From fedora-cvs-commits at redhat.com  Sun Apr  1 00:09:12 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 31 Mar 2007 20:09:12 -0400
Subject: rpms/bouncycastle/devel bouncycastle.spec,1.3,1.4
Message-ID: <200704010009.l3109C3h020109@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/bouncycastle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20095

Modified Files:
	bouncycastle.spec 
Log Message:
* Sat Mar 31 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.34-3
- Require java-1.5.0-gcj.




Index: bouncycastle.spec
===================================================================
RCS file: /cvs/dist/rpms/bouncycastle/devel/bouncycastle.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bouncycastle.spec	12 Dec 2006 20:46:30 -0000	1.3
+++ bouncycastle.spec	1 Apr 2007 00:09:10 -0000	1.4
@@ -3,7 +3,7 @@
 Summary:          Bouncy Castle Crypto Package for Java
 Name:             bouncycastle
 Version:          1.34
-Release:          2%{?dist}
+Release:          3%{?dist}
 Group:            System Environment/Libraries
 License:          BSD
 URL:              http://www.%{name}.org/
@@ -11,7 +11,7 @@
 Source0:          bcprov-jdk14-134-FEDORA.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:         jpackage-utils >= 1.5
-Requires:         java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_88rh
+Requires:         java-1.5.0-gcj
 Requires(post):   jpackage-utils >= 1.5
 Requires(postun): jpackage-utils >= 1.5
 Requires(post):   java-gcj-compat
@@ -97,7 +97,10 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %changelog
-* Tue Dec 12 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.34-2.fc7
+* Sat Mar 31 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.34-3
+- Require java-1.5.0-gcj.
+
+* Tue Dec 12 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.34-2
 - Install bcprov jar and unversioned symlink in %{_javadir}.
 - Install bcprov symlink in %{_javadir}/gcj-endorsed.
 - Change release numbering format to X.fc7.



From fedora-cvs-commits at redhat.com  Sun Apr  1 00:11:46 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 31 Mar 2007 20:11:46 -0400
Subject: rpms/lucene/devel lucene.spec,1.23,1.24
Message-ID: <200704010011.l310BkGh020208@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/lucene/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20194

Modified Files:
	lucene.spec 
Log Message:
* Sat Mar 31 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.3-1jpp.18
- Require java-1.5.0-gcj for post and postun.




Index: lucene.spec
===================================================================
RCS file: /cvs/dist/rpms/lucene/devel/lucene.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- lucene.spec	27 Mar 2007 22:56:30 -0000	1.23
+++ lucene.spec	1 Apr 2007 00:11:44 -0000	1.24
@@ -4,7 +4,7 @@
 Summary:        High-performance, full-featured text search engine
 Name:           lucene
 Version:        1.4.3
-Release:	    1jpp.17
+Release:	    1jpp.18
 Epoch:          0
 License:        Apache Software License
 URL:            http://jakarta.apache.org/lucene/
@@ -22,8 +22,8 @@
 BuildRequires:  javacc
 %if %{gcj_support}
 BuildRequires:	java-gcj-compat-devel >= 1.0.43
-Requires(post): java-1.4.2-gcj-compat
-Requires(postun): java-1.4.2-gcj-compat
+Requires(post): java-1.5.0-gcj
+Requires(postun): java-1.5.0-gcj
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
@@ -179,6 +179,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Sat Mar 31 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.3-1jpp.18
+- Require java-1.5.0-gcj for post and postun.
+
 * Tue Mar 27 2007 Deepak Bhole <dbhole at redhat.com> 1.4.3-1jpp.17
 - Added unowned directory to files list. bz# 233878.
 



From fedora-cvs-commits at redhat.com  Sun Apr  1 10:33:11 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 1 Apr 2007 06:33:11 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1142,1.1143
Message-ID: <200704011033.l31AXBN9019177@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
images_hicontrast.zip


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1142
retrieving revision 1.1143
diff -u -r1.1142 -r1.1143
--- openoffice.org.spec	31 Mar 2007 22:40:16 -0000	1.1142
+++ openoffice.org.spec	1 Apr 2007 10:33:08 -0000	1.1143
@@ -1892,6 +1892,7 @@
 %dir %{instdir}/share/config
 %{instdir}/share/config/images.zip
 %{instdir}/share/config/images_crystal.zip
+%{instdir}/share/config/images_hicontrast.zip
 %{instdir}/share/config/images_tango.zip
 %{instdir}/share/config/javavendors.xml
 %{instdir}/share/config/psetup.xpm



From fedora-cvs-commits at redhat.com  Sun Apr  1 10:33:59 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 1 Apr 2007 06:33:59 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1143,1.1144
Message-ID: <200704011033.l31AXx62019802@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
comparison build


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1143
retrieving revision 1.1144
diff -u -r1.1143 -r1.1144
--- openoffice.org.spec	1 Apr 2007 10:33:08 -0000	1.1143
+++ openoffice.org.spec	1 Apr 2007 10:33:57 -0000	1.1144
@@ -1,6 +1,6 @@
 %define oootag OOF680
 %define ooomilestone 14
-%define rh_rpm_release 2.0
+%define rh_rpm_release 2.1
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -9,7 +9,7 @@
 # undef to revert to the traditional print dialog
 %define gtkprintui 1
 # undef to revert from combining startup libs into a single libsoffice 
-%define linkopt 1
+%define linkopt 0
 
 %if %{stlvisibilityfcked}
 %define stlflags --with-stlport4



From fedora-cvs-commits at redhat.com  Sun Apr  1 13:24:17 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 1 Apr 2007 09:24:17 -0400
Subject: rpms/gnome-screensaver/devel
	gnome-screensaver-2.18.0-user-dirs.patch, 1.1,
	1.2 gnome-screensaver.spec, 1.142, 1.143
Message-ID: <200704011324.l31DOHfp013611@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-screensaver-2.18.0-user-dirs.patch 
	gnome-screensaver.spec 
Log Message:
Fall back to HOME/Pictures if PICTURES isn't set


gnome-screensaver-2.18.0-user-dirs.patch:
 personal-slideshow.desktop.in |    2 
 slideshow.c                   |   12 +++
 xdg-user-dir-lookup.c         |  167 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 180 insertions(+), 1 deletion(-)

Index: gnome-screensaver-2.18.0-user-dirs.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver-2.18.0-user-dirs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-screensaver-2.18.0-user-dirs.patch	31 Mar 2007 02:38:51 -0000	1.1
+++ gnome-screensaver-2.18.0-user-dirs.patch	1 Apr 2007 13:24:14 -0000	1.2
@@ -10,7 +10,7 @@
  StartupNotify=false
  Terminal=false
 --- gnome-screensaver-2.18.0/savers/slideshow.c.user-dirs	2007-02-22 23:39:09.000000000 -0500
-+++ gnome-screensaver-2.18.0/savers/slideshow.c	2007-03-30 22:13:17.000000000 -0400
++++ gnome-screensaver-2.18.0/savers/slideshow.c	2007-04-01 09:17:56.000000000 -0400
 @@ -34,6 +34,8 @@
  #include "gs-theme-engine.h"
  #include "gste-slideshow.h"
@@ -20,19 +20,24 @@
  int
  main (int argc, char **argv)
  {
-@@ -79,6 +81,11 @@
+@@ -79,6 +81,16 @@
                            G_CALLBACK (gtk_main_quit), NULL);
  
          engine = g_object_new (GSTE_TYPE_SLIDESHOW, NULL);
 +
 +	if (location == NULL) {
 +		location = xdg_user_dir_lookup ("PICTURES");
++		if (strcmp (location, "/tmp") == 0 || 
++                    strcmp (location, g_get_home_dir ()) == 0) {
++			free (location);
++			location = g_build_filename (g_get_home_dir (), "Pictures", NULL); 
++		}
 +	}
 +
          if (location != NULL) {
                  g_object_set (engine, "images-location", location, NULL);
          }
---- /dev/null	2007-03-30 22:25:08.845418234 -0400
+--- /dev/null	2007-04-01 08:32:00.119333847 -0400
 +++ gnome-screensaver-2.18.0/savers/xdg-user-dir-lookup.c	2007-03-30 22:13:17.000000000 -0400
 @@ -0,0 +1,167 @@
 +/*


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- gnome-screensaver.spec	31 Mar 2007 02:45:23 -0000	1.142
+++ gnome-screensaver.spec	1 Apr 2007 13:24:14 -0000	1.143
@@ -13,7 +13,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.18.0
-Release: 2%{?dist} 
+Release: 3%{?dist} 
 License: GPL
 Group: Amusements/Graphics
 Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/2.18/%{name}-%{version}.tar.bz2
@@ -126,6 +126,9 @@
 %{_sysconfdir}/skel/Pictures
 
 %changelog
+* Sun Apr  1 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-3
+- Fall back to HOME/Pictures if PICTURES is not set
+
 * Fri Mar 30 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-2
 - Use the PICTURES user dir in the Pictures screensaver
 



From fedora-cvs-commits at redhat.com  Sun Apr  1 14:47:12 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 1 Apr 2007 10:47:12 -0400
Subject: rpms/eog/devel eog-2.18.0.1-svgz.patch, NONE, 1.1 eog.spec, 1.76,
	1.77 eog-2.17.4-svgz.patch, 1.1, NONE
Message-ID: <200704011447.l31ElCua011494@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	eog.spec 
Added Files:
	eog-2.18.0.1-svgz.patch 
Removed Files:
	eog-2.17.4-svgz.patch 
Log Message:
Fix the svgz fix


eog-2.18.0.1-svgz.patch:
 eog-image.c |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

--- NEW FILE eog-2.18.0.1-svgz.patch ---
--- eog-2.18.0.1/libeog/eog-image.c.svgz	2007-03-12 19:43:29.000000000 -0400
+++ eog-2.18.0.1/libeog/eog-image.c	2007-04-01 10:39:49.000000000 -0400
@@ -455,7 +455,7 @@
 }
 
 static GnomeVFSFileSize
-eog_image_determine_file_bytes (EogImage *img, GError **error)
+eog_image_determine_file_bytes (EogImage *img, gchar **mime_type, GError **error)
 {
 	GnomeVFSFileInfo *info;
 	GnomeVFSFileSize bytes;
@@ -466,15 +466,20 @@
 	result = gnome_vfs_get_file_info_uri (img->priv->uri,
 					      info,
 					      GNOME_VFS_FILE_INFO_DEFAULT |
+                                              GNOME_VFS_FILE_INFO_GET_MIME_TYPE |
 					      GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
 
 	if ((result != GNOME_VFS_OK) || (info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) == 0) {
 		bytes = 0;
+                if (mime_type)
+                       *mime_type = NULL;
 		g_set_error (error, EOG_IMAGE_ERROR, EOG_IMAGE_ERROR_VFS,
 			     gnome_vfs_result_to_string (result));
 	}
 	else {
 		bytes = info->size;
+                if (mime_type)
+                       *mime_type = g_strdup (info->mime_type);
 	}
 
 	gnome_vfs_file_info_unref (info);
@@ -643,6 +648,7 @@
 	gboolean first_run = TRUE;
 	EogMetadataReader *md_reader = NULL;
 	GdkPixbufFormat *format;
+	gchar *mime_type;
 	gboolean read_image_data = (data2read & EOG_IMAGE_DATA_IMAGE);
 
 	g_assert (error == NULL || *error == NULL);
@@ -660,24 +666,29 @@
 		priv->file_type = NULL;
 	}
 
-	priv->bytes = eog_image_determine_file_bytes (img, error);
+	priv->bytes = eog_image_determine_file_bytes (img, &mime_type, error);
 	if (priv->bytes == 0 && (error == NULL || *error != NULL)) {
+		g_free (mime_type);
 		return FALSE;
 	}
 
 	result = gnome_vfs_open_uri (&handle, priv->uri, GNOME_VFS_OPEN_READ);
 	if (result != GNOME_VFS_OK) {
+		g_free (mime_type);
 		g_set_error (error, EOG_IMAGE_ERROR, EOG_IMAGE_ERROR_VFS,
 			     gnome_vfs_result_to_string (result));
 		return FALSE;
 	}
 	
 	buffer = g_new0 (guchar, READ_BUFFER_SIZE);
+        loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, NULL);
+        g_free (mime_type);
+        if (loader == NULL)
+             loader = gdk_pixbuf_loader_new (); 
 	failed = FALSE;
 	bytes_read_total = 0;
 
 	if (read_image_data) {
-		loader = gdk_pixbuf_loader_new ();
 		g_signal_connect_object (G_OBJECT (loader), "size-prepared", (GCallback) load_size_prepared, img, 0);
         }
 


Index: eog.spec
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/eog.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- eog.spec	13 Mar 2007 04:00:12 -0000	1.76
+++ eog.spec	1 Apr 2007 14:47:10 -0000	1.77
@@ -15,10 +15,10 @@
 Summary: Eye of GNOME image viewer
 Name:    eog
 Version: 2.18.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source: http://ftp.gnome.org/pub/gnome/sources/eog/2.17/%{name}-%{version}.tar.bz2
-Patch0: eog-2.17.4-svgz.patch
+Patch0: eog-2.18.0.1-svgz.patch
 License: GPL 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -124,6 +124,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Sun Apr  1 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0.1-2
+- Fix a problem with the svgz patch
+
 * Tue Mar 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0.1-1
 - Update to 2.18.0.1
 


--- eog-2.17.4-svgz.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sun Apr  1 15:01:34 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 1 Apr 2007 11:01:34 -0400
Subject: rpms/evince/devel evince.spec,1.75,1.76
Message-ID: <200704011501.l31F1YJf021974@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/evince/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21825

Modified Files:
	evince.spec 
Log Message:
Drop libgnomeprintui22 BR



Index: evince.spec
===================================================================
RCS file: /cvs/dist/rpms/evince/devel/evince.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- evince.spec	31 Mar 2007 13:31:31 -0000	1.75
+++ evince.spec	1 Apr 2007 15:01:32 -0000	1.76
@@ -4,7 +4,7 @@
 
 Name:		evince
 Version:	0.8.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Document viewer
 
 License: 	GPL
@@ -20,7 +20,6 @@
 BuildRequires:	poppler-devel >= %{poppler_version}
 BuildRequires:	libXt-devel
 BuildRequires:	nautilus-devel
-BuildRequires:	libgnomeprintui22-devel
 BuildRequires:	libgnomeui-devel
 BuildRequires:	gnome-vfs2-devel
 BuildRequires:	libglade2-devel
@@ -50,7 +49,7 @@
 %patch1 -p1 -b .user-dirs
 
 %build
-%configure --disable-static --disable-scrollkeeper
+%configure --disable-static --disable-scrollkeeper --with-print=gtk
 make %{?_smp_mflags}
 
 
@@ -142,6 +141,10 @@
 
 
 %changelog
+* Sun Apr  1 2007 Matthias Clasen <mclasen at redhat.com> - 0.8.0-3
+- Add an explicit --with-print=gtk to configure 
+- Drop libgnomeprintui22 BR
+
 * Sat Mar 31 2007 Matthias Clasen <mclasen at redhat.com> - 0.8.0-2
 - Add support for xdg-user-dirs
 



From fedora-cvs-commits at redhat.com  Sun Apr  1 15:15:11 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 1 Apr 2007 11:15:11 -0400
Subject: rpms/mono/devel mono.spec,1.50,1.51
Message-ID: <200704011515.l31FFBU7032075@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/mono/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31969

Modified Files:
	mono.spec 
Log Message:
Fix a spec format error



Index: mono.spec
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/mono.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- mono.spec	29 Mar 2007 13:37:27 -0000	1.50
+++ mono.spec	1 Apr 2007 15:15:08 -0000	1.51
@@ -1,6 +1,6 @@
 Name:           mono
 Version:        1.2.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        a .NET runtime environment
 
 Group:          Development/Languages
@@ -47,16 +47,16 @@
 Obsoletes:      mono-lib
 Provides:       mono-lib
 
+# Mono-basic was removed in 1.1.17
+Obsoletes:      mono-basic
+Provides:       mono-basic
+
 %description core
 This package contains the core of the Mono runtime including its
 Virtual Machine, Just-in-time compiler, C# compiler, security
 tools and libraries (corlib, XML, System.Security, ZipLib,
 I18N, Cairo and Mono.*).
 
-# Mono-basic was removed in 1.1.17
-Obsoletes:      mono-basic
-Provides:       mono-basic
-
 %package devel
 Summary:        Development tools for Mono
 Group:          Development/Languages
@@ -68,14 +68,14 @@
 Obsoletes:      mono-lib-devel
 Provides:       mono-lib-devel
 
-%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
 
+%description devel
+This package completes the Mono developer toolchain with the mono profiler,
+assembler and other various tools.
+
 %package nunit
 Summary:        NUnit Testing Framework
 Group:          Development/Languages
@@ -557,6 +557,9 @@
 %gac_dll IBM.Data.DB2
 
 %changelog
+* Sun Apr  1 2007 Matthias Clasen <mclasen at redhat.com> - 1.2.3-3
+- Fix a spec format error (#210633)
+
 * Thu Mar 29 2007 Alexander Larsson <alexl at redhat.com> - 1.2.3-2
 - Also build on alpha (#232268)
 



From fedora-cvs-commits at redhat.com  Sun Apr  1 15:48:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 1 Apr 2007 11:48:57 -0400
Subject: rpms/dhcp/FC-6 dhcp.spec, 1.120, 1.121 dhcp-3.0.5-no-win32.patch,
	1.1, NONE dhcptables.pl, 1.1, NONE
Message-ID: <200704011548.l31FmvBC009407@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcp/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv9391

Modified Files:
	dhcp.spec 
Removed Files:
	dhcp-3.0.5-no-win32.patch dhcptables.pl 
Log Message:
* Sun Apr 01 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-4
- Make sure rpm doesn't pick up dependencies for contrib/ms2isc/Registry.pm
  in the /usr/share/doc/dhcp-3.0.5 directory (#234688)



Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/FC-6/dhcp.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- dhcp.spec	1 Mar 2007 23:13:15 -0000	1.120
+++ dhcp.spec	1 Apr 2007 15:48:55 -0000	1.121
@@ -8,7 +8,7 @@
 Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent.
 Name:    dhcp
 Version: 3.0.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch:   12
 License: distributable
 Group:   System Environment/Daemons
@@ -19,7 +19,6 @@
 Source3: dhcrelay.init
 Source4: dhcpd.conf
 Source5: libdhcp4client.pc
-Source6: dhcptables.pl
 
 Patch0:  dhcp-3.0.5-extended-new-option-info.patch
 Patch1:  dhcp-3.0.5-Makefile.patch
@@ -35,7 +34,6 @@
 Patch11: dhcp-3.0.5-libdhcp4client.patch
 Patch12: dhcp-3.0.5-timeouts.patch
 Patch13: dhcp-3.0.5-fix-warnings.patch
-Patch14: dhcp-3.0.5-no-win32.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires(post): chkconfig, coreutils
@@ -144,8 +142,11 @@
 # Fix up anything that fails -Wall -Werror
 %patch13 -p1 -b .warnings
 
-# Prevent package dependency on Win32API::Registry perl module
-%patch14 -p1 -b .win32
+# Rename Registry.pm to Registry.perlmodule so find-requires doesn't pick it
+# up as a script that we need to add dependencies for (preserve permissions)
+cp -p contrib/ms2isc/Registry.pm contrib/ms2isc/Registry.perlmodule
+rm -f contrib/ms2isc/Registry.pm
+chmod -x contrib/3.0b1-lease-convert
 
 %build
 cp %SOURCE1 .
@@ -345,6 +346,10 @@
 %{_libdir}/libdhcp4client.so
 
 %changelog
+* Sun Apr 01 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-4
+- Make sure rpm doesn't pick up dependencies for contrib/ms2isc/Registry.pm
+  in the /usr/share/doc/dhcp-3.0.5 directory (#234688)
+
 * Thu Mar 01 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-3
 - Prevent package dependency on Win32API::Registry Perl module
 


--- dhcp-3.0.5-no-win32.patch DELETED ---


--- dhcptables.pl DELETED ---



From fedora-cvs-commits at redhat.com  Sun Apr  1 19:37:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 1 Apr 2007 15:37:09 -0400
Subject: rpms/hal/devel .cvsignore, 1.45, 1.46 hal.spec, 1.121, 1.122 sources,
	1.46, 1.47
Message-ID: <200704011937.l31Jb9kZ023377@cvs.devel.redhat.com>

Author: davidz

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

Modified Files:
	.cvsignore hal.spec sources 
Log Message:
* Sun Apr 01 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-0.git20070401
- Update to hal 0.5.9rc3 and hal-info-20070401
- Drop Fedora eject patch in favor of new --with-eject build option
- Man pages and new tools; notably hal-lock(1) and hal-disable-polling(1)




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	26 Mar 2007 05:42:23 -0000	1.45
+++ .cvsignore	1 Apr 2007 19:37:06 -0000	1.46
@@ -36,3 +36,5 @@
 hal-0.5.9.git20070304.tar.gz
 hal-info-20070326.tar.gz
 hal-0.5.9.git20070326.tar.gz
+hal-info-20070328.tar.gz
+hal-0.5.9.git20070401.tar.gz


Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- hal.spec	26 Mar 2007 05:42:23 -0000	1.121
+++ hal.spec	1 Apr 2007 19:37:06 -0000	1.122
@@ -26,13 +26,12 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.9
-Release: 0.git20070326%{?dist}
+Release: 0.git20070401%{?dist}
 URL: http://www.freedesktop.org/Software/hal
-Source0: http://people.freedesktop.org/~david/dist/%{name}-%{version}.git20070326.tar.gz
+Source0: http://people.freedesktop.org/~david/dist/%{name}-%{version}.git20070401.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
 Source2: hal-device-manager.desktop
 Source3: http://people.freedesktop.org/~david/dist/hal-info-%{hal_info_version}.tar.gz
-Patch0: hal-0.5.8.1-fedora-eject.patch
 
 License: AFL/GPL
 Group: System Environment/Libraries
@@ -117,10 +116,9 @@
 
 %prep
 %setup -q -a 3
-%patch0 -p0 -b .fedora-eject
 
 %build
-%configure --with-os-type=redhat --enable-console-kit --enable-acl-management --enable-umount-helper --enable-docbook-docs
+%configure --with-os-type=redhat --enable-console-kit --enable-acl-management --enable-umount-helper --enable-docbook-docs --enable-acpi-ibm --enable-acpi-toshiba --with-eject=/usr/sbin/eject
 
 cd hal-info-%{hal_info_version}
 %configure
@@ -207,6 +205,7 @@
 %dir %{_libdir}/hal
 %dir %{_libdir}/hal/scripts
 %{_libdir}/hal/scripts/*
+%{_mandir}/man1/*
 
 %{_sysconfdir}/udev/rules.d/90-hal.rules
 
@@ -241,6 +240,11 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Sun Apr 01 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-0.git20070401
+- Update to hal 0.5.9rc3 and hal-info-20070401
+- Drop Fedora eject patch in favor of new --with-eject build option
+- Man pages and new tools; notably hal-lock(1) and hal-disable-polling(1)
+
 * Mon Mar 26 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-0.git20070326
 - Update to hal 0.5.9rc2 and hal-info-20070326
 - Bring back Fedora eject patch (#231459)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	26 Mar 2007 05:42:23 -0000	1.46
+++ sources	1 Apr 2007 19:37:06 -0000	1.47
@@ -1,2 +1,2 @@
-3781c41b2f54c780216d549831965830  hal-info-20070326.tar.gz
-d3e2d565d019f626d96632d2034d9b05  hal-0.5.9.git20070326.tar.gz
+7c5ddf3fe462b225f7c0be69843631c7  hal-info-20070328.tar.gz
+53a0a42f66b13db93757db923f8d720c  hal-0.5.9.git20070401.tar.gz



From fedora-cvs-commits at redhat.com  Sun Apr  1 19:40:02 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 1 Apr 2007 15:40:02 -0400
Subject: rpms/hal/devel hal.spec,1.122,1.123
Message-ID: <200704011940.l31Je2TM023477@cvs.devel.redhat.com>

Author: davidz

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

Modified Files:
	hal.spec 
Log Message:
* Sun Apr 01 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-0.git20070401.1
- Rebuild




Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- hal.spec	1 Apr 2007 19:37:06 -0000	1.122
+++ hal.spec	1 Apr 2007 19:40:00 -0000	1.123
@@ -21,12 +21,12 @@
 
 %define hal_user_uid            68
 
-%define hal_info_version        20070326
+%define hal_info_version        20070328
 
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.9
-Release: 0.git20070401%{?dist}
+Release: 0.git20070401.1%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://people.freedesktop.org/~david/dist/%{name}-%{version}.git20070401.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
@@ -240,6 +240,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Sun Apr 01 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-0.git20070401.1
+- Rebuild
+
 * Sun Apr 01 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-0.git20070401
 - Update to hal 0.5.9rc3 and hal-info-20070401
 - Drop Fedora eject patch in favor of new --with-eject build option



From fedora-cvs-commits at redhat.com  Sun Apr  1 20:52:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 1 Apr 2007 16:52:30 -0400
Subject: rpms/dhcp/devel Makefile.dist, NONE,
 1.1 dhcp-3.0.5-default-requested-options.patch, NONE,
 1.1 dhcp-3.0.5-dhclient-decline-backoff.patch, NONE,
 1.1 dhcp-3.0.5-dhclient-usage.patch, NONE,
 1.1 dhcp-3.0.5-enable-timeout-functions.patch, NONE,
 1.1 dhcp-3.0.5-errwarn-message.patch, NONE,
 1.1 dhcp-3.0.5-failover-ports.patch, NONE, 1.1 dhcp-3.0.5-fast-timeout.patch,
 NONE, 1.1 dhcp-3.0.5-inherit-leases.patch, NONE,
 1.1 dhcp-3.0.5-manpages.patch, NONE, 1.1 dhcp-3.0.5-memory.patch, NONE,
 1.1 dhcp-3.0.5-options.patch, NONE, 1.1 dhcp-3.0.5-prototypes.patch, NONE,
 1.1 dhcp-3.0.5-release-by-ifup.patch, NONE, 1.1 dhcp-3.0.5-selinux.patch,
 NONE, 1.1 dhcp-3.0.5-unicast-bootp.patch, NONE,
 1.1 dhcp-3.0.5-warnings.patch, NONE, 1.1 dhcp4client.h, NONE,
 1.1 dhcpd-conf-to-ldap, NONE, 1.1 libdhcp_control.h, NONE, 1.1 linux, NONE,
 1.1 dhcp-3.0.5-extended-new-option-info.patch, 1.3,
 1.4 dhcp-3.0.5-ldap-configuration.patch, 1.5,
 1.6 dhcp-3.0.5-libdhcp4client.patch, 1.10,
 1.11 dhcp-3.0.5-xen-checksum.patch, 1.2, 1.3 dhcp.spec, 1.150, 1.151 dhcp!
 -3.0.5-fix-warnings.patch, 1.4, NONE dhcp-3.0.5-no-win32.patch, 1.1,
 NONE dhcpd-conf-to-ldap.pl, 1.3, NONE
Message-ID: <200704012052.l31KqU38020355@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20199

Modified Files:
	dhcp-3.0.5-extended-new-option-info.patch 
	dhcp-3.0.5-ldap-configuration.patch 
	dhcp-3.0.5-libdhcp4client.patch dhcp-3.0.5-xen-checksum.patch 
	dhcp.spec 
Added Files:
	Makefile.dist dhcp-3.0.5-default-requested-options.patch 
	dhcp-3.0.5-dhclient-decline-backoff.patch 
	dhcp-3.0.5-dhclient-usage.patch 
	dhcp-3.0.5-enable-timeout-functions.patch 
	dhcp-3.0.5-errwarn-message.patch 
	dhcp-3.0.5-failover-ports.patch dhcp-3.0.5-fast-timeout.patch 
	dhcp-3.0.5-inherit-leases.patch dhcp-3.0.5-manpages.patch 
	dhcp-3.0.5-memory.patch dhcp-3.0.5-options.patch 
	dhcp-3.0.5-prototypes.patch dhcp-3.0.5-release-by-ifup.patch 
	dhcp-3.0.5-selinux.patch dhcp-3.0.5-unicast-bootp.patch 
	dhcp-3.0.5-warnings.patch dhcp4client.h dhcpd-conf-to-ldap 
	libdhcp_control.h linux 
Removed Files:
	dhcp-3.0.5-fix-warnings.patch dhcp-3.0.5-no-win32.patch 
	dhcpd-conf-to-ldap.pl 
Log Message:
* Sun Apr 01 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-27
- Ensure that Perl and Perl modules are not added as dependencies (#234688)
- Reorganize patches by feature/bug per packaging guidelines (#225691)
- Move the following files from patches to source files:
     linux.dbus-example, linux, Makefile.dist, dhcp4client.h, libdhcp_control.h
- Compile with -fno-strict-aliasing as ISC coding standards generally don't
  agree well with gcc 4.x.x



--- NEW FILE Makefile.dist ---
# Makefile.dist for libdhcp4client
#
# We get the libdhcp4client library from the patched ISC source code.  We
# rebuild key C files with -DLIBDHCP to turn on the library features we
# need.  Normal build results in standard ISC code (i.e., not LIBDHCP
# stuff enabled).  We then link together a static library and a shared
# library with the new resulting objects.
#
# David Cantrell <dcantrell at redhat.com>

# What version of ISC DHCP is this?
VER   = $(shell grep DHCP_VERSION ../../includes/version.h | head -1 | cut -d '"' -f 2 | cut -d 'V' -f 2 | cut -d '-' -f 1)

PROGS = libdhcp4client.a libdhcp4client-$(VER).so.0

# NOTE: The ordering of these file lists is important!  We are using the
# whole program optimization features of gcc, so the order matters here.

# Source files shared by all objects
COMMON_SRCS = client_clparse.c client_dhclient.c common_alloc.c common_bpf.c \
              common_comapi.c common_conflex.c common_discover.c \
              common_dispatch.c common_dns.c common_ethernet.c \
              common_execute.c common_inet.c common_lpf.c common_memory.c \
              common_options.c common_packet.c common_parse.c common_print.c \
              common_socket.c common_tables.c common_tr.c common_tree.c \
              dst_dst_api.c dst_base64.c dst_hmac_link.c dst_md5_dgst.c \
              omapip_alloc.c omapip_array.c omapip_auth.c omapip_buffer.c \
              omapip_connection.c omapip_convert.c omapip_dispatch.c \
              omapip_errwarn.c omapip_handle.c omapip_hash.c \
              omapip_listener.c omapip_mrtrace.c omapip_result.c \
              omapip_support.c omapip_toisc.c omapip_trace.c

# Source files for libdhcp4client.o
CLIENT_SRCS = common_ctrace.c common_dlpi.c common_nit.c common_upf.c \
              dst_dst_support.c dst_prandom.c omapip_generic.c \
              omapip_message.c omapip_protocol.c

# Source files for libres.o (minires)
MINIRES_SRCS = minires_ns_date.c minires_ns_name.c minires_ns_parse.c \
               minires_ns_samedomain.c minires_ns_sign.c minires_ns_verify.c \
               minires_res_comp.c minires_res_findzonecut.c \
               minires_res_init.c minires_res_mkquery.c \
               minires_res_mkupdate.c minires_res_query.c minires_res_send.c \
               minires_res_sendsigned.c minires_res_update.c

HDRS = dhcp4client.h libdhcp_control.h
SRCS = $(COMMON_SRCS) $(CLIENT_SRCS)
OBJS = $(SRCS:.c=.o)

INCLUDES = -I$(TOP) -I$(TOP)/includes -I$(TOP)/dst -I.
CFLAGS   = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS) \
           -DCLIENT_PATH=${CLIENT_PATH} -DLIBDHCP -DUSE_MD5

all: $(PROGS)

install: all
	install -p -m 0755 -D libdhcp4client-$(VER).so.0 $(DESTDIR)$(LIBDIR)/libdhcp4client-$(VER).so.0
	ln -sf libdhcp4client-$(VER).so.0 $(DESTDIR)/$(LIBDIR)/libdhcp4client.so
	install -p -m 0644 -D libdhcp4client.a $(DESTDIR)$(LIBDIR)/libdhcp4client.a
	install -p -m 0644 -D dhcp4client.h $(DESTDIR)$(INCDIR)/dhcp4client/dhcp4client.h
	install -p -m 0644 -D libdhcp_control.h $(DESTDIR)$(INCDIR)/dhcp4client/libdhcp_control.h
	( cd $(TOP)/includes ; \
	  find . -name "*.h" -type f | while read h ; do \
	      install -p -m 0644 -D $$h $(DESTDIR)$(INCDIR)/dhcp4client/isc_dhcp/$$h ; \
	  done ; \
	)

depend:
	$(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRCS)

clean:
	-rm -f $(OBJS)

realclean: clean
	-rm -f $(PROG) *~ #*

distclean: realclean
	-rm -f Makefile

# This isn't the cleanest way to set up links, but I prefer this so I don't
# need object targets for each subdirectory.  The idea is simple.  Since
# libdhcp4client is a linked together wad of objects from across the source
# tree, we change / to _ when linking source files here.  Follow this example:
#
# We need to use client/dhclient.c, so we make this link:
#     rm -f client_dhclient.c
#     ln -s $(TOP)/client/dhclient.c client_dhclient.c
#
# Simple.  Given the way the ISC build system works, this is the easiest to
# maintain and least invasive.
#
# David Cantrell <dcantrell at redhat.com>
links:
	@for target in $(SRCS); do \
		source="`echo $$target | sed -e 's|_|/|'`"; \
		if [ ! -b $$target ]; then \
			rm -f $$target; \
		fi; \
		ln -s $(TOP)/$$source $$target; \
	done; \
	for hdr in $(HDRS); do \
		if [ ! -b $$hdr ]; then \
			rm -f $$hdr; \
		fi; \
		ln -s $(TOP)/libdhcp4client/$$hdr $$hdr; \
	done

# minires is difficult to build because it overrides things in common and dst,
# so we just link with the already built libres.a since we need it all anyway
libres.a:
	if [ ! -f ../minires/$@ ]; then \
		$(MAKE) -C ../minires; \
	fi; \
	ln ../minires/libres.a .; \
	$(AR) x libres.a

# Create the libraries
# minires/res_query.o contains an undefined symbol __h_errno_set, is not
# used by any dhcp code, and is optimized out by the linker when producing
# the dhclient executable or a shared library
libdhcp4client.a: $(OBJS) libres.a
	$(AR) crus $@ $(OBJS) `$(AR) t libres.a | grep -v res_query.o`

libdhcp4client-$(VER).so.0: $(OBJS) libres.a
	$(CC) -shared -o $@ -Wl,-soname,$@ $(OBJS) `$(AR) t libres.a | grep -v res_query.o`

# Dependencies (semi-automatically-generated)

dhcp-3.0.5-default-requested-options.patch:
 clparse.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE dhcp-3.0.5-default-requested-options.patch ---
--- dhcp-3.0.5/client/clparse.c.dho	2007-03-30 16:40:14.000000000 -0400
+++ dhcp-3.0.5/client/clparse.c	2007-03-30 16:43:53.000000000 -0400
@@ -49,6 +49,9 @@
 	DHO_DOMAIN_NAME,
 	DHO_DOMAIN_NAME_SERVERS,
 	DHO_HOST_NAME,
+	DHO_NIS_DOMAIN,
+	DHO_NIS_SERVERS,
+	DHO_NTP_SERVERS,
 	0
 };
 

dhcp-3.0.5-dhclient-decline-backoff.patch:
 client/dhclient.c |   16 +++++++++++++---
 includes/dhcpd.h  |    3 ++-
 2 files changed, 15 insertions(+), 4 deletions(-)

--- NEW FILE dhcp-3.0.5-dhclient-decline-backoff.patch ---
--- dhcp-3.0.5/client/dhclient.c.decline	2007-03-30 15:29:58.000000000 -0400
+++ dhcp-3.0.5/client/dhclient.c	2007-03-30 15:50:25.000000000 -0400
@@ -934,6 +934,7 @@
 	void *cpp;
 {
 	struct client_state *client = cpp;
+	enum dhcp_state init_state = client->state;
 
 	ASSERT_STATE(state, S_INIT);
 
@@ -946,9 +947,16 @@
 	client -> first_sending = cur_time;
 	client -> interval = client -> config -> initial_interval;
 
-	/* Add an immediate timeout to cause the first DHCPDISCOVER packet
-	   to go out. */
-	send_discover (client);
+	if (init_state != S_DECLINED) {
+		/* Add an immediate timeout to cause the first DHCPDISCOVER packet
+		   to go out. */
+		send_discover(client);
+	} else {
+		/* We've received an OFFER and it has been DECLINEd by dhclient-script.
+		 * wait for a random time between 1 and backoff_cutoff seconds before
+		 * trying again. */
+		add_timeout(cur_time + ((1 + (random() >> 2)) %  client->config->backoff_cutoff), send_discover, client, 0, 0);
+	}
 }
 
 /* state_selecting is called when one or more DHCPOFFER packets have been
@@ -1215,6 +1223,7 @@
 		send_decline (client);
 		destroy_client_lease (client -> new);
 		client -> new = (struct client_lease *)0;
+		client -> state = S_DECLINED;
 		state_init (client);
 		return;
 	}
@@ -3183,6 +3192,7 @@
 			      case S_INIT:
 			      case S_REBINDING:
 			      case S_STOPPED:
+			      case S_DECLINED:
 				break;
 			}
 			client -> state = S_INIT;
--- dhcp-3.0.5/includes/dhcpd.h.decline	2007-03-30 15:30:14.000000000 -0400
+++ dhcp-3.0.5/includes/dhcpd.h	2007-03-30 15:50:53.000000000 -0400
@@ -704,7 +704,8 @@
 	S_BOUND = 5,
 	S_RENEWING = 6,
 	S_REBINDING = 7,
-	S_STOPPED = 8
+	S_STOPPED = 8,
+	S_DECLINED = 9
 };
 
 /* Authentication and BOOTP policy possibilities (not all values work

dhcp-3.0.5-dhclient-usage.patch:
 dhclient.c |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

--- NEW FILE dhcp-3.0.5-dhclient-usage.patch ---
--- dhcp-3.0.5/client/dhclient.c.usage	2007-04-01 13:49:43.000000000 -0400
+++ dhcp-3.0.5/client/dhclient.c	2007-04-01 13:51:25.000000000 -0400
@@ -819,20 +819,29 @@
 
 static void usage ()
 {
-	log_info ("%s %s", message, DHCP_VERSION);
-	log_info (copyright);
-	log_info (arr);
-	log_info (url);
+	printf ("%s %s\n", message, DHCP_VERSION);
+	printf (copyright);
+	printf ("\n");
+	printf (arr);
+	printf ("\n");
+	printf (url);
+	printf ("\n");
 
 #ifdef EXTENDED_NEW_OPTION_INFO
-	log_error ("Usage: dhclient [-1dqr] [-nwx] [-p <port>] %s",
+	printf ("Usage: dhclient [-1dqr] [-nwx] [-p <port>] %s",
 #else
-	log_error ("Usage: dhclient [-1dqr] [-nw] [-p <port>] %s",
+	printf ("Usage: dhclient [-1dqr] [-nw] [-p <port>] %s",
 #endif
-		   "[-s server]");
-	log_error ("                [-cf config-file] [-lf lease-file]%s",
-		   "[-pf pid-file] [-e VAR=val]");
-	log_fatal ("                [-sf script-file] [interface]");
+	   "[-s server]");
+	printf ("                [-cf config-file] [-lf lease-file]%s",
+	   "[-pf pid-file] [-e VAR=val]");
+	printf ("                [ -I <dhcp-client-identifier> ] [-B]\n");
+	printf ("                [ -H <host-name> | -F <fqdn.fqdn> ] [ -T <timeout> ]\n");
+	printf ("                [ -V <vendor-class-identifier> ]\n");
+	printf ("                [ -R <request option list> ]\n");
+	printf ("                [-sf script-file] [interface]");
+
+	exit (EXIT_FAILURE);
 }
 
 isc_result_t find_class (struct class **c,

dhcp-3.0.5-enable-timeout-functions.patch:
 dispatch.c |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE dhcp-3.0.5-enable-timeout-functions.patch ---
--- dhcp-3.0.5/common/dispatch.c.ecat	2006-02-22 17:43:27.000000000 -0500
+++ dhcp-3.0.5/common/dispatch.c	2007-03-30 15:54:15.000000000 -0400
@@ -195,7 +195,6 @@
 	}
 }
 
-#if defined (DEBUG_MEMORY_LEAKAGE_ON_EXIT)
 void cancel_all_timeouts ()
 {
 	struct timeout *t, *n;
@@ -216,4 +215,3 @@
 		dfree (t, MDL);
 	}
 }
-#endif

dhcp-3.0.5-errwarn-message.patch:
 errwarn.c |   19 ++++++-------------
 1 files changed, 6 insertions(+), 13 deletions(-)

--- NEW FILE dhcp-3.0.5-errwarn-message.patch ---
--- dhcp-3.0.5/omapip/errwarn.c.message	2007-03-29 15:03:12.000000000 -0400
+++ dhcp-3.0.5/omapip/errwarn.c	2007-03-29 15:08:50.000000000 -0400
@@ -80,20 +80,13 @@
 
 #if !defined (NOMINUM)
   log_error ("%s", "");
-  log_error ("If you did not get this software from ftp.isc.org, please");
-  log_error ("get the latest from ftp.isc.org and install that before");
-  log_error ("requesting help.");
+  log_error ("This version of ISC DHCP is based on the release available");
+  log_error ("on ftp.isc.org.  Features have been added and other changes");
+  log_error ("have been made to the base software release in order to make");
+  log_error ("it work better with this distribution.");
   log_error ("%s", "");
-  log_error ("If you did get this software from ftp.isc.org and have not");
-  log_error ("yet read the README, please read it before requesting help.");
-  log_error ("If you intend to request help from the dhcp-server at isc.org");
-  log_error ("mailing list, please read the section on the README about");
-  log_error ("submitting bug reports and requests for help.");
-  log_error ("%s", "");
-  log_error ("Please do not under any circumstances send requests for");
-  log_error ("help directly to the authors of this software - please");
-  log_error ("send them to the appropriate mailing list as described in");
-  log_error ("the README file.");
+  log_error ("Please report for this software via the Red Hat Bugzilla site:");
+  log_error ("    http://bugzilla.redhat.com");
   log_error ("%s", "");
   log_error ("exiting.");
 #endif

dhcp-3.0.5-failover-ports.patch:
 confpars.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE dhcp-3.0.5-failover-ports.patch ---
--- dhcp-3.0.5/server/confpars.c.failover	2007-03-30 16:28:08.000000000 -0400
+++ dhcp-3.0.5/server/confpars.c	2007-03-30 16:32:39.000000000 -0400
@@ -998,10 +998,17 @@
 		parse_warn (cfile, "peer address may not be omitted");
 
 	/* XXX - when/if we get a port number assigned, just set as default */
+	/* See Red Hat Bugzilla 167292:
+	 * we do now:  dhcp-failover 647/tcp
+	 *             dhcp-failover 647/udp
+	 *             dhcp-failover 847/tcp
+	 *             dhcp-failover 847/udp
+	 * IANA registration by Bernard Volz <volz at cisco.com>
+	 */
 	if (!peer -> me.port)
-		parse_warn (cfile, "local port may not be omitted");
+		peer -> me.port = 647;
 	if (!peer -> partner.port)
-		parse_warn (cfile, "peer port may not be omitted");
+		peer -> partner.port = 847;
 
 	if (peer -> i_am == primary) {
 	    if (!peer -> hba) {

dhcp-3.0.5-fast-timeout.patch:
 dhclient.c |    5 +----
 1 files changed, 1 insertion(+), 4 deletions(-)

--- NEW FILE dhcp-3.0.5-fast-timeout.patch ---
--- dhcp-3.0.5/client/dhclient.c.fast	2007-03-30 16:22:54.000000000 -0400
+++ dhcp-3.0.5/client/dhclient.c	2007-03-30 16:26:11.000000000 -0400
@@ -766,10 +766,7 @@
 				do_release (client);
 			else {
 				client -> state = S_INIT;
-				/* Set up a timeout to start the initialization
-				   process. */
-				add_timeout (cur_time + random () % 5,
-					     state_reboot, client, 0, 0);
+				add_timeout (cur_time, state_reboot, client, 0, 0);
 			}
 		}
 	}

dhcp-3.0.5-inherit-leases.patch:
 dhclient.c |    8 ++++++++
 1 files changed, 8 insertions(+)

--- NEW FILE dhcp-3.0.5-inherit-leases.patch ---
--- dhcp-3.0.5/client/dhclient.c.inherit	2007-03-30 16:06:30.000000000 -0400
+++ dhcp-3.0.5/client/dhclient.c	2007-03-30 16:09:06.000000000 -0400
@@ -720,6 +720,14 @@
 				continue;
 			script_init (ip -> client,
 				     "PREINIT", (struct string_list *)0);
+			/* Has an active lease */
+			if (ip->client->active &&
+			    !ip->client->active->is_bootp &&
+			    ip->client->active->expiry > cur_time &&
+			    ip->primary_address.s_addr != 0 &&
+			    ip->client->active->address.len == 4 &&
+			    memcmp(ip->client->active->address.iabuf, &ip->primary_address, 4) == 0)
+				client_envadd(ip->client, "", "keep_old_ip", "%s", "yes");
 			if (ip -> client -> alias)
 				script_write_params (ip -> client, "alias_",
 						     ip -> client -> alias);

dhcp-3.0.5-manpages.patch:
 client/dhclient-script.8 |   23 ++++++++
 client/dhclient.8        |  123 +++++++++++++++++++++++++++++++++++++++++++++++
 client/dhclient.conf.5   |   15 +++++
 common/dhcp-options.5    |   18 ++++++
 dhcpctl/dhcpctl.3        |    5 +
 server/dhcpd.conf.5      |   18 ++----
 6 files changed, 187 insertions(+), 15 deletions(-)

--- NEW FILE dhcp-3.0.5-manpages.patch ---
--- dhcp-3.0.5/client/dhclient-script.8.manpages	2005-09-28 15:17:08.000000000 -0400
+++ dhcp-3.0.5/client/dhclient-script.8	2007-03-29 14:55:09.000000000 -0400
@@ -47,7 +47,7 @@
 exit hooks provided (see HOOKS for details).   These hooks will allow the
 user to override the default behaviour of the client in creating a
 .B /etc/resolv.conf
-file.
+file, and to handle DHCP options not handled by default. 
 .PP
 No standard client script exists for some operating systems, even though
 the actual client may work, so a pioneering user may well need to create
@@ -91,6 +91,27 @@
 .B ETCDIR/dhclient-exit-hooks
 script can modify the valid of exit_status to change the exit status
 of dhclient-script.
+.PP
+Immediately after dhclient brings an interface UP with a new IP address,
+subnet mask, and routes, in the REBOOT/BOUND states, it will check for the
+existence of an executable
+.B ETCDIR/dhclient-up-hooks
+script, and source it if found. This script can handle DHCP options in
+the environment that are not handled by default. A per-interface 
+.B ETCDIR/dhclient-up-${IF}-hooks
+script will override the generic script and be sourced when interface
+$IF has been brought up.
+.PP
+Immediately before dhclient brings an interface DOWN, removing its IP 
+address, subnet mask, and routes, in the STOP/RELEASE  states, it will 
+check for the existence of an executable
+.B ETCDIR/dhclient-down-hooks
+script, and source it if found. This script can handle DHCP options in
+the environment that are not handled by default. A per-interface 
+.B ETCDIR/dhclient-down-${IF}-hooks
+script will override the generic script and be sourced when interface
+$IF is about to be brought down.
+
 .SH OPERATION
 When dhclient needs to invoke the client configuration script, it
 defines a set of variables in the environment, and then invokes
--- dhcp-3.0.5/client/dhclient.conf.5.manpages	2005-06-16 15:40:13.000000000 -0400
+++ dhcp-3.0.5/client/dhclient.conf.5	2007-03-29 14:55:21.000000000 -0400
@@ -185,7 +185,8 @@
 options.   Only the option names should be specified in the request
 statement - not option parameters.   By default, the DHCP server
 requests the subnet-mask, broadcast-address, time-offset, routers,
-domain-name, domain-name-servers and host-name options. 
+domain-name, domain-name-servers, host-name, nis-domain, nis-servers,
+and ntp-servers options.
 .PP
 In some cases, it may be desirable to send no parameter request list
 at all.   To do this, simply write the request statement but specify
@@ -581,6 +582,18 @@
 Whenever the client tries to renew the lease, it will use that same
 media type.   The lease must expire before the client will go back to
 cycling through media types.
+.PP
+ \fBbootp-broadcast-always;\fR
+.PP
+The 
+.B bootp-broadcast-always
+statement instructs dhclient to always set the bootp broadcast flag in
+request packets, so that servers will always broadcast replies.
+This is equivalent to supplying the dhclient -B argument, and has
+the same effect as specifying 'always-broadcast' in the server's dhcpd.conf.
+This option is provided as a Red Hat extension to enable dhclient to work
+on IBM zSeries z/OS Linux guests .
+.PP
 .SH SAMPLE
 The following configuration file is used on a laptop running NetBSD
 1.3.   The laptop has an IP alias of 192.5.5.213, and has one
--- dhcp-3.0.5/client/dhclient.8.manpages	2007-03-29 14:54:16.000000000 -0400
+++ dhcp-3.0.5/client/dhclient.8	2007-03-29 14:58:16.000000000 -0400
@@ -85,6 +85,28 @@
 .B -x
 ]
 [
+.B -I
+.I dhcp-client-identifier
+]
+[
+.B -H
+.I host-name
+.R |
+.B -F fqdn.fqdn
+]
+[
+.B -V
+.I vendor-class-identifier
+]
+[
+.B -R
+.I request option list
+]
+[
+.B -T 
+.I timeout
+]
+[
 .I if0
 [
 .I ...ifN
@@ -273,6 +295,107 @@
 -s dhclient-script environment, which would allow applications running
 in that environment to handle options they do not know about in advance -
 this is a Red Hat extension to support dhcdbd and NetworkManager.
+.PP
+The -I <id> argument allows you to specify the dhcp-client-identifier string, <id>,
+to be sent to the dhcp server on the command line. It is equivalent to the
+top level dhclient.conf statement:
+.br
+ \fBsend dhcp-client-identifier "<id>";\fR
+.br
+The -I <id> command line option will override any top level dhclient.conf 
+ 'send dhcp-client-identifier' statement, but more specific per-interface
+ 'interface "X" { send dhcp-client-identifier...; }' statements in dhclient.conf
+will override the -I <id> command line option for interface "X".
+This option is provided as a Red Hat extension to enable dhclient to work
+on IBM zSeries z/OS Linux guests.
+.PP
+The -B option instructs dhclient to set the bootp broadcast flag in request
+packets, so that servers will always broadcast replies. This is equivalent
+to specifying the 'bootp-broadcast-always' option in dhclient.conf, and has
+the same effect as specifying 'always-broadcast' in the server's dhcpd.conf.
+This option is provided as a Red Hat extension to enable dhclient to work
+on IBM zSeries z/OS Linux guests.
+.PP 
+The -H <host-name> option allows you to specify the DHCP host-name option
+to send to the server on the dhclient command line. It is equivalent to the
+top level dhclient.conf statement:
+.br
+\f send host-name "<host-name>";\fR
+.br
+The -H <host-name> option  will override any top level dhclient.conf 
+ 'send host-name' statement, but more specific per-interface 
+ 'interface "X" { send host-name...;' statements in dhclient.conf
+will override the -H <host-name> command line option for interface "X".
+The host-name option only specifies the client's host name prefix, to which
+the server will append the 'ddns-domainname' or 'domain-name' options, if any,
+to derive the fully qualified domain name of the client host.
+The -H <host-name> option cannot be used with the -F <fqdn.fqdn> option.
+Only one -H <host-name> option may be specified.
+The -H <host-name> option is provided as a Red Hat extension to simplify
+configuration of clients of DHCP servers that require the host-name option
+to be sent (eg. some modern cable modems), and for dynamic DNS updates (DDNS). 
+.PP
+The -F <fqdn.fqdn> option allows you to specify the DHCP fqdn.fqdn option
+to send to the server on the dhclient command line. It is equivalent to the
+top level dhclient.conf statement:
+.br
+\f send fqdn.fqdn "<domain-name>";\fR
+.br
+The -F <fqdn.fqdn> option  will override any top level dhclient.conf 
+ 'send fqdn.fqdn' statement, but more specific per-interface 
+ 'interface "X" { send fqdn.fqdn...;' statements in dhclient.conf
+will override the -F <fqdn.fqdn> command line option for interface "X".
+This option cannot be used with the -H <host-name> option.
+The DHCP fqdn.fqdn option must specify the complete domain name of the client
+host, which the server may use for dynamic DNS updates.
+Only one -F <fqdn.fqdn> option may be specified.
+The -F <fqdn.fqdn> option is provided as a Red Hat extension to simplify
+configuration of DDNS. 
+.PP
+The -T <timeout> option allows you to specify the time after which 
+the dhclient will decide that no DHCP servers can be contacted when
+no responses have been received. It is equivalent to the 
+.br
+\f timeout <integer>;\fR
+.br
+dhclient.conf statement, and will override any such statements in dhclient.conf.
+.br
+This option is provided as a Red Hat extension.
+.PP
+The -V <vendor-class-identifier> option allows you to specify the DHCP 
+vendor-class-identifier option to send to the server on the dhclient command line. 
+It is equivalent to the top level dhclient.conf statement:
+.br
+\f send vendor-class-identifier "<vendor-class-identifier>";\fR
+.br
+The -V <vendor-class-identifier> option  will override any top level dhclient.conf 
+ 'send vendor-class-identifier' statement, but more specific per-interface 
+ 'interface "X" { send vendor-class-identifier...;' statements in dhclient.conf
+will override the -V <vendor-class-identifier> command line option for interface "X".
+The -V <vendor-class-identifier> option is provided as a Red Hat extension to simplify
+configuration of clients of DHCP servers that require the vendor-class-identifier option
+to be sent.
+.PP
+The -R <request option list> option allows you to specify the list of options the
+client is to request from the server on the dhclient command line.
+The option list must be a single string, consisting of option names separated
+by at least one comma and optional space characters. The default option list
+is :
+.br
+    subnet-mask, broadcast-address, time-offset, routers, 
+.br
+    domain-name, domain-name-servers, host-name, nis-domain, 
+.br
+    nis-servers, ntp-servers
+.br
+You can specify a different list of options to request with the -R <option list> argument.
+This is equivalent to the dhclient.conf statement:
+.br
+\f    request <option list> ;\fR
+.br
+The -R argument is provided as a Red Hat extension to ISC dhclient to facilitate requesting
+a list of options from the server different to the default.
+.PP
 .SH CONFIGURATION
 The syntax of the dhclient.conf(5) file is discussed separately.
 .SH OMAPI
--- dhcp-3.0.5/common/dhcp-options.5.manpages	2006-04-26 11:12:43.000000000 -0400
+++ dhcp-3.0.5/common/dhcp-options.5	2007-03-29 14:58:42.000000000 -0400
@@ -834,6 +834,24 @@
 classless IP routing is now the most widely deployed routing standard,
 this option is virtually useless, and is not implemented by any of the
 popular DHCP clients, for example the Microsoft DHCP client.
+.PP
+NOTE to Red Hat dhclient users:
+.br
+The RedHat dhclient-script interprets trailing 0 octets of the  target
+as  indicating  the  subnet  class  of  the route - so for this
+static-routes value:
+.br
+        option static-routes 172.0.0.0 172.16.2.254,
+.br
+                             192.168.0.0 192.168.2.254;
+.br
+the Red Hat dhclient-script will create routes:
+.br
+        172/8 via 172.16.2.254 dev $interface
+.br
+        192.168/16 via 192.168.2.254 dev $interface
+.br
+which slightly increases the usefulness of the static-routes option.
 .RE
 .PP
 .nf
--- dhcp-3.0.5/dhcpctl/dhcpctl.3.manpages	2004-09-24 17:08:38.000000000 -0400
+++ dhcp-3.0.5/dhcpctl/dhcpctl.3	2007-03-29 14:59:16.000000000 -0400
@@ -43,7 +43,8 @@
 .\"
 .\"
 .Sh SYNOPSIS
-.Fd #include <dhcpctl/dhcpctl.h>
+.Fd #include <dhcpctl.h>
+.sp
 .Ft dhcpctl_status
 .Fo dhcpctl_initialize
 .Fa void
@@ -426,7 +427,7 @@
 #include <netinet/in.h>
 
 #include <isc/result.h>
-#include <dhcpctl/dhcpctl.h>
+#include <dhcpctl.h>
 
 int main (int argc, char **argv) {
 	dhcpctl_data_string ipaddrstring = NULL;
--- dhcp-3.0.5/server/dhcpd.conf.5.manpages	2006-07-09 11:02:24.000000000 -0400
+++ dhcp-3.0.5/server/dhcpd.conf.5	2007-03-29 14:58:59.000000000 -0400
@@ -531,9 +531,9 @@
 failover peer "foo" {
   primary;
   address anthrax.rc.vix.com;
-  port 519;
+  port 647;
   peer address trantor.rc.vix.com;
-  peer port 520;
+  peer port 847;
   max-response-delay 60;
   max-unacked-updates 10;
   mclt 3600;
@@ -592,9 +592,7 @@
 .B port \fIport-number\fR\fB;\fR
 .PP
 The \fBport\fR statement declares the TCP port on which the server
-should listen for connections from its failover peer.   This statement
-may not currently be omitted, because the failover protocol does not
-yet have a reserved TCP port number.
+should listen for connections from its failover peer.  
 .RE
 .PP
 The 
@@ -606,10 +604,8 @@
 .PP
 The \fBpeer port\fR statement declares the TCP port to which the
 server should connect to reach its failover peer for failover
-messages.   This statement may not be omitted because the failover
-protocol does not yet have a reserved TCP port number.   The port
-number declared in the \fBpeer port\fR statement may be the same as
-the port number declared in the \fBport\fR statement.
+messages. The port number declared in the \fBpeer port\fR statement 
+may be the same as the port number declared in the \fBport\fR statement.
 .RE
 .PP
 The 
@@ -1133,7 +1129,7 @@
 .PP
 .nf
 key DHCP_UPDATER {
-  algorithm HMAC-MD5.SIG-ALG.REG.INT;
+  algorithm hmac-md5;
   secret pRP5FapFoJ95JEL06sv4PQ==;
 };
 
@@ -1156,7 +1152,7 @@
 .PP
 .nf
 key DHCP_UPDATER {
-  algorithm HMAC-MD5.SIG-ALG.REG.INT;
+  algorithm hmac-md5;
   secret pRP5FapFoJ95JEL06sv4PQ==;
 };
 

dhcp-3.0.5-memory.patch:
 common/lpf.c      |    1 +
 common/packet.c   |    5 +++--
 minires/ns_name.c |    5 +++++
 3 files changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE dhcp-3.0.5-memory.patch ---
--- dhcp-3.0.5/common/packet.c.memory	2005-03-03 11:55:23.000000000 -0500
+++ dhcp-3.0.5/common/packet.c	2007-03-30 17:11:06.000000000 -0400
@@ -140,6 +140,7 @@
 	struct ip ip;
 	struct udphdr udp;
 
+	memset( &ip, '\0', sizeof ip);
 	/* Fill out the IP header */
 	IP_V_SET (&ip, 4);
 	IP_HL_SET (&ip, 20);
@@ -219,7 +220,7 @@
 {
   unsigned char *data;
   struct ip ip;
-  struct udphdr *udp;
+  struct udphdr udph, *udp=&udph;
   u_int32_t ip_len = (buf [bufix] & 0xf) << 2;
   u_int32_t sum, usum;
   static int ip_packets_seen;
@@ -233,7 +234,7 @@
   int ignore = 0;
 
   memcpy(&ip, buf + bufix, sizeof (struct ip));
-  udp = (struct udphdr *)(buf + bufix + ip_len);
+  memcpy(udp, buf + bufix + ip_len, sizeof(struct udphdr));
 
 #ifdef USERLAND_FILTER
   /* Is it a UDP packet? */
--- dhcp-3.0.5/common/lpf.c.memory	2007-03-30 17:11:06.000000000 -0400
+++ dhcp-3.0.5/common/lpf.c	2007-03-30 17:11:55.000000000 -0400
@@ -246,6 +246,7 @@
 	struct interface_info *info;
 {
 	struct sock_fprog p;
+	memset(&p,'\0', sizeof(struct sock_fprog));
 
 	/* Set up the bpf filter program structure.    This is defined in
 	   bpf.c */
--- dhcp-3.0.5/minires/ns_name.c.memory	2004-06-10 13:59:40.000000000 -0400
+++ dhcp-3.0.5/minires/ns_name.c	2007-03-30 17:11:06.000000000 -0400
@@ -71,6 +71,11 @@
 	dn = dst;
 	eom = dst + dstsiz;
 
+	if (dn >= eom) {
+		errno = EMSGSIZE;
+		return (-1);
+	}
+
 	while ((n = *cp++) != 0) {
 		if ((n & NS_CMPRSFLGS) != 0) {
 			/* Some kind of compression pointer. */

dhcp-3.0.5-options.patch:
 client/clparse.c    |   10 +
 client/dhclient.c   |  274 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 common/conflex.c    |    2 
 includes/dhcpd.h    |    3 
 includes/dhctoken.h |    3 
 5 files changed, 287 insertions(+), 5 deletions(-)

--- NEW FILE dhcp-3.0.5-options.patch ---
--- dhcp-3.0.5/client/dhclient.c.options	2007-03-29 16:33:14.000000000 -0400
+++ dhcp-3.0.5/client/dhclient.c	2007-03-30 15:15:59.000000000 -0400
@@ -38,6 +38,12 @@
 #include "dhcpd.h"
 #include "version.h"
 
+/*
+ * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define
+ * that when building ISC code.
+ */
+extern int asprintf(char **strp, const char *fmt, ...);
+
 TIME default_lease_time = 43200; /* 12 hours... */
 TIME max_lease_time = 86400; /* 24 hours... */
 
@@ -77,6 +83,9 @@
 #ifdef EXTENDED_NEW_OPTION_INFO
 int extended_option_environment = 0;
 #endif
+int bootp_broadcast_always = 0;
+
+extern u_int32_t default_requested_options[];
 
 static void usage PROTO ((void));
 
@@ -103,6 +112,15 @@
 	int no_dhclient_pid = 0;
 	int no_dhclient_script = 0;
 	char *s;
+	char *dhcp_client_identifier_arg = NULL;
+	char *dhcp_host_name_arg = NULL;
+	char *dhcp_fqdn_arg = NULL;
+	char *dhcp_vendor_class_identifier_arg = NULL;
+	char *dhclient_request_options = NULL;
+
+	int timeout_arg = 0;
+	char *arg_conf = NULL;
+	int arg_conf_len = 0;
 
 	/* Make sure we have stdin, stdout and stderr. */
 	i = open ("/dev/null", O_RDWR);
@@ -211,6 +229,88 @@
 			extended_option_environment = 1;
 			new_option_info_tree = GENERATE_NEW_OPTION_INFO;
 #endif
+		} else if (!strcmp (argv [i], "-I")) {
+			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
+				usage ();
+				return EXIT_FAILURE;
+			}
+
+			if (strlen(argv[i]) >= DHCP_OPTION_LEN) {
+				log_error("-I option dhcp-client-identifier string \"%s\" is too long - maximum length is: %d",  argv[i], DHCP_OPTION_LEN-1);
+				exit(1);
+			}
+
+			dhcp_client_identifier_arg = argv[i];
+		} else if (!strcmp (argv [i], "-B")) {
+			bootp_broadcast_always = 1;
+		} else if (!strcmp (argv [i], "-H")) {
+			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
+				usage ();
+				return EXIT_FAILURE;
+			}
+
+			if (strlen(argv[i]) >= DHCP_OPTION_LEN) {
+				log_error("-H option host-name string \"%s\" is too long - maximum length is: %d",  argv[i], DHCP_OPTION_LEN-1);
+				exit(1);
+			}
+
+			if (dhcp_host_name_arg != NULL) {
+				log_error("The -H <host-name> and -F <fqdn> arguments are mutually exclusive");
+				exit(1);
+			}
+
+			dhcp_host_name_arg = argv[i];
+		} else if (!strcmp (argv [i], "-F")) {
+			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
+				usage ();
+				return EXIT_FAILURE;
+			}
+
+			if (strlen(argv[i]) >= DHCP_OPTION_LEN) {
+				log_error("-F option fqdn.fqdn string \"%s\" is too long - maximum length is: %d",  argv[i], DHCP_OPTION_LEN-1);
+				exit(1);
+			}
+
+			if (dhcp_fqdn_arg != NULL) {
+				log_error("Only one -F <fqdn> argument can be specified");
+				exit(1);
+			}
+
+			if (dhcp_host_name_arg != NULL) {
+				log_error("The -F <fqdn> and -H <host-name> arguments are mutually exclusive");
+				exit(1);
+			}
+
+			dhcp_fqdn_arg = argv[i];
+		} else if (!strcmp (argv [i], "-T")) {
+			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
+				usage ();
+				return EXIT_FAILURE;
+			}
+
+			if ((timeout_arg = atoi(argv[i])) <= 0) {
+				log_error("-T timeout option must be > 0 - bad value: %s",argv[i]);
+				exit(1);
+			}
+		} else if (!strcmp (argv [i], "-V")) {
+			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
+				usage ();
+				return EXIT_FAILURE;
+			}
+
+			if (strlen(argv[i]) >= DHCP_OPTION_LEN) {
+				log_error("-V option vendor-class-identifier string \"%s\" is too long - maximum length is: %d",  argv[i], DHCP_OPTION_LEN-1);
+				exit(1);
+			}
+
+			dhcp_vendor_class_identifier_arg = argv[i];
+		} else if (!strcmp (argv [i], "-R")) {
+			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
+				usage ();
+				return EXIT_FAILURE;
+			}
+
+			dhclient_request_options=argv[i];
  		} else if (argv [i][0] == '-') {
  		    usage ();
 		} else {
@@ -347,6 +447,170 @@
 	/* Parse the dhclient.conf file. */
 	read_client_conf ();
 
+	/* Parse any extra command line configuration arguments: */
+	if ((dhcp_client_identifier_arg != NULL) && (*dhcp_client_identifier_arg != '\0')) { 
+		arg_conf_len = asprintf(&arg_conf, "send dhcp-client-identifier \"%s\";", dhcp_client_identifier_arg);
+
+		if ((arg_conf == 0) || (arg_conf_len <= 0))
+			log_fatal("Unable to send -I option dhcp-client-identifier");
+	}
+
+	if ((dhcp_host_name_arg != NULL) && (*dhcp_host_name_arg != '\0')) {
+		if (arg_conf == 0) {
+			arg_conf_len = asprintf(&arg_conf, "send host-name \"%s\";", dhcp_host_name_arg);
+
+			if ((arg_conf == 0) || (arg_conf_len <= 0))
+				log_fatal("Unable to send -H option host-name");
+		} else {
+			char *last_arg_conf = arg_conf;
+			arg_conf = NULL;
+			arg_conf_len = asprintf( &arg_conf, "%s\nsend host-name \"%s\";", last_arg_conf, dhcp_host_name_arg);
+
+			if ((arg_conf == 0) || (arg_conf_len <= 0))
+				log_fatal("Unable to send -H option host-name");
+
+			free(last_arg_conf);
+		}
+	}
+
+	if ((dhcp_fqdn_arg != NULL) && (*dhcp_fqdn_arg != '\0')) {
+		if (arg_conf == 0) {
+			arg_conf_len = asprintf(&arg_conf,  "send fqdn.fqdn \"%s\";", dhcp_fqdn_arg);
+
+			if ((arg_conf == 0) || (arg_conf_len <= 0))
+				log_fatal("Unable to send -F option fqdn.fqdn");
+		} else {
+			char *last_arg_conf = arg_conf;
+			arg_conf = NULL;
+			arg_conf_len = asprintf( &arg_conf, "%s\nsend fqdn.fqdn \"%s\";", last_arg_conf, dhcp_fqdn_arg);
+
+			if ((arg_conf == 0)  || (arg_conf_len <= 0))
+				log_fatal("Unable to send -F option fqdn.fqdn");
+
+			free(last_arg_conf);
+		}
+	}
+
+	if (timeout_arg) {
+		if( arg_conf == 0 )
+		{
+			arg_conf_len = asprintf(&arg_conf,  "timeout %d;", timeout_arg);
+
+			if ((arg_conf == 0) || (arg_conf_len <= 0))
+				log_fatal("Unable to process -T timeout argument");
+		} else {
+			char *last_arg_conf = arg_conf;
+			arg_conf = NULL;
+			arg_conf_len = asprintf( &arg_conf, "%s\ntimeout %d;", last_arg_conf, timeout_arg);
+
+			if ((arg_conf == 0) || (arg_conf_len == 0))
+				log_fatal("Unable to process -T timeout argument");
+
+			free(last_arg_conf);
+		}
+	}
+
+	if ((dhcp_vendor_class_identifier_arg != NULL) && (*dhcp_vendor_class_identifier_arg != '\0')) {
+		if (arg_conf == 0) {
+			arg_conf_len = asprintf(&arg_conf,  "send vendor-class-identifier \"%s\";", dhcp_vendor_class_identifier_arg);
+
+			if ((arg_conf == 0) || (arg_conf_len <= 0))
+				log_fatal("Unable to send -V option vendor-class-identifier");
+		} else {
+			char *last_arg_conf = arg_conf;
+			arg_conf = NULL;
+			arg_conf_len = asprintf(&arg_conf, "%s\nsend vendor-class-identifier \"%s\";", last_arg_conf, dhcp_vendor_class_identifier_arg);
+
+			if ((arg_conf == 0) || (arg_conf_len <= 0))
+				log_fatal("Unable to send -V option vendor-class-identifier");
+
+			free(last_arg_conf);
+		}
+	}
+
+	if (dhclient_request_options != NULL) {
+		if (arg_conf == 0) {
+			arg_conf_len = asprintf(&arg_conf,  "request %s;", dhclient_request_options);
+
+			if ((arg_conf == 0) || (arg_conf_len <= 0))
+				log_fatal("Unable to parse -R <request options list> argument");
+		} else {
+			char *last_arg_conf = arg_conf;
+			arg_conf = NULL;
+			arg_conf_len = asprintf(&arg_conf, "%s\nrequest %s;", last_arg_conf, dhclient_request_options);
+
+			if ((arg_conf == 0)  || (arg_conf_len <= 0))
+				log_fatal("Unable to parse -R <request options list> argument");
+
+			free(last_arg_conf);
+		}
+	}
+
+	if (arg_conf) {
+		if( arg_conf_len == 0 )
+			if( (arg_conf_len = strlen(arg_conf)) == 0 )
+				/* huh ? cannot happen ! */
+				log_fatal("Unable to process -I/-H/-F/-T/-V/-R configuration arguments");
+
+		/* parse the extra dhclient.conf configuration arguments
+		 * into top level config: */
+		struct parse *cfile = (struct parse *)0;
+		const char *val = NULL;
+		int token;
+
+		status = new_parse (&cfile, -1, arg_conf, arg_conf_len, "extra dhclient -I/-H/-F/-T/-V/-R configuration arguments", 0);
+
+		if ((status != ISC_R_SUCCESS) || (cfile -> warnings_occurred))
+			log_fatal("Cannot parse -I/-H/-F/-T/-V/-R configuration arguments !");
+		/* more detailed parse failures will be logged */
+
+		do {
+			token = peek_token (&val, (unsigned *)0, cfile);
+			if (token == END_OF_FILE)
+				break;
+
+			parse_client_statement (cfile, (struct interface_info *)0, &top_level_config);
+
+
+		} while (1);
+
+		if (cfile -> warnings_occurred)
+			log_fatal ("Cannot parse -I/-H/-F/-T/-V/-R configuration arguments !");
+		end_parse (&cfile);
+
+		if (timeout_arg) {
+			/* we just set the toplevel timeout, but per-client
+			 * timeouts may still be at defaults. Also, it makes no
+			 * sense having the reboot_timeout or backoff_cutoff
+			 * greater than the timeout:
+			 */
+			if ((top_level_config.backoff_cutoff == 15) && (top_level_config.backoff_cutoff > (timeout_arg / 2)))
+				top_level_config.backoff_cutoff = (((unsigned long)(timeout_arg / 2)) == 0) ? timeout_arg : (unsigned long)(timeout_arg / 2);
+
+			for (ip = interfaces; ip; ip = ip -> next) {
+				if (ip->client->config->timeout == 60)
+					ip->client->config->timeout = timeout_arg;
+
+				if ((ip->client->config->reboot_timeout == 10) && (ip->client->config->reboot_timeout > ip->client->config->timeout))
+					ip->client->config->reboot_timeout = ip->client->config->timeout;
+
+				if ((ip->client->config->backoff_cutoff == 15) && (ip->client->config->backoff_cutoff > top_level_config.backoff_cutoff))
+					ip->client->config->backoff_cutoff = top_level_config.backoff_cutoff;
+			}
+		}
+
+		if ((dhclient_request_options != 0) && (top_level_config.requested_options != default_requested_options)) {
+			for (ip = interfaces; ip; ip = ip -> next) {
+				if (ip->client->config->requested_options == default_requested_options)
+					ip->client->config->requested_options = top_level_config.requested_options;
+			}
+		}
+
+		free(arg_conf);
+		arg_conf = NULL;
+		arg_conf_len = 0;
+	}
+
 	/* Parse the lease database. */
 	read_client_leases ();
 
@@ -1924,7 +2188,8 @@
 	client -> packet.xid = random ();
 	client -> packet.secs = 0; /* filled in by send_discover. */
 
-	if (can_receive_unicast_unconfigured (client -> interface))
+	if ((!(bootp_broadcast_always || client->config->bootp_broadcast_always))
+	    && can_receive_unicast_unconfigured(client->interface))
 		client -> packet.flags = 0;
 	else
 		client -> packet.flags = htons (BOOTP_BROADCAST);
@@ -2008,7 +2273,9 @@
 	} else {
 		memset (&client -> packet.ciaddr, 0,
 			sizeof client -> packet.ciaddr);
-		if (can_receive_unicast_unconfigured (client -> interface))
+		if ((!(bootp_broadcast_always ||
+		    client ->config->bootp_broadcast_always)) &&
+		    can_receive_unicast_unconfigured (client -> interface))
 			client -> packet.flags = 0;
 		else
 			client -> packet.flags = htons (BOOTP_BROADCAST);
@@ -2067,7 +2334,8 @@
 	client -> packet.hops = 0;
 	client -> packet.xid = client -> xid;
 	client -> packet.secs = 0; /* Filled in by send_request. */
-	if (can_receive_unicast_unconfigured (client -> interface))
+	if ((!(bootp_broadcast_always || client->config-> bootp_broadcast_always))
+	    && can_receive_unicast_unconfigured (client->interface))
 		client -> packet.flags = 0;
 	else
 		client -> packet.flags = htons (BOOTP_BROADCAST);
--- dhcp-3.0.5/client/clparse.c.options	2007-03-29 16:33:14.000000000 -0400
+++ dhcp-3.0.5/client/clparse.c	2007-03-29 16:33:29.000000000 -0400
@@ -81,6 +81,7 @@
 	top_level_config.requested_options = default_requested_options;
 	top_level_config.omapi_port = -1;
 	top_level_config.do_forward_update = 1;
+	top_level_config.bootp_broadcast_always = 0;
 
 	group_allocate (&top_level_config.on_receipt, MDL);
 	if (!top_level_config.on_receipt)
@@ -227,7 +228,8 @@
 	interface-declaration |
 	LEASE client-lease-statement |
 	ALIAS client-lease-statement |
-	KEY key-definition */
+	KEY key-definition |
+	BOOTP_BROADCAST_ALWAYS */
 
 void parse_client_statement (cfile, ip, config)
 	struct parse *cfile;
@@ -549,6 +551,12 @@
 		parse_reject_statement (cfile, config);
 		return;
 
+	      case BOOTP_BROADCAST_ALWAYS:
+		token = next_token(&val, (unsigned*)0, cfile);
+		config -> bootp_broadcast_always = 1;
+		parse_semi (cfile);
+		return;
+
 	      default:
 		lose = 0;
 		stmt = (struct executable_statement *)0;
--- dhcp-3.0.5/common/conflex.c.options	2007-03-29 16:33:14.000000000 -0400
+++ dhcp-3.0.5/common/conflex.c	2007-03-29 16:33:29.000000000 -0400
@@ -599,6 +599,8 @@
 			return BALANCE;
 		if (!strcasecmp (atom + 1, "ound"))
 			return BOUND;
+		if (!strcasecmp (atom + 1, "ootp-broadcast-always"))
+			return BOOTP_BROADCAST_ALWAYS;
 		break;
 	      case 'c':
 		if (!strcasecmp (atom + 1, "ase"))
--- dhcp-3.0.5/includes/dhcpd.h.options	2007-03-29 16:33:14.000000000 -0400
+++ dhcp-3.0.5/includes/dhcpd.h	2007-03-30 15:14:56.000000000 -0400
@@ -767,6 +767,9 @@
 	int do_forward_update;		/* If nonzero, and if we have the
 					   information we need, update the
 					   A record for the address we get. */
+
+	int bootp_broadcast_always;	/* If nonzero, always set the BOOTP_BROADCAST
+					   flag in requests */
 };
 
 /* Per-interface state used in the dhcp client... */
--- dhcp-3.0.5/includes/dhctoken.h.options	2005-09-22 12:19:57.000000000 -0400
+++ dhcp-3.0.5/includes/dhctoken.h	2007-03-29 16:33:29.000000000 -0400
@@ -309,7 +309,8 @@
 	DOMAIN_NAME = 613,
 	DO_FORWARD_UPDATE = 614,
 	KNOWN_CLIENTS = 615,
-	ATSFP = 616
+	ATSFP = 616,
+	BOOTP_BROADCAST_ALWAYS = 616
 };
 
 #define is_identifier(x)	((x) >= FIRST_TOKEN &&	\

dhcp-3.0.5-prototypes.patch:
 dst/dst_api.c              |    4 ++++
 dst/dst_support.c          |    4 ++++
 includes/minires/minires.h |    1 -
 minires/res_comp.c         |    5 +++++
 minires/res_init.c         |    1 +
 minires/res_mkupdate.c     |    4 ++++
 6 files changed, 18 insertions(+), 1 deletion(-)

--- NEW FILE dhcp-3.0.5-prototypes.patch ---
--- dhcp-3.0.5/dst/dst_api.c.prototypes	2007-04-01 16:29:10.000000000 -0400
+++ dhcp-3.0.5/dst/dst_api.c	2007-04-01 16:29:10.000000000 -0400
@@ -58,6 +58,10 @@
 
 #include "dst_internal.h"
 
+/* prototypes */
+extern int b64_pton(char const *src, u_char *target, size_t targsize);
+extern int b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize);
+
 /* static variables */
 static int done_init = 0;
 dst_func *dst_t_func[DST_MAX_ALGS];
--- dhcp-3.0.5/dst/dst_support.c.prototypes	2001-02-22 02:22:08.000000000 -0500
+++ dhcp-3.0.5/dst/dst_support.c	2007-04-01 16:29:10.000000000 -0400
@@ -32,6 +32,10 @@
 
 #include "dst_internal.h"
 
+/* prototypes */
+extern int b64_pton(char const *src, u_char *target, size_t targsize);
+extern int b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize);
+
 /*
  * dst_s_conv_bignum_u8_to_b64
  *	This function converts binary data stored as a u_char[] to a
--- dhcp-3.0.5/includes/minires/minires.h.prototypes	2004-06-10 13:59:37.000000000 -0400
+++ dhcp-3.0.5/includes/minires/minires.h	2007-04-01 16:29:10.000000000 -0400
@@ -65,7 +65,6 @@
 #define res_protocolname MRres_protocolname
 #define res_servicename MRres_servicename
 #define ns_datetosecs MRns_datetosecs
-#define b64_pton MRb64_pton
 #define res_ninit minires_ninit
 #define res_randomid MRres_randomid
 #define res_findzonecut MRres_findzonecut
--- dhcp-3.0.5/minires/res_mkupdate.c.prototypes	2007-04-01 16:29:10.000000000 -0400
+++ dhcp-3.0.5/minires/res_mkupdate.c	2007-04-01 16:30:12.000000000 -0400
@@ -49,6 +49,10 @@
 #include "minires/minires.h"
 #include "arpa/nameser.h"
 
+/* prototypes */
+extern int b64_pton(char const *src, u_char *target, size_t targsize);
+int dn_comp(const char *src, u_char *dst, unsigned dstsiz, u_char **dnptrs, u_char **lastdnptr);
+
 /* Options.  Leave them on. */
 #define DEBUG
 #define MAXPORT 1024
--- dhcp-3.0.5/minires/res_comp.c.prototypes	2004-06-10 13:59:42.000000000 -0400
+++ dhcp-3.0.5/minires/res_comp.c	2007-04-01 16:31:02.000000000 -0400
@@ -91,6 +91,11 @@
 #include "minires/minires.h"
 #include "arpa/nameser.h"
 
+/* prototypes */
+int ns_name_uncompress(const u_char *msg, const u_char *eom, const u_char *src, char *dst, size_t dstsiz);
+int ns_name_compress(const char *src, u_char *dst, size_t dstsiz, const u_char **dnptrs, const u_char **lastdnptr);
+int ns_name_skip(const u_char **ptrptr, const u_char *eom);
+
 /*
  * Expand compressed domain name 'comp_dn' to full domain name.
  * 'msg' is a pointer to the begining of the message,
--- dhcp-3.0.5/minires/res_init.c.prototypes	2004-06-10 13:59:43.000000000 -0400
+++ dhcp-3.0.5/minires/res_init.c	2007-04-01 16:31:38.000000000 -0400
@@ -102,6 +102,7 @@
 #define DEBUG
 
 static void res_setoptions (res_state, const char *, const char *);
+u_int res_randomid(void);
 
 #ifdef RESOLVSORT
 static const char sort_mask[] = "/&";

dhcp-3.0.5-release-by-ifup.patch:
 dhclient.c |   72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 72 insertions(+)

--- NEW FILE dhcp-3.0.5-release-by-ifup.patch ---
--- dhcp-3.0.5/client/dhclient.c.release	2007-03-30 15:30:14.000000000 -0400
+++ dhcp-3.0.5/client/dhclient.c	2007-03-30 15:29:58.000000000 -0400
@@ -366,9 +366,81 @@
 				}
 			}
 			fclose(pidfd);
+		} else {
+			/* handle release for interfaces requested with Red Hat
+			 * /sbin/ifup - pidfile will be /var/run/dhclient-$interface.pid 
+			 */
+
+			if ((path_dhclient_pid == NULL) || (*path_dhclient_pid == '\0'))
+				path_dhclient_pid = "/var/run/dhclient.pid";
+
+			char *new_path_dhclient_pid;
+			struct interface_info *ip;
+			int pdp_len = strlen(path_dhclient_pid), pfx, dpfx;
+
+			/* find append point: beginning of any trailing '.pid'
+			 * or '-$IF.pid' */
+			for (pfx=pdp_len; (pfx >= 0) && (path_dhclient_pid[pfx] != '.') && (path_dhclient_pid[pfx] != '/'); pfx--);
+				if (pfx == -1)
+					pfx = pdp_len;
+
+			if (path_dhclient_pid[pfx] == '/')
+				pfx += 1;
+
+			for (dpfx=pfx; (dpfx >= 0) && (path_dhclient_pid[dpfx] != '-') && (path_dhclient_pid[dpfx] != '/'); dpfx--);
+				if ((dpfx > -1) && (path_dhclient_pid[dpfx] != '/'))
+					pfx = dpfx;                 
+
+			for (ip = interfaces; ip; ip = ip->next) {
+				if (interfaces_requested && (ip->flags & (INTERFACE_REQUESTED)) && (ip->name != NULL)) {
+					int n_len = strlen(ip->name);
+
+					new_path_dhclient_pid = (char*) malloc(pfx + n_len + 6);
+					strncpy(new_path_dhclient_pid, path_dhclient_pid, pfx);
+					sprintf(new_path_dhclient_pid + pfx, "-%s.pid", ip->name);
+
+					if ((pidfd = fopen(new_path_dhclient_pid, "r")) != NULL) {
+						e = fscanf(pidfd, "%ld\n", &temp);
+						oldpid = (pid_t)temp;
+
+						if (e != 0 && e != EOF) {
+							if (oldpid) {
+								if (kill(oldpid, SIGTERM) == 0)
+									unlink(path_dhclient_pid);
+							}
+						}
+
+						fclose(pidfd);
+					}
+
+					free(new_path_dhclient_pid);
+				}
+			}
+		}
+	} else {
+		FILE *pidfp = NULL;
+		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, "%ld", &temp)==1) && ((dhcpid=(pid_t)temp) > 0)) {
+				snprintf(procfn,256,"/proc/%u",dhcpid);
+				dhc_running = (access(procfn, F_OK) == 0);          
+			}
+
+			fclose(pidfp);
+		}
+
+		if (dhc_running) {
+			log_fatal("dhclient(%u) is already running - exiting. ", dhcpid);
+			return(1);
 		}
 	}
 
+	write_client_pid_file();
+
 	if (!quiet) {
 		log_info ("%s %s", message, DHCP_VERSION);
 		log_info (copyright);

dhcp-3.0.5-selinux.patch:
 dhclient.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE dhcp-3.0.5-selinux.patch ---
--- dhcp-3.0.5/client/dhclient.c.selinux	2007-03-30 16:11:54.000000000 -0400
+++ dhcp-3.0.5/client/dhclient.c	2007-03-30 16:12:27.000000000 -0400
@@ -3009,6 +3009,8 @@
 			wstatus = 0;
 		}
 	} else {
+		if (leaseFile)
+			fclose(leaseFile);
 		execve (scriptName, argv, envp);
 		log_error ("execve (%s, ...): %m", scriptName);
 		exit (0);

dhcp-3.0.5-unicast-bootp.patch:
 bootp.c |   10 +++++++++-
 dhcp.c  |   33 ++++++++++++++++++++++++++-------
 2 files changed, 35 insertions(+), 8 deletions(-)

--- NEW FILE dhcp-3.0.5-unicast-bootp.patch ---
--- dhcp-3.0.5/server/bootp.c.unicast	2005-05-18 15:54:17.000000000 -0400
+++ dhcp-3.0.5/server/bootp.c	2007-03-30 16:16:00.000000000 -0400
@@ -62,6 +62,7 @@
 	char msgbuf [1024];
 	int ignorep;
 	int peer_has_leases = 0;
+	int norelay = 0;
 
 	if (packet -> raw -> op != BOOTREQUEST)
 		return;
@@ -77,7 +78,7 @@
 		 ? inet_ntoa (packet -> raw -> giaddr)
 		 : packet -> interface -> name);
 
-	if (!locate_network (packet)) {
+	if ((norelay = locate_network (packet)) == 0) {
 		log_info ("%s: network unknown", msgbuf);
 		return;
 	}
@@ -357,6 +358,13 @@
 					      from, &to, &hto);
 			goto out;
 		}
+	} else if (norelay == 2) {
+		to.sin_addr = raw.ciaddr;
+		to.sin_port = remote_port;
+		if (fallback_interface) {
+			result = send_packet (fallback_interface, (struct packet *)0, &raw, outgoing.packet_length, from, &to, &hto);
+			goto out;
+		}
 
 	/* If it comes from a client that already knows its address
 	   and is not requesting a broadcast response, and we can
--- dhcp-3.0.5/server/dhcp.c.unicast	2007-03-30 16:13:36.000000000 -0400
+++ dhcp-3.0.5/server/dhcp.c	2007-03-30 16:19:35.000000000 -0400
@@ -3817,6 +3817,7 @@
 	struct data_string data;
 	struct subnet *subnet = (struct subnet *)0;
 	struct option_cache *oc;
+	int norelay = 0;
 
 	/* See if there's a subnet selection option. */
 	oc = lookup_option (&dhcp_universe, packet -> options,
@@ -3826,12 +3827,24 @@
 	   from the interface, if there is one.   If not, fail. */
 	if (!oc && !packet -> raw -> giaddr.s_addr) {
 		if (packet -> interface -> shared_network) {
-			shared_network_reference
-				(&packet -> shared_network,
-				 packet -> interface -> shared_network, MDL);
-			return 1;
+			struct in_addr any_addr;
+			any_addr.s_addr = INADDR_ANY;
+
+			if (!packet -> packet_type && memcmp(&packet -> raw -> ciaddr, &any_addr, 4)) {
+				struct iaddr cip;
+				memcpy(cip.iabuf, &packet -> raw -> ciaddr, 4);
+				cip.len = 4;
+				if (!find_grouped_subnet(&subnet, packet->interface->shared_network, cip, MDL))
+					norelay = 2;
+			}
+
+			if (!norelay) {
+				shared_network_reference(&packet -> shared_network, packet -> interface -> shared_network, MDL);
+				return 1;
+			}
+		} else {
+			return 0;
 		}
-		return 0;
 	}
 
 	/* If there's an SSO, and it's valid, use it to figure out the
@@ -3853,7 +3866,10 @@
 		data_string_forget (&data, MDL);
 	} else {
 		ia.len = 4;
-		memcpy (ia.iabuf, &packet -> raw -> giaddr, 4);
+		if (norelay)
+			memcpy (ia.iabuf, &packet->raw->ciaddr, 4);
+		else
+			memcpy (ia.iabuf, &packet->raw->giaddr, 4);
 	}
 
 	/* If we know the subnet on which the IP address lives, use it. */
@@ -3861,7 +3877,10 @@
 		shared_network_reference (&packet -> shared_network,
 					  subnet -> shared_network, MDL);
 		subnet_dereference (&subnet, MDL);
-		return 1;
+		if (norelay)
+			return norelay;
+		else
+			return 1;
 	}
 
 	/* Otherwise, fail. */

dhcp-3.0.5-warnings.patch:
 client/clparse.c       |   15 +--------------
 client/dhclient.c      |   30 ++----------------------------
 common/alloc.c         |   10 ----------
 common/comapi.c        |   26 ++------------------------
 common/discover.c      |    9 +--------
 common/dns.c           |    5 -----
 common/execute.c       |   10 ----------
 common/icmp.c          |    5 -----
 common/inet.c          |    2 +-
 common/lpf.c           |    3 ---
 common/memory.c        |    4 +---
 common/options.c       |   21 +--------------------
 common/parse.c         |   44 ++++++++++++++++----------------------------
 common/print.c         |    2 --
 common/resolv.c        |    5 -----
 common/socket.c        |    2 --
 common/tree.c          |   17 +++--------------
 dhcpctl/callback.c     |    3 ---
 dhcpctl/cltest.c       |    5 ++---
 dhcpctl/dhcpctl.c      |    6 ------
 dhcpctl/omshell.c      |    5 +----
 dhcpctl/remote.c       |    2 --
 dst/dst_api.c          |    3 ++-
 dst/prandom.c          |    2 +-
 minires/res_mkupdate.c |    2 +-
 minires/res_update.c   |    2 +-
 omapip/alloc.c         |    1 -
 omapip/array.c         |    2 --
 omapip/buffer.c        |    3 ---
 omapip/connection.c    |    6 ------
 omapip/convert.c       |    2 +-
 omapip/errwarn.c       |   24 ++++++++++++++++--------
 omapip/generic.c       |    1 -
 omapip/handle.c        |    2 --
 omapip/hash.c          |    3 ---
 omapip/listener.c      |    8 --------
 omapip/message.c       |    4 ----
 omapip/mrtrace.c       |    2 --
 omapip/protocol.c      |    5 -----
 omapip/support.c       |   11 -----------
 omapip/trace.c         |    4 +---
 relay/dhcrelay.c       |    2 +-
 server/confpars.c      |   14 +-------------
 server/db.c            |    5 -----
 server/ddns.c          |    2 --
 server/dhcp.c          |   15 ++-------------
 server/dhcpd.c         |   10 ++++------
 server/failover.c      |   22 +---------------------
 server/mdb.c           |   10 +---------
 server/omapi.c         |   26 +-------------------------
 50 files changed, 65 insertions(+), 359 deletions(-)

--- NEW FILE dhcp-3.0.5-warnings.patch ---
--- dhcp-3.0.5/client/dhclient.c.warnings	2006-08-22 11:13:57.000000000 -0400
+++ dhcp-3.0.5/client/dhclient.c	2007-03-29 14:23:54.000000000 -0400
@@ -95,7 +95,6 @@
 	omapi_object_t *listener;
 	isc_result_t result;
 	int persist = 0;
-	int omapi_port;
 	int no_dhclient_conf = 0;
 	int no_dhclient_db = 0;
 	int no_dhclient_pid = 0;
@@ -634,7 +633,6 @@
 			picked = lp;
 			picked -> next = (struct client_lease *)0;
 		} else {
-		      freeit:
 			destroy_client_lease (lp);
 		}
 	}
@@ -693,7 +691,6 @@
 	struct client_lease *lease;
 	struct option_cache *oc;
 	struct data_string ds;
-	int i;
 	
 	/* If we're not receptive to an offer right now, or if the offer
 	   has an unrecognizable transaction id, then just drop it. */
@@ -845,8 +842,6 @@
 void bind_lease (client)
 	struct client_state *client;
 {
-	struct interface_info *ip = client -> interface;
-
 	/* Remember the medium. */
 	client -> new -> medium = client -> medium;
 
@@ -911,7 +906,6 @@
 	void *cpp;
 {
 	struct client_state *client = cpp;
-	int i;
 	struct option_cache *oc;
 	struct data_string ds;
 
@@ -954,7 +948,6 @@
 	void *cpp;
 {
 	struct client_state *client = cpp;
-	int i;
 
 	/* Cancel all timeouts. */
 	cancel_timeout (state_selecting, client);
@@ -1067,8 +1060,6 @@
 	int i;
 	int stop_selecting;
 	const char *name = packet -> packet_type ? "DHCPOFFER" : "BOOTREPLY";
-	struct iaddrlist *ap;
-	struct option_cache *oc;
 	char obuf [1024];
 	
 #ifdef DEBUG_PACKET
@@ -1886,7 +1877,6 @@
 	struct client_lease *lease;
 {
 	unsigned char discover = DHCPDISCOVER;
-	int i;
 	struct option_state *options = (struct option_state *)0;
 
 	memset (&client -> packet, 0, sizeof (client -> packet));
@@ -1950,9 +1940,6 @@
 	struct client_lease *lease;
 {
 	unsigned char request = DHCPREQUEST;
-	int i, j;
-	unsigned char *tmp, *digest;
-	unsigned char *old_digest_loc;
 	struct option_cache *oc;
 
 	memset (&client -> packet, 0, sizeof (client -> packet));
@@ -2040,7 +2027,6 @@
 	struct client_lease *lease;
 {
 	unsigned char decline = DHCPDECLINE;
-	int i;
 	struct option_cache *oc;
 
 	struct option_state *options = (struct option_state *)0;
@@ -2096,7 +2082,6 @@
 	struct client_lease *lease;
 {
 	unsigned char request = DHCPRELEASE;
-	int i;
 	struct option_cache *oc;
 
 	struct option_state *options = (struct option_state *)0;
@@ -2153,8 +2138,6 @@
 void destroy_client_lease (lease)
 	struct client_lease *lease;
 {
-	int i;
-
 	if (lease -> server_name)
 		dfree (lease -> server_name, MDL);
 	if (lease -> filename)
@@ -2217,8 +2200,6 @@
 {
 	const char *name, *dot;
 	struct data_string ds;
-	int status;
-	struct client_state *client;
 
 	memset (&ds, 0, sizeof ds);
 
@@ -2249,9 +2230,7 @@
 	int i;
 	struct tm *t;
 	static int leases_written;
-	struct option_cache *oc;
 	struct data_string ds;
-	pair *hash;
 	int errors = 0;
 	char *s;
 
@@ -2487,8 +2466,6 @@
 	int i;
 	struct data_string data;
 	struct option_cache *oc;
-	pair *hash;
-	char *s, *t;
 	struct envadd_state es;
 
 	es.client = client;
@@ -2565,11 +2542,9 @@
 int script_go (client)
 	struct client_state *client;
 {
-	int rval;
 	char *scriptName;
 	char *argv [2];
 	char **envp;
-	char *epp [3];
 	char reason [] = "REASON=NBI";
 	static char client_path [] = CLIENT_PATH;
 	int i;
@@ -2645,7 +2620,7 @@
 {
 	char spbuf [1024];
 	char *s;
-	unsigned len, i;
+	unsigned len;
 	struct string_list *val;
 	va_list list;
 
@@ -3071,8 +3046,7 @@
 
 isc_result_t client_dns_update (struct client_state *client, int addp, int ttl)
 {
-	struct data_string ddns_fqdn, ddns_fwd_name,
-	       ddns_dhcid, client_identifier;
+	struct data_string ddns_fwd_name, ddns_dhcid, client_identifier;
 	struct option_cache *oc;
 	int ignorep;
 	int result;
--- dhcp-3.0.5/client/clparse.c.warnings	2006-02-22 17:43:27.000000000 -0500
+++ dhcp-3.0.5/client/clparse.c	2007-03-29 14:24:47.000000000 -0400
@@ -39,8 +39,6 @@
 
 #include "dhcpd.h"
 
-static TIME parsed_time;
-
 struct client_config top_level_config;
 
 u_int32_t default_requested_options [] = {
@@ -62,7 +60,6 @@
 isc_result_t read_client_conf ()
 {
 	struct client_config *config;
-	struct client_state *state;
 	struct interface_info *ip;
 	isc_result_t status;
 
@@ -240,11 +237,9 @@
 	int token;
 	const char *val;
 	struct option *option;
-	struct executable_statement *stmt, **p;
-	enum statement_op op;
+	struct executable_statement *stmt;
 	int lose;
 	char *name;
-	struct data_string key_id;
 	enum policy policy;
 	int known;
 	int tmp, i;
@@ -967,11 +962,9 @@
 {
 	int token;
 	const char *val;
-	char *t, *n;
[...1766 lines suppressed...]
@@ -378,7 +377,6 @@
 isc_result_t dhcp_lease_destroy (omapi_object_t *h, const char *file, int line)
 {
 	struct lease *lease;
-	isc_result_t status;
 
 	if (h -> type != dhcp_type_lease)
 		return ISC_R_INVALIDARG;
@@ -455,7 +453,6 @@
 {
 	struct lease *lease;
 	isc_result_t status;
-	int updatep = 0;
 
 	if (h -> type != dhcp_type_lease)
 		return ISC_R_INVALIDARG;
@@ -876,9 +873,8 @@
 				   omapi_data_string_t *name,
 				   omapi_typed_data_t *value)
 {
-	struct host_decl *host, *hp;
+	struct host_decl *host;
 	isc_result_t status;
-	int foo;
 
 	if (h -> type != dhcp_type_host)
 		return ISC_R_INVALIDARG;
@@ -1137,7 +1133,6 @@
 isc_result_t dhcp_host_destroy (omapi_object_t *h, const char *file, int line)
 {
 	struct host_decl *host;
-	isc_result_t status;
 
 	if (h -> type != dhcp_type_host)
 		return ISC_R_INVALIDARG;
@@ -1558,7 +1553,6 @@
 {
 	struct pool *pool;
 	isc_result_t status;
-	int foo;
 
 	if (h -> type != dhcp_type_pool)
 		return ISC_R_INVALIDARG;
@@ -1604,8 +1598,6 @@
 isc_result_t dhcp_pool_destroy (omapi_object_t *h, const char *file, int line)
 {
 	struct pool *pool;
-	isc_result_t status;
-	struct permit *pc, *pn;
 
 	if (h -> type != dhcp_type_pool)
 		return ISC_R_INVALIDARG;
@@ -1702,10 +1694,6 @@
 isc_result_t dhcp_pool_lookup (omapi_object_t **lp,
 			       omapi_object_t *id, omapi_object_t *ref)
 {
-	omapi_value_t *tv = (omapi_value_t *)0;
-	isc_result_t status;
-	struct pool *pool;
-
 	/* Can't look up pools yet. */
 
 	/* If we get to here without finding a pool, no valid key was
@@ -1734,7 +1722,6 @@
 {
 	struct class *class;
 	isc_result_t status;
-	int foo;
 
 	if (h -> type != dhcp_type_class)
 		return ISC_R_INVALIDARG;
@@ -1780,8 +1767,6 @@
 isc_result_t dhcp_class_destroy (omapi_object_t *h, const char *file, int line)
 {
 	struct class *class;
-	isc_result_t status;
-	int i;
 
 	if (h -> type != dhcp_type_class && h -> type != dhcp_type_subclass)
 		return ISC_R_INVALIDARG;
@@ -1881,10 +1866,6 @@
 isc_result_t dhcp_class_lookup (omapi_object_t **lp,
 				omapi_object_t *id, omapi_object_t *ref)
 {
-	omapi_value_t *tv = (omapi_value_t *)0;
-	isc_result_t status;
-	struct class *class;
-
 	/* Can't look up classs yet. */
 
 	/* If we get to here without finding a class, no valid key was
@@ -1913,7 +1894,6 @@
 {
 	struct subclass *subclass;
 	isc_result_t status;
-	int foo;
 
 	if (h -> type != dhcp_type_subclass)
 		return ISC_R_INVALIDARG;
@@ -2008,10 +1988,6 @@
 isc_result_t dhcp_subclass_lookup (omapi_object_t **lp,
 				   omapi_object_t *id, omapi_object_t *ref)
 {
-	omapi_value_t *tv = (omapi_value_t *)0;
-	isc_result_t status;
-	struct subclass *subclass;
-
 	/* Can't look up subclasss yet. */
 
 	/* If we get to here without finding a subclass, no valid key was
--- dhcp-3.0.5/server/mdb.c.warnings	2006-07-18 14:16:25.000000000 -0400
+++ dhcp-3.0.5/server/mdb.c	2007-03-29 14:21:32.000000000 -0400
@@ -238,7 +238,6 @@
 	struct host_decl *hp = (struct host_decl *)0;
 	struct host_decl *np = (struct host_decl *)0;
 	struct host_decl *foo;
-	struct executable_statement *esp;
 	int hw_head = 0, uid_head = 1;
 
 	/* Don't need to do it twice. */
@@ -373,7 +372,6 @@
 			 const unsigned char *haddr, unsigned hlen,
 			 const char *file, int line)
 {
-	struct host_decl *foo;
 	struct hardware h;
 
 	h.hlen = hlen + 1;
@@ -403,7 +401,6 @@
 			   struct iaddr *addr, struct shared_network *share)
 {
 	int i;
-	struct subnet *subnet;
 	struct iaddr ip_address;
 	struct host_decl *hp;
 	struct data_string fixed_addr;
@@ -453,12 +450,11 @@
 	struct pool *pool;
 	struct lease **lpchain;
 {
-	struct lease *address_range, *lp, *plp;
+	struct lease *address_range;
 	struct iaddr net;
 	unsigned min, max, i;
 	char lowbuf [16], highbuf [16], netbuf [16];
 	struct shared_network *share = subnet -> shared_network;
-	isc_result_t status;
 	struct lease *lt = (struct lease *)0;
 
 	/* All subnets should have attached shared network structures. */
@@ -745,7 +741,6 @@
 	struct lease *lease;
 {
 	struct lease *comp = (struct lease *)0;
-	isc_result_t status;
 
 	if (find_lease_by_ip_addr (&comp, lease -> ip_addr, MDL)) {
 		if (!comp -> pool) {
@@ -795,7 +790,6 @@
 	int enter_uid = 0;
 	int enter_hwaddr = 0;
 	struct lease *lp, **lq, *prev;
-	TIME lp_next_state;
 
 #if defined (FAILOVER_PROTOCOL)
 	/* We must commit leases before sending updates regarding them
@@ -1475,7 +1469,6 @@
 	void *vpool;
 {
 	struct pool *pool;
-	struct lease *lt = (struct lease *)0;
 	struct lease *next = (struct lease *)0;
 	struct lease *lease = (struct lease *)0;
 	struct lease **lptr [5];
@@ -2013,7 +2006,6 @@
 {
 	struct shared_network *s;
 	struct pool *p;
-	struct hash_bucket *hb;
 	int i;
 	struct lease *l;
 	struct lease **lptr [5];
--- dhcp-3.0.5/server/ddns.c.warnings	2005-03-03 11:55:24.000000000 -0500
+++ dhcp-3.0.5/server/ddns.c	2007-03-29 14:21:51.000000000 -0400
@@ -224,7 +224,6 @@
 	struct data_string ddns_fwd_name;
 	struct data_string ddns_rev_name;
 	struct data_string ddns_dhcid;
-	unsigned len;
 	struct data_string d1;
 	struct option_cache *oc;
 	int s1, s2;
@@ -659,7 +658,6 @@
 	struct data_string ddns_rev_name;
 	struct data_string ddns_dhcid;
 	isc_result_t rcode;
-	struct binding *binding;
 	int result = 0;
 	int client_updated = 0;
 


--- NEW FILE dhcp4client.h ---
/* dhcp4client.h
 *
 *  Interface to the ISC dhcp IPv4 client libdhcp4client library.
 *
 *
 *  Copyright(C) Jason Vas Dias <jvdias at redhat.com> Red Hat Inc. May 2006
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation at 
 *           http://www.fsf.org/licensing/licenses/gpl.txt
 *  and included in this software distribution as the "LICENSE" file.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 */

/* include libdhcp_control.h or libdhcp.h for this */
struct libdhcp_control_s;

/* The ISC IPv4 DHCP client main() function */
extern int dhcpv4_client(struct libdhcp_control_s *dhc_ctl,
                         int argc, char **argv, char **envp);


--- NEW FILE dhcpd-conf-to-ldap ---
#!/usr/bin/perl -w

# Brian Masney <masneyb at ntelos.net>
# To use this script, set your base DN below. Then run 
# ./dhcpd-conf-to-ldap.pl < /path-to-dhcpd-conf/dhcpd.conf > output-file
# The output of this script will generate entries in LDIF format. You can use
# the slapadd command to add these entries into your LDAP server. You will
# definately want to double check that your LDAP entries are correct before
# you load them into LDAP.

# This script does not do much error checking. Make sure before you run this
# that the DHCP server doesn't give any errors about your config file

use Sys::Hostname;

my $basedn = "dc=ntelos, dc=net";

sub next_token
{
  local ($lowercase) = @_;
  local ($token, $newline);

  do 
    {
      if (!defined ($line) || length ($line) == 0)
        {
          $line = <>;
          return undef if !defined ($line);
          chop $line;
          $line_number++;
          $token_number = 0;
        }

      $line =~ s/#.*//;
      $line =~ s/^\s+//;
      $line =~ s/\s+$//;
    }
  while (length ($line) == 0);

  if (($token, $newline) = $line =~ /^(.*?)\s+(.*)/)
    {
      $line = $newline;
    }
  else
    {
      $token = $line;
      $line = '';
    }
  $token_number++;

  $token =~ y/[A-Z]/[a-z]/ if $lowercase;

  return ($token);
}


sub remaining_line
{
  local ($tmp, $str);

  $str = "";
  while (($tmp = next_token (0)))
    {
      $str .= ' ' if !($str eq "");
      $str .= $tmp;
      last if $tmp =~ /;\s*$/;
    }

  $str =~ s/;$//;
  return ($str);
}


sub
add_dn_to_stack
{
  local ($dn) = @_;

  $current_dn = "$dn, $current_dn";
}


sub
remove_dn_from_stack
{
  $current_dn =~ s/^.*?,\s*//;
}


sub
parse_error
{
  print "Parse error on line number $line_number at token number $token_number\n";
  exit (1);
}


sub
print_entry
{
  return if (scalar keys %curentry == 0);

  if (!defined ($curentry{'type'}))
    {
      $host = hostname ();
      $hostdn = "cn=$host, $basedn";
      print "dn: $hostdn\n";
      print "objectClass: top\n";
      print "objectClass: dhcpServer\n";
      print "cn: $host\n";
      print "dhcpServiceDN: $current_dn\n\n";

      print "dn: $current_dn\n";
      print "cn: DHCP Config\n";
      print "objectClass: top\n";
      print "objectClass: dhcpService\n";
      if (defined ($curentry{'options'}))
        {
          print "objectClass: dhcpOptions\n";
        }
      print "dhcpPrimaryDN: $hostdn\n";
    }
  elsif ($curentry{'type'} eq 'subnet')
    {
      print "dn: $current_dn\n";
      print "cn: " . $curentry{'ip'} . "\n";
      print "objectClass: top\n";
      print "objectClass: dhcpSubnet\n";
      if (defined ($curentry{'options'}))
        {
          print "objectClass: dhcpOptions\n";
        }
      
      print "dhcpNetMask: " . $curentry{'netmask'} . "\n";
      if (defined ($curentry{'range'}))
        {
          print "dhcpRange: " . $curentry{'range'} . "\n";
        }
    }
  elsif ($curentry{'type'} eq 'shared-network')
    {
      print "dn: $current_dn\n";
      print "cn: " . $curentry{'descr'} . "\n";
      print "objectClass: top\n";
      print "objectClass: dhcpSharedNetwork\n";
      if (defined ($curentry{'options'}))
        {
          print "objectClass: dhcpOptions\n";
        }
    }
  elsif ($curentry{'type'} eq 'group')
    {
      print "dn: $current_dn\n";
      print "cn: group\n";
      print "objectClass: top\n";
      print "objectClass: dhcpGroup\n";
      if (defined ($curentry{'options'}))
        {
          print "objectClass: dhcpOptions\n";
        }
    }
  elsif ($curentry{'type'} eq 'host')
    {
      print "dn: $current_dn\n";
      print "cn: " . $curentry{'host'} . "\n";
      print "objectClass: top\n";
      print "objectClass: dhcpHost\n";
      if (defined ($curentry{'options'}))
        {
          print "objectClass: dhcpOptions\n";
        }

      if (defined ($curentry{'hwaddress'}))
        {
          print "dhcpHWAddress: " . $curentry{'hwaddress'} . "\n";
        }
    }
  elsif ($curentry{'type'} eq 'pool')
    {
      print "dn: $current_dn\n";
      print "cn: pool\n";
      print "objectClass: top\n";
      print "objectClass: dhcpPool\n";
      if (defined ($curentry{'options'}))
        {
          print "objectClass: dhcpOptions\n";
        }

      if (defined ($curentry{'range'}))
        {
          print "dhcpRange: " . $curentry{'range'} . "\n";
        }
    }
  elsif ($curentry{'type'} eq 'class')
    {
      print "dn: $current_dn\n";
      print "cn: " . $curentry{'class'} . "\n";
      print "objectClass: top\n";
      print "objectClass: dhcpClass\n";
      if (defined ($curentry{'options'}))
        {
          print "objectClass: dhcpOptions\n";
        }
    }
  elsif ($curentry{'type'} eq 'subclass')
    {
      print "dn: $current_dn\n";
      print "cn: " . $curentry{'subclass'} . "\n";
      print "objectClass: top\n";
      print "objectClass: dhcpSubClass\n";
      if (defined ($curentry{'options'}))
        {
          print "objectClass: dhcpOptions\n";
        }
      print "dhcpClassData: " . $curentry{'class'} . "\n";
    }

  if (defined ($curentry{'statements'}))
    {
      foreach $statement (@{$curentry{'statements'}})
        {
          print "dhcpStatements: $statement\n";
        }
    }

  if (defined ($curentry{'options'}))
    {
      foreach $statement (@{$curentry{'options'}})
        {
          print "dhcpOption: $statement\n";
        }
    }

  print "\n";
  undef (%curentry);
}


sub parse_netmask
{
  local ($netmask) = @_;
  local ($i);

  if ((($a, $b, $c, $d) = $netmask =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/) != 4)
    {
      parse_error ();
    }

  $num = (($a & 0xff) << 24) |
         (($b & 0xff) << 16) |
         (($c & 0xff) << 8) |
          ($d & 0xff);

  for ($i=1; $i<=32 && $num & (1 << (32 - $i)); $i++)
    {
    }
  $i--;

  return ($i);
}


sub parse_subnet
{
  local ($ip, $tmp, $netmask);

  print_entry () if %curentry;
    
  $ip = next_token (0);
  parse_error () if !defined ($ip);

  $tmp = next_token (1);
  parse_error () if !defined ($tmp);
  parse_error () if !($tmp eq 'netmask');

  $tmp = next_token (0);
  parse_error () if !defined ($tmp);
  $netmask = parse_netmask ($tmp);

  $tmp = next_token (0);
  parse_error () if !defined ($tmp);
  parse_error () if !($tmp eq '{');

  add_dn_to_stack ("cn=$ip");
  $curentry{'type'} = 'subnet';
  $curentry{'ip'} = $ip;
  $curentry{'netmask'} = $netmask;
}


sub parse_shared_network
{
  local ($descr, $tmp);

  print_entry () if %curentry;

  $descr = next_token (0);
  parse_error () if !defined ($descr);

  $tmp = next_token (0);
  parse_error () if !defined ($tmp);
  parse_error () if !($tmp eq '{');

  add_dn_to_stack ("cn=$descr");
  $curentry{'type'} = 'shared-network';
  $curentry{'descr'} = $descr;
}


sub parse_host
{
  local ($descr, $tmp);

  print_entry () if %curentry;

  $host = next_token (0);
  parse_error () if !defined ($host);

  $tmp = next_token (0);
  parse_error () if !defined ($tmp);
  parse_error () if !($tmp eq '{');

  add_dn_to_stack ("cn=$host");
  $curentry{'type'} = 'host';
  $curentry{'host'} = $host;
}


sub parse_group
{
  local ($descr, $tmp);

  print_entry () if %curentry;

  $tmp = next_token (0);
  parse_error () if !defined ($tmp);
  parse_error () if !($tmp eq '{');

  add_dn_to_stack ("cn=group");
  $curentry{'type'} = 'group';
}


sub parse_pool
{
  local ($descr, $tmp);

  print_entry () if %curentry;

  $tmp = next_token (0);
  parse_error () if !defined ($tmp);
  parse_error () if !($tmp eq '{');

  add_dn_to_stack ("cn=pool");
  $curentry{'type'} = 'pool';
}


sub parse_class
{
  local ($descr, $tmp);

  print_entry () if %curentry;

  $class = next_token (0);
  parse_error () if !defined ($class);

  $tmp = next_token (0);
  parse_error () if !defined ($tmp);
  parse_error () if !($tmp eq '{');

  $class =~ s/\"//g;
  add_dn_to_stack ("cn=$class");
  $curentry{'type'} = 'class';
  $curentry{'class'} = $class;
}


sub parse_subclass
{
  local ($descr, $tmp);

  print_entry () if %curentry;

  $class = next_token (0);
  parse_error () if !defined ($class);

  $subclass = next_token (0);
  parse_error () if !defined ($subclass);

  $tmp = next_token (0);
  parse_error () if !defined ($tmp);
  parse_error () if !($tmp eq '{');

  add_dn_to_stack ("cn=$subclass");
  $curentry{'type'} = 'subclass';
  $curentry{'class'} = $class;
  $curentry{'subclass'} = $subclass;
}


sub parse_hwaddress
{
  local ($type, $hw, $tmp);

  $type = next_token (0);
  parse_error () if !defined ($type);

  $hw = next_token (0);
  parse_error () if !defined ($hw);
  $hw =~ s/;$//;

  $curentry{'hwaddress'} = "$type $hw";
}

    
sub parse_range
{
  local ($tmp, $str);

  $str = remaining_line ();

  if (!($str eq ''))
    {
      $str =~ s/;$//;
      $curentry{'range'} = $str;
    }
}


sub parse_statement
{
  local ($token) = shift;
  local ($str);

  if ($token eq 'option')
    {
      $str = remaining_line ();
      push (@{$curentry{'options'}}, $str);
    }
  else
    {
      $str = $token . " " . remaining_line ();
      push (@{$curentry{'statements'}}, $str);
    }
}


my $token;
my $token_number = 0;
my $line_number = 0;
my %curentry;

$current_dn = "cn=DHCP Config, $basedn";
$curentry{'descr'} = 'DHCP Config';
$line = '';

while (($token = next_token (1)))
  {
    if ($token eq '}')
      {
        print_entry () if %curentry;
        remove_dn_from_stack ();
      }
    elsif ($token eq 'subnet')
      {
        parse_subnet ();
        next;
      }
    elsif ($token eq 'shared-network')
      {
        parse_shared_network ();
        next;
      }
    elsif ($token eq 'class')
      {
        parse_class ();
        next;
      }
    elsif ($token eq 'subclass')
      {
        parse_subclass ();
        next;
      }
    elsif ($token eq 'pool')
      {
        parse_pool ();
        next;
      }
    elsif ($token eq 'group')
      {
        parse_group ();
        next;
      }
    elsif ($token eq 'host')
      {
        parse_host ();
        next;
      }
    elsif ($token eq 'hardware')
      {
        parse_hwaddress ();
        next;
      }
    elsif ($token eq 'range')
      {
        parse_range ();
        next;
      }
    else
      {
        parse_statement ($token);
        next;
      }
  }




--- NEW FILE libdhcp_control.h ---
/* libdhcp_control.h
 *
 *  DHCP client control API for libdhcp, a minimal interface to the
 *  ISC dhcp IPv4 client libdhcp4client library,
 *  and to the dhcpv6 DHCPv6 client libdhcp6client library.
 *
 *  Each DHCP client library must include this file to be controlled
 *  by libdhcp.
 *
 *  Copyright(C) Jason Vas Dias <jvdias at redhat.com> Red Hat Inc. May 2006
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation at 
 *           http://www.fsf.org/licensing/licenses/gpl.txt
 *  and included in this software distribution as the "LICENSE" file.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 */
#ifndef LIBDHCP_CONTROL_H
#define LIBDHCP_CONTROL_H

#include <stdint.h>

#define  LOG_FATAL 8

typedef enum dhcp_state_e {
    /* DHCPv4 client states
     * third callback arg will be a 'struct client_state *'
     */
    DHC4_NBI,     /* failed: no broadcast interfaces found              */
    DHC4_PREINIT, /* configuration started - bring the interface "UP"   */
    DHC4_BOUND,   /* lease obtained                                     */
    DHC4_RENEW,   /* lease renewed                                      */
    DHC4_REBOOT,  /* have valid lease, but now obtained a different one */
    DHC4_REBIND,  /* new, different lease                               */
    DHC4_STOP,    /* remove old lease                                   */
    DHC4_MEDIUM,  /* media selection begun                              */
    DHC4_TIMEOUT, /* timed out contacting DHCP server                   */
    DHC4_FAIL,    /* all attempts to contact server timed out, sleeping */
    DHC4_EXPIRE,  /* lease has expired, renewing                        */
    DHC4_RELEASE, /* releasing lease                                    */

    /* This state raised by both clients: */
    DHC_TIMEDOUT, /* libdhcp_control timeout has been exceeded          */

    /* DHCPv6 client states:    */
    DHC6_BOUND,   /* new lease obtained             - arg is optinfo *  */
    DHC6_REBIND,  /* existing expired lease rebound - arg is optinfo *  */
    DHC6_RELEASE  /* existing lease expired         - arg is dhcp6_iaidaddr*/
} DHCP_State;

struct libdhcp_control_s;

/* ala syslog(3): LOG_EMERG=0 - LOG_DEBUG=7 (+ LOG_FATAL=8 : finished -> 1) */
typedef int (*LIBDHCP_Error_Handler) (struct libdhcp_control_s *ctl,
                                      int priority, const char *fmt,
                                      va_list ap);

/* The DHCP clients will call the users' callback on important state change
 * events, with the second arg set to the client DHCP_State, and the third
 * arg set to a client specific pointer as described below. */
typedef int (*LIBDHCP_Callback) (struct libdhcp_control_s *control,
                                 enum dhcp_state_e, void*);

typedef struct libdhcp_control_s {
    /* the DHCP clients' main loop calls this on state changes */
    LIBDHCP_Callback callback;

    /* LIBDHCP_Capability bits to enable */
    uint16_t capability;

    /* set to one to make clients exit their main loop */
    uint8_t finished;

    /* set to one to decline the lease (DHCPv4 only) */
    uint8_t decline;

    /* (timeout+now) == time after which clients MUST return */
    time_t timeout;

    /* clients set this to time(0) on entering main loop */
    time_t now;

    /* user data pointer */
    void *arg;
    LIBDHCP_Error_Handler eh;
} LIBDHCP_Control;

/* DHCP client "capabilities" */
typedef enum libdhcp_capability_e {
    /* use / do not use persistent lease database files */
    DHCP_USE_LEASE_DATABASE = 1,

    /* use / do not use pid file */
    DHCP_USE_PID_FILE = 2,

    /*
     * DHCPv6 supports these capabilities in process, 
     * while the DHCPv4 client will fork and exec the dhclient-script to
     * implement them if these bits are set - otherwise, if no bits are set,
     * the callback is called and the script is not run.
     */
    /* configure interfaces UP/DOWN as required */
    DHCP_CONFIGURE_INTERFACES = 4,

    /* configure interface addresses as required */
    DHCP_CONFIGURE_ADDRESSES = 8,

    /* configure routes as required */
    DHCP_CONFIGURE_ROUTES = 16,

    /* configure resolv.conf as required */
    DHCP_CONFIGURE_RESOLVER = 32,

    /* DHCPv6 only: */
    /* configure radvd.conf & restart radvd as required */
    DHCP_CONFIGURE_RADVD = 64,
} LIBDHCP_Capability;

#endif


--- NEW FILE linux ---
#!/bin/bash
# dhclient-script for Linux. Dan Halbert, March, 1997.
# Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
# No guarantees about this. I'm a novice at the details of Linux
# networking.

# Notes:

# 0. This script is based on the netbsd script supplied with dhcp-970306.

# 1. ifconfig down apparently deletes all relevant routes and flushes
# the arp cache, so this doesn't need to be done explicitly.

# 2. The alias address handling here has not been tested AT ALL.
# I'm just going by the doc of modern Linux ip aliasing, which uses
# notations like eth0:0, eth0:1, for each alias.

# 3. I have to calculate the network address, and calculate the broadcast
# address if it is not supplied. This might be much more easily done
# by the dhclient C code, and passed on.

if [ -n "${dhc_dbus}" ]; then
   /bin/dbus-send \
       --system \
       --dest=com.redhat.dhcp \
       --type=method_call \
       /com/redhat/dhcp/$interface \
       com.redhat.dhcp.set \
       'string:'"`env | /bin/egrep -v '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`";
       if (( ( dhc_dbus & 31 ) == 31 )); then
	   exit 0;
       fi;
fi;

function save_previous() {
  if [ -e $1 ]; then
    /bin/mv $1 $1.predhclient
  else
    echo ''> $1.predhclient 
  fi
}

make_resolv_conf() {
  if [ "${PEERDNS}" == "no" ]; then  
      return 
  fi

  if [ x$reason == xRENEW ] &&
     [ "$new_domain_name" == "$old_domain_name" ] && 
     [ "$new_domain_name_servers" == "$old_domain_name_servers" ]; then
      return;
  fi

  if [ -n "$new_domain_name" ] || [ -n "$new_domain_name_servers" ]; then
    cp -fp /etc/resolv.conf /etc/resolv.conf.predhclient
    rscf=`mktemp /tmp/XXXXXX`;
    echo '; generated by /sbin/dhclient-script' > $rscf
    if [ -n "$SEARCH" ]; then
 	echo search $SEARCH >> $rscf
    else
	if [ -n "$new_domain_name" ]; then
 	    echo search $new_domain_name >> $rscf
        fi
    fi
    for nameserver in $new_domain_name_servers; do
      echo nameserver $nameserver >> $rscf
    done
    change_resolv_conf $rscf
    rm -f $rscf
  fi
}

# Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
exit_with_hooks() {
  exit_status=$1
  if [ -f /etc/dhclient-exit-hooks ]; then
    . /etc/dhclient-exit-hooks
  fi
# probably should do something with exit status of the local script
  exit $exit_status
}

# Invoke the local dhcp client enter hooks, if they exist.
if [ -f /etc/dhclient-enter-hooks ]; then
  exit_status=0
  . /etc/dhclient-enter-hooks
  # allow the local script to abort processing of this state
  # local script must set exit_status variable to nonzero.
  if [ $exit_status -ne 0 ]; then
    exit $exit_status
  fi
fi

# Import Red Hat Linux configuration
cd /etc/sysconfig/network-scripts;
. /etc/sysconfig/network-scripts/network-functions
. /etc/rc.d/init.d/functions

[ -f ../network ] && . ../network
[ -f ../networking/network ] && . ../networking/network

CONFIG=$interface

need_config ${CONFIG}

if [ -f "${CONFIG}" ]; then 
    source_config
else
    echo $"$0: configuration for $interface not found. Continuing with defaults." >&2
fi

source_config

release=`uname -r`
relmajor=`echo $release |/bin/cut -f1 -d'.'`
relminor=`echo $release |/bin/cut -f2 -d'.'`

# simple IP arithmetic functions:

function quad2num()
{
    if [ $# -eq 4 ]; then
       let n="$1<<24|$2<<16|$3<<8|$4"
       echo $n;
       return 0;
    fi
    echo '0';
    return 1;
}

function ip2num()
{
    IFS='.' quad2num $1;
}

function num2ip()
{
    let n="$1";
    let o1='(n>>24)&0xff';
    let o2='(n>>16)&0xff';
    let o3='(n>>8)&0xff';
    let o4='n & 0xff';
    echo $o1.$o2.$o3.$o4;
}

function mask()
{   
    ip=$1
    m=$2
    let ip=`IFS='.' ip2num $ip`;
    let m=`IFS='.' ip2num $m`;
    let n='ip&m';
    num2ip $n;
}

function mask_bits()
{
    ip=$1
    let ip=`IFS='.' ip2num $ip`;
    let bits=0
    for ((bit=1; '((ip&bit)==0) && (bits < 32)'; 'bit<<=1')) do
        let bits+=1
    done
    let n_bits=32-bits
    echo $n_bits
}

function class_bits()
{
    let ip=`IFS='.' ip2num $1`;
    let bits=32
    let mask='255';
    for ((i=0; i <= 3; i++, 'mask<<=8')); do
	let v='ip&mask';
	if [ "$v" -eq 0 ] ; then
	    let bits-=8;
        else
            break;
	fi;
    done;
    echo $bits;
}

function routerReachable()
{ # Handle silly DHCP servers that give us a router not on our subnet:    
    router=$1
    routerSubnet=`mask $router $new_subnet_mask`
    mySubnet=`mask $new_ip_address $new_subnet_mask`
    unreachable=0
    if [ "$routerSubnet" != "$mySubnet" ]; then
	unreachable=1
	if /sbin/arping -f -q -I $interface -w2 $router; then
	    /sbin/ip route add ${router}/32 dev $interface
	    if [ $? -eq 0 ]; then
		unreachable=0
	    else
		/usr/bin/logger -p local7.notice -t "NET"  "dhclient: failed to create host route for unreachable router $router not on subnet $mySubnet";
	    fi
	else
	    unreachable=1
	    if [ -x /usr/bin/logger ]; then
		/usr/bin/logger -p local7.notice -t "NET"  "dhclient: DHCP router $router is unreachable on DHCP subnet $mySubnet router subnet $routerSubnet";
	    fi;
	fi;
    fi;
    return $unreachable;
}

function add_default_gateway()
{
    router=$1
    metric=''
    if [ $# -gt 1 ] && [ "$2" -gt 0 ]; then 
	metric="metric $2";
    fi;    
    if routerReachable $router ; then
	/sbin/ip route replace default via $router dev $interface $metric;
	if [ $? -ne 0 ]; then 
	    /usr/bin/logger -p local7.notice -t "NET"  'dhclient: failed to create default route: '$router dev $interface $metric;
	    return 1;
	else
	    return 0;
	fi;
    fi;
    return 1;
}

function dhconfig()
{
    if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
	if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
		[ x$alias_ip_address != x$old_ip_address ]; then
         # Possible new alias. Remove old alias.
	    ifconfig $interface:0- inet 0
	fi

	if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
        # IP address changed. Bringing down the interface will delete all routes,
        # and clear the ARP cache.
	    ifconfig $interface inet 0 down
	fi
    fi
    if [ x$reason = xBOUND ] || [ x$reason = xREBOOT ] ||
       [ x$old_ip_address  != x$new_ip_address ] ||
       [ x$old_subnet_mask != x$new_subnet_mask ] ||
       [ x$new_network_number != x$new_network_number ] ||
       [ x$old_broadcast_address != x$new_broadcast_address ] ||
       [ "x$old_routers" != "x$new_routers" ] ||
       [ x$old_interface_mtu != x$new_interface_mtu ] ; then
	if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
	    ifconfig $interface inet $new_ip_address $new_subnet_arg \
		$new_broadcast_arg
	    if [ -n "$new_interface_mtu" ]; then
		/sbin/ip link set $interface mtu $new_interface_mtu;
	    fi;
	    if [ -x /etc/dhclient-${interface}-up-hooks ]; then
		. /etc/dhclient-${interface}-up-hooks;
	    elif [ -x /etc/dhclient-up-hooks ]; then
		. /etc/dhclient-up-hooks;
	    fi;
	fi;
	
	if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 4 ) != 4 )); then
	    prefix_bits=`mask_bits $new_subnet_mask`
            # Add a network route to the computed network address.
	    if [ $relmajor -lt 2 ] || \
		( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
		/sbin/ip route replace ${new_network_number}/${prefix_bits} dev $interface
		if [ $added_old_broadcast_route -eq 1 ]; then
		   /sbin/ip route del default;
		fi;
	    fi;
	    if [[  ( ( -z "$GATEWAYDEV" )  || ( "$GATEWAYDEV" = "$interface" ) ) && ( ( -z "$GATEWAY" )  || ( ( -n "$DHCLIENT_IGNORE_GATEWAY" ) && ( "$DHCLIENT_IGNORE_GATEWAY" = [Yy]* ) ) ) ]]; then
		metric=${METRIC:-''};
		let i=${METRIC:-0};
		default_routers=()
		for router in $new_routers; do
		    added_router=0
		    for r in ${default_routers[@]}; do
			if [ "$r" == "$router" ]; then
			    added_router=1;
                        fi;
		    done
		    if [ -z "$router" ] || [ "$added_router" -eq 1 ] || [ `IFS=. ip2num $router` -le 0 ] || [[ ( "$router" = "$new_broadcast_address" ) && ( "$new_subnet_mask" != "255.255.255.255" ) ]]; then
			continue;
		    fi;
		    default_routers=(${default_routers[@]} $router)
		    add_default_gateway $router $metric;		    
		    let i=i+1;
		    metric=$i; 
		done
	    elif [[ ( ( -z "$GATEWAYDEV" ) || ( "$GATEWAYDEV" = "$interface" ) ) && ( -n "$GATEWAY" ) ]]; then
		routerSubnet=`mask $GATEWAY $new_subnet_mask`
		mySubnet=`mask $new_ip_address $new_subnet_mask`
		if [ "$routerSubnet" = "$mySubnet" ]; then
		    /sbin/ip route replace default via $GATEWAY dev $interface 
		fi;
	    fi;
            # static routes
	    if [ "x$new_static_routes" != x ]; then
		IFS=', 	' static_routes=($new_static_routes)
		route_targets=()
		for((i=0; i<${#static_routes[@]}; i+=2)); do
		    target=${static_routes[$i]}
		    gateway=${static_routes[$i+1]}
		    metric=''
		    for t in ${route_targets[@]}; do
			if [ $t == $target ]; then
			    if [ -z "$metric" ]; then
				metric=1;
			    else
				((metric=metric+1));
			    fi;
			fi;
		    done;
		    if [ -n "$metric" ]; then
			metric="metric $metric";
		    fi;		    
		    if routerReachable $gateway; then
			/sbin/ip route replace ${target}/`class_bits $target` via ${gateway} dev $interface ${metric}
			if [ $? -ne 0 ]; then
			   /usr/bin/logger -p local7.notice -t 'NET' 'dhclient: failed to create static route:' ${target}/`class_bits $target` via ${gateway} dev $interface ${metric};			
			else			    
 			   route_targets=(${route_targets[@]} $target);
			fi;
		    fi;
		done
	    fi
	fi
    fi
    if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
	if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
	    then
	    ifconfig $interface:0- inet 0
	    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
	    /sbin/ip route replace ${alias_ip_address}/32 dev $interface:0
	fi
    fi
    if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 1 ) != 1 )); then
	make_resolv_conf

	if [ -n "$new_host_name" ] && need_hostname; then
	    hostname $new_host_name
	fi
    fi;
    if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 8 ) != 8 )); then
	if [ "${PEERNIS}" = no ]; then
	    :
	elif [ -n "$new_nis_domain" ]; then
	    domainname "$new_nis_domain"
	    save_previous /etc/yp.conf
	    let contents=0
	    echo '# generated by /sbin/dhclient-script' > /etc/yp.conf
	    if [ -n "$new_nis_servers" ]; then
		for I in $new_nis_servers; do
		    echo "domain $new_nis_domain server $I" >> /etc/yp.conf
		    let contents=contents+1
		done
	    else
		echo "domain $new_nis_domain broadcast" >> /etc/yp.conf
		let contents=contents+1
	    fi
	    level=`/sbin/runlevel`
	    level=${level##*\ }
	    if [ "$level" = "unknown" ]; then
		level=1;
	    fi
	    if [ $contents -gt 0 ] && [[ "$level" = [0-6] ]] && /sbin/chkconfig --level=$level ypbind >/dev/null 2>&1 && [ -r /var/run/ypbind.pid ] && yppid=`cat /var/run/ypbind.pid` && [ -d /proc/${yppid} ] && [ "`if [ -x /sbin/busybox ]; then /sbin/busybox readlink /proc/${yppid}/exe; else echo /sbin/ypbind; fi`" = "/sbin/ypbind" ]; then
	       kill -HUP $yppid;
	    fi
	elif [ -n "$new_nis_servers" ]; then
	    save_previous /etc/yp.conf
	    echo '# generated by /sbin/dhclient-script' > /etc/yp.conf
	    let contents=0
	    for I in $new_nis_servers; do
		echo "ypserver $I" >> /etc/yp.conf
		let contents=contents+1
	    done
	    level=`/sbin/runlevel`
	    level=${level##*\ }
	    if [ "$level" = "unknown" ]; then
		level=1;
	    fi
	    if [ $contents -gt 0 ] && [[ "$level" = [0-6] ]] && /sbin/chkconfig --level=$level ypbind >/dev/null 2>&1 && [ -r /var/run/ypbind.pid ] && yppid=`cat /var/run/ypbind.pid` && [ -d /proc/${yppid} ] && [ "`if [ -x /sbin/busybox ]; then /sbin/busybox readlink /proc/${yppid}/exe; else echo /sbin/ypbind; fi`" = "/sbin/ypbind" ] ; then
	       kill -HUP $yppid;
	    fi
	fi
    fi
    if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 16 ) != 16 )); then
	if [ -n "$DHCP_TIME_OFFSET_SETS_TIMEZONE" ] && [[ "$DHCP_TIME_OFFSET_SETS_TIMEZONE" = [yY1]* ]]; then
	    if [ -n "$new_time_offset" ]; then
	    #   DHCP option "time-offset" is requested by default and should be handled.
	    #   The geographical zone abbreviation cannot be determined from the GMT offset,
	    #   but the $ZONEINFO/Etc/GMT$offset file can be used - note: this disables DST.
		((z=new_time_offset/3600));
		((hoursWest=`printf '%+d' $z`))
		if (( $hoursWest < 0 )); then
		   # tzdata treats negative 'hours west' as positive 'gmtoff' !
		   ((hoursWest*=-1));
		fi
		tzfile=/usr/share/zoneinfo/Etc/GMT`printf '%+d' $hoursWest`;
		if [ -e $tzfile ]; then
		    /bin/mv -f /etc/localtime /etc/localtime.predhclient;
		    /bin/cp -fp $tzfile /etc/localtime;
		    /bin/touch /etc/localtime;
		fi;
	    fi;
	fi;
	if [ "${PEERNTP}" = no ]; then
	    :
	elif [ -n "$new_ntp_servers" ] && [ -e /etc/ntp.conf ]; then
	    save_previous /etc/ntp.conf
	    /bin/egrep -v '(^[\ \	]*(server|fudge))|(generated by /sbin/dhclient-script)'< /etc/ntp.conf.predhclient > /etc/ntp.conf
	    echo '# servers generated by /sbin/dhclient-script' >> /etc/ntp.conf
	    localClocks=(`/bin/egrep '^[\ \	]*server[\ \	]+127\.127' /etc/ntp.conf.predhclient | while read s addr rest; do echo $addr; done`)      
	    localClockFudge="`/bin/egrep '^[\ \	]*fudge[\ \	]+127\.127' /etc/ntp.conf.predhclient`";
	    for s in $new_ntp_servers ${localClocks[@]};
	      do
	      echo 'server '$s >> /etc/ntp.conf;
	    done
	    echo "$localClockFudge" >> /etc/ntp.conf;
	    if [ -x /usr/bin/diff ] && /usr/bin/diff -q /etc/ntp.conf /etc/ntp.conf.predhclient >/dev/null 2>&1; then
		: ;
	    else
		/sbin/service ntpd condrestart >/dev/null 2>&1
	    fi;
	fi
    fi;
}

if [ x$new_broadcast_address != x ] && [ x$new_subnet_mask != x ] && [ "$new_subnet_mask" != "255.255.255.255" ]; then
  new_broadcast_arg="broadcast $new_broadcast_address"
fi
if [ x$old_broadcast_address != x ]; then
  old_broadcast_arg="broadcast $old_broadcast_address"
fi
if [ x$new_subnet_mask != x ]; then
  new_subnet_arg="netmask $new_subnet_mask"
fi
if [ x$old_subnet_mask != x ]; then
  old_subnet_arg="netmask $old_subnet_mask"
fi
if [ x$alias_subnet_mask != x ]; then
  alias_subnet_arg="netmask $alias_subnet_mask"
fi

if [ x$reason = xMEDIUM ]; then
  # Linux doesn't do mediums (ok, ok, media).
  exit_with_hooks 0
fi

added_old_broadcast_route=0;
if [ x$reason = xPREINIT ]; then
    if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
	if [ x$alias_ip_address != x ]; then
    # Bring down alias interface. Its routes will disappear too.
	    ifconfig $interface:0- inet 0
	fi
	if [ x$keep_old_ip = xyes ]; then
	    ifconfig $interface up
	elif [ $relmajor -lt 2 ] || ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] )   then
	    ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \
		broadcast 255.255.255.255 up
    # Add route to make broadcast work. Do not omit netmask.
	    /sbin/ip route replace default dev $interface && added_old_broadcast_route=1;
	else
	    ifconfig $interface 0 up
	fi     

  # We need to give the kernel some time to get the interface up.
  #	sleep 1
  # I don't think this is necessary with modern kernels - no problems found during testing -
  # JVD, 2005-06-17
	# but just in case:
	if [ -n "$DHCLIENT_DELAY" ] && [ "$DHCLIENT_DELAY" -gt 0 ] ; then
	    sleep $DHCLIENT_DELAY;
	fi;
	exit_with_hooks 0
    fi;
fi

if [ x$reason = xARPCHECK ] || [ x$reason = xARPSEND ]; then
    if [ -z "$new_ip_address" ] || [ -z "$interface" ] ||  /sbin/arping -q -f -c 2 -w 3 -D -I ${interface} ${new_ip_address}; then
	exit_with_hooks 0
    else
	exit_with_hooks 1
    fi;
fi
  
if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
   [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then    
    dhconfig ;
    exit_with_hooks 0
fi

if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \
   || [ x$reason = xSTOP ]; then
  if [ -f /etc/resolv.conf.predhclient ]; then
     change_resolv_conf /etc/resolv.conf.predhclient
     rm -f /etc/resolv.conf.predhclient
  fi
  if [ -n "$DHCP_TIME_OFFSET_SETS_TIMEZONE" ] && [[ "$DHCP_TIME_OFFSET_SETS_TIMEZONE" = [yY1]* ]]; then
      if [ -e /etc/localtime.predhclient ]; then
	  /bin/rm -f /etc/localtime
	  /bin/mv -f /etc/localtime.predhclient /etc/localtime;
	  /bin/touch /etc/localtime;
      fi;
  fi;
  if [ -f /etc/ntp.conf.predhclient ]; then
     /bin/rm -f /etc/ntp.conf
     /bin/mv -f /etc/ntp.conf.predhclient /etc/ntp.conf
     service ntpd condrestart >/dev/null 2>&1 
  fi
  if [ -f /etc/yp.conf.predhclient ]; then
     /bin/rm -f /etc/yp.conf
     /bin/mv -f /etc/yp.conf.predhclient /etc/yp.conf
     level=`/sbin/runlevel`
     level=${level##*\ }
     if [ "$level" = "unknown" ]; then
	 level=1;
     fi
     if [[ "$level" = [0-6] ]] && /sbin/chkconfig --level=$level ypbind >/dev/null 2>&1 && [ -r /var/run/ypbind.pid ] && yppid=`cat /var/run/ypbind.pid` && [ -d /proc/${yppid} ] && [ "`if [ -x /sbin/busybox ]; then /sbin/busybox readlink /proc/${yppid}/exe; else echo /sbin/ypbind; fi`" = "/sbin/ypbind" ] ; then
	 kill -HUP $yppid;
     fi
  fi 
  if [ -x /etc/dhclient-${interface}-down-hooks ]; then
      . /etc/dhclient-${interface}-down-hooks;
  elif [ -x /etc/dhclient-down-hooks ]; then
      . /etc/dhclient-down-hooks;
  fi;
  if [ x$alias_ip_address != x ]; then
    # Turn off alias interface.
    ifconfig $interface:0- inet 0
  fi
  if [ x$old_ip_address != x ]; then
    # Shut down interface, which will delete routes and clear arp cache.
    ifconfig $interface inet 0 down
  fi
  if [ x$alias_ip_address != x ]; then
    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
    /sbin/ip route replace ${alias_ip_address}/32 $interface:0
  fi
  exit_with_hooks 0
fi

if [ x$reason = xTIMEOUT ] && [ "x$new_routers" != 'x' ]; then
    if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
	if [ x$alias_ip_address != x ]; then
	    ifconfig $interface:0- inet 0
	fi
	ifconfig $interface inet $new_ip_address $new_subnet_arg \
					$new_broadcast_arg
    fi;
    set $new_routers
    if ping -q -c 1 -w 10 -I $interface $1; then
	dhconfig ;
	exit_with_hooks 0
    fi
    if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
	ifconfig $interface inet 0 down
    fi;
    exit_with_hooks 1
elif [ x$reason = xTIMEOUT ]; then
  exit_with_hooks 1
fi
exit_with_hooks 0

dhcp-3.0.5-extended-new-option-info.patch:
 client/dhclient.8 |    8 ++++++
 client/dhclient.c |   64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 common/parse.c    |    4 +++
 common/tables.c   |   32 +++++++++++++++++++++++++++
 includes/dhcpd.h  |    7 +++++
 5 files changed, 115 insertions(+)

Index: dhcp-3.0.5-extended-new-option-info.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0.5-extended-new-option-info.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dhcp-3.0.5-extended-new-option-info.patch	5 Mar 2007 16:02:22 -0000	1.3
+++ dhcp-3.0.5-extended-new-option-info.patch	1 Apr 2007 20:52:27 -0000	1.4
@@ -1,5 +1,5 @@
---- dhcp-3.0.5/client/dhclient.c.enoi	2006-08-22 11:13:57.000000000 -0400
-+++ dhcp-3.0.5/client/dhclient.c	2007-03-04 15:19:43.000000000 -0500
+--- dhcp-3.0.5/client/dhclient.c.enoi	2007-03-30 16:27:32.000000000 -0400
++++ dhcp-3.0.5/client/dhclient.c	2007-03-30 16:27:51.000000000 -0400
 @@ -74,6 +74,9 @@
  int onetry=0;
  int quiet=0;
@@ -10,7 +10,7 @@
  
  static void usage PROTO ((void));
  
-@@ -204,6 +207,11 @@
+@@ -203,6 +206,11 @@
  		} else if (!strcmp (argv [i], "--version")) {
  			log_info ("isc-dhclient-%s", DHCP_VERSION);
  			exit (0);
@@ -22,7 +22,7 @@
   		} else if (argv [i][0] == '-') {
   		    usage ();
  		} else {
-@@ -476,7 +484,11 @@
+@@ -475,7 +483,11 @@
  	log_info (arr);
  	log_info (url);
  
@@ -34,7 +34,7 @@
  		   "[-s server]");
  	log_error ("                [-cf config-file] [-lf lease-file]%s",
  		   "[-pf pid-file] [-e VAR=val]");
-@@ -2447,8 +2459,30 @@
+@@ -2426,8 +2438,30 @@
  struct envadd_state {
  	struct client_state *client;
  	const char *prefix;
@@ -65,7 +65,7 @@
  void client_option_envadd (struct option_cache *oc,
  			   struct packet *packet, struct lease *lease,
  			   struct client_state *client_state,
-@@ -2465,6 +2499,28 @@
+@@ -2444,6 +2478,28 @@
  				   in_options, cfg_options, scope, oc, MDL)) {
  		if (data.len) {
  			char name [256];
@@ -94,7 +94,15 @@
  			if (dhcp_option_ev_name (name, sizeof name,
  						 oc -> option)) {
  				client_envadd (es -> client, es -> prefix,
-@@ -2704,7 +2760,14 @@
+@@ -2470,6 +2526,7 @@
+ 
+ 	es.client = client;
+ 	es.prefix = prefix;
++	es.universe = NULL;
+ 
+ 	client_envadd (client,
+ 		       prefix, "ip_address", "%s", piaddr (lease -> address));
+@@ -2679,7 +2736,14 @@
  			s = option -> name;
  			if (j + 1 == buflen)
  				return 0;
@@ -110,7 +118,7 @@
  		++i;
  	} while (i != 2);
 --- dhcp-3.0.5/client/dhclient.8.enoi	2005-09-14 12:03:33.000000000 -0400
-+++ dhcp-3.0.5/client/dhclient.8	2007-03-04 15:19:43.000000000 -0500
++++ dhcp-3.0.5/client/dhclient.8	2007-03-30 16:27:32.000000000 -0400
 @@ -82,6 +82,9 @@
  .B -w
  ]
@@ -133,9 +141,9 @@
  .SH CONFIGURATION
  The syntax of the dhclient.conf(5) file is discussed separately.
  .SH OMAPI
---- dhcp-3.0.5/common/parse.c.enoi	2006-02-22 17:43:27.000000000 -0500
-+++ dhcp-3.0.5/common/parse.c	2007-03-04 15:19:43.000000000 -0500
-@@ -1271,6 +1271,10 @@
+--- dhcp-3.0.5/common/parse.c.enoi	2007-03-30 16:27:32.000000000 -0400
++++ dhcp-3.0.5/common/parse.c	2007-03-30 16:27:32.000000000 -0400
+@@ -1266,6 +1266,10 @@
  	option_hash_add (option -> universe -> hash,
  			 (const char *)option -> name,
  			 0, option, MDL);
@@ -147,7 +155,7 @@
  }
  
 --- dhcp-3.0.5/common/tables.c.enoi	2006-02-22 17:43:27.000000000 -0500
-+++ dhcp-3.0.5/common/tables.c	2007-03-04 15:19:43.000000000 -0500
++++ dhcp-3.0.5/common/tables.c	2007-03-30 16:27:32.000000000 -0400
 @@ -1250,3 +1250,35 @@
  			   fqdn_universe.name, 0,
  			   &fqdn_universe, MDL);
@@ -185,7 +193,7 @@
 +}
 +#endif
 --- dhcp-3.0.5/includes/dhcpd.h.enoi	2006-05-17 16:16:59.000000000 -0400
-+++ dhcp-3.0.5/includes/dhcpd.h	2007-03-04 15:19:43.000000000 -0500
++++ dhcp-3.0.5/includes/dhcpd.h	2007-03-30 16:27:32.000000000 -0400
 @@ -1811,6 +1811,13 @@
  void initialize_common_option_spaces PROTO ((void));
  struct universe *config_universe;

dhcp-3.0.5-ldap-configuration.patch:
 common/conflex.c     |   46 +-
 common/print.c       |    6 
 includes/dhcpd.h     |   50 ++
 includes/site.h      |   10 
 server/Makefile.dist |    6 
 server/class.c       |   17 
 server/confpars.c    |   12 
 server/dhcpd.c       |    3 
 server/ldap.c        | 1142 +++++++++++++++++++++++++++++++++++++++++++++++++++
 server/mdb.c         |    6 
 server/stables.c     |   23 +
 11 files changed, 1295 insertions(+), 26 deletions(-)

Index: dhcp-3.0.5-ldap-configuration.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0.5-ldap-configuration.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dhcp-3.0.5-ldap-configuration.patch	5 Mar 2007 22:51:29 -0000	1.5
+++ dhcp-3.0.5-ldap-configuration.patch	1 Apr 2007 20:52:27 -0000	1.6
@@ -1,5 +1,5 @@
---- dhcp-3.0.5/common/conflex.c.ldapconf	2007-03-04 15:32:24.000000000 -0500
-+++ dhcp-3.0.5/common/conflex.c	2007-03-04 15:32:24.000000000 -0500
+--- dhcp-3.0.5/common/conflex.c.ldap	2006-02-22 17:43:27.000000000 -0500
++++ dhcp-3.0.5/common/conflex.c	2007-03-29 15:11:19.000000000 -0400
 @@ -47,6 +47,7 @@
  static enum dhcp_token read_number PROTO ((int, struct parse *));
  static enum dhcp_token read_num_or_name PROTO ((int, struct parse *));
@@ -46,7 +46,7 @@
  	} else {
  		c = cfile -> inbuf [cfile -> bufix];
  		cfile -> bufix++;
-@@ -1130,3 +1124,25 @@
+@@ -1128,3 +1122,25 @@
  	}
  	return dfv;
  }
@@ -72,8 +72,8 @@
 +	return c;
 +}
 +
---- dhcp-3.0.5/common/print.c.ldapconf	2007-03-04 15:32:24.000000000 -0500
-+++ dhcp-3.0.5/common/print.c	2007-03-04 15:32:24.000000000 -0500
+--- dhcp-3.0.5/common/print.c.ldap	2007-03-29 15:10:26.000000000 -0400
++++ dhcp-3.0.5/common/print.c	2007-03-29 15:11:19.000000000 -0400
 @@ -166,9 +166,9 @@
  }
  
@@ -87,8 +87,8 @@
  {
  	static char habuf [49];
  	char *s;
---- dhcp-3.0.5/includes/dhcpd.h.ldapconf	2007-03-04 15:32:24.000000000 -0500
-+++ dhcp-3.0.5/includes/dhcpd.h	2007-03-04 15:32:24.000000000 -0500
+--- dhcp-3.0.5/includes/dhcpd.h.ldap	2007-03-29 15:10:26.000000000 -0400
++++ dhcp-3.0.5/includes/dhcpd.h	2007-03-29 15:11:19.000000000 -0400
 @@ -79,6 +79,11 @@
  #include <isc-dhcp/result.h>
  #include <omapip/omapip_p.h>
@@ -154,7 +154,7 @@
  #if !defined (DEFAULT_DEFAULT_LEASE_TIME)
  # define DEFAULT_DEFAULT_LEASE_TIME 43200
  #endif
-@@ -1526,7 +1563,7 @@
+@@ -1531,7 +1568,7 @@
  char *quotify_string (const char *, const char *, int);
  char *quotify_buf (const unsigned char *, unsigned, const char *, int);
  char *print_base64 (const unsigned char *, unsigned, const char *, int);
@@ -163,7 +163,7 @@
  void print_lease PROTO ((struct lease *));
  void dump_raw PROTO ((const unsigned char *, unsigned));
  void dump_packet_option (struct option_cache *, struct packet *,
-@@ -2640,3 +2677,14 @@
+@@ -2639,3 +2676,14 @@
  #endif /* FAILOVER_PROTOCOL */
  
  const char *binding_state_print (enum failover_state);
@@ -178,8 +178,8 @@
 +			   struct data_string *);
 +#endif
 +
---- dhcp-3.0.5/includes/site.h.ldapconf	2002-03-12 13:33:39.000000000 -0500
-+++ dhcp-3.0.5/includes/site.h	2007-03-04 15:32:24.000000000 -0500
+--- dhcp-3.0.5/includes/site.h.ldap	2002-03-12 13:33:39.000000000 -0500
++++ dhcp-3.0.5/includes/site.h	2007-03-29 15:11:19.000000000 -0400
 @@ -177,3 +177,13 @@
     traces. */
  
@@ -194,8 +194,8 @@
 +#define _PATH_DHCLIENT_DB "/var/lib/dhclient/dhclient.leases"
 +#define _PATH_DHCPD_DB    "/var/lib/dhcpd/dhcpd.leases"
 +#define _PATH_DHCLIENT_DB "/var/lib/dhclient/dhclient.leases"
---- dhcp-3.0.5/server/Makefile.dist.ldapconf	2004-06-10 13:59:50.000000000 -0400
-+++ dhcp-3.0.5/server/Makefile.dist	2007-03-04 15:33:01.000000000 -0500
+--- dhcp-3.0.5/server/Makefile.dist.ldap	2004-06-10 13:59:50.000000000 -0400
++++ dhcp-3.0.5/server/Makefile.dist	2007-03-29 15:11:19.000000000 -0400
 @@ -25,9 +25,9 @@
  CATMANPAGES = dhcpd.cat8 dhcpd.conf.cat5 dhcpd.leases.cat5
  SEDMANPAGES = dhcpd.man8 dhcpd.conf.man5 dhcpd.leases.man5
@@ -216,8 +216,8 @@
 +	$(CC) $(LFLAGS) -o dhcpd $(OBJS) $(DHCPLIB) $(LIBS) -lldap
  
  # Dependencies (semi-automatically-generated)
---- dhcp-3.0.5/server/class.c.ldapconf	2004-06-10 13:59:51.000000000 -0400
-+++ dhcp-3.0.5/server/class.c	2007-03-04 15:32:24.000000000 -0500
+--- dhcp-3.0.5/server/class.c.ldap	2004-06-10 13:59:51.000000000 -0400
++++ dhcp-3.0.5/server/class.c	2007-03-29 15:11:19.000000000 -0400
 @@ -90,6 +90,7 @@
  	int matched = 0;
  	int status;
@@ -249,8 +249,8 @@
  #if defined (DEBUG_CLASS_MATCHING)
  					log_info ("matches subclass %s.",
  					      print_hex_1 (data.len,
---- dhcp-3.0.5/server/confpars.c.ldapconf	2007-03-04 15:32:24.000000000 -0500
-+++ dhcp-3.0.5/server/confpars.c	2007-03-04 15:32:24.000000000 -0500
+--- dhcp-3.0.5/server/confpars.c.ldap	2007-03-29 15:10:26.000000000 -0400
++++ dhcp-3.0.5/server/confpars.c	2007-03-29 15:11:19.000000000 -0400
 @@ -63,7 +63,17 @@
  
  isc_result_t readconf ()
@@ -270,8 +270,8 @@
  }
  
  isc_result_t read_conf_file (const char *filename, struct group *group,
---- dhcp-3.0.5/server/dhcpd.c.ldapconf	2007-03-04 15:32:24.000000000 -0500
-+++ dhcp-3.0.5/server/dhcpd.c	2007-03-04 15:32:24.000000000 -0500
+--- dhcp-3.0.5/server/dhcpd.c.ldap	2007-03-29 15:10:26.000000000 -0400
++++ dhcp-3.0.5/server/dhcpd.c	2007-03-29 15:11:19.000000000 -0400
 @@ -433,6 +433,9 @@
  	/* Add the ddns update style enumeration prior to parsing. */
  	add_enumeration (&ddns_styles);
@@ -282,8 +282,8 @@
  
  	if (!group_allocate (&root_group, MDL))
  		log_fatal ("Can't allocate root group!");
---- /dev/null	2007-03-03 18:04:36.394738328 -0500
-+++ dhcp-3.0.5/server/ldap.c	2007-03-04 15:32:24.000000000 -0500
+--- /dev/null	2007-03-29 11:34:09.579686084 -0400
++++ dhcp-3.0.5/server/ldap.c	2007-03-29 15:11:19.000000000 -0400
 @@ -0,0 +1,1142 @@
 +/* ldap.c
 +
@@ -1427,8 +1427,8 @@
 +
 +#endif
 +
---- dhcp-3.0.5/server/mdb.c.ldapconf	2007-03-04 15:32:24.000000000 -0500
-+++ dhcp-3.0.5/server/mdb.c	2007-03-04 15:32:24.000000000 -0500
+--- dhcp-3.0.5/server/mdb.c.ldap	2007-03-29 15:10:26.000000000 -0400
++++ dhcp-3.0.5/server/mdb.c	2007-03-29 15:11:19.000000000 -0400
 @@ -373,6 +373,12 @@
  			 const char *file, int line)
  {
@@ -1442,8 +1442,8 @@
  
  	h.hlen = hlen + 1;
  	h.hbuf [0] = htype;
---- dhcp-3.0.5/server/stables.c.ldapconf	2004-06-10 13:59:58.000000000 -0400
-+++ dhcp-3.0.5/server/stables.c	2007-03-04 15:32:24.000000000 -0500
+--- dhcp-3.0.5/server/stables.c.ldap	2004-06-10 13:59:58.000000000 -0400
++++ dhcp-3.0.5/server/stables.c	2007-03-29 15:11:19.000000000 -0400
 @@ -483,12 +483,21 @@
  	{ "log-facility", "Nsyslog-facilities.",	&server_universe, 44 },
  	{ "do-forward-updates", "f",			&server_universe, 45 },

dhcp-3.0.5-libdhcp4client.patch:
 Makefile.dist     |    2 
 client/dhclient.c |  254 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 common/alloc.c    |    4 
 common/discover.c |   13 ++
 common/dispatch.c |  167 ++++++++++++++++++++++++++++++++++-
 common/options.c  |    1 
 common/tree.c     |    3 
 configure         |    2 
 dst/hmac_link.c   |   30 +++++-
 includes/dhcpd.h  |    9 -
 omapip/alloc.c    |   34 +++++++
 omapip/dispatch.c |    2 
 omapip/errwarn.c  |   46 ++++++++-
 13 files changed, 541 insertions(+), 26 deletions(-)

Index: dhcp-3.0.5-libdhcp4client.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0.5-libdhcp4client.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dhcp-3.0.5-libdhcp4client.patch	9 Feb 2007 02:40:12 -0000	1.10
+++ dhcp-3.0.5-libdhcp4client.patch	1 Apr 2007 20:52:27 -0000	1.11
@@ -1,139 +1,114 @@
---- dhcp-3.0.5/client/dhclient.c.libdhcp4client	2007-02-08 21:01:16.000000000 -0500
-+++ dhcp-3.0.5/client/dhclient.c	2007-02-08 21:22:14.000000000 -0500
-@@ -78,7 +78,9 @@
- int extended_option_environment = 0;
+--- dhcp-3.0.5/client/dhclient.c.libdhcp4client	2007-03-30 20:54:06.000000000 -0400
++++ dhcp-3.0.5/client/dhclient.c	2007-03-30 20:54:34.000000000 -0400
+@@ -85,16 +85,52 @@
  #endif
  int bootp_broadcast_always = 0;
--
+ 
 +#ifdef LIBDHCP
-+FILE *leaseFile=0;
++FILE *leaseFile = NULL;
 +#endif
++
+ extern u_int32_t default_requested_options[];
+ 
  static void usage PROTO ((void));
  
  void do_release(struct client_state *);
-@@ -89,10 +91,58 @@
  
- extern u_int32_t default_requested_options[];
- 
--int main (argc, argv, envp)
 +#ifdef LIBDHCP
 +#include "libdhcp_control.h"
 +LIBDHCP_Control *libdhcp_control;
 +static void libdhcp_dispatch(void)
 +{
-+    struct timeval tv={0,0}, *tvp;
-+    isc_result_t status;
++	struct timeval tv = { 0, 0 }, *tvp;
++	isc_result_t status;
 +
-+    /* Wait for a packet, or a timeout, or libdhcp being finished */
-+    do {
-+	tvp = process_outstanding_timeouts (&tv);	
-+	status = omapi_one_dispatch (0, tvp);
-+	if ( libdhcp_control 
-+	   &&( (status == ISC_R_TIMEDOUT)
-+	     ||(libdhcp_control->timeout
-+	       &&( time(0L) >= 
-+	           ( libdhcp_control->timeout 
-+	            +libdhcp_control->now
-+	           )
-+	         )
-+	       )
-+	     )
-+	   )
-+	{
-+	    if( libdhcp_control -> callback )
-+		libdhcp_control -> callback
-+		    ( libdhcp_control, DHC_TIMEDOUT, 0L );
-+	    break;
-+	}
-+    } while 
-+      ( (status != ISC_R_TIMEDOUT) 
-+      &&( (!libdhcp_control)
-+        ||(!(libdhcp_control->finished))
-+	)
-+      );
++	/* Wait for a packet, or a timeout, or libdhcp being finished */
++	do {
++		tvp = process_outstanding_timeouts(&tv);
++		status = omapi_one_dispatch(0, tvp);
++
++		if (libdhcp_control && ((status == ISC_R_TIMEDOUT) || (libdhcp_control->timeout && (time(NULL) >= (libdhcp_control->timeout + libdhcp_control->now))))) {
++			if (libdhcp_control->callback)
++				libdhcp_control->callback(libdhcp_control, DHC_TIMEDOUT, NULL);
++
++			break;
++		}
++	} while ((status != ISC_R_TIMEDOUT) && ((!libdhcp_control) || (!(libdhcp_control->finished))));
 +}
 +
 +extern void omapi_free_all_pointers(void);
++
 +__attribute__ ((visibility ("default")))
-+int dhcpv4_client
-+(libdhcp_ctl, argc, argv, envp)
-+LIBDHCP_Control *libdhcp_ctl;
++int dhcpv4_client (libdhcp_ctl, argc, argv, envp)
++	LIBDHCP_Control *libdhcp_ctl;
 +#else
-+int main
-+(argc, argv, envp)
+ int main (argc, argv, envp)
 +#endif
  	int argc;
  	char **argv, **envp;
  {
 +#ifdef LIBDHCP
-+        libdhcp_control = libdhcp_ctl;
++	libdhcp_control = libdhcp_ctl;
 +#endif
  	int i;
  	struct servent *ent;
  	struct interface_info *ip;
-@@ -118,7 +168,7 @@
- 	int timeout_arg = 0;
- 	char *arg_conf = 0L;
- 	int arg_conf_len=0;
--
+@@ -122,6 +158,7 @@
+ 	char *arg_conf = NULL;
+ 	int arg_conf_len = 0;
+ 
 +#ifndef LIBDHCP
  	/* Make sure we have stdin, stdout and stderr. */
  	i = open ("/dev/null", O_RDWR);
  	if (i == 0)
-@@ -139,7 +189,7 @@
+@@ -142,6 +179,7 @@
  #if !(defined (DEBUG) || defined (SYSLOG_4_2) || defined (__CYGWIN32__))
  	setlogmask (LOG_UPTO (LOG_INFO));
  #endif	
--
 +#endif
+ 
  	/* Set up the OMAPI. */
  	status = omapi_init ();
- 	if (status != ISC_R_SUCCESS)
-@@ -468,9 +518,12 @@
- 		log_fatal("dhclient(%u) is already running - exiting. ", dhcpid);
- 		return(1);
- 	    }	    
--	}	
-+	}
+@@ -439,8 +477,12 @@
+ 		}
+ 	}
+ 
 +#ifdef LIBDHCP
-+	if ( libdhcp_control && (libdhcp_control->capability & DHCP_USE_PID_FILE) )
++	if (libdhcp_control && (libdhcp_control->capability & DHCP_USE_PID_FILE))
 +#endif
  	write_client_pid_file();
--
+ 
 +#ifndef LIBDHCP
  	if (!quiet) {
  		log_info ("%s %s", message, DHCP_VERSION);
  		log_info (copyright);
-@@ -479,7 +532,7 @@
+@@ -449,6 +491,7 @@
  		log_info ("%s", "");
  	} else
  		log_perror = 0;
--
 +#endif
+ 
  	/* If we're given a relay agent address to insert, for testing
  	   purposes, figure out what it is. */
- 	if (relay) {
-@@ -766,12 +819,18 @@
- 		arg_conf_len = 0L;
+@@ -683,11 +726,17 @@
+ 		arg_conf_len = 0;
  	}
- 		
+ 
 +#ifdef LIBDHCP
-+	if ( libdhcp_control && (libdhcp_control->capability & DHCP_USE_LEASE_DATABASE))
-+	{
++	if (libdhcp_control && (libdhcp_control->capability & DHCP_USE_LEASE_DATABASE)) {
 +#endif
  	/* Parse the lease database. */
  	read_client_leases ();
  
  	/* Rewrite the lease database... */
  	rewrite_client_leases ();
--
 +#ifdef LIBDHCP
 +	}
 +#endif
+ 
  	/* XXX */
  /* 	config_counter(&snd_counter, &rcv_counter); */
- 
-@@ -789,7 +848,7 @@
+@@ -706,7 +755,7 @@
  		if (!persist) {
  			/* Nothing more to do. */
  			log_info ("No broadcast interfaces found - exiting.");
@@ -142,50 +117,53 @@
  		}
  	} else if (!release_mode) {
  		/* Call the script with the list of interfaces. */
-@@ -884,7 +943,7 @@
- 	dmalloc_longterm = dmalloc_outstanding;
+@@ -800,6 +849,7 @@
  	dmalloc_outstanding = 0;
  #endif
--
+ 
 +#ifndef LIBDHCP
  	/* If we're not supposed to wait before getting the address,
  	   don't. */
  	if (nowait)
-@@ -897,7 +956,125 @@
+@@ -812,6 +862,128 @@
  
  	/* Start dispatching packets and timeouts... */
  	dispatch ();
 +#else
-+	if (  libdhcp_control )
-+	{
-+	   if ( libdhcp_control->timeout ) 
-+	       libdhcp_control->now = time(0L);
-+	   else
-+	       libdhcp_control->now = 0;
++	if (libdhcp_control) {
++		if (libdhcp_control->timeout)
++			libdhcp_control->now = time(NULL);
++		else
++			libdhcp_control->now = 0;
 +	}
++
 +	libdhcp_dispatch();
- 
++
 +	/* libdhcp is finished with us. */
 +
 +	/* close all file descriptors:  */
-+	for (ip = interfaces; ip; ip = ip -> next) {
-+	    shutdown( ip -> wfdesc, SHUT_RDWR );
-+	    close(ip -> wfdesc);
-+	    if( ip -> rfdesc != ip -> wfdesc )
-+		close(ip -> rfdesc);
++	for (ip = interfaces; ip; ip = ip->next) {
++		shutdown(ip->wfdesc, SHUT_RDWR);
++		close(ip->wfdesc);
++
++		if (ip->rfdesc != ip->wfdesc)
++			close(ip->rfdesc);
 +	}
-+	if( fallback_interface != 0 )
-+	{
-+	    ip = fallback_interface;
-+	    shutdown( ip -> wfdesc, SHUT_RDWR );
-+	    close(ip -> wfdesc);
-+	    if( ip -> rfdesc != ip -> wfdesc )
-+		close(ip -> rfdesc);
++
++	if (fallback_interface != 0) {
++		ip = fallback_interface;
++		shutdown(ip->wfdesc, SHUT_RDWR);
++		close(ip->wfdesc);
++
++		if (ip->rfdesc != ip->wfdesc)
++			close(ip->rfdesc);
 +	}
++
 +	if (leaseFile)
-+	    fclose (leaseFile);
++		fclose (leaseFile);
++
 +	closelog();
-+	
++
 +	char *current_pid_file = _PATH_DHCLIENT_PID;
 +
 +	/* Free ALL allocated memory: */
@@ -199,143 +177,140 @@
 +	dhcp_max_agent_option_packet_length = 0;
 +	extended_option_environment = 0;
 +	iaddr_any.len = 4;
-+	memset(&(iaddr_any.iabuf[0]),'\0',4);
++	memset(&(iaddr_any.iabuf[0]), '\0', 4);
 +	iaddr_broadcast.len = 4;
-+	memset(&(iaddr_broadcast.iabuf[0]),0xff,4);
++	memset(&(iaddr_broadcast.iabuf[0]), 0xff, 4);
 +	interfaces_requested = 0;
 +	leaseFile = 0;
 +
 +	libdhcp_control = 0;
-+	
++
 +	local_port = 0;
-+	no_daemon=0;
-+	nowait=0;
-+	onetry=0;
-+	quiet=0;
++	no_daemon = 0;
++	nowait = 0;
++	onetry = 0;
++	quiet = 0;
 +	max_lease_time = 86400;
 +	path_dhclient_conf = _PATH_DHCLIENT_CONF;
-+	path_dhclient_db = _PATH_DHCLIENT_DB;	
++	path_dhclient_db = _PATH_DHCLIENT_DB;
 +	path_dhclient_pid = _PATH_DHCLIENT_PID;
 +	strcpy(&(path_dhclient_script_array[0]), _PATH_DHCLIENT_SCRIPT);
 +	path_dhclient_script = path_dhclient_script_array;
 +	remote_port = 0;
 +	resolver_inited = 0;
 +	new_option_info_tree = 0;
-+	log_isc_blurb = 0;
 +	log_perror = 1;
-+	global_scope = 0L;
-+	root_group = 0L;
-+	group_name_hash = 0L;
-+	interfaces = 0L;
-+	dummy_interfaces = 0L;
-+	fallback_interface = 0L;
-+extern int have_setup_fallback;
-+        have_setup_fallback=0;
-+	quiet_interface_discovery=1;
++	global_scope = NULL;
++	root_group = NULL;
++	group_name_hash = NULL;
++	interfaces = NULL;
++	dummy_interfaces = NULL;
++	fallback_interface = NULL;
++	extern int have_setup_fallback;
++	have_setup_fallback = 0;
++	quiet_interface_discovery = 1;
 +#ifndef LIBDHCP
-+	timeouts = 0L;
++	timeouts = NULL;
 +#endif
-+	dhcp_type_interface=0L;
-+	interface_vector = 0L;
-+	interface_count =0;
++	dhcp_type_interface = NULL;
++	interface_vector = NULL;
++	interface_count = 0;
 +	interface_max = 0;
 +	name_servers = 0;
 +	domains = 0;
-+	dhcp_type_interface=0L;
-+	dhcp_type_group=0L;
-+	dhcp_type_shared_network=0L;
-+	dhcp_type_control=0L;
++	dhcp_type_interface = NULL;
++	dhcp_type_group = NULL;
++	dhcp_type_shared_network = NULL;
++	dhcp_type_control = NULL;
 +	memset(&dhcp_universe, '\0', sizeof(struct universe));
 +	memset(&nwip_universe, '\0', sizeof(struct universe));
 +	memset(&fqdn_universe, '\0', sizeof(struct universe));
 +	universe_hash = 0;
-+	universes=0;
-+	universe_count=0;
-+	universe_max=0;
-+	config_universe = 0;	
-+extern struct hash_bucket *free_hash_buckets;
-+	free_hash_buckets=0L;
-+extern struct dhcp_packet *dhcp_free_list;
-+	dhcp_free_list = 0L;
-+extern struct packet *packet_free_list;
-+	packet_free_list = 0L;
-+extern struct binding_value *free_binding_values;
-+	free_binding_values=0L;
-+extern struct expression *free_expressions;
-+	free_expressions=0L;
-+extern struct option_cache *free_option_caches;
-+	free_option_caches=0L;
-+extern  struct packet *free_packets;
-+	free_packets=0L;
-+extern  pair free_pairs;
-+	free_pairs=0L;
-+extern omapi_io_object_t omapi_io_states;
-+        memset(&omapi_io_states, '\0', sizeof(omapi_io_states));
-+	dhcp_control_object=0L;
++	universes = 0;
++	universe_count = 0;
++	universe_max = 0;
++	config_universe = 0; 
++	extern struct hash_bucket *free_hash_buckets;
++	free_hash_buckets = NULL;
++	extern struct dhcp_packet *dhcp_free_list;
++	dhcp_free_list = NULL;
++	extern struct packet *packet_free_list;
++	packet_free_list = NULL;
++	extern struct binding_value *free_binding_values;
++	free_binding_values = NULL;
++	extern struct expression *free_expressions;
++	free_expressions = NULL;
++	extern struct option_cache *free_option_caches;
++	free_option_caches = NULL;
++	extern  struct packet *free_packets;
++	free_packets = NULL;
++	extern  pair free_pairs;
++	free_pairs = NULL;
++	extern omapi_io_object_t omapi_io_states;
++	memset(&omapi_io_states, '\0', sizeof(omapi_io_states));
++	dhcp_control_object = NULL;
 +	unlink(current_pid_file);
 +#endif
+ 
  	/*NOTREACHED*/
  	return 0;
- }
-@@ -1292,7 +1469,20 @@
+@@ -1204,7 +1376,20 @@
  	if (client -> new -> rebind < cur_time)
  		client -> new -> rebind = TIME_MAX;
  
 +#ifdef LIBDHCP
-+    /* We need the server's siaddr for the 'bootServer'
-+     * pump option 
-+     */
-+    u_int32_t set_siaddr = 0;  
-+    set_siaddr = client -> packet.siaddr.s_addr;
-+    client->packet.siaddr.s_addr = packet->raw->siaddr.s_addr;
++	/* We need the server's siaddr for the 'bootServer'
++	 * pump option
++	 */
++	u_int32_t set_siaddr = 0;
++	set_siaddr = client->packet.siaddr.s_addr;
++	client->packet.siaddr.s_addr = packet->raw->siaddr.s_addr;
 +#endif
 +
  	bind_lease (client);
 +
 +#ifdef LIBDHCP
-+    client->packet.siaddr.s_addr = set_siaddr;
++	client->packet.siaddr.s_addr = set_siaddr;
 +#endif
  }
  
  void bind_lease (client)
-@@ -1328,6 +1518,9 @@
+@@ -1240,6 +1425,9 @@
  		return;
  	}
  
 +#ifdef LIBDHCP
-+	if ( libdhcp_control && (libdhcp_control->capability & DHCP_USE_LEASE_DATABASE))
++	if (libdhcp_control && (libdhcp_control->capability & DHCP_USE_LEASE_DATABASE))
 +#endif
  	/* Write out the new lease. */
  	write_client_lease (client, client -> new, 0, 0);
  
-@@ -1427,13 +1620,13 @@
- {
+@@ -1340,11 +1528,13 @@
  	return 0;
  }
--
+ 
 +#ifndef LIBDHCP
  int write_lease (lease)
  	struct lease *lease;
  {
  	return 0;
  }
--
 +#endif
+ 
  int write_host (host)
  	struct host_decl *host;
- {
-@@ -2004,6 +2197,10 @@
+@@ -1915,6 +2105,10 @@
  	   tell the shell script that we failed to allocate an address,
  	   and try again later. */
  	if (onetry) {
 +#ifdef LIBDHCP
-+	    script_init (client, "FAIL", (struct string_list *)0);
-+	    return;
++		script_init (client, "FAIL", (struct string_list *)0);
++		return;
 +#endif
  		if (!quiet)
  			log_info ("Unable to obtain a lease on first try.%s",
  				  "  Exiting.");
-@@ -2607,7 +2804,9 @@
+@@ -2519,7 +2713,9 @@
  	free_client_lease (lease, MDL);
  }
  
@@ -345,62 +320,62 @@
  
  void rewrite_client_leases ()
  {
-@@ -3048,6 +3247,54 @@
+@@ -2960,6 +3156,54 @@
  int script_go (client)
  	struct client_state *client;
  {
 +#ifdef LIBDHCP
-+    struct string_list *sp;
++	struct string_list *sp;
++
++	if (libdhcp_control && libdhcp_control->callback) {
++		int dhcmsg;
++		char *reason="";
++
++		for (sp = client->env; sp; sp = sp->next)
++			if (strncmp(sp->string, "reason=", 7) == 0) {
++				reason = sp->string + 7;
++				break;
++			}
++
++		if (strcmp(reason,"NBI") == 0)
++			dhcmsg = DHC4_NBI;
++		else if (strcmp(reason,"PREINIT") == 0)
++			dhcmsg = DHC4_PREINIT;
++		else if (strcmp(reason,"BOUND") == 0)
++			dhcmsg = DHC4_BOUND;
++		else if (strcmp(reason,"RENEW") == 0)
++			dhcmsg = DHC4_RENEW;
++		else if (strcmp(reason,"REBOOT") == 0)
++			dhcmsg = DHC4_REBOOT;
++		else if (strcmp(reason,"REBIND") == 0)
++			dhcmsg = DHC4_REBIND;
++		else if (strcmp(reason,"STOP") == 0)
++			dhcmsg = DHC4_STOP;
++		else if (strcmp(reason,"MEDIUM") == 0)
++			dhcmsg = DHC4_MEDIUM;
++		else if (strcmp(reason,"TIMEOUT") == 0)
++			dhcmsg = DHC4_TIMEOUT;
++		else if (strcmp(reason,"FAIL") == 0)
++			dhcmsg = DHC4_FAIL;
++		else if (strcmp(reason,"EXPIRE") == 0)
++			dhcmsg = DHC4_EXPIRE;
++		else if (strcmp(reason,"RELEASE") == 0)
++			dhcmsg = DHC4_RELEASE;
++		else
++			dhcmsg = DHC4_NBI;
++
++		(*libdhcp_control->callback) (libdhcp_control, dhcmsg, client);
 +
-+    if (libdhcp_control && libdhcp_control->callback) {
-+        int dhcmsg;
-+        char *reason="";
-+
-+        for (sp = client->env; sp; sp = sp->next) 
-+            if (strncmp(sp->string, "reason=", 7) == 0) {
-+                reason = sp->string + 7;
-+                break;
-+            }
-+
-+       if (strcmp(reason,"NBI") == 0)
-+            dhcmsg = DHC4_NBI;
-+       else if (strcmp(reason,"PREINIT") == 0)
-+            dhcmsg = DHC4_PREINIT;
-+       else if (strcmp(reason,"BOUND") == 0)
-+            dhcmsg = DHC4_BOUND;
-+       else if (strcmp(reason,"RENEW") == 0)
-+            dhcmsg = DHC4_RENEW;
-+       else if (strcmp(reason,"REBOOT") == 0)
-+            dhcmsg = DHC4_REBOOT;
-+       else if (strcmp(reason,"REBIND") == 0)
-+            dhcmsg = DHC4_REBIND;
-+       else if (strcmp(reason,"STOP") == 0)
-+            dhcmsg = DHC4_STOP;
-+       else if (strcmp(reason,"MEDIUM") == 0)
-+            dhcmsg = DHC4_MEDIUM;
-+       else if (strcmp(reason,"TIMEOUT") == 0)
-+            dhcmsg = DHC4_TIMEOUT;
-+       else if (strcmp(reason,"FAIL") == 0)
-+            dhcmsg = DHC4_FAIL;
-+       else if (strcmp(reason,"EXPIRE") == 0)
-+            dhcmsg = DHC4_EXPIRE;
-+       else if (strcmp(reason,"RELEASE") == 0)
-+            dhcmsg = DHC4_RELEASE;
-+       else
-+            dhcmsg = DHC4_NBI;
-+
-+       (*libdhcp_control->callback) (libdhcp_control, dhcmsg, client);
-+
-+       if (libdhcp_control->decline)
-+           return 1;
-+    }
++		if (libdhcp_control->decline)
++			return 1;
++	}
 +
-+    return 0;
++	return 0;
 +#else
  	char *scriptName;
  	char *argv [2];
  	char **envp;
-@@ -3121,6 +3368,7 @@
+@@ -3033,6 +3277,7 @@
  	GET_TIME (&cur_time);
  	return (WIFEXITED (wstatus) ?
  		WEXITSTATUS (wstatus) : -WTERMSIG (wstatus));
@@ -408,29 +383,29 @@
  }
  
  void client_envadd (struct client_state *client,
-@@ -3211,6 +3459,9 @@
+@@ -3123,6 +3368,9 @@
  
  	/* Don't become a daemon if the user requested otherwise. */
  	if (no_daemon) {
 +#ifdef LIBDHCP
-+	    if ( libdhcp_control && (libdhcp_control->capability & DHCP_USE_PID_FILE ) )
++		if (libdhcp_control && (libdhcp_control->capability & DHCP_USE_PID_FILE ))
 +#endif
  		write_client_pid_file ();
  		return;
  	}
-@@ -3219,7 +3470,9 @@
- 	if (state)
+@@ -3132,6 +3380,10 @@
  		return;
  	state = 1;
--
+ 
 +#ifdef LIBDHCP
 +	return;
 +#endif
++
  	/* Stop logging to stderr... */
  	log_perror = 0;
  
---- dhcp-3.0.5/common/discover.c.libdhcp4client	2007-02-08 21:01:16.000000000 -0500
-+++ dhcp-3.0.5/common/discover.c	2007-02-08 21:01:16.000000000 -0500
+--- dhcp-3.0.5/common/discover.c.libdhcp4client	2007-03-30 20:54:06.000000000 -0400
++++ dhcp-3.0.5/common/discover.c	2007-03-30 20:54:06.000000000 -0400
 @@ -121,6 +121,10 @@
     register that interface with the network I/O software, figure out what
     subnet it's on, and add it to the list of interfaces. */
@@ -452,11 +427,10 @@
  	int wifcount = 0;
  
  	/* Create an unbound datagram socket to do the SIOCGIFADDR ioctl on. */
-@@ -691,12 +697,17 @@
- 		log_info ("%s", "");
+@@ -692,10 +698,17 @@
  		log_fatal ("Not configured to listen on any interfaces!");
  	}
--
+ 
 +#ifdef LIBDHCP
 +	if (!have_setup_fallback) {
 +		have_setup_fallback = 1;
@@ -467,32 +441,12 @@
  		setup_fallback = 1;
  		maybe_setup_fallback ();
  	}
--
 +#endif
+ 
  #if defined (HAVE_SETFD)
  	if (fallback_interface) {
- 	    if (fcntl (fallback_interface -> rfdesc, F_SETFD, 1) < 0)
-@@ -811,7 +822,7 @@
- 					omapi_typed_data_t *value)
- {
- 	struct interface_info *interface;
--	isc_result_t status;
-+    isc_result_t status;
- 
- 	if (h -> type != dhcp_type_interface)
- 		return ISC_R_INVALIDARG;
---- dhcp-3.0.5/common/lpf.c.libdhcp4client	2007-02-08 21:01:16.000000000 -0500
-+++ dhcp-3.0.5/common/lpf.c	2007-02-08 21:01:16.000000000 -0500
-@@ -246,6 +246,7 @@
- 	struct interface_info *info;
- {
- 	struct sock_fprog p;
-+	memset(&p,'\0', sizeof(struct sock_fprog));
- 
- 	/* Set up the bpf filter program structure.    This is defined in
- 	   bpf.c */
---- dhcp-3.0.5/common/alloc.c.libdhcp4client	2007-02-08 21:01:16.000000000 -0500
-+++ dhcp-3.0.5/common/alloc.c	2007-02-08 21:01:16.000000000 -0500
+--- dhcp-3.0.5/common/alloc.c.libdhcp4client	2007-03-30 20:54:06.000000000 -0400
++++ dhcp-3.0.5/common/alloc.c	2007-03-30 20:54:06.000000000 -0400
 @@ -1009,7 +1009,11 @@
  	return 1;
  }
@@ -505,8 +459,8 @@
  
  #if defined (DEBUG_MEMORY_LEAKAGE) || \
  		defined (DEBUG_MEMORY_LEAKAGE_ON_EXIT)
---- dhcp-3.0.5/common/tree.c.libdhcp4client	2007-02-08 21:01:16.000000000 -0500
-+++ dhcp-3.0.5/common/tree.c	2007-02-08 21:24:40.000000000 -0500
+--- dhcp-3.0.5/common/tree.c.libdhcp4client	2007-03-30 20:54:06.000000000 -0400
++++ dhcp-3.0.5/common/tree.c	2007-03-30 20:54:06.000000000 -0400
 @@ -40,7 +40,7 @@
  #include "dhcpd.h"
  #include <omapip/omapip_p.h>
@@ -524,8 +478,8 @@
  int evaluate_option_cache (result, packet, lease, client_state,
  			   in_options, cfg_options, scope, oc, file, line)
  	struct data_string *result;
---- dhcp-3.0.5/common/options.c.libdhcp4client	2007-02-08 21:01:16.000000000 -0500
-+++ dhcp-3.0.5/common/options.c	2007-02-08 21:23:37.000000000 -0500
+--- dhcp-3.0.5/common/options.c.libdhcp4client	2007-03-30 20:54:06.000000000 -0400
++++ dhcp-3.0.5/common/options.c	2007-03-30 20:54:06.000000000 -0400
 @@ -2153,6 +2153,7 @@
  	return 1;
  }
@@ -534,18 +488,279 @@
  void option_space_foreach (struct packet *packet, struct lease *lease,
  			   struct client_state *client_state,
  			   struct option_state *in_options,
---- dhcp-3.0.5/common/dispatch.c.libdhcp4client	2007-02-08 21:01:16.000000000 -0500
-+++ dhcp-3.0.5/common/dispatch.c	2007-02-08 21:24:08.000000000 -0500
-@@ -358,6 +358,7 @@
- #endif
+--- dhcp-3.0.5/common/dispatch.c.libdhcp4client	2007-03-30 20:54:06.000000000 -0400
++++ dhcp-3.0.5/common/dispatch.c	2007-03-30 20:54:06.000000000 -0400
+@@ -39,8 +39,24 @@
+ 
+ #include "dhcpd.h"
+ 
+-struct timeout *timeouts;
+-static struct timeout *free_timeouts;
++struct timeout {
++#ifndef LIBDHCP
++	struct timeout *next;
++#endif
++	TIME when;
++	void (*func) PROTO ((void *));
++	void *what;
++	tvref_t ref;
++	tvunref_t unref;
++};
++
++#ifdef LIBDHCP
++static struct timeout *timeouts = NULL;
++static int ntimeouts = 0;
++#else
++static struct timeout *timeouts = NULL;
++static struct timeout *free_timeouts = NULL;
++#endif
+ 
+ void set_time(TIME t)
+ {
+@@ -53,9 +69,41 @@
+ 
+ struct timeval *process_outstanding_timeouts (struct timeval *tvp)
+ {
++#ifdef LIBDHCP
++	int i;
++	struct timeout t = { 0 };
++#endif
+ 	/* Call any expired timeouts, and then if there's
+ 	   still a timeout registered, time out the select
+ 	   call then. */
++#ifdef LIBDHCP
++	if (!ntimeouts)
++		return NULL;
++
++	for (i = 0; i < ntimeouts && timeouts[i].when <= cur_time;) {
++		struct timeout *new_timeouts;
++		size_t n;
++
++		memmove(&t, &timeouts[i], sizeof (t));
++
++		n = (ntimeouts - i - 1) * sizeof (t);
++		memmove(&timeouts[i+1], &timeouts[i], n);
++
++		n = --ntimeouts * sizeof (t);
++		new_timeouts = realloc(timeouts, n);
++		/* XXX broken API, no way to return error here */
++		if (new_timeouts || !n)
++			timeouts = new_timeouts;
++
++		if (t.func)
++			t.func(t.what);
++		if (t.unref)
++			t.unref(t.what, MDL);
++	}
++	if (tvp && ntimeouts) {
++		tvp->tv_sec = timeouts[0].when;
++		tvp->tv_usec = 0;
++#else
+       another:
+ 	if (timeouts) {
+ 		struct timeout *t;
+@@ -73,9 +121,15 @@
+ 			tvp -> tv_sec = timeouts -> when;
+ 			tvp -> tv_usec = 0;
+ 		}
++#endif
+ 		return tvp;
++#ifdef LIBDHCP
++	}
++	return NULL;
++#else
+ 	} else
+ 		return (struct timeval *)0;
++#endif
+ }
+ 
+ /* Wait for packets to come in using select().   When one does, call
+@@ -104,13 +158,28 @@
+ 	tvref_t ref;
+ 	tvunref_t unref;
+ {
++#ifdef LIBDHCP
++	struct timeout t = {
++		.when = when,
++		.func = where,
++		.what = what,
++		.ref = ref,
++		.unref = unref
++	};
++	struct timeout *new_timeouts;
++	int i, pos = 0;
++#else
+ 	struct timeout *t, *q;
++#endif
+ 
+ 	/* See if this timeout supersedes an existing timeout. */
++#ifdef LIBDHCP
++	for (i = 0; i < ntimeouts; i++) {
++		struct timeout *q = &timeouts[i];
++#else
+ 	t = (struct timeout *)0;
+ 	for (q = timeouts; q; q = q -> next) {
+-		if ((where == NULL || q -> func == where) &&
+-		    q -> what == what) {
++		if ((where == NULL || q -> func == where) && q -> what == what) {
+ 			if (t)
+ 				t -> next = q -> next;
+ 			else
+@@ -119,7 +188,29 @@
+ 		}
+ 		t = q;
+ 	}
++#endif
+ 
++#ifdef LIBDHCP
++		/* If this one is already in the list with a different time,
++		 * remove it and re-add */
++		if ((where == NULL || q->func == where) &&
++				q->what == what) {
++			size_t n = (--ntimeouts - i) * sizeof (*q);
++			memmove(&t, q, sizeof (t));
++
++			if (n)
++				memmove(&timeouts[i], &timeouts[i+1], n);
++
++			if (ntimeouts) {
++				new_timeouts = realloc(timeouts, ntimeouts * sizeof (*q));
++				/* XXX broken API, no way to return error here */
++				if (new_timeouts)
++					timeouts = new_timeouts;
++			} else {
++				timeouts = NULL;
++			}
++			add_timeout(when, where, what, ref, unref);
++#else
+ 	/* If we didn't supersede a timeout, allocate a timeout
+ 	   structure now. */
+ 	if (!q) {
+@@ -128,7 +219,7 @@
+ 			free_timeouts = q -> next;
+ 		} else {
+ 			q = ((struct timeout *)
+-			     dmalloc (sizeof (struct timeout), MDL));
++				dmalloc (sizeof (struct timeout), MDL));
+ 			if (!q)
+ 				log_fatal ("add_timeout: no memory!");
+ 		}
+@@ -158,22 +249,76 @@
+ 		if (t -> next -> when > q -> when) {
+ 			q -> next = t -> next;
+ 			t -> next = q;
++#endif
+ 			return;
++#ifdef LIBDHCP
++		} else if (timeouts[i].when > when) {
++			pos = i;
++#endif
+ 		}
+ 	}
+ 
++#ifdef LIBDHCP
++	/* If we didn't supersede an existing timeout, then pos is set
++	 * to the timeout which will post after this one.  Insert this
++	 * one before it. */
++
++	new_timeouts = realloc(timeouts, sizeof (t) * (ntimeouts+1));
++	/* XXX broken API, no way to return error here */
++	if (new_timeouts) {
++		/* ntimeouts = 10
++		 * pos = 3;
++		 * n = 10-3 * sizeof (t) = 7 * sizeof (t) 
++		 */
++		size_t n = (ntimeouts - pos) * sizeof (t);
++
++		timeouts = new_timeouts;
++		memmove(&timeouts[pos+1], &timeouts[pos], n);
++		memmove(&timeouts[pos], &t, sizeof (t));
++		ntimeouts++;
++	}
++#else
+ 	/* End of list. */
+ 	t -> next = q;
+ 	q -> next = (struct timeout *)0;
++#endif
+ }
+ 
+ void cancel_timeout (where, what)
+ 	void (*where) PROTO ((void *));
+ 	void *what;
+ {
++#ifdef LIBDHCP
++	struct timeout t;
++	int i = 0;
++#else
+ 	struct timeout *t, *q;
++#endif
+ 
+ 	/* Look for this timeout on the list, and unlink it if we find it. */
++#ifdef LIBDHCP
++	for (i = 0; i < ntimeouts; i++) {
++		struct timeout *new_timeouts, *q = &timeouts[i];
++
++		if (q->func == where && q->what == what) {
++			size_t n;
++
++			memmove(&t, q, sizeof (t));
++
++			n = (ntimeouts - i - 1) * sizeof (t);
++			memmove(&timeouts[i+1], &timeouts[i], n);
++
++			n = --ntimeouts * sizeof (t);
++			new_timeouts = realloc(timeouts, n);
++			/* XXX broken API, no way to return error here */
++			if (new_timeouts || !n)
++				timeouts = new_timeouts;
++
++			if (t.unref)
++				t.unref(t.what, MDL);
++		}
++	}
++#else
+ 	t = (struct timeout *)0;
+ 	for (q = timeouts; q; q = q -> next) {
+ 		if (q -> func == where && q -> what == what) {
+@@ -193,10 +338,15 @@
+ 		q -> next = free_timeouts;
+ 		free_timeouts = q;
+ 	}
++#endif
+ }
+ 
+ void cancel_all_timeouts ()
+ {
++#ifdef LIBDHCP
++	cur_time = TIME_MAX;
++	process_outstanding_timeouts(NULL);
++#else
+ 	struct timeout *t, *n;
+ 	for (t = timeouts; t; t = n) {
+ 		n = t -> next;
+@@ -205,13 +355,20 @@
+ 		t -> next = free_timeouts;
+ 		free_timeouts = t;
+ 	}
++#endif
  }
  
 +__attribute__ ((visibility ("default")))
  void relinquish_timeouts ()
  {
- #ifdef LIBDHCP
---- dhcp-3.0.5/dst/hmac_link.c.libdhcp4client	2007-02-08 21:01:16.000000000 -0500
-+++ dhcp-3.0.5/dst/hmac_link.c	2007-02-08 21:01:16.000000000 -0500
++#ifdef LIBDHCP
++	while (ntimeouts)
++		cancel_timeout(timeouts[0].func, timeouts[0].what);
++#else
+ 	struct timeout *t, *n;
+ 	for (t = free_timeouts; t; t = n) {
+ 		n = t -> next;
+ 		dfree (t, MDL);
+ 	}
++#endif
+ }
+--- dhcp-3.0.5/dst/hmac_link.c.libdhcp4client	2001-02-22 02:22:08.000000000 -0500
++++ dhcp-3.0.5/dst/hmac_link.c	2007-03-30 20:54:06.000000000 -0400
 @@ -38,6 +38,10 @@
  
  #include "dst_internal.h"
@@ -573,11 +788,10 @@
  	MD5_CTX *ctx = NULL;
  
  	if (mode & SIG_MODE_INIT) 
--		ctx = (MD5_CTX *) malloc(sizeof(*ctx));
 +#ifdef LIBDHCP
 +		ctx = (MD5_CTX *) dmalloc(sizeof(*ctx),__FILE__,__LINE__);
 +#else
-+	        ctx = (MD5_CTX *) malloc(sizeof(*ctx));
+ 		ctx = (MD5_CTX *) malloc(sizeof(*ctx));
 +#endif
  	else if (context)
  		ctx = (MD5_CTX *) *context;
@@ -632,20 +846,34 @@
  	if (dst_t_func[KEY_HMAC_MD5] == NULL)
  		return (0);
  	memset(dst_t_func[KEY_HMAC_MD5], 0, sizeof(struct dst_func));
---- dhcp-3.0.5/dst/md5_dgst.c.libdhcp4client	2004-06-14 14:50:06.000000000 -0400
-+++ dhcp-3.0.5/dst/md5_dgst.c	2007-02-08 21:05:27.000000000 -0500
-@@ -65,7 +65,7 @@
- 
- #ifdef USE_MD5 /* Added by ogud at tis.com 1998/1/26 */
- 
--const char *MD5_version="MD5 part of SSLeay 0.8.1 19-Jul-1997";
-+const char *MD5_version ="MD5 part of SSLeay 0.8.1 19-Jul-1997";
- 
- /* Implemented from RFC1321 The MD5 Message-Digest Algorithm
-  */
---- dhcp-3.0.5/omapip/alloc.c.libdhcp4client	2007-02-08 21:01:16.000000000 -0500
-+++ dhcp-3.0.5/omapip/alloc.c	2007-02-08 21:01:16.000000000 -0500
-@@ -40,6 +40,41 @@
+--- dhcp-3.0.5/includes/dhcpd.h.libdhcp4client	2007-03-30 20:54:06.000000000 -0400
++++ dhcp-3.0.5/includes/dhcpd.h	2007-03-30 20:54:06.000000000 -0400
+@@ -855,14 +855,6 @@
+ 
+ typedef void (*tvref_t)(void *, void *, const char *, int);
+ typedef void (*tvunref_t)(void *, const char *, int);
+-struct timeout {
+-	struct timeout *next;
+-	TIME when;
+-	void (*func) PROTO ((void *));
+-	void *what;
+-	tvref_t ref;
+-	tvunref_t unref;
+-};
+ 
+ struct protocol {
+ 	struct protocol *next;
+@@ -1789,7 +1781,6 @@
+ 					    struct dhcp_packet *, unsigned,
+ 					    unsigned int,
+ 					    struct iaddr, struct hardware *));
+-extern struct timeout *timeouts;
+ extern omapi_object_type_t *dhcp_type_interface;
+ #if defined (TRACING)
+ trace_type_t *interface_trace;
+--- dhcp-3.0.5/omapip/alloc.c.libdhcp4client	2007-03-30 20:54:06.000000000 -0400
++++ dhcp-3.0.5/omapip/alloc.c	2007-03-30 20:54:06.000000000 -0400
+@@ -40,6 +40,33 @@
  
  #include <omapip/omapip_p.h>
  
@@ -657,37 +885,29 @@
 +#include <search.h>  
 +extern void tdestroy (void *root, void (*free_node)(void *nodep));
 +static void *all_pointers=0L;
-+static int ptr_comparator( const void *p1, const void *p2 )
-+{
-+    return
-+	(  (p1 == p2) 
-+	   ? 0
-+	   :( (p1 > p2)
-+	      ? 1
-+	      : -1
-+	    )
-+	);
++static int ptr_comparator(const void *p1, const void *p2) {
++    return ((p1 == p2) ? 0 : ((p1 > p2) ? 1 : -1));
 +}
-+static void record_pointer( void *ptr )
-+{
++
++static void record_pointer(void *ptr) {
 +    tsearch(ptr, &(all_pointers), ptr_comparator);
 +}
-+static void forget_pointer( void *ptr )
-+{
++
++static void forget_pointer(void *ptr) {
 +    tdelete(ptr, &(all_pointers), ptr_comparator);
 +}
-+void omapi_free_all_pointers(void)
-+{
-+    if( all_pointers != 0L )
-+	tdestroy(all_pointers, free);
-+    all_pointers = 0L;
++
++void omapi_free_all_pointers(void) {
++    if (all_pointers != NULL)
++		tdestroy(all_pointers, free);
++    all_pointers = NULL;
 +}
 +#endif
 +
  #if defined (DEBUG_MEMORY_LEAKAGE) || defined (DEBUG_MALLOC_POOL) || \
  		defined (DEBUG_MEMORY_LEAKAGE_ON_EXIT)
  struct dmalloc_preamble *dmalloc_list;
-@@ -77,7 +112,9 @@
+@@ -77,7 +104,9 @@
  		return (VOIDPTR)0;
  
  	foo = malloc(len);
@@ -698,7 +918,7 @@
  	if (!foo)
  		return (VOIDPTR)0;
  	bar = (VOIDPTR)(foo + DMDOFFSET);
-@@ -199,6 +236,9 @@
+@@ -199,6 +228,9 @@
  		     0, (unsigned char *)ptr + DMDOFFSET, 0, 1, RC_MALLOC);
  #endif
  	free (ptr);
@@ -708,8 +928,8 @@
  }
  
  #if defined (DEBUG_MEMORY_LEAKAGE) || defined (DEBUG_MALLOC_POOL) || \
---- dhcp-3.0.5/omapip/dispatch.c.libdhcp4client	2007-02-08 21:01:16.000000000 -0500
-+++ dhcp-3.0.5/omapip/dispatch.c	2007-02-08 21:01:16.000000000 -0500
+--- dhcp-3.0.5/omapip/dispatch.c.libdhcp4client	2004-11-24 12:39:17.000000000 -0500
++++ dhcp-3.0.5/omapip/dispatch.c	2007-03-30 20:54:06.000000000 -0400
 @@ -34,7 +34,7 @@
  
  #include <omapip/omapip_p.h>
@@ -719,8 +939,8 @@
  TIME cur_time;
  
  OMAPI_OBJECT_ALLOC (omapi_io,
---- dhcp-3.0.5/omapip/errwarn.c.libdhcp4client	2007-02-08 21:01:16.000000000 -0500
-+++ dhcp-3.0.5/omapip/errwarn.c	2007-02-08 21:01:16.000000000 -0500
+--- dhcp-3.0.5/omapip/errwarn.c.libdhcp4client	2007-03-30 20:54:06.000000000 -0400
++++ dhcp-3.0.5/omapip/errwarn.c	2007-03-30 20:54:06.000000000 -0400
 @@ -39,6 +39,11 @@
  #include <omapip/omapip_p.h>
  #include <errno.h>
@@ -733,7 +953,7 @@
  #ifdef DEBUG
  int log_perror = -1;
  #else
-@@ -50,7 +55,9 @@
+@@ -48,7 +53,9 @@
  void (*log_cleanup) (void);
  
  #define CVT_BUF_MAX 1023
@@ -743,14 +963,13 @@
  static char fbuf [CVT_BUF_MAX + 1];
  
  /* Log an error message, then exit... */
-@@ -60,6 +67,17 @@
+@@ -58,6 +65,16 @@
    va_list list;
  
    do_percentm (fbuf, fmt);
 +  
 +#ifdef LIBDHCP
-+  if ( libdhcp_control && (libdhcp_control->eh) )
-+  {
++  if (libdhcp_control && (libdhcp_control->eh)) {
 +      va_start (list, fmt);
 +      libdhcp_control->eh(libdhcp_control, LOG_FATAL, fbuf, list);
 +      va_end(list);
@@ -761,7 +980,7 @@
  
    /* %Audit% This is log output. %2004.06.17,Safe%
     * If we truncate we hope the user can get a hint from the log.
-@@ -108,6 +126,7 @@
+@@ -93,6 +110,7 @@
    if (log_cleanup)
  	  (*log_cleanup) ();
    exit (1);
@@ -769,13 +988,12 @@
  }
  
  /* Log an error message... */
-@@ -118,6 +137,14 @@
+@@ -103,6 +121,13 @@
  
    do_percentm (fbuf, fmt);
  
 +#ifdef LIBDHCP
-+  if ( libdhcp_control && libdhcp_control->eh )
-+  {
++  if (libdhcp_control && libdhcp_control->eh) {
 +      va_start (list, fmt);
 +      libdhcp_control->eh(libdhcp_control, LOG_ERR, fbuf, list);
 +      va_end(list);
@@ -784,22 +1002,21 @@
    /* %Audit% This is log output. %2004.06.17,Safe%
     * If we truncate we hope the user can get a hint from the log.
     */
-@@ -134,7 +161,7 @@
- 	  r=write (STDERR_FILENO, mbuf, strlen (mbuf));
- 	  r=write (STDERR_FILENO, "\n", 1);
+@@ -120,7 +145,7 @@
+ 	  if (write (STDERR_FILENO, "\n", 1) <= 0)
+ 	    return 0;
    }
 -
 +#endif
    return 0;
  }
  
-@@ -146,6 +173,14 @@
+@@ -132,6 +157,13 @@
  
    do_percentm (fbuf, fmt);
  
 +#ifdef LIBDHCP
-+  if ( libdhcp_control && libdhcp_control->eh )
-+  {
++  if (libdhcp_control && libdhcp_control->eh) {
 +      va_start (list, fmt);
 +      libdhcp_control->eh(libdhcp_control, LOG_INFO, fbuf, list);
 +      va_end(list);
@@ -808,23 +1025,22 @@
    /* %Audit% This is log output. %2004.06.17,Safe%
     * If we truncate we hope the user can get a hint from the log.
     */
-@@ -162,7 +197,7 @@
- 	  r=write (STDERR_FILENO, mbuf, strlen (mbuf));
- 	  r=write (STDERR_FILENO, "\n", 1);
+@@ -149,7 +181,7 @@
+ 	  if (write (STDERR_FILENO, "\n", 1) <= 0)
+ 	    return 0;
    }
 -
 +#endif
    return 0;
  }
  
-@@ -173,7 +208,14 @@
+@@ -160,7 +192,13 @@
    va_list list;
  
    do_percentm (fbuf, fmt);
 -
 +#ifdef LIBDHCP
-+  if ( libdhcp_control && libdhcp_control->eh )
-+  {
++  if (libdhcp_control && libdhcp_control->eh) {
 +      va_start (list, fmt);
 +      libdhcp_control->eh(libdhcp_control, LOG_DEBUG, fbuf, list);
 +      va_end(list);
@@ -833,290 +1049,17 @@
    /* %Audit% This is log output. %2004.06.17,Safe%
     * If we truncate we hope the user can get a hint from the log.
     */
-@@ -190,7 +232,7 @@
- 	  r=write (STDERR_FILENO, mbuf, strlen (mbuf));
- 	  r=write (STDERR_FILENO, "\n", 1);
+@@ -178,7 +216,7 @@
+ 	  if (write (STDERR_FILENO, "\n", 1) <= 0)
+ 	    return 0;
    }
 -
 +#endif
    return 0;
  }
  
---- dhcp-3.0.5/configure.libdhcp4client	2004-09-10 17:02:30.000000000 -0400
-+++ dhcp-3.0.5/configure	2007-02-08 21:01:16.000000000 -0500
-@@ -246,7 +246,7 @@
- fi
- 
- if [ x"$dirs" = x ]; then
--  dirs=". client server relay common omapip dhcpctl minires dst"
-+  dirs=". client server relay common omapip dhcpctl minires dst libdhcp4client"
- fi
- 
- for foo in $dirs; do
---- /dev/null	2007-02-06 10:40:24.955607220 -0500
-+++ dhcp-3.0.5/libdhcp4client/Makefile.dist	2007-02-08 21:12:41.000000000 -0500
-@@ -0,0 +1,127 @@
-+# Makefile.dist for libdhcp4client
-+#
-+# We get the libdhcp4client library from the patched ISC source code.  We
-+# rebuild key C files with -DLIBDHCP to turn on the library features we
-+# need.  Normal build results in standard ISC code (i.e., not LIBDHCP
-+# stuff enabled).  We then link together a static library and a shared
-+# library with the new resulting objects.
-+#
-+# David Cantrell <dcantrell at redhat.com>
-+
-+# What version of ISC DHCP is this?
-+VER   = $(shell grep DHCP_VERSION ../../includes/version.h | head -1 | cut -d '"' -f 2 | cut -d 'V' -f 2 | cut -d '-' -f 1)
-+
-+PROGS = libdhcp4client.a libdhcp4client-$(VER).so.0
-+
-+# NOTE: The ordering of these file lists is important!  We are using the
-+# whole program optimization features of gcc, so the order matters here.
-+
-+# Source files shared by all objects
-+COMMON_SRCS = client_clparse.c client_dhclient.c common_alloc.c common_bpf.c \
-+              common_comapi.c common_conflex.c common_discover.c \
-+              common_dispatch.c common_dns.c common_ethernet.c \
-+              common_execute.c common_inet.c common_lpf.c common_memory.c \
-+              common_options.c common_packet.c common_parse.c common_print.c \
-+              common_socket.c common_tables.c common_tr.c common_tree.c \
-+              dst_dst_api.c dst_base64.c dst_hmac_link.c dst_md5_dgst.c \
-+              omapip_alloc.c omapip_array.c omapip_auth.c omapip_buffer.c \
-+              omapip_connection.c omapip_convert.c omapip_dispatch.c \
-+              omapip_errwarn.c omapip_handle.c omapip_hash.c \
-+              omapip_listener.c omapip_mrtrace.c omapip_result.c \
-+              omapip_support.c omapip_toisc.c omapip_trace.c
-+
-+# Source files for libdhcp4client.o
-+CLIENT_SRCS = common_ctrace.c common_dlpi.c common_nit.c common_upf.c \
-+              dst_dst_support.c dst_prandom.c omapip_generic.c \
-+              omapip_message.c omapip_protocol.c
-+
-+# Source files for libres.o (minires)
-+MINIRES_SRCS = minires_ns_date.c minires_ns_name.c minires_ns_parse.c \
-+               minires_ns_samedomain.c minires_ns_sign.c minires_ns_verify.c \
-+               minires_res_comp.c minires_res_findzonecut.c \
-+               minires_res_init.c minires_res_mkquery.c \
-+               minires_res_mkupdate.c minires_res_query.c minires_res_send.c \
-+               minires_res_sendsigned.c minires_res_update.c
-+
-+HDRS = dhcp4client.h libdhcp_control.h
-+SRCS = $(COMMON_SRCS) $(CLIENT_SRCS)
-+OBJS = $(SRCS:.c=.o)
-+
-+INCLUDES = -I$(TOP) -I$(TOP)/includes -I$(TOP)/dst -I.
-+CFLAGS   = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS) \
-+           -DCLIENT_PATH=${CLIENT_PATH} -DLIBDHCP -DUSE_MD5
-+
-+all: $(PROGS)
-+
-+install: all
-+	install -p -m 0755 -D libdhcp4client-$(VER).so.0 $(DESTDIR)$(LIBDIR)/libdhcp4client-$(VER).so.0
-+	ln -sf libdhcp4client-$(VER).so.0 $(DESTDIR)/$(LIBDIR)/libdhcp4client.so
-+	install -p -m 0644 -D libdhcp4client.a $(DESTDIR)$(LIBDIR)/libdhcp4client.a
-+	install -p -m 0644 -D dhcp4client.h $(DESTDIR)$(INCDIR)/dhcp4client/dhcp4client.h
-+	install -p -m 0644 -D libdhcp_control.h $(DESTDIR)$(INCDIR)/dhcp4client/libdhcp_control.h
-+	( cd $(TOP)/includes ; \
-+	  find . -name "*.h" -type f | while read h ; do \
-+	      install -p -m 0644 -D $$h $(DESTDIR)$(INCDIR)/dhcp4client/isc_dhcp/$$h ; \
-+	  done ; \
-+	)
-+
-+depend:
-+	$(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRCS)
-+
-+clean:
-+	-rm -f $(OBJS)
-+
-+realclean: clean
-+	-rm -f $(PROG) *~ #*
-+
-+distclean: realclean
-+	-rm -f Makefile
-+
-+# This isn't the cleanest way to set up links, but I prefer this so I don't
-+# need object targets for each subdirectory.  The idea is simple.  Since
-+# libdhcp4client is a linked together wad of objects from across the source
-+# tree, we change / to _ when linking source files here.  Follow this example:
-+#
-+# We need to use client/dhclient.c, so we make this link:
-+#     rm -f client_dhclient.c
-+#     ln -s $(TOP)/client/dhclient.c client_dhclient.c
-+#
-+# Simple.  Given the way the ISC build system works, this is the easiest to
-+# maintain and least invasive.
-+#
-+# David Cantrell <dcantrell at redhat.com>
-+links:
-+	@for target in $(SRCS); do \
-+		source="`echo $$target | sed -e 's|_|/|'`"; \
-+		if [ ! -b $$target ]; then \
-+			rm -f $$target; \
-+		fi; \
-+		ln -s $(TOP)/$$source $$target; \
-+	done; \
-+	for hdr in $(HDRS); do \
-+		if [ ! -b $$hdr ]; then \
-+			rm -f $$hdr; \
-+		fi; \
-+		ln -s $(TOP)/libdhcp4client/$$hdr $$hdr; \
-+	done
-+
-+# minires is difficult to build because it overrides things in common and dst,
-+# so we just link with the already built libres.a since we need it all anyway
-+libres.a:
-+	if [ ! -f ../minires/$@ ]; then \
-+		$(MAKE) -C ../minires; \
-+	fi; \
-+	ln ../minires/libres.a .; \
-+	$(AR) x libres.a
-+
-+# Create the libraries
-+# minires/res_query.o contains an undefined symbol __h_errno_set, is not
-+# used by any dhcp code, and is optimized out by the linker when producing
-+# the dhclient executable or a shared library
-+libdhcp4client.a: $(OBJS) libres.a
-+	$(AR) crus $@ $(OBJS) `$(AR) t libres.a | grep -v res_query.o`
-+
-+libdhcp4client-$(VER).so.0: $(OBJS) libres.a
-+	$(CC) -shared -o $@ -Wl,-soname,$@ $(OBJS) `$(AR) t libres.a | grep -v res_query.o`
-+
-+# Dependencies (semi-automatically-generated)
---- /dev/null	2007-02-06 10:40:24.955607220 -0500
-+++ dhcp-3.0.5/libdhcp4client/dhcp4client.h	2007-02-08 21:01:16.000000000 -0500
-@@ -0,0 +1,24 @@
-+/* dhcp4client.h
-+ *
-+ *  Interface to the ISC dhcp IPv4 client libdhcp4client library.
-+ *
-+ *
-+ *  Copyright(C) Jason Vas Dias <jvdias at redhat.com> Red Hat Inc. May 2006
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation at 
-+ *           http://www.fsf.org/licensing/licenses/gpl.txt
-+ *  and included in this software distribution as the "LICENSE" file.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ */
-+
-+struct libdhcp_control_s;  /* include libdhcp_control.h or libdhcp.h for this */
-+
-+extern int dhcpv4_client( struct libdhcp_control_s *dhc_ctl, int argc, char **argv, char **envp);
-+    /* The ISC IPv4 DHCP client main() function .
-+     */
---- /dev/null	2007-02-06 10:40:24.955607220 -0500
-+++ dhcp-3.0.5/libdhcp4client/libdhcp_control.h	2007-02-08 21:01:16.000000000 -0500
-@@ -0,0 +1,102 @@
-+/* libdhcp_control.h
-+ *
-+ *  DHCP client control API for libdhcp, a minimal interface to the
-+ *  ISC dhcp IPv4 client libdhcp4client library,
-+ *  and to the dhcpv6 DHCPv6 client libdhcp6client library.
-+ *
-+ *  Each DHCP client library must include this file to be controlled
-+ *  by libdhcp.
-+ *
-+ *  Copyright(C) Jason Vas Dias <jvdias at redhat.com> Red Hat Inc. May 2006
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation at 
-+ *           http://www.fsf.org/licensing/licenses/gpl.txt
-+ *  and included in this software distribution as the "LICENSE" file.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ */
-+#ifndef LIBDHCP_CONTROL_H
-+#define LIBDHCP_CONTROL_H
-+
-+#include <stdint.h>
-+
-+#define  LOG_FATAL 8
-+
-+typedef enum dhcp_state_e
-+{
-+
-+    /* DHCPv4 client states - third callback arg will be a 'struct client_state *'    */
-+    DHC4_NBI,         		/* failed: no broadcast interfaces found              */
-+    DHC4_PREINIT, 		/* configuration started - bring the interface "UP"   */
-+    DHC4_BOUND, 		/* lease obtained                                     */
-+    DHC4_RENEW, 		/* lease renewed                                      */
-+    DHC4_REBOOT,	        /* have valid lease, but now obtained a different one */
-+    DHC4_REBIND, 		/* new, different lease                               */
-+    DHC4_STOP,  		/* remove old lease                                   */
-+    DHC4_MEDIUM, 		/* media selection begun                              */
-+    DHC4_TIMEOUT, 		/* timed out contacting DHCP server                   */
-+    DHC4_FAIL, 			/* all attempts to contact server timed out, sleeping */
-+    DHC4_EXPIRE, 		/* lease has expired, renewing                        */
-+    DHC4_RELEASE, 		/* releasing lease                                    */
-+    /* This state raised by both clients: */
-+    DHC_TIMEDOUT,               /* libdhcp_control timeout has been exceeded          */
-+    /* DHCPv6 client states:    */
-+    DHC6_BOUND,                 /* new lease obtained             - arg is optinfo *  */
-+    DHC6_REBIND,                /* existing expired lease rebound - arg is optinfo *  */
-+    DHC6_RELEASE                /* existing lease expired         - arg is dhcp6_iaidaddr*/
-+} DHCP_State;
-+
-+struct libdhcp_control_s;
-+
-+typedef
-+int ( *LIBDHCP_Error_Handler )
-+    ( struct libdhcp_control_s *ctl,
-+      int priority,  /* ala syslog(3): LOG_EMERG=0 - LOG_DEBUG=7 (+ LOG_FATAL=8 : finished -> 1)   */
-+      const char *fmt,
-+      va_list ap
-+    );
-+
-+typedef 
-+int ( *LIBDHCP_Callback ) ( struct libdhcp_control_s *control, enum dhcp_state_e, void* );
-+    /* The DHCP clients will call the users' callback on important state change events,
-+     * with the second arg set to the client DHCP_State, and the third arg set to
-+     * a client specific pointer as described below.
-+     */
-+
-+typedef 
-+struct libdhcp_control_s
-+{
-+    LIBDHCP_Callback    callback;    	/* the DHCP clients' main loop calls this on state changes */
-+    uint16_t            capability;     /* LIBDHCP_Capability bits to enable                       */
-+    uint8_t             finished;       /* set to one to make clients exit their main loop         */
-+    uint8_t             decline;        /* set to one to decline the lease (DHCPv4 only)           */
-+    time_t              timeout;        /* (timeout+now) == time after which clients MUST return   */
-+    time_t              now;            /* clients set this to time(0) on entering main loop       */
-+    void               *arg;            /* user data pointer                                       */
-+    LIBDHCP_Error_Handler eh;
-+} LIBDHCP_Control;
-+
-+typedef enum libdhcp_capability_e
-+{/* DHCP client "capabilities" */ 
-+    DHCP_USE_LEASE_DATABASE   = 1,  	/* use / do not use persistent lease database files */
-+    DHCP_USE_PID_FILE         = 2,  	/* use / do not use pid file                        */
-+ /*
-+  * DHCPv6 supports these capabilities in process, 
-+  * while the DHCPv4 client will fork and exec the dhclient-script to implement them if these
-+  * bits are set - otherwise, if no bits are set, the callback is called and the script is 
-+  * not run.
-+  */
-+    DHCP_CONFIGURE_INTERFACES = 4,  	/* configure interfaces UP/DOWN as required         */
-+    DHCP_CONFIGURE_ADDRESSES  = 8,  	/* configure interface addresses as required        */
-+    DHCP_CONFIGURE_ROUTES     =16,  	/* configure routes as required                     */
-+    DHCP_CONFIGURE_RESOLVER   =32,  	/* configure resolv.conf as required                */
-+    /* DHCPv6 only: */
-+    DHCP_CONFIGURE_RADVD      =64,  	/* configure radvd.conf & restart radvd as required */
-+} LIBDHCP_Capability;
-+
-+#endif
 --- dhcp-3.0.5/Makefile.dist.libdhcp4client	2004-06-10 13:59:10.000000000 -0400
-+++ dhcp-3.0.5/Makefile.dist	2007-02-08 21:01:16.000000000 -0500
++++ dhcp-3.0.5/Makefile.dist	2007-03-30 20:54:06.000000000 -0400
 @@ -22,7 +22,7 @@
  #   http://www.isc.org/
  
@@ -1126,3 +1069,14 @@
  
  all:
  	@for dir in ${SUBDIRS}; do \
+--- dhcp-3.0.5/configure.libdhcp4client	2004-09-10 17:02:30.000000000 -0400
++++ dhcp-3.0.5/configure	2007-03-30 20:54:06.000000000 -0400
+@@ -246,7 +246,7 @@
+ fi
+ 
+ if [ x"$dirs" = x ]; then
+-  dirs=". client server relay common omapip dhcpctl minires dst"
++  dirs=". client server relay common omapip dhcpctl minires dst libdhcp4client"
+ fi
+ 
+ for foo in $dirs; do

dhcp-3.0.5-xen-checksum.patch:
 common/bpf.c     |    3 +-
 common/dlpi.c    |    2 -
 common/lpf.c     |   79 +++++++++++++++++++++++++++++++++++++++++++------------
 common/nit.c     |    2 -
 common/packet.c  |    5 ++-
 common/upf.c     |    2 -
 includes/dhcpd.h |    2 -
 7 files changed, 71 insertions(+), 24 deletions(-)

Index: dhcp-3.0.5-xen-checksum.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0.5-xen-checksum.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dhcp-3.0.5-xen-checksum.patch	28 Feb 2007 11:36:49 -0000	1.2
+++ dhcp-3.0.5-xen-checksum.patch	1 Apr 2007 20:52:27 -0000	1.3
@@ -1,31 +1,28 @@
-diff -ur dhcp-3.0.5.orig/common/bpf.c dhcp-3.0.5/common/bpf.c
---- dhcp-3.0.5.orig/common/bpf.c 2004-11-25 04:39:15.000000000 +1100
-+++ dhcp-3.0.5/common/bpf.c   2007-01-10 15:39:38.000000000 +1100
+--- dhcp-3.0.5/common/bpf.c.xen	2004-11-24 12:39:15.000000000 -0500
++++ dhcp-3.0.5/common/bpf.c	2007-03-30 16:34:45.000000000 -0400
 @@ -478,7 +478,8 @@
-                      interface -> rbuf,
-                      interface -> rbuf_offset,
-                      from,
--                     hdr.bh_caplen);
-+                     hdr.bh_caplen,
-+                     0);
- 
-      /* If the IP or UDP checksum was bad, skip the packet... */
-      if (offset < 0) {
-diff -ur dhcp-3.0.5.orig/common/dlpi.c dhcp-3.0.5/common/dlpi.c
---- dhcp-3.0.5.orig/common/dlpi.c   2004-11-25 04:39:15.000000000 +1100
-+++ dhcp-3.0.5/common/dlpi.c  2007-01-10 15:40:57.000000000 +1100
+ 					       interface -> rbuf,
+ 					       interface -> rbuf_offset,
+ 					       from,
+-					       hdr.bh_caplen);
++					       hdr.bh_caplen,
++					       0);
+ 
+ 		/* If the IP or UDP checksum was bad, skip the packet... */
+ 		if (offset < 0) {
+--- dhcp-3.0.5/common/dlpi.c.xen	2004-11-24 12:39:15.000000000 -0500
++++ dhcp-3.0.5/common/dlpi.c	2007-03-30 16:34:45.000000000 -0400
 @@ -679,7 +679,7 @@
-   length -= offset;
+ 	length -= offset;
  #endif
-   offset = decode_udp_ip_header (interface, dbuf, bufix,
--                  from, length);
-+                  from, length, 0);
- 
-   /* If the IP or UDP checksum was bad, skip the packet... */
-   if (offset < 0) {
-diff -ur dhcp-3.0.5.orig/common/lpf.c dhcp-3.0.5/common/lpf.c
---- dhcp-3.0.5.orig/common/lpf.c 2007-01-10 15:49:04.000000000 +1100
-+++ dhcp-3.0.5/common/lpf.c   2007-01-25 08:54:25.000000000 +1100
+ 	offset = decode_udp_ip_header (interface, dbuf, bufix,
+-				       from, length);
++				       from, length, 0);
+ 
+ 	/* If the IP or UDP checksum was bad, skip the packet... */
+ 	if (offset < 0) {
+--- dhcp-3.0.5/common/lpf.c.xen	2007-03-30 16:34:26.000000000 -0400
++++ dhcp-3.0.5/common/lpf.c	2007-03-30 16:34:45.000000000 -0400
 @@ -34,16 +34,31 @@
  #include "dhcpd.h"
  #if defined (USE_LPF_SEND) || defined (USE_LPF_RECEIVE)
@@ -47,11 +44,11 @@
 +
 +struct tpacket_auxdata
 +{
-+  __u32    tp_status;
-+  __u32    tp_len;
-+  __u32    tp_snaplen;
-+  __u16    tp_mac;
-+  __u16    tp_net;
++	__u32		tp_status;
++	__u32		tp_len;
++	__u32		tp_snaplen;
++	__u16		tp_mac;
++	__u16		tp_net;
 +};
 +#endif
 +
@@ -59,191 +56,187 @@
     is not required for packet-filter APIs. */
  
 @@ -69,10 +84,14 @@
-   struct interface_info *info;
+ 	struct interface_info *info;
  {
-   int sock;
--  struct sockaddr sa;
-+  union {
-+     struct sockaddr_ll ll;
-+     struct sockaddr common;
-+  } sa;
-+  struct ifreq ifr;
- 
-   /* Make an LPF socket. */
--  if ((sock = socket(PF_PACKET, SOCK_PACKET,
-+  if ((sock = socket(PF_PACKET, SOCK_RAW,
-            htons((short)ETH_P_ALL))) < 0) {
-      if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
-          errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
+ 	int sock;
+-	struct sockaddr sa;
++	union {
++		struct sockaddr_ll ll;
++		struct sockaddr common;
++	} sa;
++	struct ifreq ifr;
+ 
+ 	/* Make an LPF socket. */
+-	if ((sock = socket(PF_PACKET, SOCK_PACKET,
++	if ((sock = socket(PF_PACKET, SOCK_RAW,
+ 			   htons((short)ETH_P_ALL))) < 0) {
+ 		if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
+ 		    errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
 @@ -87,11 +106,16 @@
-      log_fatal ("Open a socket for LPF: %m");
-   }
+ 		log_fatal ("Open a socket for LPF: %m");
+ 	}
  
-+  memset (&ifr, 0, sizeof ifr);
-+  strncpy (ifr.ifr_name, (const char *)info -> ifp, sizeof ifr.ifr_name);
-+  if (ioctl (sock, SIOCGIFINDEX, &ifr))
-+     log_fatal ("Failed to get interface index: %m");
-+
-   /* Bind to the interface name */
-   memset (&sa, 0, sizeof sa);
--  sa.sa_family = AF_PACKET;
--  strncpy (sa.sa_data, (const char *)info -> ifp, sizeof sa.sa_data);
--  if (bind (sock, &sa, sizeof sa)) {
-+  sa.ll.sll_family = AF_PACKET;
-+  sa.ll.sll_ifindex = ifr.ifr_ifindex;
-+  if (bind (sock, &sa.common, sizeof sa)) {
-      if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
-          errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
-          errno == EAFNOSUPPORT || errno == EINVAL) {
++	memset (&ifr, 0, sizeof ifr);
++	strncpy (ifr.ifr_name, (const char *)info -> ifp, sizeof ifr.ifr_name);
++	if (ioctl (sock, SIOCGIFINDEX, &ifr))
++		log_fatal ("Failed to get interface index: %m");
++
+ 	/* Bind to the interface name */
+ 	memset (&sa, 0, sizeof sa);
+-	sa.sa_family = AF_PACKET;
+-	strncpy (sa.sa_data, (const char *)info -> ifp, sizeof sa.sa_data);
+-	if (bind (sock, &sa, sizeof sa)) {
++	sa.ll.sll_family = AF_PACKET;
++	sa.ll.sll_ifindex = ifr.ifr_ifindex;
++	if (bind (sock, &sa.common, sizeof sa)) {
+ 		if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
+ 		    errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
+ 		    errno == EAFNOSUPPORT || errno == EINVAL) {
 @@ -171,9 +195,18 @@
  void if_register_receive (info)
-   struct interface_info *info;
+ 	struct interface_info *info;
  {
-+  int val;
++	int val;
 +
-   /* Open a LPF device and hang it on this interface... */
-   info -> rfdesc = if_register_lpf (info);
+ 	/* Open a LPF device and hang it on this interface... */
+ 	info -> rfdesc = if_register_lpf (info);
  
-+  val = 1;
-+  if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA, &val,
-+        sizeof val) < 0) {
-+     if (errno != ENOPROTOOPT)
-+        log_fatal ("Failed to set auxiliary packet data: %m");
-+  }
++	val = 1;
++	if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA, &val,
++			sizeof val) < 0) {
++		if (errno != ENOPROTOOPT)
++			log_fatal ("Failed to set auxiliary packet data: %m");
++	}
 +
  #if defined (HAVE_TR_SUPPORT)
-   if (info -> hw_address.hbuf [0] == HTYPE_IEEE802)
-      lpf_tr_filter_setup (info);
-@@ -292,7 +325,6 @@
-   double hh [16];
-   double ih [1536 / sizeof (double)];
-   unsigned char *buf = (unsigned char *)ih;
--  struct sockaddr sa;
-   int result;
-   int fudge;
- 
-@@ -310,15 +342,7 @@
-            (unsigned char *)raw, len);
-   memcpy (buf + ibufp, raw, len);
- 
--  /* For some reason, SOCK_PACKET sockets can't be connected,
--     so we have to do a sentdo every time. */
--  memset (&sa, 0, sizeof sa);
--  sa.sa_family = AF_PACKET;
--  strncpy (sa.sa_data,
--      (const char *)interface -> ifp, sizeof sa.sa_data);
+ 	if (info -> hw_address.hbuf [0] == HTYPE_IEEE802)
+ 		lpf_tr_filter_setup (info);
+@@ -291,7 +324,6 @@
+ 	double hh [16];
+ 	double ih [1536 / sizeof (double)];
+ 	unsigned char *buf = (unsigned char *)ih;
+-	struct sockaddr sa;
+ 	int result;
+ 	int fudge;
+ 
+@@ -309,15 +341,7 @@
+ 				(unsigned char *)raw, len);
+ 	memcpy (buf + ibufp, raw, len);
+ 
+-	/* For some reason, SOCK_PACKET sockets can't be connected,
+-	   so we have to do a sentdo every time. */
+-	memset (&sa, 0, sizeof sa);
+-	sa.sa_family = AF_PACKET;
+-	strncpy (sa.sa_data,
+-		 (const char *)interface -> ifp, sizeof sa.sa_data);
 -
--  result = sendto (interface -> wfdesc,
--         buf + fudge, ibufp + len - fudge, 0, &sa, sizeof sa);
-+  result = write (interface -> wfdesc, buf + fudge, ibufp + len - fudge);
-   if (result < 0)
-      log_error ("send_packet: %m");
-   return result;
-@@ -335,13 +359,34 @@
+-	result = sendto (interface -> wfdesc,
+-			 buf + fudge, ibufp + len - fudge, 0, &sa, sizeof sa);
++	result = write (interface -> wfdesc, buf + fudge, ibufp + len - fudge);
+ 	if (result < 0)
+ 		log_error ("send_packet: %m");
+ 	return result;
+@@ -334,13 +358,34 @@
  {
-   int length = 0;
-   int offset = 0;
-+  int nocsum = 0;
-   unsigned char ibuf [1536];
-   unsigned bufix = 0;
-+  unsigned char cmsgbuf[CMSG_LEN(sizeof(struct tpacket_auxdata))];
-+  struct iovec iov = {
-+     .iov_base = ibuf,
-+     .iov_len = sizeof ibuf,
-+  };
-+  struct msghdr msg = {
-+     .msg_iov = &iov,
-+     .msg_iovlen = 1,
-+     .msg_control = cmsgbuf,
-+     .msg_controllen = sizeof(cmsgbuf),
-+  };
-+  struct cmsghdr *cmsg;
- 
--  length = read (interface -> rfdesc, ibuf, sizeof ibuf);
-+  length = recvmsg (interface -> rfdesc, &msg, 0);
-   if (length <= 0)
-      return length;
- 
-+  for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
-+     if (cmsg->cmsg_level == SOL_PACKET &&
-+         cmsg->cmsg_type == PACKET_AUXDATA) {
-+        struct tpacket_auxdata *aux = (void *)CMSG_DATA(cmsg);
-+        nocsum = aux->tp_status & TP_STATUS_CSUMNOTREADY;
-+     }
-+  }
-+
-   bufix = 0;
-   /* Decode the physical header... */
-   offset = decode_hw_header (interface, ibuf, bufix, hfrom);
-@@ -358,7 +403,7 @@
- 
-   /* Decode the IP and UDP headers... */
-   offset = decode_udp_ip_header (interface, ibuf, bufix, from,
--                  (unsigned)length);
-+                  (unsigned)length, nocsum);
- 
-   /* If the IP or UDP checksum was bad, skip the packet... */
-   if (offset < 0)
-diff -ur dhcp-3.0.5.orig/common/nit.c dhcp-3.0.5/common/nit.c
---- dhcp-3.0.5.orig/common/nit.c 2004-11-25 04:39:15.000000000 +1100
-+++ dhcp-3.0.5/common/nit.c   2007-01-10 15:39:47.000000000 +1100
+ 	int length = 0;
+ 	int offset = 0;
++	int nocsum = 0;
+ 	unsigned char ibuf [1536];
+ 	unsigned bufix = 0;
++	unsigned char cmsgbuf[CMSG_LEN(sizeof(struct tpacket_auxdata))];
++	struct iovec iov = {
++		.iov_base = ibuf,
++		.iov_len = sizeof ibuf,
++	};
++	struct msghdr msg = {
++		.msg_iov = &iov,
++		.msg_iovlen = 1,
++		.msg_control = cmsgbuf,
++		.msg_controllen = sizeof(cmsgbuf),
++	};
++	struct cmsghdr *cmsg;
+ 
+-	length = read (interface -> rfdesc, ibuf, sizeof ibuf);
++	length = recvmsg (interface -> rfdesc, &msg, 0);
+ 	if (length <= 0)
+ 		return length;
+ 
++	for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
++		if (cmsg->cmsg_level == SOL_PACKET &&
++		    cmsg->cmsg_type == PACKET_AUXDATA) {
++			struct tpacket_auxdata *aux = (void *)CMSG_DATA(cmsg);
++			nocsum = aux->tp_status & TP_STATUS_CSUMNOTREADY;
++		}
++	}
++
+ 	bufix = 0;
+ 	/* Decode the physical header... */
+ 	offset = decode_hw_header (interface, ibuf, bufix, hfrom);
+@@ -357,7 +402,7 @@
+ 
+ 	/* Decode the IP and UDP headers... */
+ 	offset = decode_udp_ip_header (interface, ibuf, bufix, from,
+-				       (unsigned)length);
++				       (unsigned)length, nocsum);
+ 
+ 	/* If the IP or UDP checksum was bad, skip the packet... */
+ 	if (offset < 0)
+--- dhcp-3.0.5/common/nit.c.xen	2004-11-24 12:39:15.000000000 -0500
++++ dhcp-3.0.5/common/nit.c	2007-03-30 16:34:45.000000000 -0400
 @@ -370,7 +370,7 @@
  
-   /* Decode the IP and UDP headers... */
-   offset = decode_udp_ip_header (interface, ibuf, bufix,
--                  from, length);
-+                  from, length, 0);
- 
-   /* If the IP or UDP checksum was bad, skip the packet... */
-   if (offset < 0)
-diff -ur dhcp-3.0.5.orig/common/packet.c dhcp-3.0.5/common/packet.c
---- dhcp-3.0.5.orig/common/packet.c 2007-01-10 15:49:04.000000000 +1100
-+++ dhcp-3.0.5/common/packet.c   2007-01-10 15:40:47.000000000 +1100
+ 	/* Decode the IP and UDP headers... */
+ 	offset = decode_udp_ip_header (interface, ibuf, bufix,
+-				       from, length);
++				       from, length, 0);
+ 
+ 	/* If the IP or UDP checksum was bad, skip the packet... */
+ 	if (offset < 0)
+--- dhcp-3.0.5/common/packet.c.xen	2007-03-30 16:34:26.000000000 -0400
++++ dhcp-3.0.5/common/packet.c	2007-03-30 16:34:45.000000000 -0400
 @@ -211,12 +211,13 @@
  
  /* UDP header and IP header decoded together for convenience. */
  
 -ssize_t decode_udp_ip_header (interface, buf, bufix, from, buflen)
 +ssize_t decode_udp_ip_header (interface, buf, bufix, from, buflen, nocsum)
-   struct interface_info *interface;
-   unsigned char *buf;
-   unsigned bufix;
-   struct sockaddr_in *from;
-   unsigned buflen;
-+  int nocsum;
+ 	struct interface_info *interface;
+ 	unsigned char *buf;
+ 	unsigned bufix;
+ 	struct sockaddr_in *from;
+ 	unsigned buflen;
++	int nocsum;
  {
    unsigned char *data;
    struct ip ip;
 @@ -319,7 +320,7 @@
-                      (u_int32_t)ulen))));
+ 					       (u_int32_t)ulen))));
  
    udp_packets_seen++;
 -  if (usum && usum != sum) {
 +  if (!nocsum && usum && usum != sum) {
-     udp_packets_bad_checksum++;
-     if (udp_packets_seen > 4 &&
-         (udp_packets_seen / udp_packets_bad_checksum) < 2) {
-diff -ur dhcp-3.0.5.orig/common/upf.c dhcp-3.0.5/common/upf.c
---- dhcp-3.0.5.orig/common/upf.c 2004-11-25 04:39:16.000000000 +1100
-+++ dhcp-3.0.5/common/upf.c   2007-01-10 15:39:59.000000000 +1100
+ 	  udp_packets_bad_checksum++;
+ 	  if (udp_packets_seen > 4 &&
+ 	      (udp_packets_seen / udp_packets_bad_checksum) < 2) {
+--- dhcp-3.0.5/common/upf.c.xen	2004-11-24 12:39:16.000000000 -0500
++++ dhcp-3.0.5/common/upf.c	2007-03-30 16:34:45.000000000 -0400
 @@ -321,7 +321,7 @@
  
-   /* Decode the IP and UDP headers... */
-   offset = decode_udp_ip_header (interface, ibuf, bufix,
--                  from, length);
-+                  from, length, 0);
- 
-   /* If the IP or UDP checksum was bad, skip the packet... */
-   if (offset < 0)
-diff -ur dhcp-3.0.5.orig/includes/dhcpd.h dhcp-3.0.5/includes/dhcpd.h
---- dhcp-3.0.5.orig/includes/dhcpd.h   2007-01-10 15:49:04.000000000 +1100
-+++ dhcp-3.0.5/includes/dhcpd.h  2007-01-10 15:41:08.000000000 +1100
-@@ -1948,7 +1948,7 @@
-             unsigned, struct hardware *));
+ 	/* Decode the IP and UDP headers... */
+ 	offset = decode_udp_ip_header (interface, ibuf, bufix,
+-				       from, length);
++				       from, length, 0);
+ 
+ 	/* If the IP or UDP checksum was bad, skip the packet... */
+ 	if (offset < 0)
+--- dhcp-3.0.5/includes/dhcpd.h.xen	2007-03-30 16:34:26.000000000 -0400
++++ dhcp-3.0.5/includes/dhcpd.h	2007-03-30 16:34:45.000000000 -0400
+@@ -1988,7 +1988,7 @@
+ 				 unsigned, struct hardware *));
  ssize_t decode_udp_ip_header PROTO ((struct interface_info *, unsigned char *,
-                 unsigned, struct sockaddr_in *,
--                unsigned));
-+                unsigned, int));
+ 				     unsigned, struct sockaddr_in *,
+-				     unsigned));
++				     unsigned, int));
  
  /* ethernet.c */
  void assemble_ethernet_header PROTO ((struct interface_info *, unsigned char *,


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- dhcp.spec	21 Mar 2007 15:33:58 -0000	1.150
+++ dhcp.spec	1 Apr 2007 20:52:27 -0000	1.151
@@ -7,51 +7,53 @@
 # value to avoid any problems guessing what it might be during installation.
 %define workdir work.linux-2.2
 
-Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent
-Name:    dhcp
-Version: 3.0.5
-Release: 26%{?dist}
-Epoch:   12
-License: ISC
-Group:   System Environment/Daemons
-URL:     http://isc.org/products/DHCP/
-Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz
-Source1: dhcpd.conf.sample
-Source2: dhcpd.init
-Source3: dhcrelay.init
-Source4: dhcpd.conf
-Source5: libdhcp4client.pc
-Source6: README.ldap
-Source7: draft-ietf-dhc-ldap-schema-01.txt
-Source8: dhcpd-conf-to-ldap.pl
-Source9: linux.dbus-example
-
-# Main patches
-Patch0:  dhcp-3.0.5-extended-new-option-info.patch
-Patch1:  dhcp-3.0.5-Makefile.patch
-Patch2:  dhcp-3.0.5-version.patch
-Patch3:  dhcp-3.0.5-client.patch
-Patch4:  dhcp-3.0.5-common.patch
-Patch5:  dhcp-3.0.5-dhcpctl.patch
-Patch6:  dhcp-3.0.5-dst.patch
-Patch7:  dhcp-3.0.5-includes.patch
-Patch8:  dhcp-3.0.5-omapip.patch
-Patch9:  dhcp-3.0.5-minires.patch
-Patch10: dhcp-3.0.5-server.patch
-Patch11: dhcp-3.0.5-timeouts.patch
-Patch12: dhcp-3.0.5-fix-warnings.patch
-Patch13: dhcp-3.0.5-xen-checksum.patch
-Patch14: dhcp-3.0.5-ldap-configuration.patch
-Patch15: dhcp-3.0.5-no-win32.patch
-
-# adds libdhcp4client to the ISC code base
-Patch50: dhcp-3.0.5-libdhcp4client.patch
-
-# Bug fixes
-Patch100: dhcp-3.0.5-dhclient-man-page.patch
+Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
+Name:     dhcp
+Version:  3.0.5
+Release:  27%{?dist}
+Epoch:    12
+License:  ISC
+Group:    System Environment/Daemons
+URL:      http://isc.org/products/DHCP/
+Source0:  ftp://ftp.isc.org/isc/%{name}/%{name}-%{version}.tar.gz
+Source1:  dhcpd.conf.sample
+Source2:  dhcpd.init
+Source3:  dhcrelay.init
+Source4:  dhcpd.conf
+Source5:  libdhcp4client.pc
+Source6:  README.ldap
+Source7:  draft-ietf-dhc-ldap-schema-01.txt
+Source8:  dhcpd-conf-to-ldap
+Source9:  linux.dbus-example
+Source10: linux
+Source11: Makefile.dist
+Source12: dhcp4client.h
+Source13: libdhcp_control.h
+
+Patch0:   %{name}-%{version}-version.patch
+Patch1:   %{name}-%{version}-Makefile.patch
+Patch2:   %{name}-%{version}-warnings.patch
+Patch3:   %{name}-%{version}-extended-new-option-info.patch
+Patch4:   %{name}-%{version}-errwarn-message.patch
+Patch5:   %{name}-%{version}-ldap-configuration.patch
+Patch6:   %{name}-%{version}-memory.patch
+Patch7:   %{name}-%{version}-options.patch
+Patch8:   %{name}-%{version}-release-by-ifup.patch
+Patch9:   %{name}-%{version}-dhclient-decline-backoff.patch
+Patch10:  %{name}-%{version}-enable-timeout-functions.patch
+Patch11:  %{name}-%{version}-inherit-leases.patch
+Patch12:  %{name}-%{version}-selinux.patch
+Patch13:  %{name}-%{version}-unicast-bootp.patch
+Patch14:  %{name}-%{version}-fast-timeout.patch
+Patch15:  %{name}-%{version}-failover-ports.patch
+Patch16:  %{name}-%{version}-xen-checksum.patch
+Patch17:  %{name}-%{version}-dhclient-usage.patch
+Patch18:  %{name}-%{version}-default-requested-options.patch
+Patch19:  %{name}-%{version}-prototypes.patch
+Patch20:  %{name}-%{version}-manpages.patch
+Patch21:  %{name}-%{version}-libdhcp4client.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: perl
 Requires(post): chkconfig, coreutils
 Requires(preun): chkconfig
 Requires(postun): coreutils
@@ -116,64 +118,99 @@
 %prep
 %setup -q
 
-# Extended new option info patch.  Adds the -x option to dhclient, which is
-# needed for dhcdbd and NetworkManager
-%patch0 -p1 -b .enoi
-
-# Build fixes
-%patch1 -p1 -b .Makefile
-
 # Add -RedHat to the version number
-%patch2 -p1 -b .version
+%patch0 -p1 -b .version
 
-# Patches for the client/ subdirectory
-%patch3 -p1 -b .client
-
-# Patches for the common/ subdirectory
-%patch4 -p1 -b .common
-
-# Patches for the dhcpctl/ subdirectory
-%patch5 -p1 -b .dhcpctl
-
-# Patches for the dst/ subdirectory
-%patch6 -p1 -b .dst
-
-# Patches for the includes/ subdirectory
-%patch7 -p1 -b .includes
+# Use $(MAKE) and $(CC) in the Makefiles
+%patch1 -p1 -b .Makefile
 
-# Patches for the omapip/ subdirectory
-%patch8 -p1 -b .omapip
+# Fix up anything that fails -Wall -Werror
+%patch2 -p1 -b .warnings
 
-# Patches for the minires/ subdirectory
-%patch9 -p1 -b .minires
+# Extended new option info patch.  Adds the -x option to dhclient, which is
+# needed for dhcdbd and NetworkManager
+%patch3 -p1 -b .enoi
 
-# Patches for the server/ subdirectory
-%patch10 -p1 -b .server
+# Replace the standard ISC warning message about requesting help with an
+# explanation that this is a patched build of ISC DHCP and bugs should be
+# reported through bugzilla.redhat.com
+%patch4 -p1 -b .message
 
-# Fix up timeout handling in dhclient and libdhcp4client
-%patch11 -p1 -b .timeouts
+# Add support for dhcpd.conf data in LDAP
+%patch5 -p1 -b .ldap
 
-# Fix up anything that fails -Wall -Werror
-%patch12 -p1 -b .warnings
+# Fix memory alignment and initialization problems in common/packet.c
+# Fix buffer overflow in minires library
+# Init struct sock_prog in common/lpf.c to NULL
+%patch6 -p1 -b .memory
+
+# Add more dhclient options (-I, -B, -H, -F, -T, -V, and -R)
+%patch7 -p1 -b .options
+
+# Handle releasing interfaces requested by /sbin/ifup
+# pid file is assumed to be /var/run/dhclient-$interface.pid
+%patch8 -p1 -b .release
+
+# If we receive a DHCP offer in dhclient and it's DECLINEd in dhclient-script,
+# backoff for an amount of time before trying again
+%patch9 -p1 -b .decline
+
+# Enable cancel_all_timeouts() and relinquish_timeouts() regardless of
+# the DEBUG_MEMORY_LEAKAGE_ON_EXIT macro
+%patch10 -p1 -b .etf
+
+# Inherit active leases
+%patch11 -p1 -b .inherit
+
+# Close lease file before exec to fix SELinux error message
+%patch12 -p1 -b .selinux
+
+# Support unicast BOOTP for IBM pSeries systems (and maybe others)
+%patch13 -p1 -b .unicast
+
+# Fast timeout for dhclient
+%patch14 -p1 -b .fast
+
+# Use the following IANA-registered failover ports:
+# dhcp-failover 647/tcp
+# dhcp-failover 647/udp
+# dhcp-failover 847/tcp
+# dhcp-failover 847/udp
+%patch15 -p1 -b .failover
 
 # Fix Xen host networking problems (partial checksums)
-#%patch13 -p1 -b .xen
+%patch16 -p1 -b .xen
 
-# Add support for dhcpd.conf data in LDAP
-%patch14 -p1 -b .ldap
-
-# The contrib/ms2isc/Registry.pm file requires Win32API::Registry, which is
-# not part of Fedora by default.  We comment out this use line in the script
-# so that RPM doesn't automatically add perl(Win32API::Registry) dependency.
-# The patch puts a comment in the script telling the user which perl module
-# should be installed to use the Registry.pm contrib file.
-%patch15 -p1 -b .no-win32
+# Update the usage screen for dhclient(8) indicating new options
+# Use printf() rather than log_info() to display the information
+# Also, return EXIT_FAILURE when the usage() screen is displayed (stop parsing)
+%patch17 -p1 -b .usage
+
+# Add NIS domain, NIS servers, and NTP servers to the list of default
+# requested DHCP options
+%patch18 -p1 -b .dho
+
+# Add missing prototypes to take care of gcc warnings
+# in dst/dst_api.c: add b64_pton() and b64_ntop()
+# in includes/minires/minires.h: remove macro for b64_pton
+# in minires/res_mkupdate.c: add b64_pton() and dn_comp()
+# in minires/res_comp.c: add ns_name_uncompress(), ns_name_compress(), and
+#                        ns_name_skip()
+# in minires/res_init.c: add res_randomid()
+%patch19 -p1 -b .prototypes
+
+# Man page updates explaining new features added from the above patches.
+# Normally these man page changes would be included in the feature patch,
+# however, man page changes generate more hunk failures when applying only
+# a select set of patches.  Instead, the man page changes are grouped
+# together in one patch so changes can be made to just those more easily
+# and not affect the code changes in the other patches.  It's actually
+# pretty common to update or alter these man pages independent of the code
+# changes.
+%patch20 -p1 -b .manpages
 
 # Add the libdhcp4client target (library version of dhclient)
-%patch50 -p1 -b .libdhcp4client
-
-# Apply bug fixes
-%patch100 -p1 -b .dhclient-man-page
+%patch21 -p1 -b .libdhcp4client
 
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 %{__cp} -p %SOURCE6 .
@@ -184,6 +221,23 @@
 # new option info patch too)
 %{__cp} -p %SOURCE9 client/scripts
 
+# Copy in the Fedora/RHEL dhclient script
+%{__cp} -p %SOURCE10 client/scripts
+
+# Copy in the libdhcp4client headers and Makefile.dist
+%{__mkdir} -p libdhcp4client
+%{__cp} -p %SOURCE11 libdhcp4client
+%{__cp} -p %SOURCE12 libdhcp4client
+%{__cp} -p %SOURCE13 libdhcp4client
+
+# Ensure we don't pick up Perl as a dependency from the scripts and modules
+# in the contrib directory (we copy this to /usr/share/doc in the final
+# package).
+%{__chmod} -x contrib/3.0b1-lease-convert
+%{__chmod} -x contrib/dhcpd-conf-to-ldap
+%{__cp} -p contrib/ms2isc/Registry.pm contrib/ms2isc/Registry.perlmodule
+%{__rm} -f contrib/ms2isc/Registry.pm
+
 %build
 %{__cp} %SOURCE1 .
 %{__cat} <<EOF > site.conf
@@ -200,15 +254,17 @@
 #define _PATH_DHCLIENT_DB "%{_localstatedir}/lib/dhclient/dhclient.leases"
 EOF
 
-# Enable extended option info patch (-DEXTENDED_NEW_OPTION_INFO)
+# Disable gcc's strict aliasing since ISC code tends to cast a lot.
+#
 # Use -fvisibility=hidden for libdhcp4client.  The way that library is
 # constructed, we need to follow the hide-by-default/expose-what-we-need
 # plan for the library API.
-COPTS="-fPIC -Werror -Dlint -DEXTENDED_NEW_OPTION_INFO -fvisibility=hidden"
+COPTS="-fPIC -Werror -Dlint -fno-strict-aliasing -fvisibility=hidden"
 
 # DO NOT use the %%configure macro because this configure script is not autognu
+# Enable extended option info patch (-DEXTENDED_NEW_OPTION_INFO)
 CC="%{__cc}" ./configure \
-   --copts "$RPM_OPT_FLAGS $COPTS %{?bigptrs}" \
+   --copts "$RPM_OPT_FLAGS $COPTS %{?bigptrs} -DEXTENDED_NEW_OPTION_INFO" \
    --work-dir %{workdir}
 
 %{__sed} 's/@DHCP_VERSION@/'%{version}'/' < %SOURCE5 > libdhcp4client.pc
@@ -220,8 +276,6 @@
 
 %{__make} install DESTDIR=%{buildroot}
 
-%{__install} -p -m 0755 contrib/dhcpd-conf-to-ldap.pl %{buildroot}/usr/bin/dhcpd-conf-to-ldap
-
 %{__mkdir} -p %{buildroot}%{_initrddir}
 %{__install} -p -m 0755 %SOURCE2 %{buildroot}%{_initrddir}/dhcpd
 
@@ -298,7 +352,6 @@
 %{_initrddir}/dhcpd
 %{_initrddir}/dhcrelay
 %{_bindir}/omshell
-%{_bindir}/dhcpd-conf-to-ldap
 %{_sbindir}/dhcpd
 %{_sbindir}/dhcrelay
 %attr(0644,root,root) %{_mandir}/man1/omshell.1.gz
@@ -342,6 +395,14 @@
 %{_libdir}/libdhcp4client.so
 
 %changelog
+* Sun Apr 01 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-27
+- Ensure that Perl and Perl modules are not added as dependencies (#234688)
+- Reorganize patches by feature/bug per packaging guidelines (#225691)
+- Move the following files from patches to source files:
+     linux.dbus-example, linux, Makefile.dist, dhcp4client.h, libdhcp_control.h
+- Compile with -fno-strict-aliasing as ISC coding standards generally don't
+  agree well with gcc 4.x.x
+
 * Wed Mar 21 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-26
 - Fix formatting problems in dhclient man page (#233076).
 


--- dhcp-3.0.5-fix-warnings.patch DELETED ---


--- dhcp-3.0.5-no-win32.patch DELETED ---


--- dhcpd-conf-to-ldap.pl DELETED ---



From fedora-cvs-commits at redhat.com  Sun Apr  1 20:58:06 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 1 Apr 2007 16:58:06 -0400
Subject: rpms/dhcp/devel dhcp-3.0.5-client.patch, 1.4,
	NONE dhcp-3.0.5-common.patch, 1.3,
	NONE dhcp-3.0.5-dhclient-man-page.patch, 1.1,
	NONE dhcp-3.0.5-dhcpctl.patch, 1.2, NONE dhcp-3.0.5-dst.patch,
	1.4, NONE dhcp-3.0.5-includes.patch, 1.2,
	NONE dhcp-3.0.5-minires.patch, 1.3,
	NONE dhcp-3.0.5-omapip.patch, 1.2,
	NONE dhcp-3.0.5-server.patch, 1.2,
	NONE dhcp-3.0.5-timeouts.patch, 1.3, NONE
Message-ID: <200704012058.l31Kw6gv024668@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24620

Removed Files:
	dhcp-3.0.5-client.patch dhcp-3.0.5-common.patch 
	dhcp-3.0.5-dhclient-man-page.patch dhcp-3.0.5-dhcpctl.patch 
	dhcp-3.0.5-dst.patch dhcp-3.0.5-includes.patch 
	dhcp-3.0.5-minires.patch dhcp-3.0.5-omapip.patch 
	dhcp-3.0.5-server.patch dhcp-3.0.5-timeouts.patch 
Log Message:
* Sun Apr 01 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-27
- Ensure that Perl and Perl modules are not added as dependencies (#234688)
- Reorganize patches by feature/bug per packaging guidelines (#225691)
- Move the following files from patches to source files:
     linux.dbus-example, linux, Makefile.dist, dhcp4client.h, libdhcp_control.h
- Compile with -fno-strict-aliasing as ISC coding standards generally don't
  agree well with gcc 4.x.x



--- dhcp-3.0.5-client.patch DELETED ---


--- dhcp-3.0.5-common.patch DELETED ---


--- dhcp-3.0.5-dhclient-man-page.patch DELETED ---


--- dhcp-3.0.5-dhcpctl.patch DELETED ---


--- dhcp-3.0.5-dst.patch DELETED ---


--- dhcp-3.0.5-includes.patch DELETED ---


--- dhcp-3.0.5-minires.patch DELETED ---


--- dhcp-3.0.5-omapip.patch DELETED ---


--- dhcp-3.0.5-server.patch DELETED ---


--- dhcp-3.0.5-timeouts.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr  2 01:41:46 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 1 Apr 2007 21:41:46 -0400
Subject: rpms/ElectricFence/FC-6 ElectricFence.spec,1.17,1.18
Message-ID: <200704020141.l321fkGU032671@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/ElectricFence/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv32655

Modified Files:
	ElectricFence.spec 
Log Message:
- Actually apply the patches mentioned at release 21.
- Resolves: #233702



Index: ElectricFence.spec
===================================================================
RCS file: /cvs/dist/rpms/ElectricFence/FC-6/ElectricFence.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ElectricFence.spec	28 Mar 2007 18:30:35 -0000	1.17
+++ ElectricFence.spec	2 Apr 2007 01:41:43 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A debugger which detects memory allocation violations.
 Name: ElectricFence
 Version: 2.2.2
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPL
 Group: Development/Tools
 Source: ftp://ftp.perens.com/pub/ElectricFence/beta/%{name}-%{version}.tar.gz
@@ -32,6 +32,8 @@
 %patch2 -p1 -b .vaarg
 %patch3 -p1 -b .pthread
 %patch4 -p1 -b .madvise
+%patch5 -p1
+%patch6 -p1
 
 %build
 make CFLAGS='${RPM_OPT_FLAGS} -DUSE_SEMAPHORE -fpic'
@@ -65,6 +67,10 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Apr  2 2007 Petr Machata <pmachata at redhat.com> - 2.2.2-22
+- Actually apply the patches mentioned at release 21.
+- Resolves: #233702
+
 * Wed Mar 28 2007 Petr Machata <pmachata at redhat.com> - 2.2.2-21
 - Detect for EF_DISABLE_BANNER env. var before printing out the
   banner.  (Patch adapted from Debian repositories.)



From fedora-cvs-commits at redhat.com  Mon Apr  2 03:29:41 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 1 Apr 2007 23:29:41 -0400
Subject: rpms/evince/devel evince.spec,1.76,1.77
Message-ID: <200704020329.l323Tf7v024632@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/evince/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24474

Modified Files:
	evince.spec 
Log Message:
Add an explicit BR for gnome-icon-theme



Index: evince.spec
===================================================================
RCS file: /cvs/dist/rpms/evince/devel/evince.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- evince.spec	1 Apr 2007 15:01:32 -0000	1.76
+++ evince.spec	2 Apr 2007 03:29:39 -0000	1.77
@@ -1,10 +1,11 @@
 %define poppler_version 0.5.2
 %define gtk2_version 2.9.4
 %define dbus_version 0.60
+%define theme_version 2.17.1
 
 Name:		evince
 Version:	0.8.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Document viewer
 
 License: 	GPL
@@ -30,6 +31,7 @@
 BuildRequires:  gettext
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  desktop-file-utils
+BuildRequires:  gnome-icon-theme >= %{theme_version}
 
 Requires(pre): GConf2
 Requires(post): GConf2
@@ -141,6 +143,9 @@
 
 
 %changelog
+* Sun Apr  1 2007 Matthias Clasen <mclasen at redhat.com> - 0.8.0-4
+- Add an explicit BR for gnome-icon-theme (#234780)
+
 * Sun Apr  1 2007 Matthias Clasen <mclasen at redhat.com> - 0.8.0-3
 - Add an explicit --with-print=gtk to configure 
 - Drop libgnomeprintui22 BR



From fedora-cvs-commits at redhat.com  Mon Apr  2 05:16:10 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 01:16:10 -0400
Subject: rpms/gthumb/devel gthumb-2.10.0-user-dirs.patch, NONE,
	1.1 gthumb.spec, 1.66, 1.67
Message-ID: <200704020516.l325GA4U005359@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gthumb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5201

Modified Files:
	gthumb.spec 
Added Files:
	gthumb-2.10.0-user-dirs.patch 
Log Message:
xdg-user-dirs support for gthumb


gthumb-2.10.0-user-dirs.patch:
 dlg-photo-importer.c  |    3 
 xdg-user-dir-lookup.c |  165 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 167 insertions(+), 1 deletion(-)

--- NEW FILE gthumb-2.10.0-user-dirs.patch ---
--- gthumb-2.10.0/src/dlg-photo-importer.c.user-dirs	2007-04-02 01:03:49.000000000 -0400
+++ gthumb-2.10.0/src/dlg-photo-importer.c	2007-04-02 01:05:57.000000000 -0400
@@ -68,6 +68,7 @@
 #define THUMB_BORDER 14
 #define REFRESH_RATE 10
 
+#include "xdg-user-dir-lookup.c"
 
 typedef enum {
 	GTH_IMPORTER_OP_LIST_ABILITIES,
@@ -1890,7 +1891,7 @@
 
 	default_path = eel_gconf_get_path (PREF_PHOTO_IMPORT_DESTINATION, NULL);
 	if ((default_path == NULL) || (*default_path == 0))
-		default_path = g_strdup (g_get_home_dir());
+		default_path = xdg_user_dir_lookup ("PICTURES");
 	gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (data->destination_filechooserbutton), default_path);
 	g_free (default_path);
 
--- gthumb-2.10.0/src/xdg-user-dir-lookup.c.user-dirs	2007-04-02 01:06:25.000000000 -0400
+++ gthumb-2.10.0/src/xdg-user-dir-lookup.c	2007-04-02 01:06:20.000000000 -0400
@@ -0,0 +1,165 @@
+/*
+  This file is not licenced under the GPL like the rest of the code.
+  Its is under the MIT license, to encourage reuse by cut-and-paste.
+
+  Copyright (c) 2007 Red Hat, inc
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions: 
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software. 
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+static char *
+xdg_user_dir_lookup (const char *type)
+{
+  FILE *file;
+  char *home_dir, *config_home, *config_file;
+  char buffer[512];
+  char *user_dir;
+  char *p, *d;
+  int len;
+  int relative;
+  
+  home_dir = getenv ("HOME");
+
+  if (home_dir == NULL)
+    return strdup ("/tmp");
+
+  config_home = getenv ("XDG_CONFIG_HOME");
+  if (config_home == NULL || config_home[0] == 0)
+    {
+      config_file = malloc (strlen (home_dir) + strlen ("/.config/user-dirs.dirs") + 1);
+      strcpy (config_file, home_dir);
+      strcat (config_file, "/.config/user-dirs.dirs");
+    }
+  else
+    {
+      config_file = malloc (strlen (config_home) + strlen ("/user-dirs.dirs") + 1);
+      strcpy (config_file, config_home);
+      strcat (config_file, "/user-dirs.dirs");
+    }
+
+  file = fopen (config_file, "r");
+  free (config_file);
+  if (file == NULL)
+    goto error;
+
+  user_dir = NULL;
+  while (fgets (buffer, sizeof (buffer), file))
+    {
+      /* Remove newline at end */
+      len = strlen (buffer);
+      if (len > 0 && buffer[len-1] == '\n')
+	buffer[len-1] = 0;
+      
+      p = buffer;
+      while (*p == ' ' || *p == '\t')
+	p++;
+      
+      if (strncmp (p, "XDG_", 4) != 0)
+	continue;
+      p += 4;
+      if (strncmp (p, type, strlen (type)) != 0)
+	continue;
+      p += strlen (type);
+      if (strncmp (p, "_DIR", 4) != 0)
+	continue;
+      p += 4;
+
+      while (*p == ' ' || *p == '\t')
+	p++;
+
+      if (*p != '=')
+	continue;
+      p++;
+      
+      while (*p == ' ' || *p == '\t')
+	p++;
+
+      if (*p != '"')
+	continue;
+      p++;
+      
+      relative = 0;
+      if (strncmp (p, "$HOME/", 6) == 0)
+	{
+	  p += 6;
+	  relative = 1;
+	}
+      else if (*p != '/')
+	continue;
+      
+      if (relative)
+	{
+	  user_dir = malloc (strlen (home_dir) + 1 + strlen (p) + 1);
+	  strcpy (user_dir, home_dir);
+	  strcat (user_dir, "/");
+	}
+      else
+	{
+	  user_dir = malloc (strlen (p) + 1);
+	  *user_dir = 0;
+	}
+      
+      d = user_dir + strlen (user_dir);
+      while (*p && *p != '"')
+	{
+	  if ((*p == '\\') && (*(p+1) != 0))
+	    p++;
+	  *d++ = *p++;
+	}
+      *d = 0;
+    }  
+  fclose (file);
+
+  if (user_dir)
+    return user_dir;
+
+ error:
+  /* Special case desktop for historical compatibility */
+  if (strcmp (type, "DESKTOP") == 0)
+    {
+      user_dir = malloc (strlen (home_dir) + strlen ("/Desktop") + 1);
+      strcpy (user_dir, home_dir);
+      strcat (user_dir, "/Desktop");
+      return user_dir;
+    }
+  else
+    return strdup (home_dir);
+}
+
+#ifdef STANDALONE
+int
+main (int argc, char *argv[])
+{
+  if (argc != 2)
+    {
+      fprintf (stderr, "Usage %s <dir-type>\n", argv[0]);
+      exit (1);
+    }
+  
+  printf ("%s\n", xdg_user_dir_lookup (argv[1]));
+  return 0;
+}
+#endif


Index: gthumb.spec
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- gthumb.spec	24 Mar 2007 03:47:44 -0000	1.66
+++ gthumb.spec	2 Apr 2007 05:16:08 -0000	1.67
@@ -11,7 +11,7 @@
 Summary: Image viewer, editor, organizer
 Name: gthumb
 Version: 2.10.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://gthumb.sourceforge.net
 Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gthumb/2.10/%{name}-%{version}.tar.bz2
 License: GPL
@@ -51,6 +51,8 @@
 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
 
 Patch0: gthumb-libdir.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=425365
+Patch1: gthumb-2.10.0-user-dirs.patch
 
 
 %description
@@ -60,6 +62,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .libdir
+%patch1 -p1 -b .user-dirs
 
 %build
 
@@ -132,6 +135,9 @@
 %{_datadir}/icons/hicolor/*
 
 %changelog
+* Mon Apr  2 2007 Matthias Clasen <mclasen at redhat.com> - 2.10.0-3
+- Use the PICTURES user dir as default location for photo import
+
 * Fri Mar 23 2007 Matthias Clasen <mclasen at redhat.com> - 2.10.0-2
 - Remove a no-longer needed patch (#233350)
 



From fedora-cvs-commits at redhat.com  Mon Apr  2 07:32:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 03:32:21 -0400
Subject: rpms/words/devel words.spec,1.12,1.13
Message-ID: <200704020732.l327WLQ6009302@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/words/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9252

Modified Files:
	words.spec 
Log Message:
* Mon Apr  2 2007 Karel Zak <kzak at redhat.com> - 3.0-11
- cleanup spec file
- fix #227216 - Unnecessary BuildRequirement to ncompress
- Resolves: rhbz#227216



Index: words.spec
===================================================================
RCS file: /cvs/dist/rpms/words/devel/words.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- words.spec	24 Jan 2007 11:38:08 -0000	1.12
+++ words.spec	2 Apr 2007 07:32:18 -0000	1.13
@@ -1,14 +1,18 @@
-Summary: A dictionary of English words for the /usr/share/dict directory.
+Summary: A dictionary of English words for the /usr/share/dict directory
 Name: words
 Version: 3.0
-Release: 10%{?dist}
-License: public domain
+Release: 11%{?dist}
+License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.dcs.shef.ac.uk/research/ilash/Moby/mwords.tar.Z
-URL: http://www.dcs.shef.ac.uk/research/ilash/Moby/
+URL: http://www.dcs.shef.ac.uk/research/ilash/Moby
+
 BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: ncompress, dos2unix
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: dos2unix
+BuildRequires: grep
+BuildRequires: coreutils
 
 %description
 The words file is a dictionary of English words for the
@@ -31,21 +35,22 @@
 The Moby lexicon project is complete and has
 been place into the public domain. Use, sell,
 rework, excerpt and use in any way on any platform.
-    
+
 Placing this material on internal or public servers is
 also encouraged. The compiler is not aware of any
 export restrictions so freely distribute world-wide.
-    
+
 You can verify the public domain status by contacting
-   
+
 Grady Ward
 3449 Martha Ct.
 Arcata, CA  95521-4884
-    
+
 daedal at myrealbox.com
 EOF
 
 %install
+rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/dict
 install -m644 mwords/moby $RPM_BUILD_ROOT%{_datadir}/dict/linux.words
 ln -sf linux.words $RPM_BUILD_ROOT%{_datadir}/dict/words
@@ -60,6 +65,10 @@
 /usr/share/dict/words
 
 %changelog
+* Mon Apr  2 2007 Karel Zak <kzak at redhat.com> - 3.0-11
+- cleanup spec file
+- fix #227216 - Unnecessary BuildRequirement to ncompress
+
 * Wed Jan 24 2007 Karel Zak <kzak at redhat.com> - 3.0-10
 - fix regex that removes possessives ('s)
 
@@ -101,26 +110,26 @@
 * Thu May 23 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Wed Apr  3 2002 Trond Eivind Glomsr?d <teg at redhat.com> 2-18
+* Wed Apr  3 2002 Trond Eivind Glomsrod <teg at redhat.com> 2-18
 - Bump.
 
-* Mon Mar 18 2002 Trond Eivind Glomsr?d <teg at redhat.com> 2-17
+* Mon Mar 18 2002 Trond Eivind Glomsrod <teg at redhat.com> 2-17
 - s/Copyright/License/
 - add gullible and facetious (#60166, #60173)
 
-* Fri Apr  6 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Apr  6 2001 Trond Eivind Glomsrod <teg at redhat.com>
 - Add carnivore (#35031)
 
 * Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
 - automatic rebuild
 
-* Tue Jun 13 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Tue Jun 13 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - use %%{_tmppath}
 
 * Thu Apr 13 2000 Nalin Dahyabhai <nalin at redhat.com>
 - add some words: some food additives, dinosaurs, atmospheric terms
 
-* Fri Apr 07 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Apr 07 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - update description
 - moved it to /usr/share/dict
 - updated URL



From fedora-cvs-commits at redhat.com  Mon Apr  2 08:45:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 04:45:30 -0400
Subject: rpms/words/devel words.spec,1.13,1.14
Message-ID: <200704020845.l328jUKK032620@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/words/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32575

Modified Files:
	words.spec 
Log Message:
* Mon Apr  2 2007 Karel Zak <kzak at redhat.com> - 3.0-12
- fix #226542 - Merge Review: words
- Resolves: rhbz#226542



Index: words.spec
===================================================================
RCS file: /cvs/dist/rpms/words/devel/words.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- words.spec	2 Apr 2007 07:32:18 -0000	1.13
+++ words.spec	2 Apr 2007 08:45:27 -0000	1.14
@@ -29,6 +29,11 @@
 cat [1-9]*.??? | egrep --invert-match "'s$" | egrep  "^[[:alnum:]'&!,./-]+$" | sort --ignore-case --dictionary-order | uniq > moby
 
 cat <<EOF >license.txt
+***
+    The license in the readme.txt file is original and DEPRECATED
+    license of The Moby lexicon project.
+***
+
 On June 1, 1996 Grady Ward announced that the fruits of
 the Moby project were being placed in the public domain:
 
@@ -59,12 +64,15 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc mwords/readme.txt mwords/license.txt
-/usr/share/dict/linux.words
-/usr/share/dict/words
+%{_datadir}/dict/linux.words
+%{_datadir}/dict/words
 
 %changelog
+* Mon Apr  2 2007 Karel Zak <kzak at redhat.com> - 3.0-12
+- fix #226542 - Merge Review: words
+
 * Mon Apr  2 2007 Karel Zak <kzak at redhat.com> - 3.0-11
 - cleanup spec file
 - fix #227216 - Unnecessary BuildRequirement to ncompress



From fedora-cvs-commits at redhat.com  Mon Apr  2 08:46:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 04:46:21 -0400
Subject: rpms/words/devel words.spec,1.14,1.15
Message-ID: <200704020846.l328kLhM000812@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/words/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv768

Modified Files:
	words.spec 
Log Message:
fix release number


Index: words.spec
===================================================================
RCS file: /cvs/dist/rpms/words/devel/words.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- words.spec	2 Apr 2007 08:45:27 -0000	1.14
+++ words.spec	2 Apr 2007 08:46:19 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: A dictionary of English words for the /usr/share/dict directory
 Name: words
 Version: 3.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.dcs.shef.ac.uk/research/ilash/Moby/mwords.tar.Z



From fedora-cvs-commits at redhat.com  Mon Apr  2 09:00:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 05:00:43 -0400
Subject: rpms/qt/devel 0073-xinerama-aware-qpopup.patch, NONE,
	1.1 0076-fix-qprocess.diff, NONE,
	1.1 0077-utf8-decoder-fixes.diff, NONE, 1.1 qt.spec, 1.132, 1.133
Message-ID: <200704020900.l3290hU5011185@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/qt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11086

Modified Files:
	qt.spec 
Added Files:
	0073-xinerama-aware-qpopup.patch 0076-fix-qprocess.diff 
	0077-utf8-decoder-fixes.diff 
Log Message:
- apply patches to fix
   Qt UTF-8 overlong sequence decoding vulnerability
   QPopupMenu aware of Xinerama
   a regression in QProgress::writeToStdin()


0073-xinerama-aware-qpopup.patch:
 qpopupmenu.cpp |   42 ++++++++++++++++++++++++------------------
 qpopupmenu.h   |    1 +
 2 files changed, 25 insertions(+), 18 deletions(-)

--- NEW FILE 0073-xinerama-aware-qpopup.patch ---
qt-bugs@ issue : none
bugs.kde.org number : none
applied: no
author: Lubos Lunak <l.lunak at kde.org>
Makes QPopupMenu aware of Xinerama (see e.g. https://bugzilla.novell.com/show_bug.cgi?id=216235).


--- src/widgets/qpopupmenu.cpp
+++ src/widgets/qpopupmenu.cpp
@@ -454,6 +454,15 @@ void QPopupMenu::frameChanged()
     menuContentsChanged();
 }
 
+QRect QPopupMenu::screenRect( const QPoint& pos )
+{
+    int screen_num = QApplication::desktop()->screenNumber( pos );
+#ifdef Q_WS_MAC
+    return QApplication::desktop()->availableGeometry( screen_num );
+#else
+    return QApplication::desktop()->screenGeometry( screen_num );
+#endif
+}
 /*!
     Displays the popup menu so that the item number \a indexAtPoint
     will be at the specified \e global position \a pos. To translate a
@@ -498,6 +507,15 @@ void QPopupMenu::popup( const QPoint &po
     // point.
 #endif
 
+    QRect screen = screenRect( geometry().center());
+    QRect screen2 = screenRect( QApplication::reverseLayout()
+        ? pos+QPoint(width(),0) : pos );
+    // if the widget is not in the screen given by the position, move it
+    // there, so that updateSize() uses the right size of the screen
+    if( screen != screen2 ) {
+        screen = screen2;
+        move( screen.x(), screen.y());
+    }
     if(d->scroll.scrollable) {
 	d->scroll.scrollable = QPopupMenuPrivate::Scroll::ScrollNone;
 	d->scroll.topScrollableIndex = d->scroll.scrollableSize = 0;
@@ -517,18 +535,6 @@ void QPopupMenu::popup( const QPoint &po
 	updateSize(TRUE);
     }
 
-    int screen_num;
-    if (QApplication::desktop()->isVirtualDesktop())
-	screen_num =
-	    QApplication::desktop()->screenNumber( QApplication::reverseLayout() ?
-						   pos+QPoint(width(),0) : pos );
-    else
-	screen_num = QApplication::desktop()->screenNumber( this );
-#ifdef Q_WS_MAC
-    QRect screen = QApplication::desktop()->availableGeometry( screen_num );
-#else
-    QRect screen = QApplication::desktop()->screenGeometry( screen_num );
-#endif
     int sw = screen.width();			// screen width
     int sh = screen.height();			// screen height
     int sx = screen.x();			// screen pos
@@ -1056,7 +1062,7 @@ QSize QPopupMenu::updateSize(bool force_
 				   mi->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width() + 4 );
 	}
 
-	int dh = QApplication::desktop()->height();
+	int dh = screenRect( geometry().center()).height();
 	ncols = 1;
 
 	for ( QMenuItemListIt it2( *mitems ); it2.current(); ++it2 ) {
@@ -2297,9 +2303,9 @@ void QPopupMenu::subMenuTimer() {
 	bool right = FALSE;
 	if ( ( parentMenu && parentMenu->isPopupMenu &&
 	       ((QPopupMenu*)parentMenu)->geometry().x() < geometry().x() ) ||
-	     p.x() < 0 )
+	     p.x() < screenRect( p ).left())
 	    right = TRUE;
-	if ( right && (ps.width() > QApplication::desktop()->width() - mapToGlobal( r.topRight() ).x() ) )
+	if ( right && (ps.width() > screenRect( p ).right() - mapToGlobal( r.topRight() ).x() ) )
 	    right = FALSE;
 	if ( right )
 	    p.setX( mapToGlobal( r.topRight() ).x() );
@@ -2310,7 +2316,7 @@ void QPopupMenu::subMenuTimer() {
 	bool left = FALSE;
 	if ( ( parentMenu && parentMenu->isPopupMenu &&
 	       ((QPopupMenu*)parentMenu)->geometry().x() > geometry().x() ) ||
-	     p.x() + ps.width() > QApplication::desktop()->width() )
+	     p.x() + ps.width() > screenRect( p ).right() )
 	    left = TRUE;
 	if ( left && (ps.width() > mapToGlobal( r.topLeft() ).x() ) )
 	    left = FALSE;
@@ -2318,8 +2324,8 @@ void QPopupMenu::subMenuTimer() {
 	    p.setX( mapToGlobal( r.topLeft() ).x() - ps.width() );
     }
     QRect pr = popup->itemGeometry(popup->count() - 1);
-    if (p.y() + ps.height() > QApplication::desktop()->height() &&
-	p.y() - ps.height() + (QCOORD) pr.height() >= 0)
+    if (p.y() + ps.height() > screenRect( p ).bottom() &&
+	p.y() - ps.height() + (QCOORD) pr.height() >= screenRect( p ).top())
 	p.setY( p.y() - ps.height() + (QCOORD) pr.height());
 
     if ( style().styleHint(QStyle::SH_PopupMenu_SloppySubMenus, this )) {
Index: src/widgets/qpopupmenu.h
===================================================================
--- src/widgets/qpopupmenu.h	(revision 636368)
+++ src/widgets/qpopupmenu.h	(working copy)
@@ -152,6 +152,7 @@ private:
 
     QSize	updateSize(bool force_recalc=FALSE, bool do_resize=TRUE);
     void	updateRow( int row );
+    QRect       screenRect(const QPoint& pos);
 #ifndef QT_NO_ACCEL
     void	updateAccel( QWidget * );
     void	enableAccel( bool );

0076-fix-qprocess.diff:
 qprocess.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE 0076-fix-qprocess.diff ---
qt-bugs@ issue : none
bugs.kde.org number : none
applied: no
author: from trolltech

Fixes a regression in QProgress::writeToStdin()


--- src/kernel/qprocess.cpp
+++ src/kernel/qprocess.cpp
@@ -727,7 +727,7 @@ void QProcess::closeStdinLaunch()
 void QProcess::writeToStdin( const QString& buf )
 {
     QByteArray tmp = buf.local8Bit();
-    tmp.resize( tmp.size() - 1 ); // drop the implicit \0
+    tmp.resize( qstrlen( tmp.data() ) );
     writeToStdin( tmp );
 }


0077-utf8-decoder-fixes.diff:
 codecs/qutfcodec.cpp |   16 +++++++++++++++-
 tools/qstring.cpp    |   10 ++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

--- NEW FILE 0077-utf8-decoder-fixes.diff ---
qt-bugs@ issue : N154454
bugs.kde.org number : none
applied: no
author: Dirk Mueller <mueller at kde.org>

This patch makes the utf8 decoders in Qt reject overlong
sequences, like required.

--- src/codecs/qutfcodec.cpp
+++ src/codecs/qutfcodec.cpp
@@ -154,6 +154,7 @@
 
 class QUtf8Decoder : public QTextDecoder {
     uint uc;
+    uint min_uc;
     int need;
     bool headerDone;
 public:
@@ -167,8 +168,9 @@
 	result.setLength( len ); // worst case
 	QChar *qch = (QChar *)result.unicode();
 	uchar ch;
+        int error = -1;
 	for (int i=0; i<len; i++) {
-	    ch = *chars++;
+	    ch = chars[i];
 	    if (need) {
 		if ( (ch&0xc0) == 0x80 ) {
 		    uc = (uc << 6) | (ch & 0x3f);
@@ -182,6 +184,8 @@
 			    *qch++ = QChar(high);
 			    *qch++ = QChar(low);
 			    headerDone = TRUE;
+			} else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
+                            *qch++ = QChar::replacement;
 			} else {
 			    if (headerDone || QChar(uc) != QChar::byteOrderMark)
 				*qch++ = uc;
@@ -190,6 +194,7 @@
 		    }
 		} else {
 		    // error
+                    i = error;
 		    *qch++ = QChar::replacement;
 		    need = 0;
 		}
@@ -200,12 +205,21 @@
 		} else if ((ch & 0xe0) == 0xc0) {
 		    uc = ch & 0x1f;
 		    need = 1;
+                    error = i;
+		    min_uc = 0x80;
 		} else if ((ch & 0xf0) == 0xe0) {
 		    uc = ch & 0x0f;
 		    need = 2;
+                    error = i;
+		    min_uc = 0x800;
 		} else if ((ch&0xf8) == 0xf0) {
 		    uc = ch & 0x07;
 		    need = 3;
+                    error = i;
+                    min_uc = 0x10000;
+                } else {
+                    // error
+                    *qch++ = QChar::replacement;
 		}
 	    }
 	}
--- src/tools/qstring.cpp
+++ src/tools/qstring.cpp
@@ -5805,6 +5805,7 @@
     result.setLength( len ); // worst case
     QChar *qch = (QChar *)result.unicode();
     uint uc = 0;
+    uint min_uc = 0;
     int need = 0;
     int error = -1;
     uchar ch;
@@ -5822,6 +5823,12 @@
 			unsigned short low = uc%0x400 + 0xdc00;
 			*qch++ = QChar(high);
 			*qch++ = QChar(low);
+		    } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
+			// overlong seqence, UTF16 surrogate or BOM
+                        i = error;
+                        qch = addOne(qch, result);
+                        *qch++ = QChar(0xdbff);
+                        *qch++ = QChar(0xde00+((uchar)utf8[i]));
 		    } else {
 			*qch++ = uc;
 		    }
@@ -5844,14 +5851,17 @@
 		uc = ch & 0x1f;
 		need = 1;
 		error = i;
+		min_uc = 0x80;
 	    } else if ((ch & 0xf0) == 0xe0) {
 		uc = ch & 0x0f;
 		need = 2;
 		error = i;
+		min_uc = 0x800;
 	    } else if ((ch&0xf8) == 0xf0) {
 		uc = ch & 0x07;
 		need = 3;
 		error = i;
+		min_uc = 0x10000;
 	    } else {
 	        // Error
                 qch = addOne(qch, result);


Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/qt.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- qt.spec	27 Mar 2007 13:05:38 -0000	1.132
+++ qt.spec	2 Apr 2007 09:00:37 -0000	1.133
@@ -1,7 +1,7 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: 3.3.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
@@ -53,6 +53,9 @@
 Patch102: 0048-qclipboard_hack_80072.patch
 Patch103: 0056-khotkeys_input_84434.patch
 Patch104: qt-font-default-subst.diff
+patch105: 0073-xinerama-aware-qpopup.patch
+Patch106: 0076-fix-qprocess.diff
+Patch107: 0077-utf8-decoder-fixes.diff
 
 # upstream patches
 Patch200: qt-x11-free-3.3.4-fullscreen.patch
@@ -285,6 +288,10 @@
 %patch102 -p0 -b .0048-qclipboard_hack_80072
 %patch103 -p0 -b .0056-khotkeys_input_84434
 %patch104 -p0 -b .qt-font-default-subst
+%patch105 -p0 -b .0073-xinerama-aware-qpopup
+%patch106 -p0 -b .0076-fix-qprocess
+%patch107 -p0 -b .0077-utf8-decoder-fixes
+
 %patch200 -p1 -b .fullscreen
 
 # convert to UTF-8
@@ -557,6 +564,12 @@
 
 
 %changelog
+* Mon Apr 02 2007 Than Ngo <than at redhat.com> - 1:3.3.8-3.fc7
+- apply patches to fix
+   Qt UTF-8 overlong sequence decoding vulnerability
+   QPopupMenu aware of Xinerama
+   a regression in QProgress::writeToStdin()
+
 * Tue Mar 27 2007 Than Ngo <than at redhat.com> 1:3.3.8-2.fc7
 - enable tablet support
 



From fedora-cvs-commits at redhat.com  Mon Apr  2 09:55:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 05:55:49 -0400
Subject: rpms/pciutils/devel pciutils-2.2.4-multilib.patch, 1.1,
	1.2 pciutils.spec, 1.43, 1.44
Message-ID: <200704020955.l329tnUR032158@cvs.devel.redhat.com>

Author: harald

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

Modified Files:
	pciutils-2.2.4-multilib.patch pciutils.spec 
Log Message:
- added alpha to multilib patch (#231790)
- specfile cleanup
- Resolves: rhbz#231790


pciutils-2.2.4-multilib.patch:
 configure |  116 ++++++++++++++++++++++++++++----------------------------------
 1 files changed, 53 insertions(+), 63 deletions(-)

Index: pciutils-2.2.4-multilib.patch
===================================================================
RCS file: /cvs/dist/rpms/pciutils/devel/pciutils-2.2.4-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pciutils-2.2.4-multilib.patch	26 Jan 2007 12:54:59 -0000	1.1
+++ pciutils-2.2.4-multilib.patch	2 Apr 2007 09:55:47 -0000	1.2
@@ -1,6 +1,6 @@
 --- pciutils-2.2.4/lib/configure.multilib	2006-09-09 13:06:10.000000000 +0200
-+++ pciutils-2.2.4/lib/configure	2007-01-26 13:09:31.000000000 +0100
-@@ -35,74 +35,60 @@
++++ pciutils-2.2.4/lib/configure	2007-04-02 11:49:55.000000000 +0200
+@@ -35,74 +35,62 @@
  zlib=$5
  
  c=config.h
@@ -25,6 +25,8 @@
 +#define PCI_ARCH_S390X
 +#elif defined(__s390__)
 +#define PCI_ARCH_S390
++#elif defined(__alpha__)
++#define PCI_ARCH_ALPHA
 +#else
 +#error Unknown Arch
 +#endif
@@ -122,7 +124,7 @@
  echo " dump"
  
  echo_n "Checking for zlib support... "
-@@ -124,6 +110,8 @@
+@@ -124,6 +112,8 @@
  	echo >>$c '#define PCI_IDS "pci.ids"'
  fi
  echo >>$c "#define PCI_PATH_IDS_DIR \"$idsdir\""


Index: pciutils.spec
===================================================================
RCS file: /cvs/dist/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- pciutils.spec	26 Jan 2007 12:54:59 -0000	1.43
+++ pciutils.spec	2 Apr 2007 09:55:47 -0000	1.44
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	2.2.4
-Release: 	1
+Release: 	2%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Patch0:		pciutils-strip.patch
 Patch1: 	pciutils-2.2.4-buf.patch
@@ -11,10 +11,10 @@
 Patch8: 	pciutils-2.2.4-multilib.patch
 License:	GPL
 URL:		http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
-Buildroot: 	%{_tmppath}/%{name}-%{version}-root
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveOS: 	Linux
 Requires:	hwdata
-Summary: PCI bus related utilities.
+Summary: PCI bus related utilities
 Group: Applications/System
 
 %description
@@ -24,7 +24,7 @@
 /proc/bus/pci interface).
 
 %package devel
-Summary: Linux PCI development library.
+Summary: Linux PCI development library
 Group: Development/Libraries
 
 %description devel
@@ -42,7 +42,7 @@
 %patch8 -p1 -b .multilib
 
 %build
-make OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE=1" PREFIX="/usr" IDSDIR="/usr/share/hwdata"
+make OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE=1" PREFIX="/usr" IDSDIR="/usr/share/hwdata"  %{?_smp_mflags}
 
 
 %install
@@ -72,6 +72,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr  2 2007 Harald Hoyer <harald at redhat.com> - 2.2.4-2
+- added alpha to multilib patch (#231790)
+- specfile cleanup
+- Resolves: rhbz#231790
+
 * Fri Jan 26 2007 Harald Hoyer <harald at redhat.com> - 2.2.4-1
 - version 2.2.4
 - truncate long device names (#205948)



From fedora-cvs-commits at redhat.com  Mon Apr  2 10:01:58 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 06:01:58 -0400
Subject: rpms/pcmciautils/devel pcmciautils.spec,1.23,1.24
Message-ID: <200704021001.l32A1wNX032401@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/pcmciautils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32387

Modified Files:
	pcmciautils.spec 
Log Message:
- removed Provides, because it would conflict (#234504)
- Resolves: rhbz#234504



Index: pcmciautils.spec
===================================================================
RCS file: /cvs/dist/rpms/pcmciautils/devel/pcmciautils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pcmciautils.spec	23 Mar 2007 13:23:42 -0000	1.23
+++ pcmciautils.spec	2 Apr 2007 10:01:56 -0000	1.24
@@ -2,15 +2,16 @@
 Summary: PCMCIA utilities and initialization programs
 License: GPL
 Version: 014
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group: System Environment/Base
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64
 URL: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html
 Source: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-%{version}.tar.bz2
 Obsoletes: pcmcia-cs < 3.2.9
 Obsoletes: kernel-pcmcia-cs < 3.1.32
-Provides:  pcmcia-cs = 3.2.9
-Provides:  kernel-pcmcia-cs = 3.1.32
+# Do not Provide, because it would conflict
+#Provides:  pcmcia-cs = 3.2.9
+#Provides:  kernel-pcmcia-cs = 3.1.32
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libsysfs-devel >= 1.3.0
 Requires: udev >= 062, kernel >= 2.6.12-1.1411_FC5
@@ -51,7 +52,11 @@
 %{_mandir}/man*/pccardctl*
 
 %changelog
-* Fri Mar 23 2007 Harald Hoyer <harald at redhat.com> - 014-6%{?dist}
+* Mon Apr  2 2007 Harald Hoyer <harald at redhat.com> - 014-7
+- removed Provides, because it would conflict (#234504)
+- Resolves: rhbz#234504
+
+* Fri Mar 23 2007 Harald Hoyer <harald at redhat.com> - 014-6
 - specfile cleanup
 
 * Mon Jul 17 2006 Jesse Keating <jkeating at redhat.com> - 014-5



From fedora-cvs-commits at redhat.com  Mon Apr  2 10:21:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 06:21:57 -0400
Subject: rpms/mc/devel mc.spec,1.120,1.121
Message-ID: <200704021021.l32ALvO5032646@cvs.devel.redhat.com>

Author: jnovy

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

Modified Files:
	mc.spec 
Log Message:
- fix unowned directories (#233880)



Index: mc.spec
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- mc.spec	15 Feb 2007 14:11:18 -0000	1.120
+++ mc.spec	2 Apr 2007 10:21:54 -0000	1.121
@@ -3,7 +3,7 @@
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.6.1a
-Release:	43.20070124cvs%{?dist}
+Release:	44.20070124cvs%{?dist}
 Epoch:		1
 License:	GPL
 Group:		System Environment/Shells
@@ -187,9 +187,14 @@
 %config(noreplace) %{_sysconfdir}/mc/extfs/sfs.ini
 %dir %{_datadir}/mc
 %dir %{_sysconfdir}/mc
+%dir %{_sysconfdir}/mc/syntax
+%dir %{_sysconfdir}/mc/extfs
 %dir %{_libexecdir}/mc
 
 %changelog
+* Mon Apr  2 2007 Jindrich Novy <jnovy at redhat.com> 4.6.1a-44
+- fix unowned directories (#233880)
+
 * Thu Feb 15 2007 Jindrich Novy <jnovy at redhat.com> 4.6.1a-43
 - display free space correctly for multiple filesystems (#225153)
   (thanks to Tomas Heinrich for patch)



From fedora-cvs-commits at redhat.com  Mon Apr  2 10:39:10 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 06:39:10 -0400
Subject: rpms/busybox/devel busybox-1.2.2-ls.patch, NONE, 1.1 busybox.spec,
	1.56, 1.57
Message-ID: <200704021039.l32AdAPp019587@cvs.devel.redhat.com>

Author: varekova

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

Modified Files:
	busybox.spec 
Added Files:
	busybox-1.2.2-ls.patch 
Log Message:
- Resolves: 234769 
  busybox ls does not work without a tty


busybox-1.2.2-ls.patch:
 ls.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE busybox-1.2.2-ls.patch ---
--- busybox-1.2.2/coreutils/ls.c.pom	2006-07-01 00:42:07.000000000 +0200
+++ busybox-1.2.2/coreutils/ls.c	2007-04-02 12:25:55.000000000 +0200
@@ -477,6 +477,7 @@
 		putchar('\n');
 		column = 0;
 	}
+	fflush(stdout);
 }
 
 /*----------------------------------------------------------------------*/
@@ -520,6 +521,7 @@
 			}
 		}
 	}
+	fflush(stdout);
 }
 
 /*----------------------------------------------------------------------*/


Index: busybox.spec
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- busybox.spec	19 Feb 2007 15:22:28 -0000	1.56
+++ busybox.spec	2 Apr 2007 10:39:08 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 License: GPL
 Group: System Environment/Shells
@@ -16,6 +16,7 @@
 Patch9: busybox-1.2.0-tar.patch
 Patch10: busybox-1.2.2-ash.patch
 Patch11: busybox-1.2.2-iptunnel.patch
+Patch12: busybox-1.2.2-ls.patch
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)  
 BuildRequires: libselinux-devel >= 1.27.7-2
@@ -54,6 +55,7 @@
 %patch9 -b .tar -p1
 %patch10 -b .ash -p1
 %patch11 -b .iptunnel -p1
+%patch12 -b .ls -p1
 
 %build
 # create static busybox - the executable is kept as busybox-static
@@ -95,6 +97,10 @@
 /sbin/busybox.anaconda
 
 %changelog
+* Mon Apr  2 2007 Ivana Varekova <varekova at redhat.com> - 1:1.2.2-7
+- Resolves: 234769 
+  busybox ls does not work without a tty
+
 * Mon Feb 19 2007 Ivana Varekova <varekova at redhat.com> - 1:1.2.2-6
 - incorporate package review feedback
 



From fedora-cvs-commits at redhat.com  Mon Apr  2 10:43:51 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 06:43:51 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1144,1.1145
Message-ID: <200704021043.l32Ahpup023167@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
linkopt complete


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1144
retrieving revision 1.1145
diff -u -r1.1144 -r1.1145
--- openoffice.org.spec	1 Apr 2007 10:33:57 -0000	1.1144
+++ openoffice.org.spec	2 Apr 2007 10:43:49 -0000	1.1145
@@ -1,6 +1,6 @@
 %define oootag OOF680
 %define ooomilestone 14
-%define rh_rpm_release 2.1
+%define rh_rpm_release 2
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -9,7 +9,7 @@
 # undef to revert to the traditional print dialog
 %define gtkprintui 1
 # undef to revert from combining startup libs into a single libsoffice 
-%define linkopt 0
+%define linkopt 1
 
 %if %{stlvisibilityfcked}
 %define stlflags --with-stlport4
@@ -2633,10 +2633,13 @@
 
 %changelog
 * Tue Mar 27 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.2
-- add aliases for the english autocorrect files
 - Resolves: rhbz#233944 openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
-- combine more DSOs
-- drop old themes to save space and need for translations for their names
+- add aliases for the english autocorrect files
+- drop old themes to save space and need for translations of their names
+- combine more DSOs, the speed improvement is not measurably compelling but
+  is at least startup time neutral and saves a meg in size for just 
+  core + writer
+  + http://people.redhat.com/caolanm/speed/CombinedDSO.ods
 
 * Sun Mar 25 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.1
 - RC4



From fedora-cvs-commits at redhat.com  Mon Apr  2 11:34:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 07:34:26 -0400
Subject: rpms/tetex/devel tetex-3.0-texdocpath.patch, NONE, 1.1 tetex.spec,
	1.106, 1.107
Message-ID: <200704021134.l32BYQ1T024106@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/tetex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27337

Modified Files:
	tetex.spec 
Added Files:
	tetex-3.0-texdocpath.patch 
Log Message:
- texdoc now searches in $TEXDOCS instead of $TEXMF/doc (#232769)


tetex-3.0-texdocpath.patch:
 texdoc |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE tetex-3.0-texdocpath.patch ---
--- tetex-src-3.0/texk/tetex/texdoc.texdocpath	2007-04-02 13:05:22.000000000 +0200
+++ tetex-src-3.0/texk/tetex/texdoc	2007-04-02 13:27:37.000000000 +0200
@@ -138,7 +138,7 @@
 do
   case $mode in
     search)
-      find `kpsewhich --expand-path='$TEXMF/doc' | tr : ' '` -type f -print |
+      find `kpsewhich --expand-path='$TEXDOCS' | tr : ' '` -type f -print |
         egrep $name
       continue
       ;;


Index: tetex.spec
===================================================================
RCS file: /cvs/dist/rpms/tetex/devel/tetex.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- tetex.spec	2 Feb 2007 12:38:06 -0000	1.106
+++ tetex.spec	2 Apr 2007 11:34:23 -0000	1.107
@@ -11,7 +11,7 @@
 Summary: The TeX text formatting system.
 Name: tetex
 Version: 3.0
-Release: 36%{?dist}
+Release: 37%{?dist}
 License: distributable
 Group: Applications/Publishing
 Requires: tmpwatch, dialog, ed
@@ -67,6 +67,7 @@
 Patch6: tetex-3.0-tkdep.patch
 Patch7: tetex-3.0-tkdefaults.patch
 Patch8: tetex-3.0-xprint.patch
+Patch9: tetex-3.0-texdocpath.patch
 
 ######
 # teTeX patches
@@ -273,6 +274,7 @@
 %patch6 -p1 -b .tkdep
 %patch7 -p1 -b .tkdefaults
 %patch8 -p1 -b .xprint
+%patch9 -p1 -b .texdocpath
 
 ######
 # teTeX patches
@@ -851,6 +853,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Mon Apr  2 2007 Jindrich Novy <jnovy at redhat.com> 3.0-37
+- texdoc now searches in $TEXDOCS instead of $TEXMF/doc (#232769)
+
 * Thu Feb  1 2007 Jindrich Novy <jnovy at redhat.com> 3.0-36
 - fix a couple of string overflows in makeindex, CVE-2007-0650 (#225491)
 - fix file list processing



From fedora-cvs-commits at redhat.com  Mon Apr  2 11:41:15 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 07:41:15 -0400
Subject: rpms/psmisc/devel psmisc.spec,1.34,1.35
Message-ID: <200704021141.l32BfFCD023368@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/psmisc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23354

Modified Files:
	psmisc.spec 
Log Message:
* Thu Mar  1 2007 Karel Zak <kzak at redhat.com> 22.3-2
- fix #214214 - killall <path> misbehavior (prelink, etc)
- Resolves: rhbz#214214



Index: psmisc.spec
===================================================================
RCS file: /cvs/dist/rpms/psmisc/devel/psmisc.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- psmisc.spec	1 Mar 2007 14:58:08 -0000	1.34
+++ psmisc.spec	2 Apr 2007 11:41:12 -0000	1.35
@@ -1,12 +1,12 @@
 Summary: Utilities for managing processes on your system
 Name: psmisc
 Version: 22.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD/GPL
 Group: Applications/System
 Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz
 URL: http://psmisc.sourceforge.net
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libselinux-devel
 BuildRequires: gettext
@@ -14,6 +14,8 @@
 
 # backport from upstream CVS
 Patch0: psmisc-22.3-fuser-ipv6.patch
+# 214214: killall <path> misbehavior (prelink, etc)
+Patch1: psmisc-22.3-killall-ino.patch
 
 %description
 The psmisc package contains utilities for managing processes on your
@@ -26,6 +28,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
@@ -58,6 +61,9 @@
 %{_mandir}/man1/pstree.1*
 
 %changelog
+* Thu Mar  1 2007 Karel Zak <kzak at redhat.com> 22.3-2
+- fix #214214 - killall <path> misbehavior (prelink, etc)
+
 * Thu Mar  1 2007 Karel Zak <kzak at redhat.com> 22.3-1
 - update to upstream 22.3
 - backport ipv6 bugfix from upstream CVS



From fedora-cvs-commits at redhat.com  Mon Apr  2 11:44:40 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 07:44:40 -0400
Subject: rpms/psmisc/devel psmisc-22.3-killall-ino.patch,NONE,1.1
Message-ID: <200704021144.l32BieIq023456@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/psmisc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23441

Added Files:
	psmisc-22.3-killall-ino.patch 
Log Message:
add missing patch :-(

psmisc-22.3-killall-ino.patch:
 killall.c |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

--- NEW FILE psmisc-22.3-killall-ino.patch ---
--- psmisc-22.3/src/killall.c.kzak	2007-04-02 11:45:04.000000000 +0200
+++ psmisc-22.3/src/killall.c	2007-04-02 12:56:54.000000000 +0200
@@ -372,16 +372,29 @@
 	        }
 	      else
 	        {
+		  int ok = 1;
+
 	          if (asprintf (&path, PROC_BASE "/%d/exe", pid_table[i]) < 0)
 		    continue;
 
 	          if (stat (path, &st) < 0) 
+		      ok = 0;
+
+		  else if (sts[j].st_dev != st.st_dev ||
+			   sts[j].st_ino != st.st_ino)
 		    {
-		      free (path);
-		      continue;
-	            }
-	          free (path);
-	          if (sts[j].st_dev != st.st_dev || sts[j].st_ino != st.st_ino)
+		      /* maybe the binary has been modified and std[j].st_ino
+		       * is not reliable anymore. We need to compare paths.
+		       */
+		      char linkbuf[PATH_MAX];
+
+		      if (readlink(path, linkbuf, sizeof(linkbuf)) <= 0 ||
+					  strcmp(namelist[j], linkbuf))
+			ok = 0;
+		    }
+
+		  free(path);
+		  if (!ok)
 		    continue;
 	        }
 	    } /* non-regex */



From fedora-cvs-commits at redhat.com  Mon Apr  2 12:01:15 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 08:01:15 -0400
Subject: rpms/psmisc/FC-6 psmisc-22.3-killall-ino.patch, NONE,
	1.1 psmisc.spec, 1.32, 1.33
Message-ID: <200704021201.l32C1FKl023715@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/psmisc/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv23694

Modified Files:
	psmisc.spec 
Added Files:
	psmisc-22.3-killall-ino.patch 
Log Message:
* Mon Apr  2 2007 Karel Zak <kzak at redhat.com> - 22.2-5.1
- fix #214214 - killall <path> misbehavior (prelink, etc)


psmisc-22.3-killall-ino.patch:
 killall.c |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

--- NEW FILE psmisc-22.3-killall-ino.patch ---
--- psmisc-22.3/src/killall.c.kzak	2007-04-02 11:45:04.000000000 +0200
+++ psmisc-22.3/src/killall.c	2007-04-02 12:56:54.000000000 +0200
@@ -372,16 +372,29 @@
 	        }
 	      else
 	        {
+		  int ok = 1;
+
 	          if (asprintf (&path, PROC_BASE "/%d/exe", pid_table[i]) < 0)
 		    continue;
 
 	          if (stat (path, &st) < 0) 
+		      ok = 0;
+
+		  else if (sts[j].st_dev != st.st_dev ||
+			   sts[j].st_ino != st.st_ino)
 		    {
-		      free (path);
-		      continue;
-	            }
-	          free (path);
-	          if (sts[j].st_dev != st.st_dev || sts[j].st_ino != st.st_ino)
+		      /* maybe the binary has been modified and std[j].st_ino
+		       * is not reliable anymore. We need to compare paths.
+		       */
+		      char linkbuf[PATH_MAX];
+
+		      if (readlink(path, linkbuf, sizeof(linkbuf)) <= 0 ||
+					  strcmp(namelist[j], linkbuf))
+			ok = 0;
+		    }
+
+		  free(path);
+		  if (!ok)
 		    continue;
 	        }
 	    } /* non-regex */


Index: psmisc.spec
===================================================================
RCS file: /cvs/dist/rpms/psmisc/FC-6/psmisc.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- psmisc.spec	19 Jul 2006 22:23:26 -0000	1.32
+++ psmisc.spec	2 Apr 2007 12:01:13 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Utilities for managing processes on your system.
 Name: psmisc
 Version: 22.2
-Release: 5
+Release: 5.1
 License: BSD/GPL
 Group: Applications/System
 Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz
@@ -13,6 +13,8 @@
 BuildRequires: ncurses-devel
 
 Patch0: psmisc-22.1-fuser-listsigs.patch
+# 214214: killall <path> misbehavior (prelink, etc)
+Patch1: psmisc-22.3-killall-ino.patch
 
 %description
 The psmisc package contains utilities for managing processes on your
@@ -25,6 +27,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
@@ -57,6 +60,9 @@
 %{_mandir}/man1/pstree.1*
 
 %changelog
+* Mon Apr  2 2007 Karel Zak <kzak at redhat.com> - 22.2-5.1
+- fix #214214 - killall <path> misbehavior (prelink, etc)
+
 * Wed Jul 19 2006 Karel Zak <kzak at redhat.com>  - 22.2-5
 - spec file cleanup & rebuild
 



From fedora-cvs-commits at redhat.com  Mon Apr  2 12:30:10 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 08:30:10 -0400
Subject: rpms/evolution/FC-5 evolution-2.6.3-CVE-2007-1002.patch, NONE,
	1.1 evolution.spec, 1.149, 1.150
Message-ID: <200704021230.l32CUAEV024635@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.6.3-CVE-2007-1002.patch 
Log Message:

* Mon Apr 02 2007 Matthew Barnes <mbarnes at redhat.com> - 2.6.3-2.fc5
- CVE-2007-1002 (Shared memo categories format string vulnerability)


evolution-2.6.3-CVE-2007-1002.patch:
 e-cal-component-memo-preview.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE evolution-2.6.3-CVE-2007-1002.patch ---
--- evolution-2.6.3/calendar/gui/e-cal-component-memo-preview.c.CVE-2007-1002	2007-04-02 08:21:41.000000000 -0400
+++ evolution-2.6.3/calendar/gui/e-cal-component-memo-preview.c	2007-04-02 08:26:42.000000000 -0400
@@ -144,7 +144,7 @@
 			}
 		}
 		
-		gtk_html_stream_printf(stream, string->str);
+		gtk_html_stream_printf(stream, "%s", string->str);
 		
 		gtk_html_stream_printf(stream, "</H3>");
 


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/evolution.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- evolution.spec	7 Aug 2006 20:05:54 -0000	1.149
+++ evolution.spec	2 Apr 2007 12:30:07 -0000	1.150
@@ -41,7 +41,7 @@
 
 Name: evolution
 Version: 2.6.3
-Release: 1.fc5.5
+Release: 2%{?dist}
 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
 
+# CVE-2007-1002
+Patch23: evolution-2.6.3-CVE-2007-1002.patch
+
 ### Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
@@ -209,6 +212,7 @@
 %patch20 -p1 -b .notification-cleanups
 %patch21 -p1 -b .fix-missing-declarations-2.5.5.1
 %patch22 -p1 -b .prototypes
+%patch23 -p1 -b .CVE-2007-1002
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -598,6 +602,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Apr 02 2007 Matthew Barnes <mbarnes at redhat.com> - 2.6.3-2.fc5
+- CVE-2007-1002 (Shared memo categories format string vulnerability)
+
 * Mon Aug  7 2006 Matthew Barnes <mbarnes at redhat.com> - 2.6.3-1.fc5.5
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Mon Apr  2 12:51:11 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 08:51:11 -0400
Subject: rpms/kernel/FC-6 linux-2.6-xen-add-packet_auxdata-cmsg.patch, NONE,
 1.1 linux-2.6-xen-avoid-touching-watchdog-when-gone-too-long.patch, NONE,
 1.1 linux-2.6-xen-blkback-copy-shared-data-before-verification.patch, NONE,
 1.1 linux-2.6-xen-blkback-fix-first_sect-check.patch, NONE,
 1.1 linux-2.6-xen-blkback-fix-potential-grant-entry-leaks-on-error.patch,
 NONE,
 1.1 linux-2.6-xen-blktap-fix-potential-grant-entry-leaks-on-error.patch,
 NONE, 1.1 linux-2.6-xen-copy-shared-data-before-verification.patch, NONE,
 1.1 linux-2.6-xen-fix-2tb-overflow-in-virtual-disk-driver.patch, NONE,
 1.1 linux-2.6-xen-fix-agp-on-x86_64-under-xen.patch, NONE,
 1.1 linux-2.6-xen-fix-nosegneg-detection.patch, NONE,
 1.1 linux-2.6-xen-fix-profiling.patch, NONE,
 1.1 linux-2.6-xen-fix-spinlock-when-removing-xennet-device.patch, NONE,
 1.1 linux-2.6-xen-fix-swiotlb-for-b44-module-kernel-patch.patch, NONE,
 1.1 linux-2.6-xen-iscsi-oops-on-x86_64-xen-domu.patch, 1.2,
 1.3 linux-2.6-xen-make-ballooning-work-right.patch, NONE, 1.1 linux-2.6-x!
 en-make-netfront-device-permanent.patch, NONE,
 1.1 linux-2.6-xen-netback-fix-transmit-credit-scheduler-wrap.patch, NONE,
 1.1 linux-2.6-xen-netback-reenable-tx-queueing.patch, NONE,
 1.1 linux-2.6-xen-pae-handle-64bit-addresses-correctly.patch, NONE,
 1.1 linux-2.6-xen-privcmd-range-check-hypercall-index.patch, NONE,
 1.1 linux-2.6-xen-properly-close-blkfront-on-non-existant-file.patch, NONE,
 1.1 linux-2.6-xen-use-swiotlb-mask-for-coherent-mappings-too.patch, NONE,
 1.1 kernel-2.6.spec, 1.2940, 1.2941
Message-ID: <200704021251.l32CpBp9019951@cvs.devel.redhat.com>

Author: armbru

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-xen-add-packet_auxdata-cmsg.patch 
	linux-2.6-xen-avoid-touching-watchdog-when-gone-too-long.patch 
	linux-2.6-xen-blkback-copy-shared-data-before-verification.patch 
	linux-2.6-xen-blkback-fix-first_sect-check.patch 
	linux-2.6-xen-blkback-fix-potential-grant-entry-leaks-on-error.patch 
	linux-2.6-xen-blktap-fix-potential-grant-entry-leaks-on-error.patch 
	linux-2.6-xen-copy-shared-data-before-verification.patch 
	linux-2.6-xen-fix-2tb-overflow-in-virtual-disk-driver.patch 
	linux-2.6-xen-fix-agp-on-x86_64-under-xen.patch 
	linux-2.6-xen-fix-nosegneg-detection.patch 
	linux-2.6-xen-fix-profiling.patch 
	linux-2.6-xen-fix-spinlock-when-removing-xennet-device.patch 
	linux-2.6-xen-fix-swiotlb-for-b44-module-kernel-patch.patch 
	linux-2.6-xen-iscsi-oops-on-x86_64-xen-domu.patch 
	linux-2.6-xen-make-ballooning-work-right.patch 
	linux-2.6-xen-make-netfront-device-permanent.patch 
	linux-2.6-xen-netback-fix-transmit-credit-scheduler-wrap.patch 
	linux-2.6-xen-netback-reenable-tx-queueing.patch 
	linux-2.6-xen-pae-handle-64bit-addresses-correctly.patch 
	linux-2.6-xen-privcmd-range-check-hypercall-index.patch 
	linux-2.6-xen-properly-close-blkfront-on-non-existant-file.patch 
	linux-2.6-xen-use-swiotlb-mask-for-coherent-mappings-too.patch 
Log Message:
- Xen kernel:
  >4G guest fix (Steven Rostedt )
  fix nosegneg detection (Rik van Riel )
  Use swiotlb mask for coherent mappings too (Herbert Xu )
  Fix potential grant entry leaks on error (Herbert Xu )
  Fix agp on x86_64 under Xen (Stephen C. Tweedie )
  netback: Reenable TX queueing and drop pkts after timeout (Herbert Xu )
  make ballooning work right (Rik van Riel )
  Fix xen swiotlb for b44 module (Stephen C. Tweedie )
  Copy shared data before verification (Herbert Xu )
  Properly close block frontend on non-existant file (Glauber de Oliveira Costa )
  blkback: Fix potential grant entry leaks on error (Rik van Riel )
  blkback: Copy shared data before verification (Rik van Riel)
  netback: Fix wrap to zero in transmit credit scheduler. (Herbert Xu )
  fix 2TB overflow in virtual disk driver (Rik van Riel )
  blkback: Fix first_sect check. (Rik van Riel )
  make netfront device permanent (Glauber de Oliveira Costa )
  fix iSCSI root oops on x86_64 xen domU (Rik van Riel )
  Avoid touching the watchdog when gone for too long (Glauber de Oliveira Costa )
  fix profiling (Rik van Riel )
  privcmd: Range-check hypercall index. (Herbert Xu )
  Fix spinlock bad magic when removing xennet device (Chris Lalancette )
- Add PACKET_AUXDATA cmsg (Herbert Xu )

linux-2.6-xen-add-packet_auxdata-cmsg.patch:
 b/include/linux/if_packet.h |   10 +++++++
 b/net/packet/af_packet.c    |   57 +++++++++++++++++++++++++++++++++++++-------
 net/packet/af_packet.c      |   46 +++++++++++++++++++++++------------
 3 files changed, 88 insertions(+), 25 deletions(-)

--- NEW FILE linux-2.6-xen-add-packet_auxdata-cmsg.patch ---
>From 8dc4194474159660d7f37c495e3fc3f10d0db8cc Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert at gondor.apana.org.au>
Date: Sun, 4 Feb 2007 23:31:32 -0800
Subject: [PATCH] [PACKET]: Add optional checksum computation for recvmsg

This patch is needed to make ISC's DHCP server (and probably other
DHCP servers/clients using AF_PACKET) to be able to serve another
client on the same Xen host.

The problem is that packets between different domains on the same
Xen host only have partial checksums.  Unfortunately this piece of
information is not passed along in AF_PACKET unless you're using
the mmap interface.  Since dhcpd doesn't support packet-mmap, UDP
packets from the same host come out with apparently bogus checksums.

This patch adds a mechanism for AF_PACKET recvmsg(2) to return the
status along with the packet.  It does so by adding a new cmsg that
contains this information along with some other relevant data such
as the original packet length.

I didn't include the time stamp information since there is already
a cmsg for that.

This patch also changes the mmap code to set the CSUMNOTREADY flag
on all packets instead of just outoing packets on cooked sockets.

Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>
---
 include/linux/if_packet.h |   10 ++++++++
 net/packet/af_packet.c    |   57 +++++++++++++++++++++++++++++++++++++-------
 2 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/include/linux/if_packet.h b/include/linux/if_packet.h
index 99393ef..f3de05c 100644
--- a/include/linux/if_packet.h
+++ b/include/linux/if_packet.h
@@ -41,6 +41,7 @@ struct sockaddr_ll
 #define PACKET_RX_RING			5
 #define PACKET_STATISTICS		6
 #define PACKET_COPY_THRESH		7
+#define PACKET_AUXDATA			8
 
 struct tpacket_stats
 {
@@ -48,6 +49,15 @@ struct tpacket_stats
 	unsigned int	tp_drops;
 };
 
+struct tpacket_auxdata
+{
+	__u32		tp_status;
+	__u32		tp_len;
+	__u32		tp_snaplen;
+	__u16		tp_mac;
+	__u16		tp_net;
+};
+
 struct tpacket_hdr
 {
 	unsigned long	tp_status;
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 6dc01bd..8973ea7 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -200,7 +200,8 @@ struct packet_sock {
 #endif
 	struct packet_type	prot_hook;
 	spinlock_t		bind_lock;
-	char			running;	/* prot_hook is attached*/
+	unsigned int		running:1,	/* prot_hook is attached*/
+				auxdata:1;
 	int			ifindex;	/* bound device		*/
 	__be16			num;
 #ifdef CONFIG_PACKET_MULTICAST
@@ -214,6 +215,8 @@ struct packet_sock {
 #endif
 };
 
+#define PACKET_SKB_CB(__skb)	((struct tpacket_auxdata *)((__skb)->cb))
+
 #ifdef CONFIG_PACKET_MMAP
 
 static inline char *packet_lookup_frame(struct packet_sock *po, unsigned int position)
@@ -462,6 +465,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, struct packet
 	u8 * skb_head = skb->data;
 	int skb_len = skb->len;
 	unsigned int snaplen, res;
+	struct tpacket_auxdata *aux;
 
 	if (skb->pkt_type == PACKET_LOOPBACK)
 		goto drop;
@@ -523,6 +527,15 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, struct packet
 	if (dev->hard_header_parse)
 		sll->sll_halen = dev->hard_header_parse(skb, sll->sll_addr);
 
+	aux = PACKET_SKB_CB(skb);
+	aux->tp_status = TP_STATUS_USER;
+	if (skb->ip_summed == CHECKSUM_PARTIAL)
+		aux->tp_status |= TP_STATUS_CSUMNOTREADY;
+	aux->tp_len = skb->len;
+	aux->tp_snaplen = snaplen;
+	aux->tp_mac = 0;
+	aux->tp_net = skb->nh.raw - skb->data;
+
 	if (pskb_trim(skb, snaplen))
 		goto drop_n_acct;
 
@@ -582,11 +595,12 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, struct packe
 		else if (skb->pkt_type == PACKET_OUTGOING) {
 			/* Special case: outgoing packets have ll header at head */
 			skb_pull(skb, skb->nh.raw - skb->data);
-			if (skb->ip_summed == CHECKSUM_PARTIAL)
-				status |= TP_STATUS_CSUMNOTREADY;
 		}
 	}
 
+	if (skb->ip_summed == CHECKSUM_PARTIAL)
+		status |= TP_STATUS_CSUMNOTREADY;
+
 	snaplen = skb->len;
 
 	res = run_filter(skb, sk, snaplen);
@@ -1119,6 +1133,11 @@ static int packet_recvmsg(struct kiocb *iocb, struct socket *sock,
 	if (msg->msg_name)
 		memcpy(msg->msg_name, skb->cb, msg->msg_namelen);
 
+	if (pkt_sk(sk)->auxdata) {
+		struct tpacket_auxdata *aux = PACKET_SKB_CB(skb);
+		put_cmsg(msg, SOL_PACKET, PACKET_AUXDATA, sizeof(*aux), aux);
+	}
+
 	/*
 	 *	Free or return the buffer as appropriate. Again this
 	 *	hides all the races and re-entrancy issues from us.
@@ -1317,6 +1336,7 @@ static int
 packet_setsockopt(struct socket *sock, int level, int optname, char __user *optval, int optlen)
 {
 	struct sock *sk = sock->sk;
+	struct packet_sock *po = pkt_sk(sk);
 	int ret;
 
 	if (level != SOL_PACKET)
@@ -1369,6 +1389,18 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv
 		return 0;
 	}
 #endif
+	case PACKET_AUXDATA:
+	{
+		int val;
+
+		if (optlen < sizeof(val))
+			return -EINVAL;
+		if (copy_from_user(&val, optval, sizeof(val)))
+			return -EFAULT;
+
+		po->auxdata = !!val;
+		return 0;
+	}
 	default:
 		return -ENOPROTOOPT;
 	}
@@ -1378,8 +1410,11 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
 			     char __user *optval, int __user *optlen)
 {
 	int len;
+	int val;
 	struct sock *sk = sock->sk;
 	struct packet_sock *po = pkt_sk(sk);
+	void *data;
+	struct tpacket_stats st;
 
 	if (level != SOL_PACKET)
 		return -ENOPROTOOPT;
@@ -1392,9 +1427,6 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
 		
 	switch(optname)	{
 	case PACKET_STATISTICS:
-	{
-		struct tpacket_stats st;
-
 		if (len > sizeof(struct tpacket_stats))
 			len = sizeof(struct tpacket_stats);
 		spin_lock_bh(&sk->sk_receive_queue.lock);
@@ -1403,16 +1435,23 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
 		spin_unlock_bh(&sk->sk_receive_queue.lock);
 		st.tp_packets += st.tp_drops;
 
-		if (copy_to_user(optval, &st, len))
-			return -EFAULT;
+		data = &st;
+		break;
+	case PACKET_AUXDATA:
+		if (len > sizeof(int))
+			len = sizeof(int);
+		val = po->auxdata;
+
+		data = &val;
 		break;
-	}
 	default:
 		return -ENOPROTOOPT;
 	}
 
 	if (put_user(len, optlen))
 		return -EFAULT;
+	if (copy_to_user(optval, data, len))
+		return -EFAULT;
 	return 0;
 }
 
-- 
1.5.0.5




From fedora-cvs-commits at redhat.com  Mon Apr  2 13:29:10 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 09:29:10 -0400
Subject: rpms/cups/devel cups-str2323.patch,NONE,1.1 cups.spec,1.323,1.324
Message-ID: <200704021329.l32DTArW016594@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str2323.patch 
Log Message:
* Mon Apr  2 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-3
- Don't clear printer-state-reasons after job completion (STR #2323).


cups-str2323.patch:
 job.c |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE cups-str2323.patch ---
--- cups-1.2.10/scheduler/job.c.printer-state-reasons	2007-04-02 13:42:22.000000000 +0100
+++ cups-1.2.10/scheduler/job.c	2007-04-02 13:42:35.000000000 +0100
@@ -215,7 +215,6 @@
 
 	printer->state_message[0] = '\0';
 
-	cupsdSetPrinterReasons(printer, "");
 	cupsdSetPrinterState(printer, IPP_PRINTER_IDLE, 0);
 
 	cupsdAddEvent(CUPSD_EVENT_JOB_COMPLETED, printer, job,


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- cups.spec	29 Mar 2007 16:35:20 -0000	1.323
+++ cups.spec	2 Apr 2007 13:29:08 -0000	1.324
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -44,6 +44,7 @@
 Patch20: cups-getpass.patch
 Patch21: cups-driverd-timeout.patch
 Patch22: cups-af_unix-auth.patch
+Patch23: cups-str2323.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -150,6 +151,7 @@
 %patch20 -p1 -b .getpass
 %patch21 -p1 -b .driverd-timeout
 %patch22 -p1 -b .af_unix-auth
+%patch23 -p1 -b .str2323
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -436,6 +438,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Mon Apr  2 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-3
+- Don't clear printer-state-reasons after job completion (STR #2323).
+
 * Thu Mar 29 2007 Tim Waugh <twaugh at redhat.com>
 - Small improvement for AF_UNIX auth patch.
 



From fedora-cvs-commits at redhat.com  Mon Apr  2 13:30:52 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 09:30:52 -0400
Subject: rpms/cups/FC-6 cups-str2323.patch,NONE,1.1 cups.spec,1.324,1.325
Message-ID: <200704021330.l32DUq7x017864@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str2323.patch 
Log Message:
* Mon Apr  2 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-2
- Don't clear printer-state-reasons after job completion (STR #2323).


cups-str2323.patch:
 job.c |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE cups-str2323.patch ---
--- cups-1.2.10/scheduler/job.c.printer-state-reasons	2007-04-02 13:42:22.000000000 +0100
+++ cups-1.2.10/scheduler/job.c	2007-04-02 13:42:35.000000000 +0100
@@ -215,7 +215,6 @@
 
 	printer->state_message[0] = '\0';
 
-	cupsdSetPrinterReasons(printer, "");
 	cupsdSetPrinterState(printer, IPP_PRINTER_IDLE, 0);
 
 	cupsdAddEvent(CUPSD_EVENT_JOB_COMPLETED, printer, job,


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -r1.324 -r1.325
--- cups.spec	29 Mar 2007 10:30:36 -0000	1.324
+++ cups.spec	2 Apr 2007 13:30:45 -0000	1.325
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -46,6 +46,7 @@
 Patch20: cups-getpass.patch
 Patch21: cups-driverd-timeout.patch
 Patch22: cups-logrotate.patch
+Patch23: cups-str2323.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -153,6 +154,7 @@
 %patch20 -p1 -b .getpass
 %patch21 -p1 -b .driverd-timeout
 %patch22 -p1 -b .logrotate
+%patch23 -p1 -b .str2323
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -436,6 +438,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Mon Apr  2 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-2
+- Don't clear printer-state-reasons after job completion (STR #2323).
+
 * Thu Mar 29 2007 Tim Waugh <twaugh at redhat.com>
 - LSPP: Updated patch for line-wrapped labels (bug #228107).
 



From fedora-cvs-commits at redhat.com  Mon Apr  2 13:31:05 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 09:31:05 -0400
Subject: rpms/rhgb/devel rhgb-0.16.2-change-colors.patch, 1.1,
	NONE rhgb-0.16.2-dont-call-chvt.patch, 1.1,
	NONE rhgb-0.16.2-dont-fight-the-user.patch, 1.1,
	NONE rhgb-0.16.2-dont-switch-vts-on-timeout.patch, 1.1,
	NONE rhgb-0.16.2-drop-internal-gtk-expander.patch, 1.1,
	NONE rhgb-0.16.2-init-utf8.patch, 1.1,
	NONE rhgb-0.16.2-kill-more-zombies.patch, 1.1,
	NONE rhgb-0.16.2-reap-child.patch, 1.2,
	NONE rhgb-0.16.2-scale-logos.patch, 1.1,
	NONE rhgb-0.16.4-random-fixups.patch, 1.2,
	NONE rhgb-0.16.4-wait-for-server-to-exit.patch, 1.1,
	NONE rhgb-modularx.patch, 1.4, NONE
Message-ID: <200704021331.l32DV5fa018129@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/rhgb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18038

Removed Files:
	rhgb-0.16.2-change-colors.patch 
	rhgb-0.16.2-dont-call-chvt.patch 
	rhgb-0.16.2-dont-fight-the-user.patch 
	rhgb-0.16.2-dont-switch-vts-on-timeout.patch 
	rhgb-0.16.2-drop-internal-gtk-expander.patch 
	rhgb-0.16.2-init-utf8.patch 
	rhgb-0.16.2-kill-more-zombies.patch 
	rhgb-0.16.2-reap-child.patch rhgb-0.16.2-scale-logos.patch 
	rhgb-0.16.4-random-fixups.patch 
	rhgb-0.16.4-wait-for-server-to-exit.patch rhgb-modularx.patch 
Log Message:
drop unused patches



--- rhgb-0.16.2-change-colors.patch DELETED ---


--- rhgb-0.16.2-dont-call-chvt.patch DELETED ---


--- rhgb-0.16.2-dont-fight-the-user.patch DELETED ---


--- rhgb-0.16.2-dont-switch-vts-on-timeout.patch DELETED ---


--- rhgb-0.16.2-drop-internal-gtk-expander.patch DELETED ---


--- rhgb-0.16.2-init-utf8.patch DELETED ---


--- rhgb-0.16.2-kill-more-zombies.patch DELETED ---


--- rhgb-0.16.2-reap-child.patch DELETED ---


--- rhgb-0.16.2-scale-logos.patch DELETED ---


--- rhgb-0.16.4-random-fixups.patch DELETED ---


--- rhgb-0.16.4-wait-for-server-to-exit.patch DELETED ---


--- rhgb-modularx.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr  2 13:32:33 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 09:32:33 -0400
Subject: rpms/rhgb/devel rhgb.spec, 1.68,
	1.69 rhgb-0.17.2-add-black-root.patch, 1.1, NONE
Message-ID: <200704021332.l32DWXrJ019180@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/rhgb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19084

Modified Files:
	rhgb.spec 
Removed Files:
	rhgb-0.17.2-add-black-root.patch 
Log Message:
- Fix some more small color issues



Index: rhgb.spec
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/rhgb.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- rhgb.spec	21 Mar 2007 14:59:14 -0000	1.68
+++ rhgb.spec	2 Apr 2007 13:32:31 -0000	1.69
@@ -16,14 +16,11 @@
 Requires: initscripts >= 7.22-1
 Requires: system-logos
 
-Patch0: rhgb-0.17.2-add-black-root.patch
-
 %description
 Red Hat Graphical Boot provides a clean and simple interface to the boot process
 
 %prep
 %setup -q
-%patch0 -p1 -b .add-black-root
 
 %build
 %configure


--- rhgb-0.17.2-add-black-root.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr  2 14:04:07 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 10:04:07 -0400
Subject: rpms/logwatch/devel logwatch-7.3.4-secure.patch, NONE,
	1.1 logwatch.spec, 1.63, 1.64
Message-ID: <200704021404.l32E479k018142@cvs.devel.redhat.com>

Author: varekova

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

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.4-secure.patch 
Log Message:
- Resolves: 234767
  Unmatched Entries in mails since sysklogd 1.4.2-3/#223573


logwatch-7.3.4-secure.patch:
 secure |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.4-secure.patch ---
--- logwatch-7.3.4/scripts/services/secure.pom	2007-01-29 19:29:14.000000000 +0100
+++ logwatch-7.3.4/scripts/services/secure	2007-04-02 15:56:22.000000000 +0200
@@ -204,7 +204,9 @@
       ( $ThisLine =~ /PAM pam_set_item: attempt to set conv\(\) to NULL/) or
       ( $ThisLine =~ /PAM pam_get_item: nowhere to place requested item/) or
       ( $ThisLine =~ /pam_succeed_if\(.*:.*\): error retrieving information about user [a-zA-Z]*/ ) or
-      ( $ThisLine =~ /logfile turned over/) # newsyslog on OpenBSD
+      ( $ThisLine =~ /logfile turned over/) or # newsyslog on OpenBSD
+      ( $ThisLine =~ /Connection closed by/) or
+      ( $ThisLine =~ /sshd: Accepted \S+ for \S+ from [\d\.:a-f]+ port \d+/) # ssh script reads this log
    ) {
       # Ignore these entries
    } elsif ($ThisLine =~ /^spop3d/ || $ThisLine =~ /^pop\(\w+\)\[\d+\]:/) {


Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- logwatch.spec	8 Mar 2007 14:25:45 -0000	1.63
+++ logwatch.spec	2 Apr 2007 14:04:05 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -9,6 +9,7 @@
 Patch1: logwatch-7.2.1-nosegfault.patch
 Patch2: logwatch-7.3.1-vsftpd.patch
 Patch3: logwatch-7.3.4-pam_unix.patch
+Patch4: logwatch-7.3.4-secure.patch
 
 Requires: textutils sh-utils grep mailx
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -25,6 +26,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 
@@ -138,6 +140,10 @@
 %doc License project/CHANGES 
 
 %changelog
+* Mon Apr  2 2007 Ivana Varekova <varekova at redhat.com> 7.3.4-3
+- Resolves: 234767
+  Unmatched Entries in mails since sysklogd 1.4.2-3/#223573
+
 * Thu Mar  8 2007 Ivana Varekova <varekova at redhat.com> 7.3.4-2
 - add pam_unix service patch
 



From fedora-cvs-commits at redhat.com  Mon Apr  2 14:10:07 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 10:10:07 -0400
Subject: rpms/evolution-data-server/devel
	evolution-data-server-1.10.0-code-cleanup.patch, 1.1,
	1.2 evolution-data-server.spec, 1.156, 1.157
Message-ID: <200704021410.l32EA7G7018311@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-data-server-1.10.0-code-cleanup.patch 
	evolution-data-server.spec 
Log Message:

* Mon Apr 02 2007 Matthew Barnes <mbarnes at redhat.com> - 1.10.0-5.fc7
- Make the new ESourceComboBox widget work properly (RH bug #234760).


evolution-data-server-1.10.0-code-cleanup.patch:
 calendar/libical/src/libicalss/icalssyacc.y                   |    1 
 calendar/libical/src/libicalvcal/vcc.y                        |    1 
 docs/reference/libedataserverui/libedataserverui-docs.sgml    |    1 
 docs/reference/libedataserverui/libedataserverui-sections.txt |   23 
 docs/reference/libedataserverui/libedataserverui.types        |    2 
 iconv-detect.c                                                |    1 
 libedataserverui/Makefile.am                                  |    2 
 libedataserverui/Makefile.in                                  |    7 
 libedataserverui/e-name-selector-dialog.c                     |  158 +--
 libedataserverui/e-name-selector-dialog.glade                 |   40 
 libedataserverui/e-name-selector-dialog.h                     |    1 
 libedataserverui/e-name-selector-entry.c                      |    2 
 libedataserverui/e-name-selector-list.c                       |    2 
 libedataserverui/e-source-combo-box.c                         |  461 ++++++++++
 libedataserverui/e-source-combo-box.h                         |   79 +
 libedataserverui/e-source-option-menu.h                       |    3 
 libedataserverui/test-source-option-menu.c                    |   22 
 17 files changed, 681 insertions(+), 125 deletions(-)

Index: evolution-data-server-1.10.0-code-cleanup.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server-1.10.0-code-cleanup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-data-server-1.10.0-code-cleanup.patch	15 Mar 2007 00:56:56 -0000	1.1
+++ evolution-data-server-1.10.0-code-cleanup.patch	2 Apr 2007 14:10:00 -0000	1.2
@@ -1011,12 +1011,12 @@
 +	combo_box = GTK_COMBO_BOX (source_combo_box);
 +
 +	reference = g_hash_table_lookup (priv->uid_to_row_reference, uid);
-+	g_return_if_fail (reference != NULL);
++	g_return_if_fail (gtk_tree_row_reference_valid (reference));
 +
 +	iter_was_set = gtk_tree_model_get_iter (
 +		gtk_combo_box_get_model (combo_box), &iter,
 +		gtk_tree_row_reference_get_path (reference));
-+	g_return_if_fail (!iter_was_set);
++	g_return_if_fail (iter_was_set);
 +
 +	gtk_combo_box_set_active_iter (combo_box, &iter);
 +}


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- evolution-data-server.spec	27 Mar 2007 18:30:19 -0000	1.156
+++ evolution-data-server.spec	2 Apr 2007 14:10:00 -0000	1.157
@@ -26,7 +26,7 @@
 
 Name: evolution-data-server
 Version: 1.10.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -392,6 +392,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Mon Apr 02 2007 Matthew Barnes <mbarnes at redhat.com> - 1.10.0-5.fc7
+- Make the new ESourceComboBox widget work properly (RH bug #234760).
+
 * Tue Mar 27 2007 Matthew Barnes <mbarnes at redhat.com> - 1.10.0-4.fc7
 - Link to static evolution-openldap library (RH bug #210126).
 - Require openssl-devel when statically linking against openldap.



From fedora-cvs-commits at redhat.com  Mon Apr  2 14:10:12 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 10:10:12 -0400
Subject: rpms/xmlsec1/devel xmlsec1.spec,1.27,1.28
Message-ID: <200704021410.l32EACOF018343@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/xmlsec1/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18282

Modified Files:
	xmlsec1.spec 
Log Message:
Applied patch from Michael Schwendt to fix unowned dirs
fixes rhbz#233812
Daniel



Index: xmlsec1.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlsec1/devel/xmlsec1.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xmlsec1.spec	12 Jul 2006 08:54:53 -0000	1.27
+++ xmlsec1.spec	2 Apr 2007 14:10:10 -0000	1.28
@@ -184,12 +184,16 @@
 %defattr(-, root, root)  
 
 %{prefix}/bin/xmlsec1-config
+%dir %{prefix}/include/xmlsec1
+%dir %{prefix}/include/xmlsec1/xmlsec
+%dir %{prefix}/include/xmlsec1/xmlsec/private
 %{prefix}/include/xmlsec1/xmlsec/*.h
 %{prefix}/include/xmlsec1/xmlsec/private/*.h
 %{prefix}/lib*/libxmlsec1.so
 %{prefix}/lib*/libxmlsec1.*a
 %{prefix}/lib*/pkgconfig/xmlsec1.pc
 %{prefix}/lib*/xmlsec1Conf.sh
+%dir %{prefix}/share/doc/xmlsec1
 %{prefix}/share/doc/xmlsec1/* 
 %doc AUTHORS HACKING ChangeLog NEWS README Copyright
 %doc %{_mandir}/man1/xmlsec1-config.1*
@@ -202,6 +206,7 @@
 %files openssl-devel
 %defattr(-, root, root)  
 
+%dir %{prefix}/include/xmlsec1/xmlsec/openssl
 %{prefix}/include/xmlsec1/xmlsec/openssl/*.h
 %{prefix}/lib*/libxmlsec1-openssl.*a
 %{prefix}/lib*/libxmlsec1-openssl.so
@@ -215,6 +220,7 @@
 %files gnutls-devel
 %defattr(-, root, root)  
 
+%dir %{prefix}/include/xmlsec1/xmlsec/gnutls
 %{prefix}/include/xmlsec1/xmlsec/gnutls/*.h
 %{prefix}/lib*/libxmlsec1-gnutls.*a
 %{prefix}/lib*/libxmlsec1-gnutls.so
@@ -228,6 +234,7 @@
 %files nss-devel
 %defattr(-, root, root)  
 
+%dir %{prefix}/include/xmlsec1/xmlsec/nss
 %{prefix}/include/xmlsec1/xmlsec/nss/*.h
 %{prefix}/lib*/libxmlsec1-nss.*a
 %{prefix}/lib*/libxmlsec1-nss.so



From fedora-cvs-commits at redhat.com  Mon Apr  2 14:18:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 10:18:18 -0400
Subject: rpms/hplip/devel hplip-marker-supply.patch, NONE, 1.1 hplip.spec,
	1.106, 1.107
Message-ID: <200704021418.l32EIIAL018557@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Added Files:
	hplip-marker-supply.patch 
Log Message:
* Fri Mar 30 2007 Tim Waugh <twaugh at redhat.com>
- Use marker-supply-low IPP message.


hplip-marker-supply.patch:
 hpijs.cpp |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+)

--- NEW FILE hplip-marker-supply.patch ---
--- hplip-1.7.2/prnt/hpijs/hpijs.cpp.marker-supply	2007-03-30 17:44:32.000000000 +0100
+++ hplip-1.7.2/prnt/hpijs/hpijs.cpp	2007-03-30 17:53:23.000000000 +0100
@@ -516,7 +516,30 @@
       goto BUGOUT;
    }
    if (pSS->pPC->constructor_error < 0)
+   {
       bug("WARNING: %s\n", pSS->GetDriverMessage(pSS->pPC->constructor_error));
+      switch (pSS->pPC->constructor_error)
+      {
+      case WARN_LOW_INK_BOTH_PENS:
+      case WARN_LOW_INK_BLACK:
+      case WARN_LOW_INK_COLOR:
+      case WARN_LOW_INK_PHOTO:
+      case WARN_LOW_INK_GREY:
+      case WARN_LOW_INK_BLACK_PHOTO:
+      case WARN_LOW_INK_COLOR_PHOTO:
+      case WARN_LOW_INK_GREY_PHOTO:
+      case WARN_LOW_INK_COLOR_GREY:
+      case WARN_LOW_INK_COLOR_GREY_PHOTO:
+      case WARN_LOW_INK_COLOR_BLACK_PHOTO:
+      case WARN_LOW_INK_CYAN:
+      case WARN_LOW_INK_MAGENTA:
+      case WARN_LOW_INK_YELLOW:
+      case WARN_LOW_INK_MULTIPLE_PENS:
+	 bug("STATE: +marker-supply-low\n");
+      default:
+	 bug("STATE: -marker-supply-low");
+      }
+   }
 
 #if 0
    bug("device model=%s\n", pSS->pPC->PrinterModel());


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- hplip.spec	1 Mar 2007 10:01:30 -0000	1.106
+++ hplip.spec	2 Apr 2007 14:18:16 -0000	1.107
@@ -19,6 +19,7 @@
 Patch4: hplip-cups-backend.patch
 Patch5: hplip-libm.patch
 Patch6: hplip-ipv6.patch
+Patch7: hplip-marker-supply.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -81,6 +82,9 @@
 # IPv6 support (bug #198377).
 %patch6 -p1 -b .ipv6
 
+# Use marker-supply-low IPP message.
+%patch7 -p1 -b .marker-supply
+
 autoconf # for patch4
 
 %build
@@ -181,6 +185,9 @@
 exit 0
 
 %changelog
+* Fri Mar 30 2007 Tim Waugh <twaugh at redhat.com>
+- Use marker-supply-low IPP message.
+
 * Wed Mar  1 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-1
 - 1.7.2.
 



From fedora-cvs-commits at redhat.com  Mon Apr  2 14:18:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 10:18:57 -0400
Subject: rpms/gpm/devel gpm.spec,1.50,1.51 inputattach.c,1.1,1.2
Message-ID: <200704021418.l32EIvGk018601@cvs.devel.redhat.com>

Author: tjanouse

Update of /cvs/dist/rpms/gpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18586

Modified Files:
	gpm.spec inputattach.c 
Log Message:
* Mon Apr 02 2007 Tomas Janousek <tjanouse at redhat.com> - 1.20.1-82
- updated inputattach.c to 1.24 from cvs, fixes #231635



Index: gpm.spec
===================================================================
RCS file: /cvs/dist/rpms/gpm/devel/gpm.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- gpm.spec	23 Mar 2007 16:26:11 -0000	1.50
+++ gpm.spec	2 Apr 2007 14:18:54 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: A mouse server for the Linux console.
 Name: gpm
 Version: 1.20.1
-Release: 81%{?dist}
+Release: 82%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz
@@ -186,6 +186,9 @@
 %{_libdir}/libgpm.so
 
 %changelog
+* Mon Apr 02 2007 Tomas Janousek <tjanouse at redhat.com> - 1.20.1-82
+- updated inputattach.c to 1.24 from cvs, fixes #231635
+
 * Fri Mar 23 2007 Tomas Janousek <tjanouse at redhat.com> - 1.20.1-81
 - the patch for #168076 caused a strange behaviour with ncurses, fixed it
   differently


Index: inputattach.c
===================================================================
RCS file: /cvs/dist/rpms/gpm/devel/inputattach.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- inputattach.c	9 Sep 2004 05:52:18 -0000	1.1
+++ inputattach.c	2 Apr 2007 14:18:54 -0000	1.2
@@ -342,6 +342,7 @@
 	int speed;
 	int flags;
 	unsigned long type;
+	unsigned long id;
 	unsigned long extra;
 	int flush;
 	int (*init)(int fd, long *id, long *extra);
@@ -349,30 +350,33 @@
 
 struct input_types input_types[] = {
 
-{ "--sunkbd",		"-skb",		B1200, CS8,			SERIO_SUNKBD,	0x00,	1,	NULL },
-{ "--spaceorb",		"-orb",		B9600, CS8,			SERIO_SPACEORB,	0x00,	1,	NULL },
-{ "--spaceball",	"-sbl",		B9600, CS8,			SERIO_SPACEBALL,0x00,	0,	spaceball_init },
-{ "--magellan",		"-mag",		B9600, CS8 | CSTOPB | CRTSCTS,	SERIO_MAGELLAN,	0x00,	1,	magellan_init },
-{ "--warrior",		"-war",		B1200, CS7 | CSTOPB,		SERIO_WARRIOR,	0x00,	1,	warrior_init },
-{ "--stinger",		"-sting",	B1200, CS8,			SERIO_STINGER,	0x00,	1,	stinger_init },
-{ "--mousesystems",	"-msc",		B1200, CS8,			SERIO_MSC,	0x01,	1,	NULL },
-{ "--sunmouse",		"-sun",		B1200, CS8,			SERIO_SUN,	0x01,	1,	NULL },
-{ "--microsoft",	"-bare",	B1200, CS7,			SERIO_MS,	0x00,	1,	NULL },
-{ "--mshack",		"-ms",		B1200, CS7,			SERIO_MS,	0x01,	1,	NULL },
-{ "--mouseman",		"-mman",	B1200, CS7,			SERIO_MP,	0x01,	1,	NULL },
-{ "--intellimouse",	"-ms3",		B1200, CS7,			SERIO_MZ,	0x11,	1,	NULL },
-{ "--mmwheel",		"-mmw",		B1200, CS7 | CSTOPB,		SERIO_MZP,	0x13,	1,	mzp_init },
-{ "--iforce",		"-ifor",	B38400, CS8,			SERIO_IFORCE,	0x00,	0,	NULL },
-{ "--newtonkbd",        "-newt",        B9600, CS8,                     SERIO_NEWTON,	0x00,   0,      newton_init },
-{ "--h3600ts",          "-ipaq",     	B115200, CS8,                   SERIO_H3600,	0x00,   0,      NULL },
-{ "--stowawaykbd",      "-ipaqkbd",     B115200, CS8,                   SERIO_STOWAWAY, 0x00,   0,      NULL },
-{ "--ps2serkbd",	"-ps2ser",	B1200, CS8,			SERIO_PS2SER,	0x00,	1,	NULL },
-#if 0
-{ "--twiddler",		"-twid",	B2400, CS8,			SERIO_TWIDKBD,	0x00,	0,	twiddler_init },
-{ "--twiddler-joy",	"-twidjoy",	B2400, CS8,			SERIO_TWIDJOY,	0x00,	0,	twiddler_init },
-{ "--ipod-remote",	"-ipod",	B9600, CS8,			SERIO_IPOD_REM,	0x00,	0,	NULL },
-#endif
-{ "--dump",		"-dump",	B2400, CS8, 			0,		0x00,	0,	dump_init },
+{ "--sunkbd",		"-skb",		B1200, CS8,			SERIO_SUNKBD,	0,	0,	1,	NULL },
+{ "--lkkbd",		"-lk",		B4800, CS8|CSTOPB,		SERIO_LKKBD,	0,	0,	1,	NULL },
+{ "--vsxxx-aa",		"-vs",		B4800, CS8|CSTOPB|PARENB|PARODD,SERIO_VSXXXAA,	0,	0,	1,	NULL },
+{ "--spaceorb",		"-orb",		B9600, CS8,			SERIO_SPACEORB,	0,	0,	1,	NULL },
+{ "--spaceball",	"-sbl",		B9600, CS8,			SERIO_SPACEBALL,0,	0,	0,	spaceball_init },
+{ "--magellan",		"-mag",		B9600, CS8 | CSTOPB | CRTSCTS,	SERIO_MAGELLAN,	0,	0,	1,	magellan_init },
+{ "--warrior",		"-war",		B1200, CS7 | CSTOPB,		SERIO_WARRIOR,	0,	0,	1,	warrior_init },
+{ "--stinger",		"-sting",	B1200, CS8,			SERIO_STINGER,	0,	0,	1,	stinger_init },
+{ "--mousesystems",	"-msc",		B1200, CS8,			SERIO_MSC,	0,	0x01,	1,	NULL },
+{ "--sunmouse",		"-sun",		B1200, CS8,			SERIO_SUN,	0,	0x01,	1,	NULL },
+{ "--microsoft",	"-bare",	B1200, CS7,			SERIO_MS,	0,	0,	1,	NULL },
+{ "--mshack",		"-ms",		B1200, CS7,			SERIO_MS,	0,	0x01,	1,	NULL },
+{ "--mouseman",		"-mman",	B1200, CS7,			SERIO_MP,	0,	0x01,	1,	NULL },
+{ "--intellimouse",	"-ms3",		B1200, CS7,			SERIO_MZ,	0,	0x11,	1,	NULL },
+{ "--mmwheel",		"-mmw",		B1200, CS7 | CSTOPB,		SERIO_MZP,	0,	0x13,	1,	mzp_init },
+{ "--iforce",		"-ifor",	B38400, CS8,			SERIO_IFORCE,	0,	0,	0,	NULL },
+{ "--newtonkbd",        "-newt",        B9600, CS8,                     SERIO_NEWTON,	0,	0,	0,      newton_init },
+{ "--h3600ts",          "-ipaq",     	B115200, CS8,                   SERIO_H3600,	0,	0,	0,      NULL },
+{ "--stowawaykbd",      "-ipaqkbd",     B115200, CS8,                   SERIO_STOWAWAY, 0,	0,	0,      NULL },
+{ "--ps2serkbd",	"-ps2ser",	B1200, CS8,			SERIO_PS2SER,	0,	0,	1,	NULL },
+{ "--twiddler",		"-twid",	B2400, CS8,			SERIO_TWIDKBD,	0,	0,	0,	twiddler_init },
+{ "--twiddler-joy",	"-twidjoy",	B2400, CS8,			SERIO_TWIDJOY,	0,	0,	0,	twiddler_init },
+{ "--elotouch",		"-elo",		B9600, CS8 | CRTSCTS,		SERIO_ELO,	0,	0,	0,	NULL },
+{ "--elo4002",		"-elo6b",	B9600, CS8 | CRTSCTS,		SERIO_ELO,	1,	0,	0,	NULL },
+{ "--elo271-140",	"-elo4b",	B9600, CS8 | CRTSCTS,		SERIO_ELO,	2,	0,	0,	NULL },
+{ "--elo261-280",	"-elo3b",	B9600, CS8 | CRTSCTS,		SERIO_ELO,	3,	0,	0,	NULL },
+{ "--dump",		"-dump",	B2400, CS8, 			0,		0,	0,	0,	dump_init },
 { "", "", 0, 0 }
 
 };
@@ -392,6 +396,8 @@
                 puts("");
                 puts("Modes:");
                 puts("  --sunkbd        -skb   Sun Type 4 and Type 5 keyboards");
+		puts("  --lkkbd         -lk    DEC LK201 / LK401 keyboards");
+		puts("  --vsxxx-aa      -vs    DEC VSXXX-AA / VSXXX-GA mouse and VSXXX-AB tablet");
                 puts("  --spaceorb      -orb   SpaceOrb 360 / SpaceBall Avenger");
 		puts("  --spaceball     -sbl   SpaceBall 2003 / 3003 / 4000 FLX");
                 puts("  --magellan      -mag   Magellan / SpaceMouse");
@@ -408,11 +414,8 @@
                 puts("  --h3600ts       -ipaq  Ipaq h3600 touchscreen");
 		puts("  --stowawaykbd   -ipaqkbd  Stowaway keyboard");
 		puts("  --ps2serkbd     -ps2ser PS/2 via serial keyboard");
-#if 0
 		puts("  --twiddler      -twid   Handykey Twiddler chording keyboard");
 		puts("  --twiddler-joy  -twidjoy  Handykey Twiddler used as a joystick");
-		puts("  --ipod-remote   -ipod  iPod remote control");
-#endif
 		puts("");
                 return 1;
         }
@@ -438,7 +441,7 @@
 	if (input_types[type].flush)
 		while (!readchar(fd, &c, 100));
 
-	id = 0;
+	id = input_types[type].id;
 	extra = input_types[type].extra;
 
 	if (input_types[type].init && input_types[type].init(fd, &id, &extra)) {
@@ -452,7 +455,7 @@
 		return 1;
 	}
 
-	devt = SERIO_RS232 | input_types[type].type | (id << 8) | (extra << 16);
+	devt = input_types[type].type | (id << 8) | (extra << 16);
 
 	if(ioctl(fd, SPIOCSTYPE, &devt)) {
 		fprintf(stderr, "inputattach: can't set device type\n");



From fedora-cvs-commits at redhat.com  Mon Apr  2 14:20:02 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 10:20:02 -0400
Subject: rpms/gpm/FC-6 gpm.spec,1.49,1.50 inputattach.c,1.1,1.2
Message-ID: <200704021420.l32EK2N2018694@cvs.devel.redhat.com>

Author: tjanouse

Update of /cvs/dist/rpms/gpm/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv18674

Modified Files:
	gpm.spec inputattach.c 
Log Message:
* Mon Apr 02 2007 Tomas Janousek <tjanouse at redhat.com> - 1.20.1-82
- updated inputattach.c to 1.24 from cvs, fixes #231635



Index: gpm.spec
===================================================================
RCS file: /cvs/dist/rpms/gpm/FC-6/gpm.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- gpm.spec	23 Mar 2007 16:31:10 -0000	1.49
+++ gpm.spec	2 Apr 2007 14:20:00 -0000	1.50
@@ -1,7 +1,7 @@
 Summary: A mouse server for the Linux console.
 Name: gpm
 Version: 1.20.1
-Release: 81%{?dist}
+Release: 82%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz
@@ -186,6 +186,9 @@
 %{_libdir}/libgpm.so
 
 %changelog
+* Mon Apr 02 2007 Tomas Janousek <tjanouse at redhat.com> - 1.20.1-82
+- updated inputattach.c to 1.24 from cvs, fixes #231635
+
 * Fri Mar 23 2007 Tomas Janousek <tjanouse at redhat.com> - 1.20.1-81
 - the patch for #168076 caused a strange behaviour with ncurses, fixed it
   differently


Index: inputattach.c
===================================================================
RCS file: /cvs/dist/rpms/gpm/FC-6/inputattach.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- inputattach.c	9 Sep 2004 05:52:18 -0000	1.1
+++ inputattach.c	2 Apr 2007 14:20:00 -0000	1.2
@@ -342,6 +342,7 @@
 	int speed;
 	int flags;
 	unsigned long type;
+	unsigned long id;
 	unsigned long extra;
 	int flush;
 	int (*init)(int fd, long *id, long *extra);
@@ -349,30 +350,33 @@
 
 struct input_types input_types[] = {
 
-{ "--sunkbd",		"-skb",		B1200, CS8,			SERIO_SUNKBD,	0x00,	1,	NULL },
-{ "--spaceorb",		"-orb",		B9600, CS8,			SERIO_SPACEORB,	0x00,	1,	NULL },
-{ "--spaceball",	"-sbl",		B9600, CS8,			SERIO_SPACEBALL,0x00,	0,	spaceball_init },
-{ "--magellan",		"-mag",		B9600, CS8 | CSTOPB | CRTSCTS,	SERIO_MAGELLAN,	0x00,	1,	magellan_init },
-{ "--warrior",		"-war",		B1200, CS7 | CSTOPB,		SERIO_WARRIOR,	0x00,	1,	warrior_init },
-{ "--stinger",		"-sting",	B1200, CS8,			SERIO_STINGER,	0x00,	1,	stinger_init },
-{ "--mousesystems",	"-msc",		B1200, CS8,			SERIO_MSC,	0x01,	1,	NULL },
-{ "--sunmouse",		"-sun",		B1200, CS8,			SERIO_SUN,	0x01,	1,	NULL },
-{ "--microsoft",	"-bare",	B1200, CS7,			SERIO_MS,	0x00,	1,	NULL },
-{ "--mshack",		"-ms",		B1200, CS7,			SERIO_MS,	0x01,	1,	NULL },
-{ "--mouseman",		"-mman",	B1200, CS7,			SERIO_MP,	0x01,	1,	NULL },
-{ "--intellimouse",	"-ms3",		B1200, CS7,			SERIO_MZ,	0x11,	1,	NULL },
-{ "--mmwheel",		"-mmw",		B1200, CS7 | CSTOPB,		SERIO_MZP,	0x13,	1,	mzp_init },
-{ "--iforce",		"-ifor",	B38400, CS8,			SERIO_IFORCE,	0x00,	0,	NULL },
-{ "--newtonkbd",        "-newt",        B9600, CS8,                     SERIO_NEWTON,	0x00,   0,      newton_init },
-{ "--h3600ts",          "-ipaq",     	B115200, CS8,                   SERIO_H3600,	0x00,   0,      NULL },
-{ "--stowawaykbd",      "-ipaqkbd",     B115200, CS8,                   SERIO_STOWAWAY, 0x00,   0,      NULL },
-{ "--ps2serkbd",	"-ps2ser",	B1200, CS8,			SERIO_PS2SER,	0x00,	1,	NULL },
-#if 0
-{ "--twiddler",		"-twid",	B2400, CS8,			SERIO_TWIDKBD,	0x00,	0,	twiddler_init },
-{ "--twiddler-joy",	"-twidjoy",	B2400, CS8,			SERIO_TWIDJOY,	0x00,	0,	twiddler_init },
-{ "--ipod-remote",	"-ipod",	B9600, CS8,			SERIO_IPOD_REM,	0x00,	0,	NULL },
-#endif
-{ "--dump",		"-dump",	B2400, CS8, 			0,		0x00,	0,	dump_init },
+{ "--sunkbd",		"-skb",		B1200, CS8,			SERIO_SUNKBD,	0,	0,	1,	NULL },
+{ "--lkkbd",		"-lk",		B4800, CS8|CSTOPB,		SERIO_LKKBD,	0,	0,	1,	NULL },
+{ "--vsxxx-aa",		"-vs",		B4800, CS8|CSTOPB|PARENB|PARODD,SERIO_VSXXXAA,	0,	0,	1,	NULL },
+{ "--spaceorb",		"-orb",		B9600, CS8,			SERIO_SPACEORB,	0,	0,	1,	NULL },
+{ "--spaceball",	"-sbl",		B9600, CS8,			SERIO_SPACEBALL,0,	0,	0,	spaceball_init },
+{ "--magellan",		"-mag",		B9600, CS8 | CSTOPB | CRTSCTS,	SERIO_MAGELLAN,	0,	0,	1,	magellan_init },
+{ "--warrior",		"-war",		B1200, CS7 | CSTOPB,		SERIO_WARRIOR,	0,	0,	1,	warrior_init },
+{ "--stinger",		"-sting",	B1200, CS8,			SERIO_STINGER,	0,	0,	1,	stinger_init },
+{ "--mousesystems",	"-msc",		B1200, CS8,			SERIO_MSC,	0,	0x01,	1,	NULL },
+{ "--sunmouse",		"-sun",		B1200, CS8,			SERIO_SUN,	0,	0x01,	1,	NULL },
+{ "--microsoft",	"-bare",	B1200, CS7,			SERIO_MS,	0,	0,	1,	NULL },
+{ "--mshack",		"-ms",		B1200, CS7,			SERIO_MS,	0,	0x01,	1,	NULL },
+{ "--mouseman",		"-mman",	B1200, CS7,			SERIO_MP,	0,	0x01,	1,	NULL },
+{ "--intellimouse",	"-ms3",		B1200, CS7,			SERIO_MZ,	0,	0x11,	1,	NULL },
+{ "--mmwheel",		"-mmw",		B1200, CS7 | CSTOPB,		SERIO_MZP,	0,	0x13,	1,	mzp_init },
+{ "--iforce",		"-ifor",	B38400, CS8,			SERIO_IFORCE,	0,	0,	0,	NULL },
+{ "--newtonkbd",        "-newt",        B9600, CS8,                     SERIO_NEWTON,	0,	0,	0,      newton_init },
+{ "--h3600ts",          "-ipaq",     	B115200, CS8,                   SERIO_H3600,	0,	0,	0,      NULL },
+{ "--stowawaykbd",      "-ipaqkbd",     B115200, CS8,                   SERIO_STOWAWAY, 0,	0,	0,      NULL },
+{ "--ps2serkbd",	"-ps2ser",	B1200, CS8,			SERIO_PS2SER,	0,	0,	1,	NULL },
+{ "--twiddler",		"-twid",	B2400, CS8,			SERIO_TWIDKBD,	0,	0,	0,	twiddler_init },
+{ "--twiddler-joy",	"-twidjoy",	B2400, CS8,			SERIO_TWIDJOY,	0,	0,	0,	twiddler_init },
+{ "--elotouch",		"-elo",		B9600, CS8 | CRTSCTS,		SERIO_ELO,	0,	0,	0,	NULL },
+{ "--elo4002",		"-elo6b",	B9600, CS8 | CRTSCTS,		SERIO_ELO,	1,	0,	0,	NULL },
+{ "--elo271-140",	"-elo4b",	B9600, CS8 | CRTSCTS,		SERIO_ELO,	2,	0,	0,	NULL },
+{ "--elo261-280",	"-elo3b",	B9600, CS8 | CRTSCTS,		SERIO_ELO,	3,	0,	0,	NULL },
+{ "--dump",		"-dump",	B2400, CS8, 			0,		0,	0,	0,	dump_init },
 { "", "", 0, 0 }
 
 };
@@ -392,6 +396,8 @@
                 puts("");
                 puts("Modes:");
                 puts("  --sunkbd        -skb   Sun Type 4 and Type 5 keyboards");
+		puts("  --lkkbd         -lk    DEC LK201 / LK401 keyboards");
+		puts("  --vsxxx-aa      -vs    DEC VSXXX-AA / VSXXX-GA mouse and VSXXX-AB tablet");
                 puts("  --spaceorb      -orb   SpaceOrb 360 / SpaceBall Avenger");
 		puts("  --spaceball     -sbl   SpaceBall 2003 / 3003 / 4000 FLX");
                 puts("  --magellan      -mag   Magellan / SpaceMouse");
@@ -408,11 +414,8 @@
                 puts("  --h3600ts       -ipaq  Ipaq h3600 touchscreen");
 		puts("  --stowawaykbd   -ipaqkbd  Stowaway keyboard");
 		puts("  --ps2serkbd     -ps2ser PS/2 via serial keyboard");
-#if 0
 		puts("  --twiddler      -twid   Handykey Twiddler chording keyboard");
 		puts("  --twiddler-joy  -twidjoy  Handykey Twiddler used as a joystick");
-		puts("  --ipod-remote   -ipod  iPod remote control");
-#endif
 		puts("");
                 return 1;
         }
@@ -438,7 +441,7 @@
 	if (input_types[type].flush)
 		while (!readchar(fd, &c, 100));
 
-	id = 0;
+	id = input_types[type].id;
 	extra = input_types[type].extra;
 
 	if (input_types[type].init && input_types[type].init(fd, &id, &extra)) {
@@ -452,7 +455,7 @@
 		return 1;
 	}
 
-	devt = SERIO_RS232 | input_types[type].type | (id << 8) | (extra << 16);
+	devt = input_types[type].type | (id << 8) | (extra << 16);
 
 	if(ioctl(fd, SPIOCSTYPE, &devt)) {
 		fprintf(stderr, "inputattach: can't set device type\n");



From fedora-cvs-commits at redhat.com  Mon Apr  2 14:20:59 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 10:20:59 -0400
Subject: rpms/gpm/FC-5 gpm.spec,1.44,1.45 inputattach.c,1.1,1.2
Message-ID: <200704021420.l32EKxso018772@cvs.devel.redhat.com>

Author: tjanouse

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

Modified Files:
	gpm.spec inputattach.c 
Log Message:
* Mon Apr 02 2007 Tomas Janousek <tjanouse at redhat.com> - 1.20.1-82
- updated inputattach.c to 1.24 from cvs, fixes #231635



Index: gpm.spec
===================================================================
RCS file: /cvs/dist/rpms/gpm/FC-5/gpm.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gpm.spec	23 Mar 2007 16:31:55 -0000	1.44
+++ gpm.spec	2 Apr 2007 14:20:57 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: A mouse server for the Linux console.
 Name: gpm
 Version: 1.20.1
-Release: 81%{?dist}
+Release: 82%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz
@@ -186,6 +186,9 @@
 %{_libdir}/libgpm.so
 
 %changelog
+* Mon Apr 02 2007 Tomas Janousek <tjanouse at redhat.com> - 1.20.1-82
+- updated inputattach.c to 1.24 from cvs, fixes #231635
+
 * Fri Mar 23 2007 Tomas Janousek <tjanouse at redhat.com> - 1.20.1-81
 - the patch for #168076 caused a strange behaviour with ncurses, fixed it
   differently


Index: inputattach.c
===================================================================
RCS file: /cvs/dist/rpms/gpm/FC-5/inputattach.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- inputattach.c	9 Sep 2004 05:52:18 -0000	1.1
+++ inputattach.c	2 Apr 2007 14:20:57 -0000	1.2
@@ -342,6 +342,7 @@
 	int speed;
 	int flags;
 	unsigned long type;
+	unsigned long id;
 	unsigned long extra;
 	int flush;
 	int (*init)(int fd, long *id, long *extra);
@@ -349,30 +350,33 @@
 
 struct input_types input_types[] = {
 
-{ "--sunkbd",		"-skb",		B1200, CS8,			SERIO_SUNKBD,	0x00,	1,	NULL },
-{ "--spaceorb",		"-orb",		B9600, CS8,			SERIO_SPACEORB,	0x00,	1,	NULL },
-{ "--spaceball",	"-sbl",		B9600, CS8,			SERIO_SPACEBALL,0x00,	0,	spaceball_init },
-{ "--magellan",		"-mag",		B9600, CS8 | CSTOPB | CRTSCTS,	SERIO_MAGELLAN,	0x00,	1,	magellan_init },
-{ "--warrior",		"-war",		B1200, CS7 | CSTOPB,		SERIO_WARRIOR,	0x00,	1,	warrior_init },
-{ "--stinger",		"-sting",	B1200, CS8,			SERIO_STINGER,	0x00,	1,	stinger_init },
-{ "--mousesystems",	"-msc",		B1200, CS8,			SERIO_MSC,	0x01,	1,	NULL },
-{ "--sunmouse",		"-sun",		B1200, CS8,			SERIO_SUN,	0x01,	1,	NULL },
-{ "--microsoft",	"-bare",	B1200, CS7,			SERIO_MS,	0x00,	1,	NULL },
-{ "--mshack",		"-ms",		B1200, CS7,			SERIO_MS,	0x01,	1,	NULL },
-{ "--mouseman",		"-mman",	B1200, CS7,			SERIO_MP,	0x01,	1,	NULL },
-{ "--intellimouse",	"-ms3",		B1200, CS7,			SERIO_MZ,	0x11,	1,	NULL },
-{ "--mmwheel",		"-mmw",		B1200, CS7 | CSTOPB,		SERIO_MZP,	0x13,	1,	mzp_init },
-{ "--iforce",		"-ifor",	B38400, CS8,			SERIO_IFORCE,	0x00,	0,	NULL },
-{ "--newtonkbd",        "-newt",        B9600, CS8,                     SERIO_NEWTON,	0x00,   0,      newton_init },
-{ "--h3600ts",          "-ipaq",     	B115200, CS8,                   SERIO_H3600,	0x00,   0,      NULL },
-{ "--stowawaykbd",      "-ipaqkbd",     B115200, CS8,                   SERIO_STOWAWAY, 0x00,   0,      NULL },
-{ "--ps2serkbd",	"-ps2ser",	B1200, CS8,			SERIO_PS2SER,	0x00,	1,	NULL },
-#if 0
-{ "--twiddler",		"-twid",	B2400, CS8,			SERIO_TWIDKBD,	0x00,	0,	twiddler_init },
-{ "--twiddler-joy",	"-twidjoy",	B2400, CS8,			SERIO_TWIDJOY,	0x00,	0,	twiddler_init },
-{ "--ipod-remote",	"-ipod",	B9600, CS8,			SERIO_IPOD_REM,	0x00,	0,	NULL },
-#endif
-{ "--dump",		"-dump",	B2400, CS8, 			0,		0x00,	0,	dump_init },
+{ "--sunkbd",		"-skb",		B1200, CS8,			SERIO_SUNKBD,	0,	0,	1,	NULL },
+{ "--lkkbd",		"-lk",		B4800, CS8|CSTOPB,		SERIO_LKKBD,	0,	0,	1,	NULL },
+{ "--vsxxx-aa",		"-vs",		B4800, CS8|CSTOPB|PARENB|PARODD,SERIO_VSXXXAA,	0,	0,	1,	NULL },
+{ "--spaceorb",		"-orb",		B9600, CS8,			SERIO_SPACEORB,	0,	0,	1,	NULL },
+{ "--spaceball",	"-sbl",		B9600, CS8,			SERIO_SPACEBALL,0,	0,	0,	spaceball_init },
+{ "--magellan",		"-mag",		B9600, CS8 | CSTOPB | CRTSCTS,	SERIO_MAGELLAN,	0,	0,	1,	magellan_init },
+{ "--warrior",		"-war",		B1200, CS7 | CSTOPB,		SERIO_WARRIOR,	0,	0,	1,	warrior_init },
+{ "--stinger",		"-sting",	B1200, CS8,			SERIO_STINGER,	0,	0,	1,	stinger_init },
+{ "--mousesystems",	"-msc",		B1200, CS8,			SERIO_MSC,	0,	0x01,	1,	NULL },
+{ "--sunmouse",		"-sun",		B1200, CS8,			SERIO_SUN,	0,	0x01,	1,	NULL },
+{ "--microsoft",	"-bare",	B1200, CS7,			SERIO_MS,	0,	0,	1,	NULL },
+{ "--mshack",		"-ms",		B1200, CS7,			SERIO_MS,	0,	0x01,	1,	NULL },
+{ "--mouseman",		"-mman",	B1200, CS7,			SERIO_MP,	0,	0x01,	1,	NULL },
+{ "--intellimouse",	"-ms3",		B1200, CS7,			SERIO_MZ,	0,	0x11,	1,	NULL },
+{ "--mmwheel",		"-mmw",		B1200, CS7 | CSTOPB,		SERIO_MZP,	0,	0x13,	1,	mzp_init },
+{ "--iforce",		"-ifor",	B38400, CS8,			SERIO_IFORCE,	0,	0,	0,	NULL },
+{ "--newtonkbd",        "-newt",        B9600, CS8,                     SERIO_NEWTON,	0,	0,	0,      newton_init },
+{ "--h3600ts",          "-ipaq",     	B115200, CS8,                   SERIO_H3600,	0,	0,	0,      NULL },
+{ "--stowawaykbd",      "-ipaqkbd",     B115200, CS8,                   SERIO_STOWAWAY, 0,	0,	0,      NULL },
+{ "--ps2serkbd",	"-ps2ser",	B1200, CS8,			SERIO_PS2SER,	0,	0,	1,	NULL },
+{ "--twiddler",		"-twid",	B2400, CS8,			SERIO_TWIDKBD,	0,	0,	0,	twiddler_init },
+{ "--twiddler-joy",	"-twidjoy",	B2400, CS8,			SERIO_TWIDJOY,	0,	0,	0,	twiddler_init },
+{ "--elotouch",		"-elo",		B9600, CS8 | CRTSCTS,		SERIO_ELO,	0,	0,	0,	NULL },
+{ "--elo4002",		"-elo6b",	B9600, CS8 | CRTSCTS,		SERIO_ELO,	1,	0,	0,	NULL },
+{ "--elo271-140",	"-elo4b",	B9600, CS8 | CRTSCTS,		SERIO_ELO,	2,	0,	0,	NULL },
+{ "--elo261-280",	"-elo3b",	B9600, CS8 | CRTSCTS,		SERIO_ELO,	3,	0,	0,	NULL },
+{ "--dump",		"-dump",	B2400, CS8, 			0,		0,	0,	0,	dump_init },
 { "", "", 0, 0 }
 
 };
@@ -392,6 +396,8 @@
                 puts("");
                 puts("Modes:");
                 puts("  --sunkbd        -skb   Sun Type 4 and Type 5 keyboards");
+		puts("  --lkkbd         -lk    DEC LK201 / LK401 keyboards");
+		puts("  --vsxxx-aa      -vs    DEC VSXXX-AA / VSXXX-GA mouse and VSXXX-AB tablet");
                 puts("  --spaceorb      -orb   SpaceOrb 360 / SpaceBall Avenger");
 		puts("  --spaceball     -sbl   SpaceBall 2003 / 3003 / 4000 FLX");
                 puts("  --magellan      -mag   Magellan / SpaceMouse");
@@ -408,11 +414,8 @@
                 puts("  --h3600ts       -ipaq  Ipaq h3600 touchscreen");
 		puts("  --stowawaykbd   -ipaqkbd  Stowaway keyboard");
 		puts("  --ps2serkbd     -ps2ser PS/2 via serial keyboard");
-#if 0
 		puts("  --twiddler      -twid   Handykey Twiddler chording keyboard");
 		puts("  --twiddler-joy  -twidjoy  Handykey Twiddler used as a joystick");
-		puts("  --ipod-remote   -ipod  iPod remote control");
-#endif
 		puts("");
                 return 1;
         }
@@ -438,7 +441,7 @@
 	if (input_types[type].flush)
 		while (!readchar(fd, &c, 100));
 
-	id = 0;
+	id = input_types[type].id;
 	extra = input_types[type].extra;
 
 	if (input_types[type].init && input_types[type].init(fd, &id, &extra)) {
@@ -452,7 +455,7 @@
 		return 1;
 	}
 
-	devt = SERIO_RS232 | input_types[type].type | (id << 8) | (extra << 16);
+	devt = input_types[type].type | (id << 8) | (extra << 16);
 
 	if(ioctl(fd, SPIOCSTYPE, &devt)) {
 		fprintf(stderr, "inputattach: can't set device type\n");



From fedora-cvs-commits at redhat.com  Mon Apr  2 14:27:41 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 10:27:41 -0400
Subject: rpms/gpm/FC-5 inputattach.c,1.2,1.3
Message-ID: <200704021427.l32ERflH018935@cvs.devel.redhat.com>

Author: tjanouse

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

Modified Files:
	inputattach.c 
Log Message:
Fixed inputattach to compile on fc5.



Index: inputattach.c
===================================================================
RCS file: /cvs/dist/rpms/gpm/FC-5/inputattach.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- inputattach.c	2 Apr 2007 14:20:57 -0000	1.2
+++ inputattach.c	2 Apr 2007 14:27:38 -0000	1.3
@@ -351,8 +351,8 @@
 struct input_types input_types[] = {
 
 { "--sunkbd",		"-skb",		B1200, CS8,			SERIO_SUNKBD,	0,	0,	1,	NULL },
-{ "--lkkbd",		"-lk",		B4800, CS8|CSTOPB,		SERIO_LKKBD,	0,	0,	1,	NULL },
-{ "--vsxxx-aa",		"-vs",		B4800, CS8|CSTOPB|PARENB|PARODD,SERIO_VSXXXAA,	0,	0,	1,	NULL },
+//{ "--lkkbd",		"-lk",		B4800, CS8|CSTOPB,		SERIO_LKKBD,	0,	0,	1,	NULL },
+//{ "--vsxxx-aa",		"-vs",		B4800, CS8|CSTOPB|PARENB|PARODD,SERIO_VSXXXAA,	0,	0,	1,	NULL },
 { "--spaceorb",		"-orb",		B9600, CS8,			SERIO_SPACEORB,	0,	0,	1,	NULL },
 { "--spaceball",	"-sbl",		B9600, CS8,			SERIO_SPACEBALL,0,	0,	0,	spaceball_init },
 { "--magellan",		"-mag",		B9600, CS8 | CSTOPB | CRTSCTS,	SERIO_MAGELLAN,	0,	0,	1,	magellan_init },
@@ -370,12 +370,12 @@
 { "--h3600ts",          "-ipaq",     	B115200, CS8,                   SERIO_H3600,	0,	0,	0,      NULL },
 { "--stowawaykbd",      "-ipaqkbd",     B115200, CS8,                   SERIO_STOWAWAY, 0,	0,	0,      NULL },
 { "--ps2serkbd",	"-ps2ser",	B1200, CS8,			SERIO_PS2SER,	0,	0,	1,	NULL },
-{ "--twiddler",		"-twid",	B2400, CS8,			SERIO_TWIDKBD,	0,	0,	0,	twiddler_init },
-{ "--twiddler-joy",	"-twidjoy",	B2400, CS8,			SERIO_TWIDJOY,	0,	0,	0,	twiddler_init },
-{ "--elotouch",		"-elo",		B9600, CS8 | CRTSCTS,		SERIO_ELO,	0,	0,	0,	NULL },
-{ "--elo4002",		"-elo6b",	B9600, CS8 | CRTSCTS,		SERIO_ELO,	1,	0,	0,	NULL },
-{ "--elo271-140",	"-elo4b",	B9600, CS8 | CRTSCTS,		SERIO_ELO,	2,	0,	0,	NULL },
-{ "--elo261-280",	"-elo3b",	B9600, CS8 | CRTSCTS,		SERIO_ELO,	3,	0,	0,	NULL },
+//{ "--twiddler",		"-twid",	B2400, CS8,			SERIO_TWIDKBD,	0,	0,	0,	twiddler_init },
+//{ "--twiddler-joy",	"-twidjoy",	B2400, CS8,			SERIO_TWIDJOY,	0,	0,	0,	twiddler_init },
+//{ "--elotouch",		"-elo",		B9600, CS8 | CRTSCTS,		SERIO_ELO,	0,	0,	0,	NULL },
+//{ "--elo4002",		"-elo6b",	B9600, CS8 | CRTSCTS,		SERIO_ELO,	1,	0,	0,	NULL },
+//{ "--elo271-140",	"-elo4b",	B9600, CS8 | CRTSCTS,		SERIO_ELO,	2,	0,	0,	NULL },
+//{ "--elo261-280",	"-elo3b",	B9600, CS8 | CRTSCTS,		SERIO_ELO,	3,	0,	0,	NULL },
 { "--dump",		"-dump",	B2400, CS8, 			0,		0,	0,	0,	dump_init },
 { "", "", 0, 0 }
 
@@ -396,8 +396,8 @@
                 puts("");
                 puts("Modes:");
                 puts("  --sunkbd        -skb   Sun Type 4 and Type 5 keyboards");
-		puts("  --lkkbd         -lk    DEC LK201 / LK401 keyboards");
-		puts("  --vsxxx-aa      -vs    DEC VSXXX-AA / VSXXX-GA mouse and VSXXX-AB tablet");
+//		puts("  --lkkbd         -lk    DEC LK201 / LK401 keyboards");
+//		puts("  --vsxxx-aa      -vs    DEC VSXXX-AA / VSXXX-GA mouse and VSXXX-AB tablet");
                 puts("  --spaceorb      -orb   SpaceOrb 360 / SpaceBall Avenger");
 		puts("  --spaceball     -sbl   SpaceBall 2003 / 3003 / 4000 FLX");
                 puts("  --magellan      -mag   Magellan / SpaceMouse");
@@ -414,8 +414,8 @@
                 puts("  --h3600ts       -ipaq  Ipaq h3600 touchscreen");
 		puts("  --stowawaykbd   -ipaqkbd  Stowaway keyboard");
 		puts("  --ps2serkbd     -ps2ser PS/2 via serial keyboard");
-		puts("  --twiddler      -twid   Handykey Twiddler chording keyboard");
-		puts("  --twiddler-joy  -twidjoy  Handykey Twiddler used as a joystick");
+//		puts("  --twiddler      -twid   Handykey Twiddler chording keyboard");
+//		puts("  --twiddler-joy  -twidjoy  Handykey Twiddler used as a joystick");
 		puts("");
                 return 1;
         }



From fedora-cvs-commits at redhat.com  Mon Apr  2 14:32:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 10:32:21 -0400
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.143,1.144
Message-ID: <200704021432.l32EWLUT000387@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-screensaver.spec 
Log Message:
remove /etc/skel/Pictures



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- gnome-screensaver.spec	1 Apr 2007 13:24:14 -0000	1.143
+++ gnome-screensaver.spec	2 Apr 2007 14:32:19 -0000	1.144
@@ -13,7 +13,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.18.0
-Release: 3%{?dist} 
+Release: 4%{?dist} 
 License: GPL
 Group: Amusements/Graphics
 Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/2.18/%{name}-%{version}.tar.bz2
@@ -92,8 +92,6 @@
 # hide xscreensaver from the menus
 install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/preferences-post-merged/gnome-screensaver-hide-xscreensaver.menu
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/skel/Pictures
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -123,9 +121,12 @@
 %{_sysconfdir}/xdg/menus/preferences-post-merged/*
 %{_sysconfdir}/xdg/menus/gnome-screensavers.menu
 %{_sysconfdir}/pam.d/*
-%{_sysconfdir}/skel/Pictures
 
 %changelog
+* Mon Apr  2 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-4
+- Remove the hardwired /etc/skel/Pictures, since we are
+  now using xdg-user-dirs
+
 * Sun Apr  1 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-3
 - Fall back to HOME/Pictures if PICTURES is not set
 



From fedora-cvs-commits at redhat.com  Mon Apr  2 14:42:11 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 10:42:11 -0400
Subject: rpms/boost/devel boost.spec,1.33,1.34
Message-ID: <200704021442.l32EgBAo007422@cvs.devel.redhat.com>

Author: bkoz

Update of /cvs/dist/rpms/boost/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7262

Modified Files:
	boost.spec 
Log Message:
* Mon Apr 02 2007 Benjamin Kosnik <bkoz at redhat.com> 1.33.1-13
- (#225622: Merge Review: boost)
  Change static to devel-static.




Index: boost.spec
===================================================================
RCS file: /cvs/dist/rpms/boost/devel/boost.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- boost.spec	26 Mar 2007 16:25:34 -0000	1.33
+++ boost.spec	2 Apr 2007 14:42:09 -0000	1.34
@@ -1,7 +1,7 @@
 Name: boost
 Summary: The Boost C++ Libraries
 Version: 1.33.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: Boost Software License (GPL-Compatible, Free Software License)
 URL: http://www.boost.org/
 Group: System Environment/Libraries
@@ -47,13 +47,13 @@
 %description devel
 Headers and shared object symlinks for the Boost C++ libraries.
 
-%package static
+%package devel-static
 Summary: The Boost C++ static development libraries
 Group: Development/Libraries
 Requires: boost = %{version}-%{release}
 Provides: boost-python-devel = %{version}-%{release}
 
-%description static
+%description devel-static
 Static libraries for the Boost C++ libraries.
 
 %package doc
@@ -174,7 +174,7 @@
 %{_includedir}/boost
 %{_libdir}/*.so
 
-%files static
+%files devel-static
 %defattr(-, root, root, -)
 %{_libdir}/*.a
 
@@ -183,6 +183,10 @@
 %doc %{_docdir}/boost-%{version}
 
 %changelog
+* Mon Apr 02 2007 Benjamin Kosnik <bkoz at redhat.com> 1.33.1-13
+- (#225622: Merge Review: boost)
+  Change static to devel-static.
+
 * Mon Mar 26 2007 Benjamin Kosnik <bkoz at redhat.com> 1.33.1-12
 - (#233523: libboost_python needs rebuild against python 2.5)
   Use patch.



From fedora-cvs-commits at redhat.com  Mon Apr  2 14:54:16 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 10:54:16 -0400
Subject: rpms/spamassassin/devel .cvsignore, 1.34, 1.35 sources, 1.33,
	1.34 spamassassin.spec, 1.91, 1.92
Message-ID: <200704021454.l32EsGet016442@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/spamassassin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16350

Modified Files:
	.cvsignore sources spamassassin.spec 
Log Message:
3.2.0 rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	2 Mar 2007 19:10:34 -0000	1.34
+++ .cvsignore	2 Apr 2007 14:54:11 -0000	1.35
@@ -1 +1 @@
-Mail-SpamAssassin-3.2.0-pre2.tar.bz2
+Mail-SpamAssassin-3.2.0-rc1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	2 Mar 2007 19:10:34 -0000	1.33
+++ sources	2 Apr 2007 14:54:11 -0000	1.34
@@ -1 +1 @@
-b530e3b3b828cc0fbe8ee738a300dcef  Mail-SpamAssassin-3.2.0-pre2.tar.bz2
+2be09ab4fad7960e739ecf8a0bacc8cb  Mail-SpamAssassin-3.2.0-rc1.tar.bz2


Index: spamassassin.spec
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- spamassassin.spec	7 Mar 2007 00:41:24 -0000	1.91
+++ spamassassin.spec	2 Apr 2007 14:54:11 -0000	1.92
@@ -12,12 +12,12 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 # temporary pre-release number
-%define pre pre2
+%define pre rc1
 
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: spamassassin
 Version: 3.2.0
-Release: 0.2.%{pre}%{?dist}
+Release: 0.3.%{pre}%{?dist}
 License: Apache License
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -192,6 +192,9 @@
 exit 0
 
 %changelog
+* Mon Apr 02 2007 Warren Togami <wtogami at redhat.com> 3.2.0-0.3.rc1
+- 3.2.0 rc1
+
 * Tue Mar 06 2007 Warren Togami <wtogami at redhat.com> 3.2.0-0.2.pre2
 - Conditional to require perl-devel during build for FC7+ (#226276)
 



From fedora-cvs-commits at redhat.com  Mon Apr  2 15:17:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 11:17:53 -0400
Subject: rpms/selinux-policy/devel .cvsignore, 1.109,
	1.110 modules-strict.conf, 1.25, 1.26 modules-targeted.conf,
	1.52, 1.53 policy-20070219.patch, 1.33,
	1.34 selinux-policy.spec, 1.420, 1.421 sources, 1.115, 1.116
Message-ID: <200704021517.l32FHrVu001331@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore modules-strict.conf modules-targeted.conf 
	policy-20070219.patch selinux-policy.spec sources 
Log Message:
* Mon Mar 26 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-1
- Update to upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- .cvsignore	23 Mar 2007 17:31:13 -0000	1.109
+++ .cvsignore	2 Apr 2007 15:17:45 -0000	1.110
@@ -111,3 +111,4 @@
 serefpolicy-2.5.8.tgz
 serefpolicy-2.5.9.tgz
 serefpolicy-2.5.10.tgz
+serefpolicy-2.5.11.tgz


Index: modules-strict.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-strict.conf,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- modules-strict.conf	20 Mar 2007 20:21:08 -0000	1.25
+++ modules-strict.conf	2 Apr 2007 15:17:45 -0000	1.26
@@ -1368,3 +1368,10 @@
 #  File System in Userspace (FUSE) utilities
 # 
 fusermount = base
+
+# Layer: services
+# Module: apcupsd
+#
+# daemon for most APC???s UPS for Linux
+#
+apcupsd = module


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- modules-targeted.conf	20 Mar 2007 20:21:08 -0000	1.52
+++ modules-targeted.conf	2 Apr 2007 15:17:45 -0000	1.53
@@ -1281,8 +1281,6 @@
 # 
 usernetctl = module
 
-
-
 # Layer: system
 # Module: xen
 #
@@ -1417,3 +1415,9 @@
 # 
 fusermount = base
 
+# Layer: services
+# Module: apcupsd
+#
+# daemon for most APC???s UPS for Linux
+#
+apcupsd = module

policy-20070219.patch:
 Rules.modular                             |   12 +
 policy/flask/access_vectors               |    4 
 policy/global_booleans                    |    2 
 policy/global_tunables                    |   39 +++-
 policy/mls                                |   31 ++-
 policy/modules/admin/acct.te              |    1 
 policy/modules/admin/amtu.fc              |    3 
 policy/modules/admin/amtu.if              |   53 ++++++
 policy/modules/admin/amtu.te              |   56 ++++++
 policy/modules/admin/bootloader.te        |    2 
 policy/modules/admin/consoletype.te       |    8 
 policy/modules/admin/dmesg.te             |    1 
 policy/modules/admin/firstboot.if         |   18 ++
 policy/modules/admin/kudzu.te             |    2 
 policy/modules/admin/logwatch.te          |    2 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/rpm.fc               |    3 
 policy/modules/admin/rpm.if               |   65 +++++++
 policy/modules/admin/rpm.te               |    2 
 policy/modules/admin/su.if                |    6 
 policy/modules/admin/sudo.te              |    3 
 policy/modules/admin/usermanage.te        |   42 +++--
 policy/modules/apps/games.fc              |    1 
 policy/modules/apps/gnome.if              |   26 +++
 policy/modules/apps/gpg.fc                |    2 
 policy/modules/apps/loadkeys.if           |   44 +----
 policy/modules/apps/mozilla.if            |    1 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/usernetctl.te         |   10 -
 policy/modules/kernel/corecommands.fc     |    7 
 policy/modules/kernel/corecommands.if     |   20 ++
 policy/modules/kernel/corenetwork.if.in   |   54 ++++++
 policy/modules/kernel/corenetwork.te.in   |   16 +
 policy/modules/kernel/devices.if          |   36 ++++
 policy/modules/kernel/domain.if           |   18 ++
 policy/modules/kernel/domain.te           |   46 +++++
 policy/modules/kernel/files.fc            |    1 
 policy/modules/kernel/files.if            |   81 ++++++++-
 policy/modules/kernel/filesystem.if       |   39 ++++
 policy/modules/kernel/filesystem.te       |   11 +
 policy/modules/kernel/kernel.if           |   23 ++
 policy/modules/kernel/kernel.te           |    2 
 policy/modules/kernel/mls.if              |   20 ++
 policy/modules/kernel/mls.te              |    3 
 policy/modules/kernel/selinux.if          |   38 ++++
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.if         |    2 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/services/apache.fc         |   14 -
 policy/modules/services/apache.if         |  161 +++++++++++++++++++
 policy/modules/services/apache.te         |   59 +++++++
 policy/modules/services/apcupsd.fc        |    9 +
 policy/modules/services/apcupsd.if        |  111 +++++++++++++
 policy/modules/services/apcupsd.te        |   81 +++++++++
 policy/modules/services/automount.te      |    2 
 policy/modules/services/ccs.te            |   12 +
 policy/modules/services/consolekit.fc     |    1 
 policy/modules/services/consolekit.te     |   22 ++
 policy/modules/services/cron.fc           |    1 
 policy/modules/services/cron.if           |   33 +---
 policy/modules/services/cron.te           |   51 ++++--
 policy/modules/services/cvs.te            |    2 
 policy/modules/services/cyrus.te          |    5 
 policy/modules/services/dbus.if           |   57 ++++++
 policy/modules/services/dhcp.te           |    2 
 policy/modules/services/djbdns.te         |    5 
 policy/modules/services/dovecot.te        |    4 
 policy/modules/services/ftp.te            |    5 
 policy/modules/services/hal.fc            |    6 
 policy/modules/services/hal.te            |  130 +++++++++++++++
 policy/modules/services/inetd.te          |    5 
 policy/modules/services/kerberos.if       |   58 ++-----
 policy/modules/services/kerberos.te       |   36 ++++
 policy/modules/services/mta.if            |   19 ++
 policy/modules/services/mta.te            |    2 
 policy/modules/services/networkmanager.te |    2 
 policy/modules/services/nis.if            |    4 
 policy/modules/services/ntp.te            |    1 
 policy/modules/services/pegasus.if        |   18 ++
 policy/modules/services/pegasus.te        |    5 
 policy/modules/services/postfix.te        |    2 
 policy/modules/services/ppp.te            |    9 -
 policy/modules/services/procmail.te       |    1 
 policy/modules/services/pyzor.te          |    1 
 policy/modules/services/radius.te         |    4 
 policy/modules/services/rpc.if            |    5 
 policy/modules/services/rsync.te          |    1 
 policy/modules/services/samba.if          |   44 +++++
 policy/modules/services/samba.te          |   50 +++++-
 policy/modules/services/sasl.te           |   11 +
 policy/modules/services/sendmail.if       |   20 ++
 policy/modules/services/smartmon.te       |    1 
 policy/modules/services/snmp.te           |   10 +
 policy/modules/services/spamassassin.te   |    7 
 policy/modules/services/squid.fc          |    2 
 policy/modules/services/squid.if          |   22 ++
 policy/modules/services/squid.te          |   12 +
 policy/modules/services/ssh.if            |   39 ++++
 policy/modules/services/ssh.te            |    5 
 policy/modules/services/xserver.te        |   10 -
 policy/modules/services/zabbix.fc         |    4 
 policy/modules/services/zabbix.if         |   87 ++++++++++
 policy/modules/services/zabbix.te         |   64 +++++++
 policy/modules/system/application.fc      |    1 
 policy/modules/system/application.if      |  104 ++++++++++++
 policy/modules/system/application.te      |   14 +
 policy/modules/system/authlogin.if        |   83 ++++++++--
 policy/modules/system/authlogin.te        |    3 
 policy/modules/system/fstools.fc          |    1 
 policy/modules/system/fstools.te          |    1 
 policy/modules/system/fusermount.fc       |    6 
 policy/modules/system/fusermount.if       |   41 +++++
 policy/modules/system/fusermount.te       |   45 +++++
 policy/modules/system/getty.te            |    3 
 policy/modules/system/hostname.te         |   14 +
 policy/modules/system/init.if             |    3 
 policy/modules/system/init.te             |   35 +++-
 policy/modules/system/ipsec.if            |   20 ++
 policy/modules/system/iptables.te         |    4 
 policy/modules/system/libraries.fc        |    7 
 policy/modules/system/libraries.te        |   20 ++
 policy/modules/system/locallogin.te       |    7 
 policy/modules/system/logging.if          |   21 ++
 policy/modules/system/logging.te          |    1 
 policy/modules/system/lvm.te              |    5 
 policy/modules/system/modutils.te         |    7 
 policy/modules/system/mount.fc            |    3 
 policy/modules/system/mount.if            |   37 ++++
 policy/modules/system/mount.te            |   64 +++++++
 policy/modules/system/raid.te             |    1 
 policy/modules/system/selinuxutil.fc      |    1 
 policy/modules/system/selinuxutil.if      |    5 
 policy/modules/system/selinuxutil.te      |   68 +++-----
 policy/modules/system/udev.fc             |    2 
 policy/modules/system/udev.te             |    6 
 policy/modules/system/unconfined.fc       |    1 
 policy/modules/system/unconfined.if       |   10 -
 policy/modules/system/unconfined.te       |   24 ++
 policy/modules/system/userdomain.if       |  246 ++++++++++++++++--------------
 policy/modules/system/userdomain.te       |   46 ++++-
 policy/modules/system/xen.te              |   27 +++
 policy/support/obj_perm_sets.spt          |   12 +
 142 files changed, 2778 insertions(+), 416 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.33 -r 1.34 policy-20070219.patch
Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- policy-20070219.patch	23 Mar 2007 17:26:52 -0000	1.33
+++ policy-20070219.patch	2 Apr 2007 15:17:45 -0000	1.34
@@ -1,155 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-2.5.10/man/man8/ftpd_selinux.8
---- nsaserefpolicy/man/man8/ftpd_selinux.8	2006-11-16 17:15:28.000000000 -0500
-+++ serefpolicy-2.5.10/man/man8/ftpd_selinux.8	2007-03-22 15:06:58.000000000 -0400
-@@ -39,14 +39,10 @@
- ftpd can run either as a standalone daemon or as part of the xinetd domain.  If you want to run ftpd as a daemon you must set the ftpd_is_daemon boolean.
- .TP
- setsebool -P ftpd_is_daemon 1
--.TP
--You can disable SELinux protection for the ftpd daemon by executing:
--.TP
--setsebool -P ftpd_disable_trans 1
- .br
- service vsftpd restart
- .TP
--system-config-securitylevel is a GUI tool available to customize SELinux policy settings.
-+system-config-selinux is a GUI tool available to customize SELinux policy settings.
- .SH AUTHOR	
- This manual page was written by Dan Walsh <dwalsh at redhat.com>.
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-2.5.10/man/man8/httpd_selinux.8
---- nsaserefpolicy/man/man8/httpd_selinux.8	2007-02-19 11:32:55.000000000 -0500
-+++ serefpolicy-2.5.10/man/man8/httpd_selinux.8	2007-03-22 15:06:58.000000000 -0400
-@@ -110,22 +110,7 @@
- .EE
- 
- .PP
--You can disable suexec transition, set httpd_suexec_disable_trans deny this
--
--.EX
--setsebool -P httpd_suexec_disable_trans 1
--.EE
--
--.PP
--You can disable SELinux protection for the httpd daemon by executing:
--
--.EX
--setsebool -P httpd_disable_trans 1
--service httpd restart
--.EE
--
--.PP
--system-config-securitylevel is a GUI tool available to customize SELinux policy settings.
-+system-config-selinux is a GUI tool available to customize SELinux policy settings.
- .SH AUTHOR	
- This manual page was written by Dan Walsh <dwalsh at redhat.com>.
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/kerberos_selinux.8 serefpolicy-2.5.10/man/man8/kerberos_selinux.8
---- nsaserefpolicy/man/man8/kerberos_selinux.8	2007-02-26 14:42:44.000000000 -0500
-+++ serefpolicy-2.5.10/man/man8/kerberos_selinux.8	2007-03-22 15:06:58.000000000 -0400
-@@ -18,16 +18,9 @@
- You must set the allow_kerberos boolean to allow your system to work properly in a Kerberos environment.
- .EX
- setsebool -P allow_kerberos 1
--.EE 
--If you are running Kerberos daemons kadmind or krb5kdc you can disable the SELinux protection on these daemons by setting the krb5kdc_disable_trans and kadmind_disable_trans booleans.
--.EX
--setsebool -P krb5kdc_disable_trans 1
--service krb5kdc restart
--setsebool -P kadmind_disable_trans 1
--service kadmind restart
- .EE
- .PP
--system-config-securitylevel is a GUI tool available to customize SELinux policy settings.
-+system-config-selinux is a GUI tool available to customize SELinux policy settings.
- .SH AUTHOR	
- This manual page was written by Dan Walsh <dwalsh at redhat.com>.
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/named_selinux.8 serefpolicy-2.5.10/man/man8/named_selinux.8
---- nsaserefpolicy/man/man8/named_selinux.8	2007-02-19 11:32:55.000000000 -0500
-+++ serefpolicy-2.5.10/man/man8/named_selinux.8	2007-03-22 15:06:58.000000000 -0400
-@@ -20,13 +20,7 @@
- setsebool -P named_write_master_zones 1
- .EE
- .PP
--You can disable SELinux protection for the named daemon by executing:
--.EX
--setsebool -P named_disable_trans 1
--service named restart
--.EE
--.PP
--system-config-securitylevel is a GUI tool available to customize SELinux policy settings.
-+system-config-selinux is a GUI tool available to customize SELinux policy settings.
- .SH AUTHOR	
- This manual page was written by Dan Walsh <dwalsh at redhat.com>.
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/nfs_selinux.8 serefpolicy-2.5.10/man/man8/nfs_selinux.8
---- nsaserefpolicy/man/man8/nfs_selinux.8	2006-11-16 17:15:28.000000000 -0500
-+++ serefpolicy-2.5.10/man/man8/nfs_selinux.8	2007-03-22 15:06:58.000000000 -0400
-@@ -22,7 +22,7 @@
- .TP
- setsebool -P use_nfs_home_dirs 1
- .TP
--system-config-securitylevel is a GUI tool available to customize SELinux policy settings.
-+system-config-selinux is a GUI tool available to customize SELinux policy settings.
- .SH AUTHOR	
- This manual page was written by Dan Walsh <dwalsh at redhat.com>.
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/rsync_selinux.8 serefpolicy-2.5.10/man/man8/rsync_selinux.8
---- nsaserefpolicy/man/man8/rsync_selinux.8	2007-02-19 11:32:55.000000000 -0500
-+++ serefpolicy-2.5.10/man/man8/rsync_selinux.8	2007-03-22 15:06:58.000000000 -0400
-@@ -36,13 +36,7 @@
- 
- .SH BOOLEANS
- .TP
--You can disable SELinux protection for the rsync daemon by executing:
--.EX
--setsebool -P rsync_disable_trans 1
--service xinetd restart
--.EE
--.TP
--system-config-securitylevel is a GUI tool available to customize SELinux policy settings.
-+system-config-selinux is a GUI tool available to customize SELinux policy settings.
- .SH AUTHOR	
- This manual page was written by Dan Walsh <dwalsh at redhat.com>.
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/samba_selinux.8 serefpolicy-2.5.10/man/man8/samba_selinux.8
---- nsaserefpolicy/man/man8/samba_selinux.8	2006-11-16 17:15:28.000000000 -0500
-+++ serefpolicy-2.5.10/man/man8/samba_selinux.8	2007-03-22 15:06:58.000000000 -0400
-@@ -41,17 +41,7 @@
- 
- setsebool -P use_samba_home_dirs 1
- .TP
--You can disable SELinux protection for the samba daemon by executing:
--.br 
--
--setsebool -P smbd_disable_trans 1
--.br
--service smb restart
--.TP
--system-config-securitylevel is a GUI tool available to customize SELinux policy settings.
--
--
--
-+system-config-selinux is a GUI tool available to customize SELinux policy settings.
- 
- .SH AUTHOR	
- This manual page was written by Dan Walsh <dwalsh at redhat.com>.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ypbind_selinux.8 serefpolicy-2.5.10/man/man8/ypbind_selinux.8
---- nsaserefpolicy/man/man8/ypbind_selinux.8	2006-11-16 17:15:28.000000000 -0500
-+++ serefpolicy-2.5.10/man/man8/ypbind_selinux.8	2007-03-22 15:06:58.000000000 -0400
-@@ -11,7 +11,7 @@
- .TP
- setsebool -P allow_ypbind 1
- .TP
--system-config-securitylevel is a GUI tool available to customize SELinux policy settings.
-+system-config-selinux is a GUI tool available to customize SELinux policy settings.
- .SH AUTHOR	
- This manual page was written by Dan Walsh <dwalsh at redhat.com>.
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.5.10/policy/flask/access_vectors
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.5.11/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2007-02-26 09:43:33.000000000 -0500
-+++ serefpolicy-2.5.10/policy/flask/access_vectors	2007-03-22 15:06:58.000000000 -0400
++++ serefpolicy-2.5.11/policy/flask/access_vectors	2007-04-02 11:16:11.000000000 -0400
 @@ -598,6 +598,8 @@
  	shmempwd
  	shmemgrp
@@ -168,9 +19,9 @@
  }
  
  class key
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.5.10/policy/global_booleans
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.5.11/policy/global_booleans
 --- nsaserefpolicy/policy/global_booleans	2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-2.5.10/policy/global_booleans	2007-03-22 15:06:58.000000000 -0400
++++ serefpolicy-2.5.11/policy/global_booleans	2007-04-02 11:16:11.000000000 -0400
 @@ -4,7 +4,6 @@
  # file should be used.
  #
@@ -187,69 +38,56 @@
  
  ## <desc>
  ## <p>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.5.10/policy/global_tunables
---- nsaserefpolicy/policy/global_tunables	2007-02-19 11:32:54.000000000 -0500
-+++ serefpolicy-2.5.10/policy/global_tunables	2007-03-22 15:06:58.000000000 -0400
-@@ -278,6 +278,20 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.5.11/policy/global_tunables
+--- nsaserefpolicy/policy/global_tunables	2007-03-26 16:24:14.000000000 -0400
++++ serefpolicy-2.5.11/policy/global_tunables	2007-04-02 11:16:11.000000000 -0400
+@@ -49,6 +49,14 @@
  
  ## <desc>
  ## <p>
-+## Allow httpd to read nfs files
-+## </p>
-+## </desc>
-+gen_tunable(httpd_use_nfs,false)
-+
-+## <desc>
-+## <p>
[...4275 lines suppressed...]
+ ## <p>
+ ## Allow sysadm to ptrace all processes
+@@ -58,7 +57,6 @@
+ ## </p>
+ ## </desc>
+ gen_tunable(user_ttyfile_stat,false)
+-')
+ 
+ # admin users terminals (tty and pty)
+ attribute admin_terminal;
+@@ -69,6 +67,9 @@
  # users home directory contents
  attribute home_type;
  
@@ -5861,7 +5740,7 @@
  # The privhome attribute identifies every domain that can create files under
  # regular user home directories in the regular context (IE act on behalf of
  # a user in writing regular files)
-@@ -56,10 +59,10 @@
+@@ -101,10 +102,10 @@
  # Local policy
  #
  
@@ -5873,7 +5752,7 @@
  
  	# user role change rules:
  	# sysadm_r can change to user roles
-@@ -112,6 +115,11 @@
+@@ -157,6 +158,11 @@
  
  	init_exec(sysadm_t)
  
@@ -5885,7 +5764,7 @@
  	# Following for sending reboot and wall messages
  	userdom_use_unpriv_users_ptys(sysadm_t)
  	userdom_use_unpriv_users_ttys(sysadm_t)
-@@ -182,6 +190,10 @@
+@@ -227,6 +233,10 @@
  	')
  
  	optional_policy(`
@@ -5896,7 +5775,7 @@
  		apache_run_helper(sysadm_t,sysadm_r,admin_terminal)
  		#apache_run_all_scripts(sysadm_t,sysadm_r)
  		#apache_domtrans_sys_script(sysadm_t)
-@@ -339,6 +351,10 @@
+@@ -384,6 +394,10 @@
  	')
  
  	optional_policy(`
@@ -5907,7 +5786,7 @@
  		netutils_run(sysadm_t,sysadm_r,admin_terminal)
  		netutils_run_ping(sysadm_t,sysadm_r,admin_terminal)
  		netutils_run_traceroute(sysadm_t,sysadm_r,admin_terminal)
-@@ -397,6 +413,9 @@
+@@ -442,6 +456,9 @@
  
  		ifdef(`enable_mls',`
  			userdom_security_admin_template(secadm_t,secadm_r,{ secadm_tty_device_t sysadm_devpts_t })
@@ -5917,7 +5796,7 @@
  		', `
  			userdom_security_admin_template(sysadm_t,sysadm_r,admin_terminal)
  		')
-@@ -449,15 +468,15 @@
+@@ -494,15 +511,15 @@
  	unconfined_alias_domain(sysadm_t)
  
  	# User home directory type.
@@ -5942,7 +5821,7 @@
  
  	# compatibility for switching from strict
  #	dominance { role secadm_r { role system_r; }}
-@@ -493,4 +512,9 @@
+@@ -538,4 +555,9 @@
  	optional_policy(`
  		samba_per_role_template(user)
  	')
@@ -5952,17 +5831,18 @@
 +	')
 +
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.5.10/policy/modules/system/xen.te
---- nsaserefpolicy/policy/modules/system/xen.te	2007-03-20 23:38:28.000000000 -0400
-+++ serefpolicy-2.5.10/policy/modules/system/xen.te	2007-03-22 15:09:40.000000000 -0400
-@@ -1,5 +1,5 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.5.11/policy/modules/system/xen.te
+--- nsaserefpolicy/policy/modules/system/xen.te	2007-03-26 10:39:07.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/xen.te	2007-04-02 11:16:11.000000000 -0400
+@@ -88,6 +88,7 @@
+ allow xend_t xen_image_t:dir list_dir_perms;
+ manage_dirs_pattern(xend_t,xen_image_t,xen_image_t)
+ manage_files_pattern(xend_t,xen_image_t,xen_image_t)
++read_lnk_files_pattern(xend_t,xen_image_t,xen_image_t)
+ rw_blk_files_pattern(xend_t,xen_image_t,xen_image_t)
  
--policy_module(xen,1.2.1)
-+policy_module(xen,1.2.0)
- 
- ########################################
- #
-@@ -166,8 +166,13 @@
+ allow xend_t xenctl_t:fifo_file manage_file_perms;
+@@ -165,8 +166,13 @@
  files_manage_etc_runtime_files(xend_t)
  files_etc_filetrans_etc_runtime(xend_t,file)
  files_read_usr_files(xend_t)
@@ -5977,7 +5857,7 @@
  storage_raw_read_removable_device(xend_t)
  
  term_getattr_all_user_ptys(xend_t)
-@@ -285,6 +290,12 @@
+@@ -284,6 +290,12 @@
  
  files_read_usr_files(xenstored_t)
  
@@ -5990,7 +5870,7 @@
  term_use_generic_ptys(xenstored_t)
  term_use_console(xenconsoled_t)
  
-@@ -318,6 +329,11 @@
+@@ -317,6 +329,11 @@
  
  allow xm_t xen_image_t:dir rw_dir_perms;
  allow xm_t xen_image_t:file read_file_perms;
@@ -6002,7 +5882,7 @@
  
  kernel_read_system_state(xm_t)
  kernel_read_kernel_sysctls(xm_t)
-@@ -354,3 +370,11 @@
+@@ -352,3 +369,11 @@
  xen_append_log(xm_t)
  xen_stream_connect(xm_t)
  xen_stream_connect_xenstore(xm_t)
@@ -6014,9 +5894,9 @@
 +fs_read_nfs_files(xend_t)
 +fs_getattr_all_fs(xend_t)
 +fs_read_dos_files(xend_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-2.5.10/policy/support/obj_perm_sets.spt
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-2.5.11/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2007-01-02 12:57:51.000000000 -0500
-+++ serefpolicy-2.5.10/policy/support/obj_perm_sets.spt	2007-03-22 15:06:59.000000000 -0400
++++ serefpolicy-2.5.11/policy/support/obj_perm_sets.spt	2007-04-02 11:16:11.000000000 -0400
 @@ -215,7 +215,7 @@
  define(`getattr_file_perms',`{ getattr }')
  define(`setattr_file_perms',`{ setattr }')
@@ -6026,22 +5906,23 @@
  define(`exec_file_perms',`{ getattr read execute execute_no_trans }')
  define(`append_file_perms',`{ getattr append lock ioctl }')
  define(`write_file_perms',`{ getattr write append lock ioctl }')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.5.10/Rules.modular
---- nsaserefpolicy/Rules.modular	2007-03-22 14:30:10.000000000 -0400
-+++ serefpolicy-2.5.10/Rules.modular	2007-03-22 15:06:59.000000000 -0400
-@@ -91,10 +91,10 @@
+@@ -324,3 +324,13 @@
  #
- # Create a base module package
- #
--$(base_pkg): $(base_mod) $(base_fc) $(users_extra) $(tmpdir)/seusers
-+$(base_pkg): $(base_mod) $(base_fc) $(users_extra) $(tmpdir)/seusers $(net_contexts)
- 	@echo "Creating $(NAME) base module package"
- 	@test -d $(builddir) || mkdir -p $(builddir)
--	$(verbose) $(SEMOD_PKG) -o $@ -m $(base_mod) -f $(base_fc) -u $(users_extra) -s $(tmpdir)/seusers
-+	$(verbose) $(SEMOD_PKG) -o $@ -m $(base_mod) -f $(base_fc) -u $(users_extra) -s $(tmpdir)/seusers -n $(net_contexts)
- 
- $(base_mod): $(base_conf)
- 	@echo "Compiling $(NAME) base module"
+ define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }')
+ define(`server_stream_socket_perms', `{ client_stream_socket_perms listen accept }')
++
++define(`all_capabilities', `{ chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_admin sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_write audit_control }
++')
++
++define(`all_nscd', `{ getpwd getgrp gethost getstat admin shmempwd shmemgrp shmemhost } ')
++define(`all_dbus', `{ acquire_svc send_msg } ')
++define(`all_passwd', `{ passwd chfn chsh rootok crontab } ')
++define(`all_association', `{ sendto recvfrom setcontext polmatch } ')
++
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.5.11/Rules.modular
+--- nsaserefpolicy/Rules.modular	2007-03-22 14:30:10.000000000 -0400
++++ serefpolicy-2.5.11/Rules.modular	2007-04-02 11:16:11.000000000 -0400
 @@ -167,7 +167,7 @@
  # these have to run individually because order matters:
  	$(verbose) $(GREP) '^sid ' $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true
@@ -6068,15 +5949,3 @@
  # Clean the sources
  #
  clean:
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.monolithic serefpolicy-2.5.10/Rules.monolithic
---- nsaserefpolicy/Rules.monolithic	2007-03-22 14:30:10.000000000 -0400
-+++ serefpolicy-2.5.10/Rules.monolithic	2007-03-22 15:06:59.000000000 -0400
-@@ -50,7 +50,7 @@
- 
- policy: $(polver)
- 
--install: $(loadpath) $(fcpath) $(appfiles)
-+install: $(loadpath) $(fcpath) $(ncpath) $(appfiles)
- 
- load: $(tmpdir)/load
- 


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -r1.420 -r1.421
--- selinux-policy.spec	23 Mar 2007 15:42:50 -0000	1.420
+++ selinux-policy.spec	2 Apr 2007 15:17:45 -0000	1.421
@@ -11,13 +11,13 @@
 %define BUILD_MLS 1
 %endif
 %define POLICYVER 21
-%define libsepolver 1.12.26-1
+%define libsepolver 2.0.1-2
 %define POLICYCOREUTILSVER 2.0.7-5
-%define CHECKPOLICYVER 1.30.11-1
+%define CHECKPOLICYVER 2.0.1-2
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.5.10
-Release: 2%{?dist}
+Version: 2.5.11
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -166,7 +166,7 @@
 
 %description
 SELinux Reference Policy - modular.
-Based off of reference policy: Checked out revision 2215.
+Based off of reference policy: Checked out revision 2247.
 
 %prep 
 %setup -q -n serefpolicy-%{version}
@@ -187,15 +187,6 @@
 
 # Install devel
 make clean
-make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=y MLS_CATS=1024 MCS_CATS=1024 install-headers install-docs
-mkdir %{buildroot}%{_usr}/share/selinux/devel/
-mv %{buildroot}%{_usr}/share/selinux/targeted/include %{buildroot}%{_usr}/share/selinux/devel/include
-install -m 755 ${RPM_SOURCE_DIR}/policygentool %{buildroot}%{_usr}/share/selinux/devel/
-install -m 644 ${RPM_SOURCE_DIR}/Makefile.devel %{buildroot}%{_usr}/share/selinux/devel/Makefile
-install -m 644 doc/example.* %{buildroot}%{_usr}/share/selinux/devel/
-echo  "htmlview file:///usr/share/doc/selinux-policy-%{version}/html/index.html"> %{buildroot}%{_usr}/share/selinux/devel/policyhelp
-chmod +x %{buildroot}%{_usr}/share/selinux/devel/policyhelp
-
 %if %{BUILD_TARGETED}
 # Build targeted policy
 # Commented out because only targeted ref policy currently builds
@@ -218,6 +209,16 @@
 %installCmds mls strict-mls y y 
 %endif
 
+make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=y MLS_CATS=1024 MCS_CATS=1024 install-headers install-docs
+mkdir %{buildroot}%{_usr}/share/selinux/devel/
+mv %{buildroot}%{_usr}/share/selinux/targeted/include %{buildroot}%{_usr}/share/selinux/devel/include
+install -m 755 ${RPM_SOURCE_DIR}/policygentool %{buildroot}%{_usr}/share/selinux/devel/
+install -m 644 ${RPM_SOURCE_DIR}/Makefile.devel %{buildroot}%{_usr}/share/selinux/devel/Makefile
+install -m 644 doc/example.* %{buildroot}%{_usr}/share/selinux/devel/
+echo  "htmlview file:///usr/share/doc/selinux-policy-%{version}/html/index.html"> %{buildroot}%{_usr}/share/selinux/devel/policyhelp
+chmod +x %{buildroot}%{_usr}/share/selinux/devel/policyhelp
+
+
 %clean
 %{__rm} -fR %{buildroot}
 
@@ -356,6 +357,9 @@
 %endif
 
 %changelog
+* Mon Mar 26 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-1
+- Update to upstream
+
 * Fri Mar 23 2007 Dan Walsh <dwalsh at redhat.com> 2.5.10-2
 - Allow samba to run groupadd
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- sources	23 Mar 2007 17:31:13 -0000	1.115
+++ sources	2 Apr 2007 15:17:45 -0000	1.116
@@ -1 +1 @@
-167cc1db2323e43bbb9af6520604d195  serefpolicy-2.5.10.tgz
+a40f265b7c28bbb4229ff896f1d145f1  serefpolicy-2.5.11.tgz



From fedora-cvs-commits at redhat.com  Mon Apr  2 15:28:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 11:28:26 -0400
Subject: rpms/coreutils/devel coreutils.spec,1.168,1.169
Message-ID: <200704021528.l32FSQFs009282@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	coreutils.spec 
Log Message:
- /bin/mv in %post requires libselinux


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- coreutils.spec	26 Mar 2007 12:06:23 -0000	1.168
+++ coreutils.spec	2 Apr 2007 15:28:24 -0000	1.169
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 6.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -51,7 +51,7 @@
 BuildRequires: autoconf >= 2.58, automake >= 1.8
 %{?!nopam:BuildRequires: pam-devel}
 
-Requires: libselinux >= 1.25.6-1
+Requires(post): libselinux >= 1.25.6-1
 Requires(pre): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires(post): /sbin/install-info
@@ -266,6 +266,9 @@
 /sbin/runuser
 
 %changelog
+* Mon Apr 02 2007 Karsten Hopp <karsten at redhat.com> 6.9-2
+- /bin/mv in %%post requires libselinux
+
 * Mon Mar 26 2007 Tim Waugh <twaugh at redhat.com> 6.9-1
 - 6.9.
 



From fedora-cvs-commits at redhat.com  Mon Apr  2 15:46:03 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 11:46:03 -0400
Subject: rpms/xorg-x11-drv-nv/devel xorg-x11-drv-nv.spec,1.39,1.40
Message-ID: <200704021546.l32Fk3I6010679@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	xorg-x11-drv-nv.spec 
Log Message:
* Mon Apr  2 2007 Kristian H??gsberg <krh at redhat.com> - 2.0.1-3
- Add nv patches to nouveau too.



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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xorg-x11-drv-nv.spec	30 Mar 2007 20:31:57 -0000	1.39
+++ xorg-x11-drv-nv.spec	2 Apr 2007 15:46:01 -0000	1.40
@@ -9,7 +9,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.0.1
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -41,6 +41,9 @@
 %patch2 -p1 -b .range-hack
 
 tar jxf %{SOURCE1}
+cd nouveau-%{gitdate}
+%patch0 -p1 -b .nv34-tweak
+%patch2 -p1 -b .range-hack
 
 %build
 %configure --disable-static
@@ -49,6 +52,7 @@
 pushd nouveau-%{gitdate}
 autoreconf -v --install
 %configure --disable-static
+
 make
 popd
 
@@ -75,6 +79,9 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Mon Apr  2 2007 Kristian H??gsberg <krh at redhat.com> - 2.0.1-3
+- Add nv patches to nouveau too.
+
 * Fri Mar 30 2007 Kristian H??gsberg <krh at redhat.com> 2.0.1-2
 - Update nouveau snapshot.
 



From fedora-cvs-commits at redhat.com  Mon Apr  2 16:19:03 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 12:19:03 -0400
Subject: rpms/kdenetwork/devel kdenetwork-3.5.6-kde#139719.patch, NONE,
	1.1 kdenetwork.spec, 1.92, 1.93
Message-ID: <200704021619.l32GJ34O011801@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-3.5.6-kde#139719.patch 
Log Message:
- catch the empty ICQ UIN case when creating an account, which
  would crash Kopete, kde#139719



kdenetwork-3.5.6-kde#139719.patch:
 icqeditaccountwidget.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdenetwork-3.5.6-kde#139719.patch ---
Index: kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp
===================================================================
--- kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp	(Revision 625071)
+++ kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp	(Revision 625072)
@@ -166,7 +166,7 @@
 
 	QString userName = mAccountSettings->edtAccountId->text();
 
-	if (userName.contains(" ")) 
+	if (userName.isEmpty())
 		return false;
 
 	for (unsigned int i=0; i<userName.length(); i++)


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- kdenetwork.spec	7 Feb 2007 23:23:24 -0000	1.92
+++ kdenetwork.spec	2 Apr 2007 16:19:00 -0000	1.93
@@ -13,7 +13,7 @@
 
 Name: kdenetwork
 Version: 3.5.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
 Group: Applications/Internet
@@ -32,6 +32,9 @@
 Patch3: kdenetwork-3.3.92-kppp.patch
 Patch4: kdenetwork-3.2.3-resolv.patch
 
+# upstream patces
+Patch1000: kdenetwork-3.5.6-kde#13971
+
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post,postun): /sbin/ldconfig
@@ -73,6 +76,8 @@
 %patch3 -p1 -b .kppp
 %patch4 -p1 -b .ppp
 
+%patch1000 -p0 -b .kde#13971
+
 echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE nowlistening\"" > kopete/plugins/nowlistening/configure.in.in
 
 %if %{make_cvs}
@@ -216,6 +221,10 @@
 %endif
 
 %changelog
+* Mon Apr 02 2007 Than Ngo <than at redhat.com> - 7:3.5.6-2.fc7
+- catch the empty ICQ UIN case when creating an account, which
+  would crash Kopete, kde#139719
+
 * Thu Feb 08 2007 Than Ngo <than at redhat.com> 7:3.5.6-1.fc7
 - 3.5.6
 



From fedora-cvs-commits at redhat.com  Mon Apr  2 16:43:12 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 12:43:12 -0400
Subject: rpms/system-config-printer/devel pycups-1.9.19.tar.bz2.sig, NONE,
	1.1 system-config-printer-0.7.62.tar.bz2.sig, NONE,
	1.1 upstream-key.gpg, NONE, 1.1 .cvsignore, 1.122,
	1.123 sources, 1.127, 1.128 system-config-printer.spec, 1.97, 1.98
Message-ID: <200704021643.l32GhCpB001308@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	pycups-1.9.19.tar.bz2.sig 
	system-config-printer-0.7.62.tar.bz2.sig upstream-key.gpg 
Log Message:
* Mon Apr  2 2007 Tim Waugh <twaugh at redhat.com> 0.7.62-1
- 0.7.62:
  - Use standard icon for admin tool desktop file.
  - Fixed env path in Python scripts.
  - Applet: stop running when the session ends.
  - Prevent a traceback in the SMB browser (bug #225351).
  - 'Manage print jobs' desktop file.
- Resolves: rhbz#225351



--- NEW FILE pycups-1.9.19.tar.bz2.sig ---
??

--- NEW FILE system-config-printer-0.7.62.tar.bz2.sig ---
??

--- NEW FILE upstream-key.gpg ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.7 (GNU/Linux)

mQGiBET8INgRBAD7F5RCgFZAWUVs/osq1HbC8He3lyUb0lKLnWUgHez6QN+FSb/q
sjmAIPBrKlmN6XwqnwyFZkwBS/LqgRm1lonPuqk+ngg/fyBncHq9cw2NmC+B8LKp
vwA/DPtvEj0KEpkKG67E7vf5ekYZy1JNOgo+VPIMNc7cRWnmh5XEEXVISwCghcju
nMIg9r1afkGk53i2wbTnr2cEAKAK+eEX/UH68U1dZEYoWPRYMqnJD56ljfDJr5hn
fq2ZkO3ey+zaW3OYpLrCBLC010XrCavXOtXFA4+bFfsJPn+18xx9rNecyxIf1DGN
tZQwR6Gj5LHuRcP02HJsjHLD4nLzm/dKW4Pg79jT0TDiOmjwleFRiLuwbnuu/egz
N6lnA/9zgvb+WY20istk1Op8jsCLdxJRiqO/5imOjyCKsPHJdHtOV/trkAWdYbQ5
uwUJesjHaVxb8hfHWlb7mw6NgVRbIinbK3qZy2B9ScqUDNaPKCSJWKIHEbJZSG9/
B1/tVRVxPxrkPnlodILZf+p+bTLz73UyXTzz0H1SZNcwDD7vbrQcVGltIFdhdWdo
IDx0aW1AY3liZXJlbGsubmV0PohmBBMRAgAmBQJE/CDYAhsDBQkB4TOABgsJCAcD
AgQVAggDBBYCAwECHgECF4AACgkQFLeBZ6VVmn+xIgCfS1z3qjCNN045KZVk/bKo
mHl0U/UAn1VbKLsI9qtHqsQdE2TuYdOQcU37iEYEEBECAAYFAkT8IlAACgkQ7efG
5oEDCb3z2wCaAykIDnrJP3tEiSB0+l1WXFHwyVoAniNl0Yax889ZcGgzFUo2y9jE
bUsDtB1UaW0gV2F1Z2ggPHR3YXVnaEByZWRoYXQuY29tPohmBBMRAgAmBQJE/CES
AhsDBQkB4TOABgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQFLeBZ6VVmn8wbQCb
Bw6mf5W/AIbqxZzHFJ+m6PEveGIAn2k1DncH3DVwuQELNiSpmYDP2zAJiEYEEBEC
AAYFAkT8IiwACgkQ7efG5oEDCb0zzwCghoUckiBEAcXKM/qtJCIE7bsd40QAnjGl
fgFaQzjFyqO78qvrx6SoOrY8uQINBET8IPUQCACZVzW+DiFh/O1+7ZE0p/W/JyAu
amRRMbOI+6n3sCXPDcc5LFsvUgZikCJguXgOu4sRlsyjoPv6H6NZBuJkrWVquQxg
C//9EakYpafMvms3agMb2c5s3iRf9etNoxh9MM1ndd2HZm2SIUBOQn7/DBhniQAF
z3AlW9Nwgv4EVcp09W7DC44s7R4f5GKW58f13DUSzheKIVJo0cP3FU6ZDwVVP9g8
VvLvOiAdEnYX1gC5wGfeNNlxy6qJSL31Jf2oYzwCBLY5v4CdpkswgGp3yFILIZE8
eAsfBZ8EMlG82dhQMHIHZEVmyDdlD2ELhtRW2dmcNnxSoD+kP4wbYfzvg4bjAAMG
B/9NAdrzZZumIjaTmDjao+sEJw4Cz5XSrs+g5pPzTxxHhnKw+TPdzPG4vwuczC0T
H+GFAyI4URfLcD60EkNcekh9jqEf5v5QmhGfKzmRLCzmhVZqDY6npNIOOkkYU7UI
BHKQDs4d1jRjHvdFDvRGZez/CJbXP+nyCEKYm6iBD1QFJ+1rstJaF9PPrWOkNdec
tcPqtA2QIO6EDRZfdJ5odGHQBsN7RSh4aoWZVPYgFZKd2rjbvGcm1pJZT5q/mSrX
G9olPoJWAcAX1n4+hE5QsyEj3qDg41vw3zMh9fuKrSiPmPKlYWTmRf/V3Y44eRc+
I08cYUtV/8HgX8w85nXqGIIyiE8EGBECAA8FAkT8IPUCGwwFCQHhM4AACgkQFLeB
Z6VVmn/FYACfSCm9zzWhurNap83ETfWvEuQ+3mcAn3hfMQ7fKmyTt0rhwwt23VoI
602q
=cx7G
-----END PGP PUBLIC KEY BLOCK-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- .cvsignore	30 Mar 2007 15:30:31 -0000	1.122
+++ .cvsignore	2 Apr 2007 16:43:09 -0000	1.123
@@ -104,3 +104,4 @@
 pycups-1.9.19.tar.bz2
 system-config-printer-0.7.60.tar.bz2
 system-config-printer-0.7.61.tar.bz2
+system-config-printer-0.7.62.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- sources	30 Mar 2007 15:30:31 -0000	1.127
+++ sources	2 Apr 2007 16:43:10 -0000	1.128
@@ -1,2 +1,2 @@
 c85a0ed5972a24c36787ce0dec4e0375  pycups-1.9.19.tar.bz2
-e30f27589c87390f8e6a54795f789f4a  system-config-printer-0.7.61.tar.bz2
+a6719e4a9f2a0d7395a401f6f7abb688  system-config-printer-0.7.62.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- system-config-printer.spec	30 Mar 2007 15:30:31 -0000	1.97
+++ system-config-printer.spec	2 Apr 2007 16:43:10 -0000	1.98
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.61
+Version: 0.7.62
 Release: 1%{?dist}
 License: GPL
 URL: http://cyberelk.net/tim/software/system-config-printer/
@@ -114,6 +114,7 @@
 %{_datadir}/%{name}/gtk_label_autowrap.py*
 %{_datadir}/%{name}/*.glade
 %{_datadir}/applications/redhat-system-config-printer.desktop
+%{_datadir}/applications/redhat-manage-print-jobs.desktop
 %{_sysconfdir}/pam.d/%{name}
 %{_sysconfdir}/security/console.apps/%{name}
 
@@ -128,6 +129,14 @@
 fi
 
 %changelog
+* Mon Apr  2 2007 Tim Waugh <twaugh at redhat.com> 0.7.62-1
+- 0.7.62:
+  - Use standard icon for admin tool desktop file.
+  - Fixed env path in Python scripts.
+  - Applet: stop running when the session ends.
+  - Prevent a traceback in the SMB browser (bug #225351).
+  - 'Manage print jobs' desktop file.
+
 * Fri Mar 30 2007 Tim Waugh <twaugh at redhat.com> 0.7.61-1
 - 0.7.61:
   - Fixed retrieval of SMB authentication details (bug #203539).



From fedora-cvs-commits at redhat.com  Mon Apr  2 16:54:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 12:54:01 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1145,1.1146
Message-ID: <200704021654.l32Gs149009450@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
profile build


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1145
retrieving revision 1.1146
diff -u -r1.1145 -r1.1146
--- openoffice.org.spec	2 Apr 2007 10:43:49 -0000	1.1145
+++ openoffice.org.spec	2 Apr 2007 16:53:59 -0000	1.1146
@@ -1,6 +1,6 @@
 %define oootag OOF680
 %define ooomilestone 14
-%define rh_rpm_release 2
+%define rh_rpm_release 2.3
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -1089,7 +1089,7 @@
         esac
         ARCH_FLAGS="$ARCH_FLAGS $i"
 done
-export ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64 -finline-limit=64 -fno-threadsafe-statics"
+export ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64 -finline-limit=64 -fno-threadsafe-statics -pg"
 #convert _smp_mflags to dmake equivalent
 SMP_MFLAGS=%{?_smp_mflags}
 SMP_MFLAGS=-P$[${SMP_MFLAGS/-j/}]



From fedora-cvs-commits at redhat.com  Mon Apr  2 17:11:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 13:11:42 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1146,1.1147
Message-ID: <200704021711.l32HBg06022696@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
don't care


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1146
retrieving revision 1.1147
diff -u -r1.1146 -r1.1147
--- openoffice.org.spec	2 Apr 2007 16:53:59 -0000	1.1146
+++ openoffice.org.spec	2 Apr 2007 17:11:39 -0000	1.1147
@@ -5,7 +5,7 @@
 # gcc#19664#
 %define stlvisibilityfcked 1
 # undef to get english only and no-langpacks for a quick smoketest build
-%define langpacks 1
+%define langpacks 0
 # undef to revert to the traditional print dialog
 %define gtkprintui 1
 # undef to revert from combining startup libs into a single libsoffice 
@@ -25,7 +25,8 @@
 
 %define ooo_base_name %{oootag}_m%{ooomilestone}
 
-ExclusiveArch:  ppc %{ix86} x86_64
+#ExclusiveArch:  ppc %{ix86} x86_64
+ExclusiveArch:  %{ix86}
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
 Version:        2.2.0



From fedora-cvs-commits at redhat.com  Mon Apr  2 17:24:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 13:24:49 -0400
Subject: rpms/gnome-screensaver/devel
	gnome-screensaver-2.18.0-require-mouse-grab.patch, NONE,
	1.1 gnome-screensaver.spec, 1.144, 1.145
Message-ID: <200704021724.l32HOniT032443@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-screensaver.spec 
Added Files:
	gnome-screensaver-2.18.0-require-mouse-grab.patch 
Log Message:
- require mouse grab to lock screensaver (bug 197452)


gnome-screensaver-2.18.0-require-mouse-grab.patch:
 gs-grab-x11.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE gnome-screensaver-2.18.0-require-mouse-grab.patch ---
--- gnome-screensaver-2.18.0/src/gs-grab-x11.c.require-mouse-grab	2007-04-02 13:15:56.000000000 -0400
+++ gnome-screensaver-2.18.0/src/gs-grab-x11.c	2007-04-02 13:15:59.000000000 -0400
@@ -452,17 +452,17 @@
 #endif
 
         /* When should we allow blanking to proceed?  The current theory
-           is that a keyboard grab is manditory; a mouse grab is optional.
+           is that both a keyboard grab and a mouse grab are mandatory
 
            - If we don't have a keyboard grab, then we won't be able to
            read a password to unlock, so the kbd grab is manditory.
 
            - If we don't have a mouse grab, then we might not see mouse
-           clicks as a signal to unblank -- but we will still see kbd
-           activity, so that's not a disaster.
+           clicks as a signal to unblank, on-screen widgets won't work ideally,
+           and gs_grab_move_to_window() will spin forever when it gets called.
         */
 
-        if (kstatus != GDK_GRAB_SUCCESS) {
+        if (kstatus != GDK_GRAB_SUCCESS || mstatus != GDK_GRAB_SUCCESS) {
                 /* Do not blank without a kbd grab.   */
                 return FALSE;
         }


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- gnome-screensaver.spec	2 Apr 2007 14:32:19 -0000	1.144
+++ gnome-screensaver.spec	2 Apr 2007 17:24:46 -0000	1.145
@@ -13,7 +13,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.18.0
-Release: 4%{?dist} 
+Release: 5%{?dist} 
 License: GPL
 Group: Amusements/Graphics
 Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/2.18/%{name}-%{version}.tar.bz2
@@ -23,6 +23,7 @@
 Patch2: gnome-screensaver-2.18.0-securitytoken.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=424737
 Patch3: gnome-screensaver-2.18.0-user-dirs.patch
+Patch4: gnome-screensaver-2.18.0-require-mouse-grab.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 URL: http://www.gnome.org
@@ -67,6 +68,7 @@
 %patch1 -p1 -b .use-floaters-by-default
 %patch2 -p1 -b .securitytoken
 %patch3 -p1 -b .user-dirs
+%patch4 -p1 -b .require-mouse-grab
 
 %build
 autoreconf
@@ -123,6 +125,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Mon Apr  2 2007 Ray Strode <rstrode at redhat.com> - 2.18.0-5
+- require mouse grab to lock screensaver (bug 197452)
+
 * Mon Apr  2 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-4
 - Remove the hardwired /etc/skel/Pictures, since we are
   now using xdg-user-dirs



From fedora-cvs-commits at redhat.com  Mon Apr  2 17:55:06 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 13:55:06 -0400
Subject: rpms/xorg-x11-proto-devel/devel .cvsignore, 1.25, 1.26 sources, 1.23,
	1.24 xorg-x11-proto-devel.spec, 1.53, 1.54
Message-ID: <200704021755.l32Ht6oL004380@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	26 Feb 2007 17:26:56 -0000	1.25
+++ .cvsignore	2 Apr 2007 17:55:04 -0000	1.26
@@ -1,12 +1,12 @@
 bigreqsproto-1.0.2.tar.bz2
 compositeproto-0.3.1.tar.bz2
+damageproto-1.1.0.tar.bz2
 dmxproto-2.2.2.tar.bz2
 evieext-1.0.2.tar.bz2
 fixesproto-4.0.tar.bz2
 fontcacheproto-0.1.2.tar.bz2
 fontsproto-2.0.2.tar.bz2
 glproto-1.4.8.tar.bz2
-inputproto-1.3.2.tar.bz2
 kbproto-1.0.3.tar.bz2
 randrproto-1.2.1.tar.bz2
 recordproto-1.13.2.tar.bz2
@@ -26,4 +26,4 @@
 xineramaproto-1.1.2.tar.bz2
 xproto-7.0.10.tar.bz2
 xproxymanagementprotocol-1.0.2.tar.bz2
-damageproto-1.1.0.tar.bz2
+inputproto-1.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	26 Feb 2007 17:26:56 -0000	1.23
+++ sources	2 Apr 2007 17:55:04 -0000	1.24
@@ -1,12 +1,12 @@
 95c29d9d10bf2868996c0c47a3b9a8dc  bigreqsproto-1.0.2.tar.bz2
 54f1fbd567f57093df054f8440a60a5e  compositeproto-0.3.1.tar.bz2
+33ee591e0b1ca5ad7902934541db7d24  damageproto-1.1.0.tar.bz2
 d80acad88411e7944b9b085463d53302  dmxproto-2.2.2.tar.bz2
 2507b5d0f4b2848147fbddd155aa6cfe  evieext-1.0.2.tar.bz2
 8b298cc3424597f8138c7faf7763dce9  fixesproto-4.0.tar.bz2
 60df6b625074a9790e28543dcea71651  fontcacheproto-0.1.2.tar.bz2
 c946f166107b016a21cc7a02e1132724  fontsproto-2.0.2.tar.bz2
 3dfbd17203c0c88b94b6f579f24c11cc  glproto-1.4.8.tar.bz2
-e0b7df0fc69f0712aa7f2161faa94e1d  inputproto-1.3.2.tar.bz2
 6092cdb0a1225f95356ddbe6c2abaad5  kbproto-1.0.3.tar.bz2
 e2e45564f8ce22e00e1360e79c8ccdeb  randrproto-1.2.1.tar.bz2
 0ed4706564a34fc2aff724aa16d3ff00  recordproto-1.13.2.tar.bz2
@@ -26,4 +26,4 @@
 1cc292c562962ad0ad3a253cae68c632  xineramaproto-1.1.2.tar.bz2
 2ed80e90992e7455eaac4c3e977ebd01  xproto-7.0.10.tar.bz2
 d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
-33ee591e0b1ca5ad7902934541db7d24  damageproto-1.1.0.tar.bz2
+563cc41eeb590cf5eb2127807b838dfc  inputproto-1.4.1.tar.bz2


Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- xorg-x11-proto-devel.spec	12 Mar 2007 19:41:17 -0000	1.53
+++ xorg-x11-proto-devel.spec	2 Apr 2007 17:55:04 -0000	1.54
@@ -10,7 +10,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -25,7 +25,7 @@
 Source6:  ftp://ftp.x.org/pub/individual/proto/fontcacheproto-0.1.2.tar.bz2
 Source7:  ftp://ftp.x.org/pub/individual/proto/fontsproto-2.0.2.tar.bz2
 Source8:  ftp://ftp.x.org/pub/individual/proto/glproto-1.4.8.tar.bz2
-Source9:  ftp://ftp.x.org/pub/individual/proto/inputproto-1.3.2.tar.bz2
+Source9:  ftp://ftp.x.org/pub/individual/proto/inputproto-1.4.1.tar.bz2
 Source10: ftp://ftp.x.org/pub/individual/proto/kbproto-1.0.3.tar.bz2
 Source13: ftp://ftp.x.org/pub/individual/proto/randrproto-1.2.1.tar.bz2
 Source14: ftp://ftp.x.org/pub/individual/proto/recordproto-1.13.2.tar.bz2
@@ -275,6 +275,9 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Mon Apr 02 2007 Adam Jackson <ajax at redhat.com> 7.2-7
+- inputproto 1.4.1
+
 * Mon Mar 12 2007 Adam Jackson <ajax at redhat.com> 7.2-6
 - Fix doc macros as per package review (#226641)
 



From fedora-cvs-commits at redhat.com  Mon Apr  2 18:18:35 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 14:18:35 -0400
Subject: rpms/yum/FC-6 yum-cli-continue.patch,NONE,1.1 yum.spec,1.141,1.142
Message-ID: <200704021818.l32IIZJe005741@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/yum/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv5725

Modified Files:
	yum.spec 
Added Files:
	yum-cli-continue.patch 
Log Message:
* Mon Apr  2 2007 Jeremy Katz <katzj at redhat.com> - 3.0.5-2
- add patch from Ville Skytt?? to fix installs with virtual provides (#234807)


yum-cli-continue.patch:
 cli.py |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE yum-cli-continue.patch ---
Index: cli.py
===================================================================
RCS file: /cvsroot/yum/cvs/yum/cli.py,v
retrieving revision 1.241.2.15
diff -u -r1.241.2.15 cli.py
--- cli.py	13 Mar 2007 03:22:17 -0000	1.241.2.15
+++ cli.py	2 Apr 2007 08:55:07 -0000
@@ -566,7 +566,7 @@
                     self.verbose_logger.log(yum.logginglevels.DEBUG_3,
                         'Requested dep: %s is provided by installed package', str(arg))
                     
-                    break # we don't need to look, we have it
+                    continue # we don't need to look, we have it
                 try:
                     mypkgs = self.returnPackagesByDep(arg)
                 except yum.Errors.YumBaseError, e:


Index: yum.spec
===================================================================
RCS file: /cvs/dist/rpms/yum/FC-6/yum.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- yum.spec	19 Mar 2007 21:05:15 -0000	1.141
+++ yum.spec	2 Apr 2007 18:18:33 -0000	1.142
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.0.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.0/yum-%{version}.tar.gz
@@ -14,6 +14,8 @@
 # default plugins here
 Source100: installonlyn.py
 
+Patch0: yum-cli-continue.patch
+
 URL: http://linux.duke.edu/yum/
 BuildArchitectures: noarch
 BuildRequires: python
@@ -46,6 +48,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 make
@@ -114,6 +117,9 @@
 
 
 %changelog
+* Mon Apr  2 2007 Jeremy Katz <katzj at redhat.com> - 3.0.5-2
+- add patch from Ville Skytt?? to fix installs with virtual provides (#234807)
+
 * Mon Mar 19 2007 Jeremy Katz <katzj at redhat.com> - 3.0.5-1
 - update to 3.0.5 (#231549, #231535, #231202)
 



From fedora-cvs-commits at redhat.com  Mon Apr  2 18:19:38 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 14:19:38 -0400
Subject: rpms/perl-XML-Twig/FC-6 .cvsignore, 1.10, 1.11 perl-XML-Twig.spec,
	1.15, 1.16 sources, 1.10, 1.11
Message-ID: <200704021819.l32IJcYK005834@cvs.devel.redhat.com>

Author: rnorwood

Update of /cvs/dist/rpms/perl-XML-Twig/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv5814

Modified Files:
	.cvsignore perl-XML-Twig.spec sources 
Log Message:
Resolves: rhbz#230037 - update to 3.29, remove obsolete patch, and clean up tabs in spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Twig/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	17 Jul 2006 20:42:04 -0000	1.10
+++ .cvsignore	2 Apr 2007 18:19:36 -0000	1.11
@@ -1,5 +1 @@
-XML-Twig-3.17.tar.gz
-XML-Twig-3.22.tar.gz
-XML-Twig-3.23.tar.gz
-XML-Twig-3.25.tar.gz
-XML-Twig-3.26.tar.gz
+XML-Twig-3.29.tar.gz


Index: perl-XML-Twig.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Twig/FC-6/perl-XML-Twig.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-XML-Twig.spec	17 Jul 2006 20:42:04 -0000	1.15
+++ perl-XML-Twig.spec	2 Apr 2007 18:19:36 -0000	1.16
@@ -1,12 +1,12 @@
 Name:           perl-XML-Twig
-Version:        3.26
-Release: 	1.fc6
+Version:        3.29
+Release:        1%{?dist}
 Summary:        A perl module for processing huge XML documents in tree mode
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/XML-Twig/
-Source0:   	http://www.cpan.org/authors/id/M/MI/MIROD/XML-Twig-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/M/MI/MIROD/XML-Twig-%{version}.tar.gz
 Source1:        filter-requires.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -14,7 +14,6 @@
 BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(XML::Parser)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Patch0:    perl-XML-Twig-3.23-no-HTML_TreeBuilder.patch
 
 %define __perl_requires %{SOURCE1}
 
@@ -30,8 +29,6 @@
 
 %prep
 %setup -q -n XML-Twig-%{version} 
-#%patch0 -p1 -b .tests_no_HTML_TreeBuilder
-#      ^- now fixed upstream
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null
@@ -61,6 +58,11 @@
 
 
 %changelog
+* Sun Apr 01 2007 Robin Norwood <rnorwood at redhat.com> - 3.29-1
+- Resolves: rhbz#230037
+- New version: 3.29
+- Remove obsolete patch
+
 * Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 3.26-1
 - Upgrade to 3.26
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Twig/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	17 Jul 2006 20:42:04 -0000	1.10
+++ sources	2 Apr 2007 18:19:36 -0000	1.11
@@ -1 +1 @@
-b776ab7e0649dd62a50bac41366046e1  XML-Twig-3.26.tar.gz
+fd1931464e28fb7ad082439bc2c11c2c  XML-Twig-3.29.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr  2 18:28:11 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 14:28:11 -0400
Subject: rpms/evolution/devel
	evolution-2.10.0-let-mail-notification-build.patch, NONE,
	1.1 evolution.spec, 1.237, 1.238
Message-ID: <200704021828.l32ISBNb006008@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.10.0-let-mail-notification-build.patch 
Log Message:

* Mon Apr 02 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-7.fc7
- Add patch for RH bug #231767 (allow mail-notification to build).


evolution-2.10.0-let-mail-notification-build.patch:
 em-event.c |    1 +
 em-event.h |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE evolution-2.10.0-let-mail-notification-build.patch ---
--- evolution-2.10.0/mail/em-event.c.let-mail-notification-build	2007-01-23 03:23:43.000000000 -0500
+++ evolution-2.10.0/mail/em-event.c	2007-04-02 12:57:40.000000000 -0400
@@ -30,6 +30,7 @@
 #include <glib.h>
 
 #include "em-event.h"
+#include "composer/e-msg-composer.h"
 #include "libedataserver/e-msgport.h"
 #include <e-util/e-icon-factory.h>
 
--- evolution-2.10.0/mail/em-event.h.let-mail-notification-build	2007-01-23 03:23:43.000000000 -0500
+++ evolution-2.10.0/mail/em-event.h	2007-04-02 12:57:40.000000000 -0400
@@ -26,7 +26,6 @@
 #include <glib-object.h>
 
 #include "e-util/e-event.h"
-#include "composer/e-msg-composer.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -35,6 +34,7 @@
 
 struct _CamelFolder;
 struct _CamelMimeMessage;
+struct _EMsgComposer;
 
 typedef struct _EMEvent EMEvent;
 typedef struct _EMEventClass EMEventClass;
@@ -82,7 +82,7 @@
 struct _EMEventTargetComposer {
 	EEventTarget target;
 
-	EMsgComposer *composer;
+	struct _EMsgComposer *composer;
 };
 
 typedef struct _EEventItem EMEventItem;
@@ -103,7 +103,7 @@
 EMEvent *em_event_peek(void);
 
 EMEventTargetFolder *em_event_target_new_folder(EMEvent *emp, const char *uri, guint32 flags);
-EMEventTargetComposer *em_event_target_new_composer(EMEvent *emp, const EMsgComposer *composer, guint32 flags);
+EMEventTargetComposer *em_event_target_new_composer(EMEvent *emp, const struct _EMsgComposer *composer, guint32 flags);
 EMEventTargetMessage *em_event_target_new_message(EMEvent *emp, struct _CamelFolder *folder, struct _CamelMimeMessage *message, const char *uid, guint32 flags);
 
 /* ********************************************************************** */


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- evolution.spec	31 Mar 2007 00:50:38 -0000	1.237
+++ evolution.spec	2 Apr 2007 18:28:09 -0000	1.238
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -161,6 +161,9 @@
 # CVE-2007-1002
 Patch48: evolution-2.10.0-CVE-2007-1002.patch
 
+# RH bug #231767 / GNOME bug #400241
+Patch49: evolution-2.10.0-let-mail-notification-build.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -313,6 +316,7 @@
 %patch46 -p1 -b .use-glib-i18n
 %patch47 -p1 -b .drop-old-glib-support
 %patch48 -p1 -b .CVE-2007-1002
+%patch49 -p1 -b .let-mail-notification-build
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -729,6 +733,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Apr 02 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-7.fc7
+- Add patch for RH bug #231767 (allow mail-notification to build).
+
 * Fri Mar 30 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-6.fc7
 - Revise patch for GNOME bug #362638 (deprecate EThread).
 



From fedora-cvs-commits at redhat.com  Mon Apr  2 19:14:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 15:14:30 -0400
Subject: rpms/libselinux/devel .cvsignore, 1.134, 1.135 libselinux-rhat.patch,
	1.112, 1.113 libselinux.spec, 1.256, 1.257 sources, 1.136, 1.137
Message-ID: <200704021914.l32JEUGQ018784@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libselinux-rhat.patch libselinux.spec sources 
Log Message:
* Tue Mar 27 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.9-1
- Upgrade to upstream
	* Merged class/av string conversion and avc_compute_create patch from Eamon Walsh.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- .cvsignore	27 Mar 2007 19:49:37 -0000	1.134
+++ .cvsignore	2 Apr 2007 19:14:28 -0000	1.135
@@ -113,3 +113,4 @@
 libselinux-2.0.5.tgz
 libselinux-2.0.7.tgz
 libselinux-2.0.8.tgz
+libselinux-2.0.9.tgz

libselinux-rhat.patch:
 getsebool.c |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- libselinux-rhat.patch	27 Mar 2007 19:49:37 -0000	1.112
+++ libselinux-rhat.patch	2 Apr 2007 19:14:28 -0000	1.113
@@ -1,14 +1,3 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/avc.h libselinux-2.0.7/include/selinux/avc.h
---- nsalibselinux/include/selinux/avc.h	2007-03-23 08:50:40.000000000 -0400
-+++ libselinux-2.0.7/include/selinux/avc.h	2007-03-22 16:48:42.000000000 -0400
-@@ -7,6 +7,7 @@
- #define _SELINUX_AVC_H_
- 
- #include <stdint.h>
-+#include <sys/types.h>
- #include <errno.h>
- #include <stdlib.h>
- #include <selinux/selinux.h>
 diff --exclude-from=exclude -N -u -r nsalibselinux/utils/getsebool.c libselinux-2.0.7/utils/getsebool.c
 --- nsalibselinux/utils/getsebool.c	2006-11-16 17:15:17.000000000 -0500
 +++ libselinux-2.0.7/utils/getsebool.c	2007-03-22 16:48:06.000000000 -0400


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- libselinux.spec	27 Mar 2007 20:07:00 -0000	1.256
+++ libselinux.spec	2 Apr 2007 19:14:28 -0000	1.257
@@ -1,7 +1,7 @@
 %define libsepolver 2.0.1-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.8
+Version: 2.0.9
 Release: 1%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
@@ -121,6 +121,10 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Tue Mar 27 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.9-1
+- Upgrade to upstream
+	* Merged class/av string conversion and avc_compute_create patch from Eamon Walsh.
+
 * Tue Mar 27 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.8-1
 - Upgrade to upstream
 	* Merged fix for avc.h #include's from Eamon Walsh.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/sources,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- sources	27 Mar 2007 19:49:37 -0000	1.136
+++ sources	2 Apr 2007 19:14:28 -0000	1.137
@@ -1 +1 @@
-72f67d749eeb46766eeeb28607a9b744  libselinux-2.0.8.tgz
+7db5494cb311293ac526bdd631fb6a45  libselinux-2.0.9.tgz



From fedora-cvs-commits at redhat.com  Mon Apr  2 19:27:05 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 15:27:05 -0400
Subject: rpms/gnome-games/devel gnome-games.spec,1.120,1.121
Message-ID: <200704021927.l32JR5hp028434@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-games.spec 
Log Message:
- Add minimum version to gnome-python2-desktop buildreq 
  (bug 234892)



Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- gnome-games.spec	28 Mar 2007 19:06:56 -0000	1.120
+++ gnome-games.spec	2 Apr 2007 19:27:03 -0000	1.121
@@ -24,11 +24,12 @@
 %define gtk2_version 2.6.0
 %define libgnomeui_version 2.5.0
 %define desktop_file_utils_version 0.2.90
+%define gnome_python_desktop 2.17.3
 
 Summary: GNOME games
 Name: gnome-games
 Version: 2.18.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPL
 Group: Amusements/Games
@@ -53,7 +54,7 @@
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: pygtk2-devel
-BuildRequires: gnome-python2-desktop
+BuildRequires: gnome-python2-desktop >= %{gnome_python_desktop}
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: scrollkeeper
@@ -339,6 +340,10 @@
 
 
 %changelog
+* Mon Apr  2 2007 Ray Strode <rstrode at redhat.com> - 1:2.18.0-4
+- Add minimum version to gnome-python2-desktop buildreq 
+  (bug 234892)
+
 * Wed Mar 28 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.18.0-3
 - Split of gnome-games-extra-data as a separate package
 - Correct the License tag



From fedora-cvs-commits at redhat.com  Mon Apr  2 19:39:40 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 15:39:40 -0400
Subject: rpms/kernel/devel patch-2.6.21-rc5-git9.bz2.sign, NONE,
	1.1 .cvsignore, 1.596, 1.597 kernel-2.6.spec, 1.3039,
	1.3040 sources, 1.559, 1.560 upstream, 1.487,
	1.488 patch-2.6.21-rc5-git4.bz2.sign, 1.1, NONE
Message-ID: <200704021939.l32Jdehe030795@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.21-rc5-git9.bz2.sign 
Removed Files:
	patch-2.6.21-rc5-git4.bz2.sign 
Log Message:
* Mon Apr 02 2007 Dave Jones <davej at redhat.com>
- 2.6.21-rc5-git9



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

iD8DBQBGEVOwyGugalF9Dw4RApklAJ9mpSQQqpGI2i3cEUkH3OD7HoYksACfUeMy
wF8vN+E3CCO0sSo+5yHMQjI=
=Y8Kb
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.596
retrieving revision 1.597
diff -u -r1.596 -r1.597
--- .cvsignore	30 Mar 2007 06:27:57 -0000	1.596
+++ .cvsignore	2 Apr 2007 19:39:38 -0000	1.597
@@ -5,4 +5,4 @@
 kernel-2.6.20
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc5.bz2
-patch-2.6.21-rc5-git4.bz2
+patch-2.6.21-rc5-git9.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3039
retrieving revision 1.3040
diff -u -r1.3039 -r1.3040
--- kernel-2.6.spec	2 Apr 2007 18:27:01 -0000	1.3039
+++ kernel-2.6.spec	2 Apr 2007 19:39:38 -0000	1.3040
@@ -374,7 +374,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.21-rc5.bz2
-Patch2: patch-2.6.21-rc5-git4.bz2
+Patch2: patch-2.6.21-rc5-git9.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -2245,6 +2245,9 @@
 #  - tux.
 
 %changelog
+* Mon Apr 02 2007 Dave Jones <davej at redhat.com>
+- 2.6.21-rc5-git9
+
 * Mon Apr  2 2007 Jeremy Katz <katzj at redhat.com>
 - improvements for module lists
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.559
retrieving revision 1.560
diff -u -r1.559 -r1.560
--- sources	30 Mar 2007 06:27:58 -0000	1.559
+++ sources	2 Apr 2007 19:39:38 -0000	1.560
@@ -1,4 +1,4 @@
 2618cbcc9c9ac1c3c04be903fe3338a7  sparse-0.2.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 b7bf3ee2f3ee778afa1ff0e8d44d193e  patch-2.6.21-rc5.bz2
-80835bff2edcd75f2415d8b3430af6c3  patch-2.6.21-rc5-git4.bz2
+3d19be5174983ca8649ccaebc96a5170  patch-2.6.21-rc5-git9.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -r1.487 -r1.488
--- upstream	30 Mar 2007 06:27:58 -0000	1.487
+++ upstream	2 Apr 2007 19:39:38 -0000	1.488
@@ -1,3 +1,3 @@
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc5.bz2
-patch-2.6.21-rc5-git4.bz2
+patch-2.6.21-rc5-git9.bz2


--- patch-2.6.21-rc5-git4.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr  2 19:53:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 15:53:18 -0400
Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.53,
	1.54 policy-20070219.patch, 1.34, 1.35 selinux-policy.spec,
	1.421, 1.422 sources, 1.116, 1.117
Message-ID: <200704021953.l32JrIAK031277@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	modules-targeted.conf policy-20070219.patch 
	selinux-policy.spec sources 
Log Message:
* Mon Mar 26 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-1
- Update to upstream



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- modules-targeted.conf	2 Apr 2007 15:17:45 -0000	1.53
+++ modules-targeted.conf	2 Apr 2007 19:53:16 -0000	1.54
@@ -1421,3 +1421,11 @@
 # daemon for most APC???s UPS for Linux
 #
 apcupsd = module
+
+# Layer: services
+# Module: aide
+#
+# Policy for aide
+# 
+aide = base
+

policy-20070219.patch:
 Rules.modular                             |   12 +
 policy/flask/access_vectors               |    4 
 policy/global_booleans                    |    2 
 policy/global_tunables                    |   39 +++-
 policy/mls                                |   31 ++-
 policy/modules/admin/acct.te              |    1 
 policy/modules/admin/amtu.fc              |    3 
 policy/modules/admin/amtu.if              |   53 ++++++
 policy/modules/admin/amtu.te              |   56 ++++++
 policy/modules/admin/bootloader.te        |    2 
 policy/modules/admin/consoletype.te       |    8 
 policy/modules/admin/dmesg.te             |    1 
 policy/modules/admin/firstboot.if         |   18 ++
 policy/modules/admin/kudzu.te             |    2 
 policy/modules/admin/logwatch.te          |    2 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/rpm.fc               |    3 
 policy/modules/admin/rpm.if               |   65 +++++++
 policy/modules/admin/rpm.te               |    2 
 policy/modules/admin/su.if                |    6 
 policy/modules/admin/sudo.te              |    3 
 policy/modules/admin/usermanage.te        |   42 +++--
 policy/modules/apps/games.fc              |    1 
 policy/modules/apps/gnome.if              |   26 +++
 policy/modules/apps/gpg.fc                |    2 
 policy/modules/apps/loadkeys.if           |   44 +----
 policy/modules/apps/mozilla.if            |    1 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/usernetctl.te         |   10 -
 policy/modules/kernel/corecommands.fc     |    7 
 policy/modules/kernel/corecommands.if     |   20 ++
 policy/modules/kernel/corenetwork.if.in   |   54 ++++++
 policy/modules/kernel/corenetwork.te.in   |   18 +-
 policy/modules/kernel/devices.if          |   36 ++++
 policy/modules/kernel/domain.if           |   18 ++
 policy/modules/kernel/domain.te           |   46 +++++
 policy/modules/kernel/files.fc            |    1 
 policy/modules/kernel/files.if            |   81 ++++++++-
 policy/modules/kernel/filesystem.if       |   39 ++++
 policy/modules/kernel/filesystem.te       |   11 +
 policy/modules/kernel/kernel.if           |   23 ++
 policy/modules/kernel/kernel.te           |    2 
 policy/modules/kernel/mls.if              |   20 ++
 policy/modules/kernel/mls.te              |    3 
 policy/modules/kernel/selinux.if          |   38 ++++
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.if         |    2 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/services/apache.fc         |   14 -
 policy/modules/services/apache.if         |  161 +++++++++++++++++++
 policy/modules/services/apache.te         |   59 +++++++
 policy/modules/services/apcupsd.fc        |    9 +
 policy/modules/services/apcupsd.if        |  108 +++++++++++++
 policy/modules/services/apcupsd.te        |   81 +++++++++
 policy/modules/services/automount.te      |    2 
 policy/modules/services/ccs.te            |   12 +
 policy/modules/services/consolekit.fc     |    1 
 policy/modules/services/consolekit.te     |   22 ++
 policy/modules/services/cron.fc           |    1 
 policy/modules/services/cron.if           |   33 +---
 policy/modules/services/cron.te           |   51 ++++--
 policy/modules/services/cvs.te            |    2 
 policy/modules/services/cyrus.te          |    5 
 policy/modules/services/dbus.if           |   57 ++++++
 policy/modules/services/dhcp.te           |    2 
 policy/modules/services/djbdns.te         |    5 
 policy/modules/services/dovecot.te        |    4 
 policy/modules/services/ftp.te            |    5 
 policy/modules/services/hal.fc            |    6 
 policy/modules/services/hal.te            |  130 +++++++++++++++
 policy/modules/services/inetd.te          |    5 
 policy/modules/services/kerberos.if       |   58 ++-----
 policy/modules/services/kerberos.te       |   36 ++++
 policy/modules/services/mta.if            |   19 ++
 policy/modules/services/mta.te            |    2 
 policy/modules/services/networkmanager.te |    2 
 policy/modules/services/nis.if            |    4 
 policy/modules/services/ntp.te            |    1 
 policy/modules/services/pegasus.if        |   18 ++
 policy/modules/services/pegasus.te        |    6 
 policy/modules/services/postfix.te        |    6 
 policy/modules/services/ppp.te            |    9 -
 policy/modules/services/procmail.te       |    1 
 policy/modules/services/pyzor.te          |    1 
 policy/modules/services/radius.te         |    4 
 policy/modules/services/rpc.if            |    5 
 policy/modules/services/rsync.te          |    1 
 policy/modules/services/samba.if          |   44 +++++
 policy/modules/services/samba.te          |   50 +++++-
 policy/modules/services/sasl.te           |   11 +
 policy/modules/services/sendmail.if       |   20 ++
 policy/modules/services/smartmon.te       |    1 
 policy/modules/services/snmp.te           |   10 +
 policy/modules/services/spamassassin.te   |    7 
 policy/modules/services/squid.fc          |    2 
 policy/modules/services/squid.if          |   22 ++
 policy/modules/services/squid.te          |   12 +
 policy/modules/services/ssh.if            |   39 ++++
 policy/modules/services/ssh.te            |    5 
 policy/modules/services/xserver.te        |   10 -
 policy/modules/services/zabbix.fc         |    4 
 policy/modules/services/zabbix.if         |   87 ++++++++++
 policy/modules/services/zabbix.te         |   64 +++++++
 policy/modules/system/application.fc      |    1 
 policy/modules/system/application.if      |  104 ++++++++++++
 policy/modules/system/application.te      |   14 +
 policy/modules/system/authlogin.if        |   83 ++++++++--
 policy/modules/system/authlogin.te        |    3 
 policy/modules/system/fstools.fc          |    1 
 policy/modules/system/fstools.te          |    1 
 policy/modules/system/fusermount.fc       |    6 
 policy/modules/system/fusermount.if       |   41 +++++
 policy/modules/system/fusermount.te       |   45 +++++
 policy/modules/system/getty.te            |    3 
 policy/modules/system/hostname.te         |   14 +
 policy/modules/system/init.if             |    3 
 policy/modules/system/init.te             |   35 +++-
 policy/modules/system/ipsec.if            |   20 ++
 policy/modules/system/iptables.te         |    4 
 policy/modules/system/libraries.fc        |    8 
 policy/modules/system/libraries.te        |   20 ++
 policy/modules/system/locallogin.te       |    7 
 policy/modules/system/logging.if          |   21 ++
 policy/modules/system/logging.te          |    1 
 policy/modules/system/lvm.te              |    5 
 policy/modules/system/modutils.te         |   11 +
 policy/modules/system/mount.fc            |    3 
 policy/modules/system/mount.if            |   37 ++++
 policy/modules/system/mount.te            |   64 +++++++
 policy/modules/system/raid.te             |    1 
 policy/modules/system/selinuxutil.fc      |    1 
 policy/modules/system/selinuxutil.if      |    5 
 policy/modules/system/selinuxutil.te      |   68 +++-----
 policy/modules/system/udev.fc             |    2 
 policy/modules/system/udev.te             |   11 +
 policy/modules/system/unconfined.fc       |    1 
 policy/modules/system/unconfined.if       |   10 -
 policy/modules/system/unconfined.te       |   24 ++
 policy/modules/system/userdomain.if       |  246 ++++++++++++++++--------------
 policy/modules/system/userdomain.te       |   46 ++++-
 policy/modules/system/xen.te              |   27 +++
 policy/support/obj_perm_sets.spt          |   12 +
 142 files changed, 2791 insertions(+), 417 deletions(-)

Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- policy-20070219.patch	2 Apr 2007 15:17:45 -0000	1.34
+++ policy-20070219.patch	2 Apr 2007 19:53:16 -0000	1.35
@@ -1002,7 +1002,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.5.11/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2007-02-19 11:32:51.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/kernel/corenetwork.te.in	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/kernel/corenetwork.te.in	2007-04-02 13:09:08.000000000 -0400
 @@ -48,6 +48,11 @@
  type reserved_port_t, port_type, reserved_port_type;
  
@@ -1023,6 +1023,15 @@
  network_port(asterisk, tcp,1720,s0, udp,2427,s0, udp,2727,s0, udp,4569,s0, udp,5060,s0)
  network_port(auth, tcp,113,s0)
  network_port(bgp, tcp,179,s0, udp,179,s0, tcp,2605,s0, udp,2605,s0)
+@@ -85,7 +91,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, tcp,8443,s0) #8443 is mod_nss default port
+ network_port(howl, tcp,5335,s0, udp,5353,s0)
+-network_port(hplip, tcp,1782,s0, tcp,2207,s0, tcp,2208,s0, tcp,50000,s0, tcp,50002,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,1782,s0, tcp,2207,s0, tcp,2208,s0, tcp, 8290,s0, tcp,50000,s0, tcp,50002,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)
 @@ -100,7 +106,7 @@
  network_port(kerberos_master, tcp,4444,s0, udp,4444,s0)
  network_port(kerberos, tcp,88,s0, udp,88,s0, tcp,750,s0, udp,750,s0)
@@ -2022,8 +2031,8 @@
 +/var/www/apcupsd/upsstats.cgi		--	gen_context(system_u:object_r:httpd_apcupsd_cgi_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.if serefpolicy-2.5.11/policy/modules/services/apcupsd.if
 --- nsaserefpolicy/policy/modules/services/apcupsd.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/services/apcupsd.if	2007-04-02 11:16:11.000000000 -0400
-@@ -0,0 +1,111 @@
++++ serefpolicy-2.5.11/policy/modules/services/apcupsd.if	2007-04-02 15:07:35.000000000 -0400
+@@ -0,0 +1,108 @@
 +
 +## <summary>policy for apcupsd</summary>
 +
@@ -2111,9 +2120,6 @@
 +	allow $1 apcupsd_log_t:file { getattr append };
 +')
 +
-+
-+## <summary>policy for httpd_apcupsd_cgi_script</summary>
-+
 +########################################
 +## <summary>
 +##	Execute a domain transition to run httpd_apcupsd_cgi_script.
@@ -2137,7 +2143,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.te serefpolicy-2.5.11/policy/modules/services/apcupsd.te
 --- nsaserefpolicy/policy/modules/services/apcupsd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/services/apcupsd.te	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/apcupsd.te	2007-04-02 15:11:00.000000000 -0400
 @@ -0,0 +1,81 @@
 +policy_module(apcupsd,1.0.0)
 +
@@ -2214,7 +2220,7 @@
 +corenet_tcp_sendrecv_all_if(httpd_apcupsd_cgi_script_t)
 +corenet_tcp_sendrecv_all_nodes(httpd_apcupsd_cgi_script_t)
 +corenet_tcp_sendrecv_all_ports(httpd_apcupsd_cgi_script_t)
-+corenet_tcp_connect_apcupsd_port(apcupsd_cgi_t)
++corenet_tcp_connect_apcupsd_port(httpd_apcupsd_cgi_script_t)
 +
 +allow httpd_apcupsd_cgi_script_t self:udp_socket create_socket_perms;
 +corenet_udp_sendrecv_all_if(httpd_apcupsd_cgi_script_t)
@@ -3239,7 +3245,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.5.11/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/services/pegasus.te	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/pegasus.te	2007-04-02 13:47:48.000000000 -0400
 @@ -96,13 +96,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -3256,9 +3262,17 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
+@@ -116,6 +115,7 @@
+ miscfiles_read_localization(pegasus_t)
+ 
+ sysnet_read_config(pegasus_t)
++sysnet_domtrans_ifconfig(pegasus_t)
+ 
+ userdom_dontaudit_use_unpriv_user_fds(pegasus_t)
+ userdom_dontaudit_search_sysadm_home_dirs(pegasus_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.5.11/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2007-03-26 10:39:05.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/services/postfix.te	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/postfix.te	2007-04-02 13:35:47.000000000 -0400
 @@ -169,6 +169,8 @@
  mta_rw_aliases(postfix_master_t)
  mta_read_sendmail_bin(postfix_master_t)
@@ -3268,6 +3282,17 @@
  ifdef(`targeted_policy',`
  	term_dontaudit_use_unallocated_ttys(postfix_master_t)
  	term_dontaudit_use_generic_ptys(postfix_master_t)
+@@ -552,6 +554,10 @@
+ mta_read_aliases(postfix_smtpd_t)
+ 
+ optional_policy(`
++	mailman_read_data_files(postfix_smtpd_t)
++')
++
++optional_policy(`
+ 	postgrey_stream_connect(postfix_smtpd_t)
+ ')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-2.5.11/policy/modules/services/ppp.te
 --- nsaserefpolicy/policy/modules/services/ppp.te	2007-03-26 16:24:12.000000000 -0400
 +++ serefpolicy-2.5.11/policy/modules/services/ppp.te	2007-04-02 11:16:11.000000000 -0400
@@ -4589,7 +4614,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.5.11/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2007-04-02 10:58:34.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/libraries.fc	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/libraries.fc	2007-04-02 13:43:32.000000000 -0400
 @@ -59,7 +59,6 @@
  ')
  
@@ -4598,7 +4623,15 @@
  /lib32					-d	gen_context(system_u:object_r:lib_t,s0)
  /lib32/.*					gen_context(system_u:object_r:lib_t,s0)
  /lib32/.+\.so(\.[^/]*)*			--	gen_context(system_u:object_r:shlib_t,s0)
-@@ -203,12 +202,6 @@
+@@ -82,6 +81,7 @@
+ /opt/netbeans(.*/)?jdk.*/linux/.+\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /opt/cxoffice/lib/wine/.+\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /opt/ibm/java2-ppc64-50/jre/bin/.+\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/opt/f-secure/fspms/libexec/librapi.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+ ifdef(`distro_gentoo',`
+ # despite the extensions, they are actually libs
+@@ -203,12 +203,6 @@
  /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)
  
@@ -4759,7 +4792,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.5.11/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/modutils.te	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/modutils.te	2007-04-02 15:52:33.000000000 -0400
 @@ -68,7 +68,7 @@
  # for locking: (cjp: ????)
  files_write_kernel_modules(insmod_t)
@@ -4787,7 +4820,18 @@
  ')
  
  optional_policy(`
-@@ -179,6 +181,7 @@
+@@ -162,6 +164,10 @@
+ 	xserver_getattr_log(insmod_t)
+ ')
+ 
++optional_policy(`
++	unconfined_dontaudit_rw_pipes(insmod_t)
++')
++
+ ########################################
+ #
+ # depmod local policy
+@@ -179,6 +185,7 @@
  
  files_read_kernel_symbol_table(depmod_t)
  files_read_kernel_modules(depmod_t)
@@ -4850,7 +4894,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.5.11/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2007-03-26 16:24:13.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/mount.te	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/mount.te	2007-04-02 12:05:34.000000000 -0400
 @@ -9,6 +9,13 @@
  ifdef(`targeted_policy',`
  ## <desc>
@@ -4884,7 +4928,7 @@
  
  # setuid/setgid needed to mount cifs 
 -allow mount_t self:capability { ipc_lock sys_rawio sys_admin dac_override chown sys_tty_config setuid setgid };
-+allow mount_t self:capability { ipc_lock sys_rawio sys_resource sys_admin dac_override chown sys_tty_config setuid setgid };
++allow mount_t self:capability { fsetid ipc_lock sys_rawio sys_resource sys_admin dac_override chown sys_tty_config setuid setgid };
  
  allow mount_t mount_loopback_t:file read_file_perms;
  allow mount_t self:netlink_route_socket r_netlink_socket_perms;
@@ -5170,7 +5214,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.5.11/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2007-03-20 23:38:29.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/udev.te	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/udev.te	2007-04-02 14:36:57.000000000 -0400
 @@ -89,6 +89,7 @@
  dev_manage_all_dev_nodes(udev_t)
  dev_rw_generic_files(udev_t)
@@ -5196,6 +5240,17 @@
  ')
  
  optional_policy(`
+@@ -194,5 +196,10 @@
+ ')
+ 
+ optional_policy(`
++	xen_append_log(udev_t)
++')
++
++optional_policy(`
+ 	xserver_read_xdm_pid(udev_t)
+ ')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.5.11/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2007-02-19 11:32:53.000000000 -0500
 +++ serefpolicy-2.5.11/policy/modules/system/unconfined.fc	2007-04-02 11:16:11.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -r1.421 -r1.422
--- selinux-policy.spec	2 Apr 2007 15:17:45 -0000	1.421
+++ selinux-policy.spec	2 Apr 2007 19:53:16 -0000	1.422
@@ -166,7 +166,7 @@
 
 %description
 SELinux Reference Policy - modular.
-Based off of reference policy: Checked out revision 2247.
+Based off of reference policy: Checked out revision 2253.
 
 %prep 
 %setup -q -n serefpolicy-%{version}


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- sources	2 Apr 2007 15:17:45 -0000	1.116
+++ sources	2 Apr 2007 19:53:16 -0000	1.117
@@ -1 +1 @@
-a40f265b7c28bbb4229ff896f1d145f1  serefpolicy-2.5.11.tgz
+a620a551906801c75407d4b91deb25b5  serefpolicy-2.5.11.tgz



From fedora-cvs-commits at redhat.com  Mon Apr  2 21:06:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 17:06:49 -0400
Subject: rpms/selinux-policy/devel policy-20070219.patch, 1.35,
	1.36 selinux-policy.spec, 1.422, 1.423
Message-ID: <200704022106.l32L6nYY006111@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20070219.patch selinux-policy.spec 
Log Message:
* Mon Mar 26 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-1
- Update to upstream


policy-20070219.patch:
 Rules.modular                             |   12 +
 policy/flask/access_vectors               |    4 
 policy/global_booleans                    |    2 
 policy/global_tunables                    |   39 +++-
 policy/mls                                |   31 ++-
 policy/modules/admin/acct.te              |    1 
 policy/modules/admin/amtu.fc              |    3 
 policy/modules/admin/amtu.if              |   53 ++++++
 policy/modules/admin/amtu.te              |   56 ++++++
 policy/modules/admin/bootloader.te        |    2 
 policy/modules/admin/consoletype.te       |    8 
 policy/modules/admin/dmesg.te             |    1 
 policy/modules/admin/firstboot.if         |   18 ++
 policy/modules/admin/kudzu.te             |    2 
 policy/modules/admin/logwatch.te          |    2 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/rpm.fc               |    3 
 policy/modules/admin/rpm.if               |   65 +++++++
 policy/modules/admin/rpm.te               |    2 
 policy/modules/admin/su.if                |    6 
 policy/modules/admin/sudo.te              |    3 
 policy/modules/admin/usermanage.te        |   42 +++--
 policy/modules/apps/games.fc              |    1 
 policy/modules/apps/gnome.if              |   26 +++
 policy/modules/apps/gpg.fc                |    2 
 policy/modules/apps/loadkeys.if           |   44 +----
 policy/modules/apps/mozilla.if            |    1 
 policy/modules/apps/slocate.te            |    1 
 policy/modules/apps/usernetctl.te         |   10 -
 policy/modules/kernel/corecommands.fc     |    7 
 policy/modules/kernel/corecommands.if     |   20 ++
 policy/modules/kernel/corenetwork.if.in   |   54 ++++++
 policy/modules/kernel/corenetwork.te.in   |   18 +-
 policy/modules/kernel/devices.if          |   36 ++++
 policy/modules/kernel/domain.if           |   18 ++
 policy/modules/kernel/domain.te           |   46 +++++
 policy/modules/kernel/files.fc            |    1 
 policy/modules/kernel/files.if            |   81 ++++++++-
 policy/modules/kernel/filesystem.if       |   39 ++++
 policy/modules/kernel/filesystem.te       |   11 +
 policy/modules/kernel/kernel.if           |   23 ++
 policy/modules/kernel/kernel.te           |    2 
 policy/modules/kernel/mls.if              |   20 ++
 policy/modules/kernel/mls.te              |    3 
 policy/modules/kernel/selinux.if          |   38 ++++
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.if         |    2 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/services/apache.fc         |   14 -
 policy/modules/services/apache.if         |  161 +++++++++++++++++++
 policy/modules/services/apache.te         |   59 +++++++
 policy/modules/services/apcupsd.fc        |    9 +
 policy/modules/services/apcupsd.if        |  108 +++++++++++++
 policy/modules/services/apcupsd.te        |   81 +++++++++
 policy/modules/services/automount.te      |    2 
 policy/modules/services/ccs.te            |   12 +
 policy/modules/services/consolekit.fc     |    1 
 policy/modules/services/consolekit.te     |   22 ++
 policy/modules/services/cron.fc           |    1 
 policy/modules/services/cron.if           |   33 +---
 policy/modules/services/cron.te           |   51 ++++--
 policy/modules/services/cvs.te            |    2 
 policy/modules/services/cyrus.te          |    5 
 policy/modules/services/dbus.if           |   57 ++++++
 policy/modules/services/dhcp.te           |    2 
 policy/modules/services/djbdns.te         |    5 
 policy/modules/services/dovecot.te        |    4 
 policy/modules/services/ftp.te            |    5 
 policy/modules/services/hal.fc            |    6 
 policy/modules/services/hal.te            |  130 +++++++++++++++
 policy/modules/services/inetd.te          |    5 
 policy/modules/services/kerberos.if       |   58 ++-----
 policy/modules/services/kerberos.te       |   36 ++++
 policy/modules/services/mta.if            |   19 ++
 policy/modules/services/mta.te            |    2 
 policy/modules/services/networkmanager.te |    2 
 policy/modules/services/nis.if            |    4 
 policy/modules/services/ntp.te            |    1 
 policy/modules/services/pegasus.if        |   18 ++
 policy/modules/services/pegasus.te        |    6 
 policy/modules/services/postfix.te        |    6 
 policy/modules/services/ppp.te            |    9 -
 policy/modules/services/procmail.te       |    1 
 policy/modules/services/pyzor.te          |    1 
 policy/modules/services/radius.te         |    4 
 policy/modules/services/rpc.if            |    5 
 policy/modules/services/rsync.te          |    1 
 policy/modules/services/samba.if          |   44 +++++
 policy/modules/services/samba.te          |   50 +++++-
 policy/modules/services/sasl.te           |   11 +
 policy/modules/services/sendmail.if       |   20 ++
 policy/modules/services/smartmon.te       |    1 
 policy/modules/services/snmp.te           |   10 +
 policy/modules/services/spamassassin.te   |    7 
 policy/modules/services/squid.fc          |    2 
 policy/modules/services/squid.if          |   22 ++
 policy/modules/services/squid.te          |   12 +
 policy/modules/services/ssh.if            |   39 ++++
 policy/modules/services/ssh.te            |    5 
 policy/modules/services/xserver.te        |   10 -
 policy/modules/services/zabbix.fc         |    4 
 policy/modules/services/zabbix.if         |   87 ++++++++++
 policy/modules/services/zabbix.te         |   64 +++++++
 policy/modules/system/application.fc      |    1 
 policy/modules/system/application.if      |  104 ++++++++++++
 policy/modules/system/application.te      |   14 +
 policy/modules/system/authlogin.if        |   83 ++++++++--
 policy/modules/system/authlogin.te        |    3 
 policy/modules/system/fstools.fc          |    1 
 policy/modules/system/fstools.te          |    1 
 policy/modules/system/fusermount.fc       |    6 
 policy/modules/system/fusermount.if       |   41 +++++
 policy/modules/system/fusermount.te       |   45 +++++
 policy/modules/system/getty.te            |    3 
 policy/modules/system/hostname.te         |   14 +
 policy/modules/system/init.if             |    3 
 policy/modules/system/init.te             |   35 +++-
 policy/modules/system/ipsec.if            |   20 ++
 policy/modules/system/iptables.te         |    4 
 policy/modules/system/libraries.fc        |    8 
 policy/modules/system/libraries.te        |   20 ++
 policy/modules/system/locallogin.te       |    7 
 policy/modules/system/logging.if          |   21 ++
 policy/modules/system/logging.te          |    1 
 policy/modules/system/lvm.te              |    5 
 policy/modules/system/modutils.te         |   11 +
 policy/modules/system/mount.fc            |    3 
 policy/modules/system/mount.if            |   37 ++++
 policy/modules/system/mount.te            |   64 +++++++
 policy/modules/system/raid.te             |    1 
 policy/modules/system/selinuxutil.fc      |    1 
 policy/modules/system/selinuxutil.if      |    5 
 policy/modules/system/selinuxutil.te      |   68 +++-----
 policy/modules/system/udev.fc             |    2 
 policy/modules/system/udev.te             |   11 +
 policy/modules/system/unconfined.fc       |    1 
 policy/modules/system/unconfined.if       |   10 -
 policy/modules/system/unconfined.te       |   24 ++
 policy/modules/system/userdomain.if       |  246 ++++++++++++++++--------------
 policy/modules/system/userdomain.te       |   46 ++++-
 policy/modules/system/xen.te              |   35 ++++
 policy/support/obj_perm_sets.spt          |   12 +
 142 files changed, 2799 insertions(+), 417 deletions(-)

Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- policy-20070219.patch	2 Apr 2007 19:53:16 -0000	1.35
+++ policy-20070219.patch	2 Apr 2007 21:06:47 -0000	1.36
@@ -5888,8 +5888,19 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.5.11/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/xen.te	2007-04-02 11:16:11.000000000 -0400
-@@ -88,6 +88,7 @@
++++ serefpolicy-2.5.11/policy/modules/system/xen.te	2007-04-02 17:05:45.000000000 -0400
+@@ -25,6 +25,10 @@
+ domain_type(xend_t)
+ init_daemon_domain(xend_t, xend_exec_t)
+ 
++# tmp files
++type xend_tmp_t;
++files_tmp_file(xend_tmp_t)
++
+ # var/lib files
+ type xend_var_lib_t;
+ files_type(xend_var_lib_t)
+@@ -88,6 +92,7 @@
  allow xend_t xen_image_t:dir list_dir_perms;
  manage_dirs_pattern(xend_t,xen_image_t,xen_image_t)
  manage_files_pattern(xend_t,xen_image_t,xen_image_t)
@@ -5897,7 +5908,18 @@
  rw_blk_files_pattern(xend_t,xen_image_t,xen_image_t)
  
  allow xend_t xenctl_t:fifo_file manage_file_perms;
-@@ -165,8 +166,13 @@
+@@ -105,6 +110,10 @@
+ manage_sock_files_pattern(xend_t,xend_var_log_t,xend_var_log_t)
+ logging_log_filetrans(xend_t,xend_var_log_t,{ sock_file file dir })
+ 
++allow xend_t xend_tmp_t:dir create_dir_perms;
++allow xend_t xend_tmp_t:file create_file_perms;
++files_tmp_filetrans(xend_t, xend_tmp_t, { file dir })
++
+ # var/lib files for xend
+ manage_dirs_pattern(xend_t,xend_var_lib_t,xend_var_lib_t)
+ manage_files_pattern(xend_t,xend_var_lib_t,xend_var_lib_t)
+@@ -165,8 +174,13 @@
  files_manage_etc_runtime_files(xend_t)
  files_etc_filetrans_etc_runtime(xend_t,file)
  files_read_usr_files(xend_t)
@@ -5912,7 +5934,7 @@
  storage_raw_read_removable_device(xend_t)
  
  term_getattr_all_user_ptys(xend_t)
-@@ -284,6 +290,12 @@
+@@ -284,6 +298,12 @@
  
  files_read_usr_files(xenstored_t)
  
@@ -5925,7 +5947,7 @@
  term_use_generic_ptys(xenstored_t)
  term_use_console(xenconsoled_t)
  
-@@ -317,6 +329,11 @@
+@@ -317,6 +337,11 @@
  
  allow xm_t xen_image_t:dir rw_dir_perms;
  allow xm_t xen_image_t:file read_file_perms;
@@ -5937,7 +5959,7 @@
  
  kernel_read_system_state(xm_t)
  kernel_read_kernel_sysctls(xm_t)
-@@ -352,3 +369,11 @@
+@@ -352,3 +377,11 @@
  xen_append_log(xm_t)
  xen_stream_connect(xm_t)
  xen_stream_connect_xenstore(xm_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -r1.422 -r1.423
--- selinux-policy.spec	2 Apr 2007 19:53:16 -0000	1.422
+++ selinux-policy.spec	2 Apr 2007 21:06:47 -0000	1.423
@@ -159,7 +159,8 @@
 %define relabel() \
 . %{_sysconfdir}/selinux/config; \
 FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
-if [ "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT}.pre ]; then \
+selinuxenabled; \
+if [ $? == 0  -a "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT}.pre ]; then \
 	fixfiles -C ${FILE_CONTEXT}.pre restore; \
 	rm -f ${FILE_CONTEXT}.pre; \
 fi; 



From fedora-cvs-commits at redhat.com  Mon Apr  2 21:09:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 17:09:43 -0400
Subject: rpms/ConsoleKit/devel .cvsignore, 1.4, 1.5 ConsoleKit.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200704022109.l32L9hDv008301@cvs.devel.redhat.com>

Author: davidz

Update of /cvs/dist/rpms/ConsoleKit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8143

Modified Files:
	.cvsignore ConsoleKit.spec sources 
Log Message:
* Mon Apr 02 2007 David Zeuthen <davidz at redhat.com> - 0.2.1-0.git20070402
- Update to git snapshot to get a lot of bug fixes
- Use libX11 rather than gtk2 to verify X11 sessions; update BR and R
- Split X11-using bits into a new subpackage ConsoleKit-x11 (#233982)
- Use correct location for PAM module on 64-bit (#234545)
- Build developer documentation and put them in ConsoleKit-docs




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ConsoleKit/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Mar 2007 19:38:03 -0000	1.4
+++ .cvsignore	2 Apr 2007 21:09:41 -0000	1.5
@@ -1,3 +1,4 @@
 console-kit-0.1.0.tar.gz
 ConsoleKit-0.1.3.git20070301.tar.gz
 ConsoleKit-0.2.0.tar.gz
+ConsoleKit-0.2.1.git20070204.tar.gz


Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/dist/rpms/ConsoleKit/devel/ConsoleKit.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ConsoleKit.spec	19 Mar 2007 19:47:49 -0000	1.6
+++ ConsoleKit.spec	2 Apr 2007 21:09:41 -0000	1.7
@@ -4,12 +4,12 @@
 
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
-Version: 0.2.0
-Release: 2%{?dist}
+Version: 0.2.1
+Release: 0.git20070204%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://consolekit.freedesktop.org
-Source0: http://people.freedesktop.org/~mccann/dist/ConsoleKit-%{version}.tar.gz
+Source0: http://people.freedesktop.org/~mccann/dist/ConsoleKit-%{version}.git20070204.tar.gz
 Patch0: ConsoleKit-0.2.0-daemonize-properly.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dbus >= %{dbus_version}
@@ -18,11 +18,11 @@
 BuildRequires: dbus-devel  >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: pam-devel
-BuildRequires: gtk2-devel
+BuildRequires: libX11-devel
+BuildRequires: xmlto
 
 Requires(post): chkconfig
 Requires(preun): chkconfig
-Requires: gtk2
 
 %description 
 ConsoleKit is a system daemon for tracking what users are logged
@@ -31,6 +31,19 @@
 
 It provides asynchronous notification via the system message bus.
 
+%package x11
+Summary: X11-requiring add-ons for ConsoleKit
+Group: Development/Libraries
+Requires: %name = %{version}-%{release}
+Requires: libX11
+
+%description x11 
+ConsoleKit contains some tools that require Xlib to be installed,
+those are in this separate package so server systems need not install
+X. Applications (such as xorg-x11-xinit) and login managers (such as
+gdm) that need to register their X sessions with ConsoleKit needs to
+have a Requires: for this package.
+
 %package libs
 Summary: ConsoleKit libraries
 Group: Development/Libraries
@@ -49,12 +62,20 @@
 %description devel
 Headers, libraries and API docs for ConsoleKit
 
+%package docs
+Summary: Developer documentation for ConsoleKit
+Group: Development/Libraries
+Requires: %name = %{version}-%{release}
+
+%description docs
+Developer documentation docs for HAL.
+
 %prep
 %setup -q
 %patch0 -p1 -b .daemonize-properly
 
 %build
-%configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-slibdir=/lib
+%configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs
 
 make
 
@@ -62,10 +83,12 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT/lib/*.a
-rm -f $RPM_BUILD_ROOT/lib/*.la
-rm -f $RPM_BUILD_ROOT/lib/security/*.a
-rm -f $RPM_BUILD_ROOT/lib/security/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT/%{_lib}/security/*.a
+rm -f $RPM_BUILD_ROOT/%{_lib}/security/*.la
+
+cp README AUTHORS NEWS COPYING $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -80,32 +103,49 @@
     /sbin/chkconfig --del ConsoleKit
 fi
 
-
 %files
 %defattr(-,root,root,-)
-%doc README NEWS COPYING AUTHORS ChangeLog
+%doc %dir %{_datadir}/doc/%{name}-%{version}
+%doc %{_datadir}/doc/%{name}-%{version}/README
+%doc %{_datadir}/doc/%{name}-%{version}/AUTHORS
+%doc %{_datadir}/doc/%{name}-%{version}/NEWS
+%doc %{_datadir}/doc/%{name}-%{version}/COPYING
 
 %{_sysconfdir}/dbus-1/system.d/*
 %{_sysconfdir}/rc.d/init.d/ConsoleKit
 %{_sbindir}/console-kit-daemon
 %{_bindir}/ck-list-sessions
+
+%files x11
+%defattr(-,root,root,-)
 %{_libexecdir}/*
 
 %files libs
 %defattr(-,root,root,-)
-/lib/lib*.so.*
-/lib/security/*.so
+%{_libdir}/lib*.so.*
+/%{_lib}/security/*.so
 %{_datadir}/man/man8/pam_ck_connector.8.gz
 
 %files devel
 %defattr(-,root,root,-)
 
-/lib/lib*.so
+%{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
 
+%files docs
+%defattr(-,root,root,-)
+%doc %dir %{_datadir}/doc/%{name}-%{version}/spec
+%doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Mon Apr 02 2007 David Zeuthen <davidz at redhat.com> - 0.2.1-0.git20070402
+- Update to git snapshot to get a lot of bug fixes
+- Use libX11 rather than gtk2 to verify X11 sessions; update BR and R
+- Split X11-using bits into a new subpackage ConsoleKit-x11 (#233982)
+- Use correct location for PAM module on 64-bit (#234545)
+- Build developer documentation and put them in ConsoleKit-docs
+
 * Mon Mar 19 2007 David Zeuthen <davidz at redhat.com> - 0.2.0-2
 - BR gtk2-devel and make ConsoleKit Require gtk2 (could just be
   libX11 with a simple patch)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ConsoleKit/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Mar 2007 19:38:03 -0000	1.4
+++ sources	2 Apr 2007 21:09:41 -0000	1.5
@@ -1 +1 @@
-e1ffc51b71e955a8703bcf31ff505f50  ConsoleKit-0.2.0.tar.gz
+71fe7a52a7738faa12c74570e0679313  ConsoleKit-0.2.1.git20070204.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr  2 21:45:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 17:45:30 -0400
Subject: rpms/xorg-x11-xinit/devel xinit-1.0.2-2-poke-ck.patch, NONE,
	1.1 xorg-x11-xinit.spec, 1.35, 1.36
Message-ID: <200704022145.l32LjUqE024168@cvs.devel.redhat.com>

Author: davidz

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

Modified Files:
	xorg-x11-xinit.spec 
Added Files:
	xinit-1.0.2-2-poke-ck.patch 
Log Message:
* Mon Apr 02 2007 David Zeuthen <davidz at redhat.com> 1.0.2-16
- Add ConsoleKit support (#233183)



xinit-1.0.2-2-poke-ck.patch:
 Makefile.am  |    0 
 configure.ac |    2 -
 startx.cpp   |    6 ++++
 xinit.c      |   73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 78 insertions(+), 3 deletions(-)

--- NEW FILE xinit-1.0.2-2-poke-ck.patch ---
diff --git a/Makefile.am b/Makefile.am
diff --git a/configure.ac b/configure.ac
index 55648bc..07e40cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,7 +91,7 @@ AC_ARG_WITH(xinit,
 	[XINIT="$DEFAULT_XINIT"])
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XINIT, x11)
+PKG_CHECK_MODULES(XINIT, x11 ck-connector)
 
 case $host_os in
     *bsd*)
diff --git a/startx.cpp b/startx.cpp
index eba83b8..f091fa5 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -217,6 +217,12 @@ done
 
 #endif
 
+if [ x"$display" != x ]; then
+    export DISPLAY=$display
+else
+    export DISPLAY=:0
+fi
+
 #if defined(__SCO__) || defined(__UNIXWARE__)
 if [ "$REMOTE_SERVER" = "TRUE" ]; then
         exec SHELL_CMD ${client}
diff --git a/xinit.c b/xinit.c
index 818f754..de97791 100644
--- a/xinit.c
+++ b/xinit.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
 /* $Xorg: xinit.c,v 1.5 2001/02/09 02:05:49 xorgcvs Exp $ */
 /* $XdotOrg: $ */
 
@@ -37,6 +38,13 @@ in this Software without prior written authorization from The Open Group.
 #include <stdio.h>
 #include <ctype.h>
 
+#define USE_CONKIT
+#ifdef USE_CONKIT
+#include <ck-connector.h>
+#include <X11/Xatom.h>
+static CkConnector *ckc = NULL;
+#endif /* USE_CONKIT */
+
 #ifdef X_POSIX_C_SOURCE
 #define _POSIX_C_SOURCE X_POSIX_C_SOURCE
 #include <signal.h>
@@ -558,6 +566,39 @@ processTimeout(int timeout, char *string)
 	return( serverpid != pidfound );
 }
 
+
+#ifdef USE_CONKIT
+static void
+register_new_session_with_console_kit (void)
+{
+	static char conkitbuf[256];
+	DBusError   error;
+
+	ckc = ck_connector_new ();
+	if (ckc == NULL) {
+		Error ("Cannot register with ConsoleKit: OOM creating CkConnector\n");
+		goto out;
+	}
+
+	dbus_error_init (&error);
+	if (!ck_connector_open_session (ckc, &error)) {
+		Error ("Cannot register with ConsoleKit: %s: %s\n", error.name, error.message);
+		goto out;
+	}
+
+	/* If we managed to register with ConsoleKit, put the
+	 * environment variable XDG_SESSION_COOKIE=cookie as second
+	 * element in newenviron. See set_environment() where we
+	 * earlier have made sure there is room...
+	 */
+	conkitbuf[sizeof (conkitbuf) - 1] = '\0';
+	snprintf (conkitbuf, sizeof (conkitbuf) - 1, "XDG_SESSION_COOKIE=%s", ck_connector_get_cookie (ckc));
+	newenviron[1] = conkitbuf;
+out:
+	;
+}
+#endif /* USE_CONKIT */
+
 static int
 startServer(char *server[])
 {
@@ -685,6 +726,12 @@ startServer(char *server[])
 		break;
 	}
 
+#ifdef USE_CONKIT
+	if (serverpid != -1 ) {
+		register_new_session_with_console_kit ();
+	}
+#endif /* USE_CONKIT */
+
 	return(serverpid);
 }
 
@@ -748,6 +795,13 @@ shutdown(void)
 				clientpid);
 	}
 
+#ifdef USE_CONKIT
+	if (ckc != NULL) {
+		ck_connector_unref (ckc);
+		ckc = NULL;
+	}
+#endif
+
 	if (serverpid < 0)
 		return;
 	errno = 0;
@@ -784,6 +838,13 @@ shutdown(void)
  * make a new copy of environment that has room for DISPLAY
  */
 
+
+#ifdef USE_CONKIT
+#define NUM_EXTRA_ENV_VARS 3
+#else
+#define NUM_EXTRA_ENV_VARS 2
+#endif
+
 static void 
 set_environment(void)
 {
@@ -795,11 +856,11 @@ set_environment(void)
     for (oldPtr = environ; *oldPtr; oldPtr++) ;
 
     nenvvars = (oldPtr - environ);
-    newenviron = (char **) malloc ((nenvvars + 2) * sizeof(char **));
+    newenviron = (char **) malloc ((nenvvars + NUM_EXTRA_ENV_VARS) * sizeof(char **));
     if (!newenviron) {
 	fprintf (stderr,
 		 "%s:  unable to allocate %d pointers for environment\n",
-		 program, nenvvars + 2);
+		 program, nenvvars + NUM_EXTRA_ENV_VARS);
 	exit (1);
     }
 
@@ -809,9 +870,17 @@ set_environment(void)
     newPtr = newenviron;
     *newPtr++ = displaybuf;
 
+#ifdef USE_CONKIT
+    *newPtr++ = "XDG_SESSION_COOKIE=";
+#endif
+
     /* copy pointers to other variables */
     for (oldPtr = environ; *oldPtr; oldPtr++) {
+#ifdef USE_CONKIT
+	if (strncmp (*oldPtr, "DISPLAY=", 8) != 0 && strncmp (*oldPtr, "XDG_SESSION_COOKIE=", 19) != 0) {
+#else
 	if (strncmp (*oldPtr, "DISPLAY=", 8) != 0) {
+#endif
 	    *newPtr++ = *oldPtr;
 	}
     }


Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xorg-x11-xinit.spec	27 Nov 2006 15:34:01 -0000	1.35
+++ xorg-x11-xinit.spec	2 Apr 2007 21:45:28 -0000	1.36
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X Window System xinit startup scripts
 Name:      xorg-x11-%{pkgname}
 Version:   1.0.2
-Release:   15%{?dist}
+Release:   16%{?dist}
 License:   MIT/X11
 Group:     User Interface/X
 URL:       http://www.x.org
@@ -23,15 +23,22 @@
 
 Patch0: ftp://ftp.freedesktop.org/pub/xorg/X11R7.1/patches/xinit-1.0.2-setuid.diff
 Patch1: xinit-1.0.2-client-session.patch
+Patch2: xinit-1.0.2-2-poke-ck.patch
 
 BuildRequires: pkgconfig
 BuildRequires: libX11-devel
+BuildRequires: ConsoleKit-devel
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
 # NOTE: startx needs xauth in order to run, but that is not picked up
 #       automatically by rpm.  (Bug #173684)
 Requires: xauth
 # next two are for localuser.sh
 Requires: coreutils
 Requires: xorg-x11-server-utils
+Requires: ConsoleKit-x11
+Requires: ConsoleKit-libs
 
 # NOTE: xinit, startx moved to xorg-x11-xinit during the X.Org X11R7
 # modularization.  These Obsoletes lines ensure upgrades work smoothly.
@@ -49,8 +56,10 @@
 %setup -q -n %{pkgname}-%{version}
 %patch0 -p0 -b .setuid
 %patch1 -p1 -b .client-session
+%patch2 -p1 -b .poke-ck
 
 %build
+autoreconf
 %configure
 # FIXME: Upstream should default to XINITDIR being this.  Make a patch to
 # Makefile.am and submit it in a bug report or check into CVS.
@@ -102,6 +111,9 @@
 %{_mandir}/man1/xinit.1x*
 
 %changelog
+* Mon Apr 02 2007 David Zeuthen <davidz at redhat.com> 1.0.2-16
+- Add ConsoleKit support (#233183)
+
 * Mon Nov 27 2006 Adam Jackson <ajax at redhat.com> 1.0.2-15
 - Bump EVR to fix 6 to 7 updates.
 



From fedora-cvs-commits at redhat.com  Mon Apr  2 21:45:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 17:45:42 -0400
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.42,1.43
Message-ID: <200704022145.l32LjgSr024230@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-bluetooth.spec 
Log Message:
fix scripts



Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gnome-bluetooth.spec	9 Mar 2007 15:46:15 -0000	1.42
+++ gnome-bluetooth.spec	2 Apr 2007 21:45:40 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: GNOME Bluetooth Subsystem
 Name: gnome-bluetooth
 Version: 0.8.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth
@@ -81,7 +81,6 @@
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
       %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas >/dev/null || :
-    killall -HUP gconfd-2 || :
 fi
 
 %post libs -p /sbin/ldconfig
@@ -98,7 +97,6 @@
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
       %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas > /dev/null || :
-    killall -HUP gconfd-2 || :
 fi
 
 %files -f %{name}.lang
@@ -125,6 +123,9 @@
 %{_includedir}/gnome-bluetooth/
 
 %changelog
+* Mon Apr  2 2007 Matthias Clasen <mclasen at redhat.com> - 0.8.0-4
+- Remove unncessary gconfd killing from scripts (#224561)
+
 * Tue Feb 27 2007 Harald Hoyer <harald at redhat.com> - 0.8.0-3%{?dist}
 - corrected BuildRoot
 - smp flags added



From fedora-cvs-commits at redhat.com  Mon Apr  2 22:00:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 18:00:21 -0400
Subject: rpms/xorg-x11-xinit/devel xorg-x11-xinit.spec,1.36,1.37
Message-ID: <200704022200.l32M0LqQ024524@cvs.devel.redhat.com>

Author: davidz

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

Modified Files:
	xorg-x11-xinit.spec 
Log Message:
* Mon Apr 02 2007 David Zeuthen <davidz at redhat.com> 1.0.2-17
- Also BR xorg-x11-util-macros since we autoreconf




Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xorg-x11-xinit.spec	2 Apr 2007 21:45:28 -0000	1.36
+++ xorg-x11-xinit.spec	2 Apr 2007 22:00:18 -0000	1.37
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X Window System xinit startup scripts
 Name:      xorg-x11-%{pkgname}
 Version:   1.0.2
-Release:   16%{?dist}
+Release:   17%{?dist}
 License:   MIT/X11
 Group:     User Interface/X
 URL:       http://www.x.org
@@ -31,6 +31,7 @@
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
+BuildRequires: xorg-x11-util-macros
 # NOTE: startx needs xauth in order to run, but that is not picked up
 #       automatically by rpm.  (Bug #173684)
 Requires: xauth
@@ -111,6 +112,9 @@
 %{_mandir}/man1/xinit.1x*
 
 %changelog
+* Mon Apr 02 2007 David Zeuthen <davidz at redhat.com> 1.0.2-17
+- Also BR xorg-x11-util-macros since we autoreconf
+
 * Mon Apr 02 2007 David Zeuthen <davidz at redhat.com> 1.0.2-16
 - Add ConsoleKit support (#233183)
 



From fedora-cvs-commits at redhat.com  Mon Apr  2 22:07:33 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 18:07:33 -0400
Subject: rpms/xorg-x11-xinit/devel xorg-x11-xinit.spec,1.37,1.38
Message-ID: <200704022207.l32M7X4O024719@cvs.devel.redhat.com>

Author: davidz

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

Modified Files:
	xorg-x11-xinit.spec 
Log Message:
* Mon Apr 02 2007 David Zeuthen <davidz at redhat.com> 1.0.2-18
- Man pages are now in section 1, not in section 1x




Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xorg-x11-xinit.spec	2 Apr 2007 22:00:18 -0000	1.37
+++ xorg-x11-xinit.spec	2 Apr 2007 22:07:31 -0000	1.38
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X Window System xinit startup scripts
 Name:      xorg-x11-%{pkgname}
 Version:   1.0.2
-Release:   17%{?dist}
+Release:   18%{?dist}
 License:   MIT/X11
 Group:     User Interface/X
 URL:       http://www.x.org
@@ -107,11 +107,14 @@
 %{_sysconfdir}/X11/xinit/Xsession
 %dir %{_sysconfdir}/X11/xinit/xinitrc.d
 %{_sysconfdir}/X11/xinit/xinitrc.d/*
-#%dir %{_mandir}/man1x
-%{_mandir}/man1/startx.1x*
-%{_mandir}/man1/xinit.1x*
+#%dir %{_mandir}/man1
+%{_mandir}/man1/startx.1*
+%{_mandir}/man1/xinit.1*
 
 %changelog
+* Mon Apr 02 2007 David Zeuthen <davidz at redhat.com> 1.0.2-18
+- Man pages are now in section 1, not in section 1x
+
 * Mon Apr 02 2007 David Zeuthen <davidz at redhat.com> 1.0.2-17
 - Also BR xorg-x11-util-macros since we autoreconf
 



From fedora-cvs-commits at redhat.com  Mon Apr  2 22:42:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 18:42:32 -0400
Subject: rpms/control-center/devel
	control-center-2.18.0-ellipsize-sound-devices.patch, NONE,
	1.1 control-center.spec, 1.238, 1.239
Message-ID: <200704022242.l32MgW7j014059@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13868

Modified Files:
	control-center.spec 
Added Files:
	control-center-2.18.0-ellipsize-sound-devices.patch 
Log Message:
Ellipsize sound devices in the capplet


control-center-2.18.0-ellipsize-sound-devices.patch:
 sound-properties-capplet.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE control-center-2.18.0-ellipsize-sound-devices.patch ---
--- control-center-2.18.0/capplets/sound/sound-properties-capplet.c.ellipsize-sound	2007-03-27 01:03:48.000000000 -0400
+++ control-center-2.18.0/capplets/sound/sound-properties-capplet.c	2007-03-27 01:02:45.000000000 -0400
@@ -869,6 +869,7 @@
 	g_object_unref (G_OBJECT (model)); 
 
 	renderer = gtk_cell_renderer_text_new ();
+        g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END);
 	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (device_widget), renderer, TRUE);
 	gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (device_widget), renderer,
 			"text", MIXER_DEVICE_MODEL_NAME_COLUMN);


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- control-center.spec	23 Mar 2007 21:37:29 -0000	1.238
+++ control-center.spec	2 Apr 2007 22:42:29 -0000	1.239
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.18.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -55,6 +55,9 @@
 
 Patch14: control-center-2.18.0-gnome-bg.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=425650
+Patch15: control-center-2.18.0-ellipsize-sound-devices.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: control-center-2.17.91-passwd.patch
 Patch96: control-center-2.17.92-gecos.patch
@@ -66,6 +69,7 @@
 # change default preferred apps to programs we ship
 Patch99: control-center-2.17.5-default-apps.patch
 
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 URL: http://www.gnome.org
 
@@ -167,6 +171,7 @@
 %patch12 -p1 -b .start-at-helper
 %patch13 -p1 -b .no-gnome-common
 %patch14 -p1 -b .gnome-bg
+%patch15 -p1 -b .ellipsize-sound-devices
 
 
 # vendor configuration patches
@@ -318,6 +323,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Apr  2 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-6
+- Ellipsize sound devices in the sound capplet
+
 * Fri Mar 23 2007 Soren Sandmann <sandmann at redhat.com> - 2.18.0-5
 - Remove debug spew from gnome-bg patch
 



From fedora-cvs-commits at redhat.com  Mon Apr  2 23:32:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 19:32:50 -0400
Subject: rpms/procps/devel procps-3.2.7-sysctl-ignore.patch, NONE,
	1.1 procps.spec, 1.59, 1.60 procps-3.2.5-sysctl-ignore.patch,
	1.1, NONE
Message-ID: <200704022332.l32NWo8h018036@cvs.devel.redhat.com>

Author: kzak

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

Modified Files:
	procps.spec 
Added Files:
	procps-3.2.7-sysctl-ignore.patch 
Removed Files:
	procps-3.2.5-sysctl-ignore.patch 
Log Message:
* Tue Apr  3 2007 Karel Zak <kzak at redhat.com> 3.2.7-11
- fix #234546 - 'w' doesn't give correct information about what's being run.
- fix #228870 - process `sysctl' is using deprecated sysctl
- cleanup spec file
- Resolves: rhbz#234546 rhbz#228870


procps-3.2.7-sysctl-ignore.patch:
 sysctl.c |   50 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 47 insertions(+), 3 deletions(-)

--- NEW FILE procps-3.2.7-sysctl-ignore.patch ---
--- procps-3.2.7/sysctl.c.kzak	2007-04-03 01:26:01.000000000 +0200
+++ procps-3.2.7/sysctl.c	2007-04-03 01:26:13.000000000 +0200
@@ -63,6 +63,44 @@
 static const char ERR_PRELOAD_FILE[] = "error: unable to open preload file \"%s\"\n";
 static const char WARN_BAD_LINE[] = "warning: %s(%d): invalid syntax, continuing...\n";
 
+/* Ignore deprecated sysctls
+ * -- we use this list when we scan (DisplayAll) /proc/sys only. We don't use it
+ *    in case when user direcly uses deprecated key. It's better when user can read
+ *    an error message from kernel.
+ */
+struct sysctl_ignore {
+	const char *prefix;
+	int        prefix_len;
+	const char *option;
+	int        option_len;
+};
+
+#define IGNORE_ENTRY(prefix, option) \
+		{ prefix, sizeof(prefix)-1, option, sizeof(option)-1 }
+
+static struct sysctl_ignore Ignore[] =
+{
+	IGNORE_ENTRY( "net.ipv6.neigh", "base_reachable_time" ),
+	IGNORE_ENTRY( "net.ipv6.neigh", "retrans_time" )
+};
+
+static bool IsIgnored(const char *name)
+{
+  unsigned int i;
+  int sz = strlen(name);
+
+  for (i = 0; i < sizeof(Ignore)/sizeof(struct sysctl_ignore); i++) {
+     struct sysctl_ignore *p = &Ignore[i];
+
+     if (sz < (p->prefix_len + p->option_len))
+	     continue;
+
+     if (strncmp(name, p->prefix, p->prefix_len) == 0 &&
+         strcmp(name + (sz - p->option_len), p->option) == 0)
+       return true;
+  }
+  return false;
+}
 
 static void slashdot(char *restrict p, char old, char new){
   p = strpbrk(p,"/.");
@@ -122,7 +160,7 @@
  *     Read a sysctl setting 
  *
  */
-static int ReadSetting(const char *restrict const name) {
+static int ReadSetting(const char *restrict const name, bool useign) {
    int rc = 0;
    char *restrict tmpname;
    char *restrict outname;
@@ -145,6 +183,12 @@
    outname = strdup(name);
    slashdot(outname,'/','.'); /* change / to . */
 
+   if (useign && IsIgnored(outname)) {
+     free(outname);
+     free(tmpname);
+     return rc;
+   }
+
    if (stat(tmpname, &st)==0) {
 	if (st.st_mode & (S_IRUSR|S_IROTH|S_IRGRP))	   
 	   	fp = fopen(tmpname, "r");
@@ -257,7 +301,7 @@
                strcat(tmpdir, "/");
                DisplayAll(tmpdir);
             } else {
-               rc |= ReadSetting(tmpdir+strlen(PROC_PATH));
+               rc |= ReadSetting(tmpdir+strlen(PROC_PATH), true);
             }
          }
          free(tmpdir);
@@ -519,7 +563,7 @@
          if (WriteMode || index(*argv, '='))
             ReturnCode = WriteSetting(*argv);
          else
-            ReturnCode = ReadSetting(*argv);
+            ReturnCode = ReadSetting(*argv, false);
       }
    }
 


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/devel/procps.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- procps.spec	5 Feb 2007 10:19:04 -0000	1.59
+++ procps.spec	2 Apr 2007 23:32:48 -0000	1.60
@@ -1,13 +1,13 @@
-Summary: System and process monitoring utilities.
+Summary: System and process monitoring utilities
 Name: procps
 Version: 3.2.7
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL
 Group: Applications/System
+URL: http://procps.sourceforge.net
 Source: http://procps.sourceforge.net/procps-%{version}.tar.gz
 Source1: FAQ
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -43,9 +43,12 @@
 # 199174 - top returns with exit code 1 even if no error occurs
 Patch20: procps-3.2.7-top-exitcode.patch
 # 212637 - sysctl using deprecated syscall
-Patch21: procps-3.2.5-sysctl-ignore.patch
+# 228870 - process `sysctl' is using deprecated sysctl ...
+Patch21: procps-3.2.7-sysctl-ignore.patch
 # 140975 - top corrupts screen when sorting on first column
 Patch22: procps-3.2.7-top-sorthigh.path
+# 234546 - 'w' doesn't give correct information about what's being run.
+Patch23: procps-3.2.7-w-best.patch
 
 BuildRequires: ncurses-devel
 
@@ -93,6 +96,7 @@
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 
 cp %SOURCE1 .
 
@@ -121,15 +125,20 @@
 %defattr(0644,root,root,755)
 %doc NEWS BUGS TODO FAQ
 %attr(755,root,root) /%{_lib}/*
-%attr(555,root,root) /bin/ps
-%attr(555,root,root) /sbin/sysctl
-%attr(555,root,root) /usr/bin/*
+%attr(755,root,root) /bin/ps
+%attr(755,root,root) /sbin/sysctl
+%attr(755,root,root) /usr/bin/*
 
 %attr(0644,root,root) %{_mandir}/man1/*
 %attr(0644,root,root) %{_mandir}/man8/*
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Tue Apr  3 2007 Karel Zak <kzak at redhat.com> 3.2.7-11
+- fix #234546 - 'w' doesn't give correct information about what's being run.
+- fix #228870 - process `sysctl' is using deprecated sysctl
+- cleanup spec file
+
 * Mon Feb  5 2007 Karel Zak <kzak at redhat.com> 3.2.7-10
 - fix #212637 - sysctl using deprecated syscall
 - fix #140975 - top corrupts screen when sorting on first column
@@ -458,7 +467,7 @@
 - automated rebuild
 
 * Mon Apr 15 2002 Bill Nottingham <notting at redhat.com> 2.0.7-12
-- add ldconfig in %postun
+- add ldconfig in postun section
 
 * Mon Aug 27 2001 Trond Eivind Glomsrod <teg at redhat.com> 2.0.7-11
 - Add ncurses-devel as a build dependency (#49562)


--- procps-3.2.5-sysctl-ignore.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr  2 23:33:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 19:33:18 -0400
Subject: rpms/procps/devel procps-3.2.7-w-best.patch,NONE,1.1
Message-ID: <200704022333.l32NXIih018374@cvs.devel.redhat.com>

Author: kzak

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

Added Files:
	procps-3.2.7-w-best.patch 
Log Message:


procps-3.2.7-w-best.patch:
 w.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE procps-3.2.7-w-best.patch ---
--- procps-3.2.7/w.c.kzak	2007-04-02 23:58:30.000000000 +0200
+++ procps-3.2.7/w.c	2007-04-03 00:09:15.000000000 +0200
@@ -149,11 +149,11 @@
 	const proc_t *restrict const tmp = *pptr;
 	if(unlikely(tmp->tgid == u->ut_pid)) {
 	    *found_utpid = 1;
-	    best = tmp;
+	    if (!best)
+	         best = tmp;
 	}
 	if(tmp->tty != line) continue;
 	(*jcpu) += tmp->utime + tmp->stime;
-	secondbest = tmp;
 	/* same time-logic here as for "best" below */
 	if(!  (secondbest && tmp->start_time <= secondbest->start_time)  ){
 	    secondbest = tmp;



From fedora-cvs-commits at redhat.com  Mon Apr  2 23:34:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 19:34:09 -0400
Subject: rpms/gnome-screensaver/devel
	gnome-screensaver-2.18.0-power-preferences.patch, NONE,
	1.1 gnome-screensaver.spec, 1.145, 1.146
Message-ID: <200704022334.l32NY9t2019018@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-screensaver.spec 
Added Files:
	gnome-screensaver-2.18.0-power-preferences.patch 
Log Message:
Hide Power Preferences button if gnome-power-manager is not installed


gnome-screensaver-2.18.0-power-preferences.patch:
 gnome-screensaver-preferences.c |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletion(-)

--- NEW FILE gnome-screensaver-2.18.0-power-preferences.patch ---
--- trunk/src/gnome-screensaver-preferences.c	2007/04/02 17:06:48	1149
+++ trunk/src/gnome-screensaver-preferences.c	2007/04/02 17:08:59	1150
@@ -59,6 +59,8 @@
 #define KEY_CYCLE_DELAY     KEY_DIR "/cycle_delay"
 #define KEY_THEMES          KEY_DIR "/themes"
 
+#define GPM_COMMAND "gnome-power-preferences"
+
 enum {
         NAME_COLUMN = 0,
         ID_COLUMN,
@@ -429,7 +431,7 @@
                 error = NULL;
 
                 res = gdk_spawn_command_line_on_screen (gdk_screen_get_default (),
-                                                        "gnome-power-preferences",
+                                                        GPM_COMMAND,
                                                         &error);
                 if (! res) {
                         g_warning ("Unable to start power management preferences: %s", error->message);
@@ -1358,6 +1360,18 @@
         return FALSE;
 }
 
+static gboolean
+is_program_in_path (const char *program)
+{
+        char *tmp = g_find_program_in_path (program);
+        if (tmp != NULL) {
+                g_free (tmp);
+                return TRUE;
+        } else {
+                return FALSE;
+        }
+}
+
 static void
 init_capplet (void)
 {
@@ -1372,6 +1386,7 @@
         GtkWidget *lock_checkbox;
         GtkWidget *root_warning_label;
         GtkWidget *preview_button;
+        GtkWidget *gpm_button;
         GtkWidget *fullscreen_preview_window;
         GtkWidget *fullscreen_preview_previous;
         GtkWidget *fullscreen_preview_next;
@@ -1414,6 +1429,7 @@
         lock_checkbox      = glade_xml_get_widget (xml, "lock_checkbox");
         root_warning_label = glade_xml_get_widget (xml, "root_warning_label");
         preview_button     = glade_xml_get_widget (xml, "preview_button");
+        gpm_button         = glade_xml_get_widget (xml, "gpm_button");
         fullscreen_preview_window = glade_xml_get_widget (xml, "fullscreen_preview_window");
         fullscreen_preview_area = glade_xml_get_widget (xml, "fullscreen_preview_area");
         fullscreen_preview_close = glade_xml_get_widget (xml, "fullscreen_preview_close");
@@ -1428,6 +1444,11 @@
         gtk_widget_set_no_show_all (root_warning_label, TRUE);
         widget_set_best_colormap (preview);
 
+        if (! is_program_in_path (GPM_COMMAND)) {
+                gtk_widget_set_no_show_all (gpm_button, TRUE);
+                gtk_widget_hide (gpm_button);
+        }
+
         activate_delay = config_get_activate_delay (&is_writable);
         ui_set_delay (activate_delay);
         if (! is_writable) {


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- gnome-screensaver.spec	2 Apr 2007 17:24:46 -0000	1.145
+++ gnome-screensaver.spec	2 Apr 2007 23:34:07 -0000	1.146
@@ -13,7 +13,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.18.0
-Release: 5%{?dist} 
+Release: 6%{?dist} 
 License: GPL
 Group: Amusements/Graphics
 Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/2.18/%{name}-%{version}.tar.bz2
@@ -24,6 +24,8 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=424737
 Patch3: gnome-screensaver-2.18.0-user-dirs.patch
 Patch4: gnome-screensaver-2.18.0-require-mouse-grab.patch
+# fixed in upstream trunk
+Patch5: gnome-screensaver-2.18.0-power-preferences.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 URL: http://www.gnome.org
@@ -69,6 +71,7 @@
 %patch2 -p1 -b .securitytoken
 %patch3 -p1 -b .user-dirs
 %patch4 -p1 -b .require-mouse-grab
+%patch5 -p1 -b .power-preferences
 
 %build
 autoreconf
@@ -125,6 +128,10 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Mon Apr  2 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-6
+- Hide Power Preferences button if gnome-power-manager 
+  is not installed
+
 * Mon Apr  2 2007 Ray Strode <rstrode at redhat.com> - 2.18.0-5
 - require mouse grab to lock screensaver (bug 197452)
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 01:24:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 21:24:36 -0400
Subject: rpms/hal/devel hal.spec,1.123,1.124
Message-ID: <200704030124.l331OaoI003910@cvs.devel.redhat.com>

Author: davidz

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

Modified Files:
	hal.spec 
Log Message:
* Mon Apr 02 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-0.git20070401.2
- Split hal package into hal and hal-libs (#231200)
- Fix hal-device-manager ownership (#234696)




Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- hal.spec	1 Apr 2007 19:40:00 -0000	1.123
+++ hal.spec	3 Apr 2007 01:24:33 -0000	1.124
@@ -26,7 +26,7 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.9
-Release: 0.git20070401.1%{?dist}
+Release: 0.git20070401.2%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://people.freedesktop.org/~david/dist/%{name}-%{version}.git20070401.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
@@ -79,11 +79,20 @@
 %endif
 Requires: ConsoleKit >= %{consolekit_version}
 Requires: acl >= %{acl_version}
+Requires: hal-libs = %{version}-%{release}
 
 %description
 HAL is daemon for collection and maintaining information from several
 sources about the hardware on the system.
 
+%package libs
+Summary: Libraries for accessing HAL
+Group: Development/Libraries
+Requires: dbus >= %{dbus_version}
+
+%description libs
+Libraries for accessing HAL.
+
 %package gnome
 Summary: GNOME based device manager for HAL
 Group: Development/Libraries
@@ -194,9 +203,17 @@
 
 /sbin/umount.hal
 %{_sbindir}/hald
-%{_bindir}/*
+%{_bindir}/hal-device
+%{_bindir}/hal-disable-polling
+%{_bindir}/hal-find-by-capability
+%{_bindir}/hal-find-by-property
+%{_bindir}/hal-get-property
+%{_bindir}/hal-is-caller-locked-out
+%{_bindir}/hal-lock
+%{_bindir}/hal-set-property
+%{_bindir}/lshal
+
 %{_libexecdir}/*
-%{_libdir}/*hal*.so.*
 
 %dir %{_datadir}/hal
 %dir %{_datadir}/hal/fdi
@@ -212,6 +229,10 @@
 %attr(0700,haldaemon,haldaemon) %dir %{_localstatedir}/cache/hald
 %attr(0700,haldaemon,haldaemon) %dir %{_localstatedir}/lib/hal
 
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/*hal*.so.*
+
 %files devel
 %defattr(-,root,root,-)
 
@@ -240,6 +261,10 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Mon Apr 02 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-0.git20070401.2
+- Split hal package into hal and hal-libs (#231200)
+- Fix hal-device-manager ownership (#234696)
+
 * Sun Apr 01 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-0.git20070401.1
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 02:01:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 22:01:01 -0400
Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.157,
	1.157.2.1
Message-ID: <200704030201.l33211F2009239@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
      Tag: private-e-d-s-sanity-1_10_0-5-branch
	evolution-data-server.spec 
Log Message:
keep up with rawhide...


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.157
retrieving revision 1.157.2.1
diff -u -r1.157 -r1.157.2.1
--- evolution-data-server.spec	2 Apr 2007 14:10:00 -0000	1.157
+++ evolution-data-server.spec	3 Apr 2007 02:00:56 -0000	1.157.2.1
@@ -26,7 +26,7 @@
 
 Name: evolution-data-server
 Version: 1.10.0
-Release: 5%{?dist}
+Release: 5%{?dist}.dwmw2.1
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -81,6 +81,9 @@
 # E-D-S beeps a lot
 Patch24: evolution-data-server-1.10.0-no-more-beeps.patch
 
+Patch100: evolution-data-server-1.2.0-vcrap.patch
+Patch101: evolution-data-server-1.5.91-check-only-active-folders.patch
+
 ### Dependencies ###
 
 Requires: GConf2
@@ -175,6 +178,8 @@
 %patch22 -p1 -b .isa-support
 %patch23 -p1 -b .code-cleanup
 %patch24 -p1 -b .no-more-beeps
+%patch100 -p1 -b .vcrap
+%patch101 -p1 -b .checksub
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib



From fedora-cvs-commits at redhat.com  Tue Apr  3 02:10:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 2 Apr 2007 22:10:57 -0400
Subject: rpms/evolution/devel evolution.spec,1.234.2.1,1.234.2.2
Message-ID: <200704030210.l332Avi7009575@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
      Tag: private-evo-sanity-2_10_0-branch
	evolution.spec 
Log Message:
Update to track rawhide...



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.234.2.1
retrieving revision 1.234.2.2
diff -u -r1.234.2.1 -r1.234.2.2
--- evolution.spec	24 Mar 2007 17:00:01 -0000	1.234.2.1
+++ evolution.spec	3 Apr 2007 02:10:50 -0000	1.234.2.2
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.0
-Release: 2%{?dist}.dwmw2.1
+Release: 7%{?dist}.dwmw2.1
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -149,8 +149,22 @@
 # GNOME bug #417999
 Patch44: evolution-2.10.0-e-source-combo-box.patch
 
+# GNOME bug #419469
+Patch45: evolution-2.10.0-shell-main-cleanups.patch
+
+# GNOME bug #419524
+Patch46: evolution-2.10.0-use-glib-i18n.patch
+
+# GNOME bug #418971
+Patch47: evolution-2.10.0-drop-old-glib-support.patch
+
+# CVE-2007-1002
+Patch48: evolution-2.10.0-CVE-2007-1002.patch
+
+# RH bug #231767 / GNOME bug #400241
+Patch49: evolution-2.10.0-let-mail-notification-build.patch
+
 Patch1000: evolution-2.10.0-check-only-active-folders.patch
-Patch1001: evolution-2.6.2-badalloc-crash.patch
 Patch1002: evolution-2.6.0-improve-select-thread.patch
 
 ## Dependencies ###
@@ -301,10 +315,14 @@
 %patch42 -p1 -b .view-message-source
 %patch43 -p1 -b .e-passwords
 %patch44 -p1 -b .e-source-combo-box
+%patch45 -p1 -b .shell-main-cleanups
+%patch46 -p1 -b .use-glib-i18n
+%patch47 -p1 -b .drop-old-glib-support
+%patch48 -p1 -b .CVE-2007-1002
+%patch49 -p1 -b .let-mail-notification-build
 
-%patch1000 -p1 -b .checksub
-#%patch1001 -p1 -b .badalloc
-%patch1002 -p1 -b .select-thread
+%patch1000 -p1
+%patch1002 -p1
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -378,6 +396,8 @@
 	-DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
 	-DGDK_DISABLE_DEPRECATED=1 \
 	-DEDS_DISABLE_DEPRECATED=1 \
+	-DCAMEL_DISABLE_DEPRECATED=1 \
+	-Wdeclaration-after-statement \
 	-Werror-implicit-function-declaration"
 %endif
 
@@ -450,16 +470,21 @@
 
 %post
 /sbin/ldconfig
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas apps_evolution_addressbook-%{evo_major}.schemas apps_evolution_calendar-%{evo_major}.schemas apps_evolution_shell-%{evo_major}.schemas evolution-mail-%{evo_major}.schemas"
-for S in $SCHEMAS; do
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
-done
 scrollkeeper-update -q
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook-%{evo_major}.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar-%{evo_major}.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell-%{evo_major}.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail-%{evo_major}.schemas > /dev/null
 
 %postun
 /sbin/ldconfig
 scrollkeeper-update -q
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -714,6 +739,25 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Apr 02 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-7.fc7
+- Add patch for RH bug #231767 (allow mail-notification to build).
+
+* Fri Mar 30 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-6.fc7
+- Revise patch for GNOME bug #362638 (deprecate EThread).
+
+* Thu Mar 29 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-5.fc7
+- CVE-2007-1002 (Shared memo categories format string vulnerability)
+- Add -Wdeclaration-after-statement to strict build settings.
+
+* Mon Mar 26 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-4.fc7
+- Run gtk-update-icon-cache in %post and %postun (RH bug #234018).
+
+* Sat Mar 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-3.fc7
+- Add flag to disable deprecated Camel symbols.
+- Add patch for GNOME bug #419469 (refactor shell/main.c).
+- Add patch for GNOME bug #419524 (use GLib's i18n macros).
+- Add patch for GNOME bug #418971 (drop support for GLib < 2.8).
+
 * Wed Mar 14 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-2.fc7
 - Add patch for GNOME bug #417999 (use ESourceComboBox).
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 04:07:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 00:07:47 -0400
Subject: rpms/redhat-rpm-config/devel
	redhat-rpm-config-fedora-version-fc71.patch, NONE,
	1.1 redhat-rpm-config-find-requires.patch, 1.2,
	1.3 redhat-rpm-config-java.patch, 1.2,
	1.3 redhat-rpm-config-kmp.patch, 1.4,
	1.5 redhat-rpm-config.spec, 1.45, 1.46
Message-ID: <200704030407.l3347lSP001148@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/redhat-rpm-config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1121

Modified Files:
	redhat-rpm-config-find-requires.patch 
	redhat-rpm-config-java.patch redhat-rpm-config-kmp.patch 
	redhat-rpm-config.spec 
Added Files:
	redhat-rpm-config-fedora-version-fc71.patch 
Log Message:
Rebase previous patches, add Fedora macros.


redhat-rpm-config-fedora-version-fc71.patch:
 macros |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE redhat-rpm-config-fedora-version-fc71.patch ---
diff -urNp redhat-rpm-config-8.0.45_orig/macros redhat-rpm-config-8.0.45/macros
--- redhat-rpm-config-8.0.45_orig/macros	2007-04-03 00:01:18.000000000 -0400
+++ redhat-rpm-config-8.0.45/macros	2007-04-03 00:03:44.000000000 -0400
@@ -8,6 +8,10 @@
 %_gnu			-gnu
 %_target_platform	%{_target_cpu}-%{_vendor}-%{_target_os}%{?_gnu}
 
+%fedora			7
+%dist			.fc7
+%fc7			1
+
 #==============================================================================
 # ---- configure macros.  note that most of these are inherited
 #      from the defaults.

redhat-rpm-config-find-requires.patch:
 find-requires |   20 ++++++--------------
 symset-table  |    5 +++++
 2 files changed, 11 insertions(+), 14 deletions(-)

Index: redhat-rpm-config-find-requires.patch
===================================================================
RCS file: /cvs/dist/rpms/redhat-rpm-config/devel/redhat-rpm-config-find-requires.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- redhat-rpm-config-find-requires.patch	12 Oct 2006 05:54:52 -0000	1.2
+++ redhat-rpm-config-find-requires.patch	3 Apr 2007 04:07:43 -0000	1.3
@@ -1,6 +1,6 @@
-diff -urN redhat-rpm-config-8.0.45_orig/find-requires redhat-rpm-config-8.0.45/find-requires
---- redhat-rpm-config-8.0.45_orig/find-requires	2006-07-30 19:58:01.000000000 +0100
-+++ redhat-rpm-config-8.0.45/find-requires	2006-10-12 04:55:41.000000000 +0100
+diff -urNp redhat-rpm-config-8.0.45_orig/find-requires redhat-rpm-config-8.0.45/find-requires
+--- redhat-rpm-config-8.0.45_orig/find-requires	2006-07-30 14:58:01.000000000 -0400
++++ redhat-rpm-config-8.0.45/find-requires	2007-04-03 00:00:18.000000000 -0400
 @@ -5,11 +5,6 @@
  # sonames, script interpreters, and perl modules.
  #
@@ -13,7 +13,7 @@
  ulimit -c 0
  
  #
-@@ -144,21 +139,18 @@
+@@ -144,21 +139,18 @@ done | sort -u
  # cheat a little here by looking first for a kernel, then for a kmod.
  #
  
@@ -41,10 +41,10 @@
  
  [ -x /usr/lib/rpm/redhat/find-requires.ksyms ] && [ "$is_kmod" ] &&
      printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/redhat/find-requires.ksyms
-diff -urN redhat-rpm-config-8.0.45_orig/symset-table redhat-rpm-config-8.0.45/symset-table
---- redhat-rpm-config-8.0.45_orig/symset-table	2006-06-13 03:48:59.000000000 +0100
-+++ redhat-rpm-config-8.0.45/symset-table	2006-10-12 06:53:11.000000000 +0100
-@@ -19,6 +19,11 @@
+diff -urNp redhat-rpm-config-8.0.45_orig/symset-table redhat-rpm-config-8.0.45/symset-table
+--- redhat-rpm-config-8.0.45_orig/symset-table	2006-06-12 22:48:59.000000000 -0400
++++ redhat-rpm-config-8.0.45/symset-table	2007-04-03 00:00:18.000000000 -0400
+@@ -19,6 +19,11 @@ for symsets in /boot/symsets-*.tar.gz; d
      | tar xf -
  done
  

redhat-rpm-config-java.patch:
 macros |    1 +
 1 files changed, 1 insertion(+)

Index: redhat-rpm-config-java.patch
===================================================================
RCS file: /cvs/dist/rpms/redhat-rpm-config/devel/redhat-rpm-config-java.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- redhat-rpm-config-java.patch	6 Sep 2006 13:36:49 -0000	1.2
+++ redhat-rpm-config-java.patch	3 Apr 2007 04:07:44 -0000	1.3
@@ -1,5 +1,6 @@
---- redhat-rpm-config-8.0.45/macros.java	2006-09-05 16:24:06.000000000 -0400
-+++ redhat-rpm-config-8.0.45/macros	2006-09-05 16:24:24.000000000 -0400
+diff -urNp redhat-rpm-config-8.0.45_orig/macros redhat-rpm-config-8.0.45/macros
+--- redhat-rpm-config-8.0.45_orig/macros	2005-08-16 20:27:33.000000000 -0400
++++ redhat-rpm-config-8.0.45/macros	2007-04-02 23:59:19.000000000 -0400
 @@ -86,6 +86,7 @@
      /usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} \
      /usr/lib/rpm/redhat/brp-strip-comment-note %{__strip} %{__objdump} \

redhat-rpm-config-kmp.patch:
 macros |   64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 64 insertions(+)

Index: redhat-rpm-config-kmp.patch
===================================================================
RCS file: /cvs/dist/rpms/redhat-rpm-config/devel/redhat-rpm-config-kmp.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- redhat-rpm-config-kmp.patch	18 Oct 2006 18:40:31 -0000	1.4
+++ redhat-rpm-config-kmp.patch	3 Apr 2007 04:07:44 -0000	1.5
@@ -1,7 +1,7 @@
-diff -urN redhat-rpm-config-8.0.45_orig/macros redhat-rpm-config-8.0.45/macros
---- redhat-rpm-config-8.0.45_orig/macros	2005-08-16 20:27:33.000000000 -0400
-+++ redhat-rpm-config-8.0.45/macros	2006-10-18 14:11:55.000000000 -0400
-@@ -156,3 +157,67 @@
+diff -urNp redhat-rpm-config-8.0.45_orig/macros redhat-rpm-config-8.0.45/macros
+--- redhat-rpm-config-8.0.45_orig/macros	2007-04-03 00:00:03.000000000 -0400
++++ redhat-rpm-config-8.0.45/macros	2007-04-03 00:01:18.000000000 -0400
+@@ -157,3 +157,67 @@ unset DISPLAY\
  
  # Disable lookups
  %_hkp_keyserver  %{nil}


Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-rpm-config/devel/redhat-rpm-config.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- redhat-rpm-config.spec	14 Mar 2007 18:13:24 -0000	1.45
+++ redhat-rpm-config.spec	3 Apr 2007 04:07:44 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: Red Hat specific rpm configuration files.
 Name: redhat-rpm-config
 Version: 8.0.45
-Release: 13%{dist}
+Release: 14%{dist}
 License: GPL
 Group: Development/System
 Source: redhat-rpm-config-%{version}.tar.gz
@@ -10,6 +10,7 @@
 Patch0: redhat-rpm-config-java.patch
 Patch1: redhat-rpm-config-find-requires.patch
 Patch2: redhat-rpm-config-kmp.patch
+Patch3: redhat-rpm-config-fedora-version-fc71.patch
 BuildArch: noarch
 #Requires: rpmbuild(VendorConfig) <= 4.1
 #Requires: mktemp
@@ -35,6 +36,7 @@
 (cd ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat ; patch -p1 -i %{PATCH0})
 (cd ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat ; patch -p1 -i %{PATCH1})
 (cd ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat ; patch -p1 -i %{PATCH2})
+(cd ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat ; patch -p1 -i %{PATCH3})
 install -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm/redhat/
 install -m 755 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm/redhat/
 
@@ -46,6 +48,11 @@
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Tue Apr 03 2007 Jon Masters <jcm at redhat.com> 8.0.45-14
+- Rebased all previous patches (since java fix introduced offset).
+- Added Fedora per-release macros to platforms section of macros.
+  Further debate may see these move elsewhere in the ordering.
+
 * Tue Mar 13 2007 Ben Konrath <bkonrath at redhat.com> 8.0.45-13
 - Update brp-java-repack-jars to fix issue with tomcat. 
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 04:21:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 00:21:42 -0400
Subject: rpms/jsch/devel MANIFEST.MF,NONE,1.1 jsch.spec,1.19,1.20
Message-ID: <200704030421.l334LggB001381@cvs.devel.redhat.com>

Author: bkonrath

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

Modified Files:
	jsch.spec 
Added Files:
	MANIFEST.MF 
Log Message:
* Tue Apr 3 2007 Ben Konrath <bkonrath at redhat.com> - 0:0.1.28-1jpp.6
- Add OSGi Manifest to jar.



--- NEW FILE MANIFEST.MF ---
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Version: 0.1.28
Export-Package: com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true,
  com.jcraft.jsch.jcraft;x-internal:=true
Created-By: 1.4.0 (Sun Microsystems Inc.)
Bundle-SymbolicName: com.jcraft.jsch
Bundle-Name: %bundleName
Bundle-Localization: plugin
Bundle-Vendor: %venderName
Bundle-ClassPath: .
Bundle-RequiredExecutionEnvironment: J2SE-1.4



Index: jsch.spec
===================================================================
RCS file: /cvs/dist/rpms/jsch/devel/jsch.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jsch.spec	10 Aug 2006 15:28:36 -0000	1.19
+++ jsch.spec	3 Apr 2007 04:21:39 -0000	1.20
@@ -36,13 +36,18 @@
 
 Name:           jsch
 Version:        0.1.28
-Release:        1jpp.5
+Release:        1jpp.6
 Epoch:          0
 Summary:        Pure Java implementation of SSH2
 Group:          Development/Libraries/Java
 License:        BSD-style
 URL:            http://www.jcraft.com/jsch/
 Source0:        http://download.sourceforge.net/sourceforge/jsch/jsch-%{version}.zip
+# wget http://download.eclipse.org/tools/orbit/downloads/drops/S200703261521/bundles/com.jcraft.jsch_0.1.28.jar
+# unzip com.jcraft.jsch_0.1.28.jar META-INF/MANIFEST.MF
+# mv META-INF/MANIFEST.MF
+# rmdir META-INF
+Source1:        MANIFEST.MF
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  jpackage-utils >= 0:1.5
@@ -92,6 +97,11 @@
 export CLASSPATH=$(build-classpath jzlib)
 ant dist javadoc 
 
+# inject the OSGi Manifest
+mkdir META-INF
+mv %{SOURCE1} META-INF
+zip dist/lib/%{name}-*.jar META-INF/MANIFEST.MF
+
 %install
 # jars
 rm -rf $RPM_BUILD_ROOT
@@ -163,6 +173,9 @@
 
 
 %changelog
+* Tue Apr 3 2007 Ben Konrath <bkonrath at redhat.com> - 0:0.1.28-1jpp.6
+- Add OSGi Manifest to jar.
+
 * Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> - 0:0.1.28-1jpp.5
 - Updated changelog entries in spec.
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 05:17:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 01:17:18 -0400
Subject: rpms/jsch/devel jsch.spec,1.20,1.21
Message-ID: <200704030517.l335HIZT015549@cvs.devel.redhat.com>

Author: bkonrath

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

Modified Files:
	jsch.spec 
Log Message:
- Disable aot-compile-rpm on ia64.



Index: jsch.spec
===================================================================
RCS file: /cvs/dist/rpms/jsch/devel/jsch.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jsch.spec	3 Apr 2007 04:21:39 -0000	1.20
+++ jsch.spec	3 Apr 2007 05:17:16 -0000	1.21
@@ -120,7 +120,10 @@
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name} # ghost symlink
 
 %if %{gcj_support}
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=234989
+%ifnarch ia64
   aot-compile-rpm
+%endif 
 %endif
 
 
@@ -158,8 +161,10 @@
 %{_javadir}/*.jar
 %doc LICENSE.txt
 %if %{gcj_support}
+%ifnarch ia64
 %attr(-,root,root) %{_libdir}/gcj/%{name}
 %endif
+%endif
 
 %files javadoc
 %defattr(-,root,root,-)
@@ -175,6 +180,7 @@
 %changelog
 * Tue Apr 3 2007 Ben Konrath <bkonrath at redhat.com> - 0:0.1.28-1jpp.6
 - Add OSGi Manifest to jar.
+- Disable aot-compile-rpm on ia64. 
 
 * Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> - 0:0.1.28-1jpp.5
 - Updated changelog entries in spec.



From fedora-cvs-commits at redhat.com  Tue Apr  3 05:23:39 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 01:23:39 -0400
Subject: rpms/hal/devel .cvsignore, 1.46, 1.47 hal.spec, 1.124, 1.125 sources,
	1.47, 1.48
Message-ID: <200704030523.l335NdE3019974@cvs.devel.redhat.com>

Author: davidz

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

Modified Files:
	.cvsignore hal.spec sources 
Log Message:
* Mon Apr 02 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-1
- Update to upstream release 0.5.9 and hal-info 20070402




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	1 Apr 2007 19:37:06 -0000	1.46
+++ .cvsignore	3 Apr 2007 05:23:37 -0000	1.47
@@ -38,3 +38,5 @@
 hal-0.5.9.git20070326.tar.gz
 hal-info-20070328.tar.gz
 hal-0.5.9.git20070401.tar.gz
+hal-0.5.9.tar.gz
+hal-info-20070402.tar.gz


Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- hal.spec	3 Apr 2007 01:24:33 -0000	1.124
+++ hal.spec	3 Apr 2007 05:23:37 -0000	1.125
@@ -16,19 +16,19 @@
 %define cryptsetup_luks_version 1.0.1-2
 %define pm_utils_version        0.10-1
 %define gtk_doc_version         1.4
-%define consolekit_version      0.1.0
+%define consolekit_version      0.2.0
 %define acl_version             2.2.39
 
 %define hal_user_uid            68
 
-%define hal_info_version        20070328
+%define hal_info_version        20070402
 
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.9
-Release: 0.git20070401.2%{?dist}
+Release: 1%{?dist}
 URL: http://www.freedesktop.org/Software/hal
-Source0: http://people.freedesktop.org/~david/dist/%{name}-%{version}.git20070401.tar.gz
+Source0: http://people.freedesktop.org/~david/dist/%{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
 Source2: hal-device-manager.desktop
 Source3: http://people.freedesktop.org/~david/dist/hal-info-%{hal_info_version}.tar.gz
@@ -118,7 +118,7 @@
 %package docs
 Summary: Documentation for HAL
 Group: Development/Libraries
-Requires: %name = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description docs
 API docs for HAL.
@@ -127,7 +127,7 @@
 %setup -q -a 3
 
 %build
-%configure --with-os-type=redhat --enable-console-kit --enable-acl-management --enable-umount-helper --enable-docbook-docs --enable-acpi-ibm --enable-acpi-toshiba --with-eject=/usr/sbin/eject
+%configure --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version} --with-os-type=redhat --enable-console-kit --enable-acl-management --enable-umount-helper --enable-acpi-ibm --enable-acpi-toshiba --with-eject=/usr/sbin/eject
 
 cd hal-info-%{hal_info_version}
 %configure
@@ -135,6 +135,8 @@
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
+cp README AUTHORS NEWS COPYING HACKING $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
+
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor/
 
 desktop-file-install --vendor fedora \
@@ -149,9 +151,6 @@
 cd hal-info-%{hal_info_version}
 make install DESTDIR=$RPM_BUILD_ROOT
 
-cp NEWS $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
-cp COPYING $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -192,6 +191,9 @@
 %doc %dir %{_datadir}/doc/%{name}-%{version}
 %doc %{_datadir}/doc/%{name}-%{version}/NEWS
 %doc %{_datadir}/doc/%{name}-%{version}/COPYING
+%doc %{_datadir}/doc/%{name}-%{version}/AUTHORS
+%doc %{_datadir}/doc/%{name}-%{version}/HACKING
+%doc %{_datadir}/doc/%{name}-%{version}/README
 
 %dir %{_sysconfdir}/dbus-1/system.d
 %config %{_sysconfdir}/dbus-1/system.d/hal.conf
@@ -223,6 +225,7 @@
 %dir %{_libdir}/hal/scripts
 %{_libdir}/hal/scripts/*
 %{_mandir}/man1/*
+%{_mandir}/man8/*
 
 %{_sysconfdir}/udev/rules.d/90-hal.rules
 
@@ -261,6 +264,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Mon Apr 02 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-1
+- Update to upstream release 0.5.9 and hal-info 20070402
+
 * Mon Apr 02 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-0.git20070401.2
 - Split hal package into hal and hal-libs (#231200)
 - Fix hal-device-manager ownership (#234696)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	1 Apr 2007 19:37:06 -0000	1.47
+++ sources	3 Apr 2007 05:23:37 -0000	1.48
@@ -1,2 +1,2 @@
-7c5ddf3fe462b225f7c0be69843631c7  hal-info-20070328.tar.gz
-53a0a42f66b13db93757db923f8d720c  hal-0.5.9.git20070401.tar.gz
+a6f532770cf9286e1de38d6570cbc6bc  hal-0.5.9.tar.gz
+21dbda966482245c42c0356e087417dd  hal-info-20070402.tar.gz



From fedora-cvs-commits at redhat.com  Tue Apr  3 07:21:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 03:21:47 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1147,1.1148
Message-ID: <200704030721.l337LlHE011124@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
undo


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1147
retrieving revision 1.1148
diff -u -r1.1147 -r1.1148
--- openoffice.org.spec	2 Apr 2007 17:11:39 -0000	1.1147
+++ openoffice.org.spec	3 Apr 2007 07:21:45 -0000	1.1148
@@ -1,11 +1,11 @@
 %define oootag OOF680
 %define ooomilestone 14
-%define rh_rpm_release 2.3
+%define rh_rpm_release 2
 
 # gcc#19664#
 %define stlvisibilityfcked 1
 # undef to get english only and no-langpacks for a quick smoketest build
-%define langpacks 0
+%define langpacks 1
 # undef to revert to the traditional print dialog
 %define gtkprintui 1
 # undef to revert from combining startup libs into a single libsoffice 
@@ -25,8 +25,7 @@
 
 %define ooo_base_name %{oootag}_m%{ooomilestone}
 
-#ExclusiveArch:  ppc %{ix86} x86_64
-ExclusiveArch:  %{ix86}
+ExclusiveArch:  ppc %{ix86} x86_64
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
 Version:        2.2.0
@@ -1090,7 +1089,7 @@
         esac
         ARCH_FLAGS="$ARCH_FLAGS $i"
 done
-export ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64 -finline-limit=64 -fno-threadsafe-statics -pg"
+export ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64 -finline-limit=64 -fno-threadsafe-statics"
 #convert _smp_mflags to dmake equivalent
 SMP_MFLAGS=%{?_smp_mflags}
 SMP_MFLAGS=-P$[${SMP_MFLAGS/-j/}]



From fedora-cvs-commits at redhat.com  Tue Apr  3 07:40:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 03:40:26 -0400
Subject: rpms/openoffice.org/devel openoffice.org-2.2.0.gprof.patch, NONE,
	1.1 openoffice.org.spec, 1.1148, 1.1149
Message-ID: <200704030740.l337eQMb017032@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.2.0.gprof.patch 
Log Message:
gprof test

openoffice.org-2.2.0.gprof.patch:
 inc/unxlngi4.mk        |    0 
 solenv/inc/unxlngi4.mk |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-2.2.0.gprof.patch ---
Index: inc/unxlngi4.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxlngi4.mk,v
retrieving revision 1.42
diff -u -r1.42 unxlngi4.mk
--- openoffice.org.orig/solenv/inc/unxlngi4.mk	8 Aug 2006 11:38:27 -0000	1.42
+++ openoffice.org/solenv/inc/unxlngi4.mk	3 Apr 2007 07:36:23 -0000
@@ -92,7 +92,7 @@
 .IF "$(BUILD_SPECIAL)"==""
 CFLAGSCXX+=-include preinclude.h
 .ENDIF
-PICSWITCH:=-fpic
+PICSWITCH:=-fpic -lpg
 
 # Compiler flags for compiling static object in single threaded environment with graphical user interface
 CFLAGSOBJGUIST=
@@ -139,7 +139,7 @@
 LINKC*=$(CC)
 
 # default linker flags
-LINKFLAGSDEFS*=-Wl,-z,defs
+LINKFLAGSDEFS*=-Wl,-z,defs -lpg
 LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
 LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1148
retrieving revision 1.1149
diff -u -r1.1148 -r1.1149
--- openoffice.org.spec	3 Apr 2007 07:21:45 -0000	1.1148
+++ openoffice.org.spec	3 Apr 2007 07:40:23 -0000	1.1149
@@ -1,11 +1,11 @@
 %define oootag OOF680
 %define ooomilestone 14
-%define rh_rpm_release 2
+%define rh_rpm_release 2.4
 
 # gcc#19664#
 %define stlvisibilityfcked 1
 # undef to get english only and no-langpacks for a quick smoketest build
-%define langpacks 1
+%define langpacks 0
 # undef to revert to the traditional print dialog
 %define gtkprintui 1
 # undef to revert from combining startup libs into a single libsoffice 
@@ -25,7 +25,8 @@
 
 %define ooo_base_name %{oootag}_m%{ooomilestone}
 
-ExclusiveArch:  ppc %{ix86} x86_64
+ExclusiveArch:  %{ix86}
+#ExclusiveArch:  ppc %{ix86} x86_64
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
 Version:        2.2.0
@@ -134,6 +135,7 @@
 Patch74: openoffice.org-2.2.0.ooo53397.linkopt.patch
 %endif
 Patch75: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
+Patch76: openoffice.org-2.2.0.gprof.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1059,6 +1061,7 @@
 %patch74 -p1 -b .ooo53397.linkopt.patch
 %endif
 %patch75 -p1 -b .ooo75790.sc.pa-IN.translate.patch
+%patch76 -p1 -b .gprof.patch
 
 cp %{SOURCE1} extras/source/database/evolocal.odb
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 08:30:52 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 04:30:52 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.418,1.419
Message-ID: <200704030830.l338Uq1x031383@cvs.devel.redhat.com>

Author: bkonrath

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

Modified Files:
	eclipse.spec 
Log Message:
* Tue Apr 03 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-8
- Link to system-installed jsch instead of including it. 



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -r1.418 -r1.419
--- eclipse.spec	21 Mar 2007 01:58:32 -0000	1.418
+++ eclipse.spec	3 Apr 2007 08:30:50 -0000	1.419
@@ -19,7 +19,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        7%{?dist} 
+Release:        8%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -138,7 +138,7 @@
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
 BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
-BuildRequires: jsch >= 0:0.1.28-1jpp
+BuildRequires: jsch >= 0:0.1.28-1jpp.6
 BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
 BuildRequires: mx4j >= 2.1
 BuildRequires: tomcat5 = 5.5.20
@@ -242,6 +242,7 @@
 Requires: tomcat5 = 5.5.20
 Requires: tomcat5-jasper = 5.5.20
 Requires: tomcat5-servlet-2.4-api = 5.5.20
+Requires: jsch >= 0:0.1.28-1jpp.6
 Requires: lucene, lucene-devel
 Requires: regexp
 
@@ -685,6 +686,10 @@
   find -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/@eye-eh-64_32@/ia64_32/g" "{}" \;
 %endif 
 
+# link to the jsch jar
+rm baseLocation/plugins/com.jcraft.jsch_0.1.28.jar
+ln -s %{_javadir}/jsch.jar baseLocation/plugins/com.jcraft.jsch_0.1.28.jar
+
 # set the icu4j plugins for building
 pushd baseLocation/plugins
 rm com.ibm.icu.base_3.4.5.20061213.jar \
@@ -734,24 +739,8 @@
 tar jxf %{SOURCE20}
 
 %build
-env
 ORIGCLASSPATH=$CLASSPATH
 
-# Build jsch
-pushd baseLocation/plugins
-# extract the Manifest file
-unzip -qq -o -d com.jcraft.jsch_0.1.28.jar-build com.jcraft.jsch_*.jar -x com\*
-rm com.jcraft.jsch_*.jar
-popd
-# FIXME jar -V does not work for proprietary VMs 
-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 -Mcf ../com.jcraft.jsch_0.1.28.jar *
-popd
-# FIXME don't delete this, do what icu4j does
-rm -r baseLocation/plugins/com.jcraft.jsch_0.1.28.jar-build
-
 # Finish the icu4j build
 pushd baseLocation/plugins
 
@@ -1230,6 +1219,10 @@
 
 build-jar-repository -s -p plugins/org.junit_* junit
 
+# link to the jsch jar
+rm plugins/com.jcraft.jsch_0.1.28.jar
+ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_0.1.28.jar
+
 # Ensure that the zip files are the same across all builds.
 # This is needed to make these package multilib compatible.
 # FIXME: this needs to be re-written as a separate program
@@ -1323,7 +1316,6 @@
 %else
 OSGIPLUGINVERSION=$(ls plugins | grep osgi_ | sed 's/org.eclipse.osgi_//')
 aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEPLUGINVERSION \
-                --exclude %{_datadir}/%{name}/plugins/com.jcraft.jsch_0.1.28.jar \
                 --exclude %{_datadir}/%{name}/plugins/org.eclipse.osgi_$OSGIPLUGINVERSION
 %endif
 %endif
@@ -1593,9 +1585,6 @@
 %{_libdir}/gcj/%{name}/org.eclipse.jface.text_*
 %{_libdir}/gcj/%{name}/org.eclipse.ui.intro_*
 #%{_libdir}/gcj/%{name}/org.eclipse.ui.ide_*
-%ifnarch ia64
-%{_libdir}/gcj/%{name}/com.jcraft.jsch_*
-%endif
 %{_libdir}/gcj/%{name}/org.eclipse.ui.cheatsheets_*
 %{_libdir}/gcj/%{name}/org.eclipse.ant.core_*
 %{_libdir}/gcj/%{name}/org.eclipse.help.appserver_*
@@ -1730,6 +1719,9 @@
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
+* Tue Apr 03 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-8
+- Link to system-installed jsch instead of including it. 
+
 * Tue Mar 20 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-7
 - Remove search and processing for mac encoded files.
 - Remove BR dos2unix.



From fedora-cvs-commits at redhat.com  Tue Apr  3 08:39:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 04:39:30 -0400
Subject: rpms/man-pages/devel man-pages.spec,1.68,1.69
Message-ID: <200704030839.l338dUF5005082@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/man-pages/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4968

Modified Files:
	man-pages.spec 
Log Message:
Remove the rpcinfo man page



Index: man-pages.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- man-pages.spec	16 Mar 2007 12:41:18 -0000	1.68
+++ man-pages.spec	3 Apr 2007 08:39:28 -0000	1.69
@@ -1,7 +1,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
 Version: 2.43
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: distributable
 Group: Documentation
 URL: http://www.kernel.org/pub/linux/docs/manpages/
@@ -160,6 +160,9 @@
 # Problem with db x db4 - man pages
 rm -f man3/{btree,dbopen,hash,mpool,recno}.3
 
+# Remove rpcinfo page
+rm -f man8/rpcinfo.8
+
 # Deprecated
 rm -f man2/pciconfig_{write,read,iobase}.2
 
@@ -239,6 +242,9 @@
 %lang(en) %{_mandir}/en/man*
 
 %changelog
+* Mon Apr  2 2007 Steve Dickson <steved at redhat.com> 2.43-12
+- Remove the rpcinfo man page.
+
 * Fri Mar 16 2007 Ivana Varekova <varekova at redhat.com> 2.43-11
 - Resolves: 230899
   Error in the man-pages.spec file: incorrect encoding convertation



From fedora-cvs-commits at redhat.com  Tue Apr  3 08:40:41 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 04:40:41 -0400
Subject: rpms/man-pages/devel man-pages.spec,1.69,1.70
Message-ID: <200704030840.l338efOd005970@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/man-pages/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5759

Modified Files:
	man-pages.spec 
Log Message:
Added bz number to last changelog



Index: man-pages.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- man-pages.spec	3 Apr 2007 08:39:28 -0000	1.69
+++ man-pages.spec	3 Apr 2007 08:40:39 -0000	1.70
@@ -243,7 +243,7 @@
 
 %changelog
 * Mon Apr  2 2007 Steve Dickson <steved at redhat.com> 2.43-12
-- Remove the rpcinfo man page.
+- Remove the rpcinfo man page (#228894).
 
 * Fri Mar 16 2007 Ivana Varekova <varekova at redhat.com> 2.43-11
 - Resolves: 230899



From fedora-cvs-commits at redhat.com  Tue Apr  3 09:10:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 05:10:23 -0400
Subject: rpms/automake16/devel automake16.spec,1.14,1.15
Message-ID: <200704030910.l339ANV1027512@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	automake16.spec 
Log Message:
- buildrequire texinfo for makeinfo (empty info file)


Index: automake16.spec
===================================================================
RCS file: /cvs/dist/rpms/automake16/devel/automake16.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- automake16.spec	22 Mar 2007 14:21:57 -0000	1.14
+++ automake16.spec	3 Apr 2007 09:10:15 -0000	1.15
@@ -3,7 +3,7 @@
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake16
 Version:    %{api_version}.3
-Release:    11
+Release:    12
 License:    GPL
 Group:      Development/Tools
 Source:     ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
@@ -11,7 +11,7 @@
 Source11:   filter-requires-automake.sh
 URL:        http://sources.redhat.com/automake
 Obsoletes:  automake = 1.6.3
-Buildrequires:  autoconf >= 2.52 bison flex
+Buildrequires:  autoconf >= 2.52 bison flex texinfo
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 BuildArch:  noarch
@@ -89,6 +89,9 @@
 %{_infodir}/*
 
 %changelog
+* Tue Apr 03 2007 Karsten Hopp <karsten at redhat.com> 1.6.3-12
+- buildrequire texinfo for makeinfo
+
 * Thu Mar 22 2007 Karsten Hopp <karsten at redhat.com> 1.6.3-11
 - more review fixes (#225300)
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 09:59:05 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 05:59:05 -0400
Subject: rpms/system-config-bind/devel
	system-config-bind-4.0.2-SSHFPrecord.patch, NONE,
	1.1 system-config-bind-4.0.2-correct-typos.patch, NONE,
	1.1 system-config-bind.spec, 1.65, 1.66
Message-ID: <200704030959.l339x5k3008927@cvs.devel.redhat.com>

Author: odvorace

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

Modified Files:
	system-config-bind.spec 
Added Files:
	system-config-bind-4.0.2-SSHFPrecord.patch 
	system-config-bind-4.0.2-correct-typos.patch 
Log Message:
some bug fixes

system-config-bind-4.0.2-SSHFPrecord.patch:
 RR.py |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE system-config-bind-4.0.2-SSHFPrecord.patch ---
--- system-config-bind-4.0.2/RR.py.old	2007-03-13 12:06:10.000000000 +0100
+++ system-config-bind-4.0.2/RR.py	2007-03-13 14:46:28.000000000 +0100
@@ -767,6 +767,15 @@
          }
     types=[ DNS.FORWARD ]
 
+class SSHFP(RR):
+   attrs=[ ['ALTYPE', int], ['FPTYPE', int], ['FP', str] ]
+   desc={'':_('SSH Fingerprint'),
+               'ALTYPE':_('Algorithm type'),
+               'FPTYPE':_('Fingerprint type'),
+               'FP':_('Fingerprint')
+              }
+   types=[ DNS.FORWARD ]
+
 class TXT(RR):
     attrs=[ ['TXT', str] ]
     desc={'': _('Associated Text'),
@@ -894,7 +903,7 @@
         'DNSKEY':DNSKEY, 'DS': DS,
         'HINFO':HINFO, 'ISDN': ISDN, 'KEY':KEY, 'KX': KX, 'LOC': LOC, 'MB': MB, 'MD':MD,'MF':MF,'MG':MG,'MINFO':MINFO,
         'MR':MR, 'MX':MX, 'NAPTR':NAPTR, 'NS':NS, 'NSAP':NSAP, 'NSEC':NSEC, 'NXT':NXT, 'NULL':NULL, 'PTR': PTR,
-        'PX':PX, 'RP':RP, 'RRSIG':RRSIG, 'SIG':SIG, 'SOA': SOA, 'TXT':TXT, 'SRV':SRV, 'WKS':WKS, 'X25':X25,
+        'PX':PX, 'RP':RP, 'RRSIG':RRSIG, 'SIG':SIG, 'SOA': SOA, 'TXT':TXT, 'SRV':SRV, 'SSHFP':SSHFP, 'WKS':WKS, 'X25':X25,
         # Directives:
         'INCLUDE': INCLUDE, 'GENERATE': GENERATE, 'ORIGIN': ORIGIN, 'TTL': TTL       
       }

system-config-bind-4.0.2-correct-typos.patch:
 DNS.py              |    2 +-
 Import.py           |    2 +-
 NamedConfOptions.py |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE system-config-bind-4.0.2-correct-typos.patch ---
--- system-config-bind-4.0.2/NamedConfOptions.py.old	2007-03-15 10:28:51.000000000 +0100
+++ system-config-bind-4.0.2/NamedConfOptions.py	2007-03-15 10:31:20.000000000 +0100
@@ -643,7 +643,7 @@
     'coresize':
     {  'name': _('Core File Size Limit'),
        'type': DNS.Size,
-       'desc': _('The maximum size of a core dump fil.') ,
+       'desc': _('The maximum size of a core dump file.') ,
     },
     'datasize':
     {  'name': _('Data Memory Size Limit'),
--- system-config-bind-4.0.2/Import.py.old	2007-03-15 10:28:25.000000000 +0100
+++ system-config-bind-4.0.2/Import.py	2007-03-15 10:30:43.000000000 +0100
@@ -99,7 +99,7 @@
         debug( 'CHOOSE FILE', file, response)
         if( response != gtk.RESPONSE_CANCEL ):
             if (file==None) or os.access(file, os.F_OK | os.R_OK) != 1:
-                s.bind.gui.modalError(s.bind.gui.gui,_('Import File Error'),_('You must choose a file that exists and that you have read permisssion for.'))
+                s.bind.gui.modalError(s.bind.gui.gui,_('Import File Error'),_('You must choose a file that exists and that you have read permission for.'))
                 s.fileChooser.set_filename('/etc/hosts')
                 s.fileEntry.set_text('/etc/hosts')
                 return False
--- system-config-bind-4.0.2/DNS.py.old	2007-03-15 10:28:04.000000000 +0100
+++ system-config-bind-4.0.2/DNS.py	2007-03-15 10:30:00.000000000 +0100
@@ -1124,7 +1124,7 @@
         {  'desc':_('Lame servers. These are misconfigurations in remote servers, discovered by BIND 9 when trying to query those servers during resolution.')
         },
         'delegation-only':
-        {  'desc':_('Delegation only. Logs queries that have have been forced to NXDOMAIN as the result of a delegation-only zone or a delegation-only in a hint or stub zone declaration.')
+        {  'desc':_('Delegation only. Logs queries that have been forced to NXDOMAIN as the result of a delegation-only zone or a delegation-only in a hint or stub zone declaration.')
         }
     }
     syslog_facilities=[ 'auth', 'authpriv', 'cron', 'daemon', 'kern', 'lpr', 'mail', 'mark',


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/devel/system-config-bind.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- system-config-bind.spec	23 Jan 2007 16:45:22 -0000	1.65
+++ system-config-bind.spec	3 Apr 2007 09:59:02 -0000	1.66
@@ -1,7 +1,7 @@
 Summary: 	The Red Hat BIND DNS Configuration Tool.
 Name: 		system-config-bind
 Version: 	4.0.2
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 License: 	GPL
 Group: 		Applications/System
 URL: 		http://people.redhat.com/~jvdias/system-config-bind
@@ -9,6 +9,8 @@
 Patch: 		system-config-bind-4.0.2-ver.patch
 Patch1:		system-config-bind-4.0.2-version-2.patch
 Patch2:		system-config-bind-4.0.2-check-child.patch
+Patch3:		system-config-bind-4.0.2-SSHFPrecord.patch
+Patch4:		system-config-bind-4.0.2-correct-typos.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: 	noarch
 BuildRequires:  python, gettext, make, intltool
@@ -33,6 +35,8 @@
 %patch  -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1 -b .sshfprecord
+%patch4	-p1 -b .correct-typos
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -99,6 +103,12 @@
 fi
 
 %changelog
+* Tue Apr 3 2007 Ondrej Dvoracek <odvorace at redhat.com> - 4.0.2-5
+- Added SSHFP Resource record
+- Resolves #205689
+- Corrected some typos in strings
+- Resolves #232054
+
 * Tue Jan 23 2007 Martin Stransky <stransky at redhat.com> - 4.0.2-4
 - reworked version check
 - added check for child processes (#216584)



From fedora-cvs-commits at redhat.com  Tue Apr  3 10:08:58 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 06:08:58 -0400
Subject: rpms/cups/devel cups-str2109.patch,NONE,1.1 cups.spec,1.324,1.325
Message-ID: <200704031008.l33A8wtf009277@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str2109.patch 
Log Message:
* Tue Apr  3 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-4
- Relay printer-state-message values in the IPP backend (STR #2109).


cups-str2109.patch:
 ipp.c |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

--- NEW FILE cups-str2109.patch ---
--- cups-1.2.10/backend/ipp.c.str2109	2007-04-03 11:05:13.000000000 +0100
+++ cups-1.2.10/backend/ipp.c	2007-04-03 11:05:33.000000000 +0100
@@ -210,6 +210,7 @@
 		  "document-format-supported",
 		  "printer-is-accepting-jobs",
 		  "printer-state",
+		  "printer-state-message",
 		  "printer-state-reasons",
 		};
   static const char * const jattrs[] =
@@ -1285,6 +1286,11 @@
 {
   ipp_t	*request,			/* IPP request */
 	*response;			/* IPP response */
+  static const char * const attrs[] =	/* Attributes we want */
+  {
+    "printer-state-message",
+    "printer-state-reasons"
+  };
 
 
  /*
@@ -1301,8 +1307,9 @@
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
                  "requesting-user-name", NULL, user);
 
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-               "requested-attributes", NULL, "printer-state-reasons");
+  ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+                "requested-attributes",
+		(int)(sizeof(attrs) / sizeof(attrs[0])), NULL, attrs);
 
  /*
   * Do the request...
@@ -1430,7 +1437,8 @@
 {
   int			i;		/* Looping var */
   int			count;		/* Count of reasons shown... */
-  ipp_attribute_t	*reasons;	/* printer-state-reasons */
+  ipp_attribute_t	*psm,		/* pritner-state-message */
+			*reasons;	/* printer-state-reasons */
   const char		*reason;	/* Current reason */
   const char		*message;	/* Message to show */
   char			unknown[1024];	/* Unknown message string */
@@ -1438,6 +1446,10 @@
   char			state[1024];	/* State string */
 
 
+  if ((psm = ippFindAttribute(ipp, "printer-state-message",
+                              IPP_TAG_TEXT)) != NULL)
+    fprintf(stderr, "INFO: %s\n", psm->values[0].string.text);
+
   if ((reasons = ippFindAttribute(ipp, "printer-state-reasons",
                                   IPP_TAG_KEYWORD)) == NULL)
     return (0);


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -r1.324 -r1.325
--- cups.spec	2 Apr 2007 13:29:08 -0000	1.324
+++ cups.spec	3 Apr 2007 10:08:56 -0000	1.325
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.10
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -45,6 +45,7 @@
 Patch21: cups-driverd-timeout.patch
 Patch22: cups-af_unix-auth.patch
 Patch23: cups-str2323.patch
+Patch24: cups-str2109.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -152,6 +153,7 @@
 %patch21 -p1 -b .driverd-timeout
 %patch22 -p1 -b .af_unix-auth
 %patch23 -p1 -b .str2323
+%patch24 -p1 -b .str2109
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -438,6 +440,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Apr  3 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-4
+- Relay printer-state-message values in the IPP backend (STR #2109).
+
 * Mon Apr  2 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-3
 - Don't clear printer-state-reasons after job completion (STR #2323).
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 10:15:04 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 06:15:04 -0400
Subject: rpms/procps/FC-6 procps-3.2.7-sysctl-ignore.patch, NONE,
	1.1 procps-3.2.7-w-best.patch, NONE, 1.1 procps.spec, 1.59,
	1.60 procps-3.2.5-sysctl-ignore.patch, 1.1, NONE
Message-ID: <200704031015.l33AF4hZ009393@cvs.devel.redhat.com>

Author: kzak

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

Modified Files:
	procps.spec 
Added Files:
	procps-3.2.7-sysctl-ignore.patch procps-3.2.7-w-best.patch 
Removed Files:
	procps-3.2.5-sysctl-ignore.patch 
Log Message:
* Tue Apr  3 2007 Karel Zak <kzak at redhat.com> 3.2.7-8.3
- fix #234546 - 'w' doesn't give correct information about what's being run.
- fix #228870 - process `sysctl' is using deprecated sysctl
- Resolves: rhbz#234546 rhbz#228870


procps-3.2.7-sysctl-ignore.patch:
 sysctl.c |   50 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 47 insertions(+), 3 deletions(-)

--- NEW FILE procps-3.2.7-sysctl-ignore.patch ---
--- procps-3.2.7/sysctl.c.kzak	2007-04-03 01:26:01.000000000 +0200
+++ procps-3.2.7/sysctl.c	2007-04-03 01:26:13.000000000 +0200
@@ -63,6 +63,44 @@
 static const char ERR_PRELOAD_FILE[] = "error: unable to open preload file \"%s\"\n";
 static const char WARN_BAD_LINE[] = "warning: %s(%d): invalid syntax, continuing...\n";
 
+/* Ignore deprecated sysctls
+ * -- we use this list when we scan (DisplayAll) /proc/sys only. We don't use it
+ *    in case when user direcly uses deprecated key. It's better when user can read
+ *    an error message from kernel.
+ */
+struct sysctl_ignore {
+	const char *prefix;
+	int        prefix_len;
+	const char *option;
+	int        option_len;
+};
+
+#define IGNORE_ENTRY(prefix, option) \
+		{ prefix, sizeof(prefix)-1, option, sizeof(option)-1 }
+
+static struct sysctl_ignore Ignore[] =
+{
+	IGNORE_ENTRY( "net.ipv6.neigh", "base_reachable_time" ),
+	IGNORE_ENTRY( "net.ipv6.neigh", "retrans_time" )
+};
+
+static bool IsIgnored(const char *name)
+{
+  unsigned int i;
+  int sz = strlen(name);
+
+  for (i = 0; i < sizeof(Ignore)/sizeof(struct sysctl_ignore); i++) {
+     struct sysctl_ignore *p = &Ignore[i];
+
+     if (sz < (p->prefix_len + p->option_len))
+	     continue;
+
+     if (strncmp(name, p->prefix, p->prefix_len) == 0 &&
+         strcmp(name + (sz - p->option_len), p->option) == 0)
+       return true;
+  }
+  return false;
+}
 
 static void slashdot(char *restrict p, char old, char new){
   p = strpbrk(p,"/.");
@@ -122,7 +160,7 @@
  *     Read a sysctl setting 
  *
  */
-static int ReadSetting(const char *restrict const name) {
+static int ReadSetting(const char *restrict const name, bool useign) {
    int rc = 0;
    char *restrict tmpname;
    char *restrict outname;
@@ -145,6 +183,12 @@
    outname = strdup(name);
    slashdot(outname,'/','.'); /* change / to . */
 
+   if (useign && IsIgnored(outname)) {
+     free(outname);
+     free(tmpname);
+     return rc;
+   }
+
    if (stat(tmpname, &st)==0) {
 	if (st.st_mode & (S_IRUSR|S_IROTH|S_IRGRP))	   
 	   	fp = fopen(tmpname, "r");
@@ -257,7 +301,7 @@
                strcat(tmpdir, "/");
                DisplayAll(tmpdir);
             } else {
-               rc |= ReadSetting(tmpdir+strlen(PROC_PATH));
+               rc |= ReadSetting(tmpdir+strlen(PROC_PATH), true);
             }
          }
          free(tmpdir);
@@ -519,7 +563,7 @@
          if (WriteMode || index(*argv, '='))
             ReturnCode = WriteSetting(*argv);
          else
-            ReturnCode = ReadSetting(*argv);
+            ReturnCode = ReadSetting(*argv, false);
       }
    }
 

procps-3.2.7-w-best.patch:
 w.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE procps-3.2.7-w-best.patch ---
--- procps-3.2.7/w.c.kzak	2007-04-02 23:58:30.000000000 +0200
+++ procps-3.2.7/w.c	2007-04-03 00:09:15.000000000 +0200
@@ -149,11 +149,11 @@
 	const proc_t *restrict const tmp = *pptr;
 	if(unlikely(tmp->tgid == u->ut_pid)) {
 	    *found_utpid = 1;
-	    best = tmp;
+	    if (!best)
+	         best = tmp;
 	}
 	if(tmp->tty != line) continue;
 	(*jcpu) += tmp->utime + tmp->stime;
-	secondbest = tmp;
 	/* same time-logic here as for "best" below */
 	if(!  (secondbest && tmp->start_time <= secondbest->start_time)  ){
 	    secondbest = tmp;


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/FC-6/procps.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- procps.spec	5 Feb 2007 08:25:42 -0000	1.59
+++ procps.spec	3 Apr 2007 10:15:02 -0000	1.60
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities.
 Name: procps
 Version: 3.2.7
-Release: 8.2%{dist}
+Release: 8.3%{dist}
 License: GPL
 Group: Applications/System
 Source: http://procps.sourceforge.net/procps-%{version}.tar.gz
@@ -43,10 +43,12 @@
 # 199174 - top returns with exit code 1 even if no error occurs
 Patch20: procps-3.2.7-top-exitcode.patch
 # 212637 - sysctl using deprecated syscall
-Patch21: procps-3.2.5-sysctl-ignore.patch
+# 228870 - process `sysctl' is using deprecated sysctl ...
+Patch21: procps-3.2.7-sysctl-ignore.patch
 # 140975 - top corrupts screen when sorting on first column
 Patch22: procps-3.2.7-top-sorthigh.path
-
+# 234546 - 'w' doesn't give correct information about what's being run.
+Patch23: procps-3.2.7-w-best.patch
 
 BuildRequires: ncurses-devel
 
@@ -94,6 +96,7 @@
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 
 cp %SOURCE1 .
 
@@ -131,6 +134,10 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Tue Apr  3 2007 Karel Zak <kzak at redhat.com> 3.2.7-8.3
+- fix #234546 - 'w' doesn't give correct information about what's being run.
+- fix #228870 - process `sysctl' is using deprecated sysctl
+
 * Mon Feb  5 2007 Karel Zak <kzak at redhat.com> 3.2.7-8.2
 - fix #140975 - top corrupts screen when sorting on first column
 


--- procps-3.2.5-sysctl-ignore.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr  3 10:18:11 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 06:18:11 -0400
Subject: rpms/cups/FC-6 cups-str2109.patch,NONE,1.1 cups.spec,1.325,1.326
Message-ID: <200704031018.l33AIBcx009480@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str2109.patch 
Log Message:
* Tue Apr  3 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-3
- Relay printer-state-message values in the IPP backend (STR #2109).


cups-str2109.patch:
 ipp.c |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

--- NEW FILE cups-str2109.patch ---
--- cups-1.2.10/backend/ipp.c.str2109	2007-04-03 11:05:13.000000000 +0100
+++ cups-1.2.10/backend/ipp.c	2007-04-03 11:05:33.000000000 +0100
@@ -210,6 +210,7 @@
 		  "document-format-supported",
 		  "printer-is-accepting-jobs",
 		  "printer-state",
+		  "printer-state-message",
 		  "printer-state-reasons",
 		};
   static const char * const jattrs[] =
@@ -1285,6 +1286,11 @@
 {
   ipp_t	*request,			/* IPP request */
 	*response;			/* IPP response */
+  static const char * const attrs[] =	/* Attributes we want */
+  {
+    "printer-state-message",
+    "printer-state-reasons"
+  };
 
 
  /*
@@ -1301,8 +1307,9 @@
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
                  "requesting-user-name", NULL, user);
 
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-               "requested-attributes", NULL, "printer-state-reasons");
+  ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+                "requested-attributes",
+		(int)(sizeof(attrs) / sizeof(attrs[0])), NULL, attrs);
 
  /*
   * Do the request...
@@ -1430,7 +1437,8 @@
 {
   int			i;		/* Looping var */
   int			count;		/* Count of reasons shown... */
-  ipp_attribute_t	*reasons;	/* printer-state-reasons */
+  ipp_attribute_t	*psm,		/* pritner-state-message */
+			*reasons;	/* printer-state-reasons */
   const char		*reason;	/* Current reason */
   const char		*message;	/* Message to show */
   char			unknown[1024];	/* Unknown message string */
@@ -1438,6 +1446,10 @@
   char			state[1024];	/* State string */
 
 
+  if ((psm = ippFindAttribute(ipp, "printer-state-message",
+                              IPP_TAG_TEXT)) != NULL)
+    fprintf(stderr, "INFO: %s\n", psm->values[0].string.text);
+
   if ((reasons = ippFindAttribute(ipp, "printer-state-reasons",
                                   IPP_TAG_KEYWORD)) == NULL)
     return (0);


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- cups.spec	2 Apr 2007 13:30:45 -0000	1.325
+++ cups.spec	3 Apr 2007 10:18:09 -0000	1.326
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -47,6 +47,7 @@
 Patch21: cups-driverd-timeout.patch
 Patch22: cups-logrotate.patch
 Patch23: cups-str2323.patch
+Patch24: cups-str2109.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -155,6 +156,7 @@
 %patch21 -p1 -b .driverd-timeout
 %patch22 -p1 -b .logrotate
 %patch23 -p1 -b .str2323
+%patch24 -p1 -b .str2109
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -438,6 +440,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Apr  3 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-3
+- Relay printer-state-message values in the IPP backend (STR #2109).
+
 * Mon Apr  2 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-2
 - Don't clear printer-state-reasons after job completion (STR #2323).
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 11:22:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 07:22:23 -0400
Subject: rpms/gimp-print/devel dead.package, NONE, 1.1 .cvsignore, 1.6,
	NONE Makefile, 1.1, NONE gimp-print-4.2.1-no-kitload.patch,
	1.1, NONE gimp-print-4.2.1-print.patch, 1.2,
	NONE gimp-print-4.2.6-gimp2.patch, 1.2,
	NONE gimp-print-4.2.6-mkinstalldirs.patch, 1.2,
	NONE gimp-print-C8x.patch, 1.1, NONE gimp-print-ipv6.patch,
	1.1, NONE gimp-print-menu.patch, 1.1,
	NONE gimp-print-multilib.patch, 1.1,
	NONE gimp-print-parse-lpstat.patch, 1.1,
	NONE gimp-print-plugindir.patch, 1.1,
	NONE gimp-print-ppds.patch, 1.1,
	NONE gimp-print-textdomain.patch, 1.1,
	NONE gimp-print-translate.patch, 1.1, NONE gimp-print.spec,
	1.47, NONE sources, 1.6, NONE
Message-ID: <200704031122.l33BMNPU028044@cvs.devel.redhat.com>

Author: twaugh

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

Added Files:
	dead.package 
Removed Files:
	.cvsignore Makefile gimp-print-4.2.1-no-kitload.patch 
	gimp-print-4.2.1-print.patch gimp-print-4.2.6-gimp2.patch 
	gimp-print-4.2.6-mkinstalldirs.patch gimp-print-C8x.patch 
	gimp-print-ipv6.patch gimp-print-menu.patch 
	gimp-print-multilib.patch gimp-print-parse-lpstat.patch 
	gimp-print-plugindir.patch gimp-print-ppds.patch 
	gimp-print-textdomain.patch gimp-print-translate.patch 
	gimp-print.spec sources 
Log Message:
gimp-print is replaced by gutenprint


--- NEW FILE dead.package ---


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- gimp-print-4.2.1-no-kitload.patch DELETED ---


--- gimp-print-4.2.1-print.patch DELETED ---


--- gimp-print-4.2.6-gimp2.patch DELETED ---


--- gimp-print-4.2.6-mkinstalldirs.patch DELETED ---


--- gimp-print-C8x.patch DELETED ---


--- gimp-print-ipv6.patch DELETED ---


--- gimp-print-menu.patch DELETED ---


--- gimp-print-multilib.patch DELETED ---


--- gimp-print-parse-lpstat.patch DELETED ---


--- gimp-print-plugindir.patch DELETED ---


--- gimp-print-ppds.patch DELETED ---


--- gimp-print-textdomain.patch DELETED ---


--- gimp-print-translate.patch DELETED ---


--- gimp-print.spec DELETED ---


--- sources DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr  3 11:29:00 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 07:29:00 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1149,1.1150
Message-ID: <200704031129.l33BT0Ge000673@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
bugger


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1149
retrieving revision 1.1150
diff -u -r1.1149 -r1.1150
--- openoffice.org.spec	3 Apr 2007 07:40:23 -0000	1.1149
+++ openoffice.org.spec	3 Apr 2007 11:28:57 -0000	1.1150
@@ -1,11 +1,11 @@
 %define oootag OOF680
 %define ooomilestone 14
-%define rh_rpm_release 2.4
+%define rh_rpm_release 3
 
 # gcc#19664#
 %define stlvisibilityfcked 1
 # undef to get english only and no-langpacks for a quick smoketest build
-%define langpacks 0
+%define langpacks 1
 # undef to revert to the traditional print dialog
 %define gtkprintui 1
 # undef to revert from combining startup libs into a single libsoffice 
@@ -25,8 +25,7 @@
 
 %define ooo_base_name %{oootag}_m%{ooomilestone}
 
-ExclusiveArch:  %{ix86}
-#ExclusiveArch:  ppc %{ix86} x86_64
+ExclusiveArch:  ppc %{ix86} x86_64
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
 Version:        2.2.0
@@ -135,7 +134,7 @@
 Patch74: openoffice.org-2.2.0.ooo53397.linkopt.patch
 %endif
 Patch75: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
-Patch76: openoffice.org-2.2.0.gprof.patch
+#Patch76: openoffice.org-2.2.0.gprof.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1061,7 +1060,7 @@
 %patch74 -p1 -b .ooo53397.linkopt.patch
 %endif
 %patch75 -p1 -b .ooo75790.sc.pa-IN.translate.patch
-%patch76 -p1 -b .gprof.patch
+#%patch76 -p1 -b .gprof.patch
 
 cp %{SOURCE1} extras/source/database/evolocal.odb
 
@@ -2635,11 +2634,11 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Tue Mar 27 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.2
+* Tue Mar 27 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.3
 - Resolves: rhbz#233944 openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
 - add aliases for the english autocorrect files
 - drop old themes to save space and need for translations of their names
-- combine more DSOs, the speed improvement is not measurably compelling but
+- combine more DSOs, the speed improvement is not immediately compelling but
   is at least startup time neutral and saves a meg in size for just 
   core + writer
   + http://people.redhat.com/caolanm/speed/CombinedDSO.ods



From fedora-cvs-commits at redhat.com  Tue Apr  3 11:35:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 07:35:23 -0400
Subject: rpms/system-config-bind/devel
	system-config-bind-4.0.2-DNSSECkey-record-column.patch, NONE,
	1.1 system-config-bind-4.0.2-rndc-label-correction.patch, NONE,
	1.1 system-config-bind.spec, 1.66, 1.67
Message-ID: <200704031135.l33BZNbg000375@cvs.devel.redhat.com>

Author: odvorace

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

Modified Files:
	system-config-bind.spec 
Added Files:
	system-config-bind-4.0.2-DNSSECkey-record-column.patch 
	system-config-bind-4.0.2-rndc-label-correction.patch 
Log Message:
some bugs fixed

system-config-bind-4.0.2-DNSSECkey-record-column.patch:
 RR.py       |   12 ++++++------
 ZoneTree.py |   16 ++++++++++++++--
 2 files changed, 20 insertions(+), 8 deletions(-)

--- NEW FILE system-config-bind-4.0.2-DNSSECkey-record-column.patch ---
--- system-config-bind-4.0.2/RR.py.old	2005-08-09 20:09:57.000000000 +0200
+++ system-config-bind-4.0.2/RR.py	2007-02-07 19:27:21.000000000 +0100
@@ -201,13 +204,13 @@
             if self.desc.has_key(key):
                 val=getattr(self,key)
                 t=type(val)
-                if ( t == str) or (t == int):                    
-                    yield[ self.desc[key], val ]
+                if ( t == str) or (t == int):                   
+                    yield[ self.desc[key], val, 0]
                 else:
                     v=''
                     if val.__class__ == DNS.Name:
                         v = str(val)
-                        yield[ self.desc[key], v ]
+                        yield[ self.desc[key], v, 0 ]
                     else:
                         if type(self.desc[key]) == list:
                         # handle records with variable length attr lists:
@@ -230,14 +233,14 @@
                                         elif hasattr(v,'value'):
                                             v = v.value
                                     if( v != None ):
-                                        yield( desc, v )
+                                        yield( desc, v, 0 )
                         else:
                             if( hasattr(val,'label')):
                                 v = val.label()
                             else:
                                 v = str(val)
-                            yield[ self.desc[key], v ]
-        yield [ _('Cache Time To Live'), self.TTL().label()]
+                            yield[ self.desc[key], v, val.__class__ == DNS.Base64 ]
+        yield [ _('Cache Time To Live'), self.TTL().label(), 0]
          
     def max_value_label(self):
         m=0
--- system-config-bind-4.0.2/ZoneTree.py.old	2005-09-23 19:39:51.000000000 +0200
+++ system-config-bind-4.0.2/ZoneTree.py	2007-02-07 19:14:23.000000000 +0100
@@ -1269,8 +1269,20 @@
             data="<b>"+str(r.Name())+"</b>\n"
         jlen=r.max_value_label() + 2
         jfmt='%-'+str(jlen)+'s'
-        for name, val in r.value_labels():            
-            data+=(jfmt % name)+": "+str(val)+"\n"
+	max_record_lenght = 30
+        for name, val, wrap in r.value_labels():
+            value_str = ''
+            if wrap:
+            	input_str = str(val)
+	        start = 0
+            	while start < len(input_str):
+                  	if start == 0:
+                  		data+=(jfmt % name)+": "+input_str[start:start+max_record_lenght]+'\n'
+                  	else:
+                  		data+=string.expandtabs('\t',jlen+2)+input_str[start:start+max_record_lenght]+'\n'
+                  	start = start + max_record_lenght
+	    else:
+            	data+=(jfmt % name)+": "+str(val)+"\n"
         node=''
         if len( rname ) and ( rname != z['zone'].zone_origin ):            
             if z['names'].has_key(rname):

system-config-bind-4.0.2-rndc-label-correction.patch:
 RRGUI.py    |   14 ++++++++------
 ZoneTree.py |    8 +++++---
 2 files changed, 13 insertions(+), 9 deletions(-)

--- NEW FILE system-config-bind-4.0.2-rndc-label-correction.patch ---
--- system-config-bind-4.0.2/RRGUI.py.old	2006-03-14 21:30:48.000000000 +0100
+++ system-config-bind-4.0.2/RRGUI.py	2007-02-12 14:02:17.000000000 +0100
@@ -18,6 +18,8 @@
 import RR
 import DNS
 
+RDNC_KEY_NAME=_('Remote Nameserver Control Security Key')
+
 class Widget:
     def __init__(s, d, r, a, k):
         s.dialog = d
@@ -2225,17 +2227,17 @@
             if (s.attr.name == None) or (len(s.attr.name)==0):
                 name = s.entry.get_text()
                 if len(name) <= 0:
-                    s.bind.gui.modalError(s.bind.gui.gui,_('DNS Security Key Name Error'),
-                                          _('A non-empty DNS Security Key Name is required.')
+                    s.bind.gui.modalError(s.bind.gui.gui,_('Remote Nameserver Control Security Key Name Error'),
+                                          _('A non-empty Security Key Name is required.')
                                          )
                     return False
                 if s.bind.nmdc.__contains__(s.attr.key + [ name ]):
-                    s.bind.gui.modalError(s.bind.gui.gui,_('DNS Security Key Name Error'),
+                    s.bind.gui.modalError(s.bind.gui.gui,_('Remote Nameserver Control Security Key Name Error'),
                                           _('Key "%s" already exists.') % name
                                          )
                     return False
                 if s.bind.acls.has_key(name) or (name.lower() in ['none','any','localhost','localnets']) :
-                    s.bind.gui.modalError(s.bind.gui.gui,_('DNS Security Key Name Error'),
+                    s.bind.gui.modalError(s.bind.gui.gui,_('Remote Nameserver Control Security Key Name Error'),
                                           _('Name "%s" is an Access Control List name.') % name
                                          )
                     return False
@@ -2258,9 +2260,9 @@
     def keyDialog(s):
         t=''
         if (s.attr.name == None) or (len(s.attr.name)==0):
-            t = _('New DNS Security Key')
+            t = _('New Remote Nameserver Control Security Key')
         else:
-            t = _('DNS Security Key')+' '+s.attr.name
+            t = RDNC_KEY_NAME+' '+s.attr.name
         s.editDialog = gtk.Dialog(parent=s.gui.gui, title=t,
                                   buttons=
                                   (gtk.STOCK_OK,     gtk.RESPONSE_OK,
--- system-config-bind-4.0.2/ZoneTree.py.old	2005-09-23 19:39:51.000000000 +0200
+++ system-config-bind-4.0.2/ZoneTree.py	2007-02-12 14:02:39.000000000 +0100
@@ -28,6 +28,8 @@
 INFO_COLUMN=2
 RECORD_COLUMN=3
 
+RDNC_KEY_NAME=_('Remote Nameserver Control Security Key')
+
 class ZoneNode:
     def __init__(s, z):
         s.z=z
@@ -263,7 +265,7 @@
             show_names = True
         elif((selection.__class__ == DNS.ACL) or (selection.__class__==DNS.Key)):
             choices=[['acl',_('Access Control List Filter'),DNS.ACL],
-                     ['key',_('DNS Security Key'),DNS.Key]
+                     ['key', RDNC_KEY_NAME, DNS.Key]
                     ]
         for choice in choices:
             if show_names :
@@ -1077,7 +1079,7 @@
         for acl in s.bind.acls.keys():
             s.store.append(None,[s.acl_pic, acl, _('Access Control List Filter'), s.bind.acls[acl] ])
         for key in s.bind.keys.keys():
-            s.store.append(None,[s.key_pic, key, _('DNS Security Key'), s.bind.keys[key] ])
+            s.store.append(None,[s.key_pic, key, RDNC_KEY_NAME, s.bind.keys[key] ])
         for svr in s.bind.servers.keys():
             s.store.append(None,[s.server_pic, svr, _('DNS Server') + ' ' + svr, s.bind.servers[svr]])
         if not s.bind.isViewed :                            
@@ -1092,7 +1094,7 @@
                 s.store.append( s.bind.views[key]['node'], [s.acl_pic, _('From: Filter'), _('Access Control List Filter'), view.inputFilter ] )
                 s.store.append( s.bind.views[key]['node'], [s.acl_pic, _('To: Filter'), _('Access Control List Filter'), view.outputFilter ] )                
                 for k in s.bind.views[key]['keys'].keys():
-                    s.store.append(s.bind.views[key]['node'],[s.key_pic, k, _('DNS Security Key'), s.bind.views[key]['keys'][k] ])
+                    s.store.append(s.bind.views[key]['node'],[s.key_pic, k, RDNC_KEY_NAME, s.bind.views[key]['keys'][k] ])
                 for svr in s.bind.views[key]['servers'].keys():
                     s.store.append(s.bind.views[key]['node'],[s.server_pic, svr, _('DNS Server') + ' ' + svr, s.bind.views[key]['servers'][svr]])
             for key in s.bind.views.keys():



Index: system-config-bind.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/devel/system-config-bind.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- system-config-bind.spec	3 Apr 2007 09:59:02 -0000	1.66
+++ system-config-bind.spec	3 Apr 2007 11:35:21 -0000	1.67
@@ -1,7 +1,7 @@
 Summary: 	The Red Hat BIND DNS Configuration Tool.
 Name: 		system-config-bind
 Version: 	4.0.2
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 License: 	GPL
 Group: 		Applications/System
 URL: 		http://people.redhat.com/~jvdias/system-config-bind
@@ -11,6 +11,8 @@
 Patch2:		system-config-bind-4.0.2-check-child.patch
 Patch3:		system-config-bind-4.0.2-SSHFPrecord.patch
 Patch4:		system-config-bind-4.0.2-correct-typos.patch
+Patch5:		system-config-bind-4.0.2-rndc-label-correction.patch
+Patch6:		system-config-bind-4.0.2-DNSSECkey-record-column.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: 	noarch
 BuildRequires:  python, gettext, make, intltool
@@ -37,6 +39,8 @@
 %patch2 -p1
 %patch3 -p1 -b .sshfprecord
 %patch4	-p1 -b .correct-typos
+%patch5 -p1
+%patch6 -p1
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -103,6 +107,12 @@
 fi
 
 %changelog
+* Tue Apr 3 2007 Ondrej Dvoracek <odvorace at redhat.com> - 4.0.2-6
+- Corrected rndc key labels
+- Resolves #219795
+- Corrected DNSSEC key record column
+- Resolves #219798
+
 * Tue Apr 3 2007 Ondrej Dvoracek <odvorace at redhat.com> - 4.0.2-5
 - Added SSHFP Resource record
 - Resolves #205689



From fedora-cvs-commits at redhat.com  Tue Apr  3 12:11:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 08:11:01 -0400
Subject: rpms/gdbm/devel gdbm.spec,1.20,1.21
Message-ID: <200704031211.l33CB1rU001387@cvs.devel.redhat.com>

Author: odvorace

Update of /cvs/dist/rpms/gdbm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1373

Modified Files:
	gdbm.spec 
Log Message:
spec correction


Index: gdbm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdbm/devel/gdbm.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gdbm.spec	12 Jul 2006 05:53:58 -0000	1.20
+++ gdbm.spec	3 Apr 2007 12:10:59 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: A GNU set of database routines which use extensible hashing.
 Name: gdbm
 Version: 1.8.0
-Release: 26.2.1
+Release: 27%{?dist}
 Source: ftp://ftp.gnu.org/gnu/gdbm-%{version}.tar.gz
 Patch0: gdbm-1.8.0-jbj.patch
 Patch1: gdbm-1.8.0-fhs.patch
@@ -72,11 +72,11 @@
 %postun -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info %{_infodir}/gdbm.info.gz %{_infodir}/dir --entry="* gdbm: (gdbm).                   The GNU Database."
+/sbin/install-info %{_infodir}/gdbm.info.gz %{_infodir}/dir --entry="* gdbm: (gdbm).                   The GNU Database." || :
 
 %preun devel
 if [ $1 = 0 ]; then
-   /sbin/install-info --delete %{_infodir}/gdbm.info.gz %{_infodir}/dir --entry="* gdbm: (gdbm).                   The GNU Database."
+   /sbin/install-info --delete %{_infodir}/gdbm.info.gz %{_infodir}/dir --entry="* gdbm: (gdbm).                   The GNU Database." || :
 fi
 
 %files
@@ -97,6 +97,9 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Tue Apr 3 2007 Ondrej Dvoracek <odvorace at redhat.com> - 1.8.0-27
+- made install-info use in scriptlets safe (#223688)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.8.0-26.2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 12:50:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 08:50:30 -0400
Subject: rpms/hplip/FC-6 hplip-libsane.patch, NONE, 1.1 hplip.spec, 1.101,
	1.102
Message-ID: <200704031250.l33CoUAV028961@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Added Files:
	hplip-libsane.patch 
Log Message:
* Tue Apr  3 2007 Tim Waugh <twaugh at redhat.com>
- Link libsane-hpaio against libsane (bug #234813).
- Resolves: rhbz#234813


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

--- NEW FILE hplip-libsane.patch ---
--- hplip-1.6.12/Makefile.in.libsane	2007-04-03 13:06:23.000000000 +0100
+++ hplip-1.6.12/Makefile.in	2007-04-03 13:07:49.000000000 +0100
@@ -539,7 +539,7 @@
 #      scan/sane/dime.c scan/sane/dime.h scan/sane/webScanStub.h scan/sane/webScanH.h scan/sane/stdsoap2.h scan/sane/webScan.nsmap
 @SCAN_BUILD_TRUE at libsane_hpaio_la_LDFLAGS = -version-info $(MAJORVER):$(MINORVER):$(AGEVER) 
 # The following is a interlibrary dependency that must be compiled first.
- at SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la
+ at SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la -lsane
 @SCAN_BUILD_TRUE at libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
 
 # api library
--- hplip-1.6.12/Makefile.am.libsane	2007-04-03 13:06:15.000000000 +0100
+++ hplip-1.6.12/Makefile.am	2007-04-03 13:07:36.000000000 +0100
@@ -184,7 +184,7 @@
 #      scan/sane/dime.c scan/sane/dime.h scan/sane/webScanStub.h scan/sane/webScanH.h scan/sane/stdsoap2.h scan/sane/webScan.nsmap
 libsane_hpaio_la_LDFLAGS = -version-info $(MAJORVER):$(MINORVER):$(AGEVER) 
 # The following is a interlibrary dependency that must be compiled first.
-libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la
+libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la -lsane
 libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
 
 endif


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-6/hplip.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- hplip.spec	10 Jan 2007 17:14:29 -0000	1.101
+++ hplip.spec	3 Apr 2007 12:50:28 -0000	1.102
@@ -18,6 +18,7 @@
 Patch3: hplip-cups-backend.patch
 Patch4: hplip-libm.patch
 Patch5: hplip-ipv6.patch
+Patch6: hplip-libsane.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -33,6 +34,7 @@
 BuildRequires: desktop-file-utils
 BuildRequires: libusb-devel
 BuildRequires: autoconf
+BuildRequires: sane-backends-devel
 
 %description
 The Hewlett-Packard Linux Imaging and Printing Project provides
@@ -80,6 +82,9 @@
 # IPv6 support (bug #198377).
 %patch5 -p1 -b .ipv6
 
+# Link libsane-hpaio against libsane (bug #234813).
+%patch6 -p1 -b .libsane
+
 autoconf # for patch4
 
 %build
@@ -180,6 +185,9 @@
 exit 0
 
 %changelog
+* Tue Apr  3 2007 Tim Waugh <twaugh at redhat.com>
+- Link libsane-hpaio against libsane (bug #234813).
+
 * Wed Dec  6 2006 Tim Waugh <twaugh at redhat.com> 1.6.12-1
 - 1.6.12.  No longer need broken-conf, loop, out-of-paper, guest or
   sane-debug patches.



From fedora-cvs-commits at redhat.com  Tue Apr  3 12:53:44 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 08:53:44 -0400
Subject: rpms/hplip/devel hplip-libsane.patch, NONE, 1.1 hplip.spec, 1.107,
	1.108
Message-ID: <200704031253.l33Crin9031443@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Added Files:
	hplip-libsane.patch 
Log Message:
* Tue Apr  3 2007 Tim Waugh <twaugh at redhat.com>
- Link libsane-hpaio against libsane (bug #234813).
- Resolves: rhbz#234813


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

--- NEW FILE hplip-libsane.patch ---
--- hplip-1.7.2/Makefile.in.libsane	2007-04-03 13:52:04.000000000 +0100
+++ hplip-1.7.2/Makefile.in	2007-04-03 13:53:17.000000000 +0100
@@ -579,7 +579,7 @@
 #      scan/sane/dime.c scan/sane/dime.h scan/sane/webScanStub.h scan/sane/webScanH.h scan/sane/stdsoap2.h scan/sane/webScan.nsmap
 @SCAN_BUILD_TRUE at libsane_hpaio_la_LDFLAGS = -version-info $(MAJORVER):$(MINORVER):$(AGEVER) 
 # The following is a interlibrary dependency that must be compiled first.
- at SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la
+ at SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la -lsane
 #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
 @SCAN_BUILD_TRUE at libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DWITH_LEAN
 
--- hplip-1.7.2/Makefile.am.libsane	2007-04-03 13:52:04.000000000 +0100
+++ hplip-1.7.2/Makefile.am	2007-04-03 13:52:40.000000000 +0100
@@ -192,7 +192,7 @@
 #      scan/sane/dime.c scan/sane/dime.h scan/sane/webScanStub.h scan/sane/webScanH.h scan/sane/stdsoap2.h scan/sane/webScan.nsmap
 libsane_hpaio_la_LDFLAGS = -version-info $(MAJORVER):$(MINORVER):$(AGEVER) 
 # The following is a interlibrary dependency that must be compiled first.
-libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la
+libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la -lsane
 #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
 libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DWITH_LEAN
 


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- hplip.spec	2 Apr 2007 14:18:16 -0000	1.107
+++ hplip.spec	3 Apr 2007 12:53:42 -0000	1.108
@@ -20,6 +20,7 @@
 Patch5: hplip-libm.patch
 Patch6: hplip-ipv6.patch
 Patch7: hplip-marker-supply.patch
+Patch8: hplip-libsane.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -85,6 +86,9 @@
 # Use marker-supply-low IPP message.
 %patch7 -p1 -b .marker-supply
 
+# Link libsane-hpaio against libsane (bug #234813).
+%patch8 -p1 -b .libsane
+
 autoconf # for patch4
 
 %build
@@ -185,6 +189,9 @@
 exit 0
 
 %changelog
+* Tue Apr  3 2007 Tim Waugh <twaugh at redhat.com>
+- Link libsane-hpaio against libsane (bug #234813).
+
 * Fri Mar 30 2007 Tim Waugh <twaugh at redhat.com>
 - Use marker-supply-low IPP message.
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 13:14:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 09:14:18 -0400
Subject: rpms/gcc/devel gcc41-pr31187.patch, NONE, 1.1 gcc41-rh231818.patch,
	NONE, 1.1 gcc41-rh234515.patch, NONE, 1.1 .cvsignore, 1.202,
	1.203 gcc41-java-bogus-debugline.patch, 1.1,
	1.2 gcc41-libjava-visibility.patch, 1.1, 1.2 gcc41.spec, 1.155,
	1.156 sources, 1.204, 1.205 gcc41-libffi-selinux.patch, 1.3,
	NONE gcc41-pr27351.patch, 1.1, NONE gcc41-pr30001.patch, 1.2,
	NONE gcc41-pr30045.patch, 1.1, NONE gcc41-pr30113.patch, 1.1,
	NONE gcc41-pr30847.patch, 1.1, NONE gcc41-pr30863.patch, 1.1,
	NONE gcc41-rh227376.patch, 1.1, NONE gcc41-rh228769.patch, 1.1, NONE
Message-ID: <200704031314.l33DEIdY015292@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	.cvsignore gcc41-java-bogus-debugline.patch 
	gcc41-libjava-visibility.patch gcc41.spec sources 
Added Files:
	gcc41-pr31187.patch gcc41-rh231818.patch gcc41-rh234515.patch 
Removed Files:
	gcc41-libffi-selinux.patch gcc41-pr27351.patch 
	gcc41-pr30001.patch gcc41-pr30045.patch gcc41-pr30113.patch 
	gcc41-pr30847.patch gcc41-pr30863.patch gcc41-rh227376.patch 
	gcc41-rh228769.patch 
Log Message:
4.1.2-8

gcc41-pr31187.patch:
 0 files changed

--- NEW FILE gcc41-pr31187.patch ---
2007-03-30  Jason Merrill  <jason at redhat.com>

	PR c++/31187
	* typeck.c (cp_type_readonly): New fn.
	* cp-tree.h: Declare it.
	* decl.c (start_decl): Set implicit DECL_THIS_STATIC here.
	(cp_finish_decl): Not here.

2007-04-02  Jason Merrill  <jason at redhat.com>

	PR c++/31187
	* g++.dg/ext/visibility/anon3.C: New test.

--- gcc/cp/typeck.c	(revision 123431)
+++ gcc/cp/typeck.c	(revision 123432)
@@ -6897,6 +6897,16 @@ cp_type_quals (tree type)
   return TYPE_QUALS (type);
 }
 
+/* Returns nonzero if the TYPE is const from a C++ perspective: look inside
+   arrays.  */
+
+bool
+cp_type_readonly (tree type)
+{
+  type = strip_array_types (type);
+  return TYPE_READONLY (type);
+}
+
 /* Returns nonzero if the TYPE contains a mutable member.  */
 
 bool
--- gcc/cp/decl.c	(revision 123431)
+++ gcc/cp/decl.c	(revision 123432)
@@ -3797,6 +3797,7 @@ start_decl (const cp_declarator *declara
   tree decl;
   tree type, tem;
   tree context;
+  bool was_public;
 
   *pushed_scope_p = NULL_TREE;
 
@@ -3951,6 +3952,8 @@ start_decl (const cp_declarator *declara
 		 decl);
     }
 
+  was_public = TREE_PUBLIC (decl);
+
   /* Enter this declaration into the symbol table.  */
   tem = maybe_push_decl (decl);
 
@@ -3971,6 +3974,17 @@ start_decl (const cp_declarator *declara
       && !have_global_bss_p ())
     DECL_COMMON (tem) = 1;
 
+  if (TREE_CODE (tem) == VAR_DECL
+      && DECL_NAMESPACE_SCOPE_P (tem) && !TREE_PUBLIC (tem) && !was_public
+      && !DECL_THIS_STATIC (tem) && !DECL_ARTIFICIAL (tem))
+    {
+      /* This is a const variable with implicit 'static'.  Set
+	 DECL_THIS_STATIC so we can tell it from variables that are
+	 !TREE_PUBLIC because of the anonymous namespace.  */
+      gcc_assert (cp_type_readonly (TREE_TYPE (tem)));
+      DECL_THIS_STATIC (tem) = 1;
+    }
+
   if (!processing_template_decl && TREE_CODE (tem) == VAR_DECL)
     start_decl_1 (tem, initialized);
 
@@ -5283,14 +5297,6 @@ cp_finish_decl (tree decl, tree init, bo
 	{
 	  layout_var_decl (decl);
 	  maybe_commonize_var (decl);
-	  if (DECL_NAMESPACE_SCOPE_P (decl) && !TREE_PUBLIC (decl)
-	      && !DECL_THIS_STATIC (decl) && !DECL_ARTIFICIAL (decl))
-	    {
-	      /* This is a const variable with implicit 'static'.  Set
-		 DECL_THIS_STATIC so we can tell it from variables that are
-		 !TREE_PUBLIC because of the anonymous namespace.  */
-	      DECL_THIS_STATIC (decl) = 1;
-	    }
 	}
 
       make_rtl_for_nonlocal_decl (decl, init, asmspec);
--- gcc/cp/cp-tree.h	(revision 123431)
+++ gcc/cp/cp-tree.h	(revision 123432)
@@ -4742,6 +4742,7 @@ extern bool comp_ptr_ttypes_const		(tree
 extern int ptr_reasonably_similar		(tree, tree);
 extern tree build_ptrmemfunc			(tree, tree, int, bool);
 extern int cp_type_quals			(tree);
+extern bool cp_type_readonly			(tree);
 extern bool cp_has_mutable_p			(tree);
 extern bool at_least_as_qualified_p		(tree, tree);
 extern void cp_apply_type_quals_to_decl		(int, tree);
--- gcc/testsuite/g++.dg/ext/visibility/anon3.C	(revision 0)
+++ gcc/testsuite/g++.dg/ext/visibility/anon3.C	(revision 123432)
@@ -0,0 +1,16 @@
+// PR c++/31187
+// Bug: the repeated declaration was confusing the compiler into
+// thinking that foo1 had language internal linkage.
+
+class foo { };
+
+namespace
+{
+  extern foo foo1;
+  foo foo1;
+}
+
+template< foo * >
+class bar { };
+
+bar< &foo1 > bar1;

gcc41-rh231818.patch:
 gnu/java/awt/peer/gtk/CairoGraphics2D.java                      |    5 
 gnu/java/awt/peer/gtk/ComponentGraphics.java                    |   12 
 gnu/java/awt/peer/gtk/FreetypeGlyphVector.java                  |   80 +++++
 include/gnu_java_awt_peer_gtk_CairoGraphics2D.h                 |    2 
 include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h             |   10 
 native/jni/gtk-peer/gdkfont.h                                   |    2 
 native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c     |   31 +-
 native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c |  135 ++++++++--
 native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c         |    8 
 9 files changed, 232 insertions(+), 53 deletions(-)

--- NEW FILE gcc41-rh231818.patch ---
2007-04-02  Francis Kung  <fkung at redhat.com>

	* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
	(fontSet): Initialize to null.
	(FreetypeGlyphVector(Font, int[], FontRenderContext)): Populate fontSet
	array with default font if needed.
	(FreetypeGlyphVector(FreetypeGlyphVector)): Clone all fields.
	(getNativeFontPointer): New native method.
	* include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h: Regenerated.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
	(Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getNativeFontPointer):
	New function.

2007-04-02  Francis Kung  <fkung at redhat.com>

	* gnu/java/awt/peer/gtk/CairoGraphics2D.java
	(cairoDrawGlyphVector): Added parameter.
	(drawGlyphVector): Retrieve and pass fontset parameter.
	* gnu/java/awt/peer/gtk/ComponentGraphics.java
	(cairoDrawGlyphVector): Added parameter.
	(lock): Removed unnecessary cast.
	(unlock): Removed unnecessary cast and explicitly set to ONE variable.
	* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
	(fontSet): New field.
	(dispose): New native method.
	(finalize): New method.
	(getGlyphFonts): New method.
	(getGlyphOutline): Pass fontSet parameter to native method.
	(getGlyphOutlineNative): Added parameter.
	(getGlyphs): Pass extra parameters to native method.
	(getGlyphsNative): Added parameters.
	(getKerning): Added fontSet parameter.
	(getMetricsNative): Added fontSet parameter.
	(performDefaultLayout): Only check kerning if glyphs use the same font.
	(setupGlyphMetrics): Pass extra parameters to native methods.
	* include/gnu_java_awt_peer_gtk_CairoGraphics2D.h,
	* include/gnu_java_awt_peer_gtk_FreetypGlyphVector.h: Regenerated.
	* native/jni/gtk-peer/gdkfont.h: Enable pango engine.
	(peerfont): Add variable for fontset.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
	(Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector): Accept
	array of font pointers to use when drawing glyphs.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
	(getFontSet): New function.
	(Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_dispose): New function.
	(Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyphOutlineNative):
	Added and use new fontSet parameter.
	(Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyphs): Use pango
	to retrieve glyphs and estimate font, if the current font does not contain
	a requested glyph.
	(Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getKerning): Added and use
	new fontSet parameter.
	(Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getMetricsNative): Added
	and use new fontSet parameter.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
	(Java_gnu_java_awt_peer_gtk_GdkFontPeer_dispose): Free fontset.
	(Java_gnu_java_awt_peer_gtk_GdkFontPeer_setFont): Load fontset.

--- libjava/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java	16 Mar 2007 15:14:53 -0000	1.67
+++ libjava/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java	2 Apr 2007 19:39:26 -0000	1.68
@@ -402,7 +402,7 @@ public abstract class CairoGraphics2D ex
    */
   protected native void cairoDrawGlyphVector(long pointer, GdkFontPeer font, 
                                    float x, float y, int n, 
-                                   int[] codes, float[] positions);
+                                   int[] codes, float[] positions, long[] fontset);
 
   /**
    * Set the font in cairo.
@@ -1730,6 +1730,7 @@ public abstract class CairoGraphics2D ex
       {
         int n = gv.getNumGlyphs ();
         int[] codes = gv.getGlyphCodes (0, n, null);
+        long[] fontset = ((FreetypeGlyphVector)gv).getGlyphFonts (0, n, null);
         float[] positions = gv.getGlyphPositions (0, n, null);
 
         setFont (gv.getFont ());
@@ -1737,7 +1738,7 @@ public abstract class CairoGraphics2D ex
         synchronized (fontPeer) 
           { 
             cairoDrawGlyphVector(nativePointer, fontPeer,
-                                 x, y, n, codes, positions);
+                                 x, y, n, codes, positions, fontset);
           }
       }
     else
--- libjava/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java	16 Mar 2007 15:14:53 -0000	1.25
+++ libjava/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java	2 Apr 2007 19:39:26 -0000	1.26
@@ -121,7 +121,7 @@ public class ComponentGraphics extends C
    */
   private void lock()
   {
-    Integer i = (Integer) hasLock.get();
+    Integer i = hasLock.get();
     if (i == null)
       {
         start_gdk_drawing();
@@ -136,7 +136,7 @@ public class ComponentGraphics extends C
    */
   private void unlock()
   {
-    Integer i = (Integer) hasLock.get();
+    Integer i = hasLock.get();
     if (i == null)
       throw new IllegalStateException();
     if (i == ONE)
@@ -144,6 +144,8 @@ public class ComponentGraphics extends C
         hasLock.set(null);
         end_gdk_drawing();
       }
+    else if (i.intValue() == 2)
+      hasLock.set(ONE);
     else
       hasLock.set(Integer.valueOf(i.intValue() - 1));
   }
@@ -744,12 +746,14 @@ public class ComponentGraphics extends C
   @Override
   protected void cairoDrawGlyphVector(long pointer, GdkFontPeer font,
                                       float x, float y, int n,
-                                      int[] codes, float[] positions)
+                                      int[] codes, float[] positions,
+                                      long[] fontset)
   {
     try
     {
       lock();
-      super.cairoDrawGlyphVector(pointer, font, x, y, n, codes, positions);
+      super.cairoDrawGlyphVector(pointer, font, x, y, n, codes, positions,
+                                 fontset);
     }
     finally
     {
--- libjava/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java	6 Mar 2007 19:38:31 -0000	1.16
+++ libjava/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java	2 Apr 2007 21:28:58 -0000	1.18
@@ -79,6 +79,11 @@ public class FreetypeGlyphVector extends
    * The glyph codes
    */
   private int[] glyphCodes;
+  
+  /**
+   * The set of fonts used in this glyph vector.
+   */
+  private long[] fontSet = null;
 
   /**
    * Glyph transforms. (de facto only the translation is used)
@@ -86,6 +91,19 @@ public class FreetypeGlyphVector extends
   private AffineTransform[] glyphTransforms;
 
   private GlyphMetrics[] metricsCache;
+  
+  private native void dispose(long[] fonts);
+  
+  /**
+   * Returns a pointer to the native PangoFcFont object.
+   * 
+   * The object will be referenced with g_object_ref n times before being
+   * returned, and must be unreferenced a corresponding number of times.
+   * 
+   * @param n Number of times to reference the object.
+   * @return Pointer to the native default font.
+   */
+  private native long getNativeFontPointer(int n);
 
   /**
    * Create a glyphvector from a given (Freetype) font and a String.
@@ -135,6 +153,13 @@ public class FreetypeGlyphVector extends
     glyphCodes = new int[ codes.length ];
     System.arraycopy(codes, 0, glyphCodes, 0, codes.length);
     nGlyphs = glyphCodes.length;
+    
+    if (fontSet == null)
+      {
+        fontSet = new long[nGlyphs];
+        Arrays.fill(fontSet, getNativeFontPointer(nGlyphs));
+      }
+    
     performDefaultLayout();
   }
 
@@ -157,6 +182,7 @@ public class FreetypeGlyphVector extends
       }
 
     glyphCodes = new int[ nGlyphs ];
+    fontSet = new long[nGlyphs];
     glyphPositions = new float[(nGlyphs + 1) * 2];
     glyphTransforms = new AffineTransform[ nGlyphs ];
     for(int i = 0; i < nGlyphs; i++ )
@@ -166,6 +192,13 @@ public class FreetypeGlyphVector extends
       }
     System.arraycopy(gv.glyphPositions, 0, glyphPositions, 0,
                      glyphPositions.length);
+    System.arraycopy(gv.glyphCodes, 0, glyphCodes, 0, nGlyphs);
+    System.arraycopy(gv.fontSet, 0, fontSet, 0, nGlyphs);
+  }
+  
+  public void finalize()
+  {
+    dispose(fontSet);
   }
 
   /**
@@ -175,6 +208,7 @@ public class FreetypeGlyphVector extends
   {
     nGlyphs = s.codePointCount( 0, s.length() );
     glyphCodes = new int[ nGlyphs ];
+    fontSet = new long[ nGlyphs ];
     int[] codePoints = new int[ nGlyphs ];
     int stringIndex = 0;
 
@@ -194,22 +228,22 @@ public class FreetypeGlyphVector extends
           }
       }
 
-   glyphCodes = getGlyphs( codePoints );
+    getGlyphs( codePoints, glyphCodes, fontSet );
   }
 
   /**
    * Returns the glyph code within the font for a given character
    */
-  public native int[] getGlyphs(int[] codepoints);
+  public native int[] getGlyphs(int[] codepoints, int[] glyphs, long[] fonts);
 
   /**
    * Returns the kerning of a glyph pair
    */
-  private native Point2D getKerning(int leftGlyph, int rightGlyph);
+  private native Point2D getKerning(int leftGlyph, int rightGlyph, long font);
 
-  private native double[] getMetricsNative( int glyphCode );
+  private native double[] getMetricsNative(int glyphCode, long font);
 
-  private native GeneralPath getGlyphOutlineNative(int glyphIndex);
+  private native GeneralPath getGlyphOutlineNative(int glyphIndex, long font);
 
 
   public Object clone()
@@ -267,10 +301,12 @@ public class FreetypeGlyphVector extends
 
         x += gm.getAdvanceX();
         y += gm.getAdvanceY();
-        
-        if (i != nGlyphs-1)
+
+        // Get the kerning only if it's not the last glyph, and the two glyphs are
+        // using the same font
+        if (i != nGlyphs-1 && fontSet[i] == fontSet[i+1])
           {
-            Point2D p = getKerning(glyphCodes[i], glyphCodes[i + 1]);
+            Point2D p = getKerning(glyphCodes[i], glyphCodes[i + 1], fontSet[i]);
             x += p.getX();
             y += p.getY();
           }
@@ -305,6 +341,26 @@ public class FreetypeGlyphVector extends
     return rval;
   }
 
+  /**
+   * Returns pointers to the fonts used in this glyph vector.
+   * 
+   * The array index matches that of the glyph vector itself.
+   */
+  protected long[] getGlyphFonts(int beginGlyphIndex, int numEntries, 
+                                 long[] codeReturn)
+  {
+    long[] rval;
+
+    if( codeReturn == null || codeReturn.length < numEntries)
+      rval = new long[ numEntries ];
+    else
+      rval = codeReturn;
+    
+    System.arraycopy(fontSet, beginGlyphIndex, rval, 0, numEntries);
+
+    return rval;
+  }
+
   public Shape getGlyphLogicalBounds(int glyphIndex)
   {
     GlyphMetrics gm = getGlyphMetrics( glyphIndex );
@@ -335,11 +391,10 @@ public class FreetypeGlyphVector extends
 
     for(int i = 0; i < nGlyphs; i++)
       {
-        GlyphMetrics gm = (GlyphMetrics)
-        peer.getGlyphMetrics( glyphCodes[ i ] );
+        GlyphMetrics gm = (GlyphMetrics)peer.getGlyphMetrics(glyphCodes[i]);
         if( gm == null )
           {
-            double[] val = getMetricsNative( glyphCodes[ i ] );
+            double[] val = getMetricsNative(glyphCodes[i], fontSet[i]);
             if( val == null )
               gm = null;
             else
@@ -376,7 +431,8 @@ public class FreetypeGlyphVector extends
    */
   public Shape getGlyphOutline(int glyphIndex)
   {
-    GeneralPath gp = getGlyphOutlineNative( glyphCodes[ glyphIndex ] );
+    GeneralPath gp = getGlyphOutlineNative(glyphCodes[glyphIndex],
+                                           fontSet[glyphIndex]);
     
     AffineTransform tx = AffineTransform.getTranslateInstance(glyphPositions[glyphIndex*2],
                                                               glyphPositions[glyphIndex*2+1]);
--- libjava/classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h	16 Mar 2007 15:14:53 -0000	1.17
+++ libjava/classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h	2 Apr 2007 19:39:26 -0000	1.18
@@ -22,7 +22,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetFillRule (JNIEnv *env, jobject, jlong, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetLine (JNIEnv *env, jobject, jlong, jdouble, jint, jint, jdouble);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetDash (JNIEnv *env, jobject, jlong, jdoubleArray, jint, jdouble);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector (JNIEnv *env, jobject, jlong, jobject, jfloat, jfloat, jint, jintArray, jfloatArray);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector (JNIEnv *env, jobject, jlong, jobject, jfloat, jfloat, jint, jintArray, jfloatArray, jlongArray);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetFont (JNIEnv *env, jobject, jlong, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRectangle (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoArc (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jdouble);
--- libjava/classpath/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h	11 Jun 2006 08:29:57 -0000	1.2
+++ libjava/classpath/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h	2 Apr 2007 21:28:58 -0000	1.4
@@ -10,10 +10,12 @@ extern "C"
 {
 #endif
 
-JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyphs (JNIEnv *env, jobject, jintArray);
-JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getKerning (JNIEnv *env, jobject, jint, jint);
-JNIEXPORT jdoubleArray JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getMetricsNative (JNIEnv *env, jobject, jint);
-JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyphOutlineNative (JNIEnv *env, jobject, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyphs (JNIEnv *env, jobject, jintArray, jintArray, jlongArray);
+JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getKerning (JNIEnv *env, jobject, jint, jint, jlong);
+JNIEXPORT jdoubleArray JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getMetricsNative (JNIEnv *env, jobject, jint, jlong);
+JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyphOutlineNative (JNIEnv *env, jobject, jint, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_dispose (JNIEnv *env, jobject, jlongArray);
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getNativeFontPointer (JNIEnv *env, jobject, jint);
 
 #ifdef __cplusplus
 }
--- libjava/classpath/native/jni/gtk-peer/gdkfont.h	21 Nov 2006 14:14:25 -0000	1.10
+++ libjava/classpath/native/jni/gtk-peer/gdkfont.h	2 Apr 2007 19:39:26 -0000	1.11
@@ -40,6 +40,7 @@
 
 #include "gtkpeer.h"
 
+#define PANGO_ENABLE_ENGINE
 #include <pango/pango.h>
 #include <pango/pango-context.h>
 #include <pango/pango-fontmap.h>
@@ -123,6 +124,7 @@ extern struct state_table *cp_gtk_native
 struct peerfont
 {
   PangoFont *font;
+  PangoFontset *set;
   PangoFontDescription *desc;
   PangoContext *ctx;
   PangoLayout *layout;
--- libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c	16 Mar 2007 15:14:55 -0000	1.21
+++ libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c	2 Apr 2007 19:39:26 -0000	1.22
@@ -308,9 +308,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics
  jobject font,
  jfloat x, jfloat y, jint n,
  jintArray java_codes,
- jfloatArray java_positions)
+ jfloatArray java_positions, jlongArray java_fontset)
 {
-  
   struct cairographics2d *gr = NULL;
   struct peerfont *pfont = NULL;
   cairo_glyph_t *glyphs = NULL;
@@ -333,6 +332,7 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics
   native_codes = (*env)->GetIntArrayElements (env, java_codes, NULL);
   native_positions = (*env)->GetFloatArrayElements (env, java_positions, NULL);
   
+  /* Set up glyphs and layout */
   for (i = 0; i < n; ++i)
     {
       glyphs[i].index = native_codes[i];
@@ -343,10 +343,31 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics
   (*env)->ReleaseFloatArrayElements (env, java_positions, native_positions, 0);
   (*env)->ReleaseIntArrayElements (env, java_codes, native_codes, 0);
 
-  pango_fc_font_lock_face( (PangoFcFont *)pfont->font );
-  cairo_show_glyphs (gr->cr, glyphs, n);
-  pango_fc_font_unlock_face( (PangoFcFont *)pfont->font );
+  /* Iterate through glyphs and draw */
+  jlong* fonts = (*env)->GetLongArrayElements (env, java_fontset, NULL);
+  for (i = 0; i < n; i++)
+    {
+      PangoFcFont *font = JLONG_TO_PTR(PangoFcFont, fonts[i]);
+
+      /* Draw as many glyphs as possible with the current font */
+      int length = 0;
+      while (i < n-1 && fonts[i] == fonts[i+1])
+        {
+          length++;
+          i++;
+        }
+    
+      FT_Face face = pango_fc_font_lock_face( font );
+      cairo_font_face_t *ft = cairo_ft_font_face_create_for_ft_face (face, 0);
+      g_assert (ft != NULL);
 
+      cairo_set_font_face (gr->cr, ft);
+      cairo_show_glyphs (gr->cr, &glyphs[i-length], length+1);
+                       
+      cairo_font_face_destroy (ft);
+      pango_fc_font_unlock_face(font);
+    }
+    
   g_free(glyphs);
 }
 
--- libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c	11 Jun 2006 11:31:03 -0000	1.4
+++ libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c	2 Apr 2007 21:28:59 -0000	1.6
@@ -35,6 +35,7 @@ this exception to your version of the li
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+#define PANGO_ENABLE_ENGINE
 #include <jni.h>
 #include <gtk/gtk.h>
 #include <string.h>
@@ -43,6 +44,7 @@ exception statement from your version. *
 #include <pango/pangofc-font.h>
 #include <freetype/ftglyph.h>
 #include <freetype/ftoutln.h>
+#include "jcl.h"
 #include "native_state.h"
 #include "gdkfont.h"
 #include "gnu_java_awt_peer_gtk_FreetypeGlyphVector.h"
@@ -81,42 +83,92 @@ getFont(JNIEnv *env, jobject obj)
   return (PangoFcFont *)pfont->font;
 }
 
-JNIEXPORT jintArray JNICALL 
+static PangoFontset *
+getFontSet(JNIEnv *env, jobject obj)
+{
+  jfieldID fid;
+  jobject data;
+  jclass cls;
+  struct peerfont *pfont;
+
+  cls = (*env)->GetObjectClass (env, obj);
+  fid = (*env)->GetFieldID (env, cls, "peer", 
+				 "Lgnu/java/awt/peer/gtk/GdkFontPeer;");
+  g_assert (fid != 0);
+
+  data = (*env)->GetObjectField (env, obj, fid);
+  g_assert (data != NULL);
+
+  pfont = (struct peerfont *)NSA_GET_FONT_PTR (env, data);
+  g_assert (pfont != NULL);
+  g_assert (pfont->font != NULL);
+
+  return (PangoFontset *)pfont->set;
+}
+
+JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyphs
-  (JNIEnv *env, jobject obj, jintArray codepoints)
+  (JNIEnv *env, jobject obj, jintArray codepoints, jintArray glyphs,
+   jlongArray fonts)
 {
-  FT_Face ft_face;
-  jintArray retArray;
-  PangoFcFont *font;
-  jint *values, *cpvals;
+  PangoFcFont *default_font, *current_font;
+  PangoFontset *pfs;
+  jint *cpvals;
   jint length;
   int i;
 
-  font = getFont(env, obj);
-
-  ft_face = pango_fc_font_lock_face( font );
-  g_assert (ft_face != NULL);
+  /* Set up default font and fontset */
+  default_font = getFont(env, obj);
+  current_font = default_font;
+  pfs = getFontSet(env, obj);
 
+  /* Retrieve string information */
   length = (*env)->GetArrayLength (env, codepoints);
   cpvals = (*env)->GetIntArrayElements (env, codepoints, NULL);
+  
+  jint *glyphArray = (*env)->GetIntArrayElements (env, glyphs, NULL);
+  jlong *fontArray = (*env)->GetLongArrayElements (env, fonts, NULL);
 
-  retArray = (*env)->NewIntArray (env, length);
-  values = (*env)->GetIntArrayElements (env, retArray, NULL);
+  /* A design goal of Pango is to be threadsafe, but it's admitted that it is
+   * not actually threadsafe at the moment.  Using gdk locking here to be safe,
+   * but I don't know if if actually helps at all... */ 
+  gdk_threads_enter();
 
   for( i = 0; i < length; i++ )
-    values[i] = FT_Get_Char_Index( ft_face, cpvals[i] );
+  {
+  	/* Ensure the current font has the requested character; if it doesn't,
+  	 * try the default font before pulling a new font out of the fontset.
+  	 * Once chosen, a font will be used until a character not in the font is
+  	 * encountered. */ 
+  	if (!pango_fc_font_has_char(current_font, cpvals[i]))
+  	  {
+  	    if (pango_fc_font_has_char(default_font, cpvals[i]))
+  	      {
+  	        current_font = default_font;
+  	      }
+  	    else
+  	      {
+  	        current_font = (PangoFcFont*)pango_fontset_get_font(pfs, cpvals[i]);
+  	      }
+  	  }
+  	
+  	/* Get glyph, and store both glyph and pointer to font */
+    glyphArray[i] = (int)pango_fc_font_get_glyph(current_font,
+                                                 (gunichar)cpvals[i]);
+    g_object_ref(current_font);
+    fontArray[i] = PTR_TO_JLONG(current_font);
+  }
+  
+  gdk_threads_leave();
 
-  (*env)->ReleaseIntArrayElements (env, retArray, values, 0);
+  (*env)->ReleaseIntArrayElements (env, glyphs, glyphArray, 0);
   (*env)->ReleaseIntArrayElements (env, codepoints, cpvals, 0);
-
-  pango_fc_font_unlock_face (font);
-
-  return retArray;
+  (*env)->ReleaseLongArrayElements (env, fonts, fontArray, 0);
 }
 
 JNIEXPORT jobject JNICALL 
 Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getKerning
-(JNIEnv *env, jobject obj, jint rightGlyph, jint leftGlyph)
+(JNIEnv *env, jobject obj __attribute__((unused)), jint rightGlyph, jint leftGlyph, jlong fnt)
 {
   FT_Face ft_face;
   FT_Vector kern;
@@ -125,7 +177,7 @@ Java_gnu_java_awt_peer_gtk_FreetypeGlyph
   jvalue values[2];
   PangoFcFont *font;
 
-  font = getFont(env, obj);
+  font = JLONG_TO_PTR(PangoFcFont, fnt);
   ft_face = pango_fc_font_lock_face( font );
   g_assert (ft_face != NULL);
   FT_Get_Kerning( ft_face, rightGlyph, leftGlyph, FT_KERNING_DEFAULT, &kern );
@@ -142,14 +194,14 @@ Java_gnu_java_awt_peer_gtk_FreetypeGlyph
 
 JNIEXPORT jdoubleArray JNICALL 
 Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getMetricsNative
-(JNIEnv *env, jobject obj, jint glyphIndex )
+(JNIEnv *env, jobject obj __attribute__((unused)), jint glyphIndex, jlong fnt)
 {
   FT_Face ft_face;
   jdouble *values;
   jdoubleArray retArray = NULL;
   PangoFcFont *font;
 
-  font = getFont(env, obj);
+  font = JLONG_TO_PTR(PangoFcFont, fnt);
   ft_face = pango_fc_font_lock_face( font );
 
   g_assert (ft_face != NULL);
@@ -285,7 +337,7 @@ static int _curveTo( const FT_Vector*  c
 
 JNIEXPORT jobject JNICALL 
 Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyphOutlineNative
- (JNIEnv *env, jobject obj, jint glyphIndex)
+ (JNIEnv *env, jobject obj __attribute__((unused)), jint glyphIndex, jlong fnt)
 {
   generalpath *path;
   jobject gp;
@@ -302,7 +354,7 @@ Java_gnu_java_awt_peer_gtk_FreetypeGlyph
   FT_Face ft_face;
   FT_Glyph glyph;
 
-  font = getFont(env, obj);
+  font = JLONG_TO_PTR(PangoFcFont, fnt);
   ft_face = pango_fc_font_lock_face( font );
 
   g_assert (ft_face != NULL);
@@ -345,4 +397,39 @@ Java_gnu_java_awt_peer_gtk_FreetypeGlyph
   return gp; 
 }
 
+JNIEXPORT void JNICALL 
+Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_dispose
+ (JNIEnv *env, jobject obj __attribute__((unused)), jlongArray fontset)
+{
+  PangoFcFont *font;
+  jlong *fontArray; 
+  int i, length;
 
+  length = (*env)->GetArrayLength (env, fontset);
+  fontArray = (*env)->GetLongArrayElements (env, fontset, NULL);
+  
+  gdk_threads_enter();
+  
+  for( i = 0; i < length; i++ )
+  {
+    font = JLONG_TO_PTR(PangoFcFont, fontArray[i]);
+    g_object_unref(font);
+  }
+  
+  gdk_threads_leave();
+
+  (*env)->ReleaseLongArrayElements (env, fontset, fontArray, 0);
+}
+
+JNIEXPORT jlong JNICALL 
+Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getNativeFontPointer
+ (JNIEnv *env, jobject obj, jint n)
+{
+  int i;
+  PangoFcFont *font = getFont(env, obj);
+  
+  for (i = 0; i < n; i++)
+    g_object_ref(font);
+  
+  return PTR_TO_JLONG(font);
+}
--- libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c	26 Feb 2007 22:11:38 -0000	1.22
+++ libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c	2 Apr 2007 19:39:26 -0000	1.23
@@ -35,6 +35,7 @@
    obligated to do so.  If you do not wish to do so, delete this
    exception statement from your version. */
 
+#define PANGO_ENABLE_ENGINE
 #include <pango/pango.h>
 #include <pango/pangoft2.h>
 #include <pango/pangofc-font.h>
@@ -97,6 +98,8 @@ Java_gnu_java_awt_peer_gtk_GdkFontPeer_d
     g_object_unref (pfont->layout);
   if (pfont->font != NULL)
     g_object_unref (pfont->font);
+  if (pfont->set != NULL)
+    g_object_unref (pfont->set);
   if (pfont->ctx != NULL)
     g_object_unref (pfont->ctx);
   if (pfont->desc != NULL)
@@ -257,6 +260,8 @@ Java_gnu_java_awt_peer_gtk_GdkFontPeer_s
     g_object_unref (pfont->ctx);
   if (pfont->font != NULL)
     g_object_unref (pfont->font);
+  if (pfont->set != NULL)
+    g_object_unref (pfont->set);
   if (pfont->desc != NULL)
     pango_font_description_free (pfont->desc);
 
@@ -268,7 +273,6 @@ Java_gnu_java_awt_peer_gtk_GdkFontPeer_s
   pango_font_description_set_family (pfont->desc, family_name);
   (*env)->ReleaseStringUTFChars(env, family_name_str, family_name);
 
-
   if (style & java_awt_font_BOLD)
     pango_font_description_set_weight (pfont->desc, PANGO_WEIGHT_BOLD);
 
@@ -293,6 +297,8 @@ Java_gnu_java_awt_peer_gtk_GdkFontPeer_s
   
   pango_context_set_font_description (pfont->ctx, pfont->desc);
   pango_context_set_language (pfont->ctx, gtk_get_default_language());
+  pfont->set = pango_context_load_fontset(pfont->ctx, pfont->desc,
+  										  gtk_get_default_language());
   pfont->font = pango_context_load_font (pfont->ctx, pfont->desc);
   g_assert (pfont->font != NULL);
 

gcc41-rh234515.patch:
 0 files changed

--- NEW FILE gcc41-rh234515.patch ---
2007-01-24   Steve LoBasso <slobasso at yahoo.com>
	     Paolo Carlini  <pcarlini at suse.de>

	* include/bits/deque.tcc (deque<>::erase(iterator, iterator)):
	Fix condition.
	* testsuite/23_containers/deque/modifiers/erase/3.cc: New.

--- libstdc++-v3/include/bits/deque.tcc	(revision 121146)
+++ libstdc++-v3/include/bits/deque.tcc	(revision 121147)
@@ -143,7 +143,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GL
 	{
 	  const difference_type __n = __last - __first;
 	  const difference_type __elems_before = __first - begin();
-	  if (static_cast<size_type>(__elems_before) < (size() - __n) / 2)
+	  if (static_cast<size_type>(__elems_before) <= (size() - __n) / 2)
 	    {
 	      if (__first != begin())
 		std::copy_backward(begin(), __first, __last);
--- libstdc++-v3/testsuite/23_containers/deque/modifiers/erase/3.cc	(revision 0)
+++ libstdc++-v3/testsuite/23_containers/deque/modifiers/erase/3.cc	(revision 121147)
@@ -0,0 +1,52 @@
+// Copyright (C) 2007 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// 23.2.1.3 deque modifiers
+
+#include <deque>
+#include <testsuite_hooks.h>
+
+void erase(size_t num_elm, size_t elm_strt, size_t elm_end)
+{
+  bool test __attribute__((unused)) = true;
+  using __gnu_test::copy_tracker;
+  using __gnu_test::assignment_operator;
+
+  std::deque<copy_tracker> x(num_elm);
+  copy_tracker::reset();
+  
+  x.erase(x.begin() + elm_strt, x.begin() + elm_end);
+  
+  const size_t min_num_cpy = std::min(elm_strt, num_elm - elm_end);
+  VERIFY( assignment_operator::count() == min_num_cpy );
+}
+
+// http://gcc.gnu.org/ml/libstdc++/2007-01/msg00098.html
+void test01()
+{
+  for (size_t num_elm = 0; num_elm <= 10; ++num_elm)
+    for (size_t elm_strt = 0; elm_strt <= num_elm; ++elm_strt)
+      for (size_t elm_end = elm_strt; elm_end <= num_elm; ++elm_end)
+	erase(num_elm, elm_strt, elm_end);
+}
+
+int main()
+{
+  test01();
+  return 0;
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- .cvsignore	29 Mar 2007 10:46:10 -0000	1.202
+++ .cvsignore	3 Apr 2007 13:14:16 -0000	1.203
@@ -1 +1 @@
-gcc-4.1.2-20070329.tar.bz2
+gcc-4.1.2-20070403.tar.bz2

gcc41-java-bogus-debugline.patch:
 0 files changed

Index: gcc41-java-bogus-debugline.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-java-bogus-debugline.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-java-bogus-debugline.patch	17 Mar 2007 09:01:19 -0000	1.1
+++ gcc41-java-bogus-debugline.patch	3 Apr 2007 13:14:16 -0000	1.2
@@ -1,9 +1,11 @@
 2007-03-16  Andrew Haley  <aph at redhat.com>
 
 	* class.c (push_class): Don't bogusly guess the source filename.
+	* jcf-parse.c (give_name_to_class): Don't set input_location from
+	DECL_ARTIFICIAL decls.
 
---- gcc/java/class.c	(revision 122746)
-+++ gcc/java/class.c	(working copy)
+--- gcc/java/class.c        (revision 122746)
++++ gcc/java/class.c        (working copy)
 @@ -426,8 +426,7 @@
    tree decl, signature;
    location_t saved_loc = input_location;
@@ -14,3 +16,22 @@
    input_line = 0;
  #endif
    CLASS_P (class_type) = 1;
+--- gcc/java/jcf-parse.c    (revision 122746)
++++ gcc/java/jcf-parse.c    (working copy)
+@@ -1221,9 +1221,12 @@
+        main_input_filename = sfname;
+       }
+ #else
+-      input_location = DECL_SOURCE_LOCATION (TYPE_NAME (this_class));
+-      if (main_input_filename == NULL && jcf == main_jcf)
+-       main_input_filename = input_filename;
++      if (! DECL_ARTIFICIAL (TYPE_NAME (this_class)))
++       {
++         input_location = DECL_SOURCE_LOCATION (TYPE_NAME (this_class));
++         if (main_input_filename == NULL && jcf == main_jcf)
++           main_input_filename = input_filename;
++       }
+ #endif
+ 
+       jcf->cpool.data[i].t = this_class;
+

gcc41-libjava-visibility.patch:
 0 files changed

Index: gcc41-libjava-visibility.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-libjava-visibility.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-libjava-visibility.patch	27 Mar 2007 15:39:46 -0000	1.1
+++ gcc41-libjava-visibility.patch	3 Apr 2007 13:14:16 -0000	1.2
@@ -1,4 +1,4 @@
-2007-03-23  Andrew Haley  <aph at redhat.com>
+2007-03-29  Andrew Haley  <aph at redhat.com>
 
 	* jvgenmain.c (main): Change main to use class$, not class$$.
 	(do_mangle_classname): Likewise.
@@ -9,10 +9,11 @@
 	(build_classdollar_field): Likewise.
 	(make_class_data): Likewise.
 	(layout_class_method): Likewise.
-	
---- gcc/java/class.c	(revision 123084)
+	* expr.c (special_method_p): New function.
+
+--- gcc/java/class.c	(revision 122746)
 +++ gcc/java/class.c	(working copy)
-@@ -691,6 +691,13 @@
+@@ -689,6 +688,13 @@
    return fntype;
  }
  
@@ -26,7 +27,7 @@
  tree
  add_method_1 (tree this_class, int access_flags, tree name, tree function_type)
  {
-@@ -801,6 +808,10 @@
+@@ -799,6 +805,10 @@
        /* Always make field externally visible.  This is required so
  	 that native methods can always access the field.  */
        TREE_PUBLIC (field) = 1;
@@ -37,7 +38,7 @@
        /* Considered external unless we are compiling it into this
  	 object file.  */
        DECL_EXTERNAL (field) = (is_compiled_class (class) != 2);
-@@ -958,7 +969,11 @@
+@@ -956,7 +966,11 @@
        decl = build_decl (VAR_DECL, decl_name, class_type_node);
        TREE_STATIC (decl) = 1;
        if (! flag_indirect_classes)
@@ -50,7 +51,7 @@
        DECL_IGNORED_P (decl) = 1;
        DECL_ARTIFICIAL (decl) = 1;
        if (is_compiled_class (type) == 1)
-@@ -997,6 +1012,7 @@
+@@ -995,6 +1009,7 @@
        TREE_CONSTANT (decl) = 1;
        TREE_READONLY (decl) = 1;
        TREE_PUBLIC (decl) = 1;
@@ -58,7 +59,7 @@
        DECL_IGNORED_P (decl) = 1;
        DECL_ARTIFICIAL (decl) = 1;
        MAYBE_CREATE_VAR_LANG_DECL_SPECIFIC (decl);
-@@ -1684,6 +1700,10 @@
+@@ -1640,6 +1655,10 @@
  
        TREE_PUBLIC (dtable_decl) = 1;
        DECL_INITIAL (dtable_decl) = dtable;
@@ -69,18 +70,20 @@
        if (! flag_indirect_classes)
  	rest_of_decl_compilation (dtable_decl, 1, 0);
        /* Maybe we're compiling Class as the first class.  If so, set
-@@ -2553,6 +2573,10 @@
+@@ -2509,6 +2528,12 @@
  
    TREE_PUBLIC (method_decl) = 1;
  
 +  if (flag_indirect_classes
-+      || (METHOD_PRIVATE (method_decl) && METHOD_STATIC (method_decl)))
++      || (METHOD_PRIVATE (method_decl) && METHOD_STATIC (method_decl)
++	  && ! METHOD_NATIVE (method_decl)
++	  && ! special_method_p (method_decl)))
 +    hide (method_decl);
 +
    /* Considered external unless it is being compiled into this object
       file, or it was already flagged as external.  */
    if (!DECL_EXTERNAL (method_decl))
---- gcc/java/jvgenmain.c	(revision 123084)
+--- gcc/java/jvgenmain.c	(revision 122746)
 +++ gcc/java/jvgenmain.c	(working copy)
 @@ -143,8 +143,8 @@
      fprintf (stream, "   JvRunMainName (\"%s\", argc, argv);\n", classname);
@@ -102,5 +105,41 @@
    obstack_1grow (mangle_obstack, '\0');
    return obstack_finish (mangle_obstack);
  }
-
-
+--- gcc/java/expr.c	(revision 122746)
++++ gcc/java/expr.c	(working copy)
+@@ -2121,6 +2121,25 @@
+ 
+    {NULL, NULL, NULL, NULL, 0, NULL}};
+ 
++/* True if this method is special, i.e. it's a private method that
++   should be exported fro a DSO.  */
++
++bool
++special_method_p (tree candidate_method)
++{
++  tree context = DECL_NAME (TYPE_NAME (DECL_CONTEXT (candidate_method)));
++  tree method = DECL_NAME (candidate_method);
++  rewrite_rule *p;
++
++  for (p = rules; p->classname; p++)
++    {
++      if (get_identifier (p->classname) == context
++	  && get_identifier (p->method) == method)
++	return true;
++    }
++  return false;
++}
++
+ /* Scan the rules list for replacements for *METHOD_P and replace the
+    args accordingly.  If the rewrite results in an access to a private
+    method, update SPECIAL.*/
+--- gcc/java/java-tree.h	(revision 122746)
++++ gcc/java/java-tree.h	(working copy)
+@@ -1171,6 +1171,7 @@
+ extern void initialize_builtins (void);
+ 
+ extern tree lookup_name (tree);
++extern bool special_method_p (tree);
+ extern void maybe_rewrite_invocation (tree *, tree *, tree *, tree *);
+ extern tree build_known_method_ref (tree, tree, tree, tree, tree, tree);
+ extern tree build_class_init (tree, tree);


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- gcc41.spec	29 Mar 2007 10:46:10 -0000	1.155
+++ gcc41.spec	3 Apr 2007 13:14:16 -0000	1.156
@@ -1,6 +1,6 @@
-%define DATE 20070329
+%define DATE 20070403
 %define gcc_version 4.1.2
-%define gcc_release 7
+%define gcc_release 8
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -125,27 +125,22 @@
 Patch14: gcc41-objc-rh185398.patch
 Patch15: gcc41-tests.patch
 Patch16: gcc41-pr25874.patch
-Patch17: gcc41-pr27351.patch
-Patch18: gcc41-hash-style-gnu.patch
-Patch19: gcc41-pr30001.patch
-Patch20: gcc41-java-libdotdotlib.patch
-Patch21: gcc41-pr28709.patch
-Patch22: gcc41-pr28755.patch
-Patch23: gcc41-pr27898.patch
-Patch24: gcc41-pr27567.patch
-Patch25: gcc41-pr29272.patch
-Patch26: gcc41-pr29059.patch
-Patch27: gcc41-strncat-chk.patch
-Patch28: gcc41-pr29299.patch
-Patch29: gcc41-pr30113.patch
-Patch30: gcc41-rh228769.patch
-Patch31: gcc41-pr30045.patch
-Patch32: gcc41-rh227376.patch
-Patch33: gcc41-pr30863.patch
-Patch34: gcc41-java-bogus-debugline.patch
-Patch35: gcc41-libffi-selinux.patch
-Patch36: gcc41-libjava-visibility.patch
-Patch37: gcc41-pr30847.patch
+Patch17: gcc41-hash-style-gnu.patch
+Patch18: gcc41-java-libdotdotlib.patch
+Patch19: gcc41-pr28709.patch
+Patch20: gcc41-pr28755.patch
+Patch21: gcc41-pr27898.patch
+Patch22: gcc41-pr27567.patch
+Patch23: gcc41-pr29272.patch
+Patch24: gcc41-pr29059.patch
+Patch25: gcc41-strncat-chk.patch
+Patch26: gcc41-pr29299.patch
+Patch27: gcc41-java-bogus-debugline.patch
+Patch28: gcc41-libjava-visibility.patch
+Patch29: gcc41-pr31187.patch
+Patch30: gcc41-rh231818.patch
+Patch31: gcc41-rh234515.patch
+
 %define _gnu %{nil}
 %ifarch sparc
 %define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
@@ -438,27 +433,21 @@
 %patch14 -p0 -b .objc-rh185398~
 %patch15 -p0 -b .tests~
 %patch16 -p0 -b .pr25874~
-%patch17 -p0 -b .pr27351~
-%patch18 -p0 -b .hash-style-gnu~
-%patch19 -p0 -b .pr30001~
-%patch20 -p0 -b .java-libdotdotlib~
-%patch21 -p0 -b .pr28709~
-%patch22 -p0 -b .pr28755~
-%patch23 -p0 -b .pr27898~
-%patch24 -p0 -b .pr27567~
-%patch25 -p0 -b .pr29272~
-%patch26 -p0 -b .pr29059~
-%patch27 -p0 -b .strncat-chk~
-%patch28 -p0 -b .pr29299~
-%patch29 -p0 -b .pr30113~
-%patch30 -p0 -b .rh228769~
-%patch31 -p0 -b .pr30045~
-%patch32 -p0 -b .rh227376~
-%patch33 -p0 -b .pr30863~
-%patch34 -p0 -b .java-bogus-debugline~
-%patch35 -p0 -b .libffi-selinux~
-#%patch36 -p0 -b .libjava-visibility~
-%patch37 -p0 -b .pr30847~
+%patch17 -p0 -b .hash-style-gnu~
+%patch18 -p0 -b .java-libdotdotlib~
+%patch19 -p0 -b .pr28709~
+%patch20 -p0 -b .pr28755~
+%patch21 -p0 -b .pr27898~
+%patch22 -p0 -b .pr27567~
+%patch23 -p0 -b .pr29272~
+%patch24 -p0 -b .pr29059~
+%patch25 -p0 -b .strncat-chk~
+%patch26 -p0 -b .pr29299~
+%patch27 -p0 -b .java-bogus-debugline~
+%patch28 -p0 -b .libjava-visibility~
+%patch29 -p0 -b .pr31187~
+%patch30 -p0 -b .rh231818~
+%patch31 -p0 -b .rh234515~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1582,6 +1571,17 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Tue Apr  3 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-8
+- update from gcc-4_1-branch (-r123245:123462)
+  - PRs target/31137, target/31380
+- libjava fixes (PRs classpath/31302, classpath/31303, libgcj/29869)
+- java Proxy fix (Andrew Haley, #234836)
+- deque::erase fix (Steve LoBasso, Paolo Carlini, #234515)
+- fix java font rendering (Francis Kung, #231818)
+- fix a regression caused by C++ visibility fixes (Jason Merrill,
+  PR c++/31187)
+- use hidden visibility for non-native java private methods (Andrew Haley)
+
 * Thu Mar 29 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-7
 - make sure boehm-gc doesn't use PROT_EXEC (#202209)
 - fix C++ ICE on i ? j : k = (void) 0; (PR c++/30847)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- sources	29 Mar 2007 10:46:10 -0000	1.204
+++ sources	3 Apr 2007 13:14:16 -0000	1.205
@@ -1 +1 @@
-f49aa680623a3ef46ff411d61f4a3f99  gcc-4.1.2-20070329.tar.bz2
+b79f9ba06ee8097ace35d0b338dd9332  gcc-4.1.2-20070403.tar.bz2


--- gcc41-libffi-selinux.patch DELETED ---


--- gcc41-pr27351.patch DELETED ---


--- gcc41-pr30001.patch DELETED ---


--- gcc41-pr30045.patch DELETED ---


--- gcc41-pr30113.patch DELETED ---


--- gcc41-pr30847.patch DELETED ---


--- gcc41-pr30863.patch DELETED ---


--- gcc41-rh227376.patch DELETED ---


--- gcc41-rh228769.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr  3 13:14:25 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 09:14:25 -0400
Subject: rpms/glib-java/devel glib-java.spec,1.51,1.52
Message-ID: <200704031314.l33DEPmm015423@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/glib-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15379

Modified Files:
	glib-java.spec 
Log Message:
Spaces changed to tabs.


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- glib-java.spec	5 Mar 2007 18:27:58 -0000	1.51
+++ glib-java.spec	3 Apr 2007 13:14:23 -0000	1.52
@@ -12,40 +12,38 @@
 
 # The prefix for java-gnome package names
 %define name_base glib-java
-Summary:   Base Library for the Java-GNOME libraries 
-Name:      %{java_pkg_prefix}%{name_base}
-Version:   0.2.6
-Release:   8%{?dist}
-URL:       http://java-gnome.sourceforge.net
-Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.2/%{name_base}-%{version}.tar.bz2
-Patch0:    %{name}-gjavah.patch
-License:   LGPL
-Group:     Development/Libraries
-BuildRoot: %{_tmppath}/glib-java
-
-Requires: 	/sbin/ldconfig
-Requires: 	%{c_pkg_prefix}glib2 >= 2.7.0
-BuildRequires:  java-devel >= 1.4.2 %{c_pkg_prefix}glib2-devel >= 2.7.0
-BuildRequires:  gcc-java >= 4.1.1, docbook-utils
-BuildRequires: 	pkgconfig
+Summary:	Base Library for the Java-GNOME libraries 
+Name:		%{java_pkg_prefix}%{name_base}
+Version:	0.2.6
+Release:	8%{?dist}
+URL:		http://java-gnome.sourceforge.net
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.2/%{name_base}-%{version}.tar.bz2
+Patch0:		%{name}-gjavah.patch
+License:	LGPL
+Group:		Development/Libraries
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+Requires:	/sbin/ldconfig
+Requires:	%{c_pkg_prefix}glib2 >= 2.7.0
+BuildRequires:	java-devel >= 1.4.2 %{c_pkg_prefix}glib2-devel >= 2.7.0
+BuildRequires:	gcc-java >= 4.1.1, docbook-utils
+BuildRequires:	pkgconfig
 
 %description 
 Glib-java is a base framework for the Java-GNOME libraries. Allowing the use of
 GNOME through Java.
 
 %package        devel
-Summary:        Compressed Java source files for %{name}.
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       glib2-devel
+Summary:	Compressed Java source files for %{name}.
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	glib2-devel
 
 %description    devel
 Development part of %{name}.
 
 
 %prep
-rm -rf $RPM_BUILD_ROOT
-
 %setup -q -n %{name_base}-%{version}
 
 %patch0 -p0
@@ -167,7 +165,7 @@
 * Sat Jun 17 2006 Stepan Kasal <skasal at redhat.com> - 0.2.5-0
 - Use .tar.bz2, not .tar.gz.
 
-* Wed Jun 14 2006 Stepan Kasal <skasal at redhat.com>    - 0.2.5-0
+* Wed Jun 14 2006 Stepan Kasal <skasal at redhat.com> - 0.2.5-0
 - New version.
 
 * Wed May 24 2006 Ben Konrath <bkonrath at redhat.com> - 0.2.4-4
@@ -180,7 +178,7 @@
 * Wed May 10 2006 Ben Konrath <bkonrath at redhat.com> - 0.2.4-2
 - Add -X option when zipping up the sources. This is needed for multilib.
 
-* Fri Apr 28 2006 Stepan Kasal <skasal at redhat.com>    - 0.2.4-1
+* Fri Apr 28 2006 Stepan Kasal <skasal at redhat.com> - 0.2.4-1
 - New version.
 
 * Wed Mar 01 2006 Adam Jocksch <ajocksch at redhat.com> - 0.2.3.0.20060301.rh1-1



From fedora-cvs-commits at redhat.com  Tue Apr  3 13:17:12 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 09:17:12 -0400
Subject: rpms/tcl/devel tcl.spec,1.54,1.55
Message-ID: <200704031317.l33DHCXt017207@cvs.devel.redhat.com>

Author: mmaslano

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

Modified Files:
	tcl.spec 
Log Message:
Rebuil, clean spec.



Index: tcl.spec
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- tcl.spec	26 Mar 2007 14:29:08 -0000	1.54
+++ tcl.spec	3 Apr 2007 13:17:09 -0000	1.55
@@ -3,7 +3,7 @@
 Summary: Tcl scripting language development environment
 Name: tcl
 Version: %{majorver}.13
-Release: 14%{?dist}
+Release: 15%{?dist}
 Epoch: 1 
 License: BSD
 Group: Development/Languages
@@ -74,6 +74,7 @@
 %patch7 -p1 -b .7-tests
 
 # patch1 touches tcl.m4, and patch3 touches configure.in
+# patch7 change placement of tests (merge review)
 
 %build
 cd %{name}%{version}/unix
@@ -97,19 +98,10 @@
 
 ln -s tclsh%{majorver} $RPM_BUILD_ROOT%{_bindir}/tclsh
 
-# for linking with -l%{name}
+# for linking with -lib%{name}
 ln -s lib%{name}%{majorver}.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so
 
-# backward compatible symlink for legacy tcl packages that hardcode lib path
-# to prefix/lib/%{name}%{majorver}
-## make /usr/lib for multilib archs
-mkdir -p $RPM_BUILD_ROOT/%{_prefix}/lib
-#mkdir -p $RPM_BUILD_ROOT/%{_libdir}
-#ln -s %{_datadir}/%{name}%{majorver} $RPM_BUILD_ROOT/%{_prefix}/lib/%{name}%{majorver}
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver}
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/%{name}%{majorver}
-#cp -p $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver} $RPM_BUILD_ROOT/%{_libdir}/%{name}%{majorver}
-cp -Rp $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver}/ $RPM_BUILD_ROOT/%{_libdir}/
+ln -s %{_datadir}/%{name}%{majorver} $RPM_BUILD_ROOT/%{_libdir}/%{name}%{majorver}
 
 mkdir -p $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/{generic,unix}
 find generic unix -name "*.h" -exec cp -p '{}' $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/'{}' ';'
@@ -139,8 +131,6 @@
 %{_mandir}/man1/*
 %{_mandir}/man3/*
 %{_mandir}/mann/*
-# this should be prefix/lib
-#%{_prefix}/lib/%{name}%{majorver}
 %{_libdir}/%{name}%{majorver}
 %doc %{name}%{version}/README %{name}%{version}/changes 
 %doc %{name}%{version}/license.terms
@@ -158,6 +148,9 @@
 %doc %{name}%{version}/html/*
 
 %changelog
+* Tue Apr  3 2007 Marcela Maslanova <mmaslano at redhat.com> - 1:8.4.13-15
+- cleaning spec
+
 * Tue Mar 21 2007 Marcela Maslanova <mmaslano at redhat.com> - 1:8.4.13-14
 - multilib problem, rhbz#227200
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 13:28:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 09:28:18 -0400
Subject: rpms/xen/FC-5 xen-network-bonding-fix.patch, NONE, 1.1 xen.spec,
	1.123, 1.124
Message-ID: <200704031328.l33DSIgg025573@cvs.devel.redhat.com>

Author: armbru

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

Modified Files:
	xen.spec 
Added Files:
	xen-network-bonding-fix.patch 
Log Message:
fix ethernet bonding in balanced-rr mode

xen-network-bonding-fix.patch:
 network-bridge |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

--- NEW FILE xen-network-bonding-fix.patch ---
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>

--- a/tools/examples/network-bridge	2007-03-08 09:42:35.000000000 +1100
+++ b/tools/examples/network-bridge	2007-03-08 09:46:18.000000000 +1100
@@ -70,12 +70,20 @@
 vif0="vif0.${vifnum}"
 
 get_ip_info() {
-    addr_pfx=`ip addr show dev $1 | egrep '^ *inet' | sed -e 's/ *inet //' -e 's/ .*//'`
+    addr_pfx=`ip addr show dev $1 | sed -n 's/^ *inet \(.*\) [^ ]*$/\1/p'`
     gateway=`ip route show dev $1 | fgrep default | sed 's/default via //'`
 }
+
+is_bonding() {
+    [ -f "/sys/class/net/$1/bonding/slaves" ]
+}
+
+is_ifup() {
+    ip link show dev $1 | awk '{ exit $3 !~ /[<,]UP[,>]/ }'
+}
     
 do_ifup() {
-    if ! ifup $1 ; then
+    if ! ifup $1 || ! is_ifup $1 ; then
         if [ ${addr_pfx} ] ; then
             # use the info from get_ip_info()
             ip addr flush $1
@@ -206,8 +214,8 @@
 	mac=`ip link show ${netdev} | grep 'link\/ether' | sed -e 's/.*ether \(..:..:..:..:..:..\).*/\1/'`
 	preiftransfer ${netdev}
 	transfer_addrs ${netdev} ${vdev}
-	if ! ifdown ${netdev}; then
-	    # If ifdown fails, remember the IP details.
+	if is_bonding ${netdev} || ! ifdown ${netdev}; then
+	    # Remember the IP details if necessary.
 	    get_ip_info ${netdev}
 	    ip link set ${netdev} down
 	    ip addr flush ${netdev}


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/FC-5/xen.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- xen.spec	14 Mar 2007 20:14:47 -0000	1.123
+++ xen.spec	3 Apr 2007 13:28:16 -0000	1.124
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -51,10 +51,11 @@
 Patch39: xen-shadow-enable.patch
 Patch40: xen-man-pages.patch
 
-Patch42: xen-qemu-close-fds.patch
+Patch42: xen-network-bonding-fix.patch
 
 Patch80: xen-destroydevice-args.patch
 Patch81: xen-hotplug-error-reporting.patch
+Patch82: xen-qemu-close-fds.patch
 
 # Ignore module loading for old Dom0/DomU split kernels
 Patch85: xen-initscript-mods.patch
@@ -187,13 +188,15 @@
 # Sanitize man pages
 %patch40 -p1
 
-# Close QEMU file handles when running network script
+# network bonding fix
 %patch42 -p1
 
 # fix HVM cannot allocate memory bug
 %patch80 -p1
 # hotplug script error reporting
 %patch81 -p1
+# Close QEMU file handles when running network script
+%patch82 -p1
 
 # Ignore module loading for old Dom0/DomU split kernels
 %patch85 -p1
@@ -324,6 +327,9 @@
 %dir %attr(0700,root,root) /var/log/xen
 
 %changelog
+* Mon Apr 02 2007 Markus Armbruster <armbru at redhat.com>
+- fix ethernet bonding in balanced-rr mode
+
 * Wed Mar 14 2007 Daniel P. Berrange <berrange at redhat.com> - 3.0.3-5.fc5
 - Disable access to QEMU monitor over VNC (CVE-2007-0998, bz 230295)
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 13:29:52 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 09:29:52 -0400
Subject: rpms/kernel/FC-5 linux-2.6-xen-add-packet_auxdata-cmsg.patch, NONE,
 1.1 linux-2.6-xen-avoid-touching-watchdog-when-gone-too-long.patch, NONE,
 1.1 linux-2.6-xen-blkback-copy-shared-data-before-verification.patch, NONE,
 1.1 linux-2.6-xen-blkback-fix-first_sect-check.patch, NONE,
 1.1 linux-2.6-xen-blkback-fix-potential-grant-entry-leaks-on-error.patch,
 NONE,
 1.1 linux-2.6-xen-blktap-fix-potential-grant-entry-leaks-on-error.patch,
 NONE, 1.1 linux-2.6-xen-copy-shared-data-before-verification.patch, NONE,
 1.1 linux-2.6-xen-fix-2tb-overflow-in-virtual-disk-driver.patch, NONE,
 1.1 linux-2.6-xen-fix-agp-on-x86_64-under-xen.patch, NONE,
 1.1 linux-2.6-xen-fix-nosegneg-detection.patch, NONE,
 1.1 linux-2.6-xen-fix-profiling.patch, NONE,
 1.1 linux-2.6-xen-fix-spinlock-when-removing-xennet-device.patch, NONE,
 1.1 linux-2.6-xen-fix-swiotlb-for-b44-module-kernel-patch.patch, NONE,
 1.1 linux-2.6-xen-iscsi-oops-on-x86_64-xen-domu.patch, NONE,
 1.1 linux-2.6-xen-make-ballooning-work-right.patch, NONE, 1.1 linux-2.6-!
 xen-make-netfront-device-permanent.patch, NONE,
 1.1 linux-2.6-xen-netback-fix-transmit-credit-scheduler-wrap.patch, NONE,
 1.1 linux-2.6-xen-netback-reenable-tx-queueing.patch, NONE,
 1.1 linux-2.6-xen-pae-handle-64bit-addresses-correctly.patch, NONE,
 1.1 linux-2.6-xen-privcmd-range-check-hypercall-index.patch, NONE,
 1.1 linux-2.6-xen-properly-close-blkfront-on-non-existant-file.patch, NONE,
 1.1 linux-2.6-xen-use-swiotlb-mask-for-coherent-mappings-too.patch, NONE,
 1.1 xen-amd-v-hvm-fix-for-windows-hibernate.patch, NONE,
 1.1 xen-amd-v-menu-timer-issue.patch, NONE,
 1.1 xen-emulate-pit-channels-for-vbios-support.patch, NONE,
 1.1 xen-emulation-accesses-faulting-on-page-boundary.patch, NONE,
 1.1 xen-enable-xen-booting-on-machines-with-64g.patch, NONE,
 1.1 xen-fix-for-smp-xen-guest-slow-boot-issue-on-amd-systems.patch, NONE,
 1.1 xen-fix-swiotlb-for-b44-module-xen-patch.patch, NONE,
 1.1 xen-fix-tlb-flushing-in-shadow-pagetable-mode.patch, NONE,
 1.1 xen-fix-vcpu-hotplug-statistics.patch, NONE, 1.1 xen-greater-than-!
 4g-guest-fix.patch,NONE,1.1 xen-hvm-crashes-on-ia32e-smp.patch!
 ,NONE,1.
Message-ID: <200704031329.l33DTqKb026862@cvs.devel.redhat.com>

Author: armbru

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-xen-add-packet_auxdata-cmsg.patch 
	linux-2.6-xen-avoid-touching-watchdog-when-gone-too-long.patch 
	linux-2.6-xen-blkback-copy-shared-data-before-verification.patch 
	linux-2.6-xen-blkback-fix-first_sect-check.patch 
	linux-2.6-xen-blkback-fix-potential-grant-entry-leaks-on-error.patch 
	linux-2.6-xen-blktap-fix-potential-grant-entry-leaks-on-error.patch 
	linux-2.6-xen-copy-shared-data-before-verification.patch 
	linux-2.6-xen-fix-2tb-overflow-in-virtual-disk-driver.patch 
	linux-2.6-xen-fix-agp-on-x86_64-under-xen.patch 
	linux-2.6-xen-fix-nosegneg-detection.patch 
	linux-2.6-xen-fix-profiling.patch 
	linux-2.6-xen-fix-spinlock-when-removing-xennet-device.patch 
	linux-2.6-xen-fix-swiotlb-for-b44-module-kernel-patch.patch 
	linux-2.6-xen-iscsi-oops-on-x86_64-xen-domu.patch 
	linux-2.6-xen-make-ballooning-work-right.patch 
	linux-2.6-xen-make-netfront-device-permanent.patch 
	linux-2.6-xen-netback-fix-transmit-credit-scheduler-wrap.patch 
	linux-2.6-xen-netback-reenable-tx-queueing.patch 
	linux-2.6-xen-pae-handle-64bit-addresses-correctly.patch 
	linux-2.6-xen-privcmd-range-check-hypercall-index.patch 
	linux-2.6-xen-properly-close-blkfront-on-non-existant-file.patch 
	linux-2.6-xen-use-swiotlb-mask-for-coherent-mappings-too.patch 
	xen-amd-v-hvm-fix-for-windows-hibernate.patch 
	xen-amd-v-menu-timer-issue.patch 
	xen-emulate-pit-channels-for-vbios-support.patch 
	xen-emulation-accesses-faulting-on-page-boundary.patch 
	xen-enable-xen-booting-on-machines-with-64g.patch 
	xen-fix-for-smp-xen-guest-slow-boot-issue-on-amd-systems.patch 
	xen-fix-swiotlb-for-b44-module-xen-patch.patch 
	xen-fix-tlb-flushing-in-shadow-pagetable-mode.patch 
	xen-fix-vcpu-hotplug-statistics.patch 
	xen-greater-than-4g-guest-fix.patch 
	xen-hvm-crashes-on-ia32e-smp.patch 
	xen-make-ballooning-work-right.patch 
	xen-make-hvm-hypercall-table-nr_hypercalls-entries-big.patch 
	xen-make-windows-vista-work.patch 
	xen-oprofile-on-intel-core.patch 
	xen-pae-handle-64bit-addresses-correctly.patch 
	xen-quick-fix-for-cannot-allocate-memory.patch 
	xen-race-condition-concerning-vlapic-interrupts.patch 
	xen-register-pit-handlers-to-the-correct-domain.patch 
	xen-replace-inappropriate-domain_crash_synchronous-use.patch 
Log Message:
- Add PACKET_AUXDATA cmsg (Herbert Xu )
- Xen kernel:
  >4G guest fix (Steven Rostedt )
  fix nosegneg detection (Rik van Riel )
  Use swiotlb mask for coherent mappings too (Herbert Xu )
  Fix potential grant entry leaks on error (Herbert Xu )
  Fix agp on x86_64 under Xen (Stephen C. Tweedie )
  netback: Reenable TX queueing and drop pkts after timeout (Herbert Xu )
  make ballooning work right (Rik van Riel )
  Fix xen swiotlb for b44 module (Stephen C. Tweedie )
  Copy shared data before verification (Herbert Xu )
  Properly close block frontend on non-existant file (Glauber de Oliveira Costa )
  blkback: Fix potential grant entry leaks on error (Rik van Riel )
  blkback: Copy shared data before verification (Rik van Riel)
  netback: Fix wrap to zero in transmit credit scheduler. (Herbert Xu )
  fix 2TB overflow in virtual disk driver (Rik van Riel )
  blkback: Fix first_sect check. (Rik van Riel )
  make netfront device permanent (Glauber de Oliveira Costa )
  fix iSCSI root oops on x86_64 xen domU (Rik van Riel )
  Avoid touching the watchdog when gone for too long (Glauber de Oliveira Costa )
  fix profiling (Rik van Riel )
  privcmd: Range-check hypercall index. (Herbert Xu )
  Fix spinlock bad magic when removing xennet device (Chris Lalancette )
- Xen hypervisor:
  Enable Xen booting on machines with > 64G (Chris Lalancette )
  fix TLB flushing in shadow pagetable mode (Rik van Riel )
  quick fix for Cannot allocate memory (Steven Rostedt )
  Register PIT handlers to the correct domain (Herbert Xu )
  Replace inappropriate domain_crash_synchronous use (Herbert Xu )
  Make HVM hypercall table NR_hypercalls entries big. (Herbert Xu )
  >4G guest fix (Steven Rostedt )
  emulate PIT channels for vbios support (Stephen C. Tweedie )
  Race condition concerning VLAPIC interrupts (Bhavana Nagendra )
  emulation for accesses faulting on a page boundary (Stephen C. Tweedie )
  oprofile on Intel CORE (Glauber de Oliveira Costa )
  make ballooning work right (xen part) (Rik van Riel )
  HVM crashes on IA32e SMP (Glauber de Oliveira Costa )
  Fix for SMP Xen guest slow boot issue on AMD systems (Bhavana Nagendra )
  Fix xen swiotlb for b44 module (xen part) (Stephen C. Tweedie )
  upstream patches to make Windows Vista work (Steven Rostedt)
  AMD-V HVM fix for Windows hibernate (Bhavana Nagendra )
  fix vcpu hotplug statistics (Rik van Riel )
  xen pae >4GB patch (Don Zickus)
  AMD-V HVM windows guest boot menu timer issue (Steven Rostedt)

linux-2.6-xen-add-packet_auxdata-cmsg.patch:
 b/include/linux/if_packet.h |   10 +++++++
 b/net/packet/af_packet.c    |   57 +++++++++++++++++++++++++++++++++++++-------
 net/packet/af_packet.c      |   46 +++++++++++++++++++++++------------
 3 files changed, 88 insertions(+), 25 deletions(-)

--- NEW FILE linux-2.6-xen-add-packet_auxdata-cmsg.patch ---
>From 8dc4194474159660d7f37c495e3fc3f10d0db8cc Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert at gondor.apana.org.au>
Date: Sun, 4 Feb 2007 23:31:32 -0800
Subject: [PATCH] [PACKET]: Add optional checksum computation for recvmsg

This patch is needed to make ISC's DHCP server (and probably other
DHCP servers/clients using AF_PACKET) to be able to serve another
client on the same Xen host.

The problem is that packets between different domains on the same
Xen host only have partial checksums.  Unfortunately this piece of
information is not passed along in AF_PACKET unless you're using
the mmap interface.  Since dhcpd doesn't support packet-mmap, UDP
packets from the same host come out with apparently bogus checksums.

This patch adds a mechanism for AF_PACKET recvmsg(2) to return the
status along with the packet.  It does so by adding a new cmsg that
contains this information along with some other relevant data such
as the original packet length.

I didn't include the time stamp information since there is already
a cmsg for that.

This patch also changes the mmap code to set the CSUMNOTREADY flag
on all packets instead of just outoing packets on cooked sockets.

Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>
---
 include/linux/if_packet.h |   10 ++++++++
 net/packet/af_packet.c    |   57 +++++++++++++++++++++++++++++++++++++-------
 2 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/include/linux/if_packet.h b/include/linux/if_packet.h
index 99393ef..f3de05c 100644
--- a/include/linux/if_packet.h
+++ b/include/linux/if_packet.h
@@ -41,6 +41,7 @@ struct sockaddr_ll
 #define PACKET_RX_RING			5
 #define PACKET_STATISTICS		6
 #define PACKET_COPY_THRESH		7
+#define PACKET_AUXDATA			8
 
 struct tpacket_stats
 {
@@ -48,6 +49,15 @@ struct tpacket_stats
 	unsigned int	tp_drops;
 };
 
+struct tpacket_auxdata
+{
+	__u32		tp_status;
+	__u32		tp_len;
+	__u32		tp_snaplen;
+	__u16		tp_mac;
+	__u16		tp_net;
+};
+
 struct tpacket_hdr
 {
 	unsigned long	tp_status;
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 6dc01bd..8973ea7 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -200,7 +200,8 @@ struct packet_sock {
 #endif
 	struct packet_type	prot_hook;
 	spinlock_t		bind_lock;
-	char			running;	/* prot_hook is attached*/
+	unsigned int		running:1,	/* prot_hook is attached*/
+				auxdata:1;
 	int			ifindex;	/* bound device		*/
 	__be16			num;
 #ifdef CONFIG_PACKET_MULTICAST
@@ -214,6 +215,8 @@ struct packet_sock {
 #endif
 };
 
+#define PACKET_SKB_CB(__skb)	((struct tpacket_auxdata *)((__skb)->cb))
+
 #ifdef CONFIG_PACKET_MMAP
 
 static inline char *packet_lookup_frame(struct packet_sock *po, unsigned int position)
@@ -462,6 +465,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, struct packet
 	u8 * skb_head = skb->data;
 	int skb_len = skb->len;
 	unsigned int snaplen, res;
+	struct tpacket_auxdata *aux;
 
 	if (skb->pkt_type == PACKET_LOOPBACK)
 		goto drop;
@@ -523,6 +527,15 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, struct packet
 	if (dev->hard_header_parse)
 		sll->sll_halen = dev->hard_header_parse(skb, sll->sll_addr);
 
+	aux = PACKET_SKB_CB(skb);
+	aux->tp_status = TP_STATUS_USER;
+	if (skb->ip_summed == CHECKSUM_PARTIAL)
+		aux->tp_status |= TP_STATUS_CSUMNOTREADY;
+	aux->tp_len = skb->len;
+	aux->tp_snaplen = snaplen;
+	aux->tp_mac = 0;
+	aux->tp_net = skb->nh.raw - skb->data;
+
 	if (pskb_trim(skb, snaplen))
 		goto drop_n_acct;
 
@@ -582,11 +595,12 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, struct packe
 		else if (skb->pkt_type == PACKET_OUTGOING) {
 			/* Special case: outgoing packets have ll header at head */
 			skb_pull(skb, skb->nh.raw - skb->data);
-			if (skb->ip_summed == CHECKSUM_PARTIAL)
-				status |= TP_STATUS_CSUMNOTREADY;
 		}
 	}
 
+	if (skb->ip_summed == CHECKSUM_PARTIAL)
+		status |= TP_STATUS_CSUMNOTREADY;
+
 	snaplen = skb->len;
 
 	res = run_filter(skb, sk, snaplen);
@@ -1119,6 +1133,11 @@ static int packet_recvmsg(struct kiocb *iocb, struct socket *sock,
 	if (msg->msg_name)
 		memcpy(msg->msg_name, skb->cb, msg->msg_namelen);
 
+	if (pkt_sk(sk)->auxdata) {
+		struct tpacket_auxdata *aux = PACKET_SKB_CB(skb);
+		put_cmsg(msg, SOL_PACKET, PACKET_AUXDATA, sizeof(*aux), aux);
+	}
+
 	/*
 	 *	Free or return the buffer as appropriate. Again this
 	 *	hides all the races and re-entrancy issues from us.
@@ -1317,6 +1336,7 @@ static int
 packet_setsockopt(struct socket *sock, int level, int optname, char __user *optval, int optlen)
 {
 	struct sock *sk = sock->sk;
+	struct packet_sock *po = pkt_sk(sk);
 	int ret;
 
 	if (level != SOL_PACKET)
@@ -1369,6 +1389,18 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv
 		return 0;
 	}
 #endif
+	case PACKET_AUXDATA:
+	{
+		int val;
+
+		if (optlen < sizeof(val))
+			return -EINVAL;
+		if (copy_from_user(&val, optval, sizeof(val)))
+			return -EFAULT;
+
+		po->auxdata = !!val;
+		return 0;
+	}
 	default:
 		return -ENOPROTOOPT;
 	}
@@ -1378,8 +1410,11 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
 			     char __user *optval, int __user *optlen)
 {
 	int len;
+	int val;
 	struct sock *sk = sock->sk;
 	struct packet_sock *po = pkt_sk(sk);
+	void *data;
+	struct tpacket_stats st;
 
 	if (level != SOL_PACKET)
 		return -ENOPROTOOPT;
@@ -1392,9 +1427,6 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
 		
 	switch(optname)	{
 	case PACKET_STATISTICS:
-	{
-		struct tpacket_stats st;
-
 		if (len > sizeof(struct tpacket_stats))
 			len = sizeof(struct tpacket_stats);
 		spin_lock_bh(&sk->sk_receive_queue.lock);
@@ -1403,16 +1435,23 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
 		spin_unlock_bh(&sk->sk_receive_queue.lock);
 		st.tp_packets += st.tp_drops;
 
-		if (copy_to_user(optval, &st, len))
-			return -EFAULT;
+		data = &st;
+		break;
+	case PACKET_AUXDATA:
+		if (len > sizeof(int))
+			len = sizeof(int);
+		val = po->auxdata;
+
+		data = &val;
 		break;
-	}
 	default:
 		return -ENOPROTOOPT;
 	}
 
 	if (put_user(len, optlen))
 		return -EFAULT;
+	if (copy_to_user(optval, data, len))
+		return -EFAULT;
 	return 0;
 }
 
-- 
1.5.0.5




From fedora-cvs-commits at redhat.com  Tue Apr  3 13:39:03 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 09:39:03 -0400
Subject: rpms/ghostscript/devel ghostscript.spec,1.134,1.135
Message-ID: <200704031339.l33Dd3RB028055@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28035

Modified Files:
	ghostscript.spec 
Log Message:
* Tue Apr  3 2007 Tim Waugh <twaugh at redhat.com> 8.15.4-2
- Fixed configuration file locations (bug #233966).
- Resolves: rhbz#233966



Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- ghostscript.spec	14 Mar 2007 21:56:28 -0000	1.134
+++ ghostscript.spec	3 Apr 2007 13:39:01 -0000	1.135
@@ -5,7 +5,7 @@
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 URL: http://www.cups.org/espgs/
@@ -110,7 +110,9 @@
 	%{_datadir}/fonts/default/amspsfnt/pfb \
 	%{_datadir}/fonts/default/cmpsfont/pfb \
 	%{_datadir}/fonts/japanese \
-	%{_sysconfdir}/%{name}
+	%{_datadir}/%{name}/conf.d \
+	%{_sysconfdir}/%{name} \
+	%{_sysconfdir}/%{name}/%{gs_dot_ver}
 do
   FONTPATH="$FONTPATH${FONTPATH:+:}$path"
 done
@@ -198,7 +200,12 @@
 # Don't ship two copies of Resource.  Just the versioned one will do.
 rm -rf $RPM_BUILD_ROOT%{_datadir}/ghostscript/Resource
 
-mkdir -p $RPM_BUILD_ROOT/etc/ghostscript
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/conf.d
+mkdir -p $RPM_BUILD_ROOT/etc/ghostscript/%{gs_dot_ver}
+touch $RPM_BUILD_ROOT/etc/ghostscript/%{gs_dot_ver}/Fontmap.local
+touch $RPM_BUILD_ROOT/etc/ghostscript/%{gs_dot_ver}/FAPIfontmap.local
+touch $RPM_BUILD_ROOT/etc/ghostscript/%{gs_dot_ver}/cidfmap.local
+touch $RPM_BUILD_ROOT/etc/ghostscript/%{gs_dot_ver}/CIDFnmap.local
 
 # The man/de/man1 symlinks are broken (bug #66238).
 find $RPM_BUILD_ROOT%{_mandir}/de/man1 -type l | xargs rm -f
@@ -220,7 +227,9 @@
 %files -f rpm.sharelist
 %defattr(-,root,root)
 %dir /etc/ghostscript
+%dir /etc/ghostscript/%{gs_dot_ver}
 %dir %{_datadir}/ghostscript
+%dir %{_datadir}/ghostscript/conf.d
 %dir %{_datadir}/ghostscript/%{gs_dot_ver}
 %dir %{_datadir}/ghostscript/%{gs_dot_ver}/lib
 %dir %{_datadir}/ghostscript/%{gs_dot_ver}/lib/cjkv
@@ -235,6 +244,7 @@
 %{_libdir}/%{name}/%{gs_dot_ver}
 /usr/lib/cups/filter/pstopxl
 %{_datadir}/cups/model/pxl*
+%config(noreplace) /etc/ghostscript/%{gs_dot_ver}/*
 
 %files gtk
 %defattr(-,root,root)
@@ -252,6 +262,9 @@
 %{_libdir}/libgs.so
 
 %changelog
+* Tue Apr  3 2007 Tim Waugh <twaugh at redhat.com> 8.15.4-2
+- Fixed configuration file locations (bug #233966).
+
 * Wed Mar 14 2007 Tim Waugh <twaugh at redhat.com> 8.15.4-1
 - 8.15.4.
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 13:48:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 09:48:50 -0400
Subject: rpms/control-center/devel
	control-center-2.18.0-ellipsize-sound-devices.patch, 1.1,
	1.2 control-center.spec, 1.239, 1.240
Message-ID: <200704031348.l33Dmo1k028901@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28863

Modified Files:
	control-center-2.18.0-ellipsize-sound-devices.patch 
	control-center.spec 
Log Message:
Fix a bug in the patch


control-center-2.18.0-ellipsize-sound-devices.patch:
 sound-properties-capplet.c |    1 +
 1 files changed, 1 insertion(+)

Index: control-center-2.18.0-ellipsize-sound-devices.patch
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center-2.18.0-ellipsize-sound-devices.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- control-center-2.18.0-ellipsize-sound-devices.patch	2 Apr 2007 22:42:29 -0000	1.1
+++ control-center-2.18.0-ellipsize-sound-devices.patch	3 Apr 2007 13:48:48 -0000	1.2
@@ -4,7 +4,7 @@
  	g_object_unref (G_OBJECT (model)); 
  
  	renderer = gtk_cell_renderer_text_new ();
-+        g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END);
++        g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
  	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (device_widget), renderer, TRUE);
  	gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (device_widget), renderer,
  			"text", MIXER_DEVICE_MODEL_NAME_COLUMN);


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- control-center.spec	2 Apr 2007 22:42:29 -0000	1.239
+++ control-center.spec	3 Apr 2007 13:48:48 -0000	1.240
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.18.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -323,6 +323,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-7
+- Fix a problem with the previous patch
+
 * Mon Apr  2 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-6
 - Ellipsize sound devices in the sound capplet
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 13:56:20 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 09:56:20 -0400
Subject: rpms/gcc/devel gcc41-java-bogus-debugline.patch,1.2,1.3
Message-ID: <200704031356.l33DuKCN029383@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	gcc41-java-bogus-debugline.patch 
Log Message:
4.1.2-8

gcc41-java-bogus-debugline.patch:
 0 files changed

Index: gcc41-java-bogus-debugline.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-java-bogus-debugline.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcc41-java-bogus-debugline.patch	3 Apr 2007 13:14:16 -0000	1.2
+++ gcc41-java-bogus-debugline.patch	3 Apr 2007 13:56:17 -0000	1.3
@@ -18,20 +18,19 @@
    CLASS_P (class_type) = 1;
 --- gcc/java/jcf-parse.c    (revision 122746)
 +++ gcc/java/jcf-parse.c    (working copy)
-@@ -1221,9 +1221,12 @@
-        main_input_filename = sfname;
+@@ -1221,9 +1221,12 @@ give_name_to_class (JCF *jcf, int i)
+ 	main_input_filename = sfname;
        }
  #else
 -      input_location = DECL_SOURCE_LOCATION (TYPE_NAME (this_class));
 -      if (main_input_filename == NULL && jcf == main_jcf)
--       main_input_filename = input_filename;
+-	main_input_filename = input_filename;
 +      if (! DECL_ARTIFICIAL (TYPE_NAME (this_class)))
-+       {
-+         input_location = DECL_SOURCE_LOCATION (TYPE_NAME (this_class));
-+         if (main_input_filename == NULL && jcf == main_jcf)
-+           main_input_filename = input_filename;
-+       }
++	{
++	  input_location = DECL_SOURCE_LOCATION (TYPE_NAME (this_class));
++	  if (main_input_filename == NULL && jcf == main_jcf)
++	    main_input_filename = input_filename;
++	}
  #endif
  
        jcf->cpool.data[i].t = this_class;
-



From fedora-cvs-commits at redhat.com  Tue Apr  3 14:18:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 10:18:26 -0400
Subject: rpms/samba/devel samba-3.0.24-enable_pam_nss_tests.patch, NONE,
	1.1 samba-3.0.24-nss_wins.patch, NONE, 1.1 samba.spec, 1.102, 1.103
Message-ID: <200704031418.l33EIQs2030435@cvs.devel.redhat.com>

Author: gdeschne

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30375

Modified Files:
	samba.spec 
Added Files:
	samba-3.0.24-enable_pam_nss_tests.patch 
	samba-3.0.24-nss_wins.patch 
Log Message:
- enable PAM and NSS dlopen checks during build
- fix unresolved symbols in libnss_wins.so (bug #198230)

Guenther



samba-3.0.24-enable_pam_nss_tests.patch:
 Makefile.in |   16 ++++++++++++++++
 1 files changed, 16 insertions(+)

--- NEW FILE samba-3.0.24-enable_pam_nss_tests.patch ---
--- source/Makefile.in
+++ source/Makefile.in
@@ -160,6 +160,8 @@
 
 PAM_MODULES = @PAM_MODULES@
 
+NSS_MODULES = @WINBIND_WINS_NSS@ @WINBIND_NSS@
+
 SCRIPTS = $(srcdir)/script/smbtar $(builddir)/script/findsmb
 
 VFS_MODULES = @VFS_MODULES@
@@ -769,6 +771,12 @@
 all : SHOWFLAGS proto_exists $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \
 	$(SHLIBS) $(MODULES) $(PAM_MODULES) @EXTRA_ALL_TARGETS@
 
+nss_modules : $(NSS_MODULES)
+
+libnss_winbind : SHOWFLAGS proto_exists nsswitch/libnss_winbind. at SHLIBEXT@
+
+libnss_wins : SHOWFLAGS proto_exists nsswitch/libnss_wins. at SHLIBEXT@
+
 pam_modules : $(PAM_MODULES)
 
 pam_smbpass : SHOWFLAGS proto_exists bin/pam_smbpass. at SHLIBEXT@
@@ -1736,6 +1744,14 @@
 ######################################################################
 # Samba Testing Framework
 
+# Check for NSS module problems. 
+test_nss_modules: nss_modules
+	@echo "Testing $(NSS_MODULES) "
+	@for module in $(NSS_MODULES); do \
+		./script/tests/dlopen.sh $${module} \
+			|| exit 1; \
+	done
+
 # Check for PAM module problems.  Specifically, check that every module we
 # built can actually be loaded by a minimal PAM-aware application.
 test_pam_modules: pam_modules

samba-3.0.24-nss_wins.patch:
 Makefile.in |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE samba-3.0.24-nss_wins.patch ---
Index: source/Makefile.in
===================================================================
--- source/Makefile.in.orig
+++ source/Makefile.in
@@ -687,7 +687,8 @@ PROTO_OBJ = $(SMBD_OBJ_MAIN) \
             $(RPC_NTSVCS_OBJ) utils/passwd_util.o
 
 WINBIND_WINS_NSS_OBJ = nsswitch/wins.o $(PARAM_OBJ) \
-	$(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ)
+	$(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ) \
+	$(SECRETS_OBJ)
 
 WINBIND_WINS_NSS_PICOBJS = $(WINBIND_WINS_NSS_OBJ:.o=. at PICSUFFIX@)
 
@@ -1231,7 +1232,7 @@ bin/winbindd at EXEEXT@: $(WINBINDD_OBJ) @B
 @WINBIND_WINS_NSS@: $(WINBIND_WINS_NSS_PICOBJS)
 	@echo "Linking $@"
 	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_PICOBJS) \
-		$(LDAP_LIBS) $(KRB5LIBS) \
+		$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) \
 		@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
 
 bin/pam_winbind. at SHLIBEXT@: $(PAM_WINBIND_OBJ:.o=. at PICSUFFIX@) bin/.dummy


Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- samba.spec	30 Mar 2007 19:39:40 -0000	1.102
+++ samba.spec	3 Apr 2007 14:18:24 -0000	1.103
@@ -4,7 +4,7 @@
 Name: samba
 Epoch: 0
 Version: 3.0.24
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.samba.org/
@@ -51,6 +51,8 @@
 Patch116: samba-3.0.24-arch_macro.patch
 Patch117: samba-3.0.24-pam_winbind-fixes.patch
 Patch118: samba-3.0.24-tar_options.patch
+Patch119: samba-3.0.24-enable_pam_nss_tests.patch
+Patch120: samba-3.0.24-nss_wins.patch
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
 Requires: pam >= 0:0.64 %{auth} 
@@ -175,6 +177,8 @@
 %patch116 -p0 -b .arch_macro
 %patch117 -p0 -b .pam_winbind
 %patch118 -p0 -b .tar_options
+%patch119 -p0 -b .pam_nss_test
+%patch120 -p0 -b .nss_wins
 
 # crap
 rm -f examples/VFS/.cvsignore
@@ -224,7 +228,7 @@
 	proto
 
 make  CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %{?_smp_mflags} \
-	all nsswitch/libnss_wins.so modules
+	all nsswitch/libnss_wins.so modules test_pam_modules test_nss_modules
 
 make  CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \
 	debug2html
@@ -627,6 +631,10 @@
 #%{_includedir}/libmsrpc.h
 
 %changelog
+* Tue Apr 03 2007 Guenther Deschner <gdeschner at redhat.com> 3.0.24-11.fc7
+- enable PAM and NSS dlopen checks during build
+- fix unresolved symbols in libnss_wins.so (bug #198230)
+
 * Fri Mar 30 2007 Simo Sorce <ssorce at redhat.com> 3.0.24-10.fc7
 - set passdb backend = tdbsam as default in smb.conf
 - remove samba-docs dependency from swat, that was a mistake



From fedora-cvs-commits at redhat.com  Tue Apr  3 14:34:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 10:34:50 -0400
Subject: rpms/gcc/devel gcc41-pr31187.patch,1.1,1.2
Message-ID: <200704031434.l33EYonI014386@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	gcc41-pr31187.patch 
Log Message:
4.1.2-8

gcc41-pr31187.patch:
 0 files changed

Index: gcc41-pr31187.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-pr31187.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-pr31187.patch	3 Apr 2007 13:14:16 -0000	1.1
+++ gcc41-pr31187.patch	3 Apr 2007 14:34:48 -0000	1.2
@@ -32,7 +32,7 @@
  bool
 --- gcc/cp/decl.c	(revision 123431)
 +++ gcc/cp/decl.c	(revision 123432)
-@@ -3797,6 +3797,7 @@ start_decl (const cp_declarator *declara
+@@ -3817,6 +3817,7 @@ start_decl (const cp_declarator *declara
    tree decl;
    tree type, tem;
    tree context;
@@ -40,7 +40,7 @@
  
    *pushed_scope_p = NULL_TREE;
  
-@@ -3951,6 +3952,8 @@ start_decl (const cp_declarator *declara
+@@ -3969,6 +3970,8 @@ start_decl (const cp_declarator *declara
  		 decl);
      }
  
@@ -49,9 +49,9 @@
    /* Enter this declaration into the symbol table.  */
    tem = maybe_push_decl (decl);
  
-@@ -3971,6 +3974,17 @@ start_decl (const cp_declarator *declara
-       && !have_global_bss_p ())
-     DECL_COMMON (tem) = 1;
+@@ -3988,6 +3991,17 @@ start_decl (const cp_declarator *declara
+ 		       && (flag_conserve_space || ! TREE_PUBLIC (tem)));
+ #endif
  
 +  if (TREE_CODE (tem) == VAR_DECL
 +      && DECL_NAMESPACE_SCOPE_P (tem) && !TREE_PUBLIC (tem) && !was_public
@@ -64,10 +64,10 @@
 +      DECL_THIS_STATIC (tem) = 1;
 +    }
 +
-   if (!processing_template_decl && TREE_CODE (tem) == VAR_DECL)
-     start_decl_1 (tem, initialized);
+   if (! processing_template_decl)
+     start_decl_1 (tem);
  
-@@ -5283,14 +5297,6 @@ cp_finish_decl (tree decl, tree init, bo
+@@ -5320,14 +5334,6 @@ cp_finish_decl (tree decl, tree init, bo
  	{
  	  layout_var_decl (decl);
  	  maybe_commonize_var (decl);



From fedora-cvs-commits at redhat.com  Tue Apr  3 15:12:12 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 11:12:12 -0400
Subject: rpms/gcc/devel gcc41-rh231818.patch,1.1,1.2
Message-ID: <200704031512.l33FCCtg010363@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	gcc41-rh231818.patch 
Log Message:
4.1.2-8

gcc41-rh231818.patch:
 gnu/java/awt/peer/gtk/CairoGraphics2D.java                      |    5 
 gnu/java/awt/peer/gtk/ComponentGraphics.java                    |    6 
 gnu/java/awt/peer/gtk/FreetypeGlyphVector.java                  |   80 +++++
 include/gnu_java_awt_peer_gtk_CairoGraphics2D.h                 |    2 
 include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h             |   10 
 native/jni/gtk-peer/gdkfont.h                                   |    2 
 native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c     |   31 +-
 native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c |  135 ++++++++--
 native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c         |    8 
 9 files changed, 228 insertions(+), 51 deletions(-)

Index: gcc41-rh231818.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-rh231818.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-rh231818.patch	3 Apr 2007 13:14:16 -0000	1.1
+++ gcc41-rh231818.patch	3 Apr 2007 15:12:10 -0000	1.2
@@ -58,16 +58,16 @@
 
 --- libjava/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java	16 Mar 2007 15:14:53 -0000	1.67
 +++ libjava/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java	2 Apr 2007 19:39:26 -0000	1.68
-@@ -402,7 +402,7 @@ public abstract class CairoGraphics2D ex
+@@ -392,7 +392,7 @@ public abstract class CairoGraphics2D ex
     */
-   protected native void cairoDrawGlyphVector(long pointer, GdkFontPeer font, 
+   native void cairoDrawGlyphVector(long pointer, GdkFontPeer font, 
                                     float x, float y, int n, 
 -                                   int[] codes, float[] positions);
 +                                   int[] codes, float[] positions, long[] fontset);
  
    /**
     * Set the font in cairo.
-@@ -1730,6 +1730,7 @@ public abstract class CairoGraphics2D ex
+@@ -1676,6 +1676,7 @@ public abstract class CairoGraphics2D ex
        {
          int n = gv.getNumGlyphs ();
          int[] codes = gv.getGlyphCodes (0, n, null);
@@ -75,28 +75,28 @@
          float[] positions = gv.getGlyphPositions (0, n, null);
  
          setFont (gv.getFont ());
-@@ -1737,7 +1738,7 @@ public abstract class CairoGraphics2D ex
-         synchronized (fontPeer) 
-           { 
-             cairoDrawGlyphVector(nativePointer, fontPeer,
--                                 x, y, n, codes, positions);
-+                                 x, y, n, codes, positions, fontset);
-           }
+@@ -1683,7 +1684,7 @@ public abstract class CairoGraphics2D ex
+ 	synchronized (fontPeer) 
+ 	  { 
+ 	    cairoDrawGlyphVector(nativePointer, fontPeer,
+-				 x, y, n, codes, positions);
++				 x, y, n, codes, positions, fontset);
+ 	  }
        }
      else
 --- libjava/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java	16 Mar 2007 15:14:53 -0000	1.25
 +++ libjava/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java	2 Apr 2007 19:39:26 -0000	1.26
-@@ -121,7 +121,7 @@ public class ComponentGraphics extends C
-    */
+@@ -114,7 +114,7 @@ public class ComponentGraphics extends C
+ 
    private void lock()
    {
 -    Integer i = (Integer) hasLock.get();
 +    Integer i = hasLock.get();
      if (i == null)
        {
-         start_gdk_drawing();
-@@ -136,7 +136,7 @@ public class ComponentGraphics extends C
-    */
+ 	start_gdk_drawing();
+@@ -126,7 +126,7 @@ public class ComponentGraphics extends C
+ 
    private void unlock()
    {
 -    Integer i = (Integer) hasLock.get();
@@ -104,32 +104,15 @@
      if (i == null)
        throw new IllegalStateException();
      if (i == ONE)
-@@ -144,6 +144,8 @@ public class ComponentGraphics extends C
-         hasLock.set(null);
-         end_gdk_drawing();
+@@ -134,6 +134,8 @@ public class ComponentGraphics extends C
+ 	hasLock.set(null);
+ 	end_gdk_drawing();
        }
 +    else if (i.intValue() == 2)
 +      hasLock.set(ONE);
      else
        hasLock.set(Integer.valueOf(i.intValue() - 1));
    }
-@@ -744,12 +746,14 @@ public class ComponentGraphics extends C
-   @Override
-   protected void cairoDrawGlyphVector(long pointer, GdkFontPeer font,
-                                       float x, float y, int n,
--                                      int[] codes, float[] positions)
-+                                      int[] codes, float[] positions,
-+                                      long[] fontset)
-   {
-     try
-     {
-       lock();
--      super.cairoDrawGlyphVector(pointer, font, x, y, n, codes, positions);
-+      super.cairoDrawGlyphVector(pointer, font, x, y, n, codes, positions,
-+                                 fontset);
-     }
-     finally
-     {
 --- libjava/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java	6 Mar 2007 19:38:31 -0000	1.16
 +++ libjava/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java	2 Apr 2007 21:28:58 -0000	1.18
 @@ -79,6 +79,11 @@ public class FreetypeGlyphVector extends
@@ -283,26 +266,26 @@
  
      for(int i = 0; i < nGlyphs; i++)
        {
--        GlyphMetrics gm = (GlyphMetrics)
--        peer.getGlyphMetrics( glyphCodes[ i ] );
-+        GlyphMetrics gm = (GlyphMetrics)peer.getGlyphMetrics(glyphCodes[i]);
-         if( gm == null )
-           {
--            double[] val = getMetricsNative( glyphCodes[ i ] );
-+            double[] val = getMetricsNative(glyphCodes[i], fontSet[i]);
-             if( val == null )
-               gm = null;
-             else
-@@ -376,7 +431,8 @@ public class FreetypeGlyphVector extends
+-	GlyphMetrics gm = (GlyphMetrics)
+-	  peer.getGlyphMetrics( glyphCodes[ i ] );
++	GlyphMetrics gm = (GlyphMetrics)peer.getGlyphMetrics(glyphCodes[i]);
+ 	if( gm == null )
+ 	  {
+-	    double[] val = getMetricsNative( glyphCodes[ i ] );
++	    double[] val = getMetricsNative(glyphCodes[i], fontSet[i]);
+ 	    if( val == null )
+ 	      gm = null;
+ 	    else
+@@ -374,7 +429,8 @@ public class FreetypeGlyphVector extends
     */
    public Shape getGlyphOutline(int glyphIndex)
    {
 -    GeneralPath gp = getGlyphOutlineNative( glyphCodes[ glyphIndex ] );
 +    GeneralPath gp = getGlyphOutlineNative(glyphCodes[glyphIndex],
-+                                           fontSet[glyphIndex]);
++					   fontSet[glyphIndex]);
+     if (glyphTransforms[glyphIndex] != null)
+       gp.transform( glyphTransforms[glyphIndex]);
      
-     AffineTransform tx = AffineTransform.getTranslateInstance(glyphPositions[glyphIndex*2],
-                                                               glyphPositions[glyphIndex*2+1]);
 --- libjava/classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h	16 Mar 2007 15:14:53 -0000	1.17
 +++ libjava/classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h	2 Apr 2007 19:39:26 -0000	1.18
 @@ -22,7 +22,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt



From fedora-cvs-commits at redhat.com  Tue Apr  3 15:18:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 11:18:42 -0400
Subject: rpms/tzdata/devel .cvsignore, 1.34, 1.35 sources, 1.36,
	1.37 tzdata.spec, 1.45, 1.46
Message-ID: <200704031518.l33FIgSk015491@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/tzdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12558

Modified Files:
	.cvsignore sources tzdata.spec 
Log Message:
Honduras & Syria made their minds.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tzdata/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	21 Mar 2007 13:17:38 -0000	1.34
+++ .cvsignore	3 Apr 2007 15:18:40 -0000	1.35
@@ -1,3 +1,3 @@
-tzcode2007d.tar.gz
-tzdata2007d.tar.gz
+tzcode2007e.tar.gz
+tzdata2007e.tar.gz
 tzdata-base-0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tzdata/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	21 Mar 2007 13:17:38 -0000	1.36
+++ sources	3 Apr 2007 15:18:40 -0000	1.37
@@ -1,3 +1,3 @@
-f63d242016ce0da0bafc0867e2824ad9  tzcode2007d.tar.gz
-05ba08b08c773cd26b74a94205bf397f  tzdata2007d.tar.gz
+4ac16fb9de55c6e8e4c86b4e3613fbcf  tzcode2007e.tar.gz
+b74e5f71714e5222340f1fb30da30a76  tzdata2007e.tar.gz
 906a4c98cc5240f416524a256b039c42  tzdata-base-0.tar.bz2


Index: tzdata.spec
===================================================================
RCS file: /cvs/dist/rpms/tzdata/devel/tzdata.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- tzdata.spec	21 Mar 2007 13:17:38 -0000	1.45
+++ tzdata.spec	3 Apr 2007 15:18:40 -0000	1.46
@@ -1,6 +1,6 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2007d
+Version: 2007e
 %define tzdata_version %{version}
 %define tzcode_version %{version}
 Release: 1%{?dist}
@@ -55,6 +55,11 @@
 %doc tzcode%{tzcode_version}/tz-link.html
 
 %changelog
+* Tue Apr  3 2007 Petr Machata <pmachata at redhat.com> - 2007e-1
+- Upstream 2007e
+  - Syria switched to summer time at Mar/29.
+  - Honduras will not enter DST this year.
+
 * Wed Mar 21 2007 Petr Machata <pmachata at redhat.com> - 2007d-1
 - Upstream 2007d
   - Mongolia has abolished DST.



From fedora-cvs-commits at redhat.com  Tue Apr  3 15:24:22 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 11:24:22 -0400
Subject: rpms/gcc/devel gcc41-rh234515.patch,1.1,1.2
Message-ID: <200704031524.l33FOMaE019696@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	gcc41-rh234515.patch 
Log Message:
4.1.2-8

gcc41-rh234515.patch:
 0 files changed

Index: gcc41-rh234515.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-rh234515.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-rh234515.patch	3 Apr 2007 13:14:16 -0000	1.1
+++ gcc41-rh234515.patch	3 Apr 2007 15:24:15 -0000	1.2
@@ -7,15 +7,15 @@
 
 --- libstdc++-v3/include/bits/deque.tcc	(revision 121146)
 +++ libstdc++-v3/include/bits/deque.tcc	(revision 121147)
-@@ -143,7 +143,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GL
- 	{
+@@ -142,7 +142,7 @@ namespace _GLIBCXX_STD
  	  const difference_type __n = __last - __first;
- 	  const difference_type __elems_before = __first - begin();
+ 	  const difference_type __elems_before = (__first
+ 						  - this->_M_impl._M_start);
 -	  if (static_cast<size_type>(__elems_before) < (size() - __n) / 2)
 +	  if (static_cast<size_type>(__elems_before) <= (size() - __n) / 2)
  	    {
- 	      if (__first != begin())
- 		std::copy_backward(begin(), __first, __last);
+ 	      std::copy_backward(this->_M_impl._M_start, __first, __last);
+ 	      iterator __new_start = this->_M_impl._M_start + __n;
 --- libstdc++-v3/testsuite/23_containers/deque/modifiers/erase/3.cc	(revision 0)
 +++ libstdc++-v3/testsuite/23_containers/deque/modifiers/erase/3.cc	(revision 121147)
 @@ -0,0 +1,52 @@



From fedora-cvs-commits at redhat.com  Tue Apr  3 15:38:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 11:38:36 -0400
Subject: rpms/rhgb/devel .cvsignore, 1.22, 1.23 rhgb.spec, 1.69, 1.70 sources,
	1.23, 1.24
Message-ID: <200704031538.l33FcadI023674@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/rhgb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23658

Modified Files:
	.cvsignore rhgb.spec sources 
Log Message:
- Fix some descriptions. Patch by Baris Cicek <baris at nerd.com.tr>
  bug 143954



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	21 Mar 2007 14:59:14 -0000	1.22
+++ .cvsignore	3 Apr 2007 15:38:34 -0000	1.23
@@ -1 +1 @@
-rhgb-0.17.3.tar.gz
+rhgb-0.17.4.tar.gz


Index: rhgb.spec
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/rhgb.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- rhgb.spec	2 Apr 2007 13:32:31 -0000	1.69
+++ rhgb.spec	3 Apr 2007 15:38:34 -0000	1.70
@@ -2,7 +2,7 @@
 
 Summary: Red Hat Graphical Boot
 Name: rhgb
-Version: 0.17.3
+Version: 0.17.4
 Release: 1%{?dist}
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
@@ -50,6 +50,10 @@
 %dir %{_sysconfdir}/rhgb/temp
 
 %changelog
+* Tue Apr  3 2007 Ray Strode <rstrode at redhat.com> - 0.17.4-1
+- Fix some descriptions. Patch by Baris Cicek <baris at nerd.com.tr>
+  bug 143954
+
 * Wed Mar 21 2007 Matthias Clasen  <mclasen at redhat.com> - 0.17.3-1
 - Fix some more small color issues
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	21 Mar 2007 14:59:14 -0000	1.23
+++ sources	3 Apr 2007 15:38:34 -0000	1.24
@@ -1 +1 @@
-849b0a5155411eeed985b7dd82f6d4e1  rhgb-0.17.3.tar.gz
+32d699eb360ff39fe82ff562c6ba7fe8  rhgb-0.17.4.tar.gz



From fedora-cvs-commits at redhat.com  Tue Apr  3 15:44:06 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 11:44:06 -0400
Subject: rpms/xsane/devel .cvsignore, 1.15, 1.16 sources, 1.15,
	1.16 xsane.spec, 1.45, 1.46
Message-ID: <200704031544.l33Fi61S024050@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore sources xsane.spec 
Log Message:
version 0.994 (#235038)
Resolves: #235038



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xsane/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	2 Mar 2007 14:19:13 -0000	1.15
+++ .cvsignore	3 Apr 2007 15:44:04 -0000	1.16
@@ -1 +1 @@
-xsane-0.993.tar.gz
+xsane-0.994.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xsane/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	2 Mar 2007 14:19:13 -0000	1.15
+++ sources	3 Apr 2007 15:44:04 -0000	1.16
@@ -1 +1 @@
-7e6b14ce674cdd95fa3d3afe6fee0a11  xsane-0.993.tar.gz
+7d02656026797a46a84bda63006f5668  xsane-0.994.tar.gz


Index: xsane.spec
===================================================================
RCS file: /cvs/dist/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- xsane.spec	30 Mar 2007 15:30:59 -0000	1.45
+++ xsane.spec	3 Apr 2007 15:44:04 -0000	1.46
@@ -2,8 +2,8 @@
 
 Name: xsane
 Summary: X Window System front-end for the SANE scanner interface
-Version: 0.993
-Release: 2%{?dist}
+Version: 0.994
+Release: 1%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane.desktop
 Source2: xsane.conf.in
@@ -116,6 +116,9 @@
 fi
 
 %changelog
+* Tue Apr 03 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-1
+- version 0.994 (#235038)
+
 * Fri Mar 30 2007 Nils Philippsen <nphilipp at redhat.com> - 0.993-2
 - fix summaries and buildroot, don't remove buildroot on %%prep, mark dirs and
   config files, don't reference %%buildroot in %%build, use double-%% in



From fedora-cvs-commits at redhat.com  Tue Apr  3 15:44:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 11:44:18 -0400
Subject: rpms/autofs/devel autofs-5.0.1-null-domain-fix.patch, NONE,
	1.1 autofs.spec, 1.197, 1.198
Message-ID: <200704031544.l33FiIGG024112@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-null-domain-fix.patch 
Log Message:
* Tue Apr 3 2007 Ian Kent <ikent at redhat.com> - 5.0.1-7
- fix "null" domain netgroup match for "-hosts" map.


autofs-5.0.1-null-domain-fix.patch:
 rpc_subs.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE autofs-5.0.1-null-domain-fix.patch ---
diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c
index 5151a1e..831d456 100644
--- a/lib/rpc_subs.c
+++ b/lib/rpc_subs.c
@@ -52,7 +52,7 @@
 /* Get numeric value of the n bits starting at position p */
 #define getbits(x, p, n)      ((x >> (p + 1 - n)) & ~(~0 << n))
 
-static char *ypdomain = NULL;
+static char *domain = NULL;
 
 inline void dump_core(void);
 static pthread_mutex_t networks_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -946,8 +946,8 @@ static int name_match(const char *name, const char *pattern)
 	else {
 		ret = !memcmp(name, pattern, strlen(pattern));
 		/* Name could still be a netgroup (Solaris) */
-		if (!ret && ypdomain)
-			ret = innetgr(pattern, name, NULL, ypdomain);
+		if (!ret)
+			ret = innetgr(pattern, name, NULL, domain);
 	}
 
 	return ret;
@@ -1228,8 +1228,8 @@ static int host_match(char *pattern)
 	if (gethostname(myname, MAXHOSTNAMELEN))
 		return 0;
 
-	if (yp_get_default_domain(&ypdomain))
-		ypdomain = NULL;
+	if (yp_get_default_domain(&domain))
+		domain = NULL;
 
 	if (*m_pattern == '@') {
 		/*
@@ -1237,8 +1237,8 @@ static int host_match(char *pattern)
 		 * spec or it's a netgroup.
 		 */
 		ret = match_network(m_pattern + 1);
-		if (!ret && ypdomain)
-			ret = innetgr(m_pattern + 1, myname, NULL, ypdomain);
+		if (!ret)
+			ret = innetgr(m_pattern + 1, myname, NULL, domain);
 	} else if (*m_pattern == '.') {
 		size_t m_len = strlen(m_pattern);
 		char *has_dot = strchr(myname, '.');


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- autofs.spec	29 Mar 2007 07:31:59 -0000	1.197
+++ autofs.spec	3 Apr 2007 15:44:16 -0000	1.198
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.1
-Release: 6
+Release: 7
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
@@ -21,6 +21,7 @@
 Patch9: autofs-5.0.1-bad-cast.patch
 Patch10: autofs-5.0.1-fix-browse-dir-create.patch
 Patch11: autofs-5.0.1-map-update-source-only.patch
+Patch12: autofs-5.0.1-null-domain-fix.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Conflicts: kernel < 2.6.17
@@ -73,6 +74,7 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -125,6 +127,9 @@
 %{_libdir}/autofs/
 
 %changelog
+* Tue Apr 3 2007 Ian Kent <ikent at redhat.com> - 5.0.1-7
+- fix "null" domain netgroup match for "-hosts" map.
+
 * Fri Mar 29 2007 Ian Kent <ikent at redhat.com> - 5.0.1-6
 - fix directory creation for browse mounts.
 - fix wildcard map handling and improve nsswitch source map update.



From fedora-cvs-commits at redhat.com  Tue Apr  3 15:56:35 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 11:56:35 -0400
Subject: rpms/xsane/FC-6 .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 xsane.spec, 1.42, 1.43
Message-ID: <200704031556.l33FuZ3j024466@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore sources xsane.spec 
Log Message:
version 0.994 (#235038)
fix summaries and buildroot, don't remove buildroot on %prep, mark dirs and config files, don't reference %buildroot in %build, use double-% in changelog entries (#226658)
Resolves: #226658, #235038



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xsane/FC-6/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	28 Aug 2006 07:06:05 -0000	1.14
+++ .cvsignore	3 Apr 2007 15:56:33 -0000	1.15
@@ -1 +1 @@
-xsane-0.991.tar.gz
+xsane-0.994.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xsane/FC-6/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	28 Aug 2006 07:06:05 -0000	1.14
+++ sources	3 Apr 2007 15:56:33 -0000	1.15
@@ -1 +1 @@
-cded872f2e7041f4a0f2dc4f0bbc5a77  xsane-0.991.tar.gz
+7d02656026797a46a84bda63006f5668  xsane-0.994.tar.gz


Index: xsane.spec
===================================================================
RCS file: /cvs/dist/rpms/xsane/FC-6/xsane.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- xsane.spec	25 Oct 2006 06:37:14 -0000	1.42
+++ xsane.spec	3 Apr 2007 15:56:33 -0000	1.43
@@ -1,9 +1,9 @@
 %define desktop_vendor fedora
 
 Name: xsane
-Summary: An X Window System front-end for the SANE scanner interface.
-Version: 0.991
-Release: 4%{?dist}
+Summary: X Window System front-end for the SANE scanner interface
+Version: 0.994
+Release: 1%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane.desktop
 Source2: xsane.conf.in
@@ -13,7 +13,7 @@
 License: GPL
 URL: http://www.xsane.org/
 Group: Applications/Multimedia
-Buildroot: %{_tmppath}/%{name}-buildroot
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
 BuildRequires: sane-backends-devel gimp-devel libpng-devel libjpeg-devel
 BuildRequires: desktop-file-utils >= 0.2.92
 BuildRequires: libtiff-devel
@@ -30,7 +30,7 @@
 performing the scan and then manipulating the captured image.
 
 %package gimp
-Summary: A GIMP plug-in which provides the SANE scanner interface.
+Summary: GIMP plug-in providing the SANE scanner interface
 Group: Applications/Multimedia
 Requires(post): gimp >= 2:2.2.12-4
 Requires(preun): gimp >= 2:2.2.12-4
@@ -41,7 +41,6 @@
 installed to use this package.
 
 %prep
-rm -rf %{buildroot}
 %setup -q
 %patch0 -p1 -b .htmlview
 %patch1 -p1 -b .medium-definitions
@@ -51,7 +50,7 @@
 %{expand:%%define optflags %{optflags} -DGIMP_ENABLE_COMPAT_CRUFT=1}
 aclocal -I m4
 autoconf
-%configure --with-install-root=%{buildroot}
+%configure
 make LDFLAGS=
 
 mv src/xsane src/xsane-gimp
@@ -59,7 +58,7 @@
 sed -e 's|@BINDIR@|%{_bindir}|g' < "%{SOURCE2}" > xsane.conf
 
 make clean
-%configure --with-install-root=%{buildroot} --disable-gimp
+%configure --disable-gimp
 make LDFLAGS=
 
 %install
@@ -100,9 +99,9 @@
 %dir %{_datadir}/sane
 %dir %{_datadir}/sane/xsane
 %{_datadir}/sane/xsane/*eula*
-%{_sysconfdir}/gimp
-%{_sysconfdir}/gimp/plugins.d
-%config %{_sysconfdir}/gimp/plugins.d/xsane.conf
+%dir %{_sysconfdir}/gimp
+%dir %{_sysconfdir}/gimp/plugins.d
+%config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf
 
 %post gimp
 if [ -x "%{_sbindir}/gimp-plugin-mgr" ]; then
@@ -117,6 +116,17 @@
 fi
 
 %changelog
+* Tue Apr 03 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-1
+- version 0.994 (#235038)
+
+* Fri Mar 30 2007 Nils Philippsen <nphilipp at redhat.com> - 0.993-2
+- fix summaries and buildroot, don't remove buildroot on %%prep, mark dirs and
+  config files, don't reference %%buildroot in %%build, use double-%% in
+  changelog entries (#226658)
+
+* Fri Mar 02 2007 Nils Philippsen <nphilipp at redhat.com> - 0.993-1
+- version 0.993 (#230706)
+
 * Wed Oct 25 2006 Nils Philippsen <nphilipp at redhat.com> - 0.991-4
 - fix typo in scriptlet (#212063)
 
@@ -372,7 +382,7 @@
 
 * Mon Jul 26 1999 Tim Powers <timp at redhat.com>
 - update to 0.30
-- added %defattr
+- added %%defattr
 - built for 6.1
 
 * Thu Apr 22 1999 Preston Brown <pbrown at redhat.com>



From fedora-cvs-commits at redhat.com  Tue Apr  3 15:58:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 11:58:36 -0400
Subject: rpms/kernel/devel Makefile, 1.45, 1.45.8.1 kernel-2.6.spec, 1.3040,
	1.3040.2.1 linux-2.6-build-nonintconfig.patch, 1.6, 1.6.72.1
Message-ID: <200704031558.l33FwacM024554@cvs.devel.redhat.com>

Author: jwilson

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

Modified Files:
      Tag: private-jw-vanilla-branch
	Makefile kernel-2.6.spec linux-2.6-build-nonintconfig.patch 
Log Message:
Here's hoping I did this private branch thing right... Committing changes to support --with vanilla build option to produce unpatched builds


Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile,v
retrieving revision 1.45
retrieving revision 1.45.8.1
diff -u -r1.45 -r1.45.8.1
--- Makefile	19 Mar 2007 21:32:30 -0000	1.45
+++ Makefile	3 Apr 2007 15:58:33 -0000	1.45.8.1
@@ -66,5 +66,30 @@
 	@VERSION="2.6.20" make -f Makefile.config configs
 	@scripts/reconfig.sh
 
+P_BRANCH := private-$(PRIVATE)-branch
+P_TAG := $(shell echo $(PRIVATE) | sed s/-/_/g)
+P_BASE := $(shell test -n "$(BASE)" && echo "-r $(BASE)")
+
+private:
+	@if [ -z "$(PRIVATE)" ]; then \
+		echo "Please specify a PRIVATE branch name"; \
+		echo "To create a 'private-bz1234-branch' cvs branch"; \
+		echo -e "\tmake PRIVATE=bz1234 private (branch off working directory)"; \
+		echo -e "\tmake PRIVATE=bz1234 BASE=kernel-2_6_18-8_el5" \
+		"private (branch off revision kernel-2_6_18-8_el5)"; \
+		exit 1; \
+	fi;
+	@if [ -z "$$(cvs log -h Makefile | grep $(P_BRANCH))" ]; then \
+		cvs tag $(P_BASE) -b $(P_BRANCH); \
+	fi;
+	@cvs update -dr $(P_BRANCH)
+	@if [ ! "$$(grep $(P_TAG) $(SPECFILE))" ]; then \
+		sed -ie 's/\(#% define buildid.*\).*/%define buildid '"$(P_TAG)"'.1/g' \
+		$(SPECFILE); \
+	fi;
+
+update:
+	@cvs update -PAd
+
 # since i386 isn't a target...
 compile compile-short: DIST_DEFINES += --target $(shell uname -m)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3040
retrieving revision 1.3040.2.1
diff -u -r1.3040 -r1.3040.2.1
--- kernel-2.6.spec	2 Apr 2007 19:39:38 -0000	1.3040
+++ kernel-2.6.spec	3 Apr 2007 15:58:33 -0000	1.3040.2.1
@@ -49,6 +49,10 @@
 # See also 'make debug' and 'make release'.
 %define debugbuildsenabled 0
 
+# Want to build a vanilla kernel build without any non-upstream patches?
+# (well, almost none, we need a few for build purposes). Default to 0 (off).
+%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
+
 # Versions of various parts
 
 # Polite request for people who spin their own kernel rpms:
@@ -60,7 +64,15 @@
 %define sublevel 20
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}%{?buildid}
+%define specrelease %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}%{?buildid}
+%define release %{specrelease}
+# Set upstream kernel sublevel, -rcX and -gitY levels here
+# For rawhide, usually the forthcoming kernel's sublevel, for a stable
+# release, likely something like 20.5 for kernel 2.6.20.5
+# Comment out rcrev and gitrev as needed
+%define uksublevel 21
+%define rcrev 5
+%define gitrev 9
 
 %define make_target bzImage
 %define kernel_image x86
@@ -91,6 +103,23 @@
 %define with_debug 0
 %endif
 
+# if vanilla build...
+%if %{with_vanilla}
+%{?rcrev: %define rctag _rc%rcrev}
+%{?gitrev: %define gittag _git%gitrev}
+%define ukver 2.6.%{uksublevel}%{?rctag}%{?gittag}
+%define includexen 0
+%define with_xen 0
+%define with_modsign 0
+# Ignore unknown options in our config-* files.
+# Some options go with patches we're not applying.
+%define oldconfig_target loose_nonint_oldconfig
+# Put upstream kernel version in release
+%define release 0.%{specrelease}.%{ukver}
+%else
+%define oldconfig_target nonint_oldconfig
+%endif
+
 # don't build xen or kdump kernels for OLPC
 %if 0%{?olpc}
 %define with_xen 0
@@ -373,8 +402,8 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.21-rc5.bz2
-Patch2: patch-2.6.21-rc5-git9.bz2
+Patch1: patch-2.6.%{uksublevel}-rc%{rcrev}.bz2
+Patch2: patch-2.6.%{uksublevel}-rc%{rcrev}-git%{gitrev}.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -941,7 +970,7 @@
 if [ ! -d kernel-%{kversion}/vanilla ]; then
   # Ok, first time we do a make prep.
   rm -f pax_global_header
-%setup -q -n %{name}-%{version} -c
+%setup -q -n %{name}-%{kversion} -c
   mv linux-%{kversion} vanilla
 else
   # We already have a vanilla dir.
@@ -963,6 +992,7 @@
 %patch1 -p1
 %patch2 -p1
 
+%if !%{with_vanilla}
 # Patches 10 through 100 are meant for core subsystem upgrades
 
 # Roland's utrace ptrace replacement.
@@ -1057,12 +1087,14 @@
 # and patches related to how RPMs are build
 #
 
+%endif
 
 # This patch adds a "make nonint_oldconfig" which is non-interactive and
 # also gives a list of missing options at the end. Useful for automated
 # builds (as used in the buildsystem).
 %patch800 -p1
 
+%if !%{with_vanilla}
 # Exec shield
 %patch810 -p1
 
@@ -1280,6 +1312,7 @@
 %patch10001 -p1
 
 # END OF PATCH APPLICATIONS
+%endif
 
 cp %{SOURCE10} Documentation/
 
@@ -1302,7 +1335,7 @@
 
 %if 0%{?debugbuildsenabled}
 %else
-rm -f kernel-%kversion}-*-debug.config
+rm -f kernel-%{kversion}-*-debug.config
 %endif
 
 # now run oldconfig over all the config files
@@ -1310,7 +1343,7 @@
 do
   mv $i .config
   Arch=`head -1 .config | cut -b 3-`
-  make ARCH=$Arch nonint_oldconfig > /dev/null
+  make ARCH=$Arch %{oldconfig_target} > /dev/null
   echo "# $Arch" > configs/$i
   cat .config >> configs/$i
 done
@@ -1318,8 +1351,10 @@
 # make sure the kernel has the sublevel we know it has. This looks weird
 # but for -pre and -rc versions we need it since we only want to use
 # the higher version when the final kernel is released.
+%if !%{with_vanilla}
 perl -p -i -e "s/^SUBLEVEL.*/SUBLEVEL = %{sublevel}/" Makefile
 perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -prep/" Makefile
+%endif
 
 # get rid of unwanted files resulting from patch fuzz
 find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null
@@ -1328,7 +1363,7 @@
 
 # unpack sparse.
 if [ ! -d sparse-%{sparsever} ] ; then
-%setup -D -T -q -a 3
+%setup -D -T -q -n %{name}-%{kversion} -a3
 fi
 
 # Unpack the Xen tarball.
@@ -1337,7 +1372,7 @@
 if [ -d xen ]; then
   rm -rf xen
 fi
-%setup -D -T -q -n %{name}-%{version} -a1
+%setup -D -T -q -n %{name}-%{kversion} -a1
 cd xen
 # Any necessary hypervisor patches go here
 %patch20000 -p1
@@ -1386,7 +1421,7 @@
       DevelLink=
     fi
 
-    KernelVer=%{version}-%{release}$Flavour
+    KernelVer=%{kversion}-%{release}$Flavour
     echo BUILDING A KERNEL FOR $Flavour %{_target_cpu}...
 
     # make sure EXTRAVERSION says what we want it to say
@@ -1404,7 +1439,7 @@
        KernelImage=arch/$Arch/boot/bzImage
     fi
 
-    make -s ARCH=$Arch nonint_oldconfig > /dev/null
+    make -s ARCH=$Arch %{oldconfig_target} > /dev/null
     make -s ARCH=$Arch %{?_smp_mflags} $MakeTarget %{?sparse_mflags}
     make -s ARCH=$Arch %{?_smp_mflags} modules %{?sparse_mflags} || exit 1
 
@@ -1652,10 +1687,10 @@
 %global __debug_package 1
 %files debuginfo-common
 %defattr(-,root,root)
-/usr/src/debug/%{name}-%{version}/linux-%{kversion}.%{_target_cpu}
+/usr/src/debug/%{name}-%{kversion}/linux-%{kversion}.%{_target_cpu}
 %if %{includexen}
 %if %{with_xen}
-/usr/src/debug/%{name}-%{version}/xen
+/usr/src/debug/%{name}-%{kversion}/xen
 %endif
 %endif
 %dir /usr/src/debug

linux-2.6-build-nonintconfig.patch:
 Makefile |    5 +++++
 conf.c   |   34 ++++++++++++++++++++++++++++++++--
 2 files changed, 37 insertions(+), 2 deletions(-)

Index: linux-2.6-build-nonintconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-build-nonintconfig.patch,v
retrieving revision 1.6
retrieving revision 1.6.72.1
diff -u -r1.6 -r1.6.72.1
--- linux-2.6-build-nonintconfig.patch	27 Jun 2006 00:39:13 -0000	1.6
+++ linux-2.6-build-nonintconfig.patch	3 Apr 2007 15:58:33 -0000	1.6.72.1
@@ -1,15 +1,29 @@
-diff -urNp --exclude-from=/home/davej/.exclude linux-600/scripts/kconfig/conf.c linux-800/scripts/kconfig/conf.c
---- linux-600/scripts/kconfig/conf.c
-+++ linux-800/scripts/kconfig/conf.c
-@@ -20,6 +20,7 @@ enum {
+--- linux-2.6.17/scripts/kconfig/Makefile.nonintconfig
++++ linux-2.6.17/scripts/kconfig/Makefile
+@@ -23,6 +23,11 @@ oldconfig: $(obj)/conf
+ silentoldconfig: $(obj)/conf
+ 	$< -s arch/$(ARCH)/Kconfig
+ 
++nonint_oldconfig: $(obj)/conf
++	$< -b arch/$(ARCH)/Kconfig
++loose_nonint_oldconfig: $(obj)/conf
++	$< -B arch/$(ARCH)/Kconfig
++
+ update-po-config: $(obj)/kxgettext
+ 	xgettext --default-domain=linux \
+           --add-comments --keyword=_ --keyword=N_ \
+--- linux-2.6.17/scripts/kconfig/conf.c.nonintconfig
++++ linux-2.6.17/scripts/kconfig/conf.c
+@@ -21,6 +21,8 @@ enum {
  	ask_all,
  	ask_new,
  	ask_silent,
 +	dont_ask,
++	dont_ask_dont_tell,
  	set_default,
  	set_yes,
  	set_mod,
-@@ -37,6 +37,8 @@ static struct menu *rootEntry;
+@@ -37,6 +39,8 @@ static struct menu *rootEntry;
  
  static char nohelp_text[] = N_("Sorry, no help available for this option yet.\n");
  
@@ -18,7 +32,7 @@
  static void strip(char *str)
  {
  	char *p = str;
-@@ -93,6 +96,12 @@ static void conf_askvalue(struct symbol 
+@@ -103,6 +107,14 @@ static void conf_askvalue(struct symbol 
  		fflush(stdout);
  		fgets(line, 128, stdin);
  		return;
@@ -27,114 +41,71 @@
 +			fprintf(stderr,"CONFIG_%s\n",sym->name);
 +			return_value++;
 +		}
++		/*FALLTHROUGH*/
++	case dont_ask_dont_tell:
 +		return;
  	case set_default:
  		printf("%s\n", def);
  		return;
-@@ -337,6 +346,10 @@ static int conf_choice(struct menu *menu
+@@ -346,6 +358,11 @@ static int conf_choice(struct menu *menu
  			printf("?");
  		printf("]: ");
  		switch (input_mode) {
 +		case dont_ask:
++		case dont_ask_dont_tell:
 +			cnt = def;
 +			printf("%d\n", cnt);
 +			break;
  		case ask_new:
  		case ask_silent:
  			if (!is_new) {
-@@ -472,7 +485,10 @@ static void check_conf(struct menu *menu
+@@ -482,6 +499,10 @@ static void check_conf(struct menu *menu
  			if (!conf_cnt++)
- 				printf("*\n* Restart config...\n*\n");
+ 				printf(_("*\n* Restart config...\n*\n"));
  			rootEntry = menu_get_parent_menu(menu);
--			conf(rootEntry);
-+			if (input_mode == dont_ask)
++			if (input_mode == dont_ask
++			    || input_mode == dont_ask_dont_tell)
 +				fprintf(stderr,"CONFIG_%s\n",sym->name);
 +			else
-+				conf(rootEntry);
+ 			conf(rootEntry);
  		}
- 		if (sym_is_choice(sym) && sym_get_tristate_value(sym) != mod)
- 			return;
-@@ -493,6 +509,9 @@ int main(int ac, char **av)
+ 	}
+@@ -501,6 +522,12 @@ int main(int ac, char **av)
  		case 'o':
  			input_mode = ask_new;
  			break;
 +		case 'b':
 +			input_mode = dont_ask;
 +			break;
++		case 'B':
++			input_mode = dont_ask_dont_tell;
++			break;
  		case 's':
  			input_mode = ask_silent;
  			valid_stdin = isatty(0) && isatty(1) && isatty(2);
-@@ -557,6 +576,7 @@ int main(int ac, char **av)
+@@ -566,6 +593,8 @@ int main(int ac, char **av)
  		}
  	case ask_all:
  	case ask_new:
 +	case dont_ask:
++	case dont_ask_dont_tell:
  		conf_read(NULL);
  		break;
- 	default:
-@@ -632,7 +632,7 @@ int main(int ac, char **av)
+ 	case set_no:
+@@ -612,7 +641,8 @@ int main(int ac, char **av)
  	do {
  		conf_cnt = 0;
  		check_conf(&rootmenu);
 -	} while (conf_cnt);
-+	} while ((conf_cnt) && (input_mode != dont_ask));
++ 	} while (conf_cnt && (input_mode != dont_ask
++			      && input_mode != dont_ask_dont_tell));
  	if (conf_write(NULL)) {
  		fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
  		return 1;
-@@ -643,5 +643,5 @@ skip_check:
+@@ -623,5 +653,5 @@ skip_check:
  		return 1;
  	}
  
 -	return 0;
 +	return return_value;
  }
---- linux-2.6.16.noarch/scripts/kconfig/Makefile~	2006-03-25 15:55:18.000000000 -0500
-+++ linux-2.6.16.noarch/scripts/kconfig/Makefile	2006-03-25 15:55:47.000000000 -0500
-@@ -23,6 +23,9 @@ oldconfig: $(obj)/conf
- silentoldconfig: $(obj)/conf
- 	$< -s arch/$(ARCH)/Kconfig
- 
-+nonint_oldconfig: scripts/kconfig/conf
-+	./scripts/kconfig/conf -b arch/$(ARCH)/Kconfig
-+
- update-po-config: $(obj)/kxgettext
- 	xgettext --default-domain=linux \
-           --add-comments --keyword=_ --keyword=N_ \
---- linux-2.6.14/scripts/kconfig/confdata.c~	2005-11-10 14:55:46.000000000 -0500
-+++ linux-2.6.14/scripts/kconfig/confdata.c	2005-11-10 14:56:01.000000000 -0500
-@@ -161,7 +161,7 @@ load:
- 			if (def == S_DEF_USER) {
- 				sym = sym_find(line + 9);
- 				if (!sym) {
--					conf_warning("trying to assign nonexistent symbol %s", line + 9);
-+					conf_warning("trying to assign nonexistent symbol %s", line + 9);
- 					break;
- 				}
- 			} else {
-@@ -197,7 +197,7 @@ load:
- 			if (def == S_DEF_USER) {
- 				sym = sym_find(line + 7);
- 				if (!sym) {
--					conf_warning("trying to assign nonexistent symbol %s", line + 7);
-+					conf_warning("trying to assign nonexistent symbol %s", line + 7);
- 					break;
- 				}
- 			} else {
---- linux-2.6.14/scripts/kconfig/confdata.c~	2005-11-15 23:51:37.000000000 -0500
-+++ linux-2.6.14/scripts/kconfig/confdata.c	2005-11-15 23:52:50.000000000 -0500
-@@ -153,7 +153,6 @@ int conf_read_simple(const char *name)
- 				break;
- 			} else if (!(sym->flags & SYMBOL_NEW)) {
- 				conf_warning("trying to reassign symbol %s", sym->name);
--				break;
- 			}
- 			switch (sym->type) {
- 			case S_BOOLEAN:
-@@ -183,7 +182,6 @@ int conf_read_simple(const char *name)
- 				break;
- 			} else if (!(sym->flags & SYMBOL_NEW)) {
- 				conf_warning("trying to reassign symbol %s", sym->name);
--				break;
- 			}
- 			switch (sym->type) {
- 			case S_TRISTATE:



From fedora-cvs-commits at redhat.com  Tue Apr  3 16:13:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 12:13:57 -0400
Subject: rpms/metacity/devel metacity.spec,1.109,1.110
Message-ID: <200704031613.l33GDvf3025181@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	metacity.spec 
Log Message:
Split off a devel package



Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- metacity.spec	13 Mar 2007 04:55:32 -0000	1.109
+++ metacity.spec	3 Apr 2007 16:13:55 -0000	1.110
@@ -7,9 +7,9 @@
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
-Source0: %{metacity_filename}.tar.bz2
+Source0: http://ftp.gnome.org/pub/gnome/sources/metacity/2.18/%{metacity_filename}.tar.bz2
 License: GPL
 Group: User Interface/Desktops
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -32,6 +32,7 @@
 Requires: pkgconfig
 
 Requires(post): GConf2 >= 2.14
+Requires(post): /sbin/ldconfig
 Requires(pre): GConf2 >= 2.14
 Requires(preun): GConf2 >= 2.14
 
@@ -40,6 +41,20 @@
 Metacity is a simple window manager that integrates nicely with 
 GNOME 2.
 
+%package devel
+Group: Development/Libraries
+Summary: Headers and libraries for metacity
+Requires: gtk2-devel, libX11-devel
+Requires: pkgconfig
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+
+This package contains the files needed for compiling programs using
+the metacity-private library. Note that you are not supposed to write
+programs using the metacity-private library, since it is a private
+API. This package exists purely for technical reasons.
+
 %prep
 %setup -q -n %{metacity_filename}
 
@@ -70,14 +85,14 @@
 make CPPFLAGS="$CPPFLAGS" LIBS="$LIBS"
 
 %install
-#rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-/bin/rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-/bin/rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 %find_lang %{gettext_package}
 
@@ -106,18 +121,31 @@
 %files -f %{gettext_package}.lang
 %defattr(-,root,root)
 %doc README AUTHORS COPYING NEWS HACKING doc/theme-format.txt doc/metacity-theme.dtd
-%{_bindir}/*
+%{_bindir}/metacity
+%{_bindir}/metacity-message
 %{_libexecdir}/*
 %{_datadir}/gnome/wm-properties/metacity.desktop
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/metacity
 %{_datadir}/themes
+%{_libdir}/lib*.so.*
+%{_mandir}/man1/metacity.1.gz
+
+%files devel
+%defattr(-,root,root)
+%{_bindir}/metacity-theme-viewer
+%{_bindir}/metacity-window-demo
 %{_includedir}/*
 %{_libdir}/lib*.so*
 %{_libdir}/pkgconfig/*
-%{_mandir}/man1/*
+%{_mandir}/man1/metacify-theme-viewer.1.gz
+%{_mandir}/man1/metacify-window-demo.1.gz
 
 %changelog
+* Tue Apr  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-2
+- Split off a devel package (#203547)
+- Some spec file cleanups (#21573)
+
 * Tue Mar 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-1
 - Update to 2.18.0
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 16:20:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 12:20:30 -0400
Subject: rpms/hplip/devel hplip.spec,1.108,1.109
Message-ID: <200704031620.l33GKUSO025493@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
* Tue Apr  3 2007 Tim Waugh <twaugh at redhat.com>
- Change 'Hidden' to 'NoDisplay' in the desktop file, and use the System
  category instead of Utility (bug #170762).
- Resolves: rhbz#170762



Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- hplip.spec	3 Apr 2007 12:53:42 -0000	1.108
+++ hplip.spec	3 Apr 2007 16:20:28 -0000	1.109
@@ -117,11 +117,11 @@
 	%{buildroot}%{_datadir}/applications/hplip.desktop
 
 mkdir -p %{buildroot}%{_datadir}/applications
-echo 'Hidden=true' >> %{buildroot}%{_datadir}/hplip/data/hplip.desktop
+echo 'NoDisplay=true' >> %{buildroot}%{_datadir}/hplip/data/hplip.desktop
 desktop-file-install --vendor HP				\
 	--dir %{buildroot}%{_datadir}/applications		\
 	--add-category X-Red-Hat-Extra				\
-	--add-category Utility					\
+	--add-category System					\
 	--add-category Application				\
 	%{buildroot}%{_datadir}/hplip/data/hplip.desktop
 
@@ -190,6 +190,8 @@
 
 %changelog
 * Tue Apr  3 2007 Tim Waugh <twaugh at redhat.com>
+- Change 'Hidden' to 'NoDisplay' in the desktop file, and use the System
+  category instead of Utility (bug #170762).
 - Link libsane-hpaio against libsane (bug #234813).
 
 * Fri Mar 30 2007 Tim Waugh <twaugh at redhat.com>



From fedora-cvs-commits at redhat.com  Tue Apr  3 16:21:28 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 12:21:28 -0400
Subject: rpms/gcc/devel gcc41-rh231818.patch,1.2,1.3
Message-ID: <200704031621.l33GLS60025540@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	gcc41-rh231818.patch 
Log Message:
4.1.2-8

gcc41-rh231818.patch:
 gnu/java/awt/peer/gtk/CairoGraphics2D.java                      |    5 
 gnu/java/awt/peer/gtk/ComponentGraphics.java                    |    2 
 gnu/java/awt/peer/gtk/FreetypeGlyphVector.java                  |   80 +++++
 include/gnu_java_awt_peer_gtk_CairoGraphics2D.h                 |    2 
 include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h             |   10 
 native/jni/gtk-peer/gdkfont.h                                   |    2 
 native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c     |   31 +-
 native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c |  135 ++++++++--
 native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c         |    8 
 9 files changed, 226 insertions(+), 49 deletions(-)

Index: gcc41-rh231818.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-rh231818.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcc41-rh231818.patch	3 Apr 2007 15:12:10 -0000	1.2
+++ gcc41-rh231818.patch	3 Apr 2007 16:21:25 -0000	1.3
@@ -86,24 +86,6 @@
      else
 --- libjava/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java	16 Mar 2007 15:14:53 -0000	1.25
 +++ libjava/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java	2 Apr 2007 19:39:26 -0000	1.26
-@@ -114,7 +114,7 @@ public class ComponentGraphics extends C
- 
-   private void lock()
-   {
--    Integer i = (Integer) hasLock.get();
-+    Integer i = hasLock.get();
-     if (i == null)
-       {
- 	start_gdk_drawing();
-@@ -126,7 +126,7 @@ public class ComponentGraphics extends C
- 
-   private void unlock()
-   {
--    Integer i = (Integer) hasLock.get();
-+    Integer i = hasLock.get();
-     if (i == null)
-       throw new IllegalStateException();
-     if (i == ONE)
 @@ -134,6 +134,8 @@ public class ComponentGraphics extends C
  	hasLock.set(null);
  	end_gdk_drawing();



From fedora-cvs-commits at redhat.com  Tue Apr  3 16:27:51 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 12:27:51 -0400
Subject: rpms/kernel/FC-5/configs config-generic,1.187,1.188
Message-ID: <200704031627.l33GRplr025942@cvs.devel.redhat.com>

Author: cebbert

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

Modified Files:
	config-generic 
Log Message:
* Tue Apr  3 2007 Chuck Ebbert <cebbert at redhat.com>		1.2309
- 2.6.20.4 final.
- Add Marvell PATA driver.
- 1782: Disable PCI MSI and MMCONFIG by default,
  add options to enable them.
- 1413: GFS2 update.



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-generic,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- config-generic	16 Mar 2007 21:49:15 -0000	1.187
+++ config-generic	3 Apr 2007 16:27:49 -0000	1.188
@@ -484,7 +484,7 @@
 # CONFIG_PATA_JMICRON is not set
 # CONFIG_PATA_LEGACY is not set
 # CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_MARVELL is not set
+CONFIG_PATA_MARVELL=y
 # CONFIG_PATA_MPIIX is not set
 # CONFIG_PATA_OLDPIIX is not set
 # CONFIG_PATA_NETCELL is not set



From fedora-cvs-commits at redhat.com  Tue Apr  3 16:27:51 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 12:27:51 -0400
Subject: rpms/kernel/FC-5 linux-2.6-drivers_pci_no_msi_mmconf.patch, NONE,
 1.1 linux-2.6-gfs2-update2.patch, 1.2, 1.3 kernel-2.6.spec, 1.2308,
 1.2309 linux-2.6-20.4-SCSI-gdth-fix-oops-in-gdth_copy_cmd.patch, 1.1,
 NONE linux-2.6-20.4-adjust-legacy-ide-resource-setting.patch, 1.1,
 NONE linux-2.6-20.4-copy-over-mac_len-when-cloning-an-skb.patch, 1.1,
 NONE
 linux-2.6-20.4-ehci-add-delay-to-bus_resume-before-accessing-ports.patch,
 1.1,
 NONE linux-2.6-20.4-fix-another-null-pointer-deref-in-ipv6_sockglue.c.patch,
 1.1, NONE linux-2.6-20.4-fix-extraneous-ipsec-larval-sa-creation.patch, 1.1,
 NONE
 linux-2.6-20.4-fix-gfp_kernel-with-preemption-disabled-in-fib_trie.patch,
 1.1, NONE linux-2.6-20.4-fix-ipv6-flow-label-inheritance.patch, 1.1,
 NONE linux-2.6-20.4-fix-mtime_sec_max-on-32-bit.patch, 1.1,
 NONE linux-2.6-20.4-fix-page-allocation-debugging-on-sparc64.patch, 1.1,
 NONE linux-2.6-20.4-fix-read-past-end-of-array-in-md-linear.c.patch, 1.1,
 NONE linux-2.6-20.4-fix-rtm_to_ifaddr-error-return.patch, 1.1,
 NONE linux-2.! 6-20.4-fix-sparc64-hugepage-bugs.patch, 1.1,
 NONE linux-2.6-20.4-fix-user-copy-length-in-ipv6_sockglue.c.patch, 1.1,
 NONE linux-2.6-20.4-futex-pi-state-locking-fix.patch, 1.1,
 NONE linux-2.6-20.4-hrtimer-prevent-overrun-dos-in-hrtimer_forward.patch,
 1.1, NONE
 linux-2.6-20.4-ia64-fix-null-pointer-in-ia64-irq_chip-mask-unmask-function.patch,
 1.1, NONE linux-2.6-20.4-initialise-pi_lock-if-config_rt_mutexes-n.patch,
 1.1, NONE linux-2.6-20.4-irda-irttp_dup-spin_lock-initialisation.patch, 1.1,
 NONE linux-2.6-20.4-mm-fix-madvise-infinine-loop.patch, 1.1,
 NONE linux-2.6-20.4-netfilter-nfnetlink_log-fix-reference-counting.patch,
 1.1, NONE linux-2.6-20.4-netlabel-cipso_std_bug.patch, 1.1, NONE
 linux-2.6-20.4-nfs-nfs_getattr-can-t-call-nfs_sync_mapping_range-for-non-regular-files.patch,
 1.1,
 NONE linux-2.6-20.4-r8169-fix-a-race-between-pci-probe-and-dev_open.patch,
 1.1, NONE linux-2.6-20.4x_DIO_invalidate_pages.patch, 1.1,
 NONE linux-2.6-20.4x_OOM_dont_kill_processes_with_unkillable_children.patch,
 1.1, NONE lin!
 ux-2.6-20.4x_serio_really_suppress_ack_nak.patch,1.1,NONE linu!
 x-2.6-20
Message-ID: <200704031627.l33GRp3g025931@cvs.devel.redhat.com>

Author: cebbert

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-drivers_pci_no_msi_mmconf.patch 
	linux-2.6-gfs2-update2.patch 
Removed Files:
	linux-2.6-20.4-SCSI-gdth-fix-oops-in-gdth_copy_cmd.patch 
	linux-2.6-20.4-adjust-legacy-ide-resource-setting.patch 
	linux-2.6-20.4-copy-over-mac_len-when-cloning-an-skb.patch 
	linux-2.6-20.4-ehci-add-delay-to-bus_resume-before-accessing-ports.patch 
	linux-2.6-20.4-fix-another-null-pointer-deref-in-ipv6_sockglue.c.patch 
	linux-2.6-20.4-fix-extraneous-ipsec-larval-sa-creation.patch 
	linux-2.6-20.4-fix-gfp_kernel-with-preemption-disabled-in-fib_trie.patch 
	linux-2.6-20.4-fix-ipv6-flow-label-inheritance.patch 
	linux-2.6-20.4-fix-mtime_sec_max-on-32-bit.patch 
	linux-2.6-20.4-fix-page-allocation-debugging-on-sparc64.patch 
	linux-2.6-20.4-fix-read-past-end-of-array-in-md-linear.c.patch 
	linux-2.6-20.4-fix-rtm_to_ifaddr-error-return.patch 
	linux-2.6-20.4-fix-sparc64-hugepage-bugs.patch 
	linux-2.6-20.4-fix-user-copy-length-in-ipv6_sockglue.c.patch 
	linux-2.6-20.4-futex-pi-state-locking-fix.patch 
	linux-2.6-20.4-hrtimer-prevent-overrun-dos-in-hrtimer_forward.patch 
	linux-2.6-20.4-ia64-fix-null-pointer-in-ia64-irq_chip-mask-unmask-function.patch 
	linux-2.6-20.4-initialise-pi_lock-if-config_rt_mutexes-n.patch 
	linux-2.6-20.4-irda-irttp_dup-spin_lock-initialisation.patch 
	linux-2.6-20.4-mm-fix-madvise-infinine-loop.patch 
	linux-2.6-20.4-netfilter-nfnetlink_log-fix-reference-counting.patch 
	linux-2.6-20.4-netlabel-cipso_std_bug.patch 
	linux-2.6-20.4-nfs-nfs_getattr-can-t-call-nfs_sync_mapping_range-for-non-regular-files.patch 
	linux-2.6-20.4-r8169-fix-a-race-between-pci-probe-and-dev_open.patch 
	linux-2.6-20.4x_DIO_invalidate_pages.patch 
	linux-2.6-20.4x_OOM_dont_kill_processes_with_unkillable_children.patch 
	linux-2.6-20.4x_serio_really_suppress_ack_nak.patch 
	linux-2.6-20.4x_snd_hda_codec_max_codecs_fix.patch 
	linux-2.6-20_git-serio-keyboard.patch 
	linux-2.6-git-serio-1e4865f8d469b1.patch 
Log Message:
* Tue Apr  3 2007 Chuck Ebbert <cebbert at redhat.com>		1.2309
- 2.6.20.4 final.
- Add Marvell PATA driver.
- 1782: Disable PCI MSI and MMCONFIG by default,
  add options to enable them.
- 1413: GFS2 update.


linux-2.6-drivers_pci_no_msi_mmconf.patch:
 Documentation/kernel-parameters.txt |    5 +++++
 arch/i386/pci/common.c              |    6 +++++-
 drivers/pci/msi.c                   |    6 +++++-
 drivers/pci/pci.c                   |    2 ++
 4 files changed, 17 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-drivers_pci_no_msi_mmconf.patch ---
Disable PCI MSI and MMCONFIG by default, add kernel parameters
to enable them.

Original mmconfig patch by Kyle McMartin <kyle at ubuntu.com>

Signed-off-by: Chuck Ebbert <cebbert at redhat.com>

---
 Documentation/kernel-parameters.txt |    5 +++++
 arch/i386/pci/common.c              |    6 +++++-
 drivers/pci/msi.c                   |    6 +++++-
 drivers/pci/pci.c                   |    2 ++
 4 files changed, 17 insertions(+), 2 deletions(-)

--- linux-2.6.20.noarch.orig/drivers/pci/msi.c
+++ linux-2.6.20.noarch/drivers/pci/msi.c
@@ -28,7 +28,7 @@ static DEFINE_SPINLOCK(msi_lock);
 static struct msi_desc* msi_desc[NR_IRQS] = { [0 ... NR_IRQS-1] = NULL };
 static struct kmem_cache* msi_cachep;
 
-static int pci_msi_enable = 1;
+static int pci_msi_enable = 0;
 
 static int msi_cache_init(void)
 {
@@ -977,6 +977,10 @@ void pci_no_msi(void)
 {
 	pci_msi_enable = 0;
 }
+void pci_yes_msi(void)
+{
+	pci_msi_enable = 1;
+}
 
 EXPORT_SYMBOL(pci_enable_msi);
 EXPORT_SYMBOL(pci_disable_msi);
--- linux-2.6.20.noarch.orig/drivers/pci/pci.c
+++ linux-2.6.20.noarch/drivers/pci/pci.c
@@ -1168,6 +1168,8 @@ static int __devinit pci_setup(char *str
 		if (*str && (str = pcibios_setup(str)) && *str) {
 			if (!strcmp(str, "nomsi")) {
 				pci_no_msi();
+			} else if (!strcmp(str, "msi")) {
+				pci_yes_msi();
 			} else {
 				printk(KERN_ERR "PCI: Unknown option `%s'\n",
 						str);
--- linux-2.6.20.noarch.orig/Documentation/kernel-parameters.txt
+++ linux-2.6.20.noarch/Documentation/kernel-parameters.txt
@@ -1197,8 +1197,13 @@ and is between 256 and 4096 characters. 
 				Mechanism 1.
 		conf2		[IA-32] Force use of PCI Configuration
 				Mechanism 2.
+		mmconf		[IA-32,X86_64] Enable use of MMCONFIG for PCI
+				Configuration
 		nommconf	[IA-32,X86_64] Disable use of MMCONFIG for PCI
 				Configuration
+		msi		[MSI] If the PCI_MSI kernel config parameter is
+				enabled, this kernel boot option can be used to
+				enable the use of MSI interrupts system-wide.
 		nomsi		[MSI] If the PCI_MSI kernel config parameter is
 				enabled, this kernel boot option can be used to
 				disable the use of MSI interrupts system-wide.
--- linux-2.6.20.noarch.orig/arch/i386/pci/common.c
+++ linux-2.6.20.noarch/arch/i386/pci/common.c
@@ -18,7 +18,7 @@
 #include "pci.h"
 
 unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 |
-				PCI_PROBE_MMCONF;
+				0; /* PCI_PROBE_MMCONF */
 
 static int pci_bf_sort;
 int pci_routeirq;
@@ -292,6 +292,10 @@ char * __devinit  pcibios_setup(char *st
 		pci_probe &= ~PCI_PROBE_MMCONF;
 		return NULL;
 	}
+	else if (!strcmp(str, "mmconf")) {
+		pci_probe |= PCI_PROBE_MMCONF;
+		return NULL;
+	}
 #endif
 	else if (!strcmp(str, "noacpi")) {
 		acpi_noirq_set();

linux-2.6-gfs2-update2.patch:
 b/fs/gfs2/glock.c                |  233 ++++++++++-----------------------------
 b/fs/gfs2/glock.h                |    2 
 b/fs/gfs2/incore.h               |    8 -
 b/fs/gfs2/locking/dlm/lock.c     |   10 -
 b/fs/gfs2/locking/dlm/lock_dlm.h |    1 
 b/fs/gfs2/lops.c                 |   20 +--
 b/fs/gfs2/main.c                 |    1 
 b/fs/gfs2/ops_address.c          |    4 
 b/fs/gfs2/ops_super.c            |   28 ++++
 b/fs/gfs2/rgrp.c                 |    7 +
 fs/gfs2/glock.c                  |   77 +++++++++---
 fs/gfs2/glock.h                  |    2 
 fs/gfs2/incore.h                 |    4 
 13 files changed, 179 insertions(+), 218 deletions(-)

Index: linux-2.6-gfs2-update2.patch
===================================================================
RCS file: linux-2.6-gfs2-update2.patch
diff -N linux-2.6-gfs2-update2.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-gfs2-update2.patch	3 Apr 2007 16:27:49 -0000	1.3
@@ -0,0 +1,1080 @@
+From 2036cddf4d6f2252d2e7a4fc463ff492308810db Mon Sep 17 00:00:00 2001
+From: Josef Whiter <jwhiter at redhat.com>
+Date: Mon, 12 Mar 2007 16:55:07 -0500
+Subject: [PATCH] [GFS2] Fix bz 231380, unlock page before dequeing glocks in gfs2_commit_write
+
+If we are writing a file, and in the middle of writing the file
+another node attempts to get a shared lock on that file (by doing a du for
+example) the process doing the writing will hang waiting on lock_page.  The
+reason for this is because when we have waiters on a exclusive glock, we will go
+through and flush out all dirty pages associated with that inode and release the
+lock.  The problem is that when we flush the dirty pages, we could hit a page
+that we have locked durring the generic_file_buffered_write part of this
+operation.  This patch unlocks the page before we go to dequeue the lock and
+locks it immediatly afterwards, since generic_file_buffered_write needs the page
+locked when the commit_write is completed.  This patch resolves the problem,
+however if somebody sees a better way to do this please don't hesistate to yell.
+
+Signed-off-by: Josef Whiter <jwhiter at redhat.com>
+Signed-off-by: Steven Whitehouse <swhiteho at redhat.com>
+
+diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
+index b3b7e84..90c2879 100644
+--- a/fs/gfs2/ops_address.c
++++ b/fs/gfs2/ops_address.c
+@@ -507,7 +507,9 @@ static int gfs2_commit_write(struct file *file, struct page *page,
+ 		gfs2_quota_unlock(ip);
+ 		gfs2_alloc_put(ip);
+ 	}
++	unlock_page(page);
+ 	gfs2_glock_dq_m(1, &ip->i_gh);
++	lock_page(page);
+ 	gfs2_holder_uninit(&ip->i_gh);
+ 	return 0;
+ 
+@@ -520,7 +522,9 @@ fail_endtrans:
+ 		gfs2_quota_unlock(ip);
+ 		gfs2_alloc_put(ip);
+ 	}
++	unlock_page(page);
+ 	gfs2_glock_dq_m(1, &ip->i_gh);
++	lock_page(page);
+ 	gfs2_holder_uninit(&ip->i_gh);
+ fail_nounlock:
+ 	ClearPageUptodate(page);
+-- 
+1.4.4.2
+
+From 628f0afe709b8b4cc0558375e488d8e73965390d Mon Sep 17 00:00:00 2001
+From: Steven Whitehouse <swhiteho at redhat.com>
+Date: Fri, 16 Mar 2007 09:40:31 +0000
+Subject: [PATCH] [GFS2] Fix bz 224480 and cleanup glock demotion code
+
+This patch prevents the printing of a warning message in cases where
+the fs is functioning normally by handing off responsibility for
+unlinked, but still open inodes, to another node for eventual deallocation.
+Also, there is now an improved system for ensuring that such requests
+to other nodes do not get lost. The callback on the iopen lock is
+only ever called when i_nlink == 0 and when a node is unable to deallocate
+it due to it still being in use on another node. When a node receives
+the callback therefore, it knows that i_nlink must be zero, so we mark
+it as such (in gfs2_drop_inode) in order that it will then attempt
+deallocation of the inode itself.
+
+As an additional benefit, queuing a demote request no longer requires
+a memory allocation. This simplifies the code for dealing with gfs2_holders
+as it removes one special case.
+
+There are two new fields in struct gfs2_glock. gl_demote_state is the
+state which the remote node has requested and gl_demote_time is the
+time when the request came in. Both fields are only valid when the
+GLF_DEMOTE flag is set in gl_flags.
+
+Signed-off-by: Steven Whitehouse <swhiteho at redhat.com>
+
+diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
+index a3a24f2..e707594 100644
+--- a/fs/gfs2/glock.c
++++ b/fs/gfs2/glock.c
+@@ -54,7 +54,7 @@ struct glock_iter {
+ typedef void (*glock_examiner) (struct gfs2_glock * gl);
+ 
+ static int gfs2_dump_lockstate(struct gfs2_sbd *sdp);
+-static void gfs2_glock_xmote_th(struct gfs2_holder *gh);
++static void gfs2_glock_xmote_th(struct gfs2_glock *gl, struct gfs2_holder *gh);
+ static void gfs2_glock_drop_th(struct gfs2_glock *gl);
+ static DECLARE_RWSEM(gfs2_umount_flush_sem);
+ static struct dentry *gfs2_root;
+@@ -212,7 +212,6 @@ int gfs2_glock_put(struct gfs2_glock *gl)
+ 		gfs2_assert(sdp, list_empty(&gl->gl_reclaim));
+ 		gfs2_assert(sdp, list_empty(&gl->gl_holders));
+ 		gfs2_assert(sdp, list_empty(&gl->gl_waiters1));
+-		gfs2_assert(sdp, list_empty(&gl->gl_waiters2));
+ 		gfs2_assert(sdp, list_empty(&gl->gl_waiters3));
+ 		glock_free(gl);
+ 		rv = 1;
+@@ -399,7 +398,7 @@ void gfs2_holder_reinit(unsigned int state, unsigned flags, struct gfs2_holder *
+ {
+ 	gh->gh_state = state;
+ 	gh->gh_flags = flags;
+-	gh->gh_iflags &= 1 << HIF_ALLOCED;
++	gh->gh_iflags = 0;
+ 	gh->gh_ip = (unsigned long)__builtin_return_address(0);
+ }
+ 
+@@ -416,54 +415,8 @@ void gfs2_holder_uninit(struct gfs2_holder *gh)
+ 	gh->gh_ip = 0;
+ }
+ 
+-/**
+- * gfs2_holder_get - get a struct gfs2_holder structure
+- * @gl: the glock
+- * @state: the state we're requesting
+- * @flags: the modifier flags
+- * @gfp_flags:
+- *
+- * Figure out how big an impact this function has.  Either:
+- * 1) Replace it with a cache of structures hanging off the struct gfs2_sbd
+- * 2) Leave it like it is
+- *
+- * Returns: the holder structure, NULL on ENOMEM
+- */
+-
+-static struct gfs2_holder *gfs2_holder_get(struct gfs2_glock *gl,
+-					   unsigned int state,
+-					   int flags, gfp_t gfp_flags)
+-{
+-	struct gfs2_holder *gh;
+-
+-	gh = kmalloc(sizeof(struct gfs2_holder), gfp_flags);
+-	if (!gh)
+-		return NULL;
+-
+-	gfs2_holder_init(gl, state, flags, gh);
+-	set_bit(HIF_ALLOCED, &gh->gh_iflags);
+-	gh->gh_ip = (unsigned long)__builtin_return_address(0);
+-	return gh;
+-}
+-
+-/**
+- * gfs2_holder_put - get rid of a struct gfs2_holder structure
+- * @gh: the holder structure
+- *
+- */
+-
+-static void gfs2_holder_put(struct gfs2_holder *gh)
+-{
+-	gfs2_holder_uninit(gh);
+-	kfree(gh);
+-}
+-
+-static void gfs2_holder_dispose_or_wake(struct gfs2_holder *gh)
++static void gfs2_holder_wake(struct gfs2_holder *gh)
+ {
+-	if (test_bit(HIF_DEALLOC, &gh->gh_iflags)) {
+-		gfs2_holder_put(gh);
+-		return;
+-	}
+ 	clear_bit(HIF_WAIT, &gh->gh_iflags);
+ 	smp_mb();
+ 	wake_up_bit(&gh->gh_iflags, HIF_WAIT);
+@@ -529,7 +482,7 @@ static int rq_promote(struct gfs2_holder *gh)
+ 				gfs2_reclaim_glock(sdp);
+ 			}
+ 
+-			gfs2_glock_xmote_th(gh);
++			gfs2_glock_xmote_th(gh->gh_gl, gh);
+ 			spin_lock(&gl->gl_spin);
+ 		}
+ 		return 1;
+@@ -552,7 +505,7 @@ static int rq_promote(struct gfs2_holder *gh)
+ 	gh->gh_error = 0;
+ 	set_bit(HIF_HOLDER, &gh->gh_iflags);
+ 
+-	gfs2_holder_dispose_or_wake(gh);
++	gfs2_holder_wake(gh);
+ 
+ 	return 0;
+ }
+@@ -564,32 +517,24 @@ static int rq_promote(struct gfs2_holder *gh)
+  * Returns: 1 if the queue is blocked
+  */
+ 
+-static int rq_demote(struct gfs2_holder *gh)
++static int rq_demote(struct gfs2_glock *gl)
+ {
+-	struct gfs2_glock *gl = gh->gh_gl;
+-
+ 	if (!list_empty(&gl->gl_holders))
+ 		return 1;
+ 
+-	if (gl->gl_state == gh->gh_state || gl->gl_state == LM_ST_UNLOCKED) {
+-		list_del_init(&gh->gh_list);
+-		gh->gh_error = 0;
+-		spin_unlock(&gl->gl_spin);
+-		gfs2_holder_dispose_or_wake(gh);
+-		spin_lock(&gl->gl_spin);
+-	} else {
+-		gl->gl_req_gh = gh;
+-		set_bit(GLF_LOCK, &gl->gl_flags);
+-		spin_unlock(&gl->gl_spin);
+-
+-		if (gh->gh_state == LM_ST_UNLOCKED ||
+-		    gl->gl_state != LM_ST_EXCLUSIVE)
+-			gfs2_glock_drop_th(gl);
+-		else
+-			gfs2_glock_xmote_th(gh);
+-
+-		spin_lock(&gl->gl_spin);
++	if (gl->gl_state == gl->gl_demote_state ||
++	    gl->gl_state == LM_ST_UNLOCKED) {
++		clear_bit(GLF_DEMOTE, &gl->gl_flags);
++		return 0;
+ 	}
++	set_bit(GLF_LOCK, &gl->gl_flags);
++	spin_unlock(&gl->gl_spin);
++	if (gl->gl_demote_state == LM_ST_UNLOCKED ||
++	    gl->gl_state != LM_ST_EXCLUSIVE)
++		gfs2_glock_drop_th(gl);
++	else
++		gfs2_glock_xmote_th(gl, NULL);
++	spin_lock(&gl->gl_spin);
+ 
+ 	return 0;
+ }
+@@ -617,16 +562,8 @@ static void run_queue(struct gfs2_glock *gl)
+ 			else
+ 				gfs2_assert_warn(gl->gl_sbd, 0);
+ 
+-		} else if (!list_empty(&gl->gl_waiters2) &&
+-			   !test_bit(GLF_SKIP_WAITERS2, &gl->gl_flags)) {
+-			gh = list_entry(gl->gl_waiters2.next,
+-					struct gfs2_holder, gh_list);
+-
+-			if (test_bit(HIF_DEMOTE, &gh->gh_iflags))
+-				blocked = rq_demote(gh);
+-			else
+-				gfs2_assert_warn(gl->gl_sbd, 0);
+-
++		} else if (test_bit(GLF_DEMOTE, &gl->gl_flags)) {
++			blocked = rq_demote(gl);
+ 		} else if (!list_empty(&gl->gl_waiters3)) {
+ 			gh = list_entry(gl->gl_waiters3.next,
+ 					struct gfs2_holder, gh_list);
+@@ -717,50 +654,24 @@ static void gfs2_glmutex_unlock(struct gfs2_glock *gl)
+ }
+ 
+ /**
+- * handle_callback - add a demote request to a lock's queue
++ * handle_callback - process a demote request
+  * @gl: the glock
+  * @state: the state the caller wants us to change to
+  *
+- * Note: This may fail sliently if we are out of memory.
++ * There are only two requests that we are going to see in actual
++ * practise: LM_ST_SHARED and LM_ST_UNLOCKED
+  */
+ 
+ static void handle_callback(struct gfs2_glock *gl, unsigned int state)
+ {
+-	struct gfs2_holder *gh, *new_gh = NULL;
+-
+-restart:
+ 	spin_lock(&gl->gl_spin);
+-
+-	list_for_each_entry(gh, &gl->gl_waiters2, gh_list) {
+-		if (test_bit(HIF_DEMOTE, &gh->gh_iflags) &&
+-		    gl->gl_req_gh != gh) {
+-			if (gh->gh_state != state)
+-				gh->gh_state = LM_ST_UNLOCKED;
+-			goto out;
+-		}
+-	}
+-
+-	if (new_gh) {
+-		list_add_tail(&new_gh->gh_list, &gl->gl_waiters2);
+-		new_gh = NULL;
+-	} else {
+-		spin_unlock(&gl->gl_spin);
+-
+-		new_gh = gfs2_holder_get(gl, state, LM_FLAG_TRY, GFP_NOFS);
+-		if (!new_gh)
+-			return;
+-		set_bit(HIF_DEMOTE, &new_gh->gh_iflags);
+-		set_bit(HIF_DEALLOC, &new_gh->gh_iflags);
+-		set_bit(HIF_WAIT, &new_gh->gh_iflags);
+-
+-		goto restart;
++	if (test_and_set_bit(GLF_DEMOTE, &gl->gl_flags) == 0) {
++		gl->gl_demote_state = state;
++		gl->gl_demote_time = jiffies;
++	} else if (gl->gl_demote_state != LM_ST_UNLOCKED) {
++		gl->gl_demote_state = state;
+ 	}
+-
+-out:
+ 	spin_unlock(&gl->gl_spin);
+-
+-	if (new_gh)
+-		gfs2_holder_put(new_gh);
+ }
+ 
+ /**
+@@ -820,56 +731,37 @@ static void xmote_bh(struct gfs2_glock *gl, unsigned int ret)
+ 
+ 	/*  Deal with each possible exit condition  */
+ 
+-	if (!gh)
++	if (!gh) {
+ 		gl->gl_stamp = jiffies;
+-	else if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) {
++		if (ret & LM_OUT_CANCELED)
++			op_done = 0;
++		else
++			clear_bit(GLF_DEMOTE, &gl->gl_flags);
++	} else {
+ 		spin_lock(&gl->gl_spin);
+ 		list_del_init(&gh->gh_list);
+ 		gh->gh_error = -EIO;
+-		spin_unlock(&gl->gl_spin);
+-	} else if (test_bit(HIF_DEMOTE, &gh->gh_iflags)) {
+-		spin_lock(&gl->gl_spin);
+-		list_del_init(&gh->gh_list);
+-		if (gl->gl_state == gh->gh_state ||
+-		    gl->gl_state == LM_ST_UNLOCKED) {
++		if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) 
++			goto out;
++		gh->gh_error = GLR_CANCELED;
++		if (ret & LM_OUT_CANCELED) 
++			goto out;
++		if (relaxed_state_ok(gl->gl_state, gh->gh_state, gh->gh_flags)) {
++			list_add_tail(&gh->gh_list, &gl->gl_holders);
+ 			gh->gh_error = 0;
+-		} else {
+-			if (gfs2_assert_warn(sdp, gh->gh_flags &
+-					(LM_FLAG_TRY | LM_FLAG_TRY_1CB)) == -1)
+-				fs_warn(sdp, "ret = 0x%.8X\n", ret);
+-			gh->gh_error = GLR_TRYFAILED;
++			set_bit(HIF_HOLDER, &gh->gh_iflags);
++			set_bit(HIF_FIRST, &gh->gh_iflags);
++			op_done = 0;
++			goto out;
+ 		}
+-		spin_unlock(&gl->gl_spin);
+-
+-		if (ret & LM_OUT_CANCELED)
+-			handle_callback(gl, LM_ST_UNLOCKED);
+-
+-	} else if (ret & LM_OUT_CANCELED) {
+-		spin_lock(&gl->gl_spin);
+-		list_del_init(&gh->gh_list);
+-		gh->gh_error = GLR_CANCELED;
+-		spin_unlock(&gl->gl_spin);
+-
+-	} else if (relaxed_state_ok(gl->gl_state, gh->gh_state, gh->gh_flags)) {
+-		spin_lock(&gl->gl_spin);
+-		list_move_tail(&gh->gh_list, &gl->gl_holders);
+-		gh->gh_error = 0;
+-		set_bit(HIF_HOLDER, &gh->gh_iflags);
+-		spin_unlock(&gl->gl_spin);
+-
+-		set_bit(HIF_FIRST, &gh->gh_iflags);
+-
+-		op_done = 0;
+-
+-	} else if (gh->gh_flags & (LM_FLAG_TRY | LM_FLAG_TRY_1CB)) {
+-		spin_lock(&gl->gl_spin);
+-		list_del_init(&gh->gh_list);
+ 		gh->gh_error = GLR_TRYFAILED;
+-		spin_unlock(&gl->gl_spin);
+-
+-	} else {
++		if (gh->gh_flags & (LM_FLAG_TRY | LM_FLAG_TRY_1CB))
++			goto out;
++		gh->gh_error = -EINVAL;
+ 		if (gfs2_assert_withdraw(sdp, 0) == -1)
+ 			fs_err(sdp, "ret = 0x%.8X\n", ret);
++out:
++		spin_unlock(&gl->gl_spin);
+ 	}
+ 
+ 	if (glops->go_xmote_bh)
+@@ -887,7 +779,7 @@ static void xmote_bh(struct gfs2_glock *gl, unsigned int ret)
+ 	gfs2_glock_put(gl);
+ 
+ 	if (gh)
+-		gfs2_holder_dispose_or_wake(gh);
++		gfs2_holder_wake(gh);
+ }
+ 
+ /**
+@@ -898,12 +790,11 @@ static void xmote_bh(struct gfs2_glock *gl, unsigned int ret)
+  *
+  */
+ 
+-void gfs2_glock_xmote_th(struct gfs2_holder *gh)
++void gfs2_glock_xmote_th(struct gfs2_glock *gl, struct gfs2_holder *gh)
+ {
+-	struct gfs2_glock *gl = gh->gh_gl;
+ 	struct gfs2_sbd *sdp = gl->gl_sbd;
+-	int flags = gh->gh_flags;
+-	unsigned state = gh->gh_state;
++	int flags = gh ? gh->gh_flags : 0;
++	unsigned state = gh ? gh->gh_state : gl->gl_demote_state;
+ 	const struct gfs2_glock_operations *glops = gl->gl_ops;
+ 	int lck_flags = flags & (LM_FLAG_TRY | LM_FLAG_TRY_1CB |
+ 				 LM_FLAG_NOEXP | LM_FLAG_ANY |
+@@ -953,6 +844,7 @@ static void drop_bh(struct gfs2_glock *gl, unsigned int ret)
+ 	gfs2_assert_warn(sdp, !ret);
+ 
+ 	state_change(gl, LM_ST_UNLOCKED);
++	clear_bit(GLF_DEMOTE, &gl->gl_flags);
+ 
+ 	if (glops->go_inval)
+ 		glops->go_inval(gl, DIO_METADATA);
+@@ -974,7 +866,7 @@ static void drop_bh(struct gfs2_glock *gl, unsigned int ret)
+ 	gfs2_glock_put(gl);
+ 
+ 	if (gh)
+-		gfs2_holder_dispose_or_wake(gh);
++		gfs2_holder_wake(gh);
+ }
+ 
+ /**
+@@ -1291,9 +1183,8 @@ void gfs2_glock_dq(struct gfs2_holder *gh)
+ 		if (glops->go_unlock)
+ 			glops->go_unlock(gh);
+ 
+-		gl->gl_stamp = jiffies;
+-
+ 		spin_lock(&gl->gl_spin);
++		gl->gl_stamp = jiffies;
+ 	}
+ 
+ 	clear_bit(GLF_LOCK, &gl->gl_flags);
+@@ -1981,16 +1872,16 @@ static int dump_glock(struct glock_iter *gi, struct gfs2_glock *gl)
+ 		if (error)
+ 			goto out;
+ 	}
+-	list_for_each_entry(gh, &gl->gl_waiters2, gh_list) {
+-		error = dump_holder(gi, "Waiter2", gh);
+-		if (error)
+-			goto out;
+-	}
+ 	list_for_each_entry(gh, &gl->gl_waiters3, gh_list) {
+ 		error = dump_holder(gi, "Waiter3", gh);
+ 		if (error)
+ 			goto out;
+ 	}
++	if (test_bit(GLF_DEMOTE, &gl->gl_flags)) {
++		print_dbg(gi, "  Demotion req to state %u (%llu uS ago)\n",
++			  gl->gl_demote_state,
++			  (u64)(jiffies - gl->gl_demote_time)*1000000/HZ);
++	}
+ 	if (gl->gl_ops == &gfs2_inode_glops && gl->gl_object) {
+ 		if (!test_bit(GLF_LOCK, &gl->gl_flags) &&
+ 			list_empty(&gl->gl_holders)) {
+diff --git a/fs/gfs2/glock.h b/fs/gfs2/glock.h
+index d7cef74..5e662ea 100644
+--- a/fs/gfs2/glock.h
++++ b/fs/gfs2/glock.h
+@@ -67,7 +67,7 @@ static inline int gfs2_glock_is_blocking(struct gfs2_glock *gl)
+ {
+ 	int ret;
+ 	spin_lock(&gl->gl_spin);
+-	ret = !list_empty(&gl->gl_waiters2) || !list_empty(&gl->gl_waiters3);
++	ret = test_bit(GLF_DEMOTE, &gl->gl_flags) || !list_empty(&gl->gl_waiters3);
+ 	spin_unlock(&gl->gl_spin);
+ 	return ret;
+ }
+diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
+index 7555261..9c12582 100644
+--- a/fs/gfs2/incore.h
++++ b/fs/gfs2/incore.h
+@@ -115,11 +115,8 @@ enum {
+ 	/* Actions */
+ 	HIF_MUTEX		= 0,
+ 	HIF_PROMOTE		= 1,
+-	HIF_DEMOTE		= 2,
+ 
+ 	/* States */
+-	HIF_ALLOCED		= 4,
+-	HIF_DEALLOC		= 5,
+ 	HIF_HOLDER		= 6,
+ 	HIF_FIRST		= 7,
+ 	HIF_ABORTED		= 9,
+@@ -142,8 +139,8 @@ struct gfs2_holder {
+ enum {
+ 	GLF_LOCK		= 1,
+ 	GLF_STICKY		= 2,
++	GLF_DEMOTE		= 3,
+ 	GLF_DIRTY		= 5,
+-	GLF_SKIP_WAITERS2	= 6,
+ };
+ 
+ struct gfs2_glock {
+@@ -156,11 +153,12 @@ struct gfs2_glock {
+ 
+ 	unsigned int gl_state;
+ 	unsigned int gl_hash;
++	unsigned int gl_demote_state; /* state requested by remote node */
++	unsigned long gl_demote_time; /* time of first demote request */
+ 	struct task_struct *gl_owner;
+ 	unsigned long gl_ip;
+ 	struct list_head gl_holders;
+ 	struct list_head gl_waiters1;	/* HIF_MUTEX */
+-	struct list_head gl_waiters2;	/* HIF_DEMOTE */
+ 	struct list_head gl_waiters3;	/* HIF_PROMOTE */
+ 
+ 	const struct gfs2_glock_operations *gl_ops;
+diff --git a/fs/gfs2/main.c b/fs/gfs2/main.c
+index 2183953..c4bb374 100644
+--- a/fs/gfs2/main.c
++++ b/fs/gfs2/main.c
+@@ -45,7 +45,6 @@ static void gfs2_init_glock_once(void *foo, struct kmem_cache *cachep, unsigned
+ 		spin_lock_init(&gl->gl_spin);
+ 		INIT_LIST_HEAD(&gl->gl_holders);
+ 		INIT_LIST_HEAD(&gl->gl_waiters1);
+-		INIT_LIST_HEAD(&gl->gl_waiters2);
+ 		INIT_LIST_HEAD(&gl->gl_waiters3);
+ 		gl->gl_lvb = NULL;
+ 		atomic_set(&gl->gl_lvb_count, 0);
+diff --git a/fs/gfs2/ops_super.c b/fs/gfs2/ops_super.c
+index b89999d..485ce3d 100644
+--- a/fs/gfs2/ops_super.c
++++ b/fs/gfs2/ops_super.c
+@@ -284,6 +284,31 @@ static int gfs2_remount_fs(struct super_block *sb, int *flags, char *data)
+ }
+ 
+ /**
++ * gfs2_drop_inode - Drop an inode (test for remote unlink)
++ * @inode: The inode to drop
++ *
++ * If we've received a callback on an iopen lock then its because a
++ * remote node tried to deallocate the inode but failed due to this node
++ * still having the inode open. Here we mark the link count zero
++ * since we know that it must have reached zero if the GLF_DEMOTE flag
++ * is set on the iopen glock. If we didn't do a disk read since the
++ * remote node removed the final link then we might otherwise miss
++ * this event. This check ensures that this node will deallocate the
++ * inode's blocks, or alternatively pass the baton on to another
++ * node for later deallocation.
++ */
++static void gfs2_drop_inode(struct inode *inode)
++{
++	if (inode->i_private && inode->i_nlink) {
++		struct gfs2_inode *ip = GFS2_I(inode);
++		struct gfs2_glock *gl = ip->i_iopen_gh.gh_gl;
++		if (gl && test_bit(GLF_DEMOTE, &gl->gl_flags))
++			clear_nlink(inode);
++	}
++	generic_drop_inode(inode);
++}
++
++/**
+  * gfs2_clear_inode - Deallocate an inode when VFS is done with it
+  * @inode: The VFS inode
+  *
+@@ -441,7 +466,7 @@ out_unlock:
+ out_uninit:
+ 	gfs2_holder_uninit(&ip->i_iopen_gh);
+ 	gfs2_glock_dq_uninit(&gh);
+-	if (error)
++	if (error && error != GLR_TRYFAILED)
+ 		fs_warn(sdp, "gfs2_delete_inode: %d\n", error);
+ out:
+ 	truncate_inode_pages(&inode->i_data, 0);
+@@ -481,6 +506,7 @@ const struct super_operations gfs2_super_ops = {
+ 	.statfs			= gfs2_statfs,
+ 	.remount_fs		= gfs2_remount_fs,
+ 	.clear_inode		= gfs2_clear_inode,
++	.drop_inode		= gfs2_drop_inode,
+ 	.show_options		= gfs2_show_options,
+ };
+ 
+-- 
+1.4.4.2
+
+From f5a481e985a0efcc5ffd3fc623be09f2a3a7fd7d Mon Sep 17 00:00:00 2001
+From: Steven Whitehouse <swhiteho at redhat.com>
+Date: Sun, 18 Mar 2007 16:05:27 +0000
+Subject: [PATCH] [GFS2] Fix a bug on i386 due to evaluation order
+
+Since gcc didn't evaluate the last two terms of the expression in
+glock.c:1881 as a constant expression, it resulted in an error on
+i386 due to the lack of a 64bit divide instruction. This adds some
+brackets to fix the problem.
+
+This was reported by Andrew Morton.
+
+Signed-off-by: Steven Whitehouse <swhiteho at redhat.com>
+Cc: Andrew Morton <akpm at linux-foundation.org>
+
+diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
+index e707594..b8aa816 100644
+--- a/fs/gfs2/glock.c
++++ b/fs/gfs2/glock.c
+@@ -1880,7 +1880,7 @@ static int dump_glock(struct glock_iter *gi, struct gfs2_glock *gl)
+ 	if (test_bit(GLF_DEMOTE, &gl->gl_flags)) {
+ 		print_dbg(gi, "  Demotion req to state %u (%llu uS ago)\n",
+ 			  gl->gl_demote_state,
+-			  (u64)(jiffies - gl->gl_demote_time)*1000000/HZ);
++			  (u64)(jiffies - gl->gl_demote_time)*(1000000/HZ));
+ 	}
+ 	if (gl->gl_ops == &gfs2_inode_glops && gl->gl_object) {
+ 		if (!test_bit(GLF_LOCK, &gl->gl_flags) &&
+-- 
+1.4.4.2
+
+From 3463b52f39673b644da78c81e6e239de19f38375 Mon Sep 17 00:00:00 2001
+From: Steven Whitehouse <swhiteho at redhat.com>
+Date: Sun, 18 Mar 2007 17:04:15 +0000
+Subject: [PATCH] [GFS2] Speed up lock_dlm's locking (move sprintf)
+
+The following patch speeds up lock_dlm's locking by moving the sprintf
+out from the lock acquisition path and into the lock creation path. This
+reduces the amount of CPU time used in acquiring locks by a fair amount.
+
+Signed-off-by: Steven Whitehouse <swhiteho at redhat.com>
+Acked-by: David Teigland <teigland at redhat.com>
+
+diff --git a/fs/gfs2/locking/dlm/lock.c b/fs/gfs2/locking/dlm/lock.c
+index b167add..f9c8bda 100644
+--- a/fs/gfs2/locking/dlm/lock.c
++++ b/fs/gfs2/locking/dlm/lock.c
+@@ -151,7 +151,7 @@ static inline unsigned int make_flags(struct gdlm_lock *lp,
+ 
+ /* make_strname - convert GFS lock numbers to a string */
+ 
+-static inline void make_strname(struct lm_lockname *lockname,
++static inline void make_strname(const struct lm_lockname *lockname,
+ 				struct gdlm_strname *str)
+ {
+ 	sprintf(str->name, "%8x%16llx", lockname->ln_type,
+@@ -169,6 +169,7 @@ static int gdlm_create_lp(struct gdlm_ls *ls, struct lm_lockname *name,
+ 		return -ENOMEM;
+ 
+ 	lp->lockname = *name;
++	make_strname(name, &lp->strname);
+ 	lp->ls = ls;
+ 	lp->cur = DLM_LOCK_IV;
+ 	lp->lvb = NULL;
+@@ -227,7 +228,6 @@ void gdlm_put_lock(void *lock)
+ unsigned int gdlm_do_lock(struct gdlm_lock *lp)
+ {
+ 	struct gdlm_ls *ls = lp->ls;
+-	struct gdlm_strname str;
+ 	int error, bast = 1;
+ 
+ 	/*
+@@ -249,8 +249,6 @@ unsigned int gdlm_do_lock(struct gdlm_lock *lp)
+ 	if (test_bit(LFL_NOBAST, &lp->flags))
+ 		bast = 0;
+ 
+-	make_strname(&lp->lockname, &str);
+-
+ 	set_bit(LFL_ACTIVE, &lp->flags);
+ 
+ 	log_debug("lk %x,%llx id %x %d,%d %x", lp->lockname.ln_type,
+@@ -258,8 +256,8 @@ unsigned int gdlm_do_lock(struct gdlm_lock *lp)
+ 		  lp->cur, lp->req, lp->lkf);
+ 
+ 	error = dlm_lock(ls->dlm_lockspace, lp->req, &lp->lksb, lp->lkf,
+-			 str.name, str.namelen, 0, gdlm_ast, lp,
+-			 bast ? gdlm_bast : NULL);
++			 lp->strname.name, lp->strname.namelen, 0, gdlm_ast,
++			 lp, bast ? gdlm_bast : NULL);
+ 
+ 	if ((error == -EAGAIN) && (lp->lkf & DLM_LKF_NOQUEUE)) {
+ 		lp->lksb.sb_status = -EAGAIN;
+diff --git a/fs/gfs2/locking/dlm/lock_dlm.h b/fs/gfs2/locking/dlm/lock_dlm.h
+index a87c7bf..6888bd4 100644
+--- a/fs/gfs2/locking/dlm/lock_dlm.h
++++ b/fs/gfs2/locking/dlm/lock_dlm.h
+@@ -106,6 +106,7 @@ enum {
+ struct gdlm_lock {
+ 	struct gdlm_ls		*ls;
+ 	struct lm_lockname	lockname;
++	struct gdlm_strname	strname;
+ 	char			*lvb;
+ 	struct dlm_lksb		lksb;
+ 
+-- 
+1.4.4.2
+
+From 0deaf64a2fd38bd20a4d90fa2c03c96c8d424d4c Mon Sep 17 00:00:00 2001
+From: Benjamin Marzinski <bmarzins at redhat.com>
+Date: Fri, 23 Mar 2007 09:05:12 +0000
+Subject: [PATCH] [GFS2] Fix log entry list corruption
+
+When glock_lo_add and rg_lo_add attempt to add an element to the log, they
+check to see if has already been added before locking the log. If another
+process adds that element to the log in this window between the check and
+locking the log, the element will be added to the list twice. This causes
+the log element list to become corrupted in such a way that the log element
+can never be successfully removed from the list. This patch pulls the
+list_empty() check inside the log lock, to remove this window.
+
+Signed-off-by: Benjamin E. Marzinski <bmarzins at redhat.com>
+Signed-off-by: Steven Whitehouse <swhiteho at redhat.com>
+
+diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
+index 16bb4b4..f82d84d 100644
+--- a/fs/gfs2/lops.c
++++ b/fs/gfs2/lops.c
+@@ -33,16 +33,17 @@ static void glock_lo_add(struct gfs2_sbd *sdp, struct gfs2_log_element *le)
+ 
+ 	tr->tr_touched = 1;
+ 
+-	if (!list_empty(&le->le_list))
+-		return;
+-
+ 	gl = container_of(le, struct gfs2_glock, gl_le);
+ 	if (gfs2_assert_withdraw(sdp, gfs2_glock_is_held_excl(gl)))
+ 		return;
+-	gfs2_glock_hold(gl);
+-	set_bit(GLF_DIRTY, &gl->gl_flags);
+ 
+ 	gfs2_log_lock(sdp);
++	if (!list_empty(&le->le_list)){
++		gfs2_log_unlock(sdp);
++		return;
++	}
++	gfs2_glock_hold(gl);
++	set_bit(GLF_DIRTY, &gl->gl_flags);
+ 	sdp->sd_log_num_gl++;
+ 	list_add(&le->le_list, &sdp->sd_log_le_gl);
+ 	gfs2_log_unlock(sdp);
+@@ -415,13 +416,14 @@ static void rg_lo_add(struct gfs2_sbd *sdp, struct gfs2_log_element *le)
+ 
+ 	tr->tr_touched = 1;
+ 
+-	if (!list_empty(&le->le_list))
+-		return;
+-
+ 	rgd = container_of(le, struct gfs2_rgrpd, rd_le);
+-	gfs2_rgrp_bh_hold(rgd);
+ 
+ 	gfs2_log_lock(sdp);
++	if (!list_empty(&le->le_list)){
++		gfs2_log_unlock(sdp);
++		return;
++	}
++	gfs2_rgrp_bh_hold(rgd);
+ 	sdp->sd_log_num_rg++;
+ 	list_add(&le->le_list, &sdp->sd_log_le_rg);
+ 	gfs2_log_unlock(sdp);
+-- 
+1.4.4.2
+
+From 004e1f045a92ad2c1adeb1642cb36d468e83d145 Mon Sep 17 00:00:00 2001
+From: Benjamin Marzinski <bmarzins at redhat.com>
+Date: Fri, 23 Mar 2007 14:51:56 -0600
+Subject: [PATCH] [GFS2] flush the log if a transaction can't allocate space
+
+This is a fix for bz #208514. When GFS2 frees up space, the freed blocks
+aren't available for reuse until the resource group is successfully written
+to the ondisk journal. So in rare cases, GFS2 operations will fail, saying
+that the filesystem is out of space, when in reality, you are just waiting for
+a log flush. For instance, on a 1Gig filesystem, if I continually write 10 Mb
+to a file, and then truncate it, after a hundred interations, the write will
+fail with -ENOSPC, even though the filesystem is just 1% full.
+
+The attached patch calls a log flush in these cases.  I tested this patch
+fairly heavily to check if there were any locking issues that I missed, and
+it seems to work just fine. Also, this patch only does the log flush if
+get_local_rgrp makes a complete loop of resource groups without skipping
+any do to locking issues. The code would be slightly simpler if it just always
+did the log flush after the first failed pass, and you could only ever have
+to go through the loop twice, instead of up to three times. However, I guessed
+that failing to find a rg simply do to locking issues would be common enough
+to skip the log flush in that case, but I'm not certain that this is the right
+way to go. Either way, I don't suppose this code will be hit all that often.
+
+Signed-off-by: Benjamin E. Marzinski <bmarzins at redhat.com>
+Signed-off-by: Steven Whitehouse <swhiteho at redhat.com>
+
+diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
+index 8d9c08b..2ce48d4 100644
+--- a/fs/gfs2/rgrp.c
++++ b/fs/gfs2/rgrp.c
+@@ -27,6 +27,7 @@
+ #include "trans.h"
+ #include "ops_file.h"
+ #include "util.h"
++#include "log.h"
+ 
+ #define BFITNOENT ((u32)~0)
+ 
+@@ -941,9 +942,13 @@ static int get_local_rgrp(struct gfs2_inode *ip)
+ 			rgd = gfs2_rgrpd_get_first(sdp);
+ 
+ 		if (rgd == begin) {
+-			if (++loops >= 2 || !skipped)
++			if (++loops >= 3)
+ 				return -ENOSPC;
++			if (!skipped)
++				loops++;
+ 			flags = 0;
++			if (loops == 2)
++				gfs2_log_flush(sdp, NULL);
+ 		}
+ 	}
+ 
+-- 
+1.4.4.2
+
+From 3265d3c2685e299c091727d34c2f3a612b884396 Mon Sep 17 00:00:00 2001
+From: Robert Peterson <rpeterso at redhat.com>
+Date: Fri, 23 Mar 2007 17:05:15 -0500
+Subject: [PATCH] [GFS2] Red Hat bz 228540: owner references
+
+In Testing the previously posted and accepted patch for
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=228540
+I uncovered some gfs2 badness.  It turns out that the current
+gfs2 code saves off a process pointer when glocks is taken
+in both the glock and glock holder structures.  Those
+structures will persist in memory long after the process has
+ended; pointers to poisoned memory.
+
+This problem isn't caused by the 228540 fix; the new capability
+introduced by the fix just uncovered the problem.
+
+I wrote this patch that avoids saving process pointers
+and instead saves off the process pid.  Rather than
+referencing the bad pointers, it now does process lookups.
+There is special code that makes the output nicer for
+printing holder information for processes that have ended.
+
+This patch also adds a stub for the new "sprint_symbol"
+function that exists in Andrew Morton's -mm patch set, but
+won't go into the base kernel until 2.6.22, since it adds
+functionality but doesn't fix a bug.
+
+Signed-off-by: Bob Peterson <rpeterso at redhat.com>
+Signed-off-by: Steven Whitehouse <swhiteho at redhat.com>
+
+diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
+index b8aa816..d2e3094 100644
+--- a/fs/gfs2/glock.c
++++ b/fs/gfs2/glock.c
+@@ -25,6 +25,8 @@
+ #include <asm/uaccess.h>
+ #include <linux/seq_file.h>
+ #include <linux/debugfs.h>
++#include <linux/module.h>
++#include <linux/kallsyms.h>
+ 
+ #include "gfs2.h"
+ #include "incore.h"
+@@ -54,6 +56,7 @@ struct glock_iter {
+ typedef void (*glock_examiner) (struct gfs2_glock * gl);
+ 
+ static int gfs2_dump_lockstate(struct gfs2_sbd *sdp);
++static int dump_glock(struct glock_iter *gi, struct gfs2_glock *gl);
+ static void gfs2_glock_xmote_th(struct gfs2_glock *gl, struct gfs2_holder *gh);
+ static void gfs2_glock_drop_th(struct gfs2_glock *gl);
+ static DECLARE_RWSEM(gfs2_umount_flush_sem);
+@@ -64,6 +67,7 @@ static struct dentry *gfs2_root;
+ #define GFS2_GL_HASH_MASK       (GFS2_GL_HASH_SIZE - 1)
+ 
+ static struct gfs2_gl_hash_bucket gl_hash_table[GFS2_GL_HASH_SIZE];
++static struct dentry *gfs2_root;
+ 
+ /*
+  * Despite what you might think, the numbers below are not arbitrary :-)
+@@ -312,7 +316,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,
+ 	atomic_set(&gl->gl_ref, 1);
+ 	gl->gl_state = LM_ST_UNLOCKED;
+ 	gl->gl_hash = hash;
+-	gl->gl_owner = NULL;
++	gl->gl_owner_pid = 0;
+ 	gl->gl_ip = 0;
+ 	gl->gl_ops = glops;
+ 	gl->gl_req_gh = NULL;
+@@ -376,7 +380,7 @@ void gfs2_holder_init(struct gfs2_glock *gl, unsigned int state, unsigned flags,
+ 	INIT_LIST_HEAD(&gh->gh_list);
+ 	gh->gh_gl = gl;
+ 	gh->gh_ip = (unsigned long)__builtin_return_address(0);
+-	gh->gh_owner = current;
++	gh->gh_owner_pid = current->pid;
+ 	gh->gh_state = state;
+ 	gh->gh_flags = flags;
+ 	gh->gh_error = 0;
+@@ -601,7 +605,7 @@ static void gfs2_glmutex_lock(struct gfs2_glock *gl)
+ 	if (test_and_set_bit(GLF_LOCK, &gl->gl_flags)) {
+ 		list_add_tail(&gh.gh_list, &gl->gl_waiters1);
+ 	} else {
+-		gl->gl_owner = current;
++		gl->gl_owner_pid = current->pid;
+ 		gl->gl_ip = (unsigned long)__builtin_return_address(0);
+ 		clear_bit(HIF_WAIT, &gh.gh_iflags);
+ 		smp_mb();
+@@ -628,7 +632,7 @@ static int gfs2_glmutex_trylock(struct gfs2_glock *gl)
+ 	if (test_and_set_bit(GLF_LOCK, &gl->gl_flags)) {
+ 		acquired = 0;
+ 	} else {
+-		gl->gl_owner = current;
++		gl->gl_owner_pid = current->pid;
+ 		gl->gl_ip = (unsigned long)__builtin_return_address(0);
+ 	}
+ 	spin_unlock(&gl->gl_spin);
+@@ -646,7 +650,7 @@ static void gfs2_glmutex_unlock(struct gfs2_glock *gl)
+ {
+ 	spin_lock(&gl->gl_spin);
+ 	clear_bit(GLF_LOCK, &gl->gl_flags);
+-	gl->gl_owner = NULL;
++	gl->gl_owner_pid = 0;
+ 	gl->gl_ip = 0;
+ 	run_queue(gl);
+ 	BUG_ON(!spin_is_locked(&gl->gl_spin));
+@@ -999,12 +1003,12 @@ static int glock_wait_internal(struct gfs2_holder *gh)
+ }
+ 
+ static inline struct gfs2_holder *
+-find_holder_by_owner(struct list_head *head, struct task_struct *owner)
++find_holder_by_owner(struct list_head *head, pid_t pid)
+ {
+ 	struct gfs2_holder *gh;
+ 
+ 	list_for_each_entry(gh, head, gh_list) {
+-		if (gh->gh_owner == owner)
++		if (gh->gh_owner_pid == pid)
+ 			return gh;
+ 	}
+ 
+@@ -1036,24 +1040,24 @@ static void add_to_queue(struct gfs2_holder *gh)
+ 	struct gfs2_glock *gl = gh->gh_gl;
+ 	struct gfs2_holder *existing;
+ 
+-	BUG_ON(!gh->gh_owner);
++	BUG_ON(!gh->gh_owner_pid);
+ 	if (test_and_set_bit(HIF_WAIT, &gh->gh_iflags))
+ 		BUG();
+ 
+-	existing = find_holder_by_owner(&gl->gl_holders, gh->gh_owner);
++	existing = find_holder_by_owner(&gl->gl_holders, gh->gh_owner_pid);
+ 	if (existing) {
+ 		print_symbol(KERN_WARNING "original: %s\n", existing->gh_ip);
+-		printk(KERN_INFO "pid : %d\n", existing->gh_owner->pid);
++		printk(KERN_INFO "pid : %d\n", existing->gh_owner_pid);
+ 		printk(KERN_INFO "lock type : %d lock state : %d\n",
+ 				existing->gh_gl->gl_name.ln_type, existing->gh_gl->gl_state);
+ 		print_symbol(KERN_WARNING "new: %s\n", gh->gh_ip);
+-		printk(KERN_INFO "pid : %d\n", gh->gh_owner->pid);
++		printk(KERN_INFO "pid : %d\n", gh->gh_owner_pid);
+ 		printk(KERN_INFO "lock type : %d lock state : %d\n",
+ 				gl->gl_name.ln_type, gl->gl_state);
+ 		BUG();
+ 	}
+ 
+-	existing = find_holder_by_owner(&gl->gl_waiters3, gh->gh_owner);
++	existing = find_holder_by_owner(&gl->gl_waiters3, gh->gh_owner_pid);
+ 	if (existing) {
+ 		print_symbol(KERN_WARNING "original: %s\n", existing->gh_ip);
+ 		print_symbol(KERN_WARNING "new: %s\n", gh->gh_ip);
+@@ -1756,6 +1760,22 @@ void gfs2_gl_hash_clear(struct gfs2_sbd *sdp, int wait)
+  *  Diagnostic routines to help debug distributed deadlock
+  */
+ 
++static void gfs2_print_symbol(struct glock_iter *gi, const char *fmt,
++                              unsigned long address)
++{
++/* when sprint_symbol becomes available in the new kernel, replace this */
++/* function with:
++        char buffer[KSYM_SYMBOL_LEN];
++
++        sprint_symbol(buffer, address);
++        print_dbg(gi, fmt, buffer);
++*/
++        if (gi)
++                print_dbg(gi, fmt, address);
++        else
++                print_symbol(fmt, address);
++}
++
+ /**
+  * dump_holder - print information about a glock holder
+  * @str: a string naming the type of holder
+@@ -1768,10 +1788,18 @@ static int dump_holder(struct glock_iter *gi, char *str,
+ 		       struct gfs2_holder *gh)
+ {
+ 	unsigned int x;
++	struct task_struct *gh_owner;
+ 
+ 	print_dbg(gi, "  %s\n", str);
+-	print_dbg(gi, "    owner = %ld\n",
+-		   (gh->gh_owner) ? (long)gh->gh_owner->pid : -1);
++	if (gh->gh_owner_pid) {
++		print_dbg(gi, "    owner = %ld ", (long)gh->gh_owner_pid);
++		gh_owner = find_task_by_pid(gh->gh_owner_pid);
++		if (gh_owner)
++			print_dbg(gi, "(%s)\n", gh_owner->comm);
++		else
++			print_dbg(gi, "(ended)\n");
++	} else
++		print_dbg(gi, "    owner = -1\n");
+ 	print_dbg(gi, "    gh_state = %u\n", gh->gh_state);
+ 	print_dbg(gi, "    gh_flags =");
+ 	for (x = 0; x < 32; x++)
+@@ -1784,10 +1812,7 @@ static int dump_holder(struct glock_iter *gi, char *str,
+ 		if (test_bit(x, &gh->gh_iflags))
+ 			print_dbg(gi, " %u", x);
+ 	print_dbg(gi, " \n");
+-	if (gi)
+-		print_dbg(gi, "    initialized at: 0x%x\n", gh->gh_ip);
+-	else
+-		print_symbol(KERN_INFO "    initialized at: %s\n", gh->gh_ip);
++        gfs2_print_symbol(gi, "    initialized at: %s\n", gh->gh_ip);
+ 
+ 	return 0;
+ }
+@@ -1828,6 +1853,7 @@ static int dump_glock(struct glock_iter *gi, struct gfs2_glock *gl)
+ 	struct gfs2_holder *gh;
+ 	unsigned int x;
+ 	int error = -ENOBUFS;
++	struct task_struct *gl_owner;
+ 
+ 	spin_lock(&gl->gl_spin);
+ 
+@@ -1838,10 +1864,21 @@ static int dump_glock(struct glock_iter *gi, struct gfs2_glock *gl)
+ 		if (test_bit(x, &gl->gl_flags))
+ 			print_dbg(gi, " %u", x);
+ 	}
++	if (!test_bit(GLF_LOCK, &gl->gl_flags))
++		print_dbg(gi, " (unlocked)");
+ 	print_dbg(gi, " \n");
+ 	print_dbg(gi, "  gl_ref = %d\n", atomic_read(&gl->gl_ref));
+ 	print_dbg(gi, "  gl_state = %u\n", gl->gl_state);
+-	print_dbg(gi, "  gl_owner = %s\n", gl->gl_owner->comm);
++	if (gl->gl_owner_pid) {
++		gl_owner = find_task_by_pid(gl->gl_owner_pid);
++		if (gl_owner)
++			print_dbg(gi, "  gl_owner = pid %d (%s)\n",
++				  gl->gl_owner_pid, gl_owner->comm);
++		else
++			print_dbg(gi, "  gl_owner = %d (ended)\n",
++				  gl->gl_owner_pid);
++	} else
++		print_dbg(gi, "  gl_owner = -1\n");
+ 	print_dbg(gi, "  gl_ip = %lu\n", gl->gl_ip);
+ 	print_dbg(gi, "  req_gh = %s\n", (gl->gl_req_gh) ? "yes" : "no");
+ 	print_dbg(gi, "  req_bh = %s\n", (gl->gl_req_bh) ? "yes" : "no");
+diff --git a/fs/gfs2/glock.h b/fs/gfs2/glock.h
+index 5e662ea..11477ca 100644
+--- a/fs/gfs2/glock.h
++++ b/fs/gfs2/glock.h
+@@ -38,7 +38,7 @@ static inline int gfs2_glock_is_locked_by_me(struct gfs2_glock *gl)
+ 	/* Look in glock's list of holders for one with current task as owner */
+ 	spin_lock(&gl->gl_spin);
+ 	list_for_each_entry(gh, &gl->gl_holders, gh_list) {
+-		if (gh->gh_owner == current) {
++		if (gh->gh_owner_pid == current->pid) {
+ 			locked = 1;
+ 			break;
+ 		}
+diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
+index 9c12582..fdf0470 100644
+--- a/fs/gfs2/incore.h
++++ b/fs/gfs2/incore.h
+@@ -127,7 +127,7 @@ struct gfs2_holder {
+ 	struct list_head gh_list;
+ 
+ 	struct gfs2_glock *gh_gl;
+-	struct task_struct *gh_owner;
++	pid_t gh_owner_pid;
+ 	unsigned int gh_state;
+ 	unsigned gh_flags;
+ 
+@@ -155,7 +155,7 @@ struct gfs2_glock {
+ 	unsigned int gl_hash;
+ 	unsigned int gl_demote_state; /* state requested by remote node */
+ 	unsigned long gl_demote_time; /* time of first demote request */
+-	struct task_struct *gl_owner;
++	pid_t gl_owner_pid;
+ 	unsigned long gl_ip;
+ 	struct list_head gl_holders;
+ 	struct list_head gl_waiters1;	/* HIF_MUTEX */
+-- 
+1.4.4.2
+


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2308
retrieving revision 1.2309
diff -u -r1.2308 -r1.2309
--- kernel-2.6.spec	3 Apr 2007 13:29:50 -0000	1.2308
+++ kernel-2.6.spec	3 Apr 2007 16:27:49 -0000	1.2309
@@ -313,6 +313,7 @@
 Patch1: patch-2.6.20.1.bz2
 Patch2: patch-2.6.20.1-2.bz2
 Patch3: patch-2.6.20.2-3.bz2
+Patch4: patch-2.6.20.3-4.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 
@@ -418,6 +419,7 @@
 Patch1410: linux-2.6-gfs2-update.patch
 Patch1411: linux-2.6-gfs2-tux.patch
 Patch1412: linux-2.6-gfs2-locking-exports.patch
+Patch1413: linux-2.6-gfs2-update2.patch
 
 # NFS superblock sharing / CacheFS
 Patch1431: linux-2.6-cachefiles.patch
@@ -440,49 +442,14 @@
 Patch1771: linux-2.6-silence-noise.patch
 Patch1780: linux-2.6-drivers-add-qlogic-firmware.patch
 Patch1781: linux-2.6-raid-autorun.patch
-
-# 2.6.20 fixes for testing [in the wrong place]
-Patch1790: linux-2.6-jfs_fix_deadlock.patch
-# test this; it may fix a BZ
-# sent for 20.4; not in yet
-Patch1791: linux-2.6-git-serio-1e4865f8d469b1.patch
-Patch1792: linux-2.6-20_git-serio-keyboard.patch
+Patch1782: linux-2.6-drivers_pci_no_msi_mmconf.patch
 
 # hold on to these
 #Patch: linux-2.6-simplify_assign_irq_vector.patch
 #Patch: linux-2.6-no_handler_for_vector_fix.patch
 
-# 2.6.20.4
-Patch1800: linux-2.6-20.4-fix-another-null-pointer-deref-in-ipv6_sockglue.c.patch
-Patch1801: linux-2.6-20.4-fix-rtm_to_ifaddr-error-return.patch
-Patch1802: linux-2.6-20.4-fix-user-copy-length-in-ipv6_sockglue.c.patch
-Patch1803: linux-2.6-20.4-SCSI-gdth-fix-oops-in-gdth_copy_cmd.patch
-Patch1804: linux-2.6-20.4-netlabel-cipso_std_bug.patch
-Patch1805: linux-2.6-20.4-netfilter-nfnetlink_log-fix-reference-counting.patch
-Patch1806: linux-2.6-20.4-ia64-fix-null-pointer-in-ia64-irq_chip-mask-unmask-function.patch
-Patch1807: linux-2.6-20.4-adjust-legacy-ide-resource-setting.patch
-Patch1808: linux-2.6-20.4-mm-fix-madvise-infinine-loop.patch
-Patch1809: linux-2.6-20.4-ehci-add-delay-to-bus_resume-before-accessing-ports.patch
-Patch1810: linux-2.6-20.4-initialise-pi_lock-if-config_rt_mutexes-n.patch
-Patch1811: linux-2.6-20.4-futex-pi-state-locking-fix.patch
-Patch1812: linux-2.6-20.4-nfs-nfs_getattr-can-t-call-nfs_sync_mapping_range-for-non-regular-files.patch
-Patch1813: linux-2.6-20.4-hrtimer-prevent-overrun-dos-in-hrtimer_forward.patch
-Patch1814: linux-2.6-20.4-fix-mtime_sec_max-on-32-bit.patch
-Patch1815: linux-2.6-20.4-fix-read-past-end-of-array-in-md-linear.c.patch
-Patch1816: linux-2.6-20.4-r8169-fix-a-race-between-pci-probe-and-dev_open.patch
-Patch1817: linux-2.6-20.4-fix-extraneous-ipsec-larval-sa-creation.patch
-Patch1818: linux-2.6-20.4-fix-gfp_kernel-with-preemption-disabled-in-fib_trie.patch
-Patch1819: linux-2.6-20.4-fix-ipv6-flow-label-inheritance.patch
-Patch1820: linux-2.6-20.4-copy-over-mac_len-when-cloning-an-skb.patch
-Patch1821: linux-2.6-20.4-fix-sparc64-hugepage-bugs.patch
-Patch1822: linux-2.6-20.4-fix-page-allocation-debugging-on-sparc64.patch
-Patch1823: linux-2.6-20.4-irda-irttp_dup-spin_lock-initialisation.patch
-
-# submitted for 2.6.20.4: not in
-Patch1830: linux-2.6-20.4x_DIO_invalidate_pages.patch
-Patch1831: linux-2.6-20.4x_OOM_dont_kill_processes_with_unkillable_children.patch
-Patch1832: linux-2.6-20.4x_serio_really_suppress_ack_nak.patch
-Patch1833: linux-2.6-20.4x_snd_hda_codec_max_codecs_fix.patch
+# 2.6.20 fixes for testing
+Patch1790: linux-2.6-jfs_fix_deadlock.patch
 
 # SELinux/audit patches.
 Patch1850: linux-2.6-selinux-mprotect-checks.patch
@@ -896,6 +863,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
@@ -1065,6 +1033,8 @@
 #%patch1411 -p1
 # GFS2/DLM locking exports
 %patch1412 -p1
+# additional gfs2 update
+%patch1413 -p1
 
 #nfs sharing / cachefs
 %patch1431 -p1
@@ -1100,43 +1070,11 @@
 %patch1780 -p1
 # restore START_ARRAY ioctl
 %patch1781 -p1
+# disable PCI MSI and MMCONFIG by default
+%patch1782 -p1
 
 # 2.6.20 test fixes
 %patch1790 -p1
-%patch1791 -p1
-%patch1792 -p1
-
-# 2.6.20.4 queue
-%patch1800 -p1
-%patch1801 -p1
-%patch1802 -p1
-%patch1803 -p1
-%patch1804 -p1
-%patch1805 -p1
-%patch1806 -p1
-%patch1807 -p1
-%patch1808 -p1
-%patch1809 -p1
-%patch1810 -p1
-%patch1811 -p1
-%patch1812 -p1
-%patch1813 -p1
-%patch1814 -p1
-%patch1815 -p1
-%patch1816 -p1
-%patch1817 -p1
-%patch1818 -p1
-%patch1819 -p1
-%patch1820 -p1
-%patch1821 -p1
-%patch1822 -p1
-%patch1823 -p1
-
-# submitted for 2.6.20.4: not in yet
-%patch1830 -p1
-%patch1831 -p1
-%patch1832 -p1
-%patch1833 -p1
 
 # Fix the SELinux mprotect checks on executable mappings
 %patch1850 -p1
@@ -1176,7 +1114,6 @@
 # be merged upstream
 #
 
-
 #
 # final stuff
 #
@@ -1929,6 +1866,13 @@
 %endif
 
 %changelog
+* Tue Apr  3 2007 Chuck Ebbert <cebbert at redhat.com>		1.2309
+- 2.6.20.4 final.
+- Add Marvell PATA driver.
+- 1782: Disable PCI MSI and MMCONFIG by default,
+  add options to enable them.
+- 1413: GFS2 update.
+
 * Tue Apr  3 2007 Markus Armbruster <armbru at redhat.com>
 - Add PACKET_AUXDATA cmsg (Herbert Xu )
 - Xen kernel:
@@ -2001,7 +1945,6 @@
 	1807: linux-2.6-20_nfs_getattr_check_isreg.patch
 	1808: linux-2.6-20_pi_futex_state_locking.patch
 
-
 * Thu Mar 15 2007 Chuck Ebbert <cebbert at redhat.com>
 - Added:
 	206: linux-2.6-20_x86_64_xapic_8_bit_dest.patch
@@ -2031,8 +1974,6 @@
 	1792: linux-2.6-20_git-serio-keyboard.patch
 	1794: linux-2.6-20_ia64_chip_mask.patch (Prarit)
 
-
-
 * Wed Mar 7 2007 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.20.2-rc1
 - Additional fixes:


--- linux-2.6-20.4-SCSI-gdth-fix-oops-in-gdth_copy_cmd.patch DELETED ---


--- linux-2.6-20.4-adjust-legacy-ide-resource-setting.patch DELETED ---


--- linux-2.6-20.4-copy-over-mac_len-when-cloning-an-skb.patch DELETED ---


--- linux-2.6-20.4-ehci-add-delay-to-bus_resume-before-accessing-ports.patch DELETED ---


--- linux-2.6-20.4-fix-another-null-pointer-deref-in-ipv6_sockglue.c.patch DELETED ---


--- linux-2.6-20.4-fix-extraneous-ipsec-larval-sa-creation.patch DELETED ---


--- linux-2.6-20.4-fix-gfp_kernel-with-preemption-disabled-in-fib_trie.patch DELETED ---


--- linux-2.6-20.4-fix-ipv6-flow-label-inheritance.patch DELETED ---


--- linux-2.6-20.4-fix-mtime_sec_max-on-32-bit.patch DELETED ---


--- linux-2.6-20.4-fix-page-allocation-debugging-on-sparc64.patch DELETED ---


--- linux-2.6-20.4-fix-read-past-end-of-array-in-md-linear.c.patch DELETED ---


--- linux-2.6-20.4-fix-rtm_to_ifaddr-error-return.patch DELETED ---


--- linux-2.6-20.4-fix-sparc64-hugepage-bugs.patch DELETED ---


--- linux-2.6-20.4-fix-user-copy-length-in-ipv6_sockglue.c.patch DELETED ---


--- linux-2.6-20.4-futex-pi-state-locking-fix.patch DELETED ---


--- linux-2.6-20.4-hrtimer-prevent-overrun-dos-in-hrtimer_forward.patch DELETED ---


--- linux-2.6-20.4-ia64-fix-null-pointer-in-ia64-irq_chip-mask-unmask-function.patch DELETED ---


--- linux-2.6-20.4-initialise-pi_lock-if-config_rt_mutexes-n.patch DELETED ---


--- linux-2.6-20.4-irda-irttp_dup-spin_lock-initialisation.patch DELETED ---


--- linux-2.6-20.4-mm-fix-madvise-infinine-loop.patch DELETED ---


--- linux-2.6-20.4-netfilter-nfnetlink_log-fix-reference-counting.patch DELETED ---


--- linux-2.6-20.4-netlabel-cipso_std_bug.patch DELETED ---


--- linux-2.6-20.4-nfs-nfs_getattr-can-t-call-nfs_sync_mapping_range-for-non-regular-files.patch DELETED ---


--- linux-2.6-20.4-r8169-fix-a-race-between-pci-probe-and-dev_open.patch DELETED ---


--- linux-2.6-20.4x_DIO_invalidate_pages.patch DELETED ---


--- linux-2.6-20.4x_OOM_dont_kill_processes_with_unkillable_children.patch DELETED ---


--- linux-2.6-20.4x_serio_really_suppress_ack_nak.patch DELETED ---


--- linux-2.6-20.4x_snd_hda_codec_max_codecs_fix.patch DELETED ---


--- linux-2.6-20_git-serio-keyboard.patch DELETED ---


--- linux-2.6-git-serio-1e4865f8d469b1.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr  3 16:30:38 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 12:30:38 -0400
Subject: rpms/hplip/devel hplip.spec,1.109,1.110
Message-ID: <200704031630.l33GUcOV006699@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
Need to remove the Categories line first..


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- hplip.spec	3 Apr 2007 16:20:28 -0000	1.109
+++ hplip.spec	3 Apr 2007 16:30:31 -0000	1.110
@@ -118,6 +118,7 @@
 
 mkdir -p %{buildroot}%{_datadir}/applications
 echo 'NoDisplay=true' >> %{buildroot}%{_datadir}/hplip/data/hplip.desktop
+sed -i -e '/^Categories=/d' %{buildroot}%{_datadir}/hplip/data/hplip.desktop
 desktop-file-install --vendor HP				\
 	--dir %{buildroot}%{_datadir}/applications		\
 	--add-category X-Red-Hat-Extra				\



From fedora-cvs-commits at redhat.com  Tue Apr  3 16:33:52 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 12:33:52 -0400
Subject: rpms/metacity/devel metacity.spec,1.110,1.111
Message-ID: <200704031633.l33GXq6G009013@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	metacity.spec 
Log Message:
fix typo



Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- metacity.spec	3 Apr 2007 16:13:55 -0000	1.110
+++ metacity.spec	3 Apr 2007 16:33:50 -0000	1.111
@@ -138,8 +138,8 @@
 %{_includedir}/*
 %{_libdir}/lib*.so*
 %{_libdir}/pkgconfig/*
-%{_mandir}/man1/metacify-theme-viewer.1.gz
-%{_mandir}/man1/metacify-window-demo.1.gz
+%{_mandir}/man1/metacity-theme-viewer.1.gz
+%{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
 * Tue Apr  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-2



From fedora-cvs-commits at redhat.com  Tue Apr  3 16:52:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 12:52:45 -0400
Subject: rpms/kernel/FC-5 linux-2.6-drivers_pci_no_msi_mmconf.patch,1.1,1.2
Message-ID: <200704031652.l33GqjWp022861@cvs.devel.redhat.com>

Author: cebbert

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

Modified Files:
	linux-2.6-drivers_pci_no_msi_mmconf.patch 
Log Message:
Fix nomsi nommconf patch.


linux-2.6-drivers_pci_no_msi_mmconf.patch:
 Documentation/kernel-parameters.txt |    5 +++++
 arch/i386/pci/common.c              |    6 +++++-
 drivers/pci/msi.c                   |    6 +++++-
 drivers/pci/pci.c                   |    2 ++
 drivers/pci/pci.h                   |    2 ++
 5 files changed, 19 insertions(+), 2 deletions(-)

Index: linux-2.6-drivers_pci_no_msi_mmconf.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-drivers_pci_no_msi_mmconf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-drivers_pci_no_msi_mmconf.patch	3 Apr 2007 16:27:49 -0000	1.1
+++ linux-2.6-drivers_pci_no_msi_mmconf.patch	3 Apr 2007 16:52:43 -0000	1.2
@@ -10,7 +10,8 @@
  arch/i386/pci/common.c              |    6 +++++-
  drivers/pci/msi.c                   |    6 +++++-
  drivers/pci/pci.c                   |    2 ++
- 4 files changed, 17 insertions(+), 2 deletions(-)
+ drivers/pci/pci.h                   |    2 ++
+ 5 files changed, 19 insertions(+), 2 deletions(-)
 
 --- linux-2.6.20.noarch.orig/drivers/pci/msi.c
 +++ linux-2.6.20.noarch/drivers/pci/msi.c
@@ -83,3 +84,17 @@
  #endif
  	else if (!strcmp(str, "noacpi")) {
  		acpi_noirq_set();
+--- linux-2.6.20.noarch.orig/drivers/pci/pci.h
++++ linux-2.6.20.noarch/drivers/pci/pci.h
+@@ -52,9 +52,11 @@ extern unsigned int pci_pm_d3_delay;
+ #ifdef CONFIG_PCI_MSI
+ void disable_msi_mode(struct pci_dev *dev, int pos, int type);
+ void pci_no_msi(void);
++void pci_yes_msi(void);
+ #else
+ static inline void disable_msi_mode(struct pci_dev *dev, int pos, int type) { }
+ static inline void pci_no_msi(void) { }
++static inline void pci_yes_msi(void) { }
+ #endif
+ #if defined(CONFIG_PCI_MSI) && defined(CONFIG_PM)
+ int pci_save_msi_state(struct pci_dev *dev);



From fedora-cvs-commits at redhat.com  Tue Apr  3 16:59:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 12:59:18 -0400
Subject: rpms/gnome-panel/devel
	gnome-panel-2.18.0-update-clock-immediately.patch, NONE,
	1.1 gnome-panel.spec, 1.190, 1.191
Message-ID: <200704031659.l33GxIiw027877@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.18.0-update-clock-immediately.patch 
Log Message:
- update the clock after timezone changes (bug 230832)


gnome-panel-2.18.0-update-clock-immediately.patch:
 clock.c |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)

--- NEW FILE gnome-panel-2.18.0-update-clock-immediately.patch ---
--- gnome-panel-2.18.0/applets/clock/clock.c.update-clock-immediately	2007-04-03 20:10:39.000000000 +0400
+++ gnome-panel-2.18.0/applets/clock/clock.c	2007-04-03 20:43:08.000000000 +0400
@@ -2001,14 +2001,30 @@
 	g_free (utf8);
 }
 
+static void
+on_config_tool_exited (GPid     pid,
+                       gint     status,
+                       gpointer data)
+{
+  ClockData *clock;
+
+  clock = (ClockData *) data;
+
+  refresh_clock (clock);
+
+  g_spawn_close_pid (pid);
+}
+
 static gboolean
 try_config_tool (GdkScreen  *screen,
-		 const char *tool)
+		 const char *tool,
+                 ClockData  *clock)
 {
 	GtkWidget *dialog;
 	GError    *err;
 	char     **argv;
         char      *path;
+        GPid       pid;
 
         if (!tool || tool[0] == '\0')
                 return FALSE;
@@ -2028,15 +2044,18 @@
                                  NULL,
                                  argv,
                                  NULL,
-                                 G_SPAWN_SEARCH_PATH,
-                                 NULL,
+                                 G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
                                  NULL,
                                  NULL,
+                                 &pid,
                                  &err)) {
+
+	        g_child_watch_add (pid, on_config_tool_exited, clock); 
                 g_strfreev (argv);
 		return TRUE;
 	}
 
+
         g_strfreev (argv);
 
 	dialog = gtk_message_dialog_new (NULL,
@@ -2070,11 +2089,11 @@
 
 	screen = gtk_widget_get_screen (cd->applet);
 
-	if (try_config_tool (screen, cd->config_tool))
+	if (try_config_tool (screen, cd->config_tool, cd))
 		return;
 	
 	for (i = 0; i < G_N_ELEMENTS (clock_config_tools); i++)
-		if (try_config_tool (screen, clock_config_tools [i]))
+		if (try_config_tool (screen, clock_config_tools [i], cd))
 			return;
 		
 	dialog = gtk_message_dialog_new (NULL,


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- gnome-panel.spec	31 Mar 2007 18:18:42 -0000	1.190
+++ gnome-panel.spec	3 Apr 2007 16:59:16 -0000	1.191
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.18.0
-Release: 5%{?dist} 
+Release: 6%{?dist} 
 URL: http://www.gnome.org
 Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.18/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -98,6 +98,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=424545
 Patch18: gnome-panel-2.18.0-hide-menu-if-root.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=425910
+Patch19: gnome-panel-2.18.0-update-clock-immediately.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -131,6 +134,7 @@
 %patch15 -p0 -b .compiz-support
 %patch17 -p0 -b .xdg-user-dirs
 %patch18 -p1 -b .hide-lock-menu-if-root
+%patch19 -p1 -b .update-clock-immediately
 
 . %{SOURCE4}
 
@@ -311,6 +315,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Tue Apr  3 2007 Ray Strode <rstrode at redhat.com> - 2.18.0-6
+- update the clock after timezone changes (bug 230832)
+
 * Sat Mar 31 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-5
 - Remove the bug-buddy patch again; fixed better in libgnome
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 17:06:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 13:06:23 -0400
Subject: rpms/iputils/FC-6 iputils-20020927-arping-infiniband.patch, NONE,
	1.1 iputils-20070202-idn.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 iputils-20020927-rh.patch, 1.1,
	1.2 iputils-ping_cleanup.patch, 1.1, 1.2 iputils.spec, 1.43,
	1.44 sources, 1.12, 1.13 iputils-20020124-ping_sparcfix.patch,
	1.2, NONE iputils-20020124-rdisc-server.patch, 1.1,
	NONE iputils-20020927-headers.patch, 1.2,
	NONE iputils-20020927-icmp_seq.patch, 1.1,
	NONE iputils-20020927-inet_pton.patch, 1.1,
	NONE iputils-20020927-trace_stop.patch, 1.2,
	NONE iputils-arping.patch, 1.1,
	NONE iputils-arping_buf_overflow.patch, 1.1,
	NONE iputils-flood.patch, 1.1, NONE iputils-gcc41.patch, 1.2,
	NONE iputils-getaddrinfo.patch, 1.1,
	NONE iputils-glibckernheaders.patch, 1.1,
	NONE iputils-ipv6-hoplimit.patch, 1.1,
	NONE iputils-ping-168166.patch, 1.1,
	NONE iputils-retvals.patch, 1.1, NONE
Message-ID: <200704031706.l33H6Nc9000509@cvs.devel.redhat.com>

Author: mbacovsk

Update of /cvs/dist/rpms/iputils/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv28189

Modified Files:
	.cvsignore iputils-20020927-rh.patch 
	iputils-ping_cleanup.patch iputils.spec sources 
Added Files:
	iputils-20020927-arping-infiniband.patch 
	iputils-20070202-idn.patch 
Removed Files:
	iputils-20020124-ping_sparcfix.patch 
	iputils-20020124-rdisc-server.patch 
	iputils-20020927-headers.patch iputils-20020927-icmp_seq.patch 
	iputils-20020927-inet_pton.patch 
	iputils-20020927-trace_stop.patch iputils-arping.patch 
	iputils-arping_buf_overflow.patch iputils-flood.patch 
	iputils-gcc41.patch iputils-getaddrinfo.patch 
	iputils-glibckernheaders.patch iputils-ipv6-hoplimit.patch 
	iputils-ping-168166.patch iputils-retvals.patch 
Log Message:
* Tue Apr  3 2007 Martin Bacovsky <mbacovsk at redhat.com> - 20070202-1
- upgrade to new upstream 20070202
- old and unused patches removed
- resolves: #213897: ifenslave man page from iputils-20020927-41.fc6 is not a man page
- resolves: #213717: arping doesn't work on InfiniBand ipoib interfaces
- resolves: #220302: LTC29372-ping6 doesn't define the destination address along RFC3484


iputils-20020927-arping-infiniband.patch:
 Makefile |    2 +
 arping.c |   66 +++++++++++++++++++++++++++++++++++++++++++++------------------
 2 files changed, 50 insertions(+), 18 deletions(-)

--- NEW FILE iputils-20020927-arping-infiniband.patch ---
--- iputils/Makefile.infiniband	2007-02-22 15:53:04.000000000 +0100
+++ iputils/Makefile	2007-02-22 15:55:05.000000000 +0100
@@ -45,6 +45,8 @@
 rdisc_srv.o: rdisc.c
 	$(CC) $(CFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c
 
+arping: arping.o
+	$(CC) $(LDFLAGS) arping.o $(LOADLIBES) $(LDLIBS) -lsysfs -o arping
 
 check-kernel:
 ifeq ($(KERNEL_INCLUDE),)
--- iputils/arping.c.infiniband	2007-02-22 15:53:04.000000000 +0100
+++ iputils/arping.c	2007-02-22 15:53:05.000000000 +0100
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <sysfs/libsysfs.h>
 
 #include "SNAPSHOT.h"
 
@@ -48,8 +49,13 @@
 int s;
 int broadcast_only;
 
-struct sockaddr_ll me;
-struct sockaddr_ll he;
+/*
+ * Make these two structs have padding at the end so the overly long Infiniband
+ * hardware addresses can have the remainder of their address tacked onto
+ * the end of the struct without overlapping anything.
+ */
+struct sockaddr_ll me[2];
+struct sockaddr_ll he[2];
 
 struct timeval start, last;
 
@@ -124,7 +130,8 @@
 	p+=4;
 
 	gettimeofday(&now, NULL);
-	err = sendto(s, buf, p-buf, 0, (struct sockaddr*)HE, sizeof(*HE));
+	err = sendto(s, buf, p-buf, 0, (struct sockaddr*)HE, (ah->ar_hln > 8) ?
+		     sizeof(*HE) + ah->ar_hln - 8 : sizeof(*HE));
 	if (err == p-buf) {
 		last = now;
 		sent++;
@@ -174,7 +181,7 @@
 
 	if (last.tv_sec==0 || MS_TDIFF(tv,last) > 500) {
 		count--;
-		send_pack(s, src, dst, &me, &he);
+		send_pack(s, src, dst, &me[0], &he[0]);
 		if (count == 0 && unsolicited)
 			finish();
 	}
@@ -221,7 +228,7 @@
 		return 0;
 	if (ah->ar_pln != 4)
 		return 0;
-	if (ah->ar_hln != me.sll_halen)
+	if (ah->ar_hln != me[0].sll_halen)
 		return 0;
 	if (len < sizeof(*ah) + 2*(4 + ah->ar_hln))
 		return 0;
@@ -232,7 +239,7 @@
 			return 0;
 		if (src.s_addr != dst_ip.s_addr)
 			return 0;
-		if (memcmp(p+ah->ar_hln+4, &me.sll_addr, ah->ar_hln))
+		if (memcmp(p+ah->ar_hln+4, &me[0].sll_addr, ah->ar_hln))
 			return 0;
 	} else {
 		/* DAD packet was:
@@ -250,7 +257,7 @@
 		 */
 		if (src_ip.s_addr != dst.s_addr)
 			return 0;
-		if (memcmp(p, &me.sll_addr, me.sll_halen) == 0)
+		if (memcmp(p, &me[0].sll_addr, me[0].sll_halen) == 0)
 			return 0;
 		if (src.s_addr && src.s_addr != dst_ip.s_addr)
 			return 0;
@@ -266,7 +273,7 @@
 			printf("for %s ", inet_ntoa(dst_ip));
 			s_printed = 1;
 		}
-		if (memcmp(p+ah->ar_hln+4, me.sll_addr, ah->ar_hln)) {
+		if (memcmp(p+ah->ar_hln+4, me[0].sll_addr, ah->ar_hln)) {
 			if (!s_printed)
 				printf("for ");
 			printf("[");
@@ -292,7 +299,7 @@
 	if (quit_on_reply)
 		finish();
 	if(!broadcast_only) {
-		memcpy(he.sll_addr, p, me.sll_halen);
+		memcpy(he[0].sll_addr, p, me[0].sll_halen);
 		unicasting=1;
 	}
 	return 1;
@@ -458,9 +465,9 @@
 		close(probe_fd);
 	};
 
-	me.sll_family = AF_PACKET;
-	me.sll_ifindex = ifindex;
-	me.sll_protocol = htons(ETH_P_ARP);
+	me[0].sll_family = AF_PACKET;
+	me[0].sll_ifindex = ifindex;
+	me[0].sll_protocol = htons(ETH_P_ARP);
 	if (bind(s, (struct sockaddr*)&me, sizeof(me)) == -1) {
 		perror("bind");
 		exit(2);
@@ -473,14 +480,37 @@
 			exit(2);
 		}
 	}
-	if (me.sll_halen == 0) {
+	if (me[0].sll_halen == 0) {
 		if (!quiet)
 			printf("Interface \"%s\" is not ARPable (no ll address)\n", device);
 		exit(dad?0:2);
 	}
-
-	he = me;
-	memset(he.sll_addr, -1, he.sll_halen);
+	he[0] = me[0];
+	he[1] = me[1];
+	{
+		struct sysfs_class_device *dev;
+		struct sysfs_attribute *brdcast;
+		char *next_ch;
+
+		dev = sysfs_open_class_device("net", device);
+		if (!dev) {
+			perror("sysfs class device");
+			exit(2);
+		}
+		brdcast = sysfs_get_classdev_attr(dev, "broadcast");
+		if (!brdcast) {
+			perror("sysfs attribute broadcast");
+			exit(2);
+		}
+		if (sysfs_read_attribute(brdcast)) {
+			perror("sysfs read brdcast");
+			exit(2);
+		}
+		for (ch=0; ch<he[0].sll_halen; ch++) {
+			he[0].sll_addr[ch] = strtol(brdcast->value + (ch*3),
+						    &next_ch, 16);
+		}
+	}
 
 	if (!quiet) {
 		printf("ARPING %s ", inet_ntoa(dst));
@@ -500,7 +530,7 @@
 	while(1) {
 		sigset_t sset, osset;
 		unsigned char packet[4096];
-		struct sockaddr_ll from;
+		struct sockaddr_ll from[2];
 		socklen_t alen = sizeof(from);
 		int cc;
 
@@ -513,7 +543,7 @@
 		sigaddset(&sset, SIGALRM);
 		sigaddset(&sset, SIGINT);
 		sigprocmask(SIG_BLOCK, &sset, &osset);
-		recv_pack(packet, cc, &from);
+		recv_pack(packet, cc, &from[0]);
 		if(received == count)
 			exit(0);
 		sigprocmask(SIG_SETMASK, &osset, NULL);

iputils-20070202-idn.patch:
 Makefile |    5 +++++
 ping.c   |   34 ++++++++++++++++++++++++++++++++++
 ping6.c  |   16 ++++++++++++++++
 3 files changed, 55 insertions(+)

--- NEW FILE iputils-20070202-idn.patch ---
Patch by Robert Scheck <redhat at linuxnetz.de> for iputils >= 20070202, which adds
IDN support (umlaut domains) to ping and ping6. For ping this requires the libidn
package installed. For ping6, glibc >= 2.3.4 or glibc 2.3.3 CVS >= 20031001 is
needed.

--- iputils-s20070202/ping.c			2007-03-11 12:22:08.000000000 +0100
+++ iputils-s20070202/ping.c.idn		2007-03-11 14:05:40.000000000 +0100
@@ -58,6 +58,12 @@
  *	This program has to run SUID to ROOT to access the ICMP socket.
  */
 
+#define LIBIDN
+#ifdef LIBIDN
+#include <idna.h>
+#include <locale.h>
+#endif
+
 #include "ping_common.h"
 
 #include <linux/icmp.h>
@@ -115,6 +121,12 @@
 	char *target, hnamebuf[MAXHOSTNAMELEN];
 	char rspace[3 + 4 * NROUTES + 1];	/* record route space */
 
+#ifdef LIBIDN
+	char *idn;
+	int rc = 0;
+	setlocale(LC_ALL, "");
+#endif
+
 	icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
 	socket_errno = errno;
 
@@ -236,13 +248,35 @@
 			if (argc == 1)
 				options |= F_NUMERIC;
 		} else {
+#ifdef LIBIDN
+			rc = idna_to_ascii_lz (target, &idn, 0);
+			if (rc == IDNA_SUCCESS)
+				hp = gethostbyname (idn);
+			else {
+				fprintf(stderr, "ping: IDN encoding of '%s' failed with error code %d\n", target, rc);
+				exit(2);
+			}
+			free(idn);
+#else
 			hp = gethostbyname(target);
+#endif
 			if (!hp) {
 				fprintf(stderr, "ping: unknown host %s\n", target);
 				exit(2);
 			}
 			memcpy(&whereto.sin_addr, hp->h_addr, 4);
+#ifdef LIBIDN
+			rc = idna_to_unicode_lzlz (hp->h_name, &idn, 0);
+			if (rc == IDNA_SUCCESS)
+				strncpy(hnamebuf, idn, sizeof(hnamebuf) - 1);
+			else {
+				fprintf(stderr, "ping: IDN encoding of '%s' failed with error code %d\n", hp->h_name, rc);
+				exit(2);
+			}
+			free(idn);
+#else
 			strncpy(hnamebuf, hp->h_name, sizeof(hnamebuf) - 1);
+#endif
 			hnamebuf[sizeof(hnamebuf) - 1] = 0;
 			hostname = hnamebuf;
 		}
--- iputils-s20070202/Makefile			2007-03-11 12:22:08.000000000 +0100 
+++ iputils-s20070202/Makefile.idn		2007-03-11 14:16:56.000000000 +0100
@@ -35,8 +35,13 @@
 
 
 tftpd: tftpd.o tftpsubs.o
+
 ping: ping.o ping_common.o
+	$(CC) $(CFLAGS) ping.o ping_common.o -lidn -o ping
+
 ping6: ping6.o ping_common.o
+	$(CC) $(CFLAGS) ping6.o ping_common.o -o ping6
+
 ping.o ping6.o ping_common.o: ping_common.h
 tftpd.o tftpsubs.o: tftp.h
 
--- iputils-s20070202/ping6.c			2007-03-25 13:21:27.000000000 +0200
+++ iputils-s20070202/ping6.c.idn		2007-03-25 13:53:16.000000000 +0200
@@ -66,6 +66,12 @@
  *	More statistics could always be gathered.
  *	This program has to run SUID to ROOT to access the ICMP socket.
  */
+#define IDN
+#ifdef IDN
+#define _GNU_SOURCE
+#include <locale.h>
+#endif
+
 #include "ping_common.h"
 
 #include <linux/filter.h>
@@ -210,6 +216,10 @@
 	int err, csum_offset, sz_opt;
 	static uint32_t scope_id = 0;
 
+#ifdef IDN
+	setlocale(LC_ALL, "");
+#endif
+
 	icmp_sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
 	socket_errno = errno;
 
@@ -296,6 +306,9 @@
 
 		memset(&hints, 0, sizeof(hints));
 		hints.ai_family = AF_INET6;
+#ifdef IDN
+		hints.ai_flags = AI_IDN;
+#endif
 		gai = getaddrinfo(target, NULL, &hints, &ai);
 		if (gai) {
 			fprintf(stderr, "unknown host\n");
@@ -328,6 +341,9 @@
 
 	memset(&hints, 0, sizeof(hints));
 	hints.ai_family = AF_INET6;
+#ifdef IDN
+	hints.ai_flags = AI_IDN;
+#endif
 	gai = getaddrinfo(target, NULL, &hints, &ai);
 	if (gai) {
 		fprintf(stderr, "unknown host\n");


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/iputils/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	5 Dec 2005 11:15:21 -0000	1.9
+++ .cvsignore	3 Apr 2007 17:06:21 -0000	1.10
@@ -1,3 +1,4 @@
 iputils-ss020927.tar.gz
 rdisc.initd
 ifenslave.tar.gz
+iputils-s20070202.tar.bz2

iputils-20020927-rh.patch:
 Makefile     |    4 ++--
 doc/Makefile |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Index: iputils-20020927-rh.patch
===================================================================
RCS file: /cvs/dist/rpms/iputils/FC-6/iputils-20020927-rh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iputils-20020927-rh.patch	9 Sep 2004 06:24:00 -0000	1.1
+++ iputils-20020927-rh.patch	3 Apr 2007 17:06:21 -0000	1.2
@@ -11,21 +11,14 @@
  
 --- iputils/Makefile.rh7	2002-09-20 20:23:55.000000000 +0200
 +++ iputils/Makefile	2004-05-12 15:08:25.638310270 +0200
-@@ -24,14 +24,14 @@
+@@ -24,8 +24,8 @@
  CC=gcc
  # What a pity, all new gccs are buggy and -Werror does not work. Sigh.
  #CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g -Werror
 -CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
--CFLAGS=$(CCOPT) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(DEFINES) 
+-CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES) 
 +#CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
-+#CFLAGS=$(CCOPT) $(DEFINES) 
++#CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES) 
  
  IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
  IPV6_TARGETS=tracepath6 traceroute6 ping6
- TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
- 
--all: check-kernel $(TARGETS)
-+all: $(TARGETS)
- 
- 
- tftpd: tftpd.o tftpsubs.o

iputils-ping_cleanup.patch:
 ping.c        |   27 +++++++++++++++++++++++++++
 ping_common.c |    2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

Index: iputils-ping_cleanup.patch
===================================================================
RCS file: /cvs/dist/rpms/iputils/FC-6/iputils-ping_cleanup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iputils-ping_cleanup.patch	6 Feb 2006 10:02:24 -0000	1.1
+++ iputils-ping_cleanup.patch	3 Apr 2007 17:06:21 -0000	1.2
@@ -1,25 +1,5 @@
---- iputils/ping6.c.OLD	2006-02-06 10:34:35.000000000 +0100
-+++ iputils/ping6.c	2006-02-06 10:35:38.000000000 +0100
-@@ -353,7 +353,7 @@
- 	hostname = target;
- 
- 	if (ipv6_addr_any(&source.sin6_addr)) {
--		int alen;
-+		socklen_t alen;
- 		int probe_fd = socket(AF_INET6, SOCK_DGRAM, 0);
- 
- 		if (probe_fd < 0) {
 --- iputils/ping.c.OLD	2006-02-06 10:34:35.000000000 +0100
 +++ iputils/ping.c	2006-02-06 10:34:35.000000000 +0100
-@@ -253,7 +253,7 @@
- 	}
- 
- 	if (source.sin_addr.s_addr == 0) {
--		int alen;
-+		socklen_t alen;
- 		struct sockaddr_in dst = whereto;
- 		int probe_fd = socket(AF_INET, SOCK_DGRAM, 0);
- 
 @@ -855,9 +855,36 @@
  		case ICMP_SR_FAILED:
  			printf("Source Route Failed\n");
@@ -59,33 +39,6 @@
  			break;
 --- iputils/ping_common.c.OLD	2006-02-06 10:34:35.000000000 +0100
 +++ iputils/ping_common.c	2006-02-06 10:34:35.000000000 +0100
-@@ -67,7 +67,7 @@
- 	int ii, jj, kk;
- 	int pat[16];
- 	char *cp;
--	char *bp = outpack+8;
-+	unsigned char *bp = outpack+8;
- 
- 	for (cp = patp; *cp; cp++) {
- 		if (!isxdigit(*cp)) {
-@@ -393,7 +393,7 @@
- void sock_setbufs(int icmp_sock, int alloc)
- {
- 	int rcvbuf, hold;
--	int tmplen = sizeof(hold);
-+	socklen_t tmplen = sizeof(hold);
- 
- 	if (!sndbuf)
- 		sndbuf = alloc;
-@@ -464,7 +464,7 @@
- 
- 	if (!(options & F_PINGFILLED)) {
- 		int i;
--		char *p = outpack+8;
-+		unsigned char *p = outpack+8;
- 
- 		/* Do not forget about case of small datalen,
- 		 * fill timestamp area too!
 @@ -819,7 +819,7 @@
  	}
  	if (pipesize > 1)


Index: iputils.spec
===================================================================
RCS file: /cvs/dist/rpms/iputils/FC-6/iputils.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- iputils.spec	13 Sep 2006 11:42:23 -0000	1.43
+++ iputils.spec	3 Apr 2007 17:06:21 -0000	1.44
@@ -1,42 +1,32 @@
 Summary: Network monitoring tools including ping.
 Name: iputils
-Version: 20020927
-Release: 41%{?dist}
+Version: 20070202
+Release: 1%{?dist}
 License: BSD
+URL: http://www.skbuff.net/iputils
 Group: System Environment/Daemons
-Source0: http://www.tux.org/pub/net/ip-routing/%{name}-ss020927.tar.gz
+Source0: http://www.skbuff.net/iputils/%{name}-s%{version}.tar.bz2
 Source1: ifenslave.tar.gz
 Source3: rdisc.initd
 Patch0: iputils-20020927-rh.patch
-Patch1: iputils-20020124-ping_sparcfix.patch
-Patch2: iputils-20020124-rdisc-server.patch
 Patch3: iputils-20020124-countermeasures.patch
 Patch4: iputils-20020927-addrcache.patch
 Patch5: iputils-20020927-ping-subint.patch
-Patch6: iputils-20020927-icmp_seq.patch
-Patch7: iputils-glibckernheaders.patch
-Patch8: iputils-20020927-headers.patch
 Patch9: iputils-20020927-unaligned.patch
-Patch10: iputils-20020927-inet_pton.patch
-Patch11: iputils-retvals.patch
-#Patch12: iputils-arping.patch
 Patch13: iputils-20020927-ia64_align.patch
-Patch14: iputils-arping_buf_overflow.patch
 Patch15: iputils-20020927-12-arping.patch
-Patch16: iputils-getaddrinfo.patch
-Patch17: iputils-flood.patch
-Patch18: iputils-ping-168166.patch
-Patch19: iputils-ipv6-hoplimit.patch
-Patch20: iputils-gcc41.patch
 Patch21: iputils-ping_cleanup.patch
 Patch22: iputils-ifenslave.patch
-Patch23: iputils-20020927-trace_stop.patch
+Patch25: iputils-20020927-arping-infiniband.patch
+Patch26: iputils-20070202-idn.patch
 
-Prefix: %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-root
-BuildPreReq: docbook-utils perl-SGMLSpm
-BuildPreReq: glibc-kernheaders >= 2.4-8.19
-PreReq: chkconfig
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: docbook-utils perl-SGMLSpm
+BuildRequires: glibc-kernheaders >= 2.4-8.19
+BuildRequires: libsysfs-devel
+BuildRequires: libidn-devel
+Requires(post): chkconfig
+Requires(preun): chkconfig
 
 %description
 The iputils package contains basic utilities for monitoring a network,
@@ -45,32 +35,19 @@
 the target machine is alive and receiving network traffic.
 
 %prep
-%setup -q -a 1 -n %{name}
+%setup -q -a 1 -n %{name}-s%{version}
 
 %patch0 -p1 -b .rh
-%patch1 -p1 -b .ping_sparcfix
-%patch2 -p1 -b .rdisc-server
 %patch3 -p1 -b .countermeasures
 %patch4 -p1 -b .addrcache
 %patch5 -p1 -b .ping-subint
-%patch6 -p1 -b .icmp_seq
-%patch7 -p1 -b .glibckernheaders
-%patch8 -p1 -b .headers
 %patch9 -p1 -b .unaligned
-%patch10 -p1 -b .inet_pton
-%patch11 -p1 -b .retvals
-#%patch12 -b .arping
 %patch13 -p1 -b .align
-%patch14 -p1 -b .buf_overflow
 %patch15 -p1 -b .timeout
-%patch16 -p1 -b .getaddrinfo
-%patch17 -p1 -b .flood
-%patch18 -p1 -b .memset
-%patch19 -p1 -b .hoplimit
-%patch20 -p1 -b .gcc41
 %patch21 -p1 -b .cleanup
 %patch22 -p1 -b .addr
-%patch23 -p1 -b .trace_stop
+%patch25 -p1 -b .infiniband
+%patch26 -p1 -b .idn
 
 %build
 %ifarch s390 s390x
@@ -103,13 +80,11 @@
 install -c ping6		${RPM_BUILD_ROOT}/bin/
 install -c tracepath		${RPM_BUILD_ROOT}/bin/
 install -c tracepath6		${RPM_BUILD_ROOT}/bin/
-#install -c traceroute6		${RPM_BUILD_ROOT}/bin/
 
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 ln -sf /bin/ping6 ${RPM_BUILD_ROOT}%{_sbindir}
 ln -sf /bin/tracepath ${RPM_BUILD_ROOT}%{_sbindir}
 ln -sf /bin/tracepath6 ${RPM_BUILD_ROOT}%{_sbindir}
-#ln -sf /bin/traceroute6 ${RPM_BUILD_ROOT}%{_sbindir}
 
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 install -c doc/clockdiff.8	${RPM_BUILD_ROOT}%{_mandir}/man8/
@@ -121,7 +96,6 @@
 ln -s %{_mandir}/man8/ping.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/ping6.8.gz
 ln -s %{_mandir}/man8/tracepath.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/tracepath6.8.gz
 
-#install service
 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
 install -m 755 %SOURCE3 ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/rdisc
 
@@ -144,7 +118,7 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc RELNOTES README.bonding
 %{_sbindir}/clockdiff
 %ifos linux
@@ -161,15 +135,20 @@
 %attr(4755,root,root) /bin/ping6
 /bin/tracepath
 /bin/tracepath6
-#%attr(4755,root,root)/bin/traceroute6
 %{_sbindir}/ping6
 %{_sbindir}/tracepath
 %{_sbindir}/tracepath6
-#%{_sbindir}/traceroute6
 %attr(0644,root,root) %{_mandir}/man8/*
 %config(noreplace) %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
+* Tue Apr  3 2007 Martin Bacovsky <mbacovsk at redhat.com> - 20070202-1
+- upgrade to new upstream 20070202
+- old and unused patches removed
+- resolves: #213897: ifenslave man page from iputils-20020927-41.fc6 is not a man page
+- resolves: #213717: arping doesn't work on InfiniBand ipoib interfaces
+- resolves: #220302: LTC29372-ping6 doesn't define the destination address along RFC3484
+
 * Wed Sep 13 2006 Radek Vokal <rvokal at redhat.com> - 20020927-41
 - new ifenslave/bonding documentation
 
@@ -400,7 +379,7 @@
 - add ifenslave.
 
 * Thu Feb  3 2000 Elliot Lee <sopwith at redhat.com>
-- List /usr/sbin/rdisc in %files list.
+- List /usr/sbin/rdisc in %%files list.
 
 * Thu Jan 27 2000 Jeff Johnson <jbj at redhat.com>
 - add remaining binaries.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/iputils/FC-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	13 Sep 2006 11:42:24 -0000	1.12
+++ sources	3 Apr 2007 17:06:21 -0000	1.13
@@ -1,3 +1,3 @@
-b5493f7a2997130a4f86c486c9993b86  iputils-ss020927.tar.gz
 349c02b907d61a143876f85cbd006c89  rdisc.initd
 6c3f8bffe792b2b49a99aefcf730e72f  ifenslave.tar.gz
+1d38fb3cfc2b71496e43cf646bfc1d6e  iputils-s20070202.tar.bz2


--- iputils-20020124-ping_sparcfix.patch DELETED ---


--- iputils-20020124-rdisc-server.patch DELETED ---


--- iputils-20020927-headers.patch DELETED ---


--- iputils-20020927-icmp_seq.patch DELETED ---


--- iputils-20020927-inet_pton.patch DELETED ---


--- iputils-20020927-trace_stop.patch DELETED ---


--- iputils-arping.patch DELETED ---


--- iputils-arping_buf_overflow.patch DELETED ---


--- iputils-flood.patch DELETED ---


--- iputils-gcc41.patch DELETED ---


--- iputils-getaddrinfo.patch DELETED ---


--- iputils-glibckernheaders.patch DELETED ---


--- iputils-ipv6-hoplimit.patch DELETED ---


--- iputils-ping-168166.patch DELETED ---


--- iputils-retvals.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr  3 17:16:20 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 13:16:20 -0400
Subject: rpms/gtk2/FC-6 gtk2.spec,1.202,1.203
Message-ID: <200704031716.l33HGKsS008133@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gtk2.spec 
Log Message:
- fix filechooser search



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/FC-6/gtk2.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- gtk2.spec	31 Jan 2007 05:01:31 -0000	1.202
+++ gtk2.spec	3 Apr 2007 17:16:17 -0000	1.203
@@ -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
@@ -37,6 +37,7 @@
 # fixed in upstream cvs
 Patch10: gtk+-2.10.4-im-reset.patch
 Patch11: gtk+-2.10.8-recent-menu-crash.patch
+Patch12: raw-printers.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -126,6 +127,7 @@
 
 %patch10 -p1 -b .im-reset
 %patch11 -p1 -b .recent-menu-crash
+%patch12 -p1 -b .raw-printers
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -299,6 +301,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Tue Apr  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.10.8-3
+- Apply a patch to make raw printers work (#219806)
+
 * Tue Jan 30 2007 Matthias Clasen <mclasen at redhat.com> - 2.10.8-2
 - Fix filechooser search support (#225149)
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 17:34:54 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 13:34:54 -0400
Subject: rpms/gtk2/FC-6 raw-printers.patch,NONE,1.1
Message-ID: <200704031734.l33HYsGJ021644@cvs.devel.redhat.com>

Author: mclasen

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

Added Files:
	raw-printers.patch 
Log Message:
add patch


raw-printers.patch:
 gtkcupsutils.c        |  144 +++++++++++++++++++++++++++++++++++++++++++-------
 gtkcupsutils.h        |   11 +++
 gtkprintbackendcups.c |   24 +++++++-
 3 files changed, 156 insertions(+), 23 deletions(-)

--- NEW FILE raw-printers.patch ---
--- gtk+-2.10.8/modules/printbackends/cups/gtkcupsutils.h.raw-printers	2007-01-16 22:15:15.000000000 -0500
+++ gtk+-2.10.8/modules/printbackends/cups/gtkcupsutils.h	2007-03-28 12:22:59.000000000 -0400
@@ -33,6 +33,14 @@
 
 typedef enum
 {
+  GTK_CUPS_ERROR_HTTP,
+  GTK_CUPS_ERROR_IPP,
+  GTK_CUPS_ERROR_IO,
+  GTK_CUPS_ERROR_GENERAL
+} GtkCupsErrorType;
+
+typedef enum
+{
   GTK_CUPS_POST,
   GTK_CUPS_GET
 } GtkCupsRequestType;
@@ -126,6 +134,9 @@
 						   const gchar        *value);
 gboolean         gtk_cups_result_is_error         (GtkCupsResult      *result);
 ipp_t          * gtk_cups_result_get_response     (GtkCupsResult      *result);
+GtkCupsErrorType gtk_cups_result_get_error_type   (GtkCupsResult      *result);
+int              gtk_cups_result_get_error_status (GtkCupsResult      *result);
+int              gtk_cups_result_get_error_code   (GtkCupsResult      *result);
 const char     * gtk_cups_result_get_error_string (GtkCupsResult      *result);
 
 G_END_DECLS
--- gtk+-2.10.8/modules/printbackends/cups/gtkprintbackendcups.c.raw-printers	2007-01-16 22:15:15.000000000 -0500
+++ gtk+-2.10.8/modules/printbackends/cups/gtkprintbackendcups.c	2007-03-28 12:22:59.000000000 -0400
@@ -572,10 +572,17 @@
             g_print ("CUPS Backend: %s <source %p>\n", G_STRFUNC, source));
 
   if (gtk_cups_result_is_error (result))
-    g_warning ("Error result: %s", gtk_cups_result_get_error_string (result));
+    {
+      GTK_NOTE (PRINTING, 
+                g_print("Error result: %s (type %i, status %i, code %i)\n", 
+                        gtk_cups_result_get_error_string (result),
+                        gtk_cups_result_get_error_type (result),
+                        gtk_cups_result_get_error_status (result),
+                        gtk_cups_result_get_error_code (result)));
+     }
 
   ep_callback (GTK_PRINT_BACKEND (dispatch->backend), result, user_data);
-
+    
   return FALSE;
 }
 
@@ -1223,7 +1230,18 @@
 
   if (gtk_cups_result_is_error (result))
     {
-      g_signal_emit_by_name (printer, "details-acquired", FALSE);
+      gboolean success = FALSE;
+
+      /* if we get a 404 then it is just a raw printer without a ppd
+         and not an error */
+      if ((gtk_cups_result_get_error_type (result) == GTK_CUPS_ERROR_HTTP) &&
+          (gtk_cups_result_get_error_status (result) == HTTP_NOT_FOUND))
+        {
+          gtk_printer_set_has_details (printer, TRUE);
+          success = TRUE;
+        } 
+        
+      g_signal_emit_by_name (printer, "details-acquired", success);
       return;
     }
 
--- gtk+-2.10.8/modules/printbackends/cups/gtkcupsutils.c.raw-printers	2007-01-16 22:15:15.000000000 -0500
+++ gtk+-2.10.8/modules/printbackends/cups/gtkcupsutils.c	2007-03-28 12:23:37.000000000 -0400
@@ -51,6 +51,11 @@
 {
   gchar *error_msg;
   ipp_t *ipp_response;
+  GtkCupsErrorType error_type;
+
+  /* some error types like HTTP_ERROR have a status and a code */
+  int error_status;            
+  int error_code;
 
   guint is_error : 1;
   guint is_ipp_response : 1;
@@ -73,15 +78,20 @@
                                         _get_read_data};
 
 static void
-gtk_cups_result_set_error (GtkCupsResult *result, 
-                           const char *error_msg,
+gtk_cups_result_set_error (GtkCupsResult    *result,
+                           GtkCupsErrorType  error_type,
+                           int               error_status,
+                           int               error_code, 
+                           const char       *error_msg,
 			   ...)
 {
   va_list args;
 
   result->is_ipp_response = FALSE;
-
   result->is_error = TRUE;
+  result->error_type = error_type;
+  result->error_status = error_status;
+  result->error_code = error_code;
 
   va_start (args, error_msg);
   result->error_msg = g_strdup_vprintf (error_msg, args);
@@ -206,7 +216,13 @@
   if (request->attempts > _GTK_CUPS_MAX_ATTEMPTS && 
       request->state != GTK_CUPS_REQUEST_DONE)
     {
-      gtk_cups_result_set_error (request->result, "Too many failed attempts");
+      /* TODO: should add a status or error code for too many failed attempts */
+      gtk_cups_result_set_error (request->result, 
+                                 GTK_CUPS_ERROR_GENERAL,
+                                 0,
+                                 0, 
+                                 "Too many failed attempts");
+
       request->state = GTK_CUPS_REQUEST_DONE;
       request->poll_state = GTK_CUPS_HTTP_IDLE;
     }
@@ -622,7 +638,12 @@
           request->state = GTK_CUPS_POST_DONE;
           request->poll_state = GTK_CUPS_HTTP_IDLE;
 
-          gtk_cups_result_set_error (request->result, "Failed Post");
+          /* TODO: should add a status or error code for failed post */
+          gtk_cups_result_set_error (request->result,
+                                     GTK_CUPS_ERROR_GENERAL,
+                                     0,
+                                     0,
+                                     "Failed Post");
         }
 
       request->attempts++;
@@ -649,10 +670,16 @@
 
   if (ipp_status == IPP_ERROR)
     {
+      int cups_error = cupsLastError ();
       request->state = GTK_CUPS_POST_DONE;
       request->poll_state = GTK_CUPS_HTTP_IDLE;
  
-      gtk_cups_result_set_error (request->result, "%s",ippErrorString (cupsLastError ()));
+      gtk_cups_result_set_error (request->result, 
+                                 GTK_CUPS_ERROR_IPP,
+                                 ipp_status,
+                                 cups_error,
+                                 "%s", 
+                                 ippErrorString (cups_error));
       return;
     }
 
@@ -708,7 +735,12 @@
           request->state = GTK_CUPS_POST_DONE;
 	  request->poll_state = GTK_CUPS_HTTP_IDLE;
      
-          gtk_cups_result_set_error (request->result, "Error reading from cache file: %s", error->message);
+          gtk_cups_result_set_error (request->result,
+                                     GTK_CUPS_ERROR_IO,
+                                     io_status,
+                                     error->code, 
+                                     "Error reading from cache file: %s",
+                                     error->message);
 
 	  g_error_free (error);
           return;
@@ -729,10 +761,19 @@
       if (httpWrite(request->http, buffer, (int) bytes) < bytes)
 #endif /* HAVE_CUPS_API_1_2 */
         {
+          int http_errno;
+
+          http_errno = httpError (request->http);
+
           request->state = GTK_CUPS_POST_DONE;
 	  request->poll_state = GTK_CUPS_HTTP_IDLE;
      
-          gtk_cups_result_set_error (request->result, "Error writting to socket in Post %s", strerror (httpError (request->http)));
+          gtk_cups_result_set_error (request->result,
+                                     GTK_CUPS_ERROR_HTTP,
+                                     http_status,
+                                     http_errno, 
+                                     "Error writing to socket in Post %s", 
+                                     g_strerror (http_errno));
           return;
         }
     }
@@ -765,7 +806,12 @@
       request->state = GTK_CUPS_POST_DONE;
       request->poll_state = GTK_CUPS_HTTP_IDLE;
       
-      gtk_cups_result_set_error (request->result, "Can't prompt for authorization");
+      /* TODO: create a not implemented error code */
+      gtk_cups_result_set_error (request->result, 
+                                 GTK_CUPS_ERROR_GENERAL,
+                                 0,
+                                 0,
+                                 "Can't prompt for authorization");
       return;
     }
   else if (http_status == HTTP_ERROR)
@@ -785,7 +831,12 @@
           request->state = GTK_CUPS_POST_DONE;
           request->poll_state = GTK_CUPS_HTTP_IDLE;
      
-          gtk_cups_result_set_error (request->result, "Unknown HTTP error");
+          gtk_cups_result_set_error (request->result,
+                                     GTK_CUPS_ERROR_HTTP,
+                                     http_status,
+                                     error, 
+                                     "Unknown HTTP error");
+
           return;
         }
     }
@@ -817,7 +868,12 @@
       else
         {
           request->state = GTK_CUPS_POST_DONE;
-          gtk_cups_result_set_error (request->result, "HTTP Error in POST %s", strerror (http_errno));
+          gtk_cups_result_set_error (request->result,
+                                     GTK_CUPS_ERROR_HTTP,
+                                     http_status,
+                                     http_errno, 
+                                     "HTTP Error in POST %s", 
+                                     g_strerror (http_errno));
          request->poll_state = GTK_CUPS_HTTP_IDLE;
  
           httpFlush(request->http); 
@@ -866,7 +922,13 @@
 
   if (ipp_status == IPP_ERROR)
     {
-      gtk_cups_result_set_error (request->result, "%s", ippErrorString (cupsLastError()));
+      int ipp_error = cupsLastError ();
+      gtk_cups_result_set_error (request->result,  
+                                 GTK_CUPS_ERROR_IPP,
+                                 ipp_status,
+                                 ipp_error,
+                                 "%s",
+                                 ippErrorString (ipp_error));
       
       ippDelete (request->result->ipp_response);
       request->result->ipp_response = NULL;
@@ -891,7 +953,12 @@
 
   if (request->data_io == NULL)
     {
-      gtk_cups_result_set_error (request->result, "Get requires an open io channel");
+      gtk_cups_result_set_error (request->result,
+                                 GTK_CUPS_ERROR_IO,
+                                 G_IO_STATUS_ERROR,
+                                 G_IO_CHANNEL_ERROR_FAILED, 
+                                 "Get requires an open io channel");
+
       request->state = GTK_CUPS_GET_DONE;
       request->poll_state = GTK_CUPS_HTTP_IDLE;
 
@@ -909,8 +976,13 @@
         {
           request->state = GTK_CUPS_GET_DONE;
           request->poll_state = GTK_CUPS_HTTP_IDLE;
-	  
-          gtk_cups_result_set_error (request->result, "Failed Get");
+	 
+          /* TODO: should add a status or error code for failed GET */ 
+          gtk_cups_result_set_error (request->result, 
+                                     GTK_CUPS_ERROR_GENERAL,
+                                     0,
+                                     0,
+                                     "Failed Get");
         }
 
       request->attempts++;
@@ -947,8 +1019,13 @@
       g_warning ("NOT IMPLEMENTED: We need to prompt for authorization in a non blocking manner");
       request->state = GTK_CUPS_GET_DONE;
       request->poll_state = GTK_CUPS_HTTP_IDLE;
- 
-      gtk_cups_result_set_error (request->result, "Can't prompt for authorization");
+
+      /* TODO: should add a status or error code for not implemented */ 
+      gtk_cups_result_set_error (request->result, 
+                                 GTK_CUPS_ERROR_GENERAL,
+                                 0,
+                                 0,
+                                 "Can't prompt for authorization");
       return;
     }
 /* TODO: detect ssl in configure.ac */
@@ -967,7 +1044,7 @@
       request->attempts++;
       goto again;
     }
-#endif 
+#endif
   else if (http_status != HTTP_OK)
     {
       int http_errno;
@@ -979,7 +1056,12 @@
       else
         {
           request->state = GTK_CUPS_GET_DONE;
-          gtk_cups_result_set_error (request->result, "HTTP Error in GET %s", strerror (http_errno));
+          gtk_cups_result_set_error (request->result,
+                                     GTK_CUPS_ERROR_HTTP,
+                                     http_status,
+                                     http_errno, 
+                                     "HTTP Error in GET %s", 
+                                     g_strerror (http_errno));
           request->poll_state = GTK_CUPS_HTTP_IDLE;
           httpFlush(request->http);
 
@@ -1055,7 +1137,11 @@
       request->state = GTK_CUPS_POST_DONE;
       request->poll_state = GTK_CUPS_HTTP_IDLE;
     
-      gtk_cups_result_set_error (request->result, error->message);
+      gtk_cups_result_set_error (request->result,
+                                 GTK_CUPS_ERROR_IO,
+                                 io_status,
+                                 error->code, 
+                                 error->message);
       g_error_free (error);
     }
 }
@@ -1078,6 +1164,24 @@
   return result->ipp_response;
 }
 
+GtkCupsErrorType
+gtk_cups_result_get_error_type (GtkCupsResult *result)
+{
+  return result->error_type;
+}
+
+int
+gtk_cups_result_get_error_status (GtkCupsResult *result)
+{
+  return result->error_status;
+}
+
+int
+gtk_cups_result_get_error_code (GtkCupsResult *result)
+{
+  return result->error_code;
+}
+
 const char *
 gtk_cups_result_get_error_string (GtkCupsResult *result)
 {



From fedora-cvs-commits at redhat.com  Tue Apr  3 18:58:44 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 14:58:44 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.7,
	1.8 policycoreutils.spec, 1.389, 1.390
Message-ID: <200704031858.l33Iwi8c021129@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Tue Apr 3 2007 Dan Walsh <dwalsh at redhat.com> 2.0.7-9
- Fix polgen.py to not generate udp rules on tcp input


policycoreutils-gui.patch:
 Makefile                    |   30 
 booleansPage.py             |  202 +++
 fcontextPage.py             |  185 ++
 loginsPage.py               |  173 ++
 mappingsPage.py             |   54 
 modulesPage.py              |  170 ++
 polgen.glade                | 1127 +++++++++++++++++
 polgen.py                   |  436 ++++++
 polgengui.py                |  211 +++
 portsPage.py                |  227 +++
 selinux.tbl                 |  265 ++++
 semanagePage.py             |  115 +
 statusPage.py               |  220 +++
 system-config-selinux.glade | 2885 ++++++++++++++++++++++++++++++++++++++++++++
 system-config-selinux.py    |  169 ++
 templates/__init__.py       |   18 
 templates/executable.py     |  156 ++
 templates/network.py        |   46 
 templates/rw.py             |  106 +
 templates/script.py         |   42 
 templates/semodule.py       |   41 
 templates/tmp.py            |   74 +
 templates/var_lib.py        |  107 +
 templates/var_log.py        |   91 +
 templates/var_run.py        |   93 +
 templates/var_spool.py      |  107 +
 translationsPage.py         |  111 +
 usersPage.py                |  166 ++
 28 files changed, 7627 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- policycoreutils-gui.patch	30 Mar 2007 16:19:06 -0000	1.7
+++ policycoreutils-gui.patch	3 Apr 2007 18:58:42 -0000	1.8
@@ -2184,8 +2184,8 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.7/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/polgen.py	2007-03-29 12:10:22.000000000 -0400
-@@ -0,0 +1,437 @@
++++ policycoreutils-2.0.7/gui/polgen.py	2007-04-03 14:54:50.000000000 -0400
+@@ -0,0 +1,436 @@
 +#! /usr/bin/python
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -2368,7 +2368,6 @@
 +                        
 +                for i in self.in_udp:
 +                    rec = self.find_port(int(i))
-+                    print i, rec
 +                    if rec == None:
 +                        self.need_udp_type = True;
 +                    else:
@@ -2398,8 +2397,7 @@
 +	def generate_network_rules(self):
 +		newte = ""
 +		tcp = len(self.in_tcp) + len(self.out_tcp)
-+		udp = len(self.in_udp) + len(self.out_tcp)
-+                
++		udp = len(self.in_udp) + len(self.out_udp)
 +		if tcp >  0 or udp > 0:
 +                    newte = "\n"
 +
@@ -2613,6 +2611,7 @@
 +    mypolicy.add_dir("/var/lib/daemon")
 +    mypolicy.add_dir("/etc/daemon")
 +    mypolicy.add_dir("/etc/daemon/special")
++    mypolicy.set_out_tcp("8000")
 +    print mypolicy.generate()
 +#    mypolicy = policy("inetd", "/usr/sbin/inetd", 1)
 +#    mypolicy.generate()


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -r1.389 -r1.390
--- policycoreutils.spec	30 Mar 2007 16:19:06 -0000	1.389
+++ policycoreutils.spec	3 Apr 2007 18:58:42 -0000	1.390
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 2.0.7
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -186,6 +186,9 @@
 fi
 
 %changelog
+* Tue Apr 3 2007 Dan Walsh <dwalsh at redhat.com> 2.0.7-9
+- Fix polgen.py to not generate udp rules on tcp input
+
 * Fri Mar 30 2007 Dan Walsh <dwalsh at redhat.com> 2.0.7-8
 - system-config-selinux should be able to run on a disabled system,
 - at least enough to get it enabled.



From fedora-cvs-commits at redhat.com  Tue Apr  3 19:15:11 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 15:15:11 -0400
Subject: rpms/dosfstools/devel dosfstools-2.11-label.patch, NONE,
	1.1 dosfstools.spec, 1.28, 1.29
Message-ID: <200704031915.l33JFBEE001242@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/dosfstools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1191

Modified Files:
	dosfstools.spec 
Added Files:
	dosfstools-2.11-label.patch 
Log Message:
* Tue Apr  3 2007 Jeremy Katz <katzj at redhat.com> - 2.11-8
- add dosfslabel (originally by Peter Jones)


dosfstools-2.11-label.patch:
 Makefile     |   14 +++++--
 boot.c       |   46 ++++++++++++++++++++++++
 boot.h       |    1 
 dosfsck.h    |   42 +++++++++++++++++++++-
 dosfslabel.c |  110 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 207 insertions(+), 6 deletions(-)

--- NEW FILE dosfstools-2.11-label.patch ---
--- dosfstools-2.11/dosfsck/Makefile.label	1999-07-06 10:23:11.000000000 -0400
+++ dosfstools-2.11/dosfsck/Makefile	2007-01-11 16:33:54.000000000 -0500
@@ -1,9 +1,12 @@
 
-OBJECTS = boot.o check.o common.o dosfsck.o fat.o file.o io.o lfn.o
+OBJECTS = boot.o check.o common.o fat.o file.o io.o lfn.o
 
-all: dosfsck
+all: dosfsck dosfslabel
 
-dosfsck: $(OBJECTS)
+dosfsck: $(OBJECTS) dosfsck.o
+	$(CC) -o $@ $(LDFLAGS) $^
+
+dosfslabel : $(OBJECTS) dosfslabel.o
 	$(CC) -o $@ $(LDFLAGS) $^
 
 .c.o:
@@ -15,8 +18,10 @@
 	install -m 644 dosfsck.8 $(MANDIR)
 	rm -f $(SBINDIR)/fsck.msdos
 	rm -f $(SBINDIR)/fsck.vfat
+	rm -f $(SBINDIR)/dosfslabel
 	ln -s dosfsck $(SBINDIR)/fsck.msdos
 	ln -s dosfsck $(SBINDIR)/fsck.vfat
+	ln -s dosfslabel $(SBINDIR)/dosfslabel
 	rm -f $(MANDIR)/fsck.msdos.8
 	ln -s dosfsck.8 $(MANDIR)/fsck.msdos.8
 	ln -s dosfsck.8 $(MANDIR)/fsck.vfat.8
@@ -25,7 +30,7 @@
 	rm -f *.o *.s *.i *~ \#*# tmp_make .#* .new*
 
 distclean: clean
-	rm -f *.a dosfsck
+	rm -f *.a dosfsck dosfslabel
 
 dep:
 	sed '/\#\#\# Dependencies/q' <Makefile >tmp_make
@@ -38,6 +43,7 @@
 common.o: common.c common.h
 dosfsck.o: dosfsck.c common.h dosfsck.h io.h boot.h fat.h file.h \
  check.h
+dosfslabel.o: dosfslabel.c common.h dosfsck.h io.h boot.h fat.h file.h check.h
 fat.o: fat.c common.h dosfsck.h io.h check.h fat.h
 file.o: file.c common.h file.h
 io.o: io.c dosfsck.h common.h io.h
--- dosfstools-2.11/dosfsck/dosfsck.h.label	2007-01-11 16:33:54.000000000 -0500
+++ dosfstools-2.11/dosfsck/dosfsck.h	2007-01-11 16:33:54.000000000 -0500
@@ -65,10 +65,47 @@
     __u32	root_cluster;	/* first cluster in root directory */
     __u16	info_sector;	/* filesystem info sector */
     __u16	backup_boot;	/* backup boot sector */
-    __u16	reserved2[6];	/* Unused */
+    __u8 	reserved2[12];	/* Unused */
+
+    __u8        drive_number;   /* Logical Drive Number */
+    __u8        reserved3;      /* Unused */
+
+    __u8        extended_sig;   /* Extended Signature (0x29) */
+    __u32       serial;         /* Serial number */
+    __u8        label[11];      /* FS label */
+    __u8        fs_type[8];     /* FS Type */
+
+    /* fill up to 512 bytes */
+    __u8	junk[422];
+} __attribute__ ((packed));
+
+struct boot_sector_16 {
+    __u8	ignored[3];	/* Boot strap short or near jump */
+    __u8	system_id[8];	/* Name - can be used to special case
+				   partition manager volumes */
+    __u8	sector_size[2];	/* bytes per logical sector */
+    __u8	cluster_size;	/* sectors/cluster */
+    __u16	reserved;	/* reserved sectors */
+    __u8	fats;		/* number of FATs */
+    __u8	dir_entries[2];	/* root directory entries */
+    __u8	sectors[2];	/* number of sectors */
+    __u8	media;		/* media code (unused) */
+    __u16	fat_length;	/* sectors/FAT */
+    __u16	secs_track;	/* sectors per track */
+    __u16	heads;		/* number of heads */
+    __u32	hidden;		/* hidden sectors (unused) */
+    __u32	total_sect;	/* number of sectors (if sectors == 0) */
+    
+    __u8        drive_number;   /* Logical Drive Number */
+    __u8        reserved2;      /* Unused */
+
+    __u8        extended_sig;   /* Extended Signature (0x29) */
+    __u32       serial;         /* Serial number */
+    __u8        label[11];      /* FS label */
+    __u8        fs_type[8];     /* FS Type */
 
     /* fill up to 512 bytes */
-    __u8	junk[448];
+    __u8	junk[450];
 } __attribute__ ((packed));
 
 struct info_sector {
@@ -128,6 +165,7 @@
     long free_clusters;
     loff_t backupboot_start; /* 0 if not present */
     FAT_ENTRY *fat;
+    char *label;
 } DOS_FS;
 
 #ifndef offsetof
--- /dev/null	2006-12-18 18:52:37.519428789 -0500
+++ dosfstools-2.11/dosfsck/dosfslabel.c	2007-01-11 16:35:00.000000000 -0500
@@ -0,0 +1,110 @@
+/* dosfslabel.c  -  User interface */
+
+/* Copyright 2007 Red Hat, Inc.
+ * Portions copyright 1998 Roman Hodek.
+ * Portions copyright 1993 Werner Almesberger.
+ */
+
+#include "../version.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <getopt.h>
+
+#include "common.h"
+#include "dosfsck.h"
+#include "io.h"
+#include "boot.h"
+#include "fat.h"
+#include "file.h"
+#include "check.h"
+
+
+int interactive = 0,list = 0,test = 0,verbose = 0,write_immed = 0;
+int atari_format = 0;
+unsigned n_files = 0;
+void *mem_queue = NULL;
+
+
+static void usage(int error)
+{
+    FILE *f = error ? stderr : stdout;
+    int status = error ? 1 : 0;
+
+    fprintf(f,"usage: dosfslabel device [label]\n");
+    exit(status);
+}
+
+/*
+ * ++roman: On m68k, check if this is an Atari; if yes, turn on Atari variant
+ * of MS-DOS filesystem by default.
+ */
+static void check_atari( void )
+{
+#ifdef __mc68000__
+    FILE *f;
+    char line[128], *p;
+
+    if (!(f = fopen( "/proc/hardware", "r" ))) {
+	perror( "/proc/hardware" );
+	return;
+    }
+
+    while( fgets( line, sizeof(line), f ) ) {
+	if (strncmp( line, "Model:", 6 ) == 0) {
+	    p = line + 6;
+	    p += strspn( p, " \t" );
+	    if (strncmp( p, "Atari ", 6 ) == 0)
+		atari_format = 1;
+	    break;
+	}
+    }
+    fclose( f );
+#endif
+}
+
+
+int main(int argc, char *argv[])
+{
+    DOS_FS fs;
+    int rw = 0;
+
+    char *device = NULL;
+    char *label = NULL;
+    
+    check_atari();
+
+    if (argc < 2 || argc > 3)
+        usage(1);
+
+    if (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help"))
+        usage(0);
+    else if (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version")) {
+        printf( "dosfslabel " VERSION ", " VERSION_DATE ", FAT32, LFN\n" );
+        exit(0);
+    }
+
+    device = argv[1];
+    if (argc == 3) {
+        label = argv[2];
+        if (strlen(label) > 11) {
+            fprintf(stderr,
+                    "dosfslabel: labels can be no longer than 11 characters\n");
+            exit(1);
+        }
+        rw = 1;
+    }
+
+    fs_open(device, rw);
+    read_boot(&fs);
+    if (!rw) {
+        fprintf(stdout, "%s\n", fs.label);
+        exit(0);
+    }
+
+    write_label(&fs, label);
+    return fs_close(rw) ? 1 : 0;
+}
--- dosfstools-2.11/dosfsck/boot.h.label	1997-06-18 06:09:38.000000000 -0400
+++ dosfstools-2.11/dosfsck/boot.h	2007-01-11 16:33:54.000000000 -0500
@@ -7,6 +7,7 @@
 #define _BOOT_H
 
 void read_boot(DOS_FS *fs);
+void write_label(DOS_FS *fs, char *label);
 
 /* Reads the boot sector from the currently open device and initializes *FS */
 
--- dosfstools-2.11/dosfsck/boot.c.label	2005-03-12 09:16:22.000000000 -0500
+++ dosfstools-2.11/dosfsck/boot.c	2007-01-11 16:33:54.000000000 -0500
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
+#include <stdlib.h>
 
 #include "common.h"
 #include "dosfsck.h"
@@ -348,6 +349,21 @@
     /* On FAT32, the high 4 bits of a FAT entry are reserved */
     fs->eff_fat_bits = (fs->fat_bits == 32) ? 28 : fs->fat_bits;
     fs->fat_size = fat_length*logical_sector_size;
+
+    fs->label = calloc(12, sizeof (__u8));
+    if (fs->fat_bits == 12 || fs->fat_bits == 16) {
+        struct boot_sector_16 *b16 = (struct boot_sector_16 *)&b;
+        if (b16->extended_sig == 0x29)
+            memmove(fs->label, b16->label, 11);
+        else
+            fs->label = NULL;
+    } else if (fs->fat_bits == 32) {
+        if (b.extended_sig == 0x29)
+            memmove(fs->label, &b.label, 11);
+        else
+            fs->label = NULL;
+    }
+
     if (fs->clusters > ((unsigned long long)fs->fat_size*8/fs->fat_bits)-2)
 	die("File system has %d clusters but only space for %d FAT entries.",
 	  fs->clusters,((unsigned long long)fs->fat_size*8/fs->fat_bits)-2);
@@ -365,6 +381,36 @@
     if (verbose) dump_boot(fs,&b,logical_sector_size);
 }
 
+void write_label(DOS_FS *fs, char *label)
+{
+    struct boot_sector b;
+    struct boot_sector_16 *b16 = (struct boot_sector_16 *)&b;
+    int l = strlen(label);
+
+    while (l < 11)
+        label[l++] = ' ';
+
+    fs_read(0, sizeof(b), &b);
+    if (fs->fat_bits == 12 || fs->fat_bits == 16) {
+        if (b16->extended_sig != 0x29) {
+            b16->extended_sig = 0x29;
+            b16->serial = 0;
+            memmove(b16->fs_type, fs->fat_bits == 12 ?"FAT12   ":"FAT16   ", 8);
+        }
+        memmove(b16->label, label, 11);
+    } else if (fs->fat_bits == 32) {
+        if (b.extended_sig != 0x29) {
+            b.extended_sig = 0x29;
+            b.serial = 0;
+            memmove(b.fs_type, "FAT32   ", 8);
+        }
+        memmove(b.label, label, 11);
+    }
+    fs_write(0, sizeof(b), &b); 
+    if (fs->fat_bits == 32 && fs->backupboot_start)
+        fs_write(fs->backupboot_start, sizeof(b), &b);
+}
+
 /* Local Variables: */
 /* tab-width: 8     */
 /* End:             */


Index: dosfstools.spec
===================================================================
RCS file: /cvs/dist/rpms/dosfstools/devel/dosfstools.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- dosfstools.spec	21 Feb 2007 13:06:00 -0000	1.28
+++ dosfstools.spec	3 Apr 2007 19:15:09 -0000	1.29
@@ -1,7 +1,7 @@
 Name: dosfstools
 Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux
 Version: 2.11
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-%{version}.src.tar.gz
@@ -9,6 +9,7 @@
 Patch1: dosfstools-2.7-argfix.patch
 Patch2: dosfstools-2.11-assumeKernel26.patch
 Patch4: dosfstools-2.11-fortify.patch
+Patch5: dosfstools-2.11-label.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: mkdosfs-ygg
 Provides: mkdosfs-ygg = %{version}
@@ -23,6 +24,7 @@
 %patch1 -p1 -b .argfix
 %patch2 -p1 -b .assumeKernel26
 %patch4 -p1 -b .fortify
+%patch5 -p1 -b .label
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
@@ -47,6 +49,8 @@
 install -m 644 dosfsck/dosfsck.8 %{buildroot}%{_mandir}/man8
 ln -sf dosfsck.8.gz %{buildroot}%{_mandir}/man8/fsck.vfat.8.gz
 
+install -m755 dosfsck/dosfslabel %{buildroot}/sbin/dosfslabel
+
 %clean
 rm -rf %{buildroot}
 
@@ -56,6 +60,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Tue Apr  3 2007 Jeremy Katz <katzj at redhat.com> - 2.11-8
+- add dosfslabel (originally by Peter Jones)
+
 * Wed Feb 21 2007 Peter Vrabec <pvrabec at redhat.com> 2.11-7
 - fix debuginfo package (#225707)
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 19:15:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 15:15:36 -0400
Subject: rpms/nfs-utils/devel nfs-utils.spec,1.126,1.127
Message-ID: <200704031915.l33JFatJ001564@cvs.devel.redhat.com>

Author: steved

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

Modified Files:
	nfs-utils.spec 
Log Message:
Replace portmap dependency with an rpcbind dependency (bz 228894)



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- nfs-utils.spec	12 Mar 2007 15:43:36 -0000	1.126
+++ nfs-utils.spec	3 Apr 2007 19:15:34 -0000	1.127
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.0.12
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -74,7 +74,7 @@
 
 License: GPL
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-Requires: portmap >= 4.0, sed, gawk, sh-utils, fileutils, textutils, grep
+Requires: rpcbind, sed, gawk, sh-utils, fileutils, textutils, grep
 Requires: modutils >= 2.4.26-9
 BuildRequires: nfs-utils-lib-devel libevent-devel libgssapi-devel
 BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2
@@ -292,6 +292,9 @@
 %endif
 
 %changelog
+* Tue Apr  3 2007 Steve Dickson <steved at redhat.com> 1.0.12-4
+- Replace portmap dependency with an rpcbind dependency (bz 228894)
+
 * Mon Mar 12 2007 Steve Dickson <steved at redhat.com> 1.0.12-3
 - Incorporated Merge Review comments (bz 226198)
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 19:17:07 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 15:17:07 -0400
Subject: rpms/ypbind/devel ypbind.spec,1.38,1.39
Message-ID: <200704031917.l33JH7Gc002689@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/ypbind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2596

Modified Files:
	ypbind.spec 
Log Message:
Replace portmap dependency with an rpcbind dependency (bz 228894)



Index: ypbind.spec
===================================================================
RCS file: /cvs/dist/rpms/ypbind/devel/ypbind.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ypbind.spec	1 Dec 2006 21:12:45 -0000	1.38
+++ ypbind.spec	3 Apr 2007 19:17:05 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain.
 Name: ypbind
 Version: 1.19
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2
@@ -14,7 +14,7 @@
 Patch5: ypbind-mt-1.19-log-binds.patch
 
 Prereq: /sbin/chkconfig
-Requires: portmap, yp-tools, bash >= 2.0
+Requires: rpcbind, yp-tools, bash >= 2.0
 Epoch: 3
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
@@ -90,6 +90,9 @@
 %doc README NEWS
 
 %changelog
+* Tue Apr  3 2007 Steve Dickson <steved at redhat.com> - 3:1.19-8
+- Replace portmap dependency with an rpcbind dependency (bz 228894)
+
 * Fri Dec  1 2006 Steve Dickson <steved at redhat.com> - 3:1.19-7
 - Fixed leaking ports (bz 217874)
 - Log all server bindings (bz 217782)



From fedora-cvs-commits at redhat.com  Tue Apr  3 19:26:00 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 15:26:00 -0400
Subject: rpms/selinux-policy/devel policy-20070219.patch, 1.36,
	1.37 selinux-policy.spec, 1.423, 1.424
Message-ID: <200704031926.l33JQ0rP009375@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20070219.patch selinux-policy.spec 
Log Message:
* Tue Apr 3 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-2
- Allow syslog-ng to read /var
- Allow locate to getattr on all filesystems
- nscd needs setcap


policy-20070219.patch:
 Rules.modular                             |   12 +
 policy/flask/access_vectors               |    4 
 policy/global_booleans                    |    2 
 policy/global_tunables                    |   39 +++-
 policy/mls                                |   31 ++-
 policy/modules/admin/acct.te              |    1 
 policy/modules/admin/amtu.fc              |    3 
 policy/modules/admin/amtu.if              |   53 ++++++
 policy/modules/admin/amtu.te              |   56 ++++++
 policy/modules/admin/bootloader.te        |    2 
 policy/modules/admin/consoletype.te       |    8 
 policy/modules/admin/dmesg.te             |    1 
 policy/modules/admin/firstboot.if         |   18 ++
 policy/modules/admin/kudzu.te             |    2 
 policy/modules/admin/logwatch.te          |    2 
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/rpm.fc               |    3 
 policy/modules/admin/rpm.if               |   65 +++++++
 policy/modules/admin/rpm.te               |    2 
 policy/modules/admin/su.if                |    6 
 policy/modules/admin/sudo.te              |    3 
 policy/modules/admin/usermanage.te        |   42 +++--
 policy/modules/apps/games.fc              |    1 
 policy/modules/apps/gnome.if              |   26 +++
 policy/modules/apps/gpg.fc                |    2 
 policy/modules/apps/loadkeys.if           |   44 +----
 policy/modules/apps/mozilla.if            |    1 
 policy/modules/apps/slocate.te            |    4 
 policy/modules/apps/usernetctl.te         |   10 -
 policy/modules/kernel/corecommands.fc     |    7 
 policy/modules/kernel/corecommands.if     |   20 ++
 policy/modules/kernel/corenetwork.if.in   |   54 ++++++
 policy/modules/kernel/corenetwork.te.in   |   18 +-
 policy/modules/kernel/devices.if          |   36 ++++
 policy/modules/kernel/domain.if           |   18 ++
 policy/modules/kernel/domain.te           |   46 +++++
 policy/modules/kernel/files.fc            |    1 
 policy/modules/kernel/files.if            |   81 ++++++++-
 policy/modules/kernel/filesystem.if       |   39 ++++
 policy/modules/kernel/filesystem.te       |   11 +
 policy/modules/kernel/kernel.if           |   23 ++
 policy/modules/kernel/kernel.te           |    2 
 policy/modules/kernel/mls.if              |   20 ++
 policy/modules/kernel/mls.te              |    3 
 policy/modules/kernel/selinux.if          |   38 ++++
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.if         |    2 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/services/apache.fc         |   14 -
 policy/modules/services/apache.if         |  161 +++++++++++++++++++
 policy/modules/services/apache.te         |   59 +++++++
 policy/modules/services/apcupsd.fc        |    9 +
 policy/modules/services/apcupsd.if        |  108 +++++++++++++
 policy/modules/services/apcupsd.te        |   81 +++++++++
 policy/modules/services/automount.te      |    2 
 policy/modules/services/ccs.te            |   12 +
 policy/modules/services/consolekit.fc     |    1 
 policy/modules/services/consolekit.te     |   22 ++
 policy/modules/services/cron.fc           |    1 
 policy/modules/services/cron.if           |   33 +---
 policy/modules/services/cron.te           |   51 ++++--
 policy/modules/services/cups.te           |    1 
 policy/modules/services/cvs.te            |    2 
 policy/modules/services/cyrus.te          |    5 
 policy/modules/services/dbus.if           |   57 ++++++
 policy/modules/services/dhcp.te           |    2 
 policy/modules/services/djbdns.te         |    5 
 policy/modules/services/dovecot.te        |    5 
 policy/modules/services/ftp.te            |    5 
 policy/modules/services/hal.fc            |    6 
 policy/modules/services/hal.te            |  130 +++++++++++++++
 policy/modules/services/inetd.te          |    5 
 policy/modules/services/kerberos.if       |   58 ++-----
 policy/modules/services/kerberos.te       |   36 ++++
 policy/modules/services/mta.if            |   19 ++
 policy/modules/services/mta.te            |    2 
 policy/modules/services/networkmanager.te |    2 
 policy/modules/services/nis.if            |    4 
 policy/modules/services/nscd.te           |    2 
 policy/modules/services/ntp.te            |    1 
 policy/modules/services/pegasus.if        |   18 ++
 policy/modules/services/pegasus.te        |    6 
 policy/modules/services/postfix.if        |    3 
 policy/modules/services/postfix.te        |    8 
 policy/modules/services/ppp.te            |    9 -
 policy/modules/services/procmail.te       |    1 
 policy/modules/services/pyzor.te          |    1 
 policy/modules/services/radius.te         |    4 
 policy/modules/services/rpc.if            |    5 
 policy/modules/services/rsync.te          |    1 
 policy/modules/services/samba.if          |   44 +++++
 policy/modules/services/samba.te          |   50 +++++-
 policy/modules/services/sasl.te           |   11 +
 policy/modules/services/sendmail.if       |   20 ++
 policy/modules/services/smartmon.te       |    1 
 policy/modules/services/snmp.te           |   10 +
 policy/modules/services/spamassassin.te   |    7 
 policy/modules/services/squid.fc          |    2 
 policy/modules/services/squid.if          |   22 ++
 policy/modules/services/squid.te          |   12 +
 policy/modules/services/ssh.if            |   39 ++++
 policy/modules/services/ssh.te            |    5 
 policy/modules/services/xserver.te        |   10 -
 policy/modules/services/zabbix.fc         |    4 
 policy/modules/services/zabbix.if         |   87 ++++++++++
 policy/modules/services/zabbix.te         |   64 +++++++
 policy/modules/system/application.fc      |    1 
 policy/modules/system/application.if      |  104 ++++++++++++
 policy/modules/system/application.te      |   14 +
 policy/modules/system/authlogin.if        |   83 ++++++++--
 policy/modules/system/authlogin.te        |    3 
 policy/modules/system/fstools.fc          |    1 
 policy/modules/system/fstools.te          |    1 
 policy/modules/system/fusermount.fc       |    6 
 policy/modules/system/fusermount.if       |   41 +++++
 policy/modules/system/fusermount.te       |   45 +++++
 policy/modules/system/getty.te            |    3 
 policy/modules/system/hostname.te         |   14 +
 policy/modules/system/init.if             |    3 
 policy/modules/system/init.te             |   35 +++-
 policy/modules/system/ipsec.if            |   20 ++
 policy/modules/system/iptables.te         |    4 
 policy/modules/system/libraries.fc        |    8 
 policy/modules/system/libraries.te        |   20 ++
 policy/modules/system/locallogin.te       |    7 
 policy/modules/system/logging.if          |   21 ++
 policy/modules/system/logging.te          |    2 
 policy/modules/system/lvm.te              |    5 
 policy/modules/system/modutils.te         |   11 +
 policy/modules/system/mount.fc            |    3 
 policy/modules/system/mount.if            |   37 ++++
 policy/modules/system/mount.te            |   64 +++++++
 policy/modules/system/raid.te             |    1 
 policy/modules/system/selinuxutil.fc      |    1 
 policy/modules/system/selinuxutil.if      |    5 
 policy/modules/system/selinuxutil.te      |   68 +++-----
 policy/modules/system/udev.fc             |    2 
 policy/modules/system/udev.te             |   11 +
 policy/modules/system/unconfined.fc       |    1 
 policy/modules/system/unconfined.if       |   10 -
 policy/modules/system/unconfined.te       |   24 ++
 policy/modules/system/userdomain.if       |  246 ++++++++++++++++--------------
 policy/modules/system/userdomain.te       |   46 ++++-
 policy/modules/system/xen.te              |   35 ++++
 policy/support/obj_perm_sets.spt          |   12 +
 145 files changed, 2805 insertions(+), 424 deletions(-)

Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- policy-20070219.patch	2 Apr 2007 21:06:47 -0000	1.36
+++ policy-20070219.patch	3 Apr 2007 19:25:58 -0000	1.37
@@ -852,12 +852,15 @@
  	dev_dontaudit_rw_dri($1_mozilla_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.te serefpolicy-2.5.11/policy/modules/apps/slocate.te
 --- nsaserefpolicy/policy/modules/apps/slocate.te	2007-02-19 11:32:52.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/apps/slocate.te	2007-04-02 11:16:11.000000000 -0400
-@@ -45,6 +45,7 @@
- fs_getattr_xattr_fs(locate_t)
- fs_getattr_rpc_pipefs(locate_t)
- fs_getattr_rpc_dirs(locate_t)
-+fs_getattr_iso9660_files(locate_t)
++++ serefpolicy-2.5.11/policy/modules/apps/slocate.te	2007-04-03 08:58:41.000000000 -0400
+@@ -42,9 +42,7 @@
+ files_read_etc_runtime_files(locate_t)
+ files_read_etc_files(locate_t)
+ 
+-fs_getattr_xattr_fs(locate_t)
+-fs_getattr_rpc_pipefs(locate_t)
+-fs_getattr_rpc_dirs(locate_t)
++fs_getattr_all_fs(locate_t)
  
  libs_use_shared_libs(locate_t)
  libs_use_ld_so(locate_t)
@@ -1398,7 +1401,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.5.11/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2007-03-26 16:24:09.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/kernel/filesystem.if	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/kernel/filesystem.if	2007-04-03 09:03:55.000000000 -0400
 @@ -1291,6 +1291,26 @@
  
  ########################################
@@ -2588,6 +2591,17 @@
  		mrtg_append_create_logs(system_crond_t)
  	')
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.5.11/policy/modules/services/cups.te
+--- nsaserefpolicy/policy/modules/services/cups.te	2007-03-26 10:39:04.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/cups.te	2007-04-03 09:38:32.000000000 -0400
+@@ -154,6 +154,7 @@
+ corenet_sendrecv_hplip_client_packets(cupsd_t)
+ corenet_sendrecv_ipp_client_packets(cupsd_t)
+ corenet_sendrecv_ipp_server_packets(cupsd_t)
++corenet_tcp_bind_all_rpc_ports(cupsd_t)
+ 
+ dev_rw_printer(cupsd_t)
+ dev_read_urand(cupsd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-2.5.11/policy/modules/services/cvs.te
 --- nsaserefpolicy/policy/modules/services/cvs.te	2007-03-26 16:24:12.000000000 -0400
 +++ serefpolicy-2.5.11/policy/modules/services/cvs.te	2007-04-02 11:16:11.000000000 -0400
@@ -2738,8 +2752,16 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.5.11/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2007-03-20 23:38:12.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/services/dovecot.te	2007-04-02 11:16:11.000000000 -0400
-@@ -140,6 +140,10 @@
++++ serefpolicy-2.5.11/policy/modules/services/dovecot.te	2007-04-03 09:19:00.000000000 -0400
+@@ -46,6 +46,7 @@
+ allow dovecot_t self:tcp_socket create_stream_socket_perms;
+ allow dovecot_t self:unix_dgram_socket create_socket_perms;
+ allow dovecot_t self:unix_stream_socket { create_stream_socket_perms connectto };
++allow dovecot_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ domtrans_pattern(dovecot_t, dovecot_auth_exec_t, dovecot_auth_t)
+ 
+@@ -140,6 +141,10 @@
  	udev_read_db(dovecot_t)
  ')
  
@@ -3209,6 +3231,18 @@
  	corenet_dontaudit_tcp_bind_all_ports($1)
  	corenet_dontaudit_udp_bind_all_ports($1)
  	corenet_tcp_connect_portmap_port($1)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-2.5.11/policy/modules/services/nscd.te
+--- nsaserefpolicy/policy/modules/services/nscd.te	2007-03-20 23:37:51.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/nscd.te	2007-04-02 17:10:01.000000000 -0400
+@@ -30,7 +30,7 @@
+ 
+ allow nscd_t self:capability { kill setgid setuid audit_write };
+ dontaudit nscd_t self:capability sys_tty_config;
+-allow nscd_t self:process { getattr setsched signal_perms };
++allow nscd_t self:process { getattr setcap setsched signal_perms };
+ allow nscd_t self:fifo_file { read write };
+ allow nscd_t self:unix_stream_socket create_stream_socket_perms;
+ allow nscd_t self:unix_dgram_socket create_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.5.11/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2007-03-26 10:39:04.000000000 -0400
 +++ serefpolicy-2.5.11/policy/modules/services/ntp.te	2007-04-02 11:16:11.000000000 -0400
@@ -3270,9 +3304,29 @@
  
  userdom_dontaudit_use_unpriv_user_fds(pegasus_t)
  userdom_dontaudit_search_sysadm_home_dirs(pegasus_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-2.5.11/policy/modules/services/postfix.if
+--- nsaserefpolicy/policy/modules/services/postfix.if	2007-03-26 10:39:04.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/postfix.if	2007-04-03 15:15:09.000000000 -0400
+@@ -18,7 +18,7 @@
+ 
+ ########################################
+ ## <summary>
+-##	Creates types and rules for a basic
++self##	Creates types and rules for a basic
+ ##	postfix process domain.
+ ## </summary>
+ ## <param name="prefix">
+@@ -122,6 +122,7 @@
+ 	allow postfix_$1_t postfix_master_t:unix_stream_socket { connectto rw_stream_socket_perms };
+ 	allow postfix_$1_t self:tcp_socket create_socket_perms;
+ 	allow postfix_$1_t self:udp_socket create_socket_perms;
++	allow postfix_$1_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ 	domtrans_pattern(postfix_master_t, postfix_$1_exec_t, postfix_$1_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.5.11/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2007-03-26 10:39:05.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/services/postfix.te	2007-04-02 13:35:47.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/postfix.te	2007-04-03 15:13:45.000000000 -0400
 @@ -169,6 +169,8 @@
  mta_rw_aliases(postfix_master_t)
  mta_read_sendmail_bin(postfix_master_t)
@@ -3282,7 +3336,16 @@
  ifdef(`targeted_policy',`
  	term_dontaudit_use_unallocated_ttys(postfix_master_t)
  	term_dontaudit_use_generic_ptys(postfix_master_t)
-@@ -552,6 +554,10 @@
+@@ -519,8 +521,6 @@
+ # Postfix smtp delivery local policy
+ #
+ 
+-allow postfix_smtp_t self:netlink_route_socket r_netlink_socket_perms;
+-
+ # connect to master process
+ stream_connect_pattern(postfix_smtp_t,{ postfix_private_t postfix_public_t },{ postfix_private_t postfix_public_t },postfix_master_t)
+ 
+@@ -552,6 +552,10 @@
  mta_read_aliases(postfix_smtpd_t)
  
  optional_policy(`
@@ -4759,7 +4822,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.5.11/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/logging.te	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/logging.te	2007-04-03 07:38:23.000000000 -0400
 @@ -11,6 +11,7 @@
  type auditctl_t;
  type auditctl_exec_t;
@@ -4768,6 +4831,14 @@
  role system_r types auditctl_t;
  
  type auditd_etc_t;
+@@ -331,6 +332,7 @@
+ domain_use_interactive_fds(syslogd_t)
+ 
+ files_read_etc_files(syslogd_t)
++files_read_var_files(syslogd_t)
+ files_read_etc_runtime_files(syslogd_t)
+ # /initrd is not umounted before minilog starts
+ files_dontaudit_search_isid_type_dirs(syslogd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.5.11/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2007-03-26 10:39:07.000000000 -0400
 +++ serefpolicy-2.5.11/policy/modules/system/lvm.te	2007-04-02 11:16:11.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -r1.423 -r1.424
--- selinux-policy.spec	2 Apr 2007 21:06:47 -0000	1.423
+++ selinux-policy.spec	3 Apr 2007 19:25:58 -0000	1.424
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.5.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -358,6 +358,11 @@
 %endif
 
 %changelog
+* Tue Apr 3 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-2
+- Allow syslog-ng to read /var
+- Allow locate to getattr on all filesystems
+- nscd needs setcap
+
 * Mon Mar 26 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-1
 - Update to upstream
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 19:37:00 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 15:37:00 -0400
Subject: rpms/sinjdoc/devel sinjdoc.spec,1.3,1.4
Message-ID: <200704031937.l33Jb0uF017376@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/sinjdoc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17197

Modified Files:
	sinjdoc.spec 
Log Message:
%changelog
* Tue Apr  3 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.5-4
- Obsolete gjdoc.




Index: sinjdoc.spec
===================================================================
RCS file: /cvs/dist/rpms/sinjdoc/devel/sinjdoc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sinjdoc.spec	27 Mar 2007 19:13:43 -0000	1.3
+++ sinjdoc.spec	3 Apr 2007 19:36:58 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           sinjdoc
 Version:        0.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Documentation generator for Java source code
 
 Group:          Development/Tools
@@ -11,18 +11,20 @@
 Patch1:         sinjdoc-autotools-changes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  autoconf
-BuildRequires:  automake16
-BuildRequires:  eclipse-ecj >= 3.2.1
-BuildRequires:  java_cup >= 0.10
-Requires:       java_cup >= 0.10
-Requires:       libgcj >= 4.1.2
-# GCJ native compilation support
-BuildRequires:    gcc-java >= 4.0.2
-BuildRequires:    java-gcj-compat-devel >= 1.0.70
+BuildRequires: autoconf
+BuildRequires: automake16
+BuildRequires: eclipse-ecj >= 3.2.1
+BuildRequires: gcc-java >= 4.0.2
+BuildRequires: java-gcj-compat-devel >= 1.0.70
+BuildRequires: java_cup >= 0.10
+
+Requires:         java_cup >= 0.10
+Requires:         libgcj >= 4.1.2
 Requires(post):   java-gcj-compat >= 1.0.70
 Requires(postun): java-gcj-compat >= 1.0.70
 
+Obsoletes: gjdoc <= 0.7.7-14.fc7
+
 %description
 This package contains Sinjdoc a tool for generating Javadoc-style
 documentation from Java source code
@@ -75,6 +77,9 @@
 %{_libdir}/gcj/%{name}/sinjdoc*
 
 %changelog
+* Tue Apr  3 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.5-4
+- Obsolete gjdoc.
+
 * Tue Mar 27 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.5-3
 - Fix wrapper script argument quoting.
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 19:51:17 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 15:51:17 -0400
Subject: rpms/evolution/devel evolution-2.10.0-use-glib-i18n.patch, 1.1,
	1.2 evolution.spec, 1.238, 1.239
Message-ID: <200704031951.l33JpHvG014049@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-2.10.0-use-glib-i18n.patch evolution.spec 
Log Message:

* Tue Apr 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-8.fc7
- Revise patch for GNOME bug #419524 to fix RH bug #235082
  (crash in initial account setup wizard).


evolution-2.10.0-use-glib-i18n.patch:
 a11y/addressbook/ea-addressbook-view.c                      |    2 
 a11y/addressbook/ea-minicard-view.c                         |    3 
 a11y/addressbook/ea-minicard.c                              |    2 
 a11y/calendar/ea-cal-view-event.c                           |    2 
 a11y/calendar/ea-cal-view.c                                 |    2 
 a11y/calendar/ea-day-view-main-item.c                       |    2 
 a11y/calendar/ea-day-view.c                                 |    2 
 a11y/calendar/ea-gnome-calendar.c                           |    2 
 a11y/calendar/ea-jump-button.c                              |    2 
 a11y/calendar/ea-week-view-main-item.c                      |    2 
 a11y/calendar/ea-week-view.c                                |    2 
 a11y/e-table/gal-a11y-e-cell-popup.c                        |    2 
 a11y/e-table/gal-a11y-e-cell-text.c                         |    2 
 a11y/e-table/gal-a11y-e-cell-toggle.c                       |    2 
 a11y/e-table/gal-a11y-e-cell-tree.c                         |    2 
 a11y/e-table/gal-a11y-e-cell.c                              |    2 
 a11y/e-table/gal-a11y-e-table-click-to-add.c                |    2 
 a11y/widgets/ea-calendar-item.c                             |    2 
 addressbook/gui/component/addressbook-config.c              |    2 
 addressbook/gui/component/addressbook-migrate.c             |    2 
 addressbook/gui/component/addressbook-view.c                |    2 
 addressbook/gui/component/addressbook.c                     |    2 
 addressbook/gui/component/autocompletion-config.c           |    2 
 addressbook/gui/contact-editor/e-contact-editor-address.c   |    2 
 addressbook/gui/contact-editor/e-contact-editor-fullname.c  |    2 
 addressbook/gui/contact-editor/e-contact-editor-im.c        |    2 
 addressbook/gui/contact-editor/e-contact-editor.c           |    2 
 addressbook/gui/contact-editor/e-contact-quick-add.c        |    2 
 addressbook/gui/contact-editor/eab-editor.c                 |    2 
 addressbook/gui/contact-list-editor/e-contact-list-editor.c |    2 
 addressbook/gui/widgets/e-addressbook-reflow-adapter.c      |    2 
 addressbook/gui/widgets/e-addressbook-view.c                |    2 
 addressbook/gui/widgets/e-minicard-label.c                  |    2 
 addressbook/gui/widgets/e-minicard-view-widget.c            |    2 
 addressbook/gui/widgets/e-minicard-view.c                   |    2 
 addressbook/gui/widgets/e-minicard.c                        |    2 
 addressbook/gui/widgets/eab-contact-display.c               |    2 
 addressbook/gui/widgets/gal-view-factory-minicard.c         |    2 
 addressbook/printing/e-contact-print-envelope.c             |    2 
 addressbook/printing/e-contact-print.c                      |    2 
 calendar/gui/alarm-notify/alarm-notify-dialog.c             |    2 
 calendar/gui/alarm-notify/alarm-queue.c                     |    2 
 calendar/gui/alarm-notify/notify-main.c                     |    2 
 calendar/gui/alarm-notify/util.c                            |    2 
 calendar/gui/cal-search-bar.c                               |    2 
 calendar/gui/calendar-commands.c                            |    2 
 calendar/gui/calendar-view-factory.c                        |    2 
 calendar/gui/dialogs/alarm-list-dialog.c                    |    2 
 calendar/gui/dialogs/cal-attachment-select-file.c           |    2 
 calendar/gui/dialogs/cal-prefs-dialog.c                     |    2 
 calendar/gui/dialogs/calendar-setup.c                       |    2 
 calendar/gui/dialogs/cancel-comp.c                          |    2 
 calendar/gui/dialogs/changed-comp.c                         |    2 
 calendar/gui/dialogs/comp-editor-page.c                     |    2 
 calendar/gui/dialogs/comp-editor-util.c                     |    2 
 calendar/gui/dialogs/comp-editor.c                          |    2 
 calendar/gui/dialogs/delete-comp.c                          |    2 
 calendar/gui/dialogs/delete-error.c                         |    2 
 calendar/gui/dialogs/event-editor.c                         |    2 
 calendar/gui/dialogs/event-page.c                           |    2 
 calendar/gui/dialogs/memo-editor.c                          |    2 
 calendar/gui/dialogs/memo-page.c                            |    2 
 calendar/gui/dialogs/recur-comp.c                           |    2 
 calendar/gui/dialogs/recurrence-page.c                      |    2 
 calendar/gui/dialogs/schedule-page.c                        |    2 
 calendar/gui/dialogs/task-details-page.c                    |    2 
 calendar/gui/dialogs/task-editor.c                          |    2 
 calendar/gui/dialogs/task-page.c                            |    2 
 calendar/gui/e-alarm-list.c                                 |    2 
 calendar/gui/e-cal-list-view.c                              |    2 
 calendar/gui/e-cal-model-calendar.c                         |    2 
 calendar/gui/e-cal-model-memos.c                            |    2 
 calendar/gui/e-cal-model-tasks.c                            |    2 
 calendar/gui/e-cal-model.c                                  |    2 
 calendar/gui/e-cal-popup.c                                  |    2 
 calendar/gui/e-calendar-view.c                              |    2 
 calendar/gui/e-cell-date-edit-text.c                        |    2 
 calendar/gui/e-day-view-time-item.c                         |    2 
 calendar/gui/e-day-view-top-item.c                          |    2 
 calendar/gui/e-day-view.c                                   |    2 
 calendar/gui/e-itip-control.c                               |    2 
 calendar/gui/e-meeting-list-view.c                          |    2 
 calendar/gui/e-meeting-store.c                              |    2 
 calendar/gui/e-meeting-time-sel-item.c                      |    2 
 calendar/gui/e-meeting-time-sel.c                           |    2 
 calendar/gui/e-timezone-entry.c                             |    2 
 calendar/gui/e-week-view-main-item.c                        |    2 
 calendar/gui/e-week-view.c                                  |    2 
 calendar/gui/gnome-cal.c                                    |    2 
 calendar/gui/itip-utils.c                                   |    2 
 calendar/gui/main.c                                         |    2 
 calendar/gui/memos-control.c                                |    2 
 calendar/gui/misc.c                                         |    2 
 calendar/gui/print.c                                        |    2 
 calendar/gui/tasks-control.c                                |    2 
 calendar/gui/weekday-picker.c                               |    2 
 composer/e-msg-composer-hdrs.c                              |    2 
 composer/e-msg-composer-select-file.c                       |    2 
 composer/e-msg-composer.c                                   |    2 
 e-util/Makefile.am                                          |    1 
 e-util/e-categories-config.c                                |    2 
 e-util/e-config.c                                           |    2 
 e-util/e-dialog-utils.c                                     |    2 
 e-util/e-error.c                                            |    2 
 e-util/e-event.c                                            |    2 
 e-util/e-i18n.h                                             |   74 ------
 e-util/e-import.c                                           |    2 
 e-util/e-menu.c                                             |    2 
 e-util/e-popup.c                                            |    2 
 e-util/e-text-event-processor.c                             |    3 
 e-util/e-util.c                                             |   14 -
 e-util/e-xml-utils.c                                        |  143 ------------
 e-util/e-xml-utils.h                                        |   12 -
 filter/filter-datespec.c                                    |    2 
 filter/filter-file.c                                        |    2 
 filter/filter-input.c                                       |    2 
 filter/filter-label.c                                       |    2 
 filter/filter-option.c                                      |    2 
 filter/filter-part.c                                        |    2 
 filter/filter-rule.c                                        |    2 
 filter/rule-context.c                                       |    2 
 filter/rule-editor.c                                        |    2 
 mail/em-account-editor.c                                    |    2 
 mail/em-account-prefs.c                                     |    2 
 mail/em-composer-utils.c                                    |    2 
 mail/em-filter-editor.c                                     |    2 
 mail/em-filter-folder-element.c                             |    2 
 mail/em-filter-rule.c                                       |    2 
 mail/em-folder-properties.c                                 |    2 
 mail/em-folder-selection-button.c                           |    2 
 mail/em-folder-selector.c                                   |    2 
 mail/em-folder-tree-model.c                                 |    2 
 mail/em-folder-tree.c                                       |    2 
 mail/em-folder-utils.c                                      |    2 
 mail/em-format-hook.c                                       |    2 
 mail/em-format-html-display.c                               |    2 
 mail/em-format-html.c                                       |    2 
 mail/em-format-quote.c                                      |    2 
 mail/em-format.c                                            |    2 
 mail/em-migrate.c                                           |   36 +--
 mail/em-popup.c                                             |    2 
 mail/em-subscribe-editor.c                                  |    2 
 mail/em-utils.c                                             |    2 
 mail/em-vfolder-editor.c                                    |    2 
 mail/em-vfolder-rule.c                                      |    2 
 mail/importers/mail-importer.c                              |    2 
 mail/mail-autofilter.c                                      |    2 
 mail/mail-component.c                                       |    2 
 mail/mail-folder-cache.c                                    |    2 
 mail/mail-mt.c                                              |    2 
 mail/mail-ops.c                                             |    2 
 mail/mail-send-recv.c                                       |    2 
 mail/mail-tools.c                                           |    2 
 mail/mail-vfolder.c                                         |    2 
 mail/message-list.c                                         |    2 
 mail/message-tag-followup.c                                 |    2 
 plugins/backup-restore/backup-restore.c                     |    2 
 plugins/backup-restore/backup.c                             |    2 
 plugins/bbdb/bbdb.c                                         |    2 
 plugins/bbdb/gaimbuddies.c                                  |    2 
 plugins/calendar-file/calendar-file.c                       |    2 
 plugins/calendar-http/calendar-http.c                       |    2 
 plugins/calendar-weather/calendar-weather.c                 |    2 
 plugins/default-source/default-source.c                     |    2 
 plugins/exchange-operations/exchange-send-options.c         |    2 
 plugins/groupwise-features/addressbook-groupwise.c          |    2 
 plugins/groupwise-features/install-shared.c                 |    2 
 plugins/groupwise-features/junk-settings.c                  |    2 
 plugins/groupwise-features/process-meeting.c                |    2 
 plugins/groupwise-features/send-options.c                   |    2 
 plugins/groupwise-features/share-folder-common.c            |    2 
 plugins/import-ics-attachments/icsimporter.c                |    2 
 plugins/itip-formatter/itip-formatter.c                     |    2 
 plugins/itip-formatter/itip-view.c                          |    2 
 plugins/mark-all-read/mark-all-read.c                       |    2 
 plugins/publish-calendar/publish-calendar.c                 |    2 
 plugins/subject-thread/subject-thread.c                     |    2 
 shell/e-component-registry.c                                |   21 -
 shell/e-shell-folder-title-bar.c                            |    2 
 shell/e-shell-importer.c                                    |    2 
 shell/e-shell-settings-dialog.c                             |   17 -
 shell/e-shell-utils.c                                       |    2 
 shell/e-shell-window-commands.c                             |    9 
 shell/e-shell-window.c                                      |    2 
 shell/e-shell.c                                             |    2 
 shell/e-user-creatable-items-handler.c                      |    2 
 shell/evolution-shell-component-utils.c                     |    2 
 shell/main.c                                                |    2 
 smime/gui/ca-trust-dialog.c                                 |    2 
 smime/gui/cert-trust-dialog.c                               |    2 
 smime/gui/certificate-manager.c                             |    2 
 smime/gui/certificate-viewer.c                              |    2 
 smime/gui/component.c                                       |    2 
 smime/gui/e-cert-selector.c                                 |    2 
 smime/lib/e-cert-db.c                                       |    2 
 smime/lib/e-cert.c                                          |    2 
 smime/lib/e-pkcs12.c                                        |    2 
 tools/killev.c                                              |   12 -
 widgets/menus/gal-define-views-dialog.c                     |    6 
 widgets/menus/gal-define-views-model.c                      |    2 
 widgets/menus/gal-view-collection.c                         |    2 
 widgets/menus/gal-view-factory-etable.c                     |    2 
 widgets/menus/gal-view-instance-save-as-dialog.c            |    6 
 widgets/menus/gal-view-instance.c                           |    2 
 widgets/menus/gal-view-menus.c                              |    2 
 widgets/menus/gal-view-new-dialog.c                         |    4 
 widgets/misc/e-activity-handler.c                           |    2 
 widgets/misc/e-attachment-bar.c                             |    2 
 widgets/misc/e-attachment.c                                 |    2 
 widgets/misc/e-calendar-item.c                              |    2 
 widgets/misc/e-calendar.c                                   |    2 
 widgets/misc/e-canvas-background.c                          |    2 
 widgets/misc/e-canvas-vbox.c                                |    2 
 widgets/misc/e-cell-date-edit.c                             |    2 
 widgets/misc/e-cell-percent.c                               |    2 
 widgets/misc/e-charset-picker.c                             |    2 
 widgets/misc/e-clipped-label.c                              |    2 
 widgets/misc/e-dateedit.c                                   |    2 
 widgets/misc/e-filter-bar.c                                 |    2 
 widgets/misc/e-image-chooser.c                              |    2 
 widgets/misc/e-map.c                                        |    2 
 widgets/misc/e-reflow.c                                     |    2 
 widgets/misc/e-search-bar.c                                 |    2 
 widgets/misc/e-selection-model-array.c                      |    2 
 widgets/misc/e-selection-model.c                            |    2 
 widgets/misc/e-send-options.c                               |    2 
 widgets/misc/e-task-widget.c                                |    2 
 widgets/misc/e-unicode.c                                    |    2 
 widgets/table/e-cell-combo.c                                |    2 
 widgets/table/e-cell-date.c                                 |    2 
 widgets/table/e-cell-float.c                                |    2 
 widgets/table/e-cell-number.c                               |    2 
 widgets/table/e-cell-pixbuf.c                               |    2 
 widgets/table/e-cell-text.c                                 |    2 
 widgets/table/e-table-click-to-add.c                        |    2 
 widgets/table/e-table-col.c                                 |    2 
 widgets/table/e-table-config.c                              |    8 
 widgets/table/e-table-field-chooser-dialog.c                |    2 
 widgets/table/e-table-field-chooser-item.c                  |    2 
 widgets/table/e-table-field-chooser.c                       |    4 
 widgets/table/e-table-group-container.c                     |    2 
 widgets/table/e-table-group-leaf.c                          |    2 
 widgets/table/e-table-header-item.c                         |    6 
 widgets/table/e-table-item.c                                |    2 
 widgets/table/e-table-scrolled.c                            |    2 
 widgets/table/e-table-selection-model.c                     |    2 
 widgets/table/e-table-sorter.c                              |    2 
 widgets/table/e-table.c                                     |    2 
 widgets/table/e-tree-scrolled.c                             |    2 
 widgets/table/e-tree-selection-model.c                      |    2 
 widgets/table/e-tree.c                                      |    2 
 widgets/text/e-completion-view.c                            |    4 
 widgets/text/e-entry.c                                      |    2 
 widgets/text/e-text.c                                       |    2 
 254 files changed, 304 insertions(+), 549 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 evolution-2.10.0-use-glib-i18n.patch
Index: evolution-2.10.0-use-glib-i18n.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.10.0-use-glib-i18n.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.10.0-use-glib-i18n.patch	27 Mar 2007 01:59:00 -0000	1.1
+++ evolution-2.10.0-use-glib-i18n.patch	3 Apr 2007 19:51:14 -0000	1.2
@@ -1,5 +1,5 @@
 --- evolution-2.10.0/mail/message-tag-followup.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/message-tag-followup.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/message-tag-followup.c	2007-04-03 15:07:43.000000000 -0400
 @@ -52,7 +52,7 @@
  #include <gconf/gconf-client.h>
  
@@ -10,7 +10,7 @@
  #include "e-util/e-icon-factory.h"
  #include "e-util/e-util-private.h"
 --- evolution-2.10.0/mail/em-popup.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-popup.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-popup.c	2007-04-03 15:07:43.000000000 -0400
 @@ -41,7 +41,7 @@
  #include <libgnome/gnome-url.h>
  #include <libgnomevfs/gnome-vfs-mime.h>
@@ -20,8 +20,8 @@
  
  #include "em-popup.h"
  #include "libedataserver/e-msgport.h"
---- evolution-2.10.0/mail/em-composer-utils.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/mail/em-composer-utils.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/mail/em-composer-utils.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/mail/em-composer-utils.c	2007-04-03 15:07:43.000000000 -0400
 @@ -29,7 +29,7 @@
  
  #include <libedataserver/e-data-server-util.h>
@@ -32,7 +32,7 @@
  #include "mail-mt.h"
  #include "mail-ops.h"
 --- evolution-2.10.0/mail/em-account-editor.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-account-editor.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-account-editor.c	2007-04-03 15:07:43.000000000 -0400
 @@ -64,7 +64,7 @@
  #include <gtk/gtkcombobox.h>
  #include <gtk/gtktable.h>
@@ -43,7 +43,7 @@
  #include <libgnomeui/gnome-druid-page-standard.h>
  
 --- evolution-2.10.0/mail/mail-tools.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/mail-tools.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/mail-tools.c	2007-04-03 15:07:43.000000000 -0400
 @@ -37,7 +37,7 @@
  #include <gconf/gconf.h>
  #include <gconf/gconf-client.h>
@@ -54,7 +54,7 @@
  #include <camel/camel-file-utils.h>
  #include <camel/camel-mime-message.h>
 --- evolution-2.10.0/mail/em-folder-selection-button.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-folder-selection-button.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-folder-selection-button.c	2007-04-03 15:07:43.000000000 -0400
 @@ -31,7 +31,7 @@
  #include <gtk/gtkhbox.h>
  
@@ -65,7 +65,7 @@
  #include "mail-component.h"
  #include "em-folder-tree.h"
 --- evolution-2.10.0/mail/em-format-hook.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-format-hook.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-format-hook.c	2007-04-03 15:07:43.000000000 -0400
 @@ -33,7 +33,7 @@
  
  #include <e-util/e-icon-factory.h>
@@ -76,7 +76,7 @@
  
  /* class name -> klass map for EMFormat and subclasses */
 --- evolution-2.10.0/mail/em-format-quote.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-format-quote.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-format-quote.c	2007-04-03 15:07:43.000000000 -0400
 @@ -35,7 +35,7 @@
  #include <camel/camel-url.h>
  
@@ -86,9 +86,9 @@
  
  #include "em-stripsig-filter.h"
  #include "em-format-quote.h"
---- evolution-2.10.0/mail/em-utils.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/mail/em-utils.c	2007-03-18 08:26:55.000000000 -0400
-@@ -59,7 +55,7 @@
+--- evolution-2.10.0/mail/em-utils.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/mail/em-utils.c	2007-04-03 15:07:43.000000000 -0400
+@@ -59,7 +59,7 @@
  #include <libgnomevfs/gnome-vfs-mime.h>
  #include <libgnomevfs/gnome-vfs-mime-utils.h>
  #include <libgnomevfs/gnome-vfs-mime-handlers.h>
@@ -98,7 +98,7 @@
  #include "mail-component.h"
  #include "mail-mt.h"
 --- evolution-2.10.0/mail/em-filter-rule.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-filter-rule.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-filter-rule.c	2007-04-03 15:07:43.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <string.h>
  
@@ -108,8 +108,8 @@
  
  #include "em-filter-rule.h"
  #include "em-filter-context.h"
---- evolution-2.10.0/mail/mail-component.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/mail/mail-component.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/mail/mail-component.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/mail/mail-component.c	2007-04-03 15:07:43.000000000 -0400
 @@ -78,7 +78,7 @@
  
  #include <table/e-tree.h>
@@ -119,8 +119,8 @@
  
  #include <camel/camel-file-utils.h>
  #include <camel/camel-vtrash-folder.h>
---- evolution-2.10.0/mail/importers/mail-importer.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/mail/importers/mail-importer.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/mail/importers/mail-importer.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/mail/importers/mail-importer.c	2007-04-03 15:07:43.000000000 -0400
 @@ -38,7 +38,7 @@
  
  #include <gmodule.h>
@@ -130,8 +130,8 @@
  #include <camel/camel-folder.h>
  #include <camel/camel-store.h>
  #include <camel/camel-mime-message.h>
---- evolution-2.10.0/mail/mail-send-recv.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/mail/mail-send-recv.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/mail/mail-send-recv.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/mail/mail-send-recv.c	2007-04-03 15:07:43.000000000 -0400
 @@ -39,7 +39,7 @@
  #include <gtk/gtkbox.h>
  #include <gtk/gtkscrolledwindow.h>
@@ -141,8 +141,8 @@
  
  #include "e-util/e-gtk-utils.h"
  #include "libedataserver/e-account-list.h"
---- evolution-2.10.0/mail/em-format-html.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/mail/em-format-html.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/mail/em-format-html.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/mail/em-format-html.c	2007-04-03 15:07:43.000000000 -0400
 @@ -51,7 +51,7 @@
  #include <gtkhtml/gtkhtml-embedded.h>
  #include <gtkhtml/gtkhtml-stream.h>
@@ -153,7 +153,7 @@
  #include <camel/camel-mime-message.h>
  #include <camel/camel-stream.h>
 --- evolution-2.10.0/mail/em-filter-folder-element.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-filter-folder-element.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-filter-folder-element.c	2007-04-03 15:07:43.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <string.h>
  
@@ -163,8 +163,8 @@
  
  #include "em-filter-folder-element.h"
  #include "mail/em-folder-selection-button.h"
---- evolution-2.10.0/mail/em-folder-tree.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/mail/em-folder-tree.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/mail/em-folder-tree.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/mail/em-folder-tree.c	2007-04-03 15:07:43.000000000 -0400
 @@ -38,7 +38,7 @@
  #include <glib/gi18n.h>
  #include <gtk/gtk.h>
@@ -175,7 +175,7 @@
  #include <camel/camel-session.h>
  #include <camel/camel-store.h>
 --- evolution-2.10.0/mail/em-filter-editor.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-filter-editor.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-filter-editor.c	2007-04-03 15:07:43.000000000 -0400
 @@ -26,7 +26,7 @@
  #endif
  
@@ -186,7 +186,7 @@
  #include "e-util/e-util-private.h"
  
 --- evolution-2.10.0/mail/em-folder-tree-model.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-folder-tree-model.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/mail/em-folder-tree-model.c	2007-04-03 15:07:43.000000000 -0400
 @@ -39,7 +39,7 @@
  
  #include <e-util/e-mktemp.h>
@@ -196,8 +196,8 @@
  
  #include <camel/camel-file-utils.h>
  
---- evolution-2.10.0/mail/message-list.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/mail/message-list.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/mail/message-list.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/mail/message-list.c	2007-04-03 15:07:43.000000000 -0400
 @@ -38,7 +38,7 @@
  
  #include <gtk/gtk.h>
@@ -207,8 +207,8 @@
  
  #include <camel/camel-exception.h>
  #include <camel/camel-file-utils.h>
---- evolution-2.10.0/mail/em-folder-properties.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
[...2005 lines suppressed...]
---- evolution-2.10.0/calendar/gui/e-cal-model.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/calendar/gui/e-cal-model.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/calendar/gui/e-cal-model.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-cal-model.c	2007-04-03 15:07:43.000000000 -0400
 @@ -24,7 +24,7 @@
  
  #include <string.h>
@@ -3065,7 +3066,7 @@
  #include <libecal/e-cal-time-util.h>
  #include "comp-util.h"
 --- evolution-2.10.0/calendar/gui/weekday-picker.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/weekday-picker.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/weekday-picker.c	2007-04-03 15:07:43.000000000 -0400
 @@ -25,7 +25,7 @@
  #include <string.h>
  #include <gtk/gtksignal.h>
@@ -3075,8 +3076,8 @@
  #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
  #include <libgnomecanvas/gnome-canvas-text.h>
  #include "weekday-picker.h"
---- evolution-2.10.0/calendar/gui/e-week-view.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/calendar/gui/e-week-view.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/calendar/gui/e-week-view.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-week-view.c	2007-04-03 15:07:43.000000000 -0400
 @@ -41,7 +41,7 @@
  #include <gtk/gtkvscrollbar.h>
  #include <gtk/gtkwindow.h>
@@ -3087,7 +3088,7 @@
  #include <libgnome/gnome-util.h>
  #include <gdk-pixbuf/gdk-pixbuf.h>
 --- evolution-2.10.0/calendar/gui/e-cal-model-memos.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/e-cal-model-memos.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-cal-model-memos.c	2007-04-03 15:07:43.000000000 -0400
 @@ -25,7 +25,7 @@
  #endif
  
@@ -3098,7 +3099,7 @@
  #include "e-cell-date-edit-text.h"
  #include "misc.h"
 --- evolution-2.10.0/calendar/gui/main.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/main.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/main.c	2007-04-03 15:07:43.000000000 -0400
 @@ -25,7 +25,7 @@
  #endif
  
@@ -3109,7 +3110,7 @@
  #include <libgnomevfs/gnome-vfs-init.h>
  #include <glade/glade.h>
 --- evolution-2.10.0/calendar/gui/cal-search-bar.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/cal-search-bar.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/cal-search-bar.c	2007-04-03 15:07:43.000000000 -0400
 @@ -29,7 +29,7 @@
  #include <gtk/gtkmenuitem.h>
  #include <gtk/gtkoptionmenu.h>
@@ -3120,7 +3121,7 @@
  #include <e-util/e-icon-factory.h>
  #include <libedataserver/e-categories.h>
 --- evolution-2.10.0/calendar/gui/e-day-view-time-item.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/e-day-view-time-item.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-day-view-time-item.c	2007-04-03 15:07:43.000000000 -0400
 @@ -36,7 +36,7 @@
  #include <gtk/gtksignal.h>
  #include <gtk/gtkradiomenuitem.h>
@@ -3131,7 +3132,7 @@
  #include "e-day-view-time-item.h"
  #include "calendar-config.h"
 --- evolution-2.10.0/calendar/gui/e-cal-popup.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/e-cal-popup.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-cal-popup.c	2007-04-03 15:07:43.000000000 -0400
 @@ -39,7 +39,7 @@
  #include <camel/camel-mime-part.h>
  #include <camel/camel-stream-vfs.h>
@@ -3141,8 +3142,8 @@
  #include "e-util/e-mktemp.h"
  #include "e-util/e-dialog-utils.h"
  
---- evolution-2.10.0/calendar/gui/e-meeting-store.c.use-glib-i18n	2007-03-18 08:26:54.000000000 -0400
-+++ evolution-2.10.0/calendar/gui/e-meeting-store.c	2007-03-18 08:26:55.000000000 -0400
+--- evolution-2.10.0/calendar/gui/e-meeting-store.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-meeting-store.c	2007-04-03 15:07:43.000000000 -0400
 @@ -26,7 +26,7 @@
  #endif
  
@@ -3153,7 +3154,7 @@
  #include <libgnomevfs/gnome-vfs.h>
  #include <libebook/e-book.h>
 --- evolution-2.10.0/calendar/gui/e-week-view-main-item.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/e-week-view-main-item.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-week-view-main-item.c	2007-04-03 15:07:43.000000000 -0400
 @@ -32,7 +32,7 @@
  
  #include <string.h>
@@ -3164,7 +3165,7 @@
  #include "ea-calendar.h"
  
 --- evolution-2.10.0/calendar/gui/gnome-cal.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/gnome-cal.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/gnome-cal.c	2007-04-03 15:07:43.000000000 -0400
 @@ -36,7 +36,7 @@
  #include <glib.h>
  #include <gdk/gdkkeysyms.h>
@@ -3175,7 +3176,7 @@
  #include <libgnomeui/gnome-dialog.h>
  #include <libgnomeui/gnome-dialog-util.h>
 --- evolution-2.10.0/calendar/gui/e-cal-list-view.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/e-cal-list-view.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/calendar/gui/e-cal-list-view.c	2007-04-03 15:07:43.000000000 -0400
 @@ -50,7 +50,7 @@
  #include <table/e-cell-combo.h>
  #include <misc/e-popup-menu.h>
@@ -3186,7 +3187,7 @@
  #include <libgnome/gnome-util.h>
  #include <e-util/e-categories-config.h>
 --- evolution-2.10.0/smime/lib/e-cert-db.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/lib/e-cert-db.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/smime/lib/e-cert-db.c	2007-04-03 15:07:43.000000000 -0400
 @@ -90,7 +90,7 @@
  #include "e-util/e-dialog-utils.h"
  #include "e-util/e-util-private.h"
@@ -3197,7 +3198,7 @@
  #include <sys/types.h>
  #include <sys/stat.h>
 --- evolution-2.10.0/smime/lib/e-cert.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/lib/e-cert.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/smime/lib/e-cert.c	2007-04-03 15:07:43.000000000 -0400
 @@ -62,7 +62,7 @@
  
  #include <time.h>
@@ -3208,7 +3209,7 @@
  #include <e-util/e-util.h>	/* for e_utf8_strftime, what about e_time_format_time? */
  
 --- evolution-2.10.0/smime/lib/e-pkcs12.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/lib/e-pkcs12.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/smime/lib/e-pkcs12.c	2007-04-03 15:07:43.000000000 -0400
 @@ -63,7 +63,7 @@
  #include <glib.h>
  #include <glib/gstdio.h>
@@ -3219,7 +3220,7 @@
  
  #include <time.h>
 --- evolution-2.10.0/smime/gui/certificate-viewer.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/gui/certificate-viewer.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/smime/gui/certificate-viewer.c	2007-04-03 15:07:43.000000000 -0400
 @@ -31,7 +31,7 @@
  
  #include <gtk/gtk.h>
@@ -3230,7 +3231,7 @@
  
  #include "e-util/e-util-private.h"
 --- evolution-2.10.0/smime/gui/certificate-manager.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/gui/certificate-manager.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/smime/gui/certificate-manager.c	2007-04-03 15:07:43.000000000 -0400
 @@ -29,7 +29,7 @@
  
  #include <gtk/gtk.h>
@@ -3241,7 +3242,7 @@
  #include <glade/glade.h>
  #include "evolution-config-control.h"
 --- evolution-2.10.0/smime/gui/e-cert-selector.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/gui/e-cert-selector.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/smime/gui/e-cert-selector.c	2007-04-03 15:07:43.000000000 -0400
 @@ -23,7 +23,7 @@
  #include <config.h>
  #endif
@@ -3252,7 +3253,7 @@
  #include <gtk/gtktextview.h>
  #include <gtk/gtkoptionmenu.h>
 --- evolution-2.10.0/smime/gui/cert-trust-dialog.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/gui/cert-trust-dialog.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/smime/gui/cert-trust-dialog.c	2007-04-03 15:07:43.000000000 -0400
 @@ -36,7 +36,7 @@
  #include <gtk/gtkdialog.h>
  #include <gtk/gtklabel.h>
@@ -3263,7 +3264,7 @@
  
  #include "e-util/e-util-private.h"
 --- evolution-2.10.0/smime/gui/component.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/gui/component.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/smime/gui/component.c	2007-04-03 15:07:43.000000000 -0400
 @@ -29,7 +29,7 @@
  
  #include <gtk/gtk.h>
@@ -3274,7 +3275,7 @@
  
  #include "ca-trust-dialog.h"
 --- evolution-2.10.0/smime/gui/ca-trust-dialog.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/gui/ca-trust-dialog.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/smime/gui/ca-trust-dialog.c	2007-04-03 15:07:43.000000000 -0400
 @@ -30,7 +30,7 @@
  
  #include <gtk/gtk.h>
@@ -3285,7 +3286,7 @@
  
  #include "e-util/e-util-private.h"
 --- evolution-2.10.0/tools/killev.c.use-glib-i18n	2007-01-03 10:32:49.000000000 -0500
-+++ evolution-2.10.0/tools/killev.c	2007-03-18 08:26:55.000000000 -0400
++++ evolution-2.10.0/tools/killev.c	2007-04-03 15:07:43.000000000 -0400
 @@ -31,7 +31,7 @@
  
  #include <bonobo/bonobo-exception.h>


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- evolution.spec	2 Apr 2007 18:28:09 -0000	1.238
+++ evolution.spec	3 Apr 2007 19:51:14 -0000	1.239
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -733,6 +733,10 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Tue Apr 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-8.fc7
+- Revise patch for GNOME bug #419524 to fix RH bug #235082
+  (crash in initial account setup wizard).
+
 * Mon Apr 02 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-7.fc7
 - Add patch for RH bug #231767 (allow mail-notification to build).
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 20:04:48 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 16:04:48 -0400
Subject: rpms/hal/devel hal-0.5.9-fix-luks-locking.patch, NONE, 1.1 hal.spec,
	1.125, 1.126
Message-ID: <200704032004.l33K4mXV014605@cvs.devel.redhat.com>

Author: davidz

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

Modified Files:
	hal.spec 
Added Files:
	hal-0.5.9-fix-luks-locking.patch 
Log Message:
* Tue Apr 03 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-2
- Fix a bug with how LUKS interacts with locking
- Obsolete older HAL packages to provide an upgrade path for multilib



hal-0.5.9-fix-luks-locking.patch:
 hal-luks-setup    |   14 +++++++-------
 hal-luks-teardown |   14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

--- NEW FILE hal-0.5.9-fix-luks-locking.patch ---
From: David Zeuthen <davidz at redhat.com>
Date: Tue, 3 Apr 2007 17:18:23 +0000 (-0400)
Subject: fix lock checking for LUKS setup/teardown
X-Git-Tag: HAL_0_2
X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=55256f3d56e3317b3e1efbf84f732b9464eacf8a

fix lock checking for LUKS setup/teardown

Reported here

 http://lists.freedesktop.org/archives/hal/2007-April/007936.html
---

--- a/tools/hal-luks-setup
+++ b/tools/hal-luks-setup
@@ -22,17 +22,17 @@ fi
 # Respect the same locks as Mount()/Unmount() etc.
 if [ -n "$HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME" ] ; then
     hal-is-caller-locked-out --udi $HAL_PROP_INFO_UDI \
-        --interface org.freedesktop.Hal.Volume \
-        --caller $HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME
+        --interface org.freedesktop.Hal.Device.Volume \
+        --caller "$HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME"
     RET=$?
-    if [ "$RET" != "1" ] ; then
+    if [ "$RET" != "0" ] ; then
         locked_out
     fi
-    hal-is-caller-locked-out --udi $HAL_PROP_STORAGE_ORIGINATING_DEVICE \
-        --interface org.freedesktop.Hal.Storage \
-        --caller $HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME
+    hal-is-caller-locked-out --udi $HAL_PROP_BLOCK_STORAGE_DEVICE \
+        --interface org.freedesktop.Hal.Device.Storage \
+        --caller "$HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME"
     RET=$?
-    if [ "$RET" != "1" ] ; then
+    if [ "$RET" != "0" ] ; then
         locked_out
     fi
 fi
--- a/tools/hal-luks-teardown
+++ b/tools/hal-luks-teardown
@@ -23,17 +23,17 @@ fi
 # Respect the same locks as Mount()/Unmount() etc.
 if [ -n "$HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME" ] ; then
     hal-is-caller-locked-out --udi $HAL_PROP_INFO_UDI \
-        --interface org.freedesktop.Hal.Volume \
-        --caller $HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME
+        --interface org.freedesktop.Hal.Device.Volume \
+        --caller "$HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME"
     RET=$?
-    if [ "$RET" != "1" ] ; then
+    if [ "$RET" != "0" ] ; then
         locked_out
     fi
-    hal-is-caller-locked-out --udi $HAL_PROP_STORAGE_ORIGINATING_DEVICE \
-        --interface org.freedesktop.Hal.Storage \
-        --caller $HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME
+    hal-is-caller-locked-out --udi $HAL_PROP_BLOCK_STORAGE_DEVICE \
+        --interface org.freedesktop.Hal.Device.Storage \
+        --caller "$HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME"
     RET=$?
-    if [ "$RET" != "1" ] ; then
+    if [ "$RET" != "0" ] ; then
         locked_out
     fi
 fi


Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- hal.spec	3 Apr 2007 05:23:37 -0000	1.125
+++ hal.spec	3 Apr 2007 20:04:46 -0000	1.126
@@ -26,12 +26,13 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://people.freedesktop.org/~david/dist/%{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
 Source2: hal-device-manager.desktop
 Source3: http://people.freedesktop.org/~david/dist/hal-info-%{hal_info_version}.tar.gz
+Patch0: hal-0.5.9-fix-luks-locking.patch
 
 License: AFL/GPL
 Group: System Environment/Libraries
@@ -80,6 +81,7 @@
 Requires: ConsoleKit >= %{consolekit_version}
 Requires: acl >= %{acl_version}
 Requires: hal-libs = %{version}-%{release}
+Obsoletes: %{name} < 0.5.9-1
 
 %description
 HAL is daemon for collection and maintaining information from several
@@ -89,6 +91,7 @@
 Summary: Libraries for accessing HAL
 Group: Development/Libraries
 Requires: dbus >= %{dbus_version}
+Obsoletes: %{name} < 0.5.9-1
 
 %description libs
 Libraries for accessing HAL.
@@ -125,6 +128,7 @@
 
 %prep
 %setup -q -a 3
+%patch0 -p 1 -b .luks-locking
 
 %build
 %configure --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version} --with-os-type=redhat --enable-console-kit --enable-acl-management --enable-umount-helper --enable-acpi-ibm --enable-acpi-toshiba --with-eject=/usr/sbin/eject
@@ -264,6 +268,10 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Tue Apr 03 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-2
+- Fix a bug with how LUKS interacts with locking
+- Obsolete older HAL packages to provide an upgrade path for multilib
+
 * Mon Apr 02 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-1
 - Update to upstream release 0.5.9 and hal-info 20070402
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 20:46:13 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 16:46:13 -0400
Subject: rpms/evolution/devel evolution.spec,1.234.2.2,1.234.2.3
Message-ID: <200704032046.l33KkDpu006051@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
      Tag: private-evo-sanity-2_10_0-branch
	evolution.spec 
Log Message:
old ethread patch



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.234.2.2
retrieving revision 1.234.2.3
diff -u -r1.234.2.2 -r1.234.2.3
--- evolution.spec	3 Apr 2007 02:10:50 -0000	1.234.2.2
+++ evolution.spec	3 Apr 2007 20:46:11 -0000	1.234.2.3
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.0
-Release: 7%{?dist}.dwmw2.1
+Release: 7%{?dist}.dwmw2.2
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite



From fedora-cvs-commits at redhat.com  Tue Apr  3 20:53:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 16:53:09 -0400
Subject: rpms/java-1.5.0-gcj/devel java-1.5.0-gcj.spec,1.12,1.13
Message-ID: <200704032053.l33Kr9C5011042@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.5.0-gcj/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10731

Modified Files:
	java-1.5.0-gcj.spec 
Log Message:
* Tue Apr  3 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-12
- Obsolete gnu-crypto, gnu-crypto-sasl-jdk1.4 and jessie in base
  package.
- Obsolete gnu-crypto-javadoc in javadoc subpackage.




Index: java-1.5.0-gcj.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.5.0-gcj/devel/java-1.5.0-gcj.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- java-1.5.0-gcj.spec	26 Mar 2007 20:00:58 -0000	1.12
+++ java-1.5.0-gcj.spec	3 Apr 2007 20:53:07 -0000	1.13
@@ -55,7 +55,7 @@
 
 Name:    %{name}
 Version: %{javaver}.%{buildver}
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: JPackage runtime compatibility layer for GCJ
 Group:   Development/Languages
 
@@ -132,6 +132,9 @@
 Provides: java-1.4.2-gcj-compat > 1.4.2.0-40jpp.111
 
 Obsoletes: java-1.4.2-gcj-compat <= 1.4.2.0-40jpp.111
+Obsoletes: gnu-crypto <= 2.1.0-2jpp.1
+Obsoletes: gnu-crypto-sasl-jdk1.4 <= 2.1.0-2jpp.1
+Obsoletes: jessie <= 1.0.1-7
 
 %description
 This package installs directory structures, shell scripts and symbolic
@@ -139,7 +142,7 @@
 
 %package devel
 Summary: JPackage development compatibility layer for GCJ
-Group: Development/Tools
+Group:   Development/Tools
 
 # FIXME: require libgcj-src for tools.jar symlink
 Requires:         libgcj%{gccsuffix}-src >= %{gccver}
@@ -210,6 +213,7 @@
 Provides: java-1.4.2-gcj-compat-javadoc > 1.4.2.0-40jpp.111
 
 Obsoletes: java-1.4.2-gcj-compat-javadoc <= 1.4.2.0-40jpp.111
+Obsoletes: gnu-crypto-javadoc <= 2.1.0-2jpp.1
 
 %description javadoc
 This package installs Javadoc API documentation for libgcj.
@@ -702,6 +706,11 @@
 %endif
 
 %changelog
+* Tue Apr  3 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-12
+- Obsolete gnu-crypto, gnu-crypto-sasl-jdk1.4 and jessie in base
+  package.
+- Obsolete gnu-crypto-javadoc in javadoc subpackage.
+
 * Mon Mar 26 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-11
 - Disable bootstrap mode.
 



From fedora-cvs-commits at redhat.com  Tue Apr  3 21:11:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 17:11:21 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.395, 1.396 anaconda.spec, 1.523,
	1.524 sources, 1.520, 1.521
Message-ID: <200704032111.l33LBLdv024418@cvs.devel.redhat.com>

Author: dcantrel

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

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Tue Apr 03 2007 David Cantrell <dcantrell at redhat.com> - 11.2.0.43-1
- Correctly detect if there are no more mirrors to try (clumens, #232639)
- Display size and model info per disk in PartitionTypeWindow in textw
- Support fetching kickstart files from HTTP URLs that require login
  information (bnocera at redhat.com, #194247)
- Improve CongratulationWindow.getScreen (katzj)
- Add missing import to livecd.py (katzj)
- Use correct syntax for hal-lock (katzj)
- Don't traceback in cases where there are no drives (katzj, #234697)
- Add fec_mpc52xx, ps3_storage, and gelic_net (#220009)
- Display IP address of the VNC server (#234747)
- Add OSA layer 2 support for System Z (bhinson at redhat.com, #233376)
- Import constants in backend.py (clumens, #234782)
- Add netxen_nic driver (clumens, #230245)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -r1.395 -r1.396
--- .cvsignore	30 Mar 2007 20:59:43 -0000	1.395
+++ .cvsignore	3 Apr 2007 21:11:19 -0000	1.396
@@ -1 +1 @@
-anaconda-11.2.0.42.tar.bz2
+anaconda-11.2.0.43.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.523
retrieving revision 1.524
diff -u -r1.523 -r1.524
--- anaconda.spec	30 Mar 2007 20:59:43 -0000	1.523
+++ anaconda.spec	3 Apr 2007 21:11:19 -0000	1.524
@@ -1,7 +1,7 @@
 %define livearches %{ix86} x86_64
 
 Name: anaconda
-Version: 11.2.0.42
+Version: 11.2.0.43
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -142,6 +142,21 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Apr 03 2007 David Cantrell <dcantrell at redhat.com> - 11.2.0.43-1
+- Correctly detect if there are no more mirrors to try (clumens, #232639)
+- Display size and model info per disk in PartitionTypeWindow in textw
+- Support fetching kickstart files from HTTP URLs that require login
+  information (bnocera at redhat.com, #194247)
+- Improve CongratulationWindow.getScreen (katzj)
+- Add missing import to livecd.py (katzj)
+- Use correct syntax for hal-lock (katzj)
+- Don't traceback in cases where there are no drives (katzj, #234697)
+- Add fec_mpc52xx, ps3_storage, and gelic_net (#220009)
+- Display IP address of the VNC server (#234747)
+- Add OSA layer 2 support for System Z (bhinson at redhat.com, #233376)
+- Import constants in backend.py (clumens, #234782)
+- Add netxen_nic driver (clumens, #230245)
+
 * Fri Mar 30 2007 David Cantrell <dcantrell at redhat.com> - 11.2.0.42-1
 - LiveCD fixes (katzj, #230945, #224208, #224213, #230943)
 - Handle IOErrors if we can't find the kickstart file (clumens)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.520
retrieving revision 1.521
diff -u -r1.520 -r1.521
--- sources	30 Mar 2007 20:59:43 -0000	1.520
+++ sources	3 Apr 2007 21:11:19 -0000	1.521
@@ -1 +1 @@
-36d9d2f5fd1b4632937820ed372bf495  anaconda-11.2.0.42.tar.bz2
+36c2521e929a01935cc85935da791e0a  anaconda-11.2.0.43.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr  3 21:39:27 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 17:39:27 -0400
Subject: rpms/kernel/FC-6 linux-2.6-drivers_pci_no_msi_mmconf.patch, NONE,
 1.1 linux-2.6.20.5-rc1-ata_scsi_preserve_lba_bit.patch, NONE,
 1.1 linux-2.6.20.5-rc1-crypto_walk_fix_advance_by.patch, NONE,
 1.1 patch-2.6.20.5-rc1.bz2.sign, NONE, 1.1 .cvsignore, 1.557,
 1.558 kernel-2.6.spec, 1.2941, 1.2942 sources, 1.521, 1.522 upstream, 1.441,
 1.442 linux-2.6-20.5dvb-Fix-SECAM-handling-on-saa7115.patch, 1.1,
 NONE linux-2.6-20.5dvb-core-fix-several-locking-related-problems.patch, 1.1,
 NONE linux-2.6-20.5dvb-isl6421-don-t-reference-freed-memory.patch, 1.1,
 NONE linux-2.6-20.5dvb-msp_attach-must-return-0-if-no-msp3400-was-foun.patch,
 1.1, NONE linux-2.6-20.5dvb-saa7146-Fix-allocation-of-clipping-memory.patch,
 1.1, NONE linux-2.6-20.5t-cifs_allow_attr_reset_normal.patch, 1.1,
 NONE linux-2.6-20.5t-cifs_reset_mode_when_no_attr_readonly.patch, 1.1,
 NONE linux-2.6-20.5t-cx88-dvb-fix-nxt200-input.patch, 1.1,
 NONE linux-2.6-20.5t-ide_revert_drive_side_80c_test.patch, 1.1,
 NONE linux-2.6-20.5t-sata_mv_dont_touch_reserved_bits!
 .patch, 1.1, NONE linux-2.6-20.5t-sata_mv_fix_50xx_irq_mask.patch, 1.1,
 NONE linux-2.6-20.5x-ich_clear_bmdma_1_of_2.patch, 1.1,
 NONE linux-2.6-20.5x-ich_clear_bmdma_2_of_2.patch, 1.1,
 NONE linux-2.6-20.5x-ide_jmicron_play_nice_with_ahci.patch, 1.1,
 NONE linux-2.6-20.5x_libata_clear_tf_and_poll.patch, 1.1,
 NONE linux-2.6-20.5y-block-io-errors-on-i2o-disk.patch, 1.1,
 NONE linux-2.6-20.5y-sata_copy_all_bits_in_hdio_drive_task.patch, 1.1,
 NONE linux-2.6-20.5y_crypto_walk_chunks_broken.patch, 1.1,
 NONE linux-2.6-20.5y_sata_nv_adma_pause_between_commands.patch, 1.1,
 NONE linux-2.6-20.5z-cls_basic_fix_null_deref.patch, 1.1,
 NONE linux-2.6-20.5z-net_sched_fix_ingress_locking.patch, 1.1, NONE
Message-ID: <200704032139.l33LdRSm006634@cvs.devel.redhat.com>

Author: cebbert

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	linux-2.6-drivers_pci_no_msi_mmconf.patch 
	linux-2.6.20.5-rc1-ata_scsi_preserve_lba_bit.patch 
	linux-2.6.20.5-rc1-crypto_walk_fix_advance_by.patch 
	patch-2.6.20.5-rc1.bz2.sign 
Removed Files:
	linux-2.6-20.5dvb-Fix-SECAM-handling-on-saa7115.patch 
	linux-2.6-20.5dvb-core-fix-several-locking-related-problems.patch 
	linux-2.6-20.5dvb-isl6421-don-t-reference-freed-memory.patch 
	linux-2.6-20.5dvb-msp_attach-must-return-0-if-no-msp3400-was-foun.patch 
	linux-2.6-20.5dvb-saa7146-Fix-allocation-of-clipping-memory.patch 
	linux-2.6-20.5t-cifs_allow_attr_reset_normal.patch 
	linux-2.6-20.5t-cifs_reset_mode_when_no_attr_readonly.patch 
	linux-2.6-20.5t-cx88-dvb-fix-nxt200-input.patch 
	linux-2.6-20.5t-ide_revert_drive_side_80c_test.patch 
	linux-2.6-20.5t-sata_mv_dont_touch_reserved_bits.patch 
	linux-2.6-20.5t-sata_mv_fix_50xx_irq_mask.patch 
	linux-2.6-20.5x-ich_clear_bmdma_1_of_2.patch 
	linux-2.6-20.5x-ich_clear_bmdma_2_of_2.patch 
	linux-2.6-20.5x-ide_jmicron_play_nice_with_ahci.patch 
	linux-2.6-20.5x_libata_clear_tf_and_poll.patch 
	linux-2.6-20.5y-block-io-errors-on-i2o-disk.patch 
	linux-2.6-20.5y-sata_copy_all_bits_in_hdio_drive_task.patch 
	linux-2.6-20.5y_crypto_walk_chunks_broken.patch 
	linux-2.6-20.5y_sata_nv_adma_pause_between_commands.patch 
	linux-2.6-20.5z-cls_basic_fix_null_deref.patch 
	linux-2.6-20.5z-net_sched_fix_ingress_locking.patch 
Log Message:
* Tue Apr  3 2007 Chuck Ebbert <cebbert at redhat.com>		1.2942
- 2.6.20.5-rc1 plus two fixes for broken -rc1 patches.
- Remove patches that are now in 20.5-rc1.
- 2106: move firmware timeout patch to here.
- 2107: Disable PCI MSI and MMCONFIG by default,
  add options to enable them.


linux-2.6-drivers_pci_no_msi_mmconf.patch:
 Documentation/kernel-parameters.txt |    5 +++++
 arch/i386/pci/common.c              |    6 +++++-
 drivers/pci/msi.c                   |    6 +++++-
 drivers/pci/pci.c                   |    2 ++
 drivers/pci/pci.h                   |    2 ++
 5 files changed, 19 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-drivers_pci_no_msi_mmconf.patch ---
Disable PCI MSI and MMCONFIG by default, add kernel parameters
to enable them.

Original mmconfig patch by Kyle McMartin <kyle at ubuntu.com>

Signed-off-by: Chuck Ebbert <cebbert at redhat.com>

---
 Documentation/kernel-parameters.txt |    5 +++++
 arch/i386/pci/common.c              |    6 +++++-
 drivers/pci/msi.c                   |    6 +++++-
 drivers/pci/pci.c                   |    2 ++
 drivers/pci/pci.h                   |    2 ++
 5 files changed, 19 insertions(+), 2 deletions(-)

--- linux-2.6.20.noarch.orig/drivers/pci/msi.c
+++ linux-2.6.20.noarch/drivers/pci/msi.c
@@ -28,7 +28,7 @@ static DEFINE_SPINLOCK(msi_lock);
 static struct msi_desc* msi_desc[NR_IRQS] = { [0 ... NR_IRQS-1] = NULL };
 static struct kmem_cache* msi_cachep;
 
-static int pci_msi_enable = 1;
+static int pci_msi_enable = 0;
 
 static int msi_cache_init(void)
 {
@@ -977,6 +977,10 @@ void pci_no_msi(void)
 {
 	pci_msi_enable = 0;
 }
+void pci_yes_msi(void)
+{
+	pci_msi_enable = 1;
+}
 
 EXPORT_SYMBOL(pci_enable_msi);
 EXPORT_SYMBOL(pci_disable_msi);
--- linux-2.6.20.noarch.orig/drivers/pci/pci.c
+++ linux-2.6.20.noarch/drivers/pci/pci.c
@@ -1168,6 +1168,8 @@ static int __devinit pci_setup(char *str
 		if (*str && (str = pcibios_setup(str)) && *str) {
 			if (!strcmp(str, "nomsi")) {
 				pci_no_msi();
+			} else if (!strcmp(str, "msi")) {
+				pci_yes_msi();
 			} else {
 				printk(KERN_ERR "PCI: Unknown option `%s'\n",
 						str);
--- linux-2.6.20.noarch.orig/Documentation/kernel-parameters.txt
+++ linux-2.6.20.noarch/Documentation/kernel-parameters.txt
@@ -1197,8 +1197,13 @@ and is between 256 and 4096 characters. 
 				Mechanism 1.
 		conf2		[IA-32] Force use of PCI Configuration
 				Mechanism 2.
+		mmconf		[IA-32,X86_64] Enable use of MMCONFIG for PCI
+				Configuration
 		nommconf	[IA-32,X86_64] Disable use of MMCONFIG for PCI
 				Configuration
+		msi		[MSI] If the PCI_MSI kernel config parameter is
+				enabled, this kernel boot option can be used to
+				enable the use of MSI interrupts system-wide.
 		nomsi		[MSI] If the PCI_MSI kernel config parameter is
 				enabled, this kernel boot option can be used to
 				disable the use of MSI interrupts system-wide.
--- linux-2.6.20.noarch.orig/arch/i386/pci/common.c
+++ linux-2.6.20.noarch/arch/i386/pci/common.c
@@ -18,7 +18,7 @@
 #include "pci.h"
 
 unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 |
-				PCI_PROBE_MMCONF;
+				0; /* PCI_PROBE_MMCONF */
 
 static int pci_bf_sort;
 int pci_routeirq;
@@ -292,6 +292,10 @@ char * __devinit  pcibios_setup(char *st
 		pci_probe &= ~PCI_PROBE_MMCONF;
 		return NULL;
 	}
+	else if (!strcmp(str, "mmconf")) {
+		pci_probe |= PCI_PROBE_MMCONF;
+		return NULL;
+	}
 #endif
 	else if (!strcmp(str, "noacpi")) {
 		acpi_noirq_set();
--- linux-2.6.20.noarch.orig/drivers/pci/pci.h
+++ linux-2.6.20.noarch/drivers/pci/pci.h
@@ -52,9 +52,11 @@ extern unsigned int pci_pm_d3_delay;
 #ifdef CONFIG_PCI_MSI
 void disable_msi_mode(struct pci_dev *dev, int pos, int type);
 void pci_no_msi(void);
+void pci_yes_msi(void);
 #else
 static inline void disable_msi_mode(struct pci_dev *dev, int pos, int type) { }
 static inline void pci_no_msi(void) { }
+static inline void pci_yes_msi(void) { }
 #endif
 #if defined(CONFIG_PCI_MSI) && defined(CONFIG_PM)
 int pci_save_msi_state(struct pci_dev *dev);

linux-2.6.20.5-rc1-ata_scsi_preserve_lba_bit.patch:
 libata-scsi.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE linux-2.6.20.5-rc1-ata_scsi_preserve_lba_bit.patch ---
---
--- linux/drivers/ata/libata-scsi.c.orig	2007-03-21 13:35:02.000000000 -0400
+++ linux/drivers/ata/libata-scsi.c	2007-03-30 17:40:58.000000000 -0400
@@ -333,7 +333,7 @@
 	scsi_cmd[8]  = args[3];
 	scsi_cmd[10] = args[4];
 	scsi_cmd[12] = args[5];
-	scsi_cmd[13] = args[6] & 0x0f;
+	scsi_cmd[13] = args[6] & 0x4f;
 	scsi_cmd[14] = args[0];
 
 	/* Good values for timeout and retries?  Values below
-- 
Mark Lord
Real-Time Remedies Inc.
mlord at pobox.com
-
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/


linux-2.6.20.5-rc1-crypto_walk_fix_advance_by.patch:
 scatterwalk.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE linux-2.6.20.5-rc1-crypto_walk_fix_advance_by.patch ---
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/crypto/scatterwalk.c b/crypto/scatterwalk.c
index a664231..0f76175 100644
--- a/crypto/scatterwalk.c
+++ b/crypto/scatterwalk.c
@@ -91,7 +91,7 @@ void scatterwalk_copychunks(void *buf, struct scatter_walk *walk,
 		memcpy_dir(buf, vaddr, len_this_page, out);
 		scatterwalk_unmap(vaddr, out);
 
-		scatterwalk_advance(walk, nbytes);
+		scatterwalk_advance(walk, len_this_page);
 
 		if (nbytes == len_this_page)
 			break;
-
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/



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

iD8DBQBGDX4ayGugalF9Dw4RAiudAKCL89HErY7xSkMcWw83ZtzgoZSrzQCaA9bY
DzaYyUONaW1KzmIj/TTy+IQ=
=gdSw
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/.cvsignore,v
retrieving revision 1.557
retrieving revision 1.558
diff -u -r1.557 -r1.558
--- .cvsignore	23 Mar 2007 22:41:16 -0000	1.557
+++ .cvsignore	3 Apr 2007 21:39:24 -0000	1.558
@@ -8,3 +8,4 @@
 patch-2.6.20.2-3.bz2
 patch-2.6.20.3-4.bz2
 xen-3.0.3-11774.tar.bz2
+patch-2.6.20.5-rc1.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2941
retrieving revision 1.2942
diff -u -r1.2941 -r1.2942
--- kernel-2.6.spec	2 Apr 2007 12:51:09 -0000	1.2941
+++ kernel-2.6.spec	3 Apr 2007 21:39:24 -0000	1.2942
@@ -374,6 +374,9 @@
 Patch2: patch-2.6.20.1-2.bz2
 Patch3: patch-2.6.20.2-3.bz2
 Patch4: patch-2.6.20.3-4.bz2
+Patch5: patch-2.6.20.5-rc1.bz2
+Patch6: linux-2.6.20.5-rc1-ata_scsi_preserve_lba_bit.patch
+Patch7: linux-2.6.20.5-rc1-crypto_walk_fix_advance_by.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 # needed to get utrace patch to apply cleanly
@@ -516,43 +519,19 @@
 #Patch: linux-2.6-simplify_assign_irq_vector.patch
 #Patch: linux-2.6-no_handler_for_vector_fix.patch
 
-# post 2.6.20.4 fixes
-Patch1800: linux-2.6-20.5t-cifs_allow_attr_reset_normal.patch
-Patch1801: linux-2.6-20.5t-cifs_reset_mode_when_no_attr_readonly.patch
+# post 2.6.20.5 fixes
 Patch1802: linux-2.6-20.5t-cx88-dvb-autoload.patch
-Patch1803: linux-2.6-20.5t-cx88-dvb-fix-nxt200-input.patch
-Patch1804: linux-2.6-20.5t-ide_revert_drive_side_80c_test.patch
 Patch1805: linux-2.6-20.5t-net_xfrm_audit_add_space.patch
-Patch1806: linux-2.6-20.5t-sata_mv_dont_touch_reserved_bits.patch
-Patch1807: linux-2.6-20.5t-sata_mv_fix_50xx_irq_mask.patch
 Patch1808: linux-2.6-20.5t-sky2_latest_tx_timout.patch
-Patch1809: linux-2.6-20.5x-ich_clear_bmdma_1_of_2.patch
-Patch1810: linux-2.6-20.5x-ich_clear_bmdma_2_of_2.patch
-Patch1811: linux-2.6-20.5x-ide_jmicron_play_nice_with_ahci.patch
-Patch1812: linux-2.6-20.5x_libata_clear_tf_and_poll.patch
-Patch1813: linux-2.6-20.5y_crypto_walk_chunks_broken.patch
 Patch1814: linux-2.6-20.5y-dm_crypt_disable_barriers.patch
 Patch1815: linux-2.6-20.5y_msix_flush_writes.patch
-Patch1816: linux-2.6-20.5y-sata_copy_all_bits_in_hdio_drive_task.patch
-Patch1817: linux-2.6-20.5y_sata_nv_adma_pause_between_commands.patch
 Patch1818: linux-2.6-jmicron_debug.patch
-
-# more post 2.6.20.4 patches
-Patch1819: linux-2.6-20.5dvb-core-fix-several-locking-related-problems.patch
-Patch1820: linux-2.6-20.5dvb-Fix-SECAM-handling-on-saa7115.patch
-Patch1821: linux-2.6-20.5dvb-isl6421-don-t-reference-freed-memory.patch
-Patch1822: linux-2.6-20.5dvb-msp_attach-must-return-0-if-no-msp3400-was-foun.patch
-Patch1823: linux-2.6-20.5dvb-saa7146-Fix-allocation-of-clipping-memory.patch
 Patch1824: linux-2.6-20.5t-dvb-bt8xx-autoload.patch
-Patch1825: linux-2.6-20.5y-block-io-errors-on-i2o-disk.patch
-Patch1826: linux-2.6-20.5z-cls_basic_fix_null_deref.patch
 Patch1827: linux-2.6-20.5z-ide_use_proper_error_recovery.patch
 Patch1828: linux-2.6-20.5z-mmap_dont_spam_logs.patch
-Patch1829: linux-2.6-20.5z-net_sched_fix_ingress_locking.patch
 Patch1830: linux-2.6-20.5z-nfs_allow_64bit_cookies.patch
 Patch1831: linux-2.6-20.5z-softmac_check_if_running.patch
 Patch1832: linux-2.6-20_bluetooth_broadcom_quirk.patch
-Patch1833: linux-2.6-fedora_firmware_timout_limit.patch
 Patch1834: linux-2.6-mm-udf-fixes.patch
 Patch1835: linux-2.6-proposed-i82875p-edac-fix.patch
 
@@ -574,6 +553,8 @@
 Patch2102: linux-2.6-defaults-phys-start.patch
 Patch2103: linux-2.6-defaults-unicode-vt.patch
 Patch2105: linux-2.6-defaults-nonmi.patch
+Patch2106: linux-2.6-fedora_firmware_timout_limit.patch
+Patch2107: linux-2.6-drivers_pci_no_msi_mmconf.patch
 
 # SATA Bits
 Patch2200: linux-2.6-sata-promise-pata-ports.patch
@@ -1035,6 +1016,9 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
@@ -1257,44 +1241,34 @@
 #%patch1795 -p1
 #%patch1796 -p1
 
-# post 2.6.20.4 fixes
-%patch1800 -p1
-%patch1801 -p1
+# post 2.6.20.5 fixes
+# dvb cx88 autoload (fedora)
 %patch1802 -p1
-%patch1803 -p1
-%patch1804 -p1
+# audit xfrm add space
 %patch1805 -p1
-%patch1806 -p1
-%patch1807 -p1
+# sky2 timeout
 %patch1808 -p1
-%patch1809 -p1
-%patch1810 -p1
-%patch1811 -p1
-%patch1812 -p1
-%patch1813 -p1
+# dm crypt disable barriers (send)
 %patch1814 -p1
+# msix flush writes
 %patch1815 -p1
-%patch1816 -p1
-%patch1817 -p1
+# jmicron debugging (fedora)
 %patch1818 -p1
-
-# more post 2.6.20.4 patches
-%patch1819 -p1
-%patch1820 -p1
-%patch1821 -p1
-%patch1822 -p1
-%patch1823 -p1
+# bt8xx autoload (fedora)
 %patch1824 -p1
-%patch1825 -p1
-%patch1826 -p1
+# ide error recovery (send)
 %patch1827 -p1
+# mmap dont spam logs (send?)
 %patch1828 -p1
-%patch1829 -p1
+# nfs allow 64bit cookies (send?)
 %patch1830 -p1
+# softmac check if running (send)
 %patch1831 -p1
+# bluetooth quirk (sent to maintainer, ignored)
 %patch1832 -p1
-%patch1833 -p1
+# UDF fixes from -mm
 %patch1834 -p1
+# i82875 edac unhide pci device
 %patch1835 -p1
 
 # Fix the SELinux mprotect checks on executable mappings
@@ -1323,6 +1297,11 @@
 %patch2103 -p1
 # Disable NMI watchdog by default.
 %patch2105 -p1
+# dont allow firmware timeout < 60 seconds
+%patch2106 -p1
+# disable PCI MMCONFIG and MSI by default
+%patch2107 -p1
+
 
 # ACPI patches
 
@@ -2309,6 +2288,13 @@
 %endif
 
 %changelog
+* Tue Apr  3 2007 Chuck Ebbert <cebbert at redhat.com>		1.2942
+- 2.6.20.5-rc1 plus two fixes for broken -rc1 patches.
+- Remove patches that are now in 20.5-rc1.
+- 2106: move firmware timeout patch to here.
+- 2107: Disable PCI MSI and MMCONFIG by default,
+  add options to enable them.
+
 * Mon Apr 02 2007 Markus Armbruster <armbru at redhat.com>
 - Xen kernel:
   >4G guest fix (Steven Rostedt )


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/sources,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -r1.521 -r1.522
--- sources	23 Mar 2007 22:41:16 -0000	1.521
+++ sources	3 Apr 2007 21:39:24 -0000	1.522
@@ -4,3 +4,4 @@
 8425cead82afc782e2a3866a287a61fe  patch-2.6.20.2-3.bz2
 39b98fdb6320cc986a67e76fbeb35a0c  patch-2.6.20.3-4.bz2
 a9d44b2651b0898e103395b2a7a4f263  xen-3.0.3-11774.tar.bz2
+f2ab4510e8a885ddc6eb6ba2bd6cec0e  patch-2.6.20.5-rc1.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/upstream,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -r1.441 -r1.442
--- upstream	23 Mar 2007 22:41:16 -0000	1.441
+++ upstream	3 Apr 2007 21:39:24 -0000	1.442
@@ -3,3 +3,4 @@
 patch-2.6.20.1-2.bz2
 patch-2.6.20.2-3.bz2
 patch-2.6.20.3-4.bz2
+patch-2.6.20.5-rc1.bz2


--- linux-2.6-20.5dvb-Fix-SECAM-handling-on-saa7115.patch DELETED ---


--- linux-2.6-20.5dvb-core-fix-several-locking-related-problems.patch DELETED ---


--- linux-2.6-20.5dvb-isl6421-don-t-reference-freed-memory.patch DELETED ---


--- linux-2.6-20.5dvb-msp_attach-must-return-0-if-no-msp3400-was-foun.patch DELETED ---


--- linux-2.6-20.5dvb-saa7146-Fix-allocation-of-clipping-memory.patch DELETED ---


--- linux-2.6-20.5t-cifs_allow_attr_reset_normal.patch DELETED ---


--- linux-2.6-20.5t-cifs_reset_mode_when_no_attr_readonly.patch DELETED ---


--- linux-2.6-20.5t-cx88-dvb-fix-nxt200-input.patch DELETED ---


--- linux-2.6-20.5t-ide_revert_drive_side_80c_test.patch DELETED ---


--- linux-2.6-20.5t-sata_mv_dont_touch_reserved_bits.patch DELETED ---


--- linux-2.6-20.5t-sata_mv_fix_50xx_irq_mask.patch DELETED ---


--- linux-2.6-20.5x-ich_clear_bmdma_1_of_2.patch DELETED ---


--- linux-2.6-20.5x-ich_clear_bmdma_2_of_2.patch DELETED ---


--- linux-2.6-20.5x-ide_jmicron_play_nice_with_ahci.patch DELETED ---


--- linux-2.6-20.5x_libata_clear_tf_and_poll.patch DELETED ---


--- linux-2.6-20.5y-block-io-errors-on-i2o-disk.patch DELETED ---


--- linux-2.6-20.5y-sata_copy_all_bits_in_hdio_drive_task.patch DELETED ---


--- linux-2.6-20.5y_crypto_walk_chunks_broken.patch DELETED ---


--- linux-2.6-20.5y_sata_nv_adma_pause_between_commands.patch DELETED ---


--- linux-2.6-20.5z-cls_basic_fix_null_deref.patch DELETED ---


--- linux-2.6-20.5z-net_sched_fix_ingress_locking.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr  3 21:40:28 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 17:40:28 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.3040.2.1,1.3040.2.2
Message-ID: <200704032140.l33LeS87006698@cvs.devel.redhat.com>

Author: jwilson

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

Modified Files:
      Tag: private-jw-vanilla-branch
	kernel-2.6.spec 
Log Message:
More vanilla build tweaks


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3040.2.1
retrieving revision 1.3040.2.2
diff -u -r1.3040.2.1 -r1.3040.2.2
--- kernel-2.6.spec	3 Apr 2007 15:58:33 -0000	1.3040.2.1
+++ kernel-2.6.spec	3 Apr 2007 21:40:21 -0000	1.3040.2.2
@@ -50,7 +50,7 @@
 %define debugbuildsenabled 0
 
 # Want to build a vanilla kernel build without any non-upstream patches?
-# (well, almost none, we need a few for build purposes). Default to 0 (off).
+# (well, almost none, we need nonintconfig for build purposes). Default to 0 (off).
 %define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
 
 # Versions of various parts
@@ -66,13 +66,21 @@
 %define rpmversion 2.6.%{sublevel}
 %define specrelease %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}%{?buildid}
 %define release %{specrelease}
-# Set upstream kernel sublevel, -rcX and -gitY levels here
-# For rawhide, usually the forthcoming kernel's sublevel, for a stable
-# release, likely something like 20.5 for kernel 2.6.20.5
+# Set upstream kernel sublevel, -rcX and -gitY and stable release levels here
+# For rawhide, uksublevel is usually the in-development kernel's sublevel and
+# stabletag is always 0.
+# For a stable release, uksublevel should match sublevel above, and stabletag
+# is the y in 2.6.x.y, or 0 in the case there is no y release yet.
 # Comment out rcrev and gitrev as needed
 %define uksublevel 21
+%if %{sublevel} == %{uksublevel}
+%define stabletag 4
+%else
 %define rcrev 5
 %define gitrev 9
+# Do not change, should always be 0 for non-stable kernel release builds
+%define stabletag 0
+%endif
 
 %define make_target bzImage
 %define kernel_image x86
@@ -84,6 +92,7 @@
 
 %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}
 %define hdrarch %_target_cpu
+%define pkgname kernel
 
 # if requested, only build base kernel
 %if %{with_baseonly}
@@ -105,17 +114,17 @@
 
 # if vanilla build...
 %if %{with_vanilla}
-%{?rcrev: %define rctag _rc%rcrev}
-%{?gitrev: %define gittag _git%gitrev}
-%define ukver 2.6.%{uksublevel}%{?rctag}%{?gittag}
+%{?rcrev: %define rctag .rc%rcrev}
+%{?gitrev: %define gittag .git%gitrev}
+%define ukver 2.6.%{uksublevel}
 %define includexen 0
 %define with_xen 0
 %define with_modsign 0
 # Ignore unknown options in our config-* files.
 # Some options go with patches we're not applying.
 %define oldconfig_target loose_nonint_oldconfig
-# Put upstream kernel version in release
-%define release 0.%{specrelease}.%{ukver}
+# Put upstream rc and git tags in release, if relevant
+%define release %{stabletag}%{?rctag}%{?gittag}.1%{?dist}%{?buildid}
 %else
 %define oldconfig_target nonint_oldconfig
 %endif
@@ -314,11 +323,16 @@
 #
 %define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.4-1
 
+%if !%{with_vanilla}
 Name: kernel
-Group: System Environment/Kernel
-License: GPLv2
 Version: %{rpmversion}
+%else
+Name: kernel-vanilla
+Version: %{ukver}
+%endif
 Release: %{release}
+Group: System Environment/Kernel
+License: GPLv2
 %if 0%{?olpc}
 ExclusiveArch: i386 i586
 %else
@@ -806,6 +820,9 @@
 Group: Development/System
 Obsoletes: glibc-kernheaders
 Provides: glibc-kernheaders = 3.0-46
+%if %{with_vanilla}
+Provides: kernel-headers = %{version}-%{release}
+%endif
 %description headers
 Kernel-headers includes the C header files that specify the interface
 between the Linux kernel and userspace libraries and programs.  The
@@ -970,7 +987,7 @@
 if [ ! -d kernel-%{kversion}/vanilla ]; then
   # Ok, first time we do a make prep.
   rm -f pax_global_header
-%setup -q -n %{name}-%{kversion} -c
+%setup -q -n %{pkgname}-%{kversion} -c
   mv linux-%{kversion} vanilla
 else
   # We already have a vanilla dir.
@@ -1363,7 +1380,7 @@
 
 # unpack sparse.
 if [ ! -d sparse-%{sparsever} ] ; then
-%setup -D -T -q -n %{name}-%{kversion} -a3
+%setup -D -T -q -n %{pkgname}-%{kversion} -a3
 fi
 
 # Unpack the Xen tarball.
@@ -1372,7 +1389,7 @@
 if [ -d xen ]; then
   rm -rf xen
 fi
-%setup -D -T -q -n %{name}-%{kversion} -a1
+%setup -D -T -q -n %{pkgname}-%{kversion} -a1
 cd xen
 # Any necessary hypervisor patches go here
 %patch20000 -p1
@@ -1421,7 +1438,7 @@
       DevelLink=
     fi
 
-    KernelVer=%{kversion}-%{release}$Flavour
+    KernelVer=%{version}-%{release}$Flavour
     echo BUILDING A KERNEL FOR $Flavour %{_target_cpu}...
 
     # make sure EXTRAVERSION says what we want it to say
@@ -1687,10 +1704,10 @@
 %global __debug_package 1
 %files debuginfo-common
 %defattr(-,root,root)
-/usr/src/debug/%{name}-%{kversion}/linux-%{kversion}.%{_target_cpu}
+/usr/src/debug/%{pkgname}-%{kversion}/linux-%{kversion}.%{_target_cpu}
 %if %{includexen}
 %if %{with_xen}
-/usr/src/debug/%{name}-%{kversion}/xen
+/usr/src/debug/%{pkgname}-%{kversion}/xen
 %endif
 %endif
 %dir /usr/src/debug



From fedora-cvs-commits at redhat.com  Tue Apr  3 22:15:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 18:15:21 -0400
Subject: rpms/kernel/devel Makefile,1.45.8.1,1.45.8.2
Message-ID: <200704032215.l33MFLOA008009@cvs.devel.redhat.com>

Author: jwilson

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

Modified Files:
      Tag: private-jw-vanilla-branch
	Makefile 
Log Message:
Makefile tweaks for vanilla tagging


Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile,v
retrieving revision 1.45.8.1
retrieving revision 1.45.8.2
diff -u -r1.45.8.1 -r1.45.8.2
--- Makefile	3 Apr 2007 15:58:33 -0000	1.45.8.1
+++ Makefile	3 Apr 2007 22:15:19 -0000	1.45.8.2
@@ -93,3 +93,22 @@
 
 # since i386 isn't a target...
 compile compile-short: DIST_DEFINES += --target $(shell uname -m)
+
+#
+# Hacks for building vanilla (unpatched) kernel rpms.
+# Use "make vanilla-TARGET" like "make TARGET" (make vanilla-scratch-build).
+#
+VNAME    := $(shell echo kernel-vanilla | sed -e s/\\\./_/g -e s/^[0-9]\\\+//g)
+VVERSION := $(shell rpm $(RPM_DEFINES) $(DIST_DEFINES) --with vanilla --define "_sourcedir $(SOURCEHACK)" -q --qf "%{VERSION}\n" --specfile $(SPECFILE)| head -1)
+VRELEASE := $(shell rpm $(RPM_DEFINES) $(DIST_DEFINES) --with vanilla --define "_sourcedir $(SOURCEHACK)" -q --qf "%{RELEASE}\n" --specfile $(SPECFILE)| head -1)
+
+VTAG_NAME    := $(shell echo $(VNAME)    | sed -e s/\\\./_/g -e s/^[0-9]\\\+//g)
+VTAG_VERSION := $(shell echo $(VVERSION) | sed s/\\\./_/g)
+VTAG_RELEASE := $(shell echo $(VRELEASE) | sed s/\\\./_/g)
+
+VTAG=$(VTAG_NAME)-$(VTAG_VERSION)-$(VTAG_RELEASE)
+
+vanilla-tag: $(SPECFILE)
+	cvs tag $(TAG_OPTS) -c $(VTAG)
+	@echo "Tagged with: $(VTAG)"
+	@echo



From fedora-cvs-commits at redhat.com  Tue Apr  3 22:16:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 18:16:53 -0400
Subject: rpms/kernel/devel Makefile,1.45.8.2,1.45.8.3
Message-ID: <200704032216.l33MGrgK008103@cvs.devel.redhat.com>

Author: jwilson

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

Modified Files:
      Tag: private-jw-vanilla-branch
	Makefile 
Log Message:
Meh. I hate cvs...


Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile,v
retrieving revision 1.45.8.2
retrieving revision 1.45.8.3
diff -u -r1.45.8.2 -r1.45.8.3
--- Makefile	3 Apr 2007 22:15:19 -0000	1.45.8.2
+++ Makefile	3 Apr 2007 22:16:51 -0000	1.45.8.3
@@ -98,15 +98,13 @@
 # Hacks for building vanilla (unpatched) kernel rpms.
 # Use "make vanilla-TARGET" like "make TARGET" (make vanilla-scratch-build).
 #
-VNAME    := $(shell echo kernel-vanilla | sed -e s/\\\./_/g -e s/^[0-9]\\\+//g)
 VVERSION := $(shell rpm $(RPM_DEFINES) $(DIST_DEFINES) --with vanilla --define "_sourcedir $(SOURCEHACK)" -q --qf "%{VERSION}\n" --specfile $(SPECFILE)| head -1)
 VRELEASE := $(shell rpm $(RPM_DEFINES) $(DIST_DEFINES) --with vanilla --define "_sourcedir $(SOURCEHACK)" -q --qf "%{RELEASE}\n" --specfile $(SPECFILE)| head -1)
 
-VTAG_NAME    := $(shell echo $(VNAME)    | sed -e s/\\\./_/g -e s/^[0-9]\\\+//g)
 VTAG_VERSION := $(shell echo $(VVERSION) | sed s/\\\./_/g)
 VTAG_RELEASE := $(shell echo $(VRELEASE) | sed s/\\\./_/g)
 
-VTAG=$(VTAG_NAME)-$(VTAG_VERSION)-$(VTAG_RELEASE)
+VTAG=$(TAG_NAME)-$(VTAG_VERSION)-$(VTAG_RELEASE)
 
 vanilla-tag: $(SPECFILE)
 	cvs tag $(TAG_OPTS) -c $(VTAG)



From fedora-cvs-commits at redhat.com  Tue Apr  3 22:33:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 18:33:23 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.396, 1.397 anaconda.spec, 1.524,
	1.525 sources, 1.521, 1.522
Message-ID: <200704032233.l33MXNn4023183@cvs.devel.redhat.com>

Author: katzj

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -r1.396 -r1.397
--- .cvsignore	3 Apr 2007 21:11:19 -0000	1.396
+++ .cvsignore	3 Apr 2007 22:33:21 -0000	1.397
@@ -1 +1 @@
-anaconda-11.2.0.43.tar.bz2
+anaconda-11.2.0.44.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.524
retrieving revision 1.525
diff -u -r1.524 -r1.525
--- anaconda.spec	3 Apr 2007 21:11:19 -0000	1.524
+++ anaconda.spec	3 Apr 2007 22:33:21 -0000	1.525
@@ -1,7 +1,7 @@
 %define livearches %{ix86} x86_64
 
 Name: anaconda
-Version: 11.2.0.43
+Version: 11.2.0.44
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -142,6 +142,10 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Apr  3 2007 Jeremy Katz <katzj at redhat.com> - 11.2.0.44-1
+- Clean up depsolve callback to work with yum depsolver
+- More live CD fixing
+
 * Tue Apr 03 2007 David Cantrell <dcantrell at redhat.com> - 11.2.0.43-1
 - Correctly detect if there are no more mirrors to try (clumens, #232639)
 - Display size and model info per disk in PartitionTypeWindow in textw


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -r1.521 -r1.522
--- sources	3 Apr 2007 21:11:19 -0000	1.521
+++ sources	3 Apr 2007 22:33:21 -0000	1.522
@@ -1 +1 @@
-36c2521e929a01935cc85935da791e0a  anaconda-11.2.0.43.tar.bz2
+5613ba816c7b6ee8b6b6d907f27d21b9  anaconda-11.2.0.44.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr  3 22:35:11 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 18:35:11 -0400
Subject: rpms/kernel/devel patch-2.6.21-rc5-git10.bz2.sign, NONE,
	1.1 .cvsignore, 1.597, 1.597.2.1 kernel-2.6.spec, 1.3040.2.2,
	1.3040.2.3 sources, 1.560, 1.560.2.1
Message-ID: <200704032235.l33MZBHM024432@cvs.devel.redhat.com>

Author: jwilson

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

Modified Files:
      Tag: private-jw-vanilla-branch
	.cvsignore kernel-2.6.spec sources 
Added Files:
	patch-2.6.21-rc5-git10.bz2.sign 
Log Message:
Update to 2.6.21-rc5-git10


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

iD8DBQBGEfzdyGugalF9Dw4RAvVsAJ4hikmY7mdeePWgssxM5TH36gqCbQCfcwHp
13lyZlBptAXC8rkfhM4cEog=
=2u5w
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.597
retrieving revision 1.597.2.1
diff -u -r1.597 -r1.597.2.1
--- .cvsignore	2 Apr 2007 19:39:38 -0000	1.597
+++ .cvsignore	3 Apr 2007 22:35:09 -0000	1.597.2.1
@@ -6,3 +6,4 @@
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc5.bz2
 patch-2.6.21-rc5-git9.bz2
+patch-2.6.21-rc5-git10.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3040.2.2
retrieving revision 1.3040.2.3
diff -u -r1.3040.2.2 -r1.3040.2.3
--- kernel-2.6.spec	3 Apr 2007 21:40:21 -0000	1.3040.2.2
+++ kernel-2.6.spec	3 Apr 2007 22:35:09 -0000	1.3040.2.3
@@ -77,7 +77,7 @@
 %define stabletag 4
 %else
 %define rcrev 5
-%define gitrev 9
+%define gitrev 10
 # Do not change, should always be 0 for non-stable kernel release builds
 %define stabletag 0
 %endif


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.560
retrieving revision 1.560.2.1
diff -u -r1.560 -r1.560.2.1
--- sources	2 Apr 2007 19:39:38 -0000	1.560
+++ sources	3 Apr 2007 22:35:09 -0000	1.560.2.1
@@ -1,4 +1,4 @@
 2618cbcc9c9ac1c3c04be903fe3338a7  sparse-0.2.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 b7bf3ee2f3ee778afa1ff0e8d44d193e  patch-2.6.21-rc5.bz2
-3d19be5174983ca8649ccaebc96a5170  patch-2.6.21-rc5-git9.bz2
+397da49fb513f3ba3eb239453355324a  patch-2.6.21-rc5-git10.bz2



From fedora-cvs-commits at redhat.com  Tue Apr  3 23:01:20 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 19:01:20 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.3040.2.3,
	1.3040.2.4 patch-2.6.21-rc5-git9.bz2.sign, 1.1, NONE
Message-ID: <200704032301.l33N1KtH011273@cvs.devel.redhat.com>

Author: jwilson

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

Modified Files:
      Tag: private-jw-vanilla-branch
	kernel-2.6.spec 
Removed Files:
      Tag: private-jw-vanilla-branch
	patch-2.6.21-rc5-git9.bz2.sign 
Log Message:
Still fighting with cvs and the build system to produce a vanilla build...


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3040.2.3
retrieving revision 1.3040.2.4
diff -u -r1.3040.2.3 -r1.3040.2.4
--- kernel-2.6.spec	3 Apr 2007 22:35:09 -0000	1.3040.2.3
+++ kernel-2.6.spec	3 Apr 2007 23:01:17 -0000	1.3040.2.4
@@ -2297,6 +2297,10 @@
 #  - tux.
 
 %changelog
+* Tue Apr 03 2007 Jarod Wilson <jwilson at redhat.com>
+- 2.6.21-rc5-git10
+- kernel-vanilla spec hacks
+
 * Mon Apr 02 2007 Dave Jones <davej at redhat.com>
 - 2.6.21-rc5-git9
 


--- patch-2.6.21-rc5-git9.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr  3 23:03:00 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 19:03:00 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.3040.2.4,1.3040.2.5
Message-ID: <200704032303.l33N30Pg012457@cvs.devel.redhat.com>

Author: jwilson

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

Modified Files:
      Tag: private-jw-vanilla-branch
	kernel-2.6.spec 
Log Message:
Stupid tags...


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3040.2.4
retrieving revision 1.3040.2.5
diff -u -r1.3040.2.4 -r1.3040.2.5
--- kernel-2.6.spec	3 Apr 2007 23:01:17 -0000	1.3040.2.4
+++ kernel-2.6.spec	3 Apr 2007 23:02:58 -0000	1.3040.2.5
@@ -124,7 +124,7 @@
 # Some options go with patches we're not applying.
 %define oldconfig_target loose_nonint_oldconfig
 # Put upstream rc and git tags in release, if relevant
-%define release %{stabletag}%{?rctag}%{?gittag}.1%{?dist}%{?buildid}
+%define release %{stabletag}%{?rctag}%{?gittag}.2%{?dist}%{?buildid}
 %else
 %define oldconfig_target nonint_oldconfig
 %endif



From fedora-cvs-commits at redhat.com  Tue Apr  3 23:05:05 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 19:05:05 -0400
Subject: rpms/kernel/devel upstream,1.488,1.488.2.1
Message-ID: <200704032305.l33N55LT013984@cvs.devel.redhat.com>

Author: jwilson

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

Modified Files:
      Tag: private-jw-vanilla-branch
	upstream 
Log Message:
Forgot to twiddle the upstream file


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.488
retrieving revision 1.488.2.1
diff -u -r1.488 -r1.488.2.1
--- upstream	2 Apr 2007 19:39:38 -0000	1.488
+++ upstream	3 Apr 2007 23:05:03 -0000	1.488.2.1
@@ -1,3 +1,3 @@
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc5.bz2
-patch-2.6.21-rc5-git9.bz2
+patch-2.6.21-rc5-git10.bz2



From fedora-cvs-commits at redhat.com  Tue Apr  3 23:59:59 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 19:59:59 -0400
Subject: rpms/kernel/devel linux-2.6-pmac-zilog.patch,1.1,1.2
Message-ID: <200704032359.l33NxxI3000626@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	linux-2.6-pmac-zilog.patch 
Log Message:
fix console name too

linux-2.6-pmac-zilog.patch:
 pmac_zilog.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Index: linux-2.6-pmac-zilog.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-pmac-zilog.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-pmac-zilog.patch	31 Mar 2007 23:04:20 -0000	1.1
+++ linux-2.6-pmac-zilog.patch	3 Apr 2007 23:59:56 -0000	1.2
@@ -1,5 +1,5 @@
 diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
-index 752ef07..579266d 100644
+index 752ef07..2ab23af 100644
 --- a/drivers/serial/pmac_zilog.c
 +++ b/drivers/serial/pmac_zilog.c
 @@ -99,9 +99,10 @@ static DEFINE_MUTEX(pmz_irq_mutex);
@@ -16,6 +16,15 @@
  };
  
  
+@@ -1776,7 +1777,7 @@ static void pmz_console_write(struct console *con, const char *s, unsigned int c
+ static int __init pmz_console_setup(struct console *co, char *options);
+ 
+ static struct console pmz_console = {
+-	.name	=	"ttyS",
++	.name	=	"ttyPZ",
+ 	.write	=	pmz_console_write,
+ 	.device	=	uart_console_device,
+ 	.setup	=	pmz_console_setup,
 @@ -1800,7 +1801,6 @@ static int __init pmz_register(void)
  	
  	pmz_uart_reg.nr = pmz_ports_count;



From fedora-cvs-commits at redhat.com  Wed Apr  4 00:45:54 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 20:45:54 -0400
Subject: rpms/esc/devel esc-1.0.1-admin-row-update.patch, NONE, 1.1 esc, 1.5,
	1.6 esc.spec, 1.25, 1.26 esc-rhel4-cool-build.patch, 1.1,
	NONE esc-xulrunner-lin-64.patch, 1.1, NONE
Message-ID: <200704040045.l340jsl4022545@cvs.devel.redhat.com>

Author: jmagne

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

Modified Files:
	esc esc.spec 
Added Files:
	esc-1.0.1-admin-row-update.patch 
Removed Files:
	esc-rhel4-cool-build.patch esc-xulrunner-lin-64.patch 
Log Message:
auto-import esc-1.0.1-2 on branch devel from esc-1.0.1-2.src.rpm

esc-1.0.1-admin-row-update.patch:
 ESC.js |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

--- NEW FILE esc-1.0.1-admin-row-update.patch ---
--- ./esc/src/app/xul/esc/chrome/content/esc/ESC.js.fix3	2007-04-03 11:00:47.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/ESC.js	2007-04-03 11:00:51.000000000 -0700
@@ -2249,6 +2249,7 @@
 }
 function UpdateAdminListRow( keyType, keyID)
 {
+
     if(!gAdminPage)
         return;
 
@@ -2527,6 +2528,7 @@
   {
     recordMessage("EnrollCoolKey failed.");
   }
+
   if(gAdminPage)
   {
      UpdateAdminListRow(keyType,keyID);
@@ -3778,11 +3780,14 @@
         UpdateEnrollmentArea(keyType,keyID,1);
     }
 
-    if(gAdminPage)
+
+    var adminWnd  = IsPageWindowPresent(ADMIN_WINDOW);
+
+    if(adminWnd)
     {
-          SelectRowByKeyID(keyType, keyID);
-          UpdateAdminListRow(keyType,keyID);
-           UpdateAdminKeyDetailsArea(keyType,keyID);
+          adminWnd.SelectRowByKeyID(keyType, keyID);
+          adminWnd.UpdateAdminListRow(keyType,keyID);
+          adminWnd.UpdateAdminKeyDetailsArea(keyType,keyID);
     }
 }
 


Index: esc
===================================================================
RCS file: /cvs/dist/rpms/esc/devel/esc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- esc	13 Mar 2007 20:34:09 -0000	1.5
+++ esc	4 Apr 2007 00:45:52 -0000	1.6
@@ -1,4 +1,21 @@
 #!/bin/sh
+# 
+# BEGIN COPYRIGHT BLOCK
+# This Program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 2 of the License.
+#
+# This Program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA 02111-1307 USA.
+#
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
 
 ESC_PROFILE_BASE=~/.redhat/esc
 ESC_LOG_FILE=esc.log
@@ -8,10 +25,6 @@
 ESC_EXEC=esc
 ESCD_EXEC=escd
 
-LD_LIBRARY_PATH=$ESC_PATH/xulrunner:$ESC_PATH/xulrunner/components:$ESC_PATH/xulrunner/plugins
-
-export LD_LIBRARY_PATH
-
 ESC_BIN=$ESC_PATH/xulrunner/xulrunner-bin
 ESCD_BIN=./$ESCD_EXEC
 


Index: esc.spec
===================================================================
RCS file: /cvs/dist/rpms/esc/devel/esc.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- esc.spec	13 Mar 2007 20:34:09 -0000	1.25
+++ esc.spec	4 Apr 2007 00:45:52 -0000	1.26
@@ -1,6 +1,6 @@
 Name: esc 
 Version: 1.0.1
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 Summary: Enterprise Security Client Smart Card Client
 License: GPL
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
@@ -8,40 +8,21 @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Patch1: firefox-1.5.0.1-dumpstack.patch
-#Patch2: xulrunner-1.8.0.1-coreconf.patch
 Patch1: firefox-1.5-with-system-nss.patch
 Patch2: 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
-#Patch8: esc-1.0.0-strings-fix.patch
-#Patch9: esc-rhel4-nss-nspr.patch
-Patch3: esc-xulrunner-lin-64.patch 
-Patch4: esc-rhel4-cool-build.patch
-#Patch11: esc-1.0.0.strings-1-fix.patch
-#Patch12: esc-1.0.0-ui-enhance-1.patch
-#Patch13: esc-1.0.0-pw-reset-fix.patch
-#Patch14: esc-1.0.0-escd.patch
-#Patch15: esc-1.0.0-escd1.patch
-#Patch16: esc-1.0.0-escd2.patch
-#Patch17: esc-1.0.0-build-fix.patch
-#Patch18: esc-1.0.0-diag-fix.patch
-#Patch19: esc-1.0.0-mac-win-fix.patch
-#Patch20: esc-1.0.0-mac-win-fix1.patch
-#Patch21: esc-1.0.0-mac-win-fix2.patch
-
-
+Patch3: esc-1.0.1-admin-row-update.patch
 
 BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
 BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
 BuildRequires: pango-devel libpng-devel pkgconfig zlib-devel
-BuildRequires: mozilla-nspr-devel mozilla-nss-devel
-#BuildRequires: autoconf213 
+BuildRequires: nspr-devel nss-devel
+BuildRequires: autoconf213 libX11-devel libXt-devel
 
 BuildRequires: pcsc-lite-devel coolkey-devel
-BuildRequires: desktop-file-utils zip binutils
-Requires: pcsc-lite ifd-egate coolkey mozilla-nss mozilla-nspr
+BuildRequires: desktop-file-utils zip binutils libnotify-devel
+BuildRequires: dbus-devel
+Requires: pcsc-lite ifd-egate coolkey nss nspr
+Requires: zip dbus >= 0.90 libnotify >= 0.4.2
 
 # 390 does not have coolkey or smartCards
 # Xulrunner won't compile on ppc64 right now.
@@ -78,13 +59,10 @@
 
 %setup -q -c -n %{escname}
 
-#patch esc 
+#Perform esc patching
 
-%ifarch x86_64 ppc64 ia64
-%patch3 -p1 -b .fix1
-%endif
+%patch3 -p1 -b .fix3
 
-%patch4 -p1 -b .fix2
 
 #Unpack xulrunner where esc expects it to be.
 
@@ -99,12 +77,7 @@
 
 %build
 
-MOZ_OFFSET=mozilla-1.7.3
-export MOZ_OFFSET
-
 %ifarch x86_64 ppc64 ia64
-MOZ_OFFSET=mozilla-1.7.12
-export MOZ_OFFSET
 USE_64=1
 export USE_64
 %endif
@@ -113,7 +86,7 @@
 
 cd ../..
 
-make BUILD_OPT=1 NO_SYSTEM_NSS=1 ESC_VERSION=%{version}-%{release}
+make BUILD_OPT=1 HAVE_LIB_NOTIFY=1 ESC_VERSION=%{version}-%{release}
 
 %install
 
@@ -130,6 +103,7 @@
 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}
@@ -196,7 +170,41 @@
 fi
 
 %changelog
-* Sat Aug 22 2006 Jack Magne <jmagne at redhat.com>-  1.0.0-8
+* Tue Apr 03 2007 Jack Magne <jmagne at redhat.com>- 1.0.0-2
+* Mon Mar 05 2007 Jack Magne <jmagne at redhat.com>- 1.0.0-1
+- Stability fixes
+* Fri Oct 27 2006 Jack Magne <jmagne at redhat.com>- 1.0.0-19
+- More mac and win fixes.
+* Tue Oct 24 2006 Jack Magne <jmagne at redhat.com>- 1.0.0-18
+-rebuilt on RHEL-5 branch
+* Sun Oct 4  2006 Jack Magne <jmagne at redhat.com>- 1.0.0-17
+- Diagnostics display fixes, Mac and Window fixes.
+
+* Sun Oct 01 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-16
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Fri Sep 22 2006 Jack Magne <jmagne at redhat.com>- 1.0.0-15
+- Fix to the build version
+
+* Fri Sep 22 2006 Jack Magne <jmagne at redhat.com>= 1.0.0-14
+- Fix to compile error in daemon
+
+* Fri Sep 22 2006 Jack Magne <jmagne at redhat.com>- 1.0.0-13
+- Fix to include the new esc daemon.  
+
+* Sat Sep 16 2006 Jack Magne <jmagne at redhat.com>- 1.0.0-12
+- Fix for Password Reset and minor UI revision.
+
+* Fri Sep 15 2006 Jack Magne <jmagne at redhat.com>- 1.0.0-11
+- Further UI enhancement bug fixes
+
+* Thu Sep 7 2006 Jack Magne <jmagne at redhat.com>- 1.0.0-10
+- Further strings revisions.
+
+* 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.
 
 * Tue Aug 22 2006 Jack Magne <jmagne at redhat.com> - 1.0.0-7


--- esc-rhel4-cool-build.patch DELETED ---


--- esc-xulrunner-lin-64.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr  4 01:26:44 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 21:26:44 -0400
Subject: rpms/libraw1394/devel libraw1394-juju.patch, 1.3,
	1.4 libraw1394.spec, 1.26, 1.27
Message-ID: <200704040126.l341Qium018397@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/libraw1394/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18342

Modified Files:
	libraw1394-juju.patch libraw1394.spec 
Log Message:
* Tue Apr  3 2007 Kristian H??gsberg <krh at redhat.com> - 1.2.1-4
- Update juju patch with rawiso support.


libraw1394-juju.patch:
 Makefile.am        |    3 
 configure.ac       |   22 
 juju/Makefile.am   |    8 
 juju/juju.h        |  143 +++++
 juju/raw1394-iso.c |  547 ++++++++++++++++++++
 juju/raw1394.c     | 1440 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 tools/Makefile.am  |    2 
 tools/testlibraw.c |   76 ++
 8 files changed, 2222 insertions(+), 19 deletions(-)

Index: libraw1394-juju.patch
===================================================================
RCS file: /cvs/dist/rpms/libraw1394/devel/libraw1394-juju.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libraw1394-juju.patch	20 Mar 2007 16:23:18 -0000	1.3
+++ libraw1394-juju.patch	4 Apr 2007 01:26:40 -0000	1.4
@@ -1,164 +1,21 @@
-Index: tools/testlibraw.c
-===================================================================
---- tools/testlibraw.c	(revision 171)
-+++ tools/testlibraw.c	(working copy)
-@@ -1,4 +1,5 @@
--/*
-+/*						-*- c-basic-offset: 8 -*-
-+ *
-  * libraw1394 - library for raw access to the 1394 bus with the Linux subsystem.
-  *
-  * Copyright (C) 1999,2000 Andreas Bombe
-@@ -13,12 +14,13 @@
- #include <string.h>
- #include <sys/poll.h>
- #include <stdlib.h>
-+#include <arpa/inet.h>
- 
- #include "../src/raw1394.h"
- #include "../src/csr.h"
- 
- 
--#define TESTADDR (CSR_REGISTER_BASE + CSR_CYCLE_TIME)
-+#define TESTADDR (CSR_REGISTER_BASE + CSR_CONFIG_ROM)
- 
- const char not_compatible[] = "\
- This libraw1394 does not work with your version of Linux. You need a different\n\
-@@ -45,12 +47,18 @@
-         return 0;
- }
- 
-+static const unsigned char fcp_data[] =
-+	{ 0x1, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef };
-+
- int my_fcp_handler(raw1394handle_t handle, nodeid_t nodeid, int response,
-                    size_t length, unsigned char *data)
- {
-         printf("got fcp %s from node %d of %d bytes:",
-                (response ? "response" : "command"), nodeid & 0x3f, length);
- 
-+	if (memcmp(fcp_data, data, sizeof fcp_data) != 0)
-+		printf("ERROR: fcp payload not correct\n");
-+
-         while (length) {
-                 printf(" %02x", *data);
-                 data++;
-@@ -62,7 +70,48 @@
-         return 0;
- }
- 
-+static void
-+test_fcp(raw1394handle_t handle)
-+{
-+	printf("\ntesting FCP monitoring on local node\n");
-+	raw1394_set_fcp_handler(handle, my_fcp_handler);
-+	raw1394_start_fcp_listen(handle);
-+	raw1394_write(handle, raw1394_get_local_id(handle),
-+		      CSR_REGISTER_BASE + CSR_FCP_COMMAND, sizeof(fcp_data),
-+		      (quadlet_t *)fcp_data);
-+	raw1394_write(handle, raw1394_get_local_id(handle),
-+		      CSR_REGISTER_BASE + CSR_FCP_RESPONSE, sizeof(fcp_data),
-+		      (quadlet_t *)fcp_data);
-+}
- 
-+static void
-+read_topology_map(raw1394handle_t handle)
-+{
-+	quadlet_t map[70];
-+	nodeid_t local_id;
-+	int node_count, self_id_count, i, retval;
-+
-+	local_id = raw1394_get_local_id(handle) | 0xffc0;
-+
-+	retval = raw1394_read(handle, local_id,
-+			      CSR_REGISTER_BASE + CSR_TOPOLOGY_MAP, 12, &map[0]);
-+	if (retval < 0)
-+		perror("topology map: raw1394_read failed with error");
-+	
-+	self_id_count = ntohl(map[2]) & 0xffff;
-+	node_count = ntohl(map[2]) >> 16;
-+	retval = raw1394_read(handle, local_id,
-+			      CSR_REGISTER_BASE + CSR_TOPOLOGY_MAP + 12,
-+			      self_id_count * sizeof map[0], &map[3]);
-+	if (retval < 0)
-+		perror("topology map: raw1394_read failed with error");
-+
-+	printf("topology map: %d nodes, %d self ids, generation %d\n",
-+	       node_count, self_id_count, ntohl(map[1]));
-+	for (i = 0; i < self_id_count; i++)
-+		printf("  0x%08x\n", ntohl(map[3 + i]));
-+}
-+
- int main(int argc, char **argv)
- {
-         raw1394handle_t handle;
-@@ -73,7 +122,6 @@
-         int retval;
-         
-         struct pollfd pfd;
--        unsigned char fcp_test[] = { 0x1, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef };
-         quadlet_t rom[0x100];
-         size_t rom_size;
-         unsigned char rom_version;
-@@ -150,18 +198,9 @@
-                 }
-         }
- 
--        printf("\ntesting FCP monitoring on local node\n");
--        raw1394_set_fcp_handler(handle, my_fcp_handler);
--        raw1394_start_fcp_listen(handle);
--        raw1394_write(handle, raw1394_get_local_id(handle),
--                      CSR_REGISTER_BASE + CSR_FCP_COMMAND, sizeof(fcp_test),
--                      (quadlet_t *)fcp_test);
--        raw1394_write(handle, raw1394_get_local_id(handle),
--                      CSR_REGISTER_BASE + CSR_FCP_RESPONSE, sizeof(fcp_test),
--                      (quadlet_t *)fcp_test);
-+	test_fcp(handle);
-+	read_topology_map(handle);
- 
--
--
-         printf("testing config rom stuff\n");
-         retval=raw1394_get_config_rom(handle, rom, 0x100, &rom_size, &rom_version);
-         printf("get_config_rom returned %d, romsize %d, rom_version %d\n",retval,rom_size,rom_version);
-@@ -176,16 +215,19 @@
-         retval=raw1394_update_config_rom(handle, rom, rom_size, rom_version);
-         printf("update_config_rom returned %d\n",retval);
- 
-+	printf("\nposting 0xdeadbeef as an echo request\n");
-+	raw1394_echo_request(handle, 0xdeadbeef);
- 
--
--        printf("\npolling for leftover messages\n");
-+	printf("polling for leftover messages\n");
-         pfd.fd = raw1394_get_fd(handle);
-         pfd.events = POLLIN;
-         pfd.revents = 0;
-         while (1) {
-                 retval = poll(&pfd, 1, 10);
-                 if (retval < 1) break;
--                raw1394_loop_iterate(handle);
-+		retval = raw1394_loop_iterate(handle);
-+		if (retval != 0)
-+		    printf("raw1394_loop_iterate() returned 0x%08x\n", retval);
-         }
+diff --git a/Makefile.am b/Makefile.am
+index 04ed38a..21df527 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,7 @@
+ # process this file with automake to create a Makefile.in
  
-         if (retval < 0) perror("poll failed");
-Index: tools/Makefile.am
-===================================================================
---- tools/Makefile.am	(revision 171)
-+++ tools/Makefile.am	(working copy)
-@@ -2,4 +2,4 @@
+-SUBDIRS = src tools doc debian
++SUBDIRS = $(LIB_SUBDIR) tools doc debian
++DIST_SUBDIRS = src juju
  
- # testlibraw
- bin_PROGRAMS = testlibraw sendiso dumpiso
--LDADD = ../src/libraw1394.la
-+LDADD = ../$(LIB_SUBDIR)/libraw1394.la
-Index: configure.ac
-===================================================================
---- configure.ac	(revision 171)
-+++ configure.ac	(working copy)
-@@ -24,13 +24,35 @@
+ pkgconfigdir = @libdir@/pkgconfig
+ pkgconfig_DATA = libraw1394.pc
+diff --git a/configure.ac b/configure.ac
+index fe23ca8..7e5dd66 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,6 +24,27 @@ AC_SUBST(lt_major)
  AC_SUBST(lt_revision)
  AC_SUBST(lt_age)
  
@@ -171,7 +28,7 @@
 +   LIB_SUBDIR=src
 +fi
 +AC_SUBST(LIB_SUBDIR)
- 
++
 +AC_ARG_WITH(fw-device-prefix,
 +	[  --with-fw-device-prefix=<prefix>  Prefix of firewire device file names (default "fw").],
 +	[FW_DEVICE_PREFIX="\"$withval\""], [FW_DEVICE_PREFIX="\"fw\""])
@@ -183,10 +40,10 @@
 +	[Prefix of firewire device file names.])
 +AC_DEFINE_UNQUOTED(FW_DEVICE_DIR, $FW_DEVICE_DIR,
 +	[Directory to watch for firewire device files.])
-+
+ 
  #CFLAGS=${CFLAGS:-"-Wall"}
  AC_OUTPUT([
- Makefile
+@@ -31,6 +52,7 @@ Makefile
  libraw1394.pc
  libraw1394.spec
  src/Makefile
@@ -194,24 +51,175 @@
  tools/Makefile
  doc/Makefile
  doc/testlibraw.1
-Index: Makefile.am
-===================================================================
---- Makefile.am	(revision 171)
-+++ Makefile.am	(working copy)
-@@ -1,6 +1,7 @@
- # process this file with automake to create a Makefile.in
- 
--SUBDIRS = src tools doc debian
-+SUBDIRS = $(LIB_SUBDIR) tools doc debian
-+DIST_SUBDIRS = src juju
- 
- pkgconfigdir = @libdir@/pkgconfig
- pkgconfig_DATA = libraw1394.pc
-Index: juju/raw1394-iso.c
-===================================================================
---- juju/raw1394-iso.c	(revision 0)
-+++ juju/raw1394-iso.c	(revision 0)
-@@ -0,0 +1,385 @@
+diff --git a/juju/Makefile.am b/juju/Makefile.am
+new file mode 100644
+index 0000000..6fd6a5e
+--- /dev/null
++++ b/juju/Makefile.am
+@@ -0,0 +1,8 @@
++lib_LTLIBRARIES = libraw1394.la
++
++INCLUDES = -I$(JUJU_DIR)
++libraw1394_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@
++
++libraw1394_la_SOURCES = raw1394.c raw1394-iso.c juju.h
++
++pkginclude_HEADERS = ../src/raw1394.h ../src/csr.h ../src/ieee1394.h
+diff --git a/juju/juju.h b/juju/juju.h
+new file mode 100644
+index 0000000..8c18630
+--- /dev/null
++++ b/juju/juju.h
+@@ -0,0 +1,143 @@
++/*						-*- c-basic-offset: 8 -*-
++ *
++ * juju.h -- Internal header file for raw1394 emulation
++ *
++ * Copyright (C) 2007  Kristian Hoegsberg <krh at bitplanet.net>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * 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 __juju_h
++#define __juju_h
++
++#include <stdlib.h>
++#include <byteswap.h>
++#include <fw-device-cdev.h>
++#include "../src/raw1394.h"
++#include "../src/csr.h"
++#include "config.h"
++
++#define ACK_COMPLETE 1
++
++#define ptr_to_u64(p) ((__u64)(unsigned long)(p))
++#define u64_to_ptr(p) ((void *)(unsigned long)(p))
++
++static inline __u32
++be32_to_cpu(__u32 q)
++{
++  union { char c[4]; __u32 q; } u = { { 1, 0, 0, 0 } };
++
++  return u.q == 1 ? bswap_32(q) : q;
++}
++
++static inline __u32
++cpu_to_be32(__u32 q)
++{
++  return be32_to_cpu(q);
++}
++
++#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
++
++#define BUFFER_SIZE	(16 * 1024)
++
++#define MAX_PORTS 16
++
++struct epoll_closure {
++	int (*func)(raw1394handle_t handle,
++		    struct epoll_closure *closure, __uint32_t events);
++};
++
++struct port {
++	char device_file[32];
++	char *name;
++	int node_count;
++	int card;
++};
++
++#define MAX_DEVICES	63
++#define FILENAME_SIZE	16
++
++struct device {
++	struct epoll_closure closure;
++	int fd;
++	int node_id;
++	int generation;
++	char filename[FILENAME_SIZE];
++};
++
++struct request_closure {
++	void *data;
++	size_t length;
++	unsigned long tag;
++	struct raw1394_reqhandle reqhandle;
++};
++
++struct allocation;
++
++struct raw1394_handle {
++	struct port ports[MAX_PORTS];
++	int port_count;
++	int err;
++	int generation;
++	void *user_data;
++	int notify_bus_reset;
++
++	bus_reset_handler_t bus_reset_handler;
++	tag_handler_t tag_handler;
++	arm_tag_handler_t arm_tag_handler;
++	fcp_handler_t fcp_handler;
++	__u32 fcp_allocation_handle;
++	struct allocation *allocations;
++
++	int epoll_fd;
++	int inotify_fd;
++	int inotify_watch;
++	int pipe_fds[2];
++
++	struct epoll_closure pipe_closure;
++	struct epoll_closure inotify_closure;
++
++	struct device devices[MAX_DEVICES];
++	int nodes[MAX_DEVICES];
++	int local_fd;
++	char local_filename[FILENAME_SIZE];
++
++	struct fw_cdev_event_bus_reset reset;
++
++	struct {
++		struct epoll_closure closure;
++		int fd;
++		int type;
++		int irq_interval;
++		int packet_phase;
++		int packet_count;
++		int buf_packets;
++		int max_packet_size;
++		int packet_header_index;
++		int prebuffer;
++		int start_on_cycle;
++		enum raw1394_iso_dma_recv_mode recv_mode;
++		raw1394_iso_xmit_handler_t xmit_handler;
++		raw1394_iso_recv_handler_t recv_handler;
++		unsigned char *buffer, *buffer_end, *head;
++		unsigned char *tail, *first_payload;
++
++		struct fw_cdev_iso_packet *packets;
++	} iso;
++
++	char buffer[BUFFER_SIZE];
++};
++
++#endif
+diff --git a/juju/raw1394-iso.c b/juju/raw1394-iso.c
+new file mode 100644
+index 0000000..bbf49f0
+--- /dev/null
++++ b/juju/raw1394-iso.c
+@@ -0,0 +1,547 @@
 +/*						-*- c-basic-offset: 8 -*-
 + *
 + * raw1394-iso.c -- Emulation of the raw1394 rawiso API on the juju stack
@@ -238,75 +246,89 @@
 +#include <errno.h>
 +#include <unistd.h>
 +#include <fcntl.h>
++#include <stdio.h>
 +#include <sys/epoll.h>
 +#include <sys/ioctl.h>
 +
 +#include "juju.h"
 +
-+static int
-+refill_xmit_buffer(raw1394handle_t handle, struct fw_cdev_queue_iso *queue_iso)
++static enum raw1394_iso_disposition
++queue_xmit_packets(raw1394handle_t handle)
 +{
-+	int i;
 +	struct fw_cdev_iso_packet *p = handle->iso.packets;
++	struct fw_cdev_queue_iso queue_iso;
 +	enum raw1394_iso_disposition d;
 +	unsigned int len, dropped;
-+	unsigned char tag, sy, *data, *buffer;
-+	int cycle;
-+
-+	buffer = handle->iso.buffer +
-+		handle->iso.packet_index * handle->iso.max_packet_size;
-+	data = buffer;
++	unsigned char tag, sy, *first_payload;
++	int cycle, i;
 +
++	first_payload = handle->iso.head;
 +	for (i = 0; i < handle->iso.irq_interval; i++) {
 +		cycle = -1;
 +		dropped = 0;
-+		d = handle->iso.xmit_handler(handle, data,
++
++		if (handle->iso.head + handle->iso.max_packet_size >
++		    handle->iso.buffer_end) {
++			handle->iso.head = handle->iso.buffer;
++			break;
++		}
++
++		d = handle->iso.xmit_handler(handle, handle->iso.head,
 +					     &len, &tag, &sy, cycle, dropped);
-+		/* FIXME: handle the different dispositions. */
++		if (d != RAW1394_ISO_OK)
++			break;
 +
 +		p->payload_length = len;
-+		p->interrupt = handle->iso.packet_phase == 0;
++		p->interrupt =
++			handle->iso.packet_phase == handle->iso.irq_interval - 1;
 +		p->skip = 0;
 +		p->tag = tag;
 +		p->sy = sy;
 +		p->header_length = 0;
 +
-+		data += handle->iso.max_packet_size;
-+		handle->iso.packet_index++;
-+		if (handle->iso.packet_index == handle->iso.buf_packets) {
-+			handle->iso.packet_index = 0;
-+			break;
-+		}
-+
++		handle->iso.head += len;
++		handle->iso.packet_count++;
 +		handle->iso.packet_phase++;
++
 +		if (handle->iso.packet_phase == handle->iso.irq_interval)
 +			handle->iso.packet_phase = 0;
-+
 +	}
 +
-+	queue_iso->packets = ptr_to_u64(handle->iso.packets);
-+	queue_iso->size    =
-+		handle->iso.irq_interval * sizeof handle->iso.packets[0];
-+	queue_iso->data    = ptr_to_u64(buffer);
++	queue_iso.packets = ptr_to_u64(handle->iso.packets);
++	queue_iso.size    = i * sizeof handle->iso.packets[0];
++	queue_iso.data    = ptr_to_u64(first_payload);
 +
-+	return 0;
++	len = ioctl(handle->iso.fd, FW_CDEV_IOC_QUEUE_ISO, &queue_iso);
++	if (len < 0)
++		return RAW1394_ISO_ERROR;
++
++	return d;
 +}
 +
 +static int
 +flush_xmit_packets(raw1394handle_t handle, int limit)
 +{
-+	struct fw_cdev_queue_iso queue_iso;
++	enum raw1394_iso_disposition d;
 +	int len;
 +
-+	while (handle->iso.packet_index + handle->iso.irq_interval <= limit) {
-+		if (handle->iso.queue_iso.size == 0)
-+			refill_xmit_buffer(handle, &queue_iso);
-+		len = ioctl(handle->iso.fd,
-+			    FW_CDEV_IOC_QUEUE_ISO, &queue_iso);
-+		if (len < 0)
++	if (handle->iso.xmit_handler == NULL)
++		return 0;
++
++	if (limit < handle->iso.irq_interval)
++		limit = handle->iso.irq_interval;
++
++	while (handle->iso.packet_count + handle->iso.irq_interval <= limit) {
++		d = queue_xmit_packets(handle);
++		switch (d) {
++		case RAW1394_ISO_DEFER:
++		case RAW1394_ISO_AGAIN:
++			return 0;
++		case RAW1394_ISO_ERROR:
 +			return -1;
-+		if (handle->iso.queue_iso.size > 0)
-+			break;
++		case RAW1394_ISO_STOP:
++			raw1394_iso_stop(handle);
++			return 0;
++		}
 +	}
 +
 +	return 0;
@@ -318,23 +340,72 @@
 +	struct fw_cdev_start_iso start_iso;
 +	int retval;
 +
-+	if (prebuffer_packets == -1)
-+		prebuffer_packets = handle->iso.irq_interval;
++	if (prebuffer_packets == -1)
++		prebuffer_packets = handle->iso.irq_interval;
++
++	handle->iso.prebuffer = prebuffer_packets;
++	handle->iso.start_on_cycle = start_on_cycle;
++
++	flush_xmit_packets(handle, prebuffer_packets);
++
++	if (handle->iso.prebuffer <= handle->iso.packet_count) {
++		start_iso.cycle = start_on_cycle;
++
++		retval = ioctl(handle->iso.fd,
++			       FW_CDEV_IOC_START_ISO, &start_iso);
++		if (retval < 0)
++			return retval;
++	}
++
++	return flush_xmit_packets(handle, handle->iso.buf_packets);
++}
++
++static int
++queue_recv_packets(raw1394handle_t handle)
++{
++	struct fw_cdev_queue_iso queue_iso;
++	struct fw_cdev_iso_packet *p = handle->iso.packets;
++	unsigned int len;
++	unsigned char *first_payload;
++	int i;
++
++	first_payload = handle->iso.head;
++	for (i = 0; i < handle->iso.irq_interval; i++, p++) {
++		if (handle->iso.head + handle->iso.max_packet_size >
++		    handle->iso.buffer_end) {
++			handle->iso.head = handle->iso.buffer;
++			break;
++		}
++
++		p->payload_length = handle->iso.max_packet_size;
++		p->interrupt = handle->iso.packet_phase == handle->iso.irq_interval - 1;
++		p->skip = 0;
++		p->tag = 0;
++		p->sy = 0;
++		p->header_length = 4;
 +
-+	flush_xmit_packets(handle, prebuffer_packets);
++		handle->iso.head += handle->iso.max_packet_size;
++		handle->iso.packet_count++;
++		handle->iso.packet_phase++;
 +
-+	start_iso.cycle = start_on_cycle;
++		if (handle->iso.packet_phase == handle->iso.irq_interval)
++			handle->iso.packet_phase = 0;
++	}
 +
-+	retval = ioctl(handle->iso.fd, FW_CDEV_IOC_START_ISO, &start_iso);
-+	if (retval < 0)
-+		return retval;
++	queue_iso.packets = ptr_to_u64(handle->iso.packets);
++	queue_iso.size    = i * sizeof handle->iso.packets[0];
++	queue_iso.data    = ptr_to_u64(first_payload);
 +
-+	return flush_xmit_packets(handle, handle->iso.buf_packets);
++	len = ioctl(handle->iso.fd, FW_CDEV_IOC_QUEUE_ISO, &queue_iso);
++	if (len < 0)
++		return -1;
++
++	return 0;
 +}
 + 
-+static int
-+handle_recv_packets(raw1394handle_t handle,
-+		    struct fw_cdev_event_iso_interrupt *interrupt)
++static enum raw1394_iso_disposition
++flush_recv_packets(raw1394handle_t handle,
++		   struct fw_cdev_event_iso_interrupt *interrupt)
 +{
 +	enum raw1394_iso_disposition d;
 +	quadlet_t header, *p, *end;
@@ -345,20 +416,46 @@
 +	p = interrupt->header;
 +	end = (void *) interrupt->header + interrupt->header_length;
 +	cycle = interrupt->cycle;
-+	data = NULL;
++	dropped = 0;
 +
 +	while (p < end) {
 +		header = be32_to_cpu(*p++);
-+		len = header >> 8;
-+		channel = header >> 8;
-+		tag = header >> 8;
-+		sy = header >> 8;
-+
-+		d = handle->iso.recv_handler(handle, data, len, channel,
-+					     tag, sy, cycle, dropped);
++		len = header >> 16;
++		tag = (header >> 14) & 0x3;
++		channel = (header >> 8) & 0x3f;
++		sy = header & 0x0f;
++
++		d = handle->iso.recv_handler(handle, handle->iso.tail, len,
++					     channel, tag, sy, cycle, dropped);
++		if (d != RAW1394_ISO_OK)
++			/* FIXME: we need to save the headers so we
++			 * can restart this loop. */
++			break;
 +		cycle++;
++
++		handle->iso.tail += handle->iso.max_packet_size;
++		handle->iso.packet_count--;
++		if (handle->iso.tail == handle->iso.buffer_end)
++			handle->iso.tail = handle->iso.buffer;
++	}
++
++	switch (d) {
++	case RAW1394_ISO_OK:
++	case RAW1394_ISO_DEFER:
++		break;
++		
++	case RAW1394_ISO_ERROR:
++		return -1;
++
++	case RAW1394_ISO_STOP:
++		raw1394_iso_stop(handle);
++		return 0;		
 +	}
 +
++	while (handle->iso.packet_count + handle->iso.irq_interval <=
++	       handle->iso.buf_packets)
++		queue_recv_packets(handle);
++
 +	return 0;
 +}
 +
@@ -367,6 +464,10 @@
 +{
 +	struct fw_cdev_start_iso start_iso;
 +
++	while (handle->iso.packet_count + handle->iso.irq_interval <=
++	       handle->iso.buf_packets)
++		queue_recv_packets(handle);
++
 +	start_iso.cycle = start_on_cycle;
 +	start_iso.tags =
 +		tag_mask == -1 ? FW_CDEV_ISO_CONTEXT_MATCH_ALL_TAGS : tag_mask;
@@ -387,15 +488,15 @@
 +		return -1;
 +
 +	interrupt = (struct fw_cdev_event_iso_interrupt *) handle->buffer;
-+	if (interrupt->type != FW_CDEV_EVENT_BUS_RESET)
++	if (interrupt->type != FW_CDEV_EVENT_ISO_INTERRUPT)
 +		return 0;
 +
 +	switch (handle->iso.type) {
 +	case FW_CDEV_ISO_CONTEXT_TRANSMIT:
-+		handle->iso.packet_index -= handle->iso.irq_interval;
++		handle->iso.packet_count -= handle->iso.irq_interval;
 +		return flush_xmit_packets(handle, handle->iso.buf_packets);
 +	case FW_CDEV_ISO_CONTEXT_RECEIVE:
-+		return handle_recv_packets(handle, interrupt);
++		return flush_recv_packets(handle, interrupt);
 +	default:
 +		/* Doesn't happen. */
 +		return -1;
@@ -406,25 +507,81 @@
 +			   unsigned int len, unsigned char tag,
 +			   unsigned char sy)
 +{
-+	struct fw_cdev_iso_packet packet;
++	struct fw_cdev_queue_iso queue_iso;
++	struct fw_cdev_start_iso start_iso;
++	struct fw_cdev_iso_packet *p;
++
++	{
++		int i;
++		__u32 *p = (__u32 *) data;
++
++		for (i = 0; i < 10; i++)
++			fprintf(stderr, "0x%08x ", p[i]);
++		fprintf(stderr, "\n");
++	}
++
++	if (len > handle->iso.max_packet_size) {
++		errno = EINVAL;
++		return -1;
++	}
 +
-+	packet.payload_length = len;
-+	packet.interrupt = handle->iso.packet_phase == 0;
-+	packet.skip = 0;
-+	packet.tag = tag;
-+	packet.sy = sy;
-+	packet.header_length = 0;
++	/* Block until we have space for another packet. */
++	while (handle->iso.packet_count + handle->iso.irq_interval >
++	       handle->iso.buf_packets)
++		raw1394_loop_iterate(handle);
++
++	p = &handle->iso.packets[handle->iso.packet_header_index];
++	p->payload_length = len;
++	p->interrupt =
++		handle->iso.packet_phase == handle->iso.irq_interval - 1;
++	p->skip = 0;
++	p->tag = tag;
++	p->sy = sy;
++	p->header_length = 0;
++		
++	memcpy(handle->iso.head, data, len);
 +
++	handle->iso.head += len;
++	handle->iso.packet_count++;
 +	handle->iso.packet_phase++;
++	handle->iso.packet_header_index++;
++
 +	if (handle->iso.packet_phase == handle->iso.irq_interval)
 +		handle->iso.packet_phase = 0;
 +
-+	/* FIXME: circular buffer goo. */
++	if (handle->iso.head + handle->iso.max_packet_size > handle->iso.buffer_end)
++		handle->iso.head = handle->iso.buffer;
 +
-+	memcpy(handle->iso.head, data, len);
-+	handle->iso.head += len;
++	/* Queue the packets in the kernel if we filled up the packets
++	 * array or wrapped the payload buffer. */
++	if (handle->iso.packet_header_index == handle->iso.irq_interval ||
++	    handle->iso.head == handle->iso.buffer) {
++		queue_iso.packets = ptr_to_u64(handle->iso.packets);
++		queue_iso.size    = handle->iso.packet_header_index * sizeof handle->iso.packets[0];
++		queue_iso.data    = ptr_to_u64(handle->iso.first_payload);
++		handle->iso.packet_header_index = 0;
++		handle->iso.first_payload = handle->iso.head;
 +
-+	return -1;
++		len = ioctl(handle->iso.fd, FW_CDEV_IOC_QUEUE_ISO, &queue_iso);
++		if (len < 0)
++			return -1;
++	}
++
++	/* Start the streaming if it's not already running and if
++	 * we've buffered up enough packets. */
++	if (handle->iso.prebuffer > 0 &&
++	    handle->iso.packet_count >= handle->iso.prebuffer) {
++		/* Set this to 0 to indicate that we're running. */
++		handle->iso.prebuffer = 0;
++		start_iso.cycle = handle->iso.start_on_cycle;
++
++		len = ioctl(handle->iso.fd,
++			       FW_CDEV_IOC_START_ISO, &start_iso);
++		if (len < 0)
++			return len;
++	}
++
++	return 0;
 +}
 +
 +int raw1394_iso_xmit_sync(raw1394handle_t handle)
@@ -441,33 +598,38 @@
 +	return 0;
 +}
 +
-+int raw1394_iso_xmit_init(raw1394handle_t handle,
-+			  raw1394_iso_xmit_handler_t handler,
-+			  unsigned int buf_packets,
-+			  unsigned int max_packet_size,
-+			  unsigned char channel,
-+			  enum raw1394_iso_speed speed,
-+			  int irq_interval)
++static int
++iso_init(raw1394handle_t handle, int type,
++	 raw1394_iso_xmit_handler_t xmit_handler,
++	 raw1394_iso_recv_handler_t recv_handler,
++	 unsigned int buf_packets,
++	 unsigned int max_packet_size,
++	 unsigned char channel,
++	 enum raw1394_iso_speed speed,
++	 int irq_interval)
 +{
 +	struct fw_cdev_create_iso_context create;
 +	struct epoll_event ep;
-+	int retval;
++	int retval, prot;
 +
 +	if (handle->iso.fd != -1) {
 +		errno = EBUSY;
 +		return -1;
 +	}
 +
-+	handle->iso.type = FW_CDEV_ISO_CONTEXT_TRANSMIT;
-+	handle->iso.irq_interval = irq_interval;
-+	handle->iso.xmit_handler = handler;
++	handle->iso.type = type;
++	if (irq_interval < 0)
++		handle->iso.irq_interval = 256;
++	else
++		handle->iso.irq_interval = irq_interval;
++	handle->iso.xmit_handler = xmit_handler;
++	handle->iso.recv_handler = recv_handler;
 +	handle->iso.buf_packets = buf_packets;
 +	handle->iso.max_packet_size = max_packet_size;
-+	handle->iso.packet_index = 0;
 +	handle->iso.packet_phase = 0;
-+	handle->iso.queue_iso.size = 0;
++	handle->iso.packet_count = 0;
 +	handle->iso.packets =
-+		malloc(irq_interval * sizeof handle->iso.packets[0]);
++		malloc(handle->iso.irq_interval * sizeof handle->iso.packets[0]);
 +	if (handle->iso.packets == NULL)
 +		return -1;
 +
@@ -487,9 +649,10 @@
 +		return -1;
 +	}
 +
-+	create.type = FW_CDEV_ISO_CONTEXT_TRANSMIT;
++	create.type = type;
 +	create.channel = channel;
 +	create.speed = speed;
++	create.header_size = 4;
 +
 +	retval = ioctl(handle->iso.fd,
 +		       FW_CDEV_IOC_CREATE_ISO_CONTEXT, &create);
@@ -499,266 +662,117 @@
 +		return retval;
 +	}
 +
-+	handle->iso.buffer =
-+		mmap(NULL, buf_packets * max_packet_size,
-+		     PROT_READ | PROT_WRITE, MAP_SHARED, handle->iso.fd, 0);
-+
-+	if (handle->iso.buffer == MAP_FAILED) {
-+		close(handle->iso.fd);
-+		free(handle->iso.packets);
-+		return -1;
-+	}
-+
-+	return 0;
-+}
-+
-+int raw1394_iso_recv_init(raw1394handle_t handle,
-+			  raw1394_iso_recv_handler_t handler,
-+			  unsigned int buf_packets,
-+			  unsigned int max_packet_size,
-+			  unsigned char channel,
-+			  enum raw1394_iso_dma_recv_mode mode,
-+			  int irq_interval)
-+{
-+	struct fw_cdev_create_iso_context create;
-+
-+	if (handle->iso.fd != -1) {
-+		errno = EBUSY;
-+		return -1;
++	switch (type) {
++	case FW_CDEV_ISO_CONTEXT_TRANSMIT:
++		prot = PROT_READ | PROT_WRITE;
++		break;
++	case FW_CDEV_ISO_CONTEXT_RECEIVE:
++		prot = PROT_READ;
++		break;
 +	}
 +
-+	/* FIXME: Do we need this? When would you ever want this...? */
-+	if (mode == RAW1394_DMA_PACKET_PER_BUFFER)
-+		return -1;
-+
 +	handle->iso.buffer =
 +		mmap(NULL, buf_packets * max_packet_size,
-+		     PROT_READ, MAP_SHARED, handle->iso.fd, 0);
-+
-+	if (handle->iso.buffer == MAP_FAILED)
-+		return -1;
-+
-+	create.type = FW_CDEV_ISO_CONTEXT_RECEIVE;
-+	create.channel = channel;
-+	create.speed = 0;
-+	create.header_size = 0; /* Never strip any headers. */
-+
-+	handle->iso.type = FW_CDEV_ISO_CONTEXT_RECEIVE;
-+	handle->iso.irq_interval = irq_interval;
-+	handle->iso.recv_handler = handler;
-+
-+	return ioctl(handle->iso.fd,
-+		     FW_CDEV_IOC_CREATE_ISO_CONTEXT, &create);
-+}
-+
-+int raw1394_iso_multichannel_recv_init(raw1394handle_t handle,
-+				       raw1394_iso_recv_handler_t handler,
-+				       unsigned int buf_packets,
-+				       unsigned int max_packet_size,
-+				       int irq_interval)
-+{
-+	/* FIXME: gah */
-+	errno = ENOSYS;
-+	return -1;
-+}
-+
-+int raw1394_iso_recv_listen_channel(raw1394handle_t handle,
-+				    unsigned char channel)
-+{
-+	/* FIXME: multichannel */
-+	errno = ENOSYS;
-+	return -1;
-+}
-+
-+int raw1394_iso_recv_unlisten_channel(raw1394handle_t handle,
-+				      unsigned char channel)
-+{
-+	/* FIXME: multichannel */
-+	errno = ENOSYS;
-+	return -1;
-+}
-+
-+int raw1394_iso_recv_set_channel_mask(raw1394handle_t handle, u_int64_t mask)
-+{
-+	/* FIXME: multichannel */
-+	errno = ENOSYS;
-+	return -1;
-+}
-+
-+void raw1394_iso_stop(raw1394handle_t handle)
-+{
-+	ioctl(handle->iso.fd, FW_CDEV_IOC_STOP_ISO);
-+}
-+
-+void raw1394_iso_shutdown(raw1394handle_t handle)
-+{
-+	munmap(handle->iso.buffer,
-+	       handle->iso.buf_packets * handle->iso.max_packet_size);
-+	close(handle->iso.fd);
-+	free(handle->iso.packets);
-+}
-Index: juju/juju.h
-===================================================================
---- juju/juju.h	(revision 0)
-+++ juju/juju.h	(revision 0)
-@@ -0,0 +1,139 @@
-+/*						-*- c-basic-offset: 8 -*-
-+ *
-+ * juju.h -- Internal header file for raw1394 emulation
-+ *
-+ * Copyright (C) 2007  Kristian Hoegsberg <krh at bitplanet.net>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * 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 __juju_h
-+#define __juju_h
-+
-+#include <stdlib.h>
-+#include <byteswap.h>
-+#include <fw-device-cdev.h>
-+#include "../src/raw1394.h"
-+#include "../src/csr.h"
-+#include "config.h"
-+
-+#define ACK_COMPLETE 1
-+
-+#define ptr_to_u64(p) ((__u64)(unsigned long)(p))
-+#define u64_to_ptr(p) ((void *)(unsigned long)(p))
-+
-+static inline __u32
-+be32_to_cpu(__u32 q)
-+{
-+  union { char c[4]; __u32 q; } u = { { 1, 0, 0, 0 } };
-+
-+  return u.q == 1 ? bswap_32(q) : q;
-+}
++		     prot, MAP_SHARED, handle->iso.fd, 0);
 +
-+static inline __u32
-+cpu_to_be32(__u32 q)
-+{
-+  return be32_to_cpu(q);
-+}
-+
-+#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
-+
-+#define BUFFER_SIZE	(16 * 1024)
-+
-+#define MAX_PORTS 16
-+
-+struct epoll_closure {
-+	int (*func)(raw1394handle_t handle,
-+		    struct epoll_closure *closure, __uint32_t events);
-+};
-+
-+struct port {
-+	char device_file[32];
-+	char *name;
-+	int node_count;
-+	int card;
-+};
-+
-+#define MAX_DEVICES	63
-+#define FILENAME_SIZE	16
-+
-+struct device {
-+	struct epoll_closure closure;
-+	int fd;
-+	int node_id;
-+	int generation;
-+	char filename[FILENAME_SIZE];
-+};
-+
-+struct request_closure {
-+	void *data;
-+	size_t length;
-+	unsigned long tag;
-+	struct raw1394_reqhandle reqhandle;
-+};
-+
-+struct allocation;
-+
-+struct raw1394_handle {
-+	struct port ports[MAX_PORTS];
-+	int port_count;
-+	int err;
-+	int generation;
-+	void *user_data;
-+	int notify_bus_reset;
-+
-+	bus_reset_handler_t bus_reset_handler;
-+	tag_handler_t tag_handler;
-+	arm_tag_handler_t arm_tag_handler;
-+	fcp_handler_t fcp_handler;
-+	struct allocation *allocations;
-+
-+	int epoll_fd;
-+	int inotify_fd;
-+	int inotify_watch;
-+	int pipe_fds[2];
++	if (handle->iso.buffer == MAP_FAILED) {
++		close(handle->iso.fd);
++		free(handle->iso.packets);
++		return -1;
++	}
 +
-+	struct epoll_closure pipe_closure;
-+	struct epoll_closure inotify_closure;
++	handle->iso.buffer_end = handle->iso.buffer + 
++		buf_packets * max_packet_size;
++	handle->iso.head = handle->iso.buffer;
++	handle->iso.tail = handle->iso.buffer;
++	handle->iso.first_payload = handle->iso.buffer;
 +
-+	struct device devices[MAX_DEVICES];
-+	int nodes[MAX_DEVICES];
-+	int local_fd;
-+	char local_filename[FILENAME_SIZE];
++	return 0;
++}
 +
-+	struct fw_cdev_event_bus_reset reset;
++int raw1394_iso_xmit_init(raw1394handle_t handle,
++			  raw1394_iso_xmit_handler_t handler,
++			  unsigned int buf_packets,
++			  unsigned int max_packet_size,
++			  unsigned char channel,
++			  enum raw1394_iso_speed speed,
++			  int irq_interval)
++{
++	return iso_init(handle, FW_CDEV_ISO_CONTEXT_TRANSMIT,
++			handler, NULL, buf_packets, max_packet_size,
++			channel, speed, irq_interval);
++}
 +
-+	struct {
-+		struct epoll_closure closure;
-+		int fd;
-+		int type;
-+		int irq_interval;
-+		int packet_index;
-+		int packet_phase;
-+		int buf_packets;
-+		int max_packet_size;
-+		enum raw1394_iso_dma_recv_mode recv_mode;
-+		raw1394_iso_xmit_handler_t xmit_handler;
-+		raw1394_iso_recv_handler_t recv_handler;
-+		unsigned char *buffer, *head, *tail;
++int raw1394_iso_recv_init(raw1394handle_t handle,
++			  raw1394_iso_recv_handler_t handler,
++			  unsigned int buf_packets,
++			  unsigned int max_packet_size,
++			  unsigned char channel,
++			  enum raw1394_iso_dma_recv_mode mode,
++			  int irq_interval)
++{
++	return iso_init(handle, FW_CDEV_ISO_CONTEXT_RECEIVE,
++			NULL, handler, buf_packets, max_packet_size,
++			channel, 0, irq_interval);
++}
 +
-+		struct fw_cdev_queue_iso queue_iso;
-+		struct fw_cdev_iso_packet *packets;
-+	} iso;
++int raw1394_iso_multichannel_recv_init(raw1394handle_t handle,
++				       raw1394_iso_recv_handler_t handler,
++				       unsigned int buf_packets,
++				       unsigned int max_packet_size,
++				       int irq_interval)
++{
++	/* FIXME: gah */
++	errno = ENOSYS;
++	return -1;
++}
 +
-+	char buffer[BUFFER_SIZE];
-+};
++int raw1394_iso_recv_listen_channel(raw1394handle_t handle,
++				    unsigned char channel)
++{
++	/* FIXME: multichannel */
++	errno = ENOSYS;
++	return -1;
++}
 +
-+#endif
-Index: juju/Makefile.am
-===================================================================
---- juju/Makefile.am	(revision 0)
-+++ juju/Makefile.am	(revision 0)
-@@ -0,0 +1,8 @@
-+lib_LTLIBRARIES = libraw1394.la
++int raw1394_iso_recv_unlisten_channel(raw1394handle_t handle,
++				      unsigned char channel)
++{
++	/* FIXME: multichannel */
++	errno = ENOSYS;
++	return -1;
++}
 +
-+INCLUDES = -I$(JUJU_DIR)
-+libraw1394_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@
++int raw1394_iso_recv_set_channel_mask(raw1394handle_t handle, u_int64_t mask)
++{
++	/* FIXME: multichannel */
++	errno = ENOSYS;
++	return -1;
++}
 +
-+libraw1394_la_SOURCES = raw1394.c raw1394-iso.c juju.h
++void raw1394_iso_stop(raw1394handle_t handle)
++{
++	ioctl(handle->iso.fd, FW_CDEV_IOC_STOP_ISO);
++	handle->iso.head = handle->iso.buffer;
++	handle->iso.tail = handle->iso.buffer;
++	handle->iso.first_payload = handle->iso.buffer;
++	handle->iso.packet_phase = 0;
++	handle->iso.packet_count = 0;
++}
 +
-+pkginclude_HEADERS = ../src/raw1394.h ../src/csr.h ../src/ieee1394.h
-Index: juju/raw1394.c
-===================================================================
---- juju/raw1394.c	(revision 0)
-+++ juju/raw1394.c	(revision 0)
-@@ -0,0 +1,1364 @@
++void raw1394_iso_shutdown(raw1394handle_t handle)
++{
++	munmap(handle->iso.buffer,
++	       handle->iso.buf_packets * handle->iso.max_packet_size);
++	close(handle->iso.fd);
++	free(handle->iso.packets);
++}
+diff --git a/juju/raw1394.c b/juju/raw1394.c
+new file mode 100644
+index 0000000..fd5756d
+--- /dev/null
++++ b/juju/raw1394.c
+@@ -0,0 +1,1440 @@
 +/*						-*- c-basic-offset: 8 -*-
 + *
 + * raw1394.c -- Emulation of the raw1394 API on the juju stack
@@ -980,7 +994,7 @@
 +	struct fw_cdev_send_response response;
 +	int is_response;
 +
-+	response.serial = request->serial;
++	response.handle = request->handle;
 +	response.rcode  = RCODE_COMPLETE;
 +	response.length = 0;
 +	response.data   = 0;
@@ -1011,11 +1025,7 @@
 +handle_device_event(raw1394handle_t handle,
 +		    struct epoll_closure *ec, __uint32_t events)
 +{
-+	union {
-+		struct fw_cdev_event_bus_reset bus_reset;
-+		struct fw_cdev_event_response response;
-+		struct fw_cdev_event_request request;
-+	} *u;
++	union fw_cdev_event *u;
 +	struct device *device = (struct device *) ec;
 +	struct address_closure *ac;
 +	struct request_closure *rc;
@@ -1033,7 +1043,7 @@
 +		return -1;
 +
 +	u = (void *) handle->buffer;
-+	switch (u->response.type) {
++	switch (u->common.type) {
 +	case FW_CDEV_EVENT_BUS_RESET:
 +		/* Clear old entry, unless it's been overwritten. */
 +		phy_id = handle->devices[i].node_id & 0x3f;
@@ -1483,6 +1493,7 @@
 +struct allocation {
 +	struct address_closure closure;
 +	struct allocation *next;
++	__u32 handle;
 +	byte_t *buffer;
 +	octlet_t tag;
 +	arm_options_t access_rights;
@@ -1505,7 +1516,7 @@
 +	int offset;
 +
 +	offset = request->offset - allocation->offset;
-+	response.serial = request->serial;
++	response.handle = request->handle;
 +
 +	switch (request->tcode) {
 +	case TCODE_WRITE_QUADLET_REQUEST:
@@ -1632,6 +1643,7 @@
 +		return -1;
 +	}
 +
++	allocation->handle = request.handle;
 +	allocation->next = handle->allocations;
 +	handle->allocations = allocation;
 +
@@ -1668,10 +1680,9 @@
 +		return -1;
 +	}
 +
++	request.handle = allocation->handle;
 +	free(allocation);
 +
-+	request.offset = start;
-+
 +	return ioctl(handle->local_fd, FW_CDEV_IOC_DEALLOCATE, &request);
 +}
 +
@@ -2055,6 +2066,8 @@
 +	if (ioctl(handle->local_fd, FW_CDEV_IOC_ALLOCATE, &request) < 0)
 +		return -1;
 +
++	handle->fcp_allocation_handle = request.handle;
++
 +	return 0;
 +}
 +
@@ -2063,7 +2076,7 @@
 +{
 +	struct fw_cdev_deallocate request;
 +
-+	request.offset = CSR_REGISTER_BASE + CSR_FCP_COMMAND;
++	request.handle = handle->fcp_allocation_handle;
 +
 +	return ioctl(handle->local_fd, FW_CDEV_IOC_DEALLOCATE, &request);
 +}
@@ -2104,22 +2117,253 @@
 +	return 0;
 +}
 +
++#define MAXIMUM_BANDWIDTH 4915
++
 +int
-+raw1394_bandwidth_modify (raw1394handle_t handle, unsigned int bandwidth,
++raw1394_bandwidth_modify (raw1394handle_t handle,
++			  unsigned int bandwidth,
 +			  enum raw1394_modify_mode mode)
 +{
-+	/* FIXME: copy and audit the libraw1394 version */
++        quadlet_t buffer, compare, swap;
++	nodeaddr_t addr;
++        int result;
++
++        if (bandwidth == 0)
++                return 0;
++        
++	addr = CSR_REGISTER_BASE + CSR_BANDWIDTH_AVAILABLE;
++        /* Read current bandwidth usage from IRM. */
++        result = raw1394_read (handle, raw1394_get_irm_id (handle), addr,
++			       sizeof buffer, &buffer);
++        if (result < 0)
++                return -1;
++
++        compare = ntohl (buffer);
++	switch (mode) {
++	case RAW1394_MODIFY_ALLOC:
++		swap = compare - bandwidth;
++		if (swap < 0)
++			return -1;
++		break;
 +
-+	errno = ENOSYS;
-+	return -1;
++	case RAW1394_MODIFY_FREE:
++		swap = compare + bandwidth;
++		if (swap > MAXIMUM_BANDWIDTH)
++			swap = MAXIMUM_BANDWIDTH;
++		break;
++
++	default:
++		return -1;
++	}
++
++	result = raw1394_lock(handle, raw1394_get_irm_id (handle), addr,
++			      RAW1394_EXTCODE_COMPARE_SWAP,
++			      htonl(swap), htonl(compare), &buffer);
++	if (result < 0 || ntohl(buffer) != compare)
++		return -1;
++  
++        return 0;
 +}
 +
 +int
-+raw1394_channel_modify (raw1394handle_t handle, unsigned int channel,
++raw1394_channel_modify (raw1394handle_t handle,
++			unsigned int channel,
 +			enum raw1394_modify_mode mode)
 +{
-+	/* FIXME: copy and audit the libraw1394 version */
++        quadlet_t buffer, compare, swap, bit;
++        nodeaddr_t addr;
++        int result;
++        
++	if (channel >= 64)
++		return -1;
++	addr = CSR_REGISTER_BASE +
++		CSR_CHANNELS_AVAILABLE_HI + 4 * (channel / 32);
++	/* Read currently available channels from IRM. */
++        result = raw1394_read(handle, raw1394_get_irm_id (handle), addr, 
++			      sizeof buffer, &buffer);
++        if (result < 0)
++                return -1;
++        
++	/* IEEE numbers bits from MSB (0) to LSB (31). */
++        bit = 1 << (31 - (channel & 31));
++        compare = ntohl(buffer);
++	switch (mode) {
++	case RAW1394_MODIFY_ALLOC:
++                if ((compare & bit) == 0)
++                        return -1;
++                swap = buffer & ~bit;
++		break;
 +
-+	errno = ENOSYS;
-+	return -1;
++        case RAW1394_MODIFY_FREE:
++                if ((buffer & bit) != 0)
++                        return -1;
++                swap = buffer | bit;
++		break;
++
++	default:
++		return -1;
++        }
++  
++        result = raw1394_lock (handle, raw1394_get_irm_id (handle), addr,
++			       RAW1394_EXTCODE_COMPARE_SWAP,
++			       htonl(swap), htonl(compare), &buffer);
++
++        if (result < 0 || ntohl(buffer) != compare)
++                return -1;
++  
++        return 0;
++}
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 29b250e..5be1b6f 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -2,4 +2,4 @@ MAINTAINERCLEANFILES = Makefile.in
+ 
+ # testlibraw
+ bin_PROGRAMS = testlibraw sendiso dumpiso
+-LDADD = ../src/libraw1394.la
++LDADD = ../$(LIB_SUBDIR)/libraw1394.la
+diff --git a/tools/testlibraw.c b/tools/testlibraw.c
+index 5f73bd9..2f02a6d 100644
+--- a/tools/testlibraw.c
++++ b/tools/testlibraw.c
+@@ -1,4 +1,5 @@
+-/*
++/*						-*- c-basic-offset: 8 -*-
++ *
+  * libraw1394 - library for raw access to the 1394 bus with the Linux subsystem.
+  *
+  * Copyright (C) 1999,2000 Andreas Bombe
+@@ -13,12 +14,13 @@
+ #include <string.h>
+ #include <sys/poll.h>
+ #include <stdlib.h>
++#include <arpa/inet.h>
+ 
+ #include "../src/raw1394.h"
+ #include "../src/csr.h"
+ 
+ 
+-#define TESTADDR (CSR_REGISTER_BASE + CSR_CYCLE_TIME)
++#define TESTADDR (CSR_REGISTER_BASE + CSR_CONFIG_ROM)
+ 
+ const char not_compatible[] = "\
+ This libraw1394 does not work with your version of Linux. You need a different\n\
+@@ -45,12 +47,18 @@ int my_tag_handler(raw1394handle_t handle, unsigned long tag,
+         return 0;
+ }
+ 
++static const unsigned char fcp_data[] =
++	{ 0x1, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef };
++
+ int my_fcp_handler(raw1394handle_t handle, nodeid_t nodeid, int response,
+                    size_t length, unsigned char *data)
+ {
+         printf("got fcp %s from node %d of %d bytes:",
+                (response ? "response" : "command"), nodeid & 0x3f, length);
+ 
++	if (memcmp(fcp_data, data, sizeof fcp_data) != 0)
++		printf("ERROR: fcp payload not correct\n");
++
+         while (length) {
+                 printf(" %02x", *data);
+                 data++;
+@@ -62,6 +70,47 @@ int my_fcp_handler(raw1394handle_t handle, nodeid_t nodeid, int response,
+         return 0;
+ }
+ 
++static void
++test_fcp(raw1394handle_t handle)
++{
++	printf("\ntesting FCP monitoring on local node\n");
++	raw1394_set_fcp_handler(handle, my_fcp_handler);
++	raw1394_start_fcp_listen(handle);
++	raw1394_write(handle, raw1394_get_local_id(handle),
++		      CSR_REGISTER_BASE + CSR_FCP_COMMAND, sizeof(fcp_data),
++		      (quadlet_t *)fcp_data);
++	raw1394_write(handle, raw1394_get_local_id(handle),
++		      CSR_REGISTER_BASE + CSR_FCP_RESPONSE, sizeof(fcp_data),
++		      (quadlet_t *)fcp_data);
++}
++
++static void
++read_topology_map(raw1394handle_t handle)
++{
++	quadlet_t map[70];
++	nodeid_t local_id;
++	int node_count, self_id_count, i, retval;
++
++	local_id = raw1394_get_local_id(handle) | 0xffc0;
++
++	retval = raw1394_read(handle, local_id,
++			      CSR_REGISTER_BASE + CSR_TOPOLOGY_MAP, 12, &map[0]);
++	if (retval < 0)
++		perror("topology map: raw1394_read failed with error");
++	
++	self_id_count = ntohl(map[2]) & 0xffff;
++	node_count = ntohl(map[2]) >> 16;
++	retval = raw1394_read(handle, local_id,
++			      CSR_REGISTER_BASE + CSR_TOPOLOGY_MAP + 12,
++			      self_id_count * sizeof map[0], &map[3]);
++	if (retval < 0)
++		perror("topology map: raw1394_read failed with error");
++
++	printf("topology map: %d nodes, %d self ids, generation %d\n",
++	       node_count, self_id_count, ntohl(map[1]));
++	for (i = 0; i < self_id_count; i++)
++		printf("  0x%08x\n", ntohl(map[3 + i]));
 +}
+ 
+ int main(int argc, char **argv)
+ {
+@@ -73,7 +122,6 @@ int main(int argc, char **argv)
+         int retval;
+         
+         struct pollfd pfd;
+-        unsigned char fcp_test[] = { 0x1, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef };
+         quadlet_t rom[0x100];
+         size_t rom_size;
+         unsigned char rom_version;
+@@ -150,17 +198,8 @@ int main(int argc, char **argv)
+                 }
+         }
+ 
+-        printf("\ntesting FCP monitoring on local node\n");
+-        raw1394_set_fcp_handler(handle, my_fcp_handler);
+-        raw1394_start_fcp_listen(handle);
+-        raw1394_write(handle, raw1394_get_local_id(handle),
+-                      CSR_REGISTER_BASE + CSR_FCP_COMMAND, sizeof(fcp_test),
+-                      (quadlet_t *)fcp_test);
+-        raw1394_write(handle, raw1394_get_local_id(handle),
+-                      CSR_REGISTER_BASE + CSR_FCP_RESPONSE, sizeof(fcp_test),
+-                      (quadlet_t *)fcp_test);
+-
+-
++	test_fcp(handle);
++	read_topology_map(handle);
+ 
+         printf("testing config rom stuff\n");
+         retval=raw1394_get_config_rom(handle, rom, 0x100, &rom_size, &rom_version);
+@@ -176,16 +215,19 @@ int main(int argc, char **argv)
+         retval=raw1394_update_config_rom(handle, rom, rom_size, rom_version);
+         printf("update_config_rom returned %d\n",retval);
+ 
++	printf("\nposting 0xdeadbeef as an echo request\n");
++	raw1394_echo_request(handle, 0xdeadbeef);
+ 
+-
+-        printf("\npolling for leftover messages\n");
++	printf("polling for leftover messages\n");
+         pfd.fd = raw1394_get_fd(handle);
+         pfd.events = POLLIN;
+         pfd.revents = 0;
+         while (1) {
+                 retval = poll(&pfd, 1, 10);
+                 if (retval < 1) break;
+-                raw1394_loop_iterate(handle);
++		retval = raw1394_loop_iterate(handle);
++		if (retval != 0)
++		    printf("raw1394_loop_iterate() returned 0x%08x\n", retval);
+         }
+ 
+         if (retval < 0) perror("poll failed");


Index: libraw1394.spec
===================================================================
RCS file: /cvs/dist/rpms/libraw1394/devel/libraw1394.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libraw1394.spec	20 Mar 2007 16:23:18 -0000	1.26
+++ libraw1394.spec	4 Apr 2007 01:26:40 -0000	1.27
@@ -1,7 +1,7 @@
 Summary:        Library providing low-level IEEE-1394 access
 Name:           libraw1394
 Version:        1.2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 Source:         http://www.linux1394.org/dl/libraw1394-%{version}.tar.gz
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Tue Apr  3 2007 Kristian H??gsberg <krh at redhat.com> - 1.2.1-4
+- Update juju patch with rawiso support.
+
 * Mon Mar 19 2007 Kristian H??gsberg <krh at redhat.com> 1.2.1-3
 - Add support for new stack (juju).
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 02:09:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 22:09:36 -0400
Subject: rpms/evince/devel evince.spec,1.77,1.78
Message-ID: <200704040209.l3429arD025107@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/evince/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25091

Modified Files:
	evince.spec 
Log Message:
Make the spec file work with older desktop-file-utils



Index: evince.spec
===================================================================
RCS file: /cvs/dist/rpms/evince/devel/evince.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- evince.spec	2 Apr 2007 03:29:39 -0000	1.77
+++ evince.spec	4 Apr 2007 02:09:34 -0000	1.78
@@ -5,7 +5,7 @@
 
 Name:		evince
 Version:	0.8.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Document viewer
 
 License: 	GPL
@@ -60,7 +60,7 @@
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --delete-original \
+desktop-file-install --delete-original --vendor="" \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   --remove-category="Application" \
   $RPM_BUILD_ROOT%{_datadir}/applications/evince.desktop
@@ -143,6 +143,9 @@
 
 
 %changelog
+* Tue Apr  3 2007 Matthias Clasen <mclasen at redhat.com> - 0.8.0-5
+- Add an explicit --vendor="", to pacify older desktop-file-utils
+
 * Sun Apr  1 2007 Matthias Clasen <mclasen at redhat.com> - 0.8.0-4
 - Add an explicit BR for gnome-icon-theme (#234780)
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 02:22:16 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 22:22:16 -0400
Subject: rpms/gnome-volume-manager/devel gnome-volume-manager.spec, 1.59,
	1.60
Message-ID: <200704040222.l342MGSg025297@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-volume-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25283

Modified Files:
	gnome-volume-manager.spec 
Log Message:
Make the spec file work with older desktop-file-utils



Index: gnome-volume-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- gnome-volume-manager.spec	16 Feb 2007 03:02:48 -0000	1.59
+++ gnome-volume-manager.spec	4 Apr 2007 02:22:13 -0000	1.60
@@ -1,7 +1,7 @@
 Summary: The GNOME Volume Manager
 Name: gnome-volume-manager
 Version: 2.17.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/System
 Source0: gnome-volume-manager-%{version}.tar.bz2
@@ -61,7 +61,7 @@
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
-desktop-file-install                            \
+desktop-file-install --delete-original --vendor=gnome  \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category=HardwareSettings               \
   $RPM_BUILD_ROOT%{_datadir}/applications/gnome-volume-properties.desktop
@@ -115,6 +115,9 @@
 %{_datadir}/gnome/autostart/gnome-volume-manager.desktop
 
 %changelog
+* Tue Apr  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.17.0-5
+- Add an explicit --vendor argument to pacify older desktop-file-utils
+
 * Thu Feb 15 2007 Jesse Keating <jkeating at redhat.com> - 2.17.0-4
 - Drop Req on kernel 2.6, we've been shipping that for a while
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 02:38:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 22:38:18 -0400
Subject: rpms/nautilus-cd-burner/devel nautilus-cd-burner.spec,1.88,1.89
Message-ID: <200704040238.l342cIge011531@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	nautilus-cd-burner.spec 
Log Message:
Work with older desktop-file-utils



Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- nautilus-cd-burner.spec	13 Mar 2007 06:02:07 -0000	1.88
+++ nautilus-cd-burner.spec	4 Apr 2007 02:38:16 -0000	1.89
@@ -13,7 +13,7 @@
 Summary: Easy to use CD burning for Gnome
 Name: nautilus-cd-burner
 Version: 2.18.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: http://ftp.gnome.org/pub/gnome/sources/nautilus-cd-burner/2.18/%{name}-%{version}.tar.bz2
 License: LGPL/GPL
 Group: User Interface/Desktops
@@ -76,7 +76,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-desktop-file-install --delete-original \
+desktop-file-install --vendor="" --delete-original \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
@@ -142,6 +142,9 @@
 
 
 %changelog
+* Tue Apr  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-2
+- Add an explicit --vendor, to pacify older desktop-file-utils
+
 * Tue Mar 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-1
 - Update to 2.18.0
 - Use desktop-file-install



From fedora-cvs-commits at redhat.com  Wed Apr  4 02:47:46 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 22:47:46 -0400
Subject: rpms/dbus-python/devel dbus-python-0.80.2-examine-args.patch, NONE,
	1.1 dbus-python.spec, 1.16, 1.17
Message-ID: <200704040247.l342lkT4018619@cvs.devel.redhat.com>

Author: davidz

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

Modified Files:
	dbus-python.spec 
Added Files:
	dbus-python-0.80.2-examine-args.patch 
Log Message:
* Tue Feb 13 2007 David Zeuthen <davidz at redhat.com> - 0.80.2-2
- Don't examine args for functions declared METH_NOARGS (#235017)



dbus-python-0.80.2-examine-args.patch:
 conn-methods.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

--- NEW FILE dbus-python-0.80.2-examine-args.patch ---
From: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Wed, 21 Feb 2007 12:31:15 +0000 (+0000)
Subject: Don't examine args for functions declared METH_NOARGS.
X-Git-Url: http://gitweb.freedesktop.org/?p=dbus/dbus-python.git;a=commitdiff;h=8dce2df1ceacffb2aa6e2cc8b1d4b58ee95ac5b1

Don't examine args for functions declared METH_NOARGS.
It's not guaranteed to be non-NULL, and Python checks there are no arguments
so we don't have to.
---

--- a/_dbus_bindings/conn-methods.c
+++ b/_dbus_bindings/conn-methods.c
@@ -226,10 +226,9 @@ PyDoc_STRVAR(Connection_close__doc__,
 "close()\n\n"
 "Close the connection.");
 static PyObject *
-Connection_close (Connection *self, PyObject *args)
+Connection_close (Connection *self, PyObject *args UNUSED)
 {
     TRACE(self);
-    if (!PyArg_ParseTuple(args, ":close")) return NULL;
     /* Because the user explicitly asked to close the connection, we'll even
     let them close shared connections. */
     if (self->conn) {
@@ -244,13 +243,12 @@ PyDoc_STRVAR(Connection_get_is_connected
 "get_is_connected() -> bool\n\n"
 "Return true if this Connection is connected.\n");
 static PyObject *
-Connection_get_is_connected (Connection *self, PyObject *args)
+Connection_get_is_connected (Connection *self, PyObject *args UNUSED)
 {
     dbus_bool_t ret;
 
     TRACE(self);
     DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->conn);
-    if (!PyArg_ParseTuple(args, ":get_is_connected")) return NULL;
     Py_BEGIN_ALLOW_THREADS
     ret = dbus_connection_get_is_connected(self->conn);
     Py_END_ALLOW_THREADS
@@ -261,13 +259,12 @@ PyDoc_STRVAR(Connection_get_is_authentic
 "get_is_authenticated() -> bool\n\n"
 "Return true if this Connection was ever authenticated.\n");
 static PyObject *
-Connection_get_is_authenticated (Connection *self, PyObject *args)
+Connection_get_is_authenticated (Connection *self, PyObject *args UNUSED)
 {
     dbus_bool_t ret;
 
     TRACE(self);
     DBUS_PY_RAISE_VIA_NULL_IF_FAIL(self->conn);
-    if (!PyArg_ParseTuple(args, ":get_is_authenticated")) return NULL;
     Py_BEGIN_ALLOW_THREADS
     ret = dbus_connection_get_is_authenticated(self->conn);
     Py_END_ALLOW_THREADS


Index: dbus-python.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus-python/devel/dbus-python.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- dbus-python.spec	13 Feb 2007 18:17:19 -0000	1.16
+++ dbus-python.spec	4 Apr 2007 02:47:44 -0000	1.17
@@ -7,9 +7,10 @@
 Summary: D-Bus Python Bindings 
 Name: dbus-python
 Version: 0.80.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
+Patch0: dbus-python-0.80.2-examine-args.patch
 
 License: AFL/GPL
 Group: System Environment/Libraries
@@ -34,6 +35,7 @@
 
 %prep
 %setup -q
+%patch -p 1 -b .examine-args
 
 %build
 %configure
@@ -80,6 +82,9 @@
 %{_libdir}/pkgconfig/dbus-python.pc
 
 %changelog
+* Tue Feb 13 2007 David Zeuthen <davidz at redhat.com> - 0.80.2-2
+- Don't examine args for functions declared METH_NOARGS (#235017)
+
 * Tue Feb 13 2007 John (J5) Palmieri <johnp at redhat.com> - 0.80.2-1
 - upgrade to 0.80.2 which fixes some memleaks
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 02:51:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 3 Apr 2007 22:51:47 -0400
Subject: rpms/dbus-python/devel dbus-python.spec,1.17,1.18
Message-ID: <200704040251.l342plrV021510@cvs.devel.redhat.com>

Author: davidz

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

Modified Files:
	dbus-python.spec 
Log Message:
fix date


Index: dbus-python.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus-python/devel/dbus-python.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- dbus-python.spec	4 Apr 2007 02:47:44 -0000	1.17
+++ dbus-python.spec	4 Apr 2007 02:51:45 -0000	1.18
@@ -7,7 +7,7 @@
 Summary: D-Bus Python Bindings 
 Name: dbus-python
 Version: 0.80.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Patch0: dbus-python-0.80.2-examine-args.patch
@@ -82,7 +82,10 @@
 %{_libdir}/pkgconfig/dbus-python.pc
 
 %changelog
-* Tue Feb 13 2007 David Zeuthen <davidz at redhat.com> - 0.80.2-2
+* Tue Apr 03 2007 David Zeuthen <davidz at redhat.com> - 0.80.2-3
+- Rebuild
+
+* Tue Apr 03 2007 David Zeuthen <davidz at redhat.com> - 0.80.2-2
 - Don't examine args for functions declared METH_NOARGS (#235017)
 
 * Tue Feb 13 2007 John (J5) Palmieri <johnp at redhat.com> - 0.80.2-1



From fedora-cvs-commits at redhat.com  Wed Apr  4 04:13:08 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 00:13:08 -0400
Subject: rpms/evolution/devel evolution-2.10.0-plugins-require-libxml2.patch,
	NONE, 1.1 evolution.spec, 1.239, 1.240
Message-ID: <200704040413.l344D8ql016542@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.10.0-plugins-require-libxml2.patch 
Log Message:

* Tue Apr 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-9.fc7
- Require libxml2-devel in evolution-devel package (RH bug #235056).
- Add libxml-2.0 requirement to evolution-plugin-2.10.pc.


evolution-2.10.0-plugins-require-libxml2.patch:
 evolution-plugin.pc.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE evolution-2.10.0-plugins-require-libxml2.patch ---
--- evolution-2.10.0/evolution-plugin.pc.in.plugins-require-libxml2	2007-04-03 23:47:41.000000000 -0400
+++ evolution-2.10.0/evolution-plugin.pc.in	2007-04-03 23:47:58.000000000 -0400
@@ -15,6 +15,6 @@
 Name: evolution-plugin
 Description: libraries needed for Evolution plugin development
 Version: @VERSION@
-Requires: libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 >= @BONOBOUI_REQUIRED@ camel-provider-1.2
+Requires: libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 >= @BONOBOUI_REQUIRED@ camel-provider-1.2 libxml-2.0
 Libs: -L${privlibdir} -leutil -Wl,-R${privlibdir}
 Cflags: -I${privincludedir}


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- evolution.spec	3 Apr 2007 19:51:14 -0000	1.239
+++ evolution.spec	4 Apr 2007 04:13:05 -0000	1.240
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -164,6 +164,9 @@
 # RH bug #231767 / GNOME bug #400241
 Patch49: evolution-2.10.0-let-mail-notification-build.patch
 
+# RH bug #235056
+Patch50: evolution-2.10.0-plugins-require-libxml2.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -275,6 +278,7 @@
 Requires: evolution-data-server-devel >= %{eds_version}
 Requires: gtkhtml3-devel >= %{gtkhtml_version}
 Requires: libsoup-devel >= %{soup_version}
+Requires: libxml2-devel
 Obsoletes: libgal2-devel <= %{last_libgal2_version}
 
 %description devel
@@ -317,6 +321,7 @@
 %patch47 -p1 -b .drop-old-glib-support
 %patch48 -p1 -b .CVE-2007-1002
 %patch49 -p1 -b .let-mail-notification-build
+%patch50 -p1 -b .plugins-require-libxml2
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -733,6 +738,10 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Tue Apr 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-9.fc7
+- Require libxml2-devel in evolution-devel package (RH bug #235056).
+- Add libxml-2.0 requirement to evolution-plugin-2.10.pc.
+
 * Tue Apr 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-8.fc7
 - Revise patch for GNOME bug #419524 to fix RH bug #235082
   (crash in initial account setup wizard).



From fedora-cvs-commits at redhat.com  Wed Apr  4 05:28:25 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 01:28:25 -0400
Subject: rpms/kernel/devel linux-2.6-rt2x00-scan-fix.patch, NONE,
	1.1 kernel-2.6.spec, 1.3040, 1.3041
Message-ID: <200704040528.l345SPwD003366@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-rt2x00-scan-fix.patch 
Log Message:
* Wed Apr 04 2007 Dave Jones <davej at redhat.com>
- rt2x00 scanning fix. (#234615)


linux-2.6-rt2x00-scan-fix.patch:
 rt2400pci.c |    3 +--
 rt2500pci.c |    3 +--
 rt2x00.h    |    2 +-
 rt61pci.c   |    3 +--
 4 files changed, 4 insertions(+), 7 deletions(-)

--- NEW FILE linux-2.6-rt2x00-scan-fix.patch ---
The DEVICE_ENABLED_RADIO_HW flag was accidently added,
this flag is only used (and set correctly) with the rfkill patch
applied to it.
WIthout the rfkill patch this will only prevent the radio to be
enabled for PCI devices.

Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>

---

diff --git a/drivers/net/wireless/mac80211/rt2x00/rt2400pci.c b/drivers/net/wireless/mac80211/rt2x00/rt2400pci.c
index f8a9867..f296fda 100644
--- a/drivers/net/wireless/mac80211/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/mac80211/rt2x00/rt2400pci.c
@@ -1228,8 +1228,7 @@ static int rt2400pci_enable_radio(struct rt2x00_dev *rt2x00dev)
 	 * Don't enable the radio twice.
 	 * or if the hardware button has been disabled.
 	 */
-	if (GET_FLAG(rt2x00dev, DEVICE_ENABLED_RADIO) ||
-	    !GET_FLAG(rt2x00dev, DEVICE_ENABLED_RADIO_HW))
+	if (GET_FLAG(rt2x00dev, DEVICE_ENABLED_RADIO))
 		return 0;
 
 	/*
diff --git a/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c b/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c
index bddbbf9..4fff8db 100644
--- a/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c
@@ -1354,8 +1354,7 @@ static int rt2500pci_enable_radio(struct rt2x00_dev *rt2x00dev)
 	 * Don't enable the radio twice,
 	 * or if the hardware button has been disabled.
 	 */
-	if (GET_FLAG(rt2x00dev, DEVICE_ENABLED_RADIO) ||
-	    !GET_FLAG(rt2x00dev, DEVICE_ENABLED_RADIO_HW))
+	if (GET_FLAG(rt2x00dev, DEVICE_ENABLED_RADIO))
 		return 0;
 
 	/*
diff --git a/drivers/net/wireless/mac80211/rt2x00/rt2x00.h b/drivers/net/wireless/mac80211/rt2x00/rt2x00.h
index cea6bb1..38fae66 100644
--- a/drivers/net/wireless/mac80211/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/mac80211/rt2x00/rt2x00.h
@@ -777,7 +777,7 @@ struct rt2x00_dev {
 	 */
 	unsigned int flags;
 #define DEVICE_ENABLED_RADIO		0x00000001
-#define DEVICE_ENABLED_RADIO_HW		0x00000002
+
 #define DEVICE_INITIALIZED		0x00000004
 #define DEVICE_INITIALIZED_HW		0x00000008
 
diff --git a/drivers/net/wireless/mac80211/rt2x00/rt61pci.c b/drivers/net/wireless/mac80211/rt2x00/rt61pci.c
index 9cee93f..92a7c71 100644
--- a/drivers/net/wireless/mac80211/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/mac80211/rt2x00/rt61pci.c
@@ -1635,8 +1635,7 @@ static int rt61pci_enable_radio(struct rt2x00_dev *rt2x00dev)
 	 * Don't enable the radio twice.
 	 * or if the hardware button has been disabled.
 	 */
-	if (GET_FLAG(rt2x00dev, DEVICE_ENABLED_RADIO) ||
-	    !GET_FLAG(rt2x00dev, DEVICE_ENABLED_RADIO_HW))
+	if (GET_FLAG(rt2x00dev, DEVICE_ENABLED_RADIO))
 		return 0;
 
 	/*



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3040
retrieving revision 1.3041
diff -u -r1.3040 -r1.3041
--- kernel-2.6.spec	2 Apr 2007 19:39:38 -0000	1.3040
+++ kernel-2.6.spec	4 Apr 2007 05:28:23 -0000	1.3041
@@ -383,9 +383,11 @@
 Patch12: git-wireless-dev.patch
 Patch13: git-iwlwifi.patch
 Patch14: git-iwlwifi-fixes.patch
-Patch15: linux-2.6-fix-pmops-1.patch
-Patch16: linux-2.6-fix-pmops-2.patch
-Patch17: linux-2.6-fix-pmops-3.patch
+Patch15: linux-2.6-rt2x00-scan-fix.patch
+
+Patch16: linux-2.6-fix-pmops-1.patch
+Patch17: linux-2.6-fix-pmops-2.patch
+Patch18: linux-2.6-fix-pmops-3.patch
 
 # enable sysrq-c on all kernels, not only kexec
 Patch20: linux-2.6-sysrq-c.patch
@@ -975,10 +977,12 @@
 %patch13 -p1
 # ...plus some fixes not yet in Intel's tree
 %patch14 -p1
-# Power management fixes
+# fix up scanning in rt2x00
 %patch15 -p1
+# Power management fixes
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 # sysrq works always
 %patch20 -p1
@@ -2245,6 +2249,9 @@
 #  - tux.
 
 %changelog
+* Wed Apr 04 2007 Dave Jones <davej at redhat.com>
+- rt2x00 scanning fix. (#234615)
+
 * Mon Apr 02 2007 Dave Jones <davej at redhat.com>
 - 2.6.21-rc5-git9
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 05:30:29 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 01:30:29 -0400
Subject: rpms/kernel/devel .cvsignore, 1.597, 1.598 kernel-2.6.spec, 1.3041,
	1.3042 sources, 1.560, 1.561 upstream, 1.488,
	1.489 patch-2.6.21-rc5-git9.bz2.sign, 1.1, NONE
Message-ID: <200704040530.l345UTuT004764@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Removed Files:
	patch-2.6.21-rc5-git9.bz2.sign 
Log Message:
* Wed Apr 04 2007 Dave Jones <davej at redhat.com>
- 2.6.21-rc5-git10



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.597
retrieving revision 1.598
diff -u -r1.597 -r1.598
--- .cvsignore	2 Apr 2007 19:39:38 -0000	1.597
+++ .cvsignore	4 Apr 2007 05:30:25 -0000	1.598
@@ -5,4 +5,4 @@
 kernel-2.6.20
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc5.bz2
-patch-2.6.21-rc5-git9.bz2
+patch-2.6.21-rc5-git10.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3041
retrieving revision 1.3042
diff -u -r1.3041 -r1.3042
--- kernel-2.6.spec	4 Apr 2007 05:28:23 -0000	1.3041
+++ kernel-2.6.spec	4 Apr 2007 05:30:26 -0000	1.3042
@@ -374,7 +374,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.21-rc5.bz2
-Patch2: patch-2.6.21-rc5-git9.bz2
+Patch2: patch-2.6.21-rc5-git10.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -2250,6 +2250,9 @@
 
 %changelog
 * Wed Apr 04 2007 Dave Jones <davej at redhat.com>
+- 2.6.21-rc5-git10
+
+* Wed Apr 04 2007 Dave Jones <davej at redhat.com>
 - rt2x00 scanning fix. (#234615)
 
 * Mon Apr 02 2007 Dave Jones <davej at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.560
retrieving revision 1.561
diff -u -r1.560 -r1.561
--- sources	2 Apr 2007 19:39:38 -0000	1.560
+++ sources	4 Apr 2007 05:30:26 -0000	1.561
@@ -1,4 +1,4 @@
 2618cbcc9c9ac1c3c04be903fe3338a7  sparse-0.2.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 b7bf3ee2f3ee778afa1ff0e8d44d193e  patch-2.6.21-rc5.bz2
-3d19be5174983ca8649ccaebc96a5170  patch-2.6.21-rc5-git9.bz2
+397da49fb513f3ba3eb239453355324a  patch-2.6.21-rc5-git10.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.488
retrieving revision 1.489
diff -u -r1.488 -r1.489
--- upstream	2 Apr 2007 19:39:38 -0000	1.488
+++ upstream	4 Apr 2007 05:30:26 -0000	1.489
@@ -1,3 +1,3 @@
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc5.bz2
-patch-2.6.21-rc5-git9.bz2
+patch-2.6.21-rc5-git10.bz2


--- patch-2.6.21-rc5-git9.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr  4 05:38:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 01:38:32 -0400
Subject: rpms/kernel/devel linux-2.6-defaults-pci_no_msi_mmconf.patch, NONE,
	1.1 kernel-2.6.spec, 1.3042, 1.3043
Message-ID: <200704040538.l345cW68010602@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-defaults-pci_no_msi_mmconf.patch 
Log Message:
* Wed Apr 04 2007 Dave Jones <davej at redhat.com>
- Disable PCI MSI and MMCONFIG by default (cebbert)


linux-2.6-defaults-pci_no_msi_mmconf.patch:
 Documentation/kernel-parameters.txt   |    5 +++++
 arch/i386/pci/common.c                |    6 +++++-
 drivers/pci/msi.c                     |    6 +++++-
 linux-2.6.20.noarch/drivers/pci/pci.c |    2 ++
 linux-2.6.20.noarch/drivers/pci/pci.h |    2 ++
 5 files changed, 19 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-defaults-pci_no_msi_mmconf.patch ---
Disable PCI MSI and MMCONFIG by default, add kernel parameters
to enable them.

Original mmconfig patch by Kyle McMartin <kyle at ubuntu.com>

Signed-off-by: Chuck Ebbert <cebbert at redhat.com>

---
 Documentation/kernel-parameters.txt |    5 +++++
 arch/i386/pci/common.c              |    6 +++++-
 drivers/pci/msi.c                   |    6 +++++-
 drivers/pci/pci.c                   |    2 ++
 drivers/pci/pci.h                   |    2 ++
 5 files changed, 19 insertions(+), 2 deletions(-)

--- linux-2.6.20.noarch.orig/drivers/pci/msi.c
+++ linux-2.6.20.noarch/drivers/pci/msi.c
@@ -28,7 +28,7 @@ static DEFINE_SPINLOCK(msi_lock);
 static struct msi_desc* msi_desc[NR_IRQS] = { [0 ... NR_IRQS-1] = NULL };
 static struct kmem_cache* msi_cachep;
 
-static int pci_msi_enable = 1;
+static int pci_msi_enable = 0;
 
 static int msi_cache_init(void)
 {
@@ -977,6 +977,10 @@ void pci_no_msi(void)
 {
 	pci_msi_enable = 0;
 }
+void pci_yes_msi(void)
+{
+	pci_msi_enable = 1;
+}
 
 EXPORT_SYMBOL(pci_enable_msi);
 EXPORT_SYMBOL(pci_disable_msi);
--- linux-2.6.20.noarch.orig/Documentation/kernel-parameters.txt
+++ linux-2.6.20.noarch/Documentation/kernel-parameters.txt
@@ -1197,8 +1197,13 @@ and is between 256 and 4096 characters. 
 				Mechanism 1.
 		conf2		[IA-32] Force use of PCI Configuration
 				Mechanism 2.
+		mmconf		[IA-32,X86_64] Enable use of MMCONFIG for PCI
+				Configuration
 		nommconf	[IA-32,X86_64] Disable use of MMCONFIG for PCI
 				Configuration
+		msi		[MSI] If the PCI_MSI kernel config parameter is
+				enabled, this kernel boot option can be used to
+				enable the use of MSI interrupts system-wide.
 		nomsi		[MSI] If the PCI_MSI kernel config parameter is
 				enabled, this kernel boot option can be used to
 				disable the use of MSI interrupts system-wide.
--- linux-2.6.20.noarch.orig/arch/i386/pci/common.c
+++ linux-2.6.20.noarch/arch/i386/pci/common.c
@@ -18,7 +18,7 @@
 #include "pci.h"
 
 unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 |
-				PCI_PROBE_MMCONF;
+				0; /* PCI_PROBE_MMCONF */
 
 static int pci_bf_sort;
 int pci_routeirq;
@@ -292,6 +292,10 @@ char * __devinit  pcibios_setup(char *st
 		pci_probe &= ~PCI_PROBE_MMCONF;
 		return NULL;
 	}
+	else if (!strcmp(str, "mmconf")) {
+		pci_probe |= PCI_PROBE_MMCONF;
+		return NULL;
+	}
 #endif
 	else if (!strcmp(str, "noacpi")) {
 		acpi_noirq_set();
--- linux-2.6.20.noarch/drivers/pci/pci.c~	2007-04-04 01:33:08.000000000 -0400
+++ linux-2.6.20.noarch/drivers/pci/pci.c	2007-04-04 01:33:33.000000000 -0400
@@ -1358,6 +1358,8 @@ static int __devinit pci_setup(char *str
 		if (*str && (str = pcibios_setup(str)) && *str) {
 			if (!strcmp(str, "nomsi")) {
 				pci_no_msi();
+			} else if (!strcmp(str, "msi")) {
+				pci_yes_msi();
 			} else if (!strncmp(str, "cbiosize=", 9)) {
 				pci_cardbus_io_size = memparse(str + 9, &str);
 			} else if (!strncmp(str, "cbmemsize=", 10)) {
--- linux-2.6.20.noarch/drivers/pci/pci.h~	2007-04-04 01:34:07.000000000 -0400
+++ linux-2.6.20.noarch/drivers/pci/pci.h	2007-04-04 01:34:31.000000000 -0400
@@ -47,8 +47,10 @@ extern unsigned int pci_pm_d3_delay;
 
 #ifdef CONFIG_PCI_MSI
 void pci_no_msi(void);
+void pci_yes_msi(void);
 #else
 static inline void pci_no_msi(void) { }
+static inline void pci_yes_msi(void) { }
 #endif
 
 #if defined(CONFIG_PCI_MSI) && defined(CONFIG_PM)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3042
retrieving revision 1.3043
diff -u -r1.3042 -r1.3043
--- kernel-2.6.spec	4 Apr 2007 05:30:26 -0000	1.3042
+++ kernel-2.6.spec	4 Apr 2007 05:38:29 -0000	1.3043
@@ -557,6 +557,7 @@
 Patch2103: linux-2.6-defaults-unicode-vt.patch
 Patch2104: linux-2.6-defaults-disable-split-ptlock.patch
 Patch2105: linux-2.6-defaults-nonmi.patch
+Patch2106: linux-2.6-defaults-pci_no_msi_mmconf.patch
 
 # SATA Bits
 Patch2200: linux-2.6-sata-promise-pata-ports.patch
@@ -1253,6 +1254,8 @@
 #%patch2104 -p1
 # Disable NMI watchdog by default.
 %patch2105 -p1
+# Disable MMCONFIG & MSI by default.
+%patch2106 -p1
 
 # Enable PATA ports on Promise SATA.
 #%patch2200 -p1
@@ -2250,6 +2253,9 @@
 
 %changelog
 * Wed Apr 04 2007 Dave Jones <davej at redhat.com>
+- Disable PCI MSI and MMCONFIG by default (cebbert)
+
+* Wed Apr 04 2007 Dave Jones <davej at redhat.com>
 - 2.6.21-rc5-git10
 
 * Wed Apr 04 2007 Dave Jones <davej at redhat.com>



From fedora-cvs-commits at redhat.com  Wed Apr  4 05:41:16 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 01:41:16 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.3043,
	1.3044 linux-2.6-silence-noise.patch, 1.5, 1.6
Message-ID: <200704040541.l345fGPH007640@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-silence-noise.patch 
Log Message:
* Wed Apr 04 2007 Dave Jones <davej at redhat.com>
- Silence noisy power management printk's



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3043
retrieving revision 1.3044
diff -u -r1.3043 -r1.3044
--- kernel-2.6.spec	4 Apr 2007 05:38:29 -0000	1.3043
+++ kernel-2.6.spec	4 Apr 2007 05:41:09 -0000	1.3044
@@ -2253,6 +2253,9 @@
 
 %changelog
 * Wed Apr 04 2007 Dave Jones <davej at redhat.com>
+- Silence noisy power management printk's
+
+* Wed Apr 04 2007 Dave Jones <davej at redhat.com>
 - Disable PCI MSI and MMCONFIG by default (cebbert)
 
 * Wed Apr 04 2007 Dave Jones <davej at redhat.com>

linux-2.6-silence-noise.patch:
 linux-2.6.18.noarch/arch/x86_64/mm/init.c     |    4 ----
 linux-2.6.18.noarch/drivers/pci/setup-res.c   |    4 ++--
 linux-2.6.19.noarch/arch/i386/pci/i386.c      |    4 ++--
 linux-2.6.20.noarch/drivers/base/power/main.c |    8 ++++----
 4 files changed, 8 insertions(+), 12 deletions(-)

Index: linux-2.6-silence-noise.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-silence-noise.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-silence-noise.patch	18 Feb 2007 02:52:58 -0000	1.5
+++ linux-2.6-silence-noise.patch	4 Apr 2007 05:41:09 -0000	1.6
@@ -52,3 +52,27 @@
  						"resource region %d "
  						"of device %s\n",
  						idx, pci_name(dev));
+--- linux-2.6.20.noarch/drivers/base/power/main.c~	2007-04-04 01:39:45.000000000 -0400
++++ linux-2.6.20.noarch/drivers/base/power/main.c	2007-04-04 01:39:58.000000000 -0400
+@@ -53,8 +53,8 @@ int device_pm_add(struct device * dev)
+ {
+ 	int error;
+ 
+-	pr_debug("PM: Adding info for %s:%s\n",
+-		 dev->bus ? dev->bus->name : "No Bus", dev->kobj.name);
++//	pr_debug("PM: Adding info for %s:%s\n",
++//		 dev->bus ? dev->bus->name : "No Bus", dev->kobj.name);
+ 	down(&dpm_list_sem);
+ 	list_add_tail(&dev->power.entry, &dpm_active);
+ 	device_pm_set_parent(dev, dev->parent);
+@@ -66,8 +66,8 @@ int device_pm_add(struct device * dev)
+ 
+ void device_pm_remove(struct device * dev)
+ {
+-	pr_debug("PM: Removing info for %s:%s\n",
+-		 dev->bus ? dev->bus->name : "No Bus", dev->kobj.name);
++//	pr_debug("PM: Removing info for %s:%s\n",
++//		 dev->bus ? dev->bus->name : "No Bus", dev->kobj.name);
+ 	down(&dpm_list_sem);
+ 	dpm_sysfs_remove(dev);
+ 	put_device(dev->power.pm_parent);



From fedora-cvs-commits at redhat.com  Wed Apr  4 05:54:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 01:54:50 -0400
Subject: rpms/bluez-utils/devel bluez-utils-3.9-input.patch, NONE,
	1.1 bluez-utils.spec, 1.55, 1.56
Message-ID: <200704040554.l345soum007897@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	bluez-utils.spec 
Added Files:
	bluez-utils-3.9-input.patch 
Log Message:
fix loop polling on closed fd (#232813)


bluez-utils-3.9-input.patch:
 device.c |    0 
 server.c |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE bluez-utils-3.9-input.patch ---
diff --git a/input/device.c b/input/device.c
diff --git a/input/server.c b/input/server.c
index b140bb6..911fc8e 100644
--- a/input/server.c
+++ b/input/server.c
@@ -69,7 +69,7 @@ static struct session_data *find_session(bdaddr_t *src, bdaddr_t *dst)
 
 static gboolean session_event(GIOChannel *chan, GIOCondition cond, gpointer data)
 {
-	if (cond & (G_IO_HUP | G_IO_ERR))
+	if (cond & (G_IO_HUP | G_IO_ERR | G_IO_NVAL))
 		return FALSE;
 
 	return TRUE;
@@ -133,7 +133,7 @@ static void create_watch(int sk, struct session_data *session)
 	io = g_io_channel_unix_new(sk);
 	g_io_channel_set_close_on_unref(io, TRUE);
 
-	g_io_add_watch(io, G_IO_IN | G_IO_HUP | G_IO_ERR,
+	g_io_add_watch(io, G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
 						session_event, session);
 
 	g_io_channel_unref(io);


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- bluez-utils.spec	30 Jan 2007 12:00:52 -0000	1.55
+++ bluez-utils.spec	4 Apr 2007 05:54:48 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
 Version: 3.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -14,6 +14,7 @@
 Source8: hidd.conf
 Source9: bluetooth.conf
 Patch0: bluez-utils-2.3-conf.patch
+Patch1: bluez-utils-3.9-input.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -54,6 +55,7 @@
 
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --with-bluez-libs=%{_libdir} --enable-pie --enable-debug \
@@ -120,6 +122,9 @@
 %{_libdir}/cups/backend/bluetooth
 
 %changelog
+* Tue Jan 30 2007 David Woodhouse <dwmw2 at infradead.org> 3.9-2
+- Handle HUP or ERR results from poll() instead of looping (#232813)
+
 * Tue Jan 30 2007 David Woodhouse <dwmw2 at infradead.org> 3.9-1
 - Update to bluez-utils 3.9
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 08:16:55 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 04:16:55 -0400
Subject: rpms/logwatch/devel logwatch-7.3.4-xntpd.patch, NONE,
	1.1 logwatch.spec, 1.64, 1.65
Message-ID: <200704040816.l348GtLw001264@cvs.devel.redhat.com>

Author: varekova

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

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.4-xntpd.patch 
Log Message:
- Resolves 234875
  logwatch warns about ntpd startup messages


logwatch-7.3.4-xntpd.patch:
 xntpd |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.4-xntpd.patch ---
--- logwatch-7.3.4/scripts/services/xntpd.pom	2007-02-17 20:36:11.000000000 +0100
+++ logwatch-7.3.4/scripts/services/xntpd	2007-04-04 10:10:47.000000000 +0200
@@ -105,7 +105,9 @@
         ($ThisLine =~ m/select([^\)]) error: Interrupted system call/) or
         ($ThisLine =~ m/signal_no_reset: signal \d+ had flags \d+/) or
         ($ThisLine =~ /Deleting interface \#[0-9] [^,]*, [^,]*, interface stats: received=.*, sent=.*, dropped=.*, active_time=.* secs/) or
-        ($ThisLine =~ /Invalid argument/)
+        ($ThisLine =~ /Invalid argument/) or 
+        ($ThisLine =~ /Listening on interface #[0-9]* (vmnet[0-9]|eth[0-9]|lo), [0-9a-z:.]+\#[0-9]* Enabled/) or
+        ($ThisLine =~ /Listening on interface #[0-9]* wildcard, [0-9a-z:.]+\#[0-9]* Disabled/)
     ) {
        # Ignore these
     } elsif ($ThisLine =~ m/ntpd [\d\-\.\w@]+ ... ... .. ..:..:.. /) {


Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- logwatch.spec	2 Apr 2007 14:04:05 -0000	1.64
+++ logwatch.spec	4 Apr 2007 08:16:53 -0000	1.65
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -10,6 +10,7 @@
 Patch2: logwatch-7.3.1-vsftpd.patch
 Patch3: logwatch-7.3.4-pam_unix.patch
 Patch4: logwatch-7.3.4-secure.patch
+Patch5: logwatch-7.3.4-xntpd.patch
 
 Requires: textutils sh-utils grep mailx
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,6 +28,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 
@@ -140,6 +142,10 @@
 %doc License project/CHANGES 
 
 %changelog
+* Wed Apr  4 2007 Ivana Varekova <varekova at redhat.com> 7.3.4-4
+- Resolves 234875
+  logwatch warns about ntpd startup messages
+
 * Mon Apr  2 2007 Ivana Varekova <varekova at redhat.com> 7.3.4-3
 - Resolves: 234767
   Unmatched Entries in mails since sysklogd 1.4.2-3/#223573



From fedora-cvs-commits at redhat.com  Wed Apr  4 08:34:39 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 04:34:39 -0400
Subject: rpms/scim/devel scim.spec, 1.80, 1.81 scim-setup-desktop-file.patch,
	1.1, NONE
Message-ID: <200704040834.l348Yd9P017546@cvs.devel.redhat.com>

Author: petersen

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

Modified Files:
	scim.spec 
Removed Files:
	scim-setup-desktop-file.patch 
Log Message:
- add X-GNOME-PersonalSettings category to scim-setup.desktop (#234167)
- also use desktop-file-install instead of scim-setup-desktop-file.patch to
  remove Applications category



Index: scim.spec
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/scim.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- scim.spec	12 Mar 2007 23:17:14 -0000	1.80
+++ scim.spec	4 Apr 2007 08:34:36 -0000	1.81
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.5
-Release:   11%{?dist}
+Release:   12%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -44,7 +44,6 @@
 Patch15:   scim-gtkimm-default-snooper-off-213796.patch
 Patch16:   scim_panel_gtk-settle-toolbar-after-drag.patch
 Patch17:   scim-1.4.5-no-rpath-libdir.patch
-Patch18:   scim-setup-desktop-file.patch
 
 %description
 SCIM is a user friendly and full featured input method user interface and
@@ -112,7 +111,6 @@
 %patch15 -p1 -b .15-key-snooper~
 %patch16 -p1 -b .16-drag-move~
 %patch17 -p1 -b .17-rpath~
-%patch18 -p1 -b .18-category~
 
 %if %{snapshot}
 ./bootstrap
@@ -144,9 +142,11 @@
 
 # install setup panel
 desktop-file-install \
-  --delete-original                                     \
-  --vendor fedora                                       \
-  --dir ${RPM_BUILD_ROOT}/%{_datadir}/applications      \
+  --delete-original \
+  --vendor fedora \
+  --remove-category Applications \
+  --add-category X-GNOME-PersonalSettings \
+  --dir ${RPM_BUILD_ROOT}/%{_datadir}/applications \
   ${RPM_BUILD_ROOT}/%{_datadir}/applications/scim-setup.desktop
 
 # remove capplet
@@ -250,6 +250,11 @@
 
 
 %changelog
+* Wed Apr  4 2007 Jens Petersen <petersen at redhat.com> - 1.4.5-12
+- add X-GNOME-PersonalSettings category to scim-setup.desktop (#234167)
+- also use desktop-file-install instead of scim-setup-desktop-file.patch to
+  remove Applications category
+
 * Tue Mar 13 2007 Jens Petersen <petersen at redhat.com> - 1.4.5-11
 - improve sourceforge url to main tarball (#226395)
 - preserve timestamps under make install (#226395)


--- scim-setup-desktop-file.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr  4 08:49:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 04:49:50 -0400
Subject: rpms/hplip/devel hplip.spec,1.110,1.111
Message-ID: <200704040849.l348noIc028729@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
* Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com>
- Build requires sane-backends-devel (bug #234813).
- Resolves: rhbz#234813



Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- hplip.spec	3 Apr 2007 16:30:31 -0000	1.110
+++ hplip.spec	4 Apr 2007 08:49:48 -0000	1.111
@@ -36,6 +36,7 @@
 BuildRequires: desktop-file-utils
 BuildRequires: libusb-devel
 BuildRequires: autoconf
+BuildRequires: sane-backends-devel
 
 %description
 The Hewlett-Packard Linux Imaging and Printing Project provides
@@ -190,6 +191,9 @@
 exit 0
 
 %changelog
+* Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com>
+- Build requires sane-backends-devel (bug #234813).
+
 * Tue Apr  3 2007 Tim Waugh <twaugh at redhat.com>
 - Change 'Hidden' to 'NoDisplay' in the desktop file, and use the System
   category instead of Utility (bug #170762).



From fedora-cvs-commits at redhat.com  Wed Apr  4 09:09:16 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 05:09:16 -0400
Subject: rpms/aspell-nl/devel aspell-nl.spec,1.22,1.23
Message-ID: <200704040909.l3499Grg010310@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/aspell-nl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10030

Modified Files:
	aspell-nl.spec 
Log Message:
fix a problem with libdir variable



Index: aspell-nl.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-nl/devel/aspell-nl.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- aspell-nl.spec	30 Mar 2007 12:53:15 -0000	1.22
+++ aspell-nl.spec	4 Apr 2007 09:09:14 -0000	1.23
@@ -31,11 +31,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir}
 rm $RPM_BUILD_ROOT/usr/share/ispell/dutch.aff
 rm $RPM_BUILD_ROOT/usr/dict/dutch
 rm $RPM_BUILD_ROOT/usr/info/*
-cp $RPM_BUILD_ROOT/usr/lib/aspell-0.60/nl.dat $RPM_BUILD_ROOT/usr/lib/aspell-0.60/nl_affix.dat
+cp $RPM_BUILD_ROOT%{_libdir}/aspell-0.60/nl.dat $RPM_BUILD_ROOT%{_libdir}/aspell-0.60/nl_affix.dat
 
    
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 09:32:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 05:32:43 -0400
Subject: rpms/hplip/devel hplip.spec,1.111,1.112
Message-ID: <200704040932.l349Whpq027650@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
* Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-2
- Split out a gui sub-package (bug #193661).
- Resolves: rhbz#193661



Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- hplip.spec	4 Apr 2007 08:49:48 -0000	1.111
+++ hplip.spec	4 Apr 2007 09:32:41 -0000	1.112
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 1.7.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -24,7 +24,6 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
-Requires: PyQt
 
 %define hpijs_epoch 1
 Requires: hpijs = %{hpijs_epoch}:%{version}-%{release}
@@ -42,6 +41,16 @@
 The Hewlett-Packard Linux Imaging and Printing Project provides
 drivers for HP printers and multi-function peripherals.
 
+%package gui
+Summary: HPLIP graphical tools
+Group: Applications/System
+License: BSD
+Requires: PyQt
+Requires: %{name} = %{version}-%{release}
+
+%description gui
+HPLIP graphical tools.
+
 %package -n hpijs
 Summary: HP Printer Drivers
 Group: Applications/Publishing
@@ -138,6 +147,10 @@
 rm -f %{buildroot}%{_datadir}/hplip/hplip_overview.png
 rm -f %{buildroot}%{_datadir}/hplip/hplip_readme.html
 rm -f %{buildroot}%{_datadir}/hplip/hplip.sh
+rm -f %{buildroot}%{_datadir}/hplip/data/hplip.desktop
+rm -f %{buildroot}%{_datadir}/hplip/hplip-install
+rm -rf %{buildroot}%{_datadir}/hplip/install*
+rm -f %{buildroot}%{_datadir}/hplip/hpaio.desc
 
 %clean
 rm -rf %{buildroot}
@@ -152,8 +165,51 @@
 %{_sbindir}/hpiod
 /usr/lib/cups/backend/hp
 /usr/lib/cups/backend/hpfax
-%{_datadir}/hplip
 %{_libdir}/python*/site-packages/*
+%dir %{_datadir}/hplip
+# Files
+%{_datadir}/hplip/align
+%{_datadir}/hplip/clean
+%{_datadir}/hplip/colorcal
+%{_datadir}/hplip/firmware
+%{_datadir}/hplip/hpssd*
+%{_datadir}/hplip/info
+%{_datadir}/hplip/__init__*
+%{_datadir}/hplip/levels
+%{_datadir}/hplip/makeuri
+%{_datadir}/hplip/probe
+%{_datadir}/hplip/testpage
+%{_datadir}/hplip/timedate
+# Directories
+%{_datadir}/hplip/base
+%{_datadir}/hplip/Cheetah
+%{_datadir}/hplip/cherrypy
+%{_datadir}/hplip/copier
+%dir %{_datadir}/hplip/data
+%{_datadir}/hplip/data/firmware
+%{_datadir}/hplip/data/ldl
+%{_datadir}/hplip/data/models
+%{_datadir}/hplip/data/pcl
+%{_datadir}/hplip/data/ps
+%{_datadir}/hplip/pcard
+%{_datadir}/hplip/prnt
+%{_datadir}/hplip/scan
+
+%files gui
+# Files
+%{_datadir}/hplip/check
+%{_datadir}/hplip/data/images
+%{_datadir}/hplip/fab
+%{_datadir}/hplip/fax
+%{_datadir}/hplip/makecopies
+%{_datadir}/hplip/print
+%{_datadir}/hplip/sendfax
+%{_datadir}/hplip/setup
+%{_datadir}/hplip/toolbox
+%{_datadir}/hplip/unload
+# Directories
+%{_datadir}/hplip/ui
+%{_datadir}/hplip/plugins
 %{_datadir}/applications/*.desktop
 
 %files -n hpijs
@@ -191,7 +247,8 @@
 exit 0
 
 %changelog
-* Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com>
+* Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-2
+- Split out a gui sub-package (bug #193661).
 - Build requires sane-backends-devel (bug #234813).
 
 * Tue Apr  3 2007 Tim Waugh <twaugh at redhat.com>



From fedora-cvs-commits at redhat.com  Wed Apr  4 10:24:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 06:24:31 -0400
Subject: rpms/uucp/devel uucp-1.07-sigfpe2.patch, NONE, 1.1 uucp.spec, 1.33,
	1.34
Message-ID: <200704041024.l34AOVMN025681@cvs.devel.redhat.com>

Author: lvrabel

Update of /cvs/dist/rpms/uucp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25665

Modified Files:
	uucp.spec 
Added Files:
	uucp-1.07-sigfpe2.patch 
Log Message:
fix crashes with SIGFPE (#150978)

uucp-1.07-sigfpe2.patch:
 log.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE uucp-1.07-sigfpe2.patch ---
--- uucp-1.07/log.c.sigfpe2	2005-03-13 09:35:52.500596891 +0100
+++ uucp-1.07/log.c	2005-03-13 09:38:26.414639470 +0100
@@ -671,8 +671,8 @@
     }      
 
   /* On a system which can determine microseconds we might very well
-     have both csecs == 0 and cmicros == 0.  */
-  if (csecs == 0 && cmicros < 1000)
+     have both csecs == 0 and cmicros == 0. */
+  if (csecs < 0 || (csecs == 0 && cmicros < 1000))
     cbps = 0;
   else
     {



Index: uucp.spec
===================================================================
RCS file: /cvs/dist/rpms/uucp/devel/uucp.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- uucp.spec	4 Jan 2007 09:52:41 -0000	1.33
+++ uucp.spec	4 Apr 2007 10:24:28 -0000	1.34
@@ -7,7 +7,7 @@
 Summary: The uucp utility for copying files between systems
 Name: uucp
 Version: 1.07
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPL
 Group: Applications/Communications
 Url: http://www.airs.com/ian/uucp.html
@@ -19,6 +19,7 @@
 Patch6: uucp-1.07-baudboy.patch
 Patch8: uucp-1.06.1-pipe.patch
 Patch9: uucp-1.07-lfs.patch
+Patch10: uucp-1.07-sigfpe2.patch
 Prereq: fileutils /sbin/install-info
 BuildPrereq: lockdev-devel >= 1.0.0-14
 Requires: lockdev >= 1.0.0-14
@@ -37,6 +38,7 @@
 %patch6 -p1 -b .baudboy
 %patch8 -p1 -b .pipe
 %patch9 -p1 -b .lfs
+%patch10 -p1 -b .sigfpe2
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
@@ -155,6 +157,9 @@
 %config(noreplace)	%{_newconfigdir}/sys
 
 %changelog
+* Wed Apr 04 2007 Lukas Vrabel <lvrabel at redhat.com> 1.07-15
+- fix crashes with SIGFPE (#150978) (from Wolfgang Ocker)
+
 * Thu Jan 04 2007 Peter Vrabec <pvrabec at redhat.com> 1.07-14
 - spec file improvements (#220534)
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 10:33:40 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 06:33:40 -0400
Subject: rpms/hplip/devel hplip-marker-supply.patch,1.1,1.2
Message-ID: <200704041033.l34AXeI8008192@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip-marker-supply.patch 
Log Message:
Marker supply low is a warning not an error.

hplip-marker-supply.patch:
 hpijs.cpp |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+)

Index: hplip-marker-supply.patch
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip-marker-supply.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hplip-marker-supply.patch	2 Apr 2007 14:18:16 -0000	1.1
+++ hplip-marker-supply.patch	4 Apr 2007 10:33:38 -0000	1.2
@@ -23,9 +23,9 @@
 +      case WARN_LOW_INK_MAGENTA:
 +      case WARN_LOW_INK_YELLOW:
 +      case WARN_LOW_INK_MULTIPLE_PENS:
-+	 bug("STATE: +marker-supply-low\n");
++	 bug("STATE: +marker-supply-low-warning\n");
 +      default:
-+	 bug("STATE: -marker-supply-low");
++	 bug("STATE: -marker-supply-low-warning");
 +      }
 +   }
  



From fedora-cvs-commits at redhat.com  Wed Apr  4 10:41:11 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 06:41:11 -0400
Subject: rpms/hplip/devel hplip-marker-supply.patch, 1.2, 1.3 hplip.spec,
	1.112, 1.113
Message-ID: <200704041041.l34AfBjM013463@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip-marker-supply.patch hplip.spec 
Log Message:
* Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com>
- Fixed typo in marker-supply-low patch.


hplip-marker-supply.patch:
 hpijs.cpp |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+)

Index: hplip-marker-supply.patch
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip-marker-supply.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hplip-marker-supply.patch	4 Apr 2007 10:33:38 -0000	1.2
+++ hplip-marker-supply.patch	4 Apr 2007 10:41:09 -0000	1.3
@@ -25,7 +25,7 @@
 +      case WARN_LOW_INK_MULTIPLE_PENS:
 +	 bug("STATE: +marker-supply-low-warning\n");
 +      default:
-+	 bug("STATE: -marker-supply-low-warning");
++	 bug("STATE: -marker-supply-low-warning\n");
 +      }
 +   }
  


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- hplip.spec	4 Apr 2007 09:32:41 -0000	1.112
+++ hplip.spec	4 Apr 2007 10:41:09 -0000	1.113
@@ -247,6 +247,9 @@
 exit 0
 
 %changelog
+* Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com>
+- Fixed typo in marker-supply-low patch.
+
 * Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-2
 - Split out a gui sub-package (bug #193661).
 - Build requires sane-backends-devel (bug #234813).



From fedora-cvs-commits at redhat.com  Wed Apr  4 10:48:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 06:48:31 -0400
Subject: rpms/hplip/devel hplip-marker-supply.patch,1.3,1.4
Message-ID: <200704041048.l34AmVHs018899@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip-marker-supply.patch 
Log Message:
And another typo.

hplip-marker-supply.patch:
 hpijs.cpp |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+)

Index: hplip-marker-supply.patch
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip-marker-supply.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hplip-marker-supply.patch	4 Apr 2007 10:41:09 -0000	1.3
+++ hplip-marker-supply.patch	4 Apr 2007 10:48:29 -0000	1.4
@@ -1,6 +1,6 @@
 --- hplip-1.7.2/prnt/hpijs/hpijs.cpp.marker-supply	2007-03-30 17:44:32.000000000 +0100
 +++ hplip-1.7.2/prnt/hpijs/hpijs.cpp	2007-03-30 17:53:23.000000000 +0100
-@@ -516,7 +516,30 @@
+@@ -516,7 +516,31 @@
        goto BUGOUT;
     }
     if (pSS->pPC->constructor_error < 0)
@@ -24,6 +24,7 @@
 +      case WARN_LOW_INK_YELLOW:
 +      case WARN_LOW_INK_MULTIPLE_PENS:
 +	 bug("STATE: +marker-supply-low-warning\n");
++	 break;
 +      default:
 +	 bug("STATE: -marker-supply-low-warning\n");
 +      }



From fedora-cvs-commits at redhat.com  Wed Apr  4 11:06:06 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 07:06:06 -0400
Subject: rpms/system-config-printer/devel pycups-1.9.20.tar.bz2.sig, NONE,
	1.1 .cvsignore, 1.123, 1.124 sources, 1.128,
	1.129 system-config-printer.spec, 1.98,
	1.99 pycups-1.9.19.tar.bz2.sig, 1.1, NONE
Message-ID: <200704041106.l34B66uP031631@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	pycups-1.9.20.tar.bz2.sig 
Removed Files:
	pycups-1.9.19.tar.bz2.sig 
Log Message:
* Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com>
- Updated to pycups-1.9.20 for printer-state-reasons fix.



--- NEW FILE pycups-1.9.20.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- .cvsignore	2 Apr 2007 16:43:09 -0000	1.123
+++ .cvsignore	4 Apr 2007 11:06:04 -0000	1.124
@@ -105,3 +105,4 @@
 system-config-printer-0.7.60.tar.bz2
 system-config-printer-0.7.61.tar.bz2
 system-config-printer-0.7.62.tar.bz2
+pycups-1.9.20.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- sources	2 Apr 2007 16:43:10 -0000	1.128
+++ sources	4 Apr 2007 11:06:04 -0000	1.129
@@ -1,2 +1,2 @@
-c85a0ed5972a24c36787ce0dec4e0375  pycups-1.9.19.tar.bz2
 a6719e4a9f2a0d7395a401f6f7abb688  system-config-printer-0.7.62.tar.bz2
+95ade8184c74c7373e987b02a58ae451  pycups-1.9.20.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- system-config-printer.spec	2 Apr 2007 16:43:10 -0000	1.98
+++ system-config-printer.spec	4 Apr 2007 11:06:04 -0000	1.99
@@ -1,4 +1,4 @@
-%define pycups_version 1.9.19
+%define pycups_version 1.9.20
 
 Summary: A printer administration tool
 Name: system-config-printer
@@ -129,6 +129,9 @@
 fi
 
 %changelog
+* Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com>
+- Updated to pycups-1.9.20 for printer-state-reasons fix.
+
 * Mon Apr  2 2007 Tim Waugh <twaugh at redhat.com> 0.7.62-1
 - 0.7.62:
   - Use standard icon for admin tool desktop file.


--- pycups-1.9.19.tar.bz2.sig DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr  4 12:03:08 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 08:03:08 -0400
Subject: rpms/aspell-en/devel aspell-en.spec,1.16,1.17
Message-ID: <200704041203.l34C38bY017101@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/aspell-en/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17083

Modified Files:
	aspell-en.spec 
Log Message:
add obsoletes



Index: aspell-en.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-en/devel/aspell-en.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- aspell-en.spec	30 Mar 2007 11:33:18 -0000	1.16
+++ aspell-en.spec	4 Apr 2007 12:03:06 -0000	1.17
@@ -5,14 +5,15 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 6.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: LGPL
 Group: Applications/Text
 URL: http://aspell.net/
 Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell%{aspellversion}-%{lang}-%{version}-%{langrelease}.tar.bz2
 Buildrequires: aspell >= 12:0.60
 Requires: aspell >= 12:0.60
-Conflicts: aspell-en-gb, aspell-en-ca
+Obsoletes: aspell-en-gb <= 0.33.7.1
+Obsoletes: aspell-en-ca <= 0.33.7.1
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define debug_package %{nil}
@@ -41,8 +42,8 @@
 %{_libdir}/aspell-0.60/*
 
 %changelog
-* Fri Mar 30 2007 Ivana Varekova <varekova at redhat.com> - 50:6.0-6
-- remove obstolete flag
+* Fri Mar 30 2007 Ivana Varekova <varekova at redhat.com> - 50:6.0-7
+- add version to obstolete flag
 
 * Thu Mar 29 2007 Ivana Varekova <varekova at redhat.com> - 50:6.0-5
 - add documentation



From fedora-cvs-commits at redhat.com  Wed Apr  4 12:27:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 08:27:50 -0400
Subject: rpms/libgnomekbd/devel libgnomekbd.spec,1.16,1.17
Message-ID: <200704041227.l34CRo2h017429@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomekbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17415

Modified Files:
	libgnomekbd.spec 
Log Message:
Fix a typo



Index: libgnomekbd.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomekbd/devel/libgnomekbd.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libgnomekbd.spec	13 Mar 2007 23:09:09 -0000	1.16
+++ libgnomekbd.spec	4 Apr 2007 12:27:47 -0000	1.17
@@ -1,11 +1,11 @@
 Name:           libgnomekbd
 Version:       	2.18.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://gswitchit.sourceforce.net
+URL:            http://gswitchit.sourceforge.net
 Source0:        http://ftp.gnome.org/pub/gnome/sources/libgnomekbd/2.18/libgnomekbd-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=365590
 Patch1:         libgnomekbd-0.1-werror.patch
@@ -134,6 +134,9 @@
 
 
 %changelog
+* Wed Apr  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-2
+- Fix a typo in URL
+
 * Tue Mar 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-1
 - Update to 2.18.0
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 12:40:46 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 08:40:46 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.129.ooo54603.fontconfig.patch, 1.15,
	1.16 openoffice.org.spec, 1.1150, 1.1151
Message-ID: <200704041240.l34CekAV005361@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.129.ooo54603.fontconfig.patch 
	openoffice.org.spec 
Log Message:
Resolves: rhbz#223190 make a final fallback to a font with a known working notdet glyph

openoffice.org-1.9.129.ooo54603.fontconfig.patch:
 OOE680_m6/psprint/inc/psprint/fontmanager.hxx        |   11 
 OOE680_m6/psprint/source/fontmanager/fontcache.cxx   |    2 
 OOE680_m6/psprint/source/fontmanager/fontconfig.cxx  |  410 +++++++++++++++----
 OOE680_m6/psprint/source/fontmanager/fontmanager.cxx |    9 
 OOE680_m6/vcl/inc/outdev.h                           |    2 
 OOE680_m6/vcl/inc/outfont.hxx                        |   15 
 OOE680_m6/vcl/inc/sallayout.hxx                      |    1 
 OOE680_m6/vcl/source/gdi/outdev3.cxx                 |  367 ++++++++++++-----
 OOE680_m6/vcl/source/gdi/sallayout.cxx               |   46 ++
 OOE680_m6/vcl/source/glyphs/gcach_layout.cxx         |   12 
 OOE680_m6/vcl/source/window/window.cxx               |    5 
 OOE680_m6/vcl/util/makefile.mk                       |    2 
 vcl/inc/sallayout.hxx                                |    3 
 vcl/source/gdi/outdev3.cxx                           |   11 
 vcl/source/gdi/sallayout.cxx                         |   19 
 15 files changed, 740 insertions(+), 175 deletions(-)

Index: openoffice.org-1.9.129.ooo54603.fontconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.129.ooo54603.fontconfig.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- openoffice.org-1.9.129.ooo54603.fontconfig.patch	23 Jan 2007 12:15:33 -0000	1.15
+++ openoffice.org-1.9.129.ooo54603.fontconfig.patch	4 Apr 2007 12:40:42 -0000	1.16
@@ -210,7 +210,7 @@
          DBG_ASSERT( (pFontFamily != NULL), "ImplFontCache::Get() No logical font found!" );
          if( pFontFamily )
              aFontSelData.maSearchName = pFontFamily->GetSearchName();
-@@ -3024,115 +3146,121 @@
+@@ -3024,115 +3146,143 @@
  // -----------------------------------------------------------------------
  
  ImplFontEntry* ImplFontCache::GetFallback( ImplDevFontList* pFontList,
@@ -336,7 +336,29 @@
 -        }
 +    if ( !cached )
 +    {
-+        String aName(GetFcSubstitute( aSelData, aGlyphs ));
++        String aName;
++        if (nFallbackLevel != MAX_FALLBACK -1)
++            aName = GetFcSubstitute( aSelData, aGlyphs );
++        else
++        {
++            /* 
++                There is no font that can handle this, to be safe let's set a font 
++                which has a known working .notdef glyph
++            */
++            const psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
++            std::vector<sal_Unicode> aDummy;
++            std::vector<String> aNames;
++            aNames.push_back(String(RTL_CONSTASCII_USTRINGPARAM("Sazanami Gothic")));
++            aName = rMgr.Substitute(aNames, aDummy, ByteString(),
++                psp::italic::Unknown, psp::weight::Unknown, psp::width::Unknown, psp::pitch::Unknown);
++            if (aName != String(RTL_CONSTASCII_USTRINGPARAM("Sazanami Gothic")))
++            {
++                aNames.clear();
++                aNames.push_back(OUString(RTL_CONSTASCII_USTRINGPARAM("DejaVu LGC Sans")));
++                aName = rMgr.Substitute(aNames, aDummy, ByteString(),
++                    psp::italic::Unknown, psp::weight::Unknown, psp::width::Unknown, psp::pitch::Unknown);
++            }
++        }
 +        if (aName.Len())
 +            aSelData.maSearchName = aName;
 +    }
@@ -1463,23 +1485,3 @@
  
          // prepare merging components
          nStartNew[ nLevel ] = nStartOld[ nLevel ] = 0;
-@@ -1745,7 +1758,8 @@
-                     (!maFallbackRuns[ n ].PosIsInAnyRun( nCharPos[0] ) )
-                   )
-             {
--                mpLayouts[0]->DropGlyph( nStartOld[0] );
-+                if (!(mbInComplete && (n == mnLevel-1)))
-+                    mpLayouts[0]->DropGlyph( nStartOld[0] );
-                 nStartOld[0] = nStartNew[0];
-                 nValid[0] = mpLayouts[0]->GetNextGlyphs( 1, &nDummy, aPos,
-                     nStartNew[0], &nGlyphAdv[0], &nCharPos[0] );
-@@ -1864,7 +1878,8 @@
- 
- void MultiSalLayout::DrawText( SalGraphics& rGraphics ) const
- {
--    for( int i = mnLevel; --i >= 0; )
-+    int nLevel = mbInComplete ? mnLevel-1 : mnLevel;
-+    for( int i = nLevel; --i >= 0; )
-     {
-         SalLayout& rLayout = *mpLayouts[ i ];
-         rLayout.DrawBase() = maDrawBase;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1150
retrieving revision 1.1151
diff -u -r1.1150 -r1.1151
--- openoffice.org.spec	3 Apr 2007 11:28:57 -0000	1.1150
+++ openoffice.org.spec	4 Apr 2007 12:40:42 -0000	1.1151
@@ -1,11 +1,11 @@
 %define oootag OOF680
 %define ooomilestone 14
-%define rh_rpm_release 3
+%define rh_rpm_release 4
 
 # gcc#19664#
 %define stlvisibilityfcked 1
 # undef to get english only and no-langpacks for a quick smoketest build
-%define langpacks 1
+%define langpacks 0
 # undef to revert to the traditional print dialog
 %define gtkprintui 1
 # undef to revert from combining startup libs into a single libsoffice 
@@ -25,7 +25,8 @@
 
 %define ooo_base_name %{oootag}_m%{ooomilestone}
 
-ExclusiveArch:  ppc %{ix86} x86_64
+#ExclusiveArch:  ppc %{ix86} x86_64
+ExclusiveArch:  %{ix86}
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
 Version:        2.2.0
@@ -2634,6 +2635,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Wed Apr 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.4
+- Resolves: rhbz#223190 make a final fallback to a font with a known
+  working notdef glyph
+
 * Tue Mar 27 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.3
 - Resolves: rhbz#233944 openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
 - add aliases for the english autocorrect files
@@ -2688,7 +2693,8 @@
 - a better fix for the persistant visibility markup problem
 
 * Wed Feb 21 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-8.3
-- add workspace.configrefactor01.patch and knock approx 1/2 sec off warm start
+- add workspace.configrefactor01.patch and knock .1 sec off warm start
+  http://people.redhat.com/caolanm/speed/configmgr.refactor.ods
 
 * Tue Feb 20 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-8.2
 - ooo#74692 64bit form controls



From fedora-cvs-commits at redhat.com  Wed Apr  4 12:41:20 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 08:41:20 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1151,1.1152
Message-ID: <200704041241.l34CfKfX005853@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
unto testing stuff


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1151
retrieving revision 1.1152
diff -u -r1.1151 -r1.1152
--- openoffice.org.spec	4 Apr 2007 12:40:42 -0000	1.1151
+++ openoffice.org.spec	4 Apr 2007 12:41:18 -0000	1.1152
@@ -5,7 +5,7 @@
 # gcc#19664#
 %define stlvisibilityfcked 1
 # undef to get english only and no-langpacks for a quick smoketest build
-%define langpacks 0
+%define langpacks 1
 # undef to revert to the traditional print dialog
 %define gtkprintui 1
 # undef to revert from combining startup libs into a single libsoffice 
@@ -25,8 +25,7 @@
 
 %define ooo_base_name %{oootag}_m%{ooomilestone}
 
-#ExclusiveArch:  ppc %{ix86} x86_64
-ExclusiveArch:  %{ix86}
+ExclusiveArch:  ppc %{ix86} x86_64
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
 Version:        2.2.0



From fedora-cvs-commits at redhat.com  Wed Apr  4 12:43:12 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 08:43:12 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1152,
	1.1153 openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch,
	1.1, NONE
Message-ID: <200704041243.l34ChCgJ007252@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch 
Log Message:
drop unused patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1152
retrieving revision 1.1153
diff -u -r1.1152 -r1.1153
--- openoffice.org.spec	4 Apr 2007 12:41:18 -0000	1.1152
+++ openoffice.org.spec	4 Apr 2007 12:43:10 -0000	1.1153
@@ -112,29 +112,28 @@
 Patch53: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
 Patch54: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch
 Patch55: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
-Patch56: openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch
-Patch57: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch
-Patch58: workspace.cmcfixes32.patch
-Patch59: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch60: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
-Patch61: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch62: openoffice.org-2.2.0.ooo74255.vcl.depth.mismatch.patch
-Patch63: openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch
-Patch64: openoffice.org-2.2.0.ooo74401.basctl.boost.patch
-Patch65: workspace.configrefactor01.patch
-Patch66: workspace.sixtyfour11.patch
-Patch67: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch68: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch69: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch70: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
-Patch71: openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch
-Patch72: openoffice.org-2.2.0.ooo75329.xdguserdir.patch
-Patch73: openoffice.org-2.2.0.rh232389.tango.patch
+Patch56: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch
+Patch57: workspace.cmcfixes32.patch
+Patch58: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch59: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
+Patch60: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch61: openoffice.org-2.2.0.ooo74255.vcl.depth.mismatch.patch
+Patch62: openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch
+Patch63: openoffice.org-2.2.0.ooo74401.basctl.boost.patch
+Patch64: workspace.configrefactor01.patch
+Patch65: workspace.sixtyfour11.patch
+Patch66: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch67: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch68: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch69: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
+Patch70: openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch
+Patch71: openoffice.org-2.2.0.ooo75329.xdguserdir.patch
+Patch72: openoffice.org-2.2.0.rh232389.tango.patch
 %if %{linkopt}
-Patch74: openoffice.org-2.2.0.ooo53397.linkopt.patch
+Patch73: openoffice.org-2.2.0.ooo53397.linkopt.patch
 %endif
-Patch75: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
-#Patch76: openoffice.org-2.2.0.gprof.patch
+Patch74: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
+#Patch75: openoffice.org-2.2.0.gprof.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1038,29 +1037,28 @@
 %patch53 -p1 -b .ooo73201.sw.a11yloadcrash.patch
 %patch54 -p1 -b .ooo73481.svx.longnotint32.patch
 %patch55 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
-%patch56 -p1 -b .oooXXXXX.vcl.makenotdefglyph.patch
-%patch57 -p1 -b .ooo73866.javaunohelper.parallel.patch
-%patch58 -p1 -b .workspace.cmcfixes32.patch
-%patch59 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch60 -p1 -b .ooo73974.bridges.doublereturn.patch
-%patch61 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch62 -p1 -b .ooo74255.vcl.depth.mismatch.patch
-%patch63 -p1 -b .ooo74451.sw.typemismatch.patch
-%patch64 -p1 -b .ooo74401.basctl.boost.patch
-%patch65 -p1 -b .workspace.configrefactor01.patch
-%patch66 -p1 -b .workspace.sixtyfour11.patch
-%patch67 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch68 -p1 -b .ooo68717.gstreamer.video.patch
-%patch69 -p1 -b .ooo63159.sal.dtype.patch
-%patch70 -p1 -b .ooo75167.framework.workspacerestore.patch
-%patch71 -p1 -b .ooo75190.shell.newrecentlyused.patch
-%patch72 -p1 -b .ooo75329.xdguserdir.patch
-%patch73 -p1 -b .rh232389.tango.patch
+%patch56 -p1 -b .ooo73866.javaunohelper.parallel.patch
+%patch57 -p1 -b .workspace.cmcfixes32.patch
+%patch58 -p1 -b .ooo73863.vcl.imcommit.patch
+%patch59 -p1 -b .ooo73974.bridges.doublereturn.patch
+%patch60 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch61 -p1 -b .ooo74255.vcl.depth.mismatch.patch
+%patch62 -p1 -b .ooo74451.sw.typemismatch.patch
+%patch63 -p1 -b .ooo74401.basctl.boost.patch
+%patch64 -p1 -b .workspace.configrefactor01.patch
+%patch65 -p1 -b .workspace.sixtyfour11.patch
+%patch66 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch67 -p1 -b .ooo68717.gstreamer.video.patch
+%patch68 -p1 -b .ooo63159.sal.dtype.patch
+%patch69 -p1 -b .ooo75167.framework.workspacerestore.patch
+%patch70 -p1 -b .ooo75190.shell.newrecentlyused.patch
+%patch71 -p1 -b .ooo75329.xdguserdir.patch
+%patch72 -p1 -b .rh232389.tango.patch
 %if %{linkopt}
-%patch74 -p1 -b .ooo53397.linkopt.patch
+%patch73 -p1 -b .ooo53397.linkopt.patch
 %endif
-%patch75 -p1 -b .ooo75790.sc.pa-IN.translate.patch
-#%patch76 -p1 -b .gprof.patch
+%patch74 -p1 -b .ooo75790.sc.pa-IN.translate.patch
+#%patch75 -p1 -b .gprof.patch
 
 cp %{SOURCE1} extras/source/database/evolocal.odb
 


--- openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr  4 13:13:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 09:13:57 -0400
Subject: rpms/vsftpd/devel vsftpd.spec,1.62,1.63
Message-ID: <200704041313.l34DDvpG029959@cvs.devel.redhat.com>

Author: mbarabas

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

Modified Files:
	vsftpd.spec 
Log Message:
Merge review fix


Index: vsftpd.spec
===================================================================
RCS file: /cvs/dist/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- vsftpd.spec	20 Mar 2007 21:48:02 -0000	1.62
+++ vsftpd.spec	4 Apr 2007 13:13:55 -0000	1.63
@@ -1,9 +1,9 @@
 %{!?tcp_wrappers:%define tcp_wrappers 1}
 
-Summary: vsftpd - Very Secure Ftp Daemon
+Summary: Very Secure Ftp Daemon
 Name: vsftpd
 Version: 2.0.5
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://vsftpd.beasts.org/
@@ -44,21 +44,21 @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %if %{tcp_wrappers}
-BuildPrereq: tcp_wrappers-devel
+BuildRequires: tcp_wrappers-devel
 %endif
 BuildRequires: pam-devel
-Requires: pam
 Requires: /%{_lib}/security/pam_loginuid.so
 BuildRequires: libcap-devel
-Requires: libcap
 BuildRequires: openssl-devel
-Requires: openssl
+Requires: libcap
 # for -fpie
-BuildPrereq: gcc > 3.2.3-13, binutils > 2.14.90.0.4-24, glibc-devel >= 2.3.2-45
+BuildRequires: gcc > 3.2.3-13, binutils > 2.14.90.0.4-24, glibc-devel >= 2.3.2-45
 Requires: logrotate
-Prereq: /sbin/chkconfig, /sbin/service, /usr/sbin/usermod
-Obsoletes: anonftp
-Provides: ftpserver
+Requires (preun): /sbin/chkconfig
+Requires (preun): /sbin/service
+Requires (post): /sbin/chkconfig
+#Obsoletes: anonftp
+#Provides: ftpserver
 
 %description
 vsftpd is a Very Secure FTP daemon. It was written completely from
@@ -108,22 +108,22 @@
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/sbin
-mkdir -p $RPM_BUILD_ROOT/etc
-mkdir -p $RPM_BUILD_ROOT/etc/{vsftpd,pam.d,logrotate.d,rc.d/init.d}
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{5,8}
-install -m 755 vsftpd  $RPM_BUILD_ROOT/usr/sbin/vsftpd
-install -m 600 vsftpd.conf $RPM_BUILD_ROOT/etc/vsftpd/vsftpd.conf
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{vsftpd,pam.d,logrotate.d,rc.d/init.d}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{5,8}
+install -m 755 vsftpd  $RPM_BUILD_ROOT%{_sbindir}/vsftpd
+install -m 600 vsftpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/vsftpd/vsftpd.conf
 install -m 644 vsftpd.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5/
 install -m 644 vsftpd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
-install -m 644 RedHat/vsftpd.log $RPM_BUILD_ROOT/etc/logrotate.d/vsftpd.log
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/vsftpd
-install -m 600 %{SOURCE3} $RPM_BUILD_ROOT/etc/vsftpd/ftpusers
-install -m 600 %{SOURCE4} $RPM_BUILD_ROOT/etc/vsftpd/user_list
-install -m 755 %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/vsftpd
-install -m 744 %{SOURCE6} $RPM_BUILD_ROOT/etc/vsftpd/vsftpd_conf_migrate.sh
+install -m 644 RedHat/vsftpd.log $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/vsftpd.log
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/vsftpd
+install -m 600 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/vsftpd/ftpusers
+install -m 600 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/vsftpd/user_list
+install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/vsftpd
+install -m 744 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/vsftpd/vsftpd_conf_migrate.sh
                             
-mkdir -p $RPM_BUILD_ROOT/var/ftp/pub
+mkdir -p $RPM_BUILD_ROOT/%{_var}/ftp/pub
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -141,19 +141,25 @@
 
 %files
 %defattr(-,root,root)
-/usr/sbin/vsftpd
-/etc/rc.d/init.d/vsftpd
+%{_sbindir}/vsftpd
+%{_sysconfdir}/rc.d/init.d/vsftpd
 #%config(noreplace) /etc/vsftpd.*
-%dir /etc/vsftpd
-%config(noreplace) /etc/vsftpd/*
-%config(noreplace) /etc/pam.d/vsftpd
-%config(noreplace) /etc/logrotate.d/vsftpd.log
+%dir %{_sysconfdir}/vsftpd
+%config(noreplace) %{_sysconfdir}/vsftpd/*
+%config(noreplace) %{_sysconfdir}/pam.d/vsftpd
+%config(noreplace) %{_sysconfdir}/logrotate.d/vsftpd.log
 %doc FAQ INSTALL BUGS AUDIT Changelog LICENSE README README.security REWARD SPEED TODO BENCHMARKS COPYING SECURITY/ EXAMPLE/ TUNING SIZE vsftpd.xinetd
 %{_mandir}/man5/vsftpd.conf.*
 %{_mandir}/man8/vsftpd.*
-/var/ftp
+%{_var}/ftp
 
 %changelog
+* Wed Apr 04 2007 Maros Barabas <mbarabas at redhat.com> - 2.0.5-16
+- Merge review: - fix using %%{_var}, %%{_sbindir} and 
+                  %%{_sysconfigdir} macros for files and install
+                - fix BuildRoot
+                - dropped usermod, openssl & pam requirement
+
 * Tue Mar 20 2007 Florian La Roche <laroche at redhat.com> - 2.0.5-15
 - fix BuildPrereq
 
@@ -390,7 +396,7 @@
 - don't spit out ugly errors if anonftp isn't installed (#62987)
 - fix horribly broken userlist setup (#62321)
 
-* Thu Feb 28 2002 Trond Eivind Glomsr?d <teg at redhat.com> 1.0.1-4
+* Thu Feb 28 2002 Trond Eivind Glomsr??d <teg at redhat.com> 1.0.1-4
 - s/Copyright/License/
 - add "missingok" to the logrotate script, so we don't get errors
   when nothing has happened
@@ -409,7 +415,7 @@
 
 * Wed Mar 7 2001 Seth Vidal <skvidal at phy.duke.edu>
 - Updated to 0.0.14
-- made %files entry for man page
+- made %%files entry for man page
 
 * Wed Feb 21 2001 Seth Vidal <skvidal at phy.duke.edu>
 - Updated to 0.0.13



From fedora-cvs-commits at redhat.com  Wed Apr  4 13:14:05 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 09:14:05 -0400
Subject: rpms/xsane/devel xsane-0.994-showeulaonce.patch, NONE,
	1.1 xsane.spec, 1.46, 1.47
Message-ID: <200704041314.l34DE52g030119@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	xsane.spec 
Added Files:
	xsane-0.994-showeulaonce.patch 
Log Message:
save prefs when EULA is accepted to ensure that EULA is only shown once at startup (#233645)
Resolves: #233645


xsane-0.994-showeulaonce.patch:
 xsane.c |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE xsane-0.994-showeulaonce.patch ---
--- xsane-0.994/src/xsane.c.showeulaonce	2007-02-25 23:21:06.000000000 +0100
+++ xsane-0.994/src/xsane.c	2007-04-04 15:03:33.000000000 +0200
@@ -5825,6 +5825,11 @@
       DBG(DBG_info, "user did not accept eula, we abort\n");
       return 1; /* User did not accept eula */
     }
+    else
+    {
+        /* User did accept eula */
+        xsane_pref_save();
+    }
   }
 
   xsane_pref_restore_media();


Index: xsane.spec
===================================================================
RCS file: /cvs/dist/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- xsane.spec	3 Apr 2007 15:44:04 -0000	1.46
+++ xsane.spec	4 Apr 2007 13:14:03 -0000	1.47
@@ -3,13 +3,14 @@
 Name: xsane
 Summary: X Window System front-end for the SANE scanner interface
 Version: 0.994
-Release: 1%{?dist}
+Release: 2%{?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.994-showeulaonce.patch
 License: GPL
 URL: http://www.xsane.org/
 Group: Applications/Multimedia
@@ -45,6 +46,7 @@
 %patch0 -p1 -b .htmlview
 %patch1 -p1 -b .medium-definitions
 %patch2 -p1 -b .gimp2.0
+%patch3 -p1 -b .showeulaonce
 
 %build
 %{expand:%%define optflags %{optflags} -DGIMP_ENABLE_COMPAT_CRUFT=1}
@@ -116,6 +118,10 @@
 fi
 
 %changelog
+* Wed Apr 04 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-2
+- save prefs when EULA is accepted to ensure that EULA is only shown once at
+  startup (#233645)
+
 * Tue Apr 03 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-1
 - version 0.994 (#235038)
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 13:16:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 09:16:53 -0400
Subject: rpms/rpm/devel rpm.spec,1.224,1.225
Message-ID: <200704041316.l34DGr4N031834@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31774

Modified Files:
	rpm.spec 
Log Message:
Remove ppc64 inline asm (#233145)



Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- rpm.spec	15 Mar 2007 14:11:19 -0000	1.224
+++ rpm.spec	4 Apr 2007 13:16:50 -0000	1.225
@@ -1,4 +1,4 @@
-%define with_python_version     2.4%{nil}
+%define with_python_version     2.5%{nil}
 %define with_apidocs            1%{nil}
 
 # XXX legacy requires './' payload prefix to be omitted from rpm packages.
@@ -17,7 +17,7 @@
 Name: rpm
 Version: 4.4.2
 %{expand: %%define rpm_version %{version}}
-Release: 41%{?dist}
+Release: 42%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source: rpm-%{rpm_version}.tar.gz
@@ -62,6 +62,7 @@
 Patch36: rpm-4.4.2-unicodekey.patch
 Patch37: rpm-4.4.2-noneon.patch
 Patch38: rpm-4.4.2-debugedit-canonicalize-path.patch
+Patch39: rpm-4.4.2-no-ppc-asm.patch
 License: GPL
 Requires: patch > 2.5
 Prereq: shadow-utils
@@ -202,6 +203,7 @@
 %patch36 -p1 -b .unicode
 %patch37 -p1 -b .noneon
 %patch38 -p0 -b .debugcan
+%patch39 -p1 -b .noppcasm
 
 # rebuild configure for ipv6
 autoconf
@@ -560,6 +562,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Wed Apr 04 2007 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-42
+- Remove ppc64 inline asm (#233145)
+
 * Tue Mar 13 2007 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-41
 - Fix potential segfault when no rpmloc_path (#231146)
 - Fix debugedit for relative paths (#232222)



From fedora-cvs-commits at redhat.com  Wed Apr  4 13:17:17 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 09:17:17 -0400
Subject: rpms/rpm/devel rpm-4.4.2-no-ppc-asm.patch,NONE,1.1
Message-ID: <200704041317.l34DHHRd032071@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32012

Added Files:
	rpm-4.4.2-no-ppc-asm.patch 
Log Message:
Remove ppc64 inline asm (#233145)

rpm-4.4.2-no-ppc-asm.patch:
 rpmrc.c |   21 ---------------------
 1 files changed, 21 deletions(-)

--- NEW FILE rpm-4.4.2-no-ppc-asm.patch ---
--- rpm-4.3.3/lib/rpmrc.c.asm	2005-09-19 13:17:02.000000000 -0400
+++ rpm-4.3.3/lib/rpmrc.c	2005-09-19 13:17:23.000000000 -0400
@@ -1278,27 +1278,6 @@
 	}
 #	endif
 
-#	if defined(__linux__) && defined(__powerpc__)
-	{
-	    unsigned pvr = 0;
-	    __sighandler_t oldh = signal(SIGILL, mfspr_ill);
-	    if (setjmp(mfspr_jmpbuf) == 0) {
-		__asm__ __volatile__ ("mfspr %0, 287" : "=r" (pvr));
-	    }
-	    signal(SIGILL, oldh);
-
-	    if ( pvr ) {
-		pvr >>= 16;
-		if ( pvr >= 0x40)
-		    strcpy(un.machine, "ppcpseries");
-		else if ( (pvr == 0x36) || (pvr == 0x37) )
-		    strcpy(un.machine, "ppciseries");
-		else
-		    strcpy(un.machine, "ppc");
-	    }
-	}
-#	endif
-
 	/* the uname() result goes through the arch_canon table */
 	canon = lookupInCanonTable(un.machine,
 				   tables[RPM_MACHTABLE_INSTARCH].canons,



From fedora-cvs-commits at redhat.com  Wed Apr  4 13:28:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 09:28:09 -0400
Subject: rpms/lftp/FC-6 .cvsignore, 1.28, 1.29 lftp.spec, 1.55, 1.56 sources,
	1.28, 1.29
Message-ID: <200704041328.l34DS9Js008184@cvs.devel.redhat.com>

Author: mbarabas

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

Modified Files:
	.cvsignore lftp.spec sources 
Log Message:
Upgrade to 3.5.9 ver. from upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/lftp/FC-6/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	17 Jul 2006 20:02:04 -0000	1.28
+++ .cvsignore	4 Apr 2007 13:28:07 -0000	1.29
@@ -1,20 +1 @@
-lftp-3.2.1.tar.bz2
-lftp-3.3.0.tar.bz2
-lftp-3.3.0.tar.bz2.asc
-String-CRC32-1.3.tar.gz
-lftp-3.3.1.tar.gz
-lftp-3.2.1.tar.bz2.asc
-lftp-3.3.1-3.3.2.diff.gz
-lftp-3.3.3.tar.bz2
-lftp-3.3.5.tar.bz2
-lftp-3.3.5.tar.bz2.asc
-lftp-3.4.0.tar.bz2
-lftp-3.4.0.tar.bz2.asc
-lftp-3.4.1.tar.bz2
-lftp-3.4.2.tar.bz2
-lftp-3.4.3.tar.gz
-lftp-3.4.3.tar.bz2
-lftp-3.4.4.tar.bz2
-lftp-3.4.6.tar.bz2
-lftp-3.4.7.tar.bz2
-lftp-3.5.1.tar.bz2
+lftp-3.5.9.tar.bz2


Index: lftp.spec
===================================================================
RCS file: /cvs/dist/rpms/lftp/FC-6/lftp.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- lftp.spec	23 Aug 2006 08:43:34 -0000	1.55
+++ lftp.spec	4 Apr 2007 13:28:07 -0000	1.56
@@ -1,17 +1,14 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
-Version: 	3.5.1
-Release: 	2%{?dist}
+Version: 	3.5.9
+Release: 	0%{?dist}
 License: 	GPL
 Group: 		Applications/Internet
-Source0: 	http://ftp.yars.free.net/lftp/lftp-%{version}.tar.bz2
+Source0: 	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.bz2
 URL: 		http://lftp.yar.ru/
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
 BuildRequires: 	ncurses-devel, openssl-devel, pkgconfig, readline-devel, autoconf, automake, libtool
 Requires:    	perl-String-CRC32
-Patch173276: 	lftp-3.3.5-bz173276.patch
-Patch2:		lftp-3.4.1-dont_core.patch
-Patch181694:    lftp-3.4.2-fix-redirect-coredump.patch
 
 %description
 LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
@@ -21,12 +18,6 @@
 
 %prep
 %setup -q
-#%patch173276 -p1 -b .bz173276
-#^- now fixed upstream
-#%patch2 -p1 -b .dont_core
-#^- now fixed upstream
-#%patch181694 -p1 -b .bz181694
-#^- now fixed upstream
 
 %build
 if pkg-config openssl ; then
@@ -84,8 +75,13 @@
 %{_libdir}/lftp/%{version}/proto-ftp.so
 %{_libdir}/lftp/%{version}/proto-http.so
 %{_libdir}/lftp/%{version}/proto-sftp.so
+%{_libdir}/lftp/%{version}/liblftp-getdate.so
 
 %changelog
+* Wed Apr 04 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.9
+- Upgrade to 3.5.9 from upstream 
+- Resolves #211483
+
 * Wed Aug 23 2006 Maros Barabas	<mbarabas at redhat.com> - 3.5.1-2
 - remove .a & .la from libdir
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/lftp/FC-6/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	17 Jul 2006 20:02:05 -0000	1.28
+++ sources	4 Apr 2007 13:28:07 -0000	1.29
@@ -1 +1 @@
-c6d48782cdad4759000bf7cd24555723  lftp-3.5.1.tar.bz2
+242aa0b01be79942bb9bcdd2a4b079ba  lftp-3.5.9.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr  4 13:30:33 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 09:30:33 -0400
Subject: rpms/redhat-artwork/devel redhat-artwork.spec,1.176,1.177
Message-ID: <200704041330.l34DUX0j009969@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	redhat-artwork.spec 
Log Message:
fix broken symlink



Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- redhat-artwork.spec	28 Mar 2007 16:55:42 -0000	1.176
+++ redhat-artwork.spec	4 Apr 2007 13:30:31 -0000	1.177
@@ -4,7 +4,7 @@
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
 Version: 5.0.12
-Release: 2%{?dist} 
+Release: 3%{?dist} 
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
@@ -370,7 +370,7 @@
 # save some space
 pushd $RPM_BUILD_ROOT%{_datadir}/apps/kdm/themes/FedoraFlyingHigh
   rm -f background.jpg
-  ln -s ../../../../gdm/themes/FedoraDNA/background.jpg .
+  ln -s ../../../../gdm/themes/FedoraFlyingHigh/background.jpg .
 popd
 
 %clean
@@ -404,6 +404,9 @@
 %config %{_sysconfdir}/gtk-2.0/gtkrc
 
 %changelog
+* Wed Apr 04 2007 Than Ngo <than at redhat.com> - 5.0.12-3
+- fix broken symlink
+
 * Wed Mar 28 2007 Matthias Clasen <mclasen at redhat.com> 5.0.12-2
 - Save some space by linking identical backgrounds
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 13:40:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 09:40:31 -0400
Subject: rpms/bzip2/devel bzip2.spec,1.29,1.30
Message-ID: <200704041340.l34DeVqC011046@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/bzip2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11027

Modified Files:
	bzip2.spec 
Log Message:
- remove useless -p 



Index: bzip2.spec
===================================================================
RCS file: /cvs/dist/rpms/bzip2/devel/bzip2.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- bzip2.spec	15 Mar 2007 14:00:20 -0000	1.29
+++ bzip2.spec	4 Apr 2007 13:40:29 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: A file compression utility
 Name: bzip2
 Version: 1.0.4
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: BSD
 Group: Applications/File
 URL: http://www.bzip.org/
@@ -64,11 +64,10 @@
 mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_libdir},%{_includedir}}
 cp -p bzlib.h $RPM_BUILD_ROOT%{_includedir}
 # temporary for rpm
-install -p libbz2.a $RPM_BUILD_ROOT%{_libdir}
-install -p libbz2.so.%{version} $RPM_BUILD_ROOT%{_libdir}
-install -p bzip2-shared  $RPM_BUILD_ROOT%{_bindir}/bzip2
-install -p bzip2recover bzgrep bzdiff bzmore  $RPM_BUILD_ROOT%{_bindir}/
-chmod 644 bzip2.1 bzdiff.1 bzgrep.1 bzmore.1 
+install -m 755 libbz2.a $RPM_BUILD_ROOT%{_libdir}
+install -m 755 libbz2.so.%{version} $RPM_BUILD_ROOT%{_libdir}
+install -m 755 bzip2-shared  $RPM_BUILD_ROOT%{_bindir}/bzip2
+install -m 755 bzip2recover bzgrep bzdiff bzmore  $RPM_BUILD_ROOT%{_bindir}/
 cp -p bzip2.1 bzdiff.1 bzgrep.1 bzmore.1  $RPM_BUILD_ROOT%{_mandir}/man1/
 ln -s bzip2 $RPM_BUILD_ROOT%{_bindir}/bunzip2
 ln -s bzip2 $RPM_BUILD_ROOT%{_bindir}/bzcat
@@ -109,6 +108,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Apr  4 2007 Ivana Varekova <varekova at redhat.com> 1.0.4-9
+- remove useless -p 
+
 * Thu Mar 15 2007 Ivana Varekova <varekova at redhat.com> 1.0.4-8
 - remove unnecessary "/" after RPM_BUILD_ROOT macro
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 13:49:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 09:49:42 -0400
Subject: rpms/hplip/devel hplip.spec,1.113,1.114
Message-ID: <200704041349.l34DngfE011348@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
1.7.2-3


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- hplip.spec	4 Apr 2007 10:41:09 -0000	1.113
+++ hplip.spec	4 Apr 2007 13:49:40 -0000	1.114
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 1.7.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -247,7 +247,7 @@
 exit 0
 
 %changelog
-* Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com>
+* Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-3
 - Fixed typo in marker-supply-low patch.
 
 * Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-2



From fedora-cvs-commits at redhat.com  Wed Apr  4 13:52:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 09:52:32 -0400
Subject: rpms/lftp/devel .cvsignore, 1.29, 1.30 lftp.spec, 1.56, 1.57 sources,
	1.29, 1.30
Message-ID: <200704041352.l34DqWZH011474@cvs.devel.redhat.com>

Author: mbarabas

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

Modified Files:
	.cvsignore lftp.spec sources 
Log Message:
Upgrade to new version from upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	19 Jan 2007 09:51:53 -0000	1.29
+++ .cvsignore	4 Apr 2007 13:52:30 -0000	1.30
@@ -1,21 +1 @@
-lftp-3.2.1.tar.bz2
-lftp-3.3.0.tar.bz2
-lftp-3.3.0.tar.bz2.asc
-String-CRC32-1.3.tar.gz
-lftp-3.3.1.tar.gz
-lftp-3.2.1.tar.bz2.asc
-lftp-3.3.1-3.3.2.diff.gz
-lftp-3.3.3.tar.bz2
-lftp-3.3.5.tar.bz2
-lftp-3.3.5.tar.bz2.asc
-lftp-3.4.0.tar.bz2
-lftp-3.4.0.tar.bz2.asc
-lftp-3.4.1.tar.bz2
-lftp-3.4.2.tar.bz2
-lftp-3.4.3.tar.gz
-lftp-3.4.3.tar.bz2
-lftp-3.4.4.tar.bz2
-lftp-3.4.6.tar.bz2
-lftp-3.4.7.tar.bz2
-lftp-3.5.1.tar.bz2
-lftp-3.5.9.tar.bz2
+lftp-3.5.10.tar.gz


Index: lftp.spec
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- lftp.spec	18 Jan 2007 18:51:52 -0000	1.56
+++ lftp.spec	4 Apr 2007 13:52:30 -0000	1.57
@@ -1,6 +1,6 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
-Version: 	3.5.9
+Version: 	3.5.10
 Release: 	1%{?dist}
 License: 	GPL
 Group: 		Applications/Internet
@@ -78,6 +78,9 @@
 %{_libdir}/lftp/%{version}/liblftp-getdate.so
 
 %changelog
+* Wed Apr 04 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.10
+- Upgrade to 3.5.10 from upstream
+
 * Thu Jan 18 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.9
 - Upgrade to 3.5.9 from upstream 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	19 Jan 2007 09:51:53 -0000	1.29
+++ sources	4 Apr 2007 13:52:30 -0000	1.30
@@ -1 +1 @@
-242aa0b01be79942bb9bcdd2a4b079ba  lftp-3.5.9.tar.bz2
+8ba21d5264224136eb3ab562a3150a3e  lftp-3.5.10.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr  4 13:55:05 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 09:55:05 -0400
Subject: rpms/bzip2/devel bzip2.spec,1.30,1.31
Message-ID: <200704041355.l34Dt58t011637@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/bzip2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11620

Modified Files:
	bzip2.spec 
Log Message:
- change libz.a permissions



Index: bzip2.spec
===================================================================
RCS file: /cvs/dist/rpms/bzip2/devel/bzip2.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- bzip2.spec	4 Apr 2007 13:40:29 -0000	1.30
+++ bzip2.spec	4 Apr 2007 13:55:03 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: A file compression utility
 Name: bzip2
 Version: 1.0.4
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: BSD
 Group: Applications/File
 URL: http://www.bzip.org/
@@ -64,7 +64,7 @@
 mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_libdir},%{_includedir}}
 cp -p bzlib.h $RPM_BUILD_ROOT%{_includedir}
 # temporary for rpm
-install -m 755 libbz2.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644 libbz2.a $RPM_BUILD_ROOT%{_libdir}
 install -m 755 libbz2.so.%{version} $RPM_BUILD_ROOT%{_libdir}
 install -m 755 bzip2-shared  $RPM_BUILD_ROOT%{_bindir}/bzip2
 install -m 755 bzip2recover bzgrep bzdiff bzmore  $RPM_BUILD_ROOT%{_bindir}/
@@ -108,6 +108,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Apr  4 2007 Ivana Varekova <varekova at redhat.com> 1.0.4-10
+- change libz.a permissions
+
 * Wed Apr  4 2007 Ivana Varekova <varekova at redhat.com> 1.0.4-9
 - remove useless -p 
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 13:58:20 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 09:58:20 -0400
Subject: rpms/xsane/FC-6 xsane-0.994-showeulaonce.patch, NONE, 1.1 xsane.spec,
	1.43, 1.44
Message-ID: <200704041358.l34DwKbj012196@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	xsane.spec 
Added Files:
	xsane-0.994-showeulaonce.patch 
Log Message:
save prefs when EULA is accepted to ensure that EULA is only shown once at startup (#233645)


xsane-0.994-showeulaonce.patch:
 xsane.c |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE xsane-0.994-showeulaonce.patch ---
--- xsane-0.994/src/xsane.c.showeulaonce	2007-02-25 23:21:06.000000000 +0100
+++ xsane-0.994/src/xsane.c	2007-04-04 15:03:33.000000000 +0200
@@ -5825,6 +5825,11 @@
       DBG(DBG_info, "user did not accept eula, we abort\n");
       return 1; /* User did not accept eula */
     }
+    else
+    {
+        /* User did accept eula */
+        xsane_pref_save();
+    }
   }
 
   xsane_pref_restore_media();


Index: xsane.spec
===================================================================
RCS file: /cvs/dist/rpms/xsane/FC-6/xsane.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- xsane.spec	3 Apr 2007 15:56:33 -0000	1.43
+++ xsane.spec	4 Apr 2007 13:58:18 -0000	1.44
@@ -3,13 +3,14 @@
 Name: xsane
 Summary: X Window System front-end for the SANE scanner interface
 Version: 0.994
-Release: 1%{?dist}
+Release: 2%{?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.994-showeulaonce.patch
 License: GPL
 URL: http://www.xsane.org/
 Group: Applications/Multimedia
@@ -45,6 +46,7 @@
 %patch0 -p1 -b .htmlview
 %patch1 -p1 -b .medium-definitions
 %patch2 -p1 -b .gimp2.0
+%patch3 -p1 -b .showeulaonce
 
 %build
 %{expand:%%define optflags %{optflags} -DGIMP_ENABLE_COMPAT_CRUFT=1}
@@ -116,6 +118,10 @@
 fi
 
 %changelog
+* Wed Apr 04 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-2
+- save prefs when EULA is accepted to ensure that EULA is only shown once at
+  startup (#233645)
+
 * Tue Apr 03 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-1
 - version 0.994 (#235038)
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 14:18:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 10:18:01 -0400
Subject: rpms/hal-cups-utils/devel .cvsignore, 1.14, 1.15 hal-cups-utils.spec,
	1.51, 1.52 sources, 1.14, 1.15
Message-ID: <200704041418.l34EI1NX012777@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore hal-cups-utils.spec sources 
Log Message:
* Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com> 0.6.6-1
- Prevent a traceback in hal_lpadmin (bug #232733).
- Resolves: rhbz#232733



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	8 Jan 2007 17:08:58 -0000	1.14
+++ .cvsignore	4 Apr 2007 14:17:59 -0000	1.15
@@ -2,3 +2,4 @@
 hal-cups-utils-0.6.3.tar.gz
 hal-cups-utils-0.6.4.tar.gz
 hal-cups-utils-0.6.5.tar.gz
+hal-cups-utils-0.6.6.tar.gz


Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- hal-cups-utils.spec	8 Jan 2007 17:08:58 -0000	1.51
+++ hal-cups-utils.spec	4 Apr 2007 14:17:59 -0000	1.52
@@ -1,6 +1,6 @@
 Summary: Halified CUPS utilities 
 Name: hal-cups-utils
-Version: 0.6.5
+Version: 0.6.6
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
@@ -59,6 +59,9 @@
 %{_initrddir}/cups-config-daemon
 
 %changelog
+* Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com> 0.6.6-1
+- Prevent a traceback in hal_lpadmin (bug #232733).
+
 * Mon Jan  8 2007 Tim Waugh <twaugh at redhat.com> 0.6.5-1
 - Requires system-config-printer >= 0.7.46.
 - 0.6.5:


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	8 Jan 2007 17:08:58 -0000	1.14
+++ sources	4 Apr 2007 14:17:59 -0000	1.15
@@ -1 +1 @@
-c6c136608761159f9d2cc682ee2b1e8d  hal-cups-utils-0.6.5.tar.gz
+72065a8df3cfbe25a16dc3fcbde44f53  hal-cups-utils-0.6.6.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr  4 14:21:22 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 10:21:22 -0400
Subject: rpms/iptraf/devel iptraf, NONE, 1.1 iptraf-3.0.0-incltypes.patch,
	NONE, 1.1 iptraf.spec, 1.24, 1.25
Message-ID: <200704041421.l34ELMbo013045@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/iptraf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12965

Modified Files:
	iptraf.spec 
Added Files:
	iptraf iptraf-3.0.0-incltypes.patch 
Log Message:
Add patch, clean spec.



--- NEW FILE iptraf ---
# Logrotate file for iptraf
/var/log/iptraf/* {
	compress
	delaycompress
	missingok
	notifempty
	rotate 4
	create 0600 root root
}

iptraf-3.0.0-incltypes.patch:
 ifaces.c  |    1 +
 ifstats.c |    1 +
 serv.c    |    1 +
 3 files changed, 3 insertions(+)

--- NEW FILE iptraf-3.0.0-incltypes.patch ---
--- iptraf-3.0.0/src/ifstats.c.old	2007-04-03 15:12:40.000000000 +0200
+++ iptraf-3.0.0/src/ifstats.c	2007-04-03 15:13:00.000000000 +0200
@@ -26,6 +26,7 @@
 #include <time.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#include <linux/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <netinet/in.h>
--- iptraf-3.0.0/src/serv.c.old	2007-04-04 13:59:33.000000000 +0200
+++ iptraf-3.0.0/src/serv.c	2007-04-04 14:17:33.000000000 +0200
@@ -32,6 +32,7 @@
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/udp.h>
+#include <linux/types.h>
 #include <linux/if_packet.h>
 #include <linux/if_ether.h>
 #include <listbox.h>
--- iptraf-3.0.0/src/ifaces.c.old	2007-04-04 14:23:05.000000000 +0200
+++ iptraf-3.0.0/src/ifaces.c	2007-04-04 14:25:32.000000000 +0200
@@ -27,6 +27,7 @@
 #include <net/if.h>
 #include <fcntl.h>
 #include <string.h>
+#include <linux/types.h>
 #include <linux/if_packet.h>
 #include "links.h"
 #include "error.h"


Index: iptraf.spec
===================================================================
RCS file: /cvs/dist/rpms/iptraf/devel/iptraf.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- iptraf.spec	11 Dec 2006 10:30:21 -0000	1.24
+++ iptraf.spec	4 Apr 2007 14:21:20 -0000	1.25
@@ -1,8 +1,9 @@
-Summary: A console-based network monitoring utility.
+Summary: A console-based network monitoring utility
 Name: iptraf
 Version: 3.0.0
-Release: 5%{?dist}
-Source: ftp://iptraf.seul.org/pub/iptraf/%{name}-%{version}.tar.gz
+Release: 6%{?dist}
+Source0: ftp://iptraf.seul.org/pub/iptraf/%{name}-%{version}.tar.gz
+Source1: iptraf 
 URL: http://iptraf.seul.org/
 Patch0: iptraf-2.4.0-Makefile.patch
 Patch1: iptraf-2.7.0-install.patch
@@ -13,9 +14,11 @@
 Patch6: iptraf-3.0.0-longdev.patch
 Patch7: iptraf-3.0.0-compile.fix.patch
 Patch8: iptraf-3.0.0-in_trafic.patch
+Patch9: iptraf-3.0.0-incltypes.patch
+
 License: GPL
 Group: Applications/System
-BuildRoot: /var/tmp/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel
 
 %description
@@ -47,6 +50,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 make -C src CFLAGS="$RPM_OPT_FLAGS" \
@@ -69,23 +73,30 @@
 
 # remove everything besides the html and pictures in Documentation
 find Documentation -type f | grep -v '\.html$\|\.png$\|/stylesheet' | \
-	xargs rm -f
+    xargs rm -f
 rm -rf Documentation/.xvpics
+mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d/
+cp %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/iptraf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc CHANGES FAQ LICENSE INSTALL README* RELEASE-NOTES
 %doc Documentation
 %attr(755,root,root) %{_prefix}/bin/*
 %{_mandir}/*/*
-%dir %attr(700,root,root) /var/lock/iptraf
-%dir %attr(700,root,root) /var/log/iptraf
-%dir %attr(700,root,root) /var/lib/iptraf
+%dir %attr(755,root,root) /var/lock/iptraf
+%dir %attr(755,root,root) /var/log/iptraf
+%dir %attr(755,root,root) /var/lib/iptraf
+%dir %attr(644,root,root) %config(noreplace) /etc/logrotate.d/iptraf
 
 %changelog
+* Wed Apr  4 2007 Marcela Maslanova <mmaslano at redhat.com> - 3.0.0-6
+- merge review, add logrotate file
+- rhbz#225907
+
 * Mon Dec 11 2006 Marcela Maslanova <mmaslano at redhat.com> - 3.0.0-5
 - input traffic
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 14:28:37 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 10:28:37 -0400
Subject: rpms/rhythmbox/devel
	rhythmbox-0.10.0-xdg-user-dirs-no-autoconf.patch, NONE,
	1.1 .cvsignore, 1.27, 1.28 rhythmbox.spec, 1.105,
	1.106 sources, 1.29, 1.30 rhythmbox-0.9.7-use-icon-name.patch,
	1.1, NONE rhythmbox-0.9.8-magnatune-buy-confirmation.patch,
	1.2, NONE
Message-ID: <200704041428.l34ESb7o013492@cvs.devel.redhat.com>

Author: bnocera

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

Modified Files:
	.cvsignore rhythmbox.spec sources 
Added Files:
	rhythmbox-0.10.0-xdg-user-dirs-no-autoconf.patch 
Removed Files:
	rhythmbox-0.9.7-use-icon-name.patch 
	rhythmbox-0.9.8-magnatune-buy-confirmation.patch 
Log Message:
* Wed Apr 04 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-1.fc7
- Update to the stable branch 0.10.0, fixes a large number of crashers
- Add patch for xdg-user-dirs support


rhythmbox-0.10.0-xdg-user-dirs-no-autoconf.patch:
 lib/rb-file-helpers.c       |  134 +++++++++++++++++++++++++++++++++++++++++++-
 lib/rb-file-helpers.h       |    1 
 shell/rb-shell.c            |   29 ---------
 sources/rb-library-source.c |   15 +++-
 sources/rb-podcast-source.c |    3 
 widgets/rb-dialog.c         |    4 +
 6 files changed, 154 insertions(+), 32 deletions(-)

--- NEW FILE rhythmbox-0.10.0-xdg-user-dirs-no-autoconf.patch ---
Index: sources/rb-library-source.c
===================================================================
--- sources/rb-library-source.c	(revision 4982)
+++ sources/rb-library-source.c	(working copy)
@@ -281,6 +281,7 @@
 	RBLibrarySource *source;
 	RBShell *shell;
 	RBEntryView *songs;
+	GSList *list;
 
 	source = RB_LIBRARY_SOURCE (G_OBJECT_CLASS (rb_library_source_parent_class)
 			->constructor (type, n_construct_properties, construct_properties));
@@ -290,6 +291,16 @@
 
 	rb_library_source_ui_prefs_sync (source);
 
+	/* Set up the default library location if there's no library location set */
+	list = eel_gconf_get_string_list (CONF_LIBRARY_LOCATION);
+	if (g_slist_length (list) == 0) {
+		list = g_slist_prepend (list, g_strdup (rb_music_dir ()));
+		eel_gconf_set_string_list (CONF_LIBRARY_LOCATION, list);
+	} else {
+		g_slist_foreach (list, (GFunc) g_free, NULL);
+		g_slist_free (list);
+	}
+
 	source->priv->library_location_notify_id =
 		eel_gconf_notification_add (CONF_LIBRARY_LOCATION,
 				    (GConfClientNotifyFunc) rb_library_source_library_location_changed, source);
@@ -609,10 +620,6 @@
 	if (list)
 		g_slist_free (list);
 
-	/* don't do the first-run druid if the user sets the library location */
-	if (list)
-		eel_gconf_set_boolean (CONF_FIRST_TIME, TRUE);
-
 	return FALSE;
 }
 
Index: sources/rb-podcast-source.c
===================================================================
--- sources/rb-podcast-source.c	(revision 4982)
+++ sources/rb-podcast-source.c	(working copy)
@@ -1246,6 +1246,9 @@
 	source->priv->config_widget = glade_xml_get_widget (xml, "podcast_vbox");
 
 	btn_file = glade_xml_get_widget (xml, "location_chooser");
+	gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (btn_file),
+					      rb_music_dir (),
+					      NULL);
 	download_dir = rb_podcast_manager_get_podcast_dir (source->priv->podcast_mgr);
 	gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (btn_file),
 						 download_dir);
Index: lib/rb-file-helpers.c
===================================================================
--- lib/rb-file-helpers.c	(revision 4982)
+++ lib/rb-file-helpers.c	(working copy)
@@ -38,6 +38,7 @@
 static GHashTable *files = NULL;
 
 static char *dot_dir = NULL;
+static char *music_dir = NULL;
 
 const char *
 rb_file (const char *filename)
@@ -90,6 +91,137 @@
 	return dot_dir;
 }
 
+/* Copied from xdg-user-dir-lookup.c */
+#include <stdlib.h>
+
+static char *
+xdg_user_dir_lookup (const char *type)
+{
+  FILE *file;
+  char *home_dir, *config_home, *config_file;
+  char buffer[512];
+  char *user_dir;
+  char *p, *d;
+  int len;
+  int relative;
+  
+  home_dir = getenv ("HOME");
+
+  if (home_dir == NULL)
+    return strdup ("/tmp");
+
+  config_home = getenv ("XDG_CONFIG_HOME");
+  if (config_home == NULL || config_home[0] == 0)
+    {
+      config_file = malloc (strlen (home_dir) + strlen ("/.config/user-dirs.dirs") + 1);
+      strcpy (config_file, home_dir);
+      strcat (config_file, "/.config/user-dirs.dirs");
+    }
+  else
+    {
+      config_file = malloc (strlen (config_home) + strlen ("/user-dirs.dirs") + 1);
+      strcpy (config_file, config_home);
+      strcat (config_file, "/user-dirs.dirs");
+    }
+
+  file = fopen (config_file, "r");
+  free (config_file);
+  if (file == NULL)
+    goto error;
+
+  user_dir = NULL;
+  while (fgets (buffer, sizeof (buffer), file))
+    {
+      /* Remove newline at end */
+      len = strlen (buffer);
+      if (len > 0 && buffer[len-1] == '\n')
+	buffer[len-1] = 0;
+      
+      p = buffer;
+      while (*p == ' ' || *p == '\t')
+	p++;
+      
+      if (strncmp (p, "XDG_", 4) != 0)
+	continue;
+      p += 4;
+      if (strncmp (p, type, strlen (type)) != 0)
+	continue;
+      p += strlen (type);
+      if (strncmp (p, "_DIR", 4) != 0)
+	continue;
+      p += 4;
+
+      while (*p == ' ' || *p == '\t')
+	p++;
+
+      if (*p != '=')
+	continue;
+      p++;
+      
+      while (*p == ' ' || *p == '\t')
+	p++;
+
+      if (*p != '"')
+	continue;
+      p++;
+      
+      relative = 0;
+      if (strncmp (p, "$HOME/", 6) == 0)
+	{
+	  p += 6;
+	  relative = 1;
+	}
+      else if (*p != '/')
+	continue;
+      
+      if (relative)
+	{
+	  user_dir = malloc (strlen (home_dir) + 1 + strlen (p) + 1);
+	  strcpy (user_dir, home_dir);
+	  strcat (user_dir, "/");
+	}
+      else
+	{
+	  user_dir = malloc (strlen (p) + 1);
+	  *user_dir = 0;
+	}
+      
+      d = user_dir + strlen (user_dir);
+      while (*p && *p != '"')
+	{
+	  if ((*p == '\\') && (*(p+1) != 0))
+	    p++;
+	  *d++ = *p++;
+	}
+      *d = 0;
+    }  
+  fclose (file);
+
+  if (user_dir)
+    return user_dir;
+
+ error:
+  /* Special case desktop for historical compatibility */
+  if (strcmp (type, "DESKTOP") == 0)
+    {
+      user_dir = malloc (strlen (home_dir) + strlen ("/Desktop") + 1);
+      strcpy (user_dir, home_dir);
+      strcat (user_dir, "/Desktop");
+      return user_dir;
+    }
+  else
+    return strdup (home_dir);
+}
+
+const char *
+rb_music_dir (void)
+{
+	if (music_dir != NULL)
+		return (const char *) music_dir;
+	music_dir = xdg_user_dir_lookup ("MUSIC");
+	return (const char *) music_dir;
+}
+
 void
 rb_file_helpers_init (void)
 {
@@ -103,7 +235,7 @@
 rb_file_helpers_shutdown (void)
 {
 	g_hash_table_destroy (files);
-
+	g_free (music_dir);
 	g_free (dot_dir);
 }
 
Index: lib/rb-file-helpers.h
===================================================================
--- lib/rb-file-helpers.h	(revision 4982)
+++ lib/rb-file-helpers.h	(working copy)
@@ -29,6 +29,7 @@
 
 const char *	rb_file			(const char *filename);
 const char *	rb_dot_dir		(void);
+const char *	rb_music_dir		(void);
 
 char *		rb_canonicalise_uri	(const char *uri);
 
Index: shell/rb-shell.c
===================================================================
--- shell/rb-shell.c	(revision 4982)
+++ shell/rb-shell.c	(working copy)
@@ -60,7 +60,6 @@
 #include "rb-playlist-manager.h"
 #include "rb-removable-media-manager.h"
 #include "rb-preferences.h"
-#include "rb-druid.h"
 #include "rb-shell-clipboard.h"
 #include "rb-shell-player.h"
 #include "rb-source-header.h"
@@ -142,9 +141,6 @@
 					 const char *field,
 					 GValue *metadata,
 					 RBShell *shell);
-static void rb_shell_druid_response_cb (GtkDialog *druid,
-					guint response,
-					 RBShell *shell);
 
 static void rb_shell_playlist_added_cb (RBPlaylistManager *mgr, RBSource *source, RBShell *shell);
 static void rb_shell_playlist_created_cb (RBPlaylistManager *mgr, RBSource *source, RBShell *shell);
@@ -1407,21 +1403,9 @@
 	rb_shell_sync_paned (shell);
 	gtk_widget_show_all (GTK_WIDGET (shell->priv->tray_icon));
 
-	/* Stop here if this is the first time. */
-	if (!eel_gconf_get_boolean (CONF_FIRST_TIME)) {
-		RBDruid *druid;
-		druid = rb_druid_new (shell->priv->db);
-		g_signal_connect (G_OBJECT (druid),
-				  "response",
-				  G_CALLBACK (rb_shell_druid_response_cb),
-				  shell);
+	rb_shell_set_visibility (shell, eel_gconf_get_boolean (CONF_STATE_WINDOW_VISIBLE), TRUE);
+	gdk_notify_startup_complete ();
 
-		gtk_widget_show_all (GTK_WIDGET (druid));
-	} else {
-		rb_shell_set_visibility (shell, eel_gconf_get_boolean (CONF_STATE_WINDOW_VISIBLE), TRUE);
-		gdk_notify_startup_complete ();
-	}
-
 	/* focus play if small, the entry view if not */
 	if (shell->priv->window_small) {
 		GtkWidget *play_button;
@@ -3528,15 +3512,6 @@
 
 }
 
-static void
-rb_shell_druid_response_cb (GtkDialog *druid,
-			    guint response,
-			    RBShell *shell)
-{
-	gtk_widget_show_all (GTK_WIDGET (shell->priv->window));
-	gtk_widget_destroy (GTK_WIDGET (druid));
-}
-
 static GtkBox*
 rb_shell_get_box_for_ui_location (RBShell *shell, RBShellUILocation location)
 {
Index: widgets/rb-dialog.c
===================================================================
--- widgets/rb-dialog.c	(revision 4982)
+++ widgets/rb-dialog.c	(working copy)
@@ -33,6 +33,7 @@
 #include <stdarg.h>
 
 #include "rb-dialog.h"
+#include "rb-file-helpers.h"
 #include "rb-stock-icons.h"
 
 void
@@ -104,6 +105,9 @@
 	}
 
 	gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog), local_only);
+	gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (dialog),
+					      rb_music_dir (),
+					      NULL);
 
 	if (parent != NULL) {
 		gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	21 Feb 2007 12:10:52 -0000	1.27
+++ .cvsignore	4 Apr 2007 14:28:34 -0000	1.28
@@ -1,2 +1 @@
-rhythmbox-0.9.7.tar.bz2
-rhythmbox-0.9.8.tar.bz2
+rhythmbox-0.10.0.tar.bz2


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- rhythmbox.spec	28 Mar 2007 15:08:43 -0000	1.105
+++ rhythmbox.spec	4 Apr 2007 14:28:34 -0000	1.106
@@ -2,8 +2,8 @@
 
 Name: rhythmbox
 Summary: Music Management Application 
-Version: 0.9.8
-Release: 4%{?dist}
+Version: 0.10.0
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -42,7 +42,7 @@
 
 ExcludeArch:    s390 s390x
 
-Patch0: rhythmbox-0.9.8-magnatune-buy-confirmation.patch
+Patch0: rhythmbox-0.10.0-xdg-user-dirs-no-autoconf.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -53,7 +53,7 @@
 %prep
 %setup -q
 
-%patch0 -p2 -b .magnatune
+%patch0 -p0 -b .xdg-user-dirs
 
 %build
 
@@ -145,6 +145,10 @@
 %{_libexecdir}/rhythmbox-metadata
 
 %changelog
+* Wed Apr 04 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-1.fc7
+- Update to the stable branch 0.10.0, fixes a large number of crashers
+- Add patch for xdg-user-dirs support
+
 * Wed Mar 28 2007 - Bastien Nocera <bnocera at redhat.com> - 0.9.8-4.fc7
 - Add upstream patch for bug 234216
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	21 Feb 2007 12:10:52 -0000	1.29
+++ sources	4 Apr 2007 14:28:34 -0000	1.30
@@ -1 +1 @@
-648400feb794538207b4fe95f0917d1f  rhythmbox-0.9.8.tar.bz2
+0cbd4339aebc2be4ffc29aa70809f589  rhythmbox-0.10.0.tar.bz2


--- rhythmbox-0.9.7-use-icon-name.patch DELETED ---


--- rhythmbox-0.9.8-magnatune-buy-confirmation.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr  4 14:37:37 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 10:37:37 -0400
Subject: rpms/squid/FC-6 .cvsignore, 1.22, 1.23 sources, 1.27,
	1.28 squid.spec, 1.81, 1.82
Message-ID: <200704041437.l34EbbFV031659@cvs.devel.redhat.com>

Author: mbacovsk

Update of /cvs/dist/rpms/squid/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv31125

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
* Mon Apr  2 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE12-1
- update to the latest upsteram



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/squid/FC-6/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	30 Jan 2007 11:35:17 -0000	1.22
+++ .cvsignore	4 Apr 2007 14:37:34 -0000	1.23
@@ -1 +1 @@
-squid-2.6.STABLE9.tar.bz2
+squid-2.6.STABLE12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/squid/FC-6/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	30 Jan 2007 11:35:17 -0000	1.27
+++ sources	4 Apr 2007 14:37:34 -0000	1.28
@@ -1 +1 @@
-95997d6cb38fdb562ecb790c553f9cfc  squid-2.6.STABLE9.tar.bz2
+a830ccc95cb39cdfa5e5b773add0bb0d  squid-2.6.STABLE12.tar.bz2


Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/FC-6/squid.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- squid.spec	30 Jan 2007 11:35:17 -0000	1.81
+++ squid.spec	4 Apr 2007 14:37:34 -0000	1.82
@@ -4,7 +4,7 @@
 
 Summary: The Squid proxy caching server.
 Name: squid
-Version: 2.6.STABLE9
+Version: 2.6.STABLE12
 Release: 1%{?dist}
 Epoch: 7
 License: GPL
@@ -161,7 +161,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc faq/* README ChangeLog QUICKSTART doc/*
 %doc contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
 
@@ -181,11 +181,12 @@
 %config(noreplace) /etc/sysconfig/squid
 %config(noreplace) /etc/squid/msntauth.conf
 %config(noreplace) /etc/squid/mib.txt
-/etc/squid/msntauth.conf.default
-/etc/squid/squid.conf.default
-/etc/squid/mime.conf.default
+%config /etc/squid/msntauth.conf.default
+%config /etc/squid/squid.conf.default
+%config /etc/squid/mime.conf.default
 
 %config(noreplace) /etc/squid/errors
+%dir %{_datadir}/squid
 %config(noreplace) %{_datadir}/squid/errors
 %config(noreplace) /etc/squid/icons
 %config(noreplace) /etc/rc.d/init.d/squid
@@ -324,7 +325,10 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
-* Tue Jan 30 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE9-1.fc7
+* Mon Apr  2 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE12-1
+- update to the latest upsteram
+
+* Tue Jan 30 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE9-1
 - update to the latest upstream
 
 * Sun Jan 14 2007 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE7-1



From fedora-cvs-commits at redhat.com  Wed Apr  4 14:45:54 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 10:45:54 -0400
Subject: rpms/lftp/devel lftp.spec,1.57,1.58
Message-ID: <200704041445.l34Ejs6X005543@cvs.devel.redhat.com>

Author: mbarabas

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

Modified Files:
	lftp.spec 
Log Message:
few fixes (merge review)


Index: lftp.spec
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- lftp.spec	4 Apr 2007 13:52:30 -0000	1.57
+++ lftp.spec	4 Apr 2007 14:45:52 -0000	1.58
@@ -1,14 +1,13 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
 Version: 	3.5.10
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPL
 Group: 		Applications/Internet
-Source0: 	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.bz2
+Source0: 	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.gz
 URL: 		http://lftp.yar.ru/
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
-BuildRequires: 	ncurses-devel, openssl-devel, pkgconfig, readline-devel, autoconf, automake, libtool
-Requires:    	perl-String-CRC32
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: 	ncurses-devel, openssl-devel, pkgconfig, readline-devel, autoconf, automake, libtool, gettext
 
 %description
 LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
@@ -16,6 +15,13 @@
 mirroring, and can transfer several files in parallel. It is designed with
 reliability in mind.
 
+%package devel
+Summary: Headers and static libraries for lftp development
+Group: Development/Libraries
+
+%description devel
+This package contains the header files, and static libraries for building lftp.
+
 %prep
 %setup -q
 
@@ -27,7 +33,7 @@
 LDFLAGS="-L`pwd`/src/.libs $LDFLAGS"; export LDFLAGS
 %configure --with-modules --disable-static --with-openssl=/usr --with-debug
 export tagname=CC
-make LIBTOOL=%{_bindir}/libtool
+make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags}
 
 %{?!DEBUG:  %define DEBUG 0}
 %if %{DEBUG}
@@ -37,7 +43,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 export tagname=CC
-%makeinstall LIBTOOL=%{_bindir}/libtool
+make LIBTOOL=%{_bindir}/libtool DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.la
 chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lftp/*
 chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.so
@@ -47,7 +53,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/liblftp-tasks.*a
 %find_lang %{name}
 %if %{DEBUG}
-/usr/lib/rpm/brp-compress
+%{_libdir}/rpm/brp-compress
 exit 0
 %endif
 :;
@@ -55,17 +61,26 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/sbin/chkconfig --add lftp
+/sbin/ldconfig
+
+%postun
+if [ "$1" = 0 ]; then
+/sbin/chkconfig --del lftp
+/sbin/ldconfig
+fi
+exit 0
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc BUGS COPYING ChangeLog FAQ FEATURES README* NEWS THANKS TODO
-%config %{_sysconfdir}/lftp.conf
+%config(noreplace) %{_sysconfdir}/lftp.conf
 %{_bindir}/*
 %{_mandir}/*/*
 %{_datadir}/lftp
 %dir %{_libdir}/lftp
 %dir %{_libdir}/lftp/%{version}
-%{_libdir}/liblftp-jobs*
-%{_libdir}/liblftp-tasks*
 %{_libdir}/lftp/%{version}/cmd-mirror.so
 %{_libdir}/lftp/%{version}/cmd-sleep.so
 %{_libdir}/lftp/%{version}/liblftp-network.so
@@ -77,7 +92,16 @@
 %{_libdir}/lftp/%{version}/proto-sftp.so
 %{_libdir}/lftp/%{version}/liblftp-getdate.so
 
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/liblftp-jobs*
+%{_libdir}/liblftp-tasks*
+
 %changelog
+* Wed Apr 04 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.10-2
+- Merge review fix
+- Resolves #225984
+
 * Wed Apr 04 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.10
 - Upgrade to 3.5.10 from upstream
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 14:47:35 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 10:47:35 -0400
Subject: rpms/kernel/FC-6 kernel-2.6.spec, 1.2942,
	1.2943 linux-2.6-xen-fix-profiling.patch, 1.1, NONE
Message-ID: <200704041447.l34ElZOY006863@cvs.devel.redhat.com>

Author: armbru

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-xen-fix-profiling.patch 
Log Message:
Xen kernel profiling fix is broken, back it out.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2942
retrieving revision 1.2943
diff -u -r1.2942 -r1.2943
--- kernel-2.6.spec	3 Apr 2007 21:39:24 -0000	1.2942
+++ kernel-2.6.spec	4 Apr 2007 14:47:33 -0000	1.2943
@@ -607,7 +607,6 @@
 
 Patch21008: linux-2.6-xen-fix-spinlock-when-removing-xennet-device.patch
 Patch21011: linux-2.6-xen-privcmd-range-check-hypercall-index.patch
-Patch21023: linux-2.6-xen-fix-profiling.patch
 Patch21024: linux-2.6-xen-netback-reenable-tx-queueing.patch
 Patch21027: linux-2.6-xen-avoid-touching-watchdog-when-gone-too-long.patch
 Patch21036: linux-2.6-xen-iscsi-oops-on-x86_64-xen-domu.patch
@@ -1349,7 +1348,6 @@
 
 %patch21008 -p1
 %patch21011 -p1
-%patch21023 -p1
 %patch21024 -p1
 %patch21027 -p1
 %patch21036 -p1
@@ -2288,6 +2286,9 @@
 %endif
 
 %changelog
+* Wed Apr  4 2007 Markus Armbruster <armbru at redhat.com>
+- Xen kernel profiling fix is broken, back it out.
+
 * Tue Apr  3 2007 Chuck Ebbert <cebbert at redhat.com>		1.2942
 - 2.6.20.5-rc1 plus two fixes for broken -rc1 patches.
 - Remove patches that are now in 20.5-rc1.
@@ -2295,7 +2296,7 @@
 - 2107: Disable PCI MSI and MMCONFIG by default,
   add options to enable them.
 
-* Mon Apr 02 2007 Markus Armbruster <armbru at redhat.com>
+* Mon Apr  2 2007 Markus Armbruster <armbru at redhat.com>
 - Xen kernel:
   >4G guest fix (Steven Rostedt )
   fix nosegneg detection (Rik van Riel )
@@ -2377,7 +2378,6 @@
   emulate PIT channels for vbios support (Stephen C. Tweedie )
   Race condition concerning VLAPIC interrupts (Bhavana Nagendra )
   emulation for accesses faulting on a page boundary (Stephen C. Tweedie )
-  oprofile on Intel CORE (Glauber de Oliveira Costa )
   make ballooning work right (xen part) (Rik van Riel )
   HVM crashes on IA32e SMP (Glauber de Oliveira Costa )
   Fix for SMP Xen guest slow boot issue on AMD systems (Bhavana Nagendra )


--- linux-2.6-xen-fix-profiling.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr  4 14:48:28 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 10:48:28 -0400
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.106,1.107
Message-ID: <200704041448.l34EmSO6007681@cvs.devel.redhat.com>

Author: bnocera

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

Modified Files:
	rhythmbox.spec 
Log Message:
* Wed Apr 04 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-2.fc7
- Use multiple CPUs to build, the upstream bug is fixed now



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- rhythmbox.spec	4 Apr 2007 14:28:34 -0000	1.106
+++ rhythmbox.spec	4 Apr 2007 14:48:26 -0000	1.107
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.10.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -69,9 +69,7 @@
       --with-gnome-keyring \
       --with-metadata-helper
 
-# FIXME http://bugzilla.gnome.org/show_bug.cgi?id=423771
-# make %{?_smp_mflags}
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -145,6 +143,9 @@
 %{_libexecdir}/rhythmbox-metadata
 
 %changelog
+* Wed Apr 04 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-2.fc7
+- Use multiple CPUs to build, the upstream bug is fixed now
+
 * Wed Apr 04 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-1.fc7
 - Update to the stable branch 0.10.0, fixes a large number of crashers
 - Add patch for xdg-user-dirs support



From fedora-cvs-commits at redhat.com  Wed Apr  4 14:49:55 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 10:49:55 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2309,
	1.2310 linux-2.6-xen-fix-profiling.patch, 1.1, NONE
Message-ID: <200704041449.l34EntpJ008802@cvs.devel.redhat.com>

Author: armbru

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-xen-fix-profiling.patch 
Log Message:
Xen kernel profiling fix is broken, back it out.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2309
retrieving revision 1.2310
diff -u -r1.2309 -r1.2310
--- kernel-2.6.spec	3 Apr 2007 16:27:49 -0000	1.2309
+++ kernel-2.6.spec	4 Apr 2007 14:49:53 -0000	1.2310
@@ -510,7 +510,6 @@
 
 Patch21008: linux-2.6-xen-fix-spinlock-when-removing-xennet-device.patch
 Patch21011: linux-2.6-xen-privcmd-range-check-hypercall-index.patch
-Patch21023: linux-2.6-xen-fix-profiling.patch
 Patch21024: linux-2.6-xen-netback-reenable-tx-queueing.patch
 Patch21027: linux-2.6-xen-avoid-touching-watchdog-when-gone-too-long.patch
 Patch21036: linux-2.6-xen-iscsi-oops-on-x86_64-xen-domu.patch
@@ -1125,7 +1124,6 @@
 
 %patch21008 -p1
 %patch21011 -p1
-%patch21023 -p1
 %patch21024 -p1
 %patch21027 -p1
 %patch21036 -p1
@@ -1866,6 +1864,9 @@
 %endif
 
 %changelog
+* Wed Apr  4 2007 Markus Armbruster <armbru at redhat.com>
+- Xen kernel profiling fix is broken, back it out.
+
 * Tue Apr  3 2007 Chuck Ebbert <cebbert at redhat.com>		1.2309
 - 2.6.20.4 final.
 - Add Marvell PATA driver.


--- linux-2.6-xen-fix-profiling.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr  4 15:10:38 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 11:10:38 -0400
Subject: rpms/rhgb/devel .cvsignore, 1.23, 1.24 rhgb.spec, 1.70, 1.71 sources,
	1.24, 1.25
Message-ID: <200704041510.l34FAcYF024332@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/rhgb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24190

Modified Files:
	.cvsignore rhgb.spec sources 
Log Message:
- don't bail if /etc/mtab isn't around. Patch by Jeremy Katz
  <katzj at redhat.com>, bug 235146.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	3 Apr 2007 15:38:34 -0000	1.23
+++ .cvsignore	4 Apr 2007 15:10:31 -0000	1.24
@@ -1 +1 @@
-rhgb-0.17.4.tar.gz
+rhgb-0.17.5.tar.gz


Index: rhgb.spec
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/rhgb.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- rhgb.spec	3 Apr 2007 15:38:34 -0000	1.70
+++ rhgb.spec	4 Apr 2007 15:10:31 -0000	1.71
@@ -2,7 +2,7 @@
 
 Summary: Red Hat Graphical Boot
 Name: rhgb
-Version: 0.17.4
+Version: 0.17.5
 Release: 1%{?dist}
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
@@ -50,6 +50,10 @@
 %dir %{_sysconfdir}/rhgb/temp
 
 %changelog
+* Tue Apr  3 2007 Ray Strode <rstrode at redhat.com> - 0.17.5-1
+- don't bail if /etc/mtab isn't around. Patch by Jeremy Katz
+  <katzj at redhat.com>, bug 235146.
+
 * Tue Apr  3 2007 Ray Strode <rstrode at redhat.com> - 0.17.4-1
 - Fix some descriptions. Patch by Baris Cicek <baris at nerd.com.tr>
   bug 143954


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	3 Apr 2007 15:38:34 -0000	1.24
+++ sources	4 Apr 2007 15:10:31 -0000	1.25
@@ -1 +1 @@
-32d699eb360ff39fe82ff562c6ba7fe8  rhgb-0.17.4.tar.gz
+f1729b758443f122a8fc67b5d30b3f08  rhgb-0.17.5.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr  4 15:13:52 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 11:13:52 -0400
Subject: rpms/totem/devel .cvsignore, 1.38, 1.39 sources, 1.38,
	1.39 totem.spec, 1.99, 1.100
Message-ID: <200704041513.l34FDqtI027064@cvs.devel.redhat.com>

Author: bnocera

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26901

Modified Files:
	.cvsignore sources totem.spec 
Log Message:
* Wed Apr 04 2007 - Bastien Nocera <bnocera at redhat.com> - 2.18.1-1
- New upstream version with plenty of bug fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	9 Mar 2007 19:56:34 -0000	1.38
+++ .cvsignore	4 Apr 2007 15:13:50 -0000	1.39
@@ -1 +1 @@
-totem-2.18.0.tar.bz2
+totem-2.18.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	9 Mar 2007 19:56:34 -0000	1.38
+++ sources	4 Apr 2007 15:13:50 -0000	1.39
@@ -1 +1 @@
-1a3bfeaac6297b259967f5d79896b0e7  totem-2.18.0.tar.bz2
+c8faa37112cfd2edfebdd1df88519f36  totem-2.18.1.tar.bz2


Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- totem.spec	9 Mar 2007 19:51:58 -0000	1.99
+++ totem.spec	4 Apr 2007 15:13:50 -0000	1.100
@@ -4,7 +4,7 @@
 
 Summary: Movie player for GNOME 2
 Name: totem
-Version: 2.18.0
+Version: 2.18.1
 Release: 1%{?dist} 
 License: GPL
 Group: Applications/Multimedia
@@ -201,6 +201,9 @@
 %{_libdir}/*so
 
 %changelog
+* Wed Apr 04 2007 - Bastien Nocera <bnocera at redhat.com> - 2.18.1-1
+- New upstream version with plenty of bug fixes
+
 * Fri Mar 09 2007 - Bastien Nocera <bnocera at redhat.com> - 2.18.0-1
 - Update to 2.18.0
 - Update GStreamer base plugins requirements to get some "codec-buddy"



From fedora-cvs-commits at redhat.com  Wed Apr  4 15:40:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 11:40:53 -0400
Subject: rpms/vte/devel vte-0.16.0-unicode-input-crash.patch, NONE,
	1.1 vte.spec, 1.106, 1.107
Message-ID: <200704041540.l34Ferpn006647@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/vte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6615

Modified Files:
	vte.spec 
Added Files:
	vte-0.16.0-unicode-input-crash.patch 
Log Message:
- Add upstream patch from ickle to fix unicode input crash 
  (#235160)


vte-0.16.0-unicode-input-crash.patch:
 vte.c |   12 ------------
 1 files changed, 12 deletions(-)

--- NEW FILE vte-0.16.0-unicode-input-crash.patch ---
--- vte-0.16.0/src/vte.c.unicode-input-crash	2007-04-04 11:40:19.000000000 -0400
+++ vte-0.16.0/src/vte.c	2007-04-04 11:40:19.000000000 -0400
@@ -10103,18 +10103,6 @@
 							FALSE,
 							TRUE,
 							width, height);
-			} else
-			if (preedit_cursor == len) {
-				/* Empty cursor at the end. */
-				vte_terminal_draw_cells(terminal,
-							&items[len], 1,
-							back, fore, TRUE, TRUE,
-							FALSE,
-							FALSE,
-							FALSE,
-							FALSE,
-							FALSE,
-							width, height);
 			}
 			g_free(items);
 		}


Index: vte.spec
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- vte.spec	27 Mar 2007 00:22:44 -0000	1.106
+++ vte.spec	4 Apr 2007 15:40:51 -0000	1.107
@@ -1,6 +1,6 @@
 Name: vte
 Version: 0.16.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: A terminal emulator
 License: LGPL
 Group: User Interface/X
@@ -9,6 +9,10 @@
 Patch0: vte-0.16-redraw-race.patch
 # fixed in upstream svn
 Patch1: vte-0.16.0-transparent.patch
+
+# http://bugzilla.gnome.org/show_bug.cgi?id=418588
+Patch2: vte-0.16.0-unicode-input-crash.patch
+
 BuildRequires: gtk2-devel, pygtk2-devel, python-devel, ncurses-devel
 BuildRequires: gettext
 BuildRequires: libXt-devel
@@ -34,6 +38,7 @@
 %setup -q
 %patch0 -p0 -b .redraw-race
 %patch1 -p1 -b .transparent
+%patch2 -p1 -b .unicode-input-crash
 
 %build
 PYTHON=%{_bindir}/python`%{__python} -c "import sys ; print sys.version[:3]"`
@@ -106,6 +111,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Apr  4 2007 Ray Strode <rstrode at redhat.com> 0.16.0-4
+- Add upstream patch from ickle to fix unicode input crash 
+  (#235160)
+
 * Mon Mar 26 2007 Matthias Clasen <mclasen at redhat.com> 0.16.0-3
 - Add a patch to fix transparency (#232781)
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 16:06:22 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 12:06:22 -0400
Subject: rpms/newt/devel newt-0.52.6-entry.patch, NONE, 1.1 newt.spec, 1.46,
	1.47
Message-ID: <200704041606.l34G6Mqh007942@cvs.devel.redhat.com>

Author: mlichvar

Update of /cvs/dist/rpms/newt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7897

Modified Files:
	newt.spec 
Added Files:
	newt-0.52.6-entry.patch 
Log Message:
- fix entry scrolling (#234829)
- fix multibyte character handling in entry
Resolves: #234829


newt-0.52.6-entry.patch:
 entry.c |  120 +++++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 67 insertions(+), 53 deletions(-)

--- NEW FILE newt-0.52.6-entry.patch ---
Index: entry.c
===================================================================
RCS file: /usr/local/CVS/newt/entry.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- entry.c	11 Oct 2006 15:19:39 -0000	1.40
+++ entry.c	4 Apr 2007 15:17:51 -0000	1.41
@@ -25,6 +25,8 @@
     void * filterData;
 };
 
+static int previous_char(const char *buf, int pos);
+static int next_char(const char *buf, int pos);
 static void entryDraw(newtComponent co);
 static void entryDestroy(newtComponent co);
 static struct eventResult entryEvent(newtComponent co,
@@ -103,6 +105,11 @@
 	strcpy(en->buf, initialValue);
 	en->bufUsed = strlen(initialValue);
 	en->cursorPosition = en->bufUsed;
+
+	/* move cursor back if entry is full */
+	if (en->cursorPosition && !(en->flags & NEWT_FLAG_SCROLL ||
+		    wstrlen(en->buf, -1) < co->width))
+	    en->cursorPosition = previous_char(en->buf, en->cursorPosition);
     } else {
 	*en->buf = '\0';
 	en->bufUsed = 0;
@@ -112,39 +119,57 @@
     return co;
 }
 
-static int visible_width(const char *str, int start, int end)
-{
-    int width = wstrlen(str + start, end-start);
-    int len, w = 0;
-    wchar_t wc;
-
-    len = mbtowc(&wc, str+end, MB_CUR_MAX);
-    if (len == 0)
-       w = 1;
-    else if (len > 0)
-       w = wcwidth(wc);
-    return width + w;
-}
-
 static void scroll(struct entry *en, int width)
 {
-    wchar_t wc;
-    int len, w;
-    int  newwidth = visible_width(en->buf, en->firstChar, en->cursorPosition);
-
-    while (newwidth > width) {
-        len = mbtowc(&wc, en->buf+en->firstChar, MB_CUR_MAX);
-	if (!len) {
-		en->firstChar++;
-		break;
-	}
-	if (len < 0)
-	   break;
-	w = wcwidth(wc);
-	if (w < 0)
-	   break;
-	en->firstChar += len;
-	newwidth -= w;
+    int r, lv, rv, cntx, cw, cn, nc, pc, ncw, pcw;
+
+    if (width <= 1) {
+	en->firstChar = en->cursorPosition;
+	return;
+    }
+
+    cntx = width / 4;
+    if (cntx > 5)
+	cntx = 5;
+
+    if (en->cursorPosition < en->firstChar)
+	en->firstChar = en->cursorPosition;
+
+    cn = next_char(en->buf, en->cursorPosition);
+    cw = en->cursorPosition >= en->bufUsed ? 1 :
+	wstrlen(en->buf + en->cursorPosition, cn - en->cursorPosition);
+
+    r = wstrlen(en->buf + cn, -1);
+
+    lv = wstrlen(en->buf + en->firstChar, en->cursorPosition - en->firstChar);
+    rv = width - lv - cw;
+
+#define RC (ncw > 0 && (r > rv && lv - ncw >= cntx && rv < cntx))
+#define LC (pcw > 0 && (r + pcw <= rv || (lv < cntx && rv - pcw >= cntx)))
+
+    nc = next_char(en->buf, en->firstChar);
+    ncw = wstrlen(en->buf + en->firstChar, nc - en->firstChar);
+    if (RC) {
+	do {
+	    lv -= ncw;
+	    rv += ncw;
+	    en->firstChar = nc;
+	    nc = next_char(en->buf, en->firstChar);
+	    ncw = wstrlen(en->buf + en->firstChar, nc - en->firstChar);
+	} while (RC);
+	return;
+    }
+
+    pc = previous_char(en->buf, en->firstChar);
+    pcw = wstrlen(en->buf + pc, en->firstChar - pc);
+    if (LC) {
+	do {
+	    lv += pcw;
+	    rv -= pcw;
+	    en->firstChar = pc;
+	    pc = previous_char(en->buf, en->firstChar);
+	    pcw = wstrlen(en->buf + pc, en->firstChar - pc);
+	} while (LC);
     }
 }
 
@@ -171,13 +196,8 @@
 	return;
     }
 
-    if (en->cursorPosition < en->firstChar) {
-	/* scroll to the left */
-	en->firstChar = en->cursorPosition;
-    } else {
-	/* scroll to the right */
-	scroll(en, co->width);
-    }
+    /* scroll if necessary */
+    scroll(en, co->width);
 
     chptr = en->buf + en->firstChar;
 
@@ -317,17 +337,15 @@
 static int next_char(const char *buf, int pos)
 {
     int len = mblen(buf + pos, MB_CUR_MAX);
-    if (len < 0)
+    if (len <= 0)
        return pos;
-    if (len == 0)
-       return ++pos;
     return pos+len;
 }
 
 static struct eventResult entryHandleKey(newtComponent co, int key) {
     struct entry * en = co->data;
     struct eventResult er;
-    char * chptr, * insPoint;
+    char * chptr;
 
     er.result = ER_SWALLOWED;
     switch (key) {
@@ -430,7 +448,7 @@
 		s[i] = SLang_getkey();
 	    }
 
-	    if (!i || !(en->flags & NEWT_FLAG_SCROLL) && wstrlen(en->buf, -1) >= co->width) {
+	    if (!i || (!(en->flags & NEWT_FLAG_SCROLL) && wstrlen(en->buf, -1) + wstrlen(s, i) > co->width)) {
 		/* FIXME this is broken */
 		SLtt_beep();
 		break;
@@ -440,20 +458,12 @@
 		en->bufAlloced += 20;
 		en->buf = realloc(en->buf, en->bufAlloced);
 		if (en->resultPtr) *en->resultPtr = en->buf;
-		memset(en->buf + en->bufUsed + 1, 0, 20);
+		memset(en->buf + en->bufAlloced - 20, 0, 20);
 	    }
 
 	    if (en->cursorPosition != en->bufUsed) {
 		/* insert the new character */
-
-		/* chptr is the last character in the string */
-		chptr = (en->buf + en->bufUsed) - 2 + i;
-		insPoint = en->buf + en->cursorPosition;
-
-		while (chptr >= insPoint) {
-		    *(chptr + i) = *chptr;
-		    chptr--;
-		}
+		memmove(en->buf + en->cursorPosition + i, en->buf + en->cursorPosition, en->bufUsed - en->cursorPosition);
 	    }
 	    en->bufUsed += i;
 	    for (l = 0; l < i; l++)
@@ -462,6 +472,10 @@
 	    er.result = ER_IGNORED;
 	}
     }
+
+    if (en->cursorPosition == en->bufUsed && en->cursorPosition &&
+	    !(en->flags & NEWT_FLAG_SCROLL || wstrlen(en->buf, -1) < co->width))
+	en->cursorPosition = previous_char(en->buf, en->cursorPosition);
 
     entryDraw(co);
 


Index: newt.spec
===================================================================
RCS file: /cvs/dist/rpms/newt/devel/newt.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- newt.spec	2 Mar 2007 13:26:50 -0000	1.46
+++ newt.spec	4 Apr 2007 16:06:20 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: A development library for text mode user interfaces
 Name: newt
 Version: 0.52.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 # The source for this package was pulled from upstream's vcs.  Use the
@@ -12,6 +12,7 @@
 BuildRequires: python, python-devel, slang-devel
 Provides: snack = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1: newt-0.52.6-entry.patch
 
 %package devel
 Summary: Newt windowing toolkit development files
@@ -49,6 +50,7 @@
 
 %prep
 %setup -q
+%patch1 -p0 -b .entry
 
 %build
 # gpm support seems to smash the stack w/ we use help in anaconda??
@@ -88,6 +90,10 @@
 %{_libdir}/libnewt.a
 
 %changelog
+* Wed Apr 04 2007 Miroslav Lichvar <mlichvar at redhat.com> - 0.52.6-2
+- fix entry scrolling (#234829)
+- fix multibyte character handling in entry
+
 * Fri Mar 02 2007 Miroslav Lichvar <mlichvar at redhat.com> - 0.52.6-1
 - add newtSetColor() to allow changing individual colors
 - add newtPopWindowNoRefresh() (patch by Forest Bond)



From fedora-cvs-commits at redhat.com  Wed Apr  4 16:28:44 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 12:28:44 -0400
Subject: rpms/gnome-panel/devel
	gnome-panel-2.18.0-fix-name-too-long-error.patch, NONE,
	1.1 gnome-panel.spec, 1.191, 1.192
Message-ID: <200704041628.l34GSixc008299@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.18.0-fix-name-too-long-error.patch 
Log Message:
- Allow users to correct desktop launchers when given an 
  error initially (bug 233015)


gnome-panel-2.18.0-fix-name-too-long-error.patch:
 panel-ditem-editor.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE gnome-panel-2.18.0-fix-name-too-long-error.patch ---
--- gnome-panel-2.18.0/gnome-panel/panel-ditem-editor.c.fix-name-too-long-error	2007-04-04 12:07:34.000000000 -0400
+++ gnome-panel-2.18.0/gnome-panel/panel-ditem-editor.c	2007-04-04 12:17:28.000000000 -0400
@@ -1331,7 +1331,9 @@
 				       _("Could not save launcher"),
 				       error->message);
 		g_error_free (error);
-
+		panel_util_key_file_set_string (dialog->priv->key_file, "Name", "");
+		panel_util_key_file_set_string (dialog->priv->key_file, "Comment", "");
+		panel_util_key_file_set_string (dialog->priv->key_file, "Icon", "");
 		return FALSE;
 	} else {
 		g_signal_emit (G_OBJECT (dialog),


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- gnome-panel.spec	3 Apr 2007 16:59:16 -0000	1.191
+++ gnome-panel.spec	4 Apr 2007 16:28:42 -0000	1.192
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.18.0
-Release: 6%{?dist} 
+Release: 7%{?dist} 
 URL: http://www.gnome.org
 Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.18/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -101,6 +101,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=425910
 Patch19: gnome-panel-2.18.0-update-clock-immediately.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=426281
+Patch20: gnome-panel-2.18.0-fix-name-too-long-error.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -135,6 +138,7 @@
 %patch17 -p0 -b .xdg-user-dirs
 %patch18 -p1 -b .hide-lock-menu-if-root
 %patch19 -p1 -b .update-clock-immediately
+%patch20 -p1 -b .fix-name-too-long-error
 
 . %{SOURCE4}
 
@@ -315,6 +319,10 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Apr  4 2007 Ray Strode <rstrode at redhat.com> - 2.18.0-7
+- Allow users to correct desktop launchers when given an 
+  error initially (bug 233015)
+
 * Tue Apr  3 2007 Ray Strode <rstrode at redhat.com> - 2.18.0-6
 - update the clock after timezone changes (bug 230832)
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 16:36:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 12:36:36 -0400
Subject: rpms/gnome-panel/devel
	gnome-panel-2.18.0-fix-name-too-long-error.patch, 1.1, 1.2
Message-ID: <200704041636.l34Gaajc025244@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-panel-2.18.0-fix-name-too-long-error.patch 
Log Message:
make patch actually apply


gnome-panel-2.18.0-fix-name-too-long-error.patch:
 panel-ditem-editor.c |    3 +++
 1 files changed, 3 insertions(+)

Index: gnome-panel-2.18.0-fix-name-too-long-error.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel-2.18.0-fix-name-too-long-error.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-panel-2.18.0-fix-name-too-long-error.patch	4 Apr 2007 16:28:42 -0000	1.1
+++ gnome-panel-2.18.0-fix-name-too-long-error.patch	4 Apr 2007 16:36:34 -0000	1.2
@@ -1,13 +1,12 @@
---- gnome-panel-2.18.0/gnome-panel/panel-ditem-editor.c.fix-name-too-long-error	2007-04-04 12:07:34.000000000 -0400
-+++ gnome-panel-2.18.0/gnome-panel/panel-ditem-editor.c	2007-04-04 12:17:28.000000000 -0400
-@@ -1331,7 +1331,9 @@
+--- gnome-panel-2.18.0/gnome-panel/panel-ditem-editor.c.fix-name-too-long-error	2007-03-12 14:48:43.000000000 -0400
++++ gnome-panel-2.18.0/gnome-panel/panel-ditem-editor.c	2007-04-04 12:35:55.000000000 -0400
+@@ -1331,6 +1331,9 @@
  				       _("Could not save launcher"),
  				       error->message);
  		g_error_free (error);
--
-+		panel_util_key_file_set_string (dialog->priv->key_file, "Name", "");
-+		panel_util_key_file_set_string (dialog->priv->key_file, "Comment", "");
-+		panel_util_key_file_set_string (dialog->priv->key_file, "Icon", "");
++ 		panel_util_key_file_set_string (dialog->priv->key_file, "Name", "");
++ 		panel_util_key_file_set_string (dialog->priv->key_file, "Comment", "");
++ 		panel_util_key_file_set_string (dialog->priv->key_file, "Icon", "");
  		return FALSE;
  	} else {
  		g_signal_emit (G_OBJECT (dialog),



From fedora-cvs-commits at redhat.com  Wed Apr  4 16:41:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 12:41:26 -0400
Subject: rpms/dbus-glib/devel dbus-bus-introspect.xml, NONE, 1.1 .cvsignore,
	1.3, 1.4 dbus-glib.spec, 1.11, 1.12 sources, 1.3,
	1.4 dbus-glib-0.70-dontgeneratexml.patch, 1.1,
	NONE dbus-glib-0.70-fix-includes.patch, 1.1,
	NONE dbus-glib-0.70-fix-info-leak.patch, 1.1,
	NONE dbus-glib-0.70-use-default-threads.patch, 1.1, NONE
Message-ID: <200704041641.l34GfQoY028919@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/dbus-glib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28810

Modified Files:
	.cvsignore dbus-glib.spec sources 
Added Files:
	dbus-bus-introspect.xml 
Removed Files:
	dbus-glib-0.70-dontgeneratexml.patch 
	dbus-glib-0.70-fix-includes.patch 
	dbus-glib-0.70-fix-info-leak.patch 
	dbus-glib-0.70-use-default-threads.patch 
Log Message:
0.73



--- NEW FILE dbus-bus-introspect.xml ---
   <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
  <interface name="org.freedesktop.DBus.Introspectable">
    <method name="Introspect">
      <arg name="data" direction="out" type="s"/>
    </method>
  </interface>
  <interface name="org.freedesktop.DBus">
    <method name="RequestName">
      <arg direction="in" type="s"/>
      <arg direction="in" type="u"/>
      <arg direction="out" type="u"/>
    </method>
    <method name="ReleaseName">
      <arg direction="in" type="s"/>
      <arg direction="out" type="u"/>
    </method>
    <method name="StartServiceByName">
      <arg direction="in" type="s"/>
      <arg direction="in" type="u"/>
      <arg direction="out" type="u"/>
    </method>
    <method name="Hello">
      <arg direction="out" type="s"/>
    </method>
    <method name="NameHasOwner">
      <arg direction="in" type="s"/>
      <arg direction="out" type="b"/>
    </method>
    <method name="ListNames">
      <arg direction="out" type="as"/>
    </method>
    <method name="AddMatch">
      <arg direction="in" type="s"/>
    </method>
    <method name="RemoveMatch">
      <arg direction="in" type="s"/>
    </method>
    <method name="GetNameOwner">
      <arg direction="in" type="s"/>
      <arg direction="out" type="s"/>
    </method>
    <method name="ListQueuedOwners">
      <arg direction="in" type="s"/>
      <arg direction="out" type="as"/>
    </method>
    <method name="GetConnectionUnixUser">
      <arg direction="in" type="s"/>
      <arg direction="out" type="u"/>
    </method>
    <method name="GetConnectionUnixProcessID">
      <arg direction="in" type="s"/>
      <arg direction="out" type="u"/>
    </method>
    <method name="GetConnectionSELinuxSecurityContext">
      <arg direction="in" type="s"/>
      <arg direction="out" type="ay"/>
    </method>
    <method name="ReloadConfig">
    </method>
    <signal name="NameOwnerChanged">
      <arg type="s"/>
      <arg type="s"/>
      <arg type="s"/>
    </signal>
    <signal name="NameLost">
      <arg type="s"/>
    </signal>
    <signal name="NameAcquired">
      <arg type="s"/>
    </signal>
  </interface>
</node>


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dbus-glib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Oct 2006 19:10:05 -0000	1.3
+++ .cvsignore	4 Apr 2007 16:41:24 -0000	1.4
@@ -1 +1 @@
-dbus-glib-0.71.tar.gz
+dbus-glib-0.73.tar.gz


Index: dbus-glib.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus-glib/devel/dbus-glib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dbus-glib.spec	19 Dec 2006 23:32:18 -0000	1.11
+++ dbus-glib.spec	4 Apr 2007 16:41:24 -0000	1.12
@@ -7,13 +7,11 @@
 
 Summary: GLib bindings for D-Bus
 Name: dbus-glib
-Version: 0.71
-Release: 4%{?dist}
+Version: 0.73
+Release: 1%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
-Patch1: dbus-glib-0.70-dontgeneratexml.patch
-Patch2: dbus-glib-0.70-fix-info-leak.patch
-Patch3: dbus-glib-0.70-use-default-threads.patch
+Source1: dbus-bus-introspect.xml
 License: AFL/GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,14 +58,14 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .dontgeneratexml
-%patch2 -p0 -b .fix-info-leak
-%patch3 -p1 -b .use-default-threads
 autoreconf -i -f
 
 %build
 
-%configure --disable-tests --enable-verbose-mode=yes --enable-asserts=yes
+%configure --disable-tests \
+	--enable-verbose-mode=yes \
+	--enable-asserts=yes \
+	--with-introspect-xml=%{SOURCE1}
 
 #build with checks for right now but disable checks for final release
 #%configure  --disable-tests --disable-verbose-mode --disable-asserts
@@ -104,6 +102,7 @@
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/dbus-glib-1.pc
 %{_includedir}/*
+%{_datadir}/gtk-doc/html/dbus-glib
 
 %if 0
 %files gtk
@@ -114,6 +113,10 @@
 %endif
 
 %changelog
+* Wed Apr  4 2007 Matthias Clasen <mclasen at redhat.com> - 0.73-1
+- Update to 0.73 (#233631)
+- Drop upstreamed patches
+
 * Tue Dec 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.71-4
 - Add dbus-glib-0.70-use-default-threads.patch
 - Partial fix to #219257


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dbus-glib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Oct 2006 19:10:05 -0000	1.3
+++ sources	4 Apr 2007 16:41:24 -0000	1.4
@@ -1 +1 @@
-4e1e7348b26ee8b6485452113f4221cc  dbus-glib-0.71.tar.gz
+4563eeebae66828e30b72e2c1d90a92c  dbus-glib-0.73.tar.gz


--- dbus-glib-0.70-dontgeneratexml.patch DELETED ---


--- dbus-glib-0.70-fix-includes.patch DELETED ---


--- dbus-glib-0.70-fix-info-leak.patch DELETED ---


--- dbus-glib-0.70-use-default-threads.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr  4 16:53:46 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 12:53:46 -0400
Subject: rpms/evolution-data-server/devel
	evolution-data-server-1.10.0-code-cleanup.patch, 1.2,
	1.3 evolution-data-server.spec, 1.157, 1.158
Message-ID: <200704041653.l34GrkH9005657@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-data-server-1.10.0-code-cleanup.patch 
	evolution-data-server.spec 
Log Message:

* Wed Apr 04 2007 Matthew Barnes <mbarnes at redhat.com> - 1.10.0-6.fc7
- Revise patch for GNOME bug #417999 (another ESourceComboBox goof).


evolution-data-server-1.10.0-code-cleanup.patch:
 calendar/libical/src/libicalss/icalssyacc.y                   |    1 
 calendar/libical/src/libicalvcal/vcc.y                        |    1 
 docs/reference/libedataserverui/libedataserverui-docs.sgml    |    1 
 docs/reference/libedataserverui/libedataserverui-sections.txt |   23 
 docs/reference/libedataserverui/libedataserverui.types        |    2 
 iconv-detect.c                                                |    1 
 libedataserverui/Makefile.am                                  |    2 
 libedataserverui/Makefile.in                                  |    7 
 libedataserverui/e-name-selector-dialog.c                     |  158 +--
 libedataserverui/e-name-selector-dialog.glade                 |   40 
 libedataserverui/e-name-selector-dialog.h                     |    1 
 libedataserverui/e-name-selector-entry.c                      |    2 
 libedataserverui/e-name-selector-list.c                       |    2 
 libedataserverui/e-source-combo-box.c                         |  457 ++++++++++
 libedataserverui/e-source-combo-box.h                         |   79 +
 libedataserverui/e-source-option-menu.h                       |    3 
 libedataserverui/test-source-option-menu.c                    |   22 
 17 files changed, 677 insertions(+), 125 deletions(-)

Index: evolution-data-server-1.10.0-code-cleanup.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server-1.10.0-code-cleanup.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- evolution-data-server-1.10.0-code-cleanup.patch	2 Apr 2007 14:10:00 -0000	1.2
+++ evolution-data-server-1.10.0-code-cleanup.patch	4 Apr 2007 16:53:44 -0000	1.3
@@ -1,5 +1,5 @@
 --- evolution-data-server-1.10.0/libedataserverui/e-name-selector-dialog.glade.code-cleanup	2007-01-03 05:09:27.000000000 -0500
-+++ evolution-data-server-1.10.0/libedataserverui/e-name-selector-dialog.glade	2007-03-13 15:49:50.000000000 -0400
++++ evolution-data-server-1.10.0/libedataserverui/e-name-selector-dialog.glade	2007-04-04 12:08:04.000000000 -0400
 @@ -118,7 +118,10 @@
  		  <property name="yalign">0.5</property>
  		  <property name="xpad">0</property>
@@ -62,7 +62,7 @@
  	    <packing>
  	      <property name="padding">0</property>
 --- evolution-data-server-1.10.0/libedataserverui/e-name-selector-list.c.code-cleanup	2007-01-03 05:09:27.000000000 -0500
-+++ evolution-data-server-1.10.0/libedataserverui/e-name-selector-list.c	2007-03-13 15:49:50.000000000 -0400
++++ evolution-data-server-1.10.0/libedataserverui/e-name-selector-list.c	2007-04-04 12:08:04.000000000 -0400
 @@ -447,7 +447,7 @@
  		
  			if (len > 1) {
@@ -73,7 +73,7 @@
  			} else {
  				menu_item = gtk_menu_item_new_with_label (email);			
 --- evolution-data-server-1.10.0/libedataserverui/e-name-selector-entry.c.code-cleanup	2007-01-03 05:09:27.000000000 -0500
-+++ evolution-data-server-1.10.0/libedataserverui/e-name-selector-entry.c	2007-03-13 15:49:50.000000000 -0400
++++ evolution-data-server-1.10.0/libedataserverui/e-name-selector-entry.c	2007-04-04 12:08:04.000000000 -0400
 @@ -2136,7 +2136,7 @@
  		
  			if (len > 1) {
@@ -84,7 +84,7 @@
  			} else {
  				menu_item = gtk_menu_item_new_with_label (email);			
 --- evolution-data-server-1.10.0/libedataserverui/test-source-option-menu.c.code-cleanup	2007-01-03 05:09:27.000000000 -0500
-+++ evolution-data-server-1.10.0/libedataserverui/test-source-option-menu.c	2007-03-13 15:49:50.000000000 -0400
++++ evolution-data-server-1.10.0/libedataserverui/test-source-option-menu.c	2007-04-04 12:08:04.000000000 -0400
 @@ -1,5 +1,5 @@
  /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 -/* test-source-option-menu.c - Test for ESourceOptionMenu.
@@ -141,7 +141,7 @@
  
  	g_object_unref (gconf_client);
 --- evolution-data-server-1.10.0/libedataserverui/e-source-option-menu.h.code-cleanup	2007-01-03 05:09:27.000000000 -0500
-+++ evolution-data-server-1.10.0/libedataserverui/e-source-option-menu.h	2007-03-13 15:49:50.000000000 -0400
++++ evolution-data-server-1.10.0/libedataserverui/e-source-option-menu.h	2007-04-04 12:08:04.000000000 -0400
 @@ -23,6 +23,8 @@
  #ifndef _E_SOURCE_OPTION_MENU_H_
  #define _E_SOURCE_OPTION_MENU_H_
@@ -158,8 +158,8 @@
 +#endif /* EDS_DISABLE_DEPRECATED */
  
  #endif /* _E_SOURCE_OPTION_MENU_H_ */
---- /dev/null	2007-03-08 09:20:11.212292094 -0500
-+++ evolution-data-server-1.10.0/libedataserverui/e-source-combo-box.h	2007-03-13 15:49:50.000000000 -0400
+--- /dev/null	2007-03-30 19:30:56.246366825 -0400
++++ evolution-data-server-1.10.0/libedataserverui/e-source-combo-box.h	2007-04-04 12:08:04.000000000 -0400
 @@ -0,0 +1,79 @@
 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 +/* e-source-combo-box.h
@@ -240,8 +240,8 @@
 +G_END_DECLS
 +
 +#endif /* _E_SOURCE_COMBO_BOX_H_ */
---- evolution-data-server-1.10.0/libedataserverui/Makefile.in.code-cleanup	2007-03-13 16:40:50.000000000 -0400
-+++ evolution-data-server-1.10.0/libedataserverui/Makefile.in	2007-03-13 16:41:45.000000000 -0400
+--- evolution-data-server-1.10.0/libedataserverui/Makefile.in.code-cleanup	2007-03-12 12:04:04.000000000 -0400
++++ evolution-data-server-1.10.0/libedataserverui/Makefile.in	2007-04-04 12:08:04.000000000 -0400
 @@ -78,8 +78,8 @@
  	e-name-selector-dialog.lo e-name-selector-entry.lo \
  	e-name-selector-model.lo e-name-selector-list.lo \
@@ -278,7 +278,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e-source-selector-dialog.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e-source-selector.Plo at am__quote@
 --- evolution-data-server-1.10.0/libedataserverui/e-name-selector-dialog.h.code-cleanup	2007-01-03 05:09:27.000000000 -0500
-+++ evolution-data-server-1.10.0/libedataserverui/e-name-selector-dialog.h	2007-03-13 15:49:50.000000000 -0400
++++ evolution-data-server-1.10.0/libedataserverui/e-name-selector-dialog.h	2007-04-04 12:08:04.000000000 -0400
 @@ -58,7 +58,6 @@
  	/* Private */
  
@@ -288,7 +288,7 @@
  	GtkTreeModelSort   *contact_sort;
  
 --- evolution-data-server-1.10.0/libedataserverui/Makefile.am.code-cleanup	2007-01-03 05:09:27.000000000 -0500
-+++ evolution-data-server-1.10.0/libedataserverui/Makefile.am	2007-03-13 15:49:50.000000000 -0400
++++ evolution-data-server-1.10.0/libedataserverui/Makefile.am	2007-04-04 12:08:04.000000000 -0400
 @@ -31,6 +31,7 @@
  	e-passwords.c			\
  	e-source-selector.c		\
@@ -305,8 +305,8 @@
  	e-source-option-menu.h		\
  	e-tree-model-generator.h
  
---- evolution-data-server-1.10.0/libedataserverui/e-name-selector-dialog.c.code-cleanup	2007-03-13 15:49:50.000000000 -0400
-+++ evolution-data-server-1.10.0/libedataserverui/e-name-selector-dialog.c	2007-03-13 15:49:50.000000000 -0400
+--- evolution-data-server-1.10.0/libedataserverui/e-name-selector-dialog.c.code-cleanup	2007-04-04 12:08:04.000000000 -0400
++++ evolution-data-server-1.10.0/libedataserverui/e-name-selector-dialog.c	2007-04-04 12:08:04.000000000 -0400
 @@ -32,7 +32,7 @@
  #include <gtk/gtkscrolledwindow.h>
  #include <gtk/gtkstock.h>
@@ -556,9 +556,9 @@
  }
  
  static void
---- /dev/null	2007-03-08 09:20:11.212292094 -0500
-+++ evolution-data-server-1.10.0/libedataserverui/e-source-combo-box.c	2007-03-13 15:49:50.000000000 -0400
-@@ -0,0 +1,461 @@
+--- /dev/null	2007-03-30 19:30:56.246366825 -0400
++++ evolution-data-server-1.10.0/libedataserverui/e-source-combo-box.c	2007-04-04 12:09:51.000000000 -0400
+@@ -0,0 +1,457 @@
 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 +/* e-source-option-menu.c
 + *
@@ -665,10 +665,6 @@
 +				-1);
 +			g_free (indented_name);
 +
-+			if (gtk_combo_box_get_active (combo_box) == -1)
-+				gtk_combo_box_set_active_iter (
-+					combo_box, &iter);
-+
 +			uid = e_source_peek_uid (sources->data);
 +			path = gtk_tree_model_get_path (model, &iter);
 +			g_hash_table_insert (
@@ -1021,7 +1017,7 @@
 +	gtk_combo_box_set_active_iter (combo_box, &iter);
 +}
 --- evolution-data-server-1.10.0/docs/reference/libedataserverui/libedataserverui-docs.sgml.code-cleanup	2007-03-12 01:23:42.000000000 -0400
-+++ evolution-data-server-1.10.0/docs/reference/libedataserverui/libedataserverui-docs.sgml	2007-03-13 15:49:50.000000000 -0400
++++ evolution-data-server-1.10.0/docs/reference/libedataserverui/libedataserverui-docs.sgml	2007-04-04 12:08:04.000000000 -0400
 @@ -19,6 +19,7 @@
      <xi:include href="xml/e-name-selector-list.xml"/>
      <xi:include href="xml/e-name-selector-model.xml"/>
@@ -1031,7 +1027,7 @@
      <xi:include href="xml/e-source-selector.xml"/>
      <xi:include href="xml/e-source-selector-dialog.xml"/>
 --- evolution-data-server-1.10.0/docs/reference/libedataserverui/libedataserverui.types.code-cleanup	2007-03-12 01:23:42.000000000 -0400
-+++ evolution-data-server-1.10.0/docs/reference/libedataserverui/libedataserverui.types	2007-03-13 15:49:50.000000000 -0400
++++ evolution-data-server-1.10.0/docs/reference/libedataserverui/libedataserverui.types	2007-04-04 12:08:04.000000000 -0400
 @@ -6,6 +6,7 @@
  #include <libedataserverui/e-name-selector-entry.h>
  #include <libedataserverui/e-name-selector-list.h>
@@ -1049,7 +1045,7 @@
  e_source_selector_get_type
  e_source_selector_dialog_get_type
 --- evolution-data-server-1.10.0/docs/reference/libedataserverui/libedataserverui-sections.txt.code-cleanup	2007-03-12 01:23:42.000000000 -0400
-+++ evolution-data-server-1.10.0/docs/reference/libedataserverui/libedataserverui-sections.txt	2007-03-13 15:49:50.000000000 -0400
++++ evolution-data-server-1.10.0/docs/reference/libedataserverui/libedataserverui-sections.txt	2007-04-04 12:08:04.000000000 -0400
 @@ -25,6 +25,29 @@
  </SECTION>
  
@@ -1081,7 +1077,7 @@
  <TITLE>ESourceOptionMenu</TITLE>
  ESourceOptionMenu
 --- evolution-data-server-1.10.0/iconv-detect.c.code-cleanup	2007-01-03 05:10:36.000000000 -0500
-+++ evolution-data-server-1.10.0/iconv-detect.c	2007-03-13 15:49:50.000000000 -0400
++++ evolution-data-server-1.10.0/iconv-detect.c	2007-04-04 12:08:04.000000000 -0400
 @@ -21,6 +21,7 @@
   */
  
@@ -1091,7 +1087,7 @@
  
  enum {
 --- evolution-data-server-1.10.0/calendar/libical/src/libicalss/icalssyacc.y.code-cleanup	2007-01-03 10:02:34.000000000 -0500
-+++ evolution-data-server-1.10.0/calendar/libical/src/libicalss/icalssyacc.y	2007-03-13 15:49:50.000000000 -0400
++++ evolution-data-server-1.10.0/calendar/libical/src/libicalss/icalssyacc.y	2007-04-04 12:08:04.000000000 -0400
 @@ -47,6 +47,7 @@
  static void ssyacc_add_from(struct icalgauge_impl* impl, char* str1);
  static void set_logic(struct icalgauge_impl* impl,icalgaugelogic l);
@@ -1101,7 +1097,7 @@
  %}
  
 --- evolution-data-server-1.10.0/calendar/libical/src/libicalvcal/vcc.y.code-cleanup	2007-01-03 10:02:34.000000000 -0500
-+++ evolution-data-server-1.10.0/calendar/libical/src/libicalvcal/vcc.y	2007-03-13 15:49:50.000000000 -0400
++++ evolution-data-server-1.10.0/calendar/libical/src/libicalvcal/vcc.y	2007-04-04 12:08:04.000000000 -0400
 @@ -170,6 +170,7 @@
  static void enterAttr(const char *s1, const char *s2);
  static void enterValues(const char *value);


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- evolution-data-server.spec	2 Apr 2007 14:10:00 -0000	1.157
+++ evolution-data-server.spec	4 Apr 2007 16:53:44 -0000	1.158
@@ -26,7 +26,7 @@
 
 Name: evolution-data-server
 Version: 1.10.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -392,6 +392,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Wed Apr 04 2007 Matthew Barnes <mbarnes at redhat.com> - 1.10.0-6.fc7
+- Revise patch for GNOME bug #417999 (another ESourceComboBox goof).
+
 * Mon Apr 02 2007 Matthew Barnes <mbarnes at redhat.com> - 1.10.0-5.fc7
 - Make the new ESourceComboBox widget work properly (RH bug #234760).
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 16:54:27 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 12:54:27 -0400
Subject: rpms/xorg-x11-drv-i810/devel .cvsignore, 1.20, 1.21 i810.xinf, 1.9,
	1.10 sources, 1.20, 1.21 xorg-x11-drv-i810.spec, 1.51, 1.52
Message-ID: <200704041654.l34GsRE0006226@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	.cvsignore i810.xinf sources xorg-x11-drv-i810.spec 
Log Message:
auto-import xorg-x11-drv-i810-1.6.5-17.fc7 on branch devel from xorg-x11-drv-i810-1.6.5-17.fc7.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	30 Mar 2007 19:41:10 -0000	1.20
+++ .cvsignore	4 Apr 2007 16:54:24 -0000	1.21
@@ -1,2 +1,2 @@
 xf86-video-i810-1.6.5.tar.bz2
-xf86-video-intel-1.9.93.tar.bz2
+xf86-video-intel-1.9.94.tar.bz2


Index: i810.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/i810.xinf,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- i810.xinf	27 Mar 2007 19:59:36 -0000	1.9
+++ i810.xinf	4 Apr 2007 16:54:24 -0000	1.10
@@ -34,6 +34,7 @@
 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:v00008086d00002A02sv*sd*bc*sc*i* intel	# 965GM
 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: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	30 Mar 2007 19:41:10 -0000	1.20
+++ sources	4 Apr 2007 16:54:24 -0000	1.21
@@ -1,2 +1,2 @@
 fc1e0da3430551bf25a7babf7ccfd3bf  xf86-video-i810-1.6.5.tar.bz2
-75aef7467442dd7fb0dc94e4b6ebdb7e  xf86-video-intel-1.9.93.tar.bz2
+d6c2e9700c74ae01b124183582827cf5  xf86-video-intel-1.9.94.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.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- xorg-x11-drv-i810.spec	30 Mar 2007 19:41:10 -0000	1.51
+++ xorg-x11-drv-i810.spec	4 Apr 2007 16:54:24 -0000	1.52
@@ -2,12 +2,12 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define preview_version 1.9.93
+%define preview_version 1.9.94
 
 Summary:   Xorg X11 i810 video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   1.6.5
-Release:   16%{?dist}
+Release:   17%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -100,6 +100,11 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Wed Apr 04 2007 Adam Jackson <ajax at redhat.com> 1.6.5-17
+- xf86-video-intel-1.9.94 (RC4).  Adds support for 965GM.
+- i810.xinf: Point 965GM support at the intel driver since it's not present
+  in old i810.
+
 * Fri Mar 30 2007 Adam Jackson <ajax at redhat.com> 1.6.5-16
 - xf86-video-intel-1.9.93 (RC3).
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 16:57:00 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 12:57:00 -0400
Subject: rpms/cups/devel cups-eggcups.patch,1.3,1.4 cups.spec,1.325,1.326
Message-ID: <200704041657.l34Gv0Zx008182@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups-eggcups.patch cups.spec 
Log Message:
* Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-5
- Send D-BUS QueueChanged signal on printer state changes.


cups-eggcups.patch:
 Makedefs.in                   |    1 
 backend/Makefile              |    2 -
 backend/ipp.c                 |   73 ++++++++++++++++++++++++++++++++++++++++++
 config-scripts/cups-common.m4 |    5 ++
 scheduler/subscriptions.c     |    6 +--
 5 files changed, 82 insertions(+), 5 deletions(-)

Index: cups-eggcups.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-eggcups.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cups-eggcups.patch	6 Nov 2006 16:07:22 -0000	1.3
+++ cups-eggcups.patch	4 Apr 2007 16:56:58 -0000	1.4
@@ -39,7 +39,7 @@
    else if ((event & CUPSD_EVENT_JOB_STATE) && job &&
             job->state_value == IPP_JOB_PROCESSING)
      what = "JobStartedLocal";
-+  else if (event & (CUPSD_EVENT_PRINTER_CHANGED|CUPSD_EVENT_JOB_STATE_CHANGED))
++  else if (event & (CUPSD_EVENT_PRINTER_CHANGED|CUPSD_EVENT_JOB_STATE_CHANGED|CUPS_EVENT_PRINTER_STATE_CHANGED))
 +    what = "QueueChanged";
    else
      return;


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- cups.spec	3 Apr 2007 10:08:56 -0000	1.325
+++ cups.spec	4 Apr 2007 16:56:58 -0000	1.326
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.10
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -440,6 +440,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-5
+- Send D-BUS QueueChanged signal on printer state changes.
+
 * Tue Apr  3 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-4
 - Relay printer-state-message values in the IPP backend (STR #2109).
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 16:58:56 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 12:58:56 -0400
Subject: rpms/cups/FC-6 cups-eggcups.patch,1.5,1.6 cups.spec,1.326,1.327
Message-ID: <200704041658.l34GwuMn009709@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups-eggcups.patch cups.spec 
Log Message:
* Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-4
- Send D-BUS QueueChanged signal on printer state changes.


cups-eggcups.patch:
 Makedefs.in                   |    1 
 backend/Makefile              |    2 -
 backend/ipp.c                 |   73 ++++++++++++++++++++++++++++++++++++++++++
 config-scripts/cups-common.m4 |    5 ++
 scheduler/subscriptions.c     |    6 +--
 5 files changed, 82 insertions(+), 5 deletions(-)

Index: cups-eggcups.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-6/cups-eggcups.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cups-eggcups.patch	6 Nov 2006 16:05:57 -0000	1.5
+++ cups-eggcups.patch	4 Apr 2007 16:58:54 -0000	1.6
@@ -39,7 +39,7 @@
    else if ((event & CUPSD_EVENT_JOB_STATE) && job &&
             job->state_value == IPP_JOB_PROCESSING)
      what = "JobStartedLocal";
-+  else if (event & (CUPSD_EVENT_PRINTER_CHANGED|CUPSD_EVENT_JOB_STATE_CHANGED))
++  else if (event & (CUPSD_EVENT_PRINTER_CHANGED|CUPSD_EVENT_JOB_STATE_CHANGED|CUPSD_PRINTER_STATE_CHANGED))
 +    what = "QueueChanged";
    else
      return;


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- cups.spec	3 Apr 2007 10:18:09 -0000	1.326
+++ cups.spec	4 Apr 2007 16:58:54 -0000	1.327
@@ -440,6 +440,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-4
+- Send D-BUS QueueChanged signal on printer state changes.
+
 * Tue Apr  3 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-3
 - Relay printer-state-message values in the IPP backend (STR #2109).
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 16:59:13 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 12:59:13 -0400
Subject: rpms/cups/FC-6 cups.spec,1.327,1.328
Message-ID: <200704041659.l34GxDtj010009@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
1.2.10-4


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -r1.327 -r1.328
--- cups.spec	4 Apr 2007 16:58:54 -0000	1.327
+++ cups.spec	4 Apr 2007 16:59:11 -0000	1.328
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.10
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr  4 16:59:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 12:59:31 -0400
Subject: rpms/dbus-glib/devel dbus-glib.spec,1.12,1.13
Message-ID: <200704041659.l34GxV7g010300@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/dbus-glib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10215

Modified Files:
	dbus-glib.spec 
Log Message:
fix spec



Index: dbus-glib.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus-glib/devel/dbus-glib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dbus-glib.spec	4 Apr 2007 16:41:24 -0000	1.12
+++ dbus-glib.spec	4 Apr 2007 16:59:29 -0000	1.13
@@ -65,6 +65,7 @@
 %configure --disable-tests \
 	--enable-verbose-mode=yes \
 	--enable-asserts=yes \
+	--disable-gtk-doc \
 	--with-introspect-xml=%{SOURCE1}
 
 #build with checks for right now but disable checks for final release



From fedora-cvs-commits at redhat.com  Wed Apr  4 17:06:02 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 13:06:02 -0400
Subject: rpms/cups/FC-6 cups-eggcups.patch,1.6,1.7
Message-ID: <200704041706.l34H624A014896@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups-eggcups.patch 
Log Message:
Fixed typo.

cups-eggcups.patch:
 Makedefs.in                   |    1 
 backend/Makefile              |    2 -
 backend/ipp.c                 |   73 ++++++++++++++++++++++++++++++++++++++++++
 config-scripts/cups-common.m4 |    5 ++
 scheduler/subscriptions.c     |    6 +--
 5 files changed, 82 insertions(+), 5 deletions(-)

Index: cups-eggcups.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-6/cups-eggcups.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cups-eggcups.patch	4 Apr 2007 16:58:54 -0000	1.6
+++ cups-eggcups.patch	4 Apr 2007 17:06:00 -0000	1.7
@@ -39,7 +39,7 @@
    else if ((event & CUPSD_EVENT_JOB_STATE) && job &&
             job->state_value == IPP_JOB_PROCESSING)
      what = "JobStartedLocal";
-+  else if (event & (CUPSD_EVENT_PRINTER_CHANGED|CUPSD_EVENT_JOB_STATE_CHANGED|CUPSD_PRINTER_STATE_CHANGED))
++  else if (event & (CUPSD_EVENT_PRINTER_CHANGED|CUPSD_EVENT_JOB_STATE_CHANGED|CUPSD_EVENT_PRINTER_STATE_CHANGED))
 +    what = "QueueChanged";
    else
      return;



From fedora-cvs-commits at redhat.com  Wed Apr  4 17:06:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 13:06:09 -0400
Subject: rpms/cups/devel cups-eggcups.patch,1.4,1.5
Message-ID: <200704041706.l34H696J015026@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups-eggcups.patch 
Log Message:
Fixed typo.

cups-eggcups.patch:
 Makedefs.in                   |    1 
 backend/Makefile              |    2 -
 backend/ipp.c                 |   73 ++++++++++++++++++++++++++++++++++++++++++
 config-scripts/cups-common.m4 |    5 ++
 scheduler/subscriptions.c     |    6 +--
 5 files changed, 82 insertions(+), 5 deletions(-)

Index: cups-eggcups.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-eggcups.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cups-eggcups.patch	4 Apr 2007 16:56:58 -0000	1.4
+++ cups-eggcups.patch	4 Apr 2007 17:06:07 -0000	1.5
@@ -39,7 +39,7 @@
    else if ((event & CUPSD_EVENT_JOB_STATE) && job &&
             job->state_value == IPP_JOB_PROCESSING)
      what = "JobStartedLocal";
-+  else if (event & (CUPSD_EVENT_PRINTER_CHANGED|CUPSD_EVENT_JOB_STATE_CHANGED|CUPS_EVENT_PRINTER_STATE_CHANGED))
++  else if (event & (CUPSD_EVENT_PRINTER_CHANGED|CUPSD_EVENT_JOB_STATE_CHANGED|CUPSD_EVENT_PRINTER_STATE_CHANGED))
 +    what = "QueueChanged";
    else
      return;



From fedora-cvs-commits at redhat.com  Wed Apr  4 17:14:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 13:14:23 -0400
Subject: rpms/dbus-glib/devel dbus-glib.spec,1.13,1.14
Message-ID: <200704041714.l34HENS9021879@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/dbus-glib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21800

Modified Files:
	dbus-glib.spec 
Log Message:
more build fixage



Index: dbus-glib.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus-glib/devel/dbus-glib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dbus-glib.spec	4 Apr 2007 16:59:29 -0000	1.13
+++ dbus-glib.spec	4 Apr 2007 17:14:20 -0000	1.14
@@ -58,8 +58,6 @@
 %prep
 %setup -q
 
-autoreconf -i -f
-
 %build
 
 %configure --disable-tests \



From fedora-cvs-commits at redhat.com  Wed Apr  4 17:18:44 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 13:18:44 -0400
Subject: rpms/hplip/devel hplip-media-empty.patch, NONE, 1.1 hplip.spec,
	1.114, 1.115
Message-ID: <200704041718.l34HIi4j025100@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Added Files:
	hplip-media-empty.patch 
Log Message:
* Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-4
- Clear the media-empty-error printer state.


hplip-media-empty.patch:
 hp.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hplip-media-empty.patch ---
--- hplip-1.7.2/backend/hp/hp.c.media-empty	2007-04-04 18:14:12.000000000 +0100
+++ hplip-1.7.2/backend/hp/hp.c	2007-04-04 18:15:01.000000000 +0100
@@ -410,7 +410,7 @@
    int len, vstatus, cnt;
    char buf[HPLIP_BUFFER_SIZE+HPLIP_HEADER_SIZE];
    HplipMsgAttributes ma;
-   int paperout=0, offline=0;
+   int paperout=1, offline=1;
 
    if (argc > 1)
    {


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- hplip.spec	4 Apr 2007 13:49:40 -0000	1.114
+++ hplip.spec	4 Apr 2007 17:18:42 -0000	1.115
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 1.7.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -21,6 +21,7 @@
 Patch6: hplip-ipv6.patch
 Patch7: hplip-marker-supply.patch
 Patch8: hplip-libsane.patch
+Patch9: hplip-media-empty.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -99,6 +100,9 @@
 # Link libsane-hpaio against libsane (bug #234813).
 %patch8 -p1 -b .libsane
 
+# Clear the media-empty-error printer state.
+%patch9 -p1 -b .media-empty
+
 autoconf # for patch4
 
 %build
@@ -247,6 +251,9 @@
 exit 0
 
 %changelog
+* Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-4
+- Clear the media-empty-error printer state.
+
 * Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-3
 - Fixed typo in marker-supply-low patch.
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 18:00:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 14:00:26 -0400
Subject: rpms/mesa/devel mesa-6.5.2-bindcontext-paranoia.patch, NONE,
	1.1 mesa.spec, 1.127, 1.128
Message-ID: <200704041800.l34I0Qid001693@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	mesa.spec 
Added Files:
	mesa-6.5.2-bindcontext-paranoia.patch 
Log Message:
* Wed Apr 04 2007 Adam Jackson <ajax at redhat.com> 6.5.2-9
- mesa-6.5.2-bindcontext-paranoia.patch: Paper over a crash when doBindContext
  fails, to avoid, for example, crashing the server when using tdfx but
  without glide3 installed.


mesa-6.5.2-bindcontext-paranoia.patch:
 dri_util.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE mesa-6.5.2-bindcontext-paranoia.patch ---
--- Mesa-6.5.2/src/mesa/drivers/dri/common/dri_util.c.jx	2006-12-02 13:14:16.000000000 -0500
+++ Mesa-6.5.2/src/mesa/drivers/dri/common/dri_util.c	2007-04-04 12:41:08.000000000 -0400
@@ -271,6 +271,8 @@
     __DRIdrawablePrivate *prp;
     __DRIcontextPrivate * const pcp = ctx->private;
 
+    if (!pcp)
+	return GL_FALSE;
 
     /* Find the _DRIdrawable which corresponds to the writing drawable. */
     pdraw = __driFindDrawable(psp->drawHash, draw);


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- mesa.spec	8 Mar 2007 20:32:57 -0000	1.127
+++ mesa.spec	4 Apr 2007 18:00:24 -0000	1.128
@@ -31,7 +31,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -49,6 +49,7 @@
 Patch20: mesa-6.5.2-libgl-visibility.patch
 Patch21: mesa-6.5.2-picify-dri-drivers.patch
 Patch22: mesa-6.5.2-hush-synthetic-visual-warning.patch
+Patch23: mesa-6.5.2-bindcontext-paranoia.patch
 
 BuildRequires: pkgconfig
 %if %{with_dri}
@@ -165,6 +166,7 @@
 %patch20 -p1 -b .libgl-visibility
 %patch21 -p1 -b .picify
 %patch22 -p1 -b .visual-warning
+%patch23 -p1 -b .bindcontext
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
 # license and are not open source/free software, so we remove them.
@@ -334,6 +336,11 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Wed Apr 04 2007 Adam Jackson <ajax at redhat.com> 6.5.2-9
+- mesa-6.5.2-bindcontext-paranoia.patch: Paper over a crash when doBindContext
+  fails, to avoid, for example, crashing the server when using tdfx but
+  without glide3 installed.
+
 * Thu Mar 08 2007 Adam Jackson <ajax at redhat.com> 6.5.2-8
 - Hush the (useless) warning about the synthetic visual not being supported.
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 18:52:56 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 14:52:56 -0400
Subject: rpms/evolution/devel evolution-2.10.0-bold-folders.patch, NONE,
	1.1 evolution.spec, 1.240, 1.241
Message-ID: <200704041852.l34IquYt031299@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.10.0-bold-folders.patch 
Log Message:

* Wed Apr 04 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-10.fc7
- Add patch for GNOME bug #352713 (improve folder tree updates).


evolution-2.10.0-bold-folders.patch:
 em-folder-tree.c |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+)

--- NEW FILE evolution-2.10.0-bold-folders.patch ---
--- evolution-2.10.0/mail/em-folder-tree.c.bold-folders	2007-04-04 14:04:19.000000000 -0400
+++ evolution-2.10.0/mail/em-folder-tree.c	2007-04-04 14:05:31.000000000 -0400
@@ -160,6 +160,7 @@
 
 static void emft_update_model_expanded_state (struct _EMFolderTreePrivate *priv, GtkTreeIter *iter, gboolean expanded);
 
+static void emft_model_row_changed (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, EMFolderTree *emft);
 static void emft_tree_row_activated (GtkTreeView *treeview, GtkTreePath *path, GtkTreeViewColumn *column, EMFolderTree *emft);
 static gboolean emft_tree_test_collapse_row (GtkTreeView *treeview, GtkTreeIter *root, GtkTreePath *path, EMFolderTree *emft);
 static void emft_tree_row_expanded (GtkTreeView *treeview, GtkTreeIter *root, GtkTreePath *path, EMFolderTree *emft);
@@ -539,6 +540,8 @@
 	priv->treeview = folder_tree_new (emft, model);
 	gtk_widget_show ((GtkWidget *) priv->treeview);
 	
+	g_signal_connect (priv->model, "row-changed", G_CALLBACK (emft_model_row_changed), emft);
+
 	g_signal_connect (priv->treeview, "row-expanded", G_CALLBACK (emft_tree_row_expanded), emft);
 	g_signal_connect (priv->treeview, "test-collapse-row", G_CALLBACK (emft_tree_test_collapse_row), emft);
 	g_signal_connect (priv->treeview, "row-activated", G_CALLBACK (emft_tree_row_activated), emft);
@@ -1855,6 +1858,30 @@
 }
 
 static void
+emft_model_row_changed (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, EMFolderTree *emft)
+{
+	GtkTreeIter parent_iter;
+	GtkTreeIter child_iter = *iter;
+
+	g_signal_handlers_block_by_func (model, emft_model_row_changed, emft);
+	
+	/* Folders are displayed with a bold weight to indicate that
+	   they contain unread messages.  We signal that parent rows
+	   have changed here to update them. */
+
+	while (gtk_tree_model_iter_parent (model, &parent_iter, &child_iter)) {
+		GtkTreePath *parent_path;
+
+		parent_path = gtk_tree_model_get_path (model, &parent_iter);
+		gtk_tree_model_row_changed (model, parent_path, &parent_iter);
+		gtk_tree_path_free (parent_path);
+		child_iter = parent_iter;
+	}
+	
+	g_signal_handlers_unblock_by_func (model, emft_model_row_changed, emft);
+}
+
+static void
 emft_tree_row_expanded (GtkTreeView *treeview, GtkTreeIter *root, GtkTreePath *tree_path, EMFolderTree *emft)
 {
 	struct _EMFolderTreePrivate *priv = emft->priv;


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- evolution.spec	4 Apr 2007 04:13:05 -0000	1.240
+++ evolution.spec	4 Apr 2007 18:52:54 -0000	1.241
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -167,6 +167,9 @@
 # RH bug #235056
 Patch50: evolution-2.10.0-plugins-require-libxml2.patch
 
+# GNOME bug #352713
+Patch51: evolution-2.10.0-bold-folders.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -322,6 +325,7 @@
 %patch48 -p1 -b .CVE-2007-1002
 %patch49 -p1 -b .let-mail-notification-build
 %patch50 -p1 -b .plugins-require-libxml2
+%patch51 -p1 -b .bold-folders
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -738,6 +742,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Wed Apr 04 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-10.fc7
+- Add patch for GNOME bug #352713 (improve folder tree updates).
+
 * Tue Apr 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-9.fc7
 - Require libxml2-devel in evolution-devel package (RH bug #235056).
 - Add libxml-2.0 requirement to evolution-plugin-2.10.pc.



From fedora-cvs-commits at redhat.com  Wed Apr  4 19:42:27 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 15:42:27 -0400
Subject: rpms/kernel/FC-5 linux-2.6-20.5y-dm_crypt_disable_barriers.patch,
	NONE, 1.1 linux-2.6-20.5z-ide_use_proper_error_recovery.patch,
	NONE, 1.1 linux-2.6-20.5z-mmap_dont_spam_logs.patch, NONE,
	1.1 linux-2.6-20.5z-nfs_allow_64bit_cookies.patch, NONE,
	1.1 linux-2.6-20.5z-softmac_check_if_running.patch, NONE,
	1.1 linux-2.6-proposed-i82875p-edac-fix.patch, NONE,
	1.1 linux-2.6.20.5-rc1-ata_scsi_preserve_lba_bit.patch, NONE,
	1.1 linux-2.6.20.5-rc1-crypto_walk_fix_advance_by.patch, NONE,
	1.1 patch-2.6.20.5-rc1.bz2.sign, NONE, 1.1 .cvsignore, 1.438,
	1.439 kernel-2.6.spec, 1.2310, 1.2311 sources, 1.378,
	1.379 upstream, 1.341, 1.342
Message-ID: <200704041942.l34JgRGJ026855@cvs.devel.redhat.com>

Author: cebbert

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	linux-2.6-20.5y-dm_crypt_disable_barriers.patch 
	linux-2.6-20.5z-ide_use_proper_error_recovery.patch 
	linux-2.6-20.5z-mmap_dont_spam_logs.patch 
	linux-2.6-20.5z-nfs_allow_64bit_cookies.patch 
	linux-2.6-20.5z-softmac_check_if_running.patch 
	linux-2.6-proposed-i82875p-edac-fix.patch 
	linux-2.6.20.5-rc1-ata_scsi_preserve_lba_bit.patch 
	linux-2.6.20.5-rc1-crypto_walk_fix_advance_by.patch 
	patch-2.6.20.5-rc1.bz2.sign 
Log Message:
* Wed Apr  4 2007 Chuck Ebbert <cebbert at redhat.com>		1.2311
- 2.6.20.5-rc1 plus two fixes for broken -rc1 patches.
- additional post 2.6.20.5 patches (1800-1805)


linux-2.6-20.5y-dm_crypt_disable_barriers.patch:
 dm-crypt.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE linux-2.6-20.5y-dm_crypt_disable_barriers.patch ---
> > Summary of what I've managed to rule out so far:
> >1. this problem does not occur without dm-crypt

Please could you test attached patch ?
Sorry for another annoying reboot :-)

Milan
--
mbroz at redhat.com



From: Milan Broz <mbroz at redhat.com>

Disable barriers in dm-crypt because of current workqueue processing
can reorder requests.

This must be addresed later but for now disabling barriers is needed
to prevent data corruption.

Signed-off-by: Milan Broz <mbroz at redhat.com>

Index: linux-2.6.20.1/drivers/md/dm-crypt.c
===================================================================
--- linux-2.6.20.1.orig/drivers/md/dm-crypt.c	2007-03-23 15:07:11.000000000 +0100
+++ linux-2.6.20.1/drivers/md/dm-crypt.c	2007-03-23 15:09:59.000000000 +0100
@@ -925,6 +925,9 @@ static int crypt_map(struct dm_target *t
 	struct crypt_config *cc = ti->private;
 	struct crypt_io *io;
 
+	if (bio_barrier(bio))
+		return -EOPNOTSUPP;
+
 	io = mempool_alloc(cc->io_pool, GFP_NOIO);
 	io->target = ti;
 	io->base_bio = bio;



linux-2.6-20.5z-ide_use_proper_error_recovery.patch:
 drivers/ide/ide-io.c   |   32 +++++++++++++++++++++-----------
 drivers/ide/ide-iops.c |    3 +++
 include/linux/ide.h    |    1 +
 3 files changed, 25 insertions(+), 11 deletions(-)

--- NEW FILE linux-2.6-20.5z-ide_use_proper_error_recovery.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=513daadd152ddbf32cb6d0447ddba3427ce5b8e8
Commit:     513daadd152ddbf32cb6d0447ddba3427ce5b8e8
Parent:     362ebd83adb4ff2761b6f49a3570f501c3c7e467
Author:     Suleiman Souhlal <suleiman at google.com>
AuthorDate: Mon Mar 26 23:03:20 2007 +0200
Committer:  Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
CommitDate: Mon Mar 26 23:03:20 2007 +0200

    ide: use correct IDE error recovery
    
    IDE error recovery is using IDLE IMMEDIATE if the drive is busy or has DRQ set.
    This violates the ATA spec (can only send IDLE?? IMMEDIATE when drive is not
    busy) and really hoses up some drives (modern drives will not be able to
    recover using this error handling).  The correct thing to do is issue a SRST
    followed by a SET FEATURES command.  This is what Western Digital recommends
    for error recovery and what Western Digital says Windows does. ?? It?? also does
    not violate the ATA spec as far as I can tell.
    
    Bart:
    * port the patch over the current tree
    * undo the recalibration code removal
    * send SET FEATURES command after checking for good drive status
    * don't check whether the current request is of REQ_TYPE_ATA_{CMD,TASK}
      type because we need to send SET FEATURES before handling any requests
    * some pre-ATA4 drives require INITIALIZE DEVICE PARAMETERS command before
      other commands (except IDENTIFY) so send SET FEATURES only if there are
      no pending drive->special requests
    * update comments and patch description
    * any bugs introduced by this patch are mine and not Suleiman's :-)
    
    Signed-off-by: Suleiman Souhlal <suleiman at google.com>
    Acked-by: Alan Cox <alan at redhat.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
---
 drivers/ide/ide-io.c   |   32 +++++++++++++++++++++-----------
 drivers/ide/ide-iops.c |    3 +++
 include/linux/ide.h    |    1 +
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index c193553..0e02800 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -519,21 +519,24 @@ static ide_startstop_t ide_ata_error(ide_drive_t *drive, struct request *rq, u8
 	if ((stat & DRQ_STAT) && rq_data_dir(rq) == READ && hwif->err_stops_fifo == 0)
 		try_to_flush_leftover_data(drive);
 
+	if (rq->errors >= ERROR_MAX || blk_noretry_request(rq)) {
+		ide_kill_rq(drive, rq);
+		return ide_stopped;
+	}
+
 	if (hwif->INB(IDE_STATUS_REG) & (BUSY_STAT|DRQ_STAT))
-		/* force an abort */
-		hwif->OUTB(WIN_IDLEIMMEDIATE, IDE_COMMAND_REG);
+		rq->errors |= ERROR_RESET;
 
-	if (rq->errors >= ERROR_MAX || blk_noretry_request(rq))
-		ide_kill_rq(drive, rq);
-	else {
-		if ((rq->errors & ERROR_RESET) == ERROR_RESET) {
-			++rq->errors;
-			return ide_do_reset(drive);
-		}
-		if ((rq->errors & ERROR_RECAL) == ERROR_RECAL)
-			drive->special.b.recalibrate = 1;
+	if ((rq->errors & ERROR_RESET) == ERROR_RESET) {
 		++rq->errors;
+		return ide_do_reset(drive);
 	}
+
+	if ((rq->errors & ERROR_RECAL) == ERROR_RECAL)
+		drive->special.b.recalibrate = 1;
+
+	++rq->errors;
+
 	return ide_stopped;
 }
 
@@ -1025,6 +1028,13 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)
 	if (!drive->special.all) {
 		ide_driver_t *drv;
 
+		/*
+		 * We reset the drive so we need to issue a SETFEATURES.
+		 * Do it _after_ do_special() restored device parameters.
+		 */
+		if (drive->current_speed == 0xff)
+			ide_config_drive_speed(drive, drive->desired_speed);
+
 		if (rq->cmd_type == REQ_TYPE_ATA_CMD ||
 		    rq->cmd_type == REQ_TYPE_ATA_TASK ||
 		    rq->cmd_type == REQ_TYPE_ATA_TASKFILE)
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 5523c52..1ee53a5 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -1094,6 +1094,9 @@ static void pre_reset(ide_drive_t *drive)
 	if (HWIF(drive)->pre_reset != NULL)
 		HWIF(drive)->pre_reset(drive);
 
+	if (drive->current_speed != 0xff)
+		drive->desired_speed = drive->current_speed;
+	drive->current_speed = 0xff;
 }
 
 /*
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 34f2676..58564a1 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -615,6 +615,7 @@ typedef struct ide_drive_s {
         u8	init_speed;	/* transfer rate set at boot */
         u8	pio_speed;      /* unused by core, used by some drivers for fallback from DMA */
         u8	current_speed;	/* current transfer rate set */
+	u8	desired_speed;	/* desired transfer rate set */
         u8	dn;		/* now wide spread use */
         u8	wcache;		/* status of write cache */
 	u8	acoustic;	/* acoustic management */

linux-2.6-20.5z-mmap_dont_spam_logs.patch:
 aio.c |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE linux-2.6-20.5z-mmap_dont_spam_logs.patch ---

# HG changeset patch
# User Zach Brown <zach.brown at oracle.com>
# Date 1175043205 25200
# Node ID 566a7519ab7a2f178ce3aed898809ef788ec1117
# Parent 4ab768336d285af16036707fdbb8dc66b72ff369
[PATCH] aio: remove bare user-triggerable error printk

The user can generate console output if they cause do_mmap() to fail
during sys_io_setup().  This was seen in a regression test that does
exactly that by spinning calling mmap() until it gets -ENOMEM before
calling io_setup().

We don't need this printk at all, just remove it.

Signed-off-by: Zach Brown <zach.brown at oracle.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

committer: Linus Torvalds <torvalds at woody.linux-foundation.org>

--- a/fs/aio.c	Tue Mar 27 10:06:30 2007 -0700
+++ b/fs/aio.c	Tue Mar 27 17:53:25 2007 -0700
@@ -136,7 +136,6 @@ static int aio_setup_ring(struct kioctx 
 				  0);
 	if (IS_ERR((void *)info->mmap_base)) {
 		up_write(&ctx->mm->mmap_sem);
-		printk("mmap err: %ld\n", -info->mmap_base);
 		info->mmap_size = 0;
 		aio_free_ring(ctx);
 		return -EAGAIN;


linux-2.6-20.5z-nfs_allow_64bit_cookies.patch:
 nfs3xdr.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-20.5z-nfs_allow_64bit_cookies.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=598b9a56373f0596ed48f7af730706aaee998d5f
Commit:     598b9a56373f0596ed48f7af730706aaee998d5f
Parent:     ec28297a562f2b022115b9eb82e4ea724d996240
Author:     NeilBrown <neilb at suse.de>
AuthorDate: Mon Mar 26 21:32:08 2007 -0800
Committer:  Linus Torvalds <torvalds at woody.linux-foundation.org>
CommitDate: Tue Mar 27 09:05:14 2007 -0700

    [PATCH] knfsd: allow nfsd READDIR to return 64bit cookies
    
    ->readdir passes lofft_t offsets (used as nfs cookies) to
    nfs3svc_encode_entry{,_plus}, but when they pass it on to encode_entry it
    becomes an 'off_t', which isn't good.
    
    So filesystems that returned 64bit offsets would lose.
    
    Signed-off-by: Neil Brown <neilb at suse.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---
 fs/nfsd/nfs3xdr.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
index 6f67798..7e4bb0a 100644
--- a/fs/nfsd/nfs3xdr.c
+++ b/fs/nfsd/nfs3xdr.c
@@ -859,8 +859,8 @@ compose_entry_fh(struct nfsd3_readdirres *cd, struct svc_fh *fhp,
 #define NFS3_ENTRY_BAGGAGE	(2 + 1 + 2 + 1)
 #define NFS3_ENTRYPLUS_BAGGAGE	(1 + 21 + 1 + (NFS3_FHSIZE >> 2))
 static int
-encode_entry(struct readdir_cd *ccd, const char *name,
-	     int namlen, off_t offset, ino_t ino, unsigned int d_type, int plus)
+encode_entry(struct readdir_cd *ccd, const char *name, int namlen,
+	     loff_t offset, ino_t ino, unsigned int d_type, int plus)
 {
 	struct nfsd3_readdirres *cd = container_of(ccd, struct nfsd3_readdirres,
 		       					common);
@@ -880,7 +880,7 @@ encode_entry(struct readdir_cd *ccd, const char *name,
 			*cd->offset1 = htonl(offset64 & 0xffffffff);
 			cd->offset1 = NULL;
 		} else {
-			xdr_encode_hyper(cd->offset, (u64) offset);
+			xdr_encode_hyper(cd->offset, offset64);
 		}
 	}
 

linux-2.6-20.5z-softmac_check_if_running.patch:
 ieee80211softmac_wx.c |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE linux-2.6-20.5z-softmac_check_if_running.patch ---
From: John W. Linville <linville at tuxdriver.com>
Date: Wed, 3 Jan 2007 02:22:05 +0000 (-0500)
Subject: [PATCH] softmac: avoid assert in ieee80211softmac_wx_get_rate
X-Git-Tag: v2.6.21-rc1~274^2~618^2~99
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6bbdce5ac755e3b3cdcf9bb9fdbcc2af78ad34d0

[PATCH] softmac: avoid assert in ieee80211softmac_wx_get_rate

Unconfigured bcm43xx device can hit an assert() during wx_get_rate
queries.  This is because bcm43xx calls ieee80211softmac_start late
(i.e. during open instead of probe).

   bcm43xx_net_open ->
      bcm43xx_init_board ->
         bcm43xx_select_wireless_core ->
            ieee80211softmac_start

Fix is to check that device is running before completing
ieee80211softmac_wx_get_rate.

Signed-off-by: John W. Linville <linville at tuxdriver.com>
---

diff --git a/net/ieee80211/softmac/ieee80211softmac_wx.c b/net/ieee80211/softmac/ieee80211softmac_wx.c
index fa2f7da..fb58e03 100644
--- a/net/ieee80211/softmac/ieee80211softmac_wx.c
+++ b/net/ieee80211/softmac/ieee80211softmac_wx.c
@@ -265,6 +265,12 @@ ieee80211softmac_wx_get_rate(struct net_device *net_dev,
 	int err = -EINVAL;
 
 	spin_lock_irqsave(&mac->lock, flags);
+
+	if (unlikely(!mac->running)) {
+		err = -ENODEV;
+		goto out_unlock;
+	}
+
 	switch (mac->txrates.default_rate) {
 	case IEEE80211_CCK_RATE_1MB:
 		data->bitrate.value = 1000000;

linux-2.6-proposed-i82875p-edac-fix.patch:
 i82875p_edac.c |   13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

--- NEW FILE linux-2.6-proposed-i82875p-edac-fix.patch ---
From: John Feeney <jfeeney at redhat.com>

The 82875 EDAC driver enables an otherwise-hidden PCI device, but
doesn't register it as a PCI device properly.  Therefore, the device
list in /proc/bus/pci/devices is different than the tree in 
/sys/bus/pci. This usually manifests as the X server failing to start,
since it expects the two lists to be consistent.

Signed-off-by: Adam Jackson <ajackson at redhat.com>

--- linux-2.6.18.noarch/drivers/edac/i82875p_edac.c~
+++ linux-2.6.18.noarch/drivers/edac/i82875p_edac.c
@@ -261,10 +261,6 @@ static void i82875p_check(struct mem_ctl
 	i82875p_process_error_info(mci, &info, 1);
 }
 
-#ifdef CONFIG_PROC_FS
-extern int pci_proc_attach_device(struct pci_dev *);
-#endif
-
 /* Return 0 on success or 1 on failure. */
 static int i82875p_setup_overfl_dev(struct pci_dev *pdev,
 		struct pci_dev **ovrfl_pdev, void __iomem **ovrfl_window)
@@ -287,17 +283,12 @@ static int i82875p_setup_overfl_dev(stru
 
 		if (dev == NULL)
 			return 1;
+
+        	pci_bus_add_device(dev);
 	}
 
 	*ovrfl_pdev = dev;
 
-#ifdef CONFIG_PROC_FS
-	if ((dev->procent == NULL) && pci_proc_attach_device(dev)) {
-		i82875p_printk(KERN_ERR, "%s(): Failed to attach overflow "
-			       "device\n", __func__);
-		return 1;
-	}
-#endif  /* CONFIG_PROC_FS */
 	if (pci_enable_device(dev)) {
 		i82875p_printk(KERN_ERR, "%s(): Failed to enable overflow "
 			       "device\n", __func__);
_

linux-2.6.20.5-rc1-ata_scsi_preserve_lba_bit.patch:
 libata-scsi.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE linux-2.6.20.5-rc1-ata_scsi_preserve_lba_bit.patch ---
---
--- linux/drivers/ata/libata-scsi.c.orig	2007-03-21 13:35:02.000000000 -0400
+++ linux/drivers/ata/libata-scsi.c	2007-03-30 17:40:58.000000000 -0400
@@ -333,7 +333,7 @@
 	scsi_cmd[8]  = args[3];
 	scsi_cmd[10] = args[4];
 	scsi_cmd[12] = args[5];
-	scsi_cmd[13] = args[6] & 0x0f;
+	scsi_cmd[13] = args[6] & 0x4f;
 	scsi_cmd[14] = args[0];
 
 	/* Good values for timeout and retries?  Values below
-- 
Mark Lord
Real-Time Remedies Inc.
mlord at pobox.com
-
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/


linux-2.6.20.5-rc1-crypto_walk_fix_advance_by.patch:
 scatterwalk.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE linux-2.6.20.5-rc1-crypto_walk_fix_advance_by.patch ---
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/crypto/scatterwalk.c b/crypto/scatterwalk.c
index a664231..0f76175 100644
--- a/crypto/scatterwalk.c
+++ b/crypto/scatterwalk.c
@@ -91,7 +91,7 @@ void scatterwalk_copychunks(void *buf, struct scatter_walk *walk,
 		memcpy_dir(buf, vaddr, len_this_page, out);
 		scatterwalk_unmap(vaddr, out);
 
-		scatterwalk_advance(walk, nbytes);
+		scatterwalk_advance(walk, len_this_page);
 
 		if (nbytes == len_this_page)
 			break;
-
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/



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

iD8DBQBGDX4ayGugalF9Dw4RAiudAKCL89HErY7xSkMcWw83ZtzgoZSrzQCaA9bY
DzaYyUONaW1KzmIj/TTy+IQ=
=gdSw
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -r1.438 -r1.439
--- .cvsignore	23 Mar 2007 22:40:59 -0000	1.438
+++ .cvsignore	4 Apr 2007 19:42:24 -0000	1.439
@@ -8,3 +8,4 @@
 patch-2.6.20.2-3.bz2
 patch-2.6.20.3-4.bz2
 xen-3.0.3-11774.tar.bz2
+patch-2.6.20.5-rc1.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2310
retrieving revision 1.2311
diff -u -r1.2310 -r1.2311
--- kernel-2.6.spec	4 Apr 2007 14:49:53 -0000	1.2310
+++ kernel-2.6.spec	4 Apr 2007 19:42:24 -0000	1.2311
@@ -314,6 +314,9 @@
 Patch2: patch-2.6.20.1-2.bz2
 Patch3: patch-2.6.20.2-3.bz2
 Patch4: patch-2.6.20.3-4.bz2
+Patch5: patch-2.6.20.5-rc1.bz2
+Patch6: linux-2.6.20.5-rc1-ata_scsi_preserve_lba_bit.patch
+Patch7: linux-2.6.20.5-rc1-crypto_walk_fix_advance_by.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 
@@ -451,6 +454,14 @@
 # 2.6.20 fixes for testing
 Patch1790: linux-2.6-jfs_fix_deadlock.patch
 
+# post 2.6.20.5
+Patch1800: linux-2.6-20.5y-dm_crypt_disable_barriers.patch
+Patch1801: linux-2.6-20.5z-ide_use_proper_error_recovery.patch
+Patch1802: linux-2.6-20.5z-mmap_dont_spam_logs.patch
+Patch1803: linux-2.6-20.5z-nfs_allow_64bit_cookies.patch
+Patch1804: linux-2.6-20.5z-softmac_check_if_running.patch
+Patch1805: linux-2.6-proposed-i82875p-edac-fix.patch
+
 # SELinux/audit patches.
 Patch1850: linux-2.6-selinux-mprotect-checks.patch
 
@@ -863,6 +874,9 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
@@ -1075,6 +1089,14 @@
 # 2.6.20 test fixes
 %patch1790 -p1
 
+# post 2.6.20.5
+%patch1800 -p1
+%patch1801 -p1
+%patch1802 -p1
+%patch1803 -p1
+%patch1804 -p1
+%patch1805 -p1
+
 # Fix the SELinux mprotect checks on executable mappings
 %patch1850 -p1
 
@@ -1864,6 +1886,10 @@
 %endif
 
 %changelog
+* Wed Apr  4 2007 Chuck Ebbert <cebbert at redhat.com>		1.2311
+- 2.6.20.5-rc1 plus two fixes for broken -rc1 patches.
+- additional post 2.6.20.5 patches (1800-1805)
+
 * Wed Apr  4 2007 Markus Armbruster <armbru at redhat.com>
 - Xen kernel profiling fix is broken, back it out.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -r1.378 -r1.379
--- sources	23 Mar 2007 22:40:59 -0000	1.378
+++ sources	4 Apr 2007 19:42:25 -0000	1.379
@@ -4,3 +4,4 @@
 8425cead82afc782e2a3866a287a61fe  patch-2.6.20.2-3.bz2
 39b98fdb6320cc986a67e76fbeb35a0c  patch-2.6.20.3-4.bz2
 a9d44b2651b0898e103395b2a7a4f263  xen-3.0.3-11774.tar.bz2
+f2ab4510e8a885ddc6eb6ba2bd6cec0e  patch-2.6.20.5-rc1.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- upstream	23 Mar 2007 22:40:59 -0000	1.341
+++ upstream	4 Apr 2007 19:42:25 -0000	1.342
@@ -3,3 +3,4 @@
 patch-2.6.20.1-2.bz2
 patch-2.6.20.2-3.bz2
 patch-2.6.20.3-4.bz2
+patch-2.6.20.5-rc1.bz2



From fedora-cvs-commits at redhat.com  Wed Apr  4 19:45:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 15:45:01 -0400
Subject: rpms/selinux-policy/devel policy-20070219.patch, 1.37,
	1.38 selinux-policy.spec, 1.424, 1.425
Message-ID: <200704041945.l34Jj180027017@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20070219.patch selinux-policy.spec 
Log Message:
* Tue Apr 3 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-3
- Fix interface call


policy-20070219.patch:
 Rules.modular                             |   12 +
 policy/flask/access_vectors               |    4 
 policy/global_booleans                    |    2 
 policy/global_tunables                    |   39 +++-
 policy/mls                                |   31 ++-
 policy/modules/admin/acct.te              |    1 
 policy/modules/admin/acct.xml             |   43 +++++
 policy/modules/admin/alsa.xml             |   43 +++++
 policy/modules/admin/amanda.xml           |   85 ++++++++++
 policy/modules/admin/amtu.fc              |    3 
 policy/modules/admin/amtu.if              |   53 ++++++
 policy/modules/admin/amtu.te              |   56 ++++++
 policy/modules/admin/amtu.xml             |   36 ++++
 policy/modules/admin/anaconda.xml         |    3 
 policy/modules/admin/apt.xml              |   95 +++++++++++
 policy/modules/admin/backup.xml           |   35 ++++
 policy/modules/admin/bootloader.te        |    2 
 policy/modules/admin/bootloader.xml       |   79 +++++++++
 policy/modules/admin/certwatch.xml        |   37 ++++
 policy/modules/admin/consoletype.te       |    8 
 policy/modules/admin/consoletype.xml      |   47 +++++
 policy/modules/admin/ddcprobe.xml         |   35 ++++
 policy/modules/admin/dmesg.te             |    1 
 policy/modules/admin/dmesg.xml            |   24 ++
 policy/modules/admin/dmidecode.xml        |   35 ++++
 policy/modules/admin/dpkg.xml             |  125 +++++++++++++++
 policy/modules/admin/firstboot.if         |   18 ++
 policy/modules/admin/firstboot.xml        |   88 ++++++++++
 policy/modules/admin/kudzu.te             |    2 
 policy/modules/admin/kudzu.xml            |   45 +++++
 policy/modules/admin/logrotate.xml        |   75 +++++++++
 policy/modules/admin/logwatch.te          |    2 
 policy/modules/admin/logwatch.xml         |   23 ++
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/rpm.fc               |    3 
 policy/modules/admin/rpm.if               |   65 +++++++
 policy/modules/admin/rpm.te               |    2 
 policy/modules/admin/su.if                |    6 
 policy/modules/admin/usermanage.te        |   42 +++--
 policy/modules/apps/games.fc              |    1 
 policy/modules/apps/gnome.if              |   26 +++
 policy/modules/apps/gpg.fc                |    2 
 policy/modules/apps/loadkeys.if           |   44 +----
 policy/modules/apps/mozilla.if            |    1 
 policy/modules/apps/slocate.te            |    4 
 policy/modules/apps/usernetctl.te         |   10 -
 policy/modules/kernel/corecommands.fc     |    7 
 policy/modules/kernel/corecommands.if     |   20 ++
 policy/modules/kernel/corenetwork.if.in   |   54 ++++++
 policy/modules/kernel/corenetwork.te.in   |   18 +-
 policy/modules/kernel/devices.if          |   36 ++++
 policy/modules/kernel/domain.if           |   18 ++
 policy/modules/kernel/domain.te           |   46 +++++
 policy/modules/kernel/files.fc            |    1 
 policy/modules/kernel/files.if            |   81 ++++++++-
 policy/modules/kernel/filesystem.if       |   39 ++++
 policy/modules/kernel/filesystem.te       |   11 +
 policy/modules/kernel/kernel.if           |   23 ++
 policy/modules/kernel/kernel.te           |    2 
 policy/modules/kernel/mls.if              |   20 ++
 policy/modules/kernel/mls.te              |    3 
 policy/modules/kernel/selinux.if          |   38 ++++
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.if         |    2 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/services/apache.fc         |   14 -
 policy/modules/services/apache.if         |  161 +++++++++++++++++++
 policy/modules/services/apache.te         |   59 +++++++
 policy/modules/services/apcupsd.fc        |    9 +
 policy/modules/services/apcupsd.if        |  108 +++++++++++++
 policy/modules/services/apcupsd.te        |   81 +++++++++
 policy/modules/services/automount.te      |    2 
 policy/modules/services/ccs.te            |   12 +
 policy/modules/services/consolekit.fc     |    1 
 policy/modules/services/consolekit.te     |   22 ++
 policy/modules/services/cron.fc           |    1 
 policy/modules/services/cron.if           |   33 +---
 policy/modules/services/cron.te           |   51 ++++--
 policy/modules/services/cups.te           |    2 
 policy/modules/services/cvs.te            |    2 
 policy/modules/services/cyrus.te          |    5 
 policy/modules/services/dbus.if           |   63 +++++++
 policy/modules/services/dhcp.te           |    2 
 policy/modules/services/djbdns.te         |    5 
 policy/modules/services/dovecot.te        |    5 
 policy/modules/services/ftp.te            |    5 
 policy/modules/services/hal.fc            |    6 
 policy/modules/services/hal.te            |  130 +++++++++++++++
 policy/modules/services/inetd.te          |    5 
 policy/modules/services/kerberos.if       |   58 ++-----
 policy/modules/services/kerberos.te       |   36 ++++
 policy/modules/services/mta.if            |   19 ++
 policy/modules/services/mta.te            |    2 
 policy/modules/services/networkmanager.te |    2 
 policy/modules/services/nis.if            |    4 
 policy/modules/services/nscd.te           |   10 +
 policy/modules/services/ntp.te            |    1 
 policy/modules/services/pegasus.if        |   18 ++
 policy/modules/services/pegasus.te        |    6 
 policy/modules/services/postfix.if        |    1 
 policy/modules/services/postfix.te        |    8 
 policy/modules/services/ppp.te            |    9 -
 policy/modules/services/procmail.te       |    1 
 policy/modules/services/pyzor.te          |    1 
 policy/modules/services/radius.te         |    4 
 policy/modules/services/rpc.if            |    5 
 policy/modules/services/rsync.te          |    1 
 policy/modules/services/samba.fc          |    3 
 policy/modules/services/samba.if          |   63 +++++++
 policy/modules/services/samba.te          |   77 +++++++++
 policy/modules/services/sasl.te           |   11 +
 policy/modules/services/sendmail.if       |   20 ++
 policy/modules/services/smartmon.te       |    1 
 policy/modules/services/snmp.te           |   10 +
 policy/modules/services/spamassassin.te   |    7 
 policy/modules/services/squid.fc          |    2 
 policy/modules/services/squid.if          |   22 ++
 policy/modules/services/squid.te          |   12 +
 policy/modules/services/ssh.if            |   39 ++++
 policy/modules/services/ssh.te            |    5 
 policy/modules/services/xserver.te        |   10 -
 policy/modules/services/zabbix.fc         |    4 
 policy/modules/services/zabbix.if         |   87 ++++++++++
 policy/modules/services/zabbix.te         |   64 +++++++
 policy/modules/system/application.fc      |    1 
 policy/modules/system/application.if      |  104 ++++++++++++
 policy/modules/system/application.te      |   14 +
 policy/modules/system/authlogin.if        |   83 ++++++++--
 policy/modules/system/authlogin.te        |    3 
 policy/modules/system/fstools.fc          |    1 
 policy/modules/system/fstools.te          |    1 
 policy/modules/system/fusermount.fc       |    6 
 policy/modules/system/fusermount.if       |   41 +++++
 policy/modules/system/fusermount.te       |   45 +++++
 policy/modules/system/getty.te            |    3 
 policy/modules/system/hostname.te         |   14 +
 policy/modules/system/init.if             |    3 
 policy/modules/system/init.te             |   35 +++-
 policy/modules/system/ipsec.if            |   20 ++
 policy/modules/system/iptables.te         |    4 
 policy/modules/system/libraries.fc        |    8 
 policy/modules/system/libraries.te        |   20 ++
 policy/modules/system/locallogin.te       |    7 
 policy/modules/system/logging.if          |   21 ++
 policy/modules/system/logging.te          |    2 
 policy/modules/system/lvm.te              |    5 
 policy/modules/system/modutils.te         |   11 +
 policy/modules/system/mount.fc            |    3 
 policy/modules/system/mount.if            |   37 ++++
 policy/modules/system/mount.te            |   64 +++++++
 policy/modules/system/raid.te             |    1 
 policy/modules/system/selinuxutil.fc      |    1 
 policy/modules/system/selinuxutil.if      |    5 
 policy/modules/system/selinuxutil.te      |   68 +++-----
 policy/modules/system/udev.fc             |    2 
 policy/modules/system/udev.te             |   11 +
 policy/modules/system/unconfined.fc       |    1 
 policy/modules/system/unconfined.if       |   10 -
 policy/modules/system/unconfined.te       |   24 ++
 policy/modules/system/userdomain.if       |  246 ++++++++++++++++--------------
 policy/modules/system/userdomain.te       |   46 ++++-
 policy/modules/system/xen.te              |   35 ++++
 policy/support/obj_perm_sets.spt          |   12 +
 163 files changed, 3819 insertions(+), 422 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.37 -r 1.38 policy-20070219.patch
Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- policy-20070219.patch	3 Apr 2007 19:25:58 -0000	1.37
+++ policy-20070219.patch	4 Apr 2007 19:44:58 -0000	1.38
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.5.11/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2007-02-26 09:43:33.000000000 -0500
-+++ serefpolicy-2.5.11/policy/flask/access_vectors	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/flask/access_vectors	2007-04-04 13:46:37.000000000 -0400
 @@ -598,6 +598,8 @@
  	shmempwd
  	shmemgrp
@@ -21,7 +21,7 @@
  class key
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.5.11/policy/global_booleans
 --- nsaserefpolicy/policy/global_booleans	2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-2.5.11/policy/global_booleans	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/global_booleans	2007-04-04 13:46:37.000000000 -0400
 @@ -4,7 +4,6 @@
  # file should be used.
  #
@@ -40,7 +40,7 @@
  ## <p>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.5.11/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2007-03-26 16:24:14.000000000 -0400
-+++ serefpolicy-2.5.11/policy/global_tunables	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/global_tunables	2007-04-04 13:46:37.000000000 -0400
 @@ -49,6 +49,14 @@
  
  ## <desc>
@@ -121,7 +121,7 @@
 -')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.5.11/policy/mls
 --- nsaserefpolicy/policy/mls	2007-03-09 13:02:20.000000000 -0500
-+++ serefpolicy-2.5.11/policy/mls	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/mls	2007-04-04 13:46:37.000000000 -0400
 @@ -89,12 +89,14 @@
  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
@@ -195,7 +195,7 @@
  mlsconstrain association { polmatch }
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.5.11/policy/modules/admin/acct.te
 --- nsaserefpolicy/policy/modules/admin/acct.te	2007-03-26 10:39:08.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/admin/acct.te	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/admin/acct.te	2007-04-04 13:46:37.000000000 -0400
 @@ -9,6 +9,7 @@
  type acct_t;
  type acct_exec_t;
@@ -204,16 +204,199 @@
  
  type acct_data_t;
  logging_log_file(acct_data_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.xml serefpolicy-2.5.11/policy/modules/admin/acct.xml
+--- nsaserefpolicy/policy/modules/admin/acct.xml	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.5.11/policy/modules/admin/acct.xml	2007-04-04 13:46:37.000000000 -0400
+@@ -0,0 +1,43 @@
++<module name="acct" filename="policy/modules/admin/acct.if">
++<summary>Berkeley process accounting</summary>
++<interface name="acct_domtrans" lineno="13">
++<summary>
++Transition to the accounting management domain.
++</summary>
++<param name="domain">
++<summary>
++Domain allowed access.
++</summary>
++</param>
++</interface>
++<interface name="acct_exec" lineno="32">
++<summary>
++Execute accounting management tools in the caller domain.
++</summary>
++<param name="domain">
++<summary>
++The type of the process performing this action.
++</summary>
++</param>
++</interface>
++<interface name="acct_exec_data" lineno="53">
++<summary>
++Execute accounting management data in the caller domain.
++</summary>
++<param name="domain">
++<summary>
++The type of the process performing this action.
++</summary>
++</param>
++</interface>
++<interface name="acct_manage_data" lineno="72">
++<summary>
++Create, read, write, and delete process accounting data.
++</summary>
++<param name="domain">
++<summary>
++The type of the process performing this action.
++</summary>
++</param>
++</interface>
++</module>
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.xml serefpolicy-2.5.11/policy/modules/admin/alsa.xml
+--- nsaserefpolicy/policy/modules/admin/alsa.xml	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.5.11/policy/modules/admin/alsa.xml	2007-04-04 13:46:38.000000000 -0400
+@@ -0,0 +1,43 @@
++<module name="alsa" filename="policy/modules/admin/alsa.if">
++<summary>Ainit ALSA configuration tool</summary>
++<interface name="alsa_domtrans" lineno="13">
++<summary>
++Domain transition to alsa
++</summary>
++<param name="domain">
++<summary>
++Domain allowed access.
++</summary>
++</param>
++</interface>
++<interface name="alsa_rw_semaphores" lineno="32">
++<summary>
++Allow read and write access to alsa semaphores.
++</summary>
++<param name="domain">
++<summary>
++Domain allowed access.
++</summary>
++</param>
++</interface>
++<interface name="alsa_rw_shared_mem" lineno="50">
++<summary>
++Allow read and write access to alsa shared memory.
++</summary>
++<param name="domain">
++<summary>
++Domain allowed access.
++</summary>
++</param>
++</interface>
++<interface name="alsa_read_rw_config" lineno="68">
++<summary>
++Read alsa writable config files.
++</summary>
++<param name="domain">
++<summary>
++Domain allowed access.
++</summary>
++</param>
++</interface>
++</module>
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.xml serefpolicy-2.5.11/policy/modules/admin/amanda.xml
+--- nsaserefpolicy/policy/modules/admin/amanda.xml	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.5.11/policy/modules/admin/amanda.xml	2007-04-04 13:46:38.000000000 -0400
+@@ -0,0 +1,85 @@
++<module name="amanda" filename="policy/modules/admin/amanda.if">
++<summary>Automated backup program.</summary>
++<interface name="amanda_domtrans_recover" lineno="13">
++<summary>
++Execute amrecover in the amanda_recover domain.
++</summary>
++<param name="domain">
++<summary>
++The type of the process performing this action.
++</summary>
++</param>
++</interface>
++<interface name="amanda_run_recover" lineno="43">
++<summary>
++Execute amrecover in the amanda_recover domain, and
++allow the specified role the amanda_recover domain.
++</summary>
++<param name="domain">
++<summary>
++The type of the process performing this action.
++</summary>
++</param>
++<param name="role">
++<summary>
++The role to be allowed the amanda_recover domain.
++</summary>
++</param>
++<param name="terminal">
++<summary>
++The type of the terminal allow the amanda_recover domain to use.
++</summary>
++</param>
++<rolecap/>
++</interface>
++<interface name="amanda_search_lib" lineno="63">
++<summary>
++Search amanda library directories.
++</summary>
++<param name="domain">
++<summary>
++The type of the process performing this action.
++</summary>
++</param>
++</interface>
++<interface name="amanda_dontaudit_read_dumpdates" lineno="82">
++<summary>
[...2189 lines suppressed...]
  init_system_domain(ldconfig_t,ldconfig_exec_t)
  role system_r types ldconfig_t;
@@ -4756,7 +5873,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.5.11/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/locallogin.te	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/locallogin.te	2007-04-04 13:46:37.000000000 -0400
 @@ -48,6 +48,8 @@
  allow local_login_t self:msgq create_msgq_perms;
  allow local_login_t self:msg { send receive };
@@ -4787,7 +5904,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.5.11/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/logging.if	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/logging.if	2007-04-04 13:46:37.000000000 -0400
 @@ -480,6 +480,8 @@
  	files_search_var($1)
  	manage_files_pattern($1,logfile,logfile)
@@ -4822,7 +5939,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.5.11/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/logging.te	2007-04-03 07:38:23.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/logging.te	2007-04-04 13:46:37.000000000 -0400
 @@ -11,6 +11,7 @@
  type auditctl_t;
  type auditctl_exec_t;
@@ -4841,7 +5958,7 @@
  files_dontaudit_search_isid_type_dirs(syslogd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.5.11/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/lvm.te	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/lvm.te	2007-04-04 13:46:37.000000000 -0400
 @@ -16,6 +16,7 @@
  type lvm_t;
  type lvm_exec_t;
@@ -4863,7 +5980,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.5.11/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/modutils.te	2007-04-02 15:52:33.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/modutils.te	2007-04-04 13:46:37.000000000 -0400
 @@ -68,7 +68,7 @@
  # for locking: (cjp: ????)
  files_write_kernel_modules(insmod_t)
@@ -4912,7 +6029,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.fc serefpolicy-2.5.11/policy/modules/system/mount.fc
 --- nsaserefpolicy/policy/modules/system/mount.fc	2006-11-16 17:15:24.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/system/mount.fc	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/mount.fc	2007-04-04 13:46:37.000000000 -0400
 @@ -1,4 +1,3 @@
  /bin/mount.*			--	gen_context(system_u:object_r:mount_exec_t,s0)
  /bin/umount.*			--	gen_context(system_u:object_r:mount_exec_t,s0)
@@ -4921,7 +6038,7 @@
 +/sbin/mount.ntfs-3g		--	gen_context(system_u:object_r:mount_ntfs_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-2.5.11/policy/modules/system/mount.if
 --- nsaserefpolicy/policy/modules/system/mount.if	2007-01-02 12:57:49.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/system/mount.if	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/mount.if	2007-04-04 13:46:37.000000000 -0400
 @@ -143,3 +143,40 @@
  		mount_domtrans($1)
  	')
@@ -4965,7 +6082,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.5.11/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2007-03-26 16:24:13.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/mount.te	2007-04-02 12:05:34.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/mount.te	2007-04-04 13:46:37.000000000 -0400
 @@ -9,6 +9,13 @@
  ifdef(`targeted_policy',`
  ## <desc>
@@ -5069,7 +6186,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-2.5.11/policy/modules/system/raid.te
 --- nsaserefpolicy/policy/modules/system/raid.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/raid.te	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/raid.te	2007-04-04 13:46:37.000000000 -0400
 @@ -46,6 +46,7 @@
  # RAID block device access
  storage_manage_fixed_disk(mdadm_t)
@@ -5080,7 +6197,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.5.11/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2006-11-16 17:15:24.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/system/selinuxutil.fc	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/selinuxutil.fc	2007-04-04 13:46:37.000000000 -0400
 @@ -40,6 +40,7 @@
  /usr/sbin/setfiles.*		--	gen_context(system_u:object_r:setfiles_exec_t,s0)
  /usr/sbin/setsebool		--	gen_context(system_u:object_r:semanage_exec_t,s0)
@@ -5091,7 +6208,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.5.11/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/selinuxutil.if	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/selinuxutil.if	2007-04-04 13:46:37.000000000 -0400
 @@ -616,7 +616,7 @@
  	gen_require(`
  		type selinux_config_t;
@@ -5120,7 +6237,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.5.11/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/selinuxutil.te	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/selinuxutil.te	2007-04-04 13:46:37.000000000 -0400
 @@ -1,10 +1,8 @@
  
  policy_module(selinuxutil,1.4.2)
@@ -5274,7 +6391,7 @@
  dev_read_urand(semanage_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-2.5.11/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2006-11-16 17:15:24.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/system/udev.fc	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/udev.fc	2007-04-04 13:46:37.000000000 -0400
 @@ -1,6 +1,6 @@
  # udev
  
@@ -5285,7 +6402,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.5.11/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2007-03-20 23:38:29.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/udev.te	2007-04-02 14:36:57.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/udev.te	2007-04-04 13:46:37.000000000 -0400
 @@ -89,6 +89,7 @@
  dev_manage_all_dev_nodes(udev_t)
  dev_rw_generic_files(udev_t)
@@ -5324,7 +6441,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.5.11/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2007-02-19 11:32:53.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/system/unconfined.fc	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/unconfined.fc	2007-04-04 13:46:37.000000000 -0400
 @@ -10,4 +10,5 @@
  /usr/bin/valgrind 		--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  /usr/local/RealPlayer/realplay\.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
@@ -5333,7 +6450,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.5.11/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2007-02-19 11:32:53.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/system/unconfined.if	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/unconfined.if	2007-04-04 13:46:37.000000000 -0400
 @@ -18,7 +18,7 @@
  	')
  
@@ -5360,7 +6477,7 @@
  	corenet_unconfined($1)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.5.11/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2007-03-20 09:23:14.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/unconfined.te	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/unconfined.te	2007-04-04 13:46:37.000000000 -0400
 @@ -6,6 +6,15 @@
  # Declarations
  #
@@ -5426,7 +6543,7 @@
  		init_dbus_chat_script(unconfined_execmem_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.5.11/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-03-26 16:24:13.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/userdomain.if	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/userdomain.if	2007-04-04 13:46:37.000000000 -0400
 @@ -114,6 +114,10 @@
  		# Allow making the stack executable via mprotect.
  		allow $1_t self:process execstack;
@@ -5839,7 +6956,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.5.11/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2007-03-26 16:24:13.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/userdomain.te	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/userdomain.te	2007-04-04 13:46:37.000000000 -0400
 @@ -15,7 +15,6 @@
  # Declarations
  #
@@ -5959,7 +7076,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.5.11/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/xen.te	2007-04-02 17:05:45.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/xen.te	2007-04-04 13:46:37.000000000 -0400
 @@ -25,6 +25,10 @@
  domain_type(xend_t)
  init_daemon_domain(xend_t, xend_exec_t)
@@ -6044,7 +7161,7 @@
 +fs_read_dos_files(xend_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-2.5.11/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2007-01-02 12:57:51.000000000 -0500
-+++ serefpolicy-2.5.11/policy/support/obj_perm_sets.spt	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/policy/support/obj_perm_sets.spt	2007-04-04 13:46:37.000000000 -0400
 @@ -215,7 +215,7 @@
  define(`getattr_file_perms',`{ getattr }')
  define(`setattr_file_perms',`{ setattr }')
@@ -6070,7 +7187,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.5.11/Rules.modular
 --- nsaserefpolicy/Rules.modular	2007-03-22 14:30:10.000000000 -0400
-+++ serefpolicy-2.5.11/Rules.modular	2007-04-02 11:16:11.000000000 -0400
++++ serefpolicy-2.5.11/Rules.modular	2007-04-04 13:46:37.000000000 -0400
 @@ -167,7 +167,7 @@
  # these have to run individually because order matters:
  	$(verbose) $(GREP) '^sid ' $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -r1.424 -r1.425
--- selinux-policy.spec	3 Apr 2007 19:25:58 -0000	1.424
+++ selinux-policy.spec	4 Apr 2007 19:44:58 -0000	1.425
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.5.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -358,6 +358,9 @@
 %endif
 
 %changelog
+* Tue Apr 3 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-3
+- Fix interface call
+
 * Tue Apr 3 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-2
 - Allow syslog-ng to read /var
 - Allow locate to getattr on all filesystems



From fedora-cvs-commits at redhat.com  Wed Apr  4 19:50:29 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 15:50:29 -0400
Subject: rpms/gnome-panel/devel gnome-panel-2.18.0-fix-invalid-read.patch,
	NONE, 1.1 gnome-panel.spec, 1.192, 1.193
Message-ID: <200704041950.l34JoTpo027233@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.18.0-fix-invalid-read.patch 
Log Message:
- fix invalid read and potentially fix 234544


gnome-panel-2.18.0-fix-invalid-read.patch:
 panel-run-dialog.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+)

--- NEW FILE gnome-panel-2.18.0-fix-invalid-read.patch ---
--- gnome-panel-2.18.0/gnome-panel/panel-run-dialog.c.fix-invalid-read	2007-04-04 15:35:14.000000000 -0400
+++ gnome-panel-2.18.0/gnome-panel/panel-run-dialog.c	2007-04-04 15:40:24.000000000 -0400
@@ -111,6 +111,8 @@
 
 static PanelRunDialog *static_dialog = NULL;
 
+static void panel_run_dialog_disconnect_pixmap (PanelRunDialog *dialog);
+
 static void
 panel_run_dialog_destroy (PanelRunDialog *dialog)
 {
@@ -165,6 +167,8 @@
 	if (dialog->completion)
 		g_completion_free (dialog->completion);
 	dialog->completion = NULL;
+
+	panel_run_dialog_disconnect_pixmap (dialog);
 	
 	g_free (dialog);
 }
@@ -1905,6 +1909,17 @@
 }
 
 static void
+panel_run_dialog_disconnect_pixmap (PanelRunDialog *dialog)
+{
+	g_signal_handlers_disconnect_by_func (dialog->pixmap,
+			                      G_CALLBACK (panel_run_dialog_style_set),
+			                      dialog);
+	g_signal_handlers_disconnect_by_func (dialog->pixmap,
+			                      G_CALLBACK (panel_run_dialog_screen_changed),
+			                      dialog);
+}
+
+static void
 panel_run_dialog_static_dialog_destroyed (PanelRunDialog *dialog)
 {
 	/* just reset the static dialog to NULL for next time */


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- gnome-panel.spec	4 Apr 2007 16:28:42 -0000	1.192
+++ gnome-panel.spec	4 Apr 2007 19:50:27 -0000	1.193
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.18.0
-Release: 7%{?dist} 
+Release: 8%{?dist} 
 URL: http://www.gnome.org
 Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.18/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -104,6 +104,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=426281
 Patch20: gnome-panel-2.18.0-fix-name-too-long-error.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=413921
+Patch21: gnome-panel-2.18.0-fix-invalid-read.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -139,6 +142,7 @@
 %patch18 -p1 -b .hide-lock-menu-if-root
 %patch19 -p1 -b .update-clock-immediately
 %patch20 -p1 -b .fix-name-too-long-error
+%patch21 -p1 -b .fix-invalid-read
 
 . %{SOURCE4}
 
@@ -319,6 +323,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Apr  4 2007 Ray Strode <rstrode at redhat.com> - 2.18.0-8
+- fix invalid read and potentially fix 234544
+
 * Wed Apr  4 2007 Ray Strode <rstrode at redhat.com> - 2.18.0-7
 - Allow users to correct desktop launchers when given an 
   error initially (bug 233015)



From fedora-cvs-commits at redhat.com  Wed Apr  4 20:43:48 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 16:43:48 -0400
Subject: rpms/kernel/devel patch-2.6.21-rc5-git12.bz2.sign, NONE,
	1.1 .cvsignore, 1.598, 1.599 kernel-2.6.spec, 1.3044,
	1.3045 linux-2.6-debug-taint-vm.patch, 1.10, 1.11 sources,
	1.561, 1.562 upstream, 1.489,
	1.490 patch-2.6.21-rc5-git10.bz2.sign, 1.1, NONE
Message-ID: <200704042043.l34Khm7q018020@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-debug-taint-vm.patch 
	sources upstream 
Added Files:
	patch-2.6.21-rc5-git12.bz2.sign 
Removed Files:
	patch-2.6.21-rc5-git10.bz2.sign 
Log Message:
* Wed Apr 04 2007 Dave Jones <davej at redhat.com>
- 2.6.21-rc5-git12



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

iD8DBQBGE/dayGugalF9Dw4RAoT5AJ99Bbp0ZXW0kNdW4i8FmS5f274onACggXQZ
niXR/vgRELPI2Wok6E0hAeo=
=jk/s
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.598
retrieving revision 1.599
diff -u -r1.598 -r1.599
--- .cvsignore	4 Apr 2007 05:30:25 -0000	1.598
+++ .cvsignore	4 Apr 2007 20:43:46 -0000	1.599
@@ -5,4 +5,4 @@
 kernel-2.6.20
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc5.bz2
-patch-2.6.21-rc5-git10.bz2
+patch-2.6.21-rc5-git12.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3044
retrieving revision 1.3045
diff -u -r1.3044 -r1.3045
--- kernel-2.6.spec	4 Apr 2007 05:41:09 -0000	1.3044
+++ kernel-2.6.spec	4 Apr 2007 20:43:46 -0000	1.3045
@@ -374,7 +374,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.21-rc5.bz2
-Patch2: patch-2.6.21-rc5-git10.bz2
+Patch2: patch-2.6.21-rc5-git12.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -2253,6 +2253,9 @@
 
 %changelog
 * Wed Apr 04 2007 Dave Jones <davej at redhat.com>
+- 2.6.21-rc5-git12
+
+* Wed Apr 04 2007 Dave Jones <davej at redhat.com>
 - Silence noisy power management printk's
 
 * Wed Apr 04 2007 Dave Jones <davej at redhat.com>

linux-2.6-debug-taint-vm.patch:
 linux-2.6.15/mm/page_alloc.c                  |    4 ++--
 linux-2.6.20.noarch/include/asm-generic/bug.h |    9 ++++++---
 linux-2.6.20.noarch/mm/slab.c                 |    4 ++--
 linux-2000/kernel/panic.c                     |    1 +
 4 files changed, 11 insertions(+), 7 deletions(-)

Index: linux-2.6-debug-taint-vm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-taint-vm.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-debug-taint-vm.patch	12 Feb 2007 23:06:34 -0000	1.10
+++ linux-2.6-debug-taint-vm.patch	4 Apr 2007 20:43:46 -0000	1.11
@@ -58,16 +58,16 @@
  	dump_stack();
  	page->flags &= ~(1 << PG_lru	|
  			1 << PG_private |
---- linux-2.6.16.noarch/mm/slab.c~	2006-03-22 18:25:29.000000000 -0500
-+++ linux-2.6.16.noarch/mm/slab.c	2006-03-22 18:25:53.000000000 -0500
-@@ -1573,8 +1573,8 @@ static void check_poison_obj(struct kmem
+--- linux-2.6.20.noarch/mm/slab.c~	2007-04-04 16:36:51.000000000 -0400
++++ linux-2.6.20.noarch/mm/slab.c	2007-04-04 16:37:03.000000000 -0400
+@@ -1802,8 +1802,8 @@ static void check_poison_obj(struct kmem
  			/* Print header */
  			if (lines == 0) {
  				printk(KERN_ERR
--					"Slab corruption: start=%p, len=%d\n",
--					realobj, size);
-+					"Slab corruption: (%s) start=%p, len=%d\n",
-+					print_tainted(), realobj, size);
+-					"Slab corruption: %s start=%p, len=%d\n",
+-					cachep->name, realobj, size);
++					"Slab corruption (%s): %s start=%p, len=%d\n",
++					print_tainted(), cachep->name, realobj, size);
  				print_objinfo(cachep, objp, 0);
  				dump_stack();
  			}


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.561
retrieving revision 1.562
diff -u -r1.561 -r1.562
--- sources	4 Apr 2007 05:30:26 -0000	1.561
+++ sources	4 Apr 2007 20:43:46 -0000	1.562
@@ -1,4 +1,4 @@
 2618cbcc9c9ac1c3c04be903fe3338a7  sparse-0.2.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 b7bf3ee2f3ee778afa1ff0e8d44d193e  patch-2.6.21-rc5.bz2
-397da49fb513f3ba3eb239453355324a  patch-2.6.21-rc5-git10.bz2
+3ee752aeb1f5e40d37ef5f79843ad299  patch-2.6.21-rc5-git12.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.489
retrieving revision 1.490
diff -u -r1.489 -r1.490
--- upstream	4 Apr 2007 05:30:26 -0000	1.489
+++ upstream	4 Apr 2007 20:43:46 -0000	1.490
@@ -1,3 +1,3 @@
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc5.bz2
-patch-2.6.21-rc5-git10.bz2
+patch-2.6.21-rc5-git12.bz2


--- patch-2.6.21-rc5-git10.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr  4 20:46:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 16:46:09 -0400
Subject: rpms/selinux-policy/devel policy-20070219.patch, 1.38,
	1.39 selinux-policy.spec, 1.425, 1.426
Message-ID: <200704042046.l34Kk9b8019892@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20070219.patch selinux-policy.spec 
Log Message:
* Wed Apr 4 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-4
- Fixes for samba domain controller.
- Allow ConsoleKit to look at ttys


policy-20070219.patch:
 Rules.modular                             |   12 +
 policy/flask/access_vectors               |    4 
 policy/global_booleans                    |    2 
 policy/global_tunables                    |   39 +++-
 policy/mls                                |   31 ++-
 policy/modules/admin/acct.te              |    1 
 policy/modules/admin/acct.xml             |   43 +++++
 policy/modules/admin/alsa.xml             |   43 +++++
 policy/modules/admin/amanda.xml           |   85 ++++++++++
 policy/modules/admin/amtu.fc              |    3 
 policy/modules/admin/amtu.if              |   53 ++++++
 policy/modules/admin/amtu.te              |   56 ++++++
 policy/modules/admin/amtu.xml             |   36 ++++
 policy/modules/admin/anaconda.xml         |    3 
 policy/modules/admin/apt.xml              |   95 +++++++++++
 policy/modules/admin/backup.xml           |   35 ++++
 policy/modules/admin/bootloader.te        |    2 
 policy/modules/admin/bootloader.xml       |   79 +++++++++
 policy/modules/admin/certwatch.xml        |   37 ++++
 policy/modules/admin/consoletype.te       |    8 
 policy/modules/admin/consoletype.xml      |   47 +++++
 policy/modules/admin/ddcprobe.xml         |   35 ++++
 policy/modules/admin/dmesg.te             |    1 
 policy/modules/admin/dmesg.xml            |   24 ++
 policy/modules/admin/dmidecode.xml        |   35 ++++
 policy/modules/admin/dpkg.xml             |  125 +++++++++++++++
 policy/modules/admin/firstboot.if         |   18 ++
 policy/modules/admin/firstboot.xml        |   88 ++++++++++
 policy/modules/admin/kudzu.te             |    2 
 policy/modules/admin/kudzu.xml            |   45 +++++
 policy/modules/admin/logrotate.xml        |   75 +++++++++
 policy/modules/admin/logwatch.te          |    2 
 policy/modules/admin/logwatch.xml         |   23 ++
 policy/modules/admin/netutils.te          |    1 
 policy/modules/admin/rpm.fc               |    3 
 policy/modules/admin/rpm.if               |   65 +++++++
 policy/modules/admin/rpm.te               |    2 
 policy/modules/admin/su.if                |    6 
 policy/modules/admin/usermanage.te        |   42 +++--
 policy/modules/apps/games.fc              |    1 
 policy/modules/apps/gnome.if              |   26 +++
 policy/modules/apps/gpg.fc                |    2 
 policy/modules/apps/loadkeys.if           |   44 +----
 policy/modules/apps/mozilla.if            |    1 
 policy/modules/apps/slocate.te            |    4 
 policy/modules/apps/usernetctl.te         |   10 -
 policy/modules/kernel/corecommands.fc     |    7 
 policy/modules/kernel/corecommands.if     |   20 ++
 policy/modules/kernel/corenetwork.if.in   |   54 ++++++
 policy/modules/kernel/corenetwork.te.in   |   18 +-
 policy/modules/kernel/devices.if          |   36 ++++
 policy/modules/kernel/domain.if           |   18 ++
 policy/modules/kernel/domain.te           |   46 +++++
 policy/modules/kernel/files.fc            |    1 
 policy/modules/kernel/files.if            |   81 ++++++++-
 policy/modules/kernel/filesystem.if       |   39 ++++
 policy/modules/kernel/filesystem.te       |   11 +
 policy/modules/kernel/kernel.if           |   23 ++
 policy/modules/kernel/kernel.te           |    2 
 policy/modules/kernel/mls.if              |   20 ++
 policy/modules/kernel/mls.te              |    3 
 policy/modules/kernel/selinux.if          |   38 ++++
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.if         |    2 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/services/apache.fc         |   14 -
 policy/modules/services/apache.if         |  161 +++++++++++++++++++
 policy/modules/services/apache.te         |   59 +++++++
 policy/modules/services/apcupsd.fc        |    9 +
 policy/modules/services/apcupsd.if        |  108 +++++++++++++
 policy/modules/services/apcupsd.te        |   81 +++++++++
 policy/modules/services/automount.te      |    2 
 policy/modules/services/ccs.te            |   12 +
 policy/modules/services/consolekit.fc     |    1 
 policy/modules/services/consolekit.te     |   28 ++-
 policy/modules/services/cron.fc           |    1 
 policy/modules/services/cron.if           |   33 +---
 policy/modules/services/cron.te           |   51 ++++--
 policy/modules/services/cups.te           |    2 
 policy/modules/services/cvs.te            |    2 
 policy/modules/services/cyrus.te          |    5 
 policy/modules/services/dbus.if           |   63 +++++++
 policy/modules/services/dhcp.te           |    2 
 policy/modules/services/djbdns.te         |    5 
 policy/modules/services/dovecot.te        |    5 
 policy/modules/services/ftp.te            |    5 
 policy/modules/services/hal.fc            |    6 
 policy/modules/services/hal.te            |  130 +++++++++++++++
 policy/modules/services/inetd.te          |    5 
 policy/modules/services/kerberos.if       |   58 ++-----
 policy/modules/services/kerberos.te       |   36 ++++
 policy/modules/services/mta.if            |   19 ++
 policy/modules/services/mta.te            |    2 
 policy/modules/services/networkmanager.te |    2 
 policy/modules/services/nis.if            |    4 
 policy/modules/services/nscd.te           |   10 +
 policy/modules/services/ntp.te            |    1 
 policy/modules/services/pegasus.if        |   18 ++
 policy/modules/services/pegasus.te        |    6 
 policy/modules/services/postfix.if        |    1 
 policy/modules/services/postfix.te        |    8 
 policy/modules/services/ppp.te            |    9 -
 policy/modules/services/procmail.te       |    1 
 policy/modules/services/pyzor.te          |    1 
 policy/modules/services/radius.te         |    4 
 policy/modules/services/rpc.if            |    5 
 policy/modules/services/rsync.te          |    1 
 policy/modules/services/samba.fc          |    3 
 policy/modules/services/samba.if          |   63 +++++++
 policy/modules/services/samba.te          |   77 +++++++++
 policy/modules/services/sasl.te           |   11 +
 policy/modules/services/sendmail.if       |   20 ++
 policy/modules/services/smartmon.te       |    1 
 policy/modules/services/snmp.te           |   10 +
 policy/modules/services/spamassassin.te   |    7 
 policy/modules/services/squid.fc          |    2 
 policy/modules/services/squid.if          |   22 ++
 policy/modules/services/squid.te          |   12 +
 policy/modules/services/ssh.if            |   39 ++++
 policy/modules/services/ssh.te            |    5 
 policy/modules/services/xserver.te        |   10 -
 policy/modules/services/zabbix.fc         |    4 
 policy/modules/services/zabbix.if         |   87 ++++++++++
 policy/modules/services/zabbix.te         |   64 +++++++
 policy/modules/system/application.fc      |    1 
 policy/modules/system/application.if      |  104 ++++++++++++
 policy/modules/system/application.te      |   14 +
 policy/modules/system/authlogin.if        |   83 ++++++++--
 policy/modules/system/authlogin.te        |    3 
 policy/modules/system/fstools.fc          |    1 
 policy/modules/system/fstools.te          |    1 
 policy/modules/system/fusermount.fc       |    6 
 policy/modules/system/fusermount.if       |   41 +++++
 policy/modules/system/fusermount.te       |   45 +++++
 policy/modules/system/getty.te            |    3 
 policy/modules/system/hostname.te         |   14 +
 policy/modules/system/init.if             |    3 
 policy/modules/system/init.te             |   35 +++-
 policy/modules/system/ipsec.if            |   20 ++
 policy/modules/system/iptables.te         |    4 
 policy/modules/system/libraries.fc        |    8 
 policy/modules/system/libraries.te        |   20 ++
 policy/modules/system/locallogin.te       |    7 
 policy/modules/system/logging.if          |   21 ++
 policy/modules/system/logging.te          |    2 
 policy/modules/system/lvm.te              |    5 
 policy/modules/system/modutils.te         |   11 +
 policy/modules/system/mount.fc            |    3 
 policy/modules/system/mount.if            |   37 ++++
 policy/modules/system/mount.te            |   64 +++++++
 policy/modules/system/raid.te             |    1 
 policy/modules/system/selinuxutil.fc      |    1 
 policy/modules/system/selinuxutil.if      |    5 
 policy/modules/system/selinuxutil.te      |   68 +++-----
 policy/modules/system/udev.fc             |    2 
 policy/modules/system/udev.te             |   11 +
 policy/modules/system/unconfined.fc       |    1 
 policy/modules/system/unconfined.if       |   10 -
 policy/modules/system/unconfined.te       |   24 ++
 policy/modules/system/userdomain.if       |  246 ++++++++++++++++--------------
 policy/modules/system/userdomain.te       |   46 ++++-
 policy/modules/system/xen.te              |   35 ++++
 policy/support/obj_perm_sets.spt          |   12 +
 163 files changed, 3823 insertions(+), 424 deletions(-)

Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- policy-20070219.patch	4 Apr 2007 19:44:58 -0000	1.38
+++ policy-20070219.patch	4 Apr 2007 20:46:07 -0000	1.39
@@ -3034,11 +3034,11 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.fc serefpolicy-2.5.11/policy/modules/services/apcupsd.fc
 --- nsaserefpolicy/policy/modules/services/apcupsd.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/services/apcupsd.fc	2007-04-04 15:36:00.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/apcupsd.fc	2007-04-04 16:18:34.000000000 -0400
 @@ -0,0 +1,9 @@
 +
 +/usr/sbin/apcupsd		--	gen_context(system_u:object_r:apcupsd_exec_t,s0)
-+/var/log/apcupsd\.events\*		--	gen_context(system_u:object_r:apcupsd_log_t,s0)
++/var/log/apcupsd\.events.*		--	gen_context(system_u:object_r:apcupsd_log_t,s0)
 +/var/run/apcupsd\.pid		--	gen_context(system_u:object_r:apcupsd_var_run_t,s0)
 +
 +/var/www/apcupsd/multimon.cgi		--	gen_context(system_u:object_r:httpd_apcupsd_cgi_script_exec_t,s0)
@@ -3301,7 +3301,7 @@
 +/var/run/consolekit.pid		--	gen_context(system_u:object_r:consolekit_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-2.5.11/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2007-03-20 23:38:12.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/services/consolekit.te	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/consolekit.te	2007-04-04 16:22:50.000000000 -0400
 @@ -10,13 +10,16 @@
  type consolekit_exec_t;
  init_daemon_domain(consolekit_t, consolekit_exec_t)
@@ -3321,7 +3321,7 @@
  allow consolekit_t self:fifo_file rw_fifo_file_perms;
  allow consolekit_t self:unix_stream_socket create_stream_socket_perms;
  
-@@ -27,6 +30,8 @@
+@@ -27,21 +30,38 @@
  domain_use_interactive_fds(consolekit_t)
  
  files_read_etc_files(consolekit_t)
@@ -3330,8 +3330,16 @@
  
  libs_use_ld_so(consolekit_t)
  libs_use_shared_libs(consolekit_t)
-@@ -38,10 +43,23 @@
- 	term_dontaudit_use_generic_ptys(consolekit_t)
+ 
+ miscfiles_read_localization(consolekit_t)
+ 
++term_use_all_terms(consolekit_t)
++
+ ifdef(`targeted_policy',`
+-	term_dontaudit_use_unallocated_ttys(consolekit_t)
+-	term_dontaudit_use_generic_ptys(consolekit_t)
++	term_use_unallocated_ttys(consolekit_t)
++	term_use_generic_ptys(consolekit_t)
  ')
  
 +# pid file


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -r1.425 -r1.426
--- selinux-policy.spec	4 Apr 2007 19:44:58 -0000	1.425
+++ selinux-policy.spec	4 Apr 2007 20:46:07 -0000	1.426
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.5.11
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -358,6 +358,10 @@
 %endif
 
 %changelog
+* Wed Apr 4 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-4
+- Fixes for samba domain controller.
+- Allow ConsoleKit to look at ttys
+
 * Tue Apr 3 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-3
 - Fix interface call
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 20:51:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 16:51:18 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.397, 1.398 anaconda.spec, 1.525,
	1.526 sources, 1.522, 1.523
Message-ID: <200704042051.l34KpICH023681@cvs.devel.redhat.com>

Author: katzj

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -r1.397 -r1.398
--- .cvsignore	3 Apr 2007 22:33:21 -0000	1.397
+++ .cvsignore	4 Apr 2007 20:51:16 -0000	1.398
@@ -1 +1 @@
-anaconda-11.2.0.44.tar.bz2
+anaconda-11.2.0.45.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.525
retrieving revision 1.526
diff -u -r1.525 -r1.526
--- anaconda.spec	3 Apr 2007 22:33:21 -0000	1.525
+++ anaconda.spec	4 Apr 2007 20:51:16 -0000	1.526
@@ -1,7 +1,7 @@
 %define livearches %{ix86} x86_64
 
 Name: anaconda
-Version: 11.2.0.44
+Version: 11.2.0.45
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -142,6 +142,13 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Apr  4 2007 Jeremy Katz <katzj at redhat.com> - 11.2.0.45-1
+- More live changes to fix installing from the live image running from RAM 
+  or a USB stick.  Note: requires a livecd created with livecd-tools >= 006
+- Make the end button Close for the live case (#225168)
+- Unmount installed filesystems at the end of the live install
+- Fix an autopart bug (clumens, #235279)
+
 * Tue Apr  3 2007 Jeremy Katz <katzj at redhat.com> - 11.2.0.44-1
 - Clean up depsolve callback to work with yum depsolver
 - More live CD fixing


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -r1.522 -r1.523
--- sources	3 Apr 2007 22:33:21 -0000	1.522
+++ sources	4 Apr 2007 20:51:16 -0000	1.523
@@ -1 +1 @@
-5613ba816c7b6ee8b6b6d907f27d21b9  anaconda-11.2.0.44.tar.bz2
+370e423c8720250c6e0f99d878bef6d9  anaconda-11.2.0.45.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr  4 20:51:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 16:51:57 -0400
Subject: rpms/kernel/devel linux-2.6-powermac-generic-suspend-2.patch, 1.1,
	1.2
Message-ID: <200704042051.l34KpvP1024241@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	linux-2.6-powermac-generic-suspend-2.patch 
Log Message:
fixed version

linux-2.6-powermac-generic-suspend-2.patch:
 arch/powerpc/kernel/Makefile            |    1 
 arch/powerpc/platforms/powermac/setup.c |   65 --------------------------------
 linux-2.6/arch/powerpc/kernel/swsusp.c  |   42 ++++++++++++++++++++
 linux-2.6/include/asm-powerpc/suspend.h |    9 ++++
 4 files changed, 52 insertions(+), 65 deletions(-)

Index: linux-2.6-powermac-generic-suspend-2.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-powermac-generic-suspend-2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-powermac-generic-suspend-2.patch	25 Mar 2007 21:38:09 -0000	1.1
+++ linux-2.6-powermac-generic-suspend-2.patch	4 Apr 2007 20:51:55 -0000	1.2
@@ -1,37 +1,43 @@
-From linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org Mon Mar 19 11:04:08 2007
+From linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org Mon Mar 19 16:24:54 2007
 Return-path: <linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org>
 Envelope-to: dwmw2 at baythorne.infradead.org
-Delivery-date: Mon, 19 Mar 2007 11:04:08 +0000
+Delivery-date: Mon, 19 Mar 2007 16:24:54 +0000
 Received: from pentafluge.infradead.org ([2001:4bd0:203e::1]) by
 	baythorne.infradead.org with esmtps (Exim 4.63 #1 (Red Hat Linux)) id
-	1HTFel-0004m2-2j for dwmw2 at baythorne.infradead.org; Mon, 19 Mar 2007
-	11:04:08 +0000
+	1HTKfG-0005cX-Fv for dwmw2 at baythorne.infradead.org; Mon, 19 Mar 2007
+	16:24:54 +0000
 Received: from ozlabs.org ([203.10.76.45]) by pentafluge.infradead.org with
-	esmtps (Exim 4.63 #1 (Red Hat Linux)) id 1HTFeW-0004sA-8R for
-	dwmw2 at infradead.org; Mon, 19 Mar 2007 11:03:50 +0000
+	esmtps (Exim 4.63 #1 (Red Hat Linux)) id 1HTKfD-0007pQ-Md for
+	dwmw2 at infradead.org; Mon, 19 Mar 2007 16:24:53 +0000
 Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix)
-	with ESMTP id 5D670DE74F for <dwmw2 at infradead.org>; Mon, 19 Mar 2007
-	22:00:33 +1100 (EST)
+	with ESMTP id C123CDE064 for <dwmw2 at infradead.org>; Tue, 20 Mar 2007
+	03:24:47 +1100 (EST)
 X-Original-To: linuxppc-dev at ozlabs.org
 Delivered-To: linuxppc-dev at ozlabs.org
 Received: from sipsolutions.net (crystal.sipsolutions.net [195.210.38.204])
 	(using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present
-	a certificate) by ozlabs.org (Postfix) with ESMTP id 008D4DE014 for
-	<linuxppc-dev at ozlabs.org>; Mon, 19 Mar 2007 21:59:30 +1100 (EST)
+	a certificate) by ozlabs.org (Postfix) with ESMTP id 8898FDDFB1 for
+	<linuxppc-dev at ozlabs.org>; Tue, 20 Mar 2007 03:24:32 +1100 (EST)
 Received: from [84.135.242.137] (helo=[10.0.0.4]) by sipsolutions.net with
 	esmtpsa (TLS-1.0:RSA_ARCFOUR_MD5:16) (Exim 4.63) (envelope-from
-	<johannes at sipsolutions.net>) id 1HTFV9-00034W-7R; Mon, 19 Mar 2007 10:54:08
+	<johannes at sipsolutions.net>) id 1HTKZf-0004vB-Ld; Mon, 19 Mar 2007 16:19:08
 	+0000
-Message-Id: <20070319105358.796834000 at sipsolutions.net>
-References: <20070319105352.771599000 at sipsolutions.net>
-User-Agent: quilt/0.45-1
-Date: Mon, 19 Mar 2007 11:53:54 +0100
-From: Johannes Berg <johannes at sipsolutions.net>
-To: linuxppc-dev at ozlabs.org
 Subject: [PATCH 2/5] powerpc: fix suspend states again
-Content-Disposition: inline; filename=002-fix-powermac-suspend-again.patch
+From: Johannes Berg <johannes at sipsolutions.net>
+To: Benjamin Herrenschmidt <benh at kernel.crashing.org>
+In-Reply-To: <1174319657.22561.9.camel at johannes.berg>
+References: <20070319105352.771599000 at sipsolutions.net>
+	 <20070319105358.796834000 at sipsolutions.net>
+	 <1174315727.5044.6.camel at localhost.localdomain>
+	 <1174317726.22561.4.camel at johannes.berg>
+	 <1174318342.5044.16.camel at localhost.localdomain>
+	 <1174319146.22561.6.camel at johannes.berg>
+	 <1174319657.22561.9.camel at johannes.berg>
+Date: Mon, 19 Mar 2007 17:22:30 +0100
+Message-Id: <1174321350.22561.11.camel at johannes.berg>
 Mime-Version: 1.0
 X-Mailer: Evolution 2.8.2.1 
+Cc: linuxppc-dev at ozlabs.org
 X-BeenThere: linuxppc-dev at ozlabs.org
 X-Mailman-Version: 2.1.9
 Precedence: list
@@ -46,9 +52,9 @@
 Content-Type: text/plain; charset="us-ascii"
 Sender: linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org
 Errors-To: linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org
-X-Bad-Reply: References but no 'Re:' in Subject.
+X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject.
 X-Spam-Score: 0.0 (/)
-X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/
+X-Evolution-Source: imap://dwmw2 at baythorne.infradead.org/
 Content-Transfer-Encoding: 8bit
 
 In commit 0fba3a1f39f8b0a50b56c8b068fa52131cbc84c2 (a very long time ago,
@@ -69,30 +75,29 @@
 This patch addresses these points as follows:
  1. remove all pm_ops from powermac, powermac suspend to ram isn't currently
     usable via /sys/power/state but is done via the PMU instead.
- 2. move the code responsible for storing FPU/altivec state into a new
-    arch_prepare_suspend function (previously, this was only present for
-    32-bit platforms from asm-ppc.)
+ 2. move the code responsible for storing FPU/altivec state into
+    save_processor_state and the set_context() call to restore_processor_state.
 
-A follow-on patch will create new pm_ops for via-pmu.
+It also adds a call to kernel_enable_spe() but I don't have any machines that
+have that to see if it actually works anyway.
 
-I removed
-	set_context(current->active_mm->context.id, current->active_mm->pgd);
-because
- 1. it works without and
- 2. I don't see the point
+It may look like there is some code removal missing but that is actually because
+the new suspend.h file overrides the ppc/suspend.h one which was previously used.
+
+A follow-on patch will create new pm_ops for via-pmu.
 
 Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
 Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
 
 ---
  arch/powerpc/kernel/Makefile            |    1 
- arch/powerpc/kernel/swsusp.c            |   26 ++++++++++++
+ arch/powerpc/kernel/swsusp.c            |   42 ++++++++++++++++++++
  arch/powerpc/platforms/powermac/setup.c |   65 --------------------------------
  include/asm-powerpc/suspend.h           |    9 ++++
- 4 files changed, 36 insertions(+), 65 deletions(-)
+ 4 files changed, 52 insertions(+), 65 deletions(-)
 
---- linux-2.6.orig/arch/powerpc/platforms/powermac/setup.c	2007-03-19 11:47:26.622413925 +0100
-+++ linux-2.6/arch/powerpc/platforms/powermac/setup.c	2007-03-19 11:47:39.132413925 +0100
+--- linux-2.6.orig/arch/powerpc/platforms/powermac/setup.c	2007-03-19 16:49:57.723321419 +0100
++++ linux-2.6/arch/powerpc/platforms/powermac/setup.c	2007-03-19 16:50:00.983321419 +0100
 @@ -420,76 +420,11 @@ static void __init find_boot_device(void
  #endif
  }
@@ -171,7 +176,7 @@
  }
  
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6/include/asm-powerpc/suspend.h	2007-03-19 11:47:39.132413925 +0100
++++ linux-2.6/include/asm-powerpc/suspend.h	2007-03-19 16:50:00.993321419 +0100
 @@ -0,0 +1,9 @@
 +#ifndef __ASM_POWERPC_SUSPEND_H
 +#define __ASM_POWERPC_SUSPEND_H
@@ -179,11 +184,11 @@
 +static inline int arch_prepare_suspend(void) { return 0; }
 +
 +void save_processor_state(void);
-+static inline void restore_processor_state(void) {}
++void restore_processor_state(void);
 +
 +#endif /* __ASM_POWERPC_SUSPEND_H */
---- linux-2.6.orig/arch/powerpc/kernel/Makefile	2007-03-19 11:47:26.692413925 +0100
-+++ linux-2.6/arch/powerpc/kernel/Makefile	2007-03-19 11:47:39.172413925 +0100
+--- linux-2.6.orig/arch/powerpc/kernel/Makefile	2007-03-19 16:49:57.743321419 +0100
++++ linux-2.6/arch/powerpc/kernel/Makefile	2007-03-19 16:50:00.993321419 +0100
 @@ -36,6 +36,7 @@ obj-$(CONFIG_GENERIC_TBSYNC)	+= smp-tbsy
  obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o
  obj-$(CONFIG_6xx)		+= idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o
@@ -193,8 +198,8 @@
  obj32-$(CONFIG_MODULES)		+= module_32.o
  
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6/arch/powerpc/kernel/swsusp.c	2007-03-19 11:47:39.172413925 +0100
-@@ -0,0 +1,26 @@
++++ linux-2.6/arch/powerpc/kernel/swsusp.c	2007-03-19 17:18:25.323321419 +0100
+@@ -0,0 +1,42 @@
 +/*
 + * Common powerpc suspend code for 32 and 64 bits
 + *
@@ -203,11 +208,18 @@
 + * GPLv2
 + */
 +
++#include <linux/sched.h>
++#include <asm/suspend.h>
 +#include <asm/cputable.h>
 +#include <asm/system.h>
++#include <asm/current.h>
++#include <asm/mmu_context.h>
 +
++#ifdef CONFIG_SPE
++extern void enable_kernel_spe(void);
++#endif
 +
-+int save_processor_state(void)
++void save_processor_state(void)
 +{
 +	/* Giveup the lazy FPU & vec so we don't have to back them
 +	 * up from the low level code
@@ -219,10 +231,18 @@
 +		enable_kernel_altivec();
 +#endif /* CONFIG_ALTIVEC */
 +
-+	return 0;
++#ifdef CONFIG_SPE
++	enable_kernel_spe();
++#endif
++}
++
++void restore_processor_state(void)
++{
++#ifdef CONFIG_PPC32
++	set_context(current->active_mm->context.id, current->active_mm->pgd);
++#endif
 +}
 
---
 
 _______________________________________________
 Linuxppc-dev mailing list



From fedora-cvs-commits at redhat.com  Wed Apr  4 22:19:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 18:19:45 -0400
Subject: rpms/kernel/devel config-rhel-generic,1.9,1.10
Message-ID: <200704042219.l34MJjXt022352@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-rhel-generic 
Log Message:
sync with RHEL5 & enable vesafb


Index: config-rhel-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/config-rhel-generic,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- config-rhel-generic	15 Aug 2006 21:56:07 -0000	1.9
+++ config-rhel-generic	4 Apr 2007 22:19:42 -0000	1.10
@@ -60,6 +60,9 @@
 # CONFIG_WAN_ROUTER is not set
 # CONFIG_ROMFS_FS is not set
 # CONFIG_MINIX_FS is not set
+# CONFIG_9P_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_FUSE_FS is not set
 # CONFIG_BINFMT_AOUT is not set
 # CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_SIS is not set
@@ -145,7 +148,6 @@
 # CONFIG_VIDEO_SAA5246A is not set
 # CONFIG_FB_ATY128 is not set
 # CONFIG_FB_RADEON is not set
-# CONFIG_FB_VESA is not set
 # CONFIG_FB_NEOMAGIC is not set
 # CONFIG_I82092 is not set
 # CONFIG_YELLOWFIN is not set
@@ -188,4 +190,5 @@
 # CONFIG_DECNET is not set
 # CONFIG_TCG_TPM is not set
 CONFIG_RAW_DRIVER=y
+# CONFIG_ISA is not set
 



From fedora-cvs-commits at redhat.com  Wed Apr  4 23:28:13 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 19:28:13 -0400
Subject: rpms/kernel/devel linux-2.6-debug-extra-warnings.patch,1.2,1.3
Message-ID: <200704042328.l34NSDbG007440@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-debug-extra-warnings.patch 
Log Message:
don't warn about strict-aliasing



linux-2.6-debug-extra-warnings.patch:
 Makefile |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-extra-warnings.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-extra-warnings.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-debug-extra-warnings.patch	16 Mar 2007 00:33:30 -0000	1.2
+++ linux-2.6-debug-extra-warnings.patch	4 Apr 2007 23:28:11 -0000	1.3
@@ -19,7 +19,7 @@
 -                   -fno-strict-aliasing -fno-common
 +                   -fno-strict-aliasing -fno-common \
 +		   -Werror-implicit-function-declaration \
-+		   -Wextra -Wno-unused-parameter -Wno-missing-field-initializers
++		   -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-strict-aliasing
  AFLAGS          := -D__ASSEMBLY__
  
  # Read KERNELRELEASE from include/config/kernel.release (if it exists)



From fedora-cvs-commits at redhat.com  Wed Apr  4 23:34:06 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 19:34:06 -0400
Subject: rpms/compiz/devel compiz.spec,1.75,1.76
Message-ID: <200704042334.l34NY6mN011587@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11547

Modified Files:
	compiz.spec 
Log Message:
* Wed Apr  4 2007 Kristian H??gsberg <krh at redhat.com> - 0.3.6-6
- Add place and clone plugins to default plugin list.



Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- compiz.spec	29 Mar 2007 16:42:55 -0000	1.75
+++ compiz.spec	4 Apr 2007 23:34:04 -0000	1.76
@@ -1,11 +1,12 @@
 %define		dialogversion	0.7.1
+%define		plugins place,png,decoration,clone,fade,minimize,move,resize,switcher,scale
 
 Name:           compiz
 Url:            http://www.go-compiz.org
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.3.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -92,10 +93,12 @@
 %configure 			\
 	--enable-gconf 		\
 	--enable-dbus 		\
+	--enable-place 		\
 	--enable-librsvg 	\
 	--enable-gtk 		\
 	--enable-metacity 	\
 	--enable-gnome		\
+	--with-default-plugs=%{plugins} \
 	--disable-kde
 
 make %{?_smp_mflags} imagedir=%{_datadir}/pixmaps
@@ -195,6 +198,9 @@
 %{_libdir}/libdecoration.so
 
 %changelog
+* Wed Apr  4 2007 Kristian H??gsberg <krh at redhat.com> - 0.3.6-6
+- Add place and clone plugins to default plugin list.
+
 * Wed Mar 28 2007 Kristian H??gsberg <krh at redhat.com> - 0.3.6-5
 - Update URL (#208214).
 - Require at least metacity 2.18 (#232831).



From fedora-cvs-commits at redhat.com  Wed Apr  4 23:45:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 19:45:42 -0400
Subject: rpms/kernel/devel linux-2.6-warnings-inline.patch,1.2,1.3
Message-ID: <200704042345.l34Njgar022805@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-warnings-inline.patch 
Log Message:
more inline fixes

linux-2.6-warnings-inline.patch:
 b/arch/i386/oprofile/op_model_p4.c                               |    2 -
 b/arch/powerpc/kernel/prom_init.c                                |    4 +-
 b/drivers/acpi/tables/tbfadt.c                                   |    4 +-
 b/drivers/isdn/hardware/eicon/divasmain.c                        |   12 +++----
 b/drivers/isdn/hardware/eicon/platform.h                         |    4 +-
 b/drivers/media/common/ir-functions.c                            |    2 -
 b/drivers/media/video/cx88/cx88-core.c                           |   12 +++----
 b/drivers/media/video/cx88/cx88.h                                |    4 +-
 b/drivers/net/sky2.c                                             |    2 -
 b/drivers/net/wireless/ipw2200.c                                 |    2 -
 b/drivers/scsi/tmscsim.c                                         |   16 +++++-----
 b/drivers/usb/serial/safe_serial.c                               |    2 -
 b/drivers/video/intelfb/intelfbdrv.c                             |    2 -
 b/fs/ocfs2/namei.c                                               |    2 -
 b/include/asm-powerpc/spinlock.h                                 |   10 +++---
 b/include/linux/cpuset.h                                         |    4 +-
 b/kernel/mutex.c                                                 |    2 -
 b/sound/drivers/opl4/opl4_lib.c                                  |    2 -
 b/sound/pci/au88x0/au88x0.h                                      |    4 +-
 b/sound/pci/au88x0/au88x0_core.c                                 |    4 +-
 linux-2.6.20.noarch/arch/ia64/kernel/mca.c                       |    2 -
 linux-2.6.20.noarch/arch/ia64/sn/pci/pcibr/pcibr_ate.c           |    2 -
 linux-2.6.20.noarch/arch/ia64/sn/pci/tioce_provider.c            |    4 +-
 linux-2.6.20.noarch/arch/s390/kernel/traps.c                     |    4 +-
 linux-2.6.20.noarch/drivers/char/mmtimer.c                       |   16 +++++-----
 linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c |   10 +++---
 linux-2.6.20.noarch/drivers/s390/net/ctcmain.c                   |    2 -
 linux-2.6.20.noarch/drivers/serial/ioc3_serial.c                 |    4 +-
 linux-2.6.20.noarch/drivers/serial/ioc4_serial.c                 |    4 +-
 linux-2.6.20.noarch/include/asm-powerpc/spinlock.h               |    8 ++---
 linux-2.6.20.noarch/net/mac80211/ieee80211.c                     |    6 +--
 31 files changed, 79 insertions(+), 79 deletions(-)

Index: linux-2.6-warnings-inline.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-warnings-inline.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-warnings-inline.patch	24 Mar 2007 23:42:21 -0000	1.2
+++ linux-2.6-warnings-inline.patch	4 Apr 2007 23:45:39 -0000	1.3
@@ -479,3 +479,299 @@
  {
  	stream_t *dma = &vortex->dma_wt[wtdma];
  	int temp;
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c~	2007-04-04 19:31:32.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-04-04 19:31:51.000000000 -0400
+@@ -543,7 +543,7 @@ static u32 ipw_read_restricted(struct ip
+ 	return __ipw_read_restricted(__LINE__, priv, reg);
+ }
+ 
+-static void inline _ipw_write_restricted(struct ipw_priv *priv,
++static inline void _ipw_write_restricted(struct ipw_priv *priv,
+ 					 u32 reg, u32 value)
+ {
+ 	_ipw_write32(priv, reg, value);
+@@ -640,7 +640,7 @@ static void ipw_set_bits_restricted_reg(
+ #define _ipw_set_bits_mask_restricted_reg(priv, reg, bits, mask) \
+         _ipw_write_restricted_reg( \
+             priv, reg, ((_ipw_read_restricted_reg(priv, reg) & mask) | bits))
+-static void inline __ipw_set_bits_mask_restricted_reg(u32 line, struct ipw_priv
++static inline void __ipw_set_bits_mask_restricted_reg(u32 line, struct ipw_priv
+ 						      *priv, u32 reg,
+ 						      u32 bits, u32 mask)
+ {
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c~	2007-04-04 19:31:53.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-04-04 19:32:15.000000000 -0400
+@@ -6626,12 +6626,12 @@ struct ipw_status_code {
+ 	const char *reason;
+ };
+ 
+-static void inline average_init(struct average *avg)
++static inline void average_init(struct average *avg)
+ {
+ 	memset(avg, 0, sizeof(*avg));
+ }
+ 
+-static void inline average_add(struct average *avg, s16 val)
++static inline void average_add(struct average *avg, s16 val)
+ {
+ 	avg->sum -= avg->entries[avg->pos];
+ 	avg->sum += val;
+@@ -6642,7 +6642,7 @@ static void inline average_add(struct av
+ 	}
+ }
+ 
+-static s16 inline average_value(struct average *avg)
++static inline s16 average_value(struct average *avg)
+ {
+ 	if (!unlikely(avg->init)) {
+ 		if (avg->pos)
+--- linux-2.6.20.noarch/net/mac80211/ieee80211.c~	2007-04-04 19:32:30.000000000 -0400
++++ linux-2.6.20.noarch/net/mac80211/ieee80211.c	2007-04-04 19:32:51.000000000 -0400
+@@ -1045,7 +1045,7 @@ ieee80211_tx_h_ps_buf(struct ieee80211_t
+ }
+ 
+ 
+-static void inline
++static inline void
+ __ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
+ 		       struct sk_buff *skb,
+ 		       struct net_device *dev,
+@@ -1091,7 +1091,7 @@ __ieee80211_tx_prepare(struct ieee80211_
+ 
+ }
+ 
+-static int inline is_ieee80211_device(struct net_device *dev,
++static inline int is_ieee80211_device(struct net_device *dev,
+ 				      struct net_device *master)
+ {
+ 	return (wdev_priv(dev->ieee80211_ptr) ==
+@@ -1100,7 +1100,7 @@ static int inline is_ieee80211_device(st
+ 
+ /* Device in tx->dev has a reference added; use dev_put(tx->dev) when
+  * finished with it. */
+-static void inline ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
++static inline int ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
+ 					struct sk_buff *skb,
+ 					struct net_device *mdev,
+ 					struct ieee80211_tx_control *control)
+--- linux-2.6.20.noarch/arch/ia64/kernel/mca.c~	2007-04-04 19:33:39.000000000 -0400
++++ linux-2.6.20.noarch/arch/ia64/kernel/mca.c	2007-04-04 19:33:43.000000000 -0400
+@@ -303,7 +303,7 @@ static void ia64_mlogbuf_dump_from_init(
+ 	ia64_mlogbuf_dump();
+ }
+ 
+-static void inline
++static inline void
+ ia64_mca_spin(const char *func)
+ {
+ 	if (monarch_cpu == smp_processor_id())
+--- linux-2.6.20.noarch/arch/ia64/sn/pci/tioce_provider.c~	2007-04-04 19:34:30.000000000 -0400
++++ linux-2.6.20.noarch/arch/ia64/sn/pci/tioce_provider.c	2007-04-04 19:34:40.000000000 -0400
+@@ -51,7 +51,7 @@
+  * All registers defined in struct tioce will meet that criteria.
+  */
+ 
+-static void inline
++static inline void
+ tioce_mmr_war_pre(struct tioce_kernel *kern, void __iomem *mmr_addr)
+ {
+ 	u64 mmr_base;
+@@ -77,7 +77,7 @@ tioce_mmr_war_pre(struct tioce_kernel *k
+ 	}
+ }
+ 
+-static void inline
++static inline void
+ tioce_mmr_war_post(struct tioce_kernel *kern, void __iomem *mmr_addr)
+ {
+ 	u64 mmr_base;
+--- linux-2.6.20.noarch/arch/ia64/sn/pci/pcibr/pcibr_ate.c~	2007-04-04 19:34:50.000000000 -0400
++++ linux-2.6.20.noarch/arch/ia64/sn/pci/pcibr/pcibr_ate.c	2007-04-04 19:34:56.000000000 -0400
+@@ -138,7 +138,7 @@ static inline u64 __iomem *pcibr_ate_add
+ /*
+  * Update the ate.
+  */
+-void inline
++inline void
+ ate_write(struct pcibus_info *pcibus_info, int ate_index, int count,
+ 	  volatile u64 ate)
+ {
+--- linux-2.6.20.noarch/drivers/char/mmtimer.c~	2007-04-04 19:35:07.000000000 -0400
++++ linux-2.6.20.noarch/drivers/char/mmtimer.c	2007-04-04 19:35:46.000000000 -0400
+@@ -75,7 +75,7 @@ static const struct file_operations mmti
+  */
+ #define NUM_COMPARATORS 3
+ /* Check for an RTC interrupt pending */
+-static int inline mmtimer_int_pending(int comparator)
++static inline int mmtimer_int_pending(int comparator)
+ {
+ 	if (HUB_L((unsigned long *)LOCAL_MMR_ADDR(SH_EVENT_OCCURRED)) &
+ 			SH_EVENT_OCCURRED_RTC1_INT_MASK << comparator)
+@@ -84,14 +84,14 @@ static int inline mmtimer_int_pending(in
+ 		return 0;
+ }
+ /* Clear the RTC interrupt pending bit */
+-static void inline mmtimer_clr_int_pending(int comparator)
++static inline void mmtimer_clr_int_pending(int comparator)
+ {
+ 	HUB_S((u64 *)LOCAL_MMR_ADDR(SH_EVENT_OCCURRED_ALIAS),
+ 		SH_EVENT_OCCURRED_RTC1_INT_MASK << comparator);
+ }
+ 
+ /* Setup timer on comparator RTC1 */
+-static void inline mmtimer_setup_int_0(u64 expires)
++static inline void mmtimer_setup_int_0(u64 expires)
+ {
+ 	u64 val;
+ 
+@@ -121,7 +121,7 @@ static void inline mmtimer_setup_int_0(u
+ }
+ 
+ /* Setup timer on comparator RTC2 */
+-static void inline mmtimer_setup_int_1(u64 expires)
++static inline void mmtimer_setup_int_1(u64 expires)
+ {
+ 	u64 val;
+ 
+@@ -143,7 +143,7 @@ static void inline mmtimer_setup_int_1(u
+ }
+ 
+ /* Setup timer on comparator RTC3 */
+-static void inline mmtimer_setup_int_2(u64 expires)
++static inline void mmtimer_setup_int_2(u64 expires)
+ {
+ 	u64 val;
+ 
+@@ -169,7 +169,7 @@ static void inline mmtimer_setup_int_2(u
+  * in order to insure that the setup succeeds in a deterministic time frame.
+  * It will check if the interrupt setup succeeded.
+  */
+-static int inline mmtimer_setup(int comparator, unsigned long expires)
++static inline int mmtimer_setup(int comparator, unsigned long expires)
+ {
+ 
+ 	switch (comparator) {
+@@ -194,7 +194,7 @@ static int inline mmtimer_setup(int comp
+ 	return mmtimer_int_pending(comparator);
+ }
+ 
+-static int inline mmtimer_disable_int(long nasid, int comparator)
++static inline int mmtimer_disable_int(long nasid, int comparator)
+ {
+ 	switch (comparator) {
+ 	case 0:
+@@ -396,7 +396,7 @@ static int sgi_clock_set(clockid_t clock
+  * exponentially in order to ensure that the next interrupt
+  * can be properly scheduled..
+  */
+-static int inline reschedule_periodic_timer(mmtimer_t *x)
++static inline int reschedule_periodic_timer(mmtimer_t *x)
+ {
+ 	int n;
+ 	struct k_itimer *t = x->timer;
+--- linux-2.6.20.noarch/drivers/serial/ioc4_serial.c~	2007-04-04 19:37:40.000000000 -0400
++++ linux-2.6.20.noarch/drivers/serial/ioc4_serial.c	2007-04-04 19:38:00.000000000 -0400
+@@ -823,7 +823,7 @@ pending_intrs(struct ioc4_soft *soft, in
+  *			called per port from attach...
+  * @port: port to initialize
+  */
+-static int inline port_init(struct ioc4_port *port)
++static inline int port_init(struct ioc4_port *port)
+ {
+ 	uint32_t sio_cr;
+ 	struct hooks *hooks = port->ip_hooks;
+@@ -1046,7 +1046,7 @@ static irqreturn_t ioc4_intr(int irq, vo
+  *			IOC4 with serial ports in the system.
+  * @idd: Master module data for this IOC4
+  */
+-static int inline ioc4_attach_local(struct ioc4_driver_data *idd)
++static inline int ioc4_attach_local(struct ioc4_driver_data *idd)
+ {
+ 	struct ioc4_port *port;
+ 	struct ioc4_port *ports[IOC4_NUM_SERIAL_PORTS];
+--- linux-2.6.20.noarch/drivers/serial/ioc3_serial.c~	2007-04-04 19:38:01.000000000 -0400
++++ linux-2.6.20.noarch/drivers/serial/ioc3_serial.c	2007-04-04 19:38:16.000000000 -0400
+@@ -375,7 +375,7 @@ static struct ioc3_port *get_ioc3_port(s
+  *			called per port from attach...
+  * @port: port to initialize
+  */
+-static int inline port_init(struct ioc3_port *port)
++static inline int port_init(struct ioc3_port *port)
+ {
+ 	uint32_t sio_cr;
+ 	struct port_hooks *hooks = port->ip_hooks;
+@@ -1430,7 +1430,7 @@ static int receive_chars(struct uart_por
+  * @pending: interrupts to handle
+  */
+ 
+-static int inline
++static inline int
+ ioc3uart_intr_one(struct ioc3_submodule *is,
+ 			struct ioc3_driver_data *idd,
+ 			unsigned int pending)
+--- linux-2.6.20.noarch/include/asm-powerpc/spinlock.h~	2007-04-04 19:38:42.000000000 -0400
++++ linux-2.6.20.noarch/include/asm-powerpc/spinlock.h	2007-04-04 19:39:59.000000000 -0400
+@@ -72,7 +72,7 @@ static __inline__ unsigned long __spin_t
+ 	return tmp;
+ }
+ 
+-static int __inline__ __raw_spin_trylock(raw_spinlock_t *lock)
++static inline int __raw_spin_trylock(raw_spinlock_t *lock)
+ {
+ 	CLEAR_IO_SYNC;
+ 	return __spin_trylock(lock) == 0;
+@@ -179,7 +179,7 @@ extern void __raw_spin_unlock_wait(raw_s
+  * This returns the old value in the lock + 1,
+  * so we got a read lock if the return value is > 0.
+  */
+-static long __inline__ __read_trylock(raw_rwlock_t *rw)
++static inline long __read_trylock(raw_rwlock_t *rw)
+ {
+ 	long tmp;
+ 
+@@ -251,12 +251,12 @@ static inline void __raw_write_lock(raw_
+ 	}
+ }
+ 
+-static int __inline__ __raw_read_trylock(raw_rwlock_t *rw)
++static inline int __raw_read_trylock(raw_rwlock_t *rw)
+ {
+ 	return __read_trylock(rw) > 0;
+ }
+ 
+-static int __inline__ __raw_write_trylock(raw_rwlock_t *rw)
++static inline int __raw_write_trylock(raw_rwlock_t *rw)
+ {
+ 	return __write_trylock(rw) == 0;
+ }
+--- linux-2.6.20.noarch/arch/s390/kernel/traps.c~	2007-04-04 19:43:26.000000000 -0400
++++ linux-2.6.20.noarch/arch/s390/kernel/traps.c	2007-04-04 19:43:53.000000000 -0400
+@@ -304,7 +304,7 @@ void die(const char * str, struct pt_reg
+         do_exit(SIGSEGV);
+ }
+ 
+-static void inline
++static inline void
+ report_user_fault(long interruption_code, struct pt_regs *regs)
+ {
+ #if defined(CONFIG_SYSCTL)
+@@ -318,7 +318,7 @@ report_user_fault(long interruption_code
+ #endif
+ }
+ 
+-static void __kprobes inline do_trap(long interruption_code, int signr,
++static inline void __kprobes do_trap(long interruption_code, int signr,
+ 					char *str, struct pt_regs *regs,
+ 					siginfo_t *info)
+ {
+--- linux-2.6.20.noarch/drivers/s390/net/ctcmain.c~	2007-04-04 19:44:07.000000000 -0400
++++ linux-2.6.20.noarch/drivers/s390/net/ctcmain.c	2007-04-04 19:44:18.000000000 -0400
+@@ -1827,7 +1827,7 @@ channel_get(enum channel_types type, cha
+  *
+  * @return Type class of channel to be used for that interface.
+  */
+-static enum channel_types inline
++static inline enum channel_types
+ extract_channel_media(char *name)
+ {
+ 	enum channel_types ret = channel_type_unknown;



From fedora-cvs-commits at redhat.com  Wed Apr  4 23:56:44 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 19:56:44 -0400
Subject: rpms/compiz/devel compiz.spec,1.76,1.77
Message-ID: <200704042356.l34Nui0N015683@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15669

Modified Files:
	compiz.spec 
Log Message:
* Wed Apr  4 2007 Kristian H??gsberg <krh at hinata.boston.redhat.com> - 0.3.6-7
- Fix typo in ./configure option.



Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- compiz.spec	4 Apr 2007 23:34:04 -0000	1.76
+++ compiz.spec	4 Apr 2007 23:56:42 -0000	1.77
@@ -6,7 +6,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.3.6
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -98,7 +98,7 @@
 	--enable-gtk 		\
 	--enable-metacity 	\
 	--enable-gnome		\
-	--with-default-plugs=%{plugins} \
+	--with-default-plugins=%{plugins} \
 	--disable-kde
 
 make %{?_smp_mflags} imagedir=%{_datadir}/pixmaps
@@ -198,6 +198,9 @@
 %{_libdir}/libdecoration.so
 
 %changelog
+* Wed Apr  4 2007 Kristian H??gsberg <krh at hinata.boston.redhat.com> - 0.3.6-7
+- Fix typo in ./configure option.
+
 * Wed Apr  4 2007 Kristian H??gsberg <krh at redhat.com> - 0.3.6-6
 - Add place and clone plugins to default plugin list.
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 00:02:20 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 20:02:20 -0400
Subject: rpms/concurrent/devel concurrent.spec,1.16,1.17
Message-ID: <200704050002.l3502K4r016004@cvs.devel.redhat.com>

Author: pcheung

Update of /cvs/dist/rpms/concurrent/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15989

Modified Files:
	concurrent.spec 
Log Message:
Update spec file as per fedora review




Index: concurrent.spec
===================================================================
RCS file: /cvs/dist/rpms/concurrent/devel/concurrent.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- concurrent.spec	29 Mar 2007 15:41:15 -0000	1.16
+++ concurrent.spec	5 Apr 2007 00:02:18 -0000	1.17
@@ -58,15 +58,11 @@
 This package provides standardized, efficient versions of utility classes
 commonly encountered in concurrent Java programming. This code consists of
 implementations of ideas that have been around for ages, and is merely intended
-to save you the trouble of coding them. Discussions of the rationale and
-applications of several of these classes can be found in the second edition of
-Concurrent Programming in Java.
+to save you the trouble of coding them.
 
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Requires(post): /bin/rm /bin/ln
-Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -75,7 +71,8 @@
 %setup -c -q
 mkdir -p src/EDU/oswego/cs/dl/util
 mv concurrent src/EDU/oswego/cs/dl/util
-cp %{SOURCE1} build.xml
+cp -pr %{SOURCE1} build.xml
+sed -i -e 's/..\/sun-u.c.license.pdf/http:\/\/gee.cs.oswego.edu\/dl\/classes\/EDU\/oswego\/cs\/dl\/util\/sun-u.c.license.pdf/' src/EDU/oswego/cs/dl/util/concurrent/intro.html
 
 %build
 ant \
@@ -118,7 +115,7 @@
 %files
 %defattr(0644,root,root,0755)
 %{_javadir}/*.jar
-%doc intro.html
+%doc src/EDU/oswego/cs/dl/util/concurrent/intro.html
 
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/concurrent-1.3.4.jar.*



From fedora-cvs-commits at redhat.com  Thu Apr  5 00:17:22 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 20:17:22 -0400
Subject: rpms/jakarta-commons-lang/devel jakarta-commons-lang.spec, 1.22,
	1.23
Message-ID: <200704050017.l350HMhu016420@cvs.devel.redhat.com>

Author: pcheung

Update of /cvs/dist/rpms/jakarta-commons-lang/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16398

Modified Files:
	jakarta-commons-lang.spec 
Log Message:
Update spec file as per fedora review




Index: jakarta-commons-lang.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-lang/devel/jakarta-commons-lang.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jakarta-commons-lang.spec	29 Mar 2007 15:13:50 -0000	1.22
+++ jakarta-commons-lang.spec	5 Apr 2007 00:17:20 -0000	1.23
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
 Version:        2.1
 Release:        6jpp.1%{?dist}
 Epoch:          0
-Summary:        Jakarta Commons Lang Package
+Summary:        Provides a host of helper utilities for the java.lang API
 License:        Apache Software License
 Group:          Development/Libraries/Java
 URL:            http://jakarta.apache.org/commons/lang
@@ -50,8 +50,7 @@
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
-BuildRequires:  ant-junit, jpackage-utils >= 0:1.5, %{__perl}
-BuildRequires:  sed
+BuildRequires:  ant-junit, jpackage-utils >= 0:1.5
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -68,7 +67,7 @@
 methods, object reflection, creation and serialization, and System
 properties. Additionally it contains an inheritable enum type, an
 exception structure that supports multiple types of nested-Exceptions
-and a series of utlities dedicated to help with building methods, such
+and a series of utilities dedicated to help with building methods, such
 as hashCode, toString and equals.
 
 %package        javadoc



From fedora-cvs-commits at redhat.com  Thu Apr  5 01:08:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 4 Apr 2007 21:08:43 -0400
Subject: rpms/evolution/devel evolution.spec,1.234.2.3,1.234.2.4
Message-ID: <200704050108.l3518hTZ025402@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
      Tag: private-evo-sanity-2_10_0-branch
	evolution.spec 
Log Message:
update



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.234.2.3
retrieving revision 1.234.2.4
diff -u -r1.234.2.3 -r1.234.2.4
--- evolution.spec	3 Apr 2007 20:46:11 -0000	1.234.2.3
+++ evolution.spec	5 Apr 2007 01:08:41 -0000	1.234.2.4
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.0
-Release: 7%{?dist}.dwmw2.2
+Release: 10%{?dist}.dwmw2.1
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -167,6 +167,12 @@
 Patch1000: evolution-2.10.0-check-only-active-folders.patch
 Patch1002: evolution-2.6.0-improve-select-thread.patch
 
+# RH bug #235056
+Patch50: evolution-2.10.0-plugins-require-libxml2.patch
+
+# GNOME bug #352713
+Patch51: evolution-2.10.0-bold-folders.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -278,6 +284,7 @@
 Requires: evolution-data-server-devel >= %{eds_version}
 Requires: gtkhtml3-devel >= %{gtkhtml_version}
 Requires: libsoup-devel >= %{soup_version}
+Requires: libxml2-devel
 Obsoletes: libgal2-devel <= %{last_libgal2_version}
 
 %description devel
@@ -320,6 +327,8 @@
 %patch47 -p1 -b .drop-old-glib-support
 %patch48 -p1 -b .CVE-2007-1002
 %patch49 -p1 -b .let-mail-notification-build
+%patch50 -p1 -b .plugins-require-libxml2
+%patch51 -p1 -b .bold-folders
 
 %patch1000 -p1
 %patch1002 -p1
@@ -739,6 +748,17 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Wed Apr 04 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-10.fc7
+- Add patch for GNOME bug #352713 (improve folder tree updates).
+
+* Tue Apr 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-9.fc7
+- Require libxml2-devel in evolution-devel package (RH bug #235056).
+- Add libxml-2.0 requirement to evolution-plugin-2.10.pc.
+
+* Tue Apr 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-8.fc7
+- Revise patch for GNOME bug #419524 to fix RH bug #235082
+  (crash in initial account setup wizard).
+
 * Mon Apr 02 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-7.fc7
 - Add patch for RH bug #231767 (allow mail-notification to build).
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 04:19:34 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 00:19:34 -0400
Subject: rpms/avalon-framework/devel avalon-framework-target.patch, 1.1,
	1.2 avalon-framework.spec, 1.22, 1.23
Message-ID: <200704050419.l354JYCE000788@cvs.devel.redhat.com>

Author: pcheung

Update of /cvs/dist/rpms/avalon-framework/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv764

Modified Files:
	avalon-framework-target.patch avalon-framework.spec 
Log Message:
Fix the building of javadoc



avalon-framework-target.patch:
 build.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: avalon-framework-target.patch
===================================================================
RCS file: /cvs/dist/rpms/avalon-framework/devel/avalon-framework-target.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avalon-framework-target.patch	15 Dec 2005 10:41:50 -0000	1.1
+++ avalon-framework-target.patch	5 Apr 2007 04:19:31 -0000	1.2
@@ -10,3 +10,11 @@
              <classpath refid="project.class.path" />
              <src path="${test.dir}"/>
              <exclude name="org/apache/avalon/framework/logger/LogKit*.java"
+@@ -329,6 +330,7 @@ Legal:
+         <mkdir dir="${target.javadocs}"/>
+ 
+         <javadoc packagenames="org.apache.*"
++            source="1.4"
+             sourcepath="${java.dir}"
+             destdir="${target.javadocs}">
+             <classpath refid="project.class.path" />


Index: avalon-framework.spec
===================================================================
RCS file: /cvs/dist/rpms/avalon-framework/devel/avalon-framework.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- avalon-framework.spec	16 Mar 2007 16:02:55 -0000	1.22
+++ avalon-framework.spec	5 Apr 2007 04:19:31 -0000	1.23
@@ -116,6 +116,8 @@
 # create unversioned symlinks
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
 
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
 %endif
@@ -155,6 +157,7 @@
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
 
 %changelog
 * Thu Mar 08 2007 Permaine Cheung <pcheung at redhat.com> - 0:4.1.4-2jpp.14



From fedora-cvs-commits at redhat.com  Thu Apr  5 05:50:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 01:50:47 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.3045,1.3046
Message-ID: <200704050550.l355olPh024394@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
* Thu Apr 05 2007 Dave Jones <davej at redhat.com>
- Disable some warnings.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3045
retrieving revision 1.3046
diff -u -r1.3045 -r1.3046
--- kernel-2.6.spec	4 Apr 2007 20:43:46 -0000	1.3045
+++ kernel-2.6.spec	5 Apr 2007 05:50:45 -0000	1.3046
@@ -2252,6 +2252,9 @@
 #  - tux.
 
 %changelog
+* Thu Apr 05 2007 Dave Jones <davej at redhat.com>
+- Disable some warnings.
+
 * Wed Apr 04 2007 Dave Jones <davej at redhat.com>
 - 2.6.21-rc5-git12
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 08:01:33 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 04:01:33 -0400
Subject: rpms/vixie-cron/devel vixie-cron-4.1-bz220376.patch, NONE,
	1.1 vixie-cron.spec, 1.94, 1.95
Message-ID: <200704050801.l3581X2g016842@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16809

Modified Files:
	vixie-cron.spec 
Added Files:
	vixie-cron-4.1-bz220376.patch 
Log Message:
Add patch.


vixie-cron-4.1-bz220376.patch:
 crontab.c  |   23 ++++++++++++++++++++
 database.c |   24 +++++++++++++++++++++
 misc.c     |   69 +++++++++++++++++++++++++++++++------------------------------
 3 files changed, 83 insertions(+), 33 deletions(-)

--- NEW FILE vixie-cron-4.1-bz220376.patch ---
--- vixie-cron-4.1/misc.c.old	2007-04-05 09:04:51.000000000 +0200
+++ vixie-cron-4.1/misc.c	2007-04-05 09:08:39.000000000 +0200
@@ -206,6 +206,41 @@
 #endif
 }
 
+void check_dirs(char* dirs,struct stat sb, struct group *grp) {
+    /* CRONDIR okay (now==CWD), now look at SPOOL_DIR ("tabs" or some such)
+     */
+    if (stat(dirs, &sb) < OK && errno == ENOENT) {
+        perror(dirs);
+        if (OK == mkdir(dirs, 0700)) {
+            fprintf(stderr, "%s: created\n", dirs);
+            stat(dirs, &sb);
+        } else {
+            fprintf(stderr, "%s: ", dirs);
+            perror("mkdir");
+            exit(ERROR_EXIT);
+        }
+    }
+    if (!S_ISDIR(sb.st_mode)) {
+        fprintf(stderr, "'%s' is not a directory, bailing out.\n",
+            dirs);
+        exit(ERROR_EXIT);
+    }
+    if (grp != NULL) {
+        if (sb.st_gid != grp->gr_gid)
+            if( chown(dirs, -1, grp->gr_gid) == -1 )
+            {
+            fprintf(stderr,"chdir %s failed: %s\n", dirs, strerror(errno));
+            exit(ERROR_EXIT);
+            }
+        if (sb.st_mode != 01730)
+            if( chmod(dirs, 01730) == -1 )
+            {
+            fprintf(stderr,"chmod 01730 %s failed: %s\n", dirs, strerror(errno));
+            exit(ERROR_EXIT);
+            }
+    }
+}
+
 void
 set_cron_cwd(void) {
 	struct stat sb;
@@ -237,39 +272,7 @@
 		perror(CRONDIR);
 		exit(ERROR_EXIT);
 	}
-
-	/* CRONDIR okay (now==CWD), now look at SPOOL_DIR ("tabs" or some such)
-	 */
-	if (stat(SPOOL_DIR, &sb) < OK && errno == ENOENT) {
-		perror(SPOOL_DIR);
-		if (OK == mkdir(SPOOL_DIR, 0700)) {
-			fprintf(stderr, "%s: created\n", SPOOL_DIR);
-			stat(SPOOL_DIR, &sb);
-		} else {
-			fprintf(stderr, "%s: ", SPOOL_DIR);
-			perror("mkdir");
-			exit(ERROR_EXIT);
-		}
-	}
-	if (!S_ISDIR(sb.st_mode)) {
-		fprintf(stderr, "'%s' is not a directory, bailing out.\n",
-			SPOOL_DIR);
-		exit(ERROR_EXIT);
-	}
-	if (grp != NULL) {
-		if (sb.st_gid != grp->gr_gid)
-		    if( chown(SPOOL_DIR, -1, grp->gr_gid) == -1 )
-		    {
-			fprintf(stderr,"chdir %s failed: %s\n", SPOOL_DIR, strerror(errno));
-			exit(ERROR_EXIT);
-		    }
-		if (sb.st_mode != 01730)
-		    if( chmod(SPOOL_DIR, 01730) == -1 )
-		    {
-			fprintf(stderr,"chmod 01730 %s failed: %s\n", SPOOL_DIR, strerror(errno));
-			exit(ERROR_EXIT);
-		    }
-	}
+	check_dirs(SPOOL_DIR,sb,grp); check_dirs(RH_CROND_DIR,sb,grp);
 }
 
 /* acquire_daemonlock() - write our PID into /etc/cron.pid, unless
--- vixie-cron-4.1/database.c.old	2007-04-05 09:12:02.000000000 +0200
+++ vixie-cron-4.1/database.c	2007-04-05 09:16:11.000000000 +0200
@@ -150,6 +150,27 @@
 	}
 	closedir(dir);
 
+	if (!(dir = opendir(RH_CROND_DIR))) {
+        log_it("CRON", getpid(), "OPENDIR FAILED", RH_CROND_DIR);
+        (void) exit(ERROR_EXIT);
+    }
+
+	while (NULL != (dp = readdir(dir))) {
+        char fname[MAXNAMLEN+1], tabname[MAXNAMLEN+1];
+
+        if ( not_a_crontab( dp ) )
+            continue;
+
+        strncpy(fname, dp->d_name, MAXNAMLEN);
+
+        if (!glue_strings(tabname, sizeof tabname, RH_CROND_DIR, fname, '/'))
+            continue;   /* XXX log? */
+
+        process_crontab(fname, fname, tabname,
+                &statbuf, &new_db, old_db);
+    }
+    closedir(dir);
+
 	/* if we don't do this, then when our children eventually call
 	 * getpwnam() in do_command.c's child_process to verify MAILTO=,
 	 * they will screw us up (and v-v).
@@ -357,6 +378,9 @@
 		if (!glue_strings(tabname, sizeof tabname, SPOOL_DIR, dp->d_name, '/'))
 			continue;	/* XXX log? */
 
+		if (!glue_strings(tabname, sizeof tabname, RH_CROND_DIR, dp->d_name, '/'))
+            continue;   /* XXX log? */
+
 		if ( stat( tabname, &st ) < OK )
 			continue;       /* XXX log? */
 		
--- vixie-cron-4.1/crontab.c.old	2007-04-05 09:16:33.000000000 +0200
+++ vixie-cron-4.1/crontab.c	2007-04-05 09:32:04.000000000 +0200
@@ -287,6 +287,10 @@
 		fprintf(stderr, "path too long\n");
 		exit(ERROR_EXIT);
 	}
+	if (!glue_strings(n, sizeof n, RH_CROND_DIR, User, '/')) {
+        fprintf(stderr, "path too long\n");
+        exit(ERROR_EXIT);
+    }
 	if (!(f = fopen(n, "r"))) {
 		if (errno == ENOENT)
 			fprintf(stderr, "no crontab for %s\n", User);
@@ -320,6 +324,10 @@
 		fprintf(stderr, "path too long\n");
 		exit(ERROR_EXIT);
 	}
+	if (!glue_strings(n, sizeof n, RH_CROND_DIR, User, '/')) {
+        fprintf(stderr, "path too long\n");
+        exit(ERROR_EXIT);
+    }
 	if (unlink(n) != 0) {
 		if (errno == ENOENT)
 			fprintf(stderr, "no crontab for %s\n", User);
@@ -351,6 +359,10 @@
 		fprintf(stderr, "path too long\n");
 		exit(ERROR_EXIT);
 	}
+	if (!glue_strings(n, sizeof n, RH_CROND_DIR, User, '/')) {
+        fprintf(stderr, "path too long\n");
+        exit(ERROR_EXIT);
+    }
 	if (!(f = fopen(n, "r"))) {
 		if (errno != ENOENT) {
 			perror(n);
@@ -627,6 +639,12 @@
 		fprintf(stderr, "path too long\n");
 		return (-2);
 	}
+	if (!glue_strings(TempFilename, sizeof TempFilename, RH_CROND_DIR,
+        "tmp.XXXXXXXXXX", '/')) {
+        TempFilename[0] = '\0';
+        fprintf(stderr, "path too long\n");
+        return (-2);
+    }
 	if ((fd = mkstemp(TempFilename)) == -1 || !(tmp = fdopen(fd, "w+"))) {
 		perror(TempFilename);
 		if (fd != -1) {
@@ -742,6 +760,11 @@
 		error = -2;
 		goto done;
 	}
+	if (!glue_strings(n, sizeof n, RH_CROND_DIR, User, '/')) {
+        fprintf(stderr, "path too long\n");
+        error = -2;
+        goto done;
+    }
 	if (rename(TempFilename, n)) {
 		fprintf(stderr, "%s: error renaming %s to %s\n",
 			ProgramName, TempFilename, n);


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- vixie-cron.spec	8 Mar 2007 14:39:42 -0000	1.94
+++ vixie-cron.spec	5 Apr 2007 08:01:31 -0000	1.95
@@ -10,7 +10,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times
 Name: vixie-cron
 Version: 4.1
-Release: 79%{?dist}
+Release: 80%{?dist}
 Epoch: 4
 License: BSD
 Group: System Environment/Base
@@ -83,6 +83,7 @@
 Patch63: vixie-cron-4.1-manual.patch
 Patch64: vixie-cron-4.1-_62newyear.patch
 Patch65: vixie-cron-4.1-_63newavc.patch
+Patch66: vixie-cron-4.1-bz220376.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: syslog, bash >= 2.0
@@ -189,6 +190,8 @@
 %patch63 -p1 -b .manual
 %patch64 -p1 -b ._62newyear
 %patch65 -p1 -b ._63newavc
+%patch66 -p1 -b .patch
+%patch67 -p1 -b .bz220376
 
 %build
 # RPM_OPT_FLAGS are better here, because we don't have configure for set up variables ;-)
@@ -209,16 +212,16 @@
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{1,5,8}
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
+mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
+mkdir -p $RPM_BUILD_ROOT/etc/pam.d
 make install DESTDIR=$RPM_BUILD_ROOT DESTMAN=$RPM_BUILD_ROOT%{_mandir}
-mkdir -pm700 $RPM_BUILD_ROOT/%{_localstatedir}/spool/cron
-mkdir -pm755 $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d
+mkdir -pm700 $RPM_BUILD_ROOT/var/spool/cron
+mkdir -pm755 $RPM_BUILD_ROOT/etc/cron.d
 install -pm755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/crond
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/crond
+mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/crond
 %if ! %{WITH_PAM}
-	rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
+	rm -rf $RPM_BUILD_ROOT/etc/pam.d
 %endif
 
 %clean
@@ -255,11 +258,15 @@
 %attr(700,root,root) %dir /etc/cron.d
 %attr(755,root,root) /etc/rc.d/init.d/crond
 %if %{WITH_PAM}   
-	%config(noreplace) /etc/pam.d/crond
+	%attr(0644,root,root) %config(noreplace) /etc/pam.d/crond
 %endif
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Thu Apr  5 2007 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-80
+- jobs from RH_CROND_DIR wasn't "sometimes" run
+- rhbz#220376
+
 * Thu Mar 07 2007 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-79
 - merge review
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 08:05:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 04:05:42 -0400
Subject: rpms/vixie-cron/devel vixie-cron.spec,1.95,1.96
Message-ID: <200704050805.l3585gTE017373@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17358

Modified Files:
	vixie-cron.spec 
Log Message:
Change in spec.



Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- vixie-cron.spec	5 Apr 2007 08:01:31 -0000	1.95
+++ vixie-cron.spec	5 Apr 2007 08:05:40 -0000	1.96
@@ -190,8 +190,7 @@
 %patch63 -p1 -b .manual
 %patch64 -p1 -b ._62newyear
 %patch65 -p1 -b ._63newavc
-%patch66 -p1 -b .patch
-%patch67 -p1 -b .bz220376
+%patch66 -p1 -b .bz220376
 
 %build
 # RPM_OPT_FLAGS are better here, because we don't have configure for set up variables ;-)



From fedora-cvs-commits at redhat.com  Thu Apr  5 08:52:15 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 04:52:15 -0400
Subject: rpms/passwd/devel passwd.spec,1.29,1.30
Message-ID: <200704050852.l358qFbP014239@cvs.devel.redhat.com>

Author: tmraz

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

Modified Files:
	passwd.spec 
Log Message:
* Thu Apr  5 2007 Tomas Mraz <tmraz at redhat.com> 0.74-3
- use std buildroot, add dist tag (#226232)



Index: passwd.spec
===================================================================
RCS file: /cvs/dist/rpms/passwd/devel/passwd.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- passwd.spec	30 Jan 2007 14:26:19 -0000	1.29
+++ passwd.spec	5 Apr 2007 08:52:13 -0000	1.30
@@ -7,11 +7,11 @@
 Summary: The passwd utility for setting/changing passwords using PAM
 Name: passwd
 Version: 0.74
-Release: 2
+Release: 3%{?dist}
 License: BSD
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.bz2
-Buildroot: %{_tmppath}/passwd-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pam >= 0.78, /etc/pam.d/system-auth
 %if %{WITH_SELINUX}
 BuildRequires: libselinux-devel
@@ -58,6 +58,9 @@
 %{_mandir}/man1/passwd.1*
 
 %changelog
+* Thu Apr  5 2007 Tomas Mraz <tmraz at redhat.com> 0.74-3
+- use std buildroot, add dist tag (#226232)
+
 * Tue Jan 30 2007 Tomas Mraz <tmraz at redhat.com> 0.74-2
 - do not explicitly strip the binary
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 08:54:58 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 04:54:58 -0400
Subject: rpms/system-config-printer/devel
	system-config-printer-0.7.63.tar.bz2.sig, NONE, 1.1 .cvsignore,
	1.124, 1.125 sources, 1.129, 1.130 system-config-printer.spec,
	1.99, 1.100 system-config-printer-0.7.62.tar.bz2.sig, 1.1, NONE
Message-ID: <200704050854.l358swpK016330@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore sources system-config-printer.spec 
Added Files:
	system-config-printer-0.7.63.tar.bz2.sig 
Removed Files:
	system-config-printer-0.7.62.tar.bz2.sig 
Log Message:
* Thu Apr  5 2007 Tim Waugh <twaugh at redhat.com> 0.7.63-1
- 0.7.63:
  - Translation updates.
  - Checked in missing file.



--- NEW FILE system-config-printer-0.7.63.tar.bz2.sig ---
??

Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- .cvsignore	4 Apr 2007 11:06:04 -0000	1.124
+++ .cvsignore	5 Apr 2007 08:54:56 -0000	1.125
@@ -106,3 +106,4 @@
 system-config-printer-0.7.61.tar.bz2
 system-config-printer-0.7.62.tar.bz2
 pycups-1.9.20.tar.bz2
+system-config-printer-0.7.63.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- sources	4 Apr 2007 11:06:04 -0000	1.129
+++ sources	5 Apr 2007 08:54:56 -0000	1.130
@@ -1,2 +1,2 @@
-a6719e4a9f2a0d7395a401f6f7abb688  system-config-printer-0.7.62.tar.bz2
 95ade8184c74c7373e987b02a58ae451  pycups-1.9.20.tar.bz2
+0202245ebd76a50d76d2338f023323c7  system-config-printer-0.7.63.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- system-config-printer.spec	4 Apr 2007 11:06:04 -0000	1.99
+++ system-config-printer.spec	5 Apr 2007 08:54:56 -0000	1.100
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.62
+Version: 0.7.63
 Release: 1%{?dist}
 License: GPL
 URL: http://cyberelk.net/tim/software/system-config-printer/
@@ -129,6 +129,11 @@
 fi
 
 %changelog
+* Thu Apr  5 2007 Tim Waugh <twaugh at redhat.com> 0.7.63-1
+- 0.7.63:
+  - Translation updates.
+  - Checked in missing file.
+
 * Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com>
 - Updated to pycups-1.9.20 for printer-state-reasons fix.
 


--- system-config-printer-0.7.62.tar.bz2.sig DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr  5 10:04:54 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 06:04:54 -0400
Subject: rpms/libdaemon/devel libdaemon.spec,1.8,1.9
Message-ID: <200704051004.l35A4rHw009162@cvs.devel.redhat.com>

Author: mbacovsk

Update of /cvs/dist/rpms/libdaemon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9148

Modified Files:
	libdaemon.spec 
Log Message:
* Thu Apr  5 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.10-4
- Resolves: #222855: fileconflict for /usr/share/doc/libdaemon-devel-0.10/Makefile 



Index: libdaemon.spec
===================================================================
RCS file: /cvs/dist/rpms/libdaemon/devel/libdaemon.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libdaemon.spec	12 Jul 2006 06:47:27 -0000	1.8
+++ libdaemon.spec	5 Apr 2007 10:04:51 -0000	1.9
@@ -1,6 +1,6 @@
 Name: libdaemon
 Version: 0.10
-Release: 3.2
+Release: 4%{?dist}
 Summary: library for writing UNIX daemons
 
 Group: System Environment/Libraries
@@ -62,12 +62,15 @@
 %files devel
 %defattr(-,root,root)
 %doc LICENSE README
-%doc doc/*
+%doc doc/README.html doc/style.css
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Apr  5 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.10-4
+- Resolves: #222855: fileconflict for /usr/share/doc/libdaemon-devel-0.10/Makefile 
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 10:14:55 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 06:14:55 -0400
Subject: rpms/fedora-logos/devel .cvsignore, 1.52, 1.53 fedora-logos.spec,
	1.64, 1.65 sources, 1.55, 1.56
Message-ID: <200704051014.l35AEtHf009331@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/fedora-logos/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9315

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
fix ksplash BlueCurve theme



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	22 Mar 2007 18:29:23 -0000	1.52
+++ .cvsignore	5 Apr 2007 10:14:52 -0000	1.53
@@ -1,2 +1,3 @@
 fedora-logos-6.0.96.tar.bz2
 fedora-logos-6.0.97.tar.bz2
+fedora-logos-6.0.98.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- fedora-logos.spec	28 Mar 2007 16:54:38 -0000	1.64
+++ fedora-logos.spec	5 Apr 2007 10:14:52 -0000	1.65
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 6.0.97
-Release: 2%{?dist}
+Version: 6.0.98
+Release: 1%{?dist}
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
 License: Copyright ? 1999-2006 Red Hat, Inc.  All rights reserved.
@@ -179,6 +179,9 @@
 # end i386 bits
 
 %changelog
+* Thu Apr 05 2007 Than Ngo <than at redhat.com> - 6.0.98-1
+- fix ksplash BlueCurve theme
+
 * Wed Mar 28 2007 Matthias Clasen <mclasen at redhat.com> 6.0.97-2
 - Save some space by linking backgrounds
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	22 Mar 2007 18:29:23 -0000	1.55
+++ sources	5 Apr 2007 10:14:53 -0000	1.56
@@ -1 +1 @@
-d5ee953daf54ffc0f1673defb48f23c3  fedora-logos-6.0.97.tar.bz2
+713819f337c8ecb4b0e357e470c4c3d6  fedora-logos-6.0.98.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr  5 10:15:56 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 06:15:56 -0400
Subject: rpms/libdaemon/FC-6 libdaemon.spec,1.8,1.9
Message-ID: <200704051015.l35AFujk009400@cvs.devel.redhat.com>

Author: mbacovsk

Update of /cvs/dist/rpms/libdaemon/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv9386

Modified Files:
	libdaemon.spec 
Log Message:
* Thu Apr  5 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.10-4
- Resolves: #222857: fileconflict for /usr/share/doc/libdaemon-devel-0.10/Makefile 



Index: libdaemon.spec
===================================================================
RCS file: /cvs/dist/rpms/libdaemon/FC-6/libdaemon.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libdaemon.spec	12 Jul 2006 06:47:27 -0000	1.8
+++ libdaemon.spec	5 Apr 2007 10:15:54 -0000	1.9
@@ -1,6 +1,6 @@
 Name: libdaemon
 Version: 0.10
-Release: 3.2
+Release: 4%{?dist}
 Summary: library for writing UNIX daemons
 
 Group: System Environment/Libraries
@@ -62,12 +62,15 @@
 %files devel
 %defattr(-,root,root)
 %doc LICENSE README
-%doc doc/*
+%doc doc/README.html doc/style.css
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Apr  5 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.10-4
+- Resolves: #222857: fileconflict for /usr/share/doc/libdaemon-devel-0.10/Makefile 
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 10:20:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 06:20:01 -0400
Subject: rpms/authconfig/devel authconfig.spec,1.79,1.80
Message-ID: <200704051020.l35AK1Ol009502@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/authconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9484

Modified Files:
	authconfig.spec 
Log Message:
* Thu Apr  5 2007 Tomas Mraz <tmraz at redhat.com> - 5.3.13-3
- minor changes and cleanups for merge review (#225293)



Index: authconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- authconfig.spec	19 Mar 2007 19:33:23 -0000	1.79
+++ authconfig.spec	5 Apr 2007 10:19:59 -0000	1.80
@@ -3,11 +3,14 @@
 Version: 5.3.13
 # Don't change release in elvis CVS, up version after merging all patches
 # from dist CVS instead.
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 ExclusiveOS: Linux
 Group: System Environment/Base
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# The upstream project is hosted in CVS on:
+URL: http://rhlinux.redhat.com/
+# The project doesn't have http site with downloadable tarballs yet.
 Source: %{name}-%{version}.tar.bz2
 Requires: rhpl, newt, pam >= 0.99.6.2, usermode
 Requires: python >= %(%{__python} -c "import sys; print sys.version[:3]" || echo 2.3)
@@ -60,7 +63,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING NOTES TODO README.samba3
 %ghost %config(noreplace) %{_sysconfdir}/sysconfig/authconfig
 %ghost %config(noreplace) %{_sysconfdir}/pam.d/system-auth-ac
@@ -84,7 +87,7 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/authconfig-tui
 
 %files gtk
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/authconfig-gtk
 %{_bindir}/system-config-authentication
 %{_sbindir}/authconfig-gtk
@@ -99,6 +102,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Thu Apr  5 2007 Tomas Mraz <tmraz at redhat.com> - 5.3.13-3
+- minor changes and cleanups for merge review (#225293)
+
 * Mon Mar 19 2007 Tomas Mraz <tmraz at redhat.com> - 5.3.13-2
 - nss_ldap is now in /usr/lib (#232975)
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 10:35:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 06:35:23 -0400
Subject: rpms/pam_ccreds/devel pam_ccreds.spec,1.19,1.20
Message-ID: <200704051035.l35AZNh6025749@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam_ccreds/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25692

Modified Files:
	pam_ccreds.spec 
Log Message:
* Thu Apr  5 2007 Tomas Mraz <tmraz at redhat.com> - 4-2
- minor updates for merge review (#226224)



Index: pam_ccreds.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_ccreds/devel/pam_ccreds.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pam_ccreds.spec	5 Feb 2007 16:12:07 -0000	1.19
+++ pam_ccreds.spec	5 Apr 2007 10:35:20 -0000	1.20
@@ -1,14 +1,15 @@
 Summary: Pam module to cache login credentials
 Name: pam_ccreds
 Version: 4
-Release: 1
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
-Source0: %{name}-%{version}.tar.gz
+URL: http://www.padl.com/OSS/pam_ccreds.html
+Source0: http://www.padl.com/download/%{name}-%{version}.tar.gz
 Patch1: pam_ccreds-3-inst-no-root.patch
 Patch2: pam_ccreds-4-chkpwd.patch
 
-BuildPrereq: automake db4-devel openssl-devel pam-devel
+BuildRequires: automake db4-devel openssl-devel pam-devel
 Requires: db4 pam
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
@@ -51,6 +52,9 @@
 %{_sbindir}/cc_dump
 
 %changelog
+* Thu Apr  5 2007 Tomas Mraz <tmraz at redhat.com> - 4-2
+- minor updates for merge review (#226224)
+
 * Mon Feb  5 2007 Tomas Mraz <tmraz at redhat.com> - 4-1
 - new upstream version
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 10:48:27 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 06:48:27 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1153,
	1.1154 openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch,
	1.11, NONE
Message-ID: <200704051048.l35AmRMS002835@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch 
Log Message:
remove openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1153
retrieving revision 1.1154
diff -u -r1.1153 -r1.1154
--- openoffice.org.spec	4 Apr 2007 12:43:10 -0000	1.1153
+++ openoffice.org.spec	5 Apr 2007 10:48:25 -0000	1.1154
@@ -122,18 +122,16 @@
 Patch63: openoffice.org-2.2.0.ooo74401.basctl.boost.patch
 Patch64: workspace.configrefactor01.patch
 Patch65: workspace.sixtyfour11.patch
-Patch66: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch67: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch68: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch69: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
-Patch70: openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch
-Patch71: openoffice.org-2.2.0.ooo75329.xdguserdir.patch
-Patch72: openoffice.org-2.2.0.rh232389.tango.patch
+Patch66: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch67: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch68: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
+Patch69: openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch
+Patch70: openoffice.org-2.2.0.ooo75329.xdguserdir.patch
+Patch71: openoffice.org-2.2.0.rh232389.tango.patch
 %if %{linkopt}
-Patch73: openoffice.org-2.2.0.ooo53397.linkopt.patch
+Patch72: openoffice.org-2.2.0.ooo53397.linkopt.patch
 %endif
-Patch74: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
-#Patch75: openoffice.org-2.2.0.gprof.patch
+Patch73: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1047,18 +1045,16 @@
 %patch63 -p1 -b .ooo74401.basctl.boost.patch
 %patch64 -p1 -b .workspace.configrefactor01.patch
 %patch65 -p1 -b .workspace.sixtyfour11.patch
-%patch66 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch67 -p1 -b .ooo68717.gstreamer.video.patch
-%patch68 -p1 -b .ooo63159.sal.dtype.patch
-%patch69 -p1 -b .ooo75167.framework.workspacerestore.patch
-%patch70 -p1 -b .ooo75190.shell.newrecentlyused.patch
-%patch71 -p1 -b .ooo75329.xdguserdir.patch
-%patch72 -p1 -b .rh232389.tango.patch
+%patch66 -p1 -b .ooo68717.gstreamer.video.patch
+%patch67 -p1 -b .ooo63159.sal.dtype.patch
+%patch68 -p1 -b .ooo75167.framework.workspacerestore.patch
+%patch69 -p1 -b .ooo75190.shell.newrecentlyused.patch
+%patch70 -p1 -b .ooo75329.xdguserdir.patch
+%patch71 -p1 -b .rh232389.tango.patch
 %if %{linkopt}
-%patch73 -p1 -b .ooo53397.linkopt.patch
+%patch72 -p1 -b .ooo53397.linkopt.patch
 %endif
-%patch74 -p1 -b .ooo75790.sc.pa-IN.translate.patch
-#%patch75 -p1 -b .gprof.patch
+%patch73 -p1 -b .ooo75790.sc.pa-IN.translate.patch
 
 cp %{SOURCE1} extras/source/database/evolocal.odb
 
@@ -2635,6 +2631,8 @@
 * Wed Apr 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.4
 - Resolves: rhbz#223190 make a final fallback to a font with a known
   working notdef glyph
+- remove openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+  gcc 4.1.2-8 should allow our java components to work again.
 
 * Tue Mar 27 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.3
 - Resolves: rhbz#233944 openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch


--- openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr  5 12:06:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 08:06:53 -0400
Subject: rpms/ImageMagick/FC-5 ImageMagick-6.2.5-CVE-2007-1797.patch, NONE,
	1.1 ImageMagick.spec, 1.63, 1.64
Message-ID: <200704051206.l35C6rEd000648@cvs.devel.redhat.com>

Author: nmurray

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

Modified Files:
	ImageMagick.spec 
Added Files:
	ImageMagick-6.2.5-CVE-2007-1797.patch 
Log Message:
Resolves BZ235075


ImageMagick-6.2.5-CVE-2007-1797.patch:
 dcm.c |    2 ++
 xwd.c |   10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE ImageMagick-6.2.5-CVE-2007-1797.patch ---
--- ImageMagick/coders/dcm.c.orig	2007-04-03 18:27:57.000000000 +0200
+++ ImageMagick/coders/dcm.c	2007-04-03 18:31:16.000000000 +0200
@@ -2902,6 +2902,8 @@ static Image *ReadDCMImage(const ImageIn
             {
               data=(unsigned char *)
                 AcquireMagickMemory((size_t) quantum*(length+1));
+              if (length > ((~0UL)/quantum))
+                ThrowReaderException(CorruptImageError,"ImproperImageHeader");
               if (data == (unsigned char *) NULL)
                 ThrowReaderException(ResourceLimitError,
                   "MemoryAllocationFailed");
--- ImageMagick/coders/xwd.c.orig	2007-04-03 19:21:18.000000000 +0200
+++ ImageMagick/coders/xwd.c	2007-04-03 19:24:36.000000000 +0200
@@ -236,7 +236,9 @@ static Image *ReadXWDImage(const ImageIn
   if (header.header_size < sz_XWDheader)
     ThrowReaderException(CorruptImageError,"CorruptImage");
   length=(size_t) header.header_size-sz_XWDheader;
-  comment=(char *) AcquireMagickMemory(length+MaxTextExtent);
+  if (length > ((~0UL)/sizeof(*comment)))
+    ThrowReaderException(CorruptImageError,"ImproperImageHeader");
+  comment=(char *) AcquireMagickMemory((length+1)*sizeof(*comment));
   if (comment == (char *) NULL)
     ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
   count=ReadBlob(image,length,(unsigned char *) comment);
@@ -278,8 +281,10 @@ static Image *ReadXWDImage(const ImageIn
       XWDColor
         color;
 
-      colors=(XColor *)
-        AcquireMagickMemory((size_t) header.ncolors*sizeof(*colors));
+      length=(size_t) header.ncolors;
+      if (length > ((~0UL)/sizeof(*colors)))
+        ThrowReaderException(CorruptImageError,"ImproperImageHeader");
+      colors=(XColor *) AcquireMagickMemory(length*sizeof(*colors));
       if (colors == (XColor *) NULL)
         ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
       for (i=0; i < (long) header.ncolors; i++)


Index: ImageMagick.spec
===================================================================
RCS file: /cvs/dist/rpms/ImageMagick/FC-5/ImageMagick.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ImageMagick.spec	22 Nov 2006 01:14:39 -0000	1.63
+++ ImageMagick.spec	5 Apr 2007 12:06:51 -0000	1.64
@@ -9,7 +9,7 @@
 %else
 Version: %{VER}
 %endif
-Release: 4.2.1.fc5.7
+Release: 4.2.1.fc5.8
 License: freeware
 Group: Applications/Multimedia
 %if "%{Patchlevel}" != ""
@@ -29,6 +29,8 @@
 Patch6: ImageMagick-6.2.5-perl-liblink.patch
 # 
 Patch7: ImageMagick-6.2.5-cve-2006-5456.patch
+# 235075
+Patch8: ImageMagick-6.2.5-CVE-2007-1797.patch
 
 
 Url: http://www.imagemagick.org/
@@ -130,6 +132,7 @@
 %patch5 -p1 -b .cve-2006-4144
 %patch6 -p1 -b .perl-liblink
 %patch7 -p1 -b .cve-2006-5456
+%patch8 -p1 -b .cve-2007-1797
 
 %build
 %configure --enable-shared \
@@ -240,6 +243,9 @@
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Thu Apr  5 2007 Norm Murray <nmurray at redhat.com> 6.2.5.4-4.2.1.fc5.8
+- more overflows (#235075, CVE-2007-1797)
+
 * Fri Sep 22 2006 Norm Murray <nmurray at redhat.com> 6.2.5.4-4.2.1.fc5.7
 - more overflows (#210921 CVE-2006-5456)
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 12:15:02 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 08:15:02 -0400
Subject: rpms/ImageMagick/FC-6 ImageMagick-6.2.8-CVE-2007-1797.patch, NONE,
	1.1 ImageMagick-6.2.8-icon.patch, NONE, 1.1 ImageMagick.spec,
	1.68, 1.69
Message-ID: <200704051215.l35CF2wE000864@cvs.devel.redhat.com>

Author: nmurray

Update of /cvs/dist/rpms/ImageMagick/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv838

Modified Files:
	ImageMagick.spec 
Added Files:
	ImageMagick-6.2.8-CVE-2007-1797.patch 
	ImageMagick-6.2.8-icon.patch 
Log Message:
Resolves BZ235075
Resolves BZ206873


ImageMagick-6.2.8-CVE-2007-1797.patch:
 dcm.c |    2 ++
 xwd.c |   10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE ImageMagick-6.2.8-CVE-2007-1797.patch ---
--- ImageMagick/coders/dcm.c.orig	2007-04-03 18:27:57.000000000 +0200
+++ ImageMagick/coders/dcm.c	2007-04-03 18:31:16.000000000 +0200
@@ -2902,6 +2902,8 @@ static Image *ReadDCMImage(const ImageIn
             {
               data=(unsigned char *)
                 AcquireMagickMemory((size_t) quantum*(length+1));
+              if (length > ((~0UL)/quantum))
+                ThrowReaderException(CorruptImageError,"ImproperImageHeader");
               if (data == (unsigned char *) NULL)
                 ThrowReaderException(ResourceLimitError,
                   "MemoryAllocationFailed");
--- ImageMagick/coders/xwd.c.orig	2007-04-03 19:21:18.000000000 +0200
+++ ImageMagick/coders/xwd.c	2007-04-03 19:24:36.000000000 +0200
@@ -236,7 +236,9 @@ static Image *ReadXWDImage(const ImageIn
   if (header.header_size < sz_XWDheader)
     ThrowReaderException(CorruptImageError,"CorruptImage");
   length=(size_t) header.header_size-sz_XWDheader;
-  comment=(char *) AcquireMagickMemory(length+MaxTextExtent);
+  if (length > ((~0UL)/sizeof(*comment)))
+    ThrowReaderException(CorruptImageError,"ImproperImageHeader");
+  comment=(char *) AcquireMagickMemory((length+1)*sizeof(*comment));
   if (comment == (char *) NULL)
     ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
   count=ReadBlob(image,length,(unsigned char *) comment);
@@ -278,8 +281,10 @@ static Image *ReadXWDImage(const ImageIn
       XWDColor
         color;
 
-      colors=(XColor *)
-        AcquireMagickMemory((size_t) header.ncolors*sizeof(*colors));
+      length=(size_t) header.ncolors;
+      if (length > ((~0UL)/sizeof(*colors)))
+        ThrowReaderException(CorruptImageError,"ImproperImageHeader");
+      colors=(XColor *) AcquireMagickMemory(length*sizeof(*colors));
       if (colors == (XColor *) NULL)
         ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
       for (i=0; i < (long) header.ncolors; i++)

ImageMagick-6.2.8-icon.patch:
 icon.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ImageMagick-6.2.8-icon.patch ---
--- ImageMagick-6.2.8/coders/icon.c~	2006-04-14 19:22:23.000000000 -0700
+++ ImageMagick-6.2.8/coders/icon.c	2007-01-21 17:21:22.000000000 -0800
@@ -479,7 +479,7 @@
             q->green=ScaleCharToQuantum((unsigned char) ReadBlobByte(image));
             q->red=ScaleCharToQuantum((unsigned char) ReadBlobByte(image));
             if (image->matte != MagickFalse)
-              q->opacity=ScaleCharToQuantum((unsigned char)
+              q->opacity=QuantumRange-ScaleCharToQuantum((unsigned char)
                 ReadBlobByte(image));
             q++;
           }


Index: ImageMagick.spec
===================================================================
RCS file: /cvs/dist/rpms/ImageMagick/FC-6/ImageMagick.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- ImageMagick.spec	22 Nov 2006 01:38:17 -0000	1.68
+++ ImageMagick.spec	5 Apr 2007 12:15:00 -0000	1.69
@@ -9,7 +9,7 @@
 %else
 Version: %{VER}
 %endif
-Release: 3%{?dist}.1
+Release: 4%{?dist}
 License: freeware
 Group: Applications/Multimedia
 %if "%{Patchlevel}" != ""
@@ -26,6 +26,11 @@
 Patch4: ImageMagick-6.2.8-cve-2006-4144.patch
 # 
 Patch5: ImageMagick-6.2.8-cve-2006-5456.patch
+# 206873
+Patch6: ImageMagick-6.2.8-icon.patch
+# 235075
+Patch7: ImageMagick-6.2.8-CVE-2007-1797.patch
+
 
 
 Url: http://www.imagemagick.org/
@@ -126,6 +131,8 @@
 %patch3 -p1 -b .cve-2006-3743
 %patch4 -p1 -b .cve-2006-4144
 %patch5 -p1 -b .cve-2006-5456
+%patch6 -p1 -b .icon
+%patch7 -p1 -b .cve-2007-1797
 
 %build
 %configure --enable-shared \
@@ -261,6 +268,10 @@
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Thu Apr 05 2007 Norm Murray <nmurray at redhat.com>  - 6.2.8.0-4.fc6
+- fix more overflows (#235075, CVE-2007-1797)
+- fix icon conversions (#206873)
+
 * Wed Nov 15 2006 Norm Murray <nmurray at redhat.com>  - 6.2.8.0-3.fc6.1
 - fix more overflows (#210921, CVE-2006-5456)
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 12:18:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 08:18:31 -0400
Subject: rpms/ImageMagick/devel ImageMagick-6.2.8-CVE-2007-1797.patch, NONE,
	1.1 ImageMagick.spec, 1.69, 1.70
Message-ID: <200704051218.l35CIVdU001024@cvs.devel.redhat.com>

Author: nmurray

Update of /cvs/dist/rpms/ImageMagick/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv995

Modified Files:
	ImageMagick.spec 
Added Files:
	ImageMagick-6.2.8-CVE-2007-1797.patch 
Log Message:
Resolves BZ235075


ImageMagick-6.2.8-CVE-2007-1797.patch:
 dcm.c |    2 ++
 xwd.c |   10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE ImageMagick-6.2.8-CVE-2007-1797.patch ---
--- ImageMagick/coders/dcm.c.orig	2007-04-03 18:27:57.000000000 +0200
+++ ImageMagick/coders/dcm.c	2007-04-03 18:31:16.000000000 +0200
@@ -2902,6 +2902,8 @@ static Image *ReadDCMImage(const ImageIn
             {
               data=(unsigned char *)
                 AcquireMagickMemory((size_t) quantum*(length+1));
+              if (length > ((~0UL)/quantum))
+                ThrowReaderException(CorruptImageError,"ImproperImageHeader");
               if (data == (unsigned char *) NULL)
                 ThrowReaderException(ResourceLimitError,
                   "MemoryAllocationFailed");
--- ImageMagick/coders/xwd.c.orig	2007-04-03 19:21:18.000000000 +0200
+++ ImageMagick/coders/xwd.c	2007-04-03 19:24:36.000000000 +0200
@@ -236,7 +236,9 @@ static Image *ReadXWDImage(const ImageIn
   if (header.header_size < sz_XWDheader)
     ThrowReaderException(CorruptImageError,"CorruptImage");
   length=(size_t) header.header_size-sz_XWDheader;
-  comment=(char *) AcquireMagickMemory(length+MaxTextExtent);
+  if (length > ((~0UL)/sizeof(*comment)))
+    ThrowReaderException(CorruptImageError,"ImproperImageHeader");
+  comment=(char *) AcquireMagickMemory((length+1)*sizeof(*comment));
   if (comment == (char *) NULL)
     ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
   count=ReadBlob(image,length,(unsigned char *) comment);
@@ -278,8 +281,10 @@ static Image *ReadXWDImage(const ImageIn
       XWDColor
         color;
 
-      colors=(XColor *)
-        AcquireMagickMemory((size_t) header.ncolors*sizeof(*colors));
+      length=(size_t) header.ncolors;
+      if (length > ((~0UL)/sizeof(*colors)))
+        ThrowReaderException(CorruptImageError,"ImproperImageHeader");
+      colors=(XColor *) AcquireMagickMemory(length*sizeof(*colors));
       if (colors == (XColor *) NULL)
         ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
       for (i=0; i < (long) header.ncolors; i++)


Index: ImageMagick.spec
===================================================================
RCS file: /cvs/dist/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- ImageMagick.spec	30 Mar 2007 04:41:40 -0000	1.69
+++ ImageMagick.spec	5 Apr 2007 12:18:29 -0000	1.70
@@ -9,7 +9,7 @@
 %else
 Version: %{VER}
 %endif
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: freeware
 Group: Applications/Multimedia
 %if "%{Patchlevel}" != ""
@@ -22,6 +22,9 @@
 Patch2: ImageMagick-6.2.8-multilib.patch
 Patch3: ImageMagick-6.3.2-perl-parallel-build.patch
 Patch4: ImageMagick-6.3.2-perl-liblink.patch
+# 235075
+Patch5: ImageMagick-6.2.8-CVE-2007-1797.patch
+
 
 Url: http://www.imagemagick.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -122,7 +125,7 @@
 %patch2 -p1 -b .multilib
 %patch3 -p1 -b .perl-build
 %patch4 -p1 -b .perl-link
-
+%patch5 -p1 -b .cve-2007-1797
 
 %build
 %configure --enable-shared \
@@ -258,6 +261,9 @@
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Thu Apr  5 2007 Norm Murray <nmurray at redhat.com> 6.3.2.9-3.fc7
+- heap overflows (#235075, CVE-2007-1797)
+
 * Fri Mar 30 2007 Norm Murray <nmurray at redhat.com> 6.3.2.9-2.fc7
 - perlmagick build fix (#231259)
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 13:14:29 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 09:14:29 -0400
Subject: rpms/kdelibs/devel kdelibs-3.5.6-kde#126812.patch, NONE,
	1.1 kdelibs.spec, 1.204, 1.205
Message-ID: <200704051314.l35DETro014527@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.6-kde#126812.patch 
Log Message:
- apply upstream patch to to fix crash on particular 404 url
  in embedded HTML viewer


kdelibs-3.5.6-kde#126812.patch:
 0 files changed

--- NEW FILE kdelibs-3.5.6-kde#126812.patch ---


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- kdelibs.spec	26 Mar 2007 15:43:11 -0000	1.204
+++ kdelibs.spec	5 Apr 2007 13:14:27 -0000	1.205
@@ -50,6 +50,7 @@
 
 # upstream patches
 Patch500: kdelibs-3.5.6-qt3.3.8.patch
+Patch501: kdelibs-3.5.6-kde#126812.patch
 
 # security issue
 # CVE-2007-0537
@@ -174,6 +175,7 @@
 
 # upstream patches
 %patch500 -p0 -b .qt3.3.8
+%patch501 -p0 -b .kde#126812
 
 # security
 %patch1000 -p0 -b .bz#225420-CVE-2007-0537
@@ -389,6 +391,8 @@
 %changelog
 * Mon Mar 26 2007 Than Ngo <than at redhat.com> - 6:3.5.5-3.fc7
 - apply upstream patch to fix build issue with qt-3.3.8
+- apply upstream patch to to fix crash on particular 404 url
+  in embedded HTML viewer
 
 * Tue Feb 27 2007 Than Ngo <than at redhat.com> - 6:3.5.5-2.fc7
 - cleanup specfile



From fedora-cvs-commits at redhat.com  Thu Apr  5 13:25:51 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 09:25:51 -0400
Subject: rpms/php/FC-6 php-5.1.6-CVE-2007-0455.patch, NONE,
	1.1 php-5.1.6-CVE-2007-1001.patch, NONE,
	1.1 php-5.1.6-CVE-2007-1285.patch, NONE,
	1.1 php-5.1.6-CVE-2007-1583.patch, NONE,
	1.1 php-5.1.6-CVE-2007-1718.patch, NONE, 1.1 php.spec, 1.123, 1.124
Message-ID: <200704051325.l35DPpIH021921@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	php.spec 
Added Files:
	php-5.1.6-CVE-2007-0455.patch php-5.1.6-CVE-2007-1001.patch 
	php-5.1.6-CVE-2007-1285.patch php-5.1.6-CVE-2007-1583.patch 
	php-5.1.6-CVE-2007-1718.patch 
Log Message:
* Thu Apr  5 2007 Joe Orton <jorton at redhat.com> 5.1.6-3.5.fc6
- add security fixes for CVE-2007-0455, CVE-2007-1001, 
  CVE-2007-1285, CVE-2007-1583, CVE-2007-1718 (#235354)
- package /usr/share/php (#225434)


php-5.1.6-CVE-2007-0455.patch:
 gdft.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE php-5.1.6-CVE-2007-0455.patch ---

https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=235028

--- php-5.1.6/ext/gd/libgd/gdft.c.cve0455
+++ php-5.1.6/ext/gd/libgd/gdft.c
@@ -967,7 +967,7 @@
 					} else {
 						ch = c & 0xFF;	/* don't extend sign */
 					}
-					next++;
+					if (*next) next++;
 				}
 				break;
 			case gdFTEX_Big5: {

php-5.1.6-CVE-2007-1001.patch:
 wbmp.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+)

--- NEW FILE php-5.1.6-CVE-2007-1001.patch ---
--- php-5.1.6/ext/gd/libgd/wbmp.c.cve1001
+++ php-5.1.6/ext/gd/libgd/wbmp.c
@@ -102,6 +102,8 @@
   return (0);
 }
 
+#define SAFE_MULTIPLE(x,y) (x == 0 || y == 0 || (x > 0 && y > 0 && (x < INT_MAX / y)))
+
 /* create wbmp
    ** -----------
    ** create an empty wbmp
@@ -116,6 +118,12 @@
   if ((wbmp = (Wbmp *) gdMalloc (sizeof (Wbmp))) == NULL)
     return (NULL);
 
+  if (!SAFE_MULTIPLE(width, height)) {
+      php_gd_error("createwbmp: Integer overflow from WBMP image height/width (%d x %d)\n", width, height);
+      gdFree(wbmp);
+      return NULL;
+  }
+
   if ((wbmp->bitmap = (int *) safe_emalloc(sizeof(int), width * height, 0)) == NULL)
     {
       gdFree (wbmp);
@@ -176,6 +184,13 @@
   printf ("W: %d, H: %d\n", wbmp->width, wbmp->height);
 #endif
 
+  if (!SAFE_MULTIPLE(wbmp->width, wbmp->height)) {
+      php_gd_error("readwbmp: Integer overflow from WBMP image height/width (%d x %d)\n", 
+                   wbmp->width, wbmp->height);
+      gdFree(wbmp);
+      return (-1);
+  }
+
   if ((wbmp->bitmap = (int *) safe_emalloc(wbmp->width * wbmp->height, sizeof(int), 0)) == NULL)
     {
       gdFree (wbmp);

php-5.1.6-CVE-2007-1285.patch:
 main.c          |    1 +
 php_globals.h   |    2 ++
 php_variables.c |    6 ++++++
 3 files changed, 9 insertions(+)

--- NEW FILE php-5.1.6-CVE-2007-1285.patch ---
--- php-5.1.6/main/php_variables.c.cve1285
+++ php-5.1.6/main/php_variables.c
@@ -119,10 +119,16 @@
 	index_len = var_len;
 
 	if (is_array) {
+		int nest_level = 0;
 		while (1) {
 			char *index_s;
 			int new_idx_len = 0;
 
+			if (++nest_level > PG(max_input_nesting_level)) {
+				/* too many levels of nesting */
+				php_error_docref(NULL TSRMLS_CC, E_ERROR, "Input variable nesting level more than allowed %ld (change max_input_nesting_level in php.ini to increase the limit)", PG(max_input_nesting_level));
+			}
+
 			ip++;
 			index_s = ip;
 			if (isspace(*ip)) {
--- php-5.1.6/main/php_globals.h.cve1285
+++ php-5.1.6/main/php_globals.h
@@ -150,6 +150,8 @@
 
 	char *disable_functions;
 	char *disable_classes;
+
+	long max_input_nesting_level;
 };
 
 
--- php-5.1.6/main/main.c.cve1285
+++ php-5.1.6/main/main.c
@@ -300,6 +300,7 @@
 	STD_PHP_INI_ENTRY("upload_max_filesize",	"2M",		PHP_INI_SYSTEM|PHP_INI_PERDIR,		OnUpdateLong,			upload_max_filesize,	php_core_globals,	core_globals)
 	STD_PHP_INI_ENTRY("post_max_size",			"8M",		PHP_INI_SYSTEM|PHP_INI_PERDIR,		OnUpdateLong,			post_max_size,			sapi_globals_struct,sapi_globals)
 	STD_PHP_INI_ENTRY("upload_tmp_dir",			NULL,		PHP_INI_SYSTEM,		OnUpdateStringUnempty,	upload_tmp_dir,			php_core_globals,	core_globals)
+	STD_PHP_INI_ENTRY("max_input_nesting_level", "64",		PHP_INI_SYSTEM|PHP_INI_PERDIR,		OnUpdateLong,	max_input_nesting_level,			php_core_globals,	core_globals)
 
 	STD_PHP_INI_ENTRY("user_dir",				NULL,		PHP_INI_SYSTEM,		OnUpdateString,			user_dir,				php_core_globals,	core_globals)
 	STD_PHP_INI_ENTRY("variables_order",		"EGPCS",	PHP_INI_SYSTEM|PHP_INI_PERDIR,		OnUpdateStringUnempty,	variables_order,		php_core_globals,	core_globals)

php-5.1.6-CVE-2007-1583.patch:
 mb_gpc.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE php-5.1.6-CVE-2007-1583.patch ---
--- php-5.1.6/ext/mbstring/mb_gpc.c.cve1286
+++ php-5.1.6/ext/mbstring/mb_gpc.c
@@ -206,9 +206,8 @@
 	/* register_globals stuff
 	 * XXX: this feature is going to be deprecated? */
 
-	if (info->force_register_globals) {
-		prev_rg_state = PG(register_globals);
-		PG(register_globals) = 1;
+	if (info->force_register_globals && !(prev_rg_state = PG(register_globals))) {
+		zend_alter_ini_entry("register_globals", sizeof("register_globals"), "1", sizeof("1")-1, PHP_INI_PERDIR, PHP_INI_STAGE_RUNTIME);
 	}
 
 	if (!res || *res == '\0') {
@@ -341,8 +340,8 @@
 
 out:
 	/* register_global stuff */
-	if (info->force_register_globals) {
-		PG(register_globals) = prev_rg_state;
+	if (info->force_register_globals && !prev_rg_state) {
+		zend_alter_ini_entry("register_globals", sizeof("register_globals"), "0", sizeof("0")-1, PHP_INI_PERDIR, PHP_INI_STAGE_RUNTIME);
 	}
 
 	if (convd != NULL) {

php-5.1.6-CVE-2007-1718.patch:
 mail.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE php-5.1.6-CVE-2007-1718.patch ---
--- php-5.1.6/ext/standard/mail.c.cve1718
+++ php-5.1.6/ext/standard/mail.c
@@ -48,8 +48,8 @@
 
 #define SKIP_LONG_HEADER_SEP(str, pos)										\
 	if (str[pos] == '\r' && str[pos + 1] == '\n' && (str[pos + 2] == ' ' || str[pos + 2] == '\t')) {	\
-		pos += 3;											\
-		while (str[pos] == ' ' || str[pos] == '\t') {							\
+		pos += 2;											\
+		while (str[pos + 1] == ' ' || str[pos + 1] == '\t') {							\
 			pos++;											\
 		}												\
 		continue;											\


Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/FC-6/php.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- php.spec	16 Feb 2007 16:10:59 -0000	1.123
+++ php.spec	5 Apr 2007 13:25:48 -0000	1.124
@@ -6,7 +6,7 @@
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
 Version: 5.1.6
-Release: 3.4%{?dist}
+Release: 3.5%{?dist}
 License: The PHP License v3.01
 Group: Development/Languages
 URL: http://www.php.net/
@@ -47,6 +47,11 @@
 Patch76: php-4.3.9-CVE-2007-0909-printf.patch
 Patch77: php-5.1.6-CVE-2007-0910.patch
 Patch78: php-4.3.9-CVE-2007-0988.patch
+Patch79: php-5.1.6-CVE-2007-1285.patch
+Patch80: php-5.1.6-CVE-2007-1583.patch
+Patch81: php-5.1.6-CVE-2007-0455.patch
+Patch82: php-5.1.6-CVE-2007-1001.patch
+Patch83: php-5.1.6-CVE-2007-1718.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -331,6 +336,11 @@
 %patch76 -p1 -b .cve0909-printf
 %patch77 -p1 -b .cve0910
 %patch78 -p1 -b .cve0988
+%patch79 -p1 -b .cve1285
+%patch80 -p1 -b .cve1583
+%patch81 -p1 -b .cve0455
+%patch82 -p1 -b .cve1001
+%patch83 -p1 -b .cve1718
 
 # Prevent %%doc confusion over LICENSE files
 cp Zend/LICENSE Zend/ZEND_LICENSE
@@ -619,6 +629,7 @@
 %dir %{_libdir}/php/modules
 %dir %{_localstatedir}/lib/php
 %dir %{_libdir}/php/pear
+%dir %{_datadir}/php
 
 %files cli
 %defattr(-,root,root)
@@ -653,6 +664,11 @@
 %files pdo -f files.pdo
 
 %changelog
+* Thu Apr  5 2007 Joe Orton <jorton at redhat.com> 5.1.6-3.5.fc6
+- add security fixes for CVE-2007-0455, CVE-2007-1001, 
+  CVE-2007-1285, CVE-2007-1583, CVE-2007-1718 (#235354)
+- package /usr/share/php (#225434)
+
 * Fri Feb 16 2007 Joe Orton <jorton at redhat.com> 5.1.6-3.4.fc6
 - add security fixes for: CVE-2007-0906, CVE-2007-0907, 
   CVE-2007-0908, CVE-2007-0909, CVE-2007-0910, CVE-2007-0988 (#228011)



From fedora-cvs-commits at redhat.com  Thu Apr  5 13:30:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 09:30:47 -0400
Subject: rpms/php/FC-6 php.spec,1.124,1.125
Message-ID: <200704051330.l35DUlKE025496@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	php.spec 
Log Message:
- fix bug reference



Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/FC-6/php.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- php.spec	5 Apr 2007 13:25:48 -0000	1.124
+++ php.spec	5 Apr 2007 13:30:42 -0000	1.125
@@ -666,7 +666,7 @@
 %changelog
 * Thu Apr  5 2007 Joe Orton <jorton at redhat.com> 5.1.6-3.5.fc6
 - add security fixes for CVE-2007-0455, CVE-2007-1001, 
-  CVE-2007-1285, CVE-2007-1583, CVE-2007-1718 (#235354)
+  CVE-2007-1285, CVE-2007-1583, CVE-2007-1718 (#235364)
 - package /usr/share/php (#225434)
 
 * Fri Feb 16 2007 Joe Orton <jorton at redhat.com> 5.1.6-3.4.fc6



From fedora-cvs-commits at redhat.com  Thu Apr  5 13:38:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 09:38:21 -0400
Subject: rpms/php/FC-5 php-5.1.6-CVE-2007-0455.patch, NONE,
	1.1 php-5.1.6-CVE-2007-1001.patch, NONE,
	1.1 php-5.1.6-CVE-2007-1285.patch, NONE,
	1.1 php-5.1.6-CVE-2007-1583.patch, NONE,
	1.1 php-5.1.6-CVE-2007-1718.patch, NONE, 1.1 .cvsignore, 1.27,
	1.28 php.spec, 1.117, 1.118
Message-ID: <200704051338.l35DcLb2025065@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	.cvsignore php.spec 
Added Files:
	php-5.1.6-CVE-2007-0455.patch php-5.1.6-CVE-2007-1001.patch 
	php-5.1.6-CVE-2007-1285.patch php-5.1.6-CVE-2007-1583.patch 
	php-5.1.6-CVE-2007-1718.patch 
Log Message:
* Thu Apr  5 2007 Joe Orton <jorton at redhat.com> 5.1.6-1.5
- add security fixes for CVE-2007-0455, CVE-2007-1001, 
  CVE-2007-1285, CVE-2007-1583, CVE-2007-1718 (#235364)


php-5.1.6-CVE-2007-0455.patch:
 gdft.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE php-5.1.6-CVE-2007-0455.patch ---

https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=235028

--- php-5.1.6/ext/gd/libgd/gdft.c.cve0455
+++ php-5.1.6/ext/gd/libgd/gdft.c
@@ -967,7 +967,7 @@
 					} else {
 						ch = c & 0xFF;	/* don't extend sign */
 					}
-					next++;
+					if (*next) next++;
 				}
 				break;
 			case gdFTEX_Big5: {

php-5.1.6-CVE-2007-1001.patch:
 wbmp.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+)

--- NEW FILE php-5.1.6-CVE-2007-1001.patch ---
--- php-5.1.6/ext/gd/libgd/wbmp.c.cve1001
+++ php-5.1.6/ext/gd/libgd/wbmp.c
@@ -102,6 +102,8 @@
   return (0);
 }
 
+#define SAFE_MULTIPLE(x,y) (x == 0 || y == 0 || (x > 0 && y > 0 && (x < INT_MAX / y)))
+
 /* create wbmp
    ** -----------
    ** create an empty wbmp
@@ -116,6 +118,12 @@
   if ((wbmp = (Wbmp *) gdMalloc (sizeof (Wbmp))) == NULL)
     return (NULL);
 
+  if (!SAFE_MULTIPLE(width, height)) {
+      php_gd_error("createwbmp: Integer overflow from WBMP image height/width (%d x %d)\n", width, height);
+      gdFree(wbmp);
+      return NULL;
+  }
+
   if ((wbmp->bitmap = (int *) safe_emalloc(sizeof(int), width * height, 0)) == NULL)
     {
       gdFree (wbmp);
@@ -176,6 +184,13 @@
   printf ("W: %d, H: %d\n", wbmp->width, wbmp->height);
 #endif
 
+  if (!SAFE_MULTIPLE(wbmp->width, wbmp->height)) {
+      php_gd_error("readwbmp: Integer overflow from WBMP image height/width (%d x %d)\n", 
+                   wbmp->width, wbmp->height);
+      gdFree(wbmp);
+      return (-1);
+  }
+
   if ((wbmp->bitmap = (int *) safe_emalloc(wbmp->width * wbmp->height, sizeof(int), 0)) == NULL)
     {
       gdFree (wbmp);

php-5.1.6-CVE-2007-1285.patch:
 main.c          |    1 +
 php_globals.h   |    2 ++
 php_variables.c |    6 ++++++
 3 files changed, 9 insertions(+)

--- NEW FILE php-5.1.6-CVE-2007-1285.patch ---
--- php-5.1.6/main/php_variables.c.cve1285
+++ php-5.1.6/main/php_variables.c
@@ -119,10 +119,16 @@
 	index_len = var_len;
 
 	if (is_array) {
+		int nest_level = 0;
 		while (1) {
 			char *index_s;
 			int new_idx_len = 0;
 
+			if (++nest_level > PG(max_input_nesting_level)) {
+				/* too many levels of nesting */
+				php_error_docref(NULL TSRMLS_CC, E_ERROR, "Input variable nesting level more than allowed %ld (change max_input_nesting_level in php.ini to increase the limit)", PG(max_input_nesting_level));
+			}
+
 			ip++;
 			index_s = ip;
 			if (isspace(*ip)) {
--- php-5.1.6/main/php_globals.h.cve1285
+++ php-5.1.6/main/php_globals.h
@@ -150,6 +150,8 @@
 
 	char *disable_functions;
 	char *disable_classes;
+
+	long max_input_nesting_level;
 };
 
 
--- php-5.1.6/main/main.c.cve1285
+++ php-5.1.6/main/main.c
@@ -300,6 +300,7 @@
 	STD_PHP_INI_ENTRY("upload_max_filesize",	"2M",		PHP_INI_SYSTEM|PHP_INI_PERDIR,		OnUpdateLong,			upload_max_filesize,	php_core_globals,	core_globals)
 	STD_PHP_INI_ENTRY("post_max_size",			"8M",		PHP_INI_SYSTEM|PHP_INI_PERDIR,		OnUpdateLong,			post_max_size,			sapi_globals_struct,sapi_globals)
 	STD_PHP_INI_ENTRY("upload_tmp_dir",			NULL,		PHP_INI_SYSTEM,		OnUpdateStringUnempty,	upload_tmp_dir,			php_core_globals,	core_globals)
+	STD_PHP_INI_ENTRY("max_input_nesting_level", "64",		PHP_INI_SYSTEM|PHP_INI_PERDIR,		OnUpdateLong,	max_input_nesting_level,			php_core_globals,	core_globals)
 
 	STD_PHP_INI_ENTRY("user_dir",				NULL,		PHP_INI_SYSTEM,		OnUpdateString,			user_dir,				php_core_globals,	core_globals)
 	STD_PHP_INI_ENTRY("variables_order",		"EGPCS",	PHP_INI_SYSTEM|PHP_INI_PERDIR,		OnUpdateStringUnempty,	variables_order,		php_core_globals,	core_globals)

php-5.1.6-CVE-2007-1583.patch:
 mb_gpc.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE php-5.1.6-CVE-2007-1583.patch ---
--- php-5.1.6/ext/mbstring/mb_gpc.c.cve1286
+++ php-5.1.6/ext/mbstring/mb_gpc.c
@@ -206,9 +206,8 @@
 	/* register_globals stuff
 	 * XXX: this feature is going to be deprecated? */
 
-	if (info->force_register_globals) {
-		prev_rg_state = PG(register_globals);
-		PG(register_globals) = 1;
+	if (info->force_register_globals && !(prev_rg_state = PG(register_globals))) {
+		zend_alter_ini_entry("register_globals", sizeof("register_globals"), "1", sizeof("1")-1, PHP_INI_PERDIR, PHP_INI_STAGE_RUNTIME);
 	}
 
 	if (!res || *res == '\0') {
@@ -341,8 +340,8 @@
 
 out:
 	/* register_global stuff */
-	if (info->force_register_globals) {
-		PG(register_globals) = prev_rg_state;
+	if (info->force_register_globals && !prev_rg_state) {
+		zend_alter_ini_entry("register_globals", sizeof("register_globals"), "0", sizeof("0")-1, PHP_INI_PERDIR, PHP_INI_STAGE_RUNTIME);
 	}
 
 	if (convd != NULL) {

php-5.1.6-CVE-2007-1718.patch:
 mail.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE php-5.1.6-CVE-2007-1718.patch ---
--- php-5.1.6/ext/standard/mail.c.cve1718
+++ php-5.1.6/ext/standard/mail.c
@@ -48,8 +48,8 @@
 
 #define SKIP_LONG_HEADER_SEP(str, pos)										\
 	if (str[pos] == '\r' && str[pos + 1] == '\n' && (str[pos + 2] == ' ' || str[pos + 2] == '\t')) {	\
-		pos += 3;											\
-		while (str[pos] == ' ' || str[pos] == '\t') {							\
+		pos += 2;											\
+		while (str[pos + 1] == ' ' || str[pos + 1] == '\t') {							\
 			pos++;											\
 		}												\
 		continue;											\


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/php/FC-5/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	16 Oct 2006 13:49:25 -0000	1.27
+++ .cvsignore	5 Apr 2007 13:38:19 -0000	1.28
@@ -10,3 +10,4 @@
 php-5.1.3
 php-5.1.3.tar.gz
 clog
+php-5.1.6


Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/FC-5/php.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- php.spec	23 Feb 2007 14:54:28 -0000	1.117
+++ php.spec	5 Apr 2007 13:38:19 -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.4
+Release: 1.5
 License: The PHP License v3.01
 Group: Development/Languages
 URL: http://www.php.net/
@@ -44,6 +44,11 @@
 Patch76: php-4.3.9-CVE-2007-0909-printf.patch
 Patch77: php-5.1.6-CVE-2007-0910.patch
 Patch78: php-4.3.9-CVE-2007-0988.patch
+Patch79: php-5.1.6-CVE-2007-1285.patch
+Patch80: php-5.1.6-CVE-2007-1583.patch
+Patch81: php-5.1.6-CVE-2007-0455.patch
+Patch82: php-5.1.6-CVE-2007-1001.patch
+Patch83: php-5.1.6-CVE-2007-1718.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -303,6 +308,11 @@
 %patch76 -p1 -b .cve0909-printf
 %patch77 -p1 -b .cve0910
 %patch78 -p1 -b .cve0988
+%patch79 -p1 -b .cve1285
+%patch80 -p1 -b .cve1583
+%patch81 -p1 -b .cve0455
+%patch82 -p1 -b .cve1001
+%patch83 -p1 -b .cve1718
 
 # Prevent %%doc confusion over LICENSE files
 cp Zend/LICENSE Zend/ZEND_LICENSE
@@ -601,6 +611,10 @@
 %files pdo -f files.pdo
 
 %changelog
+* Thu Apr  5 2007 Joe Orton <jorton at redhat.com> 5.1.6-1.5
+- add security fixes for CVE-2007-0455, CVE-2007-1001, 
+  CVE-2007-1285, CVE-2007-1583, CVE-2007-1718 (#235364)
+
 * Fri Feb 23 2007 Joe Orton <jorton at redhat.com> 5.1.6-1.4
 - fix pdo-abi provide
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 13:40:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 09:40:45 -0400
Subject: rpms/psacct/devel psacct.spec,1.26,1.27
Message-ID: <200704051340.l35DejHq025180@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/psacct/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25166

Modified Files:
	psacct.spec 
Log Message:
- small spec changes
- change buildroot
- remove makeinstall macro



Index: psacct.spec
===================================================================
RCS file: /cvs/dist/rpms/psacct/devel/psacct.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- psacct.spec	23 Jan 2007 09:21:45 -0000	1.26
+++ psacct.spec	5 Apr 2007 13:40:43 -0000	1.27
@@ -12,7 +12,7 @@
 Summary: Utilities for monitoring process activities
 Name: psacct
 Version: 6.3.2
-Release: 43%{?dist}
+Release: 44%{?dist}
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.gnu.org/pub/gnu/acct-6.3.2.tar.gz
@@ -30,8 +30,8 @@
 Patch7: psacct-6.3.2-LargeFile.patch
 Patch8: psacct-6.3.2-lastcomm_man.patch
 
-Buildroot: %{_tmppath}/%{name}-%{version}-root
-Prereq: /sbin/chkconfig /sbin/install-info
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: /sbin/chkconfig /sbin/install-info
 BuildRequires: autoconf
 Requires: coreutils
 
@@ -77,7 +77,9 @@
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT{/sbin,%{_bindir},%{_mandir},%{_sbindir}}
-%{makeinstall}
+make install prefix=$RPM_BUILD_ROOT%{_prefix} \
+	bindir=$RPM_BUILD_ROOT%{_bindir} sbindir=$RPM_BUILD_ROOT%{_sbindir} \
+	infodir=$RPM_BUILD_ROOT%{_datadir}/info mandir=$RPM_BUILD_ROOT%{_mandir}
 
 # move accton to /sbin -- leave historical symlink
 mv $RPM_BUILD_ROOT%{_sbindir}/accton $RPM_BUILD_ROOT/sbin/accton
@@ -140,7 +142,7 @@
 fi
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %if %{FHS_compliant}
 %dir /var/account
 %endif
@@ -167,6 +169,11 @@
 %{_infodir}/accounting.info.gz
 
 %changelog
+* Thu Apr  5 2007 Ivana Varekova <varekova at redhat.com> - 6.3.2-44
+- small spec changes
+- change buildroot
+- remove makeinstall macro
+
 * Tue Jan 23 2007 Ivana Varekova <varekova at redhat.com> - 6.3.2-43
 - Resolves: 223728
   psacct logrotate file looks for non existant directory



From fedora-cvs-commits at redhat.com  Thu Apr  5 14:15:55 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 10:15:55 -0400
Subject: rpms/kdepim/devel .cvsignore, 1.33, 1.34 kdepim.spec, 1.121,
	1.122 sources, 1.38, 1.39
Message-ID: <200704051415.l35EFtjP026002@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdepim.spec sources 
Log Message:
update timezone



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	10 Aug 2006 15:20:37 -0000	1.33
+++ .cvsignore	5 Apr 2007 14:15:53 -0000	1.34
@@ -12,3 +12,4 @@
 kdepim-3.5.2.tar.bz2
 kdepim-3.5.3.tar.bz2
 kdepim-3.5.4.tar.bz2
+timezone-update.diff.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- kdepim.spec	26 Mar 2007 15:37:36 -0000	1.121
+++ kdepim.spec	5 Apr 2007 14:15:53 -0000	1.122
@@ -32,6 +32,7 @@
 Patch1002: kdepim-3.5.6-kmail-templates.patch
 Patch1003: kdepim-3.5.6-security.patch
 Patch1004: kdepim-3.5.6-kmail-imap.patch
+Patch1005: timezone-update.diff.bz2
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post): /sbin/ldconfig
@@ -91,6 +92,7 @@
 %patch1002 -p1 -b .kmail-templates
 %patch1003 -p0 -b .security
 %patch1004 -p0 -b .imap
+%patch1005 -p0 -b .timezone
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	6 Feb 2007 17:12:22 -0000	1.38
+++ sources	5 Apr 2007 14:15:53 -0000	1.39
@@ -1 +1,2 @@
 e37e6173fe9fd7f242c9502a4ae1d7de  kdepim-3.5.6.tar.bz2
+263a717b397df1acd01a8b2c08546bcd  timezone-update.diff.bz2



From fedora-cvs-commits at redhat.com  Thu Apr  5 14:15:59 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 10:15:59 -0400
Subject: rpms/libtool/devel libtool.spec,1.50,1.51
Message-ID: <200704051415.l35EFxf1026025@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	libtool.spec 
Log Message:
- use ./configure so that config.{sub,guess} will not be replaced with ancient
  version of those files (#234778)



Index: libtool.spec
===================================================================
RCS file: /cvs/dist/rpms/libtool/devel/libtool.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- libtool.spec	14 Mar 2007 14:09:59 -0000	1.50
+++ libtool.spec	5 Apr 2007 14:15:57 -0000	1.51
@@ -3,7 +3,7 @@
 Summary: The GNU Portable Library Tool
 Name:    libtool
 Version: %{upstream_version}
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL
 Group:   Development/Tools
 Source:  http://ftp.gnu.org/gnu/libtool/libtool-%{upstream_version}.tar.gz
@@ -102,7 +102,8 @@
 export CXX=g++
 export F77=gfortran
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
-%configure
+# dumb redhat-rpm-config replaces config.{sub,guess} with ancient ones in %%configure, use ./configure instead:
+./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} --mandir=%{_mandir} --infodir=%{_infodir}
 # build not smp safe:
 make #%{?_smp_mflags}
 
@@ -163,6 +164,10 @@
 
 
 %changelog
+* Thu Apr 05 2007 Karsten Hopp <karsten at redhat.com> 1.5.22-11
+- use ./configure so that config.{sub,guess} will not be replaced with ancient
+  version of those files (#234778)
+
 * Wed Mar 14 2007 Karsten Hopp <karsten at redhat.com> 1.5.22-10
 - add disttag (#232204)
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 14:26:27 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 10:26:27 -0400
Subject: rpms/samba/devel samba.spec,1.103,1.104 smb.conf.default,1.7,1.8
Message-ID: <200704051426.l35EQReG026600@cvs.devel.redhat.com>

Author: ssorce

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26585

Modified Files:
	samba.spec smb.conf.default 
Log Message:

More work to get SELinux and Samba work well together.
SELinux policies have been updated to make samba work ok as a Domain
Controller, meanwhile we established a directories where scripts can be
installed and run unconfined from smbd.

The default smb.conf now contains some more information on how to modify
some relevant selinux options to make samba work.




Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- samba.spec	3 Apr 2007 14:18:24 -0000	1.103
+++ samba.spec	5 Apr 2007 14:26:25 -0000	1.104
@@ -584,6 +584,7 @@
 %attr(700,root,root) %dir /var/lib/samba/private
 %dir /var/run/winbindd
 %attr(750,root,wbpriv) %dir /var/lib/samba/winbindd_privileged
+%dir /var/lib/samba/scripts
 %config(noreplace) %{_sysconfdir}/samba/smb.conf
 %config(noreplace) %{_sysconfdir}/samba/lmhosts
 %config(noreplace) %{_sysconfdir}/sysconfig/samba
@@ -631,6 +632,11 @@
 #%{_includedir}/libmsrpc.h
 
 %changelog
+* Wed Apr 4 2007 Simo Sorce <ssorce at redhat.com>
+- fixes in smb.conf
+- advice in smb.conf to put scripts in /var/lib/samba/scripts
+- create /var/lib/samba/scripts so that selinux can be happy
+
 * Tue Apr 03 2007 Guenther Deschner <gdeschner at redhat.com> 3.0.24-11.fc7
 - enable PAM and NSS dlopen checks during build
 - fix unresolved symbols in libnss_wins.so (bug #198230)


Index: smb.conf.default
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/smb.conf.default,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- smb.conf.default	30 Mar 2007 13:02:19 -0000	1.7
+++ smb.conf.default	5 Apr 2007 14:26:25 -0000	1.8
@@ -19,6 +19,39 @@
 # NOTE: Whenever you modify this file you should run the command "testparm"
 # to check that you have not made any basic syntactic errors. 
 #
+#---------------
+# SELINUX NOTES:
+#
+# If you want to use the useradd/groupadd family of binaries please run:
+# setsebool -P samba_domain_controller on
+#
+# If you want to share home directories via samba please run:
+# setsebool -P samba_enable_home_dirs on
+#
+# If you create a new directory you want to share you should mark it as
+# "samba-share_t" so that selinux will let you write into it.
+# Make sure not to do that on system directories as they may already have
+# been marked with othe SELinux labels.
+#
+# Use ls -ldZ /path to see which context a directory has
+#
+# Set labels only on directories you created!
+# To set a label use the following: chcon -t samba_share_t /path
+#
+# If you need to share a system created directory you can use one of the
+# following (read-only/read-write):
+# setsebool -P samba_export_all_ro on
+# or
+# setsebool -P samba_export_all_rw on
+#
+# If you want to run scripts (preexec/root prexec/print command/...) please
+# put them into the /var/lib/samba/scripts directory so that smbd will be
+# allowed to run them.
+# Make sure you COPY them and not MOVE them so that the right SELinux context
+# is applied, to check all is ok use restorecon -R -v /var/lib/samba/scripts
+#
+#--------------
+#
 #======================= Global Settings =====================================
 	
 [global]
@@ -132,9 +165,9 @@
 	
 ;	add user script = /usr/sbin/useradd "%u" -n -g users
 ;	add group script = /usr/sbin/groupadd "%g"
-;	add machine script = /usr/sbin/adduser -n -c "Workstation (%u)" -M -d /nohome -s /bin/false "%u"
+;	add machine script = /usr/sbin/useradd -n -c "Workstation (%u)" -M -d /nohome -s /bin/false "%u"
 ;	delete user script = /usr/sbin/userdel "%u"
-;	delete user from group script = /usr/sbin/deluser "%u" "%g"
+;	delete user from group script = /usr/sbin/userdel "%u" "%g"
 ;	delete group script = /usr/sbin/groupdel "%g"
 	
 	



From fedora-cvs-commits at redhat.com  Thu Apr  5 14:32:22 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 10:32:22 -0400
Subject: rpms/openoffice.org/FC-6 openoffice.org.spec, 1.935,
	1.936 pseudoworkspace.valgrind1.patch, 1.7, 1.8
Message-ID: <200704051432.l35EWMoI008621@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec pseudoworkspace.valgrind1.patch 
Log Message:
extra valgrind fixes


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v
retrieving revision 1.935
retrieving revision 1.936
diff -u -r1.935 -r1.936
--- openoffice.org.spec	29 Mar 2007 12:36:40 -0000	1.935
+++ openoffice.org.spec	5 Apr 2007 14:32:19 -0000	1.936
@@ -1,6 +1,6 @@
 %define oootag OOD680
 %define ooomilestone 5
-%define rh_rpm_release 5.18
+%define rh_rpm_release 5.19.unreleased
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -2583,6 +2583,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu Apr 05 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.19
+- add some valgrind fixes
+
 * Thu Mar 29 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.18
 - Resolves: rhbz#234421 Wrong current sheet no for calc
 

pseudoworkspace.valgrind1.patch:
 configmgr/source/tree/cmtree.cxx                                   |    4 
 connectivity/source/drivers/evoab2/NResultSet.cxx                  |    6 -
 framework/source/uiconfiguration/moduleimagemanager.cxx            |    9 ++
 inc/SwBitArray.hxx                                                 |    0 
 inc/SwRewriter.hxx                                                 |    0 
 inc/msdffdef.hxx                                                   |    0 
 inc/osl/file.hxx                                                   |    0 
 inc/viewfrm.hxx                                                    |    0 
 lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx |    1 
 osl/unx/process.c                                                  |    0 
 psprint/source/helper/ppdparser.cxx                                |    2 
 sal/inc/osl/file.hxx                                               |    5 +
 sal/osl/unx/process.c                                              |    6 -
 sfx2/inc/viewfrm.hxx                                               |    8 +
 sfx2/source/explorer/nochaos.cxx                                   |    4 
 shell/source/backends/gconfbe/gconflayer.cxx                       |   23 +++--
 slideshow/source/engine/smilfunctionparser.cxx                     |    2 
 source/backends/gconfbe/gconflayer.cxx                             |    0 
 source/core/bastyp/SwBitArray.cxx                                  |    0 
 source/core/txtnode/thints.cxx                                     |    0 
 source/customshapes/EnhancedCustomShapeFunctionParser.cxx          |    0 
 source/cxxhelp/provider/databases.cxx                              |    0 
 source/cxxhelp/provider/db.cxx                                     |    0 
 source/cxxhelp/provider/db.hxx                                     |    0 
 source/engine/smilfunctionparser.cxx                               |    0 
 source/explorer/nochaos.cxx                                        |    0 
 source/glyphs/gcach_ftyp.cxx                                       |    0 
 source/helper/ppdparser.cxx                                        |    0 
 source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx                |    0 
 source/misc/transfer.cxx                                           |    0 
 source/msfilter/msdffimp.cxx                                       |    0 
 source/tree/cmtree.cxx                                             |    0 
 svtools/source/misc/transfer.cxx                                   |    1 
 svx/inc/msdffdef.hxx                                               |    1 
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx      |    2 
 svx/source/msfilter/msdffimp.cxx                                   |    4 
 sw/inc/SwBitArray.hxx                                              |    4 
 sw/inc/SwRewriter.hxx                                              |    1 
 sw/inc/numrule.hxx                                                 |   18 ++--
 sw/source/core/bastyp/SwBitArray.cxx                               |    2 
 sw/source/core/doc/docnum.cxx                                      |    5 -
 sw/source/core/doc/number.cxx                                      |   11 ++
 sw/source/core/txtnode/thints.cxx                                  |    2 
 unx/gtk/gdi/salnativewidgets-gtk.cxx                               |    0 
 unx/source/app/saldisp.cxx                                         |    0 
 unx/source/gdi/salvd.cxx                                           |    0 
 vcl/source/glyphs/gcach_ftyp.cxx                                   |    3 
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx                           |    3 
 vcl/unx/inc/saldisp.hxx                                            |    2 
 vcl/unx/source/app/saldisp.cxx                                     |    8 +
 vcl/unx/source/gdi/salvd.cxx                                       |    5 +
 xmlhelp/source/cxxhelp/provider/databases.cxx                      |    4 
 xmlhelp/source/cxxhelp/provider/db.cxx                             |   43 ----------
 xmlhelp/source/cxxhelp/provider/db.hxx                             |   24 -----
 54 files changed, 109 insertions(+), 104 deletions(-)

Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pseudoworkspace.valgrind1.patch	15 Dec 2006 16:33:58 -0000	1.7
+++ pseudoworkspace.valgrind1.patch	5 Apr 2007 14:32:20 -0000	1.8
@@ -739,3 +739,57 @@
      {
          ByteString aLine( pRun );
          int nPos = aLine.Search( ':' );
+Index: inc/viewfrm.hxx
+===================================================================
+RCS file: /cvs/framework/sfx2/inc/viewfrm.hxx,v
+retrieving revision 1.24
+diff -u -r1.24 viewfrm.hxx
+--- openoffice.org.orig/sfx2/inc/viewfrm.hxx	12 Dec 2006 19:28:13 -0000	1.24
++++ openoffice.org/sfx2/inc/viewfrm.hxx	5 Apr 2007 10:42:26 -0000
+@@ -109,6 +109,14 @@
+ 			}
+ 	BOOL    operator != ( const SvBorder & rObj ) const
+ 			{ return !(*this == rObj); }
++	SvBorder & operator = ( const SvBorder & rBorder )
++			{
++				Left()   = rBorder.Left();
++				Top()    = rBorder.Top();
++				Right()  = rBorder.Right();
++				Bottom() = rBorder.Bottom();
++				return *this;
++			}
+ 	SvBorder & operator += ( const SvBorder & rBorder )
+ 			{
+ 				Left()   += rBorder.Left();
+Index: source/msfilter/msdffimp.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/msfilter/msdffimp.cxx,v
+retrieving revision 1.144.42.3
+diff -u -r1.144.42.3 msdffimp.cxx
+--- openoffice.org.orig/svx/source/msfilter/msdffimp.cxx	19 Jan 2007 16:46:49 -0000	1.144.42.3
++++ openoffice.org/svx/source/msfilter/msdffimp.cxx	5 Apr 2007 13:57:43 -0000
+@@ -6969,7 +6969,7 @@
+ 
+ 	// nachschauen, ob es sich auch wirklich um ein BLIP handelt
+ 	UINT32 nLength;
+-	USHORT nInst, nFbt;
++	USHORT nInst, nFbt(0);
+ 	BYTE   nVer;
+ 	if( ReadCommonRecordHeader( rBLIPStream, nVer, nInst, nFbt, nLength) && ( 0xF018 <= nFbt ) && ( 0xF117 >= nFbt ) )
+ 	{
+Index: source/core/txtnode/thints.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/core/txtnode/thints.cxx,v
+retrieving revision 1.43.36.6
+diff -u -r1.43.36.6 thints.cxx
+--- openoffice.org.orig/sw/source/core/txtnode/thints.cxx	20 Mar 2007 12:48:03 -0000	1.43.36.6
++++ openoffice.org/sw/source/core/txtnode/thints.cxx	5 Apr 2007 14:25:12 -0000
+@@ -2138,7 +2138,7 @@
+ 
+         BuildPortions( rNode, *pHint, nMode );
+ 
+-        if ( nHtStart < *pHtEnd ) // skip merging for 0-length attributes
++        if ( nHtStart < nHintEnd ) // skip merging for 0-length attributes
+             MergePortions( rNode );
+     }
+     else



From fedora-cvs-commits at redhat.com  Thu Apr  5 14:32:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 10:32:30 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1154,
	1.1155 pseudoworkspace.valgrind1.patch, 1.16, 1.17
Message-ID: <200704051432.l35EWUSK008736@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec pseudoworkspace.valgrind1.patch 
Log Message:
extra valgrind fixes


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1154
retrieving revision 1.1155
diff -u -r1.1154 -r1.1155
--- openoffice.org.spec	5 Apr 2007 10:48:25 -0000	1.1154
+++ openoffice.org.spec	5 Apr 2007 14:32:28 -0000	1.1155
@@ -2633,6 +2633,7 @@
   working notdef glyph
 - remove openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
   gcc 4.1.2-8 should allow our java components to work again.
+- add a handful of valgrind fixes
 
 * Tue Mar 27 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.3
 - Resolves: rhbz#233944 openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch

pseudoworkspace.valgrind1.patch:
 bf_sfx2/source/explorer/sfx2_nochaos.cxx           |    0 
 binfilter/bf_sfx2/source/explorer/sfx2_nochaos.cxx |    4 ++--
 inc/viewfrm.hxx                                    |    0 
 sfx2/inc/viewfrm.hxx                               |    8 ++++++++
 source/core/txtnode/swfont.cxx                     |    0 
 source/core/txtnode/thints.cxx                     |    0 
 source/dialog/numpages.cxx                         |    0 
 source/msfilter/msdffimp.cxx                       |    0 
 svx/source/dialog/numpages.cxx                     |    1 +
 svx/source/msfilter/msdffimp.cxx                   |    2 +-
 sw/source/core/txtnode/swfont.cxx                  |    2 +-
 sw/source/core/txtnode/thints.cxx                  |    2 +-
 12 files changed, 14 insertions(+), 5 deletions(-)

Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pseudoworkspace.valgrind1.patch	30 Jan 2007 15:28:02 -0000	1.16
+++ pseudoworkspace.valgrind1.patch	5 Apr 2007 14:32:28 -0000	1.17
@@ -47,3 +47,57 @@
      SwUnderlineFont* pUnderFnt = 0;
  
      if( rInf.GetUnderFnt() )
+Index: inc/viewfrm.hxx
+===================================================================
+RCS file: /cvs/framework/sfx2/inc/viewfrm.hxx,v
+retrieving revision 1.24
+diff -u -r1.24 viewfrm.hxx
+--- openoffice.org.orig/sfx2/inc/viewfrm.hxx	12 Dec 2006 19:28:13 -0000	1.24
++++ openoffice.org/sfx2/inc/viewfrm.hxx	5 Apr 2007 10:42:26 -0000
+@@ -109,6 +109,14 @@
+ 			}
+ 	BOOL    operator != ( const SvBorder & rObj ) const
+ 			{ return !(*this == rObj); }
++	SvBorder & operator = ( const SvBorder & rBorder )
++			{
++				Left()   = rBorder.Left();
++				Top()    = rBorder.Top();
++				Right()  = rBorder.Right();
++				Bottom() = rBorder.Bottom();
++				return *this;
++			}
+ 	SvBorder & operator += ( const SvBorder & rBorder )
+ 			{
+ 				Left()   += rBorder.Left();
+Index: source/msfilter/msdffimp.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/msfilter/msdffimp.cxx,v
+retrieving revision 1.144.42.3
+diff -u -r1.144.42.3 msdffimp.cxx
+--- openoffice.org.orig/svx/source/msfilter/msdffimp.cxx	19 Jan 2007 16:46:49 -0000	1.144.42.3
++++ openoffice.org/svx/source/msfilter/msdffimp.cxx	5 Apr 2007 13:57:43 -0000
+@@ -6969,7 +6969,7 @@
+ 
+ 	// nachschauen, ob es sich auch wirklich um ein BLIP handelt
+ 	UINT32 nLength;
+-	USHORT nInst, nFbt;
++	USHORT nInst, nFbt(0);
+ 	BYTE   nVer;
+ 	if( ReadCommonRecordHeader( rBLIPStream, nVer, nInst, nFbt, nLength) && ( 0xF018 <= nFbt ) && ( 0xF117 >= nFbt ) )
+ 	{
+Index: source/core/txtnode/thints.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/core/txtnode/thints.cxx,v
+retrieving revision 1.43.36.6
+diff -u -r1.43.36.6 thints.cxx
+--- openoffice.org.orig/sw/source/core/txtnode/thints.cxx	20 Mar 2007 12:48:03 -0000	1.43.36.6
++++ openoffice.org/sw/source/core/txtnode/thints.cxx	5 Apr 2007 14:25:12 -0000
+@@ -2138,7 +2138,7 @@
+ 
+         BuildPortions( rNode, *pHint, nMode );
+ 
+-        if ( nHtStart < *pHtEnd ) // skip merging for 0-length attributes
++        if ( nHtStart < nHintEnd ) // skip merging for 0-length attributes
+             MergePortions( rNode );
+     }
+     else



From fedora-cvs-commits at redhat.com  Thu Apr  5 15:10:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 11:10:01 -0400
Subject: rpms/system-config-date/devel .cvsignore, 1.56, 1.57 sources, 1.60,
	1.61 system-config-date.spec, 1.65, 1.66
Message-ID: <200704051510.l35FA1lI003399@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
use underscores instead of spaces in timezone filenames (#235064)
Resolves: #235064



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	26 Mar 2007 09:57:37 -0000	1.56
+++ .cvsignore	5 Apr 2007 15:09:59 -0000	1.57
@@ -1 +1 @@
-system-config-date-1.8.93.tar.bz2
+system-config-date-1.8.94.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	26 Mar 2007 09:57:37 -0000	1.60
+++ sources	5 Apr 2007 15:09:59 -0000	1.61
@@ -1 +1 @@
-c7122332c2269e52d49900af73843636  system-config-date-1.8.93.tar.bz2
+86a8b2edecdd08e045960fe995e59b68  system-config-date-1.8.94.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- system-config-date.spec	26 Mar 2007 09:57:37 -0000	1.65
+++ system-config-date.spec	5 Apr 2007 15:09:59 -0000	1.66
@@ -1,6 +1,6 @@
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.8.93
+Version: 1.8.94
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/date
 License: GPL
@@ -96,6 +96,9 @@
 %config(noreplace) %{_sysconfdir}/ntp/ntpservers
 
 %changelog
+* Thu Apr 05 2007 Nils Philippsen <nphilipp at redhat.com> 1.8.94
+- use underscores instead of spaces in timezone filenames (#235064)
+
 * Mon Mar 26 2007 Nils Philippsen <nphilipp at redhat.com> 1.8.93
 - explain why system-config-date conflicts with old versions of firstboot
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 15:39:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 11:39:31 -0400
Subject: rpms/hplip/devel hplip-media-empty.patch, 1.1, 1.2 hplip.spec, 1.115,
	1.116
Message-ID: <200704051539.l35FdVKM018399@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip-media-empty.patch hplip.spec 
Log Message:
* Thu Apr  5 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-5
- Better media-empty-error state handling: always set the state.


hplip-media-empty.patch:
 hp.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Index: hplip-media-empty.patch
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip-media-empty.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hplip-media-empty.patch	4 Apr 2007 17:18:42 -0000	1.1
+++ hplip-media-empty.patch	5 Apr 2007 15:39:29 -0000	1.2
@@ -1,11 +1,33 @@
---- hplip-1.7.2/backend/hp/hp.c.media-empty	2007-04-04 18:14:12.000000000 +0100
-+++ hplip-1.7.2/backend/hp/hp.c	2007-04-04 18:15:01.000000000 +0100
+--- hplip-1.7.2/backend/hp/hp.c.media-empty	2006-12-14 18:15:44.000000000 +0000
++++ hplip-1.7.2/backend/hp/hp.c	2007-04-05 15:45:20.000000000 +0100
 @@ -410,7 +410,7 @@
     int len, vstatus, cnt;
     char buf[HPLIP_BUFFER_SIZE+HPLIP_HEADER_SIZE];
     HplipMsgAttributes ma;
 -   int paperout=0, offline=0;
-+   int paperout=1, offline=1;
++   int paperout = -1, offline = -1;
  
     if (argc > 1)
     {
+@@ -544,17 +544,17 @@
+                switch (vstatus)
+                {
+                   case VSTATUS_OOPA:
+-                     if (!paperout)
++                     if (paperout != 1)
+                      {
+                         fputs("STATE: +media-empty-error\n", stderr);
+-                        paperout=1;
++                        paperout = 1;
+                      }
+                      break;
+                   default:
+-                     if (!offline)
++                     if (offline != 1)
+                      {
+                         fputs("STATE: +other\n", stderr);
+-                        offline=1;
++                        offline = 1;
+                      }
+                      break;
+                }


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- hplip.spec	4 Apr 2007 17:18:42 -0000	1.115
+++ hplip.spec	5 Apr 2007 15:39:29 -0000	1.116
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 1.7.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -251,6 +251,9 @@
 exit 0
 
 %changelog
+* Thu Apr  5 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-5
+- Better media-empty-error state handling: always set the state.
+
 * Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-4
 - Clear the media-empty-error printer state.
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 15:53:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 11:53:26 -0400
Subject: rpms/gdm/devel gdm-2.18.0-dont-expect-utf8.patch, NONE, 1.1 gdm.spec,
	1.241, 1.242
Message-ID: <200704051553.l35FrQ7v018813@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18795

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.18.0-dont-expect-utf8.patch 
Log Message:
- don't expect utf-8 usernames for face browser (bug 235351).


gdm-2.18.0-dont-expect-utf8.patch:
 greeter_item_ulist.c |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 deletions(-)

--- NEW FILE gdm-2.18.0-dont-expect-utf8.patch ---
--- gdm-2.18.0/gui/greeter/greeter_item_ulist.c.dont-expect-utf8	2007-04-05 11:19:40.000000000 -0400
+++ gdm-2.18.0/gui/greeter/greeter_item_ulist.c	2007-04-05 11:39:06.000000000 -0400
@@ -168,6 +168,29 @@
 			&size_of_users, GDM_IS_LOCAL, !DOING_GDM_DEVELOPMENT);
 }
 
+static gchar *
+greeter_string_to_escaped_utf8 (const gchar *raw_string)
+{
+	gchar *utf8_string, *escaped_string, *p;
+        const gchar *q;
+
+	utf8_string = g_strdup (raw_string);
+        p = utf8_string;
+	while ((*p != '\0') && 
+               !g_utf8_validate (p, -1, &q)) {
+                p = (gchar *) q;
+		*p = '?';
+		p++;
+	}
+
+	g_assert (g_utf8_validate (utf8_string, -1, NULL));
+
+	escaped_string = g_markup_escape_text (utf8_string, -1);
+        g_free (utf8_string);
+
+	return escaped_string;
+}
+
 static void
 greeter_populate_user_list (GtkTreeModel *tm)
 {
@@ -181,9 +204,9 @@
 		gboolean    active;
 
 		if (usr->gecos && strcmp (usr->gecos, "") != 0) {
-			name = g_markup_escape_text (usr->gecos, -1);
+			name = greeter_string_to_escaped_utf8 (usr->gecos);
 		} else {
-			name = g_markup_escape_text (usr->login, -1);
+			name = greeter_string_to_escaped_utf8 (usr->login);
 		}
 
 		if (g_hash_table_lookup (displays_hash, usr->login))


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- gdm.spec	29 Mar 2007 19:20:32 -0000	1.241
+++ gdm.spec	5 Apr 2007 15:53:24 -0000	1.242
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.18.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -70,6 +70,8 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=424229
 Patch35: gdm-2.18.0-dont-strcpy-overlapping-strings.patch
 
+Patch36: gdm-2.18.0-dont-expect-utf8.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Prereq: /usr/sbin/useradd
@@ -156,6 +158,7 @@
 %patch33 -p0 -b .pass-ats-to-session
 %patch34 -p1 -b .add-lowres-fix
 %patch35 -p1 -b .dont-strcpy-overlapping-strings
+%patch36 -p1 -b .dont-expect-utf8
 
 %build
 cp -f %{SOURCE1} config/gdm
@@ -376,6 +379,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Thu Apr  5 2007 Ray Strode <rstrode at redhat.com> - 1:2.18.0-8
+- don't expect utf-8 usernames for face browser (bug 235351).
+
 * Thu Mar 29 2007 Ray Strode <rstrode at redhat.com> - 1:2.18.0-7
 - don't strcpy overlapping strings (bug 208181).
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 15:57:37 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 11:57:37 -0400
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.113,
	1.114 libselinux.spec, 1.257, 1.258
Message-ID: <200704051557.l35FvbGA018952@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Thu Apr 5 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.9-2
- Make rpm_exec swig work


libselinux-rhat.patch:
 src/selinuxswig.i      |   27 +++++++++++++++++++-
 src/selinuxswig_wrap.c |   64 +++++++++++++++++++++++++++++++++++--------------
 utils/getsebool.c      |   22 ++++++++++------
 3 files changed, 87 insertions(+), 26 deletions(-)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- libselinux-rhat.patch	2 Apr 2007 19:14:28 -0000	1.113
+++ libselinux-rhat.patch	5 Apr 2007 15:57:35 -0000	1.114
@@ -1,6 +1,132 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/getsebool.c libselinux-2.0.7/utils/getsebool.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-2.0.9/src/selinuxswig.i
+--- nsalibselinux/src/selinuxswig.i	2007-02-22 08:53:23.000000000 -0500
++++ libselinux-2.0.9/src/selinuxswig.i	2007-04-05 11:53:17.000000000 -0400
+@@ -115,9 +115,34 @@
+ extern const char *selinux_path(void);
+ extern int selinux_check_passwd_access(access_vector_t requested);
+ extern int checkPasswdAccess(access_vector_t requested);
++
++// This tells SWIG to treat char ** as a special case
++%typemap(in) char ** {
++  /* Check if is a list */
++  if (PyList_Check($input)) {
++    int size = PyList_Size($input);
++    int i = 0;
++    $1 = (char **) malloc((size+1)*sizeof(char *));
++    for (i = 0; i < size; i++) {
++      PyObject *o = PyList_GetItem($input,i);
++      if (PyString_Check(o))
++	$1[i] = PyString_AsString(PyList_GetItem($input,i));
++      else {
++	PyErr_SetString(PyExc_TypeError,"list must contain strings");
++	free($1);
++	return NULL;
++      }
++    }
++    $1[i] = 0;
++  } else {
++    PyErr_SetString(PyExc_TypeError,"not a list");
++    return NULL;
++  }
++}
++
+ extern int rpm_execcon(unsigned int verified, 
+ 		       const char *filename, 
+-		       char *const argv[], char *const envp[]);
++		       char **, char **);
+ 
+ extern int is_context_customizable (security_context_t scontext);
+ 
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_wrap.c libselinux-2.0.9/src/selinuxswig_wrap.c
+--- nsalibselinux/src/selinuxswig_wrap.c	2007-02-22 08:53:23.000000000 -0500
++++ libselinux-2.0.9/src/selinuxswig_wrap.c	2007-04-05 11:45:04.000000000 -0400
+@@ -4145,18 +4145,14 @@
+   PyObject *resultobj = 0;
+   unsigned int arg1 ;
+   char *arg2 = (char *) 0 ;
+-  char **arg3 ;
+-  char **arg4 ;
++  char **arg3 = (char **) 0 ;
++  char **arg4 = (char **) 0 ;
+   int result;
+   unsigned int val1 ;
+   int ecode1 = 0 ;
+   int res2 ;
+   char *buf2 = 0 ;
+   int alloc2 = 0 ;
+-  void *argp3 = 0 ;
+-  int res3 = 0 ;
+-  void *argp4 = 0 ;
+-  int res4 = 0 ;
+   PyObject * obj0 = 0 ;
+   PyObject * obj1 = 0 ;
+   PyObject * obj2 = 0 ;
+@@ -4173,17 +4169,51 @@
+     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "rpm_execcon" "', argument " "2"" of type '" "char const *""'");
+   }
+   arg2 = (char *)(buf2);
+-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_p_char, 0 |  0 );
+-  if (!SWIG_IsOK(res3)) {
+-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "rpm_execcon" "', argument " "3"" of type '" "char *const []""'"); 
+-  } 
+-  arg3 = (char **)(argp3);
+-  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_p_char, 0 |  0 );
+-  if (!SWIG_IsOK(res4)) {
+-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "rpm_execcon" "', argument " "4"" of type '" "char *const []""'"); 
+-  } 
+-  arg4 = (char **)(argp4);
+-  result = (int)rpm_execcon(arg1,(char const *)arg2,(char *const (*))arg3,(char *const (*))arg4);
++  {
++    /* Check if is a list */
++    if (PyList_Check(obj2)) {
++      int size = PyList_Size(obj2);
++      int i = 0;
++      arg3 = (char **) malloc((size+1)*sizeof(char *));
++      for (i = 0; i < size; i++) {
++        PyObject *o = PyList_GetItem(obj2,i);
++        if (PyString_Check(o))
++        arg3[i] = PyString_AsString(PyList_GetItem(obj2,i));
++        else {
++          PyErr_SetString(PyExc_TypeError,"list must contain strings");
++          free(arg3);
++          return NULL;
++        }
++      }
++      arg3[i] = 0;
++    } else {
++      PyErr_SetString(PyExc_TypeError,"not a list");
++      return NULL;
++    }
++  }
++  {
++    /* Check if is a list */
++    if (PyList_Check(obj3)) {
++      int size = PyList_Size(obj3);
++      int i = 0;
++      arg4 = (char **) malloc((size+1)*sizeof(char *));
++      for (i = 0; i < size; i++) {
++        PyObject *o = PyList_GetItem(obj3,i);
++        if (PyString_Check(o))
++        arg4[i] = PyString_AsString(PyList_GetItem(obj3,i));
++        else {
++          PyErr_SetString(PyExc_TypeError,"list must contain strings");
++          free(arg4);
++          return NULL;
++        }
++      }
++      arg4[i] = 0;
++    } else {
++      PyErr_SetString(PyExc_TypeError,"not a list");
++      return NULL;
++    }
++  }
++  result = (int)rpm_execcon(arg1,(char const *)arg2,arg3,arg4);
+   resultobj = SWIG_From_int((int)(result));
+   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+   return resultobj;
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/getsebool.c libselinux-2.0.9/utils/getsebool.c
 --- nsalibselinux/utils/getsebool.c	2006-11-16 17:15:17.000000000 -0500
-+++ libselinux-2.0.7/utils/getsebool.c	2007-03-22 16:48:06.000000000 -0400
++++ libselinux-2.0.9/utils/getsebool.c	2007-04-05 10:53:29.000000000 -0400
 @@ -72,17 +72,23 @@
  	for (i = 0; i < len; i++) {
  		active = security_get_boolean_active(names[i]);


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- libselinux.spec	2 Apr 2007 19:14:28 -0000	1.257
+++ libselinux.spec	5 Apr 2007 15:57:35 -0000	1.258
@@ -2,7 +2,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -121,6 +121,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Thu Apr 5 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.9-2
+- Make rpm_exec swig work
+
 * Tue Mar 27 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.9-1
 - Upgrade to upstream
 	* Merged class/av string conversion and avc_compute_create patch from Eamon Walsh.



From fedora-cvs-commits at redhat.com  Thu Apr  5 16:04:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 12:04:42 -0400
Subject: rpms/gdm/devel gdm-2.18.0-dont-expect-utf8.patch,1.1,1.2
Message-ID: <200704051604.l35G4gdN019327@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19305

Modified Files:
	gdm-2.18.0-dont-expect-utf8.patch 
Log Message:
don't expect utf8 in plain greeter either


gdm-2.18.0-dont-expect-utf8.patch:
 gdmcommon.c                  |   23 +++++++++++++++++++++++
 gdmcommon.h                  |    1 +
 gdmlogin.c                   |    4 ++--
 greeter/greeter_item_ulist.c |    4 ++--
 4 files changed, 28 insertions(+), 4 deletions(-)

Index: gdm-2.18.0-dont-expect-utf8.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.18.0-dont-expect-utf8.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.18.0-dont-expect-utf8.patch	5 Apr 2007 15:53:24 -0000	1.1
+++ gdm-2.18.0-dont-expect-utf8.patch	5 Apr 2007 16:04:40 -0000	1.2
@@ -1,16 +1,29 @@
---- gdm-2.18.0/gui/greeter/greeter_item_ulist.c.dont-expect-utf8	2007-04-05 11:19:40.000000000 -0400
-+++ gdm-2.18.0/gui/greeter/greeter_item_ulist.c	2007-04-05 11:39:06.000000000 -0400
-@@ -168,6 +168,29 @@
- 			&size_of_users, GDM_IS_LOCAL, !DOING_GDM_DEVELOPMENT);
+--- gdm-2.18.0/gui/gdmlogin.c.dont-expect-utf8	2007-04-05 12:02:47.000000000 -0400
++++ gdm-2.18.0/gui/gdmlogin.c	2007-04-05 12:03:24.000000000 -0400
+@@ -2042,8 +2042,8 @@
+ 	    char *label;
+ 	    char *login, *gecos;
+ 
+-	    login = g_markup_escape_text (usr->login, -1);
+-	    gecos = g_markup_escape_text (usr->gecos, -1);
++	    login = gdm_common_text_to_escaped_utf8 (usr->login);
++	    gecos = gdm_common_text_to_escaped_utf8 (usr->gecos, -1);
+ 
+ 	    label = g_strdup_printf ("<b>%s</b>\n%s",
+ 				     login,
+--- gdm-2.18.0/gui/gdmcommon.c.dont-expect-utf8	2007-04-05 11:59:23.000000000 -0400
++++ gdm-2.18.0/gui/gdmcommon.c	2007-04-05 12:02:29.000000000 -0400
+@@ -379,6 +379,29 @@
+ 	return pixbuf;
  }
  
-+static gchar *
-+greeter_string_to_escaped_utf8 (const gchar *raw_string)
++gchar *
++gdm_common_text_to_escaped_utf8 (const char *text)
 +{
 +	gchar *utf8_string, *escaped_string, *p;
 +        const gchar *q;
 +
-+	utf8_string = g_strdup (raw_string);
++	utf8_string = g_strdup (text);
 +        p = utf8_string;
 +	while ((*p != '\0') && 
 +               !g_utf8_validate (p, -1, &q)) {
@@ -27,18 +40,30 @@
 +	return escaped_string;
 +}
 +
- static void
- greeter_populate_user_list (GtkTreeModel *tm)
+ gchar * 
+ gdm_common_get_config_file (void)
  {
-@@ -181,9 +204,9 @@
+--- gdm-2.18.0/gui/gdmcommon.h.dont-expect-utf8	2007-04-05 11:59:37.000000000 -0400
++++ gdm-2.18.0/gui/gdmcommon.h	2007-04-05 12:00:40.000000000 -0400
+@@ -58,6 +58,7 @@
+                                              guint       max_width,
+                                              guint       max_height);
+ 
++gchar*	  gdm_common_text_to_escaped_utf8   (const char *text);
+ gchar*	  gdm_common_get_config_file	    (void);
+ gchar*	  gdm_common_get_custom_config_file (void);
+ gboolean  gdm_common_select_time_format	    (void);
+--- gdm-2.18.0/gui/greeter/greeter_item_ulist.c.dont-expect-utf8	2007-04-05 11:59:05.000000000 -0400
++++ gdm-2.18.0/gui/greeter/greeter_item_ulist.c	2007-04-05 12:02:09.000000000 -0400
+@@ -181,9 +181,9 @@
  		gboolean    active;
  
  		if (usr->gecos && strcmp (usr->gecos, "") != 0) {
 -			name = g_markup_escape_text (usr->gecos, -1);
-+			name = greeter_string_to_escaped_utf8 (usr->gecos);
++			name = gdm_common_text_to_escaped_utf8 (usr->gecos);
  		} else {
 -			name = g_markup_escape_text (usr->login, -1);
-+			name = greeter_string_to_escaped_utf8 (usr->login);
++			name = gdm_common_text_to_escaped_utf8 (usr->login);
  		}
  
  		if (g_hash_table_lookup (displays_hash, usr->login))



From fedora-cvs-commits at redhat.com  Thu Apr  5 16:10:04 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 12:10:04 -0400
Subject: rpms/apr-util/devel apr-util.spec,1.35,1.36
Message-ID: <200704051610.l35GA4fn019432@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/apr-util/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19415

Modified Files:
	apr-util.spec 
Log Message:
* Thu Apr  5 2007 Joe Orton <jorton at redhat.com> 1.2.8-7
- remove old Conflicts, doxygen BR (#225254)



Index: apr-util.spec
===================================================================
RCS file: /cvs/dist/rpms/apr-util/devel/apr-util.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- apr-util.spec	23 Mar 2007 09:46:00 -0000	1.35
+++ apr-util.spec	5 Apr 2007 16:10:00 -0000	1.36
@@ -4,7 +4,7 @@
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
 Version: 1.2.8
-Release: 6
+Release: 7
 License: Apache Software License 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -14,10 +14,9 @@
 Patch2: apr-util-1.2.7-pkgconf.patch
 Patch3: apr-util-1.2.8-dbddso.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: autoconf, doxygen, apr-devel >= 1.2.0
+BuildRequires: autoconf, apr-devel >= 1.2.0
 BuildRequires: openldap-devel, db4-devel, expat-devel
 BuildRequires: sqlite-devel >= 3.0.0, e2fsprogs-devel
-Conflicts: subversion < 0.20.1-2
 
 %description
 The mission of the Apache Portable Runtime (APR) is to provide a
@@ -30,7 +29,6 @@
 Summary: APR utility library development kit
 Requires: apr-util = %{version}-%{release}, apr-devel, pkgconfig
 Requires: openldap-devel, db4-devel, expat-devel
-Conflicts: subversion-devel < 0.20.1-2
 
 %description devel
 This package provides the support files which can be used to 
@@ -138,6 +136,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Apr  5 2007 Joe Orton <jorton at redhat.com> 1.2.8-7
+- remove old Conflicts, doxygen BR (#225254)
+
 * Fri Mar 23 2007 Joe Orton <jorton at redhat.com> 1.2.8-6
 - add DBD DSO lifetime fix (r521327)
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 16:11:24 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 12:11:24 -0400
Subject: rpms/gdm/devel gdm.spec,1.242,1.243
Message-ID: <200704051611.l35GBOL7019523@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19501

Modified Files:
	gdm.spec 
Log Message:
- don't expect utf-8 usernames for plain greeter face browser
  either.



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- gdm.spec	5 Apr 2007 15:53:24 -0000	1.242
+++ gdm.spec	5 Apr 2007 16:11:17 -0000	1.243
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.18.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -70,6 +70,7 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=424229
 Patch35: gdm-2.18.0-dont-strcpy-overlapping-strings.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=426647
 Patch36: gdm-2.18.0-dont-expect-utf8.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -379,6 +380,10 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Thu Apr  5 2007 Ray Strode <rstrode at redhat.com> - 1:2.18.0-9
+- don't expect utf-8 usernames for plain greeter face browser
+  either.
+
 * Thu Apr  5 2007 Ray Strode <rstrode at redhat.com> - 1:2.18.0-8
 - don't expect utf-8 usernames for face browser (bug 235351).
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 16:18:41 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 12:18:41 -0400
Subject: rpms/gdm/devel gdm.spec,1.243,1.244
Message-ID: <200704051618.l35GIepi019701@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19678

Modified Files:
	gdm.spec 
Log Message:
add upstream bug reference for "hide uninstalled languages" patch



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- gdm.spec	5 Apr 2007 16:11:17 -0000	1.243
+++ gdm.spec	5 Apr 2007 16:18:38 -0000	1.244
@@ -56,6 +56,7 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=411427
 Patch29: gdm-2.17.7-greeter.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=426653
 Patch31: gdm-2.17.8-hide-uninstalled-languages.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=412576



From fedora-cvs-commits at redhat.com  Thu Apr  5 16:20:22 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 12:20:22 -0400
Subject: rpms/gdm/devel gdm-2.18.0-dont-expect-utf8.patch,1.2,1.3
Message-ID: <200704051620.l35GKL4K019766@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19748

Modified Files:
	gdm-2.18.0-dont-expect-utf8.patch 
Log Message:
grr fix typo in patch


gdm-2.18.0-dont-expect-utf8.patch:
 gdmcommon.c                  |   23 +++++++++++++++++++++++
 gdmcommon.h                  |    1 +
 gdmlogin.c                   |    4 ++--
 greeter/greeter_item_ulist.c |    4 ++--
 4 files changed, 28 insertions(+), 4 deletions(-)

Index: gdm-2.18.0-dont-expect-utf8.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.18.0-dont-expect-utf8.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdm-2.18.0-dont-expect-utf8.patch	5 Apr 2007 16:04:40 -0000	1.2
+++ gdm-2.18.0-dont-expect-utf8.patch	5 Apr 2007 16:20:19 -0000	1.3
@@ -7,7 +7,7 @@
 -	    login = g_markup_escape_text (usr->login, -1);
 -	    gecos = g_markup_escape_text (usr->gecos, -1);
 +	    login = gdm_common_text_to_escaped_utf8 (usr->login);
-+	    gecos = gdm_common_text_to_escaped_utf8 (usr->gecos, -1);
++	    gecos = gdm_common_text_to_escaped_utf8 (usr->gecos);
  
  	    label = g_strdup_printf ("<b>%s</b>\n%s",
  				     login,



From fedora-cvs-commits at redhat.com  Thu Apr  5 16:22:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 12:22:21 -0400
Subject: rpms/perl-DBI/devel perl-DBI.spec,1.30,1.31
Message-ID: <200704051622.l35GMLwq019883@cvs.devel.redhat.com>

Author: rnorwood

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

Modified Files:
	perl-DBI.spec 
Log Message:
fix some rpmlint issues - make .spec file UTF8 and untabify.


Index: perl-DBI.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBI/devel/perl-DBI.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- perl-DBI.spec	2 Dec 2006 18:29:28 -0000	1.30
+++ perl-DBI.spec	5 Apr 2007 16:22:19 -0000	1.31
@@ -1,6 +1,6 @@
 Name:           perl-DBI
 Version:        1.53
-Release: 	1%{?dist}
+Release:        1%{?dist}
 Summary:        A database access API for perl
 
 Group:          Development/Libraries
@@ -69,7 +69,7 @@
 
 * 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
 
@@ -141,21 +141,21 @@
 * Wed Nov 20 2002 Chip Turner <cturner at redhat.com>
 - rebuild
 
-* Wed Aug  7 2002 Trond Eivind Glomsr?d <teg at redhat.com> 1.30-1
+* Wed Aug  7 2002 Trond Eivind Glomsr??d <teg at redhat.com> 1.30-1
 - 1.30. 
 
-* Tue Jun 25 2002 Trond Eivind Glomsr?d <teg at redhat.com> 1.28-1
+* Tue Jun 25 2002 Trond Eivind Glomsr??d <teg at redhat.com> 1.28-1
 - 1.28
 - Building it also fixes #66304
 
 * Fri Jun 21 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Wed Jun  5 2002 Trond Eivind Glomsr?d <teg at redhat.com> 1.23-2
+* Wed Jun  5 2002 Trond Eivind Glomsr??d <teg at redhat.com> 1.23-2
 - Tweak dependency finder - filter out a dependency found within the 
   doc section of a module
 
-* Tue Jun  4 2002 Trond Eivind Glomsr?d <teg at redhat.com> 1.23-1
+* Tue Jun  4 2002 Trond Eivind Glomsr??d <teg at redhat.com> 1.23-1
 - 1.23
 - Some changes to integrate with new Perl
 - Update URL
@@ -163,42 +163,42 @@
 * Thu May 23 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Tue May  7 2002 Trond Eivind Glomsr?d <teg at redhat.com> 1.21-2
+* Tue May  7 2002 Trond Eivind Glomsr??d <teg at redhat.com> 1.21-2
 - Rebuild
 
-* Fri Feb 22 2002 Trond Eivind Glomsr?d <teg at redhat.com> 1.21-1
+* Fri Feb 22 2002 Trond Eivind Glomsr??d <teg at redhat.com> 1.21-1
 - 1.21
 
 * Fri Feb  8 2002 Chip Turner <cturner at redhat.com>
 - filter out "soft" dependencies: perl(RPC::PlClient) and perl(Win32::ODBC)
 
-* Thu Feb  7 2002 Trond Eivind Glomsr?d <teg at redhat.com> 1.201-2
+* Thu Feb  7 2002 Trond Eivind Glomsr??d <teg at redhat.com> 1.201-2
 - Rebuild
 
-* Tue Jan 22 2002 Trond Eivind Glomsr?d <teg at redhat.com> 1.201-1
+* Tue Jan 22 2002 Trond Eivind Glomsr??d <teg at redhat.com> 1.201-1
 - 1.201
 
 * Wed Jan 09 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Tue Jan  8 2002 Trond Eivind Glomsr?d <teg at redhat.com> 1.20-1
+* Tue Jan  8 2002 Trond Eivind Glomsr??d <teg at redhat.com> 1.20-1
 - 1.20
 - Proper URL
 
-* Sat Jun 23 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Sat Jun 23 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - 1.18
 
-* Wed May 30 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Wed May 30 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - 1.16
 - change group to Applications/Databases from Applications/CPAN
 
-* Tue May  1 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Tue May  1 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - 1.15
 
-* Tue Feb 27 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Tue Feb 27 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - Cleanups
 
-* Thu Nov 30 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Thu Nov 30 2000 Trond Eivind Glomsr??d <teg at redhat.com>
 - build for main distribution
 - use %%{_tmppath}
 - change name of specfile



From fedora-cvs-commits at redhat.com  Thu Apr  5 16:24:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 12:24:57 -0400
Subject: rpms/perl-DBI/devel perl-DBI.spec,1.31,1.32
Message-ID: <200704051624.l35GOvAu020051@cvs.devel.redhat.com>

Author: rnorwood

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

Modified Files:
	perl-DBI.spec 
Log Message:
increment release.


Index: perl-DBI.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBI/devel/perl-DBI.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- perl-DBI.spec	5 Apr 2007 16:22:19 -0000	1.31
+++ perl-DBI.spec	5 Apr 2007 16:24:55 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           perl-DBI
 Version:        1.53
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A database access API for perl
 
 Group:          Development/Libraries



From fedora-cvs-commits at redhat.com  Thu Apr  5 16:45:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 12:45:47 -0400
Subject: rpms/libselinux/FC-6 libselinux-rhat.patch, 1.96,
	1.97 libselinux.spec, 1.233, 1.234
Message-ID: <200704051645.l35GjlZ0011495@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Thu Apr 5 2007 Dan Walsh <dwalsh at redhat.com> - 1.33.4-3
- Fix rpm_execcon in python


libselinux-rhat.patch:
 man/man3/avc_add_callback.3                |    3 
 man/man3/avc_cache_stats.3                 |    3 
 man/man3/avc_context_to_sid.3              |    3 
 man/man3/avc_has_perm.3                    |    1 
 man/man3/avc_init.3                        |    4 
 man/man3/context_new.3                     |    3 
 man/man3/freecon.3                         |    6 
 man/man3/get_ordered_context_list.3        |    4 
 man/man3/getcon.3                          |    4 
 man/man3/getexeccon.3                      |    4 
 man/man3/getfilecon.3                      |    4 
 man/man3/getfscreatecon.3                  |    4 
 man/man3/getseuserbyname.3                 |    3 
 man/man3/is_context_customizable.3         |    5 
 man/man3/is_selinux_enabled.3              |    6 
 man/man3/matchmediacon.3                   |    4 
 man/man3/matchpathcon.3                    |    4 
 man/man3/security_check_context.3          |    6 
 man/man3/security_compute_av.3             |    4 
 man/man3/security_getenforce.3             |    6 
 man/man3/security_load_booleans.3          |    2 
 man/man3/security_load_policy.3            |    6 
 man/man3/security_policyvers.3             |    6 
 man/man3/selinux_binary_policy_path.3      |    5 
 man/man3/selinux_check_securetty_context.3 |    6 
 man/man3/selinux_getenforcemode.3          |    5 
 man/man3/selinux_policy_root.3             |    3 
 man/man3/setfilecon.3                      |    4 
 man/man8/avcstat.8                         |    3 
 man/man8/getenforce.8                      |    2 
 man/man8/getsebool.8                       |    5 
 man/man8/matchpathcon.8                    |    3 
 man/man8/selinuxenabled.8                  |    2 
 man/man8/setenforce.8                      |    2 
 man/man8/togglesebool.8                    |    4 
 src/selinuxswig.i                          |   27 +++
 src/selinuxswig_wrap.c                     |  216 ++++++++++++++++++-----------
 utils/getdefaultcon.c                      |   80 ++++++++++
 38 files changed, 339 insertions(+), 123 deletions(-)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/FC-6/libselinux-rhat.patch,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- libselinux-rhat.patch	15 Jan 2007 15:34:10 -0000	1.96
+++ libselinux-rhat.patch	5 Apr 2007 16:45:45 -0000	1.97
@@ -1,129 +1,813 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/avc_add_callback.3 libselinux-1.33.4/man/man3/avc_add_callback.3
---- nsalibselinux/man/man3/avc_add_callback.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/avc_add_callback.3	2007-01-12 10:52:13.000000000 -0500
-@@ -3,7 +3,7 @@
- .\" Author: Eamon Walsh (ewalsh at epoch.ncsc.mil) 2004
- .TH "avc_add_callback" "3" "9 June 2004" "" "SE Linux API documentation"
- .SH "NAME"
--avc_add_callback \- additional event notification for userspace object managers.
-+avc_add_callback \- additional event notification for SELinux userspace object managers.
- .SH "SYNOPSIS"
- .B #include <selinux/selinux.h>
- .br
-@@ -181,3 +181,4 @@
- .BR avc_context_to_sid (3),
- .BR avc_cache_stats (3),
- .BR security_compute_av (3)
-+.BR selinux (8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/avc_cache_stats.3 libselinux-1.33.4/man/man3/avc_cache_stats.3
---- nsalibselinux/man/man3/avc_cache_stats.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/avc_cache_stats.3	2007-01-12 10:52:01.000000000 -0500
-@@ -3,7 +3,7 @@
- .\" Author: Eamon Walsh (ewalsh at epoch.ncsc.mil) 2004
- .TH "avc_cache_stats" "3" "27 May 2004" "" "SE Linux API documentation"
- .SH "NAME"
--avc_cache_stats, avc_av_stats, avc_sid_stats \- obtain userspace AVC statistics.
-+avc_cache_stats, avc_av_stats, avc_sid_stats \- obtain userspace SELinux AVC statistics.
- .SH "SYNOPSIS"
- .B #include <selinux/selinux.h>
- .br
-@@ -96,3 +96,4 @@
- .BR avc_has_perm (3),
- .BR avc_context_to_sid (3),
- .BR avc_add_callback (3)
-+.BR selinux (8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/avc_context_to_sid.3 libselinux-1.33.4/man/man3/avc_context_to_sid.3
---- nsalibselinux/man/man3/avc_context_to_sid.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/avc_context_to_sid.3	2007-01-12 10:51:53.000000000 -0500
-@@ -3,7 +3,7 @@
- .\" Author: Eamon Walsh (ewalsh at epoch.ncsc.mil) 2004
- .TH "avc_context_to_sid" "3" "27 May 2004" "" "SE Linux API documentation"
- .SH "NAME"
--avc_context_to_sid, avc_sid_to_context, sidput, sidget \- obtain and manipulate security ID's.
-+avc_context_to_sid, avc_sid_to_context, sidput, sidget \- obtain and manipulate SELinux security ID's.
- .SH "SYNOPSIS"
- .B #include <selinux/selinux.h>
- .br
-@@ -88,3 +88,4 @@
- .BR avc_add_callback (3),
- .BR getcon (3),
- .BR freecon (3)
-+.BR selinux (8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/avc_has_perm.3 libselinux-1.33.4/man/man3/avc_has_perm.3
---- nsalibselinux/man/man3/avc_has_perm.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/avc_has_perm.3	2007-01-12 10:16:17.000000000 -0500
-@@ -152,3 +152,4 @@
- .BR avc_cache_stats (3),
- .BR avc_add_callback (3),
- .BR security_compute_av (3)
-+.BR selinux(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/avc_init.3 libselinux-1.33.4/man/man3/avc_init.3
---- nsalibselinux/man/man3/avc_init.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/avc_init.3	2007-01-12 10:51:40.000000000 -0500
-@@ -3,7 +3,7 @@
- .\" Author: Eamon Walsh (ewalsh at epoch.ncsc.mil) 2004
- .TH "avc_init" "3" "27 May 2004" "" "SE Linux API documentation"
- .SH "NAME"
--avc_init, avc_destroy, avc_reset, avc_cleanup \- userspace AVC setup and teardown.
-+avc_init, avc_destroy, avc_reset, avc_cleanup \- userspace SELinux AVC setup and teardown.
- .SH "SYNOPSIS"
- .B #include <selinux/selinux.h>
- .br
-@@ -209,3 +209,5 @@
- .BR avc_cache_stats (3),
- .BR avc_add_callback (3),
- .BR security_compute_av (3)
-+.BR selinux (8)
+--- libselinux-1.33.4/src/selinuxswig_wrap.c.rhat	2007-04-05 12:44:08.000000000 -0400
++++ libselinux-1.33.4/src/selinuxswig_wrap.c	2007-04-05 12:44:27.000000000 -0400
+@@ -1,6 +1,6 @@
+ /* ----------------------------------------------------------------------------
+  * This file was automatically generated by SWIG (http://www.swig.org).
+- * Version 1.3.29
++ * Version 1.3.31
+  * 
+  * This file is not intended to be easily readable and contains a number of 
+  * coding conventions designed to improve portability and efficiency. Do not make
+@@ -103,7 +103,7 @@
+ #endif
+ 
+ /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
+-#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER)
++#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+ # define _CRT_SECURE_NO_DEPRECATE
+ #endif
+ 
+@@ -120,7 +120,7 @@
+ 
+ /* This should only be incremented when either the layout of swig_type_info changes,
+    or for whatever reason, the runtime changes incompatibly */
+-#define SWIG_RUNTIME_VERSION "2"
++#define SWIG_RUNTIME_VERSION "3"
+ 
+ /* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
+ #ifdef SWIG_TYPE_TABLE
+@@ -697,8 +697,6 @@
+ 
+ 
+ 
+-/* Python.h has to appear first */
+-#include <Python.h>
+ 
+ /* Add PyOS_snprintf for old Pythons */
+ #if PY_VERSION_HEX < 0x02020000
+@@ -779,6 +777,14 @@
+ }
+ #endif
+ 
++/* Py_ssize_t for old Pythons */
++/* This code is as recommended by: */
++/* http://www.python.org/dev/peps/pep-0353/#conversion-guidelines */
++#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
++typedef int Py_ssize_t;
++# define PY_SSIZE_T_MAX INT_MAX
++# define PY_SSIZE_T_MIN INT_MIN
++#endif
+ 
+ /* -----------------------------------------------------------------------------
+  * error manipulation
+@@ -1172,7 +1178,7 @@
+ SWIGRUNTIMEINLINE PyObject * 
+ _SWIG_Py_None(void)
+ {
+-  PyObject *none = Py_BuildValue("");
++  PyObject *none = Py_BuildValue((char*)"");
+   Py_DECREF(none);
+   return none;
+ }
+@@ -2031,7 +2037,7 @@
+     void *vptr = 0;
+     
+     /* here we get the method pointer for callbacks */
+-    char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
++    const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
+     const char *desc = doc ? strstr(doc, "swig_ptr: ") : 0;
+     if (desc) {
+       desc = ty ? SWIG_UnpackVoidPtr(desc + 10, &vptr, ty->name) : 0;
+@@ -2152,7 +2158,7 @@
+    return;
+  }
+ #endif
+- dict = PyObject_GetAttrString(inst, "__dict__");
++ dict = PyObject_GetAttrString(inst, (char*)"__dict__");
+  PyDict_SetItem(dict, SWIG_This(), swig_this);
+  Py_DECREF(dict);
+ } 
+@@ -2293,7 +2299,7 @@
+ 
+ /* The python cached type query */
+ SWIGRUNTIME PyObject *
+-SWIG_Python_TypeCache() {
++SWIG_Python_TypeCache(void) {
+   static PyObject *SWIG_STATIC_POINTER(cache) = PyDict_New();
+   return cache;
+ }
+@@ -2459,7 +2465,7 @@
+ 
+ #if (PY_VERSION_HEX <= 0x02000000)
+ # if !defined(SWIG_PYTHON_CLASSIC)
+-#  error "This python version requires to use swig with the '-classic' option"
++#  error "This python version requires swig to be run with the '-classic' option"
+ # endif
+ #endif
+ 
+@@ -2470,7 +2476,8 @@
+ 
+ #define SWIG_name    "_selinux"
+ 
+-#define SWIGVERSION 0x010329 
++#define SWIGVERSION 0x010331 
++#define SWIG_VERSION SWIGVERSION
+ 
+ 
+ #define SWIG_as_voidptr(a) (void *)((const void *)(a)) 
+@@ -2638,7 +2645,7 @@
+ 
+ 
+ SWIGINTERN swig_type_info*
+-SWIG_pchar_descriptor()
++SWIG_pchar_descriptor(void)
+ {
+   static int init = 0;
+   static swig_type_info* info = 0;
+@@ -2654,7 +2661,7 @@
+ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
+ {
+   if (PyString_Check(obj)) {
+-    char *cstr; int len;
++    char *cstr; Py_ssize_t len;
+     PyString_AsStringAndSize(obj, &cstr, &len);
+     if (cptr)  {
+       if (alloc) {
+@@ -3128,7 +3135,7 @@
+   if (!SWIG_IsOK(res1)) {
+     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "getfilecon" "', argument " "1"" of type '" "char const *""'");
+   }
+-  arg1 = buf1;
++  arg1 = (char *)(buf1);
+   result = (int)getfilecon((char const *)arg1,arg2);
+   resultobj = SWIG_From_int((int)(result));
+   {
+@@ -3166,7 +3173,7 @@
+   if (!SWIG_IsOK(res1)) {
+     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "lgetfilecon" "', argument " "1"" of type '" "char const *""'");
+   }
+-  arg1 = buf1;
++  arg1 = (char *)(buf1);
+   result = (int)lgetfilecon((char const *)arg1,arg2);
+   resultobj = SWIG_From_int((int)(result));
+   {
+@@ -3235,7 +3242,7 @@
+   if (!SWIG_IsOK(res1)) {
+     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "setfilecon" "', argument " "1"" of type '" "char const *""'");
+   }
+-  arg1 = buf1;
++  arg1 = (char *)(buf1);
+   {
+     arg2 = (security_context_t)PyString_AsString(obj1);
+   }
+@@ -3265,7 +3272,7 @@
+   if (!SWIG_IsOK(res1)) {
+     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "lsetfilecon" "', argument " "1"" of type '" "char const *""'");
+   }
+-  arg1 = buf1;
++  arg1 = (char *)(buf1);
+   {
+     arg2 = (security_context_t)PyString_AsString(obj1);
+   }
+@@ -3440,7 +3447,7 @@
+   if (!SWIG_IsOK(res1)) {
+     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "security_load_booleans" "', argument " "1"" of type '" "char *""'");
+   }
+-  arg1 = buf1;
++  arg1 = (char *)(buf1);
+   result = (int)security_load_booleans(arg1);
+   resultobj = SWIG_From_int((int)(result));
+   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+@@ -3594,7 +3601,7 @@
+   if (!SWIG_IsOK(res1)) {
+     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "security_get_boolean_pending" "', argument " "1"" of type '" "char const *""'");
+   }
+-  arg1 = buf1;
++  arg1 = (char *)(buf1);
+   result = (int)security_get_boolean_pending((char const *)arg1);
+   resultobj = SWIG_From_int((int)(result));
+   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+@@ -3619,7 +3626,7 @@
+   if (!SWIG_IsOK(res1)) {
+     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "security_get_boolean_active" "', argument " "1"" of type '" "char const *""'");
+   }
+-  arg1 = buf1;
++  arg1 = (char *)(buf1);
+   result = (int)security_get_boolean_active((char const *)arg1);
+   resultobj = SWIG_From_int((int)(result));
+   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+@@ -3648,7 +3655,7 @@
+   if (!SWIG_IsOK(res1)) {
+     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "security_set_boolean" "', argument " "1"" of type '" "char const *""'");
+   }
+-  arg1 = buf1;
++  arg1 = (char *)(buf1);
+   ecode2 = SWIG_AsVal_int(obj1, &val2);
+   if (!SWIG_IsOK(ecode2)) {
+     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "security_set_boolean" "', argument " "2"" of type '" "int""'");
+@@ -3712,7 +3719,7 @@
+   if (!SWIG_IsOK(res1)) {
+     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "matchpathcon_init" "', argument " "1"" of type '" "char const *""'");
+   }
+-  arg1 = buf1;
++  arg1 = (char *)(buf1);
+   result = (int)matchpathcon_init((char const *)arg1);
+   resultobj = SWIG_From_int((int)(result));
+   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+@@ -3747,7 +3754,7 @@
+   if (!SWIG_IsOK(res1)) {
+     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "matchpathcon" "', argument " "1"" of type '" "char const *""'");
+   }
+-  arg1 = buf1;
++  arg1 = (char *)(buf1);
+   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+   if (!SWIG_IsOK(ecode2)) {
+     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "matchpathcon" "', argument " "2"" of type '" "mode_t""'");
+@@ -3790,7 +3797,7 @@
+   if (!SWIG_IsOK(res1)) {
+     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "matchmediacon" "', argument " "1"" of type '" "char const *""'");
+   }
+-  arg1 = buf1;
++  arg1 = (char *)(buf1);
+   result = (int)matchmediacon((char const *)arg1,arg2);
+   resultobj = SWIG_From_int((int)(result));
+   {
+@@ -3837,7 +3844,7 @@
+   
+   if (!PyArg_ParseTuple(args,(char *)":selinux_policy_root")) SWIG_fail;
+   result = (char *)selinux_policy_root();
+-  resultobj = SWIG_FromCharPtr(result);
++  resultobj = SWIG_FromCharPtr((const char *)result);
+   return resultobj;
+ fail:
+   return NULL;
+@@ -3850,7 +3857,7 @@
+   
+   if (!PyArg_ParseTuple(args,(char *)":selinux_binary_policy_path")) SWIG_fail;
+   result = (char *)selinux_binary_policy_path();
+-  resultobj = SWIG_FromCharPtr(result);
++  resultobj = SWIG_FromCharPtr((const char *)result);
+   return resultobj;
+ fail:
+   return NULL;
+@@ -3863,7 +3870,7 @@
+   
+   if (!PyArg_ParseTuple(args,(char *)":selinux_failsafe_context_path")) SWIG_fail;
+   result = (char *)selinux_failsafe_context_path();
+-  resultobj = SWIG_FromCharPtr(result);
++  resultobj = SWIG_FromCharPtr((const char *)result);
+   return resultobj;
+ fail:
+   return NULL;
+@@ -3876,7 +3883,7 @@
+   
+   if (!PyArg_ParseTuple(args,(char *)":selinux_removable_context_path")) SWIG_fail;
+   result = (char *)selinux_removable_context_path();
+-  resultobj = SWIG_FromCharPtr(result);
++  resultobj = SWIG_FromCharPtr((const char *)result);
+   return resultobj;
+ fail:
+   return NULL;
+@@ -3889,7 +3896,7 @@
+   
+   if (!PyArg_ParseTuple(args,(char *)":selinux_default_context_path")) SWIG_fail;
+   result = (char *)selinux_default_context_path();
+-  resultobj = SWIG_FromCharPtr(result);
++  resultobj = SWIG_FromCharPtr((const char *)result);
+   return resultobj;
+ fail:
+   return NULL;
+@@ -3902,7 +3909,7 @@
+   
+   if (!PyArg_ParseTuple(args,(char *)":selinux_user_contexts_path")) SWIG_fail;
+   result = (char *)selinux_user_contexts_path();
+-  resultobj = SWIG_FromCharPtr(result);
++  resultobj = SWIG_FromCharPtr((const char *)result);
+   return resultobj;
+ fail:
+   return NULL;
+@@ -3915,7 +3922,7 @@
+   
+   if (!PyArg_ParseTuple(args,(char *)":selinux_file_context_path")) SWIG_fail;
+   result = (char *)selinux_file_context_path();
+-  resultobj = SWIG_FromCharPtr(result);
++  resultobj = SWIG_FromCharPtr((const char *)result);
+   return resultobj;
+ fail:
+   return NULL;
+@@ -3928,7 +3935,7 @@
+   
+   if (!PyArg_ParseTuple(args,(char *)":selinux_file_context_homedir_path")) SWIG_fail;
+   result = (char *)selinux_file_context_homedir_path();
+-  resultobj = SWIG_FromCharPtr(result);
++  resultobj = SWIG_FromCharPtr((const char *)result);
+   return resultobj;
+ fail:
+   return NULL;
+@@ -3941,7 +3948,7 @@
+   
+   if (!PyArg_ParseTuple(args,(char *)":selinux_file_context_local_path")) SWIG_fail;
+   result = (char *)selinux_file_context_local_path();
+-  resultobj = SWIG_FromCharPtr(result);
++  resultobj = SWIG_FromCharPtr((const char *)result);
+   return resultobj;
+ fail:
+   return NULL;
+@@ -3954,7 +3961,7 @@
+   
+   if (!PyArg_ParseTuple(args,(char *)":selinux_homedir_context_path")) SWIG_fail;
+   result = (char *)selinux_homedir_context_path();
+-  resultobj = SWIG_FromCharPtr(result);
++  resultobj = SWIG_FromCharPtr((const char *)result);
+   return resultobj;
+ fail:
+   return NULL;
+@@ -3967,7 +3974,7 @@
+   
+   if (!PyArg_ParseTuple(args,(char *)":selinux_media_context_path")) SWIG_fail;
+   result = (char *)selinux_media_context_path();
+-  resultobj = SWIG_FromCharPtr(result);
++  resultobj = SWIG_FromCharPtr((const char *)result);
+   return resultobj;
+ fail:
+   return NULL;
+@@ -3980,7 +3987,7 @@
+   
+   if (!PyArg_ParseTuple(args,(char *)":selinux_contexts_path")) SWIG_fail;
+   result = (char *)selinux_contexts_path();
+-  resultobj = SWIG_FromCharPtr(result);
++  resultobj = SWIG_FromCharPtr((const char *)result);
+   return resultobj;
+ fail:
+   return NULL;
+@@ -3993,7 +4000,7 @@
+   
+   if (!PyArg_ParseTuple(args,(char *)":selinux_booleans_path")) SWIG_fail;
+   result = (char *)selinux_booleans_path();
+-  resultobj = SWIG_FromCharPtr(result);
++  resultobj = SWIG_FromCharPtr((const char *)result);
+   return resultobj;
+ fail:
+   return NULL;
+@@ -4006,7 +4013,7 @@
+   
+   if (!PyArg_ParseTuple(args,(char *)":selinux_customizable_types_path")) SWIG_fail;
+   result = (char *)selinux_customizable_types_path();
+-  resultobj = SWIG_FromCharPtr(result);
++  resultobj = SWIG_FromCharPtr((const char *)result);
+   return resultobj;
+ fail:
+   return NULL;
+@@ -4019,7 +4026,7 @@
+   
+   if (!PyArg_ParseTuple(args,(char *)":selinux_users_path")) SWIG_fail;
+   result = (char *)selinux_users_path();
+-  resultobj = SWIG_FromCharPtr(result);
++  resultobj = SWIG_FromCharPtr((const char *)result);
+   return resultobj;
+ fail:
+   return NULL;
+@@ -4032,7 +4039,7 @@
+   
+   if (!PyArg_ParseTuple(args,(char *)":selinux_usersconf_path")) SWIG_fail;
+   result = (char *)selinux_usersconf_path();
+-  resultobj = SWIG_FromCharPtr(result);
++  resultobj = SWIG_FromCharPtr((const char *)result);
+   return resultobj;
+ fail:
+   return NULL;
+@@ -4045,7 +4052,7 @@
+   
+   if (!PyArg_ParseTuple(args,(char *)":selinux_translations_path")) SWIG_fail;
+   result = (char *)selinux_translations_path();
+-  resultobj = SWIG_FromCharPtr(result);
++  resultobj = SWIG_FromCharPtr((const char *)result);
+   return resultobj;
+ fail:
+   return NULL;
+@@ -4058,7 +4065,7 @@
+   
+   if (!PyArg_ParseTuple(args,(char *)":selinux_netfilter_context_path")) SWIG_fail;
+   result = (char *)selinux_netfilter_context_path();
+-  resultobj = SWIG_FromCharPtr(result);
++  resultobj = SWIG_FromCharPtr((const char *)result);
+   return resultobj;
+ fail:
+   return NULL;
+@@ -4071,7 +4078,7 @@
+   
+   if (!PyArg_ParseTuple(args,(char *)":selinux_path")) SWIG_fail;
+   result = (char *)selinux_path();
+-  resultobj = SWIG_FromCharPtr(result);
++  resultobj = SWIG_FromCharPtr((const char *)result);
+   return resultobj;
+ fail:
+   return NULL;
+@@ -4138,18 +4145,14 @@
+   PyObject *resultobj = 0;
+   unsigned int arg1 ;
+   char *arg2 = (char *) 0 ;
+-  char **arg3 ;
+-  char **arg4 ;
++  char **arg3 = (char **) 0 ;
++  char **arg4 = (char **) 0 ;
+   int result;
+   unsigned int val1 ;
+   int ecode1 = 0 ;
+   int res2 ;
+   char *buf2 = 0 ;
+   int alloc2 = 0 ;
+-  void *argp3 = 0 ;
+-  int res3 = 0 ;
+-  void *argp4 = 0 ;
+-  int res4 = 0 ;
+   PyObject * obj0 = 0 ;
+   PyObject * obj1 = 0 ;
+   PyObject * obj2 = 0 ;
+@@ -4165,18 +4168,52 @@
+   if (!SWIG_IsOK(res2)) {
+     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "rpm_execcon" "', argument " "2"" of type '" "char const *""'");
+   }
+-  arg2 = buf2;
+-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_p_char, 0 |  0 );
+-  if (!SWIG_IsOK(res3)) {
+-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "rpm_execcon" "', argument " "3"" of type '" "char *const []""'"); 
+-  } 
+-  arg3 = (char **)(argp3);
+-  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_p_char, 0 |  0 );
+-  if (!SWIG_IsOK(res4)) {
+-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "rpm_execcon" "', argument " "4"" of type '" "char *const []""'"); 
+-  } 
+-  arg4 = (char **)(argp4);
+-  result = (int)rpm_execcon(arg1,(char const *)arg2,(char *const (*))arg3,(char *const (*))arg4);
++  arg2 = (char *)(buf2);
++  {
++    /* Check if is a list */
++    if (PyList_Check(obj2)) {
++      int size = PyList_Size(obj2);
++      int i = 0;
++      arg3 = (char **) malloc((size+1)*sizeof(char *));
++      for (i = 0; i < size; i++) {
++        PyObject *o = PyList_GetItem(obj2,i);
++        if (PyString_Check(o))
++        arg3[i] = PyString_AsString(PyList_GetItem(obj2,i));
++        else {
++          PyErr_SetString(PyExc_TypeError,"list must contain strings");
++          free(arg3);
++          return NULL;
++        }
++      }
++      arg3[i] = 0;
++    } else {
++      PyErr_SetString(PyExc_TypeError,"not a list");
++      return NULL;
++    }
++  }
++  {
++    /* Check if is a list */
++    if (PyList_Check(obj3)) {
++      int size = PyList_Size(obj3);
++      int i = 0;
++      arg4 = (char **) malloc((size+1)*sizeof(char *));
++      for (i = 0; i < size; i++) {
++        PyObject *o = PyList_GetItem(obj3,i);
++        if (PyString_Check(o))
++        arg4[i] = PyString_AsString(PyList_GetItem(obj3,i));
++        else {
++          PyErr_SetString(PyExc_TypeError,"list must contain strings");
++          free(arg4);
++          return NULL;
++        }
++      }
++      arg4[i] = 0;
++    } else {
++      PyErr_SetString(PyExc_TypeError,"not a list");
++      return NULL;
++    }
++  }
++  result = (int)rpm_execcon(arg1,(char const *)arg2,arg3,arg4);
+   resultobj = SWIG_From_int((int)(result));
+   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+   return resultobj;
+@@ -4224,7 +4261,7 @@
+   if (!SWIG_IsOK(res1)) {
+     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "selinux_trans_to_raw_context" "', argument " "1"" of type '" "char *""'");
+   }
+-  arg1 = buf1;
++  arg1 = (char *)(buf1);
+   result = (int)selinux_trans_to_raw_context(arg1,arg2);
+   resultobj = SWIG_From_int((int)(result));
+   {
+@@ -4262,7 +4299,7 @@
+   if (!SWIG_IsOK(res1)) {
+     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "selinux_raw_to_trans_context" "', argument " "1"" of type '" "char *""'");
+   }
+-  arg1 = buf1;
++  arg1 = (char *)(buf1);
+   result = (int)selinux_raw_to_trans_context(arg1,arg2);
+   resultobj = SWIG_From_int((int)(result));
+   {
+@@ -4325,7 +4362,7 @@
+   if (!SWIG_IsOK(res1)) {
+     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "getseuserbyname" "', argument " "1"" of type '" "char const *""'");
+   }
+-  arg1 = buf1;
++  arg1 = (char *)(buf1);
+   result = (int)getseuserbyname((char const *)arg1,arg2,arg3);
+   resultobj = SWIG_From_int((int)(result));
+   {
+@@ -4479,7 +4516,7 @@
+  * structures together.
+  *
+  * The generated swig_type_info structures are assigned staticly to an initial 
+- * array. We just loop though that array, and handle each type individually.
++ * array. We just loop through that array, and handle each type individually.
+  * First we lookup if this type has been already loaded, and if so, use the
+  * loaded structure instead of the generated one. Then we have to fill in the
+  * cast linked list. The cast data is initially stored in something like a
+@@ -4517,30 +4554,47 @@
+ #define SWIGRUNTIME_DEBUG
+ #endif
+ 
++
+ SWIGRUNTIME void
+ SWIG_InitializeModule(void *clientdata) {
+   size_t i;
+-  swig_module_info *module_head;
+-  static int init_run = 0;
++  swig_module_info *module_head, *iter;
++  int found;
+   
+   clientdata = clientdata;
+   
+-  if (init_run) return;
+-  init_run = 1;
+-  
+-  /* Initialize the swig_module */
+-  swig_module.type_initial = swig_type_initial;
+-  swig_module.cast_initial = swig_cast_initial;
++  /* check to see if the circular list has been setup, if not, set it up */
++  if (swig_module.next==0) {
++    /* Initialize the swig_module */
++    swig_module.type_initial = swig_type_initial;
++    swig_module.cast_initial = swig_cast_initial;
++    swig_module.next = &swig_module;
++  }
+   
+   /* Try and load any already created modules */
+   module_head = SWIG_GetModule(clientdata);
+-  if (module_head) {
++  if (!module_head) {
++    /* This is the first module loaded for this interpreter */
++    /* so set the swig module into the interpreter */
++    SWIG_SetModule(clientdata, &swig_module);
++    module_head = &swig_module;
++  } else {
++    /* the interpreter has loaded a SWIG module, but has it loaded this one? */
++    found=0;
++    iter=module_head;
++    do {
++      if (iter==&swig_module) {
++        found=1;
++        break;
++      }
++      iter=iter->next;
++    } while (iter!= module_head);
++    
++    /* if the is found in the list, then all is done and we may leave */
++    if (found) return;
++    /* otherwise we must add out module into the list */
+     swig_module.next = module_head->next;
+     module_head->next = &swig_module;
+-  } else {
+-    /* This is the first module loaded */
+-    swig_module.next = &swig_module;
+-    SWIG_SetModule(clientdata, &swig_module);
+   }
+   
+   /* Now work on filling in swig_module.types */
+@@ -4853,7 +4907,7 @@
+   }
+   
+   SWIGINTERN PyObject *
+-  SWIG_globals() {
++  SWIG_globals(void) {
+     static PyObject *_SWIG_globals = 0; 
+     if (!_SWIG_globals) _SWIG_globals = SWIG_newvarlink();  
+     return _SWIG_globals;
+@@ -4898,11 +4952,11 @@
+     swig_type_info **types_initial) {
+     size_t i;
+     for (i = 0; methods[i].ml_name; ++i) {
+-      char *c = methods[i].ml_doc;
++      const char *c = methods[i].ml_doc;
+       if (c && (c = strstr(c, "swig_ptr: "))) {
+         int j;
+         swig_const_info *ci = 0;
+-        char *name = c + 10;
++        const char *name = c + 10;
+         for (j = 0; const_table[j].type; ++j) {
+           if (strncmp(const_table[j].name, name, 
+               strlen(const_table[j].name)) == 0) {
+--- libselinux-1.33.4/src/selinuxswig.i.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/src/selinuxswig.i	2007-04-05 12:43:33.000000000 -0400
+@@ -115,9 +115,34 @@
+ extern const char *selinux_path(void);
+ extern int selinux_check_passwd_access(access_vector_t requested);
+ extern int checkPasswdAccess(access_vector_t requested);
++
++// This tells SWIG to treat char ** as a special case
++%typemap(in) char ** {
++  /* Check if is a list */
++  if (PyList_Check($input)) {
++    int size = PyList_Size($input);
++    int i = 0;
++    $1 = (char **) malloc((size+1)*sizeof(char *));
++    for (i = 0; i < size; i++) {
++      PyObject *o = PyList_GetItem($input,i);
++      if (PyString_Check(o))
++	$1[i] = PyString_AsString(PyList_GetItem($input,i));
++      else {
++	PyErr_SetString(PyExc_TypeError,"list must contain strings");
++	free($1);
++	return NULL;
++      }
++    }
++    $1[i] = 0;
++  } else {
++    PyErr_SetString(PyExc_TypeError,"not a list");
++    return NULL;
++  }
++}
 +
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/context_new.3 libselinux-1.33.4/man/man3/context_new.3
---- nsalibselinux/man/man3/context_new.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/context_new.3	2007-01-12 10:15:43.000000000 -0500
-@@ -56,3 +56,6 @@
- On success, zero is returned. On failure, -1 is returned and errno is
- set appropriately.
+ extern int rpm_execcon(unsigned int verified, 
+ 		       const char *filename, 
+-		       char *const argv[], char *const envp[]);
++		       char **, char **);
  
-+.SH "SEE ALSO"
-+.BR selinux "(8)"
+ extern int is_context_customizable (security_context_t scontext);
+ 
+--- /dev/null	2007-04-04 16:30:44.927190078 -0400
++++ libselinux-1.33.4/utils/getdefaultcon.c	2007-04-05 12:43:33.000000000 -0400
+@@ -0,0 +1,80 @@
++#include <unistd.h>
++#include <sys/types.h>
++#include <fcntl.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <errno.h>
++#include <string.h>
++#include <ctype.h>
++#include <selinux/selinux.h>
++#include <selinux/get_context_list.h>
++
++void usage(char *name, char *detail, int rc)
++{
++	fprintf(stderr, "usage:  %s [-l level] user fromcon\n", name);
++	if (detail)
++		fprintf(stderr, "%s:  %s\n", name, detail);
++	exit(rc);
++}
++
++int main(int argc, char **argv)
++{
++	security_context_t usercon = NULL, cur_context = NULL;
++	char *user = NULL, *level = NULL, *role=NULL, *seuser=NULL, *dlevel=NULL;
++	int ret, opt;
++
++	while ((opt = getopt(argc, argv, "l:r:")) > 0) {
++		switch (opt) {
++		case 'l':
++			level = strdup(optarg);
++			break;
++		case 'r':
++			role = strdup(optarg);
++			break;
++		default:
++			usage(argv[0], "invalid option", 1);
++		}
++	}
++
++	if (((argc - optind) < 1) || ((argc - optind) > 2))
++		usage(argv[0], "invalid number of arguments", 2);
++
++	/* If selinux isn't available, bail out. */
++	if (!is_selinux_enabled()) {
++		fprintf(stderr,
++			"%s may be used only on a SELinux kernel.\n", argv[0]);
++		return 1;
++	}
++
++	user = argv[optind];
++
++	/* If a context wasn't passed, use the current context. */
++	if (((argc - optind) < 2)) {
++		if (getcon(&cur_context) < 0) {
++			fprintf(stderr, "Couldn't get current context.\n");
++			return 2;
++		}
++	} else
++		cur_context = argv[optind + 1];
 +
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/freecon.3 libselinux-1.33.4/man/man3/freecon.3
---- nsalibselinux/man/man3/freecon.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/freecon.3	2007-01-12 10:51:18.000000000 -0500
++	if (getseuserbyname(user, &seuser, &dlevel)==0) {
++		if (! level) level=dlevel;
++		if (role != NULL && role[0]) 
++			ret=get_default_context_with_rolelevel(seuser, role, level,cur_context,&usercon);
++		else
++			ret=get_default_context_with_level(seuser, level, cur_context,&usercon);
++	}
++	if (ret < 0)
++		perror(argv[0]);
++	else
++		printf("%s: %s from %s %s %s %s -> %s\n", argv[0], user, cur_context, seuser, role, level, usercon);
++
++
++	free(role);
++	free(seuser);
++	if (level != dlevel) free(level);
++	free(dlevel);
++	free(usercon);
++
++	return 0;
++}
+--- libselinux-1.33.4/man/man8/togglesebool.8.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man8/togglesebool.8	2007-04-05 12:43:33.000000000 -0400
 @@ -1,6 +1,6 @@
- .TH "freecon" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
+ .TH "togglesebool" "1" "26 Oct 2004" "sgrubb at redhat.com" "SELinux Command Line documentation"
  .SH "NAME"
--freecon, freeconary \- free memory associated with SE Linux security contexts.
-+freecon, freeconary \- free memory associated with SELinux security contexts.
+-togglesebool \- flip the current value of a boolean
++togglesebool \- flip the current value of a SELinux boolean
  .SH "SYNOPSIS"
- .B #include <selinux/selinux.h>
- .sp
-@@ -14,3 +14,7 @@
+ .B togglesebool boolean...
+ 
+@@ -14,4 +14,4 @@
+ This man page was written by Steve Grubb <sgrubb at redhat.com>
+ 
+ .SH "SEE ALSO"
+-booleans(8), getsebool(8), setsebool(8)
++selinux(8), booleans(8), getsebool(8), setsebool(8)
+--- libselinux-1.33.4/man/man8/getenforce.8.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man8/getenforce.8	2007-04-05 12:43:33.000000000 -0400
+@@ -12,4 +12,4 @@
+ Dan Walsh, <dwalsh at redhat.com>
+ 
+ .SH "SEE ALSO"
+-setenforce(8), selinuxenabled(8)
++selinux(8), setenforce(8), selinuxenabled(8)
+--- libselinux-1.33.4/man/man8/getsebool.8.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man8/getsebool.8	2007-04-05 12:43:33.000000000 -0400
+@@ -26,9 +26,10 @@
+ .B \-a
+ Show all SELinux booleans.
  
- .B freeconary
- frees the memory allocated for a context array.
-+
 +.SH "SEE ALSO"
-+.BR selinux "(8)"
++selinux(8), setsebool(8), booleans(8)
 +
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/getcon.3 libselinux-1.33.4/man/man3/getcon.3
---- nsalibselinux/man/man3/getcon.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/getcon.3	2007-01-12 10:51:12.000000000 -0500
+ .SH AUTHOR	
+ This manual page was written by Dan Walsh <dwalsh at redhat.com>.
+ The program was written by Tresys Technology.
+ 
+-.SH "SEE ALSO"
+-setsebool(8), booleans(8)
+--- libselinux-1.33.4/man/man8/setenforce.8.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man8/setenforce.8	2007-04-05 12:43:33.000000000 -0400
+@@ -17,7 +17,7 @@
+ Dan Walsh, <dwalsh at redhat.com>
+ 
+ .SH "SEE ALSO"
+-getenforce(8), selinuxenabled(8)
++selinux(8), getenforce(8), selinuxenabled(8)
+ 
+ .SH FILES
+ /etc/grub.conf, /etc/selinux/config
+--- libselinux-1.33.4/man/man8/matchpathcon.8.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man8/matchpathcon.8	2007-04-05 12:43:33.000000000 -0400
 @@ -1,6 +1,6 @@
- .TH "getcon" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
+ .TH "matchpathcon" "8" "21 April 2005" "dwalsh at redhat.com" "SE Linux Command Line documentation"
  .SH "NAME"
--getcon, getprevcon, getpidcon \- get SE Linux security context of a process.
-+getcon, getprevcon, getpidcon \- get SELinux security context of a process.
- .br
- getpeercon - get security context of a peer socket.
- .br
-@@ -59,4 +59,4 @@
- On error -1 is returned.  On success 0 is returned.
+-matchpathcon \- get the default security context for the specified path from the file contexts configuration.
++matchpathcon \- get the default SELinux security context for the specified path from the file contexts configuration.
+ 
+ .SH "SYNOPSIS"
+ .B matchpathcon [-V] [-N] [-n] [-f file_contexts_file ] [-p prefix ] filepath...
+@@ -27,4 +27,5 @@
+ This manual page was written by Dan Walsh <dwalsh at redhat.com>.
  
  .SH "SEE ALSO"
--.BR freecon "(3), " setexeccon "(3)"
-+.BR selinux "(8), " freecon "(3), " setexeccon "(3)"
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/getexeccon.3 libselinux-1.33.4/man/man3/getexeccon.3
---- nsalibselinux/man/man3/getexeccon.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/getexeccon.3	2007-01-12 10:51:04.000000000 -0500
++.BR selinux "(8), "
+ .BR mathpathcon "(3), " 
+--- libselinux-1.33.4/man/man8/selinuxenabled.8.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man8/selinuxenabled.8	2007-04-05 12:43:33.000000000 -0400
+@@ -13,4 +13,4 @@
+ Dan Walsh, <dwalsh at redhat.com>
+ 
+ .SH "SEE ALSO"
+-setenforce(8), getenforce(8)
++selinux(8), setenforce(8), getenforce(8)
+--- libselinux-1.33.4/man/man8/avcstat.8.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man8/avcstat.8	2007-04-05 12:43:33.000000000 -0400
+@@ -22,6 +22,9 @@
+ .B \-f
+ Specifies the location of the AVC statistics file, defaulting to '/selinux/avc/cache_stats'.
+ 
++.SH "SEE ALSO"
++selinux(8)
++
+ .SH AUTHOR	
+ This manual page was written by Dan Walsh <dwalsh at redhat.com>.
+ The program was written by James Morris <jmorris at redhat.com>.
+--- libselinux-1.33.4/man/man3/getexeccon.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/getexeccon.3	2007-04-05 12:43:33.000000000 -0400
 @@ -1,6 +1,6 @@
  .TH "getexeccon" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
  .SH "NAME"
@@ -140,9 +824,8 @@
 +.BR selinux "(8), " freecon "(3), " getcon "(3)"
  
  
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/getfilecon.3 libselinux-1.33.4/man/man3/getfilecon.3
---- nsalibselinux/man/man3/getfilecon.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/getfilecon.3	2007-01-12 10:50:59.000000000 -0500
+--- libselinux-1.33.4/man/man3/getfilecon.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/getfilecon.3	2007-04-05 12:43:33.000000000 -0400
 @@ -1,6 +1,6 @@
  .TH "getfilecon" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
  .SH "NAME"
@@ -157,90 +840,114 @@
  .SH "SEE ALSO"
 -.BR freecon "(3), " setfilecon "(3), " setfscreatecon "(3)"
 +.BR selinux "(8), " freecon "(3), " setfilecon "(3), " setfscreatecon "(3)"
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/getfscreatecon.3 libselinux-1.33.4/man/man3/getfscreatecon.3
---- nsalibselinux/man/man3/getfscreatecon.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/getfscreatecon.3	2007-01-12 10:50:55.000000000 -0500
+--- libselinux-1.33.4/man/man3/selinux_check_securetty_context.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/selinux_check_securetty_context.3	2007-04-05 12:43:33.000000000 -0400
 @@ -1,6 +1,6 @@
- .TH "getfscreatecon" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
+ .TH "selinux_check_securetty_context" "3" "1 January 2007" "dwalsh at redhat.com" "SE Linux API documentation"
  .SH "NAME"
--getfscreatecon, setfscreatecon \- get or set the SE Linux security context used for creating a new file system object.
-+getfscreatecon, setfscreatecon \- get or set the SELinux security context used for creating a new file system object.
- 
+-selinux_check_securetty_context \- check whether a tty security context is defined as a securetty context
++selinux_check_securetty_context \- check whether a SELinux tty security context is defined as a securetty context
  .SH "SYNOPSIS"
  .B #include <selinux/selinux.h>
-@@ -35,4 +35,4 @@
- On success 0 is returned.
+ .sp
+@@ -10,3 +10,7 @@
+ .B selinux_check_securetty_context
+ returns 0 if tty_context is a securetty context
+ returns < 0 otherwise. 
++
++.SH "SEE ALSO"
++.BR selinux "(8)"
++
+--- libselinux-1.33.4/man/man3/selinux_binary_policy_path.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/selinux_binary_policy_path.3	2007-04-05 12:43:33.000000000 -0400
+@@ -4,7 +4,7 @@
+ selinux_failsafe_context_path, selinux_removable_context_path,
+ selinux_default_context_path, selinux_user_contexts_path,
+ selinux_file_context_path, selinux_media_context_path,
+-selinux_contexts_path, selinux_booleans_path \- These functions return the paths to the active policy configuration
++selinux_contexts_path, selinux_booleans_path \- These functions return the paths to the active SELinux policy configuration
+ directories and files.
  
- .SH "SEE ALSO"
--.BR freecon "(3), " getcon "(3), " getexeccon "(3)"
-+.BR selinux "(8), " freecon "(3), " getcon "(3), " getexeccon "(3)"
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/get_ordered_context_list.3 libselinux-1.33.4/man/man3/get_ordered_context_list.3
---- nsalibselinux/man/man3/get_ordered_context_list.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/get_ordered_context_list.3	2007-01-12 10:50:48.000000000 -0500
+ .SH "SYNOPSIS"
+@@ -65,3 +65,6 @@
+ .SH AUTHOR	
+ This manual page was written by Dan Walsh <dwalsh at redhat.com>.
+ 
++.SH "SEE ALSO"
++.BR selinux "(8)"
++
+--- libselinux-1.33.4/man/man3/getfscreatecon.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/getfscreatecon.3	2007-04-05 12:43:33.000000000 -0400
 @@ -1,6 +1,6 @@
- .TH "get_ordered_context_list" "3" "1 January 2004" "russell at coker.com.au" "SE Linux"
+ .TH "getfscreatecon" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
  .SH "NAME"
--get_ordered_context_list, get_ordered_context_list_with_level, get_default_context, get_default_context_with_level, get_default_context_with_role, get_default_context_with_rolelevel, query_user_context, manual_user_enter_context, get_default_role \- determine context(s) for user sessions
-+get_ordered_context_list, get_ordered_context_list_with_level, get_default_context, get_default_context_with_level, get_default_context_with_role, get_default_context_with_rolelevel, query_user_context, manual_user_enter_context, get_default_role \- determine SELinux context(s) for user sessions
+-getfscreatecon, setfscreatecon \- get or set the SE Linux security context used for creating a new file system object.
++getfscreatecon, setfscreatecon \- get or set the SELinux security context used for creating a new file system object.
  
  .SH "SYNOPSIS"
  .B #include <selinux/selinux.h>
-@@ -77,4 +77,4 @@
- The other functions return 0 for success or -1 for errors.
+@@ -35,4 +35,4 @@
+ On success 0 is returned.
  
  .SH "SEE ALSO"
--.BR freeconary "(3), " freecon "(3), " security_compute_av "(3)", getseuserbyname"(3)"
-+.BR selinux "(8), " freeconary "(3), " freecon "(3), " security_compute_av "(3)", getseuserbyname"(3)"
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/getseuserbyname.3 libselinux-1.33.4/man/man3/getseuserbyname.3
---- nsalibselinux/man/man3/getseuserbyname.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/getseuserbyname.3	2007-01-12 10:13:47.000000000 -0500
-@@ -23,3 +23,6 @@
- The errors documented for the stat(2) system call are also applicable
- here.
+-.BR freecon "(3), " getcon "(3), " getexeccon "(3)"
++.BR selinux "(8), " freecon "(3), " getcon "(3), " getexeccon "(3)"
+--- libselinux-1.33.4/man/man3/freecon.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/freecon.3	2007-04-05 12:43:33.000000000 -0400
+@@ -1,6 +1,6 @@
+ .TH "freecon" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
+ .SH "NAME"
+-freecon, freeconary \- free memory associated with SE Linux security contexts.
++freecon, freeconary \- free memory associated with SELinux security contexts.
+ .SH "SYNOPSIS"
+ .B #include <selinux/selinux.h>
+ .sp
+@@ -14,3 +14,7 @@
  
+ .B freeconary
+ frees the memory allocated for a context array.
++
 +.SH "SEE ALSO"
 +.BR selinux "(8)"
 +
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/is_context_customizable.3 libselinux-1.33.4/man/man3/is_context_customizable.3
---- nsalibselinux/man/man3/is_context_customizable.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/is_context_customizable.3	2007-01-12 10:50:33.000000000 -0500
+--- libselinux-1.33.4/man/man3/security_getenforce.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/security_getenforce.3	2007-04-05 12:43:33.000000000 -0400
 @@ -1,6 +1,6 @@
- .TH "is_context_customizable" "3" "10 January 2005" "dwalsh at redhat.com" "SELinux API documentation"
+ .TH "security_getenforce" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
  .SH "NAME"
--is_context_customizable \- check whether context type is customizable by the administrator.
-+is_context_customizable \- check whether SELinux context type is customizable by the administrator.
+-security_getenforce, security_setenforce \- get or set the enforcing state of SE Linux
++security_getenforce, security_setenforce \- get or set the enforcing state of SELinux
  .SH "SYNOPSIS"
  .B #include <selinux/selinux.h>
  .sp
-@@ -20,3 +20,6 @@
- .SH "FILE"
- /etc/selinux/SELINUXTYPE/context/customizable_types
- 
+@@ -17,3 +17,7 @@
+ sets SE Linux to enforcing mode if the value 1 is passed in, and sets it to
+ permissive mode if 0 is passed in.  On success 0 is returned, on error -1 is
+ returned.
++
 +.SH "SEE ALSO"
 +.BR selinux "(8)"
 +
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/is_selinux_enabled.3 libselinux-1.33.4/man/man3/is_selinux_enabled.3
---- nsalibselinux/man/man3/is_selinux_enabled.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/is_selinux_enabled.3	2007-01-12 10:50:24.000000000 -0500
+--- libselinux-1.33.4/man/man3/selinux_getenforcemode.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/selinux_getenforcemode.3	2007-04-05 12:43:33.000000000 -0400
 @@ -1,6 +1,6 @@
- .TH "is_selinux_enabled" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
+ .TH "selinux_getenforcemode" "3" "25 May 2004" "dwalsh at redhat.com" "SE Linux API documentation"
  .SH "NAME"
--is_selinux_enabled \- check whether SE Linux is enabled
-+is_selinux_enabled \- check whether SELinux is enabled
+-selinux_getenforcemode \- get the enforcing state of SE Linux
++selinux_getenforcemode \- get the enforcing state of SELinux
  .SH "SYNOPSIS"
  .B #include <selinux/selinux.h>
  .sp
-@@ -9,3 +9,7 @@
- .SH "DESCRIPTION"
- .B is_selinux_enabled
- returns 1 if SE Linux is running or 0 if it is not.  May change soon.
-+
+@@ -19,4 +19,7 @@
+ On success, zero is returned.
+ On failure, -1 is returned.
+ 
 +.SH "SEE ALSO"
 +.BR selinux "(8)"
 +
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/matchmediacon.3 libselinux-1.33.4/man/man3/matchmediacon.3
---- nsalibselinux/man/man3/matchmediacon.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/matchmediacon.3	2007-01-12 10:50:18.000000000 -0500
+ 
+--- libselinux-1.33.4/man/man3/matchmediacon.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/matchmediacon.3	2007-04-05 12:43:33.000000000 -0400
 @@ -1,6 +1,6 @@
  .TH "matchmediacon" "3" "15 November 2004" "dwalsh at redhat.com" "SE Linux API documentation"
  .SH "NAME"
@@ -255,45 +962,52 @@
  .SH "SEE ALSO"
 -.BR freecon "(3)
 +.BR selinux "(8), " freecon "(3)
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/matchpathcon.3 libselinux-1.33.4/man/man3/matchpathcon.3
---- nsalibselinux/man/man3/matchpathcon.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/matchpathcon.3	2007-01-12 10:50:12.000000000 -0500
+--- libselinux-1.33.4/man/man3/getseuserbyname.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/getseuserbyname.3	2007-04-05 12:43:33.000000000 -0400
+@@ -23,3 +23,6 @@
+ The errors documented for the stat(2) system call are also applicable
+ here.
+ 
++.SH "SEE ALSO"
++.BR selinux "(8)"
++
+--- libselinux-1.33.4/man/man3/security_policyvers.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/security_policyvers.3	2007-04-05 12:43:33.000000000 -0400
 @@ -1,6 +1,6 @@
- .TH "matchpathcon" "3" "16 March 2005" "sds at tycho.nsa.gov" "SE Linux API documentation"
+ .TH "security_policyvers" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
  .SH "NAME"
--matchpathcon \- get the default security context for the specified path from the file contexts configuration.
-+matchpathcon \- get the default SELinux security context for the specified path from the file contexts configuration.
- 
+-security_policyvers \- get the version of the SE Linux policy
++security_policyvers \- get the version of the SELinux policy
  .SH "SYNOPSIS"
  .B #include <selinux/selinux.h>
-@@ -117,4 +117,4 @@
- Returns 0 on success or -1 otherwise.
- 
- .SH "SEE ALSO"
--.BR freecon "(3), " setfilecon "(3), " setfscreatecon "(3)"
-+.BR selinux "(8), " freecon "(3), " setfilecon "(3), " setfscreatecon "(3)"
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/security_check_context.3 libselinux-1.33.4/man/man3/security_check_context.3
---- nsalibselinux/man/man3/security_check_context.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/security_check_context.3	2007-01-12 10:50:01.000000000 -0500
+ .sp
+@@ -10,3 +10,7 @@
+ .B security_policyvers
+ returns the version of the policy (a positive integer) on success, or -1 on
+ error.
++
++.SH "SEE ALSO"
++.BR selinux "(8)"
++
+--- libselinux-1.33.4/man/man3/is_context_customizable.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/is_context_customizable.3	2007-04-05 12:43:33.000000000 -0400
 @@ -1,6 +1,6 @@
- .TH "security_check_context" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
+ .TH "is_context_customizable" "3" "10 January 2005" "dwalsh at redhat.com" "SELinux API documentation"
  .SH "NAME"
--security_check_context \- check the validity of a context
-+security_check_context \- check the validity of a SELinux context
+-is_context_customizable \- check whether context type is customizable by the administrator.
++is_context_customizable \- check whether SELinux context type is customizable by the administrator.
  .SH "SYNOPSIS"
  .B #include <selinux/selinux.h>
  .sp
-@@ -10,3 +10,7 @@
- .B security_check_context
- returns 0 if SE Linux is running and the context is valid, otherwise it
- returns -1.
-+
+@@ -20,3 +20,6 @@
+ .SH "FILE"
+ /etc/selinux/SELINUXTYPE/context/customizable_types
+ 
 +.SH "SEE ALSO"
 +.BR selinux "(8)"
 +
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/security_compute_av.3 libselinux-1.33.4/man/man3/security_compute_av.3
---- nsalibselinux/man/man3/security_compute_av.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/security_compute_av.3	2007-01-12 10:49:51.000000000 -0500
+--- libselinux-1.33.4/man/man3/security_compute_av.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/security_compute_av.3	2007-04-05 12:43:33.000000000 -0400
 @@ -1,7 +1,7 @@
  .TH "security_compute_av" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
  .SH "NAME"
@@ -309,132 +1023,206 @@
  .SH "SEE ALSO"
 -.BR getcon "(3), " getfilecon "(3), " get_ordered_context_list "(3)"
 +.BR selinux "(8), " getcon "(3), " getfilecon "(3), " get_ordered_context_list "(3)"
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/security_getenforce.3 libselinux-1.33.4/man/man3/security_getenforce.3
---- nsalibselinux/man/man3/security_getenforce.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/security_getenforce.3	2007-01-12 10:49:38.000000000 -0500
+--- libselinux-1.33.4/man/man3/setfilecon.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/setfilecon.3	2007-04-05 12:43:33.000000000 -0400
 @@ -1,6 +1,6 @@
- .TH "security_getenforce" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
+ .TH "setfilecon" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
  .SH "NAME"
--security_getenforce, security_setenforce \- get or set the enforcing state of SE Linux
-+security_getenforce, security_setenforce \- get or set the enforcing state of SELinux
+-setfilecon, fsetfilecon, lsetfilecon \- set SE Linux security context of a file
++setfilecon, fsetfilecon, lsetfilecon \- set SELinux security context of a file
+ 
  .SH "SYNOPSIS"
  .B #include <selinux/selinux.h>
- .sp
-@@ -17,3 +17,7 @@
- sets SE Linux to enforcing mode if the value 1 is passed in, and sets it to
- permissive mode if 0 is passed in.  On success 0 is returned, on error -1 is
- returned.
-+
-+.SH "SEE ALSO"
-+.BR selinux "(8)"
+@@ -38,4 +38,4 @@
+ here.
+ 
+ .SH "SEE ALSO"
+-.BR freecon "(3), " getfilecon "(3), " setfscreatecon "(3)"
++.BR selinux "(3), " freecon "(3), " getfilecon "(3), " setfscreatecon "(3)"
+--- libselinux-1.33.4/man/man3/matchpathcon.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/matchpathcon.3	2007-04-05 12:43:33.000000000 -0400
+@@ -1,6 +1,6 @@
+ .TH "matchpathcon" "3" "16 March 2005" "sds at tycho.nsa.gov" "SE Linux API documentation"
+ .SH "NAME"
+-matchpathcon \- get the default security context for the specified path from the file contexts configuration.
++matchpathcon \- get the default SELinux security context for the specified path from the file contexts configuration.
+ 
+ .SH "SYNOPSIS"
+ .B #include <selinux/selinux.h>
+@@ -117,4 +117,4 @@
+ Returns 0 on success or -1 otherwise.
+ 
+ .SH "SEE ALSO"
+-.BR freecon "(3), " setfilecon "(3), " setfscreatecon "(3)"
++.BR selinux "(8), " freecon "(3), " setfilecon "(3), " setfscreatecon "(3)"
+--- libselinux-1.33.4/man/man3/avc_init.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/avc_init.3	2007-04-05 12:43:33.000000000 -0400
+@@ -3,7 +3,7 @@
+ .\" Author: Eamon Walsh (ewalsh at epoch.ncsc.mil) 2004
+ .TH "avc_init" "3" "27 May 2004" "" "SE Linux API documentation"
+ .SH "NAME"
+-avc_init, avc_destroy, avc_reset, avc_cleanup \- userspace AVC setup and teardown.
++avc_init, avc_destroy, avc_reset, avc_cleanup \- userspace SELinux AVC setup and teardown.
+ .SH "SYNOPSIS"
+ .B #include <selinux/selinux.h>
+ .br
+@@ -209,3 +209,5 @@
+ .BR avc_cache_stats (3),
+ .BR avc_add_callback (3),
+ .BR security_compute_av (3)
++.BR selinux (8)
 +
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/security_load_booleans.3 libselinux-1.33.4/man/man3/security_load_booleans.3
---- nsalibselinux/man/man3/security_load_booleans.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/security_load_booleans.3	2007-01-12 10:12:30.000000000 -0500
+--- libselinux-1.33.4/man/man3/security_load_booleans.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/security_load_booleans.3	2007-04-05 12:43:33.000000000 -0400
 @@ -56,4 +56,4 @@
  This manual page was written by Dan Walsh <dwalsh at redhat.com>.
  
  .SH "SEE ALSO"
 -getsebool(8), booleans(8), togglesebool(8)
 +selinux(8), getsebool(8), booleans(8), togglesebool(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/security_load_policy.3 libselinux-1.33.4/man/man3/security_load_policy.3
---- nsalibselinux/man/man3/security_load_policy.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/security_load_policy.3	2007-01-12 10:49:30.000000000 -0500
+--- libselinux-1.33.4/man/man3/avc_add_callback.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/avc_add_callback.3	2007-04-05 12:43:33.000000000 -0400
+@@ -3,7 +3,7 @@
+ .\" Author: Eamon Walsh (ewalsh at epoch.ncsc.mil) 2004
+ .TH "avc_add_callback" "3" "9 June 2004" "" "SE Linux API documentation"
+ .SH "NAME"
+-avc_add_callback \- additional event notification for userspace object managers.
++avc_add_callback \- additional event notification for SELinux userspace object managers.
+ .SH "SYNOPSIS"
+ .B #include <selinux/selinux.h>
+ .br
+@@ -181,3 +181,4 @@
+ .BR avc_context_to_sid (3),
+ .BR avc_cache_stats (3),
+ .BR security_compute_av (3)
++.BR selinux (8)
+--- libselinux-1.33.4/man/man3/security_check_context.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/security_check_context.3	2007-04-05 12:43:33.000000000 -0400
 @@ -1,6 +1,6 @@
- .TH "security_load_policy" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
+ .TH "security_check_context" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
  .SH "NAME"
--security_load_policy \- load a new policy
-+security_load_policy \- load a new SELinux policy
+-security_check_context \- check the validity of a context
++security_check_context \- check the validity of a SELinux context
  .SH "SYNOPSIS"
  .B #include <selinux/selinux.h>
  .sp
-@@ -9,3 +9,7 @@
- .SH "DESCRIPTION"
- .B security_load_policy
- loads a new policy, returns 0 for success and -1 for error.
+@@ -10,3 +10,7 @@
+ .B security_check_context
+ returns 0 if SE Linux is running and the context is valid, otherwise it
+ returns -1.
 +
 +.SH "SEE ALSO"
 +.BR selinux "(8)"
 +
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/security_policyvers.3 libselinux-1.33.4/man/man3/security_policyvers.3
---- nsalibselinux/man/man3/security_policyvers.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/security_policyvers.3	2007-01-12 10:49:22.000000000 -0500
+--- libselinux-1.33.4/man/man3/security_load_policy.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/security_load_policy.3	2007-04-05 12:43:33.000000000 -0400
 @@ -1,6 +1,6 @@
- .TH "security_policyvers" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
+ .TH "security_load_policy" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
  .SH "NAME"
--security_policyvers \- get the version of the SE Linux policy
-+security_policyvers \- get the version of the SELinux policy
+-security_load_policy \- load a new policy
++security_load_policy \- load a new SELinux policy
  .SH "SYNOPSIS"
  .B #include <selinux/selinux.h>
  .sp
-@@ -10,3 +10,7 @@
- .B security_policyvers
- returns the version of the policy (a positive integer) on success, or -1 on
- error.
+@@ -9,3 +9,7 @@
+ .SH "DESCRIPTION"
+ .B security_load_policy
+ loads a new policy, returns 0 for success and -1 for error.
 +
 +.SH "SEE ALSO"
 +.BR selinux "(8)"
 +
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_binary_policy_path.3 libselinux-1.33.4/man/man3/selinux_binary_policy_path.3
---- nsalibselinux/man/man3/selinux_binary_policy_path.3	2007-01-11 14:01:22.000000000 -0500
-+++ libselinux-1.33.4/man/man3/selinux_binary_policy_path.3	2007-01-12 10:49:16.000000000 -0500
-@@ -4,7 +4,7 @@
- selinux_failsafe_context_path, selinux_removable_context_path,
- selinux_default_context_path, selinux_user_contexts_path,
- selinux_file_context_path, selinux_media_context_path,
--selinux_contexts_path, selinux_booleans_path \- These functions return the paths to the active policy configuration
-+selinux_contexts_path, selinux_booleans_path \- These functions return the paths to the active SELinux policy configuration
- directories and files.
+--- libselinux-1.33.4/man/man3/avc_has_perm.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/avc_has_perm.3	2007-04-05 12:43:33.000000000 -0400
+@@ -152,3 +152,4 @@
+ .BR avc_cache_stats (3),
+ .BR avc_add_callback (3),
+ .BR security_compute_av (3)
++.BR selinux(8)
+--- libselinux-1.33.4/man/man3/get_ordered_context_list.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/get_ordered_context_list.3	2007-04-05 12:43:33.000000000 -0400
+@@ -1,6 +1,6 @@
+ .TH "get_ordered_context_list" "3" "1 January 2004" "russell at coker.com.au" "SE Linux"
+ .SH "NAME"
+-get_ordered_context_list, get_ordered_context_list_with_level, get_default_context, get_default_context_with_level, get_default_context_with_role, get_default_context_with_rolelevel, query_user_context, manual_user_enter_context, get_default_role \- determine context(s) for user sessions
++get_ordered_context_list, get_ordered_context_list_with_level, get_default_context, get_default_context_with_level, get_default_context_with_role, get_default_context_with_rolelevel, query_user_context, manual_user_enter_context, get_default_role \- determine SELinux context(s) for user sessions
  
  .SH "SYNOPSIS"
-@@ -65,3 +65,6 @@
- .SH AUTHOR	
- This manual page was written by Dan Walsh <dwalsh at redhat.com>.
+ .B #include <selinux/selinux.h>
+@@ -77,4 +77,4 @@
+ The other functions return 0 for success or -1 for errors.
  
-+.SH "SEE ALSO"
-+.BR selinux "(8)"
-+
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_check_securetty_context.3 libselinux-1.33.4/man/man3/selinux_check_securetty_context.3
---- nsalibselinux/man/man3/selinux_check_securetty_context.3	2007-01-11 14:01:22.000000000 -0500
-+++ libselinux-1.33.4/man/man3/selinux_check_securetty_context.3	2007-01-12 10:48:56.000000000 -0500
+ .SH "SEE ALSO"
+-.BR freeconary "(3), " freecon "(3), " security_compute_av "(3)", getseuserbyname"(3)"
++.BR selinux "(8), " freeconary "(3), " freecon "(3), " security_compute_av "(3)", getseuserbyname"(3)"
+--- libselinux-1.33.4/man/man3/getcon.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/getcon.3	2007-04-05 12:43:33.000000000 -0400
 @@ -1,6 +1,6 @@
- .TH "selinux_check_securetty_context" "3" "1 January 2007" "dwalsh at redhat.com" "SE Linux API documentation"
+ .TH "getcon" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
  .SH "NAME"
--selinux_check_securetty_context \- check whether a tty security context is defined as a securetty context
-+selinux_check_securetty_context \- check whether a SELinux tty security context is defined as a securetty context
+-getcon, getprevcon, getpidcon \- get SE Linux security context of a process.
++getcon, getprevcon, getpidcon \- get SELinux security context of a process.
+ .br
+ getpeercon - get security context of a peer socket.
+ .br
+@@ -59,4 +59,4 @@
+ On error -1 is returned.  On success 0 is returned.
+ 
+ .SH "SEE ALSO"
+-.BR freecon "(3), " setexeccon "(3)"
++.BR selinux "(8), " freecon "(3), " setexeccon "(3)"
+--- libselinux-1.33.4/man/man3/avc_cache_stats.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/avc_cache_stats.3	2007-04-05 12:43:33.000000000 -0400
+@@ -3,7 +3,7 @@
+ .\" Author: Eamon Walsh (ewalsh at epoch.ncsc.mil) 2004
+ .TH "avc_cache_stats" "3" "27 May 2004" "" "SE Linux API documentation"
+ .SH "NAME"
+-avc_cache_stats, avc_av_stats, avc_sid_stats \- obtain userspace AVC statistics.
++avc_cache_stats, avc_av_stats, avc_sid_stats \- obtain userspace SELinux AVC statistics.
  .SH "SYNOPSIS"
  .B #include <selinux/selinux.h>
- .sp
-@@ -10,3 +10,7 @@
- .B selinux_check_securetty_context
- returns 0 if tty_context is a securetty context
- returns < 0 otherwise. 
-+
-+.SH "SEE ALSO"
-+.BR selinux "(8)"
-+
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_getenforcemode.3 libselinux-1.33.4/man/man3/selinux_getenforcemode.3
---- nsalibselinux/man/man3/selinux_getenforcemode.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/selinux_getenforcemode.3	2007-01-12 10:48:36.000000000 -0500
+ .br
+@@ -96,3 +96,4 @@
+ .BR avc_has_perm (3),
+ .BR avc_context_to_sid (3),
+ .BR avc_add_callback (3)
++.BR selinux (8)
+--- libselinux-1.33.4/man/man3/avc_context_to_sid.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/avc_context_to_sid.3	2007-04-05 12:43:33.000000000 -0400
+@@ -3,7 +3,7 @@
+ .\" Author: Eamon Walsh (ewalsh at epoch.ncsc.mil) 2004
+ .TH "avc_context_to_sid" "3" "27 May 2004" "" "SE Linux API documentation"
+ .SH "NAME"
+-avc_context_to_sid, avc_sid_to_context, sidput, sidget \- obtain and manipulate security ID's.
++avc_context_to_sid, avc_sid_to_context, sidput, sidget \- obtain and manipulate SELinux security ID's.
+ .SH "SYNOPSIS"
+ .B #include <selinux/selinux.h>
+ .br
+@@ -88,3 +88,4 @@
+ .BR avc_add_callback (3),
+ .BR getcon (3),
+ .BR freecon (3)
++.BR selinux (8)
+--- libselinux-1.33.4/man/man3/is_selinux_enabled.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/is_selinux_enabled.3	2007-04-05 12:43:33.000000000 -0400
 @@ -1,6 +1,6 @@
- .TH "selinux_getenforcemode" "3" "25 May 2004" "dwalsh at redhat.com" "SE Linux API documentation"
+ .TH "is_selinux_enabled" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
  .SH "NAME"
--selinux_getenforcemode \- get the enforcing state of SE Linux
-+selinux_getenforcemode \- get the enforcing state of SELinux
+-is_selinux_enabled \- check whether SE Linux is enabled
++is_selinux_enabled \- check whether SELinux is enabled
  .SH "SYNOPSIS"
  .B #include <selinux/selinux.h>
  .sp
-@@ -19,4 +19,7 @@
- On success, zero is returned.
- On failure, -1 is returned.
- 
+@@ -9,3 +9,7 @@
+ .SH "DESCRIPTION"
+ .B is_selinux_enabled
+ returns 1 if SE Linux is running or 0 if it is not.  May change soon.
++
 +.SH "SEE ALSO"
 +.BR selinux "(8)"
 +
- 
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_policy_root.3 libselinux-1.33.4/man/man3/selinux_policy_root.3
---- nsalibselinux/man/man3/selinux_policy_root.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/selinux_policy_root.3	2007-01-12 10:11:54.000000000 -0500
+--- libselinux-1.33.4/man/man3/selinux_policy_root.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/selinux_policy_root.3	2007-04-05 12:43:33.000000000 -0400
 @@ -14,4 +14,7 @@
  On success, returns a directory path containing the SELinux policy files.
  On failure, NULL is returned.
@@ -443,197 +1231,12 @@
 +.BR selinux "(8)"
 +
  
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/setfilecon.3 libselinux-1.33.4/man/man3/setfilecon.3
---- nsalibselinux/man/man3/setfilecon.3	2006-11-16 17:15:30.000000000 -0500
-+++ libselinux-1.33.4/man/man3/setfilecon.3	2007-01-12 10:48:24.000000000 -0500
-@@ -1,6 +1,6 @@
- .TH "setfilecon" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation"
- .SH "NAME"
--setfilecon, fsetfilecon, lsetfilecon \- set SE Linux security context of a file
-+setfilecon, fsetfilecon, lsetfilecon \- set SELinux security context of a file
- 
- .SH "SYNOPSIS"
- .B #include <selinux/selinux.h>
-@@ -38,4 +38,4 @@
- here.
- 
- .SH "SEE ALSO"
--.BR freecon "(3), " getfilecon "(3), " setfscreatecon "(3)"
-+.BR selinux "(3), " freecon "(3), " getfilecon "(3), " setfscreatecon "(3)"
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/avcstat.8 libselinux-1.33.4/man/man8/avcstat.8
---- nsalibselinux/man/man8/avcstat.8	2006-11-16 17:15:26.000000000 -0500
-+++ libselinux-1.33.4/man/man8/avcstat.8	2007-01-12 10:09:24.000000000 -0500
-@@ -22,6 +22,9 @@
- .B \-f
- Specifies the location of the AVC statistics file, defaulting to '/selinux/avc/cache_stats'.
- 
-+.SH "SEE ALSO"
-+selinux(8)
-+
- .SH AUTHOR	
- This manual page was written by Dan Walsh <dwalsh at redhat.com>.
- The program was written by James Morris <jmorris at redhat.com>.
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/getenforce.8 libselinux-1.33.4/man/man8/getenforce.8
---- nsalibselinux/man/man8/getenforce.8	2006-11-16 17:15:26.000000000 -0500
-+++ libselinux-1.33.4/man/man8/getenforce.8	2007-01-12 10:07:11.000000000 -0500
-@@ -12,4 +12,4 @@
- Dan Walsh, <dwalsh at redhat.com>
- 
- .SH "SEE ALSO"
--setenforce(8), selinuxenabled(8)
-+selinux(8), setenforce(8), selinuxenabled(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/getsebool.8 libselinux-1.33.4/man/man8/getsebool.8
---- nsalibselinux/man/man8/getsebool.8	2006-11-16 17:15:26.000000000 -0500
-+++ libselinux-1.33.4/man/man8/getsebool.8	2007-01-12 10:11:15.000000000 -0500
-@@ -26,9 +26,10 @@
- .B \-a
- Show all SELinux booleans.
+--- libselinux-1.33.4/man/man3/context_new.3.rhat	2007-01-11 14:01:24.000000000 -0500
++++ libselinux-1.33.4/man/man3/context_new.3	2007-04-05 12:43:33.000000000 -0400
+@@ -56,3 +56,6 @@
+ On success, zero is returned. On failure, -1 is returned and errno is
+ set appropriately.
  
 +.SH "SEE ALSO"
-+selinux(8), setsebool(8), booleans(8)
-+
- .SH AUTHOR	
- This manual page was written by Dan Walsh <dwalsh at redhat.com>.
- The program was written by Tresys Technology.
- 
--.SH "SEE ALSO"
--setsebool(8), booleans(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/matchpathcon.8 libselinux-1.33.4/man/man8/matchpathcon.8
---- nsalibselinux/man/man8/matchpathcon.8	2006-11-16 17:15:26.000000000 -0500
-+++ libselinux-1.33.4/man/man8/matchpathcon.8	2007-01-12 10:47:15.000000000 -0500
-@@ -1,6 +1,6 @@
- .TH "matchpathcon" "8" "21 April 2005" "dwalsh at redhat.com" "SE Linux Command Line documentation"
- .SH "NAME"
--matchpathcon \- get the default security context for the specified path from the file contexts configuration.
-+matchpathcon \- get the default SELinux security context for the specified path from the file contexts configuration.
- 
- .SH "SYNOPSIS"
- .B matchpathcon [-V] [-N] [-n] [-f file_contexts_file ] [-p prefix ] filepath...
-@@ -27,4 +27,5 @@
- This manual page was written by Dan Walsh <dwalsh at redhat.com>.
- 
- .SH "SEE ALSO"
-+.BR selinux "(8), "
- .BR mathpathcon "(3), " 
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxenabled.8 libselinux-1.33.4/man/man8/selinuxenabled.8
---- nsalibselinux/man/man8/selinuxenabled.8	2006-11-16 17:15:26.000000000 -0500
-+++ libselinux-1.33.4/man/man8/selinuxenabled.8	2007-01-12 10:07:35.000000000 -0500
-@@ -13,4 +13,4 @@
- Dan Walsh, <dwalsh at redhat.com>
- 
- .SH "SEE ALSO"
--setenforce(8), getenforce(8)
-+selinux(8), setenforce(8), getenforce(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/setenforce.8 libselinux-1.33.4/man/man8/setenforce.8
---- nsalibselinux/man/man8/setenforce.8	2006-11-16 17:15:26.000000000 -0500
-+++ libselinux-1.33.4/man/man8/setenforce.8	2007-01-12 10:06:30.000000000 -0500
-@@ -17,7 +17,7 @@
- Dan Walsh, <dwalsh at redhat.com>
- 
- .SH "SEE ALSO"
--getenforce(8), selinuxenabled(8)
-+selinux(8), getenforce(8), selinuxenabled(8)
- 
- .SH FILES
- /etc/grub.conf, /etc/selinux/config
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/togglesebool.8 libselinux-1.33.4/man/man8/togglesebool.8
---- nsalibselinux/man/man8/togglesebool.8	2006-11-16 17:15:26.000000000 -0500
-+++ libselinux-1.33.4/man/man8/togglesebool.8	2007-01-12 10:46:55.000000000 -0500
-@@ -1,6 +1,6 @@
- .TH "togglesebool" "1" "26 Oct 2004" "sgrubb at redhat.com" "SELinux Command Line documentation"
- .SH "NAME"
--togglesebool \- flip the current value of a boolean
-+togglesebool \- flip the current value of a SELinux boolean
- .SH "SYNOPSIS"
- .B togglesebool boolean...
- 
-@@ -14,4 +14,4 @@
- This man page was written by Steve Grubb <sgrubb at redhat.com>
- 
- .SH "SEE ALSO"
--booleans(8), getsebool(8), setsebool(8)
-+selinux(8), booleans(8), getsebool(8), setsebool(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/getdefaultcon.c libselinux-1.33.4/utils/getdefaultcon.c
---- nsalibselinux/utils/getdefaultcon.c	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-1.33.4/utils/getdefaultcon.c	2007-01-12 11:28:22.000000000 -0500
-@@ -0,0 +1,80 @@
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <fcntl.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <errno.h>
-+#include <string.h>
-+#include <ctype.h>
-+#include <selinux/selinux.h>
-+#include <selinux/get_context_list.h>
-+
-+void usage(char *name, char *detail, int rc)
-+{
-+	fprintf(stderr, "usage:  %s [-l level] user fromcon\n", name);
-+	if (detail)
-+		fprintf(stderr, "%s:  %s\n", name, detail);
-+	exit(rc);
-+}
-+
-+int main(int argc, char **argv)
-+{
-+	security_context_t usercon = NULL, cur_context = NULL;
-+	char *user = NULL, *level = NULL, *role=NULL, *seuser=NULL, *dlevel=NULL;
-+	int ret, opt;
-+
-+	while ((opt = getopt(argc, argv, "l:r:")) > 0) {
-+		switch (opt) {
-+		case 'l':
-+			level = strdup(optarg);
-+			break;
-+		case 'r':
-+			role = strdup(optarg);
-+			break;
-+		default:
-+			usage(argv[0], "invalid option", 1);
-+		}
-+	}
-+
-+	if (((argc - optind) < 1) || ((argc - optind) > 2))
-+		usage(argv[0], "invalid number of arguments", 2);
-+
-+	/* If selinux isn't available, bail out. */
-+	if (!is_selinux_enabled()) {
-+		fprintf(stderr,
-+			"%s may be used only on a SELinux kernel.\n", argv[0]);
-+		return 1;
-+	}
-+
-+	user = argv[optind];
-+
-+	/* If a context wasn't passed, use the current context. */
-+	if (((argc - optind) < 2)) {
-+		if (getcon(&cur_context) < 0) {
-+			fprintf(stderr, "Couldn't get current context.\n");
-+			return 2;
-+		}
-+	} else
-+		cur_context = argv[optind + 1];
-+
-+	if (getseuserbyname(user, &seuser, &dlevel)==0) {
-+		if (! level) level=dlevel;
-+		if (role != NULL && role[0]) 
-+			ret=get_default_context_with_rolelevel(seuser, role, level,cur_context,&usercon);
-+		else
-+			ret=get_default_context_with_level(seuser, level, cur_context,&usercon);
-+	}
-+	if (ret < 0)
-+		perror(argv[0]);
-+	else
-+		printf("%s: %s from %s %s %s %s -> %s\n", argv[0], user, cur_context, seuser, role, level, usercon);
-+
-+
-+	free(role);
-+	free(seuser);
-+	if (level != dlevel) free(level);
-+	free(dlevel);
-+	free(usercon);
++.BR selinux "(8)"
 +
-+	return 0;
-+}


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/FC-6/libselinux.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- libselinux.spec	15 Jan 2007 15:34:10 -0000	1.233
+++ libselinux.spec	5 Apr 2007 16:45:45 -0000	1.234
@@ -2,7 +2,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 1.33.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -121,6 +121,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Thu Apr 5 2007 Dan Walsh <dwalsh at redhat.com> - 1.33.4-3
+- Fix rpm_execcon in python
+
 * Fri Jan 12 2007 Dan Walsh <dwalsh at redhat.com> - 1.33.4-2
 - Add reference to selinux man page in all man pages to make apropos work
 Resolves: # 217881



From fedora-cvs-commits at redhat.com  Thu Apr  5 17:00:04 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 13:00:04 -0400
Subject: rpms/perl-LDAP/devel perl-LDAP.spec,1.12,1.13
Message-ID: <200704051700.l35H04UL022073@cvs.devel.redhat.com>

Author: rnorwood

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

Modified Files:
	perl-LDAP.spec 
Log Message:
Filter out provides perl(Net::LDAP::Filter) per package review.


Index: perl-LDAP.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-LDAP/devel/perl-LDAP.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-LDAP.spec	13 Feb 2007 16:27:48 -0000	1.12
+++ perl-LDAP.spec	5 Apr 2007 17:00:02 -0000	1.13
@@ -1,7 +1,7 @@
 Name:           perl-LDAP
 Version:        0.34
-Release: 	1%{?dist}
-Epoch:          1
+Release:        1%{?dist}
+Epoch:          2
 Summary:        LDAP Perl module
 
 Group:          Development/Libraries
@@ -13,8 +13,9 @@
 BuildArch:      noarch
 BuildRequires:  perl(Convert::ASN1)
 BuildRequires:  perl(IO::Socket::SSL)
+Buildrequires:  perl(Test::Harness)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:	perl(IO::Socket::SSL)
+Requires:       perl(IO::Socket::SSL)
 #Wish list
 #Requires:       perl(Authen::SASL)
 
@@ -29,6 +30,16 @@
 chmod -c 644 bin/* contrib/* lib/Net/LDAP/DSML.pm
 %{__perl} -pi -e 's|^#!/usr/local/bin/perl\b|#!%{__perl}|' contrib/*
 
+# Filter unwanted Provides:
+cat << \EOF > %{name}-prov
+#!/bin/sh
+%{__perl_provides} $* |\
+  sed -e '/perl(Net::LDAP::Filter)/d'
+EOF
+
+%define __perl_provides %{_builddir}/perl-ldap-%{version}/%{name}-prov
+chmod +x %{__perl_provides}
+
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null
 make %{?_smp_mflags}
@@ -58,6 +69,10 @@
 
 
 %changelog
+* Thu Apr 05 2007 Robin Norwood <rnorwood at redhat.com> - 1:0.34-2
+- Resolves: bz#226267
+- Filter out provides perl(Net::LDAP::Filter) per package review.
+
 * Tue Feb 13 2007 Robin Norwood <rnorwood at redhat.com> - 1:0.34-1
 - New version: 0.34
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 17:01:00 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 13:01:00 -0400
Subject: rpms/perl-LDAP/devel perl-LDAP.spec,1.13,1.14
Message-ID: <200704051701.l35H109a022662@cvs.devel.redhat.com>

Author: rnorwood

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

Modified Files:
	perl-LDAP.spec 
Log Message:
urk - increment *release* instead of *epoch*.


Index: perl-LDAP.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-LDAP/devel/perl-LDAP.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-LDAP.spec	5 Apr 2007 17:00:02 -0000	1.13
+++ perl-LDAP.spec	5 Apr 2007 17:00:58 -0000	1.14
@@ -1,7 +1,7 @@
 Name:           perl-LDAP
 Version:        0.34
-Release:        1%{?dist}
-Epoch:          2
+Release:        2%{?dist}
+Epoch:          1
 Summary:        LDAP Perl module
 
 Group:          Development/Libraries



From fedora-cvs-commits at redhat.com  Thu Apr  5 17:28:55 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 13:28:55 -0400
Subject: rpms/perl-Net-DNS/devel perl-Net-DNS.spec,1.27,1.28
Message-ID: <200704051728.l35HStfY010702@cvs.devel.redhat.com>

Author: rnorwood

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

Modified Files:
	perl-Net-DNS.spec 
Log Message:
fix issues from package review.


Index: perl-Net-DNS.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-DNS/devel/perl-Net-DNS.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- perl-Net-DNS.spec	28 Sep 2006 01:26:23 -0000	1.27
+++ perl-Net-DNS.spec	5 Apr 2007 17:28:53 -0000	1.28
@@ -1,14 +1,14 @@
 Name: perl-Net-DNS
 Version: 0.59
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: DNS resolver modules for Perl
 License: GPL or Artistic
 Group: Development/Libraries
 URL: http://www.net-dns.org/
 Source0: http://www.cpan.org/authors/id/O/OL/OLAF/Net-DNS-%{version}.tar.gz
-BuildRequires: perl >= 1:5.6.1, perl-Digest-HMAC, perl-Net-IP
+BuildRequires: perl(Digest::HMAC), perl(Net::IP)
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Net::DNS is a collection of Perl modules that act as a Domain Name
@@ -52,6 +52,12 @@
 %exclude %{_mandir}/man3/Net::DNS::Resolver::Win32.3*
 
 %changelog
+* Thu Apr 05 2007 Robin Norwood <rnorwood at redhat.com> - 0.59-2
+- Resolves: bz#226270
+- Fixed issues brought up during package review
+- BuildRequires should not require perl, and fixed the format.
+- Fixed the BuildRoot
+
 * Wed Sep 27 2006 Robin Norwood <rnorwood at redhat.com> - 0.59-1
 - Upgrade to upstream version 0.59 per bug #208315
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 17:46:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 13:46:30 -0400
Subject: rpms/selinux-policy/FC-6 policy-20061106.patch, 1.30,
	1.31 selinux-policy.spec, 1.353, 1.354
Message-ID: <200704051746.l35HkU3g012104@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20061106.patch selinux-policy.spec 
Log Message:
* Thu Apr 5 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-52
- Allow netutils to read sysfs
Resolves: #235357
- Allow samba to work as a PDC
Resolves: #235360
- Allow ypserv to bind to ports 600-1024
Resolves: #235363
- Fix kudzu to be able to telinit
Resolves: #225443


policy-20061106.patch:
 Rules.modular                                |   10 
 config/appconfig-strict-mcs/seusers          |    1 
 config/appconfig-strict-mls/default_contexts |    6 
 config/appconfig-strict-mls/seusers          |    1 
 config/appconfig-strict/seusers              |    1 
 man/man8/kerberos_selinux.8                  |    2 
 policy/flask/access_vectors                  |    2 
 policy/global_tunables                       |   89 ++++
 policy/mls                                   |   31 +
 policy/modules/admin/acct.te                 |    1 
 policy/modules/admin/amanda.if               |   17 
 policy/modules/admin/amanda.te               |    6 
 policy/modules/admin/amtu.fc                 |    3 
 policy/modules/admin/amtu.if                 |   57 ++
 policy/modules/admin/amtu.te                 |   56 ++
 policy/modules/admin/backup.te               |    5 
 policy/modules/admin/bootloader.fc           |    5 
 policy/modules/admin/bootloader.te           |   14 
 policy/modules/admin/consoletype.te          |   21 
 policy/modules/admin/ddcprobe.te             |   10 
 policy/modules/admin/dmesg.te                |    7 
 policy/modules/admin/dmidecode.te            |    5 
 policy/modules/admin/firstboot.if            |    6 
 policy/modules/admin/kudzu.te                |   11 
 policy/modules/admin/logrotate.te            |    5 
 policy/modules/admin/logwatch.te             |    8 
 policy/modules/admin/netutils.te             |   13 
 policy/modules/admin/portage.te              |    5 
 policy/modules/admin/prelink.te              |   18 
 policy/modules/admin/quota.fc                |    7 
 policy/modules/admin/quota.te                |   24 -
 policy/modules/admin/rpm.fc                  |    3 
 policy/modules/admin/rpm.if                  |   43 ++
 policy/modules/admin/rpm.te                  |   49 --
 policy/modules/admin/su.if                   |   28 -
 policy/modules/admin/su.te                   |    2 
 policy/modules/admin/sudo.if                 |   10 
 policy/modules/admin/tripwire.te             |   11 
 policy/modules/admin/usbmodules.te           |    5 
 policy/modules/admin/usermanage.if           |    1 
 policy/modules/admin/usermanage.te           |   42 +
 policy/modules/admin/vpn.te                  |    1 
 policy/modules/apps/ethereal.te              |    5 
 policy/modules/apps/evolution.if             |  107 ++++-
 policy/modules/apps/evolution.te             |    1 
 policy/modules/apps/games.fc                 |    1 
 policy/modules/apps/gnome.fc                 |    2 
 policy/modules/apps/gnome.if                 |  108 +++++
 policy/modules/apps/gnome.te                 |    5 
 policy/modules/apps/gpg.if                   |    1 
 policy/modules/apps/java.fc                  |    2 
 policy/modules/apps/java.if                  |   38 +
 policy/modules/apps/java.te                  |    2 
 policy/modules/apps/loadkeys.if              |   17 
 policy/modules/apps/mozilla.if               |  210 ++++++++-
 policy/modules/apps/mplayer.if               |   84 +++
 policy/modules/apps/mplayer.te               |    1 
 policy/modules/apps/slocate.te               |    3 
 policy/modules/apps/thunderbird.if           |   81 +++
 policy/modules/apps/userhelper.if            |   19 
 policy/modules/apps/webalizer.te             |    6 
 policy/modules/apps/wine.fc                  |    1 
 policy/modules/apps/yam.te                   |    5 
 policy/modules/kernel/corecommands.fc        |   19 
 policy/modules/kernel/corecommands.if        |   77 +++
 policy/modules/kernel/corenetwork.if.in      |  140 ++++++
 policy/modules/kernel/corenetwork.te.in      |   13 
 policy/modules/kernel/devices.fc             |    8 
 policy/modules/kernel/devices.if             |   18 
 policy/modules/kernel/devices.te             |    8 
 policy/modules/kernel/domain.if              |   58 ++
 policy/modules/kernel/domain.te              |   22 +
 policy/modules/kernel/files.fc               |    2 
 policy/modules/kernel/files.if               |  224 ++++++++++
 policy/modules/kernel/filesystem.if          |   62 ++
 policy/modules/kernel/filesystem.te          |   18 
 policy/modules/kernel/kernel.if              |   84 +++
 policy/modules/kernel/kernel.te              |   22 -
 policy/modules/kernel/mls.if                 |   28 +
 policy/modules/kernel/mls.te                 |    6 
 policy/modules/kernel/storage.fc             |    3 
 policy/modules/kernel/storage.if             |    2 
 policy/modules/kernel/terminal.fc            |    1 
 policy/modules/kernel/terminal.if            |    2 
 policy/modules/kernel/terminal.te            |    1 
 policy/modules/services/aide.fc              |    4 
 policy/modules/services/aide.te              |    7 
 policy/modules/services/apache.fc            |   17 
 policy/modules/services/apache.if            |   21 
 policy/modules/services/apache.te            |   40 +
 policy/modules/services/apm.te               |    3 
 policy/modules/services/automount.fc         |    1 
 policy/modules/services/automount.te         |    9 
 policy/modules/services/avahi.if             |   21 
 policy/modules/services/bind.fc              |    1 
 policy/modules/services/bind.te              |    5 
 policy/modules/services/bluetooth.te         |    7 
 policy/modules/services/ccs.fc               |    1 
 policy/modules/services/ccs.te               |   11 
 policy/modules/services/clamav.te            |    2 
 policy/modules/services/cron.fc              |    6 
 policy/modules/services/cron.if              |   92 ++--
 policy/modules/services/cron.te              |   52 ++
 policy/modules/services/cups.fc              |    3 
 policy/modules/services/cups.te              |    9 
 policy/modules/services/cvs.te               |    1 
 policy/modules/services/cyrus.te             |    5 
 policy/modules/services/dbus.fc              |    1 
 policy/modules/services/dbus.if              |   62 ++
 policy/modules/services/dcc.te               |    9 
 policy/modules/services/dhcp.te              |    2 
 policy/modules/services/dovecot.te           |    6 
 policy/modules/services/ftp.te               |   18 
 policy/modules/services/hal.fc               |    4 
 policy/modules/services/hal.if               |   57 ++
 policy/modules/services/hal.te               |   22 -
 policy/modules/services/inetd.te             |   28 +
 policy/modules/services/irqbalance.te        |    4 
 policy/modules/services/kerberos.if          |   25 +
 policy/modules/services/kerberos.te          |   15 
 policy/modules/services/ktalk.fc             |    3 
 policy/modules/services/ktalk.te             |    5 
 policy/modules/services/lpd.if               |   57 +-
 policy/modules/services/lpd.te               |    5 
 policy/modules/services/mta.fc               |    1 
 policy/modules/services/mta.if               |   20 
 policy/modules/services/mta.te               |    2 
 policy/modules/services/munin.te             |    5 
 policy/modules/services/networkmanager.fc    |    2 
 policy/modules/services/networkmanager.te    |    2 
 policy/modules/services/nis.fc               |    3 
 policy/modules/services/nis.if               |    8 
 policy/modules/services/nis.te               |   34 +
 policy/modules/services/nscd.if              |   20 
 policy/modules/services/nscd.te              |   24 -
 policy/modules/services/oav.te               |    5 
 policy/modules/services/oddjob.te            |    3 
 policy/modules/services/openca.if            |    4 
 policy/modules/services/openca.te            |    2 
 policy/modules/services/openvpn.te           |    4 
 policy/modules/services/pcscd.fc             |    9 
 policy/modules/services/pcscd.if             |   62 ++
 policy/modules/services/pcscd.te             |   78 +++
 policy/modules/services/pegasus.if           |   31 +
 policy/modules/services/pegasus.te           |    6 
 policy/modules/services/portmap.te           |    5 
 policy/modules/services/postfix.fc           |    1 
 policy/modules/services/postfix.if           |    3 
 policy/modules/services/postfix.te           |   21 
 policy/modules/services/procmail.te          |   28 +
 policy/modules/services/pyzor.if             |   18 
 policy/modules/services/pyzor.te             |   13 
 policy/modules/services/radius.te            |    1 
 policy/modules/services/radvd.te             |    2 
 policy/modules/services/rhgb.if              |   76 +++
 policy/modules/services/rhgb.te              |    3 
 policy/modules/services/ricci.te             |   21 
 policy/modules/services/rlogin.te            |   10 
 policy/modules/services/rpc.fc               |    1 
 policy/modules/services/rpc.if               |    3 
 policy/modules/services/rpc.te               |   26 -
 policy/modules/services/rsync.te             |    1 
 policy/modules/services/samba.fc             |    5 
 policy/modules/services/samba.if             |   41 +
 policy/modules/services/samba.te             |   48 +-
 policy/modules/services/sasl.te              |   12 
 policy/modules/services/sendmail.if          |   20 
 policy/modules/services/sendmail.te          |    8 
 policy/modules/services/setroubleshoot.if    |   20 
 policy/modules/services/setroubleshoot.te    |    2 
 policy/modules/services/smartmon.te          |    1 
 policy/modules/services/snmp.if              |   17 
 policy/modules/services/snmp.te              |   13 
 policy/modules/services/spamassassin.fc      |    2 
 policy/modules/services/spamassassin.if      |   42 +
 policy/modules/services/spamassassin.te      |   18 
 policy/modules/services/squid.fc             |    2 
 policy/modules/services/squid.if             |   21 
 policy/modules/services/squid.te             |   11 
 policy/modules/services/ssh.if               |   83 +++
 policy/modules/services/ssh.te               |   10 
 policy/modules/services/telnet.te            |    3 
 policy/modules/services/tftp.te              |    2 
 policy/modules/services/uucp.fc              |    1 
 policy/modules/services/uucp.if              |   67 +++
 policy/modules/services/uucp.te              |   44 +-
 policy/modules/services/xserver.fc           |    2 
 policy/modules/services/xserver.if           |  190 ++++++++-
 policy/modules/services/xserver.te           |   12 
 policy/modules/system/authlogin.if           |   76 +++
 policy/modules/system/authlogin.te           |    6 
 policy/modules/system/clock.te               |   13 
 policy/modules/system/fstools.fc             |    1 
 policy/modules/system/fstools.te             |   11 
 policy/modules/system/getty.te               |   14 
 policy/modules/system/hostname.te            |   19 
 policy/modules/system/init.if                |   64 +++
 policy/modules/system/init.te                |   51 ++
 policy/modules/system/ipsec.fc               |    5 
 policy/modules/system/ipsec.if               |   99 ++++
 policy/modules/system/ipsec.te               |  122 +++++
 policy/modules/system/iptables.te            |   22 -
 policy/modules/system/libraries.fc           |   39 +
 policy/modules/system/libraries.te           |   11 
 policy/modules/system/locallogin.if          |   37 +
 policy/modules/system/locallogin.te          |    6 
 policy/modules/system/logging.te             |   22 -
 policy/modules/system/lvm.fc                 |    2 
 policy/modules/system/lvm.if                 |   44 ++
 policy/modules/system/lvm.te                 |   78 +++
 policy/modules/system/miscfiles.fc           |    3 
 policy/modules/system/miscfiles.if           |   79 +++
 policy/modules/system/modutils.te            |   25 -
 policy/modules/system/mount.te               |   27 -
 policy/modules/system/netlabel.te            |    6 
 policy/modules/system/pcmcia.te              |    5 
 policy/modules/system/raid.te                |   15 
 policy/modules/system/selinuxutil.fc         |    2 
 policy/modules/system/selinuxutil.if         |  119 +++++
 policy/modules/system/selinuxutil.te         |  122 ++---
 policy/modules/system/sysnetwork.te          |   10 
 policy/modules/system/tzdata.fc              |    3 
 policy/modules/system/tzdata.if              |   23 +
 policy/modules/system/tzdata.te              |   51 ++
 policy/modules/system/unconfined.fc          |    4 
 policy/modules/system/unconfined.if          |   19 
 policy/modules/system/unconfined.te          |   23 +
 policy/modules/system/userdomain.if          |  569 ++++++++++++++++++++++++---
 policy/modules/system/userdomain.te          |   76 +--
 policy/modules/system/xen.fc                 |    1 
 policy/modules/system/xen.te                 |   46 +-
 231 files changed, 5406 insertions(+), 619 deletions(-)

Index: policy-20061106.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-20061106.patch,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- policy-20061106.patch	28 Mar 2007 13:15:07 -0000	1.30
+++ policy-20061106.patch	5 Apr 2007 17:46:28 -0000	1.31
@@ -59,7 +59,7 @@
  class key
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.4.6/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/global_tunables	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/global_tunables	2007-04-05 09:10:05.000000000 -0400
 @@ -82,6 +82,14 @@
  
  ## <desc>
@@ -75,7 +75,36 @@
  ## Allow gssd to read temp directory.
  ## </p>
  ## </desc>
-@@ -320,6 +328,14 @@
+@@ -154,7 +162,6 @@
+ ## </desc>
+ gen_tunable(allow_smbd_anon_write,false)
+ 
+-
+ ## <desc>
+ ## <p>
+ ## Allow system to run with NIS
+@@ -313,6 +320,20 @@
+ 
+ ## <desc>
+ ## <p>
++## Allow samba to be exported read/write.
++## </p>
++## </desc>
++gen_tunable(samba_export_all_rw,false)
++
++## <desc>
++## <p>
++## Allow samba to be exported read only
++## </p>
++## </desc>
++gen_tunable(samba_export_all_ro,false)
++
++## <desc>
++## <p>
+ ## Allow samba to export NFS volumes.
+ ## </p>
+ ## </desc>
+@@ -320,6 +341,14 @@
  
  ## <desc>
  ## <p>
@@ -90,7 +119,7 @@
  ## Allow squid to connect to all ports, not just
  ## HTTP, FTP, and Gopher ports.
  ## </p>
-@@ -572,8 +588,16 @@
+@@ -572,8 +601,16 @@
  ## </p>
  ## </desc>
  gen_tunable(xdm_sysadm_login,false)
@@ -107,7 +136,7 @@
  ########################################
  #
  # Targeted policy specific
-@@ -589,6 +613,13 @@
+@@ -589,6 +626,13 @@
  
  ## <desc>
  ## <p>
@@ -121,7 +150,7 @@
  ## Allow mount to mount any file
  ## </p>
  ## </desc>
-@@ -596,8 +627,49 @@
+@@ -596,8 +640,49 @@
  
  ## <desc>
  ## <p>
@@ -626,7 +655,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.4.6/policy/modules/admin/kudzu.te
 --- nsaserefpolicy/policy/modules/admin/kudzu.te	2006-11-29 12:04:49.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/kudzu.te	2007-03-23 10:42:17.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/admin/kudzu.te	2007-04-02 13:29:23.000000000 -0400
 @@ -22,7 +22,7 @@
  #
  
@@ -636,17 +665,18 @@
  allow kudzu_t self:process { signal_perms execmem };
  allow kudzu_t self:fifo_file rw_file_perms;
  allow kudzu_t self:unix_stream_socket { connectto create_stream_socket_perms };
-@@ -102,6 +102,9 @@
+@@ -102,6 +102,10 @@
  init_use_fds(kudzu_t)
  init_use_script_ptys(kudzu_t)
  init_stream_connect_script(kudzu_t)
++init_read_init_state(kudzu_t)
 +# kudzu will telinit to make init re-read
 +# the inittab after configuring serial consoles
 +init_telinit(kudzu_t)
  
  libs_use_ld_so(kudzu_t)
  libs_use_shared_libs(kudzu_t)
-@@ -167,3 +170,8 @@
+@@ -167,3 +171,8 @@
  ')
  allow kudzu_t cupsd_rw_etc_t:dir r_dir_perms;
  ')
@@ -709,7 +739,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.4.6/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2006-11-29 12:04:48.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/netutils.te	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/admin/netutils.te	2007-04-05 08:55:52.000000000 -0400
 @@ -22,6 +22,7 @@
  type traceroute_t;
  type traceroute_exec_t;
@@ -718,7 +748,24 @@
  role system_r types traceroute_t;
  
  ########################################
-@@ -229,3 +230,12 @@
+@@ -31,6 +32,7 @@
+ 
+ # Perform network administration operations and have raw access to the network.
+ allow netutils_t self:capability { net_admin net_raw setuid setgid };
++dontaudit netutils_t self:capability sys_tty_config;
+ allow netutils_t self:process { sigkill sigstop signull signal };
+ allow netutils_t self:netlink_route_socket { bind create getattr nlmsg_read nlmsg_write read write };
+ allow netutils_t self:packet_socket create_socket_perms;
+@@ -41,6 +43,8 @@
+ allow netutils_t netutils_tmp_t:file create_file_perms;
+ files_tmp_filetrans(netutils_t, netutils_tmp_t, { file dir })
+ 
++dev_read_sysfs(netutils_t)
++
+ kernel_search_proc(netutils_t)
+ 
+ corenet_non_ipsec_sendrecv(netutils_t)
+@@ -229,3 +233,12 @@
  optional_policy(`
  	nscd_socket_use(traceroute_t)
  ')
@@ -2721,7 +2768,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.if.in serefpolicy-2.4.6/policy/modules/kernel/corenetwork.if.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.if.in	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/kernel/corenetwork.if.in	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/kernel/corenetwork.if.in	2007-04-03 09:36:31.000000000 -0400
 @@ -1292,6 +1292,25 @@
  
  ########################################
@@ -2889,7 +2936,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.4.6/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/kernel/corenetwork.te.in	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/kernel/corenetwork.te.in	2007-04-02 13:29:59.000000000 -0400
 @@ -48,6 +48,11 @@
  type reserved_port_t, port_type, reserved_port_type;
  
@@ -2902,6 +2949,15 @@
  # server_packet_t is the default type of IPv4 and IPv6 server packets.
  #
  type server_packet_t, packet_type, server_packet_type;
+@@ -85,7 +90,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, tcp,8443,s0) #8443 is mod_nss default port
+ network_port(howl, tcp,5335,s0, udp,5353,s0)
+-network_port(hplip, tcp,1782,s0, tcp,2207,s0, tcp,2208,s0, tcp,50000,s0, tcp,50002,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,1782,s0, tcp,2207,s0, tcp,2208,s0, tcp, 8290,s0, tcp,50000,s0, tcp,50002,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)
 @@ -110,7 +115,8 @@
  network_port(netsupport, tcp,5405,s0, udp,5405,s0)
  network_port(nmbd, udp,137,s0, udp,138,s0, udp,139,s0)
@@ -3015,7 +3071,7 @@
  # random_device_t is the type of /dev/random
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-2.4.6/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/kernel/domain.if	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/kernel/domain.if	2007-03-27 15:34:49.000000000 -0400
 @@ -413,6 +413,24 @@
  
  ########################################
@@ -3935,6 +3991,40 @@
  fs_type(devpts_t)
  fs_use_trans devpts gen_context(system_u:object_r:devpts_t,s0);
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aide.fc serefpolicy-2.4.6/policy/modules/services/aide.fc
+--- nsaserefpolicy/policy/modules/services/aide.fc	2006-11-29 12:04:49.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/services/aide.fc	2007-04-02 15:31:12.000000000 -0400
+@@ -1,5 +1,5 @@
+-/usr/sbin/aide		--	gen_context(system_u:object_r:aide_exec_t,mls_systemhigh)
++l/usr/sbin/aide		--	gen_context(system_u:object_r:aide_exec_t,mls_systemhigh)
+ 
+-/var/lib/aide(/.*)		gen_context(system_u:object_r:aide_db_t,mls_systemhigh)
++/var/lib/aide(/.*)?		gen_context(system_u:object_r:aide_db_t,mls_systemhigh)
+ 
+ /var/log/aide.log	--	gen_context(system_u:object_r:aide_log_t,mls_systemhigh)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aide.te serefpolicy-2.4.6/policy/modules/services/aide.te
+--- nsaserefpolicy/policy/modules/services/aide.te	2006-11-29 12:04:49.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/services/aide.te	2007-04-02 15:34:06.000000000 -0400
+@@ -33,13 +33,18 @@
+ allow aide_t aide_db_t:dir rw_dir_perms;
+ allow aide_t aide_db_t:file manage_file_perms;
+ 
++domain_getattr_all_domains(aide_t)
++
+ # logs
+ logging_log_filetrans(aide_t,aide_log_t,file)
+-allow aide_t aide_log_t:file manage_file_perms;
++allow aide_t aide_log_t:file create_file_perms;
+ 
+ files_read_all_files(aide_t)
++files_read_all_symlinks(aide_t)
+ 
+ libs_use_ld_so(aide_t)
+ libs_use_shared_libs(aide_t)
+ 
++locallogin_use_fds(aide_t)
++
+ seutil_use_newrole_fds(aide_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.4.6/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2006-11-29 12:04:49.000000000 -0500
 +++ serefpolicy-2.4.6/policy/modules/services/apache.fc	2007-03-09 13:35:58.000000000 -0500
@@ -4734,7 +4824,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.4.6/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-11-29 12:04:49.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/cups.te	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/services/cups.te	2007-04-03 09:38:06.000000000 -0400
 @@ -118,6 +118,8 @@
  allow cupsd_t cupsd_tmp_t:file create_file_perms;
  allow cupsd_t cupsd_tmp_t:fifo_file create_file_perms;
@@ -4744,7 +4834,13 @@
  
  allow cupsd_t cupsd_var_run_t:file create_file_perms;
  allow cupsd_t cupsd_var_run_t:dir { setattr rw_dir_perms };
-@@ -161,6 +163,7 @@
+@@ -156,11 +158,13 @@
+ corenet_sendrecv_hplip_client_packets(cupsd_t)
+ corenet_sendrecv_ipp_client_packets(cupsd_t)
+ corenet_sendrecv_ipp_server_packets(cupsd_t)
++corenet_tcp_bind_all_rpc_ports(cupsd_t)
+ 
+ dev_rw_printer(cupsd_t)
  dev_read_urand(cupsd_t)
  dev_read_sysfs(cupsd_t)
  dev_read_usbfs(cupsd_t)
@@ -4752,7 +4848,7 @@
  
  domain_read_all_domains_state(cupsd_t)
  
-@@ -180,6 +183,7 @@
+@@ -180,6 +184,7 @@
  
  auth_domtrans_chk_passwd(cupsd_t)
  auth_dontaudit_read_pam_pid(cupsd_t)
@@ -4760,7 +4856,7 @@
  
  # Filter scripts may be shell scripts, and may invoke progs like /bin/mktemp
  corecmd_exec_shell(cupsd_t)
-@@ -232,6 +236,9 @@
+@@ -232,6 +237,9 @@
  
  ifdef(`enable_mls',`
  	lpd_relabel_spool(cupsd_t)
@@ -4770,7 +4866,7 @@
  ')
  
  ifdef(`targeted_policy',`
-@@ -518,6 +525,7 @@
+@@ -518,6 +526,7 @@
  corenet_tcp_connect_ipp_port(cupsd_lpd_t)
  
  dev_read_urand(cupsd_lpd_t)
@@ -4960,8 +5056,16 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.4.6/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2006-11-29 12:04:49.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/dovecot.te	2007-03-12 11:02:18.000000000 -0400
-@@ -94,6 +94,7 @@
++++ serefpolicy-2.4.6/policy/modules/services/dovecot.te	2007-04-03 09:18:35.000000000 -0400
+@@ -46,6 +46,7 @@
+ allow dovecot_t self:tcp_socket create_stream_socket_perms;
+ allow dovecot_t self:unix_dgram_socket create_socket_perms;
+ allow dovecot_t self:unix_stream_socket { create_stream_socket_perms connectto };
++allow dovecot_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ domain_auto_trans(dovecot_t, dovecot_auth_exec_t, dovecot_auth_t)
+ allow dovecot_t dovecot_auth_t:fd use;
+@@ -94,6 +95,7 @@
  
  term_dontaudit_use_console(dovecot_t)
  
@@ -4969,7 +5073,7 @@
  corecmd_exec_bin(dovecot_t)
  
  domain_use_interactive_fds(dovecot_t)
-@@ -149,6 +150,10 @@
+@@ -149,6 +151,10 @@
  	udev_read_db(dovecot_t)
  ')
  
@@ -5416,7 +5520,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.if serefpolicy-2.4.6/policy/modules/services/lpd.if
 --- nsaserefpolicy/policy/modules/services/lpd.if	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/lpd.if	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/services/lpd.if	2007-04-02 16:58:22.000000000 -0400
 @@ -64,33 +64,35 @@
  	allow $1_lpr_t self:udp_socket create_socket_perms;
  	allow $1_lpr_t self:netlink_route_socket r_netlink_socket_perms;
@@ -5478,7 +5582,7 @@
  	dontaudit $1_lpr_t $2:unix_stream_socket { read write };
  
  	# Transition from the user domain to the derived domain.
-@@ -221,10 +223,14 @@
+@@ -221,10 +223,15 @@
  template(`lpr_admin_template',`
  	gen_require(`
  		type $1_lpr_t;
@@ -5489,6 +5593,7 @@
  
 +	# Read and write shared files in the spool directory.
 +	allow $1_lpr_t print_spool_t:file rw_file_perms;
++	mls_file_read_up($1_lpr_t)
 +
  	# Allow per user lpr domain read acces for specific user.
  	tunable_policy(`read_untrusted_content',`
@@ -5653,8 +5758,17 @@
  	allow ypxfr_t $1:process sigchld;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.4.6/policy/modules/services/nis.te
 --- nsaserefpolicy/policy/modules/services/nis.te	2006-11-29 12:04:49.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/nis.te	2007-03-09 13:35:59.000000000 -0500
-@@ -291,6 +291,7 @@
++++ serefpolicy-2.4.6/policy/modules/services/nis.te	2007-04-05 09:25:47.000000000 -0400
+@@ -275,6 +275,8 @@
+ corenet_udp_bind_all_nodes(ypserv_t)
+ corenet_tcp_bind_reserved_port(ypserv_t)
+ corenet_udp_bind_reserved_port(ypserv_t)
++corenet_tcp_bind_all_rpc_ports(ypserv_t)
++corenet_udp_bind_all_rpc_ports(ypserv_t)
+ corenet_dontaudit_tcp_bind_all_reserved_ports(ypserv_t)
+ corenet_dontaudit_udp_bind_all_reserved_ports(ypserv_t)
+ corenet_sendrecv_generic_server_packets(ypserv_t)
+@@ -291,6 +293,7 @@
  domain_use_interactive_fds(ypserv_t)
  
  files_read_var_files(ypserv_t)
@@ -5662,7 +5776,7 @@
  
  init_use_fds(ypserv_t)
  init_use_script_ptys(ypserv_t)
-@@ -329,7 +330,19 @@
+@@ -329,7 +332,19 @@
  # ypxfr local policy
  #
  
@@ -5682,7 +5796,15 @@
  
  corenet_non_ipsec_sendrecv(ypxfr_t)
  corenet_tcp_sendrecv_all_if(ypxfr_t)
-@@ -348,4 +361,21 @@
+@@ -342,10 +357,29 @@
+ corenet_udp_bind_all_nodes(ypxfr_t)
+ corenet_tcp_bind_reserved_port(ypxfr_t)
+ corenet_udp_bind_reserved_port(ypxfr_t)
++corenet_tcp_bind_all_rpc_ports(ypxfr_t)
++corenet_udp_bind_all_rpc_ports(ypxfr_t)
+ corenet_dontaudit_tcp_bind_all_reserved_ports(ypxfr_t)
+ corenet_dontaudit_udp_bind_all_reserved_ports(ypxfr_t)
+ corenet_tcp_connect_all_ports(ypxfr_t)
  corenet_sendrecv_generic_server_packets(ypxfr_t)
  corenet_sendrecv_all_client_packets(ypxfr_t)
  
@@ -5733,8 +5855,14 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-2.4.6/policy/modules/services/nscd.te
 --- nsaserefpolicy/policy/modules/services/nscd.te	2006-11-29 12:04:49.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/nscd.te	2007-03-09 13:35:59.000000000 -0500
-@@ -35,7 +35,6 @@
++++ serefpolicy-2.4.6/policy/modules/services/nscd.te	2007-04-05 09:14:27.000000000 -0400
+@@ -30,12 +30,11 @@
+ 
+ allow nscd_t self:capability { kill setgid setuid audit_write };
+ dontaudit nscd_t self:capability sys_tty_config;
+-allow nscd_t self:process { getattr setsched signal_perms };
++allow nscd_t self:process { getattr setcap setsched signal_perms };
+ allow nscd_t self:fifo_file { read write };
  allow nscd_t self:unix_stream_socket create_stream_socket_perms;
  allow nscd_t self:unix_dgram_socket create_socket_perms;
  allow nscd_t self:netlink_selinux_socket create_socket_perms;
@@ -5783,6 +5911,17 @@
  ')
  
  optional_policy(`
+@@ -138,3 +131,10 @@
+ 	xen_dontaudit_rw_unix_stream_sockets(nscd_t)
+ 	xen_append_log(nscd_t)
+ ')
++
++optional_policy(`
++	tunable_policy(`samba_domain_controller',`
++		samba_append_log(nscd_t)
++		samba_dontaudit_use_fds(nscd_t)
++	')
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oav.te serefpolicy-2.4.6/policy/modules/services/oav.te
 --- nsaserefpolicy/policy/modules/services/oav.te	2006-11-29 12:04:49.000000000 -0500
 +++ serefpolicy-2.4.6/policy/modules/services/oav.te	2007-03-09 13:35:59.000000000 -0500
@@ -6055,7 +6194,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.4.6/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-11-29 12:04:49.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/pegasus.te	2007-03-09 13:35:59.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/services/pegasus.te	2007-04-02 13:48:16.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -6072,6 +6211,14 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
+@@ -122,6 +121,7 @@
+ miscfiles_read_localization(pegasus_t)
+ 
+ sysnet_read_config(pegasus_t)
++sysnet_domtrans_ifconfig(pegasus_t)
+ 
+ userdom_dontaudit_use_unpriv_user_fds(pegasus_t)
+ userdom_dontaudit_search_sysadm_home_dirs(pegasus_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portmap.te serefpolicy-2.4.6/policy/modules/services/portmap.te
 --- nsaserefpolicy/policy/modules/services/portmap.te	2006-11-29 12:04:51.000000000 -0500
 +++ serefpolicy-2.4.6/policy/modules/services/portmap.te	2007-03-09 13:35:59.000000000 -0500
@@ -6097,7 +6244,7 @@
  /usr/libexec/postfix/bounce --	gen_context(system_u:object_r:postfix_bounce_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-2.4.6/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/postfix.if	2007-03-09 13:35:59.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/services/postfix.if	2007-04-03 15:15:04.000000000 -0400
 @@ -48,8 +48,6 @@
  	can_exec(postfix_$1_t, postfix_$1_exec_t)
  
@@ -6107,9 +6254,17 @@
  
  	allow postfix_$1_t postfix_master_t:process sigchld;
  
+@@ -128,6 +126,7 @@
+ 	allow postfix_$1_t postfix_master_t:unix_stream_socket { connectto rw_stream_socket_perms };
+ 	allow postfix_$1_t self:tcp_socket create_socket_perms;
+ 	allow postfix_$1_t self:udp_socket create_socket_perms;
++	allow postfix_$1_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ 	domain_auto_trans(postfix_master_t, postfix_$1_exec_t, postfix_$1_t)
+ 	allow postfix_master_t postfix_$1_t:fd use;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.4.6/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-11-29 12:04:49.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/postfix.te	2007-03-09 13:35:59.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/services/postfix.te	2007-04-02 13:36:02.000000000 -0400
 @@ -171,6 +171,8 @@
  mta_rw_aliases(postfix_master_t)
  mta_read_sendmail_bin(postfix_master_t)
@@ -6156,7 +6311,7 @@
  ########################################
  #
  # Postfix smtpd local policy
-@@ -594,9 +609,11 @@
+@@ -594,9 +609,15 @@
  
  corecmd_exec_bin(postfix_smtpd_t)
  
@@ -6165,6 +6320,10 @@
  files_read_usr_files(postfix_smtpd_t)
  mta_read_aliases(postfix_smtpd_t)
 +files_dontaudit_getattr_boot_dirs(postfix_smtpd_t)
++
++optional_policy(`
++	mailman_read_data_files(postfix_smtpd_t)
++')
  
  optional_policy(`
  	postgrey_stream_connect(postfix_smtpd_t)
@@ -6633,18 +6792,32 @@
  type rsync_data_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-2.4.6/policy/modules/services/samba.fc
 --- nsaserefpolicy/policy/modules/services/samba.fc	2006-11-29 12:04:49.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/samba.fc	2007-03-27 11:21:17.000000000 -0400
-@@ -27,6 +27,7 @@
++++ serefpolicy-2.4.6/policy/modules/services/samba.fc	2007-04-05 09:13:30.000000000 -0400
+@@ -27,16 +27,21 @@
  /var/cache/samba/winbindd_privileged(/.*)? gen_context(system_u:object_r:winbind_var_run_t,s0)
  
  /var/lib/samba(/.*)?			gen_context(system_u:object_r:samba_var_t,s0)
 +/var/lib/samba/winbindd_privileged(/.*)? gen_context(system_u:object_r:winbind_var_run_t,s0)
++
++/var/lib/samba/scripts(/.*)?		gen_context(system_u:object_r:samba_unconfined_script_exec_t,s0)
  
  /var/log/samba(/.*)?			gen_context(system_u:object_r:samba_log_t,s0)
  
+ /var/run/samba/brlock\.tdb	--	gen_context(system_u:object_r:smbd_var_run_t,s0)
+ /var/run/samba/connections\.tdb	--	gen_context(system_u:object_r:smbd_var_run_t,s0)
++/var/run/samba/gencache\.tdb	--	gen_context(system_u:object_r:smbd_var_run_t,s0)
+ /var/run/samba/locking\.tdb 	--	gen_context(system_u:object_r:smbd_var_run_t,s0)
+ /var/run/samba/messages\.tdb	--	gen_context(system_u:object_r:nmbd_var_run_t,s0)
+ /var/run/samba/namelist\.debug	--	gen_context(system_u:object_r:nmbd_var_run_t,s0)
+ /var/run/samba/nmbd\.pid	--	gen_context(system_u:object_r:nmbd_var_run_t,s0)
+ /var/run/samba/sessionid\.tdb	--	gen_context(system_u:object_r:smbd_var_run_t,s0)
++/var/run/samba/share_info\.tdb	--	gen_context(system_u:object_r:smbd_var_run_t,s0)
+ /var/run/samba/smbd\.pid	--	gen_context(system_u:object_r:smbd_var_run_t,s0)
+ /var/run/samba/unexpected\.tdb	--	gen_context(system_u:object_r:nmbd_var_run_t,s0)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.4.6/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/samba.if	2007-03-09 13:35:59.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/services/samba.if	2007-04-05 09:15:12.000000000 -0400
 @@ -140,6 +140,7 @@
  	')
  
@@ -6681,7 +6854,7 @@
 +
 +	logging_search_logs($1)
 +	allow $1 samba_log_t:dir r_dir_perms;
-+	allow $1 samba_log_t:file append;
++	allow $1 samba_log_t:file append_file_perms;
 +')
 +
 +########################################
@@ -6689,14 +6862,58 @@
  ##	Execute samba log in the caller domain.
  ## </summary>
  ## <param name="domain">
+@@ -395,3 +418,21 @@
+ 	allow $1 winbind_var_run_t:sock_file { getattr read write };
+ 	allow $1 winbind_t:unix_stream_socket connectto;
+ ')
++
++########################################
++## <summary>
++##	Do not audit attempts to use file descriptors from samba.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`samba_dontaudit_use_fds',`
++	gen_require(`
++		type smbd_t;
++	')
++
++	dontaudit $1 smbd_t:fd use; 
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.4.6/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/samba.te	2007-03-27 09:53:53.000000000 -0400
-@@ -279,6 +279,11 @@
++++ serefpolicy-2.4.6/policy/modules/services/samba.te	2007-04-05 10:12:51.000000000 -0400
+@@ -10,6 +10,10 @@
+ type nmbd_exec_t;
+ init_daemon_domain(nmbd_t,nmbd_exec_t)
+ 
++type samba_unconfined_script_t;
++domain_type(samba_unconfined_script_t)
++role system_r types samba_unconfined_script_t;
++
+ type nmbd_var_run_t;
+ files_pid_file(nmbd_var_run_t)
+ 
+@@ -235,6 +239,9 @@
+ corenet_tcp_connect_ipp_port(smbd_t)
+ corenet_tcp_connect_smbd_port(smbd_t)
+ 
++corecmd_exec_shell(smbd_t)
++corecmd_exec_bin(smbd_t)
++
+ dev_read_sysfs(smbd_t)
+ dev_read_urand(smbd_t)
+ dev_getattr_mtrr_dev(smbd_t)
+@@ -279,6 +286,12 @@
  userdom_dontaudit_use_unpriv_user_fds(smbd_t)
  userdom_use_unpriv_users_fds(smbd_t)
  
 +tunable_policy(`samba_domain_controller',`
++	usermanage_domtrans_passwd(smbd_t)
 +	usermanage_domtrans_useradd(smbd_t)
 +	usermanage_domtrans_groupadd(smbd_t)
 +')
@@ -6704,7 +6921,7 @@
  ifdef(`hide_broken_symptoms', `
  	files_dontaudit_getattr_default_dirs(smbd_t)
  	files_dontaudit_getattr_boot_dirs(smbd_t)
-@@ -349,7 +354,7 @@
+@@ -349,7 +362,7 @@
  allow nmbd_t samba_etc_t:file { getattr read };
  
  allow nmbd_t samba_log_t:dir { create ra_dir_perms setattr };
@@ -6713,7 +6930,16 @@
  
  allow nmbd_t samba_var_t:dir rw_dir_perms;
  allow nmbd_t samba_var_t:file { lock unlink create write setattr read getattr rename };
-@@ -525,7 +530,7 @@
+@@ -502,7 +515,7 @@
+ userdom_use_sysadm_ttys(smbmount_t)
+ 
+ optional_policy(`
+-	cups_read_rw_config(smbd_t)
++	cups_read_rw_config(smbmount_t)
+ ')
+ 
+ optional_policy(`
+@@ -525,7 +538,7 @@
  allow swat_t self:netlink_audit_socket create;
  allow swat_t self:tcp_socket create_stream_socket_perms;
  allow swat_t self:udp_socket create_socket_perms;
@@ -6722,7 +6948,7 @@
  
  allow swat_t nmbd_exec_t:file { execute read };
  
-@@ -533,7 +538,7 @@
+@@ -533,7 +546,7 @@
  allow swat_t samba_etc_t:file { getattr write read };
  
  allow swat_t samba_log_t:dir search;
@@ -6731,7 +6957,7 @@
  
  allow swat_t smbd_exec_t:file execute ;
  
-@@ -566,9 +571,8 @@
+@@ -566,9 +579,8 @@
  corenet_raw_sendrecv_all_nodes(swat_t)
  corenet_tcp_sendrecv_all_ports(swat_t)
  corenet_udp_sendrecv_all_ports(swat_t)
@@ -6742,7 +6968,7 @@
  
  dev_read_urand(swat_t)
  
-@@ -591,6 +595,7 @@
+@@ -591,6 +603,7 @@
  
  optional_policy(`
  	cups_read_rw_config(swat_t)
@@ -6750,7 +6976,16 @@
  ')
  
  optional_policy(`
-@@ -763,3 +768,10 @@
+@@ -614,6 +627,8 @@
+ # Winbind local policy
+ #
+ 
++
++allow winbind_t self:capability setuid;
+ dontaudit winbind_t self:capability sys_tty_config;
+ allow winbind_t self:process signal_perms;
+ allow winbind_t self:fifo_file { read write };
+@@ -763,3 +778,24 @@
  	squid_read_log(winbind_helper_t)
  	squid_append_log(winbind_helper_t)
  ')
@@ -6761,6 +6996,20 @@
 +	ssh_sigchld(samba_net_t)
 +	ssh_rw_stream_sockets(samba_net_t)
 +')
++
++
++########################################
++#
++# samba_unconfined_script_t local policy
++#
++allow smbd_t samba_unconfined_script_exec_t:dir search_dir_perms;
++allow smbd_t samba_unconfined_script_exec_t:file ioctl;
++
++domain_auto_trans(smbd_t,samba_unconfined_script_exec_t,samba_unconfined_script_t)
++allow samba_unconfined_script_t smbd_t:fd use;
++allow samba_unconfined_script_t smbd_t:fifo_file rw_file_perms;
++allow samba_unconfined_script_t smbd_t:process sigchld;
++unconfined_domain(samba_unconfined_script_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-2.4.6/policy/modules/services/sasl.te
 --- nsaserefpolicy/policy/modules/services/sasl.te	2006-11-29 12:04:49.000000000 -0500
 +++ serefpolicy-2.4.6/policy/modules/services/sasl.te	2007-03-20 11:30:02.000000000 -0400
@@ -7870,7 +8119,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.4.6/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/system/authlogin.if	2007-03-09 13:35:59.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/system/authlogin.if	2007-04-03 09:52:42.000000000 -0400
 @@ -190,6 +190,9 @@
  ## </param>
  #
@@ -8203,7 +8452,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.4.6/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/system/init.if	2007-03-09 13:35:59.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/system/init.if	2007-04-05 10:18:18.000000000 -0400
 @@ -221,11 +221,14 @@
  	gen_require(`
  		type initrc_t;
@@ -8219,7 +8468,15 @@
  	role system_r types $1;
  
  	domain_auto_trans(initrc_t,$2,$1)
-@@ -1311,3 +1314,63 @@
+@@ -518,6 +521,7 @@
+ 
+ 	dev_list_all_dev_nodes($1)
+ 	allow $1 initctl_t:fifo_file rw_file_perms;
++	init_exec($1)
+ ')
+ 
+ ########################################
+@@ -1311,3 +1315,63 @@
  	files_search_pids($1)
  	allow $1 initrc_var_run_t:file create_file_perms;
  ')
@@ -8771,17 +9028,18 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.4.6/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/system/libraries.fc	2007-03-09 13:35:59.000000000 -0500
-@@ -79,6 +79,8 @@
++++ serefpolicy-2.4.6/policy/modules/system/libraries.fc	2007-04-02 13:43:17.000000000 -0400
+@@ -79,6 +79,9 @@
  /opt/netbeans(.*/)?jdk.*/linux/.+\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /opt/(.*/)?java/.+\.jar			--	gen_context(system_u:object_r:shlib_t,s0)
  /opt/(.*/)?jre/.+\.jar			--	gen_context(system_u:object_r:shlib_t,s0)
 +/opt/ibm/java2-ppc64-50/jre/bin/.+\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/opt/cxoffice/lib/wine/.+\.so      -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/opt/f-secure/fspms/libexec/librapi.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  
  ifdef(`distro_gentoo',`
  # despite the extensions, they are actually libs
-@@ -130,7 +132,8 @@
+@@ -130,7 +133,8 @@
  
  /usr/lib/win32/.*			--	gen_context(system_u:object_r:shlib_t,s0)
  
@@ -8791,7 +9049,7 @@
  /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)
  /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -139,17 +142,21 @@
+@@ -139,17 +143,21 @@
  /usr/lib(64)?/libjs\.so.*     		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?(/.*)?/libnvidia.+\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?(/.*)?/nvidia_drv.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -8814,7 +9072,7 @@
  
  /usr/X11R6/lib/libGL\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/X11R6/lib/libXvMCNVIDIA\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -157,6 +164,7 @@
+@@ -157,6 +165,7 @@
  /usr/x11R6/lib/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xorg/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xorg/modules/drivers/fglrx_drv\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -8822,7 +9080,7 @@
  /usr/lib(64)?/xorg/modules/extensions/nvidia(-[^/]*)?/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  
  ifdef(`distro_redhat',`
-@@ -167,19 +175,15 @@
+@@ -167,19 +176,15 @@
  
  # Fedora Core packages: gstreamer-plugins, compat-libstdc++, Glide3, libdv
  # 	HelixPlayer, SDL, xorg-x11, xorg-x11-libs, Hermes, valgrind, openoffice.org-libs, httpd - php
@@ -8846,7 +9104,7 @@
  /usr/lib(64)?/libSDL-.*\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xorg/modules/dri/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/X11R6/lib/modules/dri/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -243,9 +247,13 @@
+@@ -243,9 +248,13 @@
  /usr/lib(64)?/libmp3lame\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
  # Flash plugin, Macromedia
@@ -8860,7 +9118,7 @@
  
  # Jai, Sun Microsystems (Jpackage SPRM)
  /usr/lib(64)?/libmlib_jai\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -258,10 +266,9 @@
+@@ -258,10 +267,9 @@
  /usr/lib(64)?/vmware/(.*/)?VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
  # Java, Sun Microsystems (JPackage SRPM)
@@ -8874,7 +9132,7 @@
  
  /usr/(local/)?Adobe/(.*/)?intellinux/nppdf\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/(local/)?Adobe/(.*/)?intellinux/sidecars/* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -300,3 +307,6 @@
+@@ -300,3 +308,6 @@
  /var/spool/postfix/lib(64)?/lib.*\.so.*	--	gen_context(system_u:object_r:shlib_t,s0)
  /var/spool/postfix/lib(64)?/[^/]*/lib.*\.so.* -- gen_context(system_u:object_r:shlib_t,s0)
  /var/spool/postfix/lib(64)?/devfsd/.+\.so.* --	gen_context(system_u:object_r:shlib_t,s0)
@@ -11259,8 +11517,25 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.4.6/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/system/xen.te	2007-03-20 12:19:22.000000000 -0400
-@@ -86,8 +86,8 @@
++++ serefpolicy-2.4.6/policy/modules/system/xen.te	2007-04-02 17:02:56.000000000 -0400
+@@ -20,12 +20,15 @@
+ type xenctl_t;
+ files_type(xenctl_t)
+ 
+-
+ type xend_t;
+ type xend_exec_t;
+ domain_type(xend_t)
+ init_daemon_domain(xend_t, xend_exec_t)
+ 
++# tmp files
++type xend_tmp_t;
++files_tmp_file(xend_tmp_t)
++
+ # var/lib files
+ type xend_var_lib_t;
+ files_type(xend_var_lib_t)
+@@ -86,8 +89,8 @@
  allow xend_t self:tcp_socket create_stream_socket_perms;
  allow xend_t self:packet_socket create_socket_perms;
  
@@ -11271,7 +11546,18 @@
  allow xend_t xen_image_t:blk_file rw_file_perms;
  
  allow xend_t xenctl_t:fifo_file create_file_perms;
-@@ -143,6 +143,7 @@
+@@ -105,6 +108,10 @@
+ allow xend_t xend_var_log_t:dir { rw_dir_perms setattr };
+ logging_log_filetrans(xend_t,xend_var_log_t,{ sock_file file dir })
+ 
++allow xend_t xend_tmp_t:dir create_dir_perms;
++allow xend_t xend_tmp_t:file create_file_perms;
++files_tmp_filetrans(xend_t, xend_tmp_t, { file dir })
++
+ # var/lib files for xend
+ allow xend_t xend_var_lib_t:file create_file_perms;
+ allow xend_t xend_var_lib_t:sock_file create_file_perms;
+@@ -143,6 +150,7 @@
  corenet_tcp_bind_generic_port(xend_t)
  corenet_tcp_bind_vnc_port(xend_t)
  corenet_tcp_connect_xserver_port(xend_t)
@@ -11279,7 +11565,7 @@
  corenet_sendrecv_xserver_client_packets(xend_t)
  corenet_sendrecv_xen_server_packets(xend_t)
  corenet_sendrecv_soundd_server_packets(xend_t)
-@@ -152,6 +153,7 @@
+@@ -152,6 +160,7 @@
  dev_manage_xen(xend_t)
  dev_filetrans_xen(xend_t)
  dev_rw_sysfs(xend_t)
@@ -11287,7 +11573,7 @@
  
  domain_read_all_domains_state(xend_t)
  domain_dontaudit_read_all_domains_state(xend_t)
-@@ -163,8 +165,13 @@
+@@ -163,8 +172,13 @@
  files_manage_etc_runtime_files(xend_t)
  files_etc_filetrans_etc_runtime(xend_t,file)
  files_read_usr_files(xend_t)
@@ -11302,7 +11588,7 @@
  storage_raw_read_removable_device(xend_t)
  
  term_getattr_all_user_ptys(xend_t)
-@@ -236,6 +243,10 @@
+@@ -236,6 +250,10 @@
  
  files_read_usr_files(xenconsoled_t)
  
@@ -11313,7 +11599,7 @@
  term_create_pty(xenconsoled_t,xen_devpts_t);
  term_use_generic_ptys(xenconsoled_t)
  term_use_console(xenconsoled_t)
-@@ -283,6 +294,12 @@
+@@ -283,6 +301,12 @@
  
  files_read_usr_files(xenstored_t)
  
@@ -11326,7 +11612,7 @@
  term_use_generic_ptys(xenstored_t)
  term_use_console(xenconsoled_t)
  
-@@ -317,6 +334,11 @@
+@@ -317,6 +341,11 @@
  
  allow xm_t xen_image_t:dir rw_dir_perms;
  allow xm_t xen_image_t:file r_file_perms;
@@ -11338,7 +11624,7 @@
  
  kernel_read_system_state(xm_t)
  kernel_read_kernel_sysctls(xm_t)
-@@ -353,3 +375,12 @@
+@@ -353,3 +382,12 @@
  xen_append_log(xm_t)
  xen_stream_connect(xm_t)
  xen_stream_connect_xenstore(xm_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/selinux-policy.spec,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- selinux-policy.spec	28 Mar 2007 13:15:07 -0000	1.353
+++ selinux-policy.spec	5 Apr 2007 17:46:28 -0000	1.354
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.4.6
-Release: 49%{?dist}
+Release: 52%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -357,6 +357,29 @@
 %endif
 
 %changelog
+* Thu Apr 5 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-52
+- Allow netutils to read sysfs
+Resolves: #235357
+- Allow samba to work as a PDC
+Resolves: #235360
+- Allow ypserv to bind to ports 600-1024
+Resolves: #235363
+- Fix kudzu to be able to telinit
+Resolves: #225443
+
+* Tue Apr 3 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-51
+- Allow nscd setcap privs
+
+* Mon Apr 2 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-50
+- More work to allow kudzu to setup init correctly so getty will work
+Resolves: #225443
+- Allow pegasus to execute ifconfig
+Resolves: #227485
+- Allow Aide to look at lnk_files and other fixes
+Resolves: #234885
+- querying cups jobs with sysadm_r needs override mls restrictions
+Resolves: #234889
+
 * Tue Mar 27 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-49
 - Change init_daemon_domain(netlabel_mgmt_t,netlabel_mgmt_exec_t)
 - to init_system_domain(netlabel_mgmt_t,netlabel_mgmt_exec_t)



From fedora-cvs-commits at redhat.com  Thu Apr  5 18:16:14 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 14:16:14 -0400
Subject: rpms/kernel/devel linux-2.6-i965gm-support.patch,NONE,1.1
Message-ID: <200704051816.l35IGEok013314@cvs.devel.redhat.com>

Author: ajackson

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

Added Files:
	linux-2.6-i965gm-support.patch 
Log Message:
965GM gfx support patch.


linux-2.6-i965gm-support.patch:
 agp/intel-agp.c  |   14 ++++++++++++--
 drm/drm_pciids.h |    1 +
 drm/i915_dma.c   |    3 ++-
 3 files changed, 15 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-i965gm-support.patch ---
--- linux-2.6.20.noarch/drivers/char/agp/intel-agp.c.jx	2007-04-05 05:18:01.000000000 -0400
+++ linux-2.6.20.noarch/drivers/char/agp/intel-agp.c	2007-04-05 05:18:12.000000000 -0400
@@ -18,11 +18,14 @@
 #define PCI_DEVICE_ID_INTEL_82965Q_IG       0x2992
 #define PCI_DEVICE_ID_INTEL_82965G_HB       0x29A0
 #define PCI_DEVICE_ID_INTEL_82965G_IG       0x29A2
+#define PCI_DEVICE_ID_INTEL_82965GM_HB      0x2A00
+#define PCI_DEVICE_ID_INTEL_82965GM_IG      0x2A02
 
 #define IS_I965 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82946GZ_HB || \
                  agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965G_1_HB || \
                  agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965Q_HB || \
-                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965G_HB)
+                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965G_HB || \
+                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965GM_HB)
 
 
 extern int agp_memory_reserved;
@@ -1921,7 +1924,13 @@
 			bridge->driver = &intel_845_driver;
 		name = "965G";
 		break;
-
+	case PCI_DEVICE_ID_INTEL_82965GM_HB:
+		if (find_i830(PCI_DEVICE_ID_INTEL_82965GM_IG))
+			bridge->driver = &intel_i965_driver;
+		else
+			bridge->driver = &intel_845_driver;
+		name = "965GM";
+		break;
 	case PCI_DEVICE_ID_INTEL_7505_0:
 		bridge->driver = &intel_7505_driver;
 		name = "E7505";
@@ -2080,6 +2089,7 @@
 	ID(PCI_DEVICE_ID_INTEL_82965G_1_HB),
 	ID(PCI_DEVICE_ID_INTEL_82965Q_HB),
 	ID(PCI_DEVICE_ID_INTEL_82965G_HB),
+	ID(PCI_DEVICE_ID_INTEL_82965GM_HB),
 	{ }
 };
 
--- linux-2.6.20.noarch/drivers/char/drm/i915_dma.c.jx	2007-02-04 13:44:54.000000000 -0500
+++ linux-2.6.20.noarch/drivers/char/drm/i915_dma.c	2007-04-05 05:18:12.000000000 -0400
@@ -34,7 +34,8 @@
 #define IS_I965G(dev) (dev->pci_device == 0x2972 || \
 		       dev->pci_device == 0x2982 || \
 		       dev->pci_device == 0x2992 || \
-		       dev->pci_device == 0x29A2)
+		       dev->pci_device == 0x29A2 || \
+		       dev->pci_device == 0x2A02)
 
 /* Really want an OS-independent resettable timer.  Would like to have
  * this loop run for (eg) 3 sec, but have the timer reset every time
--- linux-2.6.20.noarch/drivers/char/drm/drm_pciids.h.jx	2007-04-05 05:18:10.000000000 -0400
+++ linux-2.6.20.noarch/drivers/char/drm/drm_pciids.h	2007-04-05 05:19:53.000000000 -0400
@@ -296,6 +296,7 @@
 	{0x8086, 0x2982, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
 	{0x8086, 0x2992, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
 	{0x8086, 0x29a2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+	{0, 0, 0}
 
 #define nouveau_PCI_IDS \
 	{0x10de, 0x0008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, NV_03}, \



From fedora-cvs-commits at redhat.com  Thu Apr  5 18:17:41 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 14:17:41 -0400
Subject: rpms/libgnome/devel libgnome-2.18.0-default-settings.patch, NONE,
	1.1 libgnome.spec, 1.83, 1.84
Message-ID: <200704051817.l35IHfE1013464@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnome/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13448

Modified Files:
	libgnome.spec 
Added Files:
	libgnome-2.18.0-default-settings.patch 
Log Message:
fix patches to apply


libgnome-2.18.0-default-settings.patch:
 desktop_gnome_interface.schemas.in.in |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE libgnome-2.18.0-default-settings.patch ---
--- libgnome-2.18.0/schemas/desktop_gnome_interface.schemas.in.in.default-settings	2007-04-05 14:15:31.000000000 -0400
+++ libgnome-2.18.0/schemas/desktop_gnome_interface.schemas.in.in	2007-04-05 14:16:01.000000000 -0400
@@ -130,7 +130,7 @@
       <applyto>/desktop/gnome/interface/icon_theme</applyto>
       <owner>gnome</owner>
       <type>string</type>
-      <default>gnome</default>
+      <default>Echo</default>
       <locale name="C">
         <short>Icon Theme</short>
         <long>Icon theme to use for the panel, nautilus etc.</long>
@@ -265,7 +265,7 @@
       <applyto>/desktop/gnome/interface/show_input_method_menu</applyto>
       <owner>gnome</owner>
       <type>bool</type>
-      <default>true</default>
+      <default>false</default>
       <locale name="C">
 	<short>Show the 'Input Methods' menu</short>
 	<long>Whether the context menus of entries and text views 
@@ -277,7 +277,7 @@
       <applyto>/desktop/gnome/interface/show_unicode_menu</applyto>
       <owner>gnome</owner>
       <type>bool</type>
-      <default>true</default>
+      <default>false</default>
       <locale name="C">
 	<short>Show the 'Unicode Control Character' menu</short>
 	<long>Whether the context menus of entries and text views 


Index: libgnome.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- libgnome.spec	31 Mar 2007 18:13:46 -0000	1.83
+++ libgnome.spec	5 Apr 2007 18:17:39 -0000	1.84
@@ -13,7 +13,7 @@
 Summary: GNOME base library
 Name: libgnome
 Version: 2.18.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: ftp://ftp.gnome.org
 Source0: http://ftp.gnome.org/pub/gnome/sources/libgnome/2.18/%{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -56,12 +56,11 @@
 
 Patch1: libgnome-2.16.0-default-background.patch
 Patch2: libgnome-2.11.1-scoreloc.patch
-Patch3: libgnome-2.17.90-default-icontheme.patch
 Patch4: libgnome-2.7.2-default-cursor.patch
 Patch5: libgnome-2.8.0-default-browser.patch
 Patch6: libgnome-2.15.1-stat-homedir.patch
-Patch7: libgnome-2.15.1-turn-off-im-menu.patch
 Patch8: libgnome-2.18.0-prgname.patch
+Patch9: libgnome-2.18.0-default-settings.patch
 
 
 %description
@@ -107,12 +106,11 @@
 
 %patch1 -p1 -b .default-background
 %patch2 -p1 -b .scoreloc
-%patch3 -p1 -b .default-icontheme
 %patch4 -p1 -b .default-cursor
 %patch5 -p1 -b .default-browser
 %patch6 -p1 -b .stat-homedir
-%patch7 -p1 -b .turn-off-im-menu
 %patch8 -p1 -b .prgname
+%patch9 -p1 -b .default-settings
 
 %build
 %configure --disable-gtk-doc --disable-static
@@ -182,6 +180,10 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Thu Apr  5 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-3
+- Fix patches to make changes in gconf default settings
+  take effect again
+
 * Sat Mar 31 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-2
 - Set program name correctly
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 18:37:20 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 14:37:20 -0400
Subject: rpms/kernel/devel linux-2.6-fix-pmops-4.patch, NONE,
	1.1 kernel-2.6.spec, 1.3046,
	1.3047 linux-2.6-powermac-generic-suspend-1.patch, 1.1,
	1.2 linux-2.6-powermac-generic-suspend-2.patch, 1.2,
	1.3 linux-2.6-powermac-generic-suspend-3.patch, 1.1,
	1.2 linux-2.6-powermac-generic-suspend-4.patch, 1.1, 1.2
Message-ID: <200704051837.l35IbKrk031289@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec linux-2.6-powermac-generic-suspend-1.patch 
	linux-2.6-powermac-generic-suspend-2.patch 
	linux-2.6-powermac-generic-suspend-3.patch 
	linux-2.6-powermac-generic-suspend-4.patch 
Added Files:
	linux-2.6-fix-pmops-4.patch 
Log Message:
Fix pmac generic suspend


linux-2.6-fix-pmops-4.patch:
 include/linux/pm.h  |   10 ++++++++++
 kernel/power/main.c |   10 ++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-fix-pmops-4.patch ---
---
 include/linux/pm.h  |   10 ++++++++++
 kernel/power/main.c |   10 ++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

--- wireless-dev.orig/include/linux/pm.h	2007-04-05 18:14:07.948549941 +0200
+++ wireless-dev/include/linux/pm.h	2007-04-05 18:14:13.568549941 +0200
@@ -131,9 +131,17 @@ typedef int __bitwise suspend_disk_metho
  * @prepare: Prepare the platform for the given suspend state. Can return a
  *	negative error code if necessary.
  *
+ * @irq_off: If assigned, the generic suspend code does not turn off IRQs
+ *	but relies on this callback instead. It is currently not called for
+ *	%PM_SUSPEND_DISK.
+ *
  * @enter: Enter the given suspend state, must be assigned. Can return a
  *	negative error code if necessary.
  *
+ * @irq_on: If assigned, the generic suspend code does not turn on IRQs
+ *	but relies on this callback instead. it is currently not called for
+ *	%PM_SUSPEND_DISK.
+ *
  * @finish: Called when the system has left the given state and all devices
  *	are resumed. The return value is ignored.
  *
@@ -152,7 +160,9 @@ typedef int __bitwise suspend_disk_metho
 struct pm_ops {
 	int (*valid)(suspend_state_t state);
 	int (*prepare)(suspend_state_t state);
+	void (*irq_off)(suspend_state_t state);
 	int (*enter)(suspend_state_t state);
+	void (*irq_on)(suspend_state_t state);
 	int (*finish)(suspend_state_t state);
 	suspend_disk_method_t pm_disk_mode;
 };
--- wireless-dev.orig/kernel/power/main.c	2007-04-05 18:14:07.988549941 +0200
+++ wireless-dev/kernel/power/main.c	2007-04-05 18:25:21.108549941 +0200
@@ -117,7 +117,10 @@ int suspend_enter(suspend_state_t state)
 	int error = 0;
 	unsigned long flags;
 
-	local_irq_save(flags);
+	if (pm_ops->irq_off)
+		pm_ops->irq_off(state);
+	else
+		local_irq_save(flags);
 
 	if ((error = device_power_down(PMSG_SUSPEND))) {
 		printk(KERN_ERR "Some devices failed to power down\n");
@@ -126,7 +129,10 @@ int suspend_enter(suspend_state_t state)
 	error = pm_ops->enter(state);
 	device_power_up();
  Done:
-	local_irq_restore(flags);
+	if (pm_ops->irq_on)
+		pm_ops->irq_on(state);
+	else
+		local_irq_restore(flags);
 	return error;
 }
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3046
retrieving revision 1.3047
diff -u -r1.3046 -r1.3047
--- kernel-2.6.spec	5 Apr 2007 05:50:45 -0000	1.3046
+++ kernel-2.6.spec	5 Apr 2007 18:37:18 -0000	1.3047
@@ -320,9 +320,6 @@
 BuildPreReq: gnupg
 %endif
 BuildRequires: gcc >= 3.4.2, binutils >= 2.12, redhat-rpm-config
-%if %{with_headers}
-BuildRequires: unifdef
-%endif
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
 
 
@@ -388,6 +385,7 @@
 Patch16: linux-2.6-fix-pmops-1.patch
 Patch17: linux-2.6-fix-pmops-2.patch
 Patch18: linux-2.6-fix-pmops-3.patch
+Patch19: linux-2.6-fix-pmops-4.patch
 
 # enable sysrq-c on all kernels, not only kexec
 Patch20: linux-2.6-sysrq-c.patch
@@ -984,6 +982,7 @@
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 
 # sysrq works always
 %patch20 -p1
@@ -2252,6 +2251,9 @@
 #  - tux.
 
 %changelog
+* Thu Apr 05 2007 David Woodhouse <dwmw2 at redhat.com>
+- Fix PowerMac generic suspend vs. IRQ disable
+
 * Thu Apr 05 2007 Dave Jones <davej at redhat.com>
 - Disable some warnings.
 

linux-2.6-powermac-generic-suspend-1.patch:
 arch/powerpc/Kconfig                     |    5 ++
 arch/powerpc/platforms/powermac/time.c   |   38 ----------------
 arch/powerpc/sysdev/Makefile             |    3 +
 wireless-dev/arch/powerpc/sysdev/timer.c |   70 +++++++++++++++++++++++++++++++
 4 files changed, 78 insertions(+), 38 deletions(-)

Index: linux-2.6-powermac-generic-suspend-1.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-powermac-generic-suspend-1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-powermac-generic-suspend-1.patch	25 Mar 2007 21:38:09 -0000	1.1
+++ linux-2.6-powermac-generic-suspend-1.patch	5 Apr 2007 18:37:18 -0000	1.2
@@ -1,55 +1,4 @@
-From linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org Mon Mar 19 11:03:04 2007
-Return-path: <linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org>
-Envelope-to: dwmw2 at baythorne.infradead.org
-Delivery-date: Mon, 19 Mar 2007 11:03:04 +0000
-Received: from pentafluge.infradead.org ([2001:4bd0:203e::1]) by
-	baythorne.infradead.org with esmtps (Exim 4.63 #1 (Red Hat Linux)) id
-	1HTFdm-0004lo-UL for dwmw2 at baythorne.infradead.org; Mon, 19 Mar 2007
-	11:03:04 +0000
-Received: from ozlabs.org ([203.10.76.45]) by pentafluge.infradead.org with
-	esmtps (Exim 4.63 #1 (Red Hat Linux)) id 1HTFdd-0004rJ-Fr for
-	dwmw2 at infradead.org; Mon, 19 Mar 2007 11:02:55 +0000
-Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix)
-	with ESMTP id DC64FDDEC0 for <dwmw2 at infradead.org>; Mon, 19 Mar 2007
-	22:00:19 +1100 (EST)
-X-Original-To: linuxppc-dev at ozlabs.org
-Delivered-To: linuxppc-dev at ozlabs.org
-Received: from sipsolutions.net (crystal.sipsolutions.net [195.210.38.204])
-	(using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present
-	a certificate) by ozlabs.org (Postfix) with ESMTP id 42C2FDDFDD for
-	<linuxppc-dev at ozlabs.org>; Mon, 19 Mar 2007 21:59:28 +1100 (EST)
-Received: from [84.135.242.137] (helo=[10.0.0.4]) by sipsolutions.net with
-	esmtpsa (TLS-1.0:RSA_ARCFOUR_MD5:16) (Exim 4.63) (envelope-from
-	<johannes at sipsolutions.net>) id 1HTFV5-00034S-Ty; Mon, 19 Mar 2007 10:54:04
-	+0000
-Message-Id: <20070319105357.964696000 at sipsolutions.net>
-References: <20070319105352.771599000 at sipsolutions.net>
-User-Agent: quilt/0.45-1
-Date: Mon, 19 Mar 2007 11:53:53 +0100
-From: Johannes Berg <johannes at sipsolutions.net>
-To: linuxppc-dev at ozlabs.org
-Subject: [PATCH 1/5] powerpc: generic time suspend/resume code
-Content-Disposition: inline; filename=001-time-resume.patch
-Mime-Version: 1.0
-X-Mailer: Evolution 2.8.2.1 
-X-BeenThere: linuxppc-dev at ozlabs.org
-X-Mailman-Version: 2.1.9
-Precedence: list
-List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.ozlabs.org>
-List-Unsubscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-dev>,
-	<mailto:linuxppc-dev-request at ozlabs.org?subject=unsubscribe>
-List-Archive: <http://ozlabs.org/pipermail/linuxppc-dev>
-List-Post: <mailto:linuxppc-dev at ozlabs.org>
-List-Help: <mailto:linuxppc-dev-request at ozlabs.org?subject=help>
-List-Subscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-dev>,
-	<mailto:linuxppc-dev-request at ozlabs.org?subject=subscribe>
-Content-Type: text/plain; charset="us-ascii"
-Sender: linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org
-Errors-To: linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org
-X-Bad-Reply: References but no 'Re:' in Subject.
-X-Spam-Score: 0.0 (/)
-X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/
-Content-Transfer-Encoding: 8bit
+Subject: [PATCH] powerpc: generic time suspend/resume code
 
 This patch removes the time suspend/restore code that was done through
 a PMU notifier in arch/platforms/powermac/time.c.
@@ -70,8 +19,8 @@
  arch/powerpc/sysdev/timer.c            |   70 +++++++++++++++++++++++++++++++++
  4 files changed, 78 insertions(+), 38 deletions(-)
 
---- linux-2.6.orig/arch/powerpc/platforms/powermac/time.c	2007-03-19 11:47:27.312413925 +0100
-+++ linux-2.6/arch/powerpc/platforms/powermac/time.c	2007-03-19 11:47:37.512413925 +0100
+--- wireless-dev.orig/arch/powerpc/platforms/powermac/time.c	2007-04-05 14:31:28.928552246 +0200
++++ wireless-dev/arch/powerpc/platforms/powermac/time.c	2007-04-05 14:31:45.778552246 +0200
 @@ -297,49 +297,11 @@ int __init via_calibrate_decr(void)
  }
  #endif
@@ -122,8 +71,8 @@
  	generic_calibrate_decr();
  
  #ifdef CONFIG_PPC32
---- linux-2.6.orig/arch/powerpc/Kconfig	2007-03-19 11:47:27.422413925 +0100
-+++ linux-2.6/arch/powerpc/Kconfig	2007-03-19 11:47:37.512413925 +0100
+--- wireless-dev.orig/arch/powerpc/Kconfig	2007-04-05 14:31:28.988552246 +0200
++++ wireless-dev/arch/powerpc/Kconfig	2007-04-05 14:31:45.778552246 +0200
 @@ -11,6 +11,11 @@ config PPC64
  	  This option selects whether a 32-bit or a 64-bit kernel
  	  will be built.
@@ -136,8 +85,8 @@
  config PPC32
  	bool
  	default y if !PPC64
---- linux-2.6.orig/arch/powerpc/sysdev/Makefile	2007-03-19 11:47:27.532413925 +0100
-+++ linux-2.6/arch/powerpc/sysdev/Makefile	2007-03-19 11:47:37.512413925 +0100
+--- wireless-dev.orig/arch/powerpc/sysdev/Makefile	2007-04-05 14:31:29.008552246 +0200
++++ wireless-dev/arch/powerpc/sysdev/Makefile	2007-04-05 14:31:45.778552246 +0200
 @@ -14,6 +14,9 @@ obj-$(CONFIG_FSL_SOC)		+= fsl_soc.o
  obj-$(CONFIG_TSI108_BRIDGE)	+= tsi108_pci.o tsi108_dev.o
  obj-$(CONFIG_QUICC_ENGINE)	+= qe_lib/
@@ -149,7 +98,7 @@
  obj-$(CONFIG_PPC_I8259)		+= i8259.o
  obj-$(CONFIG_PPC_83xx)		+= ipic.o
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6/arch/powerpc/sysdev/timer.c	2007-03-19 11:47:37.512413925 +0100
++++ wireless-dev/arch/powerpc/sysdev/timer.c	2007-04-05 14:31:45.778552246 +0200
 @@ -0,0 +1,70 @@
 +/*
 + * Common code to keep time when machine suspends.
@@ -221,10 +170,3 @@
 +}
 +
 +device_initcall(time_init_device);
-
---
-
-_______________________________________________
-Linuxppc-dev mailing list
-Linuxppc-dev at ozlabs.org
-https://ozlabs.org/mailman/listinfo/linuxppc-dev

linux-2.6-powermac-generic-suspend-2.patch:
 arch/powerpc/kernel/Makefile               |    1 
 arch/powerpc/platforms/powermac/setup.c    |   65 -----------------------------
 wireless-dev/arch/powerpc/kernel/swsusp.c  |   42 ++++++++++++++++++
 wireless-dev/include/asm-powerpc/suspend.h |    9 ++++
 4 files changed, 52 insertions(+), 65 deletions(-)

Index: linux-2.6-powermac-generic-suspend-2.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-powermac-generic-suspend-2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-powermac-generic-suspend-2.patch	4 Apr 2007 20:51:55 -0000	1.2
+++ linux-2.6-powermac-generic-suspend-2.patch	5 Apr 2007 18:37:18 -0000	1.3
@@ -1,61 +1,4 @@
-From linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org Mon Mar 19 16:24:54 2007
-Return-path: <linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org>
-Envelope-to: dwmw2 at baythorne.infradead.org
-Delivery-date: Mon, 19 Mar 2007 16:24:54 +0000
-Received: from pentafluge.infradead.org ([2001:4bd0:203e::1]) by
-	baythorne.infradead.org with esmtps (Exim 4.63 #1 (Red Hat Linux)) id
-	1HTKfG-0005cX-Fv for dwmw2 at baythorne.infradead.org; Mon, 19 Mar 2007
-	16:24:54 +0000
-Received: from ozlabs.org ([203.10.76.45]) by pentafluge.infradead.org with
-	esmtps (Exim 4.63 #1 (Red Hat Linux)) id 1HTKfD-0007pQ-Md for
-	dwmw2 at infradead.org; Mon, 19 Mar 2007 16:24:53 +0000
-Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix)
-	with ESMTP id C123CDE064 for <dwmw2 at infradead.org>; Tue, 20 Mar 2007
-	03:24:47 +1100 (EST)
-X-Original-To: linuxppc-dev at ozlabs.org
-Delivered-To: linuxppc-dev at ozlabs.org
-Received: from sipsolutions.net (crystal.sipsolutions.net [195.210.38.204])
-	(using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present
-	a certificate) by ozlabs.org (Postfix) with ESMTP id 8898FDDFB1 for
-	<linuxppc-dev at ozlabs.org>; Tue, 20 Mar 2007 03:24:32 +1100 (EST)
-Received: from [84.135.242.137] (helo=[10.0.0.4]) by sipsolutions.net with
-	esmtpsa (TLS-1.0:RSA_ARCFOUR_MD5:16) (Exim 4.63) (envelope-from
-	<johannes at sipsolutions.net>) id 1HTKZf-0004vB-Ld; Mon, 19 Mar 2007 16:19:08
-	+0000
-Subject: [PATCH 2/5] powerpc: fix suspend states again
-From: Johannes Berg <johannes at sipsolutions.net>
-To: Benjamin Herrenschmidt <benh at kernel.crashing.org>
-In-Reply-To: <1174319657.22561.9.camel at johannes.berg>
-References: <20070319105352.771599000 at sipsolutions.net>
-	 <20070319105358.796834000 at sipsolutions.net>
-	 <1174315727.5044.6.camel at localhost.localdomain>
-	 <1174317726.22561.4.camel at johannes.berg>
-	 <1174318342.5044.16.camel at localhost.localdomain>
-	 <1174319146.22561.6.camel at johannes.berg>
-	 <1174319657.22561.9.camel at johannes.berg>
-Date: Mon, 19 Mar 2007 17:22:30 +0100
-Message-Id: <1174321350.22561.11.camel at johannes.berg>
-Mime-Version: 1.0
-X-Mailer: Evolution 2.8.2.1 
-Cc: linuxppc-dev at ozlabs.org
-X-BeenThere: linuxppc-dev at ozlabs.org
-X-Mailman-Version: 2.1.9
-Precedence: list
-List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.ozlabs.org>
-List-Unsubscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-dev>,
-	<mailto:linuxppc-dev-request at ozlabs.org?subject=unsubscribe>
-List-Archive: <http://ozlabs.org/pipermail/linuxppc-dev>
-List-Post: <mailto:linuxppc-dev at ozlabs.org>
-List-Help: <mailto:linuxppc-dev-request at ozlabs.org?subject=help>
-List-Subscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-dev>,
-	<mailto:linuxppc-dev-request at ozlabs.org?subject=subscribe>
-Content-Type: text/plain; charset="us-ascii"
-Sender: linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org
-Errors-To: linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org
-X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject.
-X-Spam-Score: 0.0 (/)
-X-Evolution-Source: imap://dwmw2 at baythorne.infradead.org/
-Content-Transfer-Encoding: 8bit
+Subject: [PATCH] powerpc: fix suspend states again
 
 In commit 0fba3a1f39f8b0a50b56c8b068fa52131cbc84c2 (a very long time ago,
 May 2006), I fixed a bug that caused powermacs to crash when you tried
@@ -77,9 +20,7 @@
     usable via /sys/power/state but is done via the PMU instead.
  2. move the code responsible for storing FPU/altivec state into
     save_processor_state and the set_context() call to restore_processor_state.
-
-It also adds a call to kernel_enable_spe() but I don't have any machines that
-have that to see if it actually works anyway.
+ 3. add a call to kernel_enable_spe()
 
 It may look like there is some code removal missing but that is actually because
 the new suspend.h file overrides the ppc/suspend.h one which was previously used.
@@ -96,8 +37,8 @@
  include/asm-powerpc/suspend.h           |    9 ++++
  4 files changed, 52 insertions(+), 65 deletions(-)
 
---- linux-2.6.orig/arch/powerpc/platforms/powermac/setup.c	2007-03-19 16:49:57.723321419 +0100
-+++ linux-2.6/arch/powerpc/platforms/powermac/setup.c	2007-03-19 16:50:00.983321419 +0100
+--- wireless-dev.orig/arch/powerpc/platforms/powermac/setup.c	2007-04-05 14:31:28.448552246 +0200
++++ wireless-dev/arch/powerpc/platforms/powermac/setup.c	2007-04-05 14:31:46.488552246 +0200
 @@ -420,76 +420,11 @@ static void __init find_boot_device(void
  #endif
  }
@@ -176,7 +117,7 @@
  }
  
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6/include/asm-powerpc/suspend.h	2007-03-19 16:50:00.993321419 +0100
++++ wireless-dev/include/asm-powerpc/suspend.h	2007-04-05 14:31:46.488552246 +0200
 @@ -0,0 +1,9 @@
 +#ifndef __ASM_POWERPC_SUSPEND_H
 +#define __ASM_POWERPC_SUSPEND_H
@@ -187,8 +128,8 @@
 +void restore_processor_state(void);
 +
 +#endif /* __ASM_POWERPC_SUSPEND_H */
---- linux-2.6.orig/arch/powerpc/kernel/Makefile	2007-03-19 16:49:57.743321419 +0100
-+++ linux-2.6/arch/powerpc/kernel/Makefile	2007-03-19 16:50:00.993321419 +0100
+--- wireless-dev.orig/arch/powerpc/kernel/Makefile	2007-04-05 14:31:28.468552246 +0200
++++ wireless-dev/arch/powerpc/kernel/Makefile	2007-04-05 14:31:46.488552246 +0200
 @@ -36,6 +36,7 @@ obj-$(CONFIG_GENERIC_TBSYNC)	+= smp-tbsy
  obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o
  obj-$(CONFIG_6xx)		+= idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o
@@ -198,7 +139,7 @@
  obj32-$(CONFIG_MODULES)		+= module_32.o
  
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6/arch/powerpc/kernel/swsusp.c	2007-03-19 17:18:25.323321419 +0100
++++ wireless-dev/arch/powerpc/kernel/swsusp.c	2007-04-05 14:31:46.488552246 +0200
 @@ -0,0 +1,42 @@
 +/*
 + * Common powerpc suspend code for 32 and 64 bits
@@ -242,9 +183,3 @@
 +	set_context(current->active_mm->context.id, current->active_mm->pgd);
 +#endif
 +}
-
-
-_______________________________________________
-Linuxppc-dev mailing list
-Linuxppc-dev at ozlabs.org
-https://ozlabs.org/mailman/listinfo/linuxppc-dev

linux-2.6-powermac-generic-suspend-3.patch:
 drivers/macintosh/adb.c             |   42 +++++++-----------------------------
 drivers/macintosh/apm_emu.c         |   13 +++--------
 drivers/macintosh/via-pmu-led.c     |    4 ---
 drivers/macintosh/via-pmu.c         |   36 +++++-------------------------
 include/linux/pmu.h                 |   12 +---------
 sound/oss/dmasound/dmasound_awacs.c |    5 +---
 6 files changed, 24 insertions(+), 88 deletions(-)

Index: linux-2.6-powermac-generic-suspend-3.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-powermac-generic-suspend-3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-powermac-generic-suspend-3.patch	25 Mar 2007 21:38:09 -0000	1.1
+++ linux-2.6-powermac-generic-suspend-3.patch	5 Apr 2007 18:37:18 -0000	1.2
@@ -1,56 +1,4 @@
-From linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org Mon Mar 19 11:01:16 2007
-Return-path: <linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org>
-Envelope-to: dwmw2 at baythorne.infradead.org
-Delivery-date: Mon, 19 Mar 2007 11:01:16 +0000
-Received: from pentafluge.infradead.org ([2001:4bd0:203e::1]) by
-	baythorne.infradead.org with esmtps (Exim 4.63 #1 (Red Hat Linux)) id
-	1HTFbx-0004lA-On for dwmw2 at baythorne.infradead.org; Mon, 19 Mar 2007
-	11:01:16 +0000
-Received: from ozlabs.org ([203.10.76.45]) by pentafluge.infradead.org with
-	esmtps (Exim 4.63 #1 (Red Hat Linux)) id 1HTFbo-0004l8-8P for
-	dwmw2 at infradead.org; Mon, 19 Mar 2007 11:01:02 +0000
-Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix)
-	with ESMTP id 00DB5DE248 for <dwmw2 at infradead.org>; Mon, 19 Mar 2007
-	21:59:53 +1100 (EST)
-X-Original-To: linuxppc-dev at ozlabs.org
-Delivered-To: linuxppc-dev at ozlabs.org
-Received: from sipsolutions.net (crystal.sipsolutions.net [195.210.38.204])
-	(using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present
-	a certificate) by ozlabs.org (Postfix) with ESMTP id 651BEDDEEE for
-	<linuxppc-dev at ozlabs.org>; Mon, 19 Mar 2007 21:59:20 +1100 (EST)
-Received: from [84.135.242.137] (helo=[10.0.0.4]) by sipsolutions.net with
-	esmtpsa (TLS-1.0:RSA_ARCFOUR_MD5:16) (Exim 4.63) (envelope-from
-	<johannes at sipsolutions.net>) id 1HTFUx-00034G-Ba; Mon, 19 Mar 2007 10:53:56
-	+0000
-Message-Id: <20070319105359.356866000 at sipsolutions.net>
-References: <20070319105352.771599000 at sipsolutions.net>
-User-Agent: quilt/0.45-1
-Date: Mon, 19 Mar 2007 11:53:55 +0100
-From: Johannes Berg <johannes at sipsolutions.net>
-To: linuxppc-dev at ozlabs.org
-Subject: [PATCH 3/5] powermac: disallow pmu sleep notifiers from aborting
-	sleep
-Content-Disposition: inline; filename=003-less-pmu-sleep-notifier.patch
-Mime-Version: 1.0
-X-Mailer: Evolution 2.8.2.1 
-X-BeenThere: linuxppc-dev at ozlabs.org
-X-Mailman-Version: 2.1.9
-Precedence: list
-List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.ozlabs.org>
-List-Unsubscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-dev>,
-	<mailto:linuxppc-dev-request at ozlabs.org?subject=unsubscribe>
-List-Archive: <http://ozlabs.org/pipermail/linuxppc-dev>
-List-Post: <mailto:linuxppc-dev at ozlabs.org>
-List-Help: <mailto:linuxppc-dev-request at ozlabs.org?subject=help>
-List-Subscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-dev>,
-	<mailto:linuxppc-dev-request at ozlabs.org?subject=subscribe>
-Content-Type: text/plain; charset="us-ascii"
-Sender: linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org
-Errors-To: linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org
-X-Bad-Reply: References but no 'Re:' in Subject.
-X-Spam-Score: 0.0 (/)
-X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/
-Content-Transfer-Encoding: 8bit
+Subject: [PATCH] powermac: disallow pmu sleep notifiers from aborting sleep
 
 Tracing through the code, no current PMU sleep notifier can abort sleep.
 Since no new PMU sleep notifiers should be added, this patch simplifies the
@@ -71,8 +19,8 @@
  sound/oss/dmasound/dmasound_awacs.c |    5 +---
  6 files changed, 24 insertions(+), 88 deletions(-)
 
---- linux-2.6.orig/drivers/macintosh/adb.c	2007-03-19 11:47:25.572413925 +0100
-+++ linux-2.6/drivers/macintosh/adb.c	2007-03-19 11:47:40.232413925 +0100
+--- wireless-dev.orig/drivers/macintosh/adb.c	2007-04-05 14:50:53.858552246 +0200
++++ wireless-dev/drivers/macintosh/adb.c	2007-04-05 17:55:25.478549941 +0200
 @@ -90,7 +90,7 @@ static int autopoll_devs;
  int __adb_probe_sync;
  
@@ -165,8 +113,8 @@
  	
  	return ret;
  }
---- linux-2.6.orig/drivers/macintosh/via-pmu.c	2007-03-19 11:47:25.642413925 +0100
-+++ linux-2.6/drivers/macintosh/via-pmu.c	2007-03-19 11:47:40.232413925 +0100
+--- wireless-dev.orig/drivers/macintosh/via-pmu.c	2007-04-05 14:50:53.938552246 +0200
++++ wireless-dev/drivers/macintosh/via-pmu.c	2007-04-05 18:14:00.208549941 +0200
 @@ -1769,35 +1769,21 @@ EXPORT_SYMBOL(pmu_unregister_sleep_notif
  #if defined(CONFIG_PM) && defined(CONFIG_PPC32)
  
@@ -243,8 +191,8 @@
  
  	/* Send suspend call to devices, hold the device core's dpm_sem */
  	ret = device_suspend(PMSG_SUSPEND);
---- linux-2.6.orig/include/linux/pmu.h	2007-03-19 11:47:25.902413925 +0100
-+++ linux-2.6/include/linux/pmu.h	2007-03-19 11:47:40.242413925 +0100
+--- wireless-dev.orig/include/linux/pmu.h	2007-04-05 14:50:54.048552246 +0200
++++ wireless-dev/include/linux/pmu.h	2007-04-05 17:55:25.488549941 +0200
 @@ -168,24 +168,16 @@ extern int pmu_get_model(void);
  
  struct pmu_sleep_notifier
@@ -272,8 +220,8 @@
  
  /* priority levels in notifiers */
  #define SLEEP_LEVEL_VIDEO	100	/* Video driver (first wake) */
---- linux-2.6.orig/drivers/macintosh/via-pmu-led.c	2007-03-19 11:47:25.702413925 +0100
-+++ linux-2.6/drivers/macintosh/via-pmu-led.c	2007-03-19 11:47:40.242413925 +0100
+--- wireless-dev.orig/drivers/macintosh/via-pmu-led.c	2007-04-05 14:50:53.948552246 +0200
++++ wireless-dev/drivers/macintosh/via-pmu-led.c	2007-04-05 17:55:25.488549941 +0200
 @@ -81,7 +81,7 @@ static struct led_classdev pmu_led = {
  };
  
@@ -292,8 +240,8 @@
  }
  
  static struct pmu_sleep_notifier via_pmu_led_sleep_notif = {
---- linux-2.6.orig/drivers/macintosh/apm_emu.c	2007-03-19 11:47:25.802413925 +0100
-+++ linux-2.6/drivers/macintosh/apm_emu.c	2007-03-19 11:47:40.242413925 +0100
+--- wireless-dev.orig/drivers/macintosh/apm_emu.c	2007-04-05 14:50:54.028552246 +0200
++++ wireless-dev/drivers/macintosh/apm_emu.c	2007-04-05 17:55:25.498549941 +0200
 @@ -96,7 +96,7 @@ static DECLARE_WAIT_QUEUE_HEAD(apm_waitq
  static DECLARE_WAIT_QUEUE_HEAD(apm_suspend_waitqueue);
  static struct apm_user *	user_list;
@@ -339,8 +287,8 @@
  }
  
  #define APM_CRITICAL		10
---- linux-2.6.orig/sound/oss/dmasound/dmasound_awacs.c	2007-03-19 11:47:26.032413925 +0100
-+++ linux-2.6/sound/oss/dmasound/dmasound_awacs.c	2007-03-19 11:47:40.252413925 +0100
+--- wireless-dev.orig/sound/oss/dmasound/dmasound_awacs.c	2007-04-05 14:50:54.138552246 +0200
++++ wireless-dev/sound/oss/dmasound/dmasound_awacs.c	2007-04-05 17:55:25.498549941 +0200
 @@ -257,7 +257,7 @@ static volatile struct dbdma_cmd *emerge
  /*
   * Stuff for restoring after a sleep.
@@ -367,10 +315,3 @@
  }
  #endif /* CONFIG_PM */
  
-
---
-
-_______________________________________________
-Linuxppc-dev mailing list
-Linuxppc-dev at ozlabs.org
-https://ozlabs.org/mailman/listinfo/linuxppc-dev

linux-2.6-powermac-generic-suspend-4.patch:
 Documentation/feature-removal-schedule.txt |   10 
 drivers/macintosh/via-pmu.c                |  319 ++++++++++++-----------------
 2 files changed, 149 insertions(+), 180 deletions(-)

Index: linux-2.6-powermac-generic-suspend-4.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-powermac-generic-suspend-4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-powermac-generic-suspend-4.patch	25 Mar 2007 21:38:09 -0000	1.1
+++ linux-2.6-powermac-generic-suspend-4.patch	5 Apr 2007 18:37:18 -0000	1.2
@@ -1,56 +1,4 @@
-From linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org Tue Mar 20 00:13:31 2007
-Return-path: <linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org>
-Envelope-to: dwmw2 at baythorne.infradead.org
-Delivery-date: Tue, 20 Mar 2007 00:13:31 +0000
-Received: from pentafluge.infradead.org ([2001:4bd0:203e::1]) by
-	baythorne.infradead.org with esmtps (Exim 4.63 #1 (Red Hat Linux)) id
-	1HTRyl-00072X-Gz for dwmw2 at baythorne.infradead.org; Tue, 20 Mar 2007
-	00:13:31 +0000
-Received: from ozlabs.org ([203.10.76.45]) by pentafluge.infradead.org with
-	esmtps (Exim 4.63 #1 (Red Hat Linux)) id 1HTRyi-0007Xq-1g for
-	dwmw2 at infradead.org; Tue, 20 Mar 2007 00:13:31 +0000
-Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix)
-	with ESMTP id 253E6DDFBB for <dwmw2 at infradead.org>; Tue, 20 Mar 2007
-	11:13:22 +1100 (EST)
-X-Original-To: linuxppc-dev at ozlabs.org
-Delivered-To: linuxppc-dev at ozlabs.org
-Received: from sipsolutions.net (crystal.sipsolutions.net [195.210.38.204])
-	(using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present
-	a certificate) by ozlabs.org (Postfix) with ESMTP id DC781DDF3F for
-	<linuxppc-dev at ozlabs.org>; Tue, 20 Mar 2007 11:13:14 +1100 (EST)
-Received: from [84.135.241.123] (helo=[10.0.0.4]) by sipsolutions.net with
-	esmtpsa (TLS-1.0:RSA_ARCFOUR_MD5:16) (Exim 4.63) (envelope-from
-	<johannes at sipsolutions.net>) id 1HTRt3-0007M2-Hw; Tue, 20 Mar 2007 00:07:38
-	+0000
-Subject: [PATCH 4/5 v2] powermac: proper sleep management
-From: Johannes Berg <johannes at sipsolutions.net>
-To: linuxppc-dev at ozlabs.org
-In-Reply-To: <1174347848.5707.0.camel at johannes.berg>
-References: <20070319105352.771599000 at sipsolutions.net>
-	 <20070319105359.744830000 at sipsolutions.net>
-	 <1174347848.5707.0.camel at johannes.berg>
-Date: Tue, 20 Mar 2007 01:11:02 +0100
-Message-Id: <1174349462.3660.1.camel at johannes.berg>
-Mime-Version: 1.0
-X-Mailer: Evolution 2.8.2.1 
-X-BeenThere: linuxppc-dev at ozlabs.org
-X-Mailman-Version: 2.1.9
-Precedence: list
-List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.ozlabs.org>
-List-Unsubscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-dev>,
-	<mailto:linuxppc-dev-request at ozlabs.org?subject=unsubscribe>
-List-Archive: <http://ozlabs.org/pipermail/linuxppc-dev>
-List-Post: <mailto:linuxppc-dev at ozlabs.org>
-List-Help: <mailto:linuxppc-dev-request at ozlabs.org?subject=help>
-List-Subscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-dev>,
-	<mailto:linuxppc-dev-request at ozlabs.org?subject=subscribe>
-Content-Type: text/plain; charset="us-ascii"
-Sender: linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org
-Errors-To: linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org
-X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject.
-X-Spam-Score: 0.0 (/)
-X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/
-Content-Transfer-Encoding: 8bit
+Subject: [PATCH] powermac: proper sleep management
 
 After having removed the power management ops from powermac completely, this
 patch adds them back for PMU based machines, directly in the PMU driver.
@@ -72,17 +20,15 @@
 because the generic layer actually freezes processes before STR.
 
 This updated version removes the sys_sync() call that can't be done with
-processes frozen. This version was updated again to not allow dual
-suspend (suspend to ram after writing things to disk) because that is
-not supported yet.
+processes frozen.
 
 ---
  Documentation/feature-removal-schedule.txt |   10 
- drivers/macintosh/via-pmu.c                |  306 +++++++++++------------------
- 2 files changed, 136 insertions(+), 180 deletions(-)
+ drivers/macintosh/via-pmu.c                |  319 ++++++++++++-----------------
+ 2 files changed, 149 insertions(+), 180 deletions(-)
 
---- linux-2.6.orig/drivers/macintosh/via-pmu.c	2007-03-19 19:15:06.553321419 +0100
-+++ linux-2.6/drivers/macintosh/via-pmu.c	2007-03-20 00:46:53.166994679 +0100
+--- wireless-dev.orig/drivers/macintosh/via-pmu.c	2007-04-05 17:55:25.488549941 +0200
++++ wireless-dev/drivers/macintosh/via-pmu.c	2007-04-05 18:02:27.368549941 +0200
 @@ -155,9 +155,6 @@ static int drop_interrupts;
  #if defined(CONFIG_PM) && defined(CONFIG_PPC32)
  static int option_lid_wakeup = 1;
@@ -316,7 +262,7 @@
  	pbook_free_pci_save();
  	iounmap(mem_ctrl);
  
-@@ -2558,6 +2403,123 @@ pmu_release(struct inode *inode, struct 
+@@ -2558,6 +2403,136 @@ pmu_release(struct inode *inode, struct 
  	return 0;
  }
  
@@ -327,6 +273,11 @@
 +	broadcast_sleep(PBOOK_SLEEP_REQUEST);
 +	broadcast_sleep(PBOOK_SLEEP_NOW);
 +
++	return 0;
++}
++
++static void powerbook_irq_off(suspend_state_t state)
++{
 +#ifdef CONFIG_PMAC_BACKLIGHT
 +	/* Tell backlight code not to muck around with the chip anymore */
 +	pmu_backlight_set_sleep(1);
@@ -338,19 +289,19 @@
 +
 +	preempt_disable();
 +
-+	return 0;
-+}
-+
-+static int powerbook_sleep(suspend_state_t state)
-+{
-+	int error = 0;
-+
 +	asm volatile("mtdec %0" : : "r" (0x7fffffff));
 +	/* Make sure any pending DEC interrupt occurring while we did
 +	 * the above didn't re-enable the DEC */
 +	mb();
 +	asm volatile("mtdec %0" : : "r" (0x7fffffff));
 +
++	local_irq_disable();
++}
++
++static int powerbook_sleep(suspend_state_t state)
++{
++	int error = 0;
++
 +	/* Wait for completion of async requests */
 +	while (!batt_req.complete)
 +		pmu_poll();
@@ -385,6 +336,16 @@
 +
 +	mdelay(100);
 +
++#ifdef CONFIG_PMAC_BACKLIGHT
++	/* Tell backlight code it can use the chip again */
++	pmu_backlight_set_sleep(0);
++#endif
++
++	return 0;
++}
++
++static void powerbook_irq_on(suspend_state_t state)
++{
 +	/* Force a poll of ADB interrupts */
 +	adb_int_pending = 1;
 +	via_pmu_interrupt(0, NULL);
@@ -392,22 +353,18 @@
 +	/* Restart jiffies & scheduling */
 +	wakeup_decrementer();
 +
-+	return 0;
-+}
-+
-+static int powerbook_finish_sleep(suspend_state_t state)
-+{
-+#ifdef CONFIG_PMAC_BACKLIGHT
-+	/* Tell backlight code it can use the chip again */
-+	pmu_backlight_set_sleep(0);
-+#endif
-+
++	/* Re-enable local CPU interrupts */
++	local_irq_enable();
++	mdelay(10);
 +	preempt_enable();
 +
 +	/* Call platform functions marked "on wake" */
 +	pmac_pfunc_base_resume();
 +	pmac_pfunc_i2c_resume();
++}
 +
++static int powerbook_finish_sleep(suspend_state_t state)
++{
 +	/* Notify old style drivers */
 +	broadcast_wake();
 +
@@ -422,8 +379,10 @@
 +
 +static struct pm_ops pmu_pm_ops = {
 +	.prepare = powerbook_prepare_sleep,
-+	.finish = powerbook_finish_sleep,
++	.irq_off = powerbook_irq_off,
 +	.enter = powerbook_sleep,
++	.irq_on = powerbook_irq_on,
++	.finish = powerbook_finish_sleep,
 +	.valid = pmu_sleep_valid,
 +};
 +
@@ -440,7 +399,7 @@
  static int
  pmu_ioctl(struct inode * inode, struct file *filp,
  		     u_int cmd, u_long arg)
-@@ -2567,29 +2529,19 @@ pmu_ioctl(struct inode * inode, struct f
+@@ -2567,29 +2542,19 @@ pmu_ioctl(struct inode * inode, struct f
  
  	switch (cmd) {
  #if defined(CONFIG_PM) && defined(CONFIG_PPC32)
@@ -478,7 +437,7 @@
  		if (pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) < 0)
  			return put_user(0, argp);
  		else
-@@ -2602,9 +2554,6 @@ pmu_ioctl(struct inode * inode, struct f
+@@ -2602,9 +2567,6 @@ pmu_ioctl(struct inode * inode, struct f
  	{
  		int brightness;
  
@@ -488,7 +447,7 @@
  		brightness = pmac_backlight_get_legacy_brightness();
  		if (brightness < 0)
  			return brightness;
-@@ -2616,9 +2565,6 @@ pmu_ioctl(struct inode * inode, struct f
+@@ -2616,9 +2578,6 @@ pmu_ioctl(struct inode * inode, struct f
  	{
  		int brightness;
  
@@ -498,9 +457,9 @@
  		error = get_user(brightness, argp);
  		if (error)
  			return error;
---- linux-2.6.orig/Documentation/feature-removal-schedule.txt	2007-03-19 19:15:00.773321419 +0100
-+++ linux-2.6/Documentation/feature-removal-schedule.txt	2007-03-19 19:15:07.323321419 +0100
-@@ -324,3 +324,13 @@ Why:	the i8xx_tco watchdog driver has be
+--- wireless-dev.orig/Documentation/feature-removal-schedule.txt	2007-04-05 14:50:53.608552246 +0200
++++ wireless-dev/Documentation/feature-removal-schedule.txt	2007-04-05 17:55:25.558549941 +0200
+@@ -312,3 +312,13 @@ Why:	the i8xx_tco watchdog driver has be
  Who:	Wim Van Sebroeck <wim at iguana.be>
  
  ---------------------------
@@ -514,9 +473,3 @@
 +Who:	Johannes Berg <johannes at sipsolutions.net>
 +
 +---------------------------
-
-
-_______________________________________________
-Linuxppc-dev mailing list
-Linuxppc-dev at ozlabs.org
-https://ozlabs.org/mailman/listinfo/linuxppc-dev



From fedora-cvs-commits at redhat.com  Thu Apr  5 18:52:08 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 14:52:08 -0400
Subject: rpms/xorg-x11-drv-i810/devel i810.xinf, 1.10,
	1.11 xorg-x11-drv-i810.spec, 1.52, 1.53
Message-ID: <200704051852.l35Iq8nc009621@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	i810.xinf xorg-x11-drv-i810.spec 
Log Message:
* Thu Apr 05 2007 Adam Jackson <ajax at redhat.com> 1.6.5-18
- i810.xinf: More intel whitelisting (#214011, #234877)



Index: i810.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/i810.xinf,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- i810.xinf	4 Apr 2007 16:54:24 -0000	1.10
+++ i810.xinf	5 Apr 2007 18:52:06 -0000	1.11
@@ -29,6 +29,10 @@
 alias pcivideo:v00008086d000027A2sv0000A0A0sd00000589bc*sc*i* intel
 # katzj's laptop
 alias pcivideo:v00008086d000027A2sv0000103Csd000030A0bc*sc*i* intel
+# Acer Aspire 3690 (#214011)
+alias pcivideo:v00008086d000027A2sv00001025sd00000090bc*sc*i* intel
+# Lenovo Thinkpad T60w (#234877)
+alias pcivideo:v00008086d000027A2sv000017AAsd0000201Abc*sc*i* intel
 
 alias pcivideo:v00008086d00002972sv*sd*bc*sc*i* i810	# 946GZ
 alias pcivideo:v00008086d00002982sv*sd*bc*sc*i* i810	# 965G1


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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- xorg-x11-drv-i810.spec	4 Apr 2007 16:54:24 -0000	1.52
+++ xorg-x11-drv-i810.spec	5 Apr 2007 18:52:06 -0000	1.53
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 i810 video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   1.6.5
-Release:   17%{?dist}
+Release:   18%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -100,6 +100,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Thu Apr 05 2007 Adam Jackson <ajax at redhat.com> 1.6.5-18
+- i810.xinf: More intel whitelisting (#214011, #234877)
+
 * Wed Apr 04 2007 Adam Jackson <ajax at redhat.com> 1.6.5-17
 - xf86-video-intel-1.9.94 (RC4).  Adds support for 965GM.
 - i810.xinf: Point 965GM support at the intel driver since it's not present



From fedora-cvs-commits at redhat.com  Thu Apr  5 19:30:14 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 15:30:14 -0400
Subject: rpms/xorg-x11-proto-devel/devel xorg-x11-proto-devel.spec, 1.54,
	1.55
Message-ID: <200704051930.l35JUEGZ005148@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-proto-devel.spec 
Log Message:
* Thu Apr 05 2007 Adam Jackson <ajax at redhat.com> 7.2-8
- Add virtual provides for the subprotocols (#231156)



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.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- xorg-x11-proto-devel.spec	2 Apr 2007 17:55:04 -0000	1.54
+++ xorg-x11-proto-devel.spec	5 Apr 2007 19:30:12 -0000	1.55
@@ -10,28 +10,38 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Add virtual provides lazily as they get updated, so the server and libs
+# can depend on specific proto versions instead of this package's version.
 Source0:  ftp://ftp.x.org/pub/individual/proto/bigreqsproto-1.0.2.tar.bz2
 Source1:  ftp://ftp.x.org/pub/individual/proto/compositeproto-0.3.1.tar.bz2
+Provides: compositeproto = 0.3.1
 Source2:  ftp://ftp.x.org/pub/individual/proto/damageproto-1.1.0.tar.bz2
+Provides: damageproto = 1.1.0
 Source3:  ftp://ftp.x.org/pub/individual/proto/dmxproto-2.2.2.tar.bz2
 Source4:  ftp://ftp.x.org/pub/individual/proto/evieext-1.0.2.tar.bz2
 Source5:  ftp://ftp.x.org/pub/individual/proto/fixesproto-4.0.tar.bz2
+Provides: fixesproto = 4.0
 Source6:  ftp://ftp.x.org/pub/individual/proto/fontcacheproto-0.1.2.tar.bz2
 Source7:  ftp://ftp.x.org/pub/individual/proto/fontsproto-2.0.2.tar.bz2
 Source8:  ftp://ftp.x.org/pub/individual/proto/glproto-1.4.8.tar.bz2
+Provides: glproto = 1.4.8
 Source9:  ftp://ftp.x.org/pub/individual/proto/inputproto-1.4.1.tar.bz2
+Provides: inputproto = 1.4.1
 Source10: ftp://ftp.x.org/pub/individual/proto/kbproto-1.0.3.tar.bz2
+Provides: kbproto = 1.0.3
 Source13: ftp://ftp.x.org/pub/individual/proto/randrproto-1.2.1.tar.bz2
+Provides: randrproto = 1.2.1
 Source14: ftp://ftp.x.org/pub/individual/proto/recordproto-1.13.2.tar.bz2
 Source15: ftp://ftp.x.org/pub/individual/proto/renderproto-0.9.2.tar.bz2
 Source16: ftp://ftp.x.org/pub/individual/proto/resourceproto-1.0.2.tar.bz2
 Source17: ftp://ftp.x.org/pub/individual/proto/scrnsaverproto-1.1.0.tar.bz2
+Provides: scrnsaverproto = 1.1.0
 Source18: ftp://ftp.x.org/pub/individual/proto/trapproto-3.4.3.tar.bz2
 Source19: ftp://ftp.x.org/pub/individual/proto/videoproto-2.2.2.tar.bz2
 Source20: ftp://ftp.x.org/pub/individual/proto/xcmiscproto-1.1.2.tar.bz2
@@ -44,6 +54,7 @@
 Source27: ftp://ftp.x.org/pub/individual/proto/xf86vidmodeproto-2.2.2.tar.bz2
 Source28: ftp://ftp.x.org/pub/individual/proto/xineramaproto-1.1.2.tar.bz2
 Source29: ftp://ftp.x.org/pub/individual/proto/xproto-7.0.10.tar.bz2
+Provides: xproto = 7.0.10
 Source30: ftp://ftp.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2
 
 BuildRequires: pkgconfig
@@ -275,6 +286,9 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Thu Apr 05 2007 Adam Jackson <ajax at redhat.com> 7.2-8
+- Add virtual provides for the subprotocols (#231156)
+
 * Mon Apr 02 2007 Adam Jackson <ajax at redhat.com> 7.2-7
 - inputproto 1.4.1
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 19:58:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 15:58:30 -0400
Subject: rpms/kernel/devel/configs config-generic,1.304,1.305
Message-ID: <200704051958.l35JwURN006054@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
enable CONFIG_SECURITY_NETWORK_XFRM


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -r1.304 -r1.305
--- config-generic	23 Mar 2007 19:43:59 -0000	1.304
+++ config-generic	5 Apr 2007 19:58:28 -0000	1.305
@@ -2779,7 +2779,7 @@
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y



From fedora-cvs-commits at redhat.com  Thu Apr  5 20:02:12 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 16:02:12 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.3047,1.3048
Message-ID: <200704052002.l35K2CEv006334@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
* Thu Apr 05 2007 Dave Jones <davej at redhat.com>
- Enable CONFIG_SECURITY_NETWORK_XFRM



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3047
retrieving revision 1.3048
diff -u -r1.3047 -r1.3048
--- kernel-2.6.spec	5 Apr 2007 18:37:18 -0000	1.3047
+++ kernel-2.6.spec	5 Apr 2007 20:02:09 -0000	1.3048
@@ -2251,6 +2251,9 @@
 #  - tux.
 
 %changelog
+* Thu Apr 05 2007 Dave Jones <davej at redhat.com>
+- Enable CONFIG_SECURITY_NETWORK_XFRM
+
 * Thu Apr 05 2007 David Woodhouse <dwmw2 at redhat.com>
 - Fix PowerMac generic suspend vs. IRQ disable
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 20:09:16 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 16:09:16 -0400
Subject: rpms/pciutils/devel pciutils.spec,1.44,1.45
Message-ID: <200704052009.l35K9GVV006490@cvs.devel.redhat.com>

Author: pjones

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

Modified Files:
	pciutils.spec 
Log Message:
- buildreq zlib-devel so we know we always get it.



Index: pciutils.spec
===================================================================
RCS file: /cvs/dist/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- pciutils.spec	2 Apr 2007 09:55:47 -0000	1.44
+++ pciutils.spec	5 Apr 2007 20:09:14 -0000	1.45
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	2.2.4
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Patch0:		pciutils-strip.patch
 Patch1: 	pciutils-2.2.4-buf.patch
@@ -14,6 +14,7 @@
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveOS: 	Linux
 Requires:	hwdata
+BuildRequires:	zlib-devel
 Summary: PCI bus related utilities
 Group: Applications/System
 
@@ -26,6 +27,7 @@
 %package devel
 Summary: Linux PCI development library
 Group: Development/Libraries
+Requires: zlib-devel
 
 %description devel
 This package contains a library for inspecting and setting
@@ -72,6 +74,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Apr  5 2007 Peter Jones <pjones at redhat.com> - 2.2.4-3
+- buildreq zlib-devel, so we know configure will find it consistently.
+
 * Mon Apr  2 2007 Harald Hoyer <harald at redhat.com> - 2.2.4-2
 - added alpha to multilib patch (#231790)
 - specfile cleanup



From fedora-cvs-commits at redhat.com  Thu Apr  5 20:14:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 16:14:36 -0400
Subject: rpms/kudzu/devel kudzu-1.2.67-sizeof.patch, NONE,
	1.1 kudzu-1.2.67-zlib.patch, NONE, 1.1 kudzu.spec, 1.168, 1.169
Message-ID: <200704052014.l35KEasI006651@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6629

Modified Files:
	kudzu.spec 
Added Files:
	kudzu-1.2.67-sizeof.patch kudzu-1.2.67-zlib.patch 
Log Message:
- fix build to always require zlib
- fix memset size in pci scan code


kudzu-1.2.67-sizeof.patch:
 pci.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE kudzu-1.2.67-sizeof.patch ---
--- kudzu-1.2.67/pci.c.sizeof	2007-04-05 16:10:05.000000000 -0400
+++ kudzu-1.2.67/pci.c	2007-04-05 16:11:29.000000000 -0400
@@ -373,12 +373,12 @@ struct device * pciProbe(enum deviceClas
 	    pci_init(pacc);
 	    pci_scan_bus(pacc);
 		
-	    memset(cardbus_bridges,'\0',32);
+	    memset(cardbus_bridges,'\0',sizeof (cardbus_bridges));
 	    /* enumerate cardbus bridges first */
 	    for (p = pacc->devices; p; p=p->next) {
 		u_int8_t config[256];
 		
-		memset(config,'\0',256);
+		memset(config,'\0', sizeof (config));
 	        pci_read_block(p, 0, config, 64);
 		if ((config[PCI_HEADER_TYPE] & 0x7f) == PCI_HEADER_TYPE_CARDBUS) {
 		    /* Cardbus bridge */
@@ -396,7 +396,7 @@ struct device * pciProbe(enum deviceClas
 		unsigned int subvend, subdev;
 		struct pciDevice *dev,*a_dev;
 		
-		memset(config,'\0',256);
+		memset(config,'\0', sizeof (config));
 		pci_read_block(p, 0, config, 64);
 		if ((config[PCI_HEADER_TYPE] & 0x7f) == PCI_HEADER_TYPE_CARDBUS) {
 		    /* Cardbus bridge */

kudzu-1.2.67-zlib.patch:
 Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kudzu-1.2.67-zlib.patch ---
--- kudzu-1.2.67/Makefile.zlib	2007-04-05 14:11:51.000000000 -0400
+++ kudzu-1.2.67/Makefile	2007-04-05 14:13:47.000000000 -0400
@@ -63,7 +63,7 @@ libkudzu.a: $(OBJS)
 	$(RANLIB) libkudzu.a
 
 kudzu: libkudzu.a $(KUDOBJS) po
-	$(CC) $(CFLAGS) $(LDFLAGS) $(KUDOBJS) -o kudzu -L. -lkudzu -L. -lpci -Wl,-Bstatic -lpopt -Wl,-Bdynamic
+	$(CC) $(CFLAGS) $(LDFLAGS) $(KUDOBJS) -o kudzu -L. -lkudzu -L. -lpci -lz -Wl,-Bstatic -lpopt -Wl,-Bdynamic
 
 module_upgrade: libkudzu.a module_upgrade.c
 	$(CC) $(CFLAGS) $(LDFLAGS) module_upgrade.c -o module_upgrade -L. -lkudzu -lpci
@@ -73,7 +73,7 @@ _kudzumodule.so: libkudzu.a
 		if [ ! -f "$$ver/_kudzumodule.so" -o libkudzu.a -nt "$$ver/_kudzumodule.so" ]; then \
 			mkdir -p $$ver ;\
 			$(CC) $(CFLAGS) -I/usr/include/$$ver -fpic -c -o $$ver/kudzumodule.o kudzumodule.c ;\
-	        	$(CC) -o $$ver/_kudzumodule.so $$ver/kudzumodule.o -shared -Wl,-soname,_kudzumodule.so -L. -lkudzu -lpci ;\
+	        	$(CC) -o $$ver/_kudzumodule.so $$ver/kudzumodule.o -shared -Wl,-soname,_kudzumodule.so -L. -lkudzu -lpci -lz ;\
 		fi ; \
 	done
 


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- kudzu.spec	29 Mar 2007 17:25:09 -0000	1.168
+++ kudzu.spec	5 Apr 2007 20:14:34 -0000	1.169
@@ -1,6 +1,6 @@
 Name: kudzu
 Version: 1.2.67
-Release: 1
+Release: 2
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
 Group: Applications/System
@@ -11,8 +11,10 @@
 Requires: pam >= 0.74-17
 Conflicts: netconfig < 0.8.18, kernel < 2.6.13, initscripts < 8.40-1
 Requires: hwdata >= 0.169-1, hal >= 0.2.96
-BuildPrereq: pciutils-devel >= 2.2.3-4, python-devel python gettext
+BuildPrereq: pciutils-devel >= 2.2.3-4, python-devel python gettext, zlib-devel
 BuildRoot: %{_tmppath}/%{name}-root
+Patch0: kudzu-1.2.67-zlib.patch
+Patch1: kudzu-1.2.67-sizeof.patch
 
 %description
 Kudzu is a hardware probing tool run at system boot time to determine
@@ -30,6 +32,8 @@
 %prep
 
 %setup
+%patch0 -p1 -b .zlib
+%patch1 -p1 -b .sizeof
 
 %build
 ln -s `pwd` kudzu
@@ -73,6 +77,10 @@
 %{_includedir}/kudzu
 
 %changelog
+* Thu Apr  5 2007 Peter Jones <pjones at redhat.com>- 1.2.67-2
+- Fix size of memset in pci scanning
+- require zlib during build
+
 * Thu Mar 29 2007 Jeremy Katz <katzj at redhat.com> - 1.2.67-1
 - try to get the "best" match for a pci device when matching aliases 
   instead of just the first match (#225026)  



From fedora-cvs-commits at redhat.com  Thu Apr  5 20:28:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 16:28:21 -0400
Subject: rpms/samba/devel samba-3.0.24-vista_msdfs_errcodes.patch, NONE,
	1.1 samba.spec, 1.104, 1.105
Message-ID: <200704052028.l35KSLKZ006848@cvs.devel.redhat.com>

Author: ssorce

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6825

Modified Files:
	samba.spec 
Added Files:
	samba-3.0.24-vista_msdfs_errcodes.patch 
Log Message:

Add a fix for msdfs + vista



samba-3.0.24-vista_msdfs_errcodes.patch:
 rpc_server/srv_dfs_nt.c |    6 ++---
 smbd/msdfs.c            |   57 ++++++++++++++++++++++++++++--------------------
 smbd/trans2.c           |    5 ++--
 3 files changed, 40 insertions(+), 28 deletions(-)

--- NEW FILE samba-3.0.24-vista_msdfs_errcodes.patch ---
diff -uPr samba-3.0.24/source/rpc_server/srv_dfs_nt.c samba-3.0.24.msdfs/source/rpc_server/srv_dfs_nt.c
--- samba-3.0.24/source/rpc_server/srv_dfs_nt.c	2007-02-04 13:59:21.000000000 -0500
+++ samba-3.0.24.msdfs/source/rpc_server/srv_dfs_nt.c	2007-04-05 13:23:04.000000000 -0400
@@ -67,7 +67,7 @@
 	pstrcat(altpath, sharename);
 
 	/* The following call can change the cwd. */
-	if(get_referred_path(p->mem_ctx, dfspath, &jn, NULL, NULL)) {
+	if(NT_STATUS_IS_OK(get_referred_path(p->mem_ctx, dfspath, &jn, NULL, NULL))) {
 		exists = True;
 		jn.referral_count += 1;
 		old_referral_list = jn.referral_list;
@@ -137,7 +137,7 @@
 	DEBUG(5,("init_reply_dfs_remove: Request to remove %s -> %s\\%s.\n",
 		dfspath, servername, sharename));
 
-	if(!get_referred_path(p->mem_ctx, dfspath, &jn, NULL, NULL)) {
+	if(!NT_STATUS_IS_OK(get_referred_path(p->mem_ctx, dfspath, &jn, NULL, NULL))) {
 		return WERR_DFS_NO_SUCH_VOL;
 	}
 
@@ -353,7 +353,7 @@
 		return WERR_DFS_NO_SUCH_SERVER;
   
 	/* The following call can change the cwd. */
-	if(!get_referred_path(p->mem_ctx, path, &jn, &consumedcnt, NULL) || consumedcnt < strlen(path)) {
+	if(!NT_STATUS_IS_OK(get_referred_path(p->mem_ctx, path, &jn, &consumedcnt, NULL)) || consumedcnt < strlen(path)) {
 		vfs_ChDir(p->conn,p->conn->connectpath);
 		return WERR_DFS_NO_SUCH_VOL;
 	}
diff -uPr samba-3.0.24/source/smbd/msdfs.c samba-3.0.24.msdfs/source/smbd/msdfs.c
--- samba-3.0.24/source/smbd/msdfs.c	2007-02-04 13:59:13.000000000 -0500
+++ samba-3.0.24.msdfs/source/smbd/msdfs.c	2007-04-05 12:58:18.000000000 -0400
@@ -129,7 +129,7 @@
  Note this CHANGES CWD !!!! JRA.
 *********************************************************/
 
-static BOOL create_conn_struct(connection_struct *conn, int snum, char *path)
+static NTSTATUS create_conn_struct(connection_struct *conn, int snum, char *path)
 {
 	pstring connpath;
 
@@ -143,15 +143,16 @@
 	
         if ( (conn->mem_ctx=talloc_init("connection_struct")) == NULL ) {
                 DEBUG(0,("talloc_init(connection_struct) failed!\n"));
-                return False;
+                return NT_STATUS_NO_MEMORY;
         }
 	
 	set_conn_connectpath(conn, connpath);
 
 	if (!smbd_vfs_init(conn)) {
+		NTSTATUS status = map_nt_error_from_unix(errno);
 		DEBUG(0,("create_conn_struct: smbd_vfs_init failed.\n"));
 		conn_free_internal(conn);
-		return False;
+		return status;
 	}
 
 	/*
@@ -161,13 +162,14 @@
 	 */
 
 	if (vfs_ChDir(conn,conn->connectpath) != 0) {
+		NTSTATUS status = map_nt_error_from_unix(errno);
 		DEBUG(3,("create_conn_struct: Can't ChDir to new conn path %s. Error was %s\n",
 					conn->connectpath, strerror(errno) ));
 		conn_free_internal(conn);
-		return False;
+		return status;
 	}
 
-	return True;
+	return NT_STATUS_OK;
 }
 
 /**********************************************************************
@@ -478,7 +480,7 @@
  junction_map structure.
 **********************************************************************/
 
-BOOL get_referred_path(TALLOC_CTX *ctx, char *pathname, struct junction_map *jucn,
+NTSTATUS get_referred_path(TALLOC_CTX *ctx, char *pathname, struct junction_map *jucn,
 		       int *consumedcntp, BOOL *self_referralp)
 {
 	struct dfs_path dp;
@@ -487,11 +489,11 @@
 	struct connection_struct *conn = &conns;
 	pstring conn_path;
 	int snum;
-	BOOL ret = False;
+	NTSTATUS status = NT_STATUS_NOT_FOUND;
 	BOOL self_referral = False;
 
 	if (!pathname || !jucn) {
-		return False;
+		return NT_STATUS_NOT_FOUND;
 	}
 
 	ZERO_STRUCT(conns);
@@ -508,7 +510,7 @@
 	if (!is_myname_or_ipaddr(dp.hostname)) {
 		DEBUG(3, ("get_referred_path: Invalid hostname %s in path %s\n",
 			dp.hostname, pathname));
-		return False;
+		return NT_STATUS_NOT_FOUND;
 	}
 
 	pstrcpy(jucn->service_name, dp.servicename);
@@ -518,14 +520,14 @@
 	snum = lp_servicenumber(jucn->service_name);
 	if(snum < 0) {
 		if ((snum = find_service(jucn->service_name)) < 0) {
-			return False;
+			return NT_STATUS_NOT_FOUND;
 		}
 	}
 
 	if (!lp_msdfs_root(snum)) {
 		DEBUG(3,("get_referred_path: .%s. in dfs path %s is not a dfs root.\n",
 			 dp.servicename, pathname));
-		goto out;
+		return NT_STATUS_NOT_FOUND;
 	}
 
 	/*
@@ -540,13 +542,17 @@
 		struct referral* ref;
 
 		if (*lp_msdfs_proxy(snum) == '\0') {
-			return self_ref(ctx, pathname, jucn, consumedcntp, self_referralp);
+			if (self_ref(ctx, pathname, jucn, consumedcntp, self_referralp)) {
+				return NT_STATUS_OK;
+			} else {
+				return NT_STATUS_NOT_FOUND;
+			}
 		}
 
 		jucn->referral_count = 1;
 		if ((ref = TALLOC_P(ctx, struct referral)) == NULL) {
 			DEBUG(0, ("malloc failed for referral\n"));
-			goto out;
+			return NT_STATUS_NO_MEMORY;
 		}
 
 		pstrcpy(ref->alternate_path, lp_msdfs_proxy(snum));
@@ -559,13 +565,13 @@
 		if (consumedcntp) {
 			*consumedcntp = strlen(pathname);
 		}
-		ret = True;
-		goto out;
+		return NT_STATUS_OK;
 	}
 
 	pstrcpy(conn_path, lp_pathname(snum));
-	if (!create_conn_struct(conn, snum, conn_path)) {
-		return False;
+	status = create_conn_struct(conn, snum, conn_path);
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
 	}
 
 	/* If not remote & not a self referral, return False */
@@ -585,12 +591,12 @@
 		}
 	}
 	
-	ret = True;
+	status = NT_STATUS_OK;
 
 out:
 
 	conn_free_internal(conn);
-	return ret;
+	return status;
 }
 
 static int setup_ver2_dfs_referral(char *pathname, char **ppdata, 
@@ -780,7 +786,7 @@
  Set up the Dfs referral for the dfs pathname
 ******************************************************************/
 
-int setup_dfs_referral(connection_struct *orig_conn, char *pathname, int max_referral_level, char **ppdata)
+int setup_dfs_referral(connection_struct *orig_conn, char *pathname, int max_referral_level, char **ppdata, NTSTATUS *pstatus)
 {
 	struct junction_map junction;
 	int consumedcnt;
@@ -791,6 +797,7 @@
 	TALLOC_CTX *ctx;
 
 	if (!(ctx=talloc_init("setup_dfs_referral"))) {
+		*pstatus = NT_STATUS_NO_MEMORY;
 		return -1;
 	}
 
@@ -799,6 +806,7 @@
 	/* get the junction entry */
 	if (!pathnamep) {
 		talloc_destroy(ctx);
+		*pstatus = NT_STATUS_NO_MEMORY;
 		return -1;
 	}
 
@@ -811,7 +819,8 @@
 
 	pstrcpy(buf, pathnamep);
 	/* The following call can change cwd. */
-	if (!get_referred_path(ctx, buf, &junction, &consumedcnt, &self_referral)) {
+	*pstatus = get_referred_path(ctx, buf, &junction, &consumedcnt, &self_referral);
+	if(!NT_STATUS_IS_OK(*pstatus)) {
 		vfs_ChDir(orig_conn,orig_conn->connectpath);
 		talloc_destroy(ctx);
 		return -1;
@@ -848,6 +857,7 @@
 	default:
 		DEBUG(0,("setup_dfs_referral: Invalid dfs referral version: %d\n", max_referral_level));
 		talloc_destroy(ctx);
+		*pstatus = NT_STATUS_INVALID_LEVEL;
 		return -1;
 	}
       
@@ -857,6 +867,7 @@
 	}
 
 	talloc_destroy(ctx);
+	*pstatus = NT_STATUS_OK;
 	return reply_size;
 }
 
@@ -917,7 +928,7 @@
 	safe_strcat(path, jucn->volume_name, max_pathlen-1);
 
 	pstrcpy(conn_path, lp_pathname(snum));
-	if (!create_conn_struct(conn, snum, conn_path)) {
+	if (!NT_STATUS_IS_OK(create_conn_struct(conn, snum, conn_path))) {
 		return False;
 	}
 
@@ -1031,7 +1042,7 @@
 	 * Fake up a connection struct for the VFS layer.
 	 */
 
-	if (!create_conn_struct(&conn, snum, connect_path)) {
+	if (!NT_STATUS_IS_OK(create_conn_struct(&conn, snum, connect_path))) {
 		return 0;
 	}
 
diff -uPr samba-3.0.24/source/smbd/trans2.c samba-3.0.24.msdfs/source/smbd/trans2.c
--- samba-3.0.24/source/smbd/trans2.c	2007-02-04 14:09:01.000000000 -0500
+++ samba-3.0.24.msdfs/source/smbd/trans2.c	2007-04-05 12:57:22.000000000 -0400
@@ -4934,6 +4934,7 @@
   	pstring pathname;
 	int reply_size = 0;
 	int max_referral_level;
+	NTSTATUS status = NT_STATUS_OK;
 
 	DEBUG(10,("call_trans2getdfsreferral\n"));
 
@@ -4947,8 +4948,8 @@
 		return ERROR_DOS(ERRDOS,ERRbadfunc);
 
 	srvstr_pull(inbuf, pathname, &params[2], sizeof(pathname), -1, STR_TERMINATE);
-	if((reply_size = setup_dfs_referral(conn, pathname,max_referral_level,ppdata)) < 0)
-		return UNIXERROR(ERRDOS,ERRbadfile);
+	if((reply_size = setup_dfs_referral(conn, pathname,max_referral_level,ppdata,&status)) < 0)
+		return ERROR_NT(status);
     
 	SSVAL(outbuf,smb_flg2,SVAL(outbuf,smb_flg2) | FLAGS2_DFS_PATHNAMES);
 	send_trans2_replies(outbuf,bufsize,0,0,*ppdata,reply_size);


Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- samba.spec	5 Apr 2007 14:26:25 -0000	1.104
+++ samba.spec	5 Apr 2007 20:28:19 -0000	1.105
@@ -4,7 +4,7 @@
 Name: samba
 Epoch: 0
 Version: 3.0.24
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.samba.org/
@@ -53,6 +53,7 @@
 Patch118: samba-3.0.24-tar_options.patch
 Patch119: samba-3.0.24-enable_pam_nss_tests.patch
 Patch120: samba-3.0.24-nss_wins.patch
+Patch121: samba-3.0.24-vista_msdfs_errcodes.patch
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
 Requires: pam >= 0:0.64 %{auth} 
@@ -179,6 +180,7 @@
 %patch118 -p0 -b .tar_options
 %patch119 -p0 -b .pam_nss_test
 %patch120 -p0 -b .nss_wins
+%patch121 -p1 -b .msdfs
 
 # crap
 rm -f examples/VFS/.cvsignore
@@ -252,6 +254,7 @@
 mkdir -p $RPM_BUILD_ROOT/var/lib/samba
 mkdir -p $RPM_BUILD_ROOT/var/lib/samba/private
 mkdir -p $RPM_BUILD_ROOT/var/lib/samba/winbindd_privileged
+mkdir -p $RPM_BUILD_ROOT/var/lib/samba/scripts
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/swat/using_samba
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/samba/codepages 
 mkdir -p $RPM_BUILD_ROOT/var/run/winbindd
@@ -632,10 +635,11 @@
 #%{_includedir}/libmsrpc.h
 
 %changelog
-* Wed Apr 4 2007 Simo Sorce <ssorce at redhat.com>
+* Wed Apr 4 2007 Simo Sorce <ssorce at redhat.com> 3.0.24-12.fc7
 - fixes in smb.conf
 - advice in smb.conf to put scripts in /var/lib/samba/scripts
 - create /var/lib/samba/scripts so that selinux can be happy
+- fix Vista problems with msdfs errors
 
 * Tue Apr 03 2007 Guenther Deschner <gdeschner at redhat.com> 3.0.24-11.fc7
 - enable PAM and NSS dlopen checks during build



From fedora-cvs-commits at redhat.com  Thu Apr  5 20:29:13 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 16:29:13 -0400
Subject: rpms/samba/FC-5 samba-3.0.24-arch_macro.patch, NONE,
	1.1 samba-3.0.24-enable_pam_nss_tests.patch, NONE,
	1.1 samba-3.0.24-fhs-compliance.patch, NONE,
	1.1 samba-3.0.24-msdfs-root-no.patch, NONE,
	1.1 samba-3.0.24-nss_wins.patch, NONE,
	1.1 samba-3.0.24-pam_winbind-fixes.patch, NONE,
	1.1 samba-3.0.24-vista-patchset.patch, NONE,
	1.1 samba-3.0.24-vista_msdfs_errcodes.patch, NONE,
	1.1 samba.spec, 1.73, 1.74
Message-ID: <200704052029.l35KTDHZ006900@cvs.devel.redhat.com>

Author: ssorce

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

Modified Files:
	samba.spec 
Added Files:
	samba-3.0.24-arch_macro.patch 
	samba-3.0.24-enable_pam_nss_tests.patch 
	samba-3.0.24-fhs-compliance.patch 
	samba-3.0.24-msdfs-root-no.patch samba-3.0.24-nss_wins.patch 
	samba-3.0.24-pam_winbind-fixes.patch 
	samba-3.0.24-vista-patchset.patch 
	samba-3.0.24-vista_msdfs_errcodes.patch 
Log Message:

3.0.24 bug fixes from rawhide



samba-3.0.24-arch_macro.patch:
 negprot.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE samba-3.0.24-arch_macro.patch ---
------------------------------------------------------------------------
r21857 | gd | 2007-03-16 17:20:47 +0100 (Fri, 16 Mar 2007) | 4 lines

Stop pretending to be Vista in the %a macro towards Samba clients.

Guenther

------------------------------------------------------------------------
Index: source/smbd/negprot.c
===================================================================
--- source/smbd/negprot.c	(revision 21856)
+++ source/smbd/negprot.c	(revision 21857)
@@ -259,7 +259,9 @@ static int reply_nt1(char *inbuf, char *
 	if ( (SVAL(inbuf, smb_flg2) & FLAGS2_EXTENDED_SECURITY) &&
 		((SVAL(inbuf, smb_flg2) & FLAGS2_UNKNOWN_BIT4) == 0) ) 
 	{
-		set_remote_arch( RA_VISTA );		
+		if (get_remote_arch() != RA_SAMBA) {
+			set_remote_arch( RA_VISTA );
+		}
 	}
 
 	/* do spnego in user level security if the client

samba-3.0.24-enable_pam_nss_tests.patch:
 Makefile.in |   16 ++++++++++++++++
 1 files changed, 16 insertions(+)

--- NEW FILE samba-3.0.24-enable_pam_nss_tests.patch ---
--- source/Makefile.in
+++ source/Makefile.in
@@ -160,6 +160,8 @@
 
 PAM_MODULES = @PAM_MODULES@
 
+NSS_MODULES = @WINBIND_WINS_NSS@ @WINBIND_NSS@
+
 SCRIPTS = $(srcdir)/script/smbtar $(builddir)/script/findsmb
 
 VFS_MODULES = @VFS_MODULES@
@@ -769,6 +771,12 @@
 all : SHOWFLAGS proto_exists $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \
 	$(SHLIBS) $(MODULES) $(PAM_MODULES) @EXTRA_ALL_TARGETS@
 
+nss_modules : $(NSS_MODULES)
+
+libnss_winbind : SHOWFLAGS proto_exists nsswitch/libnss_winbind. at SHLIBEXT@
+
+libnss_wins : SHOWFLAGS proto_exists nsswitch/libnss_wins. at SHLIBEXT@
+
 pam_modules : $(PAM_MODULES)
 
 pam_smbpass : SHOWFLAGS proto_exists bin/pam_smbpass. at SHLIBEXT@
@@ -1736,6 +1744,14 @@
 ######################################################################
 # Samba Testing Framework
 
+# Check for NSS module problems. 
+test_nss_modules: nss_modules
+	@echo "Testing $(NSS_MODULES) "
+	@for module in $(NSS_MODULES); do \
+		./script/tests/dlopen.sh $${module} \
+			|| exit 1; \
+	done
+
 # Check for PAM module problems.  Specifically, check that every module we
 # built can actually be loaded by a minimal PAM-aware application.
 test_pam_modules: pam_modules

samba-3.0.24-fhs-compliance.patch:
 Makefile.in                   |   10 ++++++----
 configure.in                  |   35 +++++++++++++++++++++++++++--------
 dynconfig.c                   |    3 ++-
 groupdb/mapping.c             |    2 +-
 include/dynconfig.h           |    3 ++-
 intl/lang_tdb.c               |    2 +-
 lib/account_pol.c             |    2 +-
 lib/gencache.c                |    2 +-
 lib/messages.c                |    2 +-
 lib/popt_common.c             |   25 +++++++++++++++++++++++--
 lib/sharesec.c                |    4 ++--
 lib/util.c                    |   26 +++++++++++++++++++++++---
 libsmb/gpo.c                  |    2 +-
 libsmb/samlogon_cache.c       |    4 ++--
 libsmb/unexpected.c           |    4 ++--
 locking/brlock.c              |    4 ++--
 locking/locking.c             |    2 +-
 nmbd/nmbd.c                   |    4 ++--
 nmbd/nmbd_namelistdb.c        |    2 +-
 nmbd/nmbd_processlogon.c      |    2 +-
 nmbd/nmbd_serverlistdb.c      |    2 +-
 nmbd/nmbd_synclists.c         |    2 +-
 nmbd/nmbd_winsserver.c        |    6 +++---
 nsswitch/winbindd_cache.c     |    4 ++--
 nsswitch/winbindd_util.c      |    4 ++--
 param/loadparm.c              |   26 ++++++++++++++++++++------
 passdb/login_cache.c          |    2 +-
 passdb/pdb_tdb.c              |    2 +-
 printing/nt_printing.c        |   14 +++++++-------
 printing/printing.c           |    6 +++---
 printing/printing_db.c        |    2 +-
 registry/reg_db.c             |   10 +++++-----
 registry/reg_perfcount.c      |    4 ++--
 rpc_server/srv_eventlog_lib.c |    4 ++--
 rpc_server/srv_netlog_nt.c    |    2 +-
 sam/idmap_tdb.c               |    2 +-
 script/mkbuildoptions.awk     |    3 ++-
 script/tests/selftest.sh      |   10 ++++++----
 smbd/connection.c             |    4 ++--
 smbd/lanman.c                 |    4 ++--
 smbd/oplock_irix.c            |    2 +-
 smbd/server.c                 |    7 +++++--
 smbd/session.c                |    2 +-
 utils/net_idmap.c             |    2 +-
 utils/net_status.c            |   16 ++++++++--------
 utils/smbcontrol.c            |   12 ++++++------
 utils/status.c                |    8 ++++----
 utils/testparm.c              |   20 +++++++++++++++-----
 web/statuspage.c              |    2 +-
 49 files changed, 209 insertions(+), 115 deletions(-)

--- NEW FILE samba-3.0.24-fhs-compliance.patch ---
diff -uPr samba-3.0.24.old/source/configure.in samba-3.0.24.new/source/configure.in
--- samba-3.0.24.old/source/configure.in	2007-02-04 13:59:28.000000000 -0500
+++ samba-3.0.24.new/source/configure.in	2007-03-06 15:16:27.000000000 -0500
@@ -23,7 +23,8 @@
 AC_PREFIX_DEFAULT(/usr/local/samba)
 
 rootsbindir="\${SBINDIR}"
-lockdir="\${VARDIR}/locks"
+cachedir="\${VARDIR}/locks"
+statedir="\${VARDIR}/locks"
 piddir="\${VARDIR}/locks"
 test "${mandir}" || mandir="\${prefix}/man"
 logfilebase="\${VARDIR}"
@@ -37,7 +38,8 @@
 [  --with-fhs              Use FHS-compliant paths (default=no)],
 [ case "$withval" in
   yes)
-    lockdir="\${VARDIR}/lib/samba"
+    cachedir="\${VARDIR}/cache/samba"
+    statedir="\${VARDIR}/lib/samba"
     piddir="\${VARDIR}/run"
     mandir="\${prefix}/share/man"
     logfilebase="\${VARDIR}/log/samba"
@@ -81,18 +83,34 @@
   esac])
 
 #################################################
-# set lock directory location
-AC_ARG_WITH(lockdir,
-[  --with-lockdir=DIR      Where to put lock files ($ac_default_prefix/var/locks)],
+# set cache directory location
+AC_ARG_WITH(cachedir,
+[  --with-cachedir=DIR      Where to put persistent files ($ac_default_prefix/var/locks)],
 [ case "$withval" in
   yes|no)
   #
   # Just in case anybody calls it without argument
   #
-    AC_MSG_WARN([--with-lockdir called without argument - will use default])
+    AC_MSG_WARN([--with-cachedir called without argument - will use default])
   ;;
   * )
-    lockdir="$withval"
+    cachedir="$withval"
+    ;;
+  esac])
+
+#################################################
+# set state directory location
+AC_ARG_WITH(statedir,
+[  --with-statedir=DIR      Where to put persistent files ($ac_default_prefix/var/locks)],
+[ case "$withval" in
+  yes|no)
+  #
+  # Just in case anybody calls it without argument
+  #
+    AC_MSG_WARN([--with-statedir called without argument - will use default])
+  ;;
+  * )
+    statedir="$withval"
     ;;
   esac])
 
@@ -228,7 +246,8 @@
 ])
 
 AC_SUBST(configdir)
-AC_SUBST(lockdir)
+AC_SUBST(cachedir)
+AC_SUBST(statedir)
 AC_SUBST(piddir)
 AC_SUBST(logfilebase)
 AC_SUBST(privatedir)
diff -uPr samba-3.0.24.old/source/dynconfig.c samba-3.0.24.new/source/dynconfig.c
--- samba-3.0.24.old/source/dynconfig.c	2007-02-04 13:59:28.000000000 -0500
+++ samba-3.0.24.new/source/dynconfig.c	2007-03-06 15:31:22.000000000 -0500
@@ -65,7 +65,8 @@
  *
  * Not writable, but used to set a default in the parameter table.
  **/
-pstring dyn_LOCKDIR = LOCKDIR;
+pstring dyn_STATEDIR = STATEDIR;
+pstring dyn_CACHEDIR = CACHEDIR;
 pstring dyn_PIDDIR  = PIDDIR;
 
 pstring dyn_SMB_PASSWD_FILE = SMB_PASSWD_FILE;
diff -uPr samba-3.0.24.old/source/groupdb/mapping.c samba-3.0.24.new/source/groupdb/mapping.c
--- samba-3.0.24.old/source/groupdb/mapping.c	2007-02-04 13:59:14.000000000 -0500
+++ samba-3.0.24.new/source/groupdb/mapping.c	2007-03-06 15:55:49.000000000 -0500
@@ -56,7 +56,7 @@
 	if (tdb)
 		return True;
 		
-	tdb = tdb_open_log(lock_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+	tdb = tdb_open_log(state_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 	if (!tdb) {
 		DEBUG(0,("Failed to open group mapping database\n"));
 		return False;
diff -uPr samba-3.0.24.old/source/include/dynconfig.h samba-3.0.24.new/source/include/dynconfig.h
--- samba-3.0.24.old/source/include/dynconfig.h	2007-02-04 13:59:23.000000000 -0500
+++ samba-3.0.24.new/source/include/dynconfig.h	2007-03-06 15:53:36.000000000 -0500
@@ -32,7 +32,8 @@
 extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
 extern pstring dyn_LIBDIR;
 extern fstring dyn_SHLIBEXT;
-extern pstring dyn_LOCKDIR;
+extern pstring dyn_CACHEDIR;
+extern pstring dyn_STATEDIR;
 extern pstring dyn_PIDDIR;
 extern pstring dyn_SMB_PASSWD_FILE;
 extern pstring dyn_PRIVATE_DIR;
diff -uPr samba-3.0.24.old/source/intl/lang_tdb.c samba-3.0.24.new/source/intl/lang_tdb.c
--- samba-3.0.24.old/source/intl/lang_tdb.c	2006-04-19 22:29:23.000000000 -0400
+++ samba-3.0.24.new/source/intl/lang_tdb.c	2007-03-06 15:56:14.000000000 -0500
@@ -139,7 +139,7 @@
 		goto done;
 	}
 	
-	asprintf(&path, "%s%s.tdb", lock_path("lang_"), lang);
+	asprintf(&path, "%s%s.tdb", state_path("lang_"), lang);
 
 	DEBUG(10, ("lang_tdb_init: loading %s\n", path));
 
diff -uPr samba-3.0.24.old/source/lib/account_pol.c samba-3.0.24.new/source/lib/account_pol.c
--- samba-3.0.24.old/source/lib/account_pol.c	2007-02-04 13:59:18.000000000 -0500
+++ samba-3.0.24.new/source/lib/account_pol.c	2007-03-06 15:56:23.000000000 -0500
@@ -262,7 +262,7 @@
 		return True;
 	}
 
-	tdb = tdb_open_log(lock_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+	tdb = tdb_open_log(state_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 	if (!tdb) {
 		DEBUG(0,("Failed to open account policy database\n"));
 		return False;
diff -uPr samba-3.0.24.old/source/lib/gencache.c samba-3.0.24.new/source/lib/gencache.c
--- samba-3.0.24.old/source/lib/gencache.c	2007-02-04 13:59:17.000000000 -0500
+++ samba-3.0.24.new/source/lib/gencache.c	2007-03-06 15:56:34.000000000 -0500
@@ -56,7 +56,7 @@
 	/* skip file open if it's already opened */
 	if (cache) return True;
 
-	cache_fname = lock_path("gencache.tdb");
+	cache_fname = cache_path("gencache.tdb");
 
 	DEBUG(5, ("Opening cache file at %s\n", cache_fname));
 
diff -uPr samba-3.0.24.old/source/lib/messages.c samba-3.0.24.new/source/lib/messages.c
--- samba-3.0.24.old/source/lib/messages.c	2007-02-04 13:59:18.000000000 -0500
+++ samba-3.0.24.new/source/lib/messages.c	2007-03-06 15:56:43.000000000 -0500
@@ -119,7 +119,7 @@
 {
 	if (tdb) return True;
 
-	tdb = tdb_open_log(lock_path("messages.tdb"), 
+	tdb = tdb_open_log(cache_path("messages.tdb"), 
 		       0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, 
 		       O_RDWR|O_CREAT,0600);
 
diff -uPr samba-3.0.24.old/source/lib/popt_common.c samba-3.0.24.new/source/lib/popt_common.c
--- samba-3.0.24.old/source/lib/popt_common.c	2007-02-04 13:59:17.000000000 -0500
+++ samba-3.0.24.new/source/lib/popt_common.c	2007-03-06 15:38:15.000000000 -0500
@@ -156,6 +156,8 @@
  *		--lmhostsfile
  *		--libdir
  *		--shlibext
+ *		--statedir
+ *		--cachedir
  *		--lockdir
  *		--piddir
  *		--smb-passwd-file
@@ -169,6 +171,8 @@
 	DYN_LMHOSTSFILE,
 	DYN_LIBDIR,
 	DYN_SHLIBEXT,
+	DYN_STATEDIR,
+	DYN_CACHEDIR,
 	DYN_LOCKDIR,
 	DYN_PIDDIR,
 	DYN_SMB_PASSWD_FILE,
@@ -219,9 +223,22 @@
 		}
 		break;
 
+	case DYN_STATEDIR:
+		if (arg) {
+			pstrcpy(dyn_STATEDIR, arg);
+		}
+		break;
+
+	case DYN_CACHEDIR:
+		if (arg) {
+			pstrcpy(dyn_CACHEDIR, arg);
+		}
+		break;
+
 	case DYN_LOCKDIR:
 		if (arg) {
-			pstrcpy(dyn_LOCKDIR, arg);
+			pstrcpy(dyn_STATEDIR, arg);
+			pstrcpy(dyn_CACHEDIR, arg);
 		}
 		break;
 
@@ -262,8 +279,12 @@
 	    "Path to shared library directory", "LIBDIR" },
 	{ "shlibext", '\0' , POPT_ARG_STRING, NULL, DYN_SHLIBEXT,
 	    "Shared library extension", "SHLIBEXT" },
+	{ "statedir", '\0' , POPT_ARG_STRING, NULL, DYN_STATEDIR,
+	    "Path to state file directory", "STATEDIR" },
+	{ "cachedir", '\0' , POPT_ARG_STRING, NULL, DYN_CACHEDIR,
+	    "Path to cache file directory", "CACHEDIR" },
 	{ "lockdir", '\0' , POPT_ARG_STRING, NULL, DYN_LOCKDIR,
-	    "Path to lock file directory", "LOCKDIR" },
+	    "Path to lock(cache and state) file directory", "LOCKDIR" },
 	{ "piddir", '\0' , POPT_ARG_STRING, NULL, DYN_PIDDIR,
 	    "Path to PID file directory", "PIDDIR" },
 	{ "smb-passwd-file", '\0' , POPT_ARG_STRING, NULL, DYN_SMB_PASSWD_FILE,
diff -uPr samba-3.0.24.old/source/lib/sharesec.c samba-3.0.24.new/source/lib/sharesec.c
--- samba-3.0.24.old/source/lib/sharesec.c	2006-04-19 22:29:23.000000000 -0400
+++ samba-3.0.24.new/source/lib/sharesec.c	2007-03-06 15:56:59.000000000 -0500
@@ -47,10 +47,10 @@
 		return True;
 	}
 
-	share_tdb = tdb_open_log(lock_path("share_info.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+	share_tdb = tdb_open_log(state_path("share_info.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 	if (!share_tdb) {
 		DEBUG(0,("Failed to open share info database %s (%s)\n",
-			lock_path("share_info.tdb"), strerror(errno) ));
+			state_path("share_info.tdb"), strerror(errno) ));
 		return False;
 	}
  
diff -uPr samba-3.0.24.old/source/lib/util.c samba-3.0.24.new/source/lib/util.c
--- samba-3.0.24.old/source/lib/util.c	2007-02-04 13:59:17.000000000 -0500
+++ samba-3.0.24.new/source/lib/util.c	2007-03-06 15:55:29.000000000 -0500
@@ -2519,14 +2519,34 @@
 }
 
 /*****************************************************************
- A useful function for returning a path in the Samba lock directory.
+ A useful function for returning a path in the Samba cache directory.
 *****************************************************************/  
 
-char *lock_path(const char *name)
+char *cache_path(const char *name)
 {
 	static pstring fname;
 
-	pstrcpy(fname,lp_lockdir());
+	pstrcpy(fname,lp_cachedir());
+	trim_char(fname,'\0','/');
+	
+	if (!directory_exist(fname,NULL))
+		mkdir(fname,0755);
+	
+	pstrcat(fname,"/");
+	pstrcat(fname,name);
+
+	return fname;
+}
+
+/*****************************************************************
+ A useful function for returning a path in the Samba state directory.
+*****************************************************************/  
+
+char *state_path(const char *name)
+{
+	static pstring fname;
+
+	pstrcpy(fname,lp_statedir());
 	trim_char(fname,'\0','/');
 	
 	if (!directory_exist(fname,NULL))
diff -uPr samba-3.0.24.old/source/libsmb/gpo.c samba-3.0.24.new/source/libsmb/gpo.c
--- samba-3.0.24.old/source/libsmb/gpo.c	2006-04-19 22:29:25.000000000 -0400
+++ samba-3.0.24.new/source/libsmb/gpo.c	2007-03-06 15:57:10.000000000 -0500
@@ -76,7 +76,7 @@
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	local_file = talloc_asprintf(mem_ctx, "%s/%s", lock_path("gpo_cache"), "gpt.ini");
+	local_file = talloc_asprintf(mem_ctx, "%s/%s", cache_path("gpo_cache"), "gpt.ini");
 	if (local_file == NULL) {
 		return NT_STATUS_NO_MEMORY;
 	}
diff -uPr samba-3.0.24.old/source/libsmb/samlogon_cache.c samba-3.0.24.new/source/libsmb/samlogon_cache.c
--- samba-3.0.24.old/source/libsmb/samlogon_cache.c	2007-02-04 13:59:20.000000000 -0500
+++ samba-3.0.24.new/source/libsmb/samlogon_cache.c	2007-03-06 15:57:27.000000000 -0500
@@ -34,7 +34,7 @@
 BOOL netsamlogon_cache_init(void)
 {
 	if (!netsamlogon_tdb) {
-		netsamlogon_tdb = tdb_open_log(lock_path(NETSAMLOGON_TDB), 0,
+		netsamlogon_tdb = tdb_open_log(cache_path(NETSAMLOGON_TDB), 0,
 						   TDB_DEFAULT, O_RDWR | O_CREAT, 0600);
 	}
 
@@ -67,7 +67,7 @@
            winbindd_cache.tdb open.  Open the tdb if a NULL is passed. */
 
 	if (!tdb) {
-		tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 5000,
+		tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), 5000,
 				   TDB_DEFAULT, O_RDWR, 0600);
 		if (!tdb) {
 			DEBUG(5, ("netsamlogon_clear_cached_user: failed to open cache\n"));
diff -uPr samba-3.0.24.old/source/libsmb/unexpected.c samba-3.0.24.new/source/libsmb/unexpected.c
--- samba-3.0.24.old/source/libsmb/unexpected.c	2005-02-25 12:59:32.000000000 -0500
+++ samba-3.0.24.new/source/libsmb/unexpected.c	2007-03-06 15:57:43.000000000 -0500
@@ -46,7 +46,7 @@
 	int len=0;
 
 	if (!tdbd) {
-		tdbd = tdb_open_log(lock_path("unexpected.tdb"), 0, 
+		tdbd = tdb_open_log(cache_path("unexpected.tdb"), 0, 
 			       TDB_CLEAR_IF_FIRST|TDB_DEFAULT,
 			       O_RDWR | O_CREAT, 0644);
 		if (!tdbd) {
@@ -148,7 +148,7 @@
 {
 	TDB_CONTEXT *tdb2;
 
-	tdb2 = tdb_open_log(lock_path("unexpected.tdb"), 0, 0, O_RDONLY, 0);
+	tdb2 = tdb_open_log(cache_path("unexpected.tdb"), 0, 0, O_RDONLY, 0);
 	if (!tdb2) return NULL;
 
 	matched_packet = NULL;
diff -uPr samba-3.0.24.old/source/locking/brlock.c samba-3.0.24.new/source/locking/brlock.c
--- samba-3.0.24.old/source/locking/brlock.c	2007-02-04 13:59:23.000000000 -0500
+++ samba-3.0.24.new/source/locking/brlock.c	2007-03-06 15:58:11.000000000 -0500
@@ -270,13 +270,13 @@
 	if (tdb) {
 		return;
 	}
-	tdb = tdb_open_log(lock_path("brlock.tdb"),
+	tdb = tdb_open_log(cache_path("brlock.tdb"),
 			lp_open_files_db_hash_size(),
 			TDB_DEFAULT|(read_only?0x0:TDB_CLEAR_IF_FIRST),
 			read_only?O_RDONLY:(O_RDWR|O_CREAT), 0644 );
 	if (!tdb) {
 		DEBUG(0,("Failed to open byte range locking database %s\n",
-			lock_path("brlock.tdb")));
+			cache_path("brlock.tdb")));
 		return;
 	}
 }
diff -uPr samba-3.0.24.old/source/locking/locking.c samba-3.0.24.new/source/locking/locking.c
--- samba-3.0.24.old/source/locking/locking.c	2007-02-04 13:59:23.000000000 -0500
+++ samba-3.0.24.new/source/locking/locking.c	2007-03-06 15:58:19.000000000 -0500
@@ -369,7 +369,7 @@
 	if (tdb)
 		return True;
 
-	tdb = tdb_open_log(lock_path("locking.tdb"), 
+	tdb = tdb_open_log(cache_path("locking.tdb"), 
 			lp_open_files_db_hash_size(),
 			TDB_DEFAULT|(read_only?0x0:TDB_CLEAR_IF_FIRST), 
 			read_only?O_RDONLY:O_RDWR|O_CREAT,
diff -uPr samba-3.0.24.old/source/Makefile.in samba-3.0.24.new/source/Makefile.in
--- samba-3.0.24.old/source/Makefile.in	2007-02-04 13:59:28.000000000 -0500
+++ samba-3.0.24.new/source/Makefile.in	2007-03-06 15:40:03.000000000 -0500
@@ -98,7 +98,8 @@
 SWATDIR = @swatdir@
 
 # the directory where lock files go
-LOCKDIR = @lockdir@
+STATEDIR = @statedir@
+CACHEDIR = @cachedir@
 
 # the directory where pid files go
 PIDDIR = @piddir@
@@ -126,7 +127,7 @@
 PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\"  -DSBINDIR=\"$(SBINDIR)\"
 PATH_FLAGS2 = $(PATH_FLAGS1) -DBINDIR=\"$(BINDIR)\" -DDRIVERFILE=\"$(DRIVERFILE)\" 
 PATH_FLAGS3 = $(PATH_FLAGS2) -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" 
-PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\"  -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\"
+PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\"  -DSTATEDIR=\"$(STATEDIR)\" -DCACHEDIR=\"$(CACHEEDIR)\" -DPIDDIR=\"$(PIDDIR)\"
 PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \
 	      -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"@SHLIBEXT@\"
 PATH_FLAGS6 = $(PATH_FLAGS5) -DCONFIGDIR=\"$(CONFIGDIR)\"
@@ -1437,7 +1438,7 @@
 # is not used
 
 installdirs:
-	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(BINDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(PRIVATEDIR) $(PIDDIR) $(LOCKDIR) $(MANDIR)
+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(BINDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(PRIVATEDIR) $(PIDDIR) $(STATEDIR) $(CACHEDIR) $(MANDIR)
 
 installservers: all installdirs
 	@$(SHELL) script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(SBINDIR) $(SBIN_PROGS)
@@ -1549,7 +1550,8 @@
 	@echo "  mandir:      $(MANDIR)"
 	@echo "  privatedir:  $(PRIVATE_DIR)"
 	@echo "  configdir:   $(CONFIGDIR)"
-	@echo "  lockdir:     $(LOCKDIR)"
+	@echo "  statedir:    $(STATEDIR)"
+	@echo "  cachedir:    $(CACHEDIR)"
 	@echo "  piddir:      $(PIDDIR)"
 	@echo "  swatdir:     $(SWATDIR)"
 
diff -uPr samba-3.0.24.old/source/nmbd/nmbd.c samba-3.0.24.new/source/nmbd/nmbd.c
--- samba-3.0.24.old/source/nmbd/nmbd.c	2007-02-04 13:59:23.000000000 -0500
+++ samba-3.0.24.new/source/nmbd/nmbd.c	2007-03-06 15:21:15.000000000 -0500
@@ -741,8 +741,8 @@
 	}
 #endif
 
-	if (!directory_exist(lp_lockdir(), NULL)) {
-		mkdir(lp_lockdir(), 0755);
+	if (!directory_exist(lp_statedir(), NULL)) {
+		mkdir(lp_statedir(), 0755);
 	}
 
 	pidfile_create("nmbd");
diff -uPr samba-3.0.24.old/source/nmbd/nmbd_namelistdb.c samba-3.0.24.new/source/nmbd/nmbd_namelistdb.c
--- samba-3.0.24.old/source/nmbd/nmbd_namelistdb.c	2007-02-04 13:59:23.000000000 -0500
+++ samba-3.0.24.new/source/nmbd/nmbd_namelistdb.c	2007-03-06 15:58:37.000000000 -0500
@@ -626,7 +626,7 @@
 	XFILE *fp; 
 	struct subnet_record *subrec;
 
-	fp = x_fopen(lock_path("namelist.debug"),O_WRONLY|O_CREAT|O_TRUNC, 0644);
+	fp = x_fopen(cache_path("namelist.debug"),O_WRONLY|O_CREAT|O_TRUNC, 0644);
      
 	if (!fp) { 
 		DEBUG(0,("dump_all_namelists: Can't open file %s. Error was %s\n",
diff -uPr samba-3.0.24.old/source/nmbd/nmbd_processlogon.c samba-3.0.24.new/source/nmbd/nmbd_processlogon.c
--- samba-3.0.24.old/source/nmbd/nmbd_processlogon.c	2005-02-25 12:59:38.000000000 -0500
+++ samba-3.0.24.new/source/nmbd/nmbd_processlogon.c	2007-03-06 15:58:56.000000000 -0500
@@ -40,7 +40,7 @@
 {
         TDB_CONTEXT *tdb;
 
-        tdb = tdb_open_log(lock_path("connections.tdb"), 0,
+        tdb = tdb_open_log(cache_path("connections.tdb"), 0,
                            TDB_DEFAULT, O_RDONLY, 0);
 
         if (!tdb) {
diff -uPr samba-3.0.24.old/source/nmbd/nmbd_serverlistdb.c samba-3.0.24.new/source/nmbd/nmbd_serverlistdb.c
--- samba-3.0.24.old/source/nmbd/nmbd_serverlistdb.c	2007-02-04 13:59:23.000000000 -0500
+++ samba-3.0.24.new/source/nmbd/nmbd_serverlistdb.c	2007-03-06 15:21:25.000000000 -0500
@@ -325,7 +325,7 @@
 
 	updatecount++;
     
-	pstrcpy(fname,lp_lockdir());
+	pstrcpy(fname,lp_statedir());
 	trim_char(fname,'\0' ,'/');
 	pstrcat(fname,"/");
 	pstrcat(fname,SERVER_LIST);
diff -uPr samba-3.0.24.old/source/nmbd/nmbd_synclists.c samba-3.0.24.new/source/nmbd/nmbd_synclists.c
--- samba-3.0.24.old/source/nmbd/nmbd_synclists.c	2005-10-17 22:45:04.000000000 -0400
+++ samba-3.0.24.new/source/nmbd/nmbd_synclists.c	2007-03-06 15:21:33.000000000 -0500
@@ -154,7 +154,7 @@
 	s->ip = ip;
 
 	slprintf(s->fname, sizeof(pstring)-1,
-		 "%s/sync.%d", lp_lockdir(), counter++);
+		 "%s/sync.%d", lp_statedir(), counter++);
 	all_string_sub(s->fname,"//", "/", 0);
 	
 	DLIST_ADD(syncs, s);
diff -uPr samba-3.0.24.old/source/nmbd/nmbd_winsserver.c samba-3.0.24.new/source/nmbd/nmbd_winsserver.c
--- samba-3.0.24.old/source/nmbd/nmbd_winsserver.c	2007-02-04 13:59:23.000000000 -0500
+++ samba-3.0.24.new/source/nmbd/nmbd_winsserver.c	2007-03-06 15:59:13.000000000 -0500
@@ -574,7 +574,7 @@
 	}
 
 	/* Open the wins.tdb. */
-	wins_tdb = tdb_open_log(lock_path("wins.tdb"), 0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST, O_CREAT|O_RDWR, 0600);
+	wins_tdb = tdb_open_log(state_path("wins.tdb"), 0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST, O_CREAT|O_RDWR, 0600);
 	if (!wins_tdb) {
 		DEBUG(0,("initialise_wins: failed to open wins.tdb. Error was %s\n",
 			strerror(errno) ));
@@ -585,7 +585,7 @@
 
 	add_samba_names_to_subnet(wins_server_subnet);
 
-	if((fp = x_fopen(lock_path(WINS_LIST),O_RDONLY,0)) == NULL) {
+	if((fp = x_fopen(state_path(WINS_LIST),O_RDONLY,0)) == NULL) {
 		DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n",
 			WINS_LIST, strerror(errno) ));
 		return True;
@@ -2337,7 +2337,7 @@
 		}
 	}
 
-	slprintf(fname,sizeof(fname)-1,"%s/%s", lp_lockdir(), WINS_LIST);
+	slprintf(fname,sizeof(fname)-1,"%s/%s", lp_statedir(), WINS_LIST);
 	all_string_sub(fname,"//", "/", 0);
 	slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
 
diff -uPr samba-3.0.24.old/source/nsswitch/winbindd_cache.c samba-3.0.24.new/source/nsswitch/winbindd_cache.c
--- samba-3.0.24.old/source/nsswitch/winbindd_cache.c	2007-02-04 13:59:14.000000000 -0500
+++ samba-3.0.24.new/source/nsswitch/winbindd_cache.c	2007-03-06 15:59:32.000000000 -0500
@@ -1942,7 +1942,7 @@
 		return True;
 
 	/* when working offline we must not clear the cache on restart */
-	wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
+	wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"),
 				WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, 
 				lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST), 
 				O_RDWR|O_CREAT, 0600);
@@ -2186,7 +2186,7 @@
 		return;
 
 	/* when working offline we must not clear the cache on restart */
-	wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
+	wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"),
 				WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, 
 				lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST), 
 				O_RDWR|O_CREAT, 0600);
diff -uPr samba-3.0.24.old/source/nsswitch/winbindd_util.c samba-3.0.24.new/source/nsswitch/winbindd_util.c
--- samba-3.0.24.old/source/nsswitch/winbindd_util.c	2007-02-04 13:59:14.000000000 -0500
+++ samba-3.0.24.new/source/nsswitch/winbindd_util.c	2007-03-06 15:59:59.000000000 -0500
@@ -911,7 +911,7 @@
 
 char *get_winbind_priv_pipe_dir(void) 
 {
-	return lock_path(WINBINDD_PRIV_SOCKET_SUBDIR);
+	return state_path(WINBINDD_PRIV_SOCKET_SUBDIR);
 }
 
 /* Open the winbindd socket */
@@ -1182,7 +1182,7 @@
 	SMB_STRUCT_STAT stbuf;
 	TDB_CONTEXT *idmap_tdb;
 
-	pstrcpy(idmap_name, lock_path("winbindd_idmap.tdb"));
+	pstrcpy(idmap_name, state_path("winbindd_idmap.tdb"));
 
 	if (!file_exist(idmap_name, &stbuf)) {
 		/* nothing to convert return */
diff -uPr samba-3.0.24.old/source/param/loadparm.c samba-3.0.24.new/source/param/loadparm.c
--- samba-3.0.24.old/source/param/loadparm.c	2007-02-04 13:59:13.000000000 -0500
+++ samba-3.0.24.new/source/param/loadparm.c	2007-03-06 15:52:22.000000000 -0500
@@ -107,7 +107,8 @@
 	char *szAddPrinterCommand;
 	char *szDeletePrinterCommand;
 	char *szOs2DriverMap;
-	char *szLockDir;
+	char *szCacheDir;
+	char *szStateDir;
 	char *szPidDir;
 	char *szRootdir;
 	char *szDefaultService;
@@ -621,6 +622,7 @@
 static BOOL handle_netbios_scope( int snum, const char *pszParmValue, char **ptr );
 static BOOL handle_charset( int snum, const char *pszParmValue, char **ptr );
 static BOOL handle_printing( int snum, const char *pszParmValue, char **ptr);
+static BOOL handle_lock_dir( int snum, const char *pszParmValue, char **ptr);
 
 static void set_server_role(void);
 static void set_default_server_announce_type(void);
@@ -1186,8 +1188,10 @@
 	{"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE}, 
 	{"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED}, 
 	{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED}, 
-	{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_ADVANCED}, 
-	{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_HIDE}, 
+	{"cache directory", P_STRING, P_GLOBAL, &Globals.szCacheDir, NULL, NULL, FLAG_ADVANCED}, 
+	{"state directory", P_STRING, P_GLOBAL, &Globals.szStateDir, NULL, NULL, FLAG_ADVANCED}, 
+	{"lock directory", P_STRING, P_GLOBAL, &Globals.szCacheDir, handle_lock_dir, NULL, FLAG_HIDE | FLAG_DEPRECATED}, 
+	{"lock dir", P_STRING, P_GLOBAL, &Globals.szCacheDir, NULL, NULL, FLAG_HIDE | FLAG_DEPRECATED }, 
 	{"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED}, 
 #ifdef WITH_UTMP
 	{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED}, 
@@ -1445,7 +1449,8 @@
 	
 	string_set(&Globals.szPasswdProgram, "");
 	string_set(&Globals.szPidDir, dyn_PIDDIR);
-	string_set(&Globals.szLockDir, dyn_LOCKDIR);
+	string_set(&Globals.szCacheDir, dyn_CACHEDIR);
+	string_set(&Globals.szStateDir, dyn_STATEDIR);
 	string_set(&Globals.szSocketAddress, "0.0.0.0");
 	pstrcpy(s, "Samba ");
 	pstrcat(s, SAMBA_VERSION_STRING);
@@ -1642,7 +1647,7 @@
 	Globals.bASUSupport       = False;
 	
 	/* User defined shares. */
-	pstrcpy(s, dyn_LOCKDIR);
+	pstrcpy(s, dyn_STATEDIR);
 	pstrcat(s, "/usershares");
 	string_set(&Globals.szUsersharePath, s);
 	string_set(&Globals.szUsershareTemplateShare, "");
@@ -1761,7 +1766,8 @@
 FN_GLOBAL_STRING(lp_addprinter_cmd, &Globals.szAddPrinterCommand)
 FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand)
 FN_GLOBAL_STRING(lp_os2_driver_map, &Globals.szOs2DriverMap)
-FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
+FN_GLOBAL_STRING(lp_cachedir, &Globals.szCacheDir)
+FN_GLOBAL_STRING(lp_statedir, &Globals.szStateDir)
 FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir)
 FN_GLOBAL_STRING(lp_mangling_method, &Globals.szManglingMethod)
 FN_GLOBAL_INTEGER(lp_mangle_prefix, &Globals.mangle_prefix)
@@ -3333,6 +3339,14 @@
 	return True;
 }
 
+/************** handle deprecated lock directory paramter ***************/
+
+static BOOL handle_lock_dir(int snum, const char *pszParmValue, char **ptr)
+{
+	/* set also the state dir */
+	string_set(&Globals.szStateDir, pszParmValue);
+}
+
 
 /***************************************************************************
  Initialise a copymap.
diff -uPr samba-3.0.24.old/source/passdb/login_cache.c samba-3.0.24.new/source/passdb/login_cache.c
--- samba-3.0.24.old/source/passdb/login_cache.c	2007-02-04 13:59:21.000000000 -0500
+++ samba-3.0.24.new/source/passdb/login_cache.c	2007-03-06 15:27:15.000000000 -0500
@@ -36,7 +36,7 @@
 	/* skip file open if it's already opened */
 	if (cache) return True;
 
-	asprintf(&cache_fname, "%s/%s", lp_lockdir(), LOGIN_CACHE_FILE);
+	asprintf(&cache_fname, "%s/%s", lp_cachedir(), LOGIN_CACHE_FILE);
 	if (cache_fname)
 		DEBUG(5, ("Opening cache file at %s\n", cache_fname));
 	else {
diff -uPr samba-3.0.24.old/source/passdb/pdb_tdb.c samba-3.0.24.new/source/passdb/pdb_tdb.c
--- samba-3.0.24.old/source/passdb/pdb_tdb.c	2007-02-04 13:59:21.000000000 -0500
+++ samba-3.0.24.new/source/passdb/pdb_tdb.c	2007-03-06 16:00:05.000000000 -0500
@@ -1548,7 +1548,7 @@
 	uint32 rid;
 	BOOL ret = False;
 
-	tdb = tdb_open_log(lock_path("winbindd_idmap.tdb"), 0,
+	tdb = tdb_open_log(state_path("winbindd_idmap.tdb"), 0,
 			   TDB_DEFAULT, O_RDWR | O_CREAT, 0644);
 
 	if (tdb == NULL) {
diff -uPr samba-3.0.24.old/source/printing/nt_printing.c samba-3.0.24.new/source/printing/nt_printing.c
--- samba-3.0.24.old/source/printing/nt_printing.c	2007-02-04 14:09:01.000000000 -0500
+++ samba-3.0.24.new/source/printing/nt_printing.c	2007-03-06 16:01:19.000000000 -0500
@@ -551,28 +551,28 @@
  
 	if (tdb_drivers)
 		tdb_close(tdb_drivers);
-	tdb_drivers = tdb_open_log(lock_path("ntdrivers.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+	tdb_drivers = tdb_open_log(state_path("ntdrivers.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 	if (!tdb_drivers) {
 		DEBUG(0,("nt_printing_init: Failed to open nt drivers database %s (%s)\n",
-			lock_path("ntdrivers.tdb"), strerror(errno) ));
+			state_path("ntdrivers.tdb"), strerror(errno) ));
 		return False;
 	}
  
 	if (tdb_printers)
 		tdb_close(tdb_printers);
-	tdb_printers = tdb_open_log(lock_path("ntprinters.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+	tdb_printers = tdb_open_log(state_path("ntprinters.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 	if (!tdb_printers) {
 		DEBUG(0,("nt_printing_init: Failed to open nt printers database %s (%s)\n",
-			lock_path("ntprinters.tdb"), strerror(errno) ));
+			state_path("ntprinters.tdb"), strerror(errno) ));
 		return False;
 	}
  
 	if (tdb_forms)
 		tdb_close(tdb_forms);
-	tdb_forms = tdb_open_log(lock_path("ntforms.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+	tdb_forms = tdb_open_log(state_path("ntforms.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 	if (!tdb_forms) {
 		DEBUG(0,("nt_printing_init: Failed to open nt forms database %s (%s)\n",
-			lock_path("ntforms.tdb"), strerror(errno) ));
+			state_path("ntforms.tdb"), strerror(errno) ));
 		return False;
 	}
  
@@ -2348,7 +2348,7 @@
 	close_all_print_db();
 
 	if (geteuid() == 0) {
-		pstrcpy(printdb_path, lock_path("printing/"));
+		pstrcpy(printdb_path, state_path("printing/"));
 		pstrcat(printdb_path, sharename);
 		pstrcat(printdb_path, ".tdb");
 
diff -uPr samba-3.0.24.old/source/printing/printing.c samba-3.0.24.new/source/printing/printing.c
--- samba-3.0.24.old/source/printing/printing.c	2007-02-04 13:59:13.000000000 -0500
+++ samba-3.0.24.new/source/printing/printing.c	2007-03-06 16:01:54.000000000 -0500
@@ -183,9 +183,9 @@
 	int services = lp_numservices();
 	int snum;
 
-	unlink(lock_path("printing.tdb"));
-	pstrcpy(printing_path,lock_path("printing"));
-	mkdir(printing_path,0755);
+	unlink(state_path("printing.tdb"));
+	pstrcpy(printing_path, state_path("printing"));
+	mkdir(printing_path, 0755);
 
 	/* handle a Samba upgrade */
 
diff -uPr samba-3.0.24.old/source/printing/printing_db.c samba-3.0.24.new/source/printing/printing_db.c
--- samba-3.0.24.old/source/printing/printing_db.c	2007-02-04 13:59:13.000000000 -0500
+++ samba-3.0.24.new/source/printing/printing_db.c	2007-03-06 16:02:04.000000000 -0500
@@ -91,7 +91,7 @@
 		DLIST_ADD(print_db_head, p);
 	}
 
-	pstrcpy(printdb_path, lock_path("printing/"));
+	pstrcpy(printdb_path, state_path("printing/"));
 	pstrcat(printdb_path, printername);
 	pstrcat(printdb_path, ".tdb");
 
diff -uPr samba-3.0.24.old/source/registry/reg_db.c samba-3.0.24.new/source/registry/reg_db.c
--- samba-3.0.24.old/source/registry/reg_db.c	2006-04-19 22:29:45.000000000 -0400
+++ samba-3.0.24.new/source/registry/reg_db.c	2007-03-06 16:02:35.000000000 -0500
@@ -205,12 +205,12 @@
 	if ( tdb_reg )
 		return True;
 
-	if ( !(tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600)) )
+	if ( !(tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600)) )
 	{
-		tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+		tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 		if ( !tdb_reg ) {
 			DEBUG(0,("regdb_init: Failed to open registry %s (%s)\n",
-				lock_path("registry.tdb"), strerror(errno) ));
+				state_path("registry.tdb"), strerror(errno) ));
 			return False;
 		}
 		
@@ -252,11 +252,11 @@
 	
 	become_root();
 
-	tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
+	tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
 	if ( !tdb_reg ) {
 		result = ntstatus_to_werror( map_nt_error_from_unix( errno ) );
 		DEBUG(0,("regdb_open: Failed to open %s! (%s)\n", 
-			lock_path("registry.tdb"), strerror(errno) ));
+			state_path("registry.tdb"), strerror(errno) ));
 	}
 
 	unbecome_root();
diff -uPr samba-3.0.24.old/source/registry/reg_perfcount.c samba-3.0.24.new/source/registry/reg_perfcount.c
--- samba-3.0.24.old/source/registry/reg_perfcount.c	2007-02-04 13:59:26.000000000 -0500
+++ samba-3.0.24.new/source/registry/reg_perfcount.c	2007-03-06 16:03:22.000000000 -0500
@@ -44,7 +44,7 @@
 	
 	fstr_sprintf( path, "%s/%s", PERFCOUNTDIR, dbname );
 	
-	pstrcpy( fname, lock_path( path ) );
+	pstrcpy( fname, state_path( path ) );
 	
 	return fname;
 }
@@ -54,7 +54,7 @@
 
 void perfcount_init_keys( void )
 {
-	char *p = lock_path(PERFCOUNTDIR);
+	char *p = state_path(PERFCOUNTDIR);
 
 	/* no registry keys; just create the perfmon directory */
 	
diff -uPr samba-3.0.24.old/source/rpc_server/srv_eventlog_lib.c samba-3.0.24.new/source/rpc_server/srv_eventlog_lib.c
--- samba-3.0.24.old/source/rpc_server/srv_eventlog_lib.c	2007-02-04 13:59:21.000000000 -0500
+++ samba-3.0.24.new/source/rpc_server/srv_eventlog_lib.c	2007-03-06 16:03:50.000000000 -0500
@@ -67,7 +67,7 @@
 {
 	fstring path;
 	char *tdb_fullpath;
-	char *eventlogdir = lock_path( "eventlog" );
+	char *eventlogdir = state_path( "eventlog" );
 	
 	pstr_sprintf( path, "%s/%s.tdb", eventlogdir, name );
 	strlower_m( path );
@@ -349,7 +349,7 @@
 	
 	/* make sure that the eventlog dir exists */
 	
-	eventlogdir = lock_path( "eventlog" );
+	eventlogdir = state_path( "eventlog" );
 	if ( !directory_exist( eventlogdir, NULL ) )
 		mkdir( eventlogdir, 0755 );	
 	
diff -uPr samba-3.0.24.old/source/rpc_server/srv_netlog_nt.c samba-3.0.24.new/source/rpc_server/srv_netlog_nt.c
--- samba-3.0.24.old/source/rpc_server/srv_netlog_nt.c	2007-02-04 13:59:21.000000000 -0500
+++ samba-3.0.24.new/source/rpc_server/srv_netlog_nt.c	2007-03-06 16:07:25.000000000 -0500
@@ -77,7 +77,7 @@
 {
         TDB_CONTEXT *tdb;
 
-        tdb = tdb_open_log(lock_path("connections.tdb"), 0,
+        tdb = tdb_open_log(cache_path("connections.tdb"), 0,
                            TDB_DEFAULT, O_RDONLY, 0);
 
         if (!tdb) {
diff -uPr samba-3.0.24.old/source/sam/idmap_tdb.c samba-3.0.24.new/source/sam/idmap_tdb.c
--- samba-3.0.24.old/source/sam/idmap_tdb.c	2006-04-19 22:29:35.000000000 -0400
+++ samba-3.0.24.new/source/sam/idmap_tdb.c	2007-03-06 16:04:00.000000000 -0500
@@ -449,7 +449,7 @@
 	BOOL tdb_is_new = False;
 
 	/* use the old database if present */
-	tdbfile = SMB_STRDUP(lock_path("winbindd_idmap.tdb"));
+	tdbfile = SMB_STRDUP(state_path("winbindd_idmap.tdb"));
 	if (!tdbfile) {
 		DEBUG(0, ("idmap_init: out of memory!\n"));
 		return NT_STATUS_NO_MEMORY;
diff -uPr samba-3.0.24.old/source/script/mkbuildoptions.awk samba-3.0.24.new/source/script/mkbuildoptions.awk
--- samba-3.0.24.old/source/script/mkbuildoptions.awk	2007-02-04 13:59:25.000000000 -0500
+++ samba-3.0.24.new/source/script/mkbuildoptions.awk	2007-03-06 15:40:45.000000000 -0500
@@ -86,7 +86,8 @@
 	print "       output(screen,\"   LIBDIR: %s\\n\",dyn_LIBDIR);";
 	print "       output(screen,\"   SHLIBEXT: %s\\n\",dyn_SHLIBEXT);";
 
-	print "       output(screen,\"   LOCKDIR: %s\\n\",dyn_LOCKDIR);";
+	print "       output(screen,\"   STATEDIR: %s\\n\",dyn_STATEDIR);";
+	print "       output(screen,\"   CACHEDIR: %s\\n\",dyn_CACHEDIR);";
 	print "       output(screen,\"   PIDDIR: %s\\n\", dyn_PIDDIR);";
 
 	print "       output(screen,\"   SMB_PASSWD_FILE: %s\\n\",dyn_SMB_PASSWD_FILE);";
diff -uPr samba-3.0.24.old/source/script/tests/selftest.sh samba-3.0.24.new/source/script/tests/selftest.sh
--- samba-3.0.24.old/source/script/tests/selftest.sh	2007-02-04 13:59:25.000000000 -0500
+++ samba-3.0.24.new/source/script/tests/selftest.sh	2007-03-06 15:42:00.000000000 -0500
@@ -41,13 +41,14 @@
 SERVERCONFFILE=$LIBDIR/server.conf
 COMMONCONFFILE=$LIBDIR/common.conf
 PRIVATEDIR=$PREFIX_ABS/private
-LOCKDIR=$PREFIX_ABS/lockdir
+STATEDIR=$PREFIX_ABS/lockdir
+CACHEDIR=$PREFIX_ABS/lockdir
 LOGDIR=$PREFIX_ABS/logs
 SOCKET_WRAPPER_DIR=$PREFIX/sw
 CONFIGURATION="-s $CONFFILE"
 
 export PREFIX PREFIX_ABS CONFIGURATION CONFFILE PATH SOCKET_WRAPPER_DIR DOMAIN
-export PRIVATEDIR LIBDIR PIDDIR LOCKDIR LOGDIR SERVERCONFFILE
+export PRIVATEDIR LIBDIR PIDDIR STATEDIR CACHEDIR LOGDIR SERVERCONFFILE
 export SRCDIR SCRIPTDIR
 export USERNAME PASSWORD
 export SMBTORTURE4
@@ -73,7 +74,7 @@
 ##
 echo -n "CREATE TEST ENVIRONMENT IN '$PREFIX'"...
 /bin/rm -rf $PREFIX/*
-mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $LOCKDIR $LOGDIR $SOCKET_WRAPPER_DIR
+mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $STATEDIR $CACHEDIR $LOGDIR $SOCKET_WRAPPER_DIR
 mkdir -p $PREFIX_ABS/tmp
 chmod 777 $PREFIX_ABS/tmp
 
@@ -86,7 +87,8 @@
 
 	private dir = $PRIVATEDIR
 	pid directory = $PIDDIR
-	lock directory = $LOCKDIR
+	state directory = $STATEDIR
+	cache directory = $CACHEDIR
 	log file = $LOGDIR/log.%m
 	log level = 0
 
diff -uPr samba-3.0.24.old/source/smbd/connection.c samba-3.0.24.new/source/smbd/connection.c
--- samba-3.0.24.old/source/smbd/connection.c	2005-10-17 22:44:57.000000000 -0400
+++ samba-3.0.24.new/source/smbd/connection.c	2007-03-06 16:04:14.000000000 -0500
@@ -29,7 +29,7 @@
 TDB_CONTEXT *conn_tdb_ctx(void)
 {
 	if (!tdb)
-		tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, 
+		tdb = tdb_open_log(cache_path("connections.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, 
 			       O_RDWR | O_CREAT, 0644);
 
 	return tdb;
@@ -131,7 +131,7 @@
 	TDB_DATA kbuf, dbuf;
 
 	if (!tdb)
-		tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, 
+		tdb = tdb_open_log(cache_path("connections.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, 
 			       O_RDWR | O_CREAT, 0644);
 
 	if (!tdb)
diff -uPr samba-3.0.24.old/source/smbd/lanman.c samba-3.0.24.new/source/smbd/lanman.c
--- samba-3.0.24.old/source/smbd/lanman.c	2007-02-04 13:59:13.000000000 -0500
+++ samba-3.0.24.new/source/smbd/lanman.c	2007-03-06 16:04:30.000000000 -0500
@@ -1052,9 +1052,9 @@
 	BOOL local_list_only;
 	int i;
 
-	lines = file_lines_load(lock_path(SERVER_LIST), NULL, 0);
+	lines = file_lines_load(state_path(SERVER_LIST), NULL, 0);
 	if (!lines) {
-		DEBUG(4,("Can't open %s - %s\n",lock_path(SERVER_LIST),strerror(errno)));
+		DEBUG(4,("Can't open %s - %s\n",state_path(SERVER_LIST),strerror(errno)));
 		return 0;
 	}
 
diff -uPr samba-3.0.24.old/source/smbd/oplock_irix.c samba-3.0.24.new/source/smbd/oplock_irix.c
--- samba-3.0.24.old/source/smbd/oplock_irix.c	2007-02-04 13:59:13.000000000 -0500
+++ samba-3.0.24.new/source/smbd/oplock_irix.c	2007-03-06 15:27:35.000000000 -0500
@@ -38,7 +38,7 @@
 
 	set_effective_capability(KERNEL_OPLOCK_CAPABILITY);
 
-	slprintf(tmpname,sizeof(tmpname)-1, "%s/koplock.%d", lp_lockdir(), (int)sys_getpid());
+	slprintf(tmpname,sizeof(tmpname)-1, "%s/koplock.%d", lp_cachedir(), (int)sys_getpid());
 
 	if(pipe(pfd) != 0) {
 		DEBUG(0,("check_kernel_oplocks: Unable to create pipe. Error was %s\n",
diff -uPr samba-3.0.24.old/source/smbd/server.c samba-3.0.24.new/source/smbd/server.c
--- samba-3.0.24.old/source/smbd/server.c	2007-02-04 13:59:13.000000000 -0500
+++ samba-3.0.24.new/source/smbd/server.c	2007-03-06 15:28:08.000000000 -0500
@@ -902,8 +902,11 @@
 		setpgid( (pid_t)0, (pid_t)0);
 #endif
 
-	if (!directory_exist(lp_lockdir(), NULL))
-		mkdir(lp_lockdir(), 0755);
+	if (!directory_exist(lp_cachedir(), NULL))
+		mkdir(lp_cachedir(), 0755);
+
+	if (!directory_exist(lp_statedir(), NULL))
+		mkdir(lp_statedir(), 0755);
 
 	if (is_daemon)
 		pidfile_create("smbd");
diff -uPr samba-3.0.24.old/source/smbd/session.c samba-3.0.24.new/source/smbd/session.c
--- samba-3.0.24.old/source/smbd/session.c	2006-04-19 22:29:19.000000000 -0400
+++ samba-3.0.24.new/source/smbd/session.c	2007-03-06 16:04:55.000000000 -0500
@@ -34,7 +34,7 @@
 	if (tdb)
 		return True;
 
-	tdb = tdb_open_log(lock_path("sessionid.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, 
+	tdb = tdb_open_log(cache_path("sessionid.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, 
 		       O_RDWR | O_CREAT, 0644);
 	if (!tdb) {
 		DEBUG(1,("session_init: failed to open sessionid tdb\n"));
diff -uPr samba-3.0.24.old/source/utils/net_idmap.c samba-3.0.24.new/source/utils/net_idmap.c
--- samba-3.0.24.old/source/utils/net_idmap.c	2007-02-04 13:59:25.000000000 -0500
+++ samba-3.0.24.new/source/utils/net_idmap.c	2007-03-06 16:05:03.000000000 -0500
@@ -136,7 +136,7 @@
 		return NT_STATUS_UNSUCCESSFUL;
 	}
 
-	tdbfile = SMB_STRDUP(lock_path("winbindd_idmap.tdb"));
+	tdbfile = SMB_STRDUP(state_path("winbindd_idmap.tdb"));
 	if (!tdbfile) {
 		DEBUG(0, ("idmap_init: out of memory!\n"));
 		return NT_STATUS_NO_MEMORY;
diff -uPr samba-3.0.24.old/source/utils/net_status.c samba-3.0.24.new/source/utils/net_status.c
--- samba-3.0.24.old/source/utils/net_status.c	2007-02-04 13:59:25.000000000 -0500
+++ samba-3.0.24.new/source/utils/net_status.c	2007-03-06 16:05:45.000000000 -0500
@@ -70,11 +70,11 @@
 			 "------------------------\n");
 	}
 
-	tdb = tdb_open_log(lock_path("sessionid.tdb"), 0,
+	tdb = tdb_open_log(cache_path("sessionid.tdb"), 0,
 			   TDB_DEFAULT, O_RDONLY, 0);
 
 	if (tdb == NULL) {
-		d_fprintf(stderr, "%s not initialised\n", lock_path("sessionid.tdb"));
+		d_fprintf(stderr, "%s not initialised\n", cache_path("sessionid.tdb"));
 		return -1;
 	}
 
@@ -186,22 +186,22 @@
 	ids.num_entries = 0;
 	ids.entries = NULL;
 
-	tdb = tdb_open_log(lock_path("sessionid.tdb"), 0,
+	tdb = tdb_open_log(cache_path("sessionid.tdb"), 0,
 			   TDB_DEFAULT, O_RDONLY, 0);
 
 	if (tdb == NULL) {
-		d_fprintf(stderr, "%s not initialised\n", lock_path("sessionid.tdb"));
+		d_fprintf(stderr, "%s not initialised\n", cache_path("sessionid.tdb"));
 		return -1;
 	}
 
 	tdb_traverse(tdb, collect_pid, &ids);
 	tdb_close(tdb);
 
-	tdb = tdb_open_log(lock_path("connections.tdb"), 0,
+	tdb = tdb_open_log(cache_path("connections.tdb"), 0,
 			   TDB_DEFAULT, O_RDONLY, 0);
 
 	if (tdb == NULL) {
-		d_fprintf(stderr, "%s not initialised\n", lock_path("connections.tdb"));
+		d_fprintf(stderr, "%s not initialised\n", cache_path("connections.tdb"));
 		d_fprintf(stderr, "This is normal if no SMB client has ever "
 			 "connected to your server.\n");
 		return -1;
@@ -226,12 +226,12 @@
 		d_printf("-------------------------------------"
 			 "------------------\n");
 
-		tdb = tdb_open_log(lock_path("connections.tdb"), 0,
+		tdb = tdb_open_log(cache_path("connections.tdb"), 0,
 				   TDB_DEFAULT, O_RDONLY, 0);
 
 		if (tdb == NULL) {
 			d_fprintf(stderr, "%s not initialised\n",
-				 lock_path("connections.tdb"));
+				 cache_path("connections.tdb"));
 			d_fprintf(stderr, "This is normal if no SMB client has "
 				 "ever connected to your server.\n");
 			return -1;
diff -uPr samba-3.0.24.old/source/utils/smbcontrol.c samba-3.0.24.new/source/utils/smbcontrol.c
--- samba-3.0.24.old/source/utils/smbcontrol.c	2007-02-04 13:59:25.000000000 -0500
+++ samba-3.0.24.new/source/utils/smbcontrol.c	2007-03-06 16:06:33.000000000 -0500
@@ -61,7 +61,7 @@
 	if (procid_to_pid(&pid) != 0)
 		return message_send_pid(pid, msg_type, buf, len, duplicates);
 
-	tdb = tdb_open_log(lock_path("connections.tdb"), 0, 
+	tdb = tdb_open_log(cache_path("connections.tdb"), 0, 
 			   TDB_DEFAULT, O_RDWR, 0);
 	if (!tdb) {
 		fprintf(stderr,"Failed to open connections database"
@@ -286,7 +286,7 @@
 	} else {
 		TDB_CONTEXT * tdb;
 
-		tdb = tdb_open_log(lock_path("connections.tdb"), 0, 
+		tdb = tdb_open_log(cache_path("connections.tdb"), 0, 
 				   TDB_DEFAULT, O_RDONLY, 0);
 		if (!tdb) {
 			fprintf(stderr,
@@ -828,10 +828,10 @@
 	/* Remove the entry in the winbindd_cache tdb to tell a later
 	   starting winbindd that we're online. */
 
-	tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
+	tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
 	if (!tdb) {
 		fprintf(stderr, "Cannot open the tdb %s for writing.\n",
-			lock_path("winbindd_cache.tdb"));
+			cache_path("winbindd_cache.tdb"));
 		return False;
 	}
 
@@ -864,13 +864,13 @@
 	   starting winbindd that we're offline. We may actually create
 	   it here... */
 
-	tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
+	tdb = tdb_open_log(cache_path("winbindd_cache.tdb"),
 				WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
 				TDB_DEFAULT /* TDB_CLEAR_IF_FIRST */, O_RDWR|O_CREAT, 0600);
 
 	if (!tdb) {
 		fprintf(stderr, "Cannot open the tdb %s for writing.\n",
-			lock_path("winbindd_cache.tdb"));
+			cache_path("winbindd_cache.tdb"));
 		return False;
 	}
 
diff -uPr samba-3.0.24.old/source/utils/status.c samba-3.0.24.new/source/utils/status.c
--- samba-3.0.24.old/source/utils/status.c	2007-02-04 13:59:25.000000000 -0500
+++ samba-3.0.24.new/source/utils/status.c	2007-03-06 16:07:00.000000000 -0500
@@ -669,7 +669,7 @@
 	}
 	
 	if ( show_processes ) {
-		tdb = tdb_open_log(lock_path("sessionid.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
+		tdb = tdb_open_log(cache_path("sessionid.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
 		if (!tdb) {
 			d_printf("sessionid.tdb not initialised\n");
 		} else {
@@ -686,13 +686,13 @@
 	}
   
 	if ( show_shares ) {
-		tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
+		tdb = tdb_open_log(cache_path("connections.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
 		if (!tdb) {
-			d_printf("%s not initialised\n", lock_path("connections.tdb"));
+			d_printf("%s not initialised\n", cache_path("connections.tdb"));
 			d_printf("This is normal if an SMB client has never connected to your server.\n");
 		}  else  {
 			if (verbose) {
-				d_printf("Opened %s\n", lock_path("connections.tdb"));
+				d_printf("Opened %s\n", cache_path("connections.tdb"));
 			}
 
 			if (brief) 
diff -uPr samba-3.0.24.old/source/utils/testparm.c samba-3.0.24.new/source/utils/testparm.c
--- samba-3.0.24.old/source/utils/testparm.c	2007-02-04 13:59:25.000000000 -0500
+++ samba-3.0.24.new/source/utils/testparm.c	2007-03-06 15:29:34.000000000 -0500
@@ -57,13 +57,23 @@
 		ret = 1;
 	}
 
-	if (!directory_exist(lp_lockdir(), &st)) {
-		fprintf(stderr, "ERROR: lock directory %s does not exist\n",
-		       lp_lockdir());
+	if (!directory_exist(lp_cachedir(), &st)) {
+		fprintf(stderr, "ERROR: cache directory %s does not exist\n",
+		       lp_cachedir());
 		ret = 1;
 	} else if ((st.st_mode & 0777) != 0755) {
-		fprintf(stderr, "WARNING: lock directory %s should have permissions 0755 for browsing to work\n",
-		       lp_lockdir());
+		fprintf(stderr, "WARNING: cache directory %s should have permissions 0755 for browsing to work\n",
+		       lp_cachedir());
+		ret = 1;
+	}
+
+	if (!directory_exist(lp_statedir(), &st)) {
+		fprintf(stderr, "ERROR: state directory %s does not exist\n",
+		       lp_statedir());
+		ret = 1;
+	} else if ((st.st_mode & 0777) != 0755) {
+		fprintf(stderr, "WARNING: state directory %s should have permissions 0755 for browsing to work\n",
+		       lp_statedir());
 		ret = 1;
 	}
 
diff -uPr samba-3.0.24.old/source/web/statuspage.c samba-3.0.24.new/source/web/statuspage.c
--- samba-3.0.24.old/source/web/statuspage.c	2007-02-04 13:59:21.000000000 -0500
+++ samba-3.0.24.new/source/web/statuspage.c	2007-03-06 16:07:08.000000000 -0500
@@ -319,7 +319,7 @@
 		PID_or_Machine = 0;
 	}
 
-	tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
+	tdb = tdb_open_log(cache_path("connections.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
 	if (tdb) tdb_traverse(tdb, traverse_fn1, NULL);
  
 	initPid2Machine ();

samba-3.0.24-msdfs-root-no.patch:
 loadparm.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE samba-3.0.24-msdfs-root-no.patch ---
--- samba-3.0.24.orig/source/param/loadparm.c	2007-02-04 13:59:13.000000000 -0500
+++ samba-3.0.24/source/param/loadparm.c	2007-02-20 14:03:49.000000000 -0500
@@ -570,7 +570,7 @@
 	False,			/* bInheritPerms */
 	False,			/* bInheritACLS */
 	False,			/* bInheritOwner */
-	True,			/* bMSDfsRoot */
+	False,			/* bMSDfsRoot */
 	False,			/* bUseClientDriver */
 	True,			/* bDefaultDevmode */
 	False,			/* bForcePrintername */

samba-3.0.24-nss_wins.patch:
 Makefile.in |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE samba-3.0.24-nss_wins.patch ---
Index: source/Makefile.in
===================================================================
--- source/Makefile.in.orig
+++ source/Makefile.in
@@ -687,7 +687,8 @@ PROTO_OBJ = $(SMBD_OBJ_MAIN) \
             $(RPC_NTSVCS_OBJ) utils/passwd_util.o
 
 WINBIND_WINS_NSS_OBJ = nsswitch/wins.o $(PARAM_OBJ) \
-	$(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ)
+	$(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ) \
+	$(SECRETS_OBJ)
 
 WINBIND_WINS_NSS_PICOBJS = $(WINBIND_WINS_NSS_OBJ:.o=. at PICSUFFIX@)
 
@@ -1231,7 +1232,7 @@ bin/winbindd at EXEEXT@: $(WINBINDD_OBJ) @B
 @WINBIND_WINS_NSS@: $(WINBIND_WINS_NSS_PICOBJS)
 	@echo "Linking $@"
 	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_PICOBJS) \
-		$(LDAP_LIBS) $(KRB5LIBS) \
+		$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) \
 		@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
 
 bin/pam_winbind. at SHLIBEXT@: $(PAM_WINBIND_OBJ:.o=. at PICSUFFIX@) bin/.dummy

samba-3.0.24-pam_winbind-fixes.patch:
 pam_winbind.c |   67 ++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 44 insertions(+), 23 deletions(-)

--- NEW FILE samba-3.0.24-pam_winbind-fixes.patch ---
------------------------------------------------------------------------
r21143 | gd | 2007-02-05 15:34:12 +0100 (Mon, 05 Feb 2007) | 7 lines

Fix wrong check for pam error codes for getpwnam and lookup winbind
requests in pam_winbind (Bug #4094).

Inspired by fix from Lars Heete.

Guenther

------------------------------------------------------------------------
Index: source/nsswitch/pam_winbind.c
===================================================================
--- source/nsswitch/pam_winbind.c	(revision 21142)
+++ source/nsswitch/pam_winbind.c	(revision 21143)
@@ -444,21 +444,34 @@ static int pam_winbind_request(pam_handl
 	close_sock();
 
 	/* Copy reply data from socket */
-	if (response->result != WINBINDD_OK) {
-		if (response->data.auth.pam_error != PAM_SUCCESS) {
-			_pam_log(LOG_ERR, "request failed: %s, PAM error was %s (%d), NT error was %s", 
-				 response->data.auth.error_string,
-				 pam_strerror(pamh, response->data.auth.pam_error),
-				 response->data.auth.pam_error,
-				 response->data.auth.nt_status_string);
-			return response->data.auth.pam_error;
-		} else {
-			_pam_log(LOG_ERR, "request failed, but PAM error 0!");
-			return PAM_SERVICE_ERR;
-		}
+	if (response->result == WINBINDD_OK) {
+		return PAM_SUCCESS;
 	}
 
-	return PAM_SUCCESS;
+	/* no need to check for pam_error codes for getpwnam() */
+	switch (req_type) {
+
+		case WINBINDD_GETPWNAM:
+		case WINBINDD_LOOKUPNAME:
+			_pam_log(LOG_ERR, "request failed: %s, NT error was %s", 
+				response->data.auth.nt_status_string);
+			return PAM_USER_UNKNOWN;
+		default:
+			break;
+	}
+
+	if (response->data.auth.pam_error != PAM_SUCCESS) {
+		_pam_log(LOG_ERR, "request failed: %s, PAM error was %s (%d), NT error was %s", 
+			 response->data.auth.error_string,
+			 pam_strerror(pamh, response->data.auth.pam_error),
+			 response->data.auth.pam_error,
+			 response->data.auth.nt_status_string);
+		return response->data.auth.pam_error;
+	} 
+	
+	_pam_log(LOG_ERR, "request failed, but PAM error 0!");
+
+	return PAM_SERVICE_ERR;
 }
 
 static int pam_winbind_request_log(pam_handle_t * pamh,
------------------------------------------------------------------------
r21310 | gd | 2007-02-13 12:04:10 +0100 (Tue, 13 Feb 2007) | 4 lines

Fix invalid printfs in pam_winbind.

Guenther

------------------------------------------------------------------------
Index: source/nsswitch/pam_winbind.c
===================================================================
--- source/nsswitch/pam_winbind.c	(revision 21309)
+++ source/nsswitch/pam_winbind.c	(revision 21310)
@@ -461,8 +461,12 @@ static int pam_winbind_request(pam_handl
 
 		case WINBINDD_GETPWNAM:
 		case WINBINDD_LOOKUPNAME:
-			_pam_log(LOG_ERR, "request failed: %s, NT error was %s", 
+			if (strlen(response->data.auth.nt_status_string) > 0) {
+				_pam_log(LOG_ERR, "request failed, NT error was %s", 
 				response->data.auth.nt_status_string);
+			} else {
+				_pam_log(LOG_ERR, "request failed");
+			}
 			return PAM_USER_UNKNOWN;
 		default:
 			break;
@@ -518,15 +522,19 @@ static int pam_winbind_request_log(pam_h
 		}	 
 		return retval;
 	case PAM_SUCCESS:
-		if (req_type == WINBINDD_PAM_AUTH) {
-			/* Otherwise, the authentication looked good */
-			_pam_log(LOG_NOTICE, "user '%s' granted access", user);
-		} else if (req_type == WINBINDD_PAM_CHAUTHTOK) {
-			/* Otherwise, the authentication looked good */
-			_pam_log(LOG_NOTICE, "user '%s' password changed", user);
-		} else { 
-			/* Otherwise, the authentication looked good */
-			_pam_log(LOG_NOTICE, "user '%s' OK", user);
+		/* Otherwise, the authentication looked good */
+		switch (req_type) {
+			case WINBINDD_INFO:
+				break;
+			case WINBINDD_PAM_AUTH:
+				_pam_log(LOG_NOTICE, "user '%s' granted access", user);
+				break;
+			case WINBINDD_PAM_CHAUTHTOK:
+				_pam_log(LOG_NOTICE, "user '%s' password changed", user);
+				break;
+			default:
+				_pam_log(LOG_NOTICE, "user '%s' OK", user);
+				break;
 		}
 	
 		return retval;

samba-3.0.24-vista-patchset.patch:
 auth/auth_compat.c          |   13 ++++--
 include/smb.h               |    4 +-
 lib/dummysmbd.c             |    6 +++
 lib/util.c                  |    3 +
 locking/locking.c           |    5 ++
 printing/nt_printing.c      |   87 +++++++++++++++++++++++++++++++++++++++-----
 rpc_parse/parse_spoolss.c   |   11 +++++
 rpc_server/srv_spoolss.c    |    9 ++++
 rpc_server/srv_spoolss_nt.c |   15 +++++++
 smbd/dir.c                  |   39 +++++++++++++++++++
 smbd/msdfs.c                |    6 ++-
 smbd/negprot.c              |   45 ++++++++++++++++++----
 smbd/password.c             |   25 ++++++++++++
 smbd/posix_acls.c           |   26 ++++++++++++-
 smbd/sesssetup.c            |    1 
 15 files changed, 269 insertions(+), 26 deletions(-)

--- NEW FILE samba-3.0.24-vista-patchset.patch ---
Index: samba-3.0.24/source/auth/auth_compat.c
===================================================================
--- samba-3.0.24.orig/source/auth/auth_compat.c	2007-02-08 08:01:57.000000000 -0600
+++ samba-3.0.24/source/auth/auth_compat.c	2007-02-08 08:02:08.000000000 -0600
@@ -92,18 +92,25 @@
 check if a username/password pair is ok via the auth subsystem.
 return True if the password is correct, False otherwise
 ****************************************************************************/
+
 BOOL password_ok(char *smb_name, DATA_BLOB password_blob)
 {
 
 	DATA_BLOB null_password = data_blob(NULL, 0);
-	BOOL encrypted = (global_encrypted_passwords_negotiated && password_blob.length == 24);
+	BOOL encrypted = (global_encrypted_passwords_negotiated && (password_blob.length == 24 || password_blob.length > 46));
 	
 	if (encrypted) {
 		/* 
 		 * The password could be either NTLM or plain LM.  Try NTLM first, 
 		 * but fall-through as required.
-		 * NTLMv2 makes no sense here.
+		 * Vista sends NTLMv2 here - we need to try the client given workgroup.
 		 */
+		if (get_session_workgroup()) {
+			if (NT_STATUS_IS_OK(pass_check_smb(smb_name, get_session_workgroup(), null_password, password_blob, null_password, encrypted))) {
+				return True;
+			}
+		}
+
 		if (NT_STATUS_IS_OK(pass_check_smb(smb_name, lp_workgroup(), null_password, password_blob, null_password, encrypted))) {
 			return True;
 		}
@@ -119,5 +126,3 @@
 
 	return False;
 }
-
-
Index: samba-3.0.24/source/smbd/password.c
===================================================================
--- samba-3.0.24.orig/source/smbd/password.c	2007-02-08 08:01:42.000000000 -0600
+++ samba-3.0.24/source/smbd/password.c	2007-02-08 08:02:08.000000000 -0600
@@ -23,6 +23,8 @@
 /* users from session setup */
 static char *session_userlist = NULL;
 static int len_session_userlist = 0;
+/* workgroup from session setup. */
+static char *session_workgroup = NULL;
 
 /* this holds info on user ids that are already validated for this VC */
 static user_struct *validated_users;
@@ -406,6 +408,29 @@
 }
 
 /****************************************************************************
+ In security=share mode we need to store the client workgroup, as that's
+  what Vista uses for the NTLMv2 calculation.
+****************************************************************************/
+
+void add_session_workgroup(const char *workgroup)
+{
+	if (session_workgroup) {
+		SAFE_FREE(session_workgroup);
+	}
+	session_workgroup = smb_xstrdup(workgroup);
+}
+
+/****************************************************************************
+ In security=share mode we need to return the client workgroup, as that's
+  what Vista uses for the NTLMv2 calculation.
+****************************************************************************/
+
+const char *get_session_workgroup(void)
+{
+	return session_workgroup;
+}
+
+/****************************************************************************
  Check if a user is in a netgroup user list. If at first we don't succeed,
  try lower case.
 ****************************************************************************/
Index: samba-3.0.24/source/smbd/sesssetup.c
===================================================================
--- samba-3.0.24.orig/source/smbd/sesssetup.c	2007-02-08 08:01:38.000000000 -0600
+++ samba-3.0.24/source/smbd/sesssetup.c	2007-02-08 08:02:08.000000000 -0600
@@ -1035,6 +1035,7 @@
 
 		map_username(sub_user);
 		add_session_user(sub_user);
+		add_session_workgroup(domain);
 		/* Then force it to null for the benfit of the code below */
 		*user = 0;
 	}
Index: samba-3.0.24/source/rpc_server/srv_spoolss_nt.c
===================================================================
--- samba-3.0.24.orig/source/rpc_server/srv_spoolss_nt.c	2007-02-04 12:59:21.000000000 -0600
+++ samba-3.0.24/source/rpc_server/srv_spoolss_nt.c	2007-02-15 11:02:09.000000000 -0600
@@ -5848,6 +5848,12 @@
 		goto done;
 	}
 	
+	if (!secdesc_ctr) {
+		DEBUG(10,("update_printer_sec: secdesc_ctr is NULL !\n"));
+		result = WERR_INVALID_PARAM;
+		goto done;
+	}
+
 	/* Check the user has permissions to change the security
 	   descriptor.  By experimentation with two NT machines, the user
 	   requires Full Access to the printer to change security
@@ -9378,6 +9384,15 @@
 	
 	/* housekeeping information in the reply */
 	
+	/* Fix from Martin Zielinski <mz at seh.de> - ensure
+	 * the hand marshalled container size is a multiple
+	 * of 4 bytes for RPC alignment.
+	 */
+
+	if (needed % 4) {
+		needed += 4-(needed % 4);
+	}
+
 	r_u->needed 	= needed;
 	r_u->returned 	= num_entries;
 
Index: samba-3.0.24/source/printing/nt_printing.c
===================================================================
--- samba-3.0.24.orig/source/printing/nt_printing.c	2007-02-04 13:09:01.000000000 -0600
+++ samba-3.0.24/source/printing/nt_printing.c	2007-02-15 11:02:09.000000000 -0600
@@ -2984,11 +2984,15 @@
 	return True;
 }
 
+/*****************************************************************
+ ****************************************************************/
+
 static void store_printer_guid(NT_PRINTER_INFO_LEVEL_2 *info2, 
 			       struct uuid guid)
 {
 	int i;
 	REGVAL_CTR *ctr=NULL;
+	UNISTR2 unistr_guid;
 
 	/* find the DsSpooler key */
 	if ((i = lookup_printerkey(info2->data, SPOOL_DSSPOOLER_KEY)) < 0)
@@ -2996,8 +3000,18 @@
 	ctr = info2->data->keys[i].values;
 
 	regval_ctr_delvalue(ctr, "objectGUID");
-	regval_ctr_addvalue(ctr, "objectGUID", REG_BINARY, 
-			    (char *) &guid, sizeof(struct uuid));	
+
+	/* We used to store this as a REG_BINARY but that causes
+	   Vista to whine */
+
+	ZERO_STRUCT( unistr_guid );	
+	init_unistr2( &unistr_guid, smb_uuid_string_static(guid),
+		      UNI_STR_TERMINATE );
+
+	regval_ctr_addvalue(ctr, "objectGUID", REG_SZ, 
+			    (char *)unistr_guid.buffer, 
+			    unistr_guid.uni_max_len*2);
+	
 }
 
 static WERROR nt_printer_publish_ads(ADS_STRUCT *ads,
@@ -3254,6 +3268,7 @@
 	REGISTRY_VALUE *guid_val;
 	WERROR win_rc;
 	int i;
+	BOOL ret = False;
 
 	win_rc = get_a_printer(print_hnd, &printer, 2, lp_servicename(snum));
 
@@ -3267,12 +3282,36 @@
 		return False;
 	}
 
-	/* fetching printer guids really ought to be a separate function.. */
-	if (guid && regval_size(guid_val) == sizeof(struct uuid))
-		memcpy(guid, regval_data_p(guid_val), sizeof(struct uuid));
+	/* fetching printer guids really ought to be a separate function. */
+
+	if ( guid ) {	
+		fstring guid_str;
+		
+		/* We used to store the guid as REG_BINARY, then swapped 
+		   to REG_SZ for Vista compatibility so check for both */
+
+		switch ( regval_type(guid_val) ){
+		case REG_SZ:		
+			rpcstr_pull( guid_str, regval_data_p(guid_val), 
+				     sizeof(guid_str)-1, -1, STR_TERMINATE );
+			ret = smb_string_to_uuid( guid_str, guid );
+			break;			
+		case REG_BINARY:
+			if ( regval_size(guid_val) != sizeof(struct uuid) ) {
+				ret = False;
+				break;
+			}
+			memcpy(guid, regval_data_p(guid_val), sizeof(struct uuid));
+			break;
+		default:
+			DEBUG(0,("is_printer_published: GUID value stored as "
+				 "invaluid type (%d)\n", regval_type(guid_val) ));			
+			break;
+		}
+	}
 
 	free_a_printer(&printer, 2);
-	return True;
+	return ret;
 }
 #else
 WERROR nt_printer_publish(Printer_entry *print_hnd, int snum, int action)
@@ -3539,13 +3578,43 @@
 			break;
 		}
 		
-		/* add the new value */
+		DEBUG(8,("specific: [%s:%s], len: %d\n", keyname, valuename, size));
+
+		/* Vista doesn't like unknown REG_BINARY values in DsSpooler.  
+		   Thanks to Martin Zielinski for the hint. */
+
+		if ( type == REG_BINARY && 
+		     strequal( keyname, SPOOL_DSSPOOLER_KEY ) && 
+		     strequal( valuename, "objectGUID" ) ) 
+		{
+			struct uuid guid;
+			UNISTR2 unistr_guid;
+
+			ZERO_STRUCT( unistr_guid );
+			
+			/* convert the GUID to a UNICODE string */
+			
+			memcpy( &guid, data_p, sizeof(struct uuid) );
+			
+			init_unistr2( &unistr_guid, smb_uuid_string_static(guid), 
+				      UNI_STR_TERMINATE );
+			
+			regval_ctr_addvalue( printer_data->keys[key_index].values, 
+					     valuename, REG_SZ, 
+					     (const char *)unistr_guid.buffer, 
+					     unistr_guid.uni_str_len*2 );
+
+		} else {
+			/* add the value */
+
+			regval_ctr_addvalue( printer_data->keys[key_index].values, 
+					     valuename, type, (const char *)data_p, 
+					     size );
+		}
 		
-		regval_ctr_addvalue( printer_data->keys[key_index].values, valuename, type, (const char *)data_p, size );
 
 		SAFE_FREE(data_p); /* 'B' option to tdbpack does a malloc() */
 
-		DEBUG(8,("specific: [%s:%s], len: %d\n", keyname, valuename, size));
 	}
 
 	return len;
Index: samba-3.0.24/source/rpc_server/srv_spoolss.c
===================================================================
--- samba-3.0.24.orig/source/rpc_server/srv_spoolss.c	2006-04-19 21:29:27.000000000 -0500
+++ samba-3.0.24/source/rpc_server/srv_spoolss.c	2007-02-15 11:02:09.000000000 -0600
@@ -1477,6 +1477,15 @@
 	ZERO_STRUCT(r_u);
 	
 	if(!spoolss_io_q_addprinterdriverex("", &q_u, data, 0)) {
+		if (q_u.level != 3 && q_u.level != 6) {
+			/* Clever hack from Martin Zielinski <mz at seh.de>
+			 * to allow downgrade from level 8 (Vista).
+			 */
+			DEBUG(3,("api_spoolss_addprinterdriverex: unknown SPOOL_Q_ADDPRINTERDRIVEREX level %u.\n",
+				(unsigned int)q_u.level ));
+			setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_INVALID_TAG));
+			return True;
+		}
 		DEBUG(0,("spoolss_io_q_addprinterdriverex: unable to unmarshall SPOOL_Q_ADDPRINTERDRIVEREX.\n"));
 		return False;
 	}
Index: samba-3.0.24/source/rpc_parse/parse_spoolss.c
===================================================================
--- samba-3.0.24.orig/source/rpc_parse/parse_spoolss.c	2007-02-15 11:02:19.000000000 -0600
+++ samba-3.0.24/source/rpc_parse/parse_spoolss.c	2007-02-15 11:02:25.000000000 -0600
@@ -3893,7 +3893,16 @@
 		}
 		case 3:
 		{
-			ptr_sec_desc = q_u->info.info_3->secdesc_ptr;
+			/* FIXME ! Our parsing here is wrong I think,
+			 * but for a level3 it makes no sense for
+			 * ptr_sec_desc to be NULL. JRA. Based on
+			 * a Vista sniff from Martin Zielinski <mz at seh.de>.
+			 */
+			if (UNMARSHALLING(ps)) {
+				ptr_sec_desc = 1;
+			} else {
+				ptr_sec_desc = q_u->info.info_3->secdesc_ptr;
+			}
 			break;
 		}
 	}
Index: samba-3.0.24/source/smbd/posix_acls.c
===================================================================
--- samba-3.0.24.orig/source/smbd/posix_acls.c	2007-02-08 08:11:29.000000000 -0600
+++ samba-3.0.24/source/smbd/posix_acls.c	2007-02-08 08:12:02.000000000 -0600
@@ -655,6 +655,7 @@
 	}
 	return 0;
 }
+
 /****************************************************************************
  Function to create owner and group SIDs from a SMB_STRUCT_STAT.
 ****************************************************************************/
@@ -666,6 +667,27 @@
 }
 
 /****************************************************************************
+ Is the identity in two ACEs equal ? Check both SID and uid/gid.
+****************************************************************************/
+
+static BOOL identity_in_ace_equal(canon_ace *ace1, canon_ace *ace2)
+{
+	if (sid_equal(&ace1->trustee, &ace2->trustee)) {
+		return True;
+	}
+	if (ace1->owner_type == ace2->owner_type) {
+		if (ace1->owner_type == UID_ACE &&
+				ace1->unix_ug.uid == ace2->unix_ug.uid) {
+			return True;
+		} else if (ace1->owner_type == GID_ACE &&
+				ace1->unix_ug.gid == ace2->unix_ug.gid) {
+			return True;
+		}
+	}
+	return False;
+}
+
+/****************************************************************************
  Merge aces with a common sid - if both are allow or deny, OR the permissions together and
  delete the second one. If the first is deny, mask the permissions off and delete the allow
  if the permissions become zero, delete the deny if the permissions are non zero.
@@ -692,7 +714,7 @@
 
 			curr_ace_next = curr_ace->next; /* Save the link in case of delete. */
 
-			if (sid_equal(&curr_ace->trustee, &curr_ace_outer->trustee) &&
+			if (identity_in_ace_equal(curr_ace, curr_ace_outer) &&
 				(curr_ace->attr == curr_ace_outer->attr)) {
 
 				if( DEBUGLVL( 10 )) {
@@ -732,7 +754,7 @@
 			 * we've put on the ACL, we know the deny must be the first one.
 			 */
 
-			if (sid_equal(&curr_ace->trustee, &curr_ace_outer->trustee) &&
+			if (identity_in_ace_equal(curr_ace, curr_ace_outer) &&
 				(curr_ace_outer->attr == DENY_ACE) && (curr_ace->attr == ALLOW_ACE)) {
 
 				if( DEBUGLVL( 10 )) {
Index: samba-3.0.24/source/include/smb.h
===================================================================
--- samba-3.0.24.orig/source/include/smb.h	2007-02-08 15:27:50.000000000 -0600
+++ samba-3.0.24/source/include/smb.h	2007-02-08 15:31:14.000000000 -0600
@@ -1436,6 +1436,7 @@
 #define FLAGS2_LONG_PATH_COMPONENTS    0x0001
 #define FLAGS2_EXTENDED_ATTRIBUTES     0x0002
 #define FLAGS2_SMB_SECURITY_SIGNATURES 0x0004
+#define FLAGS2_UNKNOWN_BIT4            0x0010
 #define FLAGS2_IS_LONG_NAME            0x0040
 #define FLAGS2_EXTENDED_SECURITY       0x0800 
 #define FLAGS2_DFS_PATHNAMES           0x1000
@@ -1499,7 +1500,8 @@
 
 /* Remote architectures we know about. */
 enum remote_arch_types {RA_UNKNOWN, RA_WFWG, RA_OS2, RA_WIN95, RA_WINNT,
-			RA_WIN2K, RA_WINXP, RA_WIN2K3, RA_SAMBA, RA_CIFSFS};
+			RA_WIN2K, RA_WINXP, RA_WIN2K3, RA_VISTA,
+			RA_SAMBA, RA_CIFSFS};
 
 /* case handling */
 enum case_handling {CASE_LOWER,CASE_UPPER};
Index: samba-3.0.24/source/smbd/negprot.c
===================================================================
--- samba-3.0.24.orig/source/smbd/negprot.c	2007-02-08 15:27:50.000000000 -0600
+++ samba-3.0.24/source/smbd/negprot.c	2007-02-08 15:42:10.000000000 -0600
@@ -263,6 +263,16 @@
 
 	global_encrypted_passwords_negotiated = lp_encrypted_passwords();
 
+	/* Check the flags field to see if this is Vista.
+	   WinXP sets it and Vista does not. But we have to 
+	   distinguish from NT which doesn't set it either. */
+
+	if ( (SVAL(inbuf, smb_flg2) & FLAGS2_EXTENDED_SECURITY) &&
+		((SVAL(inbuf, smb_flg2) & FLAGS2_UNKNOWN_BIT4) == 0) ) 
+	{
+		set_remote_arch( RA_VISTA );		
+	}
+
 	/* do spnego in user level security if the client
 	   supports it and we can do encrypted passwords */
 	
@@ -393,6 +403,15 @@
 protocol [LANMAN2.1]
 protocol [NT LM 0.12]
 
+Vista:
+protocol [PC NETWORK PROGRAM 1.0]
+protocol [LANMAN1.0]
+protocol [Windows for Workgroups 3.1a]
+protocol [LM1.2X002]
+protocol [LANMAN2.1]
+protocol [NT LM 0.12]
+protocol [SMB 2.001]
+
 OS/2:
 protocol [PC NETWORK PROGRAM 1.0]
 protocol [XENIX CORE]
@@ -406,18 +425,19 @@
   *
   * This appears to be the matrix of which protocol is used by which
   * MS product.
-       Protocol                       WfWg    Win95   WinNT  Win2K  OS/2
-       PC NETWORK PROGRAM 1.0          1       1       1      1      1
+       Protocol                       WfWg    Win95   WinNT  Win2K  OS/2 Vista
+       PC NETWORK PROGRAM 1.0          1       1       1      1      1     1
        XENIX CORE                                      2             2
        MICROSOFT NETWORKS 3.0          2       2       
        DOS LM1.2X002                   3       3       
        MICROSOFT NETWORKS 1.03                         3
        DOS LANMAN2.1                   4       4       
-       LANMAN1.0                                       4      2      3
-       Windows for Workgroups 3.1a     5       5       5      3
-       LM1.2X002                                       6      4      4
-       LANMAN2.1                                       7      5      5
-       NT LM 0.12                              6       8      6
+       LANMAN1.0                                       4      2      3     2
+       Windows for Workgroups 3.1a     5       5       5      3            3
+       LM1.2X002                                       6      4      4     4
+       LANMAN2.1                                       7      5      5     5
+       NT LM 0.12                              6       8      6            6
+       SMB 2.001                                                           7
   *
   *  tim at fsg.com 09/29/95
   *  Win2K added by matty 17/7/99
@@ -430,6 +450,7 @@
 #define ARCH_OS2      0x14     /* Again OS/2 is like NT */
 #define ARCH_SAMBA    0x20
 #define ARCH_CIFSFS   0x40
+#define ARCH_VISTA    0x8C     /* Vista is like XP/2K */
  
 #define ARCH_ALL      0x7F
  
@@ -493,6 +514,8 @@
 			arch &= ( ARCH_WFWG | ARCH_WIN95 );
 		else if (strcsequal(p,"NT LM 0.12"))
 			arch &= ( ARCH_WIN95 | ARCH_WINNT | ARCH_WIN2K | ARCH_CIFSFS);
+		else if (strcsequal(p,"SMB 2.001"))
+			arch = ARCH_VISTA;		
 		else if (strcsequal(p,"LANMAN2.1"))
 			arch &= ( ARCH_WINNT | ARCH_WIN2K | ARCH_OS2 );
 		else if (strcsequal(p,"LM1.2X002"))
@@ -537,7 +560,13 @@
 				set_remote_arch(RA_WINNT);
 			break;
 		case ARCH_WIN2K:
-			set_remote_arch(RA_WIN2K);
+			/* Vista may have been set in the negprot so don't 
+			   override it here */
+			if ( get_remote_arch() != RA_VISTA )
+				set_remote_arch(RA_WIN2K);
+			break;
+		case ARCH_VISTA:
+			set_remote_arch(RA_VISTA);
 			break;
 		case ARCH_OS2:
 			set_remote_arch(RA_OS2);
Index: samba-3.0.24/source/lib/util.c
===================================================================
--- samba-3.0.24.orig/source/lib/util.c	2007-02-08 15:27:50.000000000 -0600
+++ samba-3.0.24/source/lib/util.c	2007-02-08 15:31:14.000000000 -0600
@@ -2182,6 +2182,9 @@
 	case RA_WIN2K3:
 		fstrcpy(remote_arch, "Win2K3");
 		break;
+	case RA_VISTA:
+		fstrcpy(remote_arch, "Vista");
+		break;
 	case RA_SAMBA:
 		fstrcpy(remote_arch,"Samba");
 		break;
Index: samba-3.0.24/source/smbd/msdfs.c
===================================================================
--- samba-3.0.24.orig/source/smbd/msdfs.c	2007-02-04 12:59:13.000000000 -0600
+++ samba-3.0.24/source/smbd/msdfs.c	2007-02-08 15:54:49.000000000 -0600
@@ -832,9 +832,13 @@
 
 	/* create the referral depeding on version */
 	DEBUG(10,("max_referral_level :%d\n",max_referral_level));
-	if(max_referral_level<2 || max_referral_level>3) {
+
+	if (max_referral_level < 2) {
 		max_referral_level = 2;
 	}
+	if (max_referral_level > 3) {
+		max_referral_level = 3;
+	}
 
 	switch(max_referral_level) {
 	case 2:
Index: samba-3.0.24/source/lib/dummysmbd.c
===================================================================
--- samba-3.0.24.orig/source/lib/dummysmbd.c	2006-04-19 21:29:23.000000000 -0500
+++ samba-3.0.24/source/lib/dummysmbd.c	2007-02-08 20:15:04.000000000 -0600
@@ -38,3 +38,9 @@
 {
 	return False;
 }
+
+NTSTATUS can_delete_directory(struct connection_struct *conn,
+                                const char *dirname)
+{
+	return NT_STATUS_OK;
+}
Index: samba-3.0.24/source/locking/locking.c
===================================================================
--- samba-3.0.24.orig/source/locking/locking.c	2007-02-04 12:59:23.000000000 -0600
+++ samba-3.0.24/source/locking/locking.c	2007-02-08 20:15:04.000000000 -0600
@@ -1166,6 +1166,11 @@
 		return NT_STATUS_ACCESS_DENIED;
 	}
 
+	/* Don't allow delete on close for non-empty directories. */
+	if (fsp->is_directory) {
+		return can_delete_directory(fsp->conn, fsp->fsp_name);
+	}
+
 	return NT_STATUS_OK;
 }
 
Index: samba-3.0.24/source/smbd/dir.c
===================================================================
--- samba-3.0.24.orig/source/smbd/dir.c	2007-02-04 12:59:13.000000000 -0600
+++ samba-3.0.24/source/smbd/dir.c	2007-02-08 20:15:04.000000000 -0600
@@ -1255,3 +1255,42 @@
 	}
 	return False;
 }
+
+/*****************************************************************
+ Is this directory empty ?
+*****************************************************************/
+
+NTSTATUS can_delete_directory(struct connection_struct *conn,
+				const char *dirname)
+{
+	NTSTATUS status = NT_STATUS_OK;
+	long dirpos = 0;
+	const char *dname;
+	struct smb_Dir *dir_hnd = OpenDir(conn, dirname, NULL, 0);
+
+	if (!dir_hnd) {
+		return map_nt_error_from_unix(errno);
+	}
+
+	while ((dname = ReadDirName(dir_hnd,&dirpos))) {
+		SMB_STRUCT_STAT st;
+
+		/* Quick check for "." and ".." */
+		if (dname[0] == '.') {
+			if (!dname[1] || (dname[1] == '.' && !dname[2])) {
+				continue;
+			}
+		}
+
+		if (!is_visible_file(conn, dirname, dname, &st, True)) {
+			continue;
+		}
+
+		DEBUG(10,("can_delete_directory: got name %s - can't delete\n", dname ));
+		status = NT_STATUS_DIRECTORY_NOT_EMPTY;
+		break;
+	}
+	CloseDir(dir_hnd);
+
+	return status;
+}

samba-3.0.24-vista_msdfs_errcodes.patch:
 rpc_server/srv_dfs_nt.c |    6 ++---
 smbd/msdfs.c            |   57 ++++++++++++++++++++++++++++--------------------
 smbd/trans2.c           |    5 ++--
 3 files changed, 40 insertions(+), 28 deletions(-)

--- NEW FILE samba-3.0.24-vista_msdfs_errcodes.patch ---
diff -uPr samba-3.0.24/source/rpc_server/srv_dfs_nt.c samba-3.0.24.msdfs/source/rpc_server/srv_dfs_nt.c
--- samba-3.0.24/source/rpc_server/srv_dfs_nt.c	2007-02-04 13:59:21.000000000 -0500
+++ samba-3.0.24.msdfs/source/rpc_server/srv_dfs_nt.c	2007-04-05 13:23:04.000000000 -0400
@@ -67,7 +67,7 @@
 	pstrcat(altpath, sharename);
 
 	/* The following call can change the cwd. */
-	if(get_referred_path(p->mem_ctx, dfspath, &jn, NULL, NULL)) {
+	if(NT_STATUS_IS_OK(get_referred_path(p->mem_ctx, dfspath, &jn, NULL, NULL))) {
 		exists = True;
 		jn.referral_count += 1;
 		old_referral_list = jn.referral_list;
@@ -137,7 +137,7 @@
 	DEBUG(5,("init_reply_dfs_remove: Request to remove %s -> %s\\%s.\n",
 		dfspath, servername, sharename));
 
-	if(!get_referred_path(p->mem_ctx, dfspath, &jn, NULL, NULL)) {
+	if(!NT_STATUS_IS_OK(get_referred_path(p->mem_ctx, dfspath, &jn, NULL, NULL))) {
 		return WERR_DFS_NO_SUCH_VOL;
 	}
 
@@ -353,7 +353,7 @@
 		return WERR_DFS_NO_SUCH_SERVER;
   
 	/* The following call can change the cwd. */
-	if(!get_referred_path(p->mem_ctx, path, &jn, &consumedcnt, NULL) || consumedcnt < strlen(path)) {
+	if(!NT_STATUS_IS_OK(get_referred_path(p->mem_ctx, path, &jn, &consumedcnt, NULL)) || consumedcnt < strlen(path)) {
 		vfs_ChDir(p->conn,p->conn->connectpath);
 		return WERR_DFS_NO_SUCH_VOL;
 	}
diff -uPr samba-3.0.24/source/smbd/msdfs.c samba-3.0.24.msdfs/source/smbd/msdfs.c
--- samba-3.0.24/source/smbd/msdfs.c	2007-02-04 13:59:13.000000000 -0500
+++ samba-3.0.24.msdfs/source/smbd/msdfs.c	2007-04-05 12:58:18.000000000 -0400
@@ -129,7 +129,7 @@
  Note this CHANGES CWD !!!! JRA.
 *********************************************************/
 
-static BOOL create_conn_struct(connection_struct *conn, int snum, char *path)
+static NTSTATUS create_conn_struct(connection_struct *conn, int snum, char *path)
 {
 	pstring connpath;
 
@@ -143,15 +143,16 @@
 	
         if ( (conn->mem_ctx=talloc_init("connection_struct")) == NULL ) {
                 DEBUG(0,("talloc_init(connection_struct) failed!\n"));
-                return False;
+                return NT_STATUS_NO_MEMORY;
         }
 	
 	set_conn_connectpath(conn, connpath);
 
 	if (!smbd_vfs_init(conn)) {
+		NTSTATUS status = map_nt_error_from_unix(errno);
 		DEBUG(0,("create_conn_struct: smbd_vfs_init failed.\n"));
 		conn_free_internal(conn);
-		return False;
+		return status;
 	}
 
 	/*
@@ -161,13 +162,14 @@
 	 */
 
 	if (vfs_ChDir(conn,conn->connectpath) != 0) {
+		NTSTATUS status = map_nt_error_from_unix(errno);
 		DEBUG(3,("create_conn_struct: Can't ChDir to new conn path %s. Error was %s\n",
 					conn->connectpath, strerror(errno) ));
 		conn_free_internal(conn);
-		return False;
+		return status;
 	}
 
-	return True;
+	return NT_STATUS_OK;
 }
 
 /**********************************************************************
@@ -478,7 +480,7 @@
  junction_map structure.
 **********************************************************************/
 
-BOOL get_referred_path(TALLOC_CTX *ctx, char *pathname, struct junction_map *jucn,
+NTSTATUS get_referred_path(TALLOC_CTX *ctx, char *pathname, struct junction_map *jucn,
 		       int *consumedcntp, BOOL *self_referralp)
 {
 	struct dfs_path dp;
@@ -487,11 +489,11 @@
 	struct connection_struct *conn = &conns;
 	pstring conn_path;
 	int snum;
-	BOOL ret = False;
+	NTSTATUS status = NT_STATUS_NOT_FOUND;
 	BOOL self_referral = False;
 
 	if (!pathname || !jucn) {
-		return False;
+		return NT_STATUS_NOT_FOUND;
 	}
 
 	ZERO_STRUCT(conns);
@@ -508,7 +510,7 @@
 	if (!is_myname_or_ipaddr(dp.hostname)) {
 		DEBUG(3, ("get_referred_path: Invalid hostname %s in path %s\n",
 			dp.hostname, pathname));
-		return False;
+		return NT_STATUS_NOT_FOUND;
 	}
 
 	pstrcpy(jucn->service_name, dp.servicename);
@@ -518,14 +520,14 @@
 	snum = lp_servicenumber(jucn->service_name);
 	if(snum < 0) {
 		if ((snum = find_service(jucn->service_name)) < 0) {
-			return False;
+			return NT_STATUS_NOT_FOUND;
 		}
 	}
 
 	if (!lp_msdfs_root(snum)) {
 		DEBUG(3,("get_referred_path: .%s. in dfs path %s is not a dfs root.\n",
 			 dp.servicename, pathname));
-		goto out;
+		return NT_STATUS_NOT_FOUND;
 	}
 
 	/*
@@ -540,13 +542,17 @@
 		struct referral* ref;
 
 		if (*lp_msdfs_proxy(snum) == '\0') {
-			return self_ref(ctx, pathname, jucn, consumedcntp, self_referralp);
+			if (self_ref(ctx, pathname, jucn, consumedcntp, self_referralp)) {
+				return NT_STATUS_OK;
+			} else {
+				return NT_STATUS_NOT_FOUND;
+			}
 		}
 
 		jucn->referral_count = 1;
 		if ((ref = TALLOC_P(ctx, struct referral)) == NULL) {
 			DEBUG(0, ("malloc failed for referral\n"));
-			goto out;
+			return NT_STATUS_NO_MEMORY;
 		}
 
 		pstrcpy(ref->alternate_path, lp_msdfs_proxy(snum));
@@ -559,13 +565,13 @@
 		if (consumedcntp) {
 			*consumedcntp = strlen(pathname);
 		}
-		ret = True;
-		goto out;
+		return NT_STATUS_OK;
 	}
 
 	pstrcpy(conn_path, lp_pathname(snum));
-	if (!create_conn_struct(conn, snum, conn_path)) {
-		return False;
+	status = create_conn_struct(conn, snum, conn_path);
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
 	}
 
 	/* If not remote & not a self referral, return False */
@@ -585,12 +591,12 @@
 		}
 	}
 	
-	ret = True;
+	status = NT_STATUS_OK;
 
 out:
 
 	conn_free_internal(conn);
-	return ret;
+	return status;
 }
 
 static int setup_ver2_dfs_referral(char *pathname, char **ppdata, 
@@ -780,7 +786,7 @@
  Set up the Dfs referral for the dfs pathname
 ******************************************************************/
 
-int setup_dfs_referral(connection_struct *orig_conn, char *pathname, int max_referral_level, char **ppdata)
+int setup_dfs_referral(connection_struct *orig_conn, char *pathname, int max_referral_level, char **ppdata, NTSTATUS *pstatus)
 {
 	struct junction_map junction;
 	int consumedcnt;
@@ -791,6 +797,7 @@
 	TALLOC_CTX *ctx;
 
 	if (!(ctx=talloc_init("setup_dfs_referral"))) {
+		*pstatus = NT_STATUS_NO_MEMORY;
 		return -1;
 	}
 
@@ -799,6 +806,7 @@
 	/* get the junction entry */
 	if (!pathnamep) {
 		talloc_destroy(ctx);
+		*pstatus = NT_STATUS_NO_MEMORY;
 		return -1;
 	}
 
@@ -811,7 +819,8 @@
 
 	pstrcpy(buf, pathnamep);
 	/* The following call can change cwd. */
-	if (!get_referred_path(ctx, buf, &junction, &consumedcnt, &self_referral)) {
+	*pstatus = get_referred_path(ctx, buf, &junction, &consumedcnt, &self_referral);
+	if(!NT_STATUS_IS_OK(*pstatus)) {
 		vfs_ChDir(orig_conn,orig_conn->connectpath);
 		talloc_destroy(ctx);
 		return -1;
@@ -848,6 +857,7 @@
 	default:
 		DEBUG(0,("setup_dfs_referral: Invalid dfs referral version: %d\n", max_referral_level));
 		talloc_destroy(ctx);
+		*pstatus = NT_STATUS_INVALID_LEVEL;
 		return -1;
 	}
       
@@ -857,6 +867,7 @@
 	}
 
 	talloc_destroy(ctx);
+	*pstatus = NT_STATUS_OK;
 	return reply_size;
 }
 
@@ -917,7 +928,7 @@
 	safe_strcat(path, jucn->volume_name, max_pathlen-1);
 
 	pstrcpy(conn_path, lp_pathname(snum));
-	if (!create_conn_struct(conn, snum, conn_path)) {
+	if (!NT_STATUS_IS_OK(create_conn_struct(conn, snum, conn_path))) {
 		return False;
 	}
 
@@ -1031,7 +1042,7 @@
 	 * Fake up a connection struct for the VFS layer.
 	 */
 
-	if (!create_conn_struct(&conn, snum, connect_path)) {
+	if (!NT_STATUS_IS_OK(create_conn_struct(&conn, snum, connect_path))) {
 		return 0;
 	}
 
diff -uPr samba-3.0.24/source/smbd/trans2.c samba-3.0.24.msdfs/source/smbd/trans2.c
--- samba-3.0.24/source/smbd/trans2.c	2007-02-04 14:09:01.000000000 -0500
+++ samba-3.0.24.msdfs/source/smbd/trans2.c	2007-04-05 12:57:22.000000000 -0400
@@ -4934,6 +4934,7 @@
   	pstring pathname;
 	int reply_size = 0;
 	int max_referral_level;
+	NTSTATUS status = NT_STATUS_OK;
 
 	DEBUG(10,("call_trans2getdfsreferral\n"));
 
@@ -4947,8 +4948,8 @@
 		return ERROR_DOS(ERRDOS,ERRbadfunc);
 
 	srvstr_pull(inbuf, pathname, &params[2], sizeof(pathname), -1, STR_TERMINATE);
-	if((reply_size = setup_dfs_referral(conn, pathname,max_referral_level,ppdata)) < 0)
-		return UNIXERROR(ERRDOS,ERRbadfile);
+	if((reply_size = setup_dfs_referral(conn, pathname,max_referral_level,ppdata,&status)) < 0)
+		return ERROR_NT(status);
     
 	SSVAL(outbuf,smb_flg2,SVAL(outbuf,smb_flg2) | FLAGS2_DFS_PATHNAMES);
 	send_trans2_replies(outbuf,bufsize,0,0,*ppdata,reply_size);


Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-5/samba.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- samba.spec	28 Mar 2007 16:24:26 -0000	1.73
+++ samba.spec	5 Apr 2007 20:29:11 -0000	1.74
@@ -3,7 +3,7 @@
 Summary: The Samba SMB server.
 Name: samba
 Version: 3.0.24
-Release: 3.fc5
+Release: 4.fc5
 Epoch: 0
 License: GNU GPL Version 2
 Group: System Environment/Daemons
@@ -43,7 +43,14 @@
 Patch111: samba-3.0.13-smbclient.patch
 #Patch112: samba-3.0.15pre2-bug106483.patch
 #Patch113: samba-3.0.21-warnings.patch
-Patch114: samba-3.0.24-tar_options.patch
+Patch114: samba-3.0.24-msdfs-root-no.patch
+Patch115: samba-3.0.24-vista-patchset.patch
+Patch116: samba-3.0.24-arch_macro.patch
+Patch117: samba-3.0.24-pam_winbind-fixes.patch
+Patch118: samba-3.0.24-tar_options.patch
+Patch119: samba-3.0.24-enable_pam_nss_tests.patch
+Patch120: samba-3.0.24-nss_wins.patch
+Patch121: samba-3.0.24-vista_msdfs_errcodes.patch
 
 Requires: pam >= 0:0.64 %{auth} samba-common = %{epoch}:%{version}-%{release}
 Requires: logrotate >= 0:3.4 initscripts >= 0:5.54-1 cups-libs >= 1:1.2.8-1
@@ -126,7 +133,14 @@
 %patch111 -p1 -b .smbclient
 #%patch112 -p1 -b .bug106483
 #%patch113 -p1 -b .warnings
-%patch114 -p0 -b .tar_options
+%patch114 -p1 -b .dfsroot
+%patch115 -p1 -b .vista
+%patch116 -p0 -b .arch_macro
+%patch117 -p0 -b .pam_winbind
+%patch118 -p0 -b .tar_options
+%patch119 -p0 -b .pam_nss_test
+%patch120 -p0 -b .nss_wins
+%patch121 -p1 -b .msdfs
 
 # crap
 rm -f examples/VFS/.cvsignore
@@ -448,6 +462,9 @@
 %{_mandir}/man7/libsmbclient.7*
 
 %changelog
+* Thu Apr 5 2007 Simo Sorce <ssorce at redhat.com> 3.0.24-4.fc5
+- sync up patches from the rawhide packages
+
 * Wed Mar 28 2007 Simo Sorce <ssorce at redhat.com> 3.0.24-3.fc5
 - add patch for bug 176649
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 20:29:52 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 16:29:52 -0400
Subject: rpms/samba/FC-6 samba-3.0.24-arch_macro.patch, NONE,
	1.1 samba-3.0.24-enable_pam_nss_tests.patch, NONE,
	1.1 samba-3.0.24-fhs-compliance.patch, NONE,
	1.1 samba-3.0.24-msdfs-root-no.patch, NONE,
	1.1 samba-3.0.24-nss_wins.patch, NONE,
	1.1 samba-3.0.24-pam_winbind-fixes.patch, NONE,
	1.1 samba-3.0.24-vista-patchset.patch, NONE,
	1.1 samba-3.0.24-vista_msdfs_errcodes.patch, NONE,
	1.1 samba.spec, 1.75, 1.76
Message-ID: <200704052029.l35KTq5u007046@cvs.devel.redhat.com>

Author: ssorce

Update of /cvs/dist/rpms/samba/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv7015

Modified Files:
	samba.spec 
Added Files:
	samba-3.0.24-arch_macro.patch 
	samba-3.0.24-enable_pam_nss_tests.patch 
	samba-3.0.24-fhs-compliance.patch 
	samba-3.0.24-msdfs-root-no.patch samba-3.0.24-nss_wins.patch 
	samba-3.0.24-pam_winbind-fixes.patch 
	samba-3.0.24-vista-patchset.patch 
	samba-3.0.24-vista_msdfs_errcodes.patch 
Log Message:

various bug fixes from rawhide



samba-3.0.24-arch_macro.patch:
 negprot.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE samba-3.0.24-arch_macro.patch ---
------------------------------------------------------------------------
r21857 | gd | 2007-03-16 17:20:47 +0100 (Fri, 16 Mar 2007) | 4 lines

Stop pretending to be Vista in the %a macro towards Samba clients.

Guenther

------------------------------------------------------------------------
Index: source/smbd/negprot.c
===================================================================
--- source/smbd/negprot.c	(revision 21856)
+++ source/smbd/negprot.c	(revision 21857)
@@ -259,7 +259,9 @@ static int reply_nt1(char *inbuf, char *
 	if ( (SVAL(inbuf, smb_flg2) & FLAGS2_EXTENDED_SECURITY) &&
 		((SVAL(inbuf, smb_flg2) & FLAGS2_UNKNOWN_BIT4) == 0) ) 
 	{
-		set_remote_arch( RA_VISTA );		
+		if (get_remote_arch() != RA_SAMBA) {
+			set_remote_arch( RA_VISTA );
+		}
 	}
 
 	/* do spnego in user level security if the client

samba-3.0.24-enable_pam_nss_tests.patch:
 Makefile.in |   16 ++++++++++++++++
 1 files changed, 16 insertions(+)

--- NEW FILE samba-3.0.24-enable_pam_nss_tests.patch ---
--- source/Makefile.in
+++ source/Makefile.in
@@ -160,6 +160,8 @@
 
 PAM_MODULES = @PAM_MODULES@
 
+NSS_MODULES = @WINBIND_WINS_NSS@ @WINBIND_NSS@
+
 SCRIPTS = $(srcdir)/script/smbtar $(builddir)/script/findsmb
 
 VFS_MODULES = @VFS_MODULES@
@@ -769,6 +771,12 @@
 all : SHOWFLAGS proto_exists $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \
 	$(SHLIBS) $(MODULES) $(PAM_MODULES) @EXTRA_ALL_TARGETS@
 
+nss_modules : $(NSS_MODULES)
+
+libnss_winbind : SHOWFLAGS proto_exists nsswitch/libnss_winbind. at SHLIBEXT@
+
+libnss_wins : SHOWFLAGS proto_exists nsswitch/libnss_wins. at SHLIBEXT@
+
 pam_modules : $(PAM_MODULES)
 
 pam_smbpass : SHOWFLAGS proto_exists bin/pam_smbpass. at SHLIBEXT@
@@ -1736,6 +1744,14 @@
 ######################################################################
 # Samba Testing Framework
 
+# Check for NSS module problems. 
+test_nss_modules: nss_modules
+	@echo "Testing $(NSS_MODULES) "
+	@for module in $(NSS_MODULES); do \
+		./script/tests/dlopen.sh $${module} \
+			|| exit 1; \
+	done
+
 # Check for PAM module problems.  Specifically, check that every module we
 # built can actually be loaded by a minimal PAM-aware application.
 test_pam_modules: pam_modules

samba-3.0.24-fhs-compliance.patch:
 Makefile.in                   |   10 ++++++----
 configure.in                  |   35 +++++++++++++++++++++++++++--------
 dynconfig.c                   |    3 ++-
 groupdb/mapping.c             |    2 +-
 include/dynconfig.h           |    3 ++-
 intl/lang_tdb.c               |    2 +-
 lib/account_pol.c             |    2 +-
 lib/gencache.c                |    2 +-
 lib/messages.c                |    2 +-
 lib/popt_common.c             |   25 +++++++++++++++++++++++--
 lib/sharesec.c                |    4 ++--
 lib/util.c                    |   26 +++++++++++++++++++++++---
 libsmb/gpo.c                  |    2 +-
 libsmb/samlogon_cache.c       |    4 ++--
 libsmb/unexpected.c           |    4 ++--
 locking/brlock.c              |    4 ++--
 locking/locking.c             |    2 +-
 nmbd/nmbd.c                   |    4 ++--
 nmbd/nmbd_namelistdb.c        |    2 +-
 nmbd/nmbd_processlogon.c      |    2 +-
 nmbd/nmbd_serverlistdb.c      |    2 +-
 nmbd/nmbd_synclists.c         |    2 +-
 nmbd/nmbd_winsserver.c        |    6 +++---
 nsswitch/winbindd_cache.c     |    4 ++--
 nsswitch/winbindd_util.c      |    4 ++--
 param/loadparm.c              |   26 ++++++++++++++++++++------
 passdb/login_cache.c          |    2 +-
 passdb/pdb_tdb.c              |    2 +-
 printing/nt_printing.c        |   14 +++++++-------
 printing/printing.c           |    6 +++---
 printing/printing_db.c        |    2 +-
 registry/reg_db.c             |   10 +++++-----
 registry/reg_perfcount.c      |    4 ++--
 rpc_server/srv_eventlog_lib.c |    4 ++--
 rpc_server/srv_netlog_nt.c    |    2 +-
 sam/idmap_tdb.c               |    2 +-
 script/mkbuildoptions.awk     |    3 ++-
 script/tests/selftest.sh      |   10 ++++++----
 smbd/connection.c             |    4 ++--
 smbd/lanman.c                 |    4 ++--
 smbd/oplock_irix.c            |    2 +-
 smbd/server.c                 |    7 +++++--
 smbd/session.c                |    2 +-
 utils/net_idmap.c             |    2 +-
 utils/net_status.c            |   16 ++++++++--------
 utils/smbcontrol.c            |   12 ++++++------
 utils/status.c                |    8 ++++----
 utils/testparm.c              |   20 +++++++++++++++-----
 web/statuspage.c              |    2 +-
 49 files changed, 209 insertions(+), 115 deletions(-)

--- NEW FILE samba-3.0.24-fhs-compliance.patch ---
diff -uPr samba-3.0.24.old/source/configure.in samba-3.0.24.new/source/configure.in
--- samba-3.0.24.old/source/configure.in	2007-02-04 13:59:28.000000000 -0500
+++ samba-3.0.24.new/source/configure.in	2007-03-06 15:16:27.000000000 -0500
@@ -23,7 +23,8 @@
 AC_PREFIX_DEFAULT(/usr/local/samba)
 
 rootsbindir="\${SBINDIR}"
-lockdir="\${VARDIR}/locks"
+cachedir="\${VARDIR}/locks"
+statedir="\${VARDIR}/locks"
 piddir="\${VARDIR}/locks"
 test "${mandir}" || mandir="\${prefix}/man"
 logfilebase="\${VARDIR}"
@@ -37,7 +38,8 @@
 [  --with-fhs              Use FHS-compliant paths (default=no)],
 [ case "$withval" in
   yes)
-    lockdir="\${VARDIR}/lib/samba"
+    cachedir="\${VARDIR}/cache/samba"
+    statedir="\${VARDIR}/lib/samba"
     piddir="\${VARDIR}/run"
     mandir="\${prefix}/share/man"
     logfilebase="\${VARDIR}/log/samba"
@@ -81,18 +83,34 @@
   esac])
 
 #################################################
-# set lock directory location
-AC_ARG_WITH(lockdir,
-[  --with-lockdir=DIR      Where to put lock files ($ac_default_prefix/var/locks)],
+# set cache directory location
+AC_ARG_WITH(cachedir,
+[  --with-cachedir=DIR      Where to put persistent files ($ac_default_prefix/var/locks)],
 [ case "$withval" in
   yes|no)
   #
   # Just in case anybody calls it without argument
   #
-    AC_MSG_WARN([--with-lockdir called without argument - will use default])
+    AC_MSG_WARN([--with-cachedir called without argument - will use default])
   ;;
   * )
-    lockdir="$withval"
+    cachedir="$withval"
+    ;;
+  esac])
+
+#################################################
+# set state directory location
+AC_ARG_WITH(statedir,
+[  --with-statedir=DIR      Where to put persistent files ($ac_default_prefix/var/locks)],
+[ case "$withval" in
+  yes|no)
+  #
+  # Just in case anybody calls it without argument
+  #
+    AC_MSG_WARN([--with-statedir called without argument - will use default])
+  ;;
+  * )
+    statedir="$withval"
     ;;
   esac])
 
@@ -228,7 +246,8 @@
 ])
 
 AC_SUBST(configdir)
-AC_SUBST(lockdir)
+AC_SUBST(cachedir)
+AC_SUBST(statedir)
 AC_SUBST(piddir)
 AC_SUBST(logfilebase)
 AC_SUBST(privatedir)
diff -uPr samba-3.0.24.old/source/dynconfig.c samba-3.0.24.new/source/dynconfig.c
--- samba-3.0.24.old/source/dynconfig.c	2007-02-04 13:59:28.000000000 -0500
+++ samba-3.0.24.new/source/dynconfig.c	2007-03-06 15:31:22.000000000 -0500
@@ -65,7 +65,8 @@
  *
  * Not writable, but used to set a default in the parameter table.
  **/
-pstring dyn_LOCKDIR = LOCKDIR;
+pstring dyn_STATEDIR = STATEDIR;
+pstring dyn_CACHEDIR = CACHEDIR;
 pstring dyn_PIDDIR  = PIDDIR;
 
 pstring dyn_SMB_PASSWD_FILE = SMB_PASSWD_FILE;
diff -uPr samba-3.0.24.old/source/groupdb/mapping.c samba-3.0.24.new/source/groupdb/mapping.c
--- samba-3.0.24.old/source/groupdb/mapping.c	2007-02-04 13:59:14.000000000 -0500
+++ samba-3.0.24.new/source/groupdb/mapping.c	2007-03-06 15:55:49.000000000 -0500
@@ -56,7 +56,7 @@
 	if (tdb)
 		return True;
 		
-	tdb = tdb_open_log(lock_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+	tdb = tdb_open_log(state_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 	if (!tdb) {
 		DEBUG(0,("Failed to open group mapping database\n"));
 		return False;
diff -uPr samba-3.0.24.old/source/include/dynconfig.h samba-3.0.24.new/source/include/dynconfig.h
--- samba-3.0.24.old/source/include/dynconfig.h	2007-02-04 13:59:23.000000000 -0500
+++ samba-3.0.24.new/source/include/dynconfig.h	2007-03-06 15:53:36.000000000 -0500
@@ -32,7 +32,8 @@
 extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
 extern pstring dyn_LIBDIR;
 extern fstring dyn_SHLIBEXT;
-extern pstring dyn_LOCKDIR;
+extern pstring dyn_CACHEDIR;
+extern pstring dyn_STATEDIR;
 extern pstring dyn_PIDDIR;
 extern pstring dyn_SMB_PASSWD_FILE;
 extern pstring dyn_PRIVATE_DIR;
diff -uPr samba-3.0.24.old/source/intl/lang_tdb.c samba-3.0.24.new/source/intl/lang_tdb.c
--- samba-3.0.24.old/source/intl/lang_tdb.c	2006-04-19 22:29:23.000000000 -0400
+++ samba-3.0.24.new/source/intl/lang_tdb.c	2007-03-06 15:56:14.000000000 -0500
@@ -139,7 +139,7 @@
 		goto done;
 	}
 	
-	asprintf(&path, "%s%s.tdb", lock_path("lang_"), lang);
+	asprintf(&path, "%s%s.tdb", state_path("lang_"), lang);
 
 	DEBUG(10, ("lang_tdb_init: loading %s\n", path));
 
diff -uPr samba-3.0.24.old/source/lib/account_pol.c samba-3.0.24.new/source/lib/account_pol.c
--- samba-3.0.24.old/source/lib/account_pol.c	2007-02-04 13:59:18.000000000 -0500
+++ samba-3.0.24.new/source/lib/account_pol.c	2007-03-06 15:56:23.000000000 -0500
@@ -262,7 +262,7 @@
 		return True;
 	}
 
-	tdb = tdb_open_log(lock_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+	tdb = tdb_open_log(state_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 	if (!tdb) {
 		DEBUG(0,("Failed to open account policy database\n"));
 		return False;
diff -uPr samba-3.0.24.old/source/lib/gencache.c samba-3.0.24.new/source/lib/gencache.c
--- samba-3.0.24.old/source/lib/gencache.c	2007-02-04 13:59:17.000000000 -0500
+++ samba-3.0.24.new/source/lib/gencache.c	2007-03-06 15:56:34.000000000 -0500
@@ -56,7 +56,7 @@
 	/* skip file open if it's already opened */
 	if (cache) return True;
 
-	cache_fname = lock_path("gencache.tdb");
+	cache_fname = cache_path("gencache.tdb");
 
 	DEBUG(5, ("Opening cache file at %s\n", cache_fname));
 
diff -uPr samba-3.0.24.old/source/lib/messages.c samba-3.0.24.new/source/lib/messages.c
--- samba-3.0.24.old/source/lib/messages.c	2007-02-04 13:59:18.000000000 -0500
+++ samba-3.0.24.new/source/lib/messages.c	2007-03-06 15:56:43.000000000 -0500
@@ -119,7 +119,7 @@
 {
 	if (tdb) return True;
 
-	tdb = tdb_open_log(lock_path("messages.tdb"), 
+	tdb = tdb_open_log(cache_path("messages.tdb"), 
 		       0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, 
 		       O_RDWR|O_CREAT,0600);
 
diff -uPr samba-3.0.24.old/source/lib/popt_common.c samba-3.0.24.new/source/lib/popt_common.c
--- samba-3.0.24.old/source/lib/popt_common.c	2007-02-04 13:59:17.000000000 -0500
+++ samba-3.0.24.new/source/lib/popt_common.c	2007-03-06 15:38:15.000000000 -0500
@@ -156,6 +156,8 @@
  *		--lmhostsfile
  *		--libdir
  *		--shlibext
+ *		--statedir
+ *		--cachedir
  *		--lockdir
  *		--piddir
  *		--smb-passwd-file
@@ -169,6 +171,8 @@
 	DYN_LMHOSTSFILE,
 	DYN_LIBDIR,
 	DYN_SHLIBEXT,
+	DYN_STATEDIR,
+	DYN_CACHEDIR,
 	DYN_LOCKDIR,
 	DYN_PIDDIR,
 	DYN_SMB_PASSWD_FILE,
@@ -219,9 +223,22 @@
 		}
 		break;
 
+	case DYN_STATEDIR:
+		if (arg) {
+			pstrcpy(dyn_STATEDIR, arg);
+		}
+		break;
+
+	case DYN_CACHEDIR:
+		if (arg) {
+			pstrcpy(dyn_CACHEDIR, arg);
+		}
+		break;
+
 	case DYN_LOCKDIR:
 		if (arg) {
-			pstrcpy(dyn_LOCKDIR, arg);
+			pstrcpy(dyn_STATEDIR, arg);
+			pstrcpy(dyn_CACHEDIR, arg);
 		}
 		break;
 
@@ -262,8 +279,12 @@
 	    "Path to shared library directory", "LIBDIR" },
 	{ "shlibext", '\0' , POPT_ARG_STRING, NULL, DYN_SHLIBEXT,
 	    "Shared library extension", "SHLIBEXT" },
+	{ "statedir", '\0' , POPT_ARG_STRING, NULL, DYN_STATEDIR,
+	    "Path to state file directory", "STATEDIR" },
+	{ "cachedir", '\0' , POPT_ARG_STRING, NULL, DYN_CACHEDIR,
+	    "Path to cache file directory", "CACHEDIR" },
 	{ "lockdir", '\0' , POPT_ARG_STRING, NULL, DYN_LOCKDIR,
-	    "Path to lock file directory", "LOCKDIR" },
+	    "Path to lock(cache and state) file directory", "LOCKDIR" },
 	{ "piddir", '\0' , POPT_ARG_STRING, NULL, DYN_PIDDIR,
 	    "Path to PID file directory", "PIDDIR" },
 	{ "smb-passwd-file", '\0' , POPT_ARG_STRING, NULL, DYN_SMB_PASSWD_FILE,
diff -uPr samba-3.0.24.old/source/lib/sharesec.c samba-3.0.24.new/source/lib/sharesec.c
--- samba-3.0.24.old/source/lib/sharesec.c	2006-04-19 22:29:23.000000000 -0400
+++ samba-3.0.24.new/source/lib/sharesec.c	2007-03-06 15:56:59.000000000 -0500
@@ -47,10 +47,10 @@
 		return True;
 	}
 
-	share_tdb = tdb_open_log(lock_path("share_info.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+	share_tdb = tdb_open_log(state_path("share_info.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 	if (!share_tdb) {
 		DEBUG(0,("Failed to open share info database %s (%s)\n",
-			lock_path("share_info.tdb"), strerror(errno) ));
+			state_path("share_info.tdb"), strerror(errno) ));
 		return False;
 	}
  
diff -uPr samba-3.0.24.old/source/lib/util.c samba-3.0.24.new/source/lib/util.c
--- samba-3.0.24.old/source/lib/util.c	2007-02-04 13:59:17.000000000 -0500
+++ samba-3.0.24.new/source/lib/util.c	2007-03-06 15:55:29.000000000 -0500
@@ -2519,14 +2519,34 @@
 }
 
 /*****************************************************************
- A useful function for returning a path in the Samba lock directory.
+ A useful function for returning a path in the Samba cache directory.
 *****************************************************************/  
 
-char *lock_path(const char *name)
+char *cache_path(const char *name)
 {
 	static pstring fname;
 
-	pstrcpy(fname,lp_lockdir());
+	pstrcpy(fname,lp_cachedir());
+	trim_char(fname,'\0','/');
+	
+	if (!directory_exist(fname,NULL))
+		mkdir(fname,0755);
+	
+	pstrcat(fname,"/");
+	pstrcat(fname,name);
+
+	return fname;
+}
+
+/*****************************************************************
+ A useful function for returning a path in the Samba state directory.
+*****************************************************************/  
+
+char *state_path(const char *name)
+{
+	static pstring fname;
+
+	pstrcpy(fname,lp_statedir());
 	trim_char(fname,'\0','/');
 	
 	if (!directory_exist(fname,NULL))
diff -uPr samba-3.0.24.old/source/libsmb/gpo.c samba-3.0.24.new/source/libsmb/gpo.c
--- samba-3.0.24.old/source/libsmb/gpo.c	2006-04-19 22:29:25.000000000 -0400
+++ samba-3.0.24.new/source/libsmb/gpo.c	2007-03-06 15:57:10.000000000 -0500
@@ -76,7 +76,7 @@
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	local_file = talloc_asprintf(mem_ctx, "%s/%s", lock_path("gpo_cache"), "gpt.ini");
+	local_file = talloc_asprintf(mem_ctx, "%s/%s", cache_path("gpo_cache"), "gpt.ini");
 	if (local_file == NULL) {
 		return NT_STATUS_NO_MEMORY;
 	}
diff -uPr samba-3.0.24.old/source/libsmb/samlogon_cache.c samba-3.0.24.new/source/libsmb/samlogon_cache.c
--- samba-3.0.24.old/source/libsmb/samlogon_cache.c	2007-02-04 13:59:20.000000000 -0500
+++ samba-3.0.24.new/source/libsmb/samlogon_cache.c	2007-03-06 15:57:27.000000000 -0500
@@ -34,7 +34,7 @@
 BOOL netsamlogon_cache_init(void)
 {
 	if (!netsamlogon_tdb) {
-		netsamlogon_tdb = tdb_open_log(lock_path(NETSAMLOGON_TDB), 0,
+		netsamlogon_tdb = tdb_open_log(cache_path(NETSAMLOGON_TDB), 0,
 						   TDB_DEFAULT, O_RDWR | O_CREAT, 0600);
 	}
 
@@ -67,7 +67,7 @@
            winbindd_cache.tdb open.  Open the tdb if a NULL is passed. */
 
 	if (!tdb) {
-		tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 5000,
+		tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), 5000,
 				   TDB_DEFAULT, O_RDWR, 0600);
 		if (!tdb) {
 			DEBUG(5, ("netsamlogon_clear_cached_user: failed to open cache\n"));
diff -uPr samba-3.0.24.old/source/libsmb/unexpected.c samba-3.0.24.new/source/libsmb/unexpected.c
--- samba-3.0.24.old/source/libsmb/unexpected.c	2005-02-25 12:59:32.000000000 -0500
+++ samba-3.0.24.new/source/libsmb/unexpected.c	2007-03-06 15:57:43.000000000 -0500
@@ -46,7 +46,7 @@
 	int len=0;
 
 	if (!tdbd) {
-		tdbd = tdb_open_log(lock_path("unexpected.tdb"), 0, 
+		tdbd = tdb_open_log(cache_path("unexpected.tdb"), 0, 
 			       TDB_CLEAR_IF_FIRST|TDB_DEFAULT,
 			       O_RDWR | O_CREAT, 0644);
 		if (!tdbd) {
@@ -148,7 +148,7 @@
 {
 	TDB_CONTEXT *tdb2;
 
-	tdb2 = tdb_open_log(lock_path("unexpected.tdb"), 0, 0, O_RDONLY, 0);
+	tdb2 = tdb_open_log(cache_path("unexpected.tdb"), 0, 0, O_RDONLY, 0);
 	if (!tdb2) return NULL;
 
 	matched_packet = NULL;
diff -uPr samba-3.0.24.old/source/locking/brlock.c samba-3.0.24.new/source/locking/brlock.c
--- samba-3.0.24.old/source/locking/brlock.c	2007-02-04 13:59:23.000000000 -0500
+++ samba-3.0.24.new/source/locking/brlock.c	2007-03-06 15:58:11.000000000 -0500
@@ -270,13 +270,13 @@
 	if (tdb) {
 		return;
 	}
-	tdb = tdb_open_log(lock_path("brlock.tdb"),
+	tdb = tdb_open_log(cache_path("brlock.tdb"),
 			lp_open_files_db_hash_size(),
 			TDB_DEFAULT|(read_only?0x0:TDB_CLEAR_IF_FIRST),
 			read_only?O_RDONLY:(O_RDWR|O_CREAT), 0644 );
 	if (!tdb) {
 		DEBUG(0,("Failed to open byte range locking database %s\n",
-			lock_path("brlock.tdb")));
+			cache_path("brlock.tdb")));
 		return;
 	}
 }
diff -uPr samba-3.0.24.old/source/locking/locking.c samba-3.0.24.new/source/locking/locking.c
--- samba-3.0.24.old/source/locking/locking.c	2007-02-04 13:59:23.000000000 -0500
+++ samba-3.0.24.new/source/locking/locking.c	2007-03-06 15:58:19.000000000 -0500
@@ -369,7 +369,7 @@
 	if (tdb)
 		return True;
 
-	tdb = tdb_open_log(lock_path("locking.tdb"), 
+	tdb = tdb_open_log(cache_path("locking.tdb"), 
 			lp_open_files_db_hash_size(),
 			TDB_DEFAULT|(read_only?0x0:TDB_CLEAR_IF_FIRST), 
 			read_only?O_RDONLY:O_RDWR|O_CREAT,
diff -uPr samba-3.0.24.old/source/Makefile.in samba-3.0.24.new/source/Makefile.in
--- samba-3.0.24.old/source/Makefile.in	2007-02-04 13:59:28.000000000 -0500
+++ samba-3.0.24.new/source/Makefile.in	2007-03-06 15:40:03.000000000 -0500
@@ -98,7 +98,8 @@
 SWATDIR = @swatdir@
 
 # the directory where lock files go
-LOCKDIR = @lockdir@
+STATEDIR = @statedir@
+CACHEDIR = @cachedir@
 
 # the directory where pid files go
 PIDDIR = @piddir@
@@ -126,7 +127,7 @@
 PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\"  -DSBINDIR=\"$(SBINDIR)\"
 PATH_FLAGS2 = $(PATH_FLAGS1) -DBINDIR=\"$(BINDIR)\" -DDRIVERFILE=\"$(DRIVERFILE)\" 
 PATH_FLAGS3 = $(PATH_FLAGS2) -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" 
-PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\"  -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\"
+PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\"  -DSTATEDIR=\"$(STATEDIR)\" -DCACHEDIR=\"$(CACHEEDIR)\" -DPIDDIR=\"$(PIDDIR)\"
 PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \
 	      -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"@SHLIBEXT@\"
 PATH_FLAGS6 = $(PATH_FLAGS5) -DCONFIGDIR=\"$(CONFIGDIR)\"
@@ -1437,7 +1438,7 @@
 # is not used
 
 installdirs:
-	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(BINDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(PRIVATEDIR) $(PIDDIR) $(LOCKDIR) $(MANDIR)
+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(BINDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(PRIVATEDIR) $(PIDDIR) $(STATEDIR) $(CACHEDIR) $(MANDIR)
 
 installservers: all installdirs
 	@$(SHELL) script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(SBINDIR) $(SBIN_PROGS)
@@ -1549,7 +1550,8 @@
 	@echo "  mandir:      $(MANDIR)"
 	@echo "  privatedir:  $(PRIVATE_DIR)"
 	@echo "  configdir:   $(CONFIGDIR)"
-	@echo "  lockdir:     $(LOCKDIR)"
+	@echo "  statedir:    $(STATEDIR)"
+	@echo "  cachedir:    $(CACHEDIR)"
 	@echo "  piddir:      $(PIDDIR)"
 	@echo "  swatdir:     $(SWATDIR)"
 
diff -uPr samba-3.0.24.old/source/nmbd/nmbd.c samba-3.0.24.new/source/nmbd/nmbd.c
--- samba-3.0.24.old/source/nmbd/nmbd.c	2007-02-04 13:59:23.000000000 -0500
+++ samba-3.0.24.new/source/nmbd/nmbd.c	2007-03-06 15:21:15.000000000 -0500
@@ -741,8 +741,8 @@
 	}
 #endif
 
-	if (!directory_exist(lp_lockdir(), NULL)) {
-		mkdir(lp_lockdir(), 0755);
+	if (!directory_exist(lp_statedir(), NULL)) {
+		mkdir(lp_statedir(), 0755);
 	}
 
 	pidfile_create("nmbd");
diff -uPr samba-3.0.24.old/source/nmbd/nmbd_namelistdb.c samba-3.0.24.new/source/nmbd/nmbd_namelistdb.c
--- samba-3.0.24.old/source/nmbd/nmbd_namelistdb.c	2007-02-04 13:59:23.000000000 -0500
+++ samba-3.0.24.new/source/nmbd/nmbd_namelistdb.c	2007-03-06 15:58:37.000000000 -0500
@@ -626,7 +626,7 @@
 	XFILE *fp; 
 	struct subnet_record *subrec;
 
-	fp = x_fopen(lock_path("namelist.debug"),O_WRONLY|O_CREAT|O_TRUNC, 0644);
+	fp = x_fopen(cache_path("namelist.debug"),O_WRONLY|O_CREAT|O_TRUNC, 0644);
      
 	if (!fp) { 
 		DEBUG(0,("dump_all_namelists: Can't open file %s. Error was %s\n",
diff -uPr samba-3.0.24.old/source/nmbd/nmbd_processlogon.c samba-3.0.24.new/source/nmbd/nmbd_processlogon.c
--- samba-3.0.24.old/source/nmbd/nmbd_processlogon.c	2005-02-25 12:59:38.000000000 -0500
+++ samba-3.0.24.new/source/nmbd/nmbd_processlogon.c	2007-03-06 15:58:56.000000000 -0500
@@ -40,7 +40,7 @@
 {
         TDB_CONTEXT *tdb;
 
-        tdb = tdb_open_log(lock_path("connections.tdb"), 0,
+        tdb = tdb_open_log(cache_path("connections.tdb"), 0,
                            TDB_DEFAULT, O_RDONLY, 0);
 
         if (!tdb) {
diff -uPr samba-3.0.24.old/source/nmbd/nmbd_serverlistdb.c samba-3.0.24.new/source/nmbd/nmbd_serverlistdb.c
--- samba-3.0.24.old/source/nmbd/nmbd_serverlistdb.c	2007-02-04 13:59:23.000000000 -0500
+++ samba-3.0.24.new/source/nmbd/nmbd_serverlistdb.c	2007-03-06 15:21:25.000000000 -0500
@@ -325,7 +325,7 @@
 
 	updatecount++;
     
-	pstrcpy(fname,lp_lockdir());
+	pstrcpy(fname,lp_statedir());
 	trim_char(fname,'\0' ,'/');
 	pstrcat(fname,"/");
 	pstrcat(fname,SERVER_LIST);
diff -uPr samba-3.0.24.old/source/nmbd/nmbd_synclists.c samba-3.0.24.new/source/nmbd/nmbd_synclists.c
--- samba-3.0.24.old/source/nmbd/nmbd_synclists.c	2005-10-17 22:45:04.000000000 -0400
+++ samba-3.0.24.new/source/nmbd/nmbd_synclists.c	2007-03-06 15:21:33.000000000 -0500
@@ -154,7 +154,7 @@
 	s->ip = ip;
 
 	slprintf(s->fname, sizeof(pstring)-1,
-		 "%s/sync.%d", lp_lockdir(), counter++);
+		 "%s/sync.%d", lp_statedir(), counter++);
 	all_string_sub(s->fname,"//", "/", 0);
 	
 	DLIST_ADD(syncs, s);
diff -uPr samba-3.0.24.old/source/nmbd/nmbd_winsserver.c samba-3.0.24.new/source/nmbd/nmbd_winsserver.c
--- samba-3.0.24.old/source/nmbd/nmbd_winsserver.c	2007-02-04 13:59:23.000000000 -0500
+++ samba-3.0.24.new/source/nmbd/nmbd_winsserver.c	2007-03-06 15:59:13.000000000 -0500
@@ -574,7 +574,7 @@
 	}
 
 	/* Open the wins.tdb. */
-	wins_tdb = tdb_open_log(lock_path("wins.tdb"), 0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST, O_CREAT|O_RDWR, 0600);
+	wins_tdb = tdb_open_log(state_path("wins.tdb"), 0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST, O_CREAT|O_RDWR, 0600);
 	if (!wins_tdb) {
 		DEBUG(0,("initialise_wins: failed to open wins.tdb. Error was %s\n",
 			strerror(errno) ));
@@ -585,7 +585,7 @@
 
 	add_samba_names_to_subnet(wins_server_subnet);
 
-	if((fp = x_fopen(lock_path(WINS_LIST),O_RDONLY,0)) == NULL) {
+	if((fp = x_fopen(state_path(WINS_LIST),O_RDONLY,0)) == NULL) {
 		DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n",
 			WINS_LIST, strerror(errno) ));
 		return True;
@@ -2337,7 +2337,7 @@
 		}
 	}
 
-	slprintf(fname,sizeof(fname)-1,"%s/%s", lp_lockdir(), WINS_LIST);
+	slprintf(fname,sizeof(fname)-1,"%s/%s", lp_statedir(), WINS_LIST);
 	all_string_sub(fname,"//", "/", 0);
 	slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
 
diff -uPr samba-3.0.24.old/source/nsswitch/winbindd_cache.c samba-3.0.24.new/source/nsswitch/winbindd_cache.c
--- samba-3.0.24.old/source/nsswitch/winbindd_cache.c	2007-02-04 13:59:14.000000000 -0500
+++ samba-3.0.24.new/source/nsswitch/winbindd_cache.c	2007-03-06 15:59:32.000000000 -0500
@@ -1942,7 +1942,7 @@
 		return True;
 
 	/* when working offline we must not clear the cache on restart */
-	wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
+	wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"),
 				WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, 
 				lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST), 
 				O_RDWR|O_CREAT, 0600);
@@ -2186,7 +2186,7 @@
 		return;
 
 	/* when working offline we must not clear the cache on restart */
-	wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
+	wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"),
 				WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, 
 				lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST), 
 				O_RDWR|O_CREAT, 0600);
diff -uPr samba-3.0.24.old/source/nsswitch/winbindd_util.c samba-3.0.24.new/source/nsswitch/winbindd_util.c
--- samba-3.0.24.old/source/nsswitch/winbindd_util.c	2007-02-04 13:59:14.000000000 -0500
+++ samba-3.0.24.new/source/nsswitch/winbindd_util.c	2007-03-06 15:59:59.000000000 -0500
@@ -911,7 +911,7 @@
 
 char *get_winbind_priv_pipe_dir(void) 
 {
-	return lock_path(WINBINDD_PRIV_SOCKET_SUBDIR);
+	return state_path(WINBINDD_PRIV_SOCKET_SUBDIR);
 }
 
 /* Open the winbindd socket */
@@ -1182,7 +1182,7 @@
 	SMB_STRUCT_STAT stbuf;
 	TDB_CONTEXT *idmap_tdb;
 
-	pstrcpy(idmap_name, lock_path("winbindd_idmap.tdb"));
+	pstrcpy(idmap_name, state_path("winbindd_idmap.tdb"));
 
 	if (!file_exist(idmap_name, &stbuf)) {
 		/* nothing to convert return */
diff -uPr samba-3.0.24.old/source/param/loadparm.c samba-3.0.24.new/source/param/loadparm.c
--- samba-3.0.24.old/source/param/loadparm.c	2007-02-04 13:59:13.000000000 -0500
+++ samba-3.0.24.new/source/param/loadparm.c	2007-03-06 15:52:22.000000000 -0500
@@ -107,7 +107,8 @@
 	char *szAddPrinterCommand;
 	char *szDeletePrinterCommand;
 	char *szOs2DriverMap;
-	char *szLockDir;
+	char *szCacheDir;
+	char *szStateDir;
 	char *szPidDir;
 	char *szRootdir;
 	char *szDefaultService;
@@ -621,6 +622,7 @@
 static BOOL handle_netbios_scope( int snum, const char *pszParmValue, char **ptr );
 static BOOL handle_charset( int snum, const char *pszParmValue, char **ptr );
 static BOOL handle_printing( int snum, const char *pszParmValue, char **ptr);
+static BOOL handle_lock_dir( int snum, const char *pszParmValue, char **ptr);
 
 static void set_server_role(void);
 static void set_default_server_announce_type(void);
@@ -1186,8 +1188,10 @@
 	{"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE}, 
 	{"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED}, 
 	{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED}, 
-	{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_ADVANCED}, 
-	{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_HIDE}, 
+	{"cache directory", P_STRING, P_GLOBAL, &Globals.szCacheDir, NULL, NULL, FLAG_ADVANCED}, 
+	{"state directory", P_STRING, P_GLOBAL, &Globals.szStateDir, NULL, NULL, FLAG_ADVANCED}, 
+	{"lock directory", P_STRING, P_GLOBAL, &Globals.szCacheDir, handle_lock_dir, NULL, FLAG_HIDE | FLAG_DEPRECATED}, 
+	{"lock dir", P_STRING, P_GLOBAL, &Globals.szCacheDir, NULL, NULL, FLAG_HIDE | FLAG_DEPRECATED }, 
 	{"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED}, 
 #ifdef WITH_UTMP
 	{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED}, 
@@ -1445,7 +1449,8 @@
 	
 	string_set(&Globals.szPasswdProgram, "");
 	string_set(&Globals.szPidDir, dyn_PIDDIR);
-	string_set(&Globals.szLockDir, dyn_LOCKDIR);
+	string_set(&Globals.szCacheDir, dyn_CACHEDIR);
+	string_set(&Globals.szStateDir, dyn_STATEDIR);
 	string_set(&Globals.szSocketAddress, "0.0.0.0");
 	pstrcpy(s, "Samba ");
 	pstrcat(s, SAMBA_VERSION_STRING);
@@ -1642,7 +1647,7 @@
 	Globals.bASUSupport       = False;
 	
 	/* User defined shares. */
-	pstrcpy(s, dyn_LOCKDIR);
+	pstrcpy(s, dyn_STATEDIR);
 	pstrcat(s, "/usershares");
 	string_set(&Globals.szUsersharePath, s);
 	string_set(&Globals.szUsershareTemplateShare, "");
@@ -1761,7 +1766,8 @@
 FN_GLOBAL_STRING(lp_addprinter_cmd, &Globals.szAddPrinterCommand)
 FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand)
 FN_GLOBAL_STRING(lp_os2_driver_map, &Globals.szOs2DriverMap)
-FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
+FN_GLOBAL_STRING(lp_cachedir, &Globals.szCacheDir)
+FN_GLOBAL_STRING(lp_statedir, &Globals.szStateDir)
 FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir)
 FN_GLOBAL_STRING(lp_mangling_method, &Globals.szManglingMethod)
 FN_GLOBAL_INTEGER(lp_mangle_prefix, &Globals.mangle_prefix)
@@ -3333,6 +3339,14 @@
 	return True;
 }
 
+/************** handle deprecated lock directory paramter ***************/
+
+static BOOL handle_lock_dir(int snum, const char *pszParmValue, char **ptr)
+{
+	/* set also the state dir */
+	string_set(&Globals.szStateDir, pszParmValue);
+}
+
 
 /***************************************************************************
  Initialise a copymap.
diff -uPr samba-3.0.24.old/source/passdb/login_cache.c samba-3.0.24.new/source/passdb/login_cache.c
--- samba-3.0.24.old/source/passdb/login_cache.c	2007-02-04 13:59:21.000000000 -0500
+++ samba-3.0.24.new/source/passdb/login_cache.c	2007-03-06 15:27:15.000000000 -0500
@@ -36,7 +36,7 @@
 	/* skip file open if it's already opened */
 	if (cache) return True;
 
-	asprintf(&cache_fname, "%s/%s", lp_lockdir(), LOGIN_CACHE_FILE);
+	asprintf(&cache_fname, "%s/%s", lp_cachedir(), LOGIN_CACHE_FILE);
 	if (cache_fname)
 		DEBUG(5, ("Opening cache file at %s\n", cache_fname));
 	else {
diff -uPr samba-3.0.24.old/source/passdb/pdb_tdb.c samba-3.0.24.new/source/passdb/pdb_tdb.c
--- samba-3.0.24.old/source/passdb/pdb_tdb.c	2007-02-04 13:59:21.000000000 -0500
+++ samba-3.0.24.new/source/passdb/pdb_tdb.c	2007-03-06 16:00:05.000000000 -0500
@@ -1548,7 +1548,7 @@
 	uint32 rid;
 	BOOL ret = False;
 
-	tdb = tdb_open_log(lock_path("winbindd_idmap.tdb"), 0,
+	tdb = tdb_open_log(state_path("winbindd_idmap.tdb"), 0,
 			   TDB_DEFAULT, O_RDWR | O_CREAT, 0644);
 
 	if (tdb == NULL) {
diff -uPr samba-3.0.24.old/source/printing/nt_printing.c samba-3.0.24.new/source/printing/nt_printing.c
--- samba-3.0.24.old/source/printing/nt_printing.c	2007-02-04 14:09:01.000000000 -0500
+++ samba-3.0.24.new/source/printing/nt_printing.c	2007-03-06 16:01:19.000000000 -0500
@@ -551,28 +551,28 @@
  
 	if (tdb_drivers)
 		tdb_close(tdb_drivers);
-	tdb_drivers = tdb_open_log(lock_path("ntdrivers.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+	tdb_drivers = tdb_open_log(state_path("ntdrivers.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 	if (!tdb_drivers) {
 		DEBUG(0,("nt_printing_init: Failed to open nt drivers database %s (%s)\n",
-			lock_path("ntdrivers.tdb"), strerror(errno) ));
+			state_path("ntdrivers.tdb"), strerror(errno) ));
 		return False;
 	}
  
 	if (tdb_printers)
 		tdb_close(tdb_printers);
-	tdb_printers = tdb_open_log(lock_path("ntprinters.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+	tdb_printers = tdb_open_log(state_path("ntprinters.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 	if (!tdb_printers) {
 		DEBUG(0,("nt_printing_init: Failed to open nt printers database %s (%s)\n",
-			lock_path("ntprinters.tdb"), strerror(errno) ));
+			state_path("ntprinters.tdb"), strerror(errno) ));
 		return False;
 	}
  
 	if (tdb_forms)
 		tdb_close(tdb_forms);
-	tdb_forms = tdb_open_log(lock_path("ntforms.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+	tdb_forms = tdb_open_log(state_path("ntforms.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 	if (!tdb_forms) {
 		DEBUG(0,("nt_printing_init: Failed to open nt forms database %s (%s)\n",
-			lock_path("ntforms.tdb"), strerror(errno) ));
+			state_path("ntforms.tdb"), strerror(errno) ));
 		return False;
 	}
  
@@ -2348,7 +2348,7 @@
 	close_all_print_db();
 
 	if (geteuid() == 0) {
-		pstrcpy(printdb_path, lock_path("printing/"));
+		pstrcpy(printdb_path, state_path("printing/"));
 		pstrcat(printdb_path, sharename);
 		pstrcat(printdb_path, ".tdb");
 
diff -uPr samba-3.0.24.old/source/printing/printing.c samba-3.0.24.new/source/printing/printing.c
--- samba-3.0.24.old/source/printing/printing.c	2007-02-04 13:59:13.000000000 -0500
+++ samba-3.0.24.new/source/printing/printing.c	2007-03-06 16:01:54.000000000 -0500
@@ -183,9 +183,9 @@
 	int services = lp_numservices();
 	int snum;
 
-	unlink(lock_path("printing.tdb"));
-	pstrcpy(printing_path,lock_path("printing"));
-	mkdir(printing_path,0755);
+	unlink(state_path("printing.tdb"));
+	pstrcpy(printing_path, state_path("printing"));
+	mkdir(printing_path, 0755);
 
 	/* handle a Samba upgrade */
 
diff -uPr samba-3.0.24.old/source/printing/printing_db.c samba-3.0.24.new/source/printing/printing_db.c
--- samba-3.0.24.old/source/printing/printing_db.c	2007-02-04 13:59:13.000000000 -0500
+++ samba-3.0.24.new/source/printing/printing_db.c	2007-03-06 16:02:04.000000000 -0500
@@ -91,7 +91,7 @@
 		DLIST_ADD(print_db_head, p);
 	}
 
-	pstrcpy(printdb_path, lock_path("printing/"));
+	pstrcpy(printdb_path, state_path("printing/"));
 	pstrcat(printdb_path, printername);
 	pstrcat(printdb_path, ".tdb");
 
diff -uPr samba-3.0.24.old/source/registry/reg_db.c samba-3.0.24.new/source/registry/reg_db.c
--- samba-3.0.24.old/source/registry/reg_db.c	2006-04-19 22:29:45.000000000 -0400
+++ samba-3.0.24.new/source/registry/reg_db.c	2007-03-06 16:02:35.000000000 -0500
@@ -205,12 +205,12 @@
 	if ( tdb_reg )
 		return True;
 
-	if ( !(tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600)) )
+	if ( !(tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600)) )
 	{
-		tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+		tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 		if ( !tdb_reg ) {
 			DEBUG(0,("regdb_init: Failed to open registry %s (%s)\n",
-				lock_path("registry.tdb"), strerror(errno) ));
+				state_path("registry.tdb"), strerror(errno) ));
 			return False;
 		}
 		
@@ -252,11 +252,11 @@
 	
 	become_root();
 
-	tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
+	tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
 	if ( !tdb_reg ) {
 		result = ntstatus_to_werror( map_nt_error_from_unix( errno ) );
 		DEBUG(0,("regdb_open: Failed to open %s! (%s)\n", 
-			lock_path("registry.tdb"), strerror(errno) ));
+			state_path("registry.tdb"), strerror(errno) ));
 	}
 
 	unbecome_root();
diff -uPr samba-3.0.24.old/source/registry/reg_perfcount.c samba-3.0.24.new/source/registry/reg_perfcount.c
--- samba-3.0.24.old/source/registry/reg_perfcount.c	2007-02-04 13:59:26.000000000 -0500
+++ samba-3.0.24.new/source/registry/reg_perfcount.c	2007-03-06 16:03:22.000000000 -0500
@@ -44,7 +44,7 @@
 	
 	fstr_sprintf( path, "%s/%s", PERFCOUNTDIR, dbname );
 	
-	pstrcpy( fname, lock_path( path ) );
+	pstrcpy( fname, state_path( path ) );
 	
 	return fname;
 }
@@ -54,7 +54,7 @@
 
 void perfcount_init_keys( void )
 {
-	char *p = lock_path(PERFCOUNTDIR);
+	char *p = state_path(PERFCOUNTDIR);
 
 	/* no registry keys; just create the perfmon directory */
 	
diff -uPr samba-3.0.24.old/source/rpc_server/srv_eventlog_lib.c samba-3.0.24.new/source/rpc_server/srv_eventlog_lib.c
--- samba-3.0.24.old/source/rpc_server/srv_eventlog_lib.c	2007-02-04 13:59:21.000000000 -0500
+++ samba-3.0.24.new/source/rpc_server/srv_eventlog_lib.c	2007-03-06 16:03:50.000000000 -0500
@@ -67,7 +67,7 @@
 {
 	fstring path;
 	char *tdb_fullpath;
-	char *eventlogdir = lock_path( "eventlog" );
+	char *eventlogdir = state_path( "eventlog" );
 	
 	pstr_sprintf( path, "%s/%s.tdb", eventlogdir, name );
 	strlower_m( path );
@@ -349,7 +349,7 @@
 	
 	/* make sure that the eventlog dir exists */
 	
-	eventlogdir = lock_path( "eventlog" );
+	eventlogdir = state_path( "eventlog" );
 	if ( !directory_exist( eventlogdir, NULL ) )
 		mkdir( eventlogdir, 0755 );	
 	
diff -uPr samba-3.0.24.old/source/rpc_server/srv_netlog_nt.c samba-3.0.24.new/source/rpc_server/srv_netlog_nt.c
--- samba-3.0.24.old/source/rpc_server/srv_netlog_nt.c	2007-02-04 13:59:21.000000000 -0500
+++ samba-3.0.24.new/source/rpc_server/srv_netlog_nt.c	2007-03-06 16:07:25.000000000 -0500
@@ -77,7 +77,7 @@
 {
         TDB_CONTEXT *tdb;
 
-        tdb = tdb_open_log(lock_path("connections.tdb"), 0,
+        tdb = tdb_open_log(cache_path("connections.tdb"), 0,
                            TDB_DEFAULT, O_RDONLY, 0);
 
         if (!tdb) {
diff -uPr samba-3.0.24.old/source/sam/idmap_tdb.c samba-3.0.24.new/source/sam/idmap_tdb.c
--- samba-3.0.24.old/source/sam/idmap_tdb.c	2006-04-19 22:29:35.000000000 -0400
+++ samba-3.0.24.new/source/sam/idmap_tdb.c	2007-03-06 16:04:00.000000000 -0500
@@ -449,7 +449,7 @@
 	BOOL tdb_is_new = False;
 
 	/* use the old database if present */
-	tdbfile = SMB_STRDUP(lock_path("winbindd_idmap.tdb"));
+	tdbfile = SMB_STRDUP(state_path("winbindd_idmap.tdb"));
 	if (!tdbfile) {
 		DEBUG(0, ("idmap_init: out of memory!\n"));
 		return NT_STATUS_NO_MEMORY;
diff -uPr samba-3.0.24.old/source/script/mkbuildoptions.awk samba-3.0.24.new/source/script/mkbuildoptions.awk
--- samba-3.0.24.old/source/script/mkbuildoptions.awk	2007-02-04 13:59:25.000000000 -0500
+++ samba-3.0.24.new/source/script/mkbuildoptions.awk	2007-03-06 15:40:45.000000000 -0500
@@ -86,7 +86,8 @@
 	print "       output(screen,\"   LIBDIR: %s\\n\",dyn_LIBDIR);";
 	print "       output(screen,\"   SHLIBEXT: %s\\n\",dyn_SHLIBEXT);";
 
-	print "       output(screen,\"   LOCKDIR: %s\\n\",dyn_LOCKDIR);";
+	print "       output(screen,\"   STATEDIR: %s\\n\",dyn_STATEDIR);";
+	print "       output(screen,\"   CACHEDIR: %s\\n\",dyn_CACHEDIR);";
 	print "       output(screen,\"   PIDDIR: %s\\n\", dyn_PIDDIR);";
 
 	print "       output(screen,\"   SMB_PASSWD_FILE: %s\\n\",dyn_SMB_PASSWD_FILE);";
diff -uPr samba-3.0.24.old/source/script/tests/selftest.sh samba-3.0.24.new/source/script/tests/selftest.sh
--- samba-3.0.24.old/source/script/tests/selftest.sh	2007-02-04 13:59:25.000000000 -0500
+++ samba-3.0.24.new/source/script/tests/selftest.sh	2007-03-06 15:42:00.000000000 -0500
@@ -41,13 +41,14 @@
 SERVERCONFFILE=$LIBDIR/server.conf
 COMMONCONFFILE=$LIBDIR/common.conf
 PRIVATEDIR=$PREFIX_ABS/private
-LOCKDIR=$PREFIX_ABS/lockdir
+STATEDIR=$PREFIX_ABS/lockdir
+CACHEDIR=$PREFIX_ABS/lockdir
 LOGDIR=$PREFIX_ABS/logs
 SOCKET_WRAPPER_DIR=$PREFIX/sw
 CONFIGURATION="-s $CONFFILE"
 
 export PREFIX PREFIX_ABS CONFIGURATION CONFFILE PATH SOCKET_WRAPPER_DIR DOMAIN
-export PRIVATEDIR LIBDIR PIDDIR LOCKDIR LOGDIR SERVERCONFFILE
+export PRIVATEDIR LIBDIR PIDDIR STATEDIR CACHEDIR LOGDIR SERVERCONFFILE
 export SRCDIR SCRIPTDIR
 export USERNAME PASSWORD
 export SMBTORTURE4
@@ -73,7 +74,7 @@
 ##
 echo -n "CREATE TEST ENVIRONMENT IN '$PREFIX'"...
 /bin/rm -rf $PREFIX/*
-mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $LOCKDIR $LOGDIR $SOCKET_WRAPPER_DIR
+mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $STATEDIR $CACHEDIR $LOGDIR $SOCKET_WRAPPER_DIR
 mkdir -p $PREFIX_ABS/tmp
 chmod 777 $PREFIX_ABS/tmp
 
@@ -86,7 +87,8 @@
 
 	private dir = $PRIVATEDIR
 	pid directory = $PIDDIR
-	lock directory = $LOCKDIR
+	state directory = $STATEDIR
+	cache directory = $CACHEDIR
 	log file = $LOGDIR/log.%m
 	log level = 0
 
diff -uPr samba-3.0.24.old/source/smbd/connection.c samba-3.0.24.new/source/smbd/connection.c
--- samba-3.0.24.old/source/smbd/connection.c	2005-10-17 22:44:57.000000000 -0400
+++ samba-3.0.24.new/source/smbd/connection.c	2007-03-06 16:04:14.000000000 -0500
@@ -29,7 +29,7 @@
 TDB_CONTEXT *conn_tdb_ctx(void)
 {
 	if (!tdb)
-		tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, 
+		tdb = tdb_open_log(cache_path("connections.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, 
 			       O_RDWR | O_CREAT, 0644);
 
 	return tdb;
@@ -131,7 +131,7 @@
 	TDB_DATA kbuf, dbuf;
 
 	if (!tdb)
-		tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, 
+		tdb = tdb_open_log(cache_path("connections.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, 
 			       O_RDWR | O_CREAT, 0644);
 
 	if (!tdb)
diff -uPr samba-3.0.24.old/source/smbd/lanman.c samba-3.0.24.new/source/smbd/lanman.c
--- samba-3.0.24.old/source/smbd/lanman.c	2007-02-04 13:59:13.000000000 -0500
+++ samba-3.0.24.new/source/smbd/lanman.c	2007-03-06 16:04:30.000000000 -0500
@@ -1052,9 +1052,9 @@
 	BOOL local_list_only;
 	int i;
 
-	lines = file_lines_load(lock_path(SERVER_LIST), NULL, 0);
+	lines = file_lines_load(state_path(SERVER_LIST), NULL, 0);
 	if (!lines) {
-		DEBUG(4,("Can't open %s - %s\n",lock_path(SERVER_LIST),strerror(errno)));
+		DEBUG(4,("Can't open %s - %s\n",state_path(SERVER_LIST),strerror(errno)));
 		return 0;
 	}
 
diff -uPr samba-3.0.24.old/source/smbd/oplock_irix.c samba-3.0.24.new/source/smbd/oplock_irix.c
--- samba-3.0.24.old/source/smbd/oplock_irix.c	2007-02-04 13:59:13.000000000 -0500
+++ samba-3.0.24.new/source/smbd/oplock_irix.c	2007-03-06 15:27:35.000000000 -0500
@@ -38,7 +38,7 @@
 
 	set_effective_capability(KERNEL_OPLOCK_CAPABILITY);
 
-	slprintf(tmpname,sizeof(tmpname)-1, "%s/koplock.%d", lp_lockdir(), (int)sys_getpid());
+	slprintf(tmpname,sizeof(tmpname)-1, "%s/koplock.%d", lp_cachedir(), (int)sys_getpid());
 
 	if(pipe(pfd) != 0) {
 		DEBUG(0,("check_kernel_oplocks: Unable to create pipe. Error was %s\n",
diff -uPr samba-3.0.24.old/source/smbd/server.c samba-3.0.24.new/source/smbd/server.c
--- samba-3.0.24.old/source/smbd/server.c	2007-02-04 13:59:13.000000000 -0500
+++ samba-3.0.24.new/source/smbd/server.c	2007-03-06 15:28:08.000000000 -0500
@@ -902,8 +902,11 @@
 		setpgid( (pid_t)0, (pid_t)0);
 #endif
 
-	if (!directory_exist(lp_lockdir(), NULL))
-		mkdir(lp_lockdir(), 0755);
+	if (!directory_exist(lp_cachedir(), NULL))
+		mkdir(lp_cachedir(), 0755);
+
+	if (!directory_exist(lp_statedir(), NULL))
+		mkdir(lp_statedir(), 0755);
 
 	if (is_daemon)
 		pidfile_create("smbd");
diff -uPr samba-3.0.24.old/source/smbd/session.c samba-3.0.24.new/source/smbd/session.c
--- samba-3.0.24.old/source/smbd/session.c	2006-04-19 22:29:19.000000000 -0400
+++ samba-3.0.24.new/source/smbd/session.c	2007-03-06 16:04:55.000000000 -0500
@@ -34,7 +34,7 @@
 	if (tdb)
 		return True;
 
-	tdb = tdb_open_log(lock_path("sessionid.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, 
+	tdb = tdb_open_log(cache_path("sessionid.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, 
 		       O_RDWR | O_CREAT, 0644);
 	if (!tdb) {
 		DEBUG(1,("session_init: failed to open sessionid tdb\n"));
diff -uPr samba-3.0.24.old/source/utils/net_idmap.c samba-3.0.24.new/source/utils/net_idmap.c
--- samba-3.0.24.old/source/utils/net_idmap.c	2007-02-04 13:59:25.000000000 -0500
+++ samba-3.0.24.new/source/utils/net_idmap.c	2007-03-06 16:05:03.000000000 -0500
@@ -136,7 +136,7 @@
 		return NT_STATUS_UNSUCCESSFUL;
 	}
 
-	tdbfile = SMB_STRDUP(lock_path("winbindd_idmap.tdb"));
+	tdbfile = SMB_STRDUP(state_path("winbindd_idmap.tdb"));
 	if (!tdbfile) {
 		DEBUG(0, ("idmap_init: out of memory!\n"));
 		return NT_STATUS_NO_MEMORY;
diff -uPr samba-3.0.24.old/source/utils/net_status.c samba-3.0.24.new/source/utils/net_status.c
--- samba-3.0.24.old/source/utils/net_status.c	2007-02-04 13:59:25.000000000 -0500
+++ samba-3.0.24.new/source/utils/net_status.c	2007-03-06 16:05:45.000000000 -0500
@@ -70,11 +70,11 @@
 			 "------------------------\n");
 	}
 
-	tdb = tdb_open_log(lock_path("sessionid.tdb"), 0,
+	tdb = tdb_open_log(cache_path("sessionid.tdb"), 0,
 			   TDB_DEFAULT, O_RDONLY, 0);
 
 	if (tdb == NULL) {
-		d_fprintf(stderr, "%s not initialised\n", lock_path("sessionid.tdb"));
+		d_fprintf(stderr, "%s not initialised\n", cache_path("sessionid.tdb"));
 		return -1;
 	}
 
@@ -186,22 +186,22 @@
 	ids.num_entries = 0;
 	ids.entries = NULL;
 
-	tdb = tdb_open_log(lock_path("sessionid.tdb"), 0,
+	tdb = tdb_open_log(cache_path("sessionid.tdb"), 0,
 			   TDB_DEFAULT, O_RDONLY, 0);
 
 	if (tdb == NULL) {
-		d_fprintf(stderr, "%s not initialised\n", lock_path("sessionid.tdb"));
+		d_fprintf(stderr, "%s not initialised\n", cache_path("sessionid.tdb"));
 		return -1;
 	}
 
 	tdb_traverse(tdb, collect_pid, &ids);
 	tdb_close(tdb);
 
-	tdb = tdb_open_log(lock_path("connections.tdb"), 0,
+	tdb = tdb_open_log(cache_path("connections.tdb"), 0,
 			   TDB_DEFAULT, O_RDONLY, 0);
 
 	if (tdb == NULL) {
-		d_fprintf(stderr, "%s not initialised\n", lock_path("connections.tdb"));
+		d_fprintf(stderr, "%s not initialised\n", cache_path("connections.tdb"));
 		d_fprintf(stderr, "This is normal if no SMB client has ever "
 			 "connected to your server.\n");
 		return -1;
@@ -226,12 +226,12 @@
 		d_printf("-------------------------------------"
 			 "------------------\n");
 
-		tdb = tdb_open_log(lock_path("connections.tdb"), 0,
+		tdb = tdb_open_log(cache_path("connections.tdb"), 0,
 				   TDB_DEFAULT, O_RDONLY, 0);
 
 		if (tdb == NULL) {
 			d_fprintf(stderr, "%s not initialised\n",
-				 lock_path("connections.tdb"));
+				 cache_path("connections.tdb"));
 			d_fprintf(stderr, "This is normal if no SMB client has "
 				 "ever connected to your server.\n");
 			return -1;
diff -uPr samba-3.0.24.old/source/utils/smbcontrol.c samba-3.0.24.new/source/utils/smbcontrol.c
--- samba-3.0.24.old/source/utils/smbcontrol.c	2007-02-04 13:59:25.000000000 -0500
+++ samba-3.0.24.new/source/utils/smbcontrol.c	2007-03-06 16:06:33.000000000 -0500
@@ -61,7 +61,7 @@
 	if (procid_to_pid(&pid) != 0)
 		return message_send_pid(pid, msg_type, buf, len, duplicates);
 
-	tdb = tdb_open_log(lock_path("connections.tdb"), 0, 
+	tdb = tdb_open_log(cache_path("connections.tdb"), 0, 
 			   TDB_DEFAULT, O_RDWR, 0);
 	if (!tdb) {
 		fprintf(stderr,"Failed to open connections database"
@@ -286,7 +286,7 @@
 	} else {
 		TDB_CONTEXT * tdb;
 
-		tdb = tdb_open_log(lock_path("connections.tdb"), 0, 
+		tdb = tdb_open_log(cache_path("connections.tdb"), 0, 
 				   TDB_DEFAULT, O_RDONLY, 0);
 		if (!tdb) {
 			fprintf(stderr,
@@ -828,10 +828,10 @@
 	/* Remove the entry in the winbindd_cache tdb to tell a later
 	   starting winbindd that we're online. */
 
-	tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
+	tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
 	if (!tdb) {
 		fprintf(stderr, "Cannot open the tdb %s for writing.\n",
-			lock_path("winbindd_cache.tdb"));
+			cache_path("winbindd_cache.tdb"));
 		return False;
 	}
 
@@ -864,13 +864,13 @@
 	   starting winbindd that we're offline. We may actually create
 	   it here... */
 
-	tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
+	tdb = tdb_open_log(cache_path("winbindd_cache.tdb"),
 				WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
 				TDB_DEFAULT /* TDB_CLEAR_IF_FIRST */, O_RDWR|O_CREAT, 0600);
 
 	if (!tdb) {
 		fprintf(stderr, "Cannot open the tdb %s for writing.\n",
-			lock_path("winbindd_cache.tdb"));
+			cache_path("winbindd_cache.tdb"));
 		return False;
 	}
 
diff -uPr samba-3.0.24.old/source/utils/status.c samba-3.0.24.new/source/utils/status.c
--- samba-3.0.24.old/source/utils/status.c	2007-02-04 13:59:25.000000000 -0500
+++ samba-3.0.24.new/source/utils/status.c	2007-03-06 16:07:00.000000000 -0500
@@ -669,7 +669,7 @@
 	}
 	
 	if ( show_processes ) {
-		tdb = tdb_open_log(lock_path("sessionid.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
+		tdb = tdb_open_log(cache_path("sessionid.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
 		if (!tdb) {
 			d_printf("sessionid.tdb not initialised\n");
 		} else {
@@ -686,13 +686,13 @@
 	}
   
 	if ( show_shares ) {
-		tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
+		tdb = tdb_open_log(cache_path("connections.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
 		if (!tdb) {
-			d_printf("%s not initialised\n", lock_path("connections.tdb"));
+			d_printf("%s not initialised\n", cache_path("connections.tdb"));
 			d_printf("This is normal if an SMB client has never connected to your server.\n");
 		}  else  {
 			if (verbose) {
-				d_printf("Opened %s\n", lock_path("connections.tdb"));
+				d_printf("Opened %s\n", cache_path("connections.tdb"));
 			}
 
 			if (brief) 
diff -uPr samba-3.0.24.old/source/utils/testparm.c samba-3.0.24.new/source/utils/testparm.c
--- samba-3.0.24.old/source/utils/testparm.c	2007-02-04 13:59:25.000000000 -0500
+++ samba-3.0.24.new/source/utils/testparm.c	2007-03-06 15:29:34.000000000 -0500
@@ -57,13 +57,23 @@
 		ret = 1;
 	}
 
-	if (!directory_exist(lp_lockdir(), &st)) {
-		fprintf(stderr, "ERROR: lock directory %s does not exist\n",
-		       lp_lockdir());
+	if (!directory_exist(lp_cachedir(), &st)) {
+		fprintf(stderr, "ERROR: cache directory %s does not exist\n",
+		       lp_cachedir());
 		ret = 1;
 	} else if ((st.st_mode & 0777) != 0755) {
-		fprintf(stderr, "WARNING: lock directory %s should have permissions 0755 for browsing to work\n",
-		       lp_lockdir());
+		fprintf(stderr, "WARNING: cache directory %s should have permissions 0755 for browsing to work\n",
+		       lp_cachedir());
+		ret = 1;
+	}
+
+	if (!directory_exist(lp_statedir(), &st)) {
+		fprintf(stderr, "ERROR: state directory %s does not exist\n",
+		       lp_statedir());
+		ret = 1;
+	} else if ((st.st_mode & 0777) != 0755) {
+		fprintf(stderr, "WARNING: state directory %s should have permissions 0755 for browsing to work\n",
+		       lp_statedir());
 		ret = 1;
 	}
 
diff -uPr samba-3.0.24.old/source/web/statuspage.c samba-3.0.24.new/source/web/statuspage.c
--- samba-3.0.24.old/source/web/statuspage.c	2007-02-04 13:59:21.000000000 -0500
+++ samba-3.0.24.new/source/web/statuspage.c	2007-03-06 16:07:08.000000000 -0500
@@ -319,7 +319,7 @@
 		PID_or_Machine = 0;
 	}
 
-	tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
+	tdb = tdb_open_log(cache_path("connections.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
 	if (tdb) tdb_traverse(tdb, traverse_fn1, NULL);
  
 	initPid2Machine ();

samba-3.0.24-msdfs-root-no.patch:
 loadparm.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE samba-3.0.24-msdfs-root-no.patch ---
--- samba-3.0.24.orig/source/param/loadparm.c	2007-02-04 13:59:13.000000000 -0500
+++ samba-3.0.24/source/param/loadparm.c	2007-02-20 14:03:49.000000000 -0500
@@ -570,7 +570,7 @@
 	False,			/* bInheritPerms */
 	False,			/* bInheritACLS */
 	False,			/* bInheritOwner */
-	True,			/* bMSDfsRoot */
+	False,			/* bMSDfsRoot */
 	False,			/* bUseClientDriver */
 	True,			/* bDefaultDevmode */
 	False,			/* bForcePrintername */

samba-3.0.24-nss_wins.patch:
 Makefile.in |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE samba-3.0.24-nss_wins.patch ---
Index: source/Makefile.in
===================================================================
--- source/Makefile.in.orig
+++ source/Makefile.in
@@ -687,7 +687,8 @@ PROTO_OBJ = $(SMBD_OBJ_MAIN) \
             $(RPC_NTSVCS_OBJ) utils/passwd_util.o
 
 WINBIND_WINS_NSS_OBJ = nsswitch/wins.o $(PARAM_OBJ) \
-	$(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ)
+	$(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ) \
+	$(SECRETS_OBJ)
 
 WINBIND_WINS_NSS_PICOBJS = $(WINBIND_WINS_NSS_OBJ:.o=. at PICSUFFIX@)
 
@@ -1231,7 +1232,7 @@ bin/winbindd at EXEEXT@: $(WINBINDD_OBJ) @B
 @WINBIND_WINS_NSS@: $(WINBIND_WINS_NSS_PICOBJS)
 	@echo "Linking $@"
 	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_PICOBJS) \
-		$(LDAP_LIBS) $(KRB5LIBS) \
+		$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) \
 		@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
 
 bin/pam_winbind. at SHLIBEXT@: $(PAM_WINBIND_OBJ:.o=. at PICSUFFIX@) bin/.dummy

samba-3.0.24-pam_winbind-fixes.patch:
 pam_winbind.c |   67 ++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 44 insertions(+), 23 deletions(-)

--- NEW FILE samba-3.0.24-pam_winbind-fixes.patch ---
------------------------------------------------------------------------
r21143 | gd | 2007-02-05 15:34:12 +0100 (Mon, 05 Feb 2007) | 7 lines

Fix wrong check for pam error codes for getpwnam and lookup winbind
requests in pam_winbind (Bug #4094).

Inspired by fix from Lars Heete.

Guenther

------------------------------------------------------------------------
Index: source/nsswitch/pam_winbind.c
===================================================================
--- source/nsswitch/pam_winbind.c	(revision 21142)
+++ source/nsswitch/pam_winbind.c	(revision 21143)
@@ -444,21 +444,34 @@ static int pam_winbind_request(pam_handl
 	close_sock();
 
 	/* Copy reply data from socket */
-	if (response->result != WINBINDD_OK) {
-		if (response->data.auth.pam_error != PAM_SUCCESS) {
-			_pam_log(LOG_ERR, "request failed: %s, PAM error was %s (%d), NT error was %s", 
-				 response->data.auth.error_string,
-				 pam_strerror(pamh, response->data.auth.pam_error),
-				 response->data.auth.pam_error,
-				 response->data.auth.nt_status_string);
-			return response->data.auth.pam_error;
-		} else {
-			_pam_log(LOG_ERR, "request failed, but PAM error 0!");
-			return PAM_SERVICE_ERR;
-		}
+	if (response->result == WINBINDD_OK) {
+		return PAM_SUCCESS;
 	}
 
-	return PAM_SUCCESS;
+	/* no need to check for pam_error codes for getpwnam() */
+	switch (req_type) {
+
+		case WINBINDD_GETPWNAM:
+		case WINBINDD_LOOKUPNAME:
+			_pam_log(LOG_ERR, "request failed: %s, NT error was %s", 
+				response->data.auth.nt_status_string);
+			return PAM_USER_UNKNOWN;
+		default:
+			break;
+	}
+
+	if (response->data.auth.pam_error != PAM_SUCCESS) {
+		_pam_log(LOG_ERR, "request failed: %s, PAM error was %s (%d), NT error was %s", 
+			 response->data.auth.error_string,
+			 pam_strerror(pamh, response->data.auth.pam_error),
+			 response->data.auth.pam_error,
+			 response->data.auth.nt_status_string);
+		return response->data.auth.pam_error;
+	} 
+	
+	_pam_log(LOG_ERR, "request failed, but PAM error 0!");
+
+	return PAM_SERVICE_ERR;
 }
 
 static int pam_winbind_request_log(pam_handle_t * pamh,
------------------------------------------------------------------------
r21310 | gd | 2007-02-13 12:04:10 +0100 (Tue, 13 Feb 2007) | 4 lines

Fix invalid printfs in pam_winbind.

Guenther

------------------------------------------------------------------------
Index: source/nsswitch/pam_winbind.c
===================================================================
--- source/nsswitch/pam_winbind.c	(revision 21309)
+++ source/nsswitch/pam_winbind.c	(revision 21310)
@@ -461,8 +461,12 @@ static int pam_winbind_request(pam_handl
 
 		case WINBINDD_GETPWNAM:
 		case WINBINDD_LOOKUPNAME:
-			_pam_log(LOG_ERR, "request failed: %s, NT error was %s", 
+			if (strlen(response->data.auth.nt_status_string) > 0) {
+				_pam_log(LOG_ERR, "request failed, NT error was %s", 
 				response->data.auth.nt_status_string);
+			} else {
+				_pam_log(LOG_ERR, "request failed");
+			}
 			return PAM_USER_UNKNOWN;
 		default:
 			break;
@@ -518,15 +522,19 @@ static int pam_winbind_request_log(pam_h
 		}	 
 		return retval;
 	case PAM_SUCCESS:
-		if (req_type == WINBINDD_PAM_AUTH) {
-			/* Otherwise, the authentication looked good */
-			_pam_log(LOG_NOTICE, "user '%s' granted access", user);
-		} else if (req_type == WINBINDD_PAM_CHAUTHTOK) {
-			/* Otherwise, the authentication looked good */
-			_pam_log(LOG_NOTICE, "user '%s' password changed", user);
-		} else { 
-			/* Otherwise, the authentication looked good */
-			_pam_log(LOG_NOTICE, "user '%s' OK", user);
+		/* Otherwise, the authentication looked good */
+		switch (req_type) {
+			case WINBINDD_INFO:
+				break;
+			case WINBINDD_PAM_AUTH:
+				_pam_log(LOG_NOTICE, "user '%s' granted access", user);
+				break;
+			case WINBINDD_PAM_CHAUTHTOK:
+				_pam_log(LOG_NOTICE, "user '%s' password changed", user);
+				break;
+			default:
+				_pam_log(LOG_NOTICE, "user '%s' OK", user);
+				break;
 		}
 	
 		return retval;

samba-3.0.24-vista-patchset.patch:
 auth/auth_compat.c          |   13 ++++--
 include/smb.h               |    4 +-
 lib/dummysmbd.c             |    6 +++
 lib/util.c                  |    3 +
 locking/locking.c           |    5 ++
 printing/nt_printing.c      |   87 +++++++++++++++++++++++++++++++++++++++-----
 rpc_parse/parse_spoolss.c   |   11 +++++
 rpc_server/srv_spoolss.c    |    9 ++++
 rpc_server/srv_spoolss_nt.c |   15 +++++++
 smbd/dir.c                  |   39 +++++++++++++++++++
 smbd/msdfs.c                |    6 ++-
 smbd/negprot.c              |   45 ++++++++++++++++++----
 smbd/password.c             |   25 ++++++++++++
 smbd/posix_acls.c           |   26 ++++++++++++-
 smbd/sesssetup.c            |    1 
 15 files changed, 269 insertions(+), 26 deletions(-)

--- NEW FILE samba-3.0.24-vista-patchset.patch ---
Index: samba-3.0.24/source/auth/auth_compat.c
===================================================================
--- samba-3.0.24.orig/source/auth/auth_compat.c	2007-02-08 08:01:57.000000000 -0600
+++ samba-3.0.24/source/auth/auth_compat.c	2007-02-08 08:02:08.000000000 -0600
@@ -92,18 +92,25 @@
 check if a username/password pair is ok via the auth subsystem.
 return True if the password is correct, False otherwise
 ****************************************************************************/
+
 BOOL password_ok(char *smb_name, DATA_BLOB password_blob)
 {
 
 	DATA_BLOB null_password = data_blob(NULL, 0);
-	BOOL encrypted = (global_encrypted_passwords_negotiated && password_blob.length == 24);
+	BOOL encrypted = (global_encrypted_passwords_negotiated && (password_blob.length == 24 || password_blob.length > 46));
 	
 	if (encrypted) {
 		/* 
 		 * The password could be either NTLM or plain LM.  Try NTLM first, 
 		 * but fall-through as required.
-		 * NTLMv2 makes no sense here.
+		 * Vista sends NTLMv2 here - we need to try the client given workgroup.
 		 */
+		if (get_session_workgroup()) {
+			if (NT_STATUS_IS_OK(pass_check_smb(smb_name, get_session_workgroup(), null_password, password_blob, null_password, encrypted))) {
+				return True;
+			}
+		}
+
 		if (NT_STATUS_IS_OK(pass_check_smb(smb_name, lp_workgroup(), null_password, password_blob, null_password, encrypted))) {
 			return True;
 		}
@@ -119,5 +126,3 @@
 
 	return False;
 }
-
-
Index: samba-3.0.24/source/smbd/password.c
===================================================================
--- samba-3.0.24.orig/source/smbd/password.c	2007-02-08 08:01:42.000000000 -0600
+++ samba-3.0.24/source/smbd/password.c	2007-02-08 08:02:08.000000000 -0600
@@ -23,6 +23,8 @@
 /* users from session setup */
 static char *session_userlist = NULL;
 static int len_session_userlist = 0;
+/* workgroup from session setup. */
+static char *session_workgroup = NULL;
 
 /* this holds info on user ids that are already validated for this VC */
 static user_struct *validated_users;
@@ -406,6 +408,29 @@
 }
 
 /****************************************************************************
+ In security=share mode we need to store the client workgroup, as that's
+  what Vista uses for the NTLMv2 calculation.
+****************************************************************************/
+
+void add_session_workgroup(const char *workgroup)
+{
+	if (session_workgroup) {
+		SAFE_FREE(session_workgroup);
+	}
+	session_workgroup = smb_xstrdup(workgroup);
+}
+
+/****************************************************************************
+ In security=share mode we need to return the client workgroup, as that's
+  what Vista uses for the NTLMv2 calculation.
+****************************************************************************/
+
+const char *get_session_workgroup(void)
+{
+	return session_workgroup;
+}
+
+/****************************************************************************
  Check if a user is in a netgroup user list. If at first we don't succeed,
  try lower case.
 ****************************************************************************/
Index: samba-3.0.24/source/smbd/sesssetup.c
===================================================================
--- samba-3.0.24.orig/source/smbd/sesssetup.c	2007-02-08 08:01:38.000000000 -0600
+++ samba-3.0.24/source/smbd/sesssetup.c	2007-02-08 08:02:08.000000000 -0600
@@ -1035,6 +1035,7 @@
 
 		map_username(sub_user);
 		add_session_user(sub_user);
+		add_session_workgroup(domain);
 		/* Then force it to null for the benfit of the code below */
 		*user = 0;
 	}
Index: samba-3.0.24/source/rpc_server/srv_spoolss_nt.c
===================================================================
--- samba-3.0.24.orig/source/rpc_server/srv_spoolss_nt.c	2007-02-04 12:59:21.000000000 -0600
+++ samba-3.0.24/source/rpc_server/srv_spoolss_nt.c	2007-02-15 11:02:09.000000000 -0600
@@ -5848,6 +5848,12 @@
 		goto done;
 	}
 	
+	if (!secdesc_ctr) {
+		DEBUG(10,("update_printer_sec: secdesc_ctr is NULL !\n"));
+		result = WERR_INVALID_PARAM;
+		goto done;
+	}
+
 	/* Check the user has permissions to change the security
 	   descriptor.  By experimentation with two NT machines, the user
 	   requires Full Access to the printer to change security
@@ -9378,6 +9384,15 @@
 	
 	/* housekeeping information in the reply */
 	
+	/* Fix from Martin Zielinski <mz at seh.de> - ensure
+	 * the hand marshalled container size is a multiple
+	 * of 4 bytes for RPC alignment.
+	 */
+
+	if (needed % 4) {
+		needed += 4-(needed % 4);
+	}
+
 	r_u->needed 	= needed;
 	r_u->returned 	= num_entries;
 
Index: samba-3.0.24/source/printing/nt_printing.c
===================================================================
--- samba-3.0.24.orig/source/printing/nt_printing.c	2007-02-04 13:09:01.000000000 -0600
+++ samba-3.0.24/source/printing/nt_printing.c	2007-02-15 11:02:09.000000000 -0600
@@ -2984,11 +2984,15 @@
 	return True;
 }
 
+/*****************************************************************
+ ****************************************************************/
+
 static void store_printer_guid(NT_PRINTER_INFO_LEVEL_2 *info2, 
 			       struct uuid guid)
 {
 	int i;
 	REGVAL_CTR *ctr=NULL;
+	UNISTR2 unistr_guid;
 
 	/* find the DsSpooler key */
 	if ((i = lookup_printerkey(info2->data, SPOOL_DSSPOOLER_KEY)) < 0)
@@ -2996,8 +3000,18 @@
 	ctr = info2->data->keys[i].values;
 
 	regval_ctr_delvalue(ctr, "objectGUID");
-	regval_ctr_addvalue(ctr, "objectGUID", REG_BINARY, 
-			    (char *) &guid, sizeof(struct uuid));	
+
+	/* We used to store this as a REG_BINARY but that causes
+	   Vista to whine */
+
+	ZERO_STRUCT( unistr_guid );	
+	init_unistr2( &unistr_guid, smb_uuid_string_static(guid),
+		      UNI_STR_TERMINATE );
+
+	regval_ctr_addvalue(ctr, "objectGUID", REG_SZ, 
+			    (char *)unistr_guid.buffer, 
+			    unistr_guid.uni_max_len*2);
+	
 }
 
 static WERROR nt_printer_publish_ads(ADS_STRUCT *ads,
@@ -3254,6 +3268,7 @@
 	REGISTRY_VALUE *guid_val;
 	WERROR win_rc;
 	int i;
+	BOOL ret = False;
 
 	win_rc = get_a_printer(print_hnd, &printer, 2, lp_servicename(snum));
 
@@ -3267,12 +3282,36 @@
 		return False;
 	}
 
-	/* fetching printer guids really ought to be a separate function.. */
-	if (guid && regval_size(guid_val) == sizeof(struct uuid))
-		memcpy(guid, regval_data_p(guid_val), sizeof(struct uuid));
+	/* fetching printer guids really ought to be a separate function. */
+
+	if ( guid ) {	
+		fstring guid_str;
+		
+		/* We used to store the guid as REG_BINARY, then swapped 
+		   to REG_SZ for Vista compatibility so check for both */
+
+		switch ( regval_type(guid_val) ){
+		case REG_SZ:		
+			rpcstr_pull( guid_str, regval_data_p(guid_val), 
+				     sizeof(guid_str)-1, -1, STR_TERMINATE );
+			ret = smb_string_to_uuid( guid_str, guid );
+			break;			
+		case REG_BINARY:
+			if ( regval_size(guid_val) != sizeof(struct uuid) ) {
+				ret = False;
+				break;
+			}
+			memcpy(guid, regval_data_p(guid_val), sizeof(struct uuid));
+			break;
+		default:
+			DEBUG(0,("is_printer_published: GUID value stored as "
+				 "invaluid type (%d)\n", regval_type(guid_val) ));			
+			break;
+		}
+	}
 
 	free_a_printer(&printer, 2);
-	return True;
+	return ret;
 }
 #else
 WERROR nt_printer_publish(Printer_entry *print_hnd, int snum, int action)
@@ -3539,13 +3578,43 @@
 			break;
 		}
 		
-		/* add the new value */
+		DEBUG(8,("specific: [%s:%s], len: %d\n", keyname, valuename, size));
+
+		/* Vista doesn't like unknown REG_BINARY values in DsSpooler.  
+		   Thanks to Martin Zielinski for the hint. */
+
+		if ( type == REG_BINARY && 
+		     strequal( keyname, SPOOL_DSSPOOLER_KEY ) && 
+		     strequal( valuename, "objectGUID" ) ) 
+		{
+			struct uuid guid;
+			UNISTR2 unistr_guid;
+
+			ZERO_STRUCT( unistr_guid );
+			
+			/* convert the GUID to a UNICODE string */
+			
+			memcpy( &guid, data_p, sizeof(struct uuid) );
+			
+			init_unistr2( &unistr_guid, smb_uuid_string_static(guid), 
+				      UNI_STR_TERMINATE );
+			
+			regval_ctr_addvalue( printer_data->keys[key_index].values, 
+					     valuename, REG_SZ, 
+					     (const char *)unistr_guid.buffer, 
+					     unistr_guid.uni_str_len*2 );
+
+		} else {
+			/* add the value */
+
+			regval_ctr_addvalue( printer_data->keys[key_index].values, 
+					     valuename, type, (const char *)data_p, 
+					     size );
+		}
 		
-		regval_ctr_addvalue( printer_data->keys[key_index].values, valuename, type, (const char *)data_p, size );
 
 		SAFE_FREE(data_p); /* 'B' option to tdbpack does a malloc() */
 
-		DEBUG(8,("specific: [%s:%s], len: %d\n", keyname, valuename, size));
 	}
 
 	return len;
Index: samba-3.0.24/source/rpc_server/srv_spoolss.c
===================================================================
--- samba-3.0.24.orig/source/rpc_server/srv_spoolss.c	2006-04-19 21:29:27.000000000 -0500
+++ samba-3.0.24/source/rpc_server/srv_spoolss.c	2007-02-15 11:02:09.000000000 -0600
@@ -1477,6 +1477,15 @@
 	ZERO_STRUCT(r_u);
 	
 	if(!spoolss_io_q_addprinterdriverex("", &q_u, data, 0)) {
+		if (q_u.level != 3 && q_u.level != 6) {
+			/* Clever hack from Martin Zielinski <mz at seh.de>
+			 * to allow downgrade from level 8 (Vista).
+			 */
+			DEBUG(3,("api_spoolss_addprinterdriverex: unknown SPOOL_Q_ADDPRINTERDRIVEREX level %u.\n",
+				(unsigned int)q_u.level ));
+			setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_INVALID_TAG));
+			return True;
+		}
 		DEBUG(0,("spoolss_io_q_addprinterdriverex: unable to unmarshall SPOOL_Q_ADDPRINTERDRIVEREX.\n"));
 		return False;
 	}
Index: samba-3.0.24/source/rpc_parse/parse_spoolss.c
===================================================================
--- samba-3.0.24.orig/source/rpc_parse/parse_spoolss.c	2007-02-15 11:02:19.000000000 -0600
+++ samba-3.0.24/source/rpc_parse/parse_spoolss.c	2007-02-15 11:02:25.000000000 -0600
@@ -3893,7 +3893,16 @@
 		}
 		case 3:
 		{
-			ptr_sec_desc = q_u->info.info_3->secdesc_ptr;
+			/* FIXME ! Our parsing here is wrong I think,
+			 * but for a level3 it makes no sense for
+			 * ptr_sec_desc to be NULL. JRA. Based on
+			 * a Vista sniff from Martin Zielinski <mz at seh.de>.
+			 */
+			if (UNMARSHALLING(ps)) {
+				ptr_sec_desc = 1;
+			} else {
+				ptr_sec_desc = q_u->info.info_3->secdesc_ptr;
+			}
 			break;
 		}
 	}
Index: samba-3.0.24/source/smbd/posix_acls.c
===================================================================
--- samba-3.0.24.orig/source/smbd/posix_acls.c	2007-02-08 08:11:29.000000000 -0600
+++ samba-3.0.24/source/smbd/posix_acls.c	2007-02-08 08:12:02.000000000 -0600
@@ -655,6 +655,7 @@
 	}
 	return 0;
 }
+
 /****************************************************************************
  Function to create owner and group SIDs from a SMB_STRUCT_STAT.
 ****************************************************************************/
@@ -666,6 +667,27 @@
 }
 
 /****************************************************************************
+ Is the identity in two ACEs equal ? Check both SID and uid/gid.
+****************************************************************************/
+
+static BOOL identity_in_ace_equal(canon_ace *ace1, canon_ace *ace2)
+{
+	if (sid_equal(&ace1->trustee, &ace2->trustee)) {
+		return True;
+	}
+	if (ace1->owner_type == ace2->owner_type) {
+		if (ace1->owner_type == UID_ACE &&
+				ace1->unix_ug.uid == ace2->unix_ug.uid) {
+			return True;
+		} else if (ace1->owner_type == GID_ACE &&
+				ace1->unix_ug.gid == ace2->unix_ug.gid) {
+			return True;
+		}
+	}
+	return False;
+}
+
+/****************************************************************************
  Merge aces with a common sid - if both are allow or deny, OR the permissions together and
  delete the second one. If the first is deny, mask the permissions off and delete the allow
  if the permissions become zero, delete the deny if the permissions are non zero.
@@ -692,7 +714,7 @@
 
 			curr_ace_next = curr_ace->next; /* Save the link in case of delete. */
 
-			if (sid_equal(&curr_ace->trustee, &curr_ace_outer->trustee) &&
+			if (identity_in_ace_equal(curr_ace, curr_ace_outer) &&
 				(curr_ace->attr == curr_ace_outer->attr)) {
 
 				if( DEBUGLVL( 10 )) {
@@ -732,7 +754,7 @@
 			 * we've put on the ACL, we know the deny must be the first one.
 			 */
 
-			if (sid_equal(&curr_ace->trustee, &curr_ace_outer->trustee) &&
+			if (identity_in_ace_equal(curr_ace, curr_ace_outer) &&
 				(curr_ace_outer->attr == DENY_ACE) && (curr_ace->attr == ALLOW_ACE)) {
 
 				if( DEBUGLVL( 10 )) {
Index: samba-3.0.24/source/include/smb.h
===================================================================
--- samba-3.0.24.orig/source/include/smb.h	2007-02-08 15:27:50.000000000 -0600
+++ samba-3.0.24/source/include/smb.h	2007-02-08 15:31:14.000000000 -0600
@@ -1436,6 +1436,7 @@
 #define FLAGS2_LONG_PATH_COMPONENTS    0x0001
 #define FLAGS2_EXTENDED_ATTRIBUTES     0x0002
 #define FLAGS2_SMB_SECURITY_SIGNATURES 0x0004
+#define FLAGS2_UNKNOWN_BIT4            0x0010
 #define FLAGS2_IS_LONG_NAME            0x0040
 #define FLAGS2_EXTENDED_SECURITY       0x0800 
 #define FLAGS2_DFS_PATHNAMES           0x1000
@@ -1499,7 +1500,8 @@
 
 /* Remote architectures we know about. */
 enum remote_arch_types {RA_UNKNOWN, RA_WFWG, RA_OS2, RA_WIN95, RA_WINNT,
-			RA_WIN2K, RA_WINXP, RA_WIN2K3, RA_SAMBA, RA_CIFSFS};
+			RA_WIN2K, RA_WINXP, RA_WIN2K3, RA_VISTA,
+			RA_SAMBA, RA_CIFSFS};
 
 /* case handling */
 enum case_handling {CASE_LOWER,CASE_UPPER};
Index: samba-3.0.24/source/smbd/negprot.c
===================================================================
--- samba-3.0.24.orig/source/smbd/negprot.c	2007-02-08 15:27:50.000000000 -0600
+++ samba-3.0.24/source/smbd/negprot.c	2007-02-08 15:42:10.000000000 -0600
@@ -263,6 +263,16 @@
 
 	global_encrypted_passwords_negotiated = lp_encrypted_passwords();
 
+	/* Check the flags field to see if this is Vista.
+	   WinXP sets it and Vista does not. But we have to 
+	   distinguish from NT which doesn't set it either. */
+
+	if ( (SVAL(inbuf, smb_flg2) & FLAGS2_EXTENDED_SECURITY) &&
+		((SVAL(inbuf, smb_flg2) & FLAGS2_UNKNOWN_BIT4) == 0) ) 
+	{
+		set_remote_arch( RA_VISTA );		
+	}
+
 	/* do spnego in user level security if the client
 	   supports it and we can do encrypted passwords */
 	
@@ -393,6 +403,15 @@
 protocol [LANMAN2.1]
 protocol [NT LM 0.12]
 
+Vista:
+protocol [PC NETWORK PROGRAM 1.0]
+protocol [LANMAN1.0]
+protocol [Windows for Workgroups 3.1a]
+protocol [LM1.2X002]
+protocol [LANMAN2.1]
+protocol [NT LM 0.12]
+protocol [SMB 2.001]
+
 OS/2:
 protocol [PC NETWORK PROGRAM 1.0]
 protocol [XENIX CORE]
@@ -406,18 +425,19 @@
   *
   * This appears to be the matrix of which protocol is used by which
   * MS product.
-       Protocol                       WfWg    Win95   WinNT  Win2K  OS/2
-       PC NETWORK PROGRAM 1.0          1       1       1      1      1
+       Protocol                       WfWg    Win95   WinNT  Win2K  OS/2 Vista
+       PC NETWORK PROGRAM 1.0          1       1       1      1      1     1
        XENIX CORE                                      2             2
        MICROSOFT NETWORKS 3.0          2       2       
        DOS LM1.2X002                   3       3       
        MICROSOFT NETWORKS 1.03                         3
        DOS LANMAN2.1                   4       4       
-       LANMAN1.0                                       4      2      3
-       Windows for Workgroups 3.1a     5       5       5      3
-       LM1.2X002                                       6      4      4
-       LANMAN2.1                                       7      5      5
-       NT LM 0.12                              6       8      6
+       LANMAN1.0                                       4      2      3     2
+       Windows for Workgroups 3.1a     5       5       5      3            3
+       LM1.2X002                                       6      4      4     4
+       LANMAN2.1                                       7      5      5     5
+       NT LM 0.12                              6       8      6            6
+       SMB 2.001                                                           7
   *
   *  tim at fsg.com 09/29/95
   *  Win2K added by matty 17/7/99
@@ -430,6 +450,7 @@
 #define ARCH_OS2      0x14     /* Again OS/2 is like NT */
 #define ARCH_SAMBA    0x20
 #define ARCH_CIFSFS   0x40
+#define ARCH_VISTA    0x8C     /* Vista is like XP/2K */
  
 #define ARCH_ALL      0x7F
  
@@ -493,6 +514,8 @@
 			arch &= ( ARCH_WFWG | ARCH_WIN95 );
 		else if (strcsequal(p,"NT LM 0.12"))
 			arch &= ( ARCH_WIN95 | ARCH_WINNT | ARCH_WIN2K | ARCH_CIFSFS);
+		else if (strcsequal(p,"SMB 2.001"))
+			arch = ARCH_VISTA;		
 		else if (strcsequal(p,"LANMAN2.1"))
 			arch &= ( ARCH_WINNT | ARCH_WIN2K | ARCH_OS2 );
 		else if (strcsequal(p,"LM1.2X002"))
@@ -537,7 +560,13 @@
 				set_remote_arch(RA_WINNT);
 			break;
 		case ARCH_WIN2K:
-			set_remote_arch(RA_WIN2K);
+			/* Vista may have been set in the negprot so don't 
+			   override it here */
+			if ( get_remote_arch() != RA_VISTA )
+				set_remote_arch(RA_WIN2K);
+			break;
+		case ARCH_VISTA:
+			set_remote_arch(RA_VISTA);
 			break;
 		case ARCH_OS2:
 			set_remote_arch(RA_OS2);
Index: samba-3.0.24/source/lib/util.c
===================================================================
--- samba-3.0.24.orig/source/lib/util.c	2007-02-08 15:27:50.000000000 -0600
+++ samba-3.0.24/source/lib/util.c	2007-02-08 15:31:14.000000000 -0600
@@ -2182,6 +2182,9 @@
 	case RA_WIN2K3:
 		fstrcpy(remote_arch, "Win2K3");
 		break;
+	case RA_VISTA:
+		fstrcpy(remote_arch, "Vista");
+		break;
 	case RA_SAMBA:
 		fstrcpy(remote_arch,"Samba");
 		break;
Index: samba-3.0.24/source/smbd/msdfs.c
===================================================================
--- samba-3.0.24.orig/source/smbd/msdfs.c	2007-02-04 12:59:13.000000000 -0600
+++ samba-3.0.24/source/smbd/msdfs.c	2007-02-08 15:54:49.000000000 -0600
@@ -832,9 +832,13 @@
 
 	/* create the referral depeding on version */
 	DEBUG(10,("max_referral_level :%d\n",max_referral_level));
-	if(max_referral_level<2 || max_referral_level>3) {
+
+	if (max_referral_level < 2) {
 		max_referral_level = 2;
 	}
+	if (max_referral_level > 3) {
+		max_referral_level = 3;
+	}
 
 	switch(max_referral_level) {
 	case 2:
Index: samba-3.0.24/source/lib/dummysmbd.c
===================================================================
--- samba-3.0.24.orig/source/lib/dummysmbd.c	2006-04-19 21:29:23.000000000 -0500
+++ samba-3.0.24/source/lib/dummysmbd.c	2007-02-08 20:15:04.000000000 -0600
@@ -38,3 +38,9 @@
 {
 	return False;
 }
+
+NTSTATUS can_delete_directory(struct connection_struct *conn,
+                                const char *dirname)
+{
+	return NT_STATUS_OK;
+}
Index: samba-3.0.24/source/locking/locking.c
===================================================================
--- samba-3.0.24.orig/source/locking/locking.c	2007-02-04 12:59:23.000000000 -0600
+++ samba-3.0.24/source/locking/locking.c	2007-02-08 20:15:04.000000000 -0600
@@ -1166,6 +1166,11 @@
 		return NT_STATUS_ACCESS_DENIED;
 	}
 
+	/* Don't allow delete on close for non-empty directories. */
+	if (fsp->is_directory) {
+		return can_delete_directory(fsp->conn, fsp->fsp_name);
+	}
+
 	return NT_STATUS_OK;
 }
 
Index: samba-3.0.24/source/smbd/dir.c
===================================================================
--- samba-3.0.24.orig/source/smbd/dir.c	2007-02-04 12:59:13.000000000 -0600
+++ samba-3.0.24/source/smbd/dir.c	2007-02-08 20:15:04.000000000 -0600
@@ -1255,3 +1255,42 @@
 	}
 	return False;
 }
+
+/*****************************************************************
+ Is this directory empty ?
+*****************************************************************/
+
+NTSTATUS can_delete_directory(struct connection_struct *conn,
+				const char *dirname)
+{
+	NTSTATUS status = NT_STATUS_OK;
+	long dirpos = 0;
+	const char *dname;
+	struct smb_Dir *dir_hnd = OpenDir(conn, dirname, NULL, 0);
+
+	if (!dir_hnd) {
+		return map_nt_error_from_unix(errno);
+	}
+
+	while ((dname = ReadDirName(dir_hnd,&dirpos))) {
+		SMB_STRUCT_STAT st;
+
+		/* Quick check for "." and ".." */
+		if (dname[0] == '.') {
+			if (!dname[1] || (dname[1] == '.' && !dname[2])) {
+				continue;
+			}
+		}
+
+		if (!is_visible_file(conn, dirname, dname, &st, True)) {
+			continue;
+		}
+
+		DEBUG(10,("can_delete_directory: got name %s - can't delete\n", dname ));
+		status = NT_STATUS_DIRECTORY_NOT_EMPTY;
+		break;
+	}
+	CloseDir(dir_hnd);
+
+	return status;
+}

samba-3.0.24-vista_msdfs_errcodes.patch:
 rpc_server/srv_dfs_nt.c |    6 ++---
 smbd/msdfs.c            |   57 ++++++++++++++++++++++++++++--------------------
 smbd/trans2.c           |    5 ++--
 3 files changed, 40 insertions(+), 28 deletions(-)

--- NEW FILE samba-3.0.24-vista_msdfs_errcodes.patch ---
diff -uPr samba-3.0.24/source/rpc_server/srv_dfs_nt.c samba-3.0.24.msdfs/source/rpc_server/srv_dfs_nt.c
--- samba-3.0.24/source/rpc_server/srv_dfs_nt.c	2007-02-04 13:59:21.000000000 -0500
+++ samba-3.0.24.msdfs/source/rpc_server/srv_dfs_nt.c	2007-04-05 13:23:04.000000000 -0400
@@ -67,7 +67,7 @@
 	pstrcat(altpath, sharename);
 
 	/* The following call can change the cwd. */
-	if(get_referred_path(p->mem_ctx, dfspath, &jn, NULL, NULL)) {
+	if(NT_STATUS_IS_OK(get_referred_path(p->mem_ctx, dfspath, &jn, NULL, NULL))) {
 		exists = True;
 		jn.referral_count += 1;
 		old_referral_list = jn.referral_list;
@@ -137,7 +137,7 @@
 	DEBUG(5,("init_reply_dfs_remove: Request to remove %s -> %s\\%s.\n",
 		dfspath, servername, sharename));
 
-	if(!get_referred_path(p->mem_ctx, dfspath, &jn, NULL, NULL)) {
+	if(!NT_STATUS_IS_OK(get_referred_path(p->mem_ctx, dfspath, &jn, NULL, NULL))) {
 		return WERR_DFS_NO_SUCH_VOL;
 	}
 
@@ -353,7 +353,7 @@
 		return WERR_DFS_NO_SUCH_SERVER;
   
 	/* The following call can change the cwd. */
-	if(!get_referred_path(p->mem_ctx, path, &jn, &consumedcnt, NULL) || consumedcnt < strlen(path)) {
+	if(!NT_STATUS_IS_OK(get_referred_path(p->mem_ctx, path, &jn, &consumedcnt, NULL)) || consumedcnt < strlen(path)) {
 		vfs_ChDir(p->conn,p->conn->connectpath);
 		return WERR_DFS_NO_SUCH_VOL;
 	}
diff -uPr samba-3.0.24/source/smbd/msdfs.c samba-3.0.24.msdfs/source/smbd/msdfs.c
--- samba-3.0.24/source/smbd/msdfs.c	2007-02-04 13:59:13.000000000 -0500
+++ samba-3.0.24.msdfs/source/smbd/msdfs.c	2007-04-05 12:58:18.000000000 -0400
@@ -129,7 +129,7 @@
  Note this CHANGES CWD !!!! JRA.
 *********************************************************/
 
-static BOOL create_conn_struct(connection_struct *conn, int snum, char *path)
+static NTSTATUS create_conn_struct(connection_struct *conn, int snum, char *path)
 {
 	pstring connpath;
 
@@ -143,15 +143,16 @@
 	
         if ( (conn->mem_ctx=talloc_init("connection_struct")) == NULL ) {
                 DEBUG(0,("talloc_init(connection_struct) failed!\n"));
-                return False;
+                return NT_STATUS_NO_MEMORY;
         }
 	
 	set_conn_connectpath(conn, connpath);
 
 	if (!smbd_vfs_init(conn)) {
+		NTSTATUS status = map_nt_error_from_unix(errno);
 		DEBUG(0,("create_conn_struct: smbd_vfs_init failed.\n"));
 		conn_free_internal(conn);
-		return False;
+		return status;
 	}
 
 	/*
@@ -161,13 +162,14 @@
 	 */
 
 	if (vfs_ChDir(conn,conn->connectpath) != 0) {
+		NTSTATUS status = map_nt_error_from_unix(errno);
 		DEBUG(3,("create_conn_struct: Can't ChDir to new conn path %s. Error was %s\n",
 					conn->connectpath, strerror(errno) ));
 		conn_free_internal(conn);
-		return False;
+		return status;
 	}
 
-	return True;
+	return NT_STATUS_OK;
 }
 
 /**********************************************************************
@@ -478,7 +480,7 @@
  junction_map structure.
 **********************************************************************/
 
-BOOL get_referred_path(TALLOC_CTX *ctx, char *pathname, struct junction_map *jucn,
+NTSTATUS get_referred_path(TALLOC_CTX *ctx, char *pathname, struct junction_map *jucn,
 		       int *consumedcntp, BOOL *self_referralp)
 {
 	struct dfs_path dp;
@@ -487,11 +489,11 @@
 	struct connection_struct *conn = &conns;
 	pstring conn_path;
 	int snum;
-	BOOL ret = False;
+	NTSTATUS status = NT_STATUS_NOT_FOUND;
 	BOOL self_referral = False;
 
 	if (!pathname || !jucn) {
-		return False;
+		return NT_STATUS_NOT_FOUND;
 	}
 
 	ZERO_STRUCT(conns);
@@ -508,7 +510,7 @@
 	if (!is_myname_or_ipaddr(dp.hostname)) {
 		DEBUG(3, ("get_referred_path: Invalid hostname %s in path %s\n",
 			dp.hostname, pathname));
-		return False;
+		return NT_STATUS_NOT_FOUND;
 	}
 
 	pstrcpy(jucn->service_name, dp.servicename);
@@ -518,14 +520,14 @@
 	snum = lp_servicenumber(jucn->service_name);
 	if(snum < 0) {
 		if ((snum = find_service(jucn->service_name)) < 0) {
-			return False;
+			return NT_STATUS_NOT_FOUND;
 		}
 	}
 
 	if (!lp_msdfs_root(snum)) {
 		DEBUG(3,("get_referred_path: .%s. in dfs path %s is not a dfs root.\n",
 			 dp.servicename, pathname));
-		goto out;
+		return NT_STATUS_NOT_FOUND;
 	}
 
 	/*
@@ -540,13 +542,17 @@
 		struct referral* ref;
 
 		if (*lp_msdfs_proxy(snum) == '\0') {
-			return self_ref(ctx, pathname, jucn, consumedcntp, self_referralp);
+			if (self_ref(ctx, pathname, jucn, consumedcntp, self_referralp)) {
+				return NT_STATUS_OK;
+			} else {
+				return NT_STATUS_NOT_FOUND;
+			}
 		}
 
 		jucn->referral_count = 1;
 		if ((ref = TALLOC_P(ctx, struct referral)) == NULL) {
 			DEBUG(0, ("malloc failed for referral\n"));
-			goto out;
+			return NT_STATUS_NO_MEMORY;
 		}
 
 		pstrcpy(ref->alternate_path, lp_msdfs_proxy(snum));
@@ -559,13 +565,13 @@
 		if (consumedcntp) {
 			*consumedcntp = strlen(pathname);
 		}
-		ret = True;
-		goto out;
+		return NT_STATUS_OK;
 	}
 
 	pstrcpy(conn_path, lp_pathname(snum));
-	if (!create_conn_struct(conn, snum, conn_path)) {
-		return False;
+	status = create_conn_struct(conn, snum, conn_path);
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
 	}
 
 	/* If not remote & not a self referral, return False */
@@ -585,12 +591,12 @@
 		}
 	}
 	
-	ret = True;
+	status = NT_STATUS_OK;
 
 out:
 
 	conn_free_internal(conn);
-	return ret;
+	return status;
 }
 
 static int setup_ver2_dfs_referral(char *pathname, char **ppdata, 
@@ -780,7 +786,7 @@
  Set up the Dfs referral for the dfs pathname
 ******************************************************************/
 
-int setup_dfs_referral(connection_struct *orig_conn, char *pathname, int max_referral_level, char **ppdata)
+int setup_dfs_referral(connection_struct *orig_conn, char *pathname, int max_referral_level, char **ppdata, NTSTATUS *pstatus)
 {
 	struct junction_map junction;
 	int consumedcnt;
@@ -791,6 +797,7 @@
 	TALLOC_CTX *ctx;
 
 	if (!(ctx=talloc_init("setup_dfs_referral"))) {
+		*pstatus = NT_STATUS_NO_MEMORY;
 		return -1;
 	}
 
@@ -799,6 +806,7 @@
 	/* get the junction entry */
 	if (!pathnamep) {
 		talloc_destroy(ctx);
+		*pstatus = NT_STATUS_NO_MEMORY;
 		return -1;
 	}
 
@@ -811,7 +819,8 @@
 
 	pstrcpy(buf, pathnamep);
 	/* The following call can change cwd. */
-	if (!get_referred_path(ctx, buf, &junction, &consumedcnt, &self_referral)) {
+	*pstatus = get_referred_path(ctx, buf, &junction, &consumedcnt, &self_referral);
+	if(!NT_STATUS_IS_OK(*pstatus)) {
 		vfs_ChDir(orig_conn,orig_conn->connectpath);
 		talloc_destroy(ctx);
 		return -1;
@@ -848,6 +857,7 @@
 	default:
 		DEBUG(0,("setup_dfs_referral: Invalid dfs referral version: %d\n", max_referral_level));
 		talloc_destroy(ctx);
+		*pstatus = NT_STATUS_INVALID_LEVEL;
 		return -1;
 	}
       
@@ -857,6 +867,7 @@
 	}
 
 	talloc_destroy(ctx);
+	*pstatus = NT_STATUS_OK;
 	return reply_size;
 }
 
@@ -917,7 +928,7 @@
 	safe_strcat(path, jucn->volume_name, max_pathlen-1);
 
 	pstrcpy(conn_path, lp_pathname(snum));
-	if (!create_conn_struct(conn, snum, conn_path)) {
+	if (!NT_STATUS_IS_OK(create_conn_struct(conn, snum, conn_path))) {
 		return False;
 	}
 
@@ -1031,7 +1042,7 @@
 	 * Fake up a connection struct for the VFS layer.
 	 */
 
-	if (!create_conn_struct(&conn, snum, connect_path)) {
+	if (!NT_STATUS_IS_OK(create_conn_struct(&conn, snum, connect_path))) {
 		return 0;
 	}
 
diff -uPr samba-3.0.24/source/smbd/trans2.c samba-3.0.24.msdfs/source/smbd/trans2.c
--- samba-3.0.24/source/smbd/trans2.c	2007-02-04 14:09:01.000000000 -0500
+++ samba-3.0.24.msdfs/source/smbd/trans2.c	2007-04-05 12:57:22.000000000 -0400
@@ -4934,6 +4934,7 @@
   	pstring pathname;
 	int reply_size = 0;
 	int max_referral_level;
+	NTSTATUS status = NT_STATUS_OK;
 
 	DEBUG(10,("call_trans2getdfsreferral\n"));
 
@@ -4947,8 +4948,8 @@
 		return ERROR_DOS(ERRDOS,ERRbadfunc);
 
 	srvstr_pull(inbuf, pathname, &params[2], sizeof(pathname), -1, STR_TERMINATE);
-	if((reply_size = setup_dfs_referral(conn, pathname,max_referral_level,ppdata)) < 0)
-		return UNIXERROR(ERRDOS,ERRbadfile);
+	if((reply_size = setup_dfs_referral(conn, pathname,max_referral_level,ppdata,&status)) < 0)
+		return ERROR_NT(status);
     
 	SSVAL(outbuf,smb_flg2,SVAL(outbuf,smb_flg2) | FLAGS2_DFS_PATHNAMES);
 	send_trans2_replies(outbuf,bufsize,0,0,*ppdata,reply_size);


Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-6/samba.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- samba.spec	28 Mar 2007 16:24:27 -0000	1.75
+++ samba.spec	5 Apr 2007 20:29:50 -0000	1.76
@@ -3,7 +3,7 @@
 Summary: The Samba SMB server.
 Name: samba
 Version: 3.0.24
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 0
 License: GNU GPL Version 2
 Group: System Environment/Daemons
@@ -44,7 +44,14 @@
 Patch111: samba-3.0.13-smbclient.patch
 #Patch112: samba-3.0.15pre2-bug106483.patch
 #Patch113: samba-3.0.21-warnings.patch
-Patch114: samba-3.0.24-tar_options.patch
+Patch114: samba-3.0.24-msdfs-root-no.patch
+Patch115: samba-3.0.24-vista-patchset.patch
+Patch116: samba-3.0.24-arch_macro.patch
+Patch117: samba-3.0.24-pam_winbind-fixes.patch
+Patch118: samba-3.0.24-tar_options.patch
+Patch119: samba-3.0.24-enable_pam_nss_tests.patch
+Patch120: samba-3.0.24-nss_wins.patch
+Patch121: samba-3.0.24-vista_msdfs_errcodes.patch
 
 Requires: pam >= 0:0.64 %{auth} samba-common = %{epoch}:%{version}-%{release}
 Requires: logrotate >= 0:3.4 initscripts >= 0:5.54-1 
@@ -127,7 +134,14 @@
 %patch111 -p1 -b .smbclient
 #%patch112 -p1 -b .bug106483
 #%patch113 -p1 -b .warnings
-%patch114 -p0 -b .tar_options
+%patch114 -p1 -b .dfsroot
+%patch115 -p1 -b .vista
+%patch116 -p0 -b .arch_macro
+%patch117 -p0 -b .pam_winbind
+%patch118 -p0 -b .tar_options
+%patch119 -p0 -b .pam_nss_test
+%patch120 -p0 -b .nss_wins
+%patch121 -p1 -b .msdfs
 
 # crap
 rm -f examples/VFS/.cvsignore
@@ -447,6 +461,9 @@
 %{_mandir}/man7/libsmbclient.7*
 
 %changelog
+* Thu Apr 5 2007 Simo Sorce <ssorce at redhat.com> 3.0.24-4.fc6
+- sync up patches from the rawhide packages
+
 * Wed Mar 28 2007 Simo Sorce <ssorce at redhat.com> 3.0.24-3.fc6
 - add patch for bug 176649
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 21:20:35 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 17:20:35 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.398, 1.399 anaconda.spec, 1.526,
	1.527 sources, 1.523, 1.524
Message-ID: <200704052120.l35LKZgQ023446@cvs.devel.redhat.com>

Author: katzj

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -r1.398 -r1.399
--- .cvsignore	4 Apr 2007 20:51:16 -0000	1.398
+++ .cvsignore	5 Apr 2007 21:20:33 -0000	1.399
@@ -1 +1 @@
-anaconda-11.2.0.45.tar.bz2
+anaconda-11.2.0.46.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.526
retrieving revision 1.527
diff -u -r1.526 -r1.527
--- anaconda.spec	4 Apr 2007 20:51:16 -0000	1.526
+++ anaconda.spec	5 Apr 2007 21:20:33 -0000	1.527
@@ -1,7 +1,7 @@
 %define livearches %{ix86} x86_64
 
 Name: anaconda
-Version: 11.2.0.45
+Version: 11.2.0.46
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -142,6 +142,10 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Apr  5 2007 Jeremy Katz <katzj at redhat.com> - 11.2.0.46-1
+- Minor live install fixes
+- dasd fixes (dcantrell)
+
 * Wed Apr  4 2007 Jeremy Katz <katzj at redhat.com> - 11.2.0.45-1
 - More live changes to fix installing from the live image running from RAM 
   or a USB stick.  Note: requires a livecd created with livecd-tools >= 006


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.523
retrieving revision 1.524
diff -u -r1.523 -r1.524
--- sources	4 Apr 2007 20:51:16 -0000	1.523
+++ sources	5 Apr 2007 21:20:33 -0000	1.524
@@ -1 +1 @@
-370e423c8720250c6e0f99d878bef6d9  anaconda-11.2.0.45.tar.bz2
+a1c7779fce685f45f55bb34045611563  anaconda-11.2.0.46.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr  5 21:34:28 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 17:34:28 -0400
Subject: rpms/kernel/devel jwltest-bcm43xx_mac80211-phy-rev-1.patch, NONE,
	1.1.2.1 jwltest-git-wireless-dev.patch, NONE,
	1.1.12.1 jwltest-mac80211-wpa-fix.patch, NONE,
	1.1.2.1 kernel-2.6.spec, 1.3048, 1.3048.2.1
Message-ID: <200704052134.l35LYSlg032463@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-jwltest-fc7-7-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-linville-jwltest-fc7-7-branch
	jwltest-bcm43xx_mac80211-phy-rev-1.patch 
	jwltest-git-wireless-dev.patch jwltest-mac80211-wpa-fix.patch 
Log Message:


jwltest-bcm43xx_mac80211-phy-rev-1.patch:
 bcm43xx_phy.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE jwltest-bcm43xx_mac80211-phy-rev-1.patch ---
--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c.orig	2007-04-05 16:34:09.000000000 -0400
+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c	2007-04-05 16:35:00.000000000 -0400
@@ -1140,7 +1140,7 @@ static void bcm43xx_phy_initb5(struct bc
 	if (phy->radio_ver == 0x2050)
 		bcm43xx_phy_write(dev, 0x0038, 0x0667);
 
-	if (phy->type == BCM43xx_PHYTYPE_G) {
+	if (phy->gmode) {
 		if (phy->radio_ver == 0x2050) {
 			bcm43xx_radio_write16(dev, 0x007A,
 					      bcm43xx_radio_read16(dev, 0x007A)
@@ -1576,7 +1576,7 @@ static void bcm43xx_phy_initg(struct bcm
 		bcm43xx_phy_write(dev, BCM43xx_PHY_RFOVER, 0x400);
 		bcm43xx_phy_write(dev, BCM43xx_PHY_PGACTL, 0xC0);
 	}
-	if (phy->gmode) {
+	if (phy->rev >= 2 && phy->gmode) {
 		tmp = bcm43xx_phy_read(dev, BCM43xx_PHY_VERSION_OFDM);
 		tmp &= BCM43xx_PHYVER_VERSION;
 		if (tmp == 3 || tmp == 5) {

jwltest-git-wireless-dev.patch:
 CREDITS                                                 |   31 
 MAINTAINERS                                             |   54 
 drivers/Kconfig                                         |    2 
 drivers/Makefile                                        |    1 
 drivers/net/Makefile                                    |    2 
 drivers/net/wireless/Kconfig                            |  120 
 drivers/net/wireless/Makefile                           |    3 
 drivers/net/wireless/bcm43xx/Kconfig                    |    3 
 drivers/net/wireless/hostap/Kconfig                     |    3 
 drivers/net/wireless/mac80211/Kconfig                   |    6 
 drivers/net/wireless/mac80211/Makefile                  |    6 
 drivers/net/wireless/mac80211/README                    |    2 
 drivers/net/wireless/mac80211/adm8211/Kconfig           |   25 
 drivers/net/wireless/mac80211/adm8211/Makefile          |    1 
 drivers/net/wireless/mac80211/adm8211/adm8211.c         | 2188 +++++++
 drivers/net/wireless/mac80211/adm8211/adm8211.h         |  622 ++
 drivers/net/wireless/mac80211/bcm43xx/Kconfig           |  100 
 drivers/net/wireless/mac80211/bcm43xx/Makefile          |   16 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h         |  870 ++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c |  433 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h |  110 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c     | 1297 ++++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h     |  361 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c    |  300 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h    |   56 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c      | 1081 +++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h      |   92 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c    | 3988 ++++++++++++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h    |  156 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c  |  163 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h  |   22 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c     | 4235 +++++++++++++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h     |  309 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c     |  671 ++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h     |  170 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c   |   82 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h   |   41 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c   |  232 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h   |    9 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c  |  376 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h  |   28 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_vstack.c  |  202 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_vstack.h  |   83 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c    |  615 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h    |  215 
 drivers/net/wireless/mac80211/p54/Kconfig               |   10 
 drivers/net/wireless/mac80211/p54/Makefile              |    4 
 drivers/net/wireless/mac80211/p54/net2280.h             |  452 +
 drivers/net/wireless/mac80211/p54/prism54.h             |   77 
 drivers/net/wireless/mac80211/p54/prism54common.c       |  807 ++
 drivers/net/wireless/mac80211/p54/prism54common.h       |  304 
 drivers/net/wireless/mac80211/p54/prism54magic.h        |   77 
 drivers/net/wireless/mac80211/p54/prism54pci.c          |  698 ++
 drivers/net/wireless/mac80211/p54/prism54pci.h          |  106 
 drivers/net/wireless/mac80211/p54/prism54usb.c          |  946 +++
 drivers/net/wireless/mac80211/p54/prism54usb.h          |  133 
 drivers/net/wireless/mac80211/rt2x00/Kconfig            |   86 
 drivers/net/wireless/mac80211/rt2x00/Makefile           |    9 
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.c        | 2586 ++++++++
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.h        |  931 +++
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.c        | 2883 +++++++++
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.h        | 1198 +++
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.c        | 2718 ++++++++
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.h        |  746 ++
 drivers/net/wireless/mac80211/rt2x00/rt2x00.h           | 1069 +++
 drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c      |  380 +
 drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h      |   70 
 drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c        |  231 
 drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h        |   74 
 drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c        |  540 +
 drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h        |   39 
 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h        |   82 
 drivers/net/wireless/mac80211/rt2x00/rt61pci.c          | 3364 ++++++++++
 drivers/net/wireless/mac80211/rt2x00/rt61pci.h          | 1361 ++++
 drivers/net/wireless/mac80211/rt2x00/rt73usb.c          | 3024 +++++++++
 drivers/net/wireless/mac80211/rt2x00/rt73usb.h          |  945 +++
 drivers/net/wireless/mac80211/rtl818x/Kconfig           |    9 
 drivers/net/wireless/mac80211/rtl818x/Makefile          |    2 
 drivers/net/wireless/mac80211/rtl818x/rtl8187.h         |  126 
 drivers/net/wireless/mac80211/rtl818x/rtl8187_dev.c     |  720 ++
 drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.c |  747 ++
 drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.h |   30 
 drivers/net/wireless/mac80211/rtl818x/rtl818x.h         |  177 
 drivers/net/wireless/mac80211/zd1211rw/Kconfig          |   19 
 drivers/net/wireless/mac80211/zd1211rw/Makefile         |   11 
 drivers/net/wireless/mac80211/zd1211rw/zd_chip.c        | 1676 +++++
 drivers/net/wireless/mac80211/zd1211rw/zd_chip.h        |  909 ++
 drivers/net/wireless/mac80211/zd1211rw/zd_def.h         |   57 
 drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h   |   67 
 drivers/net/wireless/mac80211/zd1211rw/zd_mac.c         |  705 ++
 drivers/net/wireless/mac80211/zd1211rw/zd_mac.h         |  250 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf.c          |  156 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf.h          |   81 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c   |  436 +
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c  |  274 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c   |  279 
 drivers/net/wireless/mac80211/zd1211rw/zd_usb.c         | 1327 ++++
 drivers/net/wireless/mac80211/zd1211rw/zd_usb.h         |  241 
 drivers/net/wireless/mac80211/zd1211rw/zd_util.c        |   82 
 drivers/net/wireless/mac80211/zd1211rw/zd_util.h        |   29 
 drivers/net/wireless/zd1211rw/Kconfig                   |    3 
 drivers/ssb/Kconfig                                     |   93 
 drivers/ssb/Makefile                                    |   11 
 drivers/ssb/driver_chipcommon.c                         |  402 +
 drivers/ssb/driver_mipscore.c                           |  258 
 drivers/ssb/driver_pcicore.c                            |  556 +
 drivers/ssb/main.c                                      | 1042 +++
 drivers/ssb/pci.c                                       |  667 ++
 drivers/ssb/pcihost_wrapper.c                           |  104 
 drivers/ssb/pcmcia.c                                    |  256 
 drivers/ssb/scan.c                                      |  407 +
 drivers/ssb/ssb_private.h                               |  151 
 drivers/usb/host/Kconfig                                |   13 
 drivers/usb/host/ohci-hcd.c                             |   21 
 drivers/usb/host/ohci-ssb.c                             |  254 
 include/linux/Kbuild                                    |    2 
 include/linux/crc-itu-t.h                               |   27 
 include/linux/eeprom_93cx6.h                            |   77 
 include/linux/ieee80211.h                               |  330 +
 include/linux/netdevice.h                               |    7 
 include/linux/nl80211.h                                 |  275 
 include/linux/ssb/ssb.h                                 |  403 +
 include/linux/ssb/ssb_driver_chipcommon.h               |  387 +
 include/linux/ssb/ssb_driver_extif.h                    |  163 
 include/linux/ssb/ssb_driver_mips.h                     |   47 
 include/linux/ssb/ssb_driver_pci.h                      |  108 
 include/linux/ssb/ssb_regs.h                            |  294 
 include/net/cfg80211.h                                  |  169 
 include/net/iw_handler.h                                |    3 
 include/net/mac80211.h                                  | 1074 +++
 include/net/wireless.h                                  |  160 
 lib/Kconfig                                             |   16 
 lib/Makefile                                            |    3 
 lib/crc-itu-t.c                                         |   64 
 lib/eeprom_93cx6.c                                      |  344 +
 net/Kconfig                                             |   12 
 net/Makefile                                            |    2 
 net/core/Makefile                                       |    1 
 net/core/dev.c                                          |   33 
 net/core/wireless.c                                     | 2371 -------
 net/ieee80211/Kconfig                                   |    3 
 net/mac80211/Kconfig                                    |   71 
 net/mac80211/Makefile                                   |   26 
 net/mac80211/aes_ccm.c                                  |  155 
 net/mac80211/aes_ccm.h                                  |   26 
 net/mac80211/fifo_qdisc.c                               |  102 
 net/mac80211/hostapd_ioctl.h                            |  347 +
 net/mac80211/ieee80211.c                                | 4940 ++++++++++++++++
 net/mac80211/ieee80211_cfg.c                            |   90 
 net/mac80211/ieee80211_cfg.h                            |    9 
 net/mac80211/ieee80211_common.h                         |   98 
 net/mac80211/ieee80211_i.h                              |  720 ++
 net/mac80211/ieee80211_iface.c                          |  372 +
 net/mac80211/ieee80211_ioctl.c                          | 3304 ++++++++++
 net/mac80211/ieee80211_key.h                            |   89 
 net/mac80211/ieee80211_led.c                            |   91 
 net/mac80211/ieee80211_led.h                            |   32 
 net/mac80211/ieee80211_rate.c                           |  140 
 net/mac80211/ieee80211_rate.h                           |  161 
 net/mac80211/ieee80211_scan.c                           |  344 +
 net/mac80211/ieee80211_sta.c                            | 3013 +++++++++
 net/mac80211/ieee80211_sysfs.c                          |  718 ++
 net/mac80211/ieee80211_sysfs.h                          |   12 
 net/mac80211/ieee80211_sysfs_sta.c                      |  438 +
 net/mac80211/michael.c                                  |  104 
 net/mac80211/michael.h                                  |   20 
 net/mac80211/rc80211_simple.c                           |  399 +
 net/mac80211/sta_info.c                                 |  461 +
 net/mac80211/sta_info.h                                 |  150 
 net/mac80211/tkip.c                                     |  341 +
 net/mac80211/tkip.h                                     |   36 
 net/mac80211/wep.c                                      |  328 +
 net/mac80211/wep.h                                      |   40 
 net/mac80211/wme.c                                      |  679 ++
 net/mac80211/wme.h                                      |   38 
 net/mac80211/wpa.c                                      |  846 ++
 net/mac80211/wpa.h                                      |   31 
 net/wireless/Kconfig                                    |   46 
 net/wireless/Makefile                                   |   17 
 net/wireless/core.c                                     |  323 +
 net/wireless/core.h                                     |   77 
 net/wireless/nl80211.c                                  | 1051 +++
 net/wireless/nl80211.h                                  |   17 
 net/wireless/sysfs.c                                    |  125 
 net/wireless/sysfs.h                                    |    9 
 net/wireless/wext-common.c                              |  663 ++
 net/wireless/wext-compat.c                              |  819 ++
 net/wireless/wext-export.c                              |   29 
 net/wireless/wext-mod.c                                 |   20 
 net/wireless/wext-old.c                                 | 1461 ++++
 net/wireless/wext.h                                     |   51 
 191 files changed, 85347 insertions(+), 2487 deletions(-)

--- NEW FILE jwltest-git-wireless-dev.patch ---
--- /dev/null	2007-03-09 11:47:32.684268720 -0500
+++ linux-2.6.20.noarch/include/net/wireless.h	2007-04-05 17:31:39.000000000 -0400
@@ -0,0 +1,160 @@
+#ifndef __NET_WIRELESS_H
+#define __NET_WIRELESS_H
+
+/*
+ * 802.11 device management
+ *
+ * Copyright 2007	Johannes Berg <johannes at sipsolutions.net>
+ */
+
+#include <linux/netdevice.h>
+#include <linux/debugfs.h>
+#include <linux/list.h>
+#include <net/cfg80211.h>
+
+/**
+ * struct wiphy - wireless hardware description
+ * @idx: the wiphy index assigned to this item
+ * @class_dev: the class device representing /sys/class/ieee80211/<wiphy-name>
+ */
+struct wiphy {
+	/* assign these fields before you register the wiphy */
+
+	/* permanent MAC address */
+	u8 perm_addr[ETH_ALEN];
+
+	/* If multiple wiphys are registered and you're handed e.g.
+	 * a regular netdev with assigned ieee80211_ptr, you won't
+	 * know whether it points to a wiphy your driver has registered
+	 * or not. Assign this to something global to your driver to
+	 * help determine whether you own this wiphy or not. */
+	void *privid;
+
+	/* fields below are read-only, assigned by cfg80211 */
+
+	/* the item in /sys/class/ieee80211/ points to this,
+	 * you need use set_wiphy_dev() (see below) */
+	struct device dev;
+
+	/* dir in debugfs: ieee80211/<wiphyname> */
+	struct dentry *debugfsdir;
+
+	char priv[0] __attribute__((__aligned__(NETDEV_ALIGN)));
+};
+
+/** struct wireless_dev - wireless per-netdev state
+ *
+ * This structure must be allocated by the driver/stack
+ * that uses the ieee80211_ptr field in struct net_device
+ * (this is intentional so it can be allocated along with
+ * the netdev.)
+ *
+ * @wiphy: pointer to hardware description
+ */
+struct wireless_dev {
+	struct wiphy *wiphy;
+
+	/* private to the generic wireless code */
+	struct cfg80211_config pending_config;
+	struct list_head list;
+	struct net_device *netdev;
+};
+
+/**
+ * wiphy_priv - return priv from wiphy
+ */
+static inline void *wiphy_priv(struct wiphy *wiphy)
+{
+	BUG_ON(!wiphy);
+	return &wiphy->priv;
+}
+
+/**
+ * set_wiphy_dev - set device pointer for wiphy
+ */
+static inline void set_wiphy_dev(struct wiphy *wiphy, struct device *dev)
+{
+	wiphy->dev.parent = dev;
+}
+
+/**
+ * wiphy_dev - get wiphy dev pointer
+ */
+static inline struct device *wiphy_dev(struct wiphy *wiphy)
+{
+	return wiphy->dev.parent;
+}
+
+/**
+ * wiphy_name - get wiphy name
+ */
+static inline char *wiphy_name(struct wiphy *wiphy)
+{
+	return wiphy->dev.bus_id;
+}
+
+/**
+ * wdev_priv - return wiphy priv from wireless_dev
+ */
+static inline void *wdev_priv(struct wireless_dev *wdev)
+{
+	BUG_ON(!wdev);
+	return wiphy_priv(wdev->wiphy);
+}
+
+/**
+ * wiphy_new - create a new wiphy for use with cfg80211
+ *
+ * create a new wiphy and associate the given operations with it.
+ * @sizeof_priv bytes are allocated for private use.
+ *
+ * the returned pointer must be assigned to each netdev's
+ * ieee80211_ptr for proper operation.
+ */
+struct wiphy *wiphy_new(struct cfg80211_ops *ops, int sizeof_priv);
+
+/**
+ * wiphy_register - register a wiphy with cfg80211
+ *
+ * register the given wiphy
+ *
+ * Returns a non-negative wiphy index or a negative error code.
+ */
+extern int wiphy_register(struct wiphy *wiphy);
+
+/**
+ * wiphy_unregister - deregister a wiphy from cfg80211
+ *
+ * unregister a device with the given priv pointer.
+ * After this call, no more requests can be made with this priv
+ * pointer, but the call may sleep to wait for an outstanding
+ * request that is being handled.
+ */
+extern void wiphy_unregister(struct wiphy *wiphy);
+
+/**
+ * wiphy_free - free wiphy
+ */
+extern void wiphy_free(struct wiphy *wiphy);
+
+
+/*
+ * internal definitions for wireless
+ */
+
+#if defined(CONFIG_CFG80211_WEXT_COMPAT) || defined(CONFIG_WIRELESS_EXT)
+int wext_ioctl(unsigned int cmd, struct ifreq *ifreq, void __user *arg);
+int wireless_proc_init(void);
+#else
+static inline
+int wext_ioctl(unsigned int cmd, struct ifreq *ifreq, void __user *arg)
+{
+	return -EINVAL;
+}
+static inline int wireless_proc_init(void)
+{
+	return 0;
+}
+#endif
+
+#endif /* __NET_WIRELESS_H */
--- /dev/null	2007-03-09 11:47:32.684268720 -0500
+++ linux-2.6.20.noarch/include/net/mac80211.h	2007-04-05 17:31:39.000000000 -0400
@@ -0,0 +1,1074 @@
+/*
+ * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface
+ * Copyright 2002-2005, Devicescape Software, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef MAC80211_H
+#define MAC80211_H
+
+#include <linux/kernel.h>
+#include <linux/if_ether.h>
+#include <linux/skbuff.h>
+#include <linux/wireless.h>
+#include <linux/device.h>
+#include <linux/ieee80211.h>
+#include <net/wireless.h>
+#include <net/cfg80211.h>
+
+/* Note! Only ieee80211_tx_status_irqsafe() and ieee80211_rx_irqsafe() can be
+ * called in hardware interrupt context. The low-level driver must not call any
+ * other functions in hardware interrupt context. If there is a need for such
+ * call, the low-level driver should first ACK the interrupt and perform the
+ * IEEE 802.11 code call after this, e.g., from a scheduled tasklet (in
+ * software interrupt context).
+ */
+
+/*
+ * Frame format used when passing frame between low-level hardware drivers
+ * and IEEE 802.11 driver the same as used in the wireless media, i.e.,
+ * buffers start with IEEE 802.11 header and include the same octets that
[...88476 lines suppressed...]
+			break;
+
+		buf = kmalloc(100, GFP_ATOMIC);
+		if (!buf)
+			break;
+
+		memset(&iwe, 0, sizeof(iwe));
+		iwe.cmd = IWEVCUSTOM;
+		sprintf(buf, "bcn_int=%d", bss->beacon_int);
+		iwe.u.data.length = strlen(buf);
+		current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+						  buf);
+
+		memset(&iwe, 0, sizeof(iwe));
+		iwe.cmd = IWEVCUSTOM;
+		sprintf(buf, "rssi=%d", bss->rssi);
+		iwe.u.data.length = strlen(buf);
+		current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+						  buf);
+
+		memset(&iwe, 0, sizeof(iwe));
+		iwe.cmd = IWEVCUSTOM;
+		sprintf(buf, "capab=0x%04x", bss->capability);
+		iwe.u.data.length = strlen(buf);
+		current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+						  buf);
+
+		/* dispaly all support rates in readable format */
+		p = current_ev + IW_EV_LCP_LEN;
+		iwe.cmd = SIOCGIWRATE;
+		/* Those two flags are ignored... */
+		iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;
+
+		for (i = 0; i < bss->supp_rates_len; i++) {
+			iwe.u.bitrate.value = ((bss->supp_rates[i] &
+							0x7f) * 500000);
+			p = iwe_stream_add_value(current_ev, p,
+					end_buf, &iwe, IW_EV_PARAM_LEN);
+		}
+		/* Check if we added any rate */
+		if((p - current_ev) > IW_EV_LCP_LEN)
+			current_ev = p;
+
+		kfree(buf);
+		break;
+	} while (0);
+
+	return current_ev;
+}
+
+
+int ieee80211_sta_scan_results(struct net_device *dev, char *buf, size_t len)
+{
+	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+	char *current_ev = buf;
+	char *end_buf = buf + len;
+	struct ieee80211_sta_bss *bss;
+
+	spin_lock_bh(&local->sta_bss_lock);
+	list_for_each_entry(bss, &local->sta_bss_list, list) {
+		if (buf + len - current_ev <= IW_EV_ADDR_LEN) {
+			spin_unlock_bh(&local->sta_bss_lock);
+			return -E2BIG;
+		}
+		current_ev = ieee80211_sta_scan_result(dev, bss, current_ev,
+						       end_buf);
+	}
+	spin_unlock_bh(&local->sta_bss_lock);
+	return current_ev - buf;
+}
+
+
+int ieee80211_sta_set_extra_ie(struct net_device *dev, char *ie, size_t len)
+{
+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+	struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+	kfree(ifsta->extra_ie);
+	if (len == 0) {
+		ifsta->extra_ie = NULL;
+		ifsta->extra_ie_len = 0;
+		return 0;
+	}
+	ifsta->extra_ie = kmalloc(len, GFP_KERNEL);
+	if (!ifsta->extra_ie) {
+		ifsta->extra_ie_len = 0;
+		return -ENOMEM;
+	}
+	memcpy(ifsta->extra_ie, ie, len);
+	ifsta->extra_ie_len = len;
+	return 0;
+}
+
+
+struct sta_info * ieee80211_ibss_add_sta(struct net_device *dev,
+					 struct sk_buff *skb, u8 *bssid,
+					 u8 *addr)
+{
+	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+	struct sta_info *sta;
+	struct ieee80211_sub_if_data *sdata = NULL;
+	struct net_device *sta_dev = NULL;
+
+	/* TODO: Could consider removing the least recently used entry and
+	 * allow new one to be added. */
+	if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) {
+		if (net_ratelimit()) {
+			printk(KERN_DEBUG "%s: No room for a new IBSS STA "
+			       "entry " MAC_FMT "\n", dev->name, MAC_ARG(addr));
+		}
+		return NULL;
+	}
+
+	spin_lock_bh(&local->sub_if_lock);
+	list_for_each_entry(sdata, &local->sub_if_list, list)
+		if (sdata->type == IEEE80211_IF_TYPE_IBSS &&
+		    memcmp(bssid, sdata->u.sta.bssid, ETH_ALEN) == 0) {
+			sta_dev = sdata->dev;
+			break;
+		}
+	spin_unlock_bh(&local->sub_if_lock);
+
+	if (!sta_dev)
+		return NULL;
+
+	printk(KERN_DEBUG "%s: Adding new IBSS station " MAC_FMT " (dev=%s)\n",
+	       dev->name, MAC_ARG(addr), sta_dev->name);
+
+	sta = sta_info_add(local, dev, addr, GFP_ATOMIC);
+	if (!sta)
+		return NULL;
+
+	sta->dev = sta_dev;
+	sta->supp_rates = sdata->u.sta.supp_rates_bits;
+
+	rate_control_rate_init(sta, local);
+
+	return sta; /* caller will call sta_info_put() */
+}
+
+
+int ieee80211_sta_deauthenticate(struct net_device *dev, u16 reason)
+{
+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+	struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+
+	printk(KERN_DEBUG "%s: deauthenticate(reason=%d)\n",
+	       dev->name, reason);
+
+	if (sdata->type != IEEE80211_IF_TYPE_STA &&
+	    sdata->type != IEEE80211_IF_TYPE_IBSS)
+		return -EINVAL;
+
+	ieee80211_send_deauth(dev, ifsta, reason);
+	ieee80211_set_disassoc(dev, ifsta, 1);
+	return 0;
+}
+
+
+int ieee80211_sta_disassociate(struct net_device *dev, u16 reason)
+{
+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+	struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+
+	printk(KERN_DEBUG "%s: disassociate(reason=%d)\n",
+	       dev->name, reason);
+
+	if (sdata->type != IEEE80211_IF_TYPE_STA)
+		return -EINVAL;
+
+	if (!ifsta->associated)
+		return -1;
+
+	ieee80211_send_disassoc(dev, ifsta, reason);
+	ieee80211_set_disassoc(dev, ifsta, 0);
+	return 0;
+}
--- /dev/null	2007-03-09 11:47:32.684268720 -0500
+++ linux-2.6.20.noarch/net/mac80211/ieee80211_cfg.h	2007-04-05 17:31:43.000000000 -0400
@@ -0,0 +1,9 @@
+/*
+ * mac80211 configuration hooks for cfg80211
+ */
+#ifndef __IEEE80211_CFG_H
+#define __IEEE80211_CFG_H
+
+extern struct cfg80211_ops mac80211_config_ops;
+
+#endif /* __IEEE80211_CFG_H */
--- linux-2.6.20.noarch/net/ieee80211/Kconfig.orig	2007-04-05 17:30:32.000000000 -0400
+++ linux-2.6.20.noarch/net/ieee80211/Kconfig	2007-04-05 17:31:43.000000000 -0400
@@ -56,7 +56,8 @@ config IEEE80211_CRYPT_CCMP
 
 config IEEE80211_CRYPT_TKIP
 	tristate "IEEE 802.11i TKIP encryption"
-	depends on IEEE80211 && NET_RADIO
+	depends on IEEE80211
+	select WIRELESS_EXT
 	select CRYPTO
 	select CRYPTO_MICHAEL_MIC
 	select CRYPTO_ECB

jwltest-mac80211-wpa-fix.patch:
 ieee80211_ioctl.c |    5 ++++-
 ieee80211_sta.c   |   40 ++++++++++------------------------------
 2 files changed, 14 insertions(+), 31 deletions(-)

--- NEW FILE jwltest-mac80211-wpa-fix.patch ---
--- linux-2.6.20.noarch/net/mac80211/ieee80211_ioctl.c.orig	2007-04-05 16:55:15.000000000 -0400
+++ linux-2.6.20.noarch/net/mac80211/ieee80211_ioctl.c	2007-04-05 17:09:38.000000000 -0400
@@ -1585,7 +1585,7 @@ static int ieee80211_ioctl_giwrange(stru
 	memset(range, 0, sizeof(struct iw_range));
 
 	range->we_version_compiled = WIRELESS_EXT;
-	range->we_version_source = 14;
+	range->we_version_source = 21;
 	range->retry_capa = IW_RETRY_LIMIT;
 	range->retry_flags = IW_RETRY_LIMIT;
 	range->min_retry = 0;
@@ -1605,6 +1605,9 @@ static int ieee80211_ioctl_giwrange(stru
 	range->avg_qual.noise = 0;
 	range->avg_qual.updated = local->wstats_flags;
 
+	range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 |
+			  IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP;
+
 	return 0;
 }
 
--- linux-2.6.20.noarch/net/mac80211/ieee80211_sta.c.orig	2007-04-05 16:55:16.000000000 -0400
+++ linux-2.6.20.noarch/net/mac80211/ieee80211_sta.c	2007-04-05 17:09:17.000000000 -0400
@@ -2781,39 +2781,19 @@ ieee80211_sta_scan_result(struct net_dev
 	current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, "");
 
 	if (bss && bss->wpa_ie) {
-		char *buf, *p;
-		int i;
-		buf = kmalloc(30 + bss->wpa_ie_len * 2, GFP_ATOMIC);
-		if (buf) {
-			p = buf;
-			p += sprintf(p, "wpa_ie=");
-			for (i = 0; i < bss->wpa_ie_len; i++)
-				p+= sprintf(p, "%02x", bss->wpa_ie[i]);
-			memset(&iwe, 0, sizeof(iwe));
-			iwe.cmd = IWEVCUSTOM;
-			iwe.u.data.length = strlen(buf);
-			current_ev = iwe_stream_add_point(current_ev, end_buf,
-							  &iwe, buf);
-			kfree(buf);
-		}
+		memset(&iwe, 0, sizeof(iwe));
+		iwe.cmd = IWEVGENIE;
+		iwe.u.data.length = bss->wpa_ie_len;
+		current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+						  bss->wpa_ie);
 	}
 
 	if (bss && bss->rsn_ie) {
-		char *buf, *p;
-		int i;
-		buf = kmalloc(30 + bss->rsn_ie_len * 2, GFP_ATOMIC);
-		if (buf) {
-			p = buf;
-			p += sprintf(p, "rsn_ie=");
-			for (i = 0; i < bss->rsn_ie_len; i++)
-				p+= sprintf(p, "%02x", bss->rsn_ie[i]);
-			memset(&iwe, 0, sizeof(iwe));
-			iwe.cmd = IWEVCUSTOM;
-			iwe.u.data.length = strlen(buf);
-			current_ev = iwe_stream_add_point(current_ev, end_buf,
-							  &iwe, buf);
-			kfree(buf);
-		}
+		memset(&iwe, 0, sizeof(iwe));
+		iwe.cmd = IWEVGENIE;
+		iwe.u.data.length = bss->rsn_ie_len;
+		current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+						  bss->rsn_ie);
 	}
 
 	if (bss) {


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3048
retrieving revision 1.3048.2.1
diff -u -r1.3048 -r1.3048.2.1
--- kernel-2.6.spec	5 Apr 2007 20:02:09 -0000	1.3048
+++ kernel-2.6.spec	5 Apr 2007 21:34:25 -0000	1.3048.2.1
@@ -60,7 +60,7 @@
 %define sublevel 20
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}%{?buildid}
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}%{?buildid}.jwltest.7
 
 %define make_target bzImage
 %define kernel_image x86
@@ -377,7 +377,8 @@
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
 Patch11: nouveau-drm.patch
-Patch12: git-wireless-dev.patch
+#Patch12: git-wireless-dev.patch
+Patch12: jwltest-git-wireless-dev.patch
 Patch13: git-iwlwifi.patch
 Patch14: git-iwlwifi-fixes.patch
 Patch15: linux-2.6-rt2x00-scan-fix.patch
@@ -390,6 +391,9 @@
 # enable sysrq-c on all kernels, not only kexec
 Patch20: linux-2.6-sysrq-c.patch
 
+Patch30: jwltest-bcm43xx_mac80211-phy-rev-1.patch
+Patch31: jwltest-mac80211-wpa-fix.patch
+
 # Patches 100 through 500 are meant for architecture patches
 
 # 200 - 299   x86(-64)
@@ -987,6 +991,11 @@
 # sysrq works always
 %patch20 -p1
 
+# Try reverting some spec-related changes to fix bcm43xx w/ phy rev 1 for PPC
+%patch30 -p1
+# Fix mac80211 for WPA
+%patch31 -p1
+
 # Architecture patches
 
 #



From fedora-cvs-commits at redhat.com  Thu Apr  5 21:43:17 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 17:43:17 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.3048,
	1.3049 linux-2.6-NFSD-ctlbits.patch, 1.4,
	NONE linux-2.6-defaults-disable-split-ptlock.patch, 1.3,
	NONE linux-2.6-mm-prevent-oom-fixes.patch, 1.2,
	NONE linux-2.6-sata-ahci-suspend.patch, 1.4, NONE
Message-ID: <200704052143.l35LhHTI028742@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-NFSD-ctlbits.patch 
	linux-2.6-defaults-disable-split-ptlock.patch 
	linux-2.6-mm-prevent-oom-fixes.patch 
	linux-2.6-sata-ahci-suspend.patch 
Log Message:
Bring out your dead.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3048
retrieving revision 1.3049
diff -u -r1.3048 -r1.3049
--- kernel-2.6.spec	5 Apr 2007 20:02:09 -0000	1.3048
+++ kernel-2.6.spec	5 Apr 2007 21:43:12 -0000	1.3049
@@ -510,7 +510,6 @@
 Patch1106: linux-2.6-scsi-cpqarray-set-master.patch
 
 # NFS bits.
-Patch1200: linux-2.6-NFSD-ctlbits.patch
 Patch1201: linux-2.6-NFSD-badness.patch
 
 # NIC driver fixes
@@ -548,18 +547,15 @@
 
 # VM bits.
 Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch
-Patch2005: linux-2.6-mm-prevent-oom-fixes.patch
 
 # Tweak some defaults.
 Patch2100: linux-2.6-defaults-fat-utf8.patch
 Patch2103: linux-2.6-defaults-unicode-vt.patch
-Patch2104: linux-2.6-defaults-disable-split-ptlock.patch
 Patch2105: linux-2.6-defaults-nonmi.patch
 Patch2106: linux-2.6-defaults-pci_no_msi_mmconf.patch
 
 # SATA Bits
 Patch2200: linux-2.6-sata-promise-pata-ports.patch
-Patch2201: linux-2.6-sata-ahci-suspend.patch
 Patch2204: linux-2.6-ata-quirk.patch
 
 # ACPI bits
@@ -1178,8 +1174,6 @@
 #
 # Various NFS/NFSD fixes.
 #
-# kNFSD: fixed '-p port' arg to rpc.nfsd and enables the defining proto versions and transports
-#%patch1200 -p1
 # Fix badness.
 %patch1201 -p1
 
@@ -1241,16 +1235,12 @@
 #
 # Silence GFP_ATOMIC failures.
 %patch2001 -p1
-# OOM killer enhancements.
-#%patch2005 -p1
 
 # Changes to upstream defaults.
 # Use UTF-8 by default on VFAT.
 %patch2100 -p1
 # Use unicode VT's by default.
 %patch2103 -p1
-# Disable split page table lock
-#%patch2104 -p1
 # Disable NMI watchdog by default.
 %patch2105 -p1
 # Disable MMCONFIG & MSI by default.
@@ -1258,8 +1248,6 @@
 
 # Enable PATA ports on Promise SATA.
 #%patch2200 -p1
-# Fix AHCI Suspend.
-#%patch2201 -p1
 # libata: don't initialize sg in ata_exec_internal() if DMA_NONE
 # ia64 ata quirk
 %patch2204 -p1
@@ -2252,6 +2240,9 @@
 
 %changelog
 * Thu Apr 05 2007 Dave Jones <davej at redhat.com>
+- Remove a bunch of dead patches.
+
+* Thu Apr 05 2007 Dave Jones <davej at redhat.com>
 - Enable CONFIG_SECURITY_NETWORK_XFRM
 
 * Thu Apr 05 2007 David Woodhouse <dwmw2 at redhat.com>


--- linux-2.6-NFSD-ctlbits.patch DELETED ---


--- linux-2.6-defaults-disable-split-ptlock.patch DELETED ---


--- linux-2.6-mm-prevent-oom-fixes.patch DELETED ---


--- linux-2.6-sata-ahci-suspend.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr  5 21:46:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 17:46:45 -0400
Subject: rpms/freetype/devel .cvsignore, 1.15, 1.16 freetype.spec, 1.50,
	1.51 sources, 1.15, 1.16
Message-ID: <200704052146.l35LkjNA002645@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/freetype/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2631

Modified Files:
	.cvsignore freetype.spec sources 
Log Message:
* Thu Apr 05 2007 Behdad Esfahbod <besfahbo at redhat.com> 2.3.3-1
- Update to 2.3.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	9 Mar 2007 21:35:33 -0000	1.15
+++ .cvsignore	5 Apr 2007 21:46:40 -0000	1.16
@@ -1,3 +1,3 @@
-freetype-2.3.2.tar.bz2
-freetype-doc-2.3.2.tar.bz2
-ft2demos-2.3.2.tar.bz2
+freetype-2.3.3.tar.bz2
+freetype-doc-2.3.3.tar.bz2
+ft2demos-2.3.3.tar.bz2


Index: freetype.spec
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- freetype.spec	9 Mar 2007 21:35:33 -0000	1.50
+++ freetype.spec	5 Apr 2007 21:46:40 -0000	1.51
@@ -7,7 +7,7 @@
 
 Summary: A free and portable font rendering engine
 Name: freetype
-Version: 2.3.2
+Version: 2.3.3
 Release: 1%{?dist}
 License: BSD/GPL dual license
 Group: System Environment/Libraries
@@ -203,6 +203,9 @@
 %{_libdir}/pkgconfig/
 
 %changelog
+* Thu Apr 05 2007 Behdad Esfahbod <besfahbo at redhat.com> 2.3.3-1
+- Update to 2.3.3.
+
 * Fri Mar 09 2007 Behdad Esfahbod <besfahbo at redhat.com> 2.3.2-1
 - Update to 2.3.2.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	9 Mar 2007 21:35:33 -0000	1.15
+++ sources	5 Apr 2007 21:46:40 -0000	1.16
@@ -1,3 +1,3 @@
-119e1fe126fcfa5a70bc56db55f573d5  freetype-2.3.2.tar.bz2
-d732b9b5971d019fab9c695dfa496247  freetype-doc-2.3.2.tar.bz2
-5813409ad4015424e822396e0c3f43cd  ft2demos-2.3.2.tar.bz2
+c0367b4059f672789b7a41e65f7a4b4a  freetype-2.3.3.tar.bz2
+3f0df79c7504aee5a2f5803afd510efd  freetype-doc-2.3.3.tar.bz2
+408bbefef6bea2bd8ce8c48ef8ae2a18  ft2demos-2.3.3.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr  5 21:54:44 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 17:54:44 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1155,1.1156
Message-ID: <200704052154.l35Lsi57032047@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
force links


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1155
retrieving revision 1.1156
diff -u -r1.1155 -r1.1156
--- openoffice.org.spec	5 Apr 2007 14:32:28 -0000	1.1155
+++ openoffice.org.spec	5 Apr 2007 21:54:41 -0000	1.1156
@@ -1214,11 +1214,11 @@
 pushd $RPM_BUILD_ROOT/%{instdir}/share/autocorr
 en_GB_aliases="en-AU en-BS en-BZ en-CA en-IE en-IN en-JM en-NA en-NZ en-TT en-ZA en-ZW"
 for lang in $en_GB_aliases; do
-        ln -s acor_en-GB.dat acor_$lang.dat
+        ln -sf acor_en-GB.dat acor_$lang.dat
 done
 en_US_aliases="en-PH"
 for lang in $en_US_aliases; do
-        ln -s acor_en-US.dat acor_$lang.dat
+        ln -sf acor_en-US.dat acor_$lang.dat
 done
 popd
 



From fedora-cvs-commits at redhat.com  Thu Apr  5 22:17:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 18:17:49 -0400
Subject: rpms/libunwind/devel frysk-patch-update, NONE,
	1.1 libunwind-snap-070224-frysk20070405cvs.patch, NONE,
	1.1 .cvsignore, 1.6, 1.7 libunwind.spec, 1.20, 1.21 sources,
	1.6, 1.7 libunwind-0.98.5-stack-nonexec.patch, 1.1, NONE
Message-ID: <200704052217.l35MHnVm032751@cvs.devel.redhat.com>

Author: jkratoch

Update of /cvs/dist/rpms/libunwind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32729

Modified Files:
	.cvsignore libunwind.spec sources 
Added Files:
	frysk-patch-update 
	libunwind-snap-070224-frysk20070405cvs.patch 
Removed Files:
	libunwind-0.98.5-stack-nonexec.patch 
Log Message:
* Thu Apr  5 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 0.99-0.1.frysk20070405cvs
- Update to the upstream snapshot snap-070224.
- Use the Frysk's modified version, currently snapshot 20070405cvs.
- Extend the supported architectures from ia64 also to x86_64, i386 and ppc64.
- Spec file fixups.
- Split the package to its base and the `devel' part.
- Drop the statically built libraries.



***** Error reading new file: [Errno 2] No such file or directory: 'frysk-patch-update'
libunwind-snap-070224-frysk20070405cvs.patch:
 .cvsignore                         |    5 
 ChangeLog                          |  499 
 Makefile.in                        |  732 -
 README.frysk                       |    2 
 acinclude.m4                       |   32 
 aclocal.m4                         | 6857 -----------
 config/compile                     |  136 
 config/config.guess                | 1432 --
 config/config.sub                  | 1537 --
 config/depcomp                     |  411 
 config/install-sh                  |  251 
 config/ltmain.sh                   | 6424 ----------
 config/missing                     |  282 
 config/mkinstalldirs               |   40 
 configure                          |22562 -------------------------------------
 configure.in                       |    7 
 doc/.cvsignore                     |    1 
 doc/Makefile.in                    |  468 
 doc/unw_create_addr_space.man      |   13 
 doc/unw_create_addr_space.tex      |    6 
 doc/unw_get_proc_name.man          |   13 
 doc/unw_get_proc_name.tex          |    6 
 include/.cvsignore                 |    1 
 include/config.h.in                |  121 
 include/dwarf.h                    |    2 
 include/libunwind-ppc64.h          |  191 
 include/libunwind.h                |  176 
 include/tdep-hppa/libunwind_i.h    |    8 
 include/tdep-ia64/libunwind_i.h    |    7 
 include/tdep-ppc64/README          |    3 
 include/tdep-ppc64/dwarf-config.h  |   54 
 include/tdep-ppc64/jmpbuf.h        |   35 
 include/tdep-ppc64/libunwind_i.h   |  204 
 include/tdep-x86/libunwind_i.h     |    9 
 include/tdep-x86_64/libunwind_i.h  |    9 
 src/.cvsignore                     |    1 
 src/Makefile.am                    |   82 
 src/Makefile.in                    | 2159 ---
 src/dwarf/Gfde.c                   |    2 
 src/dwarf/Gparser.c                |   51 
 src/elfxx.c                        |   67 
 src/elfxx.h                        |    5 
 src/hppa/Gget_proc_info.c          |    7 
 src/hppa/Ginit.c                   |    2 
 src/hppa/getcontext.S              |    4 
 src/hppa/init.h                    |    9 
 src/hppa/setcontext.S              |    4 
 src/hppa/siglongjmp.S              |    4 
 src/ia64/Ginit.c                   |    2 
 src/ia64/Ginstall_cursor.S         |    4 
 src/ia64/Linstall_cursor.S         |    4 
 src/ia64/dyn_info_list.S           |    4 
 src/ia64/getcontext.S              |    4 
 src/ia64/longjmp.S                 |    4 
 src/ia64/setjmp.S                  |    4 
 src/ia64/siglongjmp.S              |    4 
 src/ia64/sigsetjmp.S               |    4 
 src/mi/Gget_proc_name.c            |   22 
 src/mi/init.c                      |    2 
 src/os-hpux.c                      |    6 
 src/os-linux.c                     |   72 
 src/os-linux.h                     |    6 
 src/ppc64/Gcreate_addr_space.c     |   56 
 src/ppc64/Gget_proc_info.c         |   37 
 src/ppc64/Gget_save_loc.c          |   37 
 src/ppc64/Gglobal.c                |  100 
 src/ppc64/Ginit.c                  |  151 
 src/ppc64/Ginit_local.c            |   59 
 src/ppc64/Ginit_remote.c           |   50 
 src/ppc64/Gis_signal_frame.c       |   37 
 src/ppc64/Gregs.c                  |   46 
 src/ppc64/Gresume.c                |   79 
 src/ppc64/Gstep.c                  |   39 
 src/ppc64/Lcreate_addr_space.c     |    5 
 src/ppc64/Lget_proc_info.c         |    5 
 src/ppc64/Lget_save_loc.c          |    5 
 src/ppc64/Lglobal.c                |    5 
 src/ppc64/Linit.c                  |    5 
 src/ppc64/Linit_local.c            |    5 
 src/ppc64/Linit_remote.c           |    5 
 src/ppc64/Lis_signal_frame.c       |    5 
 src/ppc64/Lregs.c                  |    5 
 src/ppc64/Lresume.c                |    5 
 src/ppc64/Lstep.c                  |    5 
 src/ppc64/Make-arch.in             |   11 
 src/ppc64/README                   |    5 
 src/ppc64/init.h                   |   92 
 src/ppc64/is_fpreg.c               |   36 
 src/ppc64/longjmp.S                |   38 
 src/ppc64/regname.c                |  117 
 src/ppc64/siglongjmp.S             |   39 
 src/ppc64/ucontext_i.h             |   60 
 src/ppc64/unwind_i.h               |  130 
 src/ptrace/_UPT_find_proc_info.c   |    4 
 src/ptrace/_UPT_get_proc_name.c    |    4 
 src/ptrace/_UPT_reg_offset.c       |    1 
 src/x86/Gfetch_proc_info_post.c    |   51 
 src/x86/Gget_proc_info.c           |    7 
 src/x86/Ginit.c                    |    2 
 src/x86/Gstep.c                    |  106 
 src/x86/Lfetch_proc_info_post.c    |    5 
 src/x86/init.h                     |    1 
 src/x86/longjmp.S                  |    4 
 src/x86/offsets.h                  |    2 
 src/x86/siglongjmp.S               |    4 
 src/x86_64/Gfetch_proc_info_post.c |   51 
 src/x86_64/Gget_proc_info.c        |    7 
 src/x86_64/Ginit.c                 |    2 
 src/x86_64/Gstep.c                 |  113 
 src/x86_64/Lfetch_proc_info_post.c |    5 
 src/x86_64/init.h                  |    1 
 src/x86_64/longjmp.S               |    4 
 src/x86_64/setcontext.S            |    4 
 src/x86_64/siglongjmp.S            |    4 
 src/x86_64/ucontext_i.h            |   12 
 tests/.cvsignore                   |    1 
 tests/Gtest-dyn1.c                 |   23 
 tests/Gtest-resume-sig.c           |   48 
 tests/Makefile.am                  |   16 
 tests/Makefile.in                  | 1031 -
 tests/check-namespace.sh.in        |    9 
 tests/flush-cache.S                |    8 
 tests/ia64-test-setjmp.c           |    7 
 tests/mapper.c                     |    2 
 tests/run-ptrace-signull           |   14 
 tests/run-ptrace-stepper           |   34 
 tests/test-async-sig.c             |   16 
 tests/test-ptrace-signull.c        |  116 
 tests/test-ptrace-stepper.c        |  111 
 tests/test-ptrace.c                |  128 
 130 files changed, 3540 insertions(+), 44767 deletions(-)

--- NEW FILE libunwind-snap-070224-frysk20070405cvs.patch ---
Index: libunwind/.cvsignore
diff -u /dev/null libunwind/.cvsignore:1.5
--- /dev/null	Thu Apr  5 22:44:07 2007
+++ libunwind/.cvsignore	Wed Apr  4 15:48:52 2007
@@ -0,0 +1,5 @@
+autom4te.cache
+configure
+aclocal.m4
+Makefile.in
+config
Index: libunwind/ChangeLog
diff -u libunwind/ChangeLog:1.1.1.1 libunwind/ChangeLog:1.49
--- libunwind/ChangeLog:1.1.1.1	Mon Mar 12 15:32:21 2007
+++ libunwind/ChangeLog	Thu Apr  5 19:31:57 2007
@@ -1,3 +1,502 @@
+2007-04-05  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	* src/hppa/getcontext.S, src/hppa/setcontext.S, src/hppa/siglongjmp.S,
+	src/ia64/Ginstall_cursor.S, src/ia64/Linstall_cursor.S,
+	src/ia64/dyn_info_list.S, src/ia64/getcontext.S, src/ia64/longjmp.S,
+	src/ia64/setjmp.S, src/ia64/siglongjmp.S, src/ia64/sigsetjmp.S,
+	src/ppc64/longjmp.S, src/ppc64/siglongjmp.S, src/x86/longjmp.S,
+	src/x86/siglongjmp.S, src/x86_64/longjmp.S, src/x86_64/setcontext.S,
+	src/x86_64/siglongjmp.S: Stack should be non-executable, for SELinux.
+
+	* tests/test-ptrace.c (target_pid_kill): New function.
+	(target_pid, main): TARGET_PID made static, for target_pid_kill ().
+	(main): Register target_pid_kill () for atexit(3).
+
+	* tests/ia64-test-setjmp.c (doit): New forward declaration.
+	(doit_pointer): New function pointer variable initialized to DOIT.
+	(doit): Self-call made by an unoptimizable volatile indirect call.
+
+	* src/Makefile.am (LIBRARIES_cdep, lib_LTLIBRARIES_cdep_setjmp):
+	Removed, moved into ...
+	(lib_LTLIBRARIES_cdep) ... here to fix libtool --disable-static.
+	(libunwind_ptrace_a_SOURCES): Renamed to ...
+	(libunwind_ptrace_la_SOURCES) ... here to fix libtool --disable-static.
+	(install-exec-hook): Fixed for conditional compilations.
+	(lib_LIBRARIES): Removed.
+	(lib_LTLIBRARIES): Updated for removed `lib_LTLIBRARIES_cdep_setjmp'.
+	(EXTRA_DIST): Updated for new renamed `libunwind_ptrace_la_SOURCES'.
+        * tests/Makefile.am (test_ptrace_LDADD): Updated for libtool.
+
+2007-04-04  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	* acinclude.m4, config/compile, config/config.guess, config/config.sub,
+	config/depcomp, config/install-sh, config/ltmain.sh, config/missing,
+	config/mkinstalldirs: Removed the autotools generated files.
+	* .cvsignore: `config' is no longer a repository stored directory.
+
+	* include/libunwind-ppc64.h (UNW_TDEP_CURSOR_LEN): Fixed for assert()s.
+	* include/tdep-ppc64/libunwind_i.h (mempool.h): Version update even for
+	the ppc64 architecture.
+	* src/Makefile.am (ppc64): Version forward-ported the ppc64 port.
+	* src/ppc64/Ginit.c (ppc64_local_addr_space_init): Removed VALIDATE
+	initialization as it is no longer a cross-architecture field.
+	* src/ppc64/Lcreate_addr_space.c, src/ppc64/Lget_proc_info.c,
+	src/ppc64/Lget_save_loc.c, src/ppc64/Lglobal.c, src/ppc64/Linit.c,
+	src/ppc64/Linit_local.c, src/ppc64/Linit_remote.c,
+	src/ppc64/Lis_signal_frame.c, src/ppc64/Lregs.c, src/ppc64/Lresume.c,
+	src/ppc64/Lstep.c: New files.
+	* src/ppc64/setcontext.S: Removed file as it had invalid unused content.
+	* src/ppc64/siglongjmp.S (_UI_siglongjmp_cont): New stub function.
+	* tests/flush-cache.S (flush_cache): New stub function for ppc64.
+	* tests/test-ptrace-stepper.c (lockup): New ppc64 and crossplatform
+	implementations.
+
+	* tests/Gtest-dyn1.c, tests/Gtest-resume-sig.c, tests/test-async-sig.c,
+	tests/test-ptrace.c: Fixed lockups on broken libunwind (as ppc64 is).
+
+2007-03-31  Andrew Cagney  <cagney at redhat.com>
+
+	* configure.in (AM_MAINTAINER_MODE): Delete.
+	(get_arch): Map powerpc64 onto ppc64.
+	(pkg_extra): Append -frysk.
+	(pkg_maintainer): Change to frysk at sourceware.org.
+	
+2007-03-20  Nurdin Premji  <npremji at redhat.com>
+
+	* tests/mapper.c: Change alarm timeout to 80.
+
+2007-03-19  Nurdin Premji  <npremji at redhat.com>
+
+	* tests/Makefile.am: Added test_ptrace_stepper, and test_ptrace_signull
+	to list of tests to run.
+	(XFAIL): Added test_ptrace_signull.
+	* .cvsignore: Added Makefile.in.
+	* doc/.cvsignore: Ditto.
+	* src/.cvsignore: Ditto.
+	* tests/.cvsignore: Ditto.
+
+2007-03-07  Jan Kratochvil  <jan.kratochvil at redhat.com>
+
+	* include/tdep-hppa/libunwind_i.h, include/tdep-ppc64/libunwind_i.h,
+	include/tdep-x86/libunwind_i.h, include/tdep-x86_64/libunwind_i.h
+	(tdep_fetch_proc_info_post): Fixed its UNW_OBJ()-duality.
+	* src/Makefile.am (libunwind_la_SOURCES_x86_common)
+	(libunwind_la_SOURCES_x86, libunwind_x86_la_SOURCES_x86): Fixed
+	x86/Gfetch_proc_info_post.c and x86/Lfetch_proc_info_post.c duality.
+	(libunwind_la_SOURCES_x86_64_common, libunwind_la_SOURCES_x86_64)
+	(libunwind_x86_64_la_SOURCES_x86_64): Fixed
+	x86_64/Gfetch_proc_info_post.c and x86_64/Lfetch_proc_info_post.c
+	duality.
+	* src/x86/Lfetch_proc_info_post.c, src/x86_64/Lfetch_proc_info_post.c:
+	New files.
+
+2007-03-14  Nurdin Premji  <npremji at redhat.com>
+
+	* tests/check-namespace.sh.in: Reverted so lib search to libunwind version.
+
+	* Makefile.am: Added.
+	* configure.in: Added.
+	* config/ltmain.sh: Added.
+	* doc/Makefile.am: Added.
+	* src/Makefile.am: Added.
+	* tests/Makefile.am: Added.
+	* src/dwarf/Lexpr.c: Added.
+	* src/dwarf/Lfde.c: Added
+	* src/dwarf/Lfind_proc_info-lsb.c: Added
+	* src/dwarf/Lparser.c: Added
+	* src/dwarf/Lpe.c: Added
+	* src/dwarf/Lstep.c: Added
+	* src/hppa/Lcreate_addr_space.c: Added
+	* src/hppa/Lget_proc_info.c: Added
+	* src/hppa/Lget_save_loc.c: Added
+	* src/hppa/Lglobal.c: Added
+	* src/hppa/Linit.c: Added
+	* src/hppa/Linit_local.c: Added
+	* src/hppa/Linit_remote.c: Added
+	* src/hppa/Lis_signal_frame.c: Added
+	* src/hppa/Lregs.c: Added
+	* src/hppa/Lresume.c: Added
+	* src/hppa/Lstep.c: Added
+	* src/ia64/Lcreate_addr_space.c: Added
+	* src/ia64/Lget_proc_info.c: Added
+	* src/ia64/Lget_save_loc.c: Added
+	* src/ia64/Lglobal.c: Added
+	* src/ia64/Linit.c: Added
+	* src/ia64/Linit_local.c: Added
+	* src/ia64/Linit_remote.c: Added
+	* src/ia64/Linstall_cursor.S: Added
+	* src/ia64/Lis_signal_frame.c: Added
+	* src/ia64/Lparser.c: Added
+	* src/ia64/Lrbs.c: Added
+	* src/ia64/Lregs.c: Added
+	* src/ia64/Lresume.c: Added
+	* src/ia64/Lscript.c: Added
+	* src/ia64/Lstep.c: Added
+	* src/ia64/Ltables.c: Added
+	* src/mi/Ldestroy_addr_space.c: Added
+	* src/mi/Ldyn-extract.c: Added
+	* src/mi/Lfind_dynamic_proc_info.c: Added
+	* src/mi/Lget_accessors.c: Added
+	* src/mi/Lget_fpreg.c: Added
+	* src/mi/Lget_proc_info_by_ip.c: Added
+	* src/mi/Lget_proc_name.c: Added
+	* src/mi/Lget_reg.c: Added
+	* src/mi/Lput_dynamic_unwind_info.c: Added
+	* src/mi/Lset_caching_policy.c: Added
+	* src/mi/Lset_fpreg.c: Added
+	* src/mi/Lset_reg.c: Added
+	* src/x86/Lcreate_addr_space.c: Added
+	* src/x86/Lget_proc_info.c: Added
+	* src/x86/Lget_save_loc.c: Added
+	* src/x86/Lglobal.c: Added
+	* src/x86/Linit.c: Added
+	* src/x86/Linit_local.c: Added
+	* src/x86/Linit_remote.c: Added
+	* src/x86/Lis_signal_frame.c: Added
+	* src/x86/Lregs.c: Added
+	* src/x86/Lresume.c: Added
+	* src/x86/Lstep.c: Added
+	* src/x86_64/Lcreate_addr_space.c: Added
+	* src/x86_64/Lget_proc_info.c: Added
+	* src/x86_64/Lget_save_loc.c: Added
+	* src/x86_64/Lglobal.c: Added
+	* src/x86_64/Linit.c: Added
+	* src/x86_64/Linit_local.c: Added
+	* src/x86_64/Linit_remote.c: Added
+	* src/x86_64/Lis_signal_frame.c: Added
+	* src/x86_64/Lregs.c: Added
+	* src/x86_64/Lresume.c: Added
+	* src/x86_64/Lstep.c: Added
+	* tests/Lia64-test-nat.c: Added
+	* tests/Lia64-test-rbs.c: Added
+	* tests/Lia64-test-readonly.c: Added
+	* tests/Lia64-test-stack.c: Added
+	* tests/Lperf-simple.c: Added
+	* tests/Ltest-bt.c: Added
+	* tests/Ltest-concurrent.c: Added
+	* tests/Ltest-dyn1.c: Added
+	* tests/Ltest-exc.c: Added
+	* tests/Ltest-init.cxx: Added
+	* tests/Ltest-resume-sig.c: Added
+	* Makefile.in: Removed.
+	* doc/Makefile.in: Removed.
+	* src/Makefile.in: Removed.
+	* tests/Makefile.in: Removed.
[...49494 lines suppressed...]
+	      char *s;
+
+	      s = buf2 + strlen (buf2);
+	      if (s < buf2 + sizeof (buf2) - 1)
+	      *s++ = '+';
+	      *s = 0;
+	    }
+        }
+      if (n == 0 && *backtrace_check != NULL)
+        {
+	  if (strcmp (*backtrace_check, buf2) == 0)
+	    backtrace_ptr = backtrace_check;
+	}
+      if (backtrace_ptr != NULL)
+        {
+	  if (*backtrace_ptr == NULL)
+	    panic ("Excessive backtrace on level==%d, got \"%s\"\n",
+	           n, buf);
+	  else
+	    {
+	      if (strcmp (*backtrace_ptr, buf2) != 0)
+		panic ("Backtrace does not match on level==%d, want \"%s\", got \"%s\"\n",
+		       n, *backtrace_ptr, buf);
+	      backtrace_ptr++;
+	    }
+        }
+
       if (verbose)
 	{
 	  if (off)
@@ -99,7 +139,7 @@
 	      len = strlen (buf);
 	      if (len >= sizeof (buf) - 32)
 		len = sizeof (buf) - 32;
-	      sprintf (buf + len, "+0x%lx", off);
+	      sprintf (buf + len, "+0x%lx", (unsigned long) off);
 	    }
 	  printf ("%016lx %-32s (sp=%016lx)\n", (long) ip, buf, (long) sp);
 	}
@@ -139,6 +179,11 @@
 		 (long) start_ip);
 	  break;
 	}
+      if (nerrors > nerrors_max)
+        {
+	  panic ("Too many errors (%d)!\n", nerrors);
+	  break;
+	}
     }
   while (ret > 0);
 
@@ -147,13 +192,26 @@
 
   if (verbose)
     printf ("================\n\n");
+
+  if (backtrace_ptr != NULL)
+    {
+      if (*backtrace_ptr != NULL)
+	panic ("Too short backtrace on level==%d, want \"%s\"\n",
+	       n, *backtrace_ptr);
+      killed = 1;
+    }
+}
+
+static pid_t target_pid;
+static void target_pid_kill (void)
+{
+  kill (target_pid, SIGKILL);
 }
 
 int
 main (int argc, char **argv)
 {
   int status, pid, pending_sig, optind = 1, state = 1;
-  pid_t target_pid;
 
   as = unw_create_addr_space (&_UPT_accessors, 0);
   if (!as)
@@ -166,8 +224,8 @@
       /* automated test case */
       argv = args;
     }
-  else if (argc > 1)
-    while (argv[optind][0] == '-')
+  else
+    while (argv[optind] && argv[optind][0] == '-')
       {
 	if (strcmp (argv[optind], "-v") == 0)
 	  ++optind, verbose = 1;
@@ -185,7 +243,44 @@
 	else if (strcmp (argv[optind], "-n") == 0)
 	  /* Don't look-up and print symbol names.  */
 	  ++optind, print_names = 0;
+	else if (strcmp (argv[optind], "-b") == 0 && argv[optind + 1])
+	  {
+	    /* Check the backtrace if it matches this ','-delimited list
+	       after the first backtrace function is the first of the list.
+	       Omit the trailing numbers after "+" but "+" should be present.  */
+	    char *arg = argv[optind + 1];
+	    char *s;
+	    char **dp;
+
+	    optind += 2;
+	    dp = backtrace_check;
+	    if (*backtrace_check != NULL)
+	      panic ("-b specified twice is unsupported");
+	    else
+	      while (*arg)
+		{
+		  char end_orig;
+
+		  s = strchr (arg, ',');
+		  if (!s)
+		    s = arg + strlen (arg);
+		  end_orig = *s;
+		  *s = 0;
+		  if (dp >= backtrace_check - 1
+			    + (sizeof (backtrace_check) / sizeof (*backtrace_check)))
+		    panic ("Too many arguments to -b\n");
+		  else
+		    *dp++ = arg;
+		  if (end_orig)
+		    arg = s + 1;
+		  else
+		    break;
+		}
+	      *dp = NULL;
+	  }
       }
+  if (*backtrace_check && !print_names)
+    panic ("Options -b and -n conflict\n");
 
   target_pid = fork ();
   if (!target_pid)
@@ -199,10 +294,11 @@
       execve (argv[optind], argv + optind, environ);
       _exit (-1);
     }
+  atexit (target_pid_kill);
 
   ui = _UPT_create (target_pid);
 
-  while (1)
+  while (nerrors <= nerrors_max)
     {
       pid = wait4 (-1, &status,  0, 0);
       if (pid == -1)
@@ -224,12 +320,16 @@
 	    }
 	  else if (WIFSIGNALED (status))
 	    {
-	      panic ("child terminated by signal %d\n", WTERMSIG (status));
+	      if (!killed)
+		panic ("child terminated by signal %d\n", WTERMSIG (status));
 	      break;
 	    }
 	  else
 	    {
 	      pending_sig = WSTOPSIG (status);
+	      /* Avoid deadlock:  */
+	      if (WSTOPSIG (status) == SIGKILL)
+	        break;
 	      if (trace_mode == TRIGGER)
 		{
 		  if (WSTOPSIG (status) == SIGUSR1)
@@ -237,6 +337,17 @@
 		  else if  (WSTOPSIG (status) == SIGUSR2)
 		    state = 1;
 		}
+	      if (WSTOPSIG (status) != SIGUSR1 && WSTOPSIG (status) != SIGUSR2)
+	        {
+		  static int count = 0;
+
+		  if (count++ > 100)
+		    {
+		      panic ("Too many child unexpected signals (now %d)\n",
+			     WSTOPSIG (status));
+			killed = 1;
+		    }
+	        }
 	    }
 	}
 
@@ -264,10 +375,15 @@
 	  ptrace (PTRACE_SINGLESTEP, target_pid, 0, pending_sig);
 	  break;
 	}
+      if (killed)
+        kill (target_pid, SIGKILL);
     }
 
   _UPT_destroy (ui);
 
+  if (*backtrace_check != NULL && !killed)
+    panic ("-b requested but the first function was never found\n");
+
   if (nerrors)
     {
       printf ("FAILURE: detected %d errors\n", nerrors);


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libunwind/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 May 2006 04:05:13 -0000	1.6
+++ .cvsignore	5 Apr 2007 22:17:46 -0000	1.7
@@ -1 +1 @@
-libunwind-0.98.5.tar.gz
+libunwind-snap-070224.tar.gz


Index: libunwind.spec
===================================================================
RCS file: /cvs/dist/rpms/libunwind/devel/libunwind.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libunwind.spec	1 Oct 2006 20:20:01 -0000	1.20
+++ libunwind.spec	5 Apr 2007 22:17:46 -0000	1.21
@@ -1,50 +1,88 @@
 # Define this if you want to skip the strip step and preserve debug info.
 # Useful for testing. 
 #define __spec_install_post /usr/lib/rpm/brp-compress || :
-Summary: An unwinding library for ia64.
+Summary: An unwinding library
 Name: libunwind
 # Latest libunwind release.
-Version: 0.98.5
-Release: 3
+Version: 0.99
+%define frysksnap 20070405cvs
+%define upstreamsnap 070224
+Release: 0.1.frysk%{frysksnap}%{?dist}
 License: BSD
 Group: Development/Debuggers
-Source: ftp://ftp.hpl.hp.com/pub/linux-ia64/libunwind-%{version}.tar.gz
-Patch1: libunwind-0.98.5-stack-nonexec.patch
-Buildroot: %{_tmppath}/%{name}-%{version}-root
-URL: http://www.hpl.hp.com/research/linux/libunwind/index.php4/
-ExclusiveArch: ia64
+Source: http://download.savannah.nongnu.org/releases/libunwind/libunwind-snap-%{upstreamsnap}.tar.gz
+Patch1: libunwind-snap-%{upstreamsnap}-frysk%{frysksnap}.patch
+Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+URL: http://savannah.nongnu.org/projects/libunwind
+ExclusiveArch: ia64 x86_64 i386 ppc64
 
 BuildRequires: glibc gcc make tar gzip
-Prereq: info
+BuildRequires: automake libtool autoconf
 
 %description
 Libunwind provides a C ABI to determine the call-chain of a program.
 This version of libunwind is targetted for the ia64 platform.
 
+%package devel
+Summary: Development package for libunwind
+Group: Development/Debuggers
+Requires: libunwind = %{PACKAGE_VERSION}
+%description devel
+The libunwind-devel package includes the libraries and header files for
+libunwind.
+
 %prep
-%setup
+%setup -q -n %{name}-%{version}-alpha
 
-# Fix-up SELinux compatibility for Bug 201888.
-%patch1 -p1 -b .nonexec
+%patch1 -p1 -E
+# New files from Patch1:
+chmod +x tests/run-ptrace-stepper
+chmod +x tests/run-ptrace-signull
 
 %build
-%configure
+mkdir -p config
+aclocal
+libtoolize
+autoheader
+automake --add-missing
+autoconf
+%configure --disable-static --enable-shared
 make
 
 %install
 %makeinstall
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libunwind*.la
+
+%check
+make check || true
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root)
 %doc COPYING README NEWS
+%{_libdir}/libunwind*.so.*
+
+%files devel
+%defattr(-,root,root)
+%{_libdir}/libunwind*.so
 %{_mandir}/*/*
-/usr/lib/libunwind*
-/usr/include/*
+%{_includedir}/*
 
 %changelog
+* Thu Apr  5 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 0.99-0.1.frysk20070405cvs
+- Update to the upstream snapshot snap-070224.
+- Use the Frysk's modified version, currently snapshot 20070405cvs.
+- Extend the supported architectures from ia64 also to x86_64, i386 and ppc64.
+- Spec file fixups.
+- Split the package to its base and the `devel' part.
+- Drop the statically built libraries.
+
 * Sun Oct 01 2006 Jesse Keating <jkeating at redhat.com> - 0.98.5-3
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libunwind/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	27 May 2006 04:05:13 -0000	1.6
+++ sources	5 Apr 2007 22:17:46 -0000	1.7
@@ -1 +1 @@
-a145a46003930b6382a11b125eef4cb4  libunwind-0.98.5.tar.gz
+679af461131997a5200af8b327f0c44b  libunwind-snap-070224.tar.gz


--- libunwind-0.98.5-stack-nonexec.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr  5 22:21:29 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 18:21:29 -0400
Subject: rpms/kernel/devel linux-2.6-dvb-spinlock.patch, NONE,
	1.1 kernel-2.6.spec, 1.3049, 1.3050
Message-ID: <200704052221.l35MLT7f000548@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-dvb-spinlock.patch 
Log Message:
* Thu Apr 05 2007 Dave Jones <davej at redhat.com>
- Fix kernel.org bugzilla #8301: spinlock fix for flexcop-pci (#234900)


linux-2.6-dvb-spinlock.patch:
 flexcop-pci.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-dvb-spinlock.patch ---

# HG changeset patch
# User Mauro Carvalho Chehab <mchehab at infradead.org>
# Date Thu Apr 05 14:28:11 2007 -0300
# Node ID a80058519added447f1cdd870334282e8ac3226e
# parent: 628ca02d680721a85e9b2fca7cf4b782b31f9443
Fix Kernel Bugzilla #8301: spinlock fix for flexcop-pci

# Now, patch author (just the main one), on a From: field
# Please change below if the committer is not the patch author.
#
>From Hendrik Borghorst <hendrik at borghorst.org>

# Then a detailed description:
If you modprobe the b2c2-flexcop-pci module you got a hardlock of your system.
This is due the usage of spin_lock before spin_lock_init is called.

# At the end Signed-off-by: fields by patch author and committer, at least.
#
Signed-Off-By: Patrick Boettcher <pb at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

--- a/drivers/media/dvb/b2c2/flexcop-pci.c	Wed Apr 04 13:11:06 2007 -0700
+++ b/drivers/media/dvb/b2c2/flexcop-pci.c	Thu Apr 05 14:28:11 2007 -0300
@@ -143,10 +143,11 @@ static irqreturn_t flexcop_pci_isr(int i
 {
 	struct flexcop_pci *fc_pci = dev_id;
 	struct flexcop_device *fc = fc_pci->fc_dev;
+	unsigned long flags;
 	flexcop_ibi_value v;
 	irqreturn_t ret = IRQ_HANDLED;
 
-	spin_lock_irq(&fc_pci->irq_lock);
+	spin_lock_irqsave(&fc_pci->irq_lock,flags);
 
 	v = fc->read_ibi_reg(fc,irq_20c);
 
@@ -210,7 +211,7 @@ static irqreturn_t flexcop_pci_isr(int i
 		ret = IRQ_NONE;
 	}
 
-	spin_unlock_irq(&fc_pci->irq_lock);
+	spin_unlock_irqrestore(&fc_pci->irq_lock,flags);
 
 	return ret;
 }
@@ -309,12 +310,12 @@ static int flexcop_pci_init(struct flexc
 	}
 
 	pci_set_drvdata(fc_pci->pdev, fc_pci);
-
+	spin_lock_init(&fc_pci->irq_lock);
 	if ((ret = request_irq(fc_pci->pdev->irq, flexcop_pci_isr,
 					IRQF_SHARED, DRIVER_NAME, fc_pci)) != 0)
 		goto err_pci_iounmap;
 
-	spin_lock_init(&fc_pci->irq_lock);
+
 
 	fc_pci->init_state |= FC_PCI_INIT;
 	return ret;



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3049
retrieving revision 1.3050
diff -u -r1.3049 -r1.3050
--- kernel-2.6.spec	5 Apr 2007 21:43:12 -0000	1.3049
+++ kernel-2.6.spec	5 Apr 2007 22:21:27 -0000	1.3050
@@ -526,6 +526,7 @@
 Patch1650: linux-2.6-serial-460800.patch
 Patch1681: linux-2.6-xfs-umount-fix.patch
 Patch1690: linux-2.6-PT_LOAD-align.patch
+Patch1700: linux-2.6-dvb-spinlock.patch
 Patch1720: linux-2.6-proc-self-maps-fix.patch
 Patch1740: linux-2.6-softlockup-disable.patch
 Patch1770: linux-2.6-optimise-spinlock-debug.patch
@@ -1198,6 +1199,8 @@
 %patch1681 -p1
 # Align kernel data segment to page boundary.
 %patch1690 -p1
+# DVB spinlock bug
+%patch1700 -p1
 # setuid /proc/self/maps fix.
 %patch1720 -p1
 # Add a safety net to softlockup so that it doesn't prevent installs.
@@ -2240,6 +2243,9 @@
 
 %changelog
 * Thu Apr 05 2007 Dave Jones <davej at redhat.com>
+- Fix kernel.org bugzilla #8301: spinlock fix for flexcop-pci (#234900)
+
+* Thu Apr 05 2007 Dave Jones <davej at redhat.com>
 - Remove a bunch of dead patches.
 
 * Thu Apr 05 2007 Dave Jones <davej at redhat.com>



From fedora-cvs-commits at redhat.com  Thu Apr  5 22:44:20 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 18:44:20 -0400
Subject: rpms/audit/devel .cvsignore, 1.76, 1.77 audit.spec, 1.133,
	1.134 sources, 1.91, 1.92 audit-1.5.2-segfault.patch, 1.1, NONE
Message-ID: <200704052244.l35MiK5S023540@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23483

Modified Files:
	.cvsignore audit.spec sources 
Removed Files:
	audit-1.5.2-segfault.patch 
Log Message:
* Thu Apr 04 2007 Steve Grubb <sgrubb at redhat.com> 1.5.2-1
- New event dispatcher (James Antill)
- Apply patches fixing man pages and Makefile.am (Philipp Hahn)
- Apply patch correcting python libs permissions (Philipp Hahn)
- Fix auditd segfault on reload
- Fix bug in auparse library for file pointers and descriptors
- Extract subject information out of daemon events for ausearch



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/.cvsignore,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- .cvsignore	20 Mar 2007 16:34:48 -0000	1.76
+++ .cvsignore	5 Apr 2007 22:44:18 -0000	1.77
@@ -73,3 +73,4 @@
 audit-1.4.2.tar.gz
 audit-1.5.tar.gz
 audit-1.5.1.tar.gz
+audit-1.5.2.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- audit.spec	29 Mar 2007 12:19:50 -0000	1.133
+++ audit.spec	5 Apr 2007 22:44:18 -0000	1.134
@@ -1,12 +1,11 @@
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
-Version: 1.5.1
-Release: 2%{?dist}
+Version: 1.5.2
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: %{name}-%{version}.tar.gz
-Patch1: audit-1.5.2-segfault.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool swig python-devel pkgconfig
 BuildRequires: kernel-headers >= 2.6.18
@@ -62,16 +61,15 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
-autoreconf -fv --install
+autoreconf -iv --install
 %configure --sbindir=/sbin --libdir=/%{_lib}
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/{sbin,etc/{sysconfig,audisp.d,rc.d/init.d}}
+mkdir -p $RPM_BUILD_ROOT/{sbin,etc/{sysconfig,audispd/plugins.d,rc.d/init.d}}
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8
 mkdir -p $RPM_BUILD_ROOT/%{_lib}
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/audit
@@ -118,7 +116,7 @@
 if [ -f /etc/audit/auditd.conf ]; then
    tmp=`mktemp /etc/audit/auditd-post.XXXXXX`
    if [ -n $tmp ]; then
-      sed 's|#dispatcher|dispatcher|g' /etc/audit/auditd.conf > $tmp && \
+      sed 's|^#dispatcher|dispatcher|g' /etc/audit/auditd.conf > $tmp && \
       cat $tmp > /etc/audit/auditd.conf
       rm -f $tmp
    fi
@@ -163,10 +161,6 @@
 /usr/lib/python?.?/site-packages/audit.py*
 /usr/lib/python?.?/site-packages/auparse.py*
 
-%files audispd-plugins
-%defattr(-,root,root)
-%{_libexecdir}/*
-
 %files
 %defattr(-,root,root,-)
 %doc  README COPYING ChangeLog sample.rules contrib/capp.rules contrib/nispom.rules contrib/lspp.rules contrib/skeleton.c init.d/auditd.cron
@@ -182,16 +176,20 @@
 %attr(750,root,root) %dir /etc/audit
 %attr(750,root,root) %dir /etc/audispd
 %attr(750,root,root) %dir /etc/audispd/plugins.d
-%attr(750,root,root) %dir /etc/audispd/policies.d
 %attr(750,root,root) %dir %{_libdir}/audit
 %config(noreplace) %attr(640,root,root) /etc/audit/auditd.conf
 %config(noreplace) %attr(640,root,root) /etc/audit/audit.rules
 %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
-%config(noreplace) %attr(640,root,root) /etc/audispd/audispd.conf
-%doc %attr(640,root,root) /etc/audispd/plugins.d/README-CONF_PLUGINS_D
-%doc %attr(640,root,root) /etc/audispd/policies.d/README-CONF_POLICIES_D
 
 %changelog
+* Thu Apr 04 2007 Steve Grubb <sgrubb at redhat.com> 1.5.2-1
+- New event dispatcher (James Antill)
+- Apply patches fixing man pages and Makefile.am (Philipp Hahn)
+- Apply patch correcting python libs permissions (Philipp Hahn)
+- Fix auditd segfault on reload
+- Fix bug in auparse library for file pointers and descriptors
+- Extract subject information out of daemon events for ausearch
+
 * Thu Mar 29 2007 Steve Grubb <sgrubb at redhat.com> 1.5.1-2
 - Remove requires kernel-headers for python-libs
 - Apply patch to prevent segfaults on auditd reload


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- sources	20 Mar 2007 16:34:48 -0000	1.91
+++ sources	5 Apr 2007 22:44:18 -0000	1.92
@@ -1 +1 @@
-9f410eae053012d1f4db7f60c45cf8bf  audit-1.5.1.tar.gz
+10d07935bff9cfffac5c251d1e620a88  audit-1.5.2.tar.gz


--- audit-1.5.2-segfault.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr  5 23:11:08 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 19:11:08 -0400
Subject: rpms/audit/devel sources,1.92,1.93
Message-ID: <200704052311.l35NB8Z6010255@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10106

Modified Files:
	sources 
Log Message:
fix build error



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/sources,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- sources	5 Apr 2007 22:44:18 -0000	1.92
+++ sources	5 Apr 2007 23:11:05 -0000	1.93
@@ -1 +1 @@
-10d07935bff9cfffac5c251d1e620a88  audit-1.5.2.tar.gz
+fbc39e41b185e7ebdbc6493105533790  audit-1.5.2.tar.gz



From fedora-cvs-commits at redhat.com  Fri Apr  6 02:28:07 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 5 Apr 2007 22:28:07 -0400
Subject: rpms/freetype/devel freetype.spec,1.51,1.52
Message-ID: <200704060228.l362S7AD017172@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/freetype/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17158

Modified Files:
	freetype.spec 
Log Message:
* Thu Apr 05 2007 Behdad Esfahbod <besfahbo at redhat.com> 2.3.3-2
- Include new demos ftgrid and ftdiff in freetype-demos. (#235478)



Index: freetype.spec
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- freetype.spec	5 Apr 2007 21:46:40 -0000	1.51
+++ freetype.spec	6 Apr 2007 02:28:03 -0000	1.52
@@ -8,7 +8,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype
 Version: 2.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD/GPL dual license
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -119,7 +119,7 @@
 }
 %if %{with_xfree86}
 {
-  for ftdemo in ftgamma ftmulti ftstring fttimer ftview ; do
+  for ftdemo in ftdiff ftgamma ftgrid ftmulti ftstring fttimer ftview ; do
       builds/unix/libtool --mode=install install -m 755 ft2demos-%{version}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir}
   done
 }
@@ -185,7 +185,9 @@
 %{_bindir}/ftmemchk
 %{_bindir}/ftvalid
 %if %{with_xfree86}
+%{_bindir}/ftdiff
 %{_bindir}/ftgamma
+%{_bindir}/ftgrid
 %{_bindir}/ftmulti
 %{_bindir}/ftstring
 %{_bindir}/fttimer
@@ -203,6 +205,9 @@
 %{_libdir}/pkgconfig/
 
 %changelog
+* Thu Apr 05 2007 Behdad Esfahbod <besfahbo at redhat.com> 2.3.3-2
+- Include new demos ftgrid and ftdiff in freetype-demos. (#235478)
+
 * Thu Apr 05 2007 Behdad Esfahbod <besfahbo at redhat.com> 2.3.3-1
 - Update to 2.3.3.
 



From fedora-cvs-commits at redhat.com  Fri Apr  6 07:20:41 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 03:20:41 -0400
Subject: rpms/tcl/devel tcl.spec,1.55,1.56
Message-ID: <200704060720.l367KfQu016624@cvs.devel.redhat.com>

Author: mmaslano

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

Modified Files:
	tcl.spec 
Log Message:
Update spec



Index: tcl.spec
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- tcl.spec	3 Apr 2007 13:17:09 -0000	1.55
+++ tcl.spec	6 Apr 2007 07:20:35 -0000	1.56
@@ -3,7 +3,7 @@
 Summary: Tcl scripting language development environment
 Name: tcl
 Version: %{majorver}.13
-Release: 15%{?dist}
+Release: 16%{?dist}
 Epoch: 1 
 License: BSD
 Group: Development/Languages
@@ -12,7 +12,7 @@
 Source1: http://superb-east.dl.sourceforge.net/sourceforge/tcl/tcl8.4.13-html.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires: autoconf
-Provides: tcl(abi)=%{majorver}
+Provides: tcl(abi) = %{majorver}
 ##Conflicts: tcldict
 Patch1: tcl-8.3.5-tclm4-soname.patch
 Patch2: tcl-8.4.5-lib-perm.patch
@@ -148,6 +148,9 @@
 %doc %{name}%{version}/html/*
 
 %changelog
+* Tue Apr  3 2007 Marcela Maslanova <mmaslano at redhat.com> - 1:8.4.13-16
+- rhbz#227725
+
 * Tue Apr  3 2007 Marcela Maslanova <mmaslano at redhat.com> - 1:8.4.13-15
 - cleaning spec
 



From fedora-cvs-commits at redhat.com  Fri Apr  6 07:30:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 03:30:26 -0400
Subject: rpms/evolution-data-server/devel evolution-data-server.spec,
	1.157.2.1, 1.157.2.2
Message-ID: <200704060730.l367UQgo023783@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
      Tag: private-e-d-s-sanity-1_10_0-5-branch
	evolution-data-server.spec 
Log Message:
sanity build



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.157.2.1
retrieving revision 1.157.2.2
diff -u -r1.157.2.1 -r1.157.2.2
--- evolution-data-server.spec	3 Apr 2007 02:00:56 -0000	1.157.2.1
+++ evolution-data-server.spec	6 Apr 2007 07:30:23 -0000	1.157.2.2
@@ -26,7 +26,7 @@
 
 Name: evolution-data-server
 Version: 1.10.0
-Release: 5%{?dist}.dwmw2.1
+Release: 6%{?dist}.dwmw2.1
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -397,6 +397,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Wed Apr 04 2007 Matthew Barnes <mbarnes at redhat.com> - 1.10.0-6.fc7
+- Revise patch for GNOME bug #417999 (another ESourceComboBox goof).
+
 * Mon Apr 02 2007 Matthew Barnes <mbarnes at redhat.com> - 1.10.0-5.fc7
 - Make the new ESourceComboBox widget work properly (RH bug #234760).
 



From fedora-cvs-commits at redhat.com  Fri Apr  6 09:54:52 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 05:54:52 -0400
Subject: rpms/openoffice.org/FC-6 workspace.glyphadv.patch, NONE,
	1.1 openoffice.org.spec, 1.936, 1.937
Message-ID: <200704060954.l369sq0v016405@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.glyphadv.patch 
Log Message:
Resolves: rhbz#235341 workspace.glyphadv.patch

workspace.glyphadv.patch:
 psprint/inc/psprint/fontmanager.hxx        |    5 
 psprint/source/fontmanager/fontmanager.cxx |   72 ++++
 psprint/source/fontsubset/sft.c            |    5 
 psprint/source/fontsubset/sft.h            |    5 
 vcl/inc/outfont.hxx                        |    3 
 vcl/inc/salgdi.hxx                         |    9 
 vcl/source/gdi/makefile.mk                 |    2 
 vcl/source/gdi/pdffontcache.cxx            |   85 +++++
 vcl/source/gdi/pdffontcache.hxx            |   92 +++++
 vcl/source/gdi/pdfwriter_impl.cxx          |  476 +++++++++++++++++------------
 vcl/source/gdi/pdfwriter_impl.hxx          |   29 +
 vcl/unx/inc/pspgraphics.h                  |    9 
 vcl/unx/inc/salgdi.h                       |    4 
 vcl/unx/source/gdi/pspgraphics.cxx         |   24 +
 vcl/unx/source/gdi/salgdi3.cxx             |   16 
 vcl/unx/source/gdi/xlfd_extd.cxx           |    5 
 vcl/unx/source/gdi/xlfd_extd.hxx           |    1 
 vcl/win/inc/salgdi.h                       |   19 +
 vcl/win/source/gdi/salgdi3.cxx             |  251 +++++++++++----
 19 files changed, 845 insertions(+), 267 deletions(-)

--- NEW FILE workspace.glyphadv.patch ---
Index: gsl/psprint/inc/psprint/fontmanager.hxx
diff -u gsl/psprint/inc/psprint/fontmanager.hxx:1.31 gsl/psprint/inc/psprint/fontmanager.hxx:1.31.72.1
--- gsl/psprint/inc/psprint/fontmanager.hxx:1.31	Mon Jun 19 03:23:01 2006
+++ gsl/psprint/inc/psprint/fontmanager.hxx	Wed Feb 28 05:59:08 2007
@@ -651,6 +651,11 @@
                            int nGlyphs,
                            bool bVertical = false
                            );
+    void getGlyphWidths( fontID nFont,
+                         bool bVertical,
+                         std::vector< sal_Int32 >& rWidths,
+                         std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc );
+
 
     // font administration functions
 
Index: gsl/psprint/source/fontmanager/fontmanager.cxx
diff -u gsl/psprint/source/fontmanager/fontmanager.cxx:1.73 gsl/psprint/source/fontmanager/fontmanager.cxx:1.73.46.2
--- gsl/psprint/source/fontmanager/fontmanager.cxx:1.73	Sat Sep 16 05:34:04 2006
+++ gsl/psprint/source/fontmanager/fontmanager.cxx	Mon Mar  5 07:13:28 2007
@@ -3146,11 +3146,11 @@
             effectiveCode |= bVertical ? 1 << 16 : 0;
             ::std::hash_map< int, CharacterMetric >::const_iterator it =
                   pFont->m_pMetrics->m_aMetrics.find( effectiveCode );
-	    // if no vertical metrics are available assume rotated horizontal metrics
-	    if( bVertical && (it == pFont->m_pMetrics->m_aMetrics.end()) )
-                  it = pFont->m_pMetrics->m_aMetrics.find( code );
-	    // the character metrics are in it->second
-	    if( it != pFont->m_pMetrics->m_aMetrics.end() )
+            // if no vertical metrics are available assume rotated horizontal metrics
+            if( bVertical && (it == pFont->m_pMetrics->m_aMetrics.end()) )
+                it = pFont->m_pMetrics->m_aMetrics.find( code );
+            // the character metrics are in it->second
+            if( it != pFont->m_pMetrics->m_aMetrics.end() )
                 pArray[ code - minCharacter ] = it->second;
         }
     }
@@ -3639,7 +3639,7 @@
         }
         else
         {
-            DBG_ASSERT( !(pGlyphIDs[i] & 0xffff0000), "overlong glyph id" );
+            DBG_ASSERT( !(pGlyphIDs[i] & 0x007f0000), "overlong glyph id" );
             DBG_ASSERT( (int)pNewEncoding[i] < nGlyphs, "encoding wrong" );
             DBG_ASSERT( pEnc[pNewEncoding[i]] == 0 && pGID[pNewEncoding[i]] == 0, "duplicate encoded glyph" );
             pEnc[ pNewEncoding[i] ] = pNewEncoding[i];
@@ -3685,6 +3685,66 @@
     CloseTTFont( pTTFont );
 
     return bSuccess;
+}
+
+void PrintFontManager::getGlyphWidths( fontID nFont,
+                                       bool bVertical,
+                                       std::vector< sal_Int32 >& rWidths,
+                                       std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc )
+{
+    PrintFont* pFont = getFont( nFont );
+    if( !pFont ||
+        (pFont->m_eType != fonttype::TrueType && pFont->m_eType != fonttype::Type1) )
+        return;
+    if( pFont->m_eType == fonttype::TrueType )
+    {
+        TrueTypeFont* pTTFont = NULL;
+        TrueTypeFontFile* pTTFontFile = static_cast< TrueTypeFontFile* >(pFont);
+        ByteString aFromFile = getFontFile( pFont );
+        if( OpenTTFont( aFromFile.GetBuffer(), pTTFontFile->m_nCollectionEntry < 0 ? 0 : pTTFontFile->m_nCollectionEntry, &pTTFont ) != SF_OK )
+            return;
+        int nGlyphs = GetTTGlyphCount( pTTFont );
+        if( nGlyphs > 0 )
+        {
+            rWidths.resize(nGlyphs);
+            std::vector<sal_uInt16> aGlyphIds(nGlyphs);
+            for( int i = 0; i < nGlyphs; i++ )
+                aGlyphIds[i] = sal_uInt16(i);
+            TTSimpleGlyphMetrics* pMetrics = GetTTSimpleGlyphMetrics( pTTFont,
+                                                                      &aGlyphIds[0],
+                                                                      nGlyphs,
+                                                                      bVertical ? 1 : 0 );
+            if( pMetrics )
+            {
+                for( int i = 0; i< nGlyphs; i++ )
+                    rWidths[i] = pMetrics[i].adv;
+                free( pMetrics );
+                rUnicodeEnc.clear();
+            }
+        }
+        CloseTTFont( pTTFont );
+    }
+    else if( pFont->m_eType == fonttype::Type1 )
+    {
+        if( ! pFont->m_aEncodingVector.size() )
+            pFont->readAfmMetrics( getAfmFile( pFont ), m_pAtoms, true, true );
+        if( pFont->m_pMetrics )
+        {
+            rUnicodeEnc.clear();
+            rWidths.clear();
+            rWidths.reserve( pFont->m_pMetrics->m_aMetrics.size() );
+            for( std::hash_map< int, CharacterMetric >::const_iterator it = 
+                 pFont->m_pMetrics->m_aMetrics.begin();
+                 it != pFont->m_pMetrics->m_aMetrics.end(); ++it )
+            {
+                if( (it->first & 0x00010000) == 0 || bVertical )
+                {
+                    rUnicodeEnc[ sal_Unicode(it->first & 0x0000ffff) ] = sal_uInt32(rWidths.size());
+                    rWidths.push_back( it->second.width );
+                }
+            }
+        }
+    }
 }
 
 // -------------------------------------------------------------------------
Index: gsl/psprint/source/fontsubset/sft.c
diff -u gsl/psprint/source/fontsubset/sft.c:1.39 gsl/psprint/source/fontsubset/sft.c:1.39.40.1
--- gsl/psprint/source/fontsubset/sft.c:1.39	Fri Oct 13 01:28:20 2006
+++ gsl/psprint/source/fontsubset/sft.c	Wed Feb 28 05:59:09 2007
@@ -2553,6 +2553,11 @@
 
 #endif
 
+int GetTTGlyphCount( TrueTypeFont* ttf )
+{
+    return ttf->nglyphs;
+}
+
 TTSimpleGlyphMetrics *GetTTSimpleGlyphMetrics(TrueTypeFont *ttf, sal_uInt16 *glyphArray, int nGlyphs, int mode)
 {
     sal_uInt8* pTable;
Index: gsl/psprint/source/fontsubset/sft.h
diff -u gsl/psprint/source/fontsubset/sft.h:1.15 gsl/psprint/source/fontsubset/sft.h:1.15.72.1
--- gsl/psprint/source/fontsubset/sft.h:1.15	Mon Jun 19 03:25:17 2006
+++ gsl/psprint/source/fontsubset/sft.h	Wed Feb 28 05:59:10 2007
@@ -571,6 +571,11 @@
  */
     int CheckSymbolEncoding(TrueTypeFont* ttf);
     
+/**
+ * returns the number of glyphs in a font
+ */
+ int GetTTGlyphCount( TrueTypeFont* ttf );
+    
 /*- private definitions */ /*FOLD00*/
 
     struct _TrueTypeFont {
Index: gsl/vcl/inc/outfont.hxx
diff -u gsl/vcl/inc/outfont.hxx:1.23 gsl/vcl/inc/outfont.hxx:1.23.246.1
--- gsl/vcl/inc/outfont.hxx:1.23	Thu Jul 13 03:12:00 2006
+++ gsl/vcl/inc/outfont.hxx	Wed Feb 28 06:00:30 2007
@@ -152,7 +152,8 @@
 
     virtual int             GetHeight() const           { return mnHeight; }
     virtual int             GetWidth() const            { return mnWidth; }
-    virtual sal_IntPtr      GetFontId() const           { return 0; }
+    virtual sal_IntPtr      GetFontId() const = 0;
+    int                     GetFontMagic() const        { return mnMagic; }
     bool                    IsScalable() const          { return (mnHeight == 0); }
     bool                    CheckMagic( int n ) const   { return (n == mnMagic); }
     ImplFontData*           GetNextFace() const         { return mpNext; }
Index: gsl/vcl/inc/salgdi.hxx
diff -u gsl/vcl/inc/salgdi.hxx:1.36 gsl/vcl/inc/salgdi.hxx:1.36.94.1
--- gsl/vcl/inc/salgdi.hxx:1.36	Tue Nov 14 07:22:46 2006
+++ gsl/vcl/inc/salgdi.hxx	Wed Feb 28 06:00:30 2007
@@ -296,6 +296,15 @@
                                           long* pDataLen ) = 0;
     // frees the font data again
     virtual void			FreeEmbedFontData( const void* pData, long nDataLen ) = 0;
+    
+    // get the same widths as in CreateFontSubset and GetEmbedFontData
+    // in case of an embeddable font also fill the mapping
+    // between unicode and glyph id
+    // leave widths vector and mapping untouched in case of failure
+    virtual void            GetGlyphWidths( ImplFontData* pFont,
+                                            bool bVertical,
+                                            std::vector< sal_Int32 >& rWidths,
+                                            std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc ) = 0;
 
     virtual BOOL                    GetGlyphBoundRect( long nIndex, Rectangle& ) = 0;
     virtual BOOL                    GetGlyphOutline( long nIndex, basegfx::B2DPolyPolygon& ) = 0;
Index: gsl/vcl/source/gdi/makefile.mk
diff -u gsl/vcl/source/gdi/makefile.mk:1.29 gsl/vcl/source/gdi/makefile.mk:1.29.18.2
--- gsl/vcl/source/gdi/makefile.mk:1.29	Tue Feb  6 06:18:36 2007
+++ gsl/vcl/source/gdi/makefile.mk	Mon Mar  5 06:28:12 2007
@@ -108,6 +108,7 @@
 			$(SLO)$/base14.obj		\
 			$(SLO)$/pdfwriter.obj	\
 			$(SLO)$/pdfwriter_impl.obj	\
+            $(SLO)$/pdffontcache.obj\
 			$(SLO)$/sallayout.obj		\
 			$(SLO)$/salgdilayout.obj	\
 			$(SLO)$/extoutdevdata.obj	\
@@ -128,6 +129,7 @@
 					$(SLO)$/impgraph.obj	\
                     $(SLO)$/metric.obj		\
                     $(SLO)$/pdfwriter_impl.obj	\
+                    $(SLO)$/pdffontcache.obj\
                     $(SLO)$/fontcfg.obj		\
 					$(SLO)$/bmpconv.obj		\
 					$(SLO)$/pdfextoutdevdata.obj	\
Index: gsl/vcl/source/gdi/pdffontcache.cxx
diff -u /dev/null gsl/vcl/source/gdi/pdffontcache.cxx:1.1.2.3
--- /dev/null	Fri Apr  6 02:48:47 2007
+++ gsl/vcl/source/gdi/pdffontcache.cxx	Fri Mar  2 08:22:22 2007
@@ -0,0 +1,85 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile$
+ *
+ *  $Revision$
+ *
+ *  last change: $Author$ $Date$
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+#include "precompiled_vcl.hxx"
+
+#include "pdffontcache.hxx"
+#include "salgdi.hxx"
+#include "outfont.hxx"
+#include "sallayout.hxx"
+
+using namespace vcl;
+
+PDFFontCache::FontIdentifier::FontIdentifier( ImplFontData* pFont, bool bVertical ) :
+    m_nFontId( pFont->GetFontId() ),
+    m_nMagic( pFont->GetFontMagic() ),
+    m_bVertical( bVertical )
+{
+}
+
+PDFFontCache::FontData& PDFFontCache::getFont( ImplFontData* pFont, bool bVertical )
+{
+    FontIdentifier aId( pFont, bVertical );
+    FontToIndexMap::iterator it = m_aFontToIndex.find( aId );
+    if( it != m_aFontToIndex.end() )
+        return m_aFonts[ it->second ];
+    m_aFontToIndex[ aId ] = sal_uInt32(m_aFonts.size());
+    m_aFonts.push_back( FontData() );
+    return m_aFonts.back();
+}
+
+sal_Int32 PDFFontCache::getGlyphWidth( ImplFontData* pFont, sal_uInt32 nGlyph, bool bVertical, SalGraphics* pGraphics )
+{
+    sal_Int32 nWidth = 0;
+    FontData& rFontData( getFont( pFont, bVertical ) );
+    if( rFontData.m_nWidths.empty() )
+    {
+        pGraphics->GetGlyphWidths( pFont, bVertical, rFontData.m_nWidths, rFontData.m_aGlyphIdToIndex );
+    }
+    if( ! rFontData.m_nWidths.empty() )
+    {
+        sal_uInt32 nIndex = nGlyph;
+        if( (nGlyph & GF_ISCHAR) != 0 )
+        {
+            std::map<sal_Unicode,sal_uInt32>::const_iterator it =
+                rFontData.m_aGlyphIdToIndex.find( sal_Unicode(nGlyph & GF_IDXMASK) );
+                nIndex = (it != rFontData.m_aGlyphIdToIndex.end()) ? it->second : 0;
+        }
+        nIndex &= GF_IDXMASK;
+        if( nIndex < rFontData.m_nWidths.size() )
+            nWidth = rFontData.m_nWidths[ nIndex ];
+    }
+    return nWidth;
+}
Index: gsl/vcl/source/gdi/pdffontcache.hxx
diff -u /dev/null gsl/vcl/source/gdi/pdffontcache.hxx:1.1.2.2
--- /dev/null	Fri Apr  6 02:48:47 2007
+++ gsl/vcl/source/gdi/pdffontcache.hxx	Mon Mar  5 06:28:12 2007
@@ -0,0 +1,92 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile$
+ *
+ *  $Revision$
+ *
+ *  last change: $Author$ $Date$
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+#ifndef VCL_PDFFONTCACHE_HXX
+#define VCL_PDFFONTCACHE_HXX
+
+#include <sal/types.h>
+
+#include <vector>
+#include <map>
+
+class ImplFontData;
+class SalGraphics;
+
+namespace vcl
+{
+    class PDFFontCache
+    {
+        struct FontIdentifier
+        {
+            sal_IntPtr      m_nFontId;
+            int             m_nMagic;
+            bool            m_bVertical;
+            
+            FontIdentifier( ImplFontData*, bool bVertical );
+            FontIdentifier() : m_nFontId(0), m_nMagic(0), m_bVertical( false ) {}
+            
+            bool operator==( const FontIdentifier& rRight ) const
+            {
+                return m_nFontId == rRight.m_nFontId &&
+                       m_nMagic == rRight.m_nMagic &&
+                       m_bVertical == rRight.m_bVertical;
+            }
+            bool operator<( const FontIdentifier& rRight ) const
+            {
+                return m_nFontId < rRight.m_nFontId ||
+                       m_nMagic < rRight.m_nMagic ||
+                       m_bVertical < rRight.m_bVertical;
+            }
+        };
+        struct FontData
+        {
+            std::vector< sal_Int32 >                m_nWidths;
+            std::map< sal_Unicode, sal_uInt32 >     m_aGlyphIdToIndex;
+        };
+        typedef std::map< FontIdentifier, sal_uInt32 > FontToIndexMap;
+        
+        std::vector< FontData >     m_aFonts;
+        FontToIndexMap              m_aFontToIndex;
+        
+        FontData& getFont( ImplFontData*, bool bVertical );
+        public:
+        PDFFontCache() {}
+        ~PDFFontCache() {}
+        
+        sal_Int32 getGlyphWidth( ImplFontData* pFont, sal_uInt32 nGlyphId, bool bVertical, SalGraphics* pGraphics );
+    };
+}
+
+#endif
Index: gsl/vcl/source/gdi/pdfwriter_impl.cxx
diff -u gsl/vcl/source/gdi/pdfwriter_impl.cxx:1.102 gsl/vcl/source/gdi/pdfwriter_impl.cxx:1.102.66.9
--- gsl/vcl/source/gdi/pdfwriter_impl.cxx:1.102	Thu Dec 21 04:03:14 2006
+++ gsl/vcl/source/gdi/pdfwriter_impl.cxx	Fri Mar  2 09:10:34 2007
@@ -718,7 +718,7 @@
 
     void append( PDFWriterImpl::PDFPage& rPage, OStringBuffer& rBuffer, Point* pBack = NULL );
 
-    Point transform( const Point& rPoint );
+    Point transform( const Point& rPoint ) const;
 };
 }
 
@@ -733,7 +733,7 @@
     f[5] = 0.0;
 }
 
-Point Matrix3::transform( const Point& rOrig )
+Point Matrix3::transform( const Point& rOrig ) const
 {
     double x = (double)rOrig.X(), y = (double)rOrig.Y();
     return Point( (int)(x*f[0] + y*f[2] + f[4]), (int)(x*f[1] + y*f[3] + f[5]) );
@@ -1751,6 +1751,7 @@
 
     virtual ImplFontData*               Clone() const { return new ImplPdfBuiltinFontData(*this); }
     virtual ImplFontEntry*              CreateFontInstance( ImplFontSelectData& ) const;
+    virtual sal_IntPtr                  GetFontId() const { return reinterpret_cast<sal_IntPtr>(&mrBuiltin); }
 };
 
 inline const ImplPdfBuiltinFontData* GetPdfFontData( const ImplFontData* pFontData )
@@ -2970,6 +2971,20 @@
         if( ! writeBuffer( aLine.getStr(), aLine.getLength() ) )
             goto streamend;
     }
+    else
+    {
+        rtl::OStringBuffer aErrorComment( 256 );
+        aErrorComment.append( "GetEmbedFontData failed for font \"" );
+        aErrorComment.append( OUStringToOString( pFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ) );
+        aErrorComment.append( '\"' );
+        if( pFont->GetSlant() == ITALIC_NORMAL )
+            aErrorComment.append( " italic" );
+        else if( pFont->GetSlant() == ITALIC_OBLIQUE )
+            aErrorComment.append( " oblique" );
+        aErrorComment.append( " weight=" );
+        aErrorComment.append( sal_Int32(pFont->GetWeight()) );
+        emitComment( aErrorComment.getStr() );
+    }
 
     if( nStreamObject )
         // write font descriptor
@@ -3459,6 +3474,21 @@
 
                 aFontIDToObject[ lit->m_nFontID ] = nFontObject;
             }
+            else
+            {
+                const ImplFontData* pFont = it->first;
+                rtl::OStringBuffer aErrorComment( 256 );
+                aErrorComment.append( "CreateFontSubset failed for font \"" );
+                aErrorComment.append( OUStringToOString( pFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ) );
+                aErrorComment.append( '\"' );
+                if( pFont->GetSlant() == ITALIC_NORMAL )
+                    aErrorComment.append( " italic" );
+                else if( pFont->GetSlant() == ITALIC_OBLIQUE )
+                    aErrorComment.append( " oblique" );
+                aErrorComment.append( " weight=" );
+                aErrorComment.append( sal_Int32(pFont->GetWeight()) );
+                emitComment( aErrorComment.getStr() );
+            }
         }
     }
     osl_removeFile( aTmpName.pData );
@@ -5166,13 +5196,13 @@
     return true;
 }
 
-void PDFWriterImpl::registerGlyphs(
-                                   int nGlyphs,
-                                   sal_Int32* pGlyphs,
-                                   sal_Unicode* pUnicodes,
-                                   sal_uInt8* pMappedGlyphs,
-                                   sal_Int32* pMappedFontObjects,
-                                   ImplFontData* pFallbackFonts[] )
+void PDFWriterImpl::registerGlyphs( int nGlyphs,
+                                    sal_Int32* pGlyphs,
+                                    sal_Int32* pGlyphWidths,
+                                    sal_Unicode* pUnicodes,
+                                    sal_uInt8* pMappedGlyphs,
+                                    sal_Int32* pMappedFontObjects,
+                                    ImplFontData* pFallbackFonts[] )
 {
     ImplFontData* pDevFont = m_pReferenceDevice->mpFontEntry->maFontSelData.mpFontData;
     for( int i = 0; i < nGlyphs; i++ )
@@ -5182,8 +5212,34 @@
 
         ImplFontData* pCurrentFont = pFallbackFonts[i] ? pFallbackFonts[i] : pDevFont;
 
-        if( pCurrentFont->mbSubsettable )
+        if( isBuiltinFont( pCurrentFont ) )
+        {
+            sal_Int32 nFontID = 0;
+            FontEmbedData::iterator it = m_aEmbeddedFonts.find( pCurrentFont );
+            if( it != m_aEmbeddedFonts.end() )
+                nFontID = it->second.m_nNormalFontID;
+            else
+            {
+                nFontID = m_nNextFID++;
+                m_aEmbeddedFonts[ pCurrentFont ] = EmbedFont();
+                m_aEmbeddedFonts[ pCurrentFont ].m_nNormalFontID = nFontID;
+            }
+
+            pGlyphWidths[ i ] = 0;
+            pMappedGlyphs[ i ] = (sal_Int8)pUnicodes[i];
+            pMappedFontObjects[ i ] = nFontID;
+            const ImplPdfBuiltinFontData* pFD = GetPdfFontData( pCurrentFont );
+            if( pFD )
+            {
+                const BuiltinFont* pBuiltinFont = pFD->GetBuiltinFont();
+                pGlyphWidths[i] = pBuiltinFont->m_aWidths[ pUnicodes[i] & 0x00ff ];
+            }
+        }
+        else if( pCurrentFont->mbSubsettable )
         {
+            #ifndef WNT
+            DBG_ASSERT( (pGlyphs[i] & GF_ISCHAR) == 0, "hdu promised this would only happen on Windows" );
+            #endif
 
             FontSubset& rSubset = m_aSubsets[ pCurrentFont ];
             // search for glyphID
@@ -5218,8 +5274,13 @@
                 rNewGlyph.m_nFontID = pMappedFontObjects[i];
                 rNewGlyph.m_nSubsetGlyphID = nNewId;
             }
+            getReferenceDevice()->ImplGetGraphics();
+            pGlyphWidths[i] = m_aFontCache.getGlyphWidth( pCurrentFont,
+                                                          pGlyphs[i],
+                                                          (pGlyphs[i] & GF_ROTMASK) != 0,
+                                                          m_pReferenceDevice->mpGraphics );
         }
-        else
+        else if( pCurrentFont->IsEmbeddable() )
         {
             sal_Int32 nFontID = 0;
             FontEmbedData::iterator it = m_aEmbeddedFonts.find( pCurrentFont );
@@ -5302,6 +5363,10 @@
             }
             pMappedGlyphs[ i ] = (sal_Int8)cChar;
             pMappedFontObjects[ i ] = nCurFontID;
+            pGlyphWidths[ i ] = m_aFontCache.getGlyphWidth( pCurrentFont,
+                                                            (pEncoding ? pUnicodes[i] : cChar) | GF_ISCHAR,
+                                                            false,
+                                                            m_pReferenceDevice->mpGraphics );
         }
     }
 }
@@ -5376,6 +5441,179 @@
     updateGraphicsState();
 }
 
+void PDFWriterImpl::drawVerticalGlyphs(
+        const std::vector<PDFWriterImpl::PDFGlyph>& rGlyphs,
+        OStringBuffer& rLine,
+        const Point& rAlignOffset,
+        const Matrix3& rRotScale,
+        double fAngle,
+        double fXScale,
+        double fSkew,
+        sal_Int32 nFontHeight )
+{
+    long nXOffset = 0;
+    Point aCurPos( rGlyphs[0].m_aPos );
+    aCurPos = m_pReferenceDevice->PixelToLogic( aCurPos );
+    aCurPos += rAlignOffset;
+    for( size_t i = 0; i < rGlyphs.size(); i++ )
+    {
+        // have to emit each glyph on its own
+        double fDeltaAngle = 0.0;
+        double fYScale = 1.0;
+        double fTempXScale = fXScale;
+        double fSkewB = fSkew;
+        double fSkewA = 0.0;
+        
+        Point aDeltaPos;
+        if( ( rGlyphs[i].m_nGlyphId & GF_ROTMASK ) == GF_ROTL )
+        {
+            fDeltaAngle = M_PI/2.0;
+            aDeltaPos.X() = m_pReferenceDevice->GetFontMetric().GetAscent();
+            aDeltaPos.Y() = (int)((double)m_pReferenceDevice->GetFontMetric().GetDescent() * fXScale);
+            fYScale = fXScale;
+            fTempXScale = 1.0;
+            fSkewA = -fSkewB;
+            fSkewB = 0.0;
+        }
+        else if( ( rGlyphs[i].m_nGlyphId & GF_ROTMASK ) == GF_ROTR )
+        {
+            fDeltaAngle = -M_PI/2.0;
+            aDeltaPos.X() = (int)((double)m_pReferenceDevice->GetFontMetric().GetDescent()*fXScale);
+            aDeltaPos.Y() = -m_pReferenceDevice->GetFontMetric().GetAscent();
+            fYScale = fXScale;
+            fTempXScale = 1.0;
+            fSkewA = fSkewB;
+            fSkewB = 0.0;
+        }
+        aDeltaPos += (m_pReferenceDevice->PixelToLogic( Point( (int)((double)nXOffset/fXScale), 0 ) ) - m_pReferenceDevice->PixelToLogic( Point() ) );
+        if( i < rGlyphs.size()-1 )
+            nXOffset += rGlyphs[i+1].m_aPos.Y() - rGlyphs[i].m_aPos.Y();
+        if( ! rGlyphs[i].m_nGlyphId )
+            continue;
+        
+        
+        aDeltaPos = rRotScale.transform( aDeltaPos );
+        
+        Matrix3 aMat;
+        if( fSkewB != 0.0 || fSkewA != 0.0 )
+            aMat.skew( fSkewA, fSkewB );
+        aMat.scale( fTempXScale, fYScale );
+        aMat.rotate( fAngle+fDeltaAngle );
+        aMat.translate( aCurPos.X()+aDeltaPos.X(), aCurPos.Y()+aDeltaPos.Y() );
+        aMat.append( m_aPages.back(), rLine );
+        rLine.append( " Tm" );
+        if( i == 0 || rGlyphs[i-1].m_nMappedFontId != rGlyphs[i].m_nMappedFontId )
+        {
+            rLine.append( " /F" );
+            rLine.append( rGlyphs[i].m_nMappedFontId );
+            rLine.append( ' ' );
+            m_aPages.back().appendMappedLength( nFontHeight, rLine, true );
+            rLine.append( " Tf" );
+        }
+        rLine.append( "<" );
+        appendHex( rGlyphs[i].m_nMappedGlyphId, rLine );
+        rLine.append( ">Tj\n" );
+    }
+}
+
+void PDFWriterImpl::drawHorizontalGlyphs(
+        const std::vector<PDFWriterImpl::PDFGlyph>& rGlyphs,
+        OStringBuffer& rLine,
+        const Point& rAlignOffset,
+        double fAngle,
+        double fXScale,
+        double fSkew,
+        sal_Int32 nFontHeight,
+        sal_Int32 nPixelFontHeight
+        )
+{
+    // horizontal (= normal) case
+    
+    // fill in  run end indices
+    // end is marked by index of the first glyph of the next run
+    // a run is marked by same mapped font id and same Y position
+    std::vector< sal_uInt32 > aRunEnds;
+    aRunEnds.reserve( rGlyphs.size() );
+    for( size_t i = 1; i < rGlyphs.size(); i++ )
+    {
+        if( rGlyphs[i].m_nMappedFontId != rGlyphs[i-1].m_nMappedFontId ||
+            rGlyphs[i].m_aPos.Y() != rGlyphs[i-1].m_aPos.Y() )
+        {
+            aRunEnds.push_back(i);
+        }
+    }
+    // last run ends at last glyph
+    aRunEnds.push_back( rGlyphs.size() );
+
+    // loop over runs of the same font
+    sal_uInt32 nBeginRun = 0;
+    for( size_t nRun = 0; nRun < aRunEnds.size(); nRun++ )
+    {
+        // setup text matrix
+        Point aCurPos = rGlyphs[nBeginRun].m_aPos;
+        // back transformation to current coordinate system
+        aCurPos = m_pReferenceDevice->PixelToLogic( aCurPos );
+        aCurPos += rAlignOffset;
+        // the first run can be set with "Td" operator
+        // subsequent use of that operator would move
+        // the texline matrix relative to what was set before
+        // making use of that would drive us into rounding issues
+        if( nRun == 0 && fAngle == 0.0 && fXScale == 1.0 && fSkew == 0.0 )
+        {
+            m_aPages.back().appendPoint( aCurPos, rLine, false );
+            rLine.append( " Td " );
+        }
+        else
+        {
+            Matrix3 aMat;
+            if( fSkew != 0.0 )
+                aMat.skew( 0.0, fSkew );
+            aMat.scale( fXScale, 1.0 );
+            aMat.rotate( fAngle );
+            aMat.translate( aCurPos.X(), aCurPos.Y() );
+            aMat.append( m_aPages.back(), rLine );
+            rLine.append( " Tm\n" );
+        }
+        // set up correct font
+        rLine.append( "/F" );
+        rLine.append( rGlyphs[nBeginRun].m_nMappedFontId );
+        rLine.append( ' ' );
+        m_aPages.back().appendMappedLength( nFontHeight, rLine, true );
+        rLine.append( " Tf" );
+
+        // output glyphs using Tj or TJ
+        OStringBuffer aKernedLine( 256 ), aUnkernedLine( 256 );
+        aKernedLine.append( "[<" );
+        aUnkernedLine.append( '<' );
+        appendHex( rGlyphs[nBeginRun].m_nMappedGlyphId, aKernedLine );
+        appendHex( rGlyphs[nBeginRun].m_nMappedGlyphId, aUnkernedLine );
+
+        bool bNeedKern = false;
+        for( sal_uInt32 nPos = nBeginRun+1; nPos < aRunEnds[nRun]; nPos++ )
+        {
+            appendHex( rGlyphs[nPos].m_nMappedGlyphId, aUnkernedLine );
+            // check for adjustment
+            double fTheoreticalGlyphWidth = rGlyphs[nPos].m_aPos.X() - rGlyphs[nPos-1].m_aPos.X();
+            fTheoreticalGlyphWidth = 1000.0 * fTheoreticalGlyphWidth / fXScale / double(nPixelFontHeight);
+            sal_Int32 nAdjustment = rGlyphs[nPos-1].m_nNativeWidth - sal_Int32(fTheoreticalGlyphWidth+0.5);
+            if( nAdjustment != 0 )
+            {
+                bNeedKern = true;
+                aKernedLine.append( ">" );
+                aKernedLine.append( nAdjustment );
+                aKernedLine.append( "<" );
+            }
+            appendHex( rGlyphs[nPos].m_nMappedGlyphId, aKernedLine );
+        }
+        aKernedLine.append( ">]TJ\n" );
+        aUnkernedLine.append( ">Tj\n" );
+        rLine.append( bNeedKern ? aKernedLine : aUnkernedLine );
+        
+        // set beginning of next run
+        nBeginRun = aRunEnds[nRun];
+    }
+}
+
 void PDFWriterImpl::drawLayout( SalLayout& rLayout, const String& rText, bool bTextLines )
 {
     // relief takes precedence over shadow (see outdev3.cxx)
@@ -5392,27 +5630,25 @@
     const int nMaxGlyphs = 256;
 
     sal_Int32 pGlyphs[nMaxGlyphs];
+    sal_Int32 pGlyphWidths[nMaxGlyphs];
     sal_uInt8 pMappedGlyphs[nMaxGlyphs];
     sal_Int32 pMappedFontObjects[nMaxGlyphs];
     sal_Unicode pUnicodes[nMaxGlyphs];
     int pCharPosAry[nMaxGlyphs];
     sal_Int32 nAdvanceWidths[nMaxGlyphs];
     ImplFontData* pFallbackFonts[nMaxGlyphs];
-    sal_Int32 *pAdvanceWidths = m_aCurrentPDFState.m_aFont.IsVertical() ? nAdvanceWidths : NULL;
-    sal_Int32 nGlyphFlags[nMaxGlyphs];
+    bool bVertical = m_aCurrentPDFState.m_aFont.IsVertical();
     int nGlyphs;
     int nIndex = 0;
-    Point aCurPos, aLastPos(0, 0), aCumulativePos(0,0), aGlyphPos;
-    bool bFirst = true, bWasYChange = false;
     int nMinCharPos = 0, nMaxCharPos = rText.Len()-1;
     double fXScale = 1.0;
     double fSkew = 0.0;
-    sal_Int32 nFontHeight = m_pReferenceDevice->mpFontEntry->maFontSelData.mnHeight;
+    sal_Int32 nPixelFontHeight = m_pReferenceDevice->mpFontEntry->maFontSelData.mnHeight;
     TextAlign eAlign = m_aCurrentPDFState.m_aFont.GetAlign();
 
     // transform font height back to current units
     // note: the layout calculates in outdevs device pixel !!
-    nFontHeight = m_pReferenceDevice->ImplDevicePixelToLogicHeight( nFontHeight );
+    sal_Int32 nFontHeight = m_pReferenceDevice->ImplDevicePixelToLogicHeight( nPixelFontHeight );
     if( m_aCurrentPDFState.m_aFont.GetWidth() )
     {
         Font aFont( m_aCurrentPDFState.m_aFont );
@@ -5522,26 +5758,13 @@
 
     FontMetric aRefDevFontMetric = m_pReferenceDevice->GetFontMetric();
 
-    sal_Int32 nLastMappedFont = -1;
-    while( (nGlyphs = rLayout.GetNextGlyphs( nMaxGlyphs, pGlyphs, aCurPos, nIndex, pAdvanceWidths, pCharPosAry )) != 0 )
+    // collect the glyphs into a single array
+    std::vector< PDFGlyph > aGlyphs;
+    aGlyphs.reserve( nMaxGlyphs );
+    // first get all the glyphs and register them; coordinates still in Pixel
+    Point aGNGlyphPos;
+    while( (nGlyphs = rLayout.GetNextGlyphs( nMaxGlyphs, pGlyphs, aGNGlyphPos, nIndex, nAdvanceWidths, pCharPosAry )) != 0 )
     {
-        bWasYChange = (aGlyphPos.Y() != aCurPos.Y());
-        aGlyphPos = aCurPos;
-        // back transformation to current coordinate system
-        aCurPos = m_pReferenceDevice->PixelToLogic( aCurPos );
-
-        Point aOffset;
-        if ( eAlign == ALIGN_BOTTOM )
-            aOffset.Y() -= aRefDevFontMetric.GetDescent();
-        else if ( eAlign == ALIGN_TOP )
-            aOffset.Y() += aRefDevFontMetric.GetAscent();
-
-        if( aOffset.X() || aOffset.Y() )
-        {
-            aOffset = aRotScale.transform( aOffset );
-            aCurPos += aOffset;
-        }
-
         for( int i = 0; i < nGlyphs; i++ )
         {
             if( pGlyphs[i] & GF_FONTMASK )
@@ -5549,16 +5772,6 @@
             else
                 pFallbackFonts[i] = NULL;
 
-            nGlyphFlags[i] = (pGlyphs[i] & GF_FLAGMASK);
-#ifndef WNT
-            // #104930# workaround for Win32 bug: the glyph ids are actually
-            // Unicodes for vertical fonts because Win32 does not return
-            // the correct glyph ids; this is indicated by GF_ISCHAR which is
-            // needed in SalGraphics::CreateFontSubset to convert the Unicodes
-            // to vertical glyph ids. Doing this here on a per character
-            // basis would be a major performance hit.
-            pGlyphs[i] &= GF_IDXMASK;
-#endif
             if( pCharPosAry[i] >= nMinCharPos && pCharPosAry[i] <= nMaxCharPos )
                 pUnicodes[i] = rText.GetChar( sal::static_int_cast<xub_StrLen>(pCharPosAry[i]) );
             else
@@ -5568,159 +5781,34 @@
             // implementations set -1 then to indicate that no direct
             // mapping is possible
         }
-        registerGlyphs( nGlyphs, pGlyphs, pUnicodes, pMappedGlyphs, pMappedFontObjects, pFallbackFonts );
-
-        if( pAdvanceWidths )
-        {
-            // have to emit each glyph on its own
-            long nXOffset = 0;
-            for( int n = 0; n < nGlyphs; n++ )
-            {
-                double fDeltaAngle = 0.0;
-                double fYScale = 1.0;
-                double fTempXScale = fXScale;
-                double fSkewB = fSkew;
-                double fSkewA = 0.0;
-
-                Point aDeltaPos;
-                if( ( nGlyphFlags[n] & GF_ROTMASK ) == GF_ROTL )
-                {
-                    fDeltaAngle = M_PI/2.0;
-                    aDeltaPos.X() = aRefDevFontMetric.GetAscent();
-                    aDeltaPos.Y() = (int)((double)m_pReferenceDevice->GetFontMetric().GetDescent() * fXScale);
-                    fYScale = fXScale;
-                    fTempXScale = 1.0;
-                    fSkewA = -fSkewB;
-                    fSkewB = 0.0;
-                }
-                else if( ( nGlyphFlags[n] & GF_ROTMASK ) == GF_ROTR )
-                {
-                    fDeltaAngle = -M_PI/2.0;
-                    aDeltaPos.X() = (int)((double)aRefDevFontMetric.GetDescent()*fXScale);
-                    aDeltaPos.Y() = -aRefDevFontMetric.GetAscent();
-                    fYScale = fXScale;
-                    fTempXScale = 1.0;
-                    fSkewA = fSkewB;
-                    fSkewB = 0.0;
-                }
-                aDeltaPos += (m_pReferenceDevice->PixelToLogic( Point( (int)((double)nXOffset/fXScale)/rLayout.GetUnitsPerPixel(), 0 ) ) - m_pReferenceDevice->PixelToLogic( Point() ) );
-                nXOffset += pAdvanceWidths[n];
-                if( ! pGlyphs[n] )
-                    continue;
-
-
-                aDeltaPos = aRotScale.transform( aDeltaPos );
-
-                Matrix3 aMat;
-                if( fSkewB != 0.0 || fSkewA != 0.0 )
-                    aMat.skew( fSkewA, fSkewB );
-                aMat.scale( fTempXScale, fYScale );
-                aMat.rotate( fAngle+fDeltaAngle );
-                aMat.translate( aCurPos.X()+aDeltaPos.X(), aCurPos.Y()+aDeltaPos.Y() );
-                aMat.append( m_aPages.back(), aLine );
-                aLine.append( " Tm" );
-                if( nLastMappedFont != pMappedFontObjects[n] )
-                {
-                    nLastMappedFont = pMappedFontObjects[n];
-                    aLine.append( " /F" );
-                    aLine.append( pMappedFontObjects[n] );
-                    aLine.append( ' ' );
-                    m_aPages.back().appendMappedLength( nFontHeight, aLine, true );
-                    aLine.append( " Tf" );
-                }
-                aLine.append( " <" );
-                appendHex( (sal_Int8)pMappedGlyphs[n], aLine );
-                aLine.append( "> Tj\n" );
-            }
-        }
-        else // normal case
+        registerGlyphs( nGlyphs, pGlyphs, pGlyphWidths, pUnicodes, pMappedGlyphs, pMappedFontObjects, pFallbackFonts );
+        for( int i = 0; i < nGlyphs; i++)
         {
-            // optimize use of Td vs. Tm
-            if( fAngle == 0.0 && fXScale == 1.0 && ( !bFirst || fSkew == 0.0 ) )
-            {
-                if( bFirst )
-                {
-                    m_aPages.back().appendPoint( aCurPos, aLine, false, &aCumulativePos );
-                    bFirst = false;
-                    aLastPos = aCurPos;
-                }
-                else
-                {
-                    sal_Int32 nDiffL = 0;
-                    Point aDiff = aCurPos - aLastPos;
-                    m_aPages.back().appendMappedLength( (sal_Int32)aDiff.X(), aLine, false, &nDiffL );
-                    aCumulativePos.X() += nDiffL;
-                    aLine.append( ' ' );
-                    if( bWasYChange )
-                    {
-                        m_aPages.back().appendMappedLength( (sal_Int32)-aDiff.Y(), aLine, true, &nDiffL );
-                        aCumulativePos.Y() -= nDiffL;
-                    }
-                    else
-                    {
-                        aLine.append( '0' );
-                    }
-                    // back project last position to catch rounding errors
-                    Point aBackPos = lcl_convert( m_aMapMode,
-                                                  m_aGraphicsStack.front().m_aMapMode,
-                                                  getReferenceDevice(),
-                                                  aCumulativePos
-                                                  );
-                    // catch rounding error in back projection on Y axis;
-                    // else the back projection can produce a sinuous text baseline
-                    if( ! bWasYChange )
-                        aBackPos.Y() = aLastPos.Y();
-                    aLastPos = aBackPos;
-                }
-                aLine.append( " Td " );
-            }
+            aGlyphs.push_back( PDFGlyph( aGNGlyphPos,
+                                         pGlyphWidths[i],
+                                         pGlyphs[i],
+                                         pMappedFontObjects[i],
+                                         pMappedGlyphs[i] ) );
+            if( bVertical )
+                aGNGlyphPos.Y() += nAdvanceWidths[i]/rLayout.GetUnitsPerPixel();
             else
-            {
-                Matrix3 aMat;
-                if( fSkew != 0.0 )
-                    aMat.skew( 0.0, fSkew );
-                aMat.scale( fXScale, 1.0 );
-                aMat.rotate( fAngle );
-                aMat.translate( aCurPos.X(), aCurPos.Y() );
-                aMat.append( m_aPages.back(), aLine, &aCumulativePos );
-                aLine.append( " Tm\n" );
-                aLastPos = aCurPos;
-                bFirst = false;
-            }
-            int nLast = 0;
-            while( nLast < nGlyphs )
-            {
-                while( ! pGlyphs[nLast] && nLast < nGlyphs )
-                    nLast++;
-                if( nLast >= nGlyphs )
-                    break;
-
-                int nNext = nLast+1;
-                while( nNext < nGlyphs && pMappedFontObjects[ nNext ] == pMappedFontObjects[nLast] && pGlyphs[nNext] )
-                    nNext++;
-                if( nLastMappedFont != pMappedFontObjects[nLast] )
-                {
-                    aLine.append( "/F" );
-                    aLine.append( pMappedFontObjects[nLast] );
-                    aLine.append( ' ' );
-                    m_aPages.back().appendMappedLength( nFontHeight, aLine, true );
-                    aLine.append( " Tf " );
-                    nLastMappedFont = pMappedFontObjects[nLast];
-                }
-                aLine.append( "<" );
-                for( int i = nLast; i < nNext; i++ )
-                {
-                    appendHex( (sal_Int8)pMappedGlyphs[i], aLine );
-                    if( i && (i % 35) == 0 )
-                        aLine.append( "\n" );
-                }
-                aLine.append( "> Tj\n" );
-
-                nLast = nNext;
-            }
+                aGNGlyphPos.X() += nAdvanceWidths[i]/rLayout.GetUnitsPerPixel();
         }
     }
+    
+    Point aAlignOffset;
+    if ( eAlign == ALIGN_BOTTOM )
+        aAlignOffset.Y() -= aRefDevFontMetric.GetDescent();
+    else if ( eAlign == ALIGN_TOP )
+        aAlignOffset.Y() += aRefDevFontMetric.GetAscent();
+    if( aAlignOffset.X() || aAlignOffset.Y() )
+        aAlignOffset = aRotScale.transform( aAlignOffset );
 
+    if( bVertical )
+        drawVerticalGlyphs( aGlyphs, aLine, aAlignOffset, aRotScale, fAngle, fXScale, fSkew, nFontHeight );
+    else
+        drawHorizontalGlyphs( aGlyphs, aLine, aAlignOffset, fAngle, fXScale, fSkew, nFontHeight, nPixelFontHeight );
+    
     // end textobject
     aLine.append( "ET\n" );
     if( bPop )
Index: gsl/vcl/source/gdi/pdfwriter_impl.hxx
diff -u gsl/vcl/source/gdi/pdfwriter_impl.hxx:1.42 gsl/vcl/source/gdi/pdfwriter_impl.hxx:1.42.78.2
--- gsl/vcl/source/gdi/pdfwriter_impl.hxx:1.42	Mon Dec  4 00:32:37 2006
+++ gsl/vcl/source/gdi/pdfwriter_impl.hxx	Thu Mar  1 04:26:56 2007
@@ -79,6 +79,9 @@
 #include <rtl/digest.h>
 #endif
 
+#include "pdffontcache.hxx"
+
+
 #include <vector>
 #include <map>
 #include <hash_map>
@@ -106,6 +109,7 @@
 {
 
 class PDFSalLayout;
+class Matrix3;
 
 class PDFWriterImpl
 {
@@ -512,6 +516,26 @@
         }
 
     };
+    
+    // helper structure for drawLayout and friends
+    struct PDFGlyph
+    {
+        Point       m_aPos;
+        sal_Int32   m_nNativeWidth;
+        sal_Int32   m_nGlyphId;
+        sal_Int32   m_nMappedFontId;
+        sal_uInt8   m_nMappedGlyphId;
+        
+        PDFGlyph( const Point& rPos,
+                  sal_Int32 nNativeWidth,
+                  sal_Int32 nGlyphId,
+                  sal_Int32 nFontId,
+                  sal_uInt8 nMappedGlyphId )
+        : m_aPos( rPos ), m_nNativeWidth( nNativeWidth ), m_nGlyphId( nGlyphId ),
+          m_nMappedFontId( nFontId ), m_nMappedGlyphId( nMappedGlyphId )
+        {}
+    };
+
 
     static const sal_Char* getStructureTag( PDFWriter::StructElement );
     static const sal_Char* getAttributeTag( PDFWriter::StructAttribute eAtr );
@@ -589,6 +613,7 @@
     FontSubsetData						m_aSubsets;
     FontEmbedData						m_aEmbeddedFonts;
     sal_Int32							m_nNextFID;
+    PDFFontCache                        m_aFontCache;
 
     sal_Int32							m_nInheritedPageWidth;  // in inch/72
     sal_Int32							m_nInheritedPageHeight; // in inch/72
@@ -816,10 +841,12 @@
 	void appendLiteralStringEncrypt( rtl::OStringBuffer& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer );
 
     /* creates fonts and subsets that will be emitted later */
-    void registerGlyphs( int nGlyphs, sal_Int32* pGlyphs, sal_Unicode* pUnicodes, sal_uInt8* pMappedGlyphs, sal_Int32* pMappedFontObjects, ImplFontData* pFallbackFonts[] );
+    void registerGlyphs( int nGlyphs, sal_Int32* pGlyphs, sal_Int32* pGlpyhWidths, sal_Unicode* pUnicodes, sal_uInt8* pMappedGlyphs, sal_Int32* pMappedFontObjects, ImplFontData* pFallbackFonts[] );
 
     /*  emits a text object according to the passed layout */
     /* TODO: remove rText as soon as SalLayout will change so that rText is not necessary anymore */
+    void drawVerticalGlyphs( const std::vector<PDFGlyph>& rGlyphs, rtl::OStringBuffer& rLine, const Point& rAlignOffset, const Matrix3& rRotScale, double fAngle, double fXScale, double fSkew, sal_Int32 nFontHeight );
+    void drawHorizontalGlyphs( const std::vector<PDFGlyph>& rGlyphs, rtl::OStringBuffer& rLine, const Point& rAlignOffset, double fAngle, double fXScale, double fSkew, sal_Int32 nFontHeight, sal_Int32 nPixelFontHeight );
     void drawLayout( SalLayout& rLayout, const String& rText, bool bTextLines );
     void drawRelief( SalLayout& rLayout, const String& rText, bool bTextLines );
     void drawShadow( SalLayout& rLayout, const String& rText, bool bTextLines );
Index: gsl/vcl/unx/inc/pspgraphics.h
diff -u gsl/vcl/unx/inc/pspgraphics.h:1.12 gsl/vcl/unx/inc/pspgraphics.h:1.12.94.1
--- gsl/vcl/unx/inc/pspgraphics.h:1.12	Tue Nov 14 07:24:00 2006
+++ gsl/vcl/unx/inc/pspgraphics.h	Wed Feb 28 06:00:32 2007
@@ -91,6 +91,11 @@
     static const void* DoGetEmbedFontData( psp::fontID aFont, const sal_Unicode* pUnicodes, sal_Int32* pWidths, FontSubsetInfo& rInfo, long* pDataLen );
     static void DoFreeEmbedFontData( const void* pData, long nLen );
     static const std::map< sal_Unicode, sal_Int32 >* DoGetFontEncodingVector( psp::fontID aFont, const std::map< sal_Unicode, rtl::OString >** pNonEncoded );
+    static void DoGetGlyphWidths( psp::fontID aFont,
+                                  bool bVertical,
+                                  std::vector< sal_Int32 >& rWidths,
+                                  std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc );
+
     static ImplDevFontAttributes Info2DevFontAttributes( const psp::FastPrintFontInfo& );
     static void AnnounceFonts( ImplDevFontList*, const psp::FastPrintFontInfo& );
     static FontWidth	ToFontWidth (psp::width::type eWidth);
@@ -141,6 +146,10 @@
                                           FontSubsetInfo& rInfo,
                                           long* pDataLen );
     virtual void			FreeEmbedFontData( const void* pData, long nDataLen );
+    virtual void            GetGlyphWidths( ImplFontData* pFont,
+                                            bool bVertical,
+                                            std::vector< sal_Int32 >& rWidths,
+                                            std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc );
     virtual BOOL			GetGlyphBoundRect( long nIndex, Rectangle& );
     virtual BOOL			GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
     virtual SalLayout*		GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
Index: gsl/vcl/unx/inc/salgdi.h
diff -u gsl/vcl/unx/inc/salgdi.h:1.39 gsl/vcl/unx/inc/salgdi.h:1.39.94.1
--- gsl/vcl/unx/inc/salgdi.h:1.39	Tue Nov 14 07:24:32 2006
+++ gsl/vcl/unx/inc/salgdi.h	Wed Feb 28 06:00:32 2007
@@ -268,6 +268,10 @@
                                           FontSubsetInfo& rInfo,
                                           long* pDataLen );
     virtual void			FreeEmbedFontData( const void* pData, long nDataLen );
+    virtual void            GetGlyphWidths( ImplFontData* pFont,
+                                            bool bVertical,
+                                            std::vector< sal_Int32 >& rWidths,
+                                            std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc );
     virtual BOOL			GetGlyphBoundRect( long nIndex, Rectangle& );
     virtual BOOL			GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
     virtual SalLayout*		GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
Index: gsl/vcl/unx/source/gdi/pspgraphics.cxx
diff -u gsl/vcl/unx/source/gdi/pspgraphics.cxx:1.22 gsl/vcl/unx/source/gdi/pspgraphics.cxx:1.22.94.1
--- gsl/vcl/unx/source/gdi/pspgraphics.cxx:1.22	Tue Nov 14 07:25:26 2006
+++ gsl/vcl/unx/source/gdi/pspgraphics.cxx	Wed Feb 28 06:00:33 2007
@@ -1009,6 +1009,22 @@
     return PspGraphics::DoGetFontEncodingVector( aFont, pNonEncoded );
 }
 
+//--------------------------------------------------------------------------
+
+void PspGraphics::GetGlyphWidths( ImplFontData* pFont,
+                                  bool bVertical,
+                                  std::vector< sal_Int32 >& rWidths,
+                                  std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc )
+{
+    // in this context the pFont->GetFontId() is a valid PSP
+    // font since they are the only ones left after the PDF
+    // export has filtered its list of subsettable fonts (for
+    // which this method was created). The correct way would
+    // be to have the GlyphCache search for the ImplFontData pFont
+    psp::fontID aFont = pFont->GetFontId();
+    PspGraphics::DoGetGlyphWidths( aFont, bVertical, rWidths, rUnicodeEnc );
+}
+
 
 // static helpers of PspGraphics
 
@@ -1135,6 +1151,14 @@
     return rMgr.getEncodingMap( aFont, pNonEncoded );
 }
 
+void PspGraphics::DoGetGlyphWidths( psp::fontID aFont,
+                                    bool bVertical,
+                                    std::vector< sal_Int32 >& rWidths,
+                                    std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc )
+{
+    psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
+    rMgr.getGlyphWidths( aFont, bVertical, rWidths, rUnicodeEnc );
+}
 // ----------------------------------------------------------------------------
 
 FontWidth PspGraphics::ToFontWidth (psp::width::type eWidth)
Index: gsl/vcl/unx/source/gdi/salgdi3.cxx
diff -u gsl/vcl/unx/source/gdi/salgdi3.cxx:1.143 gsl/vcl/unx/source/gdi/salgdi3.cxx:1.143.68.1
--- gsl/vcl/unx/source/gdi/salgdi3.cxx:1.143	Thu Dec 21 04:05:00 2006
+++ gsl/vcl/unx/source/gdi/salgdi3.cxx	Wed Feb 28 06:00:33 2007
@@ -1468,4 +1468,20 @@
 #endif
 }
 
+//--------------------------------------------------------------------------
+
+void X11SalGraphics::GetGlyphWidths( ImplFontData* pFont,
+                                   bool bVertical,
+                                   std::vector< sal_Int32 >& rWidths,
+                                   std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc )
+{
+    // in this context the pFont->GetFontId() is a valid PSP
+    // font since they are the only ones left after the PDF
+    // export has filtered its list of subsettable fonts (for
+    // which this method was created). The correct way would
+    // be to have the GlyphCache search for the ImplFontData pFont
+    psp::fontID aFont = pFont->GetFontId();
+    PspGraphics::DoGetGlyphWidths( aFont, bVertical, rWidths, rUnicodeEnc );
+}
+
 // ===========================================================================
Index: gsl/vcl/unx/source/gdi/xlfd_extd.cxx
diff -u gsl/vcl/unx/source/gdi/xlfd_extd.cxx:1.28 gsl/vcl/unx/source/gdi/xlfd_extd.cxx:1.28.172.1
--- gsl/vcl/unx/source/gdi/xlfd_extd.cxx:1.28	Sun Sep 17 05:40:37 2006
+++ gsl/vcl/unx/source/gdi/xlfd_extd.cxx	Wed Feb 28 06:00:33 2007
@@ -78,6 +78,11 @@
     return pEntry;
 }
 
+sal_IntPtr ImplX11FontData::GetFontId() const
+{
+    return reinterpret_cast<sal_IntPtr>(&mrXlfd);
+}
+
 // --------------------------------------------------------------------------
 //
 //  classes for Xlfd handling that contain more than a single encoding.
Index: gsl/vcl/unx/source/gdi/xlfd_extd.hxx
diff -u gsl/vcl/unx/source/gdi/xlfd_extd.hxx:1.14 gsl/vcl/unx/source/gdi/xlfd_extd.hxx:1.14.538.1
--- gsl/vcl/unx/source/gdi/xlfd_extd.hxx:1.14	Fri Sep  9 06:09:55 2005
+++ gsl/vcl/unx/source/gdi/xlfd_extd.hxx	Wed Feb 28 06:00:33 2007
@@ -274,6 +274,7 @@
     const ExtendedXlfd&     GetExtendedXlfd() const { return mrXlfd; }
     virtual ImplFontData*   Clone() const           { return new ImplX11FontData( *this ); }
     virtual ImplFontEntry*  CreateFontInstance( ImplFontSelectData& ) const;
+    virtual sal_IntPtr      GetFontId() const;
 
     static bool             CheckFontData( const ImplFontData& r ) { return r.CheckMagic( X11IFD_MAGIC ); }
 };
Index: gsl/vcl/win/inc/salgdi.h
diff -u gsl/vcl/win/inc/salgdi.h:1.24 gsl/vcl/win/inc/salgdi.h:1.24.80.1
--- gsl/vcl/win/inc/salgdi.h:1.24	Mon Dec  4 08:40:48 2006
+++ gsl/vcl/win/inc/salgdi.h	Fri Mar  2 07:36:01 2007
@@ -82,6 +82,8 @@
 
     virtual ImplFontData*   Clone() const;
     virtual ImplFontEntry*  CreateFontInstance( ImplFontSelectData& ) const;
+    virtual sal_IntPtr      GetFontId() const;
+    void                    SetFontId( sal_IntPtr nId ) { mnId = nId; }
     void                    UpdateFromHDC( HDC );
 
     bool                    HasChar( sal_uInt32 cChar ) const;
@@ -95,8 +97,15 @@
     bool                    AliasSymbolsLow() const     { return mbAliasSymbolsLow; }
 
     ImplFontCharMap*        GetImplFontCharMap();
-
+    std::map< sal_Unicode,sal_Int32>* GetEncodingVector() const { return mpEncodingVector; }
+    void SetEncodingVector( std::map< sal_Unicode,sal_Int32>* pNewVec )
+    {
+        if( mpEncodingVector )
+            delete mpEncodingVector;
+        mpEncodingVector = pNewVec;
+    }
 private:
+    sal_IntPtr              mnId;
     bool                    mbDisableGlyphApi;
     bool                    mbHasKoreanRange;
     bool                    mbHasCJKSupport;
@@ -110,7 +119,7 @@
     WIN_BYTE                mnPitchAndFamily;
     bool                    mbAliasSymbolsHigh;
     bool                    mbAliasSymbolsLow;
-
+    std::map< sal_Unicode,sal_Int32>* mpEncodingVector;
 private:
     void                    ReadCmapTable( HDC );
     void                    ReadOs2Table( HDC );
@@ -171,6 +180,8 @@
 	BOOL					mbWindow;			// is Window
 	BOOL					mbScreen;			// is Screen compatible
 	BOOL					mbXORMode;			// _every_ output with RasterOp XOR
+    
+    HFONT                   ImplDoSetFont( ImplFontSelectData* i_pFont, float& o_rFontScale, HFONT& o_rOldFont );
 
 public:
     WinSalGraphics();
@@ -332,6 +343,10 @@
                                           long* pDataLen );
     // frees the font data again
     virtual void			FreeEmbedFontData( const void* pData, long nDataLen );
+    virtual void            GetGlyphWidths( ImplFontData* pFont,
+                                            bool bVertical,
+                                            std::vector< sal_Int32 >& rWidths,
+                                            std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc );
 
     virtual BOOL                    GetGlyphBoundRect( long nIndex, Rectangle& );
     virtual BOOL                    GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
Index: gsl/vcl/win/source/gdi/salgdi3.cxx
diff -u gsl/vcl/win/source/gdi/salgdi3.cxx:1.85 gsl/vcl/win/source/gdi/salgdi3.cxx:1.85.32.1
--- gsl/vcl/win/source/gdi/salgdi3.cxx:1.85	Thu Jan 25 03:26:50 2007
+++ gsl/vcl/win/source/gdi/salgdi3.cxx	Fri Mar  2 07:36:02 2007
@@ -299,6 +299,7 @@
     bool                mbImplSalCourierScalable;
     bool                mbImplSalCourierNew;
     bool                mbPrinter;
+    int                 mnFontCount;
 };
 
 // =======================================================================
@@ -654,7 +655,7 @@
 
 // -----------------------------------------------------------------------
 
-static ImplFontData* ImplLogMetricToDevFontDataA( const ENUMLOGFONTEXA* pLogFont,
+static ImplWinFontData* ImplLogMetricToDevFontDataA( const ENUMLOGFONTEXA* pLogFont,
                                          const NEWTEXTMETRICA* pMetric,
                                          DWORD nFontType )
 {
@@ -662,7 +663,7 @@
     if ( nFontType & RASTER_FONTTYPE )
         nHeight = pMetric->tmHeight - pMetric->tmInternalLeading;
 
-    ImplFontData* pData = new ImplWinFontData(
+    ImplWinFontData* pData = new ImplWinFontData(
         WinFont2DevFontAttributes(*pLogFont, *pMetric, nFontType),
         nHeight,
         pLogFont->elfLogFont.lfCharSet,
@@ -673,7 +674,7 @@
 
 // -----------------------------------------------------------------------
 
-static ImplFontData* ImplLogMetricToDevFontDataW( const ENUMLOGFONTEXW* pLogFont,
+static ImplWinFontData* ImplLogMetricToDevFontDataW( const ENUMLOGFONTEXW* pLogFont,
                                          const NEWTEXTMETRICW* pMetric,
                                          DWORD nFontType )
 {
@@ -681,7 +682,7 @@
     if ( nFontType & RASTER_FONTTYPE )
         nHeight = pMetric->tmHeight - pMetric->tmInternalLeading;
 
-    ImplFontData* pData = new ImplWinFontData(
+    ImplWinFontData* pData = new ImplWinFontData(
         WinFont2DevFontAttributes(*pLogFont, *pMetric, nFontType),
         nHeight,
         pLogFont->elfLogFont.lfCharSet,
@@ -782,7 +783,9 @@
     mbHasKoreanRange( false ),
     mbHasCJKSupport( false ),
     mbAliasSymbolsLow( false ),
-    mbAliasSymbolsHigh( false )
+    mbAliasSymbolsHigh( false ),
+    mnId( 0 ),
+    mpEncodingVector( NULL )
 {
     SetBitmapSize( 0, nHeight );
 
@@ -816,6 +819,14 @@
 
     if( mpUnicodeMap )
         mpUnicodeMap->DeReference();
+    delete mpEncodingVector;
+}
+
+// -----------------------------------------------------------------------
+
+sal_IntPtr ImplWinFontData::GetFontId() const
+{
+    return mnId;
 }
 
 // -----------------------------------------------------------------------
@@ -1221,31 +1232,9 @@
 
 // -----------------------------------------------------------------------
 
-USHORT WinSalGraphics::SetFont( ImplFontSelectData* pFont, int nFallbackLevel )
+HFONT WinSalGraphics::ImplDoSetFont( ImplFontSelectData* i_pFont, float& o_rFontScale, HFONT& o_rOldFont )
 {
-    // return early if there is no new font
-    if( !pFont )
-    {
-        // deselect still active font
-        if( mhDefFont )
-            ::SelectFont( mhDC, mhDefFont );
-        // release no longer referenced font handles
-        for( int i = nFallbackLevel; i < MAX_FALLBACK; ++i )
-        {
-            if( mhFonts[i] )
-                ::DeleteFont( mhFonts[i] );
-            mhFonts[ i ] = 0;
-        }
-        mhDefFont = 0;
-        return 0;
-    }
-
-    DBG_ASSERT( pFont->mpFontData, "WinSalGraphics mpFontData==NULL");
-    mpWinFontEntry[ nFallbackLevel ] = reinterpret_cast<ImplWinFontEntry*>( pFont->mpFontEntry );
-    mpWinFontData[ nFallbackLevel ] = static_cast<ImplWinFontData*>( pFont->mpFontData );
-
     HFONT hNewFont = 0;
-    HFONT hOldFont;
 
     HDC hdcScreen = 0;
     if( mbVirDev )
@@ -1255,15 +1244,15 @@
     if( aSalShlData.mbWNT )
     {
         LOGFONTW aLogFont;
-        ImplGetLogFontFromFontSelect( mhDC, pFont, aLogFont, true );
+        ImplGetLogFontFromFontSelect( mhDC, i_pFont, aLogFont, true );
 
         // on the display we prefer Courier New when Courier is a
         // bitmap only font and we need to stretch or rotate it
         if( mbScreen
-        &&  (pFont->mnWidth != 0
-          || pFont->mnOrientation != 0
-          || pFont->mpFontData == NULL
-          || (pFont->mpFontData->GetHeight() != pFont->mnHeight))
+        &&  (i_pFont->mnWidth != 0
+          || i_pFont->mnOrientation != 0
+          || i_pFont->mpFontData == NULL
+          || (i_pFont->mpFontData->GetHeight() != i_pFont->mnHeight))
         && !bImplSalCourierScalable
         && bImplSalCourierNew
         && (ImplSalWICompareAscii( aLogFont.lfFaceName, "Courier" ) == 0) )
@@ -1272,12 +1261,12 @@
         // limit font requests to MAXFONTHEIGHT
         // TODO: share MAXFONTHEIGHT font instance
         if( -aLogFont.lfHeight <= MAXFONTHEIGHT )
-            mfFontScale = 1.0;
+            o_rFontScale = 1.0;
         else
         {
-            mfFontScale = -aLogFont.lfHeight / (float)MAXFONTHEIGHT;
+            o_rFontScale = -aLogFont.lfHeight / (float)MAXFONTHEIGHT;
             aLogFont.lfHeight = -MAXFONTHEIGHT;
-            aLogFont.lfWidth = static_cast<LONG>( aLogFont.lfWidth / mfFontScale );
+            aLogFont.lfWidth = static_cast<LONG>( aLogFont.lfWidth / o_rFontScale );
         }
 
         hNewFont = ::CreateFontIndirectW( &aLogFont );
@@ -1288,7 +1277,7 @@
             // "PRB: Fonts Not Drawn Antialiased on Device Context for DirectDraw Surface"
             SelectFont( hdcScreen, SelectFont( hdcScreen , hNewFont ) );
         }
-        hOldFont = ::SelectFont( mhDC, hNewFont );
+        o_rOldFont = ::SelectFont( mhDC, hNewFont );
 
         TEXTMETRICW aTextMetricW;
         if( !::GetTextMetricsW( mhDC, &aTextMetricW ) )
@@ -1310,15 +1299,15 @@
              // TODO: get them from somewhere else
             mpLogFont = new LOGFONTA;
         LOGFONTA& aLogFont = *mpLogFont;
-        ImplGetLogFontFromFontSelect( mhDC, pFont, aLogFont, true );
+        ImplGetLogFontFromFontSelect( mhDC, i_pFont, aLogFont, true );
 
         // on the display we prefer Courier New when Courier is a
         // bitmap only font and we need to stretch or rotate it
         if( mbScreen
-        &&  (pFont->mnWidth != 0
-          || pFont->mnOrientation != 0
-          || pFont->mpFontData == NULL
-          || (pFont->mpFontData->GetHeight() != pFont->mnHeight))
+        &&  (i_pFont->mnWidth != 0
+          || i_pFont->mnOrientation != 0
+          || i_pFont->mpFontData == NULL
+          || (i_pFont->mpFontData->GetHeight() != i_pFont->mnHeight))
         && !bImplSalCourierScalable
         && bImplSalCourierNew
         && (stricmp( aLogFont.lfFaceName, "Courier" ) == 0) )
@@ -1327,12 +1316,12 @@
         // limit font requests to MAXFONTHEIGHT to work around driver problems
         // TODO: share MAXFONTHEIGHT font instance
         if( -aLogFont.lfHeight <= MAXFONTHEIGHT )
-            mfFontScale = 1.0;
+            o_rFontScale = 1.0;
         else
         {
-            mfFontScale = -aLogFont.lfHeight / (float)MAXFONTHEIGHT;
+            o_rFontScale = -aLogFont.lfHeight / (float)MAXFONTHEIGHT;
             aLogFont.lfHeight = -MAXFONTHEIGHT;
-            aLogFont.lfWidth = static_cast<LONG>( aLogFont.lfWidth / mfFontScale );
+            aLogFont.lfWidth = static_cast<LONG>( aLogFont.lfWidth / o_rFontScale );
         }
 
         hNewFont = ::CreateFontIndirectA( &aLogFont );
@@ -1343,7 +1332,7 @@
             // "PRB: Fonts Not Drawn Antialiased on Device Context for DirectDraw Surface"
             ::SelectFont( hdcScreen, ::SelectFont( hdcScreen , hNewFont ) );
         }
-        hOldFont = ::SelectFont( mhDC, hNewFont );
+        o_rOldFont = ::SelectFont( mhDC, hNewFont );
 
         TEXTMETRICA aTextMetricA;
         // when the font doesn't work try a replacement
@@ -1363,6 +1352,35 @@
 
     if( hdcScreen )
         ::ReleaseDC( NULL, hdcScreen );
+    
+    return hNewFont;
+}
+
+USHORT WinSalGraphics::SetFont( ImplFontSelectData* pFont, int nFallbackLevel )
+{
+    // return early if there is no new font
+    if( !pFont )
+    {
+        // deselect still active font
+        if( mhDefFont )
+            ::SelectFont( mhDC, mhDefFont );
+        // release no longer referenced font handles
+        for( int i = nFallbackLevel; i < MAX_FALLBACK; ++i )
+        {
+            if( mhFonts[i] )
+                ::DeleteFont( mhFonts[i] );
+            mhFonts[ i ] = 0;
+        }
+        mhDefFont = 0;
+        return 0;
+    }
+
+    DBG_ASSERT( pFont->mpFontData, "WinSalGraphics mpFontData==NULL");
+    mpWinFontEntry[ nFallbackLevel ] = reinterpret_cast<ImplWinFontEntry*>( pFont->mpFontEntry );
+    mpWinFontData[ nFallbackLevel ] = static_cast<ImplWinFontData*>( pFont->mpFontData );
+
+    HFONT hOldFont = 0;
+    HFONT hNewFont = ImplDoSetFont( pFont, mfFontScale, hOldFont );
 
     if( !mhDefFont )
     {
@@ -1747,7 +1765,8 @@
             if( (nFontType & RASTER_FONTTYPE) && !(nFontType & DEVICE_FONTTYPE) )
                 return 1;
 
-        ImplFontData* pData = ImplLogMetricToDevFontDataA( pLogFont, &(pMetric->ntmTm), nFontType );
+        ImplWinFontData* pData = ImplLogMetricToDevFontDataA( pLogFont, &(pMetric->ntmTm), nFontType );
+        pData->SetFontId( sal_IntPtr( pInfo->mnFontCount++ ) );
 
         // prefer the system character set, so that we get as much as
         // possible important characters. In the other case we could only
@@ -1802,7 +1821,8 @@
             if( (nFontType & RASTER_FONTTYPE) && !(nFontType & DEVICE_FONTTYPE) )
                 return 1;
 
-        ImplFontData* pData = ImplLogMetricToDevFontDataW( pLogFont, &(pMetric->ntmTm), nFontType );
+        ImplWinFontData* pData = ImplLogMetricToDevFontDataW( pLogFont, &(pMetric->ntmTm), nFontType );
+        pData->SetFontId( sal_IntPtr( pInfo->mnFontCount++ ) );
 
         // knowing Courier to be scalable is nice
         if( pInfo->mbCourier )
@@ -2070,9 +2090,10 @@
         aDFS.maMapName = aFontName;
     */
 
-    ImplFontData* pFontData = new ImplWinFontData( aDFA, 0,
+    ImplWinFontData* pFontData = new ImplWinFontData( aDFA, 0,
         sal::static_int_cast<WIN_BYTE>(nPreferedCharSet),
         sal::static_int_cast<WIN_BYTE>(TMPF_VECTOR|TMPF_TRUETYPE) );
+    pFontData->SetFontId( reinterpret_cast<sal_IntPtr>(pFontData) );
     pFontList->Add( pFontData );
     return true;
 }
@@ -2136,6 +2157,7 @@
     aInfo.mpLogFontW    = NULL;
     aInfo.mbCourier     = false;
     aInfo.mbPrinter     = mbPrinter;
+    aInfo.mnFontCount   = 0;
     if ( !mbPrinter )
     {
         aInfo.mbImplSalCourierScalable  = false;
@@ -2505,7 +2527,9 @@
 
     // TODO: much better solution: move SetFont and restoration of old font to caller
     ScopedFont aOldFont(*this);
-    SetFont( &aIFSD, 0 );
+    float fScale = 0.0;
+    HFONT hOldFont = 0;
+    ImplDoSetFont( &aIFSD, fScale, hOldFont );
 
 #if OSL_DEBUG_LEVEL > 1
     // get font metrics
@@ -2691,22 +2715,123 @@
         return NULL;
 
     // fill the encoding vector
-    typedef std::map< sal_Unicode,sal_Int32> Code2Int;
-    Code2Int& rMap = *new Code2Int;
-#if 0
-    // TODO: get correct encoding vector
-    ImplWinFontData* pWinFontData = reinterpret_cast<ImplWinFontData*>(pFont);
-    GLYPHSET aGlyphSet;
-    aGlyphSet.cbThis = sizeof(aGlyphSet);
-    DWORD aW = ::GetFontUnicodeRanges( mhDC, &aGlyphSet);
-#else
-    for( sal_Unicode i = 32; i < 256; ++i )
-        rMap[i] = i;
+    // currently no nonencoded vector
     if( pNonEncoded )
         *pNonEncoded = NULL;
-#endif
 
-    return &rMap;
+    ImplWinFontData* pWinFontData = static_cast<ImplWinFontData*>(pFont);
+    std::map< sal_Unicode,sal_Int32>* pEncoding = pWinFontData->GetEncodingVector();
+    if( pEncoding == NULL )
+    {
+        pEncoding = new std::map< sal_Unicode,sal_Int32>();
+        pWinFontData->SetEncodingVector( pEncoding );
+        #if 0
+        // TODO: get correct encoding vector
+        GLYPHSET aGlyphSet;
+        aGlyphSet.cbThis = sizeof(aGlyphSet);
+        DWORD aW = ::GetFontUnicodeRanges( mhDC, &aGlyphSet);
+        #else
+        for( sal_Unicode i = 32; i < 256; ++i )
+            (*pEncoding)[i] = i;
+        #endif
+    }
+
+    return pEncoding;
+}
+
+//--------------------------------------------------------------------------
+
+void WinSalGraphics::GetGlyphWidths( ImplFontData* pFont,
+                                     bool bVertical,
+                                     std::vector< sal_Int32 >& rWidths,
+                                     std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc )
+{
+    // create matching ImplFontSelectData
+    // we need just enough to get to the font file data
+    ImplFontSelectData aIFSD( *pFont, Size(0,1000), 0, false );
+
+    // TODO: much better solution: move SetFont and restoration of old font to caller
+    ScopedFont aOldFont(*this);
+    
+    float fScale = 0.0;
+    HFONT hOldFont = 0;
+    ImplDoSetFont( &aIFSD, fScale, hOldFont );
+    
+    if( pFont->IsSubsettable() )
+    {
+        // get raw font file data
+        DWORD nFontSize1 = ::GetFontData( mhDC, 0, 0, NULL, 0 );
+        if( nFontSize1 == GDI_ERROR )
+            return;
+        ScopedCharArray xRawFontData(new char[ nFontSize1 ]);
+        DWORD nFontSize2 = ::GetFontData( mhDC, 0, 0, (void*)xRawFontData.get(), nFontSize1 );
+        if( nFontSize1 != nFontSize2 )
+            return;
+
+        // open font file
+        sal_uInt32 nFaceNum = 0;
+        if( !*xRawFontData.get() )  // TTC candidate
+            nFaceNum = ~0U;  // indicate "TTC font extracts only"
+    
+        ScopedTrueTypeFont aSftTTF;
+        int nRC = aSftTTF.open( xRawFontData.get(), nFontSize1, nFaceNum );
+        if( nRC != SF_OK )
+            return;
+    
+        int nGlyphs = GetTTGlyphCount( aSftTTF.get() );
+        if( nGlyphs > 0 )
+        {
+            rWidths.resize(nGlyphs);
+            std::vector<sal_uInt16> aGlyphIds(nGlyphs);
+            for( int i = 0; i < nGlyphs; i++ )
+                aGlyphIds[i] = sal_uInt16(i);
+            TTSimpleGlyphMetrics* pMetrics = ::GetTTSimpleGlyphMetrics( aSftTTF.get(),
+                                                                        &aGlyphIds[0],
+                                                                        nGlyphs,
+                                                                        bVertical ? 1 : 0 );
+            if( pMetrics )
+            {
+                for( int i = 0; i< nGlyphs; i++ )
+                    rWidths[i] = pMetrics[i].adv;
+                free( pMetrics );
+                rUnicodeEnc.clear();
+            }
+            ImplWinFontData* pWinFont = static_cast<ImplWinFontData*>(pFont);
+            ImplFontCharMap* pMap = pWinFont->GetImplFontCharMap();
+			DBG_ASSERT( pMap && pMap->GetCharCount(), "no map" );
+
+			int nCharCount = pMap->GetCharCount();
+            sal_uInt32 nChar = pMap->GetFirstChar();
+			for( int i = 0; i < nCharCount; i++ )
+            {
+                if( nChar < 0x00010000 )
+                {
+                    sal_uInt16 nGlyph = ::MapChar( aSftTTF.get(),
+                                                   static_cast<sal_uInt16>(nChar),
+                                                   bVertical ? 1 : 0 );
+                    if( nGlyph )
+                        rUnicodeEnc[ static_cast<sal_Unicode>(nChar) ] = nGlyph;
+                }
+				nChar = pMap->GetNextChar( nChar );
+            }
+        }
+    }
+    else if( pFont->IsEmbeddable() )
+    {
+        // get individual character widths
+        rWidths.clear();
+        rUnicodeEnc.clear();
+        rWidths.reserve( 224 );
+        for( sal_Unicode i = 32; i < 256; ++i )
+        {
+            int nCharWidth = 0;
+            if( ::GetCharWidth32W( mhDC, i, i, &nCharWidth ) )
+            {
+                rUnicodeEnc[ i ] = rWidths.size();
+                rWidths.push_back( nCharWidth );
+            }
+        }
+    }    
 }
 
 //--------------------------------------------------------------------------


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v
retrieving revision 1.936
retrieving revision 1.937
diff -u -r1.936 -r1.937
--- openoffice.org.spec	5 Apr 2007 14:32:19 -0000	1.936
+++ openoffice.org.spec	6 Apr 2007 09:54:49 -0000	1.937
@@ -162,6 +162,7 @@
 Patch94: openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch
 Patch95: workspace.sixtyfour11.patch
 Patch96: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
+Patch97: workspace.glyphadv.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -964,7 +965,7 @@
 %patch2  -p1 -b .rh151357.setlangtolocale.patch
 %patch3  -p1 -b .rh151356.usetwodotzeropath.patch
 %patch4  -p1 -b .rh156067.noversionedicons.patch
-%patch5  -p1 -b .rhXXXXXX.redhatcolours.extras.patch
+%patch5  -p1
 %if %{gtkprintui}
 %patch6  -p1 -b .rh127576.gtkunixprintdialog.patch
 %endif
@@ -1058,6 +1059,7 @@
 %patch94 -p1 -b .ooo74451.sw.typemismatch.patch
 %patch95 -p1 -b .workspace.sixtyfour11.patch
 %patch96 -p1 -b .ooo75167.framework.workspacerestore.patch
+%patch97 -p1 -b .workspace.glyphadv.patch
 
 tar xzf %{SOURCE1}
 
@@ -2584,6 +2586,7 @@
 
 %changelog
 * Thu Apr 05 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.19
+- Resolves: rhbz#235341 workspace.glyphadv.patch
 - add some valgrind fixes
 
 * Thu Mar 29 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.18



From fedora-cvs-commits at redhat.com  Fri Apr  6 09:55:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 05:55:01 -0400
Subject: rpms/openoffice.org/devel workspace.glyphadv.patch, NONE,
	1.1 openoffice.org.spec, 1.1156, 1.1157
Message-ID: <200704060955.l369t1vt016436@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.glyphadv.patch 
Log Message:
Resolves: rhbz#235341 workspace.glyphadv.patch

workspace.glyphadv.patch:
 psprint/inc/psprint/fontmanager.hxx        |    5 
 psprint/source/fontmanager/fontmanager.cxx |   72 ++++
 psprint/source/fontsubset/sft.c            |    5 
 psprint/source/fontsubset/sft.h            |    5 
 vcl/inc/outfont.hxx                        |    3 
 vcl/inc/salgdi.hxx                         |    9 
 vcl/source/gdi/makefile.mk                 |    2 
 vcl/source/gdi/pdffontcache.cxx            |   85 +++++
 vcl/source/gdi/pdffontcache.hxx            |   92 +++++
 vcl/source/gdi/pdfwriter_impl.cxx          |  476 +++++++++++++++++------------
 vcl/source/gdi/pdfwriter_impl.hxx          |   29 +
 vcl/unx/inc/pspgraphics.h                  |    9 
 vcl/unx/inc/salgdi.h                       |    4 
 vcl/unx/source/gdi/pspgraphics.cxx         |   24 +
 vcl/unx/source/gdi/salgdi3.cxx             |   16 
 vcl/unx/source/gdi/xlfd_extd.cxx           |    5 
 vcl/unx/source/gdi/xlfd_extd.hxx           |    1 
 vcl/win/inc/salgdi.h                       |   19 +
 vcl/win/source/gdi/salgdi3.cxx             |  251 +++++++++++----
 19 files changed, 845 insertions(+), 267 deletions(-)

--- NEW FILE workspace.glyphadv.patch ---
Index: gsl/psprint/inc/psprint/fontmanager.hxx
diff -u gsl/psprint/inc/psprint/fontmanager.hxx:1.31 gsl/psprint/inc/psprint/fontmanager.hxx:1.31.72.1
--- gsl/psprint/inc/psprint/fontmanager.hxx:1.31	Mon Jun 19 03:23:01 2006
+++ gsl/psprint/inc/psprint/fontmanager.hxx	Wed Feb 28 05:59:08 2007
@@ -651,6 +651,11 @@
                            int nGlyphs,
                            bool bVertical = false
                            );
+    void getGlyphWidths( fontID nFont,
+                         bool bVertical,
+                         std::vector< sal_Int32 >& rWidths,
+                         std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc );
+
 
     // font administration functions
 
Index: gsl/psprint/source/fontmanager/fontmanager.cxx
diff -u gsl/psprint/source/fontmanager/fontmanager.cxx:1.73 gsl/psprint/source/fontmanager/fontmanager.cxx:1.73.46.2
--- gsl/psprint/source/fontmanager/fontmanager.cxx:1.73	Sat Sep 16 05:34:04 2006
+++ gsl/psprint/source/fontmanager/fontmanager.cxx	Mon Mar  5 07:13:28 2007
@@ -3146,11 +3146,11 @@
             effectiveCode |= bVertical ? 1 << 16 : 0;
             ::std::hash_map< int, CharacterMetric >::const_iterator it =
                   pFont->m_pMetrics->m_aMetrics.find( effectiveCode );
-	    // if no vertical metrics are available assume rotated horizontal metrics
-	    if( bVertical && (it == pFont->m_pMetrics->m_aMetrics.end()) )
-                  it = pFont->m_pMetrics->m_aMetrics.find( code );
-	    // the character metrics are in it->second
-	    if( it != pFont->m_pMetrics->m_aMetrics.end() )
+            // if no vertical metrics are available assume rotated horizontal metrics
+            if( bVertical && (it == pFont->m_pMetrics->m_aMetrics.end()) )
+                it = pFont->m_pMetrics->m_aMetrics.find( code );
+            // the character metrics are in it->second
+            if( it != pFont->m_pMetrics->m_aMetrics.end() )
                 pArray[ code - minCharacter ] = it->second;
         }
     }
@@ -3639,7 +3639,7 @@
         }
         else
         {
-            DBG_ASSERT( !(pGlyphIDs[i] & 0xffff0000), "overlong glyph id" );
+            DBG_ASSERT( !(pGlyphIDs[i] & 0x007f0000), "overlong glyph id" );
             DBG_ASSERT( (int)pNewEncoding[i] < nGlyphs, "encoding wrong" );
             DBG_ASSERT( pEnc[pNewEncoding[i]] == 0 && pGID[pNewEncoding[i]] == 0, "duplicate encoded glyph" );
             pEnc[ pNewEncoding[i] ] = pNewEncoding[i];
@@ -3685,6 +3685,66 @@
     CloseTTFont( pTTFont );
 
     return bSuccess;
+}
+
+void PrintFontManager::getGlyphWidths( fontID nFont,
+                                       bool bVertical,
+                                       std::vector< sal_Int32 >& rWidths,
+                                       std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc )
+{
+    PrintFont* pFont = getFont( nFont );
+    if( !pFont ||
+        (pFont->m_eType != fonttype::TrueType && pFont->m_eType != fonttype::Type1) )
+        return;
+    if( pFont->m_eType == fonttype::TrueType )
+    {
+        TrueTypeFont* pTTFont = NULL;
+        TrueTypeFontFile* pTTFontFile = static_cast< TrueTypeFontFile* >(pFont);
+        ByteString aFromFile = getFontFile( pFont );
+        if( OpenTTFont( aFromFile.GetBuffer(), pTTFontFile->m_nCollectionEntry < 0 ? 0 : pTTFontFile->m_nCollectionEntry, &pTTFont ) != SF_OK )
+            return;
+        int nGlyphs = GetTTGlyphCount( pTTFont );
+        if( nGlyphs > 0 )
+        {
+            rWidths.resize(nGlyphs);
+            std::vector<sal_uInt16> aGlyphIds(nGlyphs);
+            for( int i = 0; i < nGlyphs; i++ )
+                aGlyphIds[i] = sal_uInt16(i);
+            TTSimpleGlyphMetrics* pMetrics = GetTTSimpleGlyphMetrics( pTTFont,
+                                                                      &aGlyphIds[0],
+                                                                      nGlyphs,
+                                                                      bVertical ? 1 : 0 );
+            if( pMetrics )
+            {
+                for( int i = 0; i< nGlyphs; i++ )
+                    rWidths[i] = pMetrics[i].adv;
+                free( pMetrics );
+                rUnicodeEnc.clear();
+            }
+        }
+        CloseTTFont( pTTFont );
+    }
+    else if( pFont->m_eType == fonttype::Type1 )
+    {
+        if( ! pFont->m_aEncodingVector.size() )
+            pFont->readAfmMetrics( getAfmFile( pFont ), m_pAtoms, true, true );
+        if( pFont->m_pMetrics )
+        {
+            rUnicodeEnc.clear();
+            rWidths.clear();
+            rWidths.reserve( pFont->m_pMetrics->m_aMetrics.size() );
+            for( std::hash_map< int, CharacterMetric >::const_iterator it = 
+                 pFont->m_pMetrics->m_aMetrics.begin();
+                 it != pFont->m_pMetrics->m_aMetrics.end(); ++it )
+            {
+                if( (it->first & 0x00010000) == 0 || bVertical )
+                {
+                    rUnicodeEnc[ sal_Unicode(it->first & 0x0000ffff) ] = sal_uInt32(rWidths.size());
+                    rWidths.push_back( it->second.width );
+                }
+            }
+        }
+    }
 }
 
 // -------------------------------------------------------------------------
Index: gsl/psprint/source/fontsubset/sft.c
diff -u gsl/psprint/source/fontsubset/sft.c:1.39 gsl/psprint/source/fontsubset/sft.c:1.39.40.1
--- gsl/psprint/source/fontsubset/sft.c:1.39	Fri Oct 13 01:28:20 2006
+++ gsl/psprint/source/fontsubset/sft.c	Wed Feb 28 05:59:09 2007
@@ -2553,6 +2553,11 @@
 
 #endif
 
+int GetTTGlyphCount( TrueTypeFont* ttf )
+{
+    return ttf->nglyphs;
+}
+
 TTSimpleGlyphMetrics *GetTTSimpleGlyphMetrics(TrueTypeFont *ttf, sal_uInt16 *glyphArray, int nGlyphs, int mode)
 {
     sal_uInt8* pTable;
Index: gsl/psprint/source/fontsubset/sft.h
diff -u gsl/psprint/source/fontsubset/sft.h:1.15 gsl/psprint/source/fontsubset/sft.h:1.15.72.1
--- gsl/psprint/source/fontsubset/sft.h:1.15	Mon Jun 19 03:25:17 2006
+++ gsl/psprint/source/fontsubset/sft.h	Wed Feb 28 05:59:10 2007
@@ -571,6 +571,11 @@
  */
     int CheckSymbolEncoding(TrueTypeFont* ttf);
     
+/**
+ * returns the number of glyphs in a font
+ */
+ int GetTTGlyphCount( TrueTypeFont* ttf );
+    
 /*- private definitions */ /*FOLD00*/
 
     struct _TrueTypeFont {
Index: gsl/vcl/inc/outfont.hxx
diff -u gsl/vcl/inc/outfont.hxx:1.23 gsl/vcl/inc/outfont.hxx:1.23.246.1
--- gsl/vcl/inc/outfont.hxx:1.23	Thu Jul 13 03:12:00 2006
+++ gsl/vcl/inc/outfont.hxx	Wed Feb 28 06:00:30 2007
@@ -152,7 +152,8 @@
 
     virtual int             GetHeight() const           { return mnHeight; }
     virtual int             GetWidth() const            { return mnWidth; }
-    virtual sal_IntPtr      GetFontId() const           { return 0; }
+    virtual sal_IntPtr      GetFontId() const = 0;
+    int                     GetFontMagic() const        { return mnMagic; }
     bool                    IsScalable() const          { return (mnHeight == 0); }
     bool                    CheckMagic( int n ) const   { return (n == mnMagic); }
     ImplFontData*           GetNextFace() const         { return mpNext; }
Index: gsl/vcl/inc/salgdi.hxx
diff -u gsl/vcl/inc/salgdi.hxx:1.36 gsl/vcl/inc/salgdi.hxx:1.36.94.1
--- gsl/vcl/inc/salgdi.hxx:1.36	Tue Nov 14 07:22:46 2006
+++ gsl/vcl/inc/salgdi.hxx	Wed Feb 28 06:00:30 2007
@@ -296,6 +296,15 @@
                                           long* pDataLen ) = 0;
     // frees the font data again
     virtual void			FreeEmbedFontData( const void* pData, long nDataLen ) = 0;
+    
+    // get the same widths as in CreateFontSubset and GetEmbedFontData
+    // in case of an embeddable font also fill the mapping
+    // between unicode and glyph id
+    // leave widths vector and mapping untouched in case of failure
+    virtual void            GetGlyphWidths( ImplFontData* pFont,
+                                            bool bVertical,
+                                            std::vector< sal_Int32 >& rWidths,
+                                            std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc ) = 0;
 
     virtual BOOL                    GetGlyphBoundRect( long nIndex, Rectangle& ) = 0;
     virtual BOOL                    GetGlyphOutline( long nIndex, basegfx::B2DPolyPolygon& ) = 0;
Index: gsl/vcl/source/gdi/makefile.mk
diff -u gsl/vcl/source/gdi/makefile.mk:1.29 gsl/vcl/source/gdi/makefile.mk:1.29.18.2
--- gsl/vcl/source/gdi/makefile.mk:1.29	Tue Feb  6 06:18:36 2007
+++ gsl/vcl/source/gdi/makefile.mk	Mon Mar  5 06:28:12 2007
@@ -108,6 +108,7 @@
 			$(SLO)$/base14.obj		\
 			$(SLO)$/pdfwriter.obj	\
 			$(SLO)$/pdfwriter_impl.obj	\
+            $(SLO)$/pdffontcache.obj\
 			$(SLO)$/sallayout.obj		\
 			$(SLO)$/salgdilayout.obj	\
 			$(SLO)$/extoutdevdata.obj	\
@@ -128,6 +129,7 @@
 					$(SLO)$/impgraph.obj	\
                     $(SLO)$/metric.obj		\
                     $(SLO)$/pdfwriter_impl.obj	\
+                    $(SLO)$/pdffontcache.obj\
                     $(SLO)$/fontcfg.obj		\
 					$(SLO)$/bmpconv.obj		\
 					$(SLO)$/pdfextoutdevdata.obj	\
Index: gsl/vcl/source/gdi/pdffontcache.cxx
diff -u /dev/null gsl/vcl/source/gdi/pdffontcache.cxx:1.1.2.3
--- /dev/null	Fri Apr  6 02:48:47 2007
+++ gsl/vcl/source/gdi/pdffontcache.cxx	Fri Mar  2 08:22:22 2007
@@ -0,0 +1,85 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile$
+ *
+ *  $Revision$
+ *
+ *  last change: $Author$ $Date$
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+#include "precompiled_vcl.hxx"
+
+#include "pdffontcache.hxx"
+#include "salgdi.hxx"
+#include "outfont.hxx"
+#include "sallayout.hxx"
+
+using namespace vcl;
+
+PDFFontCache::FontIdentifier::FontIdentifier( ImplFontData* pFont, bool bVertical ) :
+    m_nFontId( pFont->GetFontId() ),
+    m_nMagic( pFont->GetFontMagic() ),
+    m_bVertical( bVertical )
+{
+}
+
+PDFFontCache::FontData& PDFFontCache::getFont( ImplFontData* pFont, bool bVertical )
+{
+    FontIdentifier aId( pFont, bVertical );
+    FontToIndexMap::iterator it = m_aFontToIndex.find( aId );
+    if( it != m_aFontToIndex.end() )
+        return m_aFonts[ it->second ];
+    m_aFontToIndex[ aId ] = sal_uInt32(m_aFonts.size());
+    m_aFonts.push_back( FontData() );
+    return m_aFonts.back();
+}
+
+sal_Int32 PDFFontCache::getGlyphWidth( ImplFontData* pFont, sal_uInt32 nGlyph, bool bVertical, SalGraphics* pGraphics )
+{
+    sal_Int32 nWidth = 0;
+    FontData& rFontData( getFont( pFont, bVertical ) );
+    if( rFontData.m_nWidths.empty() )
+    {
+        pGraphics->GetGlyphWidths( pFont, bVertical, rFontData.m_nWidths, rFontData.m_aGlyphIdToIndex );
+    }
+    if( ! rFontData.m_nWidths.empty() )
+    {
+        sal_uInt32 nIndex = nGlyph;
+        if( (nGlyph & GF_ISCHAR) != 0 )
+        {
+            std::map<sal_Unicode,sal_uInt32>::const_iterator it =
+                rFontData.m_aGlyphIdToIndex.find( sal_Unicode(nGlyph & GF_IDXMASK) );
+                nIndex = (it != rFontData.m_aGlyphIdToIndex.end()) ? it->second : 0;
+        }
+        nIndex &= GF_IDXMASK;
+        if( nIndex < rFontData.m_nWidths.size() )
+            nWidth = rFontData.m_nWidths[ nIndex ];
+    }
+    return nWidth;
+}
Index: gsl/vcl/source/gdi/pdffontcache.hxx
diff -u /dev/null gsl/vcl/source/gdi/pdffontcache.hxx:1.1.2.2
--- /dev/null	Fri Apr  6 02:48:47 2007
+++ gsl/vcl/source/gdi/pdffontcache.hxx	Mon Mar  5 06:28:12 2007
@@ -0,0 +1,92 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile$
+ *
+ *  $Revision$
+ *
+ *  last change: $Author$ $Date$
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+#ifndef VCL_PDFFONTCACHE_HXX
+#define VCL_PDFFONTCACHE_HXX
+
+#include <sal/types.h>
+
+#include <vector>
+#include <map>
+
+class ImplFontData;
+class SalGraphics;
+
+namespace vcl
+{
+    class PDFFontCache
+    {
+        struct FontIdentifier
+        {
+            sal_IntPtr      m_nFontId;
+            int             m_nMagic;
+            bool            m_bVertical;
+            
+            FontIdentifier( ImplFontData*, bool bVertical );
+            FontIdentifier() : m_nFontId(0), m_nMagic(0), m_bVertical( false ) {}
+            
+            bool operator==( const FontIdentifier& rRight ) const
+            {
+                return m_nFontId == rRight.m_nFontId &&
+                       m_nMagic == rRight.m_nMagic &&
+                       m_bVertical == rRight.m_bVertical;
+            }
+            bool operator<( const FontIdentifier& rRight ) const
+            {
+                return m_nFontId < rRight.m_nFontId ||
+                       m_nMagic < rRight.m_nMagic ||
+                       m_bVertical < rRight.m_bVertical;
+            }
+        };
+        struct FontData
+        {
+            std::vector< sal_Int32 >                m_nWidths;
+            std::map< sal_Unicode, sal_uInt32 >     m_aGlyphIdToIndex;
+        };
+        typedef std::map< FontIdentifier, sal_uInt32 > FontToIndexMap;
+        
+        std::vector< FontData >     m_aFonts;
+        FontToIndexMap              m_aFontToIndex;
+        
+        FontData& getFont( ImplFontData*, bool bVertical );
+        public:
+        PDFFontCache() {}
+        ~PDFFontCache() {}
+        
+        sal_Int32 getGlyphWidth( ImplFontData* pFont, sal_uInt32 nGlyphId, bool bVertical, SalGraphics* pGraphics );
+    };
+}
+
+#endif
Index: gsl/vcl/source/gdi/pdfwriter_impl.cxx
diff -u gsl/vcl/source/gdi/pdfwriter_impl.cxx:1.102 gsl/vcl/source/gdi/pdfwriter_impl.cxx:1.102.66.9
--- gsl/vcl/source/gdi/pdfwriter_impl.cxx:1.102	Thu Dec 21 04:03:14 2006
+++ gsl/vcl/source/gdi/pdfwriter_impl.cxx	Fri Mar  2 09:10:34 2007
@@ -718,7 +718,7 @@
 
     void append( PDFWriterImpl::PDFPage& rPage, OStringBuffer& rBuffer, Point* pBack = NULL );
 
-    Point transform( const Point& rPoint );
+    Point transform( const Point& rPoint ) const;
 };
 }
 
@@ -733,7 +733,7 @@
     f[5] = 0.0;
 }
 
-Point Matrix3::transform( const Point& rOrig )
+Point Matrix3::transform( const Point& rOrig ) const
 {
     double x = (double)rOrig.X(), y = (double)rOrig.Y();
     return Point( (int)(x*f[0] + y*f[2] + f[4]), (int)(x*f[1] + y*f[3] + f[5]) );
@@ -1751,6 +1751,7 @@
 
     virtual ImplFontData*               Clone() const { return new ImplPdfBuiltinFontData(*this); }
     virtual ImplFontEntry*              CreateFontInstance( ImplFontSelectData& ) const;
+    virtual sal_IntPtr                  GetFontId() const { return reinterpret_cast<sal_IntPtr>(&mrBuiltin); }
 };
 
 inline const ImplPdfBuiltinFontData* GetPdfFontData( const ImplFontData* pFontData )
@@ -2970,6 +2971,20 @@
         if( ! writeBuffer( aLine.getStr(), aLine.getLength() ) )
             goto streamend;
     }
+    else
+    {
+        rtl::OStringBuffer aErrorComment( 256 );
+        aErrorComment.append( "GetEmbedFontData failed for font \"" );
+        aErrorComment.append( OUStringToOString( pFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ) );
+        aErrorComment.append( '\"' );
+        if( pFont->GetSlant() == ITALIC_NORMAL )
+            aErrorComment.append( " italic" );
+        else if( pFont->GetSlant() == ITALIC_OBLIQUE )
+            aErrorComment.append( " oblique" );
+        aErrorComment.append( " weight=" );
+        aErrorComment.append( sal_Int32(pFont->GetWeight()) );
+        emitComment( aErrorComment.getStr() );
+    }
 
     if( nStreamObject )
         // write font descriptor
@@ -3459,6 +3474,21 @@
 
                 aFontIDToObject[ lit->m_nFontID ] = nFontObject;
             }
+            else
+            {
+                const ImplFontData* pFont = it->first;
+                rtl::OStringBuffer aErrorComment( 256 );
+                aErrorComment.append( "CreateFontSubset failed for font \"" );
+                aErrorComment.append( OUStringToOString( pFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ) );
+                aErrorComment.append( '\"' );
+                if( pFont->GetSlant() == ITALIC_NORMAL )
+                    aErrorComment.append( " italic" );
+                else if( pFont->GetSlant() == ITALIC_OBLIQUE )
+                    aErrorComment.append( " oblique" );
+                aErrorComment.append( " weight=" );
+                aErrorComment.append( sal_Int32(pFont->GetWeight()) );
+                emitComment( aErrorComment.getStr() );
+            }
         }
     }
     osl_removeFile( aTmpName.pData );
@@ -5166,13 +5196,13 @@
     return true;
 }
 
-void PDFWriterImpl::registerGlyphs(
-                                   int nGlyphs,
-                                   sal_Int32* pGlyphs,
-                                   sal_Unicode* pUnicodes,
-                                   sal_uInt8* pMappedGlyphs,
-                                   sal_Int32* pMappedFontObjects,
-                                   ImplFontData* pFallbackFonts[] )
+void PDFWriterImpl::registerGlyphs( int nGlyphs,
+                                    sal_Int32* pGlyphs,
+                                    sal_Int32* pGlyphWidths,
+                                    sal_Unicode* pUnicodes,
+                                    sal_uInt8* pMappedGlyphs,
+                                    sal_Int32* pMappedFontObjects,
+                                    ImplFontData* pFallbackFonts[] )
 {
     ImplFontData* pDevFont = m_pReferenceDevice->mpFontEntry->maFontSelData.mpFontData;
     for( int i = 0; i < nGlyphs; i++ )
@@ -5182,8 +5212,34 @@
 
         ImplFontData* pCurrentFont = pFallbackFonts[i] ? pFallbackFonts[i] : pDevFont;
 
-        if( pCurrentFont->mbSubsettable )
+        if( isBuiltinFont( pCurrentFont ) )
+        {
+            sal_Int32 nFontID = 0;
+            FontEmbedData::iterator it = m_aEmbeddedFonts.find( pCurrentFont );
+            if( it != m_aEmbeddedFonts.end() )
+                nFontID = it->second.m_nNormalFontID;
+            else
+            {
+                nFontID = m_nNextFID++;
+                m_aEmbeddedFonts[ pCurrentFont ] = EmbedFont();
+                m_aEmbeddedFonts[ pCurrentFont ].m_nNormalFontID = nFontID;
+            }
+
+            pGlyphWidths[ i ] = 0;
+            pMappedGlyphs[ i ] = (sal_Int8)pUnicodes[i];
+            pMappedFontObjects[ i ] = nFontID;
+            const ImplPdfBuiltinFontData* pFD = GetPdfFontData( pCurrentFont );
+            if( pFD )
+            {
+                const BuiltinFont* pBuiltinFont = pFD->GetBuiltinFont();
+                pGlyphWidths[i] = pBuiltinFont->m_aWidths[ pUnicodes[i] & 0x00ff ];
+            }
+        }
+        else if( pCurrentFont->mbSubsettable )
         {
+            #ifndef WNT
+            DBG_ASSERT( (pGlyphs[i] & GF_ISCHAR) == 0, "hdu promised this would only happen on Windows" );
+            #endif
 
             FontSubset& rSubset = m_aSubsets[ pCurrentFont ];
             // search for glyphID
@@ -5218,8 +5274,13 @@
                 rNewGlyph.m_nFontID = pMappedFontObjects[i];
                 rNewGlyph.m_nSubsetGlyphID = nNewId;
             }
+            getReferenceDevice()->ImplGetGraphics();
+            pGlyphWidths[i] = m_aFontCache.getGlyphWidth( pCurrentFont,
+                                                          pGlyphs[i],
+                                                          (pGlyphs[i] & GF_ROTMASK) != 0,
+                                                          m_pReferenceDevice->mpGraphics );
         }
-        else
+        else if( pCurrentFont->IsEmbeddable() )
         {
             sal_Int32 nFontID = 0;
             FontEmbedData::iterator it = m_aEmbeddedFonts.find( pCurrentFont );
@@ -5302,6 +5363,10 @@
             }
             pMappedGlyphs[ i ] = (sal_Int8)cChar;
             pMappedFontObjects[ i ] = nCurFontID;
+            pGlyphWidths[ i ] = m_aFontCache.getGlyphWidth( pCurrentFont,
+                                                            (pEncoding ? pUnicodes[i] : cChar) | GF_ISCHAR,
+                                                            false,
+                                                            m_pReferenceDevice->mpGraphics );
         }
     }
 }
@@ -5376,6 +5441,179 @@
     updateGraphicsState();
 }
 
+void PDFWriterImpl::drawVerticalGlyphs(
+        const std::vector<PDFWriterImpl::PDFGlyph>& rGlyphs,
+        OStringBuffer& rLine,
+        const Point& rAlignOffset,
+        const Matrix3& rRotScale,
+        double fAngle,
+        double fXScale,
+        double fSkew,
+        sal_Int32 nFontHeight )
+{
+    long nXOffset = 0;
+    Point aCurPos( rGlyphs[0].m_aPos );
+    aCurPos = m_pReferenceDevice->PixelToLogic( aCurPos );
+    aCurPos += rAlignOffset;
+    for( size_t i = 0; i < rGlyphs.size(); i++ )
+    {
+        // have to emit each glyph on its own
+        double fDeltaAngle = 0.0;
+        double fYScale = 1.0;
+        double fTempXScale = fXScale;
+        double fSkewB = fSkew;
+        double fSkewA = 0.0;
+        
+        Point aDeltaPos;
+        if( ( rGlyphs[i].m_nGlyphId & GF_ROTMASK ) == GF_ROTL )
+        {
+            fDeltaAngle = M_PI/2.0;
+            aDeltaPos.X() = m_pReferenceDevice->GetFontMetric().GetAscent();
+            aDeltaPos.Y() = (int)((double)m_pReferenceDevice->GetFontMetric().GetDescent() * fXScale);
+            fYScale = fXScale;
+            fTempXScale = 1.0;
+            fSkewA = -fSkewB;
+            fSkewB = 0.0;
+        }
+        else if( ( rGlyphs[i].m_nGlyphId & GF_ROTMASK ) == GF_ROTR )
+        {
+            fDeltaAngle = -M_PI/2.0;
+            aDeltaPos.X() = (int)((double)m_pReferenceDevice->GetFontMetric().GetDescent()*fXScale);
+            aDeltaPos.Y() = -m_pReferenceDevice->GetFontMetric().GetAscent();
+            fYScale = fXScale;
+            fTempXScale = 1.0;
+            fSkewA = fSkewB;
+            fSkewB = 0.0;
+        }
+        aDeltaPos += (m_pReferenceDevice->PixelToLogic( Point( (int)((double)nXOffset/fXScale), 0 ) ) - m_pReferenceDevice->PixelToLogic( Point() ) );
+        if( i < rGlyphs.size()-1 )
+            nXOffset += rGlyphs[i+1].m_aPos.Y() - rGlyphs[i].m_aPos.Y();
+        if( ! rGlyphs[i].m_nGlyphId )
+            continue;
+        
+        
+        aDeltaPos = rRotScale.transform( aDeltaPos );
+        
+        Matrix3 aMat;
+        if( fSkewB != 0.0 || fSkewA != 0.0 )
+            aMat.skew( fSkewA, fSkewB );
+        aMat.scale( fTempXScale, fYScale );
+        aMat.rotate( fAngle+fDeltaAngle );
+        aMat.translate( aCurPos.X()+aDeltaPos.X(), aCurPos.Y()+aDeltaPos.Y() );
+        aMat.append( m_aPages.back(), rLine );
+        rLine.append( " Tm" );
+        if( i == 0 || rGlyphs[i-1].m_nMappedFontId != rGlyphs[i].m_nMappedFontId )
+        {
+            rLine.append( " /F" );
+            rLine.append( rGlyphs[i].m_nMappedFontId );
+            rLine.append( ' ' );
+            m_aPages.back().appendMappedLength( nFontHeight, rLine, true );
+            rLine.append( " Tf" );
+        }
+        rLine.append( "<" );
+        appendHex( rGlyphs[i].m_nMappedGlyphId, rLine );
+        rLine.append( ">Tj\n" );
+    }
+}
+
+void PDFWriterImpl::drawHorizontalGlyphs(
+        const std::vector<PDFWriterImpl::PDFGlyph>& rGlyphs,
+        OStringBuffer& rLine,
+        const Point& rAlignOffset,
+        double fAngle,
+        double fXScale,
+        double fSkew,
+        sal_Int32 nFontHeight,
+        sal_Int32 nPixelFontHeight
+        )
+{
+    // horizontal (= normal) case
+    
+    // fill in  run end indices
+    // end is marked by index of the first glyph of the next run
+    // a run is marked by same mapped font id and same Y position
+    std::vector< sal_uInt32 > aRunEnds;
+    aRunEnds.reserve( rGlyphs.size() );
+    for( size_t i = 1; i < rGlyphs.size(); i++ )
+    {
+        if( rGlyphs[i].m_nMappedFontId != rGlyphs[i-1].m_nMappedFontId ||
+            rGlyphs[i].m_aPos.Y() != rGlyphs[i-1].m_aPos.Y() )
+        {
+            aRunEnds.push_back(i);
+        }
+    }
+    // last run ends at last glyph
+    aRunEnds.push_back( rGlyphs.size() );
+
+    // loop over runs of the same font
+    sal_uInt32 nBeginRun = 0;
+    for( size_t nRun = 0; nRun < aRunEnds.size(); nRun++ )
+    {
+        // setup text matrix
+        Point aCurPos = rGlyphs[nBeginRun].m_aPos;
+        // back transformation to current coordinate system
+        aCurPos = m_pReferenceDevice->PixelToLogic( aCurPos );
+        aCurPos += rAlignOffset;
+        // the first run can be set with "Td" operator
+        // subsequent use of that operator would move
+        // the texline matrix relative to what was set before
+        // making use of that would drive us into rounding issues
+        if( nRun == 0 && fAngle == 0.0 && fXScale == 1.0 && fSkew == 0.0 )
+        {
+            m_aPages.back().appendPoint( aCurPos, rLine, false );
+            rLine.append( " Td " );
+        }
+        else
+        {
+            Matrix3 aMat;
+            if( fSkew != 0.0 )
+                aMat.skew( 0.0, fSkew );
+            aMat.scale( fXScale, 1.0 );
+            aMat.rotate( fAngle );
+            aMat.translate( aCurPos.X(), aCurPos.Y() );
+            aMat.append( m_aPages.back(), rLine );
+            rLine.append( " Tm\n" );
+        }
+        // set up correct font
+        rLine.append( "/F" );
+        rLine.append( rGlyphs[nBeginRun].m_nMappedFontId );
+        rLine.append( ' ' );
+        m_aPages.back().appendMappedLength( nFontHeight, rLine, true );
+        rLine.append( " Tf" );
+
+        // output glyphs using Tj or TJ
+        OStringBuffer aKernedLine( 256 ), aUnkernedLine( 256 );
+        aKernedLine.append( "[<" );
+        aUnkernedLine.append( '<' );
+        appendHex( rGlyphs[nBeginRun].m_nMappedGlyphId, aKernedLine );
+        appendHex( rGlyphs[nBeginRun].m_nMappedGlyphId, aUnkernedLine );
+
+        bool bNeedKern = false;
+        for( sal_uInt32 nPos = nBeginRun+1; nPos < aRunEnds[nRun]; nPos++ )
+        {
+            appendHex( rGlyphs[nPos].m_nMappedGlyphId, aUnkernedLine );
+            // check for adjustment
+            double fTheoreticalGlyphWidth = rGlyphs[nPos].m_aPos.X() - rGlyphs[nPos-1].m_aPos.X();
+            fTheoreticalGlyphWidth = 1000.0 * fTheoreticalGlyphWidth / fXScale / double(nPixelFontHeight);
+            sal_Int32 nAdjustment = rGlyphs[nPos-1].m_nNativeWidth - sal_Int32(fTheoreticalGlyphWidth+0.5);
+            if( nAdjustment != 0 )
+            {
+                bNeedKern = true;
+                aKernedLine.append( ">" );
+                aKernedLine.append( nAdjustment );
+                aKernedLine.append( "<" );
+            }
+            appendHex( rGlyphs[nPos].m_nMappedGlyphId, aKernedLine );
+        }
+        aKernedLine.append( ">]TJ\n" );
+        aUnkernedLine.append( ">Tj\n" );
+        rLine.append( bNeedKern ? aKernedLine : aUnkernedLine );
+        
+        // set beginning of next run
+        nBeginRun = aRunEnds[nRun];
+    }
+}
+
 void PDFWriterImpl::drawLayout( SalLayout& rLayout, const String& rText, bool bTextLines )
 {
     // relief takes precedence over shadow (see outdev3.cxx)
@@ -5392,27 +5630,25 @@
     const int nMaxGlyphs = 256;
 
     sal_Int32 pGlyphs[nMaxGlyphs];
+    sal_Int32 pGlyphWidths[nMaxGlyphs];
     sal_uInt8 pMappedGlyphs[nMaxGlyphs];
     sal_Int32 pMappedFontObjects[nMaxGlyphs];
     sal_Unicode pUnicodes[nMaxGlyphs];
     int pCharPosAry[nMaxGlyphs];
     sal_Int32 nAdvanceWidths[nMaxGlyphs];
     ImplFontData* pFallbackFonts[nMaxGlyphs];
-    sal_Int32 *pAdvanceWidths = m_aCurrentPDFState.m_aFont.IsVertical() ? nAdvanceWidths : NULL;
-    sal_Int32 nGlyphFlags[nMaxGlyphs];
+    bool bVertical = m_aCurrentPDFState.m_aFont.IsVertical();
     int nGlyphs;
     int nIndex = 0;
-    Point aCurPos, aLastPos(0, 0), aCumulativePos(0,0), aGlyphPos;
-    bool bFirst = true, bWasYChange = false;
     int nMinCharPos = 0, nMaxCharPos = rText.Len()-1;
     double fXScale = 1.0;
     double fSkew = 0.0;
-    sal_Int32 nFontHeight = m_pReferenceDevice->mpFontEntry->maFontSelData.mnHeight;
+    sal_Int32 nPixelFontHeight = m_pReferenceDevice->mpFontEntry->maFontSelData.mnHeight;
     TextAlign eAlign = m_aCurrentPDFState.m_aFont.GetAlign();
 
     // transform font height back to current units
     // note: the layout calculates in outdevs device pixel !!
-    nFontHeight = m_pReferenceDevice->ImplDevicePixelToLogicHeight( nFontHeight );
+    sal_Int32 nFontHeight = m_pReferenceDevice->ImplDevicePixelToLogicHeight( nPixelFontHeight );
     if( m_aCurrentPDFState.m_aFont.GetWidth() )
     {
         Font aFont( m_aCurrentPDFState.m_aFont );
@@ -5522,26 +5758,13 @@
 
     FontMetric aRefDevFontMetric = m_pReferenceDevice->GetFontMetric();
 
-    sal_Int32 nLastMappedFont = -1;
-    while( (nGlyphs = rLayout.GetNextGlyphs( nMaxGlyphs, pGlyphs, aCurPos, nIndex, pAdvanceWidths, pCharPosAry )) != 0 )
+    // collect the glyphs into a single array
+    std::vector< PDFGlyph > aGlyphs;
+    aGlyphs.reserve( nMaxGlyphs );
+    // first get all the glyphs and register them; coordinates still in Pixel
+    Point aGNGlyphPos;
+    while( (nGlyphs = rLayout.GetNextGlyphs( nMaxGlyphs, pGlyphs, aGNGlyphPos, nIndex, nAdvanceWidths, pCharPosAry )) != 0 )
     {
-        bWasYChange = (aGlyphPos.Y() != aCurPos.Y());
-        aGlyphPos = aCurPos;
-        // back transformation to current coordinate system
-        aCurPos = m_pReferenceDevice->PixelToLogic( aCurPos );
-
-        Point aOffset;
-        if ( eAlign == ALIGN_BOTTOM )
-            aOffset.Y() -= aRefDevFontMetric.GetDescent();
-        else if ( eAlign == ALIGN_TOP )
-            aOffset.Y() += aRefDevFontMetric.GetAscent();
-
-        if( aOffset.X() || aOffset.Y() )
-        {
-            aOffset = aRotScale.transform( aOffset );
-            aCurPos += aOffset;
-        }
-
         for( int i = 0; i < nGlyphs; i++ )
         {
             if( pGlyphs[i] & GF_FONTMASK )
@@ -5549,16 +5772,6 @@
             else
                 pFallbackFonts[i] = NULL;
 
-            nGlyphFlags[i] = (pGlyphs[i] & GF_FLAGMASK);
-#ifndef WNT
-            // #104930# workaround for Win32 bug: the glyph ids are actually
-            // Unicodes for vertical fonts because Win32 does not return
-            // the correct glyph ids; this is indicated by GF_ISCHAR which is
-            // needed in SalGraphics::CreateFontSubset to convert the Unicodes
-            // to vertical glyph ids. Doing this here on a per character
-            // basis would be a major performance hit.
-            pGlyphs[i] &= GF_IDXMASK;
-#endif
             if( pCharPosAry[i] >= nMinCharPos && pCharPosAry[i] <= nMaxCharPos )
                 pUnicodes[i] = rText.GetChar( sal::static_int_cast<xub_StrLen>(pCharPosAry[i]) );
             else
@@ -5568,159 +5781,34 @@
             // implementations set -1 then to indicate that no direct
             // mapping is possible
         }
-        registerGlyphs( nGlyphs, pGlyphs, pUnicodes, pMappedGlyphs, pMappedFontObjects, pFallbackFonts );
-
-        if( pAdvanceWidths )
-        {
-            // have to emit each glyph on its own
-            long nXOffset = 0;
-            for( int n = 0; n < nGlyphs; n++ )
-            {
-                double fDeltaAngle = 0.0;
-                double fYScale = 1.0;
-                double fTempXScale = fXScale;
-                double fSkewB = fSkew;
-                double fSkewA = 0.0;
-
-                Point aDeltaPos;
-                if( ( nGlyphFlags[n] & GF_ROTMASK ) == GF_ROTL )
-                {
-                    fDeltaAngle = M_PI/2.0;
-                    aDeltaPos.X() = aRefDevFontMetric.GetAscent();
-                    aDeltaPos.Y() = (int)((double)m_pReferenceDevice->GetFontMetric().GetDescent() * fXScale);
-                    fYScale = fXScale;
-                    fTempXScale = 1.0;
-                    fSkewA = -fSkewB;
-                    fSkewB = 0.0;
-                }
-                else if( ( nGlyphFlags[n] & GF_ROTMASK ) == GF_ROTR )
-                {
-                    fDeltaAngle = -M_PI/2.0;
-                    aDeltaPos.X() = (int)((double)aRefDevFontMetric.GetDescent()*fXScale);
-                    aDeltaPos.Y() = -aRefDevFontMetric.GetAscent();
-                    fYScale = fXScale;
-                    fTempXScale = 1.0;
-                    fSkewA = fSkewB;
-                    fSkewB = 0.0;
-                }
-                aDeltaPos += (m_pReferenceDevice->PixelToLogic( Point( (int)((double)nXOffset/fXScale)/rLayout.GetUnitsPerPixel(), 0 ) ) - m_pReferenceDevice->PixelToLogic( Point() ) );
-                nXOffset += pAdvanceWidths[n];
-                if( ! pGlyphs[n] )
-                    continue;
-
-
-                aDeltaPos = aRotScale.transform( aDeltaPos );
-
-                Matrix3 aMat;
-                if( fSkewB != 0.0 || fSkewA != 0.0 )
-                    aMat.skew( fSkewA, fSkewB );
-                aMat.scale( fTempXScale, fYScale );
-                aMat.rotate( fAngle+fDeltaAngle );
-                aMat.translate( aCurPos.X()+aDeltaPos.X(), aCurPos.Y()+aDeltaPos.Y() );
-                aMat.append( m_aPages.back(), aLine );
-                aLine.append( " Tm" );
-                if( nLastMappedFont != pMappedFontObjects[n] )
-                {
-                    nLastMappedFont = pMappedFontObjects[n];
-                    aLine.append( " /F" );
-                    aLine.append( pMappedFontObjects[n] );
-                    aLine.append( ' ' );
-                    m_aPages.back().appendMappedLength( nFontHeight, aLine, true );
-                    aLine.append( " Tf" );
-                }
-                aLine.append( " <" );
-                appendHex( (sal_Int8)pMappedGlyphs[n], aLine );
-                aLine.append( "> Tj\n" );
-            }
-        }
-        else // normal case
+        registerGlyphs( nGlyphs, pGlyphs, pGlyphWidths, pUnicodes, pMappedGlyphs, pMappedFontObjects, pFallbackFonts );
+        for( int i = 0; i < nGlyphs; i++)
         {
-            // optimize use of Td vs. Tm
-            if( fAngle == 0.0 && fXScale == 1.0 && ( !bFirst || fSkew == 0.0 ) )
-            {
-                if( bFirst )
-                {
-                    m_aPages.back().appendPoint( aCurPos, aLine, false, &aCumulativePos );
-                    bFirst = false;
-                    aLastPos = aCurPos;
-                }
-                else
-                {
-                    sal_Int32 nDiffL = 0;
-                    Point aDiff = aCurPos - aLastPos;
-                    m_aPages.back().appendMappedLength( (sal_Int32)aDiff.X(), aLine, false, &nDiffL );
-                    aCumulativePos.X() += nDiffL;
-                    aLine.append( ' ' );
-                    if( bWasYChange )
-                    {
-                        m_aPages.back().appendMappedLength( (sal_Int32)-aDiff.Y(), aLine, true, &nDiffL );
-                        aCumulativePos.Y() -= nDiffL;
-                    }
-                    else
-                    {
-                        aLine.append( '0' );
-                    }
-                    // back project last position to catch rounding errors
-                    Point aBackPos = lcl_convert( m_aMapMode,
-                                                  m_aGraphicsStack.front().m_aMapMode,
-                                                  getReferenceDevice(),
-                                                  aCumulativePos
-                                                  );
-                    // catch rounding error in back projection on Y axis;
-                    // else the back projection can produce a sinuous text baseline
-                    if( ! bWasYChange )
-                        aBackPos.Y() = aLastPos.Y();
-                    aLastPos = aBackPos;
-                }
-                aLine.append( " Td " );
-            }
+            aGlyphs.push_back( PDFGlyph( aGNGlyphPos,
+                                         pGlyphWidths[i],
+                                         pGlyphs[i],
+                                         pMappedFontObjects[i],
+                                         pMappedGlyphs[i] ) );
+            if( bVertical )
+                aGNGlyphPos.Y() += nAdvanceWidths[i]/rLayout.GetUnitsPerPixel();
             else
-            {
-                Matrix3 aMat;
-                if( fSkew != 0.0 )
-                    aMat.skew( 0.0, fSkew );
-                aMat.scale( fXScale, 1.0 );
-                aMat.rotate( fAngle );
-                aMat.translate( aCurPos.X(), aCurPos.Y() );
-                aMat.append( m_aPages.back(), aLine, &aCumulativePos );
-                aLine.append( " Tm\n" );
-                aLastPos = aCurPos;
-                bFirst = false;
-            }
-            int nLast = 0;
-            while( nLast < nGlyphs )
-            {
-                while( ! pGlyphs[nLast] && nLast < nGlyphs )
-                    nLast++;
-                if( nLast >= nGlyphs )
-                    break;
-
-                int nNext = nLast+1;
-                while( nNext < nGlyphs && pMappedFontObjects[ nNext ] == pMappedFontObjects[nLast] && pGlyphs[nNext] )
-                    nNext++;
-                if( nLastMappedFont != pMappedFontObjects[nLast] )
-                {
-                    aLine.append( "/F" );
-                    aLine.append( pMappedFontObjects[nLast] );
-                    aLine.append( ' ' );
-                    m_aPages.back().appendMappedLength( nFontHeight, aLine, true );
-                    aLine.append( " Tf " );
-                    nLastMappedFont = pMappedFontObjects[nLast];
-                }
-                aLine.append( "<" );
-                for( int i = nLast; i < nNext; i++ )
-                {
-                    appendHex( (sal_Int8)pMappedGlyphs[i], aLine );
-                    if( i && (i % 35) == 0 )
-                        aLine.append( "\n" );
-                }
-                aLine.append( "> Tj\n" );
-
-                nLast = nNext;
-            }
+                aGNGlyphPos.X() += nAdvanceWidths[i]/rLayout.GetUnitsPerPixel();
         }
     }
+    
+    Point aAlignOffset;
+    if ( eAlign == ALIGN_BOTTOM )
+        aAlignOffset.Y() -= aRefDevFontMetric.GetDescent();
+    else if ( eAlign == ALIGN_TOP )
+        aAlignOffset.Y() += aRefDevFontMetric.GetAscent();
+    if( aAlignOffset.X() || aAlignOffset.Y() )
+        aAlignOffset = aRotScale.transform( aAlignOffset );
 
+    if( bVertical )
+        drawVerticalGlyphs( aGlyphs, aLine, aAlignOffset, aRotScale, fAngle, fXScale, fSkew, nFontHeight );
+    else
+        drawHorizontalGlyphs( aGlyphs, aLine, aAlignOffset, fAngle, fXScale, fSkew, nFontHeight, nPixelFontHeight );
+    
     // end textobject
     aLine.append( "ET\n" );
     if( bPop )
Index: gsl/vcl/source/gdi/pdfwriter_impl.hxx
diff -u gsl/vcl/source/gdi/pdfwriter_impl.hxx:1.42 gsl/vcl/source/gdi/pdfwriter_impl.hxx:1.42.78.2
--- gsl/vcl/source/gdi/pdfwriter_impl.hxx:1.42	Mon Dec  4 00:32:37 2006
+++ gsl/vcl/source/gdi/pdfwriter_impl.hxx	Thu Mar  1 04:26:56 2007
@@ -79,6 +79,9 @@
 #include <rtl/digest.h>
 #endif
 
+#include "pdffontcache.hxx"
+
+
 #include <vector>
 #include <map>
 #include <hash_map>
@@ -106,6 +109,7 @@
 {
 
 class PDFSalLayout;
+class Matrix3;
 
 class PDFWriterImpl
 {
@@ -512,6 +516,26 @@
         }
 
     };
+    
+    // helper structure for drawLayout and friends
+    struct PDFGlyph
+    {
+        Point       m_aPos;
+        sal_Int32   m_nNativeWidth;
+        sal_Int32   m_nGlyphId;
+        sal_Int32   m_nMappedFontId;
+        sal_uInt8   m_nMappedGlyphId;
+        
+        PDFGlyph( const Point& rPos,
+                  sal_Int32 nNativeWidth,
+                  sal_Int32 nGlyphId,
+                  sal_Int32 nFontId,
+                  sal_uInt8 nMappedGlyphId )
+        : m_aPos( rPos ), m_nNativeWidth( nNativeWidth ), m_nGlyphId( nGlyphId ),
+          m_nMappedFontId( nFontId ), m_nMappedGlyphId( nMappedGlyphId )
+        {}
+    };
+
 
     static const sal_Char* getStructureTag( PDFWriter::StructElement );
     static const sal_Char* getAttributeTag( PDFWriter::StructAttribute eAtr );
@@ -589,6 +613,7 @@
     FontSubsetData						m_aSubsets;
     FontEmbedData						m_aEmbeddedFonts;
     sal_Int32							m_nNextFID;
+    PDFFontCache                        m_aFontCache;
 
     sal_Int32							m_nInheritedPageWidth;  // in inch/72
     sal_Int32							m_nInheritedPageHeight; // in inch/72
@@ -816,10 +841,12 @@
 	void appendLiteralStringEncrypt( rtl::OStringBuffer& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer );
 
     /* creates fonts and subsets that will be emitted later */
-    void registerGlyphs( int nGlyphs, sal_Int32* pGlyphs, sal_Unicode* pUnicodes, sal_uInt8* pMappedGlyphs, sal_Int32* pMappedFontObjects, ImplFontData* pFallbackFonts[] );
+    void registerGlyphs( int nGlyphs, sal_Int32* pGlyphs, sal_Int32* pGlpyhWidths, sal_Unicode* pUnicodes, sal_uInt8* pMappedGlyphs, sal_Int32* pMappedFontObjects, ImplFontData* pFallbackFonts[] );
 
     /*  emits a text object according to the passed layout */
     /* TODO: remove rText as soon as SalLayout will change so that rText is not necessary anymore */
+    void drawVerticalGlyphs( const std::vector<PDFGlyph>& rGlyphs, rtl::OStringBuffer& rLine, const Point& rAlignOffset, const Matrix3& rRotScale, double fAngle, double fXScale, double fSkew, sal_Int32 nFontHeight );
+    void drawHorizontalGlyphs( const std::vector<PDFGlyph>& rGlyphs, rtl::OStringBuffer& rLine, const Point& rAlignOffset, double fAngle, double fXScale, double fSkew, sal_Int32 nFontHeight, sal_Int32 nPixelFontHeight );
     void drawLayout( SalLayout& rLayout, const String& rText, bool bTextLines );
     void drawRelief( SalLayout& rLayout, const String& rText, bool bTextLines );
     void drawShadow( SalLayout& rLayout, const String& rText, bool bTextLines );
Index: gsl/vcl/unx/inc/pspgraphics.h
diff -u gsl/vcl/unx/inc/pspgraphics.h:1.12 gsl/vcl/unx/inc/pspgraphics.h:1.12.94.1
--- gsl/vcl/unx/inc/pspgraphics.h:1.12	Tue Nov 14 07:24:00 2006
+++ gsl/vcl/unx/inc/pspgraphics.h	Wed Feb 28 06:00:32 2007
@@ -91,6 +91,11 @@
     static const void* DoGetEmbedFontData( psp::fontID aFont, const sal_Unicode* pUnicodes, sal_Int32* pWidths, FontSubsetInfo& rInfo, long* pDataLen );
     static void DoFreeEmbedFontData( const void* pData, long nLen );
     static const std::map< sal_Unicode, sal_Int32 >* DoGetFontEncodingVector( psp::fontID aFont, const std::map< sal_Unicode, rtl::OString >** pNonEncoded );
+    static void DoGetGlyphWidths( psp::fontID aFont,
+                                  bool bVertical,
+                                  std::vector< sal_Int32 >& rWidths,
+                                  std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc );
+
     static ImplDevFontAttributes Info2DevFontAttributes( const psp::FastPrintFontInfo& );
     static void AnnounceFonts( ImplDevFontList*, const psp::FastPrintFontInfo& );
     static FontWidth	ToFontWidth (psp::width::type eWidth);
@@ -141,6 +146,10 @@
                                           FontSubsetInfo& rInfo,
                                           long* pDataLen );
     virtual void			FreeEmbedFontData( const void* pData, long nDataLen );
+    virtual void            GetGlyphWidths( ImplFontData* pFont,
+                                            bool bVertical,
+                                            std::vector< sal_Int32 >& rWidths,
+                                            std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc );
     virtual BOOL			GetGlyphBoundRect( long nIndex, Rectangle& );
     virtual BOOL			GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
     virtual SalLayout*		GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
Index: gsl/vcl/unx/inc/salgdi.h
diff -u gsl/vcl/unx/inc/salgdi.h:1.39 gsl/vcl/unx/inc/salgdi.h:1.39.94.1
--- gsl/vcl/unx/inc/salgdi.h:1.39	Tue Nov 14 07:24:32 2006
+++ gsl/vcl/unx/inc/salgdi.h	Wed Feb 28 06:00:32 2007
@@ -268,6 +268,10 @@
                                           FontSubsetInfo& rInfo,
                                           long* pDataLen );
     virtual void			FreeEmbedFontData( const void* pData, long nDataLen );
+    virtual void            GetGlyphWidths( ImplFontData* pFont,
+                                            bool bVertical,
+                                            std::vector< sal_Int32 >& rWidths,
+                                            std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc );
     virtual BOOL			GetGlyphBoundRect( long nIndex, Rectangle& );
     virtual BOOL			GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
     virtual SalLayout*		GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
Index: gsl/vcl/unx/source/gdi/pspgraphics.cxx
diff -u gsl/vcl/unx/source/gdi/pspgraphics.cxx:1.22 gsl/vcl/unx/source/gdi/pspgraphics.cxx:1.22.94.1
--- gsl/vcl/unx/source/gdi/pspgraphics.cxx:1.22	Tue Nov 14 07:25:26 2006
+++ gsl/vcl/unx/source/gdi/pspgraphics.cxx	Wed Feb 28 06:00:33 2007
@@ -1009,6 +1009,22 @@
     return PspGraphics::DoGetFontEncodingVector( aFont, pNonEncoded );
 }
 
+//--------------------------------------------------------------------------
+
+void PspGraphics::GetGlyphWidths( ImplFontData* pFont,
+                                  bool bVertical,
+                                  std::vector< sal_Int32 >& rWidths,
+                                  std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc )
+{
+    // in this context the pFont->GetFontId() is a valid PSP
+    // font since they are the only ones left after the PDF
+    // export has filtered its list of subsettable fonts (for
+    // which this method was created). The correct way would
+    // be to have the GlyphCache search for the ImplFontData pFont
+    psp::fontID aFont = pFont->GetFontId();
+    PspGraphics::DoGetGlyphWidths( aFont, bVertical, rWidths, rUnicodeEnc );
+}
+
 
 // static helpers of PspGraphics
 
@@ -1135,6 +1151,14 @@
     return rMgr.getEncodingMap( aFont, pNonEncoded );
 }
 
+void PspGraphics::DoGetGlyphWidths( psp::fontID aFont,
+                                    bool bVertical,
+                                    std::vector< sal_Int32 >& rWidths,
+                                    std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc )
+{
+    psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
+    rMgr.getGlyphWidths( aFont, bVertical, rWidths, rUnicodeEnc );
+}
 // ----------------------------------------------------------------------------
 
 FontWidth PspGraphics::ToFontWidth (psp::width::type eWidth)
Index: gsl/vcl/unx/source/gdi/salgdi3.cxx
diff -u gsl/vcl/unx/source/gdi/salgdi3.cxx:1.143 gsl/vcl/unx/source/gdi/salgdi3.cxx:1.143.68.1
--- gsl/vcl/unx/source/gdi/salgdi3.cxx:1.143	Thu Dec 21 04:05:00 2006
+++ gsl/vcl/unx/source/gdi/salgdi3.cxx	Wed Feb 28 06:00:33 2007
@@ -1468,4 +1468,20 @@
 #endif
 }
 
+//--------------------------------------------------------------------------
+
+void X11SalGraphics::GetGlyphWidths( ImplFontData* pFont,
+                                   bool bVertical,
+                                   std::vector< sal_Int32 >& rWidths,
+                                   std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc )
+{
+    // in this context the pFont->GetFontId() is a valid PSP
+    // font since they are the only ones left after the PDF
+    // export has filtered its list of subsettable fonts (for
+    // which this method was created). The correct way would
+    // be to have the GlyphCache search for the ImplFontData pFont
+    psp::fontID aFont = pFont->GetFontId();
+    PspGraphics::DoGetGlyphWidths( aFont, bVertical, rWidths, rUnicodeEnc );
+}
+
 // ===========================================================================
Index: gsl/vcl/unx/source/gdi/xlfd_extd.cxx
diff -u gsl/vcl/unx/source/gdi/xlfd_extd.cxx:1.28 gsl/vcl/unx/source/gdi/xlfd_extd.cxx:1.28.172.1
--- gsl/vcl/unx/source/gdi/xlfd_extd.cxx:1.28	Sun Sep 17 05:40:37 2006
+++ gsl/vcl/unx/source/gdi/xlfd_extd.cxx	Wed Feb 28 06:00:33 2007
@@ -78,6 +78,11 @@
     return pEntry;
 }
 
+sal_IntPtr ImplX11FontData::GetFontId() const
+{
+    return reinterpret_cast<sal_IntPtr>(&mrXlfd);
+}
+
 // --------------------------------------------------------------------------
 //
 //  classes for Xlfd handling that contain more than a single encoding.
Index: gsl/vcl/unx/source/gdi/xlfd_extd.hxx
diff -u gsl/vcl/unx/source/gdi/xlfd_extd.hxx:1.14 gsl/vcl/unx/source/gdi/xlfd_extd.hxx:1.14.538.1
--- gsl/vcl/unx/source/gdi/xlfd_extd.hxx:1.14	Fri Sep  9 06:09:55 2005
+++ gsl/vcl/unx/source/gdi/xlfd_extd.hxx	Wed Feb 28 06:00:33 2007
@@ -274,6 +274,7 @@
     const ExtendedXlfd&     GetExtendedXlfd() const { return mrXlfd; }
     virtual ImplFontData*   Clone() const           { return new ImplX11FontData( *this ); }
     virtual ImplFontEntry*  CreateFontInstance( ImplFontSelectData& ) const;
+    virtual sal_IntPtr      GetFontId() const;
 
     static bool             CheckFontData( const ImplFontData& r ) { return r.CheckMagic( X11IFD_MAGIC ); }
 };
Index: gsl/vcl/win/inc/salgdi.h
diff -u gsl/vcl/win/inc/salgdi.h:1.24 gsl/vcl/win/inc/salgdi.h:1.24.80.1
--- gsl/vcl/win/inc/salgdi.h:1.24	Mon Dec  4 08:40:48 2006
+++ gsl/vcl/win/inc/salgdi.h	Fri Mar  2 07:36:01 2007
@@ -82,6 +82,8 @@
 
     virtual ImplFontData*   Clone() const;
     virtual ImplFontEntry*  CreateFontInstance( ImplFontSelectData& ) const;
+    virtual sal_IntPtr      GetFontId() const;
+    void                    SetFontId( sal_IntPtr nId ) { mnId = nId; }
     void                    UpdateFromHDC( HDC );
 
     bool                    HasChar( sal_uInt32 cChar ) const;
@@ -95,8 +97,15 @@
     bool                    AliasSymbolsLow() const     { return mbAliasSymbolsLow; }
 
     ImplFontCharMap*        GetImplFontCharMap();
-
+    std::map< sal_Unicode,sal_Int32>* GetEncodingVector() const { return mpEncodingVector; }
+    void SetEncodingVector( std::map< sal_Unicode,sal_Int32>* pNewVec )
+    {
+        if( mpEncodingVector )
+            delete mpEncodingVector;
+        mpEncodingVector = pNewVec;
+    }
 private:
+    sal_IntPtr              mnId;
     bool                    mbDisableGlyphApi;
     bool                    mbHasKoreanRange;
     bool                    mbHasCJKSupport;
@@ -110,7 +119,7 @@
     WIN_BYTE                mnPitchAndFamily;
     bool                    mbAliasSymbolsHigh;
     bool                    mbAliasSymbolsLow;
-
+    std::map< sal_Unicode,sal_Int32>* mpEncodingVector;
 private:
     void                    ReadCmapTable( HDC );
     void                    ReadOs2Table( HDC );
@@ -171,6 +180,8 @@
 	BOOL					mbWindow;			// is Window
 	BOOL					mbScreen;			// is Screen compatible
 	BOOL					mbXORMode;			// _every_ output with RasterOp XOR
+    
+    HFONT                   ImplDoSetFont( ImplFontSelectData* i_pFont, float& o_rFontScale, HFONT& o_rOldFont );
 
 public:
     WinSalGraphics();
@@ -332,6 +343,10 @@
                                           long* pDataLen );
     // frees the font data again
     virtual void			FreeEmbedFontData( const void* pData, long nDataLen );
+    virtual void            GetGlyphWidths( ImplFontData* pFont,
+                                            bool bVertical,
+                                            std::vector< sal_Int32 >& rWidths,
+                                            std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc );
 
     virtual BOOL                    GetGlyphBoundRect( long nIndex, Rectangle& );
     virtual BOOL                    GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
Index: gsl/vcl/win/source/gdi/salgdi3.cxx
diff -u gsl/vcl/win/source/gdi/salgdi3.cxx:1.85 gsl/vcl/win/source/gdi/salgdi3.cxx:1.85.32.1
--- gsl/vcl/win/source/gdi/salgdi3.cxx:1.85	Thu Jan 25 03:26:50 2007
+++ gsl/vcl/win/source/gdi/salgdi3.cxx	Fri Mar  2 07:36:02 2007
@@ -299,6 +299,7 @@
     bool                mbImplSalCourierScalable;
     bool                mbImplSalCourierNew;
     bool                mbPrinter;
+    int                 mnFontCount;
 };
 
 // =======================================================================
@@ -654,7 +655,7 @@
 
 // -----------------------------------------------------------------------
 
-static ImplFontData* ImplLogMetricToDevFontDataA( const ENUMLOGFONTEXA* pLogFont,
+static ImplWinFontData* ImplLogMetricToDevFontDataA( const ENUMLOGFONTEXA* pLogFont,
                                          const NEWTEXTMETRICA* pMetric,
                                          DWORD nFontType )
 {
@@ -662,7 +663,7 @@
     if ( nFontType & RASTER_FONTTYPE )
         nHeight = pMetric->tmHeight - pMetric->tmInternalLeading;
 
-    ImplFontData* pData = new ImplWinFontData(
+    ImplWinFontData* pData = new ImplWinFontData(
         WinFont2DevFontAttributes(*pLogFont, *pMetric, nFontType),
         nHeight,
         pLogFont->elfLogFont.lfCharSet,
@@ -673,7 +674,7 @@
 
 // -----------------------------------------------------------------------
 
-static ImplFontData* ImplLogMetricToDevFontDataW( const ENUMLOGFONTEXW* pLogFont,
+static ImplWinFontData* ImplLogMetricToDevFontDataW( const ENUMLOGFONTEXW* pLogFont,
                                          const NEWTEXTMETRICW* pMetric,
                                          DWORD nFontType )
 {
@@ -681,7 +682,7 @@
     if ( nFontType & RASTER_FONTTYPE )
         nHeight = pMetric->tmHeight - pMetric->tmInternalLeading;
 
-    ImplFontData* pData = new ImplWinFontData(
+    ImplWinFontData* pData = new ImplWinFontData(
         WinFont2DevFontAttributes(*pLogFont, *pMetric, nFontType),
         nHeight,
         pLogFont->elfLogFont.lfCharSet,
@@ -782,7 +783,9 @@
     mbHasKoreanRange( false ),
     mbHasCJKSupport( false ),
     mbAliasSymbolsLow( false ),
-    mbAliasSymbolsHigh( false )
+    mbAliasSymbolsHigh( false ),
+    mnId( 0 ),
+    mpEncodingVector( NULL )
 {
     SetBitmapSize( 0, nHeight );
 
@@ -816,6 +819,14 @@
 
     if( mpUnicodeMap )
         mpUnicodeMap->DeReference();
+    delete mpEncodingVector;
+}
+
+// -----------------------------------------------------------------------
+
+sal_IntPtr ImplWinFontData::GetFontId() const
+{
+    return mnId;
 }
 
 // -----------------------------------------------------------------------
@@ -1221,31 +1232,9 @@
 
 // -----------------------------------------------------------------------
 
-USHORT WinSalGraphics::SetFont( ImplFontSelectData* pFont, int nFallbackLevel )
+HFONT WinSalGraphics::ImplDoSetFont( ImplFontSelectData* i_pFont, float& o_rFontScale, HFONT& o_rOldFont )
 {
-    // return early if there is no new font
-    if( !pFont )
-    {
-        // deselect still active font
-        if( mhDefFont )
-            ::SelectFont( mhDC, mhDefFont );
-        // release no longer referenced font handles
-        for( int i = nFallbackLevel; i < MAX_FALLBACK; ++i )
-        {
-            if( mhFonts[i] )
-                ::DeleteFont( mhFonts[i] );
-            mhFonts[ i ] = 0;
-        }
-        mhDefFont = 0;
-        return 0;
-    }
-
-    DBG_ASSERT( pFont->mpFontData, "WinSalGraphics mpFontData==NULL");
-    mpWinFontEntry[ nFallbackLevel ] = reinterpret_cast<ImplWinFontEntry*>( pFont->mpFontEntry );
-    mpWinFontData[ nFallbackLevel ] = static_cast<ImplWinFontData*>( pFont->mpFontData );
-
     HFONT hNewFont = 0;
-    HFONT hOldFont;
 
     HDC hdcScreen = 0;
     if( mbVirDev )
@@ -1255,15 +1244,15 @@
     if( aSalShlData.mbWNT )
     {
         LOGFONTW aLogFont;
-        ImplGetLogFontFromFontSelect( mhDC, pFont, aLogFont, true );
+        ImplGetLogFontFromFontSelect( mhDC, i_pFont, aLogFont, true );
 
         // on the display we prefer Courier New when Courier is a
         // bitmap only font and we need to stretch or rotate it
         if( mbScreen
-        &&  (pFont->mnWidth != 0
-          || pFont->mnOrientation != 0
-          || pFont->mpFontData == NULL
-          || (pFont->mpFontData->GetHeight() != pFont->mnHeight))
+        &&  (i_pFont->mnWidth != 0
+          || i_pFont->mnOrientation != 0
+          || i_pFont->mpFontData == NULL
+          || (i_pFont->mpFontData->GetHeight() != i_pFont->mnHeight))
         && !bImplSalCourierScalable
         && bImplSalCourierNew
         && (ImplSalWICompareAscii( aLogFont.lfFaceName, "Courier" ) == 0) )
@@ -1272,12 +1261,12 @@
         // limit font requests to MAXFONTHEIGHT
         // TODO: share MAXFONTHEIGHT font instance
         if( -aLogFont.lfHeight <= MAXFONTHEIGHT )
-            mfFontScale = 1.0;
+            o_rFontScale = 1.0;
         else
         {
-            mfFontScale = -aLogFont.lfHeight / (float)MAXFONTHEIGHT;
+            o_rFontScale = -aLogFont.lfHeight / (float)MAXFONTHEIGHT;
             aLogFont.lfHeight = -MAXFONTHEIGHT;
-            aLogFont.lfWidth = static_cast<LONG>( aLogFont.lfWidth / mfFontScale );
+            aLogFont.lfWidth = static_cast<LONG>( aLogFont.lfWidth / o_rFontScale );
         }
 
         hNewFont = ::CreateFontIndirectW( &aLogFont );
@@ -1288,7 +1277,7 @@
             // "PRB: Fonts Not Drawn Antialiased on Device Context for DirectDraw Surface"
             SelectFont( hdcScreen, SelectFont( hdcScreen , hNewFont ) );
         }
-        hOldFont = ::SelectFont( mhDC, hNewFont );
+        o_rOldFont = ::SelectFont( mhDC, hNewFont );
 
         TEXTMETRICW aTextMetricW;
         if( !::GetTextMetricsW( mhDC, &aTextMetricW ) )
@@ -1310,15 +1299,15 @@
              // TODO: get them from somewhere else
             mpLogFont = new LOGFONTA;
         LOGFONTA& aLogFont = *mpLogFont;
-        ImplGetLogFontFromFontSelect( mhDC, pFont, aLogFont, true );
+        ImplGetLogFontFromFontSelect( mhDC, i_pFont, aLogFont, true );
 
         // on the display we prefer Courier New when Courier is a
         // bitmap only font and we need to stretch or rotate it
         if( mbScreen
-        &&  (pFont->mnWidth != 0
-          || pFont->mnOrientation != 0
-          || pFont->mpFontData == NULL
-          || (pFont->mpFontData->GetHeight() != pFont->mnHeight))
+        &&  (i_pFont->mnWidth != 0
+          || i_pFont->mnOrientation != 0
+          || i_pFont->mpFontData == NULL
+          || (i_pFont->mpFontData->GetHeight() != i_pFont->mnHeight))
         && !bImplSalCourierScalable
         && bImplSalCourierNew
         && (stricmp( aLogFont.lfFaceName, "Courier" ) == 0) )
@@ -1327,12 +1316,12 @@
         // limit font requests to MAXFONTHEIGHT to work around driver problems
         // TODO: share MAXFONTHEIGHT font instance
         if( -aLogFont.lfHeight <= MAXFONTHEIGHT )
-            mfFontScale = 1.0;
+            o_rFontScale = 1.0;
         else
         {
-            mfFontScale = -aLogFont.lfHeight / (float)MAXFONTHEIGHT;
+            o_rFontScale = -aLogFont.lfHeight / (float)MAXFONTHEIGHT;
             aLogFont.lfHeight = -MAXFONTHEIGHT;
-            aLogFont.lfWidth = static_cast<LONG>( aLogFont.lfWidth / mfFontScale );
+            aLogFont.lfWidth = static_cast<LONG>( aLogFont.lfWidth / o_rFontScale );
         }
 
         hNewFont = ::CreateFontIndirectA( &aLogFont );
@@ -1343,7 +1332,7 @@
             // "PRB: Fonts Not Drawn Antialiased on Device Context for DirectDraw Surface"
             ::SelectFont( hdcScreen, ::SelectFont( hdcScreen , hNewFont ) );
         }
-        hOldFont = ::SelectFont( mhDC, hNewFont );
+        o_rOldFont = ::SelectFont( mhDC, hNewFont );
 
         TEXTMETRICA aTextMetricA;
         // when the font doesn't work try a replacement
@@ -1363,6 +1352,35 @@
 
     if( hdcScreen )
         ::ReleaseDC( NULL, hdcScreen );
+    
+    return hNewFont;
+}
+
+USHORT WinSalGraphics::SetFont( ImplFontSelectData* pFont, int nFallbackLevel )
+{
+    // return early if there is no new font
+    if( !pFont )
+    {
+        // deselect still active font
+        if( mhDefFont )
+            ::SelectFont( mhDC, mhDefFont );
+        // release no longer referenced font handles
+        for( int i = nFallbackLevel; i < MAX_FALLBACK; ++i )
+        {
+            if( mhFonts[i] )
+                ::DeleteFont( mhFonts[i] );
+            mhFonts[ i ] = 0;
+        }
+        mhDefFont = 0;
+        return 0;
+    }
+
+    DBG_ASSERT( pFont->mpFontData, "WinSalGraphics mpFontData==NULL");
+    mpWinFontEntry[ nFallbackLevel ] = reinterpret_cast<ImplWinFontEntry*>( pFont->mpFontEntry );
+    mpWinFontData[ nFallbackLevel ] = static_cast<ImplWinFontData*>( pFont->mpFontData );
+
+    HFONT hOldFont = 0;
+    HFONT hNewFont = ImplDoSetFont( pFont, mfFontScale, hOldFont );
 
     if( !mhDefFont )
     {
@@ -1747,7 +1765,8 @@
             if( (nFontType & RASTER_FONTTYPE) && !(nFontType & DEVICE_FONTTYPE) )
                 return 1;
 
-        ImplFontData* pData = ImplLogMetricToDevFontDataA( pLogFont, &(pMetric->ntmTm), nFontType );
+        ImplWinFontData* pData = ImplLogMetricToDevFontDataA( pLogFont, &(pMetric->ntmTm), nFontType );
+        pData->SetFontId( sal_IntPtr( pInfo->mnFontCount++ ) );
 
         // prefer the system character set, so that we get as much as
         // possible important characters. In the other case we could only
@@ -1802,7 +1821,8 @@
             if( (nFontType & RASTER_FONTTYPE) && !(nFontType & DEVICE_FONTTYPE) )
                 return 1;
 
-        ImplFontData* pData = ImplLogMetricToDevFontDataW( pLogFont, &(pMetric->ntmTm), nFontType );
+        ImplWinFontData* pData = ImplLogMetricToDevFontDataW( pLogFont, &(pMetric->ntmTm), nFontType );
+        pData->SetFontId( sal_IntPtr( pInfo->mnFontCount++ ) );
 
         // knowing Courier to be scalable is nice
         if( pInfo->mbCourier )
@@ -2070,9 +2090,10 @@
         aDFS.maMapName = aFontName;
     */
 
-    ImplFontData* pFontData = new ImplWinFontData( aDFA, 0,
+    ImplWinFontData* pFontData = new ImplWinFontData( aDFA, 0,
         sal::static_int_cast<WIN_BYTE>(nPreferedCharSet),
         sal::static_int_cast<WIN_BYTE>(TMPF_VECTOR|TMPF_TRUETYPE) );
+    pFontData->SetFontId( reinterpret_cast<sal_IntPtr>(pFontData) );
     pFontList->Add( pFontData );
     return true;
 }
@@ -2136,6 +2157,7 @@
     aInfo.mpLogFontW    = NULL;
     aInfo.mbCourier     = false;
     aInfo.mbPrinter     = mbPrinter;
+    aInfo.mnFontCount   = 0;
     if ( !mbPrinter )
     {
         aInfo.mbImplSalCourierScalable  = false;
@@ -2505,7 +2527,9 @@
 
     // TODO: much better solution: move SetFont and restoration of old font to caller
     ScopedFont aOldFont(*this);
-    SetFont( &aIFSD, 0 );
+    float fScale = 0.0;
+    HFONT hOldFont = 0;
+    ImplDoSetFont( &aIFSD, fScale, hOldFont );
 
 #if OSL_DEBUG_LEVEL > 1
     // get font metrics
@@ -2691,22 +2715,123 @@
         return NULL;
 
     // fill the encoding vector
-    typedef std::map< sal_Unicode,sal_Int32> Code2Int;
-    Code2Int& rMap = *new Code2Int;
-#if 0
-    // TODO: get correct encoding vector
-    ImplWinFontData* pWinFontData = reinterpret_cast<ImplWinFontData*>(pFont);
-    GLYPHSET aGlyphSet;
-    aGlyphSet.cbThis = sizeof(aGlyphSet);
-    DWORD aW = ::GetFontUnicodeRanges( mhDC, &aGlyphSet);
-#else
-    for( sal_Unicode i = 32; i < 256; ++i )
-        rMap[i] = i;
+    // currently no nonencoded vector
     if( pNonEncoded )
         *pNonEncoded = NULL;
-#endif
 
-    return &rMap;
+    ImplWinFontData* pWinFontData = static_cast<ImplWinFontData*>(pFont);
+    std::map< sal_Unicode,sal_Int32>* pEncoding = pWinFontData->GetEncodingVector();
+    if( pEncoding == NULL )
+    {
+        pEncoding = new std::map< sal_Unicode,sal_Int32>();
+        pWinFontData->SetEncodingVector( pEncoding );
+        #if 0
+        // TODO: get correct encoding vector
+        GLYPHSET aGlyphSet;
+        aGlyphSet.cbThis = sizeof(aGlyphSet);
+        DWORD aW = ::GetFontUnicodeRanges( mhDC, &aGlyphSet);
+        #else
+        for( sal_Unicode i = 32; i < 256; ++i )
+            (*pEncoding)[i] = i;
+        #endif
+    }
+
+    return pEncoding;
+}
+
+//--------------------------------------------------------------------------
+
+void WinSalGraphics::GetGlyphWidths( ImplFontData* pFont,
+                                     bool bVertical,
+                                     std::vector< sal_Int32 >& rWidths,
+                                     std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc )
+{
+    // create matching ImplFontSelectData
+    // we need just enough to get to the font file data
+    ImplFontSelectData aIFSD( *pFont, Size(0,1000), 0, false );
+
+    // TODO: much better solution: move SetFont and restoration of old font to caller
+    ScopedFont aOldFont(*this);
+    
+    float fScale = 0.0;
+    HFONT hOldFont = 0;
+    ImplDoSetFont( &aIFSD, fScale, hOldFont );
+    
+    if( pFont->IsSubsettable() )
+    {
+        // get raw font file data
+        DWORD nFontSize1 = ::GetFontData( mhDC, 0, 0, NULL, 0 );
+        if( nFontSize1 == GDI_ERROR )
+            return;
+        ScopedCharArray xRawFontData(new char[ nFontSize1 ]);
+        DWORD nFontSize2 = ::GetFontData( mhDC, 0, 0, (void*)xRawFontData.get(), nFontSize1 );
+        if( nFontSize1 != nFontSize2 )
+            return;
+
+        // open font file
+        sal_uInt32 nFaceNum = 0;
+        if( !*xRawFontData.get() )  // TTC candidate
+            nFaceNum = ~0U;  // indicate "TTC font extracts only"
+    
+        ScopedTrueTypeFont aSftTTF;
+        int nRC = aSftTTF.open( xRawFontData.get(), nFontSize1, nFaceNum );
+        if( nRC != SF_OK )
+            return;
+    
+        int nGlyphs = GetTTGlyphCount( aSftTTF.get() );
+        if( nGlyphs > 0 )
+        {
+            rWidths.resize(nGlyphs);
+            std::vector<sal_uInt16> aGlyphIds(nGlyphs);
+            for( int i = 0; i < nGlyphs; i++ )
+                aGlyphIds[i] = sal_uInt16(i);
+            TTSimpleGlyphMetrics* pMetrics = ::GetTTSimpleGlyphMetrics( aSftTTF.get(),
+                                                                        &aGlyphIds[0],
+                                                                        nGlyphs,
+                                                                        bVertical ? 1 : 0 );
+            if( pMetrics )
+            {
+                for( int i = 0; i< nGlyphs; i++ )
+                    rWidths[i] = pMetrics[i].adv;
+                free( pMetrics );
+                rUnicodeEnc.clear();
+            }
+            ImplWinFontData* pWinFont = static_cast<ImplWinFontData*>(pFont);
+            ImplFontCharMap* pMap = pWinFont->GetImplFontCharMap();
+			DBG_ASSERT( pMap && pMap->GetCharCount(), "no map" );
+
+			int nCharCount = pMap->GetCharCount();
+            sal_uInt32 nChar = pMap->GetFirstChar();
+			for( int i = 0; i < nCharCount; i++ )
+            {
+                if( nChar < 0x00010000 )
+                {
+                    sal_uInt16 nGlyph = ::MapChar( aSftTTF.get(),
+                                                   static_cast<sal_uInt16>(nChar),
+                                                   bVertical ? 1 : 0 );
+                    if( nGlyph )
+                        rUnicodeEnc[ static_cast<sal_Unicode>(nChar) ] = nGlyph;
+                }
+				nChar = pMap->GetNextChar( nChar );
+            }
+        }
+    }
+    else if( pFont->IsEmbeddable() )
+    {
+        // get individual character widths
+        rWidths.clear();
+        rUnicodeEnc.clear();
+        rWidths.reserve( 224 );
+        for( sal_Unicode i = 32; i < 256; ++i )
+        {
+            int nCharWidth = 0;
+            if( ::GetCharWidth32W( mhDC, i, i, &nCharWidth ) )
+            {
+                rUnicodeEnc[ i ] = rWidths.size();
+                rWidths.push_back( nCharWidth );
+            }
+        }
+    }    
 }
 
 //--------------------------------------------------------------------------


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1156
retrieving revision 1.1157
diff -u -r1.1156 -r1.1157
--- openoffice.org.spec	5 Apr 2007 21:54:41 -0000	1.1156
+++ openoffice.org.spec	6 Apr 2007 09:54:59 -0000	1.1157
@@ -132,6 +132,7 @@
 Patch72: openoffice.org-2.2.0.ooo53397.linkopt.patch
 %endif
 Patch73: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
+Patch74: workspace.glyphadv.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1055,6 +1056,7 @@
 %patch72 -p1 -b .ooo53397.linkopt.patch
 %endif
 %patch73 -p1 -b .ooo75790.sc.pa-IN.translate.patch
+%patch74 -p1 -b .workspace.glyphadv.patch
 
 cp %{SOURCE1} extras/source/database/evolocal.odb
 
@@ -2634,6 +2636,7 @@
 - remove openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
   gcc 4.1.2-8 should allow our java components to work again.
 - add a handful of valgrind fixes
+- Resolves: rhbz#235341 workspace.glyphadv.patch
 
 * Tue Mar 27 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.3
 - Resolves: rhbz#233944 openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch



From fedora-cvs-commits at redhat.com  Fri Apr  6 10:16:27 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 06:16:27 -0400
Subject: rpms/brltty/FC-6 brltty-3.7.2-debuginfo.patch, NONE,
	1.1 brltty-3.7.2-vt-buildfix.patch, NONE, 1.1 brltty.spec,
	1.19, 1.20
Message-ID: <200704061016.l36AGRTc016726@cvs.devel.redhat.com>

Author: tjanouse

Update of /cvs/dist/rpms/brltty/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv16703

Modified Files:
	brltty.spec 
Added Files:
	brltty-3.7.2-debuginfo.patch brltty-3.7.2-vt-buildfix.patch 
Log Message:
merge from devel:
* Tue Jan 30 2007 Tomas Janousek <tjanouse at redhat.com> - 3.7.2-2.1
- quiet postinstall scriptlet, really fixes #224570

* Tue Jan 30 2007 Tomas Janousek <tjanouse at redhat.com> - 3.7.2-2
- failsafe postinstall script, fixes #224570
- makefile fix - debuginfo extraction now works

* Thu Jan 25 2007 Tomas Janousek <tjanouse at redhat.com> - 3.7.2-1.1
- fix building with newer kernel-headers (#224149, #235494)


brltty-3.7.2-debuginfo.patch:
 config.mk.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE brltty-3.7.2-debuginfo.patch ---
--- brltty-3.7.2/config.mk.in.debuginfo	2005-12-26 13:58:07.000000000 +0100
+++ brltty-3.7.2/config.mk.in	2007-01-30 12:39:10.000000000 +0100
@@ -89,7 +89,7 @@
 
 INSTALL = @INSTALL@
 INSTALL_SCRIPT = $(INSTALL)
-INSTALL_PROGRAM = $(INSTALL_SCRIPT) -s
+INSTALL_PROGRAM = $(INSTALL_SCRIPT)
 INSTALL_DATA = $(INSTALL) -m 644
 INSTALL_DIRECTORY = $(INSTALL) -d
 

brltty-3.7.2-vt-buildfix.patch:
 api_client.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE brltty-3.7.2-vt-buildfix.patch ---
--- brltty-3.7.2/Programs/api_client.c.vt-buildfix	2005-12-26 13:57:11.000000000 +0100
+++ brltty-3.7.2/Programs/api_client.c	2007-01-25 11:54:44.000000000 +0100
@@ -74,7 +74,7 @@
 
 #ifdef linux
 #include <linux/major.h>
-#include <linux/tty.h>
+#include <linux/vt.h>
 #define MAXIMUM_VIRTUAL_CONSOLE MAX_NR_CONSOLES
 #endif /* linux */
 


Index: brltty.spec
===================================================================
RCS file: /cvs/dist/rpms/brltty/FC-6/brltty.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- brltty.spec	12 Jul 2006 11:48:49 -0000	1.19
+++ brltty.spec	6 Apr 2007 10:16:24 -0000	1.20
@@ -1,11 +1,13 @@
 Name: brltty
 Version: 3.7.2
-Release: 1%{?dist}
+Release: 2.1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://mielke.cc/brltty/
 Source: http://mielke.cc/brltty/releases/%{name}-%{version}.tar.gz
 Patch0: brltty-3.7.2-linux-compiler-h.patch
+Patch1: brltty-3.7.2-vt-buildfix.patch
+Patch2: brltty-3.7.2-debuginfo.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-InstallRoot
 Summary: Braille display driver for Linux/Unix.
 Requires(post): coreutils
@@ -53,6 +55,8 @@
 %prep
 %setup -n brltty-3.7.2
 %patch0 -p1 -b .linux-compiler-h
+%patch1 -p1 -b .vt-buildfix
+%patch2 -p1 -b .debuginfo
 
 %build
 %configure --with-install-root="${RPM_BUILD_ROOT}" --with-braille-driver=-tt
@@ -86,13 +90,12 @@
 if $install
 then
    device="$(set -- ${devices} && echo "${1}")"
-   echo -n "Creating screen inspection device ${device}..."
    mkdir -p "${device%/*}"
    mknod -m o= "${device}" c 7 128
    chmod 660 "${device}"
    chown root.tty "${device}"
-   echo "done."
 fi
+exit 0
 
 %files
 %defattr(-,root,root)
@@ -122,6 +125,16 @@
 %doc Documents/BrlAPIref-HTML
 
 %changelog
+* Tue Jan 30 2007 Tomas Janousek <tjanouse at redhat.com> - 3.7.2-2.1
+- quiet postinstall scriptlet, really fixes #224570
+
+* Tue Jan 30 2007 Tomas Janousek <tjanouse at redhat.com> - 3.7.2-2
+- failsafe postinstall script, fixes #224570
+- makefile fix - debuginfo extraction now works
+
+* Thu Jan 25 2007 Tomas Janousek <tjanouse at redhat.com> - 3.7.2-1.1
+- fix building with newer kernel-headers (#224149, #235494)
+
 * Wed Jul 12 2006 Petr Rockai <prockai at redhat.com> - 3.7.2-1
 - upgrade to latest upstream version
 - split off brlapi and brlapi-devel packages



From fedora-cvs-commits at redhat.com  Fri Apr  6 10:32:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 06:32:31 -0400
Subject: rpms/dovecot/devel .cvsignore, 1.22, 1.23 dovecot.spec, 1.72,
	1.73 sources, 1.23, 1.24
Message-ID: <200704061032.l36AWVum030921@cvs.devel.redhat.com>

Author: tjanouse

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

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
* Fri Apr 06 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0-9.rc30
- update to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dovecot/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	23 Mar 2007 21:31:41 -0000	1.22
+++ .cvsignore	6 Apr 2007 10:32:29 -0000	1.23
@@ -1,4 +1,4 @@
-dovecot-1.0.rc28.tar.gz
-dovecot-1.0.rc28.tar.gz.sig
+dovecot-1.0.rc30.tar.gz
+dovecot-1.0.rc30.tar.gz.sig
 dovecot-sieve-1.0.1.tar.gz
 dovecot-sieve-1.0.1.tar.gz.sig


Index: dovecot.spec
===================================================================
RCS file: /cvs/dist/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- dovecot.spec	30 Mar 2007 12:05:16 -0000	1.72
+++ dovecot.spec	6 Apr 2007 10:32:29 -0000	1.73
@@ -1,6 +1,6 @@
 %define pkg_version 1.0
-%define my_release 8.1
-%define pkg_release %{my_release}.rc28%{?dist}
+%define my_release 9
+%define pkg_release %{my_release}.rc30%{?dist}
 %define pkg_sieve_version 1.0.1
 %define pkg_sieve_release %{my_release}%{?dist}
 
@@ -13,7 +13,7 @@
 
 %define build_postgres 1
 %define build_mysql 1
-%define upstream 1.0.rc28
+%define upstream 1.0.rc30
 
 %define build_sieve 1
 %define sieve_name dovecot-sieve
@@ -295,6 +295,9 @@
 
 
 %changelog
+* Fri Apr 06 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0-9.rc30
+- update to latest upstream
+
 * Fri Mar 30 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0-8.1.rc28
 - spec file cleanup (fixes docs path)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dovecot/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	23 Mar 2007 21:31:41 -0000	1.23
+++ sources	6 Apr 2007 10:32:29 -0000	1.24
@@ -1,4 +1,4 @@
-e6fd617f3210f914815186c176796881  dovecot-1.0.rc28.tar.gz
-a3198c2db6b43472bc3afdd51e538711  dovecot-1.0.rc28.tar.gz.sig
+59470fa98d4004e8e9036934c92eaade  dovecot-1.0.rc30.tar.gz
+4fc0af7695cdb8d7473de8851387a63e  dovecot-1.0.rc30.tar.gz.sig
 b070d2177009bb555cd7e25c710047d5  dovecot-sieve-1.0.1.tar.gz
 c9f5a39ef66e427968141f265c879d60  dovecot-sieve-1.0.1.tar.gz.sig



From fedora-cvs-commits at redhat.com  Fri Apr  6 10:44:25 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 06:44:25 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1157,1.1158
Message-ID: <200704061044.l36AiPQ3006962@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#231924 core/extras merged


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1157
retrieving revision 1.1158
diff -u -r1.1157 -r1.1158
--- openoffice.org.spec	6 Apr 2007 09:54:59 -0000	1.1157
+++ openoffice.org.spec	6 Apr 2007 10:44:22 -0000	1.1158
@@ -316,7 +316,7 @@
 Summary: Afrikaans language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-af
+Requires: hunspell-af
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-af
 Obsoletes: openoffice.org2-langpack-af_ZA
@@ -339,7 +339,7 @@
 Summary: Bulgarian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-bg
+Requires: hunspell-bg
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-bg
 Obsoletes: openoffice.org2-langpack-bg_BG
@@ -363,7 +363,7 @@
 Summary: Catalan language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-ca
+Requires: hunspell-ca
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-ca
 Obsoletes: openoffice.org2-langpack-ca_ES
@@ -375,7 +375,7 @@
 Summary: Czech language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-cs
+Requires: hunspell-cs
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-cs
 Obsoletes: openoffice.org2-langpack-cs_CZ
@@ -387,7 +387,7 @@
 Summary: Welsh language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-cy
+Requires: hunspell-cy
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-cy
 Obsoletes: openoffice.org2-langpack-cy_GB
@@ -400,7 +400,7 @@
 Summary: Danish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-da
+Requires: hunspell-da
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-da
 Obsoletes: openoffice.org2-langpack-da_DK
@@ -413,7 +413,7 @@
 Summary: German language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-de
+Requires: hunspell-de
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-de
 
@@ -425,7 +425,7 @@
 Summary: Greek language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-el
+Requires: hunspell-el
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-el
 Obsoletes: openoffice.org2-langpack-el_GR
@@ -446,7 +446,7 @@
 Summary: Spanish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-es
+Requires: hunspell-es
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-es
 
@@ -457,7 +457,7 @@
 Summary: Estonian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-ee
+Requires: hunspell-ee
 Obsoletes: openoffice.org-langpack-et
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-et_EE
@@ -491,7 +491,7 @@
 Summary: French language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-fr
+Requires: hunspell-fr
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-fr
 
@@ -502,7 +502,7 @@
 Summary: Irish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-ga
+Requires: hunspell-ga
 Obsoletes: openoffice.org2-langpack-ga_IE
 
 %description langpack-ga_IE
@@ -512,7 +512,7 @@
 Summary: Galician language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-gl
+Requires: hunspell-gl
 Obsoletes: openoffice.org-langpack-gl
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-gl_ES
@@ -546,7 +546,7 @@
 Summary: Hebrew language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-he
+Requires: hunspell-he
 Requires: fonts-hebrew
 Obsoletes: openoffice.org-langpack-he
 Obsoletes: openoffice.org-i18n
@@ -571,7 +571,7 @@
 Summary: Hungarian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-hu
+Requires: hunspell-hu
 Obsoletes: openoffice.org-langpack-hu
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-hu_HU
@@ -583,7 +583,7 @@
 Summary: Croatian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-hr
+Requires: hunspell-hr
 Obsoletes: openoffice.org-langpack-hr
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-hr_HR
@@ -595,7 +595,7 @@
 Summary: Italian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-it
+Requires: hunspell-it
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-it
 
@@ -630,7 +630,7 @@
 Summary: Lithuanian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-lt
+Requires: hunspell-lt
 Obsoletes: openoffice.org-langpack-lt
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-lt_LT
@@ -642,7 +642,7 @@
 Summary: Malay language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-ms
+Requires: hunspell-ms
 Obsoletes: openoffice.org-langpack-ms
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-ms_MY
@@ -654,7 +654,7 @@
 Summary: Bokmal language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-nb
+Requires: hunspell-nb
 Obsoletes: openoffice.org-langpack-nb
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-nb_NO
@@ -666,7 +666,7 @@
 Summary: Dutch language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-nl
+Requires: hunspell-nl
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-nl
 
@@ -677,7 +677,7 @@
 Summary: Nynorsk language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-nn
+Requires: hunspell-nn
 Obsoletes: openoffice.org-langpack-nn
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-nn_NO
@@ -697,7 +697,7 @@
 Summary: Polish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-pl
+Requires: hunspell-pl
 Obsoletes: openoffice.org-langpack-pl
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-pl_PL
@@ -709,7 +709,7 @@
 Summary: Portuguese language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-pt
+Requires: hunspell-pt
 Obsoletes: openoffice.org-langpack-pt
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-pt_PT
@@ -721,7 +721,7 @@
 Summary: Brazilian Portuguese language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-pt
+Requires: hunspell-pt
 Obsoletes: openoffice.org-langpack-pt-BR
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-pt_BR
@@ -733,7 +733,7 @@
 Summary: Russian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-ru
+Requires: hunspell-ru
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-ru
 
@@ -744,7 +744,7 @@
 Summary: Slovak language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-sk
+Requires: hunspell-sk
 Obsoletes: openoffice.org-langpack-sk
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-sk_SK
@@ -756,7 +756,7 @@
 Summary: Slovenian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-sl
+Requires: hunspell-sl
 Obsoletes: openoffice.org-langpack-sl
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-sl_SI
@@ -793,7 +793,7 @@
 Summary: Swedish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-sv
+Requires: hunspell-sv
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-sv
 
@@ -815,7 +815,7 @@
 Summary: Thai language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-th
+Requires: hunspell-th
 Obsoletes: openoffice.org-langpack-th
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-th_TH
@@ -907,7 +907,7 @@
 Summary: Zulu language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-# Requires: hunspell-zu
+Requires: hunspell-zu
 Obsoletes: openoffice.org-langpack-zu
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-zu_ZA
@@ -2633,10 +2633,11 @@
 * Wed Apr 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.4
 - Resolves: rhbz#223190 make a final fallback to a font with a known
   working notdef glyph
+- Resolves: rhbz#235341 pdf overlapping characters
+- Resolves: rhbz#231924 core/extras merged, can require dictionaries
 - remove openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
   gcc 4.1.2-8 should allow our java components to work again.
 - add a handful of valgrind fixes
-- Resolves: rhbz#235341 workspace.glyphadv.patch
 
 * Tue Mar 27 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.3
 - Resolves: rhbz#233944 openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch



From fedora-cvs-commits at redhat.com  Fri Apr  6 10:48:34 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 06:48:34 -0400
Subject: rpms/iputils/FC-6 iputils.spec,1.44,1.45
Message-ID: <200704061048.l36AmYwM010020@cvs.devel.redhat.com>

Author: mbacovsk

Update of /cvs/dist/rpms/iputils/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv9766

Modified Files:
	iputils.spec 
Log Message:
* Fri Apr  6 2007 Martin Bacovsky <mbacovsk at redhat.com> - 20070202-2
- resolves: #235374: Update of iputils starts rdisc, breaking connectivity 



Index: iputils.spec
===================================================================
RCS file: /cvs/dist/rpms/iputils/FC-6/iputils.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- iputils.spec	3 Apr 2007 17:06:21 -0000	1.44
+++ iputils.spec	6 Apr 2007 10:48:32 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: Network monitoring tools including ping.
 Name: iputils
 Version: 20070202
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 URL: http://www.skbuff.net/iputils
 Group: System Environment/Daemons
@@ -110,7 +110,10 @@
 
 %postun
 if [ "$1" -ge "1" ]; then
-    service rdisc restart >/dev/null 2>&1 || :
+	service rdisc status 2>&1 > /dev/null
+	if [ $? -eq 0 ]; then
+		service rdisc restart >/dev/null 2>&1 || :
+	fi
 fi
 
 
@@ -142,6 +145,9 @@
 %config(noreplace) %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
+* Fri Apr  6 2007 Martin Bacovsky <mbacovsk at redhat.com> - 20070202-2
+- resolves: #235374: Update of iputils starts rdisc, breaking connectivity 
+
 * Tue Apr  3 2007 Martin Bacovsky <mbacovsk at redhat.com> - 20070202-1
 - upgrade to new upstream 20070202
 - old and unused patches removed



From fedora-cvs-commits at redhat.com  Fri Apr  6 10:57:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 06:57:47 -0400
Subject: rpms/util-linux/devel util-linux-2.13-hwclock-systohc.patch, NONE,
	1.1 util-linux-2.13-mount-fake.patch, NONE,
	1.1 util-linux-2.13-umount-sysfs.patch, 1.1,
	1.2 util-linux.spec, 1.152, 1.153
Message-ID: <200704061057.l36Avl37016691@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16604

Modified Files:
	util-linux-2.13-umount-sysfs.patch util-linux.spec 
Added Files:
	util-linux-2.13-hwclock-systohc.patch 
	util-linux-2.13-mount-fake.patch 
Log Message:
* Fri Apr  6 2007 Karel Zak <kzak at redhat.com> 2.13-0.51
- fix #150493 - hwclock --systohc sets clock 0.5 seconds slow
- fix #220873 - starting RPC idmapd: Error: RPC MTAB does not exist.
                (added rpc_pipefs to util-linux-2.13-umount-sysfs.patch)
- fix #227903 - mount -f does not work with NFS-mounted


util-linux-2.13-hwclock-systohc.patch:
 hwclock.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE util-linux-2.13-hwclock-systohc.patch ---
commit 99c392d8ba163e35b9d562dd4bcf7dd476ad3573
Author: Karel Zak <kzak at redhat.com>
Date:   Tue Mar 20 00:32:37 2007 +0100

    hwclock: fix --systohc sets clock 0.5 seconds slow
    
    quote from rh150493:
    
    	The kernel code, when setting the BIOS clock notes that the clock time
    	ticks to the next second 0.5 seconds after adjusting it  (see
    	linux/arch/i386/kernel/time.c).
    
    	hwclock --systohc sets the CMOS clock at the 1 second boundry and thus
    	causes the clock to be wrong by 500ms each time it is reset.  If the
    	clock is set every shutdown then the clock will have a reboot-count
    	related drift as well as the natural drift problems of the clock. Note
    	that this also mucks up the drift calculations, of course.
    
    Signed-off-by: Karel Zak <kzak at redhat.com>

diff --git a/hwclock/hwclock.c b/hwclock/hwclock.c
index 9731dad..820c388 100644
--- a/hwclock/hwclock.c
+++ b/hwclock/hwclock.c
@@ -517,14 +517,19 @@ set_hardware_clock_exact(const time_t sethwtime,
            "Delaying further to reach the next full second.\n"),
            time_diff(beginsystime, refsystime));
   
-  /* Now delay some more until Hardware Clock time newhwtime arrives */
+  /*
+   * Now delay some more until Hardware Clock time newhwtime arrives.  The -500
+   * ms is because the Hardware Clock always sets to your set time plus 500 ms
+   * (because it is designed to update to the next second precisely 500 ms
+   * after you finish the setting).
+   */
   do {
 	  float tdiff;
 	  gettimeofday(&nowsystime, NULL);
 	  tdiff = time_diff(nowsystime, beginsystime);
 	  if (tdiff < 0)
 		  goto time_resync;	/* probably time was reset */
-  } while (time_diff(nowsystime, refsystime) < newhwtime - sethwtime);
+  } while (time_diff(nowsystime, refsystime) - 0.5 < newhwtime - sethwtime);
   
   set_hardware_clock(newhwtime, universal, testing);
 }

util-linux-2.13-mount-fake.patch:
 mount.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE util-linux-2.13-mount-fake.patch ---
--- util-linux-2.13-pre7/mount/mount.c.kzak	2007-02-09 12:54:20.000000000 +0100
+++ util-linux-2.13-pre7/mount/mount.c	2007-02-09 12:54:14.000000000 +0100
@@ -602,6 +602,8 @@
 		 mountargs[i++] = node;
 		 if (sloppy && (strcmp(type, "nfs")==0 || strcmp(type, "nfs4")==0))
 		      mountargs[i++] = "-s";
+		 if (fake)
+		      mountargs[i++] = "-f";
 		 if (nomtab)
 		      mountargs[i++] = "-n";
 		 if (verbose)

util-linux-2.13-umount-sysfs.patch:
 umount.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: util-linux-2.13-umount-sysfs.patch
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux-2.13-umount-sysfs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util-linux-2.13-umount-sysfs.patch	23 Feb 2006 14:19:40 -0000	1.1
+++ util-linux-2.13-umount-sysfs.patch	6 Apr 2007 10:57:45 -0000	1.2
@@ -5,7 +5,7 @@
  		/* nodev stuff: sysfs, usbfs, oprofilefs, ... */
  		if (types == NULL)
 -			types = "noproc,nodevfs,nodevpts";
-+			types = "noproc,nodevfs,nodevpts,nosysfs";
++			types = "noproc,nodevfs,nodevpts,nosysfs,rpc_pipefs";
  		result = umount_all (types, test_opts);
  	} else if (argc < 1) {
  		usage (stderr, 2);


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- util-linux.spec	3 Mar 2007 20:50:41 -0000	1.152
+++ util-linux.spec	6 Apr 2007 10:57:45 -0000	1.153
@@ -9,7 +9,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.50%{?dist}
+Release: 0.51%{?dist}
 License: distributable
 Group: System Environment/Base
 
@@ -243,6 +243,11 @@
 Patch261: util-linux-2.13-namei-logic.patch
 # 222293 - undocumented partx,addpart, delpart
 Patch262: util-linux-2.13-partx-man.patch
+# 150493 - hwclock --systohc sets clock 0.5 seconds slow
+Patch263: util-linux-2.13-hwclock-systohc.patch
+# 227903 - mount -f does not work with NFS-mounted
+Patch264: util-linux-2.13-mount-fake.patch
+
 
 # When adding patches, please make sure that it is easy to find out what bug # the 
 # patch fixes.
@@ -344,6 +349,8 @@
 %patch260 -p1
 %patch261 -p1
 %patch262 -p1
+%patch263 -p1
+%patch264 -p1
 
 %build
 unset LINGUAS || :
@@ -757,6 +764,12 @@
 /sbin/losetup
 
 %changelog
+* Fri Apr  6 2007 Karel Zak <kzak at redhat.com> 2.13-0.51
+- fix #150493 - hwclock --systohc sets clock 0.5 seconds slow
+- fix #220873 - starting RPC idmapd: Error: RPC MTAB does not exist.
+                (added rpc_pipefs to util-linux-2.13-umount-sysfs.patch)
+- fix #227903 - mount -f does not work with NFS-mounted
+
 * Sat Mar  3 2007 David Zeuthen <davidz at redhat.com> 2.13-0.50
 - include ConsoleKit session module by default (#229172)
 



From fedora-cvs-commits at redhat.com  Fri Apr  6 11:01:02 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 07:01:02 -0400
Subject: rpms/iputils/devel iputils.spec,1.47,1.48
Message-ID: <200704061101.l36B12Mm018998@cvs.devel.redhat.com>

Author: mbacovsk

Update of /cvs/dist/rpms/iputils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18895

Modified Files:
	iputils.spec 
Log Message:
* Fri Apr  6 2007 Martin Bacovsky <mbacovsk at redhat.com> - 20070202-3
- resolves: #235374: Update of iputils starts rdisc, breaking connectivity 



Index: iputils.spec
===================================================================
RCS file: /cvs/dist/rpms/iputils/devel/iputils.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- iputils.spec	27 Mar 2007 11:34:20 -0000	1.47
+++ iputils.spec	6 Apr 2007 11:01:00 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: Network monitoring tools including ping
 Name: iputils
 Version: 20070202
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 URL: http://www.skbuff.net/iputils
 Group: System Environment/Daemons
@@ -110,7 +110,10 @@
 
 %postun
 if [ "$1" -ge "1" ]; then
-    service rdisc restart >/dev/null 2>&1 || :
+	service rdisc status 2>&1 > /dev/null
+	if [ $? -eq 0 ]; then
+		service rdisc restart >/dev/null 2>&1 || :
+	fi
 fi
 
 
@@ -142,6 +145,9 @@
 %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
+* Fri Apr  6 2007 Martin Bacovsky <mbacovsk at redhat.com> - 20070202-3
+- resolves: #235374: Update of iputils starts rdisc, breaking connectivity 
+
 * Tue Mar 27 2007 Martin Bacovsky <mbacovsk at redhat.com> - 20070202-2
 - Resolves: #234060: [PATCH] IDN (umlaut domains) support for ping and ping6
   patch provided by Robert Scheck <redhat at linuxnetz.de>



From fedora-cvs-commits at redhat.com  Fri Apr  6 12:03:25 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 08:03:25 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1158,1.1159
Message-ID: <200704061203.l36C3P8p008205@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
merge postponed


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1158
retrieving revision 1.1159
diff -u -r1.1158 -r1.1159
--- openoffice.org.spec	6 Apr 2007 10:44:22 -0000	1.1158
+++ openoffice.org.spec	6 Apr 2007 12:03:22 -0000	1.1159
@@ -316,7 +316,7 @@
 Summary: Afrikaans language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-af
+#Requires: hunspell-af
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-af
 Obsoletes: openoffice.org2-langpack-af_ZA
@@ -339,7 +339,7 @@
 Summary: Bulgarian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-bg
+#Requires: hunspell-bg
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-bg
 Obsoletes: openoffice.org2-langpack-bg_BG
@@ -363,7 +363,7 @@
 Summary: Catalan language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-ca
+#Requires: hunspell-ca
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-ca
 Obsoletes: openoffice.org2-langpack-ca_ES
@@ -375,7 +375,7 @@
 Summary: Czech language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-cs
+#Requires: hunspell-cs
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-cs
 Obsoletes: openoffice.org2-langpack-cs_CZ
@@ -387,7 +387,7 @@
 Summary: Welsh language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-cy
+#Requires: hunspell-cy
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-cy
 Obsoletes: openoffice.org2-langpack-cy_GB
@@ -400,7 +400,7 @@
 Summary: Danish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-da
+#Requires: hunspell-da
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-da
 Obsoletes: openoffice.org2-langpack-da_DK
@@ -413,7 +413,7 @@
 Summary: German language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-de
+#Requires: hunspell-de
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-de
 
@@ -425,7 +425,7 @@
 Summary: Greek language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-el
+#Requires: hunspell-el
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-el
 Obsoletes: openoffice.org2-langpack-el_GR
@@ -446,7 +446,7 @@
 Summary: Spanish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-es
+#Requires: hunspell-es
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-es
 
@@ -457,7 +457,7 @@
 Summary: Estonian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-ee
+#Requires: hunspell-ee
 Obsoletes: openoffice.org-langpack-et
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-et_EE
@@ -491,7 +491,7 @@
 Summary: French language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-fr
+#Requires: hunspell-fr
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-fr
 
@@ -502,7 +502,7 @@
 Summary: Irish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-ga
+#Requires: hunspell-ga
 Obsoletes: openoffice.org2-langpack-ga_IE
 
 %description langpack-ga_IE
@@ -512,7 +512,7 @@
 Summary: Galician language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-gl
+#Requires: hunspell-gl
 Obsoletes: openoffice.org-langpack-gl
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-gl_ES
@@ -546,7 +546,7 @@
 Summary: Hebrew language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-he
+#Requires: hunspell-he
 Requires: fonts-hebrew
 Obsoletes: openoffice.org-langpack-he
 Obsoletes: openoffice.org-i18n
@@ -571,7 +571,7 @@
 Summary: Hungarian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-hu
+#Requires: hunspell-hu
 Obsoletes: openoffice.org-langpack-hu
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-hu_HU
@@ -583,7 +583,7 @@
 Summary: Croatian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-hr
+#Requires: hunspell-hr
 Obsoletes: openoffice.org-langpack-hr
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-hr_HR
@@ -595,7 +595,7 @@
 Summary: Italian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-it
+#Requires: hunspell-it
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-it
 
@@ -630,7 +630,7 @@
 Summary: Lithuanian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-lt
+#Requires: hunspell-lt
 Obsoletes: openoffice.org-langpack-lt
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-lt_LT
@@ -642,7 +642,7 @@
 Summary: Malay language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-ms
+#Requires: hunspell-ms
 Obsoletes: openoffice.org-langpack-ms
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-ms_MY
@@ -654,7 +654,7 @@
 Summary: Bokmal language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-nb
+#Requires: hunspell-nb
 Obsoletes: openoffice.org-langpack-nb
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-nb_NO
@@ -666,7 +666,7 @@
 Summary: Dutch language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-nl
+#Requires: hunspell-nl
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-nl
 
@@ -677,7 +677,7 @@
 Summary: Nynorsk language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-nn
+#Requires: hunspell-nn
 Obsoletes: openoffice.org-langpack-nn
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-nn_NO
@@ -697,7 +697,7 @@
 Summary: Polish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-pl
+#Requires: hunspell-pl
 Obsoletes: openoffice.org-langpack-pl
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-pl_PL
@@ -709,7 +709,7 @@
 Summary: Portuguese language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-pt
+#Requires: hunspell-pt
 Obsoletes: openoffice.org-langpack-pt
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-pt_PT
@@ -721,7 +721,7 @@
 Summary: Brazilian Portuguese language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-pt
+#Requires: hunspell-pt
 Obsoletes: openoffice.org-langpack-pt-BR
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-pt_BR
@@ -733,7 +733,7 @@
 Summary: Russian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-ru
+#Requires: hunspell-ru
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-ru
 
@@ -744,7 +744,7 @@
 Summary: Slovak language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-sk
+#Requires: hunspell-sk
 Obsoletes: openoffice.org-langpack-sk
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-sk_SK
@@ -756,7 +756,7 @@
 Summary: Slovenian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-sl
+#Requires: hunspell-sl
 Obsoletes: openoffice.org-langpack-sl
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-sl_SI
@@ -793,7 +793,7 @@
 Summary: Swedish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-sv
+#Requires: hunspell-sv
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-sv
 
@@ -815,7 +815,7 @@
 Summary: Thai language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-th
+#Requires: hunspell-th
 Obsoletes: openoffice.org-langpack-th
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-th_TH
@@ -907,7 +907,7 @@
 Summary: Zulu language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-zu
+#Requires: hunspell-zu
 Obsoletes: openoffice.org-langpack-zu
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-zu_ZA
@@ -2634,7 +2634,6 @@
 - Resolves: rhbz#223190 make a final fallback to a font with a known
   working notdef glyph
 - Resolves: rhbz#235341 pdf overlapping characters
-- Resolves: rhbz#231924 core/extras merged, can require dictionaries
 - remove openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
   gcc 4.1.2-8 should allow our java components to work again.
 - add a handful of valgrind fixes



From fedora-cvs-commits at redhat.com  Fri Apr  6 12:06:10 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 08:06:10 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1159,1.1160
Message-ID: <200704061206.l36C6AHd008299@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
merge postponed, let's build to get a working java again


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1159
retrieving revision 1.1160
diff -u -r1.1159 -r1.1160
--- openoffice.org.spec	6 Apr 2007 12:03:22 -0000	1.1159
+++ openoffice.org.spec	6 Apr 2007 12:06:08 -0000	1.1160
@@ -2630,12 +2630,12 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Wed Apr 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.4
+* Fri Apr 06 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.4
+- Resolves: rhbz#235341 pdf overlapping characters
 - Resolves: rhbz#223190 make a final fallback to a font with a known
   working notdef glyph
-- Resolves: rhbz#235341 pdf overlapping characters
 - remove openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-  gcc 4.1.2-8 should allow our java components to work again.
+  because gcc 4.1.2-8 should allow our java components to work again.
 - add a handful of valgrind fixes
 
 * Tue Mar 27 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.3



From fedora-cvs-commits at redhat.com  Fri Apr  6 12:08:39 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 08:08:39 -0400
Subject: rpms/openoffice.org/FC-6 openoffice.org.spec,1.937,1.938
Message-ID: <200704061208.l36C8dBe008374@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
let's build it


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v
retrieving revision 1.937
retrieving revision 1.938
diff -u -r1.937 -r1.938
--- openoffice.org.spec	6 Apr 2007 09:54:49 -0000	1.937
+++ openoffice.org.spec	6 Apr 2007 12:08:37 -0000	1.938
@@ -1,6 +1,6 @@
 %define oootag OOD680
 %define ooomilestone 5
-%define rh_rpm_release 5.19.unreleased
+%define rh_rpm_release 5.19
 
 # gcc#19664#
 %define stlvisibilityfcked 1



From fedora-cvs-commits at redhat.com  Fri Apr  6 12:35:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 08:35:31 -0400
Subject: rpms/openoffice.org/FC-6 pseudoworkspace.valgrind1.patch,1.8,1.9
Message-ID: <200704061235.l36CZVMk024532@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	pseudoworkspace.valgrind1.patch 
Log Message:
can't be that

pseudoworkspace.valgrind1.patch:
 configmgr/source/tree/cmtree.cxx                                   |    4 
 connectivity/source/drivers/evoab2/NResultSet.cxx                  |    6 -
 framework/source/uiconfiguration/moduleimagemanager.cxx            |    9 ++
 inc/SwBitArray.hxx                                                 |    0 
 inc/SwRewriter.hxx                                                 |    0 
 inc/msdffdef.hxx                                                   |    0 
 inc/osl/file.hxx                                                   |    0 
 inc/viewfrm.hxx                                                    |    0 
 lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx |    1 
 osl/unx/process.c                                                  |    0 
 psprint/source/helper/ppdparser.cxx                                |    2 
 sal/inc/osl/file.hxx                                               |    5 +
 sal/osl/unx/process.c                                              |    6 -
 sfx2/inc/viewfrm.hxx                                               |    8 +
 sfx2/source/explorer/nochaos.cxx                                   |    4 
 shell/source/backends/gconfbe/gconflayer.cxx                       |   23 +++--
 slideshow/source/engine/smilfunctionparser.cxx                     |    2 
 source/backends/gconfbe/gconflayer.cxx                             |    0 
 source/core/bastyp/SwBitArray.cxx                                  |    0 
 source/customshapes/EnhancedCustomShapeFunctionParser.cxx          |    0 
 source/cxxhelp/provider/databases.cxx                              |    0 
 source/cxxhelp/provider/db.cxx                                     |    0 
 source/cxxhelp/provider/db.hxx                                     |    0 
 source/engine/smilfunctionparser.cxx                               |    0 
 source/explorer/nochaos.cxx                                        |    0 
 source/glyphs/gcach_ftyp.cxx                                       |    0 
 source/helper/ppdparser.cxx                                        |    0 
 source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx                |    0 
 source/misc/transfer.cxx                                           |    0 
 source/msfilter/msdffimp.cxx                                       |    0 
 source/tree/cmtree.cxx                                             |    0 
 svtools/source/misc/transfer.cxx                                   |    1 
 svx/inc/msdffdef.hxx                                               |    1 
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx      |    2 
 svx/source/msfilter/msdffimp.cxx                                   |    4 
 sw/inc/SwBitArray.hxx                                              |    4 
 sw/inc/SwRewriter.hxx                                              |    1 
 sw/inc/numrule.hxx                                                 |   18 ++--
 sw/source/core/bastyp/SwBitArray.cxx                               |    2 
 sw/source/core/doc/docnum.cxx                                      |    5 -
 sw/source/core/doc/number.cxx                                      |   11 ++
 unx/gtk/gdi/salnativewidgets-gtk.cxx                               |    0 
 unx/source/app/saldisp.cxx                                         |    0 
 unx/source/gdi/salvd.cxx                                           |    0 
 vcl/source/glyphs/gcach_ftyp.cxx                                   |    3 
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx                           |    3 
 vcl/unx/inc/saldisp.hxx                                            |    2 
 vcl/unx/source/app/saldisp.cxx                                     |    8 +
 vcl/unx/source/gdi/salvd.cxx                                       |    5 +
 xmlhelp/source/cxxhelp/provider/databases.cxx                      |    4 
 xmlhelp/source/cxxhelp/provider/db.cxx                             |   43 ----------
 xmlhelp/source/cxxhelp/provider/db.hxx                             |   24 -----
 52 files changed, 108 insertions(+), 103 deletions(-)

Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pseudoworkspace.valgrind1.patch	5 Apr 2007 14:32:20 -0000	1.8
+++ pseudoworkspace.valgrind1.patch	6 Apr 2007 12:35:28 -0000	1.9
@@ -777,19 +777,3 @@
  	BYTE   nVer;
  	if( ReadCommonRecordHeader( rBLIPStream, nVer, nInst, nFbt, nLength) && ( 0xF018 <= nFbt ) && ( 0xF117 >= nFbt ) )
  	{
-Index: source/core/txtnode/thints.cxx
-===================================================================
-RCS file: /cvs/sw/sw/source/core/txtnode/thints.cxx,v
-retrieving revision 1.43.36.6
-diff -u -r1.43.36.6 thints.cxx
---- openoffice.org.orig/sw/source/core/txtnode/thints.cxx	20 Mar 2007 12:48:03 -0000	1.43.36.6
-+++ openoffice.org/sw/source/core/txtnode/thints.cxx	5 Apr 2007 14:25:12 -0000
-@@ -2138,7 +2138,7 @@
- 
-         BuildPortions( rNode, *pHint, nMode );
- 
--        if ( nHtStart < *pHtEnd ) // skip merging for 0-length attributes
-+        if ( nHtStart < nHintEnd ) // skip merging for 0-length attributes
-             MergePortions( rNode );
-     }
-     else



From fedora-cvs-commits at redhat.com  Fri Apr  6 12:49:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 08:49:47 -0400
Subject: rpms/openoffice.org/FC-6
	openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch,
	1.2, 1.3
Message-ID: <200704061249.l36CnlAm002461@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch 
Log Message:
belt and braces for visibility problem

openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch:
 cppuhelper/compbase.hxx                   |    3 ++-
 cppuhelper/compbase1.hxx                  |    4 ++--
 cppuhelper/inc/cppuhelper/compbase10.hxx  |    4 ++--
 cppuhelper/inc/cppuhelper/compbase11.hxx  |    4 ++--
 cppuhelper/inc/cppuhelper/compbase12.hxx  |    4 ++--
 cppuhelper/inc/cppuhelper/compbase2.hxx   |    4 ++--
 cppuhelper/inc/cppuhelper/compbase3.hxx   |    4 ++--
 cppuhelper/inc/cppuhelper/compbase4.hxx   |    4 ++--
 cppuhelper/inc/cppuhelper/compbase5.hxx   |    4 ++--
 cppuhelper/inc/cppuhelper/compbase6.hxx   |    4 ++--
 cppuhelper/inc/cppuhelper/compbase7.hxx   |    4 ++--
 cppuhelper/inc/cppuhelper/compbase8.hxx   |    4 ++--
 cppuhelper/inc/cppuhelper/compbase9.hxx   |    4 ++--
 cppuhelper/inc/cppuhelper/compbase_ex.hxx |    4 ++--
 cppuhelper/inc/cppuhelper/implbase.hxx    |    4 +++-
 cppuhelper/inc/cppuhelper/implbase1.hxx   |    6 +++---
 cppuhelper/inc/cppuhelper/implbase10.hxx  |    6 +++---
 cppuhelper/inc/cppuhelper/implbase11.hxx  |    6 +++---
 cppuhelper/inc/cppuhelper/implbase12.hxx  |    6 +++---
 cppuhelper/inc/cppuhelper/implbase2.hxx   |    6 +++---
 cppuhelper/inc/cppuhelper/implbase3.hxx   |    6 +++---
 cppuhelper/inc/cppuhelper/implbase4.hxx   |    6 +++---
 cppuhelper/inc/cppuhelper/implbase5.hxx   |    6 +++---
 cppuhelper/inc/cppuhelper/implbase6.hxx   |    6 +++---
 cppuhelper/inc/cppuhelper/implbase7.hxx   |    6 +++---
 cppuhelper/inc/cppuhelper/implbase8.hxx   |    6 +++---
 cppuhelper/inc/cppuhelper/implbase9.hxx   |    6 +++---
 cppuhelper/inc/cppuhelper/implbase_ex.hxx |   19 +++++++++++++++++--
 inc/cppuhelper/compbase.hxx               |    0 
 inc/cppuhelper/compbase1.hxx              |    0 
 inc/cppuhelper/compbase10.hxx             |    0 
 inc/cppuhelper/compbase11.hxx             |    0 
 inc/cppuhelper/compbase12.hxx             |    0 
 inc/cppuhelper/compbase2.hxx              |    0 
 inc/cppuhelper/compbase3.hxx              |    0 
 inc/cppuhelper/compbase4.hxx              |    0 
 inc/cppuhelper/compbase5.hxx              |    0 
 inc/cppuhelper/compbase6.hxx              |    0 
 inc/cppuhelper/compbase7.hxx              |    0 
 inc/cppuhelper/compbase8.hxx              |    0 
 inc/cppuhelper/compbase9.hxx              |    0 
 inc/cppuhelper/compbase_ex.hxx            |    0 
 inc/cppuhelper/implbase.hxx               |    0 
 inc/cppuhelper/implbase1.hxx              |    0 
 inc/cppuhelper/implbase10.hxx             |    0 
 inc/cppuhelper/implbase11.hxx             |    0 
 inc/cppuhelper/implbase12.hxx             |    0 
 inc/cppuhelper/implbase2.hxx              |    0 
 inc/cppuhelper/implbase3.hxx              |    0 
 inc/cppuhelper/implbase4.hxx              |    0 
 inc/cppuhelper/implbase5.hxx              |    0 
 inc/cppuhelper/implbase6.hxx              |    0 
 inc/cppuhelper/implbase7.hxx              |    0 
 inc/cppuhelper/implbase8.hxx              |    0 
 inc/cppuhelper/implbase9.hxx              |    0 
 inc/cppuhelper/implbase_ex.hxx            |    0 
 56 files changed, 84 insertions(+), 66 deletions(-)

Index: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch	14 Nov 2006 09:47:52 -0000	1.2
+++ openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch	6 Apr 2007 12:49:45 -0000	1.3
@@ -226,3 +226,647 @@
  
  /** ImplHelper
      @internal
+Index: inc/cppuhelper/compbase.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase.hxx,v
+retrieving revision 1.13
+diff -u -r1.13 compbase.hxx
+--- openoffice.org/cppuhelper/inc/cppuhelper/compbase.hxx	8 Sep 2005 09:03:54 -0000	1.13
++++ openoffice.org.orig/cppuhelperinc/cppuhelper/compbase.hxx	26 Feb 2007 10:08:02 -0000
+@@ -41,7 +41,7 @@
+ #ifndef _CPPUHELPER_IMPLBASE_HXX_
+ #include <cppuhelper/implbase.hxx>
+ #endif
+-
++#pragma GCC visibility push(default)
+ /* This header should not be used anymore.
+    @deprecated
+ */
+@@ -124,4 +124,5 @@
+ __DEF_COMPIMPLHELPER_B( N ) \
+ __DEF_COMPIMPLHELPER_C( N )
+ 
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/compbase1.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase1.hxx,v
+retrieving revision 1.13
+diff -u -r1.13 compbase1.hxx
+--- openoffice.org/cppuhelper/inc/cppuhelper/compbase1.hxx	19 Jun 2006 10:28:17 -0000	1.13
++++ openoffice.org.orig/cppuhelperinc/cppuhelper/compbase1.hxx	26 Feb 2007 10:08:03 -0000
+@@ -45,7 +45,7 @@
+ /*
+ __DEF_COMPIMPLHELPER_EX( 1 )
+ */
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+ 
+@@ -146,5 +146,5 @@
+             { return ImplHelper_getImplementationId( cd::get() ); }
+     };
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/compbase10.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase10.hxx,v
+retrieving revision 1.13
+diff -u -r1.13 compbase10.hxx
+--- openoffice.org/cppuhelper/inc/cppuhelper/compbase10.hxx	19 Jun 2006 10:28:29 -0000	1.13
++++ openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase10.hxx	26 Feb 2007 10:08:03 -0000
+@@ -45,7 +45,7 @@
+ /*
+ __DEF_COMPIMPLHELPER_EX( 10 )
+ */
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+ 
+@@ -146,5 +146,5 @@
+             { return ImplHelper_getImplementationId( cd::get() ); }
+     };
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/compbase11.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase11.hxx,v
+retrieving revision 1.13
+diff -u -r1.13 compbase11.hxx
+--- openoffice.org/cppuhelper/inc/cppuhelper/compbase11.hxx	19 Jun 2006 10:28:40 -0000	1.13
++++ openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase11.hxx	26 Feb 2007 10:08:03 -0000
+@@ -45,7 +45,7 @@
+ /*
+ __DEF_COMPIMPLHELPER_EX( 11 )
+ */
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+ 
+@@ -146,5 +146,5 @@
+             { return ImplHelper_getImplementationId( cd::get() ); }
+     };
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/compbase12.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase12.hxx,v
+retrieving revision 1.13
+diff -u -r1.13 compbase12.hxx
+--- openoffice.org/cppuhelper/inc/cppuhelper/compbase12.hxx	19 Jun 2006 10:28:52 -0000	1.13
++++ openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase12.hxx	26 Feb 2007 10:08:03 -0000
+@@ -45,7 +45,7 @@
+ /*
+ __DEF_COMPIMPLHELPER_EX( 12 )
+ */
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+ 
+@@ -146,5 +146,5 @@
+             { return ImplHelper_getImplementationId( cd::get() ); }
+     };
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/compbase2.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase2.hxx,v
+retrieving revision 1.13
+diff -u -r1.13 compbase2.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase2.hxx	19 Jun 2006 10:29:03 -0000	1.13
++++ openoffice.org/cppuhelper/inc/cppuhelper/compbase2.hxx	26 Feb 2007 10:08:03 -0000
+@@ -45,7 +45,7 @@
+ /*
+ __DEF_COMPIMPLHELPER_EX( 2 )
+ */
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+ 
+@@ -146,5 +146,5 @@
+             { return ImplHelper_getImplementationId( cd::get() ); }
+     };
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/compbase3.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase3.hxx,v
+retrieving revision 1.13
+diff -u -r1.13 compbase3.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase3.hxx	19 Jun 2006 10:29:15 -0000	1.13
++++ /openoffice.org/cppuhelper/inc/cppuhelper/compbase3.hxx	26 Feb 2007 10:08:03 -0000
+@@ -45,7 +45,7 @@
+ /*
+ __DEF_COMPIMPLHELPER_EX( 3 )
+ */
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+ 
+@@ -146,5 +146,5 @@
+             { return ImplHelper_getImplementationId( cd::get() ); }
+     };
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/compbase4.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase4.hxx,v
+retrieving revision 1.13
+diff -u -r1.13 compbase4.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase4.hxx	19 Jun 2006 10:29:26 -0000	1.13
++++ openoffice.org/cppuhelper/inc/cppuhelper/compbase4.hxx	26 Feb 2007 10:08:04 -0000
+@@ -45,7 +45,7 @@
+ /*
+ __DEF_COMPIMPLHELPER_EX( 4 )
+ */
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+ 
+@@ -146,5 +146,5 @@
+             { return ImplHelper_getImplementationId( cd::get() ); }
+     };
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/compbase5.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase5.hxx,v
+retrieving revision 1.13
+diff -u -r1.13 compbase5.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase5.hxx	19 Jun 2006 10:29:38 -0000	1.13
++++ openoffice.org/cppuhelper/inc/cppuhelper/compbase5.hxx	26 Feb 2007 10:08:04 -0000
+@@ -45,7 +45,7 @@
+ /*
+ __DEF_COMPIMPLHELPER_EX( 5 )
+ */
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+ 
+@@ -146,5 +146,5 @@
+             { return ImplHelper_getImplementationId( cd::get() ); }
+     };
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/compbase6.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase6.hxx,v
+retrieving revision 1.13
+diff -u -r1.13 compbase6.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase6.hxx	19 Jun 2006 10:29:53 -0000	1.13
++++ openoffice.org/cppuhelper/inc/cppuhelper/compbase6.hxx	26 Feb 2007 10:08:04 -0000
+@@ -45,7 +45,7 @@
+ /*
+ __DEF_COMPIMPLHELPER_EX( 6 )
+ */
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+ 
+@@ -146,5 +146,5 @@
+             { return ImplHelper_getImplementationId( cd::get() ); }
+     };
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/compbase7.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase7.hxx,v
+retrieving revision 1.13
+diff -u -r1.13 compbase7.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase7.hxx	19 Jun 2006 10:30:06 -0000	1.13
++++ openoffice.org/cppuhelper/inc/cppuhelper/compbase7.hxx	26 Feb 2007 10:08:04 -0000
+@@ -45,7 +45,7 @@
+ /*
+ __DEF_COMPIMPLHELPER_EX( 7 )
+ */
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+ 
+@@ -146,5 +146,5 @@
+             { return ImplHelper_getImplementationId( cd::get() ); }
+     };
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/compbase8.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase8.hxx,v
+retrieving revision 1.13
+diff -u -r1.13 compbase8.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase8.hxx	19 Jun 2006 10:30:19 -0000	1.13
++++ openoffice.org/cppuhelper/inc/cppuhelper/compbase8.hxx	26 Feb 2007 10:08:05 -0000
+@@ -45,7 +45,7 @@
+ /*
+ __DEF_COMPIMPLHELPER_EX( 8 )
+ */
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+ 
+@@ -146,5 +146,5 @@
+             { return ImplHelper_getImplementationId( cd::get() ); }
+     };
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/compbase9.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase9.hxx,v
+retrieving revision 1.13
+diff -u -r1.13 compbase9.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase9.hxx	19 Jun 2006 10:30:40 -0000	1.13
++++ openoffice.org/cppuhelper/inc/cppuhelper/compbase9.hxx	26 Feb 2007 10:08:05 -0000
+@@ -45,7 +45,7 @@
+ /*
+ __DEF_COMPIMPLHELPER_EX( 9 )
+ */
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+ 
+@@ -145,5 +145,5 @@
+             { return ImplHelper_getImplementationId( cd::get() ); }
+     };
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/compbase_ex.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase_ex.hxx,v
+retrieving revision 1.3
+diff -u -r1.3 compbase_ex.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase_ex.hxx	8 Sep 2005 09:10:47 -0000	1.3
++++ openoffice.org/cppuhelper/inc/cppuhelper/compbase_ex.hxx	26 Feb 2007 10:08:05 -0000
+@@ -50,7 +50,7 @@
+ #include <com/sun/star/lang/XComponent.hpp>
+ #endif
+ 
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+ 
+@@ -190,5 +190,5 @@
+     SAL_THROW( (::com::sun::star::uno::RuntimeException) );
+ 
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/implbase.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase.hxx,v
+retrieving revision 1.14
+diff -u -r1.14 implbase.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase.hxx	8 Sep 2005 09:12:29 -0000	1.14
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase.hxx	26 Feb 2007 10:08:05 -0000
+@@ -54,7 +54,7 @@
+ /* This header should not be used anymore.
+    @deprecated
+ */
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+ 
+@@ -310,5 +310,7 @@
+ __DEF_IMPLHELPER_POST_A( N ) \
+ __DEF_IMPLHELPER_POST_B( N ) \
+ __DEF_IMPLHELPER_POST_C( N )
++
++#pragma GCC visibility pop
+ #endif
+ 
+Index: inc/cppuhelper/implbase1.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase1.hxx,v
+retrieving revision 1.16
+diff -u -r1.16 implbase1.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase1.hxx	13 Dec 2006 14:51:42 -0000	1.16
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase1.hxx	26 Feb 2007 10:08:05 -0000
+@@ -44,7 +44,7 @@
+ #ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_
+ #include <com/sun/star/uno/XComponentContext.hpp>
+ #endif
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+     /** @internal */
+@@ -305,5 +305,5 @@
+             { return ImplHelper_getImplementationId( cd::get() ); }
+     };
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/implbase10.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase10.hxx,v
+retrieving revision 1.15
+diff -u -r1.15 implbase10.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase10.hxx	5 Oct 2005 14:24:09 -0000	1.15
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase10.hxx	26 Feb 2007 10:08:05 -0000
+@@ -41,7 +41,7 @@
+ #ifndef INCLUDED_RTL_INSTANCE_HXX
+ #include <rtl/instance.hxx>
+ #endif
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+     /** @internal */
+@@ -308,5 +308,5 @@
+             { return ImplHelper_getImplementationId( cd::get() ); }
+     };
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/implbase11.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase11.hxx,v
+retrieving revision 1.15
+diff -u -r1.15 implbase11.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase11.hxx	5 Oct 2005 14:24:35 -0000	1.15
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase11.hxx	26 Feb 2007 10:08:06 -0000
+@@ -41,7 +41,7 @@
+ #ifndef INCLUDED_RTL_INSTANCE_HXX
+ #include <rtl/instance.hxx>
+ #endif
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+     /** @internal */
+@@ -309,5 +309,5 @@
+             { return ImplHelper_getImplementationId( cd::get() ); }
+     };
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/implbase12.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase12.hxx,v
+retrieving revision 1.15
+diff -u -r1.15 implbase12.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase12.hxx	5 Oct 2005 14:25:08 -0000	1.15
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase12.hxx	26 Feb 2007 10:08:06 -0000
+@@ -41,7 +41,7 @@
+ #ifndef INCLUDED_RTL_INSTANCE_HXX
+ #include <rtl/instance.hxx>
+ #endif
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+     /** @internal */
+@@ -310,5 +310,5 @@
+             { return ImplHelper_getImplementationId( cd::get() ); }
+     };
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/implbase2.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase2.hxx,v
+retrieving revision 1.15
+diff -u -r1.15 implbase2.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase2.hxx	5 Oct 2005 14:25:28 -0000	1.15
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase2.hxx	26 Feb 2007 10:08:06 -0000
+@@ -41,7 +41,7 @@
+ #ifndef INCLUDED_RTL_INSTANCE_HXX
+ #include <rtl/instance.hxx>
+ #endif
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+     /** @internal */
+@@ -299,5 +299,5 @@
+             { return ImplHelper_getImplementationId( cd::get() ); }
+     };
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/implbase3.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase3.hxx,v
+retrieving revision 1.15
+diff -u -r1.15 implbase3.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase3.hxx	5 Oct 2005 14:25:47 -0000	1.15
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase3.hxx	26 Feb 2007 10:08:06 -0000
+@@ -41,7 +41,7 @@
+ #ifndef INCLUDED_RTL_INSTANCE_HXX
+ #include <rtl/instance.hxx>
+ #endif
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+     /** @internal */
+@@ -301,5 +301,5 @@
+             { return ImplHelper_getImplementationId( cd::get() ); }
+     };
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/implbase4.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase4.hxx,v
+retrieving revision 1.15
+diff -u -r1.15 implbase4.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase4.hxx	5 Oct 2005 14:26:03 -0000	1.15
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase4.hxx	26 Feb 2007 10:08:07 -0000
+@@ -41,7 +41,7 @@
+ #ifndef INCLUDED_RTL_INSTANCE_HXX
+ #include <rtl/instance.hxx>
+ #endif
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+     /** @internal */
+@@ -302,5 +302,5 @@
+             { return ImplHelper_getImplementationId( cd::get() ); }
+     };
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/implbase5.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase5.hxx,v
+retrieving revision 1.15
+diff -u -r1.15 implbase5.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase5.hxx	5 Oct 2005 14:26:20 -0000	1.15
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase5.hxx	26 Feb 2007 10:08:07 -0000
+@@ -41,7 +41,7 @@
+ #ifndef INCLUDED_RTL_INSTANCE_HXX
+ #include <rtl/instance.hxx>
+ #endif
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+     /** @internal */
+@@ -303,5 +303,5 @@
+             { return ImplHelper_getImplementationId( cd::get() ); }
+     };
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/implbase6.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase6.hxx,v
+retrieving revision 1.15
+diff -u -r1.15 implbase6.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase6.hxx	5 Oct 2005 14:26:37 -0000	1.15
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase6.hxx	26 Feb 2007 10:08:07 -0000
+@@ -41,7 +41,7 @@
+ #ifndef INCLUDED_RTL_INSTANCE_HXX
+ #include <rtl/instance.hxx>
+ #endif
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+     /** @internal */
+@@ -304,5 +304,5 @@
+             { return ImplHelper_getImplementationId( cd::get() ); }
+     };
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/implbase7.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase7.hxx,v
+retrieving revision 1.15
+diff -u -r1.15 implbase7.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase7.hxx	5 Oct 2005 14:26:54 -0000	1.15
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase7.hxx	26 Feb 2007 10:08:07 -0000
+@@ -41,7 +41,7 @@
+ #ifndef INCLUDED_RTL_INSTANCE_HXX
+ #include <rtl/instance.hxx>
+ #endif
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+     /** @internal */
+@@ -306,5 +306,5 @@
+             { return ImplHelper_getImplementationId( cd::get() ); }
+     };
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/implbase8.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase8.hxx,v
+retrieving revision 1.15
+diff -u -r1.15 implbase8.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase8.hxx	5 Oct 2005 14:27:12 -0000	1.15
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase8.hxx	26 Feb 2007 10:08:08 -0000
+@@ -41,7 +41,7 @@
+ #ifndef INCLUDED_RTL_INSTANCE_HXX
+ #include <rtl/instance.hxx>
+ #endif
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+     /** @internal */
+@@ -306,5 +306,5 @@
+             { return ImplHelper_getImplementationId( cd::get() ); }
+     };
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/implbase9.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase9.hxx,v
+retrieving revision 1.15
+diff -u -r1.15 implbase9.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase9.hxx	5 Oct 2005 14:27:40 -0000	1.15
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase9.hxx	26 Feb 2007 10:08:08 -0000
+@@ -41,7 +41,7 @@
+ #ifndef INCLUDED_RTL_INSTANCE_HXX
+ #include <rtl/instance.hxx>
+ #endif
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+     /** @internal */
+@@ -308,5 +308,5 @@
+             { return ImplHelper_getImplementationId( cd::get() ); }
+     };
+ }
+-
++#pragma GCC visibility pop
+ #endif
+Index: inc/cppuhelper/implbase_ex.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase_ex.hxx,v
+retrieving revision 1.6
+diff -u -r1.6 implbase_ex.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase_ex.hxx	5 Oct 2005 14:27:57 -0000	1.6
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase_ex.hxx	26 Feb 2007 10:08:08 -0000
+@@ -64,7 +64,7 @@
+ __DEF_IMPLHELPER_EX( 3 )
+ */
+ 
+-
++#pragma GCC visibility push(default)
+ namespace cppu
+ {
+ 
+@@ -187,5 +187,5 @@
+     SAL_THROW( (::com::sun::star::uno::RuntimeException) );
+ 
+ }
+-
++#pragma GCC visibility pop
+ #endif



From fedora-cvs-commits at redhat.com  Fri Apr  6 12:53:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 08:53:23 -0400
Subject: rpms/openoffice.org/FC-6 openoffice.org.spec,1.938,1.939
Message-ID: <200704061253.l36CrNsF004978@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
add valgrind suitable alloc item to testtools


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v
retrieving revision 1.938
retrieving revision 1.939
diff -u -r1.938 -r1.939
--- openoffice.org.spec	6 Apr 2007 12:08:37 -0000	1.938
+++ openoffice.org.spec	6 Apr 2007 12:53:21 -0000	1.939
@@ -1208,6 +1208,9 @@
 $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}
 
+#add the debugging libsalalloc_malloc.so.3 library
+cp -f solver/680/unxlng*.pro/lib/libsalalloc_malloc.so.3 $RPM_BUILD_ROOT/%{instdir}/program
+
 #rh#158977# clear execstack requirement
 execstack -c $RPM_BUILD_ROOT/%{instdir}/program/libgcc3_uno.so
 
@@ -2555,6 +2558,7 @@
 %{instdir}/program/hid.lst
 %{instdir}/program/libcommuni680*.so
 %{instdir}/program/libsimplecm680*.so
+%{instdir}/program/libsalalloc_malloc.so.3
 %{instdir}/program/testtoolrc
 %{instdir}/program/testtool.bin
 %dir %{instdir}/program/resource



From fedora-cvs-commits at redhat.com  Fri Apr  6 14:26:07 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 10:26:07 -0400
Subject: rpms/rpcbind/devel rpcbind.spec,1.10,1.11
Message-ID: <200704061426.l36EQ7hs032222@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/rpcbind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32196

Modified Files:
	rpcbind.spec 
Log Message:
- Fixed the Provides and Obsoletes statments to correctly
  obsolete the portmap package.



Index: rpcbind.spec
===================================================================
RCS file: /cvs/dist/rpms/rpcbind/devel/rpcbind.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rpcbind.spec	3 Apr 2007 13:23:00 -0000	1.10
+++ rpcbind.spec	6 Apr 2007 14:26:04 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           rpcbind
 Version:        0.1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Universal Addresses to RPC Program Number Napper
 Group:          System Environment/Daemons
 License:        GPL
@@ -19,8 +19,8 @@
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/chkconfig
 
-Provides: rpcinfo = %{version}-%{release}
-Obsoletes: portmap < 0.1.4-1
+Provides: portmap = %{version}-%{release}
+Obsoletes: portmap <= 4.0-65.3
 
 Patch1: rpcbind-0.1.4-compile.patch
 Patch2: rpcbind-0.1.4-debug.patch
@@ -117,6 +117,9 @@
 %dir %attr(700,rpc,rpc) /var/lib/rpcbind
 
 %changelog
+* Fri Apr  6 2007 Steve Dickson <steved at redhat.com> 0.1.4-3
+- Fixed the Provides and Obsoletes statments to correctly
+  obsolete the portmap package.
 * Tue Apr  3 2007 Steve Dickson <steved at redhat.com> 0.1.4-2
 - Added dependency on glibc-common which allows the
   rpcinfo command to be installed in the correct place.



From fedora-cvs-commits at redhat.com  Fri Apr  6 14:40:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 10:40:31 -0400
Subject: rpms/hexedit/devel hexedit.spec,1.22,1.23
Message-ID: <200704061440.l36EeV0k019316@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/hexedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19150

Modified Files:
	hexedit.spec 
Log Message:
- spec fixes



Index: hexedit.spec
===================================================================
RCS file: /cvs/dist/rpms/hexedit/devel/hexedit.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- hexedit.spec	29 Nov 2006 09:00:28 -0000	1.22
+++ hexedit.spec	6 Apr 2007 14:40:24 -0000	1.23
@@ -1,18 +1,18 @@
-Summary: A hexadecimal file viewer and editor.
+Summary: A hexadecimal file viewer and editor
 Name: hexedit
 Version: 1.2.12
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Editors
 URL: http://merd.sourceforge.net/pixel/hexedit.html
 Source: http://merd.net/pixel/%{name}-%{version}.src.tgz
 Patch: hexedit-1.2.2-config.patch
-BuildPrereq: ncurses-devel
-Buildroot: %{_tmppath}/%{name}-root
+BuildRequires: ncurses-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-Hexedit shows a file both in ASCII and in hexadecimal. The file can be a device as
-the file is read a piece at a time. Hexedit can be used to modify the file
+Hexedit shows a file both in ASCII and in hexadecimal. The file can be a device
+as the file is read a piece at a time. Hexedit can be used to modify the file
 and search through it.
 
 %prep
@@ -27,7 +27,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall mandir=$RPM_BUILD_ROOT%{_mandir}
+make install mandir=$RPM_BUILD_ROOT%{_mandir} bindir=$RPM_BUILD_ROOT%{_bindir}
 
 %clean 
 rm -rf $RPM_BUILD_ROOT
@@ -39,6 +39,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Apr 06 2007 Jindrich Novy <jnovy at redhat.com> 1.2.12-5
+- spec fixes
+
 * Wed Nov 29 2006 Jindrich Novy <jnovy at redhat.com> 1.2.12-4
 - fix URL, add dist tag
 
@@ -152,7 +155,7 @@
 
 * Thu Jul 15 1999 Tim Powers <timp at redhat.com>
 - updated source
-- cleaned up %build section. Now uses make install instead of install
+- cleaned up %%build section. Now uses make install instead of install
   blah....
 -built for 6.1
 



From fedora-cvs-commits at redhat.com  Fri Apr  6 15:08:25 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 11:08:25 -0400
Subject: rpms/openoffice.org/FC-6 workspace.glyphadv.patch,1.1,1.2
Message-ID: <200704061508.l36F8PBO007112@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	workspace.glyphadv.patch 
Log Message:
readjust for 2.0.4

workspace.glyphadv.patch:
 psprint/inc/psprint/fontmanager.hxx        |    5 
 psprint/source/fontmanager/fontmanager.cxx |   72 +++-
 psprint/source/fontsubset/sft.c            |    5 
 psprint/source/fontsubset/sft.h            |    5 
 vcl/inc/outfont.hxx                        |    3 
 vcl/inc/salgdi.hxx                         |    9 
 vcl/source/gdi/makefile.mk                 |    2 
 vcl/source/gdi/pdffontcache.cxx            |   85 +++++
 vcl/source/gdi/pdffontcache.hxx            |   92 +++++
 vcl/source/gdi/pdfwriter_impl.cxx          |  485 +++++++++++++++++------------
 vcl/source/gdi/pdfwriter_impl.hxx          |   29 +
 vcl/unx/inc/pspgraphics.h                  |    9 
 vcl/unx/inc/salgdi.h                       |    4 
 vcl/unx/source/gdi/pspgraphics.cxx         |   24 +
 vcl/unx/source/gdi/salgdi3.cxx             |   16 
 vcl/unx/source/gdi/xlfd_extd.cxx           |    5 
 vcl/unx/source/gdi/xlfd_extd.hxx           |    1 
 vcl/win/inc/salgdi.h                       |   19 +
 vcl/win/source/gdi/salgdi3.cxx             |  249 +++++++++++---
 19 files changed, 848 insertions(+), 271 deletions(-)

Index: workspace.glyphadv.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/workspace.glyphadv.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.glyphadv.patch	6 Apr 2007 09:54:50 -0000	1.1
+++ workspace.glyphadv.patch	6 Apr 2007 15:08:22 -0000	1.2
@@ -388,7 +388,7 @@
 diff -u gsl/vcl/source/gdi/pdfwriter_impl.cxx:1.102 gsl/vcl/source/gdi/pdfwriter_impl.cxx:1.102.66.9
 --- gsl/vcl/source/gdi/pdfwriter_impl.cxx:1.102	Thu Dec 21 04:03:14 2006
 +++ gsl/vcl/source/gdi/pdfwriter_impl.cxx	Fri Mar  2 09:10:34 2007
-@@ -718,7 +718,7 @@
+@@ -681,7 +681,7 @@
  
      void append( PDFWriterImpl::PDFPage& rPage, OStringBuffer& rBuffer, Point* pBack = NULL );
  
@@ -397,7 +397,7 @@
  };
  }
  
-@@ -733,7 +733,7 @@
+@@ -696,7 +696,7 @@
      f[5] = 0.0;
  }
  
@@ -406,7 +406,7 @@
  {
      double x = (double)rOrig.X(), y = (double)rOrig.Y();
      return Point( (int)(x*f[0] + y*f[2] + f[4]), (int)(x*f[1] + y*f[3] + f[5]) );
-@@ -1751,6 +1751,7 @@
+@@ -1662,6 +1662,7 @@
  
      virtual ImplFontData*               Clone() const { return new ImplPdfBuiltinFontData(*this); }
      virtual ImplFontEntry*              CreateFontInstance( ImplFontSelectData& ) const;
@@ -414,7 +414,7 @@
  };
  
  inline const ImplPdfBuiltinFontData* GetPdfFontData( const ImplFontData* pFontData )
-@@ -2970,6 +2971,20 @@
+@@ -2861,6 +2862,20 @@
          if( ! writeBuffer( aLine.getStr(), aLine.getLength() ) )
              goto streamend;
      }
@@ -435,7 +435,7 @@
  
      if( nStreamObject )
          // write font descriptor
-@@ -3459,6 +3474,21 @@
+@@ -3351,6 +3366,21 @@
  
                  aFontIDToObject[ lit->m_nFontID ] = nFontObject;
              }
@@ -457,7 +457,7 @@
          }
      }
      osl_removeFile( aTmpName.pData );
-@@ -5166,13 +5196,13 @@
+@@ -5108,13 +5138,13 @@
      return true;
  }
  
@@ -478,7 +478,7 @@
  {
      ImplFontData* pDevFont = m_pReferenceDevice->mpFontEntry->maFontSelData.mpFontData;
      for( int i = 0; i < nGlyphs; i++ )
-@@ -5182,8 +5212,34 @@
+@@ -5124,8 +5154,34 @@
  
          ImplFontData* pCurrentFont = pFallbackFonts[i] ? pFallbackFonts[i] : pDevFont;
  
@@ -514,7 +514,7 @@
  
              FontSubset& rSubset = m_aSubsets[ pCurrentFont ];
              // search for glyphID
-@@ -5218,8 +5274,13 @@
+@@ -5160,8 +5216,13 @@
                  rNewGlyph.m_nFontID = pMappedFontObjects[i];
                  rNewGlyph.m_nSubsetGlyphID = nNewId;
              }
@@ -529,7 +529,7 @@
          {
              sal_Int32 nFontID = 0;
              FontEmbedData::iterator it = m_aEmbeddedFonts.find( pCurrentFont );
-@@ -5302,6 +5363,10 @@
+@@ -5244,6 +5305,10 @@
              }
              pMappedGlyphs[ i ] = (sal_Int8)cChar;
              pMappedFontObjects[ i ] = nCurFontID;
@@ -540,7 +540,7 @@
          }
      }
  }
-@@ -5376,6 +5441,179 @@
+@@ -5318,6 +5383,179 @@
      updateGraphicsState();
  }
  
@@ -720,7 +720,7 @@
  void PDFWriterImpl::drawLayout( SalLayout& rLayout, const String& rText, bool bTextLines )
  {
      // relief takes precedence over shadow (see outdev3.cxx)
-@@ -5392,27 +5630,25 @@
+@@ -5334,27 +5572,25 @@
      const int nMaxGlyphs = 256;
  
      sal_Int32 pGlyphs[nMaxGlyphs];
@@ -752,7 +752,7 @@
      if( m_aCurrentPDFState.m_aFont.GetWidth() )
      {
          Font aFont( m_aCurrentPDFState.m_aFont );
-@@ -5522,26 +5758,13 @@
+@@ -5464,26 +5700,13 @@
  
      FontMetric aRefDevFontMetric = m_pReferenceDevice->GetFontMetric();
  
@@ -785,7 +785,7 @@
          for( int i = 0; i < nGlyphs; i++ )
          {
              if( pGlyphs[i] & GF_FONTMASK )
-@@ -5549,16 +5772,6 @@
+@@ -5491,16 +5714,6 @@
              else
                  pFallbackFonts[i] = NULL;
  
@@ -802,7 +802,7 @@
              if( pCharPosAry[i] >= nMinCharPos && pCharPosAry[i] <= nMaxCharPos )
                  pUnicodes[i] = rText.GetChar( sal::static_int_cast<xub_StrLen>(pCharPosAry[i]) );
              else
-@@ -5568,159 +5781,34 @@
+@@ -5510,159 +5723,35 @@
              // implementations set -1 then to indicate that no direct
              // mapping is possible
          }
@@ -872,9 +872,7 @@
 -            }
 -        }
 -        else // normal case
-+        registerGlyphs( nGlyphs, pGlyphs, pGlyphWidths, pUnicodes, pMappedGlyphs, pMappedFontObjects, pFallbackFonts );
-+        for( int i = 0; i < nGlyphs; i++)
-         {
+-        {
 -            // optimize use of Td vs. Tm
 -            if( fAngle == 0.0 && fXScale == 1.0 && ( !bFirst || fSkew == 0.0 ) )
 -            {
@@ -893,8 +891,8 @@
 -                    aLine.append( ' ' );
 -                    if( bWasYChange )
 -                    {
--                        m_aPages.back().appendMappedLength( (sal_Int32)-aDiff.Y(), aLine, true, &nDiffL );
--                        aCumulativePos.Y() -= nDiffL;
+-                        m_aPages.back().appendMappedLength( (sal_Int32)aDiff.Y(), aLine, true, &nDiffL );
+-                        aCumulativePos.Y() += nDiffL;
 -                    }
 -                    else
 -                    {
@@ -914,14 +912,7 @@
 -                }
 -                aLine.append( " Td " );
 -            }
-+            aGlyphs.push_back( PDFGlyph( aGNGlyphPos,
-+                                         pGlyphWidths[i],
-+                                         pGlyphs[i],
-+                                         pMappedFontObjects[i],
-+                                         pMappedGlyphs[i] ) );
-+            if( bVertical )
-+                aGNGlyphPos.Y() += nAdvanceWidths[i]/rLayout.GetUnitsPerPixel();
-             else
+-            else
 -            {
 -                Matrix3 aMat;
 -                if( fSkew != 0.0 )
@@ -965,23 +956,37 @@
 -
 -                nLast = nNext;
 -            }
-+                aGNGlyphPos.X() += nAdvanceWidths[i]/rLayout.GetUnitsPerPixel();
-         }
-     }
-+    
-+    Point aAlignOffset;
-+    if ( eAlign == ALIGN_BOTTOM )
-+        aAlignOffset.Y() -= aRefDevFontMetric.GetDescent();
-+    else if ( eAlign == ALIGN_TOP )
-+        aAlignOffset.Y() += aRefDevFontMetric.GetAscent();
-+    if( aAlignOffset.X() || aAlignOffset.Y() )
-+        aAlignOffset = aRotScale.transform( aAlignOffset );
+-        }
+-    }
  
-+    if( bVertical )
-+        drawVerticalGlyphs( aGlyphs, aLine, aAlignOffset, aRotScale, fAngle, fXScale, fSkew, nFontHeight );
-+    else
-+        drawHorizontalGlyphs( aGlyphs, aLine, aAlignOffset, fAngle, fXScale, fSkew, nFontHeight, nPixelFontHeight );
-+    
++         registerGlyphs( nGlyphs, pGlyphs, pGlyphWidths, pUnicodes, pMappedGlyphs, pMappedFontObjects, pFallbackFonts );
++         for( int i = 0; i < nGlyphs; i++)
++         {
++             aGlyphs.push_back( PDFGlyph( aGNGlyphPos,
++                                          pGlyphWidths[i],
++                                          pGlyphs[i],
++                                          pMappedFontObjects[i],
++                                          pMappedGlyphs[i] ) );
++             if( bVertical )
++                 aGNGlyphPos.Y() += nAdvanceWidths[i]/rLayout.GetUnitsPerPixel();
++             else
++                 aGNGlyphPos.X() += nAdvanceWidths[i]/rLayout.GetUnitsPerPixel();
++         }
++     }
++     
++     Point aAlignOffset;
++     if ( eAlign == ALIGN_BOTTOM )
++         aAlignOffset.Y() -= aRefDevFontMetric.GetDescent();
++     else if ( eAlign == ALIGN_TOP )
++         aAlignOffset.Y() += aRefDevFontMetric.GetAscent();
++     if( aAlignOffset.X() || aAlignOffset.Y() )
++         aAlignOffset = aRotScale.transform( aAlignOffset );
++ 
++     if( bVertical )
++         drawVerticalGlyphs( aGlyphs, aLine, aAlignOffset, aRotScale, fAngle, fXScale, fSkew, nFontHeight );
++     else
++         drawHorizontalGlyphs( aGlyphs, aLine, aAlignOffset, fAngle, fXScale, fSkew, nFontHeight, nPixelFontHeight );
++     
      // end textobject
      aLine.append( "ET\n" );
      if( bPop )
@@ -1256,7 +1261,7 @@
 diff -u gsl/vcl/win/source/gdi/salgdi3.cxx:1.85 gsl/vcl/win/source/gdi/salgdi3.cxx:1.85.32.1
 --- gsl/vcl/win/source/gdi/salgdi3.cxx:1.85	Thu Jan 25 03:26:50 2007
 +++ gsl/vcl/win/source/gdi/salgdi3.cxx	Fri Mar  2 07:36:02 2007
-@@ -299,6 +299,7 @@
+@@ -262,6 +262,7 @@
      bool                mbImplSalCourierScalable;
      bool                mbImplSalCourierNew;
      bool                mbPrinter;
@@ -1264,7 +1269,7 @@
  };
  
  // =======================================================================
-@@ -654,7 +655,7 @@
+@@ -617,7 +618,7 @@
  
  // -----------------------------------------------------------------------
  
@@ -1273,16 +1278,7 @@
                                           const NEWTEXTMETRICA* pMetric,
                                           DWORD nFontType )
  {
-@@ -662,7 +663,7 @@
-     if ( nFontType & RASTER_FONTTYPE )
-         nHeight = pMetric->tmHeight - pMetric->tmInternalLeading;
- 
--    ImplFontData* pData = new ImplWinFontData(
-+    ImplWinFontData* pData = new ImplWinFontData(
-         WinFont2DevFontAttributes(*pLogFont, *pMetric, nFontType),
-         nHeight,
-         pLogFont->elfLogFont.lfCharSet,
-@@ -673,7 +674,7 @@
+@@ -636,7 +637,7 @@
  
  // -----------------------------------------------------------------------
  
@@ -1291,7 +1287,7 @@
                                           const NEWTEXTMETRICW* pMetric,
                                           DWORD nFontType )
  {
-@@ -681,7 +682,7 @@
+@@ -644,7 +645,7 @@
      if ( nFontType & RASTER_FONTTYPE )
          nHeight = pMetric->tmHeight - pMetric->tmInternalLeading;
  
@@ -1300,7 +1296,7 @@
          WinFont2DevFontAttributes(*pLogFont, *pMetric, nFontType),
          nHeight,
          pLogFont->elfLogFont.lfCharSet,
-@@ -782,7 +783,9 @@
+@@ -745,7 +746,9 @@
      mbHasKoreanRange( false ),
      mbHasCJKSupport( false ),
      mbAliasSymbolsLow( false ),
@@ -1311,7 +1307,7 @@
  {
      SetBitmapSize( 0, nHeight );
  
-@@ -816,6 +819,14 @@
+@@ -779,6 +782,14 @@
  
      if( mpUnicodeMap )
          mpUnicodeMap->DeReference();
@@ -1326,7 +1322,7 @@
  }
  
  // -----------------------------------------------------------------------
-@@ -1221,31 +1232,9 @@
+@@ -1183,31 +1194,9 @@
  
  // -----------------------------------------------------------------------
  
@@ -1359,7 +1355,7 @@
  
      HDC hdcScreen = 0;
      if( mbVirDev )
-@@ -1255,15 +1244,15 @@
+@@ -1217,15 +1206,15 @@
      if( aSalShlData.mbWNT )
      {
          LOGFONTW aLogFont;
@@ -1380,7 +1376,7 @@
          && !bImplSalCourierScalable
          && bImplSalCourierNew
          && (ImplSalWICompareAscii( aLogFont.lfFaceName, "Courier" ) == 0) )
-@@ -1272,12 +1261,12 @@
+@@ -1234,12 +1223,12 @@
          // limit font requests to MAXFONTHEIGHT
          // TODO: share MAXFONTHEIGHT font instance
          if( -aLogFont.lfHeight <= MAXFONTHEIGHT )
@@ -1396,7 +1392,7 @@
          }
  
          hNewFont = ::CreateFontIndirectW( &aLogFont );
-@@ -1288,7 +1277,7 @@
+@@ -1250,7 +1239,7 @@
              // "PRB: Fonts Not Drawn Antialiased on Device Context for DirectDraw Surface"
              SelectFont( hdcScreen, SelectFont( hdcScreen , hNewFont ) );
          }
@@ -1405,7 +1401,7 @@
  
          TEXTMETRICW aTextMetricW;
          if( !::GetTextMetricsW( mhDC, &aTextMetricW ) )
-@@ -1310,15 +1299,15 @@
+@@ -1272,15 +1261,15 @@
               // TODO: get them from somewhere else
              mpLogFont = new LOGFONTA;
          LOGFONTA& aLogFont = *mpLogFont;
@@ -1426,7 +1422,7 @@
          && !bImplSalCourierScalable
          && bImplSalCourierNew
          && (stricmp( aLogFont.lfFaceName, "Courier" ) == 0) )
-@@ -1327,12 +1316,12 @@
+@@ -1289,12 +1278,12 @@
          // limit font requests to MAXFONTHEIGHT to work around driver problems
          // TODO: share MAXFONTHEIGHT font instance
          if( -aLogFont.lfHeight <= MAXFONTHEIGHT )
@@ -1442,7 +1438,7 @@
          }
  
          hNewFont = ::CreateFontIndirectA( &aLogFont );
-@@ -1343,7 +1332,7 @@
+@@ -1305,7 +1294,7 @@
              // "PRB: Fonts Not Drawn Antialiased on Device Context for DirectDraw Surface"
              ::SelectFont( hdcScreen, ::SelectFont( hdcScreen , hNewFont ) );
          }
@@ -1451,7 +1447,7 @@
  
          TEXTMETRICA aTextMetricA;
          // when the font doesn't work try a replacement
-@@ -1363,6 +1352,35 @@
+@@ -1325,6 +1314,35 @@
  
      if( hdcScreen )
          ::ReleaseDC( NULL, hdcScreen );
@@ -1487,7 +1483,7 @@
  
      if( !mhDefFont )
      {
-@@ -1747,7 +1765,8 @@
+@@ -1715,7 +1733,8 @@
              if( (nFontType & RASTER_FONTTYPE) && !(nFontType & DEVICE_FONTTYPE) )
                  return 1;
  
@@ -1497,7 +1493,7 @@
  
          // prefer the system character set, so that we get as much as
          // possible important characters. In the other case we could only
-@@ -1802,7 +1821,8 @@
+@@ -1770,7 +1789,8 @@
              if( (nFontType & RASTER_FONTTYPE) && !(nFontType & DEVICE_FONTTYPE) )
                  return 1;
  
@@ -1507,7 +1503,7 @@
  
          // knowing Courier to be scalable is nice
          if( pInfo->mbCourier )
-@@ -2070,9 +2090,10 @@
+@@ -2036,9 +2056,10 @@
          aDFS.maMapName = aFontName;
      */
  
@@ -1519,7 +1515,7 @@
      pFontList->Add( pFontData );
      return true;
  }
-@@ -2136,6 +2157,7 @@
+@@ -2102,6 +2123,7 @@
      aInfo.mpLogFontW    = NULL;
      aInfo.mbCourier     = false;
      aInfo.mbPrinter     = mbPrinter;
@@ -1527,7 +1523,7 @@
      if ( !mbPrinter )
      {
          aInfo.mbImplSalCourierScalable  = false;
-@@ -2505,7 +2527,9 @@
+@@ -2471,7 +2493,9 @@
  
      // TODO: much better solution: move SetFont and restoration of old font to caller
      ScopedFont aOldFont(*this);
@@ -1538,22 +1534,22 @@
  
  #if OSL_DEBUG_LEVEL > 1
      // get font metrics
-@@ -2691,22 +2715,123 @@
+@@ -2657,23 +2681,122 @@
          return NULL;
  
      // fill the encoding vector
 -    typedef std::map< sal_Unicode,sal_Int32> Code2Int;
 -    Code2Int& rMap = *new Code2Int;
--#if 0
+-#if 0    
 -    // TODO: get correct encoding vector
 -    ImplWinFontData* pWinFontData = reinterpret_cast<ImplWinFontData*>(pFont);
+-    
 -    GLYPHSET aGlyphSet;
 -    aGlyphSet.cbThis = sizeof(aGlyphSet);
 -    DWORD aW = ::GetFontUnicodeRanges( mhDC, &aGlyphSet);
--#else
+-#else    
 -    for( sal_Unicode i = 32; i < 256; ++i )
 -        rMap[i] = i;
-+    // currently no nonencoded vector
      if( pNonEncoded )
          *pNonEncoded = NULL;
 -#endif



From fedora-cvs-commits at redhat.com  Fri Apr  6 15:24:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 11:24:43 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.3050,1.3051
Message-ID: <200704061524.l36FOh0X018953@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	kernel-2.6.spec 
Log Message:
* Fri Apr  6 2007 Kristian H??gsberg <krh at redhat.com>
- Add patches to fix #235463 and possibly #235199 and #231708.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3050
retrieving revision 1.3051
diff -u -r1.3050 -r1.3051
--- kernel-2.6.spec	5 Apr 2007 22:21:27 -0000	1.3050
+++ kernel-2.6.spec	6 Apr 2007 15:24:41 -0000	1.3051
@@ -565,6 +565,11 @@
 # a0ab4547b23c09541bc47a294a1397b3b0415bfe in the linux1394 git tree.
 Patch5000: linux-2.6-firewire.patch
 
+# These two are going upstream and will get folded into patch 5000,
+# this is just to get some testing ASAP.
+Patch5001: linux-2.6-firewire-context-run.patch
+Patch5002: linux-2.6-firewire-check-condition.patch
+ 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
 # amount of drivers they touch. But only these should go here.
@@ -1265,6 +1270,8 @@
 
 # Pull in the new firewire stack
 %patch5000 -p1
+%patch5001 -p1
+%patch5002 -p1
 
 #
 # final stuff
@@ -2242,6 +2249,9 @@
 #  - tux.
 
 %changelog
+* Fri Apr  6 2007 Kristian H??gsberg <krh at redhat.com>
+- Add patches to fix #235463 and possibly #235199 and #231708.
+
 * Thu Apr 05 2007 Dave Jones <davej at redhat.com>
 - Fix kernel.org bugzilla #8301: spinlock fix for flexcop-pci (#234900)
 



From fedora-cvs-commits at redhat.com  Fri Apr  6 15:26:05 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 11:26:05 -0400
Subject: rpms/kernel/devel linux-2.6-firewire-check-condition.patch, NONE,
	1.1 linux-2.6-firewire-context-run.patch, NONE, 1.1
Message-ID: <200704061526.l36FQ5Xd020044@cvs.devel.redhat.com>

Author: krh

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

Added Files:
	linux-2.6-firewire-check-condition.patch 
	linux-2.6-firewire-context-run.patch 
Log Message:
* Fri Apr  6 2007 Kristian H??gsberg <krh at redhat.com>
- Add patches to fix #235463 and possibly #235199 and #231708.


linux-2.6-firewire-check-condition.patch:
 fw-sbp2.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

--- NEW FILE linux-2.6-firewire-check-condition.patch ---
>From ad12bc442b70e3bfd831e197dbaeabcd6086a137 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Kristian_H=C3=B8gsberg?= <krh at redhat.com>
Date: Fri, 6 Apr 2007 10:44:57 -0400
Subject: [PATCH] Report CHECK_CONDITION up to the SCSI stack.

On some devices (e.g. the 3rd generation iPod) the command agent
dies a lot, typically on SCSI level errors.  When it dies it returns
an CHECK_CONDITION status, and we need to propagate this up to the
SCSI stack so it properly recover the device.
---
 drivers/firewire/fw-sbp2.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index 2e5479b..28d0884 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -746,7 +746,8 @@ static struct fw_driver sbp2_driver = {
 	.id_table = sbp2_id_table,
 };
 
-static unsigned int sbp2_status_to_sense_data(u8 * sbp2_status, u8 * sense_data)
+static unsigned int
+sbp2_status_to_sense_data(u8 *sbp2_status, u8 *sense_data)
 {
 	sense_data[0] = 0x70;
 	sense_data[1] = 0x0;
@@ -767,20 +768,19 @@ static unsigned int sbp2_status_to_sense_data(u8 * sbp2_status, u8 * sense_data)
 
 	switch (sbp2_status[0] & 0x3f) {
 	case SAM_STAT_GOOD:
-		return DID_OK;
+		return DID_OK << 16;
 
 	case SAM_STAT_CHECK_CONDITION:
-		/* return CHECK_CONDITION << 1 | DID_OK << 16; */
-		return DID_OK;
+		return DID_OK << 16 | CHECK_CONDITION << 1;
 
 	case SAM_STAT_BUSY:
-		return DID_BUS_BUSY;
+		return DID_BUS_BUSY << 16;
 
 	case SAM_STAT_CONDITION_MET:
 	case SAM_STAT_RESERVATION_CONFLICT:
 	case SAM_STAT_COMMAND_TERMINATED:
 	default:
-		return DID_ERROR;
+		return DID_ERROR << 16;
 	}
 }
 
@@ -801,26 +801,26 @@ complete_command_orb(struct sbp2_orb *base_orb, struct sbp2_status *status)
 
 		switch (status_get_response(*status)) {
 		case SBP2_STATUS_REQUEST_COMPLETE:
-			result = DID_OK;
+			result = DID_OK << 16;
 			break;
 		case SBP2_STATUS_TRANSPORT_FAILURE:
-			result = DID_BUS_BUSY;
+			result = DID_BUS_BUSY << 16;
 			break;
 		case SBP2_STATUS_ILLEGAL_REQUEST:
 		case SBP2_STATUS_VENDOR_DEPENDENT:
 		default:
-			result = DID_ERROR;
+			result = DID_ERROR << 16;
 			break;
 		}
 
-		if (result == DID_OK && status_get_len(*status) > 1)
+		if (result == DID_OK << 16 && status_get_len(*status) > 1)
 			result = sbp2_status_to_sense_data(status_get_data(*status),
 							   orb->cmd->sense_buffer);
 	} else {
 		/* If the orb completes with status == NULL, something
 		 * went wrong, typically a bus reset happened mid-orb
 		 * or when sending the write (less likely). */
-		result = DID_BUS_BUSY;
+		result = DID_BUS_BUSY << 16;
 	}
 
 	dma_unmap_single(device->card->device, orb->base.request_bus,
@@ -841,7 +841,7 @@ complete_command_orb(struct sbp2_orb *base_orb, struct sbp2_status *status)
 				 sizeof orb->request_buffer_bus,
 				 DMA_FROM_DEVICE);
 
-	orb->cmd->result = result << 16;
+	orb->cmd->result = result;
 	orb->done(orb->cmd);
 
 	kfree(orb);
-- 
1.4.4.2


linux-2.6-firewire-context-run.patch:
 fw-ohci.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-firewire-context-run.patch ---
>From 758c2744e2a64aa0c20d229b1f08a6d6b48b8d17 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Kristian_H=C3=B8gsberg?= <krh at redhat.com>
Date: Fri, 6 Apr 2007 10:32:26 -0400
Subject: [PATCH] Check CONTEXT_RUN, not CONTEXT_ACTIVE to se if context is running.

Doh.
---
 drivers/firewire/fw-ohci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 6f9895d..fca7eac 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -661,7 +661,7 @@ at_context_queue_packet(struct context *ctx, struct fw_packet *packet)
 
 	/* If the context isn't already running, start it up. */
 	reg = reg_read(ctx->ohci, control_set(ctx->regs));
-	if ((reg & CONTEXT_ACTIVE) == 0)
+	if ((reg & CONTEXT_RUN) == 0)
 		context_run(ctx, 0);
 
 	return 0;
-- 
1.4.4.2




From fedora-cvs-commits at redhat.com  Fri Apr  6 15:59:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 11:59:53 -0400
Subject: rpms/openoffice.org/FC-6 workspace.glyphadv.patch,1.2,1.3
Message-ID: <200704061559.l36FxrMC023438@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	workspace.glyphadv.patch 
Log Message:
not sch headers in older version

workspace.glyphadv.patch:
 psprint/inc/psprint/fontmanager.hxx        |    5 
 psprint/source/fontmanager/fontmanager.cxx |   72 +++-
 psprint/source/fontsubset/sft.c            |    5 
 psprint/source/fontsubset/sft.h            |    5 
 vcl/inc/outfont.hxx                        |    3 
 vcl/inc/salgdi.hxx                         |    9 
 vcl/source/gdi/makefile.mk                 |    2 
 vcl/source/gdi/pdffontcache.cxx            |   83 ++++
 vcl/source/gdi/pdffontcache.hxx            |   92 +++++
 vcl/source/gdi/pdfwriter_impl.cxx          |  485 +++++++++++++++++------------
 vcl/source/gdi/pdfwriter_impl.hxx          |   29 +
 vcl/unx/inc/pspgraphics.h                  |    9 
 vcl/unx/inc/salgdi.h                       |    4 
 vcl/unx/source/gdi/pspgraphics.cxx         |   24 +
 vcl/unx/source/gdi/salgdi3.cxx             |   16 
 vcl/unx/source/gdi/xlfd_extd.cxx           |    5 
 vcl/unx/source/gdi/xlfd_extd.hxx           |    1 
 vcl/win/inc/salgdi.h                       |   19 +
 vcl/win/source/gdi/salgdi3.cxx             |  249 +++++++++++---
 19 files changed, 846 insertions(+), 271 deletions(-)

Index: workspace.glyphadv.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/workspace.glyphadv.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.glyphadv.patch	6 Apr 2007 15:08:22 -0000	1.2
+++ workspace.glyphadv.patch	6 Apr 2007 15:59:51 -0000	1.3
@@ -201,7 +201,7 @@
 diff -u /dev/null gsl/vcl/source/gdi/pdffontcache.cxx:1.1.2.3
 --- /dev/null	Fri Apr  6 02:48:47 2007
 +++ gsl/vcl/source/gdi/pdffontcache.cxx	Fri Mar  2 08:22:22 2007
-@@ -0,0 +1,85 @@
+@@ -0,0 +1,83 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -237,8 +237,6 @@
 + *
 + ************************************************************************/
 +
-+#include "precompiled_vcl.hxx"
-+
 +#include "pdffontcache.hxx"
 +#include "salgdi.hxx"
 +#include "outfont.hxx"



From fedora-cvs-commits at redhat.com  Fri Apr  6 18:01:46 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 14:01:46 -0400
Subject: rpms/libXfont/devel .cvsignore, 1.12, 1.13 libXfont.spec, 1.30,
	1.31 sources, 1.13, 1.14 built-in-scalable.patch, 1.1, NONE
Message-ID: <200704061801.l36I1kVB014541@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	.cvsignore libXfont.spec sources 
Removed Files:
	built-in-scalable.patch 
Log Message:
auto-import libXfont-1.2.8-1.fc7 on branch devel from libXfont-1.2.8-1.fc7.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	6 Jan 2007 03:57:24 -0000	1.12
+++ .cvsignore	6 Apr 2007 18:01:44 -0000	1.13
@@ -1 +1 @@
-libXfont-1.2.6.tar.bz2
+libXfont-1.2.8.tar.bz2


Index: libXfont.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/libXfont.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- libXfont.spec	17 Jan 2007 21:42:15 -0000	1.30
+++ libXfont.spec	6 Apr 2007 18:01:44 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
-Version: 1.2.6
-Release: 2%{?dist}
+Version: 1.2.8
+Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,7 +9,6 @@
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 Patch0: libXfont-1.2.3-namespace-pollution.patch
-Patch1: built-in-scalable.patch
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
@@ -41,16 +40,9 @@
 %prep
 %setup -q
 #%patch0 -p1 -b .hidden
-%patch1 -p1 -b built-in-scalable.patch
-
-# Disable static library creation by default.
-%define with_static 0
 
 %build
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make 
 
 %install
@@ -95,13 +87,13 @@
 %{_includedir}/X11/fonts/pcf.h
 %{_includedir}/X11/fonts/ft.h
 %{_includedir}/X11/fonts/ftfuncs.h
-%if %{with_static}
-%{_libdir}/libXfont.a
-%endif
 %{_libdir}/libXfont.so
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
+* Fri Apr 06 2007 Adam Jackson <ajax at redhat.com> 1.2.8-1
+- libXfont 1.2.8.
+
 * Wed Jan 17 2007 Kristian H??gsberg <krh at redhat.com> 1.2.6-2
 - Add built-in-scalable.patch to prevent crash when trying to scale
   built-in bitmap fonts.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	6 Jan 2007 03:57:24 -0000	1.13
+++ sources	6 Apr 2007 18:01:44 -0000	1.14
@@ -1 +1 @@
-9f2c956b9a01f20a247a155d75270737  libXfont-1.2.6.tar.bz2
+83b8e21f6ee22512a8f72ba51e2d74f6  libXfont-1.2.8.tar.bz2


--- built-in-scalable.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr  6 18:02:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 14:02:36 -0400
Subject: rpms/libXfont/FC-6 libXfont.spec,1.23,1.24 sources,1.10,1.11
Message-ID: <200704061802.l36I2a9f014620@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	libXfont.spec sources 
Log Message:
* Fri Apr 06 2007 Adam Jackson <ajax at redhat.com> 1.2.8-1
- libXfont 1.2.8.



Index: libXfont.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfont/FC-6/libXfont.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libXfont.spec	12 Sep 2006 18:12:26 -0000	1.23
+++ libXfont.spec	6 Apr 2007 18:02:34 -0000	1.24
@@ -1,6 +1,6 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
-Version: 1.2.2
+Version: 1.2.8
 Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
@@ -8,6 +8,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+Patch0: libXfont-1.2.3-namespace-pollution.patch
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
@@ -38,15 +39,10 @@
 
 %prep
 %setup -q
-
-# Disable static library creation by default.
-%define with_static 0
+#%patch0 -p1 -b .hidden
 
 %build
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make 
 
 %install
@@ -91,13 +87,36 @@
 %{_includedir}/X11/fonts/pcf.h
 %{_includedir}/X11/fonts/ft.h
 %{_includedir}/X11/fonts/ftfuncs.h
-%if %{with_static}
-%{_libdir}/libXfont.a
-%endif
 %{_libdir}/libXfont.so
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
+* Fri Apr 06 2007 Adam Jackson <ajax at redhat.com> 1.2.8-1
+- libXfont 1.2.8.
+
+* Wed Jan 17 2007 Kristian H??gsberg <krh at redhat.com> 1.2.6-2
+- Add built-in-scalable.patch to prevent crash when trying to scale
+  built-in bitmap fonts.
+
+* Fri Jan 05 2007 Adam Jackson <ajax at redhat.com> 1.2.6-1
+- Update to 1.2.6
+
+* Fri Dec 1 2006 Adam Jackson <ajax at redhat.com> 1.2.5-1
+- Update to 1.2.5 from upstream.  Drops CID font support.
+
+* Sat Nov 25 2006 Adam Jackson <ajax at redhat.com> 1.2.3-4.fc7
+- Revert the namespace whatsit until xfs is sorted out.
+
+* Mon Nov 20 2006 Adam Jackson <ajax at redhat.com> 1.2.3-3.fc7
+- libXdmcp-1.0.2-namespace-pollution.patch: One more collision avoider.
+
+* Mon Nov 20 2006 Adam Jackson <ajax at redhat.com> 1.2.3-2.fc7
+- libXfont-1.2.3-namespace-pollution.patch: Hide some symbols from the dynamic
+  linker to avoid colliding with other libs.
+
+* Mon Nov 20 2006 Adam Jackson <ajax at redhat.com> 1.2.3-1.fc6
+- Update to 1.2.3
+
 * Tue Sep 12 2006 Adam Jackson <ajackson at redhat.com> 1.2.2-1.fc6
 - Update to 1.2.2, misc security fixes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXfont/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	12 Sep 2006 18:12:26 -0000	1.10
+++ sources	6 Apr 2007 18:02:34 -0000	1.11
@@ -1 +1 @@
-ea2bf3d122e4491ba589e8fd3576f0a1  libXfont-1.2.2.tar.bz2
+83b8e21f6ee22512a8f72ba51e2d74f6  libXfont-1.2.8.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr  6 18:03:06 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 14:03:06 -0400
Subject: rpms/libXfont/FC-5 libXfont.spec,1.15,1.16 sources,1.8,1.9
Message-ID: <200704061803.l36I36Yq014686@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	libXfont.spec sources 
Log Message:
* Fri Apr 06 2007 Adam Jackson <ajax at redhat.com> 1.2.8-1
- libXfont 1.2.8.



Index: libXfont.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfont/FC-5/libXfont.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libXfont.spec	12 Sep 2006 18:52:21 -0000	1.15
+++ libXfont.spec	6 Apr 2007 18:03:04 -0000	1.16
@@ -1,12 +1,14 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
-Version: 1.2.2
-Release: 1
+Version: 1.2.8
+Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+Patch0: libXfont-1.2.3-namespace-pollution.patch
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
@@ -23,8 +25,10 @@
 %package devel
 Summary: X.Org X11 libXfont development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
+
+Requires: libfontenc-devel
 # NOTE: libXfont headers include proto headers, so this is needed.
 Requires: xorg-x11-proto-devel
 
@@ -35,21 +39,16 @@
 
 %prep
 %setup -q
-
-# Disable static library creation by default.
-%define with_static 0
+#%patch0 -p1 -b .hidden
 
 %build
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make 
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -62,9 +61,9 @@
 
 %files
 %defattr(-,root,root,-)
-# FIXME:  Missing README/INSTALL %doc AUTHORS COPYING README INSTALL ChangeLog
+# FIXME:  Missing README/INSTALL - should file bug upstream.
+#%doc AUTHORS COPYING README INSTALL ChangeLog NEWS
 %doc AUTHORS COPYING ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXfont.so.1
 %{_libdir}/libXfont.so.1.4.1
 
@@ -88,21 +87,58 @@
 %{_includedir}/X11/fonts/pcf.h
 %{_includedir}/X11/fonts/ft.h
 %{_includedir}/X11/fonts/ftfuncs.h
-%if %{with_static}
-%{_libdir}/libXfont.a
-%endif
 %{_libdir}/libXfont.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
-* Tue Sep 12 2006 Adam Jackson <ajackson at redhat.com> - 1.2.2-1
-- Update to 1.2.2, misc security fixes.
+* Fri Apr 06 2007 Adam Jackson <ajax at redhat.com> 1.2.8-1
+- libXfont 1.2.8.
+
+* Wed Jan 17 2007 Kristian H??gsberg <krh at redhat.com> 1.2.6-2
+- Add built-in-scalable.patch to prevent crash when trying to scale
+  built-in bitmap fonts.
+
+* Fri Jan 05 2007 Adam Jackson <ajax at redhat.com> 1.2.6-1
+- Update to 1.2.6
+
+* Fri Dec 1 2006 Adam Jackson <ajax at redhat.com> 1.2.5-1
+- Update to 1.2.5 from upstream.  Drops CID font support.
+
+* Sat Nov 25 2006 Adam Jackson <ajax at redhat.com> 1.2.3-4.fc7
+- Revert the namespace whatsit until xfs is sorted out.
+
+* Mon Nov 20 2006 Adam Jackson <ajax at redhat.com> 1.2.3-3.fc7
+- libXdmcp-1.0.2-namespace-pollution.patch: One more collision avoider.
+
+* Mon Nov 20 2006 Adam Jackson <ajax at redhat.com> 1.2.3-2.fc7
+- libXfont-1.2.3-namespace-pollution.patch: Hide some symbols from the dynamic
+  linker to avoid colliding with other libs.
+
+* Mon Nov 20 2006 Adam Jackson <ajax at redhat.com> 1.2.3-1.fc6
+- Update to 1.2.3
+
+* Tue Sep 12 2006 Adam Jackson <ajackson at redhat.com> 1.2.2-1.fc6
+- Update to 1.2.2, misc security fixes
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.2.0-1.1.fc6
+- rebuild
+
+* Mon Jul 10 2006 Mike A. Harris <mharris at redhat.com> 1.2.0-1.fc6
+- Update to 1.2.0
+
+* Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-3
+- Remove package ownership of mandir/libdir/etc.
+
+* Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-2
+- Added "Requires: libfontenc-devel" for (#185778)
+
+* Sat Apr 01 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
+- Update to 1.1.0 for crash fix and new headers
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-2.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.0-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Mon Jan 23 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXfont/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	12 Sep 2006 18:52:21 -0000	1.8
+++ sources	6 Apr 2007 18:03:04 -0000	1.9
@@ -1 +1 @@
-ea2bf3d122e4491ba589e8fd3576f0a1  libXfont-1.2.2.tar.bz2
+83b8e21f6ee22512a8f72ba51e2d74f6  libXfont-1.2.8.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr  6 18:07:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 14:07:36 -0400
Subject: rpms/xorg-x11-server/devel .cvsignore, 1.23, 1.24 sources, 1.18,
	1.19 xorg-x11-server.spec, 1.215, 1.216
Message-ID: <200704061807.l36I7aBZ014814@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	.cvsignore sources xorg-x11-server.spec 
Log Message:
auto-import xorg-x11-server-1.2.99.905-1.fc7 on branch devel from xorg-x11-server-1.2.99.905-1.fc7.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	30 Mar 2007 19:32:06 -0000	1.23
+++ .cvsignore	6 Apr 2007 18:07:34 -0000	1.24
@@ -1 +1 @@
-xorg-server-1.2.99.903.tar.bz2
+xorg-server-1.2.99.905.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	30 Mar 2007 19:32:06 -0000	1.18
+++ sources	6 Apr 2007 18:07:34 -0000	1.19
@@ -1 +1 @@
-b7c61148bf5827f6a220696381bfba15  xorg-server-1.2.99.903.tar.bz2
+0c755fb74191ba1bca47657be8791bd2  xorg-server-1.2.99.905.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- xorg-x11-server.spec	31 Mar 2007 01:59:13 -0000	1.215
+++ xorg-x11-server.spec	6 Apr 2007 18:07:34 -0000	1.216
@@ -8,8 +8,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.2.99.903
-Release:   2%{?dist}
+Version:   1.2.99.905
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -562,6 +562,9 @@
 
 
 %changelog
+* Fri Apr 06 2007 Adam Jackson <ajax at redhat.com> 1.2.99.905-1
+- xserver 1.3 RC5.
+
 * Fri Mar 30 2007 David Woodhouse <dwmw2 at redhat.com> 1.2.99.903-2
 - Fix regression with PCI domains, but disjoint bus numbers (#207659)
 



From fedora-cvs-commits at redhat.com  Fri Apr  6 18:12:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 14:12:01 -0400
Subject: rpms/libXfont/FC-5 libXfont.spec,1.16,1.17
Message-ID: <200704061812.l36IC1ug014946@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	libXfont.spec 
Log Message:
Fix spec bogon



Index: libXfont.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfont/FC-5/libXfont.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libXfont.spec	6 Apr 2007 18:03:04 -0000	1.16
+++ libXfont.spec	6 Apr 2007 18:11:59 -0000	1.17
@@ -8,7 +8,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
-Patch0: libXfont-1.2.3-namespace-pollution.patch
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros



From fedora-cvs-commits at redhat.com  Fri Apr  6 18:12:28 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 14:12:28 -0400
Subject: rpms/libXfont/FC-6 libXfont.spec,1.24,1.25
Message-ID: <200704061812.l36ICS08015007@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	libXfont.spec 
Log Message:
Fix spec bogon



Index: libXfont.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfont/FC-6/libXfont.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libXfont.spec	6 Apr 2007 18:02:34 -0000	1.24
+++ libXfont.spec	6 Apr 2007 18:12:26 -0000	1.25
@@ -8,7 +8,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
-Patch0: libXfont-1.2.3-namespace-pollution.patch
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros



From fedora-cvs-commits at redhat.com  Fri Apr  6 18:12:59 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 14:12:59 -0400
Subject: rpms/libXfont/devel libXfont.spec,1.31,1.32
Message-ID: <200704061812.l36ICxPf015068@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	libXfont.spec 
Log Message:
Comment out unused patch



Index: libXfont.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/libXfont.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- libXfont.spec	6 Apr 2007 18:01:44 -0000	1.31
+++ libXfont.spec	6 Apr 2007 18:12:57 -0000	1.32
@@ -8,7 +8,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
-Patch0: libXfont-1.2.3-namespace-pollution.patch
+#Patch0: libXfont-1.2.3-namespace-pollution.patch
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros



From fedora-cvs-commits at redhat.com  Fri Apr  6 18:31:40 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 14:31:40 -0400
Subject: rpms/libX11/devel libX11-cve-2007-1667.patch, NONE, 1.1 .cvsignore,
	1.8, 1.9 libX11.spec, 1.33, 1.34
Message-ID: <200704061831.l36IVeUC028701@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libX11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28646/devel

Modified Files:
	.cvsignore libX11.spec 
Added Files:
	libX11-cve-2007-1667.patch 
Log Message:
auto-import libX11-1.0.3-8.fc7 on branch devel from libX11-1.0.3-8.fc7.src.rpm

libX11-cve-2007-1667.patch:
 ImUtil.c |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)

--- NEW FILE libX11-cve-2007-1667.patch ---
From: Matthieu Herrb <matthieu at roadrock.(none)>
Date: Tue, 3 Apr 2007 13:39:52 +0000 (+0200)
Subject: Multiple integer overflows in the XGetPixel() and XInitImage functions
X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/lib/libX11.git;a=commitdiff;h=7dc7ef398b6ad90ccd1680ed9cd1cfdd47312f5a

Multiple integer overflows in the XGetPixel() and XInitImage functions

CVE-2007-1667
---

--- a/src/ImUtil.c
+++ b/src/ImUtil.c
@@ -327,12 +327,13 @@ XImage *XCreateImage (dpy, visual, depth
 {
 	register XImage *image;
 	int bits_per_pixel = 1;
+	int min_bytes_per_line;
 
 	if (depth == 0 || depth > 32 ||
 	    (format != XYBitmap && format != XYPixmap && format != ZPixmap) ||
 	    (format == XYBitmap && depth != 1) ||
 	    (xpad != 8 && xpad != 16 && xpad != 32) ||
-	    offset < 0 || image_bytes_per_line < 0)
+	    offset < 0)
 	    return (XImage *) NULL;
 	if ((image = (XImage *) Xcalloc(1, (unsigned) sizeof(XImage))) == NULL)
 	    return (XImage *) NULL;
@@ -363,16 +364,21 @@ XImage *XCreateImage (dpy, visual, depth
 	/*
 	 * compute per line accelerator.
 	 */
-	if (image_bytes_per_line == 0)
 	{
 	if (format == ZPixmap)
-	    image->bytes_per_line = 
+	    min_bytes_per_line = 
 	       ROUNDUP((bits_per_pixel * width), image->bitmap_pad);
 	else
-	    image->bytes_per_line =
+	    min_bytes_per_line =
 	        ROUNDUP((width + offset), image->bitmap_pad);
 	}
-	else image->bytes_per_line = image_bytes_per_line;
+	if (image_bytes_per_line == 0) {
+	    image->bytes_per_line = min_bytes_per_line;
+	} else if (image_bytes_per_line < min_bytes_per_line) {
+	    return 0;
+	} else {
+	    image->bytes_per_line = image_bytes_per_line;
+	}
 
 	image->bits_per_pixel = bits_per_pixel;
 	image->obdata = NULL;
@@ -384,7 +390,11 @@ XImage *XCreateImage (dpy, visual, depth
 Status XInitImage (image)
     XImage *image;
 {
+	int min_bytes_per_line;
+
 	if (image->depth == 0 || image->depth > 32 ||
+	    image->bits_per_pixel > 32 || image->bitmap_unit > 32 ||
+	    image->bits_per_pixel < 0 || image->bitmap_unit < 0 ||
 	    (image->format != XYBitmap &&
 	     image->format != XYPixmap &&
 	     image->format != ZPixmap) ||
@@ -392,21 +402,24 @@ Status XInitImage (image)
 	    (image->bitmap_pad != 8 &&
 	     image->bitmap_pad != 16 &&
 	     image->bitmap_pad != 32) ||
-	    image->xoffset < 0 || image->bytes_per_line < 0)
+	    image->xoffset < 0)
 	    return 0;
 
 	/*
 	 * compute per line accelerator.
 	 */
-	if (image->bytes_per_line == 0)
-	{
 	if (image->format == ZPixmap)
-	    image->bytes_per_line = 
+	    min_bytes_per_line = 
 	       ROUNDUP((image->bits_per_pixel * image->width),
 		       image->bitmap_pad);
 	else
-	    image->bytes_per_line =
+	    min_bytes_per_line =
 	        ROUNDUP((image->width + image->xoffset), image->bitmap_pad);
+
+	if (image->bytes_per_line == 0) {
+	    image->bytes_per_line = min_bytes_per_line;
+	} else if (image->bytes_per_line < min_bytes_per_line) {
+	    return 0;
 	}
 
 	_XInitImageFuncPtrs (image);


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libX11/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Jul 2006 09:14:31 -0000	1.8
+++ .cvsignore	6 Apr 2007 18:31:38 -0000	1.9
@@ -1,3 +1 @@
-libX11-1.0.1.tar.bz2
-libX11-1.0.2.tar.bz2
 libX11-1.0.3.tar.bz2


Index: libX11.spec
===================================================================
RCS file: /cvs/dist/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- libX11.spec	30 Jan 2007 00:41:53 -0000	1.33
+++ libX11.spec	6 Apr 2007 18:31:38 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.0.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -17,6 +17,7 @@
 Patch2: dont-forward-keycode-0.patch
 Patch3: bug-201284.patch
 Patch4: libX11-fd-leak.patch
+Patch5: libX11-cve-2007-1667.patch
 
 BuildRequires: pkgconfig
 # xproto >= 7.0.6 required
@@ -59,16 +60,12 @@
 %patch2 -p1 -b .dont-forward-keycode-0
 %patch3 -p1 -b .3-bug201284
 %patch4 -p1 -b .xim-fd-leak
-
-# Disable static library creation by default.
-%define with_static 0
+%patch5 -p1 -b .cve-2007-1667
 
 %build
 %configure \
 	--disable-dependency-tracking \
-%if ! %{with_static}
 	--disable-static
-%endif
 
 make %{?_smp_mflags}
 
@@ -242,15 +239,15 @@
 %{_includedir}/X11/Xresource.h
 %{_includedir}/X11/Xutil.h
 %{_includedir}/X11/cursorfont.h
-%if %{with_static}
-%{_libdir}/libX11.a
-%endif
 %{_libdir}/libX11.so
 %{_libdir}/pkgconfig/x11.pc
 #%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Fri Apr 06 2007 Adam Jackson <ajax at redhat.com> 1.0.3-8
+- Fix for CVE 2007-1667.
+
 * Mon Jan 29 2007 Adam Jackson <ajax at redhat.com> 1.0.3-7
 - Fix xim fd leak.
 



From fedora-cvs-commits at redhat.com  Fri Apr  6 18:47:22 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 14:47:22 -0400
Subject: rpms/libX11/FC-6 libX11.spec,1.33,1.34
Message-ID: <200704061847.l36IlMEd007568@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libX11/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv7529

Modified Files:
	libX11.spec 
Log Message:
* Fri Apr 06 2007 Adam Jackson <ajax at redhat.com> 1.0.3-7
- libX11-cve-2007-1667.patch: Fix CVE 2007-1667.



Index: libX11.spec
===================================================================
RCS file: /cvs/dist/rpms/libX11/FC-6/libX11.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- libX11.spec	30 Jan 2007 00:39:06 -0000	1.33
+++ libX11.spec	6 Apr 2007 18:47:20 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.0.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -17,6 +17,7 @@
 Patch2: dont-forward-keycode-0.patch
 Patch3: bug-201284.patch
 Patch4: libX11-fd-leak.patch
+Patch5: libX11-cve-2007-1667.patch
 
 BuildRequires: pkgconfig
 # xproto >= 7.0.6 required
@@ -59,6 +60,7 @@
 %patch2 -p1 -b .dont-forward-keycode-0
 %patch3 -p1 -b .3-bug201284
 %patch4 -p1 -b .xim-fd-leak
+%patch5 -p1 -b .cve-2007-1667
 
 # Disable static library creation by default.
 %define with_static 0
@@ -251,6 +253,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Fri Apr 06 2007 Adam Jackson <ajax at redhat.com> 1.0.3-7
+- libX11-cve-2007-1667.patch: Fix CVE 2007-1667.
+
 * Mon Jan 29 2007 Adam Jackson <ajax at redhat.com> 1.0.3-6.fc6
 - Fix fd leak in xim.
 



From fedora-cvs-commits at redhat.com  Fri Apr  6 18:48:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 6 Apr 2007 14:48:50 -0400
Subject: rpms/libX11/FC-5 libX11.spec,1.17,1.18
Message-ID: <200704061848.l36ImonL008698@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	libX11.spec 
Log Message:
* Fri Apr 06 2007 Adam Jackson <ajax at redhat.com> 1.0.0-4
- libX11-cve-2007-1667.patch: Fix CVE 2007-1667



Index: libX11.spec
===================================================================
RCS file: /cvs/dist/rpms/libX11/FC-5/libX11.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libX11.spec	27 Jun 2006 02:37:30 -0000	1.17
+++ libX11.spec	6 Apr 2007 18:48:48 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.0.0
-Release: 3.FC5.0
+Release: 4%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -12,6 +12,7 @@
 Patch0: libX11-0.99.3-datadir-locale-dir-fix.patch
 Patch1: libX11-1.0.0-Xcursor.patch
 Patch2: libX11-1.0.1-setuid.diff
+Patch3: libX11-cve-2007-1667.patch
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
@@ -46,6 +47,7 @@
 %patch0 -p0 -b .datadir-locale-dir-fix
 %patch1 -p1 -b .Xcursor
 %patch2 -p1 -b .setuid
+%patch3 -p1 -b .cve-2007-1667
 
 # Disable static library creation by default.
 %define with_static 0
@@ -244,6 +246,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Fri Apr 06 2007 Adam Jackson <ajax at redhat.com> 1.0.0-4
+- libX11-cve-2007-1667.patch: Fix CVE 2007-1667
+
 * Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3.FC5.0
 - Added libX11-1.0.1-setuid.diff to fix potential security issue (#196094)
 - Change dependency on "filesystem" package to "xorg-x11-filesystem" package,



From fedora-cvs-commits at redhat.com  Sat Apr  7 11:30:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 7 Apr 2007 07:30:26 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1160,1.1161
Message-ID: <200704071130.l37BUQXa032100@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
rhbz#235325 dubious x86_64 link


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1160
retrieving revision 1.1161
diff -u -r1.1160 -r1.1161
--- openoffice.org.spec	6 Apr 2007 12:06:08 -0000	1.1160
+++ openoffice.org.spec	7 Apr 2007 11:30:17 -0000	1.1161
@@ -1124,8 +1124,8 @@
 cd ../../util
 %if ! %{linkopt}
 `(cat ../$OUTPATH.pro/misc/soffice.soffice_5.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs | xargs`
-$LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/soffice
 %endif
+$LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/soffice
 `( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/swriter) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-writer | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
 `( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/scalc) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-calc| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
 `( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/simpress) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-impress| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
@@ -1148,8 +1148,8 @@
 fi
 %if ! %{linkopt}
 cp -f ../../desktop/$OUTPATH.pro/lib/libsoffice.so $RPM_BUILD_ROOT/%{instdir}/program
-cp -f ../../desktop/$OUTPATH.pro/bin/soffice $RPM_BUILD_ROOT/%{instdir}/program/soffice.bin
 %endif
+cp -f ../../desktop/$OUTPATH.pro/bin/soffice $RPM_BUILD_ROOT/%{instdir}/program/soffice.bin
 cp -f ../../desktop/$OUTPATH.pro/bin/swriter $RPM_BUILD_ROOT/%{instdir}/program/swriter.bin
 cp -f ../../desktop/$OUTPATH.pro/bin/scalc $RPM_BUILD_ROOT/%{instdir}/program/scalc.bin
 cp -f ../../desktop/$OUTPATH.pro/bin/simpress $RPM_BUILD_ROOT/%{instdir}/program/simpress.bin



From fedora-cvs-commits at redhat.com  Sat Apr  7 11:35:22 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 7 Apr 2007 07:35:22 -0400
Subject: rpms/selinux-policy/devel policy-20070219.patch, 1.39,
	1.40 selinux-policy.spec, 1.426, 1.427
Message-ID: <200704071135.l37BZMTq003052@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20070219.patch selinux-policy.spec 
Log Message:
* Thu Apr 5 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-5
- Allow bluetooth to read inotifyfs


policy-20070219.patch:
 Rules.modular                             |   12 +
 policy/flask/access_vectors               |    4 
 policy/global_booleans                    |    2 
 policy/global_tunables                    |   39 +++-
 policy/mls                                |   31 ++-
 policy/modules/admin/acct.te              |    1 
 policy/modules/admin/acct.xml             |   43 +++++
 policy/modules/admin/alsa.xml             |   43 +++++
 policy/modules/admin/amanda.xml           |   85 ++++++++++
 policy/modules/admin/amtu.fc              |    3 
 policy/modules/admin/amtu.if              |   53 ++++++
 policy/modules/admin/amtu.te              |   56 ++++++
 policy/modules/admin/amtu.xml             |   36 ++++
 policy/modules/admin/anaconda.xml         |    3 
 policy/modules/admin/apt.xml              |   95 +++++++++++
 policy/modules/admin/backup.xml           |   35 ++++
 policy/modules/admin/bootloader.te        |    2 
 policy/modules/admin/bootloader.xml       |   79 +++++++++
 policy/modules/admin/certwatch.xml        |   37 ++++
 policy/modules/admin/consoletype.te       |    8 
 policy/modules/admin/consoletype.xml      |   47 +++++
 policy/modules/admin/ddcprobe.xml         |   35 ++++
 policy/modules/admin/dmesg.te             |    1 
 policy/modules/admin/dmesg.xml            |   24 ++
 policy/modules/admin/dmidecode.xml        |   35 ++++
 policy/modules/admin/dpkg.xml             |  125 +++++++++++++++
 policy/modules/admin/firstboot.if         |   18 ++
 policy/modules/admin/firstboot.xml        |   88 ++++++++++
 policy/modules/admin/kudzu.te             |    2 
 policy/modules/admin/kudzu.xml            |   45 +++++
 policy/modules/admin/logrotate.xml        |   75 +++++++++
 policy/modules/admin/logwatch.te          |    2 
 policy/modules/admin/logwatch.xml         |   23 ++
 policy/modules/admin/netutils.te          |    4 
 policy/modules/admin/rpm.fc               |    3 
 policy/modules/admin/rpm.if               |   65 +++++++
 policy/modules/admin/rpm.te               |    2 
 policy/modules/admin/su.if                |    6 
 policy/modules/admin/usermanage.te        |   42 +++--
 policy/modules/apps/games.fc              |    1 
 policy/modules/apps/gnome.if              |   26 +++
 policy/modules/apps/gpg.fc                |    2 
 policy/modules/apps/loadkeys.if           |   44 +----
 policy/modules/apps/mozilla.if            |    1 
 policy/modules/apps/slocate.te            |    4 
 policy/modules/apps/usernetctl.te         |   10 -
 policy/modules/kernel/corecommands.fc     |    7 
 policy/modules/kernel/corecommands.if     |   20 ++
 policy/modules/kernel/corenetwork.if.in   |   54 ++++++
 policy/modules/kernel/corenetwork.te.in   |   18 +-
 policy/modules/kernel/devices.if          |   36 ++++
 policy/modules/kernel/domain.if           |   18 ++
 policy/modules/kernel/domain.te           |   46 +++++
 policy/modules/kernel/files.fc            |    1 
 policy/modules/kernel/files.if            |   81 ++++++++-
 policy/modules/kernel/filesystem.if       |   39 ++++
 policy/modules/kernel/filesystem.te       |   11 +
 policy/modules/kernel/kernel.if           |   23 ++
 policy/modules/kernel/kernel.te           |    2 
 policy/modules/kernel/mls.if              |   20 ++
 policy/modules/kernel/mls.te              |    3 
 policy/modules/kernel/selinux.if          |   38 ++++
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.if         |    2 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/services/apache.fc         |   14 -
 policy/modules/services/apache.if         |  169 +++++++++++++++++++-
 policy/modules/services/apache.te         |   70 ++++++++
 policy/modules/services/apcupsd.fc        |    9 +
 policy/modules/services/apcupsd.if        |  108 +++++++++++++
 policy/modules/services/apcupsd.te        |   81 +++++++++
 policy/modules/services/automount.te      |    2 
 policy/modules/services/bluetooth.te      |    2 
 policy/modules/services/ccs.te            |   12 +
 policy/modules/services/consolekit.fc     |    1 
 policy/modules/services/consolekit.te     |   28 ++-
 policy/modules/services/cron.fc           |    1 
 policy/modules/services/cron.if           |   33 +---
 policy/modules/services/cron.te           |   51 ++++--
 policy/modules/services/cups.te           |    2 
 policy/modules/services/cvs.te            |    2 
 policy/modules/services/cyrus.te          |    5 
 policy/modules/services/dbus.if           |   63 +++++++
 policy/modules/services/dhcp.te           |    2 
 policy/modules/services/djbdns.te         |    5 
 policy/modules/services/dovecot.te        |    5 
 policy/modules/services/ftp.te            |    5 
 policy/modules/services/hal.fc            |    8 
 policy/modules/services/hal.if            |   19 ++
 policy/modules/services/hal.te            |  139 ++++++++++++++++
 policy/modules/services/inetd.te          |    5 
 policy/modules/services/kerberos.if       |   58 ++-----
 policy/modules/services/kerberos.te       |   36 ++++
 policy/modules/services/mta.if            |   19 ++
 policy/modules/services/mta.te            |    2 
 policy/modules/services/networkmanager.te |    2 
 policy/modules/services/nis.if            |    4 
 policy/modules/services/nis.te            |    4 
 policy/modules/services/nscd.te           |   10 +
 policy/modules/services/ntp.te            |    5 
 policy/modules/services/pegasus.if        |   18 ++
 policy/modules/services/pegasus.te        |    6 
 policy/modules/services/postfix.if        |    1 
 policy/modules/services/postfix.te        |    8 
 policy/modules/services/ppp.te            |    9 -
 policy/modules/services/procmail.te       |    1 
 policy/modules/services/pyzor.te          |    1 
 policy/modules/services/radius.te         |    4 
 policy/modules/services/rpc.if            |    5 
 policy/modules/services/rsync.te          |    1 
 policy/modules/services/samba.fc          |    3 
 policy/modules/services/samba.if          |   64 +++++++
 policy/modules/services/samba.te          |   79 +++++++++
 policy/modules/services/sasl.te           |   11 +
 policy/modules/services/sendmail.if       |   20 ++
 policy/modules/services/smartmon.te       |    1 
 policy/modules/services/snmp.te           |   10 +
 policy/modules/services/spamassassin.te   |    7 
 policy/modules/services/squid.fc          |    2 
 policy/modules/services/squid.if          |   22 ++
 policy/modules/services/squid.te          |   12 +
 policy/modules/services/ssh.if            |   39 ++++
 policy/modules/services/ssh.te            |    5 
 policy/modules/services/xserver.te        |   10 -
 policy/modules/services/zabbix.fc         |    4 
 policy/modules/services/zabbix.if         |   87 ++++++++++
 policy/modules/services/zabbix.te         |   64 +++++++
 policy/modules/system/application.fc      |    1 
 policy/modules/system/application.if      |  104 ++++++++++++
 policy/modules/system/application.te      |   14 +
 policy/modules/system/authlogin.if        |   83 ++++++++--
 policy/modules/system/authlogin.te        |    3 
 policy/modules/system/fstools.fc          |    1 
 policy/modules/system/fstools.te          |    1 
 policy/modules/system/fusermount.fc       |    6 
 policy/modules/system/fusermount.if       |   41 +++++
 policy/modules/system/fusermount.te       |   45 +++++
 policy/modules/system/getty.te            |    3 
 policy/modules/system/hostname.te         |   14 +
 policy/modules/system/init.if             |    3 
 policy/modules/system/init.te             |   35 +++-
 policy/modules/system/ipsec.if            |   20 ++
 policy/modules/system/iptables.te         |    4 
 policy/modules/system/libraries.fc        |    8 
 policy/modules/system/libraries.te        |   20 ++
 policy/modules/system/locallogin.te       |    7 
 policy/modules/system/logging.if          |   21 ++
 policy/modules/system/logging.te          |    2 
 policy/modules/system/lvm.te              |    5 
 policy/modules/system/modutils.te         |   11 +
 policy/modules/system/mount.fc            |    3 
 policy/modules/system/mount.if            |   37 ++++
 policy/modules/system/mount.te            |   64 +++++++
 policy/modules/system/raid.te             |    1 
 policy/modules/system/selinuxutil.fc      |    1 
 policy/modules/system/selinuxutil.if      |    5 
 policy/modules/system/selinuxutil.te      |   68 +++-----
 policy/modules/system/udev.fc             |    2 
 policy/modules/system/udev.te             |   11 +
 policy/modules/system/unconfined.fc       |    1 
 policy/modules/system/unconfined.if       |   10 -
 policy/modules/system/unconfined.te       |   24 ++
 policy/modules/system/userdomain.if       |  246 ++++++++++++++++--------------
 policy/modules/system/userdomain.te       |   46 ++++-
 policy/modules/system/xen.te              |   35 ++++
 policy/support/obj_perm_sets.spt          |   12 +
 166 files changed, 3877 insertions(+), 435 deletions(-)

Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- policy-20070219.patch	4 Apr 2007 20:46:07 -0000	1.39
+++ policy-20070219.patch	7 Apr 2007 11:35:20 -0000	1.40
@@ -1459,7 +1459,7 @@
 +</module>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.5.11/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2007-03-26 16:24:13.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/admin/netutils.te	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/admin/netutils.te	2007-04-05 08:55:43.000000000 -0400
 @@ -31,6 +31,7 @@
  type traceroute_t;
  type traceroute_exec_t;
@@ -1468,6 +1468,23 @@
  role system_r types traceroute_t;
  
  ########################################
+@@ -40,6 +41,7 @@
+ 
+ # Perform network administration operations and have raw access to the network.
+ allow netutils_t self:capability { net_admin net_raw setuid setgid };
++dontaudit netutils_t self:capability sys_tty_config;
+ allow netutils_t self:process { sigkill sigstop signull signal };
+ allow netutils_t self:netlink_route_socket { bind create getattr nlmsg_read nlmsg_write read write };
+ allow netutils_t self:packet_socket create_socket_perms;
+@@ -50,6 +52,8 @@
+ manage_files_pattern(netutils_t,netutils_tmp_t,netutils_tmp_t)
+ files_tmp_filetrans(netutils_t, netutils_tmp_t, { file dir })
+ 
++dev_read_sysfs(netutils_t)
++
+ kernel_search_proc(netutils_t)
+ 
+ corenet_non_ipsec_sendrecv(netutils_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.5.11/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-11-16 17:15:26.000000000 -0500
 +++ serefpolicy-2.5.11/policy/modules/admin/rpm.fc	2007-04-04 13:46:37.000000000 -0400
@@ -2493,7 +2510,7 @@
  genfscon futexfs / gen_context(system_u:object_r:futexfs_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.5.11/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2007-02-19 11:32:51.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/kernel/kernel.if	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/kernel/kernel.if	2007-04-04 16:41:08.000000000 -0400
 @@ -1830,6 +1830,26 @@
  
  ########################################
@@ -2719,8 +2736,30 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.5.11/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2007-04-02 10:58:34.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/services/apache.if	2007-04-04 13:46:37.000000000 -0400
-@@ -268,8 +268,11 @@
++++ serefpolicy-2.5.11/policy/modules/services/apache.if	2007-04-06 15:34:02.000000000 -0400
+@@ -18,10 +18,6 @@
+ 		attribute httpd_script_exec_type;
+ 		type httpd_t, httpd_suexec_t, httpd_log_t;
+ 	')
+-	# allow write access to public file transfer
+-	# services files.
+-	gen_tunable(allow_httpd_$1_script_anon_write,false)
+-
+ 	#This type is for webpages
+ 	type httpd_$1_content_t, httpdcontent; # customizable
+ 	files_type(httpd_$1_content_t)
+@@ -120,10 +116,6 @@
+ 		can_exec(httpd_$1_script_t, httpdcontent)
+ 	')
+ 
+-	tunable_policy(`allow_httpd_$1_script_anon_write',`
+-		miscfiles_manage_public_files(httpd_$1_script_t)
+-	') 
+-
+ 	# Allow the web server to run scripts and serve pages
+ 	tunable_policy(`httpd_builtin_scripting',`
+ 		manage_dirs_pattern(httpd_t,httpd_$1_script_rw_t,httpd_$1_script_rw_t)
+@@ -268,8 +260,11 @@
  	')
  
  	apache_content_template($1)
@@ -2733,7 +2772,7 @@
  	userdom_user_home_content($1,httpd_$1_content_t)
  
  	role $3 types httpd_$1_script_t;
-@@ -434,6 +437,24 @@
+@@ -434,6 +429,24 @@
  
  ########################################
  ## <summary>
@@ -2758,7 +2797,7 @@
  ##	Inherit and use file descriptors from Apache.
  ## </summary>
  ## <param name="domain">
-@@ -752,6 +773,7 @@
+@@ -752,6 +765,7 @@
  	')
  
  	allow $1 httpd_modules_t:dir list_dir_perms;
@@ -2766,7 +2805,7 @@
  ')
  
  ########################################
-@@ -1000,3 +1022,140 @@
+@@ -1000,3 +1014,140 @@
  
  	allow $1 httpd_sys_script_t:dir search_dir_perms;
  ')
@@ -2909,8 +2948,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.5.11/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2007-04-02 10:58:34.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/services/apache.te	2007-04-04 13:46:37.000000000 -0400
-@@ -106,6 +106,20 @@
++++ serefpolicy-2.5.11/policy/modules/services/apache.te	2007-04-06 15:38:22.000000000 -0400
+@@ -106,6 +106,27 @@
  ## </desc>
  gen_tunable(httpd_unified,false)
  
@@ -2928,10 +2967,17 @@
 +## </desc>
 +gen_tunable(httpd_use_cifs,false)
 +
++## <desc>
++## <p>
++## Allow apache scripts to write to public content 
++## </p>
++## </desc>
++gen_tunable(allow_httpd_sys_script_anon_write,false)
++
  attribute httpdcontent;
  
  # domains that can exec all users scripts
-@@ -257,6 +271,7 @@
+@@ -257,6 +278,7 @@
  allow httpd_t httpd_modules_t:dir list_dir_perms;
  mmap_files_pattern(httpd_t,httpd_modules_t,httpd_modules_t)
  read_files_pattern(httpd_t,httpd_modules_t,httpd_modules_t)
@@ -2939,7 +2985,7 @@
  
  apache_domtrans_rotatelogs(httpd_t)
  # Apache-httpd needs to be able to send signals to the log rotate procs.
-@@ -297,6 +312,7 @@
+@@ -297,6 +319,7 @@
  kernel_read_kernel_sysctls(httpd_t)
  # for modules that want to access /proc/meminfo
  kernel_read_system_state(httpd_t)
@@ -2947,7 +2993,18 @@
  
  corenet_non_ipsec_sendrecv(httpd_t)
  corenet_tcp_sendrecv_all_if(httpd_t)
-@@ -433,11 +449,21 @@
+@@ -416,6 +439,10 @@
+ 	allow httpd_t httpd_unconfined_script_exec_t:dir list_dir_perms;
+ ')
+ 
++tunable_policy(`allow_httpd_sys_script_anon_write',`
++	miscfiles_manage_public_files(httpd_sys_script_t)
++') 
++
+ tunable_policy(`httpd_enable_cgi && httpd_unified && httpd_builtin_scripting',`
+ 	domtrans_pattern(httpd_t, httpdcontent, httpd_sys_script_t)
+ 
+@@ -433,11 +460,21 @@
  	fs_read_nfs_symlinks(httpd_t)
  ')
  
@@ -2969,7 +3026,7 @@
  tunable_policy(`httpd_ssi_exec',`
  	corecmd_shell_domtrans(httpd_t,httpd_sys_script_t)
  	allow httpd_sys_script_t httpd_t:fd use;
-@@ -468,6 +494,7 @@
+@@ -468,6 +505,7 @@
  
  optional_policy(`
  	kerberos_use(httpd_t)
@@ -2977,7 +3034,7 @@
  ')
  
  optional_policy(`
-@@ -667,6 +694,12 @@
+@@ -667,6 +705,12 @@
  	fs_exec_nfs_files(httpd_suexec_t)
  ')
  
@@ -2990,7 +3047,7 @@
  tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',`
  	fs_read_cifs_files(httpd_suexec_t)
  	fs_read_cifs_symlinks(httpd_suexec_t)
-@@ -729,11 +762,21 @@
+@@ -729,11 +773,21 @@
  	')
  ')
  
@@ -3012,7 +3069,7 @@
  tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',`
  	fs_read_cifs_files(httpd_sys_script_t)
  	fs_read_cifs_symlinks(httpd_sys_script_t)
-@@ -787,3 +830,19 @@
+@@ -787,3 +841,19 @@
  	term_dontaudit_use_generic_ptys(httpd_rotatelogs_t)
  	term_dontaudit_use_unallocated_ttys(httpd_rotatelogs_t)
  ')
@@ -3261,6 +3318,18 @@
  dev_read_urand(automount_t)
  
  domain_use_interactive_fds(automount_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.5.11/policy/modules/services/bluetooth.te
+--- nsaserefpolicy/policy/modules/services/bluetooth.te	2007-03-20 23:38:04.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/bluetooth.te	2007-04-05 08:38:17.000000000 -0400
+@@ -98,7 +98,7 @@
+ 
+ fs_getattr_all_fs(bluetooth_t)
+ fs_search_auto_mountpoints(bluetooth_t)
+-fs_search_inotifyfs(bluetooth_t)
++fs_list_inotifyfs(bluetooth_t)
+ 
+ #Handle bluetooth serial devices
+ term_use_unallocated_ttys(bluetooth_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.te serefpolicy-2.5.11/policy/modules/services/ccs.te
 --- nsaserefpolicy/policy/modules/services/ccs.te	2007-03-26 10:39:04.000000000 -0400
 +++ serefpolicy-2.5.11/policy/modules/services/ccs.te	2007-04-04 13:46:37.000000000 -0400
@@ -3831,8 +3900,8 @@
  tunable_policy(`ftp_home_dir && use_nfs_home_dirs',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-2.5.11/policy/modules/services/hal.fc
 --- nsaserefpolicy/policy/modules/services/hal.fc	2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/services/hal.fc	2007-04-04 13:46:37.000000000 -0400
-@@ -8,4 +8,10 @@
++++ serefpolicy-2.5.11/policy/modules/services/hal.fc	2007-04-04 16:39:58.000000000 -0400
+@@ -8,4 +8,12 @@
  
  /var/lib/hal(/.*)?				gen_context(system_u:object_r:hald_var_lib_t,s0)
  
@@ -3843,10 +3912,38 @@
 +/usr/libexec/hal-acl-tool		--	gen_context(system_u:object_r:hald_acl_exec_t,s0)
 +
 +/usr/libexec/hald-addon-macbookpro-backlight --	gen_context(system_u:object_r:hald_mac_exec_t,s0)
++
++/var/log/pm-suspend.log				gen_context(system_u:object_r:hald_log_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.5.11/policy/modules/services/hal.if
+--- nsaserefpolicy/policy/modules/services/hal.if	2007-02-19 11:32:53.000000000 -0500
++++ serefpolicy-2.5.11/policy/modules/services/hal.if	2007-04-07 07:33:28.000000000 -0400
+@@ -208,3 +208,22 @@
+ 	files_search_pids($1)
+ 	allow $1 hald_var_run_t:file rw_file_perms;
+ ')
++
++########################################
++## <summary>
++##	Do not audit attempts to write the hal
++##	log files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit
++##	</summary>
++## </param>
++#
++interface(`hal_dontaudit_write_log',`
++	gen_require(`
++		type hald_log_t;
++	')
++
++	dontaudit $1 hald_log_t:file { append write };
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.5.11/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2007-03-20 23:38:00.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/services/hal.te	2007-04-04 13:46:37.000000000 -0400
-@@ -16,9 +16,30 @@
++++ serefpolicy-2.5.11/policy/modules/services/hal.te	2007-04-06 15:40:37.000000000 -0400
+@@ -16,9 +16,33 @@
  type hald_var_run_t;
  files_pid_file(hald_var_run_t)
  
@@ -3856,6 +3953,9 @@
  type hald_var_lib_t;
  files_type(hald_var_lib_t)
  
++type hald_log_t;
++files_type(hald_log_t)
++
 +type hald_acl_t;
 +type hald_acl_exec_t;
 +domain_type(hald_acl_t)
@@ -3877,7 +3977,7 @@
  ########################################
  #
  # Local policy
-@@ -26,7 +47,7 @@
+@@ -26,7 +50,7 @@
  
  # execute openvt which needs setuid
  allow hald_t self:capability { chown setuid setgid kill net_admin sys_admin sys_nice dac_override dac_read_search mknod sys_rawio sys_tty_config };
@@ -3886,7 +3986,14 @@
  allow hald_t self:process signal_perms;
  allow hald_t self:fifo_file rw_fifo_file_perms;
  allow hald_t self:unix_stream_socket { create_stream_socket_perms connectto };
-@@ -51,11 +72,13 @@
+@@ -48,14 +72,20 @@
+ manage_files_pattern(hald_t,hald_var_lib_t,hald_var_lib_t)
+ manage_sock_files_pattern(hald_t,hald_var_lib_t,hald_var_lib_t)
+ 
++# var/log files for hald
++allow hald_t hald_log_t:file manage_file_perms;
++logging_log_filetrans(hald_t,hald_log_t,file)
++
  manage_files_pattern(hald_t,hald_var_run_t,hald_var_run_t)
  files_pid_filetrans(hald_t,hald_var_run_t,file)
  
@@ -3894,14 +4001,15 @@
 +
  kernel_read_system_state(hald_t)
  kernel_read_network_state(hald_t)
- kernel_read_kernel_sysctls(hald_t)
+-kernel_read_kernel_sysctls(hald_t)
++kernel_rw_kernel_sysctl(hald_t)
  kernel_read_fs_sysctls(hald_t)
 -kernel_read_irq_sysctls(hald_t)
 +kernel_rw_irq_sysctls(hald_t)
  kernel_rw_vm_sysctls(hald_t)
  kernel_write_proc_files(hald_t)
  
-@@ -85,9 +108,13 @@
+@@ -85,9 +115,13 @@
  dev_rw_power_management(hald_t)
  # hal is now execing pm-suspend
  dev_rw_sysfs(hald_t)
@@ -3915,7 +4023,7 @@
  
  files_exec_etc_files(hald_t)
  files_read_etc_files(hald_t)
-@@ -101,9 +128,11 @@
+@@ -101,9 +135,11 @@
  files_create_boot_flag(hald_t)
  files_getattr_all_dirs(hald_t)
  files_read_kernel_img(hald_t)
@@ -3927,7 +4035,7 @@
  fs_list_auto_mountpoints(hald_t)
  files_getattr_all_mountpoints(hald_t)
  
-@@ -128,10 +157,10 @@
+@@ -128,10 +164,10 @@
  auth_use_nsswitch(hald_t)
  
  init_domtrans_script(hald_t)
@@ -3939,7 +4047,7 @@
  
  libs_use_ld_so(hald_t)
  libs_use_shared_libs(hald_t)
-@@ -245,3 +274,98 @@
+@@ -245,3 +281,98 @@
  optional_policy(`
  	vbetool_domtrans(hald_t)
  ')
@@ -4269,9 +4377,30 @@
  	corenet_dontaudit_tcp_bind_all_ports($1)
  	corenet_dontaudit_udp_bind_all_ports($1)
  	corenet_tcp_connect_portmap_port($1)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.5.11/policy/modules/services/nis.te
+--- nsaserefpolicy/policy/modules/services/nis.te	2007-03-26 10:39:04.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/nis.te	2007-04-05 09:25:36.000000000 -0400
+@@ -258,6 +258,8 @@
+ corenet_udp_bind_all_nodes(ypserv_t)
+ corenet_tcp_bind_reserved_port(ypserv_t)
+ corenet_udp_bind_reserved_port(ypserv_t)
++corenet_tcp_bind_all_rpc_ports(ypserv_t)
++corenet_udp_bind_all_rpc_ports(ypserv_t)
+ corenet_dontaudit_tcp_bind_all_reserved_ports(ypserv_t)
+ corenet_dontaudit_udp_bind_all_reserved_ports(ypserv_t)
+ corenet_sendrecv_generic_server_packets(ypserv_t)
+@@ -332,6 +334,8 @@
+ corenet_udp_bind_all_nodes(ypxfr_t)
+ corenet_tcp_bind_reserved_port(ypxfr_t)
+ corenet_udp_bind_reserved_port(ypxfr_t)
++corenet_tcp_bind_all_rpc_ports(ypxfr_t)
++corenet_udp_bind_all_rpc_ports(ypxfr_t)
+ corenet_dontaudit_tcp_bind_all_reserved_ports(ypxfr_t)
+ corenet_dontaudit_udp_bind_all_reserved_ports(ypxfr_t)
+ corenet_tcp_connect_all_ports(ypxfr_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-2.5.11/policy/modules/services/nscd.te
 --- nsaserefpolicy/policy/modules/services/nscd.te	2007-03-20 23:37:51.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/services/nscd.te	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/nscd.te	2007-04-05 09:14:24.000000000 -0400
 @@ -30,7 +30,7 @@
  
  allow nscd_t self:capability { kill setgid setuid audit_write };
@@ -4295,7 +4424,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.5.11/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/services/ntp.te	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/ntp.te	2007-04-07 07:33:52.000000000 -0400
 @@ -129,6 +129,7 @@
  
  optional_policy(`
@@ -4304,6 +4433,17 @@
  ')
  
  optional_policy(`
+@@ -136,6 +137,10 @@
+ ')
+ 
+ optional_policy(`
++	hal_dontaudit_write_log(ntpd_t)
++')
++
++optional_policy(`
+ 	seutil_sigchld_newrole(ntpd_t)
+ ')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.5.11/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2006-11-16 17:15:21.000000000 -0500
 +++ serefpolicy-2.5.11/policy/modules/services/pegasus.if	2007-04-04 13:46:37.000000000 -0400
@@ -4478,23 +4618,20 @@
  type rsync_data_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-2.5.11/policy/modules/services/samba.fc
 --- nsaserefpolicy/policy/modules/services/samba.fc	2007-02-23 16:50:01.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/services/samba.fc	2007-04-04 13:46:37.000000000 -0400
-@@ -25,9 +25,12 @@
- #
- /var/cache/samba(/.*)?			gen_context(system_u:object_r:samba_var_t,s0)
++++ serefpolicy-2.5.11/policy/modules/services/samba.fc	2007-04-05 09:14:13.000000000 -0400
+@@ -27,6 +27,9 @@
  /var/cache/samba/winbindd_privileged(/.*)? gen_context(system_u:object_r:winbind_var_run_t,s0)
-+/var/lib/samba/winbindd_privileged(/.*)? gen_context(system_u:object_r:winbind_var_run_t,s0)
  
  /var/lib/samba(/.*)?			gen_context(system_u:object_r:samba_var_t,s0)
- 
-+/var/lib/samba/scripts(/.*)?		gen_context(system_u:object_r:samba_unconfined_script_exec_t,s0)
++/var/lib/samba/winbindd_privileged(/.*)? gen_context(system_u:object_r:winbind_var_run_t,s0)
 +
++/var/lib/samba/scripts(/.*)?		gen_context(system_u:object_r:samba_unconfined_script_exec_t,s0)
+ 
  /var/log/samba(/.*)?			gen_context(system_u:object_r:samba_log_t,s0)
  
- /var/run/samba/brlock\.tdb	--	gen_context(system_u:object_r:smbd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.5.11/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/services/samba.if	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/samba.if	2007-04-05 09:15:08.000000000 -0400
 @@ -177,6 +177,27 @@
  
  ########################################
@@ -4565,7 +4702,7 @@
  ##	Allow the specified domain to write to smbmount tcp sockets.
  ## </summary>
  ## <param name="domain">
-@@ -377,3 +421,22 @@
+@@ -377,3 +421,23 @@
  	allow $1 samba_var_t:dir search_dir_perms;
  	stream_connect_pattern($1,winbind_var_run_t,winbind_var_run_t,winbind_t)
  ')
@@ -4588,9 +4725,10 @@
 +	dontaudit $1 smbd_t:fd use; 
 +')
 +
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.5.11/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2007-03-26 16:24:12.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/services/samba.te	2007-04-04 14:46:39.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/samba.te	2007-04-05 09:09:57.000000000 -0400
 @@ -28,10 +28,39 @@
  ## </desc>
  gen_tunable(samba_share_nfs,false)
@@ -4654,7 +4792,29 @@
  ifdef(`hide_broken_symptoms', `
  	files_dontaudit_getattr_default_dirs(smbd_t)
  	files_dontaudit_getattr_boot_dirs(smbd_t)
-@@ -362,9 +400,12 @@
+@@ -339,6 +377,21 @@
+ 	udev_read_db(smbd_t)
+ ')
+ 
++tunable_policy(`samba_export_all_rw',`
++	fs_read_noxattr_fs_files(smbd_t) 
++	auth_manage_all_files_except_shadow(smbd_t)
++	fs_read_noxattr_fs_files(nmbd_t) 
++	auth_manage_all_files_except_shadow(nmbd_t)
++')
++
++tunable_policy(`samba_export_all_ro',`
++	fs_read_noxattr_fs_files(smbd_t) 
++	auth_read_all_files_except_shadow(smbd_t)
++	fs_read_noxattr_fs_files(nmbd_t) 
++	auth_read_all_files_except_shadow(nmbd_t)
++')
++
++
+ ########################################
+ #
+ # nmbd Local policy
+@@ -362,9 +415,12 @@
  files_pid_filetrans(nmbd_t,nmbd_var_run_t,file)
  
  read_files_pattern(nmbd_t,samba_etc_t,samba_etc_t)
@@ -4668,7 +4828,7 @@
  read_files_pattern(nmbd_t,samba_log_t,samba_log_t)
  create_files_pattern(nmbd_t,samba_log_t,samba_log_t)
  allow nmbd_t samba_log_t:dir setattr;
-@@ -457,6 +498,7 @@
+@@ -457,6 +513,7 @@
  
  allow smbmount_t samba_secrets_t:file manage_file_perms;
  
@@ -4676,20 +4836,35 @@
  allow smbmount_t samba_var_t:dir rw_dir_perms;
  manage_files_pattern(smbmount_t,samba_var_t,samba_var_t)
  manage_lnk_files_pattern(smbmount_t,samba_var_t,samba_var_t)
-@@ -625,6 +667,12 @@
+@@ -514,7 +571,7 @@
+ userdom_use_sysadm_ttys(smbmount_t)
+ 
+ optional_policy(`
+-	cups_read_rw_config(smbd_t)
++	cups_read_rw_config(smbmount_t)
+ ')
+ 
+ optional_policy(`
+@@ -625,6 +682,8 @@
  # Winbind local policy
  #
  
 +
 +allow winbind_t self:capability setuid;
-+
-+allow winbind_t nmbd_t:process { signal signull };
-+allow winbind_t nmbd_var_run_t:file read_file_perms;
-+
  dontaudit winbind_t self:capability sys_tty_config;
  allow winbind_t self:process signal_perms;
  allow winbind_t self:fifo_file { read write };
-@@ -645,6 +693,7 @@
+@@ -634,6 +693,9 @@
+ allow winbind_t self:tcp_socket create_stream_socket_perms;
+ allow winbind_t self:udp_socket create_socket_perms;
+ 
++allow winbind_t nmbd_t:process { signal signull };
++allow winbind_t nmbd_var_run_t:file read_file_perms;
++
+ allow winbind_t samba_etc_t:dir list_dir_perms;
+ read_files_pattern(winbind_t,samba_etc_t,samba_etc_t)
+ read_lnk_files_pattern(winbind_t,samba_etc_t,samba_etc_t)
+@@ -645,6 +707,7 @@
  manage_files_pattern(winbind_t,samba_log_t,samba_log_t)
  manage_lnk_files_pattern(winbind_t,samba_log_t,samba_log_t)
  
@@ -4697,7 +4872,7 @@
  manage_files_pattern(winbind_t,samba_var_t,samba_var_t)
  manage_lnk_files_pattern(winbind_t,samba_var_t,samba_var_t)
  
-@@ -736,6 +785,7 @@
+@@ -736,6 +799,7 @@
  read_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t)
  read_lnk_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t)
  
@@ -4705,25 +4880,11 @@
  allow winbind_helper_t samba_var_t:dir search;
  
  stream_connect_pattern(winbind_helper_t,winbind_var_run_t,winbind_var_run_t,winbind_t)
-@@ -764,3 +814,28 @@
+@@ -764,3 +828,14 @@
  	squid_read_log(winbind_helper_t)
  	squid_append_log(winbind_helper_t)
  ')
 +
-+tunable_policy(`samba_export_all_rw',`
-+	fs_read_noxattr_fs_files(smbd_t) 
-+	auth_manage_all_files_except_shadow(smbd_t)
-+	fs_read_noxattr_fs_files(nmbd_t) 
-+	auth_manage_all_files_except_shadow(nmbd_t)
-+')
-+
-+tunable_policy(`samba_export_all_ro',`
-+	fs_read_noxattr_fs_files(smbd_t) 
-+	auth_read_all_files_except_shadow(smbd_t)
-+	fs_read_noxattr_fs_files(nmbd_t) 
-+	auth_read_all_files_except_shadow(nmbd_t)
-+')
-+
 +########################################
 +#
 +# samba_unconfined_script_t local policy
@@ -5661,7 +5822,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.5.11/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/init.if	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/init.if	2007-04-05 10:18:25.000000000 -0400
 @@ -194,11 +194,14 @@
  	gen_require(`
  		type initrc_t;


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -r1.426 -r1.427
--- selinux-policy.spec	4 Apr 2007 20:46:07 -0000	1.426
+++ selinux-policy.spec	7 Apr 2007 11:35:20 -0000	1.427
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.5.11
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -358,6 +358,9 @@
 %endif
 
 %changelog
+* Thu Apr 5 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-5
+- Allow bluetooth to read inotifyfs
+
 * Wed Apr 4 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-4
 - Fixes for samba domain controller.
 - Allow ConsoleKit to look at ttys



From fedora-cvs-commits at redhat.com  Sun Apr  8 04:37:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 8 Apr 2007 00:37:26 -0400
Subject: rpms/ppc64-utils/devel ps3.dts, NONE, 1.1 .cvsignore, 1.5,
	1.6 ppc64-utils.spec, 1.23, 1.24 sources, 1.10, 1.11
Message-ID: <200704080437.l384bQ2r015039@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	.cvsignore ppc64-utils.spec sources 
Added Files:
	ps3.dts 
Log Message:
Update kernel bootwrapper


--- NEW FILE ps3.dts ---
/*
 *  PS3 Game Console device tree.
 *
 *  Copyright (C) 2006 Sony Computer Entertainment Inc.
 *  Copyright 2006 Sony Corp.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; version 2 of the License.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */


/ {
	model = "PS3 Game Console";
	compatible = "PS3";
	#size-cells = <2>;
	#address-cells = <2>;

	/*
	 * Need to keep linux,platform for a while, not used by kernel.
	 */

	chosen {
		linux,platform = <0>;
	};

	/*
	 * Put the RMO here to keep kexec userspace happy.
	 * We'll actually get the size of the bootmem block from lv1 after
	 * startup.
	 */

	memory {
		device_type = "memory";
		reg = <0 0 0 07c00000>;
	};

	/*
	 * dtc expects a clock-frequency and timebase-frequency entries, so
	 * we'll put a null entries here.  These will be initialized after
	 * startup with data from lv1.
	 *
	 * The boot cpu is always zero for PS3.
	 *
	 * Seems the only way currently to indicate a processor has multiple
	 * threads is with an ibm,ppc-interrupt-server#s entry.  We'll put one
	 * here so we can bring up both of ours.  See smp_setup_cpu_maps().
	 */

	cpus {
		#size-cells = <0>;
		#address-cells = <1>;

		CBE,PPE {
			device_type = "cpu";
			reg = <0>;
			ibm,ppc-interrupt-server#s = <0 1>;
			clock-frequency = <0>;
			timebase-frequency = <0>;
			i-cache-size = <8000>;
			d-cache-size = <8000>;
			i-cache-line-size = <80>;
			d-cache-line-size = <80>;
		};
	};
};


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ppc64-utils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Mar 2007 03:26:54 -0000	1.5
+++ .cvsignore	8 Apr 2007 04:37:24 -0000	1.6
@@ -6,3 +6,5 @@
 powerpc-utils-1.0.3.tar.gz
 powerpc-utils-papr-1.0.3.tar.gz
 ps3pf_utils-1.0.9.tar.bz2
+zImage-wrapper.tar.gz
+ps3.dtb


Index: ppc64-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/ppc64-utils/devel/ppc64-utils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ppc64-utils.spec	31 Mar 2007 03:26:54 -0000	1.23
+++ ppc64-utils.spec	8 Apr 2007 04:37:24 -0000	1.24
@@ -5,7 +5,7 @@
 Summary: Linux/PPC64 specific utilities
 Name: ppc64-utils
 Version: 0.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL and OSL
 Group: System Environment/Base
 Source0: http://powerpc-utils.ozlabs.org/releases/powerpc-utils-%{powerpcutilsver}.tar.gz
@@ -16,6 +16,9 @@
 Source6: zImage-boot.tar.gz
 Source7: http://powerpc-utils.ozlabs.org/releases/powerpc-utils-papr-%{powerpcutilsver}.tar.gz
 Source8: http://www.kernel.org/pub/linux/kernel/people/geoff/cell/ps3pf_utils-%{ps3pfutilsver}.tar.bz2
+Source9: zImage-wrapper.tar.gz
+Source10: ps3.dts
+Source11: ps3.dtb
 Patch0: pmac-utils-0.4-cell.patch
 Patch1: ppc64-utils-1.1-64k.patch
 Patch2: ps3pf_utils-1.0.9-types.patch
@@ -34,7 +37,7 @@
 A collection of utilities for Linux on PPC64 platforms.
 
 %prep
-%setup -n powerpc-utils-%{powerpcutilsver} -a 5 -a 6 -a 7 -a 8
+%setup -n powerpc-utils-%{powerpcutilsver} -a 5 -a 6 -a 7 -a 8 -a 9
 cp %{SOURCE1} %{SOURCE2} %{SOURCE3} .
 %patch0 -p0 -b .cell
 %patch1 -p1 -b .64k
@@ -47,7 +50,10 @@
 make -C pmac-utils-%{pmacutilsver} clean nvsetenv nvsetenv.8
 CFLAGS="$RPM_OPT_FLAGS" make -C powerpc-utils-papr-%{powerpcutilsver}
 make -C zImage-boot zImage.stub
+make -C zImage-wrapper CFLAGS="$RPM_OPT_FLAGS"
 make -C ps3pf_utils-%{ps3pfutilsver}
+# After Core/Extras merge, we can require dtc and...
+# dtc -O dtb %{SOURCE10} -o ps3.dtb
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -70,7 +76,9 @@
 rm -rf $RPM_BUILD_ROOT/etc/init.d
 install -m 644 scripts/ibmvscsis.sh $RPM_BUILD_ROOT/usr/share/ppc64-utils
 popd
+make -C zImage-wrapper DESTDIR=$RPM_BUILD_ROOT install
 make -C ps3pf_utils-%{ps3pfutilsver} DESTDIR=$RPM_BUILD_ROOT install
+install -m0644 %{SOURCE10} %{SOURCE11} $RPM_BUILD_ROOT/usr/share/ppc64-utils/wrapper
 rm -rf $RPM_BUILD_ROOT/%{_docdir}/packages
 
 %clean
@@ -86,6 +94,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Sun Apr  8 2007 David Woodhouse <dwmw2 at redhat.com> - 0.11-3
+- Update kernel bootwrapper magic
+
 * Sat Mar 31 2007 David Woodhouse <dwmw2 at redhat.com> - 0.11-2
 - Include ps3pf_utils.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ppc64-utils/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	31 Mar 2007 03:26:54 -0000	1.10
+++ sources	8 Apr 2007 04:37:24 -0000	1.11
@@ -3,3 +3,5 @@
 ffd031d0b949bef79a57159ecc235d3f  powerpc-utils-1.0.3.tar.gz
 19ae37d109ccafa4feeb714925b022b1  powerpc-utils-papr-1.0.3.tar.gz
 0a7cccf1de3287e669898e3f41cddf3e  ps3pf_utils-1.0.9.tar.bz2
+527d2fbc16951d5ff44c7aec5bc0e6f5  zImage-wrapper.tar.gz
+787839c782f8ab9812903cfb501455c8  ps3.dtb



From fedora-cvs-commits at redhat.com  Sun Apr  8 04:46:00 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 8 Apr 2007 00:46:00 -0400
Subject: rpms/ppc64-utils/devel sources,1.11,1.12
Message-ID: <200704080446.l384k04R021619@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	sources 
Log Message:
Fix wrapper makefile for ppc64 build


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ppc64-utils/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Apr 2007 04:37:24 -0000	1.11
+++ sources	8 Apr 2007 04:45:58 -0000	1.12
@@ -3,5 +3,5 @@
 ffd031d0b949bef79a57159ecc235d3f  powerpc-utils-1.0.3.tar.gz
 19ae37d109ccafa4feeb714925b022b1  powerpc-utils-papr-1.0.3.tar.gz
 0a7cccf1de3287e669898e3f41cddf3e  ps3pf_utils-1.0.9.tar.bz2
-527d2fbc16951d5ff44c7aec5bc0e6f5  zImage-wrapper.tar.gz
 787839c782f8ab9812903cfb501455c8  ps3.dtb
+d25ea5cbe4da2528781bf8be284de3ad  zImage-wrapper.tar.gz



From fedora-cvs-commits at redhat.com  Sun Apr  8 17:17:52 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 8 Apr 2007 13:17:52 -0400
Subject: rpms/anaconda/devel anaconda.spec,1.528,1.529
Message-ID: <200704081717.l38HHqSt020387@cvs.devel.redhat.com>

Author: pjones

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

Modified Files:
	anaconda.spec 
Log Message:
- rebuild



Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.528
retrieving revision 1.529
diff -u -r1.528 -r1.529
--- anaconda.spec	6 Apr 2007 02:29:15 -0000	1.528
+++ anaconda.spec	8 Apr 2007 17:17:49 -0000	1.529
@@ -2,7 +2,7 @@
 
 Name: anaconda
 Version: 11.2.0.46
-Release: 1
+Release: 2
 License: GPL
 Summary: Graphical system installer
 Group: Applications/System
@@ -143,6 +143,9 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Sun Apr  8 2007 Peter Jones <pjones at redhat.com> - 11.2.0.46-2
+- Rebuild because aparently the s390 build produced a corrupt package...
+
 * Thu Apr  5 2007 Jeremy Katz <katzj at redhat.com> - 11.2.0.46-1
 - Minor live install fixes
 - dasd fixes (dcantrell)



From fedora-cvs-commits at redhat.com  Sun Apr  8 17:32:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 8 Apr 2007 13:32:32 -0400
Subject: rpms/xorg-x11-server/FC-6 xserver-cve-2007-1003.patch, NONE,
	1.1 xorg-x11-server.spec, 1.188, 1.189
Message-ID: <200704081732.l38HWW4Q030892@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-cve-2007-1003.patch 
Log Message:
* Sun Apr 08 2007 Adam Jackson <ajax at redhat.com> 1.1.1-47.8
- xserver-cve-2007-1003.patch: Fix CVE 2007-1003 in XC-MISC extension.


xserver-cve-2007-1003.patch:
 xcmisc.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

--- NEW FILE xserver-cve-2007-1003.patch ---
From: Matthieu Herrb <matthieu at roadrock.(none)>
Date: Tue, 3 Apr 2007 13:47:18 +0000 (+0200)
Subject: CVE-2007-1003: XC-MISC Extension ProcXCMiscGetXIDList() Memory Corruption
X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=645d87cf8ef724d4591614f9994cdc4d7549a7a8

CVE-2007-1003: XC-MISC Extension ProcXCMiscGetXIDList() Memory Corruption
---

--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -42,6 +42,12 @@ from The Open Group.
 #include <X11/extensions/xcmiscstr.h>
 #include "modinit.h"
 
+#if HAVE_STDINT_H
+#include <stdint.h>
+#elif !defined(UINT32_MAX)
+#define UINT32_MAX 0xffffffffU
+#endif
+
 #if 0
 static unsigned char XCMiscCode;
 #endif
@@ -143,7 +149,10 @@ ProcXCMiscGetXIDList(client)
 
     REQUEST_SIZE_MATCH(xXCMiscGetXIDListReq);
 
-    pids = (XID *)ALLOCATE_LOCAL(stuff->count * sizeof(XID));
+    if (stuff->count > UINT32_MAX / sizeof(XID))
+	    return BadAlloc;
+
+    pids = (XID *)Xalloc(stuff->count * sizeof(XID));
     if (!pids)
     {
 	return BadAlloc;
@@ -164,7 +173,7 @@ ProcXCMiscGetXIDList(client)
     	client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
 	WriteSwappedDataToClient(client, count * sizeof(XID), pids);
     }
-    DEALLOCATE_LOCAL(pids);
+    Xfree(pids);
     return(client->noClientException);
 }
 


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/FC-6/xorg-x11-server.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- xorg-x11-server.spec	28 Feb 2007 21:20:49 -0000	1.188
+++ xorg-x11-server.spec	8 Apr 2007 17:32:30 -0000	1.189
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.1
-Release:   47.7%{?dist}
+Release:   47.8%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -33,6 +33,7 @@
 
 # http://xorg.freedesktop.org/releases/X11R7.1/patches/xorg-xserver-1.1.0-dbe-render.diff
 Patch50:   xorg-xserver-1.1.0-dbe-render.diff
+Patch51:   xserver-cve-2007-1003.patch
 
 # OpenGL compositing manager feature/optimization patches.
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
@@ -365,6 +366,7 @@
 %patch16 -p1 -b .pseudocomposite
 
 %patch50 -p1 -b .alloca
+%patch51 -p1 -b .xcmisc
 
 %patch100 -p0 -b .no-move-damage
 %patch101 -p0 -b .dont-backfill-bg-none
@@ -741,6 +743,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Sun Apr 08 2007 Adam Jackson <ajax at redhat.com> 1.1.1-47.8
+- xserver-cve-2007-1003.patch: Fix CVE 2007-1003 in XC-MISC extension.
+
 * Wed Feb 28 2007 Adam Jackson <ajax at redhat.com> 1.1.1-47.7
 - xorg-x11-server-1.1.1-no-pseudocolor-composite.patch: Disable Composite
   on low color depths since it can't handle pseudocolor visuals. (#217388)



From fedora-cvs-commits at redhat.com  Sun Apr  8 17:34:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 8 Apr 2007 13:34:32 -0400
Subject: rpms/xorg-x11-server/FC-5 xserver-cve-2007-1003.patch, NONE,
	1.1 xorg-x11-server.spec, 1.55, 1.56
Message-ID: <200704081734.l38HYWNK032238@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-cve-2007-1003.patch 
Log Message:
* Sun Apr 08 2007 Adam Jackson <ajax at redhat.com> 1.0.1-9.fc5.7
- xserver-cve-2007-1003.patch: Fix CVE 2007-1003 in XC-MISC extension.
- xorg-x11-server-1.0.1-intel-bridge-fix.patch: Backport an Intel PCI bridge
  fix from FC6.


xserver-cve-2007-1003.patch:
 xcmisc.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

--- NEW FILE xserver-cve-2007-1003.patch ---
From: Matthieu Herrb <matthieu at roadrock.(none)>
Date: Tue, 3 Apr 2007 13:47:18 +0000 (+0200)
Subject: CVE-2007-1003: XC-MISC Extension ProcXCMiscGetXIDList() Memory Corruption
X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=645d87cf8ef724d4591614f9994cdc4d7549a7a8

CVE-2007-1003: XC-MISC Extension ProcXCMiscGetXIDList() Memory Corruption
---

--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -42,6 +42,12 @@ from The Open Group.
 #include <X11/extensions/xcmiscstr.h>
 #include "modinit.h"
 
+#if HAVE_STDINT_H
+#include <stdint.h>
+#elif !defined(UINT32_MAX)
+#define UINT32_MAX 0xffffffffU
+#endif
+
 #if 0
 static unsigned char XCMiscCode;
 #endif
@@ -143,7 +149,10 @@ ProcXCMiscGetXIDList(client)
 
     REQUEST_SIZE_MATCH(xXCMiscGetXIDListReq);
 
-    pids = (XID *)ALLOCATE_LOCAL(stuff->count * sizeof(XID));
+    if (stuff->count > UINT32_MAX / sizeof(XID))
+	    return BadAlloc;
+
+    pids = (XID *)Xalloc(stuff->count * sizeof(XID));
     if (!pids)
     {
 	return BadAlloc;
@@ -164,7 +173,7 @@ ProcXCMiscGetXIDList(client)
     	client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
 	WriteSwappedDataToClient(client, count * sizeof(XID), pids);
     }
-    DEALLOCATE_LOCAL(pids);
+    Xfree(pids);
     return(client->noClientException);
 }
 


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/FC-5/xorg-x11-server.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- xorg-x11-server.spec	9 Jan 2007 22:51:19 -0000	1.55
+++ xorg-x11-server.spec	8 Apr 2007 17:34:30 -0000	1.56
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.1
-Release:   9.fc5.6
+Release:   9.fc5.7
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -36,11 +36,13 @@
 Patch11:   xorg-x11-server-1.0.1-setuid.patch
 # http://xorg.freedesktop.org/releases/X11R7.0/patches/xorg-xserver-1.0.1-dbe-render.diff
 Patch12:   xorg-xserver-1.0.1-dbe-render.diff
+Patch13:   xserver-cve-2007-1003.patch
 
 # Patches taken from xserver/xorg CVS HEAD, post-1.0.1
 Patch100:  xorg-x11-server-1.0.1-fbpict-fix-rounding.patch
 Patch101:  xorg-x11-server-1.0.1-SEGV-on-null-interface.patch
 Patch102:  xorg-x11-server-1.0.99.901-render-x4a4-crash.patch
+Patch103:  xorg-x11-server-1.0.1-intel-bridge-fix.patch
 
 Patch1000:  xorg-redhat-die-ugly-pattern-die-die-die.patch
 Patch1001:  xorg-x11-server-1.0.1-Red-Hat-extramodes.patch
@@ -269,10 +271,12 @@
 %patch10 -p0 -b .render-tris-CVE-2006-1526
 %patch11 -p2 -b .setuid
 %patch12 -p1 -b .alloca
+%patch13 -p1 -b .xcmisc
 
 %patch100 -p2 -b .fbpict-fix-rounding
 %patch101 -p2 -b .SEGV-on-null-interface
 %patch102 -p0 -b .render-x4a4-crash
+%patch103 -p1 -b .intel-bridge
 
 %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
 %patch1001 -p1 -b .Red-Hat-extramodes
@@ -548,6 +552,11 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Sun Apr 08 2007 Adam Jackson <ajax at redhat.com> 1.0.1-9.fc5.7
+- xserver-cve-2007-1003.patch: Fix CVE 2007-1003 in XC-MISC extension.
+- xorg-x11-server-1.0.1-intel-bridge-fix.patch: Backport an Intel PCI bridge
+  fix from FC6.
+
 * Tue Jan 09 2007 Adam Jackson <ajax at redhat.com> 1.0.1-9.fc5.6
 - xorg-xserver-1.0.1-dbe-render.diff: CVE #2006-6101.
 



From fedora-cvs-commits at redhat.com  Sun Apr  8 17:36:05 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 8 Apr 2007 13:36:05 -0400
Subject: rpms/xorg-x11-server/FC-5
	xorg-x11-server-1.0.1-intel-bridge-fix.patch, NONE, 1.1
Message-ID: <200704081736.l38Ha5fr000926@cvs.devel.redhat.com>

Author: ajackson

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

Added Files:
	xorg-x11-server-1.0.1-intel-bridge-fix.patch 
Log Message:
* Sun Apr 08 2007 Adam Jackson <ajax at redhat.com> 1.0.1-9.fc5.7
- xserver-cve-2007-1003.patch: Fix CVE 2007-1003 in XC-MISC extension.
- xorg-x11-server-1.0.1-intel-bridge-fix.patch: Backport an Intel PCI bridge
  fix from FC6.


xorg-x11-server-1.0.1-intel-bridge-fix.patch:
 common/xf86pciBus.c             |   11 ++++++++++-
 os-support/shared/stdResource.c |    5 +++--
 2 files changed, 13 insertions(+), 3 deletions(-)

--- NEW FILE xorg-x11-server-1.0.1-intel-bridge-fix.patch ---
commit c339b221d3f59130a39e63d4cec3de7e3de95bf3
Author: Dave Airlie <airlied at linux.ie>
Date:   Wed Apr 26 11:31:07 2006 +0000

    Bug #6750: This patch detects Intel bridges that are transparent but aren't
        reported as such. From the Linux kernel fixups. This patch also removes
        the reserved BIOS area from the area to allocate resources in.

diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index e06dce5..af19b37 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -1774,7 +1774,16 @@ xf86GetPciBridgeInfo(void)
 		PciBus->brfunc = pcrp->funcnum;
 
 		PciBus->subclass = sub_class;
-		PciBus->interface = pcrp->pci_prog_if;
+
+		/* The Intel bridges don't report as transparent
+		   but guess what they are - from Linux kernel - airlied */
+		if ((pcrp->pci_vendor == PCI_VENDOR_INTEL) && 
+		   ((pcrp->pci_device & 0xff00) == 0x2400)) {
+			xf86MsgVerb(X_INFO, 3, "Intel Bridge workaround enabled\n");
+			PciBus->interface = PCI_IF_BRIDGE_PCI_SUBTRACTIVE;
+		} else {
+			PciBus->interface = pcrp->pci_prog_if;
+		}
 
 		if (pBusInfo && pBusInfo->funcs->pciControlBridge)
 		    PciBus->brcontrol =
diff --git a/hw/xfree86/os-support/shared/stdResource.c b/hw/xfree86/os-support/shared/stdResource.c
index 8599973..83ad0bb 100644
--- a/hw/xfree86/os-support/shared/stdResource.c
+++ b/hw/xfree86/os-support/shared/stdResource.c
@@ -150,10 +150,11 @@ #if 0
     ret = xf86AddResToList(ret, &range, -1);
     RANGE(range, 0xfee00000, 0xfeefffff, ResExcMemBlock | ResBios);
     ret = xf86AddResToList(ret, &range, -1);
-#endif
+    /* airlied - remove BIOS range it shouldn't be here 
+       this should use E820 - or THE OS */
     RANGE(range, 0xffe00000, 0xffffffff, ResExcMemBlock | ResBios);
     ret = xf86AddResToList(ret, &range, -1);
-
+#endif
     /*
      * Fallback would be to claim well known ports in the 0x0 - 0x3ff range
      * along with their sparse I/O aliases, but that's too imprecise.  Instead



From fedora-cvs-commits at redhat.com  Sun Apr  8 19:16:38 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 8 Apr 2007 15:16:38 -0400
Subject: rpms/gnome-games/devel gnome-games.spec,1.121,1.122
Message-ID: <200704081916.l38JGcG1010694@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-games.spec 
Log Message:
- Add Obsoletes: gnome-chess (bug 234127)



Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- gnome-games.spec	2 Apr 2007 19:27:03 -0000	1.121
+++ gnome-games.spec	8 Apr 2007 19:16:36 -0000	1.122
@@ -29,7 +29,7 @@
 Summary: GNOME games
 Name: gnome-games
 Version: 2.18.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPL
 Group: Amusements/Games
@@ -72,6 +72,9 @@
 Provides: gnome-sudoku
 Obsoletes: gnome-sudoku
 
+Provides: glchess
+Obsoletes: glchess < 2.0
+
 %description
 
 The gnome-games package includes some small games that come with the
@@ -340,6 +343,9 @@
 
 
 %changelog
+* Sun Apr  8 2007 Ray Strode <rstrode at redhat.com> - 1:2.18.0-5
+- Add Obsoletes: gnome-chess (bug 234127)
+
 * Mon Apr  2 2007 Ray Strode <rstrode at redhat.com> - 1:2.18.0-4
 - Add minimum version to gnome-python2-desktop buildreq 
   (bug 234892)



From fedora-cvs-commits at redhat.com  Sun Apr  8 23:22:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 8 Apr 2007 19:22:23 -0400
Subject: rpms/kernel/devel patch-2.6.21-rc6-git1.bz2.sign, NONE,
	1.1 patch-2.6.21-rc6.bz2.sign, NONE, 1.1 .cvsignore, 1.599,
	1.600 kernel-2.6.spec, 1.3051, 1.3052 sources, 1.562,
	1.563 upstream, 1.490, 1.491 patch-2.6.21-rc5-git12.bz2.sign,
	1.1, NONE patch-2.6.21-rc5.bz2.sign, 1.1, NONE
Message-ID: <200704082322.l38NMNeX029025@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.21-rc6-git1.bz2.sign patch-2.6.21-rc6.bz2.sign 
Removed Files:
	patch-2.6.21-rc5-git12.bz2.sign patch-2.6.21-rc5.bz2.sign 
Log Message:
* Sun Apr 08 2007 Dave Jones <davej at redhat.com>
- 2.6.21-rc6-git1



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

iD8DBQBGF+slyGugalF9Dw4RAoCNAJ9zcsFuDuXTqMdhjaYSsewSPvRM1gCeLHVR
lO88K7deyUYxflIvZOpsRjc=
=AmBO
-----END PGP SIGNATURE-----


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

iD8DBQBGFbcKyGugalF9Dw4RAkg2AJ41Wd3LPvqd0ehj/xVdCNHWFKL5qQCfa1Jt
8jm2Qrc9XObGCvZg8SFxeLw=
=mLWb
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.599
retrieving revision 1.600
diff -u -r1.599 -r1.600
--- .cvsignore	4 Apr 2007 20:43:46 -0000	1.599
+++ .cvsignore	8 Apr 2007 23:22:20 -0000	1.600
@@ -4,5 +4,5 @@
 sparse-0.2.tar.bz2
 kernel-2.6.20
 linux-2.6.20.tar.bz2
-patch-2.6.21-rc5.bz2
-patch-2.6.21-rc5-git12.bz2
+patch-2.6.21-rc6.bz2
+patch-2.6.21-rc6-git1.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3051
retrieving revision 1.3052
diff -u -r1.3051 -r1.3052
--- kernel-2.6.spec	6 Apr 2007 15:24:41 -0000	1.3051
+++ kernel-2.6.spec	8 Apr 2007 23:22:20 -0000	1.3052
@@ -370,8 +370,8 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.21-rc5.bz2
-Patch2: patch-2.6.21-rc5-git12.bz2
+Patch1: patch-2.6.21-rc6.bz2
+Patch2: patch-2.6.21-rc6-git1.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -2249,6 +2249,9 @@
 #  - tux.
 
 %changelog
+* Sun Apr 08 2007 Dave Jones <davej at redhat.com>
+- 2.6.21-rc6-git1
+
 * Fri Apr  6 2007 Kristian H??gsberg <krh at redhat.com>
 - Add patches to fix #235463 and possibly #235199 and #231708.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.562
retrieving revision 1.563
diff -u -r1.562 -r1.563
--- sources	4 Apr 2007 20:43:46 -0000	1.562
+++ sources	8 Apr 2007 23:22:21 -0000	1.563
@@ -1,4 +1,4 @@
 2618cbcc9c9ac1c3c04be903fe3338a7  sparse-0.2.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
-b7bf3ee2f3ee778afa1ff0e8d44d193e  patch-2.6.21-rc5.bz2
-3ee752aeb1f5e40d37ef5f79843ad299  patch-2.6.21-rc5-git12.bz2
+291cbc4c09c5111e4a2030a04ee69b65  patch-2.6.21-rc6.bz2
+37f989cebb4cabf999a094f757376bd2  patch-2.6.21-rc6-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.490
retrieving revision 1.491
diff -u -r1.490 -r1.491
--- upstream	4 Apr 2007 20:43:46 -0000	1.490
+++ upstream	8 Apr 2007 23:22:21 -0000	1.491
@@ -1,3 +1,3 @@
 linux-2.6.20.tar.bz2
-patch-2.6.21-rc5.bz2
-patch-2.6.21-rc5-git12.bz2
+patch-2.6.21-rc6.bz2
+patch-2.6.21-rc6-git1.bz2


--- patch-2.6.21-rc5-git12.bz2.sign DELETED ---


--- patch-2.6.21-rc5.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr  9 04:47:12 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 00:47:12 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.3052,
	1.3053 linux-2.6-debug-extra-warnings.patch, 1.3, 1.4
Message-ID: <200704090447.l394lCkc009092@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-debug-extra-warnings.patch 
Log Message:
* Mon Apr 09 2007 Dave Jones <davej at redhat.com>
- Disable a bunch more warnings.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3052
retrieving revision 1.3053
diff -u -r1.3052 -r1.3053
--- kernel-2.6.spec	8 Apr 2007 23:22:20 -0000	1.3052
+++ kernel-2.6.spec	9 Apr 2007 04:47:09 -0000	1.3053
@@ -2249,6 +2249,9 @@
 #  - tux.
 
 %changelog
+* Mon Apr 09 2007 Dave Jones <davej at redhat.com>
+- Disable a bunch more warnings.
+
 * Sun Apr 08 2007 Dave Jones <davej at redhat.com>
 - 2.6.21-rc6-git1
 

linux-2.6-debug-extra-warnings.patch:
 Makefile |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-extra-warnings.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-extra-warnings.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-debug-extra-warnings.patch	4 Apr 2007 23:28:11 -0000	1.3
+++ linux-2.6-debug-extra-warnings.patch	9 Apr 2007 04:47:09 -0000	1.4
@@ -2,7 +2,7 @@
  This makes builds fail sooner if something is implicitly defined instead
  of having to wait half an hour for it to fail at the linking stage.
 
--Wextra -Wno-unused-parameter -Wno-missing-field-initializers
+-Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-strict-aliasing -Wno-sign-compare
  Enable the kitchen-sink of 'mostly harmless' warnings, and exclude
  some of the really noisy ones.
 
@@ -19,7 +19,7 @@
 -                   -fno-strict-aliasing -fno-common
 +                   -fno-strict-aliasing -fno-common \
 +		   -Werror-implicit-function-declaration \
-+		   -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-strict-aliasing
++		   -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-strict-aliasing -Wno-sign-compare
  AFLAGS          := -D__ASSEMBLY__
  
  # Read KERNELRELEASE from include/config/kernel.release (if it exists)



From fedora-cvs-commits at redhat.com  Mon Apr  9 11:49:10 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 07:49:10 -0400
Subject: rpms/at-spi/devel at-spi-1.18.0-ior-leak.patch, NONE, 1.1 .cvsignore,
	1.36, 1.37 at-spi.spec, 1.66, 1.67 sources, 1.36, 1.37
Message-ID: <200704091149.l39BnARd014682@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore at-spi.spec sources 
Added Files:
	at-spi-1.18.0-ior-leak.patch 
Log Message:
1.18.1, memleak fix


at-spi-1.18.0-ior-leak.patch:
 bridge.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE at-spi-1.18.0-ior-leak.patch ---
--- at-spi-1.18.0/atk-bridge/bridge.c.ior-leak	2007-04-09 13:34:13.000000000 +0200
+++ at-spi-1.18.0/atk-bridge/bridge.c	2007-04-09 13:35:35.000000000 +0200
@@ -420,9 +420,11 @@
 	  /* XXX: This presumes that the registry has successfully restarted itself already...*/
 	  ior = (char *) spi_atk_bridge_get_registry_ior ();
 
-	  if (ior != NULL)
+	  if (ior != NULL) {
 	       registry = CORBA_ORB_string_to_object (bonobo_activation_orb_get (), 
 						      ior, &ev);
+	       XFree (ior);
+	  }
 	  else {
 	       g_warning ("IOR not set.");  
 	       registry = CORBA_OBJECT_NIL;


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	13 Mar 2007 15:33:42 -0000	1.36
+++ .cvsignore	9 Apr 2007 11:49:08 -0000	1.37
@@ -1 +1 @@
-at-spi-1.18.0.tar.bz2
+at-spi-1.18.1.tar.bz2


Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- at-spi.spec	27 Mar 2007 02:55:38 -0000	1.66
+++ at-spi.spec	9 Apr 2007 11:49:08 -0000	1.67
@@ -7,12 +7,12 @@
 
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
-Version: 1.18.0
-Release: 2%{?dist}
+Version: 1.18.1
+Release: 1%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: http://ftp.gnome.org/pub/gnome/sources/at-spi/1.18/%{name}-%{version}.tar.bz2
-# backport from upstream svn
-Patch0: at-spi-1.18.0-deadlock.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=427836
+Patch0: at-spi-1.18.0-ior-leak.patch
 
 License: LGPL
 Group: System Environment/Libraries
@@ -61,7 +61,8 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .deadlock
+%patch0 -p1 -b .ior-leak
+
 
 %build
 %configure --disable-gtk-doc
@@ -101,6 +102,11 @@
 %{_includedir}/* 
 
 %changelog
+* Mon Apr  9 2007 Matthias Clasen <mclasen at redhat.com> - 1.18.1-1
+- Update to 1.18.1, which includes the previous patch
+- Drop obsolete patch
+- Fix a small memory leak
+
 * Mon Mar 26 2007 Matthias Clasen <mclasen at redhat.com> - 1.18.0-2
 - Backport a patch to fix deadlocks in applications
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	13 Mar 2007 15:33:42 -0000	1.36
+++ sources	9 Apr 2007 11:49:08 -0000	1.37
@@ -1 +1 @@
-d77f3b7111a847903f66f5cb111ee89e  at-spi-1.18.0.tar.bz2
+46c531204df5d39f7e83822372b0ce69  at-spi-1.18.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr  9 14:15:37 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 10:15:37 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.8,
	1.9 policycoreutils.spec, 1.390, 1.391
Message-ID: <200704091415.l39EFbsC007045@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Mon Apr 9 2007 Dan Walsh <dwalsh at redhat.com> 2.0.7-10
- Add filter to booleans page


policycoreutils-gui.patch:
 Makefile                    |   30 
 booleansPage.py             |  224 +++
 fcontextPage.py             |  185 ++
 loginsPage.py               |  173 ++
 mappingsPage.py             |   54 
 modulesPage.py              |  172 ++
 polgen.glade                | 1127 ++++++++++++++++
 polgen.py                   |  436 ++++++
 polgengui.py                |  211 +++
 portsPage.py                |  227 +++
 selinux.tbl                 |  274 ++++
 semanagePage.py             |  115 +
 statusPage.py               |  220 +++
 system-config-selinux.glade | 2956 ++++++++++++++++++++++++++++++++++++++++++++
 system-config-selinux.py    |  169 ++
 templates/__init__.py       |   18 
 templates/executable.py     |  156 ++
 templates/network.py        |   46 
 templates/rw.py             |  106 +
 templates/script.py         |   42 
 templates/semodule.py       |   41 
 templates/tmp.py            |   74 +
 templates/var_lib.py        |  107 +
 templates/var_log.py        |   91 +
 templates/var_run.py        |   93 +
 templates/var_spool.py      |  107 +
 translationsPage.py         |  111 +
 usersPage.py                |  166 ++
 28 files changed, 7731 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- policycoreutils-gui.patch	3 Apr 2007 18:58:42 -0000	1.8
+++ policycoreutils-gui.patch	9 Apr 2007 14:15:34 -0000	1.9
@@ -1,7 +1,7 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.7/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/booleansPage.py	2007-03-23 09:03:56.000000000 -0400
-@@ -0,0 +1,202 @@
++++ policycoreutils-2.0.7/gui/booleansPage.py	2007-04-06 15:20:14.000000000 -0400
+@@ -0,0 +1,224 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
 +#
@@ -35,7 +35,6 @@
 +INSTALLPATH='/usr/share/system-config-selinux'
 +sys.path.append(INSTALLPATH)
 +
-+from Conf import *
 +import commands
 +ENFORCING=0
 +PERMISSIVE=1
@@ -55,6 +54,8 @@
 +    import __builtin__
 +    __builtin__.__dict__['_'] = unicode
 +
++from glob import fnmatch
++
 +class Translation:
 +    def __init__(self):
 +        self.translation={}
@@ -71,6 +72,15 @@
 +            except:
 +                continue
 +
++    def match(self,key, filter=""):
++        try:
++            f=filter.lower()
++            val=self.get_value(key).lower()
++            k=key.lower()
++            return val.find(f) >= 0 or k.find(f) >= 0
++        except:
++            return False
++
 +    def get_category(self,key):
 +        try:
 +            return _(self.translation[key][0])
@@ -153,6 +163,10 @@
 +        # Bring in widgets from glade file.
 +        self.typeHBox = xml.get_widget("typeHBox")
 +        self.booleanSW = xml.get_widget("booleanSW")
++        self.booleansFilter = xml.get_widget("booleansFilter")
++        self.booleansFilter.connect("focus_out_event", self.filter_changed)
++        self.booleansFilter.connect("activate", self.filter_changed)
++        
 +        self.booleansView = xml.get_widget("booleansView")
 +        self.typeLabel = xml.get_widget("typeLabel")
 +        self.modifySeparator = xml.get_widget("modifySeparator")
@@ -173,25 +187,33 @@
 +
 +        col = gtk.TreeViewColumn("", gtk.CellRendererText(), text=1)
 +        self.booleansView.append_column(col)
-+        self.refreshBooleans()
++        self.filter=""
++        self.refreshBooleans(self.filter)
 +            
++    def filter_changed(self, *arg):
++        filter =  arg[0].get_text()
++        if filter != self.filter:
++            self.refreshBooleans(filter)
++            self.filter=filter
++        
 +    def use_menus(self):
 +        return False
 +    
 +    def get_description(self):
 +        return _("Boolean")
 +
-+    def refreshBooleans(self):
++    def refreshBooleans(self, filter=None):
 +        self.modifiers=Modifiers(self.booleansStore)
 +        booleansList=commands.getoutput("/usr/sbin/getsebool -a").split("\n")
 +        for i in booleansList:
 +            rec=i.split()
 +            name=rec[0]
-+            if rec[2]=="on" or rec[2]=="active":
-+                on=1
-+            else:
-+                on=0
-+            self.modifiers.add(name,Boolean(name,on))
++            if self.translation.match(name, filter):
++                if rec[2]=="on" or rec[2]=="active":
++                    on=1
++                else:
++                    on=0
++                self.modifiers.add(name,Boolean(name,on))
 +
 +    def boolean_toggled(self, widget, row):
 +        if len(row) == 1:
@@ -664,8 +686,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.7/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/modulesPage.py	2007-03-23 09:03:56.000000000 -0400
-@@ -0,0 +1,170 @@
++++ policycoreutils-2.0.7/gui/modulesPage.py	2007-04-05 10:09:19.000000000 -0400
+@@ -0,0 +1,172 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -749,15 +771,17 @@
 +
 +    def load(self):
 +        self.store.clear()
-+        fd=os.popen("semodule -l")
-+        l = fd.readlines()
-+        fd.close()
-+        for i in l:
-+            module, ver = i.split('\t')
-+            iter = self.store.append()
-+            self.store.set_value(iter, 0, module.strip())
-+            self.store.set_value(iter, 1, ver.strip())
-+        
++        try:
++            fd=os.popen("semodule -l")
++            l = fd.readlines()
++            fd.close()
++            for i in l:
++                module, ver = i.split('\t')
++                iter = self.store.append()
++                self.store.set_value(iter, 0, module.strip())
++                self.store.set_value(iter, 1, ver.strip())
++        except:
++            pass
 +        self.view.get_selection().select_path ((0,))
 +    
 +
@@ -2855,8 +2879,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.7/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/selinux.tbl	2007-03-23 09:03:56.000000000 -0400
-@@ -0,0 +1,265 @@
++++ policycoreutils-2.0.7/gui/selinux.tbl	2007-04-06 15:33:02.000000000 -0400
+@@ -0,0 +1,274 @@
 +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
 +allow_cvs_read_shadow  _("CVS") _("Allow cvs daemon to read shadow")
 +allow_daemons_dump_core _("Admin") _("Allow all daemons to write corefiles to /.")
@@ -2865,6 +2889,7 @@
 +allow_execmem _("Memory Protection") _("Allow unconfined executables to map a memory region as both executable and writable, this is dangerous and the executable should be reported in bugzilla")
 +allow_execmod _("Memory Protection") _("Allow all unconfined executables to use libraries requiring text relocation that are not labeled textrel_shlib_t")
 +allow_execstack _("Memory Protection") _("Allow unconfined executables to make their stack executable.  This should never, ever be neessary. Probably indicates a badly coded executable, but could indicate an attack. This executable should be reported in bugzilla")
++allow_ftpd_full_access _("FTP") _("Allow ftpd to full access to the system")
 +allow_ftpd_anon_write _("FTP") _("Allow ftpd to upload files to directories labeled public_content_rw_t")
 +allow_ftpd_use_cifs _("FTP") _("Allow ftp servers to use cifs used for public file transfer services.")
 +allow_ftpd_use_nfs _("FTP") _("Allow ftp servers to use nfs used for public file transfer services.")
@@ -3004,8 +3029,8 @@
 +nessusd_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for nessusd daemon")
 +NetworkManager_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for NetworkManager")
 +nfsd_disable_trans _("NFS") _("Disable SELinux protection for nfsd daemon")
-+nfs_export_all_ro _("NFS") _("Allow the reading on any NFS file system")
-+nfs_export_all_rw _("NFS") _("Allow the read/write/create on any NFS file system")
++nfs_export_all_ro _("NFS") _("Allow NFS to share any file/directory read only")
++nfs_export_all_rw _("NFS") _("Allow NFS to share any file/directory read/write")
 +nmbd_disable_trans _("Samba") _("Disable SELinux protection for nmbd daemon")
 +nrpe_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for nrpe daemon")
 +nscd_disable_trans _("Name Service") _("Disable SELinux protection for nscd daemon")
@@ -3065,7 +3090,7 @@
 +snort_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for snort daemon")
 +soundd_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for soundd daemon")
 +sound_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for sound daemon")
-+spamassasin_can_network _("Spam Assassin") _("Allow Spam Assasin daemon network access")
++spamassassin_can_network _("Spam Assassin") _("Allow Spam Assasin daemon network access")
 +spamd_disable_trans _("spam Protection") _("Disable SELinux protection for spamd daemon")
 +spamd_enable_home_dirs _("spam Protection") _("Allow spamd to access home directories")
 +spammassasin_can_network _("spam Protection") _("Allow spammassasin to access the network")
@@ -3122,6 +3147,14 @@
 +ypserv_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for ypserv daemon")
 +ypxfr_disable_trans _("NIS") _("Disable SELinux protection for NIS Transfer Daemon")
 +zebra_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for zebra daemon")
++httpd_use_cifs _("HTTPD Service") _("Allow httpd to access samba/cifs file systems.")
++httpd_use_nfs _("HTTPD Service") _("Allow httpd to access nfs file systems.")
++samba_domain_controller _("Samba") _("Allow samba to act as the domain controller, add users, groups and change passwords")
++samba_export_all_ro _("Samba") _("Allow Samba to share any file/directory read only")
++samba_export_all_rw _("Samba") _("Allow Samba to share any file/directory read/write")
++webadm_manage_users_files _("HTTPD Service") _("Allow httpd to access nfs file systems.")
++webadm_read_users_files _("HTTPD Service") _("Allow httpd to access nfs file systems.")
++
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.7/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-2.0.7/gui/semanagePage.py	2007-03-23 09:03:56.000000000 -0400
@@ -3467,8 +3500,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.7/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/system-config-selinux.glade	2007-03-23 09:03:56.000000000 -0400
-@@ -0,0 +1,2885 @@
++++ policycoreutils-2.0.7/gui/system-config-selinux.glade	2007-04-06 15:13:41.000000000 -0400
+@@ -0,0 +1,2956 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 +
@@ -5339,26 +5372,97 @@
 +	      </child>
 +
 +	      <child>
-+		<widget class="GtkScrolledWindow" id="scrolledwindow18">
++		<widget class="GtkVBox" id="vbox18">
 +		  <property name="visible">True</property>
-+		  <property name="can_focus">True</property>
-+		  <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-+		  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-+		  <property name="shadow_type">GTK_SHADOW_NONE</property>
-+		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
++		  <property name="homogeneous">False</property>
++		  <property name="spacing">0</property>
 +
 +		  <child>
-+		    <widget class="GtkTreeView" id="booleansView">
++		    <widget class="GtkHBox" id="hbox7">
++		      <property name="visible">True</property>
++		      <property name="homogeneous">False</property>
++		      <property name="spacing">0</property>
++
++		      <child>
++			<widget class="GtkLabel" id="label51">
++			  <property name="visible">True</property>
++			  <property name="label" translatable="yes">Filter</property>
++			  <property name="use_underline">False</property>
++			  <property name="use_markup">False</property>
++			  <property name="justify">GTK_JUSTIFY_LEFT</property>
++			  <property name="wrap">False</property>
++			  <property name="selectable">False</property>
++			  <property name="xalign">0.5</property>
++			  <property name="yalign">0.5</property>
++			  <property name="xpad">0</property>
++			  <property name="ypad">0</property>
++			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			  <property name="width_chars">-1</property>
++			  <property name="single_line_mode">False</property>
++			  <property name="angle">0</property>
++			</widget>
++			<packing>
++			  <property name="padding">10</property>
++			  <property name="expand">False</property>
++			  <property name="fill">False</property>
++			</packing>
++		      </child>
++
++		      <child>
++			<widget class="GtkEntry" id="booleansFilter">
++			  <property name="visible">True</property>
++			  <property name="can_focus">True</property>
++			  <property name="editable">True</property>
++			  <property name="visibility">True</property>
++			  <property name="max_length">0</property>
++			  <property name="text" translatable="yes"></property>
++			  <property name="has_frame">True</property>
++			  <property name="invisible_char">???</property>
++			  <property name="activates_default">False</property>
++			  <signal name="changed" handler="on_booleansFilter_changed" last_modification_time="Fri, 06 Apr 2007 12:39:26 GMT"/>
++			</widget>
++			<packing>
++			  <property name="padding">0</property>
++			  <property name="expand">True</property>
++			  <property name="fill">True</property>
++			</packing>
++		      </child>
++		    </widget>
++		    <packing>
++		      <property name="padding">10</property>
++		      <property name="expand">False</property>
++		      <property name="fill">True</property>
++		    </packing>
++		  </child>
++
++		  <child>
++		    <widget class="GtkScrolledWindow" id="scrolledwindow18">
 +		      <property name="visible">True</property>
 +		      <property name="can_focus">True</property>
-+		      <property name="headers_visible">False</property>
-+		      <property name="rules_hint">False</property>
-+		      <property name="reorderable">False</property>
-+		      <property name="enable_search">True</property>
-+		      <property name="fixed_height_mode">False</property>
-+		      <property name="hover_selection">False</property>
-+		      <property name="hover_expand">False</property>
++		      <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
++		      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
++		      <property name="shadow_type">GTK_SHADOW_NONE</property>
++		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
++
++		      <child>
++			<widget class="GtkTreeView" id="booleansView">
++			  <property name="visible">True</property>
++			  <property name="can_focus">True</property>
++			  <property name="headers_visible">False</property>
++			  <property name="rules_hint">False</property>
++			  <property name="reorderable">False</property>
++			  <property name="enable_search">True</property>
++			  <property name="fixed_height_mode">False</property>
++			  <property name="hover_selection">False</property>
++			  <property name="hover_expand">False</property>
++			</widget>
++		      </child>
 +		    </widget>
++		    <packing>
++		      <property name="padding">0</property>
++		      <property name="expand">True</property>
++		      <property name="fill">True</property>
++		    </packing>
 +		  </child>
 +		</widget>
 +		<packing>


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -r1.390 -r1.391
--- policycoreutils.spec	3 Apr 2007 18:58:42 -0000	1.390
+++ policycoreutils.spec	9 Apr 2007 14:15:34 -0000	1.391
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 2.0.7
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -186,6 +186,9 @@
 fi
 
 %changelog
+* Mon Apr 9 2007 Dan Walsh <dwalsh at redhat.com> 2.0.7-10
+- Add filter to booleans page
+
 * Tue Apr 3 2007 Dan Walsh <dwalsh at redhat.com> 2.0.7-9
 - Fix polgen.py to not generate udp rules on tcp input
 



From fedora-cvs-commits at redhat.com  Mon Apr  9 16:41:05 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 12:41:05 -0400
Subject: rpms/gtkhtml3/devel .cvsignore, 1.50, 1.51 gtkhtml3.spec, 1.88,
	1.89 sources, 1.50, 1.51
Message-ID: <200704091641.l39Gf5qG021023@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/gtkhtml3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20874

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:

* Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 3.14.1-1.fc7
- Update to 3.14.1
- Add -Wdeclaration-after-statement to strict build settings.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	13 Mar 2007 02:36:31 -0000	1.50
+++ .cvsignore	9 Apr 2007 16:41:03 -0000	1.51
@@ -1 +1 @@
-gtkhtml-3.14.0.tar.bz2
+gtkhtml-3.14.1.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- gtkhtml3.spec	13 Mar 2007 02:36:31 -0000	1.88
+++ gtkhtml3.spec	9 Apr 2007 16:41:03 -0000	1.89
@@ -8,7 +8,7 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.14.0
+Version: 3.14.1
 Release: 1%{?dist}
 License: LGPL/GPL
 Group: System Environment/Libraries
@@ -82,6 +82,7 @@
 	-DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
 	-DGDK_DISABLE_DEPRECATED=1 \
 	-DGNOME_DISABLE_DEPRECATED=1 \
+	-Wdeclaration-after-statement \
 	-Werror-implicit-function-declaration"
 %endif
 
@@ -131,6 +132,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 3.14.1-1.fc7
+- Update to 3.14.1
+- Add -Wdeclaration-after-statement to strict build settings.
+
 * Mon Mar 12 2007 Matthew Barnes <mbarnes at redhat.com> - 3.14.0-1.fc7
 - Update to 3.14.0
 - Bump gtkhtml_major to 3.14.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	13 Mar 2007 02:36:31 -0000	1.50
+++ sources	9 Apr 2007 16:41:03 -0000	1.51
@@ -1 +1 @@
-633fe78fc9b28e013bed269848aa0f9b  gtkhtml-3.14.0.tar.bz2
+ac0171a22ac47a0372296bb112f5f8d6  gtkhtml-3.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr  9 16:41:24 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 12:41:24 -0400
Subject: rpms/evolution-data-server/devel .cvsignore, 1.61,
	1.62 evolution-data-server-1.10.0-code-cleanup.patch, 1.3,
	1.4 evolution-data-server-1.8.0-no-gnome-common.patch, 1.2,
	1.3 evolution-data-server.spec, 1.158, 1.159 sources, 1.61,
	1.62 evolution-data-server-1.10.0-no-more-beeps.patch, 1.1, NONE
Message-ID: <200704091641.l39GfOBj021281@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	.cvsignore evolution-data-server-1.10.0-code-cleanup.patch 
	evolution-data-server-1.8.0-no-gnome-common.patch 
	evolution-data-server.spec sources 
Removed Files:
	evolution-data-server-1.10.0-no-more-beeps.patch 
Log Message:

* Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 1.10.1-1.fc7
- Update to 1.10.1
- Remove evolution-data-server-1.10.0-no-more-beeps.patch (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	13 Mar 2007 02:51:25 -0000	1.61
+++ .cvsignore	9 Apr 2007 16:41:22 -0000	1.62
@@ -1 +1 @@
-evolution-data-server-1.10.0.tar.bz2
+evolution-data-server-1.10.1.tar.bz2

evolution-data-server-1.10.0-code-cleanup.patch:
 calendar/libical/src/libicalss/icalssyacc.y                   |    1 
 calendar/libical/src/libicalvcal/vcc.y                        |    1 
 docs/reference/libedataserverui/libedataserverui-docs.sgml    |    1 
 docs/reference/libedataserverui/libedataserverui-sections.txt |   23 
 docs/reference/libedataserverui/libedataserverui.types        |    2 
 libedataserverui/Makefile.am                                  |    2 
 libedataserverui/Makefile.in                                  |    7 
 libedataserverui/e-name-selector-dialog.c                     |  158 +--
 libedataserverui/e-name-selector-dialog.glade                 |   40 
 libedataserverui/e-name-selector-dialog.h                     |    1 
 libedataserverui/e-name-selector-entry.c                      |    2 
 libedataserverui/e-name-selector-list.c                       |    2 
 libedataserverui/e-source-combo-box.c                         |  457 ++++++++++
 libedataserverui/e-source-combo-box.h                         |   79 +
 libedataserverui/e-source-option-menu.h                       |    3 
 libedataserverui/test-source-option-menu.c                    |   22 
 16 files changed, 676 insertions(+), 125 deletions(-)

Index: evolution-data-server-1.10.0-code-cleanup.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server-1.10.0-code-cleanup.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- evolution-data-server-1.10.0-code-cleanup.patch	4 Apr 2007 16:53:44 -0000	1.3
+++ evolution-data-server-1.10.0-code-cleanup.patch	9 Apr 2007 16:41:22 -0000	1.4
@@ -1076,16 +1076,6 @@
  <FILE>e-source-option-menu</FILE>
  <TITLE>ESourceOptionMenu</TITLE>
  ESourceOptionMenu
---- evolution-data-server-1.10.0/iconv-detect.c.code-cleanup	2007-01-03 05:10:36.000000000 -0500
-+++ evolution-data-server-1.10.0/iconv-detect.c	2007-04-04 12:08:04.000000000 -0400
-@@ -21,6 +21,7 @@
-  */
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <iconv.h>
- 
- enum {
 --- evolution-data-server-1.10.0/calendar/libical/src/libicalss/icalssyacc.y.code-cleanup	2007-01-03 10:02:34.000000000 -0500
 +++ evolution-data-server-1.10.0/calendar/libical/src/libicalss/icalssyacc.y	2007-04-04 12:08:04.000000000 -0400
 @@ -47,6 +47,7 @@

evolution-data-server-1.8.0-no-gnome-common.patch:
 configure    |  148 -----------------------------------------------------------
 configure.in |    2 
 2 files changed, 150 deletions(-)

Index: evolution-data-server-1.8.0-no-gnome-common.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server-1.8.0-no-gnome-common.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- evolution-data-server-1.8.0-no-gnome-common.patch	22 Jan 2007 03:35:03 -0000	1.2
+++ evolution-data-server-1.8.0-no-gnome-common.patch	9 Apr 2007 16:41:22 -0000	1.3
@@ -1,16 +1,16 @@
---- evolution-data-server-1.9.5/configure.no-gnome-common	2007-01-21 21:49:28.000000000 -0500
-+++ evolution-data-server-1.9.5/configure	2007-01-21 21:50:44.000000000 -0500
-@@ -29801,141 +29801,6 @@
+--- evolution-data-server-1.10.1/configure.no-gnome-common	2007-04-09 12:15:42.000000000 -0400
++++ evolution-data-server-1.10.1/configure	2007-04-09 12:16:10.000000000 -0400
+@@ -32298,154 +32298,6 @@
  
  
  
--    # Check whether --enable-compile-warnings or --disable-compile-warnings was given.
+-    # Check whether --enable-compile-warnings was given.
 -if test "${enable_compile_warnings+set}" = set; then
--  enableval="$enable_compile_warnings"
--
+-  enableval=$enable_compile_warnings;
 -else
 -  enable_compile_warnings="yes"
--fi;
+-fi
+-
 -
 -    warnCFLAGS=
 -    if test "x$GCC" != xyes; then
@@ -36,8 +36,8 @@
 -	for option in -Wno-sign-compare; do
 -		SAVE_CFLAGS="$CFLAGS"
 -		CFLAGS="$CFLAGS $option"
--		echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
--echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6
+-		{ echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
+-echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; }
 -		cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -54,24 +54,36 @@
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -80,12 +92,13 @@
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--has_option=no
+-	has_option=no
 -fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -		CFLAGS="$SAVE_CFLAGS"
--		echo "$as_me:$LINENO: result: $has_option" >&5
--echo "${ECHO_T}$has_option" >&6
+-		{ echo "$as_me:$LINENO: result: $has_option" >&5
+-echo "${ECHO_T}$has_option" >&6; }
 -		if test $has_option = yes; then
 -		  warning_flags="$warning_flags $option"
 -		fi
@@ -104,21 +117,21 @@
 -	;;
 -    esac
 -    CFLAGS="$realsave_CFLAGS"
--    echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
--echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6
--    echo "$as_me:$LINENO: result: $warning_flags" >&5
--echo "${ECHO_T}$warning_flags" >&6
+-    { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
+-echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; }
+-    { echo "$as_me:$LINENO: result: $warning_flags" >&5
+-echo "${ECHO_T}$warning_flags" >&6; }
 -
--    # Check whether --enable-iso-c or --disable-iso-c was given.
+-    # Check whether --enable-iso-c was given.
 -if test "${enable_iso_c+set}" = set; then
--  enableval="$enable_iso_c"
--
+-  enableval=$enable_iso_c;
 -else
 -  enable_iso_c=no
--fi;
+-fi
+-
 -
--    echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
--echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6
+-    { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
+-echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; }
 -    complCFLAGS=
 -    if test "x$enable_iso_c" != "xno"; then
 -	if test "x$GCC" = "xyes"; then
@@ -132,8 +145,8 @@
 -	esac
 -	fi
 -    fi
--    echo "$as_me:$LINENO: result: $complCFLAGS" >&5
--echo "${ECHO_T}$complCFLAGS" >&6
+-    { echo "$as_me:$LINENO: result: $complCFLAGS" >&5
+-echo "${ECHO_T}$complCFLAGS" >&6; }
 -
 -    WARN_CFLAGS="$warning_flags $complCFLAGS"
 -
@@ -142,9 +155,9 @@
  case $CFLAGS in
  *-Wall*)
  	# Turn off the annoying "comparison between signed and unsigned"
---- evolution-data-server-1.9.5/configure.in.no-gnome-common	2007-01-08 11:49:57.000000000 -0500
-+++ evolution-data-server-1.9.5/configure.in	2007-01-21 21:49:01.000000000 -0500
-@@ -1206,8 +1206,6 @@
+--- evolution-data-server-1.10.1/configure.in.no-gnome-common	2007-04-09 08:44:46.000000000 -0400
++++ evolution-data-server-1.10.1/configure.in	2007-04-09 12:15:42.000000000 -0400
+@@ -1209,8 +1209,6 @@
  dnl CFLAGS and LIBS and stuff
  dnl *************************
  


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- evolution-data-server.spec	4 Apr 2007 16:53:44 -0000	1.158
+++ evolution-data-server.spec	9 Apr 2007 16:41:22 -0000	1.159
@@ -25,8 +25,8 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 1.10.0
-Release: 6%{?dist}
+Version: 1.10.1
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -78,9 +78,6 @@
 # GNOME bug #417999
 Patch23: evolution-data-server-1.10.0-code-cleanup.patch
 
-# E-D-S beeps a lot
-Patch24: evolution-data-server-1.10.0-no-more-beeps.patch
-
 ### Dependencies ###
 
 Requires: GConf2
@@ -174,7 +171,6 @@
 %patch21 -p1 -b .e-passwords
 %patch22 -p1 -b .isa-support
 %patch23 -p1 -b .code-cleanup
-%patch24 -p1 -b .no-more-beeps
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -392,6 +388,10 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 1.10.1-1.fc7
+- Update to 1.10.1
+- Remove evolution-data-server-1.10.0-no-more-beeps.patch (fixed upstream).
+
 * Wed Apr 04 2007 Matthew Barnes <mbarnes at redhat.com> - 1.10.0-6.fc7
 - Revise patch for GNOME bug #417999 (another ESourceComboBox goof).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	13 Mar 2007 02:51:25 -0000	1.61
+++ sources	9 Apr 2007 16:41:22 -0000	1.62
@@ -1 +1 @@
-390ea134306b667a2d77b7e859c8cba0  evolution-data-server-1.10.0.tar.bz2
+1175bf76756009975f684116e76638c3  evolution-data-server-1.10.1.tar.bz2


--- evolution-data-server-1.10.0-no-more-beeps.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr  9 16:56:10 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 12:56:10 -0400
Subject: rpms/evolution-connector/devel .cvsignore, 1.46,
	1.47 evolution-connector.spec, 1.95,
	1.96 evolution-exchange-2.7.2-no_gnome_common.patch, 1.2,
	1.3 sources, 1.46, 1.47
Message-ID: <200704091656.l39GuAkg032050@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	.cvsignore evolution-connector.spec 
	evolution-exchange-2.7.2-no_gnome_common.patch sources 
Log Message:

* Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-1.fc7
- Update to 2.10.1
- Add -Wdeclaration-after-statement to strict build settings.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	13 Mar 2007 03:52:35 -0000	1.46
+++ .cvsignore	9 Apr 2007 16:56:03 -0000	1.47
@@ -1 +1 @@
-evolution-exchange-2.10.0.tar.bz2
+evolution-exchange-2.10.1.tar.bz2


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- evolution-connector.spec	13 Mar 2007 03:52:35 -0000	1.95
+++ evolution-connector.spec	9 Apr 2007 16:56:03 -0000	1.96
@@ -23,7 +23,7 @@
 ### Abstract ###
 
 Name: evolution-connector
-Version: 2.10.0
+Version: 2.10.1
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
@@ -107,6 +107,7 @@
 	-DGDK_DISABLE_DEPRECATED=1 \
 	-DGTK_DISABLE_DEPRECATED=1 \
 	-DGNOME_DISABLE_DEPRECATED=1 \
+	-Wdeclaration-after-statement \
 	-Werror-implicit-function-declaration"
 %endif
 
@@ -148,6 +149,10 @@
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-1.fc7
+- Update to 2.10.1
+- Add -Wdeclaration-after-statement to strict build settings.
+
 * Mon Mar 12 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-1.fc7
 - Update to 2.10.0
 

evolution-exchange-2.7.2-no_gnome_common.patch:
 configure    |  148 -----------------------------------------------------------
 configure.in |    2 
 2 files changed, 150 deletions(-)

Index: evolution-exchange-2.7.2-no_gnome_common.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-exchange-2.7.2-no_gnome_common.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- evolution-exchange-2.7.2-no_gnome_common.patch	22 Jan 2007 03:38:48 -0000	1.2
+++ evolution-exchange-2.7.2-no_gnome_common.patch	9 Apr 2007 16:56:03 -0000	1.3
@@ -1,5 +1,5 @@
---- evolution-exchange-2.9.5/configure.in.no_gnome_common	2007-01-08 11:50:35.000000000 -0500
-+++ evolution-exchange-2.9.5/configure.in	2007-01-21 22:11:46.000000000 -0500
+--- evolution-exchange-2.10.1/configure.in.no_gnome_common	2007-04-09 07:22:04.000000000 -0400
++++ evolution-exchange-2.10.1/configure.in	2007-04-09 12:44:52.000000000 -0400
 @@ -95,8 +95,6 @@
  dnl CFLAGS and LIBS and stuff
  dnl *************************
@@ -9,19 +9,19 @@
  case $CFLAGS in
  *-Wall*)
  	CFLAGS="$CFLAGS -Wno-sign-compare"
---- evolution-exchange-2.9.5/configure.no_gnome_common	2007-01-21 22:12:23.000000000 -0500
-+++ evolution-exchange-2.9.5/configure	2007-01-21 22:13:03.000000000 -0500
-@@ -21924,141 +21924,6 @@
+--- evolution-exchange-2.10.1/configure.no_gnome_common	2007-04-09 08:03:50.000000000 -0400
++++ evolution-exchange-2.10.1/configure	2007-04-09 12:45:51.000000000 -0400
+@@ -23393,154 +23393,6 @@
  
  
  
--    # Check whether --enable-compile-warnings or --disable-compile-warnings was given.
+-    # Check whether --enable-compile-warnings was given.
 -if test "${enable_compile_warnings+set}" = set; then
--  enableval="$enable_compile_warnings"
--
+-  enableval=$enable_compile_warnings;
 -else
 -  enable_compile_warnings="maximum"
--fi;
+-fi
+-
 -
 -    warnCFLAGS=
 -    if test "x$GCC" != xyes; then
@@ -47,8 +47,8 @@
 -	for option in -Wno-sign-compare; do
 -		SAVE_CFLAGS="$CFLAGS"
 -		CFLAGS="$CFLAGS $option"
--		echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
--echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6
+-		{ echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
+-echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; }
 -		cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -65,24 +65,36 @@
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -91,12 +103,13 @@
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--has_option=no
+-	has_option=no
 -fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -		CFLAGS="$SAVE_CFLAGS"
--		echo "$as_me:$LINENO: result: $has_option" >&5
--echo "${ECHO_T}$has_option" >&6
+-		{ echo "$as_me:$LINENO: result: $has_option" >&5
+-echo "${ECHO_T}$has_option" >&6; }
 -		if test $has_option = yes; then
 -		  warning_flags="$warning_flags $option"
 -		fi
@@ -115,21 +128,21 @@
 -	;;
 -    esac
 -    CFLAGS="$realsave_CFLAGS"
--    echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
--echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6
--    echo "$as_me:$LINENO: result: $warning_flags" >&5
--echo "${ECHO_T}$warning_flags" >&6
+-    { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
+-echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; }
+-    { echo "$as_me:$LINENO: result: $warning_flags" >&5
+-echo "${ECHO_T}$warning_flags" >&6; }
 -
--    # Check whether --enable-iso-c or --disable-iso-c was given.
+-    # Check whether --enable-iso-c was given.
 -if test "${enable_iso_c+set}" = set; then
--  enableval="$enable_iso_c"
--
+-  enableval=$enable_iso_c;
 -else
 -  enable_iso_c=no
--fi;
+-fi
+-
 -
--    echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
--echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6
+-    { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
+-echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; }
 -    complCFLAGS=
 -    if test "x$enable_iso_c" != "xno"; then
 -	if test "x$GCC" = "xyes"; then
@@ -143,8 +156,8 @@
 -	esac
 -	fi
 -    fi
--    echo "$as_me:$LINENO: result: $complCFLAGS" >&5
--echo "${ECHO_T}$complCFLAGS" >&6
+-    { echo "$as_me:$LINENO: result: $complCFLAGS" >&5
+-echo "${ECHO_T}$complCFLAGS" >&6; }
 -
 -    WARN_CFLAGS="$warning_flags $complCFLAGS"
 -


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	13 Mar 2007 03:52:35 -0000	1.46
+++ sources	9 Apr 2007 16:56:03 -0000	1.47
@@ -1 +1 @@
-ffed2fdc7645b029bbf0c774e35e3fa0  evolution-exchange-2.10.0.tar.bz2
+3457a46a0450737d83f1c74e97c89b8f  evolution-exchange-2.10.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr  9 17:07:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 13:07:53 -0400
Subject: rpms/wpa_supplicant/devel wpa_supplicant-0.5.7-use-syslog.patch,
	NONE, 1.1 wpa_supplicant.spec, 1.21, 1.22
Message-ID: <200704091707.l39H7rs9008154@cvs.devel.redhat.com>

Author: dcbw

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

Modified Files:
	wpa_supplicant.spec 
Added Files:
	wpa_supplicant-0.5.7-use-syslog.patch 
Log Message:
* Mon Apr  9 2007 Dan Williams <dcbw at redhat.com> - 0.5.7-2
- Add patch to send output to syslog



wpa_supplicant-0.5.7-use-syslog.patch:
 common.c         |  172 ++++++++++++++++++++++++++++---------------------------
 main.c           |   29 ++++++++-
 wpa_passphrase.c |    1 
 wpa_supplicant.c |   32 ++++++++++
 4 files changed, 150 insertions(+), 84 deletions(-)

--- NEW FILE wpa_supplicant-0.5.7-use-syslog.patch ---
--- wpa_supplicant-0.5.7/wpa_supplicant.c.syslog	2007-04-09 10:54:27.000000000 -0400
+++ wpa_supplicant-0.5.7/wpa_supplicant.c	2007-04-09 10:54:27.000000000 -0400
@@ -18,6 +18,8 @@
 
 #include "includes.h"
 
+#include <syslog.h>
+
 #include "common.h"
 #include "eapol_sm.h"
 #include "eap.h"
@@ -111,6 +113,8 @@
 extern int wpa_debug_show_keys;
 extern int wpa_debug_timestamp;
 
+extern char * use_syslog;
+
 static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx);
 
 #if defined(IEEE8021X_EAPOL) || !defined(CONFIG_NO_WPA)
@@ -2533,6 +2537,28 @@
 	return global;
 }
 
+static int get_facility(const char *f)
+{
+	if (!strcmp(f, "authpriv"))	return LOG_AUTHPRIV;
+	if (!strcmp(f, "cron"))		return LOG_CRON;
+	if (!strcmp(f, "daemon"))	return LOG_DAEMON;
+	if (!strcmp(f, "ftp"))		return LOG_FTP;
+	if (!strcmp(f, "kern"))		return LOG_KERN;
+	if (!strcmp(f, "local0"))	return LOG_LOCAL0;
+	if (!strcmp(f, "local1"))	return LOG_LOCAL1;
+	if (!strcmp(f, "local2"))	return LOG_LOCAL2;
+	if (!strcmp(f, "local3"))	return LOG_LOCAL3;
+	if (!strcmp(f, "local4"))	return LOG_LOCAL4;
+	if (!strcmp(f, "local5"))	return LOG_LOCAL5;
+	if (!strcmp(f, "local6"))	return LOG_LOCAL6;
+	if (!strcmp(f, "local7"))	return LOG_LOCAL7;
+	if (!strcmp(f, "lpr"))		return LOG_LPR;
+	if (!strcmp(f, "mail"))		return LOG_MAIL;
+	if (!strcmp(f, "news"))		return LOG_NEWS;
+	if (!strcmp(f, "user"))		return LOG_USER;
+	if (!strcmp(f, "uucp"))		return LOG_UUCP;
+	return LOG_DAEMON;
+}
 
 /**
  * wpa_supplicant_run - Run the %wpa_supplicant main event loop
@@ -2551,6 +2577,9 @@
 	    wpa_supplicant_daemon(global->params.pid_file))
 		return -1;
 
+	if (use_syslog)
+		openlog("wpa_supplicant", LOG_PID | LOG_CONS | LOG_PERROR, get_facility(use_syslog));
+
 	if (global->params.wait_for_monitor) {
 		for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next)
 			if (wpa_s->ctrl_iface)
@@ -2563,6 +2592,9 @@
 
 	eloop_run();
 
+	if (use_syslog)
+		closelog();
+
 	return 0;
 }
 
--- wpa_supplicant-0.5.7/common.c.syslog	2006-12-31 16:41:44.000000000 -0500
+++ wpa_supplicant-0.5.7/common.c	2007-04-09 10:54:27.000000000 -0400
@@ -13,6 +13,7 @@
  */
 
 #include "includes.h"
+#include <syslog.h>
 
 #include "common.h"
 
@@ -37,6 +38,7 @@
 	return -1;
 }
 
+extern char * use_syslog;
 
 static int hex2byte(const char *hex)
 {
@@ -162,6 +164,35 @@
 	printf("%ld.%06u: ", (long) tv.sec, (unsigned int) tv.usec);
 }
 
+char * wpa_debug_print_timestamp_internal(char *out)
+{
+	struct timeval tv;
+	char buf[16];
+	char *p = out;
+
+	if (!wpa_debug_timestamp)
+		return out;
+
+	gettimeofday(&tv, NULL);
+	if (strftime(buf, sizeof(buf), "%b %d %H:%M:%S",
+		     localtime((const time_t *) &tv.tv_sec)) <= 0) {
+		snprintf(buf, sizeof(buf), "%u", (int) tv.tv_sec);
+	}
+	return p + sprintf(out, "%s.%06u: ", buf, (unsigned int) tv.tv_usec);
+}
+
+int wpa_to_syslog_level(int wpal)
+{
+	if (wpal <= MSG_DEBUG)
+		return LOG_DEBUG;
+	else if (wpal == MSG_INFO)
+		return LOG_INFO;
+	else if (wpal == MSG_WARNING)
+		return LOG_WARNING;
+	else if (wpal == MSG_ERROR)
+		return LOG_ERR;
+	return LOG_INFO;
+}
 
 /**
  * wpa_printf - conditional printf
@@ -177,20 +208,26 @@
 void wpa_printf(int level, char *fmt, ...)
 {
 	va_list ap;
+	char out_buf[2048];
+	char * p = &out_buf[0];
 
 	va_start(ap, fmt);
 	if (level >= wpa_debug_level) {
 		wpa_debug_print_timestamp();
+		p = wpa_debug_print_timestamp_internal(p);
+		vsprintf(p, fmt, ap);
+		if (use_syslog)
+			syslog(wpa_to_syslog_level(level), "%s\n", out_buf);
+		else
 #ifdef CONFIG_DEBUG_FILE
-		if (out_file) {
-			vfprintf(out_file, fmt, ap);
-			fprintf(out_file, "\n");
-		} else {
+			if (out_file) {
+				fprintf(out_file, out_buf);
+				fprintf(out_file, "\n");
+			} else {
 #endif /* CONFIG_DEBUG_FILE */
-		vprintf(fmt, ap);
-		printf("\n");
+				printf("%s\n", out_buf);
 #ifdef CONFIG_DEBUG_FILE
-		}
+			}
 #endif /* CONFIG_DEBUG_FILE */
 	}
 	va_end(ap);
@@ -201,36 +238,33 @@
 			 size_t len, int show)
 {
 	size_t i;
+	char out_buf[2048];
+	char * p = &out_buf[0];
+
 	if (level < wpa_debug_level)
 		return;
-	wpa_debug_print_timestamp();
-#ifdef CONFIG_DEBUG_FILE
-	if (out_file) {
-		fprintf(out_file, "%s - hexdump(len=%lu):",
-			title, (unsigned long) len);
-		if (buf == NULL) {
-			fprintf(out_file, " [NULL]");
-		} else if (show) {
-			for (i = 0; i < len; i++)
-				fprintf(out_file, " %02x", buf[i]);
-		} else {
-			fprintf(out_file, " [REMOVED]");
-		}
-		fprintf(out_file, "\n");
-	} else {
-#endif /* CONFIG_DEBUG_FILE */
-	printf("%s - hexdump(len=%lu):", title, (unsigned long) len);
+	p = wpa_debug_print_timestamp_internal(p);
+	p += sprintf(p, "%s - hexdump(len=%lu):", title, (unsigned long) len);
 	if (buf == NULL) {
-		printf(" [NULL]");
+		p += sprintf(p, " [NULL]");
 	} else if (show) {
 		for (i = 0; i < len; i++)
-			printf(" %02x", buf[i]);
+			p += sprintf(p, " %02x", buf[i]);
 	} else {
-		printf(" [REMOVED]");
+		p += sprintf(p, " [REMOVED]");
 	}
-	printf("\n");
+	if (use_syslog)
+		syslog(wpa_to_syslog_level(level), "%s\n", out_buf);
+	else
 #ifdef CONFIG_DEBUG_FILE
-	}
+		if (out_file) {
+			fprintf(out_file, out_buf);
+			fprintf(out_file, "\n");
+		} else {
+#endif /* CONFIG_DEBUG_FILE */
+			printf("%s\n", out_buf);
+#ifdef CONFIG_DEBUG_FILE
+		}
 #endif /* CONFIG_DEBUG_FILE */
 }
 
@@ -252,81 +286,55 @@
 	size_t i, llen;
 	const u8 *pos = buf;
 	const size_t line_len = 16;
+	char out_buf[2048];
+	char * p = &out_buf[0];
 
 	if (level < wpa_debug_level)
 		return;
-	wpa_debug_print_timestamp();
-#ifdef CONFIG_DEBUG_FILE
-	if (out_file) {
-		if (!show) {
-			fprintf(out_file,
-				"%s - hexdump_ascii(len=%lu): [REMOVED]\n",
-				title, (unsigned long) len);
-			return;
-		}
-		if (buf == NULL) {
-			fprintf(out_file,
-				"%s - hexdump_ascii(len=%lu): [NULL]\n",
-				title, (unsigned long) len);
-			return;
-		}
-		fprintf(out_file, "%s - hexdump_ascii(len=%lu):\n",
-			title, (unsigned long) len);
-		while (len) {
-			llen = len > line_len ? line_len : len;
-			fprintf(out_file, "    ");
-			for (i = 0; i < llen; i++)
-				fprintf(out_file, " %02x", pos[i]);
-			for (i = llen; i < line_len; i++)
-				fprintf(out_file, "   ");
-			fprintf(out_file, "   ");
-			for (i = 0; i < llen; i++) {
-				if (isprint(pos[i]))
-					fprintf(out_file, "%c", pos[i]);
-				else
-					fprintf(out_file, "_");
-			}
-			for (i = llen; i < line_len; i++)
-				fprintf(out_file, " ");
-			fprintf(out_file, "\n");
-			pos += llen;
-			len -= llen;
-		}
-	} else {
-#endif /* CONFIG_DEBUG_FILE */
+	p = wpa_debug_print_timestamp_internal(p);
 	if (!show) {
-		printf("%s - hexdump_ascii(len=%lu): [REMOVED]\n",
+		p += sprintf(p, "%s - hexdump_ascii(len=%lu): [REMOVED]\n",
 		       title, (unsigned long) len);
-		return;
+		goto out;
 	}
 	if (buf == NULL) {
-		printf("%s - hexdump_ascii(len=%lu): [NULL]\n",
+		p += sprintf(p, "%s - hexdump_ascii(len=%lu): [NULL]\n",
 		       title, (unsigned long) len);
-		return;
+		goto out;
 	}
-	printf("%s - hexdump_ascii(len=%lu):\n", title, (unsigned long) len);
+	p += sprintf(p, "%s - hexdump_ascii(len=%lu):\n", title, (unsigned long) len);
 	while (len) {
 		llen = len > line_len ? line_len : len;
-		printf("    ");
+		p += sprintf(p, "    ");
 		for (i = 0; i < llen; i++)
-			printf(" %02x", pos[i]);
+			p += sprintf(p, " %02x", pos[i]);
 		for (i = llen; i < line_len; i++)
-			printf("   ");
-		printf("   ");
+			p += sprintf(p, "   ");
+		p += sprintf(p, "   ");
 		for (i = 0; i < llen; i++) {
 			if (isprint(pos[i]))
-				printf("%c", pos[i]);
+				p += sprintf(p, "%c", pos[i]);
 			else
-				printf("_");
+				p += sprintf(p, "_");
 		}
 		for (i = llen; i < line_len; i++)
-			printf(" ");
-		printf("\n");
+			p += sprintf(p, " ");
 		pos += llen;
 		len -= llen;
 	}
+out:
+	if (use_syslog)
+		syslog(wpa_to_syslog_level(level), "%s\n", out_buf);
+	else
 #ifdef CONFIG_DEBUG_FILE
-	}
+		if (out_file) {
+			fprintf(out_file, out_buf);
+			fprintf(out_file, "\n");
+		} else {
+#endif /* CONFIG_DEBUG_FILE */
+			printf("%s\n", out_buf);
+#ifdef CONFIG_DEBUG_FILE
+		}
 #endif /* CONFIG_DEBUG_FILE */
 }
 
--- wpa_supplicant-0.5.7/wpa_passphrase.c.syslog	2007-04-09 10:55:41.000000000 -0400
+++ wpa_supplicant-0.5.7/wpa_passphrase.c	2007-04-09 10:55:53.000000000 -0400
@@ -17,6 +17,7 @@
 #include "common.h"
 #include "sha1.h"
 
+char * use_syslog = NULL;
 
 int main(int argc, char *argv[])
 {
--- wpa_supplicant-0.5.7/main.c.syslog	2006-11-29 22:37:01.000000000 -0500
+++ wpa_supplicant-0.5.7/main.c	2007-04-09 10:54:27.000000000 -0400
@@ -33,6 +33,7 @@
 
 extern struct wpa_driver_ops *wpa_supplicant_drivers[];
 
+char * use_syslog = NULL;
 
 static void usage(void)
 {
@@ -69,7 +70,8 @@
 	       "  -K = include keys (passwords, etc.) in debug output\n"
 	       "  -t = include timestamp in debug messages\n"
 	       "  -h = show this help text\n"
-	       "  -L = show license (GPL and BSD)\n");
+	       "  -L = show license (GPL and BSD)\n"
+	       "  -o = syslog facility to use\n");
 	printf("  -p = driver parameters\n"
 	       "  -P = PID file\n"
 	       "  -q = decrease debugging verbosity (-qq even less)\n"
@@ -120,6 +122,20 @@
 #endif /* __linux__ */
 }
 
+static int
+validate_syslog_facility(const char * f)
+{
+	if (!f) return 0;
+	if (strcmp(f, "authpriv") && strcmp(f, "cron") && strcmp(f, "daemon")
+	    && strcmp(f, "ftp") && strcmp(f, "kern") && strcmp(f, "local0")
+	    && strcmp(f, "local1") && strcmp(f, "local2") && strcmp(f, "local3")
+	    && strcmp(f, "local4") && strcmp(f, "local5") && strcmp(f, "local6")
+	    && strcmp(f, "local8") && strcmp(f, "lpr") && strcmp(f, "mail")
+	    && strcmp(f, "news") && strcmp(f, "user") && strcmp(f, "uucp"))
+		return -1;
+	return 0;
+}
+
 
 int main(int argc, char *argv[])
 {
@@ -143,7 +159,7 @@
 	wpa_supplicant_fd_workaround();
 
 	for (;;) {
-		c = getopt(argc, argv, "b:Bc:C:D:dg:hi:KLNp:P:qtuvwW");
+		c = getopt(argc, argv, "b:Bc:C:D:dg:hi:KLNo:p:P:qtuvwW");
 		if (c < 0)
 			break;
 		switch (c) {
@@ -187,6 +203,9 @@
 		case 'L':
 			license();
 			goto out;
+		case 'o':
+			use_syslog = optarg;
+			break;
 		case 'p':
 			iface->driver_param = optarg;
 			break;
@@ -231,6 +250,12 @@
 	}
 
 	exitcode = 0;
+
+	if (validate_syslog_facility (use_syslog)) {
+		printf("Invalid syslog facility '%s'\n", use_syslog);
+		exitcode = -1;
+	}
+
 	global = wpa_supplicant_init(&params);
 	if (global == NULL) {
 		printf("Failed to initialize wpa_supplicant\n");


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- wpa_supplicant.spec	15 Mar 2007 18:48:00 -0000	1.21
+++ wpa_supplicant.spec	9 Apr 2007 17:07:50 -0000	1.22
@@ -2,7 +2,7 @@
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.5.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -16,6 +16,7 @@
 Patch2: wpa_supplicant-wep-key-fix.patch
 # http://hostap.epitest.fi/bugz/show_bug.cgi?id=192
 Patch3: wpa_supplicant-fix-deprecated-dbus-function.patch
+Patch4: wpa_supplicant-0.5.7-use-syslog.patch
 URL: http://w1.fi/wpa_supplicant/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -46,6 +47,7 @@
 %patch1 -p1 -b .driver-wext-debug
 %patch2 -p1 -b .wep-key-fix
 %patch3 -p0 -b .fix-deprecated-dbus-functions
+%patch4 -p1 -b .syslog
 
 %build
 cp %{SOURCE1} ./.config
@@ -126,6 +128,9 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Mon Apr  9 2007 Dan Williams <dcbw at redhat.com> - 0.5.7-2
+- Add patch to send output to syslog
+
 * Thu Mar 15 2007 Dan Williams <dcbw at redhat.com> - 0.5.7-1
 - Update to 0.5.7 stable release
 



From fedora-cvs-commits at redhat.com  Mon Apr  9 17:15:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 13:15:47 -0400
Subject: rpms/NetworkManager/devel
	NetworkManager-0.6.5-wpa_supplicant-debug.patch, NONE,
	1.1 .cvsignore, 1.40, 1.41 NetworkManager.spec, 1.142,
	1.143 sources, 1.58,
	1.59 NetworkManager-0.6.5-dbus-connection-close.patch, 1.1, NONE
Message-ID: <200704091715.l39HFlVj014195@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13999

Modified Files:
	.cvsignore NetworkManager.spec sources 
Added Files:
	NetworkManager-0.6.5-wpa_supplicant-debug.patch 
Removed Files:
	NetworkManager-0.6.5-dbus-connection-close.patch 
Log Message:
* Mon Apr  9 2007 Dan Williams  <dcbw at redhat.com> - 1:0.6.5-0.7.svn2547
- Update from trunk
    - Updated translations
    - Cleaned-up VPN properties dialogs
    - Fix 64-bit kernel leakage issues in WEXT
    - Don't capture and redirect wpa_supplicant log output



NetworkManager-0.6.5-wpa_supplicant-debug.patch:
 nm-device-802-11-wireless.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE NetworkManager-0.6.5-wpa_supplicant-debug.patch ---
--- NetworkManager-0.6.5/src/nm-device-802-11-wireless.c.debug	2007-04-09 11:00:46.000000000 -0400
+++ NetworkManager-0.6.5/src/nm-device-802-11-wireless.c	2007-04-09 11:02:00.000000000 -0400
@@ -2715,14 +2715,17 @@
 supplicant_exec (NMDevice80211Wireless *self)
 {
 	gboolean	success = FALSE;
-	char *	argv[4];
+	char *	argv[7];
 	GError *	error = NULL;
 	GPid		pid = -1;
 
 	argv[0] = WPA_SUPPLICANT_BIN;
 	argv[1] = "-g";
 	argv[2] = WPA_SUPPLICANT_GLOBAL_SOCKET;
-	argv[3] = NULL;
+	argv[3] = "-dd";
+	argv[4] = "-o";
+	argv[5] = "daemon";
+	argv[6] = NULL;
 
 	success = g_spawn_async ("/", argv, NULL, 0, &supplicant_child_setup, NULL,
 	                         &pid, &error);


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	15 Mar 2007 18:24:14 -0000	1.40
+++ .cvsignore	9 Apr 2007 17:15:45 -0000	1.41
@@ -5,3 +5,5 @@
 NetworkManager-0.6.5.cvs20061025.tar.gz
 NetworkManager-0.6.5.svn2474.tar.gz
 nm-applet-0.6.5.svn63.tar.gz
+NetworkManager-0.6.5.svn2547.tar.gz
+nm-applet-0.6.5.svn71.tar.gz


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- NetworkManager.spec	29 Mar 2007 11:32:43 -0000	1.142
+++ NetworkManager.spec	9 Apr 2007 17:15:45 -0000	1.143
@@ -10,15 +10,15 @@
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.6.5
-Release: 0.6.svn2474%{?dist}
+Release: 0.7.svn2547%{?dist}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
-Source: %{name}-%{version}.svn2474.tar.gz
-Source1: nm-applet-0.6.5.svn63.tar.gz
+Source: %{name}-%{version}.svn2547.tar.gz
+Source1: nm-applet-0.6.5.svn71.tar.gz
 Patch0: NetworkManager-0.6.4-startup-dhcdbd.patch
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
-Patch2: NetworkManager-0.6.5-dbus-connection-close.patch
+Patch2: NetworkManager-0.6.5-wpa_supplicant-debug.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -117,13 +117,12 @@
 %prep
 %setup -q
 %patch0 -p1 -b .startup-dhcdbd
+%patch2 -p1 -b .wpas-debug
 
 # unpack the applet
 tar -xzf %{SOURCE1}
 %patch1 -p1 -b .buildfix
 
-%patch2 -p1 -b .dbus-connection-close
-
 %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
@@ -247,6 +246,13 @@
 
 
 %changelog
+* Mon Apr  9 2007 Dan Williams  <dcbw at redhat.com> - 1:0.6.5-0.7.svn2547
+- Update from trunk
+    - Updated translations
+    - Cleaned-up VPN properties dialogs
+    - Fix 64-bit kernel leakage issues in WEXT
+    - Don't capture and redirect wpa_supplicant log output
+
 * Wed Mar 28 2007 Matthew Barnes  <mbarnes at redhat.com> 1:0.6.5-0.6.svn2474
 - Close private D-Bus connections. (#232691)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	15 Mar 2007 18:24:14 -0000	1.58
+++ sources	9 Apr 2007 17:15:45 -0000	1.59
@@ -1,2 +1,2 @@
-66c2c133230b27b8c0f0904bc0afda52  NetworkManager-0.6.5.svn2474.tar.gz
-99409b7e202a8c0c1121f7f63490392d  nm-applet-0.6.5.svn63.tar.gz
+bb96eb758e4e2156f15cbc863580f0a1  NetworkManager-0.6.5.svn2547.tar.gz
+6705d870f81ccc89f3a7edbe4a6870e8  nm-applet-0.6.5.svn71.tar.gz


--- NetworkManager-0.6.5-dbus-connection-close.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr  9 17:34:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 13:34:32 -0400
Subject: rpms/yelp/devel .cvsignore, 1.34, 1.35 sources, 1.36, 1.37 yelp.spec,
	1.93, 1.94
Message-ID: <200704091734.l39HYWMZ027445@cvs.devel.redhat.com>

Author: mbarnes

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

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

* Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 2.18.1-1
- Update to 2.18.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	13 Mar 2007 05:41:52 -0000	1.34
+++ .cvsignore	9 Apr 2007 17:34:29 -0000	1.35
@@ -1 +1 @@
-yelp-2.18.0.tar.bz2
+yelp-2.18.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	13 Mar 2007 05:41:52 -0000	1.36
+++ sources	9 Apr 2007 17:34:29 -0000	1.37
@@ -1 +1 @@
-bc40ea281cdfa256c7da0d0b7fe8191b  yelp-2.18.0.tar.bz2
+84abbfe7e042706cbf21752957e29bf3  yelp-2.18.1.tar.bz2


Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- yelp.spec	23 Mar 2007 15:45:03 -0000	1.93
+++ yelp.spec	9 Apr 2007 17:34:29 -0000	1.94
@@ -18,8 +18,8 @@
 
 Summary: A system documentation reader from the Gnome project
 Name: yelp
-Version: 2.18.0
-Release: 2%{?dist}
+Version: 2.18.1
+Release: 1%{?dist}
 Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.18/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
@@ -149,6 +149,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 2.18.1-1
+- Update to 2.18.1
+
 * Fri Mar 23 2007 Christopher Aillon <caillon at redhat.com> - 2.18.0-2
 - Rebuild against newer gecko
 



From fedora-cvs-commits at redhat.com  Mon Apr  9 17:34:55 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 13:34:55 -0400
Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.22,
	1.23 gnome-doc-utils.spec, 1.33, 1.34 sources, 1.22, 1.23
Message-ID: <200704091734.l39HYtcO027749@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/gnome-doc-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27660

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

* Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 0.10.2-1.fc7
- Update to 0.10.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	13 Mar 2007 02:21:15 -0000	1.22
+++ .cvsignore	9 Apr 2007 17:34:52 -0000	1.23
@@ -1 +1 @@
-gnome-doc-utils-0.10.1.tar.bz2
+gnome-doc-utils-0.10.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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gnome-doc-utils.spec	13 Mar 2007 02:21:15 -0000	1.33
+++ gnome-doc-utils.spec	9 Apr 2007 17:34:53 -0000	1.34
@@ -1,7 +1,7 @@
 ### Abstract ###
 
 Name: gnome-doc-utils
-Version: 0.10.1
+Version: 0.10.2
 Release: 1%{?dist}
 License: LGPL
 Group: Development/Tools
@@ -71,6 +71,9 @@
 %{_datadir}/gnome-doc-utils
 
 %changelog
+* Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 0.10.2-1.fc7
+- Update to 0.10.2
+
 * Mon Mar 12 2007 Matthew Barnes <mbarnes at redhat.com> - 0.10.1-1.fc7
 - Update to 0.10.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	13 Mar 2007 02:21:15 -0000	1.22
+++ sources	9 Apr 2007 17:34:53 -0000	1.23
@@ -1 +1 @@
-208775a4b6c6d9ea0478a84afb36701f  gnome-doc-utils-0.10.1.tar.bz2
+6df322b239fa8c7c0d2e4d9b9905c1a2  gnome-doc-utils-0.10.2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr  9 18:09:29 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 14:09:29 -0400
Subject: rpms/evolution/devel .cvsignore, 1.68,
	1.69 evolution-2.7.1-no-gnome-common.patch, 1.3,
	1.4 evolution.spec, 1.241, 1.242 sources, 1.68,
	1.69 evolution-2.10.0-CVE-2007-1002.patch, 1.1,
	NONE evolution-2.10.0-bold-folders.patch, 1.1,
	NONE evolution-2.10.0-let-mail-notification-build.patch, 1.1,
	NONE evolution-2.10.0-plugins-require-libxml2.patch, 1.1, NONE
Message-ID: <200704091809.l39I9T7Y025929@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	.cvsignore evolution-2.7.1-no-gnome-common.patch 
	evolution.spec sources 
Removed Files:
	evolution-2.10.0-CVE-2007-1002.patch 
	evolution-2.10.0-bold-folders.patch 
	evolution-2.10.0-let-mail-notification-build.patch 
	evolution-2.10.0-plugins-require-libxml2.patch 
Log Message:

* Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-1.fc7
- Update to 2.10.1
- Remove patch for CVE-2007-1002 (fixed upstream).
- Remove patch for RH bug #231767 (fixed upstream).
- Remove patch for RH bug #235056 (fixed upstream).
- Remove patch for GNOME bug #352713 (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- .cvsignore	13 Mar 2007 04:13:38 -0000	1.68
+++ .cvsignore	9 Apr 2007 18:09:26 -0000	1.69
@@ -1 +1 @@
-evolution-2.10.0.tar.bz2
+evolution-2.10.1.tar.bz2

evolution-2.7.1-no-gnome-common.patch:
 configure    |  148 -----------------------------------------------------------
 configure.in |    3 -
 2 files changed, 151 deletions(-)

Index: evolution-2.7.1-no-gnome-common.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.7.1-no-gnome-common.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- evolution-2.7.1-no-gnome-common.patch	22 Jan 2007 03:37:21 -0000	1.3
+++ evolution-2.7.1-no-gnome-common.patch	9 Apr 2007 18:09:26 -0000	1.4
@@ -1,16 +1,16 @@
---- evolution-2.9.5/configure.no-gnome-common	2007-01-21 22:00:01.000000000 -0500
-+++ evolution-2.9.5/configure	2007-01-21 22:00:53.000000000 -0500
-@@ -30764,141 +30764,6 @@
+--- evolution-2.10.1/configure.no-gnome-common	2007-04-09 12:32:23.000000000 -0400
++++ evolution-2.10.1/configure	2007-04-09 12:33:02.000000000 -0400
+@@ -33161,154 +33161,6 @@
  
  
  
--    # Check whether --enable-compile-warnings or --disable-compile-warnings was given.
+-    # Check whether --enable-compile-warnings was given.
 -if test "${enable_compile_warnings+set}" = set; then
--  enableval="$enable_compile_warnings"
--
+-  enableval=$enable_compile_warnings;
 -else
 -  enable_compile_warnings="yes"
--fi;
+-fi
+-
 -
 -    warnCFLAGS=
 -    if test "x$GCC" != xyes; then
@@ -36,8 +36,8 @@
 -	for option in -Wno-sign-compare; do
 -		SAVE_CFLAGS="$CFLAGS"
 -		CFLAGS="$CFLAGS $option"
--		echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
--echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6
+-		{ echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
+-echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; }
 -		cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -54,24 +54,36 @@
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -80,12 +92,13 @@
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--has_option=no
+-	has_option=no
 -fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -		CFLAGS="$SAVE_CFLAGS"
--		echo "$as_me:$LINENO: result: $has_option" >&5
--echo "${ECHO_T}$has_option" >&6
+-		{ echo "$as_me:$LINENO: result: $has_option" >&5
+-echo "${ECHO_T}$has_option" >&6; }
 -		if test $has_option = yes; then
 -		  warning_flags="$warning_flags $option"
 -		fi
@@ -104,21 +117,21 @@
 -	;;
 -    esac
 -    CFLAGS="$realsave_CFLAGS"
--    echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
--echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6
--    echo "$as_me:$LINENO: result: $warning_flags" >&5
--echo "${ECHO_T}$warning_flags" >&6
+-    { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
+-echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; }
+-    { echo "$as_me:$LINENO: result: $warning_flags" >&5
+-echo "${ECHO_T}$warning_flags" >&6; }
 -
--    # Check whether --enable-iso-c or --disable-iso-c was given.
+-    # Check whether --enable-iso-c was given.
 -if test "${enable_iso_c+set}" = set; then
--  enableval="$enable_iso_c"
--
+-  enableval=$enable_iso_c;
 -else
 -  enable_iso_c=no
--fi;
+-fi
+-
 -
--    echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
--echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6
+-    { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
+-echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; }
 -    complCFLAGS=
 -    if test "x$enable_iso_c" != "xno"; then
 -	if test "x$GCC" = "xyes"; then
@@ -132,8 +145,8 @@
 -	esac
 -	fi
 -    fi
--    echo "$as_me:$LINENO: result: $complCFLAGS" >&5
--echo "${ECHO_T}$complCFLAGS" >&6
+-    { echo "$as_me:$LINENO: result: $complCFLAGS" >&5
+-echo "${ECHO_T}$complCFLAGS" >&6; }
 -
 -    WARN_CFLAGS="$warning_flags $complCFLAGS"
 -
@@ -142,9 +155,9 @@
  case $CFLAGS in
  *-Wall*)
  	# Turn off the annoying "comparison between signed and unsigned"
---- evolution-2.9.5/configure.in.no-gnome-common	2007-01-08 11:54:43.000000000 -0500
-+++ evolution-2.9.5/configure.in	2007-01-21 21:57:28.000000000 -0500
-@@ -1133,9 +1133,6 @@
+--- evolution-2.10.1/configure.in.no-gnome-common	2007-04-09 09:11:47.000000000 -0400
++++ evolution-2.10.1/configure.in	2007-04-09 12:32:23.000000000 -0400
+@@ -1136,9 +1136,6 @@
  dnl *************************
  dnl CFLAGS and LIBS and stuff
  dnl *************************


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- evolution.spec	4 Apr 2007 18:52:54 -0000	1.241
+++ evolution.spec	9 Apr 2007 18:09:26 -0000	1.242
@@ -46,8 +46,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.10.0
-Release: 10%{?dist}
+Version: 2.10.1
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -158,18 +158,6 @@
 # GNOME bug #418971
 Patch47: evolution-2.10.0-drop-old-glib-support.patch
 
-# CVE-2007-1002
-Patch48: evolution-2.10.0-CVE-2007-1002.patch
-
-# RH bug #231767 / GNOME bug #400241
-Patch49: evolution-2.10.0-let-mail-notification-build.patch
-
-# RH bug #235056
-Patch50: evolution-2.10.0-plugins-require-libxml2.patch
-
-# GNOME bug #352713
-Patch51: evolution-2.10.0-bold-folders.patch
-
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -322,10 +310,6 @@
 %patch45 -p1 -b .shell-main-cleanups
 %patch46 -p1 -b .use-glib-i18n
 %patch47 -p1 -b .drop-old-glib-support
-%patch48 -p1 -b .CVE-2007-1002
-%patch49 -p1 -b .let-mail-notification-build
-%patch50 -p1 -b .plugins-require-libxml2
-%patch51 -p1 -b .bold-folders
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -742,6 +726,13 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-1.fc7
+- Update to 2.10.1
+- Remove patch for CVE-2007-1002 (fixed upstream).
+- Remove patch for RH bug #231767 (fixed upstream).
+- Remove patch for RH bug #235056 (fixed upstream).
+- Remove patch for GNOME bug #352713 (fixed upstream).
+
 * Wed Apr 04 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-10.fc7
 - Add patch for GNOME bug #352713 (improve folder tree updates).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	13 Mar 2007 04:13:38 -0000	1.68
+++ sources	9 Apr 2007 18:09:26 -0000	1.69
@@ -1 +1 @@
-68d32e518f235bea9d768ae55e91bffc  evolution-2.10.0.tar.bz2
+16051c6cbb617cb04665e402566e0976  evolution-2.10.1.tar.bz2


--- evolution-2.10.0-CVE-2007-1002.patch DELETED ---


--- evolution-2.10.0-bold-folders.patch DELETED ---


--- evolution-2.10.0-let-mail-notification-build.patch DELETED ---


--- evolution-2.10.0-plugins-require-libxml2.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr  9 18:27:27 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 14:27:27 -0400
Subject: rpms/selinux-policy/devel policy-20070219.patch,1.40,1.41
Message-ID: <200704091827.l39IRR5Y026400@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20070219.patch 
Log Message:
* Thu Apr 5 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-5
- Allow bluetooth to read inotifyfs


policy-20070219.patch:
 Rules.modular                             |   12 +
 policy/flask/access_vectors               |    4 
 policy/global_booleans                    |    2 
 policy/global_tunables                    |   39 +++-
 policy/mls                                |   31 ++-
 policy/modules/admin/acct.te              |    1 
 policy/modules/admin/acct.xml             |   43 +++++
 policy/modules/admin/alsa.xml             |   43 +++++
 policy/modules/admin/amanda.xml           |   85 ++++++++++
 policy/modules/admin/amtu.fc              |    3 
 policy/modules/admin/amtu.if              |   53 ++++++
 policy/modules/admin/amtu.te              |   56 ++++++
 policy/modules/admin/amtu.xml             |   36 ++++
 policy/modules/admin/anaconda.xml         |    3 
 policy/modules/admin/apt.xml              |   95 +++++++++++
 policy/modules/admin/backup.xml           |   35 ++++
 policy/modules/admin/bootloader.te        |    2 
 policy/modules/admin/bootloader.xml       |   79 +++++++++
 policy/modules/admin/certwatch.xml        |   37 ++++
 policy/modules/admin/consoletype.te       |    8 
 policy/modules/admin/consoletype.xml      |   47 +++++
 policy/modules/admin/ddcprobe.xml         |   35 ++++
 policy/modules/admin/dmesg.te             |    1 
 policy/modules/admin/dmesg.xml            |   24 ++
 policy/modules/admin/dmidecode.xml        |   35 ++++
 policy/modules/admin/dpkg.xml             |  125 +++++++++++++++
 policy/modules/admin/firstboot.if         |   18 ++
 policy/modules/admin/firstboot.xml        |   88 ++++++++++
 policy/modules/admin/kudzu.te             |    2 
 policy/modules/admin/kudzu.xml            |   45 +++++
 policy/modules/admin/logrotate.xml        |   75 +++++++++
 policy/modules/admin/logwatch.te          |    2 
 policy/modules/admin/logwatch.xml         |   23 ++
 policy/modules/admin/netutils.te          |    4 
 policy/modules/admin/rpm.fc               |    3 
 policy/modules/admin/rpm.if               |   65 +++++++
 policy/modules/admin/rpm.te               |    2 
 policy/modules/admin/su.if                |    6 
 policy/modules/admin/usermanage.te        |   42 +++--
 policy/modules/apps/games.fc              |    1 
 policy/modules/apps/gnome.if              |   26 +++
 policy/modules/apps/gpg.fc                |    2 
 policy/modules/apps/loadkeys.if           |   44 +----
 policy/modules/apps/mozilla.if            |    1 
 policy/modules/apps/slocate.te            |    4 
 policy/modules/apps/usernetctl.te         |   10 -
 policy/modules/kernel/corecommands.fc     |    7 
 policy/modules/kernel/corecommands.if     |   20 ++
 policy/modules/kernel/corenetwork.if.in   |   54 ++++++
 policy/modules/kernel/corenetwork.te.in   |   18 +-
 policy/modules/kernel/devices.if          |   36 ++++
 policy/modules/kernel/domain.if           |   18 ++
 policy/modules/kernel/domain.te           |   46 +++++
 policy/modules/kernel/files.fc            |    1 
 policy/modules/kernel/files.if            |   81 ++++++++-
 policy/modules/kernel/filesystem.if       |   39 ++++
 policy/modules/kernel/filesystem.te       |   11 +
 policy/modules/kernel/kernel.if           |   23 ++
 policy/modules/kernel/kernel.te           |    2 
 policy/modules/kernel/mls.if              |   20 ++
 policy/modules/kernel/mls.te              |    3 
 policy/modules/kernel/selinux.if          |   38 ++++
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.if         |    2 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/services/apache.fc         |   14 -
 policy/modules/services/apache.if         |  169 +++++++++++++++++++-
 policy/modules/services/apache.te         |   70 ++++++++
 policy/modules/services/apcupsd.fc        |    9 +
 policy/modules/services/apcupsd.if        |  108 +++++++++++++
 policy/modules/services/apcupsd.te        |   81 +++++++++
 policy/modules/services/automount.te      |    2 
 policy/modules/services/bluetooth.te      |    2 
 policy/modules/services/ccs.te            |   12 +
 policy/modules/services/consolekit.fc     |    1 
 policy/modules/services/consolekit.te     |   28 ++-
 policy/modules/services/cron.fc           |    1 
 policy/modules/services/cron.if           |   33 +---
 policy/modules/services/cron.te           |   51 ++++--
 policy/modules/services/cups.te           |    2 
 policy/modules/services/cvs.te            |    2 
 policy/modules/services/cyrus.te          |    5 
 policy/modules/services/dbus.if           |   63 +++++++
 policy/modules/services/dhcp.te           |    2 
 policy/modules/services/djbdns.te         |    5 
 policy/modules/services/dovecot.te        |    5 
 policy/modules/services/ftp.te            |    5 
 policy/modules/services/hal.fc            |    8 
 policy/modules/services/hal.if            |   19 ++
 policy/modules/services/hal.te            |  142 ++++++++++++++++-
 policy/modules/services/inetd.te          |    5 
 policy/modules/services/kerberos.if       |   58 ++-----
 policy/modules/services/kerberos.te       |   36 ++++
 policy/modules/services/mta.if            |   19 ++
 policy/modules/services/mta.te            |    2 
 policy/modules/services/networkmanager.te |    2 
 policy/modules/services/nis.if            |    4 
 policy/modules/services/nis.te            |    4 
 policy/modules/services/nscd.te           |   10 +
 policy/modules/services/ntp.te            |    5 
 policy/modules/services/pegasus.if        |   18 ++
 policy/modules/services/pegasus.te        |    6 
 policy/modules/services/postfix.if        |    1 
 policy/modules/services/postfix.te        |    8 
 policy/modules/services/ppp.te            |    9 -
 policy/modules/services/procmail.te       |    1 
 policy/modules/services/pyzor.te          |    1 
 policy/modules/services/radius.te         |    4 
 policy/modules/services/rpc.if            |    5 
 policy/modules/services/rsync.te          |    1 
 policy/modules/services/samba.fc          |    3 
 policy/modules/services/samba.if          |   64 +++++++
 policy/modules/services/samba.te          |   79 +++++++++
 policy/modules/services/sasl.te           |   11 +
 policy/modules/services/sendmail.if       |   20 ++
 policy/modules/services/smartmon.te       |    1 
 policy/modules/services/snmp.te           |   10 +
 policy/modules/services/spamassassin.te   |    7 
 policy/modules/services/squid.fc          |    2 
 policy/modules/services/squid.if          |   22 ++
 policy/modules/services/squid.te          |   12 +
 policy/modules/services/ssh.if            |   39 ++++
 policy/modules/services/ssh.te            |    5 
 policy/modules/services/xserver.te        |   10 -
 policy/modules/services/zabbix.fc         |    4 
 policy/modules/services/zabbix.if         |   87 ++++++++++
 policy/modules/services/zabbix.te         |   64 +++++++
 policy/modules/system/application.fc      |    1 
 policy/modules/system/application.if      |  104 ++++++++++++
 policy/modules/system/application.te      |   14 +
 policy/modules/system/authlogin.if        |   83 ++++++++--
 policy/modules/system/authlogin.te        |    3 
 policy/modules/system/fstools.fc          |    1 
 policy/modules/system/fstools.te          |    1 
 policy/modules/system/fusermount.fc       |    6 
 policy/modules/system/fusermount.if       |   41 +++++
 policy/modules/system/fusermount.te       |   45 +++++
 policy/modules/system/getty.te            |    3 
 policy/modules/system/hostname.te         |   14 +
 policy/modules/system/init.if             |    3 
 policy/modules/system/init.te             |   35 +++-
 policy/modules/system/ipsec.if            |   20 ++
 policy/modules/system/iptables.te         |    4 
 policy/modules/system/libraries.fc        |    8 
 policy/modules/system/libraries.te        |   20 ++
 policy/modules/system/locallogin.te       |    7 
 policy/modules/system/logging.if          |   21 ++
 policy/modules/system/logging.te          |    2 
 policy/modules/system/lvm.te              |    5 
 policy/modules/system/modutils.te         |   11 +
 policy/modules/system/mount.fc            |    3 
 policy/modules/system/mount.if            |   37 ++++
 policy/modules/system/mount.te            |   64 +++++++
 policy/modules/system/raid.te             |    1 
 policy/modules/system/selinuxutil.fc      |    1 
 policy/modules/system/selinuxutil.if      |    5 
 policy/modules/system/selinuxutil.te      |   70 +++-----
 policy/modules/system/udev.fc             |    2 
 policy/modules/system/udev.te             |   11 +
 policy/modules/system/unconfined.fc       |    1 
 policy/modules/system/unconfined.if       |   10 -
 policy/modules/system/unconfined.te       |   24 ++
 policy/modules/system/userdomain.if       |  246 ++++++++++++++++--------------
 policy/modules/system/userdomain.te       |   46 ++++-
 policy/modules/system/xen.te              |   35 ++++
 policy/support/obj_perm_sets.spt          |   12 +
 166 files changed, 3881 insertions(+), 436 deletions(-)

Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- policy-20070219.patch	7 Apr 2007 11:35:20 -0000	1.40
+++ policy-20070219.patch	9 Apr 2007 18:27:25 -0000	1.41
@@ -3942,7 +3942,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.5.11/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2007-03-20 23:38:00.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/services/hal.te	2007-04-06 15:40:37.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/hal.te	2007-04-09 08:33:45.000000000 -0400
 @@ -16,9 +16,33 @@
  type hald_var_run_t;
  files_pid_file(hald_var_run_t)
@@ -4047,7 +4047,7 @@
  
  libs_use_ld_so(hald_t)
  libs_use_shared_libs(hald_t)
-@@ -245,3 +281,98 @@
+@@ -245,3 +281,101 @@
  optional_policy(`
  	vbetool_domtrans(hald_t)
  ')
@@ -4069,10 +4069,13 @@
 +corecmd_exec_bin(hald_acl_t)
 +
 +dev_getattr_all_chr_files(hald_acl_t)
++dev_getattr_generic_usb_dev(hald_acl_t)
 +dev_getattr_video_dev(hald_acl_t)
 +dev_setattr_video_dev(hald_acl_t)
 +dev_getattr_sound_dev(hald_acl_t)
 +dev_setattr_sound_dev(hald_acl_t)
++dev_setattr_generic_usb_dev(hald_acl_t)
++dev_setattr_usbfs_files(hald_acl_t)
 +
 +libs_use_ld_so(hald_acl_t)
 +libs_use_shared_libs(hald_acl_t)
@@ -6406,7 +6409,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.5.11/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/selinuxutil.te	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/selinuxutil.te	2007-04-09 13:43:58.000000000 -0400
 @@ -1,10 +1,8 @@
  
  policy_module(selinuxutil,1.4.2)
@@ -6526,6 +6529,15 @@
  
  selinux_get_fs_mount(load_policy_t)
  selinux_load_policy(load_policy_t)
+@@ -217,7 +211,7 @@
+ 	# cjp: cover up stray file descriptors.
+ 	dontaudit load_policy_t selinux_config_t:file write;
+ 	optional_policy(`
+-		unconfined_dontaudit_read_pipes(load_policy_t)
++		unconfined_dontaudit_rw_pipes(load_policy_t)
+ 	')
+ ')
+ 
 @@ -310,15 +304,13 @@
  userdom_dontaudit_search_all_users_home_content(newrole_t)
  userdom_search_all_users_home_dirs(newrole_t)
@@ -6619,7 +6631,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.5.11/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2007-02-19 11:32:53.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/system/unconfined.if	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/unconfined.if	2007-04-09 13:43:41.000000000 -0400
 @@ -18,7 +18,7 @@
  	')
  



From fedora-cvs-commits at redhat.com  Mon Apr  9 18:36:08 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 14:36:08 -0400
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.427,1.428
Message-ID: <200704091836.l39Ia8MT010522@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	selinux-policy.spec 
Log Message:
* Mon Apr 9 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-6
- Fix hald_acl_t to be able to getattr/setattr on usb devices
- Dontaudit write to unconfined_pipes for load_policy



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.427
retrieving revision 1.428
diff -u -r1.427 -r1.428
--- selinux-policy.spec	7 Apr 2007 11:35:20 -0000	1.427
+++ selinux-policy.spec	9 Apr 2007 18:36:06 -0000	1.428
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.5.11
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -358,6 +358,10 @@
 %endif
 
 %changelog
+* Mon Apr 9 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-6
+- Fix hald_acl_t to be able to getattr/setattr on usb devices
+- Dontaudit write to unconfined_pipes for load_policy
+
 * Thu Apr 5 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-5
 - Allow bluetooth to read inotifyfs
 



From fedora-cvs-commits at redhat.com  Mon Apr  9 18:37:51 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 14:37:51 -0400
Subject: rpms/dhcp/devel dhcp.spec, 1.151,
	1.152 dhcp-3.0.5-xen-checksum.patch, 1.3, NONE
Message-ID: <200704091837.l39IbpAg011838@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11768

Modified Files:
	dhcp.spec 
Removed Files:
	dhcp-3.0.5-xen-checksum.patch 
Log Message:
* Mon Apr 09 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-28
- Remove Xen patch (#235649, from RHEL-5, doesn't work correctly for Fedora)



Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- dhcp.spec	1 Apr 2007 20:52:27 -0000	1.151
+++ dhcp.spec	9 Apr 2007 18:37:48 -0000	1.152
@@ -10,7 +10,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.5
-Release:  27%{?dist}
+Release:  28%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -46,12 +46,11 @@
 Patch13:  %{name}-%{version}-unicast-bootp.patch
 Patch14:  %{name}-%{version}-fast-timeout.patch
 Patch15:  %{name}-%{version}-failover-ports.patch
-Patch16:  %{name}-%{version}-xen-checksum.patch
-Patch17:  %{name}-%{version}-dhclient-usage.patch
-Patch18:  %{name}-%{version}-default-requested-options.patch
-Patch19:  %{name}-%{version}-prototypes.patch
-Patch20:  %{name}-%{version}-manpages.patch
-Patch21:  %{name}-%{version}-libdhcp4client.patch
+Patch16:  %{name}-%{version}-dhclient-usage.patch
+Patch17:  %{name}-%{version}-default-requested-options.patch
+Patch18:  %{name}-%{version}-prototypes.patch
+Patch19:  %{name}-%{version}-manpages.patch
+Patch20:  %{name}-%{version}-libdhcp4client.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): chkconfig, coreutils
@@ -178,17 +177,14 @@
 # dhcp-failover 847/udp
 %patch15 -p1 -b .failover
 
-# Fix Xen host networking problems (partial checksums)
-%patch16 -p1 -b .xen
-
 # Update the usage screen for dhclient(8) indicating new options
 # Use printf() rather than log_info() to display the information
 # Also, return EXIT_FAILURE when the usage() screen is displayed (stop parsing)
-%patch17 -p1 -b .usage
+%patch16 -p1 -b .usage
 
 # Add NIS domain, NIS servers, and NTP servers to the list of default
 # requested DHCP options
-%patch18 -p1 -b .dho
+%patch17 -p1 -b .dho
 
 # Add missing prototypes to take care of gcc warnings
 # in dst/dst_api.c: add b64_pton() and b64_ntop()
@@ -197,7 +193,7 @@
 # in minires/res_comp.c: add ns_name_uncompress(), ns_name_compress(), and
 #                        ns_name_skip()
 # in minires/res_init.c: add res_randomid()
-%patch19 -p1 -b .prototypes
+%patch18 -p1 -b .prototypes
 
 # Man page updates explaining new features added from the above patches.
 # Normally these man page changes would be included in the feature patch,
@@ -207,10 +203,10 @@
 # and not affect the code changes in the other patches.  It's actually
 # pretty common to update or alter these man pages independent of the code
 # changes.
-%patch20 -p1 -b .manpages
+%patch19 -p1 -b .manpages
 
 # Add the libdhcp4client target (library version of dhclient)
-%patch21 -p1 -b .libdhcp4client
+%patch20 -p1 -b .libdhcp4client
 
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 %{__cp} -p %SOURCE6 .
@@ -395,6 +391,9 @@
 %{_libdir}/libdhcp4client.so
 
 %changelog
+* Mon Apr 09 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-28
+- Remove Xen patch (#235649, from RHEL-5, doesn't work correctly for Fedora)
+
 * Sun Apr 01 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-27
 - Ensure that Perl and Perl modules are not added as dependencies (#234688)
 - Reorganize patches by feature/bug per packaging guidelines (#225691)


--- dhcp-3.0.5-xen-checksum.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr  9 18:45:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 14:45:43 -0400
Subject: rpms/dhcdbd/devel .cvsignore, 1.25, 1.26 dhcdbd.spec, 1.41,
	1.42 sources, 1.35, 1.36
Message-ID: <200704091845.l39IjhgK017871@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcdbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17824

Modified Files:
	.cvsignore dhcdbd.spec sources 
Log Message:
* Mon Apr 09 2007 David Cantrell <dcantrell at redhat.com> - 2.7-1
- Spec file scriptlet cleanups



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	5 Mar 2007 18:53:54 -0000	1.25
+++ .cvsignore	9 Apr 2007 18:45:41 -0000	1.26
@@ -1 +1 @@
-dhcdbd-2.6.tar.bz2
+dhcdbd-2.7.tar.bz2


Index: dhcdbd.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/dhcdbd.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- dhcdbd.spec	5 Mar 2007 18:53:54 -0000	1.41
+++ dhcdbd.spec	9 Apr 2007 18:45:41 -0000	1.42
@@ -6,16 +6,23 @@
 
 Summary:   DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS
 Name:      dhcdbd
-Version:   2.6
+Version:   2.7
 Release:   1%{?dist}
 License:   GPL
 Group:     System Environment/Daemons
-URL:       http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.bz2
-Source0:   %{name}-%{version}.tar.bz2
+URL:       http://people.redhat.com/dcantrel/%{name}/
+
+Source:    http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.bz2
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:  dhclient >= 3.0.4, dbus >= 0.6
 BuildRequires: dbus-devel >= 0.90, pkgconfig
 
+Requires: dhclient >= 3.0.4, dbus >= 0.6
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(postun): /sbin/service
+
 %description
 dhcdbd provides a D-BUS interface to the ISC dhclient software.  The
 daemon provides access to DHCP configuration operations and stores those
@@ -37,21 +44,19 @@
 %{__rm} -rf %{buildroot}
 
 %post
+# This adds the proper /etc/rc*.d links for the script
 /sbin/chkconfig --add dhcdbd
-exit 0
 
 %preun
-if [ $1 -eq 0 ]; then
-    service dhcdbd stop >/dev/null 2>&1
+if [ $1 = 0 ]; then
+    /sbin/service dhcdbd stop >/dev/null 2>&1 || :
     /sbin/chkconfig --del dhcdbd
 fi
-exit 0
 
 %postun
-if [ $1 -ge 1 ]; then
-    service dhcdbd condrestart >/dev/null 2>&1
+if [ "$1" -ge "1" ]; then
+    /sbin/service dhcdbd condrestart >/dev/null 2>&1 || :
 fi
-exit 0
 
 %files
 %defattr(-, root, root, -)
@@ -62,6 +67,9 @@
 %attr(755,root,root) %{_initrddir}/dhcdbd
 
 %changelog
+* Mon Apr 09 2007 David Cantrell <dcantrell at redhat.com> - 2.7-1
+- Spec file scriptlet cleanups
+
 * Mon Mar 05 2007 David Cantrell <dcantrell at redhat.com> - 2.6-1
 - Spec file cleanups to conform to Fedora packaging guidelines
 - Run 'chkconfig --del dhcdbd' on package removal (#222514)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	5 Mar 2007 18:53:54 -0000	1.35
+++ sources	9 Apr 2007 18:45:41 -0000	1.36
@@ -1 +1 @@
-e8242676e71787ec6b7e800d28cb9a3f  dhcdbd-2.6.tar.bz2
+9edf3eabe05487e7ee5f0b685683d7fb  dhcdbd-2.7.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr  9 18:48:52 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 14:48:52 -0400
Subject: rpms/kernel/devel patch-2.6.21-rc6-git2.bz2.sign, NONE,
	1.1 .cvsignore, 1.600, 1.601 kernel-2.6.spec, 1.3053,
	1.3054 sources, 1.563, 1.564 upstream, 1.491,
	1.492 patch-2.6.21-rc6-git1.bz2.sign, 1.1, NONE
Message-ID: <200704091848.l39Imqfs020350@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.21-rc6-git2.bz2.sign 
Removed Files:
	patch-2.6.21-rc6-git1.bz2.sign 
Log Message:
* Mon Apr 09 2007 Dave Jones <davej at redhat.com>
- 2.6.21-rc6-git2



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

iD8DBQBGGeXdyGugalF9Dw4RAsVbAJ44EFTssJicVlwHepG6vM0RWGZNfACeNd40
oqeCZ9Mh/eBLYtLZidRju84=
=CPXO
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.600
retrieving revision 1.601
diff -u -r1.600 -r1.601
--- .cvsignore	8 Apr 2007 23:22:20 -0000	1.600
+++ .cvsignore	9 Apr 2007 18:48:49 -0000	1.601
@@ -5,4 +5,4 @@
 kernel-2.6.20
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc6.bz2
-patch-2.6.21-rc6-git1.bz2
+patch-2.6.21-rc6-git2.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3053
retrieving revision 1.3054
diff -u -r1.3053 -r1.3054
--- kernel-2.6.spec	9 Apr 2007 04:47:09 -0000	1.3053
+++ kernel-2.6.spec	9 Apr 2007 18:48:49 -0000	1.3054
@@ -371,7 +371,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.21-rc6.bz2
-Patch2: patch-2.6.21-rc6-git1.bz2
+Patch2: patch-2.6.21-rc6-git2.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -2250,6 +2250,9 @@
 
 %changelog
 * Mon Apr 09 2007 Dave Jones <davej at redhat.com>
+- 2.6.21-rc6-git2
+
+* Mon Apr 09 2007 Dave Jones <davej at redhat.com>
 - Disable a bunch more warnings.
 
 * Sun Apr 08 2007 Dave Jones <davej at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.563
retrieving revision 1.564
diff -u -r1.563 -r1.564
--- sources	8 Apr 2007 23:22:21 -0000	1.563
+++ sources	9 Apr 2007 18:48:49 -0000	1.564
@@ -1,4 +1,4 @@
 2618cbcc9c9ac1c3c04be903fe3338a7  sparse-0.2.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 291cbc4c09c5111e4a2030a04ee69b65  patch-2.6.21-rc6.bz2
-37f989cebb4cabf999a094f757376bd2  patch-2.6.21-rc6-git1.bz2
+ac7d3fdf2473e5bec83c409b895bbe0f  patch-2.6.21-rc6-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.491
retrieving revision 1.492
diff -u -r1.491 -r1.492
--- upstream	8 Apr 2007 23:22:21 -0000	1.491
+++ upstream	9 Apr 2007 18:48:50 -0000	1.492
@@ -1,3 +1,3 @@
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc6.bz2
-patch-2.6.21-rc6-git1.bz2
+patch-2.6.21-rc6-git2.bz2


--- patch-2.6.21-rc6-git1.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr  9 19:45:54 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 15:45:54 -0400
Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.23,
	1.24 gnome-doc-utils.spec, 1.34, 1.35 sources, 1.23, 1.24
Message-ID: <200704091945.l39Jjs9I018856@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/gnome-doc-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18839

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

* Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 0.10.3-1.fc7
- Update to 0.10.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	9 Apr 2007 17:34:52 -0000	1.23
+++ .cvsignore	9 Apr 2007 19:45:52 -0000	1.24
@@ -1 +1 @@
-gnome-doc-utils-0.10.2.tar.bz2
+gnome-doc-utils-0.10.3.tar.bz2


Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gnome-doc-utils.spec	9 Apr 2007 17:34:53 -0000	1.34
+++ gnome-doc-utils.spec	9 Apr 2007 19:45:52 -0000	1.35
@@ -1,7 +1,7 @@
 ### Abstract ###
 
 Name: gnome-doc-utils
-Version: 0.10.2
+Version: 0.10.3
 Release: 1%{?dist}
 License: LGPL
 Group: Development/Tools
@@ -71,8 +71,8 @@
 %{_datadir}/gnome-doc-utils
 
 %changelog
-* Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 0.10.2-1.fc7
-- Update to 0.10.2
+* Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 0.10.3-1.fc7
+- Update to 0.10.3
 
 * Mon Mar 12 2007 Matthew Barnes <mbarnes at redhat.com> - 0.10.1-1.fc7
 - Update to 0.10.1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	9 Apr 2007 17:34:53 -0000	1.23
+++ sources	9 Apr 2007 19:45:52 -0000	1.24
@@ -1 +1 @@
-6df322b239fa8c7c0d2e4d9b9905c1a2  gnome-doc-utils-0.10.2.tar.bz2
+43f3a4086ec1254cbe20b85948192d18  gnome-doc-utils-0.10.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr  9 19:50:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 15:50:09 -0400
Subject: rpms/libselinux/devel .cvsignore, 1.135, 1.136 libselinux-rhat.patch,
	1.114, 1.115 libselinux.spec, 1.258, 1.259 sources, 1.137, 1.138
Message-ID: <200704091950.l39Jo9v5019115@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libselinux-rhat.patch libselinux.spec sources 
Log Message:
* Mon Apr 9 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.11-1
- Upgrade to upstream
	* Merged userspace AVC patch to follow kernel's behavior for permissive mode in caching previous denials from Eamon Walsh.
	* Merged sidput(NULL) patch from Eamon Walsh.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- .cvsignore	2 Apr 2007 19:14:28 -0000	1.135
+++ .cvsignore	9 Apr 2007 19:50:05 -0000	1.136
@@ -114,3 +114,4 @@
 libselinux-2.0.7.tgz
 libselinux-2.0.8.tgz
 libselinux-2.0.9.tgz
+libselinux-2.0.11.tgz

libselinux-rhat.patch:
 man/man8/matchpathcon.8 |    2 +-
 src/selinuxswig.i       |   31 ++++++++++++++++++++++++++++++-
 utils/getsebool.c       |    5 ++++-
 3 files changed, 35 insertions(+), 3 deletions(-)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- libselinux-rhat.patch	5 Apr 2007 15:57:35 -0000	1.114
+++ libselinux-rhat.patch	9 Apr 2007 19:50:05 -0000	1.115
@@ -1,18 +1,31 @@
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/matchpathcon.8 libselinux-2.0.9/man/man8/matchpathcon.8
+--- nsalibselinux/man/man8/matchpathcon.8	2007-01-17 11:11:35.000000000 -0500
++++ libselinux-2.0.9/man/man8/matchpathcon.8	2007-04-05 13:20:43.000000000 -0400
+@@ -28,4 +28,4 @@
+ 
+ .SH "SEE ALSO"
+ .BR selinux "(8), "
+-.BR mathpathcon "(3), " 
++.BR matchpathcon "(3), " 
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-2.0.9/src/selinuxswig.i
 --- nsalibselinux/src/selinuxswig.i	2007-02-22 08:53:23.000000000 -0500
-+++ libselinux-2.0.9/src/selinuxswig.i	2007-04-05 11:53:17.000000000 -0400
-@@ -115,9 +115,34 @@
++++ libselinux-2.0.9/src/selinuxswig.i	2007-04-05 16:47:42.000000000 -0400
+@@ -115,9 +115,38 @@
  extern const char *selinux_path(void);
  extern int selinux_check_passwd_access(access_vector_t requested);
  extern int checkPasswdAccess(access_vector_t requested);
 +
 +// This tells SWIG to treat char ** as a special case
-+%typemap(in) char ** {
++%typemap(python,in) char ** {
 +  /* Check if is a list */
 +  if (PyList_Check($input)) {
 +    int size = PyList_Size($input);
 +    int i = 0;
 +    $1 = (char **) malloc((size+1)*sizeof(char *));
++    if ($1 == NULL) {
++	PyErr_SetString(PyExc_MemoryError,"Out of memory");
++	return NULL;
++    }
 +    for (i = 0; i < size; i++) {
 +      PyObject *o = PyList_GetItem($input,i);
 +      if (PyString_Check(o))
@@ -37,125 +50,32 @@
  
  extern int is_context_customizable (security_context_t scontext);
  
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_wrap.c libselinux-2.0.9/src/selinuxswig_wrap.c
---- nsalibselinux/src/selinuxswig_wrap.c	2007-02-22 08:53:23.000000000 -0500
-+++ libselinux-2.0.9/src/selinuxswig_wrap.c	2007-04-05 11:45:04.000000000 -0400
-@@ -4145,18 +4145,14 @@
-   PyObject *resultobj = 0;
-   unsigned int arg1 ;
-   char *arg2 = (char *) 0 ;
--  char **arg3 ;
--  char **arg4 ;
-+  char **arg3 = (char **) 0 ;
-+  char **arg4 = (char **) 0 ;
-   int result;
-   unsigned int val1 ;
-   int ecode1 = 0 ;
-   int res2 ;
-   char *buf2 = 0 ;
-   int alloc2 = 0 ;
--  void *argp3 = 0 ;
--  int res3 = 0 ;
--  void *argp4 = 0 ;
--  int res4 = 0 ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   PyObject * obj2 = 0 ;
-@@ -4173,17 +4169,51 @@
-     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "rpm_execcon" "', argument " "2"" of type '" "char const *""'");
-   }
-   arg2 = (char *)(buf2);
--  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_p_char, 0 |  0 );
--  if (!SWIG_IsOK(res3)) {
--    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "rpm_execcon" "', argument " "3"" of type '" "char *const []""'"); 
--  } 
--  arg3 = (char **)(argp3);
--  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_p_char, 0 |  0 );
--  if (!SWIG_IsOK(res4)) {
--    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "rpm_execcon" "', argument " "4"" of type '" "char *const []""'"); 
--  } 
--  arg4 = (char **)(argp4);
--  result = (int)rpm_execcon(arg1,(char const *)arg2,(char *const (*))arg3,(char *const (*))arg4);
-+  {
-+    /* Check if is a list */
-+    if (PyList_Check(obj2)) {
-+      int size = PyList_Size(obj2);
-+      int i = 0;
-+      arg3 = (char **) malloc((size+1)*sizeof(char *));
-+      for (i = 0; i < size; i++) {
-+        PyObject *o = PyList_GetItem(obj2,i);
-+        if (PyString_Check(o))
-+        arg3[i] = PyString_AsString(PyList_GetItem(obj2,i));
-+        else {
-+          PyErr_SetString(PyExc_TypeError,"list must contain strings");
-+          free(arg3);
-+          return NULL;
-+        }
-+      }
-+      arg3[i] = 0;
-+    } else {
-+      PyErr_SetString(PyExc_TypeError,"not a list");
-+      return NULL;
-+    }
-+  }
-+  {
-+    /* Check if is a list */
-+    if (PyList_Check(obj3)) {
-+      int size = PyList_Size(obj3);
-+      int i = 0;
-+      arg4 = (char **) malloc((size+1)*sizeof(char *));
-+      for (i = 0; i < size; i++) {
-+        PyObject *o = PyList_GetItem(obj3,i);
-+        if (PyString_Check(o))
-+        arg4[i] = PyString_AsString(PyList_GetItem(obj3,i));
-+        else {
-+          PyErr_SetString(PyExc_TypeError,"list must contain strings");
-+          free(arg4);
-+          return NULL;
-+        }
-+      }
-+      arg4[i] = 0;
-+    } else {
-+      PyErr_SetString(PyExc_TypeError,"not a list");
-+      return NULL;
-+    }
-+  }
-+  result = (int)rpm_execcon(arg1,(char const *)arg2,arg3,arg4);
-   resultobj = SWIG_From_int((int)(result));
-   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-   return resultobj;
 diff --exclude-from=exclude -N -u -r nsalibselinux/utils/getsebool.c libselinux-2.0.9/utils/getsebool.c
 --- nsalibselinux/utils/getsebool.c	2006-11-16 17:15:17.000000000 -0500
-+++ libselinux-2.0.9/utils/getsebool.c	2007-04-05 10:53:29.000000000 -0400
-@@ -72,17 +72,23 @@
++++ libselinux-2.0.9/utils/getsebool.c	2007-04-05 16:57:51.000000000 -0400
+@@ -14,7 +14,7 @@
+ 
+ int main(int argc, char **argv)
+ {
+-	int i, rc = 0, active, pending, len = 0, opt;
++	int i, get_all = 0, rc = 0, active, pending, len = 0, opt;
+ 	char **names;
+ 
+ 	while ((opt = getopt(argc, argv, "a")) > 0) {
+@@ -39,6 +39,7 @@
+ 				printf("No booleans\n");
+ 				return 0;
+ 			}
++			get_all = 1;
+ 			break;
+ 		default:
+ 			usage(argv[0]);
+@@ -72,6 +73,8 @@
  	for (i = 0; i < len; i++) {
  		active = security_get_boolean_active(names[i]);
  		if (active < 0) {
--			fprintf(stderr, "Error getting active value for %s\n",
--				names[i]);
--			rc = -1;
--			goto out;
-+			if (errno != EACCES) { 
-+				fprintf(stderr, "Error getting active value for %s\n",
-+					names[i]);
-+				rc = -1;
-+				goto out;
-+			}
-+			continue;
- 		}
- 		pending = security_get_boolean_pending(names[i]);
- 		if (pending < 0) {
--			fprintf(stderr, "Error getting pending value for %s\n",
--				names[i]);
--			rc = -1;
--			goto out;
-+			if (errno != EACCES) { 
-+				fprintf(stderr, "Error getting pending value for %s\n",
-+					names[i]);
-+				rc = -1;
-+				goto out;
-+			}
-+			continue;
- 		}
- 		if (pending != active) {
- 			printf("%s --> %s pending: %s\n", names[i],
++			if (get_all && errno == EACCES) 
++				continue;
+ 			fprintf(stderr, "Error getting active value for %s\n",
+ 				names[i]);
+ 			rc = -1;


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- libselinux.spec	5 Apr 2007 15:57:35 -0000	1.258
+++ libselinux.spec	9 Apr 2007 19:50:05 -0000	1.259
@@ -1,8 +1,8 @@
 %define libsepolver 2.0.1-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.9
-Release: 2%{?dist}
+Version: 2.0.11
+Release: 1%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -121,6 +121,11 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Mon Apr 9 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.11-1
+- Upgrade to upstream
+	* Merged userspace AVC patch to follow kernel's behavior for permissive mode in caching previous denials from Eamon Walsh.
+	* Merged sidput(NULL) patch from Eamon Walsh.
+
 * Thu Apr 5 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.9-2
 - Make rpm_exec swig work
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/sources,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- sources	2 Apr 2007 19:14:28 -0000	1.137
+++ sources	9 Apr 2007 19:50:05 -0000	1.138
@@ -1 +1 @@
-7db5494cb311293ac526bdd631fb6a45  libselinux-2.0.9.tgz
+1ba54e7ad81fd4589bf4897260ee2071  libselinux-2.0.11.tgz



From fedora-cvs-commits at redhat.com  Mon Apr  9 20:42:05 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 16:42:05 -0400
Subject: rpms/gnome-python2/devel gnome-python2.spec,1.4,1.5
Message-ID: <200704092042.l39Kg59N009479@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	gnome-python2.spec 
Log Message:

* Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 2.18.1-1.fc7
- Update to 2.18.1



Index: gnome-python2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/gnome-python2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-python2.spec	12 Mar 2007 19:55:10 -0000	1.4
+++ gnome-python2.spec	9 Apr 2007 20:42:02 -0000	1.5
@@ -6,7 +6,7 @@
 ### Abstract ###
 
 Name: gnome-python2
-Version: 2.18.0
+Version: 2.18.1
 Release: 1%{?dist}
 License: LGPL
 Group: Development/Languages
@@ -198,6 +198,9 @@
 rm -f /usr/lib/python2.2/site-packages/bonobo/__init__.{pyc,pyo}
 
 %changelog
+* Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 2.18.1-1.fc7
+- Update to 2.18.1
+
 * Mon Mar 12 2007 Matthew Barnes <mbarnes at redhat.com> - 2.18.0-1.fc7
 - Update to 2.18.0
 



From fedora-cvs-commits at redhat.com  Mon Apr  9 20:43:22 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 16:43:22 -0400
Subject: rpms/gnome-python2/devel .cvsignore,1.25,1.26 sources,1.25,1.26
Message-ID: <200704092043.l39KhMfW010592@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	.cvsignore sources 
Log Message:
Update sources



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	12 Mar 2007 19:55:10 -0000	1.25
+++ .cvsignore	9 Apr 2007 20:43:20 -0000	1.26
@@ -1 +1 @@
-gnome-python-2.18.0.tar.bz2
+gnome-python-2.18.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	12 Mar 2007 19:55:10 -0000	1.25
+++ sources	9 Apr 2007 20:43:20 -0000	1.26
@@ -1 +1 @@
-75400e51abe3cedb785db40960cbad53  gnome-python-2.18.0.tar.bz2
+5fa614cec83de56d05a964f93ef9dd4e  gnome-python-2.18.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr  9 20:47:58 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 16:47:58 -0400
Subject: rpms/selinux-policy/devel policy-20070219.patch, 1.41,
	1.42 selinux-policy.spec, 1.428, 1.429
Message-ID: <200704092047.l39KlwNH014169@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20070219.patch selinux-policy.spec 
Log Message:
* Mon Apr 9 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-7
- Fixes for pyzor, cyrus, consoletype on everything installs


policy-20070219.patch:
 Rules.modular                             |   12 +
 policy/flask/access_vectors               |    4 
 policy/global_booleans                    |    2 
 policy/global_tunables                    |   39 +++-
 policy/mls                                |   31 ++-
 policy/modules/admin/acct.te              |    1 
 policy/modules/admin/acct.xml             |   43 ++++
 policy/modules/admin/alsa.xml             |   43 ++++
 policy/modules/admin/amanda.xml           |   85 +++++++++
 policy/modules/admin/amtu.fc              |    3 
 policy/modules/admin/amtu.if              |   53 +++++
 policy/modules/admin/amtu.te              |   56 ++++++
 policy/modules/admin/amtu.xml             |   36 ++++
 policy/modules/admin/anaconda.xml         |    3 
 policy/modules/admin/apt.xml              |   95 ++++++++++
 policy/modules/admin/backup.xml           |   35 +++
 policy/modules/admin/bootloader.te        |    2 
 policy/modules/admin/bootloader.xml       |   79 ++++++++
 policy/modules/admin/certwatch.xml        |   37 ++++
 policy/modules/admin/consoletype.te       |   10 -
 policy/modules/admin/consoletype.xml      |   47 +++++
 policy/modules/admin/ddcprobe.xml         |   35 +++
 policy/modules/admin/dmesg.te             |    1 
 policy/modules/admin/dmesg.xml            |   24 ++
 policy/modules/admin/dmidecode.xml        |   35 +++
 policy/modules/admin/dpkg.xml             |  125 +++++++++++++
 policy/modules/admin/firstboot.if         |   18 ++
 policy/modules/admin/firstboot.xml        |   88 +++++++++
 policy/modules/admin/kudzu.te             |    2 
 policy/modules/admin/kudzu.xml            |   45 +++++
 policy/modules/admin/logrotate.xml        |   75 ++++++++
 policy/modules/admin/logwatch.te          |    2 
 policy/modules/admin/logwatch.xml         |   23 ++
 policy/modules/admin/netutils.te          |    4 
 policy/modules/admin/rpm.fc               |    3 
 policy/modules/admin/rpm.if               |   65 +++++++
 policy/modules/admin/rpm.te               |    2 
 policy/modules/admin/su.if                |    6 
 policy/modules/admin/usermanage.te        |   42 +++-
 policy/modules/apps/games.fc              |    1 
 policy/modules/apps/gnome.if              |   26 ++
 policy/modules/apps/gpg.fc                |    2 
 policy/modules/apps/loadkeys.if           |   44 +---
 policy/modules/apps/mozilla.if            |    1 
 policy/modules/apps/slocate.te            |    4 
 policy/modules/apps/uml.if                |   27 ---
 policy/modules/apps/usernetctl.te         |   10 -
 policy/modules/kernel/corecommands.fc     |    7 
 policy/modules/kernel/corecommands.if     |   20 ++
 policy/modules/kernel/corenetwork.if.in   |   54 ++++++
 policy/modules/kernel/corenetwork.te.in   |   18 +-
 policy/modules/kernel/devices.if          |   36 ++++
 policy/modules/kernel/domain.if           |   18 ++
 policy/modules/kernel/domain.te           |   46 +++++
 policy/modules/kernel/files.fc            |    1 
 policy/modules/kernel/files.if            |   81 ++++++++-
 policy/modules/kernel/filesystem.if       |   39 ++++
 policy/modules/kernel/filesystem.te       |   12 +
 policy/modules/kernel/kernel.if           |   23 ++
 policy/modules/kernel/kernel.te           |    2 
 policy/modules/kernel/mls.if              |   20 ++
 policy/modules/kernel/mls.te              |    3 
 policy/modules/kernel/selinux.if          |   38 ++++
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.if         |    2 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/services/amavis.te         |    3 
 policy/modules/services/apache.fc         |   14 -
 policy/modules/services/apache.if         |  169 +++++++++++++++++-
 policy/modules/services/apache.te         |   70 +++++++
 policy/modules/services/apcupsd.fc        |    9 +
 policy/modules/services/apcupsd.if        |  108 ++++++++++++
 policy/modules/services/apcupsd.te        |   81 +++++++++
 policy/modules/services/automount.te      |    2 
 policy/modules/services/bluetooth.te      |    2 
 policy/modules/services/ccs.te            |   12 +
 policy/modules/services/consolekit.fc     |    1 
 policy/modules/services/consolekit.te     |   28 ++-
 policy/modules/services/cron.fc           |    1 
 policy/modules/services/cron.if           |   33 +--
 policy/modules/services/cron.te           |   51 ++++-
 policy/modules/services/cups.te           |    2 
 policy/modules/services/cvs.te            |    2 
 policy/modules/services/cyrus.te          |    6 
 policy/modules/services/dbus.if           |   63 +++++++
 policy/modules/services/dhcp.te           |    2 
 policy/modules/services/djbdns.te         |    5 
 policy/modules/services/dovecot.te        |    5 
 policy/modules/services/ftp.te            |    5 
 policy/modules/services/hal.fc            |    8 
 policy/modules/services/hal.if            |   19 ++
 policy/modules/services/hal.te            |  142 +++++++++++++++
 policy/modules/services/inetd.te          |    5 
 policy/modules/services/kerberos.if       |   58 ++----
 policy/modules/services/kerberos.te       |   36 +++-
 policy/modules/services/mta.if            |   19 ++
 policy/modules/services/mta.te            |    2 
 policy/modules/services/networkmanager.te |    2 
 policy/modules/services/nis.if            |    4 
 policy/modules/services/nis.te            |    4 
 policy/modules/services/nscd.te           |   10 +
 policy/modules/services/ntp.te            |    5 
 policy/modules/services/pegasus.if        |   18 ++
 policy/modules/services/pegasus.te        |    6 
 policy/modules/services/postfix.if        |    1 
 policy/modules/services/postfix.te        |    8 
 policy/modules/services/ppp.te            |    9 -
 policy/modules/services/procmail.te       |    1 
 policy/modules/services/pyzor.te          |    7 
 policy/modules/services/radius.te         |    4 
 policy/modules/services/rpc.if            |    5 
 policy/modules/services/rsync.te          |    1 
 policy/modules/services/samba.fc          |    3 
 policy/modules/services/samba.if          |   64 +++++++
 policy/modules/services/samba.te          |   79 ++++++++
 policy/modules/services/sasl.te           |   11 +
 policy/modules/services/sendmail.if       |   22 ++
 policy/modules/services/smartmon.te       |    1 
 policy/modules/services/snmp.te           |   10 +
 policy/modules/services/spamassassin.te   |    7 
 policy/modules/services/squid.fc          |    2 
 policy/modules/services/squid.if          |   22 ++
 policy/modules/services/squid.te          |   12 +
 policy/modules/services/ssh.if            |   39 ++++
 policy/modules/services/ssh.te            |    5 
 policy/modules/services/xserver.te        |   10 -
 policy/modules/services/zabbix.fc         |    4 
 policy/modules/services/zabbix.if         |   87 +++++++++
 policy/modules/services/zabbix.te         |   64 +++++++
 policy/modules/system/application.fc      |    1 
 policy/modules/system/application.if      |  104 +++++++++++
 policy/modules/system/application.te      |   14 +
 policy/modules/system/authlogin.if        |   83 +++++++--
 policy/modules/system/authlogin.te        |    3 
 policy/modules/system/fstools.fc          |    1 
 policy/modules/system/fstools.te          |    1 
 policy/modules/system/fusermount.fc       |    6 
 policy/modules/system/fusermount.if       |   41 ++++
 policy/modules/system/fusermount.te       |   45 +++++
 policy/modules/system/getty.te            |    3 
 policy/modules/system/hostname.te         |   14 +
 policy/modules/system/init.if             |    3 
 policy/modules/system/init.te             |   35 +++
 policy/modules/system/ipsec.if            |   20 ++
 policy/modules/system/iptables.te         |    4 
 policy/modules/system/libraries.fc        |    8 
 policy/modules/system/libraries.te        |   20 ++
 policy/modules/system/locallogin.te       |    7 
 policy/modules/system/logging.if          |   21 ++
 policy/modules/system/logging.te          |    2 
 policy/modules/system/lvm.te              |    5 
 policy/modules/system/modutils.te         |   11 +
 policy/modules/system/mount.fc            |    3 
 policy/modules/system/mount.if            |   37 ++++
 policy/modules/system/mount.te            |   64 ++++++-
 policy/modules/system/raid.te             |    1 
 policy/modules/system/selinuxutil.fc      |    1 
 policy/modules/system/selinuxutil.if      |    5 
 policy/modules/system/selinuxutil.te      |   73 +++-----
 policy/modules/system/sysnetwork.te       |    1 
 policy/modules/system/udev.fc             |    2 
 policy/modules/system/udev.te             |   11 +
 policy/modules/system/unconfined.fc       |    1 
 policy/modules/system/unconfined.if       |   10 -
 policy/modules/system/unconfined.te       |   24 ++
 policy/modules/system/userdomain.if       |  269 +++++++++++++++++-------------
 policy/modules/system/userdomain.te       |   46 +++--
 policy/modules/system/xen.te              |   35 +++
 policy/support/obj_perm_sets.spt          |   12 +
 169 files changed, 3920 insertions(+), 466 deletions(-)

Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- policy-20070219.patch	9 Apr 2007 18:27:25 -0000	1.41
+++ policy-20070219.patch	9 Apr 2007 20:47:56 -0000	1.42
@@ -834,7 +834,7 @@
 +</module>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.5.11/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2007-02-19 11:32:54.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/admin/consoletype.te	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/admin/consoletype.te	2007-04-09 15:58:47.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -857,6 +857,15 @@
  
  ########################################
  #
+@@ -49,7 +55,7 @@
+ init_use_fds(consoletype_t)
+ init_use_script_ptys(consoletype_t)
+ init_use_script_fds(consoletype_t)
+-init_write_script_pipes(consoletype_t)
++init_rw_script_pipes(consoletype_t)
+ 
+ domain_use_interactive_fds(consoletype_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.xml serefpolicy-2.5.11/policy/modules/admin/consoletype.xml
 --- nsaserefpolicy/policy/modules/admin/consoletype.xml	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.5.11/policy/modules/admin/consoletype.xml	2007-04-04 13:46:38.000000000 -0400
@@ -1894,6 +1903,43 @@
  
  libs_use_shared_libs(locate_t)
  libs_use_ld_so(locate_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/uml.if serefpolicy-2.5.11/policy/modules/apps/uml.if
+--- nsaserefpolicy/policy/modules/apps/uml.if	2007-03-26 10:38:58.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/apps/uml.if	2007-04-09 15:17:52.000000000 -0400
+@@ -193,33 +193,6 @@
+ 		nis_use_ypbind($1_uml_t)
+ 	')
+ 
+-	ifdef(`TODO',`
+-		# for X
+-		optional_policy(`
+-			ifelse($1, sysadm,`
+-			',`
+-				optional_policy(`
+-					allow $1_uml_t xdm_xserver_tmp_t:dir search;
+-				')
+-				allow $1_uml_t $1_xserver_tmp_t:sock_file write;
+-				allow $1_uml_t $1_xserver_t:unix_stream_socket connectto;
+-			')
+-		')
+-
+-		optional_policy(`
+-			# for uml_net
+-			domain_auto_trans($1_uml_t, uml_net_exec_t, uml_net_t)
+-			allow uml_net_t $1_uml_t:unix_stream_socket { read write };
+-			allow uml_net_t $1_uml_t:unix_dgram_socket { read write };
+-			dontaudit uml_net_t privfd:fd use;
+-			can_access_pty(uml_net_t, $1_uml)
+-			dontaudit uml_net_t $1_uml_rw_t:dir { getattr search };
+-		')
+-		#TODO
+-		optional_policy(`
+-			allow $1_uml_t $1_xauth_home_t:file { getattr read };
+-		')
+-	')
+ ')
+ 
+ ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/usernetctl.te serefpolicy-2.5.11/policy/modules/apps/usernetctl.te
 --- nsaserefpolicy/policy/modules/apps/usernetctl.te	2007-03-26 16:24:10.000000000 -0400
 +++ serefpolicy-2.5.11/policy/modules/apps/usernetctl.te	2007-04-04 13:46:37.000000000 -0400
@@ -2484,8 +2530,15 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.5.11/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2007-03-26 16:24:09.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/kernel/filesystem.te	2007-04-04 13:46:37.000000000 -0400
-@@ -60,11 +60,22 @@
++++ serefpolicy-2.5.11/policy/modules/kernel/filesystem.te	2007-04-09 16:04:53.000000000 -0400
+@@ -54,17 +54,29 @@
+ 
+ type capifs_t;
+ fs_type(capifs_t)
++files_mountpoint(capifs_t)
+ genfscon capifs / gen_context(system_u:object_r:capifs_t,s0)
+ 
+ type configfs_t;
  fs_type(configfs_t)
  genfscon configfs / gen_context(system_u:object_r:configfs_t,s0)
  
@@ -2700,6 +2753,31 @@
  fs_type(devpts_t)
  fs_use_trans devpts gen_context(system_u:object_r:devpts_t,s0);
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.5.11/policy/modules/services/amavis.te
+--- nsaserefpolicy/policy/modules/services/amavis.te	2007-03-26 10:39:04.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/amavis.te	2007-04-09 15:52:56.000000000 -0400
+@@ -50,6 +50,7 @@
+ allow amavis_t self:unix_stream_socket create_stream_socket_perms;
+ allow amavis_t self:unix_dgram_socket create_socket_perms;
+ allow amavis_t self:tcp_socket { listen accept };
++allow amavis_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ # configuration files
+ allow amavis_t amavis_etc_t:dir list_dir_perms;
+@@ -74,6 +75,7 @@
+ files_tmp_filetrans(amavis_t,amavis_tmp_t,file)
+ 
+ # var/lib files for amavis
++files_search_var_lib(amavis_t)
+ manage_dirs_pattern(amavis_t,amavis_var_lib_t,amavis_var_lib_t)
+ manage_files_pattern(amavis_t,amavis_var_lib_t,amavis_var_lib_t)
+ manage_sock_files_pattern(amavis_t,amavis_var_lib_t,amavis_var_lib_t)
+@@ -177,4 +179,5 @@
+ optional_policy(`
+ 	spamassassin_exec(amavis_t)
+ 	spamassassin_exec_client(amavis_t)
++	spamassassin_read_lib_files(amavis_t)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.5.11/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2007-02-23 16:50:01.000000000 -0500
 +++ serefpolicy-2.5.11/policy/modules/services/apache.fc	2007-04-04 13:46:37.000000000 -0400
@@ -2948,7 +3026,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.5.11/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2007-04-02 10:58:34.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/services/apache.te	2007-04-06 15:38:22.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/apache.te	2007-04-09 15:02:54.000000000 -0400
 @@ -106,6 +106,27 @@
  ## </desc>
  gen_tunable(httpd_unified,false)
@@ -3320,7 +3398,7 @@
  domain_use_interactive_fds(automount_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.5.11/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2007-03-20 23:38:04.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/services/bluetooth.te	2007-04-05 08:38:17.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/bluetooth.te	2007-04-09 14:53:07.000000000 -0400
 @@ -98,7 +98,7 @@
  
  fs_getattr_all_fs(bluetooth_t)
@@ -3715,7 +3793,7 @@
  type cvs_data_t; # customizable
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.5.11/policy/modules/services/cyrus.te
 --- nsaserefpolicy/policy/modules/services/cyrus.te	2007-03-20 23:38:13.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/services/cyrus.te	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/cyrus.te	2007-04-09 14:53:56.000000000 -0400
 @@ -111,6 +111,7 @@
  userdom_use_sysadm_ptys(cyrus_t)
  
@@ -3735,6 +3813,14 @@
  	ldap_stream_connect(cyrus_t)
  ')
  
+@@ -140,6 +145,7 @@
+ 
+ optional_policy(`
+ 	snmp_read_snmp_var_lib_files(cyrus_t)
++	snmp_dontaudit_write_snmp_var_lib_files(cyrus_t)
+ ')
+ 
+ optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.5.11/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2007-03-26 10:39:04.000000000 -0400
 +++ serefpolicy-2.5.11/policy/modules/services/dbus.if	2007-04-04 13:46:37.000000000 -0400
@@ -4572,8 +4658,28 @@
  type procmail_tmp_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-2.5.11/policy/modules/services/pyzor.te
 --- nsaserefpolicy/policy/modules/services/pyzor.te	2007-03-08 13:52:43.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/services/pyzor.te	2007-04-04 13:46:37.000000000 -0400
-@@ -77,6 +77,7 @@
++++ serefpolicy-2.5.11/policy/modules/services/pyzor.te	2007-04-09 16:02:48.000000000 -0400
+@@ -54,6 +54,11 @@
+ corenet_udp_sendrecv_all_nodes(pyzor_t)
+ corenet_udp_sendrecv_all_ports(pyzor_t)
+ 
++corenet_tcp_sendrecv_all_if(pyzor_t)
++corenet_tcp_sendrecv_all_nodes(pyzor_t)
++corenet_tcp_sendrecv_all_ports(pyzor_t)
++corenet_tcp_connect_http_port(pyzor_t)
++
+ dev_read_urand(pyzor_t)
+ 
+ files_read_etc_files(pyzor_t)
+@@ -68,6 +73,7 @@
+ userdom_dontaudit_search_sysadm_home_dirs(pyzor_t)
+ 
+ ifdef(`targeted_policy',`
++	userdom_dontaudit_write_sysadm_home_dirs(pyzor_t)
+ 	userdom_read_generic_user_home_content_files(pyzor_t)
+ ')
+ 
+@@ -77,6 +83,7 @@
  ')
  
  optional_policy(`
@@ -4935,7 +5041,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-2.5.11/policy/modules/services/sendmail.if
 --- nsaserefpolicy/policy/modules/services/sendmail.if	2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/services/sendmail.if	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/sendmail.if	2007-04-09 15:08:40.000000000 -0400
 @@ -76,6 +76,26 @@
  
  ########################################
@@ -4955,7 +5061,7 @@
 +	')
 +
 +	logging_search_logs($1)
-+	allow $1 sendmail_log_t:file read_file_perms;
++	read_files_pattern($1, sendmail_log_t, sendmail_log_t)
 +')
 +
 +########################################
@@ -4963,6 +5069,15 @@
  ##	Create, read, write, and delete sendmail logs.
  ## </summary>
  ## <param name="domain">
+@@ -91,7 +111,7 @@
+ 	')
+ 
+ 	logging_search_logs($1)
+-	allow $1 sendmail_log_t:file manage_file_perms;
++	manage_files_pattern($1, sendmail_log_t, sendmail_log_t)
+ ')
+ 
+ ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-2.5.11/policy/modules/services/smartmon.te
 --- nsaserefpolicy/policy/modules/services/smartmon.te	2007-03-20 23:38:13.000000000 -0400
 +++ serefpolicy-2.5.11/policy/modules/services/smartmon.te	2007-04-04 13:46:37.000000000 -0400
@@ -5825,7 +5940,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.5.11/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/init.if	2007-04-05 10:18:25.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/init.if	2007-04-09 15:56:23.000000000 -0400
 @@ -194,11 +194,14 @@
  	gen_require(`
  		type initrc_t;
@@ -6409,7 +6524,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.5.11/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/selinuxutil.te	2007-04-09 13:43:58.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/selinuxutil.te	2007-04-09 14:54:48.000000000 -0400
 @@ -1,10 +1,8 @@
  
  policy_module(selinuxutil,1.4.2)
@@ -6464,7 +6579,7 @@
  #
  # policy_config_t is the type of /etc/security/selinux/*
  # the security server policy configuration.
-@@ -83,31 +76,33 @@
+@@ -83,31 +76,34 @@
  type restorecon_exec_t;
  domain_obj_id_change_exemption(restorecon_t)
  init_system_domain(restorecon_t,restorecon_exec_t)
@@ -6499,13 +6614,14 @@
  role system_r types semanage_t;
  
 +ifdef(`targeted_policy',`
++init_use_fds(semanage_t)
 +init_system_domain(semanage_t, semanage_exec_t)
 +')
 +
  type semanage_store_t;
  files_type(semanage_store_t)
  
-@@ -121,12 +116,10 @@
+@@ -121,12 +117,10 @@
  files_type(semanage_trans_lock_t)
  
  type setfiles_t, can_relabelto_binary_policy;
@@ -6521,7 +6637,7 @@
  
  ifdef(`distro_redhat',`
  	init_system_domain(setfiles_t,setfiles_exec_t)
-@@ -195,6 +188,7 @@
+@@ -195,6 +189,7 @@
  fs_getattr_xattr_fs(load_policy_t)
  
  mls_file_read_up(load_policy_t)
@@ -6529,7 +6645,7 @@
  
  selinux_get_fs_mount(load_policy_t)
  selinux_load_policy(load_policy_t)
-@@ -217,7 +211,7 @@
+@@ -217,7 +212,7 @@
  	# cjp: cover up stray file descriptors.
  	dontaudit load_policy_t selinux_config_t:file write;
  	optional_policy(`
@@ -6538,7 +6654,7 @@
  	')
  ')
  
-@@ -310,15 +304,13 @@
+@@ -310,15 +305,13 @@
  userdom_dontaudit_search_all_users_home_content(newrole_t)
  userdom_search_all_users_home_dirs(newrole_t)
  
@@ -6561,7 +6677,7 @@
  
  tunable_policy(`allow_polyinstantiation',`
  	files_polyinstantiate_all(newrole_t)
-@@ -571,6 +563,8 @@
+@@ -571,6 +564,8 @@
  kernel_read_system_state(semanage_t)
  kernel_read_kernel_sysctls(semanage_t)
  
@@ -6570,6 +6686,25 @@
  corecmd_exec_bin(semanage_t)
  
  dev_read_urand(semanage_t)
+@@ -700,6 +695,6 @@
+ ifdef(`hide_broken_symptoms',`
+ 	# cjp: cover up stray file descriptors.
+ 	optional_policy(`
+-		unconfined_dontaudit_read_pipes(setfiles_t)
++		unconfined_dontaudit_rw_pipes(setfiles_t)
+ 	')
+ ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.5.11/policy/modules/system/sysnetwork.te
+--- nsaserefpolicy/policy/modules/system/sysnetwork.te	2007-03-26 10:39:07.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/sysnetwork.te	2007-04-09 16:43:32.000000000 -0400
+@@ -221,6 +221,7 @@
+ optional_policy(`
+ 	seutil_sigchld_newrole(dhcpc_t)
+ 	seutil_dontaudit_search_config(dhcpc_t)
++	seutil_domtrans_restorecon(dhcpc_t)
+ ')
+ 
+ optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-2.5.11/policy/modules/system/udev.fc
 --- nsaserefpolicy/policy/modules/system/udev.fc	2006-11-16 17:15:24.000000000 -0500
 +++ serefpolicy-2.5.11/policy/modules/system/udev.fc	2007-04-04 13:46:37.000000000 -0400
@@ -6724,7 +6859,7 @@
  		init_dbus_chat_script(unconfined_execmem_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.5.11/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-03-26 16:24:13.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/userdomain.if	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/system/userdomain.if	2007-04-09 16:02:32.000000000 -0400
 @@ -114,6 +114,10 @@
  		# Allow making the stack executable via mprotect.
  		allow $1_t self:process execstack;
@@ -7065,7 +7200,7 @@
  ')
  
  ########################################
-@@ -5737,3 +5701,69 @@
+@@ -5737,3 +5701,92 @@
  	allow $1 user_home_dir_t:dir manage_dir_perms;
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
@@ -7132,9 +7267,32 @@
 +	dontaudit $2 $1_file_type:file getattr;
 +')
 +
++########################################
++## <summary>
++##	Do not audit attempts to write to homedirs of sysadm users 
++##	home directory.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`userdom_dontaudit_write_sysadm_home_dirs',`
++	ifdef(`targeted_policy',`
++		gen_require(`
++			type user_home_dir_t;
++		')
++
++		dontaudit $1 user_home_dir_t:dir write;
++	', `
++		gen_require(`
++			type sysadm_home_dir_t;
++		')
 +
-+
-+
++		dontaudit $1 sysadm_home_dir_t:dir write;
++	')
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.5.11/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2007-03-26 16:24:13.000000000 -0400
 +++ serefpolicy-2.5.11/policy/modules/system/userdomain.te	2007-04-04 13:46:37.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -r1.428 -r1.429
--- selinux-policy.spec	9 Apr 2007 18:36:06 -0000	1.428
+++ selinux-policy.spec	9 Apr 2007 20:47:56 -0000	1.429
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.5.11
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -358,6 +358,9 @@
 %endif
 
 %changelog
+* Mon Apr 9 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-7
+- Fixes for pyzor, cyrus, consoletype on everything installs
+
 * Mon Apr 9 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-6
 - Fix hald_acl_t to be able to getattr/setattr on usb devices
 - Dontaudit write to unconfined_pipes for load_policy



From fedora-cvs-commits at redhat.com  Mon Apr  9 20:49:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 16:49:21 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.295,
	1.296 policycoreutils.spec, 1.391, 1.392
Message-ID: <200704092049.l39KnLf0015268@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Mon Apr 9 2007 Dan Walsh <dwalsh at redhat.com> 2.0.7-11
- Don't generate invalid context with genhomedircon


policycoreutils-rhat.patch:
 Makefile                     |    2 +-
 audit2allow/Makefile         |    2 +-
 restorecon/restorecon.c      |    4 ++--
 restorecond/restorecond.c    |   12 +++++++-----
 restorecond/restorecond.conf |    3 +++
 restorecond/restorecond.init |    1 +
 scripts/chcat                |   17 ++++++++++-------
 scripts/fixfiles             |    2 +-
 scripts/genhomedircon        |    6 +++++-
 semanage/seobject.py         |   10 +++++++---
 10 files changed, 38 insertions(+), 21 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- policycoreutils-rhat.patch	29 Mar 2007 16:16:45 -0000	1.295
+++ policycoreutils-rhat.patch	9 Apr 2007 20:49:19 -0000	1.296
@@ -132,6 +132,29 @@
  exit $?
  }
  
+diff --exclude-from=exclude --exclude=sepolgen-1.0.7 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-2.0.7/scripts/genhomedircon
+--- nsapolicycoreutils/scripts/genhomedircon	2006-11-28 09:24:33.000000000 -0500
++++ policycoreutils-2.0.7/scripts/genhomedircon	2007-04-09 15:44:47.000000000 -0400
+@@ -26,6 +26,7 @@
+ 
+ import sys, os, pwd, string, getopt, re
+ from semanage import *;
++import selinux
+ import gettext
+ gettext.install('policycoreutils')
+ 
+@@ -249,7 +250,10 @@
+ 				i = i.replace("HOME_DIR", home)
+ 				i = i.replace("ROLE", prefix)
+ 				i = i.replace("system_u", seuser)
+-				ret = ret+i
++				# Validate if the generated context exists.  Some user types may not exist
++				scon = i.split()[-1]
++				if selinux.security_check_context(scon) == 0:
++					ret = ret+i
+ 		fd.close()
+ 		return ret
+ 
 diff --exclude-from=exclude --exclude=sepolgen-1.0.7 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.7/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2007-02-22 08:53:22.000000000 -0500
 +++ policycoreutils-2.0.7/semanage/seobject.py	2007-03-23 09:03:56.000000000 -0400


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -r1.391 -r1.392
--- policycoreutils.spec	9 Apr 2007 14:15:34 -0000	1.391
+++ policycoreutils.spec	9 Apr 2007 20:49:19 -0000	1.392
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 2.0.7
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -186,6 +186,9 @@
 fi
 
 %changelog
+* Mon Apr 9 2007 Dan Walsh <dwalsh at redhat.com> 2.0.7-11
+- Don't generate invalid context with genhomedircon
+
 * Mon Apr 9 2007 Dan Walsh <dwalsh at redhat.com> 2.0.7-10
 - Add filter to booleans page
 



From fedora-cvs-commits at redhat.com  Mon Apr  9 21:10:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 17:10:42 -0400
Subject: rpms/gtk2/devel gtk+-2.10.8-search.patch, 1.2, 1.3 gtk2.spec, 1.219,
	1.220
Message-ID: <200704092110.l39LAg1I030932@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gtk+-2.10.8-search.patch gtk2.spec 
Log Message:
Fix a memory leak in the search patch


gtk+-2.10.8-search.patch:
 Makefile.am              |   10 
 gtkfilechooserdefault.c  | 1512 ++++++++++++++++++++++++++++++++++++-----------
 gtkfilechooserprivate.h  |   35 -
 gtkquery.c               |  142 ++++
 gtkquery.h               |   74 ++
 gtksearchengine.c        |  197 ++++++
 gtksearchengine.h        |   91 ++
 gtksearchenginebeagle.c  |  420 +++++++++++++
 gtksearchenginebeagle.h  |   59 +
 gtksearchenginesimple.c  |  376 +++++++++++
 gtksearchenginesimple.h  |   59 +
 gtksearchenginetracker.c |  362 +++++++++++
 gtksearchenginetracker.h |   59 +
 13 files changed, 3051 insertions(+), 345 deletions(-)

Index: gtk+-2.10.8-search.patch
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk+-2.10.8-search.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk+-2.10.8-search.patch	31 Jan 2007 04:44:00 -0000	1.2
+++ gtk+-2.10.8-search.patch	9 Apr 2007 21:10:38 -0000	1.3
@@ -1,5 +1,5 @@
---- /dev/null	2007-01-30 22:42:40.851021051 -0500
-+++ gtk+-2.10.9/gtk/gtksearchenginetracker.h	2007-01-30 23:27:42.000000000 -0500
+--- /dev/null	2007-04-09 09:59:25.840251204 +0200
++++ gtk+-2.10.11/gtk/gtksearchenginetracker.h	2007-04-09 22:42:19.000000000 +0200
 @@ -0,0 +1,59 @@
 +/*
 + * Copyright (C) 2005 Mr Jamie McCracken
@@ -60,8 +60,8 @@
 +G_END_DECLS
 +
 +#endif /* __GTK_SEARCH_ENGINE_TRACKER_H__ */
---- /dev/null	2007-01-30 22:42:40.851021051 -0500
-+++ gtk+-2.10.9/gtk/gtksearchengine.h	2007-01-30 23:27:42.000000000 -0500
+--- /dev/null	2007-04-09 09:59:25.840251204 +0200
++++ gtk+-2.10.11/gtk/gtksearchengine.h	2007-04-09 22:42:19.000000000 +0200
 @@ -0,0 +1,91 @@
 +/*
 + * Copyright (C) 2005 Novell, Inc.
@@ -154,8 +154,8 @@
 +G_END_DECLS
 +
 +#endif /* __GTK_SEARCH_ENGINE_H__ */
---- /dev/null	2007-01-30 22:42:40.851021051 -0500
-+++ gtk+-2.10.9/gtk/gtksearchenginebeagle.h	2007-01-30 23:27:42.000000000 -0500
+--- /dev/null	2007-04-09 09:59:25.840251204 +0200
++++ gtk+-2.10.11/gtk/gtksearchenginebeagle.h	2007-04-09 22:42:19.000000000 +0200
 @@ -0,0 +1,59 @@
 +/*
 + * Copyright (C) 2005 Novell, Inc.
@@ -216,8 +216,8 @@
 +G_END_DECLS
 +
 +#endif /* __GTK_SEARCH_ENGINE_BEAGLE_H__ */
---- /dev/null	2007-01-30 22:42:40.851021051 -0500
-+++ gtk+-2.10.9/gtk/gtksearchengine.c	2007-01-30 23:27:42.000000000 -0500
+--- /dev/null	2007-04-09 09:59:25.840251204 +0200
++++ gtk+-2.10.11/gtk/gtksearchengine.c	2007-04-09 22:42:19.000000000 +0200
 @@ -0,0 +1,197 @@
 +/*
 + * Copyright (C) 2005 Novell, Inc.
@@ -416,8 +416,8 @@
 +  
 +  g_signal_emit (engine, signals[ERROR], 0, error_message);
 +}
---- /dev/null	2007-01-30 22:42:40.851021051 -0500
-+++ gtk+-2.10.9/gtk/gtksearchenginetracker.c	2007-01-30 23:27:42.000000000 -0500
+--- /dev/null	2007-04-09 09:59:25.840251204 +0200
++++ gtk+-2.10.11/gtk/gtksearchenginetracker.c	2007-04-09 22:42:19.000000000 +0200
 @@ -0,0 +1,362 @@
 +/*
 + * Copyright (C) 2005 Mr Jamie McCracken
@@ -781,8 +781,8 @@
 +  
 +  return GTK_SEARCH_ENGINE (engine);
 +}
---- gtk+-2.10.9/gtk/Makefile.am.search	2007-01-22 10:48:04.000000000 -0500
-+++ gtk+-2.10.9/gtk/Makefile.am	2007-01-30 23:27:42.000000000 -0500
+--- gtk+-2.10.11/gtk/Makefile.am.search	2007-03-14 05:07:06.000000000 +0100
++++ gtk+-2.10.11/gtk/Makefile.am	2007-04-09 22:42:19.000000000 +0200
 @@ -332,6 +332,11 @@
  
  # GTK+ header files that don't get installed
@@ -807,9 +807,9 @@
  	fnmatch.c		\
  	gtkaboutdialog.c	\
  	gtkaccelgroup.c		\
---- gtk+-2.10.9/gtk/gtkfilechooserdefault.c.search	2007-01-22 10:48:04.000000000 -0500
-+++ gtk+-2.10.9/gtk/gtkfilechooserdefault.c	2007-01-30 23:27:42.000000000 -0500
-@@ -78,6 +78,8 @@
+--- gtk+-2.10.11/gtk/gtkfilechooserdefault.c.search	2007-03-14 05:07:03.000000000 +0100
++++ gtk+-2.10.11/gtk/gtkfilechooserdefault.c	2007-04-09 22:46:41.000000000 +0200
+@@ -79,6 +79,8 @@
  #include <errno.h>
  #include <string.h>
  #include <time.h>
@@ -818,7 +818,7 @@
  
  
  
-@@ -171,13 +173,20 @@
+@@ -172,13 +174,20 @@
    SHORTCUTS_COL_PIXBUF,
    SHORTCUTS_COL_NAME,
    SHORTCUTS_COL_DATA,
@@ -840,7 +840,7 @@
  /* Column numbers for the file list */
  enum {
    FILE_LIST_COL_NAME,
-@@ -186,6 +195,16 @@
+@@ -187,6 +196,16 @@
    FILE_LIST_COL_NUM_COLUMNS
  };
  
@@ -857,7 +857,7 @@
  /* Identifiers for target types */
  enum {
    GTK_TREE_MODEL_ROW,
-@@ -225,9 +244,19 @@
+@@ -226,9 +245,19 @@
  static const int num_file_list_dest_targets = (sizeof (file_list_dest_targets)
  					       / sizeof (file_list_dest_targets[0]));
  
@@ -877,7 +877,7 @@
    SHORTCUTS_HOME,
    SHORTCUTS_DESKTOP,
    SHORTCUTS_VOLUMES,
-@@ -419,6 +448,14 @@
+@@ -420,6 +449,14 @@
  					GtkFileChooserDefault *impl);
  static void location_switch_to_path_bar (GtkFileChooserDefault *impl);
  
@@ -892,7 +892,7 @@
  
  
  
-@@ -428,26 +465,26 @@
+@@ -429,26 +466,26 @@
    GtkTreeModelFilter parent;
  
    GtkFileChooserDefault *impl;
@@ -930,7 +930,7 @@
  
  
  
-@@ -663,6 +700,7 @@
+@@ -664,6 +701,7 @@
    impl->reload_state = RELOAD_EMPTY;
    impl->pending_select_paths = NULL;
    impl->location_mode = LOCATION_MODE_PATH_BAR;
@@ -938,7 +938,7 @@
  
    gtk_box_set_spacing (GTK_BOX (impl), 12);
  
-@@ -678,22 +716,24 @@
+@@ -679,22 +717,24 @@
  			 GtkTreeIter           *iter)
  {
    gpointer col_data;
@@ -967,7 +967,7 @@
      {
        GtkFileSystemVolume *volume;
  
-@@ -704,6 +744,8 @@
+@@ -705,6 +745,8 @@
      {
        GtkFilePath *path;
  
@@ -976,7 +976,7 @@
        path = col_data;
        gtk_file_path_free (path);
      }
-@@ -790,8 +832,11 @@
+@@ -791,8 +833,11 @@
    GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (object);
    GSList *l;
  
@@ -990,16 +990,17 @@
  
    shortcuts_free (impl);
  
-@@ -829,6 +874,8 @@
+@@ -829,6 +874,9 @@
+ 
    if (impl->sort_model)
      g_object_unref (impl->sort_model);
- 
++  
++  search_stop_searching (impl);
 +  search_clear_model (impl, FALSE);
-+
+ 
    g_free (impl->preview_display_name);
  
-   g_free (impl->edited_new_text);
-@@ -1080,6 +1127,14 @@
+@@ -1081,6 +1129,14 @@
    update_preview_widget_visibility (impl);
  }
  
@@ -1014,7 +1015,7 @@
  /* Re-reads all the icons for the shortcuts, used when the theme changes */
  struct ReloadIconsData
  {
-@@ -1150,19 +1205,20 @@
+@@ -1151,19 +1207,20 @@
    do
      {
        gpointer data;
@@ -1039,7 +1040,7 @@
  	    {
  	      GtkFileSystemVolume *volume;
  
-@@ -1177,46 +1233,53 @@
+@@ -1178,46 +1235,53 @@
  	      if (pixbuf)
  		g_object_unref (pixbuf);
  	    }
@@ -1132,7 +1133,7 @@
  	    }
  	}
      }
-@@ -1348,7 +1411,6 @@
+@@ -1349,7 +1413,6 @@
  {
    gint pos = -1;
    gboolean cancelled = handle->cancelled;
@@ -1140,7 +1141,7 @@
    GdkPixbuf *pixbuf;
    GtkTreePath *path;
    GtkTreeIter iter;
-@@ -1413,12 +1475,15 @@
+@@ -1414,12 +1477,15 @@
  		      SHORTCUTS_COL_PIXBUF, pixbuf,
  		      SHORTCUTS_COL_PIXBUF_VISIBLE, TRUE,
  		      SHORTCUTS_COL_NAME, request->label_copy,
@@ -1159,7 +1160,7 @@
  
    if (request->type == SHORTCUTS_CURRENT_FOLDER
        && request->impl->save_folder_combo != NULL)
-@@ -1430,7 +1495,7 @@
+@@ -1431,7 +1497,7 @@
        g_signal_handlers_block_by_func (request->impl->save_folder_combo,
  				       G_CALLBACK (save_folder_combo_changed_cb),
  				       request->impl);
@@ -1168,7 +1169,7 @@
        g_signal_handlers_unblock_by_func (request->impl->save_folder_combo,
  				         G_CALLBACK (save_folder_combo_changed_cb),
  				         request->impl);
-@@ -1504,7 +1569,7 @@
+@@ -1505,7 +1571,7 @@
  static void
  shortcuts_insert_path (GtkFileChooserDefault *impl,
  		       int                    pos,
@@ -1177,7 +1178,7 @@
  		       GtkFileSystemVolume   *volume,
  		       const GtkFilePath     *path,
  		       const char            *label,
-@@ -1517,79 +1582,89 @@
+@@ -1518,79 +1584,89 @@
    GtkTreeIter iter;
    GtkIconTheme *icon_theme;      
  
@@ -1324,7 +1325,7 @@
      }
  
    if (pos == -1)
-@@ -1604,13 +1679,16 @@
+@@ -1605,13 +1681,16 @@
  		      SHORTCUTS_COL_PIXBUF_VISIBLE, TRUE,
  		      SHORTCUTS_COL_NAME, label_copy,
  		      SHORTCUTS_COL_DATA, data,
@@ -1344,7 +1345,7 @@
  
    if (type == SHORTCUTS_CURRENT_FOLDER && impl->save_folder_combo != NULL)
      {
-@@ -1622,7 +1700,8 @@
+@@ -1623,7 +1702,8 @@
        g_signal_handlers_block_by_func (impl->save_folder_combo,
  				       G_CALLBACK (save_folder_combo_changed_cb),
  				       impl);
@@ -1354,7 +1355,7 @@
        g_signal_handlers_unblock_by_func (impl->save_folder_combo,
  				         G_CALLBACK (save_folder_combo_changed_cb),
  				         impl);
-@@ -1636,6 +1715,30 @@
+@@ -1637,6 +1717,30 @@
    profile_end ("end", NULL);
  }
  
@@ -1385,7 +1386,7 @@
  /* Appends an item for the user's home directory to the shortcuts model */
  static void
  shortcuts_append_home (GtkFileChooserDefault *impl)
-@@ -1654,7 +1757,8 @@
+@@ -1655,7 +1759,8 @@
  
    home_path = gtk_file_system_filename_to_path (impl->file_system, home);
  
@@ -1395,7 +1396,7 @@
  
    gtk_file_path_free (home_path);
  
-@@ -1687,7 +1791,9 @@
+@@ -1688,7 +1793,9 @@
    path = gtk_file_system_filename_to_path (impl->file_system, name);
    g_free (name);
  
@@ -1406,7 +1407,7 @@
    /* We do not actually pop up an error dialog if there is no desktop directory
     * because some people may really not want to have one.
     */
-@@ -1726,7 +1832,7 @@
+@@ -1727,7 +1834,7 @@
        label = gtk_file_system_get_bookmark_label (impl->file_system, path);
  
        /* NULL GError, but we don't really want to show error boxes here */
@@ -1415,7 +1416,7 @@
        num_inserted++;
  
        g_free (label);
-@@ -1745,6 +1851,16 @@
+@@ -1746,6 +1853,16 @@
    int n;
  
    n = 0;
@@ -1432,7 +1433,7 @@
  
    if (where == SHORTCUTS_HOME)
      goto out;
-@@ -1842,15 +1958,18 @@
+@@ -1843,15 +1960,18 @@
  	    }
  	}
  
@@ -1454,7 +1455,7 @@
  
    impl->changing_folder = old_changing_folders;
  
-@@ -1860,11 +1979,13 @@
+@@ -1861,11 +1981,13 @@
  /* Inserts a separator node in the shortcuts list */
  static void
  shortcuts_insert_separator (GtkFileChooserDefault *impl,
@@ -1470,7 +1471,7 @@
  
    gtk_list_store_insert (impl->shortcuts_model, &iter,
  			 shortcuts_get_index (impl, where));
-@@ -1873,6 +1994,7 @@
+@@ -1874,6 +1996,7 @@
  		      SHORTCUTS_COL_PIXBUF_VISIBLE, FALSE,
  		      SHORTCUTS_COL_NAME, NULL,
  		      SHORTCUTS_COL_DATA, NULL,
@@ -1478,7 +1479,7 @@
  		      -1);
  }
  
-@@ -1885,7 +2007,7 @@
+@@ -1886,7 +2009,7 @@
    GtkTreeIter iter;
    GtkFilePath *list_selected = NULL;
    GtkFilePath *combo_selected = NULL;
@@ -1487,7 +1488,7 @@
    gpointer col_data;
  
    profile_start ("start", NULL);
-@@ -1898,10 +2020,10 @@
+@@ -1899,10 +2022,10 @@
        gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), 
  			  &iter, 
  			  SHORTCUTS_COL_DATA, &col_data,
@@ -1500,7 +1501,7 @@
  	list_selected = gtk_file_path_copy (col_data);
      }
  
-@@ -1909,13 +2031,18 @@
+@@ -1910,13 +2033,18 @@
        gtk_combo_box_get_active_iter (GTK_COMBO_BOX (impl->save_folder_combo), 
  				     &iter))
      {
@@ -1522,7 +1523,7 @@
  	combo_selected = gtk_file_path_copy (col_data);
      }
  
-@@ -1933,8 +2060,11 @@
+@@ -1934,8 +2062,11 @@
    if (impl->num_bookmarks > 0)
      shortcuts_insert_separator (impl, SHORTCUTS_BOOKMARKS_SEPARATOR);
  
@@ -1536,7 +1537,7 @@
  
    if (list_selected)
      {
-@@ -1948,8 +2078,8 @@
+@@ -1949,8 +2080,8 @@
  
        pos = shortcut_find_position (impl, combo_selected);
        if (pos != -1)
@@ -1547,7 +1548,7 @@
        gtk_file_path_free (combo_selected);
      }
    
-@@ -1994,11 +2124,11 @@
+@@ -1995,11 +2126,11 @@
        if (base_path &&
  	  strcmp (gtk_file_path_get_string (base_path), gtk_file_path_get_string (impl->current_folder)) == 0)
  	{
@@ -1561,7 +1562,7 @@
  	  if (volume)
  	    gtk_file_system_volume_free (impl->file_system, volume);
  	}
-@@ -2007,7 +2137,8 @@
+@@ -2008,7 +2139,8 @@
  	gtk_file_path_free (base_path);
      }
    else if (impl->save_folder_combo != NULL)
@@ -1571,7 +1572,7 @@
  }
  
  /* Updates the current folder row in the shortcuts model */
-@@ -2029,9 +2160,9 @@
+@@ -2030,9 +2162,9 @@
  
  /* Filter function used for the shortcuts filter model */
  static gboolean
@@ -1584,7 +1585,7 @@
  {
    GtkFileChooserDefault *impl;
    GtkTreePath *path;
-@@ -2058,11 +2189,17 @@
+@@ -2059,11 +2191,17 @@
  					      GDK_TYPE_PIXBUF,	/* pixbuf */
  					      G_TYPE_STRING,	/* name */
  					      G_TYPE_POINTER,	/* path or volume */
@@ -1603,7 +1604,7 @@
    if (impl->file_system)
      {
        shortcuts_append_home (impl);
-@@ -2070,12 +2207,12 @@
+@@ -2071,12 +2209,12 @@
        shortcuts_add_volumes (impl);
      }
  
@@ -1621,7 +1622,7 @@
  					  impl,
  					  NULL);
  }
-@@ -2293,16 +2430,16 @@
+@@ -2294,16 +2432,16 @@
    for (i = 0; i < current_folder_separator_idx; i++)
      {
        gpointer col_data;
@@ -1641,7 +1642,7 @@
  	    {
  	      GtkFileSystemVolume *volume;
  	      GtkFilePath *base_path;
-@@ -2318,7 +2455,7 @@
+@@ -2319,7 +2457,7 @@
  	      if (exists)
  		return i;
  	    }
@@ -1650,7 +1651,7 @@
  	    {
  	      GtkFilePath *model_path;
  
-@@ -2424,7 +2561,7 @@
+@@ -2425,7 +2563,7 @@
    if (!gtk_tree_selection_get_selected (selection, NULL, &parent_iter))
      return FALSE;
  
@@ -1659,7 +1660,7 @@
  						    iter,
  						    &parent_iter);
    return TRUE;
-@@ -2447,11 +2584,12 @@
+@@ -2448,11 +2586,12 @@
  		      SHORTCUTS_COL_DATA, &col_data,
  		      SHORTCUTS_COL_REMOVABLE, &removable,
  		      -1);
@@ -1673,7 +1674,7 @@
    path = col_data;
  
    error = NULL;
-@@ -2608,6 +2746,16 @@
+@@ -2609,6 +2748,16 @@
    gboolean active;
    gchar *tip;
  
@@ -1690,7 +1691,7 @@
    selection_check (impl, &num_selected, NULL, &all_folders);
  
    if (num_selected == 0)
-@@ -3121,7 +3269,7 @@
+@@ -3122,7 +3271,7 @@
  {
    GtkTreeIter iter;
    gpointer col_data;
@@ -1699,7 +1700,7 @@
    GtkTreePath *path;
    int old_position;
    int bookmarks_index;
-@@ -3146,10 +3294,10 @@
+@@ -3147,10 +3296,10 @@
    gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), &iter,
  		      SHORTCUTS_COL_NAME, &name,
  		      SHORTCUTS_COL_DATA, &col_data,
@@ -1712,7 +1713,7 @@
    
    file_path = col_data;
    file_path_copy = gtk_file_path_copy (file_path); /* removal below will free file_path, so we need a copy */
-@@ -3233,17 +3381,11 @@
+@@ -3234,17 +3383,11 @@
  			      GtkTreeIter  *iter,
  			      gpointer      data)
  {
@@ -1733,7 +1734,7 @@
  }
  
  /* Since GtkTreeView has a keybinding attached to '/', we need to catch
-@@ -3488,7 +3630,7 @@
+@@ -3489,7 +3632,7 @@
    /* Accessible object name for the file chooser's shortcuts pane */
    atk_object_set_name (gtk_widget_get_accessible (impl->browse_shortcuts_tree_view), _("Places"));
  
@@ -1742,7 +1743,7 @@
  
    gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view),
  					  GDK_BUTTON1_MASK,
-@@ -3561,8 +3703,7 @@
+@@ -3562,8 +3705,7 @@
  
    gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view),
  					shortcuts_row_separator_func,
@@ -1752,7 +1753,7 @@
  
    gtk_tree_view_append_column (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view), column);
  
-@@ -3933,6 +4074,8 @@
+@@ -3934,6 +4076,8 @@
  {
    file_list_build_popup_menu (impl);
  
@@ -1761,7 +1762,7 @@
    /* The sensitivity of the Add to Bookmarks item is set in
     * bookmarks_check_add_sensitivity()
     */
-@@ -4032,6 +4175,28 @@
+@@ -4033,6 +4177,28 @@
    return TRUE;
  }
  
@@ -1790,7 +1791,7 @@
  /* Creates the widgets for the file list */
  static GtkWidget *
  create_file_list (GtkFileChooserDefault *impl)
-@@ -4045,7 +4210,7 @@
+@@ -4046,7 +4212,7 @@
  
    swin = gtk_scrolled_window_new (NULL, NULL);
    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swin),
@@ -1799,7 +1800,7 @@
    gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swin),
  				       GTK_SHADOW_IN);
  
-@@ -4135,6 +4300,7 @@
+@@ -4136,6 +4302,7 @@
    gtk_tree_view_column_set_sort_column_id (column, FILE_LIST_COL_SIZE);
    gtk_tree_view_append_column (GTK_TREE_VIEW (impl->browse_files_tree_view), column);
  #endif
@@ -1807,7 +1808,7 @@
    /* Modification time column */
  
    column = gtk_tree_view_column_new ();
-@@ -4145,8 +4311,11 @@
+@@ -4146,8 +4313,11 @@
    gtk_tree_view_column_pack_start (column, renderer, TRUE);
    gtk_tree_view_column_set_cell_data_func (column, renderer,
  					   list_mtime_data_func, impl, NULL);
@@ -1820,7 +1821,7 @@
    gtk_widget_show_all (swin);
  
    return swin;
-@@ -4254,9 +4423,59 @@
+@@ -4255,9 +4425,59 @@
      return;
  
    if (gtk_combo_box_get_active_iter (combo, &iter))
@@ -1881,7 +1882,7 @@
  /* Creates the combo box with the save folders */
  static GtkWidget *
  save_folder_combo_create (GtkFileChooserDefault *impl)
-@@ -4264,8 +4483,14 @@
+@@ -4265,8 +4485,14 @@
    GtkWidget *combo;
    GtkCellRenderer *cell;
  
@@ -1897,7 +1898,7 @@
  			"focus-on-click", FALSE,
                          NULL);
    gtk_widget_show (combo);
-@@ -4287,8 +4512,7 @@
+@@ -4288,8 +4514,7 @@
  
    gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo),
  					shortcuts_row_separator_func,
@@ -1907,7 +1908,7 @@
  
    g_signal_connect (combo, "changed",
  		    G_CALLBACK (save_folder_combo_changed_cb), impl);
-@@ -4622,6 +4846,7 @@
+@@ -4622,6 +4847,7 @@
    hbox = gtk_hbox_new (FALSE, 12);
    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
    gtk_widget_show (hbox);
@@ -1915,7 +1916,7 @@
  
    location_button_create (impl);
    gtk_box_pack_start (GTK_BOX (hbox), impl->location_button, FALSE, FALSE, 0);
-@@ -5210,6 +5435,9 @@
+@@ -5206,6 +5432,9 @@
        impl->shortcuts_activate_iter_handle = NULL;
      }
  
@@ -1925,7 +1926,7 @@
    remove_settings_signal (impl, gtk_widget_get_screen (GTK_WIDGET (impl)));
  
    G_OBJECT_CLASS (_gtk_file_chooser_default_parent_class)->dispose (object);
-@@ -5487,31 +5715,32 @@
+@@ -5483,31 +5712,32 @@
  
    GTK_WIDGET_CLASS (_gtk_file_chooser_default_parent_class)->map (widget);
  
@@ -1983,7 +1984,7 @@
  
    bookmarks_changed_cb (impl->file_system, impl);
  
-@@ -5982,12 +6211,6 @@
+@@ -5978,12 +6208,6 @@
         * but rather on behalf of something else like GtkFileChooserButton.  In
         * that case, the chooser's selection should be what the caller expects,
         * as the user can't see that something else got selected.  See bug #165264.
@@ -1996,7 +1997,7 @@
         */
        if (GTK_WIDGET_MAPPED (impl) && impl->action == GTK_FILE_CHOOSER_ACTION_OPEN)
  	browse_files_select_first_row (impl);
-@@ -6034,17 +6257,11 @@
+@@ -6030,17 +6254,11 @@
    profile_end ("end", NULL);
  }
  
@@ -2017,7 +2018,7 @@
    if (impl->browse_files_model)
      {
        g_object_unref (impl->browse_files_model);
-@@ -6056,6 +6273,20 @@
+@@ -6052,6 +6270,20 @@
        g_object_unref (impl->sort_model);
        impl->sort_model = NULL;
      }
@@ -2038,7 +2039,7 @@
  
    set_busy_cursor (impl, TRUE);
    gtk_tree_view_set_model (GTK_TREE_VIEW (impl->browse_files_tree_view), NULL);
-@@ -6130,6 +6361,9 @@
+@@ -6126,6 +6358,9 @@
    struct update_chooser_entry_selected_foreach_closure closure;
    const char *file_part;
  
@@ -2048,7 +2049,7 @@
    if (!(impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
  	|| impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER
  	|| ((impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
-@@ -6151,35 +6385,40 @@
+@@ -6147,35 +6382,40 @@
      }
    else if (closure.num_selected == 1)
      {
@@ -2117,7 +2118,7 @@
      }
    else
      {
-@@ -6386,6 +6625,8 @@
+@@ -6382,6 +6622,8 @@
  
    profile_start ("start", (char *) path);
  
@@ -2126,7 +2127,7 @@
    g_assert (path != NULL);
  
    if (impl->local_only &&
-@@ -6427,6 +6668,9 @@
+@@ -6423,6 +6665,9 @@
  {
    GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (chooser);
  
@@ -2136,7 +2137,7 @@
    if (impl->reload_state == RELOAD_EMPTY)
      {
        char *current_working_dir;
-@@ -6487,9 +6731,9 @@
+@@ -6483,9 +6728,9 @@
      return FALSE;
  
    if (!parent_path)
@@ -2148,7 +2149,7 @@
      same_path = FALSE;
    else
      {
-@@ -6585,6 +6829,16 @@
+@@ -6581,6 +6826,16 @@
  gtk_file_chooser_default_select_all (GtkFileChooser *chooser)
  {
    GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (chooser);
@@ -2165,7 +2166,7 @@
    if (impl->select_multiple)
      gtk_tree_model_foreach (GTK_TREE_MODEL (impl->sort_model), 
  			    maybe_select, impl);
-@@ -6714,6 +6968,10 @@
+@@ -6720,6 +6975,10 @@
    struct get_paths_closure info;
    GtkWindow *toplevel;
    GtkWidget *current_focus;
@@ -2176,7 +2177,7 @@
  
    info.impl = impl;
    info.result = NULL;
-@@ -6725,12 +6983,14 @@
+@@ -6731,12 +6990,14 @@
    else
      current_focus = NULL;
  
@@ -2191,7 +2192,7 @@
        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
        gtk_tree_selection_selected_foreach (selection, get_paths_foreach, &info);
  
-@@ -6765,8 +7025,12 @@
+@@ -6771,8 +7032,12 @@
  	  return NULL;
  	}
  
@@ -2206,7 +2207,7 @@
      }
    else if (impl->toplevel_last_focus_widget == impl->browse_files_tree_view)
      goto file_list;
-@@ -6935,7 +7199,7 @@
+@@ -6941,7 +7206,7 @@
  
    pos = shortcuts_get_pos_for_shortcut_folder (data->impl, data->impl->num_shortcuts);
  
@@ -2215,7 +2216,7 @@
  
  out:
    g_object_unref (data->impl);
-@@ -7049,15 +7313,15 @@
+@@ -7055,15 +7320,15 @@
    for (i = 0; i < impl->num_shortcuts; i++)
      {
        gpointer col_data;
@@ -2234,7 +2235,7 @@
  
        shortcut = col_data;
        if (gtk_file_path_compare (shortcut, path) == 0)
-@@ -7106,15 +7370,15 @@
+@@ -7112,15 +7377,15 @@
    for (i = 0; i < impl->num_shortcuts; i++)
      {
        gpointer col_data;
@@ -2253,7 +2254,7 @@
  
        shortcut = col_data;
        list = g_slist_prepend (list, gtk_file_path_copy (shortcut));
-@@ -7449,6 +7713,23 @@
+@@ -7455,6 +7720,23 @@
      }
  }
  
@@ -2277,7 +2278,7 @@
  static void
  action_create_folder_cb (GtkFileSystemHandle *handle,
  			 const GtkFilePath   *path,
-@@ -7714,6 +7995,9 @@
+@@ -7720,6 +8002,9 @@
  
        g_assert (impl->action >= GTK_FILE_CHOOSER_ACTION_OPEN && impl->action <= GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER);
  
@@ -2287,7 +2288,7 @@
        selection_check (impl, &num_selected, &all_files, &all_folders);
  
        if (num_selected > 2)
-@@ -7850,7 +8134,7 @@
+@@ -7856,7 +8141,7 @@
  	{
  	  shortcuts_activate_iter (impl, &iter);
  	  
@@ -2296,7 +2297,7 @@
  	}
        else
  	goto file_list;
-@@ -7864,6 +8148,11 @@
+@@ -7870,6 +8155,11 @@
         */
        goto file_list;
      }
@@ -2308,7 +2309,7 @@
    else if (impl->location_entry && impl->toplevel_last_focus_widget == impl->location_entry)
      {
        /* The focus is on a dialog's action area button, *and* the widget that
-@@ -7913,15 +8202,453 @@
+@@ -7919,15 +8209,453 @@
    gtk_widget_grab_focus (widget);
  }
  
@@ -2768,7 +2769,7 @@
         */
        filter_index = g_slist_index (impl->filters, filter);
        if (impl->filters && filter && filter_index < 0)
-@@ -7961,28 +8688,44 @@
+@@ -7967,28 +8695,44 @@
  {
    GtkTreePath *cursor_path;
    const GtkFilePath *new_path;
@@ -2830,7 +2831,7 @@
      }
  
    if (new_path != impl->preview_path &&
-@@ -7998,7 +8741,7 @@
+@@ -8004,7 +8748,7 @@
        if (new_path)
  	{
  	  impl->preview_path = gtk_file_path_copy (new_path);
@@ -2839,7 +2840,7 @@
  	}
        else
  	{
-@@ -8067,6 +8810,8 @@
+@@ -8073,6 +8817,8 @@
  {
    GtkFilePath *path;
  
@@ -2848,7 +2849,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.
     */
-@@ -8087,6 +8832,8 @@
+@@ -8093,6 +8839,8 @@
        if (path != NULL)
          {
            change_folder_and_display_error (impl, path);
@@ -2857,7 +2858,7 @@
            gtk_file_path_free (path);
          }
      }
-@@ -8119,7 +8866,10 @@
+@@ -8125,7 +8873,10 @@
      goto out;
  
    if (!error && gtk_file_info_get_is_folder (info))
@@ -2869,7 +2870,7 @@
    else
      gtk_file_chooser_default_select_path (GTK_FILE_CHOOSER (data->impl), data->path, NULL);
  
-@@ -8136,26 +8886,25 @@
+@@ -8142,26 +8893,25 @@
  			 GtkTreeIter           *iter)
  {
    gpointer col_data;
@@ -2901,7 +2902,7 @@
      {
        GtkFileSystemVolume *volume;
  
-@@ -8163,7 +8912,7 @@
+@@ -8169,7 +8919,7 @@
  
        shortcuts_activate_volume (impl, volume);
      }
@@ -2910,7 +2911,7 @@
      {
        struct ShortcutsActivateData *data;
  
-@@ -8176,6 +8925,10 @@
+@@ -8182,6 +8932,10 @@
  				  GTK_FILE_INFO_IS_FOLDER,
  				  shortcuts_activate_get_info_cb, data);
      }
@@ -2921,7 +2922,7 @@
  }
  
  /* Callback used when a row in the shortcuts list is activated */
-@@ -8188,15 +8941,13 @@
+@@ -8194,15 +8948,13 @@
    GtkTreeIter iter;
    GtkTreeIter child_iter;
  
@@ -2939,7 +2940,7 @@
  }
  
  /* Handler for GtkWidget::key-press-event on the shortcuts list */
-@@ -8236,8 +8987,15 @@
+@@ -8242,8 +8994,15 @@
  			gpointer           data)
  {
    GtkFileChooserDefault *impl = data;
@@ -2956,7 +2957,7 @@
  }
  
  static gboolean
-@@ -8249,6 +9007,9 @@
+@@ -8255,6 +9014,9 @@
  {
    GtkFileChooserDefault *impl = data;
  
@@ -2966,7 +2967,7 @@
    if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
        impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
      {
-@@ -8274,7 +9035,7 @@
+@@ -8280,7 +9042,7 @@
  			GtkFileChooserDefault *impl)
  {
    /* See if we are in the new folder editable row for Save mode */
@@ -2975,7 +2976,7 @@
      {
        const GtkFileInfo *info;
        gboolean had_selection;
-@@ -8289,6 +9050,8 @@
+@@ -8295,6 +9057,8 @@
  
   out:
  
@@ -2984,7 +2985,7 @@
    update_chooser_entry (impl);
    check_preview_change (impl);
    bookmarks_check_add_sensitivity (impl);
-@@ -8306,6 +9069,12 @@
+@@ -8312,6 +9076,12 @@
    GtkTreeIter iter, child_iter;
    const GtkFileInfo *info;
  
@@ -2997,7 +2998,7 @@
    if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (impl->sort_model), &iter, path))
      return;
  
-@@ -8376,6 +9145,15 @@
+@@ -8382,6 +9152,15 @@
    const GtkFileInfo *info; 
    gboolean sensitive = TRUE;
  
@@ -3013,7 +3014,7 @@
    profile_start ("start", NULL);
    
    info = get_list_file_info (impl, iter);
-@@ -8425,13 +9203,33 @@
+@@ -8431,13 +9210,33 @@
  		     gpointer           data)
  {
    GtkFileChooserDefault *impl = data;
@@ -3049,7 +3050,7 @@
  		    NULL);
  
        return;
-@@ -8447,6 +9245,7 @@
+@@ -8453,6 +9252,7 @@
    g_object_set (cell,
  		"text", gtk_file_info_get_display_name (info),
  		"sensitive", sensitive,
@@ -3057,7 +3058,7 @@
  		NULL);
  }
  
-@@ -8508,7 +9307,6 @@
+@@ -8514,7 +9314,6 @@
  		      gpointer           data)
  {
    GtkFileChooserDefault *impl;
@@ -3065,7 +3066,7 @@
    GtkFileTime time_mtime;
    GDate mtime, now;
    int days_diff;
-@@ -8517,17 +9315,35 @@
+@@ -8523,17 +9322,35 @@
  
    impl = data;
  
@@ -3109,7 +3110,7 @@
  
    if (time_mtime == 0)
      strcpy (buf, _("Unknown"));
-@@ -8558,10 +9374,6 @@
+@@ -8564,10 +9381,6 @@
  	}
      }
  
@@ -3120,7 +3121,7 @@
    g_object_set (cell,
  		"text", buf,
  		"sensitive", sensitive,
-@@ -8587,7 +9399,23 @@
+@@ -8593,7 +9406,23 @@
  static void
  location_popup_handler (GtkFileChooserDefault *impl,
  			const gchar           *path)
@@ -3145,7 +3146,7 @@
    if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
        || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
      {
-@@ -8656,6 +9484,7 @@
+@@ -8662,6 +9491,7 @@
      g_assert_not_reached ();
  
    shortcuts_activate_iter (impl, &iter);
@@ -3153,7 +3154,7 @@
  }
  
  /* Handler for the "home-folder" keybinding signal */
-@@ -8700,26 +9529,26 @@
+@@ -8706,26 +9536,26 @@
  /* Drag and drop interfaces */
  
  static void
@@ -3186,7 +3187,7 @@
  
    pos = *gtk_tree_path_get_indices (path);
    bookmarks_pos = shortcuts_get_index (model->impl, SHORTCUTS_BOOKMARKS);
-@@ -8729,13 +9558,13 @@
+@@ -8735,13 +9565,13 @@
  
  /* GtkTreeDragSource::drag_data_get implementation for the shortcuts filter model */
  static gboolean
@@ -3205,7 +3206,7 @@
  
    /* FIXME */
  
-@@ -8744,30 +9573,30 @@
+@@ -8750,30 +9580,30 @@
  
  /* Fill the GtkTreeDragSourceIface vtable */
  static void
@@ -3247,8 +3248,8 @@
  			"child-model", child_model,
  			"virtual-root", root,
  			NULL);
---- gtk+-2.10.9/gtk/gtkfilechooserprivate.h.search	2007-01-22 10:48:04.000000000 -0500
-+++ gtk+-2.10.9/gtk/gtkfilechooserprivate.h	2007-01-30 23:27:42.000000000 -0500
+--- gtk+-2.10.11/gtk/gtkfilechooserprivate.h.search	2007-03-14 05:07:03.000000000 +0100
++++ gtk+-2.10.11/gtk/gtkfilechooserprivate.h	2007-04-09 22:42:19.000000000 +0200
 @@ -25,6 +25,8 @@
  #include "gtkfilesystem.h"
  #include "gtkfilesystemmodel.h"
@@ -3345,8 +3346,8 @@
    guint expand_folders : 1;
  
  #if 0
---- /dev/null	2007-01-30 22:42:40.851021051 -0500
-+++ gtk+-2.10.9/gtk/gtksearchenginesimple.h	2007-01-30 23:27:42.000000000 -0500
+--- /dev/null	2007-04-09 09:59:25.840251204 +0200
++++ gtk+-2.10.11/gtk/gtksearchenginesimple.h	2007-04-09 22:42:19.000000000 +0200
 @@ -0,0 +1,59 @@
 +/*
 + * Copyright (C) 2005 Red Hat, Inc
@@ -3407,8 +3408,8 @@
 +G_END_DECLS
 +
 +#endif /* __GTK_SEARCH_ENGINE_SIMPLE_H__ */
---- /dev/null	2007-01-30 22:42:40.851021051 -0500
-+++ gtk+-2.10.9/gtk/gtksearchenginesimple.c	2007-01-30 23:29:14.000000000 -0500
+--- /dev/null	2007-04-09 09:59:25.840251204 +0200
++++ gtk+-2.10.11/gtk/gtksearchenginesimple.c	2007-04-09 22:42:19.000000000 +0200
 @@ -0,0 +1,376 @@
 +/*
 + * Copyright (C) 2005 Red Hat, Inc
@@ -3786,8 +3787,8 @@
 +  
 +  return engine;
 +}
---- /dev/null	2007-01-30 22:42:40.851021051 -0500
-+++ gtk+-2.10.9/gtk/gtksearchenginebeagle.c	2007-01-30 23:27:42.000000000 -0500
+--- /dev/null	2007-04-09 09:59:25.840251204 +0200
++++ gtk+-2.10.11/gtk/gtksearchenginebeagle.c	2007-04-09 22:42:19.000000000 +0200
 @@ -0,0 +1,420 @@
 +/*
 + * Copyright (C) 2005 Novell, Inc.
@@ -4209,8 +4210,8 @@
 +  
 +  return GTK_SEARCH_ENGINE (engine);
 +}
---- /dev/null	2007-01-30 22:42:40.851021051 -0500
-+++ gtk+-2.10.9/gtk/gtkquery.c	2007-01-30 23:27:42.000000000 -0500
+--- /dev/null	2007-04-09 09:59:25.840251204 +0200
++++ gtk+-2.10.11/gtk/gtkquery.c	2007-04-09 22:42:19.000000000 +0200
 @@ -0,0 +1,142 @@
 +/*
 + * Copyright (C) 2005 Novell, Inc.
@@ -4354,8 +4355,8 @@
 +					    g_strdup (mime_type));
 +}
 +
---- /dev/null	2007-01-30 22:42:40.851021051 -0500
-+++ gtk+-2.10.9/gtk/gtkquery.h	2007-01-30 23:27:42.000000000 -0500
+--- /dev/null	2007-04-09 09:59:25.840251204 +0200
++++ gtk+-2.10.11/gtk/gtkquery.h	2007-04-09 22:42:19.000000000 +0200
 @@ -0,0 +1,74 @@
 +/*
 + * Copyright (C) 2005 Novell, Inc.


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- gtk2.spec	28 Mar 2007 16:15:34 -0000	1.219
+++ gtk2.spec	9 Apr 2007 21:10:38 -0000	1.220
@@ -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: http://ftp.gnome.org/pub/gnome/sources/gtk+/2.10/gtk+-%{version}.tar.bz2
@@ -37,6 +37,7 @@
 Patch10: gtk+-2.10.4-im-reset.patch
 # fixed in upstream cvs
 Patch11: raw-printers.patch
+Patch12: gtk-keys.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -123,6 +124,7 @@
 %patch7 -p1 -b .cursor-blink
 %patch10 -p1 -b .im-reset
 %patch11 -p1 -b .raw-printers
+%patch12 -p1 -b .keys
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -289,6 +291,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Mon Apr  9 2007 Matthias Clasen <mclasen at redhat.com> - 1.10.11-4
+- Fix a memory leak in the search patch
+
 * Wed Mar 28 2007 Matthias Clasen <mclasen at redhat.com> - 1.10.11-3
 - Support raw printers
 



From fedora-cvs-commits at redhat.com  Mon Apr  9 21:30:33 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 17:30:33 -0400
Subject: rpms/gtk2/devel gtk2.spec,1.220,1.221
Message-ID: <200704092130.l39LUXkb012731@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gtk2.spec 
Log Message:
fix spec



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- gtk2.spec	9 Apr 2007 21:10:38 -0000	1.220
+++ gtk2.spec	9 Apr 2007 21:30:31 -0000	1.221
@@ -37,7 +37,6 @@
 Patch10: gtk+-2.10.4-im-reset.patch
 # fixed in upstream cvs
 Patch11: raw-printers.patch
-Patch12: gtk-keys.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -124,7 +123,6 @@
 %patch7 -p1 -b .cursor-blink
 %patch10 -p1 -b .im-reset
 %patch11 -p1 -b .raw-printers
-%patch12 -p1 -b .keys
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .



From fedora-cvs-commits at redhat.com  Mon Apr  9 21:37:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 17:37:49 -0400
Subject: rpms/perl-LDAP/devel perl-LDAP.spec,1.14,1.15
Message-ID: <200704092137.l39Lbnh2010766@cvs.devel.redhat.com>

Author: rnorwood

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

Modified Files:
	perl-LDAP.spec 
Log Message:
resolves: rhbz#226267 - Need to only filter out the unversioned provides for perl(Net::LDAP::Filter).


Index: perl-LDAP.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-LDAP/devel/perl-LDAP.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-LDAP.spec	5 Apr 2007 17:00:58 -0000	1.14
+++ perl-LDAP.spec	9 Apr 2007 21:37:47 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-LDAP
 Version:        0.34
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          1
 Summary:        LDAP Perl module
 
@@ -34,7 +34,7 @@
 cat << \EOF > %{name}-prov
 #!/bin/sh
 %{__perl_provides} $* |\
-  sed -e '/perl(Net::LDAP::Filter)/d'
+  sed -e '/perl(Net::LDAP::Filter)$/d'
 EOF
 
 %define __perl_provides %{_builddir}/perl-ldap-%{version}/%{name}-prov
@@ -69,6 +69,11 @@
 
 
 %changelog
+* Mon Apr 09 2007 Robin Norwood <rnorwood at redhat.com> - 1:0.34-3
+- Resolves: bz#226267
+- Only filter out the unversioned Provides: perl(Net::LDAP::Filter) to
+  avoid breaking dependencies.
+
 * Thu Apr 05 2007 Robin Norwood <rnorwood at redhat.com> - 1:0.34-2
 - Resolves: bz#226267
 - Filter out provides perl(Net::LDAP::Filter) per package review.



From fedora-cvs-commits at redhat.com  Mon Apr  9 21:44:58 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 17:44:58 -0400
Subject: rpms/dhcp/devel dhcp.spec,1.152,1.153
Message-ID: <200704092144.l39LiwiL013536@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13516

Modified Files:
	dhcp.spec 
Log Message:
* Tue Apr 10 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-29
- Spec file cleanups (#225691)



Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- dhcp.spec	9 Apr 2007 18:37:48 -0000	1.152
+++ dhcp.spec	9 Apr 2007 21:44:55 -0000	1.153
@@ -10,7 +10,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.5
-Release:  28%{?dist}
+Release:  29%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -30,34 +30,36 @@
 Source12: dhcp4client.h
 Source13: libdhcp_control.h
 
-Patch0:   %{name}-%{version}-version.patch
-Patch1:   %{name}-%{version}-Makefile.patch
-Patch2:   %{name}-%{version}-warnings.patch
-Patch3:   %{name}-%{version}-extended-new-option-info.patch
-Patch4:   %{name}-%{version}-errwarn-message.patch
-Patch5:   %{name}-%{version}-ldap-configuration.patch
-Patch6:   %{name}-%{version}-memory.patch
-Patch7:   %{name}-%{version}-options.patch
-Patch8:   %{name}-%{version}-release-by-ifup.patch
-Patch9:   %{name}-%{version}-dhclient-decline-backoff.patch
-Patch10:  %{name}-%{version}-enable-timeout-functions.patch
-Patch11:  %{name}-%{version}-inherit-leases.patch
-Patch12:  %{name}-%{version}-selinux.patch
-Patch13:  %{name}-%{version}-unicast-bootp.patch
-Patch14:  %{name}-%{version}-fast-timeout.patch
-Patch15:  %{name}-%{version}-failover-ports.patch
-Patch16:  %{name}-%{version}-dhclient-usage.patch
-Patch17:  %{name}-%{version}-default-requested-options.patch
-Patch18:  %{name}-%{version}-prototypes.patch
-Patch19:  %{name}-%{version}-manpages.patch
-Patch20:  %{name}-%{version}-libdhcp4client.patch
+Patch0:   %{name}-3.0.5-version.patch
+Patch1:   %{name}-3.0.5-Makefile.patch
+Patch2:   %{name}-3.0.5-warnings.patch
+Patch3:   %{name}-3.0.5-extended-new-option-info.patch
+Patch4:   %{name}-3.0.5-errwarn-message.patch
+Patch5:   %{name}-3.0.5-ldap-configuration.patch
+Patch6:   %{name}-3.0.5-memory.patch
+Patch7:   %{name}-3.0.5-options.patch
+Patch8:   %{name}-3.0.5-release-by-ifup.patch
+Patch9:   %{name}-3.0.5-dhclient-decline-backoff.patch
+Patch10:  %{name}-3.0.5-enable-timeout-functions.patch
+Patch11:  %{name}-3.0.5-inherit-leases.patch
+Patch12:  %{name}-3.0.5-selinux.patch
+Patch13:  %{name}-3.0.5-unicast-bootp.patch
+Patch14:  %{name}-3.0.5-fast-timeout.patch
+Patch15:  %{name}-3.0.5-failover-ports.patch
+Patch16:  %{name}-3.0.5-dhclient-usage.patch
+Patch17:  %{name}-3.0.5-default-requested-options.patch
+Patch18:  %{name}-3.0.5-prototypes.patch
+Patch19:  %{name}-3.0.5-manpages.patch
+Patch20:  %{name}-3.0.5-libdhcp4client.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires(post): chkconfig, coreutils
-Requires(preun): chkconfig
-Requires(postun): coreutils
 BuildRequires: groff openldap-devel
 
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(postun): /sbin/service
+
 %description
 DHCP (Dynamic Host Configuration Protocol) is a protocol which allows
 individual devices on an IP network to get their own network
@@ -71,15 +73,14 @@
 the ISC DHCP service and relay agent.
 
 %package -n dhclient
-Summary: Provides the dhclient ISC DHCP client daemon and dhclient-script .
-Requires: initscripts >= 6.75
+Summary: Provides the dhclient ISC DHCP client daemon and dhclient-script
 Group: System Environment/Base
-Obsoletes: dhcpcd <= 1.3.22
+Requires: initscripts >= 6.75
 
 %package devel
 Summary: Development headers and libraries for interfacing to the DHCP server
-Requires: dhcp = %{epoch}:%{version}-%{release}, openldap-devel
 Group: Development/Libraries
+Requires: dhcp = %{epoch}:%{version}-%{release}, openldap-devel
 
 %description -n dhclient
 DHCP (Dynamic Host Configuration Protocol) is a protocol which allows
@@ -107,6 +108,7 @@
 %package -n libdhcp4client-devel
 Summary: Header files for development with the ISC DHCP IPv4 client library
 Group: Development/Libraries
+Requires: libdhcp4client = %{epoch}:%{version}-%{release}
 Requires: openldap-devel pkgconfig
 
 %description -n libdhcp4client-devel
@@ -209,30 +211,35 @@
 %patch20 -p1 -b .libdhcp4client
 
 # Copy in documentation and example scripts for LDAP patch to dhcpd
-%{__cp} -p %SOURCE6 .
-%{__cp} -p %SOURCE7 doc
-%{__cp} -p %SOURCE8 contrib
+%{__install} -p -m 0644 %SOURCE6 .
+%{__install} -p -m 0644 %SOURCE7 doc
+%{__install} -p -m 0755 %SOURCE8 contrib
 
 # Copy in example dhclient script for use with D-BUS (requires extended
 # new option info patch too)
-%{__cp} -p %SOURCE9 client/scripts
+%{__install} -p -m 0755 %SOURCE9 client/scripts
 
 # Copy in the Fedora/RHEL dhclient script
-%{__cp} -p %SOURCE10 client/scripts
+%{__install} -p -m 0755 %SOURCE10 client/scripts
 
 # Copy in the libdhcp4client headers and Makefile.dist
 %{__mkdir} -p libdhcp4client
-%{__cp} -p %SOURCE11 libdhcp4client
-%{__cp} -p %SOURCE12 libdhcp4client
-%{__cp} -p %SOURCE13 libdhcp4client
+%{__install} -p -m 0644 %SOURCE11 libdhcp4client
+%{__install} -p -m 0644 %SOURCE12 libdhcp4client
+%{__install} -p -m 0644 %SOURCE13 libdhcp4client
 
 # Ensure we don't pick up Perl as a dependency from the scripts and modules
 # in the contrib directory (we copy this to /usr/share/doc in the final
 # package).
-%{__chmod} -x contrib/3.0b1-lease-convert
-%{__chmod} -x contrib/dhcpd-conf-to-ldap
-%{__cp} -p contrib/ms2isc/Registry.pm contrib/ms2isc/Registry.perlmodule
-%{__rm} -f contrib/ms2isc/Registry.pm
+%{__cp} -a contrib __fedora_contrib
+%{__chmod} -x __fedora_contrib/3.0b1-lease-convert
+%{__chmod} -x __fedora_contrib/dhcpd-conf-to-ldap
+%{__mv} __fedora_contrib/ms2isc/Registry.pm __fedora_contrib/ms2isc/Registry.perlmodule
+
+# We want UNIX-style line endings
+%{__sed} -i -e 's/\r//' __fedora_contrib/ms2isc/readme.txt
+%{__sed} -i -e 's/\r//' __fedora_contrib/ms2isc/Registry.perlmodule
+%{__sed} -i -e 's/\r//' __fedora_contrib/ms2isc/ms2isc.pl
 
 %build
 %{__cp} %SOURCE1 .
@@ -263,7 +270,7 @@
    --copts "$RPM_OPT_FLAGS $COPTS %{?bigptrs} -DEXTENDED_NEW_OPTION_INFO" \
    --work-dir %{workdir}
 
-%{__sed} 's/@DHCP_VERSION@/'%{version}'/' < %SOURCE5 > libdhcp4client.pc
+%{__sed} 's/@DHCP_VERSION@/%{version}/' < %SOURCE5 > libdhcp4client.pc
 %{__make} %{?_smp_mflags} CC="%{__cc}"
 
 %install
@@ -312,25 +319,23 @@
 %{__rm} -rf %{buildroot}
 
 %post
+# This adds the proper /etc/rc*.d links for the script
 /sbin/chkconfig --add dhcpd
 /sbin/chkconfig --add dhcrelay
-exit 0
 
 %preun
-if [ $1 = 0 ]; then	# execute this only if we are NOT doing an upgrade
-    service dhcpd stop >/dev/null 2>&1
-    service dhcrelay stop >/dev/null 2>&1
+if [ $1 = 0 ]; then
+    /sbin/service dhcpd stop >/dev/null 2>&1 || :
+    /sbin/service dhcrelay stop >/dev/null 2>&1 || :
     /sbin/chkconfig --del dhcpd
     /sbin/chkconfig --del dhcrelay
 fi
-exit 0
 
 %postun
 if [ "$1" -ge "1" ]; then
-    service dhcpd condrestart >/dev/null 2>&1
-    service dhcrelay condrestart >/dev/null 2>&1
+    /sbin/service dhcpd condrestart >/dev/null 2>&1 || :
+    /sbin/service dhcrelay condrestart >/dev/null 2>&1 || :
 fi
-exit 0
 
 %post -n libdhcp4client -p /sbin/ldconfig
 
@@ -339,7 +344,7 @@
 %files
 %defattr(-,root,root,-)
 %doc README README.ldap RELNOTES dhcpd.conf.sample doc/IANA-arp-parameters
-%doc doc/IANA-arp-parameters doc/api+protocol doc/*.txt contrib
+%doc doc/IANA-arp-parameters doc/api+protocol doc/*.txt __fedora_contrib
 %dir %{_localstatedir}/lib/dhcpd
 %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/dhcpd/dhcpd.leases
 %config(noreplace) %{_sysconfdir}/sysconfig/dhcpd
@@ -377,7 +382,9 @@
 %exclude %{_includedir}/dhcp4client
 %{_includedir}/*
 %{_libdir}/*.a
-%{_mandir}/man3/*
+%attr(0644,root,root) %{_mandir}/man3/omshell.3.gz
+%attr(0644,root,root) %{_mandir}/man3/dhcpctl.3.gz
+%attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %files -n libdhcp4client
 %defattr(0755,root,root,0755)
@@ -391,6 +398,9 @@
 %{_libdir}/libdhcp4client.so
 
 %changelog
+* Tue Apr 10 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-29
+- Spec file cleanups (#225691)
+
 * Mon Apr 09 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-28
 - Remove Xen patch (#235649, from RHEL-5, doesn't work correctly for Fedora)
 



From fedora-cvs-commits at redhat.com  Mon Apr  9 22:07:35 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 18:07:35 -0400
Subject: rpms/libX11/FC-6 libX11-cve-2007-1667.patch,NONE,1.1
Message-ID: <200704092207.l39M7Zta014375@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libX11/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv14360

Added Files:
	libX11-cve-2007-1667.patch 
Log Message:
* Fri Apr 06 2007 Adam Jackson <ajax at redhat.com> 1.0.3-7
- libX11-cve-2007-1667.patch: Fix CVE 2007-1667.


libX11-cve-2007-1667.patch:
 ImUtil.c |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)

--- NEW FILE libX11-cve-2007-1667.patch ---
From: Matthieu Herrb <matthieu at roadrock.(none)>
Date: Tue, 3 Apr 2007 13:39:52 +0000 (+0200)
Subject: Multiple integer overflows in the XGetPixel() and XInitImage functions
X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/lib/libX11.git;a=commitdiff;h=7dc7ef398b6ad90ccd1680ed9cd1cfdd47312f5a

Multiple integer overflows in the XGetPixel() and XInitImage functions

CVE-2007-1667
---

--- a/src/ImUtil.c
+++ b/src/ImUtil.c
@@ -327,12 +327,13 @@ XImage *XCreateImage (dpy, visual, depth
 {
 	register XImage *image;
 	int bits_per_pixel = 1;
+	int min_bytes_per_line;
 
 	if (depth == 0 || depth > 32 ||
 	    (format != XYBitmap && format != XYPixmap && format != ZPixmap) ||
 	    (format == XYBitmap && depth != 1) ||
 	    (xpad != 8 && xpad != 16 && xpad != 32) ||
-	    offset < 0 || image_bytes_per_line < 0)
+	    offset < 0)
 	    return (XImage *) NULL;
 	if ((image = (XImage *) Xcalloc(1, (unsigned) sizeof(XImage))) == NULL)
 	    return (XImage *) NULL;
@@ -363,16 +364,21 @@ XImage *XCreateImage (dpy, visual, depth
 	/*
 	 * compute per line accelerator.
 	 */
-	if (image_bytes_per_line == 0)
 	{
 	if (format == ZPixmap)
-	    image->bytes_per_line = 
+	    min_bytes_per_line = 
 	       ROUNDUP((bits_per_pixel * width), image->bitmap_pad);
 	else
-	    image->bytes_per_line =
+	    min_bytes_per_line =
 	        ROUNDUP((width + offset), image->bitmap_pad);
 	}
-	else image->bytes_per_line = image_bytes_per_line;
+	if (image_bytes_per_line == 0) {
+	    image->bytes_per_line = min_bytes_per_line;
+	} else if (image_bytes_per_line < min_bytes_per_line) {
+	    return 0;
+	} else {
+	    image->bytes_per_line = image_bytes_per_line;
+	}
 
 	image->bits_per_pixel = bits_per_pixel;
 	image->obdata = NULL;
@@ -384,7 +390,11 @@ XImage *XCreateImage (dpy, visual, depth
 Status XInitImage (image)
     XImage *image;
 {
+	int min_bytes_per_line;
+
 	if (image->depth == 0 || image->depth > 32 ||
+	    image->bits_per_pixel > 32 || image->bitmap_unit > 32 ||
+	    image->bits_per_pixel < 0 || image->bitmap_unit < 0 ||
 	    (image->format != XYBitmap &&
 	     image->format != XYPixmap &&
 	     image->format != ZPixmap) ||
@@ -392,21 +402,24 @@ Status XInitImage (image)
 	    (image->bitmap_pad != 8 &&
 	     image->bitmap_pad != 16 &&
 	     image->bitmap_pad != 32) ||
-	    image->xoffset < 0 || image->bytes_per_line < 0)
+	    image->xoffset < 0)
 	    return 0;
 
 	/*
 	 * compute per line accelerator.
 	 */
-	if (image->bytes_per_line == 0)
-	{
 	if (image->format == ZPixmap)
-	    image->bytes_per_line = 
+	    min_bytes_per_line = 
 	       ROUNDUP((image->bits_per_pixel * image->width),
 		       image->bitmap_pad);
 	else
-	    image->bytes_per_line =
+	    min_bytes_per_line =
 	        ROUNDUP((image->width + image->xoffset), image->bitmap_pad);
+
+	if (image->bytes_per_line == 0) {
+	    image->bytes_per_line = min_bytes_per_line;
+	} else if (image->bytes_per_line < min_bytes_per_line) {
+	    return 0;
 	}
 
 	_XInitImageFuncPtrs (image);



From fedora-cvs-commits at redhat.com  Mon Apr  9 22:17:03 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 18:17:03 -0400
Subject: rpms/libX11/FC-5 libX11-cve-2007-1667.patch,NONE,1.1
Message-ID: <200704092217.l39MH38I014639@cvs.devel.redhat.com>

Author: ajackson

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

Added Files:
	libX11-cve-2007-1667.patch 
Log Message:
* Fri Apr 06 2007 Adam Jackson <ajax at redhat.com> 1.0.0-4
- libX11-cve-2007-1667.patch: Fix CVE 2007-1667


libX11-cve-2007-1667.patch:
 ImUtil.c |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)

--- NEW FILE libX11-cve-2007-1667.patch ---
From: Matthieu Herrb <matthieu at roadrock.(none)>
Date: Tue, 3 Apr 2007 13:39:52 +0000 (+0200)
Subject: Multiple integer overflows in the XGetPixel() and XInitImage functions
X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/lib/libX11.git;a=commitdiff;h=7dc7ef398b6ad90ccd1680ed9cd1cfdd47312f5a

Multiple integer overflows in the XGetPixel() and XInitImage functions

CVE-2007-1667
---

--- a/src/ImUtil.c
+++ b/src/ImUtil.c
@@ -327,12 +327,13 @@ XImage *XCreateImage (dpy, visual, depth
 {
 	register XImage *image;
 	int bits_per_pixel = 1;
+	int min_bytes_per_line;
 
 	if (depth == 0 || depth > 32 ||
 	    (format != XYBitmap && format != XYPixmap && format != ZPixmap) ||
 	    (format == XYBitmap && depth != 1) ||
 	    (xpad != 8 && xpad != 16 && xpad != 32) ||
-	    offset < 0 || image_bytes_per_line < 0)
+	    offset < 0)
 	    return (XImage *) NULL;
 	if ((image = (XImage *) Xcalloc(1, (unsigned) sizeof(XImage))) == NULL)
 	    return (XImage *) NULL;
@@ -363,16 +364,21 @@ XImage *XCreateImage (dpy, visual, depth
 	/*
 	 * compute per line accelerator.
 	 */
-	if (image_bytes_per_line == 0)
 	{
 	if (format == ZPixmap)
-	    image->bytes_per_line = 
+	    min_bytes_per_line = 
 	       ROUNDUP((bits_per_pixel * width), image->bitmap_pad);
 	else
-	    image->bytes_per_line =
+	    min_bytes_per_line =
 	        ROUNDUP((width + offset), image->bitmap_pad);
 	}
-	else image->bytes_per_line = image_bytes_per_line;
+	if (image_bytes_per_line == 0) {
+	    image->bytes_per_line = min_bytes_per_line;
+	} else if (image_bytes_per_line < min_bytes_per_line) {
+	    return 0;
+	} else {
+	    image->bytes_per_line = image_bytes_per_line;
+	}
 
 	image->bits_per_pixel = bits_per_pixel;
 	image->obdata = NULL;
@@ -384,7 +390,11 @@ XImage *XCreateImage (dpy, visual, depth
 Status XInitImage (image)
     XImage *image;
 {
+	int min_bytes_per_line;
+
 	if (image->depth == 0 || image->depth > 32 ||
+	    image->bits_per_pixel > 32 || image->bitmap_unit > 32 ||
+	    image->bits_per_pixel < 0 || image->bitmap_unit < 0 ||
 	    (image->format != XYBitmap &&
 	     image->format != XYPixmap &&
 	     image->format != ZPixmap) ||
@@ -392,21 +402,24 @@ Status XInitImage (image)
 	    (image->bitmap_pad != 8 &&
 	     image->bitmap_pad != 16 &&
 	     image->bitmap_pad != 32) ||
-	    image->xoffset < 0 || image->bytes_per_line < 0)
+	    image->xoffset < 0)
 	    return 0;
 
 	/*
 	 * compute per line accelerator.
 	 */
-	if (image->bytes_per_line == 0)
-	{
 	if (image->format == ZPixmap)
-	    image->bytes_per_line = 
+	    min_bytes_per_line = 
 	       ROUNDUP((image->bits_per_pixel * image->width),
 		       image->bitmap_pad);
 	else
-	    image->bytes_per_line =
+	    min_bytes_per_line =
 	        ROUNDUP((image->width + image->xoffset), image->bitmap_pad);
+
+	if (image->bytes_per_line == 0) {
+	    image->bytes_per_line = min_bytes_per_line;
+	} else if (image->bytes_per_line < min_bytes_per_line) {
+	    return 0;
 	}
 
 	_XInitImageFuncPtrs (image);



From fedora-cvs-commits at redhat.com  Mon Apr  9 23:05:20 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 19:05:20 -0400
Subject: rpms/libwnck/devel libwnck-2.18.0-property-leak.patch, NONE,
	1.1 libwnck.spec, 1.67, 1.68
Message-ID: <200704092305.l39N5K31019294@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	libwnck.spec 
Added Files:
	libwnck-2.18.0-property-leak.patch 
Log Message:
Plug a small memory leak


libwnck-2.18.0-property-leak.patch:
 xutils.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE libwnck-2.18.0-property-leak.patch ---
--- libwnck-2.18.0/libwnck/xutils.c.property-leak	2007-04-10 00:47:26.000000000 +0200
+++ libwnck-2.18.0/libwnck/xutils.c	2007-04-10 00:56:29.000000000 +0200
@@ -245,11 +245,13 @@
                                           &list);
 
   if (count == 0)
-    return NULL;
+    retval = NULL;
+  else
+    {
+      retval = list[0];
+      list[0] = g_strdup (""); /* something to free */
+    }
 
-  retval = list[0];
-  list[0] = g_strdup (""); /* something to free */
-  
   g_strfreev (list);
 
   return retval;


Index: libwnck.spec
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- libwnck.spec	29 Mar 2007 01:36:17 -0000	1.67
+++ libwnck.spec	9 Apr 2007 23:05:18 -0000	1.68
@@ -6,7 +6,7 @@
 Summary: Window Navigator Construction Kit
 Name: libwnck
 Version: 2.18.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://ftp.gnome.org/pub/GNOME/sources/libwnck/
 Source0: http://ftp.gnome.org/pub/gnome/sources/libwnck/2.18/%{name}-%{version}.tar.bz2
 License: LGPL
@@ -31,6 +31,8 @@
 Patch3: libwnck-2.18.0-appearance.patch
 Patch4: libwnck-2.18.0-viewport.patch
 Patch5: libwnck-2.18.0-above.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=428056
+Patch6: libwnck-2.18.0-property-leak.patch
 
 %description
 
@@ -63,6 +65,7 @@
 %patch3 -p1 -b .appearance
 %patch4 -p1 -b .viewport
 %patch5 -p1 -b .above
+%patch6 -p1 -b .property-leak
 
 %build
 
@@ -101,6 +104,9 @@
 %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Tue Apr 10 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-3
+- Plug a small memory leak
+
 * Wed Mar 28 2007 Kristian H??gsberg <krh at redhat.com> - 2.18.0-2
 - Add compiz integration patches from GNOME #352383:
    - libwnck-2.18.0-appearance.patch



From fedora-cvs-commits at redhat.com  Mon Apr  9 23:09:54 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 19:09:54 -0400
Subject: rpms/xorg-x11-server/devel xserver-1.3.0-mmap-failure-check.patch,
	NONE, 1.1 xserver-1.3.0-no-pseudocolor-composite.patch, NONE,
	1.1 xserver-1.3.0-pci-bus-count.patch, NONE,
	1.1 xserver-1.3.0-rom-search.patch, NONE,
	1.1 xserver-1.3.0-xnest-exposures.patch, NONE,
	1.1 xorg-x11-server.spec, 1.216, 1.217
Message-ID: <200704092309.l39N9sbO022560@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.3.0-mmap-failure-check.patch 
	xserver-1.3.0-no-pseudocolor-composite.patch 
	xserver-1.3.0-pci-bus-count.patch 
	xserver-1.3.0-rom-search.patch 
	xserver-1.3.0-xnest-exposures.patch 
Log Message:
* Mon Apr 09 2007 Adam Jackson <ajax at redhat.com> 1.2.99.905-2
- xserver-1.3.0-pci-bus-count.patch: Allocate the PCI bus array dynamically,
  so as not to run off the end of it.
- xserver-1.3.0-mmap-failure-check.patch: Check for failure when mmap'ing
  bus memory. (#234073)
- xserver-1.3.0-rom-search.patch: Look for the sysfs ROM file in the (flat)
  /sys/bus/pci/devices tree, instead of the (bus-topological) /sys/devices,
  so we don't fail to find ROMs merely because they're behind a bridge.
- xserver-1.3.0-no-pseudocolor-composite.patch: Refuse to initialize
  Composite when Render is missing or when the root window is using
  a pseudocolor visual. (#217388)
- xserver-1.3.0-xnest-exposures.patch: Fix Motif app redraw in Xnest. (#229350)


xserver-1.3.0-mmap-failure-check.patch:
 linuxPci.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE xserver-1.3.0-mmap-failure-check.patch ---
--- ./hw/xfree86/os-support/bus/linuxPci.c.orig	2007-03-14 09:37:44.000000000 -0600
+++ ./hw/xfree86/os-support/bus/linuxPci.c	2007-03-14 09:41:01.000000000 -0600
@@ -634,28 +634,28 @@
 		    ADDRESS Base, unsigned long Size)
 {
     int domain = xf86GetPciDomain(Tag);
-    int fd;
+    int fd = -1;
     pointer addr;
 
     /*
      * We use /proc/bus/pci on non-legacy addresses or if the Linux sysfs
      * legacy_mem interface is unavailable.
      */
-    if (Base > 1024*1024)
-	return linuxMapPci(ScreenNum, Flags, Tag, Base, Size,
+    if (Base >= 1024*1024)
+	addr = linuxMapPci(ScreenNum, Flags, Tag, Base, Size,
 			   PCIIOC_MMAP_IS_MEM);
-
-    if ((fd = linuxOpenLegacy(Tag, "legacy_mem")) < 0)
-	return linuxMapPci(ScreenNum, Flags, Tag, Base, Size,
+    else if ((fd = linuxOpenLegacy(Tag, "legacy_mem")) < 0)
+	addr = linuxMapPci(ScreenNum, Flags, Tag, Base, Size,
 			   PCIIOC_MMAP_IS_MEM);
+    else
+	addr = mmap(NULL, Size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, Base);
 
-    addr = mmap(NULL, Size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, Base);
-    if (addr == MAP_FAILED) {
-	close (fd);
+    if (fd >= 0)
+	close(fd);
+    if (addr == NULL || addr == MAP_FAILED) {
 	perror("mmap failure");
 	FatalError("xf86MapDomainMem():  mmap() failure\n");
     }
-    close(fd);
     return addr;
 }
 

xserver-1.3.0-no-pseudocolor-composite.patch:
 compext.c |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+)

--- NEW FILE xserver-1.3.0-no-pseudocolor-composite.patch ---
diff --git a/composite/compext.c b/composite/compext.c
index 4c25cc7..af05b4a 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -678,6 +678,25 @@ CompositeExtensionInit (void)
     ExtensionEntry  *extEntry;
     int		    s;
 
+    for (s = 0; s < screenInfo.numScreens; s++) {
+	ScreenPtr pScreen = screenInfo.screens[s];
+	VisualPtr vis;
+
+	/* Composite on 8bpp pseudocolor root windows appears to fail, so
+	 * just disable it on anything pseudocolor for safety.
+	 */
+	for (vis = pScreen->visuals; vis->vid != pScreen->rootVisual; vis++)
+	    ;
+	if ((vis->class | DynamicClass) == PseudoColor)
+	    return;
+
+	/* Ensure that Render is initialized, which is required for automatic
+	 * compositing.
+	 */
+	if (GetPictureScreenIfSet(pScreen) == NULL)
+	    return;
+    }
+
     CompositeClientWindowType = CreateNewResourceType (FreeCompositeClientWindow);
     if (!CompositeClientWindowType)
 	return;

xserver-1.3.0-pci-bus-count.patch:
 Pci.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE xserver-1.3.0-pci-bus-count.patch ---
--- xorg-server-1.1.1/hw/xfree86/os-support/bus/Pci.c.jx	2007-02-12 11:08:52.000000000 -0500
+++ xorg-server-1.1.1/hw/xfree86/os-support/bus/Pci.c	2007-03-30 12:20:08.000000000 -0400
@@ -231,14 +231,14 @@
 int            pciMaxBusNum = MAX_PCI_BUSES;
 static Bool    inProbe = FALSE;
 
-static pciConfigPtr pci_devp[MAX_PCI_DEVICES + 1] = {NULL, };
+static pciConfigPtr *pci_devp = NULL;
 
 static int readPciBios( PCITAG Tag, CARD8* tmp, ADDRESS hostbase,
 			unsigned char * buf, int len, PciBiosType BiosType );
 
 static int (*pciOSHandleBIOS)(PCITAG Tag, int basereg, unsigned char *buf, int len);
 
-int xf86MaxPciDevs = MAX_PCI_DEVICES;
+int xf86MaxPciDevs = 0;
 
 /*
  * Platform specific PCI function pointers.
@@ -271,6 +271,11 @@
 	if (pciNumBuses <= 0)
 	    ARCH_PCI_OS_INIT();
 #endif
+	if (xf86MaxPciDevs == 0)
+	    xf86MaxPciDevs = MAX_PCI_DEVICES; /* XXX bogus */
+	if (pci_devp)
+	    xfree(pci_devp);
+	pci_devp = xnfcalloc(xf86MaxPciDevs + 1, sizeof(pciConfigPtr));
 }
 
 void pciSetOSBIOSPtr(int (*bios_fn)(PCITAG Tag, int basereg, unsigned char * buf, int len))
@@ -913,7 +918,7 @@
      * result in an endless recursion if platform/OS specific PCI
      * bus probing code calls this function from with in it.
      */
-    if (done || pci_devp[0])
+    if (done || pci_devp)
 	return pci_devp;
 
     done = TRUE;

xserver-1.3.0-rom-search.patch:
 linuxPci.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xserver-1.3.0-rom-search.patch ---
--- xorg-server-1.2.99.905/hw/xfree86/os-support/bus/linuxPci.c.jx	2007-04-09 16:15:43.000000000 -0400
+++ xorg-server-1.2.99.905/hw/xfree86/os-support/bus/linuxPci.c	2007-04-09 17:37:28.000000000 -0400
@@ -778,8 +778,8 @@
     bus  = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(Tag));
     dev  = PCI_DEV_FROM_TAG(Tag);
     func = PCI_FUNC_FROM_TAG(Tag);
-    sprintf(file, "/sys/devices/pci%04x:%02x/%04x:%02x:%02x.%1x/rom",
-	    dom, bus, dom, bus, dev, func);
+    sprintf(file, "/sys/bus/pci/devices/%04x:%02x:%02x.%1x/rom",
+	    dom, bus, dev, func);
 
     /*
      * If the caller wants the ROM and the sysfs rom interface exists,

xserver-1.3.0-xnest-exposures.patch:
 Events.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xserver-1.3.0-xnest-exposures.patch ---
--- xorg-server-1.2.99.905/hw/xnest/Events.c.jx	2007-01-31 19:55:51.000000000 -0500
+++ xorg-server-1.2.99.905/hw/xnest/Events.c	2007-04-09 18:42:51.000000000 -0400
@@ -85,7 +85,7 @@
   while (XCheckIfEvent(xnestDisplay, &X, xnestExposurePredicate, NULL)) {
     pWin = xnestWindowPtr(X.xexpose.window);
     
-    if (pWin) {
+    if (pWin && X.xexpose.width && X.xexpose.height) {
       Box.x1 = pWin->drawable.x + wBorderWidth(pWin) + X.xexpose.x;
       Box.y1 = pWin->drawable.y + wBorderWidth(pWin) + X.xexpose.y;
       Box.x2 = Box.x1 + X.xexpose.width;
@@ -93,7 +93,7 @@
       
       REGION_INIT(pWin->drawable.pScreen, &Rgn, &Box, 1);
       
-      miWindowExposures(pWin, &Rgn, NullRegion); 
+      miSendExposures(pWin, &Rgn, Box.x2, Box.y2);
     }
   }
 }


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- xorg-x11-server.spec	6 Apr 2007 18:07:34 -0000	1.216
+++ xorg-x11-server.spec	9 Apr 2007 23:09:52 -0000	1.217
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.2.99.905
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -28,7 +28,7 @@
 Patch12:   xorg-x11-server-1.1.1-graphics-expose.patch
 Patch15:   xorg-x11-server-1.1.1-automake-1.10-fixes.patch
 Patch18:   xorg-x11-server-1.1.1-glcore-visual-matching.patch
-Patch19:   xorg-x11-server-1.2.99-unbreak-domain.patch
+Patch19:   xserver-1.3.0-xnest-exposures.patch
 
 # OpenGL compositing manager feature/optimization patches.
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
@@ -36,6 +36,7 @@
 Patch105:  xorg-x11-server-1.2.0-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:  xserver-1.3.0-no-pseudocolor-composite.patch
 
 # Red Hat specific tweaking, not intended for upstream
 # XXX move these to the end of the list
@@ -55,6 +56,12 @@
 Patch2004:  xserver-1.2.0-honor-displaysize.patch
 Patch2005:  xserver-1.2.99.901-xephyr-crash-at-exit.patch
 
+# assorted PCI layer shenanigans.  oh the pain.
+Patch2500:  xorg-x11-server-1.2.99-unbreak-domain.patch
+Patch2501:  xserver-1.3.0-pci-bus-count.patch
+Patch2502:  xserver-1.3.0-mmap-failure-check.patch
+Patch2503:  xserver-1.3.0-rom-search.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -253,13 +260,14 @@
 %patch12 -p1 -b .graphics-expose
 %patch15 -p1 -b .automake-1.10
 %patch18 -p1 -b .glcore-visual
-%patch19 -p1 -b .unbreak-domains
+%patch19 -p1 -b .xnest-expose
 
 %patch100 -p0 -b .no-move-damage
 %patch101 -p0 -b .dont-backfill-bg-none
 %patch105 -p1 -b .enable-composite
 %patch106 -p1 -b .no-xnest-composite
 %patch107 -p1 -b .offscreen-pixmaps
+%patch108 -p1 -b .composite-paranoia
 
 %patch1001 -p1 -b .Red-Hat-extramodes
 %patch1002 -p1 -b .xephyr
@@ -277,9 +285,13 @@
 %patch2004 -p1 -b .displaysize
 %patch2005 -p1 -b .xephyr-crash
 
+%patch2500 -p1 -b .unbreak-domains
+%patch2501 -p1 -b .pci-bus-count
+%patch2502 -p1 -b .mmap-check
+%patch2503 -p1 -b .rom-search
+
 %build
 
-# --disable-dependency-tracking ?
 # --with-rgb-path should be superfluous now ?
 # --with-pie ?
 aclocal ; automake -a ; autoconf
@@ -323,14 +335,12 @@
 
 # Install the vesamodes and extramodes files to let our install/config tools
 # be able to parse the same modelist as the X server uses (rhpxl).
-{
-    mkdir -p $RPM_BUILD_ROOT%{_datadir}/xorg
-    for each in vesamodes extramodes ; do
-        install -m 0644 %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/xorg/$each
-        cat hw/xfree86/common/$each >> $RPM_BUILD_ROOT%{_datadir}/xorg/$each
-        chmod 0444 $RPM_BUILD_ROOT%{_datadir}/xorg/$each
-    done
-}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/xorg
+for each in vesamodes extramodes ; do
+    install -m 0644 %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/xorg/$each
+    cat hw/xfree86/common/$each >> $RPM_BUILD_ROOT%{_datadir}/xorg/$each
+    chmod 0444 $RPM_BUILD_ROOT%{_datadir}/xorg/$each
+done
 %endif
 
 # Make the source package
@@ -359,19 +369,18 @@
     rm -f $RPM_BUILD_ROOT%{_bindir}/out?
     rm -f $RPM_BUILD_ROOT%{_bindir}/pcitweak
     rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pcitweak.1*
-    # Remove all libtool archives (*.la)
     find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
 
 %ifarch s390 s390x
     # FIXME: The following files get installed on s390/s390x and we don't
     # want some of them on s390 at all, and others should be in a -common
     # subpackage, but it's not worth doing that for 3 files right now.
-#    error: Installed (but unpackaged) file(s) found:
-#	   /randrstr.h
-#	   /usr/lib/pkgconfig/xorg-server.pc
-#	      /usr/share/aclocal/xorg-server.m4
-#	      /usr/share/man/man1/Xserver.1x.gz
-#	      /var/lib/xkb/README.compiled
+    # error: Installed (but unpackaged) file(s) found:
+    #	   /randrstr.h
+    #	   /usr/lib/pkgconfig/xorg-server.pc
+    #	      /usr/share/aclocal/xorg-server.m4
+    #	      /usr/share/man/man1/Xserver.1x.gz
+    #	      /var/lib/xkb/README.compiled
 
     rm -f $RPM_BUILD_ROOT/randrstr.h
     rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
@@ -386,15 +395,7 @@
 %if %{with_hw_servers}
 %pre Xorg
 {
-  # Install/Upgrade section
   pushd /etc/X11
-  # Migrate any pre-existing XFree86 4.x config file to xorg.conf if it
-  # doesn't already exist, and rename any remaining XFree86 4.x config files
-  # to have .obsoleted file extensions, to help avoid end user confusion for
-  # people unaware of the config file name change between server
-  # implementations, and avoid bug reports.  If this turns out to confuse
-  # users, I can modify it to add comments to the top of the obsoleted files
-  # to point users to xorg.conf   <mharris at redhat.com>
   for configfile in XF86Config XF86Config-4 ; do
     if [ -r $configfile ]; then
       if [ -r xorg.conf ]; then
@@ -404,30 +405,14 @@
       fi
     fi
   done
-  # Massage pre-existing config files to work properly with X.org X11
-  # - Remove xie and pex5 modules from the config files, as they are long
-  #   since obsolete, and not provided since XFree86 4.2.0
-  # - Remove Option "XkbRules" "xfree86" to help work around upgrade problems
-  #   such as https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=120858
-#  for configfile in xorg.conf ; do
-    configfile="xorg.conf"
-    OLD_MODULEPATH="/usr/X11R6/lib/modules"
-    if [ -r $configfile -a -w $configfile ]; then
-      # Remove module load lines from the config file for obsolete modules
-      perl -p -i -e 's/^.*Load.*"(pex5|xie|xtt).*\n$"//gi' $configfile
-      # Change the keyboard configuration from the deprecated "keyboard"
-      # driver, to the newer "kbd" driver.
-      perl -p -i -e 's/^\s*Driver(.*)"keyboard"/Driver\1"kbd"/gi' $configfile
-      # Remove any Options "XkbRules" lines that may be present
-      perl -p -i -e 's/^.*Option.*"XkbRules".*"(xfree86|xorg)".*\n$//gi' $configfile
-      # Remove RgbPath specifications from the config file as they are
-      # unnecessary, and break upgrades from monolithic to modular X.
-      # Fixes bugs (#173036, 173435, 173453, 173428)
-      perl -p -i -e 's#^\s*RgbPath.*$##gi' $configfile
-      # If ModulePath is specified in the config file, delete it.
-      perl -p -i -e 's#^\s*ModulePath.*$##gi' $configfile
-    fi
-#  done
+  configfile="xorg.conf"
+  if [ -r xorg.conf -a -w xorg.conf ]; then
+    perl -p -i -e 's/^.*Load.*"(pex5|xie|xtt).*\n$"//gi' xorg.conf
+    perl -p -i -e 's/^\s*Driver(.*)"keyboard"/Driver\1"kbd"/gi' xorg.conf
+    perl -p -i -e 's/^.*Option.*"XkbRules".*"(xfree86|xorg)".*\n$//gi' xorg.conf
+    perl -p -i -e 's#^\s*RgbPath.*$##gi' xorg.conf
+    perl -p -i -e 's#^\s*ModulePath.*$##gi' xorg.conf
+  fi
   popd
 } &> /dev/null || :
 %endif
@@ -562,6 +547,19 @@
 
 
 %changelog
+* Mon Apr 09 2007 Adam Jackson <ajax at redhat.com> 1.2.99.905-2
+- xserver-1.3.0-pci-bus-count.patch: Allocate the PCI bus array dynamically,
+  so as not to run off the end of it.
+- xserver-1.3.0-mmap-failure-check.patch: Check for failure when mmap'ing
+  bus memory. (#234073)
+- xserver-1.3.0-rom-search.patch: Look for the sysfs ROM file in the (flat)
+  /sys/bus/pci/devices tree, instead of the (bus-topological) /sys/devices,
+  so we don't fail to find ROMs merely because they're behind a bridge.
+- xserver-1.3.0-no-pseudocolor-composite.patch: Refuse to initialize
+  Composite when Render is missing or when the root window is using
+  a pseudocolor visual. (#217388)
+- xserver-1.3.0-xnest-exposures.patch: Fix Motif app redraw in Xnest. (#229350)
+
 * Fri Apr 06 2007 Adam Jackson <ajax at redhat.com> 1.2.99.905-1
 - xserver 1.3 RC5.
 



From fedora-cvs-commits at redhat.com  Mon Apr  9 23:59:40 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 19:59:40 -0400
Subject: rpms/gnome-applets/devel gnome-applets-2.18.0-node-leak.patch, NONE,
	1.1 gnome-applets.spec, 1.217, 1.218
Message-ID: <200704092359.l39NxedZ006414@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-applets.spec 
Added Files:
	gnome-applets-2.18.0-node-leak.patch 
Log Message:
fix a leak in the keyboard indicator applet


gnome-applets-2.18.0-node-leak.patch:
 gswitchit-applet.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE gnome-applets-2.18.0-node-leak.patch ---
--- gnome-applets-2.18.0/gswitchit/gswitchit-applet.c.node-leak	2007-04-10 01:40:23.000000000 +0200
+++ gnome-applets-2.18.0/gswitchit/gswitchit-applet.c	2007-04-10 01:41:27.000000000 +0200
@@ -502,6 +502,7 @@
 		bonobo_ui_component_add_verb (popup, verb, (BonoboUIVerbFn)
 					      GSwitchItAppletCmdSetGroup,
 					      sia);
+		bonobo_ui_node_unref (node);
 		xkl_debug (160,
 			   "Registered group menu item \'%s\' as \'%s\'\n",
 			   verb, *currentName);


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- gnome-applets.spec	31 Mar 2007 22:40:40 -0000	1.217
+++ gnome-applets.spec	9 Apr 2007 23:59:38 -0000	1.218
@@ -33,7 +33,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.18.0
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -58,6 +58,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=424989
 Patch32:	gnome-applets-2.18.0-bug-buddy.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=428072
+Patch33:	gnome-applets-2.18.0-node-leak.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -141,6 +144,7 @@
 %patch30 -p1 -b .fix-null-applet
 %patch31 -p1 -b .fix-find
 %patch32 -p1 -b .bug-buddy
+%patch33 -p1 -b .node-leak
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
@@ -326,6 +330,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Tue Apr 10 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.18.0-7
+- Fix a leak in the keyboard indicator applet
+
 * Sat Mar 31 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.18.0-6
 - Fix the bug-buddy support of the accessx status applet
 



From fedora-cvs-commits at redhat.com  Tue Apr 10 03:16:55 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 23:16:55 -0400
Subject: rpms/evolution/devel evolution-2.10.1-fix-gnome-doc-utils.patch,
	NONE, 1.1 evolution.spec, 1.242, 1.243
Message-ID: <200704100316.l3A3GtuT010022@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.10.1-fix-gnome-doc-utils.patch 
Log Message:

* Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-1.fc7
- Update to 2.10.1
- Fix buggy gnome-doc-utils.make (GNOME bug #427939).
- Remove patch for CVE-2007-1002 (fixed upstream).
- Remove patch for RH bug #231767 (fixed upstream).
- Remove patch for RH bug #235056 (fixed upstream).
- Remove patch for GNOME bug #352713 (fixed upstream).


evolution-2.10.1-fix-gnome-doc-utils.patch:
 gnome-doc-utils.make |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE evolution-2.10.1-fix-gnome-doc-utils.patch ---
--- evolution-2.10.1/gnome-doc-utils.make.fix-gnome-doc-utils	2007-04-09 21:16:29.000000000 -0400
+++ evolution-2.10.1/gnome-doc-utils.make	2007-04-09 21:16:42.000000000 -0400
@@ -130,11 +130,9 @@
 _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
 _ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
 
-if ENABLE_SK
 _skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
 _sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
 _skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
-endif
 
 
 ################################################################################


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- evolution.spec	9 Apr 2007 18:09:26 -0000	1.242
+++ evolution.spec	10 Apr 2007 03:16:52 -0000	1.243
@@ -158,6 +158,9 @@
 # GNOME bug #418971
 Patch47: evolution-2.10.0-drop-old-glib-support.patch
 
+# GNOME bug #427939 (gnome-doc-utils)
+Patch48: evolution-2.10.1-fix-gnome-doc-utils.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -310,6 +313,7 @@
 %patch45 -p1 -b .shell-main-cleanups
 %patch46 -p1 -b .use-glib-i18n
 %patch47 -p1 -b .drop-old-glib-support
+%patch48 -p1 -b .fix-gnome-doc-utils
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -728,6 +732,7 @@
 %changelog
 * Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-1.fc7
 - Update to 2.10.1
+- Fix buggy gnome-doc-utils.make (GNOME bug #427939).
 - Remove patch for CVE-2007-1002 (fixed upstream).
 - Remove patch for RH bug #231767 (fixed upstream).
 - Remove patch for RH bug #235056 (fixed upstream).



From fedora-cvs-commits at redhat.com  Tue Apr 10 03:44:48 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 9 Apr 2007 23:44:48 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.399, 1.400 anaconda.spec, 1.529,
	1.530 sources, 1.524, 1.525
Message-ID: <200704100344.l3A3imI0021730@cvs.devel.redhat.com>

Author: katzj

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -r1.399 -r1.400
--- .cvsignore	5 Apr 2007 21:20:33 -0000	1.399
+++ .cvsignore	10 Apr 2007 03:44:46 -0000	1.400
@@ -1 +1 @@
-anaconda-11.2.0.46.tar.bz2
+anaconda-11.2.0.47.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.529
retrieving revision 1.530
diff -u -r1.529 -r1.530
--- anaconda.spec	8 Apr 2007 17:17:49 -0000	1.529
+++ anaconda.spec	10 Apr 2007 03:44:46 -0000	1.530
@@ -1,8 +1,8 @@
 %define livearches %{ix86} x86_64
 
 Name: anaconda
-Version: 11.2.0.46
-Release: 2
+Version: 11.2.0.47
+Release: 1
 License: GPL
 Summary: Graphical system installer
 Group: Applications/System
@@ -52,7 +52,6 @@
 %endif
 Obsoletes: anaconda-images <= 10
 Url: http://fedora.redhat.com/projects/anaconda-installer/
-ExcludeArch: s390 s390x
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -143,6 +142,10 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Mon Apr  9 2007 Jeremy Katz <katzj at redhat.com> - 11.2.0.47-1
+- Fix build on s390
+- Ensure we exit at the end of the install. 
+
 * Sun Apr  8 2007 Peter Jones <pjones at redhat.com> - 11.2.0.46-2
 - Rebuild because aparently the s390 build produced a corrupt package...
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.524
retrieving revision 1.525
diff -u -r1.524 -r1.525
--- sources	5 Apr 2007 21:20:33 -0000	1.524
+++ sources	10 Apr 2007 03:44:46 -0000	1.525
@@ -1 +1 @@
-a1c7779fce685f45f55bb34045611563  anaconda-11.2.0.46.tar.bz2
+920efbca835434d3fbdb96bef2c0f7d5  anaconda-11.2.0.47.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 10 10:14:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 06:14:21 -0400
Subject: rpms/shadow-utils/devel shadow-4.0.16-lOption.patch, 1.2,
	1.3 shadow-4.0.17-useradd.patch, 1.3, 1.4 shadow-utils.spec,
	1.99, 1.100
Message-ID: <200704101014.l3AAEL3W030155@cvs.devel.redhat.com>

Author: pvrabec

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

Modified Files:
	shadow-4.0.16-lOption.patch shadow-4.0.17-useradd.patch 
	shadow-utils.spec 
Log Message:
fix 235641: useradd dumps core when build without WITH_SELINUX


shadow-4.0.16-lOption.patch:
 man/useradd.8 |    3 +++
 src/useradd.c |    9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

Index: shadow-4.0.16-lOption.patch
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-4.0.16-lOption.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shadow-4.0.16-lOption.patch	3 Nov 2006 15:29:36 -0000	1.2
+++ shadow-4.0.16-lOption.patch	10 Apr 2007 10:14:19 -0000	1.3
@@ -16,7 +16,7 @@
      Gflg = 0,			/* secondary group set for new account */
      kflg = 0,			/* specify a directory to fill new user directory */
      mflg = 0,			/* create user's home directory if it doesn't exist */
-+    lflg = 0;      		/* do not add user to lastlog database file */
++    lflg = 0,      		/* do not add user to lastlog database file */
      Mflg = 0,                   /* do NOT create user's home directory no matter what */
      nflg = 0,                   /* do NOT create a group having the same name as the user */
      oflg = 0,			/* permit non-unique user ID to be specified with -u */

shadow-4.0.17-useradd.patch:
 lib/defines.h       |    3 +
 lib/prototypes.h    |    6 +++
 libmisc/Makefile.am |    1 
 libmisc/copydir.c   |    2 -
 libmisc/system.c    |   37 ++++++++++++++++++++++
 man/useradd.8       |    3 +
 man/useradd.8.xml   |   13 ++++++++
 man/usermod.8       |    4 ++
 man/usermod.8.xml   |   13 ++++++++
 src/useradd.c       |   75 ++++++++++++++++++++++++++++++++++++++++------
 src/userdel.c       |   11 ++++++
 src/usermod.c       |   84 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 12 files changed, 242 insertions(+), 10 deletions(-)

Index: shadow-4.0.17-useradd.patch
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-4.0.17-useradd.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- shadow-4.0.17-useradd.patch	28 Feb 2007 16:24:03 -0000	1.3
+++ shadow-4.0.17-useradd.patch	10 Apr 2007 10:14:19 -0000	1.4
@@ -213,7 +213,7 @@
 +#ifdef WITH_SELINUX
 +			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mlMnrop:s:u:Z:",
 +#else
-+			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mlMnrop:s:u",
++			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mlMnrop:s:u:",
 +#endif
  				     long_options, NULL)) != -1) {
  			switch (c) {


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- shadow-utils.spec	26 Mar 2007 15:07:41 -0000	1.99
+++ shadow-utils.spec	10 Apr 2007 10:14:19 -0000	1.100
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.0.18.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 Epoch: 2
 URL: http://shadow.pld.org.pl/
 Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2
@@ -223,6 +223,9 @@
 %{_mandir}/*/man8/faillog.8*
 
 %changelog
+* Tue Apr 10 2007 Peter Vrabec <pvrabec at redhat.com> 2:4.0.18.1-13
+- fix useradd dump core when build without WITH_SELINUX (#235641)
+
 * Mon Mar 26 2007 Peter Vrabec <pvrabec at redhat.com> 2:4.0.18.1-12
 - create user's mailbox file by default (#231311)
 



From fedora-cvs-commits at redhat.com  Tue Apr 10 10:49:06 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 06:49:06 -0400
Subject: rpms/logwatch/devel logwatch-7.3.4-secure.patch, 1.1,
	1.2 logwatch.spec, 1.65, 1.66
Message-ID: <200704101049.l3AAn6Jt023776@cvs.devel.redhat.com>

Author: varekova

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

Modified Files:
	logwatch-7.3.4-secure.patch logwatch.spec 
Log Message:
- logwatch will ignore more useless secure logs


logwatch-7.3.4-secure.patch:
 secure |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

Index: logwatch-7.3.4-secure.patch
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/logwatch-7.3.4-secure.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logwatch-7.3.4-secure.patch	2 Apr 2007 14:04:04 -0000	1.1
+++ logwatch-7.3.4-secure.patch	10 Apr 2007 10:49:04 -0000	1.2
@@ -7,7 +7,7 @@
 -      ( $ThisLine =~ /logfile turned over/) # newsyslog on OpenBSD
 +      ( $ThisLine =~ /logfile turned over/) or # newsyslog on OpenBSD
 +      ( $ThisLine =~ /Connection closed by/) or
-+      ( $ThisLine =~ /sshd: Accepted \S+ for \S+ from [\d\.:a-f]+ port \d+/) # ssh script reads this log
++      ( $ThisLine =~ /sshd.*: Accepted \S+ for \S+ from [\d\.:a-f]+ port \d+/) # ssh script reads this log
     ) {
        # Ignore these entries
     } elsif ($ThisLine =~ /^spop3d/ || $ThisLine =~ /^pop\(\w+\)\[\d+\]:/) {


Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- logwatch.spec	4 Apr 2007 08:16:53 -0000	1.65
+++ logwatch.spec	10 Apr 2007 10:49:04 -0000	1.66
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -142,6 +142,9 @@
 %doc License project/CHANGES 
 
 %changelog
+* Tue Apr 10 2007 Ivana Varekova <varekova at redhat.com> 7.3.4-5
+- logwatch will ignore more useless secure logs
+
 * Wed Apr  4 2007 Ivana Varekova <varekova at redhat.com> 7.3.4-4
 - Resolves 234875
   logwatch warns about ntpd startup messages



From fedora-cvs-commits at redhat.com  Tue Apr 10 10:53:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 06:53:01 -0400
Subject: rpms/cups/devel cups.spec,1.326,1.327
Message-ID: <200704101053.l3AAr1PH026574@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
* Tue Apr 10 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-6
- Fixed 'cancel' man page (bug #234088).
- Added empty subscriptions.conf file to make sure it gets the right
  SELinux file context.
- Resolves: rhbz#234088



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- cups.spec	4 Apr 2007 16:56:58 -0000	1.326
+++ cups.spec	10 Apr 2007 10:52:58 -0000	1.327
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.10
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -205,8 +205,6 @@
 for i in lp lpq lpr lprm lpstat; do
 	mv $i.1 $i-cups.1
 done
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/cancel.1
-ln -s lp-cups.1 $RPM_BUILD_ROOT%{_mandir}/man1/cancel-cups.1
 cd $RPM_BUILD_ROOT%{_mandir}/man8
 mv lpc.8 lpc-cups.8
 popd
@@ -271,6 +269,7 @@
 touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/printers.conf
 touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/classes.conf
 touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/client.conf
+touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/subscriptions.conf
 
 # This is %%ghost'ed, but needs to be created in %%install anyway.
 touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/lpoptions
@@ -357,6 +356,7 @@
 %config(noreplace) %attr(0600,root,lp) /etc/cups/printers.conf
 %config(noreplace) %attr(0644,root,lp) /etc/cups/pdftops.conf
 %config(noreplace) %attr(0644,root,lp) /etc/cups/snmp.conf
+%config(noreplace) %attr(0644,root,lp) /etc/cups/subscriptions.conf
 /etc/cups/interfaces
 %config(noreplace) /etc/cups/mime.types
 %config(noreplace) /etc/cups/mime.convs
@@ -440,6 +440,11 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Apr 10 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-6
+- Fixed 'cancel' man page (bug #234088).
+- Added empty subscriptions.conf file to make sure it gets the right
+  SELinux file context.
+
 * Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-5
 - Send D-BUS QueueChanged signal on printer state changes.
 



From fedora-cvs-commits at redhat.com  Tue Apr 10 10:57:06 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 06:57:06 -0400
Subject: rpms/hwdata/devel .cvsignore, 1.83, 1.84 hwdata.spec, 1.85,
	1.86 sources, 1.86, 1.87
Message-ID: <200704101057.l3AAv6ha029702@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/hwdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29639/devel

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/.cvsignore,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- .cvsignore	14 Mar 2007 13:00:28 -0000	1.83
+++ .cvsignore	10 Apr 2007 10:57:03 -0000	1.84
@@ -1 +1 @@
-hwdata-0.199.tar.gz
+hwdata-0.200.tar.gz


Index: hwdata.spec
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/hwdata.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- hwdata.spec	14 Mar 2007 13:00:28 -0000	1.85
+++ hwdata.spec	10 Apr 2007 10:57:03 -0000	1.86
@@ -1,6 +1,6 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.199
+Version: 0.200
 Release: 1%{?dist}
 License: GPL/MIT
 Group: System Environment/Base
@@ -28,11 +28,15 @@
 %files
 %defattr(-,root,root)
 %doc LICENSE COPYING
-%dir /usr/share/hwdata
-%config(noreplace) /etc/modprobe.d/blacklist
-/usr/share/hwdata/*
+%dir %{_datadir}/%{name}
+%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist
+%{_datadir}/%{name}/*
 
 %changelog
+* Tue Apr 10 2007 Karsten Hopp <karsten at redhat.com> 0.200-1
+- use macros
+- update pci.ids
+
 * Mon Mar 12 2007 Karsten Hopp <karsten at redhat.com> 0.199-1
 - drop %%config from data files in /usr
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/sources,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- sources	14 Mar 2007 13:00:28 -0000	1.86
+++ sources	10 Apr 2007 10:57:03 -0000	1.87
@@ -1 +1 @@
-0054faa13518b503d3fd4f1ebd076d7d  hwdata-0.199.tar.gz
+0518c7071d95f8047ca2539a9da208f6  hwdata-0.200.tar.gz



From fedora-cvs-commits at redhat.com  Tue Apr 10 11:22:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 07:22:43 -0400
Subject: rpms/gnome-screensaver/devel
	gnome-screensaver-2.18.0-standard-flexi-server.patch, NONE,
	1.1 gnome-screensaver.spec, 1.146, 1.147
Message-ID: <200704101122.l3ABMhhC015665@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-screensaver.spec 
Added Files:
	gnome-screensaver-2.18.0-standard-flexi-server.patch 
Log Message:
Improve robustness of fast user switching


gnome-screensaver-2.18.0-standard-flexi-server.patch:
 gs-lock-plug.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-screensaver-2.18.0-standard-flexi-server.patch ---
--- gnome-screensaver-2.18.0/src/gs-lock-plug.c.standard-flexi-server	2007-04-10 13:12:31.000000000 +0200
+++ gnome-screensaver-2.18.0/src/gs-lock-plug.c	2007-04-10 13:12:41.000000000 +0200
@@ -50,7 +50,7 @@
 
 #define KEY_LOCK_DIALOG_THEME "/apps/gnome-screensaver/lock_dialog_theme"
 #define GDM_FLEXISERVER_COMMAND "gdmflexiserver"
-#define GDM_FLEXISERVER_ARGS    "--startnew"
+#define GDM_FLEXISERVER_ARGS    "--startnew Standard"
 
 enum {
         AUTH_PAGE = 0,


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- gnome-screensaver.spec	2 Apr 2007 23:34:07 -0000	1.146
+++ gnome-screensaver.spec	10 Apr 2007 11:22:40 -0000	1.147
@@ -13,7 +13,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.18.0
-Release: 6%{?dist} 
+Release: 7%{?dist} 
 License: GPL
 Group: Amusements/Graphics
 Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/2.18/%{name}-%{version}.tar.bz2
@@ -26,6 +26,8 @@
 Patch4: gnome-screensaver-2.18.0-require-mouse-grab.patch
 # fixed in upstream trunk
 Patch5: gnome-screensaver-2.18.0-power-preferences.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=428199
+Patch6: gnome-screensaver-2.18.0-standard-flexi-server.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 URL: http://www.gnome.org
@@ -72,6 +74,7 @@
 %patch3 -p1 -b .user-dirs
 %patch4 -p1 -b .require-mouse-grab
 %patch5 -p1 -b .power-preferences
+%patch6 -p1 -b .standard-flexi-server
 
 %build
 autoreconf
@@ -128,6 +131,10 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Tue Apr 10 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-7
+- Make fast-user-switching work with gdm configurations
+  involving multiple X servers
+
 * Mon Apr  2 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-6
 - Hide Power Preferences button if gnome-power-manager 
   is not installed



From fedora-cvs-commits at redhat.com  Tue Apr 10 11:22:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 07:22:43 -0400
Subject: rpms/alsa-utils/devel alsa-utils.spec, 1.49, 1.50 alsaunmute.c, 1.11,
	1.12
Message-ID: <200704101122.l3ABMhsh015661@cvs.devel.redhat.com>

Author: stransky

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

Modified Files:
	alsa-utils.spec alsaunmute.c 
Log Message:
added support for large files, minor fix in alsaunmute, fixed #209239 - alsaconf: Stale language-dependent files


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- alsa-utils.spec	19 Jan 2007 13:07:15 -0000	1.49
+++ alsa-utils.spec	10 Apr 2007 11:22:40 -0000	1.50
@@ -4,7 +4,7 @@
 Summary: 	Advanced Linux Sound Architecture (ALSA) utilities
 Name: 		alsa-utils
 Version: 	1.0.14
-Release: 	0.3%{?prever_dot}%{?dist}
+Release: 	0.4%{?prever_dot}%{?dist}
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -13,6 +13,7 @@
 Source3: 	alsacard.c
 Source4: 	alsaunmute.c
 Source10:	alsa.rules
+Patch:		alsa-utils-1.0.14-alsaconf.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	alsa-lib-devel >= %{version}
 BuildRequires:	ncurses-devel
@@ -25,9 +26,10 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
+%patch -p1
 
 %build
-%configure CFLAGS="$RPM_OPT_FLAGS" --sbindir=/sbin 
+%configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --sbindir=/sbin
 %{__make} %{?_smp_mflags}
 %{__cc} $RPM_OPT_FLAGS -o salsa %{SOURCE2} -lasound
 %{__cc} $RPM_OPT_FLAGS -o alsacard %{SOURCE3} -lasound
@@ -36,9 +38,6 @@
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 make install DESTDIR=$RPM_BUILD_ROOT
-%find_lang alsaconf
-%{__rm} -f $RPM_BUILD_ROOT/sbin/alsaconf \
-	$RPM_BUILD_ROOT%{_mandir}/man*/alsaconf*
 
 mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
 ln -s ../../sbin/alsactl $RPM_BUILD_ROOT/%{_sbindir}/alsactl
@@ -53,7 +52,7 @@
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-%files -f alsaconf.lang
+%files
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README TODO
 /etc/udev/rules.d/*
@@ -62,12 +61,16 @@
 %{_sbindir}/*
 /sbin/*
 %{_mandir}/man?/*
-%{_mandir}/fr/man?/*
 /usr/share/sounds/alsa/*
 /usr/share/alsa/speaker-test/*
 /usr/share/locale/*
 
 %changelog
+* Thu Apr 10 2007 Martin Stransky <stransky at redhat.com> 1.0.14-0.4.rc2
+- added support for large files
+- minor fix in alsaunmute
+- fixed #209239 - alsaconf: Stale language-dependent files
+
 * Fri Jan 19 2007 Martin Stransky <stransky at redhat.com> 1.0.14-0.3.rc2
 - new upstream
 


Index: alsaunmute.c
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/alsaunmute.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- alsaunmute.c	10 Jan 2007 10:24:44 -0000	1.11
+++ alsaunmute.c	10 Apr 2007 11:22:40 -0000	1.12
@@ -290,7 +290,7 @@
   printf("Usage: alsaunmute card_number [-v] [-s volume]\n\n");
   printf("  card_number       - number of unmuted card\n");
   printf("  [-v]              - verbose mode\n");
-  printf("  [-s volume]       - set this volume level instead of the default (75%)\n");
+  printf("  [-s volume]       - set this volume level instead of the default (75%%)\n");
   printf("                      the volume is number from 0 to 100\n\n");
   exit(0);
 }



From fedora-cvs-commits at redhat.com  Tue Apr 10 11:23:28 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 07:23:28 -0400
Subject: rpms/alsa-utils/devel alsa-utils-1.0.14-alsaconf.patch,NONE,1.1
Message-ID: <200704101123.l3ABNS4C016266@cvs.devel.redhat.com>

Author: stransky

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

Added Files:
	alsa-utils-1.0.14-alsaconf.patch 
Log Message:
a patch for previous commit

alsa-utils-1.0.14-alsaconf.patch:
 Makefile.am |    2 +-
 Makefile.in |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE alsa-utils-1.0.14-alsaconf.patch ---
--- alsa-utils-1.0.14rc2/Makefile.in.old	2007-01-15 14:49:50.000000000 +0100
+++ alsa-utils-1.0.14rc2/Makefile.in	2007-04-10 13:12:12.000000000 +0200
@@ -65,7 +65,7 @@
 	uninstall-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = include alsactl alsaconf alsamixer amidi amixer aplay \
+DIST_SUBDIRS = include alsactl alsamixer amidi amixer aplay \
 	iecset seq speaker-test utils m4 po
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -185,7 +185,7 @@
 INCLUDES = -I$(top_srcdir)/include
 @ALSAMIXER_FALSE at ALSAMIXER_DIR = 
 @ALSAMIXER_TRUE at ALSAMIXER_DIR = alsamixer
-SUBDIRS = include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po
+SUBDIRS = include alsactl $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po
 EXTRA_DIST = config.rpath mkinstalldirs  config.rpath mkinstalldirs ChangeLog INSTALL TODO README configure hgcompile depcomp
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4
--- alsa-utils-1.0.14rc2/Makefile.am.old	2007-01-15 14:48:22.000000000 +0100
+++ alsa-utils-1.0.14rc2/Makefile.am	2007-04-10 13:11:51.000000000 +0200
@@ -4,7 +4,7 @@
 else
 ALSAMIXER_DIR=
 endif
-SUBDIRS= include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po
+SUBDIRS= include alsactl $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po
 EXTRA_DIST= config.rpath mkinstalldirs  config.rpath mkinstalldirs ChangeLog INSTALL TODO README configure hgcompile depcomp
 AUTOMAKE_OPTIONS=foreign
 ACLOCAL_AMFLAGS = -I m4



From fedora-cvs-commits at redhat.com  Tue Apr 10 11:52:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 07:52:43 -0400
Subject: rpms/libbonobo/devel libbonobo-2.18.0-env-leak.patch, NONE,
	1.1 libbonobo.spec, 1.53, 1.54
Message-ID: <200704101152.l3ABqhhh021654@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libbonobo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21638

Modified Files:
	libbonobo.spec 
Added Files:
	libbonobo-2.18.0-env-leak.patch 
Log Message:
Plug a small memory leak


libbonobo-2.18.0-env-leak.patch:
 bonobo-activation-activate.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE libbonobo-2.18.0-env-leak.patch ---
--- libbonobo-2.18.0/bonobo-activation/bonobo-activation-activate.c.env-leak	2007-04-09 21:07:53.000000000 +0200
+++ libbonobo-2.18.0/bonobo-activation/bonobo-activation-activate.c	2007-04-09 21:08:27.000000000 +0200
@@ -817,8 +817,7 @@
 	activation_environment._release = TRUE;
 
 	for (i = 0; i < activation_environment._length - 1; i++)
-		Bonobo_ActivationEnvValue_copy (
-			&activation_environment._buffer [i], &old_buffer [i]);
+		activation_environment._buffer[i] = old_buffer[i];
 
 	Bonobo_ActivationEnvValue_set (&activation_environment._buffer [i], name, value);
 


Index: libbonobo.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- libbonobo.spec	13 Mar 2007 17:19:16 -0000	1.53
+++ libbonobo.spec	10 Apr 2007 11:52:41 -0000	1.54
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.18.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://ftp.gnome.org
 Source0: http://ftp.gnome.org/pub/gnome/sources/libbonobo/2.18/%{name}-%{version}.tar.bz2
 License: LGPL
@@ -24,6 +24,8 @@
 Provides: bonobo-activation = %{version}-%{release}
 
 Patch0: libbonobo-2.13.1-multishlib.patch
+# fixed in upstream svn
+Patch1: libbonobo-2.18.0-env-leak.patch
 
 %description
 Bonobo is a component system based on CORBA, used by the GNOME desktop.
@@ -55,6 +57,7 @@
 %patch0 -p1 -b .multishlib
 %endif
 
+%patch1 -p1 -b .env-leak
 
 %build
 intltoolize -f
@@ -120,6 +123,9 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Mon Apr  9 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-2
+- Don't leak strings from the bonobo activation environment
+
 * Tue Mar 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-1
 - Update to 2.18.0
 



From fedora-cvs-commits at redhat.com  Tue Apr 10 11:58:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 07:58:21 -0400
Subject: rpms/alsa-utils/devel alsa-utils.spec,1.50,1.51
Message-ID: <200704101158.l3ABwL32021791@cvs.devel.redhat.com>

Author: stransky

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

Modified Files:
	alsa-utils.spec 
Log Message:
fixed #233765 - alsa-utils : unowned directories


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- alsa-utils.spec	10 Apr 2007 11:22:40 -0000	1.50
+++ alsa-utils.spec	10 Apr 2007 11:58:19 -0000	1.51
@@ -61,8 +61,12 @@
 %{_sbindir}/*
 /sbin/*
 %{_mandir}/man?/*
-/usr/share/sounds/alsa/*
-/usr/share/alsa/speaker-test/*
+%dir %{_datadir}/sounds
+%dir %{_datadir}/sounds/alsa
+%{_datadir}/sounds/alsa/*
+%dir %{_datadir}/alsa
+%dir %{_datadir}/alsa/speaker-test
+%{_datadir}/alsa/speaker-test/*
 /usr/share/locale/*
 
 %changelog
@@ -70,6 +74,7 @@
 - added support for large files
 - minor fix in alsaunmute
 - fixed #209239 - alsaconf: Stale language-dependent files
+- fixed #233765 - alsa-utils : unowned directories
 
 * Fri Jan 19 2007 Martin Stransky <stransky at redhat.com> 1.0.14-0.3.rc2
 - new upstream



From fedora-cvs-commits at redhat.com  Tue Apr 10 12:25:16 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 08:25:16 -0400
Subject: rpms/epiphany/devel .cvsignore, 1.55, 1.56 epiphany.spec, 1.141,
	1.142 sources, 1.56, 1.57
Message-ID: <200704101225.l3ACPGP2022251@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
* Tue Apr 10 2007 Christopher Aillon <caillon at redhat.com> 2.18.1-1
- Update to 2.18.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	13 Mar 2007 17:43:20 -0000	1.55
+++ .cvsignore	10 Apr 2007 12:25:14 -0000	1.56
@@ -1 +1 @@
-epiphany-2.18.0.tar.bz2
+epiphany-2.18.1.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- epiphany.spec	23 Mar 2007 15:46:37 -0000	1.141
+++ epiphany.spec	10 Apr 2007 12:25:14 -0000	1.142
@@ -8,8 +8,8 @@
 
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
-Version: 2.18.0
-Release: 3%{?dist}
+Version: 2.18.1
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -185,6 +185,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Tue Apr 10 2007 Christopher Aillon <caillon at redhat.com> 2.18.1-1
+- Update to 2.18.1
+
 * Fri Mar 23 2007 Christopher Aillon <caillon at redhat.com> 2.18.0-3
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	13 Mar 2007 17:43:20 -0000	1.56
+++ sources	10 Apr 2007 12:25:14 -0000	1.57
@@ -1 +1 @@
-3ac47fcf7e9875885c3f4d53dac24b7c  epiphany-2.18.0.tar.bz2
+680a14ee43637728c94bcdf02ef16a4a  epiphany-2.18.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 10 12:29:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 08:29:21 -0400
Subject: rpms/alsa-lib/devel alsa-lib.spec,1.52,1.53
Message-ID: <200704101229.l3ACTL7S022363@cvs.devel.redhat.com>

Author: stransky

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

Modified Files:
	alsa-lib.spec 
Log Message:
added fix for #233764 - unowned directories


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- alsa-lib.spec	8 Mar 2007 11:31:12 -0000	1.52
+++ alsa-lib.spec	10 Apr 2007 12:29:19 -0000	1.53
@@ -5,7 +5,7 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name:    alsa-lib
 Version: %{version_main}
-Release: 0.3%{?prever_dot}%{?dist}
+Release: 0.4%{?prever_dot}%{?dist}
 License: LGPL
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}.tar.bz2
@@ -88,8 +88,13 @@
 %exclude %{_libdir}/libasound.la
 %{_libdir}/pkgconfig/alsa.pc
 %{_datadir}/aclocal/alsa.m4
+%dir %{_libdir}/alsa-lib
+%dir %{_libdir}/alsa-lib/smixer
 
 %changelog
+* Tue Apr 10 2007 Martin Stransky <stransky at redhat.com> 1.0.14-0.4.rc3
+- added fix for #233764 - unowned directories
+
 * Thu Mar 8  2007 Martin Stransky <stransky at redhat.com> 1.0.14-0.3.rc3
 - new upstream
 



From fedora-cvs-commits at redhat.com  Tue Apr 10 12:42:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 08:42:50 -0400
Subject: rpms/kernel-xen-2.6/devel git-iwlwifi-fixes.patch, NONE,
 1.1.2.1 git-iwlwifi.patch, NONE, 1.1.2.1 git-wireless-dev.patch, NONE,
 1.1.2.1 linux-2.6-ata-quirk.patch, NONE,
 1.1.2.1 linux-2.6-crap-sysfs-workaround.patch, NONE,
 1.1.2.1 linux-2.6-debug-extra-warnings.patch, NONE,
 1.1.2.1 linux-2.6-defaults-pci_no_msi_mmconf.patch, NONE,
 1.1.2.1 linux-2.6-dvb-spinlock.patch, NONE,
 1.1.2.1 linux-2.6-firewire-check-condition.patch, NONE,
 1.1.2.1 linux-2.6-firewire-context-run.patch, NONE,
 1.1.2.1 linux-2.6-fix-pmops-1.patch, NONE,
 1.1.2.1 linux-2.6-fix-pmops-2.patch, NONE,
 1.1.2.1 linux-2.6-fix-pmops-3.patch, NONE,
 1.1.2.1 linux-2.6-fix-pmops-4.patch, NONE,
 1.1.2.1 linux-2.6-i82875-edac-pci-setup.patch, NONE,
 1.1.2.1 linux-2.6-mpc52xx-fec.patch, NONE,
 1.1.2.1 linux-2.6-mpc52xx-sdma.patch, NONE,
 1.1.2.1 linux-2.6-ondemand-timer.patch, NONE,
 1.1.2.1 linux-2.6-pmac-zilog.patch, NONE,
 1.1.2.1 linux-2.6-powermac-generic-suspend-1.patch, NONE,
 1.1.2.1 linux-2.6-powermac-generic-suspend-2.patch, NONE,
 1.1.2.1 linux-2.6-powe! rmac-generic-suspend-3.patch, NONE,
 1.1.2.1 linux-2.6-powermac-generic-suspend-4.patch, NONE,
 1.1.2.1 linux-2.6-ps3-device-init.patch, NONE,
 1.1.2.1 linux-2.6-ps3-ethernet-autoload.patch, NONE,
 1.1.2.1 linux-2.6-ps3-ethernet-modular.patch, NONE,
 1.1.2.1 linux-2.6-ps3-ethernet.patch, NONE,
 1.1.2.1 linux-2.6-ps3-exports.patch, NONE,
 1.1.2.1 linux-2.6-ps3-fix-slowdown-bug.patch, NONE,
 1.1.2.1 linux-2.6-ps3-legacy-ioport.patch, NONE,
 1.1.2.1 linux-2.6-ps3-memory-probe.patch, NONE,
 1.1.2.1 linux-2.6-ps3-replace-irq-alloc-free.patch, NONE,
 1.1.2.1 linux-2.6-ps3-sound.patch, NONE,
 1.1.2.1 linux-2.6-ps3-stable-patches.patch, NONE,
 1.1.2.1 linux-2.6-ps3-storage.patch, NONE,
 1.1.2.1 linux-2.6-ps3av-export-header.patch, NONE,
 1.1.2.1 linux-2.6-ps3fb-panic.patch, NONE,
 1.1.2.1 linux-2.6-rt2x00-scan-fix.patch, NONE,
 1.1.2.1 linux-2.6-uevent-ps3.patch, NONE,
 1.1.2.1 linux-2.6-warnings-inline.patch, NONE,
 1.1.2.1 linux-2.6-xen-blktap-cleanup.patch, NONE,
 1.1.2.1 linux-2.6-xen-blktap-dynamic-major.patch, NONE,
 1.1.2.1 linux-2.6-xe!
 n-blktap-fixes.patch,NONE,1.1.2.1 linux-2.6-xen-blktap-sysfs.p!
 atch,NON
Message-ID: <200704101242.l3ACgowt011330@cvs.devel.redhat.com>

Author: ehabkost

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

Modified Files:
      Tag: private-ehabkost-2_6_21-branch
	kernel-xen.spec linux-2.6-compile-fixes.patch 
	linux-2.6-debug-no-quiet.patch 
	linux-2.6-debug-sizeof-structs.patch 
	linux-2.6-debug-sleep-in-irq-warning.patch 
	linux-2.6-debug-sysfs-crash-debugging-xen.patch 
	linux-2.6-debug-sysfs-crash-debugging.patch 
	linux-2.6-debug-taint-vm.patch linux-2.6-devmem.patch 
	linux-2.6-execshield.patch linux-2.6-firewire.patch 
	linux-2.6-modsign-core.patch linux-2.6-modsign-crypto.patch 
	linux-2.6-modsign-include.patch linux-2.6-modsign-ksign.patch 
	linux-2.6-modsign-mpilib.patch linux-2.6-modsign-script.patch 
	linux-2.6-silence-noise.patch linux-2.6-squashfs.patch 
	linux-2.6-utrace.patch linux-2.6-xen-execshield.patch 
	linux-2.6-xen.patch sources 
Added Files:
      Tag: private-ehabkost-2_6_21-branch
	git-iwlwifi-fixes.patch git-iwlwifi.patch 
	git-wireless-dev.patch linux-2.6-ata-quirk.patch 
	linux-2.6-crap-sysfs-workaround.patch 
	linux-2.6-debug-extra-warnings.patch 
	linux-2.6-defaults-pci_no_msi_mmconf.patch 
	linux-2.6-dvb-spinlock.patch 
	linux-2.6-firewire-check-condition.patch 
	linux-2.6-firewire-context-run.patch 
	linux-2.6-fix-pmops-1.patch linux-2.6-fix-pmops-2.patch 
	linux-2.6-fix-pmops-3.patch linux-2.6-fix-pmops-4.patch 
	linux-2.6-i82875-edac-pci-setup.patch 
	linux-2.6-mpc52xx-fec.patch linux-2.6-mpc52xx-sdma.patch 
	linux-2.6-ondemand-timer.patch linux-2.6-pmac-zilog.patch 
	linux-2.6-powermac-generic-suspend-1.patch 
	linux-2.6-powermac-generic-suspend-2.patch 
	linux-2.6-powermac-generic-suspend-3.patch 
	linux-2.6-powermac-generic-suspend-4.patch 
	linux-2.6-ps3-device-init.patch 
	linux-2.6-ps3-ethernet-autoload.patch 
	linux-2.6-ps3-ethernet-modular.patch 
	linux-2.6-ps3-ethernet.patch linux-2.6-ps3-exports.patch 
	linux-2.6-ps3-fix-slowdown-bug.patch 
	linux-2.6-ps3-legacy-ioport.patch 
	linux-2.6-ps3-memory-probe.patch 
	linux-2.6-ps3-replace-irq-alloc-free.patch 
	linux-2.6-ps3-sound.patch linux-2.6-ps3-stable-patches.patch 
	linux-2.6-ps3-storage.patch 
	linux-2.6-ps3av-export-header.patch 
	linux-2.6-ps3fb-panic.patch linux-2.6-rt2x00-scan-fix.patch 
	linux-2.6-uevent-ps3.patch linux-2.6-warnings-inline.patch 
	linux-2.6-xen-blktap-cleanup.patch 
	linux-2.6-xen-blktap-dynamic-major.patch 
	linux-2.6-xen-blktap-fixes.patch 
	linux-2.6-xen-blktap-sysfs.patch 
	linux-2.6-xen-execshield-lazy-exec-limit.patch 
	linux-2.6-xen-pvfb.patch 
	linux-2.6-xen-x86_64-add-ppoll-pselect.patch nouveau-drm.patch 
Log Message:
Importing all patches from rawhide kernel

The patches are not applying cleanly yet. They will be updated on a
further commit, after the 2.6.21 xen patch is integrated.

Patches not related to xen that are not on rawhide were removed.



git-iwlwifi-fixes.patch:
 base.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE git-iwlwifi-fixes.patch ---
--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig	2007-03-22 14:13:12.000000000 -0400
+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-03-22 14:13:23.000000000 -0400
@@ -12377,6 +12377,7 @@ static int ipw_pci_probe(struct pci_dev 
 	err = ipw_read_ucode(priv);
 	if (err) {
 		IPW_ERROR("Could not read microcode from disk: %d\n", err);
+		mutex_unlock(&priv->mutex);
 		goto out_remove_sysfs;
 	}
 

git-iwlwifi.patch:
 Kconfig              |    1 
 Makefile             |    1 
 iwlwifi/Kconfig      |   52 
 iwlwifi/Makefile     |    2 
 iwlwifi/base.c       |13753 +++++++++++++++++++++++++++++++++++++++++++++++++++
 iwlwifi/iwlwifi.h    | 1297 ++++
 iwlwifi/iwlwifi_hw.h | 1877 ++++++
 7 files changed, 16983 insertions(+)

--- NEW FILE git-iwlwifi.patch ---
--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig	2007-03-22 15:13:39.000000000 -0400
+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-03-22 15:14:05.000000000 -0400
@@ -0,0 +1,13753 @@
+/******************************************************************************
+
+  Copyright(c) 2003 - 2006 Intel Corporation. All rights reserved.
+
+  Portions of this file are derived from the ipw3945 project, as well
+  as portions of the ieee80211 subsystem header files.
+
+  802.11 status code portion of this file from ethereal-0.10.6:
+    Copyright 2000, Axis Communications AB
+    Ethereal - Network traffic analyzer
+    By Gerald Combs <gerald at ethereal.com>
+    Copyright 1998 Gerald Combs
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of version 2 of the GNU General Public License as
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+
+  Contact Information:
+  James P. Ketrenos <ipw2100-admin at linux.intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+******************************************************************************/
+
+/*
+ * Theory of operation:
+ *
+ * The primary NIC mode of operation is configured within the RXON command.
+ * As such, there are two instances of RXON data -- staging_rxon and
+ * active_rxon.  The former is used to configure the device, the later to
+ * reflect the actual currently active configuration.
+ *
+ * After configuring staging_rxon, it is activated by calling
+ * ipw_commit_rxon(). The ipw_commit_rxon() will ensure the correct sequence
+ * of commands are invoked on the hardware to result in Tx being possible
+ * (if the channel is appropriate for Tx)
+ *
+ * About the threading and lock model of the driver...
+ *
+ * There are three paths of execution through the driver.
+ *
+ * 1.  ioctl based (wireless extensions, netdev, etc.)
+ * 2.  interrupt based
+ * 3.  scheduled work queue items
+ *
+ * As soon as an interrupt comes in, it schedules a tasklet.  That tasklet,
+ * when run, does any HW checks, pulls any data from the read queue,
+ * and schedules other layers to do the actual work.
+ *
+ * NOTE: This driver is a work in progress.  It is currently structured
+ * in a way that we can add support for the next wireless adapter
+ * available from Intel.
+ *
+ * Our current focus is as follows:
+ * 1.  Get the driver working w/ mac80211 in STA(client) mode.
+ * 2.  Clean up the dual-driver code from function redirection to
+ *     if/else switches where the code detlas are minimal.
+ * 3.  Evaluate the amount of delta between the hardware versions and
+ *     possibly split iwlwifi into multiple drivers for each piece of
+ *     HW, sharing as much base code as possible (would result in
+ *     multiple driver files on disk vs. a single module that works
+ *     with multiple hardware types)
+ * 4.  Document the uCode regulatory enforcement
+ * 5.  Document the rate scaling capabilities of the 3945
+ * 6.  Provide an initial rate scaling algorithm tailored for the
+ *     statistic data exposed by the 3945.
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/dma-mapping.h>
+#include <linux/delay.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/wireless.h>
+#include <linux/firmware.h>
+#include <net/iw_handler.h>
+
+//#define BIT(x) (1 << (x))
+#include <net/mac80211.h>
+#include <net/ieee80211.h>
+
+#include <../net/mac80211/ieee80211_rate.h>
+
+#include <net/ieee80211_radiotap.h>
+	
+#ifndef ETH_P_80211_RAW
+#define ETH_P_80211_RAW (ETH_P_ECONET + 1)
+#endif
+
+#include <linux/if_arp.h>
+#include <asm/div64.h>
+
+#include "iwlwifi.h"
+
+#define IWLWIFI_VERSION "0.0.11k"
+
+#define DRV_DESCRIPTION	"Intel(R) Wireless Link driver for Linux"
+#define DRV_COPYRIGHT	"Copyright(c) 2003-2006 Intel Corporation"
+#define DRV_VERSION     IWLWIFI_VERSION
+
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR(DRV_COPYRIGHT);
+MODULE_LICENSE("GPL");
+
+/*MAC80211  move this to mac80211 files */
+#define IEEE80211_FC(type, stype) cpu_to_le16((type << 2) | (stype << 4))
+
+#define IEEE80211_CHAN_W_RADAR_DETECT 0x00000010
+
+#define IEEE80211_24GHZ_BAND     (1<<0)
+#define IEEE80211_52GHZ_BAND     (1<<1)
+
+#define IEEE80211_CCK_RATE_1MB                  0x02
+#define IEEE80211_CCK_RATE_2MB                  0x04
+#define IEEE80211_CCK_RATE_5MB                  0x0B
+#define IEEE80211_CCK_RATE_11MB                 0x16
+#define IEEE80211_OFDM_RATE_6MB                 0x0C
+#define IEEE80211_OFDM_RATE_9MB                 0x12
+#define IEEE80211_OFDM_RATE_12MB                0x18
+#define IEEE80211_OFDM_RATE_18MB                0x24
+#define IEEE80211_OFDM_RATE_24MB                0x30
+#define IEEE80211_OFDM_RATE_36MB                0x48
+#define IEEE80211_OFDM_RATE_48MB                0x60
+#define IEEE80211_OFDM_RATE_54MB                0x6C
+#define IEEE80211_BASIC_RATE_MASK               0x80
+
+#define IEEE80211_CCK_RATE_1MB_MASK             (1<<0)
+#define IEEE80211_CCK_RATE_2MB_MASK             (1<<1)
+#define IEEE80211_CCK_RATE_5MB_MASK             (1<<2)
+#define IEEE80211_CCK_RATE_11MB_MASK            (1<<3)
+#define IEEE80211_OFDM_RATE_6MB_MASK            (1<<4)
+#define IEEE80211_OFDM_RATE_9MB_MASK            (1<<5)
+#define IEEE80211_OFDM_RATE_12MB_MASK           (1<<6)
+#define IEEE80211_OFDM_RATE_18MB_MASK           (1<<7)
+#define IEEE80211_OFDM_RATE_24MB_MASK           (1<<8)
+#define IEEE80211_OFDM_RATE_36MB_MASK           (1<<9)
+#define IEEE80211_OFDM_RATE_48MB_MASK           (1<<10)
+#define IEEE80211_OFDM_RATE_54MB_MASK           (1<<11)
+
+#define IEEE80211_CCK_RATES_MASK                0x0000000F
+#define IEEE80211_CCK_BASIC_RATES_MASK  (IEEE80211_CCK_RATE_1MB_MASK | \
+        IEEE80211_CCK_RATE_2MB_MASK)
+#define IEEE80211_CCK_DEFAULT_RATES_MASK        (IEEE80211_CCK_BASIC_RATES_MASK | \
+        IEEE80211_CCK_RATE_5MB_MASK | \
+        IEEE80211_CCK_RATE_11MB_MASK)
+
+#define IEEE80211_OFDM_RATES_MASK               0x00000FF0
+#define IEEE80211_OFDM_BASIC_RATES_MASK (IEEE80211_OFDM_RATE_6MB_MASK | \
+        IEEE80211_OFDM_RATE_12MB_MASK | \
+        IEEE80211_OFDM_RATE_24MB_MASK)
+#define IEEE80211_OFDM_DEFAULT_RATES_MASK       (IEEE80211_OFDM_BASIC_RATES_MASK | \
+        IEEE80211_OFDM_RATE_9MB_MASK  | \
+        IEEE80211_OFDM_RATE_18MB_MASK | \
+        IEEE80211_OFDM_RATE_36MB_MASK | \
+        IEEE80211_OFDM_RATE_48MB_MASK | \
+        IEEE80211_OFDM_RATE_54MB_MASK)
+#define IEEE80211_DEFAULT_RATES_MASK (IEEE80211_OFDM_DEFAULT_RATES_MASK | \
+                                IEEE80211_CCK_DEFAULT_RATES_MASK)
+
+#define IEEE80211_NUM_OFDM_RATES            8
+#define IEEE80211_NUM_CCK_RATES             4
+#define IEEE80211_OFDM_SHIFT_MASK_A         4
+
+/*MAC80211 end */
+
+static u32 ipw_debug_level;
+
+static int param_debug = 0;
+static int param_channel = 0;
+static int param_mode = 0;
+static int param_auto_create = 1;	/* def: create new adhoc network if needed */
+static int param_led = 1;	/* def: use LEDs */
+static int param_disable = 0;	/* def: enable radio */
+static int param_antenna = 0;	/* def: 0 = both antennas (use diversity) */
+static int param_hwcrypto = 0;	/* def: using software encryption */
+static int param_qos_enable = 1;
+static int param_rtap_iface = 0;
+
+static const char ipw_modes[] = {
+	'a', 'b', 'g', '?'
+};
[...16611 lines suppressed...]
+	u8 flags;
+	/* We have 15 LSB to use as we please (MSB indicates
+	 * a frame Rx'd from the HW).  We encode the following
+	 * information into the sequence field:
+	 *
+	 *  0:7    index in fifo
+	 *  8:13   fifo selection
+	 * 14:14   bit indicating if this packet references the 'extra'
+	 *         storage at the end of the memory queue
+	 * 15:15   (Rx indication)
+	 *
+	 */
+	u16 sequence;
+
+	/* command data follows immediately */
+	u8 data[0];
+} __attribute__ ((packed));
+
+// Used for passing to driver number of successes and failures per rate
+struct rate_histogram {
+	union {
+		u32 a[SUP_RATE_11A_MAX_NUM_CHANNELS];
+		u32 b[SUP_RATE_11B_MAX_NUM_CHANNELS];
+		u32 g[SUP_RATE_11G_MAX_NUM_CHANNELS];
+	} success;
+	union {
+		u32 a[SUP_RATE_11A_MAX_NUM_CHANNELS];
+		u32 b[SUP_RATE_11B_MAX_NUM_CHANNELS];
+		u32 g[SUP_RATE_11G_MAX_NUM_CHANNELS];
+	} failed;
+} __attribute__ ((packed));
+
+/* statistics command response */
+
+struct statistics_rx_phy {
+	u32 ina_cnt;
+	u32 fina_cnt;
+	u32 plcp_err;
+	u32 crc32_err;
+	u32 overrun_err;
+	u32 early_overrun_err;
+	u32 crc32_good;
+	u32 false_alarm_cnt;
+	u32 fina_sync_err_cnt;
+	u32 sfd_timeout;
+	u32 fina_timeout;
+	u32 unresponded_rts;
+	u32 rxe_frame_limit_overrun;
+	u32 sent_ack_cnt;
+	u32 sent_cts_cnt;
+} __attribute__ ((packed));
+
+struct statistics_rx {
+	struct statistics_rx_phy ofdm;
+	struct statistics_rx_phy cck;
+	u32 bogus_cts;
+	u32 bogus_ack;
+	u32 non_bssid_frames;
+	u32 filtered_frames;
+	u32 non_channel_beacons;
+} __attribute__ ((packed));
+
+struct statistics_tx {
+	u32 preamble_cnt;
+	u32 rx_detected_cnt;
+	u32 bt_prio_defer_cnt;
+	u32 bt_prio_kill_cnt;
+	u32 few_bytes_cnt;
+	u32 cts_timeout;
+	u32 ack_timeout;
+	u32 expected_ack_cnt;
+	u32 actual_ack_cnt;
+} __attribute__ ((packed));
+
+struct statistics_dbg {
+	u32 burst_check;
+	u32 burst_count;
+	u32 reserved[4];
+} __attribute__ ((packed));
+
+struct statistics_div {
+	u32 tx_on_a;
+	u32 tx_on_b;
+	u32 exec_time;
+	u32 probe_time;
+} __attribute__ ((packed));
+
+struct statistics_general {
+	u32 temperature;
+	struct statistics_dbg dbg;
+	u32 sleep_time;
+	u32 slots_out;
+	u32 slots_idle;
+	u32 ttl_timestamp;
+	struct statistics_div div;
+} __attribute__ ((packed));
+
+struct ipw_notif_statistics {
+	u32 flag;
+	struct statistics_rx rx;
+	struct statistics_tx tx;
+	struct statistics_general general;
+} __attribute__ ((packed));
+
+struct ipw_rx_packet {
+	u32 len;
+	struct ipw_cmd_header hdr;
+	union {
+		struct ipw_alive_resp alive_frame;
+		struct ipw_rx_frame rx_frame;
+		struct ipw_tx_resp tx_resp;
+		struct ipw_spectrum_notification spectrum_notif;
+		struct ipw_csa_notification csa_notif;
+		struct ipw_error_resp err_resp;
+		struct ipw_card_state_notif card_state_notif;
+		struct ipw_notif_statistics stats;
+		struct BeaconNtfSpecifics beacon_status;
+		struct ipw_add_sta_resp add_sta;
+		struct ipw_sleep_notification sleep_notif;
+		u32 status;
+		u8 raw[0];
+	} u;
+} __attribute__ ((packed));
+
+#define IPW_RX_FRAME_SIZE        (4 + sizeof(struct ipw_rx_frame))
+
+struct ipw_multicast_addr {
+	u8 num_of_multicast_addresses;
+	u8 reserved[3];
+	u8 mac1[6];
+	u8 mac2[6];
+	u8 mac3[6];
+	u8 mac4[6];
+} __attribute__ ((packed));
+
+struct ipw_tgi_tx_key {
+	u8 key_id;
+	u8 security_type;
+	u8 station_index;
+	u8 flags;
+	u8 key[16];
+	u32 tx_counter[2];
+} __attribute__ ((packed));
+
+struct ipw_associate {
+	u8 channel;
+	u8 auth_type:4, auth_key:4;
+	u8 assoc_type;
+	u8 reserved;
+	u16 policy_support;
+	u8 preamble_length;
+	u8 ieee_mode;
+	u8 bssid[ETH_ALEN];
+	u32 assoc_tsf_msw;
+	u32 assoc_tsf_lsw;
+	u16 capability;
+	u16 listen_interval;
+	u16 beacon_interval;
+	u8 dest[ETH_ALEN];
+	u16 atim_window;
+	u8 smr;
+	u8 reserved1;
+	u16 reserved2;
+	u16 assoc_id;
+	u8 erp_value;
+} __attribute__ ((packed));
+
+#define IPW_SUPPORTED_RATES_IE_LEN         8
+
+struct ipw_supported_rates {
+	u8 ieee_mode;
+	u8 num_rates;
+	u8 purpose;
+	u8 reserved;
+	u8 supported_rates[IPW_MAX_RATES];
+} __attribute__ ((packed));
+
+struct ipw_channel_tx_power {
+	u8 channel_number;
+	s8 tx_power;
+} __attribute__ ((packed));
+
+
+#define IPW_RX_BUF_SIZE 3000
+
+#endif				/* __iwlwifi_hw_h__ */
--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile.orig	2007-03-22 15:13:39.000000000 -0400
+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile	2007-03-22 15:13:46.000000000 -0400
@@ -4,3 +4,4 @@ obj-$(CONFIG_ADM8211)		+= adm8211/
 obj-$(CONFIG_P54_COMMON)	+= p54/
 obj-$(CONFIG_ZD1211RW_MAC80211)	+= zd1211rw/
 obj-$(CONFIG_RTL818X)		+= rtl818x/
+obj-$(CONFIG_IWLWIFI)		+= iwlwifi/
--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig.orig	2007-03-22 15:13:39.000000000 -0400
+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig	2007-03-22 15:13:46.000000000 -0400
@@ -4,3 +4,4 @@ source "drivers/net/wireless/mac80211/ad
 source "drivers/net/wireless/mac80211/p54/Kconfig"
 source "drivers/net/wireless/mac80211/zd1211rw/Kconfig"
 source "drivers/net/wireless/mac80211/rtl818x/Kconfig"
+source "drivers/net/wireless/mac80211/iwlwifi/Kconfig"

git-wireless-dev.patch:
 CREDITS                                                 |   31 
 MAINTAINERS                                             |   54 
 drivers/Kconfig                                         |    2 
 drivers/Makefile                                        |    1 
 drivers/net/Makefile                                    |    2 
 drivers/net/wireless/Kconfig                            |  120 
 drivers/net/wireless/Makefile                           |    3 
 drivers/net/wireless/bcm43xx/Kconfig                    |    3 
 drivers/net/wireless/hostap/Kconfig                     |    3 
 drivers/net/wireless/mac80211/Kconfig                   |    6 
 drivers/net/wireless/mac80211/Makefile                  |    6 
 drivers/net/wireless/mac80211/README                    |    2 
 drivers/net/wireless/mac80211/adm8211/Kconfig           |   25 
 drivers/net/wireless/mac80211/adm8211/Makefile          |    1 
 drivers/net/wireless/mac80211/adm8211/adm8211.c         | 2188 +++++++
 drivers/net/wireless/mac80211/adm8211/adm8211.h         |  622 ++
 drivers/net/wireless/mac80211/bcm43xx/Kconfig           |  100 
 drivers/net/wireless/mac80211/bcm43xx/Makefile          |   16 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h         |  870 ++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c |  433 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h |  110 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c     | 1297 ++++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h     |  361 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c    |  300 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h    |   56 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c      | 1081 +++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h      |   92 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c    | 3988 ++++++++++++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h    |  156 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c  |  163 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h  |   22 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c     | 4235 +++++++++++++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h     |  309 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c     |  671 ++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h     |  170 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c   |   82 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h   |   41 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c   |  232 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h   |    9 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c  |  376 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h  |   28 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_vstack.c  |  202 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_vstack.h  |   83 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c    |  615 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h    |  215 
 drivers/net/wireless/mac80211/p54/Kconfig               |   10 
 drivers/net/wireless/mac80211/p54/Makefile              |    4 
 drivers/net/wireless/mac80211/p54/net2280.h             |  452 +
 drivers/net/wireless/mac80211/p54/prism54.h             |   77 
 drivers/net/wireless/mac80211/p54/prism54common.c       |  807 ++
 drivers/net/wireless/mac80211/p54/prism54common.h       |  304 
 drivers/net/wireless/mac80211/p54/prism54magic.h        |   77 
 drivers/net/wireless/mac80211/p54/prism54pci.c          |  698 ++
 drivers/net/wireless/mac80211/p54/prism54pci.h          |  106 
 drivers/net/wireless/mac80211/p54/prism54usb.c          |  946 +++
 drivers/net/wireless/mac80211/p54/prism54usb.h          |  133 
 drivers/net/wireless/mac80211/rt2x00/Kconfig            |   86 
 drivers/net/wireless/mac80211/rt2x00/Makefile           |    9 
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.c        | 2586 ++++++++
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.h        |  931 +++
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.c        | 2883 +++++++++
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.h        | 1198 +++
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.c        | 2718 ++++++++
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.h        |  746 ++
 drivers/net/wireless/mac80211/rt2x00/rt2x00.h           | 1069 +++
 drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c      |  380 +
 drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h      |   70 
 drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c        |  231 
 drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h        |   74 
 drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c        |  540 +
 drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h        |   39 
 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h        |   82 
 drivers/net/wireless/mac80211/rt2x00/rt61pci.c          | 3364 ++++++++++
 drivers/net/wireless/mac80211/rt2x00/rt61pci.h          | 1361 ++++
 drivers/net/wireless/mac80211/rt2x00/rt73usb.c          | 3024 +++++++++
 drivers/net/wireless/mac80211/rt2x00/rt73usb.h          |  945 +++
 drivers/net/wireless/mac80211/rtl818x/Kconfig           |    9 
 drivers/net/wireless/mac80211/rtl818x/Makefile          |    2 
 drivers/net/wireless/mac80211/rtl818x/rtl8187.h         |  126 
 drivers/net/wireless/mac80211/rtl818x/rtl8187_dev.c     |  720 ++
 drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.c |  747 ++
 drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.h |   30 
 drivers/net/wireless/mac80211/rtl818x/rtl818x.h         |  177 
 drivers/net/wireless/mac80211/zd1211rw/Kconfig          |   19 
 drivers/net/wireless/mac80211/zd1211rw/Makefile         |   11 
 drivers/net/wireless/mac80211/zd1211rw/zd_chip.c        | 1676 +++++
 drivers/net/wireless/mac80211/zd1211rw/zd_chip.h        |  909 ++
 drivers/net/wireless/mac80211/zd1211rw/zd_def.h         |   57 
 drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h   |   67 
 drivers/net/wireless/mac80211/zd1211rw/zd_mac.c         |  705 ++
 drivers/net/wireless/mac80211/zd1211rw/zd_mac.h         |  250 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf.c          |  156 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf.h          |   81 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c   |  436 +
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c  |  274 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c   |  279 
 drivers/net/wireless/mac80211/zd1211rw/zd_usb.c         | 1327 ++++
 drivers/net/wireless/mac80211/zd1211rw/zd_usb.h         |  241 
 drivers/net/wireless/mac80211/zd1211rw/zd_util.c        |   82 
 drivers/net/wireless/mac80211/zd1211rw/zd_util.h        |   29 
 drivers/net/wireless/zd1211rw/Kconfig                   |    3 
 drivers/ssb/Kconfig                                     |   93 
 drivers/ssb/Makefile                                    |   11 
 drivers/ssb/driver_chipcommon.c                         |  402 +
 drivers/ssb/driver_mipscore.c                           |  258 
 drivers/ssb/driver_pcicore.c                            |  556 +
 drivers/ssb/main.c                                      | 1042 +++
 drivers/ssb/pci.c                                       |  667 ++
 drivers/ssb/pcihost_wrapper.c                           |  104 
 drivers/ssb/pcmcia.c                                    |  256 
 drivers/ssb/scan.c                                      |  407 +
 drivers/ssb/ssb_private.h                               |  151 
 drivers/usb/host/Kconfig                                |   13 
 drivers/usb/host/ohci-hcd.c                             |   21 
 drivers/usb/host/ohci-ssb.c                             |  254 
 include/linux/Kbuild                                    |    2 
 include/linux/crc-itu-t.h                               |   27 
 include/linux/eeprom_93cx6.h                            |   77 
 include/linux/ieee80211.h                               |  330 +
 include/linux/netdevice.h                               |    7 
 include/linux/nl80211.h                                 |  275 
 include/linux/ssb/ssb.h                                 |  403 +
 include/linux/ssb/ssb_driver_chipcommon.h               |  387 +
 include/linux/ssb/ssb_driver_extif.h                    |  163 
 include/linux/ssb/ssb_driver_mips.h                     |   47 
 include/linux/ssb/ssb_driver_pci.h                      |  108 
 include/linux/ssb/ssb_regs.h                            |  294 
 include/net/cfg80211.h                                  |  169 
 include/net/iw_handler.h                                |    3 
 include/net/mac80211.h                                  | 1074 +++
 include/net/wireless.h                                  |  160 
 lib/Kconfig                                             |   16 
 lib/Makefile                                            |    3 
 lib/crc-itu-t.c                                         |   64 
 lib/eeprom_93cx6.c                                      |  344 +
 net/Kconfig                                             |   12 
 net/Makefile                                            |    2 
 net/core/Makefile                                       |    1 
 net/core/dev.c                                          |   33 
 net/core/wireless.c                                     | 2371 -------
 net/ieee80211/Kconfig                                   |    3 
 net/mac80211/Kconfig                                    |   71 
 net/mac80211/Makefile                                   |   26 
 net/mac80211/aes_ccm.c                                  |  155 
 net/mac80211/aes_ccm.h                                  |   26 
 net/mac80211/fifo_qdisc.c                               |  102 
 net/mac80211/hostapd_ioctl.h                            |  347 +
 net/mac80211/ieee80211.c                                | 4940 ++++++++++++++++
 net/mac80211/ieee80211_cfg.c                            |   90 
 net/mac80211/ieee80211_cfg.h                            |    9 
 net/mac80211/ieee80211_common.h                         |   98 
 net/mac80211/ieee80211_i.h                              |  720 ++
 net/mac80211/ieee80211_iface.c                          |  372 +
 net/mac80211/ieee80211_ioctl.c                          | 3304 ++++++++++
 net/mac80211/ieee80211_key.h                            |   89 
 net/mac80211/ieee80211_led.c                            |   91 
 net/mac80211/ieee80211_led.h                            |   32 
 net/mac80211/ieee80211_rate.c                           |  140 
 net/mac80211/ieee80211_rate.h                           |  161 
 net/mac80211/ieee80211_scan.c                           |  344 +
 net/mac80211/ieee80211_sta.c                            | 3013 +++++++++
 net/mac80211/ieee80211_sysfs.c                          |  718 ++
 net/mac80211/ieee80211_sysfs.h                          |   12 
 net/mac80211/ieee80211_sysfs_sta.c                      |  438 +
 net/mac80211/michael.c                                  |  104 
 net/mac80211/michael.h                                  |   20 
 net/mac80211/rc80211_simple.c                           |  399 +
 net/mac80211/sta_info.c                                 |  461 +
 net/mac80211/sta_info.h                                 |  150 
 net/mac80211/tkip.c                                     |  341 +
 net/mac80211/tkip.h                                     |   36 
 net/mac80211/wep.c                                      |  328 +
 net/mac80211/wep.h                                      |   40 
 net/mac80211/wme.c                                      |  679 ++
 net/mac80211/wme.h                                      |   38 
 net/mac80211/wpa.c                                      |  846 ++
 net/mac80211/wpa.h                                      |   31 
 net/wireless/Kconfig                                    |   46 
 net/wireless/Makefile                                   |   17 
 net/wireless/core.c                                     |  323 +
 net/wireless/core.h                                     |   77 
 net/wireless/nl80211.c                                  | 1051 +++
 net/wireless/nl80211.h                                  |   17 
 net/wireless/sysfs.c                                    |  125 
 net/wireless/sysfs.h                                    |    9 
 net/wireless/wext-common.c                              |  663 ++
 net/wireless/wext-compat.c                              |  819 ++
 net/wireless/wext-export.c                              |   29 
 net/wireless/wext-mod.c                                 |   20 
 net/wireless/wext-old.c                                 | 1461 ++++
 net/wireless/wext.h                                     |   51 
 191 files changed, 85347 insertions(+), 2487 deletions(-)

--- NEW FILE git-wireless-dev.patch ---
--- /dev/null	2007-03-09 11:47:32.684268720 -0500
+++ linux-2.6.20.noarch/include/net/wireless.h	2007-03-20 11:29:04.000000000 -0400
@@ -0,0 +1,160 @@
+#ifndef __NET_WIRELESS_H
+#define __NET_WIRELESS_H
+
+/*
+ * 802.11 device management
+ *
+ * Copyright 2007	Johannes Berg <johannes at sipsolutions.net>
+ */
+
+#include <linux/netdevice.h>
+#include <linux/debugfs.h>
+#include <linux/list.h>
+#include <net/cfg80211.h>
+
+/**
+ * struct wiphy - wireless hardware description
+ * @idx: the wiphy index assigned to this item
+ * @class_dev: the class device representing /sys/class/ieee80211/<wiphy-name>
+ */
+struct wiphy {
+	/* assign these fields before you register the wiphy */
+
+	/* permanent MAC address */
+	u8 perm_addr[ETH_ALEN];
+
+	/* If multiple wiphys are registered and you're handed e.g.
+	 * a regular netdev with assigned ieee80211_ptr, you won't
+	 * know whether it points to a wiphy your driver has registered
+	 * or not. Assign this to something global to your driver to
+	 * help determine whether you own this wiphy or not. */
+	void *privid;
+
+	/* fields below are read-only, assigned by cfg80211 */
+
+	/* the item in /sys/class/ieee80211/ points to this,
+	 * you need use set_wiphy_dev() (see below) */
+	struct device dev;
+
+	/* dir in debugfs: ieee80211/<wiphyname> */
+	struct dentry *debugfsdir;
+
+	char priv[0] __attribute__((__aligned__(NETDEV_ALIGN)));
+};
+
+/** struct wireless_dev - wireless per-netdev state
+ *
+ * This structure must be allocated by the driver/stack
+ * that uses the ieee80211_ptr field in struct net_device
+ * (this is intentional so it can be allocated along with
+ * the netdev.)
+ *
+ * @wiphy: pointer to hardware description
+ */
+struct wireless_dev {
+	struct wiphy *wiphy;
+
+	/* private to the generic wireless code */
+	struct cfg80211_config pending_config;
+	struct list_head list;
+	struct net_device *netdev;
+};
+
+/**
+ * wiphy_priv - return priv from wiphy
+ */
+static inline void *wiphy_priv(struct wiphy *wiphy)
+{
+	BUG_ON(!wiphy);
+	return &wiphy->priv;
+}
+
+/**
+ * set_wiphy_dev - set device pointer for wiphy
+ */
+static inline void set_wiphy_dev(struct wiphy *wiphy, struct device *dev)
+{
+	wiphy->dev.parent = dev;
+}
+
+/**
+ * wiphy_dev - get wiphy dev pointer
+ */
+static inline struct device *wiphy_dev(struct wiphy *wiphy)
+{
+	return wiphy->dev.parent;
+}
+
+/**
+ * wiphy_name - get wiphy name
+ */
+static inline char *wiphy_name(struct wiphy *wiphy)
+{
+	return wiphy->dev.bus_id;
+}
+
+/**
+ * wdev_priv - return wiphy priv from wireless_dev
+ */
+static inline void *wdev_priv(struct wireless_dev *wdev)
+{
+	BUG_ON(!wdev);
+	return wiphy_priv(wdev->wiphy);
+}
+
+/**
+ * wiphy_new - create a new wiphy for use with cfg80211
+ *
+ * create a new wiphy and associate the given operations with it.
+ * @sizeof_priv bytes are allocated for private use.
+ *
+ * the returned pointer must be assigned to each netdev's
+ * ieee80211_ptr for proper operation.
+ */
+struct wiphy *wiphy_new(struct cfg80211_ops *ops, int sizeof_priv);
+
+/**
+ * wiphy_register - register a wiphy with cfg80211
+ *
+ * register the given wiphy
+ *
+ * Returns a non-negative wiphy index or a negative error code.
+ */
+extern int wiphy_register(struct wiphy *wiphy);
+
+/**
+ * wiphy_unregister - deregister a wiphy from cfg80211
+ *
+ * unregister a device with the given priv pointer.
+ * After this call, no more requests can be made with this priv
+ * pointer, but the call may sleep to wait for an outstanding
+ * request that is being handled.
+ */
+extern void wiphy_unregister(struct wiphy *wiphy);
+
+/**
+ * wiphy_free - free wiphy
+ */
+extern void wiphy_free(struct wiphy *wiphy);
+
+
+/*
+ * internal definitions for wireless
+ */
+
+#if defined(CONFIG_CFG80211_WEXT_COMPAT) || defined(CONFIG_WIRELESS_EXT)
+int wext_ioctl(unsigned int cmd, struct ifreq *ifreq, void __user *arg);
+int wireless_proc_init(void);
+#else
+static inline
+int wext_ioctl(unsigned int cmd, struct ifreq *ifreq, void __user *arg)
+{
+	return -EINVAL;
+}
+static inline int wireless_proc_init(void)
+{
+	return 0;
+}
+#endif
+
+#endif /* __NET_WIRELESS_H */
--- /dev/null	2007-03-09 11:47:32.684268720 -0500
+++ linux-2.6.20.noarch/include/net/mac80211.h	2007-03-20 11:29:04.000000000 -0400
@@ -0,0 +1,1074 @@
+/*
+ * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface
+ * Copyright 2002-2005, Devicescape Software, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef MAC80211_H
+#define MAC80211_H
+
+#include <linux/kernel.h>
+#include <linux/if_ether.h>
+#include <linux/skbuff.h>
+#include <linux/wireless.h>
+#include <linux/device.h>
+#include <linux/ieee80211.h>
+#include <net/wireless.h>
+#include <net/cfg80211.h>
+
+/* Note! Only ieee80211_tx_status_irqsafe() and ieee80211_rx_irqsafe() can be
+ * called in hardware interrupt context. The low-level driver must not call any
+ * other functions in hardware interrupt context. If there is a need for such
+ * call, the low-level driver should first ACK the interrupt and perform the
+ * IEEE 802.11 code call after this, e.g., from a scheduled tasklet (in
+ * software interrupt context).
+ */
+
+/*
+ * Frame format used when passing frame between low-level hardware drivers
+ * and IEEE 802.11 driver the same as used in the wireless media, i.e.,
+ * buffers start with IEEE 802.11 header and include the same octets that
[...88476 lines suppressed...]
+			break;
+
+		buf = kmalloc(100, GFP_ATOMIC);
+		if (!buf)
+			break;
+
+		memset(&iwe, 0, sizeof(iwe));
+		iwe.cmd = IWEVCUSTOM;
+		sprintf(buf, "bcn_int=%d", bss->beacon_int);
+		iwe.u.data.length = strlen(buf);
+		current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+						  buf);
+
+		memset(&iwe, 0, sizeof(iwe));
+		iwe.cmd = IWEVCUSTOM;
+		sprintf(buf, "rssi=%d", bss->rssi);
+		iwe.u.data.length = strlen(buf);
+		current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+						  buf);
+
+		memset(&iwe, 0, sizeof(iwe));
+		iwe.cmd = IWEVCUSTOM;
+		sprintf(buf, "capab=0x%04x", bss->capability);
+		iwe.u.data.length = strlen(buf);
+		current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+						  buf);
+
+		/* dispaly all support rates in readable format */
+		p = current_ev + IW_EV_LCP_LEN;
+		iwe.cmd = SIOCGIWRATE;
+		/* Those two flags are ignored... */
+		iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;
+
+		for (i = 0; i < bss->supp_rates_len; i++) {
+			iwe.u.bitrate.value = ((bss->supp_rates[i] &
+							0x7f) * 500000);
+			p = iwe_stream_add_value(current_ev, p,
+					end_buf, &iwe, IW_EV_PARAM_LEN);
+		}
+		/* Check if we added any rate */
+		if((p - current_ev) > IW_EV_LCP_LEN)
+			current_ev = p;
+
+		kfree(buf);
+		break;
+	} while (0);
+
+	return current_ev;
+}
+
+
+int ieee80211_sta_scan_results(struct net_device *dev, char *buf, size_t len)
+{
+	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+	char *current_ev = buf;
+	char *end_buf = buf + len;
+	struct ieee80211_sta_bss *bss;
+
+	spin_lock_bh(&local->sta_bss_lock);
+	list_for_each_entry(bss, &local->sta_bss_list, list) {
+		if (buf + len - current_ev <= IW_EV_ADDR_LEN) {
+			spin_unlock_bh(&local->sta_bss_lock);
+			return -E2BIG;
+		}
+		current_ev = ieee80211_sta_scan_result(dev, bss, current_ev,
+						       end_buf);
+	}
+	spin_unlock_bh(&local->sta_bss_lock);
+	return current_ev - buf;
+}
+
+
+int ieee80211_sta_set_extra_ie(struct net_device *dev, char *ie, size_t len)
+{
+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+	struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+	kfree(ifsta->extra_ie);
+	if (len == 0) {
+		ifsta->extra_ie = NULL;
+		ifsta->extra_ie_len = 0;
+		return 0;
+	}
+	ifsta->extra_ie = kmalloc(len, GFP_KERNEL);
+	if (!ifsta->extra_ie) {
+		ifsta->extra_ie_len = 0;
+		return -ENOMEM;
+	}
+	memcpy(ifsta->extra_ie, ie, len);
+	ifsta->extra_ie_len = len;
+	return 0;
+}
+
+
+struct sta_info * ieee80211_ibss_add_sta(struct net_device *dev,
+					 struct sk_buff *skb, u8 *bssid,
+					 u8 *addr)
+{
+	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+	struct sta_info *sta;
+	struct ieee80211_sub_if_data *sdata = NULL;
+	struct net_device *sta_dev = NULL;
+
+	/* TODO: Could consider removing the least recently used entry and
+	 * allow new one to be added. */
+	if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) {
+		if (net_ratelimit()) {
+			printk(KERN_DEBUG "%s: No room for a new IBSS STA "
+			       "entry " MAC_FMT "\n", dev->name, MAC_ARG(addr));
+		}
+		return NULL;
+	}
+
+	spin_lock_bh(&local->sub_if_lock);
+	list_for_each_entry(sdata, &local->sub_if_list, list)
+		if (sdata->type == IEEE80211_IF_TYPE_IBSS &&
+		    memcmp(bssid, sdata->u.sta.bssid, ETH_ALEN) == 0) {
+			sta_dev = sdata->dev;
+			break;
+		}
+	spin_unlock_bh(&local->sub_if_lock);
+
+	if (!sta_dev)
+		return NULL;
+
+	printk(KERN_DEBUG "%s: Adding new IBSS station " MAC_FMT " (dev=%s)\n",
+	       dev->name, MAC_ARG(addr), sta_dev->name);
+
+	sta = sta_info_add(local, dev, addr, GFP_ATOMIC);
+	if (!sta)
+		return NULL;
+
+	sta->dev = sta_dev;
+	sta->supp_rates = sdata->u.sta.supp_rates_bits;
+
+	rate_control_rate_init(sta, local);
+
+	return sta; /* caller will call sta_info_put() */
+}
+
+
+int ieee80211_sta_deauthenticate(struct net_device *dev, u16 reason)
+{
+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+	struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+
+	printk(KERN_DEBUG "%s: deauthenticate(reason=%d)\n",
+	       dev->name, reason);
+
+	if (sdata->type != IEEE80211_IF_TYPE_STA &&
+	    sdata->type != IEEE80211_IF_TYPE_IBSS)
+		return -EINVAL;
+
+	ieee80211_send_deauth(dev, ifsta, reason);
+	ieee80211_set_disassoc(dev, ifsta, 1);
+	return 0;
+}
+
+
+int ieee80211_sta_disassociate(struct net_device *dev, u16 reason)
+{
+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+	struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+
+	printk(KERN_DEBUG "%s: disassociate(reason=%d)\n",
+	       dev->name, reason);
+
+	if (sdata->type != IEEE80211_IF_TYPE_STA)
+		return -EINVAL;
+
+	if (!ifsta->associated)
+		return -1;
+
+	ieee80211_send_disassoc(dev, ifsta, reason);
+	ieee80211_set_disassoc(dev, ifsta, 0);
+	return 0;
+}
--- /dev/null	2007-03-09 11:47:32.684268720 -0500
+++ linux-2.6.20.noarch/net/mac80211/ieee80211_cfg.h	2007-03-20 11:29:04.000000000 -0400
@@ -0,0 +1,9 @@
+/*
+ * mac80211 configuration hooks for cfg80211
+ */
+#ifndef __IEEE80211_CFG_H
+#define __IEEE80211_CFG_H
+
+extern struct cfg80211_ops mac80211_config_ops;
+
+#endif /* __IEEE80211_CFG_H */
--- linux-2.6.20.noarch/net/ieee80211/Kconfig.orig	2007-03-20 11:27:30.000000000 -0400
+++ linux-2.6.20.noarch/net/ieee80211/Kconfig	2007-03-20 11:29:04.000000000 -0400
@@ -56,7 +56,8 @@ config IEEE80211_CRYPT_CCMP
 
 config IEEE80211_CRYPT_TKIP
 	tristate "IEEE 802.11i TKIP encryption"
-	depends on IEEE80211 && NET_RADIO
+	depends on IEEE80211
+	select WIRELESS_EXT
 	select CRYPTO
 	select CRYPTO_MICHAEL_MIC
 	select CRYPTO_ECB

linux-2.6-ata-quirk.patch:
 Makefile |    1 +
 quirks.c |   45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

--- NEW FILE linux-2.6-ata-quirk.patch ---
--- linux-2.6.20/arch/ia64/kernel/quirks.c	1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.20_fix/arch/ia64/kernel/quirks.c	2007-02-13 13:56:34.000000000 -0500
@@ -0,0 +1,45 @@
+/*
+ * This file contains work-arounds for ia64 platform bugs.
+ */
+#include <linux/pci.h>
+
+/*
+ * quirk_intel_ide_controller: If an ide/ata controller is
+ * at legacy mode, BIOS might initiates BAR(bar 0~3 and 5)
+ * with incorrect value. This quirk will reset the incorrect
+ * value to 0.
+ */
+static void __devinit quirk_intel_ide_controller(struct pci_dev *dev)
+{
+	unsigned int pos;
+	struct resource *res;
+	int fixed = 0;
+	u8 tmp8;
+
+	if ((dev->class >> 8) != PCI_CLASS_STORAGE_IDE)
+		return;
+
+	/* TODO: What if one channel is in native mode ... */
+	pci_read_config_byte(dev, PCI_CLASS_PROG, &tmp8);
+	if ((tmp8 & 5) == 5)
+		return;
+
+	for( pos = 0; pos < 6; pos ++ ) {
+		res = &dev->resource[pos];
+		if (!(res->flags & (IORESOURCE_IO | IORESOURCE_MEM)))
+			continue;
+
+		if (!res->start && res->end) {
+			res->start = res->end = 0;
+			res->flags = 0;
+			fixed = 1;
+		}
+	}
+	if (fixed)
+		printk(KERN_WARNING
+			"PCI device %s: BIOS resource configuration fixed.\n",
+			pci_name(dev));
+}
+
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_11, quirk_intel_ide_controller);
+
--- linux-2.6.20/arch/ia64/kernel/Makefile	2007-02-08 02:13:41.000000000 -0500
+++ linux-2.6.20_fix/arch/ia64/kernel/Makefile	2007-02-12 09:49:39.000000000 -0500
@@ -33,6 +33,7 @@ obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o
 obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR)	+= uncached.o
 obj-$(CONFIG_AUDIT)		+= audit.o
 obj-$(CONFIG_PCI_MSI)		+= msi_ia64.o
+obj-$(CONFIG_PCI)		+= quirks.o
 mca_recovery-y			+= mca_drv.o mca_drv_asm.o
 
 obj-$(CONFIG_IA64_ESI)		+= esi.o

linux-2.6-crap-sysfs-workaround.patch:
 class.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-crap-sysfs-workaround.patch ---
--- linux-2.6.20.ppc/drivers/base/class.c~	2007-02-04 18:44:54.000000000 +0000
+++ linux-2.6.20.ppc/drivers/base/class.c	2007-03-28 00:23:30.000000000 +0100
@@ -380,7 +380,7 @@ static int deprecated_class_uevent(char 
 	struct device *dev = class_dev->dev;
 	char *path;
 
-	if (!dev)
+	//if (!dev)
 		return 0;
 
 	/* add device, backing this class device (deprecated) */

linux-2.6-debug-extra-warnings.patch:
 Makefile |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-debug-extra-warnings.patch ---
-Werror-implicit-function-declaration
 This makes builds fail sooner if something is implicitly defined instead
 of having to wait half an hour for it to fail at the linking stage.

-Wextra -Wno-unused-parameter -Wno-missing-field-initializers
 Enable the kitchen-sink of 'mostly harmless' warnings, and exclude
 some of the really noisy ones.

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

diff --git a/Makefile b/Makefile
index 6393738..c5d60f2 100644
--- a/Makefile
+++ b/Makefile
@@ -313,7 +313,9 @@ LINUXINCLUDE    := -Iinclude \
 CPPFLAGS        := -D__KERNEL__ $(LINUXINCLUDE)
 
 CFLAGS          := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
-                   -fno-strict-aliasing -fno-common
+                   -fno-strict-aliasing -fno-common \
+		   -Werror-implicit-function-declaration \
+		   -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-strict-aliasing
 AFLAGS          := -D__ASSEMBLY__
 
 # Read KERNELRELEASE from include/config/kernel.release (if it exists)

linux-2.6-defaults-pci_no_msi_mmconf.patch:
 Documentation/kernel-parameters.txt   |    5 +++++
 arch/i386/pci/common.c                |    6 +++++-
 drivers/pci/msi.c                     |    6 +++++-
 linux-2.6.20.noarch/drivers/pci/pci.c |    2 ++
 linux-2.6.20.noarch/drivers/pci/pci.h |    2 ++
 5 files changed, 19 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-defaults-pci_no_msi_mmconf.patch ---
Disable PCI MSI and MMCONFIG by default, add kernel parameters
to enable them.

Original mmconfig patch by Kyle McMartin <kyle at ubuntu.com>

Signed-off-by: Chuck Ebbert <cebbert at redhat.com>

---
 Documentation/kernel-parameters.txt |    5 +++++
 arch/i386/pci/common.c              |    6 +++++-
 drivers/pci/msi.c                   |    6 +++++-
 drivers/pci/pci.c                   |    2 ++
 drivers/pci/pci.h                   |    2 ++
 5 files changed, 19 insertions(+), 2 deletions(-)

--- linux-2.6.20.noarch.orig/drivers/pci/msi.c
+++ linux-2.6.20.noarch/drivers/pci/msi.c
@@ -28,7 +28,7 @@ static DEFINE_SPINLOCK(msi_lock);
 static struct msi_desc* msi_desc[NR_IRQS] = { [0 ... NR_IRQS-1] = NULL };
 static struct kmem_cache* msi_cachep;
 
-static int pci_msi_enable = 1;
+static int pci_msi_enable = 0;
 
 static int msi_cache_init(void)
 {
@@ -977,6 +977,10 @@ void pci_no_msi(void)
 {
 	pci_msi_enable = 0;
 }
+void pci_yes_msi(void)
+{
+	pci_msi_enable = 1;
+}
 
 EXPORT_SYMBOL(pci_enable_msi);
 EXPORT_SYMBOL(pci_disable_msi);
--- linux-2.6.20.noarch.orig/Documentation/kernel-parameters.txt
+++ linux-2.6.20.noarch/Documentation/kernel-parameters.txt
@@ -1197,8 +1197,13 @@ and is between 256 and 4096 characters. 
 				Mechanism 1.
 		conf2		[IA-32] Force use of PCI Configuration
 				Mechanism 2.
+		mmconf		[IA-32,X86_64] Enable use of MMCONFIG for PCI
+				Configuration
 		nommconf	[IA-32,X86_64] Disable use of MMCONFIG for PCI
 				Configuration
+		msi		[MSI] If the PCI_MSI kernel config parameter is
+				enabled, this kernel boot option can be used to
+				enable the use of MSI interrupts system-wide.
 		nomsi		[MSI] If the PCI_MSI kernel config parameter is
 				enabled, this kernel boot option can be used to
 				disable the use of MSI interrupts system-wide.
--- linux-2.6.20.noarch.orig/arch/i386/pci/common.c
+++ linux-2.6.20.noarch/arch/i386/pci/common.c
@@ -18,7 +18,7 @@
 #include "pci.h"
 
 unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 |
-				PCI_PROBE_MMCONF;
+				0; /* PCI_PROBE_MMCONF */
 
 static int pci_bf_sort;
 int pci_routeirq;
@@ -292,6 +292,10 @@ char * __devinit  pcibios_setup(char *st
 		pci_probe &= ~PCI_PROBE_MMCONF;
 		return NULL;
 	}
+	else if (!strcmp(str, "mmconf")) {
+		pci_probe |= PCI_PROBE_MMCONF;
+		return NULL;
+	}
 #endif
 	else if (!strcmp(str, "noacpi")) {
 		acpi_noirq_set();
--- linux-2.6.20.noarch/drivers/pci/pci.c~	2007-04-04 01:33:08.000000000 -0400
+++ linux-2.6.20.noarch/drivers/pci/pci.c	2007-04-04 01:33:33.000000000 -0400
@@ -1358,6 +1358,8 @@ static int __devinit pci_setup(char *str
 		if (*str && (str = pcibios_setup(str)) && *str) {
 			if (!strcmp(str, "nomsi")) {
 				pci_no_msi();
+			} else if (!strcmp(str, "msi")) {
+				pci_yes_msi();
 			} else if (!strncmp(str, "cbiosize=", 9)) {
 				pci_cardbus_io_size = memparse(str + 9, &str);
 			} else if (!strncmp(str, "cbmemsize=", 10)) {
--- linux-2.6.20.noarch/drivers/pci/pci.h~	2007-04-04 01:34:07.000000000 -0400
+++ linux-2.6.20.noarch/drivers/pci/pci.h	2007-04-04 01:34:31.000000000 -0400
@@ -47,8 +47,10 @@ extern unsigned int pci_pm_d3_delay;
 
 #ifdef CONFIG_PCI_MSI
 void pci_no_msi(void);
+void pci_yes_msi(void);
 #else
 static inline void pci_no_msi(void) { }
+static inline void pci_yes_msi(void) { }
 #endif
 
 #if defined(CONFIG_PCI_MSI) && defined(CONFIG_PM)

linux-2.6-dvb-spinlock.patch:
 flexcop-pci.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-dvb-spinlock.patch ---

# HG changeset patch
# User Mauro Carvalho Chehab <mchehab at infradead.org>
# Date Thu Apr 05 14:28:11 2007 -0300
# Node ID a80058519added447f1cdd870334282e8ac3226e
# parent: 628ca02d680721a85e9b2fca7cf4b782b31f9443
Fix Kernel Bugzilla #8301: spinlock fix for flexcop-pci

# Now, patch author (just the main one), on a From: field
# Please change below if the committer is not the patch author.
#
>From Hendrik Borghorst <hendrik at borghorst.org>

# Then a detailed description:
If you modprobe the b2c2-flexcop-pci module you got a hardlock of your system.
This is due the usage of spin_lock before spin_lock_init is called.

# At the end Signed-off-by: fields by patch author and committer, at least.
#
Signed-Off-By: Patrick Boettcher <pb at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

--- a/drivers/media/dvb/b2c2/flexcop-pci.c	Wed Apr 04 13:11:06 2007 -0700
+++ b/drivers/media/dvb/b2c2/flexcop-pci.c	Thu Apr 05 14:28:11 2007 -0300
@@ -143,10 +143,11 @@ static irqreturn_t flexcop_pci_isr(int i
 {
 	struct flexcop_pci *fc_pci = dev_id;
 	struct flexcop_device *fc = fc_pci->fc_dev;
+	unsigned long flags;
 	flexcop_ibi_value v;
 	irqreturn_t ret = IRQ_HANDLED;
 
-	spin_lock_irq(&fc_pci->irq_lock);
+	spin_lock_irqsave(&fc_pci->irq_lock,flags);
 
 	v = fc->read_ibi_reg(fc,irq_20c);
 
@@ -210,7 +211,7 @@ static irqreturn_t flexcop_pci_isr(int i
 		ret = IRQ_NONE;
 	}
 
-	spin_unlock_irq(&fc_pci->irq_lock);
+	spin_unlock_irqrestore(&fc_pci->irq_lock,flags);
 
 	return ret;
 }
@@ -309,12 +310,12 @@ static int flexcop_pci_init(struct flexc
 	}
 
 	pci_set_drvdata(fc_pci->pdev, fc_pci);
-
+	spin_lock_init(&fc_pci->irq_lock);
 	if ((ret = request_irq(fc_pci->pdev->irq, flexcop_pci_isr,
 					IRQF_SHARED, DRIVER_NAME, fc_pci)) != 0)
 		goto err_pci_iounmap;
 
-	spin_lock_init(&fc_pci->irq_lock);
+
 
 	fc_pci->init_state |= FC_PCI_INIT;
 	return ret;


linux-2.6-firewire-check-condition.patch:
 fw-sbp2.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

--- NEW FILE linux-2.6-firewire-check-condition.patch ---
>From ad12bc442b70e3bfd831e197dbaeabcd6086a137 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Kristian_H=C3=B8gsberg?= <krh at redhat.com>
Date: Fri, 6 Apr 2007 10:44:57 -0400
Subject: [PATCH] Report CHECK_CONDITION up to the SCSI stack.

On some devices (e.g. the 3rd generation iPod) the command agent
dies a lot, typically on SCSI level errors.  When it dies it returns
an CHECK_CONDITION status, and we need to propagate this up to the
SCSI stack so it properly recover the device.
---
 drivers/firewire/fw-sbp2.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index 2e5479b..28d0884 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -746,7 +746,8 @@ static struct fw_driver sbp2_driver = {
 	.id_table = sbp2_id_table,
 };
 
-static unsigned int sbp2_status_to_sense_data(u8 * sbp2_status, u8 * sense_data)
+static unsigned int
+sbp2_status_to_sense_data(u8 *sbp2_status, u8 *sense_data)
 {
 	sense_data[0] = 0x70;
 	sense_data[1] = 0x0;
@@ -767,20 +768,19 @@ static unsigned int sbp2_status_to_sense_data(u8 * sbp2_status, u8 * sense_data)
 
 	switch (sbp2_status[0] & 0x3f) {
 	case SAM_STAT_GOOD:
-		return DID_OK;
+		return DID_OK << 16;
 
 	case SAM_STAT_CHECK_CONDITION:
-		/* return CHECK_CONDITION << 1 | DID_OK << 16; */
-		return DID_OK;
+		return DID_OK << 16 | CHECK_CONDITION << 1;
 
 	case SAM_STAT_BUSY:
-		return DID_BUS_BUSY;
+		return DID_BUS_BUSY << 16;
 
 	case SAM_STAT_CONDITION_MET:
 	case SAM_STAT_RESERVATION_CONFLICT:
 	case SAM_STAT_COMMAND_TERMINATED:
 	default:
-		return DID_ERROR;
+		return DID_ERROR << 16;
 	}
 }
 
@@ -801,26 +801,26 @@ complete_command_orb(struct sbp2_orb *base_orb, struct sbp2_status *status)
 
 		switch (status_get_response(*status)) {
 		case SBP2_STATUS_REQUEST_COMPLETE:
-			result = DID_OK;
+			result = DID_OK << 16;
 			break;
 		case SBP2_STATUS_TRANSPORT_FAILURE:
-			result = DID_BUS_BUSY;
+			result = DID_BUS_BUSY << 16;
 			break;
 		case SBP2_STATUS_ILLEGAL_REQUEST:
 		case SBP2_STATUS_VENDOR_DEPENDENT:
 		default:
-			result = DID_ERROR;
+			result = DID_ERROR << 16;
 			break;
 		}
 
-		if (result == DID_OK && status_get_len(*status) > 1)
+		if (result == DID_OK << 16 && status_get_len(*status) > 1)
 			result = sbp2_status_to_sense_data(status_get_data(*status),
 							   orb->cmd->sense_buffer);
 	} else {
 		/* If the orb completes with status == NULL, something
 		 * went wrong, typically a bus reset happened mid-orb
 		 * or when sending the write (less likely). */
-		result = DID_BUS_BUSY;
+		result = DID_BUS_BUSY << 16;
 	}
 
 	dma_unmap_single(device->card->device, orb->base.request_bus,
@@ -841,7 +841,7 @@ complete_command_orb(struct sbp2_orb *base_orb, struct sbp2_status *status)
 				 sizeof orb->request_buffer_bus,
 				 DMA_FROM_DEVICE);
 
-	orb->cmd->result = result << 16;
+	orb->cmd->result = result;
 	orb->done(orb->cmd);
 
 	kfree(orb);
-- 
1.4.4.2


linux-2.6-firewire-context-run.patch:
 fw-ohci.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-firewire-context-run.patch ---
>From 758c2744e2a64aa0c20d229b1f08a6d6b48b8d17 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Kristian_H=C3=B8gsberg?= <krh at redhat.com>
Date: Fri, 6 Apr 2007 10:32:26 -0400
Subject: [PATCH] Check CONTEXT_RUN, not CONTEXT_ACTIVE to se if context is running.

Doh.
---
 drivers/firewire/fw-ohci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 6f9895d..fca7eac 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -661,7 +661,7 @@ at_context_queue_packet(struct context *ctx, struct fw_packet *packet)
 
 	/* If the context isn't already running, start it up. */
 	reg = reg_read(ctx->ohci, control_set(ctx->regs));
-	if ((reg & CONTEXT_ACTIVE) == 0)
+	if ((reg & CONTEXT_RUN) == 0)
 		context_run(ctx, 0);
 
 	return 0;
-- 
1.4.4.2


linux-2.6-fix-pmops-1.patch:
 arch/arm/common/sharpsl_pm.c |    1 
 arch/arm/mach-at91/pm.c      |    1 
 arch/arm/mach-omap1/pm.c     |    1 
 arch/arm/mach-omap2/pm.c     |    1 
 arch/arm/mach-pxa/pm.c       |    4 ---
 arch/arm/mach-sa1100/pm.c    |    7 -----
 arch/arm/plat-s3c24xx/pm.c   |    9 ------
 arch/sh/boards/hp6xx/pm.c    |    7 -----
 include/linux/pm.h           |   23 +++++++++--------
 kernel/power/disk.c          |   56 ++++++++++++++++++++++++++++---------------
 kernel/power/main.c          |    6 +++-
 11 files changed, 54 insertions(+), 62 deletions(-)

--- NEW FILE linux-2.6-fix-pmops-1.patch ---
>From johannes at sipsolutions.net Wed Mar 21 15:56:28 2007
Date: Wed, 21 Mar 2007 15:56:28 +0100
From: Johannes Berg <johannes at sipsolutions.net>
To: Andrew Morton <akpm at linux-foundation.org>
Cc: linux-pm at lists.linux-foundation.org, David Brownell <david-b at pacbell.net>, Pavel Machek <pavel at ucw.cz>
Subject: [PATCH 1/3] rework pm_ops pm_disk_mode, kill misuse

The pm_ops.pm_disk_mode is used in totally bogus ways since
nobody really seems to understand what it actually does.

This patch clarifies the pm_disk_mode description.

It also removes all the arm and sh users that think they can veto
suspend to disk via pm_ops; not so since the user can always
do echo shutdown > /sys/power/disk, they need to find a better
way involving Kconfig or such.

ACPI is the only user left with a non-zero pm_disk_mode.

The patch also sets the default mode to shutdown again, but
when a new pm_ops is registered its pm_disk_mode is selected
as default, that way the default stays for ACPI where it is
apparently required.

Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Cc: David Brownell <david-b at pacbell.net>
Cc: Pavel Machek <pavel at ucw.cz>
Cc: linux-pm at lists.linux-foundation.org

---
 arch/arm/common/sharpsl_pm.c |    1 
 arch/arm/mach-at91/pm.c      |    1 
 arch/arm/mach-omap1/pm.c     |    1 
 arch/arm/mach-omap2/pm.c     |    1 
 arch/arm/mach-pxa/pm.c       |    4 ---
 arch/arm/mach-sa1100/pm.c    |    7 -----
 arch/arm/plat-s3c24xx/pm.c   |    9 ------
 arch/sh/boards/hp6xx/pm.c    |    7 -----
 include/linux/pm.h           |   23 +++++++++--------
 kernel/power/disk.c          |   56 ++++++++++++++++++++++++++++---------------
 kernel/power/main.c          |    6 +++-
 11 files changed, 54 insertions(+), 62 deletions(-)

--- linux-2.6.orig/include/linux/pm.h	2007-03-20 12:41:38.423214909 +0100
+++ linux-2.6/include/linux/pm.h	2007-03-20 12:42:02.253214909 +0100
@@ -112,6 +112,8 @@ typedef int __bitwise suspend_state_t;
 
 typedef int __bitwise suspend_disk_method_t;
 
+/* invalid must be 0 so struct pm_ops initialisers can leave it out */
+#define PM_DISK_INVALID		((__force suspend_disk_method_t) 0)
 #define	PM_DISK_FIRMWARE	((__force suspend_disk_method_t) 1)
 #define	PM_DISK_PLATFORM	((__force suspend_disk_method_t) 2)
 #define	PM_DISK_SHUTDOWN	((__force suspend_disk_method_t) 3)
@@ -137,17 +139,16 @@ typedef int __bitwise suspend_disk_metho
  * @finish: Called when the system has left the given state and all devices
  *	are resumed. The return value is ignored.
  *
- * @pm_disk_mode: Set to the disk method that the user should be able to
- *	configure for suspend-to-disk. Since %PM_DISK_SHUTDOWN,
- *	%PM_DISK_REBOOT, %PM_DISK_TEST and %PM_DISK_TESTPROC
- *	are always allowed, currently only %PM_DISK_PLATFORM
- *	makes sense. If the user then choses %PM_DISK_PLATFORM,
- *	the @prepare call will be called before suspending to disk
- *	(if present), the @enter call should be present and will
- *	be called after all state has been saved and the machine
- *	is ready to be shut down/suspended/..., and the @finish
- *	callback is called after state has been restored. All
- *	these calls are called with %PM_SUSPEND_DISK as the state.
+ * @pm_disk_mode: The generic code always allows one of the shutdown methods
+ *	%PM_DISK_SHUTDOWN, %PM_DISK_REBOOT, %PM_DISK_TEST and
+ *	%PM_DISK_TESTPROC. If this variable is set, the mode it is set
+ *	to is allowed in addition to those modes and is also made default.
+ *	When this mode is sent selected, the @prepare call will be called
+ *	before suspending to disk (if present), the @enter call should be
+ *	present and will be called after all state has been saved and the
+ *	machine is ready to be powered off; the @finish callback is called
+ *	after state has been restored. All these calls are called with
+ *	%PM_SUSPEND_DISK as the state.
  */
 struct pm_ops {
 	int (*valid)(suspend_state_t state);
--- linux-2.6.orig/kernel/power/disk.c	2007-03-20 12:41:38.463214909 +0100
+++ linux-2.6/kernel/power/disk.c	2007-03-20 12:42:02.263214909 +0100
@@ -39,7 +39,13 @@ static inline int platform_prepare(void)
 {
 	int error = 0;
 
-	if (pm_disk_mode == PM_DISK_PLATFORM) {
+	switch (pm_disk_mode) {
+	case PM_DISK_TEST:
+	case PM_DISK_TESTPROC:
+	case PM_DISK_SHUTDOWN:
+	case PM_DISK_REBOOT:
+		break;
+	default:
 		if (pm_ops && pm_ops->prepare)
 			error = pm_ops->prepare(PM_SUSPEND_DISK);
 	}
@@ -48,30 +54,32 @@ static inline int platform_prepare(void)
 
 /**
  *	power_down - Shut machine down for hibernate.
- *	@mode:		Suspend-to-disk mode
  *
- *	Use the platform driver, if configured so, and return gracefully if it
- *	fails.
- *	Otherwise, try to power off and reboot. If they fail, halt the machine,
- *	there ain't no turning back.
+ *	Use the platform driver, if configured so; otherwise try
+ *	to power off or reboot.
  */
 
-static void power_down(suspend_disk_method_t mode)
+static void power_down(void)
 {
-	switch(mode) {
-	case PM_DISK_PLATFORM:
-		if (pm_ops && pm_ops->enter) {
-			kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
-			pm_ops->enter(PM_SUSPEND_DISK);
-			break;
-		}
+
+	switch (pm_disk_mode) {
+	case PM_DISK_TEST:
+	case PM_DISK_TESTPROC:
+		break;
 	case PM_DISK_SHUTDOWN:
 		kernel_power_off();
 		break;
 	case PM_DISK_REBOOT:
 		kernel_restart(NULL);
 		break;
+	default:
+		if (pm_ops && pm_ops->enter) {
+			kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
+			pm_ops->enter(PM_SUSPEND_DISK);
+			break;
+		}
 	}
+
 	kernel_halt();
 	/* Valid image is on the disk, if we continue we risk serious data corruption
 	   after resume. */
@@ -82,7 +90,13 @@ static void power_down(suspend_disk_meth
 
 static inline void platform_finish(void)
 {
-	if (pm_disk_mode == PM_DISK_PLATFORM) {
+	switch (pm_disk_mode) {
+	case PM_DISK_TEST:
+	case PM_DISK_TESTPROC:
+	case PM_DISK_SHUTDOWN:
+	case PM_DISK_REBOOT:
+		break;
+	default:
 		if (pm_ops && pm_ops->finish)
 			pm_ops->finish(PM_SUSPEND_DISK);
 	}
@@ -167,7 +181,7 @@ int pm_suspend_disk(void)
 		pr_debug("PM: writing image.\n");
 		error = swsusp_write();
 		if (!error)
-			power_down(pm_disk_mode);
+			power_down();
 		else {
 			swsusp_free();
 			goto Thaw;
@@ -347,10 +361,14 @@ static ssize_t disk_store(struct subsyst
 		}
 	}
 	if (mode) {
-		if (mode == PM_DISK_SHUTDOWN || mode == PM_DISK_REBOOT ||
-		     mode == PM_DISK_TEST || mode == PM_DISK_TESTPROC) {
+		switch (mode) {
+		case PM_DISK_SHUTDOWN:
+		case PM_DISK_REBOOT:
+		case PM_DISK_TEST:
+		case PM_DISK_TESTPROC:
 			pm_disk_mode = mode;
-		} else {
+			break;
+		default:
 			if (pm_ops && pm_ops->enter &&
 			    (mode == pm_ops->pm_disk_mode))
 				pm_disk_mode = mode;
--- linux-2.6.orig/kernel/power/main.c	2007-03-20 12:41:38.543214909 +0100
+++ linux-2.6/kernel/power/main.c	2007-03-20 12:42:02.263214909 +0100
@@ -30,7 +30,7 @@
 DEFINE_MUTEX(pm_mutex);
 
 struct pm_ops *pm_ops;
-suspend_disk_method_t pm_disk_mode = PM_DISK_PLATFORM;
+suspend_disk_method_t pm_disk_mode = PM_DISK_SHUTDOWN;
 
 /**
  *	pm_set_ops - Set the global power method table. 
@@ -41,6 +41,10 @@ void pm_set_ops(struct pm_ops * ops)
 {
 	mutex_lock(&pm_mutex);
 	pm_ops = ops;
+	if (ops && ops->pm_disk_mode != PM_DISK_INVALID) {
+		pm_disk_mode = ops->pm_disk_mode;
+	} else
+		pm_disk_mode = PM_DISK_SHUTDOWN;
 	mutex_unlock(&pm_mutex);
 }
 
--- linux-2.6.orig/arch/arm/common/sharpsl_pm.c	2007-03-20 12:41:38.673214909 +0100
+++ linux-2.6/arch/arm/common/sharpsl_pm.c	2007-03-20 12:42:02.263214909 +0100
@@ -766,7 +766,6 @@ static void sharpsl_apm_get_power_status
 }
 
 static struct pm_ops sharpsl_pm_ops = {
-	.pm_disk_mode	= PM_DISK_FIRMWARE,
 	.prepare	= pxa_pm_prepare,
 	.enter		= corgi_pxa_pm_enter,
 	.finish		= pxa_pm_finish,
--- linux-2.6.orig/arch/arm/mach-at91/pm.c	2007-03-20 12:41:38.743214909 +0100
+++ linux-2.6/arch/arm/mach-at91/pm.c	2007-03-20 12:42:02.263214909 +0100
@@ -201,7 +201,6 @@ error:
 
 
 static struct pm_ops at91_pm_ops ={
-	.pm_disk_mode	= 0,
 	.valid		= at91_pm_valid_state,
 	.prepare	= at91_pm_prepare,
 	.enter		= at91_pm_enter,
--- linux-2.6.orig/arch/arm/mach-omap1/pm.c	2007-03-20 12:41:38.763214909 +0100
+++ linux-2.6/arch/arm/mach-omap1/pm.c	2007-03-20 12:42:02.263214909 +0100
@@ -698,7 +698,6 @@ static struct irqaction omap_wakeup_irq 
 
 
 static struct pm_ops omap_pm_ops ={
-	.pm_disk_mode	= 0,
 	.prepare	= omap_pm_prepare,
 	.enter		= omap_pm_enter,
 	.finish		= omap_pm_finish,
--- linux-2.6.orig/arch/arm/mach-omap2/pm.c	2007-03-20 12:41:38.833214909 +0100
+++ linux-2.6/arch/arm/mach-omap2/pm.c	2007-03-20 12:42:02.263214909 +0100
@@ -370,7 +370,6 @@ static int omap2_pm_finish(suspend_state
 }
 
 static struct pm_ops omap_pm_ops = {
-	.pm_disk_mode	= 0,
 	.prepare	= omap2_pm_prepare,
 	.enter		= omap2_pm_enter,
 	.finish		= omap2_pm_finish,
--- linux-2.6.orig/arch/arm/mach-pxa/pm.c	2007-03-20 12:41:38.853214909 +0100
+++ linux-2.6/arch/arm/mach-pxa/pm.c	2007-03-20 12:42:02.263214909 +0100
@@ -223,11 +223,7 @@ int pxa_pm_finish(suspend_state_t state)
 
 EXPORT_SYMBOL_GPL(pxa_pm_finish);
 
-/*
- * Set to PM_DISK_FIRMWARE so we can quickly veto suspend-to-disk.
- */
 static struct pm_ops pxa_pm_ops = {
-	.pm_disk_mode	= PM_DISK_FIRMWARE,
 	.prepare	= pxa_pm_prepare,
 	.enter		= pxa_pm_enter,
 	.finish		= pxa_pm_finish,
--- linux-2.6.orig/arch/arm/mach-sa1100/pm.c	2007-03-20 12:41:38.903214909 +0100
+++ linux-2.6/arch/arm/mach-sa1100/pm.c	2007-03-20 12:42:02.273214909 +0100
@@ -59,9 +59,6 @@ static int sa11x0_pm_enter(suspend_state
 	unsigned long gpio, sleep_save[SLEEP_SAVE_SIZE];
 	struct timespec delta, rtc;
 
-	if (state != PM_SUSPEND_MEM)
-		return -EINVAL;
-
 	/* preserve current time */
 	rtc.tv_sec = RCNR;
 	rtc.tv_nsec = 0;
@@ -134,11 +131,7 @@ unsigned long sleep_phys_sp(void *sp)
 	return virt_to_phys(sp);
 }
 
-/*
- * Set to PM_DISK_FIRMWARE so we can quickly veto suspend-to-disk.
- */
 static struct pm_ops sa11x0_pm_ops = {
-	.pm_disk_mode	= PM_DISK_FIRMWARE,
 	.enter		= sa11x0_pm_enter,
 };
 
--- linux-2.6.orig/arch/arm/plat-s3c24xx/pm.c	2007-03-20 12:41:38.953214909 +0100
+++ linux-2.6/arch/arm/plat-s3c24xx/pm.c	2007-03-20 12:42:02.273214909 +0100
@@ -511,11 +511,6 @@ static int s3c2410_pm_enter(suspend_stat
 		return -EINVAL;
 	}
 
-	if (state != PM_SUSPEND_MEM) {
-		printk(KERN_ERR PFX "error: only PM_SUSPEND_MEM supported\n");
-		return -EINVAL;
-	}
-
 	/* check if we have anything to wake-up with... bad things seem
 	 * to happen if you suspend with no wakeup (system will often
 	 * require a full power-cycle)
@@ -633,11 +628,7 @@ static int s3c2410_pm_finish(suspend_sta
 	return 0;
 }
 
-/*
- * Set to PM_DISK_FIRMWARE so we can quickly veto suspend-to-disk.
- */
 static struct pm_ops s3c2410_pm_ops = {
-	.pm_disk_mode	= PM_DISK_FIRMWARE,
 	.prepare	= s3c2410_pm_prepare,
 	.enter		= s3c2410_pm_enter,
 	.finish		= s3c2410_pm_finish,
--- linux-2.6.orig/arch/sh/boards/hp6xx/pm.c	2007-03-20 12:41:39.163214909 +0100
+++ linux-2.6/arch/sh/boards/hp6xx/pm.c	2007-03-20 12:42:02.273214909 +0100
@@ -27,9 +27,6 @@ static int hp6x0_pm_enter(suspend_state_
 	u16 hd64461_stbcr;
 #endif
 
-	if (state != PM_SUSPEND_MEM)
-		return -EINVAL;
-
 #ifdef CONFIG_HD64461_ENABLER
 	outb(0, HD64461_PCC1CSCIER);
 
@@ -70,11 +67,7 @@ static int hp6x0_pm_enter(suspend_state_
 	return 0;
 }
 
-/*
- * Set to PM_DISK_FIRMWARE so we can quickly veto suspend-to-disk.
- */
 static struct pm_ops hp6x0_pm_ops = {
-	.pm_disk_mode	= PM_DISK_FIRMWARE,
 	.enter		= hp6x0_pm_enter,
 };
 

--

linux-2.6-fix-pmops-2.patch:
 Documentation/power/interface.txt |   21 +++++----------------
 Documentation/power/states.txt    |   13 +++++++------
 Documentation/power/swsusp.txt    |   14 +++++---------
 include/linux/pm.h                |   13 ++++++-------
 kernel/power/disk.c               |   27 +++++++++++----------------
 5 files changed, 34 insertions(+), 54 deletions(-)

--- NEW FILE linux-2.6-fix-pmops-2.patch ---
>From johannes at sipsolutions.net Wed Mar 21 15:56:26 2007
Date: Wed, 21 Mar 2007 15:56:26 +0100
From: Johannes Berg <johannes at sipsolutions.net>
To: Andrew Morton <akpm at linux-foundation.org>
Cc: linux-pm at lists.linux-foundation.org, Pavel Machek <pavel at ucw.cz>
Subject: [PATCH 2/3] power management: remove firmware disk mode

This patch removes the firmware disk suspend mode which is the wrong
approach, it is supposed to be used for implementing firmware-based disk
suspend but cannot actually be used for that.

Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Cc: Pavel Machek <pavel at ucw.cz>
Cc: linux-pm at lists.linux-foundation.org

---
 Documentation/power/interface.txt |   21 +++++----------------
 Documentation/power/states.txt    |   13 +++++++------
 Documentation/power/swsusp.txt    |   14 +++++---------
 include/linux/pm.h                |   13 ++++++-------
 kernel/power/disk.c               |   27 +++++++++++----------------
 5 files changed, 34 insertions(+), 54 deletions(-)

--- linux-2.6.orig/include/linux/pm.h	2007-03-21 15:44:54.663148946 +0100
+++ linux-2.6/include/linux/pm.h	2007-03-21 15:45:04.403148946 +0100
@@ -114,13 +114,12 @@ typedef int __bitwise suspend_disk_metho
 
 /* invalid must be 0 so struct pm_ops initialisers can leave it out */
 #define PM_DISK_INVALID		((__force suspend_disk_method_t) 0)
-#define	PM_DISK_FIRMWARE	((__force suspend_disk_method_t) 1)
-#define	PM_DISK_PLATFORM	((__force suspend_disk_method_t) 2)
-#define	PM_DISK_SHUTDOWN	((__force suspend_disk_method_t) 3)
-#define	PM_DISK_REBOOT		((__force suspend_disk_method_t) 4)
-#define	PM_DISK_TEST		((__force suspend_disk_method_t) 5)
-#define	PM_DISK_TESTPROC	((__force suspend_disk_method_t) 6)
-#define	PM_DISK_MAX		((__force suspend_disk_method_t) 7)
+#define	PM_DISK_PLATFORM	((__force suspend_disk_method_t) 1)
+#define	PM_DISK_SHUTDOWN	((__force suspend_disk_method_t) 2)
+#define	PM_DISK_REBOOT		((__force suspend_disk_method_t) 3)
+#define	PM_DISK_TEST		((__force suspend_disk_method_t) 4)
+#define	PM_DISK_TESTPROC	((__force suspend_disk_method_t) 5)
+#define	PM_DISK_MAX		((__force suspend_disk_method_t) 6)
 
 /**
  * struct pm_ops - Callbacks for managing platform dependent suspend states.
--- linux-2.6.orig/kernel/power/disk.c	2007-03-21 15:44:54.693148946 +0100
+++ linux-2.6/kernel/power/disk.c	2007-03-21 15:48:06.073148946 +0100
@@ -123,8 +123,6 @@ static int prepare_processes(void)
 /**
  *	pm_suspend_disk - The granpappy of hibernation power management.
  *
- *	If we're going through the firmware, then get it over with quickly.
- *
  *	If not, then call swsusp to do its thing, then figure out how
  *	to power down the system.
  */
@@ -301,7 +299,6 @@ late_initcall(software_resume);
 
 
 static const char * const pm_disk_modes[] = {
-	[PM_DISK_FIRMWARE]	= "firmware",
 	[PM_DISK_PLATFORM]	= "platform",
 	[PM_DISK_SHUTDOWN]	= "shutdown",
 	[PM_DISK_REBOOT]	= "reboot",
@@ -312,27 +309,25 @@ static const char * const pm_disk_modes[
 /**
  *	disk - Control suspend-to-disk mode
  *
- *	Suspend-to-disk can be handled in several ways. The greatest
- *	distinction is who writes memory to disk - the firmware or the OS.
- *	If the firmware does it, we assume that it also handles suspending
- *	the system.
- *	If the OS does it, then we have three options for putting the system
- *	to sleep - using the platform driver (e.g. ACPI or other PM registers),
- *	powering off the system or rebooting the system (for testing).
+ *	Suspend-to-disk can be handled in several ways. We have a few options
+ *	for putting the system to sleep - using the platform driver (e.g. ACPI
+ *	or other pm_ops), powering off the system or rebooting the system
+ *	(for testing) as well as the two test modes.
  *
- *	The system will support either 'firmware' or 'platform', and that is
- *	known a priori (and encoded in pm_ops). But, the user may choose
- *	'shutdown' or 'reboot' as alternatives.
+ *	The system can support 'platform', and that is known a priori (and
+ *	encoded in pm_ops). However, the user may choose 'shutdown' or 'reboot'
+ *	as alternatives, as well as the test modes 'test' and 'testproc'.
  *
  *	show() will display what the mode is currently set to.
  *	store() will accept one of
  *
- *	'firmware'
  *	'platform'
  *	'shutdown'
  *	'reboot'
+ *	'test'
+ *	'testproc'
  *
- *	It will only change to 'firmware' or 'platform' if the system
+ *	It will only change to 'platform' if the system
  *	supports it (as determined from pm_ops->pm_disk_mode).
  */
 
@@ -354,7 +349,7 @@ static ssize_t disk_store(struct subsyst
 	len = p ? p - buf : n;
 
 	mutex_lock(&pm_mutex);
-	for (i = PM_DISK_FIRMWARE; i < PM_DISK_MAX; i++) {
+	for (i = PM_DISK_PLATFORM; i < PM_DISK_MAX; i++) {
 		if (!strncmp(buf, pm_disk_modes[i], len)) {
 			mode = i;
 			break;
--- linux-2.6.orig/Documentation/power/interface.txt	2007-03-21 15:45:17.873148946 +0100
+++ linux-2.6/Documentation/power/interface.txt	2007-03-21 15:49:26.673148946 +0100
@@ -18,17 +18,10 @@ states.
 
 
 /sys/power/disk controls the operating mode of the suspend-to-disk
-mechanism. Suspend-to-disk can be handled in several ways. The
-greatest distinction is who writes memory to disk - the firmware or
-the kernel. If the firmware does it, we assume that it also handles
-suspending the system. 
-
-If the kernel does it, then we have three options for putting the system
-to sleep - using the platform driver (e.g. ACPI or other PM
-registers), powering off the system or rebooting the system (for
-testing). The system will support either 'firmware' or 'platform', and
-that is known a priori. But, the user may choose 'shutdown' or
-'reboot' as alternatives. 
+mechanism. Suspend-to-disk can be handled in several ways. We have a
+few options for putting the system to sleep - using the platform driver
+(e.g. ACPI or other pm_ops), powering off the system or rebooting the
+system (for testing).
 
 Additionally, /sys/power/disk can be used to turn on one of the two testing
 modes of the suspend-to-disk mechanism: 'testproc' or 'test'.  If the
@@ -44,16 +37,12 @@ is being slow and which device drivers a
 Reading from this file will display what the mode is currently set
 to. Writing to this file will accept one of
 
-       'firmware'
-       'platform'
+       'platform' (only if the platform supports it)
        'shutdown'
        'reboot'
        'testproc'
        'test'
 
-It will only change to 'firmware' or 'platform' if the system supports
-it. 
-
 /sys/power/image_size controls the size of the image created by
 the suspend-to-disk mechanism.  It can be written a string
 representing a non-negative integer that will be used as an upper
--- linux-2.6.orig/Documentation/power/states.txt	2007-03-21 15:45:17.993148946 +0100
+++ linux-2.6/Documentation/power/states.txt	2007-03-21 15:51:18.763148946 +0100
@@ -62,17 +62,18 @@ setup via another operating system for i
 inconvenience, this method requires minimal work by the kernel, since
 the firmware will also handle restoring memory contents on resume. 
 
-If the kernel is responsible for persistently saving state, a mechanism
-called 'swsusp' (Swap Suspend) is used to write memory contents to
-free swap space. swsusp has some restrictive requirements, but should
-work in most cases. Some, albeit outdated, documentation can be found
-in Documentation/power/swsusp.txt. 
+For suspend-to-disk, a mechanism called swsusp called 'swsusp' (Swap
+Suspend) is used to write memory contents to free swap space.
+swsusp has some restrictive requirements, but should work in most
+cases. Some, albeit outdated, documentation can be found in
+Documentation/power/swsusp.txt. Alternatively, userspace can do most
+of the actual suspend to disk work, see userland-swsusp.txt.
 
 Once memory state is written to disk, the system may either enter a
 low-power state (like ACPI S4), or it may simply power down. Powering
 down offers greater savings, and allows this mechanism to work on any
 system. However, entering a real low-power state allows the user to
-trigger wake up events (e.g. pressing a key or opening a laptop lid). 
+trigger wake up events (e.g. pressing a key or opening a laptop lid).
 
 A transition from Suspend-to-Disk to the On state should take about 30
 seconds, though it's typically a bit more with the current
--- linux-2.6.orig/Documentation/power/swsusp.txt	2007-03-21 15:45:18.133148946 +0100
+++ linux-2.6/Documentation/power/swsusp.txt	2007-03-21 15:52:20.423148946 +0100
@@ -156,8 +156,7 @@ instead set the PF_NOFREEZE process flag
 be very careful).
 
 
-Q: What is the difference between "platform", "shutdown" and
-"firmware" in /sys/power/disk?
+Q: What is the difference between "platform" and "shutdown"?
 
 A:
 
@@ -166,11 +165,8 @@ shutdown: save state in linux, then tell
 platform: save state in linux, then tell bios to powerdown and blink
           "suspended led"
 
-firmware: tell bios to save state itself [needs BIOS-specific suspend
-	  partition, and has very little to do with swsusp]
-
-"platform" is actually right thing to do, but "shutdown" is most
-reliable.
+"platform" is actually right thing to do where supported, but
+"shutdown" is most reliable (except on ACPI systems).
 
 Q: I do not understand why you have such strong objections to idea of
 selective suspend.
@@ -388,8 +384,8 @@ while the system is asleep, maintaining 
 modes like "suspend-to-RAM" or "standby".  (Don't write "disk" to the
 /sys/power/state file; write "standby" or "mem".)  We've not seen any
 hardware that can use these modes through software suspend, although in
-theory some systems might support "platform" or "firmware" modes that
-won't break the USB connections.
+theory some systems might support "platform" modes that won't break the
+USB connections.
 
 Remember that it's always a bad idea to unplug a disk drive containing a
 mounted filesystem.  That's true even when your system is asleep!  The

--

linux-2.6-fix-pmops-3.patch:
 arch/arm/common/sharpsl_pm.c |    1 +
 arch/arm/mach-omap1/pm.c     |    1 +
 arch/arm/mach-omap2/pm.c     |    1 +
 arch/arm/mach-pnx4008/pm.c   |   35 +----------------------------------
 arch/arm/mach-pxa/pm.c       |    1 +
 arch/arm/mach-sa1100/pm.c    |    1 +
 arch/arm/plat-s3c24xx/pm.c   |   19 +------------------
 arch/sh/boards/hp6xx/pm.c    |    1 +
 drivers/acpi/sleep/main.c    |   13 +++++++++++--
 include/linux/pm.h           |    4 ++++
 kernel/power/main.c          |   13 +++++++++++++
 11 files changed, 36 insertions(+), 54 deletions(-)

--- NEW FILE linux-2.6-fix-pmops-3.patch ---
>From johannes at sipsolutions.net Wed Mar 21 15:56:31 2007
Date: Wed, 21 Mar 2007 15:56:31 +0100
From: Johannes Berg <johannes at sipsolutions.net>
To: Andrew Morton <akpm at linux-foundation.org>
Cc: linux-pm at lists.linux-foundation.org, David Brownell <david-b at pacbell.net>, Pavel Machek <pavel at ucw.cz>
Subject: [PATCH 3/3] power management: implement pm_ops.valid for everybody

Almost all users of pm_ops only support mem sleep, don't check in .valid
and don't reject any others in .prepare so users can be confused if they
check /sys/power/state, especially when new states are added (these would
then result in s-t-r although they're supposed to be something different).

This patch implements a generic pm_valid_only_mem function that is then
exported for users and puts it to use in almost all existing pm_ops.

Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Cc: David Brownell <david-b at pacbell.net>
Cc: Pavel Machek <pavel at ucw.cz>
Cc: linux-pm at lists.linux-foundation.org

---
 arch/arm/common/sharpsl_pm.c |    1 +
 arch/arm/mach-omap1/pm.c     |    1 +
 arch/arm/mach-omap2/pm.c     |    1 +
 arch/arm/mach-pnx4008/pm.c   |   35 +----------------------------------
 arch/arm/mach-pxa/pm.c       |    1 +
 arch/arm/mach-sa1100/pm.c    |    1 +
 arch/arm/plat-s3c24xx/pm.c   |   19 +------------------
 arch/sh/boards/hp6xx/pm.c    |    1 +
 drivers/acpi/sleep/main.c    |   13 +++++++++++--
 include/linux/pm.h           |    4 ++++
 kernel/power/main.c          |   13 +++++++++++++
 11 files changed, 36 insertions(+), 54 deletions(-)

--- linux-2.6.orig/include/linux/pm.h	2007-03-20 12:42:04.813214909 +0100
+++ linux-2.6/include/linux/pm.h	2007-03-20 12:42:05.693214909 +0100
@@ -128,6 +128,9 @@ typedef int __bitwise suspend_disk_metho
  *	always valid and never passed to this call.
  *	If not assigned, all suspend states are advertised as valid
  *	in /sys/power/state (but can still be rejected by prepare or enter.)
+ *	Since new states can be added for other platforms, you should
+ *	assign this callback. There is a %pm_valid_only_mem function
+ *	available if you only implemented mem sleep.
  *
  * @prepare: Prepare the platform for the given suspend state. Can return a
  *	negative error code if necessary.
@@ -165,6 +168,7 @@ extern void pm_set_ops(struct pm_ops *pm
 extern struct pm_ops *pm_ops;
 extern int pm_suspend(suspend_state_t state);
 
+extern int pm_valid_only_mem(suspend_state_t state);
 
 /*
  * Device power management
--- linux-2.6.orig/arch/arm/common/sharpsl_pm.c	2007-03-20 12:42:02.263214909 +0100
+++ linux-2.6/arch/arm/common/sharpsl_pm.c	2007-03-20 12:42:05.693214909 +0100
@@ -769,6 +769,7 @@ static struct pm_ops sharpsl_pm_ops = {
 	.prepare	= pxa_pm_prepare,
 	.enter		= corgi_pxa_pm_enter,
 	.finish		= pxa_pm_finish,
+	.valid		= pm_valid_only_mem,
 };
 
 static int __init sharpsl_pm_probe(struct platform_device *pdev)
--- linux-2.6.orig/arch/arm/mach-omap1/pm.c	2007-03-20 12:42:02.263214909 +0100
+++ linux-2.6/arch/arm/mach-omap1/pm.c	2007-03-20 12:42:05.703214909 +0100
@@ -701,6 +701,7 @@ static struct pm_ops omap_pm_ops ={
 	.prepare	= omap_pm_prepare,
 	.enter		= omap_pm_enter,
 	.finish		= omap_pm_finish,
+	.valid		= pm_valid_only_mem,
 };
 
 static int __init omap_pm_init(void)
--- linux-2.6.orig/arch/arm/mach-omap2/pm.c	2007-03-20 12:42:02.263214909 +0100
+++ linux-2.6/arch/arm/mach-omap2/pm.c	2007-03-20 12:42:05.703214909 +0100
@@ -373,6 +373,7 @@ static struct pm_ops omap_pm_ops = {
 	.prepare	= omap2_pm_prepare,
 	.enter		= omap2_pm_enter,
 	.finish		= omap2_pm_finish,
+	.valid		= pm_valid_only_mem,
 };
 
 int __init omap2_pm_init(void)
--- linux-2.6.orig/arch/arm/mach-pnx4008/pm.c	2007-03-20 12:41:36.133214909 +0100
+++ linux-2.6/arch/arm/mach-pnx4008/pm.c	2007-03-20 12:42:05.703214909 +0100
@@ -115,42 +115,9 @@ static int pnx4008_pm_enter(suspend_stat
 	return 0;
 }
 
-/*
- * Called after processes are frozen, but before we shut down devices.
- */
-static int pnx4008_pm_prepare(suspend_state_t state)
-{
-	switch (state) {
-	case PM_SUSPEND_STANDBY:
-	case PM_SUSPEND_MEM:
-		break;
-
-	case PM_SUSPEND_DISK:
-		return -ENOTSUPP;
-		break;
-
-	default:
-		return -EINVAL;
-		break;
-	}
-	return 0;
-}
-
-/*
- * Called after devices are re-setup, but before processes are thawed.
- */
-static int pnx4008_pm_finish(suspend_state_t state)
-{
-	return 0;
-}
-
-/*
- * Set to PM_DISK_FIRMWARE so we can quickly veto suspend-to-disk.
- */
 static struct pm_ops pnx4008_pm_ops = {
-	.prepare = pnx4008_pm_prepare,
 	.enter = pnx4008_pm_enter,
-	.finish = pnx4008_pm_finish,
+	.valid = pm_valid_only_mem,
 };
 
 static int __init pnx4008_pm_init(void)
--- linux-2.6.orig/arch/arm/mach-pxa/pm.c	2007-03-20 12:42:02.263214909 +0100
+++ linux-2.6/arch/arm/mach-pxa/pm.c	2007-03-20 12:42:05.703214909 +0100
@@ -227,6 +227,7 @@ static struct pm_ops pxa_pm_ops = {
 	.prepare	= pxa_pm_prepare,
 	.enter		= pxa_pm_enter,
 	.finish		= pxa_pm_finish,
+	.valid		= pm_valid_only_mem,
 };
 
 static int __init pxa_pm_init(void)
--- linux-2.6.orig/arch/arm/mach-sa1100/pm.c	2007-03-20 12:42:02.273214909 +0100
+++ linux-2.6/arch/arm/mach-sa1100/pm.c	2007-03-20 12:42:05.703214909 +0100
@@ -133,6 +133,7 @@ unsigned long sleep_phys_sp(void *sp)
 
 static struct pm_ops sa11x0_pm_ops = {
 	.enter		= sa11x0_pm_enter,
+	.valid		= pm_valid_only_mem,
 };
 
 static int __init sa11x0_pm_init(void)
--- linux-2.6.orig/arch/arm/plat-s3c24xx/pm.c	2007-03-20 12:42:02.273214909 +0100
+++ linux-2.6/arch/arm/plat-s3c24xx/pm.c	2007-03-20 12:42:05.703214909 +0100
@@ -612,26 +612,9 @@ static int s3c2410_pm_enter(suspend_stat
 	return 0;
 }
 
-/*
- * Called after processes are frozen, but before we shut down devices.
- */
-static int s3c2410_pm_prepare(suspend_state_t state)
-{
-	return 0;
-}
-
-/*
- * Called after devices are re-setup, but before processes are thawed.
- */
-static int s3c2410_pm_finish(suspend_state_t state)
-{
-	return 0;
-}
-
 static struct pm_ops s3c2410_pm_ops = {
-	.prepare	= s3c2410_pm_prepare,
 	.enter		= s3c2410_pm_enter,
-	.finish		= s3c2410_pm_finish,
+	.valid		= pm_valid_only_mem,
 };
 
 /* s3c2410_pm_init
--- linux-2.6.orig/arch/sh/boards/hp6xx/pm.c	2007-03-20 12:42:02.273214909 +0100
+++ linux-2.6/arch/sh/boards/hp6xx/pm.c	2007-03-20 12:42:05.713214909 +0100
@@ -69,6 +69,7 @@ static int hp6x0_pm_enter(suspend_state_
 
 static struct pm_ops hp6x0_pm_ops = {
 	.enter		= hp6x0_pm_enter,
+	.valid		= pm_valid_only_mem,
 };
 
 static int __init hp6x0_pm_init(void)
--- linux-2.6.orig/drivers/acpi/sleep/main.c	2007-03-20 12:41:36.863214909 +0100
+++ linux-2.6/drivers/acpi/sleep/main.c	2007-03-20 12:42:05.713214909 +0100
@@ -168,9 +168,18 @@ int acpi_suspend(u32 acpi_state)
 
 static int acpi_pm_state_valid(suspend_state_t pm_state)
 {
-	u32 acpi_state = acpi_suspend_states[pm_state];
+	u32 acpi_state;
 
-	return sleep_states[acpi_state];
+	switch (pm_state) {
+	case PM_SUSPEND_ON:
+	case PM_SUSPEND_STANDBY:
+	case PM_SUSPEND_MEM:
+		acpi_state = acpi_suspend_states[pm_state];
+
+		return sleep_states[acpi_state];
+	default:
+		return 0;
+	}
 }
 
 static struct pm_ops acpi_pm_ops = {
--- linux-2.6.orig/kernel/power/main.c	2007-03-20 12:42:02.263214909 +0100
+++ linux-2.6/kernel/power/main.c	2007-03-20 12:42:05.713214909 +0100
@@ -48,6 +48,19 @@ void pm_set_ops(struct pm_ops * ops)
 	mutex_unlock(&pm_mutex);
 }
 
+/**
+ * pm_valid_only_mem - generic memory-only valid callback
+ *
+ * pm_ops drivers that implement mem suspend only and only need
+ * to check for that in their .valid callback can use this instead
+ * of rolling their own .valid callback.
+ */
+int pm_valid_only_mem(suspend_state_t state)
+{
+	return state == PM_SUSPEND_MEM;
+}
+
+
 static inline void pm_finish(suspend_state_t state)
 {
 	if (pm_ops->finish)

--

linux-2.6-fix-pmops-4.patch:
 include/linux/pm.h  |   10 ++++++++++
 kernel/power/main.c |   10 ++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-fix-pmops-4.patch ---
---
 include/linux/pm.h  |   10 ++++++++++
 kernel/power/main.c |   10 ++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

--- wireless-dev.orig/include/linux/pm.h	2007-04-05 18:14:07.948549941 +0200
+++ wireless-dev/include/linux/pm.h	2007-04-05 18:14:13.568549941 +0200
@@ -131,9 +131,17 @@ typedef int __bitwise suspend_disk_metho
  * @prepare: Prepare the platform for the given suspend state. Can return a
  *	negative error code if necessary.
  *
+ * @irq_off: If assigned, the generic suspend code does not turn off IRQs
+ *	but relies on this callback instead. It is currently not called for
+ *	%PM_SUSPEND_DISK.
+ *
  * @enter: Enter the given suspend state, must be assigned. Can return a
  *	negative error code if necessary.
  *
+ * @irq_on: If assigned, the generic suspend code does not turn on IRQs
+ *	but relies on this callback instead. it is currently not called for
+ *	%PM_SUSPEND_DISK.
+ *
  * @finish: Called when the system has left the given state and all devices
  *	are resumed. The return value is ignored.
  *
@@ -152,7 +160,9 @@ typedef int __bitwise suspend_disk_metho
 struct pm_ops {
 	int (*valid)(suspend_state_t state);
 	int (*prepare)(suspend_state_t state);
+	void (*irq_off)(suspend_state_t state);
 	int (*enter)(suspend_state_t state);
+	void (*irq_on)(suspend_state_t state);
 	int (*finish)(suspend_state_t state);
 	suspend_disk_method_t pm_disk_mode;
 };
--- wireless-dev.orig/kernel/power/main.c	2007-04-05 18:14:07.988549941 +0200
+++ wireless-dev/kernel/power/main.c	2007-04-05 18:25:21.108549941 +0200
@@ -117,7 +117,10 @@ int suspend_enter(suspend_state_t state)
 	int error = 0;
 	unsigned long flags;
 
-	local_irq_save(flags);
+	if (pm_ops->irq_off)
+		pm_ops->irq_off(state);
+	else
+		local_irq_save(flags);
 
 	if ((error = device_power_down(PMSG_SUSPEND))) {
 		printk(KERN_ERR "Some devices failed to power down\n");
@@ -126,7 +129,10 @@ int suspend_enter(suspend_state_t state)
 	error = pm_ops->enter(state);
 	device_power_up();
  Done:
-	local_irq_restore(flags);
+	if (pm_ops->irq_on)
+		pm_ops->irq_on(state);
+	else
+		local_irq_restore(flags);
 	return error;
 }
 

linux-2.6-i82875-edac-pci-setup.patch:
 i82875p_edac.c |   13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

--- NEW FILE linux-2.6-i82875-edac-pci-setup.patch ---
From: John Feeney <jfeeney at redhat.com>
Subject: [PATCH RHEL-5] BZ219288 /proc/bus/pci/devices speaks LIES
Date: Mon, 08 Jan 2007 15:52:30 -0500
Bugzilla: 219288
Message-Id: <45A2AF0E.5080901 at redhat.com>
Changelog: edac: fix /proc/bus/pci/devices to allow X to start


RHBZ#: 219288 /proc/bus/pci/devices speaks LIES
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=219288

Description:
On specific Dell systems (e.g. PE 700), X fails to start with the following
errors in /var/log/Xorg.0.log:

(EE) No devices detected.

Fatal server error:
no screens found
XIO:  fatal IO error 104 (Connection reset by peer) on X server ":0.0"
    after 0 requests (0 known processed) with 0 events remaining.

After some investigation, by Ajax, it was determined that the
/proc/bus/pci/devices file and the /proc/bus/pci/* tree did not match,  
that is,
the devices file could list 15 devices while there would be 16 entries 
in the
tree. This discrepancy caused X to be unable to find its device, e.g. 
mach64.

Upon further review, it was determined that the device with the 8086:257e
pci id was missing from the devices file, hence the investigation lead to
drivers/edac/i82875p_edac.c where Dell determined that this driver was
adding an entry to the /proc tree with a call to pci_proc_attach_device()
but not to the global list of devices, the list that the devices file 
displays.

RHEL Version Found:
RHEL5-B2 (2.6.18-1.2767.el5)

The Proposed Fix:
The pci_bus_add_device function will replace pci_proc_attach_device()
because pci_bus_add_device() calls pci_proc_attach_device() while
populating the devices file as well.

In lieu of qualifying the call (with a "if(dev->procent==NULL)"), the
pci_bus_add_device() will be included in the if statement that detects a 
hidden
device. Thus, when the device previously hidden by BIOS is enabled and
detected, the /proc file system components will be fully implemented 
with the
pci_bus_add_device() call.

Note: In the drivers subdirectory, it appears as though i82875p_edac.c
is the only place outside of the pci directory where 
pci_proc_attach_device()
is called while pci_bus_add_device() is called by 17 other drivers. 
Perhaps,
this and the fact that pci_proc_attach_device() needed to be externed 
should
have been a red flag to the author of the original patch that added this
functionality.

Also note: even though the original code had pci_proc_attach_device() call
enveloped in "#ifdef CONFIG_PROC_FS", all other situations in drivers/*
where pci_bus_add_device() was called did not use this ifdef so it was not
carried forward.

Upstream Status:
It  does not  appear as though this fix is upstream at this point in
time. The offending function was added to 2.6.17-git17 in June of
2006. This patch will be submitted upstream.

--- linux-2.6.18.noarch/drivers/edac/i82875p_edac.c.dell
+++ linux-2.6.18.noarch/drivers/edac/i82875p_edac.c
@@ -261,10 +261,6 @@ static void i82875p_check(struct mem_ctl
 	i82875p_process_error_info(mci, &info, 1);
 }
 
-#ifdef CONFIG_PROC_FS
-extern int pci_proc_attach_device(struct pci_dev *);
-#endif
-
 /* Return 0 on success or 1 on failure. */
 static int i82875p_setup_overfl_dev(struct pci_dev *pdev,
 		struct pci_dev **ovrfl_pdev, void __iomem **ovrfl_window)
@@ -287,17 +283,12 @@ static int i82875p_setup_overfl_dev(stru
 
 		if (dev == NULL)
 			return 1;
+
+        	pci_bus_add_device(dev);
 	}
 
 	*ovrfl_pdev = dev;
 
-#ifdef CONFIG_PROC_FS
-	if ((dev->procent == NULL) && pci_proc_attach_device(dev)) {
-		i82875p_printk(KERN_ERR, "%s(): Failed to attach overflow "
-			       "device\n", __func__);
-		return 1;
-	}
-#endif  /* CONFIG_PROC_FS */
 	if (pci_enable_device(dev)) {
 		i82875p_printk(KERN_ERR, "%s(): Failed to enable overflow "
 			       "device\n", __func__);


linux-2.6-mpc52xx-fec.patch:
 drivers/net/Kconfig                                         |    1 
 drivers/net/Makefile                                        |    1 
 linux-2.6.20.fec/drivers/net/fec_mpc52xx/Kconfig            |   23 
 linux-2.6.20.fec/drivers/net/fec_mpc52xx/Makefile           |    8 
 linux-2.6.20.fec/drivers/net/fec_mpc52xx/fec.c              |  872 ++++++++++++
 linux-2.6.20.fec/drivers/net/fec_mpc52xx/fec.h              |  308 ++++
 linux-2.6.20.fec/drivers/net/fec_mpc52xx/fec_phy.c          |  532 +++++++
 linux-2.6.20.fec/drivers/net/fec_mpc52xx/fec_phy.h          |   73 +
 linux-2.6.20.fec/drivers/net/fec_mpc52xx/sdma_fec.c         |  173 ++
 linux-2.6.20.fec/drivers/net/fec_mpc52xx/sdma_fec.h         |   71 
 linux-2.6.20.fec/drivers/net/fec_mpc52xx/sdma_fec_rx_task.c |   71 
 linux-2.6.20.fec/drivers/net/fec_mpc52xx/sdma_fec_tx_task.c |   84 +
 12 files changed, 2217 insertions(+)

--- NEW FILE linux-2.6-mpc52xx-fec.patch ---
diff -uNr linux-2.6.20.ppc64/drivers/net/fec_mpc52xx/fec.c linux-2.6.20.fec/drivers/net/fec_mpc52xx/fec.c
--- linux-2.6.20.ppc64/drivers/net/fec_mpc52xx/fec.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.20.fec/drivers/net/fec_mpc52xx/fec.c	2007-03-27 23:52:17.000000000 +0100
@@ -0,0 +1,872 @@
+/*
+ * drivers/net/fec_mpc52xx/fec.c
+ *
+ * Driver for the MPC5200 Fast Ethernet Controller
+ *
+ * Author: Dale Farnsworth <dfarnsworth at mvista.com>
+ *
+ * 2003-2004 (c) MontaVista, Software, Inc.  This file is licensed under
+ * the terms of the GNU General Public License version 2.  This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+
+#include <linux/module.h>
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/spinlock.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/crc32.h>
+
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/ethtool.h>
+#include <linux/skbuff.h>
+
+#include <asm/io.h>
+#include <asm/delay.h>
+#include <asm/ppcboot.h>
+#include <asm/mpc52xx.h>
+
+#if defined(CONFIG_PPC_MERGE)
+#include <asm/of_device.h>
+#include <asm/of_platform.h>
+#include <platforms/52xx/bestcomm.h>
+#include "sdma_fec.h"
+#else
+#include <syslib/bestcomm/bestcomm.h>
+#include <syslib/bestcomm/fec.h>
+#endif
+
+#include "fec_phy.h"
+#include "fec.h"
+
+#define DRIVER_NAME "mpc52xx-fec"
+
+static irqreturn_t fec_interrupt(int, void *);
+static irqreturn_t fec_rx_interrupt(int, void *);
+static irqreturn_t fec_tx_interrupt(int, void *);
+static struct net_device_stats *fec_get_stats(struct net_device *);
+static void fec_set_multicast_list(struct net_device *dev);
+static void fec_reinit(struct net_device *dev);
+
+static u8 mpc52xx_fec_mac_addr[6];
+static u8 null_mac[6];
+
+static void fec_tx_timeout(struct net_device *dev)
+{
+	struct fec_priv *priv = (struct fec_priv *)dev->priv;
+
+	priv->stats.tx_errors++;
+
+	if (!priv->tx_full)
+		netif_wake_queue(dev);
+}
+
+static void fec_set_paddr(struct net_device *dev, u8 *mac)
+{
+	struct fec_priv *priv = (struct fec_priv *)dev->priv;
+	struct mpc52xx_fec *fec = priv->fec;
+
+	out_be32(&fec->paddr1, *(u32*)(&mac[0]));
+	out_be32(&fec->paddr2, (*(u16*)(&mac[4]) << 16) | 0x8808);
+}
+
+static void fec_get_paddr(struct net_device *dev, u8 *mac)
+{
+	struct fec_priv *priv = (struct fec_priv *)dev->priv;
+	struct mpc52xx_fec *fec = priv->fec;
+
+	*(u32*)(&mac[0]) = in_be32(&fec->paddr1);
+	*(u16*)(&mac[4]) = in_be32(&fec->paddr2) >> 16;
+}
+
+static int fec_set_mac_address(struct net_device *dev, void *addr)
+{
+	struct sockaddr *sock = (struct sockaddr *)addr;
+
+	memcpy(dev->dev_addr, sock->sa_data, dev->addr_len);
+
+	fec_set_paddr(dev, sock->sa_data);
+	return 0;
+}
+
+/* This function is called to start or restart the FEC during a link
+ * change.  This happens on fifo errors or when switching between half
+ * and full duplex.
+ */
+static void fec_restart(struct net_device *dev, int duplex)
+{
+	struct fec_priv *priv = (struct fec_priv *)dev->priv;
+	struct mpc52xx_fec *fec = priv->fec;
+	u32 rcntrl;
+	u32 tcntrl;
+	int i;
+
+	out_be32(&fec->rfifo_status, in_be32(&fec->rfifo_status) & 0x700000);
+	out_be32(&fec->tfifo_status, in_be32(&fec->tfifo_status) & 0x700000);
+	out_be32(&fec->reset_cntrl, 0x1000000);
+
+	/* Whack a reset.  We should wait for this. */
+	out_be32(&fec->ecntrl, FEC_ECNTRL_RESET);
+	for (i = 0; i < FEC_RESET_DELAY; ++i) {
+		if ((in_be32(&fec->ecntrl) & FEC_ECNTRL_RESET) == 0)
+			break;
+		udelay(1);
+	}
+	if (i == FEC_RESET_DELAY)
+		printk (KERN_ERR DRIVER_NAME ": FEC Reset timeout!\n");
+
+	/* Set station address. */
+	fec_set_paddr(dev, dev->dev_addr);
+
+	fec_set_multicast_list(dev);
+
+	rcntrl = FEC_RX_BUFFER_SIZE << 16;	/* max frame length */
+	rcntrl |= FEC_RCNTRL_FCE;
+	rcntrl |= MII_RCNTL_MODE;
+	if (duplex)
+		tcntrl = FEC_TCNTRL_FDEN;		/* FD enable */
+	else {
+		rcntrl |= FEC_RCNTRL_DRT;
+		tcntrl = 0;
+	}
+	out_be32(&fec->r_cntrl, rcntrl);
+	out_be32(&fec->x_cntrl, tcntrl);
+
+	set_phy_speed(fec, priv->phy_speed);
+
+	priv->full_duplex = duplex;
+
+	/* Clear any outstanding interrupt. */
+	out_be32(&fec->ievent, 0xffffffff);	/* clear intr events */
+
+	/* Enable interrupts we wish to service.
+	*/
+	out_be32(&fec->imask, FEC_IMASK_ENABLE);
+
+	/* And last, enable the transmit and receive processing.
+	*/
+	out_be32(&fec->ecntrl, FEC_ECNTRL_ETHER_EN);
+	out_be32(&fec->r_des_active, 0x01000000);
+
+	/* The tx ring is no longer full. */
+	if (priv->tx_full)
+	{
+		priv->tx_full = 0;
+		netif_wake_queue(dev);
+	}
+}
+
+static void fec_free_rx_buffers(struct sdma *s)
+{
+	struct sk_buff *skb;
+
+	while (!sdma_queue_empty(s)) {
+		skb = sdma_retrieve_buffer(s, NULL);
+		kfree_skb(skb);
+	}
+}
+
+static int fec_open(struct net_device *dev)
+{
+	struct fec_priv *priv = (struct fec_priv *)dev->priv;
+	struct sk_buff *skb;
+	void *data;
+
+	sdma_fec_rx_init(priv->rx_sdma, priv->rx_fifo, FEC_RX_BUFFER_SIZE);
+	sdma_fec_tx_init(priv->tx_sdma, priv->tx_fifo);
+
+	while (!sdma_queue_full(priv->rx_sdma)) {
+		skb = dev_alloc_skb(FEC_RX_BUFFER_SIZE);
+		if (skb == 0)
+			goto eagain;
+
+		/* zero out the initial receive buffers to aid debugging */
+		memset(skb->data, 0, FEC_RX_BUFFER_SIZE);
+		data = (void *)virt_to_phys(skb->data);
+		sdma_submit_buffer(priv->rx_sdma, skb, data, FEC_RX_BUFFER_SIZE);
+	}
+
+	fec_set_paddr(dev, dev->dev_addr);
+
+	if (fec_mii_wait(dev) != 0)
[...1876 lines suppressed...]
+struct sdma_fec_tx_inc {
+	u16 pad0;
+	s16 incr_bytes;
+	u16 pad1;
+	s16 incr_src;
+	u16 pad2;
+	s16 incr_src_ma;
+};
+
+extern int sdma_fec_rx_init(struct sdma *s, phys_addr_t fifo, int maxbufsize);
+extern int sdma_fec_tx_init(struct sdma *s, phys_addr_t fifo);
+
+extern u32 sdma_fec_rx_task[];
+extern u32 sdma_fec_tx_task[];
+
+
+#endif  /* __BESTCOMM_FEC_H__ */
diff -uNr linux-2.6.20.ppc64/drivers/net/fec_mpc52xx/sdma_fec_rx_task.c linux-2.6.20.fec/drivers/net/fec_mpc52xx/sdma_fec_rx_task.c
--- linux-2.6.20.ppc64/drivers/net/fec_mpc52xx/sdma_fec_rx_task.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.20.fec/drivers/net/fec_mpc52xx/sdma_fec_rx_task.c	2007-03-27 22:57:09.000000000 +0100
@@ -0,0 +1,71 @@
+/*
+ * sdma_fec_rx_task.c
+ *
+ * Automatically created based on BestCommAPI-2.2/code_dma/image_rtos1/dma_image.hex
+ * on Tue Mar 22 11:19:38 2005 GMT
+ */
+
+#include <linux/types.h>
+
+/*
+ * The header consists of the following fields:
+ *	uint32_t	magic;
+ *	uint8_t		desc_size;
+ *	uint8_t		var_size;
+ *	uint8_t		inc_size;
+ *	uint8_t		first_var;
+ *	uint8_t		reserved[8];
+ *
+ * The size fields contain the number of 32-bit words.
+*/
+
+uint32_t sdma_fec_rx_task[] = {
+	/* header */
+	0x4243544b,
+	0x18060709,
+	0x00000000,
+	0x00000000,
+
+	/* Task descriptors */
+	0x808220e3, /* LCD: idx0 = var1, idx1 = var4; idx1 <= var3; idx0 += inc4, idx1 += inc3 */
+	0x10601010, /*   DRD1A: var4 = var2; FN=0 MORE init=3 WS=0 RS=0 */
+	0xb8800264, /*   LCD: idx2 = *idx1, idx3 = var0; idx2 < var9; idx2 += inc4, idx3 += inc4 */
+	0x10001308, /*     DRD1A: var4 = idx1; FN=0 MORE init=0 WS=0 RS=0 */
+	0x60140002, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT init=0 WS=2 RS=2 */
+	0x0cccfcca, /*     DRD2B1: *idx3 = EU3(); EU3(*idx3,var10)  */
+	0x80004000, /*   LCDEXT: idx2 = 0x00000000; ; */
+	0xb8c58029, /*   LCD: idx3 = *(idx1 + var00000015); idx3 once var0; idx3 += inc5 */
+	0x60000002, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT init=0 WS=0 RS=0 */
+	0x088cf8cc, /*     DRD2B1: idx2 = EU3(); EU3(idx3,var12)  */
+	0x991982f2, /*   LCD: idx2 = idx2, idx3 = idx3; idx2 > var11; idx2 += inc6, idx3 += inc2 */
+	0x006acf80, /*     DRD1A: *idx3 = *idx0; FN=0 init=3 WS=1 RS=1 */
+	0x80004000, /*   LCDEXT: idx2 = 0x00000000; ; */
+	0x9999802d, /*   LCD: idx3 = idx3; idx3 once var0; idx3 += inc5 */
+	0x70000002, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT MORE init=0 WS=0 RS=0 */
+	0x034cfc4e, /*     DRD2B1: var13 = EU3(); EU3(*idx1,var14)  */
+	0x00008868, /*     DRD1A: idx2 = var13; FN=0 init=0 WS=0 RS=0 */
+	0x99198341, /*   LCD: idx2 = idx2, idx3 = idx3; idx2 > var13; idx2 += inc0, idx3 += inc1 */
+	0x007ecf80, /*     DRD1A: *idx3 = *idx0; FN=0 init=3 WS=3 RS=3 */
+	0x99198272, /*   LCD: idx2 = idx2, idx3 = idx3; idx2 > var9; idx2 += inc6, idx3 += inc2 */
+	0x046acf80, /*     DRD1A: *idx3 = *idx0; FN=0 INT init=3 WS=1 RS=1 */
+	0x9819002d, /*   LCD: idx2 = idx0; idx2 once var0; idx2 += inc5 */
+	0x0060c790, /*     DRD1A: *idx1 = *idx2; FN=0 init=3 WS=0 RS=0 */
+	0x000001f8, /*   NOP */
+
+	/* VAR[9]-VAR[14] */
+	0x40000000,
+	0x7fff7fff,
+	0x00000000,
+	0x00000003,
+	0x40000008,
+	0x43ffffff,
+
+	/* INC[0]-INC[6] */
+	0x40000000,
+	0xe0000000,
+	0xe0000000,
+	0xa0000008,
+	0x20000000,
+	0x00000000,
+	0x4000ffff,
+};
diff -uNr linux-2.6.20.ppc64/drivers/net/fec_mpc52xx/sdma_fec_tx_task.c linux-2.6.20.fec/drivers/net/fec_mpc52xx/sdma_fec_tx_task.c
--- linux-2.6.20.ppc64/drivers/net/fec_mpc52xx/sdma_fec_tx_task.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.20.fec/drivers/net/fec_mpc52xx/sdma_fec_tx_task.c	2007-03-27 22:57:09.000000000 +0100
@@ -0,0 +1,84 @@
+/*
+ * sdma_fec_tx_task.c
+ *
+ * Automatically created based on BestCommAPI-2.2/code_dma/image_rtos1/dma_image.hex
+ * on Tue Mar 22 11:19:29 2005 GMT
+ */
+
+#include <linux/types.h>
+
+/*
+ * The header consists of the following fields:
+ *	uint32_t	magic;
+ *	uint8_t		desc_size;
+ *	uint8_t		var_size;
+ *	uint8_t		inc_size;
+ *	uint8_t		first_var;
+ *	uint8_t		reserved[8];
+ *
+ * The size fields contain the number of 32-bit words.
+*/
+
+uint32_t sdma_fec_tx_task[] = {
+	/* header */
+	0x4243544b,
+	0x2407070d,
+	0x00000000,
+	0x00000000,
+
+	/* Task descriptors */
+	0x8018001b, /* LCD: idx0 = var0; idx0 <= var0; idx0 += inc3 */
+	0x60000005, /*   DRD2A: EU0=0 EU1=0 EU2=0 EU3=5 EXT init=0 WS=0 RS=0 */
+	0x01ccfc0d, /*   DRD2B1: var7 = EU3(); EU3(*idx0,var13)  */
+	0x8082a123, /* LCD: idx0 = var1, idx1 = var5; idx1 <= var4; idx0 += inc4, idx1 += inc3 */
+	0x10801418, /*   DRD1A: var5 = var3; FN=0 MORE init=4 WS=0 RS=0 */
+	0xf88103a4, /*   LCDEXT: idx2 = *idx1, idx3 = var2; idx2 < var14; idx2 += inc4, idx3 += inc4 */
+	0x801a6024, /*   LCD: idx4 = var0; ; idx4 += inc4 */
+	0x10001708, /*     DRD1A: var5 = idx1; FN=0 MORE init=0 WS=0 RS=0 */
+	0x60140002, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT init=0 WS=2 RS=2 */
+	0x0cccfccf, /*     DRD2B1: *idx3 = EU3(); EU3(*idx3,var15)  */
+	0x991a002c, /*   LCD: idx2 = idx2, idx3 = idx4; idx2 once var0; idx2 += inc5, idx3 += inc4 */
+	0x70000002, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT MORE init=0 WS=0 RS=0 */
+	0x024cfc4d, /*     DRD2B1: var9 = EU3(); EU3(*idx1,var13)  */
+	0x60000003, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=3 EXT init=0 WS=0 RS=0 */
+	0x0cccf247, /*     DRD2B1: *idx3 = EU3(); EU3(var9,var7)  */
+	0x80004000, /*   LCDEXT: idx2 = 0x00000000; ; */
+	0xb8c80029, /*   LCD: idx3 = *(idx1 + var0000001a); idx3 once var0; idx3 += inc5 */
+	0x70000002, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT MORE init=0 WS=0 RS=0 */
+	0x088cf8d1, /*     DRD2B1: idx2 = EU3(); EU3(idx3,var17)  */
+	0x00002f10, /*     DRD1A: var11 = idx2; FN=0 init=0 WS=0 RS=0 */
+	0x99198432, /*   LCD: idx2 = idx2, idx3 = idx3; idx2 > var16; idx2 += inc6, idx3 += inc2 */
+	0x008ac398, /*     DRD1A: *idx0 = *idx3; FN=0 init=4 WS=1 RS=1 */
+	0x80004000, /*   LCDEXT: idx2 = 0x00000000; ; */
+	0x9999802d, /*   LCD: idx3 = idx3; idx3 once var0; idx3 += inc5 */
+	0x70000002, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT MORE init=0 WS=0 RS=0 */
+	0x048cfc53, /*     DRD2B1: var18 = EU3(); EU3(*idx1,var19)  */
+	0x60000008, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=8 EXT init=0 WS=0 RS=0 */
+	0x088cf48b, /*     DRD2B1: idx2 = EU3(); EU3(var18,var11)  */
+	0x99198481, /*   LCD: idx2 = idx2, idx3 = idx3; idx2 > var18; idx2 += inc0, idx3 += inc1 */
+	0x009ec398, /*     DRD1A: *idx0 = *idx3; FN=0 init=4 WS=3 RS=3 */
+	0x991983b2, /*   LCD: idx2 = idx2, idx3 = idx3; idx2 > var14; idx2 += inc6, idx3 += inc2 */
+	0x088ac398, /*     DRD1A: *idx0 = *idx3; FN=0 TFD init=4 WS=1 RS=1 */
+	0x9919002d, /*   LCD: idx2 = idx2; idx2 once var0; idx2 += inc5 */
+	0x60000005, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=5 EXT init=0 WS=0 RS=0 */
+	0x0c4cf88e, /*     DRD2B1: *idx1 = EU3(); EU3(idx2,var14)  */
+	0x000001f8, /*   NOP */
+
+	/* VAR[13]-VAR[19] */
+	0x0c000000,
+	0x40000000,
+	0x7fff7fff,
+	0x00000000,
+	0x00000003,
+	0x40000004,
+	0x43ffffff,
+
+	/* INC[0]-INC[6] */
+	0x40000000,
+	0xe0000000,
+	0xe0000000,
+	0xa0000008,
+	0x20000000,
+	0x00000000,
+	0x4000ffff,
+};
--- linux-2.6.20.ppc64/drivers/net/Makefile	2007-03-22 11:18:04.000000000 +0000
+++ linux-2.6.20.fec/drivers/net/Makefile	2007-03-27 19:09:21.000000000 +0100
@@ -196,6 +196,7 @@ obj-$(CONFIG_SMC91X) += smc91x.o
 obj-$(CONFIG_SMC911X) += smc911x.o
 obj-$(CONFIG_DM9000) += dm9000.o
 obj-$(CONFIG_FEC_8XX) += fec_8xx/
+obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx/
 obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o
 
 obj-$(CONFIG_MACB) += macb.o
--- linux-2.6.20.ppc64/drivers/net/Kconfig	2007-03-22 11:17:54.000000000 +0000
+++ linux-2.6.20.fec/drivers/net/Kconfig	2007-03-27 19:09:21.000000000 +0100
@@ -1889,6 +1889,7 @@ config NE_H8300
 	  controller on the Renesas H8/300 processor.
 
 source "drivers/net/fec_8xx/Kconfig"
+source "drivers/net/fec_mpc52xx/Kconfig"
 source "drivers/net/fs_enet/Kconfig"
 
 endmenu

linux-2.6-mpc52xx-sdma.patch:
 arch/powerpc/Kconfig                                    |    5 
 linux-2.6.20.fec/arch/powerpc/platforms/52xx/Makefile   |    1 
 linux-2.6.20.fec/arch/powerpc/platforms/52xx/bestcomm.c |  399 +++++++++++++
 linux-2.6.20.fec/arch/powerpc/platforms/52xx/bestcomm.h |  478 ++++++++++++++++
 4 files changed, 883 insertions(+)

--- NEW FILE linux-2.6-mpc52xx-sdma.patch ---
--- linux-2.6.20.ppc64/arch/powerpc/Kconfig	2007-03-22 11:17:52.000000000 +0000
+++ linux-2.6.20.fec/arch/powerpc/Kconfig	2007-03-27 19:09:27.000000000 +0100
@@ -451,6 +456,11 @@
 
 	  It is safe to say 'Y' here
 
+config PPC_BESTCOMM
+	bool
+	depends on PPC_MPC52xx
+	default y
+
 config PPC_EFIKA
 	bool "bPlan Efika 5k2. MPC5200B based computer"
 	depends on PPC_MULTIPLATFORM && PPC32
diff -uNr linux-2.6.20.ppc64/arch/powerpc/platforms/52xx/bestcomm.c linux-2.6.20.fec/arch/powerpc/platforms/52xx/bestcomm.c
--- linux-2.6.20.ppc64/arch/powerpc/platforms/52xx/bestcomm.c	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.20.fec/arch/powerpc/platforms/52xx/bestcomm.c	2007-03-27 23:40:42.000000000 +0100
@@ -0,0 +1,399 @@
+/*
+ * arch/ppc/syslib/bestcomm/bestcomm.c
+ *
+ * Driver for MPC52xx processor BestComm peripheral controller
+ *
+ * Author: Dale Farnsworth <dfarnsworth at mvista.com>
+ *
+ * 2003-2004 (c) MontaVista, Software, Inc.  This file is licensed under
+ * the terms of the GNU General Public License version 2.  This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ *
+ * HISTORY:
+ *
+ * 2005-08-14	Converted to platform driver by 
+ *		Andrey Volkov <avolkov at varma-el.com>, Varma Electronics Oy
+ */
+
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/string.h>
+
+#include <asm/bug.h>
+#include <asm/io.h>
+#include <asm/mpc52xx.h>
+#include <asm/of_platform.h>
+
+#include "bestcomm.h"
+
+#define DRIVER_NAME "mpc52xx-bestcomm"
+
+struct sdma_io sdma;
+struct device_node *sdma_node;
+struct device_node *sram_node;
+
+static spinlock_t sdma_lock = SPIN_LOCK_UNLOCKED;
+
+#ifdef CONFIG_BESTCOMM_DEBUG
+void sdma_dump(void)
+{
+	int i;
+	printk("** SDMA registers: pa = %.8lx, va = %p\n",
+	       sdma.base_reg_addr, sdma.io);
+	printk("**  taskBar = %08x\n", sdma.io->taskBar);
+	printk("**  currentPointer = %08x\n", sdma.io->currentPointer);
+	printk("**  endPointer = %08x\n", sdma.io->endPointer);
+	printk("**  variablePointer = %08x\n", sdma.io->variablePointer);
+
+	printk("**  IntVect1 = %08x\n", sdma.io->IntVect1);
+	printk("**  IntVect2 = %08x\n", sdma.io->IntVect2);
+	printk("**  PtdCntrl = %08x\n", sdma.io->PtdCntrl);
+
+	printk("**  IntPend = %08x\n", sdma.io->IntPend);
+	printk("**  IntMask = %08x\n", sdma.io->IntMask);
+
+	printk("**  TCR dump:");	
+
+	for (i=0;i<16;i++)  {
+		if(i%8 == 0)
+			printk("\n**   %02X:",i);
+		printk(" %04X",sdma.io->tcr[i]);
+	}
+	printk("\n**  IPR dump:");	
+	for (i=0;i<32;i++)  {
+		if(i%16 == 0)
+			printk("\n**   %02X:",i);
+		printk(" %02X",sdma.io->ipr[i]);
+	}
+	printk("\n**  cReqSelect = %08x\n", sdma.io->cReqSelect);
+	printk("**  task_size0 = %08x\n", sdma.io->task_size0);
+	printk("**  task_size1 = %08x\n", sdma.io->task_size1);
+	printk("**  MDEDebug = %08x\n", sdma.io->MDEDebug);
+	printk("**  ADSDebug = %08x\n", sdma.io->ADSDebug);
+	printk("**  Value1 = %08x\n", sdma.io->Value1);
+	printk("**  Value2 = %08x\n", sdma.io->Value2);
+	printk("**  Control = %08x\n", sdma.io->Control);
+	printk("**  Status = %08x\n", sdma.io->Status);
+	printk("**  PTDDebug = %08x\n", sdma.io->PTDDebug);
+}
+#endif
+
+#ifdef CONFIG_BESTCOMM_DEBUG
+#define SDMA_DUMP_REGS()	sdma_dump()
+#else
+#define SDMA_DUMP_REGS()
+#endif
+
+/*
+ * Use a very simple SRAM allocator.
+ * There is no mechanism for freeing space.
+ * In an attempt to minimize internal fragmentation, the SRAM is
+ * divided into two areas.
+ *
+ * Area 1 is at the beginning of SRAM
+ * and is used for allocations requiring alignments of 16 bytes or less.
+ * Successive allocations return higher addresses.
+ *
+ * Area 2 is at the end of SRAM and is used for the remaining allocations.
+ * Successive allocations return lower addresses.
+ *
+ * I've considered adding routines to support the freeing of SRAM allocations,
+ * but the SRAM is so small (16K) that fragmentation can quickly cause the
+ * SRAM to be unusable.  If you can come up with a slick way to free SRAM
+ * memory without the fragmentation problem, please do so.
+ */
+
+static u8 *area1_end;
+static u8 *area2_begin;
+
+void *sdma_sram_alloc(int size, int alignment, u32 *dma_handle)
+{
+	u8 *a;
+
+	spin_lock(&sdma_lock);
+
+	/* alignment must be a power of 2 */
+	BUG_ON(alignment & (alignment - 1));
+
+	if (alignment < 16) {
+		a = (u8 *)(((u32)area1_end + (alignment-1)) & ~(alignment-1));
+		if (a + size <= area2_begin)
+			area1_end = a + size;
+		else
+			a = 0;				/* out of memory */
+	} else {
+		a = (u8 *)(((u32)area2_begin - size) & ~(alignment - 1));
+		if (a >= area1_end)
+			area2_begin = a;
+		else
+			a = 0;				/* out of memory */
+	}
+	if(a && dma_handle)
+		*dma_handle = sdma_sram_pa(a);
+	spin_unlock(&sdma_lock);
+	return (void *)a;
+}
+
+/* this will need to be updated if Freescale changes their task code FDT */
+static u32 fdt_ops[] = {
+	0xa0045670,	/* FDT[48] */
+	0x80045670,	/* FDT[49] */
+	0x21800000,	/* FDT[50] */
+	0x21e00000,	/* FDT[51] */
+	0x21500000,	/* FDT[52] */
+	0x21400000,	/* FDT[53] */
+	0x21500000,	/* FDT[54] */
+	0x20400000,	/* FDT[55] */
+	0x20500000,	/* FDT[56] */
+	0x20800000,	/* FDT[57] */
+	0x20a00000,	/* FDT[58] */
+	0xc0170000,	/* FDT[59] */
+	0xc0145670,	/* FDT[60] */
+	0xc0345670,	/* FDT[61] */
+	0xa0076540,	/* FDT[62] */
+	0xa0000760,	/* FDT[63] */
+};
+
+static int new_task_number(void)
+{
+	struct sdma_tdt *tdt;
+	int i;
+
+	spin_lock(&sdma_lock);
+
+	tdt = sdma.tdt;
+	for (i=0; i<SDMA_MAX_TASKS; i++, tdt++)
+		if (tdt->start == 0)
+			break;
+	if (i == SDMA_MAX_TASKS)
+		i = -1;
+
+	spin_unlock(&sdma_lock);
+
+	return i;
+}
+
+int sdma_load_task(u32 *task_image)
+{
+	struct sdma_task_header *head = (struct sdma_task_header *)task_image;
+	struct sdma_tdt *tdt;
+	int tasknum;
+	u32 *desc;
+	u32 *var_src, *var_dst;
+	u32 *inc_src;
+	void *start;
+
+	BUG_ON(head->magic != SDMA_TASK_MAGIC);
+
+	tasknum = new_task_number();
+	if (tasknum < 0)
+		return -ENOMEM;
+
+	desc = (u32 *)(head + 1);
+	var_src = desc + head->desc_size;
+	inc_src = var_src + head->var_size;
+
+	tdt = &sdma.tdt[tasknum];
+
+	start = sdma_sram_alloc(head->desc_size * sizeof(u32), 4, &tdt->start);
+	if (!start)
+		return -ENOMEM;
+	tdt->stop = tdt->start + (head->desc_size - 1)*sizeof(u32);
+	var_dst = sdma_sram_va(tdt->var);
+
+	memcpy(start, desc, head->desc_size * sizeof(u32));
+	memcpy(&var_dst[head->first_var], var_src, head->var_size * sizeof(u32));
+	memcpy(&var_dst[SDMA_MAX_VAR], inc_src, head->inc_size * sizeof(u32));
+
+	return tasknum;
+}
+
+void sdma_set_initiator(int task, int initiator)
+{
+	int i;
+	int num_descs;
+	u32 *desc;
+	int next_drd_has_initiator;
+
+	sdma_set_tcr_initiator(task, initiator);
+
+	desc = sdma_task_desc(task);
+	next_drd_has_initiator = 1;
+	num_descs = sdma_task_num_descs(task);
+
+	for (i=0; i<num_descs; i++, desc++) {
+		if (!sdma_desc_is_drd(*desc))
+			continue;
+		if (next_drd_has_initiator)
+			if (sdma_desc_initiator(*desc) != SDMA_INITIATOR_ALWAYS)
+				sdma_set_desc_initiator(desc, initiator);
+		next_drd_has_initiator = !sdma_drd_is_extended(*desc);
+	}
+}
+
+struct sdma *sdma_alloc(int queue_size)
+{
+	struct sdma *s = kmalloc(sizeof(*s), GFP_KERNEL);
+	void **cookie;
+
+	if (!s)
+		return NULL;
+
+	memset(s, 0, sizeof(*s));
+
+	if (queue_size) {
+		cookie = kmalloc(sizeof(*cookie) * queue_size, GFP_KERNEL);
+		if (!cookie) {
+			kfree(s);
+			return NULL;
+		}
+		s->cookie = cookie;
+	}
+
+	s->num_bd = queue_size;
+	s->node = sdma_node;
+	return s;
+}
+EXPORT_SYMBOL_GPL(sdma_alloc);
+
+void sdma_free(struct sdma *s)
+{
+	if (s->cookie)
+		kfree(s->cookie);
+	kfree(s);
+}
+
+static int __init mpc52xx_sdma_init(void)
+{
+	int task;
+	u32 *context;
+	u32 *fdt;
+	struct sdma_tdt *tdt;
+	struct resource mem_io, mem_sram;
+	u32 tdt_pa, var_pa, context_pa, fdt_pa;
+	int ret = -ENODEV;
+
+	/* Find SDMA registers */
+	sdma_node = of_find_compatible_node(NULL, "dma-controller", "mpc5200-bestcomm");
+	if (!sdma_node) {
+		printk (KERN_ERR DRIVER_NAME ": could not locate DMA controller\n");
+		goto out;
+	}
+
+	if ((ret = of_address_to_resource(sdma_node, 0, &mem_io)) != 0) {
+		printk(KERN_ERR "Could not get address of SDMA controller\n");
+		goto out;
+	}
+
+	/* Find SRAM location */
+	sram_node = of_find_compatible_node(NULL, "sram", "mpc5200-sram");
+	if (!sram_node) {
+		printk (KERN_ERR DRIVER_NAME ": could not locate SRAM\n");
+		goto out;
+	}
+
+	if ((ret = of_address_to_resource(sram_node, 0, &mem_sram)) != 0) {
+		printk(KERN_ERR "Could not get address of SRAM\n");
+		goto out;
+	}
+
+	/* Map register regions */
+	if (!request_mem_region(mem_io.start, mem_io.end - mem_io.start + 1,
+	                        DRIVER_NAME)) {
+		printk(KERN_ERR DRIVER_NAME " - resource unavailable\n");
+		goto out;
+	}
+	sdma.base_reg_addr = mem_io.start;
+
+	sdma.io = ioremap_nocache(mem_io.start, sizeof(struct mpc52xx_sdma));
+
+	if (!sdma.io ) {
+		printk(KERN_ERR DRIVER_NAME " - failed to map sdma regs\n");
+		ret = -ENOMEM;
+		goto map_io_error;
+	}
+
+	SDMA_DUMP_REGS();
+
+	sdma.sram_size = mem_sram.end - mem_sram.start + 1;
+	if (!request_mem_region(mem_sram.start, sdma.sram_size, DRIVER_NAME)) {
+		printk(KERN_ERR DRIVER_NAME " - resource unavailable\n");
+		goto req_sram_error;
+	}
+
+	sdma.base_sram_addr = mem_sram.start;
+	sdma.sram = ioremap_nocache(mem_sram.start, sdma.sram_size);
+	if (!sdma.sram ) {
+		printk(KERN_ERR DRIVER_NAME " - failed to map sdma sram\n");
+		ret = -ENOMEM;
+		goto map_sram_error;
+	}
+
+	area1_end = sdma.sram;
+	area2_begin = area1_end + sdma.sram_size;
+
+	memset(area1_end, 0, sdma.sram_size);
+
+	/* allocate space for task descriptors, contexts, and var tables */
+	sdma.tdt = sdma_sram_alloc(sizeof(struct sdma_tdt) * SDMA_MAX_TASKS, 4, &tdt_pa);
+
+	context = sdma_sram_alloc(SDMA_CONTEXT_SIZE * SDMA_MAX_TASKS,
+							  SDMA_CONTEXT_ALIGN, &context_pa);
+	sdma.var = sdma_sram_alloc( (SDMA_VAR_SIZE + SDMA_INC_SIZE) * SDMA_MAX_TASKS, 
+								SDMA_VAR_ALIGN, &var_pa);
+	fdt = sdma_sram_alloc(SDMA_FDT_SIZE, SDMA_FDT_ALIGN, &fdt_pa);
+	memcpy(&fdt[48], fdt_ops, sizeof(fdt_ops));
+
+	out_be32(&sdma.io->taskBar, tdt_pa);
+
+	tdt = sdma.tdt;
+	for (task=0; task < SDMA_MAX_TASKS; task++) {
+		out_be16(&sdma.io->tcr[task], 0);
+		out_8(&sdma.io->ipr[task], 0);
+
+		tdt->context = context_pa;
+		tdt->var = var_pa;
+		tdt->fdt = fdt_pa;
+		var_pa += (SDMA_MAX_VAR + SDMA_MAX_INC)*sizeof(u32);
+		context_pa += SDMA_MAX_CONTEXT*sizeof(u32);
+		tdt++;
+	}
+
+	out_8(&sdma.io->ipr[SDMA_INITIATOR_ALWAYS], SDMA_IPR_ALWAYS);
+
+	/* Disable COMM Bus Prefetch, apparently it's not reliable yet */
+	out_be16(&sdma.io->PtdCntrl, in_be16(&sdma.io->PtdCntrl) | 1);
+
+	printk(KERN_INFO "MPC52xx BestComm inited\n");
+
+	return 0;
+
+map_sram_error:
+	release_mem_region(mem_sram.start, sdma.sram_size);
+req_sram_error:
+	iounmap(sdma.io);
+map_io_error:
+	release_mem_region(mem_io.start, mem_io.end - mem_io.start + 1);
+out:
+	printk(KERN_ERR "DMA: MPC52xx BestComm init FAILED !!!\n");
+	return ret;
+}
+
+subsys_initcall(mpc52xx_sdma_init);
+
+
+MODULE_DESCRIPTION("Freescale MPC52xx BestComm DMA");
+MODULE_LICENSE("GPL");
+
+EXPORT_SYMBOL(sdma_sram_alloc);
+EXPORT_SYMBOL(sdma_load_task);
+EXPORT_SYMBOL(sdma_set_initiator);
+EXPORT_SYMBOL(sdma_free);
+EXPORT_SYMBOL(sdma);
+
+
diff -uNr linux-2.6.20.ppc64/arch/powerpc/platforms/52xx/bestcomm.h linux-2.6.20.fec/arch/powerpc/platforms/52xx/bestcomm.h
--- linux-2.6.20.ppc64/arch/powerpc/platforms/52xx/bestcomm.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.20.fec/arch/powerpc/platforms/52xx/bestcomm.h	2007-03-27 22:57:08.000000000 +0100
@@ -0,0 +1,478 @@
+/*
+ * arch/ppc/syslib/bestcomm/bestcomm.h
+ *
+ * Driver for MPC52xx processor BestComm peripheral controller
+ *
+ * Author: Dale Farnsworth <dfarnsworth at mvista.com>
+ *
+ * 2003-2004 (c) MontaVista, Software, Inc.  This file is licensed under
+ * the terms of the GNU General Public License version 2.  This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ *
+ * HISTORY:
+ *
+ * 2005-08-14	Converted to platform driver by 
+ *		Andrey Volkov <avolkov at varma-el.com>, Varma Electronics Oy
+ */
+
+#ifndef __BESTCOMM_BESTCOMM_H__
+#define __BESTCOMM_BESTCOMM_H__
+
+#include "mpc52xx_pic.h"
+
+/* Buffer Descriptor definitions */
+struct sdma_bd {
+	u32 status;
+	void *data;
+};
+
+struct sdma_bd2 {
+	u32 status;
+	void *data1;
+	void *data2;
+};
+
+struct sdma_io {
+	unsigned long			base_reg_addr;
+	struct mpc52xx_sdma __iomem	*io;
+	unsigned long			base_sram_addr;
+	void __iomem			*sram;
+	size_t				sram_size;
+
+	struct sdma_tdt __iomem  	*tdt;
+	u32 __iomem			*var;
+};
+extern struct sdma_io sdma;
+
+#define	sdma_sram_pa(virt)	(((unsigned long)(((void __iomem *)(virt))-sdma.sram))+sdma.base_sram_addr)
+#define	sdma_sram_va(pa)	((void __iomem *)((((unsigned long)(pa))-sdma.base_sram_addr)+((unsigned long)sdma.sram)))
+
+#define	sdma_io_pa(virt)	(((unsigned long)(((void __iomem *)(virt))-((void __iomem *)sdma.io)))+sdma.base_reg_addr)
+#define	sdma_io_va(pa)	((void __iomem *)((((unsigned long)(pa))-sdma.base_reg_addr)+((unsigned long)sdma.io)))
+
+#define SDMA_LEN_BITS		26
+#define SDMA_LEN_MASK		((1 << SDMA_LEN_BITS) - 1)
+
+#define SDMA_BD_READY		0x40000000UL
+
+#define SDMA_FEC_TX_BD_TFD	0x08000000UL	/* transmit frame done */
+#define SDMA_FEC_TX_BD_INT	0x04000000UL	/* Interrupt */
+#define SDMA_FEC_TX_BD_TFD_INIT	(SDMA_BD_READY | SDMA_FEC_TX_BD_TFD | \
+							SDMA_FEC_TX_BD_INT)
+
+struct sdma {
+	union {
+		struct sdma_bd *bd;
+		struct sdma_bd2 *bd2;
+	};
+	void **cookie;
+	u16 index;
+	u16 outdex;
+	u16 num_bd;
+	s16 tasknum;
+	u32 flags;
+	struct device_node *node;
+};
+
+#define SDMA_FLAGS_NONE		0x0000
+#define SDMA_FLAGS_ENABLE_TASK	0x0001
+#define SDMA_FLAGS_BD2		0x0002
+
+/* Task Descriptor Table Entry */
+struct sdma_tdt {
+	u32 start;
+	u32 stop;
+	u32 var;
+	u32 fdt;
+	u32 exec_status; /* used internally by SmartComm engine */
+	u32 mvtp;		 /* used internally by SmartComm engine */
+	u32 context;
+	u32 litbase;
+};
+
+//extern struct sdma_tdt *sdma_tdt;
+
+#define SDMA_MAX_TASKS		16
+#define SDMA_MAX_VAR		24
+#define SDMA_MAX_INC		8
+#define SDMA_MAX_FDT		64
+#define SDMA_MAX_CONTEXT	20
+#define SDMA_CONTEXT_SIZE	SDMA_MAX_CONTEXT * sizeof(u32)
+#define SDMA_CONTEXT_ALIGN	0x100
+#define SDMA_VAR_SIZE		SDMA_MAX_VAR * sizeof(u32)
+#define SDMA_VAR_ALIGN		0x80
+#define SDMA_INC_SIZE		SDMA_MAX_INC * sizeof(u32)
+#define SDMA_FDT_SIZE		SDMA_MAX_FDT * sizeof(u32)
+#define SDMA_FDT_ALIGN		0x100
+#define SDMA_BD_ALIGN		0x10
+
+#define TASK_ENABLE		0x8000
+
+#ifndef DPRINK
+	#ifdef CONFIG_BESTCOMM_DEBUG
+	#define DPRINTK(a,b...)	printk(KERN_DEBUG "sdma: %s: " a, __FUNCTION__ , ## b)
+	#else
+	#define DPRINTK(a,b...)
+	#endif
+#endif
+
+static inline void sdma_enable_task(int task)
+{
+	u16 reg;
+
+	DPRINTK("***DMA enable task (%d): tdt = %p\n",task, sdma.tdt);
+	DPRINTK("***tdt->start   = %08x\n",sdma.tdt[task].start);
+	DPRINTK("***tdt->stop    = %08x\n",sdma.tdt[task].stop);
+	DPRINTK("***tdt->var     = %08x\n",sdma.tdt[task].var);
+	DPRINTK("***tdt->fdt     = %08x\n",sdma.tdt[task].fdt);
+	DPRINTK("***tdt->status  = %08x\n",sdma.tdt[task].exec_status);
+	DPRINTK("***tdt->mvtp    = %08x\n",sdma.tdt[task].mvtp);
+	DPRINTK("***tdt->context = %08x\n",sdma.tdt[task].context);
+	DPRINTK("***tdt->litbase = %08x\n",sdma.tdt[task].litbase);
+	DPRINTK("***--------------\n");
+
+	reg = in_be16(&sdma.io->tcr[task]);
+	DPRINTK("***enable task: &sdma.io->tcr=%p, reg = %04x\n", &sdma.io->tcr, reg);
+	out_be16(&sdma.io->tcr[task],  reg | TASK_ENABLE);
+}
+
+static inline void sdma_disable_task(int task)
+{
+	u16 reg = in_be16(&sdma.io->tcr[task]);
+	DPRINTK("***disable task(%d): reg = %04x\n", task, reg);
+	out_be16(&sdma.io->tcr[task], reg & ~TASK_ENABLE);
+}
+
+static inline int sdma_irq(struct sdma *s)
+{
+	return irq_of_parse_and_map(s->node, s->tasknum);
+}
+
+static inline void sdma_enable(struct sdma *s)
+{
+	sdma_enable_task(s->tasknum);
+}
+
+static inline void sdma_disable(struct sdma *s)
+{
+	sdma_disable_task(s->tasknum);
+}
+
+static inline int sdma_queue_empty(struct sdma *s)
+{
+	return s->index == s->outdex;
+}
+
+static inline void sdma_clear_irq(struct sdma *s)
+{
+	out_be32(&sdma.io->IntPend, 1 << s->tasknum);
+}
+
+static inline int sdma_next_index(struct sdma *s)
+{
+	return ((s->index + 1) == s->num_bd) ? 0 : s->index + 1;
+}
+
+static inline int sdma_next_outdex(struct sdma *s)
+{
+	return ((s->outdex + 1) == s->num_bd) ? 0 : s->outdex + 1;
+}
+
+static inline int sdma_queue_full(struct sdma *s)
+{
+	return s->outdex == sdma_next_index(s);
+}
+
+static inline int sdma_buffer_done(struct sdma *s)
+{
+#ifdef CONFIG_BESTCOMM_DEBUG
+	BUG_ON(s->flags & SDMA_FLAGS_BD2);
+#endif
+	if (sdma_queue_empty(s))
+		return 0;
+	return (s->bd[s->outdex].status & SDMA_BD_READY) == 0;
+}
+
+static inline int sdma_buffer2_done(struct sdma *s)
+{
+#ifdef CONFIG_BESTCOMM_DEBUG
+	BUG_ON(!(s->flags & SDMA_FLAGS_BD2));
+#endif
+	if (sdma_queue_empty(s))
+		return 0;
+
+	return (s->bd2[s->outdex].status & SDMA_BD_READY) == 0;
+}
+
+static inline u32 *sdma_task_desc(int task)
+{
+	return sdma_sram_va(sdma.tdt[task].start);
+}
+
+static inline u32 sdma_task_num_descs(int task)
+{
+	return (sdma.tdt[task].stop - sdma.tdt[task].start)/sizeof(u32) + 1;
+}
+
+static inline u32 *sdma_task_var(int task)
+{
+	return sdma_sram_va(sdma.tdt[task].var);
+}
+
+static inline u32 *sdma_task_inc(int task)
+{
+	return &sdma_task_var(task)[SDMA_MAX_VAR];
+}
+
+static inline void sdma_set_tcr_initiator(int task, int initiator) {
+	u16 *tcr = &sdma.io->tcr[task];
+	out_be16(tcr, (in_be16(tcr) & ~0x1f00) | (initiator << 8));
+}
+
+#define SDMA_DRD_INITIATOR_SHIFT	21
+
+static inline int sdma_desc_initiator(u32 desc)
+{
+	return (desc >> SDMA_DRD_INITIATOR_SHIFT) & 0x1f;
+}
+
+static inline void sdma_set_desc_initiator(u32 *desc, int initiator)
+{
+	*desc = (*desc & ~(0x1f << SDMA_DRD_INITIATOR_SHIFT)) |
+			((initiator << SDMA_DRD_INITIATOR_SHIFT) & 0x1f);
+}
+
+static inline void sdma_submit_buffer(struct sdma *s, void *cookie, void *data,
+								int length)
+{
+#ifdef CONFIG_BESTCOMM_DEBUG
+	BUG_ON(s->flags & SDMA_FLAGS_BD2);
+#endif
+	s->cookie[s->index] = cookie;
+	s->bd[s->index].data = data;
+	s->bd[s->index].status = SDMA_BD_READY | length;
+	s->index = sdma_next_index(s);
+	if (s->flags & SDMA_FLAGS_ENABLE_TASK)
+		sdma_enable_task(s->tasknum);
+}
+
+/*
+ * Special submit_buffer function to submit last buffer of a frame to
+ * the FEC tx task.  tfd means "transmit frame done".
+ */
+static inline void sdma_fec_tfd_submit_buffer(struct sdma *s, void *cookie,
+							void *data, int length)
+{
+#ifdef CONFIG_BESTCOMM_DEBUG
+	BUG_ON(s->flags & SDMA_FLAGS_BD2);
+#endif
+	s->cookie[s->index] = cookie;
+	s->bd[s->index].data = data;
+	s->bd[s->index].status = SDMA_FEC_TX_BD_TFD_INIT | length;
+	s->index = sdma_next_index(s);
+	sdma_enable_task(s->tasknum);
+}
+
+static inline void *sdma_retrieve_buffer(struct sdma *s, int *length)
+{
+	void *cookie = s->cookie[s->outdex];
+
+#ifdef CONFIG_BESTCOMM_DEBUG
+	BUG_ON(s->flags & SDMA_FLAGS_BD2);
+#endif
+	if (length)
+		*length = s->bd[s->outdex].status & SDMA_LEN_MASK;
+	s->outdex = sdma_next_outdex(s);
+	return cookie;
+}
+
+static inline void sdma_submit_buffer2(struct sdma *s, void *cookie,
+					void *data1, void *data2, int length)
+{
+#ifdef CONFIG_BESTCOMM_DEBUG
+	BUG_ON(!(s->flags & SDMA_FLAGS_BD2));
+#endif
+	s->cookie[s->index] = cookie;
+	s->bd2[s->index].data1 = data1;
+	s->bd2[s->index].data2 = data2;
+	s->bd2[s->index].status = SDMA_BD_READY | length;
+	s->index = sdma_next_index(s);
+	if (s->flags & SDMA_FLAGS_ENABLE_TASK)
+		sdma_enable_task(s->tasknum);
+}
+
+static inline void *sdma_retrieve_buffer2(struct sdma *s, int *length)
+{
+	void *cookie = s->cookie[s->outdex];
+
+#ifdef CONFIG_BESTCOMM_DEBUG
+	BUG_ON(!(s->flags & SDMA_FLAGS_BD2));
+#endif
+	if (length)
+		*length = s->bd2[s->outdex].status & SDMA_LEN_MASK;
+	s->outdex = sdma_next_outdex(s);
+	return cookie;
+}
+
+#define SDMA_TASK_MAGIC		0x4243544B	/* 'BCTK' */
+
+/* the size fields are given in number of 32-bit words */
+struct sdma_task_header {
+	u32	magic;
+	u8	desc_size;
+	u8	var_size;
+	u8	inc_size;
+	u8	first_var;
+	u8	reserved[8];
+};
+
+#define SDMA_DESC_NOP		0x000001f8
+#define SDMA_LCD_MASK		0x80000000
+#define SDMA_DRD_EXTENDED	0x40000000
+
+#define sdma_drd_is_extended(desc) ((desc) & SDMA_DRD_EXTENDED)
+
+static inline int sdma_desc_is_drd(u32 desc) {
+	return !(desc & SDMA_LCD_MASK) && desc != SDMA_DESC_NOP;
+};
+
+#define SDMA_PRAGMA_BIT_RSV		7	/* reserved pragma bit */
+#define SDMA_PRAGMA_BIT_PRECISE_INC	6	/* increment 0=when possible, */
+						/*	1=iter end */
+#define SDMA_PRAGMA_BIT_RST_ERROR_NO	5	/* don't reset errors on */
+						/* task enable */
+#define SDMA_PRAGMA_BIT_PACK		4	/* pack data enable */
+#define SDMA_PRAGMA_BIT_INTEGER		3	/* data alignment */
+						/* 0=frac(msb), 1=int(lsb) */
+#define SDMA_PRAGMA_BIT_SPECREAD	2	/* XLB speculative read */
+#define SDMA_PRAGMA_BIT_CW		1	/* write line buffer enable */
+#define SDMA_PRAGMA_BIT_RL		0	/* read line buffer enable */
+
+#define SDMA_STD_PRAGMA		((0 << SDMA_PRAGMA_BIT_RSV)		| \
+				 (0 << SDMA_PRAGMA_BIT_PRECISE_INC)	| \
+				 (0 << SDMA_PRAGMA_BIT_RST_ERROR_NO)	| \
+				 (0 << SDMA_PRAGMA_BIT_PACK)		| \
+				 (0 << SDMA_PRAGMA_BIT_INTEGER)		| \
+				 (1 << SDMA_PRAGMA_BIT_SPECREAD)	| \
+				 (1 << SDMA_PRAGMA_BIT_CW)		| \
+				 (1 << SDMA_PRAGMA_BIT_RL))
+
+#define SDMA_PCI_PRAGMA		((0 << SDMA_PRAGMA_BIT_RSV)		| \
+				 (0 << SDMA_PRAGMA_BIT_PRECISE_INC)	| \
+				 (0 << SDMA_PRAGMA_BIT_RST_ERROR_NO)	| \
+				 (0 << SDMA_PRAGMA_BIT_PACK)		| \
+				 (1 << SDMA_PRAGMA_BIT_INTEGER)		| \
+				 (1 << SDMA_PRAGMA_BIT_SPECREAD)	| \
+				 (1 << SDMA_PRAGMA_BIT_CW)		| \
+				 (1 << SDMA_PRAGMA_BIT_RL))
+
+#define SDMA_ATA_PRAGMA		SDMA_STD_PRAGMA
+#define SDMA_CRC16_DP_0_PRAGMA	SDMA_STD_PRAGMA
+#define SDMA_CRC16_DP_1_PRAGMA	SDMA_STD_PRAGMA
+#define SDMA_FEC_RX_BD_PRAGMA	SDMA_STD_PRAGMA
+#define SDMA_FEC_TX_BD_PRAGMA	SDMA_STD_PRAGMA
+#define SDMA_GEN_DP_0_PRAGMA	SDMA_STD_PRAGMA
+#define SDMA_GEN_DP_1_PRAGMA	SDMA_STD_PRAGMA
+#define SDMA_GEN_DP_2_PRAGMA	SDMA_STD_PRAGMA
+#define SDMA_GEN_DP_3_PRAGMA	SDMA_STD_PRAGMA
+#define SDMA_GEN_DP_BD_0_PRAGMA	SDMA_STD_PRAGMA
+#define SDMA_GEN_DP_BD_1_PRAGMA	SDMA_STD_PRAGMA
+#define SDMA_GEN_RX_BD_PRAGMA	SDMA_STD_PRAGMA
+#define SDMA_GEN_TX_BD_PRAGMA	SDMA_STD_PRAGMA
+#define SDMA_GEN_LPC_PRAGMA	SDMA_STD_PRAGMA
+#define SDMA_PCI_RX_PRAGMA	SDMA_PCI_PRAGMA
+#define SDMA_PCI_TX_PRAGMA	SDMA_PCI_PRAGMA
+
+static inline void sdma_set_task_pragma(int task, int pragma)
+{
+	u32 *fdt = &sdma.tdt[task].fdt;
+	*fdt = (*fdt & ~0xff) | pragma;
+}
+
+static inline void sdma_set_task_auto_start(int task, int next_task)
+{
+	u16 *tcr = &sdma.io->tcr[task];
+	out_be16(tcr, (in_be16(tcr) & ~0xff) | 0x00c0 | next_task);
+}
+
+#define SDMA_INITIATOR_ALWAYS	 0
+#define SDMA_INITIATOR_SCTMR_0	 1
+#define SDMA_INITIATOR_SCTMR_1	 2
+#define SDMA_INITIATOR_FEC_RX	 3
+#define SDMA_INITIATOR_FEC_TX	 4
+#define SDMA_INITIATOR_ATA_RX	 5
+#define SDMA_INITIATOR_ATA_TX	 6
+#define SDMA_INITIATOR_SCPCI_RX	 7
+#define SDMA_INITIATOR_SCPCI_TX	 8
+#define SDMA_INITIATOR_PSC3_RX	 9
+#define SDMA_INITIATOR_PSC3_TX	10
+#define SDMA_INITIATOR_PSC2_RX	11
+#define SDMA_INITIATOR_PSC2_TX	12
+#define SDMA_INITIATOR_PSC1_RX	13
+#define SDMA_INITIATOR_PSC1_TX	14
+#define SDMA_INITIATOR_SCTMR_2	15
+#define SDMA_INITIATOR_SCLPC	16
+#define SDMA_INITIATOR_PSC5_RX	17
+#define SDMA_INITIATOR_PSC5_TX	18
+#define SDMA_INITIATOR_PSC4_RX	19
+#define SDMA_INITIATOR_PSC4_TX	20
+#define SDMA_INITIATOR_I2C2_RX	21
+#define SDMA_INITIATOR_I2C2_TX	22
+#define SDMA_INITIATOR_I2C1_RX	23
+#define SDMA_INITIATOR_I2C1_TX	24
+#define SDMA_INITIATOR_PSC6_RX	25
+#define SDMA_INITIATOR_PSC6_TX	26
+#define SDMA_INITIATOR_IRDA_RX	25
+#define SDMA_INITIATOR_IRDA_TX	26
+#define SDMA_INITIATOR_SCTMR_3	27
+#define SDMA_INITIATOR_SCTMR_4	28
+#define SDMA_INITIATOR_SCTMR_5	29
+#define SDMA_INITIATOR_SCTMR_6	30
+#define SDMA_INITIATOR_SCTMR_7	31
+
+#define SDMA_IPR_ALWAYS	7
+#define SDMA_IPR_SCTMR_0 	2
+#define SDMA_IPR_SCTMR_1 	2
+#define SDMA_IPR_FEC_RX 	6
+#define SDMA_IPR_FEC_TX 	5
+#define SDMA_IPR_ATA_RX 	4
+#define SDMA_IPR_ATA_TX 	3
+#define SDMA_IPR_SCPCI_RX	2
+#define SDMA_IPR_SCPCI_TX	2
+#define SDMA_IPR_PSC3_RX	2
+#define SDMA_IPR_PSC3_TX	2
+#define SDMA_IPR_PSC2_RX	2
+#define SDMA_IPR_PSC2_TX	2
+#define SDMA_IPR_PSC1_RX	2
+#define SDMA_IPR_PSC1_TX	2
+#define SDMA_IPR_SCTMR_2	2
+#define SDMA_IPR_SCLPC		2
+#define SDMA_IPR_PSC5_RX	2
+#define SDMA_IPR_PSC5_TX	2
+#define SDMA_IPR_PSC4_RX	2
+#define SDMA_IPR_PSC4_TX	2
+#define SDMA_IPR_I2C2_RX	2
+#define SDMA_IPR_I2C2_TX	2
+#define SDMA_IPR_I2C1_RX	2
+#define SDMA_IPR_I2C1_TX	2
+#define SDMA_IPR_PSC6_RX	2
+#define SDMA_IPR_PSC6_TX	2
+#define SDMA_IPR_IRDA_RX	2
+#define SDMA_IPR_IRDA_TX	2
+#define SDMA_IPR_SCTMR_3	2
+#define SDMA_IPR_SCTMR_4	2
+#define SDMA_IPR_SCTMR_5	2
+#define SDMA_IPR_SCTMR_6	2
+#define SDMA_IPR_SCTMR_7	2
+
+extern struct sdma *sdma_alloc(int request_queue_size);
+extern void sdma_free(struct sdma *sdma_struct);
+extern int sdma_load_task(u32 *task_image);
+extern void *sdma_sram_alloc(int size, int alignment, u32 *dma_handle);
+extern void sdma_init_bd(struct sdma *s);
+extern void sdma_init_bd2(struct sdma *s);
+
+#define FIELD_OFFSET(s,f) ((unsigned long)(&(((struct s*)0)->f)))
+
+#endif  /* __BESTCOMM_BESTCOMM_H__ */
diff -uNr linux-2.6.20.ppc64/arch/powerpc/platforms/52xx/Makefile linux-2.6.20.fec/arch/powerpc/platforms/52xx/Makefile
--- linux-2.6.20.ppc64/arch/powerpc/platforms/52xx/Makefile	2007-03-22 11:17:52.000000000 +0000
+++ linux-2.6.20.fec/arch/powerpc/platforms/52xx/Makefile	2007-03-27 23:23:04.000000000 +0100
@@ -4,6 +4,7 @@
 ifeq ($(CONFIG_PPC_MERGE),y)
 obj-y				+= mpc52xx_pic.o mpc52xx_common.o
 obj-$(CONFIG_PCI)		+= mpc52xx_pci.o
+obj-$(CONFIG_PPC_BESTCOMM) 	+= bestcomm.o
 endif
 
 obj-$(CONFIG_PPC_EFIKA)		+= efika.o

linux-2.6-ondemand-timer.patch:
 drivers/cpufreq/cpufreq_ondemand.c |    2 -
 include/linux/timer.h              |    1 
 include/linux/workqueue.h          |    6 +++
 kernel/timer.c                     |   65 ++++++++++++++++++++++++++++++++-----
 4 files changed, 65 insertions(+), 9 deletions(-)

--- NEW FILE linux-2.6-ondemand-timer.patch ---
>From davej  Wed Mar 28 19:01:19 2007
Return-path: <venkatesh.pallipadi at intel.com>
X-Spam-Checker-Version: SpamAssassin 3.1.8 (2007-02-13) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00 autolearn=ham
	version=3.1.8
Envelope-to: davej at codemonkey.org.uk
Delivery-date: Thu, 29 Mar 2007 00:01:12 +0100
Received: from testure.choralone.org [194.9.77.134]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.6)
	for <davej at localhost> (single-drop); Wed, 28 Mar 2007 19:01:19 -0400 (EDT)
Received: from mga01.intel.com ([192.55.52.88])
	by testure.choralone.org with esmtp (Exim 4.63)
	(envelope-from <venkatesh.pallipadi at intel.com>)
	id 1HWh8h-0006J9-Es
	for davej at codemonkey.org.uk; Thu, 29 Mar 2007 00:01:11 +0100
Received: from fmsmga001.fm.intel.com ([10.253.24.23])
  by mga01.intel.com with ESMTP; 28 Mar 2007 16:01:04 -0700
Received: from linux-os.sc.intel.com ([172.25.110.8])
  by fmsmga001.fm.intel.com with ESMTP; 28 Mar 2007 16:01:03 -0700
X-ExtLoop1: 1
X-IronPort-AV: i="4.14,342,1170662400"; 
   d="scan'208"; a="221109611:sNHT21096852"
Received: by linux-os.sc.intel.com (Postfix, from userid 47009)
	id AADD228006; Wed, 28 Mar 2007 16:00:21 -0700 (PDT)
Date: Wed, 28 Mar 2007 16:00:21 -0700
From: Venki Pallipadi <venkatesh.pallipadi at intel.com>
To: Oleg Nesterov <oleg at tv-sign.ru>
Cc: linux-kernel <linux-kernel at vger.kernel.org>,
	akpm at linux-foundation.org, davej at codemonkey.org.uk,
	johnstul at us.ibm.com, mingo at elte.hu, tglx at linutronix.de,
	Andi Kleen <ak at suse.de>
Subject: Re: [PATCH] Add support for deferrable timers (respun-Mar28)
Message-ID: <20070328230021.GA29774 at linux-os.sc.intel.com>
References: <200703212353.l2LNrNOj007453 at shell0.pdx.osdl.net> <20070322140532.GA120 at tv-sign.ru> <20070322151817.GA29840 at linux-os.sc.intel.com> <20070322161355.GA160 at tv-sign.ru> <20070327204344.GA21529 at linux-os.sc.intel.com> <20070327211145.GB216 at tv-sign.ru> <20070327215542.GA27408 at linux-os.sc.intel.com> <20070327222227.GA279 at tv-sign.ru>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20070327222227.GA279 at tv-sign.ru>
User-Agent: Mutt/1.4.1i
Status: RO
Content-Length: 6118
Lines: 195


Andrew,

Please drop the patch you included yesterday and two incremental patches and
use the patch below.

This patch is - yesterday's patch + Your tidy cleanup +
minor changes based on comments from Oleg and Andi. This is a lot
cleaner (and smaller) than earlier patches.

Thanks,
Venki


Introduce a new flag for timers - deferrable:
Timers that work normally when system is busy. But, will not cause CPU to
come out of idle (just to service this timer), when CPU is idle. Instead,
this timer will be serviced when CPU eventually wakes up with a subsequent
non-deferrable timer.

The main advantage of this is to avoid unnecessary timer interrupts when
CPU is idle. If the routine currently called by a timer can wait until next
event without any issues, this new timer can be used to setup timer event
for that routine. This, with dynticks, allows CPUs to be lazy, allowing them
to stay in idle for extended period of time by reducing unnecesary wakeup and
thereby reducing the power consumption.

This patch:
Builds this new timer on top of existing timer infrastructure. It uses
last bit in 'base' pointer of timer_list structure to store this
deferrable timer flag. __next_timer_interrupt() function
skips over these deferrable timers when CPU looks for
next timer event for which it has to wake up.

This is exported by a new interface init_timer_deferrable() that can
be called in place of regular init_timer().

Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>

Index: new/kernel/timer.c
===================================================================
--- new.orig/kernel/timer.c	2007-03-22 16:27:44.000000000 -0800
+++ new/kernel/timer.c	2007-03-28 10:05:38.000000000 -0800
@@ -74,7 +74,7 @@
 	tvec_t tv3;
 	tvec_t tv4;
 	tvec_t tv5;
-} ____cacheline_aligned_in_smp;
+} ____cacheline_aligned;
 
 typedef struct tvec_t_base_s tvec_base_t;
 
@@ -82,6 +82,37 @@
 EXPORT_SYMBOL(boot_tvec_bases);
 static DEFINE_PER_CPU(tvec_base_t *, tvec_bases) = &boot_tvec_bases;
 
+/*
+ * Note that all tvec_bases is 2 byte aligned and lower bit of
+ * base in timer_list is guaranteed to be zero. Use the LSB for
+ * the new flag to indicate whether the timer is deferrable
+ */
+#define TBASE_DEFERRABLE_FLAG		(0x1)
+
+/* Functions below help us manage 'deferrable' flag */
+static inline unsigned int tbase_get_deferrable(tvec_base_t *base)
+{
+	return ((unsigned int)(unsigned long)base & TBASE_DEFERRABLE_FLAG);
+}
+
+static inline tvec_base_t *tbase_get_base(tvec_base_t *base)
+{
+	return ((tvec_base_t *)((unsigned long)base & ~TBASE_DEFERRABLE_FLAG));
+}
+
+static inline void timer_set_deferrable(struct timer_list *timer)
+{
+	timer->base = ((tvec_base_t *)((unsigned long)(timer->base) |
+	                               TBASE_DEFERRABLE_FLAG));
+}
+
+static inline void
+timer_set_base(struct timer_list *timer, tvec_base_t *new_base)
+{
+	timer->base = (tvec_base_t *)((unsigned long)(new_base) |
+	                              tbase_get_deferrable(timer->base));
+}
+
 /**
  * __round_jiffies - function to round jiffies to a full second
  * @j: the time in (absolute) jiffies that should be rounded
@@ -295,6 +326,13 @@
 }
 EXPORT_SYMBOL(init_timer);
 
+void fastcall init_timer_deferrable(struct timer_list *timer)
+{
+	init_timer(timer);
+	timer_set_deferrable(timer);
+}
+EXPORT_SYMBOL(init_timer_deferrable);
+
 static inline void detach_timer(struct timer_list *timer,
 				int clear_pending)
 {
@@ -325,10 +363,11 @@
 	tvec_base_t *base;
 
 	for (;;) {
-		base = timer->base;
+		tvec_base_t *prelock_base = timer->base;
+		base = tbase_get_base(prelock_base);
 		if (likely(base != NULL)) {
 			spin_lock_irqsave(&base->lock, *flags);
-			if (likely(base == timer->base))
+			if (likely(prelock_base == timer->base))
 				return base;
 			/* The timer has migrated to another CPU */
 			spin_unlock_irqrestore(&base->lock, *flags);
@@ -365,11 +404,11 @@
 		 */
 		if (likely(base->running_timer != timer)) {
 			/* See the comment in lock_timer_base() */
-			timer->base = NULL;
+			timer_set_base(timer, NULL);
 			spin_unlock(&base->lock);
 			base = new_base;
 			spin_lock(&base->lock);
-			timer->base = base;
+			timer_set_base(timer, base);
 		}
 	}
 
@@ -397,7 +436,7 @@
 	timer_stats_timer_set_start_info(timer);
   	BUG_ON(timer_pending(timer) || !timer->function);
 	spin_lock_irqsave(&base->lock, flags);
-	timer->base = base;
+	timer_set_base(timer, base);
 	internal_add_timer(base, timer);
 	spin_unlock_irqrestore(&base->lock, flags);
 }
@@ -548,7 +587,7 @@
 	 * don't have to detach them individually.
 	 */
 	list_for_each_entry_safe(timer, tmp, &tv_list, entry) {
-		BUG_ON(timer->base != base);
+		BUG_ON(tbase_get_base(timer->base) != base);
 		internal_add_timer(base, timer);
 	}
 
@@ -634,6 +673,9 @@
 	index = slot = timer_jiffies & TVR_MASK;
 	do {
 		list_for_each_entry(nte, base->tv1.vec + slot, entry) {
+ 			if (tbase_get_deferrable(nte->base))
+ 				continue;
+ 
 			found = 1;
 			expires = nte->expires;
 			/* Look at the cascade bucket(s)? */
@@ -1602,6 +1644,13 @@
 						cpu_to_node(cpu));
 			if (!base)
 				return -ENOMEM;
+
+			/* Make sure that tvec_base is 2 byte aligned */
+			if (tbase_get_deferrable(base)) {
+				WARN_ON(1);
+				kfree(base);
+				return -ENOMEM;
+			}
 			memset(base, 0, sizeof(*base));
 			per_cpu(tvec_bases, cpu) = base;
 		} else {
@@ -1643,7 +1692,7 @@
 	while (!list_empty(head)) {
 		timer = list_entry(head->next, struct timer_list, entry);
 		detach_timer(timer, 0);
-		timer->base = new_base;
+		timer_set_base(timer, new_base);
 		internal_add_timer(new_base, timer);
 	}
 }
Index: new/include/linux/timer.h
===================================================================
--- new.orig/include/linux/timer.h	2007-03-22 16:27:44.000000000 -0800
+++ new/include/linux/timer.h	2007-03-28 10:03:14.000000000 -0800
@@ -37,6 +37,7 @@
 		TIMER_INITIALIZER(_function, _expires, _data)
 
 void fastcall init_timer(struct timer_list * timer);
+void fastcall init_timer_deferrable(struct timer_list *timer);
 
 static inline void setup_timer(struct timer_list * timer,
 				void (*function)(unsigned long),



From fedora-cvs-commits at redhat.com  Tue Apr 10 12:49:37 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 08:49:37 -0400
Subject: rpms/selinux-policy/FC-6 policy-20061106.patch, 1.31,
	1.32 selinux-policy.spec, 1.354, 1.355
Message-ID: <200704101249.l3ACnb7T016563@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20061106.patch selinux-policy.spec 
Log Message:
* Thu Apr 5 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-52
- Don't relabel if selinux is not enabled
- Allow netutils to read sysfs
Resolves: #235357
- Allow samba to work as a PDC
Resolves: #235360
- Allow ypserv to bind to ports 600-1024
Resolves: #235363
- Fix kudzu to be able to telinit
Resolves: #225443


policy-20061106.patch:
 Rules.modular                                |   10 
 config/appconfig-strict-mcs/seusers          |    1 
 config/appconfig-strict-mls/default_contexts |    6 
 config/appconfig-strict-mls/seusers          |    1 
 config/appconfig-strict/seusers              |    1 
 man/man8/kerberos_selinux.8                  |    2 
 policy/flask/access_vectors                  |    2 
 policy/global_tunables                       |   89 ++++
 policy/mls                                   |   31 +
 policy/modules/admin/acct.te                 |    1 
 policy/modules/admin/amanda.if               |   17 
 policy/modules/admin/amanda.te               |    6 
 policy/modules/admin/amtu.fc                 |    3 
 policy/modules/admin/amtu.if                 |   57 ++
 policy/modules/admin/amtu.te                 |   56 ++
 policy/modules/admin/backup.te               |    5 
 policy/modules/admin/bootloader.fc           |    5 
 policy/modules/admin/bootloader.te           |   14 
 policy/modules/admin/consoletype.te          |   21 
 policy/modules/admin/ddcprobe.te             |   10 
 policy/modules/admin/dmesg.te                |    7 
 policy/modules/admin/dmidecode.te            |    5 
 policy/modules/admin/firstboot.if            |    6 
 policy/modules/admin/kudzu.te                |   11 
 policy/modules/admin/logrotate.te            |    5 
 policy/modules/admin/logwatch.te             |    8 
 policy/modules/admin/netutils.te             |   13 
 policy/modules/admin/portage.te              |    5 
 policy/modules/admin/prelink.te              |   18 
 policy/modules/admin/quota.fc                |    7 
 policy/modules/admin/quota.te                |   24 -
 policy/modules/admin/rpm.fc                  |    3 
 policy/modules/admin/rpm.if                  |   43 ++
 policy/modules/admin/rpm.te                  |   49 --
 policy/modules/admin/su.if                   |   28 -
 policy/modules/admin/su.te                   |    2 
 policy/modules/admin/sudo.if                 |   10 
 policy/modules/admin/tripwire.te             |   11 
 policy/modules/admin/usbmodules.te           |    5 
 policy/modules/admin/usermanage.if           |    1 
 policy/modules/admin/usermanage.te           |   42 +
 policy/modules/admin/vpn.te                  |    1 
 policy/modules/apps/ethereal.te              |    5 
 policy/modules/apps/evolution.if             |  107 ++++-
 policy/modules/apps/evolution.te             |    1 
 policy/modules/apps/games.fc                 |    1 
 policy/modules/apps/gnome.fc                 |    2 
 policy/modules/apps/gnome.if                 |  108 +++++
 policy/modules/apps/gnome.te                 |    5 
 policy/modules/apps/gpg.if                   |    1 
 policy/modules/apps/java.fc                  |    2 
 policy/modules/apps/java.if                  |   38 +
 policy/modules/apps/java.te                  |    2 
 policy/modules/apps/loadkeys.if              |   17 
 policy/modules/apps/mozilla.if               |  210 ++++++++-
 policy/modules/apps/mplayer.if               |   84 +++
 policy/modules/apps/mplayer.te               |    1 
 policy/modules/apps/slocate.te               |    3 
 policy/modules/apps/thunderbird.if           |   81 +++
 policy/modules/apps/userhelper.if            |   19 
 policy/modules/apps/webalizer.te             |    6 
 policy/modules/apps/wine.fc                  |    1 
 policy/modules/apps/yam.te                   |    5 
 policy/modules/kernel/corecommands.fc        |   19 
 policy/modules/kernel/corecommands.if        |   77 +++
 policy/modules/kernel/corenetwork.if.in      |  140 ++++++
 policy/modules/kernel/corenetwork.te.in      |   13 
 policy/modules/kernel/devices.fc             |    8 
 policy/modules/kernel/devices.if             |   18 
 policy/modules/kernel/devices.te             |    8 
 policy/modules/kernel/domain.if              |   58 ++
 policy/modules/kernel/domain.te              |   22 +
 policy/modules/kernel/files.fc               |    2 
 policy/modules/kernel/files.if               |  224 ++++++++++
 policy/modules/kernel/filesystem.if          |   62 ++
 policy/modules/kernel/filesystem.te          |   19 
 policy/modules/kernel/kernel.if              |   84 +++
 policy/modules/kernel/kernel.te              |   22 -
 policy/modules/kernel/mls.if                 |   28 +
 policy/modules/kernel/mls.te                 |    6 
 policy/modules/kernel/storage.fc             |    3 
 policy/modules/kernel/storage.if             |    2 
 policy/modules/kernel/terminal.fc            |    1 
 policy/modules/kernel/terminal.if            |    2 
 policy/modules/kernel/terminal.te            |    1 
 policy/modules/services/aide.fc              |    4 
 policy/modules/services/aide.te              |    7 
 policy/modules/services/amavis.te            |    2 
 policy/modules/services/apache.fc            |   17 
 policy/modules/services/apache.if            |   21 
 policy/modules/services/apache.te            |   40 +
 policy/modules/services/apm.te               |    3 
 policy/modules/services/automount.fc         |    1 
 policy/modules/services/automount.te         |    9 
 policy/modules/services/avahi.if             |   21 
 policy/modules/services/bind.fc              |    1 
 policy/modules/services/bind.te              |    5 
 policy/modules/services/bluetooth.te         |    8 
 policy/modules/services/ccs.fc               |    1 
 policy/modules/services/ccs.te               |   11 
 policy/modules/services/clamav.te            |    2 
 policy/modules/services/cron.fc              |    6 
 policy/modules/services/cron.if              |   92 ++--
 policy/modules/services/cron.te              |   52 ++
 policy/modules/services/cups.fc              |    3 
 policy/modules/services/cups.te              |    9 
 policy/modules/services/cvs.te               |    1 
 policy/modules/services/cyrus.te             |    5 
 policy/modules/services/dbus.fc              |    1 
 policy/modules/services/dbus.if              |   62 ++
 policy/modules/services/dcc.te               |    9 
 policy/modules/services/dhcp.te              |    2 
 policy/modules/services/dovecot.te           |    6 
 policy/modules/services/ftp.te               |   18 
 policy/modules/services/hal.fc               |    4 
 policy/modules/services/hal.if               |   57 ++
 policy/modules/services/hal.te               |   22 -
 policy/modules/services/inetd.te             |   28 +
 policy/modules/services/irqbalance.te        |    4 
 policy/modules/services/kerberos.if          |   25 +
 policy/modules/services/kerberos.te          |   15 
 policy/modules/services/ktalk.fc             |    3 
 policy/modules/services/ktalk.te             |    5 
 policy/modules/services/lpd.if               |   57 +-
 policy/modules/services/lpd.te               |    5 
 policy/modules/services/mta.fc               |    1 
 policy/modules/services/mta.if               |   20 
 policy/modules/services/mta.te               |    2 
 policy/modules/services/munin.te             |    5 
 policy/modules/services/networkmanager.fc    |    2 
 policy/modules/services/networkmanager.te    |    2 
 policy/modules/services/nis.fc               |    3 
 policy/modules/services/nis.if               |    8 
 policy/modules/services/nis.te               |   34 +
 policy/modules/services/nscd.if              |   20 
 policy/modules/services/nscd.te              |   24 -
 policy/modules/services/oav.te               |    5 
 policy/modules/services/oddjob.te            |    3 
 policy/modules/services/openca.if            |    4 
 policy/modules/services/openca.te            |    2 
 policy/modules/services/openvpn.te           |    4 
 policy/modules/services/pcscd.fc             |    9 
 policy/modules/services/pcscd.if             |   62 ++
 policy/modules/services/pcscd.te             |   78 +++
 policy/modules/services/pegasus.if           |   31 +
 policy/modules/services/pegasus.te           |    6 
 policy/modules/services/portmap.te           |    5 
 policy/modules/services/postfix.fc           |    1 
 policy/modules/services/postfix.if           |    3 
 policy/modules/services/postfix.te           |   21 
 policy/modules/services/procmail.te          |   28 +
 policy/modules/services/pyzor.if             |   18 
 policy/modules/services/pyzor.te             |   13 
 policy/modules/services/radius.te            |    1 
 policy/modules/services/radvd.te             |    2 
 policy/modules/services/rhgb.if              |   76 +++
 policy/modules/services/rhgb.te              |    3 
 policy/modules/services/ricci.te             |   21 
 policy/modules/services/rlogin.te            |   10 
 policy/modules/services/rpc.fc               |    1 
 policy/modules/services/rpc.if               |    3 
 policy/modules/services/rpc.te               |   26 -
 policy/modules/services/rsync.te             |    1 
 policy/modules/services/samba.fc             |    5 
 policy/modules/services/samba.if             |   41 +
 policy/modules/services/samba.te             |   51 ++
 policy/modules/services/sasl.te              |   12 
 policy/modules/services/sendmail.if          |   22 +
 policy/modules/services/sendmail.te          |    8 
 policy/modules/services/setroubleshoot.if    |   20 
 policy/modules/services/setroubleshoot.te    |    2 
 policy/modules/services/smartmon.te          |    1 
 policy/modules/services/snmp.if              |   17 
 policy/modules/services/snmp.te              |   13 
 policy/modules/services/spamassassin.fc      |    2 
 policy/modules/services/spamassassin.if      |   42 +
 policy/modules/services/spamassassin.te      |   18 
 policy/modules/services/squid.fc             |    2 
 policy/modules/services/squid.if             |   21 
 policy/modules/services/squid.te             |   11 
 policy/modules/services/ssh.if               |   83 +++
 policy/modules/services/ssh.te               |   10 
 policy/modules/services/telnet.te            |    3 
 policy/modules/services/tftp.te              |    2 
 policy/modules/services/uucp.fc              |    1 
 policy/modules/services/uucp.if              |   67 +++
 policy/modules/services/uucp.te              |   44 +-
 policy/modules/services/xserver.fc           |    2 
 policy/modules/services/xserver.if           |  190 ++++++++-
 policy/modules/services/xserver.te           |   12 
 policy/modules/system/authlogin.if           |   76 +++
 policy/modules/system/authlogin.te           |    6 
 policy/modules/system/clock.te               |   13 
 policy/modules/system/fstools.fc             |    1 
 policy/modules/system/fstools.te             |   11 
 policy/modules/system/getty.te               |   14 
 policy/modules/system/hostname.te            |   19 
 policy/modules/system/init.if                |   64 +++
 policy/modules/system/init.te                |   51 ++
 policy/modules/system/ipsec.fc               |    5 
 policy/modules/system/ipsec.if               |   99 ++++
 policy/modules/system/ipsec.te               |  122 +++++
 policy/modules/system/iptables.te            |   22 -
 policy/modules/system/libraries.fc           |   39 +
 policy/modules/system/libraries.te           |   11 
 policy/modules/system/locallogin.if          |   37 +
 policy/modules/system/locallogin.te          |    6 
 policy/modules/system/logging.fc             |    5 
 policy/modules/system/logging.te             |   25 +
 policy/modules/system/lvm.fc                 |    2 
 policy/modules/system/lvm.if                 |   44 ++
 policy/modules/system/lvm.te                 |   78 +++
 policy/modules/system/miscfiles.fc           |    3 
 policy/modules/system/miscfiles.if           |   79 +++
 policy/modules/system/modutils.te            |   25 -
 policy/modules/system/mount.te               |   27 -
 policy/modules/system/netlabel.te            |    6 
 policy/modules/system/pcmcia.te              |    5 
 policy/modules/system/raid.te                |   15 
 policy/modules/system/selinuxutil.fc         |    2 
 policy/modules/system/selinuxutil.if         |  119 +++++
 policy/modules/system/selinuxutil.te         |  124 ++---
 policy/modules/system/sysnetwork.te          |   10 
 policy/modules/system/tzdata.fc              |    3 
 policy/modules/system/tzdata.if              |   23 +
 policy/modules/system/tzdata.te              |   51 ++
 policy/modules/system/unconfined.fc          |    4 
 policy/modules/system/unconfined.if          |   19 
 policy/modules/system/unconfined.te          |   23 +
 policy/modules/system/userdomain.if          |  569 ++++++++++++++++++++++++---
 policy/modules/system/userdomain.te          |   76 +--
 policy/modules/system/xen.fc                 |    1 
 policy/modules/system/xen.te                 |   46 +-
 233 files changed, 5424 insertions(+), 620 deletions(-)

Index: policy-20061106.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-20061106.patch,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- policy-20061106.patch	5 Apr 2007 17:46:28 -0000	1.31
+++ policy-20061106.patch	10 Apr 2007 12:49:35 -0000	1.32
@@ -3591,7 +3591,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.4.6/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/kernel/filesystem.te	2007-03-20 16:07:41.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/kernel/filesystem.te	2007-04-09 16:05:21.000000000 -0400
 @@ -21,9 +21,11 @@
  
  # Use xattrs for the following filesystem types.
@@ -3604,7 +3604,15 @@
  fs_use_xattr jffs2 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);
-@@ -63,6 +65,11 @@
+@@ -52,6 +54,7 @@
+ 
+ type capifs_t;
+ fs_type(capifs_t)
++files_mountpoint(capifs_t)
+ genfscon capifs / gen_context(system_u:object_r:capifs_t,s0)
+ 
+ type configfs_t;
+@@ -63,6 +66,11 @@
  # change to task SID 20060628
  #genfscon eventpollfs / gen_context(system_u:object_r:eventpollfs_t,s0)
  
@@ -3616,7 +3624,7 @@
  type futexfs_t;
  fs_type(futexfs_t)
  genfscon futexfs / gen_context(system_u:object_r:futexfs_t,s0)
-@@ -101,6 +108,7 @@
+@@ -101,6 +109,7 @@
  type rpc_pipefs_t;
  fs_type(rpc_pipefs_t)
  genfscon rpc_pipefs / gen_context(system_u:object_r:rpc_pipefs_t,s0)
@@ -3624,7 +3632,7 @@
  
  #
  # tmpfs_t is the type for tmpfs filesystems
-@@ -137,6 +145,7 @@
+@@ -137,6 +146,7 @@
  #
  type cifs_t alias sambafs_t;
  fs_noxattr_type(cifs_t)
@@ -3632,7 +3640,7 @@
  genfscon cifs / gen_context(system_u:object_r:cifs_t,s0)
  genfscon smbfs / gen_context(system_u:object_r:cifs_t,s0)
  
-@@ -146,9 +155,9 @@
+@@ -146,9 +156,9 @@
  #
  type dosfs_t;
  fs_noxattr_type(dosfs_t)
@@ -3643,7 +3651,7 @@
  genfscon ntfs / gen_context(system_u:object_r:dosfs_t,s0)
  genfscon vfat / gen_context(system_u:object_r:dosfs_t,s0)
  
-@@ -182,7 +191,6 @@
+@@ -182,7 +192,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)
@@ -3651,7 +3659,7 @@
  
  ########################################
  #
-@@ -202,3 +210,9 @@
+@@ -202,3 +211,9 @@
  # pseudo filesystem types that are applied to both the filesystem
  # and its files.
  allow filesystem_unconfined_type filesystem_type:{ dir file lnk_file sock_file fifo_file chr_file blk_file } *;
@@ -4025,6 +4033,25 @@
 +locallogin_use_fds(aide_t)
 +
  seutil_use_newrole_fds(aide_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.4.6/policy/modules/services/amavis.te
+--- nsaserefpolicy/policy/modules/services/amavis.te	2006-11-29 12:04:51.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/services/amavis.te	2007-04-09 14:51:43.000000000 -0400
+@@ -50,6 +50,7 @@
+ allow amavis_t self:unix_stream_socket create_stream_socket_perms;
+ allow amavis_t self:unix_dgram_socket create_socket_perms;
+ allow amavis_t self:tcp_socket { listen accept };
++allow amavis_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ # configuration files
+ allow amavis_t amavis_etc_t:dir r_dir_perms;
+@@ -74,6 +75,7 @@
+ files_tmp_filetrans(amavis_t,amavis_tmp_t,file)
+ 
+ # var/lib files for amavis
++files_search_var_lib(amavis_t)
+ allow amavis_t amavis_var_lib_t:file create_file_perms;
+ allow amavis_t amavis_var_lib_t:sock_file create_file_perms;
+ allow amavis_t amavis_var_lib_t:dir create_dir_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.4.6/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2006-11-29 12:04:49.000000000 -0500
 +++ serefpolicy-2.4.6/policy/modules/services/apache.fc	2007-03-09 13:35:58.000000000 -0500
@@ -4354,7 +4381,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.4.6/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/bluetooth.te	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/services/bluetooth.te	2007-04-09 14:52:15.000000000 -0400
 @@ -41,7 +41,7 @@
  # Bluetooth services local policy
  #
@@ -4364,7 +4391,15 @@
  dontaudit bluetooth_t self:capability sys_tty_config;
  allow bluetooth_t self:process { getsched signal_perms };
  allow bluetooth_t self:fifo_file rw_file_perms;
-@@ -253,3 +253,8 @@
+@@ -104,6 +104,7 @@
+ 
+ fs_getattr_all_fs(bluetooth_t)
+ fs_search_auto_mountpoints(bluetooth_t)
++fs_list_inotifyfs(bluetooth_t)
+ 
+ term_dontaudit_use_console(bluetooth_t)
+ #Handle bluetooth serial devices
+@@ -253,3 +254,8 @@
  optional_policy(`
         	xserver_stream_connect_xdm(bluetooth_helper_t)
  ')	
@@ -6886,8 +6921,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.4.6/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/samba.te	2007-04-05 10:12:51.000000000 -0400
-@@ -10,6 +10,10 @@
++++ serefpolicy-2.4.6/policy/modules/services/samba.te	2007-04-05 13:57:44.000000000 -0400
+@@ -10,6 +10,13 @@
  type nmbd_exec_t;
  init_daemon_domain(nmbd_t,nmbd_exec_t)
  
@@ -6895,10 +6930,13 @@
 +domain_type(samba_unconfined_script_t)
 +role system_r types samba_unconfined_script_t;
 +
++type samba_unconfined_script_exec_t;
++domain_entry_file(samba_unconfined_script_t, samba_unconfined_script_exec_t)
++
  type nmbd_var_run_t;
  files_pid_file(nmbd_var_run_t)
  
-@@ -235,6 +239,9 @@
+@@ -235,6 +242,9 @@
  corenet_tcp_connect_ipp_port(smbd_t)
  corenet_tcp_connect_smbd_port(smbd_t)
  
@@ -6908,7 +6946,7 @@
  dev_read_sysfs(smbd_t)
  dev_read_urand(smbd_t)
  dev_getattr_mtrr_dev(smbd_t)
-@@ -279,6 +286,12 @@
+@@ -279,6 +289,12 @@
  userdom_dontaudit_use_unpriv_user_fds(smbd_t)
  userdom_use_unpriv_users_fds(smbd_t)
  
@@ -6921,7 +6959,7 @@
  ifdef(`hide_broken_symptoms', `
  	files_dontaudit_getattr_default_dirs(smbd_t)
  	files_dontaudit_getattr_boot_dirs(smbd_t)
-@@ -349,7 +362,7 @@
+@@ -349,7 +365,7 @@
  allow nmbd_t samba_etc_t:file { getattr read };
  
  allow nmbd_t samba_log_t:dir { create ra_dir_perms setattr };
@@ -6930,7 +6968,7 @@
  
  allow nmbd_t samba_var_t:dir rw_dir_perms;
  allow nmbd_t samba_var_t:file { lock unlink create write setattr read getattr rename };
-@@ -502,7 +515,7 @@
+@@ -502,7 +518,7 @@
  userdom_use_sysadm_ttys(smbmount_t)
  
  optional_policy(`
@@ -6939,7 +6977,7 @@
  ')
  
  optional_policy(`
-@@ -525,7 +538,7 @@
+@@ -525,7 +541,7 @@
  allow swat_t self:netlink_audit_socket create;
  allow swat_t self:tcp_socket create_stream_socket_perms;
  allow swat_t self:udp_socket create_socket_perms;
@@ -6948,7 +6986,7 @@
  
  allow swat_t nmbd_exec_t:file { execute read };
  
-@@ -533,7 +546,7 @@
+@@ -533,7 +549,7 @@
  allow swat_t samba_etc_t:file { getattr write read };
  
  allow swat_t samba_log_t:dir search;
@@ -6957,7 +6995,7 @@
  
  allow swat_t smbd_exec_t:file execute ;
  
-@@ -566,9 +579,8 @@
+@@ -566,9 +582,8 @@
  corenet_raw_sendrecv_all_nodes(swat_t)
  corenet_tcp_sendrecv_all_ports(swat_t)
  corenet_udp_sendrecv_all_ports(swat_t)
@@ -6968,7 +7006,7 @@
  
  dev_read_urand(swat_t)
  
-@@ -591,6 +603,7 @@
+@@ -591,6 +606,7 @@
  
  optional_policy(`
  	cups_read_rw_config(swat_t)
@@ -6976,7 +7014,7 @@
  ')
  
  optional_policy(`
-@@ -614,6 +627,8 @@
+@@ -614,6 +630,8 @@
  # Winbind local policy
  #
  
@@ -6985,7 +7023,7 @@
  dontaudit winbind_t self:capability sys_tty_config;
  allow winbind_t self:process signal_perms;
  allow winbind_t self:fifo_file { read write };
-@@ -763,3 +778,24 @@
+@@ -763,3 +781,24 @@
  	squid_read_log(winbind_helper_t)
  	squid_append_log(winbind_helper_t)
  ')
@@ -7055,8 +7093,8 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-2.4.6/policy/modules/services/sendmail.if
 --- nsaserefpolicy/policy/modules/services/sendmail.if	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/sendmail.if	2007-03-26 13:51:31.000000000 -0400
-@@ -76,6 +76,26 @@
++++ serefpolicy-2.4.6/policy/modules/services/sendmail.if	2007-04-09 15:07:05.000000000 -0400
+@@ -76,6 +76,27 @@
  
  ########################################
  ## <summary>
@@ -7075,6 +7113,7 @@
 +	')
 +
 +	logging_search_logs($1)
++	allow $1 sendmail_log_t:dir search_dir_perms;
 +	allow $1 sendmail_log_t:file read_file_perms;
 +')
 +
@@ -7083,6 +7122,14 @@
  ##	Create, read, write, and delete sendmail logs.
  ## </summary>
  ## <param name="domain">
+@@ -91,6 +112,7 @@
+ 	')
+ 
+ 	logging_search_logs($1)
++	allow $1 sendmail_log_t:dir manage_dir_perms;
+ 	allow $1 sendmail_log_t:file manage_file_perms;
+ ')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.4.6/policy/modules/services/sendmail.te
 --- nsaserefpolicy/policy/modules/services/sendmail.te	2006-11-29 12:04:51.000000000 -0500
 +++ serefpolicy-2.4.6/policy/modules/services/sendmail.te	2007-03-09 13:35:59.000000000 -0500
@@ -9238,10 +9285,25 @@
  corecmd_list_sbin(local_login_t)
  corecmd_read_bin_symlinks(local_login_t)
  corecmd_read_sbin_symlinks(local_login_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.4.6/policy/modules/system/logging.fc
+--- nsaserefpolicy/policy/modules/system/logging.fc	2006-11-29 12:04:51.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/system/logging.fc	2007-04-09 17:10:37.000000000 -0400
+@@ -26,6 +26,11 @@
+ 
+ /var/log		-d	gen_context(system_u:object_r:var_log_t,s0-mls_systemhigh)
+ /var/log/.*			gen_context(system_u:object_r:var_log_t,s0)
++/var/log/messages[^/]*		gen_context(system_u:object_r:var_log_t,mls_systemhigh)
++/var/log/secure[^/]*		gen_context(system_u:object_r:var_log_t,mls_systemhigh)
++/var/log/cron[^/]*		gen_context(system_u:object_r:var_log_t,mls_systemhigh)
++/var/log/messages[^/]*		gen_context(system_u:object_r:var_log_t,mls_systemhigh)
++/var/log/maillog[^/]*		gen_context(system_u:object_r:var_log_t,mls_systemhigh)
+ /var/log/audit(/.*)?		gen_context(system_u:object_r:auditd_log_t,mls_systemhigh)
+ 
+ ifndef(`distro_gentoo',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.4.6/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/system/logging.te	2007-03-09 13:35:59.000000000 -0500
-@@ -53,6 +53,7 @@
++++ serefpolicy-2.4.6/policy/modules/system/logging.te	2007-04-09 17:14:48.000000000 -0400
+@@ -53,9 +53,11 @@
  
  type var_log_t;
  logging_log_file(var_log_t)
@@ -9249,7 +9311,11 @@
  
  ifdef(`enable_mls',`
  	init_ranged_daemon_domain(auditd_t,auditd_exec_t,mls_systemhigh)
-@@ -63,7 +64,7 @@
++	init_ranged_daemon_domain(syslogd_t,syslogd_exec_t,mls_systemhigh)
+ ')
+ 
+ ########################################
+@@ -63,7 +65,7 @@
  # Auditd local policy
  #
  
@@ -9258,7 +9324,7 @@
  allow auditctl_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay nlmsg_readpriv };
  
  libs_use_ld_so(auditctl_t)
-@@ -275,7 +276,7 @@
+@@ -275,7 +277,7 @@
  allow syslogd_t self:unix_dgram_socket sendto;
  allow syslogd_t self:fifo_file rw_file_perms;
  allow syslogd_t self:udp_socket create_socket_perms;
@@ -9267,7 +9333,16 @@
  # Create and bind to /dev/log or /var/run/log.
  allow syslogd_t devlog_t:sock_file create_file_perms;
  files_pid_filetrans(syslogd_t,devlog_t,sock_file)
-@@ -326,6 +327,18 @@
+@@ -311,6 +313,8 @@
+ 
+ fs_search_auto_mountpoints(syslogd_t)
+ 
++mls_rangetrans_target(syslogd_t)
++
+ term_write_console(syslogd_t)
+ # Allow syslog to a terminal
+ term_write_unallocated_ttys(syslogd_t)
+@@ -326,6 +330,18 @@
  corenet_udp_sendrecv_all_ports(syslogd_t)
  corenet_udp_bind_all_nodes(syslogd_t)
  corenet_udp_bind_syslogd_port(syslogd_t)
@@ -9286,7 +9361,7 @@
  # syslog-ng can send or receive logs
  corenet_sendrecv_syslogd_client_packets(syslogd_t)
  corenet_sendrecv_syslogd_server_packets(syslogd_t)
-@@ -398,3 +411,8 @@
+@@ -398,3 +414,8 @@
  	# log to the xconsole
  	xserver_rw_console(syslogd_t)
  ')
@@ -10067,7 +10142,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.4.6/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/system/selinuxutil.te	2007-03-09 13:35:59.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/system/selinuxutil.te	2007-04-09 13:48:27.000000000 -0400
 @@ -107,6 +107,19 @@
  type semanage_exec_t;
  domain_entry_file(semanage_t, semanage_exec_t)
@@ -10096,11 +10171,13 @@
  
  selinux_get_fs_mount(load_policy_t)
  selinux_load_policy(load_policy_t)
-@@ -225,6 +239,7 @@
+@@ -224,7 +238,8 @@
+ 	# cjp: cover up stray file descriptors.
  	dontaudit load_policy_t selinux_config_t:file write;
  	optional_policy(`
- 		unconfined_dontaudit_read_pipes(load_policy_t)
-+		unconfined_dontaudit_read_pipes(setfiles_t)
+-		unconfined_dontaudit_read_pipes(load_policy_t)
++		unconfined_dontaudit_rw_pipes(load_policy_t)
++		unconfined_dontaudit_rw_pipes(setfiles_t)
  	')
  ')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/selinux-policy.spec,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- selinux-policy.spec	5 Apr 2007 17:46:28 -0000	1.354
+++ selinux-policy.spec	10 Apr 2007 12:49:35 -0000	1.355
@@ -158,7 +158,8 @@
 %define relabel() \
 . %{_sysconfdir}/selinux/config; \
 FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
-if [ "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT}.pre ]; then \
+selinuxenabled; \
+if [ $? == 0  -a "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT}.pre ]; then \
 	fixfiles -C ${FILE_CONTEXT}.pre restore; \
 	rm -f ${FILE_CONTEXT}.pre; \
 fi; 
@@ -358,6 +359,7 @@
 
 %changelog
 * Thu Apr 5 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-52
+- Don't relabel if selinux is not enabled
 - Allow netutils to read sysfs
 Resolves: #235357
 - Allow samba to work as a PDC



From fedora-cvs-commits at redhat.com  Tue Apr 10 13:11:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 09:11:30 -0400
Subject: rpms/tetex/devel .cvsignore, 1.26, 1.27 sources, 1.28,
	1.29 tetex.spec, 1.107, 1.108
Message-ID: <200704101311.l3ADBUFO032372@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/tetex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32198

Modified Files:
	.cvsignore sources tetex.spec 
Log Message:
- update nomencl package from CTAN (#234466)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tetex/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	26 Apr 2006 15:52:10 -0000	1.26
+++ .cvsignore	10 Apr 2007 13:11:28 -0000	1.27
@@ -43,3 +43,4 @@
 ptex-src-3.1.9.tar.bz2
 ptex-texmf-2.4.tar.bz2
 xdvik-22.84.10-j1.31_for_tetex.patch.gz
+nomencl.zip


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tetex/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	26 Apr 2006 17:12:25 -0000	1.28
+++ sources	10 Apr 2007 13:11:28 -0000	1.29
@@ -8,3 +8,4 @@
 6daeed5b2218286d2790c8afbcc5af11  mendexk2.6d.tar.bz2
 a1d191daba2c5569340d2576a85b290e  ptex-src-3.1.9.tar.bz2
 29fd883448f25c575690b62f2dfe9925  ptex-texmf-2.4.tar.bz2
+073c369f035c7e00aa6ec383b10f775e  nomencl.zip


Index: tetex.spec
===================================================================
RCS file: /cvs/dist/rpms/tetex/devel/tetex.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- tetex.spec	2 Apr 2007 11:34:23 -0000	1.107
+++ tetex.spec	10 Apr 2007 13:11:28 -0000	1.108
@@ -11,7 +11,7 @@
 Summary: The TeX text formatting system.
 Name: tetex
 Version: 3.0
-Release: 37%{?dist}
+Release: 38%{?dist}
 License: distributable
 Group: Applications/Publishing
 Requires: tmpwatch, dialog, ed
@@ -35,6 +35,7 @@
 Source100: envlab.tar.bz2
 Source101: OMSrsfs.fd
 Source102: caption.tar.bz2
+Source103: nomencl.zip
 
 #####
 # Source900-999: Japanization related
@@ -528,6 +529,17 @@
 ls ${RPM_BUILD_ROOT}%{_datadir}/texmf/tex/latex/caption | grep -v "\\.sty$" | xargs rm -f
 popd
 
+# update nomencl package from CTAN (#234466)
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/texmf/tex/latex/nomencl
+unzip %{SOURCE103} -d ${RPM_BUILD_ROOT}%{_datadir}/texmf/tex/latex
+pushd ${RPM_BUILD_ROOT}%{_datadir}/texmf/tex/latex/nomencl
+${RPM_BUILD_ROOT}%{_bindir}/latex nomencl.ins
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/texmf/doc/latex/nomencl
+mv README nomencl.pdf ${RPM_BUILD_ROOT}%{_datadir}/texmf/doc/latex/nomencl
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/texmf/doc/latex/nomencl/nomencl.dvi
+ls ${RPM_BUILD_ROOT}%{_datadir}/texmf/tex/latex/nomencl | grep -v "\\.sty$" | xargs rm -f
+popd
+
 # Create symlinks for Euler fonts (#9782)
 pushd ${RPM_BUILD_ROOT}%{_datadir}/texmf/tex/latex/amsfonts
 for i in ex f r s ; do
@@ -853,6 +865,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Tue Apr 10 2007 Jindrich Novy <jnovy at redhat.com> 3.0-38
+- update nomencl package from CTAN (#234466)
+
 * Mon Apr  2 2007 Jindrich Novy <jnovy at redhat.com> 3.0-37
 - texdoc now searches in $TEXDOCS instead of $TEXMF/doc (#232769)
 



From fedora-cvs-commits at redhat.com  Tue Apr 10 13:11:48 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 09:11:48 -0400
Subject: rpms/kernel-xen-2.6/devel git-iwlwifi-fixes.patch, 1.1.2.1,
	1.1.2.2 kernel-xen.spec, 1.18.2.1,
	1.18.2.2 linux-2.6-debug-sysfs-crash-debugging-xen.patch,
	1.1.2.1, 1.1.2.2 linux-2.6-devmem.patch, 1.2.2.1,
	1.2.2.2 linux-2.6-warnings-inline.patch, 1.1.2.1,
	1.1.2.2 linux-2.6-xen-execshield.patch, 1.3.2.1,
	1.3.2.2 linux-2.6-xen.patch, 1.3.2.1, 1.3.2.2
Message-ID: <200704101311.l3ADBmfm032654@cvs.devel.redhat.com>

Author: ehabkost

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

Modified Files:
      Tag: private-ehabkost-2_6_21-branch
	git-iwlwifi-fixes.patch kernel-xen.spec 
	linux-2.6-debug-sysfs-crash-debugging-xen.patch 
	linux-2.6-devmem.patch linux-2.6-warnings-inline.patch 
	linux-2.6-xen-execshield.patch linux-2.6-xen.patch 
Log Message:
Updating new xen patch from linux-2.6.21-xen-3.0.4, from changeset 4c1ffa190d62

The patches that were removed are not needed anymore.

This is Work In Progress. This doesn't compile yet. Config files need
to be updated and compiltation needed to be tested.



git-iwlwifi-fixes.patch:
 base.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

Index: git-iwlwifi-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/Attic/git-iwlwifi-fixes.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- git-iwlwifi-fixes.patch	10 Apr 2007 12:42:47 -0000	1.1.2.1
+++ git-iwlwifi-fixes.patch	10 Apr 2007 13:11:45 -0000	1.1.2.2
@@ -1,6 +1,26 @@
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig	2007-03-22 14:13:12.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-03-22 14:13:23.000000000 -0400
-@@ -12377,6 +12377,7 @@ static int ipw_pci_probe(struct pci_dev 
+Index: linux-2.6.20.i386/drivers/net/wireless/mac80211/iwlwifi/base.c
+===================================================================
+--- linux-2.6.20.i386.orig/drivers/net/wireless/mac80211/iwlwifi/base.c
++++ linux-2.6.20.i386/drivers/net/wireless/mac80211/iwlwifi/base.c
+@@ -543,7 +543,7 @@ static u32 ipw_read_restricted(struct ip
+ 	return __ipw_read_restricted(__LINE__, priv, reg);
+ }
+ 
+-static void inline _ipw_write_restricted(struct ipw_priv *priv,
++static inline void _ipw_write_restricted(struct ipw_priv *priv,
+ 					 u32 reg, u32 value)
+ {
+ 	_ipw_write32(priv, reg, value);
+@@ -640,7 +640,7 @@ static void ipw_set_bits_restricted_reg(
+ #define _ipw_set_bits_mask_restricted_reg(priv, reg, bits, mask) \
+         _ipw_write_restricted_reg( \
+             priv, reg, ((_ipw_read_restricted_reg(priv, reg) & mask) | bits))
+-static void inline __ipw_set_bits_mask_restricted_reg(u32 line, struct ipw_priv
++static inline void __ipw_set_bits_mask_restricted_reg(u32 line, struct ipw_priv
+ 						      *priv, u32 reg,
+ 						      u32 bits, u32 mask)
+ {
+@@ -12961,6 +12961,7 @@ static int ipw_pci_probe(struct pci_dev 
  	err = ipw_read_ucode(priv);
  	if (err) {
  		IPW_ERROR("Could not read microcode from disk: %d\n", err);


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -r1.18.2.1 -r1.18.2.2
--- kernel-xen.spec	10 Apr 2007 12:42:48 -0000	1.18.2.1
+++ kernel-xen.spec	10 Apr 2007 13:11:45 -0000	1.18.2.2
@@ -399,18 +399,10 @@
 Patch950: linux-2.6-xen.patch
 Patch951: linux-2.6-xen-utrace.patch
 Patch952: linux-2.6-xen-x86_64-silence-up-apic-errors.patch
-Patch953: linux-2.6-xen-x86_64-add-ppoll-pselect.patch
 Patch954: linux-2.6-xen-execshield.patch
 Patch955: linux-2.6-xen-tux.patch
 Patch956: linux-2.6-xen-execshield-lazy-exec-limit.patch
-Patch958: linux-2.6-ia64-kexec-kdump-xen-conflict.patch
 
-Patch960: linux-2.6-xen-blktap-fixes.patch
-Patch961: linux-2.6-xen-blktap-cleanup.patch
-Patch962: linux-2.6-xen-blktap-dynamic-major.patch
-Patch963: linux-2.6-xen-blktap-sysfs.patch
-
-Patch990: linux-2.6-xen-pvfb.patch
 
 #
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
@@ -942,17 +934,10 @@
 # Xen utrace
 %patch951 -p1
 %patch952 -p1
-%patch953 -p1
 # Xen exec-shield bits
 %patch954 -p1
 %patch955 -p1
 %patch956 -p1
-%patch958 -p1
-%patch960 -p1
-%patch961 -p1
-%patch962 -p1
-%patch963 -p1
-%patch990 -p1
 %endif
 
 #

linux-2.6-debug-sysfs-crash-debugging-xen.patch:
 i386/kernel/traps-xen.c   |    5 +++++
 x86_64/kernel/traps-xen.c |    5 +++++
 2 files changed, 10 insertions(+)

Index: linux-2.6-debug-sysfs-crash-debugging-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/linux-2.6-debug-sysfs-crash-debugging-xen.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-debug-sysfs-crash-debugging-xen.patch	10 Apr 2007 12:42:48 -0000	1.1.2.1
+++ linux-2.6-debug-sysfs-crash-debugging-xen.patch	10 Apr 2007 13:11:45 -0000	1.1.2.2
@@ -4,19 +4,20 @@
 # Parent  35d3d547d0d38754c0fc4831a7f073531245c835
 sysfs-crash-debugging xen bits
 
-diff -r 35d3d547d0d3 -r e5168f3eb0de arch/i386/kernel/traps-xen.c
---- a/arch/i386/kernel/traps-xen.c	Thu Jul 27 00:46:20 2006 +0200
-+++ b/arch/i386/kernel/traps-xen.c	Thu Jul 27 00:59:37 2006 +0200
-@@ -100,6 +100,8 @@ static int kstack_depth_to_print = 24;
- static int kstack_depth_to_print = 24;
- static int call_trace = 1;
+Index: linux-2.6.20.i386/arch/i386/kernel/traps-xen.c
+===================================================================
+--- linux-2.6.20.i386.orig/arch/i386/kernel/traps-xen.c
++++ linux-2.6.20.i386/arch/i386/kernel/traps-xen.c
+@@ -103,6 +103,8 @@ int kstack_depth_to_print = 24;
+ static unsigned int code_bytes = 64;
  ATOMIC_NOTIFIER_HEAD(i386die_chain);
-+
-+extern char last_sysfs_file[];
  
++extern char last_sysfs_file[];
++
  int register_die_notifier(struct notifier_block *nb)
  {
-@@ -414,6 +416,9 @@ void die(const char * str, struct pt_reg
+ 	vmalloc_sync_all();
+@@ -431,6 +433,9 @@ void die(const char * str, struct pt_reg
  #endif
  		if (nl)
  			printk("\n");
@@ -26,19 +27,20 @@
  		if (notify_die(DIE_OOPS, str, regs, err,
  					current->thread.trap_no, SIGSEGV) !=
  				NOTIFY_STOP) {
-diff -r 35d3d547d0d3 -r e5168f3eb0de arch/x86_64/kernel/traps-xen.c
---- a/arch/x86_64/kernel/traps-xen.c	Thu Jul 27 00:46:20 2006 +0200
-+++ b/arch/x86_64/kernel/traps-xen.c	Thu Jul 27 00:59:37 2006 +0200
-@@ -69,6 +69,8 @@ asmlinkage void spurious_interrupt_bug(v
- asmlinkage void spurious_interrupt_bug(void);
- 
+Index: linux-2.6.20.i386/arch/x86_64/kernel/traps-xen.c
+===================================================================
+--- linux-2.6.20.i386.orig/arch/x86_64/kernel/traps-xen.c
++++ linux-2.6.20.i386/arch/x86_64/kernel/traps-xen.c
+@@ -74,6 +74,8 @@ asmlinkage void spurious_interrupt_bug(v
  ATOMIC_NOTIFIER_HEAD(die_chain);
-+
-+extern char last_sysfs_file[];
+ EXPORT_SYMBOL(die_chain);
  
++extern char last_sysfs_file[];
++
  int register_die_notifier(struct notifier_block *nb)
  {
-@@ -537,6 +539,9 @@ void __kprobes __die(const char * str, s
+ 	vmalloc_sync_all();
+@@ -535,6 +537,9 @@ void __kprobes __die(const char * str, s
  	printk("DEBUG_PAGEALLOC");
  #endif
  	printk("\n");

linux-2.6-devmem.patch:
 arch/i386/mm/init.c          |   19 +++++
 arch/ia64/mm/init.c          |    7 ++
 arch/powerpc/mm/mem.c        |   14 ++++
 arch/s390/mm/init.c          |    5 +
 arch/x86_64/mm/init.c        |   42 ++++++++++++
 drivers/char/mem.c           |  144 ++++++-------------------------------------
 fs/proc/kcore.c              |    2 
 include/asm-alpha/page.h     |    2 
 include/asm-arm/page.h       |    2 
 include/asm-arm26/page.h     |    2 
 include/asm-cris/page.h      |    2 
 include/asm-h8300/page.h     |    2 
 include/asm-i386/page.h      |    2 
 include/asm-ia64/page.h      |    1 
 include/asm-m68k/page.h      |    2 
 include/asm-m68knommu/page.h |    2 
 include/asm-mips/page.h      |    2 
 include/asm-parisc/page.h    |    2 
 include/asm-powerpc/page.h   |    2 
 include/asm-ppc/page.h       |    2 
 include/asm-s390/page.h      |    2 
 include/asm-sh/page.h        |    2 
 include/asm-sh64/page.h      |    2 
 include/asm-sparc/page.h     |    2 
 include/asm-sparc64/page.h   |    2 
 include/asm-um/page.h        |    1 
 include/asm-v850/page.h      |    2 
 include/asm-x86_64/page.h    |    4 +
 28 files changed, 152 insertions(+), 123 deletions(-)

Index: linux-2.6-devmem.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/linux-2.6-devmem.patch,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- linux-2.6-devmem.patch	10 Apr 2007 12:42:48 -0000	1.2.2.1
+++ linux-2.6-devmem.patch	10 Apr 2007 13:11:45 -0000	1.2.2.2
@@ -1,7 +1,7 @@
-Index: linux-2.6/arch/i386/mm/init.c
+Index: linux-2.6.20.i386/arch/i386/mm/init.c
 ===================================================================
---- linux-2.6.orig/arch/i386/mm/init.c
-+++ linux-2.6/arch/i386/mm/init.c
+--- linux-2.6.20.i386.orig/arch/i386/mm/init.c
++++ linux-2.6.20.i386/arch/i386/mm/init.c
 @@ -233,6 +233,25 @@ int page_is_ram(unsigned long pagenr)
  	return 0;
  }
@@ -28,11 +28,11 @@
  #ifdef CONFIG_HIGHMEM
  pte_t *kmap_pte;
  pgprot_t kmap_prot;
-Index: linux-2.6/arch/ia64/mm/init.c
+Index: linux-2.6.20.i386/arch/ia64/mm/init.c
 ===================================================================
---- linux-2.6.orig/arch/ia64/mm/init.c
-+++ linux-2.6/arch/ia64/mm/init.c
-@@ -263,6 +263,13 @@ free_initrd_mem (unsigned long start, un
+--- linux-2.6.20.i386.orig/arch/ia64/mm/init.c
++++ linux-2.6.20.i386/arch/ia64/mm/init.c
+@@ -281,6 +281,13 @@ free_initrd_mem (unsigned long start, un
  	}
  }
  
@@ -46,10 +46,10 @@
  /*
   * This installs a clean page in the kernel's page table.
   */
-Index: linux-2.6/arch/powerpc/mm/mem.c
+Index: linux-2.6.20.i386/arch/powerpc/mm/mem.c
 ===================================================================
---- linux-2.6.orig/arch/powerpc/mm/mem.c
-+++ linux-2.6/arch/powerpc/mm/mem.c
+--- linux-2.6.20.i386.orig/arch/powerpc/mm/mem.c
++++ linux-2.6.20.i386/arch/powerpc/mm/mem.c
 @@ -45,6 +45,7 @@
  #include <asm/prom.h>
  #include <asm/lmb.h>
@@ -58,7 +58,7 @@
  #include <asm/vdso.h>
  
  #include "mmu_decl.h"
-@@ -343,6 +344,19 @@ void __init mem_init(void)
+@@ -339,6 +340,19 @@ void __init mem_init(void)
  	max_mapnr = max_pfn;
  	totalram_pages += free_all_bootmem();
  #endif
@@ -78,13 +78,13 @@
  	for_each_online_pgdat(pgdat) {
  		for (i = 0; i < pgdat->node_spanned_pages; i++) {
  			if (!pfn_valid(pgdat->node_start_pfn + i))
-Index: linux-2.6/arch/s390/mm/init.c
+Index: linux-2.6.20.i386/arch/s390/mm/init.c
 ===================================================================
---- linux-2.6.orig/arch/s390/mm/init.c
-+++ linux-2.6/arch/s390/mm/init.c
-@@ -241,6 +241,11 @@ void __init paging_init(void)
+--- linux-2.6.20.i386.orig/arch/s390/mm/init.c
++++ linux-2.6.20.i386/arch/s390/mm/init.c
+@@ -148,6 +148,11 @@ void __init paging_init(void)
+ 	free_area_init_nodes(max_zone_pfns);
  }
- #endif /* CONFIG_64BIT */
  
 +int page_is_ram (unsigned long pagenr)
 +{
@@ -94,10 +94,10 @@
  void __init mem_init(void)
  {
  	unsigned long codesize, reservedpages, datasize, initsize;
-Index: linux-2.6/arch/x86_64/mm/init.c
+Index: linux-2.6.20.i386/arch/x86_64/mm/init.c
 ===================================================================
---- linux-2.6.orig/arch/x86_64/mm/init.c
-+++ linux-2.6/arch/x86_64/mm/init.c
+--- linux-2.6.20.i386.orig/arch/x86_64/mm/init.c
++++ linux-2.6.20.i386/arch/x86_64/mm/init.c
 @@ -452,6 +452,28 @@ void __init clear_kernel_mapping(unsigne
  	__flush_tlb_all();
  } 
@@ -154,12 +154,12 @@
  static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules,
  			 kcore_vsyscall;
  
-Index: linux-2.6/drivers/char/mem.c
+Index: linux-2.6.20.i386/drivers/char/mem.c
 ===================================================================
---- linux-2.6.orig/drivers/char/mem.c
-+++ linux-2.6/drivers/char/mem.c
-@@ -102,6 +102,22 @@ static inline int valid_mmap_phys_addr_r
- }
+--- linux-2.6.20.i386.orig/drivers/char/mem.c
++++ linux-2.6.20.i386/drivers/char/mem.c
+@@ -35,6 +35,22 @@
+ # include <linux/efi.h>
  #endif
  
 +static inline int range_is_allowed(unsigned long from, unsigned long to)
@@ -179,9 +179,9 @@
 +}
 +
  /*
-  * This funcion reads the *physical* memory. The f_pos points directly to the 
-  * memory location. 
-@@ -151,6 +167,8 @@ static ssize_t read_mem(struct file * fi
+  * Architectures vary in how they handle caching for addresses
+  * outside of main memory.
+@@ -152,6 +168,8 @@ static ssize_t read_mem(struct file * fi
  		 */
  		ptr = xlate_dev_mem_ptr(p);
  
@@ -190,7 +190,7 @@
  		if (copy_to_user(buf, ptr, sz))
  			return -EFAULT;
  		buf += sz;
-@@ -208,6 +226,8 @@ static ssize_t write_mem(struct file * f
+@@ -209,6 +227,8 @@ static ssize_t write_mem(struct file * f
  		 */
  		ptr = xlate_dev_mem_ptr(p);
  
@@ -199,7 +199,7 @@
  		copied = copy_from_user(ptr, buf, sz);
  		if (copied) {
  			written += sz - copied;
-@@ -357,6 +377,8 @@ static ssize_t read_kmem(struct file *fi
+@@ -359,6 +379,8 @@ static ssize_t read_kmem(struct file *fi
  	ssize_t low_count, read, sz;
  	char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
  
@@ -208,7 +208,7 @@
  	read = 0;
  	if (p < (unsigned long) high_memory) {
  		low_count = count;
-@@ -432,126 +454,6 @@ static ssize_t read_kmem(struct file *fi
+@@ -434,126 +456,6 @@ static ssize_t read_kmem(struct file *fi
   	return read;
  }
  
@@ -335,7 +335,7 @@
  #if (defined(CONFIG_ISA) || defined(CONFIG_PCI)) && !defined(__mc68000__)
  static ssize_t read_port(struct file * file, char __user * buf,
  			 size_t count, loff_t *ppos)
-@@ -818,7 +720,6 @@ static const struct file_operations mem_
+@@ -828,7 +730,6 @@ extern struct file_operations mem_fops;
  static const struct file_operations kmem_fops = {
  	.llseek		= memory_lseek,
  	.read		= read_kmem,
@@ -343,7 +343,7 @@
  	.mmap		= mmap_kmem,
  	.open		= open_kmem,
  	.get_unmapped_area = get_unmapped_area_mem,
-@@ -954,7 +855,6 @@ static const struct {
+@@ -964,7 +865,6 @@ static const struct {
  	const struct file_operations	*fops;
  } devlist[] = { /* list of minor devices */
  	{1, "mem",     S_IRUSR | S_IWUSR | S_IRGRP, &mem_fops},
@@ -351,11 +351,11 @@
  	{3, "null",    S_IRUGO | S_IWUGO,           &null_fops},
  #if (defined(CONFIG_ISA) || defined(CONFIG_PCI)) && !defined(__mc68000__)
  	{4, "port",    S_IRUSR | S_IWUSR | S_IRGRP, &port_fops},
-Index: linux-2.6/fs/proc/kcore.c
+Index: linux-2.6.20.i386/fs/proc/kcore.c
 ===================================================================
---- linux-2.6.orig/fs/proc/kcore.c
-+++ linux-2.6/fs/proc/kcore.c
-@@ -25,7 +25,7 @@
+--- linux-2.6.20.i386.orig/fs/proc/kcore.c
++++ linux-2.6.20.i386/fs/proc/kcore.c
+@@ -26,7 +26,7 @@
  
  static int open_kcore(struct inode * inode, struct file * filp)
  {
@@ -364,10 +364,10 @@
  }
  
  static ssize_t read_kcore(struct file *, char __user *, size_t, loff_t *);
-Index: linux-2.6/include/asm-alpha/page.h
+Index: linux-2.6.20.i386/include/asm-alpha/page.h
 ===================================================================
---- linux-2.6.orig/include/asm-alpha/page.h
-+++ linux-2.6/include/asm-alpha/page.h
+--- linux-2.6.20.i386.orig/include/asm-alpha/page.h
++++ linux-2.6.20.i386/include/asm-alpha/page.h
 @@ -93,6 +93,8 @@ typedef unsigned long pgprot_t;
  #define VM_DATA_DEFAULT_FLAGS		(VM_READ | VM_WRITE | VM_EXEC | \
  					 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
@@ -377,10 +377,10 @@
  #include <asm-generic/memory_model.h>
  #include <asm-generic/page.h>
  
-Index: linux-2.6/include/asm-arm/page.h
+Index: linux-2.6.20.i386/include/asm-arm/page.h
 ===================================================================
---- linux-2.6.orig/include/asm-arm/page.h
-+++ linux-2.6/include/asm-arm/page.h
+--- linux-2.6.20.i386.orig/include/asm-arm/page.h
++++ linux-2.6.20.i386/include/asm-arm/page.h
 @@ -192,6 +192,8 @@ typedef unsigned long pgprot_t;
  
  #include <asm-generic/page.h>
@@ -390,10 +390,10 @@
  #endif /* __KERNEL__ */
  
  #endif
-Index: linux-2.6/include/asm-arm26/page.h
+Index: linux-2.6.20.i386/include/asm-arm26/page.h
 ===================================================================
---- linux-2.6.orig/include/asm-arm26/page.h
-+++ linux-2.6/include/asm-arm26/page.h
+--- linux-2.6.20.i386.orig/include/asm-arm26/page.h
++++ linux-2.6.20.i386/include/asm-arm26/page.h
 @@ -95,6 +95,8 @@ typedef unsigned long pgprot_t;
  #define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \
  				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
@@ -403,10 +403,10 @@
  #endif /* __KERNEL__ */
  
  #include <asm-generic/page.h>
-Index: linux-2.6/include/asm-cris/page.h
+Index: linux-2.6.20.i386/include/asm-cris/page.h
 ===================================================================
---- linux-2.6.orig/include/asm-cris/page.h
-+++ linux-2.6/include/asm-cris/page.h
+--- linux-2.6.20.i386.orig/include/asm-cris/page.h
++++ linux-2.6.20.i386/include/asm-cris/page.h
 @@ -76,6 +76,8 @@ typedef struct { unsigned long pgprot; }
  #include <asm-generic/memory_model.h>
  #include <asm-generic/page.h>
@@ -416,10 +416,10 @@
  #endif /* __KERNEL__ */
  
  #endif /* _CRIS_PAGE_H */
-Index: linux-2.6/include/asm-h8300/page.h
+Index: linux-2.6.20.i386/include/asm-h8300/page.h
 ===================================================================
---- linux-2.6.orig/include/asm-h8300/page.h
-+++ linux-2.6/include/asm-h8300/page.h
+--- linux-2.6.20.i386.orig/include/asm-h8300/page.h
++++ linux-2.6.20.i386/include/asm-h8300/page.h
 @@ -78,6 +78,8 @@ extern unsigned long memory_end;
  #include <asm-generic/memory_model.h>
  #include <asm-generic/page.h>
@@ -429,11 +429,11 @@
  #endif /* __KERNEL__ */
  
  #endif /* _H8300_PAGE_H */
-Index: linux-2.6/include/asm-i386/page.h
+Index: linux-2.6.20.i386/include/asm-i386/page.h
 ===================================================================
---- linux-2.6.orig/include/asm-i386/page.h
-+++ linux-2.6/include/asm-i386/page.h
-@@ -108,6 +108,8 @@ extern int sysctl_legacy_va_layout;
+--- linux-2.6.20.i386.orig/include/asm-i386/page.h
++++ linux-2.6.20.i386/include/asm-i386/page.h
+@@ -110,6 +110,8 @@ extern int sysctl_legacy_va_layout;
  
  extern int page_is_ram(unsigned long pagenr);
  
@@ -442,21 +442,22 @@
  #endif /* __ASSEMBLY__ */
  
  #ifdef __ASSEMBLY__
-Index: linux-2.6/include/asm-ia64/page.h
+Index: linux-2.6.20.i386/include/asm-ia64/page.h
 ===================================================================
---- linux-2.6.orig/include/asm-ia64/page.h
-+++ linux-2.6/include/asm-ia64/page.h
-@@ -227,5 +227,6 @@ get_order (unsigned long size)
+--- linux-2.6.20.i386.orig/include/asm-ia64/page.h
++++ linux-2.6.20.i386/include/asm-ia64/page.h
+@@ -228,6 +228,7 @@ get_order (unsigned long size)
  					 (((current->personality & READ_IMPLIES_EXEC) != 0)	\
  					  ? VM_EXEC : 0))
  
 +#define devmem_is_allowed(x) 1
- # endif /* __KERNEL__ */
- #endif /* _ASM_IA64_PAGE_H */
-Index: linux-2.6/include/asm-m68k/page.h
+ 
+ #ifndef __ASSEMBLY__
+ #ifdef CONFIG_XEN
+Index: linux-2.6.20.i386/include/asm-m68k/page.h
 ===================================================================
---- linux-2.6.orig/include/asm-m68k/page.h
-+++ linux-2.6/include/asm-m68k/page.h
+--- linux-2.6.20.i386.orig/include/asm-m68k/page.h
++++ linux-2.6.20.i386/include/asm-m68k/page.h
 @@ -177,6 +177,8 @@ static inline void *__va(unsigned long x
  
  #include <asm-generic/page.h>
@@ -466,10 +467,10 @@
  #endif /* __KERNEL__ */
  
  #endif /* _M68K_PAGE_H */
-Index: linux-2.6/include/asm-m68knommu/page.h
+Index: linux-2.6.20.i386/include/asm-m68knommu/page.h
 ===================================================================
---- linux-2.6.orig/include/asm-m68knommu/page.h
-+++ linux-2.6/include/asm-m68knommu/page.h
+--- linux-2.6.20.i386.orig/include/asm-m68knommu/page.h
++++ linux-2.6.20.i386/include/asm-m68knommu/page.h
 @@ -77,6 +77,8 @@ extern unsigned long memory_end;
  
  #include <asm-generic/page.h>
@@ -479,22 +480,22 @@
  #endif /* __KERNEL__ */
  
  #endif /* _M68KNOMMU_PAGE_H */
-Index: linux-2.6/include/asm-mips/page.h
+Index: linux-2.6.20.i386/include/asm-mips/page.h
 ===================================================================
---- linux-2.6.orig/include/asm-mips/page.h
-+++ linux-2.6/include/asm-mips/page.h
-@@ -178,4 +178,6 @@ typedef struct { unsigned long pgprot; }
+--- linux-2.6.20.i386.orig/include/asm-mips/page.h
++++ linux-2.6.20.i386/include/asm-mips/page.h
+@@ -199,4 +199,6 @@ typedef struct { unsigned long pgprot; }
  
  #endif /* defined (__KERNEL__) */
  
 +#define devmem_is_allowed(x) 1
 +
  #endif /* _ASM_PAGE_H */
-Index: linux-2.6/include/asm-parisc/page.h
+Index: linux-2.6.20.i386/include/asm-parisc/page.h
 ===================================================================
---- linux-2.6.orig/include/asm-parisc/page.h
-+++ linux-2.6/include/asm-parisc/page.h
-@@ -169,6 +169,8 @@ extern int npmem_ranges;
+--- linux-2.6.20.i386.orig/include/asm-parisc/page.h
++++ linux-2.6.20.i386/include/asm-parisc/page.h
+@@ -173,6 +173,8 @@ extern int npmem_ranges;
  #include <asm-generic/memory_model.h>
  #include <asm-generic/page.h>
  
@@ -503,10 +504,10 @@
  #endif /* __KERNEL__ */
  
  #endif /* _PARISC_PAGE_H */
-Index: linux-2.6/include/asm-ppc/page.h
+Index: linux-2.6.20.i386/include/asm-ppc/page.h
 ===================================================================
---- linux-2.6.orig/include/asm-ppc/page.h
-+++ linux-2.6/include/asm-ppc/page.h
+--- linux-2.6.20.i386.orig/include/asm-ppc/page.h
++++ linux-2.6.20.i386/include/asm-ppc/page.h
 @@ -173,6 +173,8 @@ extern __inline__ int get_order(unsigned
  /* We do define AT_SYSINFO_EHDR but don't use the gate mechanism */
  #define __HAVE_ARCH_GATE_AREA		1
@@ -516,10 +517,10 @@
  #include <asm-generic/memory_model.h>
  #endif /* __KERNEL__ */
  #endif /* _PPC_PAGE_H */
-Index: linux-2.6/include/asm-powerpc/page.h
+Index: linux-2.6.20.i386/include/asm-powerpc/page.h
 ===================================================================
---- linux-2.6.orig/include/asm-powerpc/page.h
-+++ linux-2.6/include/asm-powerpc/page.h
+--- linux-2.6.20.i386.orig/include/asm-powerpc/page.h
++++ linux-2.6.20.i386/include/asm-powerpc/page.h
 @@ -191,6 +191,8 @@ extern const char *arch_vma_name(struct 
  #include <asm-generic/memory_model.h>
  #endif /* __ASSEMBLY__ */
@@ -529,11 +530,11 @@
  #endif /* __KERNEL__ */
  
  #endif /* _ASM_POWERPC_PAGE_H */
-Index: linux-2.6/include/asm-s390/page.h
+Index: linux-2.6.20.i386/include/asm-s390/page.h
 ===================================================================
---- linux-2.6.orig/include/asm-s390/page.h
-+++ linux-2.6/include/asm-s390/page.h
-@@ -148,6 +148,8 @@ page_get_storage_key(unsigned long addr)
+--- linux-2.6.20.i386.orig/include/asm-s390/page.h
++++ linux-2.6.20.i386/include/asm-s390/page.h
+@@ -166,6 +166,8 @@ static inline int pfn_valid(unsigned lon
  #include <asm-generic/memory_model.h>
  #include <asm-generic/page.h>
  
@@ -542,11 +543,11 @@
  #endif /* __KERNEL__ */
  
  #endif /* _S390_PAGE_H */
-Index: linux-2.6/include/asm-sh/page.h
+Index: linux-2.6.20.i386/include/asm-sh/page.h
 ===================================================================
---- linux-2.6.orig/include/asm-sh/page.h
-+++ linux-2.6/include/asm-sh/page.h
-@@ -124,5 +124,7 @@ typedef struct { unsigned long pgprot; }
+--- linux-2.6.20.i386.orig/include/asm-sh/page.h
++++ linux-2.6.20.i386/include/asm-sh/page.h
+@@ -148,5 +148,7 @@ typedef struct { unsigned long pgd; } pg
  #define __HAVE_ARCH_GATE_AREA
  #endif
  
@@ -554,10 +555,10 @@
 +
  #endif /* __KERNEL__ */
  #endif /* __ASM_SH_PAGE_H */
-Index: linux-2.6/include/asm-sh64/page.h
+Index: linux-2.6.20.i386/include/asm-sh64/page.h
 ===================================================================
---- linux-2.6.orig/include/asm-sh64/page.h
-+++ linux-2.6/include/asm-sh64/page.h
+--- linux-2.6.20.i386.orig/include/asm-sh64/page.h
++++ linux-2.6.20.i386/include/asm-sh64/page.h
 @@ -115,5 +115,7 @@ typedef struct { unsigned long pgprot; }
  #include <asm-generic/memory_model.h>
  #include <asm-generic/page.h>
@@ -566,10 +567,10 @@
 +
  #endif /* __KERNEL__ */
  #endif /* __ASM_SH64_PAGE_H */
-Index: linux-2.6/include/asm-sparc/page.h
+Index: linux-2.6.20.i386/include/asm-sparc/page.h
 ===================================================================
---- linux-2.6.orig/include/asm-sparc/page.h
-+++ linux-2.6/include/asm-sparc/page.h
+--- linux-2.6.20.i386.orig/include/asm-sparc/page.h
++++ linux-2.6.20.i386/include/asm-sparc/page.h
 @@ -163,6 +163,8 @@ extern unsigned long pfn_base;
  #include <asm-generic/memory_model.h>
  #include <asm-generic/page.h>
@@ -579,10 +580,10 @@
  #endif /* __KERNEL__ */
  
  #endif /* _SPARC_PAGE_H */
-Index: linux-2.6/include/asm-sparc64/page.h
+Index: linux-2.6.20.i386/include/asm-sparc64/page.h
 ===================================================================
---- linux-2.6.orig/include/asm-sparc64/page.h
-+++ linux-2.6/include/asm-sparc64/page.h
+--- linux-2.6.20.i386.orig/include/asm-sparc64/page.h
++++ linux-2.6.20.i386/include/asm-sparc64/page.h
 @@ -141,6 +141,8 @@ typedef unsigned long pgprot_t;
  #define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \
  				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
@@ -592,22 +593,22 @@
  #include <asm-generic/page.h>
  
  #endif /* __KERNEL__ */
-Index: linux-2.6/include/asm-um/page.h
+Index: linux-2.6.20.i386/include/asm-um/page.h
 ===================================================================
---- linux-2.6.orig/include/asm-um/page.h
-+++ linux-2.6/include/asm-um/page.h
+--- linux-2.6.20.i386.orig/include/asm-um/page.h
++++ linux-2.6.20.i386/include/asm-um/page.h
 @@ -113,6 +113,7 @@ extern unsigned long uml_physmem;
  
  extern struct page *arch_validate(struct page *page, gfp_t mask, int order);
  #define HAVE_ARCH_VALIDATE
 +#define devmem_is_allowed(x) 1
  
- extern void arch_free_page(struct page *page, int order);
+ extern int arch_free_page(struct page *page, int order);
  #define HAVE_ARCH_FREE_PAGE
-Index: linux-2.6/include/asm-v850/page.h
+Index: linux-2.6.20.i386/include/asm-v850/page.h
 ===================================================================
---- linux-2.6.orig/include/asm-v850/page.h
-+++ linux-2.6/include/asm-v850/page.h
+--- linux-2.6.20.i386.orig/include/asm-v850/page.h
++++ linux-2.6.20.i386/include/asm-v850/page.h
 @@ -126,6 +126,8 @@ typedef unsigned long pgprot_t;
  #include <asm-generic/memory_model.h>
  #include <asm-generic/page.h>
@@ -617,10 +618,10 @@
  #endif /* KERNEL */
  
  #endif /* __V850_PAGE_H__ */
-Index: linux-2.6/include/asm-x86_64/page.h
+Index: linux-2.6.20.i386/include/asm-x86_64/page.h
 ===================================================================
---- linux-2.6.orig/include/asm-x86_64/page.h
-+++ linux-2.6/include/asm-x86_64/page.h
+--- linux-2.6.20.i386.orig/include/asm-x86_64/page.h
++++ linux-2.6.20.i386/include/asm-x86_64/page.h
 @@ -138,6 +138,10 @@ typedef struct { unsigned long pgprot; }
  #include <asm-generic/memory_model.h>
  #include <asm-generic/page.h>

linux-2.6-warnings-inline.patch:
 arch/i386/oprofile/op_model_p4.c             |    2 +-
 arch/ia64/kernel/mca.c                       |    2 +-
 arch/ia64/sn/pci/pcibr/pcibr_ate.c           |    2 +-
 arch/ia64/sn/pci/tioce_provider.c            |    4 ++--
 arch/powerpc/kernel/prom_init.c              |    4 ++--
 arch/s390/kernel/traps.c                     |    4 ++--
 drivers/acpi/tables/tbfadt.c                 |    4 ++--
 drivers/char/mmtimer.c                       |   16 ++++++++--------
 drivers/isdn/hardware/eicon/divasmain.c      |   12 ++++++------
 drivers/isdn/hardware/eicon/platform.h       |    4 ++--
 drivers/media/common/ir-functions.c          |    2 +-
 drivers/media/video/cx88/cx88-core.c         |   12 ++++++------
 drivers/media/video/cx88/cx88.h              |    4 ++--
 drivers/net/sky2.c                           |    2 +-
 drivers/net/wireless/ipw2200.c               |    2 +-
 drivers/net/wireless/mac80211/iwlwifi/base.c |    6 +++---
 drivers/s390/net/ctcmain.c                   |    2 +-
 drivers/scsi/tmscsim.c                       |   16 ++++++++--------
 drivers/serial/ioc3_serial.c                 |    4 ++--
 drivers/serial/ioc4_serial.c                 |    4 ++--
 drivers/usb/serial/safe_serial.c             |    2 +-
 drivers/video/intelfb/intelfbdrv.c           |    2 +-
 fs/ocfs2/namei.c                             |    2 +-
 include/asm-powerpc/spinlock.h               |    8 ++++----
 include/linux/cpuset.h                       |    4 ++--
 kernel/mutex.c                               |    2 +-
 net/mac80211/ieee80211.c                     |    6 +++---
 sound/drivers/opl4/opl4_lib.c                |    2 +-
 sound/pci/au88x0/au88x0.h                    |    4 ++--
 sound/pci/au88x0/au88x0_core.c               |    4 ++--
 30 files changed, 72 insertions(+), 72 deletions(-)

Index: linux-2.6-warnings-inline.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-warnings-inline.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-warnings-inline.patch	10 Apr 2007 12:42:48 -0000	1.1.2.1
+++ linux-2.6-warnings-inline.patch	10 Apr 2007 13:11:45 -0000	1.1.2.2
@@ -1,8 +1,8 @@
-diff --git a/arch/i386/oprofile/op_model_p4.c b/arch/i386/oprofile/op_model_p4.c
-index 4792592..cf6d792 100644
---- a/arch/i386/oprofile/op_model_p4.c
-+++ b/arch/i386/oprofile/op_model_p4.c
-@@ -47,7 +47,7 @@ static inline void setup_num_counters(void)
+Index: linux-2.6.20.i386/arch/i386/oprofile/op_model_p4.c
+===================================================================
+--- linux-2.6.20.i386.orig/arch/i386/oprofile/op_model_p4.c
++++ linux-2.6.20.i386/arch/i386/oprofile/op_model_p4.c
+@@ -47,7 +47,7 @@ static inline void setup_num_counters(vo
  #endif
  }
  
@@ -11,11 +11,11 @@
  {
  #ifdef CONFIG_SMP
  	return smp_num_siblings == 2 ? 2 : 1;
-diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
-index 4fb5938..7dc7773 100644
---- a/arch/powerpc/kernel/prom_init.c
-+++ b/arch/powerpc/kernel/prom_init.c
-@@ -429,14 +429,14 @@ static int __init prom_next_node(phandle *nodep)
+Index: linux-2.6.20.i386/arch/powerpc/kernel/prom_init.c
+===================================================================
+--- linux-2.6.20.i386.orig/arch/powerpc/kernel/prom_init.c
++++ linux-2.6.20.i386/arch/powerpc/kernel/prom_init.c
+@@ -429,14 +429,14 @@ static int __init prom_next_node(phandle
  	}
  }
  
@@ -32,10 +32,10 @@
  {
  	return call_prom("getproplen", 2, 1, node, ADDR(pname));
  }
-diff --git a/drivers/acpi/tables/tbfadt.c b/drivers/acpi/tables/tbfadt.c
-index 807c711..727ec23 100644
---- a/drivers/acpi/tables/tbfadt.c
-+++ b/drivers/acpi/tables/tbfadt.c
+Index: linux-2.6.20.i386/drivers/acpi/tables/tbfadt.c
+===================================================================
+--- linux-2.6.20.i386.orig/drivers/acpi/tables/tbfadt.c
++++ linux-2.6.20.i386/drivers/acpi/tables/tbfadt.c
 @@ -48,7 +48,7 @@
  ACPI_MODULE_NAME("tbfadt")
  
@@ -45,7 +45,7 @@
  acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
  			     u8 bit_width, u64 address);
  
-@@ -122,7 +122,7 @@ static struct acpi_fadt_info fadt_info_table[] = {
+@@ -122,7 +122,7 @@ static struct acpi_fadt_info fadt_info_t
   *
   ******************************************************************************/
  
@@ -54,11 +54,11 @@
  acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
  			     u8 bit_width, u64 address)
  {
-diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c
-index 5e862e2..49bc3e7 100644
---- a/drivers/isdn/hardware/eicon/divasmain.c
-+++ b/drivers/isdn/hardware/eicon/divasmain.c
-@@ -448,32 +448,32 @@ void divasa_unmap_pci_bar(void __iomem *bar)
+Index: linux-2.6.20.i386/drivers/isdn/hardware/eicon/divasmain.c
+===================================================================
+--- linux-2.6.20.i386.orig/drivers/isdn/hardware/eicon/divasmain.c
++++ linux-2.6.20.i386/drivers/isdn/hardware/eicon/divasmain.c
+@@ -448,32 +448,32 @@ void divasa_unmap_pci_bar(void __iomem *
  /*********************************************************
   ** I/O port access 
   *********************************************************/
@@ -97,11 +97,11 @@
  {
  	outb(p, (unsigned long) addr);
  }
-diff --git a/drivers/isdn/hardware/eicon/platform.h b/drivers/isdn/hardware/eicon/platform.h
-index ff09f07..6ef28c8 100644
---- a/drivers/isdn/hardware/eicon/platform.h
-+++ b/drivers/isdn/hardware/eicon/platform.h
-@@ -275,13 +275,13 @@ void diva_os_get_time (dword* sec, dword* usec);
+Index: linux-2.6.20.i386/drivers/isdn/hardware/eicon/platform.h
+===================================================================
+--- linux-2.6.20.i386.orig/drivers/isdn/hardware/eicon/platform.h
++++ linux-2.6.20.i386/drivers/isdn/hardware/eicon/platform.h
+@@ -275,13 +275,13 @@ void diva_os_get_time (dword* sec, dword
  **  atomic operation, fake because we use threads
  */
  typedef int diva_os_atomic_t;
@@ -117,10 +117,10 @@
  diva_os_atomic_decrement(diva_os_atomic_t* pv)
  {
    *pv -= 1;
-diff --git a/drivers/media/common/ir-functions.c b/drivers/media/common/ir-functions.c
-index cbf7c05..14bf46b 100644
---- a/drivers/media/common/ir-functions.c
-+++ b/drivers/media/common/ir-functions.c
+Index: linux-2.6.20.i386/drivers/media/common/ir-functions.c
+===================================================================
+--- linux-2.6.20.i386.orig/drivers/media/common/ir-functions.c
++++ linux-2.6.20.i386/drivers/media/common/ir-functions.c
 @@ -125,7 +125,7 @@ u32 ir_extract_bits(u32 data, u32 mask)
  	return value;
  }
@@ -130,10 +130,10 @@
  {
  	return (samples[bit/32] & (1 << (31-(bit%32)))) ? 1 : 0;
  }
-diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
-index d86813b..49c9d65 100644
---- a/drivers/media/video/cx88/cx88-core.c
-+++ b/drivers/media/video/cx88/cx88-core.c
+Index: linux-2.6.20.i386/drivers/media/video/cx88/cx88-core.c
+===================================================================
+--- linux-2.6.20.i386.orig/drivers/media/video/cx88/cx88-core.c
++++ linux-2.6.20.i386/drivers/media/video/cx88/cx88-core.c
 @@ -636,22 +636,22 @@ int cx88_reset(struct cx88_core *core)
  
  /* ------------------------------------------------------------------ */
@@ -161,7 +161,7 @@
  {
  	if (norm & V4L2_STD_PAL_M)
  		return 28604892;      // 3.575611 MHz
-@@ -671,7 +671,7 @@ static unsigned int inline norm_fsc8(v4l2_std_id norm)
+@@ -671,7 +671,7 @@ static unsigned int inline norm_fsc8(v4l
  	return 35468950;      // 4.43361875 MHz +/- 5 Hz
  }
  
@@ -170,7 +170,7 @@
  {
  
  	unsigned int fsc4=norm_fsc8(norm)/2;
-@@ -682,7 +682,7 @@ static unsigned int inline norm_htotal(v4l2_std_id norm)
+@@ -682,7 +682,7 @@ static unsigned int inline norm_htotal(v
  				((fsc4+262)/525*1001+15000)/30000;
  }
  
@@ -179,10 +179,10 @@
  {
  	return (norm & V4L2_STD_625_50) ? 511 : 400;
  }
-diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
-index a4f7bef..d3c4d7f 100644
---- a/drivers/media/video/cx88/cx88.h
-+++ b/drivers/media/video/cx88/cx88.h
+Index: linux-2.6.20.i386/drivers/media/video/cx88/cx88.h
+===================================================================
+--- linux-2.6.20.i386.orig/drivers/media/video/cx88/cx88.h
++++ linux-2.6.20.i386/drivers/media/video/cx88/cx88.h
 @@ -91,13 +91,13 @@ enum cx8802_board_access {
  /* ----------------------------------------------------------- */
  /* tv norms                                                    */
@@ -199,11 +199,11 @@
  {
  	return (norm & V4L2_STD_625_50) ? 576 : 480;
  }
-diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
-index ab0ab92..bf709f7 100644
---- a/drivers/net/sky2.c
-+++ b/drivers/net/sky2.c
-@@ -3000,7 +3000,7 @@ static int sky2_set_mac_address(struct net_device *dev, void *p)
+Index: linux-2.6.20.i386/drivers/net/sky2.c
+===================================================================
+--- linux-2.6.20.i386.orig/drivers/net/sky2.c
++++ linux-2.6.20.i386/drivers/net/sky2.c
+@@ -3000,7 +3000,7 @@ static int sky2_set_mac_address(struct n
  	return 0;
  }
  
@@ -212,11 +212,11 @@
  {
  	u32 bit;
  
-diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
-index c878a2f..8809443 100644
---- a/drivers/net/wireless/ipw2200.c
-+++ b/drivers/net/wireless/ipw2200.c
-@@ -3923,7 +3923,7 @@ static const char *ipw_get_status_code(u16 status)
+Index: linux-2.6.20.i386/drivers/net/wireless/ipw2200.c
+===================================================================
+--- linux-2.6.20.i386.orig/drivers/net/wireless/ipw2200.c
++++ linux-2.6.20.i386/drivers/net/wireless/ipw2200.c
+@@ -3923,7 +3923,7 @@ static const char *ipw_get_status_code(u
  	return "Unknown status value.";
  }
  
@@ -225,11 +225,11 @@
  {
  	memset(avg, 0, sizeof(*avg));
  }
-diff --git a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c
-index a583e89..db16d01 100644
---- a/drivers/scsi/tmscsim.c
-+++ b/drivers/scsi/tmscsim.c
-@@ -351,7 +351,7 @@ static u8  dc390_clock_speed[] = {100,80,67,57,50, 40, 31, 20};
+Index: linux-2.6.20.i386/drivers/scsi/tmscsim.c
+===================================================================
+--- linux-2.6.20.i386.orig/drivers/scsi/tmscsim.c
++++ linux-2.6.20.i386/drivers/scsi/tmscsim.c
+@@ -351,7 +351,7 @@ static u8  dc390_clock_speed[] = {100,80
   * (DCBs, SRBs, Queueing)
   *
   **********************************************************************/
@@ -238,7 +238,7 @@
  {
     struct dc390_dcb* pDCB = pACB->pLinkDCB; if (!pDCB) return NULL;
     while (pDCB->TargetID != id || pDCB->TargetLUN != lun)
-@@ -482,7 +482,7 @@ static void dc390_pci_unmap (struct dc390_srb* pSRB)
+@@ -482,7 +482,7 @@ static void dc390_pci_unmap (struct dc39
  	}
  }
  
@@ -265,7 +265,7 @@
  DC390_Interrupt(void *dev_id)
  {
      struct dc390_acb *pACB = dev_id;
-@@ -1044,7 +1044,7 @@ dc390_MsgOut_0( struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus)
+@@ -1044,7 +1044,7 @@ dc390_MsgOut_0( struct dc390_acb* pACB, 
  }
  
  
@@ -283,7 +283,7 @@
  dc390_MsgIn_reject (struct dc390_acb* pACB, struct dc390_srb* pSRB)
  {
    pSRB->MsgOutBuf[0] = MESSAGE_REJECT;
-@@ -1272,7 +1272,7 @@ dc390_restore_ptr (struct dc390_acb* pACB, struct dc390_srb* pSRB)
+@@ -1272,7 +1272,7 @@ dc390_restore_ptr (struct dc390_acb* pAC
  /* The old implementation was correct. Sigh! */
  
  /* Check if the message is complete */
@@ -301,10 +301,10 @@
  dc390_RequestSense(struct dc390_acb* pACB, struct dc390_dcb* pDCB, struct dc390_srb* pSRB)
  {
  	struct scsi_cmnd *pcmd;
-diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c
-index 5a03a3f..c16c8fc 100644
---- a/drivers/usb/serial/safe_serial.c
-+++ b/drivers/usb/serial/safe_serial.c
+Index: linux-2.6.20.i386/drivers/usb/serial/safe_serial.c
+===================================================================
+--- linux-2.6.20.i386.orig/drivers/usb/serial/safe_serial.c
++++ linux-2.6.20.i386/drivers/usb/serial/safe_serial.c
 @@ -198,7 +198,7 @@ static const __u16 crc10_table[256] = {
   * Perform a memcpy and calculate fcs using ppp 10bit CRC algorithm. Return
   * new 10 bit FCS.
@@ -314,11 +314,11 @@
  {
  	for (; len-- > 0; fcs = CRC10_FCS (fcs, *sp++));
  	return fcs;
-diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
-index b75eda8..34704bd 100644
---- a/drivers/video/intelfb/intelfbdrv.c
-+++ b/drivers/video/intelfb/intelfbdrv.c
-@@ -939,7 +939,7 @@ intelfb_pci_unregister(struct pci_dev *pdev)
+Index: linux-2.6.20.i386/drivers/video/intelfb/intelfbdrv.c
+===================================================================
+--- linux-2.6.20.i386.orig/drivers/video/intelfb/intelfbdrv.c
++++ linux-2.6.20.i386/drivers/video/intelfb/intelfbdrv.c
+@@ -939,7 +939,7 @@ intelfb_pci_unregister(struct pci_dev *p
   *                       helper functions                      *
   ***************************************************************/
  
@@ -327,10 +327,10 @@
  intelfb_var_to_depth(const struct fb_var_screeninfo *var)
  {
  	DBG_MSG("intelfb_var_to_depth: bpp: %d, green.length is %d\n",
-diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
-index 28dd757..f8de8e7 100644
---- a/fs/ocfs2/namei.c
-+++ b/fs/ocfs2/namei.c
+Index: linux-2.6.20.i386/fs/ocfs2/namei.c
+===================================================================
+--- linux-2.6.20.i386.orig/fs/ocfs2/namei.c
++++ linux-2.6.20.i386/fs/ocfs2/namei.c
 @@ -1926,7 +1926,7 @@ bail:
  /*
   * Returns 0 if not found, -1 on failure, and 1 on success
@@ -340,60 +340,48 @@
  					struct inode *dir,
  					const char *name, int namelen,
  					unsigned long offset,
-diff --git a/include/asm-powerpc/spinlock.h b/include/asm-powerpc/spinlock.h
-index cc4cfce..14fc13b 100644
---- a/include/asm-powerpc/spinlock.h
-+++ b/include/asm-powerpc/spinlock.h
-@@ -103,7 +103,7 @@ extern void __rw_yield(raw_rwlock_t *lock);
- #define SHARED_PROCESSOR	0
- #endif
+Index: linux-2.6.20.i386/include/asm-powerpc/spinlock.h
+===================================================================
+--- linux-2.6.20.i386.orig/include/asm-powerpc/spinlock.h
++++ linux-2.6.20.i386/include/asm-powerpc/spinlock.h
+@@ -72,7 +72,7 @@ static __inline__ unsigned long __spin_t
+ 	return tmp;
+ }
  
--static void __inline__ __raw_spin_lock(raw_spinlock_t *lock)
-+static inline void __raw_spin_lock(raw_spinlock_t *lock)
+-static int __inline__ __raw_spin_trylock(raw_spinlock_t *lock)
++static inline int __raw_spin_trylock(raw_spinlock_t *lock)
  {
  	CLEAR_IO_SYNC;
- 	while (1) {
-@@ -118,7 +118,7 @@ static void __inline__ __raw_spin_lock(raw_spinlock_t *lock)
- 	}
- }
- 
--static void __inline__ __raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags)
-+static inline void  __raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags)
+ 	return __spin_trylock(lock) == 0;
+@@ -179,7 +179,7 @@ extern void __raw_spin_unlock_wait(raw_s
+  * This returns the old value in the lock + 1,
+  * so we got a read lock if the return value is > 0.
+  */
+-static long __inline__ __read_trylock(raw_rwlock_t *rw)
++static inline long __read_trylock(raw_rwlock_t *rw)
  {
- 	unsigned long flags_dis;
+ 	long tmp;
  
-@@ -223,7 +223,7 @@ static __inline__ long __write_trylock(raw_rwlock_t *rw)
- 	return tmp;
+@@ -251,12 +251,12 @@ static inline void __raw_write_lock(raw_
+ 	}
  }
  
--static void __inline__ __raw_read_lock(raw_rwlock_t *rw)
-+static inline void __raw_read_lock(raw_rwlock_t *rw)
+-static int __inline__ __raw_read_trylock(raw_rwlock_t *rw)
++static inline int __raw_read_trylock(raw_rwlock_t *rw)
  {
- 	while (1) {
- 		if (likely(__read_trylock(rw) > 0))
-@@ -237,7 +237,7 @@ static void __inline__ __raw_read_lock(raw_rwlock_t *rw)
- 	}
+ 	return __read_trylock(rw) > 0;
  }
  
--static void __inline__ __raw_write_lock(raw_rwlock_t *rw)
-+static inline void __raw_write_lock(raw_rwlock_t *rw)
+-static int __inline__ __raw_write_trylock(raw_rwlock_t *rw)
++static inline int __raw_write_trylock(raw_rwlock_t *rw)
  {
- 	while (1) {
- 		if (likely(__write_trylock(rw) == 0))
-@@ -261,7 +261,7 @@ static int __inline__ __raw_write_trylock(raw_rwlock_t *rw)
  	return __write_trylock(rw) == 0;
  }
- 
--static void __inline__ __raw_read_unlock(raw_rwlock_t *rw)
-+static inline void __raw_read_unlock(raw_rwlock_t *rw)
- {
- 	long tmp;
- 
-diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
-index 826b15e..7944036 100644
---- a/include/linux/cpuset.h
-+++ b/include/linux/cpuset.h
-@@ -33,13 +33,13 @@ int cpuset_zonelist_valid_mems_allowed(struct zonelist *zl);
+Index: linux-2.6.20.i386/include/linux/cpuset.h
+===================================================================
+--- linux-2.6.20.i386.orig/include/linux/cpuset.h
++++ linux-2.6.20.i386/include/linux/cpuset.h
+@@ -33,13 +33,13 @@ int cpuset_zonelist_valid_mems_allowed(s
  extern int __cpuset_zone_allowed_softwall(struct zone *z, gfp_t gfp_mask);
  extern int __cpuset_zone_allowed_hardwall(struct zone *z, gfp_t gfp_mask);
  
@@ -409,11 +397,11 @@
  {
  	return number_of_cpusets <= 1 ||
  		__cpuset_zone_allowed_hardwall(z, gfp_mask);
-diff --git a/kernel/mutex.c b/kernel/mutex.c
-index e7cbbb8..a812273 100644
---- a/kernel/mutex.c
-+++ b/kernel/mutex.c
-@@ -81,7 +81,7 @@ __mutex_lock_slowpath(atomic_t *lock_count);
+Index: linux-2.6.20.i386/kernel/mutex.c
+===================================================================
+--- linux-2.6.20.i386.orig/kernel/mutex.c
++++ linux-2.6.20.i386/kernel/mutex.c
+@@ -81,7 +81,7 @@ __mutex_lock_slowpath(atomic_t *lock_cou
   *
   * This function is similar to (but not equivalent to) down().
   */
@@ -422,11 +410,11 @@
  {
  	might_sleep();
  	/*
-diff --git a/sound/drivers/opl4/opl4_lib.c b/sound/drivers/opl4/opl4_lib.c
-index 01997f2..cbc1195 100644
---- a/sound/drivers/opl4/opl4_lib.c
-+++ b/sound/drivers/opl4/opl4_lib.c
-@@ -27,7 +27,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens at ladisch.de>");
+Index: linux-2.6.20.i386/sound/drivers/opl4/opl4_lib.c
+===================================================================
+--- linux-2.6.20.i386.orig/sound/drivers/opl4/opl4_lib.c
++++ linux-2.6.20.i386/sound/drivers/opl4/opl4_lib.c
+@@ -27,7 +27,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@
  MODULE_DESCRIPTION("OPL4 driver");
  MODULE_LICENSE("GPL");
  
@@ -435,11 +423,11 @@
  {
  	int timeout = 10;
  	while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)
-diff --git a/sound/pci/au88x0/au88x0.h b/sound/pci/au88x0/au88x0.h
-index 5ccf0b1..485a05b 100644
---- a/sound/pci/au88x0/au88x0.h
-+++ b/sound/pci/au88x0/au88x0.h
-@@ -215,7 +215,7 @@ static void vortex_adbdma_startfifo(vortex_t * vortex, int adbdma);
+Index: linux-2.6.20.i386/sound/pci/au88x0/au88x0.h
+===================================================================
+--- linux-2.6.20.i386.orig/sound/pci/au88x0/au88x0.h
++++ linux-2.6.20.i386/sound/pci/au88x0/au88x0.h
+@@ -215,7 +215,7 @@ static void vortex_adbdma_startfifo(vort
  //static void vortex_adbdma_stopfifo(vortex_t *vortex, int adbdma);
  static void vortex_adbdma_pausefifo(vortex_t * vortex, int adbdma);
  static void vortex_adbdma_resumefifo(vortex_t * vortex, int adbdma);
@@ -448,7 +436,7 @@
  static void vortex_adbdma_resetup(vortex_t *vortex, int adbdma);
  
  #ifndef CHIP_AU8810
-@@ -223,7 +223,7 @@ static void vortex_wtdma_startfifo(vortex_t * vortex, int wtdma);
+@@ -223,7 +223,7 @@ static void vortex_wtdma_startfifo(vorte
  static void vortex_wtdma_stopfifo(vortex_t * vortex, int wtdma);
  static void vortex_wtdma_pausefifo(vortex_t * vortex, int wtdma);
  static void vortex_wtdma_resumefifo(vortex_t * vortex, int wtdma);
@@ -457,11 +445,11 @@
  #endif
  
  /* global stuff. */
-diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c
-index 4a336ea..687986c 100644
---- a/sound/pci/au88x0/au88x0_core.c
-+++ b/sound/pci/au88x0/au88x0_core.c
-@@ -1250,7 +1250,7 @@ static void vortex_adbdma_resetup(vortex_t *vortex, int adbdma) {
+Index: linux-2.6.20.i386/sound/pci/au88x0/au88x0_core.c
+===================================================================
+--- linux-2.6.20.i386.orig/sound/pci/au88x0/au88x0_core.c
++++ linux-2.6.20.i386/sound/pci/au88x0/au88x0_core.c
+@@ -1250,7 +1250,7 @@ static void vortex_adbdma_resetup(vortex
  	}
  }
  
@@ -470,7 +458,7 @@
  {
  	stream_t *dma = &vortex->dma_adb[adbdma];
  	int temp;
-@@ -1499,7 +1499,7 @@ static int vortex_wtdma_getcursubuffer(vortex_t * vortex, int wtdma)
+@@ -1499,7 +1499,7 @@ static int vortex_wtdma_getcursubuffer(v
  		 POS_SHIFT) & POS_MASK);
  }
  #endif
@@ -479,28 +467,10 @@
  {
  	stream_t *dma = &vortex->dma_wt[wtdma];
  	int temp;
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c~	2007-04-04 19:31:32.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-04-04 19:31:51.000000000 -0400
-@@ -543,7 +543,7 @@ static u32 ipw_read_restricted(struct ip
- 	return __ipw_read_restricted(__LINE__, priv, reg);
- }
- 
--static void inline _ipw_write_restricted(struct ipw_priv *priv,
-+static inline void _ipw_write_restricted(struct ipw_priv *priv,
- 					 u32 reg, u32 value)
- {
- 	_ipw_write32(priv, reg, value);
-@@ -640,7 +640,7 @@ static void ipw_set_bits_restricted_reg(
- #define _ipw_set_bits_mask_restricted_reg(priv, reg, bits, mask) \
-         _ipw_write_restricted_reg( \
-             priv, reg, ((_ipw_read_restricted_reg(priv, reg) & mask) | bits))
--static void inline __ipw_set_bits_mask_restricted_reg(u32 line, struct ipw_priv
-+static inline void __ipw_set_bits_mask_restricted_reg(u32 line, struct ipw_priv
- 						      *priv, u32 reg,
- 						      u32 bits, u32 mask)
- {
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c~	2007-04-04 19:31:53.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-04-04 19:32:15.000000000 -0400
+Index: linux-2.6.20.i386/drivers/net/wireless/mac80211/iwlwifi/base.c
+===================================================================
+--- linux-2.6.20.i386.orig/drivers/net/wireless/mac80211/iwlwifi/base.c
++++ linux-2.6.20.i386/drivers/net/wireless/mac80211/iwlwifi/base.c
 @@ -6626,12 +6626,12 @@ struct ipw_status_code {
  	const char *reason;
  };
@@ -525,8 +495,10 @@
  {
  	if (!unlikely(avg->init)) {
  		if (avg->pos)
---- linux-2.6.20.noarch/net/mac80211/ieee80211.c~	2007-04-04 19:32:30.000000000 -0400
-+++ linux-2.6.20.noarch/net/mac80211/ieee80211.c	2007-04-04 19:32:51.000000000 -0400
+Index: linux-2.6.20.i386/net/mac80211/ieee80211.c
+===================================================================
+--- linux-2.6.20.i386.orig/net/mac80211/ieee80211.c
++++ linux-2.6.20.i386/net/mac80211/ieee80211.c
 @@ -1045,7 +1045,7 @@ ieee80211_tx_h_ps_buf(struct ieee80211_t
  }
  
@@ -554,8 +526,10 @@
  					struct sk_buff *skb,
  					struct net_device *mdev,
  					struct ieee80211_tx_control *control)
---- linux-2.6.20.noarch/arch/ia64/kernel/mca.c~	2007-04-04 19:33:39.000000000 -0400
-+++ linux-2.6.20.noarch/arch/ia64/kernel/mca.c	2007-04-04 19:33:43.000000000 -0400
+Index: linux-2.6.20.i386/arch/ia64/kernel/mca.c
+===================================================================
+--- linux-2.6.20.i386.orig/arch/ia64/kernel/mca.c
++++ linux-2.6.20.i386/arch/ia64/kernel/mca.c
 @@ -303,7 +303,7 @@ static void ia64_mlogbuf_dump_from_init(
  	ia64_mlogbuf_dump();
  }
@@ -565,8 +539,10 @@
  ia64_mca_spin(const char *func)
  {
  	if (monarch_cpu == smp_processor_id())
---- linux-2.6.20.noarch/arch/ia64/sn/pci/tioce_provider.c~	2007-04-04 19:34:30.000000000 -0400
-+++ linux-2.6.20.noarch/arch/ia64/sn/pci/tioce_provider.c	2007-04-04 19:34:40.000000000 -0400
+Index: linux-2.6.20.i386/arch/ia64/sn/pci/tioce_provider.c
+===================================================================
+--- linux-2.6.20.i386.orig/arch/ia64/sn/pci/tioce_provider.c
++++ linux-2.6.20.i386/arch/ia64/sn/pci/tioce_provider.c
 @@ -51,7 +51,7 @@
   * All registers defined in struct tioce will meet that criteria.
   */
@@ -585,8 +561,10 @@
  tioce_mmr_war_post(struct tioce_kernel *kern, void __iomem *mmr_addr)
  {
  	u64 mmr_base;
---- linux-2.6.20.noarch/arch/ia64/sn/pci/pcibr/pcibr_ate.c~	2007-04-04 19:34:50.000000000 -0400
-+++ linux-2.6.20.noarch/arch/ia64/sn/pci/pcibr/pcibr_ate.c	2007-04-04 19:34:56.000000000 -0400
+Index: linux-2.6.20.i386/arch/ia64/sn/pci/pcibr/pcibr_ate.c
+===================================================================
+--- linux-2.6.20.i386.orig/arch/ia64/sn/pci/pcibr/pcibr_ate.c
++++ linux-2.6.20.i386/arch/ia64/sn/pci/pcibr/pcibr_ate.c
 @@ -138,7 +138,7 @@ static inline u64 __iomem *pcibr_ate_add
  /*
   * Update the ate.
@@ -596,8 +574,10 @@
  ate_write(struct pcibus_info *pcibus_info, int ate_index, int count,
  	  volatile u64 ate)
  {
---- linux-2.6.20.noarch/drivers/char/mmtimer.c~	2007-04-04 19:35:07.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/char/mmtimer.c	2007-04-04 19:35:46.000000000 -0400
+Index: linux-2.6.20.i386/drivers/char/mmtimer.c
+===================================================================
+--- linux-2.6.20.i386.orig/drivers/char/mmtimer.c
++++ linux-2.6.20.i386/drivers/char/mmtimer.c
 @@ -75,7 +75,7 @@ static const struct file_operations mmti
   */
  #define NUM_COMPARATORS 3
@@ -669,8 +649,10 @@
  {
  	int n;
  	struct k_itimer *t = x->timer;
---- linux-2.6.20.noarch/drivers/serial/ioc4_serial.c~	2007-04-04 19:37:40.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/serial/ioc4_serial.c	2007-04-04 19:38:00.000000000 -0400
+Index: linux-2.6.20.i386/drivers/serial/ioc4_serial.c
+===================================================================
+--- linux-2.6.20.i386.orig/drivers/serial/ioc4_serial.c
++++ linux-2.6.20.i386/drivers/serial/ioc4_serial.c
 @@ -823,7 +823,7 @@ pending_intrs(struct ioc4_soft *soft, in
   *			called per port from attach...
   * @port: port to initialize
@@ -689,8 +671,10 @@
  {
  	struct ioc4_port *port;
  	struct ioc4_port *ports[IOC4_NUM_SERIAL_PORTS];
---- linux-2.6.20.noarch/drivers/serial/ioc3_serial.c~	2007-04-04 19:38:01.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/serial/ioc3_serial.c	2007-04-04 19:38:16.000000000 -0400
+Index: linux-2.6.20.i386/drivers/serial/ioc3_serial.c
+===================================================================
+--- linux-2.6.20.i386.orig/drivers/serial/ioc3_serial.c
++++ linux-2.6.20.i386/drivers/serial/ioc3_serial.c
 @@ -375,7 +375,7 @@ static struct ioc3_port *get_ioc3_port(s
   *			called per port from attach...
   * @port: port to initialize
@@ -709,43 +693,10 @@
  ioc3uart_intr_one(struct ioc3_submodule *is,
  			struct ioc3_driver_data *idd,
  			unsigned int pending)
---- linux-2.6.20.noarch/include/asm-powerpc/spinlock.h~	2007-04-04 19:38:42.000000000 -0400
-+++ linux-2.6.20.noarch/include/asm-powerpc/spinlock.h	2007-04-04 19:39:59.000000000 -0400
-@@ -72,7 +72,7 @@ static __inline__ unsigned long __spin_t
- 	return tmp;
- }
- 
--static int __inline__ __raw_spin_trylock(raw_spinlock_t *lock)
-+static inline int __raw_spin_trylock(raw_spinlock_t *lock)
- {
- 	CLEAR_IO_SYNC;
- 	return __spin_trylock(lock) == 0;
-@@ -179,7 +179,7 @@ extern void __raw_spin_unlock_wait(raw_s
-  * This returns the old value in the lock + 1,
-  * so we got a read lock if the return value is > 0.
-  */
--static long __inline__ __read_trylock(raw_rwlock_t *rw)
-+static inline long __read_trylock(raw_rwlock_t *rw)
- {
- 	long tmp;
- 
-@@ -251,12 +251,12 @@ static inline void __raw_write_lock(raw_
- 	}
- }
- 
--static int __inline__ __raw_read_trylock(raw_rwlock_t *rw)
-+static inline int __raw_read_trylock(raw_rwlock_t *rw)
- {
- 	return __read_trylock(rw) > 0;
- }
- 
--static int __inline__ __raw_write_trylock(raw_rwlock_t *rw)
-+static inline int __raw_write_trylock(raw_rwlock_t *rw)
- {
- 	return __write_trylock(rw) == 0;
- }
---- linux-2.6.20.noarch/arch/s390/kernel/traps.c~	2007-04-04 19:43:26.000000000 -0400
-+++ linux-2.6.20.noarch/arch/s390/kernel/traps.c	2007-04-04 19:43:53.000000000 -0400
+Index: linux-2.6.20.i386/arch/s390/kernel/traps.c
+===================================================================
+--- linux-2.6.20.i386.orig/arch/s390/kernel/traps.c
++++ linux-2.6.20.i386/arch/s390/kernel/traps.c
 @@ -304,7 +304,7 @@ void die(const char * str, struct pt_reg
          do_exit(SIGSEGV);
  }
@@ -764,8 +715,10 @@
  					char *str, struct pt_regs *regs,
  					siginfo_t *info)
  {
---- linux-2.6.20.noarch/drivers/s390/net/ctcmain.c~	2007-04-04 19:44:07.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/s390/net/ctcmain.c	2007-04-04 19:44:18.000000000 -0400
+Index: linux-2.6.20.i386/drivers/s390/net/ctcmain.c
+===================================================================
+--- linux-2.6.20.i386.orig/drivers/s390/net/ctcmain.c
++++ linux-2.6.20.i386/drivers/s390/net/ctcmain.c
 @@ -1827,7 +1827,7 @@ channel_get(enum channel_types type, cha
   *
   * @return Type class of channel to be used for that interface.

linux-2.6-xen-execshield.patch:
 i386/kernel/cpu/common-xen.c |    7 +++
 i386/kernel/process-xen.c    |   60 +++++++++++++++++++++++++++
 i386/kernel/smp-xen.c        |    3 +
 i386/kernel/traps-xen.c      |   93 ++++++++++++++++++++++++++++++++++++++++++-
 i386/mm/init-xen.c           |    6 ++
 x86_64/kernel/process-xen.c  |    6 --
 x86_64/kernel/setup64-xen.c  |   40 ------------------
 x86_64/mm/fault-xen.c        |    2 
 8 files changed, 168 insertions(+), 49 deletions(-)

Index: linux-2.6-xen-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/linux-2.6-xen-execshield.patch,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- linux-2.6-xen-execshield.patch	10 Apr 2007 12:42:48 -0000	1.3.2.1
+++ linux-2.6-xen-execshield.patch	10 Apr 2007 13:11:45 -0000	1.3.2.2
@@ -1,7 +1,8 @@
-diff -r 095d53b0d1a6 arch/i386/kernel/cpu/common-xen.c
---- a/arch/i386/kernel/cpu/common-xen.c	Tue Jul 25 21:53:33 2006 +0200
-+++ b/arch/i386/kernel/cpu/common-xen.c	Tue Jul 25 23:02:25 2006 +0200
-@@ -431,6 +431,13 @@ void __cpuinit identify_cpu(struct cpuin
+Index: linux-2.6.20.i386/arch/i386/kernel/cpu/common-xen.c
+===================================================================
+--- linux-2.6.20.i386.orig/arch/i386/kernel/cpu/common-xen.c
++++ linux-2.6.20.i386/arch/i386/kernel/cpu/common-xen.c
+@@ -447,6 +447,13 @@ void __cpuinit identify_cpu(struct cpuin
  	if (disable_pse)
  		clear_bit(X86_FEATURE_PSE, c->x86_capability);
  
@@ -15,20 +16,21 @@
  	/* If the model name is still unset, do table lookup. */
  	if ( !c->x86_model_id[0] ) {
  		char *p;
-diff -r 095d53b0d1a6 arch/i386/kernel/process-xen.c
---- a/arch/i386/kernel/process-xen.c	Tue Jul 25 21:53:33 2006 +0200
-+++ b/arch/i386/kernel/process-xen.c	Tue Jul 25 23:02:25 2006 +0200
-@@ -528,6 +528,9 @@ struct task_struct fastcall * __switch_t
- 	else BUG_ON(!(read_cr0() & 8));
- #endif
+Index: linux-2.6.20.i386/arch/i386/kernel/process-xen.c
+===================================================================
+--- linux-2.6.20.i386.orig/arch/i386/kernel/process-xen.c
++++ linux-2.6.20.i386/arch/i386/kernel/process-xen.c
+@@ -500,6 +500,9 @@ static inline void disable_tsc(struct ta
+ {
+ 	struct thread_info *prev, *next;
  
 +	if (next_p->mm)
 +		load_user_cs_desc(cpu, next_p->mm);
 +
  	/*
- 	 * Reload esp0.
- 	 * This is load_esp0(tss, next) with a multicall.
-@@ -810,3 +813,60 @@ unsigned long arch_align_stack(unsigned 
+ 	 * gcc should eliminate the ->thread_info dereference if
+ 	 * has_secure_computing returns 0 at compile time (SECCOMP=n).
+@@ -871,3 +874,60 @@ unsigned long arch_align_stack(unsigned 
  		sp -= get_random_int() % 8192;
  	return sp & ~0xf;
  }
@@ -89,18 +91,19 @@
 +		current->mm->brk = new_brk;
 +}
 +
-diff -r 095d53b0d1a6 arch/i386/kernel/smp-xen.c
---- a/arch/i386/kernel/smp-xen.c	Tue Jul 25 21:53:33 2006 +0200
-+++ b/arch/i386/kernel/smp-xen.c	Tue Jul 25 23:02:25 2006 +0200
+Index: linux-2.6.20.i386/arch/i386/kernel/smp-xen.c
+===================================================================
+--- linux-2.6.20.i386.orig/arch/i386/kernel/smp-xen.c
++++ linux-2.6.20.i386/arch/i386/kernel/smp-xen.c
 @@ -23,6 +23,7 @@
  
  #include <asm/mtrr.h>
  #include <asm/tlbflush.h>
 +#include <asm/desc.h>
- #if 0
+ #ifndef CONFIG_XEN
  #include <mach_apic.h>
  #endif
-@@ -285,6 +286,8 @@ irqreturn_t smp_invalidate_interrupt(int
+@@ -285,6 +286,8 @@ fastcall void smp_invalidate_interrupt(s
  	unsigned long cpu;
  
  	cpu = get_cpu();
@@ -109,10 +112,11 @@
  
  	if (!cpu_isset(cpu, flush_cpumask))
  		goto out;
-diff -r 095d53b0d1a6 arch/i386/kernel/traps-xen.c
---- a/arch/i386/kernel/traps-xen.c	Tue Jul 25 21:53:33 2006 +0200
-+++ b/arch/i386/kernel/traps-xen.c	Tue Jul 25 23:02:25 2006 +0200
-@@ -558,11 +558,89 @@ DO_ERROR(11, SIGBUS,  "segment not prese
+Index: linux-2.6.20.i386/arch/i386/kernel/traps-xen.c
+===================================================================
+--- linux-2.6.20.i386.orig/arch/i386/kernel/traps-xen.c
++++ linux-2.6.20.i386/arch/i386/kernel/traps-xen.c
+@@ -573,11 +573,88 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv
  DO_ERROR(11, SIGBUS,  "segment not present", segment_not_present)
  DO_ERROR(12, SIGBUS,  "stack segment", stack_segment)
  DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0)
@@ -199,11 +203,10 @@
  {
 +	int cpu = get_cpu();
 +	int ok;
-+
  	current->thread.error_code = error_code;
  	current->thread.trap_no = 13;
  
-@@ -572,17 +650,31 @@ fastcall void __kprobes do_general_prote
+@@ -587,17 +664,31 @@ fastcall void __kprobes do_general_prote
  	if (!user_mode(regs))
  		goto gp_in_kernel;
  
@@ -235,9 +238,10 @@
  	if (!fixup_exception(regs)) {
  		if (notify_die(DIE_GPF, "general protection fault", regs,
  				error_code, 13, SIGSEGV) == NOTIFY_STOP)
-diff -r 095d53b0d1a6 arch/i386/mm/init-xen.c
---- a/arch/i386/mm/init-xen.c	Tue Jul 25 21:53:33 2006 +0200
-+++ b/arch/i386/mm/init-xen.c	Tue Jul 25 23:02:25 2006 +0200
+Index: linux-2.6.20.i386/arch/i386/mm/init-xen.c
+===================================================================
+--- linux-2.6.20.i386.orig/arch/i386/mm/init-xen.c
++++ linux-2.6.20.i386/arch/i386/mm/init-xen.c
 @@ -465,7 +465,7 @@ EXPORT_SYMBOL(__supported_pte_mask);
   * Control non executable mappings.
   *
@@ -245,46 +249,32 @@
 - * off     Disable
 + * off     Disable (disables exec-shield too)
   */
- void __init noexec_setup(const char *str)
+ static int __init noexec_setup(char *str)
  {
-@@ -475,6 +475,7 @@ void __init noexec_setup(const char *str
- 	} else if (!strncmp(str,"off",3)) {
+@@ -477,6 +477,7 @@ static int __init noexec_setup(char *str
+ 	} else if (!strcmp(str,"off")) {
  		disable_nx = 1;
  		__supported_pte_mask &= ~_PAGE_NX;
 +		exec_shield = 0;
- 	}
- }
+ 	} else
+ 		return -EINVAL;
  
-@@ -541,7 +542,10 @@ void __init paging_init(void)
+@@ -548,7 +549,10 @@ void __init paging_init(void)
  	set_nx();
  	if (nx_enabled)
  		printk("NX (Execute Disable) protection: active\n");
--#endif
 +	else
-+#endif
+ #endif
 +	if (exec_shield)
 +		printk("Using x86 segment limits to approximate NX protection\n");
  
  	pagetable_init();
  
-diff -r 095d53b0d1a6 arch/x86_64/ia32/syscall32-xen.c
---- a/arch/x86_64/ia32/syscall32-xen.c	Tue Jul 25 21:53:33 2006 +0200
-+++ b/arch/x86_64/ia32/syscall32-xen.c	Tue Jul 25 23:02:25 2006 +0200
-@@ -47,7 +47,9 @@ struct linux_binprm;
- struct linux_binprm;
- 
- /* Setup a VMA at program startup for the vsyscall page */
--int syscall32_setup_pages(struct linux_binprm *bprm, int exstack)
-+int syscall32_setup_pages(struct linux_binprm *bprm, int exstack,
-+			  unsigned long start_code,
-+			  unsigned long interp_map_address)
- {
- 	int npages = (VSYSCALL32_END - VSYSCALL32_BASE) >> PAGE_SHIFT;
- 	struct vm_area_struct *vma;
-diff -r 095d53b0d1a6 arch/x86_64/kernel/process-xen.c
---- a/arch/x86_64/kernel/process-xen.c	Tue Jul 25 21:53:33 2006 +0200
-+++ b/arch/x86_64/kernel/process-xen.c	Tue Jul 25 23:02:25 2006 +0200
-@@ -590,12 +590,6 @@ void set_personality_64bit(void)
+Index: linux-2.6.20.i386/arch/x86_64/kernel/process-xen.c
+===================================================================
+--- linux-2.6.20.i386.orig/arch/x86_64/kernel/process-xen.c
++++ linux-2.6.20.i386/arch/x86_64/kernel/process-xen.c
+@@ -670,12 +670,6 @@ void set_personality_64bit(void)
  
  	/* Make sure to be in 64bit mode */
  	clear_thread_flag(TIF_IA32); 
@@ -297,25 +287,34 @@
  }
  
  asmlinkage long sys_fork(struct pt_regs *regs)
-diff -r 095d53b0d1a6 arch/x86_64/kernel/setup64-xen.c
---- a/arch/x86_64/kernel/setup64-xen.c	Tue Jul 25 21:53:33 2006 +0200
-+++ b/arch/x86_64/kernel/setup64-xen.c	Tue Jul 25 23:02:25 2006 +0200
-@@ -55,7 +55,7 @@ on	Enable(default)
- on	Enable(default)
- off	Disable
- */ 
--int __init nonx_setup(char *str)
-+void __init nonx_setup(char *str)
- {
- 	if (!strncmp(str, "on", 2)) {
-                 __supported_pte_mask |= _PAGE_NX; 
-@@ -64,28 +64,7 @@ int __init nonx_setup(char *str)
- 		do_not_nx = 1;
- 		__supported_pte_mask &= ~_PAGE_NX;
-         }
--	return 1;
+Index: linux-2.6.20.i386/arch/x86_64/kernel/setup64-xen.c
+===================================================================
+--- linux-2.6.20.i386.orig/arch/x86_64/kernel/setup64-xen.c
++++ linux-2.6.20.i386/arch/x86_64/kernel/setup64-xen.c
+@@ -49,46 +49,6 @@ unsigned long __supported_pte_mask __rea
+ EXPORT_SYMBOL(__supported_pte_mask);
+ static int do_not_nx __cpuinitdata = 0;
+ 
+-/* noexec=on|off
+-Control non executable mappings for 64bit processes.
+-
+-on	Enable(default)
+-off	Disable
+-*/ 
+-static int __init nonx_setup(char *str)
+-{
+-	if (!str)
+-		return -EINVAL;
+-	if (!strncmp(str, "on", 2)) {
+-                __supported_pte_mask |= _PAGE_NX; 
+- 		do_not_nx = 0; 
+-	} else if (!strncmp(str, "off", 3)) {
+-		do_not_nx = 1;
+-		__supported_pte_mask &= ~_PAGE_NX;
+-        }
+-	return 0;
 -} 
--__setup("noexec=", nonx_setup);	/* parsed early actually */
+-early_param("noexec", nonx_setup);
 -
 -int force_personality32 = 0; 
 -
@@ -335,15 +334,16 @@
 -	return 1;
 -}
 -__setup("noexec32=", nonx32_setup);
-+}
- 
+-
  /*
   * Great future plan:
-diff -r 095d53b0d1a6 arch/x86_64/mm/fault-xen.c
---- a/arch/x86_64/mm/fault-xen.c	Tue Jul 25 21:53:33 2006 +0200
-+++ b/arch/x86_64/mm/fault-xen.c	Tue Jul 25 23:02:25 2006 +0200
-@@ -114,7 +114,7 @@ static noinline int is_prefetch(struct p
- 	instr = (unsigned char *)convert_rip_to_linear(current, regs);
+  * Declare PDA itself and support (irqstack,tss,pgd) as per cpu data.
+Index: linux-2.6.20.i386/arch/x86_64/mm/fault-xen.c
+===================================================================
+--- linux-2.6.20.i386.orig/arch/x86_64/mm/fault-xen.c
++++ linux-2.6.20.i386/arch/x86_64/mm/fault-xen.c
+@@ -87,7 +87,7 @@ static noinline int is_prefetch(struct p
+ 	instr = (unsigned char __user *)convert_rip_to_linear(current, regs);
  	max_instr = instr + 15;
  
 -	if (user_mode(regs) && instr >= (unsigned char *)TASK_SIZE)
@@ -351,112 +351,3 @@
  		return 0;
  
  	while (scan_more && instr < max_instr) { 
-diff -r 095d53b0d1a6 include/asm-i386/mach-xen/asm/desc.h
---- a/include/asm-i386/mach-xen/asm/desc.h	Tue Jul 25 21:53:33 2006 +0200
-+++ b/include/asm-i386/mach-xen/asm/desc.h	Tue Jul 25 23:02:25 2006 +0200
-@@ -159,6 +159,20 @@ static inline unsigned long get_desc_bas
- 	return base;
- }
- 
-+static inline void set_user_cs(struct desc_struct *desc, unsigned long limit)
-+{
-+	limit = (limit - 1) / PAGE_SIZE;
-+	desc->a = limit & 0xffff;
-+	desc->b = (limit & 0xf0000) | 0x00c0fb00;
-+}
-+
-+#define load_user_cs_desc(cpu, mm) \
-+        HYPERVISOR_update_descriptor(virt_to_machine(&get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS]), (u64)(mm)->context.user_cs.a | ((u64)(mm)->context.user_cs.b) << 32);
-+
-+extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
-+extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
-+extern void arch_flush_exec_range(struct mm_struct *mm);
-+
- #endif /* !__ASSEMBLY__ */
- 
- #endif
-diff -r 095d53b0d1a6 include/asm-i386/mach-xen/asm/mmu.h
---- a/include/asm-i386/mach-xen/asm/mmu.h	Tue Jul 25 21:53:33 2006 +0200
-+++ b/include/asm-i386/mach-xen/asm/mmu.h	Tue Jul 25 23:02:25 2006 +0200
-@@ -7,11 +7,15 @@
-  * we put the segment information here.
-  *
-  * cpu_vm_mask is used to optimize ldt flushing.
-+ * exec_limit is used to track the range PROT_EXEC
-+ * mappings span.
-  */
- typedef struct { 
- 	int size;
- 	struct semaphore sem;
- 	void *ldt;
-+	struct desc_struct user_cs;
-+	unsigned long exec_limit;
- 	void *vdso;
- } mm_context_t;
- 
-diff -r 095d53b0d1a6 include/asm-i386/mach-xen/asm/pgalloc.h
---- a/include/asm-i386/mach-xen/asm/pgalloc.h	Tue Jul 25 21:53:33 2006 +0200
-+++ b/include/asm-i386/mach-xen/asm/pgalloc.h	Tue Jul 25 23:02:25 2006 +0200
-@@ -2,6 +2,7 @@
- #define _I386_PGALLOC_H
- 
- #include <asm/fixmap.h>
-+#include <asm/desc.h>
- #include <linux/threads.h>
- #include <linux/mm.h>		/* for struct page */
- #include <asm/io.h>		/* for phys_to_virt and page_to_pseudophys */
-diff -r 095d53b0d1a6 include/asm-i386/mach-xen/asm/processor.h
---- a/include/asm-i386/mach-xen/asm/processor.h	Tue Jul 25 21:53:33 2006 +0200
-+++ b/include/asm-i386/mach-xen/asm/processor.h	Tue Jul 25 23:02:25 2006 +0200
-@@ -333,7 +333,10 @@ extern int bootloader_type;
- /* This decides where the kernel will search for a free chunk of vm
-  * space during mmap's.
-  */
--#define TASK_UNMAPPED_BASE	(PAGE_ALIGN(TASK_SIZE / 3))
-+#define TASK_UNMAPPED_BASE	PAGE_ALIGN(TASK_SIZE/3)
-+
-+#define __HAVE_ARCH_ALIGN_STACK
-+extern unsigned long arch_align_stack(unsigned long sp);
- 
- #define HAVE_ARCH_PICK_MMAP_LAYOUT
- 
-@@ -526,6 +529,9 @@ static inline void __load_esp0(struct ts
- 	regs->xcs = __USER_CS;					\
- 	regs->eip = new_eip;					\
- 	regs->esp = new_esp;					\
-+	preempt_disable();					\
-+	load_user_cs_desc(smp_processor_id(), current->mm);	\
-+	preempt_enable();					\
- } while (0)
- 
- /*
-diff -r 095d53b0d1a6 include/asm-x86_64/mach-xen/asm/pgalloc.h
---- a/include/asm-x86_64/mach-xen/asm/pgalloc.h	Tue Jul 25 21:53:33 2006 +0200
-+++ b/include/asm-x86_64/mach-xen/asm/pgalloc.h	Tue Jul 25 23:02:25 2006 +0200
-@@ -8,6 +8,14 @@
- #include <asm/io.h>		/* for phys_to_virt and page_to_pseudophys */
- 
- #include <xen/features.h>
-+
-+#define arch_add_exec_range(mm, limit) \
-+		do { (void)(mm), (void)(limit); } while (0)
-+#define arch_flush_exec_range(mm) \
-+		do { (void)(mm); } while (0)
-+#define arch_remove_exec_range(mm, limit) \
-+		do { (void)(mm), (void)(limit); } while (0)
-+
- void make_page_readonly(void *va, unsigned int feature);
- void make_page_writable(void *va, unsigned int feature);
- void make_pages_readonly(void *va, unsigned int nr, unsigned int feature);
-diff -r 095d53b0d1a6 include/asm-x86_64/mach-xen/asm/pgtable.h
---- a/include/asm-x86_64/mach-xen/asm/pgtable.h	Tue Jul 25 21:53:33 2006 +0200
-+++ b/include/asm-x86_64/mach-xen/asm/pgtable.h	Tue Jul 25 23:02:25 2006 +0200
-@@ -44,7 +44,7 @@ extern unsigned long __supported_pte_mas
- 
- #define swapper_pg_dir init_level4_pgt
- 
--extern int nonx_setup(char *str);
-+extern void nonx_setup(char *str);
- extern void paging_init(void);
- extern void clear_kernel_mapping(unsigned long addr, unsigned long size);
- 

linux-2.6-xen.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.c                    |   10 
 arch/i386/kernel/alternative.c                  |   11 
 arch/i386/kernel/apic-xen.c                     | 1560 ++++++++++++
 arch/i386/kernel/asm-offsets.c                  |   13 
 arch/i386/kernel/cpu/Makefile                   |    5 
 arch/i386/kernel/cpu/common-xen.c               |  868 +++++++
 arch/i386/kernel/cpu/mtrr/Makefile              |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c            |  197 +
 arch/i386/kernel/crash.c                        |    4 
 arch/i386/kernel/e820.c                         |  106 
 arch/i386/kernel/entry-xen.S                    | 1292 ++++++++++
 arch/i386/kernel/entry.S                        |    6 
 arch/i386/kernel/fixup.c                        |   95 
 arch/i386/kernel/head-xen.S                     |  294 ++
 arch/i386/kernel/init_task-xen.c                |   51 
 arch/i386/kernel/io_apic-xen.c                  | 2976 ++++++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                   |  121 
 arch/i386/kernel/irq.c                          |    4 
 arch/i386/kernel/ldt-xen.c                      |  268 ++
 arch/i386/kernel/machine_kexec.c                |   41 
 arch/i386/kernel/microcode-xen.c                |  141 +
 arch/i386/kernel/mpparse.c                      |   28 
 arch/i386/kernel/pci-dma-xen.c                  |  375 +++
 arch/i386/kernel/process-xen.c                  |  873 +++++++
 arch/i386/kernel/quirks.c                       |   12 
 arch/i386/kernel/setup-xen.c                    |  823 ++++++
 arch/i386/kernel/smp-xen.c                      |  697 +++++
 arch/i386/kernel/swiotlb.c                      |  683 +++++
 arch/i386/kernel/sysenter.c                     |   18 
 arch/i386/kernel/time-xen.c                     | 1070 ++++++++
 arch/i386/kernel/traps-xen.c                    | 1145 +++++++++
 arch/i386/kernel/traps.c                        |    9 
 arch/i386/kernel/tsc.c                          |    2 
 arch/i386/kernel/vm86.c                         |   12 
 arch/i386/kernel/vmlinux.lds.S                  |    6 
 arch/i386/kernel/vsyscall-note-xen.S            |   32 
 arch/i386/lib/delay.c                           |    2 
 arch/i386/mach-xen/Makefile                     |    5 
 arch/i386/mach-xen/irqflags.c                   |  103 
 arch/i386/mach-xen/setup.c                      |  169 +
 arch/i386/mm/Makefile                           |    8 
 arch/i386/mm/fault-xen.c                        |  728 +++++
 arch/i386/mm/highmem-xen.c                      |  118 
 arch/i386/mm/hypervisor.c                       |  449 +++
 arch/i386/mm/init-xen.c                         |  873 +++++++
 arch/i386/mm/ioremap-xen.c                      |  443 +++
 arch/i386/mm/pageattr.c                         |    2 
 arch/i386/mm/pgtable-xen.c                      |  741 +++++
 arch/i386/oprofile/Makefile                     |    7 
 arch/i386/oprofile/xenoprof.c                   |  179 +
 arch/i386/pci/Makefile                          |    9 
 arch/i386/pci/irq.c                             |   12 
 arch/i386/pci/pcifront.c                        |   55 
 arch/i386/power/Makefile                        |    4 
 arch/ia64/Kconfig                               |   72 
 arch/ia64/Makefile                              |   16 
 arch/ia64/dig/setup.c                           |   17 
 arch/ia64/hp/sim/Makefile                       |    2 
 arch/ia64/kernel/asm-offsets.c                  |   24 
 arch/ia64/kernel/entry.S                        |   36 
 arch/ia64/kernel/gate.S                         |  116 
 arch/ia64/kernel/gate.lds.S                     |   22 
 arch/ia64/kernel/head.S                         |    6 
 arch/ia64/kernel/iosapic.c                      |   75 
 arch/ia64/kernel/irq_ia64.c                     |  328 ++
 arch/ia64/kernel/pal.S                          |    3 
 arch/ia64/kernel/patch.c                        |   71 
 arch/ia64/kernel/perfmon.c                      |   89 
 arch/ia64/kernel/setup.c                        |  131 +
 arch/ia64/mm/ioremap.c                          |    3 
 arch/ia64/oprofile/Makefile                     |    4 
 arch/ia64/oprofile/init.c                       |   14 
 arch/ia64/oprofile/oprofile_perfmon.h           |   30 
 arch/ia64/oprofile/perfmon.c                    |   35 
 arch/ia64/oprofile/xenoprof.c                   |  142 +
 arch/ia64/xen/Makefile                          |    9 
 arch/ia64/xen/drivers/README                    |    2 
 arch/ia64/xen/hypercall.S                       |  411 +++
 arch/ia64/xen/hypervisor.c                      | 1104 ++++++++
 arch/ia64/xen/mem.c                             |   76 
 arch/ia64/xen/util.c                            |  117 
 arch/ia64/xen/xcom_hcall.c                      |  365 ++
 arch/ia64/xen/xcom_mini.c                       |  417 +++
 arch/ia64/xen/xcom_privcmd.c                    |  663 +++++
 arch/ia64/xen/xencomm.c                         |  263 ++
 arch/ia64/xen/xenentry.S                        |  908 +++++++
 arch/ia64/xen/xenhpski.c                        |   19 
 arch/ia64/xen/xenivt.S                          | 2178 +++++++++++++++++
 arch/ia64/xen/xenminstate.h                     |  368 ++
 arch/ia64/xen/xenpal.S                          |   76 
 arch/ia64/xen/xensetup.S                        |   53 
 arch/um/kernel/physmem.c                        |    4 
 arch/x86_64/Kconfig                             |   63 
 arch/x86_64/Makefile                            |   20 
 arch/x86_64/ia32/Makefile                       |   23 
 arch/x86_64/ia32/ia32entry-xen.S                |  744 ++++++
 arch/x86_64/ia32/syscall32.c                    |   24 
 arch/x86_64/ia32/syscall32_syscall.S            |   11 
 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/apic-xen.c                   | 1262 ++++++++++
 arch/x86_64/kernel/asm-offsets.c                |    2 
 arch/x86_64/kernel/crash.c                      |    6 
 arch/x86_64/kernel/e820-xen.c                   |  769 ++++++
 arch/x86_64/kernel/early_printk.c               |   34 
 arch/x86_64/kernel/entry-xen.S                  | 1163 +++++++++
 arch/x86_64/kernel/genapic-xen.c                |  143 +
 arch/x86_64/kernel/genapic_xen.c                |  190 +
 arch/x86_64/kernel/head-xen.S                   |  189 +
 arch/x86_64/kernel/head64.c                     |   54 
 arch/x86_64/kernel/init_task.c                  |    3 
 arch/x86_64/kernel/io_apic-xen.c                | 2316 ++++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                 |   99 
 arch/x86_64/kernel/irq.c                        |    4 
 arch/x86_64/kernel/ldt-xen.c                    |  283 ++
 arch/x86_64/kernel/machine_kexec.c              |  121 
 arch/x86_64/kernel/mpparse.c                    |   22 
 arch/x86_64/kernel/pci-swiotlb.c                |   12 
 arch/x86_64/kernel/process-xen.c                |  868 +++++++
 arch/x86_64/kernel/setup-xen.c                  | 1347 ++++++++++
 arch/x86_64/kernel/setup64-xen.c                |  356 ++
 arch/x86_64/kernel/smp-xen.c                    |  577 ++++
 arch/x86_64/kernel/time-xen.c                   | 1050 ++++++++
 arch/x86_64/kernel/traps-xen.c                  | 1156 +++++++++
 arch/x86_64/kernel/vmlinux.lds.S                |    2 
 arch/x86_64/kernel/vsyscall.c                   |   18 
 arch/x86_64/kernel/xen_entry.S                  |   40 
 arch/x86_64/mm/Makefile                         |   10 
 arch/x86_64/mm/fault-xen.c                      |  694 +++++
 arch/x86_64/mm/init-xen.c                       | 1193 +++++++++
 arch/x86_64/mm/pageattr.c                       |  171 +
 arch/x86_64/oprofile/Makefile                   |   10 
 arch/x86_64/pci/Makefile                        |    5 
 drivers/Makefile                                |    1 
 drivers/acpi/Kconfig                            |    7 
 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                      |  760 ++++++
 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                             |    3 
 drivers/serial/Kconfig                          |    1 
 drivers/xen/Kconfig                             |  283 ++
 drivers/xen/Makefile                            |   19 
 drivers/xen/balloon/Makefile                    |    2 
 drivers/xen/balloon/balloon.c                   |  624 +++++
 drivers/xen/balloon/common.h                    |   58 
 drivers/xen/balloon/sysfs.c                     |  165 +
 drivers/xen/blkback/Makefile                    |    3 
 drivers/xen/blkback/blkback.c                   |  581 ++++
 drivers/xen/blkback/common.h                    |  138 +
 drivers/xen/blkback/interface.c                 |  171 +
 drivers/xen/blkback/vbd.c                       |  118 
 drivers/xen/blkback/xenbus.c                    |  485 +++
 drivers/xen/blkfront/Kconfig                    |    6 
 drivers/xen/blkfront/Makefile                   |    5 
 drivers/xen/blkfront/blkfront.c                 |  892 +++++++
 drivers/xen/blkfront/block.h                    |  156 +
 drivers/xen/blkfront/vbd.c                      |  375 +++
 drivers/xen/blktap/Makefile                     |    6 
 drivers/xen/blktap/blktap.c                     | 1518 ++++++++++++
 drivers/xen/blktap/blktapmain.c                 | 1503 ++++++++++++
 drivers/xen/blktap/common.h                     |  120 
 drivers/xen/blktap/interface.c                  |  164 +
 drivers/xen/blktap/xenbus.c                     |  366 ++
 drivers/xen/char/Makefile                       |    2 
 drivers/xen/char/mem.c                          |  203 +
 drivers/xen/console/Makefile                    |    2 
 drivers/xen/console/console.c                   |  709 +++++
 drivers/xen/console/xencons_ring.c              |  143 +
 drivers/xen/core/Makefile                       |   14 
 drivers/xen/core/cpu_hotplug.c                  |  188 +
 drivers/xen/core/evtchn.c                       |  860 ++++++
 drivers/xen/core/features.c                     |   34 
 drivers/xen/core/gnttab.c                       |  487 +++
 drivers/xen/core/hypervisor_sysfs.c             |   59 
 drivers/xen/core/machine_kexec.c                |  190 +
 drivers/xen/core/machine_reboot.c               |  185 +
 drivers/xen/core/reboot.c                       |  221 +
 drivers/xen/core/skbuff.c                       |  144 +
 drivers/xen/core/smpboot.c                      |  501 ++++
 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/fbfront/Makefile                    |    2 
 drivers/xen/fbfront/xenfb.c                     |  750 ++++++
 drivers/xen/fbfront/xenkbd.c                    |  300 ++
 drivers/xen/netback/Makefile                    |    5 
 drivers/xen/netback/common.h                    |  146 +
 drivers/xen/netback/interface.c                 |  349 ++
 drivers/xen/netback/loopback.c                  |  322 ++
 drivers/xen/netback/netback.c                   | 1524 ++++++++++++
 drivers/xen/netback/xenbus.c                    |  450 +++
 drivers/xen/netfront/Kconfig                    |    6 
 drivers/xen/netfront/Makefile                   |    4 
 drivers/xen/netfront/netfront.c                 | 2106 ++++++++++++++++
 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         |  301 ++
 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                  |  923 +++++++
 drivers/xen/pciback/pciback.h                   |   93 
 drivers/xen/pciback/pciback_ops.c               |   94 
 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                   |  285 ++
 drivers/xen/tpmback/Makefile                    |    4 
 drivers/xen/tpmback/common.h                    |   86 
 drivers/xen/tpmback/interface.c                 |  182 +
 drivers/xen/tpmback/tpmback.c                   |  944 +++++++
 drivers/xen/tpmback/xenbus.c                    |  289 ++
 drivers/xen/util.c                              |   70 
 drivers/xen/xenbus/Makefile                     |    9 
 drivers/xen/xenbus/xenbus_backend_client.c      |  147 +
 drivers/xen/xenbus/xenbus_client.c              |  305 ++
 drivers/xen/xenbus/xenbus_comms.c               |  210 +
 drivers/xen/xenbus/xenbus_comms.h               |   44 
 drivers/xen/xenbus/xenbus_dev.c                 |  361 ++
 drivers/xen/xenbus/xenbus_probe.c               | 1030 ++++++++
 drivers/xen/xenbus/xenbus_probe.h               |   73 
 drivers/xen/xenbus/xenbus_probe_backend.c       |  271 ++
 drivers/xen/xenbus/xenbus_xs.c                  |  859 ++++++
 drivers/xen/xenoprof/xenoprofile.c              |  500 ++++
 fs/Kconfig                                      |    1 
 include/asm-i386/highmem.h                      |    3 
 include/asm-i386/kexec.h                        |   14 
 include/asm-i386/kmap_types.h                   |    5 
 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            |  222 +
 include/asm-i386/mach-xen/asm/dma-mapping.h     |  151 +
 include/asm-i386/mach-xen/asm/fixmap.h          |  162 +
 include/asm-i386/mach-xen/asm/floppy.h          |  147 +
 include/asm-i386/mach-xen/asm/hypercall.h       |  407 +++
 include/asm-i386/mach-xen/asm/hypervisor.h      |  245 +
 include/asm-i386/mach-xen/asm/io.h              |  363 ++
 include/asm-i386/mach-xen/asm/irqflags.h        |   96 
 include/asm-i386/mach-xen/asm/maddr.h           |  176 +
 include/asm-i386/mach-xen/asm/mmu_context.h     |  107 
 include/asm-i386/mach-xen/asm/page.h            |  235 +
 include/asm-i386/mach-xen/asm/pgalloc.h         |   82 
 include/asm-i386/mach-xen/asm/pgtable-2level.h  |   77 
 include/asm-i386/mach-xen/asm/pgtable-3level.h  |  194 +
 include/asm-i386/mach-xen/asm/pgtable.h         |  581 ++++
 include/asm-i386/mach-xen/asm/processor.h       |  759 ++++++
 include/asm-i386/mach-xen/asm/scatterlist.h     |   22 
 include/asm-i386/mach-xen/asm/smp.h             |  120 
 include/asm-i386/mach-xen/asm/swiotlb.h         |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h    |  145 +
 include/asm-i386/mach-xen/asm/system.h          |  535 ++++
 include/asm-i386/mach-xen/asm/timer.h           |   76 
 include/asm-i386/mach-xen/asm/tlbflush.h        |  106 
 include/asm-i386/mach-xen/asm/xenoprof.h        |   48 
 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/mmu.h                          |   13 
 include/asm-i386/pci.h                          |   35 
 include/asm-i386/pgtable-2level-defs.h          |    2 
 include/asm-i386/pgtable-3level-defs.h          |    6 
 include/asm-i386/segment.h                      |    8 
 include/asm-i386/setup.h                        |    6 
 include/asm-i386/vga.h                          |    4 
 include/asm-ia64/agp.h                          |   31 
 include/asm-ia64/dma-mapping.h                  |   94 
 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                    |  463 +++
 include/asm-ia64/hypervisor.h                   |  224 +
 include/asm-ia64/intel_intrin.h                 |   68 
 include/asm-ia64/io.h                           |   56 
 include/asm-ia64/iosapic.h                      |    2 
 include/asm-ia64/irq.h                          |   33 
 include/asm-ia64/machvec_dig.h                  |   15 
 include/asm-ia64/maddr.h                        |  102 
 include/asm-ia64/meminit.h                      |    5 
 include/asm-ia64/page.h                         |   53 
 include/asm-ia64/pal.h                          |    1 
 include/asm-ia64/pgalloc.h                      |    4 
 include/asm-ia64/privop.h                       |   60 
 include/asm-ia64/processor.h                    |    1 
 include/asm-ia64/sal.h                          |   21 
 include/asm-ia64/synch_bitops.h                 |   61 
 include/asm-ia64/system.h                       |    4 
 include/asm-ia64/uaccess.h                      |   20 
 include/asm-ia64/xen/privop.h                   |  303 ++
 include/asm-ia64/xen/xcom_hcall.h               |   86 
 include/asm-ia64/xen/xencomm.h                  |   60 
 include/asm-ia64/xenoprof.h                     |   48 
 include/asm-um/page.h                           |    2 
 include/asm-x86_64/apic.h                       |    2 
 include/asm-x86_64/bootsetup.h                  |    6 
 include/asm-x86_64/dma-mapping.h                |    5 
 include/asm-x86_64/dmi.h                        |    9 
 include/asm-x86_64/dwarf2.h                     |    2 
 include/asm-x86_64/e820.h                       |    8 
 include/asm-x86_64/ipi.h                        |    5 
 include/asm-x86_64/kexec.h                      |   13 
 include/asm-x86_64/mach-xen/asm/agp.h           |   35 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h    |   27 
 include/asm-x86_64/mach-xen/asm/desc.h          |  212 +
 include/asm-x86_64/mach-xen/asm/fixmap.h        |  108 
 include/asm-x86_64/mach-xen/asm/floppy.h        |  207 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h        |  157 +
 include/asm-x86_64/mach-xen/asm/hypercall.h     |  406 +++
 include/asm-x86_64/mach-xen/asm/hypervisor.h    |    2 
 include/asm-x86_64/mach-xen/asm/io.h            |  295 ++
 include/asm-x86_64/mach-xen/asm/irq.h           |   34 
 include/asm-x86_64/mach-xen/asm/irqflags.h      |   65 
 include/asm-x86_64/mach-xen/asm/maddr.h         |  150 +
 include/asm-x86_64/mach-xen/asm/mmu_context.h   |  135 +
 include/asm-x86_64/mach-xen/asm/msr.h           |  427 +++
 include/asm-x86_64/mach-xen/asm/page.h          |  214 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h       |  224 +
 include/asm-x86_64/mach-xen/asm/pgtable.h       |  550 ++++
 include/asm-x86_64/mach-xen/asm/processor.h     |  507 ++++
 include/asm-x86_64/mach-xen/asm/smp.h           |  120 
 include/asm-x86_64/mach-xen/asm/synch_bitops.h  |    2 
 include/asm-x86_64/mach-xen/asm/system.h        |  266 ++
 include/asm-x86_64/mach-xen/asm/timer.h         |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h      |  120 
 include/asm-x86_64/mach-xen/asm/xenoprof.h      |    1 
 include/asm-x86_64/mach-xen/asm/xor.h           |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h       |  122 
 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   |   63 
 include/asm-x86_64/mach-xen/setup_arch_pre.h    |    5 
 include/asm-x86_64/mmu.h                        |   18 
 include/asm-x86_64/nmi.h                        |   22 
 include/asm-x86_64/pci.h                        |   26 
 include/asm-x86_64/swiotlb.h                    |    8 
 include/asm-x86_64/vga.h                        |    4 
 include/linux/gfp.h                             |    6 
 include/linux/highmem.h                         |    6 
 include/linux/interrupt.h                       |    6 
 include/linux/kexec.h                           |   13 
 include/linux/mm.h                              |   10 
 include/linux/oprofile.h                        |   11 
 include/linux/pfn.h                             |    4 
 include/linux/skbuff.h                          |   15 
 include/xen/balloon.h                           |   57 
 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                            |  151 +
 include/xen/hvm.h                               |   24 
 include/xen/hypervisor_sysfs.h                  |   32 
 include/xen/interface/COPYING                   |   38 
 include/xen/interface/acm.h                     |  205 +
 include/xen/interface/acm_ops.h                 |  120 
 include/xen/interface/arch-ia64.h               |  500 ++++
 include/xen/interface/arch-powerpc.h            |  121 
 include/xen/interface/arch-x86/xen-x86_32.h     |  151 +
 include/xen/interface/arch-x86/xen-x86_64.h     |  208 +
 include/xen/interface/arch-x86/xen.h            |  190 +
 include/xen/interface/arch-x86_32.h             |   27 
 include/xen/interface/arch-x86_64.h             |   27 
 include/xen/interface/callback.h                |   92 
 include/xen/interface/dom0_ops.h                |  120 
 include/xen/interface/domctl.h                  |  437 +++
 include/xen/interface/elfnote.h                 |  179 +
 include/xen/interface/event_channel.h           |  251 ++
 include/xen/interface/features.h                |   71 
 include/xen/interface/grant_table.h             |  380 +++
 include/xen/interface/hvm/e820.h                |   47 
 include/xen/interface/hvm/hvm_info_table.h      |   41 
 include/xen/interface/hvm/hvm_op.h              |   53 
 include/xen/interface/hvm/ioreq.h               |   97 
 include/xen/interface/hvm/params.h              |   36 
 include/xen/interface/hvm/vmx_assist.h          |  116 
 include/xen/interface/io/blkif.h                |  126 +
 include/xen/interface/io/console.h              |   51 
 include/xen/interface/io/fbif.h                 |  138 +
 include/xen/interface/io/kbdif.h                |  130 +
 include/xen/interface/io/netif.h                |  184 +
 include/xen/interface/io/pciif.h                |   83 
 include/xen/interface/io/ring.h                 |  299 ++
 include/xen/interface/io/tpmif.h                |   77 
 include/xen/interface/io/xenbus.h               |   73 
 include/xen/interface/io/xs_wire.h              |  116 
 include/xen/interface/kexec.h                   |  137 +
 include/xen/interface/memory.h                  |  276 ++
 include/xen/interface/nmi.h                     |   78 
 include/xen/interface/physdev.h                 |  169 +
 include/xen/interface/platform.h                |  143 +
 include/xen/interface/sched.h                   |  121 
 include/xen/interface/sysctl.h                  |  169 +
 include/xen/interface/trace.h                   |  102 
 include/xen/interface/vcpu.h                    |  142 +
 include/xen/interface/version.h                 |   91 
 include/xen/interface/xen-compat.h              |   51 
 include/xen/interface/xen.h                     |  597 ++++
 include/xen/interface/xencomm.h                 |   41 
 include/xen/interface/xenoprof.h                |  130 +
 include/xen/pcifront.h                          |   76 
 include/xen/public/evtchn.h                     |   88 
 include/xen/public/privcmd.h                    |   79 
 include/xen/xen_proc.h                          |   12 
 include/xen/xenbus.h                            |  307 ++
 include/xen/xencons.h                           |   19 
 include/xen/xenoprof.h                          |   42 
 kernel/Kconfig.preempt                          |    1 
 kernel/fork.c                                   |    3 
 kernel/irq/manage.c                             |    2 
 kernel/kexec.c                                  |   47 
 lib/Makefile                                    |    1 
 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                               |   27 
 net/ipv4/netfilter/ip_nat_proto_tcp.c           |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c           |    8 
 net/ipv4/xfrm4_output.c                         |    6 
 net/ipv6/addrconf.c                             |    3 
 scripts/Makefile.xen                            |   14 
 458 files changed, 92106 insertions(+), 251 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.3.2.1 -r 1.3.2.2 linux-2.6-xen.patch
Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/linux-2.6-xen.patch,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- linux-2.6-xen.patch	10 Apr 2007 12:42:48 -0000	1.3.2.1
+++ linux-2.6-xen.patch	10 Apr 2007 13:11:45 -0000	1.3.2.2
@@ -1,7 +1,7 @@
-Index: linux-2.6.20.noarch/arch/i386/Kconfig
+Index: linux-2.6.20.i386/arch/i386/Kconfig
 ===================================================================
---- linux-2.6.20.noarch.orig/arch/i386/Kconfig
-+++ linux-2.6.20.noarch/arch/i386/Kconfig
+--- linux-2.6.20.i386.orig/arch/i386/Kconfig
++++ linux-2.6.20.i386/arch/i386/Kconfig
 @@ -16,6 +16,7 @@ config X86_32
  
  config GENERIC_TIME
@@ -282,10 +282,10 @@
  config KTIME_SCALAR
  	bool
  	default y
-Index: linux-2.6.20.noarch/arch/i386/Kconfig.cpu
+Index: linux-2.6.20.i386/arch/i386/Kconfig.cpu
 ===================================================================
---- linux-2.6.20.noarch.orig/arch/i386/Kconfig.cpu
-+++ linux-2.6.20.noarch/arch/i386/Kconfig.cpu
+--- linux-2.6.20.i386.orig/arch/i386/Kconfig.cpu
++++ linux-2.6.20.i386/arch/i386/Kconfig.cpu
 @@ -262,7 +262,7 @@ config X86_PPRO_FENCE
  
  config X86_F00F_BUG
@@ -302,10 +302,10 @@
 -	depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX || MCORE2) && !X86_NUMAQ
 +	depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX || MCORE2) && !X86_NUMAQ && !X86_XEN
  	default y
-Index: linux-2.6.20.noarch/arch/i386/Kconfig.debug
+Index: linux-2.6.20.i386/arch/i386/Kconfig.debug
 ===================================================================
---- linux-2.6.20.noarch.orig/arch/i386/Kconfig.debug
-+++ linux-2.6.20.noarch/arch/i386/Kconfig.debug
+--- linux-2.6.20.i386.orig/arch/i386/Kconfig.debug
++++ linux-2.6.20.i386/arch/i386/Kconfig.debug
 @@ -79,6 +79,7 @@ config X86_MPPARSE
  config DOUBLEFAULT
  	default y
@@ -314,10 +314,10 @@
  	help
            This option allows trapping of rare doublefault exceptions that
            would otherwise cause a system to silently reboot. Disabling this
-Index: linux-2.6.20.noarch/arch/i386/Makefile
+Index: linux-2.6.20.i386/arch/i386/Makefile
 ===================================================================
---- linux-2.6.20.noarch.orig/arch/i386/Makefile
-+++ linux-2.6.20.noarch/arch/i386/Makefile
+--- linux-2.6.20.i386.orig/arch/i386/Makefile
++++ linux-2.6.20.i386/arch/i386/Makefile
 @@ -60,6 +60,11 @@ AFLAGS += $(call as-instr,.cfi_startproc
  
  CFLAGS += $(cflags-y)
@@ -374,10 +374,10 @@
  	       arch/$(ARCH)/boot/image.iso \
  	       arch/$(ARCH)/boot/mtools.conf
 +CLEAN_FILES += vmlinuz vmlinux-stripped
-Index: linux-2.6.20.noarch/arch/i386/boot-xen/Makefile
+Index: linux-2.6.20.i386/arch/i386/boot-xen/Makefile
 ===================================================================
 --- /dev/null
-+++ linux-2.6.20.noarch/arch/i386/boot-xen/Makefile
++++ linux-2.6.20.i386/arch/i386/boot-xen/Makefile
 @@ -0,0 +1,21 @@
 +
 +OBJCOPYFLAGS := -g --strip-unneeded
@@ -400,10 +400,10 @@
 +	install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
-Index: linux-2.6.20.noarch/arch/i386/kernel/Makefile
+Index: linux-2.6.20.i386/arch/i386/kernel/Makefile
 ===================================================================
---- linux-2.6.20.noarch.orig/arch/i386/kernel/Makefile
-+++ linux-2.6.20.noarch/arch/i386/kernel/Makefile
+--- linux-2.6.20.i386.orig/arch/i386/kernel/Makefile
++++ linux-2.6.20.i386/arch/i386/kernel/Makefile
 @@ -47,6 +47,12 @@ EXTRA_AFLAGS   := -traditional
  
  obj-$(CONFIG_SCx200)		+= scx200.o
@@ -448,10 +448,10 @@
 +obj-y := $(call cherrypickxen, $(obj-y))
 +extra-y := $(call cherrypickxen, $(extra-y))
 +endif
-Index: linux-2.6.20.noarch/arch/i386/kernel/acpi/Makefile
+Index: linux-2.6.20.i386/arch/i386/kernel/acpi/Makefile
 ===================================================================
---- linux-2.6.20.noarch.orig/arch/i386/kernel/acpi/Makefile
-+++ linux-2.6.20.noarch/arch/i386/kernel/acpi/Makefile
+--- linux-2.6.20.i386.orig/arch/i386/kernel/acpi/Makefile
++++ linux-2.6.20.i386/arch/i386/kernel/acpi/Makefile
 @@ -8,3 +8,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
  obj-y				+= cstate.o processor.o
  endif
@@ -460,10 +460,10 @@
 +include $(srctree)/scripts/Makefile.xen
 +obj-y := $(call cherrypickxen, $(obj-y), $(src))
 +endif
-Index: linux-2.6.20.noarch/arch/i386/kernel/acpi/boot.c
+Index: linux-2.6.20.i386/arch/i386/kernel/acpi/boot.c
 ===================================================================
---- linux-2.6.20.noarch.orig/arch/i386/kernel/acpi/boot.c
-+++ linux-2.6.20.noarch/arch/i386/kernel/acpi/boot.c
+--- linux-2.6.20.i386.orig/arch/i386/kernel/acpi/boot.c
++++ linux-2.6.20.i386/arch/i386/kernel/acpi/boot.c
 @@ -103,7 +103,7 @@ static u64 acpi_lapic_addr __initdata = 
   */
  enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_PIC;
@@ -505,10 +505,10 @@
  	/* detect the location of the ACPI PM Timer */
  	if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID) {
  		/* FADT rev. 2 */
-Index: linux-2.6.20.noarch/arch/i386/kernel/alternative.c
+Index: linux-2.6.20.i386/arch/i386/kernel/alternative.c
 ===================================================================
---- linux-2.6.20.noarch.orig/arch/i386/kernel/alternative.c
-+++ linux-2.6.20.noarch/arch/i386/kernel/alternative.c
+--- linux-2.6.20.i386.orig/arch/i386/kernel/alternative.c
++++ linux-2.6.20.i386/arch/i386/kernel/alternative.c
 @@ -5,7 +5,11 @@
  #include <asm/alternative.h>
  #include <asm/sections.h>
@@ -546,10 +546,10 @@
  		return;
  	}
  
-Index: linux-2.6.20.noarch/arch/i386/kernel/apic-xen.c
+Index: linux-2.6.20.i386/arch/i386/kernel/apic-xen.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.20.noarch/arch/i386/kernel/apic-xen.c
++++ linux-2.6.20.i386/arch/i386/kernel/apic-xen.c
 @@ -0,0 +1,1560 @@
 +/*
 + *	Local APIC handling, local APIC timers
@@ -2111,10 +2111,10 @@
 +
 +#endif	/* CONFIG_PM */
 +#endif /* !CONFIG_XEN */
-Index: linux-2.6.20.noarch/arch/i386/kernel/asm-offsets.c
+Index: linux-2.6.20.i386/arch/i386/kernel/asm-offsets.c
 ===================================================================
---- linux-2.6.20.noarch.orig/arch/i386/kernel/asm-offsets.c
-+++ linux-2.6.20.noarch/arch/i386/kernel/asm-offsets.c
+--- linux-2.6.20.i386.orig/arch/i386/kernel/asm-offsets.c
++++ linux-2.6.20.i386/arch/i386/kernel/asm-offsets.c
 @@ -89,9 +89,14 @@ void foo(void)
  	OFFSET(pbe_orig_address, pbe, orig_address);
  	OFFSET(pbe_next, pbe, next);
@@ -2142,10 +2142,10 @@
 +	OFFSET(XEN_START_mfn_list, start_info, mfn_list);
 +#endif
  }
-Index: linux-2.6.20.noarch/arch/i386/kernel/cpu/Makefile
+Index: linux-2.6.20.i386/arch/i386/kernel/cpu/Makefile
 ===================================================================
---- linux-2.6.20.noarch.orig/arch/i386/kernel/cpu/Makefile
-+++ linux-2.6.20.noarch/arch/i386/kernel/cpu/Makefile
+--- linux-2.6.20.i386.orig/arch/i386/kernel/cpu/Makefile
++++ linux-2.6.20.i386/arch/i386/kernel/cpu/Makefile
 @@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE)	+=	mcheck/
  
  obj-$(CONFIG_MTRR)	+= 	mtrr/
@@ -2155,10 +2155,10 @@
 +include $(srctree)/scripts/Makefile.xen
 +obj-y := $(call cherrypickxen, $(obj-y), $(src))
 +endif
-Index: linux-2.6.20.noarch/arch/i386/kernel/cpu/common-xen.c
+Index: linux-2.6.20.i386/arch/i386/kernel/cpu/common-xen.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.20.noarch/arch/i386/kernel/cpu/common-xen.c
++++ linux-2.6.20.i386/arch/i386/kernel/cpu/common-xen.c
 @@ -0,0 +1,868 @@
 +#include <linux/init.h>
 +#include <linux/string.h>
@@ -3028,10 +3028,10 @@
 +	per_cpu(cpu_tlbstate, cpu).active_mm = &init_mm;
 +}
 +#endif
-Index: linux-2.6.20.noarch/arch/i386/kernel/cpu/mtrr/Makefile
+Index: linux-2.6.20.i386/arch/i386/kernel/cpu/mtrr/Makefile
 ===================================================================
---- linux-2.6.20.noarch.orig/arch/i386/kernel/cpu/mtrr/Makefile
-+++ linux-2.6.20.noarch/arch/i386/kernel/cpu/mtrr/Makefile
+--- linux-2.6.20.i386.orig/arch/i386/kernel/cpu/mtrr/Makefile
++++ linux-2.6.20.i386/arch/i386/kernel/cpu/mtrr/Makefile
 @@ -1,3 +1,10 @@
  obj-y		:= main.o if.o generic.o state.o
  obj-$(CONFIG_X86_32) += amd.o cyrix.o centaur.o
@@ -3043,10 +3043,10 @@
 +obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
[...5719 lines suppressed...]
+--- linux-2.6.20.i386.orig/kernel/irq/manage.c
++++ linux-2.6.20.i386/kernel/irq/manage.c
 @@ -30,6 +30,7 @@ void synchronize_irq(unsigned int irq)
  {
  	struct irq_desc *desc = irq_desc + irq;
@@ -97413,10 +97413,10 @@
  	if (irq >= NR_IRQS)
  		return;
  
-Index: linux-2.6.20.noarch/kernel/kexec.c
+Index: linux-2.6.20.i386/kernel/kexec.c
 ===================================================================
---- linux-2.6.20.noarch.orig/kernel/kexec.c
-+++ linux-2.6.20.noarch/kernel/kexec.c
+--- linux-2.6.20.i386.orig/kernel/kexec.c
++++ linux-2.6.20.i386/kernel/kexec.c
 @@ -404,7 +404,7 @@ static struct page *kimage_alloc_normal_
  		pages = kimage_alloc_pages(GFP_KERNEL, order);
  		if (!pages)
@@ -97578,10 +97578,10 @@
  	/* Install the new kernel, and  Uninstall the old */
  	image = xchg(dest_image, image);
  
-Index: linux-2.6.20.noarch/lib/Makefile
+Index: linux-2.6.20.i386/lib/Makefile
 ===================================================================
---- linux-2.6.20.noarch.orig/lib/Makefile
-+++ linux-2.6.20.noarch/lib/Makefile
+--- linux-2.6.20.i386.orig/lib/Makefile
++++ linux-2.6.20.i386/lib/Makefile
 @@ -60,6 +60,7 @@ obj-$(CONFIG_EEPROM_93CX6) += eeprom_93c
  
  obj-$(CONFIG_SWIOTLB) += swiotlb.o
@@ -97590,10 +97590,10 @@
  
  lib-$(CONFIG_GENERIC_BUG) += bug.o
  
-Index: linux-2.6.20.noarch/mm/Kconfig
+Index: linux-2.6.20.i386/mm/Kconfig
 ===================================================================
---- linux-2.6.20.noarch.orig/mm/Kconfig
-+++ linux-2.6.20.noarch/mm/Kconfig
+--- linux-2.6.20.i386.orig/mm/Kconfig
++++ linux-2.6.20.i386/mm/Kconfig
 @@ -132,11 +132,14 @@ config MEMORY_HOTPLUG_SPARSE
  # 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.
@@ -97609,10 +97609,10 @@
  	default "4"
  
  #
-Index: linux-2.6.20.noarch/mm/highmem.c
+Index: linux-2.6.20.i386/mm/highmem.c
 ===================================================================
---- linux-2.6.20.noarch.orig/mm/highmem.c
-+++ linux-2.6.20.noarch/mm/highmem.c
+--- linux-2.6.20.i386.orig/mm/highmem.c
++++ linux-2.6.20.i386/mm/highmem.c
 @@ -149,6 +149,17 @@ start:
  	return vaddr;
  }
@@ -97631,10 +97631,10 @@
  void fastcall *kmap_high(struct page *page)
  {
  	unsigned long vaddr;
-Index: linux-2.6.20.noarch/mm/memory.c
+Index: linux-2.6.20.i386/mm/memory.c
 ===================================================================
---- linux-2.6.20.noarch.orig/mm/memory.c
-+++ linux-2.6.20.noarch/mm/memory.c
+--- linux-2.6.20.i386.orig/mm/memory.c
++++ linux-2.6.20.i386/mm/memory.c
 @@ -404,7 +404,8 @@ struct page *vm_normal_page(struct vm_ar
  	 * and that the resulting page looks ok.
  	 */
@@ -97783,10 +97783,10 @@
  /*
   * handle_pte_fault chooses page fault handler according to an entry
   * which was read non-atomically.  Before making any commitment, on
-Index: linux-2.6.20.noarch/mm/mmap.c
+Index: linux-2.6.20.i386/mm/mmap.c
 ===================================================================
---- linux-2.6.20.noarch.orig/mm/mmap.c
-+++ linux-2.6.20.noarch/mm/mmap.c
+--- linux-2.6.20.i386.orig/mm/mmap.c
++++ linux-2.6.20.i386/mm/mmap.c
 @@ -2067,6 +2067,10 @@ void exit_mmap(struct mm_struct *mm)
  	unsigned long nr_accounted = 0;
  	unsigned long end;
@@ -97798,10 +97798,10 @@
  	lru_add_drain();
  	flush_cache_mm(mm);
  	tlb = tlb_gather_mmu(mm, 1);
-Index: linux-2.6.20.noarch/mm/page_alloc.c
+Index: linux-2.6.20.i386/mm/page_alloc.c
 ===================================================================
---- linux-2.6.20.noarch.orig/mm/page_alloc.c
-+++ linux-2.6.20.noarch/mm/page_alloc.c
+--- linux-2.6.20.i386.orig/mm/page_alloc.c
++++ linux-2.6.20.i386/mm/page_alloc.c
 @@ -494,6 +494,8 @@ static void __free_pages_ok(struct page 
  	int i;
  	int reserved = 0;
@@ -97829,10 +97829,10 @@
  	if (PageAnon(page))
  		page->mapping = NULL;
  	if (free_pages_check(page))
-Index: linux-2.6.20.noarch/net/core/dev.c
+Index: linux-2.6.20.i386/net/core/dev.c
 ===================================================================
---- linux-2.6.20.noarch.orig/net/core/dev.c
-+++ linux-2.6.20.noarch/net/core/dev.c
+--- linux-2.6.20.i386.orig/net/core/dev.c
++++ linux-2.6.20.i386/net/core/dev.c
 @@ -118,6 +118,12 @@
  #include <linux/ctype.h>
  #include <net/wireless.h>
@@ -97931,10 +97931,10 @@
  
  #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
  EXPORT_SYMBOL(br_handle_frame_hook);
-Index: linux-2.6.20.noarch/net/core/skbuff.c
+Index: linux-2.6.20.i386/net/core/skbuff.c
 ===================================================================
---- linux-2.6.20.noarch.orig/net/core/skbuff.c
-+++ linux-2.6.20.noarch/net/core/skbuff.c
+--- linux-2.6.20.i386.orig/net/core/skbuff.c
++++ linux-2.6.20.i386/net/core/skbuff.c
 @@ -140,6 +140,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
   *	Buffers may only be allocated from interrupts using a @gfp_mask of
   *	%GFP_ATOMIC.
@@ -98005,10 +98005,10 @@
  	C(pkt_type);
  	C(ip_summed);
  	C(priority);
-Index: linux-2.6.20.noarch/net/ipv4/netfilter/ip_nat_proto_tcp.c
+Index: linux-2.6.20.i386/net/ipv4/netfilter/ip_nat_proto_tcp.c
 ===================================================================
---- linux-2.6.20.noarch.orig/net/ipv4/netfilter/ip_nat_proto_tcp.c
-+++ linux-2.6.20.noarch/net/ipv4/netfilter/ip_nat_proto_tcp.c
+--- linux-2.6.20.i386.orig/net/ipv4/netfilter/ip_nat_proto_tcp.c
++++ linux-2.6.20.i386/net/ipv4/netfilter/ip_nat_proto_tcp.c
 @@ -134,8 +134,15 @@ tcp_manip_pkt(struct sk_buff **pskb,
  	if (hdrsize < sizeof(*hdr))
  		return 1;
@@ -98025,10 +98025,10 @@
  	return 1;
  }
  
-Index: linux-2.6.20.noarch/net/ipv4/netfilter/ip_nat_proto_udp.c
+Index: linux-2.6.20.i386/net/ipv4/netfilter/ip_nat_proto_udp.c
 ===================================================================
---- linux-2.6.20.noarch.orig/net/ipv4/netfilter/ip_nat_proto_udp.c
-+++ linux-2.6.20.noarch/net/ipv4/netfilter/ip_nat_proto_udp.c
+--- linux-2.6.20.i386.orig/net/ipv4/netfilter/ip_nat_proto_udp.c
++++ linux-2.6.20.i386/net/ipv4/netfilter/ip_nat_proto_udp.c
 @@ -120,8 +120,16 @@ udp_manip_pkt(struct sk_buff **pskb,
  	}
  
@@ -98046,10 +98046,10 @@
  		if (!hdr->check)
  			hdr->check = CSUM_MANGLED_0;
  	}
-Index: linux-2.6.20.noarch/net/ipv4/xfrm4_output.c
+Index: linux-2.6.20.i386/net/ipv4/xfrm4_output.c
 ===================================================================
---- linux-2.6.20.noarch.orig/net/ipv4/xfrm4_output.c
-+++ linux-2.6.20.noarch/net/ipv4/xfrm4_output.c
+--- linux-2.6.20.i386.orig/net/ipv4/xfrm4_output.c
++++ linux-2.6.20.i386/net/ipv4/xfrm4_output.c
 @@ -18,6 +18,8 @@
  #include <net/xfrm.h>
  #include <net/icmp.h>
@@ -98070,10 +98070,10 @@
  	if (skb->ip_summed == CHECKSUM_PARTIAL) {
  		err = skb_checksum_help(skb);
  		if (err)
-Index: linux-2.6.20.noarch/net/ipv6/addrconf.c
+Index: linux-2.6.20.i386/net/ipv6/addrconf.c
 ===================================================================
---- linux-2.6.20.noarch.orig/net/ipv6/addrconf.c
-+++ linux-2.6.20.noarch/net/ipv6/addrconf.c
+--- linux-2.6.20.i386.orig/net/ipv6/addrconf.c
++++ linux-2.6.20.i386/net/ipv6/addrconf.c
 @@ -2492,6 +2492,8 @@ static void addrconf_dad_start(struct in
  	spin_lock_bh(&ifp->lock);
  
@@ -98091,10 +98091,10 @@
  	    (ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) {
  		struct in6_addr all_routers;
  
-Index: linux-2.6.20.noarch/scripts/Makefile.xen
+Index: linux-2.6.20.i386/scripts/Makefile.xen
 ===================================================================
 --- /dev/null
-+++ linux-2.6.20.noarch/scripts/Makefile.xen
++++ linux-2.6.20.i386/scripts/Makefile.xen
 @@ -0,0 +1,14 @@
 +
 +# cherrypickxen($1 = allobj)



From fedora-cvs-commits at redhat.com  Tue Apr 10 13:38:10 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 09:38:10 -0400
Subject: rpms/scrollkeeper/devel scrollkeeper_cl.xml.pa, NONE,
	1.1 scrollkeeper.spec, 1.25, 1.26
Message-ID: <200704101338.l3ADcA1n019369@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/scrollkeeper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18885

Modified Files:
	scrollkeeper.spec 
Added Files:
	scrollkeeper_cl.xml.pa 
Log Message:
Add Panjabi translations



--- NEW FILE scrollkeeper_cl.xml.pa ---
<?xml version="1.0" encoding="UTF-8"?>
<ScrollKeeperContentsList>



  <sect categorycode="Applications">
    <title>????????????</title>
    <sect categorycode="ApplicationsAmusement">
      <title>?????????????????????</title>
      </sect>
    <sect categorycode="ApplicationsEducation">
      <title>??????????????????</title>
      <sect categorycode="ApplicationsEducationArts">
        <title>?????????</title>
        </sect>
      <sect categorycode="ApplicationsEducationComputer Science">
        <title>????????????????????? ???????????????</title>
        </sect>
      <sect categorycode="ApplicationsEducationEnglish">
        <title>????????????????????????</title>
        </sect>
      <sect categorycode="ApplicationsEducationLanguage">
        <title>???????????????</title>
        </sect>
      <sect categorycode="ApplicationsEducationMaths">
        <title>????????????</title>
        </sect>
      <sect categorycode="ApplicationsEducationMusic">
        <title>???????????????</title>
        </sect>
      <sect categorycode="ApplicationsEducationScience">
        <title>??????????????????</title>
        </sect>
      <sect categorycode="ApplicationsEducationTechnology">
        <title>????????????????????????</title>
        </sect>
      <sect categorycode="ApplicationsEducationTesting">
        <title>?????????????????????</title>
        </sect>
      <sect categorycode="ApplicationsEducationOther">
        <title>?????????</title>
        </sect>
    </sect>
    <sect categorycode="ApplicationsGames">
      <title>???????????????</title>
      <sect categorycode="ApplicationsGamesArcade">
        <title>???????????????</title>
        </sect>
      <sect categorycode="ApplicationsGamesBoard">
        <title>????????????</title>
        </sect>
      <sect categorycode="ApplicationsGamesFirst Person Shooters">
        <title>?????????????????? ???????????? ???????????????</title>
        </sect>
      <sect categorycode="ApplicationsGamesPuzzles">
        <title>??????????????????</title>
        </sect>
      <sect categorycode="ApplicationsGamesFighting">
        <title>????????????</title>
        </sect>
      <sect categorycode="ApplicationsGamesRole-Playing">
        <title>?????????-?????????</title>
        </sect>
      <sect categorycode="ApplicationsGamesSimulation">
        <title>???????????????????????????</title>
        </sect>
      <sect categorycode="ApplicationsGamesStrategy">
        <title>????????????</title>
        </sect>
      <sect categorycode="ApplicationsGamesOther">
        <title>?????????</title>
        </sect>
    </sect>
    <sect categorycode="ApplicationsInternet">
      <title>????????????????????????</title>
      <sect categorycode="ApplicationsInternetChat">
        <title>??????????????????</title>
        </sect>
      <sect categorycode="ApplicationsInternetEmail">
        <title>???-?????????</title>
        </sect>
      <sect categorycode="ApplicationsInternetFax">
        <title>????????????</title>
        </sect>
      <sect categorycode="ApplicationsInternetFile Sharing">
        <title>???????????? ????????????</title>
        </sect>
      <sect categorycode="ApplicationsInternetFTP">
        <title>FTP</title>
        </sect>
      <sect categorycode="ApplicationsInternetInternet Phone">
        <title>???????????????????????? ?????????</title>
        </sect>
      <sect categorycode="ApplicationsInternetMessaging">
        <title>??????????????????</title>
        </sect>
      <sect categorycode="ApplicationsInternetNews">
        <title>??????????????????</title>
        </sect>
      <sect categorycode="ApplicationsInternetVideo Conferencing">
        <title>??????????????? ??????????????????</title>
        </sect>
      <sect categorycode="ApplicationsInternetWeb">
        <title>????????????</title>
        </sect>
      <sect categorycode="ApplicationsInternetOther">
        <title>?????????</title>
        </sect>
    </sect>
    <sect categorycode="ApplicationsMultimedia">
      <title>???????????????????????????</title>
      <sect categorycode="ApplicationsMultimediaGraphics">
        <title>?????????????????????</title>
        <sect categorycode="ApplicationsMultimediaGraphics3D Modelling">
          <title>3D ?????????????????????</title>
          </sect>
        <sect categorycode="ApplicationsMultimediaGraphics3D Rendering">
          <title>3D ?????????????????????</title>
          </sect>
        <sect categorycode="ApplicationsMultimediaGraphicsCAD">
          <title>CAD</title>
          </sect>
        <sect categorycode="ApplicationsMultimediaGraphicsCapture">
          <title>???????????????</title>
          </sect>
        <sect categorycode="ApplicationsMultimediaGraphicsConversion">
          <title>??????????????????</title>
          </sect>
        <sect categorycode="ApplicationsMultimediaGraphicsDrawing">
          <title>??????????????????</title>
          </sect>
        <sect categorycode="ApplicationsMultimediaGraphicsEditing">
          <title>??????????????????</title>
          </sect>
        <sect categorycode="ApplicationsMultimediaGraphicsViewing">
          <title>???????????????</title>
          </sect>
        <sect categorycode="ApplicationsMultimediaGraphicsOther">
          <title>?????????</title>
          </sect>
      </sect>
      <sect categorycode="ApplicationsMultimediaSound">
        <title>???????????????</title>
        <sect categorycode="ApplicationsMultimediaSoundAnalysis">
          <title>????????????</title>
          </sect>
        <sect categorycode="ApplicationsMultimediaSoundCD Mastering">
          <title>CD ????????????????????????</title>
          </sect>
        <sect categorycode="ApplicationsMultimediaSoundConversion">
          <title>???????????????????????????</title>
          </sect>
        <sect categorycode="ApplicationsMultimediaSoundEditing">
          <title>??????????????????</title>
          </sect>
        <sect categorycode="ApplicationsMultimediaSoundMIDI">
          <title>MIDI</title>
          </sect>
        <sect categorycode="ApplicationsMultimediaSoundMixers">
          <title>???????????????</title>
          </sect>
        <sect categorycode="ApplicationsMultimediaSoundPlayers">
          <title>???????????????</title>
          </sect>
        <sect categorycode="ApplicationsMultimediaSoundRecording">
          <title>????????????????????????</title>
          </sect>
        <sect categorycode="ApplicationsMultimediaSoundSpeech">
          <title>???????????????</title>
          </sect>
        <sect categorycode="ApplicationsMultimediaSoundOther">
          <title>?????????</title>
          </sect>
      </sect>
      <sect categorycode="ApplicationsMultimediaVideo">
        <title>???????????????</title>
        <sect categorycode="ApplicationsMultimediaVideoCapture">
          <title>???????????????</title>
          </sect>
        <sect categorycode="ApplicationsMultimediaVideoConversion">
          <title>???????????????</title>
          </sect>
        <sect categorycode="ApplicationsMultimediaVideoDisplay">
          <title>?????????????????????</title>
          </sect>
        <sect categorycode="ApplicationsMultimediaVideoEditing">
          <title>??????????????????</title>
          </sect>
        <sect categorycode="ApplicationsMultimediaVideoOther">
          <title>?????????</title>
          </sect>
      </sect>
      <sect categorycode="ApplicationsMultimediaOther">
        <title>?????????</title>
        </sect>
    </sect>
    <sect categorycode="ApplicationsOffice">
      <title>???????????????</title>
      <sect categorycode="ApplicationsOfficeCalendar">
        <title>??????????????????</title>
        </sect>
      <sect categorycode="ApplicationsOfficeData Processing">
        <title>????????????????????? ??????????????????????????????</title>
        </sect>
      <sect categorycode="ApplicationsOfficeDatabase">
        <title>?????????????????????</title>
        </sect>
      <sect categorycode="ApplicationsOfficeEmail">
        <title>????????????</title>
        </sect>
      <sect categorycode="ApplicationsOfficeFinancial">
        <title>???????????????</title>
        </sect>
      <sect categorycode="ApplicationsOfficePIM">
        <title>PIM</title>
        </sect>
      <sect categorycode="ApplicationsOfficePlotting">
        <title>?????????????????????</title>
        </sect>
      <sect categorycode="ApplicationsOfficePresentation">
        <title>????????????????????????</title>
        </sect>
      <sect categorycode="ApplicationsOfficePublishing">
        <title>?????????????????????</title>
        <sect categorycode="ApplicationsOfficePublishingWeb Publishing">
          <title>???????????? ?????????????????????</title>
          </sect>
      </sect>
      <sect categorycode="ApplicationsOfficeWord Processing">
        <title>???????????? ????????????????????????</title>
        </sect>
      <sect categorycode="ApplicationsOfficeOther">
        <title>?????????</title>
        </sect>
    </sect>
    <sect categorycode="ApplicationsScientific">
      <title>?????????????????????</title>
      <sect categorycode="ApplicationsScientificAstronomy">
        <title>???????????? ??????????????????</title>
        </sect>
      <sect categorycode="ApplicationsScientificAstrophysics">
        <title>???????????? ???????????????</title>
        </sect>
      <sect categorycode="ApplicationsScientificBiology">
        <title>????????? ??????????????????</title>
        </sect>
      <sect categorycode="ApplicationsScientificChemistry">
        <title>??????????????? ??????????????????</title>
        </sect>
      <sect categorycode="ApplicationsScientificEDA">
        <title>EDA</title>
        </sect>
      <sect categorycode="ApplicationsScientificGenetics">
        <title>??????????????????</title>
        </sect>
      <sect categorycode="ApplicationsScientificMath">
        <title>????????????</title>
        </sect>
      <sect categorycode="ApplicationsScientificPhysics">
        <title>??????????????? ??????????????????</title>
        </sect>
      <sect categorycode="ApplicationsScientificVisualisation">
        <title>??????????????????????????????????????????</title>
        </sect>
      <sect categorycode="ApplicationsScientificOther">
        <title>?????????</title>
        </sect>
    </sect>
    <sect categorycode="ApplicationsSecurity">
      <title>?????????????????????</title>
      <sect categorycode="ApplicationsSecurityCryptography">
        <title>???????????????????????????????????????</title>
        </sect>
      <sect categorycode="ApplicationsSecurityOther">
        <title>?????????</title>
        </sect>
    </sect>
    <sect categorycode="ApplicationsText Editors">
      <title>????????? ??????????????????</title>
      <sect categorycode="ApplicationsText EditorsCLI">
        <title>CLI</title>
        </sect>
      <sect categorycode="ApplicationsText EditorsGUI">
        <title>GUI</title>
        </sect>
      <sect categorycode="ApplicationsText EditorsOther">
        <title>?????????</title>
        </sect>
    </sect>
    <sect categorycode="ApplicationsUtilities">
      <title>?????????????????????</title>
      <sect categorycode="ApplicationsUtilitiesArchiving">
        <title>???????????????</title>
        </sect>
      <sect categorycode="ApplicationsUtilitiesCalculating">
        <title>?????????????????????????????????</title>
        </sect>
      <sect categorycode="ApplicationsUtilitiesClocks">
        <title>???????????????</title>
        </sect>
      <sect categorycode="ApplicationsUtilitiesCompression">
        <title>???????????????</title>
        </sect>
      <sect categorycode="ApplicationsUtilitiesFile Utilities">
        <title>???????????? ?????????????????????</title>
        </sect>
      <sect categorycode="ApplicationsUtilitiesMonitors">
        <title>??????????????????</title>
        </sect>
      <sect categorycode="ApplicationsUtilitiesPrinting">
        <title>????????????????????????</title>
        </sect>
      <sect categorycode="ApplicationsUtilitiesTerminals">
        <title>??????????????????</title>
        </sect>
      <sect categorycode="ApplicationsUtilitiesText Utilities">
        <title>????????? ?????????????????????</title>
        </sect>
      <sect categorycode="ApplicationsUtilitiesOther">
        <title>?????????</title>
        </sect>
    </sect>
    <sect categorycode="ApplicationsX">
      <title>X</title>
      <sect categorycode="ApplicationsXConfiguration">
        <title>??????????????????</title>
        </sect>
      <sect categorycode="ApplicationsXFonts">
        <title>????????????</title>
        </sect>
      <sect categorycode="ApplicationsXLogin Managers">
        <title>??????????????? ??????????????????</title>
        </sect>
      <sect categorycode="ApplicationsXScreensavers">
        <title>???????????????-????????????</title>
        </sect>
      <sect categorycode="ApplicationsXWindow Managers">
        <title>??????????????? ??????????????????</title>
        </sect>
      <sect categorycode="ApplicationsXOther">
        <title>?????????</title>
        </sect>
    </sect>
  </sect>

  <sect categorycode="CDE">
    <title>CDE</title>
    </sect>

  <sect categorycode="Development">
    <title>??????????????????????????????</title>
    <sect categorycode="DevelopmentDatabases">
      <title>?????????????????????</title>
      </sect>
    <sect categorycode="DevelopmentDevelopment Tools">
      <title>?????????????????????????????? ?????????</title>
      <sect categorycode="DevelopmentDevelopment ToolsBuild Tools">
        <title>???????????? ?????????</title>
        </sect>
      <sect categorycode="DevelopmentDevelopment ToolsCode Generators">
        <title>????????? ?????????????????????</title>
        </sect>
      <sect categorycode="DevelopmentDevelopment ToolsConfiguration">
        <title>??????????????????</title>
        </sect>
      <sect categorycode="DevelopmentDevelopment ToolsDebuggers">
        <title>??????????????????</title>
        </sect>
      <sect categorycode="DevelopmentDevelopment ToolsIDEs">
        <title>IDE</title>
        </sect>
      <sect categorycode="DevelopmentDevelopment ToolsPackaging">
        <title>????????????????????????</title>
        </sect>
      <sect categorycode="DevelopmentDevelopment ToolsProfiling">
        <title>?????????????????????????????????</title>
        </sect>
      <sect categorycode="DevelopmentDevelopment ToolsRAD">
        <title>RAD</title>
        </sect>
      <sect categorycode="DevelopmentDevelopment ToolsVersion Control">
        <title>???????????? ??????????????????</title>
        </sect>
      <sect categorycode="DevelopmentDevelopment ToolsOther">
        <title>?????????</title>
        </sect>
    </sect>
    <sect categorycode="DevelopmentEnvironments">
      <title>????????????????????????????????????</title>
      <sect categorycode="DevelopmentEnvironmentsADA">
        <title>ADA</title>
        </sect>
      <sect categorycode="DevelopmentEnvironmentsC">
        <title>C</title>
        </sect>
      <sect categorycode="DevelopmentEnvironmentsC++">
        <title>C++</title>
        </sect>
      <sect categorycode="DevelopmentEnvironmentsGNOME">
        <title>????????????</title>
        </sect>
      <sect categorycode="DevelopmentEnvironmentsGTK+">
        <title>GTK+</title>
        </sect>
      <sect categorycode="DevelopmentEnvironmentsgtk++">
        <title>gtk++</title>
        </sect>
      <sect categorycode="DevelopmentEnvironmentsJava">
        <title>Java</title>
        </sect>
      <sect categorycode="DevelopmentEnvironmentsKDE">
        <title>KDE</title>
        </sect>
      <sect categorycode="DevelopmentEnvironmentsPerl">
        <title>?????????</title>
        </sect>
      <sect categorycode="DevelopmentEnvironmentsPython">
        <title>???????????????</title>
        </sect>
      <sect categorycode="DevelopmentEnvironmentsQt">
        <title>Qt</title>
        </sect>
      <sect categorycode="DevelopmentEnvironmentsTcl/Tk">
        <title>Tcl/Tk</title>
        </sect>
      <sect categorycode="DevelopmentEnvironmentsWebML">
        <title>WebML</title>
        </sect>
      <sect categorycode="DevelopmentEnvironmentsOther">
        <title>?????????</title>
        </sect>
    </sect>
    <sect categorycode="DevelopmentKernels">
      <title>????????????</title>
      <sect categorycode="DevelopmentKernelsFreeBSD">
        <title>FreeBSD</title>
        </sect>
      <sect categorycode="DevelopmentKernelsLinux">
        <title>???????????????</title>
        </sect>
      <sect categorycode="DevelopmentKernelsNetBSD">
        <title>NetBSD</title>
        </sect>
      <sect categorycode="DevelopmentKernelsOther">
        <title>?????????</title>
        </sect>
    </sect>
    <sect categorycode="DevelopmentLibraries">
      <title>????????????????????????</title>
      </sect>
    <sect categorycode="DevelopmentSystem Calls">
      <title>??????????????? ?????????</title>
      </sect>
    <sect categorycode="DevelopmentOther">
      <title>?????????</title>
      </sect>
  </sect>
  <sect categorycode="General">
    <title>??????</title>
    <sect categorycode="GeneralLicenses">
      <title>?????????????????????</title>
      </sect>
    <sect categorycode="GeneralLinux">
      <title>???????????????</title>
      <sect categorycode="GeneralLinuxDistributions">
        <title>????????????????????????????????????</title>
        <sect categorycode="GeneralLinuxDistributionsCaldera">
          <title>Caldera</title>
          </sect>
        <sect categorycode="GeneralLinuxDistributionsDebian">
          <title>??????????????????</title>
          </sect>
        <sect categorycode="GeneralLinuxDistributionsMandrake">
          <title>Mandrake</title>
          </sect>
        <sect categorycode="GeneralLinuxDistributionsRed Flag">
          <title>Red Flag</title>
          </sect>
        <sect categorycode="GeneralLinuxDistributionsRed Hat">
          <title>Red Hat</title>
          </sect>
        <sect categorycode="GeneralLinuxDistributionsSlackware">
          <title>????????????????????????</title>
          </sect>
        <sect categorycode="GeneralLinuxDistributionsSuSE">
          <title>SuSE</title>
          </sect>
        <sect categorycode="GeneralLinuxDistributionsOther">
          <title>?????????</title>
          </sect>
      </sect>
      <sect categorycode="GeneralLinuxGeneral">
        <title>??????</title>
        </sect>
      <sect categorycode="GeneralLinuxOther">
        <title>?????????</title>
        </sect>
    </sect>
    <sect categorycode="GeneralOther">
      <title>?????????</title>
      </sect>
  </sect>

  <sect categorycode="GNOME">
    <title>????????????</title>
    <sect categorycode="GNOMEAccessibility">
      <title>???????????????</title>
      </sect>
    <sect categorycode="GNOMECore Desktop">
      <title>????????? ?????????????????????</title>
      </sect>
    <sect categorycode="GNOMEDesktop">
      <title>?????????????????????</title>
      <sect categorycode="GNOMEDesktopUser Guides">
        <title>?????????????????? ????????????</title>
        </sect>
    </sect>
    <sect categorycode="GNOMEApplets">
      <title>???????????????</title>
      <sect categorycode="GNOMEAppletsAccessories">
        <title>???????????????</title>
        </sect>
      <sect categorycode="GNOMEAppletsAmusement">
        <title>?????????????????????</title>
        </sect>
      <sect categorycode="GNOMEAppletsClock">
        <title>?????????</title>
        </sect>
      <sect categorycode="GNOMEAppletsInternet">
        <title>????????????????????????</title>
        </sect>
      <sect categorycode="GNOMEAppletsMonitors">
        <title>??????????????????</title>
        </sect>
      <sect categorycode="GNOMEAppletsMultimedia">
        <title>???????????????????????????</title>
        </sect>
      <sect categorycode="GNOMEAppletsNetwork">
        <title>??????????????????</title>
        </sect>
      <sect categorycode="GNOMEAppletsUtility">
        <title>?????????????????????</title>
        </sect>
    </sect>
    <sect categorycode="GNOMEApplications">
      <title>????????????</title>
      <sect categorycode="GNOMEApplicationsAccessories">
        <title>???????????????</title>
        </sect>
      <sect categorycode="GNOMEApplicationsDesktop Preferences">
        <title>????????????????????? ????????????</title>
        </sect>
      <sect categorycode="GNOMEApplicationsGames">
        <title>???????????????</title>
        </sect>
      <sect categorycode="GNOMEApplicationsGraphics">
        <title>?????????????????????</title>
        </sect>
      <sect categorycode="GNOMEApplicationsInternet">
        <title>????????????????????????</title>
        </sect>
      <sect categorycode="GNOMEApplicationsOffice">
        <title>???????????????</title>
        </sect>
      <sect categorycode="GNOMEApplicationsProgramming">
        <title>?????????????????????????????????</title>
        </sect>
      <sect categorycode="GNOMEApplicationsSound and Video">
        <title>??????????????? ????????? ???????????????</title>
        </sect>
      <sect categorycode="GNOMEApplicationsSystem Tools">
        <title>??????????????? ?????????</title>
        </sect>
    </sect>
    <sect categorycode="GNOMEPreferences">
      <title>???????????? ????????????</title>
      </sect>
    <sect categorycode="GNOMESystem Administration">
      <title>??????????????? ????????????????????????</title>
      </sect>
    <sect categorycode="GNOMEUtilities">
      <title>?????????????????????</title>
      </sect>
    <sect categorycode="GNOMEDevelopment">
      <title>??????????????????????????????</title>
      <sect categorycode="GNOMEDevelopmentApplications">
        <title>????????????</title>
        </sect>
      <sect categorycode="GNOMEDevelopmentIntroductory">
        <title>????????? ????????????</title>
        </sect>
      <sect categorycode="GNOMEDevelopmentTutorials">
        <title>?????????????????????</title>
        </sect>
      <sect categorycode="GNOMEDevelopmentWhite Papers">
        <title>???????????? ????????????</title>
        </sect>
    </sect>
    <sect categorycode="GNOMEGames">
      <title>???????????????</title>
      </sect>
    <sect categorycode="GNOMEGraphics">
      <title>?????????????????????</title>
      </sect>
    <sect categorycode="GNOMEInternet">
      <title>????????????????????????</title>
      </sect>
    <sect categorycode="GNOMEMultimedia">
      <title>???????????????????????????</title>
      </sect>
    <sect categorycode="GNOMESettings">
      <title>??????????????????</title>
      </sect>
    <sect categorycode="GNOMESystem">
      <title>???????????????</title>
      </sect>
    <sect categorycode="GNOMEOther">
      <title>?????????</title>
      </sect>
  </sect>

  <sect categorycode="KDE">
    <title>KDE</title>
    <sect categorycode="KDEUtilities">
      <title>?????????????????????</title>
      </sect>
    <sect categorycode="KDEApplications">
      <title>????????????</title>
      </sect>
    <sect categorycode="KDEGames">
      <title>???????????????</title>
      </sect>
    <sect categorycode="KDEGraphics">
      <title>?????????????????????</title>
      </sect>
    <sect categorycode="KDEInternet">
      <title>????????????????????????</title>
      </sect>
    <sect categorycode="KDEMultimedia">
      <title>???????????????????????????</title>
      </sect>
    <sect categorycode="KDESettings">
      <title>??????????????????</title>
      </sect>
    <sect categorycode="KDESystem">
      <title>???????????????</title>
      </sect>
    <sect categorycode="KDEPrograms">
      <title>????????????????????????</title>
      </sect>
    <sect categorycode="KDEDevelopment">
      <title>??????????????????????????????</title>
      </sect>
    <sect categorycode="KDEOther">
      <title>?????????</title>
      </sect>
  </sect>

  <sect categorycode="System">
    <title>???????????????</title>
    <sect categorycode="SystemAdministration">
      <title>????????????????????????</title>
      <sect categorycode="SystemAdministrationBackups">
        <title>??????????????????</title>
        <sect categorycode="SystemAdministrationBackupsLocal">
          <title>????????????</title>
          </sect>
        <sect categorycode="SystemAdministrationBackupsRemote">
          <title>???????????????</title>
          </sect>
      </sect>
      <sect categorycode="SystemAdministrationFilesystems">
        <title>????????????-???????????????</title>
        </sect>
      <sect categorycode="SystemAdministrationNetworking">
        <title>??????????????????????????????</title>
        <sect categorycode="SystemAdministrationNetworkingAppleTalk">
          <title>AppleTalk</title>
          </sect>
        <sect categorycode="SystemAdministrationNetworkingPPP">
          <title>PPP</title>
          </sect>
        <sect categorycode="SystemAdministrationNetworkingSMB">
          <title>SMB</title>
          </sect>
        <sect categorycode="SystemAdministrationNetworkingTCP/IP">
          <title>TCP/IP</title>
          </sect>
        <sect categorycode="SystemAdministrationNetworkingDNS">
          <title>DNS</title>
          </sect>
        <sect categorycode="SystemAdministrationNetworkingOther">
          <title>?????????</title>
          </sect>
      </sect>
      <sect categorycode="SystemAdministrationUsers">
        <title>??????????????????</title>
        </sect>
      <sect categorycode="SystemAdministrationOther">
        <title>?????????</title>
        </sect>
    </sect>
    <sect categorycode="SystemConfiguration">
      <title>??????????????????</title>
      <sect categorycode="SystemConfigurationConfig Files">
        <title>?????????????????? ??????????????????</title>
        </sect>
      <sect categorycode="SystemConfigurationConfiguration Tools">
        <title>?????????????????? ?????????</title>
        </sect>
      <sect categorycode="SystemConfigurationOther">
        <title>?????????</title>
        </sect>
    </sect>
    <sect categorycode="SystemHardware">
      <title>????????????????????????</title>
      <sect categorycode="SystemHardwareProcessor">
        <title>????????????????????????</title>
        </sect>
      <sect categorycode="SystemHardwareStorage">
        <title>?????????????????????</title>
        </sect>
      <sect categorycode="SystemHardwareVideo">
        <title>???????????????</title>
        </sect>
      <sect categorycode="SystemHardwareInput Devices">
        <title>?????????????????? ????????????</title>
        </sect>
      <sect categorycode="SystemHardwareNetworking">
        <title>??????????????????????????????</title>
        </sect>
      <sect categorycode="SystemHardwarePCI/ISA/PCMCIA">
        <title>PCI/ISA/PCMCIA</title>
        </sect>
      <sect categorycode="SystemHardwareOther">
        <title>?????????</title>
        </sect>
    </sect>
    <sect categorycode="SystemPackage Management">
      <title>??????????????? ???????????????</title>
      </sect>
    <sect categorycode="SystemSecurity">
      <title>?????????????????????</title>
      <sect categorycode="SystemSecurityFirewall">
        <title>?????????????????????</title>
        </sect>
      <sect categorycode="SystemSecurityIntrusion Detection">
        <title>?????????????????? ?????????</title>
        </sect>
      <sect categorycode="SystemSecurityVirus">
        <title>???????????????</title>
        </sect>
      <sect categorycode="SystemSecurityOther">
        <title>?????????</title>
        </sect>
    </sect>
    <sect categorycode="SystemServices">
      <title>?????????????????????</title>
      <sect categorycode="SystemServicesHTTP">
        <title>HTTP</title>
        </sect>
      <sect categorycode="SystemServicesFTP">
        <title>FTP</title>
        </sect>
      <sect categorycode="SystemServicesSMB">
        <title>SMB</title>
        </sect>
      <sect categorycode="SystemServicesSSH">
        <title>SSH</title>
        </sect>
      <sect categorycode="SystemServicesTelnet">
        <title>?????????????????????</title>
        </sect>
      <sect categorycode="SystemServicesSyslog">
        <title>Syslog</title>
        </sect>
      <sect categorycode="SystemServicesBIND">
        <title>BIND</title>
        </sect>
      <sect categorycode="SystemServicesPrinting">
        <title>????????????????????????</title>
        </sect>
      <sect categorycode="SystemServicesOther">
        <title>?????????</title>
        </sect>
    </sect>
    <sect categorycode="SystemOther">
      <title>?????????</title>
      </sect>
  </sect>
</ScrollKeeperContentsList>


Index: scrollkeeper.spec
===================================================================
RCS file: /cvs/dist/rpms/scrollkeeper/devel/scrollkeeper.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- scrollkeeper.spec	7 Nov 2006 16:09:26 -0000	1.25
+++ scrollkeeper.spec	10 Apr 2007 13:38:07 -0000	1.26
@@ -2,13 +2,15 @@
 
 Name: scrollkeeper
 Version: 0.3.14
-Release: 10%{?dist}
+Release: 11%{?dist}
 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}-%{version}-root
+# template for Panjabi, see bug 230686
+Source2: scrollkeeper_cl.xml.pa
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 ### Patches ###
 
@@ -36,7 +38,7 @@
 BuildRequires: libxslt-devel
 BuildRequires: docbook-dtds
 # For intltool:
-BuildRequires: perl-XML-Parser 
+BuildRequires: perl(XML::Parser) 
 
 %description 
 ScrollKeeper is a cataloging system for documentation. It manages
@@ -62,6 +64,9 @@
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/scrollkeeper/Templates/pa
+cp %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/scrollkeeper/Templates/pa/scrollkeeper_cl.xml
+
 %find_lang %{name}
 
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/scrollkeeper
@@ -131,6 +136,9 @@
 /sbin/ldconfig
 
 %changelog
+* Tue Apr 10 2007 Matthias Clasen <mclasen at redhat.com> - 0.3.4-11
+- Add Panjabi translations for the content list (#230686)
+
 * Tue Nov  7 2006 Matthias Clasen <mclasen at redhat.com> - 0.3.4-10
 - Fix Requires
 



From fedora-cvs-commits at redhat.com  Tue Apr 10 13:50:59 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 09:50:59 -0400
Subject: rpms/samba/devel .cvsignore,1.35,1.36 sources,1.37,1.38
Message-ID: <200704101350.l3ADoxBc016890@cvs.devel.redhat.com>

Author: ssorce

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16875

Modified Files:
	.cvsignore sources 
Log Message:

moving to 3.0.25rc1




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	19 Feb 2007 21:38:36 -0000	1.35
+++ .cvsignore	10 Apr 2007 13:50:53 -0000	1.36
@@ -1 +1 @@
-samba-3.0.24.tar.gz
+samba-3.0.25rc1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	19 Feb 2007 21:38:36 -0000	1.37
+++ sources	10 Apr 2007 13:50:53 -0000	1.38
@@ -1 +1 @@
-89273f67a6d8067cbbecefaa13747153  samba-3.0.24.tar.gz
+23690bd9f12eae1dd2c54a1cc3cae8fb  samba-3.0.25rc1.tar.gz



From fedora-cvs-commits at redhat.com  Tue Apr 10 14:20:52 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 10:20:52 -0400
Subject: rpms/kernel/devel patch-2.6.21-rc6-git3.bz2.sign, NONE,
	1.1 .cvsignore, 1.601, 1.602 kernel-2.6.spec, 1.3054,
	1.3055 sources, 1.564, 1.565 upstream, 1.492,
	1.493 patch-2.6.21-rc6-git2.bz2.sign, 1.1, NONE
Message-ID: <200704101420.l3AEKq6L017733@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.21-rc6-git3.bz2.sign 
Removed Files:
	patch-2.6.21-rc6-git2.bz2.sign 
Log Message:
* Tue Apr 10 2007 Dave Jones <davej at redhat.com>
- 2.6.21-rc6-git3



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

iD8DBQBGGpB9yGugalF9Dw4RAmyqAJ9howC3yGfXkzjdOUTssFmYPvbHSACdHM1B
uqLWQFldgHhtcSKTdOMglho=
=1Nin
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.601
retrieving revision 1.602
diff -u -r1.601 -r1.602
--- .cvsignore	9 Apr 2007 18:48:49 -0000	1.601
+++ .cvsignore	10 Apr 2007 14:20:44 -0000	1.602
@@ -5,4 +5,4 @@
 kernel-2.6.20
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc6.bz2
-patch-2.6.21-rc6-git2.bz2
+patch-2.6.21-rc6-git3.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3054
retrieving revision 1.3055
diff -u -r1.3054 -r1.3055
--- kernel-2.6.spec	9 Apr 2007 18:48:49 -0000	1.3054
+++ kernel-2.6.spec	10 Apr 2007 14:20:44 -0000	1.3055
@@ -371,7 +371,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.21-rc6.bz2
-Patch2: patch-2.6.21-rc6-git2.bz2
+Patch2: patch-2.6.21-rc6-git3.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -2249,6 +2249,9 @@
 #  - tux.
 
 %changelog
+* Tue Apr 10 2007 Dave Jones <davej at redhat.com>
+- 2.6.21-rc6-git3
+
 * Mon Apr 09 2007 Dave Jones <davej at redhat.com>
 - 2.6.21-rc6-git2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.564
retrieving revision 1.565
diff -u -r1.564 -r1.565
--- sources	9 Apr 2007 18:48:49 -0000	1.564
+++ sources	10 Apr 2007 14:20:44 -0000	1.565
@@ -1,4 +1,4 @@
 2618cbcc9c9ac1c3c04be903fe3338a7  sparse-0.2.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 291cbc4c09c5111e4a2030a04ee69b65  patch-2.6.21-rc6.bz2
-ac7d3fdf2473e5bec83c409b895bbe0f  patch-2.6.21-rc6-git2.bz2
+faf550e7d36efa34048034b858af97e8  patch-2.6.21-rc6-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.492
retrieving revision 1.493
diff -u -r1.492 -r1.493
--- upstream	9 Apr 2007 18:48:50 -0000	1.492
+++ upstream	10 Apr 2007 14:20:44 -0000	1.493
@@ -1,3 +1,3 @@
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc6.bz2
-patch-2.6.21-rc6-git2.bz2
+patch-2.6.21-rc6-git3.bz2


--- patch-2.6.21-rc6-git2.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 10 14:22:03 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 10:22:03 -0400
Subject: rpms/firstboot/devel .cvsignore, 1.77, 1.78 firstboot.spec, 1.100,
	1.101 sources, 1.96, 1.97
Message-ID: <200704101422.l3AEM3b5017862@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/firstboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17782

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- .cvsignore	21 Mar 2007 22:01:49 -0000	1.77
+++ .cvsignore	10 Apr 2007 14:22:01 -0000	1.78
@@ -49,3 +49,4 @@
 firstboot-1.4.32.tar.bz2
 firstboot-1.4.33.tar.bz2
 firstboot-1.4.34.tar.bz2
+firstboot-1.4.35.tar.bz2


Index: firstboot.spec
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/firstboot.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- firstboot.spec	21 Mar 2007 22:01:49 -0000	1.100
+++ firstboot.spec	10 Apr 2007 14:22:01 -0000	1.101
@@ -1,8 +1,8 @@
 Summary: Initial system configuration utility
 Name: firstboot
-Version: 1.4.34
+Version: 1.4.35
 Release: 1%{?dist}
-URL: http://fedora.redhat.com/projects/config-tools/
+URL: http://fedoraproject.org/wiki/FirstBoot
 License: GPL
 ExclusiveOS: Linux
 Group: System Environment/Base
@@ -94,6 +94,11 @@
 
 
 %changelog
+* Tue Apr 10 2007 Chris Lumens <clumens at redhat.com> - 1.4.35-1
+- Iterate over all possible CD drives on the additional CD module (#231612).
+- Correct package URL (#235079).
+- Update translation files.
+
 * Wed Mar 21 2007 Chris Lumens <clumens at redhat.com> - 1.4.34-1
 - Reword EULA module.
 - Fix screenshot code.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/sources,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- sources	21 Mar 2007 22:01:49 -0000	1.96
+++ sources	10 Apr 2007 14:22:01 -0000	1.97
@@ -1 +1,2 @@
 055300e57d3b781aa206c63283978639  firstboot-1.4.34.tar.bz2
+4beb310b87284acac49ecab14de24f5d  firstboot-1.4.35.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 10 14:24:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 10:24:01 -0400
Subject: rpms/busybox/devel busybox-petitboot.config, NONE,
	1.1 busybox-1.2.0-selinux.patch, 1.1, 1.2 busybox.spec, 1.57,
	1.58 busybox-1.2.0-gcc41.patch, 1.1, NONE
Message-ID: <200704101424.l3AEO1vf018049@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	busybox-1.2.0-selinux.patch busybox.spec 
Added Files:
	busybox-petitboot.config 
Removed Files:
	busybox-1.2.0-gcc41.patch 
Log Message:
Add petitboot configuration and subpackage



--- NEW FILE busybox-petitboot.config ---
#
# Automatically generated make config: don't edit
#
HAVE_DOT_CONFIG=y

#
# Busybox Settings
#

#
# General Configuration
#
CONFIG_NITPICK=y
CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
CONFIG_SHOW_USAGE=y
# CONFIG_FEATURE_VERBOSE_USAGE is not set
CONFIG_FEATURE_COMPRESS_USAGE=y
# CONFIG_FEATURE_INSTALLER is not set
# CONFIG_LOCALE_SUPPORT is not set
CONFIG_GETOPT_LONG=y
CONFIG_FEATURE_DEVPTS=y
# CONFIG_FEATURE_CLEAN_UP is not set
CONFIG_FEATURE_SUID=y
# CONFIG_FEATURE_SUID_CONFIG is not set
# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
# CONFIG_SELINUX is not set
CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"

#
# Build Options
#
# CONFIG_STATIC is not set
# CONFIG_BUILD_LIBBUSYBOX is not set
# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
# CONFIG_FEATURE_SHARED_BUSYBOX is not set
# CONFIG_LFS is not set
# USING_CROSS_COMPILER is not set
CROSS_COMPILER_PREFIX=""
# CONFIG_BUILD_AT_ONCE is not set

#
# Debugging Options
#
# CONFIG_DEBUG is not set
# CONFIG_DEBUG_PESSIMIZE is not set
# CONFIG_NO_DEBUG_LIB is not set
# CONFIG_DMALLOC is not set
# CONFIG_EFENCE is not set
CONFIG_DEBUG_YANK_SUSv2=y

#
# Installation Options
#
# CONFIG_INSTALL_NO_USR is not set
CONFIG_INSTALL_APPLET_SYMLINKS=y
# CONFIG_INSTALL_APPLET_HARDLINKS is not set
# CONFIG_INSTALL_APPLET_DONT is not set
PREFIX="./_install"

#
# Busybox Library Tuning
#
CONFIG_MD5_SIZE_VS_SPEED=2

#
# Applets
#

#
# Archival Utilities
#
# CONFIG_AR is not set
# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
CONFIG_BUNZIP2=y
CONFIG_CPIO=y
# CONFIG_DPKG is not set
# CONFIG_DPKG_DEB is not set
# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
CONFIG_GUNZIP=y
CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y
CONFIG_GZIP=y
# CONFIG_RPM2CPIO is not set
# CONFIG_RPM is not set
CONFIG_TAR=y
# CONFIG_FEATURE_TAR_CREATE is not set
CONFIG_FEATURE_TAR_BZIP2=y
# CONFIG_FEATURE_TAR_LZMA is not set
# CONFIG_FEATURE_TAR_FROM is not set
CONFIG_FEATURE_TAR_GZIP=y
# CONFIG_FEATURE_TAR_COMPRESS is not set
CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set
# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
# CONFIG_UNCOMPRESS is not set
# CONFIG_UNLZMA is not set
# CONFIG_FEATURE_LZMA_FAST is not set
# CONFIG_UNZIP is not set

#
# Common options for cpio and tar
#
# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
# CONFIG_FEATURE_DEB_TAR_GZ is not set
# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
# CONFIG_FEATURE_DEB_TAR_LZMA is not set

#
# Coreutils
#
CONFIG_BASENAME=y
# CONFIG_CAL is not set
CONFIG_CAT=y
# CONFIG_CATV is not set
# CONFIG_CHGRP is not set
# CONFIG_CHMOD is not set
# CONFIG_CHOWN is not set
CONFIG_CHROOT=y
# CONFIG_CKSUM is not set
# CONFIG_CMP is not set
# CONFIG_COMM is not set
CONFIG_CP=y
CONFIG_CUT=y
CONFIG_DATE=y
CONFIG_FEATURE_DATE_ISOFMT=y
CONFIG_DD=y
# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set
CONFIG_FEATURE_DD_IBS_OBS=y
CONFIG_DF=y
# CONFIG_DIFF is not set
# CONFIG_FEATURE_DIFF_BINARY is not set
# CONFIG_FEATURE_DIFF_DIR is not set
# CONFIG_FEATURE_DIFF_MINIMAL is not set
CONFIG_DIRNAME=y
# CONFIG_DOS2UNIX is not set
# CONFIG_UNIX2DOS is not set
CONFIG_DU=y
# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set
CONFIG_ECHO=y
CONFIG_FEATURE_FANCY_ECHO=y
CONFIG_ENV=y
# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
CONFIG_EXPR=y
# CONFIG_EXPR_MATH_SUPPORT_64 is not set
CONFIG_FALSE=y
# CONFIG_FOLD is not set
CONFIG_HEAD=y
CONFIG_FEATURE_FANCY_HEAD=y
# CONFIG_HOSTID is not set
# CONFIG_ID is not set
# CONFIG_INSTALL is not set
# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
# CONFIG_LENGTH is not set
CONFIG_LN=y
# CONFIG_LOGNAME is not set
CONFIG_LS=y
CONFIG_FEATURE_LS_FILETYPES=y
CONFIG_FEATURE_LS_FOLLOWLINKS=y
CONFIG_FEATURE_LS_RECURSIVE=y
# CONFIG_FEATURE_LS_SORTFILES is not set
CONFIG_FEATURE_LS_TIMESTAMPS=y
# CONFIG_FEATURE_LS_USERNAME is not set
# CONFIG_FEATURE_LS_COLOR is not set
# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
CONFIG_MD5SUM=y
CONFIG_MKDIR=y
CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
# CONFIG_MKFIFO is not set
CONFIG_MKNOD=y
CONFIG_MV=y
CONFIG_FEATURE_MV_LONG_OPTIONS=y
# CONFIG_NICE is not set
# CONFIG_NOHUP is not set
# CONFIG_OD is not set
# CONFIG_PRINTENV is not set
# CONFIG_PRINTF is not set
CONFIG_PWD=y
# CONFIG_REALPATH is not set
CONFIG_RM=y
CONFIG_RMDIR=y
# CONFIG_SEQ is not set
# CONFIG_SHA1SUM is not set
CONFIG_SLEEP=y
CONFIG_FEATURE_FANCY_SLEEP=y
# CONFIG_SORT is not set
# CONFIG_FEATURE_SORT_BIG is not set
# CONFIG_STAT is not set
# CONFIG_FEATURE_STAT_FORMAT is not set
# CONFIG_STTY is not set
# CONFIG_SUM is not set
CONFIG_SYNC=y
CONFIG_TAIL=y
CONFIG_FEATURE_FANCY_TAIL=y
CONFIG_TEE=y
# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
CONFIG_TEST=y
# CONFIG_FEATURE_TEST_64 is not set
# CONFIG_TOUCH is not set
# CONFIG_TR is not set
# CONFIG_FEATURE_TR_CLASSES is not set
# CONFIG_FEATURE_TR_EQUIV is not set
CONFIG_TRUE=y
# CONFIG_TTY is not set
CONFIG_UNAME=y
# CONFIG_UNIQ is not set
# CONFIG_USLEEP is not set
# CONFIG_UUDECODE is not set
# CONFIG_UUENCODE is not set
# CONFIG_WATCH is not set
# CONFIG_WC is not set
# CONFIG_WHO is not set
# CONFIG_WHOAMI is not set
CONFIG_YES=y

#
# Common options for cp and mv
#
CONFIG_FEATURE_PRESERVE_HARDLINKS=y

#
# Common options for ls, more and telnet
#
CONFIG_FEATURE_AUTOWIDTH=y

#
# Common options for df, du, ls
#
CONFIG_FEATURE_HUMAN_READABLE=y

#
# Common options for md5sum, sha1sum
#
CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y

#
# Console Utilities
#
CONFIG_CHVT=y
CONFIG_CLEAR=y
# CONFIG_DEALLOCVT is not set
# CONFIG_DUMPKMAP is not set
# CONFIG_LOADFONT is not set
# CONFIG_LOADKMAP is not set
# CONFIG_OPENVT is not set
CONFIG_RESET=y
# CONFIG_SETCONSOLE is not set
# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
CONFIG_SETKEYCODES=y
# CONFIG_SETLOGCONS is not set

#
# Debian Utilities
#
# CONFIG_MKTEMP is not set
# CONFIG_PIPE_PROGRESS is not set
# CONFIG_READLINK is not set
# CONFIG_FEATURE_READLINK_FOLLOW is not set
CONFIG_RUN_PARTS=y
# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
# CONFIG_START_STOP_DAEMON is not set
# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
# CONFIG_WHICH is not set

#
# Editors
#
# CONFIG_AWK is not set
# CONFIG_FEATURE_AWK_MATH is not set
# CONFIG_ED is not set
# CONFIG_PATCH is not set
# CONFIG_SED is not set
# CONFIG_VI is not set
# CONFIG_FEATURE_VI_COLON is not set
# CONFIG_FEATURE_VI_YANKMARK is not set
# CONFIG_FEATURE_VI_SEARCH is not set
# CONFIG_FEATURE_VI_USE_SIGNALS is not set
# CONFIG_FEATURE_VI_DOT_CMD is not set
# CONFIG_FEATURE_VI_READONLY is not set
# CONFIG_FEATURE_VI_SETOPTS is not set
# CONFIG_FEATURE_VI_SET is not set
# CONFIG_FEATURE_VI_WIN_RESIZE is not set
# CONFIG_FEATURE_VI_OPTIMIZE_CURSOR is not set

#
# Finding Utilities
#
# CONFIG_FIND is not set
# CONFIG_FEATURE_FIND_PRINT0 is not set
# CONFIG_FEATURE_FIND_MTIME is not set
# CONFIG_FEATURE_FIND_MMIN is not set
# CONFIG_FEATURE_FIND_PERM is not set
# CONFIG_FEATURE_FIND_TYPE is not set
# CONFIG_FEATURE_FIND_XDEV is not set
# CONFIG_FEATURE_FIND_NEWER is not set
# CONFIG_FEATURE_FIND_INUM is not set
# CONFIG_FEATURE_FIND_EXEC is not set
# CONFIG_GREP is not set
# CONFIG_FEATURE_GREP_EGREP_ALIAS is not set
# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set
# CONFIG_FEATURE_GREP_CONTEXT is not set
# CONFIG_XARGS is not set
# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set

#
# Init Utilities
#
# CONFIG_INIT is not set
# CONFIG_DEBUG_INIT is not set
# CONFIG_FEATURE_USE_INITTAB is not set
# CONFIG_FEATURE_INIT_SCTTY is not set
# CONFIG_FEATURE_EXTRA_QUIET is not set
# CONFIG_FEATURE_INIT_COREDUMPS is not set
# CONFIG_FEATURE_INITRD is not set
CONFIG_HALT=y
# CONFIG_MESG is not set

#
# Login/Password Management Utilities
#
# CONFIG_FEATURE_SHADOWPASSWDS is not set
# CONFIG_USE_BB_SHADOW is not set
CONFIG_USE_BB_PWD_GRP=y
# CONFIG_ADDGROUP is not set
# CONFIG_DELGROUP is not set
# CONFIG_ADDUSER is not set
# CONFIG_DELUSER is not set
# CONFIG_GETTY is not set
# CONFIG_FEATURE_UTMP is not set
# CONFIG_FEATURE_WTMP is not set
# CONFIG_LOGIN is not set
# CONFIG_FEATURE_SECURETTY is not set
# CONFIG_PASSWD is not set
# CONFIG_SU is not set
# CONFIG_SULOGIN is not set
# CONFIG_VLOCK is not set

#
# Linux Ext2 FS Progs
#
# CONFIG_CHATTR is not set
# CONFIG_E2FSCK is not set
# CONFIG_FSCK is not set
# CONFIG_LSATTR is not set
# CONFIG_MKE2FS is not set
# CONFIG_TUNE2FS is not set
# CONFIG_E2LABEL is not set
# CONFIG_FINDFS is not set

#
# Linux Module Utilities
#
CONFIG_INSMOD=y
# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
CONFIG_RMMOD=y
CONFIG_LSMOD=y
# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
CONFIG_MODPROBE=y
CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y

#
# Options common to multiple modutils
#
CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
# CONFIG_FEATURE_2_4_MODULES is not set
CONFIG_FEATURE_2_6_MODULES=y
# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set

#
# Linux System Utilities
#
CONFIG_DMESG=y
CONFIG_FBSET=y
CONFIG_FEATURE_FBSET_FANCY=y
CONFIG_FEATURE_FBSET_READMODE=y
# CONFIG_FDFLUSH is not set
# CONFIG_FDFORMAT is not set
CONFIG_FDISK=y
FDISK_SUPPORT_LARGE_DISKS=y
# CONFIG_FEATURE_FDISK_WRITABLE is not set
# CONFIG_FEATURE_AIX_LABEL is not set
# CONFIG_FEATURE_SGI_LABEL is not set
# CONFIG_FEATURE_SUN_LABEL is not set
# CONFIG_FEATURE_OSF_LABEL is not set
# CONFIG_FEATURE_FDISK_ADVANCED is not set
# CONFIG_FREERAMDISK is not set
# CONFIG_FSCK_MINIX is not set
# CONFIG_MKFS_MINIX is not set
# CONFIG_FEATURE_MINIX2 is not set
# CONFIG_GETOPT is not set
# CONFIG_HEXDUMP is not set
# CONFIG_HWCLOCK is not set
# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
# CONFIG_IPCRM is not set
# CONFIG_IPCS is not set
# CONFIG_LOSETUP is not set
CONFIG_MDEV=y
CONFIG_FEATURE_MDEV_CONF=y
CONFIG_FEATURE_MDEV_EXEC=y
# CONFIG_MKSWAP is not set
# CONFIG_FEATURE_MKSWAP_V0 is not set
# CONFIG_MORE is not set
# CONFIG_FEATURE_USE_TERMIOS is not set
CONFIG_MOUNT=y
CONFIG_FEATURE_MOUNT_NFS=y
# CONFIG_PIVOT_ROOT is not set
# CONFIG_RDATE is not set
# CONFIG_READPROFILE is not set
# CONFIG_SETARCH is not set
# CONFIG_SWAPONOFF is not set
# CONFIG_SWITCH_ROOT is not set
CONFIG_UMOUNT=y
CONFIG_FEATURE_UMOUNT_ALL=y

#
# Common options for mount/umount
#
# CONFIG_FEATURE_MOUNT_LOOP is not set
# CONFIG_FEATURE_MTAB_SUPPORT is not set

#
# Miscellaneous Utilities
#
# CONFIG_ADJTIMEX is not set
# CONFIG_BBCONFIG is not set
# CONFIG_CROND is not set
# CONFIG_DEBUG_CROND_OPTION is not set
# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
# CONFIG_CRONTAB is not set
# CONFIG_DC is not set
# CONFIG_DEVFSD is not set
# CONFIG_DEVFSD_MODLOAD is not set
# CONFIG_DEVFSD_FG_NP is not set
# CONFIG_DEVFSD_VERBOSE is not set
# CONFIG_FEATURE_DEVFS is not set
CONFIG_EJECT=y
# CONFIG_LAST is not set
# CONFIG_LESS is not set
# CONFIG_FEATURE_LESS_BRACKETS is not set
# CONFIG_FEATURE_LESS_FLAGS is not set
# CONFIG_FEATURE_LESS_FLAGCS is not set
# CONFIG_FEATURE_LESS_MARKS is not set
# CONFIG_FEATURE_LESS_REGEXP is not set
# CONFIG_HDPARM is not set
# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
# CONFIG_MAKEDEVS is not set
# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
# CONFIG_MOUNTPOINT is not set
# CONFIG_MT is not set
# CONFIG_RUNLEVEL is not set
# CONFIG_RX is not set
# CONFIG_STRINGS is not set
# CONFIG_SETSID is not set
# CONFIG_TASKSET is not set
# CONFIG_TIME is not set
# CONFIG_WATCHDOG is not set

#
# Networking Utilities
#
CONFIG_FEATURE_IPV6=y
# CONFIG_ARPING is not set
# CONFIG_DNSD is not set
# CONFIG_ETHER_WAKE is not set
# CONFIG_FAKEIDENTD is not set
CONFIG_FTPGET=y
# CONFIG_FTPPUT is not set
CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
# CONFIG_HOSTNAME is not set
# CONFIG_HTTPD is not set
# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set
# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
# CONFIG_FEATURE_HTTPD_SETUID is not set
# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
# CONFIG_FEATURE_HTTPD_CGI is not set
# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
# CONFIG_IFCONFIG is not set
# CONFIG_FEATURE_IFCONFIG_STATUS is not set
# CONFIG_FEATURE_IFCONFIG_SLIP is not set
# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
# CONFIG_FEATURE_IFCONFIG_HW is not set
# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
# CONFIG_IFUPDOWN is not set
# CONFIG_FEATURE_IFUPDOWN_IP is not set
# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set
# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
# CONFIG_FEATURE_IFUPDOWN_IPX is not set
# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
# CONFIG_INETD is not set
# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
# CONFIG_FEATURE_INETD_RPC is not set
CONFIG_IP=y
CONFIG_FEATURE_IP_ADDRESS=y
CONFIG_FEATURE_IP_LINK=y
CONFIG_FEATURE_IP_ROUTE=y
# CONFIG_FEATURE_IP_TUNNEL is not set
CONFIG_FEATURE_IP_SHORT_FORMS=y
CONFIG_IPADDR=y
CONFIG_IPLINK=y
CONFIG_IPROUTE=y
# CONFIG_IPTUNNEL is not set
# CONFIG_IPCALC is not set
# CONFIG_FEATURE_IPCALC_FANCY is not set
# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
# CONFIG_NAMEIF is not set
# CONFIG_NC is not set
# CONFIG_NC_GAPING_SECURITY_HOLE is not set
# CONFIG_NETSTAT is not set
# CONFIG_NSLOOKUP is not set
CONFIG_PING=y
# CONFIG_FEATURE_FANCY_PING is not set
CONFIG_PING6=y
# CONFIG_FEATURE_FANCY_PING6 is not set
# CONFIG_ROUTE is not set
# CONFIG_TELNET is not set
# CONFIG_FEATURE_TELNET_TTYPE is not set
# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
# CONFIG_TELNETD is not set
# CONFIG_FEATURE_TELNETD_INETD is not set
# CONFIG_TFTP is not set
# CONFIG_FEATURE_TFTP_GET is not set
# CONFIG_FEATURE_TFTP_PUT is not set
# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
# CONFIG_DEBUG_TFTP is not set
# CONFIG_TRACEROUTE is not set
# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set

#
# udhcp Server/Client
#
# CONFIG_APP_UDHCPD is not set
# CONFIG_APP_UDHCPC is not set
# CONFIG_APP_DUMPLEASES is not set
# CONFIG_FEATURE_UDHCP_SYSLOG is not set
# CONFIG_FEATURE_UDHCP_DEBUG is not set
# CONFIG_VCONFIG is not set
# CONFIG_WGET is not set
# CONFIG_FEATURE_WGET_STATUSBAR is not set
# CONFIG_FEATURE_WGET_AUTHENTICATION is not set
# CONFIG_FEATURE_WGET_IP6_LITERAL is not set
# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
# CONFIG_ZCIP is not set

#
# Process Utilities
#
# CONFIG_FREE is not set
# CONFIG_FUSER is not set
CONFIG_KILL=y
CONFIG_KILLALL=y
# CONFIG_PIDOF is not set
# CONFIG_FEATURE_PIDOF_SINGLE is not set
# CONFIG_FEATURE_PIDOF_OMIT is not set
CONFIG_PS=y
CONFIG_FEATURE_PS_WIDE=y
# CONFIG_RENICE is not set
# CONFIG_BB_SYSCTL is not set
# CONFIG_TOP is not set
# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
# CONFIG_UPTIME is not set

#
# Shells
#
CONFIG_FEATURE_SH_IS_ASH=y
# CONFIG_FEATURE_SH_IS_HUSH is not set
# CONFIG_FEATURE_SH_IS_LASH is not set
# CONFIG_FEATURE_SH_IS_MSH is not set
# CONFIG_FEATURE_SH_IS_NONE is not set
CONFIG_ASH=y

#
# Ash Shell Options
#
# CONFIG_ASH_JOB_CONTROL is not set
CONFIG_ASH_READ_NCHARS=y
CONFIG_ASH_READ_TIMEOUT=y
CONFIG_ASH_ALIAS=y
CONFIG_ASH_MATH_SUPPORT=y
# CONFIG_ASH_MATH_SUPPORT_64 is not set
CONFIG_ASH_GETOPTS=y
CONFIG_ASH_BUILTIN_ECHO=y
CONFIG_ASH_BUILTIN_TEST=y
CONFIG_ASH_CMDCMD=y
# CONFIG_ASH_MAIL is not set
CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
# CONFIG_ASH_RANDOM_SUPPORT is not set
# CONFIG_ASH_EXPAND_PRMT is not set
# CONFIG_HUSH is not set
# CONFIG_LASH is not set
# CONFIG_MSH is not set

#
# Bourne Shell Options
#
CONFIG_FEATURE_SH_EXTRA_QUIET=y
CONFIG_FEATURE_SH_STANDALONE_SHELL=y
CONFIG_FEATURE_COMMAND_EDITING=y
# CONFIG_FEATURE_COMMAND_EDITING_VI is not set
CONFIG_FEATURE_COMMAND_HISTORY=15
# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
# CONFIG_FEATURE_SH_FANCY_PROMPT is not set

#
# System Logging Utilities
#
# CONFIG_SYSLOGD is not set
# CONFIG_FEATURE_ROTATE_LOGFILE is not set
# CONFIG_FEATURE_REMOTE_LOG is not set
# CONFIG_FEATURE_IPC_SYSLOG is not set
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
# CONFIG_LOGREAD is not set
# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
# CONFIG_KLOGD is not set
# CONFIG_LOGGER is not set

#
# Selinux Utilities
#
# CONFIG_LOAD_POLICY is not set

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

Index: busybox-1.2.0-selinux.patch
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/busybox-1.2.0-selinux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- busybox-1.2.0-selinux.patch	4 Jul 2006 11:10:26 -0000	1.1
+++ busybox-1.2.0-selinux.patch	10 Apr 2007 14:23:59 -0000	1.2
@@ -199,17 +199,6 @@
  source shell/Config.in
  source sysklogd/Config.in
 +source selinux/Config.in
---- busybox-1.2.0/Rules.mak.selinux	2006-07-01 00:42:13.000000000 +0200
-+++ busybox-1.2.0/Rules.mak	2006-07-03 13:22:00.000000000 +0200
-@@ -397,7 +397,7 @@
- 			-o $@ $(LD_START_GROUP)  \
- 			$(APPLETS_DEFINE) $(APPLET_SRC) \
- 			$(BUSYBOX_DEFINE) $(BUSYBOX_SRC) $(libraries-y) \
--			$(LDBUSYBOX) $(LIBRARIES) \
-+			$(LDBUSYBOX) $(LIBRARIES) -lsepol\
- 			$(LD_END_GROUP)
- cmd_link.so        = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) \
- 			$(LIB_CFLAGS) $(CFLAGS_COMBINE) $(LIB_LDFLAGS) \
 --- busybox-1.2.0/Makefile.selinux	2006-07-01 00:42:13.000000000 +0200
 +++ busybox-1.2.0/Makefile	2006-07-03 13:22:00.000000000 +0200
 @@ -33,7 +33,7 @@


Index: busybox.spec
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- busybox.spec	2 Apr 2007 10:39:08 -0000	1.57
+++ busybox.spec	10 Apr 2007 14:23:59 -0000	1.58
@@ -1,18 +1,18 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.2.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 License: GPL
 Group: System Environment/Shells
 Source: http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
+Source1: busybox-petitboot.config
 Patch: busybox-1.2.0-static.patch
 Patch1: busybox-1.2.0-anaconda.patch
 Patch2: busybox-1.2.0-selinux.patch
 Patch4: busybox-1.2.0-ppc64.patch
 Patch5: busybox-1.2.0-page_size.patch
 Patch7: busybox-1.2.2-id_ps.patch
-Patch8: busybox-1.2.0-gcc41.patch
 Patch9: busybox-1.2.0-tar.patch
 Patch10: busybox-1.2.2-ash.patch
 Patch11: busybox-1.2.2-iptunnel.patch
@@ -28,6 +28,10 @@
 Group: System Environment/Shells
 Summary: Version of busybox configured for use with anaconda
 
+%package petitboot
+Group: System Environment/Shells
+Summary: Version of busybox configured for use with petitboot
+
 %description 
 Busybox is a single binary which includes versions of a large number
 of system commands, including a shell.  This package can be very
@@ -41,6 +45,13 @@
 anaconda. The busybox package provides a binary better suited to
 normal use.
 
+%description petitboot
+Busybox is a single binary which includes versions of a large number
+of system commands, including a shell.  The version contained in this
+package is a minimal configuration intended for use with the Petitboot
+bootloader used on PlayStation 3. The busybox package provides a binary
+better suited to normal use.
+
 %prep
 %setup -q
 #SELINUX Patch
@@ -51,7 +62,6 @@
 %endif
 %patch5 -b .ia64 -p1
 %patch7 -b .id_ps -p1
-%patch8 -b .gcc111 -p1
 %patch9 -b .tar -p1
 %patch10 -b .ash -p1
 %patch11 -b .iptunnel -p1
@@ -72,13 +82,21 @@
 
 make defconfig
 make CONFIG_DEBUG=y CC="gcc $RPM_OPT_FLAGS"
+cp busybox busybox.anaconda
+
+make clean
+cp %{SOURCE1} .config
+yes "" | make oldconfig
+make CC="gcc $RPM_OPT_FLAGS -Os"
+cp busybox busybox.petitboot
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/sbin
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
 install -m 755 busybox-static $RPM_BUILD_ROOT/sbin/busybox
-install -m 755 busybox $RPM_BUILD_ROOT/sbin/busybox.anaconda
+install -m 755 busybox.anaconda $RPM_BUILD_ROOT/sbin/busybox.anaconda
+install -m 755 busybox.petitboot $RPM_BUILD_ROOT/sbin/busybox.petitboot
 install -p docs/BusyBox.1 $RPM_BUILD_ROOT/%{_mandir}/man1/busybox.1
 chmod 644 $RPM_BUILD_ROOT/%{_mandir}/man1/busybox.1
 
@@ -96,7 +114,15 @@
 %defattr(-,root,root,-)
 /sbin/busybox.anaconda
 
+%files petitboot
+%doc LICENSE docs/BusyBox.html
+%defattr(-,root,root,-)
+/sbin/busybox.petitboot
+
 %changelog
+* Sat Apr  7 2007 David Woodhouse <dwmw2 at redhat.com> - 1:1.2.2-8
+- Add busybox-petitboot subpackage
+
 * Mon Apr  2 2007 Ivana Varekova <varekova at redhat.com> - 1:1.2.2-7
 - Resolves: 234769 
   busybox ls does not work without a tty


--- busybox-1.2.0-gcc41.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 10 14:31:29 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 10:31:29 -0400
Subject: rpms/yum/FC-6 .cvsignore, 1.50, 1.51 sources, 1.52, 1.53 yum.spec,
	1.142, 1.143 yum-cli-continue.patch, 1.1, NONE
Message-ID: <200704101431.l3AEVTDq025504@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/yum/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv19555

Modified Files:
	.cvsignore sources yum.spec 
Removed Files:
	yum-cli-continue.patch 
Log Message:
* Tue Apr 10 2007 Jeremy Katz <katzj at redhat.com> - 3.0.6-1
- update to 3.0.6 (#235572, #235632, #234807)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/yum/FC-6/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	19 Mar 2007 21:10:03 -0000	1.50
+++ .cvsignore	10 Apr 2007 14:31:21 -0000	1.51
@@ -1 +1 @@
-yum-3.0.5.tar.gz
+yum-3.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/yum/FC-6/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	19 Mar 2007 21:10:03 -0000	1.52
+++ sources	10 Apr 2007 14:31:22 -0000	1.53
@@ -1 +1 @@
-a7d21698067b419961cc7797cc07e31c  yum-3.0.5.tar.gz
+2b4a3e2fe4bf2c066cfcc0f8d4461113  yum-3.0.6.tar.gz


Index: yum.spec
===================================================================
RCS file: /cvs/dist/rpms/yum/FC-6/yum.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- yum.spec	2 Apr 2007 18:18:33 -0000	1.142
+++ yum.spec	10 Apr 2007 14:31:22 -0000	1.143
@@ -2,8 +2,8 @@
 
 Summary: RPM installer/updater
 Name: yum
-Version: 3.0.5
-Release: 2%{?dist}
+Version: 3.0.6
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.0/yum-%{version}.tar.gz
@@ -14,8 +14,6 @@
 # default plugins here
 Source100: installonlyn.py
 
-Patch0: yum-cli-continue.patch
-
 URL: http://linux.duke.edu/yum/
 BuildArchitectures: noarch
 BuildRequires: python
@@ -48,7 +46,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 make
@@ -117,6 +114,9 @@
 
 
 %changelog
+* Tue Apr 10 2007 Jeremy Katz <katzj at redhat.com> - 3.0.6-1
+- update to 3.0.6 (#235572, #235632, #234807)
+
 * Mon Apr  2 2007 Jeremy Katz <katzj at redhat.com> - 3.0.5-2
 - add patch from Ville Skytt?? to fix installs with virtual provides (#234807)
 


--- yum-cli-continue.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 10 14:41:55 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 10:41:55 -0400
Subject: rpms/samba/devel samba.spec,1.105,1.106
Message-ID: <200704101441.l3AEftE6006298@cvs.devel.redhat.com>

Author: ssorce

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5988

Modified Files:
	samba.spec 
Log Message:

this spec can build a 3.0.25rc1, w00t easier than expected :)




Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- samba.spec	5 Apr 2007 20:28:19 -0000	1.105
+++ samba.spec	10 Apr 2007 14:41:53 -0000	1.106
@@ -3,15 +3,15 @@
 Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
-Version: 3.0.24
-Release: 12%{?dist}
+Version: 3.0.25
+Release: 0.1.rc1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.samba.org/
 
 #TAG: change for non-pre
-#Source: http://www.samba.org/samba/ftp/samba/%{name}-%{version}rc3.tar.gz
-Source: http://www.samba.org/samba/ftp/samba/%{name}-%{version}.tar.gz
+Source: http://www.samba.org/samba/ftp/rc/%{name}-%{version}rc1.tar.gz
+#Source: http://www.samba.org/samba/ftp/samba/%{name}-%{version}.tar.gz
 
 # Red Hat specific replacement-files
 Source1: samba.log
@@ -33,12 +33,12 @@
 # (none right now)
 
 # generic patches
-Patch101: samba-2.2.0-smbw.patch
+#Patch101: samba-2.2.0-smbw.patch
 Patch102: samba-3.0.0beta1-pipedir.patch
 #Patch103: samba-3.0.23-logfiles.patch
 Patch104: samba-3.0.0rc3-nmbd-netbiosname.patch
 #Patch105: samba-3.0.23-smb.conf.patch
-Patch106: samba-3.0.23d-man.patch
+#Patch106: samba-3.0.23d-man.patch
 # The passwd part has been applied, but not the group part
 Patch107: samba-3.0.23rc3-passwd.patch
 #Patch108: samba-3.0.8-non-ascii-domain.patch
@@ -46,14 +46,6 @@
 Patch111: samba-3.0.13-smbclient.patch
 #Patch112: samba-3.0.15pre2-bug106483.patch
 #Patch113: samba-3.0.21-warnings.patch
-Patch114: samba-3.0.24-msdfs-root-no.patch
-Patch115: samba-3.0.24-vista-patchset.patch
-Patch116: samba-3.0.24-arch_macro.patch
-Patch117: samba-3.0.24-pam_winbind-fixes.patch
-Patch118: samba-3.0.24-tar_options.patch
-Patch119: samba-3.0.24-enable_pam_nss_tests.patch
-Patch120: samba-3.0.24-nss_wins.patch
-Patch121: samba-3.0.24-vista_msdfs_errcodes.patch
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
 Requires: pam >= 0:0.64 %{auth} 
@@ -145,8 +137,8 @@
 
 %prep
 # TAG: change for non-pre
-# % setup -q -n samba-3.0.23rc3
-%setup -q 
+%setup -q -n samba-3.0.25rc1
+#%setup -q 
 
 # copy Red Hat specific scripts
 mkdir packaging/Fedora
@@ -161,26 +153,18 @@
 # Upstream patches
 #(none)
 # generic patches
-%patch101 -p1 -b .smbw
+#%patch101 -p1 -b .smbw
 %patch102 -p1 -b .pipedir
 #%patch103 -p1 -b .logfiles
 %patch104 -p1 -b .nmbd-netbiosname
 #%patch105 -p1 -b .upstream
-%patch106 -p1 -b .man
+#%patch106 -p1 -b .man
 %patch107 -p1 -b .passwd
 #%patch108 -p1 -b .non-ascii-domain
 %patch110 -p1 -b .smbspool
 %patch111 -p1 -b .smbclient
 #%patch112 -p1 -b .bug106483
 #%patch113 -p1 -b .warnings
-%patch114 -p1 -b .dfsroot
-%patch115 -p1 -b .vista
-%patch116 -p0 -b .arch_macro
-%patch117 -p0 -b .pam_winbind
-%patch118 -p0 -b .tar_options
-%patch119 -p0 -b .pam_nss_test
-%patch120 -p0 -b .nss_wins
-%patch121 -p1 -b .msdfs
 
 # crap
 rm -f examples/VFS/.cvsignore
@@ -317,13 +301,16 @@
 #install -m 644 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libdir}/libsmbclient.a
 install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{_includedir}
 
-#libmsrpc
+# various libs we currently remove
+# TODO: evaluate how to make them back by extracting the correct .h files
 
 #this lib is not really useful or usable (libmsrpc.h requires the samba source)
 #so better to remove it until upstream fixes it
 rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libmsrpc.so
 rm -f $RPM_BUILD_ROOT%{_includedir}/libmsrpc.h
 
+rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.so
+
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
 install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/swat
 
@@ -511,6 +498,8 @@
 %{_mandir}/man7/samba.7*
 %{_mandir}/man8/nmbd.8*
 %{_mandir}/man8/smbd.8*
+%{_mandir}/man8/eventlogadm.8*
+%{_mandir}/man8/vfs_*.8*
 %{_libdir}/samba/vfs
 %{_libdir}/samba/auth
 %attr(1777,root,root) %dir /var/spool/samba
@@ -615,6 +604,8 @@
 %{_mandir}/man8/winbindd.8*
 %{_mandir}/man8/tdbbackup.8*
 %{_mandir}/man8/tdbdump.8*
+%{_mandir}/man8/tdbtool.8*
+%{_mandir}/man8/idmap_*.8*
 
 %doc README COPYING Manifest 
 %doc WHATSNEW.txt Roadmap



From fedora-cvs-commits at redhat.com  Tue Apr 10 15:03:33 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 11:03:33 -0400
Subject: rpms/kexec-tools/devel kexec-tools-1.101-ppc64_rmo_top.patch, NONE,
	1.1 kexec-tools.spec, 1.79, 1.80
Message-ID: <200704101503.l3AF3Xpv022138@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22086

Modified Files:
	kexec-tools.spec 
Added Files:
	kexec-tools-1.101-ppc64_rmo_top.patch 
Log Message:
Resolves: bz 235030

kexec-tools-1.101-ppc64_rmo_top.patch:
 kexec-ppc64.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kexec-tools-1.101-ppc64_rmo_top.patch ---
--- kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.c.orig	2007-04-10 10:53:44.000000000 -0400
+++ kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.c	2007-04-10 10:53:58.000000000 -0400
@@ -369,8 +369,8 @@
 			}
 			rmo_base = ((unsigned long long *)buf)[0];
 			rmo_top = rmo_base + ((unsigned long long *)buf)[1];
-			if (rmo_top > 0x30000000UL)
-				rmo_top = 0x30000000UL;
+			if (rmo_top > 0x07C00000UL)
+				rmo_top = 0x07C00000UL;
 
 			fclose(file);
 			closedir(cdir);


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- kexec-tools.spec	26 Mar 2007 13:22:11 -0000	1.79
+++ kexec-tools.spec	10 Apr 2007 15:03:31 -0000	1.80
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 65%{?dist}
+Release: 66%{?dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -65,6 +65,7 @@
 Patch304: kexec-tools-1.101-ppc64-platform-fix.patch
 Patch305: kexec-tools-1.101-ppc64-64k-pages.patch
 Patch306: kexec-tools-1.101-ppc64-memory_regions.patch
+Patch307: kexec-tools-1.101-ppc64_rmo_top.patch
 
 #
 # Patches 401 through 500 are meant for s390 kexec-tools enablement
@@ -118,6 +119,7 @@
 %patch304 -p1
 %patch305 -p1
 %patch306 -p1
+%patch307 -p1
 %patch401 -p1
 %patch501 -p1
 %patch601 -p1
@@ -239,6 +241,9 @@
 %doc kexec-kdump-howto.txt
 
 %changelog
+* Tue Apr 10 2007 Neil Horman <nhorman at redhat.com> - 1.101-66%{dist}
+- Reduce rmo_top to 0x7c000000 for PS3 (bz 235030)
+
 * Mon Mar 26 2007 Neil Horman <nhorman at redhat.com> - 1.101-65%{dist}
 - Fix spec to own kexec_tools directory (bz 219035)
 



From fedora-cvs-commits at redhat.com  Tue Apr 10 15:20:54 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 11:20:54 -0400
Subject: rpms/selinux-policy/devel policy-20070219.patch, 1.42,
	1.43 selinux-policy.spec, 1.429, 1.430
Message-ID: <200704101520.l3AFKs2d002446@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20070219.patch selinux-policy.spec 
Log Message:
* Tue Apr 10 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-8
- Fix Sonypic backlight
- Allow snmp to look at squid_conf_t


policy-20070219.patch:
 Rules.modular                             |   12 +
 policy/flask/access_vectors               |    4 
 policy/global_booleans                    |    2 
 policy/global_tunables                    |   39 +++-
 policy/mls                                |   31 ++-
 policy/modules/admin/acct.te              |    1 
 policy/modules/admin/acct.xml             |   43 ++++
 policy/modules/admin/alsa.xml             |   43 ++++
 policy/modules/admin/amanda.xml           |   85 +++++++++
 policy/modules/admin/amtu.fc              |    3 
 policy/modules/admin/amtu.if              |   53 +++++
 policy/modules/admin/amtu.te              |   56 ++++++
 policy/modules/admin/amtu.xml             |   36 ++++
 policy/modules/admin/anaconda.xml         |    3 
 policy/modules/admin/apt.xml              |   95 ++++++++++
 policy/modules/admin/backup.xml           |   35 +++
 policy/modules/admin/bootloader.te        |    2 
 policy/modules/admin/bootloader.xml       |   79 ++++++++
 policy/modules/admin/certwatch.xml        |   37 ++++
 policy/modules/admin/consoletype.te       |   10 -
 policy/modules/admin/consoletype.xml      |   47 +++++
 policy/modules/admin/ddcprobe.xml         |   35 +++
 policy/modules/admin/dmesg.te             |    1 
 policy/modules/admin/dmesg.xml            |   24 ++
 policy/modules/admin/dmidecode.xml        |   35 +++
 policy/modules/admin/dpkg.xml             |  125 +++++++++++++
 policy/modules/admin/firstboot.if         |   18 ++
 policy/modules/admin/firstboot.xml        |   88 +++++++++
 policy/modules/admin/kudzu.te             |    2 
 policy/modules/admin/kudzu.xml            |   45 +++++
 policy/modules/admin/logrotate.xml        |   75 ++++++++
 policy/modules/admin/logwatch.te          |    2 
 policy/modules/admin/logwatch.xml         |   23 ++
 policy/modules/admin/netutils.te          |    4 
 policy/modules/admin/rpm.fc               |    3 
 policy/modules/admin/rpm.if               |   65 +++++++
 policy/modules/admin/rpm.te               |    2 
 policy/modules/admin/su.if                |    6 
 policy/modules/admin/usermanage.te        |   42 +++-
 policy/modules/apps/games.fc              |    1 
 policy/modules/apps/gnome.if              |   26 ++
 policy/modules/apps/gpg.fc                |    2 
 policy/modules/apps/loadkeys.if           |   44 +---
 policy/modules/apps/mozilla.if            |    1 
 policy/modules/apps/slocate.te            |    4 
 policy/modules/apps/uml.if                |   27 ---
 policy/modules/apps/usernetctl.te         |   10 -
 policy/modules/kernel/corecommands.fc     |    7 
 policy/modules/kernel/corecommands.if     |   20 ++
 policy/modules/kernel/corenetwork.if.in   |   54 ++++++
 policy/modules/kernel/corenetwork.te.in   |   18 +-
 policy/modules/kernel/devices.if          |   36 ++++
 policy/modules/kernel/domain.if           |   18 ++
 policy/modules/kernel/domain.te           |   46 +++++
 policy/modules/kernel/files.fc            |    1 
 policy/modules/kernel/files.if            |   81 ++++++++-
 policy/modules/kernel/filesystem.if       |   39 ++++
 policy/modules/kernel/filesystem.te       |   12 +
 policy/modules/kernel/kernel.if           |   23 ++
 policy/modules/kernel/kernel.te           |    2 
 policy/modules/kernel/mls.if              |   20 ++
 policy/modules/kernel/mls.te              |    3 
 policy/modules/kernel/selinux.if          |   38 ++++
 policy/modules/kernel/storage.if          |    2 
 policy/modules/kernel/terminal.if         |    2 
 policy/modules/kernel/terminal.te         |    1 
 policy/modules/services/amavis.te         |    3 
 policy/modules/services/apache.fc         |   14 -
 policy/modules/services/apache.if         |  169 +++++++++++++++++-
 policy/modules/services/apache.te         |   70 +++++++
 policy/modules/services/apcupsd.fc        |    9 +
 policy/modules/services/apcupsd.if        |  108 ++++++++++++
 policy/modules/services/apcupsd.te        |   81 +++++++++
 policy/modules/services/automount.te      |    2 
 policy/modules/services/bluetooth.te      |    2 
 policy/modules/services/ccs.te            |   12 +
 policy/modules/services/consolekit.fc     |    1 
 policy/modules/services/consolekit.te     |   28 ++-
 policy/modules/services/cron.fc           |    1 
 policy/modules/services/cron.if           |   33 +--
 policy/modules/services/cron.te           |   51 ++++-
 policy/modules/services/cups.te           |    2 
 policy/modules/services/cvs.te            |    2 
 policy/modules/services/cyrus.te          |    6 
 policy/modules/services/dbus.if           |   63 +++++++
 policy/modules/services/dhcp.te           |    2 
 policy/modules/services/djbdns.te         |    5 
 policy/modules/services/dovecot.te        |    5 
 policy/modules/services/ftp.te            |    5 
 policy/modules/services/hal.fc            |    8 
 policy/modules/services/hal.if            |   19 ++
 policy/modules/services/hal.te            |  142 +++++++++++++++
 policy/modules/services/inetd.te          |    5 
 policy/modules/services/kerberos.if       |   58 ++----
 policy/modules/services/kerberos.te       |   36 +++-
 policy/modules/services/mta.if            |   19 ++
 policy/modules/services/mta.te            |    2 
 policy/modules/services/networkmanager.te |    2 
 policy/modules/services/nis.if            |    4 
 policy/modules/services/nis.te            |    4 
 policy/modules/services/nscd.te           |   10 +
 policy/modules/services/ntp.te            |    5 
 policy/modules/services/pegasus.if        |   18 ++
 policy/modules/services/pegasus.te        |    6 
 policy/modules/services/postfix.if        |    1 
 policy/modules/services/postfix.te        |    8 
 policy/modules/services/ppp.te            |    9 -
 policy/modules/services/procmail.te       |    1 
 policy/modules/services/pyzor.te          |    7 
 policy/modules/services/radius.te         |    4 
 policy/modules/services/rpc.if            |    5 
 policy/modules/services/rsync.te          |    1 
 policy/modules/services/samba.fc          |    3 
 policy/modules/services/samba.if          |   64 +++++++
 policy/modules/services/samba.te          |   79 ++++++++
 policy/modules/services/sasl.te           |   11 +
 policy/modules/services/sendmail.if       |   22 ++
 policy/modules/services/smartmon.te       |    1 
 policy/modules/services/snmp.te           |   15 +
 policy/modules/services/spamassassin.te   |    7 
 policy/modules/services/squid.fc          |    2 
 policy/modules/services/squid.if          |   22 ++
 policy/modules/services/squid.te          |   12 +
 policy/modules/services/ssh.if            |   39 ++++
 policy/modules/services/ssh.te            |    5 
 policy/modules/services/xserver.te        |   10 -
 policy/modules/services/zabbix.fc         |    4 
 policy/modules/services/zabbix.if         |   87 +++++++++
 policy/modules/services/zabbix.te         |   64 +++++++
 policy/modules/system/application.fc      |    1 
 policy/modules/system/application.if      |  104 +++++++++++
 policy/modules/system/application.te      |   14 +
 policy/modules/system/authlogin.if        |   83 +++++++--
 policy/modules/system/authlogin.te        |    3 
 policy/modules/system/fstools.fc          |    1 
 policy/modules/system/fstools.te          |    1 
 policy/modules/system/fusermount.fc       |    6 
 policy/modules/system/fusermount.if       |   41 ++++
 policy/modules/system/fusermount.te       |   45 +++++
 policy/modules/system/getty.te            |    3 
 policy/modules/system/hostname.te         |   14 +
 policy/modules/system/init.if             |    3 
 policy/modules/system/init.te             |   35 +++
 policy/modules/system/ipsec.if            |   20 ++
 policy/modules/system/iptables.te         |    4 
 policy/modules/system/libraries.fc        |    8 
 policy/modules/system/libraries.te        |   20 ++
 policy/modules/system/locallogin.te       |    7 
 policy/modules/system/logging.if          |   21 ++
 policy/modules/system/logging.te          |    2 
 policy/modules/system/lvm.te              |    5 
 policy/modules/system/modutils.te         |   11 +
 policy/modules/system/mount.fc            |    3 
 policy/modules/system/mount.if            |   37 ++++
 policy/modules/system/mount.te            |   64 ++++++-
 policy/modules/system/raid.te             |    1 
 policy/modules/system/selinuxutil.fc      |    1 
 policy/modules/system/selinuxutil.if      |    5 
 policy/modules/system/selinuxutil.te      |   73 +++-----
 policy/modules/system/sysnetwork.te       |    1 
 policy/modules/system/udev.fc             |    2 
 policy/modules/system/udev.te             |   11 +
 policy/modules/system/unconfined.fc       |    1 
 policy/modules/system/unconfined.if       |   10 -
 policy/modules/system/unconfined.te       |   24 ++
 policy/modules/system/userdomain.if       |  269 +++++++++++++++++-------------
 policy/modules/system/userdomain.te       |   46 +++--
 policy/modules/system/xen.te              |   35 +++
 policy/support/obj_perm_sets.spt          |   12 +
 169 files changed, 3925 insertions(+), 466 deletions(-)

Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- policy-20070219.patch	9 Apr 2007 20:47:56 -0000	1.42
+++ policy-20070219.patch	10 Apr 2007 15:20:50 -0000	1.43
@@ -3986,7 +3986,7 @@
  tunable_policy(`ftp_home_dir && use_nfs_home_dirs',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-2.5.11/policy/modules/services/hal.fc
 --- nsaserefpolicy/policy/modules/services/hal.fc	2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/services/hal.fc	2007-04-04 16:39:58.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/hal.fc	2007-04-10 11:16:16.000000000 -0400
 @@ -8,4 +8,12 @@
  
  /var/lib/hal(/.*)?				gen_context(system_u:object_r:hald_var_lib_t,s0)
@@ -3996,8 +3996,8 @@
  /var/run/haldaemon.pid	--	 		gen_context(system_u:object_r:hald_var_run_t,s0)
 +
 +/usr/libexec/hal-acl-tool		--	gen_context(system_u:object_r:hald_acl_exec_t,s0)
-+
 +/usr/libexec/hald-addon-macbookpro-backlight --	gen_context(system_u:object_r:hald_mac_exec_t,s0)
++/usr/libexec/hal-system-sonypic	 --	gen_context(system_u:object_r:hald_sonypic_exec_t,s0)
 +
 +/var/log/pm-suspend.log				gen_context(system_u:object_r:hald_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.5.11/policy/modules/services/hal.if
@@ -4028,7 +4028,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.5.11/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2007-03-20 23:38:00.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/services/hal.te	2007-04-09 08:33:45.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/hal.te	2007-04-10 11:15:53.000000000 -0400
 @@ -16,9 +16,33 @@
  type hald_var_run_t;
  files_pid_file(hald_var_run_t)
@@ -4054,11 +4054,11 @@
 +domain_entry_file(hald_mac_t,hald_mac_exec_t)
 +role system_r types hald_mac_t;
 +
-+type hald_sonipic_t;
-+type hald_sonipic_exec_t;
-+domain_type(hald_sonipic_t)
-+domain_entry_file(hald_sonipic_t,hald_sonipic_exec_t)
-+role system_r types hald_sonipic_t;
++type hald_sonypic_t;
++type hald_sonypic_exec_t;
++domain_type(hald_sonypic_t)
++domain_entry_file(hald_sonypic_t,hald_sonypic_exec_t)
++role system_r types hald_sonypic_t;
 +
  ########################################
  #
@@ -4214,26 +4214,26 @@
 +# Local hald sonypic policy
 +#
 +
-+domtrans_pattern(hald_t, hald_sonipic_exec_t, hald_sonipic_t)
-+allow hald_t hald_sonipic_t : process signal;
-+allow hald_sonipic_t hald_t : unix_stream_socket connectto;
++domtrans_pattern(hald_t, hald_sonypic_exec_t, hald_sonypic_t)
++allow hald_t hald_sonypic_t : process signal;
++allow hald_sonypic_t hald_t : unix_stream_socket connectto;
 +
-+dev_write_video_dev(hald_sonipic_t)
++dev_write_video_dev(hald_sonypic_t)
 +
-+files_search_var_lib(hald_sonipic_t)
-+manage_dirs_pattern(hald_sonipic_t,hald_var_lib_t,hald_var_lib_t)
-+manage_files_pattern(hald_sonipic_t,hald_var_lib_t,hald_var_lib_t)
++files_search_var_lib(hald_sonypic_t)
++manage_dirs_pattern(hald_sonypic_t,hald_var_lib_t,hald_var_lib_t)
++manage_files_pattern(hald_sonypic_t,hald_var_lib_t,hald_var_lib_t)
 +
-+libs_use_ld_so(hald_sonipic_t)
-+libs_use_shared_libs(hald_sonipic_t)
++libs_use_ld_so(hald_sonypic_t)
++libs_use_shared_libs(hald_sonypic_t)
 +
-+files_read_usr_files(hald_sonipic_t)
++files_read_usr_files(hald_sonypic_t)
 +
-+miscfiles_read_localization(hald_sonipic_t)
++miscfiles_read_localization(hald_sonypic_t)
 +
 +ifdef(`targeted_policy',`
-+	term_dontaudit_use_console(hald_sonipic_t)
-+	term_dontaudit_use_generic_ptys(hald_sonipic_t)
++	term_dontaudit_use_console(hald_sonypic_t)
++	term_dontaudit_use_generic_ptys(hald_sonypic_t)
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-2.5.11/policy/modules/services/inetd.te
 --- nsaserefpolicy/policy/modules/services/inetd.te	2007-03-26 16:24:12.000000000 -0400
@@ -5091,7 +5091,7 @@
  storage_raw_write_fixed_disk(fsdaemon_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-2.5.11/policy/modules/services/snmp.te
 --- nsaserefpolicy/policy/modules/services/snmp.te	2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/services/snmp.te	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/snmp.te	2007-04-10 11:00:42.000000000 -0400
 @@ -134,6 +134,11 @@
  ')
  
@@ -5104,7 +5104,7 @@
  	nis_use_ypbind(snmpd_t)
  ')
  
-@@ -146,9 +151,14 @@
+@@ -146,9 +151,19 @@
  ')
  
  optional_policy(`
@@ -5116,9 +5116,14 @@
  ')
  
  optional_policy(`
++	squid_read_config(snmpd_t)
++')
++
++optional_policy(`
  	udev_read_db(snmpd_t)
  ')
 +
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.5.11/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2007-03-26 16:24:12.000000000 -0400
 +++ serefpolicy-2.5.11/policy/modules/services/spamassassin.te	2007-04-04 13:46:37.000000000 -0400
@@ -5174,7 +5179,7 @@
 +/usr/lib64/squid/cachemgr\.cgi	--	gen_context(system_u:object_r:httpd_squid_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.if serefpolicy-2.5.11/policy/modules/services/squid.if
 --- nsaserefpolicy/policy/modules/services/squid.if	2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/services/squid.if	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.11/policy/modules/services/squid.if	2007-04-10 11:02:44.000000000 -0400
 @@ -36,7 +36,7 @@
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -r1.429 -r1.430
--- selinux-policy.spec	9 Apr 2007 20:47:56 -0000	1.429
+++ selinux-policy.spec	10 Apr 2007 15:20:50 -0000	1.430
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.5.11
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -358,6 +358,10 @@
 %endif
 
 %changelog
+* Tue Apr 10 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-8
+- Fix Sonypic backlight
+- Allow snmp to look at squid_conf_t
+
 * Mon Apr 9 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-7
 - Fixes for pyzor, cyrus, consoletype on everything installs
 



From fedora-cvs-commits at redhat.com  Tue Apr 10 15:29:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 11:29:18 -0400
Subject: rpms/firstboot/devel sources,1.97,1.98
Message-ID: <200704101529.l3AFTHak008550@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/firstboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8462

Modified Files:
	sources 
Log Message:
Update sources file as well.



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/sources,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- sources	10 Apr 2007 14:22:01 -0000	1.97
+++ sources	10 Apr 2007 15:29:15 -0000	1.98
@@ -1,2 +1 @@
-055300e57d3b781aa206c63283978639  firstboot-1.4.34.tar.bz2
 4beb310b87284acac49ecab14de24f5d  firstboot-1.4.35.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 10 15:51:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 11:51:32 -0400
Subject: rpms/kdebase/devel kdebase.spec,1.242,1.243
Message-ID: <200704101551.l3AFpWrA010436@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdebase.spec 
Log Message:
- fix unknown protocol smb
- add Buildrequires on libusb-devel



Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- kdebase.spec	22 Mar 2007 18:42:13 -0000	1.242
+++ kdebase.spec	10 Apr 2007 15:51:30 -0000	1.243
@@ -6,7 +6,7 @@
 %define redhatify 1
 %define include_kappfinder 0
 
-%define qt_version 3.3.7
+%define qt_version 3.3.8
 %define arts_version 1.5.6
 %define kde_version 3.5.6
 %define kdelibs_epoch 6
@@ -18,7 +18,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -93,7 +93,7 @@
 %endif
 
 BuildRequires: kdelibs-devel >= %{kde_version}
-BuildRequires: samba >= 2.2.3a-5
+BuildRequires: libsmbclient-devel
 BuildRequires: pam-devel
 BuildRequires: gettext
 BuildRequires: imake
@@ -129,6 +129,7 @@
 BuildRequires: libutempter-devel
 %ifnarch s390 s390x
 BuildRequires: libraw1394-devel
+BuildRequires: libusb-devel
 %endif
 %ifarch alpha %{ix86} x86_64
 BuildRequires: lm_sensors-devel
@@ -551,6 +552,10 @@
 %exclude %{_libdir}/libkdeinit_*.so
 
 %changelog
+* Tue Apr 10 2007 Than Ngo <than at redhat.com> 6:3.5.6-5.fc7
+- fix unknown protocol smb
+- add Buildrequires on libusb-devel
+
 * Thu Mar 22 2007 Than Ngo <than at redhat.com> 6:3.5.6-4.fc7
 - add new KDM theme for Fedora 7
 



From fedora-cvs-commits at redhat.com  Tue Apr 10 15:59:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 11:59:30 -0400
Subject: rpms/freetype/devel .cvsignore, 1.16, 1.17 freetype.spec, 1.52,
	1.53 sources, 1.16, 1.17
Message-ID: <200704101559.l3AFxU5g011020@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/freetype/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11001

Modified Files:
	.cvsignore freetype.spec sources 
Log Message:
* Tue Apr 05 2007 Behdad Esfahbod <besfahbo at redhat.com> 2.3.4-1
- Update to 2.3.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	5 Apr 2007 21:46:40 -0000	1.16
+++ .cvsignore	10 Apr 2007 15:59:28 -0000	1.17
@@ -1,3 +1,3 @@
-freetype-2.3.3.tar.bz2
-freetype-doc-2.3.3.tar.bz2
-ft2demos-2.3.3.tar.bz2
+freetype-2.3.4.tar.bz2
+freetype-doc-2.3.4.tar.bz2
+ft2demos-2.3.4.tar.bz2


Index: freetype.spec
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- freetype.spec	6 Apr 2007 02:28:03 -0000	1.52
+++ freetype.spec	10 Apr 2007 15:59:28 -0000	1.53
@@ -7,8 +7,8 @@
 
 Summary: A free and portable font rendering engine
 Name: freetype
-Version: 2.3.3
-Release: 2%{?dist}
+Version: 2.3.4
+Release: 1%{?dist}
 License: BSD/GPL dual license
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -205,6 +205,9 @@
 %{_libdir}/pkgconfig/
 
 %changelog
+* Tue Apr 05 2007 Behdad Esfahbod <besfahbo at redhat.com> 2.3.4-1
+- Update to 2.3.4.
+
 * Thu Apr 05 2007 Behdad Esfahbod <besfahbo at redhat.com> 2.3.3-2
 - Include new demos ftgrid and ftdiff in freetype-demos. (#235478)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	5 Apr 2007 21:46:40 -0000	1.16
+++ sources	10 Apr 2007 15:59:28 -0000	1.17
@@ -1,3 +1,3 @@
-c0367b4059f672789b7a41e65f7a4b4a  freetype-2.3.3.tar.bz2
-3f0df79c7504aee5a2f5803afd510efd  freetype-doc-2.3.3.tar.bz2
-408bbefef6bea2bd8ce8c48ef8ae2a18  ft2demos-2.3.3.tar.bz2
+1a6c59a7723d637c78672e7784da865d  freetype-2.3.4.tar.bz2
+40cb37ba6c003845208c1b89cf507249  freetype-doc-2.3.4.tar.bz2
+51684210fc73d59ba107ad6302b21118  ft2demos-2.3.4.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 10 16:03:52 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 12:03:52 -0400
Subject: rpms/vte/devel .cvsignore, 1.55, 1.56 sources, 1.55, 1.56 vte.spec,
	1.107, 1.108 vte-0.16-redraw-race.patch, 1.1,
	NONE vte-0.16.0-transparent.patch, 1.2,
	NONE vte-0.16.0-unicode-input-crash.patch, 1.1, NONE
Message-ID: <200704101603.l3AG3qWr011300@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/vte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11282

Modified Files:
	.cvsignore sources vte.spec 
Removed Files:
	vte-0.16-redraw-race.patch vte-0.16.0-transparent.patch 
	vte-0.16.0-unicode-input-crash.patch 
Log Message:
* Tue Apr 10 2007 Behdad Esfahbod <besfahbo at redhat.com> 0.16.1-1
- Update to 0.16.1
- Drop all patches.  All upstreamed.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	13 Mar 2007 01:29:09 -0000	1.55
+++ .cvsignore	10 Apr 2007 16:03:49 -0000	1.56
@@ -1 +1 @@
-vte-0.16.0.tar.bz2
+vte-0.16.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	13 Mar 2007 01:29:09 -0000	1.55
+++ sources	10 Apr 2007 16:03:49 -0000	1.56
@@ -1 +1 @@
-6b85967ba75ed574d0e5782697fbc79f  vte-0.16.0.tar.bz2
+ceec938666899c1e67e1ce4dd358c753  vte-0.16.1.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- vte.spec	4 Apr 2007 15:40:51 -0000	1.107
+++ vte.spec	10 Apr 2007 16:03:49 -0000	1.108
@@ -1,17 +1,11 @@
 Name: vte
-Version: 0.16.0
-Release: 4%{?dist}
+Version: 0.16.1
+Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPL
 Group: User Interface/X
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/vte/0.15/%{name}-%{version}.tar.bz2
-Patch0: vte-0.16-redraw-race.patch
-# fixed in upstream svn
-Patch1: vte-0.16.0-transparent.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=418588
-Patch2: vte-0.16.0-unicode-input-crash.patch
 
 BuildRequires: gtk2-devel, pygtk2-devel, python-devel, ncurses-devel
 BuildRequires: gettext
@@ -36,9 +30,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .redraw-race
-%patch1 -p1 -b .transparent
-%patch2 -p1 -b .unicode-input-crash
 
 %build
 PYTHON=%{_bindir}/python`%{__python} -c "import sys ; print sys.version[:3]"`
@@ -111,6 +102,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr 10 2007 Behdad Esfahbod <besfahbo at redhat.com> 0.16.1-1
+- Update to 0.16.1
+- Drop all patches.  All upstreamed.
+
 * Wed Apr  4 2007 Ray Strode <rstrode at redhat.com> 0.16.0-4
 - Add upstream patch from ickle to fix unicode input crash 
   (#235160)


--- vte-0.16-redraw-race.patch DELETED ---


--- vte-0.16.0-transparent.patch DELETED ---


--- vte-0.16.0-unicode-input-crash.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 10 16:08:13 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 12:08:13 -0400
Subject: rpms/pango/devel .cvsignore, 1.53, 1.54 pango.spec, 1.111,
	1.112 sources, 1.53, 1.54
Message-ID: <200704101608.l3AG8DKY011538@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11428

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
* Tue Apr 10 2007 Behdad Esfahbod <besfahbo at redhat.com> - 1.16.2-1
- Update to 1.16.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	13 Mar 2007 05:22:43 -0000	1.53
+++ .cvsignore	10 Apr 2007 16:08:11 -0000	1.54
@@ -1 +1 @@
-pango-1.16.1.tar.bz2
+pango-1.16.2.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- pango.spec	13 Mar 2007 05:22:43 -0000	1.111
+++ pango.spec	10 Apr 2007 16:08:11 -0000	1.112
@@ -8,7 +8,7 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.16.1
+Version: 1.16.2
 Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
@@ -219,6 +219,9 @@
 
 
 %changelog
+* Tue Apr 10 2007 Behdad Esfahbod <besfahbo at redhat.com> - 1.16.2-1
+- Update to 1.16.2.
+
 * Tue Mar 13 2007 Matthias Clasen <mclasen at redhat.com> - 1.16.1-1
 - Update to 1.16.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	13 Mar 2007 05:22:43 -0000	1.53
+++ sources	10 Apr 2007 16:08:11 -0000	1.54
@@ -1 +1 @@
-4aa720633e53701a652f27700a7946dd  pango-1.16.1.tar.bz2
+8ea80c1d747a2844d7d096bfd347c2dc  pango-1.16.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 10 16:14:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 12:14:50 -0400
Subject: rpms/gnutls/devel gnutls.spec,1.25,1.26
Message-ID: <200704101614.l3AGEoY5011905@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/gnutls/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11891

Modified Files:
	gnutls.spec 
Log Message:
* Tue Apr 10 2007 Tomas Mraz <tmraz at redhat.com> 1.4.5-2
- properly require install-info (patch by Ville Skytt??)
- standard buildroot and use dist tag
- add COPYING and README to doc



Index: gnutls.spec
===================================================================
RCS file: /cvs/dist/rpms/gnutls/devel/gnutls.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gnutls.spec	7 Feb 2007 18:56:37 -0000	1.25
+++ gnutls.spec	10 Apr 2007 16:14:48 -0000	1.26
@@ -1,7 +1,7 @@
-Summary: A TLS protocol implementation.
+Summary: A TLS protocol implementation
 Name: gnutls
 Version: 1.4.5
-Release: 1
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 BuildRequires: libgcrypt-devel >= 1.2.2, gettext
@@ -16,19 +16,21 @@
 Source1: libgnutls-config
 Patch0: gnutls-1.4.0-nosrp.patch
 Patch1: gnutls-1.4.1-enable-psk.patch
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libgcrypt >= 1.2.2
 
 %package devel
-Summary: Development files for the %{name} package.
+Summary: Development files for the %{name} package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: libgcrypt-devel
 Requires: zlib-devel
 Requires: pkgconfig
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %package utils
-Summary: Command line tools for TLS protocol.
+Summary: Command line tools for TLS protocol
 Group: Applications/System
 Requires: %{name} = %{version}-%{release}
 
@@ -89,20 +91,21 @@
 
 %post devel
 if [ -f %{_infodir}/gnutls.info.gz ]; then
-    /sbin/install-info %{_infodir}/gnutls.info.gz %{_infodir}/dir
+    /sbin/install-info %{_infodir}/gnutls.info.gz %{_infodir}/dir || :
 fi
 
 %preun devel
 if [ $1 = 0 -a -f %{_infodir}/gnutls.info.gz ]; then
-   /sbin/install-info --delete %{_infodir}/gnutls.info.gz %{_infodir}/dir
+   /sbin/install-info --delete %{_infodir}/gnutls.info.gz %{_infodir}/dir || :
 fi
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/*.so.*
+%doc COPYING COPYING.LIB README AUTHORS
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/libgnutls*-config
 %{_includedir}/*
 %{_libdir}/*.a
@@ -113,13 +116,18 @@
 %{_infodir}/gnutls*
 
 %files utils
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/certtool
 %{_bindir}/psktool
 %{_bindir}/gnutls*
 %{_mandir}/man1/*
 
 %changelog
+* Tue Apr 10 2007 Tomas Mraz <tmraz at redhat.com> 1.4.5-2
+- properly require install-info (patch by Ville Skytt??)
+- standard buildroot and use dist tag
+- add COPYING and README to doc
+
 * Wed Feb  7 2007 Tomas Mraz <tmraz at redhat.com> 1.4.5-1
 - new upstream version
 - drop libtermcap-devel from buildrequires



From fedora-cvs-commits at redhat.com  Tue Apr 10 16:38:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 12:38:30 -0400
Subject: rpms/httpd/devel httpd.spec,1.104,1.105
Message-ID: <200704101638.l3AGcUHx030360@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	httpd.spec 
Log Message:
* Tue Apr  3 2007 Joe Orton <jorton at redhat.com> 2.2.4-3
- drop old triggers, old Requires, xmlto BR
- use Requires(...) correctly 
- use standard BuildRoot 
- don't mark init script as config file
- trim CHANGES further



Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- httpd.spec	12 Mar 2007 13:29:57 -0000	1.104
+++ httpd.spec	10 Apr 2007 16:38:22 -0000	1.105
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.4
-Release: 2
+Release: 3
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -39,15 +39,14 @@
 Patch54: httpd-2.2.0-authnoprov.patch
 License: Apache Software License
 Group: System Environment/Daemons
-BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: autoconf, perl, pkgconfig, xmlto >= 0.0.11, findutils
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: autoconf, perl, pkgconfig, findutils
 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
+Requires(pre): /usr/sbin/useradd
+Requires(post): chkconfig
 Provides: webserver
 Provides: httpd-mmn = %{mmn}
 Obsoletes: apache, secureweb, mod_dav, mod_gzip, stronghold-apache, stronghold-htdocs
@@ -136,7 +135,7 @@
 autoheader && autoconf || exit 1
 
 # Limit size of CHANGES to recent history
-echo '1,/Changes with Apache MPM/wq' | ed CHANGES
+echo '1,/Changes with Apache 2.0/wq' | ed CHANGES
 
 # Before configure; fix location of build dir in generated apxs
 %{__perl} -pi -e "s:\@exp_installbuilddir\@:%{_libdir}/httpd/build:g" \
@@ -327,15 +326,6 @@
 /usr/sbin/useradd -c "Apache" -u 48 \
 	-s /sbin/nologin -r -d %{contentdir} apache 2> /dev/null || :
 
-%triggerpostun -- apache < 2.0, stronghold-apache < 2.0
-/sbin/chkconfig --add httpd
-
-# Prevent removal of index.html on upgrades from 1.3
-%triggerun -- apache < 2.0, stronghold-apache < 2.0
-if [ -r %{contentdir}/index.html -a ! -r %{contentdir}/index.html.rpmold ]; then
-  mv %{contentdir}/index.html %{contentdir}/index.html.rpmold
-fi
-
 %post
 # Register the httpd service
 /sbin/chkconfig --add httpd
@@ -411,7 +401,7 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf/magic
 
 %config(noreplace) %{_sysconfdir}/logrotate.d/httpd
-%config %{_sysconfdir}/rc.d/init.d/httpd
+%{_sysconfdir}/rc.d/init.d/httpd
 
 %dir %{_sysconfdir}/httpd/conf.d
 %{_sysconfdir}/httpd/conf.d/README
@@ -472,6 +462,13 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Tue Apr  3 2007 Joe Orton <jorton at redhat.com> 2.2.4-3
+- drop old triggers, old Requires, xmlto BR
+- use Requires(...) correctly 
+- use standard BuildRoot 
+- don't mark init script as config file
+- trim CHANGES further
+
 * Mon Mar 12 2007 Joe Orton <jorton at redhat.com> 2.2.4-2
 - update to 2.2.4
 - drop the migration guide (#223605)



From fedora-cvs-commits at redhat.com  Tue Apr 10 16:39:03 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 12:39:03 -0400
Subject: rpms/httpd/devel httpd.spec,1.105,1.106
Message-ID: <200704101639.l3AGd31E030858@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	httpd.spec 
Log Message:
- fix a trailing comma



Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- httpd.spec	10 Apr 2007 16:38:22 -0000	1.105
+++ httpd.spec	10 Apr 2007 16:39:01 -0000	1.106
@@ -42,7 +42,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: autoconf, perl, pkgconfig, findutils
 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, 
+BuildRequires: apr-devel >= 1.2.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0
 Requires: initscripts >= 8.36
 Obsoletes: httpd-suexec
 Requires(pre): /usr/sbin/useradd



From fedora-cvs-commits at redhat.com  Tue Apr 10 16:44:05 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 12:44:05 -0400
Subject: rpms/httpd/devel httpd.spec,1.106,1.107
Message-ID: <200704101644.l3AGi5iB002132@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	httpd.spec 
Log Message:
- BR: ed



Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- httpd.spec	10 Apr 2007 16:39:01 -0000	1.106
+++ httpd.spec	10 Apr 2007 16:44:03 -0000	1.107
@@ -40,7 +40,7 @@
 License: Apache Software License
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: autoconf, perl, pkgconfig, findutils
+BuildRequires: autoconf, perl, pkgconfig, findutils, ed
 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: initscripts >= 8.36



From fedora-cvs-commits at redhat.com  Tue Apr 10 16:47:11 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 12:47:11 -0400
Subject: rpms/system-switch-mail/devel .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 system-switch-mail.spec, 1.15, 1.16
Message-ID: <200704101647.l3AGlBvV004484@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/system-switch-mail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4416

Modified Files:
	.cvsignore sources system-switch-mail.spec 
Log Message:
add support for ssmtp and esmtp




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-switch-mail/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 Jul 2006 18:18:44 -0000	1.12
+++ .cvsignore	10 Apr 2007 16:47:09 -0000	1.13
@@ -7,3 +7,4 @@
 system-switch-mail-0.5.25-7.tar.bz2
 system-switch-mail-0.5.25-8.tar.bz2
 system-switch-mail-0.5.25-10.tar.bz2
+system-switch-mail-0.5.25-13.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-switch-mail/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 Jul 2006 18:18:44 -0000	1.12
+++ sources	10 Apr 2007 16:47:09 -0000	1.13
@@ -1 +1 @@
-c39347b9060a620a885b405fb16e0b9b  system-switch-mail-0.5.25-10.tar.bz2
+a57e614601299f811ea67bd4ed4c21e4  system-switch-mail-0.5.25-13.tar.bz2


Index: system-switch-mail.spec
===================================================================
RCS file: /cvs/dist/rpms/system-switch-mail/devel/system-switch-mail.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- system-switch-mail.spec	17 Jul 2006 18:18:44 -0000	1.15
+++ system-switch-mail.spec	10 Apr 2007 16:47:09 -0000	1.16
@@ -1,11 +1,11 @@
 Summary: The Mail Transport Agent Switcher
 Name: system-switch-mail
 Version: 0.5.25
-Release: 10
+Release: 13
 Source0: %{name}-%{version}-%{release}.tar.bz2
 License: GPL
 Group: Applications/System
-BuildRoot: %{_tmppath}/%{name}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 
@@ -13,10 +13,11 @@
 Requires: /usr/sbin/alternatives
 Requires: python >= 2.3
 Requires: usermode
-BuildPreReq: python >= 2.3
-BuildPreReq: gettext
-BuildPreReq: automake
-BuildPreReq: intltool
+
+BuildRequires: python >= 2.3
+BuildRequires: gettext
+BuildRequires: automake
+BuildRequires: intltool
 
 Obsoletes: redhat-switchmail, redhat-switch-mail
 Provides: redhat-switchmail, redhat-switch-mail
@@ -76,6 +77,15 @@
 %{_datadir}/%{name}/switchmail.glade
 
 %changelog
+* Tue Apr 10 2007 Than Ngo <than at redhat.com> - 0.5.25-13
+- add support for ssmtp and esmtp
+
+* Mon Dec 18 2006 Phil Knirsch <pknirsch at redhat.com> - 0.5.25-12
+- Resolves: bz#216602, one more update for kn and si po files
+
+* Mon Dec 04 2006 Than Ngo <than at redhat.com> - 0.5.25-11
+- Resolved: bz#216602, update po files
+
 * Mon Jul 17 2006 Than Ngo <than at redhat.com> 0.5.25-10
 - update po files
 



From fedora-cvs-commits at redhat.com  Tue Apr 10 16:47:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 12:47:30 -0400
Subject: rpms/epiphany/devel epiphany.spec, 1.142,
	1.143 epiphany-2.18.0-lookup-64-bit-plugins.patch, 1.1, NONE
Message-ID: <200704101647.l3AGlUwI004765@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	epiphany.spec 
Removed Files:
	epiphany-2.18.0-lookup-64-bit-plugins.patch 
Log Message:
remove upstreamed patch


Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- epiphany.spec	10 Apr 2007 12:25:14 -0000	1.142
+++ epiphany.spec	10 Apr 2007 16:47:27 -0000	1.143
@@ -51,7 +51,6 @@
 # Patches
 Patch0: epiphany-1.0.1-home-page.patch
 Patch1: epiphany-2.17.3-use-pango.patch
-Patch2: epiphany-2.18.0-lookup-64-bit-plugins.patch
 
 %description
 epiphany is a simple GNOME web browser based on the Mozilla rendering
@@ -88,7 +87,6 @@
 
 %patch0 -p1 -b .homepage
 %patch1 -p1 -b .use-pango
-%patch2 -p0 -b .use-64-bit-plugins
 
 %build
 %ifnarch s390 s390x


--- epiphany-2.18.0-lookup-64-bit-plugins.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 10 16:51:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 12:51:45 -0400
Subject: rpms/dovecot/devel .cvsignore, 1.23, 1.24 dovecot.spec, 1.73,
	1.74 sources, 1.24, 1.25
Message-ID: <200704101651.l3AGpjKI007972@cvs.devel.redhat.com>

Author: tjanouse

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

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
* Tue Apr 10 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0-10.rc31
- update to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dovecot/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	6 Apr 2007 10:32:29 -0000	1.23
+++ .cvsignore	10 Apr 2007 16:51:43 -0000	1.24
@@ -1,4 +1,4 @@
-dovecot-1.0.rc30.tar.gz
-dovecot-1.0.rc30.tar.gz.sig
+dovecot-1.0.rc31.tar.gz
+dovecot-1.0.rc31.tar.gz.sig
 dovecot-sieve-1.0.1.tar.gz
 dovecot-sieve-1.0.1.tar.gz.sig


Index: dovecot.spec
===================================================================
RCS file: /cvs/dist/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- dovecot.spec	6 Apr 2007 10:32:29 -0000	1.73
+++ dovecot.spec	10 Apr 2007 16:51:43 -0000	1.74
@@ -1,6 +1,8 @@
+%define upstream 1.0.rc31
+%define sieve_upstream 1.0.1
 %define pkg_version 1.0
-%define my_release 9
-%define pkg_release %{my_release}.rc30%{?dist}
+%define my_release 10
+%define pkg_release %{my_release}.rc31%{?dist}
 %define pkg_sieve_version 1.0.1
 %define pkg_sieve_release %{my_release}%{?dist}
 
@@ -13,11 +15,9 @@
 
 %define build_postgres 1
 %define build_mysql 1
-%define upstream 1.0.rc30
 
 %define build_sieve 1
 %define sieve_name dovecot-sieve
-%define sieve_upstream 1.0.1
 
 Source: http://dovecot.org/releases/%{name}-%{upstream}.tar.gz
 Source1: dovecot.init
@@ -295,6 +295,9 @@
 
 
 %changelog
+* Tue Apr 10 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0-10.rc31
+- update to latest upstream
+
 * Fri Apr 06 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0-9.rc30
 - update to latest upstream
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dovecot/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	6 Apr 2007 10:32:29 -0000	1.24
+++ sources	10 Apr 2007 16:51:43 -0000	1.25
@@ -1,4 +1,4 @@
-59470fa98d4004e8e9036934c92eaade  dovecot-1.0.rc30.tar.gz
-4fc0af7695cdb8d7473de8851387a63e  dovecot-1.0.rc30.tar.gz.sig
+246b74f72bc710b3348307955de29292  dovecot-1.0.rc31.tar.gz
+4ea850201debd538caa107c9d363ad4b  dovecot-1.0.rc31.tar.gz.sig
 b070d2177009bb555cd7e25c710047d5  dovecot-sieve-1.0.1.tar.gz
 c9f5a39ef66e427968141f265c879d60  dovecot-sieve-1.0.1.tar.gz.sig



From fedora-cvs-commits at redhat.com  Tue Apr 10 17:25:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 13:25:45 -0400
Subject: rpms/bind/devel bind.spec, 1.168,
	1.169 named.caching-nameserver.conf, 1.4,
	1.5 bind-9.4.0-idn.patch, 1.1, NONE
Message-ID: <200704101725.l3AHPjLE000366@cvs.devel.redhat.com>

Author: atkac

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

Modified Files:
	bind.spec named.caching-nameserver.conf 
Removed Files:
	bind-9.4.0-idn.patch 
Log Message:
cleanup in caching-nameserver configuration (#209954)
throw away idn changes



Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- bind.spec	16 Mar 2007 15:25:39 -0000	1.168
+++ bind.spec	10 Apr 2007 17:25:42 -0000	1.169
@@ -10,7 +10,6 @@
 %{?!bind_uid:   %define bind_uid   25}
 %{?!bind_gid:   %define bind_gid   25}
 %{?!selinux:	%define selinux     1}
-%define IDN 0
 %define		bind_dir      /var/named
 %define    	chroot_prefix %{bind_dir}/chroot
 #
@@ -77,7 +76,6 @@
 Patch52:	bind-9.3.3-edns.patch
 Patch61:        bind-9.3.4-sdb-sqlite-src.patch
 Patch62:        bind-9.4.0-sdb-sqlite-bld.patch
-Patch63:	bind-9.4.0-idn.patch
 #
 Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2, mktemp
 Requires(post): grep, chkconfig >= 1.3.26
@@ -285,24 +283,14 @@
 %if %{SDB}
 %patch62 -p1 -b .sdb-sqlite-bld
 %endif
-%if %{IDN}
-%patch63 -p1 -b .idn
-%endif
 :;
 
 
 %build
-#first we must compile our libidnkit library
-%if %{IDN}
-pushd contrib/idn/idnkit-1.0-src
-%configure
-make %{?_smp_mflags}
-popd
-%endif
-
 libtoolize --copy --force; aclocal; autoconf
 cp -f /usr/share/libtool/config.{guess,sub} .
 %if %{DEBUGINFO}
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -O0"
 export CFLAGS="$RPM_OPT_FLAGS";
 %else
 export CFLAGS=`echo $RPM_OPT_FLAGS | sed 's/-O2 -g/-g3 -gdwarf-2/g'`;
@@ -333,9 +321,6 @@
 %if %{LIBBIND}
 	--enable-libbind \
 %endif
-%if %{IDN}
-	--with-idn \
-%endif
 	--disable-openssl-version-check \
 	CFLAGS="$CFLAGS" \
 ;
@@ -350,18 +335,6 @@
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-#libidnkit
-%if %{IDN}
-pushd contrib/idn/idnkit-1.0-src
-make DESTDIR=${RPM_BUILD_ROOT} install
-# remove bogus created by make install
-rm -rf ${RPM_BUILD_ROOT}/%{_includedir}/*
-rm -rf ${RPM_BUILD_ROOT}/%{_libdir}/libidnkit.la
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/idnkit
-rm -rf ${RPM_BUILD_ROOT}/%{_mandir}/man3
-popd
-%endif
-
 cp  --preserve=timestamps %{SOURCE5} doc/rfc
 gzip -9       doc/rfc/*
 mkdir -p ${RPM_BUILD_ROOT}/etc/{rc.d/init.d,logrotate.d}
@@ -686,21 +659,7 @@
 %{_bindir}/host
 %{_bindir}/nslookup
 %{_bindir}/nsupdate
-%if %{IDN}
-%{_libdir}/*
-%{_bindir}/idnconv
-%endif
 %defattr(0644,root,root,0755)
-%if %{IDN}
-%config(noreplace) /etc/idn.conf
-%config /etc/idn.conf.sample
-%config(noreplace) /etc/idnalias.conf
-%config /etc/idnalias.conf.sample
-%{_mandir}/man1/idnconv.1.gz
-%{_mandir}/man5/idn.conf.5.gz
-%{_mandir}/man5/idnalias.conf.5.gz
-%{_mandir}/man5/idnrc.5.gz
-%endif
 %{_mandir}/man1/host.1*
 %{_mandir}/man8/nsupdate.8*
 %{_mandir}/man1/dig.1*
@@ -800,6 +759,11 @@
 %endif
 
 %changelog
+* Tue Apr 10 2007 Adam Tkac <atkac redhat com> 31:9.4.0-4.fc7
+- removed query-source[-v6] options from caching-nameserver config
+  (#209954, increase security)
+- throw away idn. It won't be ready in fc7
+
 * Tue Mar 13 2007 Adam Tkac <atkac redhat com> 31:9.4.0-3.fc7
 - prepared bind to merge review
 - added experimental idn support to bind-utils utils (not enabled by default yet)


Index: named.caching-nameserver.conf
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/named.caching-nameserver.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- named.caching-nameserver.conf	5 Sep 2006 11:03:16 -0000	1.4
+++ named.caching-nameserver.conf	10 Apr 2007 17:25:42 -0000	1.5
@@ -18,8 +18,6 @@
 	dump-file 	"/var/named/data/cache_dump.db";
         statistics-file "/var/named/data/named_stats.txt";
         memstatistics-file "/var/named/data/named_mem_stats.txt";
-	query-source    port 53;	
-	query-source-v6 port 53;
 	allow-query     { localhost; };
 };
 logging {


--- bind-9.4.0-idn.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 10 17:26:24 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 13:26:24 -0400
Subject: rpms/bind/devel bind.spec,1.169,1.170
Message-ID: <200704101726.l3AHQO6p000871@cvs.devel.redhat.com>

Author: atkac

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

Modified Files:
	bind.spec 
Log Message:
release up



Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- bind.spec	10 Apr 2007 17:25:42 -0000	1.169
+++ bind.spec	10 Apr 2007 17:26:22 -0000	1.170
@@ -17,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.4.0
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Epoch:   	31
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-cvs-commits at redhat.com  Tue Apr 10 17:27:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 13:27:30 -0400
Subject: rpms/xorg-x11-drv-i810/devel i810.xinf, 1.11,
	1.12 xorg-x11-drv-i810.spec, 1.53, 1.54
Message-ID: <200704101727.l3AHRUtm001736@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	i810.xinf xorg-x11-drv-i810.spec 
Log Message:
* Tue Apr 10 2007 Adam Jackson <ajax at redhat.com> 1.6.5-19
- i810.xinf: Move all 965 and 945 chips onto the new driver, as well as
  915GM.



Index: i810.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/i810.xinf,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- i810.xinf	5 Apr 2007 18:52:06 -0000	1.11
+++ i810.xinf	10 Apr 2007 17:27:27 -0000	1.12
@@ -7,37 +7,18 @@
 
 alias pcivideo:v00008086d00001132sv*sd*bc*sc*i* i810	# i815
 alias pcivideo:v00008086d00002562sv*sd*bc*sc*i* i810	# 845G
-
 alias pcivideo:v00008086d00002572sv*sd*bc*sc*i* i810	# 865G
-
 alias pcivideo:v00008086d00002582sv*sd*bc*sc*i* i810	# 915G
 # 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:v00008086d00002592sv*sd*bc*sc*i* intel	# 915GM
 alias pcivideo:v00008086d00002772sv*sd*bc*sc*i* i810	# 945G
-
-alias pcivideo:v00008086d000027A2sv*sd*bc*sc*i* i810	# 945GM
-# Apple 945GM machines (Intel Mini and Macbook Pro)
-alias pcivideo:v00008086d000027A2sv00008086sd00007270bc*sc*i* intel
-# Aopen Mini PC
-alias pcivideo:v00008086d000027A2sv0000A0A0sd00000589bc*sc*i* intel
-# katzj's laptop
-alias pcivideo:v00008086d000027A2sv0000103Csd000030A0bc*sc*i* intel
-# Acer Aspire 3690 (#214011)
-alias pcivideo:v00008086d000027A2sv00001025sd00000090bc*sc*i* intel
-# Lenovo Thinkpad T60w (#234877)
-alias pcivideo:v00008086d000027A2sv000017AAsd0000201Abc*sc*i* intel
-
-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:v00008086d000027A2sv*sd*bc*sc*i* intel	# 945GM
+alias pcivideo:v00008086d00002972sv*sd*bc*sc*i* intel	# 946GZ, really a 965
+alias pcivideo:v00008086d00002982sv*sd*bc*sc*i* intel	# 965G1
+alias pcivideo:v00008086d00002992sv*sd*bc*sc*i* intel	# 965Q
+alias pcivideo:v00008086d000029A2sv*sd*bc*sc*i* intel	# 965G
 alias pcivideo:v00008086d00002A02sv*sd*bc*sc*i* intel	# 965GM
 alias pcivideo:v00008086d00003577sv*sd*bc*sc*i* i810	# i830
 alias pcivideo:v00008086d00003582sv*sd*bc*sc*i* i810	# 855GM


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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- xorg-x11-drv-i810.spec	5 Apr 2007 18:52:06 -0000	1.53
+++ xorg-x11-drv-i810.spec	10 Apr 2007 17:27:28 -0000	1.54
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 i810 video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   1.6.5
-Release:   18%{?dist}
+Release:   19%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -100,6 +100,10 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Tue Apr 10 2007 Adam Jackson <ajax at redhat.com> 1.6.5-19
+- i810.xinf: Move all 965 and 945 chips onto the new driver, as well as
+  915GM.
+
 * Thu Apr 05 2007 Adam Jackson <ajax at redhat.com> 1.6.5-18
 - i810.xinf: More intel whitelisting (#214011, #234877)
 



From fedora-cvs-commits at redhat.com  Tue Apr 10 18:09:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 14:09:18 -0400
Subject: rpms/kexec-tools/devel kexec-tools-1.101-ppc-boots-ppc64.patch, NONE,
	1.1 kexec-tools.spec, 1.80, 1.81
Message-ID: <200704101809.l3AI9Igx005028@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5013

Modified Files:
	kexec-tools.spec 
Added Files:
	kexec-tools-1.101-ppc-boots-ppc64.patch 
Log Message:
Relates: bz 235608


kexec-tools-1.101-ppc-boots-ppc64.patch:
 kexec/arch/ppc64/kexec-elf-ppc64.c     |   26 +++++++++++-----------
 kexec/arch/ppc64/kexec-elf-rel-ppc64.c |    4 +--
 kexec/arch/ppc64/kexec-ppc64.c         |   38 ++++++++++++++++-----------------
 kexec/arch/ppc64/kexec-ppc64.h         |    2 -
 kexec/kexec-sha256.h                   |    4 +--
 purgatory/Makefile                     |    4 +--
 purgatory/arch/ppc64/Makefile          |    2 +
 purgatory/purgatory.c                  |    2 +
 8 files changed, 43 insertions(+), 39 deletions(-)

--- NEW FILE kexec-tools-1.101-ppc-boots-ppc64.patch ---
--- kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-rel-ppc64.c.orig	2007-04-10 13:33:39.000000000 -0400
+++ kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-rel-ppc64.c	2007-04-10 13:33:49.000000000 -0400
@@ -101,10 +101,10 @@
 		break;
 
 	case R_PPC64_ADDR16_HIGHEST:
-		*(uint16_t *)location = ((value>>48)  & 0xffff);
+		*(uint16_t *)location = (((uint64_t)value>>48)  & 0xffff);
 		break;
 	case R_PPC64_ADDR16_HIGHER:
-		*(uint16_t *)location = ((value>>32)  & 0xffff);
+		*(uint16_t *)location = (((uint64_t)value>>32)  & 0xffff);
 		break;
 
 	default:
--- kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-ppc64.c.orig	2007-04-10 13:33:39.000000000 -0400
+++ kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-ppc64.c	2007-04-10 13:33:49.000000000 -0400
@@ -42,7 +42,7 @@
 #define BOOTLOADER         "kexec"
 #define BOOTLOADER_VERSION VERSION
 
-unsigned long initrd_base, initrd_size;
+uint64_t initrd_base, initrd_size;
 
 int create_flatten_tree(struct kexec_info *, unsigned char **, unsigned long *,
 			char *);
@@ -76,19 +76,19 @@
 	char *cmdline, *modified_cmdline;
 	const char *ramdisk, *devicetreeblob;
 	int cmdline_len, modified_cmdline_len;
-	unsigned long long max_addr, hole_addr;
+	uint64_t max_addr, hole_addr;
 	unsigned char *seg_buf = NULL;
 	off_t seg_size = 0;
 	struct mem_phdr *phdr;
 	size_t size;
-	unsigned long long *rsvmap_ptr;
+	uint64_t *rsvmap_ptr;
 	struct bootblock *bb_ptr;
 	unsigned int nr_segments, i;
 	int result, opt;
-	unsigned long my_kernel, my_dt_offset;
+	uint64_t my_kernel, my_dt_offset;
 	unsigned int my_panic_kernel;
-	unsigned long my_stack, my_backup_start;
-	unsigned long toc_addr;
+	uint64_t my_stack, my_backup_start;
+	uint64_t toc_addr;
 
 #define OPT_APPEND     (OPT_ARCH_MAX+0)
 #define OPT_RAMDISK     (OPT_ARCH_MAX+1)
@@ -226,10 +226,10 @@
 		}
 		seg_buf = (unsigned char *)slurp_file(ramdisk, &seg_size);
 		add_buffer(info, seg_buf, seg_size, seg_size, 0, 0, max_addr, 1);
-		hole_addr = (unsigned long long)
+		hole_addr = (uint64_t)
 			info->segment[info->nr_segments-1].mem;
 		initrd_base = hole_addr;
-		initrd_size = (unsigned long long)
+		initrd_size = (uint64_t)
 			info->segment[info->nr_segments-1].memsz;
 	} /* ramdisk */
 
@@ -259,25 +259,25 @@
 	 */
 	bb_ptr = (struct bootblock *)(
 		(unsigned char *)info->segment[(info->nr_segments)-1].buf);
-	rsvmap_ptr = (unsigned long long *)(
+	rsvmap_ptr = (uint64_t *)(
 		(unsigned char *)info->segment[(info->nr_segments)-1].buf +
 		bb_ptr->off_mem_rsvmap);
 	while (*rsvmap_ptr || *(rsvmap_ptr+1))
 		rsvmap_ptr += 2;
 	rsvmap_ptr -= 2;
-	*rsvmap_ptr = (unsigned long long)(
+	*rsvmap_ptr = (uint64_t)(
 		info->segment[(info->nr_segments)-1].mem);
 	rsvmap_ptr++;
-	*rsvmap_ptr = (unsigned long long)bb_ptr->totalsize;
+	*rsvmap_ptr = (uint64_t)bb_ptr->totalsize;
 
 	nr_segments = info->nr_segments;
 
 	/* Set kernel */
-	my_kernel = (unsigned long )info->segment[0].mem;
+	my_kernel = (uint64_t)info->segment[0].mem;
 	elf_rel_set_symbol(&info->rhdr, "kernel", &my_kernel, sizeof(my_kernel));
 
 	/* Set dt_offset */
-	my_dt_offset = (unsigned long )info->segment[nr_segments-1].mem;
+	my_dt_offset = (uint64_t)info->segment[nr_segments-1].mem;
 	elf_rel_set_symbol(&info->rhdr, "dt_offset", &my_dt_offset,
 				sizeof(my_dt_offset));
 
--- kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.h.orig	2007-04-10 13:33:39.000000000 -0400
+++ kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.h	2007-04-10 13:33:49.000000000 -0400
@@ -15,7 +15,7 @@
 void elf_ppc64_usage(void);
 void reserve(unsigned long long where, unsigned long long length);
 
-extern unsigned long initrd_base, initrd_size;
+extern uint64_t initrd_base, initrd_size;
 /* boot block version 2 as defined by the linux kernel */
 struct bootblock {
 	unsigned magic,
--- kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.c.orig	2007-04-10 13:33:39.000000000 -0400
+++ kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.c	2007-04-10 13:36:19.000000000 -0400
@@ -35,12 +35,12 @@
 #include <arch/options.h>
 
 static struct exclude_range exclude_range[MAX_MEMORY_RANGES];
-static unsigned long long rmo_top;
+static uint64_t rmo_top;
 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;
+uint64_t memory_max = 0;
 static int nr_memory_ranges, nr_exclude_ranges;
-unsigned long long crash_base, crash_size;
+uint64_t crash_base, crash_size;
 
 static int sort_base_ranges();
 
@@ -90,10 +90,10 @@
 			if (local_memory_ranges >= MAX_MEMORY_RANGES)
 				break;
 			base_memory_range[local_memory_ranges].start =
-				((unsigned long long *)buf)[0];
+				((uint64_t *)buf)[0];
 			base_memory_range[local_memory_ranges].end  =
 				base_memory_range[local_memory_ranges].start +
-				((unsigned long long *)buf)[1];
+				((uint64_t *)buf)[1];
 			base_memory_range[local_memory_ranges].type = RANGE_RAM;
 			local_memory_ranges++;
 #ifdef DEBUG
@@ -120,7 +120,7 @@
 static int sort_base_ranges()
 {
 	int i, j;
-	unsigned long long tstart, tend;
+	uint64_t tstart, tend;
 
 	for (i = 0; i < nr_memory_ranges - 1; i++) {
 		for (j = 0; j < nr_memory_ranges - i - 1; j++) {
@@ -141,7 +141,7 @@
 static int sort_ranges()
 {
 	int i, j;
-	unsigned long long tstart, tend;
+	uint64_t tstart, tend;
 	for (i = 0; i < nr_exclude_ranges - 1; i++) {
 		for (j = 0; j < nr_exclude_ranges - i - 1; j++) {
 			if (exclude_range[j].start > exclude_range[j+1].start) {
@@ -162,12 +162,12 @@
  */
 static int get_devtree_details(unsigned long kexec_flags)
 {
-	unsigned long long rmo_base;
-	unsigned long long tce_base;
+	uint64_t rmo_base;
+	uint64_t tce_base;
 	unsigned int tce_size;
 	unsigned int rtas_base, rtas_size;
-	unsigned long long htab_base, htab_size;
-	unsigned long long kernel_end;
+	uint64_t htab_base, htab_size;
+	uint64_t kernel_end;
 	char buf[MAXBYTES-1];
 	char device_tree[256] = "/proc/device-tree/";
 	char fname[256];
@@ -203,7 +203,7 @@
 				closedir(dir);
 				return -1;
 			}
-			if (fread(&kernel_end, sizeof(unsigned long), 1, file) != 1) {
+			if (fread(&kernel_end, sizeof(uint64_t), 1, file) != 1) {
 				perror(fname);
 				fclose(file);
 				closedir(cdir);
@@ -228,7 +228,7 @@
 					closedir(dir);
 					return -1;
 				}
-				if (fread(&crash_base, sizeof(unsigned long), 1,
+				if (fread(&crash_base, sizeof(uint64_t), 1,
 						file) != 1) {
 					perror(fname);
 					fclose(file);
@@ -248,7 +248,7 @@
 					closedir(dir);
 					return -1;
 				}
-				if (fread(&crash_size, sizeof(unsigned long), 1,
+				if (fread(&crash_size, sizeof(uint64_t), 1,
 						file) != 1) {
 					perror(fname);
 					fclose(file);
@@ -281,7 +281,7 @@
 				closedir(dir);
 				return -1;
 			}
-			if (fread(&htab_base, sizeof(unsigned long), 1, file) != 1) {
+			if (fread(&htab_base, sizeof(uint64_t), 1, file) != 1) {
 				perror(fname);
 				fclose(file);
 				closedir(cdir);
@@ -298,7 +298,7 @@
 				closedir(dir);
 				return -1;
 			}
-			if (fread(&htab_size, sizeof(unsigned long), 1, file) != 1) {
+			if (fread(&htab_size, sizeof(uint64_t), 1, file) != 1) {
 				perror(fname);
 				fclose(file);
 				closedir(cdir);
@@ -367,8 +367,8 @@
 				closedir(dir);
 				return -1;
 			}
-			rmo_base = ((unsigned long long *)buf)[0];
-			rmo_top = rmo_base + ((unsigned long long *)buf)[1];
+			rmo_base = ((uint64_t *)buf)[0];
+			rmo_top = rmo_base + ((uint64_t *)buf)[1];
 			if (rmo_top > 0x07C00000UL)
 				rmo_top = 0x07C00000UL;
 
@@ -389,7 +389,7 @@
 				closedir(dir);
 				return -1;
 			}
-			if (fread(&tce_base, sizeof(unsigned long), 1, file) != 1) {
+			if (fread(&tce_base, sizeof(uint64_t), 1, file) != 1) {
 				perror(fname);
 				fclose(file);
 				closedir(cdir);
--- kexec-tools-1.101/kexec/kexec-sha256.h.orig	2007-04-10 13:33:39.000000000 -0400
+++ kexec-tools-1.101/kexec/kexec-sha256.h	2007-04-10 13:33:49.000000000 -0400
@@ -2,8 +2,8 @@
 #define KEXEC_SHA256_H
 
 struct sha256_region {
-	const void *start;
-	unsigned long len;
+	uint64_t start;
+	uint64_t len;
 };
 
 #define SHA256_REGIONS 16
--- kexec-tools-1.101/purgatory/Makefile.orig	2007-04-10 13:33:39.000000000 -0400
+++ kexec-tools-1.101/purgatory/Makefile	2007-04-10 13:33:49.000000000 -0400
@@ -57,9 +57,9 @@
 	$(MKDIR) -p $(@D)
 	$(CC) $(PCFLAGS) -o $@ -c $<
 
-$(PURGATORY): $(PURGATORY_OBJS) $(UTIL_LIB)
+$(PURGATORY): $(PURGATORY_OBJS)
 	$(MKDIR) -p $(@D)
-	$(LD) $(LDFLAGS) --no-undefined -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB)
+	$(LD) $(LDFLAGS) --no-undefined -e purgatory_start -r -o $@ $(PURGATORY_OBJS) 
 
 echo::
 	@echo "PURGATORY_C_SRCS $(PURGATORY_C_SRCS)"
--- kexec-tools-1.101/purgatory/arch/ppc64/Makefile.orig	2007-04-10 13:33:39.000000000 -0400
+++ kexec-tools-1.101/purgatory/arch/ppc64/Makefile	2007-04-10 13:33:49.000000000 -0400
@@ -6,3 +6,5 @@
 PURGATORY_C_SRCS += purgatory/arch/ppc64/purgatory-ppc64.c
 PURGATORY_C_SRCS += purgatory/arch/ppc64/console-ppc64.c
 PURGATORY_C_SRCS += purgatory/arch/ppc64/crashdump_backup.c
+
+PCFLAGS += -m64 -mcall-aixdesc
--- kexec-tools-1.101/purgatory/purgatory.c.orig	2007-04-10 13:33:39.000000000 -0400
+++ kexec-tools-1.101/purgatory/purgatory.c	2007-04-10 13:33:49.000000000 -0400
@@ -46,3 +46,5 @@
 	verify_sha256_digest();
 	post_verification_setup_arch();
 }
+
+#include "../util_lib/sha256.c"


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- kexec-tools.spec	10 Apr 2007 15:03:31 -0000	1.80
+++ kexec-tools.spec	10 Apr 2007 18:09:16 -0000	1.81
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 66%{?dist}
+Release: 67%{?dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -23,8 +23,7 @@
 Requires: busybox >= 1.2.0
 BuildRequires: zlib-devel elfutils-libelf-devel glib2-devel pkgconfig
 BuildRequires: elfutils-libelf-devel elfutils-devel-static gettext
-ExcludeArch: ppc
-%ifarch %{ix86} x86_64 ppc64 ia64
+%ifarch %{ix86} x86_64 ppc64 ia64 ppc
 Obsoletes: diskdumputils netdump
 %endif
 
@@ -66,6 +65,7 @@
 Patch305: kexec-tools-1.101-ppc64-64k-pages.patch
 Patch306: kexec-tools-1.101-ppc64-memory_regions.patch
 Patch307: kexec-tools-1.101-ppc64_rmo_top.patch
+Patch308: kexec-tools-1.101-ppc-boots-ppc64.patch
 
 #
 # Patches 401 through 500 are meant for s390 kexec-tools enablement
@@ -120,6 +120,9 @@
 %patch305 -p1
 %patch306 -p1
 %patch307 -p1
+%ifarch ppc
+%patch308 -p1
+%endif
 %patch401 -p1
 %patch501 -p1
 %patch601 -p1
@@ -128,6 +131,7 @@
 mkdir -p -m755 kcp
 tar -z -x -v -f %{SOURCE9}
 
+
 %patch603 -p1
 %patch604 -p1
 %patch605 -p1
@@ -135,6 +139,10 @@
 
 tar -z -x -v -f %{SOURCE13}
 
+%ifarch ppc
+%define archdef ARCH=ppc64
+%endif
+
 %build
 %configure \
 %ifarch ppc64
@@ -144,15 +152,15 @@
     --sbindir=/sbin
 rm -f kexec-tools.spec.in
 cp %{SOURCE10} . 
-make
-%ifarch %{ix86} x86_64 ia64 ppc64
+make %{?archdef}
+%ifarch %{ix86} x86_64 ia64 ppc64 ppc
 make -C makedumpfile
 %endif
 make -C po
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install %{?archdef} DESTDIR=$RPM_BUILD_ROOT
 make -C po install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
 mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
@@ -171,7 +179,7 @@
 install -m 644 kexec/kexec.8 $RPM_BUILD_ROOT%{_mandir}/man8/kexec.8
 install -m 755 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/kdump/firstboot_kdump.py
 install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_mandir}/man8/mkdumprd.8
-%ifarch %{ix86} x86_64 ia64 ppc64
+%ifarch %{ix86} x86_64 ia64 ppc64 ppc
 install -m 755 makedumpfile/makedumpfile $RPM_BUILD_ROOT/sbin/makedumpfile
 install -m 755 makedumpfile/makedumpfile-R.pl $RPM_BUILD_ROOT/sbin/makedumpfile-reasm
 %endif
@@ -241,6 +249,9 @@
 %doc kexec-kdump-howto.txt
 
 %changelog
+* Tue Apr 10 2007 Neil Horman <nhorman at redhat.com> - 1.101-67%{dist}
+- Allow ppc to boot ppc64 kernels (bz 235608)
+
 * Tue Apr 10 2007 Neil Horman <nhorman at redhat.com> - 1.101-66%{dist}
 - Reduce rmo_top to 0x7c000000 for PS3 (bz 235030)
 



From fedora-cvs-commits at redhat.com  Tue Apr 10 18:09:22 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 14:09:22 -0400
Subject: rpms/kernel/devel git-wireless-dev-fixes.patch, NONE,
	1.1 kernel-2.6.spec, 1.3055, 1.3056
Message-ID: <200704101809.l3AI9MNi005056@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	git-wireless-dev-fixes.patch 
Log Message:


git-wireless-dev-fixes.patch:
 ieee80211_ioctl.c |    5 ++++-
 ieee80211_sta.c   |   40 ++++++++++------------------------------
 2 files changed, 14 insertions(+), 31 deletions(-)

--- NEW FILE git-wireless-dev-fixes.patch ---
--- linux-2.6.20.noarch/net/mac80211/ieee80211_ioctl.c.orig	2007-04-05 16:55:15.000000000 -0400
+++ linux-2.6.20.noarch/net/mac80211/ieee80211_ioctl.c	2007-04-05 17:09:38.000000000 -0400
@@ -1585,7 +1585,7 @@ static int ieee80211_ioctl_giwrange(stru
 	memset(range, 0, sizeof(struct iw_range));
 
 	range->we_version_compiled = WIRELESS_EXT;
-	range->we_version_source = 14;
+	range->we_version_source = 21;
 	range->retry_capa = IW_RETRY_LIMIT;
 	range->retry_flags = IW_RETRY_LIMIT;
 	range->min_retry = 0;
@@ -1605,6 +1605,9 @@ static int ieee80211_ioctl_giwrange(stru
 	range->avg_qual.noise = 0;
 	range->avg_qual.updated = local->wstats_flags;
 
+	range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 |
+			  IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP;
+
 	return 0;
 }
 
--- linux-2.6.20.noarch/net/mac80211/ieee80211_sta.c.orig	2007-04-05 16:55:16.000000000 -0400
+++ linux-2.6.20.noarch/net/mac80211/ieee80211_sta.c	2007-04-05 17:09:17.000000000 -0400
@@ -2781,39 +2781,19 @@ ieee80211_sta_scan_result(struct net_dev
 	current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, "");
 
 	if (bss && bss->wpa_ie) {
-		char *buf, *p;
-		int i;
-		buf = kmalloc(30 + bss->wpa_ie_len * 2, GFP_ATOMIC);
-		if (buf) {
-			p = buf;
-			p += sprintf(p, "wpa_ie=");
-			for (i = 0; i < bss->wpa_ie_len; i++)
-				p+= sprintf(p, "%02x", bss->wpa_ie[i]);
-			memset(&iwe, 0, sizeof(iwe));
-			iwe.cmd = IWEVCUSTOM;
-			iwe.u.data.length = strlen(buf);
-			current_ev = iwe_stream_add_point(current_ev, end_buf,
-							  &iwe, buf);
-			kfree(buf);
-		}
+		memset(&iwe, 0, sizeof(iwe));
+		iwe.cmd = IWEVGENIE;
+		iwe.u.data.length = bss->wpa_ie_len;
+		current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+						  bss->wpa_ie);
 	}
 
 	if (bss && bss->rsn_ie) {
-		char *buf, *p;
-		int i;
-		buf = kmalloc(30 + bss->rsn_ie_len * 2, GFP_ATOMIC);
-		if (buf) {
-			p = buf;
-			p += sprintf(p, "rsn_ie=");
-			for (i = 0; i < bss->rsn_ie_len; i++)
-				p+= sprintf(p, "%02x", bss->rsn_ie[i]);
-			memset(&iwe, 0, sizeof(iwe));
-			iwe.cmd = IWEVCUSTOM;
-			iwe.u.data.length = strlen(buf);
-			current_ev = iwe_stream_add_point(current_ev, end_buf,
-							  &iwe, buf);
-			kfree(buf);
-		}
+		memset(&iwe, 0, sizeof(iwe));
+		iwe.cmd = IWEVGENIE;
+		iwe.u.data.length = bss->rsn_ie_len;
+		current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+						  bss->rsn_ie);
 	}
 
 	if (bss) {


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3055
retrieving revision 1.3056
diff -u -r1.3055 -r1.3056
--- kernel-2.6.spec	10 Apr 2007 14:20:44 -0000	1.3055
+++ kernel-2.6.spec	10 Apr 2007 18:09:20 -0000	1.3056
@@ -378,17 +378,18 @@
 Patch10: linux-2.6-utrace.patch
 Patch11: nouveau-drm.patch
 Patch12: git-wireless-dev.patch
-Patch13: git-iwlwifi.patch
-Patch14: git-iwlwifi-fixes.patch
-Patch15: linux-2.6-rt2x00-scan-fix.patch
-
-Patch16: linux-2.6-fix-pmops-1.patch
-Patch17: linux-2.6-fix-pmops-2.patch
-Patch18: linux-2.6-fix-pmops-3.patch
-Patch19: linux-2.6-fix-pmops-4.patch
+Patch13: git-wireless-dev-fixes.patch
+Patch14: git-iwlwifi.patch
+Patch15: git-iwlwifi-fixes.patch
+Patch16: linux-2.6-rt2x00-scan-fix.patch
+
+Patch17: linux-2.6-fix-pmops-1.patch
+Patch18: linux-2.6-fix-pmops-2.patch
+Patch19: linux-2.6-fix-pmops-3.patch
+Patch20: linux-2.6-fix-pmops-4.patch
 
 # enable sysrq-c on all kernels, not only kexec
-Patch20: linux-2.6-sysrq-c.patch
+Patch21: linux-2.6-sysrq-c.patch
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -974,20 +975,22 @@
 
 # Add the new wireless stack and drivers from wireless-dev
 %patch12 -p1
-# ...and the iwlwifi driver from Intel
+# ...plus some fixes not yet in the wireless-dev tree
 %patch13 -p1
-# ...plus some fixes not yet in Intel's tree
+# ...and the iwlwifi driver from Intel
 %patch14 -p1
-# fix up scanning in rt2x00
+# ...plus some fixes not yet in Intel's tree
 %patch15 -p1
-# Power management fixes
+# fix up scanning in rt2x00
 %patch16 -p1
+# Power management fixes
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 
 # sysrq works always
-%patch20 -p1
+%patch21 -p1
 
 # Architecture patches
 
@@ -2249,6 +2252,9 @@
 #  - tux.
 
 %changelog
+* Tue Apr 10 2007 John W. Linville <linville at redhat.com>
+- Add fix for using WPA with mac80211 drivers
+
 * Tue Apr 10 2007 Dave Jones <davej at redhat.com>
 - 2.6.21-rc6-git3
 



From fedora-cvs-commits at redhat.com  Tue Apr 10 18:16:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 14:16:49 -0400
Subject: rpms/kernel/FC-5 linux-2.6-20.7a-ahci_ATI_SB600_workaround.patch,
	NONE, 1.1 linux-2.6-20.7a-fib_rules_fix_return_value.patch,
	NONE, 1.1 linux-2.6-20.7a-libata-lba48.patch, NONE,
	1.1 linux-2.6-20.7b-libata_blacklist.patch, NONE,
	1.1 linux-2.6-20.7b-libata_clear_tf_before_sense.patch, NONE,
	1.1 linux-2.6-20.7b-scsi_eh_scatterlist.patch, NONE,
	1.1 linux-2.6-21-rc6-readahead.patch, NONE,
	1.1 linux-2.6-gfs2-update3.patch, NONE,
	1.1 linux-2.6-i386_pci-add_debugging.patch, NONE,
	1.1 patch-2.6.20.4-5.bz2.sign, NONE,
	1.1 patch-2.6.20.5-6.bz2.sign, NONE, 1.1 .cvsignore, 1.439,
	1.440 kernel-2.6.spec, 1.2311, 1.2312 sources, 1.379,
	1.380 upstream, 1.342, 1.343 patch-2.6.20.5-rc1.bz2.sign, 1.1, NONE
Message-ID: <200704101816.l3AIGnQg005346@cvs.devel.redhat.com>

Author: cebbert

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	linux-2.6-20.7a-ahci_ATI_SB600_workaround.patch 
	linux-2.6-20.7a-fib_rules_fix_return_value.patch 
	linux-2.6-20.7a-libata-lba48.patch 
	linux-2.6-20.7b-libata_blacklist.patch 
	linux-2.6-20.7b-libata_clear_tf_before_sense.patch 
	linux-2.6-20.7b-scsi_eh_scatterlist.patch 
	linux-2.6-21-rc6-readahead.patch linux-2.6-gfs2-update3.patch 
	linux-2.6-i386_pci-add_debugging.patch 
	patch-2.6.20.4-5.bz2.sign patch-2.6.20.5-6.bz2.sign 
Removed Files:
	patch-2.6.20.5-rc1.bz2.sign 
Log Message:
* Tue Apr 10 2007 Chuck Ebbert <cebbert at redhat.com>		1.2312
- 2.6.20.5
- 2.6.20.6
- GFS2 update (1414)
- additional bugfixes (1806-1813)


linux-2.6-20.7a-ahci_ATI_SB600_workaround.patch:
 ahci.c |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-20.7a-ahci_ATI_SB600_workaround.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=55a61604cd1354e1783364e1c901034f2f474b7d
Commit:     55a61604cd1354e1783364e1c901034f2f474b7d
Parent:     d7d0dad62a641c156386288a747c1a2f6bb2e42d
Author:     Conke Hu <conke.hu at gmail.com>
AuthorDate: Tue Mar 27 18:33:05 2007 +0800
Committer:  Jeff Garzik <jeff at garzik.org>
CommitDate: Wed Mar 28 02:04:27 2007 -0400

    ahci.c: walkaround for SB600 SATA internal error issue
    
       There is a HW issue in ATI SB600 SATA that PxSERR.E should not be
    set on some conditions, for example, when there is no media in SATA
    CD/DVD drive or media is not ready, AHCI controller fails to execute
    ATAPI commands and reports PORT_IRQ_TF_ERR, but ATI SB600 SATA
    controller sets PxSERR.E at the
    same time, which is not necessary.
        This patch is just to ignore the INTERNAL ERROR in such case.
    Without this patch, ahci error handler will report many errors as
    below:
        ----------- cut from dmesg -----------
    ata9: soft resetting port
    ata9: SATA link up 1.5 Gbps (SStatus 113 SControl 300)
    ata9.00: configured for UDMA/33
    ata9: EH complete
    ata9.00: exception Emask 0x40 SAct 0x0 SErr 0x800 action 0x2
    ata9.00: (irq_stat 0x40000001)
    ata9.00: cmd a0/00:00:00:00:20/00:00:00:00:00/a0 tag 0 cdb 0x0 data 0
            res 51/24:03:00:00:20/00:00:00:00:00/a0 Emask 0x40 (internal error)
    ata9: soft resetting port
    ata9: SATA link up 1.5 Gbps (SStatus 113 SControl 300)
    ata9.00: configured for UDMA/33
    ata9: EH complete
    ata9.00: exception Emask 0x40 SAct 0x0 SErr 0x800 action 0x2
    ata9.00: (irq_stat 0x40000001)
    ata9.00: cmd a0/01:00:00:00:00/00:00:00:00:00/a0 tag 0 cdb 0x43 data 12 in
            res 51/24:03:00:00:00/00:00:00:00:00/a0 Emask 0x40 (internal error)
        -------- end cut ---------
    
    Signed-off-by: Conke Hu <conke.hu at amd.com>
    Signed-off-by: Jeff Garzik <jeff at garzik.org>
---
 drivers/ata/ahci.c |   21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

--- linux-2.6.20.noarch.orig/drivers/ata/ahci.c
+++ linux-2.6.20.noarch/drivers/ata/ahci.c
@@ -82,6 +82,7 @@ enum {
 	board_ahci_pi		= 1,
 	board_ahci_vt8251	= 2,
 	board_ahci_ign_iferr	= 3,
+	board_ahci_sb600	= 4,
 
 	/* global controller registers */
 	HOST_CAP		= 0x00, /* host capabilities */
@@ -173,6 +174,7 @@ enum {
 	AHCI_FLAG_NO_NCQ		= (1 << 24),
 	AHCI_FLAG_IGN_IRQ_IF_ERR	= (1 << 25), /* ignore IRQ_IF_ERR */
 	AHCI_FLAG_HONOR_PI		= (1 << 26), /* honor PORTS_IMPL */
+	AHCI_FLAG_IGN_SERR_INTERNAL	= (1 << 27), /* ignore SERR_INTERNAL */
 };
 
 struct ahci_cmd_hdr {
@@ -365,6 +367,18 @@ static const struct ata_port_info ahci_p
 		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */
 		.port_ops	= &ahci_ops,
 	},
+	/* board_ahci_sb600 */
+	{
+		.sht		= &ahci_sht,
+		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
+				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |
+				  ATA_FLAG_SKIP_D2H_BSY |
+				  AHCI_FLAG_IGN_SERR_INTERNAL,
+		.pio_mask	= 0x1f, /* pio0-4 */
+		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */
+		.port_ops	= &ahci_ops,
+	},
+
 };
 
 static const struct pci_device_id ahci_pci_tbl[] = {
@@ -404,7 +418,7 @@ static const struct pci_device_id ahci_p
 	{ PCI_VDEVICE(JMICRON, 0x2366), board_ahci_ign_iferr }, /* JMB366 */
 
 	/* ATI */
-	{ PCI_VDEVICE(ATI, 0x4380), board_ahci }, /* ATI SB600 non-raid */
+	{ PCI_VDEVICE(ATI, 0x4380), board_ahci_sb600 }, /* ATI SB600 non-raid */
 	{ PCI_VDEVICE(ATI, 0x4381), board_ahci }, /* ATI SB600 raid */
 
 	/* VIA */
@@ -1076,8 +1090,11 @@ static void ahci_error_intr(struct ata_p
 	if (ap->flags & AHCI_FLAG_IGN_IRQ_IF_ERR)
 		irq_stat &= ~PORT_IRQ_IF_ERR;
 
-	if (irq_stat & PORT_IRQ_TF_ERR)
+	if (irq_stat & PORT_IRQ_TF_ERR) {
 		err_mask |= AC_ERR_DEV;
+		if (ap->flags & AHCI_FLAG_IGN_SERR_INTERNAL)
+			serror &= ~SERR_INTERNAL;
+	}
 
 	if (irq_stat & (PORT_IRQ_HBUS_ERR | PORT_IRQ_HBUS_DATA_ERR)) {
 		err_mask |= AC_ERR_HOST_BUS;

linux-2.6-20.7a-fib_rules_fix_return_value.patch:
 fib_rules.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-20.7a-fib_rules_fix_return_value.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=83886b6b636173b206f475929e58fac75c6f2446
Commit:     83886b6b636173b206f475929e58fac75c6f2446
Parent:     9a5ee4cc9ef8de5185114237a81f5f395e21d8fd
Author:     Steven Whitehouse <swhiteho at redhat.com>
AuthorDate: Fri Mar 30 13:34:27 2007 -0700
Committer:  David S. Miller <davem at sunset.davemloft.net>
CommitDate: Mon Apr 2 13:30:51 2007 -0700

    [NET]: Change "not found" return value for rule lookup
    
    This changes the "not found" error return for the lookup
    function to -ESRCH so that it can be distinguished from
    the case where a rule or route resulting in -ENETUNREACH
    has been found during the search.
    
    It fixes a bug where if DECnet was compiled with routing
    support, but no routes were added to the routing table,
    it was failing to fall back to endnode routing.
    
    Signed-off-by: Steven Whitehouse <swhiteho at redhat.com>
    Signed-off-by: Patrick Caulfield <pcaulfie at redhat.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>
---
 net/core/fib_rules.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index d011819..7174ced 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -143,7 +143,7 @@ int fib_rules_lookup(struct fib_rules_ops *ops, struct flowi *fl,
 		}
 	}
 
-	err = -ENETUNREACH;
+	err = -ESRCH;
 out:
 	rcu_read_unlock();
 

linux-2.6-20.7a-libata-lba48.patch:
 libata-core.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-20.7a-libata-lba48.patch ---
From: Mark Lord <liml at rtr.ca>
Date: Mon, 2 Apr 2007 20:20:35 +0000 (-0400)
Subject: 2.6.21 fix lba48 bug in libata fill_result_tf()
X-Git-Tag: v2.6.21-rc6~16^2~5
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=4742d54fa4b391342dfb8f34de14d51da101fb39

2.6.21 fix lba48 bug in libata fill_result_tf()

Current 2.6.21 libata does the following:

void ata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
{
        struct ata_ioports *ioaddr = &ap->ioaddr;

        tf->command = ata_check_status(ap);
	...
        if (tf->flags & ATA_TFLAG_LBA48) {
                iowrite8(tf->ctl | ATA_HOB, ioaddr->ctl_addr);
                tf->hob_feature = ioread8(ioaddr->error_addr);
                ...
        }
}
...
static void fill_result_tf(struct ata_queued_cmd *qc)
{
        struct ata_port *ap = qc->ap;

        ap->ops->tf_read(ap, &qc->result_tf);
        qc->result_tf.flags = qc->tf.flags;
}

Based on this, those last two statements fill_result_tf()
appear to me to be in the wrong order, in that the tf->flags
are uninitialized at the point where tf_read() is invoked.
So for lba48 commands, tf_read() won't be reading back the
full lba48 register contents..

Correct?

This patch corrects fill_result_tf() so that the flags
get copied to result_tf before they are used by tf_read().

Signed-off-by:  Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
---

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index ddb3909..e07142b 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -4717,8 +4717,8 @@ static void fill_result_tf(struct ata_queued_cmd *qc)
 {
 	struct ata_port *ap = qc->ap;
 
-	ap->ops->tf_read(ap, &qc->result_tf);
 	qc->result_tf.flags = qc->tf.flags;
+	ap->ops->tf_read(ap, &qc->result_tf);
 }
 
 /**

linux-2.6-20.7b-libata_blacklist.patch:
 libata-core.c |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-20.7b-libata_blacklist.patch ---
Update libata drive blacklist to the latest from 2.6.21.

[diff between 2.6.20.6 and 2.6.21-rc6]

Signed-off-by: Chuck Ebbert <cebbert at redhat.com>

--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -3316,16 +3316,30 @@ static const struct ata_blacklist_entry 
 	{ "WPI CDD-820", 	NULL,		ATA_HORKAGE_NODMA },
 	{ "SAMSUNG CD-ROM SC-148C", NULL,	ATA_HORKAGE_NODMA },
 	{ "SAMSUNG CD-ROM SC",	NULL,		ATA_HORKAGE_NODMA },
-	{ "SanDisk SDP3B-64", 	NULL,		ATA_HORKAGE_NODMA },
 	{ "ATAPI CD-ROM DRIVE 40X MAXIMUM",NULL,ATA_HORKAGE_NODMA },
 	{ "_NEC DV5800A", 	NULL,		ATA_HORKAGE_NODMA },
 	{ "SAMSUNG CD-ROM SN-124","N001",	ATA_HORKAGE_NODMA },
 
+	/* Weird ATAPI devices */
+	{ "TORiSAN DVD-ROM DRD-N216", NULL,	ATA_HORKAGE_MAX_SEC_128 |
+						ATA_HORKAGE_DMA_RW_ONLY },
+
 	/* Devices we expect to fail diagnostics */
 
 	/* Devices where NCQ should be avoided */
 	/* NCQ is slow */
         { "WDC WD740ADFD-00",   NULL,		ATA_HORKAGE_NONCQ },
+	/* http://thread.gmane.org/gmane.linux.ide/14907 */
+	{ "FUJITSU MHT2060BH",	NULL,		ATA_HORKAGE_NONCQ },
+	/* NCQ is broken */
+	{ "Maxtor 6L250S0",     "BANC1G10",     ATA_HORKAGE_NONCQ },
+	/* NCQ hard hangs device under heavier load, needs hard power cycle */
+	{ "Maxtor 6B250S0",	"BANC1B70",	ATA_HORKAGE_NONCQ },
+	/* Blacklist entries taken from Silicon Image 3124/3132
+	   Windows driver .inf file - also several Linux problem reports */
+	{ "HTS541060G9SA00",    "MB3OC60D",     ATA_HORKAGE_NONCQ, },
+	{ "HTS541080G9SA00",    "MB4OC60D",     ATA_HORKAGE_NONCQ, },
+	{ "HTS541010G9SA00",    "MBZOC60D",     ATA_HORKAGE_NONCQ, },
 
 	/* Devices with NCQ limits */
 

linux-2.6-20.7b-libata_clear_tf_before_sense.patch:
 libata-eh.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

--- NEW FILE linux-2.6-20.7b-libata_clear_tf_before_sense.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=56287768e31268969abd94b38b931a29d1ced1ce
Commit:     56287768e31268969abd94b38b931a29d1ced1ce
Parent:     7152764700559b6a4041fdaba345df9a5cd962f0
Author:     Albert Lee <albertcc at tw.ibm.com>
AuthorDate: Mon Apr 2 11:30:46 2007 +0800
Committer:  Jeff Garzik <jeff at garzik.org>
CommitDate: Wed Apr 4 02:12:27 2007 -0400

    libata: Clear tf before doing request sense (take 3)
    
    patch 2/4:
      Clear tf before doing request sense.
    
    This fixes the AOpen 56X/AKH timeout problem.
    (http://bugzilla.kernel.org/show_bug.cgi?id=8244)
    
    Signed-off-by: Albert Lee <albertcc at tw.ibm.com>
    Signed-off-by: Jeff Garzik <jeff at garzik.org>
---
 drivers/ata/libata-eh.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index c89664a..39f556c 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -982,26 +982,27 @@ static int ata_eh_read_log_10h(struct ata_device *dev,
  *	RETURNS:
  *	0 on success, AC_ERR_* mask on failure
  */
-static unsigned int atapi_eh_request_sense(struct ata_device *dev,
-					   unsigned char *sense_buf)
+static unsigned int atapi_eh_request_sense(struct ata_queued_cmd *qc)
 {
+	struct ata_device *dev = qc->dev;
+	unsigned char *sense_buf = qc->scsicmd->sense_buffer;
 	struct ata_port *ap = dev->ap;
 	struct ata_taskfile tf;
 	u8 cdb[ATAPI_CDB_LEN];
 
 	DPRINTK("ATAPI request sense\n");
 
-	ata_tf_init(dev, &tf);
-
 	/* FIXME: is this needed? */
 	memset(sense_buf, 0, SCSI_SENSE_BUFFERSIZE);
 
-	/* XXX: why tf_read here? */
-	ap->ops->tf_read(ap, &tf);
-
-	/* fill these in, for the case where they are -not- overwritten */
+	/* initialize sense_buf with the error register,
+	 * for the case where they are -not- overwritten
+	 */
 	sense_buf[0] = 0x70;
-	sense_buf[2] = tf.feature >> 4;
+	sense_buf[2] = qc->result_tf.feature >> 4;
+
+	/* some devices time out if garbage left in tf */ 
+	ata_tf_init(dev, &tf);
 
 	memset(cdb, 0, ATAPI_CDB_LEN);
 	cdb[0] = REQUEST_SENSE;
@@ -1165,8 +1166,7 @@ static unsigned int ata_eh_analyze_tf(struct ata_queued_cmd *qc,
 
 	case ATA_DEV_ATAPI:
 		if (!(qc->ap->pflags & ATA_PFLAG_FROZEN)) {
-			tmp = atapi_eh_request_sense(qc->dev,
-						     qc->scsicmd->sense_buffer);
+			tmp = atapi_eh_request_sense(qc);
 			if (!tmp) {
 				/* ATA_QCFLAG_SENSE_VALID is used to
 				 * tell atapi_qc_complete() that sense

linux-2.6-20.7b-scsi_eh_scatterlist.patch:
 scsi_error.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-20.7b-scsi_eh_scatterlist.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8cc574a3c5cea70229f243a6b57fd69e60491d82
Commit:     8cc574a3c5cea70229f243a6b57fd69e60491d82
Parent:     d80f0a4beb15d817bfbb18a29e5ffc1d9dc353ea
Author:     David S. Miller <davem at sunset.davemloft.net>
AuthorDate: Mon Apr 2 14:21:55 2007 -0700
Committer:  David S. Miller <davem at sunset.davemloft.net>
CommitDate: Mon Apr 2 14:26:22 2007 -0700

    [SCSI]: Fix scsi_send_eh_cmnd scatterlist handling
    
    This fixes a regression caused by commit:
    
    2dc611de5a3fd955cd0298c50691d4c05046db97
    
    The sense buffer code in scsi_send_eh_cmnd was changed to use
    alloc_page() and a scatter list, but the sense data copy was not
    updated to match so what we actually get in the sense buffer is total
    grabage starting with the kernel address of the struct page we got.
    Basically the stack frame of scsi_send_eh_cmd() is what ends up
    in the sense buffer.
    
    Depending upon how pointers look on a given platform, you can
    end up getting sr_ioctl.c errors when you mount a cdrom.  If
    the CDROM gives a check condition for GPCMD_GET_CONFIGURATION issued
    by drivers/cdrom/cdrom.c:cdrom_mmc_profile(), sr_ioctl will
    spit out this error message in sr_do_ioctl() with the way pointers
    are on sparc64:
    
    		default:
    			printk(KERN_ERR "%s: CDROM (ioctl) error, command: ", cd->cdi.name);
    			__scsi_print_command(cgc->cmd);
    			scsi_print_sense_hdr("sr", &sshdr);
    			err = -EIO;
    
    This is the error Tom Callaway reported in:
    
    http://marc.info/?l=linux-sparc&m=117407453208101&w=2
    
    Anyways, fix this by using page_address(sgl.page) which is OK
    because we know this is low-mem due to GFP_ATOMIC.
    
    Signed-off-by: David S. Miller <davem at davemloft.net>
    Acked-by: Christoph Hellwig <hch at lst.de>
---
 drivers/scsi/scsi_error.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index b8edcf5..918bb60 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -716,7 +716,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
 	 */
 	if (copy_sense) {
 		if (!SCSI_SENSE_VALID(scmd)) {
-			memcpy(scmd->sense_buffer, scmd->request_buffer,
+			memcpy(scmd->sense_buffer, page_address(sgl.page),
 			       sizeof(scmd->sense_buffer));
 		}
 		__free_page(sgl.page);

linux-2.6-21-rc6-readahead.patch:
 include/linux/fs.h |    1 +
 mm/filemap.c       |    9 ++++++---
 mm/readahead.c     |    3 +++
 3 files changed, 10 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-21-rc6-readahead.patch ---
Introduce ra.offset and store in it an offset where the previous read ended. This way
we can detect whether reads are really sequential (and thus we should not mark the page
as accessed repeatedly) or whether they are random and just happen to be in the same page
(and the page should really be marked accessed again).

Signed-off-by: Jan Kara <jack at suse.cz>

diff -rupX /home/jack/.kerndiffexclude linux-2.6.21-rc6/include/linux/fs.h linux-2.6.21-rc6-1-readahead/include/linux/fs.h
--- linux-2.6.21-rc6/include/linux/fs.h	2007-04-10 17:09:58.000000000 +0200
+++ linux-2.6.21-rc6-1-readahead/include/linux/fs.h	2007-04-10 17:14:42.000000000 +0200
@@ -702,6 +702,7 @@ struct file_ra_state {
 	unsigned long ra_pages;		/* Maximum readahead window */
 	unsigned long mmap_hit;		/* Cache hit stat for mmap accesses */
 	unsigned long mmap_miss;	/* Cache miss stat for mmap accesses */
+	unsigned int offset;		/* Offset where last read() ended in a page */
 };
 #define RA_FLAG_MISS 0x01	/* a cache miss occured against this file */
 #define RA_FLAG_INCACHE 0x02	/* file is already in cache */
diff -rupX /home/jack/.kerndiffexclude linux-2.6.21-rc6/mm/filemap.c linux-2.6.21-rc6-1-readahead/mm/filemap.c
--- linux-2.6.21-rc6/mm/filemap.c	2007-04-10 17:10:00.000000000 +0200
+++ linux-2.6.21-rc6-1-readahead/mm/filemap.c	2007-04-10 17:18:10.000000000 +0200
@@ -868,6 +868,7 @@ void do_generic_mapping_read(struct addr
 	unsigned long last_index;
 	unsigned long next_index;
 	unsigned long prev_index;
+	unsigned int prev_offset;
 	loff_t isize;
 	struct page *cached_page;
 	int error;
@@ -877,6 +878,7 @@ void do_generic_mapping_read(struct addr
 	index = *ppos >> PAGE_CACHE_SHIFT;
 	next_index = index;
 	prev_index = ra.prev_page;
+	prev_offset = ra.offset;
 	last_index = (*ppos + desc->count + PAGE_CACHE_SIZE-1) >> PAGE_CACHE_SHIFT;
 	offset = *ppos & ~PAGE_CACHE_MASK;
 
@@ -924,10 +926,10 @@ page_ok:
 			flush_dcache_page(page);
 
 		/*
-		 * When (part of) the same page is read multiple times
-		 * in succession, only mark it as accessed the first time.
+		 * When a sequential read accesses a page several times,
+		 * only mark it as accessed the first time.
 		 */
-		if (prev_index != index)
+		if (prev_index != index || offset != prev_offset)
 			mark_page_accessed(page);
 		prev_index = index;
 
@@ -945,6 +947,7 @@ page_ok:
 		offset += ret;
 		index += offset >> PAGE_CACHE_SHIFT;
 		offset &= ~PAGE_CACHE_MASK;
+		prev_offset = ra.offset = offset;
 
 		page_cache_release(page);
 		if (ret == nr && desc->count)
diff -rupX /home/jack/.kerndiffexclude linux-2.6.21-rc6/mm/readahead.c linux-2.6.21-rc6-1-readahead/mm/readahead.c
--- linux-2.6.21-rc6/mm/readahead.c	2007-04-10 17:10:00.000000000 +0200
+++ linux-2.6.21-rc6-1-readahead/mm/readahead.c	2007-04-10 17:14:42.000000000 +0200
@@ -207,6 +207,8 @@ out:
  *              If page_cache_readahead sees that it is again being called for
  *              a page which it just looked at, it can return immediately without
  *              making any state changes.
+ * offset:      Offset in the prev_page where the last read ended - used for
+ *              detection of sequential file reading.
  * ahead_start,
  * ahead_size:  Together, these form the "ahead window".
  * ra_pages:	The externally controlled max readahead for this fd.
@@ -473,6 +475,7 @@ page_cache_readahead(struct address_spac
 	/* Note that prev_page == -1 if it is a first read */
 	sequential = (offset == ra->prev_page + 1);
 	ra->prev_page = offset;
+	ra->offset = 0;
 
 	max = get_max_readahead(ra);
 	newsize = min(req_size, max);

linux-2.6-gfs2-update3.patch:
 locking/dlm/lock.c     |    4 ++--
 locking/dlm/lock_dlm.h |    2 +-
 rgrp.c                 |    5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE linux-2.6-gfs2-update3.patch ---
>From 9f95fae981198a86811d19f4ca6da7349755b210 Mon Sep 17 00:00:00 2001
From: David Teigland <teigland at redhat.com>
Date: Wed, 28 Mar 2007 11:08:04 -0500
Subject: [PATCH] [GFS2] use log_error before LM_OUT_ERROR

We always want to see the details of the error returned to gfs, but
log_debug is often turned off, so use log_error (printk).

Signed-off-by: David Teigland <teigland at redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho at redhat.com>

diff --git a/fs/gfs2/locking/dlm/lock.c b/fs/gfs2/locking/dlm/lock.c
index f9c8bda..c305255 100644
--- a/fs/gfs2/locking/dlm/lock.c
+++ b/fs/gfs2/locking/dlm/lock.c
@@ -266,7 +266,7 @@ unsigned int gdlm_do_lock(struct gdlm_lock *lp)
 	}
 
 	if (error) {
-		log_debug("%s: gdlm_lock %x,%llx err=%d cur=%d req=%d lkf=%x "
+		log_error("%s: gdlm_lock %x,%llx err=%d cur=%d req=%d lkf=%x "
 			  "flags=%lx", ls->fsname, lp->lockname.ln_type,
 			  (unsigned long long)lp->lockname.ln_number, error,
 			  lp->cur, lp->req, lp->lkf, lp->flags);
@@ -294,7 +294,7 @@ static unsigned int gdlm_do_unlock(struct gdlm_lock *lp)
 	error = dlm_unlock(ls->dlm_lockspace, lp->lksb.sb_lkid, lkf, NULL, lp);
 
 	if (error) {
-		log_debug("%s: gdlm_unlock %x,%llx err=%d cur=%d req=%d lkf=%x "
+		log_error("%s: gdlm_unlock %x,%llx err=%d cur=%d req=%d lkf=%x "
 			  "flags=%lx", ls->fsname, lp->lockname.ln_type,
 			  (unsigned long long)lp->lockname.ln_number, error,
 			  lp->cur, lp->req, lp->lkf, lp->flags);
-- 
1.4.4.2



From fedora-cvs-commits at redhat.com  Tue Apr 10 18:33:17 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 14:33:17 -0400
Subject: rpms/java-1.5.0-gcj/devel java-1.5.0-gcj.spec,1.13,1.14
Message-ID: <200704101833.l3AIXH1Q020826@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.5.0-gcj/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20634

Modified Files:
	java-1.5.0-gcj.spec 
Log Message:
* Tue Apr 10 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-13
- Point URL field at java-gcj-compat home page.
- Require openssl for build.
- Generate and include cacerts.
- Resolves: rhbz#200836 rhbz#233239




Index: java-1.5.0-gcj.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.5.0-gcj/devel/java-1.5.0-gcj.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- java-1.5.0-gcj.spec	3 Apr 2007 20:53:07 -0000	1.13
+++ java-1.5.0-gcj.spec	10 Apr 2007 18:33:15 -0000	1.14
@@ -55,13 +55,14 @@
 
 Name:    %{name}
 Version: %{javaver}.%{buildver}
-Release: 12%{?dist}
+Release: 13%{?dist}
 Summary: JPackage runtime compatibility layer for GCJ
 Group:   Development/Languages
 
 License: GPL
-URL:     ftp://sources.redhat.com/pub/rhug/java-gcj-compat-%{jgcver}.tar.gz
-Source0: java-gcj-compat-%{jgcver}.tar.gz
+URL:     http://sources.redhat.com/rhug/java-gcj-compat.html
+Source0: ftp://sources.redhat.com/pub/rhug/java-gcj-compat-%{jgcver}.tar.gz
+Source1: generate-cacerts.pl
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +70,8 @@
 # and rebuild-gcj-db
 BuildRequires: gcc%{gccsuffix}-java >= %{gccver}
 BuildRequires: libgcj%{gccsuffix}-src >= %{gccver}
+# required for cacerts generation
+BuildRequires: openssl
 BuildRequires: python-devel
 %if ! %{bootstrap}
 BuildRequires: sinjdoc
@@ -314,6 +317,10 @@
 # classpath.security file.
 EOF
 done
+# cacerts
+pushd $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security
+  %{__perl} %{SOURCE1}
+popd
 
 # versionless symbolic links
 pushd $RPM_BUILD_ROOT%{_jvmdir}
@@ -593,6 +600,7 @@
 %{_jvmdir}/%{jredir}/bin/java
 %{_jvmdir}/%{jredir}/bin/keytool
 %{_jvmdir}/%{jredir}/bin/rmiregistry
+%{_jvmdir}/%{jredir}/lib/security/cacerts
 %{_jvmdir}/%{jredir}/lib/security/java.security
 %{_jvmdir}/%{jredir}/lib/jaas.jar
 %{_jvmdir}/%{jredir}/lib/jce.jar
@@ -706,6 +714,12 @@
 %endif
 
 %changelog
+* Tue Apr 10 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-13
+- Point URL field at java-gcj-compat home page.
+- Require openssl for build.
+- Generate and include cacerts.
+- Resolves: rhbz#200836 rhbz#233239
+
 * Tue Apr  3 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-12
 - Obsolete gnu-crypto, gnu-crypto-sasl-jdk1.4 and jessie in base
   package.



From fedora-cvs-commits at redhat.com  Tue Apr 10 18:43:08 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 14:43:08 -0400
Subject: rpms/kernel/FC-5 linux-2.6-20.7b-libata_blacklist.patch,1.1,1.2
Message-ID: <200704101843.l3AIh8Q2027943@cvs.devel.redhat.com>

Author: cebbert

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

Modified Files:
	linux-2.6-20.7b-libata_blacklist.patch 
Log Message:
Fix libata blacklist patch.


linux-2.6-20.7b-libata_blacklist.patch:
 libata-core.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletion(-)

Index: linux-2.6-20.7b-libata_blacklist.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-20.7b-libata_blacklist.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-20.7b-libata_blacklist.patch	10 Apr 2007 18:16:47 -0000	1.1
+++ linux-2.6-20.7b-libata_blacklist.patch	10 Apr 2007 18:43:06 -0000	1.2
@@ -6,7 +6,7 @@
 
 --- a/drivers/ata/libata-core.c
 +++ b/drivers/ata/libata-core.c
-@@ -3316,16 +3316,30 @@ static const struct ata_blacklist_entry 
+@@ -3316,16 +3316,26 @@ static const struct ata_blacklist_entry 
  	{ "WPI CDD-820", 	NULL,		ATA_HORKAGE_NODMA },
  	{ "SAMSUNG CD-ROM SC-148C", NULL,	ATA_HORKAGE_NODMA },
  	{ "SAMSUNG CD-ROM SC",	NULL,		ATA_HORKAGE_NODMA },
@@ -15,10 +15,6 @@
  	{ "_NEC DV5800A", 	NULL,		ATA_HORKAGE_NODMA },
  	{ "SAMSUNG CD-ROM SN-124","N001",	ATA_HORKAGE_NODMA },
  
-+	/* Weird ATAPI devices */
-+	{ "TORiSAN DVD-ROM DRD-N216", NULL,	ATA_HORKAGE_MAX_SEC_128 |
-+						ATA_HORKAGE_DMA_RW_ONLY },
-+
  	/* Devices we expect to fail diagnostics */
  
  	/* Devices where NCQ should be avoided */



From fedora-cvs-commits at redhat.com  Tue Apr 10 18:52:44 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 14:52:44 -0400
Subject: rpms/java-1.5.0-gcj/devel .cvsignore, 1.4, 1.5 java-1.5.0-gcj.spec,
	1.14, 1.15 sources, 1.4, 1.5
Message-ID: <200704101852.l3AIqiNl002555@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.5.0-gcj/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2373

Modified Files:
	.cvsignore java-1.5.0-gcj.spec sources 
Log Message:
- Import java-gcj-compat 1.0.75.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/java-1.5.0-gcj/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Mar 2007 18:43:43 -0000	1.4
+++ .cvsignore	10 Apr 2007 18:52:42 -0000	1.5
@@ -1 +1 @@
-java-gcj-compat-1.0.74.tar.gz
+java-gcj-compat-1.0.75.tar.gz


Index: java-1.5.0-gcj.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.5.0-gcj/devel/java-1.5.0-gcj.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- java-1.5.0-gcj.spec	10 Apr 2007 18:33:15 -0000	1.14
+++ java-1.5.0-gcj.spec	10 Apr 2007 18:52:42 -0000	1.15
@@ -19,7 +19,7 @@
 # the version-release string for the gcj rpms we require
 %define gccver          4.1.2-5
 # the version string for the java-gcj-compat release we require
-%define jgcver          1.0.74
+%define jgcver          1.0.75
 
 # hard-code libdir on 64-bit architectures to make the 64-bit JDK
 # simply be another alternative
@@ -319,7 +319,7 @@
 done
 # cacerts
 pushd $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security
-  %{__perl} %{SOURCE1}
+  %{__perl} $RPM_SOURCE_DIR/java-gcj-compat-%{jgcver}/generate-cacerts.pl
 popd
 
 # versionless symbolic links
@@ -715,6 +715,7 @@
 
 %changelog
 * Tue Apr 10 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-13
+- Import java-gcj-compat 1.0.75.
 - Point URL field at java-gcj-compat home page.
 - Require openssl for build.
 - Generate and include cacerts.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/java-1.5.0-gcj/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Mar 2007 18:43:43 -0000	1.4
+++ sources	10 Apr 2007 18:52:42 -0000	1.5
@@ -1 +1 @@
-beb36071b10f4c726f17741ccf4d6980  java-gcj-compat-1.0.74.tar.gz
+f42dabf8c247d18356ee1921ceedb62a  java-gcj-compat-1.0.75.tar.gz



From fedora-cvs-commits at redhat.com  Tue Apr 10 18:54:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 14:54:42 -0400
Subject: rpms/java-1.5.0-gcj/devel java-1.5.0-gcj.spec,1.15,1.16
Message-ID: <200704101854.l3AIsgls004111@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.5.0-gcj/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3861

Modified Files:
	java-1.5.0-gcj.spec 
Log Message:
- Remove Source1 field.




Index: java-1.5.0-gcj.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.5.0-gcj/devel/java-1.5.0-gcj.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- java-1.5.0-gcj.spec	10 Apr 2007 18:52:42 -0000	1.15
+++ java-1.5.0-gcj.spec	10 Apr 2007 18:54:40 -0000	1.16
@@ -62,7 +62,6 @@
 License: GPL
 URL:     http://sources.redhat.com/rhug/java-gcj-compat.html
 Source0: ftp://sources.redhat.com/pub/rhug/java-gcj-compat-%{jgcver}.tar.gz
-Source1: generate-cacerts.pl
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From fedora-cvs-commits at redhat.com  Tue Apr 10 18:58:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 14:58:42 -0400
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.81,1.82
Message-ID: <200704101858.l3AIwg9f007163@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7116

Modified Files:
	kexec-tools.spec 
Log Message:
Resolves: bz235608


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- kexec-tools.spec	10 Apr 2007 18:09:16 -0000	1.81
+++ kexec-tools.spec	10 Apr 2007 18:58:40 -0000	1.82
@@ -120,9 +120,7 @@
 %patch305 -p1
 %patch306 -p1
 %patch307 -p1
-%ifarch ppc
 %patch308 -p1
-%endif
 %patch401 -p1
 %patch501 -p1
 %patch601 -p1



From fedora-cvs-commits at redhat.com  Tue Apr 10 19:07:24 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 15:07:24 -0400
Subject: rpms/java-1.5.0-gcj/devel java-1.5.0-gcj.spec,1.16,1.17
Message-ID: <200704101907.l3AJ7OrC013358@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.5.0-gcj/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13187

Modified Files:
	java-1.5.0-gcj.spec 
Log Message:
- Fix generate-cacerts.pl invocation.




Index: java-1.5.0-gcj.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.5.0-gcj/devel/java-1.5.0-gcj.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- java-1.5.0-gcj.spec	10 Apr 2007 18:54:40 -0000	1.16
+++ java-1.5.0-gcj.spec	10 Apr 2007 19:07:22 -0000	1.17
@@ -317,9 +317,8 @@
 EOF
 done
 # cacerts
-pushd $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security
-  %{__perl} $RPM_SOURCE_DIR/java-gcj-compat-%{jgcver}/generate-cacerts.pl
-popd
+%{__perl} generate-cacerts.pl
+install -m 644 cacerts $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security
 
 # versionless symbolic links
 pushd $RPM_BUILD_ROOT%{_jvmdir}



From fedora-cvs-commits at redhat.com  Tue Apr 10 19:12:51 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 15:12:51 -0400
Subject: rpms/selinux-policy/FC-6 modules-targeted.conf, 1.42,
	1.43 policy-20061106.patch, 1.32, 1.33 selinux-policy.spec,
	1.355, 1.356
Message-ID: <200704101912.l3AJCpwt017791@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	modules-targeted.conf policy-20061106.patch 
	selinux-policy.spec 
Log Message:
* Mon Apr 10 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-54
- syslog needs to be run as SystemHigh
- Fix file context mapping
Resolves: #235725
- Add apcupsd policy



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/modules-targeted.conf,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- modules-targeted.conf	28 Mar 2007 13:15:07 -0000	1.42
+++ modules-targeted.conf	10 Apr 2007 19:12:48 -0000	1.43
@@ -1185,3 +1185,11 @@
 #  File System in Userspace (FUSE) utilities
 # 
 fusermount = base
+
+# Layer: services
+# Module: apcupsd
+#
+# daemon for most APC???s UPS for Linux
+#
+apcupsd = module
+

policy-20061106.patch:
 Rules.modular                                |   10 
 config/appconfig-strict-mcs/seusers          |    1 
 config/appconfig-strict-mls/default_contexts |    6 
 config/appconfig-strict-mls/seusers          |    1 
 config/appconfig-strict/seusers              |    1 
 man/man8/kerberos_selinux.8                  |    2 
 policy/flask/access_vectors                  |    2 
 policy/global_tunables                       |   89 ++++
 policy/mls                                   |   31 +
 policy/modules/admin/acct.te                 |    1 
 policy/modules/admin/amanda.if               |   17 
 policy/modules/admin/amanda.te               |    6 
 policy/modules/admin/amtu.fc                 |    3 
 policy/modules/admin/amtu.if                 |   57 ++
 policy/modules/admin/amtu.te                 |   56 ++
 policy/modules/admin/backup.te               |    5 
 policy/modules/admin/bootloader.fc           |    5 
 policy/modules/admin/bootloader.te           |   14 
 policy/modules/admin/consoletype.te          |   21 
 policy/modules/admin/ddcprobe.te             |   10 
 policy/modules/admin/dmesg.te                |    7 
 policy/modules/admin/dmidecode.te            |    5 
 policy/modules/admin/firstboot.if            |    6 
 policy/modules/admin/kudzu.te                |   11 
 policy/modules/admin/logrotate.te            |    5 
 policy/modules/admin/logwatch.te             |   12 
 policy/modules/admin/netutils.te             |   13 
 policy/modules/admin/portage.te              |    5 
 policy/modules/admin/prelink.te              |   18 
 policy/modules/admin/quota.fc                |    7 
 policy/modules/admin/quota.te                |   24 -
 policy/modules/admin/rpm.fc                  |    3 
 policy/modules/admin/rpm.if                  |   43 ++
 policy/modules/admin/rpm.te                  |   49 --
 policy/modules/admin/su.if                   |   28 -
 policy/modules/admin/su.te                   |    2 
 policy/modules/admin/sudo.if                 |   10 
 policy/modules/admin/tripwire.te             |   11 
 policy/modules/admin/usbmodules.te           |    5 
 policy/modules/admin/usermanage.if           |    1 
 policy/modules/admin/usermanage.te           |   42 +
 policy/modules/admin/vpn.te                  |    1 
 policy/modules/apps/ethereal.te              |    5 
 policy/modules/apps/evolution.if             |  107 ++++-
 policy/modules/apps/evolution.te             |    1 
 policy/modules/apps/games.fc                 |    1 
 policy/modules/apps/gnome.fc                 |    2 
 policy/modules/apps/gnome.if                 |  108 +++++
 policy/modules/apps/gnome.te                 |    5 
 policy/modules/apps/gpg.if                   |    1 
 policy/modules/apps/java.fc                  |    2 
 policy/modules/apps/java.if                  |   38 +
 policy/modules/apps/java.te                  |    2 
 policy/modules/apps/loadkeys.if              |   17 
 policy/modules/apps/mozilla.if               |  210 ++++++++-
 policy/modules/apps/mplayer.if               |   84 +++
 policy/modules/apps/mplayer.te               |    1 
 policy/modules/apps/slocate.te               |    3 
 policy/modules/apps/thunderbird.if           |   81 +++
 policy/modules/apps/userhelper.if            |   19 
 policy/modules/apps/webalizer.te             |    6 
 policy/modules/apps/wine.fc                  |    1 
 policy/modules/apps/yam.te                   |    5 
 policy/modules/kernel/corecommands.fc        |   19 
 policy/modules/kernel/corecommands.if        |   77 +++
 policy/modules/kernel/corenetwork.if.in      |  140 ++++++
 policy/modules/kernel/corenetwork.te.in      |   14 
 policy/modules/kernel/devices.fc             |    8 
 policy/modules/kernel/devices.if             |   18 
 policy/modules/kernel/devices.te             |    8 
 policy/modules/kernel/domain.if              |   58 ++
 policy/modules/kernel/domain.te              |   22 +
 policy/modules/kernel/files.fc               |    2 
 policy/modules/kernel/files.if               |  224 ++++++++++
 policy/modules/kernel/filesystem.if          |   62 ++
 policy/modules/kernel/filesystem.te          |   19 
 policy/modules/kernel/kernel.if              |   84 +++
 policy/modules/kernel/kernel.te              |   22 -
 policy/modules/kernel/mls.if                 |   28 +
 policy/modules/kernel/mls.te                 |    6 
 policy/modules/kernel/storage.fc             |    3 
 policy/modules/kernel/storage.if             |    2 
 policy/modules/kernel/terminal.fc            |    1 
 policy/modules/kernel/terminal.if            |    2 
 policy/modules/kernel/terminal.te            |    1 
 policy/modules/services/aide.fc              |    4 
 policy/modules/services/aide.te              |    7 
 policy/modules/services/amavis.te            |    2 
 policy/modules/services/apache.fc            |   17 
 policy/modules/services/apache.if            |   21 
 policy/modules/services/apache.te            |   40 +
 policy/modules/services/apm.te               |    3 
 policy/modules/services/automount.fc         |    1 
 policy/modules/services/automount.te         |    9 
 policy/modules/services/avahi.if             |   40 +
 policy/modules/services/bind.fc              |    1 
 policy/modules/services/bind.te              |    5 
 policy/modules/services/bluetooth.te         |    8 
 policy/modules/services/ccs.fc               |    1 
 policy/modules/services/ccs.te               |   11 
 policy/modules/services/clamav.te            |    2 
 policy/modules/services/cron.fc              |    6 
 policy/modules/services/cron.if              |   92 ++--
 policy/modules/services/cron.te              |   52 ++
 policy/modules/services/cups.fc              |    3 
 policy/modules/services/cups.te              |    9 
 policy/modules/services/cvs.te               |    1 
 policy/modules/services/cyrus.te             |    5 
 policy/modules/services/dbus.fc              |    1 
 policy/modules/services/dbus.if              |   62 ++
 policy/modules/services/dcc.te               |    9 
 policy/modules/services/dhcp.te              |    2 
 policy/modules/services/dovecot.te           |    6 
 policy/modules/services/ftp.te               |   18 
 policy/modules/services/hal.fc               |    4 
 policy/modules/services/hal.if               |   57 ++
 policy/modules/services/hal.te               |   22 -
 policy/modules/services/inetd.te             |   28 +
 policy/modules/services/irqbalance.te        |    4 
 policy/modules/services/kerberos.if          |   25 +
 policy/modules/services/kerberos.te          |   15 
 policy/modules/services/ktalk.fc             |    3 
 policy/modules/services/ktalk.te             |    5 
 policy/modules/services/lpd.if               |   57 +-
 policy/modules/services/lpd.te               |    5 
 policy/modules/services/mta.fc               |    1 
 policy/modules/services/mta.if               |   20 
 policy/modules/services/mta.te               |    2 
 policy/modules/services/munin.te             |    5 
 policy/modules/services/networkmanager.fc    |    2 
 policy/modules/services/networkmanager.te    |    2 
 policy/modules/services/nis.fc               |    3 
 policy/modules/services/nis.if               |    8 
 policy/modules/services/nis.te               |   34 +
 policy/modules/services/nscd.if              |   20 
 policy/modules/services/nscd.te              |   24 -
 policy/modules/services/oav.te               |    5 
 policy/modules/services/oddjob.te            |    3 
 policy/modules/services/openca.if            |    4 
 policy/modules/services/openca.te            |    2 
 policy/modules/services/openvpn.te           |    4 
 policy/modules/services/pcscd.fc             |    9 
 policy/modules/services/pcscd.if             |   62 ++
 policy/modules/services/pcscd.te             |   78 +++
 policy/modules/services/pegasus.if           |   31 +
 policy/modules/services/pegasus.te           |    6 
 policy/modules/services/portmap.te           |    5 
 policy/modules/services/postfix.fc           |    1 
 policy/modules/services/postfix.if           |    3 
 policy/modules/services/postfix.te           |   21 
 policy/modules/services/procmail.te          |   28 +
 policy/modules/services/pyzor.if             |   18 
 policy/modules/services/pyzor.te             |   13 
 policy/modules/services/radius.te            |    1 
 policy/modules/services/radvd.te             |    2 
 policy/modules/services/rhgb.if              |   76 +++
 policy/modules/services/rhgb.te              |    3 
 policy/modules/services/ricci.te             |   21 
 policy/modules/services/rlogin.te            |   10 
 policy/modules/services/rpc.fc               |    1 
 policy/modules/services/rpc.if               |    3 
 policy/modules/services/rpc.te               |   26 -
 policy/modules/services/rsync.te             |    1 
 policy/modules/services/samba.fc             |    5 
 policy/modules/services/samba.if             |   41 +
 policy/modules/services/samba.te             |   51 ++
 policy/modules/services/sasl.te              |   12 
 policy/modules/services/sendmail.if          |   22 +
 policy/modules/services/sendmail.te          |    8 
 policy/modules/services/setroubleshoot.if    |   20 
 policy/modules/services/setroubleshoot.te    |    2 
 policy/modules/services/smartmon.te          |    1 
 policy/modules/services/snmp.if              |   17 
 policy/modules/services/snmp.te              |   17 
 policy/modules/services/spamassassin.fc      |    2 
 policy/modules/services/spamassassin.if      |   42 +
 policy/modules/services/spamassassin.te      |   18 
 policy/modules/services/squid.fc             |    2 
 policy/modules/services/squid.if             |   21 
 policy/modules/services/squid.te             |   11 
 policy/modules/services/ssh.if               |   83 +++
 policy/modules/services/ssh.te               |   10 
 policy/modules/services/telnet.te            |    3 
 policy/modules/services/tftp.te              |    2 
 policy/modules/services/uucp.fc              |    1 
 policy/modules/services/uucp.if              |   67 +++
 policy/modules/services/uucp.te              |   44 +-
 policy/modules/services/xserver.fc           |    2 
 policy/modules/services/xserver.if           |  190 ++++++++-
 policy/modules/services/xserver.te           |   12 
 policy/modules/system/authlogin.if           |   76 +++
 policy/modules/system/authlogin.te           |    6 
 policy/modules/system/clock.te               |   13 
 policy/modules/system/fstools.fc             |    1 
 policy/modules/system/fstools.te             |   11 
 policy/modules/system/getty.te               |   14 
 policy/modules/system/hostname.te            |   19 
 policy/modules/system/init.if                |   64 +++
 policy/modules/system/init.te                |   51 ++
 policy/modules/system/ipsec.fc               |    5 
 policy/modules/system/ipsec.if               |   99 ++++
 policy/modules/system/ipsec.te               |  122 +++++
 policy/modules/system/iptables.te            |   22 -
 policy/modules/system/libraries.fc           |   39 +
 policy/modules/system/libraries.te           |   11 
 policy/modules/system/locallogin.if          |   37 +
 policy/modules/system/locallogin.te          |    6 
 policy/modules/system/logging.fc             |    5 
 policy/modules/system/logging.te             |   27 +
 policy/modules/system/lvm.fc                 |    2 
 policy/modules/system/lvm.if                 |   44 ++
 policy/modules/system/lvm.te                 |   78 +++
 policy/modules/system/miscfiles.fc           |    3 
 policy/modules/system/miscfiles.if           |   79 +++
 policy/modules/system/modutils.te            |   25 -
 policy/modules/system/mount.te               |   27 -
 policy/modules/system/netlabel.te            |    6 
 policy/modules/system/pcmcia.te              |    5 
 policy/modules/system/raid.te                |   15 
 policy/modules/system/selinuxutil.fc         |    2 
 policy/modules/system/selinuxutil.if         |  119 +++++
 policy/modules/system/selinuxutil.te         |  124 ++---
 policy/modules/system/sysnetwork.te          |   10 
 policy/modules/system/tzdata.fc              |    3 
 policy/modules/system/tzdata.if              |   23 +
 policy/modules/system/tzdata.te              |   51 ++
 policy/modules/system/unconfined.fc          |    4 
 policy/modules/system/unconfined.if          |   19 
 policy/modules/system/unconfined.te          |   23 +
 policy/modules/system/userdomain.if          |  569 ++++++++++++++++++++++++---
 policy/modules/system/userdomain.te          |   76 +--
 policy/modules/system/xen.fc                 |    1 
 policy/modules/system/xen.te                 |   46 +-
 233 files changed, 5454 insertions(+), 620 deletions(-)

Index: policy-20061106.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-20061106.patch,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- policy-20061106.patch	10 Apr 2007 12:49:35 -0000	1.32
+++ policy-20061106.patch	10 Apr 2007 19:12:48 -0000	1.33
@@ -699,7 +699,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.4.6/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2006-11-29 12:04:49.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/logwatch.te	2007-03-20 23:21:55.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/admin/logwatch.te	2007-04-10 14:37:57.000000000 -0400
 @@ -30,6 +30,7 @@
  allow logwatch_t self:process signal;
  allow logwatch_t self:fifo_file rw_file_perms;
@@ -729,7 +729,18 @@
  
  miscfiles_read_localization(logwatch_t)
  
-@@ -126,3 +130,7 @@
+@@ -95,6 +99,10 @@
+ ')
+ 
+ optional_policy(`
++	avahi_dontaudit_search_pid(logwatch_t)
++')
++
++optional_policy(`
+ 	bind_read_config(logwatch_t)
+ 	bind_read_zone(logwatch_t)
+ ')
+@@ -126,3 +134,7 @@
  optional_policy(`
  	samba_read_log(logwatch_t)
  ')
@@ -2936,7 +2947,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.4.6/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/kernel/corenetwork.te.in	2007-04-02 13:29:59.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/kernel/corenetwork.te.in	2007-04-10 14:52:19.000000000 -0400
 @@ -48,6 +48,11 @@
  type reserved_port_t, port_type, reserved_port_type;
  
@@ -2949,7 +2960,15 @@
  # server_packet_t is the default type of IPv4 and IPv6 server packets.
  #
  type server_packet_t, packet_type, server_packet_type;
-@@ -85,7 +90,7 @@
+@@ -60,6 +65,7 @@
+ network_port(amanda, udp,10080,s0, tcp,10080,s0, udp,10081,s0, tcp,10081,s0, tcp,10082,s0, tcp,10083,s0)
+ network_port(amavisd_recv, tcp,10024,s0)
+ network_port(amavisd_send, tcp,10025,s0)
++network_port(apcupsd, tcp,3551,s0, udp,3551,s0)
+ network_port(asterisk, tcp,1720,s0, udp,2427,s0, udp,2727,s0, udp,4569,s0, udp,5060,s0)
+ network_port(auth, tcp,113,s0)
+ network_port(bgp, tcp,179,s0, udp,179,s0, tcp,2605,s0, udp,2605,s0)
+@@ -85,7 +91,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, tcp,8443,s0) #8443 is mod_nss default port
  network_port(howl, tcp,5335,s0, udp,5353,s0)
@@ -2958,7 +2977,7 @@
  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)
-@@ -110,7 +115,8 @@
+@@ -110,7 +116,8 @@
  network_port(netsupport, tcp,5405,s0, udp,5405,s0)
  network_port(nmbd, udp,137,s0, udp,138,s0, udp,139,s0)
  network_port(ntp, udp,123,s0)
@@ -2968,7 +2987,7 @@
  network_port(pegasus_http, tcp,5988,s0)
  network_port(pegasus_https, tcp,5989,s0)
  network_port(pop, tcp,106,s0, tcp,109,s0, tcp,110,s0, tcp,143,s0, tcp,220,s0, tcp,993,s0, tcp,995,s0, tcp,1109,s0)
-@@ -156,6 +162,9 @@
+@@ -156,6 +163,9 @@
  
  # Defaults for reserved ports.  Earlier portcon entries take precedence;
  # these entries just cover any remaining reserved ports not otherwise declared.
@@ -4330,8 +4349,8 @@
  fs_unmount_all_fs(automount_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.if serefpolicy-2.4.6/policy/modules/services/avahi.if
 --- nsaserefpolicy/policy/modules/services/avahi.if	2006-11-29 12:04:49.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/avahi.if	2007-03-09 13:35:58.000000000 -0500
-@@ -20,3 +20,24 @@
++++ serefpolicy-2.4.6/policy/modules/services/avahi.if	2007-04-10 14:49:32.000000000 -0400
+@@ -20,3 +20,43 @@
  	allow $1 avahi_t:dbus send_msg;
  	allow avahi_t $1:dbus send_msg;
  ')
@@ -4356,6 +4375,25 @@
 +	allow $1 avahi_var_run_t:sock_file rw_file_perms;
 +	allow $1 avahi_t:unix_stream_socket connectto;
 +')
++
++########################################
++## <summary>
++##	Do not audit attempts to search the AVAHI pid directory.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`avahi_dontaudit_search_pid',`
++	gen_require(`
++		type avahi_var_run_t;
++	')
++
++	dontaudit $1 avahi_var_run_t:dir search_dir_perms;
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.fc serefpolicy-2.4.6/policy/modules/services/bind.fc
 --- nsaserefpolicy/policy/modules/services/bind.fc	2006-11-29 12:04:49.000000000 -0500
 +++ serefpolicy-2.4.6/policy/modules/services/bind.fc	2007-03-09 13:35:58.000000000 -0500
@@ -7235,7 +7273,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-2.4.6/policy/modules/services/snmp.te
 --- nsaserefpolicy/policy/modules/services/snmp.te	2006-11-29 12:04:49.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/snmp.te	2007-03-26 13:52:41.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/services/snmp.te	2007-04-10 11:01:01.000000000 -0400
 @@ -77,6 +77,7 @@
  dev_read_sysfs(snmpd_t)
  dev_read_urand(snmpd_t)
@@ -7268,7 +7306,7 @@
  	nis_use_ypbind(snmpd_t)
  ')
  
-@@ -150,6 +157,10 @@
+@@ -150,9 +157,17 @@
  ')
  
  optional_policy(`
@@ -7279,6 +7317,13 @@
  	seutil_sigchld_newrole(snmpd_t)
  ')
  
+ optional_policy(`
++	squid_read_config(snmpd_t)
++')
++
++optional_policy(`
+ 	udev_read_db(snmpd_t)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-2.4.6/policy/modules/services/spamassassin.fc
 --- nsaserefpolicy/policy/modules/services/spamassassin.fc	2006-11-29 12:04:49.000000000 -0500
 +++ serefpolicy-2.4.6/policy/modules/services/spamassassin.fc	2007-03-09 13:35:59.000000000 -0500
@@ -9287,7 +9332,7 @@
  corecmd_read_sbin_symlinks(local_login_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.4.6/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/system/logging.fc	2007-04-09 17:10:37.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/system/logging.fc	2007-04-10 13:48:11.000000000 -0400
 @@ -26,6 +26,11 @@
  
  /var/log		-d	gen_context(system_u:object_r:var_log_t,s0-mls_systemhigh)
@@ -9295,14 +9340,14 @@
 +/var/log/messages[^/]*		gen_context(system_u:object_r:var_log_t,mls_systemhigh)
 +/var/log/secure[^/]*		gen_context(system_u:object_r:var_log_t,mls_systemhigh)
 +/var/log/cron[^/]*		gen_context(system_u:object_r:var_log_t,mls_systemhigh)
-+/var/log/messages[^/]*		gen_context(system_u:object_r:var_log_t,mls_systemhigh)
 +/var/log/maillog[^/]*		gen_context(system_u:object_r:var_log_t,mls_systemhigh)
++/var/log/spooler[^/]*		gen_context(system_u:object_r:var_log_t,mls_systemhigh)
  /var/log/audit(/.*)?		gen_context(system_u:object_r:auditd_log_t,mls_systemhigh)
  
  ifndef(`distro_gentoo',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.4.6/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/system/logging.te	2007-04-09 17:14:48.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/system/logging.te	2007-04-10 13:44:51.000000000 -0400
 @@ -53,9 +53,11 @@
  
  type var_log_t;
@@ -9333,16 +9378,18 @@
  # Create and bind to /dev/log or /var/run/log.
  allow syslogd_t devlog_t:sock_file create_file_perms;
  files_pid_filetrans(syslogd_t,devlog_t,sock_file)
-@@ -311,6 +313,8 @@
+@@ -311,6 +313,10 @@
  
  fs_search_auto_mountpoints(syslogd_t)
  
++mls_file_write_down(syslogd_t) # Need to be able to write to /var/run/ directory
 +mls_rangetrans_target(syslogd_t)
++mls_fd_use_all_levels(syslogd_t)
 +
  term_write_console(syslogd_t)
  # Allow syslog to a terminal
  term_write_unallocated_ttys(syslogd_t)
-@@ -326,6 +330,18 @@
+@@ -326,6 +332,18 @@
  corenet_udp_sendrecv_all_ports(syslogd_t)
  corenet_udp_bind_all_nodes(syslogd_t)
  corenet_udp_bind_syslogd_port(syslogd_t)
@@ -9361,7 +9408,7 @@
  # syslog-ng can send or receive logs
  corenet_sendrecv_syslogd_client_packets(syslogd_t)
  corenet_sendrecv_syslogd_server_packets(syslogd_t)
-@@ -398,3 +414,8 @@
+@@ -398,3 +416,8 @@
  	# log to the xconsole
  	xserver_rw_console(syslogd_t)
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/selinux-policy.spec,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- selinux-policy.spec	10 Apr 2007 12:49:35 -0000	1.355
+++ selinux-policy.spec	10 Apr 2007 19:12:49 -0000	1.356
@@ -17,13 +17,14 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.4.6
-Release: 52%{?dist}
+Release: 54%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
 patch: policy-20061106.patch
 patch1: policy-dccp.patch
 patch2: policy-fusermount.patch
+patch3: policy-apcupsd.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
 Source3: Makefile.devel
@@ -170,8 +171,9 @@
 %prep 
 %setup -q -n serefpolicy-%{version}
 %patch -p1
-%patch1 -p1 
+%patch1 -p1 -b .dccp
 %patch2 -p1 -b .fusermount
+%patch3 -p1 -b .apcupsd
 
 %install
 # Build targeted policy
@@ -358,6 +360,12 @@
 %endif
 
 %changelog
+* Mon Apr 10 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-54
+- syslog needs to be run as SystemHigh
+- Fix file context mapping
+Resolves: #235725
+- Add apcupsd policy
+
 * Thu Apr 5 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-52
 - Don't relabel if selinux is not enabled
 - Allow netutils to read sysfs



From fedora-cvs-commits at redhat.com  Tue Apr 10 19:15:20 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 15:15:20 -0400
Subject: rpms/selinux-policy/FC-6 policy-apcupsd.patch,NONE,1.1
Message-ID: <200704101915.l3AJFKAk019774@cvs.devel.redhat.com>

Author: dwalsh

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

Added Files:
	policy-apcupsd.patch 
Log Message:
* Mon Apr 10 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-54
- syslog needs to be run as SystemHigh
- Fix file context mapping
Resolves: #235725
- Add apcupsd policy


policy-apcupsd.patch:
 apcupsd.fc |    9 +++++
 apcupsd.if |  108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 apcupsd.te |   81 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 198 insertions(+)

--- NEW FILE policy-apcupsd.patch ---
--- serefpolicy-2.4.6/policy/modules/services/apcupsd.te.apcupsd	2007-04-10 14:44:39.000000000 -0400
+++ serefpolicy-2.4.6/policy/modules/services/apcupsd.te	2007-04-10 14:43:06.000000000 -0400
@@ -0,0 +1,81 @@
+policy_module(apcupsd,1.0.0)
+
+########################################
+#
+# Declarations
+#
+
+type apcupsd_t;
+type apcupsd_exec_t;
+domain_type(apcupsd_t)
+init_daemon_domain(apcupsd_t, apcupsd_exec_t)
+
+# pid files
+type apcupsd_var_run_t;
+files_pid_file(apcupsd_var_run_t)
+
+# log files
+type apcupsd_log_t;
+logging_log_file(apcupsd_log_t)
+
+########################################
+#
+# apcupsd local policy
+#
+
+# Init script handling
+init_use_fds(apcupsd_t)
+init_use_script_ptys(apcupsd_t)
+domain_use_interactive_fds(apcupsd_t)
+
+## internal communication is often done using fifo and unix sockets.
+allow apcupsd_t self:fifo_file rw_file_perms;
+allow apcupsd_t self:unix_stream_socket create_stream_socket_perms;
+
+files_read_etc_files(apcupsd_t)
+files_search_locks(apcupsd_t)
+
+libs_use_ld_so(apcupsd_t)
+libs_use_shared_libs(apcupsd_t)
+
+miscfiles_read_localization(apcupsd_t)
+
+ifdef(`targeted_policy',`
+	term_dontaudit_use_unallocated_ttys(apcupsd_t)
+	term_dontaudit_use_generic_ptys(apcupsd_t)
+')
+
+
+# pid file
+allow apcupsd_t apcupsd_var_run_t:file manage_file_perms;
+allow apcupsd_t apcupsd_var_run_t:dir rw_dir_perms;
+files_pid_filetrans(apcupsd_t,apcupsd_var_run_t, file)
+
+# log files
+allow apcupsd_t apcupsd_log_t:file manage_file_perms;
+allow apcupsd_t apcupsd_log_t:dir { rw_dir_perms setattr };
+logging_log_filetrans(apcupsd_t,apcupsd_log_t,{ file dir })
+
+logging_send_syslog_msg(apcupsd_t)
+
+########################################
+#
+# apcupsd_cgi Declarations
+#
+
+apache_content_template(apcupsd_cgi)
+
+# Default Networking
+sysnet_dns_name_resolve(httpd_apcupsd_cgi_script_t)
+corenet_non_ipsec_sendrecv(httpd_apcupsd_cgi_script_t)
+
+allow httpd_apcupsd_cgi_script_t self:tcp_socket create_stream_socket_perms;
+corenet_tcp_sendrecv_all_if(httpd_apcupsd_cgi_script_t)
+corenet_tcp_sendrecv_all_nodes(httpd_apcupsd_cgi_script_t)
+corenet_tcp_sendrecv_all_ports(httpd_apcupsd_cgi_script_t)
+corenet_tcp_connect_apcupsd_port(httpd_apcupsd_cgi_script_t)
+
+allow httpd_apcupsd_cgi_script_t self:udp_socket create_socket_perms;
+corenet_udp_sendrecv_all_if(httpd_apcupsd_cgi_script_t)
+corenet_udp_sendrecv_all_nodes(httpd_apcupsd_cgi_script_t)
+corenet_udp_sendrecv_all_ports(httpd_apcupsd_cgi_script_t)
--- serefpolicy-2.4.6/policy/modules/services/apcupsd.if.apcupsd	2007-04-10 14:44:42.000000000 -0400
+++ serefpolicy-2.4.6/policy/modules/services/apcupsd.if	2007-04-10 14:43:06.000000000 -0400
@@ -0,0 +1,108 @@
+
+## <summary>policy for apcupsd</summary>
+
+########################################
+## <summary>
+##	Execute a domain transition to run apcupsd.
+## </summary>
+## <param name="domain">
+## <summary>
+##	Domain allowed to transition.
+## </summary>
+## </param>
+#
+interface(`apcupsd_domtrans',`
+	gen_require(`
+		type apcupsd_t, apcupsd_exec_t;
+	')
+
+	domain_auto_trans($1,apcupsd_exec_t,apcupsd_t)
+
+	allow apcupsd_t $1:fd use;
+	allow apcupsd_t $1:fifo_file rw_file_perms;
+	allow apcupsd_t $1:process sigchld;
+')
+
+########################################
+## <summary>
+##	Read apcupsd PID files.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`apcupsd_read_pid_files',`
+	gen_require(`
+		type apcupsd_var_run_t;
+	')
+
+	files_search_pids($1)
+	allow $1 apcupsd_var_run_t:file r_file_perms;
+')
+
+
+########################################
+## <summary>
+##	Allow the specified domain to read apcupsd's log files.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <rolecap/>
+#
+interface(`apcupsd_read_log',`
+	gen_require(`
+		type apcupsd_log_t;
+	')
+
+	logging_search_logs($1)
+	allow $1 apcupsd_log_t:dir r_dir_perms;
+	allow $1 apcupsd_log_t:file { read getattr lock };
+')
+
+########################################
+## <summary>
+##	Allow the specified domain to append
+##	apcupsd log files.
+## </summary>
+## <param name="domain">
+## 	<summary>
+##	Domain allowed to transition.
+## 	</summary>
+## </param>
+#
+interface(`apcupsd_append_log',`
+	gen_require(`
+		type var_log_t, apcupsd_log_t;
+	')
+
+	logging_search_logs($1)
+	allow $1 apcupsd_log_t:dir r_dir_perms;
+	allow $1 apcupsd_log_t:file { getattr append };
+')
+
+########################################
+## <summary>
+##	Execute a domain transition to run httpd_apcupsd_cgi_script.
+## </summary>
+## <param name="domain">
+## <summary>
+##	Domain allowed to transition.
+## </summary>
+## </param>
+#
+interface(`httpd_apcupsd_cgi_script_domtrans',`
+	gen_require(`
+		type httpd_apcupsd_cgi_script_t, httpd_apcupsd_cgi_script_exec_t;
+	')
+
+	domain_auto_trans($1,httpd_apcupsd_cgi_script_exec_t,httpd_apcupsd_cgi_script_t)
+
+	allow httpd_apcupsd_cgi_script_t $1:fd use;
+	allow httpd_apcupsd_cgi_script_t $1:fifo_file rw_file_perms;
+	allow httpd_apcupsd_cgi_script_t $1:process sigchld;
+')
--- serefpolicy-2.4.6/policy/modules/services/apcupsd.fc.apcupsd	2007-04-10 14:44:36.000000000 -0400
+++ serefpolicy-2.4.6/policy/modules/services/apcupsd.fc	2007-04-10 14:43:06.000000000 -0400
@@ -0,0 +1,9 @@
+
+/usr/sbin/apcupsd		--	gen_context(system_u:object_r:apcupsd_exec_t,s0)
+/var/log/apcupsd\.events.*		--	gen_context(system_u:object_r:apcupsd_log_t,s0)
+/var/run/apcupsd\.pid		--	gen_context(system_u:object_r:apcupsd_var_run_t,s0)
+
+/var/www/apcupsd/multimon.cgi		--	gen_context(system_u:object_r:httpd_apcupsd_cgi_script_exec_t,s0)
+/var/www/apcupsd/upsfstats.cgi		--	gen_context(system_u:object_r:httpd_apcupsd_cgi_script_exec_t,s0)
+/var/www/apcupsd/upsimage.cgi		--	gen_context(system_u:object_r:httpd_apcupsd_cgi_script_exec_t,s0)
+/var/www/apcupsd/upsstats.cgi		--	gen_context(system_u:object_r:httpd_apcupsd_cgi_script_exec_t,s0)



From fedora-cvs-commits at redhat.com  Tue Apr 10 19:18:46 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 15:18:46 -0400
Subject: rpms/libgnomeui/devel libgnomeui-2.18.1-user-dirs.patch, NONE,
	1.1 libgnomeui.spec, 1.70, 1.71
Message-ID: <200704101918.l3AJIj8V022374@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomeui/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22003

Modified Files:
	libgnomeui.spec 
Added Files:
	libgnomeui-2.18.1-user-dirs.patch 
Log Message:
use DESKTOP user dir for the desktop path


libgnomeui-2.18.1-user-dirs.patch:
 gtkfilesystemgnomevfs.c |  128 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 127 insertions(+), 1 deletion(-)

--- NEW FILE libgnomeui-2.18.1-user-dirs.patch ---
--- libgnomeui-2.18.1/file-chooser/gtkfilesystemgnomevfs.c.user-dirs	2007-03-14 01:25:09.000000000 +0100
+++ libgnomeui-2.18.1/file-chooser/gtkfilesystemgnomevfs.c	2007-04-10 16:53:43.000000000 +0200
@@ -491,6 +491,132 @@
 #endif
 }
 
+
+/* copied from xdg-user-dir-lookup.c */
+static char *
+xdg_user_dir_lookup (const char *type)
+{
+  FILE *file;
+  char *home_dir, *config_home, *config_file;
+  char buffer[512];
+  char *user_dir;
+  char *p, *d;
+  int len;
+  int relative;
+  
+  home_dir = getenv ("HOME");
+
+  if (home_dir == NULL)
+    return strdup ("/tmp");
+
+  config_home = getenv ("XDG_CONFIG_HOME");
+  if (config_home == NULL || config_home[0] == 0)
+    {
+      config_file = malloc (strlen (home_dir) + strlen ("/.config/user-dirs.dirs") + 1);
+      strcpy (config_file, home_dir);
+      strcat (config_file, "/.config/user-dirs.dirs");
+    }
+  else
+    {
+      config_file = malloc (strlen (config_home) + strlen ("/user-dirs.dirs") + 1);
+      strcpy (config_file, config_home);
+      strcat (config_file, "/user-dirs.dirs");
+    }
+
+  file = fopen (config_file, "r");
+  
+  free (config_file);
+  if (file == NULL)
+    goto error;
+
+  user_dir = NULL;
+  while (fgets (buffer, sizeof (buffer), file))
+    {
+      /* Remove newline at end */
+      len = strlen (buffer);
+      if (len > 0 && buffer[len-1] == '\n')
+	buffer[len-1] = 0;
+      
+      
+      p = buffer;
+      while (*p == ' ' || *p == '\t')
+	p++;
+      
+      if (strncmp (p, "XDG_", 4) != 0)
+	continue;
+      p += 4;
+      if (strncmp (p, type, strlen (type)) != 0)
+	continue;
+      p += strlen (type);
+      if (strncmp (p, "_DIR", 4) != 0)
+	continue;
+      p += 4;
+
+      while (*p == ' ' || *p == '\t')
+	p++;
+
+      if (*p != '=')
+	continue;
+      p++;
+      
+      while (*p == ' ' || *p == '\t')
+	p++;
+
+      if (*p != '"')
+	continue;
+      p++;
+      
+      relative = 0;
+      if (strncmp (p, "$HOME/", 6) == 0)
+	{
+	  p += 6;
+	  relative = 1;
+	}
+      else if (*p != '/')
+	continue;
+      
+      if (relative)
+	{
+	  user_dir = malloc (strlen (home_dir) + 1 + strlen (p) + 1);
+	  strcpy (user_dir, home_dir);
+	  strcat (user_dir, "/");
+	}
+      else
+	{
+	  user_dir = malloc (strlen (p) + 1);
+	  *user_dir = 0;
+	}
+      
+      d = user_dir + strlen (user_dir);
+      while (*p && *p != '"')
+	{
+	  if ((*p == '\\') && (*(p+1) != 0))
+	    p++;
+	  *d++ = *p++;
+	}
+      *d = 0;
+    }  
+  fclose (file);
+
+  
+
+  if (user_dir)
+    return user_dir;
+
+ error:
+  /* Special case desktop for historical compatibility */
+  if (strcmp (type, "DESKTOP") == 0)
+    {
+      user_dir = malloc (strlen (home_dir) + strlen ("/Desktop") + 1);
+      strcpy (user_dir, home_dir);
+      strcat (user_dir, "/Desktop");
+      return user_dir;
+    }
+  else
+    return strdup (home_dir);
+}
+
+
 static void
 gtk_file_system_gnome_vfs_init (GtkFileSystemGnomeVFS *system_vfs)
 {
@@ -502,7 +628,7 @@
 #ifdef HAVE_BIND_TEXTDOMAIN_CODESET 
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 #endif
-  name = g_build_filename (g_get_home_dir (), "Desktop", NULL);
+  name = xdg_user_dir_lookup ("DESKTOP");
   system_vfs->desktop_uri = (char *)gtk_file_system_filename_to_path (GTK_FILE_SYSTEM (system_vfs),
 								      name);
   g_free (name);


Index: libgnomeui.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/libgnomeui.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- libgnomeui.spec	14 Mar 2007 03:27:42 -0000	1.70
+++ libgnomeui.spec	10 Apr 2007 19:18:43 -0000	1.71
@@ -18,9 +18,11 @@
 Summary: GNOME base GUI library
 Name: libgnomeui
 Version: 2.18.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: ftp://ftp.gnome.org
 Source0: http://ftp.gnome.org/pub/gnome/sources/libgnomeui/2.18/%{name}-%{version}.tar.bz2
+Patch0: libgnomeui-2.18.1-user-dirs.patch
+
 License: LGPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -96,6 +98,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .user-dirs
 
 %build
 %configure --disable-gtk-doc --disable-static
@@ -138,6 +141,9 @@
 %{_datadir}/gtk-doc/html/libgnomeui
 
 %changelog
+* Tue Apr 10 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.1-2
+- Add user-dirs support to the gnome-vfs filechooser backend
+
 * Tue Mar 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.1-1
 - Update to 2.18.1
 



From fedora-cvs-commits at redhat.com  Tue Apr 10 19:36:24 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 15:36:24 -0400
Subject: rpms/kexec-tools/devel kexec-tools-1.101-ppc-boots-ppc64.patch, 1.1,
	1.2
Message-ID: <200704101936.l3AJaOLh020995@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14203

Modified Files:
	kexec-tools-1.101-ppc-boots-ppc64.patch 
Log Message:
Relates: bz 235608

kexec-tools-1.101-ppc-boots-ppc64.patch:
 kexec/arch/ppc64/crashdump-ppc64.h     |    4 +--
 kexec/arch/ppc64/kexec-elf-ppc64.c     |   26 +++++++++++-----------
 kexec/arch/ppc64/kexec-elf-rel-ppc64.c |    4 +--
 kexec/arch/ppc64/kexec-ppc64.c         |   38 ++++++++++++++++-----------------
 kexec/arch/ppc64/kexec-ppc64.h         |    2 -
 kexec/kexec-sha256.h                   |    4 +--
 purgatory/Makefile                     |    4 +--
 purgatory/arch/ppc64/Makefile          |    2 +
 purgatory/purgatory.c                  |    2 +
 9 files changed, 45 insertions(+), 41 deletions(-)

Index: kexec-tools-1.101-ppc-boots-ppc64.patch
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools-1.101-ppc-boots-ppc64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kexec-tools-1.101-ppc-boots-ppc64.patch	10 Apr 2007 18:09:16 -0000	1.1
+++ kexec-tools-1.101-ppc-boots-ppc64.patch	10 Apr 2007 19:36:22 -0000	1.2
@@ -1,5 +1,5 @@
---- kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-rel-ppc64.c.orig	2007-04-10 13:33:39.000000000 -0400
-+++ kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-rel-ppc64.c	2007-04-10 13:33:49.000000000 -0400
+--- kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-rel-ppc64.c.orig	2007-04-10 15:33:46.000000000 -0400
++++ kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-rel-ppc64.c	2007-04-10 15:34:06.000000000 -0400
 @@ -101,10 +101,10 @@
  		break;
  
@@ -13,8 +13,20 @@
  		break;
  
  	default:
---- kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-ppc64.c.orig	2007-04-10 13:33:39.000000000 -0400
-+++ kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-ppc64.c	2007-04-10 13:33:49.000000000 -0400
+--- kexec-tools-1.101/kexec/arch/ppc64/crashdump-ppc64.h.orig	2007-04-10 15:34:59.000000000 -0400
++++ kexec-tools-1.101/kexec/arch/ppc64/crashdump-ppc64.h	2007-04-10 15:35:16.000000000 -0400
+@@ -25,7 +25,7 @@
+ #define _ALIGN_UP(addr,size)     (((addr)+((size)-1))&(~((size)-1)))
+ #define _ALIGN_DOWN(addr,size)   ((addr)&(~((size)-1)))
+ 
+-extern unsigned long long crash_base;
+-extern unsigned long long crash_size;
++extern uint64_t crash_base;
++extern uint64_t crash_size;
+ 
+ #endif /* CRASHDUMP_PPC64_H */
+--- kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-ppc64.c.orig	2007-04-10 15:33:47.000000000 -0400
++++ kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-ppc64.c	2007-04-10 15:34:06.000000000 -0400
 @@ -42,7 +42,7 @@
  #define BOOTLOADER         "kexec"
  #define BOOTLOADER_VERSION VERSION
@@ -93,8 +105,8 @@
  	elf_rel_set_symbol(&info->rhdr, "dt_offset", &my_dt_offset,
  				sizeof(my_dt_offset));
  
---- kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.h.orig	2007-04-10 13:33:39.000000000 -0400
-+++ kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.h	2007-04-10 13:33:49.000000000 -0400
+--- kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.h.orig	2007-04-10 15:33:46.000000000 -0400
++++ kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.h	2007-04-10 15:34:06.000000000 -0400
 @@ -15,7 +15,7 @@
  void elf_ppc64_usage(void);
  void reserve(unsigned long long where, unsigned long long length);
@@ -104,8 +116,8 @@
  /* boot block version 2 as defined by the linux kernel */
  struct bootblock {
  	unsigned magic,
---- kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.c.orig	2007-04-10 13:33:39.000000000 -0400
-+++ kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.c	2007-04-10 13:36:19.000000000 -0400
+--- kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.c.orig	2007-04-10 15:33:46.000000000 -0400
++++ kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.c	2007-04-10 15:34:06.000000000 -0400
 @@ -35,12 +35,12 @@
  #include <arch/options.h>
  
@@ -235,8 +247,8 @@
  				perror(fname);
  				fclose(file);
  				closedir(cdir);
---- kexec-tools-1.101/kexec/kexec-sha256.h.orig	2007-04-10 13:33:39.000000000 -0400
-+++ kexec-tools-1.101/kexec/kexec-sha256.h	2007-04-10 13:33:49.000000000 -0400
+--- kexec-tools-1.101/kexec/kexec-sha256.h.orig	2007-04-10 15:33:46.000000000 -0400
++++ kexec-tools-1.101/kexec/kexec-sha256.h	2007-04-10 15:34:06.000000000 -0400
 @@ -2,8 +2,8 @@
  #define KEXEC_SHA256_H
  
@@ -248,8 +260,8 @@
  };
  
  #define SHA256_REGIONS 16
---- kexec-tools-1.101/purgatory/Makefile.orig	2007-04-10 13:33:39.000000000 -0400
-+++ kexec-tools-1.101/purgatory/Makefile	2007-04-10 13:33:49.000000000 -0400
+--- kexec-tools-1.101/purgatory/Makefile.orig	2007-04-10 15:33:46.000000000 -0400
++++ kexec-tools-1.101/purgatory/Makefile	2007-04-10 15:34:06.000000000 -0400
 @@ -57,9 +57,9 @@
  	$(MKDIR) -p $(@D)
  	$(CC) $(PCFLAGS) -o $@ -c $<
@@ -262,16 +274,16 @@
  
  echo::
  	@echo "PURGATORY_C_SRCS $(PURGATORY_C_SRCS)"
---- kexec-tools-1.101/purgatory/arch/ppc64/Makefile.orig	2007-04-10 13:33:39.000000000 -0400
-+++ kexec-tools-1.101/purgatory/arch/ppc64/Makefile	2007-04-10 13:33:49.000000000 -0400
+--- kexec-tools-1.101/purgatory/arch/ppc64/Makefile.orig	2007-04-10 15:33:46.000000000 -0400
++++ kexec-tools-1.101/purgatory/arch/ppc64/Makefile	2007-04-10 15:34:06.000000000 -0400
 @@ -6,3 +6,5 @@
  PURGATORY_C_SRCS += purgatory/arch/ppc64/purgatory-ppc64.c
  PURGATORY_C_SRCS += purgatory/arch/ppc64/console-ppc64.c
  PURGATORY_C_SRCS += purgatory/arch/ppc64/crashdump_backup.c
 +
 +PCFLAGS += -m64 -mcall-aixdesc
---- kexec-tools-1.101/purgatory/purgatory.c.orig	2007-04-10 13:33:39.000000000 -0400
-+++ kexec-tools-1.101/purgatory/purgatory.c	2007-04-10 13:33:49.000000000 -0400
+--- kexec-tools-1.101/purgatory/purgatory.c.orig	2007-04-10 15:33:46.000000000 -0400
++++ kexec-tools-1.101/purgatory/purgatory.c	2007-04-10 15:34:06.000000000 -0400
 @@ -46,3 +46,5 @@
  	verify_sha256_digest();
  	post_verification_setup_arch();



From fedora-cvs-commits at redhat.com  Tue Apr 10 19:47:25 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 15:47:25 -0400
Subject: rpms/kexec-tools/devel kexec-tools-1.101-ppc64-align-dtstruct.patch,
	NONE, 1.1 kexec-tools-1.101-ppc64-bootargs-align.patch, NONE,
	1.1 kexec-tools.spec, 1.82, 1.83
Message-ID: <200704101947.l3AJlPMc030737@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30718

Modified Files:
	kexec-tools.spec 
Added Files:
	kexec-tools-1.101-ppc64-align-dtstruct.patch 
	kexec-tools-1.101-ppc64-bootargs-align.patch 
Log Message:
fix ppc64 device-tree and bootargs alignment

kexec-tools-1.101-ppc64-align-dtstruct.patch:
 fs2dt.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kexec-tools-1.101-ppc64-align-dtstruct.patch ---
--- kexec-tools-1.101/kexec/arch/ppc64/fs2dt.c~	2006-04-27 15:01:55.000000000 +0900
+++ kexec-tools-1.101/kexec/arch/ppc64/fs2dt.c	2006-05-08 14:15:50.571330714 +0900
@@ -61,7 +61,8 @@
 struct stat statbuf[1];
 char pathname[MAXPATH], *pathstart;
 char propnames[NAMESPACE];
-dvt dtstruct[TREEWORDS], *dt;
+dvt dtstruct[TREEWORDS] __attribute((aligned(8)));
+dvt *dt;
 unsigned long long mem_rsrv[2*MEMRESERVE];
 
 static int initrd_found = 0;

kexec-tools-1.101-ppc64-bootargs-align.patch:
 fs2dt.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE kexec-tools-1.101-ppc64-bootargs-align.patch ---
--- kexec-tools-1.101/kexec/arch/ppc64/fs2dt.c.org	2006-04-26 13:12:55.515946645 +0900
+++ kexec-tools-1.101/kexec/arch/ppc64/fs2dt.c	2006-04-26 13:50:00.665270758 +0900
@@ -275,6 +275,8 @@
 				strcat(local_cmdline, " ");
 				cmd_len = strlen(local_cmdline);
 				cmd_len = cmd_len + 1;
+				if ((cmd_len >= 8) && ((unsigned long)dt & 0x4))
+					dt++;
 				memcpy(dt,local_cmdline,cmd_len);
 				len = cmd_len;
 				*dt_len = cmd_len;


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- kexec-tools.spec	10 Apr 2007 18:58:40 -0000	1.82
+++ kexec-tools.spec	10 Apr 2007 19:47:22 -0000	1.83
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 67%{?dist}
+Release: 68%{?dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -66,6 +66,8 @@
 Patch306: kexec-tools-1.101-ppc64-memory_regions.patch
 Patch307: kexec-tools-1.101-ppc64_rmo_top.patch
 Patch308: kexec-tools-1.101-ppc-boots-ppc64.patch
+Patch309: kexec-tools-1.101-ppc64-align-dtstruct.patch
+Patch310: kexec-tools-1.101-ppc64-bootargs-align.patch
 
 #
 # Patches 401 through 500 are meant for s390 kexec-tools enablement
@@ -121,6 +123,8 @@
 %patch306 -p1
 %patch307 -p1
 %patch308 -p1
+%patch309 -p1
+%patch310 -p1 
 %patch401 -p1
 %patch501 -p1
 %patch601 -p1
@@ -247,6 +251,9 @@
 %doc kexec-kdump-howto.txt
 
 %changelog
+* Tue Apr 10 2007 Neil Horman <nhorman at redhat.com> - 1.101-68%{dist}
+- Fix alignment of bootargs and device-tree structures on ppc64
+
 * Tue Apr 10 2007 Neil Horman <nhorman at redhat.com> - 1.101-67%{dist}
 - Allow ppc to boot ppc64 kernels (bz 235608)
 



From fedora-cvs-commits at redhat.com  Tue Apr 10 19:48:54 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 15:48:54 -0400
Subject: rpms/gtk2/devel gtk+-2.10.11-user-dirs.patch, NONE, 1.1 gtk2.spec,
	1.221, 1.222
Message-ID: <200704101948.l3AJmsVt030811@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gtk2.spec 
Added Files:
	gtk+-2.10.11-user-dirs.patch 
Log Message:
Support xdg-user-dirs in the file chooser


gtk+-2.10.11-user-dirs.patch:
 Makefile.am             |    1 
 gtkfilechooserbutton.c  |   12 ++-
 gtkfilechooserdefault.c |   23 +++----
 gtkfilesystemunix.c     |    4 -
 gtkpathbar.c            |    6 +
 xdg-user-dir-lookup.c   |  150 ++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 179 insertions(+), 17 deletions(-)

--- NEW FILE gtk+-2.10.11-user-dirs.patch ---
--- gtk+-2.10.11/gtk/Makefile.am.user-dirs	2007-04-10 20:50:54.000000000 +0200
+++ gtk+-2.10.11/gtk/Makefile.am	2007-04-10 20:50:54.000000000 +0200
@@ -598,6 +598,7 @@
 	gtkwidget.c		\
 	gtkwindow-decorate.c    \
 	gtkwindow.c		\
+	xdg-user-dir-lookup.c	\
 	$(gtk_clipboard_dnd_c_sources)
 gtk_c_sources = $(gtk_base_c_sources)
 gtk_all_c_sources = $(gtk_base_c_sources)
--- gtk+-2.10.11/gtk/gtkpathbar.c.user-dirs	2007-03-14 05:07:01.000000000 +0100
+++ gtk+-2.10.11/gtk/gtkpathbar.c	2007-04-10 20:50:54.000000000 +0200
@@ -1586,6 +1586,8 @@
   return TRUE;
 }
 
+char *_xdg_user_dir_lookup (const char *type);
+
 /* FIXME: This should be a construct-only property */
 void
 _gtk_path_bar_set_file_system (GtkPathBar    *path_bar,
@@ -1607,9 +1609,9 @@
       /* FIXME: Need file system backend specific way of getting the
        * Desktop path.
        */
-      desktop = g_build_filename (home, "Desktop", NULL);
+      desktop = _xdg_user_dir_lookup ("DESKTOP");
       path_bar->desktop_path = gtk_file_system_filename_to_path (path_bar->file_system, desktop);
-      g_free (desktop);
+      free (desktop);
     }
   else
     {
--- gtk+-2.10.11/gtk/gtkfilesystemunix.c.user-dirs	2007-03-14 05:07:06.000000000 +0100
+++ gtk+-2.10.11/gtk/gtkfilesystemunix.c	2007-04-10 20:50:54.000000000 +0200
@@ -1605,6 +1605,8 @@
   return filename_to_path (filename);
 }
 
+char *_xdg_user_dir_lookup (const char *type);
+
 /* Returns the name of the icon to be used for a path which is known to be a
  * directory.  This can vary for Home, Desktop, etc.
  */
@@ -1617,7 +1619,7 @@
     return "gnome-fs-directory";
 
   if (!desktop_path)
-      desktop_path = g_build_filename (g_get_home_dir (), "Desktop", NULL);
+    desktop_path = _xdg_user_dir_lookup ("DESKTOP");
 
   if (strcmp (g_get_home_dir (), path) == 0)
     return "gnome-fs-home";
--- gtk+-2.10.11/gtk/gtkfilechooserdefault.c.user-dirs	2007-04-10 20:50:54.000000000 +0200
+++ gtk+-2.10.11/gtk/gtkfilechooserdefault.c	2007-04-10 21:15:22.000000000 +0200
@@ -1767,12 +1767,14 @@
   profile_end ("end", NULL);
 }
 
+char *_xdg_user_dir_lookup (const char *type);
+
 /* Appends the ~/Desktop directory to the shortcuts model */
 static void
 shortcuts_append_desktop (GtkFileChooserDefault *impl)
 {
-  char *name;
-  const char *home;
+  char *name, *tmp;
+  const char *display_name = NULL;
   GtkFilePath *path;
 
   profile_start ("start", NULL);
@@ -1780,20 +1782,18 @@
 #ifdef G_OS_WIN32
   name = _gtk_file_system_win32_get_desktop ();
 #else
-  home = g_get_home_dir ();
-  if (home == NULL)
-    {
-      profile_end ("end - no home directory!?", NULL);
-      return;
-    }
-
-  name = g_build_filename (home, "Desktop", NULL);
+  tmp = _xdg_user_dir_lookup ("DESKTOP");
+  name = g_strdup (tmp);
+  free (tmp);
+  display_name = g_path_get_basename (name);
 #endif
 
   path = gtk_file_system_filename_to_path (impl->file_system, name);
   g_free (name);
 
-  shortcuts_insert_path (impl, -1, SHORTCUT_TYPE_PATH, NULL, path, _("Desktop"), FALSE, SHORTCUTS_DESKTOP);
+  shortcuts_insert_path (impl, -1, SHORTCUT_TYPE_PATH, NULL, path, 
+                         display_name ? display_name : _("Desktop"), 
+                         FALSE, SHORTCUTS_DESKTOP);
   impl->has_desktop = TRUE;
 
   /* We do not actually pop up an error dialog if there is no desktop directory
@@ -1801,6 +1801,7 @@
    */
 
   gtk_file_path_free (path);
+  g_free (display_name);
 
   profile_end ("end", NULL);
 }
--- /dev/null	2007-04-10 17:42:06.546489881 +0200
+++ gtk+-2.10.11/gtk/xdg-user-dir-lookup.c	2007-04-10 20:50:54.000000000 +0200
@@ -0,0 +1,150 @@
+/*
+  This file is not licenced under the GPL like the rest of the code.
+  Its is under the MIT license, to encourage reuse by cut-and-paste.
+
+  Copyright (c) 2007 Red Hat, inc
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions: 
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software. 
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+char *
+_xdg_user_dir_lookup (const char *type)
+{
+  FILE *file;
+  char *home_dir, *config_home, *config_file;
+  char buffer[512];
+  char *user_dir;
+  char *p, *d;
+  int len;
+  int relative;
+  
+  home_dir = getenv ("HOME");
+
+  if (home_dir == NULL)
+    return strdup ("/tmp");
+
+  config_home = getenv ("XDG_CONFIG_HOME");
+  if (config_home == NULL || config_home[0] == 0)
+    {
+      config_file = malloc (strlen (home_dir) + strlen ("/.config/user-dirs.dirs") + 1);
+      strcpy (config_file, home_dir);
+      strcat (config_file, "/.config/user-dirs.dirs");
+    }
+  else
+    {
+      config_file = malloc (strlen (config_home) + strlen ("/user-dirs.dirs") + 1);
+      strcpy (config_file, config_home);
+      strcat (config_file, "/user-dirs.dirs");
+    }
+
+  file = fopen (config_file, "r");
+  free (config_file);
+  if (file == NULL)
+    goto error;
+
+  user_dir = NULL;
+  while (fgets (buffer, sizeof (buffer), file))
+    {
+      /* Remove newline at end */
+      len = strlen (buffer);
+      if (len > 0 && buffer[len-1] == '\n')
+	buffer[len-1] = 0;
+      
+      p = buffer;
+      while (*p == ' ' || *p == '\t')
+	p++;
+      
+      if (strncmp (p, "XDG_", 4) != 0)
+	continue;
+      p += 4;
+      if (strncmp (p, type, strlen (type)) != 0)
+	continue;
+      p += strlen (type);
+      if (strncmp (p, "_DIR", 4) != 0)
+	continue;
+      p += 4;
+
+      while (*p == ' ' || *p == '\t')
+	p++;
+
+      if (*p != '=')
+	continue;
+      p++;
+      
+      while (*p == ' ' || *p == '\t')
+	p++;
+
+      if (*p != '"')
+	continue;
+      p++;
+      
+      relative = 0;
+      if (strncmp (p, "$HOME/", 6) == 0)
+	{
+	  p += 6;
+	  relative = 1;
+	}
+      else if (*p != '/')
+	continue;
+      
+      if (relative)
+	{
+	  user_dir = malloc (strlen (home_dir) + 1 + strlen (p) + 1);
+	  strcpy (user_dir, home_dir);
+	  strcat (user_dir, "/");
+	}
+      else
+	{
+	  user_dir = malloc (strlen (p) + 1);
+	  *user_dir = 0;
+	}
+      
+      d = user_dir + strlen (user_dir);
+      while (*p && *p != '"')
+	{
+	  if ((*p == '\\') && (*(p+1) != 0))
+	    p++;
+	  *d++ = *p++;
+	}
+      *d = 0;
+    }  
+  fclose (file);
+
+  if (user_dir)
+    return user_dir;
+
+ error:
+  /* Special case desktop for historical compatibility */
+  if (strcmp (type, "DESKTOP") == 0)
+    {
+      user_dir = malloc (strlen (home_dir) + strlen ("/Desktop") + 1);
+      strcpy (user_dir, home_dir);
+      strcat (user_dir, "/Desktop");
+      return user_dir;
+    }
+  else
+    return strdup (home_dir);
+}
--- gtk+-2.10.11/gtk/gtkfilechooserbutton.c.user-dirs	2007-03-14 05:07:03.000000000 +0100
+++ gtk+-2.10.11/gtk/gtkfilechooserbutton.c	2007-04-10 21:15:42.000000000 +0200
@@ -65,7 +65,6 @@
 #define GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_FILE_CHOOSER_BUTTON, GtkFileChooserButtonPrivate))
 
 #define DEFAULT_TITLE		N_("Select A File")
-#define DESKTOP_DISPLAY_NAME	N_("Desktop")
 #define FALLBACK_DISPLAY_NAME	N_("(None)")
 #define FALLBACK_ICON_NAME	"stock_unknown"
 #define FALLBACK_ICON_SIZE	16
@@ -1642,11 +1641,14 @@
   g_object_unref (handle);
 }
 
+char *_xdg_user_dir_lookup (const char *type);
+
 static inline void
 model_add_special (GtkFileChooserButton *button)
 {
   const gchar *homedir;
   gchar *desktopdir = NULL;
+  gchar *desktopname = NULL;
   GtkListStore *store;
   GtkTreeIter iter;
   GtkFilePath *path;
@@ -1690,12 +1692,14 @@
       button->priv->n_special++;
 
 #ifndef G_OS_WIN32
-      desktopdir = g_build_filename (homedir, DESKTOP_DISPLAY_NAME, NULL);
+      desktopdir = _xdg_user_dir_lookup ("DESKTOP");
+      desktopname = g_path_get_basename (desktopdir);
 #endif
     }
 
 #ifdef G_OS_WIN32
   desktopdir = _gtk_file_system_win32_get_desktop ();
+  desktopname = NULL;
 #endif
 
   if (desktopdir)
@@ -1723,7 +1727,7 @@
       gtk_list_store_set (store, &iter,
 			  TYPE_COLUMN, ROW_TYPE_SPECIAL,
 			  ICON_COLUMN, NULL,
-			  DISPLAY_NAME_COLUMN, _(DESKTOP_DISPLAY_NAME),
+			  DISPLAY_NAME_COLUMN, desktopname ? desktopname :_("Desktop"),
 			  DATA_COLUMN, path,
 			  IS_FOLDER_COLUMN, TRUE,
 			  HANDLE_COLUMN, handle,
@@ -1731,6 +1735,8 @@
 
       button->priv->n_special++;
     }
+
+  g_free (desktopname);
 }
 
 static void


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- gtk2.spec	9 Apr 2007 21:30:31 -0000	1.221
+++ gtk2.spec	10 Apr 2007 19:48:52 -0000	1.222
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: http://ftp.gnome.org/pub/gnome/sources/gtk+/2.10/gtk+-%{version}.tar.bz2
@@ -37,6 +37,7 @@
 Patch10: gtk+-2.10.4-im-reset.patch
 # fixed in upstream cvs
 Patch11: raw-printers.patch
+Patch12: gtk+-2.10.11-user-dirs.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -123,6 +124,7 @@
 %patch7 -p1 -b .cursor-blink
 %patch10 -p1 -b .im-reset
 %patch11 -p1 -b .raw-printers
+%patch12 -p1 -b .user-dirs
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -289,6 +291,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Tue Apr 10 2007 Matthias Clasen <mclasen at redhat.com> - 1.10.11-5
+- Use DESKTOP xdg-user-dir in the file chooser
+
 * Mon Apr  9 2007 Matthias Clasen <mclasen at redhat.com> - 1.10.11-4
 - Fix a memory leak in the search patch
 



From fedora-cvs-commits at redhat.com  Tue Apr 10 20:20:05 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 16:20:05 -0400
Subject: rpms/evolution-data-server/devel evolution-data-server.spec,
	1.157.2.2, 1.157.2.3
Message-ID: <200704102020.l3AKK5lE000406@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
      Tag: private-e-d-s-sanity-1_10_0-5-branch
	evolution-data-server.spec 
Log Message:
update



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.157.2.2
retrieving revision 1.157.2.3
diff -u -r1.157.2.2 -r1.157.2.3
--- evolution-data-server.spec	6 Apr 2007 07:30:23 -0000	1.157.2.2
+++ evolution-data-server.spec	10 Apr 2007 20:20:03 -0000	1.157.2.3
@@ -25,8 +25,8 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 1.10.0
-Release: 6%{?dist}.dwmw2.1
+Version: 1.10.1
+Release: 1%{?dist}.dwmw2.1
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -78,9 +78,6 @@
 # GNOME bug #417999
 Patch23: evolution-data-server-1.10.0-code-cleanup.patch
 
-# E-D-S beeps a lot
-Patch24: evolution-data-server-1.10.0-no-more-beeps.patch
-
 Patch100: evolution-data-server-1.2.0-vcrap.patch
 Patch101: evolution-data-server-1.5.91-check-only-active-folders.patch
 
@@ -177,7 +174,6 @@
 %patch21 -p1 -b .e-passwords
 %patch22 -p1 -b .isa-support
 %patch23 -p1 -b .code-cleanup
-%patch24 -p1 -b .no-more-beeps
 %patch100 -p1 -b .vcrap
 %patch101 -p1 -b .checksub
 
@@ -397,6 +393,10 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 1.10.1-1.fc7
+- Update to 1.10.1
+- Remove evolution-data-server-1.10.0-no-more-beeps.patch (fixed upstream).
+
 * Wed Apr 04 2007 Matthew Barnes <mbarnes at redhat.com> - 1.10.0-6.fc7
 - Revise patch for GNOME bug #417999 (another ESourceComboBox goof).
 



From fedora-cvs-commits at redhat.com  Tue Apr 10 20:23:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 16:23:09 -0400
Subject: rpms/evolution/devel evolution.spec,1.234.2.4,1.234.2.5
Message-ID: <200704102023.l3AKN9He000584@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
      Tag: private-evo-sanity-2_10_0-branch
	evolution.spec 
Log Message:
update



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.234.2.4
retrieving revision 1.234.2.5
diff -u -r1.234.2.4 -r1.234.2.5
--- evolution.spec	5 Apr 2007 01:08:41 -0000	1.234.2.4
+++ evolution.spec	10 Apr 2007 20:23:07 -0000	1.234.2.5
@@ -46,8 +46,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.10.0
-Release: 10%{?dist}.dwmw2.1
+Version: 2.10.1
+Release: 1%{?dist}.dwmw2.1
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -158,23 +158,14 @@
 # GNOME bug #418971
 Patch47: evolution-2.10.0-drop-old-glib-support.patch
 
-# CVE-2007-1002
-Patch48: evolution-2.10.0-CVE-2007-1002.patch
+# GNOME bug #427939 (gnome-doc-utils)
+Patch48: evolution-2.10.1-fix-gnome-doc-utils.patch
 
-# RH bug #231767 / GNOME bug #400241
-Patch49: evolution-2.10.0-let-mail-notification-build.patch
+## Dependencies ###
 
 Patch1000: evolution-2.10.0-check-only-active-folders.patch
 Patch1002: evolution-2.6.0-improve-select-thread.patch
 
-# RH bug #235056
-Patch50: evolution-2.10.0-plugins-require-libxml2.patch
-
-# GNOME bug #352713
-Patch51: evolution-2.10.0-bold-folders.patch
-
-## Dependencies ###
-
 Requires(post): GConf2
 Requires(post): scrollkeeper >= %{scrollkeeper_version}
 Requires(postun): scrollkeeper >= %{scrollkeeper_version}
@@ -325,10 +316,7 @@
 %patch45 -p1 -b .shell-main-cleanups
 %patch46 -p1 -b .use-glib-i18n
 %patch47 -p1 -b .drop-old-glib-support
-%patch48 -p1 -b .CVE-2007-1002
-%patch49 -p1 -b .let-mail-notification-build
-%patch50 -p1 -b .plugins-require-libxml2
-%patch51 -p1 -b .bold-folders
+%patch48 -p1 -b .fix-gnome-doc-utils
 
 %patch1000 -p1
 %patch1002 -p1
@@ -748,6 +736,14 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-1.fc7
+- Update to 2.10.1
+- Fix buggy gnome-doc-utils.make (GNOME bug #427939).
+- Remove patch for CVE-2007-1002 (fixed upstream).
+- Remove patch for RH bug #231767 (fixed upstream).
+- Remove patch for RH bug #235056 (fixed upstream).
+- Remove patch for GNOME bug #352713 (fixed upstream).
+
 * Wed Apr 04 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.0-10.fc7
 - Add patch for GNOME bug #352713 (improve folder tree updates).
 



From fedora-cvs-commits at redhat.com  Tue Apr 10 20:23:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 16:23:32 -0400
Subject: rpms/mesa/devel mesa-6.5.2-radeon-backports-231787.patch, NONE,
	1.1 mesa.spec, 1.128, 1.129
Message-ID: <200704102023.l3AKNWXJ000653@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	mesa.spec 
Added Files:
	mesa-6.5.2-radeon-backports-231787.patch 
Log Message:
* Tue Apr 10 2007 Adam Jackson <ajax at redhat.com> 6.5.2-10
- mesa-6.5.2-radeon-backports-231787.patch: Backport various radeon bugfixes
  from git. (#231787)


mesa-6.5.2-radeon-backports-231787.patch:
 drivers/dri/r200/r200_context.c     |    6 ++++--
 drivers/dri/r200/r200_lock.c        |    1 -
 drivers/dri/r200/r200_state.c       |    2 ++
 drivers/dri/r300/radeon_context.c   |    3 +++
 drivers/dri/r300/radeon_lock.c      |    1 -
 drivers/dri/r300/radeon_state.c     |    2 ++
 drivers/dri/radeon/radeon_context.c |   10 ++++++----
 drivers/dri/radeon/radeon_lock.c    |    1 -
 drivers/dri/radeon/radeon_state.c   |    2 ++
 main/texstore.c                     |    3 ++-
 10 files changed, 21 insertions(+), 10 deletions(-)

--- NEW FILE mesa-6.5.2-radeon-backports-231787.patch ---
--- Mesa-6.5.2/src/mesa/main/texstore.c.radeon-231787	2006-11-02 17:57:11.000000000 -0500
+++ Mesa-6.5.2/src/mesa/main/texstore.c	2007-04-10 14:52:22.000000000 -0400
@@ -808,7 +808,8 @@
 
 /*    _mesa_printf("map %d %d %d %d\n", map[0], map[1], map[2], map[3]);  */
 
-   if (srcRowStride == srcWidth * srcComponents &&
+   if (srcRowStride == dstRowStride &&
+       srcRowStride == srcWidth * srcComponents &&
        dimensions < 3) {
       /* 1 and 2D images only */
       GLubyte *dstImage = (GLubyte *) dstAddr
--- Mesa-6.5.2/src/mesa/drivers/dri/r200/r200_lock.c.radeon-231787	2006-11-15 14:54:40.000000000 -0500
+++ Mesa-6.5.2/src/mesa/drivers/dri/r200/r200_lock.c	2007-04-10 14:51:44.000000000 -0400
@@ -98,7 +98,6 @@
          r200SetCliprects( rmesa, GL_FRONT_LEFT );
       r200UpdateViewportOffset( rmesa->glCtx );
       driUpdateFramebufferSize(rmesa->glCtx, drawable);
-      rmesa->lastStamp = drawable->lastStamp;
    }
 
    R200_STATECHANGE( rmesa, ctx );
--- Mesa-6.5.2/src/mesa/drivers/dri/r200/r200_state.c.radeon-231787	2006-11-15 14:54:40.000000000 -0500
+++ Mesa-6.5.2/src/mesa/drivers/dri/r200/r200_state.c	2007-04-10 14:51:44.000000000 -0400
@@ -1890,6 +1890,8 @@
 
    if (rmesa->state.scissor.enabled)
       r200RecalcScissorRects( rmesa );
+
+   rmesa->lastStamp = drawable->lastStamp;
 }
 
 
--- Mesa-6.5.2/src/mesa/drivers/dri/r200/r200_context.c.radeon-231787	2007-04-10 14:50:43.000000000 -0400
+++ Mesa-6.5.2/src/mesa/drivers/dri/r200/r200_context.c	2007-04-10 14:51:44.000000000 -0400
@@ -694,11 +694,13 @@
 				&newCtx->vbl_seq );
       }
 
+      newCtx->dri.readable = driReadPriv;
+
       if ( newCtx->dri.drawable != driDrawPriv ||
-           newCtx->dri.readable != driReadPriv ) {
+           newCtx->lastStamp != driDrawPriv->lastStamp ) {
 	 newCtx->dri.drawable = driDrawPriv;
-	 newCtx->dri.readable = driReadPriv;
 
+	 r200SetCliprects(newCtx, GL_BACK_LEFT);
 	 r200UpdateWindow( newCtx->glCtx );
 	 r200UpdateViewportOffset( newCtx->glCtx );
       }
--- Mesa-6.5.2/src/mesa/drivers/dri/r300/radeon_context.c.radeon-231787	2006-11-15 09:55:48.000000000 -0500
+++ Mesa-6.5.2/src/mesa/drivers/dri/r300/radeon_context.c	2007-04-10 14:52:07.000000000 -0400
@@ -51,6 +51,7 @@
 #include "radeon_macros.h"
 #include "radeon_reg.h"
 
+#include "radeon_state.h"
 #include "r300_state.h"
 
 #include "utils.h"
@@ -279,6 +280,8 @@
 
 			r300UpdateWindow(radeon->glCtx);
 			r300UpdateViewportOffset(radeon->glCtx);
+
+			radeonSetCliprects(radeon);
 		}
 
 		_mesa_make_current(radeon->glCtx,
--- Mesa-6.5.2/src/mesa/drivers/dri/r300/radeon_state.c.radeon-231787	2006-11-15 09:55:48.000000000 -0500
+++ Mesa-6.5.2/src/mesa/drivers/dri/r300/radeon_state.c	2007-04-10 14:52:07.000000000 -0400
@@ -185,6 +185,8 @@
 
 	if (radeon->state.scissor.enabled)
 		radeonRecalcScissorRects(radeon);
+
+	radeon->lastStamp = drawable->lastStamp;
 }
 
 
--- Mesa-6.5.2/src/mesa/drivers/dri/r300/radeon_lock.c.radeon-231787	2006-11-01 13:52:11.000000000 -0500
+++ Mesa-6.5.2/src/mesa/drivers/dri/r300/radeon_lock.c	2007-04-10 14:52:07.000000000 -0400
@@ -90,7 +90,6 @@
 #else
 		radeonUpdateScissor(radeon->glCtx);
 #endif
-		radeon->lastStamp = drawable->lastStamp;
 	}
 
 	if (sarea->ctx_owner != radeon->dri.hwContext) {
--- Mesa-6.5.2/src/mesa/drivers/dri/radeon/radeon_context.c.radeon-231787	2007-04-10 14:50:43.000000000 -0400
+++ Mesa-6.5.2/src/mesa/drivers/dri/radeon/radeon_context.c	2007-04-10 14:51:44.000000000 -0400
@@ -615,12 +615,14 @@
 	 driDrawableInitVBlank( driDrawPriv, newCtx->vblank_flags,
 				&newCtx->vbl_seq );
       }
-      
-      if ( (newCtx->dri.drawable != driDrawPriv)
-	   || (newCtx->dri.readable != driReadPriv) ) {
+
+      newCtx->dri.readable = driReadPriv;
+
+      if ( (newCtx->dri.drawable != driDrawPriv) ||
+           newCtx->lastStamp != driDrawPriv->lastStamp ) {
 	 newCtx->dri.drawable = driDrawPriv;
-	 newCtx->dri.readable = driReadPriv;
 
+	 radeonSetCliprects(newCtx);
 	 radeonUpdateWindow( newCtx->glCtx );
 	 radeonUpdateViewportOffset( newCtx->glCtx );
       }
--- Mesa-6.5.2/src/mesa/drivers/dri/radeon/radeon_state.c.radeon-231787	2006-11-01 13:52:11.000000000 -0500
+++ Mesa-6.5.2/src/mesa/drivers/dri/radeon/radeon_state.c	2007-04-10 14:51:44.000000000 -0400
@@ -1676,6 +1676,8 @@
 
    if (rmesa->state.scissor.enabled)
       radeonRecalcScissorRects( rmesa );
+
+   rmesa->lastStamp = drawable->lastStamp;
 }
 
 
--- Mesa-6.5.2/src/mesa/drivers/dri/radeon/radeon_lock.c.radeon-231787	2006-10-19 10:32:06.000000000 -0400
+++ Mesa-6.5.2/src/mesa/drivers/dri/radeon/radeon_lock.c	2007-04-10 14:51:44.000000000 -0400
@@ -96,7 +96,6 @@
       radeonSetCliprects( rmesa );
       radeonUpdateViewportOffset( rmesa->glCtx );
       driUpdateFramebufferSize(rmesa->glCtx, drawable);
-      rmesa->lastStamp = drawable->lastStamp;
    }
 
    RADEON_STATECHANGE( rmesa, ctx );


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- mesa.spec	4 Apr 2007 18:00:24 -0000	1.128
+++ mesa.spec	10 Apr 2007 20:23:30 -0000	1.129
@@ -31,7 +31,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -50,6 +50,7 @@
 Patch21: mesa-6.5.2-picify-dri-drivers.patch
 Patch22: mesa-6.5.2-hush-synthetic-visual-warning.patch
 Patch23: mesa-6.5.2-bindcontext-paranoia.patch
+Patch24: mesa-6.5.2-radeon-backports-231787.patch
 
 BuildRequires: pkgconfig
 %if %{with_dri}
@@ -167,6 +168,7 @@
 %patch21 -p1 -b .picify
 %patch22 -p1 -b .visual-warning
 %patch23 -p1 -b .bindcontext
+%patch24 -p1 -b .radeon-231787
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
 # license and are not open source/free software, so we remove them.
@@ -336,6 +338,10 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Tue Apr 10 2007 Adam Jackson <ajax at redhat.com> 6.5.2-10
+- mesa-6.5.2-radeon-backports-231787.patch: Backport various radeon bugfixes
+  from git. (#231787)
+
 * Wed Apr 04 2007 Adam Jackson <ajax at redhat.com> 6.5.2-9
 - mesa-6.5.2-bindcontext-paranoia.patch: Paper over a crash when doBindContext
   fails, to avoid, for example, crashing the server when using tdfx but



From fedora-cvs-commits at redhat.com  Tue Apr 10 20:27:03 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 16:27:03 -0400
Subject: rpms/firefox/devel firefox-redhat-default-prefs.js, 1.7,
	1.8 firefox.spec, 1.178, 1.179
Message-ID: <200704102027.l3AKR3jS000777@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	firefox-redhat-default-prefs.js firefox.spec 
Log Message:
* Tue Apr 10 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.3-3
- Ensure initial homepage on all locales is our proper default



Index: firefox-redhat-default-prefs.js
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox-redhat-default-prefs.js,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- firefox-redhat-default-prefs.js	24 Oct 2006 18:57:43 -0000	1.7
+++ firefox-redhat-default-prefs.js	10 Apr 2007 20:27:00 -0000	1.8
@@ -4,7 +4,7 @@
 pref("browser.link.open_external",          3);
 pref("browser.startup.homepage", "file:///usr/share/doc/HTML/index.html");
 pref("startup.homepage_override_url", "file:///usr/share/doc/HTML/index.html");
-pref("startup.homepage_welcome_url, "file:///usr/share/doc/HTML/index.html");
+pref("startup.homepage_welcome_url", "file:///usr/share/doc/HTML/index.html");
 pref("general.smoothScroll",                true);
 pref("general.useragent.vendor", "Fedora");
 pref("general.useragent.vendorSub", "FIREFOX_RPM_VR");


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- firefox.spec	25 Mar 2007 22:40:33 -0000	1.178
+++ firefox.spec	10 Apr 2007 20:27:00 -0000	1.179
@@ -12,7 +12,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        2.0.0.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -281,7 +281,11 @@
   %{__mkdir_p} $langtmp
   jarfile=$extensiondir/chrome/$language.jar
   unzip $jarfile -d $langtmp
-  sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{indexhtml}|g;" $langtmp/locale/browser-region/region.properties
+
+  sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{indexhtml}|g;" \
+         -e "s|startup.homepage_override_url.*$|startup.homepage_override_url=%{indexhtml}|g;" \
+       > $langtmp/locale/browser-region/region.properties
+
   find $langtmp -type f | xargs chmod 644
   %{__rm} -rf $jarfile
   cd $langtmp
@@ -416,6 +420,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Apr 10 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.3-3
+- Ensure initial homepage on all locales is our proper default
+
 * Sun Mar 25 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.3-2
 - Fix the symlink to default bookmarks
 - Use mktemp for temp dirs



From fedora-cvs-commits at redhat.com  Tue Apr 10 20:52:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 16:52:45 -0400
Subject: rpms/vixie-cron/devel vixie-cron-4.1-hardlink.patch, NONE,
	1.1 vixie-cron.spec, 1.96, 1.97
Message-ID: <200704102052.l3AKqjlF030178@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30061

Modified Files:
	vixie-cron.spec 
Added Files:
	vixie-cron-4.1-hardlink.patch 
Log Message:
Add patch


vixie-cron-4.1-hardlink.patch:
 database.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE vixie-cron-4.1-hardlink.patch ---
--- vixie-cron-4.1/database.c.link	2007-03-27 17:59:59.000000000 +0200
+++ vixie-cron-4.1/database.c	2007-04-10 22:40:37.000000000 +0200
@@ -256,7 +256,7 @@
 		    log_it(fname, getpid(), "WRONG FILE OWNER", tabname);
 		    goto next_crontab;
 	    }
-	    if (statbuf->st_nlink != 1) {
+	    if (pw && statbuf->st_nlink != 1) {
 		    log_it(fname, getpid(), "BAD LINK COUNT", tabname);
 		    goto next_crontab;
 	    }


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- vixie-cron.spec	5 Apr 2007 08:05:40 -0000	1.96
+++ vixie-cron.spec	10 Apr 2007 20:52:43 -0000	1.97
@@ -10,7 +10,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times
 Name: vixie-cron
 Version: 4.1
-Release: 80%{?dist}
+Release: 81%{?dist}
 Epoch: 4
 License: BSD
 Group: System Environment/Base
@@ -84,6 +84,7 @@
 Patch64: vixie-cron-4.1-_62newyear.patch
 Patch65: vixie-cron-4.1-_63newavc.patch
 Patch66: vixie-cron-4.1-bz220376.patch
+Patch67: vixie-cron-4.1-hardlink.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: syslog, bash >= 2.0
@@ -191,6 +192,7 @@
 %patch64 -p1 -b ._62newyear
 %patch65 -p1 -b ._63newavc
 %patch66 -p1 -b .bz220376
+%patch67 -p1 -b .link
 
 %build
 # RPM_OPT_FLAGS are better here, because we don't have configure for set up variables ;-)
@@ -262,6 +264,10 @@
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Tue Apr 10 2007 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-81
+- hard link from /etc/crontab cause stop running jobs
+- rhbz#235880
+
 * Thu Apr  5 2007 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-80
 - jobs from RH_CROND_DIR wasn't "sometimes" run
 - rhbz#220376



From fedora-cvs-commits at redhat.com  Tue Apr 10 20:56:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 16:56:23 -0400
Subject: rpms/firefox/devel firefox.spec,1.179,1.180
Message-ID: <200704102056.l3AKuNaQ000395@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	firefox.spec 
Log Message:
properly use sed


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- firefox.spec	10 Apr 2007 20:27:00 -0000	1.179
+++ firefox.spec	10 Apr 2007 20:56:21 -0000	1.180
@@ -284,7 +284,7 @@
 
   sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{indexhtml}|g;" \
          -e "s|startup.homepage_override_url.*$|startup.homepage_override_url=%{indexhtml}|g;" \
-       > $langtmp/locale/browser-region/region.properties
+         $langtmp/locale/browser-region/region.properties
 
   find $langtmp -type f | xargs chmod 644
   %{__rm} -rf $jarfile



From fedora-cvs-commits at redhat.com  Tue Apr 10 20:58:02 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 16:58:02 -0400
Subject: rpms/xorg-x11-server/devel xserver-1.3.0-domain-obiwan.patch, NONE,
	1.1 xserver-1.3.0-x86emu-imul-int64.patch, NONE,
	1.1 xorg-x11-server.spec, 1.217, 1.218
Message-ID: <200704102058.l3AKw2jP001733@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.3.0-domain-obiwan.patch 
	xserver-1.3.0-x86emu-imul-int64.patch 
Log Message:
* Tue Apr 10 2007 Adam Jackson <ajax at redhat.com> 1.2.99.905-3
- xserver-1.3.0-domain-obiwan.patch: Fix a PCI domain off-by-one. (#235861)
- xserver-1.3.0-x86emu-imul-int64.patch: Fix imul in x86emu. (#235861)


xserver-1.3.0-domain-obiwan.patch:
 linuxPci.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xserver-1.3.0-domain-obiwan.patch ---
commit 1b94c117e0f294ef2f89bf24d45ba7a8e45efe35
Author: Matthias Hopf <mhopf at suse.de>
Date:   Tue Oct 10 19:37:22 2006 +0200

    Fixing probably long-standing bug in domain support.

diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c
index c6dad1f..7d220d0 100644
--- a/hw/xfree86/os-support/bus/linuxPci.c
+++ b/hw/xfree86/os-support/bus/linuxPci.c
@@ -498,7 +498,7 @@ xf86GetPciDomain(PCITAG Tag)
     pPCI = xf86GetPciHostConfigFromTag(Tag);
 
     if (pPCI && (result = PCI_DOM_FROM_BUS(pPCI->busnum)))
-	return result;
+	return result + 1;
 
     if (!pPCI || pPCI->fakeDevice)
 	return 1;		/* Domain 0 is reserved */

xserver-1.3.0-x86emu-imul-int64.patch:
 prim_ops.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xserver-1.3.0-x86emu-imul-int64.patch ---
commit 2fe74ef339c3a4902ae8214f5a0454662895422c
Author: Matthias Hopf <mhopf at suse.de>
Date:   Thu Mar 15 16:56:01 2007 +0100

    Fix calculations in x86 emulator for the long long case (Andreas Schwab).

diff --git a/hw/xfree86/x86emu/prim_ops.c b/hw/xfree86/x86emu/prim_ops.c
index 461e09e..b9e7257 100644
--- a/hw/xfree86/x86emu/prim_ops.c
+++ b/hw/xfree86/x86emu/prim_ops.c
@@ -2082,7 +2082,7 @@ Implements the IMUL instruction and side effects.
 void imul_long_direct(u32 *res_lo, u32* res_hi,u32 d, u32 s)
 {
 #ifdef	__HAS_LONG_LONG__
-	s64 res = (s32)d * (s32)s;
+	s64 res = (s64)(s32)d * (s32)s;
 
 	*res_lo = (u32)res;
 	*res_hi = (u32)(res >> 32);
@@ -2174,7 +2174,7 @@ Implements the MUL instruction and side effects.
 void mul_long(u32 s)
 {
 #ifdef	__HAS_LONG_LONG__
-	u64 res = (u32)M.x86.R_EAX * (u32)s;
+	u64 res = (u64)M.x86.R_EAX * s;
 
 	M.x86.R_EAX = (u32)res;
 	M.x86.R_EDX = (u32)(res >> 32);


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- xorg-x11-server.spec	9 Apr 2007 23:09:52 -0000	1.217
+++ xorg-x11-server.spec	10 Apr 2007 20:58:00 -0000	1.218
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.2.99.905
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -29,6 +29,7 @@
 Patch15:   xorg-x11-server-1.1.1-automake-1.10-fixes.patch
 Patch18:   xorg-x11-server-1.1.1-glcore-visual-matching.patch
 Patch19:   xserver-1.3.0-xnest-exposures.patch
+Patch20:   xserver-1.3.0-x86emu-imul-int64.patch
 
 # OpenGL compositing manager feature/optimization patches.
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
@@ -61,6 +62,7 @@
 Patch2501:  xserver-1.3.0-pci-bus-count.patch
 Patch2502:  xserver-1.3.0-mmap-failure-check.patch
 Patch2503:  xserver-1.3.0-rom-search.patch
+Patch2504:  xserver-1.3.0-domain-obiwan.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -261,6 +263,7 @@
 %patch15 -p1 -b .automake-1.10
 %patch18 -p1 -b .glcore-visual
 %patch19 -p1 -b .xnest-expose
+%patch20 -p1 -b .x86emu-imul
 
 %patch100 -p0 -b .no-move-damage
 %patch101 -p0 -b .dont-backfill-bg-none
@@ -289,6 +292,7 @@
 %patch2501 -p1 -b .pci-bus-count
 %patch2502 -p1 -b .mmap-check
 %patch2503 -p1 -b .rom-search
+%patch2504 -p1 -b .domain-obiwan
 
 %build
 
@@ -547,6 +551,10 @@
 
 
 %changelog
+* Tue Apr 10 2007 Adam Jackson <ajax at redhat.com> 1.2.99.905-3
+- xserver-1.3.0-domain-obiwan.patch: Fix a PCI domain off-by-one. (#235861)
+- xserver-1.3.0-x86emu-imul-int64.patch: Fix imul in x86emu. (#235861)
+
 * Mon Apr 09 2007 Adam Jackson <ajax at redhat.com> 1.2.99.905-2
 - xserver-1.3.0-pci-bus-count.patch: Allocate the PCI bus array dynamically,
   so as not to run off the end of it.



From fedora-cvs-commits at redhat.com  Tue Apr 10 21:15:54 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 17:15:54 -0400
Subject: rpms/kernel/FC-6 linux-2.6-20.7a-ahci_ATI_SB600_workaround.patch,
	NONE, 1.1 linux-2.6-20.7a-fib_rules_fix_return_value.patch,
	NONE, 1.1 linux-2.6-20.7a-libata-lba48.patch, NONE,
	1.1 linux-2.6-20.7b-libata_blacklist.patch, NONE,
	1.1 linux-2.6-20.7b-libata_clear_tf_before_sense.patch, NONE,
	1.1 linux-2.6-20.7b-scsi_eh_scatterlist.patch, NONE,
	1.1 linux-2.6-21-rc6-readahead.patch, NONE,
	1.1 linux-2.6-21-rc6-sched_align_runqueue.patch, NONE,
	1.1 linux-2.6-gfs2-update3.patch, NONE,
	1.1 linux-2.6-i386_pci-add_debugging.patch, NONE,
	1.1 patch-2.6.20.4-5.bz2.sign, NONE,
	1.1 patch-2.6.20.5-6.bz2.sign, NONE, 1.1 .cvsignore, 1.558,
	1.559 kernel-2.6.spec, 1.2943, 1.2944 sources, 1.522,
	1.523 upstream, 1.442, 1.443 patch-2.6.20.5-rc1.bz2.sign, 1.1, NONE
Message-ID: <200704102115.l3ALFsT8014924@cvs.devel.redhat.com>

Author: cebbert

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	linux-2.6-20.7a-ahci_ATI_SB600_workaround.patch 
	linux-2.6-20.7a-fib_rules_fix_return_value.patch 
	linux-2.6-20.7a-libata-lba48.patch 
	linux-2.6-20.7b-libata_blacklist.patch 
	linux-2.6-20.7b-libata_clear_tf_before_sense.patch 
	linux-2.6-20.7b-scsi_eh_scatterlist.patch 
	linux-2.6-21-rc6-readahead.patch 
	linux-2.6-21-rc6-sched_align_runqueue.patch 
	linux-2.6-gfs2-update3.patch 
	linux-2.6-i386_pci-add_debugging.patch 
	patch-2.6.20.4-5.bz2.sign patch-2.6.20.5-6.bz2.sign 
Removed Files:
	patch-2.6.20.5-rc1.bz2.sign 
Log Message:
* Tue Apr 10 2007 Chuck Ebbert <cebbert at redhat.com>		1.2944
- 2.6.20.5
- 2.6.20.6
- GFS2 update (1414)
- additional bugfixes (1820-1828)


linux-2.6-20.7a-ahci_ATI_SB600_workaround.patch:
 ahci.c |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-20.7a-ahci_ATI_SB600_workaround.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=55a61604cd1354e1783364e1c901034f2f474b7d
Commit:     55a61604cd1354e1783364e1c901034f2f474b7d
Parent:     d7d0dad62a641c156386288a747c1a2f6bb2e42d
Author:     Conke Hu <conke.hu at gmail.com>
AuthorDate: Tue Mar 27 18:33:05 2007 +0800
Committer:  Jeff Garzik <jeff at garzik.org>
CommitDate: Wed Mar 28 02:04:27 2007 -0400

    ahci.c: walkaround for SB600 SATA internal error issue
    
       There is a HW issue in ATI SB600 SATA that PxSERR.E should not be
    set on some conditions, for example, when there is no media in SATA
    CD/DVD drive or media is not ready, AHCI controller fails to execute
    ATAPI commands and reports PORT_IRQ_TF_ERR, but ATI SB600 SATA
    controller sets PxSERR.E at the
    same time, which is not necessary.
        This patch is just to ignore the INTERNAL ERROR in such case.
    Without this patch, ahci error handler will report many errors as
    below:
        ----------- cut from dmesg -----------
    ata9: soft resetting port
    ata9: SATA link up 1.5 Gbps (SStatus 113 SControl 300)
    ata9.00: configured for UDMA/33
    ata9: EH complete
    ata9.00: exception Emask 0x40 SAct 0x0 SErr 0x800 action 0x2
    ata9.00: (irq_stat 0x40000001)
    ata9.00: cmd a0/00:00:00:00:20/00:00:00:00:00/a0 tag 0 cdb 0x0 data 0
            res 51/24:03:00:00:20/00:00:00:00:00/a0 Emask 0x40 (internal error)
    ata9: soft resetting port
    ata9: SATA link up 1.5 Gbps (SStatus 113 SControl 300)
    ata9.00: configured for UDMA/33
    ata9: EH complete
    ata9.00: exception Emask 0x40 SAct 0x0 SErr 0x800 action 0x2
    ata9.00: (irq_stat 0x40000001)
    ata9.00: cmd a0/01:00:00:00:00/00:00:00:00:00/a0 tag 0 cdb 0x43 data 12 in
            res 51/24:03:00:00:00/00:00:00:00:00/a0 Emask 0x40 (internal error)
        -------- end cut ---------
    
    Signed-off-by: Conke Hu <conke.hu at amd.com>
    Signed-off-by: Jeff Garzik <jeff at garzik.org>
---
 drivers/ata/ahci.c |   21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

--- linux-2.6.20.noarch.orig/drivers/ata/ahci.c
+++ linux-2.6.20.noarch/drivers/ata/ahci.c
@@ -82,6 +82,7 @@ enum {
 	board_ahci_pi		= 1,
 	board_ahci_vt8251	= 2,
 	board_ahci_ign_iferr	= 3,
+	board_ahci_sb600	= 4,
 
 	/* global controller registers */
 	HOST_CAP		= 0x00, /* host capabilities */
@@ -173,6 +174,7 @@ enum {
 	AHCI_FLAG_NO_NCQ		= (1 << 24),
 	AHCI_FLAG_IGN_IRQ_IF_ERR	= (1 << 25), /* ignore IRQ_IF_ERR */
 	AHCI_FLAG_HONOR_PI		= (1 << 26), /* honor PORTS_IMPL */
+	AHCI_FLAG_IGN_SERR_INTERNAL	= (1 << 27), /* ignore SERR_INTERNAL */
 };
 
 struct ahci_cmd_hdr {
@@ -365,6 +367,18 @@ static const struct ata_port_info ahci_p
 		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */
 		.port_ops	= &ahci_ops,
 	},
+	/* board_ahci_sb600 */
+	{
+		.sht		= &ahci_sht,
+		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
+				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |
+				  ATA_FLAG_SKIP_D2H_BSY |
+				  AHCI_FLAG_IGN_SERR_INTERNAL,
+		.pio_mask	= 0x1f, /* pio0-4 */
+		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */
+		.port_ops	= &ahci_ops,
+	},
+
 };
 
 static const struct pci_device_id ahci_pci_tbl[] = {
@@ -404,7 +418,7 @@ static const struct pci_device_id ahci_p
 	{ PCI_VDEVICE(JMICRON, 0x2366), board_ahci_ign_iferr }, /* JMB366 */
 
 	/* ATI */
-	{ PCI_VDEVICE(ATI, 0x4380), board_ahci }, /* ATI SB600 non-raid */
+	{ PCI_VDEVICE(ATI, 0x4380), board_ahci_sb600 }, /* ATI SB600 non-raid */
 	{ PCI_VDEVICE(ATI, 0x4381), board_ahci }, /* ATI SB600 raid */
 
 	/* VIA */
@@ -1076,8 +1090,11 @@ static void ahci_error_intr(struct ata_p
 	if (ap->flags & AHCI_FLAG_IGN_IRQ_IF_ERR)
 		irq_stat &= ~PORT_IRQ_IF_ERR;
 
-	if (irq_stat & PORT_IRQ_TF_ERR)
+	if (irq_stat & PORT_IRQ_TF_ERR) {
 		err_mask |= AC_ERR_DEV;
+		if (ap->flags & AHCI_FLAG_IGN_SERR_INTERNAL)
+			serror &= ~SERR_INTERNAL;
+	}
 
 	if (irq_stat & (PORT_IRQ_HBUS_ERR | PORT_IRQ_HBUS_DATA_ERR)) {
 		err_mask |= AC_ERR_HOST_BUS;

linux-2.6-20.7a-fib_rules_fix_return_value.patch:
 fib_rules.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-20.7a-fib_rules_fix_return_value.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=83886b6b636173b206f475929e58fac75c6f2446
Commit:     83886b6b636173b206f475929e58fac75c6f2446
Parent:     9a5ee4cc9ef8de5185114237a81f5f395e21d8fd
Author:     Steven Whitehouse <swhiteho at redhat.com>
AuthorDate: Fri Mar 30 13:34:27 2007 -0700
Committer:  David S. Miller <davem at sunset.davemloft.net>
CommitDate: Mon Apr 2 13:30:51 2007 -0700

    [NET]: Change "not found" return value for rule lookup
    
    This changes the "not found" error return for the lookup
    function to -ESRCH so that it can be distinguished from
    the case where a rule or route resulting in -ENETUNREACH
    has been found during the search.
    
    It fixes a bug where if DECnet was compiled with routing
    support, but no routes were added to the routing table,
    it was failing to fall back to endnode routing.
    
    Signed-off-by: Steven Whitehouse <swhiteho at redhat.com>
    Signed-off-by: Patrick Caulfield <pcaulfie at redhat.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>
---
 net/core/fib_rules.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index d011819..7174ced 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -143,7 +143,7 @@ int fib_rules_lookup(struct fib_rules_ops *ops, struct flowi *fl,
 		}
 	}
 
-	err = -ENETUNREACH;
+	err = -ESRCH;
 out:
 	rcu_read_unlock();
 

linux-2.6-20.7a-libata-lba48.patch:
 libata-core.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-20.7a-libata-lba48.patch ---
From: Mark Lord <liml at rtr.ca>
Date: Mon, 2 Apr 2007 20:20:35 +0000 (-0400)
Subject: 2.6.21 fix lba48 bug in libata fill_result_tf()
X-Git-Tag: v2.6.21-rc6~16^2~5
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=4742d54fa4b391342dfb8f34de14d51da101fb39

2.6.21 fix lba48 bug in libata fill_result_tf()

Current 2.6.21 libata does the following:

void ata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
{
        struct ata_ioports *ioaddr = &ap->ioaddr;

        tf->command = ata_check_status(ap);
	...
        if (tf->flags & ATA_TFLAG_LBA48) {
                iowrite8(tf->ctl | ATA_HOB, ioaddr->ctl_addr);
                tf->hob_feature = ioread8(ioaddr->error_addr);
                ...
        }
}
...
static void fill_result_tf(struct ata_queued_cmd *qc)
{
        struct ata_port *ap = qc->ap;

        ap->ops->tf_read(ap, &qc->result_tf);
        qc->result_tf.flags = qc->tf.flags;
}

Based on this, those last two statements fill_result_tf()
appear to me to be in the wrong order, in that the tf->flags
are uninitialized at the point where tf_read() is invoked.
So for lba48 commands, tf_read() won't be reading back the
full lba48 register contents..

Correct?

This patch corrects fill_result_tf() so that the flags
get copied to result_tf before they are used by tf_read().

Signed-off-by:  Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
---

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index ddb3909..e07142b 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -4717,8 +4717,8 @@ static void fill_result_tf(struct ata_queued_cmd *qc)
 {
 	struct ata_port *ap = qc->ap;
 
-	ap->ops->tf_read(ap, &qc->result_tf);
 	qc->result_tf.flags = qc->tf.flags;
+	ap->ops->tf_read(ap, &qc->result_tf);
 }
 
 /**

linux-2.6-20.7b-libata_blacklist.patch:
 libata-core.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-20.7b-libata_blacklist.patch ---
Update libata drive blacklist to the latest from 2.6.21.

[diff between 2.6.20.6 and 2.6.21-rc6; removed one
entry that required new libata features]

Signed-off-by: Chuck Ebbert <cebbert at redhat.com>

--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -3316,16 +3316,26 @@ static const struct ata_blacklist_entry 
 	{ "WPI CDD-820", 	NULL,		ATA_HORKAGE_NODMA },
 	{ "SAMSUNG CD-ROM SC-148C", NULL,	ATA_HORKAGE_NODMA },
 	{ "SAMSUNG CD-ROM SC",	NULL,		ATA_HORKAGE_NODMA },
-	{ "SanDisk SDP3B-64", 	NULL,		ATA_HORKAGE_NODMA },
 	{ "ATAPI CD-ROM DRIVE 40X MAXIMUM",NULL,ATA_HORKAGE_NODMA },
 	{ "_NEC DV5800A", 	NULL,		ATA_HORKAGE_NODMA },
 	{ "SAMSUNG CD-ROM SN-124","N001",	ATA_HORKAGE_NODMA },
 
 	/* Devices we expect to fail diagnostics */
 
 	/* Devices where NCQ should be avoided */
 	/* NCQ is slow */
         { "WDC WD740ADFD-00",   NULL,		ATA_HORKAGE_NONCQ },
+	/* http://thread.gmane.org/gmane.linux.ide/14907 */
+	{ "FUJITSU MHT2060BH",	NULL,		ATA_HORKAGE_NONCQ },
+	/* NCQ is broken */
+	{ "Maxtor 6L250S0",     "BANC1G10",     ATA_HORKAGE_NONCQ },
+	/* NCQ hard hangs device under heavier load, needs hard power cycle */
+	{ "Maxtor 6B250S0",	"BANC1B70",	ATA_HORKAGE_NONCQ },
+	/* Blacklist entries taken from Silicon Image 3124/3132
+	   Windows driver .inf file - also several Linux problem reports */
+	{ "HTS541060G9SA00",    "MB3OC60D",     ATA_HORKAGE_NONCQ, },
+	{ "HTS541080G9SA00",    "MB4OC60D",     ATA_HORKAGE_NONCQ, },
+	{ "HTS541010G9SA00",    "MBZOC60D",     ATA_HORKAGE_NONCQ, },
 
 	/* Devices with NCQ limits */
 

linux-2.6-20.7b-libata_clear_tf_before_sense.patch:
 libata-eh.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

--- NEW FILE linux-2.6-20.7b-libata_clear_tf_before_sense.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=56287768e31268969abd94b38b931a29d1ced1ce
Commit:     56287768e31268969abd94b38b931a29d1ced1ce
Parent:     7152764700559b6a4041fdaba345df9a5cd962f0
Author:     Albert Lee <albertcc at tw.ibm.com>
AuthorDate: Mon Apr 2 11:30:46 2007 +0800
Committer:  Jeff Garzik <jeff at garzik.org>
CommitDate: Wed Apr 4 02:12:27 2007 -0400

    libata: Clear tf before doing request sense (take 3)
    
    patch 2/4:
      Clear tf before doing request sense.
    
    This fixes the AOpen 56X/AKH timeout problem.
    (http://bugzilla.kernel.org/show_bug.cgi?id=8244)
    
    Signed-off-by: Albert Lee <albertcc at tw.ibm.com>
    Signed-off-by: Jeff Garzik <jeff at garzik.org>
---
 drivers/ata/libata-eh.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index c89664a..39f556c 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -982,26 +982,27 @@ static int ata_eh_read_log_10h(struct ata_device *dev,
  *	RETURNS:
  *	0 on success, AC_ERR_* mask on failure
  */
-static unsigned int atapi_eh_request_sense(struct ata_device *dev,
-					   unsigned char *sense_buf)
+static unsigned int atapi_eh_request_sense(struct ata_queued_cmd *qc)
 {
+	struct ata_device *dev = qc->dev;
+	unsigned char *sense_buf = qc->scsicmd->sense_buffer;
 	struct ata_port *ap = dev->ap;
 	struct ata_taskfile tf;
 	u8 cdb[ATAPI_CDB_LEN];
 
 	DPRINTK("ATAPI request sense\n");
 
-	ata_tf_init(dev, &tf);
-
 	/* FIXME: is this needed? */
 	memset(sense_buf, 0, SCSI_SENSE_BUFFERSIZE);
 
-	/* XXX: why tf_read here? */
-	ap->ops->tf_read(ap, &tf);
-
-	/* fill these in, for the case where they are -not- overwritten */
+	/* initialize sense_buf with the error register,
+	 * for the case where they are -not- overwritten
+	 */
 	sense_buf[0] = 0x70;
-	sense_buf[2] = tf.feature >> 4;
+	sense_buf[2] = qc->result_tf.feature >> 4;
+
+	/* some devices time out if garbage left in tf */ 
+	ata_tf_init(dev, &tf);
 
 	memset(cdb, 0, ATAPI_CDB_LEN);
 	cdb[0] = REQUEST_SENSE;
@@ -1165,8 +1166,7 @@ static unsigned int ata_eh_analyze_tf(struct ata_queued_cmd *qc,
 
 	case ATA_DEV_ATAPI:
 		if (!(qc->ap->pflags & ATA_PFLAG_FROZEN)) {
-			tmp = atapi_eh_request_sense(qc->dev,
-						     qc->scsicmd->sense_buffer);
+			tmp = atapi_eh_request_sense(qc);
 			if (!tmp) {
 				/* ATA_QCFLAG_SENSE_VALID is used to
 				 * tell atapi_qc_complete() that sense

linux-2.6-20.7b-scsi_eh_scatterlist.patch:
 scsi_error.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-20.7b-scsi_eh_scatterlist.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8cc574a3c5cea70229f243a6b57fd69e60491d82
Commit:     8cc574a3c5cea70229f243a6b57fd69e60491d82
Parent:     d80f0a4beb15d817bfbb18a29e5ffc1d9dc353ea
Author:     David S. Miller <davem at sunset.davemloft.net>
AuthorDate: Mon Apr 2 14:21:55 2007 -0700
Committer:  David S. Miller <davem at sunset.davemloft.net>
CommitDate: Mon Apr 2 14:26:22 2007 -0700

    [SCSI]: Fix scsi_send_eh_cmnd scatterlist handling
    
    This fixes a regression caused by commit:
    
    2dc611de5a3fd955cd0298c50691d4c05046db97
    
    The sense buffer code in scsi_send_eh_cmnd was changed to use
    alloc_page() and a scatter list, but the sense data copy was not
    updated to match so what we actually get in the sense buffer is total
    grabage starting with the kernel address of the struct page we got.
    Basically the stack frame of scsi_send_eh_cmd() is what ends up
    in the sense buffer.
    
    Depending upon how pointers look on a given platform, you can
    end up getting sr_ioctl.c errors when you mount a cdrom.  If
    the CDROM gives a check condition for GPCMD_GET_CONFIGURATION issued
    by drivers/cdrom/cdrom.c:cdrom_mmc_profile(), sr_ioctl will
    spit out this error message in sr_do_ioctl() with the way pointers
    are on sparc64:
    
    		default:
    			printk(KERN_ERR "%s: CDROM (ioctl) error, command: ", cd->cdi.name);
    			__scsi_print_command(cgc->cmd);
    			scsi_print_sense_hdr("sr", &sshdr);
    			err = -EIO;
    
    This is the error Tom Callaway reported in:
    
    http://marc.info/?l=linux-sparc&m=117407453208101&w=2
    
    Anyways, fix this by using page_address(sgl.page) which is OK
    because we know this is low-mem due to GFP_ATOMIC.
    
    Signed-off-by: David S. Miller <davem at davemloft.net>
    Acked-by: Christoph Hellwig <hch at lst.de>
---
 drivers/scsi/scsi_error.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index b8edcf5..918bb60 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -716,7 +716,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
 	 */
 	if (copy_sense) {
 		if (!SCSI_SENSE_VALID(scmd)) {
-			memcpy(scmd->sense_buffer, scmd->request_buffer,
+			memcpy(scmd->sense_buffer, page_address(sgl.page),
 			       sizeof(scmd->sense_buffer));
 		}
 		__free_page(sgl.page);

linux-2.6-21-rc6-readahead.patch:
 include/linux/fs.h |    1 +
 mm/filemap.c       |    9 ++++++---
 mm/readahead.c     |    3 +++
 3 files changed, 10 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-21-rc6-readahead.patch ---
Introduce ra.offset and store in it an offset where the previous read ended. This way
we can detect whether reads are really sequential (and thus we should not mark the page
as accessed repeatedly) or whether they are random and just happen to be in the same page
(and the page should really be marked accessed again).

Signed-off-by: Jan Kara <jack at suse.cz>

diff -rupX /home/jack/.kerndiffexclude linux-2.6.21-rc6/include/linux/fs.h linux-2.6.21-rc6-1-readahead/include/linux/fs.h
--- linux-2.6.21-rc6/include/linux/fs.h	2007-04-10 17:09:58.000000000 +0200
+++ linux-2.6.21-rc6-1-readahead/include/linux/fs.h	2007-04-10 17:14:42.000000000 +0200
@@ -702,6 +702,7 @@ struct file_ra_state {
 	unsigned long ra_pages;		/* Maximum readahead window */
 	unsigned long mmap_hit;		/* Cache hit stat for mmap accesses */
 	unsigned long mmap_miss;	/* Cache miss stat for mmap accesses */
+	unsigned int offset;		/* Offset where last read() ended in a page */
 };
 #define RA_FLAG_MISS 0x01	/* a cache miss occured against this file */
 #define RA_FLAG_INCACHE 0x02	/* file is already in cache */
diff -rupX /home/jack/.kerndiffexclude linux-2.6.21-rc6/mm/filemap.c linux-2.6.21-rc6-1-readahead/mm/filemap.c
--- linux-2.6.21-rc6/mm/filemap.c	2007-04-10 17:10:00.000000000 +0200
+++ linux-2.6.21-rc6-1-readahead/mm/filemap.c	2007-04-10 17:18:10.000000000 +0200
@@ -868,6 +868,7 @@ void do_generic_mapping_read(struct addr
 	unsigned long last_index;
 	unsigned long next_index;
 	unsigned long prev_index;
+	unsigned int prev_offset;
 	loff_t isize;
 	struct page *cached_page;
 	int error;
@@ -877,6 +878,7 @@ void do_generic_mapping_read(struct addr
 	index = *ppos >> PAGE_CACHE_SHIFT;
 	next_index = index;
 	prev_index = ra.prev_page;
+	prev_offset = ra.offset;
 	last_index = (*ppos + desc->count + PAGE_CACHE_SIZE-1) >> PAGE_CACHE_SHIFT;
 	offset = *ppos & ~PAGE_CACHE_MASK;
 
@@ -924,10 +926,10 @@ page_ok:
 			flush_dcache_page(page);
 
 		/*
-		 * When (part of) the same page is read multiple times
-		 * in succession, only mark it as accessed the first time.
+		 * When a sequential read accesses a page several times,
+		 * only mark it as accessed the first time.
 		 */
-		if (prev_index != index)
+		if (prev_index != index || offset != prev_offset)
 			mark_page_accessed(page);
 		prev_index = index;
 
@@ -945,6 +947,7 @@ page_ok:
 		offset += ret;
 		index += offset >> PAGE_CACHE_SHIFT;
 		offset &= ~PAGE_CACHE_MASK;
+		prev_offset = ra.offset = offset;
 
 		page_cache_release(page);
 		if (ret == nr && desc->count)
diff -rupX /home/jack/.kerndiffexclude linux-2.6.21-rc6/mm/readahead.c linux-2.6.21-rc6-1-readahead/mm/readahead.c
--- linux-2.6.21-rc6/mm/readahead.c	2007-04-10 17:10:00.000000000 +0200
+++ linux-2.6.21-rc6-1-readahead/mm/readahead.c	2007-04-10 17:14:42.000000000 +0200
@@ -207,6 +207,8 @@ out:
  *              If page_cache_readahead sees that it is again being called for
  *              a page which it just looked at, it can return immediately without
  *              making any state changes.
+ * offset:      Offset in the prev_page where the last read ended - used for
+ *              detection of sequential file reading.
  * ahead_start,
  * ahead_size:  Together, these form the "ahead window".
  * ra_pages:	The externally controlled max readahead for this fd.
@@ -473,6 +475,7 @@ page_cache_readahead(struct address_spac
 	/* Note that prev_page == -1 if it is a first read */
 	sequential = (offset == ra->prev_page + 1);
 	ra->prev_page = offset;
+	ra->offset = 0;
 
 	max = get_max_readahead(ra);
 	newsize = min(req_size, max);

linux-2.6-21-rc6-sched_align_runqueue.patch:
 sched.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-21-rc6-sched_align_runqueue.patch ---
Align the per cpu runqueue to the cacheline boundary. This will minimize the
number of cachelines touched during remote wakeup.

Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
Acked-by: Ingo Molnar <mingo at elte.hu>

--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -278,7 +278,7 @@ struct rq {
 	struct lock_class_key rq_lock_key;
 };
 
-static DEFINE_PER_CPU(struct rq, runqueues);
+static DEFINE_PER_CPU(struct rq, runqueues) ____cacheline_aligned_in_smp;
 
 static inline int cpu_of(struct rq *rq)
 {

linux-2.6-gfs2-update3.patch:
 locking/dlm/lock.c     |    4 ++--
 locking/dlm/lock_dlm.h |    2 +-
 rgrp.c                 |    5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE linux-2.6-gfs2-update3.patch ---
>From 9f95fae981198a86811d19f4ca6da7349755b210 Mon Sep 17 00:00:00 2001
From: David Teigland <teigland at redhat.com>
Date: Wed, 28 Mar 2007 11:08:04 -0500
Subject: [PATCH] [GFS2] use log_error before LM_OUT_ERROR

We always want to see the details of the error returned to gfs, but
log_debug is often turned off, so use log_error (printk).

Signed-off-by: David Teigland <teigland at redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho at redhat.com>

diff --git a/fs/gfs2/locking/dlm/lock.c b/fs/gfs2/locking/dlm/lock.c
index f9c8bda..c305255 100644
--- a/fs/gfs2/locking/dlm/lock.c
+++ b/fs/gfs2/locking/dlm/lock.c
@@ -266,7 +266,7 @@ unsigned int gdlm_do_lock(struct gdlm_lock *lp)
 	}
 
 	if (error) {
-		log_debug("%s: gdlm_lock %x,%llx err=%d cur=%d req=%d lkf=%x "
+		log_error("%s: gdlm_lock %x,%llx err=%d cur=%d req=%d lkf=%x "
 			  "flags=%lx", ls->fsname, lp->lockname.ln_type,
 			  (unsigned long long)lp->lockname.ln_number, error,
 			  lp->cur, lp->req, lp->lkf, lp->flags);
@@ -294,7 +294,7 @@ static unsigned int gdlm_do_unlock(struct gdlm_lock *lp)
 	error = dlm_unlock(ls->dlm_lockspace, lp->lksb.sb_lkid, lkf, NULL, lp);
 
 	if (error) {
-		log_debug("%s: gdlm_unlock %x,%llx err=%d cur=%d req=%d lkf=%x "
+		log_error("%s: gdlm_unlock %x,%llx err=%d cur=%d req=%d lkf=%x "
 			  "flags=%lx", ls->fsname, lp->lockname.ln_type,
 			  (unsigned long long)lp->lockname.ln_number, error,
 			  lp->cur, lp->req, lp->lkf, lp->flags);
-- 
1.4.4.2



From fedora-cvs-commits at redhat.com  Tue Apr 10 22:22:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 18:22:09 -0400
Subject: rpms/kernel/devel linux-2.6-common-uevent.patch,1.1,1.2
Message-ID: <200704102222.l3AMM9QK025632@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	linux-2.6-common-uevent.patch 
Log Message:
fix alias generation and soundbus matching

linux-2.6-common-uevent.patch:
 b/arch/powerpc/kernel/of_device.c       |   63 ++++++++++++++++++++++++++++++++
 b/include/asm-powerpc/of_device.h       |    3 +
 b/scripts/mod/file2alias.c              |   11 ++++-
 sound/aoa/soundbus/i2sbus/i2sbus-core.c |    5 +-
 4 files changed, 76 insertions(+), 6 deletions(-)

Index: linux-2.6-common-uevent.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-common-uevent.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-common-uevent.patch	19 Dec 2006 11:20:31 -0000	1.1
+++ linux-2.6-common-uevent.patch	10 Apr 2007 22:22:06 -0000	1.2
@@ -166,3 +166,52 @@
 Linuxppc-dev mailing list
 Linuxppc-dev at ozlabs.org
 https://ozlabs.org/mailman/listinfo/linuxppc-dev
+diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
+index b2f73ff..4903292 100644
+--- a/scripts/mod/file2alias.c
++++ b/scripts/mod/file2alias.c
+@@ -354,11 +354,16 @@ static int do_pcmcia_entry(const char *filename,
+ 
+ static int do_of_entry (const char *filename, struct of_device_id *of, char *alias)
+ {
++    int len;
+     char *tmp;
+-    sprintf (alias, "of:N%sT%sC%s",
++    len = sprintf (alias, "of:N%sT%s",
+                     of->name[0] ? of->name : "*",
+-                    of->type[0] ? of->type : "*",
+-                    of->compatible[0] ? of->compatible : "*");
++                    of->type[0] ? of->type : "*");
++
++    if (of->compatible[0])
++        sprintf (&alias[len], "%sC%s",
++                     of->type[0] ? "*" : "",
++                     of->compatible);
+ 
+     /* Replace all whitespace with underscores */
+     for (tmp = alias; tmp && *tmp; tmp++)
+---
+ sound/aoa/soundbus/i2sbus/i2sbus-core.c |    5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+--- wireless-dev.orig/sound/aoa/soundbus/i2sbus/i2sbus-core.c	2007-04-05 14:31:29.318552246 +0200
++++ wireless-dev/sound/aoa/soundbus/i2sbus/i2sbus-core.c	2007-04-05 14:31:45.188552246 +0200
+@@ -23,9 +23,6 @@
+ MODULE_LICENSE("GPL");
+ MODULE_AUTHOR("Johannes Berg <johannes at sipsolutions.net>");
+ MODULE_DESCRIPTION("Apple Soundbus: I2S support");
+-/* for auto-loading, declare that we handle this weird
+- * string that macio puts into the relevant device */
+-MODULE_ALIAS("of:Ni2sTi2sC");
+ 
+ static int force;
+ module_param(force, int, 0444);
+@@ -37,6 +34,8 @@ static struct of_device_id i2sbus_match[
+ 	{ }
+ };
+ 
++MODULE_DEVICE_TABLE(of, i2sbus_match);
++
+ static int alloc_dbdma_descriptor_ring(struct i2sbus_dev *i2sdev,
+ 				       struct dbdma_command_mem *r,
+ 				       int numcmds)



From fedora-cvs-commits at redhat.com  Tue Apr 10 22:42:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 18:42:01 -0400
Subject: rpms/kernel-xen-2.6/devel kernel-2.6.20-i586.config, 1.1,
	1.1.2.1 kernel-2.6.20-i686-PAE-debug.config, 1.1,
	1.1.2.1 kernel-2.6.20-i686-PAE.config, 1.1,
	1.1.2.1 kernel-2.6.20-i686-debug.config, 1.1,
	1.1.2.1 kernel-2.6.20-i686-xen.config, 1.1,
	1.1.2.1 kernel-2.6.20-i686.config, 1.1,
	1.1.2.1 kernel-2.6.20-ia64-xen.config, 1.1,
	1.1.2.1 kernel-2.6.20-ia64.config, 1.1,
	1.1.2.1 kernel-2.6.20-ppc-smp.config, 1.1,
	1.1.2.1 kernel-2.6.20-ppc.config, 1.1,
	1.1.2.1 kernel-2.6.20-ppc64-kdump.config, 1.1,
	1.1.2.1 kernel-2.6.20-ppc64.config, 1.1,
	1.1.2.1 kernel-2.6.20-ppc64iseries-kdump.config, 1.1,
	1.1.2.1 kernel-2.6.20-ppc64iseries.config, 1.1,
	1.1.2.1 kernel-2.6.20-s390.config, 1.1,
	1.1.2.1 kernel-2.6.20-s390x.config, 1.1,
	1.1.2.1 kernel-2.6.20-x86_64-debug.config, 1.1,
	1.1.2.1 kernel-2.6.20-x86_64-kdump.config, 1.1,
	1.1.2.1 kernel-2.6.20-x86_64-xen.config, 1.2,
	1.2.2.1 kernel-2.6.20-x86_64.config, 1.1, 1.1.2.1
Message-ID: <200704102242.l3AMg1Y6014638@cvs.devel.redhat.com>

Author: ehabkost

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

Modified Files:
      Tag: private-ehabkost-2_6_21-branch
	kernel-2.6.20-i586.config kernel-2.6.20-i686-PAE-debug.config 
	kernel-2.6.20-i686-PAE.config kernel-2.6.20-i686-debug.config 
	kernel-2.6.20-i686-xen.config kernel-2.6.20-i686.config 
	kernel-2.6.20-ia64-xen.config kernel-2.6.20-ia64.config 
	kernel-2.6.20-ppc-smp.config kernel-2.6.20-ppc.config 
	kernel-2.6.20-ppc64-kdump.config kernel-2.6.20-ppc64.config 
	kernel-2.6.20-ppc64iseries-kdump.config 
	kernel-2.6.20-ppc64iseries.config kernel-2.6.20-s390.config 
	kernel-2.6.20-s390x.config kernel-2.6.20-x86_64-debug.config 
	kernel-2.6.20-x86_64-kdump.config 
	kernel-2.6.20-x86_64-xen.config kernel-2.6.20-x86_64.config 
Log Message:
Updating config files according to rawhide config files

All the non-xen config files where updated with exactly the
same files from kernel/devel.

*-xen.config was updated manually, including most changes from rawhide,
but keeping some stuff that was already on kernel-xen-2.6.




Index: kernel-2.6.20-i586.config
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-2.6.20-i586.config,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- kernel-2.6.20-i586.config	22 Mar 2007 16:06:42 -0000	1.1
+++ kernel-2.6.20-i586.config	10 Apr 2007 22:41:59 -0000	1.1.2.1
@@ -57,6 +57,7 @@
 CONFIG_KMOD=y
 CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
+CONFIG_MODULE_VERIFY_ELF=y
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -68,7 +69,6 @@
 # CONFIG_PCI_MULTITHREAD_PROBE is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
-# FIXME: Was borked in .17git11 for non-acpi machines.
 # CONFIG_HOTPLUG_PCI_PCIE is not set
 CONFIG_HOTPLUG_PCI_FAKE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
@@ -105,6 +105,7 @@
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
+# CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
@@ -112,6 +113,8 @@
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_AMSO1100=m
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 
 #
 # Executable file formats
@@ -257,7 +260,7 @@
 # CONFIG_PNPBIOS is not set
 
 CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m 
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 
 #
 # Block devices
@@ -304,6 +307,11 @@
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_LSF=y
 
+CONFIG_BLK_DEV_DELKIN=m
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+
+
 #
 # ATA/ATAPI/MFM/RLL support
 #
@@ -445,22 +453,23 @@
 CONFIG_MEGARAID_SAS=m
 
 CONFIG_ATA=m
-CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_VIA=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_NV=m
 CONFIG_PDC_ADMA=m
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_QSTOR=m
+CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SIL=m
 CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
 
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
@@ -479,6 +488,7 @@
 CONFIG_PATA_HPT3X3=m
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_IT821X=m
+CONFIG_PATA_IT8213=m
 CONFIG_PATA_JMICRON=m
 # CONFIG_PATA_LEGACY is not set
 CONFIG_PATA_TRIFLEX=m
@@ -583,9 +593,9 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-CONFIG_FW=m
-CONFIG_FW_OHCI=m
-CONFIG_FW_SBP2=m
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 
 #
 # IEEE 1394 (FireWire) support
@@ -625,6 +635,7 @@
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -707,6 +718,7 @@
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -758,6 +770,7 @@
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
@@ -785,7 +798,6 @@
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_NAT=m
@@ -824,6 +836,7 @@
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RT=m
@@ -860,6 +873,7 @@
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
@@ -978,7 +992,7 @@
 
 #
 # ATM
-# 
+#
 # CONFIG_ATM_DUMMY is not set
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_LANE=m
@@ -1069,6 +1083,7 @@
 CONFIG_B44=m
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_E100=m
@@ -1086,6 +1101,7 @@
 CONFIG_SIS900=m
 CONFIG_SIS190=m
 CONFIG_EPIC100=m
+CONFIG_SC92031=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_TLAN=m
@@ -1132,6 +1148,7 @@
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y
+CONFIG_CHELSIO_T3=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1154,26 +1171,19 @@
 # CONFIG_SLIP_MODE_SLIP6 is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
+# Wireless LAN
 #
+CONFIG_WLAN_PRE80211=y
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
+CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 
-#
-# Wireless 802.11b ISA/PCI cards support
-#
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -1181,6 +1191,9 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
+CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT_COMPAT=y
+# CONFIG_NL80211 is not set
 CONFIG_IPW2100=m
 CONFIG_IPW2200=m
 # CONFIG_IPW2100_DEBUG is not set
@@ -1188,6 +1201,38 @@
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_BCM43XX_MAC80211=m
+CONFIG_BCM43XX_MAC80211_PCI=y
+CONFIG_BCM43XX_MAC80211_PCMCIA=y
+CONFIG_BCM43XX_MAC80211_DEBUG=y
+CONFIG_BCM43XX_MAC80211_DMA=y
+CONFIG_BCM43XX_MAC80211_PIO=y
+CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set
+# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set
+CONFIG_RT2X00=y
+CONFIG_RT2400PCI=m
+# CONFIG_RT2400PCI_DEBUG is not set
+CONFIG_RT2500PCI=m
+# CONFIG_RT2500PCI_DEBUG is not set
+CONFIG_RT61PCI=m
+# CONFIG_RT61PCI_DEBUG is not set
+CONFIG_RT2500USB=m
+# CONFIG_RT2500USB_DEBUG is not set
+CONFIG_RT73USB=m
+# CONFIG_RT73USB_DEBUG is not set
+CONFIG_RT2X00_DEBUGFS=m
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_ADM8211=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_ZD1211RW_MAC80211=m
+# CONFIG_ZD1211RW_MAC80211_DEBUG is not set
+CONFIG_RTL818X=y
+CONFIG_RTL8187=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_DEBUG=y
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1199,10 +1244,6 @@
 CONFIG_PRISM54=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
@@ -1397,6 +1438,7 @@
 # CAPI subsystem
 #
 CONFIG_ISDN_CAPI=m
+# CONFIG_CAPI_TRACE is not set
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
@@ -1425,6 +1467,7 @@
 
 CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M101=m
 CONFIG_GIGASET_M105=m
 # CONFIG_GIGASET_DEBUG is not set
 # CONFIG_GIGASET_UNDOCREQ is not set
@@ -1521,8 +1564,10 @@
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_INPUT_ATLAS_BTNS=m
 
 CONFIG_MAC_EMUMOUSEBTN=y
+
 #
 # Character devices
 #
@@ -1607,6 +1652,7 @@
 #
 
 CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PASEMI=m
 CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_SAVAGE4=m
 CONFIG_I2C_VOODOO3=m
@@ -1644,6 +1690,7 @@
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ATXP1=m
@@ -1764,22 +1811,22 @@
 CONFIG_RTC_INTF_SYSFS=m
 CONFIG_RTC_INTF_PROC=m
 CONFIG_RTC_INTF_DEV=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS1742=m
+# CONFIG_RTC_DRV_EP93XX is not set
+CONFIG_RTC_DRV_ISL1208=m
+# CONFIG_RTC_DRV_M48T86 is not set
 CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_RS5C372=m
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_EP93XX is not set
 # CONFIG_RTC_DRV_SA1100 is not set
 # CONFIG_RTC_DRV_TEST is not set
-
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_V3020=m
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
@@ -1811,6 +1858,7 @@
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_VIA=m
+CONFIG_DRM_NOUVEAU=m
 
 #
 # PCMCIA character devices
@@ -1959,6 +2007,7 @@
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_CXUSB=m
 CONFIG_DVB_USB_DIBUSB_MB=m
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
@@ -1966,12 +2015,17 @@
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_GL861=m
 CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_VP702X=m
 CONFIG_DVB_USB_VP7045=m
+
+CONFIG_DVB_TUNER_QT1010=m
+
 CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_LGDT330X=m
 
@@ -1982,7 +2036,6 @@
 
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
 CONFIG_VIDEO_BTCX=m
@@ -1996,18 +2049,30 @@
 # Graphics support
 #
 CONFIG_FB=y
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
+CONFIG_FB_3DFX=m
+CONFIG_FB_3DFX_ACCEL=y
+# CONFIG_FB_ARC is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+# CONFIG_FB_ASILIANT is not set
+CONFIG_FB_CIRRUS=m
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_CYBLA=m
+# CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
-CONFIG_FB_RIVA=m
-# CONFIG_FB_RIVA_DEBUG is not set
-# CONFIG_FB_RIVA_I2C is not set
 CONFIG_FB_I810=m
 CONFIG_FB_I810_GTF=y
 CONFIG_FB_I810_I2C=y
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_IMAC is not set
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_KYRO=m
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -2015,44 +2080,35 @@
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_MATROX_MULTIHEAD=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
 CONFIG_FB_RADEON=m
 # CONFIG_FB_RADEON_DEBUG is not set
 CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GX=y
+CONFIG_FB_RIVA=m
+# CONFIG_FB_RIVA_DEBUG is not set
+# CONFIG_FB_RIVA_I2C is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
 # CONFIG_FB_SIS is not set
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_VOODOO1=m
+CONFIG_FB_SM501=m
+CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_KYRO=m
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-# CONFIG_FB_ASILIANT is not set
-CONFIG_FB_3DFX_ACCEL=y
 CONFIG_FB_TRIDENT_ACCEL=y
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_TILEBLITTING=y
-# CONFIG_FB_ARC is not set
-CONFIG_FB_INTEL=m
-# CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_CYBLA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_VGA16=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_VOODOO1=m
+
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_IMAC is not set
 
 #
 # Console display driver support
@@ -2108,6 +2164,7 @@
 CONFIG_SND_MTS64=m
 # CONFIG_SND_SERIAL_U16550 is not set
 CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
 
 #
@@ -2196,10 +2253,8 @@
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
-CONFIG_USB_MULTITHREAD_PROBE=y
 
 #
 # USB Host Controller Drivers
@@ -2209,6 +2264,7 @@
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_CS=m
 
@@ -2241,11 +2297,13 @@
 # USB Human Interface Devices (HID)
 #
 CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-CONFIG_USB_HID_POWERBOOK=y
+
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y
 CONFIG_LOGITECH_FF=y
+CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
@@ -2296,6 +2354,7 @@
 # Has dumb detection, which gets loaded for every hid device.
 # CONFIG_USB_YEALINK is not set
 CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
@@ -2315,6 +2374,7 @@
 #
 CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
 
 #
 # USB port drivers
@@ -2374,7 +2434,7 @@
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_XIRCOM=m
-# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_DEBUG=m
 
 CONFIG_USB_EZUSB=y
 CONFIG_USB_EMI62=m
@@ -2391,7 +2451,9 @@
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LCD=m
-CONFIG_USB_TEST=m
+CONFIG_USB_BERRY_CHARGE=m
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
 # CONFIG_USB_GADGET is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
 # CONFIG_USB_GADGET_GOKU is not set
@@ -2429,6 +2491,7 @@
 CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_USB_LD=m
 CONFIG_USB_APPLETOUCH=m
+CONFIG_USB_GTCO=m
 CONFIG_USB_TRANCEVIBRATOR=m
 
 CONFIG_USB_TOUCHSCREEN=m
@@ -2437,6 +2500,19 @@
 CONFIG_USB_HIDINPUT_POWERBOOK=y
 
 #
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCMCIAHOST=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE=y
+
+# Multifunction USB devices
+CONFIG_MFD_SM501=m
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=m
@@ -2487,7 +2563,6 @@
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
 CONFIG_UDF_FS=m
 
 #
@@ -2524,13 +2599,14 @@
 # CONFIG_BEFS_DEBUG is not set
 CONFIG_BFS_FS=m
 CONFIG_EFS_FS=m
-# CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
@@ -2696,13 +2772,15 @@
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y
 CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DEBUG_DEVRES=y
 
 #
 # Security options
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
@@ -2727,6 +2805,7 @@
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=m
@@ -2734,6 +2813,7 @@
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_KHAZAD=m
@@ -2741,16 +2821,19 @@
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_MPILIB=y
 CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIGNATURE_DSA=y
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
 
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_LIBCRC32C=m
@@ -2762,7 +2845,9 @@
 CONFIG_CRC16=m
 CONFIG_CRC32=m
 CONFIG_CRC_CCITT=m
+CONFIG_CRC_ITU_T=m
 
+CONFIG_EEPROM_93CX6=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 
@@ -2776,9 +2861,14 @@
 # CONFIG_ATA_OVER_ETH is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY_BACKLIGHT=y
+
 CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
 
 CONFIG_SCHEDSTATS=y
 
@@ -2790,7 +2880,6 @@
 CONFIG_CPUSETS=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
-# CONFIG_SECCOMP is not set
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_MUST_CHECK=y
 
@@ -2810,8 +2899,9 @@
 
 CONFIG_PM_LEGACY=y
 # CONFIG_PM_SYSFS_DEPRECATED is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_TRACE is not set
+CONFIG_PM_DEBUG=y
+CONFIG_PM_TRACE=y
+# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
 
 CONFIG_CRASH=m
 
@@ -2964,6 +3054,7 @@
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INDIGOIO=m
 CONFIG_SND_INDIGODJ=m
+# CONFIG_SND_SOC is not set
 
 ## END of ISA options.
 
@@ -3001,21 +3092,31 @@
 
 CONFIG_HZ_1000=y
 
-CONFIG_HID=m
+CONFIG_TIMER_STATS=y
 
+# Auxillary displays
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=y
+CONFIG_CFAG12864B_RATE=20
+
+CONFIG_DEBUG_IGNORE_QUIET=y
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_RWSEMS=y
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_PROVE_LOCKING=y
 CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_SLEEP_IN_IRQ=y
 
 CONFIG_FAULT_INJECTION=y
 CONFIG_FAILSLAB=y
 CONFIG_FAIL_PAGE_ALLOC=y
 CONFIG_FAIL_MAKE_REQUEST=y
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+
 CONFIG_UID16=y
 # CONFIG_X86_PC is not set
 CONFIG_X86_GENERICARCH=y
@@ -3048,7 +3149,6 @@
 CONFIG_NR_CPUS=32
 CONFIG_X86_GENERIC=y
 CONFIG_X86_CMPXCHG=y
-CONFIG_X86_XADD=y
 CONFIG_X86_L1_CACHE_SHIFT=7
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_X86_PPRO_FENCE=y
@@ -3090,6 +3190,7 @@
 # CONFIG_PCI_GODIRECT is not set
 # CONFIG_PCI_GOMMCONFIG is not set
 CONFIG_PCI_GOANY=y
+# CONFIG_SECCOMP is not set
 CONFIG_I2O_BLOCK=m
 CONFIG_I2O_SCSI=m
 CONFIG_I2O_PROC=m
@@ -3109,30 +3210,33 @@
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_MPPARSE=y
 CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_AC=m
+# CONFIG_ACPI_ASUS is not set
 CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BAY=m
+CONFIG_ACPI_IBM_BAY=y
+CONFIG_ACPI_BLACKLIST_YEAR=1999
 CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_FAN=y
-CONFIG_ACPI_PROCESSOR=y
-CONFIG_ACPI_THERMAL=y
-# CONFIG_ACPI_ASUS is not set
-# CONFIG_ACPI_TOSHIBA is not set
+CONFIG_ACPI_CONTAINER=m
 # CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DOCK=m
 CONFIG_ACPI_EC=y
-CONFIG_ACPI_POWER=y
-CONFIG_ACPI_SYSTEM=y
-CONFIG_ACPI_NUMA=y
-CONFIG_ACPI_BLACKLIST_YEAR=1999
-CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=y
 # CONFIG_ACPI_IBM is not set
-CONFIG_PNPACPI=y
-CONFIG_ACPI_DOCK=m
 # CONFIG_ACPI_IBM_DOCK is not set
+CONFIG_ACPI_NUMA=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_POWER=y
+CONFIG_ACPI_PROCFS=y
 CONFIG_ACPI_SBS=m
+CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
-# CONFIG_ACPI_HOTKEY is not set
-CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_SYSTEM=y
+CONFIG_ACPI_THERMAL=y
+# CONFIG_ACPI_TOSHIBA is not set
+CONFIG_ACPI_VIDEO=m
+CONFIG_PNPACPI=y
+CONFIG_ASUS_LAPTOP=m
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_DEBUG=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
@@ -3155,13 +3259,12 @@
 # CONFIG_X86_SPEEDSTEP_ICH is not set
 # CONFIG_X86_SPEEDSTEP_SMI is not set
 CONFIG_X86_SPEEDSTEP_LIB=y
-CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y
-CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
 # CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
 # CONFIG_X86_P4_CLOCKMOD is not set
 CONFIG_X86_LONGRUN=y
 # CONFIG_X86_LONGHAUL is not set
 # CONFIG_X86_CPUFREQ_NFORCE2 is not set
+CONFIG_X86_E_POWERSAVER=y
 CONFIG_X86_SMP=y
 CONFIG_X86_HT=y
 CONFIG_X86_BIOS_REBOOT=y
@@ -3190,7 +3293,6 @@
 CONFIG_HOTPLUG_PCI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 # CONFIG_HOTPLUG_PCI_SHPC is not set
-# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
 CONFIG_PM=y
 CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200_MONITOR=y
@@ -3235,6 +3337,9 @@
 CONFIG_KVM_AMD=m
 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_NOHIGHMEM is not set
 CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set


Index: kernel-2.6.20-i686-PAE-debug.config
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-2.6.20-i686-PAE-debug.config,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- kernel-2.6.20-i686-PAE-debug.config	22 Mar 2007 16:06:42 -0000	1.1
+++ kernel-2.6.20-i686-PAE-debug.config	10 Apr 2007 22:41:59 -0000	1.1.2.1
@@ -57,6 +57,7 @@
 CONFIG_KMOD=y
 CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
+CONFIG_MODULE_VERIFY_ELF=y
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -68,7 +69,6 @@
 # CONFIG_PCI_MULTITHREAD_PROBE is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
-# FIXME: Was borked in .17git11 for non-acpi machines.
 CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_HOTPLUG_PCI_FAKE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
@@ -105,6 +105,7 @@
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
+# CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
@@ -112,6 +113,8 @@
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_AMSO1100=m
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 
 #
 # Executable file formats
@@ -257,7 +260,7 @@
 # CONFIG_PNPBIOS is not set
 
 CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m 
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 
 #
 # Block devices
@@ -304,6 +307,11 @@
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_LSF=y
 
+CONFIG_BLK_DEV_DELKIN=m
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+
+
 #
 # ATA/ATAPI/MFM/RLL support
 #
@@ -445,22 +453,23 @@
 CONFIG_MEGARAID_SAS=m
 
 CONFIG_ATA=m
-CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_VIA=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_NV=m
 CONFIG_PDC_ADMA=m
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_QSTOR=m
+CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SIL=m
 CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
 
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
@@ -479,6 +488,7 @@
 CONFIG_PATA_HPT3X3=m
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_IT821X=m
+CONFIG_PATA_IT8213=m
 CONFIG_PATA_JMICRON=m
 # CONFIG_PATA_LEGACY is not set
 CONFIG_PATA_TRIFLEX=m
@@ -583,9 +593,9 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-CONFIG_FW=m
-CONFIG_FW_OHCI=m
-CONFIG_FW_SBP2=m
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 
 #
 # IEEE 1394 (FireWire) support
@@ -625,6 +635,7 @@
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -707,6 +718,7 @@
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -758,6 +770,7 @@
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
@@ -785,7 +798,6 @@
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_NAT=m
@@ -824,6 +836,7 @@
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RT=m
@@ -860,6 +873,7 @@
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
@@ -978,7 +992,7 @@
 
 #
 # ATM
-# 
+#
 # CONFIG_ATM_DUMMY is not set
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_LANE=m
@@ -1069,6 +1083,7 @@
 CONFIG_B44=m
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_E100=m
@@ -1086,6 +1101,7 @@
 CONFIG_SIS900=m
 CONFIG_SIS190=m
 CONFIG_EPIC100=m
+CONFIG_SC92031=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_TLAN=m
@@ -1132,6 +1148,7 @@
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y
+CONFIG_CHELSIO_T3=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1154,26 +1171,19 @@
 # CONFIG_SLIP_MODE_SLIP6 is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
+# Wireless LAN
 #
+CONFIG_WLAN_PRE80211=y
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
+CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 
-#
-# Wireless 802.11b ISA/PCI cards support
-#
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -1181,6 +1191,9 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
+CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT_COMPAT=y
+# CONFIG_NL80211 is not set
 CONFIG_IPW2100=m
 CONFIG_IPW2200=m
 # CONFIG_IPW2100_DEBUG is not set
@@ -1188,6 +1201,38 @@
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_BCM43XX_MAC80211=m
+CONFIG_BCM43XX_MAC80211_PCI=y
+CONFIG_BCM43XX_MAC80211_PCMCIA=y
+CONFIG_BCM43XX_MAC80211_DEBUG=y
+CONFIG_BCM43XX_MAC80211_DMA=y
+CONFIG_BCM43XX_MAC80211_PIO=y
+CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set
+# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set
+CONFIG_RT2X00=y
+CONFIG_RT2400PCI=m
+# CONFIG_RT2400PCI_DEBUG is not set
+CONFIG_RT2500PCI=m
+# CONFIG_RT2500PCI_DEBUG is not set
+CONFIG_RT61PCI=m
+# CONFIG_RT61PCI_DEBUG is not set
+CONFIG_RT2500USB=m
+# CONFIG_RT2500USB_DEBUG is not set
+CONFIG_RT73USB=m
+# CONFIG_RT73USB_DEBUG is not set
+CONFIG_RT2X00_DEBUGFS=m
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_ADM8211=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_ZD1211RW_MAC80211=m
+# CONFIG_ZD1211RW_MAC80211_DEBUG is not set
+CONFIG_RTL818X=y
+CONFIG_RTL8187=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_DEBUG=y
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1199,10 +1244,6 @@
 CONFIG_PRISM54=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
@@ -1397,6 +1438,7 @@
 # CAPI subsystem
 #
 CONFIG_ISDN_CAPI=m
+# CONFIG_CAPI_TRACE is not set
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
@@ -1425,6 +1467,7 @@
 
 CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M101=m
 CONFIG_GIGASET_M105=m
 # CONFIG_GIGASET_DEBUG is not set
 # CONFIG_GIGASET_UNDOCREQ is not set
@@ -1521,8 +1564,10 @@
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_INPUT_ATLAS_BTNS=m
 
 CONFIG_MAC_EMUMOUSEBTN=y
+
 #
 # Character devices
 #
@@ -1607,6 +1652,7 @@
 #
 
 CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PASEMI=m
 CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_SAVAGE4=m
 CONFIG_I2C_VOODOO3=m
@@ -1644,6 +1690,7 @@
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ATXP1=m
@@ -1764,22 +1811,22 @@
 CONFIG_RTC_INTF_SYSFS=m
 CONFIG_RTC_INTF_PROC=m
 CONFIG_RTC_INTF_DEV=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS1742=m
+# CONFIG_RTC_DRV_EP93XX is not set
+CONFIG_RTC_DRV_ISL1208=m
+# CONFIG_RTC_DRV_M48T86 is not set
 CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_RS5C372=m
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_EP93XX is not set
 # CONFIG_RTC_DRV_SA1100 is not set
 # CONFIG_RTC_DRV_TEST is not set
-
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_V3020=m
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -1811,6 +1858,7 @@
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_VIA=m
+CONFIG_DRM_NOUVEAU=m
 
 #
 # PCMCIA character devices
@@ -1959,6 +2007,7 @@
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_CXUSB=m
 CONFIG_DVB_USB_DIBUSB_MB=m
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
@@ -1966,12 +2015,17 @@
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_GL861=m
 CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_VP702X=m
 CONFIG_DVB_USB_VP7045=m
+
+CONFIG_DVB_TUNER_QT1010=m
+
 CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_LGDT330X=m
 
@@ -1982,7 +2036,6 @@
 
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
 CONFIG_VIDEO_BTCX=m
@@ -1996,18 +2049,30 @@
 # Graphics support
 #
 CONFIG_FB=y
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
+CONFIG_FB_3DFX=m
+CONFIG_FB_3DFX_ACCEL=y
+# CONFIG_FB_ARC is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+# CONFIG_FB_ASILIANT is not set
+CONFIG_FB_CIRRUS=m
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_CYBLA=m
+# CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
-CONFIG_FB_RIVA=m
-# CONFIG_FB_RIVA_DEBUG is not set
-# CONFIG_FB_RIVA_I2C is not set
 CONFIG_FB_I810=m
 CONFIG_FB_I810_GTF=y
 CONFIG_FB_I810_I2C=y
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_IMAC is not set
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_KYRO=m
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -2015,44 +2080,35 @@
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_MATROX_MULTIHEAD=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
 CONFIG_FB_RADEON=m
 # CONFIG_FB_RADEON_DEBUG is not set
 CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GX=y
+CONFIG_FB_RIVA=m
+# CONFIG_FB_RIVA_DEBUG is not set
+# CONFIG_FB_RIVA_I2C is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
 # CONFIG_FB_SIS is not set
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_VOODOO1=m
+CONFIG_FB_SM501=m
+CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_KYRO=m
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-# CONFIG_FB_ASILIANT is not set
-CONFIG_FB_3DFX_ACCEL=y
 CONFIG_FB_TRIDENT_ACCEL=y
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_TILEBLITTING=y
-# CONFIG_FB_ARC is not set
-CONFIG_FB_INTEL=m
-# CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_CYBLA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_VGA16=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_VOODOO1=m
+
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_IMAC is not set
 
 #
 # Console display driver support
@@ -2108,6 +2164,7 @@
 CONFIG_SND_MTS64=m
 # CONFIG_SND_SERIAL_U16550 is not set
 CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
 
 #
@@ -2196,10 +2253,8 @@
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
-CONFIG_USB_MULTITHREAD_PROBE=y
 
 #
 # USB Host Controller Drivers
@@ -2209,6 +2264,7 @@
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_CS=m
 
@@ -2241,11 +2297,13 @@
 # USB Human Interface Devices (HID)
 #
 CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-CONFIG_USB_HID_POWERBOOK=y
+
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y
 CONFIG_LOGITECH_FF=y
+CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
@@ -2296,6 +2354,7 @@
 # Has dumb detection, which gets loaded for every hid device.
 # CONFIG_USB_YEALINK is not set
 CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
@@ -2315,6 +2374,7 @@
 #
 CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
 
 #
 # USB port drivers
@@ -2374,7 +2434,7 @@
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_XIRCOM=m
-# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_DEBUG=m
 
 CONFIG_USB_EZUSB=y
 CONFIG_USB_EMI62=m
@@ -2391,7 +2451,9 @@
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LCD=m
-CONFIG_USB_TEST=m
+CONFIG_USB_BERRY_CHARGE=m
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
 # CONFIG_USB_GADGET is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
 # CONFIG_USB_GADGET_GOKU is not set
@@ -2429,6 +2491,7 @@
 CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_USB_LD=m
 CONFIG_USB_APPLETOUCH=m
+CONFIG_USB_GTCO=m
 CONFIG_USB_TRANCEVIBRATOR=m
 
 CONFIG_USB_TOUCHSCREEN=m
@@ -2437,6 +2500,19 @@
 CONFIG_USB_HIDINPUT_POWERBOOK=y
 
 #
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCMCIAHOST=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE=y
+
+# Multifunction USB devices
+CONFIG_MFD_SM501=m
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=m
@@ -2487,7 +2563,6 @@
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
 CONFIG_UDF_FS=m
 
 #
@@ -2524,13 +2599,14 @@
 # CONFIG_BEFS_DEBUG is not set
 CONFIG_BFS_FS=m
 CONFIG_EFS_FS=m
-# CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
@@ -2696,13 +2772,15 @@
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y
 CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DEBUG_DEVRES=y
 
 #
 # Security options
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
@@ -2727,6 +2805,7 @@
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=m
@@ -2734,6 +2813,7 @@
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_KHAZAD=m
@@ -2741,16 +2821,19 @@
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_MPILIB=y
 CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIGNATURE_DSA=y
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
 
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_LIBCRC32C=m
@@ -2762,7 +2845,9 @@
 CONFIG_CRC16=m
 CONFIG_CRC32=m
 CONFIG_CRC_CCITT=m
+CONFIG_CRC_ITU_T=m
 
+CONFIG_EEPROM_93CX6=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 
@@ -2776,9 +2861,14 @@
 CONFIG_ATA_OVER_ETH=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY_BACKLIGHT=y
+
 CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
 
 CONFIG_SCHEDSTATS=y
 
@@ -2790,7 +2880,6 @@
 CONFIG_CPUSETS=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
-# CONFIG_SECCOMP is not set
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_MUST_CHECK=y
 
@@ -2810,8 +2899,9 @@
 
 CONFIG_PM_LEGACY=y
 # CONFIG_PM_SYSFS_DEPRECATED is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_TRACE is not set
+CONFIG_PM_DEBUG=y
+CONFIG_PM_TRACE=y
+# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
 
 CONFIG_CRASH=m
 
@@ -2964,6 +3054,7 @@
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INDIGOIO=m
 CONFIG_SND_INDIGODJ=m
+# CONFIG_SND_SOC is not set
 
 ## END of ISA options.
 
@@ -3001,22 +3092,30 @@
 
 CONFIG_HZ_1000=y
 
-CONFIG_HID=m
+CONFIG_TIMER_STATS=y
 
+# Auxillary displays
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=y
+CONFIG_CFAG12864B_RATE=20
+
+CONFIG_DEBUG_IGNORE_QUIET=y
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_RWSEMS=y
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_PROVE_LOCKING=y
 CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_SLEEP_IN_IRQ=y
 
 CONFIG_FAULT_INJECTION=y
 CONFIG_FAILSLAB=y
 CONFIG_FAIL_PAGE_ALLOC=y
 CONFIG_FAIL_MAKE_REQUEST=y
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
-
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 CONFIG_UID16=y
 # CONFIG_X86_PC is not set
 CONFIG_X86_GENERICARCH=y
@@ -3049,7 +3148,6 @@
 CONFIG_NR_CPUS=32
 CONFIG_X86_GENERIC=y
 CONFIG_X86_CMPXCHG=y
-CONFIG_X86_XADD=y
 CONFIG_X86_L1_CACHE_SHIFT=7
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_X86_PPRO_FENCE=y
@@ -3091,6 +3189,7 @@
 # CONFIG_PCI_GODIRECT is not set
 # CONFIG_PCI_GOMMCONFIG is not set
 CONFIG_PCI_GOANY=y
+# CONFIG_SECCOMP is not set
 CONFIG_I2O_BLOCK=m
 CONFIG_I2O_SCSI=m
 CONFIG_I2O_PROC=m
@@ -3110,30 +3209,33 @@
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_MPPARSE=y
 CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_AC=m
+CONFIG_ACPI_ASUS=m
 CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BAY=m
+CONFIG_ACPI_IBM_BAY=y
+CONFIG_ACPI_BLACKLIST_YEAR=1999
 CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_FAN=y
-CONFIG_ACPI_PROCESSOR=y
-CONFIG_ACPI_THERMAL=y
-CONFIG_ACPI_ASUS=m
-CONFIG_ACPI_TOSHIBA=m
+CONFIG_ACPI_CONTAINER=m
 # CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DOCK=m
 CONFIG_ACPI_EC=y
-CONFIG_ACPI_POWER=y
-CONFIG_ACPI_SYSTEM=y
-CONFIG_ACPI_NUMA=y
-CONFIG_ACPI_BLACKLIST_YEAR=1999
-CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=y
 CONFIG_ACPI_IBM=m
-CONFIG_PNPACPI=y
-CONFIG_ACPI_DOCK=m
 # CONFIG_ACPI_IBM_DOCK is not set
+CONFIG_ACPI_NUMA=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_POWER=y
+CONFIG_ACPI_PROCFS=y
 CONFIG_ACPI_SBS=m
+CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
-# CONFIG_ACPI_HOTKEY is not set
-CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_SYSTEM=y
+CONFIG_ACPI_THERMAL=y
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_PNPACPI=y
+CONFIG_ASUS_LAPTOP=m
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_DEBUG=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
@@ -3152,17 +3254,16 @@
 CONFIG_X86_POWERNOW_K7=y
 CONFIG_X86_POWERNOW_K8=y
 # CONFIG_X86_GX_SUSPMOD is not set
-CONFIG_X86_SPEEDSTEP_CENTRINO=y
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 CONFIG_X86_SPEEDSTEP_ICH=y
 CONFIG_X86_SPEEDSTEP_SMI=y
 CONFIG_X86_SPEEDSTEP_LIB=y
-CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y
-CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
 # CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
 CONFIG_X86_P4_CLOCKMOD=m
 CONFIG_X86_LONGRUN=y
 # CONFIG_X86_LONGHAUL is not set
 # CONFIG_X86_CPUFREQ_NFORCE2 is not set
+CONFIG_X86_E_POWERSAVER=y
 CONFIG_X86_SMP=y
 CONFIG_X86_HT=y
 CONFIG_X86_BIOS_REBOOT=y
@@ -3191,7 +3292,6 @@
 CONFIG_HOTPLUG_PCI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 # CONFIG_HOTPLUG_PCI_SHPC is not set
-# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
 CONFIG_PM=y
 CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200_MONITOR=y
@@ -3236,6 +3336,9 @@
 CONFIG_KVM_AMD=m
 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_NOHIGHMEM is not set
 # CONFIG_HIGHMEM4G is not set
 CONFIG_HIGHMEM64G=y


Index: kernel-2.6.20-i686-PAE.config
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-2.6.20-i686-PAE.config,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- kernel-2.6.20-i686-PAE.config	22 Mar 2007 16:06:42 -0000	1.1
+++ kernel-2.6.20-i686-PAE.config	10 Apr 2007 22:41:59 -0000	1.1.2.1
@@ -57,6 +57,7 @@
 CONFIG_KMOD=y
 CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
+CONFIG_MODULE_VERIFY_ELF=y
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -68,7 +69,6 @@
 # CONFIG_PCI_MULTITHREAD_PROBE is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
-# FIXME: Was borked in .17git11 for non-acpi machines.
 CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_HOTPLUG_PCI_FAKE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
@@ -105,6 +105,7 @@
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
+# CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
@@ -112,6 +113,8 @@
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_AMSO1100=m
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 
 #
 # Executable file formats
@@ -257,7 +260,7 @@
 # CONFIG_PNPBIOS is not set
 
 CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m 
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 
 #
 # Block devices
@@ -304,6 +307,11 @@
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_LSF=y
 
+CONFIG_BLK_DEV_DELKIN=m
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+
+
 #
 # ATA/ATAPI/MFM/RLL support
 #
@@ -445,22 +453,23 @@
 CONFIG_MEGARAID_SAS=m
 
 CONFIG_ATA=m
-CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_VIA=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_NV=m
 CONFIG_PDC_ADMA=m
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_QSTOR=m
+CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SIL=m
 CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
 
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
@@ -479,6 +488,7 @@
 CONFIG_PATA_HPT3X3=m
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_IT821X=m
+CONFIG_PATA_IT8213=m
 CONFIG_PATA_JMICRON=m
 # CONFIG_PATA_LEGACY is not set
 CONFIG_PATA_TRIFLEX=m
@@ -583,9 +593,9 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-CONFIG_FW=m
-CONFIG_FW_OHCI=m
-CONFIG_FW_SBP2=m
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 
 #
 # IEEE 1394 (FireWire) support
@@ -625,6 +635,7 @@
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -707,6 +718,7 @@
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -758,6 +770,7 @@
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
@@ -785,7 +798,6 @@
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_NAT=m
@@ -824,6 +836,7 @@
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RT=m
@@ -860,6 +873,7 @@
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
@@ -978,7 +992,7 @@
 
 #
 # ATM
-# 
+#
 # CONFIG_ATM_DUMMY is not set
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_LANE=m
@@ -1069,6 +1083,7 @@
 CONFIG_B44=m
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_E100=m
@@ -1086,6 +1101,7 @@
 CONFIG_SIS900=m
 CONFIG_SIS190=m
 CONFIG_EPIC100=m
+CONFIG_SC92031=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_TLAN=m
@@ -1132,6 +1148,7 @@
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y
+CONFIG_CHELSIO_T3=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1154,26 +1171,19 @@
 # CONFIG_SLIP_MODE_SLIP6 is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
+# Wireless LAN
 #
+CONFIG_WLAN_PRE80211=y
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
+CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 
-#
-# Wireless 802.11b ISA/PCI cards support
-#
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -1181,6 +1191,9 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
+CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT_COMPAT=y
+# CONFIG_NL80211 is not set
 CONFIG_IPW2100=m
 CONFIG_IPW2200=m
 # CONFIG_IPW2100_DEBUG is not set
@@ -1188,6 +1201,38 @@
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_BCM43XX_MAC80211=m
+CONFIG_BCM43XX_MAC80211_PCI=y
+CONFIG_BCM43XX_MAC80211_PCMCIA=y
+CONFIG_BCM43XX_MAC80211_DEBUG=y
+CONFIG_BCM43XX_MAC80211_DMA=y
+CONFIG_BCM43XX_MAC80211_PIO=y
+CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set
+# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set
+CONFIG_RT2X00=y
+CONFIG_RT2400PCI=m
+# CONFIG_RT2400PCI_DEBUG is not set
+CONFIG_RT2500PCI=m
+# CONFIG_RT2500PCI_DEBUG is not set
+CONFIG_RT61PCI=m
+# CONFIG_RT61PCI_DEBUG is not set
+CONFIG_RT2500USB=m
+# CONFIG_RT2500USB_DEBUG is not set
+CONFIG_RT73USB=m
+# CONFIG_RT73USB_DEBUG is not set
+CONFIG_RT2X00_DEBUGFS=m
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_ADM8211=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_ZD1211RW_MAC80211=m
+# CONFIG_ZD1211RW_MAC80211_DEBUG is not set
+CONFIG_RTL818X=y
+CONFIG_RTL8187=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_DEBUG=y
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1199,10 +1244,6 @@
 CONFIG_PRISM54=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
@@ -1397,6 +1438,7 @@
 # CAPI subsystem
 #
 CONFIG_ISDN_CAPI=m
+# CONFIG_CAPI_TRACE is not set
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
@@ -1425,6 +1467,7 @@
 
 CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M101=m
 CONFIG_GIGASET_M105=m
 # CONFIG_GIGASET_DEBUG is not set
 # CONFIG_GIGASET_UNDOCREQ is not set
@@ -1521,8 +1564,10 @@
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_INPUT_ATLAS_BTNS=m
 
 CONFIG_MAC_EMUMOUSEBTN=y
+
 #
 # Character devices
 #
@@ -1607,6 +1652,7 @@
 #
 
 CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PASEMI=m
 CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_SAVAGE4=m
 CONFIG_I2C_VOODOO3=m
@@ -1644,6 +1690,7 @@
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ATXP1=m
@@ -1764,22 +1811,22 @@
 CONFIG_RTC_INTF_SYSFS=m
 CONFIG_RTC_INTF_PROC=m
 CONFIG_RTC_INTF_DEV=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS1742=m
+# CONFIG_RTC_DRV_EP93XX is not set
+CONFIG_RTC_DRV_ISL1208=m
+# CONFIG_RTC_DRV_M48T86 is not set
 CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_RS5C372=m
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_EP93XX is not set
 # CONFIG_RTC_DRV_SA1100 is not set
 # CONFIG_RTC_DRV_TEST is not set
-
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_V3020=m
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -1811,6 +1858,7 @@
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_VIA=m
+CONFIG_DRM_NOUVEAU=m
 
 #
 # PCMCIA character devices
@@ -1959,6 +2007,7 @@
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_CXUSB=m
 CONFIG_DVB_USB_DIBUSB_MB=m
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
@@ -1966,12 +2015,17 @@
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_GL861=m
 CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_VP702X=m
 CONFIG_DVB_USB_VP7045=m
+
+CONFIG_DVB_TUNER_QT1010=m
+
 CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_LGDT330X=m
 
@@ -1982,7 +2036,6 @@
 
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
 CONFIG_VIDEO_BTCX=m
@@ -1996,18 +2049,30 @@
 # Graphics support
 #
 CONFIG_FB=y
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
+CONFIG_FB_3DFX=m
+CONFIG_FB_3DFX_ACCEL=y
+# CONFIG_FB_ARC is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+# CONFIG_FB_ASILIANT is not set
+CONFIG_FB_CIRRUS=m
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_CYBLA=m
+# CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
-CONFIG_FB_RIVA=m
-# CONFIG_FB_RIVA_DEBUG is not set
-# CONFIG_FB_RIVA_I2C is not set
 CONFIG_FB_I810=m
 CONFIG_FB_I810_GTF=y
 CONFIG_FB_I810_I2C=y
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_IMAC is not set
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_KYRO=m
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -2015,44 +2080,35 @@
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_MATROX_MULTIHEAD=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
 CONFIG_FB_RADEON=m
 # CONFIG_FB_RADEON_DEBUG is not set
 CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GX=y
+CONFIG_FB_RIVA=m
+# CONFIG_FB_RIVA_DEBUG is not set
+# CONFIG_FB_RIVA_I2C is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
 # CONFIG_FB_SIS is not set
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_VOODOO1=m
+CONFIG_FB_SM501=m
+CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_KYRO=m
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-# CONFIG_FB_ASILIANT is not set
-CONFIG_FB_3DFX_ACCEL=y
 CONFIG_FB_TRIDENT_ACCEL=y
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_TILEBLITTING=y
-# CONFIG_FB_ARC is not set
-CONFIG_FB_INTEL=m
-# CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_CYBLA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_VGA16=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_VOODOO1=m
+
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_IMAC is not set
 
 #
 # Console display driver support
@@ -2108,6 +2164,7 @@
 CONFIG_SND_MTS64=m
 # CONFIG_SND_SERIAL_U16550 is not set
 CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
 
 #
@@ -2196,10 +2253,8 @@
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
-CONFIG_USB_MULTITHREAD_PROBE=y
 
 #
 # USB Host Controller Drivers
@@ -2209,6 +2264,7 @@
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_CS=m
 
@@ -2241,11 +2297,13 @@
 # USB Human Interface Devices (HID)
 #
 CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-CONFIG_USB_HID_POWERBOOK=y
+
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y
 CONFIG_LOGITECH_FF=y
+CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
@@ -2296,6 +2354,7 @@
 # Has dumb detection, which gets loaded for every hid device.
 # CONFIG_USB_YEALINK is not set
 CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
@@ -2315,6 +2374,7 @@
 #
 CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
 
 #
 # USB port drivers
@@ -2374,7 +2434,7 @@
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_XIRCOM=m
-# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_DEBUG=m
 
 CONFIG_USB_EZUSB=y
 CONFIG_USB_EMI62=m
@@ -2391,7 +2451,9 @@
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LCD=m
-CONFIG_USB_TEST=m
+CONFIG_USB_BERRY_CHARGE=m
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
 # CONFIG_USB_GADGET is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
 # CONFIG_USB_GADGET_GOKU is not set
@@ -2429,6 +2491,7 @@
 CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_USB_LD=m
 CONFIG_USB_APPLETOUCH=m
+CONFIG_USB_GTCO=m
 CONFIG_USB_TRANCEVIBRATOR=m
 
 CONFIG_USB_TOUCHSCREEN=m
@@ -2437,6 +2500,19 @@
 CONFIG_USB_HIDINPUT_POWERBOOK=y
 
 #
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCMCIAHOST=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE=y
+
+# Multifunction USB devices
+CONFIG_MFD_SM501=m
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=m
@@ -2487,7 +2563,6 @@
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
 CONFIG_UDF_FS=m
 
 #
@@ -2524,13 +2599,14 @@
 # CONFIG_BEFS_DEBUG is not set
 CONFIG_BFS_FS=m
 CONFIG_EFS_FS=m
-# CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
@@ -2696,13 +2772,15 @@
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y
 CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DEBUG_DEVRES=y
 
 #
 # Security options
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
@@ -2727,6 +2805,7 @@
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=m
@@ -2734,6 +2813,7 @@
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_KHAZAD=m
@@ -2741,16 +2821,19 @@
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_MPILIB=y
 CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIGNATURE_DSA=y
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
 
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_LIBCRC32C=m
@@ -2762,7 +2845,9 @@
 CONFIG_CRC16=m
 CONFIG_CRC32=m
 CONFIG_CRC_CCITT=m
+CONFIG_CRC_ITU_T=m
 
+CONFIG_EEPROM_93CX6=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 
@@ -2776,9 +2861,14 @@
 CONFIG_ATA_OVER_ETH=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY_BACKLIGHT=y
+
 CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
 
 CONFIG_SCHEDSTATS=y
 
@@ -2790,7 +2880,6 @@
 CONFIG_CPUSETS=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
-# CONFIG_SECCOMP is not set
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_MUST_CHECK=y
 
@@ -2810,8 +2899,9 @@
 
 CONFIG_PM_LEGACY=y
 # CONFIG_PM_SYSFS_DEPRECATED is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_TRACE is not set
+CONFIG_PM_DEBUG=y
+CONFIG_PM_TRACE=y
+# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
 
 CONFIG_CRASH=m
 
@@ -2964,6 +3054,7 @@
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INDIGOIO=m
 CONFIG_SND_INDIGODJ=m
+# CONFIG_SND_SOC is not set
 
 ## END of ISA options.
 
@@ -3001,21 +3092,31 @@
 
 CONFIG_HZ_1000=y
 
-CONFIG_HID=m
+CONFIG_TIMER_STATS=y
 
+# Auxillary displays
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=y
+CONFIG_CFAG12864B_RATE=20
+
+CONFIG_DEBUG_IGNORE_QUIET=y
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_RWSEMS=y
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_PROVE_LOCKING=y
 CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_SLEEP_IN_IRQ=y
 
 CONFIG_FAULT_INJECTION=y
 CONFIG_FAILSLAB=y
 CONFIG_FAIL_PAGE_ALLOC=y
 CONFIG_FAIL_MAKE_REQUEST=y
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+
 CONFIG_UID16=y
 # CONFIG_X86_PC is not set
 CONFIG_X86_GENERICARCH=y
@@ -3048,7 +3149,6 @@
 CONFIG_NR_CPUS=32
 CONFIG_X86_GENERIC=y
 CONFIG_X86_CMPXCHG=y
-CONFIG_X86_XADD=y
 CONFIG_X86_L1_CACHE_SHIFT=7
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_X86_PPRO_FENCE=y
@@ -3090,6 +3190,7 @@
 # CONFIG_PCI_GODIRECT is not set
 # CONFIG_PCI_GOMMCONFIG is not set
 CONFIG_PCI_GOANY=y
+# CONFIG_SECCOMP is not set
 CONFIG_I2O_BLOCK=m
 CONFIG_I2O_SCSI=m
 CONFIG_I2O_PROC=m
@@ -3109,30 +3210,33 @@
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_MPPARSE=y
 CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_AC=m
+CONFIG_ACPI_ASUS=m
 CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BAY=m
+CONFIG_ACPI_IBM_BAY=y
+CONFIG_ACPI_BLACKLIST_YEAR=1999
 CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_FAN=y
-CONFIG_ACPI_PROCESSOR=y
-CONFIG_ACPI_THERMAL=y
-CONFIG_ACPI_ASUS=m
-CONFIG_ACPI_TOSHIBA=m
+CONFIG_ACPI_CONTAINER=m
 # CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DOCK=m
 CONFIG_ACPI_EC=y
-CONFIG_ACPI_POWER=y
-CONFIG_ACPI_SYSTEM=y
-CONFIG_ACPI_NUMA=y
-CONFIG_ACPI_BLACKLIST_YEAR=1999
-CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=y
 CONFIG_ACPI_IBM=m
-CONFIG_PNPACPI=y
-CONFIG_ACPI_DOCK=m
 # CONFIG_ACPI_IBM_DOCK is not set
+CONFIG_ACPI_NUMA=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_POWER=y
+CONFIG_ACPI_PROCFS=y
 CONFIG_ACPI_SBS=m
+CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
-# CONFIG_ACPI_HOTKEY is not set
-CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_SYSTEM=y
+CONFIG_ACPI_THERMAL=y
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_PNPACPI=y
+CONFIG_ASUS_LAPTOP=m
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_DEBUG=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
@@ -3151,17 +3255,16 @@
 CONFIG_X86_POWERNOW_K7=y
 CONFIG_X86_POWERNOW_K8=y
 # CONFIG_X86_GX_SUSPMOD is not set
-CONFIG_X86_SPEEDSTEP_CENTRINO=y
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 CONFIG_X86_SPEEDSTEP_ICH=y
 CONFIG_X86_SPEEDSTEP_SMI=y
 CONFIG_X86_SPEEDSTEP_LIB=y
-CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y
-CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
 # CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
 CONFIG_X86_P4_CLOCKMOD=m
 CONFIG_X86_LONGRUN=y
 # CONFIG_X86_LONGHAUL is not set
 # CONFIG_X86_CPUFREQ_NFORCE2 is not set
+CONFIG_X86_E_POWERSAVER=y
 CONFIG_X86_SMP=y
 CONFIG_X86_HT=y
 CONFIG_X86_BIOS_REBOOT=y
@@ -3190,7 +3293,6 @@
 CONFIG_HOTPLUG_PCI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 # CONFIG_HOTPLUG_PCI_SHPC is not set
-# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
 CONFIG_PM=y
 CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200_MONITOR=y
@@ -3235,6 +3337,9 @@
 CONFIG_KVM_AMD=m
 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_NOHIGHMEM is not set
 # CONFIG_HIGHMEM4G is not set
 CONFIG_HIGHMEM64G=y


Index: kernel-2.6.20-i686-debug.config
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-2.6.20-i686-debug.config,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- kernel-2.6.20-i686-debug.config	22 Mar 2007 16:06:42 -0000	1.1
+++ kernel-2.6.20-i686-debug.config	10 Apr 2007 22:41:59 -0000	1.1.2.1
@@ -57,6 +57,7 @@
 CONFIG_KMOD=y
 CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
+CONFIG_MODULE_VERIFY_ELF=y
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -68,7 +69,6 @@
 # CONFIG_PCI_MULTITHREAD_PROBE is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
-# FIXME: Was borked in .17git11 for non-acpi machines.
 CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_HOTPLUG_PCI_FAKE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
@@ -105,6 +105,7 @@
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
+# CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
@@ -112,6 +113,8 @@
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_AMSO1100=m
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 
 #
 # Executable file formats
@@ -257,7 +260,7 @@
 # CONFIG_PNPBIOS is not set
 
 CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m 
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 
 #
 # Block devices
@@ -304,6 +307,11 @@
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_LSF=y
 
+CONFIG_BLK_DEV_DELKIN=m
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+
+
 #
 # ATA/ATAPI/MFM/RLL support
 #
@@ -445,22 +453,23 @@
 CONFIG_MEGARAID_SAS=m
 
 CONFIG_ATA=m
-CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_VIA=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_NV=m
 CONFIG_PDC_ADMA=m
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_QSTOR=m
+CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SIL=m
 CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
 
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
@@ -479,6 +488,7 @@
 CONFIG_PATA_HPT3X3=m
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_IT821X=m
+CONFIG_PATA_IT8213=m
 CONFIG_PATA_JMICRON=m
 # CONFIG_PATA_LEGACY is not set
 CONFIG_PATA_TRIFLEX=m
@@ -583,9 +593,9 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-CONFIG_FW=m
-CONFIG_FW_OHCI=m
-CONFIG_FW_SBP2=m
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 
 #
 # IEEE 1394 (FireWire) support
@@ -625,6 +635,7 @@
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -707,6 +718,7 @@
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -758,6 +770,7 @@
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
@@ -785,7 +798,6 @@
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_NAT=m
@@ -824,6 +836,7 @@
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RT=m
@@ -860,6 +873,7 @@
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
@@ -978,7 +992,7 @@
 
 #
 # ATM
-# 
+#
 # CONFIG_ATM_DUMMY is not set
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_LANE=m
@@ -1069,6 +1083,7 @@
 CONFIG_B44=m
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_E100=m
@@ -1086,6 +1101,7 @@
 CONFIG_SIS900=m
 CONFIG_SIS190=m
 CONFIG_EPIC100=m
+CONFIG_SC92031=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_TLAN=m
@@ -1132,6 +1148,7 @@
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y
+CONFIG_CHELSIO_T3=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1154,26 +1171,19 @@
 # CONFIG_SLIP_MODE_SLIP6 is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
+# Wireless LAN
 #
+CONFIG_WLAN_PRE80211=y
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
+CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 
-#
-# Wireless 802.11b ISA/PCI cards support
-#
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -1181,6 +1191,9 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
+CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT_COMPAT=y
+# CONFIG_NL80211 is not set
 CONFIG_IPW2100=m
 CONFIG_IPW2200=m
 # CONFIG_IPW2100_DEBUG is not set
@@ -1188,6 +1201,38 @@
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_BCM43XX_MAC80211=m
+CONFIG_BCM43XX_MAC80211_PCI=y
+CONFIG_BCM43XX_MAC80211_PCMCIA=y
+CONFIG_BCM43XX_MAC80211_DEBUG=y
+CONFIG_BCM43XX_MAC80211_DMA=y
+CONFIG_BCM43XX_MAC80211_PIO=y
+CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set
+# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set
+CONFIG_RT2X00=y
+CONFIG_RT2400PCI=m
+# CONFIG_RT2400PCI_DEBUG is not set
+CONFIG_RT2500PCI=m
+# CONFIG_RT2500PCI_DEBUG is not set
+CONFIG_RT61PCI=m
+# CONFIG_RT61PCI_DEBUG is not set
+CONFIG_RT2500USB=m
+# CONFIG_RT2500USB_DEBUG is not set
+CONFIG_RT73USB=m
+# CONFIG_RT73USB_DEBUG is not set
+CONFIG_RT2X00_DEBUGFS=m
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_ADM8211=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_ZD1211RW_MAC80211=m
+# CONFIG_ZD1211RW_MAC80211_DEBUG is not set
+CONFIG_RTL818X=y
+CONFIG_RTL8187=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_DEBUG=y
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1199,10 +1244,6 @@
 CONFIG_PRISM54=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
@@ -1397,6 +1438,7 @@
 # CAPI subsystem
 #
 CONFIG_ISDN_CAPI=m
+# CONFIG_CAPI_TRACE is not set
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
@@ -1425,6 +1467,7 @@
 
 CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M101=m
 CONFIG_GIGASET_M105=m
 # CONFIG_GIGASET_DEBUG is not set
 # CONFIG_GIGASET_UNDOCREQ is not set
@@ -1521,8 +1564,10 @@
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_INPUT_ATLAS_BTNS=m
 
 CONFIG_MAC_EMUMOUSEBTN=y
+
 #
 # Character devices
 #
@@ -1607,6 +1652,7 @@
 #
 
 CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PASEMI=m
 CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_SAVAGE4=m
 CONFIG_I2C_VOODOO3=m
@@ -1644,6 +1690,7 @@
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ATXP1=m
@@ -1764,22 +1811,22 @@
 CONFIG_RTC_INTF_SYSFS=m
 CONFIG_RTC_INTF_PROC=m
 CONFIG_RTC_INTF_DEV=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS1742=m
+# CONFIG_RTC_DRV_EP93XX is not set
+CONFIG_RTC_DRV_ISL1208=m
+# CONFIG_RTC_DRV_M48T86 is not set
 CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_RS5C372=m
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_EP93XX is not set
 # CONFIG_RTC_DRV_SA1100 is not set
 # CONFIG_RTC_DRV_TEST is not set
-
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_V3020=m
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -1811,6 +1858,7 @@
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_VIA=m
+CONFIG_DRM_NOUVEAU=m
 
 #
 # PCMCIA character devices
@@ -1959,6 +2007,7 @@
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_CXUSB=m
 CONFIG_DVB_USB_DIBUSB_MB=m
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
@@ -1966,12 +2015,17 @@
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_GL861=m
 CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_VP702X=m
 CONFIG_DVB_USB_VP7045=m
+
+CONFIG_DVB_TUNER_QT1010=m
+
 CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_LGDT330X=m
 
@@ -1982,7 +2036,6 @@
 
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
 CONFIG_VIDEO_BTCX=m
@@ -1996,18 +2049,30 @@
 # Graphics support
 #
 CONFIG_FB=y
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
+CONFIG_FB_3DFX=m
+CONFIG_FB_3DFX_ACCEL=y
+# CONFIG_FB_ARC is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+# CONFIG_FB_ASILIANT is not set
+CONFIG_FB_CIRRUS=m
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_CYBLA=m
+# CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
-CONFIG_FB_RIVA=m
-# CONFIG_FB_RIVA_DEBUG is not set
-# CONFIG_FB_RIVA_I2C is not set
 CONFIG_FB_I810=m
 CONFIG_FB_I810_GTF=y
 CONFIG_FB_I810_I2C=y
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_IMAC is not set
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_KYRO=m
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -2015,44 +2080,35 @@
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_MATROX_MULTIHEAD=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
 CONFIG_FB_RADEON=m
 # CONFIG_FB_RADEON_DEBUG is not set
 CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GX=y
+CONFIG_FB_RIVA=m
+# CONFIG_FB_RIVA_DEBUG is not set
+# CONFIG_FB_RIVA_I2C is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
 # CONFIG_FB_SIS is not set
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_VOODOO1=m
+CONFIG_FB_SM501=m
+CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_KYRO=m
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-# CONFIG_FB_ASILIANT is not set
-CONFIG_FB_3DFX_ACCEL=y
 CONFIG_FB_TRIDENT_ACCEL=y
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_TILEBLITTING=y
-# CONFIG_FB_ARC is not set
-CONFIG_FB_INTEL=m
-# CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_CYBLA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_VGA16=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_VOODOO1=m
+
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_IMAC is not set
 
 #
 # Console display driver support
@@ -2108,6 +2164,7 @@
 CONFIG_SND_MTS64=m
 # CONFIG_SND_SERIAL_U16550 is not set
 CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
 
 #
@@ -2196,10 +2253,8 @@
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
-CONFIG_USB_MULTITHREAD_PROBE=y
 
 #
 # USB Host Controller Drivers
@@ -2209,6 +2264,7 @@
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_CS=m
 
@@ -2241,11 +2297,13 @@
 # USB Human Interface Devices (HID)
 #
 CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-CONFIG_USB_HID_POWERBOOK=y
+
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y
 CONFIG_LOGITECH_FF=y
+CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
@@ -2296,6 +2354,7 @@
 # Has dumb detection, which gets loaded for every hid device.
 # CONFIG_USB_YEALINK is not set
 CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
@@ -2315,6 +2374,7 @@
 #
 CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
 
 #
 # USB port drivers
@@ -2374,7 +2434,7 @@
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_XIRCOM=m
-# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_DEBUG=m
 
 CONFIG_USB_EZUSB=y
 CONFIG_USB_EMI62=m
@@ -2391,7 +2451,9 @@
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LCD=m
-CONFIG_USB_TEST=m
+CONFIG_USB_BERRY_CHARGE=m
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
 # CONFIG_USB_GADGET is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
 # CONFIG_USB_GADGET_GOKU is not set
@@ -2429,6 +2491,7 @@
 CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_USB_LD=m
 CONFIG_USB_APPLETOUCH=m
+CONFIG_USB_GTCO=m
 CONFIG_USB_TRANCEVIBRATOR=m
 
 CONFIG_USB_TOUCHSCREEN=m
@@ -2437,6 +2500,19 @@
 CONFIG_USB_HIDINPUT_POWERBOOK=y
 
 #
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCMCIAHOST=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE=y
+
+# Multifunction USB devices
+CONFIG_MFD_SM501=m
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=m
@@ -2487,7 +2563,6 @@
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
 CONFIG_UDF_FS=m
 
 #
@@ -2524,13 +2599,14 @@
 # CONFIG_BEFS_DEBUG is not set
 CONFIG_BFS_FS=m
 CONFIG_EFS_FS=m
-# CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
@@ -2696,13 +2772,15 @@
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y
 CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DEBUG_DEVRES=y
 
 #
 # Security options
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
@@ -2727,6 +2805,7 @@
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=m
@@ -2734,6 +2813,7 @@
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_KHAZAD=m
@@ -2741,16 +2821,19 @@
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_MPILIB=y
 CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIGNATURE_DSA=y
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
 
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_LIBCRC32C=m
@@ -2762,7 +2845,9 @@
 CONFIG_CRC16=m
 CONFIG_CRC32=m
 CONFIG_CRC_CCITT=m
+CONFIG_CRC_ITU_T=m
 
+CONFIG_EEPROM_93CX6=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 
@@ -2776,9 +2861,14 @@
 CONFIG_ATA_OVER_ETH=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY_BACKLIGHT=y
+
 CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
 
 CONFIG_SCHEDSTATS=y
 
@@ -2790,7 +2880,6 @@
 CONFIG_CPUSETS=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
-# CONFIG_SECCOMP is not set
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_MUST_CHECK=y
 
@@ -2810,8 +2899,9 @@
 
 CONFIG_PM_LEGACY=y
 # CONFIG_PM_SYSFS_DEPRECATED is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_TRACE is not set
+CONFIG_PM_DEBUG=y
+CONFIG_PM_TRACE=y
+# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
 
 CONFIG_CRASH=m
 
@@ -2964,6 +3054,7 @@
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INDIGOIO=m
 CONFIG_SND_INDIGODJ=m
+# CONFIG_SND_SOC is not set
 
 ## END of ISA options.
 
@@ -3001,22 +3092,30 @@
 
 CONFIG_HZ_1000=y
 
-CONFIG_HID=m
+CONFIG_TIMER_STATS=y
 
+# Auxillary displays
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=y
+CONFIG_CFAG12864B_RATE=20
+
+CONFIG_DEBUG_IGNORE_QUIET=y
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_RWSEMS=y
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_PROVE_LOCKING=y
 CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_SLEEP_IN_IRQ=y
 
 CONFIG_FAULT_INJECTION=y
 CONFIG_FAILSLAB=y
 CONFIG_FAIL_PAGE_ALLOC=y
 CONFIG_FAIL_MAKE_REQUEST=y
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
-
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 CONFIG_UID16=y
 # CONFIG_X86_PC is not set
 CONFIG_X86_GENERICARCH=y
@@ -3049,7 +3148,6 @@
 CONFIG_NR_CPUS=32
 CONFIG_X86_GENERIC=y
 CONFIG_X86_CMPXCHG=y
-CONFIG_X86_XADD=y
 CONFIG_X86_L1_CACHE_SHIFT=7
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_X86_PPRO_FENCE=y
@@ -3091,6 +3189,7 @@
 # CONFIG_PCI_GODIRECT is not set
 # CONFIG_PCI_GOMMCONFIG is not set
 CONFIG_PCI_GOANY=y
+# CONFIG_SECCOMP is not set
 CONFIG_I2O_BLOCK=m
 CONFIG_I2O_SCSI=m
 CONFIG_I2O_PROC=m
@@ -3110,30 +3209,33 @@
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_MPPARSE=y
 CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_AC=m
+CONFIG_ACPI_ASUS=m
 CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BAY=m
+CONFIG_ACPI_IBM_BAY=y
+CONFIG_ACPI_BLACKLIST_YEAR=1999
 CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_FAN=y
-CONFIG_ACPI_PROCESSOR=y
-CONFIG_ACPI_THERMAL=y
-CONFIG_ACPI_ASUS=m
-CONFIG_ACPI_TOSHIBA=m
+CONFIG_ACPI_CONTAINER=m
 # CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DOCK=m
 CONFIG_ACPI_EC=y
-CONFIG_ACPI_POWER=y
-CONFIG_ACPI_SYSTEM=y
-CONFIG_ACPI_NUMA=y
-CONFIG_ACPI_BLACKLIST_YEAR=1999
-CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=y
 CONFIG_ACPI_IBM=m
-CONFIG_PNPACPI=y
-CONFIG_ACPI_DOCK=m
 # CONFIG_ACPI_IBM_DOCK is not set
+CONFIG_ACPI_NUMA=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_POWER=y
+CONFIG_ACPI_PROCFS=y
 CONFIG_ACPI_SBS=m
+CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
-# CONFIG_ACPI_HOTKEY is not set
-CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_SYSTEM=y
+CONFIG_ACPI_THERMAL=y
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_PNPACPI=y
+CONFIG_ASUS_LAPTOP=m
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_DEBUG=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
@@ -3152,17 +3254,16 @@
 CONFIG_X86_POWERNOW_K7=y
 CONFIG_X86_POWERNOW_K8=y
 # CONFIG_X86_GX_SUSPMOD is not set
-CONFIG_X86_SPEEDSTEP_CENTRINO=y
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 CONFIG_X86_SPEEDSTEP_ICH=y
 CONFIG_X86_SPEEDSTEP_SMI=y
 CONFIG_X86_SPEEDSTEP_LIB=y
-CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y
-CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
 # CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
 CONFIG_X86_P4_CLOCKMOD=m
 CONFIG_X86_LONGRUN=y
 # CONFIG_X86_LONGHAUL is not set
 # CONFIG_X86_CPUFREQ_NFORCE2 is not set
+CONFIG_X86_E_POWERSAVER=y
 CONFIG_X86_SMP=y
 CONFIG_X86_HT=y
 CONFIG_X86_BIOS_REBOOT=y
@@ -3191,7 +3292,6 @@
 CONFIG_HOTPLUG_PCI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 # CONFIG_HOTPLUG_PCI_SHPC is not set
-# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
 CONFIG_PM=y
 CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200_MONITOR=y
@@ -3236,6 +3336,9 @@
 CONFIG_KVM_AMD=m
 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_NOHIGHMEM is not set
 CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set


Index: kernel-2.6.20-i686-xen.config
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-2.6.20-i686-xen.config,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- kernel-2.6.20-i686-xen.config	22 Mar 2007 16:01:16 -0000	1.1
+++ kernel-2.6.20-i686-xen.config	10 Apr 2007 22:41:59 -0000	1.1.2.1
@@ -57,6 +57,7 @@
 CONFIG_KMOD=y
 CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
+CONFIG_MODULE_VERIFY_ELF=y
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -68,7 +69,6 @@
 # CONFIG_PCI_MULTITHREAD_PROBE is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
-# FIXME: Was borked in .17git11 for non-acpi machines.
 CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_HOTPLUG_PCI_FAKE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
@@ -105,6 +105,7 @@
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
+# CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
@@ -112,6 +113,8 @@
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_AMSO1100=m
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 
 #
 # Executable file formats
@@ -257,7 +260,7 @@
 # CONFIG_PNPBIOS is not set
 
 CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m 
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 
 #
 # Block devices
@@ -304,6 +307,11 @@
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_LSF=y
 
+CONFIG_BLK_DEV_DELKIN=m
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+
+
 #
 # ATA/ATAPI/MFM/RLL support
 #
@@ -445,22 +453,23 @@
 CONFIG_MEGARAID_SAS=m
 
 CONFIG_ATA=m
-CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_VIA=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_NV=m
 CONFIG_PDC_ADMA=m
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_QSTOR=m
+CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SIL=m
 CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
 
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
@@ -479,6 +488,7 @@
 CONFIG_PATA_HPT3X3=m
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_IT821X=m
+CONFIG_PATA_IT8213=m
 CONFIG_PATA_JMICRON=m
 # CONFIG_PATA_LEGACY is not set
 CONFIG_PATA_TRIFLEX=m
@@ -583,9 +593,9 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-CONFIG_FW=m
-CONFIG_FW_OHCI=m
-CONFIG_FW_SBP2=m
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 
 #
 # IEEE 1394 (FireWire) support
@@ -625,6 +635,7 @@
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -707,6 +718,7 @@
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -758,6 +770,7 @@
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
@@ -785,7 +798,6 @@
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_NAT=m
@@ -824,6 +836,7 @@
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RT=m
@@ -860,6 +873,7 @@
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
@@ -978,7 +992,7 @@
 
 #
 # ATM
-# 
+#
 # CONFIG_ATM_DUMMY is not set
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_LANE=m
@@ -1069,6 +1083,7 @@
 CONFIG_B44=m
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_E100=m
@@ -1086,6 +1101,7 @@
 CONFIG_SIS900=m
 CONFIG_SIS190=m
 CONFIG_EPIC100=m
+CONFIG_SC92031=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_TLAN=m
@@ -1132,6 +1148,7 @@
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y
+CONFIG_CHELSIO_T3=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1154,26 +1171,19 @@
 # CONFIG_SLIP_MODE_SLIP6 is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
+# Wireless LAN
 #
+CONFIG_WLAN_PRE80211=y
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
+CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 
-#
-# Wireless 802.11b ISA/PCI cards support
-#
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -1181,6 +1191,9 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
+CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT_COMPAT=y
+# CONFIG_NL80211 is not set
 CONFIG_IPW2100=m
 CONFIG_IPW2200=m
 # CONFIG_IPW2100_DEBUG is not set
@@ -1188,6 +1201,38 @@
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_BCM43XX_MAC80211=m
+CONFIG_BCM43XX_MAC80211_PCI=y
+CONFIG_BCM43XX_MAC80211_PCMCIA=y
+CONFIG_BCM43XX_MAC80211_DEBUG=y
+CONFIG_BCM43XX_MAC80211_DMA=y
+CONFIG_BCM43XX_MAC80211_PIO=y
+CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set
+# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set
+CONFIG_RT2X00=y
+CONFIG_RT2400PCI=m
+# CONFIG_RT2400PCI_DEBUG is not set
+CONFIG_RT2500PCI=m
+# CONFIG_RT2500PCI_DEBUG is not set
+CONFIG_RT61PCI=m
+# CONFIG_RT61PCI_DEBUG is not set
+CONFIG_RT2500USB=m
+# CONFIG_RT2500USB_DEBUG is not set
+CONFIG_RT73USB=m
+# CONFIG_RT73USB_DEBUG is not set
+CONFIG_RT2X00_DEBUGFS=m
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_ADM8211=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_ZD1211RW_MAC80211=m
+# CONFIG_ZD1211RW_MAC80211_DEBUG is not set
+CONFIG_RTL818X=y
+CONFIG_RTL8187=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_DEBUG=y
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1199,10 +1244,6 @@
 CONFIG_PRISM54=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
@@ -1397,6 +1438,7 @@
 # CAPI subsystem
 #
 CONFIG_ISDN_CAPI=m
+# CONFIG_CAPI_TRACE is not set
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
@@ -1425,6 +1467,7 @@
 
 CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M101=m
 CONFIG_GIGASET_M105=m
 # CONFIG_GIGASET_DEBUG is not set
 # CONFIG_GIGASET_UNDOCREQ is not set
@@ -1521,8 +1564,10 @@
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_INPUT_ATLAS_BTNS=m
 
 CONFIG_MAC_EMUMOUSEBTN=y
+
 #
 # Character devices
 #
@@ -1607,6 +1652,7 @@
 #
 
 CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PASEMI=m
 CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_SAVAGE4=m
 CONFIG_I2C_VOODOO3=m
@@ -1644,6 +1690,7 @@
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ATXP1=m
@@ -1764,22 +1811,22 @@
 CONFIG_RTC_INTF_SYSFS=m
 CONFIG_RTC_INTF_PROC=m
 CONFIG_RTC_INTF_DEV=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS1742=m
+# CONFIG_RTC_DRV_EP93XX is not set
+CONFIG_RTC_DRV_ISL1208=m
+# CONFIG_RTC_DRV_M48T86 is not set
 CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_RS5C372=m
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_EP93XX is not set
 # CONFIG_RTC_DRV_SA1100 is not set
 # CONFIG_RTC_DRV_TEST is not set
-
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_V3020=m
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -1811,6 +1858,7 @@
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_VIA=m
+CONFIG_DRM_NOUVEAU=m
 
 #
 # PCMCIA character devices
@@ -1959,6 +2007,7 @@
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_CXUSB=m
 CONFIG_DVB_USB_DIBUSB_MB=m
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
@@ -1966,12 +2015,17 @@
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_GL861=m
 CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_VP702X=m
 CONFIG_DVB_USB_VP7045=m
+
+CONFIG_DVB_TUNER_QT1010=m
+
 CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_LGDT330X=m
 
@@ -1982,7 +2036,6 @@
 
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
 CONFIG_VIDEO_BTCX=m
@@ -1996,18 +2049,30 @@
 # Graphics support
 #
 CONFIG_FB=y
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
+CONFIG_FB_3DFX=m
+CONFIG_FB_3DFX_ACCEL=y
+# CONFIG_FB_ARC is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+# CONFIG_FB_ASILIANT is not set
+CONFIG_FB_CIRRUS=m
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_CYBLA=m
+# CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
-CONFIG_FB_RIVA=m
-# CONFIG_FB_RIVA_DEBUG is not set
-# CONFIG_FB_RIVA_I2C is not set
 CONFIG_FB_I810=m
 CONFIG_FB_I810_GTF=y
 CONFIG_FB_I810_I2C=y
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_IMAC is not set
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_KYRO=m
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -2015,44 +2080,35 @@
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_MATROX_MULTIHEAD=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
 CONFIG_FB_RADEON=m
 # CONFIG_FB_RADEON_DEBUG is not set
 CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GX=y
+CONFIG_FB_RIVA=m
+# CONFIG_FB_RIVA_DEBUG is not set
+# CONFIG_FB_RIVA_I2C is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
 # CONFIG_FB_SIS is not set
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_VOODOO1=m
+CONFIG_FB_SM501=m
+CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_KYRO=m
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-# CONFIG_FB_ASILIANT is not set
-CONFIG_FB_3DFX_ACCEL=y
 CONFIG_FB_TRIDENT_ACCEL=y
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_TILEBLITTING=y
-# CONFIG_FB_ARC is not set
-CONFIG_FB_INTEL=m
-# CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_CYBLA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_VGA16=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_VOODOO1=m
+
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_IMAC is not set
 
 #
 # Console display driver support
@@ -2108,6 +2164,7 @@
 CONFIG_SND_MTS64=m
 # CONFIG_SND_SERIAL_U16550 is not set
 CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
 
 #
@@ -2196,10 +2253,8 @@
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
-CONFIG_USB_MULTITHREAD_PROBE=y
 
 #
 # USB Host Controller Drivers
@@ -2209,6 +2264,7 @@
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_CS=m
 
@@ -2241,11 +2297,13 @@
 # USB Human Interface Devices (HID)
 #
 CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-CONFIG_USB_HID_POWERBOOK=y
+
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y
 CONFIG_LOGITECH_FF=y
+CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
@@ -2296,6 +2354,7 @@
 # Has dumb detection, which gets loaded for every hid device.
 # CONFIG_USB_YEALINK is not set
 CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
@@ -2315,6 +2374,7 @@
 #
 CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
 
 #
 # USB port drivers
@@ -2374,7 +2434,7 @@
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_XIRCOM=m
-# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_DEBUG=m
 
 CONFIG_USB_EZUSB=y
 CONFIG_USB_EMI62=m
@@ -2391,6 +2451,8 @@
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LCD=m
+CONFIG_USB_BERRY_CHARGE=m
+# CONFIG_USB_IOWARRIOR is not set
 CONFIG_USB_TEST=m
 # CONFIG_USB_GADGET is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
@@ -2429,6 +2491,7 @@
 CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_USB_LD=m
 CONFIG_USB_APPLETOUCH=m
+CONFIG_USB_GTCO=m
 CONFIG_USB_TRANCEVIBRATOR=m
 
 CONFIG_USB_TOUCHSCREEN=m
@@ -2437,6 +2500,19 @@
 CONFIG_USB_HIDINPUT_POWERBOOK=y
 
 #
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCMCIAHOST=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE=y
+
+# Multifunction USB devices
+CONFIG_MFD_SM501=m
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=m
@@ -2487,7 +2563,6 @@
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
 CONFIG_UDF_FS=m
 
 #
@@ -2524,13 +2599,14 @@
 # CONFIG_BEFS_DEBUG is not set
 CONFIG_BFS_FS=m
 CONFIG_EFS_FS=m
-# CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
@@ -2696,13 +2772,15 @@
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y
 CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DEBUG_DEVRES=y
 
 #
 # Security options
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
@@ -2727,6 +2805,7 @@
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=m
@@ -2734,6 +2813,7 @@
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_KHAZAD=m
@@ -2741,16 +2821,19 @@
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_MPILIB=y
 CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIGNATURE_DSA=y
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
 
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_LIBCRC32C=m
@@ -2762,7 +2845,9 @@
 CONFIG_CRC16=m
 CONFIG_CRC32=m
 CONFIG_CRC_CCITT=m
+CONFIG_CRC_ITU_T=m
 
+CONFIG_EEPROM_93CX6=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 
@@ -2776,9 +2861,14 @@
 CONFIG_ATA_OVER_ETH=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY_BACKLIGHT=y
+
 CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
 
 CONFIG_SCHEDSTATS=y
 
@@ -2790,7 +2880,6 @@
 CONFIG_CPUSETS=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
-# CONFIG_SECCOMP is not set
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_MUST_CHECK=y
 
@@ -2810,8 +2899,9 @@
 
 CONFIG_PM_LEGACY=y
 # CONFIG_PM_SYSFS_DEPRECATED is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_TRACE is not set
+CONFIG_PM_DEBUG=y
+CONFIG_PM_TRACE=y
+# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
 
 CONFIG_CRASH=m
 
@@ -2964,6 +3054,7 @@
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INDIGOIO=m
 CONFIG_SND_INDIGODJ=m
+# CONFIG_SND_SOC is not set
 
 ## END of ISA options.
 
@@ -3001,21 +3092,31 @@
 
 # CONFIG_HZ_1000 is not set
 
-CONFIG_HID=m
+CONFIG_TIMER_STATS=y
+
+# Auxillary displays
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=y
+CONFIG_CFAG12864B_RATE=20
 
+CONFIG_DEBUG_IGNORE_QUIET=y
 # CONFIG_DEBUG_SLAB is not set
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_RWSEMS=y
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_PROVE_LOCKING=y
 CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_SLEEP_IN_IRQ=y
 
 CONFIG_FAULT_INJECTION=y
 CONFIG_FAILSLAB=y
 CONFIG_FAIL_PAGE_ALLOC=y
 CONFIG_FAIL_MAKE_REQUEST=y
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+
 CONFIG_UID16=y
 # CONFIG_X86_PC is not set
 # CONFIG_X86_GENERICARCH is not set
@@ -3048,7 +3149,6 @@
 CONFIG_NR_CPUS=32
 CONFIG_X86_GENERIC=y
 CONFIG_X86_CMPXCHG=y
-CONFIG_X86_XADD=y
 CONFIG_X86_L1_CACHE_SHIFT=7
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_X86_PPRO_FENCE=y
@@ -3090,6 +3190,7 @@
 # CONFIG_PCI_GODIRECT is not set
 # CONFIG_PCI_GOMMCONFIG is not set
 CONFIG_PCI_GOANY=y
+# CONFIG_SECCOMP is not set
 CONFIG_I2O_BLOCK=m
 CONFIG_I2O_SCSI=m
 CONFIG_I2O_PROC=m
@@ -3109,30 +3210,33 @@
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_MPPARSE=y
 CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_AC=m
+CONFIG_ACPI_ASUS=m
 CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BAY=m
+CONFIG_ACPI_IBM_BAY=y
+CONFIG_ACPI_BLACKLIST_YEAR=1999
 CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_FAN=y
-CONFIG_ACPI_PROCESSOR=y
-CONFIG_ACPI_THERMAL=y
-CONFIG_ACPI_ASUS=m
-CONFIG_ACPI_TOSHIBA=m
+CONFIG_ACPI_CONTAINER=m
 # CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DOCK=m
 CONFIG_ACPI_EC=y
-CONFIG_ACPI_POWER=y
-CONFIG_ACPI_SYSTEM=y
-CONFIG_ACPI_NUMA=y
-CONFIG_ACPI_BLACKLIST_YEAR=1999
-CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=y
 CONFIG_ACPI_IBM=m
-CONFIG_PNPACPI=y
-CONFIG_ACPI_DOCK=m
 # CONFIG_ACPI_IBM_DOCK is not set
+CONFIG_ACPI_NUMA=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_POWER=y
+CONFIG_ACPI_PROCFS=y
 CONFIG_ACPI_SBS=m
+CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
-# CONFIG_ACPI_HOTKEY is not set
-CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_SYSTEM=y
+CONFIG_ACPI_THERMAL=y
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_PNPACPI=y
+CONFIG_ASUS_LAPTOP=m
 # CONFIG_CPU_FREQ is not set
 CONFIG_CPU_FREQ_DEBUG=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
@@ -3155,13 +3259,12 @@
 CONFIG_X86_SPEEDSTEP_ICH=y
 CONFIG_X86_SPEEDSTEP_SMI=y
 CONFIG_X86_SPEEDSTEP_LIB=y
-CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y
-CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
 # CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
 CONFIG_X86_P4_CLOCKMOD=m
 CONFIG_X86_LONGRUN=y
 # CONFIG_X86_LONGHAUL is not set
 # CONFIG_X86_CPUFREQ_NFORCE2 is not set
+CONFIG_X86_E_POWERSAVER=y
 CONFIG_X86_SMP=y
 CONFIG_X86_HT=y
 CONFIG_X86_BIOS_REBOOT=y
@@ -3190,7 +3293,6 @@
 CONFIG_HOTPLUG_PCI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 # CONFIG_HOTPLUG_PCI_SHPC is not set
-# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
 CONFIG_PM=y
 CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200_MONITOR=y
@@ -3235,6 +3337,9 @@
 CONFIG_KVM_AMD=m
 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_XEN_PCIDEV_FRONTEND=y
 # CONFIG_XEN_PCIDEV_FE_DEBUG is not set
 CONFIG_XEN=y
@@ -3279,3 +3384,23 @@
 # CONFIG_NOHIGHMEM is not set
 # CONFIG_HIGHMEM4G is not set
 CONFIG_HIGHMEM64G=y
+CONFIG_FW=m
+CONFIG_FW_OHCI=m
+CONFIG_FW_SBP2=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
+CONFIG_NET_RADIO=y
+CONFIG_VIDEO_VIDEOBUF=m
+# CONFIG_USB_BANDWIDTH is not set
+CONFIG_USB_MULTITHREAD_PROBE=y
+CONFIG_USB_HIDINPUT=y
+CONFIG_USB_HID_POWERBOOK=y
+CONFIG_ZISOFS_FS=y
+# CONFIG_JFFS_FS is not set
+CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_LCD_DEVICE=y
+CONFIG_DEBUG_RWSEMS=y
+CONFIG_X86_XADD=y
+# CONFIG_ACPI_HOTKEY is not set
+CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y
+CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
+# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set


Index: kernel-2.6.20-i686.config
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-2.6.20-i686.config,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- kernel-2.6.20-i686.config	22 Mar 2007 16:06:42 -0000	1.1
+++ kernel-2.6.20-i686.config	10 Apr 2007 22:41:59 -0000	1.1.2.1
@@ -57,6 +57,7 @@
 CONFIG_KMOD=y
 CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
+CONFIG_MODULE_VERIFY_ELF=y
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -68,7 +69,6 @@
 # CONFIG_PCI_MULTITHREAD_PROBE is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
-# FIXME: Was borked in .17git11 for non-acpi machines.
 CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_HOTPLUG_PCI_FAKE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
@@ -105,6 +105,7 @@
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
+# CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
@@ -112,6 +113,8 @@
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_AMSO1100=m
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 
 #
 # Executable file formats
@@ -257,7 +260,7 @@
 # CONFIG_PNPBIOS is not set
 
 CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m 
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 
 #
 # Block devices
@@ -304,6 +307,11 @@
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_LSF=y
 
+CONFIG_BLK_DEV_DELKIN=m
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+
+
 #
 # ATA/ATAPI/MFM/RLL support
 #
@@ -445,22 +453,23 @@
 CONFIG_MEGARAID_SAS=m
 
 CONFIG_ATA=m
-CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_VIA=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_NV=m
 CONFIG_PDC_ADMA=m
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_QSTOR=m
+CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SIL=m
 CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
 
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
@@ -479,6 +488,7 @@
 CONFIG_PATA_HPT3X3=m
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_IT821X=m
+CONFIG_PATA_IT8213=m
 CONFIG_PATA_JMICRON=m
 # CONFIG_PATA_LEGACY is not set
 CONFIG_PATA_TRIFLEX=m
@@ -583,9 +593,9 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-CONFIG_FW=m
-CONFIG_FW_OHCI=m
-CONFIG_FW_SBP2=m
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 
 #
 # IEEE 1394 (FireWire) support
@@ -625,6 +635,7 @@
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -707,6 +718,7 @@
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -758,6 +770,7 @@
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
@@ -785,7 +798,6 @@
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_NAT=m
@@ -824,6 +836,7 @@
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RT=m
@@ -860,6 +873,7 @@
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
@@ -978,7 +992,7 @@
 
 #
 # ATM
-# 
+#
 # CONFIG_ATM_DUMMY is not set
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_LANE=m
@@ -1069,6 +1083,7 @@
 CONFIG_B44=m
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_E100=m
@@ -1086,6 +1101,7 @@
 CONFIG_SIS900=m
 CONFIG_SIS190=m
 CONFIG_EPIC100=m
+CONFIG_SC92031=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_TLAN=m
@@ -1132,6 +1148,7 @@
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y
+CONFIG_CHELSIO_T3=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1154,26 +1171,19 @@
 # CONFIG_SLIP_MODE_SLIP6 is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
+# Wireless LAN
 #
+CONFIG_WLAN_PRE80211=y
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
+CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 
-#
-# Wireless 802.11b ISA/PCI cards support
-#
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -1181,6 +1191,9 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
+CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT_COMPAT=y
+# CONFIG_NL80211 is not set
 CONFIG_IPW2100=m
 CONFIG_IPW2200=m
 # CONFIG_IPW2100_DEBUG is not set
@@ -1188,6 +1201,38 @@
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_BCM43XX_MAC80211=m
+CONFIG_BCM43XX_MAC80211_PCI=y
+CONFIG_BCM43XX_MAC80211_PCMCIA=y
+CONFIG_BCM43XX_MAC80211_DEBUG=y
+CONFIG_BCM43XX_MAC80211_DMA=y
+CONFIG_BCM43XX_MAC80211_PIO=y
+CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set
+# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set
+CONFIG_RT2X00=y
+CONFIG_RT2400PCI=m
+# CONFIG_RT2400PCI_DEBUG is not set
+CONFIG_RT2500PCI=m
+# CONFIG_RT2500PCI_DEBUG is not set
+CONFIG_RT61PCI=m
+# CONFIG_RT61PCI_DEBUG is not set
+CONFIG_RT2500USB=m
+# CONFIG_RT2500USB_DEBUG is not set
+CONFIG_RT73USB=m
+# CONFIG_RT73USB_DEBUG is not set
+CONFIG_RT2X00_DEBUGFS=m
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_ADM8211=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_ZD1211RW_MAC80211=m
+# CONFIG_ZD1211RW_MAC80211_DEBUG is not set
+CONFIG_RTL818X=y
+CONFIG_RTL8187=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_DEBUG=y
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1199,10 +1244,6 @@
 CONFIG_PRISM54=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
@@ -1397,6 +1438,7 @@
 # CAPI subsystem
 #
 CONFIG_ISDN_CAPI=m
+# CONFIG_CAPI_TRACE is not set
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
@@ -1425,6 +1467,7 @@
 
 CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M101=m
 CONFIG_GIGASET_M105=m
 # CONFIG_GIGASET_DEBUG is not set
 # CONFIG_GIGASET_UNDOCREQ is not set
@@ -1521,8 +1564,10 @@
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_INPUT_ATLAS_BTNS=m
 
 CONFIG_MAC_EMUMOUSEBTN=y
+
 #
 # Character devices
 #
@@ -1607,6 +1652,7 @@
 #
 
 CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PASEMI=m
 CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_SAVAGE4=m
 CONFIG_I2C_VOODOO3=m
@@ -1644,6 +1690,7 @@
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ATXP1=m
@@ -1764,22 +1811,22 @@
 CONFIG_RTC_INTF_SYSFS=m
 CONFIG_RTC_INTF_PROC=m
 CONFIG_RTC_INTF_DEV=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS1742=m
+# CONFIG_RTC_DRV_EP93XX is not set
+CONFIG_RTC_DRV_ISL1208=m
+# CONFIG_RTC_DRV_M48T86 is not set
 CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_RS5C372=m
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_EP93XX is not set
 # CONFIG_RTC_DRV_SA1100 is not set
 # CONFIG_RTC_DRV_TEST is not set
-
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_V3020=m
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -1811,6 +1858,7 @@
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_VIA=m
+CONFIG_DRM_NOUVEAU=m
 
 #
 # PCMCIA character devices
@@ -1959,6 +2007,7 @@
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_CXUSB=m
 CONFIG_DVB_USB_DIBUSB_MB=m
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
@@ -1966,12 +2015,17 @@
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_GL861=m
 CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_VP702X=m
 CONFIG_DVB_USB_VP7045=m
+
+CONFIG_DVB_TUNER_QT1010=m
+
 CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_LGDT330X=m
 
@@ -1982,7 +2036,6 @@
 
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
 CONFIG_VIDEO_BTCX=m
@@ -1996,18 +2049,30 @@
 # Graphics support
 #
 CONFIG_FB=y
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
+CONFIG_FB_3DFX=m
+CONFIG_FB_3DFX_ACCEL=y
+# CONFIG_FB_ARC is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+# CONFIG_FB_ASILIANT is not set
+CONFIG_FB_CIRRUS=m
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_CYBLA=m
+# CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
-CONFIG_FB_RIVA=m
-# CONFIG_FB_RIVA_DEBUG is not set
-# CONFIG_FB_RIVA_I2C is not set
 CONFIG_FB_I810=m
 CONFIG_FB_I810_GTF=y
 CONFIG_FB_I810_I2C=y
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_IMAC is not set
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_KYRO=m
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -2015,44 +2080,35 @@
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_MATROX_MULTIHEAD=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
 CONFIG_FB_RADEON=m
 # CONFIG_FB_RADEON_DEBUG is not set
 CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GX=y
+CONFIG_FB_RIVA=m
+# CONFIG_FB_RIVA_DEBUG is not set
+# CONFIG_FB_RIVA_I2C is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
 # CONFIG_FB_SIS is not set
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_VOODOO1=m
+CONFIG_FB_SM501=m
+CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_KYRO=m
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-# CONFIG_FB_ASILIANT is not set
-CONFIG_FB_3DFX_ACCEL=y
 CONFIG_FB_TRIDENT_ACCEL=y
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_TILEBLITTING=y
-# CONFIG_FB_ARC is not set
-CONFIG_FB_INTEL=m
-# CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_CYBLA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_VGA16=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_VOODOO1=m
+
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_IMAC is not set
 
 #
 # Console display driver support
@@ -2108,6 +2164,7 @@
 CONFIG_SND_MTS64=m
 # CONFIG_SND_SERIAL_U16550 is not set
 CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
 
 #
@@ -2196,10 +2253,8 @@
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
-CONFIG_USB_MULTITHREAD_PROBE=y
 
 #
 # USB Host Controller Drivers
@@ -2209,6 +2264,7 @@
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_CS=m
 
@@ -2241,11 +2297,13 @@
 # USB Human Interface Devices (HID)
 #
 CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-CONFIG_USB_HID_POWERBOOK=y
+
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y
 CONFIG_LOGITECH_FF=y
+CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
@@ -2296,6 +2354,7 @@
 # Has dumb detection, which gets loaded for every hid device.
 # CONFIG_USB_YEALINK is not set
 CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
@@ -2315,6 +2374,7 @@
 #
 CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
 
 #
 # USB port drivers
@@ -2374,7 +2434,7 @@
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_XIRCOM=m
-# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_DEBUG=m
 
 CONFIG_USB_EZUSB=y
 CONFIG_USB_EMI62=m
@@ -2391,7 +2451,9 @@
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LCD=m
-CONFIG_USB_TEST=m
+CONFIG_USB_BERRY_CHARGE=m
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
 # CONFIG_USB_GADGET is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
 # CONFIG_USB_GADGET_GOKU is not set
@@ -2429,6 +2491,7 @@
 CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_USB_LD=m
 CONFIG_USB_APPLETOUCH=m
+CONFIG_USB_GTCO=m
 CONFIG_USB_TRANCEVIBRATOR=m
 
 CONFIG_USB_TOUCHSCREEN=m
@@ -2437,6 +2500,19 @@
 CONFIG_USB_HIDINPUT_POWERBOOK=y
 
 #
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCMCIAHOST=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE=y
+
+# Multifunction USB devices
+CONFIG_MFD_SM501=m
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=m
@@ -2487,7 +2563,6 @@
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
 CONFIG_UDF_FS=m
 
 #
@@ -2524,13 +2599,14 @@
 # CONFIG_BEFS_DEBUG is not set
 CONFIG_BFS_FS=m
 CONFIG_EFS_FS=m
-# CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
@@ -2696,13 +2772,15 @@
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y
 CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DEBUG_DEVRES=y
 
 #
 # Security options
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
@@ -2727,6 +2805,7 @@
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=m
@@ -2734,6 +2813,7 @@
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_KHAZAD=m
@@ -2741,16 +2821,19 @@
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_MPILIB=y
 CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIGNATURE_DSA=y
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
 
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_LIBCRC32C=m
@@ -2762,7 +2845,9 @@
 CONFIG_CRC16=m
 CONFIG_CRC32=m
 CONFIG_CRC_CCITT=m
+CONFIG_CRC_ITU_T=m
 
+CONFIG_EEPROM_93CX6=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 
@@ -2776,9 +2861,14 @@
 CONFIG_ATA_OVER_ETH=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY_BACKLIGHT=y
+
 CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
 
 CONFIG_SCHEDSTATS=y
 
@@ -2790,7 +2880,6 @@
 CONFIG_CPUSETS=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
-# CONFIG_SECCOMP is not set
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_MUST_CHECK=y
 
@@ -2810,8 +2899,9 @@
 
 CONFIG_PM_LEGACY=y
 # CONFIG_PM_SYSFS_DEPRECATED is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_TRACE is not set
+CONFIG_PM_DEBUG=y
+CONFIG_PM_TRACE=y
+# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
 
 CONFIG_CRASH=m
 
@@ -2964,6 +3054,7 @@
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INDIGOIO=m
 CONFIG_SND_INDIGODJ=m
+# CONFIG_SND_SOC is not set
 
 ## END of ISA options.
 
@@ -3001,21 +3092,31 @@
 
 CONFIG_HZ_1000=y
 
-CONFIG_HID=m
+CONFIG_TIMER_STATS=y
 
+# Auxillary displays
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=y
+CONFIG_CFAG12864B_RATE=20
+
+CONFIG_DEBUG_IGNORE_QUIET=y
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_RWSEMS=y
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_PROVE_LOCKING=y
 CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_SLEEP_IN_IRQ=y
 
 CONFIG_FAULT_INJECTION=y
 CONFIG_FAILSLAB=y
 CONFIG_FAIL_PAGE_ALLOC=y
 CONFIG_FAIL_MAKE_REQUEST=y
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+
 CONFIG_UID16=y
 # CONFIG_X86_PC is not set
 CONFIG_X86_GENERICARCH=y
@@ -3048,7 +3149,6 @@
 CONFIG_NR_CPUS=32
 CONFIG_X86_GENERIC=y
 CONFIG_X86_CMPXCHG=y
-CONFIG_X86_XADD=y
 CONFIG_X86_L1_CACHE_SHIFT=7
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_X86_PPRO_FENCE=y
@@ -3090,6 +3190,7 @@
 # CONFIG_PCI_GODIRECT is not set
 # CONFIG_PCI_GOMMCONFIG is not set
 CONFIG_PCI_GOANY=y
+# CONFIG_SECCOMP is not set
 CONFIG_I2O_BLOCK=m
 CONFIG_I2O_SCSI=m
 CONFIG_I2O_PROC=m
@@ -3109,30 +3210,33 @@
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_MPPARSE=y
 CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_AC=m
+CONFIG_ACPI_ASUS=m
 CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BAY=m
+CONFIG_ACPI_IBM_BAY=y
+CONFIG_ACPI_BLACKLIST_YEAR=1999
 CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_FAN=y
-CONFIG_ACPI_PROCESSOR=y
-CONFIG_ACPI_THERMAL=y
-CONFIG_ACPI_ASUS=m
-CONFIG_ACPI_TOSHIBA=m
+CONFIG_ACPI_CONTAINER=m
 # CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DOCK=m
 CONFIG_ACPI_EC=y
-CONFIG_ACPI_POWER=y
-CONFIG_ACPI_SYSTEM=y
-CONFIG_ACPI_NUMA=y
-CONFIG_ACPI_BLACKLIST_YEAR=1999
-CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=y
 CONFIG_ACPI_IBM=m
-CONFIG_PNPACPI=y
-CONFIG_ACPI_DOCK=m
 # CONFIG_ACPI_IBM_DOCK is not set
+CONFIG_ACPI_NUMA=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_POWER=y
+CONFIG_ACPI_PROCFS=y
 CONFIG_ACPI_SBS=m
+CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
-# CONFIG_ACPI_HOTKEY is not set
-CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_SYSTEM=y
+CONFIG_ACPI_THERMAL=y
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_PNPACPI=y
+CONFIG_ASUS_LAPTOP=m
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_DEBUG=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
@@ -3151,17 +3255,16 @@
 CONFIG_X86_POWERNOW_K7=y
 CONFIG_X86_POWERNOW_K8=y
 # CONFIG_X86_GX_SUSPMOD is not set
-CONFIG_X86_SPEEDSTEP_CENTRINO=y
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 CONFIG_X86_SPEEDSTEP_ICH=y
 CONFIG_X86_SPEEDSTEP_SMI=y
 CONFIG_X86_SPEEDSTEP_LIB=y
-CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y
-CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
 # CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
 CONFIG_X86_P4_CLOCKMOD=m
 CONFIG_X86_LONGRUN=y
 # CONFIG_X86_LONGHAUL is not set
 # CONFIG_X86_CPUFREQ_NFORCE2 is not set
+CONFIG_X86_E_POWERSAVER=y
 CONFIG_X86_SMP=y
 CONFIG_X86_HT=y
 CONFIG_X86_BIOS_REBOOT=y
@@ -3190,7 +3293,6 @@
 CONFIG_HOTPLUG_PCI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 # CONFIG_HOTPLUG_PCI_SHPC is not set
-# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
 CONFIG_PM=y
 CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200_MONITOR=y
@@ -3235,6 +3337,9 @@
 CONFIG_KVM_AMD=m
 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_NOHIGHMEM is not set
 CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set


Index: kernel-2.6.20-ia64-xen.config
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-2.6.20-ia64-xen.config,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- kernel-2.6.20-ia64-xen.config	22 Mar 2007 16:01:16 -0000	1.1
+++ kernel-2.6.20-ia64-xen.config	10 Apr 2007 22:41:59 -0000	1.1.2.1
@@ -57,6 +57,7 @@
 CONFIG_KMOD=y
 CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
+CONFIG_MODULE_VERIFY_ELF=y
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -68,7 +69,6 @@
 # CONFIG_PCI_MULTITHREAD_PROBE is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
-# FIXME: Was borked in .17git11 for non-acpi machines.
 # CONFIG_HOTPLUG_PCI_PCIE is not set
 CONFIG_HOTPLUG_PCI_FAKE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
@@ -105,6 +105,7 @@
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
+# CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
@@ -112,6 +113,8 @@
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_AMSO1100=m
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 
 #
 # Executable file formats
@@ -257,7 +260,7 @@
 # CONFIG_PNPBIOS is not set
 
 CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m 
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 
 #
 # Block devices
@@ -304,6 +307,11 @@
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_LSF=y
 
+CONFIG_BLK_DEV_DELKIN=m
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+
+
 #
 # ATA/ATAPI/MFM/RLL support
 #
@@ -445,22 +453,23 @@
 CONFIG_MEGARAID_SAS=m
 
 CONFIG_ATA=m
-CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_VIA=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_NV=m
 CONFIG_PDC_ADMA=m
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_QSTOR=m
+CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SIL=m
 CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
 
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
@@ -479,6 +488,7 @@
 CONFIG_PATA_HPT3X3=m
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_IT821X=m
+CONFIG_PATA_IT8213=m
 CONFIG_PATA_JMICRON=m
 # CONFIG_PATA_LEGACY is not set
 CONFIG_PATA_TRIFLEX=m
@@ -583,9 +593,9 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-CONFIG_FW=m
-CONFIG_FW_OHCI=m
-CONFIG_FW_SBP2=m
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 
 #
 # IEEE 1394 (FireWire) support
@@ -625,6 +635,7 @@
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -707,6 +718,7 @@
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -758,6 +770,7 @@
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
@@ -785,7 +798,6 @@
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_NAT=m
@@ -824,6 +836,7 @@
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RT=m
@@ -860,6 +873,7 @@
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
@@ -978,7 +992,7 @@
 
 #
 # ATM
-# 
+#
 # CONFIG_ATM_DUMMY is not set
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_LANE=m
@@ -1069,6 +1083,7 @@
 CONFIG_B44=m
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_E100=m
@@ -1086,6 +1101,7 @@
 CONFIG_SIS900=m
 CONFIG_SIS190=m
 CONFIG_EPIC100=m
+CONFIG_SC92031=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_TLAN=m
@@ -1132,6 +1148,7 @@
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y
+CONFIG_CHELSIO_T3=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1154,26 +1171,19 @@
 # CONFIG_SLIP_MODE_SLIP6 is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
+# Wireless LAN
 #
+CONFIG_WLAN_PRE80211=y
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
+CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 
-#
-# Wireless 802.11b ISA/PCI cards support
-#
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 CONFIG_IEEE80211_DEBUG=y
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -1181,6 +1191,9 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
+CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT_COMPAT=y
+# CONFIG_NL80211 is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
@@ -1188,6 +1201,38 @@
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_BCM43XX_MAC80211=m
+CONFIG_BCM43XX_MAC80211_PCI=y
+CONFIG_BCM43XX_MAC80211_PCMCIA=y
+CONFIG_BCM43XX_MAC80211_DEBUG=y
+CONFIG_BCM43XX_MAC80211_DMA=y
+CONFIG_BCM43XX_MAC80211_PIO=y
+CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set
+# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set
+CONFIG_RT2X00=y
+CONFIG_RT2400PCI=m
+# CONFIG_RT2400PCI_DEBUG is not set
+CONFIG_RT2500PCI=m
+# CONFIG_RT2500PCI_DEBUG is not set
+CONFIG_RT61PCI=m
+# CONFIG_RT61PCI_DEBUG is not set
+CONFIG_RT2500USB=m
+# CONFIG_RT2500USB_DEBUG is not set
+CONFIG_RT73USB=m
+# CONFIG_RT73USB_DEBUG is not set
+CONFIG_RT2X00_DEBUGFS=m
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_ADM8211=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_ZD1211RW_MAC80211=m
+# CONFIG_ZD1211RW_MAC80211_DEBUG is not set
+CONFIG_RTL818X=y
+CONFIG_RTL8187=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_DEBUG=y
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1199,10 +1244,6 @@
 CONFIG_PRISM54=m
 # CONFIG_BCM43XX is not set
 CONFIG_BCM43XX_DEBUG=y
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
@@ -1397,6 +1438,7 @@
 # CAPI subsystem
 #
 CONFIG_ISDN_CAPI=m
+# CONFIG_CAPI_TRACE is not set
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
@@ -1425,6 +1467,7 @@
 
 CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M101=m
 CONFIG_GIGASET_M105=m
 # CONFIG_GIGASET_DEBUG is not set
 # CONFIG_GIGASET_UNDOCREQ is not set
@@ -1521,8 +1564,10 @@
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_INPUT_ATLAS_BTNS=m
 
 CONFIG_MAC_EMUMOUSEBTN=y
+
 #
 # Character devices
 #
@@ -1607,6 +1652,7 @@
 #
 
 CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PASEMI=m
 CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_SAVAGE4=m
 CONFIG_I2C_VOODOO3=m
@@ -1644,6 +1690,7 @@
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ATXP1=m
@@ -1764,22 +1811,22 @@
 CONFIG_RTC_INTF_SYSFS=m
 CONFIG_RTC_INTF_PROC=m
 CONFIG_RTC_INTF_DEV=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS1742=m
+# CONFIG_RTC_DRV_EP93XX is not set
+CONFIG_RTC_DRV_ISL1208=m
+# CONFIG_RTC_DRV_M48T86 is not set
 CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_RS5C372=m
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_EP93XX is not set
 # CONFIG_RTC_DRV_SA1100 is not set
 # CONFIG_RTC_DRV_TEST is not set
-
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_V3020=m
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -1811,6 +1858,7 @@
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_VIA=m
+CONFIG_DRM_NOUVEAU=m
 
 #
 # PCMCIA character devices
@@ -1959,6 +2007,7 @@
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_CXUSB=m
 CONFIG_DVB_USB_DIBUSB_MB=m
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
@@ -1966,12 +2015,17 @@
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_GL861=m
 CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_VP702X=m
 CONFIG_DVB_USB_VP7045=m
+
+CONFIG_DVB_TUNER_QT1010=m
+
 CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_LGDT330X=m
 
@@ -1982,7 +2036,6 @@
 
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
 CONFIG_VIDEO_BTCX=m
@@ -1996,18 +2049,30 @@
 # Graphics support
 #
 CONFIG_FB=y
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
+CONFIG_FB_3DFX=m
+CONFIG_FB_3DFX_ACCEL=y
+# CONFIG_FB_ARC is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+# CONFIG_FB_ASILIANT is not set
+CONFIG_FB_CIRRUS=m
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_CYBLA=m
+# CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
-CONFIG_FB_RIVA=m
-# CONFIG_FB_RIVA_DEBUG is not set
-# CONFIG_FB_RIVA_I2C is not set
 CONFIG_FB_I810=m
 CONFIG_FB_I810_GTF=y
 CONFIG_FB_I810_I2C=y
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_IMAC is not set
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_KYRO=m
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -2015,44 +2080,35 @@
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_MATROX_MULTIHEAD=y
+# CONFIG_FB_NEOMAGIC is not set
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
 CONFIG_FB_RADEON=m
 # CONFIG_FB_RADEON_DEBUG is not set
 CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GX=y
+CONFIG_FB_RIVA=m
+# CONFIG_FB_RIVA_DEBUG is not set
+# CONFIG_FB_RIVA_I2C is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
 # CONFIG_FB_SIS is not set
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
-# CONFIG_FB_NEOMAGIC is not set
-CONFIG_FB_3DFX=m
-CONFIG_FB_VOODOO1=m
+CONFIG_FB_SM501=m
+CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_KYRO=m
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-# CONFIG_FB_ASILIANT is not set
-CONFIG_FB_3DFX_ACCEL=y
 CONFIG_FB_TRIDENT_ACCEL=y
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_TILEBLITTING=y
-# CONFIG_FB_ARC is not set
-CONFIG_FB_INTEL=m
-# CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_CYBLA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_VGA16=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_VOODOO1=m
+
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_IMAC is not set
 
 #
 # Console display driver support
@@ -2108,6 +2164,7 @@
 CONFIG_SND_MTS64=m
 # CONFIG_SND_SERIAL_U16550 is not set
 CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
 
 #
@@ -2196,10 +2253,8 @@
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
-CONFIG_USB_MULTITHREAD_PROBE=y
 
 #
 # USB Host Controller Drivers
@@ -2209,6 +2264,7 @@
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_CS=m
 
@@ -2241,11 +2297,13 @@
 # USB Human Interface Devices (HID)
 #
 CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-CONFIG_USB_HID_POWERBOOK=y
+
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y
 CONFIG_LOGITECH_FF=y
+CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
@@ -2296,6 +2354,7 @@
 # Has dumb detection, which gets loaded for every hid device.
 # CONFIG_USB_YEALINK is not set
 CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
@@ -2315,6 +2374,7 @@
 #
 CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
 
 #
 # USB port drivers
@@ -2374,7 +2434,7 @@
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_XIRCOM=m
-# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_DEBUG=m
 
 CONFIG_USB_EZUSB=y
 CONFIG_USB_EMI62=m
@@ -2391,6 +2451,8 @@
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LCD=m
+CONFIG_USB_BERRY_CHARGE=m
+# CONFIG_USB_IOWARRIOR is not set
 CONFIG_USB_TEST=m
 # CONFIG_USB_GADGET is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
@@ -2429,6 +2491,7 @@
 CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_USB_LD=m
 CONFIG_USB_APPLETOUCH=m
+CONFIG_USB_GTCO=m
 CONFIG_USB_TRANCEVIBRATOR=m
 
 CONFIG_USB_TOUCHSCREEN=m
@@ -2437,6 +2500,19 @@
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 
 #
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCMCIAHOST=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE=y
+
+# Multifunction USB devices
+CONFIG_MFD_SM501=m
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=m
@@ -2487,7 +2563,6 @@
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
 CONFIG_UDF_FS=m
 
 #
@@ -2524,13 +2599,14 @@
 # CONFIG_BEFS_DEBUG is not set
 CONFIG_BFS_FS=m
 CONFIG_EFS_FS=m
-# CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
@@ -2696,13 +2772,15 @@
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y
 CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DEBUG_DEVRES=y
 
 #
 # Security options
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
@@ -2727,6 +2805,7 @@
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=m
@@ -2734,6 +2813,7 @@
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_KHAZAD=m
@@ -2741,16 +2821,19 @@
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_MPILIB=y
 CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIGNATURE_DSA=y
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
 
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_LIBCRC32C=m
@@ -2762,7 +2845,9 @@
 CONFIG_CRC16=m
 CONFIG_CRC32=m
 CONFIG_CRC_CCITT=m
+CONFIG_CRC_ITU_T=m
 
+CONFIG_EEPROM_93CX6=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 
@@ -2776,9 +2861,14 @@
 CONFIG_ATA_OVER_ETH=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY_BACKLIGHT=y
+
 CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
 
 CONFIG_SCHEDSTATS=y
 
@@ -2790,7 +2880,6 @@
 CONFIG_CPUSETS=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
-# CONFIG_SECCOMP is not set
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_MUST_CHECK=y
 
@@ -2810,8 +2899,9 @@
 
 CONFIG_PM_LEGACY=y
 # CONFIG_PM_SYSFS_DEPRECATED is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_TRACE is not set
+CONFIG_PM_DEBUG=y
+CONFIG_PM_TRACE=y
+# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
 
 # CONFIG_CRASH is not set
 
@@ -2964,6 +3054,7 @@
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INDIGOIO=m
 CONFIG_SND_INDIGODJ=m
+# CONFIG_SND_SOC is not set
 
 ## END of ISA options.
 
@@ -3001,21 +3092,31 @@
 
 # CONFIG_HZ_1000 is not set
 
-CONFIG_HID=m
+CONFIG_TIMER_STATS=y
+
+# Auxillary displays
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=y
+CONFIG_CFAG12864B_RATE=20
 
+CONFIG_DEBUG_IGNORE_QUIET=y
 # CONFIG_DEBUG_SLAB is not set
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_RWSEMS=y
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_PROVE_LOCKING=y
 CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_SLEEP_IN_IRQ=y
 
 CONFIG_FAULT_INJECTION=y
 CONFIG_FAILSLAB=y
 CONFIG_FAIL_PAGE_ALLOC=y
 CONFIG_FAIL_MAKE_REQUEST=y
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+
 CONFIG_IA64=y
 CONFIG_64BIT=y
 CONFIG_XEN=y
@@ -3073,32 +3174,33 @@
 CONFIG_SGI_SNSC=y
 CONFIG_IA64_SGI_SN_XP=y
 CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_AC=m
+# CONFIG_ACPI_ASUS is not set
+CONFIG_ACPI_BAY=m
 CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_FAN=y
-CONFIG_ACPI_PROCESSOR=y
-CONFIG_ACPI_THERMAL=y
-# CONFIG_ACPI_ASUS is not set
-# CONFIG_ACPI_TOSHIBA is not set
 # CONFIG_ACPI_DEBUG is not set
+# CONFIG_ACPI_DOCK is not set
 CONFIG_ACPI_EC=y
+CONFIG_ACPI_FAN=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
+CONFIG_ACPI_NUMA=y
 CONFIG_ACPI_POWER=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_PROCFS=y
+CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SYSTEM=y
-CONFIG_ACPI_NUMA=y
-CONFIG_ACPI_BLACKLIST_YEAR=0
-# CONFIG_ACPI_DOCK is not set
-CONFIG_ACPI_HOTPLUG_MEMORY=y
+CONFIG_ACPI_THERMAL=y
+# CONFIG_ACPI_TOSHIBA is not set
+CONFIG_ACPI_VIDEO=m
 CONFIG_SERIAL_SGI_L1_CONSOLE=y
 CONFIG_PM=y
 CONFIG_HOTPLUG_PCI=y
 # CONFIG_HPET is not set
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y
 CONFIG_HOTPLUG_PCI_SGI=m
-CONFIG_ACPI_VIDEO=m
 CONFIG_PNPACPI=y
 CONFIG_SCHED_SMT=y
 CONFIG_SGI_TIOCX=y
@@ -3163,8 +3265,28 @@
 CONFIG_XEN_SMPBOOT=y
 CONFIG_MICROCODE=y
 CONFIG_HZ_250=y
+# CONFIG_KVM is not set
+# CONFIG_KVM_INTEL is not set
+# CONFIG_KVM_AMD is not set
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_XEN_IA64_DOM0_VP=y
+CONFIG_FW=m
+CONFIG_FW_OHCI=m
+CONFIG_FW_SBP2=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
+CONFIG_NET_RADIO=y
+CONFIG_VIDEO_VIDEOBUF=m
+# CONFIG_USB_BANDWIDTH is not set
+CONFIG_USB_MULTITHREAD_PROBE=y
+CONFIG_USB_HIDINPUT=y
+CONFIG_USB_HID_POWERBOOK=y
+CONFIG_ZISOFS_FS=y
+# CONFIG_JFFS_FS is not set
+CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_LCD_DEVICE=y
+# CONFIG_SECCOMP is not set
+CONFIG_DEBUG_RWSEMS=y
+CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y
 CONFIG_XEN_IA64_EXPOSE_P2M=y
 CONFIG_XEN_IA64_EXPOSE_P2M_USE_DTR=y


Index: kernel-2.6.20-ia64.config
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-2.6.20-ia64.config,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- kernel-2.6.20-ia64.config	22 Mar 2007 16:06:42 -0000	1.1
+++ kernel-2.6.20-ia64.config	10 Apr 2007 22:41:59 -0000	1.1.2.1
@@ -57,6 +57,7 @@
 CONFIG_KMOD=y
 CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
+CONFIG_MODULE_VERIFY_ELF=y
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -68,8 +69,7 @@
 # CONFIG_PCI_MULTITHREAD_PROBE is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
-# FIXME: Was borked in .17git11 for non-acpi machines.
-# CONFIG_HOTPLUG_PCI_PCIE is not set
+CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_HOTPLUG_PCI_FAKE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
 CONFIG_ISA=y
@@ -105,6 +105,7 @@
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
+# CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
@@ -112,6 +113,8 @@
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_AMSO1100=m
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 
 #
 # Executable file formats
@@ -257,7 +260,7 @@
 # CONFIG_PNPBIOS is not set
 
 CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m 
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 
 #
 # Block devices
@@ -304,6 +307,11 @@
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_LSF=y
 
+CONFIG_BLK_DEV_DELKIN=m
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+
+
 #
 # ATA/ATAPI/MFM/RLL support
 #
@@ -445,22 +453,23 @@
 CONFIG_MEGARAID_SAS=m
 
 CONFIG_ATA=m
-CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_VIA=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_NV=m
 CONFIG_PDC_ADMA=m
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_QSTOR=m
+CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SIL=m
 CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
 
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
@@ -479,6 +488,7 @@
 CONFIG_PATA_HPT3X3=m
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_IT821X=m
+CONFIG_PATA_IT8213=m
 CONFIG_PATA_JMICRON=m
 # CONFIG_PATA_LEGACY is not set
 CONFIG_PATA_TRIFLEX=m
@@ -583,9 +593,9 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-CONFIG_FW=m
-CONFIG_FW_OHCI=m
-CONFIG_FW_SBP2=m
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 
 #
 # IEEE 1394 (FireWire) support
@@ -625,6 +635,7 @@
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -707,6 +718,7 @@
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -758,6 +770,7 @@
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
@@ -785,7 +798,6 @@
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_NAT=m
@@ -824,6 +836,7 @@
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RT=m
@@ -860,6 +873,7 @@
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
@@ -978,7 +992,7 @@
 
 #
 # ATM
-# 
+#
 # CONFIG_ATM_DUMMY is not set
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_LANE=m
@@ -1069,6 +1083,7 @@
 CONFIG_B44=m
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_E100=m
@@ -1086,6 +1101,7 @@
 CONFIG_SIS900=m
 CONFIG_SIS190=m
 CONFIG_EPIC100=m
+CONFIG_SC92031=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_TLAN=m
@@ -1132,6 +1148,7 @@
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y
+CONFIG_CHELSIO_T3=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1154,26 +1171,19 @@
 # CONFIG_SLIP_MODE_SLIP6 is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
+# Wireless LAN
 #
+CONFIG_WLAN_PRE80211=y
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
+CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 
-#
-# Wireless 802.11b ISA/PCI cards support
-#
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 CONFIG_IEEE80211_DEBUG=y
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -1181,6 +1191,9 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
+CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT_COMPAT=y
+# CONFIG_NL80211 is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
@@ -1188,6 +1201,38 @@
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_BCM43XX_MAC80211=m
+CONFIG_BCM43XX_MAC80211_PCI=y
+CONFIG_BCM43XX_MAC80211_PCMCIA=y
+CONFIG_BCM43XX_MAC80211_DEBUG=y
+CONFIG_BCM43XX_MAC80211_DMA=y
+CONFIG_BCM43XX_MAC80211_PIO=y
+CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set
+# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set
+CONFIG_RT2X00=y
+CONFIG_RT2400PCI=m
+# CONFIG_RT2400PCI_DEBUG is not set
+CONFIG_RT2500PCI=m
+# CONFIG_RT2500PCI_DEBUG is not set
+CONFIG_RT61PCI=m
+# CONFIG_RT61PCI_DEBUG is not set
+CONFIG_RT2500USB=m
+# CONFIG_RT2500USB_DEBUG is not set
+CONFIG_RT73USB=m
+# CONFIG_RT73USB_DEBUG is not set
+CONFIG_RT2X00_DEBUGFS=m
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_ADM8211=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_ZD1211RW_MAC80211=m
+# CONFIG_ZD1211RW_MAC80211_DEBUG is not set
+CONFIG_RTL818X=y
+CONFIG_RTL8187=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_DEBUG=y
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1199,10 +1244,6 @@
 CONFIG_PRISM54=m
 # CONFIG_BCM43XX is not set
 CONFIG_BCM43XX_DEBUG=y
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
@@ -1397,6 +1438,7 @@
 # CAPI subsystem
 #
 CONFIG_ISDN_CAPI=m
+# CONFIG_CAPI_TRACE is not set
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
@@ -1425,6 +1467,7 @@
 
 CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M101=m
 CONFIG_GIGASET_M105=m
 # CONFIG_GIGASET_DEBUG is not set
 # CONFIG_GIGASET_UNDOCREQ is not set
@@ -1521,8 +1564,10 @@
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_INPUT_ATLAS_BTNS=m
 
 CONFIG_MAC_EMUMOUSEBTN=y
+
 #
 # Character devices
 #
@@ -1607,6 +1652,7 @@
 #
 
 CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PASEMI=m
 CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_SAVAGE4=m
 CONFIG_I2C_VOODOO3=m
@@ -1644,6 +1690,7 @@
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ATXP1=m
@@ -1764,22 +1811,22 @@
 CONFIG_RTC_INTF_SYSFS=m
 CONFIG_RTC_INTF_PROC=m
 CONFIG_RTC_INTF_DEV=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS1742=m
+# CONFIG_RTC_DRV_EP93XX is not set
+CONFIG_RTC_DRV_ISL1208=m
+# CONFIG_RTC_DRV_M48T86 is not set
 CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_RS5C372=m
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_EP93XX is not set
 # CONFIG_RTC_DRV_SA1100 is not set
 # CONFIG_RTC_DRV_TEST is not set
-
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_V3020=m
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -1811,6 +1858,7 @@
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_VIA=m
+CONFIG_DRM_NOUVEAU=m
 
 #
 # PCMCIA character devices
@@ -1959,6 +2007,7 @@
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_CXUSB=m
 CONFIG_DVB_USB_DIBUSB_MB=m
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
@@ -1966,12 +2015,17 @@
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_GL861=m
 CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_VP702X=m
 CONFIG_DVB_USB_VP7045=m
+
+CONFIG_DVB_TUNER_QT1010=m
+
 CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_LGDT330X=m
 
@@ -1982,7 +2036,6 @@
 
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
 CONFIG_VIDEO_BTCX=m
@@ -1996,18 +2049,30 @@
 # Graphics support
 #
 CONFIG_FB=y
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
+CONFIG_FB_3DFX=m
+CONFIG_FB_3DFX_ACCEL=y
+# CONFIG_FB_ARC is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+# CONFIG_FB_ASILIANT is not set
+CONFIG_FB_CIRRUS=m
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_CYBLA=m
+# CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
-CONFIG_FB_RIVA=m
-# CONFIG_FB_RIVA_DEBUG is not set
-# CONFIG_FB_RIVA_I2C is not set
 CONFIG_FB_I810=m
 CONFIG_FB_I810_GTF=y
 CONFIG_FB_I810_I2C=y
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_IMAC is not set
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_KYRO=m
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -2015,44 +2080,35 @@
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_MATROX_MULTIHEAD=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
 CONFIG_FB_RADEON=m
 # CONFIG_FB_RADEON_DEBUG is not set
 CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GX=y
+CONFIG_FB_RIVA=m
+# CONFIG_FB_RIVA_DEBUG is not set
+# CONFIG_FB_RIVA_I2C is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
 # CONFIG_FB_SIS is not set
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_VOODOO1=m
+CONFIG_FB_SM501=m
+CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_KYRO=m
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-# CONFIG_FB_ASILIANT is not set
-CONFIG_FB_3DFX_ACCEL=y
 CONFIG_FB_TRIDENT_ACCEL=y
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_TILEBLITTING=y
-# CONFIG_FB_ARC is not set
-CONFIG_FB_INTEL=m
-# CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_CYBLA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_VGA16=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_VOODOO1=m
+
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_IMAC is not set
 
 #
 # Console display driver support
@@ -2108,6 +2164,7 @@
 CONFIG_SND_MTS64=m
 # CONFIG_SND_SERIAL_U16550 is not set
 CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
 
 #
@@ -2196,10 +2253,8 @@
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
-CONFIG_USB_MULTITHREAD_PROBE=y
 
 #
 # USB Host Controller Drivers
@@ -2209,6 +2264,7 @@
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_CS=m
 
@@ -2241,11 +2297,13 @@
 # USB Human Interface Devices (HID)
 #
 CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-CONFIG_USB_HID_POWERBOOK=y
+
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y
 CONFIG_LOGITECH_FF=y
+CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
@@ -2296,6 +2354,7 @@
 # Has dumb detection, which gets loaded for every hid device.
 # CONFIG_USB_YEALINK is not set
 CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
@@ -2315,6 +2374,7 @@
 #
 CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
 
 #
 # USB port drivers
@@ -2374,7 +2434,7 @@
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_XIRCOM=m
-# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_DEBUG=m
 
 CONFIG_USB_EZUSB=y
 CONFIG_USB_EMI62=m
@@ -2391,7 +2451,9 @@
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LCD=m
-CONFIG_USB_TEST=m
+CONFIG_USB_BERRY_CHARGE=m
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
 # CONFIG_USB_GADGET is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
 # CONFIG_USB_GADGET_GOKU is not set
@@ -2429,6 +2491,7 @@
 CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_USB_LD=m
 CONFIG_USB_APPLETOUCH=m
+CONFIG_USB_GTCO=m
 CONFIG_USB_TRANCEVIBRATOR=m
 
 CONFIG_USB_TOUCHSCREEN=m
@@ -2437,6 +2500,19 @@
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 
 #
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCMCIAHOST=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE=y
+
+# Multifunction USB devices
+CONFIG_MFD_SM501=m
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=m
@@ -2487,7 +2563,6 @@
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
 CONFIG_UDF_FS=m
 
 #
@@ -2524,13 +2599,14 @@
 # CONFIG_BEFS_DEBUG is not set
 CONFIG_BFS_FS=m
 CONFIG_EFS_FS=m
-# CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
@@ -2696,13 +2772,15 @@
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y
 CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DEBUG_DEVRES=y
 
 #
 # Security options
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
@@ -2727,6 +2805,7 @@
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=m
@@ -2734,6 +2813,7 @@
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_KHAZAD=m
@@ -2741,16 +2821,19 @@
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_MPILIB=y
 CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIGNATURE_DSA=y
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
 
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_LIBCRC32C=m
@@ -2762,7 +2845,9 @@
 CONFIG_CRC16=m
 CONFIG_CRC32=m
 CONFIG_CRC_CCITT=m
+CONFIG_CRC_ITU_T=m
 
+CONFIG_EEPROM_93CX6=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 
@@ -2776,9 +2861,14 @@
 CONFIG_ATA_OVER_ETH=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY_BACKLIGHT=y
+
 CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
 
 CONFIG_SCHEDSTATS=y
 
@@ -2790,7 +2880,6 @@
 CONFIG_CPUSETS=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
-# CONFIG_SECCOMP is not set
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_MUST_CHECK=y
 
@@ -2810,8 +2899,9 @@
 
 CONFIG_PM_LEGACY=y
 # CONFIG_PM_SYSFS_DEPRECATED is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_TRACE is not set
+CONFIG_PM_DEBUG=y
+CONFIG_PM_TRACE=y
+# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
 
 # CONFIG_CRASH is not set
 
@@ -2964,6 +3054,7 @@
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INDIGOIO=m
 CONFIG_SND_INDIGODJ=m
+# CONFIG_SND_SOC is not set
 
 ## END of ISA options.
 
@@ -3001,21 +3092,31 @@
 
 CONFIG_HZ_1000=y
 
-CONFIG_HID=m
+CONFIG_TIMER_STATS=y
+
+# Auxillary displays
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=y
+CONFIG_CFAG12864B_RATE=20
 
+CONFIG_DEBUG_IGNORE_QUIET=y
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_RWSEMS=y
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_PROVE_LOCKING=y
 CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_SLEEP_IN_IRQ=y
 
 CONFIG_FAULT_INJECTION=y
 CONFIG_FAILSLAB=y
 CONFIG_FAIL_PAGE_ALLOC=y
 CONFIG_FAIL_MAKE_REQUEST=y
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+
 CONFIG_IA64=y
 CONFIG_64BIT=y
 # CONFIG_XEN is not set
@@ -3073,32 +3174,33 @@
 CONFIG_SGI_SNSC=y
 CONFIG_IA64_SGI_SN_XP=y
 CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_AC=m
+# CONFIG_ACPI_ASUS is not set
+CONFIG_ACPI_BAY=m
 CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_FAN=y
-CONFIG_ACPI_PROCESSOR=y
-CONFIG_ACPI_THERMAL=y
-# CONFIG_ACPI_ASUS is not set
-# CONFIG_ACPI_TOSHIBA is not set
 # CONFIG_ACPI_DEBUG is not set
+# CONFIG_ACPI_DOCK is not set
 CONFIG_ACPI_EC=y
+CONFIG_ACPI_FAN=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
+CONFIG_ACPI_NUMA=y
 CONFIG_ACPI_POWER=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_PROCFS=y
+CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SYSTEM=y
-CONFIG_ACPI_NUMA=y
-CONFIG_ACPI_BLACKLIST_YEAR=0
-# CONFIG_ACPI_DOCK is not set
-CONFIG_ACPI_HOTPLUG_MEMORY=y
+CONFIG_ACPI_THERMAL=y
+# CONFIG_ACPI_TOSHIBA is not set
+CONFIG_ACPI_VIDEO=m
 CONFIG_SERIAL_SGI_L1_CONSOLE=y
 CONFIG_PM=y
 CONFIG_HOTPLUG_PCI=y
 # CONFIG_HPET is not set
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y
 CONFIG_HOTPLUG_PCI_SGI=m
-CONFIG_ACPI_VIDEO=m
 CONFIG_PNPACPI=y
 CONFIG_SCHED_SMT=y
 CONFIG_SGI_TIOCX=y
@@ -3124,4 +3226,3 @@
 CONFIG_NODES_SHIFT=10
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_PROC_VMCORE=y
-# CONFIG_XEN_IA64_EXPOSE_P2M is not set


Index: kernel-2.6.20-ppc-smp.config
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-2.6.20-ppc-smp.config,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- kernel-2.6.20-ppc-smp.config	22 Mar 2007 16:06:42 -0000	1.1
+++ kernel-2.6.20-ppc-smp.config	10 Apr 2007 22:41:59 -0000	1.1.2.1
@@ -57,6 +57,7 @@
 CONFIG_KMOD=y
 CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
+CONFIG_MODULE_VERIFY_ELF=y
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -68,8 +69,7 @@
 # CONFIG_PCI_MULTITHREAD_PROBE is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
-# FIXME: Was borked in .17git11 for non-acpi machines.
-# CONFIG_HOTPLUG_PCI_PCIE is not set
+CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_HOTPLUG_PCI_FAKE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
 CONFIG_ISA=y
@@ -105,6 +105,7 @@
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
+# CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
@@ -112,6 +113,8 @@
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_AMSO1100=m
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 
 #
 # Executable file formats
@@ -257,7 +260,7 @@
 # CONFIG_PNPBIOS is not set
 
 CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m 
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 
 #
 # Block devices
@@ -304,6 +307,11 @@
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_LSF=y
 
+CONFIG_BLK_DEV_DELKIN=m
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+
+
 #
 # ATA/ATAPI/MFM/RLL support
 #
@@ -331,7 +339,7 @@
 CONFIG_BLK_DEV_CMD640=y
 CONFIG_BLK_DEV_CMD640_ENHANCED=y
 # CONFIG_BLK_DEV_IDEPNP is not set
-# CONFIG_BLK_DEV_IDEPCI is not set 
+# CONFIG_BLK_DEV_IDEPCI is not set
 CONFIG_IDEPCI_SHARE_IRQ=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
 CONFIG_BLK_DEV_GENERIC=y
@@ -445,22 +453,23 @@
 CONFIG_MEGARAID_SAS=m
 
 CONFIG_ATA=m
-CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_VIA=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_NV=m
 CONFIG_PDC_ADMA=m
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_QSTOR=m
+CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SIL=m
 CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
 
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
@@ -479,6 +488,7 @@
 CONFIG_PATA_HPT3X3=m
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_IT821X=m
+CONFIG_PATA_IT8213=m
 CONFIG_PATA_JMICRON=m
 # CONFIG_PATA_LEGACY is not set
 CONFIG_PATA_TRIFLEX=m
@@ -583,9 +593,9 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-CONFIG_FW=m
-CONFIG_FW_OHCI=m
-CONFIG_FW_SBP2=m
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 
 #
 # IEEE 1394 (FireWire) support
@@ -625,6 +635,7 @@
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -707,6 +718,7 @@
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -758,6 +770,7 @@
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
@@ -785,7 +798,6 @@
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_NAT=m
@@ -824,6 +836,7 @@
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RT=m
@@ -860,6 +873,7 @@
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
@@ -978,7 +992,7 @@
 
 #
 # ATM
-# 
+#
 # CONFIG_ATM_DUMMY is not set
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_LANE=m
@@ -1069,6 +1083,7 @@
 CONFIG_B44=m
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_E100=m
@@ -1086,6 +1101,7 @@
 CONFIG_SIS900=m
 CONFIG_SIS190=m
 CONFIG_EPIC100=m
+CONFIG_SC92031=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_TLAN=m
@@ -1132,6 +1148,7 @@
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y
+CONFIG_CHELSIO_T3=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1154,26 +1171,19 @@
 # CONFIG_SLIP_MODE_SLIP6 is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
+# Wireless LAN
 #
+CONFIG_WLAN_PRE80211=y
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
+CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 
-#
-# Wireless 802.11b ISA/PCI cards support
-#
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 CONFIG_IEEE80211_DEBUG=y
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -1181,6 +1191,9 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
+CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT_COMPAT=y
+# CONFIG_NL80211 is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
@@ -1188,6 +1201,38 @@
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_BCM43XX_MAC80211=m
+CONFIG_BCM43XX_MAC80211_PCI=y
+CONFIG_BCM43XX_MAC80211_PCMCIA=y
+CONFIG_BCM43XX_MAC80211_DEBUG=y
+CONFIG_BCM43XX_MAC80211_DMA=y
+CONFIG_BCM43XX_MAC80211_PIO=y
+CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set
+# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set
+CONFIG_RT2X00=y
+CONFIG_RT2400PCI=m
+# CONFIG_RT2400PCI_DEBUG is not set
+CONFIG_RT2500PCI=m
+# CONFIG_RT2500PCI_DEBUG is not set
+CONFIG_RT61PCI=m
+# CONFIG_RT61PCI_DEBUG is not set
+CONFIG_RT2500USB=m
+# CONFIG_RT2500USB_DEBUG is not set
+CONFIG_RT73USB=m
+# CONFIG_RT73USB_DEBUG is not set
+CONFIG_RT2X00_DEBUGFS=m
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_ADM8211=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_ZD1211RW_MAC80211=m
+# CONFIG_ZD1211RW_MAC80211_DEBUG is not set
+CONFIG_RTL818X=y
+CONFIG_RTL8187=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_DEBUG=y
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1199,10 +1244,6 @@
 CONFIG_PRISM54=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
@@ -1397,6 +1438,7 @@
 # CAPI subsystem
 #
 CONFIG_ISDN_CAPI=m
+# CONFIG_CAPI_TRACE is not set
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
@@ -1425,6 +1467,7 @@
 
 CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M101=m
 CONFIG_GIGASET_M105=m
 # CONFIG_GIGASET_DEBUG is not set
 # CONFIG_GIGASET_UNDOCREQ is not set
@@ -1521,8 +1564,10 @@
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_INPUT_ATLAS_BTNS=m
 
 CONFIG_MAC_EMUMOUSEBTN=y
+
 #
 # Character devices
 #
@@ -1607,6 +1652,7 @@
 #
 
 CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PASEMI=m
 CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_SAVAGE4=m
 CONFIG_I2C_VOODOO3=m
@@ -1644,6 +1690,7 @@
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ATXP1=m
@@ -1764,22 +1811,22 @@
 CONFIG_RTC_INTF_SYSFS=m
 CONFIG_RTC_INTF_PROC=m
 CONFIG_RTC_INTF_DEV=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS1742=m
+# CONFIG_RTC_DRV_EP93XX is not set
+CONFIG_RTC_DRV_ISL1208=m
+# CONFIG_RTC_DRV_M48T86 is not set
 CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_RS5C372=m
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_EP93XX is not set
 # CONFIG_RTC_DRV_SA1100 is not set
 # CONFIG_RTC_DRV_TEST is not set
-
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_V3020=m
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -1811,6 +1858,7 @@
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_VIA=m
+CONFIG_DRM_NOUVEAU=m
 
 #
 # PCMCIA character devices
@@ -1959,6 +2007,7 @@
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_CXUSB=m
 CONFIG_DVB_USB_DIBUSB_MB=m
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
@@ -1966,12 +2015,17 @@
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_GL861=m
 CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_VP702X=m
 CONFIG_DVB_USB_VP7045=m
+
+CONFIG_DVB_TUNER_QT1010=m
+
 CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_LGDT330X=m
 
@@ -1982,7 +2036,6 @@
 
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
 CONFIG_VIDEO_BTCX=m
@@ -1996,18 +2049,30 @@
 # Graphics support
 #
 CONFIG_FB=y
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_VGA16 is not set
-CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
+CONFIG_FB_3DFX=m
+CONFIG_FB_3DFX_ACCEL=y
+# CONFIG_FB_ARC is not set
+CONFIG_FB_ATY128=y
+CONFIG_FB_ATY=y
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+# CONFIG_FB_ASILIANT is not set
+CONFIG_FB_CIRRUS=m
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_CYBLA=m
+# CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
-CONFIG_FB_RIVA=m
-# CONFIG_FB_RIVA_DEBUG is not set
-# CONFIG_FB_RIVA_I2C is not set
 CONFIG_FB_I810=m
 CONFIG_FB_I810_GTF=y
 CONFIG_FB_I810_I2C=y
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_IMAC is not set
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_KYRO=m
 CONFIG_FB_MATROX=y
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -2015,44 +2080,35 @@
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_MATROX_MULTIHEAD=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_NVIDIA=y
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
 CONFIG_FB_RADEON=y
 # CONFIG_FB_RADEON_DEBUG is not set
 CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_ATY128=y
-CONFIG_FB_ATY=y
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GX=y
+CONFIG_FB_RIVA=m
+# CONFIG_FB_RIVA_DEBUG is not set
+# CONFIG_FB_RIVA_I2C is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
 # CONFIG_FB_SIS is not set
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_VOODOO1=m
+CONFIG_FB_SM501=m
+CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_KYRO=m
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-# CONFIG_FB_ASILIANT is not set
-CONFIG_FB_3DFX_ACCEL=y
 CONFIG_FB_TRIDENT_ACCEL=y
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_TILEBLITTING=y
-# CONFIG_FB_ARC is not set
-CONFIG_FB_INTEL=m
-# CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_NVIDIA=y
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_CYBLA=m
+CONFIG_FB_VESA=y
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_VOODOO1=m
+
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_IMAC is not set
 
 #
 # Console display driver support
@@ -2108,6 +2164,7 @@
 CONFIG_SND_MTS64=m
 # CONFIG_SND_SERIAL_U16550 is not set
 CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
 
 #
@@ -2196,10 +2253,8 @@
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
-CONFIG_USB_MULTITHREAD_PROBE=y
 
 #
 # USB Host Controller Drivers
@@ -2209,6 +2264,7 @@
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_CS=m
 
@@ -2241,11 +2297,13 @@
 # USB Human Interface Devices (HID)
 #
 CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-CONFIG_USB_HID_POWERBOOK=y
+
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y
 CONFIG_LOGITECH_FF=y
+CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
@@ -2296,6 +2354,7 @@
 # Has dumb detection, which gets loaded for every hid device.
 # CONFIG_USB_YEALINK is not set
 CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
@@ -2315,6 +2374,7 @@
 #
 CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
 
 #
 # USB port drivers
@@ -2374,7 +2434,7 @@
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_XIRCOM=m
-# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_DEBUG=m
 
 CONFIG_USB_EZUSB=y
 CONFIG_USB_EMI62=m
@@ -2391,7 +2451,9 @@
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LCD=m
-CONFIG_USB_TEST=m
+CONFIG_USB_BERRY_CHARGE=m
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
 # CONFIG_USB_GADGET is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
 # CONFIG_USB_GADGET_GOKU is not set
@@ -2429,6 +2491,7 @@
 CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_USB_LD=m
 CONFIG_USB_APPLETOUCH=m
+CONFIG_USB_GTCO=m
 CONFIG_USB_TRANCEVIBRATOR=m
 
 CONFIG_USB_TOUCHSCREEN=m
@@ -2437,6 +2500,19 @@
 CONFIG_USB_HIDINPUT_POWERBOOK=y
 
 #
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCMCIAHOST=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE=y
+
+# Multifunction USB devices
+CONFIG_MFD_SM501=m
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=m
@@ -2487,7 +2563,6 @@
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
 CONFIG_UDF_FS=m
 
 #
@@ -2524,13 +2599,14 @@
 # CONFIG_BEFS_DEBUG is not set
 CONFIG_BFS_FS=m
 CONFIG_EFS_FS=m
-# CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
@@ -2696,13 +2772,15 @@
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y
 CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DEBUG_DEVRES=y
 
 #
 # Security options
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
@@ -2727,6 +2805,7 @@
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=m
@@ -2734,6 +2813,7 @@
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_KHAZAD=m
@@ -2741,16 +2821,19 @@
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_MPILIB=y
 CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIGNATURE_DSA=y
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
 
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_LIBCRC32C=m
@@ -2762,7 +2845,9 @@
 CONFIG_CRC16=m
 CONFIG_CRC32=m
 CONFIG_CRC_CCITT=m
+CONFIG_CRC_ITU_T=m
 
+CONFIG_EEPROM_93CX6=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 
@@ -2776,9 +2861,14 @@
 CONFIG_ATA_OVER_ETH=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY_BACKLIGHT=y
+
 CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
 
 CONFIG_SCHEDSTATS=y
 
@@ -2790,7 +2880,6 @@
 CONFIG_CPUSETS=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
-# CONFIG_SECCOMP is not set
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_MUST_CHECK=y
 
@@ -2810,8 +2899,9 @@
 
 CONFIG_PM_LEGACY=y
 # CONFIG_PM_SYSFS_DEPRECATED is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_TRACE is not set
+CONFIG_PM_DEBUG=y
+CONFIG_PM_TRACE=y
+# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
 
 # CONFIG_CRASH is not set
 
@@ -2964,6 +3054,7 @@
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INDIGOIO=m
 CONFIG_SND_INDIGODJ=m
+# CONFIG_SND_SOC is not set
 
 ## END of ISA options.
 
@@ -3001,21 +3092,31 @@
 
 CONFIG_HZ_1000=y
 
-CONFIG_HID=m
+CONFIG_TIMER_STATS=y
+
+# Auxillary displays
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=y
+CONFIG_CFAG12864B_RATE=20
 
+CONFIG_DEBUG_IGNORE_QUIET=y
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_RWSEMS=y
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_PROVE_LOCKING=y
 CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_SLEEP_IN_IRQ=y
 
 CONFIG_FAULT_INJECTION=y
 CONFIG_FAILSLAB=y
 CONFIG_FAIL_PAGE_ALLOC=y
 CONFIG_FAIL_MAKE_REQUEST=y
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+
 CONFIG_IRQ_ALL_CPUS=y
 CONFIG_PPC=y
 CONFIG_WATCHDOG_RTAS=m
@@ -3025,6 +3126,7 @@
 CONFIG_TAU=y
 # CONFIG_TAU_INT is not set
 CONFIG_TAU_AVERAGE=y
+# CONFIG_SECCOMP is not set
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_DEBUG=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
@@ -3058,11 +3160,6 @@
 CONFIG_FB_OF=y
 # CONFIG_FB_CONTROL is not set
 CONFIG_FB_IBM_GXT4500=y
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-CONFIG_FB_RIVA_BACKLIGHT=y
-CONFIG_FB_NVIDIA_BACKLIGHT=y
 CONFIG_SND_POWERMAC=m
 CONFIG_SND_POWERMAC_AUTO_DRC=y
 CONFIG_SND_AOA=m
@@ -3074,6 +3171,7 @@
 CONFIG_SND_AOA_SOUNDBUS_I2S=m
 CONFIG_XMON=y
 CONFIG_XMON_DEFAULT=y
+CONFIG_XMON_DISASSEMBLY=y
 CONFIG_BOOTX_TEXT=y
 # CONFIG_PCMCIA_M8XX is not set
 CONFIG_MEMORY_HOTPLUG=y
@@ -3082,6 +3180,9 @@
 # CONFIG_SGI_IOC4 is not set
 CONFIG_PPC_EFIKA=y
 CONFIG_PPC_LITE5200=y
+CONFIG_PPC_BESTCOMM=y
+CONFIG_FEC_MPC52xx=m
+CONFIG_FEC_MPC52xx_USE_MDIO=y
 CONFIG_PMAC_RACKMETER=m
 CONFIG_SERIAL_MPC52xx=y
 CONFIG_SERIAL_MPC52xx_CONSOLE=y
@@ -3091,7 +3192,6 @@
 CONFIG_USB_OHCI_HCD_PPC_OF=y
 CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
 CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
-CONFIG_XMON_DISASSEMBLY=y
 CONFIG_SERIAL_TEXT_DEBUG=y
 CONFIG_SERIAL_UARTLITE=m
 CONFIG_SERIAL_UARTLITE_CONSOLE=y
@@ -3136,9 +3236,6 @@
 CONFIG_MACE=m
 # CONFIG_MACE_AAUI_PORT is not set
 CONFIG_MV643XX_ETH=m
-CONFIG_MV643XX_ETH_0=y
-CONFIG_MV643XX_ETH_1=y
-CONFIG_MV643XX_ETH_2=y
 CONFIG_I2C_HYDRA=m
 CONFIG_I2C_MPC=m
 CONFIG_THERM_WINDTUNNEL=m
@@ -3156,4 +3253,8 @@
 # CONFIG_UDBG_RTAS_CONSOLE is not set
 CONFIG_BRIQ_PANEL=m
 CONFIG_PATA_MPC52xx=m
+CONFIG_PPC_MPC5200_BUGFIX=y
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_DEBUG_STACKOVERFLOW=y
+CONFIG_DEBUG_STACK_USAGE=y
 CONFIG_NR_CPUS=4


Index: kernel-2.6.20-ppc.config
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-2.6.20-ppc.config,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- kernel-2.6.20-ppc.config	22 Mar 2007 16:06:42 -0000	1.1
+++ kernel-2.6.20-ppc.config	10 Apr 2007 22:41:59 -0000	1.1.2.1
@@ -57,6 +57,7 @@
 CONFIG_KMOD=y
 CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
+CONFIG_MODULE_VERIFY_ELF=y
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -68,8 +69,7 @@
 # CONFIG_PCI_MULTITHREAD_PROBE is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
-# FIXME: Was borked in .17git11 for non-acpi machines.
-# CONFIG_HOTPLUG_PCI_PCIE is not set
+CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_HOTPLUG_PCI_FAKE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
 CONFIG_ISA=y
@@ -105,6 +105,7 @@
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
+# CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
@@ -112,6 +113,8 @@
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_AMSO1100=m
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 
 #
 # Executable file formats
@@ -257,7 +260,7 @@
 # CONFIG_PNPBIOS is not set
 
 CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m 
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 
 #
 # Block devices
@@ -304,6 +307,11 @@
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_LSF=y
 
+CONFIG_BLK_DEV_DELKIN=m
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+
+
 #
 # ATA/ATAPI/MFM/RLL support
 #
@@ -331,7 +339,7 @@
 CONFIG_BLK_DEV_CMD640=y
 CONFIG_BLK_DEV_CMD640_ENHANCED=y
 # CONFIG_BLK_DEV_IDEPNP is not set
-# CONFIG_BLK_DEV_IDEPCI is not set 
+# CONFIG_BLK_DEV_IDEPCI is not set
 CONFIG_IDEPCI_SHARE_IRQ=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
 CONFIG_BLK_DEV_GENERIC=y
@@ -445,22 +453,23 @@
 CONFIG_MEGARAID_SAS=m
 
 CONFIG_ATA=m
-CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_VIA=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_NV=m
 CONFIG_PDC_ADMA=m
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_QSTOR=m
+CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SIL=m
 CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
 
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
@@ -479,6 +488,7 @@
 CONFIG_PATA_HPT3X3=m
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_IT821X=m
+CONFIG_PATA_IT8213=m
 CONFIG_PATA_JMICRON=m
 # CONFIG_PATA_LEGACY is not set
 CONFIG_PATA_TRIFLEX=m
@@ -583,9 +593,9 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-CONFIG_FW=m
-CONFIG_FW_OHCI=m
-CONFIG_FW_SBP2=m
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 
 #
 # IEEE 1394 (FireWire) support
@@ -625,6 +635,7 @@
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -707,6 +718,7 @@
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -758,6 +770,7 @@
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
@@ -785,7 +798,6 @@
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_NAT=m
@@ -824,6 +836,7 @@
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RT=m
@@ -860,6 +873,7 @@
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
@@ -978,7 +992,7 @@
 
 #
 # ATM
-# 
+#
 # CONFIG_ATM_DUMMY is not set
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_LANE=m
@@ -1069,6 +1083,7 @@
 CONFIG_B44=m
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_E100=m
@@ -1086,6 +1101,7 @@
 CONFIG_SIS900=m
 CONFIG_SIS190=m
 CONFIG_EPIC100=m
+CONFIG_SC92031=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_TLAN=m
@@ -1132,6 +1148,7 @@
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y
+CONFIG_CHELSIO_T3=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1154,26 +1171,19 @@
 # CONFIG_SLIP_MODE_SLIP6 is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
+# Wireless LAN
 #
+CONFIG_WLAN_PRE80211=y
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
+CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 
-#
-# Wireless 802.11b ISA/PCI cards support
-#
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 CONFIG_IEEE80211_DEBUG=y
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -1181,6 +1191,9 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
+CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT_COMPAT=y
+# CONFIG_NL80211 is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
@@ -1188,6 +1201,38 @@
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_BCM43XX_MAC80211=m
+CONFIG_BCM43XX_MAC80211_PCI=y
+CONFIG_BCM43XX_MAC80211_PCMCIA=y
+CONFIG_BCM43XX_MAC80211_DEBUG=y
+CONFIG_BCM43XX_MAC80211_DMA=y
+CONFIG_BCM43XX_MAC80211_PIO=y
+CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set
+# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set
+CONFIG_RT2X00=y
+CONFIG_RT2400PCI=m
+# CONFIG_RT2400PCI_DEBUG is not set
+CONFIG_RT2500PCI=m
+# CONFIG_RT2500PCI_DEBUG is not set
+CONFIG_RT61PCI=m
+# CONFIG_RT61PCI_DEBUG is not set
+CONFIG_RT2500USB=m
+# CONFIG_RT2500USB_DEBUG is not set
+CONFIG_RT73USB=m
+# CONFIG_RT73USB_DEBUG is not set
+CONFIG_RT2X00_DEBUGFS=m
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_ADM8211=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_ZD1211RW_MAC80211=m
+# CONFIG_ZD1211RW_MAC80211_DEBUG is not set
+CONFIG_RTL818X=y
+CONFIG_RTL8187=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_DEBUG=y
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1199,10 +1244,6 @@
 CONFIG_PRISM54=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
@@ -1397,6 +1438,7 @@
 # CAPI subsystem
 #
 CONFIG_ISDN_CAPI=m
+# CONFIG_CAPI_TRACE is not set
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
@@ -1425,6 +1467,7 @@
 
 CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M101=m
 CONFIG_GIGASET_M105=m
 # CONFIG_GIGASET_DEBUG is not set
 # CONFIG_GIGASET_UNDOCREQ is not set
@@ -1521,8 +1564,10 @@
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_INPUT_ATLAS_BTNS=m
 
 CONFIG_MAC_EMUMOUSEBTN=y
+
 #
 # Character devices
 #
@@ -1607,6 +1652,7 @@
 #
 
 CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PASEMI=m
 CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_SAVAGE4=m
 CONFIG_I2C_VOODOO3=m
@@ -1644,6 +1690,7 @@
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ATXP1=m
@@ -1764,22 +1811,22 @@
 CONFIG_RTC_INTF_SYSFS=m
 CONFIG_RTC_INTF_PROC=m
 CONFIG_RTC_INTF_DEV=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS1742=m
+# CONFIG_RTC_DRV_EP93XX is not set
+CONFIG_RTC_DRV_ISL1208=m
+# CONFIG_RTC_DRV_M48T86 is not set
 CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_RS5C372=m
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_EP93XX is not set
 # CONFIG_RTC_DRV_SA1100 is not set
 # CONFIG_RTC_DRV_TEST is not set
-
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_V3020=m
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -1811,6 +1858,7 @@
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_VIA=m
+CONFIG_DRM_NOUVEAU=m
 
 #
 # PCMCIA character devices
@@ -1959,6 +2007,7 @@
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_CXUSB=m
 CONFIG_DVB_USB_DIBUSB_MB=m
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
@@ -1966,12 +2015,17 @@
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_GL861=m
 CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_VP702X=m
 CONFIG_DVB_USB_VP7045=m
+
+CONFIG_DVB_TUNER_QT1010=m
+
 CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_LGDT330X=m
 
@@ -1982,7 +2036,6 @@
 
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
 CONFIG_VIDEO_BTCX=m
@@ -1996,18 +2049,30 @@
 # Graphics support
 #
 CONFIG_FB=y
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_VGA16 is not set
-CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
+CONFIG_FB_3DFX=m
+CONFIG_FB_3DFX_ACCEL=y
+# CONFIG_FB_ARC is not set
+CONFIG_FB_ATY128=y
+CONFIG_FB_ATY=y
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+# CONFIG_FB_ASILIANT is not set
+CONFIG_FB_CIRRUS=m
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_CYBLA=m
+# CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
-CONFIG_FB_RIVA=m
-# CONFIG_FB_RIVA_DEBUG is not set
-# CONFIG_FB_RIVA_I2C is not set
 CONFIG_FB_I810=m
 CONFIG_FB_I810_GTF=y
 CONFIG_FB_I810_I2C=y
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_IMAC is not set
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_KYRO=m
 CONFIG_FB_MATROX=y
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -2015,44 +2080,35 @@
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_MATROX_MULTIHEAD=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_NVIDIA=y
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
 CONFIG_FB_RADEON=y
 # CONFIG_FB_RADEON_DEBUG is not set
 CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_ATY128=y
-CONFIG_FB_ATY=y
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GX=y
+CONFIG_FB_RIVA=m
+# CONFIG_FB_RIVA_DEBUG is not set
+# CONFIG_FB_RIVA_I2C is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
 # CONFIG_FB_SIS is not set
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_VOODOO1=m
+CONFIG_FB_SM501=m
+CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_KYRO=m
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-# CONFIG_FB_ASILIANT is not set
-CONFIG_FB_3DFX_ACCEL=y
 CONFIG_FB_TRIDENT_ACCEL=y
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_TILEBLITTING=y
-# CONFIG_FB_ARC is not set
-CONFIG_FB_INTEL=m
-# CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_NVIDIA=y
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_CYBLA=m
+CONFIG_FB_VESA=y
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_VOODOO1=m
+
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_IMAC is not set
 
 #
 # Console display driver support
@@ -2108,6 +2164,7 @@
 CONFIG_SND_MTS64=m
 # CONFIG_SND_SERIAL_U16550 is not set
 CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
 
 #
@@ -2196,10 +2253,8 @@
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
-CONFIG_USB_MULTITHREAD_PROBE=y
 
 #
 # USB Host Controller Drivers
@@ -2209,6 +2264,7 @@
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_CS=m
 
@@ -2241,11 +2297,13 @@
 # USB Human Interface Devices (HID)
 #
 CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-CONFIG_USB_HID_POWERBOOK=y
+
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y
 CONFIG_LOGITECH_FF=y
+CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
@@ -2296,6 +2354,7 @@
 # Has dumb detection, which gets loaded for every hid device.
 # CONFIG_USB_YEALINK is not set
 CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
@@ -2315,6 +2374,7 @@
 #
 CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
 
 #
 # USB port drivers
@@ -2374,7 +2434,7 @@
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_XIRCOM=m
-# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_DEBUG=m
 
 CONFIG_USB_EZUSB=y
 CONFIG_USB_EMI62=m
@@ -2391,7 +2451,9 @@
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LCD=m
-CONFIG_USB_TEST=m
+CONFIG_USB_BERRY_CHARGE=m
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
 # CONFIG_USB_GADGET is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
 # CONFIG_USB_GADGET_GOKU is not set
@@ -2429,6 +2491,7 @@
 CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_USB_LD=m
 CONFIG_USB_APPLETOUCH=m
+CONFIG_USB_GTCO=m
 CONFIG_USB_TRANCEVIBRATOR=m
 
 CONFIG_USB_TOUCHSCREEN=m
@@ -2437,6 +2500,19 @@
 CONFIG_USB_HIDINPUT_POWERBOOK=y
 
 #
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCMCIAHOST=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE=y
+
+# Multifunction USB devices
+CONFIG_MFD_SM501=m
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=m
@@ -2487,7 +2563,6 @@
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
 CONFIG_UDF_FS=m
 
 #
@@ -2524,13 +2599,14 @@
 # CONFIG_BEFS_DEBUG is not set
 CONFIG_BFS_FS=m
 CONFIG_EFS_FS=m
-# CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
@@ -2696,13 +2772,15 @@
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y
 CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DEBUG_DEVRES=y
 
 #
 # Security options
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
@@ -2727,6 +2805,7 @@
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=m
@@ -2734,6 +2813,7 @@
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_KHAZAD=m
@@ -2741,16 +2821,19 @@
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_MPILIB=y
 CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIGNATURE_DSA=y
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
 
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_LIBCRC32C=m
@@ -2762,7 +2845,9 @@
 CONFIG_CRC16=m
 CONFIG_CRC32=m
 CONFIG_CRC_CCITT=m
+CONFIG_CRC_ITU_T=m
 
+CONFIG_EEPROM_93CX6=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 
@@ -2776,9 +2861,14 @@
 CONFIG_ATA_OVER_ETH=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY_BACKLIGHT=y
+
 CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
 
 CONFIG_SCHEDSTATS=y
 
@@ -2790,7 +2880,6 @@
 CONFIG_CPUSETS=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
-# CONFIG_SECCOMP is not set
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_MUST_CHECK=y
 
@@ -2810,8 +2899,9 @@
 
 CONFIG_PM_LEGACY=y
 # CONFIG_PM_SYSFS_DEPRECATED is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_TRACE is not set
+CONFIG_PM_DEBUG=y
+CONFIG_PM_TRACE=y
+# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
 
 # CONFIG_CRASH is not set
 
@@ -2964,6 +3054,7 @@
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INDIGOIO=m
 CONFIG_SND_INDIGODJ=m
+# CONFIG_SND_SOC is not set
 
 ## END of ISA options.
 
@@ -3001,21 +3092,31 @@
 
 CONFIG_HZ_1000=y
 
-CONFIG_HID=m
+CONFIG_TIMER_STATS=y
+
+# Auxillary displays
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=y
+CONFIG_CFAG12864B_RATE=20
 
+CONFIG_DEBUG_IGNORE_QUIET=y
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_RWSEMS=y
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_PROVE_LOCKING=y
 CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_SLEEP_IN_IRQ=y
 
 CONFIG_FAULT_INJECTION=y
 CONFIG_FAILSLAB=y
 CONFIG_FAIL_PAGE_ALLOC=y
 CONFIG_FAIL_MAKE_REQUEST=y
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+
 CONFIG_IRQ_ALL_CPUS=y
 CONFIG_PPC=y
 CONFIG_WATCHDOG_RTAS=m
@@ -3025,6 +3126,7 @@
 CONFIG_TAU=y
 # CONFIG_TAU_INT is not set
 CONFIG_TAU_AVERAGE=y
+# CONFIG_SECCOMP is not set
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_DEBUG=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
@@ -3058,11 +3160,6 @@
 CONFIG_FB_OF=y
 # CONFIG_FB_CONTROL is not set
 CONFIG_FB_IBM_GXT4500=y
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-CONFIG_FB_RIVA_BACKLIGHT=y
-CONFIG_FB_NVIDIA_BACKLIGHT=y
 CONFIG_SND_POWERMAC=m
 CONFIG_SND_POWERMAC_AUTO_DRC=y
 CONFIG_SND_AOA=m
@@ -3074,6 +3171,7 @@
 CONFIG_SND_AOA_SOUNDBUS_I2S=m
 CONFIG_XMON=y
 CONFIG_XMON_DEFAULT=y
+CONFIG_XMON_DISASSEMBLY=y
 CONFIG_BOOTX_TEXT=y
 # CONFIG_PCMCIA_M8XX is not set
 CONFIG_MEMORY_HOTPLUG=y
@@ -3082,6 +3180,9 @@
 # CONFIG_SGI_IOC4 is not set
 CONFIG_PPC_EFIKA=y
 CONFIG_PPC_LITE5200=y
+CONFIG_PPC_BESTCOMM=y
+CONFIG_FEC_MPC52xx=m
+CONFIG_FEC_MPC52xx_USE_MDIO=y
 CONFIG_PMAC_RACKMETER=m
 CONFIG_SERIAL_MPC52xx=y
 CONFIG_SERIAL_MPC52xx_CONSOLE=y
@@ -3091,7 +3192,6 @@
 CONFIG_USB_OHCI_HCD_PPC_OF=y
 CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
 CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
-CONFIG_XMON_DISASSEMBLY=y
 CONFIG_SERIAL_TEXT_DEBUG=y
 CONFIG_SERIAL_UARTLITE=m
 CONFIG_SERIAL_UARTLITE_CONSOLE=y
@@ -3136,9 +3236,6 @@
 CONFIG_MACE=m
 # CONFIG_MACE_AAUI_PORT is not set
 CONFIG_MV643XX_ETH=m
-CONFIG_MV643XX_ETH_0=y
-CONFIG_MV643XX_ETH_1=y
-CONFIG_MV643XX_ETH_2=y
 CONFIG_I2C_HYDRA=m
 CONFIG_I2C_MPC=m
 CONFIG_THERM_WINDTUNNEL=m
@@ -3156,3 +3253,7 @@
 # CONFIG_UDBG_RTAS_CONSOLE is not set
 CONFIG_BRIQ_PANEL=m
 CONFIG_PATA_MPC52xx=m
+CONFIG_PPC_MPC5200_BUGFIX=y
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_DEBUG_STACKOVERFLOW=y
+CONFIG_DEBUG_STACK_USAGE=y


Index: kernel-2.6.20-ppc64-kdump.config
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-2.6.20-ppc64-kdump.config,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- kernel-2.6.20-ppc64-kdump.config	22 Mar 2007 16:06:42 -0000	1.1
+++ kernel-2.6.20-ppc64-kdump.config	10 Apr 2007 22:41:59 -0000	1.1.2.1
@@ -58,6 +58,7 @@
 CONFIG_KMOD=y
 CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
+CONFIG_MODULE_VERIFY_ELF=y
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -69,8 +70,7 @@
 # CONFIG_PCI_MULTITHREAD_PROBE is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
-# FIXME: Was borked in .17git11 for non-acpi machines.
-# CONFIG_HOTPLUG_PCI_PCIE is not set
+CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_HOTPLUG_PCI_FAKE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
 CONFIG_ISA=y
@@ -106,6 +106,7 @@
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
+# CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
@@ -113,6 +114,8 @@
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_AMSO1100=m
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 
 #
 # Executable file formats
@@ -258,7 +261,7 @@
 # CONFIG_PNPBIOS is not set
 
 CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m 
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 
 #
 # Block devices
@@ -305,6 +308,11 @@
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_LSF=y
 
+CONFIG_BLK_DEV_DELKIN=m
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+
+
 #
 # ATA/ATAPI/MFM/RLL support
 #
@@ -332,7 +340,7 @@
 CONFIG_BLK_DEV_CMD640=y
 CONFIG_BLK_DEV_CMD640_ENHANCED=y
 # CONFIG_BLK_DEV_IDEPNP is not set
-# CONFIG_BLK_DEV_IDEPCI is not set 
+# CONFIG_BLK_DEV_IDEPCI is not set
 CONFIG_IDEPCI_SHARE_IRQ=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
 CONFIG_BLK_DEV_GENERIC=y
@@ -446,22 +454,23 @@
 CONFIG_MEGARAID_SAS=m
 
 CONFIG_ATA=m
-CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_VIA=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_NV=m
 CONFIG_PDC_ADMA=m
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_QSTOR=m
+CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SIL=m
 CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
 
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
@@ -480,6 +489,7 @@
 CONFIG_PATA_HPT3X3=m
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_IT821X=m
+CONFIG_PATA_IT8213=m
 CONFIG_PATA_JMICRON=m
 # CONFIG_PATA_LEGACY is not set
 CONFIG_PATA_TRIFLEX=m
@@ -584,9 +594,9 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-CONFIG_FW=m
-CONFIG_FW_OHCI=m
-CONFIG_FW_SBP2=m
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 
 #
 # IEEE 1394 (FireWire) support
@@ -626,6 +636,7 @@
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -708,6 +719,7 @@
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -759,6 +771,7 @@
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
@@ -786,7 +799,6 @@
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_NAT=m
@@ -825,6 +837,7 @@
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RT=m
@@ -861,6 +874,7 @@
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
@@ -979,7 +993,7 @@
 
 #
 # ATM
-# 
+#
 # CONFIG_ATM_DUMMY is not set
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_LANE=m
@@ -1070,6 +1084,7 @@
 CONFIG_B44=m
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_E100=m
@@ -1087,6 +1102,7 @@
 CONFIG_SIS900=m
 CONFIG_SIS190=m
 CONFIG_EPIC100=m
+CONFIG_SC92031=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_TLAN=m
@@ -1133,6 +1149,7 @@
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y
+CONFIG_CHELSIO_T3=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1155,26 +1172,19 @@
 # CONFIG_SLIP_MODE_SLIP6 is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
+# Wireless LAN
 #
+CONFIG_WLAN_PRE80211=y
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
+CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 
-#
-# Wireless 802.11b ISA/PCI cards support
-#
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 CONFIG_IEEE80211_DEBUG=y
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -1182,6 +1192,9 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
+CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT_COMPAT=y
+# CONFIG_NL80211 is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
@@ -1189,6 +1202,38 @@
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_BCM43XX_MAC80211=m
+CONFIG_BCM43XX_MAC80211_PCI=y
+CONFIG_BCM43XX_MAC80211_PCMCIA=y
+CONFIG_BCM43XX_MAC80211_DEBUG=y
+CONFIG_BCM43XX_MAC80211_DMA=y
+CONFIG_BCM43XX_MAC80211_PIO=y
+CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set
+# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set
+CONFIG_RT2X00=y
+CONFIG_RT2400PCI=m
+# CONFIG_RT2400PCI_DEBUG is not set
+CONFIG_RT2500PCI=m
+# CONFIG_RT2500PCI_DEBUG is not set
+CONFIG_RT61PCI=m
+# CONFIG_RT61PCI_DEBUG is not set
+CONFIG_RT2500USB=m
+# CONFIG_RT2500USB_DEBUG is not set
+CONFIG_RT73USB=m
+# CONFIG_RT73USB_DEBUG is not set
+CONFIG_RT2X00_DEBUGFS=m
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_ADM8211=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_ZD1211RW_MAC80211=m
+# CONFIG_ZD1211RW_MAC80211_DEBUG is not set
+CONFIG_RTL818X=y
+CONFIG_RTL8187=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_DEBUG=y
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1200,10 +1245,6 @@
 CONFIG_PRISM54=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
@@ -1398,6 +1439,7 @@
 # CAPI subsystem
 #
 CONFIG_ISDN_CAPI=m
+# CONFIG_CAPI_TRACE is not set
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
@@ -1426,6 +1468,7 @@
 
 CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M101=m
 CONFIG_GIGASET_M105=m
 # CONFIG_GIGASET_DEBUG is not set
 # CONFIG_GIGASET_UNDOCREQ is not set
@@ -1522,8 +1565,10 @@
 # CONFIG_INPUT_PCSPKR is not set
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_INPUT_ATLAS_BTNS=m
 
 CONFIG_MAC_EMUMOUSEBTN=y
+
 #
 # Character devices
 #
@@ -1608,6 +1653,7 @@
 #
 
 CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PASEMI=m
 CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_SAVAGE4=m
 CONFIG_I2C_VOODOO3=m
@@ -1645,6 +1691,7 @@
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ATXP1=m
@@ -1765,22 +1812,22 @@
 CONFIG_RTC_INTF_SYSFS=m
 CONFIG_RTC_INTF_PROC=m
 CONFIG_RTC_INTF_DEV=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS1742=m
+# CONFIG_RTC_DRV_EP93XX is not set
+CONFIG_RTC_DRV_ISL1208=m
+# CONFIG_RTC_DRV_M48T86 is not set
 CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_RS5C372=m
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_EP93XX is not set
 # CONFIG_RTC_DRV_SA1100 is not set
 # CONFIG_RTC_DRV_TEST is not set
-
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_V3020=m
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -1812,6 +1859,7 @@
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_VIA=m
+CONFIG_DRM_NOUVEAU=m
 
 #
 # PCMCIA character devices
@@ -1960,6 +2008,7 @@
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_CXUSB=m
 CONFIG_DVB_USB_DIBUSB_MB=m
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
@@ -1967,12 +2016,17 @@
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_GL861=m
 CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_VP702X=m
 CONFIG_DVB_USB_VP7045=m
+
+CONFIG_DVB_TUNER_QT1010=m
+
 CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_LGDT330X=m
 
@@ -1983,7 +2037,6 @@
 
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
 CONFIG_VIDEO_BTCX=m
@@ -1997,18 +2050,30 @@
 # Graphics support
 #
 CONFIG_FB=y
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_VGA16 is not set
-CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
+CONFIG_FB_3DFX=m
+CONFIG_FB_3DFX_ACCEL=y
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+# CONFIG_FB_ASILIANT is not set
+CONFIG_FB_CIRRUS=m
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_CYBLA=m
+# CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
-CONFIG_FB_RIVA=m
-# CONFIG_FB_RIVA_DEBUG is not set
-# CONFIG_FB_RIVA_I2C is not set
 CONFIG_FB_I810=m
 CONFIG_FB_I810_GTF=y
 CONFIG_FB_I810_I2C=y
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_IMAC is not set
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_KYRO=m
 CONFIG_FB_MATROX=y
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -2016,44 +2081,35 @@
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_MATROX_MULTIHEAD=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_NVIDIA=y
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
 CONFIG_FB_RADEON=y
 # CONFIG_FB_RADEON_DEBUG is not set
 CONFIG_FB_RADEON_I2C=y
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GX=y
+CONFIG_FB_RIVA=m
+# CONFIG_FB_RIVA_DEBUG is not set
+# CONFIG_FB_RIVA_I2C is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
 # CONFIG_FB_SIS is not set
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_VOODOO1=m
+CONFIG_FB_SM501=m
+CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_KYRO=m
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-# CONFIG_FB_ASILIANT is not set
-CONFIG_FB_3DFX_ACCEL=y
 CONFIG_FB_TRIDENT_ACCEL=y
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_TILEBLITTING=y
-# CONFIG_FB_ARC is not set
-CONFIG_FB_INTEL=m
-# CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_NVIDIA=y
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_CYBLA=m
+CONFIG_FB_VESA=y
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_VOODOO1=m
+
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_IMAC is not set
 
 #
 # Console display driver support
@@ -2109,6 +2165,7 @@
 CONFIG_SND_MTS64=m
 # CONFIG_SND_SERIAL_U16550 is not set
 CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
 
 #
@@ -2197,10 +2254,8 @@
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
-CONFIG_USB_MULTITHREAD_PROBE=y
 
 #
 # USB Host Controller Drivers
@@ -2210,6 +2265,7 @@
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_CS=m
 
@@ -2242,11 +2298,13 @@
 # USB Human Interface Devices (HID)
 #
 CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-CONFIG_USB_HID_POWERBOOK=y
+
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y
 CONFIG_LOGITECH_FF=y
+CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
@@ -2297,6 +2355,7 @@
 # Has dumb detection, which gets loaded for every hid device.
 # CONFIG_USB_YEALINK is not set
 CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
@@ -2316,6 +2375,7 @@
 #
 CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
 
 #
 # USB port drivers
@@ -2375,7 +2435,7 @@
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_XIRCOM=m
-# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_DEBUG=m
 
 CONFIG_USB_EZUSB=y
 CONFIG_USB_EMI62=m
@@ -2392,7 +2452,9 @@
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LCD=m
-CONFIG_USB_TEST=m
+CONFIG_USB_BERRY_CHARGE=m
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
 # CONFIG_USB_GADGET is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
 # CONFIG_USB_GADGET_GOKU is not set
@@ -2430,6 +2492,7 @@
 CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_USB_LD=m
 CONFIG_USB_APPLETOUCH=m
+CONFIG_USB_GTCO=m
 CONFIG_USB_TRANCEVIBRATOR=m
 
 CONFIG_USB_TOUCHSCREEN=m
@@ -2438,6 +2501,19 @@
 CONFIG_USB_HIDINPUT_POWERBOOK=y
 
 #
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCMCIAHOST=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE=y
+
+# Multifunction USB devices
+CONFIG_MFD_SM501=m
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=m
@@ -2488,7 +2564,6 @@
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
 CONFIG_UDF_FS=m
 
 #
@@ -2525,13 +2600,14 @@
 # CONFIG_BEFS_DEBUG is not set
 CONFIG_BFS_FS=m
 CONFIG_EFS_FS=m
-# CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
@@ -2697,13 +2773,15 @@
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y
 CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DEBUG_DEVRES=y
 
 #
 # Security options
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
@@ -2728,6 +2806,7 @@
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=m
@@ -2735,6 +2814,7 @@
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_KHAZAD=m
@@ -2742,16 +2822,19 @@
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_MPILIB=y
 CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIGNATURE_DSA=y
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
 
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_LIBCRC32C=m
@@ -2763,7 +2846,9 @@
 CONFIG_CRC16=m
 CONFIG_CRC32=m
 CONFIG_CRC_CCITT=m
+CONFIG_CRC_ITU_T=m
 
+CONFIG_EEPROM_93CX6=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 
@@ -2777,9 +2862,14 @@
 CONFIG_ATA_OVER_ETH=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY_BACKLIGHT=y
+
 CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
 
 CONFIG_SCHEDSTATS=y
 
@@ -2791,7 +2881,6 @@
 CONFIG_CPUSETS=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
-# CONFIG_SECCOMP is not set
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_MUST_CHECK=y
 
@@ -2811,8 +2900,9 @@
 
 CONFIG_PM_LEGACY=y
 # CONFIG_PM_SYSFS_DEPRECATED is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_TRACE is not set
+CONFIG_PM_DEBUG=y
+CONFIG_PM_TRACE=y
+# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
 
 # CONFIG_CRASH is not set
 
@@ -2965,6 +3055,7 @@
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INDIGOIO=m
 CONFIG_SND_INDIGODJ=m
+# CONFIG_SND_SOC is not set
 
 ## END of ISA options.
 
@@ -3002,21 +3093,31 @@
 
 CONFIG_HZ_1000=y
 
-CONFIG_HID=m
+CONFIG_TIMER_STATS=y
+
+# Auxillary displays
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=y
+CONFIG_CFAG12864B_RATE=20
 
+CONFIG_DEBUG_IGNORE_QUIET=y
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_RWSEMS=y
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_PROVE_LOCKING=y
 CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_SLEEP_IN_IRQ=y
 
 CONFIG_FAULT_INJECTION=y
 CONFIG_FAILSLAB=y
 CONFIG_FAIL_PAGE_ALLOC=y
 CONFIG_FAIL_MAKE_REQUEST=y
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+
 CONFIG_IRQ_ALL_CPUS=y
 CONFIG_PPC=y
 CONFIG_WATCHDOG_RTAS=m
@@ -3026,6 +3127,7 @@
 CONFIG_TAU=y
 # CONFIG_TAU_INT is not set
 CONFIG_TAU_AVERAGE=y
+# CONFIG_SECCOMP is not set
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_DEBUG=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
@@ -3059,11 +3161,6 @@
 CONFIG_FB_OF=y
 # CONFIG_FB_CONTROL is not set
 CONFIG_FB_IBM_GXT4500=y
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-CONFIG_FB_RIVA_BACKLIGHT=y
-CONFIG_FB_NVIDIA_BACKLIGHT=y
 CONFIG_SND_POWERMAC=m
 CONFIG_SND_POWERMAC_AUTO_DRC=y
 CONFIG_SND_AOA=m
@@ -3075,6 +3172,7 @@
 CONFIG_SND_AOA_SOUNDBUS_I2S=m
 CONFIG_XMON=y
 CONFIG_XMON_DEFAULT=y
+CONFIG_XMON_DISASSEMBLY=y
 CONFIG_BOOTX_TEXT=y
 # CONFIG_PCMCIA_M8XX is not set
 CONFIG_MEMORY_HOTPLUG=y
@@ -3083,6 +3181,9 @@
 # CONFIG_SGI_IOC4 is not set
 CONFIG_PPC_EFIKA=y
 CONFIG_PPC_LITE5200=y
+CONFIG_PPC_BESTCOMM=y
+CONFIG_FEC_MPC52xx=m
+CONFIG_FEC_MPC52xx_USE_MDIO=y
 CONFIG_PMAC_RACKMETER=m
 CONFIG_SERIAL_MPC52xx=y
 CONFIG_SERIAL_MPC52xx_CONSOLE=y
@@ -3092,7 +3193,6 @@
 CONFIG_USB_OHCI_HCD_PPC_OF=y
 CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
 CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
-CONFIG_XMON_DISASSEMBLY=y
 CONFIG_SERIAL_TEXT_DEBUG=y
 CONFIG_SERIAL_UARTLITE=m
 CONFIG_SERIAL_UARTLITE_CONSOLE=y
@@ -3139,10 +3239,19 @@
 CONFIG_PPC_PSERIES=y
 CONFIG_PPC_PMAC=y
 CONFIG_PPC_PS3=y
+CONFIG_PPC_CELLEB=y
 CONFIG_PS3_HTAB_SIZE=20
 # CONFIG_PS3_DYNAMIC_DMA is not set
 CONFIG_PS3_USE_LPAR_ADDR=y
+CONFIG_PS3_ADVANCED=y
 CONFIG_PS3_VUART=y
+CONFIG_PS3_PS3AV=y
+CONFIG_PS3_STORAGE=m
+CONFIG_PS3_STORAGE_EXPECTED_NUM_DRIVES=3
+CONFIG_PS3_STORAGE_MAX_SPINUP_WAIT_TIME=10
+CONFIG_SND_PS3=m
+CONFIG_SND_PS3_DEFAULT_START_DELAY=1000
+CONFIG_GELIC_NET=m
 CONFIG_CBE_THERM=m
 CONFIG_CBE_CPUFREQ=m
 CONFIG_IBMEBUS=y
@@ -3166,7 +3275,6 @@
 CONFIG_ADB_PMU_LED_IDE=y
 CONFIG_PMAC_SMU=y
 CONFIG_CPU_FREQ_PMAC64=y
-CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y
 CONFIG_SCSI_IPR_TRACE=y
 CONFIG_SCSI_IPR_DUMP=y
 CONFIG_SPIDER_NET=m
@@ -3181,4 +3289,17 @@
 CONFIG_VIODASD=m
 CONFIG_VIOCD=m
 CONFIG_VIOTAPE=m
+CONFIG_PASEMI_MAC=m
+CONFIG_SERIAL_OF_PLATFORM=m
+CONFIG_PPC_PASEMI_IOMMU=y
+CONFIG_SERIAL_TXX9=y
+CONFIG_SERIAL_TXX9_NR_UARTS=6
+CONFIG_SERIAL_TXX9_CONSOLE=y
+CONFIG_HVC_BEAT=y
+CONFIG_FB_PS3=y
+CONFIG_FB_PS3_DEFAULT_SIZE_M=18
+CONFIG_PPC_PMI=m
+CONFIG_PS3_SYS_MANAGER=y
+# CONFIG_BLK_DEV_CELLEB is not set
+CONFIG_PATA_SCC=m
 CONFIG_PROC_VMCORE=y


Index: kernel-2.6.20-ppc64.config
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-2.6.20-ppc64.config,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- kernel-2.6.20-ppc64.config	22 Mar 2007 16:06:42 -0000	1.1
+++ kernel-2.6.20-ppc64.config	10 Apr 2007 22:41:59 -0000	1.1.2.1
@@ -57,6 +57,7 @@
 CONFIG_KMOD=y
 CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
+CONFIG_MODULE_VERIFY_ELF=y
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -68,8 +69,7 @@
 # CONFIG_PCI_MULTITHREAD_PROBE is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
-# FIXME: Was borked in .17git11 for non-acpi machines.
-# CONFIG_HOTPLUG_PCI_PCIE is not set
+CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_HOTPLUG_PCI_FAKE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
 CONFIG_ISA=y
@@ -105,6 +105,7 @@
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
+# CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
@@ -112,6 +113,8 @@
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_AMSO1100=m
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 
 #
 # Executable file formats
@@ -257,7 +260,7 @@
 # CONFIG_PNPBIOS is not set
 
 CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m 
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 
 #
 # Block devices
@@ -304,6 +307,11 @@
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_LSF=y
 
+CONFIG_BLK_DEV_DELKIN=m
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+
+
 #
 # ATA/ATAPI/MFM/RLL support
 #
@@ -331,7 +339,7 @@
 CONFIG_BLK_DEV_CMD640=y
 CONFIG_BLK_DEV_CMD640_ENHANCED=y
 # CONFIG_BLK_DEV_IDEPNP is not set
-# CONFIG_BLK_DEV_IDEPCI is not set 
+# CONFIG_BLK_DEV_IDEPCI is not set
 CONFIG_IDEPCI_SHARE_IRQ=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
 CONFIG_BLK_DEV_GENERIC=y
@@ -445,22 +453,23 @@
 CONFIG_MEGARAID_SAS=m
 
 CONFIG_ATA=m
-CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_VIA=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_NV=m
 CONFIG_PDC_ADMA=m
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_QSTOR=m
+CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SIL=m
 CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
 
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
@@ -479,6 +488,7 @@
 CONFIG_PATA_HPT3X3=m
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_IT821X=m
+CONFIG_PATA_IT8213=m
 CONFIG_PATA_JMICRON=m
 # CONFIG_PATA_LEGACY is not set
 CONFIG_PATA_TRIFLEX=m
@@ -583,9 +593,9 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-CONFIG_FW=m
-CONFIG_FW_OHCI=m
-CONFIG_FW_SBP2=m
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 
 #
 # IEEE 1394 (FireWire) support
@@ -625,6 +635,7 @@
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -707,6 +718,7 @@
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -758,6 +770,7 @@
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
@@ -785,7 +798,6 @@
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_NAT=m
@@ -824,6 +836,7 @@
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RT=m
@@ -860,6 +873,7 @@
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
@@ -978,7 +992,7 @@
 
 #
 # ATM
-# 
+#
 # CONFIG_ATM_DUMMY is not set
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_LANE=m
@@ -1069,6 +1083,7 @@
 CONFIG_B44=m
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_E100=m
@@ -1086,6 +1101,7 @@
 CONFIG_SIS900=m
 CONFIG_SIS190=m
 CONFIG_EPIC100=m
+CONFIG_SC92031=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_TLAN=m
@@ -1132,6 +1148,7 @@
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y
+CONFIG_CHELSIO_T3=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1154,26 +1171,19 @@
 # CONFIG_SLIP_MODE_SLIP6 is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
+# Wireless LAN
 #
+CONFIG_WLAN_PRE80211=y
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
+CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 
-#
-# Wireless 802.11b ISA/PCI cards support
-#
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 CONFIG_IEEE80211_DEBUG=y
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -1181,6 +1191,9 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
+CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT_COMPAT=y
+# CONFIG_NL80211 is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
@@ -1188,6 +1201,38 @@
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_BCM43XX_MAC80211=m
+CONFIG_BCM43XX_MAC80211_PCI=y
+CONFIG_BCM43XX_MAC80211_PCMCIA=y
+CONFIG_BCM43XX_MAC80211_DEBUG=y
+CONFIG_BCM43XX_MAC80211_DMA=y
+CONFIG_BCM43XX_MAC80211_PIO=y
+CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set
+# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set
+CONFIG_RT2X00=y
+CONFIG_RT2400PCI=m
+# CONFIG_RT2400PCI_DEBUG is not set
+CONFIG_RT2500PCI=m
+# CONFIG_RT2500PCI_DEBUG is not set
+CONFIG_RT61PCI=m
+# CONFIG_RT61PCI_DEBUG is not set
+CONFIG_RT2500USB=m
+# CONFIG_RT2500USB_DEBUG is not set
+CONFIG_RT73USB=m
+# CONFIG_RT73USB_DEBUG is not set
+CONFIG_RT2X00_DEBUGFS=m
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_ADM8211=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_ZD1211RW_MAC80211=m
+# CONFIG_ZD1211RW_MAC80211_DEBUG is not set
+CONFIG_RTL818X=y
+CONFIG_RTL8187=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_DEBUG=y
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1199,10 +1244,6 @@
 CONFIG_PRISM54=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
@@ -1397,6 +1438,7 @@
 # CAPI subsystem
 #
 CONFIG_ISDN_CAPI=m
+# CONFIG_CAPI_TRACE is not set
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
@@ -1425,6 +1467,7 @@
 
 CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M101=m
 CONFIG_GIGASET_M105=m
 # CONFIG_GIGASET_DEBUG is not set
 # CONFIG_GIGASET_UNDOCREQ is not set
@@ -1521,8 +1564,10 @@
 # CONFIG_INPUT_PCSPKR is not set
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_INPUT_ATLAS_BTNS=m
 
 CONFIG_MAC_EMUMOUSEBTN=y
+
 #
 # Character devices
 #
@@ -1607,6 +1652,7 @@
 #
 
 CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PASEMI=m
 CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_SAVAGE4=m
 CONFIG_I2C_VOODOO3=m
@@ -1644,6 +1690,7 @@
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ATXP1=m
@@ -1764,22 +1811,22 @@
 CONFIG_RTC_INTF_SYSFS=m
 CONFIG_RTC_INTF_PROC=m
 CONFIG_RTC_INTF_DEV=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS1742=m
+# CONFIG_RTC_DRV_EP93XX is not set
+CONFIG_RTC_DRV_ISL1208=m
+# CONFIG_RTC_DRV_M48T86 is not set
 CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_RS5C372=m
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_EP93XX is not set
 # CONFIG_RTC_DRV_SA1100 is not set
 # CONFIG_RTC_DRV_TEST is not set
-
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_V3020=m
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -1811,6 +1858,7 @@
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_VIA=m
+CONFIG_DRM_NOUVEAU=m
 
 #
 # PCMCIA character devices
@@ -1959,6 +2007,7 @@
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_CXUSB=m
 CONFIG_DVB_USB_DIBUSB_MB=m
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
@@ -1966,12 +2015,17 @@
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_GL861=m
 CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_VP702X=m
 CONFIG_DVB_USB_VP7045=m
+
+CONFIG_DVB_TUNER_QT1010=m
+
 CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_LGDT330X=m
 
@@ -1982,7 +2036,6 @@
 
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
 CONFIG_VIDEO_BTCX=m
@@ -1996,18 +2049,30 @@
 # Graphics support
 #
 CONFIG_FB=y
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_VGA16 is not set
-CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
+CONFIG_FB_3DFX=m
+CONFIG_FB_3DFX_ACCEL=y
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+# CONFIG_FB_ASILIANT is not set
+CONFIG_FB_CIRRUS=m
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_CYBLA=m
+# CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
-CONFIG_FB_RIVA=m
-# CONFIG_FB_RIVA_DEBUG is not set
-# CONFIG_FB_RIVA_I2C is not set
 CONFIG_FB_I810=m
 CONFIG_FB_I810_GTF=y
 CONFIG_FB_I810_I2C=y
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_IMAC is not set
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_KYRO=m
 CONFIG_FB_MATROX=y
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -2015,44 +2080,35 @@
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_MATROX_MULTIHEAD=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_NVIDIA=y
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
 CONFIG_FB_RADEON=y
 # CONFIG_FB_RADEON_DEBUG is not set
 CONFIG_FB_RADEON_I2C=y
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GX=y
+CONFIG_FB_RIVA=m
+# CONFIG_FB_RIVA_DEBUG is not set
+# CONFIG_FB_RIVA_I2C is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
 # CONFIG_FB_SIS is not set
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_VOODOO1=m
+CONFIG_FB_SM501=m
+CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_KYRO=m
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-# CONFIG_FB_ASILIANT is not set
-CONFIG_FB_3DFX_ACCEL=y
 CONFIG_FB_TRIDENT_ACCEL=y
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_TILEBLITTING=y
-# CONFIG_FB_ARC is not set
-CONFIG_FB_INTEL=m
-# CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_NVIDIA=y
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_CYBLA=m
+CONFIG_FB_VESA=y
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_VOODOO1=m
+
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_IMAC is not set
 
 #
 # Console display driver support
@@ -2108,6 +2164,7 @@
 CONFIG_SND_MTS64=m
 # CONFIG_SND_SERIAL_U16550 is not set
 CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
 
 #
@@ -2196,10 +2253,8 @@
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
-CONFIG_USB_MULTITHREAD_PROBE=y
 
 #
 # USB Host Controller Drivers
@@ -2209,6 +2264,7 @@
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_CS=m
 
@@ -2241,11 +2297,13 @@
 # USB Human Interface Devices (HID)
 #
 CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-CONFIG_USB_HID_POWERBOOK=y
+
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y
 CONFIG_LOGITECH_FF=y
+CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
@@ -2296,6 +2354,7 @@
 # Has dumb detection, which gets loaded for every hid device.
 # CONFIG_USB_YEALINK is not set
 CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
@@ -2315,6 +2374,7 @@
 #
 CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
 
 #
 # USB port drivers
@@ -2374,7 +2434,7 @@
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_XIRCOM=m
-# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_DEBUG=m
 
 CONFIG_USB_EZUSB=y
 CONFIG_USB_EMI62=m
@@ -2391,7 +2451,9 @@
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LCD=m
-CONFIG_USB_TEST=m
+CONFIG_USB_BERRY_CHARGE=m
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
 # CONFIG_USB_GADGET is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
 # CONFIG_USB_GADGET_GOKU is not set
@@ -2429,6 +2491,7 @@
 CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_USB_LD=m
 CONFIG_USB_APPLETOUCH=m
+CONFIG_USB_GTCO=m
 CONFIG_USB_TRANCEVIBRATOR=m
 
 CONFIG_USB_TOUCHSCREEN=m
@@ -2437,6 +2500,19 @@
 CONFIG_USB_HIDINPUT_POWERBOOK=y
 
 #
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCMCIAHOST=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE=y
+
+# Multifunction USB devices
+CONFIG_MFD_SM501=m
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=m
@@ -2487,7 +2563,6 @@
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
 CONFIG_UDF_FS=m
 
 #
@@ -2524,13 +2599,14 @@
 # CONFIG_BEFS_DEBUG is not set
 CONFIG_BFS_FS=m
 CONFIG_EFS_FS=m
-# CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
@@ -2696,13 +2772,15 @@
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y
 CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DEBUG_DEVRES=y
 
 #
 # Security options
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
@@ -2727,6 +2805,7 @@
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=m
@@ -2734,6 +2813,7 @@
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_KHAZAD=m
@@ -2741,16 +2821,19 @@
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_MPILIB=y
 CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIGNATURE_DSA=y
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
 
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_LIBCRC32C=m
@@ -2762,7 +2845,9 @@
 CONFIG_CRC16=m
 CONFIG_CRC32=m
 CONFIG_CRC_CCITT=m
+CONFIG_CRC_ITU_T=m
 
+CONFIG_EEPROM_93CX6=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 
@@ -2776,9 +2861,14 @@
 CONFIG_ATA_OVER_ETH=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY_BACKLIGHT=y
+
 CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
 
 CONFIG_SCHEDSTATS=y
 
@@ -2790,7 +2880,6 @@
 CONFIG_CPUSETS=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
-# CONFIG_SECCOMP is not set
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_MUST_CHECK=y
 
@@ -2810,8 +2899,9 @@
 
 CONFIG_PM_LEGACY=y
 # CONFIG_PM_SYSFS_DEPRECATED is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_TRACE is not set
+CONFIG_PM_DEBUG=y
+CONFIG_PM_TRACE=y
+# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
 
 # CONFIG_CRASH is not set
 
@@ -2964,6 +3054,7 @@
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INDIGOIO=m
 CONFIG_SND_INDIGODJ=m
+# CONFIG_SND_SOC is not set
 
 ## END of ISA options.
 
@@ -3001,21 +3092,31 @@
 
 CONFIG_HZ_1000=y
 
-CONFIG_HID=m
+CONFIG_TIMER_STATS=y
+
+# Auxillary displays
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=y
+CONFIG_CFAG12864B_RATE=20
 
+CONFIG_DEBUG_IGNORE_QUIET=y
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_RWSEMS=y
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_PROVE_LOCKING=y
 CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_SLEEP_IN_IRQ=y
 
 CONFIG_FAULT_INJECTION=y
 CONFIG_FAILSLAB=y
 CONFIG_FAIL_PAGE_ALLOC=y
 CONFIG_FAIL_MAKE_REQUEST=y
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+
 CONFIG_IRQ_ALL_CPUS=y
 CONFIG_PPC=y
 CONFIG_WATCHDOG_RTAS=m
@@ -3025,6 +3126,7 @@
 CONFIG_TAU=y
 # CONFIG_TAU_INT is not set
 CONFIG_TAU_AVERAGE=y
+# CONFIG_SECCOMP is not set
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_DEBUG=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
@@ -3058,11 +3160,6 @@
 CONFIG_FB_OF=y
 # CONFIG_FB_CONTROL is not set
 CONFIG_FB_IBM_GXT4500=y
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-CONFIG_FB_RIVA_BACKLIGHT=y
-CONFIG_FB_NVIDIA_BACKLIGHT=y
 CONFIG_SND_POWERMAC=m
 CONFIG_SND_POWERMAC_AUTO_DRC=y
 CONFIG_SND_AOA=m
@@ -3074,6 +3171,7 @@
 CONFIG_SND_AOA_SOUNDBUS_I2S=m
 CONFIG_XMON=y
 CONFIG_XMON_DEFAULT=y
+CONFIG_XMON_DISASSEMBLY=y
 CONFIG_BOOTX_TEXT=y
 # CONFIG_PCMCIA_M8XX is not set
 CONFIG_MEMORY_HOTPLUG=y
@@ -3082,6 +3180,9 @@
 # CONFIG_SGI_IOC4 is not set
 CONFIG_PPC_EFIKA=y
 CONFIG_PPC_LITE5200=y
+CONFIG_PPC_BESTCOMM=y
+CONFIG_FEC_MPC52xx=m
+CONFIG_FEC_MPC52xx_USE_MDIO=y
 CONFIG_PMAC_RACKMETER=m
 CONFIG_SERIAL_MPC52xx=y
 CONFIG_SERIAL_MPC52xx_CONSOLE=y
@@ -3091,7 +3192,6 @@
 CONFIG_USB_OHCI_HCD_PPC_OF=y
 CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
 CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
-CONFIG_XMON_DISASSEMBLY=y
 CONFIG_SERIAL_TEXT_DEBUG=y
 CONFIG_SERIAL_UARTLITE=m
 CONFIG_SERIAL_UARTLITE_CONSOLE=y
@@ -3138,10 +3238,19 @@
 CONFIG_PPC_PSERIES=y
 CONFIG_PPC_PMAC=y
 CONFIG_PPC_PS3=y
+CONFIG_PPC_CELLEB=y
 CONFIG_PS3_HTAB_SIZE=20
 # CONFIG_PS3_DYNAMIC_DMA is not set
 CONFIG_PS3_USE_LPAR_ADDR=y
+CONFIG_PS3_ADVANCED=y
 CONFIG_PS3_VUART=y
+CONFIG_PS3_PS3AV=y
+CONFIG_PS3_STORAGE=m
+CONFIG_PS3_STORAGE_EXPECTED_NUM_DRIVES=3
+CONFIG_PS3_STORAGE_MAX_SPINUP_WAIT_TIME=10
+CONFIG_SND_PS3=m
+CONFIG_SND_PS3_DEFAULT_START_DELAY=1000
+CONFIG_GELIC_NET=m
 CONFIG_CBE_THERM=m
 CONFIG_CBE_CPUFREQ=m
 CONFIG_IBMEBUS=y
@@ -3165,7 +3274,6 @@
 CONFIG_ADB_PMU_LED_IDE=y
 CONFIG_PMAC_SMU=y
 CONFIG_CPU_FREQ_PMAC64=y
-CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y
 CONFIG_SCSI_IPR_TRACE=y
 CONFIG_SCSI_IPR_DUMP=y
 CONFIG_SPIDER_NET=m
@@ -3180,3 +3288,16 @@
 CONFIG_VIODASD=m
 CONFIG_VIOCD=m
 CONFIG_VIOTAPE=m
+CONFIG_PASEMI_MAC=m
+CONFIG_SERIAL_OF_PLATFORM=m
+CONFIG_PPC_PASEMI_IOMMU=y
+CONFIG_SERIAL_TXX9=y
+CONFIG_SERIAL_TXX9_NR_UARTS=6
+CONFIG_SERIAL_TXX9_CONSOLE=y
+CONFIG_HVC_BEAT=y
+CONFIG_FB_PS3=y
+CONFIG_FB_PS3_DEFAULT_SIZE_M=18
+CONFIG_PPC_PMI=m
+CONFIG_PS3_SYS_MANAGER=y
+# CONFIG_BLK_DEV_CELLEB is not set
+CONFIG_PATA_SCC=m


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.1.2.1 kernel-2.6.20-ppc64iseries-kdump.config
Index: kernel-2.6.20-ppc64iseries-kdump.config
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-2.6.20-ppc64iseries-kdump.config,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- kernel-2.6.20-ppc64iseries-kdump.config	22 Mar 2007 16:06:42 -0000	1.1
+++ kernel-2.6.20-ppc64iseries-kdump.config	10 Apr 2007 22:41:59 -0000	1.1.2.1
@@ -1,3154 +0,0 @@
-# powerpc
-# powerpc
-#
-# Automatically generated make config: don't edit
-#
-CONFIG_MMU=y
-CONFIG_SMP=y
-CONFIG_HOTPLUG_CPU=y
-CONFIG_LOCALVERSION=""
-CONFIG_CRASH_DUMP=y
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-#
-# General setup
-#
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_SYSCTL=y
-CONFIG_LOG_BUF_SHIFT=17
-# CONFIG_IKCONFIG is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_EXTRA_PASS=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_CFQ=y
-CONFIG_IPC_NS=y
-CONFIG_POSIX_MQUEUE=y
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
-CONFIG_PREEMPT_BKL=y
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-CONFIG_KMOD=y
-CONFIG_MODULE_SIG=y
-# CONFIG_MODULE_SIG_FORCE is not set
-
-#
-# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
-#
-CONFIG_PCI=y
-# CONFIG_PCI_DEBUG is not set
-CONFIG_HT_IRQ=y
-CONFIG_PCI_MSI=y
-# CONFIG_PCI_MULTITHREAD_PROBE is not set
-CONFIG_PCIEPORTBUS=y
-CONFIG_PCIEAER=y
-# FIXME: Was borked in .17git11 for non-acpi machines.
-# CONFIG_HOTPLUG_PCI_PCIE is not set
-# CONFIG_HOTPLUG_PCI_FAKE is not set
-# CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
-CONFIG_ISA=y
-# CONFIG_EISA is not set
-# CONFIG_MCA is not set
-# CONFIG_SCx200 is not set
-CONFIG_HOTPLUG=y
-# CONFIG_DEBUG_KOBJECT is not set
-
-#
-# PCMCIA/CardBus support
-#
-# CONFIG_PCMCIA is not set
-CONFIG_PCMCIA_LOAD_CIS=y
-# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_YENTA=y
-# CONFIG_CARDBUS is not set
-CONFIG_I82092=m
-CONFIG_PD6729=m
-CONFIG_PCMCIA_IOCTL=y
-
-# CONFIG_PCCARD is not set
-# CONFIG_MMC is not set
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_TIFM_SD=m
-
-# CONFIG_INFINIBAND is not set
-CONFIG_INFINIBAND_MTHCA=m
-# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
-CONFIG_INFINIBAND_IPOIB=m
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_IPATH=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_INFINIBAND_AMSO1100=m
-# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_MISC=y
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_FW_LOADER=y
-
-# CONFIG_SPI is not set
-
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-# CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_CONCAT=m
-CONFIG_MTD_CMDLINE_PARTS=y
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_MTD_BLOCK2MTD=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PNC2000 is not set
-CONFIG_MTD_SC520CDP=m
-CONFIG_MTD_NETSC520=m
-# CONFIG_MTD_SBC_GXX is not set
-# CONFIG_MTD_SCx200_DOCFLASH is not set
-# CONFIG_MTD_AMD76XROM is not set
-CONFIG_MTD_SCB2_FLASH=m
-# CONFIG_MTD_NETtel is not set
-# CONFIG_MTD_DILNETPC is not set
-# CONFIG_MTD_L440GX is not set
-CONFIG_MTD_PCI=m
-CONFIG_MTD_TS5500=m
-
-#
-# Self-contained MTD device drivers
[...2763 lines suppressed...]
-# CONFIG_SND_PDAUDIOCF is not set
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-
-## END of ISA options.
-
-# CONFIG_FORCED_INLINING is not set
-
-CONFIG_MIGRATION=y
-CONFIG_RESOURCES_64BIT=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-# CONFIG_LEDS_CORGI is not set
-# CONFIG_LEDS_LOCOMO is not set
-# CONFIG_LEDS_SPITZ is not set
-# CONFIG_LEDS_IXP4XX is not set
-# CONFIG_LEDS_TOSA is not set
-# CONFIG_LEDS_S3C24XX is not set
-# CONFIG_LEDS_AMS_DELTA is not set
-# CONFIG_LEDS_NET48XX is not set
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-
-CONFIG_DMA_ENGINE=y
-CONFIG_NET_DMA=y
-# CONFIG_INTEL_IOATDMA is not set
-
-# CONFIG_UNUSED_SYMBOLS is not set
-
-CONFIG_UTRACE=y
-CONFIG_PTRACE=y
-
-CONFIG_KPROBES=y
-
-# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
-
-CONFIG_HZ_1000=y
-
-CONFIG_HID=m
-
-CONFIG_DEBUG_SLAB=y
-CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_RWSEMS=y
-CONFIG_DEBUG_LOCK_ALLOC=y
-CONFIG_PROVE_LOCKING=y
-CONFIG_DEBUG_VM=y
-
-CONFIG_FAULT_INJECTION=y
-CONFIG_FAILSLAB=y
-CONFIG_FAIL_PAGE_ALLOC=y
-CONFIG_FAIL_MAKE_REQUEST=y
-CONFIG_FAULT_INJECTION_DEBUG_FS=y
-CONFIG_IRQ_ALL_CPUS=y
-CONFIG_PPC=y
-CONFIG_WATCHDOG_RTAS=m
-CONFIG_DEBUGGER=y
-CONFIG_GENERIC_NVRAM=y
-CONFIG_ALTIVEC=y
-CONFIG_TAU=y
-# CONFIG_TAU_INT is not set
-CONFIG_TAU_AVERAGE=y
-# CONFIG_CPU_FREQ is not set
-CONFIG_CPU_FREQ_DEBUG=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-CONFIG_CPU_FREQ_TABLE=y
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_PM=y
-CONFIG_SOFTWARE_SUSPEND=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_GEN_RTC=y
-# CONFIG_GEN_RTC_X is not set
-CONFIG_PROC_DEVICETREE=y
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_BLK_DEV_IDE_PMAC=y
-CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
-CONFIG_BLK_DEV_IDEDMA_PMAC=y
-CONFIG_ADB=y
-CONFIG_ADB_PMU=y
-# CONFIG_WINDFARM is not set
-CONFIG_WINDFARM_PM112=y
-CONFIG_I2C_POWERMAC=y
-CONFIG_APPLE_AIRPORT=m
-CONFIG_SERIAL_PMACZILOG=m
-CONFIG_AGP_UNINORTH=y
-# CONFIG_FB_OF is not set
-# CONFIG_FB_CONTROL is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-CONFIG_FB_RIVA_BACKLIGHT=y
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-CONFIG_SND_POWERMAC=m
-CONFIG_SND_POWERMAC_AUTO_DRC=y
-CONFIG_SND_AOA=m
-CONFIG_SND_AOA_SOUNDBUS=m
-CONFIG_SND_AOA_FABRIC_LAYOUT=m
-CONFIG_SND_AOA_ONYX=m
-CONFIG_SND_AOA_TAS=m
-CONFIG_SND_AOA_TOONIE=m
-CONFIG_SND_AOA_SOUNDBUS_I2S=m
-# CONFIG_XMON is not set
-CONFIG_XMON_DEFAULT=y
-CONFIG_BOOTX_TEXT=y
-# CONFIG_PCMCIA_M8XX is not set
-CONFIG_MEMORY_HOTPLUG=y
-# CONFIG_PPC_EARLY_DEBUG is not set
-# CONFIG_PMAC_BACKLIGHT_LEGACY is not set
-# CONFIG_SGI_IOC4 is not set
-CONFIG_PPC_EFIKA=y
-CONFIG_PPC_LITE5200=y
-CONFIG_PMAC_RACKMETER=m
-CONFIG_SERIAL_MPC52xx=y
-CONFIG_SERIAL_MPC52xx_CONSOLE=y
-CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
-CONFIG_USB_OHCI_HCD_PPC_SOC=y
-CONFIG_USB_OHCI_HCD_PCI=y
-CONFIG_USB_OHCI_HCD_PPC_OF=y
-CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
-CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
-CONFIG_XMON_DISASSEMBLY=y
-CONFIG_SERIAL_TEXT_DEBUG=y
-CONFIG_SERIAL_UARTLITE=m
-CONFIG_SERIAL_UARTLITE_CONSOLE=y
-CONFIG_SENSORS_AMS=m
-CONFIG_SENSORS_AMS_PMU=y
-CONFIG_SENSORS_AMS_I2C=y
-# CONFIG_IDE_GENERIC is not set
-# CONFIG_BLK_DEV_SL82C105 is not set
-# CONFIG_IDE_ARM is not set
-# CONFIG_SATA_INTEL_COMBINED is not set
-CONFIG_MTD_PHYSMAP_OF=m
-CONFIG_PPC64=y
-CONFIG_VIRT_CPU_ACCOUNTING=y
-CONFIG_NR_CPUS=128
-# CONFIG_FB_PLATINUM is not set
-# CONFIG_FB_VALKYRIE is not set
-# CONFIG_FB_CT65550 is not set
-# CONFIG_POWER4_ONLY is not set
-# CONFIG_PPC_PASEMI is not set
-CONFIG_RTAS_PROC=y
-CONFIG_IOMMU_VMERGE=y
-# CONFIG_NUMA is not set
-# CONFIG_PPC_64K_PAGES is not set
-# CONFIG_SCHED_SMT is not set
-# CONFIG_MV643XX_ETH is not set
-CONFIG_IRQSTACKS=y
-CONFIG_DEBUG_STACK_USAGE=y
-CONFIG_DEBUG_STACKOVERFLOW=y
-CONFIG_EHEA=m
-CONFIG_INFINIBAND_EHCA=m
-CONFIG_INFINIBAND_EHCA_SCALING=y
-CONFIG_HCALL_STATS=y
-CONFIG_SCSI_IBMVSCSIS=m
-CONFIG_PPC_ISERIES=y
-# CONFIG_PPC_PSERIES is not set
-# CONFIG_PPC_SYSTEMSIM is not set
-# CONFIG_PPC_PS3 is not set
-# CONFIG_PPC_PMAC is not set
-# CONFIG_PPC_MAPLE is not set
-# CONFIG_PPC_IBM_CELL_BLADE is not set
-# CONFIG_MAMBO is not set
-CONFIG_ISERIES_VETH=m
-CONFIG_VIOCONS=y
-CONFIG_VIODASD=m
-CONFIG_VIOCD=m
-CONFIG_VIOTAPE=m
-# CONFIG_SCSI_SATA is not set
-CONFIG_LPARCFG=y
-CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y
-CONFIG_SCSI_IBMVSCSI=m
-CONFIG_SERIAL_ICOM=m
-# CONFIG_ADB_PMU_LED is not set
-# CONFIG_PMAC_SMU is not set
-# CONFIG_SPU_FS is not set
-# CONFIG_CBE_RAS is not set
-CONFIG_PROC_VMCORE=y


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.1.2.1 kernel-2.6.20-ppc64iseries.config
Index: kernel-2.6.20-ppc64iseries.config
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-2.6.20-ppc64iseries.config,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- kernel-2.6.20-ppc64iseries.config	22 Mar 2007 16:06:42 -0000	1.1
+++ kernel-2.6.20-ppc64iseries.config	10 Apr 2007 22:41:59 -0000	1.1.2.1
@@ -1,3152 +0,0 @@
-# powerpc
-#
-# Automatically generated make config: don't edit
-#
-CONFIG_MMU=y
-CONFIG_SMP=y
-CONFIG_HOTPLUG_CPU=y
-CONFIG_LOCALVERSION=""
-# CONFIG_CRASH_DUMP is not set
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-#
-# General setup
-#
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_SYSCTL=y
-CONFIG_LOG_BUF_SHIFT=17
-# CONFIG_IKCONFIG is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_EXTRA_PASS=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_CFQ=y
-CONFIG_IPC_NS=y
-CONFIG_POSIX_MQUEUE=y
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
-CONFIG_PREEMPT_BKL=y
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-CONFIG_KMOD=y
-CONFIG_MODULE_SIG=y
-# CONFIG_MODULE_SIG_FORCE is not set
-
-#
-# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
-#
-CONFIG_PCI=y
-# CONFIG_PCI_DEBUG is not set
-CONFIG_HT_IRQ=y
-CONFIG_PCI_MSI=y
-# CONFIG_PCI_MULTITHREAD_PROBE is not set
-CONFIG_PCIEPORTBUS=y
-CONFIG_PCIEAER=y
-# FIXME: Was borked in .17git11 for non-acpi machines.
-# CONFIG_HOTPLUG_PCI_PCIE is not set
-# CONFIG_HOTPLUG_PCI_FAKE is not set
-# CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
-CONFIG_ISA=y
-# CONFIG_EISA is not set
-# CONFIG_MCA is not set
-# CONFIG_SCx200 is not set
-CONFIG_HOTPLUG=y
-# CONFIG_DEBUG_KOBJECT is not set
-
-#
-# PCMCIA/CardBus support
-#
-# CONFIG_PCMCIA is not set
-CONFIG_PCMCIA_LOAD_CIS=y
-# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_YENTA=y
-# CONFIG_CARDBUS is not set
-CONFIG_I82092=m
-CONFIG_PD6729=m
-CONFIG_PCMCIA_IOCTL=y
-
-# CONFIG_PCCARD is not set
-# CONFIG_MMC is not set
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_TIFM_SD=m
-
-# CONFIG_INFINIBAND is not set
-CONFIG_INFINIBAND_MTHCA=m
-# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
-CONFIG_INFINIBAND_IPOIB=m
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_IPATH=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_INFINIBAND_AMSO1100=m
-# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_MISC=y
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_FW_LOADER=y
-
-# CONFIG_SPI is not set
-
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-# CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_CONCAT=m
-CONFIG_MTD_CMDLINE_PARTS=y
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_MTD_BLOCK2MTD=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PNC2000 is not set
-CONFIG_MTD_SC520CDP=m
-CONFIG_MTD_NETSC520=m
-# CONFIG_MTD_SBC_GXX is not set
-# CONFIG_MTD_SCx200_DOCFLASH is not set
-# CONFIG_MTD_AMD76XROM is not set
-CONFIG_MTD_SCB2_FLASH=m
-# CONFIG_MTD_NETtel is not set
-# CONFIG_MTD_DILNETPC is not set
-# CONFIG_MTD_L440GX is not set
-CONFIG_MTD_PCI=m
-CONFIG_MTD_TS5500=m
-
-#
-# Self-contained MTD device drivers
-#
[...2761 lines suppressed...]
-# CONFIG_SND_SSCAPE is not set
-# CONFIG_SND_PDAUDIOCF is not set
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-
-## END of ISA options.
-
-# CONFIG_FORCED_INLINING is not set
-
-CONFIG_MIGRATION=y
-CONFIG_RESOURCES_64BIT=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-# CONFIG_LEDS_CORGI is not set
-# CONFIG_LEDS_LOCOMO is not set
-# CONFIG_LEDS_SPITZ is not set
-# CONFIG_LEDS_IXP4XX is not set
-# CONFIG_LEDS_TOSA is not set
-# CONFIG_LEDS_S3C24XX is not set
-# CONFIG_LEDS_AMS_DELTA is not set
-# CONFIG_LEDS_NET48XX is not set
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-
-CONFIG_DMA_ENGINE=y
-CONFIG_NET_DMA=y
-# CONFIG_INTEL_IOATDMA is not set
-
-# CONFIG_UNUSED_SYMBOLS is not set
-
-CONFIG_UTRACE=y
-CONFIG_PTRACE=y
-
-CONFIG_KPROBES=y
-
-# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
-
-CONFIG_HZ_1000=y
-
-CONFIG_HID=m
-
-CONFIG_DEBUG_SLAB=y
-CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_RWSEMS=y
-CONFIG_DEBUG_LOCK_ALLOC=y
-CONFIG_PROVE_LOCKING=y
-CONFIG_DEBUG_VM=y
-
-CONFIG_FAULT_INJECTION=y
-CONFIG_FAILSLAB=y
-CONFIG_FAIL_PAGE_ALLOC=y
-CONFIG_FAIL_MAKE_REQUEST=y
-CONFIG_FAULT_INJECTION_DEBUG_FS=y
-CONFIG_IRQ_ALL_CPUS=y
-CONFIG_PPC=y
-CONFIG_WATCHDOG_RTAS=m
-CONFIG_DEBUGGER=y
-CONFIG_GENERIC_NVRAM=y
-CONFIG_ALTIVEC=y
-CONFIG_TAU=y
-# CONFIG_TAU_INT is not set
-CONFIG_TAU_AVERAGE=y
-# CONFIG_CPU_FREQ is not set
-CONFIG_CPU_FREQ_DEBUG=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-CONFIG_CPU_FREQ_TABLE=y
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_PM=y
-CONFIG_SOFTWARE_SUSPEND=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_GEN_RTC=y
-# CONFIG_GEN_RTC_X is not set
-CONFIG_PROC_DEVICETREE=y
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_BLK_DEV_IDE_PMAC=y
-CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
-CONFIG_BLK_DEV_IDEDMA_PMAC=y
-CONFIG_ADB=y
-CONFIG_ADB_PMU=y
-# CONFIG_WINDFARM is not set
-CONFIG_WINDFARM_PM112=y
-CONFIG_I2C_POWERMAC=y
-CONFIG_APPLE_AIRPORT=m
-CONFIG_SERIAL_PMACZILOG=m
-CONFIG_AGP_UNINORTH=y
-# CONFIG_FB_OF is not set
-# CONFIG_FB_CONTROL is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-CONFIG_FB_RIVA_BACKLIGHT=y
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-CONFIG_SND_POWERMAC=m
-CONFIG_SND_POWERMAC_AUTO_DRC=y
-CONFIG_SND_AOA=m
-CONFIG_SND_AOA_SOUNDBUS=m
-CONFIG_SND_AOA_FABRIC_LAYOUT=m
-CONFIG_SND_AOA_ONYX=m
-CONFIG_SND_AOA_TAS=m
-CONFIG_SND_AOA_TOONIE=m
-CONFIG_SND_AOA_SOUNDBUS_I2S=m
-# CONFIG_XMON is not set
-CONFIG_XMON_DEFAULT=y
-CONFIG_BOOTX_TEXT=y
-# CONFIG_PCMCIA_M8XX is not set
-CONFIG_MEMORY_HOTPLUG=y
-# CONFIG_PPC_EARLY_DEBUG is not set
-# CONFIG_PMAC_BACKLIGHT_LEGACY is not set
-# CONFIG_SGI_IOC4 is not set
-CONFIG_PPC_EFIKA=y
-CONFIG_PPC_LITE5200=y
-CONFIG_PMAC_RACKMETER=m
-CONFIG_SERIAL_MPC52xx=y
-CONFIG_SERIAL_MPC52xx_CONSOLE=y
-CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
-CONFIG_USB_OHCI_HCD_PPC_SOC=y
-CONFIG_USB_OHCI_HCD_PCI=y
-CONFIG_USB_OHCI_HCD_PPC_OF=y
-CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
-CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
-CONFIG_XMON_DISASSEMBLY=y
-CONFIG_SERIAL_TEXT_DEBUG=y
-CONFIG_SERIAL_UARTLITE=m
-CONFIG_SERIAL_UARTLITE_CONSOLE=y
-CONFIG_SENSORS_AMS=m
-CONFIG_SENSORS_AMS_PMU=y
-CONFIG_SENSORS_AMS_I2C=y
-# CONFIG_IDE_GENERIC is not set
-# CONFIG_BLK_DEV_SL82C105 is not set
-# CONFIG_IDE_ARM is not set
-# CONFIG_SATA_INTEL_COMBINED is not set
-CONFIG_MTD_PHYSMAP_OF=m
-CONFIG_PPC64=y
-CONFIG_VIRT_CPU_ACCOUNTING=y
-CONFIG_NR_CPUS=128
-# CONFIG_FB_PLATINUM is not set
-# CONFIG_FB_VALKYRIE is not set
-# CONFIG_FB_CT65550 is not set
-# CONFIG_POWER4_ONLY is not set
-# CONFIG_PPC_PASEMI is not set
-CONFIG_RTAS_PROC=y
-CONFIG_IOMMU_VMERGE=y
-# CONFIG_NUMA is not set
-# CONFIG_PPC_64K_PAGES is not set
-# CONFIG_SCHED_SMT is not set
-# CONFIG_MV643XX_ETH is not set
-CONFIG_IRQSTACKS=y
-CONFIG_DEBUG_STACK_USAGE=y
-CONFIG_DEBUG_STACKOVERFLOW=y
-CONFIG_EHEA=m
-CONFIG_INFINIBAND_EHCA=m
-CONFIG_INFINIBAND_EHCA_SCALING=y
-CONFIG_HCALL_STATS=y
-CONFIG_SCSI_IBMVSCSIS=m
-CONFIG_PPC_ISERIES=y
-# CONFIG_PPC_PSERIES is not set
-# CONFIG_PPC_SYSTEMSIM is not set
-# CONFIG_PPC_PS3 is not set
-# CONFIG_PPC_PMAC is not set
-# CONFIG_PPC_MAPLE is not set
-# CONFIG_PPC_IBM_CELL_BLADE is not set
-# CONFIG_MAMBO is not set
-CONFIG_ISERIES_VETH=m
-CONFIG_VIOCONS=y
-CONFIG_VIODASD=m
-CONFIG_VIOCD=m
-CONFIG_VIOTAPE=m
-# CONFIG_SCSI_SATA is not set
-CONFIG_LPARCFG=y
-CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y
-CONFIG_SCSI_IBMVSCSI=m
-CONFIG_SERIAL_ICOM=m
-# CONFIG_ADB_PMU_LED is not set
-# CONFIG_PMAC_SMU is not set
-# CONFIG_SPU_FS is not set
-# CONFIG_CBE_RAS is not set


Index: kernel-2.6.20-s390.config
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-2.6.20-s390.config,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- kernel-2.6.20-s390.config	22 Mar 2007 16:06:42 -0000	1.1
+++ kernel-2.6.20-s390.config	10 Apr 2007 22:41:59 -0000	1.1.2.1
@@ -57,6 +57,7 @@
 CONFIG_KMOD=y
 CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
+CONFIG_MODULE_VERIFY_ELF=y
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -68,8 +69,7 @@
 # CONFIG_PCI_MULTITHREAD_PROBE is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
-# FIXME: Was borked in .17git11 for non-acpi machines.
-# CONFIG_HOTPLUG_PCI_PCIE is not set
+CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_HOTPLUG_PCI_FAKE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
 CONFIG_ISA=y
@@ -105,6 +105,7 @@
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
+# CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
@@ -112,6 +113,8 @@
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_AMSO1100=m
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 
 #
 # Executable file formats
@@ -257,7 +260,7 @@
 # CONFIG_PNPBIOS is not set
 
 CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m 
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 
 #
 # Block devices
@@ -304,6 +307,11 @@
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_LSF=y
 
+CONFIG_BLK_DEV_DELKIN=m
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+
+
 #
 # ATA/ATAPI/MFM/RLL support
 #
@@ -445,22 +453,23 @@
 CONFIG_MEGARAID_SAS=m
 
 CONFIG_ATA=m
-CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_VIA=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_NV=m
 CONFIG_PDC_ADMA=m
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_QSTOR=m
+CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SIL=m
 CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
 
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
@@ -479,6 +488,7 @@
 CONFIG_PATA_HPT3X3=m
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_IT821X=m
+CONFIG_PATA_IT8213=m
 CONFIG_PATA_JMICRON=m
 # CONFIG_PATA_LEGACY is not set
 CONFIG_PATA_TRIFLEX=m
@@ -583,9 +593,9 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-CONFIG_FW=m
-CONFIG_FW_OHCI=m
-CONFIG_FW_SBP2=m
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 
 #
 # IEEE 1394 (FireWire) support
@@ -625,6 +635,7 @@
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -707,6 +718,7 @@
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -758,6 +770,7 @@
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
@@ -785,7 +798,6 @@
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_NAT=m
@@ -824,6 +836,7 @@
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RT=m
@@ -860,6 +873,7 @@
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
@@ -978,7 +992,7 @@
 
 #
 # ATM
-# 
+#
 # CONFIG_ATM_DUMMY is not set
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_LANE=m
@@ -1066,9 +1080,10 @@
 CONFIG_AMD8111E_NAPI=y
 CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_ADAPTEC_STARFIRE_NAPI=y
-CONFIG_B44=m
+# CONFIG_B44 is not set
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_E100=m
@@ -1086,6 +1101,7 @@
 CONFIG_SIS900=m
 CONFIG_SIS190=m
 CONFIG_EPIC100=m
+CONFIG_SC92031=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_TLAN=m
@@ -1132,6 +1148,7 @@
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y
+CONFIG_CHELSIO_T3=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1154,26 +1171,19 @@
 # CONFIG_SLIP_MODE_SLIP6 is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Obsolete Wireless cards support (pre-802.11)
+# Wireless LAN
 #
+# CONFIG_WLAN_PRE80211 is not set
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
+# CONFIG_WLAN_80211 is not set
 # CONFIG_PCMCIA_RAYCS is not set
 
-#
-# Wireless 802.11b ISA/PCI cards support
-#
+# CONFIG_MAC80211 is not set
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG is not set
 # CONFIG_IEEE80211 is not set
 CONFIG_IEEE80211_DEBUG=y
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -1181,6 +1191,9 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
+CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT_COMPAT=y
+# CONFIG_NL80211 is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
@@ -1188,6 +1201,38 @@
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_BCM43XX_MAC80211=m
+CONFIG_BCM43XX_MAC80211_PCI=y
+CONFIG_BCM43XX_MAC80211_PCMCIA=y
+CONFIG_BCM43XX_MAC80211_DEBUG=y
+CONFIG_BCM43XX_MAC80211_DMA=y
+CONFIG_BCM43XX_MAC80211_PIO=y
+CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set
+# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set
+CONFIG_RT2X00=y
+CONFIG_RT2400PCI=m
+# CONFIG_RT2400PCI_DEBUG is not set
+CONFIG_RT2500PCI=m
+# CONFIG_RT2500PCI_DEBUG is not set
+CONFIG_RT61PCI=m
+# CONFIG_RT61PCI_DEBUG is not set
+CONFIG_RT2500USB=m
+# CONFIG_RT2500USB_DEBUG is not set
+CONFIG_RT73USB=m
+# CONFIG_RT73USB_DEBUG is not set
+CONFIG_RT2X00_DEBUGFS=m
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_ADM8211=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_ZD1211RW_MAC80211=m
+# CONFIG_ZD1211RW_MAC80211_DEBUG is not set
+CONFIG_RTL818X=y
+CONFIG_RTL8187=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_DEBUG=y
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1199,10 +1244,6 @@
 CONFIG_PRISM54=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
@@ -1397,6 +1438,7 @@
 # CAPI subsystem
 #
 CONFIG_ISDN_CAPI=m
+# CONFIG_CAPI_TRACE is not set
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
@@ -1425,6 +1467,7 @@
 
 CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M101=m
 CONFIG_GIGASET_M105=m
 # CONFIG_GIGASET_DEBUG is not set
 # CONFIG_GIGASET_UNDOCREQ is not set
@@ -1521,8 +1564,10 @@
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_INPUT_ATLAS_BTNS=m
 
 CONFIG_MAC_EMUMOUSEBTN=y
+
 #
 # Character devices
 #
@@ -1607,6 +1652,7 @@
 #
 
 CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PASEMI=m
 CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_SAVAGE4=m
 CONFIG_I2C_VOODOO3=m
@@ -1644,6 +1690,7 @@
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ATXP1=m
@@ -1764,22 +1811,22 @@
 CONFIG_RTC_INTF_SYSFS=m
 CONFIG_RTC_INTF_PROC=m
 CONFIG_RTC_INTF_DEV=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS1742=m
+# CONFIG_RTC_DRV_EP93XX is not set
+CONFIG_RTC_DRV_ISL1208=m
+# CONFIG_RTC_DRV_M48T86 is not set
 CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_RS5C372=m
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_EP93XX is not set
 # CONFIG_RTC_DRV_SA1100 is not set
 # CONFIG_RTC_DRV_TEST is not set
-
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_V3020=m
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -1811,6 +1858,7 @@
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_VIA=m
+CONFIG_DRM_NOUVEAU=m
 
 #
 # PCMCIA character devices
@@ -1959,6 +2007,7 @@
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_CXUSB=m
 CONFIG_DVB_USB_DIBUSB_MB=m
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
@@ -1966,12 +2015,17 @@
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_GL861=m
 CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_VP702X=m
 CONFIG_DVB_USB_VP7045=m
+
+CONFIG_DVB_TUNER_QT1010=m
+
 CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_LGDT330X=m
 
@@ -1982,7 +2036,6 @@
 
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
 CONFIG_VIDEO_BTCX=m
@@ -1996,18 +2049,30 @@
 # Graphics support
 #
 CONFIG_FB=y
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
+CONFIG_FB_3DFX=m
+CONFIG_FB_3DFX_ACCEL=y
+# CONFIG_FB_ARC is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+# CONFIG_FB_ASILIANT is not set
+CONFIG_FB_CIRRUS=m
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_CYBLA=m
+# CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
-CONFIG_FB_RIVA=m
-# CONFIG_FB_RIVA_DEBUG is not set
-# CONFIG_FB_RIVA_I2C is not set
 CONFIG_FB_I810=m
 CONFIG_FB_I810_GTF=y
 CONFIG_FB_I810_I2C=y
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_IMAC is not set
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_KYRO=m
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -2015,44 +2080,35 @@
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_MATROX_MULTIHEAD=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
 CONFIG_FB_RADEON=m
 # CONFIG_FB_RADEON_DEBUG is not set
 CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GX=y
+CONFIG_FB_RIVA=m
+# CONFIG_FB_RIVA_DEBUG is not set
+# CONFIG_FB_RIVA_I2C is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
 # CONFIG_FB_SIS is not set
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_VOODOO1=m
+CONFIG_FB_SM501=m
+CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_KYRO=m
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-# CONFIG_FB_ASILIANT is not set
-CONFIG_FB_3DFX_ACCEL=y
 CONFIG_FB_TRIDENT_ACCEL=y
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_TILEBLITTING=y
-# CONFIG_FB_ARC is not set
-CONFIG_FB_INTEL=m
-# CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_CYBLA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_VGA16=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_VOODOO1=m
+
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_IMAC is not set
 
 #
 # Console display driver support
@@ -2108,6 +2164,7 @@
 CONFIG_SND_MTS64=m
 # CONFIG_SND_SERIAL_U16550 is not set
 CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
 
 #
@@ -2196,10 +2253,8 @@
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
-CONFIG_USB_MULTITHREAD_PROBE=y
 
 #
 # USB Host Controller Drivers
@@ -2209,6 +2264,7 @@
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_CS=m
 
@@ -2241,11 +2297,13 @@
 # USB Human Interface Devices (HID)
 #
 CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-CONFIG_USB_HID_POWERBOOK=y
+
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y
 CONFIG_LOGITECH_FF=y
+CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
@@ -2296,6 +2354,7 @@
 # Has dumb detection, which gets loaded for every hid device.
 # CONFIG_USB_YEALINK is not set
 CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
@@ -2315,6 +2374,7 @@
 #
 CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
 
 #
 # USB port drivers
@@ -2374,7 +2434,7 @@
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_XIRCOM=m
-# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_DEBUG=m
 
 CONFIG_USB_EZUSB=y
 CONFIG_USB_EMI62=m
@@ -2391,7 +2451,9 @@
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LCD=m
-CONFIG_USB_TEST=m
+CONFIG_USB_BERRY_CHARGE=m
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
 # CONFIG_USB_GADGET is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
 # CONFIG_USB_GADGET_GOKU is not set
@@ -2429,6 +2491,7 @@
 CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_USB_LD=m
 CONFIG_USB_APPLETOUCH=m
+CONFIG_USB_GTCO=m
 CONFIG_USB_TRANCEVIBRATOR=m
 
 CONFIG_USB_TOUCHSCREEN=m
@@ -2437,6 +2500,19 @@
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 
 #
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCMCIAHOST=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE=y
+
+# Multifunction USB devices
+CONFIG_MFD_SM501=m
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=m
@@ -2487,7 +2563,6 @@
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
 CONFIG_UDF_FS=m
 
 #
@@ -2524,13 +2599,14 @@
 # CONFIG_BEFS_DEBUG is not set
 CONFIG_BFS_FS=m
 CONFIG_EFS_FS=m
-# CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
@@ -2696,13 +2772,15 @@
 # CONFIG_BOOT_DELAY is not set
 CONFIG_DEBUG_SLAB_LEAK=y
 CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DEBUG_DEVRES=y
 
 #
 # Security options
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
@@ -2727,6 +2805,7 @@
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=m
@@ -2734,6 +2813,7 @@
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_KHAZAD=m
@@ -2741,16 +2821,19 @@
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_MPILIB=y
 CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIGNATURE_DSA=y
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
 
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_LIBCRC32C=m
@@ -2762,7 +2845,9 @@
 CONFIG_CRC16=m
 CONFIG_CRC32=m
 CONFIG_CRC_CCITT=m
+CONFIG_CRC_ITU_T=m
 
+CONFIG_EEPROM_93CX6=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 
@@ -2776,9 +2861,14 @@
 # CONFIG_ATA_OVER_ETH is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY_BACKLIGHT=y
+
 CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
 
 CONFIG_SCHEDSTATS=y
 
@@ -2790,7 +2880,6 @@
 CONFIG_CPUSETS=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
-# CONFIG_SECCOMP is not set
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_MUST_CHECK=y
 
@@ -2810,8 +2899,9 @@
 
 CONFIG_PM_LEGACY=y
 # CONFIG_PM_SYSFS_DEPRECATED is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_TRACE is not set
+CONFIG_PM_DEBUG=y
+CONFIG_PM_TRACE=y
+# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
 
 CONFIG_CRASH=m
 
@@ -2964,6 +3054,7 @@
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INDIGOIO=m
 CONFIG_SND_INDIGODJ=m
+# CONFIG_SND_SOC is not set
 
 ## END of ISA options.
 
@@ -3001,21 +3092,31 @@
 
 CONFIG_HZ_1000=y
 
-CONFIG_HID=m
+CONFIG_TIMER_STATS=y
 
+# Auxillary displays
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=y
+CONFIG_CFAG12864B_RATE=20
+
+CONFIG_DEBUG_IGNORE_QUIET=y
 # CONFIG_DEBUG_SLAB is not set
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_RWSEMS=y
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_PROVE_LOCKING=y
 CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_SLEEP_IN_IRQ=y
 
 CONFIG_FAULT_INJECTION=y
 CONFIG_FAILSLAB=y
 CONFIG_FAIL_PAGE_ALLOC=y
 CONFIG_FAIL_MAKE_REQUEST=y
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_NO_IDLE_HZ=y
 CONFIG_NO_IDLE_HZ_INIT=y
@@ -3076,6 +3177,7 @@
 CONFIG_QETH_PERF_STATS=y
 CONFIG_CCWGROUP=m
 CONFIG_Z90CRYPT=m
+# CONFIG_WIRELESS_EXT is not set
 CONFIG_IBM_PARTITION=y
 CONFIG_CRYPTO_SHA1_S390=m
 CONFIG_CRYPTO_SHA256_S390=m
@@ -3098,6 +3200,10 @@
 CONFIG_MONWRITER=m
 CONFIG_ZCRYPT=m
 CONFIG_ZCRYPT_MONOLITHIC=y
+CONFIG_S390_SWITCH_AMODE=y
+CONFIG_S390_EXEC_PROTECT=y
+CONFIG_AFIUCV=m
+CONFIG_S390_PRNG=m
 # CONFIG_64BIT is not set
 CONFIG_MARCH_G5=y
 # CONFIG_MARCH_Z900 is not set


Index: kernel-2.6.20-s390x.config
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-2.6.20-s390x.config,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- kernel-2.6.20-s390x.config	22 Mar 2007 16:06:42 -0000	1.1
+++ kernel-2.6.20-s390x.config	10 Apr 2007 22:41:59 -0000	1.1.2.1
@@ -57,6 +57,7 @@
 CONFIG_KMOD=y
 CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
+CONFIG_MODULE_VERIFY_ELF=y
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -68,8 +69,7 @@
 # CONFIG_PCI_MULTITHREAD_PROBE is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
-# FIXME: Was borked in .17git11 for non-acpi machines.
-# CONFIG_HOTPLUG_PCI_PCIE is not set
+CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_HOTPLUG_PCI_FAKE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
 CONFIG_ISA=y
@@ -105,6 +105,7 @@
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
+# CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
@@ -112,6 +113,8 @@
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_AMSO1100=m
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 
 #
 # Executable file formats
@@ -257,7 +260,7 @@
 # CONFIG_PNPBIOS is not set
 
 CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m 
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 
 #
 # Block devices
@@ -304,6 +307,11 @@
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_LSF=y
 
+CONFIG_BLK_DEV_DELKIN=m
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+
+
 #
 # ATA/ATAPI/MFM/RLL support
 #
@@ -445,22 +453,23 @@
 CONFIG_MEGARAID_SAS=m
 
 CONFIG_ATA=m
-CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_VIA=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_NV=m
 CONFIG_PDC_ADMA=m
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_QSTOR=m
+CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SIL=m
 CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
 
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
@@ -479,6 +488,7 @@
 CONFIG_PATA_HPT3X3=m
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_IT821X=m
+CONFIG_PATA_IT8213=m
 CONFIG_PATA_JMICRON=m
 # CONFIG_PATA_LEGACY is not set
 CONFIG_PATA_TRIFLEX=m
@@ -583,9 +593,9 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-CONFIG_FW=m
-CONFIG_FW_OHCI=m
-CONFIG_FW_SBP2=m
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 
 #
 # IEEE 1394 (FireWire) support
@@ -625,6 +635,7 @@
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -707,6 +718,7 @@
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -758,6 +770,7 @@
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
@@ -785,7 +798,6 @@
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_NAT=m
@@ -824,6 +836,7 @@
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RT=m
@@ -860,6 +873,7 @@
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
@@ -978,7 +992,7 @@
 
 #
 # ATM
-# 
+#
 # CONFIG_ATM_DUMMY is not set
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_LANE=m
@@ -1066,9 +1080,10 @@
 CONFIG_AMD8111E_NAPI=y
 CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_ADAPTEC_STARFIRE_NAPI=y
-CONFIG_B44=m
+# CONFIG_B44 is not set
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_E100=m
@@ -1086,6 +1101,7 @@
 CONFIG_SIS900=m
 CONFIG_SIS190=m
 CONFIG_EPIC100=m
+CONFIG_SC92031=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_TLAN=m
@@ -1132,6 +1148,7 @@
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y
+CONFIG_CHELSIO_T3=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1154,26 +1171,19 @@
 # CONFIG_SLIP_MODE_SLIP6 is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Obsolete Wireless cards support (pre-802.11)
+# Wireless LAN
 #
+# CONFIG_WLAN_PRE80211 is not set
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
+# CONFIG_WLAN_80211 is not set
 # CONFIG_PCMCIA_RAYCS is not set
 
-#
-# Wireless 802.11b ISA/PCI cards support
-#
+# CONFIG_MAC80211 is not set
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG is not set
 # CONFIG_IEEE80211 is not set
 CONFIG_IEEE80211_DEBUG=y
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -1181,6 +1191,9 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
+CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT_COMPAT=y
+# CONFIG_NL80211 is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
@@ -1188,6 +1201,38 @@
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_BCM43XX_MAC80211=m
+CONFIG_BCM43XX_MAC80211_PCI=y
+CONFIG_BCM43XX_MAC80211_PCMCIA=y
+CONFIG_BCM43XX_MAC80211_DEBUG=y
+CONFIG_BCM43XX_MAC80211_DMA=y
+CONFIG_BCM43XX_MAC80211_PIO=y
+CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set
+# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set
+CONFIG_RT2X00=y
+CONFIG_RT2400PCI=m
+# CONFIG_RT2400PCI_DEBUG is not set
+CONFIG_RT2500PCI=m
+# CONFIG_RT2500PCI_DEBUG is not set
+CONFIG_RT61PCI=m
+# CONFIG_RT61PCI_DEBUG is not set
+CONFIG_RT2500USB=m
+# CONFIG_RT2500USB_DEBUG is not set
+CONFIG_RT73USB=m
+# CONFIG_RT73USB_DEBUG is not set
+CONFIG_RT2X00_DEBUGFS=m
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_ADM8211=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_ZD1211RW_MAC80211=m
+# CONFIG_ZD1211RW_MAC80211_DEBUG is not set
+CONFIG_RTL818X=y
+CONFIG_RTL8187=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_DEBUG=y
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1199,10 +1244,6 @@
 CONFIG_PRISM54=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
@@ -1397,6 +1438,7 @@
 # CAPI subsystem
 #
 CONFIG_ISDN_CAPI=m
+# CONFIG_CAPI_TRACE is not set
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
@@ -1425,6 +1467,7 @@
 
 CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M101=m
 CONFIG_GIGASET_M105=m
 # CONFIG_GIGASET_DEBUG is not set
 # CONFIG_GIGASET_UNDOCREQ is not set
@@ -1521,8 +1564,10 @@
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_INPUT_ATLAS_BTNS=m
 
 CONFIG_MAC_EMUMOUSEBTN=y
+
 #
 # Character devices
 #
@@ -1607,6 +1652,7 @@
 #
 
 CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PASEMI=m
 CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_SAVAGE4=m
 CONFIG_I2C_VOODOO3=m
@@ -1644,6 +1690,7 @@
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ATXP1=m
@@ -1764,22 +1811,22 @@
 CONFIG_RTC_INTF_SYSFS=m
 CONFIG_RTC_INTF_PROC=m
 CONFIG_RTC_INTF_DEV=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS1742=m
+# CONFIG_RTC_DRV_EP93XX is not set
+CONFIG_RTC_DRV_ISL1208=m
+# CONFIG_RTC_DRV_M48T86 is not set
 CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_RS5C372=m
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_EP93XX is not set
 # CONFIG_RTC_DRV_SA1100 is not set
 # CONFIG_RTC_DRV_TEST is not set
-
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_V3020=m
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -1811,6 +1858,7 @@
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_VIA=m
+CONFIG_DRM_NOUVEAU=m
 
 #
 # PCMCIA character devices
@@ -1959,6 +2007,7 @@
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_CXUSB=m
 CONFIG_DVB_USB_DIBUSB_MB=m
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
@@ -1966,12 +2015,17 @@
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_GL861=m
 CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_VP702X=m
 CONFIG_DVB_USB_VP7045=m
+
+CONFIG_DVB_TUNER_QT1010=m
+
 CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_LGDT330X=m
 
@@ -1982,7 +2036,6 @@
 
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
 CONFIG_VIDEO_BTCX=m
@@ -1996,18 +2049,30 @@
 # Graphics support
 #
 CONFIG_FB=y
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
+CONFIG_FB_3DFX=m
+CONFIG_FB_3DFX_ACCEL=y
+# CONFIG_FB_ARC is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+# CONFIG_FB_ASILIANT is not set
+CONFIG_FB_CIRRUS=m
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_CYBLA=m
+# CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
-CONFIG_FB_RIVA=m
-# CONFIG_FB_RIVA_DEBUG is not set
-# CONFIG_FB_RIVA_I2C is not set
 CONFIG_FB_I810=m
 CONFIG_FB_I810_GTF=y
 CONFIG_FB_I810_I2C=y
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_IMAC is not set
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_KYRO=m
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -2015,44 +2080,35 @@
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_MATROX_MULTIHEAD=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
 CONFIG_FB_RADEON=m
 # CONFIG_FB_RADEON_DEBUG is not set
 CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GX=y
+CONFIG_FB_RIVA=m
+# CONFIG_FB_RIVA_DEBUG is not set
+# CONFIG_FB_RIVA_I2C is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
 # CONFIG_FB_SIS is not set
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_VOODOO1=m
+CONFIG_FB_SM501=m
+CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_KYRO=m
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-# CONFIG_FB_ASILIANT is not set
-CONFIG_FB_3DFX_ACCEL=y
 CONFIG_FB_TRIDENT_ACCEL=y
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_TILEBLITTING=y
-# CONFIG_FB_ARC is not set
-CONFIG_FB_INTEL=m
-# CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_CYBLA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_VGA16=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_VOODOO1=m
+
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_IMAC is not set
 
 #
 # Console display driver support
@@ -2108,6 +2164,7 @@
 CONFIG_SND_MTS64=m
 # CONFIG_SND_SERIAL_U16550 is not set
 CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
 
 #
@@ -2196,10 +2253,8 @@
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
-CONFIG_USB_MULTITHREAD_PROBE=y
 
 #
 # USB Host Controller Drivers
@@ -2209,6 +2264,7 @@
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_CS=m
 
@@ -2241,11 +2297,13 @@
 # USB Human Interface Devices (HID)
 #
 CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-CONFIG_USB_HID_POWERBOOK=y
+
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y
 CONFIG_LOGITECH_FF=y
+CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
@@ -2296,6 +2354,7 @@
 # Has dumb detection, which gets loaded for every hid device.
 # CONFIG_USB_YEALINK is not set
 CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
@@ -2315,6 +2374,7 @@
 #
 CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
 
 #
 # USB port drivers
@@ -2374,7 +2434,7 @@
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_XIRCOM=m
-# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_DEBUG=m
 
 CONFIG_USB_EZUSB=y
 CONFIG_USB_EMI62=m
@@ -2391,7 +2451,9 @@
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LCD=m
-CONFIG_USB_TEST=m
+CONFIG_USB_BERRY_CHARGE=m
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
 # CONFIG_USB_GADGET is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
 # CONFIG_USB_GADGET_GOKU is not set
@@ -2429,6 +2491,7 @@
 CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_USB_LD=m
 CONFIG_USB_APPLETOUCH=m
+CONFIG_USB_GTCO=m
 CONFIG_USB_TRANCEVIBRATOR=m
 
 CONFIG_USB_TOUCHSCREEN=m
@@ -2437,6 +2500,19 @@
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 
 #
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCMCIAHOST=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE=y
+
+# Multifunction USB devices
+CONFIG_MFD_SM501=m
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=m
@@ -2487,7 +2563,6 @@
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
 CONFIG_UDF_FS=m
 
 #
@@ -2524,13 +2599,14 @@
 # CONFIG_BEFS_DEBUG is not set
 CONFIG_BFS_FS=m
 CONFIG_EFS_FS=m
-# CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
@@ -2696,13 +2772,15 @@
 # CONFIG_BOOT_DELAY is not set
 CONFIG_DEBUG_SLAB_LEAK=y
 CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DEBUG_DEVRES=y
 
 #
 # Security options
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
@@ -2727,6 +2805,7 @@
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=m
@@ -2734,6 +2813,7 @@
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_KHAZAD=m
@@ -2741,16 +2821,19 @@
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_MPILIB=y
 CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIGNATURE_DSA=y
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
 
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_LIBCRC32C=m
@@ -2762,7 +2845,9 @@
 CONFIG_CRC16=m
 CONFIG_CRC32=m
 CONFIG_CRC_CCITT=m
+CONFIG_CRC_ITU_T=m
 
+CONFIG_EEPROM_93CX6=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 
@@ -2776,9 +2861,14 @@
 # CONFIG_ATA_OVER_ETH is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY_BACKLIGHT=y
+
 CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
 
 CONFIG_SCHEDSTATS=y
 
@@ -2790,7 +2880,6 @@
 CONFIG_CPUSETS=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
-# CONFIG_SECCOMP is not set
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_MUST_CHECK=y
 
@@ -2810,8 +2899,9 @@
 
 CONFIG_PM_LEGACY=y
 # CONFIG_PM_SYSFS_DEPRECATED is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_TRACE is not set
+CONFIG_PM_DEBUG=y
+CONFIG_PM_TRACE=y
+# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
 
 CONFIG_CRASH=m
 
@@ -2964,6 +3054,7 @@
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INDIGOIO=m
 CONFIG_SND_INDIGODJ=m
+# CONFIG_SND_SOC is not set
 
 ## END of ISA options.
 
@@ -3001,21 +3092,31 @@
 
 CONFIG_HZ_1000=y
 
-CONFIG_HID=m
+CONFIG_TIMER_STATS=y
 
+# Auxillary displays
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=y
+CONFIG_CFAG12864B_RATE=20
+
+CONFIG_DEBUG_IGNORE_QUIET=y
 # CONFIG_DEBUG_SLAB is not set
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_RWSEMS=y
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_PROVE_LOCKING=y
 CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_SLEEP_IN_IRQ=y
 
 CONFIG_FAULT_INJECTION=y
 CONFIG_FAILSLAB=y
 CONFIG_FAIL_PAGE_ALLOC=y
 CONFIG_FAIL_MAKE_REQUEST=y
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_NO_IDLE_HZ=y
 CONFIG_NO_IDLE_HZ_INIT=y
@@ -3076,6 +3177,7 @@
 CONFIG_QETH_PERF_STATS=y
 CONFIG_CCWGROUP=m
 CONFIG_Z90CRYPT=m
+# CONFIG_WIRELESS_EXT is not set
 CONFIG_IBM_PARTITION=y
 CONFIG_CRYPTO_SHA1_S390=m
 CONFIG_CRYPTO_SHA256_S390=m
@@ -3098,6 +3200,10 @@
 CONFIG_MONWRITER=m
 CONFIG_ZCRYPT=m
 CONFIG_ZCRYPT_MONOLITHIC=y
+CONFIG_S390_SWITCH_AMODE=y
+CONFIG_S390_EXEC_PROTECT=y
+CONFIG_AFIUCV=m
+CONFIG_S390_PRNG=m
 CONFIG_64BIT=y
 # CONFIG_MARCH_G5 is not set
 CONFIG_MARCH_Z900=y


Index: kernel-2.6.20-x86_64-debug.config
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-2.6.20-x86_64-debug.config,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- kernel-2.6.20-x86_64-debug.config	22 Mar 2007 16:06:42 -0000	1.1
+++ kernel-2.6.20-x86_64-debug.config	10 Apr 2007 22:41:59 -0000	1.1.2.1
@@ -57,6 +57,7 @@
 CONFIG_KMOD=y
 CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
+CONFIG_MODULE_VERIFY_ELF=y
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -68,7 +69,6 @@
 # CONFIG_PCI_MULTITHREAD_PROBE is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
-# FIXME: Was borked in .17git11 for non-acpi machines.
 CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_HOTPLUG_PCI_FAKE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
@@ -105,6 +105,7 @@
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
+# CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
@@ -112,6 +113,8 @@
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_AMSO1100=m
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 
 #
 # Executable file formats
@@ -257,7 +260,7 @@
 # CONFIG_PNPBIOS is not set
 
 CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m 
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 
 #
 # Block devices
@@ -304,6 +307,11 @@
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_LSF=y
 
+CONFIG_BLK_DEV_DELKIN=m
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+
+
 #
 # ATA/ATAPI/MFM/RLL support
 #
@@ -445,22 +453,23 @@
 CONFIG_MEGARAID_SAS=m
 
 CONFIG_ATA=m
-CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_VIA=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_NV=m
 CONFIG_PDC_ADMA=m
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_QSTOR=m
+CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SIL=m
 CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
 
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
@@ -479,6 +488,7 @@
 CONFIG_PATA_HPT3X3=m
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_IT821X=m
+CONFIG_PATA_IT8213=m
 CONFIG_PATA_JMICRON=m
 # CONFIG_PATA_LEGACY is not set
 CONFIG_PATA_TRIFLEX=m
@@ -583,9 +593,9 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-CONFIG_FW=m
-CONFIG_FW_OHCI=m
-CONFIG_FW_SBP2=m
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 
 #
 # IEEE 1394 (FireWire) support
@@ -625,6 +635,7 @@
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -707,6 +718,7 @@
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -758,6 +770,7 @@
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
@@ -785,7 +798,6 @@
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_NAT=m
@@ -824,6 +836,7 @@
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RT=m
@@ -860,6 +873,7 @@
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
@@ -978,7 +992,7 @@
 
 #
 # ATM
-# 
+#
 # CONFIG_ATM_DUMMY is not set
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_LANE=m
@@ -1069,6 +1083,7 @@
 CONFIG_B44=m
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_E100=m
@@ -1086,6 +1101,7 @@
 CONFIG_SIS900=m
 CONFIG_SIS190=m
 CONFIG_EPIC100=m
+CONFIG_SC92031=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_TLAN=m
@@ -1132,6 +1148,7 @@
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y
+CONFIG_CHELSIO_T3=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1154,26 +1171,19 @@
 # CONFIG_SLIP_MODE_SLIP6 is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
+# Wireless LAN
 #
+CONFIG_WLAN_PRE80211=y
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
+CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 
-#
-# Wireless 802.11b ISA/PCI cards support
-#
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -1181,6 +1191,9 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
+CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT_COMPAT=y
+# CONFIG_NL80211 is not set
 CONFIG_IPW2100=m
 CONFIG_IPW2200=m
 # CONFIG_IPW2100_DEBUG is not set
@@ -1188,6 +1201,38 @@
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_BCM43XX_MAC80211=m
+CONFIG_BCM43XX_MAC80211_PCI=y
+CONFIG_BCM43XX_MAC80211_PCMCIA=y
+CONFIG_BCM43XX_MAC80211_DEBUG=y
+CONFIG_BCM43XX_MAC80211_DMA=y
+CONFIG_BCM43XX_MAC80211_PIO=y
+CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set
+# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set
+CONFIG_RT2X00=y
+CONFIG_RT2400PCI=m
+# CONFIG_RT2400PCI_DEBUG is not set
+CONFIG_RT2500PCI=m
+# CONFIG_RT2500PCI_DEBUG is not set
+CONFIG_RT61PCI=m
+# CONFIG_RT61PCI_DEBUG is not set
+CONFIG_RT2500USB=m
+# CONFIG_RT2500USB_DEBUG is not set
+CONFIG_RT73USB=m
+# CONFIG_RT73USB_DEBUG is not set
+CONFIG_RT2X00_DEBUGFS=m
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_ADM8211=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_ZD1211RW_MAC80211=m
+# CONFIG_ZD1211RW_MAC80211_DEBUG is not set
+CONFIG_RTL818X=y
+CONFIG_RTL8187=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_DEBUG=y
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1199,10 +1244,6 @@
 CONFIG_PRISM54=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
@@ -1397,6 +1438,7 @@
 # CAPI subsystem
 #
 CONFIG_ISDN_CAPI=m
+# CONFIG_CAPI_TRACE is not set
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
@@ -1425,6 +1467,7 @@
 
 CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M101=m
 CONFIG_GIGASET_M105=m
 # CONFIG_GIGASET_DEBUG is not set
 # CONFIG_GIGASET_UNDOCREQ is not set
@@ -1521,8 +1564,10 @@
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_INPUT_ATLAS_BTNS=m
 
 CONFIG_MAC_EMUMOUSEBTN=y
+
 #
 # Character devices
 #
@@ -1607,6 +1652,7 @@
 #
 
 CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PASEMI=m
 CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_SAVAGE4=m
 CONFIG_I2C_VOODOO3=m
@@ -1644,6 +1690,7 @@
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ATXP1=m
@@ -1764,22 +1811,22 @@
 CONFIG_RTC_INTF_SYSFS=m
 CONFIG_RTC_INTF_PROC=m
 CONFIG_RTC_INTF_DEV=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS1742=m
+# CONFIG_RTC_DRV_EP93XX is not set
+CONFIG_RTC_DRV_ISL1208=m
+# CONFIG_RTC_DRV_M48T86 is not set
 CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_RS5C372=m
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_EP93XX is not set
 # CONFIG_RTC_DRV_SA1100 is not set
 # CONFIG_RTC_DRV_TEST is not set
-
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_V3020=m
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -1811,6 +1858,7 @@
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_VIA=m
+CONFIG_DRM_NOUVEAU=m
 
 #
 # PCMCIA character devices
@@ -1959,6 +2007,7 @@
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_CXUSB=m
 CONFIG_DVB_USB_DIBUSB_MB=m
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
@@ -1966,12 +2015,17 @@
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_GL861=m
 CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_VP702X=m
 CONFIG_DVB_USB_VP7045=m
+
+CONFIG_DVB_TUNER_QT1010=m
+
 CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_LGDT330X=m
 
@@ -1982,7 +2036,6 @@
 
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
 CONFIG_VIDEO_BTCX=m
@@ -1996,18 +2049,30 @@
 # Graphics support
 #
 CONFIG_FB=y
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
+CONFIG_FB_3DFX=m
+CONFIG_FB_3DFX_ACCEL=y
+# CONFIG_FB_ARC is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+# CONFIG_FB_ASILIANT is not set
+CONFIG_FB_CIRRUS=m
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_CYBLA=m
+# CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
-CONFIG_FB_RIVA=m
-# CONFIG_FB_RIVA_DEBUG is not set
-# CONFIG_FB_RIVA_I2C is not set
 CONFIG_FB_I810=m
 CONFIG_FB_I810_GTF=y
 CONFIG_FB_I810_I2C=y
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_IMAC is not set
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_KYRO=m
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -2015,44 +2080,35 @@
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_MATROX_MULTIHEAD=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
 CONFIG_FB_RADEON=m
 # CONFIG_FB_RADEON_DEBUG is not set
 CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GX=y
+CONFIG_FB_RIVA=m
+# CONFIG_FB_RIVA_DEBUG is not set
+# CONFIG_FB_RIVA_I2C is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
 # CONFIG_FB_SIS is not set
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_VOODOO1=m
+CONFIG_FB_SM501=m
+CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_KYRO=m
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-# CONFIG_FB_ASILIANT is not set
-CONFIG_FB_3DFX_ACCEL=y
 CONFIG_FB_TRIDENT_ACCEL=y
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_TILEBLITTING=y
-# CONFIG_FB_ARC is not set
-CONFIG_FB_INTEL=m
-# CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_CYBLA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_VGA16=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_VOODOO1=m
+
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_IMAC is not set
 
 #
 # Console display driver support
@@ -2108,6 +2164,7 @@
 CONFIG_SND_MTS64=m
 # CONFIG_SND_SERIAL_U16550 is not set
 CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
 
 #
@@ -2196,10 +2253,8 @@
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
-CONFIG_USB_MULTITHREAD_PROBE=y
 
 #
 # USB Host Controller Drivers
@@ -2209,6 +2264,7 @@
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_CS=m
 
@@ -2241,11 +2297,13 @@
 # USB Human Interface Devices (HID)
 #
 CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-CONFIG_USB_HID_POWERBOOK=y
+
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y
 CONFIG_LOGITECH_FF=y
+CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
@@ -2296,6 +2354,7 @@
 # Has dumb detection, which gets loaded for every hid device.
 # CONFIG_USB_YEALINK is not set
 CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
@@ -2315,6 +2374,7 @@
 #
 CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
 
 #
 # USB port drivers
@@ -2374,7 +2434,7 @@
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_XIRCOM=m
-# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_DEBUG=m
 
 CONFIG_USB_EZUSB=y
 CONFIG_USB_EMI62=m
@@ -2391,7 +2451,9 @@
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LCD=m
-CONFIG_USB_TEST=m
+CONFIG_USB_BERRY_CHARGE=m
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
 # CONFIG_USB_GADGET is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
 # CONFIG_USB_GADGET_GOKU is not set
@@ -2429,6 +2491,7 @@
 CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_USB_LD=m
 CONFIG_USB_APPLETOUCH=m
+CONFIG_USB_GTCO=m
 CONFIG_USB_TRANCEVIBRATOR=m
 
 CONFIG_USB_TOUCHSCREEN=m
@@ -2437,6 +2500,19 @@
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 
 #
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCMCIAHOST=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE=y
+
+# Multifunction USB devices
+CONFIG_MFD_SM501=m
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=m
@@ -2487,7 +2563,6 @@
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
 CONFIG_UDF_FS=m
 
 #
@@ -2524,13 +2599,14 @@
 # CONFIG_BEFS_DEBUG is not set
 CONFIG_BFS_FS=m
 CONFIG_EFS_FS=m
-# CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
@@ -2696,13 +2772,15 @@
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y
 CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DEBUG_DEVRES=y
 
 #
 # Security options
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
@@ -2727,6 +2805,7 @@
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=m
@@ -2734,6 +2813,7 @@
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_KHAZAD=m
@@ -2741,16 +2821,19 @@
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_MPILIB=y
 CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIGNATURE_DSA=y
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
 
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_LIBCRC32C=m
@@ -2762,7 +2845,9 @@
 CONFIG_CRC16=m
 CONFIG_CRC32=m
 CONFIG_CRC_CCITT=m
+CONFIG_CRC_ITU_T=m
 
+CONFIG_EEPROM_93CX6=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 
@@ -2776,9 +2861,14 @@
 CONFIG_ATA_OVER_ETH=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY_BACKLIGHT=y
+
 CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
 
 CONFIG_SCHEDSTATS=y
 
@@ -2790,7 +2880,6 @@
 CONFIG_CPUSETS=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
-# CONFIG_SECCOMP is not set
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_MUST_CHECK=y
 
@@ -2810,8 +2899,9 @@
 
 CONFIG_PM_LEGACY=y
 # CONFIG_PM_SYSFS_DEPRECATED is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_TRACE is not set
+CONFIG_PM_DEBUG=y
+CONFIG_PM_TRACE=y
+# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
 
 CONFIG_CRASH=m
 
@@ -2964,6 +3054,7 @@
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INDIGOIO=m
 CONFIG_SND_INDIGODJ=m
+# CONFIG_SND_SOC is not set
 
 ## END of ISA options.
 
@@ -3001,22 +3092,30 @@
 
 CONFIG_HZ_1000=y
 
-CONFIG_HID=m
+CONFIG_TIMER_STATS=y
 
+# Auxillary displays
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=y
+CONFIG_CFAG12864B_RATE=20
+
+CONFIG_DEBUG_IGNORE_QUIET=y
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_RWSEMS=y
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_PROVE_LOCKING=y
 CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_SLEEP_IN_IRQ=y
 
 CONFIG_FAULT_INJECTION=y
 CONFIG_FAILSLAB=y
 CONFIG_FAIL_PAGE_ALLOC=y
 CONFIG_FAIL_MAKE_REQUEST=y
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
-
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 CONFIG_UID16=y
 # CONFIG_X86_64_XEN is not set
 # CONFIG_MK8 is not set
@@ -3051,6 +3150,7 @@
 CONFIG_I2O_EXT_ADAPTEC_DMA64=y
 CONFIG_I2O_CONFIG_OLD_IOCTL=y
 CONFIG_I2O_BUS=m
+# CONFIG_SECCOMP is not set
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_SCHED_SMT=y
 CONFIG_SOFTWARE_SUSPEND=y
@@ -3065,44 +3165,47 @@
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_FREQ_DEBUG=y
-CONFIG_X86_SPEEDSTEP_CENTRINO=y
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y
 # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_AC=m
+CONFIG_ACPI_ASUS=m
 CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BAY=m
+CONFIG_ACPI_IBM_BAY=y
+CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_CONTAINER=m
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DOCK=m
+CONFIG_ACPI_EC=y
 CONFIG_ACPI_FAN=y
+# CONFIG_ACPI_HOTKEY is not set
+CONFIG_ACPI_HOTPLUG_MEMORY=m
+CONFIG_ACPI_IBM=m
+# CONFIG_ACPI_IBM_DOCK is not set
+CONFIG_ACPI_NUMA=y
 CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_PROCFS=y
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_SLEEP=y
+# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
 CONFIG_ACPI_THERMAL=y
-CONFIG_ACPI_ASUS=m
 CONFIG_ACPI_TOSHIBA=m
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_EC=y
 CONFIG_ACPI_POWER=y
 CONFIG_ACPI_SYSTEM=y
-CONFIG_ACPI_NUMA=y
-CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_IBM=m
-# CONFIG_ACPI_IBM_DOCK is not set
-CONFIG_ACPI_HOTPLUG_MEMORY=m
-CONFIG_ACPI_DOCK=m
-CONFIG_ACPI_SBS=m
-# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
-# CONFIG_ACPI_HOTKEY is not set
-CONFIG_ACPI_CONTAINER=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_SHPC=m
-# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
 CONFIG_HPET=y
 # CONFIG_HPET_MMAP is not set
 # CONFIG_HPET_RTC_IRQ is not set


Index: kernel-2.6.20-x86_64-kdump.config
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-2.6.20-x86_64-kdump.config,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- kernel-2.6.20-x86_64-kdump.config	22 Mar 2007 16:06:42 -0000	1.1
+++ kernel-2.6.20-x86_64-kdump.config	10 Apr 2007 22:41:59 -0000	1.1.2.1
@@ -57,6 +57,7 @@
 CONFIG_KMOD=y
 CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
+CONFIG_MODULE_VERIFY_ELF=y
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -64,11 +65,10 @@
 CONFIG_PCI=y
 # CONFIG_PCI_DEBUG is not set
 CONFIG_HT_IRQ=y
-# CONFIG_PCI_MSI is not set
+CONFIG_PCI_MSI=y
 # CONFIG_PCI_MULTITHREAD_PROBE is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
-# FIXME: Was borked in .17git11 for non-acpi machines.
 CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_HOTPLUG_PCI_FAKE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
@@ -105,6 +105,7 @@
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
+# CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
@@ -112,6 +113,8 @@
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_AMSO1100=m
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 
 #
 # Executable file formats
@@ -257,7 +260,7 @@
 # CONFIG_PNPBIOS is not set
 
 CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m 
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 
 #
 # Block devices
@@ -304,6 +307,11 @@
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_LSF=y
 
+CONFIG_BLK_DEV_DELKIN=m
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+
+
 #
 # ATA/ATAPI/MFM/RLL support
 #
@@ -445,22 +453,23 @@
 CONFIG_MEGARAID_SAS=m
 
 CONFIG_ATA=m
-CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_VIA=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_NV=m
 CONFIG_PDC_ADMA=m
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_QSTOR=m
+CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SIL=m
 CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
 
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
@@ -479,6 +488,7 @@
 CONFIG_PATA_HPT3X3=m
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_IT821X=m
+CONFIG_PATA_IT8213=m
 CONFIG_PATA_JMICRON=m
 # CONFIG_PATA_LEGACY is not set
 CONFIG_PATA_TRIFLEX=m
@@ -583,9 +593,9 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-CONFIG_FW=m
-CONFIG_FW_OHCI=m
-CONFIG_FW_SBP2=m
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 
 #
 # IEEE 1394 (FireWire) support
@@ -625,6 +635,7 @@
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -707,6 +718,7 @@
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -758,6 +770,7 @@
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
@@ -785,7 +798,6 @@
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_NAT=m
@@ -824,6 +836,7 @@
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RT=m
@@ -860,6 +873,7 @@
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
@@ -978,7 +992,7 @@
 
 #
 # ATM
-# 
+#
 # CONFIG_ATM_DUMMY is not set
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_LANE=m
@@ -1069,6 +1083,7 @@
 CONFIG_B44=m
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_E100=m
@@ -1086,6 +1101,7 @@
 CONFIG_SIS900=m
 CONFIG_SIS190=m
 CONFIG_EPIC100=m
+CONFIG_SC92031=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_TLAN=m
@@ -1132,6 +1148,7 @@
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y
+CONFIG_CHELSIO_T3=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1154,26 +1171,19 @@
 # CONFIG_SLIP_MODE_SLIP6 is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
+# Wireless LAN
 #
+CONFIG_WLAN_PRE80211=y
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
+CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 
-#
-# Wireless 802.11b ISA/PCI cards support
-#
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -1181,6 +1191,9 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
+CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT_COMPAT=y
+# CONFIG_NL80211 is not set
 CONFIG_IPW2100=m
 CONFIG_IPW2200=m
 # CONFIG_IPW2100_DEBUG is not set
@@ -1188,6 +1201,38 @@
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_BCM43XX_MAC80211=m
+CONFIG_BCM43XX_MAC80211_PCI=y
+CONFIG_BCM43XX_MAC80211_PCMCIA=y
+CONFIG_BCM43XX_MAC80211_DEBUG=y
+CONFIG_BCM43XX_MAC80211_DMA=y
+CONFIG_BCM43XX_MAC80211_PIO=y
+CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set
+# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set
+CONFIG_RT2X00=y
+CONFIG_RT2400PCI=m
+# CONFIG_RT2400PCI_DEBUG is not set
+CONFIG_RT2500PCI=m
+# CONFIG_RT2500PCI_DEBUG is not set
+CONFIG_RT61PCI=m
+# CONFIG_RT61PCI_DEBUG is not set
+CONFIG_RT2500USB=m
+# CONFIG_RT2500USB_DEBUG is not set
+CONFIG_RT73USB=m
+# CONFIG_RT73USB_DEBUG is not set
+CONFIG_RT2X00_DEBUGFS=m
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_ADM8211=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_ZD1211RW_MAC80211=m
+# CONFIG_ZD1211RW_MAC80211_DEBUG is not set
+CONFIG_RTL818X=y
+CONFIG_RTL8187=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_DEBUG=y
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1199,10 +1244,6 @@
 CONFIG_PRISM54=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
@@ -1397,6 +1438,7 @@
 # CAPI subsystem
 #
 CONFIG_ISDN_CAPI=m
+# CONFIG_CAPI_TRACE is not set
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
@@ -1425,6 +1467,7 @@
 
 CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M101=m
 CONFIG_GIGASET_M105=m
 # CONFIG_GIGASET_DEBUG is not set
 # CONFIG_GIGASET_UNDOCREQ is not set
@@ -1521,8 +1564,10 @@
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_INPUT_ATLAS_BTNS=m
 
 CONFIG_MAC_EMUMOUSEBTN=y
+
 #
 # Character devices
 #
@@ -1607,6 +1652,7 @@
 #
 
 CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PASEMI=m
 CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_SAVAGE4=m
 CONFIG_I2C_VOODOO3=m
@@ -1644,6 +1690,7 @@
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ATXP1=m
@@ -1764,22 +1811,22 @@
 CONFIG_RTC_INTF_SYSFS=m
 CONFIG_RTC_INTF_PROC=m
 CONFIG_RTC_INTF_DEV=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS1742=m
+# CONFIG_RTC_DRV_EP93XX is not set
+CONFIG_RTC_DRV_ISL1208=m
+# CONFIG_RTC_DRV_M48T86 is not set
 CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_RS5C372=m
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_EP93XX is not set
 # CONFIG_RTC_DRV_SA1100 is not set
 # CONFIG_RTC_DRV_TEST is not set
-
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_V3020=m
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -1811,6 +1858,7 @@
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_VIA=m
+CONFIG_DRM_NOUVEAU=m
 
 #
 # PCMCIA character devices
@@ -1959,6 +2007,7 @@
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_CXUSB=m
 CONFIG_DVB_USB_DIBUSB_MB=m
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
@@ -1966,12 +2015,17 @@
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_GL861=m
 CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_VP702X=m
 CONFIG_DVB_USB_VP7045=m
+
+CONFIG_DVB_TUNER_QT1010=m
+
 CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_LGDT330X=m
 
@@ -1982,7 +2036,6 @@
 
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
 CONFIG_VIDEO_BTCX=m
@@ -1996,18 +2049,30 @@
 # Graphics support
 #
 CONFIG_FB=y
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
+CONFIG_FB_3DFX=m
+CONFIG_FB_3DFX_ACCEL=y
+# CONFIG_FB_ARC is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+# CONFIG_FB_ASILIANT is not set
+CONFIG_FB_CIRRUS=m
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_CYBLA=m
+# CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
-CONFIG_FB_RIVA=m
-# CONFIG_FB_RIVA_DEBUG is not set
-# CONFIG_FB_RIVA_I2C is not set
 CONFIG_FB_I810=m
 CONFIG_FB_I810_GTF=y
 CONFIG_FB_I810_I2C=y
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_IMAC is not set
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_KYRO=m
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -2015,44 +2080,35 @@
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_MATROX_MULTIHEAD=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
 CONFIG_FB_RADEON=m
 # CONFIG_FB_RADEON_DEBUG is not set
 CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GX=y
+CONFIG_FB_RIVA=m
+# CONFIG_FB_RIVA_DEBUG is not set
+# CONFIG_FB_RIVA_I2C is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
 # CONFIG_FB_SIS is not set
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_VOODOO1=m
+CONFIG_FB_SM501=m
+CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_KYRO=m
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-# CONFIG_FB_ASILIANT is not set
-CONFIG_FB_3DFX_ACCEL=y
 CONFIG_FB_TRIDENT_ACCEL=y
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_TILEBLITTING=y
-# CONFIG_FB_ARC is not set
-CONFIG_FB_INTEL=m
-# CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_CYBLA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_VGA16=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_VOODOO1=m
+
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_IMAC is not set
 
 #
 # Console display driver support
@@ -2108,6 +2164,7 @@
 CONFIG_SND_MTS64=m
 # CONFIG_SND_SERIAL_U16550 is not set
 CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
 
 #
@@ -2196,10 +2253,8 @@
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
-CONFIG_USB_MULTITHREAD_PROBE=y
 
 #
 # USB Host Controller Drivers
@@ -2209,6 +2264,7 @@
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_CS=m
 
@@ -2241,11 +2297,13 @@
 # USB Human Interface Devices (HID)
 #
 CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-CONFIG_USB_HID_POWERBOOK=y
+
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y
 CONFIG_LOGITECH_FF=y
+CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
@@ -2296,6 +2354,7 @@
 # Has dumb detection, which gets loaded for every hid device.
 # CONFIG_USB_YEALINK is not set
 CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
@@ -2315,6 +2374,7 @@
 #
 CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
 
 #
 # USB port drivers
@@ -2374,7 +2434,7 @@
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_XIRCOM=m
-# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_DEBUG=m
 
 CONFIG_USB_EZUSB=y
 CONFIG_USB_EMI62=m
@@ -2391,7 +2451,9 @@
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LCD=m
-CONFIG_USB_TEST=m
+CONFIG_USB_BERRY_CHARGE=m
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
 # CONFIG_USB_GADGET is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
 # CONFIG_USB_GADGET_GOKU is not set
@@ -2429,6 +2491,7 @@
 CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_USB_LD=m
 CONFIG_USB_APPLETOUCH=m
+CONFIG_USB_GTCO=m
 CONFIG_USB_TRANCEVIBRATOR=m
 
 CONFIG_USB_TOUCHSCREEN=m
@@ -2437,6 +2500,19 @@
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 
 #
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCMCIAHOST=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE=y
+
+# Multifunction USB devices
+CONFIG_MFD_SM501=m
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=m
@@ -2487,7 +2563,6 @@
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
 CONFIG_UDF_FS=m
 
 #
@@ -2524,13 +2599,14 @@
 # CONFIG_BEFS_DEBUG is not set
 CONFIG_BFS_FS=m
 CONFIG_EFS_FS=m
-# CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
@@ -2696,13 +2772,15 @@
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y
 CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DEBUG_DEVRES=y
 
 #
 # Security options
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
@@ -2727,6 +2805,7 @@
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=m
@@ -2734,6 +2813,7 @@
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_KHAZAD=m
@@ -2741,16 +2821,19 @@
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_MPILIB=y
 CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIGNATURE_DSA=y
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
 
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_LIBCRC32C=m
@@ -2762,7 +2845,9 @@
 CONFIG_CRC16=m
 CONFIG_CRC32=m
 CONFIG_CRC_CCITT=m
+CONFIG_CRC_ITU_T=m
 
+CONFIG_EEPROM_93CX6=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 
@@ -2776,9 +2861,14 @@
 CONFIG_ATA_OVER_ETH=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY_BACKLIGHT=y
+
 CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
 
 CONFIG_SCHEDSTATS=y
 
@@ -2790,7 +2880,6 @@
 CONFIG_CPUSETS=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
-# CONFIG_SECCOMP is not set
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_MUST_CHECK=y
 
@@ -2810,8 +2899,9 @@
 
 CONFIG_PM_LEGACY=y
 # CONFIG_PM_SYSFS_DEPRECATED is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_TRACE is not set
+CONFIG_PM_DEBUG=y
+CONFIG_PM_TRACE=y
+# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
 
 CONFIG_CRASH=m
 
@@ -2964,6 +3054,7 @@
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INDIGOIO=m
 CONFIG_SND_INDIGODJ=m
+# CONFIG_SND_SOC is not set
 
 ## END of ISA options.
 
@@ -3001,21 +3092,31 @@
 
 CONFIG_HZ_1000=y
 
-CONFIG_HID=m
+CONFIG_TIMER_STATS=y
 
+# Auxillary displays
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=y
+CONFIG_CFAG12864B_RATE=20
+
+CONFIG_DEBUG_IGNORE_QUIET=y
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_RWSEMS=y
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_PROVE_LOCKING=y
 CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_SLEEP_IN_IRQ=y
 
 CONFIG_FAULT_INJECTION=y
 CONFIG_FAILSLAB=y
 CONFIG_FAIL_PAGE_ALLOC=y
 CONFIG_FAIL_MAKE_REQUEST=y
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+
 CONFIG_UID16=y
 # CONFIG_X86_64_XEN is not set
 # CONFIG_MK8 is not set
@@ -3050,6 +3151,7 @@
 CONFIG_I2O_EXT_ADAPTEC_DMA64=y
 CONFIG_I2O_CONFIG_OLD_IOCTL=y
 CONFIG_I2O_BUS=m
+# CONFIG_SECCOMP is not set
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_SCHED_SMT=y
 CONFIG_SOFTWARE_SUSPEND=y
@@ -3064,44 +3166,47 @@
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_FREQ_DEBUG=y
-CONFIG_X86_SPEEDSTEP_CENTRINO=y
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y
 # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_AC=m
+CONFIG_ACPI_ASUS=m
 CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BAY=m
+CONFIG_ACPI_IBM_BAY=y
+CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_CONTAINER=m
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DOCK=m
+CONFIG_ACPI_EC=y
 CONFIG_ACPI_FAN=y
+# CONFIG_ACPI_HOTKEY is not set
+CONFIG_ACPI_HOTPLUG_MEMORY=m
+CONFIG_ACPI_IBM=m
+# CONFIG_ACPI_IBM_DOCK is not set
+CONFIG_ACPI_NUMA=y
 CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_PROCFS=y
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_SLEEP=y
+# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
 CONFIG_ACPI_THERMAL=y
-CONFIG_ACPI_ASUS=m
 CONFIG_ACPI_TOSHIBA=m
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_EC=y
 CONFIG_ACPI_POWER=y
 CONFIG_ACPI_SYSTEM=y
-CONFIG_ACPI_NUMA=y
-CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_IBM=m
-# CONFIG_ACPI_IBM_DOCK is not set
-CONFIG_ACPI_HOTPLUG_MEMORY=m
-CONFIG_ACPI_DOCK=m
-CONFIG_ACPI_SBS=m
-# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
-# CONFIG_ACPI_HOTKEY is not set
-CONFIG_ACPI_CONTAINER=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_SHPC=m
-# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
 CONFIG_HPET=y
 # CONFIG_HPET_MMAP is not set
 # CONFIG_HPET_RTC_IRQ is not set


Index: kernel-2.6.20-x86_64-xen.config
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-2.6.20-x86_64-xen.config,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- kernel-2.6.20-x86_64-xen.config	22 Mar 2007 17:41:32 -0000	1.2
+++ kernel-2.6.20-x86_64-xen.config	10 Apr 2007 22:41:59 -0000	1.2.2.1
@@ -57,6 +57,7 @@
 CONFIG_KMOD=y
 CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
+CONFIG_MODULE_VERIFY_ELF=y
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -68,7 +69,6 @@
 # CONFIG_PCI_MULTITHREAD_PROBE is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
-# FIXME: Was borked in .17git11 for non-acpi machines.
 CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_HOTPLUG_PCI_FAKE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
@@ -105,6 +105,7 @@
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
+# CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
@@ -112,6 +113,8 @@
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_AMSO1100=m
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 
 #
 # Executable file formats
@@ -257,7 +260,7 @@
 # CONFIG_PNPBIOS is not set
 
 CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m 
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 
 #
 # Block devices
@@ -304,6 +307,11 @@
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_LSF=y
 
+CONFIG_BLK_DEV_DELKIN=m
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+
+
 #
 # ATA/ATAPI/MFM/RLL support
 #
@@ -445,22 +453,23 @@
 CONFIG_MEGARAID_SAS=m
 
 CONFIG_ATA=m
-CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_VIA=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_NV=m
 CONFIG_PDC_ADMA=m
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_QSTOR=m
+CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SIL=m
 CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
 
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
@@ -479,6 +488,7 @@
 CONFIG_PATA_HPT3X3=m
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_IT821X=m
+CONFIG_PATA_IT8213=m
 CONFIG_PATA_JMICRON=m
 # CONFIG_PATA_LEGACY is not set
 CONFIG_PATA_TRIFLEX=m
@@ -583,7 +593,9 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-# CONFIG_FW is not set
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 
 #
 # IEEE 1394 (FireWire) support
@@ -623,6 +635,7 @@
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -705,6 +718,7 @@
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -756,6 +770,7 @@
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
@@ -783,7 +798,6 @@
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_NAT=m
@@ -822,6 +836,7 @@
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RT=m
@@ -858,6 +873,7 @@
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
@@ -976,7 +992,7 @@
 
 #
 # ATM
-# 
+#
 # CONFIG_ATM_DUMMY is not set
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_LANE=m
@@ -1067,6 +1083,7 @@
 CONFIG_B44=m
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_E100=m
@@ -1084,6 +1101,7 @@
 CONFIG_SIS900=m
 CONFIG_SIS190=m
 CONFIG_EPIC100=m
+CONFIG_SC92031=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_TLAN=m
@@ -1130,6 +1148,7 @@
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y
+CONFIG_CHELSIO_T3=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1152,26 +1171,19 @@
 # CONFIG_SLIP_MODE_SLIP6 is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
+# Wireless LAN
 #
+CONFIG_WLAN_PRE80211=y
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
+CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 
-#
-# Wireless 802.11b ISA/PCI cards support
-#
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -1179,6 +1191,9 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
+CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT_COMPAT=y
+# CONFIG_NL80211 is not set
 CONFIG_IPW2100=m
 CONFIG_IPW2200=m
 # CONFIG_IPW2100_DEBUG is not set
@@ -1186,6 +1201,38 @@
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_BCM43XX_MAC80211=m
+CONFIG_BCM43XX_MAC80211_PCI=y
+CONFIG_BCM43XX_MAC80211_PCMCIA=y
+CONFIG_BCM43XX_MAC80211_DEBUG=y
+CONFIG_BCM43XX_MAC80211_DMA=y
+CONFIG_BCM43XX_MAC80211_PIO=y
+CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set
+# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set
+CONFIG_RT2X00=y
+CONFIG_RT2400PCI=m
+# CONFIG_RT2400PCI_DEBUG is not set
+CONFIG_RT2500PCI=m
+# CONFIG_RT2500PCI_DEBUG is not set
+CONFIG_RT61PCI=m
+# CONFIG_RT61PCI_DEBUG is not set
+CONFIG_RT2500USB=m
+# CONFIG_RT2500USB_DEBUG is not set
+CONFIG_RT73USB=m
+# CONFIG_RT73USB_DEBUG is not set
+CONFIG_RT2X00_DEBUGFS=m
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_ADM8211=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_ZD1211RW_MAC80211=m
+# CONFIG_ZD1211RW_MAC80211_DEBUG is not set
+CONFIG_RTL818X=y
+CONFIG_RTL8187=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_DEBUG=y
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1197,10 +1244,6 @@
 CONFIG_PRISM54=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
@@ -1395,6 +1438,7 @@
 # CAPI subsystem
 #
 CONFIG_ISDN_CAPI=m
+# CONFIG_CAPI_TRACE is not set
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
@@ -1423,6 +1467,7 @@
 
 CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M101=m
 CONFIG_GIGASET_M105=m
 # CONFIG_GIGASET_DEBUG is not set
 # CONFIG_GIGASET_UNDOCREQ is not set
@@ -1519,8 +1564,10 @@
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_INPUT_ATLAS_BTNS=m
 
 CONFIG_MAC_EMUMOUSEBTN=y
+
 #
 # Character devices
 #
@@ -1605,6 +1652,7 @@
 #
 
 CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PASEMI=m
 CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_SAVAGE4=m
 CONFIG_I2C_VOODOO3=m
@@ -1642,6 +1690,7 @@
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ATXP1=m
@@ -1762,22 +1811,22 @@
 CONFIG_RTC_INTF_SYSFS=m
 CONFIG_RTC_INTF_PROC=m
 CONFIG_RTC_INTF_DEV=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS1742=m
+# CONFIG_RTC_DRV_EP93XX is not set
+CONFIG_RTC_DRV_ISL1208=m
+# CONFIG_RTC_DRV_M48T86 is not set
 CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_RS5C372=m
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_EP93XX is not set
 # CONFIG_RTC_DRV_SA1100 is not set
 # CONFIG_RTC_DRV_TEST is not set
-
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_V3020=m
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -1809,6 +1858,7 @@
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_VIA=m
+CONFIG_DRM_NOUVEAU=m
 
 #
 # PCMCIA character devices
@@ -1957,6 +2007,7 @@
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_CXUSB=m
 CONFIG_DVB_USB_DIBUSB_MB=m
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
@@ -1964,12 +2015,17 @@
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_GL861=m
 CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_VP702X=m
 CONFIG_DVB_USB_VP7045=m
+
+CONFIG_DVB_TUNER_QT1010=m
+
 CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_LGDT330X=m
 
@@ -1980,7 +2036,6 @@
 
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
 CONFIG_VIDEO_BTCX=m
@@ -1994,18 +2049,30 @@
 # Graphics support
 #
 CONFIG_FB=y
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
+CONFIG_FB_3DFX=m
+CONFIG_FB_3DFX_ACCEL=y
+# CONFIG_FB_ARC is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+# CONFIG_FB_ASILIANT is not set
+CONFIG_FB_CIRRUS=m
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_CYBLA=m
+# CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
-CONFIG_FB_RIVA=m
-# CONFIG_FB_RIVA_DEBUG is not set
-# CONFIG_FB_RIVA_I2C is not set
 CONFIG_FB_I810=m
 CONFIG_FB_I810_GTF=y
 CONFIG_FB_I810_I2C=y
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_IMAC is not set
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_KYRO=m
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -2013,44 +2080,35 @@
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_MATROX_MULTIHEAD=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
 CONFIG_FB_RADEON=m
 # CONFIG_FB_RADEON_DEBUG is not set
 CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GX=y
+CONFIG_FB_RIVA=m
+# CONFIG_FB_RIVA_DEBUG is not set
+# CONFIG_FB_RIVA_I2C is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
 # CONFIG_FB_SIS is not set
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_VOODOO1=m
+CONFIG_FB_SM501=m
+CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_KYRO=m
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-# CONFIG_FB_ASILIANT is not set
-CONFIG_FB_3DFX_ACCEL=y
 CONFIG_FB_TRIDENT_ACCEL=y
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_TILEBLITTING=y
-# CONFIG_FB_ARC is not set
-CONFIG_FB_INTEL=m
-# CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_CYBLA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_VGA16=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_VOODOO1=m
+
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_IMAC is not set
 
 #
 # Console display driver support
@@ -2106,6 +2164,7 @@
 CONFIG_SND_MTS64=m
 # CONFIG_SND_SERIAL_U16550 is not set
 CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
 
 #
@@ -2194,10 +2253,8 @@
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
-CONFIG_USB_MULTITHREAD_PROBE=y
 
 #
 # USB Host Controller Drivers
@@ -2207,6 +2264,7 @@
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_CS=m
 
@@ -2239,11 +2297,13 @@
 # USB Human Interface Devices (HID)
 #
 CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-CONFIG_USB_HID_POWERBOOK=y
+
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y
 CONFIG_LOGITECH_FF=y
+CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
@@ -2294,6 +2354,7 @@
 # Has dumb detection, which gets loaded for every hid device.
 # CONFIG_USB_YEALINK is not set
 CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
@@ -2313,6 +2374,7 @@
 #
 CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
 
 #
 # USB port drivers
@@ -2372,7 +2434,7 @@
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_XIRCOM=m
-# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_DEBUG=m
 
 CONFIG_USB_EZUSB=y
 CONFIG_USB_EMI62=m
@@ -2389,6 +2451,8 @@
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LCD=m
+CONFIG_USB_BERRY_CHARGE=m
+# CONFIG_USB_IOWARRIOR is not set
 CONFIG_USB_TEST=m
 # CONFIG_USB_GADGET is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
@@ -2427,6 +2491,7 @@
 CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_USB_LD=m
 CONFIG_USB_APPLETOUCH=m
+CONFIG_USB_GTCO=m
 CONFIG_USB_TRANCEVIBRATOR=m
 
 CONFIG_USB_TOUCHSCREEN=m
@@ -2435,6 +2500,19 @@
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 
 #
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCMCIAHOST=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE=y
+
+# Multifunction USB devices
+CONFIG_MFD_SM501=m
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=m
@@ -2485,7 +2563,6 @@
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
 CONFIG_UDF_FS=m
 
 #
@@ -2522,13 +2599,14 @@
 # CONFIG_BEFS_DEBUG is not set
 CONFIG_BFS_FS=m
 CONFIG_EFS_FS=m
-# CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
@@ -2694,13 +2772,15 @@
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y
 CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DEBUG_DEVRES=y
 
 #
 # Security options
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
@@ -2725,6 +2805,7 @@
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=m
@@ -2732,6 +2813,7 @@
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_KHAZAD=m
@@ -2739,16 +2821,19 @@
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_MPILIB=y
 CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIGNATURE_DSA=y
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
 
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_LIBCRC32C=m
@@ -2760,7 +2845,9 @@
 CONFIG_CRC16=m
 CONFIG_CRC32=m
 CONFIG_CRC_CCITT=m
+CONFIG_CRC_ITU_T=m
 
+CONFIG_EEPROM_93CX6=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 
@@ -2774,9 +2861,14 @@
 CONFIG_ATA_OVER_ETH=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY_BACKLIGHT=y
+
 CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
 
 CONFIG_SCHEDSTATS=y
 
@@ -2788,7 +2880,6 @@
 CONFIG_CPUSETS=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
-# CONFIG_SECCOMP is not set
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_MUST_CHECK=y
 
@@ -2808,8 +2899,9 @@
 
 CONFIG_PM_LEGACY=y
 # CONFIG_PM_SYSFS_DEPRECATED is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_TRACE is not set
+CONFIG_PM_DEBUG=y
+CONFIG_PM_TRACE=y
+# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
 
 CONFIG_CRASH=m
 
@@ -2962,6 +3054,7 @@
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INDIGOIO=m
 CONFIG_SND_INDIGODJ=m
+# CONFIG_SND_SOC is not set
 
 ## END of ISA options.
 
@@ -2999,21 +3092,31 @@
 
 # CONFIG_HZ_1000 is not set
 
-CONFIG_HID=m
+CONFIG_TIMER_STATS=y
+
+# Auxillary displays
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=y
+CONFIG_CFAG12864B_RATE=20
 
+CONFIG_DEBUG_IGNORE_QUIET=y
 # CONFIG_DEBUG_SLAB is not set
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_RWSEMS=y
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_PROVE_LOCKING=y
 CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_SLEEP_IN_IRQ=y
 
 CONFIG_FAULT_INJECTION=y
 CONFIG_FAILSLAB=y
 CONFIG_FAIL_PAGE_ALLOC=y
 CONFIG_FAIL_MAKE_REQUEST=y
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+
 CONFIG_UID16=y
 CONFIG_X86_64_XEN=y
 # CONFIG_MK8 is not set
@@ -3048,6 +3151,7 @@
 CONFIG_I2O_EXT_ADAPTEC_DMA64=y
 CONFIG_I2O_CONFIG_OLD_IOCTL=y
 CONFIG_I2O_BUS=m
+# CONFIG_SECCOMP is not set
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_SCHED_SMT=y
 CONFIG_SOFTWARE_SUSPEND=y
@@ -3064,42 +3168,45 @@
 CONFIG_CPU_FREQ_DEBUG=y
 CONFIG_X86_SPEEDSTEP_CENTRINO=y
 CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y
 # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_AC=m
+CONFIG_ACPI_ASUS=m
 CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BAY=m
+CONFIG_ACPI_IBM_BAY=y
+CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_CONTAINER=m
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DOCK=m
+CONFIG_ACPI_EC=y
 CONFIG_ACPI_FAN=y
+# CONFIG_ACPI_HOTKEY is not set
+CONFIG_ACPI_HOTPLUG_MEMORY=m
+CONFIG_ACPI_IBM=m
+# CONFIG_ACPI_IBM_DOCK is not set
+CONFIG_ACPI_NUMA=y
 CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_PROCFS=y
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_SLEEP=y
+# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
 CONFIG_ACPI_THERMAL=y
-CONFIG_ACPI_ASUS=m
 CONFIG_ACPI_TOSHIBA=m
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_EC=y
 CONFIG_ACPI_POWER=y
 CONFIG_ACPI_SYSTEM=y
-CONFIG_ACPI_NUMA=y
-CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_IBM=m
-# CONFIG_ACPI_IBM_DOCK is not set
-CONFIG_ACPI_HOTPLUG_MEMORY=m
-CONFIG_ACPI_DOCK=m
-CONFIG_ACPI_SBS=m
-# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
-# CONFIG_ACPI_HOTKEY is not set
-CONFIG_ACPI_CONTAINER=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_SHPC=m
-# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
 CONFIG_HPET=y
 # CONFIG_HPET_MMAP is not set
 # CONFIG_HPET_RTC_IRQ is not set
@@ -3197,3 +3304,18 @@
 CONFIG_HZ_250=y
 CONFIG_X86_64=y
 # CONFIG_X86_XEN is not set
+# CONFIG_FW is not set
+CONFIG_IP_NF_TARGET_TCPMSS=m
+CONFIG_NET_RADIO=y
+CONFIG_VIDEO_VIDEOBUF=m
+# CONFIG_USB_BANDWIDTH is not set
+CONFIG_USB_MULTITHREAD_PROBE=y
+CONFIG_USB_HIDINPUT=y
+CONFIG_USB_HID_POWERBOOK=y
+CONFIG_ZISOFS_FS=y
+# CONFIG_JFFS_FS is not set
+CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_LCD_DEVICE=y
+CONFIG_DEBUG_RWSEMS=y
+CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y
+# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set


Index: kernel-2.6.20-x86_64.config
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-2.6.20-x86_64.config,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- kernel-2.6.20-x86_64.config	22 Mar 2007 16:06:42 -0000	1.1
+++ kernel-2.6.20-x86_64.config	10 Apr 2007 22:41:59 -0000	1.1.2.1
@@ -57,6 +57,7 @@
 CONFIG_KMOD=y
 CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
+CONFIG_MODULE_VERIFY_ELF=y
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -68,7 +69,6 @@
 # CONFIG_PCI_MULTITHREAD_PROBE is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
-# FIXME: Was borked in .17git11 for non-acpi machines.
 CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_HOTPLUG_PCI_FAKE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
@@ -105,6 +105,7 @@
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
+# CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
@@ -112,6 +113,8 @@
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_AMSO1100=m
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 
 #
 # Executable file formats
@@ -257,7 +260,7 @@
 # CONFIG_PNPBIOS is not set
 
 CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m 
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 
 #
 # Block devices
@@ -304,6 +307,11 @@
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_LSF=y
 
+CONFIG_BLK_DEV_DELKIN=m
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+
+
 #
 # ATA/ATAPI/MFM/RLL support
 #
@@ -445,22 +453,23 @@
 CONFIG_MEGARAID_SAS=m
 
 CONFIG_ATA=m
-CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_VIA=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_NV=m
 CONFIG_PDC_ADMA=m
 CONFIG_SATA_AHCI=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_QSTOR=m
+CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SIL=m
 CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
 
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
@@ -479,6 +488,7 @@
 CONFIG_PATA_HPT3X3=m
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_IT821X=m
+CONFIG_PATA_IT8213=m
 CONFIG_PATA_JMICRON=m
 # CONFIG_PATA_LEGACY is not set
 CONFIG_PATA_TRIFLEX=m
@@ -583,9 +593,9 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-CONFIG_FW=m
-CONFIG_FW_OHCI=m
-CONFIG_FW_SBP2=m
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 
 #
 # IEEE 1394 (FireWire) support
@@ -625,6 +635,7 @@
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -707,6 +718,7 @@
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -758,6 +770,7 @@
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
@@ -785,7 +798,6 @@
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_NAT=m
@@ -824,6 +836,7 @@
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RT=m
@@ -860,6 +873,7 @@
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
@@ -978,7 +992,7 @@
 
 #
 # ATM
-# 
+#
 # CONFIG_ATM_DUMMY is not set
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_LANE=m
@@ -1069,6 +1083,7 @@
 CONFIG_B44=m
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_E100=m
@@ -1086,6 +1101,7 @@
 CONFIG_SIS900=m
 CONFIG_SIS190=m
 CONFIG_EPIC100=m
+CONFIG_SC92031=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_TLAN=m
@@ -1132,6 +1148,7 @@
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y
+CONFIG_CHELSIO_T3=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1154,26 +1171,19 @@
 # CONFIG_SLIP_MODE_SLIP6 is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
+# Wireless LAN
 #
+CONFIG_WLAN_PRE80211=y
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
+CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 
-#
-# Wireless 802.11b ISA/PCI cards support
-#
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -1181,6 +1191,9 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IEEE80211_SOFTMAC_DEBUG=y
+CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT_COMPAT=y
+# CONFIG_NL80211 is not set
 CONFIG_IPW2100=m
 CONFIG_IPW2200=m
 # CONFIG_IPW2100_DEBUG is not set
@@ -1188,6 +1201,38 @@
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_BCM43XX_MAC80211=m
+CONFIG_BCM43XX_MAC80211_PCI=y
+CONFIG_BCM43XX_MAC80211_PCMCIA=y
+CONFIG_BCM43XX_MAC80211_DEBUG=y
+CONFIG_BCM43XX_MAC80211_DMA=y
+CONFIG_BCM43XX_MAC80211_PIO=y
+CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set
+# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set
+CONFIG_RT2X00=y
+CONFIG_RT2400PCI=m
+# CONFIG_RT2400PCI_DEBUG is not set
+CONFIG_RT2500PCI=m
+# CONFIG_RT2500PCI_DEBUG is not set
+CONFIG_RT61PCI=m
+# CONFIG_RT61PCI_DEBUG is not set
+CONFIG_RT2500USB=m
+# CONFIG_RT2500USB_DEBUG is not set
+CONFIG_RT73USB=m
+# CONFIG_RT73USB_DEBUG is not set
+CONFIG_RT2X00_DEBUGFS=m
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_ADM8211=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_ZD1211RW_MAC80211=m
+# CONFIG_ZD1211RW_MAC80211_DEBUG is not set
+CONFIG_RTL818X=y
+CONFIG_RTL8187=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_DEBUG=y
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1199,10 +1244,6 @@
 CONFIG_PRISM54=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
@@ -1397,6 +1438,7 @@
 # CAPI subsystem
 #
 CONFIG_ISDN_CAPI=m
+# CONFIG_CAPI_TRACE is not set
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
@@ -1425,6 +1467,7 @@
 
 CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M101=m
 CONFIG_GIGASET_M105=m
 # CONFIG_GIGASET_DEBUG is not set
 # CONFIG_GIGASET_UNDOCREQ is not set
@@ -1521,8 +1564,10 @@
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_INPUT_ATLAS_BTNS=m
 
 CONFIG_MAC_EMUMOUSEBTN=y
+
 #
 # Character devices
 #
@@ -1607,6 +1652,7 @@
 #
 
 CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PASEMI=m
 CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_SAVAGE4=m
 CONFIG_I2C_VOODOO3=m
@@ -1644,6 +1690,7 @@
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ATXP1=m
@@ -1764,22 +1811,22 @@
 CONFIG_RTC_INTF_SYSFS=m
 CONFIG_RTC_INTF_PROC=m
 CONFIG_RTC_INTF_DEV=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS1742=m
+# CONFIG_RTC_DRV_EP93XX is not set
+CONFIG_RTC_DRV_ISL1208=m
+# CONFIG_RTC_DRV_M48T86 is not set
 CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_RS5C372=m
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_EP93XX is not set
 # CONFIG_RTC_DRV_SA1100 is not set
 # CONFIG_RTC_DRV_TEST is not set
-
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_V3020=m
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -1811,6 +1858,7 @@
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_VIA=m
+CONFIG_DRM_NOUVEAU=m
 
 #
 # PCMCIA character devices
@@ -1959,6 +2007,7 @@
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
 CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_CXUSB=m
 CONFIG_DVB_USB_DIBUSB_MB=m
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
@@ -1966,12 +2015,17 @@
 CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_GL861=m
 CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
 CONFIG_DVB_USB_NOVA_T_USB2=m
 CONFIG_DVB_USB_TTUSB2=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_VP702X=m
 CONFIG_DVB_USB_VP7045=m
+
+CONFIG_DVB_TUNER_QT1010=m
+
 CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_LGDT330X=m
 
@@ -1982,7 +2036,6 @@
 
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
 CONFIG_VIDEO_BTCX=m
@@ -1996,18 +2049,30 @@
 # Graphics support
 #
 CONFIG_FB=y
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
+CONFIG_FB_3DFX=m
+CONFIG_FB_3DFX_ACCEL=y
+# CONFIG_FB_ARC is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+# CONFIG_FB_ASILIANT is not set
+CONFIG_FB_CIRRUS=m
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_CYBLA=m
+# CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
-CONFIG_FB_RIVA=m
-# CONFIG_FB_RIVA_DEBUG is not set
-# CONFIG_FB_RIVA_I2C is not set
 CONFIG_FB_I810=m
 CONFIG_FB_I810_GTF=y
 CONFIG_FB_I810_I2C=y
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_IMAC is not set
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_KYRO=m
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -2015,44 +2080,35 @@
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_MATROX_MULTIHEAD=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
 CONFIG_FB_RADEON=m
 # CONFIG_FB_RADEON_DEBUG is not set
 CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GX=y
+CONFIG_FB_RIVA=m
+# CONFIG_FB_RIVA_DEBUG is not set
+# CONFIG_FB_RIVA_I2C is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_S3=m
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
 # CONFIG_FB_SIS is not set
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_VOODOO1=m
+CONFIG_FB_SM501=m
+CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_TRIDENT=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_KYRO=m
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-# CONFIG_FB_ASILIANT is not set
-CONFIG_FB_3DFX_ACCEL=y
 CONFIG_FB_TRIDENT_ACCEL=y
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_TILEBLITTING=y
-# CONFIG_FB_ARC is not set
-CONFIG_FB_INTEL=m
-# CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_CYBLA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_VGA16=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_VOODOO1=m
+
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_IMAC is not set
 
 #
 # Console display driver support
@@ -2108,6 +2164,7 @@
 CONFIG_SND_MTS64=m
 # CONFIG_SND_SERIAL_U16550 is not set
 CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
 
 #
@@ -2196,10 +2253,8 @@
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
-CONFIG_USB_MULTITHREAD_PROBE=y
 
 #
 # USB Host Controller Drivers
@@ -2209,6 +2264,7 @@
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_CS=m
 
@@ -2241,11 +2297,13 @@
 # USB Human Interface Devices (HID)
 #
 CONFIG_USB_HID=y
-CONFIG_USB_HIDINPUT=y
-CONFIG_USB_HID_POWERBOOK=y
+
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y
 CONFIG_LOGITECH_FF=y
+CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
@@ -2296,6 +2354,7 @@
 # Has dumb detection, which gets loaded for every hid device.
 # CONFIG_USB_YEALINK is not set
 CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
@@ -2315,6 +2374,7 @@
 #
 CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
 
 #
 # USB port drivers
@@ -2374,7 +2434,7 @@
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_XIRCOM=m
-# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_DEBUG=m
 
 CONFIG_USB_EZUSB=y
 CONFIG_USB_EMI62=m
@@ -2391,7 +2451,9 @@
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LCD=m
-CONFIG_USB_TEST=m
+CONFIG_USB_BERRY_CHARGE=m
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
 # CONFIG_USB_GADGET is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
 # CONFIG_USB_GADGET_GOKU is not set
@@ -2429,6 +2491,7 @@
 CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_USB_LD=m
 CONFIG_USB_APPLETOUCH=m
+CONFIG_USB_GTCO=m
 CONFIG_USB_TRANCEVIBRATOR=m
 
 CONFIG_USB_TOUCHSCREEN=m
@@ -2437,6 +2500,19 @@
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 
 #
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCMCIAHOST=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE=y
+
+# Multifunction USB devices
+CONFIG_MFD_SM501=m
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=m
@@ -2487,7 +2563,6 @@
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=y
 CONFIG_UDF_FS=m
 
 #
@@ -2524,13 +2599,14 @@
 # CONFIG_BEFS_DEBUG is not set
 CONFIG_BFS_FS=m
 CONFIG_EFS_FS=m
-# CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
@@ -2696,13 +2772,15 @@
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y
 CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DEBUG_DEVRES=y
 
 #
 # Security options
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
@@ -2727,6 +2805,7 @@
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=m
@@ -2734,6 +2813,7 @@
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_KHAZAD=m
@@ -2741,16 +2821,19 @@
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_MPILIB=y
 CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIGNATURE_DSA=y
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
 
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_LIBCRC32C=m
@@ -2762,7 +2845,9 @@
 CONFIG_CRC16=m
 CONFIG_CRC32=m
 CONFIG_CRC_CCITT=m
+CONFIG_CRC_ITU_T=m
 
+CONFIG_EEPROM_93CX6=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 
@@ -2776,9 +2861,14 @@
 CONFIG_ATA_OVER_ETH=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY_BACKLIGHT=y
+
 CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
 
 CONFIG_SCHEDSTATS=y
 
@@ -2790,7 +2880,6 @@
 CONFIG_CPUSETS=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
-# CONFIG_SECCOMP is not set
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_MUST_CHECK=y
 
@@ -2810,8 +2899,9 @@
 
 CONFIG_PM_LEGACY=y
 # CONFIG_PM_SYSFS_DEPRECATED is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_TRACE is not set
+CONFIG_PM_DEBUG=y
+CONFIG_PM_TRACE=y
+# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
 
 CONFIG_CRASH=m
 
@@ -2964,6 +3054,7 @@
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INDIGOIO=m
 CONFIG_SND_INDIGODJ=m
+# CONFIG_SND_SOC is not set
 
 ## END of ISA options.
 
@@ -3001,21 +3092,31 @@
 
 CONFIG_HZ_1000=y
 
-CONFIG_HID=m
+CONFIG_TIMER_STATS=y
 
+# Auxillary displays
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=y
+CONFIG_CFAG12864B_RATE=20
+
+CONFIG_DEBUG_IGNORE_QUIET=y
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_RWSEMS=y
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_PROVE_LOCKING=y
 CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_SLEEP_IN_IRQ=y
 
 CONFIG_FAULT_INJECTION=y
 CONFIG_FAILSLAB=y
 CONFIG_FAIL_PAGE_ALLOC=y
 CONFIG_FAIL_MAKE_REQUEST=y
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+
 CONFIG_UID16=y
 # CONFIG_X86_64_XEN is not set
 # CONFIG_MK8 is not set
@@ -3050,6 +3151,7 @@
 CONFIG_I2O_EXT_ADAPTEC_DMA64=y
 CONFIG_I2O_CONFIG_OLD_IOCTL=y
 CONFIG_I2O_BUS=m
+# CONFIG_SECCOMP is not set
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_SCHED_SMT=y
 CONFIG_SOFTWARE_SUSPEND=y
@@ -3064,44 +3166,47 @@
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_FREQ_DEBUG=y
-CONFIG_X86_SPEEDSTEP_CENTRINO=y
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y
 # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_AC=m
+CONFIG_ACPI_ASUS=m
 CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BAY=m
+CONFIG_ACPI_IBM_BAY=y
+CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_CONTAINER=m
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DOCK=m
+CONFIG_ACPI_EC=y
 CONFIG_ACPI_FAN=y
+# CONFIG_ACPI_HOTKEY is not set
+CONFIG_ACPI_HOTPLUG_MEMORY=m
+CONFIG_ACPI_IBM=m
+# CONFIG_ACPI_IBM_DOCK is not set
+CONFIG_ACPI_NUMA=y
 CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_PROCFS=y
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_SLEEP=y
+# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
 CONFIG_ACPI_THERMAL=y
-CONFIG_ACPI_ASUS=m
 CONFIG_ACPI_TOSHIBA=m
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_EC=y
 CONFIG_ACPI_POWER=y
 CONFIG_ACPI_SYSTEM=y
-CONFIG_ACPI_NUMA=y
-CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_IBM=m
-# CONFIG_ACPI_IBM_DOCK is not set
-CONFIG_ACPI_HOTPLUG_MEMORY=m
-CONFIG_ACPI_DOCK=m
-CONFIG_ACPI_SBS=m
-# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
-# CONFIG_ACPI_HOTKEY is not set
-CONFIG_ACPI_CONTAINER=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_SHPC=m
-# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE 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  Tue Apr 10 22:48:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 18:48:57 -0400
Subject: rpms/xorg-x11-drv-savage/FC-6 savage-2.1.2-missing-symbol.patch,
	NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 xorg-x11-drv-savage.spec, 1.16,
	1.17 savage-disable-dri-bug196011.patch, 1.1, NONE
Message-ID: <200704102248.l3AMmveD019768@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-savage/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv19715/FC-6

Modified Files:
	.cvsignore sources xorg-x11-drv-savage.spec 
Added Files:
	savage-2.1.2-missing-symbol.patch 
Removed Files:
	savage-disable-dri-bug196011.patch 
Log Message:
auto-import xorg-x11-drv-savage-2.1.2-3.fc6 on branch FC-6 from xorg-x11-drv-savage-2.1.2-3.fc6.src.rpm

savage-2.1.2-missing-symbol.patch:
 savage_vbe.c |    9 ---------
 1 files changed, 9 deletions(-)

--- NEW FILE savage-2.1.2-missing-symbol.patch ---
--- xf86-video-savage-2.1.2/src/savage_vbe.c.jx	2006-09-02 13:32:45.000000000 -0400
+++ xf86-video-savage-2.1.2/src/savage_vbe.c	2007-02-26 17:59:52.000000000 -0500
@@ -187,15 +187,6 @@
 	    ErrorF("Set video mode failed\n");
 	}
     }
-#ifdef XFree86LOADER
-    else
-    {
-	if( !vbeModeInit( psav->pVbe, n ) )
-	{
-	    ErrorF("Set video mode failed\n");
-	}
-    }
-#endif
 }
 
 void


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-savage/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Apr 2006 03:24:45 -0000	1.7
+++ .cvsignore	10 Apr 2007 22:48:55 -0000	1.8
@@ -1 +1 @@
-xf86-video-savage-2.1.1.tar.bz2
+xf86-video-savage-2.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-savage/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Apr 2006 03:24:45 -0000	1.7
+++ sources	10 Apr 2007 22:48:55 -0000	1.8
@@ -1 +1 @@
-6e2c7da49d311f3e9fbf12e5ba527222  xf86-video-savage-2.1.1.tar.bz2
+6367e921a98f6a7fec9d0a9bc5ff0a47  xf86-video-savage-2.1.2.tar.bz2


Index: xorg-x11-drv-savage.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-savage/FC-6/xorg-x11-drv-savage.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-savage.spec	25 Jul 2006 03:21:22 -0000	1.16
+++ xorg-x11-drv-savage.spec	10 Apr 2007 22:48:55 -0000	1.17
@@ -4,34 +4,26 @@
 
 %define cvsdate xxxxxxx
 
-%ifarch %{ix86} x86_64 ia64 ppc
-%define with_dri        1
-%else
-%define with_dri        0
-%endif
-
 Summary:   Xorg X11 savage video driver
 Name:      xorg-x11-drv-savage
-Version:   2.1.1
-Release:   5%{?dist}
+Version:   2.1.2
+Release:   3%{?dist}
 URL:       http://www.x.org
-License:   MIT/X11
+License: MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   savage.xinf
 
-Patch0:    savage-disable-dri-bug196011.patch
+Patch1:    savage-2.1.2-missing-symbol.patch
 
-ExclusiveArch: %{ix86} x86_64 ppc
+ExcludeArch: s390 s390x
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk >= 1.1.0-2
-%if %{with_dri}
 BuildRequires: mesa-libGL-devel >= 6.4-4
 BuildRequires: libdrm-devel >= 2.0-1
-%endif
 
 Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
@@ -40,16 +32,10 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p0 -b .savage-disable-dri-bug196011
+%patch1 -p1 -b .missing-symbol
 
 %build
-%configure --disable-static \
-%if %{with_dri}
-           --enable-dri
-%else
-           --disable-dri
-%endif
-
+%configure --disable-static --enable-dri
 make
 
 %install
@@ -69,13 +55,22 @@
 
 %files
 %defattr(-,root,root,-)
-%dir %{moduledir}
-%dir %{driverdir}
 %{driverdir}/savage_drv.so
 %{_datadir}/hwdata/videoaliases/savage.xinf
 %{_mandir}/man4/savage.4*
 
 %changelog
+* Mon Feb 26 2007 Adam Jackson <ajax at redhat.com> 2.1.2-3
+- Delete a call to a symbol that's never existed.  Wacky.
+- Disown the module directory
+
+* Fri Feb 16 2007 Adam Jackson <ajax at redhat.com> 2.1.2-2
+- ExclusiveArch -> ExcludeArch
+- Enable DRI on all arches
+
+* Mon Jan 29 2007 Adam Jackson <ajax at redhat.com> 2.1.2-1
+- Update to 2.1.2
+
 * Mon Jul 24 2006 Mike A. Harris <mharris at redhat.com> 2.1.1-5.fc6
 - Added savage-disable-dri-bug196011.patch to disable DRI by default on various
   Savage chipsets reported in bug (#196011) and (fdo#6357)


--- savage-disable-dri-bug196011.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 10 22:54:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 18:54:36 -0400
Subject: rpms/xorg-x11-drv-savage/FC-6 xorg-x11-drv-savage.spec,1.17,1.18
Message-ID: <200704102254.l3AMsaeW023854@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-savage/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv23809

Modified Files:
	xorg-x11-drv-savage.spec 
Log Message:
ExclusiveArch for fc6 compatibility


Index: xorg-x11-drv-savage.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-savage/FC-6/xorg-x11-drv-savage.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-x11-drv-savage.spec	10 Apr 2007 22:48:55 -0000	1.17
+++ xorg-x11-drv-savage.spec	10 Apr 2007 22:54:34 -0000	1.18
@@ -18,7 +18,7 @@
 
 Patch1:    savage-2.1.2-missing-symbol.patch
 
-ExcludeArch: s390 s390x
+ExclusiveArch: %{ix86} x86_64 ppc
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk >= 1.1.0-2



From fedora-cvs-commits at redhat.com  Wed Apr 11 03:11:37 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 10 Apr 2007 23:11:37 -0400
Subject: rpms/evolution/devel evolution-2.8.1-kill-ethread.patch, 1.3,
	1.4 evolution.spec, 1.243, 1.244
Message-ID: <200704110311.l3B3BbNJ020192@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-2.8.1-kill-ethread.patch evolution.spec 
Log Message:

* Tue Apr 10 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-2.fc7
- Revise patch for GNOME bug #362638 to fix RH bug #235096
  (crash when displaying a mail server message to user).


evolution-2.8.1-kill-ethread.patch:
 calendar/gui/alarm-notify/alarm-notify.c            |   85 ----
 calendar/gui/alarm-notify/alarm-notify.h            |   13 
 calendar/gui/alarm-notify/alarm-queue.c             |  320 ++++++++---------
 mail/em-composer-utils.c                            |   10 
 mail/em-folder-browser.c                            |    2 
 mail/em-folder-properties.c                         |    2 
 mail/em-folder-tree.c                               |    4 
 mail/em-folder-utils.c                              |    4 
 mail/em-folder-view.c                               |    9 
 mail/em-format-html-print.c                         |    2 
 mail/em-format-html.c                               |    2 
 mail/em-subscribe-editor.c                          |    6 
 mail/em-sync-stream.c                               |  344 +++++-------------
 mail/em-sync-stream.h                               |   64 +--
 mail/importers/elm-importer.c                       |    2 
 mail/importers/mail-importer.c                      |    2 
 mail/importers/pine-importer.c                      |    2 
 mail/mail-component.c                               |    2 
 mail/mail-folder-cache.c                            |    4 
 mail/mail-mt.c                                      |  372 ++++++++------------
 mail/mail-mt.h                                      |   35 -
 mail/mail-ops.c                                     |   50 +-
 mail/mail-ops.h                                     |    9 
 mail/mail-send-recv.c                               |    2 
 mail/mail-session.c                                 |   86 +---
 mail/mail-vfolder.c                                 |   10 
 mail/message-list.c                                 |    4 
 plugins/exchange-operations/exchange-folder.c       |    2 
 plugins/folder-unsubscribe/folder-unsubscribe.c     |    2 
 plugins/groupwise-features/share-folder-common.c    |    2 
 plugins/mailing-list-actions/mailing-list-actions.c |    2 
 plugins/mark-all-read/mark-all-read.c               |    2 
 plugins/save-attachments/save-attachments.c         |    2 
 33 files changed, 574 insertions(+), 885 deletions(-)

Index: evolution-2.8.1-kill-ethread.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.8.1-kill-ethread.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- evolution-2.8.1-kill-ethread.patch	31 Mar 2007 00:50:38 -0000	1.3
+++ evolution-2.8.1-kill-ethread.patch	11 Apr 2007 03:11:35 -0000	1.4
@@ -1,5 +1,5 @@
---- evolution-2.10.0/mail/mail-send-recv.c.kill-ethread	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/mail-send-recv.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/mail/mail-send-recv.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/mail-send-recv.c	2007-04-10 22:37:49.000000000 -0400
 @@ -819,7 +819,7 @@
  		m->folders = folders;
  		m->info = sinfo;
@@ -9,8 +9,8 @@
  	} else {
  		receive_done ("", data);
  	}
---- evolution-2.10.0/mail/mail-component.c.kill-ethread	2007-03-12 16:13:58.000000000 -0400
-+++ evolution-2.10.0/mail/mail-component.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/mail/mail-component.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/mail-component.c	2007-04-10 22:37:49.000000000 -0400
 @@ -965,7 +965,7 @@
  		if (camel_url_get_param(url, "uid") != NULL) {
  			char *curi = em_uri_to_camel(uri);
@@ -20,8 +20,8 @@
  			g_free(curi);
  		} else {
  			g_warning("email uri's must include a uid parameter");
---- evolution-2.10.0/mail/mail-ops.c.kill-ethread	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/mail-ops.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/mail/mail-ops.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/mail-ops.c	2007-04-10 22:37:49.000000000 -0400
 @@ -221,7 +221,7 @@
  		camel_filter_driver_remove_rule_by_name (m->driver, "new-mail-notification");
  	}
@@ -247,8 +247,8 @@
  
  	return id;
  }
---- evolution-2.10.0/mail/em-folder-utils.c.kill-ethread	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-folder-utils.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/mail/em-folder-utils.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-folder-utils.c	2007-04-10 22:37:49.000000000 -0400
 @@ -260,7 +260,7 @@
  	m->delete = delete;
  	seq = m->msg.seq;
@@ -267,8 +267,8 @@
  	
  	return id;
  }
---- evolution-2.10.0/mail/importers/elm-importer.c.kill-ethread	2007-01-03 10:34:11.000000000 -0500
-+++ evolution-2.10.0/mail/importers/elm-importer.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/mail/importers/elm-importer.c.kill-ethread	2007-04-09 09:09:26.000000000 -0400
++++ evolution-2.10.1/mail/importers/elm-importer.c	2007-04-10 22:37:49.000000000 -0400
 @@ -312,7 +312,7 @@
  
  	id = m->msg.seq;
@@ -278,8 +278,8 @@
  
  	return id;
  }
---- evolution-2.10.0/mail/importers/mail-importer.c.kill-ethread	2007-01-03 10:34:11.000000000 -0500
-+++ evolution-2.10.0/mail/importers/mail-importer.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/mail/importers/mail-importer.c.kill-ethread	2007-04-09 09:09:26.000000000 -0400
++++ evolution-2.10.1/mail/importers/mail-importer.c	2007-04-10 22:37:49.000000000 -0400
 @@ -329,7 +329,7 @@
  	}
  
@@ -289,8 +289,8 @@
  
  	return id;
  }
---- evolution-2.10.0/mail/importers/pine-importer.c.kill-ethread	2007-01-03 10:34:11.000000000 -0500
-+++ evolution-2.10.0/mail/importers/pine-importer.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/mail/importers/pine-importer.c.kill-ethread	2007-04-09 09:09:26.000000000 -0400
++++ evolution-2.10.1/mail/importers/pine-importer.c	2007-04-10 22:37:49.000000000 -0400
 @@ -350,7 +350,7 @@
  
  	id = m->msg.seq;
@@ -300,8 +300,8 @@
  
  	return id;
  }
---- evolution-2.10.0/mail/mail-vfolder.c.kill-ethread	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/mail-vfolder.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/mail/mail-vfolder.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/mail-vfolder.c	2007-04-10 22:37:49.000000000 -0400
 @@ -188,7 +188,7 @@
  	m->sources_folder = sources_folder;
  	
@@ -347,8 +347,8 @@
  
  	from = em_uri_from_camel(cfrom);
  	to = em_uri_from_camel(cto);
---- evolution-2.10.0/mail/em-format-html.c.kill-ethread	2007-02-26 04:59:59.000000000 -0500
-+++ evolution-2.10.0/mail/em-format-html.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/mail/em-format-html.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-format-html.c	2007-04-10 22:37:49.000000000 -0400
 @@ -1375,7 +1375,7 @@
  		}
  		
@@ -358,9 +358,9 @@
  	}
  
  	efh->priv->format_timeout_id = 0;
---- evolution-2.10.0/mail/em-folder-properties.c.kill-ethread	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-folder-properties.c	2007-03-30 15:47:31.000000000 -0400
-@@ -379,7 +379,7 @@
+--- evolution-2.10.1/mail/em-folder-properties.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-folder-properties.c	2007-04-10 22:37:49.000000000 -0400
+@@ -386,7 +386,7 @@
  	}
  
  	if (folder == NULL)
@@ -369,9 +369,9 @@
  	else
  		emfp_dialog_got_folder((char *)uri, folder, NULL);
  }
---- evolution-2.10.0/mail/em-folder-tree.c.kill-ethread	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-folder-tree.c	2007-03-30 15:47:31.000000000 -0400
-@@ -966,7 +966,7 @@
+--- evolution-2.10.1/mail/em-folder-tree.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-folder-tree.c	2007-04-10 22:37:49.000000000 -0400
+@@ -969,7 +969,7 @@
  tree_drag_data_action(struct _DragDataReceivedAsync *m)
  {
  	m->move = m->action == GDK_ACTION_MOVE;
@@ -380,7 +380,7 @@
  }
  
  static void
-@@ -1891,7 +1891,7 @@
+@@ -1915,7 +1915,7 @@
  	m->top = full_name;
  	m->flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST;
  	
@@ -389,8 +389,8 @@
  }
  
  static gboolean
---- evolution-2.10.0/mail/em-folder-browser.c.kill-ethread	2007-02-26 04:59:59.000000000 -0500
-+++ evolution-2.10.0/mail/em-folder-browser.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/mail/em-folder-browser.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-folder-browser.c	2007-04-10 22:37:49.000000000 -0400
 @@ -948,7 +948,7 @@
  	m->sources_folder = sources_folder;
  	
@@ -400,9 +400,9 @@
  
  	return id;
  }
---- evolution-2.10.0/mail/message-list.c.kill-ethread	2007-01-23 03:23:43.000000000 -0500
-+++ evolution-2.10.0/mail/message-list.c	2007-03-30 15:47:31.000000000 -0400
-@@ -1888,7 +1888,7 @@
+--- evolution-2.10.1/mail/message-list.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/message-list.c	2007-04-10 22:37:49.000000000 -0400
+@@ -1889,7 +1889,7 @@
  ml_drop_action(struct _drop_msg *m)
  {
  	m->move = m->action == GDK_ACTION_MOVE;
@@ -411,7 +411,7 @@
  }
  
  static void
-@@ -3922,7 +3922,7 @@
+@@ -3978,7 +3978,7 @@
  
  	m->ml->regen = g_list_prepend(m->ml->regen, m);
  	/* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */
@@ -420,8 +420,8 @@
  
  	m->ml->regen_timeout_msg = NULL;
  	m->ml->regen_timeout_id = 0;
---- evolution-2.10.0/mail/em-sync-stream.h.kill-ethread	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-sync-stream.h	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/mail/em-sync-stream.h.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-sync-stream.h	2007-04-10 22:37:49.000000000 -0400
 @@ -29,41 +29,45 @@
  #ifndef EM_SYNC_STREAM_H
  #define EM_SYNC_STREAM_H
@@ -498,8 +498,8 @@
 +G_END_DECLS
  
  #endif /* EM_SYNC_STREAM_H */
---- evolution-2.10.0/mail/em-format-html-print.c.kill-ethread	2007-02-26 04:59:59.000000000 -0500
-+++ evolution-2.10.0/mail/em-format-html-print.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/mail/em-format-html-print.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-format-html-print.c	2007-04-10 22:37:49.000000000 -0400
 @@ -262,7 +262,7 @@
  		g_object_ref(source);
  	g_object_ref(efhp);
@@ -509,8 +509,8 @@
  
  	return 0;		/* damn async ... */
  }
---- evolution-2.10.0/mail/em-sync-stream.c.kill-ethread	2007-02-26 04:59:59.000000000 -0500
-+++ evolution-2.10.0/mail/em-sync-stream.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/mail/em-sync-stream.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-sync-stream.c	2007-04-10 22:37:49.000000000 -0400
 @@ -25,42 +25,17 @@
  #include <config.h>
  #endif
@@ -936,8 +936,8 @@
 +		g_string_free (emss->buffer, TRUE);
 +	emss->buffer = g_string_sized_new (size);
  }
---- evolution-2.10.0/mail/em-subscribe-editor.c.kill-ethread	2007-01-08 11:54:43.000000000 -0500
-+++ evolution-2.10.0/mail/em-subscribe-editor.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/mail/em-subscribe-editor.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-subscribe-editor.c	2007-04-10 22:37:49.000000000 -0400
 @@ -229,7 +229,7 @@
  	next = (struct _zsubscribe_msg *)e_dlist_remhead(&m->sub->subscribe);
  	if (next) {
@@ -965,8 +965,8 @@
  	return id;
  }
  
---- evolution-2.10.0/mail/mail-mt.h.kill-ethread	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/mail-mt.h	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/mail/mail-mt.h.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/mail-mt.h	2007-04-10 22:37:49.000000000 -0400
 @@ -25,14 +25,15 @@
  
  #include <pthread.h>
@@ -1037,8 +1037,8 @@
  /* A generic proxy event for anything that can be proxied during the life of the mailer (almost nothing) */
  /* Note that almost all objects care about the lifecycle of their events, so this cannot be used */
  extern MailAsyncEvent *mail_async_event;
---- evolution-2.10.0/mail/mail-ops.h.kill-ethread	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/mail-ops.h	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/mail/mail-ops.h.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/mail-ops.h	2007-04-10 22:37:49.000000000 -0400
 @@ -30,13 +30,14 @@
  #pragma }
  #endif /* __cplusplus */
@@ -1079,8 +1079,8 @@
  
  /* and for a store */
  int mail_get_store (const char *uri, CamelOperation *op,
---- evolution-2.10.0/mail/em-composer-utils.c.kill-ethread	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-composer-utils.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/mail/em-composer-utils.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-composer-utils.c	2007-04-10 22:37:49.000000000 -0400
 @@ -534,7 +534,7 @@
  	    strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) {
  		int id;
@@ -1124,8 +1124,8 @@
 -	mail_get_message (folder, uid, post_reply_to_message, NULL, mail_thread_new);
 +	mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push);
  }
---- evolution-2.10.0/mail/mail-folder-cache.c.kill-ethread	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/mail-folder-cache.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/mail/mail-folder-cache.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/mail-folder-cache.c	2007-04-10 22:37:49.000000000 -0400
 @@ -907,7 +907,7 @@
  	m->store = store;
  	camel_object_ref (store);
@@ -1144,8 +1144,8 @@
  
  	LOCK(info_lock);
  
---- evolution-2.10.0/mail/em-folder-view.c.kill-ethread	2007-03-01 01:06:14.000000000 -0500
-+++ evolution-2.10.0/mail/em-folder-view.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/mail/em-folder-view.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-folder-view.c	2007-04-10 22:37:49.000000000 -0400
 @@ -68,6 +68,7 @@
  #include <gtkhtml/gtkhtml-stream.h>
  
@@ -1190,8 +1190,8 @@
  		} else {
  			e_profile_event_emit("goto.empty", "", 0);
  			g_free(emfv->priv->selected_uid);
---- evolution-2.10.0/mail/mail-session.c.kill-ethread	2007-02-26 04:59:59.000000000 -0500
-+++ evolution-2.10.0/mail/mail-session.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/mail/mail-session.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/mail-session.c	2007-04-10 22:37:49.000000000 -0400
 @@ -35,7 +35,7 @@
  #include <libgnome/gnome-sound.h>
  
@@ -1201,6 +1201,15 @@
  
  #include <camel/camel.h>	/* FIXME: this is where camel_init is defined, it shouldn't include everything else */
  #include <camel/camel-filter-driver.h>
+@@ -256,7 +256,7 @@
+ 
+ /* ********************************************************************** */
+ 
+-static GtkDialog *message_dialog;
++static gpointer message_dialog;
+ static EDList message_list = E_DLIST_INITIALISER(message_list);
+ 
+ struct _user_message_msg {
 @@ -283,7 +283,7 @@
  	/* if !allow_cancel, then we've already replied */
  	if (m->allow_cancel) {
@@ -1210,7 +1219,92 @@
  	}
  	
  	/* check for pendings */
-@@ -364,17 +364,18 @@
+@@ -292,22 +292,10 @@
+ }
+ 
+ static void
+-user_message_destroy_notify (struct _user_message_msg *m, GObject *deadbeef)
+-{
+-	message_dialog = NULL;
+-}
+-
+-/* This is kinda ugly/inefficient, but oh well, it works */
+-static const char *error_type[] = {
+-	"mail:session-message-info", "mail:session-message-warning", "mail:session-message-error",
+-	"mail:session-message-info-cancel", "mail:session-message-warning-cancel", "mail:session-message-error-cancel"
+-};
+-
+-static void
+ do_user_message (struct _mail_msg *mm)
+ {
+ 	struct _user_message_msg *m = (struct _user_message_msg *)mm;
+-	int type;
++	const gchar *error_type;
+ 	
+ 	if (!m->ismain && message_dialog != NULL) {
+ 		e_dlist_addtail (&message_list, (EDListNode *)m);
+@@ -315,24 +303,27 @@
+ 	}
+ 	
+ 	switch (m->type) {
+-	case CAMEL_SESSION_ALERT_INFO:
+-		type = 0;
+-		break;
+-	case CAMEL_SESSION_ALERT_WARNING:
+-		type = 1;
+-		break;
+-	case CAMEL_SESSION_ALERT_ERROR:
+-		type = 2;
+-		break;
+-	default:
+-		type = 0;
++		case CAMEL_SESSION_ALERT_INFO:
++			error_type = m->allow_cancel ?
++				"mail:session-message-info-cancel" :
++				"mail:session-message-info";
++			break;
++		case CAMEL_SESSION_ALERT_WARNING:
++			error_type = m->allow_cancel ?
++				"mail:session-message-warning-cancel" :
++				"mail:session-message-warning";
++			break;
++		case CAMEL_SESSION_ALERT_ERROR:
++			error_type = m->allow_cancel ?
++				"mail:session-message-error-cancel" :
++				"mail:session-message-error";
++			break;
++		default:
++			g_assert_not_reached ();
+ 	}
+ 
+-	if (m->allow_cancel)
+-		type += 3;
+-	
+-	message_dialog = (GtkDialog *)e_error_new(NULL, error_type[type], m->prompt, NULL);
+-	g_object_set ((GObject *) message_dialog, "allow_shrink", TRUE, "allow_grow", TRUE, NULL);
++	message_dialog = e_error_new(NULL, error_type, m->prompt, NULL);
++	g_object_set (message_dialog, "allow_shrink", TRUE, "allow_grow", TRUE, NULL);
+ 	
+ 	/* We only need to wait for the result if we allow cancel otherwise show but send result back instantly */
+ 	if (m->allow_cancel) {
+@@ -340,12 +331,13 @@
+ 			user_message_response(message_dialog, gtk_dialog_run (message_dialog), m);
+ 		} else {
+ 			g_signal_connect (message_dialog, "response", G_CALLBACK (user_message_response), m);
+-			gtk_widget_show ((GtkWidget *) message_dialog);
++			gtk_widget_show (message_dialog);
+ 		}
+ 	} else {
+ 		g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_widget_destroy), message_dialog);
+-		g_object_weak_ref ((GObject *) message_dialog, (GWeakNotify) user_message_destroy_notify, m);
+-		gtk_widget_show ((GtkWidget *) message_dialog);
++		g_object_add_weak_pointer (message_dialog, &message_dialog);
++		gtk_widget_show (message_dialog);
++		e_flag_free (mm->processed);
+ 		mail_msg_free(m);
+ 	}
+ }
+@@ -364,17 +356,17 @@
  alert_user(CamelSession *session, CamelSessionAlertType type, const char *prompt, gboolean cancel)
  {
  	MailSession *mail_session = MAIL_SESSION (session);
@@ -1223,18 +1317,18 @@
  	if (!mail_session->interactive)
  		return FALSE;
  
- 	if (cancel)
+-	if (cancel)
 -		user_message_reply = e_msgport_new ();	
 -	m = mail_msg_new (&user_message_op, user_message_reply, sizeof (*m));
 -	m->ismain = pthread_equal(pthread_self(), mail_gui_thread);
-+		processed = e_flag_new ();
++	processed = e_flag_new ();
 +
 +	m = mail_msg_new (&user_message_op, processed, sizeof (*m));
 +	m->ismain = mail_in_main_thread();
  	m->type = type;
  	m->prompt = g_strdup(prompt);
  	m->allow_cancel = cancel;
-@@ -382,18 +383,14 @@
+@@ -382,18 +374,14 @@
  	if (m->ismain)
  		do_user_message((struct _mail_msg *)m);
  	else {
@@ -1249,14 +1343,14 @@
 -		g_assert(m == r);
 -
 +		e_flag_wait (processed);
++		e_flag_free (processed);
  		ret = m->result;
  		mail_msg_free(m);
 -		e_msgport_destroy(user_message_reply);
-+		e_flag_free (processed);
  	} else
  		ret = TRUE;
  
-@@ -686,7 +683,7 @@
+@@ -687,7 +675,7 @@
  		/* flush/cancel pending user messages */
  		while ((um = (struct _user_message_msg *) e_dlist_remhead (&message_list))) {
  			d(printf ("Flusing message request: %s\n", um->prompt));
@@ -1265,8 +1359,8 @@
  		}
  		
  		/* and the current */
---- evolution-2.10.0/mail/mail-mt.c.kill-ethread	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/mail-mt.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/mail/mail-mt.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/mail-mt.c	2007-04-10 22:37:49.000000000 -0400
 @@ -29,7 +29,6 @@
  #include <gtk/gtk.h>
  #include <libgnome/gnome-i18n.h>
@@ -1811,8 +1905,8 @@
  }
  
  /* ******************** */
---- evolution-2.10.0/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread	2007-01-03 10:34:02.000000000 -0500
-+++ evolution-2.10.0/plugins/folder-unsubscribe/folder-unsubscribe.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread	2007-04-09 09:09:11.000000000 -0400
++++ evolution-2.10.1/plugins/folder-unsubscribe/folder-unsubscribe.c	2007-04-10 22:37:49.000000000 -0400
 @@ -108,5 +108,5 @@
  	unsub = mail_msg_new (&unsubscribe_op, NULL, sizeof (struct _folder_unsub_t));
  	unsub->uri = g_strdup (target->uri);
@@ -1820,8 +1914,8 @@
 -	e_thread_put (mail_thread_new, (EMsg *) unsub);
 +	mail_msg_unordered_push ((mail_msg_t *) unsub);
  }
---- evolution-2.10.0/plugins/mark-all-read/mark-all-read.c.kill-ethread	2007-01-03 10:34:03.000000000 -0500
-+++ evolution-2.10.0/plugins/mark-all-read/mark-all-read.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/plugins/mark-all-read/mark-all-read.c.kill-ethread	2007-04-09 09:09:14.000000000 -0400
++++ evolution-2.10.1/plugins/mark-all-read/mark-all-read.c	2007-04-10 22:37:49.000000000 -0400
 @@ -44,7 +44,7 @@
  		return;
  	}
@@ -1831,8 +1925,8 @@
  }
  
  static void
---- evolution-2.10.0/plugins/exchange-operations/exchange-folder.c.kill-ethread	2007-01-03 10:34:03.000000000 -0500
-+++ evolution-2.10.0/plugins/exchange-operations/exchange-folder.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/plugins/exchange-operations/exchange-folder.c.kill-ethread	2007-04-09 09:09:13.000000000 -0400
++++ evolution-2.10.1/plugins/exchange-operations/exchange-folder.c	2007-04-10 22:37:49.000000000 -0400
 @@ -134,7 +134,7 @@
  	inbox_physical_uri = e_folder_get_physical_uri (inbox);
  
@@ -1842,8 +1936,8 @@
  
  
  }
---- evolution-2.10.0/plugins/save-attachments/save-attachments.c.kill-ethread	2007-02-26 04:59:58.000000000 -0500
-+++ evolution-2.10.0/plugins/save-attachments/save-attachments.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/plugins/save-attachments/save-attachments.c.kill-ethread	2007-04-09 09:09:15.000000000 -0400
++++ evolution-2.10.1/plugins/save-attachments/save-attachments.c	2007-04-10 22:37:49.000000000 -0400
 @@ -407,5 +407,5 @@
  	camel_object_ref(data->folder);
  	data->uid = g_strdup(target->uids->pdata[0]);
@@ -1851,8 +1945,8 @@
 -	mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new);
 +	mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push);
  }
---- evolution-2.10.0/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread	2007-01-03 10:34:04.000000000 -0500
-+++ evolution-2.10.0/plugins/mailing-list-actions/mailing-list-actions.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread	2007-04-09 09:09:14.000000000 -0400
++++ evolution-2.10.1/plugins/mailing-list-actions/mailing-list-actions.c	2007-04-10 22:37:49.000000000 -0400
 @@ -89,7 +89,7 @@
  	data->uri = strdup (sel->uri);
  
@@ -1862,8 +1956,8 @@
  }
  	
  void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data)
---- evolution-2.10.0/plugins/groupwise-features/share-folder-common.c.kill-ethread	2007-01-03 10:34:02.000000000 -0500
-+++ evolution-2.10.0/plugins/groupwise-features/share-folder-common.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/plugins/groupwise-features/share-folder-common.c.kill-ethread	2007-04-09 09:09:12.000000000 -0400
++++ evolution-2.10.1/plugins/groupwise-features/share-folder-common.c	2007-04-10 22:37:49.000000000 -0400
 @@ -239,7 +239,7 @@
  	m->done = done;
  	g_free (namebuf);
@@ -1873,8 +1967,8 @@
  		
  	return id;
  }
---- evolution-2.10.0/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread	2007-01-03 10:34:50.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/alarm-notify/alarm-notify.h	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread	2007-04-09 09:10:29.000000000 -0400
++++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.h	2007-04-10 22:37:49.000000000 -0400
 @@ -39,19 +39,6 @@
  
  typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate;
@@ -1895,8 +1989,8 @@
  struct _AlarmNotify {
  	BonoboObject object;
  
---- evolution-2.10.0/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread	2007-01-03 10:34:50.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/alarm-notify/alarm-notify.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread	2007-04-09 09:10:29.000000000 -0400
++++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.c	2007-04-10 22:37:49.000000000 -0400
 @@ -45,10 +45,6 @@
          GMutex *mutex;
  };
@@ -2009,8 +2103,8 @@
  }
  
  static void
---- evolution-2.10.0/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread	2007-01-03 10:34:50.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/alarm-notify/alarm-queue.c	2007-03-30 15:47:31.000000000 -0400
+--- evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread	2007-04-09 09:10:29.000000000 -0400
++++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c	2007-04-10 22:37:49.000000000 -0400
 @@ -115,9 +115,6 @@
  static int tray_blink_state = FALSE;
  static AlarmNotify *an;


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- evolution.spec	10 Apr 2007 03:16:52 -0000	1.243
+++ evolution.spec	11 Apr 2007 03:11:35 -0000	1.244
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -730,6 +730,10 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Tue Apr 10 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-2.fc7
+- Revise patch for GNOME bug #362638 to fix RH bug #235096
+  (crash when displaying a mail server message to user).
+
 * Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-1.fc7
 - Update to 2.10.1
 - Fix buggy gnome-doc-utils.make (GNOME bug #427939).



From fedora-cvs-commits at redhat.com  Wed Apr 11 07:15:08 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 03:15:08 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1161,
	1.1162 openoffice.org-2.2.0.gprof.patch, 1.1, NONE
Message-ID: <200704110715.l3B7F8a6005980@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.2.0.gprof.patch 
Log Message:
Resolves: rhbz#235828 INIFILE optimization breaks addins


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1161
retrieving revision 1.1162
diff -u -r1.1161 -r1.1162
--- openoffice.org.spec	7 Apr 2007 11:30:17 -0000	1.1161
+++ openoffice.org.spec	11 Apr 2007 07:15:05 -0000	1.1162
@@ -1,6 +1,6 @@
 %define oootag OOF680
 %define ooomilestone 14
-%define rh_rpm_release 4
+%define rh_rpm_release 5
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -1359,9 +1359,6 @@
 cp -f %{PATCH0} $RPM_BUILD_ROOT/%{instdir}/program/crash_report
 chmod a+x $RPM_BUILD_ROOT/%{instdir}/program/crash_report
 
-#preset the shared config file
-sed -i -e 's#sd_binary"#sd_binary" -env:INIFILENAME=%{instdir}/program/sofficerc#g' $RPM_BUILD_ROOT/%{instdir}/program/soffice
-
 #make up some /usr/bin scripts
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 
@@ -2630,6 +2627,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Wed Apr 11 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.5
+- Resolves: rhbz#235828 INIFILE optimization breaks addins
+
 * Fri Apr 06 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.4
 - Resolves: rhbz#235341 pdf overlapping characters
 - Resolves: rhbz#223190 make a final fallback to a font with a known


--- openoffice.org-2.2.0.gprof.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 11 08:18:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 04:18:49 -0400
Subject: rpms/scim/devel scim-system-config, NONE,
	1.1 scim-system-default-config.patch, 1.10, 1.11 scim.spec,
	1.81, 1.82
Message-ID: <200704110818.l3B8Insw017831@cvs.devel.redhat.com>

Author: petersen

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

Modified Files:
	scim-system-default-config.patch scim.spec 
Added Files:
	scim-system-config 
Log Message:
- do not set a hotkey by default for non-Asian users (#235435)
- move the scim system config file from scim-system-default-config.patch
  into a source file scim-system-config
Resolves: #235435



--- NEW FILE scim-system-config ---
# This file is encoded in UTF-8 encoding.
/DefaultIMEngineFactory/ta_IN = IMEngine-M17N-ta-tamil99
# pinyin
/DefaultIMEngineFactory/zh_CN = 05235cfc-43ce-490c-b1b1-c5a2185276ae
/DefaultIMEngineFactory/zh_SG = 05235cfc-43ce-490c-b1b1-c5a2185276ae
# CangJie
/DefaultIMEngineFactory/zh_HK = e5e88504-6fae-4c34-8324-49508cfad72a
# chewing
/DefaultIMEngineFactory/zh_TW = fcff66b6-4d3e-4cf2-833c-01ef66ac6025
/FrontEnd/OnTheSpot = true
/FrontEnd/ChangeFactoryGlobally = false
/FrontEnd/Socket/ConfigReadOnly = false
/FrontEnd/Socket/MaxClients = 512
/FrontEnd/X11/BrokenWchar = true
/FrontEnd/X11/Dynamic = false
/FrontEnd/X11/OnTheSpot = true
/FrontEnd/X11/ServerName = SCIM
/Hotkeys/FrontEnd/NextFactory = 
/Hotkeys/FrontEnd/NextFactory/zh_CN = Control+Alt+Down,Shift+Control+KeyRelease+Shift_L,Shift+Control+KeyRelease+Shift_R
/Hotkeys/FrontEnd/NextFactory/zh_HK = Control+Alt+Down,Shift+Control+KeyRelease+Shift_L,Shift+Control+KeyRelease+Shift_R
/Hotkeys/FrontEnd/NextFactory/zh_SG = Control+Alt+Down,Shift+Control+KeyRelease+Shift_L,Shift+Control+KeyRelease+Shift_R
/Hotkeys/FrontEnd/NextFactory/zh_TW = Control+Alt+Down,Shift+Control+KeyRelease+Shift_L,Shift+Control+KeyRelease+Shift_R
/Hotkeys/FrontEnd/PreviousFactory = 
/Hotkeys/FrontEnd/PreviousFactory/zh_CN = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
/Hotkeys/FrontEnd/PreviousFactory/zh_HK = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
/Hotkeys/FrontEnd/PreviousFactory/zh_SG = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
/Hotkeys/FrontEnd/PreviousFactory/zh_TW = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
/Hotkeys/FrontEnd/ShowFactoryMenu = 
/Hotkeys/FrontEnd/Trigger =
/Hotkeys/FrontEnd/Trigger/as_IN = Control+space
/Hotkeys/FrontEnd/Trigger/bn_BD = Control+space
/Hotkeys/FrontEnd/Trigger/bn_IN = Control+space
/Hotkeys/FrontEnd/Trigger/gu_IN = Control+space
/Hotkeys/FrontEnd/Trigger/hi_IN = Control+space
/Hotkeys/FrontEnd/Trigger/ja_JP = Zenkaku_Hankaku,Alt+grave,Control+space
/Hotkeys/FrontEnd/Trigger/kn_IN = Control+space
/Hotkeys/FrontEnd/Trigger/ko_KR = Alt+Alt_L+KeyRelease,Shift+space,Control+space,Hangul
/Hotkeys/FrontEnd/Trigger/ml_IN = Control+space
/Hotkeys/FrontEnd/Trigger/mr_IN = Control+space
/Hotkeys/FrontEnd/Trigger/or_IN = Control+space
/Hotkeys/FrontEnd/Trigger/pa_IN = Control+space
/Hotkeys/FrontEnd/Trigger/si_LK = Control+space
/Hotkeys/FrontEnd/Trigger/ta_IN = Control+space
/Hotkeys/FrontEnd/Trigger/te_IN = Control+space
/Hotkeys/FrontEnd/Trigger/th_TH = Control+space
/Hotkeys/FrontEnd/Trigger/ur_IN = Control+space
/Hotkeys/FrontEnd/Trigger/zh_CN = Control+space
/Hotkeys/FrontEnd/Trigger/zh_HK = Control+space
/Hotkeys/FrontEnd/Trigger/zh_SG = Control+space
/Hotkeys/FrontEnd/Trigger/zh_TW = Control+space
/Hotkeys/FrontEnd/ValidKeyMask = Shift+Control+Alt+CapsLock+Meta+Super+Hyper
/Panel/Gtk/Color/ActiveBackground = light sky blue
/Panel/Gtk/Color/ActiveText = black
/Panel/Gtk/Color/NormalBackground = #F7F3F7
/Panel/Gtk/Color/NormalText = black
/Panel/Gtk/Font = default
/Panel/Gtk/DefaultSticked = false
/Panel/Gtk/LookupTableEmbedded = true
/Panel/Gtk/LookupTableVertical = true
/Panel/Gtk/ShowStatusBox = false
/Panel/Gtk/ShowTrayIcon = true
/Panel/Gtk/ToolBar/AlwaysShow = false
/Panel/Gtk/ToolBar/AutoSnap = true
/Panel/Gtk/ToolBar/HideTimeout = 2
/Panel/Gtk/ToolBar/POS_X = -1 
/Panel/Gtk/ToolBar/POS_Y = -1 
/Panel/Gtk/ToolBar/ShowHelpIcon = true
/Panel/Gtk/ToolBar/ShowFactoryIcon = true
/Panel/Gtk/ToolBar/ShowFactoryName = true
/Panel/Gtk/ToolBar/ShowMenuIcon = true
/Panel/Gtk/ToolBar/ShowSetupIcon = true
/Panel/Gtk/ToolBar/ShowStickIcon = false
/IMEngine/RawCode/Locales = default

scim-system-default-config.patch:
 global |    2 ++
 1 files changed, 2 insertions(+)

Index: scim-system-default-config.patch
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/scim-system-default-config.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- scim-system-default-config.patch	15 Dec 2006 08:36:36 -0000	1.10
+++ scim-system-default-config.patch	11 Apr 2007 08:18:47 -0000	1.11
@@ -6,53 +6,3 @@
  /DefaultSocketTimeout = 5000
 +# disable by default: rawcode, CNS11643, CangJie3, CangJie5, Cantonese, Dayi3, EZ-Big, Erbi-QS, Erbi, Jyutping, Simplex, Stroke5, Wu, ZhuYin-Big, Ziranma
 +/DisabledIMEngineFactories = 6e029d75-ef65-42a8-848e-332e63d70f9c,468effb6-69fa-48b8-9207-dc4f722640a0,5da9d4ff-ccdd-45af-b1a5-7bd4ac0aeb5f,11cb2711-6225-49ca-bde4-472d2ca8aaef,33a8f7ff-b05a-4a54-b617-a73cd53583bd,a9eb5dd7-8e8a-4d1c-b486-2f59bbd12ef0,8bd47de6-4b38-49c0-864b-f6ea43bd2dff,17ebfb4f-2cc5-44da-a440-5c28c68997cf,107dcd74-b06a-4fcd-ac29-4b3136358eb7,a82d50ad-7995-4db7-9b34-3e9e4e31e4d7,2ffa6ab6-8ebc-4e8d-95a2-7ee6b7ffb9bd,bdf5fc1e-63a0-41bd-8e31-3239d67152c0,170d45fe-7fce-4e5b-bd86-f78d2aa8b29e,6137b317-cffc-4e39-80a1-eabb903ed855,8a6975df-6a78-4c7e-91d5-889da6c2fd80
---- scim-1.4.5/configs/config.6-config	2006-09-24 19:52:07.000000000 +1000
-+++ scim-1.4.5/configs/config	2006-12-12 17:13:30.000000000 +1000
-@@ -1,4 +1,12 @@
- # This file is encoded in UTF-8 encoding.
-+/DefaultIMEngineFactory/ta_IN = IMEngine-M17N-ta-tamil99
-+# pinyin
-+/DefaultIMEngineFactory/zh_CN = 05235cfc-43ce-490c-b1b1-c5a2185276ae
-+/DefaultIMEngineFactory/zh_SG = 05235cfc-43ce-490c-b1b1-c5a2185276ae
-+# CangJie
-+/DefaultIMEngineFactory/zh_HK = e5e88504-6fae-4c34-8324-49508cfad72a
-+# chewing
-+/DefaultIMEngineFactory/zh_TW = fcff66b6-4d3e-4cf2-833c-01ef66ac6025
- /FrontEnd/OnTheSpot = true
- /FrontEnd/ChangeFactoryGlobally = false
- /FrontEnd/Socket/ConfigReadOnly = false
-@@ -7,11 +15,21 @@
- /FrontEnd/X11/Dynamic = false
- /FrontEnd/X11/OnTheSpot = true
- /FrontEnd/X11/ServerName = SCIM
--/Hotkeys/FrontEnd/NextFactory = Control+Alt+Down,Shift+Control+KeyRelease+Shift_L,Shift+Control+KeyRelease+Shift_R
--/Hotkeys/FrontEnd/PreviousFactory = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
--/Hotkeys/FrontEnd/ShowFactoryMenu = Control+Alt+Right
-+/Hotkeys/FrontEnd/NextFactory = 
-+/Hotkeys/FrontEnd/NextFactory/zh_CN = Control+Alt+Down,Shift+Control+KeyRelease+Shift_L,Shift+Control+KeyRelease+Shift_R
-+/Hotkeys/FrontEnd/NextFactory/zh_HK = Control+Alt+Down,Shift+Control+KeyRelease+Shift_L,Shift+Control+KeyRelease+Shift_R
-+/Hotkeys/FrontEnd/NextFactory/zh_SG = Control+Alt+Down,Shift+Control+KeyRelease+Shift_L,Shift+Control+KeyRelease+Shift_R
-+/Hotkeys/FrontEnd/NextFactory/zh_TW = Control+Alt+Down,Shift+Control+KeyRelease+Shift_L,Shift+Control+KeyRelease+Shift_R
-+/Hotkeys/FrontEnd/PreviousFactory = 
-+/Hotkeys/FrontEnd/PreviousFactory/zh_CN = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
-+/Hotkeys/FrontEnd/PreviousFactory/zh_HK = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
-+/Hotkeys/FrontEnd/PreviousFactory/zh_SG = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
-+/Hotkeys/FrontEnd/PreviousFactory/zh_TW = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
-+/Hotkeys/FrontEnd/ShowFactoryMenu = 
- /Hotkeys/FrontEnd/Trigger = Control+space
--/Hotkeys/FrontEnd/ValidKeyMask = Shift+Control+Alt+CapsLock+Meta
-+/Hotkeys/FrontEnd/Trigger/ja_JP = Zenkaku_Hankaku,Alt+grave,Control+space
-+/Hotkeys/FrontEnd/Trigger/ko_KR = Alt+Alt_L+KeyRelease,Shift+space,Control+space,Hangul
-+/Hotkeys/FrontEnd/ValidKeyMask = Shift+Control+Alt+CapsLock+Meta+Super+Hyper
- /Panel/Gtk/Color/ActiveBackground = light sky blue
- /Panel/Gtk/Color/ActiveText = black
- /Panel/Gtk/Color/NormalBackground = #F7F3F7
-@@ -19,7 +37,7 @@
- /Panel/Gtk/Font = default
- /Panel/Gtk/DefaultSticked = false
- /Panel/Gtk/LookupTableEmbedded = true
--/Panel/Gtk/LookupTableVertical = false
-+/Panel/Gtk/LookupTableVertical = true
- /Panel/Gtk/ShowStatusBox = false
- /Panel/Gtk/ShowTrayIcon = true
- /Panel/Gtk/ToolBar/AlwaysShow = false


Index: scim.spec
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/scim.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- scim.spec	4 Apr 2007 08:34:36 -0000	1.81
+++ scim.spec	11 Apr 2007 08:18:47 -0000	1.82
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.5
-Release:   12%{?dist}
+Release:   13%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -12,6 +12,7 @@
 Source0:   http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?snapdate:-%{snapdate}}.tar.gz
 Source1:   xinput-scim
 Source2:   scim-icons-0.7.tar.gz
+Source3:   scim-system-config
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel, libXt-devel, desktop-file-utils
@@ -122,6 +123,9 @@
 cp -p scim-icons/icons/*.png data/icons
 cp -p scim-icons/pixmaps/*.png data/pixmaps
 
+# use our system config file
+mv configs/config{,.orig} 
+cp -p %{SOURCE3} configs/config
 
 %build
 %configure --disable-static --enable-ld-version-script
@@ -250,6 +254,11 @@
 
 
 %changelog
+* Wed Apr 11 2007 Jens Petersen <petersen at redhat.com> - 1.4.5-13
+- do not set a hotkey by default for non-Asian users (#235435)
+- move the scim system config file from scim-system-default-config.patch
+  into a source file scim-system-config
+
 * Wed Apr  4 2007 Jens Petersen <petersen at redhat.com> - 1.4.5-12
 - add X-GNOME-PersonalSettings category to scim-setup.desktop (#234167)
 - also use desktop-file-install instead of scim-setup-desktop-file.patch to



From fedora-cvs-commits at redhat.com  Wed Apr 11 09:03:46 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 05:03:46 -0400
Subject: rpms/system-config-soundcard/devel
	system-config-soundcard-2.0.6-update.patch, NONE,
	1.1 system-config-soundcard.spec, 1.55, 1.56
Message-ID: <200704110903.l3B93kcK022236@cvs.devel.redhat.com>

Author: stransky

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

Modified Files:
	system-config-soundcard.spec 
Added Files:
	system-config-soundcard-2.0.6-update.patch 
Log Message:
fixed #227778, fixed device and initial soundcard configuration, fixed modprobe.conf parser

system-config-soundcard-2.0.6-update.patch:
 soundcard.py        |   81 ++++++++++++++++++++++++++++++++++++++++++++--------
 soundcardBackend.py |   36 ++++++++++++++---------
 2 files changed, 92 insertions(+), 25 deletions(-)

--- NEW FILE system-config-soundcard-2.0.6-update.patch ---
--- system-config-soundcard-2.0.6/src/soundcard.py.old	2006-12-21 14:17:00.000000000 +0100
+++ system-config-soundcard-2.0.6/src/soundcard.py	2007-04-11 10:51:00.000000000 +0200
@@ -81,10 +81,14 @@
         if self.play_sound_card_index != None :
             self.soundcardBackend.stopTestSound(self.play_sound_card_index)
             self.play_sound_card_index = None
+        if self.firstBoot :
+            self.soundcardBackend.rewriteConfigFiles()
         gtk.main_quit()
     
     def __init__(self, doDebug=None, backend=None):
     
+        self.firstBoot = True
+    
         self.mainWindow = None
 
         self.card_list = None
@@ -246,6 +250,25 @@
         else:
             self.soundcardBackend.setVolume()
 
+    # we need to shrink/cut every too long line
+    def wrapLine(self, line, max_len = 30, cut = False):
+        lines = string.split(line)
+        
+        lines_new = []
+        ln = 0        
+        
+        for l in lines:
+          ln = ln + len(l)
+          if ln > max_len:
+            if not cut:
+              l = '\n' + l[0:]
+              ln = len(l)
+            else:
+              break              
+          lines_new.append(l)
+          
+        return string.join(lines_new)
+
     def create_frame(self, widget, border = 5, label = None, shadow = gtk.SHADOW_NONE):
         frame = gtk.Frame(label)
         frame.set_border_width(border)
@@ -272,26 +295,43 @@
         maker_label2 = gtk.Label("")
 
         if card.maker != None:
+            maker_string = []
+            if self.firstBoot:
+              maker_string = self.wrapLine(card.maker)
+            else:
+              maker_string = card.maker
+        
             maker_label.set_markup("<span><b>"
                        "%s</b></span>" % _("Vendor:"))
-            maker_label.set_alignment(0.0, 0.5)
-            maker_label2 = gtk.Label(card.maker)
+            maker_label.set_alignment(0.0, 0.5)                       
+            maker_label2 = gtk.Label(maker_string)
             maker_label2.set_alignment(0.0, 0.5)
             
         elif card.type != None:
+            type_string = []
+            if self.firstBoot:
+              type_string = self.wrapLine(card.type)
+            else:
+              type_string = card.type
+              
             maker_label.set_markup("<span><b>"
                        "%s</b></span>" % _("Card:"))
             maker_label.set_alignment(0.0, 0.5)
-            maker_label2 = gtk.Label(card.type)
+            maker_label2 = gtk.Label(type_string)
             maker_label2.set_alignment(0.0, 0.5)
 
 
+        model_string = []
+        if self.firstBoot:
+          model_string = self.wrapLine(card.model)
+        else:
+          model_string = card.model          
+
         model_label = gtk.Label("")
         model_label.set_markup("<span><b>"
                    "%s</b></span>" % _("Model:"))
         model_label.set_alignment(0.0, 0.5)
-
-        model_label2 = gtk.Label(card.model)
+        model_label2 = gtk.Label(model_string)
         model_label2.set_alignment(0.0, 0.5)
 
         module_label = gtk.Label("")
@@ -486,8 +526,8 @@
         return tmpBox
 
     def default_device_menu_handler(self, data):
-        #print "Default device %d" % data
         card_index = self.soundcardBackend.getDefaultCard()
+        #print "Default device %d, card %d" % (data, card_index)
         self.soundcardBackend.setCardDefaultDevice(card_index, data)
 
     def test_device_menu_handler(self, data):
@@ -543,7 +583,7 @@
         #print self.soundcardBackend.getCardDefaultDevice(data)
         #print "card %d device %d" % (data, self.soundcardBackend.getDefaultCardDevice(data))
         self.create_sub_device_menu_refresh(self.default_device_menu_handler, data, \
-                            self.soundcardBackend.getCardDefaultDevice(data))
+                                            self.soundcardBackend.getCardDefaultDevice(data))
 
     def create_settings_page_card_list_callback(self, treeview):
         #print "Zmena"
@@ -707,6 +747,9 @@
     def create_system_page_modules_reload(self, widget):
         self.soundcardBackend.reloadModules()
         
+    def create_system_page_rewrite_files(self,  widget):
+        self.soundcardBackend.rewriteConfigFiles()
+
     def create_system_page(self):
     
         table = gtk.Table(2, 3)
@@ -718,8 +761,13 @@
         maker_label.set_markup("<span><b>"
                    "%s</b></span>" % _("ALSA Driver version:"))
         
+        driver_line = self.soundcardBackend.getDriverVersion()
+        pos = string.find(driver_line,"Driver")
+        if pos != -1:
+          driver_line = driver_line[pos:]
+        
         maker_label.set_alignment(0.0, 0.5)
-        maker_label2 = gtk.Label(self.soundcardBackend.getDriverVersion())
+        maker_label2 = gtk.Label(driver_line)
         maker_label2.set_alignment(0.0, 0.5)
 
         model_label = gtk.Label("")
@@ -764,9 +812,18 @@
         detectionBox = gtk.HBox(False, 8)
         detectionBox.pack_start(reload_button, True, True)
         detectionBox = self.create_frame(self.create_frame(detectionBox,8),0,_("Drivers"),gtk.SHADOW_ETCHED_IN)
-        
+
         infoBox.pack_start(detectionBox, False, False)
 
+        rewrite_button = gtk.Button(_("Rewrite configuration files"))
+        rewrite_button.connect("clicked", self.create_system_page_rewrite_files)
+
+        rewriteBox = gtk.HBox(False, 8)
+        rewriteBox.pack_start(rewrite_button, True, True)
+        rewriteBox = self.create_frame(self.create_frame(rewriteBox,8),0,_("Configuration files"),gtk.SHADOW_ETCHED_IN)
+
+        infoBox.pack_start(rewriteBox, False, False)
+
         return infoBox
 
     def refresh_notebook(self):
@@ -778,7 +835,7 @@
 
     def launch(self):
     
-        print "Running from first-boot..."
+        print "Running from first-boot..."           
     
         self.mainVBox = gtk.VBox()
         self.internalVBox = gtk.VBox(False, 10)
@@ -799,7 +856,9 @@
     def stand_alone(self):
 
         print "Running from command-line..."
-            
+        
+        self.firstBoot = False
+        
         self.mainWindow = gtk.Dialog()
         self.mainWindow.vbox.set_spacing(5)
         self.mainWindow.connect("destroy", self.destroy)
--- system-config-soundcard-2.0.6/src/soundcardBackend.py.old	2006-07-21 09:37:22.000000000 +0200
+++ system-config-soundcard-2.0.6/src/soundcardBackend.py	2007-04-11 10:40:58.000000000 +0200
@@ -19,9 +19,6 @@
 
 ## TODO
 ## - surround test (alsa-speaker test)
-## - clean-up objects interfaces
-## - remove all 2.4 stuff
-
 
 
 import string
@@ -193,7 +190,9 @@
         if kernel_type == '2.6':
             lines = []
 
-            lines.append("#Generated by system-config-soundcard, do not edit by hand\n")
+            lines.append("#Generated by system-config-soundcard\n")
+            lines.append("#If you edit this file, don't run system-config-soundcard,\n")
+            lines.append("#all changes could be lost.\n")
             if self.hardware_device:            
                 lines.append("#HWCONF\n")
                 lines.append("#DEV %d\n" % device)
@@ -254,23 +253,27 @@
                 
             tmp = line.split()
                         
-            if tmp == [] or tmp[0] == [] or tmp[1] == [] or\
-               tmp[2] == [] or tmp[0][0] == '#':
-                modprobe.append(whole_line)
+            if tmp == [] or tmp[0] == [] or tmp[0][0] == '#'\
+               or tmp[1] == [] or tmp[2] == [] :
+                modprobe.append(whole_line)                
+                continue
+                
+            if tmp[0] == "install" or tmp[0] == "remove":
+                modprobe.append(whole_line)                
                 continue
     
             if tmp[0] != "alias" and tmp[1][:3] != "snd" and\
                tmp[2][:9] != "snd-card-":
-                modprobe.append(whole_line)
-                continue            
+                modprobe.append(whole_line)                
+                continue                
             
             if tmp[0] != "options" and tmp[1][:3] != "snd" and\
                tmp[2][:5] != "index" and tmp[2][:11] != "cards_limit":
-                modprobe.append(whole_line)
+                modprobe.append(whole_line)                
                 continue
-                
-            sound_lines.append([position] + tmp)
 
+            sound_lines.append([position] + tmp)
+        
         modprobe.append("options snd cards_limit=" + `len(cardArray)` + "\n")
         
         for card in cardArray:
@@ -283,7 +286,7 @@
             fd = open('/etc/modprobe.conf', 'w')
             fd.writelines(modprobe)
             fd.close()
-        except:            
+        except:
             return False
 
         return True
@@ -545,6 +548,7 @@
 
     def setCardDefaultDevice(self, card_index, device_index):
         self.cardArray[card_index].default_device = device_index
+        self.soundConfig.cardDefaultChanged()
     
     def getCardDefaultDevice(self, card_index):
         return self.cardArray[card_index].default_device
@@ -587,7 +591,11 @@
     
     def reloadModules(self, *args):
         self.soundConfig.reloadModules(self.cardArray)
-    
+
+    def rewriteConfigFiles(self):
+        self.soundConfig.rewriteModprobe(self.cardArray)
+        self.soundConfig.writeAlsaConfig(self.cardArray)
+
     # ------------------------------------------------------------------------
     # Info routines
     # ------------------------------------------------------------------------


Index: system-config-soundcard.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- system-config-soundcard.spec	28 Mar 2007 15:40:26 -0000	1.55
+++ system-config-soundcard.spec	11 Apr 2007 09:03:44 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: A graphical interface for detecting and configuring soundcards
 Name: system-config-soundcard
 Version: 2.0.6
-Release: 3%{dist}
+Release: 4%{dist}
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html
 License: GPL
 ExclusiveOS: Linux
@@ -10,6 +10,7 @@
 BuildArch: noarch
 Source0: %{name}-%{version}.tar.bz2
 Patch: system-config-soundcard-2.0.6-dbus.patch
+Patch1: system-config-soundcard-2.0.6-update.patch
 BuildRequires: desktop-file-utils
 BuildRequires: gettext, intltool
 ExcludeArch: s390 s390x
@@ -33,6 +34,7 @@
 %prep
 %setup -q
 %patch -p1
+%patch1 -p1 -b .old
 
 %build
 make
@@ -82,6 +84,12 @@
 %ghost /root/scsound.log
 
 %changelog
+* Wed Apr 11 2007 Martin Stransky <stransky at redhat.com> 2.0.6-4
+- fixed #227778 - Firstboot soundcard screen 'too wide' 
+  with long name
+- fixed device and initial soundcard configuration
+- fixed modprobe.conf parser
+
 * Wed Mar 28 2007 Jeremy Katz <katzj at redhat.com> - 2.0.6-3
 - sox doesn't get used anymore; don't require it
 



From fedora-cvs-commits at redhat.com  Wed Apr 11 09:28:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 05:28:30 -0400
Subject: rpms/fonts-japanese/devel fonts-japanese.spec,1.22,1.23
Message-ID: <200704110928.l3B9SUaV007936@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/fonts-japanese/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7869

Modified Files:
	fonts-japanese.spec 
Log Message:
* Tue Apr 10 2007 Akira TAGOH <tagoh at redhat.com> - 0.20061016-5
- Move the configuration files for ghostscript under /usr/share/ghostscript/conf.d


Index: fonts-japanese.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-japanese/devel/fonts-japanese.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- fonts-japanese.spec	15 Mar 2007 10:52:30 -0000	1.22
+++ fonts-japanese.spec	11 Apr 2007 09:28:28 -0000	1.23
@@ -2,7 +2,7 @@
 %define basefontdir     %{_datadir}/fonts/%{language}
 %define ttfontdir       %{basefontdir}/TrueType
 %define bmpfontdir      %{basefontdir}/misc
-%define cidmapdir       %{_sysconfdir}/ghostscript
+%define cidmapdir       %{_datadir}/ghostscript/conf.d
 %define chxlfd          /usr/bin/perl $RPM_BUILD_DIR/%{name}-%{version}/%{vft}/chbdfxlfd.pl
 %define mkalias         /usr/bin/perl $RPM_BUILD_DIR/%{name}-%{version}/%{vft}/mkalias.pl
 %define mkbold          $RPM_BUILD_DIR/%{name}-%{version}/%{shinonome}-src/tools/mkbold
@@ -23,7 +23,7 @@
 
 Name:           fonts-japanese
 Version:        0.20061016
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        Distributable
 Group:          User Interface/X
 BuildArch:      noarch
@@ -397,6 +397,9 @@
 %config %{cidmapdir}/CIDFnmap.ja
 
 %changelog
+* Tue Apr 10 2007 Akira TAGOH <tagoh at redhat.com> - 0.20061016-5
+- Move the configuration files for ghostscript under /usr/share/ghostscript/conf.d
+
 * Fri Mar 15 2007 Akira TAGOH <tagoh at redhat.com> - 0.20061016-4
 - more cleanups. (#225765)
 



From fedora-cvs-commits at redhat.com  Wed Apr 11 09:53:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 05:53:32 -0400
Subject: rpms/udev/devel udev-106-selinuxmedia.patch, NONE, 1.1 udev.spec,
	1.199, 1.200
Message-ID: <200704110953.l3B9rWLc008722@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8702

Modified Files:
	udev.spec 
Added Files:
	udev-106-selinuxmedia.patch 
Log Message:
- create floppy device nodes with the correct selinux context (bug #235953)
- Resolves: rhbz#235953


udev-106-selinuxmedia.patch:
 extras/floppy/create_floppy_devices.c |    1 +
 udev_selinux.c                        |   12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

--- NEW FILE udev-106-selinuxmedia.patch ---
--- udev-106/udev_selinux.c.selinuxmedia	2007-03-03 18:42:09.000000000 +0100
+++ udev-106/udev_selinux.c	2007-04-11 11:49:14.000000000 +0200
@@ -118,10 +118,12 @@
 		char *media;
 		int ret = -1;
 
-		media = get_media(devname, mode);
-		if (media) {
-			ret = matchmediacon(media, &scontext);
-			free(media);
+		if (devname) {
+			media = get_media(devname, mode);
+			if (media) {
+				ret = matchmediacon(media, &scontext);
+				free(media);
+			}
 		}
 
 		if (ret < 0)
@@ -152,6 +154,8 @@
 	 * restoration creation purposes.
 	 */
 	if (is_selinux_running()) {
+		if (!udev_root[0])
+			err("selinux_init: udev_root not set\n");
 		matchpathcon_init_prefix(NULL, udev_root);
 		if (getfscreatecon(&prev_scontext) < 0) {
 			err("getfscreatecon failed\n");
--- udev-106/extras/floppy/create_floppy_devices.c.selinuxmedia	2007-03-03 18:42:09.000000000 +0100
+++ udev-106/extras/floppy/create_floppy_devices.c	2007-04-11 11:45:59.000000000 +0200
@@ -155,6 +155,7 @@
 	if (type == 0)
 		return 0;
 
+	udev_config_init();
 	selinux_init();
 
 	i = 0;


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- udev.spec	7 Mar 2007 18:01:25 -0000	1.199
+++ udev.spec	11 Apr 2007 09:53:30 -0000	1.200
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 106
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -24,6 +24,7 @@
 Patch5: udev-extras.patch
 Patch7: udev-089-nopie.patch
 Patch9: udev-091-lib64.patch
+Patch10: udev-106-selinuxmedia.patch
 Patch14: udev-095-dbgwait.patch
 
 ExclusiveOS: Linux
@@ -77,6 +78,7 @@
 %patch5 -p1 -b .rhextras
 %patch7 -p1 -b .nopie
 %patch9 -p1 -b .lib64
+%patch10 -p1 -b .selinuxmedia
 %patch14 -p1 -b .dbgwait
 
 rm -f etc/udev/redhat/51-hotplug.rules
@@ -348,7 +350,11 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
-* Wed Mar  7 2007 Harald Hoyer <harald at redhat.com> - 106-1%{?dist}
+* Wed Apr 11 2007 Harald Hoyer <harald at redhat.com> - 106-2
+- create floppy device nodes with the correct selinux context (bug #235953)
+- Resolves: rhbz#235953
+
+* Wed Mar  7 2007 Harald Hoyer <harald at redhat.com> - 106-1
 - version 106
 - specfile cleanup
 - removed pilot rule



From fedora-cvs-commits at redhat.com  Wed Apr 11 10:21:13 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 06:21:13 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.419,1.420
Message-ID: <200704111021.l3BALDK5009145@cvs.devel.redhat.com>

Author: bkonrath

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

Modified Files:
	eclipse.spec 
Log Message:
- Fix links to system-installed javadocs.


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -r1.419 -r1.420
--- eclipse.spec	3 Apr 2007 08:30:50 -0000	1.419
+++ eclipse.spec	11 Apr 2007 10:21:11 -0000	1.420
@@ -59,9 +59,6 @@
 #    (which contains the JNI .sos) is in %{_libdir}
 # We should investigate whether or not this can go upstream
 Patch12:        %{name}-launcher-set-install-dir-and-shared-config.patch
-# Don't attempt to link to Sun's javadocs
-# FIXME:  could use sed instead
-Patch13:        %{name}-javadoclinks.patch
 # Always generate debug info when building RPMs (Andrew Haley)
 # This needs to be investigated for getEnv changes
 Patch14:        %{name}-ecj-rpmdebuginfo.patch
@@ -431,13 +428,15 @@
 sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" library/eclipse.c
 popd
 
-# Link against our system-installed javadocs
-%patch13 -p0
-sed --in-place "s:/usr/share/:%{_datadir}/:g"           \
-        plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt  \
-        plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
-        plugins/org.eclipse.pde.doc.user/pdeOptions     \
-        plugins/org.eclipse.platform.doc.isv/platformOptions.txt 
+# use our system-installed javadocs
+sed --in-place "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadocs/java|" \
+   plugins/org.eclipse.platform.doc.isv/platformOptions.txt
+sed --in-place "s|http://java.sun.com/j2se/1.5/docs/api|%{_datadir}/javadocs/java|" \
+   plugins/org.eclipse.jdt.doc.isv/jdtaptOptions.txt                     \
+   plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
+sed --in-place "s|http://java.sun.com/j2se/1.4/docs/api|%{_datadir}/javadocs/java|" \
+   plugins/org.eclipse.pde.doc.user/pdeOptions.txt                       \
+   plugins/org.eclipse.pde.doc.user/pdeOptions
 %patch14 -p0
 
 pushd plugins/org.eclipse.pde.build
@@ -1719,8 +1718,9 @@
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
-* Tue Apr 03 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-8
+* Wed Apr 11 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-8
 - Link to system-installed jsch instead of including it. 
+- Fix links to system-installed javadocs.
 
 * Tue Mar 20 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-7
 - Remove search and processing for mac encoded files.



From fedora-cvs-commits at redhat.com  Wed Apr 11 10:21:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 06:21:31 -0400
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.107,1.108
Message-ID: <200704111021.l3BALVOa009173@cvs.devel.redhat.com>

Author: bnocera

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

Modified Files:
	rhythmbox.spec 
Log Message:
* Wed Apr 11 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-3.fc7
- Add requires for gnome-themes, spotted by Nigel Jones (#235818)



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- rhythmbox.spec	4 Apr 2007 14:48:26 -0000	1.107
+++ rhythmbox.spec	11 Apr 2007 10:21:29 -0000	1.108
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.10.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -12,6 +12,7 @@
 Requires: gtk2 >= 2.4.0
 Requires: libgnomeui >= 2.6.0
 Requires: gnome-python2
+Requires: gnome-themes
 Requires(post): scrollkeeper
 Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
 Requires(post): GConf2
@@ -143,6 +144,9 @@
 %{_libexecdir}/rhythmbox-metadata
 
 %changelog
+* Wed Apr 11 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-3.fc7
+- Add requires for gnome-themes, spotted by Nigel Jones (#235818)
+
 * Wed Apr 04 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-2.fc7
 - Use multiple CPUs to build, the upstream bug is fixed now
 



From fedora-cvs-commits at redhat.com  Wed Apr 11 10:21:48 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 06:21:48 -0400
Subject: rpms/eclipse/devel eclipse-javadoclinks.patch,1.5,NONE
Message-ID: <200704111021.l3BALmQ6009235@cvs.devel.redhat.com>

Author: bkonrath

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

Removed Files:
	eclipse-javadoclinks.patch 
Log Message:
-Remove unused patch


--- eclipse-javadoclinks.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 11 10:33:08 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 06:33:08 -0400
Subject: rpms/tetex/FC-6 tetex-3.0-CVE-2007-0650.patch, NONE,
	1.1 tetex-3.0-mktexlsrfix.patch, NONE,
	1.1 tetex-3.0-texdocpath.patch, NONE, 1.1 sources, 1.28,
	1.29 tetex.spec, 1.103, 1.104
Message-ID: <200704111033.l3BAX8nb023802@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/tetex/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv23618

Modified Files:
	sources tetex.spec 
Added Files:
	tetex-3.0-CVE-2007-0650.patch tetex-3.0-mktexlsrfix.patch 
	tetex-3.0-texdocpath.patch 
Log Message:
- update nomencl package from CTAN (#234466)
- texdoc now searches in $TEXDOCS instead of $TEXMF/doc (#232769)
- fix a couple of string overflows in makeindex, CVE-2007-0650 (#225491)
- fix file list processing
- make preun scripts failsafe for subpackages when
  docs are excluded (#223719)
- don't inherit incorrect permissions for ls-R from parent
  directory while doing texhash (#220239)



tetex-3.0-CVE-2007-0650.patch:
 mkind.c |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

--- NEW FILE tetex-3.0-CVE-2007-0650.patch ---
--- tetex-src-3.0/texk/makeindexk/mkind.c.CVE-2007-0650	2002-10-02 14:26:37.000000000 +0200
+++ tetex-src-3.0/texk/makeindexk/mkind.c	2007-02-02 12:29:31.000000000 +0100
@@ -179,7 +179,9 @@
 		    argc--;
 		    if (argc <= 0)
 			FATAL("Expected -p <num>\n","");
-		    strcpy(pageno, *++argv);
+		    if (strlen(*++argv) >= sizeof(pageno))
+			FATAL("Page number too high\n","");
+		    strcpy(pageno, *argv);
 		    init_page = TRUE;
 		    if (STREQ(pageno, EVEN)) {
 			log_given = TRUE;
@@ -230,7 +232,7 @@
 		char tmp[STRING_MAX + 5];
 		
 		/* base set by last call to check_idx */
-		sprintf (tmp, "%s%s", base, INDEX_STY);
+		snprintf (tmp, sizeof(tmp), "%s%s", base, INDEX_STY);
 		if (0 == access(tmp, R_OK)) {
 			open_sty (tmp);
 			sty_given = TRUE;
@@ -405,9 +407,9 @@
 		    STRING_MAX,totmem);
 #endif /* DEBUG */
 
-	    if ((idx_fn = (char *) malloc(STRING_MAX)) == NULL)
+	    if ((idx_fn = (char *) malloc(STRING_MAX+5)) == NULL)
 		FATAL("Not enough core...abort.\n", "");
-	    sprintf(idx_fn, "%s%s", base, INDEX_IDX);
+	    snprintf(idx_fn, STRING_MAX+5, "%s%s", base, INDEX_IDX);
 	    if ((open_fn && 
 	 ((idx_fp = OPEN_IN(idx_fn)) == NULL)
 	) ||
@@ -434,7 +436,7 @@
 
     /* index output file */
     if (!ind_given) {
-	sprintf(ind, "%s%s", base, INDEX_IND);
+	snprintf(ind, sizeof(ind), "%s%s", base, INDEX_IND);
 	ind_fn = ind;
     }
     if ((ind_fp = OPEN_OUT(ind_fn)) == NULL)
@@ -442,14 +444,14 @@
 
     /* index transcript file */
     if (!ilg_given) {
-	sprintf(ilg, "%s%s", base, INDEX_ILG);
+	snprintf(ilg, sizeof(ilg), "%s%s", base, INDEX_ILG);
 	ilg_fn = ilg;
     }
     if ((ilg_fp = OPEN_OUT(ilg_fn)) == NULL)
 	FATAL("Can't create transcript file %s.\n", ilg_fn);
 
     if (log_given) {
-	sprintf(log_fn, "%s%s", base, INDEX_LOG);
+	snprintf(log_fn, sizeof(log_fn), "%s%s", base, INDEX_LOG);
 	if ((log_fp = OPEN_IN(log_fn)) == NULL) {
 	    FATAL("Source log file %s not found.\n", log_fn);
 	} else {
@@ -505,6 +507,9 @@
   if ((found = kpse_find_file (fn, kpse_ist_format, 1)) == NULL) {
      FATAL("Index style file %s not found.\n", fn);
   } else {
+    if (strlen(found) >= sizeof(sty_fn)) {
+      FATAL("Style file %s too long.\n", found);
+    }
     strcpy(sty_fn,found);
     if ((sty_fp = OPEN_IN(sty_fn)) == NULL) {
       FATAL("Could not open style file %s.\n", sty_fn);
@@ -512,6 +517,9 @@
   }
 #else
     if ((path = getenv(STYLE_PATH)) == NULL) {
+        if (strlen(fn) >= sizeof(sty_fn)) {
+          FATAL("Style file %s too long.\n", fn);
+        }
 	/* style input path not defined */
 	strcpy(sty_fn, fn);
 	sty_fp = OPEN_IN(sty_fn);

tetex-3.0-mktexlsrfix.patch:
 mktexlsr |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE tetex-3.0-mktexlsrfix.patch ---
--- tetex-src-3.0/texk/kpathsea/mktexlsr.mktexlsrfix	2006-12-20 14:11:38.000000000 +0100
+++ tetex-src-3.0/texk/kpathsea/mktexlsr	2006-12-20 14:51:32.000000000 +0100
@@ -140,7 +140,7 @@
   until PERMS=`kpsestat = "$db_file"`; do sleep 1; done
   chmod $PERMS "$db_file_tmp"
   rm -f "$db_file"
-  install "$db_file_tmp" "$db_file"
+  install -m644 "$db_file_tmp" "$db_file"
   rm -rf "$db_dir_tmp"
 done
 tty -s && echo "$progname: Done." >&2

tetex-3.0-texdocpath.patch:
 texdoc |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE tetex-3.0-texdocpath.patch ---
--- tetex-src-3.0/texk/tetex/texdoc.texdocpath	2007-04-02 13:05:22.000000000 +0200
+++ tetex-src-3.0/texk/tetex/texdoc	2007-04-02 13:27:37.000000000 +0200
@@ -138,7 +138,7 @@
 do
   case $mode in
     search)
-      find `kpsewhich --expand-path='$TEXMF/doc' | tr : ' '` -type f -print |
+      find `kpsewhich --expand-path='$TEXDOCS' | tr : ' '` -type f -print |
         egrep $name
       continue
       ;;


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tetex/FC-6/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	26 Apr 2006 17:12:25 -0000	1.28
+++ sources	11 Apr 2007 10:33:05 -0000	1.29
@@ -8,3 +8,4 @@
 6daeed5b2218286d2790c8afbcc5af11  mendexk2.6d.tar.bz2
 a1d191daba2c5569340d2576a85b290e  ptex-src-3.1.9.tar.bz2
 29fd883448f25c575690b62f2dfe9925  ptex-texmf-2.4.tar.bz2
+073c369f035c7e00aa6ec383b10f775e  nomencl.zip


Index: tetex.spec
===================================================================
RCS file: /cvs/dist/rpms/tetex/FC-6/tetex.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- tetex.spec	8 Oct 2006 08:09:07 -0000	1.103
+++ tetex.spec	11 Apr 2007 10:33:05 -0000	1.104
@@ -11,7 +11,7 @@
 Summary: The TeX text formatting system.
 Name: tetex
 Version: 3.0
-Release: 33%{?dist}
+Release: 34%{?dist}
 License: distributable
 Group: Applications/Publishing
 Requires: tmpwatch, dialog, ed
@@ -35,6 +35,7 @@
 Source100: envlab.tar.bz2
 Source101: OMSrsfs.fd
 Source102: caption.tar.bz2
+Source103: nomencl.zip
 
 #####
 # Source900-999: Japanization related
@@ -67,6 +68,7 @@
 Patch6: tetex-3.0-tkdep.patch
 Patch7: tetex-3.0-tkdefaults.patch
 Patch8: tetex-3.0-xprint.patch
+Patch9: tetex-3.0-texdocpath.patch
 
 ######
 # teTeX patches
@@ -86,6 +88,8 @@
 Patch21: tetex-3.0-dvipdfm.patch
 Patch22: tetex-3.0-selinux.patch
 Patch23: tetex-3.0-footfix.patch
+Patch24: tetex-3.0-mktexlsrfix.patch
+Patch25: tetex-3.0-CVE-2007-0650.patch
 
 ######
 # Japanization patches
@@ -271,6 +275,7 @@
 %patch6 -p1 -b .tkdep
 %patch7 -p1 -b .tkdefaults
 %patch8 -p1 -b .xprint
+%patch9 -p1 -b .texdocpath
 
 ######
 # teTeX patches
@@ -304,6 +309,10 @@
 %patch22 -p1 -b .selinux
 # fix para option in footmisc package (#188701)
 %patch23 -p1 -b .footfix
+# don't inherit incorrect permissions for ls-R from parent directory (#220239)
+%patch24 -p1 -b .mktexlsrfix
+# fix a couple of string overflows in makeindex - CVE-2007-0650 (#225491)
+%patch25 -p1 -b .CVE-2007-0650
 
 %if %{enable_japanese}
 mkdir texmf/ptex-texmf
@@ -520,6 +529,17 @@
 ls ${RPM_BUILD_ROOT}%{_datadir}/texmf/tex/latex/caption | grep -v "\\.sty$" | xargs rm -f
 popd
 
+# update nomencl package from CTAN (#234466)
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/texmf/tex/latex/nomencl
+unzip %{SOURCE103} -d ${RPM_BUILD_ROOT}%{_datadir}/texmf/tex/latex
+pushd ${RPM_BUILD_ROOT}%{_datadir}/texmf/tex/latex/nomencl
+${RPM_BUILD_ROOT}%{_bindir}/latex nomencl.ins
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/texmf/doc/latex/nomencl
+mv README nomencl.pdf ${RPM_BUILD_ROOT}%{_datadir}/texmf/doc/latex/nomencl
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/texmf/doc/latex/nomencl/nomencl.dvi
+ls ${RPM_BUILD_ROOT}%{_datadir}/texmf/tex/latex/nomencl | grep -v "\\.sty$" | xargs rm -f
+popd
+
 # Create symlinks for Euler fonts (#9782)
 pushd ${RPM_BUILD_ROOT}%{_datadir}/texmf/tex/latex/amsfonts
 for i in ex f r s ; do
@@ -805,16 +825,19 @@
 	/sbin/install-info --delete %{_infodir}/web2c.info.gz %{_infodir}/dir
 	/sbin/install-info --delete %{_infodir}/kpathsea.info.gz %{_infodir}/dir
 fi
+exit 0
 
 %preun dvips
 if [ "$1" = 0 ]; then
 	/sbin/install-info --delete %{_infodir}/dvips.info.gz %{_infodir}/dir
 fi
+exit 0
 
 %preun latex
 if [ "$1" = 0 ]; then
 	/sbin/install-info --delete %{_infodir}/latex.info.gz %{_infodir}/dir
 fi
+exit 0
 
 %files -f filelist.tex
 %defattr(-,root,root)
@@ -842,6 +865,16 @@
 %defattr(-,root,root)
 
 %changelog
+* Wed Apr 14 2007 Jindrich Novy <jnovy at redhat.com> 3.0-34
+- update nomencl package from CTAN (#234466)
+- texdoc now searches in $TEXDOCS instead of $TEXMF/doc (#232769)
+- fix a couple of string overflows in makeindex, CVE-2007-0650 (#225491)
+- fix file list processing
+- make preun scripts failsafe for subpackages when
+  docs are excluded (#223719)
+- don't inherit incorrect permissions for ls-R from parent
+  directory while doing texhash (#220239)
+
 * Sun Oct  8 2006 Jindrich Novy <jnovy at redhat.com> 3.0-33
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Apr 11 11:12:35 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 07:12:35 -0400
Subject: rpms/libtheora/devel libtheora.spec,1.14,1.15
Message-ID: <200704111112.l3BBCZhL019832@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libtheora/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19553

Modified Files:
	libtheora.spec 
Log Message:
Add docs to -devel



Index: libtheora.spec
===================================================================
RCS file: /cvs/dist/rpms/libtheora/devel/libtheora.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libtheora.spec	25 Mar 2007 21:59:42 -0000	1.14
+++ libtheora.spec	11 Apr 2007 11:12:32 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Theora Video Compression Codec
 Name: libtheora
 Version: 1.0alpha7
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 0
 License: BSD
 Group: System Environment/Libraries
@@ -74,6 +74,7 @@
 
 %files devel
 %defattr(-,root,root,-)
+%doc doc/libtheora/html
 %dir %{_includedir}/theora
 %{_includedir}/theora/theora.h
 %{_libdir}/*.so
@@ -84,6 +85,9 @@
 %{_bindir}/*
 
 %changelog
+* Wed Apr 11 2007 Matthias Clasen <mclasen at redhat.com> - 0:1.0alpha7-3
+- Add api docs to the -devel package
+
 * Sun Mar 25 2007 Matthias Clasen <mclasen at redhat.com> - 0:1.0alpha7-2
 - Fix a directory ownership issue (#233872)
 - Small spec cleanups



From fedora-cvs-commits at redhat.com  Wed Apr 11 11:33:06 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 07:33:06 -0400
Subject: rpms/coreutils/FC-6 coreutils-rm-race.patch, NONE,
	1.1 coreutils.spec, 1.150, 1.151
Message-ID: <200704111133.l3BBX6on002075@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	coreutils.spec 
Added Files:
	coreutils-rm-race.patch 
Log Message:
* Wed Apr 11 2007 Tim Waugh <twaugh at redhat.com>
- Fixed rm race (bug #235401).
- Resolves: rhbz#235401


coreutils-rm-race.patch:
 remove.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE coreutils-rm-race.patch ---
--- coreutils-5.97/src/remove.c.rm-race	2007-04-11 12:28:11.000000000 +0100
+++ coreutils-5.97/src/remove.c	2007-04-11 12:29:25.000000000 +0100
@@ -887,6 +887,8 @@
 		 quote (full_filename (".")));
 	  return RM_ERROR;
 	}
+      else
+	return RM_OK;
     }
 
   while (1)


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/FC-6/coreutils.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- coreutils.spec	24 Jan 2007 16:37:24 -0000	1.150
+++ coreutils.spec	11 Apr 2007 11:33:03 -0000	1.151
@@ -24,6 +24,7 @@
 Patch2: coreutils-rename.patch
 Patch3: coreutils-cut-coredump.patch
 Patch4: coreutils-223869.patch
+Patch5: coreutils-rm-race.patch
 Patch10: coreutils-newhashes.patch
 
 # Our patches
@@ -86,6 +87,7 @@
 %patch2 -p1 -b .rename
 %patch3 -p1 -b .cut-coredump
 %patch4 -p1 -b .223869
+%patch5 -p1 -b .rm-race
 %patch10 -p1 -b .newhashes
 
 # Our patches
@@ -288,6 +290,9 @@
 /sbin/runuser
 
 %changelog
+* Wed Apr 11 2007 Tim Waugh <twaugh at redhat.com>
+- Fixed rm race (bug #235401).
+
 * Wed Jan 24 2007 Tim Waugh <twaugh at redhat.com>
 - Fixed wrong error message (bug #223869).
 



From fedora-cvs-commits at redhat.com  Wed Apr 11 11:33:14 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 07:33:14 -0400
Subject: rpms/totem/devel totem.spec,1.100,1.101
Message-ID: <200704111133.l3BBXE1x002189@cvs.devel.redhat.com>

Author: bnocera

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1661

Modified Files:
	totem.spec 
Log Message:
* Wed Apr 11 2007 - Bastien Nocera <bnocera at redhat.com> - 2.18.1-2
- Add requires for gnome-themes, spotted by Nigel Jones (#235819)



Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- totem.spec	4 Apr 2007 15:13:50 -0000	1.100
+++ totem.spec	11 Apr 2007 11:33:12 -0000	1.101
@@ -5,7 +5,7 @@
 Summary: Movie player for GNOME 2
 Name: totem
 Version: 2.18.1
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/totem/
@@ -25,6 +25,7 @@
 Requires: gstreamer-plugins-base >= %gstreamer_plugins_base_version
 Requires: gstreamer-plugins-good >= %gstreamer_plugins_good_version
 Requires: iso-codes
+Requires: gnome-themes
 Requires: %{name}-plparser = %{version}-%{release}
 
 BuildRequires: gcc-c++, pkgconfig, gettext, scrollkeeper
@@ -201,6 +202,9 @@
 %{_libdir}/*so
 
 %changelog
+* Wed Apr 11 2007 - Bastien Nocera <bnocera at redhat.com> - 2.18.1-2
+- Add requires for gnome-themes, spotted by Nigel Jones (#235819)
+
 * Wed Apr 04 2007 - Bastien Nocera <bnocera at redhat.com> - 2.18.1-1
 - New upstream version with plenty of bug fixes
 



From fedora-cvs-commits at redhat.com  Wed Apr 11 12:24:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 08:24:42 -0400
Subject: rpms/k3b/devel .cvsignore, 1.14, 1.15 k3b.spec, 1.39, 1.40 sources,
	1.15, 1.16
Message-ID: <200704111224.l3BCOgTr000701@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/k3b/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv685

Modified Files:
	.cvsignore k3b.spec sources 
Log Message:
- version k3b-1.0
- provide/obsolete k3b-extras



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	15 Feb 2007 12:10:46 -0000	1.14
+++ .cvsignore	11 Apr 2007 12:24:40 -0000	1.15
@@ -1,2 +1,2 @@
-k3b-1.0rc6.tar.bz2
-k3b-i18n-0.12.17.tar.bz2
+k3b-1.0.tar.bz2
+k3b-i18n-1.0.tar.bz2


Index: k3b.spec
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- k3b.spec	15 Feb 2007 12:17:28 -0000	1.39
+++ k3b.spec	11 Apr 2007 12:24:40 -0000	1.40
@@ -1,9 +1,9 @@
-%define tar_version 1.0rc6
-%define i18n_version 0.12.17
+%define tar_version 1.0
+%define i18n_version 1.0
 
 Name: k3b
-Version: 1.0.0
-Release: 0.rc6.1%{?dist}
+Version: 1.0
+Release: 1%{?dist}
 Epoch: 0
 Summary: CD/DVD burning application for KDE
 
@@ -33,6 +33,8 @@
 
 Requires: cdrecord mkisofs dvd+rw-tools cdrdao
 Provides: %{name}-i18n = %{epoch}:%{version}-%{release}
+Obsoletes: k3b-extras <= 0:0.12.17-1.fc6
+Provides: k3b-extras = 0:0.12.17-2
 
 %description
 K3b provides a comfortable user interface to perform most CD/DVD
@@ -51,9 +53,9 @@
 
 %prep
 %setup -q -a 1 -n %{name}-%{tar_version}
-
-%patch1 -p1 -b .lns
-
+pushd %{name}-i18n-%{i18n_version}
+%patch1 -p2 -b .lns
+popd
 # Make desktop icon file names compatible with GNOME.
 sed -i 's,^Icon=k3b$,Icon=k3b.png,' src/k3b.desktop k3bsetup/k3bsetup2.desktop
 
@@ -187,6 +189,10 @@
 %{_libdir}/libk3b*.so
 
 %changelog
+* Wed Apr 11 2007 Harald Hoyer <harald at redhat.com> - 0:1.0-1
+- version k3b-1.0
+- provide/obsolete k3b-extras
+
 * Thu Feb 15 2007 Harald Hoyer <harald at redhat.com> - 0:1.0.0-0.rc6.1
 - version k3b-1.0rc6
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	15 Feb 2007 12:10:46 -0000	1.15
+++ sources	11 Apr 2007 12:24:40 -0000	1.16
@@ -1,2 +1,2 @@
-4cc663fd6f135531b9384b90282ebfb4  k3b-1.0rc6.tar.bz2
-f9de0fb3ce91fa572f4f0fd24dcfe2f2  k3b-i18n-0.12.17.tar.bz2
+02bf955059adfe9ac8a11d36fb34a11c  k3b-1.0.tar.bz2
+19534f984a9846b50bf027d1a9ce4988  k3b-i18n-1.0.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 11 12:54:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 08:54:31 -0400
Subject: rpms/man-pages/devel .cvsignore, 1.31,
	1.32 man-pages-2.34-libaio-includes.patch, 1.1,
	1.2 man-pages.spec, 1.70, 1.71 sources, 1.30,
	1.31 man-pages-1.51-nopent.patch, 1.1,
	NONE man-pages-1.60-issue.patch, 1.1,
	NONE man-pages-1.60-re_comp.patch, 1.1,
	NONE man-pages-1.67-nscd_conf.patch, 1.1,
	NONE man-pages-2.05-issue.patch, 1.1,
	NONE man-pages-2.13-aio.patch, 1.1,
	NONE man-pages-2.32-langinfo.patch, 1.1,
	NONE man-pages-2.32-mmap.patch, 1.1,
	NONE man-pages-2.32-termcap.patch, 1.1,
	NONE man-pages-2.34-getrlimit.patch, 1.1,
	NONE man-pages-2.34-inet.patch, 1.1,
	NONE man-pages-2.34-write.patch, 1.1,
	NONE man-pages-2.39-clone.patch, 1.1,
	NONE man-pages-2.39-typo.patch, 1.1, NONE
Message-ID: <200704111254.l3BCsVPp031390@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/man-pages/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31243

Modified Files:
	.cvsignore man-pages-2.34-libaio-includes.patch man-pages.spec 
	sources 
Removed Files:
	man-pages-1.51-nopent.patch man-pages-1.60-issue.patch 
	man-pages-1.60-re_comp.patch man-pages-1.67-nscd_conf.patch 
	man-pages-2.05-issue.patch man-pages-2.13-aio.patch 
	man-pages-2.32-langinfo.patch man-pages-2.32-mmap.patch 
	man-pages-2.32-termcap.patch man-pages-2.34-getrlimit.patch 
	man-pages-2.34-inet.patch man-pages-2.34-write.patch 
	man-pages-2.39-clone.patch man-pages-2.39-typo.patch 
Log Message:
 update to 2.44



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	1 Dec 2006 10:44:00 -0000	1.31
+++ .cvsignore	11 Apr 2007 12:54:29 -0000	1.32
@@ -1,4 +1,4 @@
 man-pages-extralocale.tar.bz2
 man2.tar.gz
 man2_sys2.1.tar.gz
-man-pages-2.43.tar.bz2
+man-pages-2.44.tar.bz2

man-pages-2.34-libaio-includes.patch:
 io_submit.2 |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: man-pages-2.34-libaio-includes.patch
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/man-pages-2.34-libaio-includes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- man-pages-2.34-libaio-includes.patch	18 Jul 2006 09:35:39 -0000	1.1
+++ man-pages-2.34-libaio-includes.patch	11 Apr 2007 12:54:29 -0000	1.2
@@ -9,25 +9,3 @@
  .sp
  .HP 16
  long\ \fBio_submit\fR\ (aio_context_t\ \fIctx_id\fR, long\ \fInr\fR, struct\ iocb\ \fI**iocbpp\fR);
---- man-pages-1.67/man2/io_getevents.2.orig	2006-04-11 10:24:14.000000000 -0400
-+++ man-pages-1.67/man2/io_getevents.2	2006-04-11 10:24:17.000000000 -0400
-@@ -31,7 +31,7 @@ io_getevents \- Read asynchronous I/O ev
- 
- .sp
- 
--#include <linux/aio.h>
-+#include <libaio.h>
- 
- .sp
- .HP 19
---- man-pages-1.67/man2/io_cancel.2.orig	2006-04-11 10:24:05.000000000 -0400
-+++ man-pages-1.67/man2/io_cancel.2	2006-04-11 10:24:09.000000000 -0400
-@@ -27,7 +27,7 @@ io_cancel \- Cancel an outstanding async
- .ad l
- .hy 0
- 
--#include <linux/aio.h>
-+#include <libaio.h>
- .sp
- .HP 16
- long\ \fBio_cancel\fR\ (aio_context_t\ \fIctx_id\fR, struct\ iocb\ \fI*iocb\fR, struct\ io_event\ \fI*result\fR);


Index: man-pages.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- man-pages.spec	3 Apr 2007 08:40:39 -0000	1.70
+++ man-pages.spec	11 Apr 2007 12:54:29 -0000	1.71
@@ -1,7 +1,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
-Version: 2.43
-Release: 12%{?dist}
+Version: 2.44
+Release: 1%{?dist}
 License: distributable
 Group: Documentation
 URL: http://www.kernel.org/pub/linux/docs/manpages/
@@ -16,25 +16,11 @@
 Source13: nss.5
 Source14: man2_sys2.1.tar.gz
 Patch1: man-pages-1.51-iconv.patch
-Patch2: man-pages-1.51-nopent.patch
-Patch3: man-pages-2.32-langinfo.patch
-Patch4: man-pages-1.60-re_comp.patch
 Patch8: man-pages-1.60-fs.patch
-Patch9: man-pages-1.60-issue.patch
-Patch16: man-pages-2.05-issue.patch
-Patch19: man-pages-2.32-termcap.patch
-Patch20: man-pages-2.13-aio.patch
-Patch21: man-pages-2.32-mmap.patch
-Patch22: man-pages-1.67-nscd_conf.patch
 Patch23: man-pages-2.25-dbopen.patch
 Patch24: man-pages-2.25-malloc.patch
-Patch26: man-pages-2.34-inet.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
-Patch33: man-pages-2.39-typo.patch
-Patch35: man-pages-2.39-clone.patch
 Patch36: man-pages-2.39-unimplemented.patch
 Patch37: man-pages-2.41-mmap.patch
 Patch38: man-pages-2.43-mount.patch
@@ -67,25 +53,11 @@
 tar xzf %{SOURCE11}
 
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 %patch8 -p1
-%patch9 -p1 
-%patch16 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1 
 %patch23 -p1
 %patch24 -p1
-%patch26 -p1
 %patch28 -p1
-%patch29 -p1
 %patch30 -p1
-%patch31 -p1
-%patch33 -p1
-%patch35 -p1
 %patch36 -p1 
 %patch37 -p1
 %patch38 -p1
@@ -242,6 +214,9 @@
 %lang(en) %{_mandir}/en/man*
 
 %changelog
+* Wed Apr 11 2007 Ivana Varekova <varekova at redhat.com> 2.44-1
+- update to 2.44
+
 * Mon Apr  2 2007 Steve Dickson <steved at redhat.com> 2.43-12
 - Remove the rpcinfo man page (#228894).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	1 Dec 2006 10:44:00 -0000	1.30
+++ sources	11 Apr 2007 12:54:29 -0000	1.31
@@ -1,4 +1,4 @@
 57f2e0500d177e05647990eae439a8ee  man-pages-extralocale.tar.bz2
 af09d031dcee66929510e078d00066f2  man2.tar.gz
 fbc03fdbc665e24961d30dad3ed8596d  man2_sys2.1.tar.gz
-15105479df4f65dd208eaaded48a1f54  man-pages-2.43.tar.bz2
+e2a0b9822e50760e25b47d2a9b300a69  man-pages-2.44.tar.bz2


--- man-pages-1.51-nopent.patch DELETED ---


--- man-pages-1.60-issue.patch DELETED ---


--- man-pages-1.60-re_comp.patch DELETED ---


--- man-pages-1.67-nscd_conf.patch DELETED ---


--- man-pages-2.05-issue.patch DELETED ---


--- man-pages-2.13-aio.patch DELETED ---


--- man-pages-2.32-langinfo.patch DELETED ---


--- man-pages-2.32-mmap.patch DELETED ---


--- man-pages-2.32-termcap.patch DELETED ---


--- man-pages-2.34-getrlimit.patch DELETED ---


--- man-pages-2.34-inet.patch DELETED ---


--- man-pages-2.34-write.patch DELETED ---


--- man-pages-2.39-clone.patch DELETED ---


--- man-pages-2.39-typo.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 11 13:09:05 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 09:09:05 -0400
Subject: rpms/subversion/devel subversion.spec,1.93,1.94
Message-ID: <200704111309.l3BD953P009660@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	subversion.spec 
Log Message:
* Wed Apr 11 2007 Joe Orton <jorton at redhat.com> 1.4.3-5
- fix version of apr/apr-util in BR (#216181)



Index: subversion.spec
===================================================================
RCS file: /cvs/dist/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- subversion.spec	30 Mar 2007 09:58:54 -0000	1.93
+++ subversion.spec	11 Apr 2007 13:09:03 -0000	1.94
@@ -15,7 +15,7 @@
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
 Version: 1.4.3
-Release: 4
+Release: 5
 License: BSD
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -29,7 +29,7 @@
 Patch7: subversion-1.1.3-java.patch
 BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
 BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext
-BuildRequires: apr-devel >= 0.9.6-1, apr-util-devel >= 0.9.5-1
+BuildRequires: apr-devel >= 0.9.7, apr-util-devel >= 0.9.7
 BuildRequires: neon-devel >= 0:0.24.7-1
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -260,6 +260,9 @@
 %endif
 
 %changelog
+* Wed Apr 11 2007 Joe Orton <jorton at redhat.com> 1.4.3-5
+- fix version of apr/apr-util in BR (#216181)
+
 * Thu Mar 29 2007 Joe Orton <jorton at redhat.com> 1.4.3-4
 - fix javahl compile failure
 



From fedora-cvs-commits at redhat.com  Wed Apr 11 13:12:39 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 09:12:39 -0400
Subject: rpms/libselinux/devel .cvsignore, 1.136, 1.137 libselinux.spec,
	1.259, 1.260 sources, 1.138, 1.139
Message-ID: <200704111312.l3BDCdBL012426@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libselinux.spec sources 
Log Message:
* Wed Apr 11 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.12-1
- Upgrade to upstream
	* Merged support for getting initial contexts from James Carter.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- .cvsignore	9 Apr 2007 19:50:05 -0000	1.136
+++ .cvsignore	11 Apr 2007 13:12:34 -0000	1.137
@@ -115,3 +115,4 @@
 libselinux-2.0.8.tgz
 libselinux-2.0.9.tgz
 libselinux-2.0.11.tgz
+libselinux-2.0.12.tgz


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -r1.259 -r1.260
--- libselinux.spec	9 Apr 2007 19:50:05 -0000	1.259
+++ libselinux.spec	11 Apr 2007 13:12:34 -0000	1.260
@@ -1,7 +1,7 @@
 %define libsepolver 2.0.1-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.11
+Version: 2.0.12
 Release: 1%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
@@ -121,6 +121,10 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Wed Apr 11 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.12-1
+- Upgrade to upstream
+	* Merged support for getting initial contexts from James Carter.
+
 * Mon Apr 9 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.11-1
 - Upgrade to upstream
 	* Merged userspace AVC patch to follow kernel's behavior for permissive mode in caching previous denials from Eamon Walsh.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/sources,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- sources	9 Apr 2007 19:50:05 -0000	1.138
+++ sources	11 Apr 2007 13:12:34 -0000	1.139
@@ -1 +1 @@
-1ba54e7ad81fd4589bf4897260ee2071  libselinux-2.0.11.tgz
+4f5114ea42063b1e3331e84d02bcb0cc  libselinux-2.0.12.tgz



From fedora-cvs-commits at redhat.com  Wed Apr 11 13:14:55 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 09:14:55 -0400
Subject: rpms/policycoreutils/devel .cvsignore, 1.145,
	1.146 policycoreutils.spec, 1.392, 1.393 sources, 1.150, 1.151
Message-ID: <200704111314.l3BDEtnU014191@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore policycoreutils.spec sources 
Log Message:
* Wed Apr 11 2007 Dan Walsh <dwalsh at redhat.com> 2.0.8-1
- Updated version of sepolgen
	* Merged updates to sepolgen-ifgen from Karl MacMillan.
	* Merged updates to sepolgen parser and tools from Karl MacMillan.
	  This includes improved debugging support, handling of interface 
	  calls with list parameters, support for role transition rules,
	  updated range transition rule support, and looser matching.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- .cvsignore	26 Mar 2007 18:44:05 -0000	1.145
+++ .cvsignore	11 Apr 2007 13:14:53 -0000	1.146
@@ -142,3 +142,5 @@
 sepolgen-1.0.4.tgz
 sepolgen-1.0.6.tgz
 sepolgen-1.0.7.tgz
+policycoreutils-2.0.8.tgz
+sepolgen-1.0.8.tgz


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -r1.392 -r1.393
--- policycoreutils.spec	9 Apr 2007 20:49:19 -0000	1.392
+++ policycoreutils.spec	11 Apr 2007 13:14:53 -0000	1.393
@@ -2,11 +2,11 @@
 %define libsepolver 2.0.1-1
 %define libsemanagever 1.10.0-1
 %define libselinuxver 2.0.0-1
-%define sepolgenver 1.0.7
+%define sepolgenver 1.0.8
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 2.0.7
-Release: 11%{?dist}
+Version: 2.0.8
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -186,6 +186,14 @@
 fi
 
 %changelog
+* Wed Apr 11 2007 Dan Walsh <dwalsh at redhat.com> 2.0.8-1
+- Updated version of sepolgen
+	* Merged updates to sepolgen-ifgen from Karl MacMillan.
+	* Merged updates to sepolgen parser and tools from Karl MacMillan.
+	  This includes improved debugging support, handling of interface 
+	  calls with list parameters, support for role transition rules,
+	  updated range transition rule support, and looser matching.
+
 * Mon Apr 9 2007 Dan Walsh <dwalsh at redhat.com> 2.0.7-11
 - Don't generate invalid context with genhomedircon
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- sources	26 Mar 2007 18:44:05 -0000	1.150
+++ sources	11 Apr 2007 13:14:53 -0000	1.151
@@ -1,2 +1,2 @@
-1c75ba52423c0263de2f76eed8ea003e  policycoreutils-2.0.7.tgz
-59bed1b9208d727de20d9d38a146c461  sepolgen-1.0.7.tgz
+3adbd3e84611903fb973e656b373ca59  policycoreutils-2.0.8.tgz
+4d6e57c7fc396efbcf96b7accab4ba30  sepolgen-1.0.8.tgz



From fedora-cvs-commits at redhat.com  Wed Apr 11 13:27:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 09:27:01 -0400
Subject: rpms/xdoclet/devel xdoclet.spec,1.27,1.28
Message-ID: <200704111327.l3BDR13S022017@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/xdoclet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21901

Modified Files:
	xdoclet.spec 
Log Message:
* Tue Apr 11 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.2.3-7jpp.3
- Remove mockobjects requirements.




Index: xdoclet.spec
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/xdoclet.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xdoclet.spec	4 Aug 2006 19:27:38 -0000	1.27
+++ xdoclet.spec	11 Apr 2007 13:26:59 -0000	1.28
@@ -43,7 +43,7 @@
 
 Name:		xdoclet
 Version:	1.2.3
-Release:	7jpp.2
+Release:	7jpp.3
 Epoch:		0
 Summary:	XDoclet Attribute Orientated Programming Framework
 License:	XDoclet Open Source Licence
@@ -76,7 +76,6 @@
 BuildRequires:  jakarta-commons-lang 
 BuildRequires:  jakarta-commons-logging 
 BuildRequires:  log4j
-BuildRequires:  mockobjects 
 BuildRequires:  struts 
 BuildRequires:  velocity 
 BuildRequires:  xalan-j2 >= 0:2.7.0
@@ -87,7 +86,6 @@
 Requires:  jakarta-commons-collections
 Requires:  jakarta-commons-logging
 Requires:  log4j
-Requires:  mockobjects
 Requires:  velocity
 Requires:  xalan-j2 >= 0:2.7.0
 Requires:  xml-commons-apis
@@ -158,7 +156,10 @@
 tar xzf %{SOURCE1}
 popd
 
-for j in xjavadoc-1.1 jrefactory javacc junit bsf commons-collections commons-logging log4j velocity xalan-j2 xjavadoc xml-commons-apis mockobjects-core; do
+# Remove mockobjects support.
+rm -rf modules/mockobjects
+
+for j in xjavadoc-1.1 jrefactory javacc junit bsf commons-collections commons-logging log4j velocity xalan-j2 xjavadoc xml-commons-apis; do
 	ln -s $(build-classpath $j) lib
 done
 
@@ -263,7 +264,6 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-jsf-module-1.2.3.jar.*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-libelis-module-1.2.3.jar.*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-macromedia-module-1.2.3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-mockobjects-module-1.2.3.jar.*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-mvcsoft-module-1.2.3.jar.*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-mx4j-module-1.2.3.jar.*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-objectweb-module-1.2.3.jar.*
@@ -299,6 +299,9 @@
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Tue Apr 11 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.2.3-7jpp.3
+- Remove mockobjects requirements.
+
 * Fri Aug 04 2006 Matt Wringe <mwringe at redhat.com> - 0:1.2.3-7jpp.2
 - Rebuild with define with_gcj_support
 



From fedora-cvs-commits at redhat.com  Wed Apr 11 13:28:20 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 09:28:20 -0400
Subject: rpms/qt/devel qt-3.3.8-fontrendering-#214570.patch, NONE,
	1.1 qt-3.3.8-fontrendering-as_IN-209972.patch, NONE,
	1.1 qt.spec, 1.133, 1.134 qt-3.3.6-fontrendering-#214570.patch,
	1.2, NONE qt-3.3.6-fontrendering-as_IN-209972.patch, 1.1, NONE
Message-ID: <200704111328.l3BDSK5A023044@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/qt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22914

Modified Files:
	qt.spec 
Added Files:
	qt-3.3.8-fontrendering-#214570.patch 
	qt-3.3.8-fontrendering-as_IN-209972.patch 
Removed Files:
	qt-3.3.6-fontrendering-#214570.patch 
	qt-3.3.6-fontrendering-as_IN-209972.patch 
Log Message:
- adjust qt-3.3.8-fontrendering-as_IN-209972.patch and
  qt-3.3.8-fontrendering-#214570.patch for qt-3.3.8



qt-3.3.8-fontrendering-#214570.patch:
 qscriptengine_x11.cpp |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE qt-3.3.8-fontrendering-#214570.patch ---
--- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig	2007-04-11 15:05:34.000000000 +0200
+++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp	2007-04-11 15:22:19.000000000 +0200
@@ -1240,7 +1240,7 @@
     int script = item->script;
     Q_ASSERT(script >= QFont::Devanagari && script <= QFont::Sinhala);
     const unsigned short script_base = 0x0900 + 0x80*(script-QFont::Devanagari);
-    const unsigned short ra = script_base + 0x30;
+    unsigned short ra = script_base + 0x30;            //it was const unsigned short ra before modification
     const unsigned short halant = script_base + 0x4d;
     const unsigned short nukta = script_base + 0x3c;
 
@@ -1278,6 +1278,11 @@
     }
 #endif
 
+    unsigned short *chkAssamese=reordered.data();
+    if((script == QFont::Bengali) && (*chkAssamese==0x09F0)) //if it is assamese ra
+    {
+       ra  = script_base + 0x70;
+    }
     if (len != 1) {
         unsigned short *uc = reordered.data();
         bool beginsWithRa = FALSE;

qt-3.3.8-fontrendering-as_IN-209972.patch:
 qscriptengine_x11.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE qt-3.3.8-fontrendering-as_IN-209972.patch ---
--- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig	2007-04-11 15:05:34.000000000 +0200
+++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp	2007-04-11 15:22:19.000000000 +0200
@@ -601,7 +601,7 @@
     None, None, None, None,
     None, None, None, None,
 
-    None, None, None, None,
+    Below, None, None, None,
     None, None, None, None,
     None, None, None, None,
     None, None, None, None,


Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/qt.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- qt.spec	2 Apr 2007 09:00:37 -0000	1.133
+++ qt.spec	11 Apr 2007 13:28:18 -0000	1.134
@@ -1,7 +1,7 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: 3.3.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
@@ -32,10 +32,10 @@
 Patch26: qt-3.3.6-fontrendering-punjabi-209970.patch
 Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch
 Patch28: qt-3.3.6-fontrendering-or_IN-209098.patch
-Patch29: qt-3.3.6-fontrendering-as_IN-209972.patch
+Patch29: qt-3.3.8-fontrendering-as_IN-209972.patch
 Patch31: qt-3.3.6-fontrendering-te_IN-211259.patch
 Patch32: qt-3.3.6-fontrendering-214371.patch
-Patch33: qt-3.3.6-fontrendering-#214570.patch
+Patch33: qt-3.3.8-fontrendering-#214570.patch
 Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch
 Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch
 
@@ -564,6 +564,10 @@
 
 
 %changelog
+* Wed Apr 11 2007 Than Ngo <than at redhat.com> - 1:3.3.8-4.fc7
+- adjust qt-3.3.8-fontrendering-as_IN-209972.patch and
+  qt-3.3.8-fontrendering-#214570.patch for qt-3.3.8
+
 * Mon Apr 02 2007 Than Ngo <than at redhat.com> - 1:3.3.8-3.fc7
 - apply patches to fix
    Qt UTF-8 overlong sequence decoding vulnerability


--- qt-3.3.6-fontrendering-#214570.patch DELETED ---


--- qt-3.3.6-fontrendering-as_IN-209972.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 11 13:53:41 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 09:53:41 -0400
Subject: rpms/kexec-tools/devel kdump.init, 1.13, 1.14 kexec-tools.spec, 1.83,
	1.84
Message-ID: <200704111353.l3BDrfgn024761@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24746

Modified Files:
	kdump.init kexec-tools.spec 
Log Message:
Resolves: bz 235986


Index: kdump.init
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kdump.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kdump.init	25 Jan 2007 20:13:28 -0000	1.13
+++ kdump.init	11 Apr 2007 13:53:39 -0000	1.14
@@ -250,7 +250,7 @@
 	SSH_SERVER=`echo $SSH_TARGET | sed -e's/\(.*@\)\(.*$\)/\2/'`
  
 	#now send the found key to the found server
-	cat $KEYFILE | ssh -x $SSH_USER@$SSH_SERVER "mkdir -p ~$SSH_USER/.ssh; chmod 700 ~$SSH_USER/.ssh;  cat >> ~$SSH_USER/.ssh/authorized_keys2"
+	cat $KEYFILE | ssh -x $SSH_USER@$SSH_SERVER "mkdir -p ~$SSH_USER/.ssh; chmod 700 ~$SSH_USER/.ssh;  cat >> ~$SSH_USER/.ssh/authorized_keys2; chmod 600 ~$SSH_USER/.ssh/authorized_keys2"
 	RET=$?
 	if [ $RET == 0 ]; then
 		echo $KEYFILE has been added to ~$SSH_USER/.ssh/authorized_keys2 on $SSH_SERVER


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- kexec-tools.spec	10 Apr 2007 19:47:22 -0000	1.83
+++ kexec-tools.spec	11 Apr 2007 13:53:39 -0000	1.84
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 68%{?dist}
+Release: 69%{?dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -251,6 +251,9 @@
 %doc kexec-kdump-howto.txt
 
 %changelog
+* Wed Apr 11 2007 Neil Horman <nhorman at redhat.com> - 1.101-69%{dist}
+- Fixed up kdump.init to enforce mode 600 on authorized_keys2 (bz 235986)
+
 * Tue Apr 10 2007 Neil Horman <nhorman at redhat.com> - 1.101-68%{dist}
 - Fix alignment of bootargs and device-tree structures on ppc64
 



From fedora-cvs-commits at redhat.com  Wed Apr 11 14:29:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 10:29:21 -0400
Subject: rpms/dhcp/devel dhcp-3.0.5-xen-checksum.patch, 1.4, 1.5 dhcp.spec,
	1.153, 1.154
Message-ID: <200704111429.l3BETLxI025349@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25328

Modified Files:
	dhcp.spec 
Added Files:
	dhcp-3.0.5-xen-checksum.patch 
Log Message:
* Wed Apr 11 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-30
- Enable Xen patch again, kernel bits present (#231444)


dhcp-3.0.5-xen-checksum.patch:
 common/bpf.c     |    3 +-
 common/dlpi.c    |    2 -
 common/lpf.c     |   79 +++++++++++++++++++++++++++++++++++++++++++------------
 common/nit.c     |    2 -
 common/packet.c  |    5 ++-
 common/upf.c     |    2 -
 includes/dhcpd.h |    2 -
 7 files changed, 71 insertions(+), 24 deletions(-)

Index: dhcp-3.0.5-xen-checksum.patch
===================================================================
RCS file: dhcp-3.0.5-xen-checksum.patch
diff -N dhcp-3.0.5-xen-checksum.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ dhcp-3.0.5-xen-checksum.patch	11 Apr 2007 14:29:18 -0000	1.5
@@ -0,0 +1,242 @@
+--- dhcp-3.0.5/common/bpf.c.xen	2004-11-24 12:39:15.000000000 -0500
++++ dhcp-3.0.5/common/bpf.c	2007-03-30 16:34:45.000000000 -0400
+@@ -478,7 +478,8 @@
+ 					       interface -> rbuf,
+ 					       interface -> rbuf_offset,
+ 					       from,
+-					       hdr.bh_caplen);
++					       hdr.bh_caplen,
++					       0);
+ 
+ 		/* If the IP or UDP checksum was bad, skip the packet... */
+ 		if (offset < 0) {
+--- dhcp-3.0.5/common/dlpi.c.xen	2004-11-24 12:39:15.000000000 -0500
++++ dhcp-3.0.5/common/dlpi.c	2007-03-30 16:34:45.000000000 -0400
+@@ -679,7 +679,7 @@
+ 	length -= offset;
+ #endif
+ 	offset = decode_udp_ip_header (interface, dbuf, bufix,
+-				       from, length);
++				       from, length, 0);
+ 
+ 	/* If the IP or UDP checksum was bad, skip the packet... */
+ 	if (offset < 0) {
+--- dhcp-3.0.5/common/lpf.c.xen	2007-03-30 16:34:26.000000000 -0400
++++ dhcp-3.0.5/common/lpf.c	2007-03-30 16:34:45.000000000 -0400
+@@ -34,16 +34,31 @@
+ #include "dhcpd.h"
+ #if defined (USE_LPF_SEND) || defined (USE_LPF_RECEIVE)
+ #include <sys/ioctl.h>
++#include <sys/socket.h>
+ #include <sys/uio.h>
+ 
+ #include <asm/types.h>
+ #include <linux/filter.h>
+ #include <linux/if_ether.h>
++#include <linux/if_packet.h>
+ #include <netinet/in_systm.h>
+ #include "includes/netinet/ip.h"
+ #include "includes/netinet/udp.h"
+ #include "includes/netinet/if_ether.h"
+ 
++#ifndef PACKET_AUXDATA
++#define PACKET_AUXDATA 8
++
++struct tpacket_auxdata
++{
++	__u32		tp_status;
++	__u32		tp_len;
++	__u32		tp_snaplen;
++	__u16		tp_mac;
++	__u16		tp_net;
++};
++#endif
++
+ /* Reinitializes the specified interface after an address change.   This
+    is not required for packet-filter APIs. */
+ 
+@@ -69,10 +84,14 @@
+ 	struct interface_info *info;
+ {
+ 	int sock;
+-	struct sockaddr sa;
++	union {
++		struct sockaddr_ll ll;
++		struct sockaddr common;
++	} sa;
++	struct ifreq ifr;
+ 
+ 	/* Make an LPF socket. */
+-	if ((sock = socket(PF_PACKET, SOCK_PACKET,
++	if ((sock = socket(PF_PACKET, SOCK_RAW,
+ 			   htons((short)ETH_P_ALL))) < 0) {
+ 		if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
+ 		    errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
+@@ -87,11 +106,16 @@
+ 		log_fatal ("Open a socket for LPF: %m");
+ 	}
+ 
++	memset (&ifr, 0, sizeof ifr);
++	strncpy (ifr.ifr_name, (const char *)info -> ifp, sizeof ifr.ifr_name);
++	if (ioctl (sock, SIOCGIFINDEX, &ifr))
++		log_fatal ("Failed to get interface index: %m");
++
+ 	/* Bind to the interface name */
+ 	memset (&sa, 0, sizeof sa);
+-	sa.sa_family = AF_PACKET;
+-	strncpy (sa.sa_data, (const char *)info -> ifp, sizeof sa.sa_data);
+-	if (bind (sock, &sa, sizeof sa)) {
++	sa.ll.sll_family = AF_PACKET;
++	sa.ll.sll_ifindex = ifr.ifr_ifindex;
++	if (bind (sock, &sa.common, sizeof sa)) {
+ 		if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
+ 		    errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
+ 		    errno == EAFNOSUPPORT || errno == EINVAL) {
+@@ -171,9 +195,18 @@
+ void if_register_receive (info)
+ 	struct interface_info *info;
+ {
++	int val;
++
+ 	/* Open a LPF device and hang it on this interface... */
+ 	info -> rfdesc = if_register_lpf (info);
+ 
++	val = 1;
++	if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA, &val,
++			sizeof val) < 0) {
++		if (errno != ENOPROTOOPT)
++			log_fatal ("Failed to set auxiliary packet data: %m");
++	}
++
+ #if defined (HAVE_TR_SUPPORT)
+ 	if (info -> hw_address.hbuf [0] == HTYPE_IEEE802)
+ 		lpf_tr_filter_setup (info);
+@@ -291,7 +324,6 @@
+ 	double hh [16];
+ 	double ih [1536 / sizeof (double)];
+ 	unsigned char *buf = (unsigned char *)ih;
+-	struct sockaddr sa;
+ 	int result;
+ 	int fudge;
+ 
+@@ -309,15 +341,7 @@
+ 				(unsigned char *)raw, len);
+ 	memcpy (buf + ibufp, raw, len);
+ 
+-	/* For some reason, SOCK_PACKET sockets can't be connected,
+-	   so we have to do a sentdo every time. */
+-	memset (&sa, 0, sizeof sa);
+-	sa.sa_family = AF_PACKET;
+-	strncpy (sa.sa_data,
+-		 (const char *)interface -> ifp, sizeof sa.sa_data);
+-
+-	result = sendto (interface -> wfdesc,
+-			 buf + fudge, ibufp + len - fudge, 0, &sa, sizeof sa);
++	result = write (interface -> wfdesc, buf + fudge, ibufp + len - fudge);
+ 	if (result < 0)
+ 		log_error ("send_packet: %m");
+ 	return result;
+@@ -334,13 +358,34 @@
+ {
+ 	int length = 0;
+ 	int offset = 0;
++	int nocsum = 0;
+ 	unsigned char ibuf [1536];
+ 	unsigned bufix = 0;
++	unsigned char cmsgbuf[CMSG_LEN(sizeof(struct tpacket_auxdata))];
++	struct iovec iov = {
++		.iov_base = ibuf,
++		.iov_len = sizeof ibuf,
++	};
++	struct msghdr msg = {
++		.msg_iov = &iov,
++		.msg_iovlen = 1,
++		.msg_control = cmsgbuf,
++		.msg_controllen = sizeof(cmsgbuf),
++	};
++	struct cmsghdr *cmsg;
+ 
+-	length = read (interface -> rfdesc, ibuf, sizeof ibuf);
++	length = recvmsg (interface -> rfdesc, &msg, 0);
+ 	if (length <= 0)
+ 		return length;
+ 
++	for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
++		if (cmsg->cmsg_level == SOL_PACKET &&
++		    cmsg->cmsg_type == PACKET_AUXDATA) {
++			struct tpacket_auxdata *aux = (void *)CMSG_DATA(cmsg);
++			nocsum = aux->tp_status & TP_STATUS_CSUMNOTREADY;
++		}
++	}
++
+ 	bufix = 0;
+ 	/* Decode the physical header... */
+ 	offset = decode_hw_header (interface, ibuf, bufix, hfrom);
+@@ -357,7 +402,7 @@
+ 
+ 	/* Decode the IP and UDP headers... */
+ 	offset = decode_udp_ip_header (interface, ibuf, bufix, from,
+-				       (unsigned)length);
++				       (unsigned)length, nocsum);
+ 
+ 	/* If the IP or UDP checksum was bad, skip the packet... */
+ 	if (offset < 0)
+--- dhcp-3.0.5/common/nit.c.xen	2004-11-24 12:39:15.000000000 -0500
++++ dhcp-3.0.5/common/nit.c	2007-03-30 16:34:45.000000000 -0400
+@@ -370,7 +370,7 @@
+ 
+ 	/* Decode the IP and UDP headers... */
+ 	offset = decode_udp_ip_header (interface, ibuf, bufix,
+-				       from, length);
++				       from, length, 0);
+ 
+ 	/* If the IP or UDP checksum was bad, skip the packet... */
+ 	if (offset < 0)
+--- dhcp-3.0.5/common/packet.c.xen	2007-03-30 16:34:26.000000000 -0400
++++ dhcp-3.0.5/common/packet.c	2007-03-30 16:34:45.000000000 -0400
+@@ -211,12 +211,13 @@
+ 
+ /* UDP header and IP header decoded together for convenience. */
+ 
+-ssize_t decode_udp_ip_header (interface, buf, bufix, from, buflen)
++ssize_t decode_udp_ip_header (interface, buf, bufix, from, buflen, nocsum)
+ 	struct interface_info *interface;
+ 	unsigned char *buf;
+ 	unsigned bufix;
+ 	struct sockaddr_in *from;
+ 	unsigned buflen;
++	int nocsum;
+ {
+   unsigned char *data;
+   struct ip ip;
+@@ -319,7 +320,7 @@
+ 					       (u_int32_t)ulen))));
+ 
+   udp_packets_seen++;
+-  if (usum && usum != sum) {
++  if (!nocsum && usum && usum != sum) {
+ 	  udp_packets_bad_checksum++;
+ 	  if (udp_packets_seen > 4 &&
+ 	      (udp_packets_seen / udp_packets_bad_checksum) < 2) {
+--- dhcp-3.0.5/common/upf.c.xen	2004-11-24 12:39:16.000000000 -0500
++++ dhcp-3.0.5/common/upf.c	2007-03-30 16:34:45.000000000 -0400
+@@ -321,7 +321,7 @@
+ 
+ 	/* Decode the IP and UDP headers... */
+ 	offset = decode_udp_ip_header (interface, ibuf, bufix,
+-				       from, length);
++				       from, length, 0);
+ 
+ 	/* If the IP or UDP checksum was bad, skip the packet... */
+ 	if (offset < 0)
+--- dhcp-3.0.5/includes/dhcpd.h.xen	2007-03-30 16:34:26.000000000 -0400
++++ dhcp-3.0.5/includes/dhcpd.h	2007-03-30 16:34:45.000000000 -0400
+@@ -1988,7 +1988,7 @@
+ 				 unsigned, struct hardware *));
+ ssize_t decode_udp_ip_header PROTO ((struct interface_info *, unsigned char *,
+ 				     unsigned, struct sockaddr_in *,
+-				     unsigned));
++				     unsigned, int));
+ 
+ /* ethernet.c */
+ void assemble_ethernet_header PROTO ((struct interface_info *, unsigned char *,


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- dhcp.spec	9 Apr 2007 21:44:55 -0000	1.153
+++ dhcp.spec	11 Apr 2007 14:29:18 -0000	1.154
@@ -10,7 +10,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.5
-Release:  29%{?dist}
+Release:  30%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -51,6 +51,7 @@
 Patch18:  %{name}-3.0.5-prototypes.patch
 Patch19:  %{name}-3.0.5-manpages.patch
 Patch20:  %{name}-3.0.5-libdhcp4client.patch
+Patch21:  %{name}-3.0.5-xen-checksum.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: groff openldap-devel
@@ -210,6 +211,9 @@
 # Add the libdhcp4client target (library version of dhclient)
 %patch20 -p1 -b .libdhcp4client
 
+# Handle Xen partial UDP checksums
+%patch21 -p1 -b .xen
+
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 %{__install} -p -m 0644 %SOURCE6 .
 %{__install} -p -m 0644 %SOURCE7 doc
@@ -398,6 +402,9 @@
 %{_libdir}/libdhcp4client.so
 
 %changelog
+* Wed Apr 11 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-30
+- Enable Xen patch again, kernel bits present (#231444)
+
 * Tue Apr 10 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-29
 - Spec file cleanups (#225691)
 



From fedora-cvs-commits at redhat.com  Wed Apr 11 14:38:06 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 10:38:06 -0400
Subject: rpms/gamin/devel gamin-0.1.7-fallback.patch, NONE, 1.1 gamin.spec,
	1.57, 1.58
Message-ID: <200704111438.l3BEc6RH011322@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/gamin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11248

Modified Files:
	gamin.spec 
Added Files:
	gamin-0.1.7-fallback.patch 
Log Message:
* Wed Apr 11 2007 Alexander Larsson <alexl at redhat.com> - 0.1.8-5
- Add patch that handles inotify failing fallback (#233316)



gamin-0.1.7-fallback.patch:
 inotify-helper.c |    3 +--
 inotify-kernel.c |    2 +-
 inotify-path.c   |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE gamin-0.1.7-fallback.patch ---
diff -Naur gamin-0.1.7/server/inotify-helper.c gamin-0.1.7.new/server/inotify-helper.c
--- gamin-0.1.7/server/inotify-helper.c	2007-02-08 15:29:03.000000000 +0000
+++ gamin-0.1.7.new/server/inotify-helper.c	2007-02-08 15:33:50.000000000 +0000
@@ -87,14 +87,13 @@
 		return result;
 	}
 
-	initialized = TRUE;
-
 	result = ip_startup (ih_event_callback);
 	if (!result) {
 		g_warning( "Could not initialize inotify\n");
 		G_UNLOCK(inotify_lock);
 		return FALSE;
 	}
+	initialized = TRUE;
 	user_ecb = ecb;
 	user_fcb = fcb;
 	im_startup (ih_found_callback);
diff -Naur gamin-0.1.7/server/inotify-kernel.c gamin-0.1.7.new/server/inotify-kernel.c
--- gamin-0.1.7/server/inotify-kernel.c	2007-02-08 15:29:02.000000000 +0000
+++ gamin-0.1.7.new/server/inotify-kernel.c	2007-02-08 15:33:32.000000000 +0000
@@ -200,12 +200,12 @@
 		return inotify_instance_fd >= 0;
 	}
 
-	initialized = TRUE;
 	inotify_instance_fd = inotify_init ();
 
 	if (inotify_instance_fd < 0) {
 		return FALSE;
 	}
+	initialized = TRUE;
 
 	inotify_read_ioc = g_io_channel_unix_new(inotify_instance_fd);
 	ik_poll_fd.fd = inotify_instance_fd;
diff -Naur gamin-0.1.7/server/inotify-path.c gamin-0.1.7.new/server/inotify-path.c
--- gamin-0.1.7/server/inotify-path.c	2007-02-08 15:29:03.000000000 +0000
+++ gamin-0.1.7.new/server/inotify-path.c	2007-02-08 15:32:31.000000000 +0000
@@ -96,13 +96,13 @@
 		return result;
 	}
 
-	initialized = TRUE;
 	event_callback = cb;
 	result = ik_startup (ip_event_callback);
 
 	if (!result) {
 		return FALSE;
 	}
+	initialized = TRUE;
 
 	path_dir_hash = g_hash_table_new(g_str_hash, g_str_equal);
 	sub_dir_hash = g_hash_table_new(g_direct_hash, g_direct_equal);


Index: gamin.spec
===================================================================
RCS file: /cvs/dist/rpms/gamin/devel/gamin.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- gamin.spec	7 Mar 2007 11:11:47 -0000	1.57
+++ gamin.spec	11 Apr 2007 14:38:04 -0000	1.58
@@ -1,7 +1,7 @@
 Summary: Library providing the FAM File Alteration Monitor API
 Name: gamin
 Version: 0.1.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPL
 Group: Development/Libraries
 Source: gamin-%{version}.tar.gz
@@ -26,6 +26,7 @@
 
 Patch1:         gamin-0.1.7-fix-polling.patch
 Patch2:         gamin-conditional-poll.patch
+Patch3:         gamin-0.1.7-fallback.patch
 
 %description devel
 This C library provides an API and ABI compatible file alteration
@@ -47,6 +48,7 @@
 
 %patch1 -p1 -b .fix-polling
 %patch2 -p0 -b .conditional-poll
+%patch3 -p1 -b .fallback
 
 %build
 autoreconf --force --install
@@ -95,6 +97,9 @@
 %doc doc/python.html
 
 %changelog
+* Wed Apr 11 2007 Alexander Larsson <alexl at redhat.com> - 0.1.8-5
+- Add patch that handles inotify failing fallback (#233316)
+
 * Wed Mar  7 2007 Alexander Larsson <alexl at redhat.com> - 0.1.8-4
 - Add patch to fix #204906
 



From fedora-cvs-commits at redhat.com  Wed Apr 11 14:53:16 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 10:53:16 -0400
Subject: rpms/nautilus/devel .cvsignore, 1.52, 1.53 nautilus.spec, 1.147,
	1.148 sources, 1.56, 1.57
Message-ID: <200704111453.l3BErGcc022578@cvs.devel.redhat.com>

Author: alexl

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

Modified Files:
	.cvsignore nautilus.spec sources 
Log Message:
* Wed Apr 11 2007 Alexander Larsson <alexl at redhat.com> - 2.18.1-1
- Update to 2.18.1




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	12 Mar 2007 13:53:28 -0000	1.52
+++ .cvsignore	11 Apr 2007 14:53:14 -0000	1.53
@@ -1 +1 @@
-nautilus-2.18.0.1.tar.bz2
+nautilus-2.18.1.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- nautilus.spec	26 Mar 2007 23:13:50 -0000	1.147
+++ nautilus.spec	11 Apr 2007 14:53:14 -0000	1.148
@@ -18,8 +18,8 @@
 
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME
-Version: 	2.18.0.1
-Release:	2%{?dist}
+Version: 	2.18.1
+Release:	1%{?dist}
 License: 	GPL
 Group:          User Interface/Desktops
 Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/2.17/%{name}-%{version}.tar.bz2
@@ -221,6 +221,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Apr 11 2007 Alexander Larsson <alexl at redhat.com> - 2.18.1-1
+- Update to 2.18.1
+
 * Mon Mar 26 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0.1-2
 - Update icon caches (#234020)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	12 Mar 2007 13:53:28 -0000	1.56
+++ sources	11 Apr 2007 14:53:14 -0000	1.57
@@ -1 +1 @@
-a4e98623e326c5daa201564eed218594  nautilus-2.18.0.1.tar.bz2
+e4718f37080b7d98cd5707e617d43ae6  nautilus-2.18.1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 11 15:00:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 11:00:45 -0400
Subject: rpms/gnome-python2-extras/devel gnome-python2-extras.spec,1.2,1.3
Message-ID: <200704111500.l3BF0j1K028018@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	gnome-python2-extras.spec 
Log Message:

* Wed Apr 11 2007 Matthew Barnes <mbarnes at redhat.com> - 2.14.3-2.fc7
- Rebuild against firefox-2.0.0.3.
- Require exactly 2.0.0.3 so we're notified of dependency breaks.



Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/gnome-python2-extras.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-python2-extras.spec	25 Feb 2007 21:37:57 -0000	1.2
+++ gnome-python2-extras.spec	11 Apr 2007 15:00:42 -0000	1.3
@@ -5,14 +5,14 @@
 %define gnome_panel_version 2.2.0
 %define gnome_python_version 2.9.0
 %define gtkhtml2_version 2.3.1
-%define firefox_version 2.0
+%define firefox_version 2.0.0.3
 %define gtkspell_version 2.0.7
 
 ### Abstract ###
 
 Name: gnome-python2-extras
 Version: 2.14.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL/LGPL
 Group: Development/Languages
 Summary: The sources for additional. PyGNOME Python extension modules.
@@ -30,7 +30,7 @@
 
 ### Build Dependencies ###
 
-BuildRequires: firefox-devel >= %{firefox_version}
+BuildRequires: firefox-devel = %{firefox_version}
 BuildRequires: glib2 >= %{glib_version}
 BuildRequires: gnome-panel-devel >= %{gnome_panel_version}
 BuildRequires: gnome-python2-devel >= %{gnome_python_version}
@@ -79,7 +79,7 @@
 %package -n gnome-python2-gtkmozembed
 Summary: Python bindings for interacting with gtkmozembed
 Group: Development/Languages
-Requires: firefox >= %{firefox_version}
+Requires: firefox = %{firefox_version}
 
 %description -n gnome-python2-gtkmozembed
 This module contains a wrapper that allows the use of gtkmozembed
@@ -136,6 +136,10 @@
 %{_datadir}/gtk-doc/html/pygtkmozembed
 
 %changelog
+* Wed Apr 11 2007 Matthew Barnes <mbarnes at redhat.com> - 2.14.3-2.fc7
+- Rebuild against firefox-2.0.0.3.
+- Require exactly 2.0.0.3 so we're notified of dependency breaks.
+
 * Sun Feb 25 2007 Matthew Barnes <mbarnes at redhat.com> - 2.14.3-1.fc7
 - Update to 2.14.3
 



From fedora-cvs-commits at redhat.com  Wed Apr 11 15:07:12 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 11:07:12 -0400
Subject: rpms/nautilus/devel
	nautilus-2.18.0.1-file-and-directory-list-leak.patch, NONE,
	1.1 nautilus.spec, 1.148, 1.149
Message-ID: <200704111507.l3BF7CFx000362@cvs.devel.redhat.com>

Author: alexl

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

Modified Files:
	nautilus.spec 
Added Files:
	nautilus-2.18.0.1-file-and-directory-list-leak.patch 
Log Message:
* Wed Apr 11 2007 Alexander Larsson <alexl at redhat.com> - 2.18.1-2
- Fix memleak (#235696)


nautilus-2.18.0.1-file-and-directory-list-leak.patch:
 fm-directory-view.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE nautilus-2.18.0.1-file-and-directory-list-leak.patch ---
--- nautilus-2.18.0.1/src/file-manager/fm-directory-view.c.file-and-directory-list-leak	2007-04-09 19:28:53.000000000 +0200
+++ nautilus-2.18.0.1/src/file-manager/fm-directory-view.c	2007-04-09 19:29:04.000000000 +0200
@@ -519,6 +519,8 @@
 	for (l = list; l != NULL; l = l->next) {
 		file_and_directory_free (l->data);
 	}
+
+	g_list_free (list);
 }
 
 static gboolean


Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- nautilus.spec	11 Apr 2007 14:53:14 -0000	1.148
+++ nautilus.spec	11 Apr 2007 15:07:10 -0000	1.149
@@ -19,7 +19,7 @@
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME
 Version: 	2.18.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License: 	GPL
 Group:          User Interface/Desktops
 Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/2.17/%{name}-%{version}.tar.bz2
@@ -82,6 +82,9 @@
 
 Patch7:         nautilus-xdg-user-dirs.patch
 
+#backport from svn
+Patch8:         nautilus-2.18.0.1-file-and-directory-list-leak.patch
+
 %description
 Nautilus integrates access to files, applications, media,
 Internet-based resources and the Web. Nautilus delivers a dynamic and
@@ -115,6 +118,7 @@
 %patch5 -p1 -b .selinux
 %patch6 -p1 -b .dynamic-search
 %patch7 -p0 -b .xdg-user-dirs
+%patch8 -p1 -b .xdg-user-dirs
 
 %build
 
@@ -221,6 +225,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Apr 11 2007 Alexander Larsson <alexl at redhat.com> - 2.18.1-2
+- Fix memleak (#235696)
+
 * Wed Apr 11 2007 Alexander Larsson <alexl at redhat.com> - 2.18.1-1
 - Update to 2.18.1
 



From fedora-cvs-commits at redhat.com  Wed Apr 11 15:15:08 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 11:15:08 -0400
Subject: rpms/gnome-vfs2/devel .cvsignore, 1.47, 1.48 gnome-vfs2.spec, 1.153,
	1.154 sources, 1.49, 1.50
Message-ID: <200704111515.l3BFF89u006574@cvs.devel.redhat.com>

Author: alexl

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

Modified Files:
	.cvsignore gnome-vfs2.spec sources 
Log Message:
* Wed Apr 11 2007 Alexander Larsson <alexl at redhat.com> - 2.18.1-1
- Update to 2.18.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	13 Mar 2007 12:50:40 -0000	1.47
+++ .cvsignore	11 Apr 2007 15:15:06 -0000	1.48
@@ -1 +1 @@
-gnome-vfs-2.18.0.1.tar.bz2
+gnome-vfs-2.18.1.tar.bz2


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- gnome-vfs2.spec	13 Mar 2007 12:50:40 -0000	1.153
+++ gnome-vfs2.spec	11 Apr 2007 15:15:06 -0000	1.154
@@ -13,7 +13,7 @@
 
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
-Version: 2.18.0.1
+Version: 2.18.1
 Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
@@ -229,6 +229,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Wed Apr 11 2007 Alexander Larsson <alexl at redhat.com> - 2.18.1-1
+- Update to 2.18.1
+
 * Tue Mar 13 2007 Alexander Larsson <alexl at redhat.com> - 2.18.0.1-1
 - Update to 2.18.0.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	13 Mar 2007 12:50:40 -0000	1.49
+++ sources	11 Apr 2007 15:15:06 -0000	1.50
@@ -1 +1 @@
-0b7a6ab495c0d94c3db00a7b0321adbf  gnome-vfs-2.18.0.1.tar.bz2
+bf4a6d95180d05981893e5d021c6695c  gnome-vfs-2.18.1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 11 15:23:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 11:23:09 -0400
Subject: rpms/rhythmbox/devel rhythmbox-iradio-initial.pls, NONE,
	1.1 rhythmbox.spec, 1.108, 1.109
Message-ID: <200704111523.l3BFN9HM012410@cvs.devel.redhat.com>

Author: bnocera

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

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-iradio-initial.pls 
Log Message:
* Wed Apr 11 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-4.fc7
- Provide some quality Ogg radios in the default iRadio catalogue
  (#229677)



--- NEW FILE rhythmbox-iradio-initial.pls ---
[playlist]

# http://www.wknc.org/listen.php
file1=http://wknc.org:8000/wknclq.ogg.m3u
title1=WKNC 88.1 FM (NC State) (Modem)
genre1=Music

file2=http://wknc.org:8000/wkncmq.ogg.m3u
title2=WKNC 88.1 FM (NC State) (Broadband)
genre2=Music

# http://www.virginradio.co.uk/listen/
file3=http://www.smgradio.com/core/audio/ogg/live.pls?service=vr
title3=Virgin Radio UK (Modem)
genre3=Pop

file4=http://www.smgradio.com/core/audio/ogg/live.pls?service=vrbb
title4=Virgin Radio UK (Broadband)
genre4=Pop

# http://xtreme.virginradio.co.uk/thestation/listen/index.html
file5=http://www.smgradio.com/core/audio/ogg/live.pls?service=vx
title5=Virgin Xtreme (Modem)
genre5=Modern Rock

file6=http://www.smgradio.com/core/audio/ogg/live.pls?service=vxbb
title6=Virgin Xtreme (Broadband)
genre6=Modern Rock

# http://classicrock.virginradio.co.uk/thestation/listen/index.html
file7=http://www.smgradio.com/core/audio/ogg/live.pls?service=vc
title7=Virgin Classic Rock (Modem)
genre7=Rock'n'Roll

file8=http://www.smgradio.com/core/audio/ogg/live.pls?service=vcbb
title8=Virgin Classic Rock (Broadband)
genre8=Rock'n'Roll

# http://www.cbc.ca/listen/ogg.html
file9=http://www.cbc.ca/livemedia/cbcr1-toronto.m3u
title9=CBC Radio One (Canada)
genre9=General

file10=http://www.cbc.ca/livemedia/cbcr2-toronto.m3u
title10=CBC Radio Two (Canada)
genre10=General

# http://www.nrk.no/lyd/
file11=http://media.hiof.no/streams/m3u/nrk-p1-172.ogg.m3u
title11=NRK P1 (Norway)
genre11=General

file12=http://media.hiof.no/streams/m3u/nrk-p2-172.ogg.m3u
title12=NRK P2 (Norway)
genre12=General

file13=http://media.hiof.no/streams/m3u/nrk-petre-172.ogg.m3u
title13=NRK P3 (Norway)
genre13=General

file14=http://media.hiof.no/streams/m3u/nrk-alltid-nyheter-172.ogg.m3u
title14=NRK Alltid Nyheter (Norway)
genre14=

file15=http://media.hiof.no/streams/m3u/nrk-mpetre-172.ogg.m3u
title15=NRK mP3 (Norway)
genre15=

file16=http://media.hiof.no/streams/m3u/nrk-alltid-klassisk-172.ogg.m3u
title16=NRK Alltid Klassisk (Norway)
genre16=

file17=http://media.hiof.no/streams/m3u/nrk-stortinget-172.ogg.m3u
title17=NRK Stortinget (Norway)
genre17=



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- rhythmbox.spec	11 Apr 2007 10:21:29 -0000	1.108
+++ rhythmbox.spec	11 Apr 2007 15:23:07 -0000	1.109
@@ -3,11 +3,12 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.10.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.9/%{name}-%{version}.tar.bz2
+Source1: rhythmbox-iradio-initial.pls
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: gtk2 >= 2.4.0
 Requires: libgnomeui >= 2.6.0
@@ -85,9 +86,8 @@
 
 %find_lang %name
 
-# Default internet radio stations use mp3
-rm %{buildroot}%{_libdir}/rhythmbox/plugins/iradio/iradio-initial.pls
-touch %{buildroot}%{_libdir}/rhythmbox/plugins/iradio/iradio-initial.pls
+# Replace the default radios with Ogg Radios
+cp -a %{SOURCE1} %{buildroot}%{_libdir}/rhythmbox/plugins/iradio/iradio-initial.pls
 
 # Don't package api docs
 rm -rf %{buildroot}/%{_datadir}/gtk-doc/
@@ -144,6 +144,10 @@
 %{_libexecdir}/rhythmbox-metadata
 
 %changelog
+* Wed Apr 11 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-4.fc7
+- Provide some quality Ogg radios in the default iRadio catalogue
+  (#229677)
+
 * Wed Apr 11 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-3.fc7
 - Add requires for gnome-themes, spotted by Nigel Jones (#235818)
 



From fedora-cvs-commits at redhat.com  Wed Apr 11 15:34:06 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 11:34:06 -0400
Subject: rpms/mdadm/devel mdadm.spec,1.41,1.42
Message-ID: <200704111534.l3BFY6Tx020561@cvs.devel.redhat.com>

Author: dledford

Update of /cvs/dist/rpms/mdadm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20513

Modified Files:
	mdadm.spec 
Log Message:
* Wed Apr 11 2007 Doug Ledford <dledford at redhat.com> - 2.6.1-3
- Various cleanups as part of merge review process
- Related: bz226134



Index: mdadm.spec
===================================================================
RCS file: /cvs/dist/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- mdadm.spec	31 Mar 2007 13:45:58 -0000	1.41
+++ mdadm.spec	11 Apr 2007 15:34:04 -0000	1.42
@@ -1,7 +1,7 @@
 Summary:     mdadm controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     2.6.1
-Release:     2%{?dist}
+Release:     3%{?dist}
 Source:      http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz
 Source1:     mdmonitor.init
 Patch1:	     mdadm-1.5.0-email.patch
@@ -9,12 +9,16 @@
 Patch3:      mdadm-2.5.2-static.patch
 Patch4:      mdadm-2.2-nodiet.patch
 Patch5:      mdadm-2.5.2-cflags.patch
+Patch6:      mdadm-2.6.1-build.patch
 URL:         http://www.cse.unsw.edu.au/~neilb/source/mdadm/
 License:     GPL
 Group:       System Environment/Base
-BuildRoot:   %{_tmppath}/%{name}-root
+BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:   mdctl,raidtools
 Requires:    smtpdaemon
+Requires(post): /sbin/service, /sbin/chkconfig
+Requires(preun): /sbin/service, /sbin/chkconfig
+Requires(postun): /sbin/service
 
 %description 
 mdadm is used to create, manage, and monitor Linux MD (software RAID)
@@ -30,13 +34,15 @@
 %patch3 -p1 -b .static
 %patch4 -p1 -b .nodiet
 %patch5 -p1 -b .cflags
+%patch6 -p1 -b .build
 
 %build
-make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" MDASSEMBLE_AUTO=1 mdadm mdadm.static mdassemble.static
+make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" MDASSEMBLE_AUTO=1 mdassemble.static mdassemble mdadm.static mdadm
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin install
-install -D -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/mdmonitor
+install -Dp -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/mdmonitor
 
 mkdir -p -m 700 $RPM_BUILD_ROOT/var/run/mdadm
 
@@ -69,13 +75,17 @@
 
 %files
 %defattr(-,root,root)
-%doc ANNOUNCE-* TODO ChangeLog mdadm.conf-example COPYING misc/*
+%doc TODO ChangeLog mdadm.conf-example COPYING misc/*
 /sbin/*
 %{_initrddir}/*
 %{_mandir}/man*/md*
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Wed Apr 11 2007 Doug Ledford <dledford at redhat.com> - 2.6.1-3
+- Various cleanups as part of merge review process
+- Related: bz226134
+
 * Sat Mar 31 2007 Doug Ledford <dledford at redhat.com> - 2.6.1-2
 - Oops, missing a dependency in the Makefile
 
@@ -190,7 +200,7 @@
 - add patch with reallyforce mode on creation to be used by anaconda
 
 * Wed May 12 2004 Doug Ledford <dledford at redhat.com> 2.5.0-6
-- Fix a bug in the %postun scriptlet related to downgrading to a version
+- Fix a bug in the postun scriptlet related to downgrading to a version
   of mdadm that doesn't include the mdmpd daemon.
 
 * Fri May 07 2004 Doug Ledford <dledford at redhat.com> 1.5.0-5



From fedora-cvs-commits at redhat.com  Wed Apr 11 15:34:25 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 11:34:25 -0400
Subject: rpms/mdadm/devel mdadm-2.6.1-build.patch,NONE,1.1
Message-ID: <200704111534.l3BFYPKg020821@cvs.devel.redhat.com>

Author: dledford

Update of /cvs/dist/rpms/mdadm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20780

Added Files:
	mdadm-2.6.1-build.patch 
Log Message:
* Wed Apr 11 2007 Doug Ledford <dledford at redhat.com> - 2.6.1-3
- Various cleanups as part of merge review process
- Related: bz226134


mdadm-2.6.1-build.patch:
 Makefile |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

--- NEW FILE mdadm-2.6.1-build.patch ---
--- mdadm-2.6.1/Makefile.build	2007-04-11 11:12:46.000000000 -0400
+++ mdadm-2.6.1/Makefile	2007-04-11 11:18:54.000000000 -0400
@@ -100,9 +100,11 @@ mdadm.static : $(OBJS) $(STATICOBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -static -o mdadm.static $(OBJS) $(STATICOBJS)
 
 mdadm.tcc : $(SRCS) mdadm.h
+	rm -f $(OBJS)
 	$(TCC) -o mdadm.tcc $(SRCS)
 
 mdadm.uclibc : $(SRCS) mdadm.h
+	rm -f $(OBJS) $(STATICOBJS)
 	$(UCLIBC_GCC) -DUCLIBC -DHAVE_STDINT_H -o mdadm.uclibc $(SRCS) $(STATICSRC)
 
 mdadm.klibc : $(SRCS) mdadm.h
@@ -113,15 +115,15 @@ test_stripe : restripe.c mdadm.h
 	$(CC) $(CXFLAGS) $(LDFLAGS) -o test_stripe -DMAIN restripe.c
 
 mdassemble : $(ASSEMBLE_SRCS) mdadm.h
-	rm -f $(OBJS)
-	$(DIET_GCC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS)  $(STATICSRC)
+	rm -f $(OBJS) $(STATICOBJS)
+	$(CC) $(ASSEMBLE_FLAGS) $(LDFLAGS) -DHAVE_STDINT_H -o mdassemble.static $(ASSEMBLE_SRCS) $(STATICSRC)
 
-mdassemble.static : $(ASSEMBLE_SRCS) mdadm.h
-	rm -f $(OBJS)
+mdassemble.static : $(ASSEMBLE_SRCS) $(STATICSRC) mdadm.h
+	rm -f $(OBJS) $(STATICOBJS)
 	$(CC) $(ASSEMBLE_FLAGS) $(LDFLAGS) -static -DHAVE_STDINT_H -o mdassemble.static $(ASSEMBLE_SRCS) $(STATICSRC)
 
-mdassemble.uclibc : $(ASSEMBLE_SRCS) mdadm.h
-	rm -f $(OJS)
+mdassemble.uclibc : $(ASSEMBLE_SRCS) $(STATICSRC) mdadm.h
+	rm -f $(OBJS) $(STATICOBJS)
 	$(UCLIBC_GCC) $(ASSEMBLE_FLAGS) -DUCLIBC -DHAVE_STDINT_H -static -o mdassemble.uclibc $(ASSEMBLE_SRCS) $(STATICSRC)
 
 # This doesn't work
@@ -164,10 +166,10 @@ install-klibc : mdadm.klibc install-man
 	$(INSTALL) -D -m 755 mdadm.klibc $(DESTDIR)$(BINDIR)/mdadm
 
 install-man: mdadm.8 mdassemble.8 md.4 mdadm.conf.5
-	$(INSTALL) -D -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR)/mdadm.8
-	$(INSTALL) -D -m 644 mdassemble.8 $(DESTDIR)$(MAN8DIR)/mdassemble.8
-	$(INSTALL) -D -m 644 md.4 $(DESTDIR)$(MAN4DIR)/md.4
-	$(INSTALL) -D -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5
+	$(INSTALL) -Dp -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR)/mdadm.8
+	$(INSTALL) -Dp -m 644 mdassemble.8 $(DESTDIR)$(MAN8DIR)/mdassemble.8
+	$(INSTALL) -Dp -m 644 md.4 $(DESTDIR)$(MAN4DIR)/md.4
+	$(INSTALL) -Dp -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5
 
 uninstall:
 	rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 md.4 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm



From fedora-cvs-commits at redhat.com  Wed Apr 11 15:44:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 11:44:49 -0400
Subject: rpms/bind/devel bind.spec,1.170,1.171
Message-ID: <200704111544.l3BFin86018055@cvs.devel.redhat.com>

Author: atkac

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

Modified Files:
	bind.spec 
Log Message:
dnssec-signzone's -d option now works correctly



Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- bind.spec	10 Apr 2007 17:26:22 -0000	1.170
+++ bind.spec	11 Apr 2007 15:44:47 -0000	1.171
@@ -17,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.4.0
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Epoch:   	31
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,6 +76,7 @@
 Patch52:	bind-9.3.3-edns.patch
 Patch61:        bind-9.3.4-sdb-sqlite-src.patch
 Patch62:        bind-9.4.0-sdb-sqlite-bld.patch
+Patch63:	bind-9.4.0-dnssec-directory.patch
 #
 Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2, mktemp
 Requires(post): grep, chkconfig >= 1.3.26
@@ -283,6 +284,7 @@
 %if %{SDB}
 %patch62 -p1 -b .sdb-sqlite-bld
 %endif
+%patch63 -p1 -b .directory
 :;
 
 
@@ -759,6 +761,9 @@
 %endif
 
 %changelog
+* Wed Apr 11 2007 Adam Tkac <atkac redhat com> 31:9.4.0-5.fc7
+- dnssec-signzone utility now doesn't ignore -d parameter
+
 * Tue Apr 10 2007 Adam Tkac <atkac redhat com> 31:9.4.0-4.fc7
 - removed query-source[-v6] options from caching-nameserver config
   (#209954, increase security)



From fedora-cvs-commits at redhat.com  Wed Apr 11 15:52:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 11:52:43 -0400
Subject: rpms/sysklogd/devel sysklogd-1.4.2rh-includeFacPri.patch, 1.1,
	1.2 sysklogd.spec, 1.52, 1.53
Message-ID: <200704111552.l3BFqhFx018211@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/sysklogd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18195

Modified Files:
	sysklogd-1.4.2rh-includeFacPri.patch sysklogd.spec 
Log Message:
some fixes of previous release (#223573)


sysklogd-1.4.2rh-includeFacPri.patch:
 sysklogd.8 |    6 ++++++
 syslogd.c  |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 59 insertions(+), 5 deletions(-)

Index: sysklogd-1.4.2rh-includeFacPri.patch
===================================================================
RCS file: /cvs/dist/rpms/sysklogd/devel/sysklogd-1.4.2rh-includeFacPri.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sysklogd-1.4.2rh-includeFacPri.patch	26 Mar 2007 10:08:36 -0000	1.1
+++ sysklogd-1.4.2rh-includeFacPri.patch	11 Apr 2007 15:52:41 -0000	1.2
@@ -1,5 +1,5 @@
 --- sysklogd-1.4.2rh/sysklogd.8.includeFacPri	2007-02-26 10:46:08.000000000 +0100
-+++ sysklogd-1.4.2rh/sysklogd.8	2007-03-26 11:53:35.000000000 +0200
++++ sysklogd-1.4.2rh/sysklogd.8	2007-04-11 17:46:34.000000000 +0200
 @@ -172,6 +172,12 @@
  no domain would be cut, you will have to specify two domains like:
  .BR "\-s north.de:infodrom.north.de" .
@@ -13,8 +13,8 @@
  .B "\-v"
  Print version and exit.
  .TP
---- sysklogd-1.4.2rh/syslogd.c.includeFacPri	2007-03-26 11:46:00.000000000 +0200
-+++ sysklogd-1.4.2rh/syslogd.c	2007-03-26 11:56:50.000000000 +0200
+--- sysklogd-1.4.2rh/syslogd.c.includeFacPri	2007-04-11 17:46:34.000000000 +0200
++++ sysklogd-1.4.2rh/syslogd.c	2007-04-11 17:47:30.000000000 +0200
 @@ -755,6 +755,8 @@
  char	**LocalHosts = NULL;	/* these hosts are logged with their hostname */
  int	NoHops = 1;		/* Can we bounce syslog messages through an
@@ -103,14 +103,23 @@
 +		v->iov_base = fp_buf;
 +		v->iov_len = strlen(fp_buf);
 +	} else {
-+		v->iov_base = " ";
-+		v->iov_len = 1;
++		v->iov_base = "";
++		v->iov_len = 0;
 +	}
 +	v++;
 +
  	v->iov_base = f->f_prevhost;
  	v->iov_len = strlen(v->iov_base);
  	v++;
+@@ -1865,7 +1913,7 @@
+ 		else {
+ 			f->f_time = now;
+ 			(void) snprintf(line, sizeof(line), "<%d>%s\n", f->f_prevpri, \
+-				(char *) iov[4].iov_base);
++				(char *) iov[5].iov_base);
+ 			l = strlen(line);
+ 			if (l > MAXLINE)
+ 				l = MAXLINE;
 @@ -1929,7 +1977,7 @@
  		if (f->f_file == -1)
  			break;


Index: sysklogd.spec
===================================================================
RCS file: /cvs/dist/rpms/sysklogd/devel/sysklogd.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sysklogd.spec	26 Mar 2007 10:08:36 -0000	1.52
+++ sysklogd.spec	11 Apr 2007 15:52:41 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: System logging and kernel message trapping daemons
 Name: sysklogd
 Version: 1.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.infodrom.org/projects/sysklogd/
@@ -103,6 +103,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Apr 11 2007 Peter Vrabec <pvrabec at redhat.com> 1.4.2-4
+- some fixes of previous release (#223573)
+
 * Mon Mar 26 2007 Peter Vrabec <pvrabec at redhat.com> 1.4.2-3
 - include priority/facility in message (#223573)
 



From fedora-cvs-commits at redhat.com  Wed Apr 11 15:57:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 11:57:49 -0400
Subject: rpms/bind/devel bind-9.4.0-dnssec-directory.patch,NONE,1.1
Message-ID: <200704111557.l3BFvniI018368@cvs.devel.redhat.com>

Author: atkac

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

Added Files:
	bind-9.4.0-dnssec-directory.patch 
Log Message:
forgot add patch file :)


bind-9.4.0-dnssec-directory.patch:
 dnssec-signzone.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE bind-9.4.0-dnssec-directory.patch ---
--- bind-9.4.0/bin/dnssec/dnssec-signzone.c.directory	2007-04-11 15:42:56.000000000 +0200
+++ bind-9.4.0/bin/dnssec/dnssec-signzone.c	2007-04-11 15:43:23.000000000 +0200
@@ -1470,8 +1470,8 @@
 		fatal("failed to find the zone's origin: %s",
 		      isc_result_totext(result));
 
-	result = dns_dnssec_findzonekeys(db, currentversion, node, gorigin,
-					 mctx, 20, keys, &nkeys);
+	result = dns_dnssec_findzonekeys2(db, currentversion, node, gorigin,
+					 directory, mctx, 20, keys, &nkeys);
 	if (result == ISC_R_NOTFOUND)
 		result = ISC_R_SUCCESS;
 	if (result != ISC_R_SUCCESS)



From fedora-cvs-commits at redhat.com  Wed Apr 11 16:00:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 12:00:18 -0400
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.154,1.155
Message-ID: <200704111600.l3BG0IYk018506@cvs.devel.redhat.com>

Author: alexl

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

Modified Files:
	gnome-vfs2.spec 
Log Message:
* Wed Apr 11 2007 Alexander Larsson <alexl at redhat.com> - 2.18.1-2
- Require libsmbclient, not samba-common



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- gnome-vfs2.spec	11 Apr 2007 15:15:06 -0000	1.154
+++ gnome-vfs2.spec	11 Apr 2007 16:00:16 -0000	1.155
@@ -14,7 +14,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.18.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source0: http://ftp.gnome.org/pub/gnome/source/gnome-vfs/2.17/gnome-vfs-%{version}.tar.bz2
@@ -39,7 +39,7 @@
 BuildRequires: autoconf
 BuildRequires: gtk-doc >= %{gtkdoc_version}
 BuildRequires: perl-XML-Parser >= %{perl_XML_Parser_version}
-BuildRequires: samba-common >= %{samba_version}
+BuildRequires: libsmbclient-devel >= %{samba_version}
 BuildRequires: openssl-devel gamin-devel
 BuildRequires: krb5-devel
 BuildRequires: avahi-glib-devel >= %{avahi_version}
@@ -100,7 +100,7 @@
 Summary: Windows fileshare support for gnome-vfs
 Group: System Environment/Libraries
 Requires:   %{name} = %{version}-%{release}
-Requires: samba-common >= %{samba_version}
+Requires: libsmbclient >= %{samba_version}
 Obsoletes:     gnome-vfs2-extras
 Provides:     gnome-vfs2-extras
 
@@ -229,6 +229,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Wed Apr 11 2007 Alexander Larsson <alexl at redhat.com> - 2.18.1-2
+- Require libsmbclient, not samba-common
+
 * Wed Apr 11 2007 Alexander Larsson <alexl at redhat.com> - 2.18.1-1
 - Update to 2.18.1
 



From fedora-cvs-commits at redhat.com  Wed Apr 11 16:30:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 12:30:57 -0400
Subject: rpms/hplip/FC-6 hplip-broken-conf.patch, 1.1, NONE hplip-guest.patch,
	1.1, NONE hplip-loop.patch, 1.1, NONE hplip-out-of-paper.patch,
	1.1, NONE hplip-sane-debug.patch, 1.2, NONE
Message-ID: <200704111630.l3BGUvGb019247@cvs.devel.redhat.com>

Author: twaugh

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

Removed Files:
	hplip-broken-conf.patch hplip-guest.patch hplip-loop.patch 
	hplip-out-of-paper.patch hplip-sane-debug.patch 
Log Message:
Unused patches


--- hplip-broken-conf.patch DELETED ---


--- hplip-guest.patch DELETED ---


--- hplip-loop.patch DELETED ---


--- hplip-out-of-paper.patch DELETED ---


--- hplip-sane-debug.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 11 16:33:54 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 12:33:54 -0400
Subject: rpms/parted/devel parted-1.8.6-off-by-one.patch, NONE,
	1.1 parted.spec, 1.104, 1.105
Message-ID: <200704111633.l3BGXsDO001531@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/parted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1486

Modified Files:
	parted.spec 
Added Files:
	parted-1.8.6-off-by-one.patch 
Log Message:
* Wed Apr 11 2007 David Cantrell <dcantrell at redhat.com> - 1.8.6-3
- Fix off-by-one bug in parted(8) when displaying disk label (#235901)


parted-1.8.6-off-by-one.patch:
 parted.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE parted-1.8.6-off-by-one.patch ---
--- parted-1.8.6/parted/parted.c.offbyone	2007-04-11 12:13:06.000000000 -0400
+++ parted-1.8.6/parted/parted.c	2007-04-11 12:13:21.000000000 -0400
@@ -1217,6 +1217,7 @@
 static int
 do_print (PedDevice** dev)
 {
+        PedUnit         default_unit;
         PedDisk*        disk;
         Table*          table;
         StrList*        row;
@@ -1303,11 +1304,12 @@
         }
 
         start = ped_unit_format (*dev, 0);
+        default_unit = ped_unit_get_default ();
         end = ped_unit_format_byte (*dev, (*dev)->length * (*dev)->sector_size
-                                          - 1 );
+         - (default_unit == PED_UNIT_CHS || default_unit == PED_UNIT_CYLINDER));
         
         if (opt_machine_mode) {
-            switch (ped_unit_get_default ()) {
+            switch (default_unit) {
                 case PED_UNIT_CHS:      puts ("CHS;");
                                         break;
                 case PED_UNIT_CYLINDER: puts ("CYL;");


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- parted.spec	21 Mar 2007 15:02:34 -0000	1.104
+++ parted.spec	11 Apr 2007 16:33:52 -0000	1.105
@@ -4,20 +4,24 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 1.8.6
-Release: 2%{?dist}
+Release: 3%{?dist}
+License: GPL
+Group:   Applications/System
 Source:  ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
 
-Patch0: %{name}-%{version}-warnings.patch
-Patch1: %{name}-%{version}-notransname.patch
+Patch0: %{name}-1.8.6-warnings.patch
+Patch1: %{name}-1.8.6-notransname.patch
+Patch2: %{name}-1.8.6-off-by-one.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-License: GPL
-Group: Applications/System
 BuildRequires: e2fsprogs-devel readline-devel ncurses-devel
 BuildRequires: automake libtool gettext-devel texinfo
 BuildRequires: device-mapper-devel, libselinux-devel libsepol-devel
 
-Prereq: /sbin/install-info
+Requires(post): /sbin/ldconfig
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
+Requires(postun): /sbin/ldconfig
 
 %description
 The GNU Parted program allows you to create, destroy, resize, move,
@@ -26,8 +30,8 @@
 to new hard disks.
 
 %package devel
-Summary: Files for developing apps which will manipulate disk partitions.
-Group: Development/Libraries
+Summary:  Files for developing apps which will manipulate disk partitions.
+Group:    Development/Libraries
 Requires: %{name} = %{version}-%{release}
 %description devel
 The GNU Parted library is a set of routines for hard disk partition
@@ -39,6 +43,7 @@
 %setup -q
 %patch0 -p1 -b .warnings
 %patch1 -p1 -b .notransname
+%patch2 -p1 -b .offbyone
 
 %build
 %configure --enable-device-mapper --enable-selinux
@@ -55,17 +60,16 @@
 %clean
 %{__rm} -rf %{buildroot}
 
-%post 
+%post
 /sbin/ldconfig
 /sbin/install-info %{_infodir}/parted.info.gz %{_infodir}/dir || :
 
 %preun
-if [ "$1" = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/parted.info.gz %{_infodir}/dir
+if [ $1 = 0 ]; then
+    /sbin/install-info --delete %{_infodir}/parted.info.gz %{_infodir}/dir >/dev/null 2>&1 || :
 fi
-exit 0
 
-%postun -p /sbin/ldconfig 
+%postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -86,6 +90,9 @@
 %{_libdir}/pkgconfig/libparted.pc
 
 %changelog
+* Wed Apr 11 2007 David Cantrell <dcantrell at redhat.com> - 1.8.6-3
+- Fix off-by-one bug in parted(8) when displaying disk label (#235901)
+
 * Wed Mar 21 2007 David Cantrell <dcantrell at redhat.com> - 1.8.6-2
 - Do not translate partition name from disk label (#224182)
 



From fedora-cvs-commits at redhat.com  Wed Apr 11 16:45:48 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 12:45:48 -0400
Subject: rpms/hplip/FC-6 .cvsignore, 1.15, 1.16 hplip-libsane.patch, 1.1,
	1.2 hplip.spec, 1.102, 1.103 sources, 1.15, 1.16
Message-ID: <200704111645.l3BGjmrR010136@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore hplip-libsane.patch hplip.spec sources 
Log Message:
* Wed Apr 11 2007 Tim Waugh <twaugh at redhat.com>
- 1.7.2.
- Better media-empty-error state handling: always set the state.
- Use marker-supply-low IPP message.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-6/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	10 Jan 2007 17:14:29 -0000	1.15
+++ .cvsignore	11 Apr 2007 16:45:46 -0000	1.16
@@ -12,3 +12,4 @@
 hplip-1.6.7.tar.gz
 hplip-1.6.10.tar.gz
 hplip-1.6.12.tar.gz
+hplip-1.7.2.tar.gz

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

Index: hplip-libsane.patch
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-6/hplip-libsane.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hplip-libsane.patch	3 Apr 2007 12:50:28 -0000	1.1
+++ hplip-libsane.patch	11 Apr 2007 16:45:46 -0000	1.2
@@ -1,22 +1,22 @@
---- hplip-1.6.12/Makefile.in.libsane	2007-04-03 13:06:23.000000000 +0100
-+++ hplip-1.6.12/Makefile.in	2007-04-03 13:07:49.000000000 +0100
-@@ -539,7 +539,7 @@
+--- hplip-1.7.2/Makefile.in.libsane	2007-04-03 13:52:04.000000000 +0100
++++ hplip-1.7.2/Makefile.in	2007-04-03 13:53:17.000000000 +0100
+@@ -579,7 +579,7 @@
  #      scan/sane/dime.c scan/sane/dime.h scan/sane/webScanStub.h scan/sane/webScanH.h scan/sane/stdsoap2.h scan/sane/webScan.nsmap
  @SCAN_BUILD_TRUE at libsane_hpaio_la_LDFLAGS = -version-info $(MAJORVER):$(MINORVER):$(AGEVER) 
  # The following is a interlibrary dependency that must be compiled first.
 - at SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la
 + at SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la -lsane
- @SCAN_BUILD_TRUE at libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
+ #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
+ @SCAN_BUILD_TRUE at libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DWITH_LEAN
  
- # api library
---- hplip-1.6.12/Makefile.am.libsane	2007-04-03 13:06:15.000000000 +0100
-+++ hplip-1.6.12/Makefile.am	2007-04-03 13:07:36.000000000 +0100
-@@ -184,7 +184,7 @@
+--- hplip-1.7.2/Makefile.am.libsane	2007-04-03 13:52:04.000000000 +0100
++++ hplip-1.7.2/Makefile.am	2007-04-03 13:52:40.000000000 +0100
+@@ -192,7 +192,7 @@
  #      scan/sane/dime.c scan/sane/dime.h scan/sane/webScanStub.h scan/sane/webScanH.h scan/sane/stdsoap2.h scan/sane/webScan.nsmap
  libsane_hpaio_la_LDFLAGS = -version-info $(MAJORVER):$(MINORVER):$(AGEVER) 
  # The following is a interlibrary dependency that must be compiled first.
 -libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la
 +libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la -lsane
- libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
+ #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
+ libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DWITH_LEAN
  
- endif


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-6/hplip.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- hplip.spec	3 Apr 2007 12:50:28 -0000	1.102
+++ hplip.spec	11 Apr 2007 16:45:46 -0000	1.103
@@ -1,6 +1,6 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 1.6.12
+Version: 1.7.2
 Release: 1%{?dist}
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
@@ -19,6 +19,8 @@
 Patch4: hplip-libm.patch
 Patch5: hplip-ipv6.patch
 Patch6: hplip-libsane.patch
+Patch7: hplip-media-empty.patch
+Patch8: hplip-marker-supply.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -85,6 +87,12 @@
 # Link libsane-hpaio against libsane (bug #234813).
 %patch6 -p1 -b .libsane
 
+# Clear the media-empty-error printer state.
+%patch7 -p1 -b .media-empty
+
+# Use marker-supply-low IPP message.
+%patch8 -p1 -b .marker-supply
+
 autoconf # for patch4
 
 %build
@@ -185,6 +193,11 @@
 exit 0
 
 %changelog
+* Wed Apr 11 2007 Tim Waugh <twaugh at redhat.com>
+- 1.7.2.
+- Better media-empty-error state handling: always set the state.
+- Use marker-supply-low IPP message.
+
 * Tue Apr  3 2007 Tim Waugh <twaugh at redhat.com>
 - Link libsane-hpaio against libsane (bug #234813).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-6/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	10 Jan 2007 17:14:29 -0000	1.15
+++ sources	11 Apr 2007 16:45:46 -0000	1.16
@@ -1 +1 @@
-8adcb93703f6e90510f51b3cf96567c9  hplip-1.6.12.tar.gz
+739a9cef41ca655ad98bc35a39c0517e  hplip-1.7.2.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 11 16:46:07 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 12:46:07 -0400
Subject: rpms/hplip/FC-6 hplip.spec,1.103,1.104
Message-ID: <200704111646.l3BGk7bP010407@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
1.7.2-1


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-6/hplip.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- hplip.spec	11 Apr 2007 16:45:46 -0000	1.103
+++ hplip.spec	11 Apr 2007 16:46:05 -0000	1.104
@@ -193,7 +193,7 @@
 exit 0
 
 %changelog
-* Wed Apr 11 2007 Tim Waugh <twaugh at redhat.com>
+* Wed Apr 11 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-1
 - 1.7.2.
 - Better media-empty-error state handling: always set the state.
 - Use marker-supply-low IPP message.



From fedora-cvs-commits at redhat.com  Wed Apr 11 16:47:33 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 12:47:33 -0400
Subject: rpms/hplip/FC-6 hplip-marker-supply.patch, NONE,
	1.1 hplip-media-empty.patch, NONE, 1.1
Message-ID: <200704111647.l3BGlXsS011496@cvs.devel.redhat.com>

Author: twaugh

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

Added Files:
	hplip-marker-supply.patch hplip-media-empty.patch 
Log Message:
Include the patches.

hplip-marker-supply.patch:
 hpijs.cpp |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+)

--- NEW FILE hplip-marker-supply.patch ---
--- hplip-1.7.2/prnt/hpijs/hpijs.cpp.marker-supply	2007-03-30 17:44:32.000000000 +0100
+++ hplip-1.7.2/prnt/hpijs/hpijs.cpp	2007-03-30 17:53:23.000000000 +0100
@@ -516,7 +516,31 @@
       goto BUGOUT;
    }
    if (pSS->pPC->constructor_error < 0)
+   {
       bug("WARNING: %s\n", pSS->GetDriverMessage(pSS->pPC->constructor_error));
+      switch (pSS->pPC->constructor_error)
+      {
+      case WARN_LOW_INK_BOTH_PENS:
+      case WARN_LOW_INK_BLACK:
+      case WARN_LOW_INK_COLOR:
+      case WARN_LOW_INK_PHOTO:
+      case WARN_LOW_INK_GREY:
+      case WARN_LOW_INK_BLACK_PHOTO:
+      case WARN_LOW_INK_COLOR_PHOTO:
+      case WARN_LOW_INK_GREY_PHOTO:
+      case WARN_LOW_INK_COLOR_GREY:
+      case WARN_LOW_INK_COLOR_GREY_PHOTO:
+      case WARN_LOW_INK_COLOR_BLACK_PHOTO:
+      case WARN_LOW_INK_CYAN:
+      case WARN_LOW_INK_MAGENTA:
+      case WARN_LOW_INK_YELLOW:
+      case WARN_LOW_INK_MULTIPLE_PENS:
+	 bug("STATE: +marker-supply-low-warning\n");
+	 break;
+      default:
+	 bug("STATE: -marker-supply-low-warning\n");
+      }
+   }
 
 #if 0
    bug("device model=%s\n", pSS->pPC->PrinterModel());

hplip-media-empty.patch:
 hp.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE hplip-media-empty.patch ---
--- hplip-1.7.2/backend/hp/hp.c.media-empty	2006-12-14 18:15:44.000000000 +0000
+++ hplip-1.7.2/backend/hp/hp.c	2007-04-05 15:45:20.000000000 +0100
@@ -410,7 +410,7 @@
    int len, vstatus, cnt;
    char buf[HPLIP_BUFFER_SIZE+HPLIP_HEADER_SIZE];
    HplipMsgAttributes ma;
-   int paperout=0, offline=0;
+   int paperout = -1, offline = -1;
 
    if (argc > 1)
    {
@@ -544,17 +544,17 @@
                switch (vstatus)
                {
                   case VSTATUS_OOPA:
-                     if (!paperout)
+                     if (paperout != 1)
                      {
                         fputs("STATE: +media-empty-error\n", stderr);
-                        paperout=1;
+                        paperout = 1;
                      }
                      break;
                   default:
-                     if (!offline)
+                     if (offline != 1)
                      {
                         fputs("STATE: +other\n", stderr);
-                        offline=1;
+                        offline = 1;
                      }
                      break;
                }



From fedora-cvs-commits at redhat.com  Wed Apr 11 17:00:13 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 13:00:13 -0400
Subject: rpms/rsh/devel netkit-rsh-0.17-nodns.patch, NONE, 1.1 rsh.spec, 1.35,
	1.36
Message-ID: <200704111700.l3BH0CBX020903@cvs.devel.redhat.com>

Author: atkac

Update of /cvs/dist/rpms/rsh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19938

Modified Files:
	rsh.spec 
Added Files:
	netkit-rsh-0.17-nodns.patch 
Log Message:
improved -D rlogind's option. When client's ip can't be translated to name
rlogind uses ip


netkit-rsh-0.17-nodns.patch:
 network.c |    6 ++++++
 rlogind.8 |    2 ++
 2 files changed, 8 insertions(+)

--- NEW FILE netkit-rsh-0.17-nodns.patch ---
--- netkit-rsh-0.17/rlogind/rlogind.8.nodns	2007-04-11 18:57:18.000000000 +0200
+++ netkit-rsh-0.17/rlogind/rlogind.8	2007-04-11 18:58:03.000000000 +0200
@@ -53,6 +53,8 @@
 .Bl -tag -width Ds
 .It Fl a
 Ask hostname for verification.
+.It Fl D
+Disable reverse client checking. Security is lower
 .It Fl h
 Permit use of superuser 
 .Dq Pa .rhosts
--- netkit-rsh-0.17/rlogind/network.c.nodns	2007-04-11 18:48:49.000000000 +0200
+++ netkit-rsh-0.17/rlogind/network.c	2007-04-11 18:48:49.000000000 +0200
@@ -127,6 +127,12 @@
 	error = getnameinfo(fromp, fromlen,
 		hname_buf, sizeof(hname_buf), portname, NI_MAXSERV,
 		NI_NUMERICSERV);
+	if((error == EAI_AGAIN) && no_host_check)
+	{
+		error = getnameinfo(fromp, fromlen,
+                hname_buf, sizeof(hname_buf), portname, NI_MAXSERV,
+                NI_NUMERICSERV | NI_NUMERICHOST);
+	}
 	assert(error == 0);
 
 	if ((check_all || local_domain(hname_buf)) && !no_host_check ) {


Index: rsh.spec
===================================================================
RCS file: /cvs/dist/rpms/rsh/devel/rsh.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- rsh.spec	22 Jan 2007 13:54:02 -0000	1.35
+++ rsh.spec	11 Apr 2007 17:00:10 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: Clients for remote access commands (rsh, rlogin, rcp).
 Name: rsh
 Version: 0.17
-Release: 39%{?dist}
+Release: 40%{?dist}
 License: BSD
 Group: Applications/Internet
 
@@ -51,6 +51,7 @@
 Patch29: netkit-rsh-0.17-rlogin-linefeed.patch
 Patch30: netkit-rsh-0.17-ipv6.patch
 Patch31: netkit-rsh-0.17-pam_env.patch
+Patch32: netkit-rsh-0.17-nodns.patch
 
 %description
 The rsh package contains a set of programs which allow users to run
@@ -114,6 +115,7 @@
 %patch29 -p1 -b .linefeed
 %patch30 -p1 -b .ipv6
 %patch31 -p1 -b .pam_env
+%patch32 -p1 -b .nodns
 
 # No, I don't know what this is doing in the tarball.
 rm -f rexec/rexec
@@ -139,7 +141,7 @@
     s,^SBINDIR=.*$,SBINDIR=%{_sbindir},;
     ' MCONFIG
 %endif
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -182,6 +184,10 @@
 %{_mandir}/man8/*.8*
 
 %changelog
+* Tue Apr 10 2007 Adam Tkac <atkac redhat com> 0.17-40.fc7
+- improved -D option to rlogind - when name won't be resolved rlogind uses IP address
+- added smp_mflags to make
+
 * Mon Jan 22 2007 Adam Tkac <atkac redhat com> 0.17-39.fc7
 - rebased on ncurses instead of libtermcap
 



From fedora-cvs-commits at redhat.com  Wed Apr 11 17:22:59 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 13:22:59 -0400
Subject: rpms/system-config-display/devel .cvsignore, 1.36, 1.37 sources,
	1.44, 1.45 system-config-display.spec, 1.50, 1.51
Message-ID: <200704111722.l3BHMxfN005052@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	.cvsignore sources system-config-display.spec 
Log Message:
auto-import system-config-display-1.0.51-1.fc7 on branch devel from system-config-display-1.0.51-1.fc7.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	28 Mar 2007 18:45:51 -0000	1.36
+++ .cvsignore	11 Apr 2007 17:22:57 -0000	1.37
@@ -1 +1 @@
-system-config-display-1.0.50.tar.bz2
+system-config-display-1.0.51.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	28 Mar 2007 18:45:51 -0000	1.44
+++ sources	11 Apr 2007 17:22:57 -0000	1.45
@@ -1 +1 @@
-766697b1b78645b0569b9ac83692b50f  system-config-display-1.0.50.tar.bz2
+c98fa2dc8e3cd5e33230fe0a38dc4102  system-config-display-1.0.51.tar.bz2


Index: system-config-display.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/system-config-display.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- system-config-display.spec	28 Mar 2007 18:45:51 -0000	1.50
+++ system-config-display.spec	11 Apr 2007 17:22:57 -0000	1.51
@@ -1,6 +1,6 @@
 Summary: A graphical interface for configuring the X Window System display
 Name: system-config-display
-Version: 1.0.50
+Version: 1.0.51
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/Tools
 License: GPL
@@ -78,6 +78,10 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-display.png
 
 %changelog
+* Wed Apr 11 2007 Adam Jackson <ajax at redhat.com> 1.0.51-1
+- Load the mouse and keyboard configs from the config file, so as not to
+  clobber them. (#145316)
+
 * Wed Mar 28 2007 Jeremy Katz <katzj at redhat.com> - 1.0.50-1
 - start X server with a black background; we don't need xsri anymore
 



From fedora-cvs-commits at redhat.com  Wed Apr 11 17:43:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 13:43:42 -0400
Subject: rpms/xorg-x11-server/FC-6 xserver-1.1.1-int10-update.patch, NONE,
	1.1 xorg-x11-server.spec, 1.189, 1.190
Message-ID: <200704111743.l3BHhg9E011036@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.1.1-int10-update.patch 
Log Message:
* Wed Apr 11 2007 Adam Jackson <ajax at redhat.com> 1.1.1-47.9
- xserver-1.1.1-int10-update.patch: Backport various important int10 and
  x86emu updates from git. (#216927, among others)


xserver-1.1.1-int10-update.patch:
 int10/generic.c                |    2 -
 os-support/linux/int10/linux.c |    3 +
 x86emu/ops2.c                  |   72 ++++++++++++++++++++++++++++++-----------
 x86emu/prim_ops.c              |    4 +-
 4 files changed, 59 insertions(+), 22 deletions(-)

--- NEW FILE xserver-1.1.1-int10-update.patch ---
--- xorg-server-1.1.1/hw/xfree86/os-support/linux/int10/linux.c.jx	2006-07-05 14:31:41.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/os-support/linux/int10/linux.c	2007-04-11 13:21:27.000000000 -0400
@@ -104,6 +104,7 @@
     legacyVGARec vga;
     xf86int10BiosLocation bios;
     Bool videoBiosMapped = FALSE;
+    pciVideoPtr pvp;
     
     if (int10Generation != serverGeneration) {
 	counter = 0;
@@ -165,6 +166,8 @@
     pInt = (xf86Int10InfoPtr)xnfcalloc(1, sizeof(xf86Int10InfoRec));
     pInt->scrnIndex = screen;
     pInt->entityIndex = entityIndex;
+    pvp = xf86GetPciInfoForEntity(entityIndex);
+    if (pvp) pInt->Tag = pciTag(pvp->bus, pvp->device, pvp->func);
     if (!xf86Int10ExecSetup(pInt))
 	goto error0;
     pInt->mem = &linuxMem;
--- xorg-server-1.1.1/hw/xfree86/int10/generic.c.jx	2006-07-05 14:31:40.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/int10/generic.c	2007-04-11 13:21:27.000000000 -0400
@@ -105,7 +105,7 @@
     base = INTPriv(pInt)->base = xnfalloc(SYS_BIOS);
 
     pvp = xf86GetPciInfoForEntity(entityIndex);
-    if (pvp) pInt->Tag = ((pciConfigPtr)(pvp->thisCard))->tag;
+    if (pvp) pInt->Tag = pciTag(pvp->bus, pvp->device, pvp->func);
 
     /*
      * we need to map video RAM MMIO as some chipsets map mmio
--- xorg-server-1.1.1/hw/xfree86/x86emu/prim_ops.c.jx	2006-07-05 14:31:42.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/x86emu/prim_ops.c	2007-04-11 13:21:12.000000000 -0400
@@ -2082,7 +2082,7 @@
 void imul_long_direct(u32 *res_lo, u32* res_hi,u32 d, u32 s)
 {
 #ifdef	__HAS_LONG_LONG__
-	s64 res = (s32)d * (s32)s;
+	s64 res = (s64)(s32)d * (s32)s;
 
 	*res_lo = (u32)res;
 	*res_hi = (u32)(res >> 32);
@@ -2174,7 +2174,7 @@
 void mul_long(u32 s)
 {
 #ifdef	__HAS_LONG_LONG__
-	u64 res = (u32)M.x86.R_EAX * (u32)s;
+	u64 res = (u64)M.x86.R_EAX * s;
 
 	M.x86.R_EAX = (u32)res;
 	M.x86.R_EDX = (u32)(res >> 32);
--- xorg-server-1.1.1/hw/xfree86/x86emu/ops2.c.jx	2006-07-05 14:31:42.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/x86emu/ops2.c	2007-04-11 13:20:55.000000000 -0400
@@ -65,6 +65,40 @@
 
 /****************************************************************************
 REMARKS:
+Handles opcode 0x0f,0x31
+****************************************************************************/
+static void x86emuOp2_rdtsc(u8 X86EMU_UNUSED(op2))
+{
+#ifdef __HAS_LONG_LONG__
+    static u64 counter = 0;
+#else
+    static u32 counter = 0;
+#endif
+
+    counter += 0x10000;
+
+    /* read timestamp counter */
+    /*
+     * Note that instead of actually trying to accurately measure this, we just
+     * increase the counter by a fixed amount every time we hit one of these
+     * instructions.  Feel free to come up with a better method.
+     */
+    START_OF_INSTR();
+    DECODE_PRINTF("RDTSC\n");
+    TRACE_AND_STEP();
+#ifdef __HAS_LONG_LONG__
+    M.x86.R_EAX = counter & 0xffffffff;
+    M.x86.R_EDX = counter >> 32;
+#else
+    M.x86.R_EAX = counter;
+    M.x86.R_EDX = 0;
+#endif
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
+/****************************************************************************
+REMARKS:
 Handles opcode 0x0f,0x80-0x8F
 ****************************************************************************/
 static void x86emuOp2_long_jump(u8 op2)
@@ -2129,7 +2163,7 @@
     uint srcoffset;
 
     START_OF_INSTR();
-    DECODE_PRINTF("BSF\n");
+    DECODE_PRINTF("BSF\t");
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch(mod) {
     case 0:
@@ -2209,25 +2243,25 @@
 	break;
     case 3:				/* register to register */
 	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-	    u32 *srcreg, *dstreg;
+	    u32 srcval, *dstreg;
 
-	    srcreg = DECODE_RM_LONG_REGISTER(rl);
+	    srcval = *DECODE_RM_LONG_REGISTER(rl);
 	    DECODE_PRINTF(",");
 	    dstreg = DECODE_RM_LONG_REGISTER(rh);
 	    TRACE_AND_STEP();
-	    CONDITIONAL_SET_FLAG(*srcreg == 0, F_ZF);
+	    CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
 	    for(*dstreg = 0; *dstreg < 32; (*dstreg)++)
-		if ((*srcreg >> *dstreg) & 1) break;
+		if ((srcval >> *dstreg) & 1) break;
 	} else {
-	    u16 *srcreg, *dstreg;
+	    u16 srcval, *dstreg;
 
-	    srcreg = DECODE_RM_WORD_REGISTER(rl);
+	    srcval = *DECODE_RM_WORD_REGISTER(rl);
 	    DECODE_PRINTF(",");
 	    dstreg = DECODE_RM_WORD_REGISTER(rh);
 	    TRACE_AND_STEP();
-	    CONDITIONAL_SET_FLAG(*srcreg == 0, F_ZF);
+	    CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
 	    for(*dstreg = 0; *dstreg < 16; (*dstreg)++)
-		if ((*srcreg >> *dstreg) & 1) break;
+		if ((srcval >> *dstreg) & 1) break;
 	}
 	break;
     }
@@ -2245,7 +2279,7 @@
     uint srcoffset;
 
     START_OF_INSTR();
-    DECODE_PRINTF("BSF\n");
+    DECODE_PRINTF("BSR\t");
     FETCH_DECODE_MODRM(mod, rh, rl);
     switch(mod) {
     case 0:
@@ -2325,25 +2359,25 @@
 	break;
     case 3:				/* register to register */
 	if (M.x86.mode & SYSMODE_PREFIX_DATA) {
-	    u32 *srcreg, *dstreg;
+	    u32 srcval, *dstreg;
 
-	    srcreg = DECODE_RM_LONG_REGISTER(rl);
+	    srcval = *DECODE_RM_LONG_REGISTER(rl);
 	    DECODE_PRINTF(",");
 	    dstreg = DECODE_RM_LONG_REGISTER(rh);
 	    TRACE_AND_STEP();
-	    CONDITIONAL_SET_FLAG(*srcreg == 0, F_ZF);
+	    CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
 	    for(*dstreg = 31; *dstreg > 0; (*dstreg)--)
-		if ((*srcreg >> *dstreg) & 1) break;
+		if ((srcval >> *dstreg) & 1) break;
 	} else {
-	    u16 *srcreg, *dstreg;
+	    u16 srcval, *dstreg;
 
-	    srcreg = DECODE_RM_WORD_REGISTER(rl);
+	    srcval = *DECODE_RM_WORD_REGISTER(rl);
 	    DECODE_PRINTF(",");
 	    dstreg = DECODE_RM_WORD_REGISTER(rh);
 	    TRACE_AND_STEP();
-	    CONDITIONAL_SET_FLAG(*srcreg == 0, F_ZF);
+	    CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
 	    for(*dstreg = 15; *dstreg > 0; (*dstreg)--)
-		if ((*srcreg >> *dstreg) & 1) break;
+		if ((srcval >> *dstreg) & 1) break;
 	}
 	break;
     }
@@ -2580,7 +2614,7 @@
 /*  0x2f */ x86emuOp2_illegal_op,
 
 /*  0x30 */ x86emuOp2_illegal_op,
-/*  0x31 */ x86emuOp2_illegal_op,
+/*  0x31 */ x86emuOp2_rdtsc,
 /*  0x32 */ x86emuOp2_illegal_op,
 /*  0x33 */ x86emuOp2_illegal_op,
 /*  0x34 */ x86emuOp2_illegal_op,


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/FC-6/xorg-x11-server.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- xorg-x11-server.spec	8 Apr 2007 17:32:30 -0000	1.189
+++ xorg-x11-server.spec	11 Apr 2007 17:43:40 -0000	1.190
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.1
-Release:   47.8%{?dist}
+Release:   47.9%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -64,6 +64,7 @@
 Patch2006:  xorg-x11-server-1.1.1-revert-xkb-change.patch
 Patch2007:  xorg-x11-server-1.1.1-aiglx-locking.patch
 Patch2008:  xorg-x11-server-1.1.1-edid-hex-dump.patch
+Patch2009:  xserver-1.1.1-int10-update.patch
 
 # autoconfiguration feature patches
 Patch3001:  xorg-x11-server-1.1.0-edid-mode-injection-1.patch
@@ -393,6 +394,7 @@
 %patch2006 -p1 -b .revert-xkb-change
 %patch2007 -p1 -b .aiglx-locking
 %patch2008 -p1 -b .hexdump
+%patch2009 -p1 -b .int10-update
 
 %patch3001 -p1 -b .edid1
 %patch3002 -p1 -b .edid2
@@ -743,6 +745,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Wed Apr 11 2007 Adam Jackson <ajax at redhat.com> 1.1.1-47.9
+- xserver-1.1.1-int10-update.patch: Backport various important int10 and
+  x86emu updates from git. (#216927, among others)
+
 * Sun Apr 08 2007 Adam Jackson <ajax at redhat.com> 1.1.1-47.8
 - xserver-cve-2007-1003.patch: Fix CVE 2007-1003 in XC-MISC extension.
 



From fedora-cvs-commits at redhat.com  Wed Apr 11 18:21:02 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 14:21:02 -0400
Subject: rpms/curl/devel .cvsignore, 1.23, 1.24 curl-7.15.3-multilib.patch,
	1.1, 1.2 curl-7.16.0-privlibs.patch, 1.2, 1.3 curl.spec, 1.46,
	1.47 sources, 1.24, 1.25
Message-ID: <200704111821.l3BIL2OA012387@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/curl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12353

Modified Files:
	.cvsignore curl-7.15.3-multilib.patch 
	curl-7.16.0-privlibs.patch curl.spec sources 
Log Message:
- update to 7.16.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/curl/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	30 Jan 2007 12:16:38 -0000	1.23
+++ .cvsignore	11 Apr 2007 18:20:54 -0000	1.24
@@ -2,3 +2,4 @@
 curl-7.15.5.tar.bz2
 curl-7.16.0.tar.bz2
 curl-7.16.1.tar.bz2
+curl-7.16.2.tar.bz2

curl-7.15.3-multilib.patch:
 curl-config.in |   13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

Index: curl-7.15.3-multilib.patch
===================================================================
RCS file: /cvs/dist/rpms/curl/devel/curl-7.15.3-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- curl-7.15.3-multilib.patch	21 Mar 2006 09:17:46 -0000	1.1
+++ curl-7.15.3-multilib.patch	11 Apr 2007 18:20:54 -0000	1.2
@@ -1,6 +1,6 @@
---- curl-7.15.1/curl-config.in.pom	2005-09-04 20:15:24.000000000 +0200
-+++ curl-7.15.1/curl-config.in	2006-03-20 14:12:04.485640816 +0100
-@@ -50,7 +50,7 @@
+--- curl-7.16.2/curl-config.in.multilib	2007-02-18 10:41:27.000000000 +0100
++++ curl-7.16.2/curl-config.in	2007-04-11 20:00:16.000000000 +0200
+@@ -71,7 +71,7 @@
  	;;
  
      --cc)
@@ -9,12 +9,21 @@
  	;;
  
      --prefix)
-@@ -143,7 +143,7 @@
+@@ -181,16 +181,7 @@
         	;;
  
      --libs)
--       	echo -L at libdir@ -lcurl @LDFLAGS@ @LIBS@
-+        pkg-config libcurl --libs
-        	;;
+-	if test "X at libdir@" != "X/usr/lib"; then
+-	   CURLLIBDIR="-L at libdir@ "
+-	else
+-	   CURLLIBDIR=""
+-	fi
+-	if test "X at REQUIRE_LIB_DEPS@" = "Xyes"; then
+-	  echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
+-	else
+-	  echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBS@
+-	fi
++	pkg-config libcurl --libs
+ 	;;
  
      *)

curl-7.16.0-privlibs.patch:
 libcurl.pc.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: curl-7.16.0-privlibs.patch
===================================================================
RCS file: /cvs/dist/rpms/curl/devel/curl-7.16.0-privlibs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- curl-7.16.0-privlibs.patch	29 Jan 2007 16:25:45 -0000	1.2
+++ curl-7.16.0-privlibs.patch	11 Apr 2007 18:20:54 -0000	1.3
@@ -1,11 +1,11 @@
---- curl-7.16.1/libcurl.pc.in.privlibs	2007-01-02 13:14:21.000000000 +0100
-+++ curl-7.16.1/libcurl.pc.in	2007-01-29 17:20:50.000000000 +0100
+--- curl-7.16.2/libcurl.pc.in.privlibs	2007-02-18 10:41:27.000000000 +0100
++++ curl-7.16.2/libcurl.pc.in	2007-04-11 20:02:34.000000000 +0200
 @@ -33,6 +33,6 @@
  URL: http://curl.haxx.se/
  Description: Library to transfer files with ftp, http, etc.
  Version: @VERSION@
--Libs: -L${libdir} -lcurl @LDFLAGS@
--Libs.private: @LIBS@
+-Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
+-Libs.private: @LIBCURL_LIBS@ @LIBS@
 +Libs: -L${libdir} -lcurl
-+Libs.private: @LDFLAGS@ @LIBS@
++Libs.private: @LIBCURL_LIBS@ @LIBS@ @LDFLAGS@
  Cflags: -I${includedir}


Index: curl.spec
===================================================================
RCS file: /cvs/dist/rpms/curl/devel/curl.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- curl.spec	22 Feb 2007 13:29:21 -0000	1.46
+++ curl.spec	11 Apr 2007 18:20:54 -0000	1.47
@@ -2,8 +2,8 @@
 
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl 
-Version: 7.16.1
-Release: 3%{?dist}
+Version: 7.16.2
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -96,6 +96,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 11 2007 Jindrich Novy <jnovy at redhat.com> 7.16.2-1
+- update to 7.16.2
+
 * Mon Feb 19 2007 Jindrich Novy <jnovy at redhat.com> 7.16.1-3
 - don't create/ship static libraries (#225671)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/curl/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	30 Jan 2007 12:16:38 -0000	1.24
+++ sources	11 Apr 2007 18:20:54 -0000	1.25
@@ -1 +1,2 @@
 acdab0b0467c55e10ed02d2afed80575  curl-7.16.1.tar.bz2
+37a1de15c4300ca9413d39d2bcea9b36  curl-7.16.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 11 18:31:17 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 14:31:17 -0400
Subject: rpms/coreutils/FC-6 coreutils-dangling-full-path.patch, NONE,
	1.1 coreutils-selinux.patch, 1.28, 1.29 coreutils.spec, 1.151, 1.152
Message-ID: <200704111831.l3BIVHda026310@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	coreutils-selinux.patch coreutils.spec 
Added Files:
	coreutils-dangling-full-path.patch 
Log Message:
* Wed Apr 11 2007 Tim Waugh <twaugh at redhat.com> 5.97-12.4
- Backported ls fix for 'ls -lL' showing dangling links with full paths
  (bug #230052).
- Fixed rm race (bug #235401).
- Resolves: rhbz#230052 rhbz#235401


coreutils-dangling-full-path.patch:
 NEWS     |    3 +++
 src/ls.c |    6 ------
 2 files changed, 3 insertions(+), 6 deletions(-)

--- NEW FILE coreutils-dangling-full-path.patch ---
--- coreutils-5.97/src/ls.c.dangling-full-path	2006-05-30 07:22:53.000000000 +0100
+++ coreutils-5.97/src/ls.c	2007-04-11 18:15:23.000000000 +0100
@@ -2509,12 +2509,6 @@
       || format_needs_stat
       || (format_needs_type
 	  && (type == unknown
-
-	      /* FIXME: remove this disjunct.
-		 I don't think we care about symlinks here, but for now
-		 this won't make a big performance difference.  */
-	      || type == symbolic_link
-
 	      /* --indicator-style=classify (aka -F)
 		 requires that we stat each regular file
 		 to see if it's executable.  */
--- coreutils-5.97/NEWS.dangling-full-path	2007-04-11 18:15:00.000000000 +0100
+++ coreutils-5.97/NEWS	2007-04-11 18:15:00.000000000 +0100
@@ -51,6 +51,9 @@
 
 ** Bug fixes
 
+  ls --indicator-style=file-type would sometimes stat a symlink
+  unnecessarily.
+
   mv: moving a symlink into the place of an existing non-directory is
   now done atomically;  before, mv would first unlink the destination.
 

coreutils-selinux.patch:
 README             |    4 
 config.hin         |   33 +---
 configure.ac       |    7 
 man/Makefile.am    |    4 
 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       |   45 +++++
 man/runcon.x       |   14 +
 man/stat.1         |    6 
 man/vdir.1         |   14 +
 src/Makefile.am    |   23 +-
 src/chcon.c        |  421 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/copy.c         |   73 +++++++++
 src/copy.h         |    4 
 src/cp.c           |   67 ++++++++
 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           |   13 +
 src/runcon.c       |  253 +++++++++++++++++++++++++++++++
 src/stat.c         |  146 ++++++++++++++----
 tests/help-version |    4 
 33 files changed, 1699 insertions(+), 101 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.28 -r 1.29 coreutils-selinux.patch
Index: coreutils-selinux.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/FC-6/coreutils-selinux.patch,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- coreutils-selinux.patch	24 Nov 2006 18:34:38 -0000	1.28
+++ coreutils-selinux.patch	11 Apr 2007 18:31:15 -0000	1.29
@@ -1,562 +1,659 @@
---- /dev/null	2006-11-23 08:31:37.745607750 +0000
-+++ coreutils-5.97/src/chcon.c	2006-11-17 13:56:55.000000000 +0000
-@@ -0,0 +1,421 @@
-+/* chcontext -- change security context of a pathname */
-+
-+#include <config.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <grp.h>
-+#include <getopt.h>
+--- coreutils-5.97/tests/help-version.selinux	2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/tests/help-version	2007-04-11 18:15:32.000000000 +0100
+@@ -46,6 +46,8 @@
+ 
+     # Skip `test'; it doesn't accept --help or --version.
+     test $i = test && continue;
++    test $i = chcon && continue;
++    test $i = runcon && continue;
+ 
+     # false fails even when invoked with --help or --version.
+     if test $i = false; then
+@@ -162,7 +164,7 @@
+ 
+ for i in $all_programs; do
+   # Skip these.
+-  case $i in chroot|stty|tty|false) continue;; esac
++  case $i in chroot|stty|tty|false|chcon|runcon) continue;; esac
+ 
+   rm -rf $tmp_in $tmp_in2 $tmp_dir $tmp_out
+   echo > $tmp_in
+--- coreutils-5.97/src/ls.c.selinux	2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/src/ls.c	2007-04-11 18:16:16.000000000 +0100
+@@ -135,6 +135,18 @@
+ 
+ #define AUTHORS "Richard Stallman", "David MacKenzie"
+ 
++#ifdef WITH_SELINUX
 +#include <selinux/selinux.h>
-+#include <selinux/context.h>
 +
-+#include "system.h"
-+#include "error.h"
-+#include "savedir.h"
-+#include "group-member.h"
++static int print_scontext       = 0;
 +
-+enum Change_status
-+{
-+  CH_SUCCEEDED,
-+  CH_FAILED,
-+  CH_NO_CHANGE_REQUESTED
-+};
 +
-+enum Verbosity
-+{
-+  /* Print a message for each file that is processed.  */
-+  V_high,
 +
-+  /* Print a message for each file whose attributes we change.  */
-+  V_changes_only,
 +
-+  /* Do not be verbose.  This is the default. */
-+  V_off
-+};
 +
-+static int change_dir_context (const char *dir, const struct stat *statp);
 +
-+/* The name the program was run with. */
-+char *program_name;
++#endif
 +
-+/* If nonzero, and the systems has support for it, change the context
-+   of symbolic links rather than any files they point to.  */
-+static int change_symlinks;
+ #define obstack_chunk_alloc malloc
+ #define obstack_chunk_free free
+ 
+@@ -170,7 +182,8 @@
+     symbolic_link DT_INIT (DT_LNK),
+     sock DT_INIT (DT_SOCK),
+     arg_directory DT_INIT (2 * (DT_UNKNOWN | DT_FIFO | DT_CHR | DT_DIR | DT_BLK
+-				| DT_REG | DT_LNK | DT_SOCK))
++				| DT_REG | DT_LNK | DT_SOCK)),
++    command_line
+   };
+ 
+ struct fileinfo
+@@ -179,6 +192,7 @@
+     char *name;
+ 
+     struct stat stat;
++    int stat_failed;
+ 
+     /* For symbolic link, name of the file linked to, otherwise zero.  */
+     char *linkname;
+@@ -197,6 +211,10 @@
+     /* For long listings, true if the file has an access control list.  */
+     bool have_acl;
+ #endif
 +
-+/* If nonzero, change the context of directories recursively. */
-+static int recurse;
++#ifdef WITH_SELINUX
++    security_context_t scontext;
++#endif
+   };
+ 
+ #if HAVE_ACL || USE_ACL
+@@ -232,7 +250,8 @@
+ static bool file_ignored (char const *name);
+ static uintmax_t gobble_file (char const *name, enum filetype type,
+ 			      bool command_line_arg, char const *dirname);
+-static void print_color_indicator (const char *name, mode_t mode, int linkok);
++static void print_color_indicator (const char *name, mode_t mode, int linkok,
++				   int stat_failed);
+ static void put_indicator (const struct bin_str *ind);
+ static void add_ignore_pattern (const char *pattern);
+ static void attach (char *dest, const char *dirname, const char *name);
+@@ -253,7 +272,7 @@
+ static void print_long_format (const struct fileinfo *f);
+ static void print_many_per_line (void);
+ static void print_name_with_quoting (const char *p, mode_t mode,
+-				     int linkok,
++				     int linkok, int stat_failed,
+ 				     struct obstack *stack);
+ static void prep_non_filename_text (void);
+ static void print_type_indicator (mode_t mode);
+@@ -263,6 +282,9 @@
+ static void sort_files (void);
+ static void parse_ls_color (void);
+ void usage (int status);
++#ifdef WITH_SELINUX
++static void print_scontext_format (const struct fileinfo *f);
++#endif
+ 
+ /* The name this program was run with.  */
+ char *program_name;
+@@ -371,7 +393,11 @@
+     one_per_line,		/* -1 */
+     many_per_line,		/* -C */
+     horizontal,			/* -x */
+-    with_commas			/* -m */
++    with_commas,	        /* -m */
++#ifdef WITH_SELINUX
++    security_format,		/* -Z */
++#endif
++    invalid_format
+   };
+ 
+ static enum format format;
+@@ -740,6 +766,11 @@
+   SHOW_CONTROL_CHARS_OPTION,
+   SI_OPTION,
+   SORT_OPTION,
++#ifdef WITH_SELINUX
++  CONTEXT_OPTION,
++  LCONTEXT_OPTION,
++  SCONTEXT_OPTION,
++#endif
+   TIME_OPTION,
+   TIME_STYLE_OPTION
+ };
+@@ -784,6 +815,11 @@
+   {"time-style", required_argument, NULL, TIME_STYLE_OPTION},
+   {"color", optional_argument, NULL, COLOR_OPTION},
+   {"block-size", required_argument, NULL, BLOCK_SIZE_OPTION},
++#ifdef WITH_SELINUX
++  {"context", no_argument, 0, CONTEXT_OPTION},
++  {"lcontext", no_argument, 0, LCONTEXT_OPTION},
++  {"scontext", no_argument, 0, SCONTEXT_OPTION},
++#endif
+   {"author", no_argument, NULL, AUTHOR_OPTION},
+   {GETOPT_HELP_OPTION_DECL},
+   {GETOPT_VERSION_OPTION_DECL},
+@@ -793,12 +829,19 @@
+ static char const *const format_args[] =
+ {
+   "verbose", "long", "commas", "horizontal", "across",
+-  "vertical", "single-column", NULL
++  "vertical", "single-column",
++#ifdef WITH_SELINUX
++  "context",
++#endif
++  NULL
+ };
+ static enum format const format_types[] =
+ {
+   long_format, long_format, with_commas, horizontal, horizontal,
+   many_per_line, one_per_line
++#ifdef WITH_SELINUX
++  , security_format
[...3805 lines suppressed...]
- .PP
---- coreutils-5.97/man/mkfifo.1.selinux	2006-05-25 18:27:36.000000000 +0100
-+++ coreutils-5.97/man/mkfifo.1	2006-11-17 13:56:55.000000000 +0000
-@@ -12,6 +12,9 @@
- .PP
- Mandatory arguments to long options are mandatory for short options too.
- .TP
-+\fB\-Z\fR, \fB\-\-context\fR=\fICONTEXT\fR
-+set security context (quoted string)
-+.TP
- \fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR
- set permission mode (as in chmod), not a=rw \- umask
- .TP
 --- coreutils-5.97/man/mknod.1.selinux	2006-05-25 18:27:36.000000000 +0100
-+++ coreutils-5.97/man/mknod.1	2006-11-17 13:56:55.000000000 +0000
++++ coreutils-5.97/man/mknod.1	2007-04-11 18:15:32.000000000 +0100
 @@ -12,6 +12,9 @@
  .PP
  Mandatory arguments to long options are mandatory for short options too.
@@ -2787,31 +2850,20 @@
  \fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR
  set permission mode (as in chmod), not a=rw \- umask
  .TP
---- coreutils-5.97/man/mkdir.1.selinux	2006-05-25 18:27:35.000000000 +0100
-+++ coreutils-5.97/man/mkdir.1	2006-11-17 13:56:55.000000000 +0000
-@@ -12,6 +12,8 @@
- .PP
- Mandatory arguments to long options are mandatory for short options too.
- .TP
-+\fB\-Z\fR, \fB\-\-context\fR=\fICONTEXT\fR (SELinux) set security context to CONTEXT
-+.TP
- \fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR
- set permission mode (as in chmod), not rwxrwxrwx \- umask
- .TP
---- coreutils-5.97/man/dir.1.selinux	2006-06-01 08:33:14.000000000 +0100
-+++ coreutils-5.97/man/dir.1	2006-11-17 13:56:55.000000000 +0000
+--- coreutils-5.97/man/ls.1.selinux	2006-06-01 08:33:14.000000000 +0100
++++ coreutils-5.97/man/ls.1	2007-04-11 18:15:32.000000000 +0100
 @@ -201,6 +201,20 @@
  .TP
  \fB\-1\fR
  list one file per line
 +.PP
-+SELINUX options:
++SELinux options:
 +.TP
 +\fB\-\-lcontext\fR
 +Display security context.   Enable \fB\-l\fR. Lines
 +will probably be too wide for most displays.
 +.TP
-+\fB\-\-context\fR
++\fB\-Z\fR, \fB\-\-context\fR
 +Display security context so it fits on most
 +displays.  Displays only mode, user, group,
 +security context and file name.
@@ -2821,25 +2873,19 @@
  .TP
  \fB\-\-help\fR
  display this help and exit
---- /dev/null	2006-11-23 08:31:37.745607750 +0000
-+++ coreutils-5.97/man/runcon.x	2006-11-17 13:56:55.000000000 +0000
-@@ -0,0 +1,14 @@
-+[NAME]
-+runcon \- run command with specified security context
-+[DESCRIPTION]
-+Run COMMAND with completely-specified CONTEXT, or with current or
-+transitioned security context modified by one or more of LEVEL,
-+ROLE, TYPE, and USER.
-+.PP
-+If none of \fI-c\fR, \fI-t\fR, \fI-u\fR, \fI-r\fR, or \fI-l\fR, is specified,
-+the first argument is used as the complete context.  Any additional
-+arguments after \fICOMMAND\fR are interpreted as arguments to the
-+command.
-+.PP
-+Note that only carefully-chosen contexts are likely to successfully
-+run.
+--- coreutils-5.97/man/mkdir.1.selinux	2006-05-25 18:27:35.000000000 +0100
++++ coreutils-5.97/man/mkdir.1	2007-04-11 18:15:32.000000000 +0100
+@@ -12,6 +12,8 @@
+ .PP
+ Mandatory arguments to long options are mandatory for short options too.
+ .TP
++\fB\-Z\fR, \fB\-\-context\fR=\fICONTEXT\fR (SELinux) set security context to CONTEXT
++.TP
+ \fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR
+ set permission mode (as in chmod), not rwxrwxrwx \- umask
+ .TP
 --- coreutils-5.97/man/vdir.1.selinux	2006-06-01 08:33:14.000000000 +0100
-+++ coreutils-5.97/man/vdir.1	2006-11-17 13:56:55.000000000 +0000
++++ coreutils-5.97/man/vdir.1	2007-04-11 18:15:32.000000000 +0100
 @@ -201,6 +201,20 @@
  .TP
  \fB\-1\fR
@@ -2861,77 +2907,33 @@
  .TP
  \fB\-\-help\fR
  display this help and exit
---- /dev/null	2006-11-23 08:31:37.745607750 +0000
-+++ coreutils-5.97/man/chcon.x	2006-11-17 13:56:55.000000000 +0000
-@@ -0,0 +1,4 @@
-+[NAME]
-+chcon \- change file security context
-+[DESCRIPTION]
-+.\" Add any additional description here
---- /dev/null	2006-11-23 08:31:37.745607750 +0000
-+++ coreutils-5.97/man/chcon.1	2006-11-17 13:56:55.000000000 +0000
-@@ -0,0 +1,64 @@
-+.TH CHCON 1 "July 2003" "chcon (coreutils) 5.0" "User Commands"
-+.SH NAME
-+chcon \- change security context
-+.SH SYNOPSIS
-+.B chcon
-+[\fIOPTION\fR]...\fI CONTEXT FILE\fR...
-+.br
-+.B chcon
-+[\fIOPTION\fR]...\fI --reference=RFILE FILE\fR...
-+.SH DESCRIPTION
-+.PP
-+." Add any additional description here
-+.PP
-+Change the security context of each FILE to CONTEXT.
-+.TP
-+\fB\-c\fR, \fB\-\-changes\fR
-+like verbose but report only when a change is made
-+.TP
-+\fB\-h\fR, \fB\-\-no\-dereference\fR
-+affect symbolic links instead of any referenced file (available only on systems with lchown system call)
-+.TP
-+\fB\-f\fR, \fB\-\-silent\fR, \fB\-\-quiet\fR
-+suppress most error messages
-+.TP
-+\fB\-l\fR, \fB\-\-range\fR
-+set range RANGE in the target security context
-+.TP
-+\fB\-\-reference\fR=\fIRFILE\fR
-+use RFILE's context instead of using a CONTEXT value
-+.TP
-+\fB\-R\fR, \fB\-\-recursive\fR
-+change files and directories recursively
-+.TP
-+\fB\-r\fR, \fB\-\-role\fR
-+set role ROLE in the target security context
-+.TP
-+\fB\-t\fR, \fB\-\-type\fR
-+set type TYPE in the target security context
-+.TP
-+\fB\-u\fR, \fB\-\-user\fR
-+set user USER in the target security context
-+.TP
-+\fB\-v\fR, \fB\-\-verbose\fR
-+output a diagnostic for every file processed
-+.TP
-+\fB\-\-help\fR
-+display this help and exit
+--- coreutils-5.97/man/install.1.selinux	2006-05-25 18:27:35.000000000 +0100
++++ coreutils-5.97/man/install.1	2007-04-11 18:15:32.000000000 +0100
+@@ -65,6 +65,11 @@
+ .TP
+ \fB\-v\fR, \fB\-\-verbose\fR
+ print the name of each directory as it is created
++.HP
++\fB\-P\fR, \fB\-\-preserve_context\fR (SELinux) Preserve security context
 +.TP
-+\fB\-\-version\fR
-+output version information and exit
-+.SH "REPORTING BUGS"
-+Report bugs to <https://bugzilla.redhat.com/bugzilla>.
-+.SH "SEE ALSO"
-+The full documentation for
-+.B chcon
-+is maintained as a Texinfo manual.  If the
-+.B info
-+and
-+.B chcon
-+programs are properly installed at your site, the command
-+.IP
-+.B info chcon
-+.PP
-+should give you access to the complete manual.
++\fB\-Z\fR, \fB\-\-context\fR=\fICONTEXT\fR
++(SELinux) Set security context of files and directories
+ .TP
+ \fB\-\-help\fR
+ display this help and exit
+--- coreutils-5.97/README.selinux	2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/README	2007-04-11 18:15:32.000000000 +0100
+@@ -8,11 +8,11 @@
+ The programs that can be built with this package are:
+ 
+   [ base64
+-  basename cat chgrp chmod chown chroot cksum comm cp csplit cut date dd
++  basename cat chcon chgrp chmod chown chroot cksum comm cp csplit cut date dd
+   df dir dircolors dirname du echo env expand expr factor false fmt fold
+   ginstall groups head hostid hostname id join kill link ln logname ls
+   md5sum mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr
+-  printenv printf ptx pwd readlink rm rmdir runuser seq sha1sum sha224sum
++  printenv printf ptx pwd readlink rm rmdir runcon runuser seq sha1sum sha224sum
+   sha256sum sha384sum sha512sum shred sleep sort
+   split stat stty su sum sync tac tail tee test touch tr true tsort tty
+   uname unexpand uniq unlink uptime users vdir wc who whoami yes


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/FC-6/coreutils.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- coreutils.spec	11 Apr 2007 11:33:03 -0000	1.151
+++ coreutils.spec	11 Apr 2007 18:31:15 -0000	1.152
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 5.97
-Release: 12.3%{?dist}
+Release: 12.4%{?dist}
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -25,6 +25,7 @@
 Patch3: coreutils-cut-coredump.patch
 Patch4: coreutils-223869.patch
 Patch5: coreutils-rm-race.patch
+Patch6: coreutils-dangling-full-path.patch
 Patch10: coreutils-newhashes.patch
 
 # Our patches
@@ -88,6 +89,7 @@
 %patch3 -p1 -b .cut-coredump
 %patch4 -p1 -b .223869
 %patch5 -p1 -b .rm-race
+%patch6 -p1 -b .dangling-full-path
 %patch10 -p1 -b .newhashes
 
 # Our patches
@@ -290,7 +292,9 @@
 /sbin/runuser
 
 %changelog
-* Wed Apr 11 2007 Tim Waugh <twaugh at redhat.com>
+* Wed Apr 11 2007 Tim Waugh <twaugh at redhat.com> 5.97-12.4
+- Backported ls fix for 'ls -lL' showing dangling links with full paths
+  (bug #230052).
 - Fixed rm race (bug #235401).
 
 * Wed Jan 24 2007 Tim Waugh <twaugh at redhat.com>



From fedora-cvs-commits at redhat.com  Wed Apr 11 19:36:03 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 15:36:03 -0400
Subject: rpms/dhcp/devel dhcpd-conf-to-ldap, 1.1, NONE linux, 1.1,
	NONE linux.dbus-example, 1.1, NONE
Message-ID: <200704111936.l3BJa3oi009871@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9754

Removed Files:
	dhcpd-conf-to-ldap linux linux.dbus-example 
Log Message:
Removed so I can re-add them with the correct permissions.



--- dhcpd-conf-to-ldap DELETED ---


--- linux DELETED ---


--- linux.dbus-example DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 11 19:36:39 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 15:36:39 -0400
Subject: rpms/dhcp/devel dhcpd-conf-to-ldap, 1.2, 1.3 linux, 1.2,
	1.3 linux.dbus-example, 1.2, 1.3
Message-ID: <200704111936.l3BJadkF027856@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5841

Added Files:
	dhcpd-conf-to-ldap linux linux.dbus-example 
Log Message:
Re-added with 0755 permissions.



Index: dhcpd-conf-to-ldap
===================================================================
RCS file: dhcpd-conf-to-ldap
diff -N dhcpd-conf-to-ldap
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ dhcpd-conf-to-ldap	11 Apr 2007 19:36:37 -0000	1.3
@@ -0,0 +1,517 @@
+#!/usr/bin/perl -w
+
+# Brian Masney <masneyb at ntelos.net>
+# To use this script, set your base DN below. Then run 
+# ./dhcpd-conf-to-ldap.pl < /path-to-dhcpd-conf/dhcpd.conf > output-file
+# The output of this script will generate entries in LDIF format. You can use
+# the slapadd command to add these entries into your LDAP server. You will
+# definately want to double check that your LDAP entries are correct before
+# you load them into LDAP.
+
+# This script does not do much error checking. Make sure before you run this
+# that the DHCP server doesn't give any errors about your config file
+
+use Sys::Hostname;
+
+my $basedn = "dc=ntelos, dc=net";
+
+sub next_token
+{
+  local ($lowercase) = @_;
+  local ($token, $newline);
+
+  do 
+    {
+      if (!defined ($line) || length ($line) == 0)
+        {
+          $line = <>;
+          return undef if !defined ($line);
+          chop $line;
+          $line_number++;
+          $token_number = 0;
+        }
+
+      $line =~ s/#.*//;
+      $line =~ s/^\s+//;
+      $line =~ s/\s+$//;
+    }
+  while (length ($line) == 0);
+
+  if (($token, $newline) = $line =~ /^(.*?)\s+(.*)/)
+    {
+      $line = $newline;
+    }
+  else
+    {
+      $token = $line;
+      $line = '';
+    }
+  $token_number++;
+
+  $token =~ y/[A-Z]/[a-z]/ if $lowercase;
+
+  return ($token);
+}
+
+
+sub remaining_line
+{
+  local ($tmp, $str);
+
+  $str = "";
+  while (($tmp = next_token (0)))
+    {
+      $str .= ' ' if !($str eq "");
+      $str .= $tmp;
+      last if $tmp =~ /;\s*$/;
+    }
+
+  $str =~ s/;$//;
+  return ($str);
+}
+
+
+sub
+add_dn_to_stack
+{
+  local ($dn) = @_;
+
+  $current_dn = "$dn, $current_dn";
+}
+
+
+sub
+remove_dn_from_stack
+{
+  $current_dn =~ s/^.*?,\s*//;
+}
+
+
+sub
+parse_error
+{
+  print "Parse error on line number $line_number at token number $token_number\n";
+  exit (1);
+}
+
+
+sub
+print_entry
+{
+  return if (scalar keys %curentry == 0);
+
+  if (!defined ($curentry{'type'}))
+    {
+      $host = hostname ();
+      $hostdn = "cn=$host, $basedn";
+      print "dn: $hostdn\n";
+      print "objectClass: top\n";
+      print "objectClass: dhcpServer\n";
+      print "cn: $host\n";
+      print "dhcpServiceDN: $current_dn\n\n";
+
+      print "dn: $current_dn\n";
+      print "cn: DHCP Config\n";
+      print "objectClass: top\n";
+      print "objectClass: dhcpService\n";
+      if (defined ($curentry{'options'}))
+        {
+          print "objectClass: dhcpOptions\n";
+        }
+      print "dhcpPrimaryDN: $hostdn\n";
+    }
+  elsif ($curentry{'type'} eq 'subnet')
+    {
+      print "dn: $current_dn\n";
+      print "cn: " . $curentry{'ip'} . "\n";
+      print "objectClass: top\n";
+      print "objectClass: dhcpSubnet\n";
+      if (defined ($curentry{'options'}))
+        {
+          print "objectClass: dhcpOptions\n";
+        }
+      
+      print "dhcpNetMask: " . $curentry{'netmask'} . "\n";
+      if (defined ($curentry{'range'}))
+        {
+          print "dhcpRange: " . $curentry{'range'} . "\n";
+        }
+    }
+  elsif ($curentry{'type'} eq 'shared-network')
+    {
+      print "dn: $current_dn\n";
+      print "cn: " . $curentry{'descr'} . "\n";
+      print "objectClass: top\n";
+      print "objectClass: dhcpSharedNetwork\n";
+      if (defined ($curentry{'options'}))
+        {
+          print "objectClass: dhcpOptions\n";
+        }
+    }
+  elsif ($curentry{'type'} eq 'group')
+    {
+      print "dn: $current_dn\n";
+      print "cn: group\n";
+      print "objectClass: top\n";
+      print "objectClass: dhcpGroup\n";
+      if (defined ($curentry{'options'}))
+        {
+          print "objectClass: dhcpOptions\n";
+        }
+    }
+  elsif ($curentry{'type'} eq 'host')
+    {
+      print "dn: $current_dn\n";
+      print "cn: " . $curentry{'host'} . "\n";
+      print "objectClass: top\n";
+      print "objectClass: dhcpHost\n";
+      if (defined ($curentry{'options'}))
+        {
+          print "objectClass: dhcpOptions\n";
+        }
+
+      if (defined ($curentry{'hwaddress'}))
+        {
+          print "dhcpHWAddress: " . $curentry{'hwaddress'} . "\n";
+        }
+    }
+  elsif ($curentry{'type'} eq 'pool')
+    {
+      print "dn: $current_dn\n";
+      print "cn: pool\n";
+      print "objectClass: top\n";
+      print "objectClass: dhcpPool\n";
+      if (defined ($curentry{'options'}))
+        {
+          print "objectClass: dhcpOptions\n";
+        }
+
+      if (defined ($curentry{'range'}))
+        {
+          print "dhcpRange: " . $curentry{'range'} . "\n";
+        }
+    }
+  elsif ($curentry{'type'} eq 'class')
+    {
+      print "dn: $current_dn\n";
+      print "cn: " . $curentry{'class'} . "\n";
+      print "objectClass: top\n";
+      print "objectClass: dhcpClass\n";
+      if (defined ($curentry{'options'}))
+        {
+          print "objectClass: dhcpOptions\n";
+        }
+    }
+  elsif ($curentry{'type'} eq 'subclass')
+    {
+      print "dn: $current_dn\n";
+      print "cn: " . $curentry{'subclass'} . "\n";
+      print "objectClass: top\n";
+      print "objectClass: dhcpSubClass\n";
+      if (defined ($curentry{'options'}))
+        {
+          print "objectClass: dhcpOptions\n";
+        }
+      print "dhcpClassData: " . $curentry{'class'} . "\n";
+    }
+
+  if (defined ($curentry{'statements'}))
+    {
+      foreach $statement (@{$curentry{'statements'}})
+        {
+          print "dhcpStatements: $statement\n";
+        }
+    }
+
+  if (defined ($curentry{'options'}))
+    {
+      foreach $statement (@{$curentry{'options'}})
+        {
+          print "dhcpOption: $statement\n";
+        }
+    }
+
+  print "\n";
+  undef (%curentry);
+}
+
+
+sub parse_netmask
+{
+  local ($netmask) = @_;
+  local ($i);
+
+  if ((($a, $b, $c, $d) = $netmask =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/) != 4)
+    {
+      parse_error ();
+    }
+
+  $num = (($a & 0xff) << 24) |
+         (($b & 0xff) << 16) |
+         (($c & 0xff) << 8) |
+          ($d & 0xff);
+
+  for ($i=1; $i<=32 && $num & (1 << (32 - $i)); $i++)
+    {
+    }
+  $i--;
+
+  return ($i);
+}
+
+
+sub parse_subnet
+{
+  local ($ip, $tmp, $netmask);
+
+  print_entry () if %curentry;
+    
+  $ip = next_token (0);
+  parse_error () if !defined ($ip);
+
+  $tmp = next_token (1);
+  parse_error () if !defined ($tmp);
+  parse_error () if !($tmp eq 'netmask');
+
+  $tmp = next_token (0);
+  parse_error () if !defined ($tmp);
+  $netmask = parse_netmask ($tmp);
+
+  $tmp = next_token (0);
+  parse_error () if !defined ($tmp);
+  parse_error () if !($tmp eq '{');
+
+  add_dn_to_stack ("cn=$ip");
+  $curentry{'type'} = 'subnet';
+  $curentry{'ip'} = $ip;
+  $curentry{'netmask'} = $netmask;
+}
+
+
+sub parse_shared_network
+{
+  local ($descr, $tmp);
+
+  print_entry () if %curentry;
+
+  $descr = next_token (0);
+  parse_error () if !defined ($descr);
+
+  $tmp = next_token (0);
+  parse_error () if !defined ($tmp);
+  parse_error () if !($tmp eq '{');
+
+  add_dn_to_stack ("cn=$descr");
+  $curentry{'type'} = 'shared-network';
+  $curentry{'descr'} = $descr;
+}
+
+
+sub parse_host
+{
+  local ($descr, $tmp);
+
+  print_entry () if %curentry;
+
+  $host = next_token (0);
+  parse_error () if !defined ($host);
+
+  $tmp = next_token (0);
+  parse_error () if !defined ($tmp);
+  parse_error () if !($tmp eq '{');
+
+  add_dn_to_stack ("cn=$host");
+  $curentry{'type'} = 'host';
+  $curentry{'host'} = $host;
+}
+
+
+sub parse_group
+{
+  local ($descr, $tmp);
+
+  print_entry () if %curentry;
+
+  $tmp = next_token (0);
+  parse_error () if !defined ($tmp);
+  parse_error () if !($tmp eq '{');
+
+  add_dn_to_stack ("cn=group");
+  $curentry{'type'} = 'group';
+}
+
+
+sub parse_pool
+{
+  local ($descr, $tmp);
+
+  print_entry () if %curentry;
+
+  $tmp = next_token (0);
+  parse_error () if !defined ($tmp);
+  parse_error () if !($tmp eq '{');
+
+  add_dn_to_stack ("cn=pool");
+  $curentry{'type'} = 'pool';
+}
+
+
+sub parse_class
+{
+  local ($descr, $tmp);
+
+  print_entry () if %curentry;
+
+  $class = next_token (0);
+  parse_error () if !defined ($class);
+
+  $tmp = next_token (0);
+  parse_error () if !defined ($tmp);
+  parse_error () if !($tmp eq '{');
+
+  $class =~ s/\"//g;
+  add_dn_to_stack ("cn=$class");
+  $curentry{'type'} = 'class';
+  $curentry{'class'} = $class;
+}
+
+
+sub parse_subclass
+{
+  local ($descr, $tmp);
+
+  print_entry () if %curentry;
+
+  $class = next_token (0);
+  parse_error () if !defined ($class);
+
+  $subclass = next_token (0);
+  parse_error () if !defined ($subclass);
+
+  $tmp = next_token (0);
+  parse_error () if !defined ($tmp);
+  parse_error () if !($tmp eq '{');
+
+  add_dn_to_stack ("cn=$subclass");
+  $curentry{'type'} = 'subclass';
+  $curentry{'class'} = $class;
+  $curentry{'subclass'} = $subclass;
+}
+
+
+sub parse_hwaddress
+{
+  local ($type, $hw, $tmp);
+
+  $type = next_token (0);
+  parse_error () if !defined ($type);
+
+  $hw = next_token (0);
+  parse_error () if !defined ($hw);
+  $hw =~ s/;$//;
+
+  $curentry{'hwaddress'} = "$type $hw";
+}
+
+    
+sub parse_range
+{
+  local ($tmp, $str);
+
+  $str = remaining_line ();
+
+  if (!($str eq ''))
+    {
+      $str =~ s/;$//;
+      $curentry{'range'} = $str;
+    }
+}
+
+
+sub parse_statement
+{
+  local ($token) = shift;
+  local ($str);
+
+  if ($token eq 'option')
+    {
+      $str = remaining_line ();
+      push (@{$curentry{'options'}}, $str);
+    }
+  else
+    {
+      $str = $token . " " . remaining_line ();
+      push (@{$curentry{'statements'}}, $str);
+    }
+}
+
+
+my $token;
+my $token_number = 0;
+my $line_number = 0;
+my %curentry;
+
+$current_dn = "cn=DHCP Config, $basedn";
+$curentry{'descr'} = 'DHCP Config';
+$line = '';
+
+while (($token = next_token (1)))
+  {
+    if ($token eq '}')
+      {
+        print_entry () if %curentry;
+        remove_dn_from_stack ();
+      }
+    elsif ($token eq 'subnet')
+      {
+        parse_subnet ();
+        next;
+      }
+    elsif ($token eq 'shared-network')
+      {
+        parse_shared_network ();
+        next;
+      }
+    elsif ($token eq 'class')
+      {
+        parse_class ();
+        next;
+      }
+    elsif ($token eq 'subclass')
+      {
+        parse_subclass ();
+        next;
+      }
+    elsif ($token eq 'pool')
+      {
+        parse_pool ();
+        next;
+      }
+    elsif ($token eq 'group')
+      {
+        parse_group ();
+        next;
+      }
+    elsif ($token eq 'host')
+      {
+        parse_host ();
+        next;
+      }
+    elsif ($token eq 'hardware')
+      {
+        parse_hwaddress ();
+        next;
+      }
+    elsif ($token eq 'range')
+      {
+        parse_range ();
+        next;
+      }
+    else
+      {
+        parse_statement ($token);
+        next;
+      }
+  }
+
+


Index: linux
===================================================================
RCS file: linux
diff -N linux
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux	11 Apr 2007 19:36:37 -0000	1.3
@@ -0,0 +1,566 @@
+#!/bin/bash
+# dhclient-script for Linux. Dan Halbert, March, 1997.
+# Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
+# No guarantees about this. I'm a novice at the details of Linux
+# networking.
+
+# Notes:
+
+# 0. This script is based on the netbsd script supplied with dhcp-970306.
+
+# 1. ifconfig down apparently deletes all relevant routes and flushes
+# the arp cache, so this doesn't need to be done explicitly.
+
+# 2. The alias address handling here has not been tested AT ALL.
+# I'm just going by the doc of modern Linux ip aliasing, which uses
+# notations like eth0:0, eth0:1, for each alias.
+
+# 3. I have to calculate the network address, and calculate the broadcast
+# address if it is not supplied. This might be much more easily done
+# by the dhclient C code, and passed on.
+
+if [ -n "${dhc_dbus}" ]; then
+   /bin/dbus-send \
+       --system \
+       --dest=com.redhat.dhcp \
+       --type=method_call \
+       /com/redhat/dhcp/$interface \
+       com.redhat.dhcp.set \
+       'string:'"`env | /bin/egrep -v '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`";
+       if (( ( dhc_dbus & 31 ) == 31 )); then
+	   exit 0;
+       fi;
+fi;
+
+function save_previous() {
+  if [ -e $1 ]; then
+    /bin/mv $1 $1.predhclient
+  else
+    echo ''> $1.predhclient 
+  fi
+}
+
+make_resolv_conf() {
+  if [ "${PEERDNS}" == "no" ]; then  
+      return 
+  fi
+
+  if [ x$reason == xRENEW ] &&
+     [ "$new_domain_name" == "$old_domain_name" ] && 
+     [ "$new_domain_name_servers" == "$old_domain_name_servers" ]; then
+      return;
+  fi
+
+  if [ -n "$new_domain_name" ] || [ -n "$new_domain_name_servers" ]; then
+    cp -fp /etc/resolv.conf /etc/resolv.conf.predhclient
+    rscf=`mktemp /tmp/XXXXXX`;
+    echo '; generated by /sbin/dhclient-script' > $rscf
+    if [ -n "$SEARCH" ]; then
+ 	echo search $SEARCH >> $rscf
+    else
+	if [ -n "$new_domain_name" ]; then
+ 	    echo search $new_domain_name >> $rscf
+        fi
+    fi
+    for nameserver in $new_domain_name_servers; do
+      echo nameserver $nameserver >> $rscf
+    done
+    change_resolv_conf $rscf
+    rm -f $rscf
+  fi
+}
+
+# Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
+exit_with_hooks() {
+  exit_status=$1
+  if [ -f /etc/dhclient-exit-hooks ]; then
+    . /etc/dhclient-exit-hooks
+  fi
+# probably should do something with exit status of the local script
+  exit $exit_status
+}
+
+# Invoke the local dhcp client enter hooks, if they exist.
+if [ -f /etc/dhclient-enter-hooks ]; then
+  exit_status=0
+  . /etc/dhclient-enter-hooks
+  # allow the local script to abort processing of this state
+  # local script must set exit_status variable to nonzero.
+  if [ $exit_status -ne 0 ]; then
+    exit $exit_status
+  fi
+fi
+
+# Import Red Hat Linux configuration
+cd /etc/sysconfig/network-scripts;
+. /etc/sysconfig/network-scripts/network-functions
+. /etc/rc.d/init.d/functions
+
+[ -f ../network ] && . ../network
+[ -f ../networking/network ] && . ../networking/network
+
+CONFIG=$interface
+
+need_config ${CONFIG}
+
+if [ -f "${CONFIG}" ]; then 
+    source_config
+else
+    echo $"$0: configuration for $interface not found. Continuing with defaults." >&2
+fi
+
+source_config
+
+release=`uname -r`
+relmajor=`echo $release |/bin/cut -f1 -d'.'`
+relminor=`echo $release |/bin/cut -f2 -d'.'`
+
+# simple IP arithmetic functions:
+
+function quad2num()
+{
+    if [ $# -eq 4 ]; then
+       let n="$1<<24|$2<<16|$3<<8|$4"
+       echo $n;
+       return 0;
+    fi
+    echo '0';
+    return 1;
+}
+
+function ip2num()
+{
+    IFS='.' quad2num $1;
+}
+
+function num2ip()
+{
+    let n="$1";
+    let o1='(n>>24)&0xff';
+    let o2='(n>>16)&0xff';
+    let o3='(n>>8)&0xff';
+    let o4='n & 0xff';
+    echo $o1.$o2.$o3.$o4;
+}
+
+function mask()
+{   
+    ip=$1
+    m=$2
+    let ip=`IFS='.' ip2num $ip`;
+    let m=`IFS='.' ip2num $m`;
+    let n='ip&m';
+    num2ip $n;
+}
+
+function mask_bits()
+{
+    ip=$1
+    let ip=`IFS='.' ip2num $ip`;
+    let bits=0
+    for ((bit=1; '((ip&bit)==0) && (bits < 32)'; 'bit<<=1')) do
+        let bits+=1
+    done
+    let n_bits=32-bits
+    echo $n_bits
+}
+
+function class_bits()
+{
+    let ip=`IFS='.' ip2num $1`;
+    let bits=32
+    let mask='255';
+    for ((i=0; i <= 3; i++, 'mask<<=8')); do
+	let v='ip&mask';
+	if [ "$v" -eq 0 ] ; then
+	    let bits-=8;
+        else
+            break;
+	fi;
+    done;
+    echo $bits;
+}
+
+function routerReachable()
+{ # Handle silly DHCP servers that give us a router not on our subnet:    
+    router=$1
+    routerSubnet=`mask $router $new_subnet_mask`
+    mySubnet=`mask $new_ip_address $new_subnet_mask`
+    unreachable=0
+    if [ "$routerSubnet" != "$mySubnet" ]; then
+	unreachable=1
+	if /sbin/arping -f -q -I $interface -w2 $router; then
+	    /sbin/ip route add ${router}/32 dev $interface
+	    if [ $? -eq 0 ]; then
+		unreachable=0
+	    else
+		/usr/bin/logger -p local7.notice -t "NET"  "dhclient: failed to create host route for unreachable router $router not on subnet $mySubnet";
+	    fi
+	else
+	    unreachable=1
+	    if [ -x /usr/bin/logger ]; then
+		/usr/bin/logger -p local7.notice -t "NET"  "dhclient: DHCP router $router is unreachable on DHCP subnet $mySubnet router subnet $routerSubnet";
+	    fi;
+	fi;
+    fi;
+    return $unreachable;
+}
+
+function add_default_gateway()
+{
+    router=$1
+    metric=''
+    if [ $# -gt 1 ] && [ "$2" -gt 0 ]; then 
+	metric="metric $2";
+    fi;    
+    if routerReachable $router ; then
+	/sbin/ip route replace default via $router dev $interface $metric;
+	if [ $? -ne 0 ]; then 
+	    /usr/bin/logger -p local7.notice -t "NET"  'dhclient: failed to create default route: '$router dev $interface $metric;
+	    return 1;
+	else
+	    return 0;
+	fi;
+    fi;
+    return 1;
+}
+
+function dhconfig()
+{
+    if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+	if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
+		[ x$alias_ip_address != x$old_ip_address ]; then
+         # Possible new alias. Remove old alias.
+	    ifconfig $interface:0- inet 0
+	fi
+
+	if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
+        # IP address changed. Bringing down the interface will delete all routes,
+        # and clear the ARP cache.
+	    ifconfig $interface inet 0 down
+	fi
+    fi
+    if [ x$reason = xBOUND ] || [ x$reason = xREBOOT ] ||
+       [ x$old_ip_address  != x$new_ip_address ] ||
+       [ x$old_subnet_mask != x$new_subnet_mask ] ||
+       [ x$new_network_number != x$new_network_number ] ||
+       [ x$old_broadcast_address != x$new_broadcast_address ] ||
+       [ "x$old_routers" != "x$new_routers" ] ||
+       [ x$old_interface_mtu != x$new_interface_mtu ] ; then
+	if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+	    ifconfig $interface inet $new_ip_address $new_subnet_arg \
+		$new_broadcast_arg
+	    if [ -n "$new_interface_mtu" ]; then
+		/sbin/ip link set $interface mtu $new_interface_mtu;
+	    fi;
+	    if [ -x /etc/dhclient-${interface}-up-hooks ]; then
+		. /etc/dhclient-${interface}-up-hooks;
+	    elif [ -x /etc/dhclient-up-hooks ]; then
+		. /etc/dhclient-up-hooks;
+	    fi;
+	fi;
+	
+	if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 4 ) != 4 )); then
+	    prefix_bits=`mask_bits $new_subnet_mask`
+            # Add a network route to the computed network address.
+	    if [ $relmajor -lt 2 ] || \
+		( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
+		/sbin/ip route replace ${new_network_number}/${prefix_bits} dev $interface
+		if [ $added_old_broadcast_route -eq 1 ]; then
+		   /sbin/ip route del default;
+		fi;
+	    fi;
+	    if [[  ( ( -z "$GATEWAYDEV" )  || ( "$GATEWAYDEV" = "$interface" ) ) && ( ( -z "$GATEWAY" )  || ( ( -n "$DHCLIENT_IGNORE_GATEWAY" ) && ( "$DHCLIENT_IGNORE_GATEWAY" = [Yy]* ) ) ) ]]; then
+		metric=${METRIC:-''};
+		let i=${METRIC:-0};
+		default_routers=()
+		for router in $new_routers; do
+		    added_router=0
+		    for r in ${default_routers[@]}; do
+			if [ "$r" == "$router" ]; then
+			    added_router=1;
+                        fi;
+		    done
+		    if [ -z "$router" ] || [ "$added_router" -eq 1 ] || [ `IFS=. ip2num $router` -le 0 ] || [[ ( "$router" = "$new_broadcast_address" ) && ( "$new_subnet_mask" != "255.255.255.255" ) ]]; then
+			continue;
+		    fi;
+		    default_routers=(${default_routers[@]} $router)
+		    add_default_gateway $router $metric;		    
+		    let i=i+1;
+		    metric=$i; 
+		done
+	    elif [[ ( ( -z "$GATEWAYDEV" ) || ( "$GATEWAYDEV" = "$interface" ) ) && ( -n "$GATEWAY" ) ]]; then
+		routerSubnet=`mask $GATEWAY $new_subnet_mask`
+		mySubnet=`mask $new_ip_address $new_subnet_mask`
+		if [ "$routerSubnet" = "$mySubnet" ]; then
+		    /sbin/ip route replace default via $GATEWAY dev $interface 
+		fi;
+	    fi;
+            # static routes
+	    if [ "x$new_static_routes" != x ]; then
+		IFS=', 	' static_routes=($new_static_routes)
+		route_targets=()
+		for((i=0; i<${#static_routes[@]}; i+=2)); do
+		    target=${static_routes[$i]}
+		    gateway=${static_routes[$i+1]}
+		    metric=''
+		    for t in ${route_targets[@]}; do
+			if [ $t == $target ]; then
+			    if [ -z "$metric" ]; then
+				metric=1;
+			    else
+				((metric=metric+1));
+			    fi;
+			fi;
+		    done;
+		    if [ -n "$metric" ]; then
+			metric="metric $metric";
+		    fi;		    
+		    if routerReachable $gateway; then
+			/sbin/ip route replace ${target}/`class_bits $target` via ${gateway} dev $interface ${metric}
+			if [ $? -ne 0 ]; then
+			   /usr/bin/logger -p local7.notice -t 'NET' 'dhclient: failed to create static route:' ${target}/`class_bits $target` via ${gateway} dev $interface ${metric};			
+			else			    
+ 			   route_targets=(${route_targets[@]} $target);
+			fi;
+		    fi;
+		done
+	    fi
+	fi
+    fi
+    if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+	if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
+	    then
+	    ifconfig $interface:0- inet 0
+	    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+	    /sbin/ip route replace ${alias_ip_address}/32 dev $interface:0
+	fi
+    fi
+    if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 1 ) != 1 )); then
+	make_resolv_conf
+
+	if [ -n "$new_host_name" ] && need_hostname; then
+	    hostname $new_host_name
+	fi
+    fi;
+    if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 8 ) != 8 )); then
+	if [ "${PEERNIS}" = no ]; then
+	    :
+	elif [ -n "$new_nis_domain" ]; then
+	    domainname "$new_nis_domain"
+	    save_previous /etc/yp.conf
+	    let contents=0
+	    echo '# generated by /sbin/dhclient-script' > /etc/yp.conf
+	    if [ -n "$new_nis_servers" ]; then
+		for I in $new_nis_servers; do
+		    echo "domain $new_nis_domain server $I" >> /etc/yp.conf
+		    let contents=contents+1
+		done
+	    else
+		echo "domain $new_nis_domain broadcast" >> /etc/yp.conf
+		let contents=contents+1
+	    fi
+	    level=`/sbin/runlevel`
+	    level=${level##*\ }
+	    if [ "$level" = "unknown" ]; then
+		level=1;
+	    fi
+	    if [ $contents -gt 0 ] && [[ "$level" = [0-6] ]] && /sbin/chkconfig --level=$level ypbind >/dev/null 2>&1 && [ -r /var/run/ypbind.pid ] && yppid=`cat /var/run/ypbind.pid` && [ -d /proc/${yppid} ] && [ "`if [ -x /sbin/busybox ]; then /sbin/busybox readlink /proc/${yppid}/exe; else echo /sbin/ypbind; fi`" = "/sbin/ypbind" ]; then
+	       kill -HUP $yppid;
+	    fi
+	elif [ -n "$new_nis_servers" ]; then
+	    save_previous /etc/yp.conf
+	    echo '# generated by /sbin/dhclient-script' > /etc/yp.conf
+	    let contents=0
+	    for I in $new_nis_servers; do
+		echo "ypserver $I" >> /etc/yp.conf
+		let contents=contents+1
+	    done
+	    level=`/sbin/runlevel`
+	    level=${level##*\ }
+	    if [ "$level" = "unknown" ]; then
+		level=1;
+	    fi
+	    if [ $contents -gt 0 ] && [[ "$level" = [0-6] ]] && /sbin/chkconfig --level=$level ypbind >/dev/null 2>&1 && [ -r /var/run/ypbind.pid ] && yppid=`cat /var/run/ypbind.pid` && [ -d /proc/${yppid} ] && [ "`if [ -x /sbin/busybox ]; then /sbin/busybox readlink /proc/${yppid}/exe; else echo /sbin/ypbind; fi`" = "/sbin/ypbind" ] ; then
+	       kill -HUP $yppid;
+	    fi
+	fi
+    fi
+    if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 16 ) != 16 )); then
+	if [ -n "$DHCP_TIME_OFFSET_SETS_TIMEZONE" ] && [[ "$DHCP_TIME_OFFSET_SETS_TIMEZONE" = [yY1]* ]]; then
+	    if [ -n "$new_time_offset" ]; then
+	    #   DHCP option "time-offset" is requested by default and should be handled.
+	    #   The geographical zone abbreviation cannot be determined from the GMT offset,
+	    #   but the $ZONEINFO/Etc/GMT$offset file can be used - note: this disables DST.
+		((z=new_time_offset/3600));
+		((hoursWest=`printf '%+d' $z`))
+		if (( $hoursWest < 0 )); then
+		   # tzdata treats negative 'hours west' as positive 'gmtoff' !
+		   ((hoursWest*=-1));
+		fi
+		tzfile=/usr/share/zoneinfo/Etc/GMT`printf '%+d' $hoursWest`;
+		if [ -e $tzfile ]; then
+		    /bin/mv -f /etc/localtime /etc/localtime.predhclient;
+		    /bin/cp -fp $tzfile /etc/localtime;
+		    /bin/touch /etc/localtime;
+		fi;
+	    fi;
+	fi;
+	if [ "${PEERNTP}" = no ]; then
+	    :
+	elif [ -n "$new_ntp_servers" ] && [ -e /etc/ntp.conf ]; then
+	    save_previous /etc/ntp.conf
+	    /bin/egrep -v '(^[\ \	]*(server|fudge))|(generated by /sbin/dhclient-script)'< /etc/ntp.conf.predhclient > /etc/ntp.conf
+	    echo '# servers generated by /sbin/dhclient-script' >> /etc/ntp.conf
+	    localClocks=(`/bin/egrep '^[\ \	]*server[\ \	]+127\.127' /etc/ntp.conf.predhclient | while read s addr rest; do echo $addr; done`)      
+	    localClockFudge="`/bin/egrep '^[\ \	]*fudge[\ \	]+127\.127' /etc/ntp.conf.predhclient`";
+	    for s in $new_ntp_servers ${localClocks[@]};
+	      do
+	      echo 'server '$s >> /etc/ntp.conf;
+	    done
+	    echo "$localClockFudge" >> /etc/ntp.conf;
+	    if [ -x /usr/bin/diff ] && /usr/bin/diff -q /etc/ntp.conf /etc/ntp.conf.predhclient >/dev/null 2>&1; then
+		: ;
+	    else
+		/sbin/service ntpd condrestart >/dev/null 2>&1
+	    fi;
+	fi
+    fi;
+}
+
+if [ x$new_broadcast_address != x ] && [ x$new_subnet_mask != x ] && [ "$new_subnet_mask" != "255.255.255.255" ]; then
+  new_broadcast_arg="broadcast $new_broadcast_address"
+fi
+if [ x$old_broadcast_address != x ]; then
+  old_broadcast_arg="broadcast $old_broadcast_address"
+fi
+if [ x$new_subnet_mask != x ]; then
+  new_subnet_arg="netmask $new_subnet_mask"
+fi
+if [ x$old_subnet_mask != x ]; then
+  old_subnet_arg="netmask $old_subnet_mask"
+fi
+if [ x$alias_subnet_mask != x ]; then
+  alias_subnet_arg="netmask $alias_subnet_mask"
+fi
+
+if [ x$reason = xMEDIUM ]; then
+  # Linux doesn't do mediums (ok, ok, media).
+  exit_with_hooks 0
+fi
+
+added_old_broadcast_route=0;
+if [ x$reason = xPREINIT ]; then
+    if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+	if [ x$alias_ip_address != x ]; then
+    # Bring down alias interface. Its routes will disappear too.
+	    ifconfig $interface:0- inet 0
+	fi
+	if [ x$keep_old_ip = xyes ]; then
+	    ifconfig $interface up
+	elif [ $relmajor -lt 2 ] || ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] )   then
+	    ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \
+		broadcast 255.255.255.255 up
+    # Add route to make broadcast work. Do not omit netmask.
+	    /sbin/ip route replace default dev $interface && added_old_broadcast_route=1;
+	else
+	    ifconfig $interface 0 up
+	fi     
+
+  # We need to give the kernel some time to get the interface up.
+  #	sleep 1
+  # I don't think this is necessary with modern kernels - no problems found during testing -
+  # JVD, 2005-06-17
+	# but just in case:
+	if [ -n "$DHCLIENT_DELAY" ] && [ "$DHCLIENT_DELAY" -gt 0 ] ; then
+	    sleep $DHCLIENT_DELAY;
+	fi;
+	exit_with_hooks 0
+    fi;
+fi
+
+if [ x$reason = xARPCHECK ] || [ x$reason = xARPSEND ]; then
+    if [ -z "$new_ip_address" ] || [ -z "$interface" ] ||  /sbin/arping -q -f -c 2 -w 3 -D -I ${interface} ${new_ip_address}; then
+	exit_with_hooks 0
+    else
+	exit_with_hooks 1
+    fi;
+fi
+  
+if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
+   [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then    
+    dhconfig ;
+    exit_with_hooks 0
+fi
+
+if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \
+   || [ x$reason = xSTOP ]; then
+  if [ -f /etc/resolv.conf.predhclient ]; then
+     change_resolv_conf /etc/resolv.conf.predhclient
+     rm -f /etc/resolv.conf.predhclient
+  fi
+  if [ -n "$DHCP_TIME_OFFSET_SETS_TIMEZONE" ] && [[ "$DHCP_TIME_OFFSET_SETS_TIMEZONE" = [yY1]* ]]; then
+      if [ -e /etc/localtime.predhclient ]; then
+	  /bin/rm -f /etc/localtime
+	  /bin/mv -f /etc/localtime.predhclient /etc/localtime;
+	  /bin/touch /etc/localtime;
+      fi;
+  fi;
+  if [ -f /etc/ntp.conf.predhclient ]; then
+     /bin/rm -f /etc/ntp.conf
+     /bin/mv -f /etc/ntp.conf.predhclient /etc/ntp.conf
+     service ntpd condrestart >/dev/null 2>&1 
+  fi
+  if [ -f /etc/yp.conf.predhclient ]; then
+     /bin/rm -f /etc/yp.conf
+     /bin/mv -f /etc/yp.conf.predhclient /etc/yp.conf
+     level=`/sbin/runlevel`
+     level=${level##*\ }
+     if [ "$level" = "unknown" ]; then
+	 level=1;
+     fi
+     if [[ "$level" = [0-6] ]] && /sbin/chkconfig --level=$level ypbind >/dev/null 2>&1 && [ -r /var/run/ypbind.pid ] && yppid=`cat /var/run/ypbind.pid` && [ -d /proc/${yppid} ] && [ "`if [ -x /sbin/busybox ]; then /sbin/busybox readlink /proc/${yppid}/exe; else echo /sbin/ypbind; fi`" = "/sbin/ypbind" ] ; then
+	 kill -HUP $yppid;
+     fi
+  fi 
+  if [ -x /etc/dhclient-${interface}-down-hooks ]; then
+      . /etc/dhclient-${interface}-down-hooks;
+  elif [ -x /etc/dhclient-down-hooks ]; then
+      . /etc/dhclient-down-hooks;
+  fi;
+  if [ x$alias_ip_address != x ]; then
+    # Turn off alias interface.
+    ifconfig $interface:0- inet 0
+  fi
+  if [ x$old_ip_address != x ]; then
+    # Shut down interface, which will delete routes and clear arp cache.
+    ifconfig $interface inet 0 down
+  fi
+  if [ x$alias_ip_address != x ]; then
+    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+    /sbin/ip route replace ${alias_ip_address}/32 $interface:0
+  fi
+  exit_with_hooks 0
+fi
+
+if [ x$reason = xTIMEOUT ] && [ "x$new_routers" != 'x' ]; then
+    if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+	if [ x$alias_ip_address != x ]; then
+	    ifconfig $interface:0- inet 0
+	fi
+	ifconfig $interface inet $new_ip_address $new_subnet_arg \
+					$new_broadcast_arg
+    fi;
+    set $new_routers
+    if ping -q -c 1 -w 10 -I $interface $1; then
+	dhconfig ;
+	exit_with_hooks 0
+    fi
+    if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+	ifconfig $interface inet 0 down
+    fi;
+    exit_with_hooks 1
+elif [ x$reason = xTIMEOUT ]; then
+  exit_with_hooks 1
+fi
+exit_with_hooks 0


Index: linux.dbus-example
===================================================================
RCS file: linux.dbus-example
diff -N linux.dbus-example
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux.dbus-example	11 Apr 2007 19:36:37 -0000	1.3
@@ -0,0 +1,223 @@
+#!/bin/bash
+# dhclient-script for Linux. Dan Halbert, March, 1997.
+# Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
+# No guarantees about this. I'm a novice at the details of Linux
+# networking.
+
+# Notes:
+
+# 0. This script is based on the netbsd script supplied with dhcp-970306.
+
+# 1. ifconfig down apparently deletes all relevant routes and flushes
+# the arp cache, so this doesn't need to be done explicitly.
+
+# 2. The alias address handling here has not been tested AT ALL.
+# I'm just going by the doc of modern Linux ip aliasing, which uses
+# notations like eth0:0, eth0:1, for each alias.
+
+# 3. I have to calculate the network address, and calculate the broadcast
+# address if it is not supplied. This might be much more easily done
+# by the dhclient C code, and passed on.
+
+# 4. TIMEOUT not tested. ping has a flag I don't know, and I'm suspicious
+# of the $1 in its args.
+
+if [ -n "${dhc_dbus}" ]; then
+  /bin/dbus-send \
+    --system --dest=com.redhat.dhcp --type=method_call \
+    /com/redhat/dhcp/$interface com.redhat.dhcp.set \
+    'string:'"`env | /bin/egrep -v '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`";
+    if (( ( dhc_dbus & 31 ) == 31 )); then
+    exit 0;
+    fi;
+fi;
+
+make_resolv_conf() {
+  if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then
+    echo search $new_domain_name >/etc/resolv.conf
+    chmod 644 /etc/resolv.conf
+    for nameserver in $new_domain_name_servers; do
+      echo nameserver $nameserver >>/etc/resolv.conf
+    done
+  fi
+}
+
+# Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
+exit_with_hooks() {
+  exit_status=$1
+  if [ -f /etc/dhclient-exit-hooks ]; then
+    . /etc/dhclient-exit-hooks
+  fi
+# probably should do something with exit status of the local script
+  exit $exit_status
+}
+
+# Invoke the local dhcp client enter hooks, if they exist.
+if [ -f /etc/dhclient-enter-hooks ]; then
+  exit_status=0
+  . /etc/dhclient-enter-hooks
+  # allow the local script to abort processing of this state
+  # local script must set exit_status variable to nonzero.
+  if [ $exit_status -ne 0 ]; then
+    exit $exit_status
+  fi
+fi
+
+release=`uname -r`
+release=`expr $release : '\(.*\)\..*'`
+relminor=`echo $release |sed -e 's/[0-9]*\.\([0-9][0-9]*\)\(\..*\)*$/\1/'`
+relmajor=`echo $release |sed -e 's/\([0-9][0-9]*\)\..*$/\1/'`
+
+if [ x$new_broadcast_address != x ]; then
+  new_broadcast_arg="broadcast $new_broadcast_address"
+fi
+if [ x$old_broadcast_address != x ]; then
+  old_broadcast_arg="broadcast $old_broadcast_address"
+fi
+if [ x$new_subnet_mask != x ]; then
+  new_subnet_arg="netmask $new_subnet_mask"
+fi
+if [ x$old_subnet_mask != x ]; then
+  old_subnet_arg="netmask $old_subnet_mask"
+fi
+if [ x$alias_subnet_mask != x ]; then
+  alias_subnet_arg="netmask $alias_subnet_mask"
+fi
+
+if [ x$reason = xMEDIUM ]; then
+  # Linux doesn't do mediums (ok, ok, media).
+  exit_with_hooks 0
+fi
+
+if [ x$reason = xPREINIT ]; then
+  if [ x$alias_ip_address != x ]; then
+    # Bring down alias interface. Its routes will disappear too.
+    ifconfig $interface:0- inet 0
+  fi
+  if [ $relmajor -lt 2 ] || ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] )
+   then
+    ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \
+		broadcast 255.255.255.255 up
+    # Add route to make broadcast work. Do not omit netmask.
+    route add default dev $interface netmask 0.0.0.0
+  else
+    ifconfig $interface 0 up
+  fi
+
+  # We need to give the kernel some time to get the interface up.
+  sleep 1
+
+  exit_with_hooks 0
+fi
+
+if [ x$reason = xARPCHECK ] || [ x$reason = xARPSEND ]; then
+  exit_with_hooks 0
+fi
+  
+if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
+   [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then
+  current_hostname=`hostname`
+  if [ x$current_hostname = x ] || \
+     [ x$current_hostname = x$old_host_name ]; then
+    if [ x$current_hostname = x ] || \
+       [ x$new_host_name != x$old_host_name ]; then
+      hostname $new_host_name
+    fi
+  fi
+
+  if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+  if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
+		[ x$alias_ip_address != x$old_ip_address ]; then
+    # Possible new alias. Remove old alias.
+    ifconfig $interface:0- inet 0
+  fi
+  if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
+    # IP address changed. Bringing down the interface will delete all routes,
+    # and clear the ARP cache.
+    ifconfig $interface inet 0 down
+
+  fi
+  fi
+  if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+     [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+  if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+    ifconfig $interface inet $new_ip_address $new_subnet_arg \
+							$new_broadcast_arg
+  fi
+  if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 4 ) != 4 )); then
+    # Add a network route to the computed network address.
+    if [ $relmajor -lt 2 ] || \
+		( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
+      route add -net $new_network_number $new_subnet_arg dev $interface
+    fi
+    for router in $new_routers; do
+      route add default gw $router
+    done
+  fi
+  fi
+  if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+  if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
+   then
+    ifconfig $interface:0- inet 0
+    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+    route add -host $alias_ip_address $interface:0
+  fi
+  fi
+  if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 1 ) != 1 )); then
+  make_resolv_conf
+  fi
+  exit_with_hooks 0
+fi
+
+if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \
+   || [ x$reason = xSTOP ]; then
+  if [ x$alias_ip_address != x ]; then
+    # Turn off alias interface.
+    ifconfig $interface:0- inet 0
+  fi
+  if [ x$old_ip_address != x ]; then
+    # Shut down interface, which will delete routes and clear arp cache.
+    ifconfig $interface inet 0 down
+  fi
+  if [ x$alias_ip_address != x ]; then
+    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+    route add -host $alias_ip_address $interface:0
+  fi
+  exit_with_hooks 0
+fi
+fi
+
+if [ x$reason = xTIMEOUT ]; then
+  if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+  if [ x$alias_ip_address != x ]; then
+    ifconfig $interface:0- inet 0
+  fi
+  ifconfig $interface inet $new_ip_address $new_subnet_arg \
+					$new_broadcast_arg
+  fi
+  set $new_routers
+  ############## what is -w in ping?
+  if ping -q -c 1 $1; then
+    if [ x$new_ip_address != x$alias_ip_address ] && \
+			[ x$alias_ip_address != x ]; then
+      ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+      route add -host $alias_ip_address dev $interface:0
+    fi
+    if [ $relmajor -lt 2 ] || \
+		( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
+      route add -net $new_network_number
+    fi
+    for router in $new_routers; do
+      route add default gw $router
+    done
+    make_resolv_conf
+    exit_with_hooks 0
+  fi
+  if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+  ifconfig $interface inet 0 down
+  fi
+  exit_with_hooks 1
+fi
+
+exit_with_hooks 0



From fedora-cvs-commits at redhat.com  Wed Apr 11 19:38:33 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 15:38:33 -0400
Subject: rpms/dhcp/devel dhcpd-conf-to-ldap, 1.3, NONE linux, 1.3,
	NONE linux.dbus-example, 1.3, NONE
Message-ID: <200704111938.l3BJcXlo005968@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5919

Removed Files:
	dhcpd-conf-to-ldap linux linux.dbus-example 
Log Message:
Removed again.



--- dhcpd-conf-to-ldap DELETED ---


--- linux DELETED ---


--- linux.dbus-example DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 11 19:38:58 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 15:38:58 -0400
Subject: rpms/dhcp/devel dhcpd-conf-to-ldap, 1.4, 1.5 linux, 1.4,
	1.5 linux.dbus-example, 1.4, 1.5
Message-ID: <200704111938.l3BJcwHG006012@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5995

Added Files:
	dhcpd-conf-to-ldap linux linux.dbus-example 
Log Message:
Re-added with 0644 permissions.



Index: dhcpd-conf-to-ldap
===================================================================
RCS file: dhcpd-conf-to-ldap
diff -N dhcpd-conf-to-ldap
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ dhcpd-conf-to-ldap	11 Apr 2007 19:38:56 -0000	1.5
@@ -0,0 +1,517 @@
+#!/usr/bin/perl -w
+
+# Brian Masney <masneyb at ntelos.net>
+# To use this script, set your base DN below. Then run 
+# ./dhcpd-conf-to-ldap.pl < /path-to-dhcpd-conf/dhcpd.conf > output-file
+# The output of this script will generate entries in LDIF format. You can use
+# the slapadd command to add these entries into your LDAP server. You will
+# definately want to double check that your LDAP entries are correct before
+# you load them into LDAP.
+
+# This script does not do much error checking. Make sure before you run this
+# that the DHCP server doesn't give any errors about your config file
+
+use Sys::Hostname;
+
+my $basedn = "dc=ntelos, dc=net";
+
+sub next_token
+{
+  local ($lowercase) = @_;
+  local ($token, $newline);
+
+  do 
+    {
+      if (!defined ($line) || length ($line) == 0)
+        {
+          $line = <>;
+          return undef if !defined ($line);
+          chop $line;
+          $line_number++;
+          $token_number = 0;
+        }
+
+      $line =~ s/#.*//;
+      $line =~ s/^\s+//;
+      $line =~ s/\s+$//;
+    }
+  while (length ($line) == 0);
+
+  if (($token, $newline) = $line =~ /^(.*?)\s+(.*)/)
+    {
+      $line = $newline;
+    }
+  else
+    {
+      $token = $line;
+      $line = '';
+    }
+  $token_number++;
+
+  $token =~ y/[A-Z]/[a-z]/ if $lowercase;
+
+  return ($token);
+}
+
+
+sub remaining_line
+{
+  local ($tmp, $str);
+
+  $str = "";
+  while (($tmp = next_token (0)))
+    {
+      $str .= ' ' if !($str eq "");
+      $str .= $tmp;
+      last if $tmp =~ /;\s*$/;
+    }
+
+  $str =~ s/;$//;
+  return ($str);
+}
+
+
+sub
+add_dn_to_stack
+{
+  local ($dn) = @_;
+
+  $current_dn = "$dn, $current_dn";
+}
+
+
+sub
+remove_dn_from_stack
+{
+  $current_dn =~ s/^.*?,\s*//;
+}
+
+
+sub
+parse_error
+{
+  print "Parse error on line number $line_number at token number $token_number\n";
+  exit (1);
+}
+
+
+sub
+print_entry
+{
+  return if (scalar keys %curentry == 0);
+
+  if (!defined ($curentry{'type'}))
+    {
+      $host = hostname ();
+      $hostdn = "cn=$host, $basedn";
+      print "dn: $hostdn\n";
+      print "objectClass: top\n";
+      print "objectClass: dhcpServer\n";
+      print "cn: $host\n";
+      print "dhcpServiceDN: $current_dn\n\n";
+
+      print "dn: $current_dn\n";
+      print "cn: DHCP Config\n";
+      print "objectClass: top\n";
+      print "objectClass: dhcpService\n";
+      if (defined ($curentry{'options'}))
+        {
+          print "objectClass: dhcpOptions\n";
+        }
+      print "dhcpPrimaryDN: $hostdn\n";
+    }
+  elsif ($curentry{'type'} eq 'subnet')
+    {
+      print "dn: $current_dn\n";
+      print "cn: " . $curentry{'ip'} . "\n";
+      print "objectClass: top\n";
+      print "objectClass: dhcpSubnet\n";
+      if (defined ($curentry{'options'}))
+        {
+          print "objectClass: dhcpOptions\n";
+        }
+      
+      print "dhcpNetMask: " . $curentry{'netmask'} . "\n";
+      if (defined ($curentry{'range'}))
+        {
+          print "dhcpRange: " . $curentry{'range'} . "\n";
+        }
+    }
+  elsif ($curentry{'type'} eq 'shared-network')
+    {
+      print "dn: $current_dn\n";
+      print "cn: " . $curentry{'descr'} . "\n";
+      print "objectClass: top\n";
+      print "objectClass: dhcpSharedNetwork\n";
+      if (defined ($curentry{'options'}))
+        {
+          print "objectClass: dhcpOptions\n";
+        }
+    }
+  elsif ($curentry{'type'} eq 'group')
+    {
+      print "dn: $current_dn\n";
+      print "cn: group\n";
+      print "objectClass: top\n";
+      print "objectClass: dhcpGroup\n";
+      if (defined ($curentry{'options'}))
+        {
+          print "objectClass: dhcpOptions\n";
+        }
+    }
+  elsif ($curentry{'type'} eq 'host')
+    {
+      print "dn: $current_dn\n";
+      print "cn: " . $curentry{'host'} . "\n";
+      print "objectClass: top\n";
+      print "objectClass: dhcpHost\n";
+      if (defined ($curentry{'options'}))
+        {
+          print "objectClass: dhcpOptions\n";
+        }
+
+      if (defined ($curentry{'hwaddress'}))
+        {
+          print "dhcpHWAddress: " . $curentry{'hwaddress'} . "\n";
+        }
+    }
+  elsif ($curentry{'type'} eq 'pool')
+    {
+      print "dn: $current_dn\n";
+      print "cn: pool\n";
+      print "objectClass: top\n";
+      print "objectClass: dhcpPool\n";
+      if (defined ($curentry{'options'}))
+        {
+          print "objectClass: dhcpOptions\n";
+        }
+
+      if (defined ($curentry{'range'}))
+        {
+          print "dhcpRange: " . $curentry{'range'} . "\n";
+        }
+    }
+  elsif ($curentry{'type'} eq 'class')
+    {
+      print "dn: $current_dn\n";
+      print "cn: " . $curentry{'class'} . "\n";
+      print "objectClass: top\n";
+      print "objectClass: dhcpClass\n";
+      if (defined ($curentry{'options'}))
+        {
+          print "objectClass: dhcpOptions\n";
+        }
+    }
+  elsif ($curentry{'type'} eq 'subclass')
+    {
+      print "dn: $current_dn\n";
+      print "cn: " . $curentry{'subclass'} . "\n";
+      print "objectClass: top\n";
+      print "objectClass: dhcpSubClass\n";
+      if (defined ($curentry{'options'}))
+        {
+          print "objectClass: dhcpOptions\n";
+        }
+      print "dhcpClassData: " . $curentry{'class'} . "\n";
+    }
+
+  if (defined ($curentry{'statements'}))
+    {
+      foreach $statement (@{$curentry{'statements'}})
+        {
+          print "dhcpStatements: $statement\n";
+        }
+    }
+
+  if (defined ($curentry{'options'}))
+    {
+      foreach $statement (@{$curentry{'options'}})
+        {
+          print "dhcpOption: $statement\n";
+        }
+    }
+
+  print "\n";
+  undef (%curentry);
+}
+
+
+sub parse_netmask
+{
+  local ($netmask) = @_;
+  local ($i);
+
+  if ((($a, $b, $c, $d) = $netmask =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/) != 4)
+    {
+      parse_error ();
+    }
+
+  $num = (($a & 0xff) << 24) |
+         (($b & 0xff) << 16) |
+         (($c & 0xff) << 8) |
+          ($d & 0xff);
+
+  for ($i=1; $i<=32 && $num & (1 << (32 - $i)); $i++)
+    {
+    }
+  $i--;
+
+  return ($i);
+}
+
+
+sub parse_subnet
+{
+  local ($ip, $tmp, $netmask);
+
+  print_entry () if %curentry;
+    
+  $ip = next_token (0);
+  parse_error () if !defined ($ip);
+
+  $tmp = next_token (1);
+  parse_error () if !defined ($tmp);
+  parse_error () if !($tmp eq 'netmask');
+
+  $tmp = next_token (0);
+  parse_error () if !defined ($tmp);
+  $netmask = parse_netmask ($tmp);
+
+  $tmp = next_token (0);
+  parse_error () if !defined ($tmp);
+  parse_error () if !($tmp eq '{');
+
+  add_dn_to_stack ("cn=$ip");
+  $curentry{'type'} = 'subnet';
+  $curentry{'ip'} = $ip;
+  $curentry{'netmask'} = $netmask;
+}
+
+
+sub parse_shared_network
+{
+  local ($descr, $tmp);
+
+  print_entry () if %curentry;
+
+  $descr = next_token (0);
+  parse_error () if !defined ($descr);
+
+  $tmp = next_token (0);
+  parse_error () if !defined ($tmp);
+  parse_error () if !($tmp eq '{');
+
+  add_dn_to_stack ("cn=$descr");
+  $curentry{'type'} = 'shared-network';
+  $curentry{'descr'} = $descr;
+}
+
+
+sub parse_host
+{
+  local ($descr, $tmp);
+
+  print_entry () if %curentry;
+
+  $host = next_token (0);
+  parse_error () if !defined ($host);
+
+  $tmp = next_token (0);
+  parse_error () if !defined ($tmp);
+  parse_error () if !($tmp eq '{');
+
+  add_dn_to_stack ("cn=$host");
+  $curentry{'type'} = 'host';
+  $curentry{'host'} = $host;
+}
+
+
+sub parse_group
+{
+  local ($descr, $tmp);
+
+  print_entry () if %curentry;
+
+  $tmp = next_token (0);
+  parse_error () if !defined ($tmp);
+  parse_error () if !($tmp eq '{');
+
+  add_dn_to_stack ("cn=group");
+  $curentry{'type'} = 'group';
+}
+
+
+sub parse_pool
+{
+  local ($descr, $tmp);
+
+  print_entry () if %curentry;
+
+  $tmp = next_token (0);
+  parse_error () if !defined ($tmp);
+  parse_error () if !($tmp eq '{');
+
+  add_dn_to_stack ("cn=pool");
+  $curentry{'type'} = 'pool';
+}
+
+
+sub parse_class
+{
+  local ($descr, $tmp);
+
+  print_entry () if %curentry;
+
+  $class = next_token (0);
+  parse_error () if !defined ($class);
+
+  $tmp = next_token (0);
+  parse_error () if !defined ($tmp);
+  parse_error () if !($tmp eq '{');
+
+  $class =~ s/\"//g;
+  add_dn_to_stack ("cn=$class");
+  $curentry{'type'} = 'class';
+  $curentry{'class'} = $class;
+}
+
+
+sub parse_subclass
+{
+  local ($descr, $tmp);
+
+  print_entry () if %curentry;
+
+  $class = next_token (0);
+  parse_error () if !defined ($class);
+
+  $subclass = next_token (0);
+  parse_error () if !defined ($subclass);
+
+  $tmp = next_token (0);
+  parse_error () if !defined ($tmp);
+  parse_error () if !($tmp eq '{');
+
+  add_dn_to_stack ("cn=$subclass");
+  $curentry{'type'} = 'subclass';
+  $curentry{'class'} = $class;
+  $curentry{'subclass'} = $subclass;
+}
+
+
+sub parse_hwaddress
+{
+  local ($type, $hw, $tmp);
+
+  $type = next_token (0);
+  parse_error () if !defined ($type);
+
+  $hw = next_token (0);
+  parse_error () if !defined ($hw);
+  $hw =~ s/;$//;
+
+  $curentry{'hwaddress'} = "$type $hw";
+}
+
+    
+sub parse_range
+{
+  local ($tmp, $str);
+
+  $str = remaining_line ();
+
+  if (!($str eq ''))
+    {
+      $str =~ s/;$//;
+      $curentry{'range'} = $str;
+    }
+}
+
+
+sub parse_statement
+{
+  local ($token) = shift;
+  local ($str);
+
+  if ($token eq 'option')
+    {
+      $str = remaining_line ();
+      push (@{$curentry{'options'}}, $str);
+    }
+  else
+    {
+      $str = $token . " " . remaining_line ();
+      push (@{$curentry{'statements'}}, $str);
+    }
+}
+
+
+my $token;
+my $token_number = 0;
+my $line_number = 0;
+my %curentry;
+
+$current_dn = "cn=DHCP Config, $basedn";
+$curentry{'descr'} = 'DHCP Config';
+$line = '';
+
+while (($token = next_token (1)))
+  {
+    if ($token eq '}')
+      {
+        print_entry () if %curentry;
+        remove_dn_from_stack ();
+      }
+    elsif ($token eq 'subnet')
+      {
+        parse_subnet ();
+        next;
+      }
+    elsif ($token eq 'shared-network')
+      {
+        parse_shared_network ();
+        next;
+      }
+    elsif ($token eq 'class')
+      {
+        parse_class ();
+        next;
+      }
+    elsif ($token eq 'subclass')
+      {
+        parse_subclass ();
+        next;
+      }
+    elsif ($token eq 'pool')
+      {
+        parse_pool ();
+        next;
+      }
+    elsif ($token eq 'group')
+      {
+        parse_group ();
+        next;
+      }
+    elsif ($token eq 'host')
+      {
+        parse_host ();
+        next;
+      }
+    elsif ($token eq 'hardware')
+      {
+        parse_hwaddress ();
+        next;
+      }
+    elsif ($token eq 'range')
+      {
+        parse_range ();
+        next;
+      }
+    else
+      {
+        parse_statement ($token);
+        next;
+      }
+  }
+
+


Index: linux
===================================================================
RCS file: linux
diff -N linux
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux	11 Apr 2007 19:38:56 -0000	1.5
@@ -0,0 +1,566 @@
+#!/bin/bash
+# dhclient-script for Linux. Dan Halbert, March, 1997.
+# Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
+# No guarantees about this. I'm a novice at the details of Linux
+# networking.
+
+# Notes:
+
+# 0. This script is based on the netbsd script supplied with dhcp-970306.
+
+# 1. ifconfig down apparently deletes all relevant routes and flushes
+# the arp cache, so this doesn't need to be done explicitly.
+
+# 2. The alias address handling here has not been tested AT ALL.
+# I'm just going by the doc of modern Linux ip aliasing, which uses
+# notations like eth0:0, eth0:1, for each alias.
+
+# 3. I have to calculate the network address, and calculate the broadcast
+# address if it is not supplied. This might be much more easily done
+# by the dhclient C code, and passed on.
+
+if [ -n "${dhc_dbus}" ]; then
+   /bin/dbus-send \
+       --system \
+       --dest=com.redhat.dhcp \
+       --type=method_call \
+       /com/redhat/dhcp/$interface \
+       com.redhat.dhcp.set \
+       'string:'"`env | /bin/egrep -v '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`";
+       if (( ( dhc_dbus & 31 ) == 31 )); then
+	   exit 0;
+       fi;
+fi;
+
+function save_previous() {
+  if [ -e $1 ]; then
+    /bin/mv $1 $1.predhclient
+  else
+    echo ''> $1.predhclient 
+  fi
+}
+
+make_resolv_conf() {
+  if [ "${PEERDNS}" == "no" ]; then  
+      return 
+  fi
+
+  if [ x$reason == xRENEW ] &&
+     [ "$new_domain_name" == "$old_domain_name" ] && 
+     [ "$new_domain_name_servers" == "$old_domain_name_servers" ]; then
+      return;
+  fi
+
+  if [ -n "$new_domain_name" ] || [ -n "$new_domain_name_servers" ]; then
+    cp -fp /etc/resolv.conf /etc/resolv.conf.predhclient
+    rscf=`mktemp /tmp/XXXXXX`;
+    echo '; generated by /sbin/dhclient-script' > $rscf
+    if [ -n "$SEARCH" ]; then
+ 	echo search $SEARCH >> $rscf
+    else
+	if [ -n "$new_domain_name" ]; then
+ 	    echo search $new_domain_name >> $rscf
+        fi
+    fi
+    for nameserver in $new_domain_name_servers; do
+      echo nameserver $nameserver >> $rscf
+    done
+    change_resolv_conf $rscf
+    rm -f $rscf
+  fi
+}
+
+# Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
+exit_with_hooks() {
+  exit_status=$1
+  if [ -f /etc/dhclient-exit-hooks ]; then
+    . /etc/dhclient-exit-hooks
+  fi
+# probably should do something with exit status of the local script
+  exit $exit_status
+}
+
+# Invoke the local dhcp client enter hooks, if they exist.
+if [ -f /etc/dhclient-enter-hooks ]; then
+  exit_status=0
+  . /etc/dhclient-enter-hooks
+  # allow the local script to abort processing of this state
+  # local script must set exit_status variable to nonzero.
+  if [ $exit_status -ne 0 ]; then
+    exit $exit_status
+  fi
+fi
+
+# Import Red Hat Linux configuration
+cd /etc/sysconfig/network-scripts;
+. /etc/sysconfig/network-scripts/network-functions
+. /etc/rc.d/init.d/functions
+
+[ -f ../network ] && . ../network
+[ -f ../networking/network ] && . ../networking/network
+
+CONFIG=$interface
+
+need_config ${CONFIG}
+
+if [ -f "${CONFIG}" ]; then 
+    source_config
+else
+    echo $"$0: configuration for $interface not found. Continuing with defaults." >&2
+fi
+
+source_config
+
+release=`uname -r`
+relmajor=`echo $release |/bin/cut -f1 -d'.'`
+relminor=`echo $release |/bin/cut -f2 -d'.'`
+
+# simple IP arithmetic functions:
+
+function quad2num()
+{
+    if [ $# -eq 4 ]; then
+       let n="$1<<24|$2<<16|$3<<8|$4"
+       echo $n;
+       return 0;
+    fi
+    echo '0';
+    return 1;
+}
+
+function ip2num()
+{
+    IFS='.' quad2num $1;
+}
+
+function num2ip()
+{
+    let n="$1";
+    let o1='(n>>24)&0xff';
+    let o2='(n>>16)&0xff';
+    let o3='(n>>8)&0xff';
+    let o4='n & 0xff';
+    echo $o1.$o2.$o3.$o4;
+}
+
+function mask()
+{   
+    ip=$1
+    m=$2
+    let ip=`IFS='.' ip2num $ip`;
+    let m=`IFS='.' ip2num $m`;
+    let n='ip&m';
+    num2ip $n;
+}
+
+function mask_bits()
+{
+    ip=$1
+    let ip=`IFS='.' ip2num $ip`;
+    let bits=0
+    for ((bit=1; '((ip&bit)==0) && (bits < 32)'; 'bit<<=1')) do
+        let bits+=1
+    done
+    let n_bits=32-bits
+    echo $n_bits
+}
+
+function class_bits()
+{
+    let ip=`IFS='.' ip2num $1`;
+    let bits=32
+    let mask='255';
+    for ((i=0; i <= 3; i++, 'mask<<=8')); do
+	let v='ip&mask';
+	if [ "$v" -eq 0 ] ; then
+	    let bits-=8;
+        else
+            break;
+	fi;
+    done;
+    echo $bits;
+}
+
+function routerReachable()
+{ # Handle silly DHCP servers that give us a router not on our subnet:    
+    router=$1
+    routerSubnet=`mask $router $new_subnet_mask`
+    mySubnet=`mask $new_ip_address $new_subnet_mask`
+    unreachable=0
+    if [ "$routerSubnet" != "$mySubnet" ]; then
+	unreachable=1
+	if /sbin/arping -f -q -I $interface -w2 $router; then
+	    /sbin/ip route add ${router}/32 dev $interface
+	    if [ $? -eq 0 ]; then
+		unreachable=0
+	    else
+		/usr/bin/logger -p local7.notice -t "NET"  "dhclient: failed to create host route for unreachable router $router not on subnet $mySubnet";
+	    fi
+	else
+	    unreachable=1
+	    if [ -x /usr/bin/logger ]; then
+		/usr/bin/logger -p local7.notice -t "NET"  "dhclient: DHCP router $router is unreachable on DHCP subnet $mySubnet router subnet $routerSubnet";
+	    fi;
+	fi;
+    fi;
+    return $unreachable;
+}
+
+function add_default_gateway()
+{
+    router=$1
+    metric=''
+    if [ $# -gt 1 ] && [ "$2" -gt 0 ]; then 
+	metric="metric $2";
+    fi;    
+    if routerReachable $router ; then
+	/sbin/ip route replace default via $router dev $interface $metric;
+	if [ $? -ne 0 ]; then 
+	    /usr/bin/logger -p local7.notice -t "NET"  'dhclient: failed to create default route: '$router dev $interface $metric;
+	    return 1;
+	else
+	    return 0;
+	fi;
+    fi;
+    return 1;
+}
+
+function dhconfig()
+{
+    if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+	if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
+		[ x$alias_ip_address != x$old_ip_address ]; then
+         # Possible new alias. Remove old alias.
+	    ifconfig $interface:0- inet 0
+	fi
+
+	if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
+        # IP address changed. Bringing down the interface will delete all routes,
+        # and clear the ARP cache.
+	    ifconfig $interface inet 0 down
+	fi
+    fi
+    if [ x$reason = xBOUND ] || [ x$reason = xREBOOT ] ||
+       [ x$old_ip_address  != x$new_ip_address ] ||
+       [ x$old_subnet_mask != x$new_subnet_mask ] ||
+       [ x$new_network_number != x$new_network_number ] ||
+       [ x$old_broadcast_address != x$new_broadcast_address ] ||
+       [ "x$old_routers" != "x$new_routers" ] ||
+       [ x$old_interface_mtu != x$new_interface_mtu ] ; then
+	if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+	    ifconfig $interface inet $new_ip_address $new_subnet_arg \
+		$new_broadcast_arg
+	    if [ -n "$new_interface_mtu" ]; then
+		/sbin/ip link set $interface mtu $new_interface_mtu;
+	    fi;
+	    if [ -x /etc/dhclient-${interface}-up-hooks ]; then
+		. /etc/dhclient-${interface}-up-hooks;
+	    elif [ -x /etc/dhclient-up-hooks ]; then
+		. /etc/dhclient-up-hooks;
+	    fi;
+	fi;
+	
+	if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 4 ) != 4 )); then
+	    prefix_bits=`mask_bits $new_subnet_mask`
+            # Add a network route to the computed network address.
+	    if [ $relmajor -lt 2 ] || \
+		( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
+		/sbin/ip route replace ${new_network_number}/${prefix_bits} dev $interface
+		if [ $added_old_broadcast_route -eq 1 ]; then
+		   /sbin/ip route del default;
+		fi;
+	    fi;
+	    if [[  ( ( -z "$GATEWAYDEV" )  || ( "$GATEWAYDEV" = "$interface" ) ) && ( ( -z "$GATEWAY" )  || ( ( -n "$DHCLIENT_IGNORE_GATEWAY" ) && ( "$DHCLIENT_IGNORE_GATEWAY" = [Yy]* ) ) ) ]]; then
+		metric=${METRIC:-''};
+		let i=${METRIC:-0};
+		default_routers=()
+		for router in $new_routers; do
+		    added_router=0
+		    for r in ${default_routers[@]}; do
+			if [ "$r" == "$router" ]; then
+			    added_router=1;
+                        fi;
+		    done
+		    if [ -z "$router" ] || [ "$added_router" -eq 1 ] || [ `IFS=. ip2num $router` -le 0 ] || [[ ( "$router" = "$new_broadcast_address" ) && ( "$new_subnet_mask" != "255.255.255.255" ) ]]; then
+			continue;
+		    fi;
+		    default_routers=(${default_routers[@]} $router)
+		    add_default_gateway $router $metric;		    
+		    let i=i+1;
+		    metric=$i; 
+		done
+	    elif [[ ( ( -z "$GATEWAYDEV" ) || ( "$GATEWAYDEV" = "$interface" ) ) && ( -n "$GATEWAY" ) ]]; then
+		routerSubnet=`mask $GATEWAY $new_subnet_mask`
+		mySubnet=`mask $new_ip_address $new_subnet_mask`
+		if [ "$routerSubnet" = "$mySubnet" ]; then
+		    /sbin/ip route replace default via $GATEWAY dev $interface 
+		fi;
+	    fi;
+            # static routes
+	    if [ "x$new_static_routes" != x ]; then
+		IFS=', 	' static_routes=($new_static_routes)
+		route_targets=()
+		for((i=0; i<${#static_routes[@]}; i+=2)); do
+		    target=${static_routes[$i]}
+		    gateway=${static_routes[$i+1]}
+		    metric=''
+		    for t in ${route_targets[@]}; do
+			if [ $t == $target ]; then
+			    if [ -z "$metric" ]; then
+				metric=1;
+			    else
+				((metric=metric+1));
+			    fi;
+			fi;
+		    done;
+		    if [ -n "$metric" ]; then
+			metric="metric $metric";
+		    fi;		    
+		    if routerReachable $gateway; then
+			/sbin/ip route replace ${target}/`class_bits $target` via ${gateway} dev $interface ${metric}
+			if [ $? -ne 0 ]; then
+			   /usr/bin/logger -p local7.notice -t 'NET' 'dhclient: failed to create static route:' ${target}/`class_bits $target` via ${gateway} dev $interface ${metric};			
+			else			    
+ 			   route_targets=(${route_targets[@]} $target);
+			fi;
+		    fi;
+		done
+	    fi
+	fi
+    fi
+    if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+	if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
+	    then
+	    ifconfig $interface:0- inet 0
+	    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+	    /sbin/ip route replace ${alias_ip_address}/32 dev $interface:0
+	fi
+    fi
+    if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 1 ) != 1 )); then
+	make_resolv_conf
+
+	if [ -n "$new_host_name" ] && need_hostname; then
+	    hostname $new_host_name
+	fi
+    fi;
+    if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 8 ) != 8 )); then
+	if [ "${PEERNIS}" = no ]; then
+	    :
+	elif [ -n "$new_nis_domain" ]; then
+	    domainname "$new_nis_domain"
+	    save_previous /etc/yp.conf
+	    let contents=0
+	    echo '# generated by /sbin/dhclient-script' > /etc/yp.conf
+	    if [ -n "$new_nis_servers" ]; then
+		for I in $new_nis_servers; do
+		    echo "domain $new_nis_domain server $I" >> /etc/yp.conf
+		    let contents=contents+1
+		done
+	    else
+		echo "domain $new_nis_domain broadcast" >> /etc/yp.conf
+		let contents=contents+1
+	    fi
+	    level=`/sbin/runlevel`
+	    level=${level##*\ }
+	    if [ "$level" = "unknown" ]; then
+		level=1;
+	    fi
+	    if [ $contents -gt 0 ] && [[ "$level" = [0-6] ]] && /sbin/chkconfig --level=$level ypbind >/dev/null 2>&1 && [ -r /var/run/ypbind.pid ] && yppid=`cat /var/run/ypbind.pid` && [ -d /proc/${yppid} ] && [ "`if [ -x /sbin/busybox ]; then /sbin/busybox readlink /proc/${yppid}/exe; else echo /sbin/ypbind; fi`" = "/sbin/ypbind" ]; then
+	       kill -HUP $yppid;
+	    fi
+	elif [ -n "$new_nis_servers" ]; then
+	    save_previous /etc/yp.conf
+	    echo '# generated by /sbin/dhclient-script' > /etc/yp.conf
+	    let contents=0
+	    for I in $new_nis_servers; do
+		echo "ypserver $I" >> /etc/yp.conf
+		let contents=contents+1
+	    done
+	    level=`/sbin/runlevel`
+	    level=${level##*\ }
+	    if [ "$level" = "unknown" ]; then
+		level=1;
+	    fi
+	    if [ $contents -gt 0 ] && [[ "$level" = [0-6] ]] && /sbin/chkconfig --level=$level ypbind >/dev/null 2>&1 && [ -r /var/run/ypbind.pid ] && yppid=`cat /var/run/ypbind.pid` && [ -d /proc/${yppid} ] && [ "`if [ -x /sbin/busybox ]; then /sbin/busybox readlink /proc/${yppid}/exe; else echo /sbin/ypbind; fi`" = "/sbin/ypbind" ] ; then
+	       kill -HUP $yppid;
+	    fi
+	fi
+    fi
+    if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 16 ) != 16 )); then
+	if [ -n "$DHCP_TIME_OFFSET_SETS_TIMEZONE" ] && [[ "$DHCP_TIME_OFFSET_SETS_TIMEZONE" = [yY1]* ]]; then
+	    if [ -n "$new_time_offset" ]; then
+	    #   DHCP option "time-offset" is requested by default and should be handled.
+	    #   The geographical zone abbreviation cannot be determined from the GMT offset,
+	    #   but the $ZONEINFO/Etc/GMT$offset file can be used - note: this disables DST.
+		((z=new_time_offset/3600));
+		((hoursWest=`printf '%+d' $z`))
+		if (( $hoursWest < 0 )); then
+		   # tzdata treats negative 'hours west' as positive 'gmtoff' !
+		   ((hoursWest*=-1));
+		fi
+		tzfile=/usr/share/zoneinfo/Etc/GMT`printf '%+d' $hoursWest`;
+		if [ -e $tzfile ]; then
+		    /bin/mv -f /etc/localtime /etc/localtime.predhclient;
+		    /bin/cp -fp $tzfile /etc/localtime;
+		    /bin/touch /etc/localtime;
+		fi;
+	    fi;
+	fi;
+	if [ "${PEERNTP}" = no ]; then
+	    :
+	elif [ -n "$new_ntp_servers" ] && [ -e /etc/ntp.conf ]; then
+	    save_previous /etc/ntp.conf
+	    /bin/egrep -v '(^[\ \	]*(server|fudge))|(generated by /sbin/dhclient-script)'< /etc/ntp.conf.predhclient > /etc/ntp.conf
+	    echo '# servers generated by /sbin/dhclient-script' >> /etc/ntp.conf
+	    localClocks=(`/bin/egrep '^[\ \	]*server[\ \	]+127\.127' /etc/ntp.conf.predhclient | while read s addr rest; do echo $addr; done`)      
+	    localClockFudge="`/bin/egrep '^[\ \	]*fudge[\ \	]+127\.127' /etc/ntp.conf.predhclient`";
+	    for s in $new_ntp_servers ${localClocks[@]};
+	      do
+	      echo 'server '$s >> /etc/ntp.conf;
+	    done
+	    echo "$localClockFudge" >> /etc/ntp.conf;
+	    if [ -x /usr/bin/diff ] && /usr/bin/diff -q /etc/ntp.conf /etc/ntp.conf.predhclient >/dev/null 2>&1; then
+		: ;
+	    else
+		/sbin/service ntpd condrestart >/dev/null 2>&1
+	    fi;
+	fi
+    fi;
+}
+
+if [ x$new_broadcast_address != x ] && [ x$new_subnet_mask != x ] && [ "$new_subnet_mask" != "255.255.255.255" ]; then
+  new_broadcast_arg="broadcast $new_broadcast_address"
+fi
+if [ x$old_broadcast_address != x ]; then
+  old_broadcast_arg="broadcast $old_broadcast_address"
+fi
+if [ x$new_subnet_mask != x ]; then
+  new_subnet_arg="netmask $new_subnet_mask"
+fi
+if [ x$old_subnet_mask != x ]; then
+  old_subnet_arg="netmask $old_subnet_mask"
+fi
+if [ x$alias_subnet_mask != x ]; then
+  alias_subnet_arg="netmask $alias_subnet_mask"
+fi
+
+if [ x$reason = xMEDIUM ]; then
+  # Linux doesn't do mediums (ok, ok, media).
+  exit_with_hooks 0
+fi
+
+added_old_broadcast_route=0;
+if [ x$reason = xPREINIT ]; then
+    if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+	if [ x$alias_ip_address != x ]; then
+    # Bring down alias interface. Its routes will disappear too.
+	    ifconfig $interface:0- inet 0
+	fi
+	if [ x$keep_old_ip = xyes ]; then
+	    ifconfig $interface up
+	elif [ $relmajor -lt 2 ] || ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] )   then
+	    ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \
+		broadcast 255.255.255.255 up
+    # Add route to make broadcast work. Do not omit netmask.
+	    /sbin/ip route replace default dev $interface && added_old_broadcast_route=1;
+	else
+	    ifconfig $interface 0 up
+	fi     
+
+  # We need to give the kernel some time to get the interface up.
+  #	sleep 1
+  # I don't think this is necessary with modern kernels - no problems found during testing -
+  # JVD, 2005-06-17
+	# but just in case:
+	if [ -n "$DHCLIENT_DELAY" ] && [ "$DHCLIENT_DELAY" -gt 0 ] ; then
+	    sleep $DHCLIENT_DELAY;
+	fi;
+	exit_with_hooks 0
+    fi;
+fi
+
+if [ x$reason = xARPCHECK ] || [ x$reason = xARPSEND ]; then
+    if [ -z "$new_ip_address" ] || [ -z "$interface" ] ||  /sbin/arping -q -f -c 2 -w 3 -D -I ${interface} ${new_ip_address}; then
+	exit_with_hooks 0
+    else
+	exit_with_hooks 1
+    fi;
+fi
+  
+if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
+   [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then    
+    dhconfig ;
+    exit_with_hooks 0
+fi
+
+if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \
+   || [ x$reason = xSTOP ]; then
+  if [ -f /etc/resolv.conf.predhclient ]; then
+     change_resolv_conf /etc/resolv.conf.predhclient
+     rm -f /etc/resolv.conf.predhclient
+  fi
+  if [ -n "$DHCP_TIME_OFFSET_SETS_TIMEZONE" ] && [[ "$DHCP_TIME_OFFSET_SETS_TIMEZONE" = [yY1]* ]]; then
+      if [ -e /etc/localtime.predhclient ]; then
+	  /bin/rm -f /etc/localtime
+	  /bin/mv -f /etc/localtime.predhclient /etc/localtime;
+	  /bin/touch /etc/localtime;
+      fi;
+  fi;
+  if [ -f /etc/ntp.conf.predhclient ]; then
+     /bin/rm -f /etc/ntp.conf
+     /bin/mv -f /etc/ntp.conf.predhclient /etc/ntp.conf
+     service ntpd condrestart >/dev/null 2>&1 
+  fi
+  if [ -f /etc/yp.conf.predhclient ]; then
+     /bin/rm -f /etc/yp.conf
+     /bin/mv -f /etc/yp.conf.predhclient /etc/yp.conf
+     level=`/sbin/runlevel`
+     level=${level##*\ }
+     if [ "$level" = "unknown" ]; then
+	 level=1;
+     fi
+     if [[ "$level" = [0-6] ]] && /sbin/chkconfig --level=$level ypbind >/dev/null 2>&1 && [ -r /var/run/ypbind.pid ] && yppid=`cat /var/run/ypbind.pid` && [ -d /proc/${yppid} ] && [ "`if [ -x /sbin/busybox ]; then /sbin/busybox readlink /proc/${yppid}/exe; else echo /sbin/ypbind; fi`" = "/sbin/ypbind" ] ; then
+	 kill -HUP $yppid;
+     fi
+  fi 
+  if [ -x /etc/dhclient-${interface}-down-hooks ]; then
+      . /etc/dhclient-${interface}-down-hooks;
+  elif [ -x /etc/dhclient-down-hooks ]; then
+      . /etc/dhclient-down-hooks;
+  fi;
+  if [ x$alias_ip_address != x ]; then
+    # Turn off alias interface.
+    ifconfig $interface:0- inet 0
+  fi
+  if [ x$old_ip_address != x ]; then
+    # Shut down interface, which will delete routes and clear arp cache.
+    ifconfig $interface inet 0 down
+  fi
+  if [ x$alias_ip_address != x ]; then
+    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+    /sbin/ip route replace ${alias_ip_address}/32 $interface:0
+  fi
+  exit_with_hooks 0
+fi
+
+if [ x$reason = xTIMEOUT ] && [ "x$new_routers" != 'x' ]; then
+    if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+	if [ x$alias_ip_address != x ]; then
+	    ifconfig $interface:0- inet 0
+	fi
+	ifconfig $interface inet $new_ip_address $new_subnet_arg \
+					$new_broadcast_arg
+    fi;
+    set $new_routers
+    if ping -q -c 1 -w 10 -I $interface $1; then
+	dhconfig ;
+	exit_with_hooks 0
+    fi
+    if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+	ifconfig $interface inet 0 down
+    fi;
+    exit_with_hooks 1
+elif [ x$reason = xTIMEOUT ]; then
+  exit_with_hooks 1
+fi
+exit_with_hooks 0


Index: linux.dbus-example
===================================================================
RCS file: linux.dbus-example
diff -N linux.dbus-example
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux.dbus-example	11 Apr 2007 19:38:56 -0000	1.5
@@ -0,0 +1,223 @@
+#!/bin/bash
+# dhclient-script for Linux. Dan Halbert, March, 1997.
+# Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
+# No guarantees about this. I'm a novice at the details of Linux
+# networking.
+
+# Notes:
+
+# 0. This script is based on the netbsd script supplied with dhcp-970306.
+
+# 1. ifconfig down apparently deletes all relevant routes and flushes
+# the arp cache, so this doesn't need to be done explicitly.
+
+# 2. The alias address handling here has not been tested AT ALL.
+# I'm just going by the doc of modern Linux ip aliasing, which uses
+# notations like eth0:0, eth0:1, for each alias.
+
+# 3. I have to calculate the network address, and calculate the broadcast
+# address if it is not supplied. This might be much more easily done
+# by the dhclient C code, and passed on.
+
+# 4. TIMEOUT not tested. ping has a flag I don't know, and I'm suspicious
+# of the $1 in its args.
+
+if [ -n "${dhc_dbus}" ]; then
+  /bin/dbus-send \
+    --system --dest=com.redhat.dhcp --type=method_call \
+    /com/redhat/dhcp/$interface com.redhat.dhcp.set \
+    'string:'"`env | /bin/egrep -v '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`";
+    if (( ( dhc_dbus & 31 ) == 31 )); then
+    exit 0;
+    fi;
+fi;
+
+make_resolv_conf() {
+  if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then
+    echo search $new_domain_name >/etc/resolv.conf
+    chmod 644 /etc/resolv.conf
+    for nameserver in $new_domain_name_servers; do
+      echo nameserver $nameserver >>/etc/resolv.conf
+    done
+  fi
+}
+
+# Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
+exit_with_hooks() {
+  exit_status=$1
+  if [ -f /etc/dhclient-exit-hooks ]; then
+    . /etc/dhclient-exit-hooks
+  fi
+# probably should do something with exit status of the local script
+  exit $exit_status
+}
+
+# Invoke the local dhcp client enter hooks, if they exist.
+if [ -f /etc/dhclient-enter-hooks ]; then
+  exit_status=0
+  . /etc/dhclient-enter-hooks
+  # allow the local script to abort processing of this state
+  # local script must set exit_status variable to nonzero.
+  if [ $exit_status -ne 0 ]; then
+    exit $exit_status
+  fi
+fi
+
+release=`uname -r`
+release=`expr $release : '\(.*\)\..*'`
+relminor=`echo $release |sed -e 's/[0-9]*\.\([0-9][0-9]*\)\(\..*\)*$/\1/'`
+relmajor=`echo $release |sed -e 's/\([0-9][0-9]*\)\..*$/\1/'`
+
+if [ x$new_broadcast_address != x ]; then
+  new_broadcast_arg="broadcast $new_broadcast_address"
+fi
+if [ x$old_broadcast_address != x ]; then
+  old_broadcast_arg="broadcast $old_broadcast_address"
+fi
+if [ x$new_subnet_mask != x ]; then
+  new_subnet_arg="netmask $new_subnet_mask"
+fi
+if [ x$old_subnet_mask != x ]; then
+  old_subnet_arg="netmask $old_subnet_mask"
+fi
+if [ x$alias_subnet_mask != x ]; then
+  alias_subnet_arg="netmask $alias_subnet_mask"
+fi
+
+if [ x$reason = xMEDIUM ]; then
+  # Linux doesn't do mediums (ok, ok, media).
+  exit_with_hooks 0
+fi
+
+if [ x$reason = xPREINIT ]; then
+  if [ x$alias_ip_address != x ]; then
+    # Bring down alias interface. Its routes will disappear too.
+    ifconfig $interface:0- inet 0
+  fi
+  if [ $relmajor -lt 2 ] || ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] )
+   then
+    ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \
+		broadcast 255.255.255.255 up
+    # Add route to make broadcast work. Do not omit netmask.
+    route add default dev $interface netmask 0.0.0.0
+  else
+    ifconfig $interface 0 up
+  fi
+
+  # We need to give the kernel some time to get the interface up.
+  sleep 1
+
+  exit_with_hooks 0
+fi
+
+if [ x$reason = xARPCHECK ] || [ x$reason = xARPSEND ]; then
+  exit_with_hooks 0
+fi
+  
+if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
+   [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then
+  current_hostname=`hostname`
+  if [ x$current_hostname = x ] || \
+     [ x$current_hostname = x$old_host_name ]; then
+    if [ x$current_hostname = x ] || \
+       [ x$new_host_name != x$old_host_name ]; then
+      hostname $new_host_name
+    fi
+  fi
+
+  if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+  if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
+		[ x$alias_ip_address != x$old_ip_address ]; then
+    # Possible new alias. Remove old alias.
+    ifconfig $interface:0- inet 0
+  fi
+  if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
+    # IP address changed. Bringing down the interface will delete all routes,
+    # and clear the ARP cache.
+    ifconfig $interface inet 0 down
+
+  fi
+  fi
+  if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+     [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+  if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+    ifconfig $interface inet $new_ip_address $new_subnet_arg \
+							$new_broadcast_arg
+  fi
+  if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 4 ) != 4 )); then
+    # Add a network route to the computed network address.
+    if [ $relmajor -lt 2 ] || \
+		( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
+      route add -net $new_network_number $new_subnet_arg dev $interface
+    fi
+    for router in $new_routers; do
+      route add default gw $router
+    done
+  fi
+  fi
+  if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+  if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
+   then
+    ifconfig $interface:0- inet 0
+    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+    route add -host $alias_ip_address $interface:0
+  fi
+  fi
+  if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 1 ) != 1 )); then
+  make_resolv_conf
+  fi
+  exit_with_hooks 0
+fi
+
+if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \
+   || [ x$reason = xSTOP ]; then
+  if [ x$alias_ip_address != x ]; then
+    # Turn off alias interface.
+    ifconfig $interface:0- inet 0
+  fi
+  if [ x$old_ip_address != x ]; then
+    # Shut down interface, which will delete routes and clear arp cache.
+    ifconfig $interface inet 0 down
+  fi
+  if [ x$alias_ip_address != x ]; then
+    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+    route add -host $alias_ip_address $interface:0
+  fi
+  exit_with_hooks 0
+fi
+fi
+
+if [ x$reason = xTIMEOUT ]; then
+  if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+  if [ x$alias_ip_address != x ]; then
+    ifconfig $interface:0- inet 0
+  fi
+  ifconfig $interface inet $new_ip_address $new_subnet_arg \
+					$new_broadcast_arg
+  fi
+  set $new_routers
+  ############## what is -w in ping?
+  if ping -q -c 1 $1; then
+    if [ x$new_ip_address != x$alias_ip_address ] && \
+			[ x$alias_ip_address != x ]; then
+      ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+      route add -host $alias_ip_address dev $interface:0
+    fi
+    if [ $relmajor -lt 2 ] || \
+		( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
+      route add -net $new_network_number
+    fi
+    for router in $new_routers; do
+      route add default gw $router
+    done
+    make_resolv_conf
+    exit_with_hooks 0
+  fi
+  if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then
+  ifconfig $interface inet 0 down
+  fi
+  exit_with_hooks 1
+fi
+
+exit_with_hooks 0



From fedora-cvs-commits at redhat.com  Wed Apr 11 19:48:00 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 15:48:00 -0400
Subject: rpms/kernel/devel linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch,
	NONE, 1.1 git-iwlwifi-fixes.patch, 1.1, 1.2 kernel-2.6.spec,
	1.3056, 1.3057
Message-ID: <200704111948.l3BJm0W8006390@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
	git-iwlwifi-fixes.patch kernel-2.6.spec 
Added Files:
	linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch 
Log Message:


linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch:
 bcm43xx_phy.c |   50 +++++++++++++++++++++++++++++---------------------
 1 files changed, 29 insertions(+), 21 deletions(-)

--- NEW FILE linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch ---
--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c.orig	2007-04-11 14:52:39.000000000 -0400
+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c	2007-04-11 14:53:22.000000000 -0400
@@ -1362,7 +1362,7 @@ static void bcm43xx_phy_initb6(struct bc
 static void bcm43xx_calc_loopback_gain(struct bcm43xx_wldev *dev)
 {
 	struct bcm43xx_phy *phy = &dev->phy;
-	u16 backup_phy[16];
+	u16 backup_phy[16] = {0};
 	u16 backup_radio[3];
 	u16 backup_bband;
 	u16 i, j, loop_i_max;
@@ -1373,8 +1373,10 @@ static void bcm43xx_calc_loopback_gain(s
 	backup_phy[1] = bcm43xx_phy_read(dev, BCM43xx_PHY_CCKBBANDCFG);
 	backup_phy[2] = bcm43xx_phy_read(dev, BCM43xx_PHY_RFOVER);
 	backup_phy[3] = bcm43xx_phy_read(dev, BCM43xx_PHY_RFOVERVAL);
-	backup_phy[4] = bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVER);
-	backup_phy[5] = bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVERVAL);
+	if (phy->rev != 1) {
+		backup_phy[4] = bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVER);
+		backup_phy[5] = bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVERVAL);
+	}
 	backup_phy[6] = bcm43xx_phy_read(dev, BCM43xx_PHY_BASE(0x5A));
 	backup_phy[7] = bcm43xx_phy_read(dev, BCM43xx_PHY_BASE(0x59));
 	backup_phy[8] = bcm43xx_phy_read(dev, BCM43xx_PHY_BASE(0x58));
@@ -1402,14 +1404,16 @@ static void bcm43xx_calc_loopback_gain(s
 			  bcm43xx_phy_read(dev, BCM43xx_PHY_RFOVER) | 0x0001);
 	bcm43xx_phy_write(dev, BCM43xx_PHY_RFOVERVAL,
 			  bcm43xx_phy_read(dev, BCM43xx_PHY_RFOVERVAL) & 0xFFFE);
-	bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVER,
-			  bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVER) | 0x0001);
-	bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVERVAL,
-			  bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVERVAL) & 0xFFFE);
-	bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVER,
-			  bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVER) | 0x0002);
-	bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVERVAL,
-			  bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVERVAL) & 0xFFFD);
+	if (phy->rev != 1) {
+		bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVER,
+				  bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVER) | 0x0001);
+		bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVERVAL,
+				  bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVERVAL) & 0xFFFE);
+		bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVER,
+				  bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVER) | 0x0002);
+		bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVERVAL,
+				  bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVERVAL) & 0xFFFD);
+	}
 	bcm43xx_phy_write(dev, BCM43xx_PHY_RFOVER,
 			  bcm43xx_phy_read(dev, BCM43xx_PHY_RFOVER) | 0x000C);
 	bcm43xx_phy_write(dev, BCM43xx_PHY_RFOVER,
@@ -1426,10 +1430,12 @@ static void bcm43xx_calc_loopback_gain(s
 
 	bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x0A),
 			  bcm43xx_phy_read(dev, BCM43xx_PHY_BASE(0x0A)) | 0x2000);
-	bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVER,
-			  bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVER) | 0x0004);
-	bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVERVAL,
-			  bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVERVAL) & 0xFFFB);
+	if (phy->rev != 1) {
+		bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVER,
+				  bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVER) | 0x0004);
+		bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVERVAL,
+				  bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVERVAL) & 0xFFFB);
+	}
 	bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x03),
 			  (bcm43xx_phy_read(dev, BCM43xx_PHY_BASE(0x03))
 			   & 0xFF9F) | 0x40);
@@ -1522,8 +1528,10 @@ exit_loop1:
 		trsw_rx = 0x18;
 exit_loop2:
 
-	bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVER, backup_phy[4]);
-	bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVERVAL, backup_phy[5]);
+	if (phy->rev != 1) {
+		bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVER, backup_phy[4]);
+		bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVERVAL, backup_phy[5]);
+	}
 	bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x5A), backup_phy[6]);
 	bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x59), backup_phy[7]);
 	bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x58), backup_phy[8]);
@@ -1576,7 +1584,7 @@ static void bcm43xx_phy_initg(struct bcm
 		bcm43xx_phy_write(dev, BCM43xx_PHY_RFOVER, 0x400);
 		bcm43xx_phy_write(dev, BCM43xx_PHY_PGACTL, 0xC0);
 	}
-	if (phy->gmode) {
+	if (phy->gmode && phy->rev >= 2) {
 		tmp = bcm43xx_phy_read(dev, BCM43xx_PHY_VERSION_OFDM);
 		tmp &= BCM43xx_PHYVER_VERSION;
 		if (tmp == 3 || tmp == 5) {
@@ -1635,7 +1643,7 @@ static void bcm43xx_phy_initg(struct bcm
 		else
 			bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x2F), 0x202);
 	}
-	if (phy->gmode) {
+	if (phy->gmode && phy->rev != 1) {
 		bcm43xx_lo_adjust(dev);
 		bcm43xx_phy_write(dev, BCM43xx_PHY_LO_MASK, 0x8078);
 	}
@@ -1649,8 +1657,8 @@ static void bcm43xx_phy_initg(struct bcm
 		 */
 		bcm43xx_nrssi_hw_update(dev, 0xFFFF);//FIXME?
 		bcm43xx_calc_nrssi_threshold(dev);
-	} else {
-		if (phy->gmode && phy->nrssi[0] == -1000) {
+	} else if (phy->gmode && phy->rev != 1) {
+		if (phy->nrssi[0] == -1000) {
 			assert(phy->nrssi[1] == -1000);
 			bcm43xx_calc_nrssi_slope(dev);
 		} else

git-iwlwifi-fixes.patch:
 base.c    |    1 +
 iwlwifi.h |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Index: git-iwlwifi-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/git-iwlwifi-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- git-iwlwifi-fixes.patch	23 Mar 2007 18:13:09 -0000	1.1
+++ git-iwlwifi-fixes.patch	11 Apr 2007 19:47:58 -0000	1.2
@@ -1,6 +1,6 @@
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig	2007-03-22 14:13:12.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-03-22 14:13:23.000000000 -0400
-@@ -12377,6 +12377,7 @@ static int ipw_pci_probe(struct pci_dev 
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig	2007-04-11 15:15:22.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-04-11 15:15:27.000000000 -0400
+@@ -12970,6 +12970,7 @@ static int ipw_pci_probe(struct pci_dev 
  	err = ipw_read_ucode(priv);
  	if (err) {
  		IPW_ERROR("Could not read microcode from disk: %d\n", err);
@@ -8,3 +8,14 @@
  		goto out_remove_sysfs;
  	}
  
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h.orig	2007-04-11 15:17:53.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h	2007-04-11 15:18:59.000000000 -0400
+@@ -180,7 +180,7 @@ do { if (ipw_debug_level & (level)) \
+ #define IPW_DL_QOS           (1<<31)
+ 
+ #define IPW_ERROR(f, a...) printk(KERN_ERR DRV_NAME ": " f, ## a)
+-#define IPW_WARNING(f, a...) printk(KERN_ERR DRV_NAME ": " f, ## a)
++#define IPW_WARNING(f, a...) printk(KERN_WARN DRV_NAME ": " f, ## a)
+ #define IPW_DEBUG_INFO(f, a...)    IPW_DEBUG(IPW_DL_INFO, f, ## a)
+ 
+ #define IPW_DEBUG_MAC80211(f, a...)     IPW_DEBUG(IPW_DL_MAC80211, f, ## a)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3056
retrieving revision 1.3057
diff -u -r1.3056 -r1.3057
--- kernel-2.6.spec	10 Apr 2007 18:09:20 -0000	1.3056
+++ kernel-2.6.spec	11 Apr 2007 19:47:58 -0000	1.3057
@@ -382,14 +382,15 @@
 Patch14: git-iwlwifi.patch
 Patch15: git-iwlwifi-fixes.patch
 Patch16: linux-2.6-rt2x00-scan-fix.patch
+Patch17: linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch
 
-Patch17: linux-2.6-fix-pmops-1.patch
-Patch18: linux-2.6-fix-pmops-2.patch
-Patch19: linux-2.6-fix-pmops-3.patch
-Patch20: linux-2.6-fix-pmops-4.patch
+Patch18: linux-2.6-fix-pmops-1.patch
+Patch19: linux-2.6-fix-pmops-2.patch
+Patch20: linux-2.6-fix-pmops-3.patch
+Patch21: linux-2.6-fix-pmops-4.patch
 
 # enable sysrq-c on all kernels, not only kexec
-Patch21: linux-2.6-sysrq-c.patch
+Patch22: linux-2.6-sysrq-c.patch
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -983,14 +984,16 @@
 %patch15 -p1
 # fix up scanning in rt2x00
 %patch16 -p1
-# Power management fixes
+# fix oops on ppc for bcm43xx-mac80211 w/ phy rev 1
 %patch17 -p1
+# Power management fixes
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 # sysrq works always
-%patch21 -p1
+%patch22 -p1
 
 # Architecture patches
 
@@ -2252,6 +2255,10 @@
 #  - tux.
 
 %changelog
+* Tue Apr 11 2007 John W. Linville <linville at redhat.com>
+- Add fix for bcm43xx-mac80211 oops on ppc w/ phy rev 1
+- Set IPW_WARNING to KERN_WARN to make iwlwifi less chatty
+
 * Tue Apr 10 2007 John W. Linville <linville at redhat.com>
 - Add fix for using WPA with mac80211 drivers
 



From fedora-cvs-commits at redhat.com  Wed Apr 11 19:58:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 15:58:57 -0400
Subject: rpms/redhat-rpm-config/devel redhat-rpm-config-find-provides.patch,
	NONE, 1.1 redhat-rpm-config.spec, 1.46, 1.47
Message-ID: <200704111958.l3BJwvmN006999@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/redhat-rpm-config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6983

Modified Files:
	redhat-rpm-config.spec 
Added Files:
	redhat-rpm-config-find-provides.patch 
Log Message:
Add modalias tracking.


redhat-rpm-config-find-provides.patch:
 find-provides                 |    8 ++++
 find-provides.d/modalias.prov |   76 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+)

--- NEW FILE redhat-rpm-config-find-provides.patch ---
diff -ruP redhat-rpm-config-8.0.45/find-provides redhat-rpm-config-8.0.45-MOD/find-provides
--- redhat-rpm-config-8.0.45/find-provides	2006-07-30 13:57:59.000000000 -0500
+++ redhat-rpm-config-8.0.45-MOD/find-provides	2007-02-26 10:17:14.000000000 -0600
@@ -71,6 +71,14 @@
     echo $filelist | tr '[:blank:]' \\n | /usr/lib/rpm/redhat/find-provides.libtool | sort -u
 
 #
+# --- any other extra find-provides scripts
+for i in /usr/lib/rpm/redhat/find-provides.d/*.prov
+do
+    [ -x $i ] &&
+        (echo $filelist | tr '[:blank:]' \\n | $i | sort -u)
+done
+
+#
 # --- pkgconfig
 [ -x /usr/lib/rpm/redhat/find-provides.pkgconfig ] &&
     echo $filelist | tr '[:blank:]' \\n | /usr/lib/rpm/redhat/find-provides.pkgconfig | sort -u
diff -ruP redhat-rpm-config-8.0.45/find-provides.d/modalias.prov redhat-rpm-config-8.0.45-MOD/find-provides.d/modalias.prov
--- redhat-rpm-config-8.0.45/find-provides.d/modalias.prov	1969-12-31 18:00:00.000000000 -0600
+++ redhat-rpm-config-8.0.45-MOD/find-provides.d/modalias.prov	2007-02-26 10:19:18.000000000 -0600
@@ -0,0 +1,76 @@
+#! /bin/sh
+
+# heavily based upon find-suggests.ksyms by Andreas Gruenbacher <agruen at suse.de>.
+# with modifications by Michael Brown <Michael_E_Brown at dell.com>
+#
+# -- added module versioning info to modalias() symbols
+# -- removed code which inspects spec files.
+
+IFS=$'\n'
+
+# 
+# Initially, dont generate modalias() lines for kernel package. This needs
+# additional discussion. Would like to eventually add them for 
+# completeness, so that we can determine when drivers are folded into 
+# mainline kernel.
+# 
+case "$1" in
+kernel-module-*)    ;; # Fedora kernel module package names start with
+		       # kernel-module.
+kernel*)	   is_kernel_package=1 ;;
+esac
+
+if ! [ -z "$is_kernel_package" ]; then
+    cat > /dev/null
+    exit 0
+fi
+
+print_modaliases() {
+    declare class=$1 variants=$2 pos=$3
+    if [ -n "$variants" ]; then
+	echo "${class:0:pos}[$variants]${class:pos+1}"
+    else
+	[ -z "$class" ] || echo "$class"
+    fi
+}
+
+combine_modaliases() {
+    declare tag class variants pos n
+    read class
+    while read tag; do
+	for ((n=0; n<${#class}; n++)); do
+	    if [ "*" != "${class:n:1}" -a \
+		 "${class:0:n}" = "${tag:0:n}" -a \
+		 "${class:n+1}" = "${tag:n+1}" ] &&
+	       ( [ -z "$pos" ] || [ $n = $pos ] ); then
+		variants="${variants:-${class:n:1}}${tag:n:1}"
+		pos=$n
+		break
+	    fi
+	done
+	if [ $n -eq ${#class} ]; then
+	    print_modaliases "$class" "$variants" "$pos"
+	    variants=
+	    pos=
+	    class=$tag
+	fi
+    done
+    print_modaliases "$class" "$variants" "$pos"
+}
+
+for module in $(grep -E '/lib/modules/.+\.ko$') $*; do
+    # | head -n1 because some modules have *two* version tags. *cough*b44*cough*
+    modver=$(/sbin/modinfo -F version "$module"| head -n1)
+    modver=${modver// /_}
+
+    # only add version tag if it has a version
+    if [ -n "$modver" ]; then
+        /sbin/modinfo -F alias "$module" \
+        | sed -nre "s,(.+),modalias(\\1) = $modver,p"
+    else
+        /sbin/modinfo -F alias "$module" \
+        | sed -nre "s,(.+),modalias(\\1),p"
+    fi
+done \
+| sort -u \
+| combine_modaliases


Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-rpm-config/devel/redhat-rpm-config.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- redhat-rpm-config.spec	3 Apr 2007 04:07:44 -0000	1.46
+++ redhat-rpm-config.spec	11 Apr 2007 19:58:55 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: Red Hat specific rpm configuration files.
 Name: redhat-rpm-config
 Version: 8.0.45
-Release: 14%{dist}
+Release: 15%{dist}
 License: GPL
 Group: Development/System
 Source: redhat-rpm-config-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Patch1: redhat-rpm-config-find-requires.patch
 Patch2: redhat-rpm-config-kmp.patch
 Patch3: redhat-rpm-config-fedora-version-fc71.patch
+Patch4: redhat-rpm-config-find-provides.patch
 BuildArch: noarch
 #Requires: rpmbuild(VendorConfig) <= 4.1
 #Requires: mktemp
@@ -37,8 +38,10 @@
 (cd ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat ; patch -p1 -i %{PATCH1})
 (cd ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat ; patch -p1 -i %{PATCH2})
 (cd ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat ; patch -p1 -i %{PATCH3})
+(cd ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat ; patch -p1 -i %{PATCH4})
 install -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm/redhat/
 install -m 755 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm/redhat/
+chmod a+x ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat/find-*.d/*.prov
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -48,6 +51,10 @@
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Wed Apr 11 2007 Jon Masters <jcm at redhat.com> 8.0.45-15
+- Add modalias tags to kernel module packages (kmods) for tracking.
+- Further information is available at http://www.kerneldrivers.org/.
+
 * Tue Apr 03 2007 Jon Masters <jcm at redhat.com> 8.0.45-14
 - Rebased all previous patches (since java fix introduced offset).
 - Added Fedora per-release macros to platforms section of macros.



From fedora-cvs-commits at redhat.com  Wed Apr 11 20:12:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 16:12:53 -0400
Subject: rpms/dhcp/devel dhcp.spec,1.154,1.155
Message-ID: <200704112012.l3BKCrJt007631@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7617

Modified Files:
	dhcp.spec 
Log Message:
* Thu Apr 12 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-31
- Spec file cleanups (#225691)
- Put libdhcpctl.a and libomapi.a in dhcp-devel-static package
- Put libdhcp4client.a in libdhcp4client-devel-static package



Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- dhcp.spec	11 Apr 2007 14:29:18 -0000	1.154
+++ dhcp.spec	11 Apr 2007 20:12:51 -0000	1.155
@@ -10,7 +10,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.5
-Release:  30%{?dist}
+Release:  31%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -77,11 +77,7 @@
 Summary: Provides the dhclient ISC DHCP client daemon and dhclient-script
 Group: System Environment/Base
 Requires: initscripts >= 6.75
-
-%package devel
-Summary: Development headers and libraries for interfacing to the DHCP server
-Group: Development/Libraries
-Requires: dhcp = %{epoch}:%{version}-%{release}, openldap-devel
+Obsoletes: dhcpcd <= 1.3.22
 
 %description -n dhclient
 DHCP (Dynamic Host Configuration Protocol) is a protocol which allows
@@ -94,8 +90,22 @@
 and on clients run a DHCP client daemon.  The dhclient package
 provides the ISC DHCP client daemon.
 
+%package devel
+Summary: Development headers and libraries for interfacing to the DHCP server
+Group: Development/Libraries
+Requires: dhcp = %{epoch}:%{version}-%{release}
+
 %description devel
-Libraries for interfacing with the ISC DHCP server.
+Header files and API documentation for using the ISC DHCP libraries.
+
+%package devel-static
+Summary: Static archives of libdhcpctl and libomapi
+Group: Development/Libraries
+Requires: dhcp-devel = %{epoch}:%{version}-%{release}, openldap-devel
+
+%description devel-static
+The dhcp-devel-static package contains the static archive for
+libdhcpctl and libomapi.
 
 %package -n libdhcp4client
 Summary: ISC DHCP IPv4 client in a library for invocation from other programs
@@ -115,7 +125,16 @@
 %description -n libdhcp4client-devel
 Header files for development with the Internet Software Consortium (ISC)
 Dynamic Host Configuration Protocol (DHCP) Internet Protocol version 4 (IPv4)
-client library .
+client library.
+
+%package -n libdhcp4client-devel-static
+Summary: Static archive for libdhcp4client
+Group: Development/Libraries
+Requires: libdhcp4client-devel = %{epoch}:%{version}-%{release}
+
+%description -n libdhcp4client-devel-static
+The libdhcp4client-devel-static package contains the static archive for
+libdhcp4client.
 
 %prep
 %setup -q
@@ -382,26 +401,38 @@
 
 %files devel
 %defattr(-,root,root,-)
-%exclude %{_libdir}/libdhcp4client*
-%exclude %{_includedir}/dhcp4client
-%{_includedir}/*
-%{_libdir}/*.a
+%{_includedir}/dhcpctl.h
+%{_includedir}/isc-dhcp
+%{_includedir}/omapi
 %attr(0644,root,root) %{_mandir}/man3/omshell.3.gz
 %attr(0644,root,root) %{_mandir}/man3/dhcpctl.3.gz
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
+%files devel-static
+%defattr(-,root,root,-)
+%{_libdir}/libdhcpctl.a
+%{_libdir}/libomapi
+
 %files -n libdhcp4client
 %defattr(0755,root,root,0755)
 %{_libdir}/libdhcp4client-%{version}.so.*
 
 %files -n libdhcp4client-devel
 %defattr(0644,root,root,0755)
-%{_includedir}/dhcp4client*
+%{_includedir}/dhcp4client
 %{_libdir}/pkgconfig/libdhcp4client.pc
-%{_libdir}/libdhcp4client.a
 %{_libdir}/libdhcp4client.so
 
+%files -n libdhcp4client-devel-static
+%defattr(0644,root,root,0755)
+%{_libdir}/libdhcp4client.a
+
 %changelog
+* Thu Apr 12 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-31
+- Spec file cleanups (#225691)
+- Put libdhcpctl.a and libomapi.a in dhcp-devel-static package
+- Put libdhcp4client.a in libdhcp4client-devel-static package
+
 * Wed Apr 11 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-30
 - Enable Xen patch again, kernel bits present (#231444)
 
@@ -646,12 +677,12 @@
 
 * Sun Jan 22 2006 Dan Williams <dcbw at redhat.com> - 11:3.0.3-21
 - Fix dhclient-script to use /bin/dbus-send now that all dbus related
-    binaries are in /bin rather than /usr/bin
+  binaries are in /bin rather than /usr/bin
 
 * Mon Jan 16 2006 Jason Vas Dias <jvdias at redhat.com> - 11:3.0.3-20
 - fix bug 177845: allow client ip-address as default router 
 - fix bug 176615: fix DDNS update when Windows-NT client sends 
-	          host-name with trailing nul
+                  host-name with trailing nul
 
 * Tue Dec 20 2005 Jason Vas Dias <jvdias at redhat.com> - 11:3.0.3-18
 - fix bug 176270: allow routers with an octet of 255 in their IP address
@@ -665,9 +696,9 @@
 * Fri Nov 19 2005 Jason Vas Dias <jvdias at redhat.com> - 11:3.0.3-12
 - fix bug 173619: dhclient-script should reconfig on RENEW if 
                   subnet-mask, broadcast-address, mtu, routers, etc.
-		  have changed
+                  have changed
 - apply upstream improvements to trailing nul options fix of bug 160655
-  
+
 * Tue Nov 15 2005 Jason Vas Dias <jvdias at redhat.com> - 11:3.0.3-11
 - Rebuild for FC-5
 - fix bug 167028 - test IBM's unicast bootp patch (from xma at us.ibm.com)
@@ -738,18 +769,19 @@
 - fix bug 163203: silence ISC blurb on configtest 
 - fix default 'boot file server' value (packet->siaddr):
   In dhcp-3.0.2(-), this was defaulted to the server address;
-  now it defaults to 0.0.0.0 (a rather silly default!) and 
-  must be specified with the 'next-server' option ( not the tftp-boot-server option ?!?)
-  which causes PXE boot clients to fail to load anything after the boot file.
+  now it defaults to 0.0.0.0 (a rather silly default!) and
+  must be specified with the 'next-server' option (not the tftp-boot-server
+  option ?!?) which causes PXE boot clients to fail to load anything after
+  the boot file.
 
 * Fri Jul 08 2005 Jason Vas Dias <jvdias at redhat.com> 10:3.0.2-14.FC5
 - Allow package to compile with glibc-headers-2.3.5-11 (tr.c's use of __u16)
 
 * Fri May 10 2005 Jason Vas Dias <jvdias at redhat.com> 10:3.0.2-14
 - Fix bug 159929: prevent dhclient flooding network on repeated DHCPDECLINE
-- dhclient fast startup: 
+- dhclient fast startup:
    remove dhclient's  random 1-5 second delay on startup if only
-   configuring one interface 
+   configuring one interface
    remove dhclient_script's "sleep 1" on PREINIT
 - fix new gcc-4.0.0-11 compiler warnings for binding_state_t
 
@@ -765,20 +797,20 @@
 * Mon Apr 25 2005 Jason Vas Dias <jvdias at redhat.com> 10:3.0.2-10
 - dhclient-script dhcdbd extensions. 
 - Tested to have no effect unless dhcdbd invokes dhclient.
- 
+
 * Thu Apr 21 2005 Jason Vas Dias <jvdias at redhat.com> 10:3.0.2-9
 - bugs 153244 & 155143 are now fixed with SELinux policy; 
   autotrans now works for dhcpc_t, so restorecons are not required,
   and dhclient runs OK under dhcpc_t with SELinux enforcing.
 - fix bug 155506: 'predhclien' typo (emacs!).
- 
+
 * Mon Apr 18 2005 Jason Vas Dias <jvdias at redhat.com> 10:3.0.2-8
 - Fix bugs 153244 & 155143: 
       o restore dhclient-script 'restorecon's
-      o give dhclient and dhclient-script an exec context of 
+      o give dhclient and dhclient-script an exec context of
         'system_u:object_r:sbin_t' that allows them to run
         domainname / hostname and to update configuration files
-        in dhclient post script.       
+        in dhclient post script.
 - Prevent dhclient emitting verbose ISC 'blurb' on error exit in -q mode
 
 * Mon Apr 04 2005 Jason Vas Dias <jvdias at redhat.com> 10:3.0.2-7
@@ -818,7 +850,7 @@
 
 * Thu Feb 10 2005 Jason Vas Dias <jvdias at redhat.com> 8.3.0.4rc3-3
 - fix bug 147375: dhcpd heap corruption on 32-bit 'subnet' masks
-- fix bug 147502: dhclient should honor GATEWAYDEV and GATEWAY settings            
+- fix bug 147502: dhclient should honor GATEWAYDEV and GATEWAY settings
 - fix bug 146600: dhclient's timeout mode ping should use -I
 - fix bug 146524: dhcpd.init should discard dhcpd's initial output message
 - fix bug 147739: dhcpd.init configtest should honor -cf in DHCPDARGS
@@ -827,10 +859,10 @@
 - fix bug 145997: allow hex 32-bit integers in user specified options
 
 * Thu Jan 06 2005 Jason Vas Dias <jvdias at redhat.com> 8:3.0.2rc3-1
-- still need an epoch to get past nvre test 
+- still need an epoch to get past nvre test
 
 * Thu Jan 06 2005 Jason Vas Dias <jvdias at redhat.com> 3.0.2rc3-1
-- fix bug 144417: much improved dhclient-script 
+- fix bug 144417: much improved dhclient-script
 
 * Thu Jan 06 2005 Jason Vas Dias <jvdias at redhat.com> 3.0.2rc3-1
 - Upgrade to latest release from ISC, which includes most of our
@@ -839,15 +871,15 @@
 * Thu Jan 06 2005 Jason Vas Dias <jvdias at redhat.com> 7:3.0.1-17
 - fix bug 144250: gcc-3.4.3-11 is broken :
 - log_error ("Lease with bogus binding state: %%d size: %%d",
--			   comp -> binding_state,
--			   sizeof(comp->binding_state));
+-   comp -> binding_state,
+-   sizeof(comp->binding_state));
 - prints:    'Lease with bogus binding state: 257 1'    !
 - compiling with gcc33 (compat-gcc-8-3.3.4.2 fixes for now).
 
 * Mon Jan 03 2005 Jason Vas Dias <jvdias at redhat.com> 7:3.0.1-16
 - fix bug 143704: dhclient -r does not work if lease held by
 - dhclient run from ifup . dhclient will now look for the pid
-- files created by ifup .
+- files created by ifup.
 
 * Wed Nov 17 2004 Jason Vas Dias <jvdias at redhat.com> 7:3.0.1-14
 - NTP: fix bug 139715: merge in new ntp servers only rather than replace
@@ -855,7 +887,7 @@
 
 * Tue Nov 16 2004 Jason Vas Dias <jvdias at redhat.com> 7:3.0.1-12
 - fix bug 138181 & bug 139468: do not attempt to listen/send on
--     unconfigured  loopback, point-to-point or non-broadcast 
+-     unconfigured  loopback, point-to-point or non-broadcast
 -     interfaces (don't generate annoying log messages)
 - fix bug 138869: dhclient-script: check if '$new_routers' is
 -     empty before doing 'set $new_routers;...;ping ... $1'
@@ -863,7 +895,7 @@
 * Wed Oct 06 2004 Jason Vas Dias <jvdias at redhat.com> 7:3.0.1-11
 - dhcp-3.0.2b1 came out today. A diff of the 'ack_lease' function
 - Dave Hankins and I patched exposed a missing '!' on an if clause
-- that got dropped with the 'new-host' patch. Replacing the '!' .
+- that got dropped with the 'new-host' patch. Replacing the '!'.
 - Also found one missing host_dereference.
 
 * Wed Oct 06 2004 Jason Vas Dias <jvdias at redhat.com> 7:3.0.1-10
@@ -875,19 +907,19 @@
 - Fix bug 133522:
 - PXE Boot clients with static leases not given 'file' option
 - 104 by server - PXE booting was disabled for 'fixed-address'
-- clients. 
+- clients.
 
 * Fri Sep 10 2004 Jason Vas Dias <jvdias at redhat.com> 7:3.0.1-8
-- Fix bug 131212: 
+- Fix bug 131212:
 - If "deny booting" is defined for some group of hosts,
 - then after one of those hosts is denied booting, all
 - hosts are denied booting, because of a pointer not being
 - cleared in the lease record. 
-- An upstream patch was obtained which will be in dhcp-3.0.2 .
+- An upstream patch was obtained which will be in dhcp-3.0.2.
 
 * Mon Aug 16 2004 Jason Vas Dias <jvdias at redhat.com> 7:3.0.1-7
 - Forward DNS update by client was disabled by a bug that I
-- found in code where 'client->sent_options' was being 
+- found in code where 'client->sent_options' was being
 - freed too early.
 - Re-enabled it after contacting upstream maintainer
 - who confirmed that this was a bug (bug #130069) -
@@ -895,7 +927,7 @@
 - Upstream maintainer informs me this patch will be in dhcp-3.0.2 .
 
 * Tue Aug 3  2004 Jason Vas Dias <jvdias at redhat.com> 6:3.0.1-6
-- Allow 2.0 kernels to obtain default gateway via dhcp 
+- Allow 2.0 kernels to obtain default gateway via dhcp
 
 * Mon Aug 2  2004 Jason Vas Dias <jvdias at redhat.com> 5:3.0.1-5
 - Invoke 'change_resolv_conf' function to change resolv.conf
@@ -904,7 +936,7 @@
 - Upgraded to new ISC 3.0.1 version
 
 * Thu Jun 24 2004 Dan Walsh <dwalsh at redhat.com> 1:3.0.1rc14-5
-- Allow dhclient-script to continue without a config file.  
+- Allow dhclient-script to continue without a config file.
 - It will use default values.
 
 * Wed Jun 23 2004 Dan Walsh <dwalsh at redhat.com> 1:3.0.1rc14-4
@@ -940,7 +972,7 @@
 - Add static routes patch to dhclient-script
 
 * Wed Mar 25 2004 Dan Walsh <dwalsh at redhat.com> 1:3.0.1rc12-4
-- Fix init to check config during restart 
+- Fix init to check config during restart
 
 * Wed Mar 24 2004 Dan Walsh <dwalsh at redhat.com> 1:3.0.1rc12-3
 - Fix init script to create leases file if missing
@@ -983,25 +1015,25 @@
 - Add configtest
 
 * Fri Aug 1 2003 Dan Walsh <dwalsh at redhat.com> 1:3.0pl2-6.10
-- increment for base 
+- increment for base
 
 * Fri Aug 1 2003 Dan Walsh <dwalsh at redhat.com> 1:3.0pl2-6.9
 - Don't update resolv.conf on renewals
 
 * Tue Jul  29 2003 Dan Walsh <dwalsh at redhat.com> 1:3.0pl2-6.8
-- increment for base 
+- increment for base
 
 * Tue Jul  29 2003 Dan Walsh <dwalsh at redhat.com> 1:3.0pl2-6.7
 - Fix name of driftfile
 
 * Tue Jul  29 2003 Dan Walsh <dwalsh at redhat.com> 1:3.0pl2-6.6
-- increment for base 
+- increment for base
 
 * Tue Jul  29 2003 Dan Walsh <dwalsh at redhat.com> 1:3.0pl2-6.5
 - Change dhcrelay script to check DHCPSERVERS
 
 * Mon Jul  7 2003 Dan Walsh <dwalsh at redhat.com> 1:3.0pl2-6.4
-- increment for base 
+- increment for base
 
 * Mon Jul  7 2003 Dan Walsh <dwalsh at redhat.com> 1:3.0pl2-6.3
 - Fix dhclient-script to support PEERNTP and PEERNIS flags.
@@ -1058,7 +1090,7 @@
 - require kernel version
 
 * Fri Jan 24 2003 Dan Walsh <dwalsh at redhat.com> 3.0pl1-16
-- move dhcp-options to separate package 
+- move dhcp-options to separate package
 
 * Wed Jan 22 2003 Tim Powers <timp at redhat.com>
 - rebuilt
@@ -1073,7 +1105,7 @@
 - Fix when ntp is not installed.
 
 * Mon Jan 6 2003 Dan Walsh <dwalsh at redhat.com> 3.0pl1-12
-- Fix #73079 (dhcpctl man page) 
+- Fix #73079 (dhcpctl man page)
 
 * Thu Nov 14 2002 Elliot Lee <sopwith at redhat.com> 3.0pl1-11
 - Use generic PTRSIZE_64BIT detection instead of ifarch.
@@ -1133,7 +1165,8 @@
 - Include dhcrelay scripts from #49186
 
 * Thu Dec 20 2001 Elliot Lee <sopwith at redhat.com> 3.0-2
-- Update to 3.0, include devel files installed by it (as part of the main package).
+- Update to 3.0, include devel files installed by it (as part of the main
+  package).
 
 * Sun Aug 26 2001 Elliot Lee <sopwith at redhat.com> 2.0pl5-8
 - Fix #26446



From fedora-cvs-commits at redhat.com  Wed Apr 11 20:15:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 16:15:36 -0400
Subject: rpms/kernel/devel git-iwlwifi-fixes.patch,1.2,1.3
Message-ID: <200704112015.l3BKFapA007678@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
	git-iwlwifi-fixes.patch 
Log Message:


git-iwlwifi-fixes.patch:
 base.c    |    1 +
 iwlwifi.h |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Index: git-iwlwifi-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/git-iwlwifi-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- git-iwlwifi-fixes.patch	11 Apr 2007 19:47:58 -0000	1.2
+++ git-iwlwifi-fixes.patch	11 Apr 2007 20:15:34 -0000	1.3
@@ -15,7 +15,7 @@
  
  #define IPW_ERROR(f, a...) printk(KERN_ERR DRV_NAME ": " f, ## a)
 -#define IPW_WARNING(f, a...) printk(KERN_ERR DRV_NAME ": " f, ## a)
-+#define IPW_WARNING(f, a...) printk(KERN_WARN DRV_NAME ": " f, ## a)
++#define IPW_WARNING(f, a...) printk(KERN_WARNING DRV_NAME ": " f, ## a)
  #define IPW_DEBUG_INFO(f, a...)    IPW_DEBUG(IPW_DL_INFO, f, ## a)
  
  #define IPW_DEBUG_MAC80211(f, a...)     IPW_DEBUG(IPW_DL_MAC80211, f, ## a)



From fedora-cvs-commits at redhat.com  Wed Apr 11 20:23:55 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 16:23:55 -0400
Subject: rpms/selinux-policy/devel .cvsignore, 1.110,
	1.111 policy-20070219.patch, 1.43, 1.44 selinux-policy.spec,
	1.430, 1.431 sources, 1.117, 1.118
Message-ID: <200704112023.l3BKNtQw008229@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore policy-20070219.patch selinux-policy.spec sources 
Log Message:
* Tue Apr 10 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-1
- Update to upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- .cvsignore	2 Apr 2007 15:17:45 -0000	1.110
+++ .cvsignore	11 Apr 2007 20:23:53 -0000	1.111
@@ -112,3 +112,4 @@
 serefpolicy-2.5.9.tgz
 serefpolicy-2.5.10.tgz
 serefpolicy-2.5.11.tgz
+serefpolicy-2.5.12.tgz

policy-20070219.patch:
 Rules.modular                           |   12 +
 policy/flask/access_vectors             |    4 
 policy/global_booleans                  |    2 
 policy/global_tunables                  |    7 
 policy/mls                              |   31 ++-
 policy/modules/admin/acct.te            |    1 
 policy/modules/admin/amtu.fc            |    3 
 policy/modules/admin/amtu.if            |   53 ++++++
 policy/modules/admin/amtu.te            |   56 ++++++
 policy/modules/admin/bootloader.te      |    2 
 policy/modules/admin/consoletype.te     |   10 -
 policy/modules/admin/dmesg.te           |    1 
 policy/modules/admin/kudzu.te           |    6 
 policy/modules/admin/logwatch.te        |    4 
 policy/modules/admin/netutils.te        |    6 
 policy/modules/admin/rpm.fc             |    3 
 policy/modules/admin/rpm.if             |   85 +++++++---
 policy/modules/admin/rpm.te             |    2 
 policy/modules/admin/su.if              |    4 
 policy/modules/admin/usermanage.te      |   25 ++
 policy/modules/apps/gnome.if            |   26 ++-
 policy/modules/apps/gpg.fc              |    2 
 policy/modules/apps/loadkeys.if         |   44 +----
 policy/modules/apps/mozilla.if          |    1 
 policy/modules/apps/slocate.te          |    4 
 policy/modules/apps/uml.if              |   27 ---
 policy/modules/kernel/corecommands.fc   |    5 
 policy/modules/kernel/corecommands.if   |   20 ++
 policy/modules/kernel/corenetwork.te.in |   14 +
 policy/modules/kernel/devices.if        |   36 ++++
 policy/modules/kernel/domain.if         |   18 ++
 policy/modules/kernel/domain.te         |   46 +++++
 policy/modules/kernel/files.fc          |    1 
 policy/modules/kernel/files.if          |   81 ++++++++-
 policy/modules/kernel/filesystem.if     |   39 ++++
 policy/modules/kernel/filesystem.te     |   12 +
 policy/modules/kernel/kernel.if         |   23 ++
 policy/modules/kernel/kernel.te         |    2 
 policy/modules/kernel/mls.if            |   20 ++
 policy/modules/kernel/mls.te            |    3 
 policy/modules/kernel/selinux.if        |   38 ++++
 policy/modules/kernel/storage.if        |    2 
 policy/modules/kernel/terminal.if       |    2 
 policy/modules/kernel/terminal.te       |    1 
 policy/modules/services/amavis.te       |    3 
 policy/modules/services/apache.fc       |   14 -
 policy/modules/services/apache.if       |  171 +++++++++++++++++++-
 policy/modules/services/apache.te       |   72 ++++++++
 policy/modules/services/apcupsd.fc      |    9 +
 policy/modules/services/apcupsd.if      |  108 ++++++++++++
 policy/modules/services/apcupsd.te      |   81 +++++++++
 policy/modules/services/automount.te    |    2 
 policy/modules/services/avahi.if        |   19 ++
 policy/modules/services/bluetooth.te    |    2 
 policy/modules/services/consolekit.te   |   13 +
 policy/modules/services/cron.fc         |    1 
 policy/modules/services/cron.if         |   33 +--
 policy/modules/services/cron.te         |   43 ++++-
 policy/modules/services/cups.te         |    6 
 policy/modules/services/cvs.te          |    1 
 policy/modules/services/cyrus.te        |    1 
 policy/modules/services/dbus.if         |   63 +++++++
 policy/modules/services/dhcp.te         |    2 
 policy/modules/services/djbdns.te       |    5 
 policy/modules/services/dovecot.te      |    5 
 policy/modules/services/ftp.te          |    5 
 policy/modules/services/hal.fc          |    8 
 policy/modules/services/hal.if          |   19 ++
 policy/modules/services/hal.te          |  142 ++++++++++++++++
 policy/modules/services/inetd.te        |    5 
 policy/modules/services/kerberos.if     |   79 ++-------
 policy/modules/services/kerberos.te     |   36 ++++
 policy/modules/services/mta.if          |   19 ++
 policy/modules/services/mta.te          |    2 
 policy/modules/services/nis.if          |    4 
 policy/modules/services/nis.te          |    4 
 policy/modules/services/nscd.te         |   10 +
 policy/modules/services/ntp.te          |    4 
 policy/modules/services/pegasus.if      |   18 ++
 policy/modules/services/pegasus.te      |    6 
 policy/modules/services/postfix.if      |    1 
 policy/modules/services/postfix.te      |    8 
 policy/modules/services/procmail.te     |    1 
 policy/modules/services/pyzor.te        |    7 
 policy/modules/services/radius.te       |    4 
 policy/modules/services/rpc.if          |    5 
 policy/modules/services/rsync.te        |    1 
 policy/modules/services/samba.fc        |    3 
 policy/modules/services/samba.if        |   64 +++++++
 policy/modules/services/samba.te        |   80 +++++++++
 policy/modules/services/sendmail.if     |   22 ++
 policy/modules/services/smartmon.te     |    1 
 policy/modules/services/snmp.te         |   15 +
 policy/modules/services/spamassassin.te |    7 
 policy/modules/services/squid.fc        |    2 
 policy/modules/services/squid.if        |   22 ++
 policy/modules/services/squid.te        |   12 +
 policy/modules/services/ssh.if          |   39 ++++
 policy/modules/services/ssh.te          |    5 
 policy/modules/system/application.fc    |    1 
 policy/modules/system/application.if    |  104 ++++++++++++
 policy/modules/system/application.te    |   14 +
 policy/modules/system/authlogin.if      |   83 ++++++++-
 policy/modules/system/authlogin.te      |    3 
 policy/modules/system/fstools.fc        |    1 
 policy/modules/system/fstools.te        |    1 
 policy/modules/system/fusermount.fc     |    6 
 policy/modules/system/fusermount.if     |   41 ++++
 policy/modules/system/fusermount.te     |   45 +++++
 policy/modules/system/getty.te          |    3 
 policy/modules/system/hostname.te       |   14 +
 policy/modules/system/init.if           |    3 
 policy/modules/system/init.te           |   35 +++-
 policy/modules/system/ipsec.if          |   20 ++
 policy/modules/system/iptables.te       |    4 
 policy/modules/system/libraries.fc      |    2 
 policy/modules/system/locallogin.te     |    7 
 policy/modules/system/logging.if        |   21 ++
 policy/modules/system/logging.te        |    2 
 policy/modules/system/lvm.te            |    6 
 policy/modules/system/modutils.te       |    6 
 policy/modules/system/mount.fc          |    3 
 policy/modules/system/mount.if          |   37 ++++
 policy/modules/system/mount.te          |   64 +++++++
 policy/modules/system/raid.te           |    1 
 policy/modules/system/selinuxutil.fc    |    1 
 policy/modules/system/selinuxutil.if    |    5 
 policy/modules/system/selinuxutil.te    |   52 +++---
 policy/modules/system/sysnetwork.te     |    1 
 policy/modules/system/udev.te           |    6 
 policy/modules/system/unconfined.fc     |    1 
 policy/modules/system/unconfined.if     |   10 -
 policy/modules/system/unconfined.te     |   24 ++
 policy/modules/system/userdomain.if     |  269 +++++++++++++++++++-------------
 policy/modules/system/userdomain.te     |   46 ++++-
 policy/modules/system/xen.te            |   35 ++++
 policy/support/obj_perm_sets.spt        |   12 +
 137 files changed, 2655 insertions(+), 432 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.43 -r 1.44 policy-20070219.patch
Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- policy-20070219.patch	10 Apr 2007 15:20:50 -0000	1.43
+++ policy-20070219.patch	11 Apr 2007 20:23:53 -0000	1.44
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.5.11/policy/flask/access_vectors
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.5.12/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2007-02-26 09:43:33.000000000 -0500
-+++ serefpolicy-2.5.11/policy/flask/access_vectors	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.12/policy/flask/access_vectors	2007-04-11 16:04:22.000000000 -0400
 @@ -598,6 +598,8 @@
  	shmempwd
  	shmemgrp
@@ -19,9 +19,9 @@
  }
  
  class key
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.5.11/policy/global_booleans
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.5.12/policy/global_booleans
 --- nsaserefpolicy/policy/global_booleans	2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-2.5.11/policy/global_booleans	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.12/policy/global_booleans	2007-04-11 16:04:22.000000000 -0400
 @@ -4,7 +4,6 @@
  # file should be used.
  #
@@ -38,54 +38,10 @@
  
  ## <desc>
  ## <p>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.5.11/policy/global_tunables
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.5.12/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2007-03-26 16:24:14.000000000 -0400
-+++ serefpolicy-2.5.11/policy/global_tunables	2007-04-04 13:46:37.000000000 -0400
-@@ -49,6 +49,14 @@
- 
- ## <desc>
- ## <p>
-+## Allows clients to write to the X server shared
-+## memory segments.
-+## </p>
-+## </desc>
-+gen_tunable(allow_write_xshm,false)
-+
-+## <desc>
-+## <p>
- ## Allow system to run with NIS
- ## </p>
- ## </desc>
-@@ -56,6 +64,14 @@
- 
- ## <desc>
- ## <p>
-+## Enable extra rules in the cron domain
-+## to support fcron.
-+## </p>
-+## </desc>
-+gen_tunable(fcron_crond,false)
-+
-+## <desc>
-+## <p>
- ## Enable reading of urandom for all domains.
- ## </p>
- ## <p>
-@@ -83,6 +99,13 @@
- 
- ## <desc>
- ## <p>
-+## Allow pppd to be run for a regular user
-+## </p>
-+## </desc>
-+gen_tunable(pppd_for_user,false)
-+
-+## <desc>
-+## <p>
- ## Allow reading of default_t files.
- ## </p>
- ## </desc>
-@@ -102,12 +125,6 @@
++++ serefpolicy-2.5.12/policy/global_tunables	2007-04-11 16:04:22.000000000 -0400
+@@ -102,12 +102,6 @@
  ## </desc>
  gen_tunable(use_samba_home_dirs,false)
  
@@ -98,30 +54,14 @@
  ## <desc>
  ## <p>
  ## Allow email client to various content.
-@@ -135,6 +152,15 @@
- ## </desc>
- gen_tunable(user_tcp_server,false)
- 
-+
-+## <desc>
-+## <p>
-+## Allow users to control network interfaces
-+## (also needs USERCTL=true)
-+## </p>
-+## </desc>
-+gen_tunable(user_net_control,false)
-+
- ## <desc>
- ## <p>
- ## Allow applications to write untrusted content
-@@ -143,4 +169,3 @@
+@@ -143,4 +137,3 @@
  ## </p>
  ## </desc>
  gen_tunable(write_untrusted_content,false)
 -')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.5.11/policy/mls
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.5.12/policy/mls
 --- nsaserefpolicy/policy/mls	2007-03-09 13:02:20.000000000 -0500
-+++ serefpolicy-2.5.11/policy/mls	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.12/policy/mls	2007-04-11 16:04:22.000000000 -0400
 @@ -89,12 +89,14 @@
  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
@@ -193,9 +133,9 @@
  	 ( t2 == unlabeled_t ));
  
  mlsconstrain association { polmatch }
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.5.11/policy/modules/admin/acct.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.5.12/policy/modules/admin/acct.te
 --- nsaserefpolicy/policy/modules/admin/acct.te	2007-03-26 10:39:08.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/admin/acct.te	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/admin/acct.te	2007-04-11 16:04:22.000000000 -0400
 @@ -9,6 +9,7 @@
  type acct_t;
  type acct_exec_t;
@@ -204,199 +144,16 @@
  
  type acct_data_t;
  logging_log_file(acct_data_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.xml serefpolicy-2.5.11/policy/modules/admin/acct.xml
---- nsaserefpolicy/policy/modules/admin/acct.xml	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/admin/acct.xml	2007-04-04 13:46:37.000000000 -0400
-@@ -0,0 +1,43 @@
-+<module name="acct" filename="policy/modules/admin/acct.if">
-+<summary>Berkeley process accounting</summary>
-+<interface name="acct_domtrans" lineno="13">
-+<summary>
-+Transition to the accounting management domain.
-+</summary>
-+<param name="domain">
-+<summary>
-+Domain allowed access.
-+</summary>
-+</param>
-+</interface>
-+<interface name="acct_exec" lineno="32">
-+<summary>
-+Execute accounting management tools in the caller domain.
-+</summary>
-+<param name="domain">
-+<summary>
-+The type of the process performing this action.
-+</summary>
-+</param>
-+</interface>
-+<interface name="acct_exec_data" lineno="53">
-+<summary>
-+Execute accounting management data in the caller domain.
-+</summary>
-+<param name="domain">
-+<summary>
-+The type of the process performing this action.
-+</summary>
-+</param>
-+</interface>
-+<interface name="acct_manage_data" lineno="72">
-+<summary>
-+Create, read, write, and delete process accounting data.
-+</summary>
-+<param name="domain">
-+<summary>
-+The type of the process performing this action.
-+</summary>
-+</param>
-+</interface>
-+</module>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.xml serefpolicy-2.5.11/policy/modules/admin/alsa.xml
---- nsaserefpolicy/policy/modules/admin/alsa.xml	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/admin/alsa.xml	2007-04-04 13:46:38.000000000 -0400
-@@ -0,0 +1,43 @@
-+<module name="alsa" filename="policy/modules/admin/alsa.if">
-+<summary>Ainit ALSA configuration tool</summary>
-+<interface name="alsa_domtrans" lineno="13">
-+<summary>
-+Domain transition to alsa
-+</summary>
-+<param name="domain">
-+<summary>
-+Domain allowed access.
-+</summary>
-+</param>
-+</interface>
[...3685 lines suppressed...]
- ifdef(`distro_redhat',`
- 	init_system_domain(setfiles_t,setfiles_exec_t)
-@@ -195,6 +189,7 @@
+@@ -195,6 +194,7 @@
  fs_getattr_xattr_fs(load_policy_t)
  
  mls_file_read_up(load_policy_t)
@@ -6650,7 +5038,7 @@
  
  selinux_get_fs_mount(load_policy_t)
  selinux_load_policy(load_policy_t)
-@@ -217,7 +212,7 @@
+@@ -217,7 +217,7 @@
  	# cjp: cover up stray file descriptors.
  	dontaudit load_policy_t selinux_config_t:file write;
  	optional_policy(`
@@ -6659,7 +5047,7 @@
  	')
  ')
  
-@@ -310,15 +305,13 @@
+@@ -310,15 +310,13 @@
  userdom_dontaudit_search_all_users_home_content(newrole_t)
  userdom_search_all_users_home_dirs(newrole_t)
  
@@ -6682,7 +5070,7 @@
  
  tunable_policy(`allow_polyinstantiation',`
  	files_polyinstantiate_all(newrole_t)
-@@ -571,6 +564,8 @@
+@@ -571,6 +569,8 @@
  kernel_read_system_state(semanage_t)
  kernel_read_kernel_sysctls(semanage_t)
  
@@ -6691,7 +5079,7 @@
  corecmd_exec_bin(semanage_t)
  
  dev_read_urand(semanage_t)
-@@ -700,6 +695,6 @@
+@@ -700,6 +700,6 @@
  ifdef(`hide_broken_symptoms',`
  	# cjp: cover up stray file descriptors.
  	optional_policy(`
@@ -6699,9 +5087,9 @@
 +		unconfined_dontaudit_rw_pipes(setfiles_t)
  	')
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.5.11/policy/modules/system/sysnetwork.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.5.12/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/sysnetwork.te	2007-04-09 16:43:32.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/sysnetwork.te	2007-04-11 16:04:22.000000000 -0400
 @@ -221,6 +221,7 @@
  optional_policy(`
  	seutil_sigchld_newrole(dhcpc_t)
@@ -6710,20 +5098,9 @@
  ')
  
  optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-2.5.11/policy/modules/system/udev.fc
---- nsaserefpolicy/policy/modules/system/udev.fc	2006-11-16 17:15:24.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/system/udev.fc	2007-04-04 13:46:37.000000000 -0400
-@@ -1,6 +1,6 @@
- # udev
- 
--/dev/\.udev(/.*)?	gen_context(system_u:object_r:udev_tbl_t,s0)
-+/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.5.11/policy/modules/system/udev.te
---- nsaserefpolicy/policy/modules/system/udev.te	2007-03-20 23:38:29.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/udev.te	2007-04-04 13:46:37.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.5.12/policy/modules/system/udev.te
+--- nsaserefpolicy/policy/modules/system/udev.te	2007-04-11 15:52:54.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/udev.te	2007-04-11 16:04:22.000000000 -0400
 @@ -89,6 +89,7 @@
  dev_manage_all_dev_nodes(udev_t)
  dev_rw_generic_files(udev_t)
@@ -6732,24 +5109,7 @@
  
  domain_read_all_domains_state(udev_t)
  domain_dontaudit_ptrace_all_domains(udev_t) #pidof triggers these 
-@@ -166,13 +167,14 @@
- 
- 	# for arping used for static IP addresses on PCMCIA ethernet
- 	netutils_domtrans(udev_t)
-+
-+	term_search_ptys(udev_t)
-+
- ')
- 
- ifdef(`targeted_policy',`
- 	term_dontaudit_use_unallocated_ttys(udev_t)
- 	term_dontaudit_use_generic_ptys(udev_t)
--
--	unconfined_domain(udev_t)
- ')
- 
- optional_policy(`
-@@ -194,5 +196,10 @@
+@@ -194,5 +195,10 @@
  ')
  
  optional_policy(`
@@ -6760,18 +5120,18 @@
  	xserver_read_xdm_pid(udev_t)
  ')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.5.11/policy/modules/system/unconfined.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.5.12/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2007-02-19 11:32:53.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/system/unconfined.fc	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/unconfined.fc	2007-04-11 16:04:22.000000000 -0400
 @@ -10,4 +10,5 @@
  /usr/bin/valgrind 		--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  /usr/local/RealPlayer/realplay\.bin --	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)
 +/usr/bin/vmware.*		--	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.5.11/policy/modules/system/unconfined.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.5.12/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2007-02-19 11:32:53.000000000 -0500
-+++ serefpolicy-2.5.11/policy/modules/system/unconfined.if	2007-04-09 13:43:41.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/unconfined.if	2007-04-11 16:04:22.000000000 -0400
 @@ -18,7 +18,7 @@
  	')
  
@@ -6796,9 +5156,9 @@
  
  	kernel_unconfined($1)
  	corenet_unconfined($1)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.5.11/policy/modules/system/unconfined.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.5.12/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2007-03-20 09:23:14.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/unconfined.te	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/unconfined.te	2007-04-11 16:04:22.000000000 -0400
 @@ -6,6 +6,15 @@
  # Declarations
  #
@@ -6862,9 +5222,9 @@
  		dbus_stub(unconfined_execmem_t)
  
  		init_dbus_chat_script(unconfined_execmem_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.5.11/policy/modules/system/userdomain.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.5.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-03-26 16:24:13.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/userdomain.if	2007-04-09 16:02:32.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/userdomain.if	2007-04-11 16:04:22.000000000 -0400
 @@ -114,6 +114,10 @@
  		# Allow making the stack executable via mprotect.
  		allow $1_t self:process execstack;
@@ -7298,9 +5658,9 @@
 +		dontaudit $1 sysadm_home_dir_t:dir write;
 +	')
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.5.11/policy/modules/system/userdomain.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.5.12/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2007-03-26 16:24:13.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/userdomain.te	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/userdomain.te	2007-04-11 16:04:22.000000000 -0400
 @@ -15,7 +15,6 @@
  # Declarations
  #
@@ -7418,9 +5778,9 @@
 +	')
 +
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.5.11/policy/modules/system/xen.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.5.12/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.11/policy/modules/system/xen.te	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/xen.te	2007-04-11 16:04:22.000000000 -0400
 @@ -25,6 +25,10 @@
  domain_type(xend_t)
  init_daemon_domain(xend_t, xend_exec_t)
@@ -7503,9 +5863,9 @@
 +fs_read_nfs_files(xend_t)
 +fs_getattr_all_fs(xend_t)
 +fs_read_dos_files(xend_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-2.5.11/policy/support/obj_perm_sets.spt
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-2.5.12/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2007-01-02 12:57:51.000000000 -0500
-+++ serefpolicy-2.5.11/policy/support/obj_perm_sets.spt	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.12/policy/support/obj_perm_sets.spt	2007-04-11 16:04:22.000000000 -0400
 @@ -215,7 +215,7 @@
  define(`getattr_file_perms',`{ getattr }')
  define(`setattr_file_perms',`{ setattr }')
@@ -7529,9 +5889,9 @@
 +define(`all_association', `{ sendto recvfrom setcontext polmatch } ')
 +
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.5.11/Rules.modular
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.5.12/Rules.modular
 --- nsaserefpolicy/Rules.modular	2007-03-22 14:30:10.000000000 -0400
-+++ serefpolicy-2.5.11/Rules.modular	2007-04-04 13:46:37.000000000 -0400
++++ serefpolicy-2.5.12/Rules.modular	2007-04-11 16:04:22.000000000 -0400
 @@ -167,7 +167,7 @@
  # these have to run individually because order matters:
  	$(verbose) $(GREP) '^sid ' $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -r1.430 -r1.431
--- selinux-policy.spec	10 Apr 2007 15:20:50 -0000	1.430
+++ selinux-policy.spec	11 Apr 2007 20:23:53 -0000	1.431
@@ -16,8 +16,8 @@
 %define CHECKPOLICYVER 2.0.1-2
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.5.11
-Release: 8%{?dist}
+Version: 2.5.12
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -167,7 +167,7 @@
 
 %description
 SELinux Reference Policy - modular.
-Based off of reference policy: Checked out revision 2253.
+Based off of reference policy: Checked out revision 2261.
 
 %prep 
 %setup -q -n serefpolicy-%{version}
@@ -358,6 +358,9 @@
 %endif
 
 %changelog
+* Tue Apr 10 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-1
+- Update to upstream
+
 * Tue Apr 10 2007 Dan Walsh <dwalsh at redhat.com> 2.5.11-8
 - Fix Sonypic backlight
 - Allow snmp to look at squid_conf_t


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- sources	2 Apr 2007 19:53:16 -0000	1.117
+++ sources	11 Apr 2007 20:23:53 -0000	1.118
@@ -1 +1 @@
-a620a551906801c75407d4b91deb25b5  serefpolicy-2.5.11.tgz
+c2ffdf32fcc2c122ac40c1fb68154e68  serefpolicy-2.5.12.tgz



From fedora-cvs-commits at redhat.com  Wed Apr 11 20:31:00 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 16:31:00 -0400
Subject: rpms/selinux-policy/devel sources,1.118,1.119
Message-ID: <200704112031.l3BKV0GA021733@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	sources 
Log Message:
* Tue Apr 10 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-1
- Update to upstream



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- sources	11 Apr 2007 20:23:53 -0000	1.118
+++ sources	11 Apr 2007 20:30:58 -0000	1.119
@@ -1 +1 @@
-c2ffdf32fcc2c122ac40c1fb68154e68  serefpolicy-2.5.12.tgz
+0aa75b44a124001fa6ce77ac24718e50  serefpolicy-2.5.12.tgz



From fedora-cvs-commits at redhat.com  Wed Apr 11 20:40:55 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 16:40:55 -0400
Subject: rpms/kernel/devel patch-2.6.21-rc6-git4.bz2.sign, NONE,
	1.1 .cvsignore, 1.602, 1.603 kernel-2.6.spec, 1.3057,
	1.3058 sources, 1.565, 1.566 upstream, 1.493,
	1.494 patch-2.6.21-rc6-git3.bz2.sign, 1.1, NONE
Message-ID: <200704112040.l3BKetFe028827@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.21-rc6-git4.bz2.sign 
Removed Files:
	patch-2.6.21-rc6-git3.bz2.sign 
Log Message:
* Wed Apr 11 2007 Dave Jones <davej at redhat.com>
- 2.6.21-rc6-git4



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

iD8DBQBGHMoRyGugalF9Dw4RAuoyAJ9NHDtSY6Tk6UtkVk1G+6cEyyC/VwCfbtyI
VNsU27nNs0J8LUQXA9DsM18=
=pukH
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.602
retrieving revision 1.603
diff -u -r1.602 -r1.603
--- .cvsignore	10 Apr 2007 14:20:44 -0000	1.602
+++ .cvsignore	11 Apr 2007 20:40:48 -0000	1.603
@@ -5,4 +5,4 @@
 kernel-2.6.20
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc6.bz2
-patch-2.6.21-rc6-git3.bz2
+patch-2.6.21-rc6-git4.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3057
retrieving revision 1.3058
diff -u -r1.3057 -r1.3058
--- kernel-2.6.spec	11 Apr 2007 19:47:58 -0000	1.3057
+++ kernel-2.6.spec	11 Apr 2007 20:40:48 -0000	1.3058
@@ -371,7 +371,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.21-rc6.bz2
-Patch2: patch-2.6.21-rc6-git3.bz2
+Patch2: patch-2.6.21-rc6-git4.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -2255,6 +2255,9 @@
 #  - tux.
 
 %changelog
+* Wed Apr 11 2007 Dave Jones <davej at redhat.com>
+- 2.6.21-rc6-git4
+
 * Tue Apr 11 2007 John W. Linville <linville at redhat.com>
 - Add fix for bcm43xx-mac80211 oops on ppc w/ phy rev 1
 - Set IPW_WARNING to KERN_WARN to make iwlwifi less chatty


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.565
retrieving revision 1.566
diff -u -r1.565 -r1.566
--- sources	10 Apr 2007 14:20:44 -0000	1.565
+++ sources	11 Apr 2007 20:40:48 -0000	1.566
@@ -1,4 +1,4 @@
 2618cbcc9c9ac1c3c04be903fe3338a7  sparse-0.2.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 291cbc4c09c5111e4a2030a04ee69b65  patch-2.6.21-rc6.bz2
-faf550e7d36efa34048034b858af97e8  patch-2.6.21-rc6-git3.bz2
+7dd28cd22a68f082dead576313621c2c  patch-2.6.21-rc6-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.493
retrieving revision 1.494
diff -u -r1.493 -r1.494
--- upstream	10 Apr 2007 14:20:44 -0000	1.493
+++ upstream	11 Apr 2007 20:40:48 -0000	1.494
@@ -1,3 +1,3 @@
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc6.bz2
-patch-2.6.21-rc6-git3.bz2
+patch-2.6.21-rc6-git4.bz2


--- patch-2.6.21-rc6-git3.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 11 20:47:22 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 16:47:22 -0400
Subject: rpms/libXi/devel .cvsignore, 1.7, 1.8 libXi.spec, 1.16, 1.17 sources,
	1.8, 1.9
Message-ID: <200704112047.l3BKlM0O001403@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1345/devel

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXi/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	20 Nov 2006 18:39:35 -0000	1.7
+++ .cvsignore	11 Apr 2007 20:47:20 -0000	1.8
@@ -1 +1 @@
-libXi-1.0.2.tar.bz2
+libXi-1.0.4.tar.bz2


Index: libXi.spec
===================================================================
RCS file: /cvs/dist/rpms/libXi/devel/libXi.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libXi.spec	20 Nov 2006 18:39:35 -0000	1.16
+++ libXi.spec	11 Apr 2007 20:47:20 -0000	1.17
@@ -1,6 +1,6 @@
 Summary: X.Org X11 libXi runtime library
 Name: libXi
-Version: 1.0.2
+Version: 1.0.4
 Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
@@ -78,6 +78,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Apr 11 2007 Adam Jackson <ajax at redhat.com> 1.0.4-1
+- libXi 1.0.4
+
 * Mon Nov 20 2006 Adam Jackson <ajax at redhat.com> 1.0.2-1
 - Update to 1.0.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXi/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Nov 2006 18:39:35 -0000	1.8
+++ sources	11 Apr 2007 20:47:20 -0000	1.9
@@ -1 +1 @@
-4a5207a29a6b220e5462129854689844  libXi-1.0.2.tar.bz2
+321b917512e96d1b0cb945ab72d27c6a  libXi-1.0.4.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 11 20:55:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 16:55:30 -0400
Subject: rpms/selinux-policy/devel modules-strict.conf, 1.26,
	1.27 modules-targeted.conf, 1.54, 1.55 policy-20070219.patch,
	1.44, 1.45
Message-ID: <200704112055.l3BKtUwf007440@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	modules-strict.conf modules-targeted.conf 
	policy-20070219.patch 
Log Message:
* Tue Apr 10 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-1
- Update to upstream



Index: modules-strict.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-strict.conf,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- modules-strict.conf	2 Apr 2007 15:17:45 -0000	1.26
+++ modules-strict.conf	11 Apr 2007 20:55:28 -0000	1.27
@@ -1375,3 +1375,10 @@
 # daemon for most APC???s UPS for Linux
 #
 apcupsd = module
+
+# Layer: services
+# Module: w3c
+#
+# w3c
+# 
+w3c = module


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- modules-targeted.conf	2 Apr 2007 19:53:16 -0000	1.54
+++ modules-targeted.conf	11 Apr 2007 20:55:28 -0000	1.55
@@ -1429,3 +1429,10 @@
 # 
 aide = base
 
+# Layer: services
+# Module: w3c
+#
+# w3c
+# 
+w3c = module
+

policy-20070219.patch:
 Rules.modular                           |   12 +
 policy/flask/access_vectors             |    4 
 policy/global_booleans                  |    2 
 policy/global_tunables                  |    7 
 policy/mls                              |   31 ++-
 policy/modules/admin/acct.te            |    1 
 policy/modules/admin/amtu.fc            |    3 
 policy/modules/admin/amtu.if            |   53 ++++++
 policy/modules/admin/amtu.te            |   56 ++++++
 policy/modules/admin/bootloader.te      |    2 
 policy/modules/admin/consoletype.te     |   10 -
 policy/modules/admin/dmesg.te           |    1 
 policy/modules/admin/kudzu.te           |    6 
 policy/modules/admin/logwatch.te        |    4 
 policy/modules/admin/netutils.te        |    6 
 policy/modules/admin/rpm.fc             |    3 
 policy/modules/admin/rpm.if             |   85 +++++++---
 policy/modules/admin/rpm.te             |    2 
 policy/modules/admin/su.if              |    4 
 policy/modules/admin/usermanage.te      |   25 ++
 policy/modules/apps/gnome.if            |   26 ++-
 policy/modules/apps/gpg.fc              |    2 
 policy/modules/apps/loadkeys.if         |   44 +----
 policy/modules/apps/mozilla.if          |    1 
 policy/modules/apps/slocate.te          |    4 
 policy/modules/apps/uml.if              |   27 ---
 policy/modules/kernel/corecommands.fc   |    5 
 policy/modules/kernel/corecommands.if   |   20 ++
 policy/modules/kernel/corenetwork.te.in |   14 +
 policy/modules/kernel/devices.if        |   36 ++++
 policy/modules/kernel/domain.if         |   18 ++
 policy/modules/kernel/domain.te         |   46 +++++
 policy/modules/kernel/files.fc          |    1 
 policy/modules/kernel/files.if          |   81 ++++++++-
 policy/modules/kernel/filesystem.if     |   39 ++++
 policy/modules/kernel/filesystem.te     |   12 +
 policy/modules/kernel/kernel.if         |   23 ++
 policy/modules/kernel/kernel.te         |    2 
 policy/modules/kernel/mls.if            |   20 ++
 policy/modules/kernel/mls.te            |    3 
 policy/modules/kernel/selinux.if        |   38 ++++
 policy/modules/kernel/storage.if        |    2 
 policy/modules/kernel/terminal.if       |    2 
 policy/modules/kernel/terminal.te       |    1 
 policy/modules/services/amavis.te       |    3 
 policy/modules/services/apache.fc       |   14 -
 policy/modules/services/apache.if       |  171 +++++++++++++++++++-
 policy/modules/services/apache.te       |   72 ++++++++
 policy/modules/services/apcupsd.fc      |    9 +
 policy/modules/services/apcupsd.if      |  108 ++++++++++++
 policy/modules/services/apcupsd.te      |   81 +++++++++
 policy/modules/services/automount.te    |    2 
 policy/modules/services/avahi.if        |   19 ++
 policy/modules/services/bluetooth.te    |    2 
 policy/modules/services/consolekit.te   |   13 +
 policy/modules/services/cron.fc         |    1 
 policy/modules/services/cron.if         |   33 +--
 policy/modules/services/cron.te         |   43 ++++-
 policy/modules/services/cups.te         |    6 
 policy/modules/services/cvs.te          |    1 
 policy/modules/services/cyrus.te        |    1 
 policy/modules/services/dbus.if         |   63 +++++++
 policy/modules/services/dhcp.te         |    2 
 policy/modules/services/djbdns.te       |    5 
 policy/modules/services/dovecot.te      |    5 
 policy/modules/services/ftp.te          |    5 
 policy/modules/services/hal.fc          |    8 
 policy/modules/services/hal.if          |   19 ++
 policy/modules/services/hal.te          |  142 ++++++++++++++++
 policy/modules/services/inetd.te        |    5 
 policy/modules/services/kerberos.if     |   79 ++-------
 policy/modules/services/kerberos.te     |   36 ++++
 policy/modules/services/mta.if          |   19 ++
 policy/modules/services/mta.te          |    2 
 policy/modules/services/nis.if          |    4 
 policy/modules/services/nis.te          |    4 
 policy/modules/services/nscd.te         |   10 +
 policy/modules/services/ntp.te          |    4 
 policy/modules/services/pegasus.if      |   18 ++
 policy/modules/services/pegasus.te      |    6 
 policy/modules/services/postfix.if      |    1 
 policy/modules/services/postfix.te      |    8 
 policy/modules/services/procmail.te     |    1 
 policy/modules/services/pyzor.te        |    7 
 policy/modules/services/radius.te       |    4 
 policy/modules/services/rpc.if          |    5 
 policy/modules/services/rsync.te        |    1 
 policy/modules/services/samba.fc        |    3 
 policy/modules/services/samba.if        |   64 +++++++
 policy/modules/services/samba.te        |   80 +++++++++
 policy/modules/services/sendmail.if     |   22 ++
 policy/modules/services/smartmon.te     |    1 
 policy/modules/services/snmp.te         |   15 +
 policy/modules/services/spamassassin.te |    7 
 policy/modules/services/squid.fc        |    2 
 policy/modules/services/squid.if        |   22 ++
 policy/modules/services/squid.te        |   12 +
 policy/modules/services/ssh.if          |   39 ++++
 policy/modules/services/ssh.te          |    5 
 policy/modules/services/w3c.fc          |    2 
 policy/modules/services/w3c.if          |    1 
 policy/modules/services/w3c.te          |   14 +
 policy/modules/system/application.fc    |    1 
 policy/modules/system/application.if    |  104 ++++++++++++
 policy/modules/system/application.te    |   14 +
 policy/modules/system/authlogin.if      |   83 ++++++++-
 policy/modules/system/authlogin.te      |    3 
 policy/modules/system/fstools.fc        |    1 
 policy/modules/system/fstools.te        |    1 
 policy/modules/system/fusermount.fc     |    6 
 policy/modules/system/fusermount.if     |   41 ++++
 policy/modules/system/fusermount.te     |   45 +++++
 policy/modules/system/getty.te          |    3 
 policy/modules/system/hostname.te       |   14 +
 policy/modules/system/init.if           |   42 ++++
 policy/modules/system/init.te           |   35 +++-
 policy/modules/system/ipsec.if          |   20 ++
 policy/modules/system/iptables.te       |    4 
 policy/modules/system/libraries.fc      |    2 
 policy/modules/system/locallogin.te     |    7 
 policy/modules/system/logging.if        |   21 ++
 policy/modules/system/logging.te        |    2 
 policy/modules/system/lvm.te            |    6 
 policy/modules/system/modutils.te       |    6 
 policy/modules/system/mount.fc          |    3 
 policy/modules/system/mount.if          |   37 ++++
 policy/modules/system/mount.te          |   64 +++++++
 policy/modules/system/raid.te           |    1 
 policy/modules/system/selinuxutil.fc    |    1 
 policy/modules/system/selinuxutil.if    |    5 
 policy/modules/system/selinuxutil.te    |   52 +++---
 policy/modules/system/sysnetwork.te     |    1 
 policy/modules/system/udev.te           |    6 
 policy/modules/system/unconfined.fc     |    1 
 policy/modules/system/unconfined.if     |   10 -
 policy/modules/system/unconfined.te     |   24 ++
 policy/modules/system/userdomain.if     |  269 +++++++++++++++++++-------------
 policy/modules/system/userdomain.te     |   46 ++++-
 policy/modules/system/xen.te            |   35 ++++
 policy/support/obj_perm_sets.spt        |   12 +
 140 files changed, 2711 insertions(+), 432 deletions(-)

Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- policy-20070219.patch	11 Apr 2007 20:23:53 -0000	1.44
+++ policy-20070219.patch	11 Apr 2007 20:55:28 -0000	1.45
@@ -4006,6 +4006,35 @@
  ')
  
  tunable_policy(`ssh_sysadm_login',`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.fc serefpolicy-2.5.12/policy/modules/services/w3c.fc
+--- nsaserefpolicy/policy/modules/services/w3c.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.5.12/policy/modules/services/w3c.fc	2007-04-11 16:34:53.000000000 -0400
+@@ -0,0 +1,2 @@
++/usr/share/w3c-markup-validator(/.*)?		gen_context(system_u:object_r:httpd_w3c_validator_content_t,s0)
++/usr/share/w3c-markup-validator/cgi-bin(/.*)?	gen_context(system_u:object_r:httpd_w3c_validator_script_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.if serefpolicy-2.5.12/policy/modules/services/w3c.if
+--- nsaserefpolicy/policy/modules/services/w3c.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.5.12/policy/modules/services/w3c.if	2007-04-11 16:36:59.000000000 -0400
+@@ -0,0 +1 @@
++## <summary>W3C</summary>
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.te serefpolicy-2.5.12/policy/modules/services/w3c.te
+--- nsaserefpolicy/policy/modules/services/w3c.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.5.12/policy/modules/services/w3c.te	2007-04-11 16:36:14.000000000 -0400
+@@ -0,0 +1,14 @@
++policy_module(w3c,1.2.1)
++
++apache_content_template(w3c_validator)
++
++sysnet_dns_name_resolve(httpd_w3c_validator_script_t)
++
++corenet_tcp_connect_ftp_port(httpd_w3c_validator_script_t)
++corenet_tcp_sendrecv_ftp_port(httpd_w3c_validator_script_t)
++corenet_tcp_connect_http_port(httpd_w3c_validator_script_t)
++corenet_tcp_sendrecv_http_port(httpd_w3c_validator_script_t)
++corenet_tcp_connect_http_cache_port(httpd_w3c_validator_script_t)
++corenet_tcp_sendrecv_http_cache_port(httpd_w3c_validator_script_t)
++
++miscfiles_read_certs(httpd_w3c_validator_script_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.fc serefpolicy-2.5.12/policy/modules/system/application.fc
 --- nsaserefpolicy/policy/modules/system/application.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.5.12/policy/modules/system/application.fc	2007-04-11 16:04:22.000000000 -0400
@@ -4447,7 +4476,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.5.12/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/init.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/init.if	2007-04-11 16:41:11.000000000 -0400
 @@ -194,11 +194,14 @@
  	gen_require(`
  		type initrc_t;
@@ -4463,6 +4492,49 @@
  	role system_r types $1;
  
  	domtrans_pattern(initrc_t,$2,$1)
+@@ -1269,3 +1272,42 @@
+ 	files_search_pids($1)
+ 	allow $1 initrc_var_run_t:file manage_file_perms;
+ ')
++
++########################################
++## <summary>
++##	Read the process state (/proc/pid) of init.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`init_read_init_state',`
++	gen_require(`
++		attribute init_t;
++	')
++
++	allow $1 init_t:dir search_dir_perms;
++	allow $1 init_t:file r_file_perms;
++	allow $1 init_t:lnk_file r_file_perms;
++')
++
++########################################
++## <summary>
++##	Ptrace init
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`init_ptrace_init_domain',`
++	gen_require(`
++		attribute init_t;
++	')
++
++	allow $1 init_t:process ptrace;
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.5.12/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2007-03-26 16:24:13.000000000 -0400
 +++ serefpolicy-2.5.12/policy/modules/system/init.te	2007-04-11 16:04:22.000000000 -0400



From fedora-cvs-commits at redhat.com  Wed Apr 11 21:18:20 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 17:18:20 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.3058,
	1.3059 linux-2.6-i965gm-support.patch, 1.1, 1.2
Message-ID: <200704112118.l3BLIKLA024628@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-i965gm-support.patch 
Log Message:
* Wed Apr 11 2007 Dave Jones <davej at redhat.com>
- DRM support for Intel 965GM



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3058
retrieving revision 1.3059
diff -u -r1.3058 -r1.3059
--- kernel-2.6.spec	11 Apr 2007 20:40:48 -0000	1.3058
+++ kernel-2.6.spec	11 Apr 2007 21:18:18 -0000	1.3059
@@ -383,6 +383,7 @@
 Patch15: git-iwlwifi-fixes.patch
 Patch16: linux-2.6-rt2x00-scan-fix.patch
 Patch17: linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch
+# FIXME: The wireless stuff really belongs in its own section given there's so much of it.
 
 Patch18: linux-2.6-fix-pmops-1.patch
 Patch19: linux-2.6-fix-pmops-2.patch
@@ -390,8 +391,12 @@
 Patch21: linux-2.6-fix-pmops-4.patch
 
 # enable sysrq-c on all kernels, not only kexec
+# FIXME: upstream soon? When? It's been here for ages.
 Patch22: linux-2.6-sysrq-c.patch
 
+# DRM bits for 965
+Patch23: linux-2.6-i965gm-support.patch
+
 # Patches 100 through 500 are meant for architecture patches
 
 # 200 - 299   x86(-64)
@@ -995,6 +1000,9 @@
 # sysrq works always
 %patch22 -p1
 
+# DRM support for 965GM
+%patch23 -p1
+
 # Architecture patches
 
 #
@@ -2256,6 +2264,9 @@
 
 %changelog
 * Wed Apr 11 2007 Dave Jones <davej at redhat.com>
+- DRM support for Intel 965GM
+
+* Wed Apr 11 2007 Dave Jones <davej at redhat.com>
 - 2.6.21-rc6-git4
 
 * Tue Apr 11 2007 John W. Linville <linville at redhat.com>

linux-2.6-i965gm-support.patch:
 drm_pciids.h |    1 +
 i915_dma.c   |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

Index: linux-2.6-i965gm-support.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-i965gm-support.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-i965gm-support.patch	5 Apr 2007 18:16:12 -0000	1.1
+++ linux-2.6-i965gm-support.patch	11 Apr 2007 21:18:18 -0000	1.2
@@ -1,43 +1,3 @@
---- linux-2.6.20.noarch/drivers/char/agp/intel-agp.c.jx	2007-04-05 05:18:01.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/char/agp/intel-agp.c	2007-04-05 05:18:12.000000000 -0400
-@@ -18,11 +18,14 @@
- #define PCI_DEVICE_ID_INTEL_82965Q_IG       0x2992
- #define PCI_DEVICE_ID_INTEL_82965G_HB       0x29A0
- #define PCI_DEVICE_ID_INTEL_82965G_IG       0x29A2
-+#define PCI_DEVICE_ID_INTEL_82965GM_HB      0x2A00
-+#define PCI_DEVICE_ID_INTEL_82965GM_IG      0x2A02
- 
- #define IS_I965 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82946GZ_HB || \
-                  agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965G_1_HB || \
-                  agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965Q_HB || \
--                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965G_HB)
-+                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965G_HB || \
-+                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965GM_HB)
- 
- 
- extern int agp_memory_reserved;
-@@ -1921,7 +1924,13 @@
- 			bridge->driver = &intel_845_driver;
- 		name = "965G";
- 		break;
--
-+	case PCI_DEVICE_ID_INTEL_82965GM_HB:
-+		if (find_i830(PCI_DEVICE_ID_INTEL_82965GM_IG))
-+			bridge->driver = &intel_i965_driver;
-+		else
-+			bridge->driver = &intel_845_driver;
-+		name = "965GM";
-+		break;
- 	case PCI_DEVICE_ID_INTEL_7505_0:
- 		bridge->driver = &intel_7505_driver;
- 		name = "E7505";
-@@ -2080,6 +2089,7 @@
- 	ID(PCI_DEVICE_ID_INTEL_82965G_1_HB),
- 	ID(PCI_DEVICE_ID_INTEL_82965Q_HB),
- 	ID(PCI_DEVICE_ID_INTEL_82965G_HB),
-+	ID(PCI_DEVICE_ID_INTEL_82965GM_HB),
- 	{ }
- };
  
 --- linux-2.6.20.noarch/drivers/char/drm/i915_dma.c.jx	2007-02-04 13:44:54.000000000 -0500
 +++ linux-2.6.20.noarch/drivers/char/drm/i915_dma.c	2007-04-05 05:18:12.000000000 -0400



From fedora-cvs-commits at redhat.com  Wed Apr 11 21:18:54 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 17:18:54 -0400
Subject: rpms/libdhcp/devel libdhcp-1.24-option-list.patch, NONE,
	1.1 libdhcp.spec, 1.49, 1.50
Message-ID: <200704112118.l3BLIsi5025051@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/libdhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25006

Modified Files:
	libdhcp.spec 
Added Files:
	libdhcp-1.24-option-list.patch 
Log Message:
* Wed Apr 11 2007 David Cantrell <dcantrell at redhat.com> - 1.24-2
- Request and handle static-routes option for IPv4 requests (#149736)


libdhcp-1.24-option-list.patch:
 pump.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE libdhcp-1.24-option-list.patch ---
--- libdhcp-1.24/pump.c.optionlist	2007-03-23 11:07:30.000000000 -0400
+++ libdhcp-1.24/pump.c	2007-04-11 17:03:10.000000000 -0400
@@ -85,6 +85,9 @@
 #include <dhcp4client/dhcp4client.h>
 #include <dhcp4client/isc_dhcp/dhcpd.h>
 
+/* DHCP options to request */
+#define OPTLIST "subnet-mask,broadcast-address,routers,domain-name,domain-name-servers,host-name,static-routes"
+
 enum {
     OOM,
     DHCP_FAILED,
@@ -447,9 +450,11 @@
     pumpEnableInterface(ifx->device);
     ifx->dhcp_nic = dhcp_nic(ifx->nh, dhcp_preference, ifx->device,
                              dhcp_capability, timeout,
-                             (LIBDHCP_Error_Handler) logger, log_level, "-V",
-                             vendor_class, hostname ? "-H" : 0L,
-                             hostname ? hostname : 0L, 0L);
+                             (LIBDHCP_Error_Handler) logger, log_level,
+                             "-R", OPTLIST,
+                             "-V", vendor_class,
+                             hostname ? "-H" : 0L, hostname ? hostname : 0L,
+                             0L);
     if (ifx->dhcp_nic) {
         /* fill in the pumpNetIntf structure.
          * We'll just use the FIRST configured address as ifx->ip -


Index: libdhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/libdhcp.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- libdhcp.spec	23 Mar 2007 17:57:25 -0000	1.49
+++ libdhcp.spec	11 Apr 2007 21:18:52 -0000	1.50
@@ -1,12 +1,13 @@
 Summary:    A library for network interface configuration with DHCP
 Name:       libdhcp
 Version:    1.24
-Release:    1%{?dist}
+Release:    2%{?dist}
 License:    GPL
 Group:      Development/Libraries
 URL:        http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.bz2
 Source0:    %{name}-%{version}.tar.bz2
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:     %{name}-1.24-option-list.patch
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: dhcp-devel, libdhcp4client-devel >= 12:3.0.4-18
 BuildRequires: libdhcp6client-devel >= 0.10-38 , libnl-devel >= 1.0-0.10.pre5.4
 BuildRequires: pkgconfig
@@ -31,6 +32,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .optionlist
 
 %build
 %{__make} %{?_smp_mflags}
@@ -59,6 +61,9 @@
 %{_libdir}/pkgconfig/libdhcp.pc
 
 %changelog
+* Wed Apr 11 2007 David Cantrell <dcantrell at redhat.com> - 1.24-2
+- Request and handle static-routes option for IPv4 requests (#149736)
+
 * Fri Mar 23 2007 David Cantrell <dcantrell at redhat.com> - 1.24-1
 - In pumpSetupInterface(), handle dual stack networks rather than defaulting
   to the value of the 'ip' structure member (#232690)



From fedora-cvs-commits at redhat.com  Wed Apr 11 21:34:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 17:34:26 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.218,1.219
Message-ID: <200704112134.l3BLYQ2c003347@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Wed Apr 11 2007 Adam Jackson <ajax at redhat.com> 1.2.99.905-4
- xserver-1.3.0-no-prerelease-warning.patch: Hush the useless prerelease
  warning if we happen to be building one (and even if not).



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- xorg-x11-server.spec	10 Apr 2007 20:58:00 -0000	1.218
+++ xorg-x11-server.spec	11 Apr 2007 21:34:24 -0000	1.219
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.2.99.905
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -50,6 +50,7 @@
 Patch1007:  xorg-x11-server-1.1.1-spurious-libxf1bpp-link.patch
 Patch1008:  xorg-x11-server-1.2.0-xf86config-comment-less.patch
 Patch1009:  xorg-x11-server-1.2.0-maxpixclock-option.patch
+Patch1010:  xserver-1.3.0-no-prerelease-warning.patch
 
 Patch2001:  xserver-1.2.0-geode-mmx.patch
 Patch2002:  xserver-1.2.0-xephyr-keysym-madness.patch
@@ -281,6 +282,7 @@
 %patch1007 -p1 -b .xf1bpp
 %patch1008 -p1 -b .comment-less
 %patch1009 -p1 -b .maxpixclock
+%patch1010 -p1 -b .prerelease-warning
 
 %patch2001 -p1 -b .geode-mmx
 %patch2002 -p1 -b .xephyr-keysym
@@ -551,6 +553,10 @@
 
 
 %changelog
+* Wed Apr 11 2007 Adam Jackson <ajax at redhat.com> 1.2.99.905-4
+- xserver-1.3.0-no-prerelease-warning.patch: Hush the useless prerelease
+  warning if we happen to be building one (and even if not).
+
 * Tue Apr 10 2007 Adam Jackson <ajax at redhat.com> 1.2.99.905-3
 - xserver-1.3.0-domain-obiwan.patch: Fix a PCI domain off-by-one. (#235861)
 - xserver-1.3.0-x86emu-imul-int64.patch: Fix imul in x86emu. (#235861)



From fedora-cvs-commits at redhat.com  Wed Apr 11 21:34:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 17:34:47 -0400
Subject: rpms/xorg-x11-server/devel
	xserver-1.3.0-no-prerelease-warning.patch, NONE, 1.1
Message-ID: <200704112134.l3BLYlOb003591@cvs.devel.redhat.com>

Author: ajackson

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

Added Files:
	xserver-1.3.0-no-prerelease-warning.patch 
Log Message:
* Wed Apr 11 2007 Adam Jackson <ajax at redhat.com> 1.2.99.905-4
- xserver-1.3.0-no-prerelease-warning.patch: Hush the useless prerelease
  warning if we happen to be building one (and even if not).


xserver-1.3.0-no-prerelease-warning.patch:
 configure.ac                 |    2 +-
 hw/xfree86/common/xf86Init.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xserver-1.3.0-no-prerelease-warning.patch ---
--- xorg-server-1.2.99.905/configure.ac.jx	2007-04-06 16:52:25.000000000 -0400
+++ xorg-server-1.2.99.905/configure.ac	2007-04-06 17:45:10.000000000 -0400
@@ -238,7 +238,7 @@
 	;;
   x86_64*|amd64*)
   	use_x86_asm="yes"
-	I386_VIDEO=yes
+	I386_VIDEO=no
 	case $host_os in
 		*freebsd*)	AC_DEFINE(USE_DEV_IO, 1, [BSD /dev/io]) ;;
 		*netbsd*)	AC_DEFINE(USE_I386_IOPL, 1, [BSD i386 iopl])
--- xorg-server-1.2.99.905/hw/xfree86/common/xf86Init.c.jx	2007-01-31 19:55:51.000000000 -0500
+++ xorg-server-1.2.99.905/hw/xfree86/common/xf86Init.c	2007-04-11 12:32:24.000000000 -0400
@@ -1770,7 +1770,7 @@
 static void
 xf86PrintBanner()
 {
-#if PRE_RELEASE
+#if 0
   ErrorF("\n"
     "This is a pre-release version of the X server from " XVENDORNAME ".\n"
     "It is not supported in any way.\n"



From fedora-cvs-commits at redhat.com  Wed Apr 11 21:44:13 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 17:44:13 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.219,
	1.220 xserver-1.3.0-no-prerelease-warning.patch, 1.1, 1.2
Message-ID: <200704112144.l3BLiCuf000866@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-server.spec xserver-1.3.0-no-prerelease-warning.patch 
Log Message:
remove a stray patch hunk


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- xorg-x11-server.spec	11 Apr 2007 21:34:24 -0000	1.219
+++ xorg-x11-server.spec	11 Apr 2007 21:44:10 -0000	1.220
@@ -58,6 +58,8 @@
 Patch2004:  xserver-1.2.0-honor-displaysize.patch
 Patch2005:  xserver-1.2.99.901-xephyr-crash-at-exit.patch
 
+Patch9999: fuck-the-kernel.patch
+
 # assorted PCI layer shenanigans.  oh the pain.
 Patch2500:  xorg-x11-server-1.2.99-unbreak-domain.patch
 Patch2501:  xserver-1.3.0-pci-bus-count.patch
@@ -296,6 +298,8 @@
 %patch2503 -p1 -b .rom-search
 %patch2504 -p1 -b .domain-obiwan
 
+%patch9999 -p1 -b .jx
+
 %build
 
 # --with-rgb-path should be superfluous now ?

xserver-1.3.0-no-prerelease-warning.patch:
 xf86Init.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: xserver-1.3.0-no-prerelease-warning.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xserver-1.3.0-no-prerelease-warning.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xserver-1.3.0-no-prerelease-warning.patch	11 Apr 2007 21:34:45 -0000	1.1
+++ xserver-1.3.0-no-prerelease-warning.patch	11 Apr 2007 21:44:10 -0000	1.2
@@ -1,14 +1,3 @@
---- xorg-server-1.2.99.905/configure.ac.jx	2007-04-06 16:52:25.000000000 -0400
-+++ xorg-server-1.2.99.905/configure.ac	2007-04-06 17:45:10.000000000 -0400
-@@ -238,7 +238,7 @@
- 	;;
-   x86_64*|amd64*)
-   	use_x86_asm="yes"
--	I386_VIDEO=yes
-+	I386_VIDEO=no
- 	case $host_os in
- 		*freebsd*)	AC_DEFINE(USE_DEV_IO, 1, [BSD /dev/io]) ;;
- 		*netbsd*)	AC_DEFINE(USE_I386_IOPL, 1, [BSD i386 iopl])
 --- xorg-server-1.2.99.905/hw/xfree86/common/xf86Init.c.jx	2007-01-31 19:55:51.000000000 -0500
 +++ xorg-server-1.2.99.905/hw/xfree86/common/xf86Init.c	2007-04-11 12:32:24.000000000 -0400
 @@ -1770,7 +1770,7 @@



From fedora-cvs-commits at redhat.com  Wed Apr 11 21:44:33 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 17:44:33 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.220,1.221
Message-ID: <200704112144.l3BLiXC0000894@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-server.spec 
Log Message:
remove a stray patch hunk


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- xorg-x11-server.spec	11 Apr 2007 21:44:10 -0000	1.220
+++ xorg-x11-server.spec	11 Apr 2007 21:44:31 -0000	1.221
@@ -58,8 +58,6 @@
 Patch2004:  xserver-1.2.0-honor-displaysize.patch
 Patch2005:  xserver-1.2.99.901-xephyr-crash-at-exit.patch
 
-Patch9999: fuck-the-kernel.patch
-
 # assorted PCI layer shenanigans.  oh the pain.
 Patch2500:  xorg-x11-server-1.2.99-unbreak-domain.patch
 Patch2501:  xserver-1.3.0-pci-bus-count.patch
@@ -298,8 +296,6 @@
 %patch2503 -p1 -b .rom-search
 %patch2504 -p1 -b .domain-obiwan
 
-%patch9999 -p1 -b .jx
-
 %build
 
 # --with-rgb-path should be superfluous now ?



From fedora-cvs-commits at redhat.com  Wed Apr 11 22:03:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 18:03:50 -0400
Subject: rpms/kernel/devel/configs config-generic,1.305,1.305.6.1
Message-ID: <200704112203.l3BM3osk001285@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-jwltest-fc7-8-branch
	config-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.305
retrieving revision 1.305.6.1
diff -u -r1.305 -r1.305.6.1
--- config-generic	5 Apr 2007 19:58:28 -0000	1.305
+++ config-generic	11 Apr 2007 22:03:48 -0000	1.305.6.1
@@ -1182,6 +1182,7 @@
 
 CONFIG_MAC80211=m
 CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
 # CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 CONFIG_IEEE80211_DEBUG=y



From fedora-cvs-commits at redhat.com  Wed Apr 11 22:03:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 18:03:50 -0400
Subject: rpms/kernel/devel jwltest-bcm43xx_mac80211-phy-rev-1.patch, NONE,
	1.1.4.1 jwltest-git-iwlwifi-fixes.patch, NONE,
	1.1.4.1 jwltest-git-iwlwifi.patch, NONE,
	1.1.4.1 jwltest-git-wireless-dev.patch, NONE,
	1.1.14.1 kernel-2.6.spec, 1.3056,
	1.3056.2.1 linux-2.6-warnings-inline.patch, 1.3, 1.3.6.1
Message-ID: <200704112203.l3BM3opr001263@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-jwltest-fc7-8-branch
	kernel-2.6.spec linux-2.6-warnings-inline.patch 
Added Files:
      Tag: private-linville-jwltest-fc7-8-branch
	jwltest-bcm43xx_mac80211-phy-rev-1.patch 
	jwltest-git-iwlwifi-fixes.patch jwltest-git-iwlwifi.patch 
	jwltest-git-wireless-dev.patch 
Log Message:


jwltest-bcm43xx_mac80211-phy-rev-1.patch:
 bcm43xx_phy.c |   50 +++++++++++++++++++++++++++++---------------------
 1 files changed, 29 insertions(+), 21 deletions(-)

--- NEW FILE jwltest-bcm43xx_mac80211-phy-rev-1.patch ---
--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c.orig	2007-04-11 14:52:39.000000000 -0400
+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c	2007-04-11 14:53:22.000000000 -0400
@@ -1362,7 +1362,7 @@ static void bcm43xx_phy_initb6(struct bc
 static void bcm43xx_calc_loopback_gain(struct bcm43xx_wldev *dev)
 {
 	struct bcm43xx_phy *phy = &dev->phy;
-	u16 backup_phy[16];
+	u16 backup_phy[16] = {0};
 	u16 backup_radio[3];
 	u16 backup_bband;
 	u16 i, j, loop_i_max;
@@ -1373,8 +1373,10 @@ static void bcm43xx_calc_loopback_gain(s
 	backup_phy[1] = bcm43xx_phy_read(dev, BCM43xx_PHY_CCKBBANDCFG);
 	backup_phy[2] = bcm43xx_phy_read(dev, BCM43xx_PHY_RFOVER);
 	backup_phy[3] = bcm43xx_phy_read(dev, BCM43xx_PHY_RFOVERVAL);
-	backup_phy[4] = bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVER);
-	backup_phy[5] = bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVERVAL);
+	if (phy->rev != 1) {
+		backup_phy[4] = bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVER);
+		backup_phy[5] = bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVERVAL);
+	}
 	backup_phy[6] = bcm43xx_phy_read(dev, BCM43xx_PHY_BASE(0x5A));
 	backup_phy[7] = bcm43xx_phy_read(dev, BCM43xx_PHY_BASE(0x59));
 	backup_phy[8] = bcm43xx_phy_read(dev, BCM43xx_PHY_BASE(0x58));
@@ -1402,14 +1404,16 @@ static void bcm43xx_calc_loopback_gain(s
 			  bcm43xx_phy_read(dev, BCM43xx_PHY_RFOVER) | 0x0001);
 	bcm43xx_phy_write(dev, BCM43xx_PHY_RFOVERVAL,
 			  bcm43xx_phy_read(dev, BCM43xx_PHY_RFOVERVAL) & 0xFFFE);
-	bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVER,
-			  bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVER) | 0x0001);
-	bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVERVAL,
-			  bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVERVAL) & 0xFFFE);
-	bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVER,
-			  bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVER) | 0x0002);
-	bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVERVAL,
-			  bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVERVAL) & 0xFFFD);
+	if (phy->rev != 1) {
+		bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVER,
+				  bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVER) | 0x0001);
+		bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVERVAL,
+				  bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVERVAL) & 0xFFFE);
+		bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVER,
+				  bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVER) | 0x0002);
+		bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVERVAL,
+				  bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVERVAL) & 0xFFFD);
+	}
 	bcm43xx_phy_write(dev, BCM43xx_PHY_RFOVER,
 			  bcm43xx_phy_read(dev, BCM43xx_PHY_RFOVER) | 0x000C);
 	bcm43xx_phy_write(dev, BCM43xx_PHY_RFOVER,
@@ -1426,10 +1430,12 @@ static void bcm43xx_calc_loopback_gain(s
 
 	bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x0A),
 			  bcm43xx_phy_read(dev, BCM43xx_PHY_BASE(0x0A)) | 0x2000);
-	bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVER,
-			  bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVER) | 0x0004);
-	bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVERVAL,
-			  bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVERVAL) & 0xFFFB);
+	if (phy->rev != 1) {
+		bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVER,
+				  bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVER) | 0x0004);
+		bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVERVAL,
+				  bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVERVAL) & 0xFFFB);
+	}
 	bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x03),
 			  (bcm43xx_phy_read(dev, BCM43xx_PHY_BASE(0x03))
 			   & 0xFF9F) | 0x40);
@@ -1522,8 +1528,10 @@ exit_loop1:
 		trsw_rx = 0x18;
 exit_loop2:
 
-	bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVER, backup_phy[4]);
-	bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVERVAL, backup_phy[5]);
+	if (phy->rev != 1) {
+		bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVER, backup_phy[4]);
+		bcm43xx_phy_write(dev, BCM43xx_PHY_ANALOGOVERVAL, backup_phy[5]);
+	}
 	bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x5A), backup_phy[6]);
 	bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x59), backup_phy[7]);
 	bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x58), backup_phy[8]);
@@ -1576,7 +1584,7 @@ static void bcm43xx_phy_initg(struct bcm
 		bcm43xx_phy_write(dev, BCM43xx_PHY_RFOVER, 0x400);
 		bcm43xx_phy_write(dev, BCM43xx_PHY_PGACTL, 0xC0);
 	}
-	if (phy->gmode) {
+	if (phy->gmode && phy->rev >= 2) {
 		tmp = bcm43xx_phy_read(dev, BCM43xx_PHY_VERSION_OFDM);
 		tmp &= BCM43xx_PHYVER_VERSION;
 		if (tmp == 3 || tmp == 5) {
@@ -1635,7 +1643,7 @@ static void bcm43xx_phy_initg(struct bcm
 		else
 			bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x2F), 0x202);
 	}
-	if (phy->gmode) {
+	if (phy->gmode && phy->rev != 1) {
 		bcm43xx_lo_adjust(dev);
 		bcm43xx_phy_write(dev, BCM43xx_PHY_LO_MASK, 0x8078);
 	}
@@ -1649,8 +1657,8 @@ static void bcm43xx_phy_initg(struct bcm
 		 */
 		bcm43xx_nrssi_hw_update(dev, 0xFFFF);//FIXME?
 		bcm43xx_calc_nrssi_threshold(dev);
-	} else {
-		if (phy->gmode && phy->nrssi[0] == -1000) {
+	} else if (phy->gmode && phy->rev != 1) {
+		if (phy->nrssi[0] == -1000) {
 			assert(phy->nrssi[1] == -1000);
 			bcm43xx_calc_nrssi_slope(dev);
 		} else

jwltest-git-iwlwifi-fixes.patch:
 base.c    |    1 +
 iwlwifi.h |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE jwltest-git-iwlwifi-fixes.patch ---
--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig	2007-04-11 15:15:22.000000000 -0400
+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-04-11 15:15:27.000000000 -0400
@@ -12970,6 +12970,7 @@ static int ipw_pci_probe(struct pci_dev 
 	err = ipw_read_ucode(priv);
 	if (err) {
 		IPW_ERROR("Could not read microcode from disk: %d\n", err);
+		mutex_unlock(&priv->mutex);
 		goto out_remove_sysfs;
 	}
 
--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h.orig	2007-04-11 15:17:53.000000000 -0400
+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h	2007-04-11 15:18:59.000000000 -0400
@@ -180,7 +180,7 @@ do { if (ipw_debug_level & (level)) \
 #define IPW_DL_QOS           (1<<31)
 
 #define IPW_ERROR(f, a...) printk(KERN_ERR DRV_NAME ": " f, ## a)
-#define IPW_WARNING(f, a...) printk(KERN_ERR DRV_NAME ": " f, ## a)
+#define IPW_WARNING(f, a...) printk(KERN_WARNING DRV_NAME ": " f, ## a)
 #define IPW_DEBUG_INFO(f, a...)    IPW_DEBUG(IPW_DL_INFO, f, ## a)
 
 #define IPW_DEBUG_MAC80211(f, a...)     IPW_DEBUG(IPW_DL_MAC80211, f, ## a)

jwltest-git-iwlwifi.patch:
 Kconfig              |    1 
 Makefile             |    1 
 iwlwifi/Kconfig      |   52 
 iwlwifi/Makefile     |    2 
 iwlwifi/base.c       |13762 +++++++++++++++++++++++++++++++++++++++++++++++++++
 iwlwifi/iwlwifi.h    | 1297 ++++
 iwlwifi/iwlwifi_hw.h | 1877 ++++++
 7 files changed, 16992 insertions(+)

--- NEW FILE jwltest-git-iwlwifi.patch ---
--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig	2007-04-11 14:45:40.000000000 -0400
+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-04-11 14:46:30.000000000 -0400
@@ -0,0 +1,13762 @@
+/******************************************************************************
+
+  Copyright(c) 2003 - 2006 Intel Corporation. All rights reserved.
+
+  Portions of this file are derived from the ipw3945 project, as well
+  as portions of the ieee80211 subsystem header files.
+
+  802.11 status code portion of this file from ethereal-0.10.6:
+    Copyright 2000, Axis Communications AB
+    Ethereal - Network traffic analyzer
+    By Gerald Combs <gerald at ethereal.com>
+    Copyright 1998 Gerald Combs
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of version 2 of the GNU General Public License as
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+
+  Contact Information:
+  James P. Ketrenos <ipw2100-admin at linux.intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+******************************************************************************/
+
+/*
+ * Theory of operation:
+ *
+ * The primary NIC mode of operation is configured within the RXON command.
+ * As such, there are two instances of RXON data -- staging_rxon and
+ * active_rxon.  The former is used to configure the device, the later to
+ * reflect the actual currently active configuration.
+ *
+ * After configuring staging_rxon, it is activated by calling
+ * ipw_commit_rxon(). The ipw_commit_rxon() will ensure the correct sequence
+ * of commands are invoked on the hardware to result in Tx being possible
+ * (if the channel is appropriate for Tx)
+ *
+ * About the threading and lock model of the driver...
+ *
+ * There are three paths of execution through the driver.
+ *
+ * 1.  ioctl based (wireless extensions, netdev, etc.)
+ * 2.  interrupt based
+ * 3.  scheduled work queue items
+ *
+ * As soon as an interrupt comes in, it schedules a tasklet.  That tasklet,
+ * when run, does any HW checks, pulls any data from the read queue,
+ * and schedules other layers to do the actual work.
+ *
+ * NOTE: This driver is a work in progress.  It is currently structured
+ * in a way that we can add support for the next wireless adapter
+ * available from Intel.
+ *
+ * Our current focus is as follows:
+ * 1.  Get the driver working w/ mac80211 in STA(client) mode.
+ * 2.  Clean up the dual-driver code from function redirection to
+ *     if/else switches where the code detlas are minimal.
+ * 3.  Evaluate the amount of delta between the hardware versions and
+ *     possibly split iwlwifi into multiple drivers for each piece of
+ *     HW, sharing as much base code as possible (would result in
+ *     multiple driver files on disk vs. a single module that works
+ *     with multiple hardware types)
+ * 4.  Document the uCode regulatory enforcement
+ * 5.  Document the rate scaling capabilities of the 3945
+ * 6.  Provide an initial rate scaling algorithm tailored for the
+ *     statistic data exposed by the 3945.
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/dma-mapping.h>
+#include <linux/delay.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/wireless.h>
+#include <linux/firmware.h>
+#include <net/iw_handler.h>
+
+//#define BIT(x) (1 << (x))
+#include <net/mac80211.h>
+#include <net/ieee80211.h>
+
+#include <../net/mac80211/ieee80211_rate.h>
+
+#include <net/ieee80211_radiotap.h>
+	
+#ifndef ETH_P_80211_RAW
+#define ETH_P_80211_RAW (ETH_P_ECONET + 1)
+#endif
+
+#include <linux/if_arp.h>
+#include <asm/div64.h>
+
+#include "iwlwifi.h"
+
+#define IWLWIFI_VERSION "0.0.12k"
+
+#define DRV_DESCRIPTION	"Intel(R) Wireless Link driver for Linux"
+#define DRV_COPYRIGHT	"Copyright(c) 2003-2006 Intel Corporation"
+#define DRV_VERSION     IWLWIFI_VERSION
+
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR(DRV_COPYRIGHT);
+MODULE_LICENSE("GPL");
+
+/*MAC80211  move this to mac80211 files */
+#define IEEE80211_FC(type, stype) cpu_to_le16((type << 2) | (stype << 4))
+
+#define IEEE80211_CHAN_W_RADAR_DETECT 0x00000010
+
+#define IEEE80211_24GHZ_BAND     (1<<0)
+#define IEEE80211_52GHZ_BAND     (1<<1)
+
+#define IEEE80211_CCK_RATE_1MB                  0x02
+#define IEEE80211_CCK_RATE_2MB                  0x04
+#define IEEE80211_CCK_RATE_5MB                  0x0B
+#define IEEE80211_CCK_RATE_11MB                 0x16
+#define IEEE80211_OFDM_RATE_6MB                 0x0C
+#define IEEE80211_OFDM_RATE_9MB                 0x12
+#define IEEE80211_OFDM_RATE_12MB                0x18
+#define IEEE80211_OFDM_RATE_18MB                0x24
+#define IEEE80211_OFDM_RATE_24MB                0x30
+#define IEEE80211_OFDM_RATE_36MB                0x48
+#define IEEE80211_OFDM_RATE_48MB                0x60
+#define IEEE80211_OFDM_RATE_54MB                0x6C
+#define IEEE80211_BASIC_RATE_MASK               0x80
+
+#define IEEE80211_CCK_RATE_1MB_MASK             (1<<0)
+#define IEEE80211_CCK_RATE_2MB_MASK             (1<<1)
+#define IEEE80211_CCK_RATE_5MB_MASK             (1<<2)
+#define IEEE80211_CCK_RATE_11MB_MASK            (1<<3)
+#define IEEE80211_OFDM_RATE_6MB_MASK            (1<<4)
+#define IEEE80211_OFDM_RATE_9MB_MASK            (1<<5)
+#define IEEE80211_OFDM_RATE_12MB_MASK           (1<<6)
+#define IEEE80211_OFDM_RATE_18MB_MASK           (1<<7)
+#define IEEE80211_OFDM_RATE_24MB_MASK           (1<<8)
+#define IEEE80211_OFDM_RATE_36MB_MASK           (1<<9)
+#define IEEE80211_OFDM_RATE_48MB_MASK           (1<<10)
+#define IEEE80211_OFDM_RATE_54MB_MASK           (1<<11)
+
+#define IEEE80211_CCK_RATES_MASK                0x0000000F
+#define IEEE80211_CCK_BASIC_RATES_MASK  (IEEE80211_CCK_RATE_1MB_MASK | \
+        IEEE80211_CCK_RATE_2MB_MASK)
+#define IEEE80211_CCK_DEFAULT_RATES_MASK        (IEEE80211_CCK_BASIC_RATES_MASK | \
+        IEEE80211_CCK_RATE_5MB_MASK | \
+        IEEE80211_CCK_RATE_11MB_MASK)
+
+#define IEEE80211_OFDM_RATES_MASK               0x00000FF0
+#define IEEE80211_OFDM_BASIC_RATES_MASK (IEEE80211_OFDM_RATE_6MB_MASK | \
+        IEEE80211_OFDM_RATE_12MB_MASK | \
+        IEEE80211_OFDM_RATE_24MB_MASK)
+#define IEEE80211_OFDM_DEFAULT_RATES_MASK       (IEEE80211_OFDM_BASIC_RATES_MASK | \
+        IEEE80211_OFDM_RATE_9MB_MASK  | \
+        IEEE80211_OFDM_RATE_18MB_MASK | \
+        IEEE80211_OFDM_RATE_36MB_MASK | \
+        IEEE80211_OFDM_RATE_48MB_MASK | \
+        IEEE80211_OFDM_RATE_54MB_MASK)
+#define IEEE80211_DEFAULT_RATES_MASK (IEEE80211_OFDM_DEFAULT_RATES_MASK | \
+                                IEEE80211_CCK_DEFAULT_RATES_MASK)
+
+#define IEEE80211_NUM_OFDM_RATES            8
+#define IEEE80211_NUM_CCK_RATES             4
+#define IEEE80211_OFDM_SHIFT_MASK_A         4
+
+/*MAC80211 end */
+
+static u32 ipw_debug_level;
+
+static int param_debug = 0;
+static int param_channel = 0;
+static int param_mode = 0;
+static int param_auto_create = 1;	/* def: create new adhoc network if needed */
+static int param_led = 1;	/* def: use LEDs */
+static int param_disable = 0;	/* def: enable radio */
+static int param_antenna = 0;	/* def: 0 = both antennas (use diversity) */
+static int param_hwcrypto = 0;	/* def: using software encryption */
+static int param_qos_enable = 1;
+static int param_rtap_iface = 0;
+
+static const char ipw_modes[] = {
+	'a', 'b', 'g', '?'
+};
[...16620 lines suppressed...]
+	u8 flags;
+	/* We have 15 LSB to use as we please (MSB indicates
+	 * a frame Rx'd from the HW).  We encode the following
+	 * information into the sequence field:
+	 *
+	 *  0:7    index in fifo
+	 *  8:13   fifo selection
+	 * 14:14   bit indicating if this packet references the 'extra'
+	 *         storage at the end of the memory queue
+	 * 15:15   (Rx indication)
+	 *
+	 */
+	u16 sequence;
+
+	/* command data follows immediately */
+	u8 data[0];
+} __attribute__ ((packed));
+
+// Used for passing to driver number of successes and failures per rate
+struct rate_histogram {
+	union {
+		u32 a[SUP_RATE_11A_MAX_NUM_CHANNELS];
+		u32 b[SUP_RATE_11B_MAX_NUM_CHANNELS];
+		u32 g[SUP_RATE_11G_MAX_NUM_CHANNELS];
+	} success;
+	union {
+		u32 a[SUP_RATE_11A_MAX_NUM_CHANNELS];
+		u32 b[SUP_RATE_11B_MAX_NUM_CHANNELS];
+		u32 g[SUP_RATE_11G_MAX_NUM_CHANNELS];
+	} failed;
+} __attribute__ ((packed));
+
+/* statistics command response */
+
+struct statistics_rx_phy {
+	u32 ina_cnt;
+	u32 fina_cnt;
+	u32 plcp_err;
+	u32 crc32_err;
+	u32 overrun_err;
+	u32 early_overrun_err;
+	u32 crc32_good;
+	u32 false_alarm_cnt;
+	u32 fina_sync_err_cnt;
+	u32 sfd_timeout;
+	u32 fina_timeout;
+	u32 unresponded_rts;
+	u32 rxe_frame_limit_overrun;
+	u32 sent_ack_cnt;
+	u32 sent_cts_cnt;
+} __attribute__ ((packed));
+
+struct statistics_rx {
+	struct statistics_rx_phy ofdm;
+	struct statistics_rx_phy cck;
+	u32 bogus_cts;
+	u32 bogus_ack;
+	u32 non_bssid_frames;
+	u32 filtered_frames;
+	u32 non_channel_beacons;
+} __attribute__ ((packed));
+
+struct statistics_tx {
+	u32 preamble_cnt;
+	u32 rx_detected_cnt;
+	u32 bt_prio_defer_cnt;
+	u32 bt_prio_kill_cnt;
+	u32 few_bytes_cnt;
+	u32 cts_timeout;
+	u32 ack_timeout;
+	u32 expected_ack_cnt;
+	u32 actual_ack_cnt;
+} __attribute__ ((packed));
+
+struct statistics_dbg {
+	u32 burst_check;
+	u32 burst_count;
+	u32 reserved[4];
+} __attribute__ ((packed));
+
+struct statistics_div {
+	u32 tx_on_a;
+	u32 tx_on_b;
+	u32 exec_time;
+	u32 probe_time;
+} __attribute__ ((packed));
+
+struct statistics_general {
+	u32 temperature;
+	struct statistics_dbg dbg;
+	u32 sleep_time;
+	u32 slots_out;
+	u32 slots_idle;
+	u32 ttl_timestamp;
+	struct statistics_div div;
+} __attribute__ ((packed));
+
+struct ipw_notif_statistics {
+	u32 flag;
+	struct statistics_rx rx;
+	struct statistics_tx tx;
+	struct statistics_general general;
+} __attribute__ ((packed));
+
+struct ipw_rx_packet {
+	u32 len;
+	struct ipw_cmd_header hdr;
+	union {
+		struct ipw_alive_resp alive_frame;
+		struct ipw_rx_frame rx_frame;
+		struct ipw_tx_resp tx_resp;
+		struct ipw_spectrum_notification spectrum_notif;
+		struct ipw_csa_notification csa_notif;
+		struct ipw_error_resp err_resp;
+		struct ipw_card_state_notif card_state_notif;
+		struct ipw_notif_statistics stats;
+		struct BeaconNtfSpecifics beacon_status;
+		struct ipw_add_sta_resp add_sta;
+		struct ipw_sleep_notification sleep_notif;
+		u32 status;
+		u8 raw[0];
+	} u;
+} __attribute__ ((packed));
+
+#define IPW_RX_FRAME_SIZE        (4 + sizeof(struct ipw_rx_frame))
+
+struct ipw_multicast_addr {
+	u8 num_of_multicast_addresses;
+	u8 reserved[3];
+	u8 mac1[6];
+	u8 mac2[6];
+	u8 mac3[6];
+	u8 mac4[6];
+} __attribute__ ((packed));
+
+struct ipw_tgi_tx_key {
+	u8 key_id;
+	u8 security_type;
+	u8 station_index;
+	u8 flags;
+	u8 key[16];
+	u32 tx_counter[2];
+} __attribute__ ((packed));
+
+struct ipw_associate {
+	u8 channel;
+	u8 auth_type:4, auth_key:4;
+	u8 assoc_type;
+	u8 reserved;
+	u16 policy_support;
+	u8 preamble_length;
+	u8 ieee_mode;
+	u8 bssid[ETH_ALEN];
+	u32 assoc_tsf_msw;
+	u32 assoc_tsf_lsw;
+	u16 capability;
+	u16 listen_interval;
+	u16 beacon_interval;
+	u8 dest[ETH_ALEN];
+	u16 atim_window;
+	u8 smr;
+	u8 reserved1;
+	u16 reserved2;
+	u16 assoc_id;
+	u8 erp_value;
+} __attribute__ ((packed));
+
+#define IPW_SUPPORTED_RATES_IE_LEN         8
+
+struct ipw_supported_rates {
+	u8 ieee_mode;
+	u8 num_rates;
+	u8 purpose;
+	u8 reserved;
+	u8 supported_rates[IPW_MAX_RATES];
+} __attribute__ ((packed));
+
+struct ipw_channel_tx_power {
+	u8 channel_number;
+	s8 tx_power;
+} __attribute__ ((packed));
+
+
+#define IPW_RX_BUF_SIZE 3000
+
+#endif				/* __iwlwifi_hw_h__ */
--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile.orig	2007-04-11 14:45:40.000000000 -0400
+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile	2007-04-11 14:46:00.000000000 -0400
@@ -4,3 +4,4 @@ obj-$(CONFIG_ADM8211)		+= adm8211/
 obj-$(CONFIG_P54_COMMON)	+= p54/
 obj-$(CONFIG_ZD1211RW_MAC80211)	+= zd1211rw/
 obj-$(CONFIG_RTL818X)		+= rtl818x/
+obj-$(CONFIG_IWLWIFI)		+= iwlwifi/
--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig.orig	2007-04-11 14:45:40.000000000 -0400
+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig	2007-04-11 14:46:00.000000000 -0400
@@ -4,3 +4,4 @@ source "drivers/net/wireless/mac80211/ad
 source "drivers/net/wireless/mac80211/p54/Kconfig"
 source "drivers/net/wireless/mac80211/zd1211rw/Kconfig"
 source "drivers/net/wireless/mac80211/rtl818x/Kconfig"
+source "drivers/net/wireless/mac80211/iwlwifi/Kconfig"

jwltest-git-wireless-dev.patch:
 .mailmap                                                |    1 
 CREDITS                                                 |   37 
 Documentation/feature-removal-schedule.txt              |   11 
 MAINTAINERS                                             |   60 
 drivers/Kconfig                                         |    2 
 drivers/Makefile                                        |    1 
 drivers/misc/Kconfig                                    |    8 
 drivers/misc/Makefile                                   |    1 
 drivers/misc/eeprom_93cx6.c                             |  344 +
 drivers/net/Makefile                                    |    2 
 drivers/net/wireless/Kconfig                            |  120 
 drivers/net/wireless/Makefile                           |    3 
 drivers/net/wireless/bcm43xx/Kconfig                    |    3 
 drivers/net/wireless/hostap/Kconfig                     |    3 
 drivers/net/wireless/mac80211/Kconfig                   |    6 
 drivers/net/wireless/mac80211/Makefile                  |    6 
 drivers/net/wireless/mac80211/README                    |    2 
 drivers/net/wireless/mac80211/adm8211/Kconfig           |   25 
 drivers/net/wireless/mac80211/adm8211/Makefile          |    1 
 drivers/net/wireless/mac80211/adm8211/adm8211.c         | 2172 ++++++
 drivers/net/wireless/mac80211/adm8211/adm8211.h         |  622 +
 drivers/net/wireless/mac80211/bcm43xx/Kconfig           |  100 
 drivers/net/wireless/mac80211/bcm43xx/Makefile          |   18 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h         |  875 ++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c |  433 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h |  110 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c     | 1297 ++++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h     |  361 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c    |  300 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h    |   56 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c      | 1110 +++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h      |   92 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c    | 3984 ++++++++++++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h    |  156 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c  |  163 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h  |   22 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c     | 4262 +++++++++++++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h     |  309 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c     |  671 ++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h     |  170 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c   |   82 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h   |   41 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c   |  232 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h   |    9 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c  |  376 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h  |   28 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c    |  611 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h    |  250 
 drivers/net/wireless/mac80211/p54/Kconfig               |   10 
 drivers/net/wireless/mac80211/p54/Makefile              |    4 
 drivers/net/wireless/mac80211/p54/net2280.h             |  452 +
 drivers/net/wireless/mac80211/p54/prism54.h             |   77 
 drivers/net/wireless/mac80211/p54/prism54common.c       |  821 ++
 drivers/net/wireless/mac80211/p54/prism54common.h       |  328 +
 drivers/net/wireless/mac80211/p54/prism54magic.h        |   77 
 drivers/net/wireless/mac80211/p54/prism54pci.c          |  700 ++
 drivers/net/wireless/mac80211/p54/prism54pci.h          |  106 
 drivers/net/wireless/mac80211/p54/prism54usb.c          |  946 ++
 drivers/net/wireless/mac80211/p54/prism54usb.h          |  133 
 drivers/net/wireless/mac80211/rt2x00/Kconfig            |   86 
 drivers/net/wireless/mac80211/rt2x00/Makefile           |    9 
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.c        | 2595 ++++++++
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.h        |  931 ++
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.c        | 2892 +++++++++
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.h        | 1198 +++
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.c        | 2727 ++++++++
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.h        |  746 ++
 drivers/net/wireless/mac80211/rt2x00/rt2x00.h           | 1069 +++
 drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c      |  380 +
 drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h      |   70 
 drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c        |  231 
 drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h        |   74 
 drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c        |  540 +
 drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h        |   39 
 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h        |   82 
 drivers/net/wireless/mac80211/rt2x00/rt61pci.c          | 3362 ++++++++++
 drivers/net/wireless/mac80211/rt2x00/rt61pci.h          | 1361 ++++
 drivers/net/wireless/mac80211/rt2x00/rt73usb.c          | 3024 +++++++++
 drivers/net/wireless/mac80211/rt2x00/rt73usb.h          |  945 ++
 drivers/net/wireless/mac80211/rtl818x/Kconfig           |    9 
 drivers/net/wireless/mac80211/rtl818x/Makefile          |    2 
 drivers/net/wireless/mac80211/rtl818x/rtl8187.h         |  126 
 drivers/net/wireless/mac80211/rtl818x/rtl8187_dev.c     |  726 ++
 drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.c |  747 ++
 drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.h |   30 
 drivers/net/wireless/mac80211/rtl818x/rtl818x.h         |  180 
 drivers/net/wireless/mac80211/zd1211rw/Kconfig          |   19 
 drivers/net/wireless/mac80211/zd1211rw/Makefile         |   11 
 drivers/net/wireless/mac80211/zd1211rw/zd_chip.c        | 1679 +++++
 drivers/net/wireless/mac80211/zd1211rw/zd_chip.h        |  910 ++
 drivers/net/wireless/mac80211/zd1211rw/zd_def.h         |   57 
 drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h   |   67 
 drivers/net/wireless/mac80211/zd1211rw/zd_mac.c         |  700 ++
 drivers/net/wireless/mac80211/zd1211rw/zd_mac.h         |  250 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf.c          |  170 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf.h          |   80 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c   |  436 +
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c  |  491 +
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c   |  279 
 drivers/net/wireless/mac80211/zd1211rw/zd_usb.c         | 1337 ++++
 drivers/net/wireless/mac80211/zd1211rw/zd_usb.h         |  241 
 drivers/net/wireless/mac80211/zd1211rw/zd_util.c        |   82 
 drivers/net/wireless/mac80211/zd1211rw/zd_util.h        |   29 
 drivers/net/wireless/zd1211rw/Kconfig                   |    4 
 drivers/ssb/Kconfig                                     |   93 
 drivers/ssb/Makefile                                    |   11 
 drivers/ssb/driver_chipcommon.c                         |  402 +
 drivers/ssb/driver_mipscore.c                           |  258 
 drivers/ssb/driver_pcicore.c                            |  556 +
 drivers/ssb/main.c                                      | 1050 +++
 drivers/ssb/pci.c                                       |  667 ++
 drivers/ssb/pcihost_wrapper.c                           |  104 
 drivers/ssb/pcmcia.c                                    |  256 
 drivers/ssb/scan.c                                      |  407 +
 drivers/ssb/ssb_private.h                               |  151 
 drivers/usb/host/Kconfig                                |   13 
 drivers/usb/host/ohci-hcd.c                             |   21 
 drivers/usb/host/ohci-ssb.c                             |  254 
 include/linux/Kbuild                                    |    2 
 include/linux/crc-itu-t.h                               |   27 
 include/linux/eeprom_93cx6.h                            |   77 
 include/linux/ieee80211.h                               |  403 +
 include/linux/netdevice.h                               |    7 
 include/linux/nl80211.h                                 |  302 
 include/linux/ssb/ssb.h                                 |  403 +
 include/linux/ssb/ssb_driver_chipcommon.h               |  387 +
 include/linux/ssb/ssb_driver_extif.h                    |  163 
 include/linux/ssb/ssb_driver_mips.h                     |   47 
 include/linux/ssb/ssb_driver_pci.h                      |  108 
 include/linux/ssb/ssb_regs.h                            |  294 
 include/net/cfg80211.h                                  |  153 
 include/net/iw_handler.h                                |   13 
 include/net/mac80211.h                                  | 1106 +++
 include/net/wireless.h                                  |  159 
 lib/Kconfig                                             |    8 
 lib/Makefile                                            |    1 
 lib/crc-itu-t.c                                         |   64 
 net/Kconfig                                             |   12 
 net/Makefile                                            |    2 
 net/core/Makefile                                       |    1 
 net/core/dev.c                                          |   33 
 net/core/rtnetlink.c                                    |   31 
 net/ieee80211/Kconfig                                   |    3 
 net/mac80211/Kconfig                                    |   81 
 net/mac80211/Makefile                                   |   21 
 net/mac80211/aes_ccm.c                                  |  155 
 net/mac80211/aes_ccm.h                                  |   26 
 net/mac80211/debugfs.c                                  |  436 +
 net/mac80211/debugfs.h                                  |   16 
 net/mac80211/debugfs_key.c                              |  253 
 net/mac80211/debugfs_key.h                              |   34 
 net/mac80211/debugfs_netdev.c                           |  440 +
 net/mac80211/debugfs_netdev.h                           |   30 
 net/mac80211/debugfs_sta.c                              |  247 
 net/mac80211/debugfs_sta.h                              |   12 
 net/mac80211/hostapd_ioctl.h                            |  347 +
 net/mac80211/ieee80211.c                                | 5097 ++++++++++++++++
 net/mac80211/ieee80211_cfg.c                            |   90 
 net/mac80211/ieee80211_cfg.h                            |    9 
 net/mac80211/ieee80211_common.h                         |   98 
 net/mac80211/ieee80211_i.h                              |  848 ++
 net/mac80211/ieee80211_iface.c                          |  366 +
 net/mac80211/ieee80211_ioctl.c                          | 3290 ++++++++++
 net/mac80211/ieee80211_key.h                            |  106 
 net/mac80211/ieee80211_led.c                            |   91 
 net/mac80211/ieee80211_led.h                            |   32 
 net/mac80211/ieee80211_rate.c                           |  140 
 net/mac80211/ieee80211_rate.h                           |  144 
 net/mac80211/ieee80211_scan.c                           |  344 +
 net/mac80211/ieee80211_sta.c                            | 3210 ++++++++++
 net/mac80211/michael.c                                  |  104 
 net/mac80211/michael.h                                  |   20 
 net/mac80211/rc80211_simple.c                           |  432 +
 net/mac80211/sta_info.c                                 |  463 +
 net/mac80211/sta_info.h                                 |  167 
 net/mac80211/tkip.c                                     |  341 +
 net/mac80211/tkip.h                                     |   36 
 net/mac80211/wep.c                                      |  328 +
 net/mac80211/wep.h                                      |   40 
 net/mac80211/wme.c                                      |  685 ++
 net/mac80211/wme.h                                      |   38 
 net/mac80211/wpa.c                                      |  846 ++
 net/mac80211/wpa.h                                      |   31 
 net/wireless/Kconfig                                    |   46 
 net/wireless/Makefile                                   |   17 
 net/wireless/core.c                                     |  359 +
 net/wireless/core.h                                     |   80 
 net/wireless/nl80211.c                                  |  982 +++
 net/wireless/nl80211.h                                  |   24 
 net/wireless/sysfs.c                                    |  125 
 net/wireless/sysfs.h                                    |    9 
 net/wireless/wext-common.c                              |  663 ++
 net/wireless/wext-compat.c                              |  789 ++
 net/wireless/wext-export.c                              |   29 
 net/wireless/wext-mod.c                                 |   20 
 net/wireless/wext-old.c                                 |  829 ++
 net/wireless/wext.h                                     |   51 
 197 files changed, 85623 insertions(+), 168 deletions(-)

--- NEW FILE jwltest-git-wireless-dev.patch ---
--- /dev/null	2007-03-09 11:47:32.684268720 -0500
+++ linux-2.6.20.noarch/include/net/wireless.h	2007-04-11 17:49:30.000000000 -0400
@@ -0,0 +1,159 @@
+#ifndef __NET_WIRELESS_H
+#define __NET_WIRELESS_H
+
+/*
+ * 802.11 device management
+ *
+ * Copyright 2007	Johannes Berg <johannes at sipsolutions.net>
+ */
+
+#include <linux/netdevice.h>
+#include <linux/debugfs.h>
+#include <linux/list.h>
+#include <net/cfg80211.h>
+
+/**
+ * struct wiphy - wireless hardware description
+ * @idx: the wiphy index assigned to this item
+ * @class_dev: the class device representing /sys/class/ieee80211/<wiphy-name>
+ */
+struct wiphy {
+	/* assign these fields before you register the wiphy */
+
+	/* permanent MAC address */
+	u8 perm_addr[ETH_ALEN];
+
+	/* If multiple wiphys are registered and you're handed e.g.
+	 * a regular netdev with assigned ieee80211_ptr, you won't
+	 * know whether it points to a wiphy your driver has registered
+	 * or not. Assign this to something global to your driver to
+	 * help determine whether you own this wiphy or not. */
+	void *privid;
+
+	/* fields below are read-only, assigned by cfg80211 */
+
+	/* the item in /sys/class/ieee80211/ points to this,
+	 * you need use set_wiphy_dev() (see below) */
+	struct device dev;
+
+	/* dir in debugfs: ieee80211/<wiphyname> */
+	struct dentry *debugfsdir;
+
+	char priv[0] __attribute__((__aligned__(NETDEV_ALIGN)));
+};
+
+/** struct wireless_dev - wireless per-netdev state
+ *
+ * This structure must be allocated by the driver/stack
+ * that uses the ieee80211_ptr field in struct net_device
+ * (this is intentional so it can be allocated along with
+ * the netdev.)
+ *
+ * @wiphy: pointer to hardware description
+ */
+struct wireless_dev {
+	struct wiphy *wiphy;
+
+	/* private to the generic wireless code */
+	struct list_head list;
+	struct net_device *netdev;
+};
+
+/**
+ * wiphy_priv - return priv from wiphy
+ */
+static inline void *wiphy_priv(struct wiphy *wiphy)
+{
+	BUG_ON(!wiphy);
+	return &wiphy->priv;
+}
+
+/**
+ * set_wiphy_dev - set device pointer for wiphy
+ */
+static inline void set_wiphy_dev(struct wiphy *wiphy, struct device *dev)
+{
+	wiphy->dev.parent = dev;
+}
+
+/**
+ * wiphy_dev - get wiphy dev pointer
+ */
+static inline struct device *wiphy_dev(struct wiphy *wiphy)
+{
+	return wiphy->dev.parent;
+}
+
+/**
+ * wiphy_name - get wiphy name
+ */
+static inline char *wiphy_name(struct wiphy *wiphy)
+{
+	return wiphy->dev.bus_id;
+}
+
+/**
+ * wdev_priv - return wiphy priv from wireless_dev
+ */
+static inline void *wdev_priv(struct wireless_dev *wdev)
+{
+	BUG_ON(!wdev);
+	return wiphy_priv(wdev->wiphy);
+}
+
+/**
+ * wiphy_new - create a new wiphy for use with cfg80211
+ *
+ * create a new wiphy and associate the given operations with it.
+ * @sizeof_priv bytes are allocated for private use.
+ *
+ * the returned pointer must be assigned to each netdev's
+ * ieee80211_ptr for proper operation.
+ */
+struct wiphy *wiphy_new(struct cfg80211_ops *ops, int sizeof_priv);
+
+/**
+ * wiphy_register - register a wiphy with cfg80211
+ *
+ * register the given wiphy
+ *
+ * Returns a non-negative wiphy index or a negative error code.
+ */
+extern int wiphy_register(struct wiphy *wiphy);
+
+/**
+ * wiphy_unregister - deregister a wiphy from cfg80211
+ *
+ * unregister a device with the given priv pointer.
+ * After this call, no more requests can be made with this priv
+ * pointer, but the call may sleep to wait for an outstanding
+ * request that is being handled.
+ */
+extern void wiphy_unregister(struct wiphy *wiphy);
+
+/**
+ * wiphy_free - free wiphy
+ */
+extern void wiphy_free(struct wiphy *wiphy);
+
+
+/*
+ * internal definitions for wireless
+ */
+
+#if defined(CONFIG_CFG80211_WEXT_COMPAT) || defined(CONFIG_WIRELESS_EXT)
+int wext_ioctl(unsigned int cmd, struct ifreq *ifreq, void __user *arg);
+int wireless_proc_init(void);
+#else
+static inline
+int wext_ioctl(unsigned int cmd, struct ifreq *ifreq, void __user *arg)
+{
+	return -EINVAL;
+}
+static inline int wireless_proc_init(void)
+{
+	return 0;
+}
+#endif
+
+#endif /* __NET_WIRELESS_H */
--- /dev/null	2007-03-09 11:47:32.684268720 -0500
+++ linux-2.6.20.noarch/include/net/mac80211.h	2007-04-11 17:49:30.000000000 -0400
@@ -0,0 +1,1106 @@
+/*
+ * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface
+ * Copyright 2002-2005, Devicescape Software, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef MAC80211_H
+#define MAC80211_H
+
+#include <linux/kernel.h>
+#include <linux/if_ether.h>
+#include <linux/skbuff.h>
+#include <linux/wireless.h>
+#include <linux/device.h>
+#include <linux/ieee80211.h>
+#include <net/wireless.h>
+#include <net/cfg80211.h>
+
+/* Note! Only ieee80211_tx_status_irqsafe() and ieee80211_rx_irqsafe() can be
+ * called in hardware interrupt context. The low-level driver must not call any
+ * other functions in hardware interrupt context. If there is a need for such
+ * call, the low-level driver should first ACK the interrupt and perform the
+ * IEEE 802.11 code call after this, e.g., from a scheduled tasklet (in
+ * software interrupt context).
+ */
+
+/*
+ * Frame format used when passing frame between low-level hardware drivers
+ * and IEEE 802.11 driver the same as used in the wireless media, i.e.,
+ * buffers start with IEEE 802.11 header and include the same octets that
+ * are sent over air.
[...86491 lines suppressed...]
+		iwe.cmd = SIOCGIWRATE;
+		/* Those two flags are ignored... */
+		iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;
+
+		for (i = 0; i < bss->supp_rates_len; i++) {
+			iwe.u.bitrate.value = ((bss->supp_rates[i] &
+							0x7f) * 500000);
+			p = iwe_stream_add_value(current_ev, p,
+					end_buf, &iwe, IW_EV_PARAM_LEN);
+		}
+		/* Check if we added any rate */
+		if((p - current_ev) > IW_EV_LCP_LEN)
+			current_ev = p;
+
+		kfree(buf);
+		break;
+	} while (0);
+
+	return current_ev;
+}
+
+
+int ieee80211_sta_scan_results(struct net_device *dev, char *buf, size_t len)
+{
+	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+	char *current_ev = buf;
+	char *end_buf = buf + len;
+	struct ieee80211_sta_bss *bss;
+
+	spin_lock_bh(&local->sta_bss_lock);
+	list_for_each_entry(bss, &local->sta_bss_list, list) {
+		if (buf + len - current_ev <= IW_EV_ADDR_LEN) {
+			spin_unlock_bh(&local->sta_bss_lock);
+			return -E2BIG;
+		}
+		current_ev = ieee80211_sta_scan_result(dev, bss, current_ev,
+						       end_buf);
+	}
+	spin_unlock_bh(&local->sta_bss_lock);
+	return current_ev - buf;
+}
+
+
+int ieee80211_sta_set_extra_ie(struct net_device *dev, char *ie, size_t len)
+{
+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+	struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+	kfree(ifsta->extra_ie);
+	if (len == 0) {
+		ifsta->extra_ie = NULL;
+		ifsta->extra_ie_len = 0;
+		return 0;
+	}
+	ifsta->extra_ie = kmalloc(len, GFP_KERNEL);
+	if (!ifsta->extra_ie) {
+		ifsta->extra_ie_len = 0;
+		return -ENOMEM;
+	}
+	memcpy(ifsta->extra_ie, ie, len);
+	ifsta->extra_ie_len = len;
+	return 0;
+}
+
+
+struct sta_info * ieee80211_ibss_add_sta(struct net_device *dev,
+					 struct sk_buff *skb, u8 *bssid,
+					 u8 *addr)
+{
+	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+	struct sta_info *sta;
+	struct ieee80211_sub_if_data *sdata = NULL;
+	struct net_device *sta_dev = NULL;
+
+	/* TODO: Could consider removing the least recently used entry and
+	 * allow new one to be added. */
+	if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) {
+		if (net_ratelimit()) {
+			printk(KERN_DEBUG "%s: No room for a new IBSS STA "
+			       "entry " MAC_FMT "\n", dev->name, MAC_ARG(addr));
+		}
+		return NULL;
+	}
+
+	spin_lock_bh(&local->sub_if_lock);
+	list_for_each_entry(sdata, &local->sub_if_list, list)
+		if (sdata->type == IEEE80211_IF_TYPE_IBSS &&
+		    memcmp(bssid, sdata->u.sta.bssid, ETH_ALEN) == 0) {
+			sta_dev = sdata->dev;
+			break;
+		}
+	spin_unlock_bh(&local->sub_if_lock);
+
+	if (!sta_dev)
+		return NULL;
+
+	printk(KERN_DEBUG "%s: Adding new IBSS station " MAC_FMT " (dev=%s)\n",
+	       dev->name, MAC_ARG(addr), sta_dev->name);
+
+	sta = sta_info_add(local, dev, addr, GFP_ATOMIC);
+	if (!sta)
+		return NULL;
+
+	sta->dev = sta_dev;
+	sta->supp_rates = sdata->u.sta.supp_rates_bits;
+
+	rate_control_rate_init(sta, local);
+
+	return sta; /* caller will call sta_info_put() */
+}
+
+
+int ieee80211_sta_deauthenticate(struct net_device *dev, u16 reason)
+{
+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+	struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+
+	printk(KERN_DEBUG "%s: deauthenticate(reason=%d)\n",
+	       dev->name, reason);
+
+	if (sdata->type != IEEE80211_IF_TYPE_STA &&
+	    sdata->type != IEEE80211_IF_TYPE_IBSS)
+		return -EINVAL;
+
+	ieee80211_send_deauth(dev, ifsta, reason);
+	ieee80211_set_disassoc(dev, ifsta, 1);
+	return 0;
+}
+
+
+int ieee80211_sta_disassociate(struct net_device *dev, u16 reason)
+{
+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+	struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+
+	printk(KERN_DEBUG "%s: disassociate(reason=%d)\n",
+	       dev->name, reason);
+
+	if (sdata->type != IEEE80211_IF_TYPE_STA)
+		return -EINVAL;
+
+	if (!ifsta->associated)
+		return -1;
+
+	ieee80211_send_disassoc(dev, ifsta, reason);
+	ieee80211_set_disassoc(dev, ifsta, 0);
+	return 0;
+}
--- /dev/null	2007-03-09 11:47:32.684268720 -0500
+++ linux-2.6.20.noarch/net/mac80211/ieee80211_cfg.h	2007-04-11 17:49:30.000000000 -0400
@@ -0,0 +1,9 @@
+/*
+ * mac80211 configuration hooks for cfg80211
+ */
+#ifndef __IEEE80211_CFG_H
+#define __IEEE80211_CFG_H
+
+extern struct cfg80211_ops mac80211_config_ops;
+
+#endif /* __IEEE80211_CFG_H */
--- /dev/null	2007-03-09 11:47:32.684268720 -0500
+++ linux-2.6.20.noarch/net/mac80211/debugfs.h	2007-04-11 17:49:30.000000000 -0400
@@ -0,0 +1,16 @@
+#ifndef __MAC80211_DEBUGFS_H
+#define __MAC80211_DEBUGFS_H
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+extern void debugfs_hw_add(struct ieee80211_local *local);
+extern void debugfs_hw_del(struct ieee80211_local *local);
+extern int mac80211_open_file_generic(struct inode *inode, struct file *file);
+#else
+static inline void debugfs_hw_add(struct ieee80211_local *local)
+{
+	return;
+}
+static inline void debugfs_hw_del(struct ieee80211_local *local) {}
+#endif
+
+#endif /* __MAC80211_DEBUGFS_H */
--- linux-2.6.20.noarch/net/ieee80211/Kconfig.orig	2007-04-11 17:48:35.000000000 -0400
+++ linux-2.6.20.noarch/net/ieee80211/Kconfig	2007-04-11 17:49:30.000000000 -0400
@@ -56,7 +56,8 @@ config IEEE80211_CRYPT_CCMP
 
 config IEEE80211_CRYPT_TKIP
 	tristate "IEEE 802.11i TKIP encryption"
-	depends on IEEE80211 && NET_RADIO
+	depends on IEEE80211
+	select WIRELESS_EXT
 	select CRYPTO
 	select CRYPTO_MICHAEL_MIC
 	select CRYPTO_ECB
--- linux-2.6.20.noarch/.mailmap.orig	2007-04-11 17:48:35.000000000 -0400
+++ linux-2.6.20.noarch/.mailmap	2007-04-11 17:49:29.000000000 -0400
@@ -57,6 +57,7 @@ Jean Tourrilhes <jt at hpl.hp.com>
 Jeff Garzik <jgarzik at pretzel.yyz.us>
 Jens Axboe <axboe at suse.de>
 Jens Osterkamp <Jens.Osterkamp at de.ibm.com>
+Johannes Berg <johannes at sipsolutions.net>
 John Stultz <johnstul at us.ibm.com>
 Juha Yrjola <at solidboot.com>
 Juha Yrjola <juha.yrjola at nokia.com>


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3056
retrieving revision 1.3056.2.1
diff -u -r1.3056 -r1.3056.2.1
--- kernel-2.6.spec	10 Apr 2007 18:09:20 -0000	1.3056
+++ kernel-2.6.spec	11 Apr 2007 22:03:47 -0000	1.3056.2.1
@@ -60,7 +60,7 @@
 %define sublevel 20
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}%{?buildid}
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}%{?buildid}.jwltest.8
 
 %define make_target bzImage
 %define kernel_image x86
@@ -377,10 +377,13 @@
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
 Patch11: nouveau-drm.patch
-Patch12: git-wireless-dev.patch
+#Patch12: git-wireless-dev.patch
+Patch12: jwltest-git-wireless-dev.patch
 Patch13: git-wireless-dev-fixes.patch
-Patch14: git-iwlwifi.patch
-Patch15: git-iwlwifi-fixes.patch
+#Patch14: git-iwlwifi.patch
+Patch14: jwltest-git-iwlwifi.patch
+#Patch15: git-iwlwifi-fixes.patch
+Patch15: jwltest-git-iwlwifi-fixes.patch
 Patch16: linux-2.6-rt2x00-scan-fix.patch
 
 Patch17: linux-2.6-fix-pmops-1.patch
@@ -391,6 +394,8 @@
 # enable sysrq-c on all kernels, not only kexec
 Patch21: linux-2.6-sysrq-c.patch
 
+Patch30: jwltest-bcm43xx_mac80211-phy-rev-1.patch
+
 # Patches 100 through 500 are meant for architecture patches
 
 # 200 - 299   x86(-64)
@@ -976,13 +981,13 @@
 # Add the new wireless stack and drivers from wireless-dev
 %patch12 -p1
 # ...plus some fixes not yet in the wireless-dev tree
-%patch13 -p1
+#%patch13 -p1
 # ...and the iwlwifi driver from Intel
 %patch14 -p1
 # ...plus some fixes not yet in Intel's tree
 %patch15 -p1
 # fix up scanning in rt2x00
-%patch16 -p1
+#%patch16 -p1
 # Power management fixes
 %patch17 -p1
 %patch18 -p1
@@ -992,6 +997,9 @@
 # sysrq works always
 %patch21 -p1
 
+# revert some spec-related changes to fix bcm43xx w/ phy rev 1 for PPC
+%patch30 -p1
+
 # Architecture patches
 
 #

linux-2.6-warnings-inline.patch:
 b/arch/i386/oprofile/op_model_p4.c                               |    2 -
 b/arch/powerpc/kernel/prom_init.c                                |    4 +-
 b/drivers/acpi/tables/tbfadt.c                                   |    4 +-
 b/drivers/isdn/hardware/eicon/divasmain.c                        |   12 +++----
 b/drivers/isdn/hardware/eicon/platform.h                         |    4 +-
 b/drivers/media/common/ir-functions.c                            |    2 -
 b/drivers/media/video/cx88/cx88-core.c                           |   12 +++----
 b/drivers/media/video/cx88/cx88.h                                |    4 +-
 b/drivers/net/sky2.c                                             |    2 -
 b/drivers/net/wireless/ipw2200.c                                 |    2 -
 b/drivers/scsi/tmscsim.c                                         |   16 +++++-----
 b/drivers/usb/serial/safe_serial.c                               |    2 -
 b/drivers/video/intelfb/intelfbdrv.c                             |    2 -
 b/fs/ocfs2/namei.c                                               |    2 -
 b/include/asm-powerpc/spinlock.h                                 |   10 +++---
 b/include/linux/cpuset.h                                         |    4 +-
 b/kernel/mutex.c                                                 |    2 -
 b/sound/drivers/opl4/opl4_lib.c                                  |    2 -
 b/sound/pci/au88x0/au88x0.h                                      |    4 +-
 b/sound/pci/au88x0/au88x0_core.c                                 |    4 +-
 linux-2.6.20.noarch/arch/ia64/kernel/mca.c                       |    2 -
 linux-2.6.20.noarch/arch/ia64/sn/pci/pcibr/pcibr_ate.c           |    2 -
 linux-2.6.20.noarch/arch/ia64/sn/pci/tioce_provider.c            |    4 +-
 linux-2.6.20.noarch/arch/s390/kernel/traps.c                     |    4 +-
 linux-2.6.20.noarch/drivers/char/mmtimer.c                       |   16 +++++-----
 linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c |   10 +++---
 linux-2.6.20.noarch/drivers/s390/net/ctcmain.c                   |    2 -
 linux-2.6.20.noarch/drivers/serial/ioc3_serial.c                 |    4 +-
 linux-2.6.20.noarch/drivers/serial/ioc4_serial.c                 |    4 +-
 linux-2.6.20.noarch/include/asm-powerpc/spinlock.h               |    8 ++---
 linux-2.6.20.noarch/net/mac80211/ieee80211.c                     |    6 +--
 31 files changed, 79 insertions(+), 79 deletions(-)

Index: linux-2.6-warnings-inline.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-warnings-inline.patch,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -r1.3 -r1.3.6.1
--- linux-2.6-warnings-inline.patch	4 Apr 2007 23:45:39 -0000	1.3
+++ linux-2.6-warnings-inline.patch	11 Apr 2007 22:03:48 -0000	1.3.6.1
@@ -549,11 +549,11 @@
  
  /* Device in tx->dev has a reference added; use dev_put(tx->dev) when
   * finished with it. */
--static void inline ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
+-static int inline ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
 +static inline int ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
- 					struct sk_buff *skb,
- 					struct net_device *mdev,
- 					struct ieee80211_tx_control *control)
+ 				       struct sk_buff *skb,
+ 				       struct net_device *mdev,
+ 				       struct ieee80211_tx_control *control)
 --- linux-2.6.20.noarch/arch/ia64/kernel/mca.c~	2007-04-04 19:33:39.000000000 -0400
 +++ linux-2.6.20.noarch/arch/ia64/kernel/mca.c	2007-04-04 19:33:43.000000000 -0400
 @@ -303,7 +303,7 @@ static void ia64_mlogbuf_dump_from_init(



From fedora-cvs-commits at redhat.com  Wed Apr 11 22:39:44 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 18:39:44 -0400
Subject: rpms/evolution/devel evolution-2.8.1-kill-ethread.patch, 1.2,
	1.2.2.1
Message-ID: <200704112239.l3BMdiJn020434@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
      Tag: private-evo-sanity-2_10_0-branch
	evolution-2.8.1-kill-ethread.patch 
Log Message:
remove em_sync_stream bits


evolution-2.8.1-kill-ethread.patch:
 calendar/gui/alarm-notify/alarm-notify.c            |   85 ----
 calendar/gui/alarm-notify/alarm-notify.h            |   13 
 calendar/gui/alarm-notify/alarm-queue.c             |  320 ++++++++---------
 mail/em-composer-utils.c                            |   10 
 mail/em-folder-browser.c                            |    2 
 mail/em-folder-properties.c                         |    2 
 mail/em-folder-tree.c                               |    4 
 mail/em-folder-utils.c                              |    4 
 mail/em-folder-view.c                               |    9 
 mail/em-format-html-print.c                         |    2 
 mail/em-format-html.c                               |    2 
 mail/em-subscribe-editor.c                          |    6 
 mail/importers/elm-importer.c                       |    2 
 mail/importers/mail-importer.c                      |    2 
 mail/importers/pine-importer.c                      |    2 
 mail/mail-component.c                               |    2 
 mail/mail-folder-cache.c                            |    4 
 mail/mail-mt.c                                      |  372 ++++++++------------
 mail/mail-mt.h                                      |   35 -
 mail/mail-ops.c                                     |   50 +-
 mail/mail-ops.h                                     |    9 
 mail/mail-send-recv.c                               |    2 
 mail/mail-session.c                                 |   86 +---
 mail/mail-vfolder.c                                 |   10 
 mail/message-list.c                                 |    4 
 plugins/exchange-operations/exchange-folder.c       |    2 
 plugins/folder-unsubscribe/folder-unsubscribe.c     |    2 
 plugins/groupwise-features/share-folder-common.c    |    2 
 plugins/mailing-list-actions/mailing-list-actions.c |    2 
 plugins/mark-all-read/mark-all-read.c               |    2 
 plugins/save-attachments/save-attachments.c         |    2 
 31 files changed, 434 insertions(+), 617 deletions(-)

Index: evolution-2.8.1-kill-ethread.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.8.1-kill-ethread.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- evolution-2.8.1-kill-ethread.patch	15 Feb 2007 23:35:32 -0000	1.2
+++ evolution-2.8.1-kill-ethread.patch	11 Apr 2007 22:39:42 -0000	1.2.2.1
@@ -1,5 +1,5 @@
---- evolution-2.9.91/mail/mail-send-recv.c.kill-ethread	2007-01-03 10:27:18.000000000 -0500
-+++ evolution-2.9.91/mail/mail-send-recv.c	2007-02-15 16:04:42.000000000 -0500
+--- evolution-2.10.1/mail/mail-send-recv.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/mail-send-recv.c	2007-04-10 22:37:49.000000000 -0400
 @@ -819,7 +819,7 @@
  		m->folders = folders;
  		m->info = sinfo;
@@ -9,8 +9,8 @@
  	} else {
  		receive_done ("", data);
  	}
---- evolution-2.9.91/mail/mail-component.c.kill-ethread	2007-01-03 10:27:18.000000000 -0500
-+++ evolution-2.9.91/mail/mail-component.c	2007-02-15 16:04:42.000000000 -0500
+--- evolution-2.10.1/mail/mail-component.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/mail-component.c	2007-04-10 22:37:49.000000000 -0400
 @@ -965,7 +965,7 @@
  		if (camel_url_get_param(url, "uid") != NULL) {
  			char *curi = em_uri_to_camel(uri);
@@ -20,8 +20,8 @@
  			g_free(curi);
  		} else {
  			g_warning("email uri's must include a uid parameter");
---- evolution-2.9.91/mail/mail-ops.c.kill-ethread	2007-01-03 10:27:18.000000000 -0500
-+++ evolution-2.9.91/mail/mail-ops.c	2007-02-15 16:04:42.000000000 -0500
+--- evolution-2.10.1/mail/mail-ops.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/mail-ops.c	2007-04-10 22:37:49.000000000 -0400
 @@ -221,7 +221,7 @@
  		camel_filter_driver_remove_rule_by_name (m->driver, "new-mail-notification");
  	}
@@ -247,8 +247,8 @@
  
  	return id;
  }
---- evolution-2.9.91/mail/em-folder-utils.c.kill-ethread	2007-01-03 10:27:18.000000000 -0500
-+++ evolution-2.9.91/mail/em-folder-utils.c	2007-02-15 16:04:42.000000000 -0500
+--- evolution-2.10.1/mail/em-folder-utils.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-folder-utils.c	2007-04-10 22:37:49.000000000 -0400
 @@ -260,7 +260,7 @@
  	m->delete = delete;
  	seq = m->msg.seq;
@@ -267,8 +267,8 @@
  	
  	return id;
  }
---- evolution-2.9.91/mail/importers/elm-importer.c.kill-ethread	2007-01-03 10:27:16.000000000 -0500
-+++ evolution-2.9.91/mail/importers/elm-importer.c	2007-02-15 16:04:42.000000000 -0500
+--- evolution-2.10.1/mail/importers/elm-importer.c.kill-ethread	2007-04-09 09:09:26.000000000 -0400
++++ evolution-2.10.1/mail/importers/elm-importer.c	2007-04-10 22:37:49.000000000 -0400
 @@ -312,7 +312,7 @@
  
  	id = m->msg.seq;
@@ -278,8 +278,8 @@
  
  	return id;
  }
---- evolution-2.9.91/mail/importers/mail-importer.c.kill-ethread	2007-01-03 10:27:16.000000000 -0500
-+++ evolution-2.9.91/mail/importers/mail-importer.c	2007-02-15 16:04:42.000000000 -0500
+--- evolution-2.10.1/mail/importers/mail-importer.c.kill-ethread	2007-04-09 09:09:26.000000000 -0400
++++ evolution-2.10.1/mail/importers/mail-importer.c	2007-04-10 22:37:49.000000000 -0400
 @@ -329,7 +329,7 @@
  	}
  
@@ -289,8 +289,8 @@
  
  	return id;
  }
---- evolution-2.9.91/mail/importers/pine-importer.c.kill-ethread	2007-01-03 10:27:16.000000000 -0500
-+++ evolution-2.9.91/mail/importers/pine-importer.c	2007-02-15 16:04:42.000000000 -0500
+--- evolution-2.10.1/mail/importers/pine-importer.c.kill-ethread	2007-04-09 09:09:26.000000000 -0400
++++ evolution-2.10.1/mail/importers/pine-importer.c	2007-04-10 22:37:49.000000000 -0400
 @@ -350,7 +350,7 @@
  
  	id = m->msg.seq;
@@ -300,8 +300,8 @@
  
  	return id;
  }
---- evolution-2.9.91/mail/mail-vfolder.c.kill-ethread	2007-01-03 10:27:18.000000000 -0500
-+++ evolution-2.9.91/mail/mail-vfolder.c	2007-02-15 16:04:42.000000000 -0500
+--- evolution-2.10.1/mail/mail-vfolder.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/mail-vfolder.c	2007-04-10 22:37:49.000000000 -0400
 @@ -188,7 +188,7 @@
  	m->sources_folder = sources_folder;
  	
@@ -347,9 +347,9 @@
  
  	from = em_uri_from_camel(cfrom);
  	to = em_uri_from_camel(cto);
---- evolution-2.9.91/mail/em-format-html.c.kill-ethread	2007-01-03 10:27:18.000000000 -0500
-+++ evolution-2.9.91/mail/em-format-html.c	2007-02-15 16:04:42.000000000 -0500
-@@ -1374,7 +1374,7 @@
+--- evolution-2.10.1/mail/em-format-html.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-format-html.c	2007-04-10 22:37:49.000000000 -0400
+@@ -1375,7 +1375,7 @@
  		}
  		
  		efh->priv->format_id = m->msg.seq;
@@ -358,9 +358,9 @@
  	}
  
  	efh->priv->format_timeout_id = 0;
---- evolution-2.9.91/mail/em-folder-properties.c.kill-ethread	2007-01-03 10:27:18.000000000 -0500
-+++ evolution-2.9.91/mail/em-folder-properties.c	2007-02-15 16:04:42.000000000 -0500
-@@ -379,7 +379,7 @@
+--- evolution-2.10.1/mail/em-folder-properties.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-folder-properties.c	2007-04-10 22:37:49.000000000 -0400
+@@ -386,7 +386,7 @@
  	}
  
  	if (folder == NULL)
@@ -369,9 +369,9 @@
  	else
  		emfp_dialog_got_folder((char *)uri, folder, NULL);
  }
---- evolution-2.9.91/mail/em-folder-tree.c.kill-ethread	2007-01-03 10:27:18.000000000 -0500
-+++ evolution-2.9.91/mail/em-folder-tree.c	2007-02-15 16:04:42.000000000 -0500
-@@ -966,7 +966,7 @@
+--- evolution-2.10.1/mail/em-folder-tree.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-folder-tree.c	2007-04-10 22:37:49.000000000 -0400
+@@ -969,7 +969,7 @@
  tree_drag_data_action(struct _DragDataReceivedAsync *m)
  {
  	m->move = m->action == GDK_ACTION_MOVE;
@@ -380,7 +380,7 @@
  }
  
  static void
-@@ -1891,7 +1891,7 @@
+@@ -1915,7 +1915,7 @@
  	m->top = full_name;
  	m->flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST;
  	
@@ -389,8 +389,8 @@
  }
  
  static gboolean
---- evolution-2.9.91/mail/em-folder-browser.c.kill-ethread	2007-02-12 05:37:31.000000000 -0500
-+++ evolution-2.9.91/mail/em-folder-browser.c	2007-02-15 16:04:42.000000000 -0500
+--- evolution-2.10.1/mail/em-folder-browser.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-folder-browser.c	2007-04-10 22:37:49.000000000 -0400
 @@ -948,7 +948,7 @@
  	m->sources_folder = sources_folder;
  	
@@ -400,9 +400,9 @@
  
  	return id;
  }
---- evolution-2.9.91/mail/message-list.c.kill-ethread	2007-01-18 07:31:51.000000000 -0500
-+++ evolution-2.9.91/mail/message-list.c	2007-02-15 16:04:42.000000000 -0500
-@@ -1888,7 +1888,7 @@
+--- evolution-2.10.1/mail/message-list.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/message-list.c	2007-04-10 22:37:49.000000000 -0400
+@@ -1889,7 +1889,7 @@
  ml_drop_action(struct _drop_msg *m)
  {
  	m->move = m->action == GDK_ACTION_MOVE;
@@ -411,7 +411,7 @@
  }
  
  static void
-@@ -3922,7 +3922,7 @@
+@@ -3978,7 +3978,7 @@
  
  	m->ml->regen = g_list_prepend(m->ml->regen, m);
  	/* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */
@@ -420,8 +420,8 @@
  
  	m->ml->regen_timeout_msg = NULL;
  	m->ml->regen_timeout_id = 0;
---- evolution-2.9.91/mail/em-format-html-print.c.kill-ethread	2007-02-12 01:58:01.000000000 -0500
-+++ evolution-2.9.91/mail/em-format-html-print.c	2007-02-15 16:04:42.000000000 -0500
+--- evolution-2.10.1/mail/em-format-html-print.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-format-html-print.c	2007-04-10 22:37:49.000000000 -0400
 @@ -262,7 +262,7 @@
  		g_object_ref(source);
  	g_object_ref(efhp);
@@ -431,37 +431,8 @@
  
  	return 0;		/* damn async ... */
  }
---- evolution-2.9.91/mail/em-sync-stream.c.kill-ethread	2007-02-09 15:16:33.000000000 -0500
-+++ evolution-2.9.91/mail/em-sync-stream.c	2007-02-15 16:04:42.000000000 -0500
-@@ -268,7 +268,7 @@
- 	if (emss->cancel)
- 		return -1;
- 
--	if (pthread_equal(pthread_self(), mail_gui_thread)) {
-+	if (mail_in_main_thread ()) {
- 		EMSS_CLASS(emss)->sync_write(stream, buffer, n);
- #ifdef LOG_STREAM
- 		if (p->logfd)
-@@ -298,7 +298,7 @@
- 	if (emss->cancel)
- 		return -1;
- 
--	if (pthread_equal(pthread_self(), mail_gui_thread))
-+	if (mail_in_main_thread ())
- 		return ((EMSyncStreamClass *)(((CamelObject *)emss)->klass))->sync_flush(stream);
- 	else
- 		sync_op(emss, EMSS_FLUSH, NULL, 0);
-@@ -316,7 +316,7 @@
- 
- 	d(printf("%p: closing stream\n", stream));
- 
--	if (pthread_equal(pthread_self(), mail_gui_thread)) {
-+	if (mail_in_main_thread ()) {
- #ifdef LOG_STREAM
- 		if (emss->priv->logfd) {
- 			fclose(emss->priv->logfd);
---- evolution-2.9.91/mail/em-subscribe-editor.c.kill-ethread	2007-01-08 11:35:48.000000000 -0500
-+++ evolution-2.9.91/mail/em-subscribe-editor.c	2007-02-15 16:04:42.000000000 -0500
+--- evolution-2.10.1/mail/em-subscribe-editor.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-subscribe-editor.c	2007-04-10 22:37:49.000000000 -0400
 @@ -229,7 +229,7 @@
  	next = (struct _zsubscribe_msg *)e_dlist_remhead(&m->sub->subscribe);
  	if (next) {
@@ -489,25 +460,38 @@
  	return id;
  }
  
---- evolution-2.9.91/mail/mail-mt.h.kill-ethread	2007-01-03 10:27:18.000000000 -0500
-+++ evolution-2.9.91/mail/mail-mt.h	2007-02-15 16:04:42.000000000 -0500
-@@ -33,6 +33,7 @@
- 	EMsg msg;		/* parent type */
+--- evolution-2.10.1/mail/mail-mt.h.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/mail-mt.h	2007-04-10 22:37:49.000000000 -0400
+@@ -25,14 +25,15 @@
+ 
+ #include <pthread.h>
+ #include "camel/camel-exception.h"
+-#include "libedataserver/e-msgport.h"
++#include "libedataserver/e-flag.h"
+ #include "camel/camel-object.h"
+ #include "camel/camel-operation.h"
+ 
+ typedef struct _mail_msg {
+-	EMsg msg;		/* parent type */
++	EFlag *processed;	/* optional */
  	struct _mail_msg_op *ops; /* operation functions */
  	unsigned int seq;	/* seq number for synchronisation */
 +	gint priority;		/* priority (default = 0) */
  	CamelOperation *cancel;	/* a cancellation/status handle */
  	CamelException ex;	/* an initialised camel exception, upto the caller to use this */
  	struct _mail_msg_priv *priv; /* private for internal use */
-@@ -51,6 +52,8 @@
+@@ -51,8 +52,10 @@
  void mail_msg_init(void);
  void mail_msg_cleanup (void);
  
 +gboolean mail_in_main_thread (void);
 +
  /* allocate a new message */
- void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size);
+-void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size);
++void *mail_msg_new(mail_msg_op_t *ops, EFlag *processed, size_t size);
  void mail_msg_free(void *msg);
+ void mail_msg_check_error(void *msg);
+ void mail_msg_cancel(unsigned int msgid);
 @@ -60,6 +63,14 @@
  void mail_msg_wait_all(void);
  int mail_msg_active(unsigned int msgid);
@@ -548,9 +532,9 @@
  /* A generic proxy event for anything that can be proxied during the life of the mailer (almost nothing) */
  /* Note that almost all objects care about the lifecycle of their events, so this cannot be used */
  extern MailAsyncEvent *mail_async_event;
---- evolution-2.9.91/mail/mail-ops.h.kill-ethread	2007-01-03 10:27:18.000000000 -0500
-+++ evolution-2.9.91/mail/mail-ops.h	2007-02-15 16:04:42.000000000 -0500
-@@ -30,6 +30,8 @@
+--- evolution-2.10.1/mail/mail-ops.h.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/mail-ops.h	2007-04-10 22:37:49.000000000 -0400
+@@ -30,13 +30,14 @@
  #pragma }
  #endif /* __cplusplus */
  
@@ -559,7 +543,14 @@
  #include "camel/camel-store.h"
  #include "camel/camel-folder.h"
  #include "camel/camel-filter-driver.h"
-@@ -55,12 +57,12 @@
+ #include "camel/camel-mime-message.h"
+ #include "camel/camel-operation.h"
+ 
+-#include "libedataserver/e-msgport.h"
+ #include "libedataserver/e-account.h"
+ 
+ void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info,
+@@ -55,12 +56,12 @@
  void mail_get_message (CamelFolder *folder, const char *uid,
  		       void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data),
  		       void *data,
@@ -574,7 +565,7 @@
  
  /* get several messages */
  void mail_get_messages (CamelFolder *folder, GPtrArray *uids,
-@@ -70,7 +72,7 @@
+@@ -70,7 +71,7 @@
  /* same for a folder */
  int mail_get_folder (const char *uri, guint32 flags,
  		     void (*done) (char *uri, CamelFolder *folder, void *data), void *data,
@@ -583,8 +574,8 @@
  
  /* and for a store */
  int mail_get_store (const char *uri, CamelOperation *op,
---- evolution-2.9.91/mail/em-composer-utils.c.kill-ethread	2007-01-03 10:27:18.000000000 -0500
-+++ evolution-2.9.91/mail/em-composer-utils.c	2007-02-15 16:04:42.000000000 -0500
+--- evolution-2.10.1/mail/em-composer-utils.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-composer-utils.c	2007-04-10 22:37:49.000000000 -0400
 @@ -534,7 +534,7 @@
  	    strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) {
  		int id;
@@ -628,8 +619,8 @@
 -	mail_get_message (folder, uid, post_reply_to_message, NULL, mail_thread_new);
 +	mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push);
  }
---- evolution-2.9.91/mail/mail-folder-cache.c.kill-ethread	2007-01-03 10:27:18.000000000 -0500
-+++ evolution-2.9.91/mail/mail-folder-cache.c	2007-02-15 16:04:42.000000000 -0500
+--- evolution-2.10.1/mail/mail-folder-cache.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/mail-folder-cache.c	2007-04-10 22:37:49.000000000 -0400
 @@ -907,7 +907,7 @@
  	m->store = store;
  	camel_object_ref (store);
@@ -648,9 +639,17 @@
  
  	LOCK(info_lock);
  
---- evolution-2.9.91/mail/em-folder-view.c.kill-ethread	2007-02-12 01:58:01.000000000 -0500
-+++ evolution-2.9.91/mail/em-folder-view.c	2007-02-15 16:04:42.000000000 -0500
-@@ -693,7 +693,7 @@
+--- evolution-2.10.1/mail/em-folder-view.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-folder-view.c	2007-04-10 22:37:49.000000000 -0400
+@@ -68,6 +68,7 @@
+ #include <gtkhtml/gtkhtml-stream.h>
+ 
+ #include <libedataserver/e-data-server-util.h>
++#include <libedataserver/e-msgport.h>
+ 
+ #include "menus/gal-view-etable.h"
+ #include "menus/gal-view-factory-etable.h"
+@@ -693,7 +694,7 @@
  static void
  emfv_set_folder_uri(EMFolderView *emfv, const char *uri)
  {
@@ -659,7 +658,7 @@
  }
  
  static void
-@@ -1611,7 +1611,7 @@
+@@ -1613,7 +1614,7 @@
  	data->type = type;
  	data->source = source;
  	
@@ -668,7 +667,7 @@
  }
  
  static void
-@@ -1709,7 +1709,7 @@
+@@ -1711,7 +1712,7 @@
  	data->type = type;
  	data->uri = g_strdup (uri);
  	
@@ -677,7 +676,7 @@
  }
  
  static void
-@@ -2369,7 +2369,7 @@
+@@ -2370,7 +2371,7 @@
  			g_object_ref (emfv);
  			/* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */
  			e_profile_event_emit("goto.load", emfv->displayed_uid, 0);
@@ -686,18 +685,145 @@
  		} else {
  			e_profile_event_emit("goto.empty", "", 0);
  			g_free(emfv->priv->selected_uid);
---- evolution-2.9.91/mail/mail-session.c.kill-ethread	2007-02-15 16:04:42.000000000 -0500
-+++ evolution-2.9.91/mail/mail-session.c	2007-02-15 16:04:42.000000000 -0500
-@@ -374,7 +374,7 @@
- 	if (cancel)
- 		user_message_reply = e_msgport_new ();	
- 	m = mail_msg_new (&user_message_op, user_message_reply, sizeof (*m));
+--- evolution-2.10.1/mail/mail-session.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/mail-session.c	2007-04-10 22:37:49.000000000 -0400
+@@ -35,7 +35,7 @@
+ #include <libgnome/gnome-sound.h>
+ 
+ #include <libedataserverui/e-passwords.h>
+-#include <libedataserver/e-msgport.h>
++#include <libedataserver/e-flag.h>
+ 
+ #include <camel/camel.h>	/* FIXME: this is where camel_init is defined, it shouldn't include everything else */
+ #include <camel/camel-filter-driver.h>
+@@ -256,7 +256,7 @@
+ 
+ /* ********************************************************************** */
+ 
+-static GtkDialog *message_dialog;
++static gpointer message_dialog;
+ static EDList message_list = E_DLIST_INITIALISER(message_list);
+ 
+ struct _user_message_msg {
+@@ -283,7 +283,7 @@
+ 	/* if !allow_cancel, then we've already replied */
+ 	if (m->allow_cancel) {
+ 		m->result = button == GTK_RESPONSE_OK;
+-		e_msgport_reply((EMsg *)m);
++		e_flag_set (m->msg.processed);
+ 	}
+ 	
+ 	/* check for pendings */
+@@ -292,22 +292,10 @@
+ }
+ 
+ static void
+-user_message_destroy_notify (struct _user_message_msg *m, GObject *deadbeef)
+-{
+-	message_dialog = NULL;
+-}
+-
+-/* This is kinda ugly/inefficient, but oh well, it works */
+-static const char *error_type[] = {
+-	"mail:session-message-info", "mail:session-message-warning", "mail:session-message-error",
+-	"mail:session-message-info-cancel", "mail:session-message-warning-cancel", "mail:session-message-error-cancel"
+-};
+-
+-static void
+ do_user_message (struct _mail_msg *mm)
+ {
+ 	struct _user_message_msg *m = (struct _user_message_msg *)mm;
+-	int type;
++	const gchar *error_type;
+ 	
+ 	if (!m->ismain && message_dialog != NULL) {
+ 		e_dlist_addtail (&message_list, (EDListNode *)m);
+@@ -315,24 +303,27 @@
+ 	}
+ 	
+ 	switch (m->type) {
+-	case CAMEL_SESSION_ALERT_INFO:
+-		type = 0;
+-		break;
+-	case CAMEL_SESSION_ALERT_WARNING:
+-		type = 1;
+-		break;
+-	case CAMEL_SESSION_ALERT_ERROR:
+-		type = 2;
+-		break;
+-	default:
+-		type = 0;
++		case CAMEL_SESSION_ALERT_INFO:
++			error_type = m->allow_cancel ?
++				"mail:session-message-info-cancel" :
++				"mail:session-message-info";
++			break;
++		case CAMEL_SESSION_ALERT_WARNING:
++			error_type = m->allow_cancel ?
++				"mail:session-message-warning-cancel" :
++				"mail:session-message-warning";
++			break;
++		case CAMEL_SESSION_ALERT_ERROR:
++			error_type = m->allow_cancel ?
++				"mail:session-message-error-cancel" :
++				"mail:session-message-error";
++			break;
++		default:
++			g_assert_not_reached ();
+ 	}
+ 
+-	if (m->allow_cancel)
+-		type += 3;
+-	
+-	message_dialog = (GtkDialog *)e_error_new(NULL, error_type[type], m->prompt, NULL);
+-	g_object_set ((GObject *) message_dialog, "allow_shrink", TRUE, "allow_grow", TRUE, NULL);
++	message_dialog = e_error_new(NULL, error_type, m->prompt, NULL);
++	g_object_set (message_dialog, "allow_shrink", TRUE, "allow_grow", TRUE, NULL);
+ 	
+ 	/* We only need to wait for the result if we allow cancel otherwise show but send result back instantly */
+ 	if (m->allow_cancel) {
+@@ -340,12 +331,13 @@
+ 			user_message_response(message_dialog, gtk_dialog_run (message_dialog), m);
+ 		} else {
+ 			g_signal_connect (message_dialog, "response", G_CALLBACK (user_message_response), m);
+-			gtk_widget_show ((GtkWidget *) message_dialog);
++			gtk_widget_show (message_dialog);
+ 		}
+ 	} else {
+ 		g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_widget_destroy), message_dialog);
+-		g_object_weak_ref ((GObject *) message_dialog, (GWeakNotify) user_message_destroy_notify, m);
+-		gtk_widget_show ((GtkWidget *) message_dialog);
++		g_object_add_weak_pointer (message_dialog, &message_dialog);
++		gtk_widget_show (message_dialog);
++		e_flag_free (mm->processed);
+ 		mail_msg_free(m);
+ 	}
+ }
+@@ -364,17 +356,17 @@
+ alert_user(CamelSession *session, CamelSessionAlertType type, const char *prompt, gboolean cancel)
+ {
+ 	MailSession *mail_session = MAIL_SESSION (session);
+-	struct _user_message_msg *m, *r;
+-	EMsgPort *user_message_reply = NULL;
++	struct _user_message_msg *m;
++	EFlag *processed = NULL;
+ 	gboolean ret;
+ 
+ 	if (!mail_session->interactive)
+ 		return FALSE;
+ 
+-	if (cancel)
+-		user_message_reply = e_msgport_new ();	
+-	m = mail_msg_new (&user_message_op, user_message_reply, sizeof (*m));
 -	m->ismain = pthread_equal(pthread_self(), mail_gui_thread);
++	processed = e_flag_new ();
++
++	m = mail_msg_new (&user_message_op, processed, sizeof (*m));
 +	m->ismain = mail_in_main_thread();
  	m->type = type;
  	m->prompt = g_strdup(prompt);
  	m->allow_cancel = cancel;
-@@ -382,9 +382,7 @@
+@@ -382,18 +374,14 @@
  	if (m->ismain)
  		do_user_message((struct _mail_msg *)m);
  	else {
@@ -708,9 +834,37 @@
  	}
  
  	if (cancel) {
---- evolution-2.9.91/mail/mail-mt.c.kill-ethread	2007-01-03 10:27:18.000000000 -0500
-+++ evolution-2.9.91/mail/mail-mt.c	2007-02-15 16:28:12.000000000 -0500
-@@ -82,12 +82,8 @@
+-		r = (struct _user_message_msg *)e_msgport_wait(user_message_reply);
+-		g_assert(m == r);
+-
++		e_flag_wait (processed);
++		e_flag_free (processed);
+ 		ret = m->result;
+ 		mail_msg_free(m);
+-		e_msgport_destroy(user_message_reply);
+ 	} else
+ 		ret = TRUE;
+ 
+@@ -687,7 +675,7 @@
+ 		/* flush/cancel pending user messages */
+ 		while ((um = (struct _user_message_msg *) e_dlist_remhead (&message_list))) {
+ 			d(printf ("Flusing message request: %s\n", um->prompt));
+-			e_msgport_reply((EMsg *) um);
++			e_flag_set (um->msg.processed);
+ 		}
+ 		
+ 		/* and the current */
+--- evolution-2.10.1/mail/mail-mt.c.kill-ethread	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/mail-mt.c	2007-04-10 22:37:49.000000000 -0400
+@@ -29,7 +29,6 @@
+ #include <gtk/gtk.h>
+ #include <libgnome/gnome-i18n.h>
+ 
+-#include <libedataserver/e-msgport.h>
+ #include <libedataserver/e-data-server-util.h>
+ 
+ #include <camel/camel-url.h>
+@@ -82,13 +81,9 @@
  static pthread_mutex_t mail_msg_lock = PTHREAD_MUTEX_INITIALIZER;
  static pthread_cond_t mail_msg_cond = PTHREAD_COND_INITIALIZER;
  
@@ -720,10 +874,12 @@
  
 -static void mail_msg_destroy(EThread *e, EMsg *msg, void *data);
 -
- void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size)
+-void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size)
++void *mail_msg_new(mail_msg_op_t *ops, EFlag *processed, size_t size)
  {
  	struct _mail_msg *msg;
-@@ -112,7 +108,6 @@
+ 
+@@ -112,7 +107,6 @@
  					fprintf(log, "Logging async operations\n");
  
  				if (log_locks) {
@@ -731,7 +887,18 @@
  					fprintf(log, "%" G_GINT64_MODIFIER "x: lock mail_msg_lock\n", e_util_pthread_id(pthread_self()));
  				}
  			} else {
-@@ -308,9 +303,8 @@
+@@ -123,9 +117,9 @@
+ 	}
+ #endif
+ 	msg = g_malloc0(size);
++	msg->processed = processed;  /* owned by caller */
+ 	msg->ops = ops;
+ 	msg->seq = mail_msg_seq++;
+-	msg->msg.reply_port = reply_port;
+ 	msg->cancel = camel_operation_new(mail_operation_status, GINT_TO_POINTER(msg->seq));
+ 	camel_exception_init(&msg->ex);
+ 	msg->priv = g_malloc0(sizeof(*msg->priv));
+@@ -308,9 +302,8 @@
  void mail_msg_wait(unsigned int msgid)
  {
  	struct _mail_msg *m;
@@ -742,7 +909,7 @@
  		MAIL_MT_LOCK(mail_msg_lock);
  		m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid));
  		while (m) {
-@@ -347,9 +341,7 @@
+@@ -347,9 +340,7 @@
  
  void mail_msg_wait_all(void)
  {
@@ -753,7 +920,7 @@
  		MAIL_MT_LOCK(mail_msg_lock);
  		while (g_hash_table_size(mail_msg_active_table) > 0) {
  			MAIL_MT_UNLOCK(mail_msg_lock);
-@@ -420,241 +412,193 @@
+@@ -420,241 +411,193 @@
  	MAIL_MT_UNLOCK(mail_msg_lock);
  }
  
@@ -829,11 +996,11 @@
 +	/* check the main loop queue */
 +	while ((msg = g_async_queue_try_pop (main_loop_queue)) != NULL) {
 +
-+		/* If the message has a reply_port, it must also have a
-+		 * receive_msg() callback.  The receive_msg() callback is
-+		 * responsible for issuing the reply, and the recipient of
-+		 * the reply is responsible for freeing the message. */
-+		if (msg->msg.reply_port != NULL) {
++		/* If the message has a "processed" EFlag, it must also have
++		 * a receive_msg() callback.  The receive_msg() callback is
++		 * responsible for setting the EFlag, and thread blocked on
++		 * the EFlag is reponsible for freeing it. */
++		if (msg->processed != NULL) {
 +			g_assert (msg->ops->receive_msg != NULL);
 +			msg->ops->receive_msg (msg);
 +		} else {
@@ -1131,7 +1298,7 @@
  }
  
  /* ********************************************************************** */
-@@ -723,7 +667,6 @@
+@@ -723,7 +666,6 @@
  {
  	struct _proxy_msg *m;
  	int id;
@@ -1139,7 +1306,7 @@
  
  	/* we dont have a reply port for this, we dont care when/if it gets executed, just queue it */
  	m = mail_msg_new(&async_event_op, NULL, sizeof(*m));
-@@ -743,12 +686,12 @@
+@@ -743,12 +685,12 @@
  	/* We use an idle function instead of our own message port only because the
  	   gui message ports's notification buffer might overflow and deadlock us */
  	if (type == MAIL_ASYNC_GUI) {
@@ -1155,41 +1322,49 @@
  
  	return id;
  }
-@@ -842,6 +785,9 @@
+@@ -842,6 +784,9 @@
  		m->ret = m->func(p1, p2, i1, p3, p4, p5);
  		break;
  	}
 +
-+	if (mm->msg.reply_port != NULL)
-+		e_msgport_reply ((EMsg *) mm);
++	if (mm->processed != NULL)
++		e_flag_set (mm->processed);
  }
  
  static struct _mail_msg_op mail_call_op = {
-@@ -857,11 +803,10 @@
+@@ -856,23 +801,22 @@
+ 	struct _call_msg *m;
  	void *ret;
  	va_list ap;
- 	EMsgPort *reply = NULL;
+-	EMsgPort *reply = NULL;
 -	int ismain = pthread_equal(pthread_self(), mail_gui_thread);
++	EFlag *processed = NULL;
  
  	va_start(ap, func);
  
 -	if (!ismain)
+-		reply = e_msgport_new();
 +	if (!mail_in_main_thread ())
- 		reply = e_msgport_new();
++		processed = e_flag_new ();
  
- 	m = mail_msg_new(&mail_call_op, reply, sizeof(*m));
-@@ -869,8 +814,8 @@
+-	m = mail_msg_new(&mail_call_op, reply, sizeof(*m));
++	m = mail_msg_new(&mail_call_op, processed, sizeof(*m));
+ 	m->type = type;
  	m->func = func;
  	G_VA_COPY(m->ap, ap);
  
 -	if (!ismain) {
 -		e_msgport_put(mail_gui_port, (EMsg *)m);
-+	if (reply != NULL) {
+-		e_msgport_wait(reply);
+-		e_msgport_destroy(reply);
++	if (processed != NULL) {
 +		mail_msg_main_loop_push((mail_msg_t *) m);
- 		e_msgport_wait(reply);
- 		e_msgport_destroy(reply);
++		e_flag_wait (processed);
++		e_flag_free (processed);
  	} else {
-@@ -909,7 +854,7 @@
+ 		do_call(&m->msg);
+ 	}
+@@ -909,7 +853,7 @@
  	busy_state++;
  	if (busy_state == 1) {
  		m = mail_msg_new(&set_busy_op, NULL, sizeof(*m));
@@ -1198,7 +1373,7 @@
  	}
  	MAIL_MT_UNLOCK(status_lock);
  }
-@@ -922,7 +867,7 @@
+@@ -922,7 +866,7 @@
  	busy_state--;
  	if (busy_state == 0) {
  		m = mail_msg_new(&set_busy_op, NULL, sizeof(*m));
@@ -1207,7 +1382,7 @@
  	}
  	MAIL_MT_UNLOCK(status_lock);
  }
-@@ -947,7 +892,7 @@
+@@ -947,7 +891,7 @@
  	char *out, *p, *o, c;
  	int pc;
  	
@@ -1216,7 +1391,7 @@
  	
  	MAIL_MT_LOCK (mail_msg_lock);
  	
-@@ -1055,7 +1000,7 @@
+@@ -1055,7 +999,7 @@
  	}
  	m->pc = pc;
  	m->data = data;
@@ -1225,8 +1400,8 @@
  }
  
  /* ******************** */
---- evolution-2.9.91/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread	2007-01-03 10:27:06.000000000 -0500
-+++ evolution-2.9.91/plugins/folder-unsubscribe/folder-unsubscribe.c	2007-02-15 16:04:42.000000000 -0500
+--- evolution-2.10.1/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread	2007-04-09 09:09:11.000000000 -0400
++++ evolution-2.10.1/plugins/folder-unsubscribe/folder-unsubscribe.c	2007-04-10 22:37:49.000000000 -0400
 @@ -108,5 +108,5 @@
  	unsub = mail_msg_new (&unsubscribe_op, NULL, sizeof (struct _folder_unsub_t));
  	unsub->uri = g_strdup (target->uri);
@@ -1234,8 +1409,8 @@
 -	e_thread_put (mail_thread_new, (EMsg *) unsub);
 +	mail_msg_unordered_push ((mail_msg_t *) unsub);
  }
---- evolution-2.9.91/plugins/mark-all-read/mark-all-read.c.kill-ethread	2007-01-03 10:27:08.000000000 -0500
-+++ evolution-2.9.91/plugins/mark-all-read/mark-all-read.c	2007-02-15 16:04:42.000000000 -0500
+--- evolution-2.10.1/plugins/mark-all-read/mark-all-read.c.kill-ethread	2007-04-09 09:09:14.000000000 -0400
++++ evolution-2.10.1/plugins/mark-all-read/mark-all-read.c	2007-04-10 22:37:49.000000000 -0400
 @@ -44,7 +44,7 @@
  		return;
  	}
@@ -1245,8 +1420,8 @@
  }
  
  static void
---- evolution-2.9.91/plugins/exchange-operations/exchange-folder.c.kill-ethread	2007-01-03 10:27:08.000000000 -0500
-+++ evolution-2.9.91/plugins/exchange-operations/exchange-folder.c	2007-02-15 16:04:42.000000000 -0500
+--- evolution-2.10.1/plugins/exchange-operations/exchange-folder.c.kill-ethread	2007-04-09 09:09:13.000000000 -0400
++++ evolution-2.10.1/plugins/exchange-operations/exchange-folder.c	2007-04-10 22:37:49.000000000 -0400
 @@ -134,7 +134,7 @@
  	inbox_physical_uri = e_folder_get_physical_uri (inbox);
  
@@ -1256,8 +1431,8 @@
  
  
  }
---- evolution-2.9.91/plugins/save-attachments/save-attachments.c.kill-ethread	2007-02-09 15:16:33.000000000 -0500
-+++ evolution-2.9.91/plugins/save-attachments/save-attachments.c	2007-02-15 16:04:42.000000000 -0500
+--- evolution-2.10.1/plugins/save-attachments/save-attachments.c.kill-ethread	2007-04-09 09:09:15.000000000 -0400
++++ evolution-2.10.1/plugins/save-attachments/save-attachments.c	2007-04-10 22:37:49.000000000 -0400
 @@ -407,5 +407,5 @@
  	camel_object_ref(data->folder);
  	data->uid = g_strdup(target->uids->pdata[0]);
@@ -1265,8 +1440,8 @@
 -	mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new);
 +	mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push);
  }
---- evolution-2.9.91/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread	2007-01-03 10:27:09.000000000 -0500
-+++ evolution-2.9.91/plugins/mailing-list-actions/mailing-list-actions.c	2007-02-15 16:04:42.000000000 -0500
+--- evolution-2.10.1/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread	2007-04-09 09:09:14.000000000 -0400
++++ evolution-2.10.1/plugins/mailing-list-actions/mailing-list-actions.c	2007-04-10 22:37:49.000000000 -0400
 @@ -89,7 +89,7 @@
  	data->uri = strdup (sel->uri);
  
@@ -1276,8 +1451,8 @@
  }
  	
  void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data)
---- evolution-2.9.91/plugins/groupwise-features/share-folder-common.c.kill-ethread	2007-01-03 10:27:07.000000000 -0500
-+++ evolution-2.9.91/plugins/groupwise-features/share-folder-common.c	2007-02-15 16:04:42.000000000 -0500
+--- evolution-2.10.1/plugins/groupwise-features/share-folder-common.c.kill-ethread	2007-04-09 09:09:12.000000000 -0400
++++ evolution-2.10.1/plugins/groupwise-features/share-folder-common.c	2007-04-10 22:37:49.000000000 -0400
 @@ -239,7 +239,7 @@
  	m->done = done;
  	g_free (namebuf);
@@ -1287,8 +1462,8 @@
  		
  	return id;
  }
---- evolution-2.9.91/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread	2007-01-03 10:27:57.000000000 -0500
-+++ evolution-2.9.91/calendar/gui/alarm-notify/alarm-notify.h	2007-02-15 16:04:42.000000000 -0500
+--- evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread	2007-04-09 09:10:29.000000000 -0400
++++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.h	2007-04-10 22:37:49.000000000 -0400
 @@ -39,19 +39,6 @@
  
  typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate;
@@ -1309,8 +1484,8 @@
  struct _AlarmNotify {
  	BonoboObject object;
  
---- evolution-2.9.91/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread	2007-01-03 10:27:57.000000000 -0500
-+++ evolution-2.9.91/calendar/gui/alarm-notify/alarm-notify.c	2007-02-15 16:04:42.000000000 -0500
+--- evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread	2007-04-09 09:10:29.000000000 -0400
++++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.c	2007-04-10 22:37:49.000000000 -0400
 @@ -45,10 +45,6 @@
          GMutex *mutex;
  };
@@ -1423,8 +1598,8 @@
  }
  
  static void
---- evolution-2.9.91/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread	2007-01-03 10:27:57.000000000 -0500
-+++ evolution-2.9.91/calendar/gui/alarm-notify/alarm-queue.c	2007-02-15 16:04:42.000000000 -0500
+--- evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread	2007-04-09 09:10:29.000000000 -0400
++++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c	2007-04-10 22:37:49.000000000 -0400
 @@ -115,9 +115,6 @@
  static int tray_blink_state = FALSE;
  static AlarmNotify *an;



From fedora-cvs-commits at redhat.com  Wed Apr 11 22:49:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 18:49:23 -0400
Subject: rpms/evolution/devel evolution.spec,1.234.2.5,1.234.2.6
Message-ID: <200704112249.l3BMnNoX027123@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
      Tag: private-evo-sanity-2_10_0-branch
	evolution.spec 
Log Message:
update, build with em_sync_thingy patches



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.234.2.5
retrieving revision 1.234.2.6
diff -u -r1.234.2.5 -r1.234.2.6
--- evolution.spec	10 Apr 2007 20:23:07 -0000	1.234.2.5
+++ evolution.spec	11 Apr 2007 22:49:20 -0000	1.234.2.6
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.1
-Release: 1%{?dist}.dwmw2.1
+Release: 2%{?dist}.dwmw2.1
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -736,6 +736,10 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Tue Apr 10 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-2.fc7
+- Revise patch for GNOME bug #362638 to fix RH bug #235096
+  (crash when displaying a mail server message to user).
+
 * Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-1.fc7
 - Update to 2.10.1
 - Fix buggy gnome-doc-utils.make (GNOME bug #427939).



From fedora-cvs-commits at redhat.com  Wed Apr 11 23:23:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 19:23:47 -0400
Subject: rpms/gnome-terminal/devel gnome-terminal.spec, 1.77,
	1.78 gnome-terminal-2.12.0-inputmethod.patch, 1.1,
	NONE gnome-terminal-2.14.1-real-transparency.patch, 1.5, NONE
Message-ID: <200704112323.l3BNNlqe018154@cvs.devel.redhat.com>

Author: besfahbo

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

Modified Files:
	gnome-terminal.spec 
Removed Files:
	gnome-terminal-2.12.0-inputmethod.patch 
	gnome-terminal-2.14.1-real-transparency.patch 
Log Message:
Whitespace cleanup and remove unused patches.



Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- gnome-terminal.spec	13 Mar 2007 05:28:47 -0000	1.77
+++ gnome-terminal.spec	11 Apr 2007 23:23:44 -0000	1.78
@@ -65,11 +65,11 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-desktop-file-install --vendor gnome --delete-original       \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-only-show-in GNOME                                  \
-  --remove-category=Application				    \
-  --add-category=System					    \
+desktop-file-install --vendor gnome --delete-original	\
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
+  --add-only-show-in GNOME				\
+  --remove-category=Application				\
+  --add-category=System					\
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
 # grr, --disable-scrollkeeper is not good enough


--- gnome-terminal-2.12.0-inputmethod.patch DELETED ---


--- gnome-terminal-2.14.1-real-transparency.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 11 23:38:54 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 19:38:54 -0400
Subject: rpms/cairo/devel cairo.spec,1.70,1.71
Message-ID: <200704112338.l3BNcsuS028331@cvs.devel.redhat.com>

Author: besfahbo

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

Modified Files:
	cairo.spec 
Log Message:
Apply some changes from merge review



Index: cairo.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- cairo.spec	20 Mar 2007 19:35:58 -0000	1.70
+++ cairo.spec	11 Apr 2007 23:38:51 -0000	1.71
@@ -11,10 +11,6 @@
 Group:		System Environment/Libraries
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-Obsoletes: libpixman <= 0.1.6
-Obsoletes: libpixman-devel <= 0.1.6
-Obsoletes: libpixman-debuginfo <= 0.1.6
-
 BuildRequires: pkgconfig
 BuildRequires: libXrender-devel
 BuildRequires: libX11-devel
@@ -29,7 +25,7 @@
 the X Window System, OpenGL (via glitz), in-memory image buffers, and
 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
+hardware acceleration when available (e.g. through the X Render
 Extension or OpenGL).
 
 %package devel
@@ -44,8 +40,8 @@
 
 %description devel
 Developmental libraries and header files required for developing or
-compiling software which links to the cairo library, which is an open
-source vector graphics library.
+compiling software which links to the cairo graphics library, which is
+an open source vector graphics library.
 
 %prep
 %setup -q
@@ -75,7 +71,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README 
+%doc AUTHORS BIBLIOGRAPHY BUGS ChangeLog COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 NEWS PORTING_GUIDE README TODO ROADMAP
 %{_libdir}/libcairo*.so.* 
 
 %files devel



From fedora-cvs-commits at redhat.com  Thu Apr 12 00:08:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 20:08:42 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.221,1.222
Message-ID: <200704120008.l3C08gs5025703@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Wed Apr 11 2007 Adam Jackson <ajax at redhat.com> 1.2.99.905-4
- xserver-1.3.0-no-prerelease-warning.patch: Hush the useless prerelease
  warning if we happen to be building one (and even if not).
- xserver-1.3.0-pci-device-enable.patch: Make sure the PCI device is enabled
  in sysfs before we start touching it, otherwise, armageddon.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- xorg-x11-server.spec	11 Apr 2007 21:44:31 -0000	1.221
+++ xorg-x11-server.spec	12 Apr 2007 00:08:39 -0000	1.222
@@ -64,6 +64,7 @@
 Patch2502:  xserver-1.3.0-mmap-failure-check.patch
 Patch2503:  xserver-1.3.0-rom-search.patch
 Patch2504:  xserver-1.3.0-domain-obiwan.patch
+Patch2505:  xserver-1.3.0-pci-device-enable.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -295,6 +296,7 @@
 %patch2502 -p1 -b .mmap-check
 %patch2503 -p1 -b .rom-search
 %patch2504 -p1 -b .domain-obiwan
+%patch2505 -p1 -b .device-enable
 
 %build
 
@@ -556,6 +558,8 @@
 * Wed Apr 11 2007 Adam Jackson <ajax at redhat.com> 1.2.99.905-4
 - xserver-1.3.0-no-prerelease-warning.patch: Hush the useless prerelease
   warning if we happen to be building one (and even if not).
+- xserver-1.3.0-pci-device-enable.patch: Make sure the PCI device is enabled
+  in sysfs before we start touching it, otherwise, armageddon.
 
 * Tue Apr 10 2007 Adam Jackson <ajax at redhat.com> 1.2.99.905-3
 - xserver-1.3.0-domain-obiwan.patch: Fix a PCI domain off-by-one. (#235861)



From fedora-cvs-commits at redhat.com  Thu Apr 12 00:10:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 20:10:57 -0400
Subject: rpms/xorg-x11-server/devel xserver-1.3.0-pci-device-enable.patch,
	NONE, 1.1
Message-ID: <200704120010.l3C0AvnA025779@cvs.devel.redhat.com>

Author: ajackson

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

Added Files:
	xserver-1.3.0-pci-device-enable.patch 
Log Message:
* Wed Apr 11 2007 Adam Jackson <ajax at redhat.com> 1.2.99.905-4
- xserver-1.3.0-no-prerelease-warning.patch: Hush the useless prerelease
  warning if we happen to be building one (and even if not).
- xserver-1.3.0-pci-device-enable.patch: Make sure the PCI device is enabled
  in sysfs before we start touching it, otherwise, armageddon.


xserver-1.3.0-pci-device-enable.patch:
 xf86Bus.c |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 46 insertions(+)

--- NEW FILE xserver-1.3.0-pci-device-enable.patch ---
--- xorg-server-1.2.99.905/hw/xfree86/common/xf86Bus.c.device-enable	2007-02-17 20:31:36.000000000 -0500
+++ xorg-server-1.2.99.905/hw/xfree86/common/xf86Bus.c	2007-04-11 18:56:56.000000000 -0400
@@ -42,6 +42,10 @@
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86Resources.h"
+#include "Pci.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 
 /* Bus-specific headers */
 
@@ -66,6 +70,7 @@
 BusRec primaryBus = { BUS_NONE, {{0}}};
 
 static Bool xf86ResAccessEnter = FALSE;
+static int lnxEntityPrivate;
 
 #ifdef REDUCER
 /* Resources that temporarily conflict with estimated resources */
@@ -116,6 +121,9 @@
 #if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
     xf86SbusProbe();
 #endif
+#ifdef linux
+    lnxEntityPrivate = xf86AllocateEntityPrivateIndex();
+#endif
 }
 
 /*
@@ -264,6 +272,39 @@
 	return FALSE;
     }
 }
+
+static void
+lnxEntityInit(int entityIndex, pointer private)
+{
+    EntityProc init;
+    EntityPtr ent = xf86Entities[entityIndex];
+
+    if (ent->bus.type == BUS_PCI) do {
+	char file[256], buf = '\0';
+	int fd;
+	int dom = PCI_DOM_FROM_BUS(ent->bus.id.pci.bus);
+	int bus = PCI_BUS_NO_DOMAIN(ent->bus.id.pci.bus);
+	int dev = ent->bus.id.pci.device;
+	int func = ent->bus.id.pci.func;
+	sprintf(file, "/sys/bus/pci/devices/%04x:%02x:%02x.%1x/enable",
+		dom, bus, dev, func);
+
+	if ((fd = open(file, O_RDWR)) < 0) {
+	    xf86Msg(X_ERROR, "Unable to open %s.  Be afraid.\n", file);
+	    break;
+	}
+	read(fd, &buf, 1);
+	if (buf = '0') {
+	    xf86Msg(X_INFO, "Enabling PCI device\n");
+	    write(fd, "1", 2);
+	}
+	close(fd);
+    } while (0);
+
+    init = xf86GetEntityPrivate(entityIndex, lnxEntityPrivate)->ptr;
+    if (init)
+	init(entityIndex, private);
+}
 	
 _X_EXPORT Bool
 xf86SetEntityFuncs(int entityIndex, EntityProc init, EntityProc enter,
@@ -271,7 +312,12 @@
 {
     if (entityIndex >= xf86NumEntities)
 	return FALSE;
+#ifndef linux
     xf86Entities[entityIndex]->entityInit = init;
+#else
+    xf86Entities[entityIndex]->entityInit = lnxEntityInit;
+    xf86GetEntityPrivate(entityIndex, lnxEntityPrivate)->ptr = init;
+#endif
     xf86Entities[entityIndex]->entityEnter = enter;
     xf86Entities[entityIndex]->entityLeave = leave;
     xf86Entities[entityIndex]->private = private;



From fedora-cvs-commits at redhat.com  Thu Apr 12 01:39:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 11 Apr 2007 21:39:26 -0400
Subject: rpms/vte/devel vte.spec,1.108,1.109
Message-ID: <200704120139.l3C1dQqb019443@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/vte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19325

Modified Files:
	vte.spec 
Log Message:
Merge review fixes



Index: vte.spec
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- vte.spec	10 Apr 2007 16:03:49 -0000	1.108
+++ vte.spec	12 Apr 2007 01:39:19 -0000	1.109
@@ -5,7 +5,7 @@
 License: LGPL
 Group: User Interface/X
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/vte/0.15/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.gnome.org/pub/GNOME/sources/vte/0.16/%{name}-%{version}.tar.bz2
 
 BuildRequires: gtk2-devel, pygtk2-devel, python-devel, ncurses-devel
 BuildRequires: gettext
@@ -87,7 +87,6 @@
 %files devel
 %defattr(-,root,root)
 %{_includedir}/*
-%dir %{_libdir}/%{name}
 %{_libdir}/%{name}/decset
 %{_libdir}/%{name}/interpret
 %{_libdir}/%{name}/iso8859mode



From fedora-cvs-commits at redhat.com  Thu Apr 12 04:01:12 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 00:01:12 -0400
Subject: rpms/fonts-japanese/devel fonts-japanese.spec,1.23,1.24
Message-ID: <200704120401.l3C41CUZ008197@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/fonts-japanese/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8182

Modified Files:
	fonts-japanese.spec 
Log Message:
* Thu Apr 12 2007 Akira TAGOH <tagoh at redhat.com> - 0.20061016-6
- Remove %%config from the files under /usr/share/ghostscript/conf.d.
- clean up more in spec file.


Index: fonts-japanese.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-japanese/devel/fonts-japanese.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- fonts-japanese.spec	11 Apr 2007 09:28:28 -0000	1.23
+++ fonts-japanese.spec	12 Apr 2007 04:01:08 -0000	1.24
@@ -9,12 +9,6 @@
 %define mkitalic        $RPM_BUILD_DIR/%{name}-%{version}/%{vft}/mkitalic
 
 %define sazanami        sazanami-20061016
-## FIXME: the below lines will be removed in the future.
-#%%define substname     kochi-substitute
-#%%define substver      20030809
-#%%define kochisubst    %{substname}-%{substver}
-#%%define ksnonaga10    %{substname}-nonaga10-%{substver}
-#
 %define kappa           Kappa20-0.396
 %define shinonome       shinonome-0.9.11
 %define warabi12        warabi12-0.19a
@@ -36,10 +30,6 @@
 Source2:        FAPIcidfmap.ja
 Source3:        cidfmap.ja
 Source4:        CIDFnmap.ja
-## FIXME: the below lines will be removed in the future.
-## Source0:     http://downloads.sourceforge.jp/efont/4767/%{kochisubst}.tar.bz2
-#Source5:       %{ksnonaga10}.tar.bz2
-#Source6:       fonts.alias.kk
 ## files in jisksp14
 Source10:       jisksp14.bdf.gz
 ## files in jisksp16-1990
@@ -296,16 +286,6 @@
 install -m 0644 *.ttf $RPM_BUILD_ROOT%{ttfontdir}/
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{ttfontdir}/fonts.alias
 popd
-#
-#pushd %{kochisubst}
-#install -m 0644 *.ttf $RPM_BUILD_ROOT%{ttfontdir}/
-#if test -f $RPM_BUILD_ROOT%{ttfontdir}/fonts.alias; then
-#  cat $RPM_BUILD_ROOT%{ttfontdir}/fonts.alias %{SOURCE6} > $RPM_BUILD_ROOT%{ttfontdir}/fonts.alias.$$$ && mv $RPM_BUILD_ROOT%{ttfontdir}/fonts.alias{.$$$,} || exit
-#  chmod 0644 $RPM_BUILD_ROOT%{ttfontdir}/fonts.alias
-#else
-#  install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{ttfontdir}/fonts.alias
-#fi
-#popd
 
 ## jisksp14
 install -m 0644 jisksp14.pcf* $RPM_BUILD_ROOT%{bmpfontdir}/
@@ -374,7 +354,6 @@
 %files
 %defattr(-, root, root)
 %doc %{sazanami}/doc
-#%%doc %{kochisubst}/docs %{kochisubst}/{COPYING,README.ja,README.RedHat}
 %doc doc.orig readme.kaname_bdf
 %doc fonts-ja/COPYRIGHT* fonts-ja/README* fonts-ja/LICENSE* fonts-ja/ALLFONTS.txt
 %dir %{basefontdir}
@@ -392,11 +371,15 @@
 %ghost %verify(not md5 size mtime) %{bmpfontdir}/encodings.dir
 %{ttfontdir}/*ttf
 %{bmpfontdir}/*gz
-%config %{cidmapdir}/FAPIcidfmap.ja
-%config %{cidmapdir}/cidfmap.ja
-%config %{cidmapdir}/CIDFnmap.ja
+%{cidmapdir}/FAPIcidfmap.ja
+%{cidmapdir}/cidfmap.ja
+%{cidmapdir}/CIDFnmap.ja
 
 %changelog
+* Thu Apr 12 2007 Akira TAGOH <tagoh at redhat.com> - 0.20061016-6
+- Remove %%config from the files under /usr/share/ghostscript/conf.d.
+- clean up more in spec file.
+
 * Tue Apr 10 2007 Akira TAGOH <tagoh at redhat.com> - 0.20061016-5
 - Move the configuration files for ghostscript under /usr/share/ghostscript/conf.d
 



From fedora-cvs-commits at redhat.com  Thu Apr 12 04:01:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 00:01:36 -0400
Subject: rpms/fonts-japanese/devel fonts-japanese.spec,1.24,1.25
Message-ID: <200704120401.l3C41aHQ008279@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/fonts-japanese/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8260

Modified Files:
	fonts-japanese.spec 
Log Message:



Index: fonts-japanese.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-japanese/devel/fonts-japanese.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- fonts-japanese.spec	12 Apr 2007 04:01:08 -0000	1.24
+++ fonts-japanese.spec	12 Apr 2007 04:01:34 -0000	1.25
@@ -17,7 +17,7 @@
 
 Name:           fonts-japanese
 Version:        0.20061016
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        Distributable
 Group:          User Interface/X
 BuildArch:      noarch



From fedora-cvs-commits at redhat.com  Thu Apr 12 08:01:51 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 04:01:51 -0400
Subject: rpms/lftp/devel lftp.spec,1.58,1.59
Message-ID: <200704120801.l3C81ptO025767@cvs.devel.redhat.com>

Author: mbarabas

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

Modified Files:
	lftp.spec 
Log Message:
Correct spec mistakes in merge review


Index: lftp.spec
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- lftp.spec	4 Apr 2007 14:45:52 -0000	1.58
+++ lftp.spec	12 Apr 2007 08:01:49 -0000	1.59
@@ -1,13 +1,13 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
 Version: 	3.5.10
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.gz
 URL: 		http://lftp.yar.ru/
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: 	ncurses-devel, openssl-devel, pkgconfig, readline-devel, autoconf, automake, libtool, gettext
+BuildRequires: 	ncurses-devel, openssl-devel, pkgconfig, readline-devel, libtool, gettext
 
 %description
 LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
@@ -15,13 +15,6 @@
 mirroring, and can transfer several files in parallel. It is designed with
 reliability in mind.
 
-%package devel
-Summary: Headers and static libraries for lftp development
-Group: Development/Libraries
-
-%description devel
-This package contains the header files, and static libraries for building lftp.
-
 %prep
 %setup -q
 
@@ -31,7 +24,7 @@
 	LDFLAGS=`pkg-config --libs-only-L openssl`; export LDFLAGS
 fi
 LDFLAGS="-L`pwd`/src/.libs $LDFLAGS"; export LDFLAGS
-%configure --with-modules --disable-static --with-openssl=/usr --with-debug
+%configure --with-modules --disable-static --with-openssl=/usr --with-debug --disable-rpath
 export tagname=CC
 make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags}
 
@@ -61,13 +54,10 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/chkconfig --add lftp
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
 %postun
 if [ "$1" = 0 ]; then
-/sbin/chkconfig --del lftp
 /sbin/ldconfig
 fi
 exit 0
@@ -91,13 +81,16 @@
 %{_libdir}/lftp/%{version}/proto-http.so
 %{_libdir}/lftp/%{version}/proto-sftp.so
 %{_libdir}/lftp/%{version}/liblftp-getdate.so
-
-%files devel
-%defattr(-,root,root,-)
 %{_libdir}/liblftp-jobs*
 %{_libdir}/liblftp-tasks*
 
 %changelog
+* Wed Apr 11 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.10-3
+- Correct mistake removing devel package & calling chkconfig
+- Resolves #235436
+- Removing automake autoconf
+- Resolves #225984
+
 * Wed Apr 04 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.10-2
 - Merge review fix
 - Resolves #225984
@@ -177,8 +170,8 @@
   bug 171096 : 'mget files in lftp causes abort' (core dump actually)
   resulted from not doing so .
   See http://lftp.yar.ru :
-      Recent events:
-      2005-10-17: lftp-3.3.2 released. Fixed a coredump caused by double-free.
+    Recent events:2005-10-17: 
+    lftp-3.3.2 released. Fixed a coredump caused by double-free.
 
 * Sat Oct 15 2005 Florian La Roche <laroche at redhat.com> - 3.3.1-1
 - 3.3.1



From fedora-cvs-commits at redhat.com  Thu Apr 12 08:29:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 04:29:57 -0400
Subject: rpms/sudo/devel sudo-1.6.8p12-getgrouplist.patch, NONE,
	1.1 sudo.spec, 1.49, 1.50
Message-ID: <200704120829.l3C8TvBG026525@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/sudo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26508

Modified Files:
	sudo.spec 
Added Files:
	sudo-1.6.8p12-getgrouplist.patch 
Log Message:
also use getgrouplist() to determine group membership (#235915)


sudo-1.6.8p12-getgrouplist.patch:
 check.c      |   18 ++++++++++++++++++
 config.h.in  |    3 +++
 configure    |    2 +-
 configure.in |    2 +-
 4 files changed, 23 insertions(+), 2 deletions(-)

--- NEW FILE sudo-1.6.8p12-getgrouplist.patch ---
--- sudo-1.6.8p12/configure.in.getgrouplist	2007-04-12 10:16:12.000000000 +0200
+++ sudo-1.6.8p12/configure.in	2007-04-12 10:18:16.000000000 +0200
@@ -1694,7 +1694,7 @@
 dnl Function checks
 dnl
 AC_CHECK_FUNCS(strchr strrchr memchr memcpy memset sysconf tzset \
-	       strftime setrlimit initgroups fstat gettimeofday)
+	       strftime setrlimit initgroups getgrouplist fstat gettimeofday)
 AC_CHECK_FUNCS(seteuid, , [AC_DEFINE(NO_SAVED_IDS)])
 if test -z "$SKIP_SETRESUID"; then
     AC_CHECK_FUNCS(setresuid, [SKIP_SETREUID=yes])
--- sudo-1.6.8p12/configure.getgrouplist	2005-10-28 02:48:25.000000000 +0200
+++ sudo-1.6.8p12/configure	2007-04-12 10:18:16.000000000 +0200
@@ -24677,7 +24677,7 @@
 
 
 for ac_func in strchr strrchr memchr memcpy memset sysconf tzset \
-	       strftime setrlimit initgroups fstat gettimeofday
+	       strftime setrlimit initgroups getgrouplist fstat gettimeofday
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
--- sudo-1.6.8p12/check.c.getgrouplist	2005-03-25 02:55:31.000000000 +0100
+++ sudo-1.6.8p12/check.c	2007-04-12 10:18:16.000000000 +0200
@@ -299,6 +299,24 @@
 	    return(TRUE);
     }
 
+#ifdef HAVE_GETGROUPLIST
+    {
+	gid_t *grouplist, grouptmp;
+	int n_groups, i;
+	n_groups = 1;
+	if (getgrouplist(user_name, user_gid, &grouptmp, &n_groups) == -1) {
+	    grouplist = (gid_t *) emalloc(sizeof(gid_t) * (n_groups + 1));
+	    if (getgrouplist(user_name, user_gid, grouplist, &n_groups) > 0)
+		for (i = 0; i < n_groups; i++)
+		    if (grouplist[i] == grp->gr_gid) {
+			free(grouplist);
+			return(TRUE);
+		    }
+	    free(grouplist);
+	}
+    }
+#endif
+
     return(FALSE);
 }
 
--- sudo-1.6.8p12/config.h.in.getgrouplist	2007-04-12 10:16:12.000000000 +0200
+++ sudo-1.6.8p12/config.h.in	2007-04-12 10:18:16.000000000 +0200
@@ -122,6 +122,9 @@
 /* Define to 1 if you have the `getdomainname' function. */
 #undef HAVE_GETDOMAINNAME
 
+/* Define to 1 if you have the `getgrouplist' function. */
+#undef HAVE_GETGROUPLIST
+
 /* Define to 1 if you have the `getifaddrs' function. */
 #undef HAVE_GETIFADDRS
 


Index: sudo.spec
===================================================================
RCS file: /cvs/dist/rpms/sudo/devel/sudo.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sudo.spec	26 Feb 2007 19:23:08 -0000	1.49
+++ sudo.spec	12 Apr 2007 08:29:55 -0000	1.50
@@ -1,7 +1,7 @@
 Summary: Allows restricted root access for specified users
 Name: sudo
 Version: 1.6.8p12
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: BSD
 Group: Applications/System
 URL: http://www.courtesan.com/sudo/
@@ -28,6 +28,7 @@
 Patch6: sudo-1.6.8p12-pam-login.patch
 # IPv6 support
 Patch7: sudo-1.6.8p12-ipv6.patch
+Patch8: sudo-1.6.8p12-getgrouplist.patch
 
 %description
 Sudo (superuser do) allows a system administrator to give certain
@@ -48,6 +49,7 @@
 %patch5 -p1 -b .tty
 %patch6 -p1 -b .login
 %patch7 -p1 -b .ipv6
+%patch8 -p1 -b .getgrouplist
 
 %build
 %ifarch s390 s390x
@@ -127,6 +129,9 @@
 /bin/chmod 0440 /etc/sudoers || :
 
 %changelog
+* Thu Apr 12 2007 Peter Vrabec <pvrabec at redhat.com> 1.6.8p12-14
+- also use getgrouplist() to determine group membership (#235915)
+
 * Mon Feb 26 2007 Peter Vrabec <pvrabec at redhat.com> 1.6.8p12-13
 - fix some spec file issues
 



From fedora-cvs-commits at redhat.com  Thu Apr 12 08:31:34 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 04:31:34 -0400
Subject: rpms/iputils/FC-6 iputils.spec,1.45,1.46 sources,1.13,1.14
Message-ID: <200704120831.l3C8VYv9007961@cvs.devel.redhat.com>

Author: mbacovsk

Update of /cvs/dist/rpms/iputils/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv7793

Modified Files:
	iputils.spec sources 
Log Message:
* Thu Apr 12 2007 Martin Bacovsky <mbacovsk at redhat.com> - 20070202-3
- resolves: #236114: broken man page ifenslave



Index: iputils.spec
===================================================================
RCS file: /cvs/dist/rpms/iputils/FC-6/iputils.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- iputils.spec	6 Apr 2007 10:48:32 -0000	1.45
+++ iputils.spec	12 Apr 2007 08:31:32 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: Network monitoring tools including ping.
 Name: iputils
 Version: 20070202
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 URL: http://www.skbuff.net/iputils
 Group: System Environment/Daemons
@@ -145,6 +145,9 @@
 %config(noreplace) %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
+* Thu Apr 12 2007 Martin Bacovsky <mbacovsk at redhat.com> - 20070202-3
+- resolves: #236114: broken man page ifenslave
+
 * Fri Apr  6 2007 Martin Bacovsky <mbacovsk at redhat.com> - 20070202-2
 - resolves: #235374: Update of iputils starts rdisc, breaking connectivity 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/iputils/FC-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	3 Apr 2007 17:06:21 -0000	1.13
+++ sources	12 Apr 2007 08:31:32 -0000	1.14
@@ -1,3 +1,3 @@
 349c02b907d61a143876f85cbd006c89  rdisc.initd
-6c3f8bffe792b2b49a99aefcf730e72f  ifenslave.tar.gz
 1d38fb3cfc2b71496e43cf646bfc1d6e  iputils-s20070202.tar.bz2
+7b1b81338efea21dd5ecac3fd1f89c1b  ifenslave.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 12 09:56:40 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 05:56:40 -0400
Subject: rpms/doxygen/devel .cvsignore, 1.21, 1.22 doxygen.spec, 1.44,
	1.45 sources, 1.22, 1.23
Message-ID: <200704120956.l3C9uexP017336@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/doxygen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17320

Modified Files:
	.cvsignore doxygen.spec sources 
Log Message:
1.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/doxygen/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	12 Jun 2006 20:42:44 -0000	1.21
+++ .cvsignore	12 Apr 2007 09:56:38 -0000	1.22
@@ -8,3 +8,4 @@
 doxygen-1.4.5.src.tar.gz
 doxygen-1.4.6.src.tar.gz
 doxygen-1.4.7.src.tar.gz
+doxygen-1.5.2.src.tar.gz


Index: doxygen.spec
===================================================================
RCS file: /cvs/dist/rpms/doxygen/devel/doxygen.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- doxygen.spec	6 Nov 2006 11:27:40 -0000	1.44
+++ doxygen.spec	12 Apr 2007 09:56:38 -0000	1.45
@@ -3,8 +3,8 @@
 
 Summary: A documentation system for C/C++.
 Name: doxygen
-Version: 1.5.1
-Release: 2
+Version: 1.5.2
+Release: 1%{?dist}
 Epoch: 1
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
 
@@ -16,14 +16,15 @@
 License: GPL
 Url: http://www.stack.nl/~dimitri/doxygen/index.html
 
-BuildPrereq: libstdc++-devel
-BuildPrereq: perl
-BuildPrereq: tetex-dvips, tetex-latex, ghostscript
-BuildPrereq: gettext
-BuildPrereq: flex
-BuildPrereq: bison
+BuildRequires: perl
+BuildRequires: tetex-dvips
+BuildRequires: tetex-latex
+BuildRequires: ghostscript
+BuildRequires: gettext
+BuildRequires: flex
+BuildRequires: bison
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Doxygen can generate an online class browser (in HTML) and/or a
@@ -100,6 +101,9 @@
 %endif
 
 %changelog
+* Thu Apr 12 2007 Than Ngo <than at redhat.com> - 1:1.5.2-1
+- 1.5.2
+
 * Fri Nov 03 2006 Than Ngo <than at redhat.com> 1:1.5.1-2
 - 1.5.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/doxygen/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	6 Nov 2006 11:27:40 -0000	1.22
+++ sources	12 Apr 2007 09:56:38 -0000	1.23
@@ -1 +1 @@
-43b8e58e5ca70cb8f1285c35a171014e  doxygen-1.5.1.src.tar.gz
+f2782e5bd31a7d10b092500bf0d96ae2  doxygen-1.5.2.src.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 12 10:28:19 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 06:28:19 -0400
Subject: rpms/sip/devel .cvsignore, 1.17, 1.18 sip.spec, 1.35, 1.36 sources,
	1.17, 1.18
Message-ID: <200704121028.l3CASJRR017894@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/sip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17880

Modified Files:
	.cvsignore sip.spec sources 
Log Message:
4.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sip/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	18 Jan 2007 12:55:01 -0000	1.17
+++ .cvsignore	12 Apr 2007 10:28:17 -0000	1.18
@@ -7,3 +7,4 @@
 sip-4.4.5.tar.gz
 sip-4.5.tar.gz
 sip-4.5.2.tar.gz
+sip-4.6.tar.gz


Index: sip.spec
===================================================================
RCS file: /cvs/dist/rpms/sip/devel/sip.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sip.spec	18 Jan 2007 12:55:01 -0000	1.35
+++ sip.spec	12 Apr 2007 10:28:17 -0000	1.36
@@ -1,13 +1,13 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define minor .2
 
-%define qtver 3.3.7
+%define qtver 3.3.8
 %define qtpkg qt
 
 Summary: SIP - Python/C++ Bindings Generator
 Name: sip
-Version: 4.5.2
-Release: 1
+Version: 4.6
+Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
 Url: http://www.riverbankcomputing.co.uk/
@@ -82,6 +82,9 @@
 %{_includedir}/python?.?/*
 
 %changelog
+* Thu Apr 12 2007 Than Ngo <than at redhat.com> - 4.6-1.fc7
+- 4.6
+
 * Thu Jan 18 2007 Than Ngo <than at redhat.com> - 4.5.2-1
 - 4.5.2 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sip/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	18 Jan 2007 12:55:01 -0000	1.17
+++ sources	12 Apr 2007 10:28:17 -0000	1.18
@@ -1 +1 @@
-0fdb0cbdcbbe158009196437711eb8bd  sip-4.5.2.tar.gz
+2f57b65de36e85067b3bdf5830315460  sip-4.6.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 12 10:35:22 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 06:35:22 -0400
Subject: rpms/PyQt/devel .cvsignore, 1.17, 1.18 PyQt.spec, 1.36, 1.37 sources,
	1.17, 1.18
Message-ID: <200704121035.l3CAZMao001661@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/PyQt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1597

Modified Files:
	.cvsignore PyQt.spec sources 
Log Message:
3.17.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/PyQt/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	6 Nov 2006 16:59:48 -0000	1.17
+++ .cvsignore	12 Apr 2007 10:35:19 -0000	1.18
@@ -5,3 +5,4 @@
 PyQt-x11-gpl-3.15.tar.gz
 PyQt-x11-gpl-3.16.tar.gz
 PyQt-x11-gpl-3.17.tar.gz
+PyQt-x11-gpl-3.17.1.tar.gz


Index: PyQt.spec
===================================================================
RCS file: /cvs/dist/rpms/PyQt/devel/PyQt.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- PyQt.spec	18 Jan 2007 13:02:00 -0000	1.36
+++ PyQt.spec	12 Apr 2007 10:35:19 -0000	1.37
@@ -1,14 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define minor %{nil}
 
-%define qtversion 3.3.7
+%define qtversion 3.3.8
 %define qtpkg qt
-%define sip_version 4.5.2
+%define sip_version 4.6
 
 Summary: Python bindings for Qt
 Name: PyQt
-Version: 3.17
-Release: 3
+Version: 3.17.1
+Release: 1%{?dist}
 License: GPL
 Group: Development/Languages
 Url: http://www.riverbankcomputing.co.uk/pyqt/
@@ -88,6 +88,9 @@
 %doc examples/*.png examples/*.gif examples/*.bmp
 
 %changelog
+* Thu Apr 12 2007 Than Ngo <than at redhat.com> - 3.17.1-1.fc7
+- 3.17.1
+
 * Thu Jan 18 2007 Than Ngo <than at redhat.com> - 3.17-3
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/PyQt/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	6 Nov 2006 16:59:48 -0000	1.17
+++ sources	12 Apr 2007 10:35:19 -0000	1.18
@@ -1 +1 @@
-dd0ecb6258215cd8e47e6de1c37a6da2  PyQt-x11-gpl-3.17.tar.gz
+f04fa60df7c09e3c0a2006982c2c4cf5  PyQt-x11-gpl-3.17.1.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 12 11:11:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 07:11:21 -0400
Subject: rpms/xterm/devel xterm-222-man-page_paths.patch, 1.1, 1.2 xterm.spec,
	1.55, 1.56
Message-ID: <200704121111.l3CBBLrs027816@cvs.devel.redhat.com>

Author: mlichvar

Update of /cvs/dist/rpms/xterm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27713

Modified Files:
	xterm-222-man-page_paths.patch xterm.spec 
Log Message:
- fix sections in man pages


xterm-222-man-page_paths.patch:
 minstall.sh |    8 +++++++-
 xterm.man   |   12 ++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

Index: xterm-222-man-page_paths.patch
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/xterm-222-man-page_paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xterm-222-man-page_paths.patch	23 Nov 2006 13:21:45 -0000	1.1
+++ xterm-222-man-page_paths.patch	12 Apr 2007 11:11:19 -0000	1.2
@@ -45,17 +45,18 @@
  .I __apploaddir__/XTerm
 --- xterm-222/minstall.sh.man-page_paths	2006-04-10 02:34:37.000000000 +0200
 +++ xterm-222/minstall.sh	2006-11-23 10:23:39.000000000 +0100
-@@ -16,6 +16,9 @@
+@@ -16,13 +16,19 @@
  END_FILE="$3"
  APPS_DIR="$4"
  
+-suffix=`echo "$END_FILE" | sed -e 's%^[^.]*.%%'`
 +fontpath=/usr/share/X11/fonts
 +xorgcfgdir=/etc/X11
 +xorgcfgfil=xorg.conf
- suffix=`echo "$END_FILE" | sed -e 's%^[^.]*.%%'`
++suffix=7
  NEW_FILE=temp$$
  
-@@ -23,6 +26,9 @@
+ sed	-e 's%__vendorversion__%"X Window System"%' \
  	-e s%__apploaddir__%$APPS_DIR% \
  	-e s%__mansuffix__%$suffix%g \
  	-e s%__miscmansuffix__%$suffix%g \


Index: xterm.spec
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- xterm.spec	27 Mar 2007 15:27:19 -0000	1.55
+++ xterm.spec	12 Apr 2007 11:11:19 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: Terminal emulator for the X Window System
 Name: xterm
 Version: 225
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://dickey.his.com/xterm
 License: MIT
 Group: User Interface/X
@@ -77,6 +77,9 @@
 %{x11_app_defaults_dir}/XTerm-color
 
 %changelog
+* Thu Apr 12 2007 Miroslav Lichvar <mlichvar at redhat.com> 225-2
+- fix sections in man pages
+
 * Tue Mar 27 2007 Miroslav Lichvar <mlichvar at redhat.com> 225-1
 - update to 225
 



From fedora-cvs-commits at redhat.com  Thu Apr 12 11:47:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 07:47:53 -0400
Subject: rpms/xterm/FC-6 .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 xterm-222-man-page_paths.patch, 1.1,
	1.2 xterm-223-redhat-resources.patch, 1.1, 1.2 xterm.spec,
	1.51, 1.52 xterm-224-setegid.patch, 1.1, NONE
Message-ID: <200704121147.l3CBlrjT008741@cvs.devel.redhat.com>

Author: mlichvar

Update of /cvs/dist/rpms/xterm/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv8706

Modified Files:
	.cvsignore sources xterm-222-man-page_paths.patch 
	xterm-223-redhat-resources.patch xterm.spec 
Removed Files:
	xterm-224-setegid.patch 
Log Message:
- update to 225
- fix sections in man pages
- enable metaSendsEscape resource by default



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xterm/FC-6/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	16 Feb 2007 15:03:25 -0000	1.17
+++ .cvsignore	12 Apr 2007 11:47:51 -0000	1.18
@@ -1,2 +1,2 @@
 16colors.txt
-xterm-224.tgz
+xterm-225.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xterm/FC-6/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	16 Feb 2007 15:03:25 -0000	1.17
+++ sources	12 Apr 2007 11:47:51 -0000	1.18
@@ -1,2 +1,2 @@
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-7e9f042873eb1927934d21733f9a2e1a  xterm-224.tgz
+dbd31341a9ccb982647416e8d27b0f00  xterm-225.tgz

xterm-222-man-page_paths.patch:
 minstall.sh |    8 +++++++-
 xterm.man   |   12 ++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

Index: xterm-222-man-page_paths.patch
===================================================================
RCS file: /cvs/dist/rpms/xterm/FC-6/xterm-222-man-page_paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xterm-222-man-page_paths.patch	8 Jan 2007 17:50:45 -0000	1.1
+++ xterm-222-man-page_paths.patch	12 Apr 2007 11:47:51 -0000	1.2
@@ -45,17 +45,18 @@
  .I __apploaddir__/XTerm
 --- xterm-222/minstall.sh.man-page_paths	2006-04-10 02:34:37.000000000 +0200
 +++ xterm-222/minstall.sh	2006-11-23 10:23:39.000000000 +0100
-@@ -16,6 +16,9 @@
+@@ -16,13 +16,19 @@
  END_FILE="$3"
  APPS_DIR="$4"
  
+-suffix=`echo "$END_FILE" | sed -e 's%^[^.]*.%%'`
 +fontpath=/usr/share/X11/fonts
 +xorgcfgdir=/etc/X11
 +xorgcfgfil=xorg.conf
- suffix=`echo "$END_FILE" | sed -e 's%^[^.]*.%%'`
++suffix=7
  NEW_FILE=temp$$
  
-@@ -23,6 +26,9 @@
+ sed	-e 's%__vendorversion__%"X Window System"%' \
  	-e s%__apploaddir__%$APPS_DIR% \
  	-e s%__mansuffix__%$suffix%g \
  	-e s%__miscmansuffix__%$suffix%g \

xterm-223-redhat-resources.patch:
 XTerm.ad |    8 ++++++++
 1 files changed, 8 insertions(+)

Index: xterm-223-redhat-resources.patch
===================================================================
RCS file: /cvs/dist/rpms/xterm/FC-6/xterm-223-redhat-resources.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xterm-223-redhat-resources.patch	8 Jan 2007 17:50:45 -0000	1.1
+++ xterm-223-redhat-resources.patch	12 Apr 2007 11:47:51 -0000	1.2
@@ -1,12 +1,13 @@
 --- xterm-223/XTerm.ad.redhat-resources	2006-06-24 16:34:45.000000000 +0200
 +++ xterm-223/XTerm.ad	2007-01-08 18:13:38.000000000 +0100
-@@ -186,3 +186,10 @@
+@@ -186,3 +186,11 @@
  !
  ! Alternatively,
  !*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
 +
 +! Red Hat Defaults:
 +*VT100*eightBitInput: 0
++*VT100*metaSendsEscape: 1
 +*VT100*backarrowKey:  0
 +*VT100*scrollBar:     1
 +*VT100*utf8Title:     1


Index: xterm.spec
===================================================================
RCS file: /cvs/dist/rpms/xterm/FC-6/xterm.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- xterm.spec	16 Feb 2007 15:03:25 -0000	1.51
+++ xterm.spec	12 Apr 2007 11:47:51 -0000	1.52
@@ -1,6 +1,6 @@
 Summary: xterm terminal emulator for the X Window System
 Name:    xterm
-Version: 224
+Version: 225
 Release: 1%{?dist}
 URL:     http://dickey.his.com/xterm
 License: MIT
@@ -15,7 +15,6 @@
 Patch1: xterm-223-redhat-resources.patch
 Patch2: xterm-222-can-2003-0063.patch
 Patch3: xterm-222-man-page_paths.patch
-Patch4: xterm-224-setegid.patch
 
 %{?!enable_trace:  %define enable_trace 0}
 
@@ -32,7 +31,6 @@
 %patch1 -p1 -b .redhat-resources
 %patch2 -p1 -b .can-2003-0063
 %patch3 -p1 -b .man-page_paths
-%patch4 -p1 -b .setegid
 
 %build
 %configure \
@@ -45,7 +43,7 @@
 	--enable-wide-chars \
 	--with-app-defaults=%{x11_app_defaults_dir} \
 	--with-utempter \
-	--disable-setuid \
+	--disable-setgid \
 	--with-tty-group=tty
 
 make %{?_smp_mflags}
@@ -72,6 +70,11 @@
 %{x11_app_defaults_dir}/XTerm-color
 
 %changelog
+* Thu Apr 12 2007 Miroslav Lichvar <mlichvar at redhat.com> 225-1.fc6
+- update to 225
+- fix sections in man pages
+- enable metaSendsEscape resource by default
+
 * Fri Feb 16 2007 Miroslav Lichvar <mlichvar at redhat.com> 224-1.fc6
 - update to 224
 - drop utempter group before creating pty


--- xterm-224-setegid.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 12 12:13:11 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 08:13:11 -0400
Subject: rpms/gimp/devel gimp.spec,1.117,1.118
Message-ID: <200704121213.l3CCDBWi009133@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	gimp.spec 
Log Message:
use gutenprint per default for current development/future distribution versions (Fedora >= 7, RHEL >= 6)



Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- gimp.spec	26 Mar 2007 08:04:42 -0000	1.117
+++ gimp.spec	12 Apr 2007 12:13:09 -0000	1.118
@@ -4,6 +4,7 @@
 # 
 # modular_x:   modular X deps
 # lcms:        lcms support
+# gutenprint:  gutenprint support (instead of gimp-print)
 # python:      python support
 # mp:          multi processor support
 # static:      build static libraries
@@ -18,6 +19,12 @@
 %define _enable_lcms 0%{?_with_lcms:1}
 %endif
 
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 7 || 0%{?rhel} >= 6
+%define _enable_gutenprint 0%{!?_without_gutenprint:1}
+%else
+%define _enable_gutenprint 0%{?_with_gutenprint:1}
+%endif
+
 %define _enable_python 0%{!?_without_python:1}
 %define _enable_mp 0%{!?_without_mp:1}
 %define _enable_static 0%{!?_without_static:1}
@@ -36,7 +43,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
@@ -67,7 +74,11 @@
 %else
 BuildRequires:	xorg-x11-devel
 %endif
+%if %_enable_gutenprint
+BuildRequires:  gutenprint-devel >= 5.0.0
+%else
 BuildRequires:	gimp-print-devel >= 4.2.0
+%endif
 BuildRequires:	automake >= 1.7
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	libtool >= 1.5
@@ -84,7 +95,11 @@
 Requires: 	gtk2 >= 2.4.14
 Requires:	pango >= 1.6.0
 Requires:	fontconfig >= 2.2.0
+%if %_enable_gutenprint
+Requires:   gutenprint >= 5.0.0
+%else
 Requires:	gimp-print >= 4.2.0
+%endif
 Requires(post): /usr/bin/update-desktop-database
 Requires(post): hicolor-icon-theme
 Requires(postun): /usr/bin/update-desktop-database
@@ -403,6 +418,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Mar 26 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.13-3
+- use gutenprint per default for current development/future distribution
+  versions (Fedora >= 7, RHEL >= 6)
+
 * Mon Mar 26 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.13-2
 - own used directories in gimp-devel (#233794)
 



From fedora-cvs-commits at redhat.com  Thu Apr 12 12:36:46 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 08:36:46 -0400
Subject: rpms/kdenetwork/devel .cvsignore, 1.38, 1.39 kdenetwork.spec, 1.93,
	1.94 sources, 1.44, 1.45 kdenetwork-3.5.6-kde#139719.patch,
	1.1, NONE
Message-ID: <200704121236.l3CCak2q026804@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdenetwork.spec sources 
Removed Files:
	kdenetwork-3.5.6-kde#139719.patch 
Log Message:
- cleanup
- apply CVS upstream patches



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	10 Aug 2006 14:38:37 -0000	1.38
+++ .cvsignore	12 Apr 2007 12:36:44 -0000	1.39
@@ -11,3 +11,4 @@
 kdenetwork-3.5.1.tar.bz2
 kdenetwork-3.5.3.tar.bz2
 kdenetwork-3.5.4.tar.bz2
+kdenetwork-3.5.6-cvs-12042007.patch.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- kdenetwork.spec	2 Apr 2007 16:19:00 -0000	1.93
+++ kdenetwork.spec	12 Apr 2007 12:36:44 -0000	1.94
@@ -1,10 +1,10 @@
 %define debug 0
-%define final 0
+%define final 1
 %define arts 1
 %define libidn 1
 %define make_cvs 1
 
-%define qt_version 3.3.7
+%define qt_version 3.3.8
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 %define qt_epoch 1
@@ -13,8 +13,9 @@
 
 Name: kdenetwork
 Version: 3.5.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: K Desktop Environment - Network Applications
+
 Epoch: 7
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,34 +28,24 @@
 Source4: lisarc
 Source5: lisa.redhat
 
-Patch0: kdenetwork-3.1-desktop.patch
-Patch1: kdenetwork-3.1-buildroot.patch
+# upstream patch
+Patch0: kdenetwork-3.5.6-cvs-12042007.patch.bz2
+
+Patch1: kdenetwork-3.1-desktop.patch
+Patch2: kdenetwork-3.1-buildroot.patch
 Patch3: kdenetwork-3.3.92-kppp.patch
 Patch4: kdenetwork-3.2.3-resolv.patch
 
-# upstream patces
-Patch1000: kdenetwork-3.5.6-kde#13971
-
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post,postun): /sbin/ldconfig
 Requires(post,postun): /sbin/chkconfig
 
-BuildRequires: qt-devel >= %{qt_version}
-BuildRequires: kdebase-devel
-BuildRequires: libtool
-BuildRequires: glibc-devel
-BuildRequires: gcc-c++
-BuildRequires: automake
-BuildRequires: autoconf
 %ifnarch s390 s390x
 BuildRequires: wireless-tools-devel >= 25
 %endif
-BuildRequires: coreutils
-BuildRequires: libXmu-devel
-BuildRequires: libXxf86vm-devel
-BuildRequires: libXtst-devel
-BuildRequires: openssl-devel
+
+BuildRequires: qt-devel >= %{qt_version} kdebase-devel libtool automake
+BuildRequires: coreutils libXmu-devel libXxf86vm-devel libXtst-devel openssl-devel
 
 %description
 Networking applications for the K Desktop Environment.
@@ -69,15 +60,29 @@
 Development files for kdenetwork. Install kdenetwork-devel if you wish
 to develop or compile KDE networking applications.
 
+%package extras
+Summary: Extras packages from KDEnetwork
+Group: Applications/Internet
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+
+%description extras
+More Networking applications for the K Desktop Environment:
+ * ksirc
+ * kdict
+ * ktalkd
+ * kpf
+ * kwifimanager
+
 %prep
 %setup -q
-%patch0 -p1 -b .dt
-%patch1 -p1 -b .buildroot
+
+%patch0 -p1 -b .cvs
+%patch1 -p1 -b .dt
+%patch2 -p1 -b .buildroot
 %patch3 -p1 -b .kppp
 %patch4 -p1 -b .ppp
 
-%patch1000 -p0 -b .kde#13971
-
 echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE nowlistening\"" > kopete/plugins/nowlistening/configure.in.in
 
 %if %{make_cvs}
@@ -87,29 +92,23 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-%configure \
-   --enable-new-ldflags \
-   --disable-dependency-tracking \
-   --disable-rpath \
+%configure                        \
+   --enable-new-ldflags           \
+   --disable-dependency-tracking  \
+   --disable-rpath                \
    --enable-gcc-hidden-visibility \
 %if %{arts} == 0
-   --without-arts \
+   --without-arts                 \
 %endif
 %if %{debug} == 0
-   --disable-debug \
-   --disable-warnings \
+   --disable-debug                \
+   --disable-warnings             \
 %endif
 %if %{final}
-   --enable-final \
+   --enable-final                 \
 %endif
    --includedir=%{_includedir}/kde
 
-# ld breaks with -fPIC on ppc, workaround
-# it will be removed when this bug is fixed
-%ifarch ppc ppc64
-   perl -pi -e 's,^pic_flag=" -fPIC -DPIC",pic_flag=" -fpic",g' libtool
-%endif
-
 make %{?_smp_mflags}
 
 %install
@@ -118,15 +117,27 @@
 make install DESTDIR=%{buildroot}
 
 mkdir -p %{buildroot}/etc/pam.d
-cp %{SOURCE1} %{buildroot}/etc/pam.d/kppp
+cp -p %{SOURCE1} %{buildroot}/etc/pam.d/kppp
 
-# Make symlinks relative
-mkdir -p %{buildroot}%{_docdir}/HTML/en/common
-pushd %{buildroot}%{_docdir}/HTML/en
-for i in *; do
-   [ -d $i -a -L $i/common ] && ln -nfs ../common $i
+## File lists
+# locale's
+%find_lang %{name} || touch %{name}.lang
+# HTML (1.0)
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
+  if [ -d $lang_dir ]; then
+    lang=$(basename $lang_dir)
+    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
+    # replace absolute symlinks with relative ones
+    pushd $lang_dir
+      for i in *; do
+        [ -d $i -a -L $i/common ] && %{__rm} -f $i/common && ln -sf ../common $i/common
+      done
+    popd
+  fi
 done
-popd
+fi
 
 # Show only in KDE
 for i in fileshare kcmkrfb kcmktalkd kcmwifi krfb kppp kppplogview \
@@ -148,12 +159,12 @@
 EOF
 
 mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d
-cp %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d
+cp -p %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d
 
 # Add lisa startup script
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
-install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/lisarc
-install -m 0755 %{SOURCE5} %{buildroot}%{_sysconfdir}/rc.d/init.d/lisa
+install -p -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/lisarc
+install -p -m 0755 %{SOURCE5} %{buildroot}%{_sysconfdir}/rc.d/init.d/lisa
 
 %post
 /sbin/ldconfig
@@ -173,23 +184,148 @@
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %preun
-if [ "$1" = "0" ]; then
-    /sbin/chkconfig --del lisa ||:
-    /sbin/service lisa stop > /dev/null 2>&1 ||:
-fi
+/sbin/chkconfig --del lisa ||:
+/sbin/service lisa stop > /dev/null 2>&1 ||:
+
+
+%post extras
+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
+
+
+%postun extras
+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
+
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
+
+
+%files extras
+%defattr(-,root,root,-)
+
+# ksirc
+%doc %{_docdir}/HTML/??/ksirc/
+%{_bindir}/ksirc
+%{_libdir}/libkdeinit_ksirc.*
+%{_libdir}/kde3/ksirc.*
+%{_datadir}/applications/kde/ksirc.desktop
+%{_datadir}/apps/ksirc/
+%config(noreplace) %{_datadir}/config/ksircrc
+%{_datadir}/icons/hicolor/??x??/apps/ksirc.png
+
+# kdict
+%doc %{_docdir}/HTML/en/kdict
+%{_bindir}/kdict
+%{_libdir}/kde3/kdict*
+%{_libdir}/libkdeinit_kdict.*
+%{_datadir}/applications/kde/kdict.desktop
+%{_datadir}/apps/kdict
+%{_datadir}/apps/kicker/applets/kdictapplet.desktop
+%{_datadir}/icons/hicolor/128x128/apps/kdict.png
+%{_datadir}/icons/hicolor/??x??/apps/kdict.png
+%{_datadir}/icons/hicolor/scalable/apps/kdict.svgz
+
+# ktalk
+%doc %{_docdir}/HTML/en/ktalkd
+%{_bindir}/ktalkd*
+%{_libdir}/kde3/kcm_ktalkd.*
+%{_datadir}/applications/kde/kcmktalkd.desktop
+%config(noreplace) %{_datadir}/config/ktalkdrc
+%{_datadir}/icons/crystalsvg/128x128/apps/ktalkd.png
+%{_datadir}/icons/crystalsvg/??x??/apps/ktalkd.png
+%{_datadir}/sounds/ktalkd.wav
+%config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
+
+# kpf
+%doc %{_docdir}/HTML/en/kpf
+%{_libdir}/kde3/kpf*
+%{_datadir}/apps/kicker/applets/kpfapplet.desktop
+%{_datadir}/icons/crystalsvg/??x??/apps/kpf.png
+%{_datadir}/services/kpfpropertiesdialogplugin.desktop
+
+# kwifimanager
+%doc %{_docdir}/HTML/en/kwifimanager
+%{_bindir}/kwifimanager
+%{_libdir}/kde3/kcm_wifi.*
+%{_datadir}/applications/kde/kcmwifi.desktop
+%{_datadir}/applications/kde/kwifimanager.desktop
+%{_datadir}/apps/kwifimanager
+%{_datadir}/icons/hicolor/128x128/apps/kwifimanager.png
+%{_datadir}/icons/hicolor/??x??/apps/kwifimanager.png
+%{_datadir}/icons/hicolor/scalable/apps/kwifimanager.svgz
+
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING README
+
+
+# ksirc
+%exclude %{_bindir}/ksirc
+%exclude %{_libdir}/libkdeinit_ksirc.*
+%exclude %{_libdir}/kde3/ksirc.*
+%exclude %{_datadir}/applications/kde/ksirc.desktop
+%exclude %{_datadir}/apps/ksirc/
+%exclude %{_datadir}/config/ksircrc
+%exclude %{_docdir}/HTML/??/ksirc/
+%exclude %{_datadir}/icons/hicolor/??x??/apps/ksirc.png
+
+
+# kdict
+%exclude %{_docdir}/HTML/en/kdict
+%exclude %{_bindir}/kdict
+%exclude %{_libdir}/kde3/kdict*
+%exclude %{_libdir}/libkdeinit_kdict.*
+%exclude %{_datadir}/applications/kde/kdict.desktop
+%exclude %{_datadir}/apps/kdict
+%exclude %{_datadir}/apps/kicker/applets/kdictapplet.desktop
+%exclude %{_datadir}/icons/hicolor/128x128/apps/kdict.png
+%exclude %{_datadir}/icons/hicolor/??x??/apps/kdict.png
+%exclude %{_datadir}/icons/hicolor/scalable/apps/kdict.svgz
+
+
+# ktalk
+%exclude %{_docdir}/HTML/en/ktalkd
+%exclude %{_sysconfdir}/xinetd.d/ktalk
+%exclude %{_bindir}/ktalkd*
+%exclude %{_libdir}/kde3/kcm_ktalkd.*
+%exclude %{_datadir}/applications/kde/kcmktalkd.desktop
+%exclude %{_datadir}/config/ktalkdrc
+%exclude %{_datadir}/icons/crystalsvg/128x128/apps/ktalkd.png
+%exclude %{_datadir}/icons/crystalsvg/??x??/apps/ktalkd.png
+%exclude %{_datadir}/sounds/ktalkd.wav
+
+
+# kpf
+%exclude %{_libdir}/kde3/kpf*
+%exclude %{_datadir}/apps/kicker/applets/kpfapplet.desktop
+%exclude %{_docdir}/HTML/en/kpf
+%exclude %{_datadir}/icons/crystalsvg/??x??/apps/kpf.png
+%exclude %{_datadir}/services/kpfpropertiesdialogplugin.desktop
+
+
+# kwifimanager
+%exclude %{_bindir}/kwifimanager
+%exclude %{_libdir}/kde3/kcm_wifi.*
+%exclude %{_datadir}/applications/kde/kcmwifi.desktop
+%exclude %{_datadir}/applications/kde/kwifimanager.desktop
+%exclude %{_datadir}/apps/kwifimanager
+%exclude %{_docdir}/HTML/en/kwifimanager
+%exclude %{_datadir}/icons/hicolor/128x128/apps/kwifimanager.png
+%exclude %{_datadir}/icons/hicolor/??x??/apps/kwifimanager.png
+%exclude %{_datadir}/icons/hicolor/scalable/apps/kwifimanager.svgz
+
 %doc %{_docdir}/HTML/en/*
 %config(noreplace) /etc/security/console.apps/kppp
 %config(noreplace) /etc/pam.d/kppp
 %config(noreplace) %{_sysconfdir}/lisarc
-%config %{_sysconfdir}/rc.d/init.d/lisa
-%config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
+%config(noreplace) %{_sysconfdir}/rc.d/init.d/lisa
 %{_libdir}/*.so.*
 %{_libdir}/libkdeinit_*.so
 %ifnarch s390 s390x
@@ -203,7 +339,7 @@
 %{_datadir}/apps/*
 %{_datadir}/applications/kde/*
 %{_datadir}/applnk/.hidden/*
-%{_datadir}/config/*
+%config(noreplace) %{_datadir}/config/*
 %{_datadir}/config.kcfg/*
 %{_datadir}/icons/*/*/*/*
 %{_datadir}/mimelnk/*
@@ -211,6 +347,7 @@
 %{_datadir}/servicetypes/*
 %{_datadir}/sounds/*
 
+
 %files devel
 %defattr(-,root,root)
 %{_includedir}/kde/*
@@ -221,13 +358,29 @@
 %endif
 
 %changelog
+* Thu Apr 12 2007 Than Ngo <than at redhat.com> - 7:3.5.6-3.fc7
+- cleanup
+- apply CVS upstream patches
+
 * Mon Apr 02 2007 Than Ngo <than at redhat.com> - 7:3.5.6-2.fc7
 - catch the empty ICQ UIN case when creating an account, which
   would crash Kopete, kde#139719
 
-* Thu Feb 08 2007 Than Ngo <than at redhat.com> 7:3.5.6-1.fc7
+* Thu Feb 08 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 7:3.5.5-0.3
+- dropped autoconf, gcc-c++, glibc-devel as BR
+- split ksirc, ktalkd and kdict as a separate package kdenetwork-extras
+- dropped requires:  kdelibs >= %%{kdelibs_epoch}:%%{version} already required by kdebase
+- added timestamps wherever possible
+
+* Wed Jan 31 2007 Than Ngo <than at redhat.com> 7:3.5.6-0.1.fc6
 - 3.5.6
 
+* Fri Nov 10 2006 Than Ngo <than at redhat.com> 7:3.5.5-0.2.fc6
+- add missing nowlistening plugins
+
+* Thu Oct 26 2006 Than Ngo <than at redhat.com> 7:3.5.5-0.1
+- 3.5.5
+
 * Tue Sep 19 2006 Than Ngo <than at redhat.com> 7:3.5.4-5
 - apply upstream patches
     fix #133995, emoticon parsing if there are sub-emoticons
@@ -270,7 +423,7 @@
 * Mon Jun 05 2006 Than Ngo <than at redhat.com> 7:3.5.3-1
 - update to 3.5.3
 
-* Tue May 16 2006 Than Ngo <than at redhat.com> 7:3.5.2-2 
+* Tue May 16 2006 Than Ngo <than at redhat.com> 7:3.5.2-2
 - rebuilt againts new qt to fix multilib problem
 
 * Thu Apr 06 2006 Than Ngo <than at redhat.com> 7:3.5.2-0.1.fc5
@@ -282,7 +435,7 @@
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 7:3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Sun Feb 05 2006 Than Ngo <than at redhat.com> 7:3.5.1-1 
+* Sun Feb 05 2006 Than Ngo <than at redhat.com> 7:3.5.1-1
 - 3.5.1
 
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
@@ -291,7 +444,7 @@
 * Wed Nov 30 2005 Than Ngo <than at redhat.com> 7:3.5.0-1
 - 3.5
 
-* Wed Nov 09 2005 Than Ngo <than at redhat.com> 7:3.4.92-3 
+* Wed Nov 09 2005 Than Ngo <than at redhat.com> 7:3.4.92-3
 - get rid of XFree86-devel requires
 - fix gcc4 compilation
 
@@ -382,7 +535,7 @@
 * Sat Aug 07 2004 Than Ngo <than at redhat.com> 7:3.2.92-1
 - update to 3.3 Beta 2
 
-* Thu Jul 01 2004 Than Ngo <than at redhat.com> 7:3.2.3-2 
+* Thu Jul 01 2004 Than Ngo <than at redhat.com> 7:3.2.3-2
 - add buildRequire on wireless-tools, xmms-devel (bug #124712)
 - add sub package nowlistening to get rid of xmms dependency (bug #115067)
 - fix resolv.conf problem (bug #125601, #125442)
@@ -394,7 +547,7 @@
 - 3.2.2 release
 
 * Fri Apr 02 2004 Than Ngo <than at redhat.com> 7:3.2.1-5.1
-- fix missing soname, bug #119739 
+- fix missing soname, bug #119739
 
 * Thu Apr 01 2004 Than Ngo <than at redhat.com> 3.2.1-5
 - fix kget issue, bug #117395
@@ -402,10 +555,10 @@
 * Mon Mar 29 2004 Than Ngo <than at redhat.com> 3.2.1-4
 - cleanup KDE/GNOME menus
 
-* Fri Mar 19 2004 Karsten Hopp <karsten at redhat.de> 3.2.1-3 
+* Fri Mar 19 2004 Karsten Hopp <karsten at redhat.de> 3.2.1-3
 - move Obsoletes: kmail to kdepim package.
 
-* Sun Mar 14 2004 Karsten Hopp <karsten at redhat.de> 3.2.1-2 
+* Sun Mar 14 2004 Karsten Hopp <karsten at redhat.de> 3.2.1-2
 - remove kmail virtual package, its in kdepim now
 
 * Sun Mar 07 2004 Than Ngo <than at redhat.com> 7:3.2.1-1
@@ -423,7 +576,7 @@
 * Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
 - rebuilt
 
-* Sat Feb 07 2004 Than Ngo <than at redhat.com> 3.2.0-0.3 
+* Sat Feb 07 2004 Than Ngo <than at redhat.com> 3.2.0-0.3
 - 3.2.0 release
 - built against qt-3.3.0
 
@@ -472,7 +625,7 @@
 - 3.1.1
 
 * Fri Mar 7 2003 Dan Walsh <dwalsh at redhat.com> 3.1-8
-- bump release number 
+- bump release number
 
 * Thu Mar  6 2003 Than Ngo <than at redhat.com> 3.1-7
 - la file issue, bug #85727
@@ -497,7 +650,7 @@
 * Tue Jan 28 2003 Than Ngo <than at redhat.com> 3.1-1
 - 3.1 release
 - remove some unneeded macros
- 
+
 * Thu Jan 23 2003 Tim Powers <timp at redhat.com> 7:3.1-0.10
 - rebuild
 
@@ -651,7 +804,7 @@
 - Add missing PAM file, fix group
 
 * Wed Nov 15 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- update to HEAD 
+- update to HEAD
 
 * Fri Nov  3 2000 Bernhard Rosenkraenzer <bero at redhat.com>
 - Update CVS (fix kmail segfault with empty identity)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	7 Feb 2007 23:23:24 -0000	1.44
+++ sources	12 Apr 2007 12:36:44 -0000	1.45
@@ -1 +1,2 @@
 0f428cccc4ea16aa53c427530874c591  kdenetwork-3.5.6.tar.bz2
+2f935be73dd84f3e2f5dd5a2b03dba50  kdenetwork-3.5.6-cvs-12042007.patch.bz2


--- kdenetwork-3.5.6-kde#139719.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 12 12:51:27 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 08:51:27 -0400
Subject: rpms/flac/devel flac-1.1.4-hide-byteswap.patch, NONE, 1.1 flac.spec,
	1.27, 1.28
Message-ID: <200704121251.l3CCpR9H005171@cvs.devel.redhat.com>

Author: bnocera

Update of /cvs/dist/rpms/flac/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4961

Modified Files:
	flac.spec 
Added Files:
	flac-1.1.4-hide-byteswap.patch 
Log Message:
* Thu Apr 12 2007 - Bastien Nocera <bnocera at redhat.com> - 1.1.4-4
- The byteSwap symbol shouldn't be global, reported by Joe Orton
  <jorton at redhat.com> (#215920)


flac-1.1.4-hide-byteswap.patch:
 md5.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE flac-1.1.4-hide-byteswap.patch ---
--- flac-1.1.4/src/libFLAC/md5.c	2006-11-11 22:56:47.000000000 +0000
+++ flac-1.1.4.new/src/libFLAC/md5.c	2007-04-12 13:41:01.000000000 +0100
@@ -143,6 +143,7 @@ FLAC__MD5Transform(FLAC__uint32 buf[4], 
 
 #endif
 
+static
 FLaC__INLINE
 void
 byteSwap(FLAC__uint32 *buf, unsigned words)


Index: flac.spec
===================================================================
RCS file: /cvs/dist/rpms/flac/devel/flac.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- flac.spec	14 Feb 2007 12:34:40 -0000	1.27
+++ flac.spec	12 Apr 2007 12:51:25 -0000	1.28
@@ -1,10 +1,11 @@
 Summary: An encoder/decoder for the Free Lossless Audio Codec
 Name: flac
 Version: 1.1.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPL/GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/flac/flac-%{version}.tar.gz
+Patch2: flac-1.1.4-hide-byteswap.patch
 Patch3: flac-1.1.3-gnu-stack.patch
 Patch4: flac-1.1.3-noxmms.patch
 Patch5: flac-1.1.4-link-ogg.patch
@@ -35,6 +36,7 @@
 
 %prep
 %setup -q
+%patch2 -p1 -b .extra-sym
 %patch3 -p1 -b .gnu-stack
 %patch4 -p1 -b .noxmms
 %patch5 -p1 -b .link-ogg
@@ -78,6 +80,10 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Apr 12 2007 - Bastien Nocera <bnocera at redhat.com> - 1.1.4-4
+- The byteSwap symbol shouldn't be global, reported by Joe Orton
+  <jorton at redhat.com> (#215920)
+
 * Wed Feb 14 2007 - Bastien Nocera <bnocera at redhat.com> - 1.1.4-3
 - Also include the new pkgconfig files
 



From fedora-cvs-commits at redhat.com  Thu Apr 12 13:37:56 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 09:37:56 -0400
Subject: rpms/vorbis-tools/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 vorbis-tools.spec, 1.24, 1.25
Message-ID: <200704121337.l3CDbup8032438@cvs.devel.redhat.com>

Author: bnocera

Update of /cvs/dist/rpms/vorbis-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32422

Modified Files:
	.cvsignore sources vorbis-tools.spec 
Log Message:
* Thu Apr 12 2007 - Bastien Nocera <bnocera at redhat.com> - 1.1.1.svn20070412-1.fc7
- Upgrade to a current SVN snapshot of vorbis-tools to get our FLAC support
  back, after the recent libFLAC upgrade (#229124)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/vorbis-tools/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Nov 2005 21:29:14 -0000	1.5
+++ .cvsignore	12 Apr 2007 13:37:53 -0000	1.6
@@ -1,2 +1 @@
-vorbis-tools-1.0.1.tar.gz
-vorbis-tools-1.1.1.tar.gz
+vorbis-tools-1.1.1.svn20070412.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/vorbis-tools/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Nov 2005 21:29:14 -0000	1.5
+++ sources	12 Apr 2007 13:37:54 -0000	1.6
@@ -1 +1 @@
-47845fd76f5f2354a3619c4097575487  vorbis-tools-1.1.1.tar.gz
+2f5a369c3af63a1e62272ff2d40de9bb  vorbis-tools-1.1.1.svn20070412.tar.gz


Index: vorbis-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/vorbis-tools/devel/vorbis-tools.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- vorbis-tools.spec	19 Feb 2007 13:50:02 -0000	1.24
+++ vorbis-tools.spec	12 Apr 2007 13:37:54 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: The Vorbis General Audio Compression Codec tools.
 Name:		vorbis-tools
-Version:	1.1.1
-Release:	5%{?dist}
+Version:	1.1.1.svn20070412
+Release:	1%{?dist}
 Epoch:		1
 Group: Applications/Multimedia
 License:	GPL
@@ -65,6 +65,10 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Apr 12 2007 - Bastien Nocera <bnocera at redhat.com> - 1.1.1.svn20070412-1.fc7
+- Upgrade to a current SVN snapshot of vorbis-tools to get our FLAC support
+  back, after the recent libFLAC upgrade (#229124)
+
 * Wed Feb 14 2007 Karsten Hopp <karsten at redhat.com> 1.1.1-5
 - rebuild with libFLAC.so.8, link with libogg instead of libOggFLAC
 



From fedora-cvs-commits at redhat.com  Thu Apr 12 13:38:24 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 09:38:24 -0400
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.94,1.95
Message-ID: <200704121338.l3CDcOqX032507@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdenetwork.spec 
Log Message:
fix rpm file list on s390



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- kdenetwork.spec	12 Apr 2007 12:36:44 -0000	1.94
+++ kdenetwork.spec	12 Apr 2007 13:38:22 -0000	1.95
@@ -249,6 +249,7 @@
 %{_datadir}/icons/crystalsvg/??x??/apps/kpf.png
 %{_datadir}/services/kpfpropertiesdialogplugin.desktop
 
+%ifnarch s390 s390x
 # kwifimanager
 %doc %{_docdir}/HTML/en/kwifimanager
 %{_bindir}/kwifimanager
@@ -259,7 +260,7 @@
 %{_datadir}/icons/hicolor/128x128/apps/kwifimanager.png
 %{_datadir}/icons/hicolor/??x??/apps/kwifimanager.png
 %{_datadir}/icons/hicolor/scalable/apps/kwifimanager.svgz
-
+%endif
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -309,7 +310,7 @@
 %exclude %{_datadir}/icons/crystalsvg/??x??/apps/kpf.png
 %exclude %{_datadir}/services/kpfpropertiesdialogplugin.desktop
 
-
+%ifnarch s390 s390x
 # kwifimanager
 %exclude %{_bindir}/kwifimanager
 %exclude %{_libdir}/kde3/kcm_wifi.*
@@ -320,6 +321,7 @@
 %exclude %{_datadir}/icons/hicolor/128x128/apps/kwifimanager.png
 %exclude %{_datadir}/icons/hicolor/??x??/apps/kwifimanager.png
 %exclude %{_datadir}/icons/hicolor/scalable/apps/kwifimanager.svgz
+%endif
 
 %doc %{_docdir}/HTML/en/*
 %config(noreplace) /etc/security/console.apps/kppp



From fedora-cvs-commits at redhat.com  Thu Apr 12 13:43:03 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 09:43:03 -0400
Subject: rpms/vorbis-tools/devel vorbis-tools.spec, 1.25,
	1.26 vorbis-tools-1.1.1-conversion.patch, 1.1, NONE
Message-ID: <200704121343.l3CDh37p032686@cvs.devel.redhat.com>

Author: bnocera

Update of /cvs/dist/rpms/vorbis-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32671

Modified Files:
	vorbis-tools.spec 
Removed Files:
	vorbis-tools-1.1.1-conversion.patch 
Log Message:
- remove obsolete UTF8 patch



Index: vorbis-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/vorbis-tools/devel/vorbis-tools.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- vorbis-tools.spec	12 Apr 2007 13:37:54 -0000	1.25
+++ vorbis-tools.spec	12 Apr 2007 13:43:00 -0000	1.26
@@ -9,7 +9,6 @@
 Source:		http://www.xiph.org/ogg/vorbis/download/%{name}-%{version}.tar.gz
 Patch0:		vorbis-tools-1.0-build.patch
 Patch1:		vorbis-tools-1.0-curlconfig.patch
-Patch2:		vorbis-tools-1.1.1-conversion.patch
 Patch3:		vorbis-tools-1.1.1-curlopt-mute.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Requires:	libogg >= 2:1.1
@@ -37,7 +36,6 @@
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1 -b .conversion
 %patch3 -p1 -b .curlopt-mute
 
 %build
@@ -68,6 +66,7 @@
 * Thu Apr 12 2007 - Bastien Nocera <bnocera at redhat.com> - 1.1.1.svn20070412-1.fc7
 - Upgrade to a current SVN snapshot of vorbis-tools to get our FLAC support
   back, after the recent libFLAC upgrade (#229124)
+- Remove obsolete UTF8 patch
 
 * Wed Feb 14 2007 Karsten Hopp <karsten at redhat.com> 1.1.1-5
 - rebuild with libFLAC.so.8, link with libogg instead of libOggFLAC


--- vorbis-tools-1.1.1-conversion.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 12 13:49:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 09:49:36 -0400
Subject: rpms/vorbis-tools/devel vorbis-tools.spec, 1.26,
	1.27 vorbis-tools-1.1.1-curlopt-mute.patch, 1.1, NONE
Message-ID: <200704121349.l3CDnae6000358@cvs.devel.redhat.com>

Author: bnocera

Update of /cvs/dist/rpms/vorbis-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv342

Modified Files:
	vorbis-tools.spec 
Removed Files:
	vorbis-tools-1.1.1-curlopt-mute.patch 
Log Message:
- remove obsolete curl mute patch



Index: vorbis-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/vorbis-tools/devel/vorbis-tools.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- vorbis-tools.spec	12 Apr 2007 13:43:00 -0000	1.26
+++ vorbis-tools.spec	12 Apr 2007 13:49:33 -0000	1.27
@@ -9,7 +9,6 @@
 Source:		http://www.xiph.org/ogg/vorbis/download/%{name}-%{version}.tar.gz
 Patch0:		vorbis-tools-1.0-build.patch
 Patch1:		vorbis-tools-1.0-curlconfig.patch
-Patch3:		vorbis-tools-1.1.1-curlopt-mute.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Requires:	libogg >= 2:1.1
 Requires:	libvorbis >= 1:%{version} 
@@ -36,7 +35,6 @@
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch3 -p1 -b .curlopt-mute
 
 %build
 perl -p -i -e "s/-O20/$RPM_OPT_FLAGS/" configure
@@ -66,7 +64,7 @@
 * Thu Apr 12 2007 - Bastien Nocera <bnocera at redhat.com> - 1.1.1.svn20070412-1.fc7
 - Upgrade to a current SVN snapshot of vorbis-tools to get our FLAC support
   back, after the recent libFLAC upgrade (#229124)
-- Remove obsolete UTF8 patch
+- Remove obsolete UTF8 and Curl mute patches
 
 * Wed Feb 14 2007 Karsten Hopp <karsten at redhat.com> 1.1.1-5
 - rebuild with libFLAC.so.8, link with libogg instead of libOggFLAC


--- vorbis-tools-1.1.1-curlopt-mute.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 12 14:09:06 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 10:09:06 -0400
Subject: rpms/gimp-help/devel .cvsignore, 1.8, 1.9 gimp-help.spec, 1.11,
	1.12 sources, 1.8, 1.9
Message-ID: <200704121409.l3CE96Cd000783@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore gimp-help.spec sources 
Log Message:
version 2-0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gimp-help/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	4 Jan 2007 19:23:34 -0000	1.8
+++ .cvsignore	12 Apr 2007 14:09:03 -0000	1.9
@@ -1 +1 @@
-gimp-help-2-0.11.tar.gz
+gimp-help-2-0.12.tar.gz


Index: gimp-help.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp-help/devel/gimp-help.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gimp-help.spec	4 Jan 2007 19:23:34 -0000	1.11
+++ gimp-help.spec	12 Apr 2007 14:09:03 -0000	1.12
@@ -1,4 +1,4 @@
-%define gimphelpver 2-0.11
+%define gimphelpver 2-0.12
 %define gimpsubver 2.0
 
 Summary: Help files for the GIMP.
@@ -40,6 +40,9 @@
 %{_datadir}/gimp/%{gimpsubver}/help
 
 %changelog
+* Thu Apr 12 2007 Nils Philippsen <nphilipp at redhat.com> - 2-0.1.0.12
+- version 2-0.12
+
 * Thu Jan 04 2007 Nils Philippsen <nphilipp at redhat.com> - 2-0.1.0.11
 - version 2-0.11
 - add disttag


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gimp-help/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	4 Jan 2007 19:23:34 -0000	1.8
+++ sources	12 Apr 2007 14:09:03 -0000	1.9
@@ -1 +1 @@
-1becf4914fe51d8f0ce4142202c8cb92  gimp-help-2-0.11.tar.gz
+fc1e2153eafa04fa701b23818029c3e1  gimp-help-2-0.12.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 12 14:36:00 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 10:36:00 -0400
Subject: rpms/sendmail/devel sendmail-etc-mail-access, NONE,
	1.1 sendmail-etc-mail-domaintable, NONE,
	1.1 sendmail-etc-mail-local-host-names, NONE,
	1.1 sendmail-etc-mail-mailertable, NONE,
	1.1 sendmail-etc-mail-trusted-users, NONE,
	1.1 sendmail-etc-mail-virtusertable, NONE, 1.1 .cvsignore,
	1.20, 1.21 sendmail.spec, 1.78, 1.79 sources, 1.20, 1.21
Message-ID: <200704121436.l3CEa05o017893@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/sendmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17766

Modified Files:
	.cvsignore sendmail.spec sources 
Added Files:
	sendmail-etc-mail-access sendmail-etc-mail-domaintable 
	sendmail-etc-mail-local-host-names 
	sendmail-etc-mail-mailertable sendmail-etc-mail-trusted-users 
	sendmail-etc-mail-virtusertable 
Log Message:
[tw]
- new version 8.14.1
- spec file cleanup for merge review (rhbz#226407)
- dropped update support for sendmail versions prior to 8.12.0
- using pdf documentation




--- NEW FILE sendmail-etc-mail-access ---
# Check the /usr/share/doc/sendmail/README.cf file for a description
# of the format of this file. (search for access_db in that file)
# The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
# package.
#
# by default we allow relaying from localhost...
Connect:localhost.localdomain		RELAY
Connect:localhost			RELAY
Connect:127.0.0.1			RELAY



--- NEW FILE sendmail-etc-mail-domaintable ---
# The "domain table" can be used to provide domain name mapping.
# Use of this should really be limited to your own domains.
# It may be useful if you change names (e.g., your company
# changes names from oldname.com to newname.com)


--- NEW FILE sendmail-etc-mail-local-host-names ---
# local-host-names - include all aliases for your machine here.


--- NEW FILE sendmail-etc-mail-mailertable ---
# The "mailer table" can be used to override routing for particular domains
# (which are not in class {w}, i.e. local host names).
#
# hash /etc/mail/mailertable
#
# Keys in this database are fully qualified domain names or partial domains
# preceded by a dot -- for example, "vangogh.CS.Berkeley.EDU" or
# ".CS.Berkeley.EDU". As a special case of the latter, "." matches any domain
# not covered by other keys. Values must be of the form:
#
# mailer:domain
#
# where "mailer" is the internal mailer name, and "domain" is where to send
# the message. These maps are not reflected into the message header. As a
# special case, the forms:
#
# local:user
#
# will forward to the indicated user using the local mailer,
#
# local:
#
# will forward to the original user in the e-mail address using the local
# mailer, and
#
# error:code message
# error:D.S.N:code message
#
# will give an error message with the indicated SMTP reply code and message,
# where D.S.N is an RFC 1893 compliant error code. 


--- NEW FILE sendmail-etc-mail-trusted-users ---
# trusted-users - users that can send mail as others without a warning
# apache, mailman, majordomo, uucp, are good candidates


--- NEW FILE sendmail-etc-mail-virtusertable ---
# A domain-specific form of aliasing, allowing multiple virtual domains to be
# hosted on one machine.
#
# info at foo.com	foo-info
# info at bar.com	bar-info
# joe at bar.com	error:nouser 550 No such user here
# jax at bar.com	error:5.7.0:550 Address invalid
# @baz.org	jane at example.net
#
# then mail addressed to info at foo.com will be sent to the address foo-info,
# mail addressed to info at bar.com will be delivered to bar-info, and mail
# addressed to anyone at baz.org  will be sent to jane at example.net, mail to
# joe at bar.com will be rejected with the specified error message, and mail to
# jax at bar.com will also have a RFC 1893  compliant error code 5.7.0.
#
# The username from the original address is passed as %1 allowing:
#
# @foo.org	%1 at example.com
#
# Additionally, if the local part consists of "user+detail" then "detail" is
# passed as %2 and "+detail" is passed as %3  when a match against user+* is
# attempted, so entries like
#
# old+*@foo.org	new+%2 at example.com
# gen+*@foo.org	%2 at example.com
# +*@foo.org	%1%3 at example.com
# X++ at foo.org	Z%3 at example.com
# @bar.org	%1%3
#
# Note: to preserve "+detail" for a default case (@domain) %1%3 must be used
# as RHS. There are two wildcards after "+": "+" matches only a non-empty
# detail, "*" matches also empty details, e.g., user+ at foo.org  matches#
# +*@foo.org but not ++ at foo.org. This can be used to ensure that the
# parameters %2 and %3 are not empty.
#
# All the host names on the left hand side (foo.com, bar.com, and baz.org)
# must be in class {w} or class {VirtHost}. The latter can be defined by the
# macros VIRTUSER_DOMAIN or VIRTUSER_DOMAIN_FILE (analogously to
# MASQUERADE_DOMAIN and MASQUERADE_DOMAIN_FILE). If VIRTUSER_DOMAIN or
# VIRTUSER_DOMAIN_FILE is used, then the entries of class {VirtHost} are
# added to class {R}, i.e., relaying is allowed to (and from) those domains.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sendmail/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	6 Feb 2007 16:15:48 -0000	1.20
+++ .cvsignore	12 Apr 2007 14:35:58 -0000	1.21
@@ -7,3 +7,4 @@
 sendmail.8.13.7.tar.gz
 sendmail.8.13.8.tar.gz
 sendmail.8.14.0.tar.gz
+sendmail.8.14.1.tar.gz


Index: sendmail.spec
===================================================================
RCS file: /cvs/dist/rpms/sendmail/devel/sendmail.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- sendmail.spec	6 Feb 2007 16:15:48 -0000	1.78
+++ sendmail.spec	12 Apr 2007 14:35:58 -0000	1.79
@@ -1,32 +1,28 @@
 ##   package options
-%define       with_fsl      no
-%define       with_tls      yes
-%define       with_sasl1    no
-%define       with_sasl2    yes
-%define       with_milter   yes
-%define       with_ldap     yes
-%define       with_mysql    no
+%define with_tls      yes
+%define with_sasl1    no
+%define with_sasl2    yes
+%define with_milter   yes
+%define with_ldap     yes
+%define with_mysql    no
+%define enable_pie    yes
 
-%define       enable_pie    yes
-%define       old_setup     no
-
-%define sendmailcf /usr/share/sendmail-cf
+%define sendmailcf %{_datadir}/sendmail-cf
 %define stdir /var/log/mail
 %define smshell /sbin/nologin
-%define initdir /etc/rc.d/init.d
+%define spooldir /var/spool
+%define maildir %{_sysconfdir}/mail
 
-Summary: A widely used Mail Transport Agent (MTA).
+Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
-Version: 8.14.0
+Version: 8.14.1
 Release: 1
 License: Sendmail
 Group: System Environment/Daemons
-Provides: smtpdaemon
+URL: http://www.sendmail.org/
+Provides: MTA smtpdaemon
 Source0: ftp://ftp.sendmail.org/pub/sendmail/sendmail.%{version}.tar.gz
 Source1: sendmail.init
-%if "%{old_setup}" == "yes"
-Source3: aliases
-%endif
 Source4: sendmail.sysconfig
 Source5: sendmail.etc-mail-Makefile
 Source6: sendmail-redhat.mc
@@ -34,6 +30,12 @@
 Source8: sendmail.pam
 Source9: sendmail-8.12.5-newconfig.readme
 Source11: Sendmail-sasl2.conf
+Source12: sendmail-etc-mail-access
+Source13: sendmail-etc-mail-domaintable
+Source14: sendmail-etc-mail-local-host-names
+Source15: sendmail-etc-mail-mailertable
+Source16: sendmail-etc-mail-trusted-users
+Source17: sendmail-etc-mail-virtusertable
 Patch3: sendmail-8.14.0-makemapman.patch
 Patch4: sendmail-8.13.2-smrsh-paths.patch
 Patch5: sendmail-8.12.2-movefiles.patch
@@ -44,45 +46,41 @@
 Patch12: sendmail-8.13.0-cyrus.patch
 Patch13: sendmail-8.13.7-aliases_dir.patch
 Patch14: sendmail-8.13.7-vacation.patch
-Patch15: sendmail-8.13.8-noversion.patch
-Buildroot: %{_tmppath}/%{name}-root
+Patch15: sendmail-8.14.1-noversion.patch
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tcp_wrappers-devel
 BuildRequires: db4-devel
 BuildRequires: hesiod-devel
 BuildRequires: groff
+BuildRequires: ghostscript
 BuildRequires: m4
-PreReq: /usr/sbin/alternatives
+PreReq: %{_sbindir}/alternatives
 Provides: %{_sbindir}/sendmail %{_bindir}/mailq %{_bindir}/newaliases
-Provides: %{_bindir}/rmail %{_mandir}/man1/mailq.1.gz
-Provides: %{_mandir}/man1/newaliases.1.gz %{_mandir}/man5/aliases.5.gz
+Provides: %{_bindir}/rmail /usr/lib/sendmail
+Provides: %{_sysconfdir}/pam.d/smtp
+Provides: %{_mandir}/man1/mailq.1.gz %{_mandir}/man1/newaliases.1.gz
+Provides: %{_mandir}/man5/aliases.5.gz %{_mandir}/man8/sendmail.8.gz
 PreReq: chkconfig >= 1.3
-PreReq: /usr/sbin/useradd /bin/mktemp fileutils gawk sed sh-utils
+PreReq: %{_sbindir}/useradd sed coreutils
 Requires: procmail
 Requires: bash >= 2.0
-%if "%{old_setup}" != "yes"
 Requires: setup >= 2.5.31-1
 BuildRequires: setup >= 2.5.31-1
-#Requires: /etc/aliases
-%endif
-%if "%{with_fsl}" == "yes"
-BuildRequires:  fsl >= 1.2.0
-PreReq:       fsl >= 1.2.0
-%endif
 %if "%{with_tls}" == "yes"
-BuildRequires:  openssl-devel
-PreReq:       openssl
+BuildRequires: openssl-devel
+Requires: openssl
 %endif
 %if "%{with_sasl1}" == "yes" || "%{with_sasl2}" == "yes"
-BuildRequires:  cyrus-sasl-devel, openssl-devel
-PreReq:       /usr/sbin/saslauthd, openssl
+BuildRequires: cyrus-sasl-devel openssl-devel
+Requires: %{_sbindir}/saslauthd openssl
 %endif
 %if "%{with_ldap}" == "yes"
-BuildRequires:  openldap-devel, openssl-devel
-PreReq:       openldap, openssl
+BuildRequires: openldap-devel openssl-devel
+Requires: openldap openssl
 %endif
 %if "%{with_mysql}" == "yes"
-BuildRequires:  mysql-devel
-PreReq:       mysql
+BuildRequires: mysql-devel
+Requires: mysql
 %endif
 
 
@@ -98,7 +96,7 @@
 Sendmail, you can install the sendmail-doc package.
 
 %package doc
-Summary: Documentation about the Sendmail Mail Transport Agent program.
+Summary: Documentation about the Sendmail Mail Transport Agent program
 Group: Documentation
 Requires: sendmail = %{version}-%{release}
 
@@ -109,8 +107,8 @@
 provided in PostScript(TM) and troff formats.
 
 %package devel
-Summary: Extra development include files and development files.
-Group: System Environment/Daemons
+Summary: Extra development include files and development files
+Group: Development/Libraries
 Requires: sendmail = %{version}-%{release}
 
 %description devel
@@ -118,7 +116,7 @@
 of sendmail.
 
 %package cf
-Summary: The files needed to reconfigure Sendmail.
+Summary: The files needed to reconfigure Sendmail
 Group: System Environment/Daemons
 Requires: sendmail = %{version}-%{release}
 Requires: m4
@@ -142,14 +140,14 @@
 %patch12 -p1 -b .cyrus
 %patch13 -p1 -b .aliases_dir
 %patch14 -p1 -b .vacation
-%patch15 -p1
+%patch15 -p1 -b .noversion
 
 %build
 # generate redhat config file
 cat > redhat.config.m4 << EOF
 define(\`confMAPDEF', \`-DNEWDB -DNIS -DHESIOD -DMAP_REGEX -DSOCKETMAP -DNAMED_BIND=1')
 define(\`confOPTIMIZE', \`\`\`${RPM_OPT_FLAGS}''')
-define(\`confENVDEF', \`-I/usr/include/db4 -I/usr/kerberos/include -Wall -DXDEBUG=0 -DTCPWRAPPERS -DNETINET6 -DHES_GETMAILHOST -DUSE_VENDOR_CF_PATH=1 -D_FFR_WORKAROUND_BROKEN_NAMESERVERS -D_FFR_SMTP_SSL -D_FFR_TLS_1')
+define(\`confENVDEF', \`-I%{_includedir}/db4 -I/usr/kerberos/include -Wall -DXDEBUG=0 -DTCPWRAPPERS -DNETINET6 -DHES_GETMAILHOST -DUSE_VENDOR_CF_PATH=1 -D_FFR_TLS_1')
 define(\`confLIBDIRS', \`-L/usr/kerberos/%{_lib}')
 define(\`confLIBS', \`-lnsl -lwrap -lhesiod -lcrypt -ldb')
 define(\`confMANOWN', \`root')
@@ -163,11 +161,6 @@
 define(\`confLIBSEARCH', \`db resolv 44bsd')
 EOF
 
-# block mail from http proxies
-#cat >> redhat.config.m4 << EOF
-#APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_BLOCK_PROXIES')
-#EOF
-
 %ifarch ppc ppc64 s390x
 cat >> redhat.config.m4 << EOF
 APPENDDEF(\`confOPTIMIZE', \`-DSM_CONF_SHM=0')
@@ -195,7 +188,7 @@
 
 %if "%{with_sasl1}" == "yes"
 cat >> redhat.config.m4 << EOF
-APPENDDEF(\`confENVDEF', \`-DSASL=1 -D_FFR_UNSAFE_SASL')dnl
+APPENDDEF(\`confENVDEF', \`-DSASL=1')dnl
 APPENDDEF(\`confLIBS', \`-lsasl -lcrypto')dnl
 EOF
 %endif
@@ -210,7 +203,6 @@
 %if "%{with_milter}" == "yes"
 cat >> redhat.config.m4 << EOF
 APPENDDEF(\`conf_sendmail_ENVDEF', \`-DMILTER')dnl
-APPENDDEF(\`conf_libmilter_ENVDEF', \`-D_FFR_MILTER_ROOT_UNSAFE')dnl
 EOF
 %endif
 
@@ -241,24 +233,32 @@
 	popd
 done
 
+make -C doc/op op.pdf
+
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-cd $RPM_BUILD_ROOT
-mkdir -p etc/sysconfig .%{initdir} etc/pam.d
-mkdir -p usr/bin usr/include/libmilter usr/%{_lib} usr/lib
-mkdir -p .%{_mandir}/man{1,5,8}
-mkdir -p usr/sbin var/log var/spool .%{sendmailcf}
-cd -
+for d in %{_bindir} %{_sbindir} %{_includedir}/libmilter \
+	%{_libdir} %{_mandir}/man{1,5,8} %{maildir} %{stdir} %{spooldir} \
+	%{_docdir}/sendmail-%{version} %{sendmailcf} %{_sysconfdir}/smrsh\
+	%{spooldir}/clientmqueue %{_sysconfdir}/sysconfig %{_initrddir} \
+	%{_sysconfdir}/pam.d;
+do
+	install -m 755 -d %{buildroot}$d
+done
+install -m 700 -d %{buildroot}%{spooldir}/mqueue
+
+# create /usr/lib for 64 bit architectures
+%if "%{_libdir}" != "/usr/lib"
+install -m 755 -d %{buildroot}/usr/lib
+%endif
 
-OBJDIR=obj.$(uname -s).$(uname -r).$(arch)
 nameuser=`id -nu`
 namegroup=`id -ng`
 
 Make() {
 	make $@ \
-		DESTDIR=$RPM_BUILD_ROOT \
+		DESTDIR=%{buildroot} \
 		MANROOT=%{_mandir}/man \
 		SBINOWN=${nameuser} SBINGRP=${namegroup} \
 		UBINOWN=${nameuser} UBINGRP=${namegroup} \
@@ -270,6 +270,8 @@
 		MSPQOWN=${nameuser} 
 }
 
+OBJDIR=obj.$(uname -s).$(uname -r).$(arch)
+
 Make install -C $OBJDIR/libmilter
 Make install -C $OBJDIR/libsmutil
 Make install -C $OBJDIR/sendmail
@@ -279,185 +281,138 @@
 Make install -C $OBJDIR/smrsh
 Make install -C $OBJDIR/makemap
 
-touch $RPM_BUILD_ROOT/rootfile
-root=..
-while [ ! -r $RPM_BUILD_ROOT/%{_bindir}/${root}/rootfile ] ; do
-	root=${root}/..
-done
-ln -sf ${root}%{_sbindir}/makemap $RPM_BUILD_ROOT/%{_bindir}/makemap
-
-# Install docs by hand for the sendmail-doc package.
-DOC=$RPM_BUILD_ROOT%{_docdir}/sendmail
-mkdir -p $DOC
-cp -ar FAQ LICENSE KNOWNBUGS README RELEASE_NOTES doc $DOC
-cp sendmail/README   $DOC/README.sendmail
-cp sendmail/SECURITY $DOC/SECURITY
-cp smrsh/README      $DOC/README.smrsh
-cp libmilter/README  $DOC/README.libmilter
-cp cf/README         $DOC/README.cf
-cp %{SOURCE9}        $DOC/README.redhat
+# install libraries
+install -m 644  $OBJDIR/libmilter/libmilter.a %{buildroot}%{_libdir}
+install -m 644  $OBJDIR/libsmutil/libsmutil.a %{buildroot}%{_libdir}
+install -m 644  $OBJDIR/libsm/libsm.a         %{buildroot}%{_libdir}
+
+%if "%{_lib}" == "lib64"
+# libmilter.a is 64 bit, not usable in /usr/lib for 32 bit build
+rm -fr %{buildroot}/usr/lib/libmilter.a
+%endif
 
-# Install the cf files for the sendmail-cf package.
-cp -ar cf/* $RPM_BUILD_ROOT%{sendmailcf}
-# remove patch backup files
-rm -rf $RPM_BUILD_ROOT%{sendmailcf}/cf/Build.*
-rm -rf $RPM_BUILD_ROOT%{sendmailcf}/*/*.mc.*
-rm -rf $RPM_BUILD_ROOT%{sendmailcf}/*/*.m4.*
+# replace absolute with relative symlinks
+ln -sf ../sbin/makemap %{buildroot}%{_bindir}/makemap
+for f in hoststat mailq newaliases purgestat ; do
+    ln -sf ../sbin/sendmail.sendmail %{buildroot}%{_bindir}/${f}
+done
 
-install -d -m755 $RPM_BUILD_ROOT/etc/mail
+# use /usr/lib, even for 64 bit architectures
+ln -sf ../sbin/sendmail.sendmail %{buildroot}/usr/lib/sendmail.sendmail
 
-sed -e 's|@@PATH@@|%{sendmailcf}|' < %{SOURCE6} > $RPM_BUILD_ROOT/etc/mail/sendmail.mc
+# install docs for sendmail
+install -p -m 644 FAQ %{buildroot}%{_docdir}/sendmail-%{version}
+install -p -m 644 KNOWNBUGS %{buildroot}%{_docdir}/sendmail-%{version}
+install -p -m 644 LICENSE %{buildroot}%{_docdir}/sendmail-%{version}
+install -p -m 644 README %{buildroot}%{_docdir}/sendmail-%{version}
+install -p -m 644 RELEASE_NOTES %{buildroot}%{_docdir}/sendmail-%{version}
+
+# install docs for sendmail-doc
+install -m 644 doc/op/op.pdf %{buildroot}%{_docdir}/sendmail-%{version}
+install -p -m 644 sendmail/README %{buildroot}%{_docdir}/sendmail-%{version}/README.sendmail
+install -p -m 644 sendmail/SECURITY %{buildroot}%{_docdir}/sendmail-%{version}
+install -p -m 644 smrsh/README %{buildroot}%{_docdir}/sendmail-%{version}/README.smrsh
+install -p -m 644 libmilter/README %{buildroot}%{_docdir}/sendmail-%{version}/README.libmilter
+install -p -m 644 cf/README %{buildroot}%{_docdir}/sendmail-%{version}/README.cf
+install -m 644 %{SOURCE9} %{buildroot}%{_docdir}/sendmail-%{version}/README.redhat
 
-sed -e 's|%{sendmailcf}|\.\.|' < $RPM_BUILD_ROOT/etc/mail/sendmail.mc > cf/cf/redhat.mc
-%if "%{stdir}" != "/etc/mail"
-perl -pi -e 's:/etc/mail/statistics:%{stdir}/statistics:' cf/cf/redhat.mc
+# install the cf files for the sendmail-cf package.
+cp -ar cf/* %{buildroot}%{sendmailcf}
+# remove patch backup files
+rm -rf %{buildroot}%{sendmailcf}/cf/Build.*
+rm -rf %{buildroot}%{sendmailcf}/*/*.mc.*
+rm -rf %{buildroot}%{sendmailcf}/*/*.m4.*
+
+# install sendmail.mc with proper paths
+install -m 644 %{SOURCE6} %{buildroot}%{maildir}/sendmail.mc
+sed -i -e 's|@@PATH@@|%{sendmailcf}|' %{buildroot}%{maildir}/sendmail.mc
+
+# create sendmail.cf
+cp %{buildroot}%{maildir}/sendmail.mc cf/cf/redhat.mc
+sed -i -e 's|%{sendmailcf}|\.\.|' cf/cf/redhat.mc
+%if "%{stdir}" != "%{maildir}"
+sed -i -e 's:%{maildir}/statistics:%{stdir}/statistics:' cf/cf/redhat.mc
 %endif
 (cd cf/cf && m4 redhat.mc > redhat.cf)
-install -m 644 cf/cf/redhat.cf $RPM_BUILD_ROOT/etc/mail/sendmail.cf
-install -m 644 cf/cf/submit.mc $RPM_BUILD_ROOT/etc/mail/submit.mc
-
-echo "# local-host-names - include all aliases for your machine here." \
-	> $RPM_BUILD_ROOT/etc/mail/local-host-names
-( echo "# trusted-users - users that can send mail as others without a warning"
-echo "# apache, mailman, majordomo, uucp, are good candidates" ) \
-	> $RPM_BUILD_ROOT/etc/mail/trusted-users
-
-ln -sf ../sbin/sendmail $RPM_BUILD_ROOT/usr/lib/sendmail.sendmail
-install -d -m775 $RPM_BUILD_ROOT/var/spool/mqueue
-install -d -m755 $RPM_BUILD_ROOT/var/spool/clientmqueue
-
-# dangling symlinks
-root=..
-while [ ! -r $RPM_BUILD_ROOT/%{_bindir}/${root}/rootfile ] ; do
-	root=${root}/..
-done
-for f in hoststat mailq newaliases purgestat ; do
-    ln -sf ${root}%{_sbindir}/sendmail $RPM_BUILD_ROOT%{_bindir}/${f}
-done
-install -d -m755 $RPM_BUILD_ROOT/etc/smrsh
+install -m 644 cf/cf/redhat.cf %{buildroot}%{maildir}/sendmail.cf
+install -m 644 cf/cf/submit.mc %{buildroot}%{maildir}/submit.mc
 
-cat <<EOF > $RPM_BUILD_ROOT/etc/mail/access
-# Check the /usr/share/doc/sendmail/README.cf file for a description
-# of the format of this file. (search for access_db in that file)
-# The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
-# package.
-#
-# by default we allow relaying from localhost...
-Connect:localhost.localdomain		RELAY
-Connect:localhost			RELAY
-Connect:127.0.0.1			RELAY
+install -m 644 %{SOURCE12} %{buildroot}%{maildir}/access
+install -m 644 %{SOURCE13} %{buildroot}%{maildir}/domaintable
+install -m 644 %{SOURCE14} %{buildroot}%{maildir}/local-host-names
+install -m 644 %{SOURCE15} %{buildroot}%{maildir}/mailertable
+install -m 644 %{SOURCE16} %{buildroot}%{maildir}/trusted-users
+install -m 644 %{SOURCE17} %{buildroot}%{maildir}/virtusertable
 
-EOF
+# create db files
 for map in virtusertable access domaintable mailertable ; do
-    touch $RPM_BUILD_ROOT/etc/mail/${map}
-    chmod 0644 $RPM_BUILD_ROOT/etc/mail/${map}
-    $RPM_BUILD_ROOT%{_bindir}/makemap -C $RPM_BUILD_ROOT/etc/mail/sendmail.cf hash $RPM_BUILD_ROOT/etc/mail/${map}.db < $RPM_BUILD_ROOT/etc/mail/${map}
-    chmod 0644 $RPM_BUILD_ROOT/etc/mail/${map}.db
+	touch %{buildroot}%{maildir}/${map}
+	chmod 0644 %{buildroot}%{maildir}/${map}
+	%{buildroot}%{_bindir}/makemap -C %{buildroot}%{maildir}/sendmail.cf \
+		hash %{buildroot}%{maildir}/${map}.db \
+		< %{buildroot}%{maildir}/${map}
+	chmod 0644 %{buildroot}%{maildir}/${map}.db
 done
-%if "%{old_setup}" == "yes"
-install -m644 %{SOURCE3} $RPM_BUILD_ROOT/etc/aliases
-$RPM_BUILD_ROOT/usr/bin/makemap -C $RPM_BUILD_ROOT/etc/mail/sendmail.cf hash $RPM_BUILD_ROOT/etc/aliases.db < %{SOURCE3}
-%else
-$RPM_BUILD_ROOT/usr/bin/makemap -C $RPM_BUILD_ROOT/etc/mail/sendmail.cf hash $RPM_BUILD_ROOT/etc/aliases.db < /etc/aliases
-%endif
-
-install -m644 %SOURCE4 $RPM_BUILD_ROOT/etc/sysconfig/sendmail
-install -m755 %SOURCE1 $RPM_BUILD_ROOT%{initdir}/sendmail
+%{buildroot}%{_bindir}/makemap -C %{buildroot}%{maildir}/sendmail.cf \
+	hash %{buildroot}%{_sysconfdir}/aliases.db < %{_sysconfdir}/aliases
 
-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/mail/Makefile
+install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/sendmail
+install -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/sendmail
+install -m 644 %{SOURCE5} %{buildroot}%{maildir}/Makefile
 
-chmod u+w $RPM_BUILD_ROOT/usr/sbin/{mailstats,praliases}
-chmod u+w $RPM_BUILD_ROOT/usr/bin/rmail
+chmod u+w %{buildroot}%{_sbindir}/{mailstats,praliases}
+chmod u+w %{buildroot}%{_bindir}/rmail
 
 %if "%{with_sasl1}" == "yes"
-install -m755 -d $RPM_BUILD_ROOT%{_libdir}/sasl
-install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_libdir}/sasl/Sendmail.conf
+install -m 755 -d %{buildroot}%{_libdir}/sasl
+install -m 644 %{SOURCE7} %{buildroot}%{_libdir}/sasl/Sendmail.conf
 %endif
 %if "%{with_sasl2}" == "yes"
-install -m755 -d $RPM_BUILD_ROOT%{_libdir}/sasl2
-install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_libdir}/sasl2/Sendmail.conf
+install -m 755 -d %{buildroot}%{_libdir}/sasl2
+install -m 644 %{SOURCE11} %{buildroot}%{_libdir}/sasl2/Sendmail.conf
 %endif
-install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/pam.d/smtp.sendmail
-
-install -m 755 -d $RPM_BUILD_ROOT%{_libdir}
-install -m 644  $OBJDIR/libmilter/libmilter.a $RPM_BUILD_ROOT%{_libdir}
-install -m 644  $OBJDIR/libsmutil/libsmutil.a $RPM_BUILD_ROOT%{_libdir}
-install -m 644  $OBJDIR/libsm/libsm.a         $RPM_BUILD_ROOT%{_libdir}
+install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/pam.d/smtp.sendmail
 
 # allow stripping of the sendmail app
-chmod 755 $RPM_BUILD_ROOT%{_sbindir}/sendmail
-
-mv $RPM_BUILD_ROOT%{_sbindir}/sendmail $RPM_BUILD_ROOT%{_sbindir}/sendmail.sendmail
-for i in mailq newaliases rmail; do
-	mv $RPM_BUILD_ROOT%{_bindir}/$i $RPM_BUILD_ROOT%{_bindir}/$i.sendmail
-done
-mv $RPM_BUILD_ROOT%{_mandir}/man1/mailq.1 $RPM_BUILD_ROOT%{_mandir}/man1/mailq.sendmail.1
-mv $RPM_BUILD_ROOT%{_mandir}/man1/newaliases.1 $RPM_BUILD_ROOT%{_mandir}/man1/newaliases.sendmail.1
-mv $RPM_BUILD_ROOT%{_mandir}/man5/aliases.5 $RPM_BUILD_ROOT%{_mandir}/man5/aliases.sendmail.5
-mv $RPM_BUILD_ROOT%{_mandir}/man8/sendmail.8 $RPM_BUILD_ROOT%{_mandir}/man8/sendmail.sendmail.8
+chmod 755 %{buildroot}%{_sbindir}/sendmail
 
-%if "%{stdir}" != "/etc/mail"
-perl -pi -e 's:/etc/mail/statistics:%{stdir}/statistics:' $RPM_BUILD_ROOT%{_mandir}/man*/*
+# fix path for statistics file in man pages
+%if "%{stdir}" != "%{maildir}"
+sed -i -e 's:%{maildir}/statistics:%{stdir}/statistics:' %{buildroot}%{_mandir}/man*/*
 %endif
 
-%if "%{_libdir}" == "/usr/lib64"
-rm -fr $RPM_BUILD_ROOT/usr/lib/libmilter.a
-%endif
+# rename files for alternative usage
+mv %{buildroot}%{_sbindir}/sendmail %{buildroot}%{_sbindir}/sendmail.sendmail
+for i in mailq newaliases rmail; do
+	mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i.sendmail
+done
+mv %{buildroot}%{_mandir}/man1/mailq.1 %{buildroot}%{_mandir}/man1/mailq.sendmail.1
+mv %{buildroot}%{_mandir}/man1/newaliases.1 %{buildroot}%{_mandir}/man1/newaliases.sendmail.1
+mv %{buildroot}%{_mandir}/man5/aliases.5 %{buildroot}%{_mandir}/man5/aliases.sendmail.5
+mv %{buildroot}%{_mandir}/man8/sendmail.8 %{buildroot}%{_mandir}/man8/sendmail.sendmail.8
 
-rm -rf $RPM_BUILD_ROOT/rootfile
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %pre
-/usr/sbin/useradd -u 47 -d /var/spool/mqueue -r -s %{smshell} mailnull >/dev/null 2>&1
-/usr/sbin/useradd -u 51 -d /var/spool/mqueue -r -s %{smshell} smmsp >/dev/null 2>&1
+%{_sbindir}/useradd -u 47 -d %{spooldir}/mqueue -r -s %{smshell} mailnull >/dev/null 2>&1
+%{_sbindir}/useradd -u 51 -d %{spooldir}/mqueue -r -s %{smshell} smmsp >/dev/null 2>&1
 exit 0
 
 %postun
 if [ "$1" -ge "1" ]; then
-	%{initdir}/sendmail condrestart >/dev/null 2>&1
-	mta=`readlink /etc/alternatives/mta`
+	%{_initrddir}/sendmail condrestart >/dev/null 2>&1
+	mta=`readlink %{_sysconfdir}/alternatives/mta`
 	if [ "$mta" == "%{_sbindir}/sendmail.sendmail" ]; then
-		/usr/sbin/alternatives --set mta %{_sbindir}/sendmail.sendmail
+		%{_sbindir}/alternatives --set mta %{_sbindir}/sendmail.sendmail
 	fi
 fi
 exit 0
 
 %post
-#
-# Convert old format to new
-#
-if [ -f /etc/mail/deny ] ; then
-    cat /etc/mail/deny | \
-	awk 'BEGIN{ print "# Entries from obsoleted /etc/mail/deny"} \
-		  {print $1" REJECT"}' >> /etc/mail/access
-    cp /etc/mail/deny /etc/mail/deny.rpmorig
-fi
-for oldfile in relay_allow ip_allow name_allow ; do
-    if [ -f /etc/mail/$oldfile ] ; then
-	cat /etc/mail/$oldfile | \
-		awk "BEGIN { print \"# Entries from obsoleted /etc/mail/$oldfile\" ;} \
-	     { print \$1\" RELAY\" }" >> /etc/mail/access
-	cp /etc/mail/$oldfile /etc/mail/$oldfile.rpmorig
-     fi
-done
-
-#
-# Remove deprecated config flags which are probably harmless to remove
-#
-cf=`/bin/mktemp /etc/mail/sendmail.cf.XXXXXX`
-if [ "$cf" != "" ] ; then
-	sed 's/^O AutoRebuildAliases$/#&/g' /etc/mail/sendmail.cf > ${cf} && \
-	cat ${cf} > /etc/mail/sendmail.cf
-	rm ${cf}
-fi
-
-/sbin/chkconfig --add sendmail
-#
 # Set up the alternatives files for MTAs.
-#
-/usr/sbin/alternatives --install %{_sbindir}/sendmail mta %{_sbindir}/sendmail.sendmail 90 \
+%{_sbindir}/alternatives --install %{_sbindir}/sendmail mta %{_sbindir}/sendmail.sendmail 90 \
 	--slave %{_bindir}/mailq mta-mailq %{_bindir}/mailq.sendmail \
 	--slave %{_bindir}/newaliases mta-newaliases %{_bindir}/newaliases.sendmail \
 	--slave %{_bindir}/rmail mta-rmail %{_bindir}/rmail.sendmail \
@@ -469,115 +424,101 @@
 	--slave %{_mandir}/man5/aliases.5.gz mta-aliasesman %{_mandir}/man5/aliases.sendmail.5.gz \
 	--initscript sendmail
 
-
-#
-# Oops, these files moved
-#
-if [ -f /etc/sendmail.cw ]; then
-    cat /etc/sendmail.cw  | \
-      awk 'BEGIN { print "# Entries from obsoleted /etc/sendmail.cw" ;} \
-           { print $1 }' >> /etc/mail/local-host-names
-    cp /etc/sendmail.cw /etc/sendmail.cw.rpmorig
-fi
-#
 # Rebuild maps (next reboot will rebuild also)
-#
 {
-  chown root /etc/aliases.db /etc/mail/access.db /etc/mail/mailertable.db \
-    /etc/mail/domaintable.db  /etc/mail/virtusertable.db
-  /usr/bin/newaliases
-  for map in virtusertable access domaintable mailertable ; do
-    if [ -f /etc/mail/${map} ]; then
-      /usr/bin/makemap hash /etc/mail/${map} < /etc/mail/${map}
-    fi
-  done
+	chown root %{_sysconfdir}/aliases.db %{maildir}/access.db \
+		%{maildir}/mailertable.db %{maildir}/domaintable.db \
+		%{maildir}/virtusertable.db
+	%{_bindir}/newaliases
+	for map in virtusertable access domaintable mailertable ; do
+		if [ -f %{maildir}/${map} ]; then
+			%{_bindir}/makemap hash %{maildir}/${map} \
+				< %{maildir}/${map}
+		fi
+	done
 } > /dev/null 2>&1
-
+exit 0
 
 %preun
 if [ $1 = 0 ]; then
-	%{initdir}/sendmail stop >/dev/null 2>&1
+	%{_initrddir}/sendmail stop >/dev/null 2>&1
 	/sbin/chkconfig --del sendmail
-	/usr/sbin/alternatives --remove mta %{_sbindir}/sendmail.sendmail
+	%{_sbindir}/alternatives --remove mta %{_sbindir}/sendmail.sendmail
 fi
 exit 0
 
-%triggerpostun -- sendmail < 8.10.0
-/sbin/chkconfig --add sendmail
-
-%triggerpostun -- sendmail < 8.11.6-11
-/usr/sbin/alternatives --auto mta
-
 %files
 %defattr(-,root,root)
-/usr/bin/hoststat
-/usr/bin/makemap
-/usr/bin/purgestat
-/usr/sbin/mailstats
-/usr/sbin/makemap
-/usr/sbin/praliases
-%attr(2755,root,smmsp)/usr/sbin/sendmail.sendmail
-/usr/bin/rmail.sendmail
-/usr/bin/newaliases.sendmail
-/usr/bin/mailq.sendmail
-/usr/sbin/smrsh
+%doc %{_docdir}/sendmail-%{version}/FAQ
+%doc %{_docdir}/sendmail-%{version}/KNOWNBUGS
+%doc %{_docdir}/sendmail-%{version}/LICENSE
+%doc %{_docdir}/sendmail-%{version}/README
+%doc %{_docdir}/sendmail-%{version}/RELEASE_NOTES
+%{_bindir}/hoststat
+%{_bindir}/makemap
+%{_bindir}/purgestat
+%{_sbindir}/mailstats
+%{_sbindir}/makemap
+%{_sbindir}/praliases
+%attr(2755,root,smmsp) %{_sbindir}/sendmail.sendmail
+%{_bindir}/rmail.sendmail
+%{_bindir}/newaliases.sendmail
+%{_bindir}/mailq.sendmail
+%{_sbindir}/smrsh
 /usr/lib/sendmail.sendmail
 
-%{_mandir}/man8/rmail.8*
-%{_mandir}/man8/praliases.8*
-%{_mandir}/man8/mailstats.8*
-%{_mandir}/man8/makemap.8*
-%{_mandir}/man8/sendmail.sendmail.8*
-%{_mandir}/man8/smrsh.8*
-%{_mandir}/man5/aliases.sendmail.5*
-%{_mandir}/man1/newaliases.sendmail.1*
-%{_mandir}/man1/mailq.sendmail.1*
+%{_mandir}/man8/rmail.8.gz
+%{_mandir}/man8/praliases.8.gz
+%{_mandir}/man8/mailstats.8.gz
+%{_mandir}/man8/makemap.8.gz
+%{_mandir}/man8/sendmail.sendmail.8.gz
+%{_mandir}/man8/smrsh.8.gz
+%{_mandir}/man5/aliases.sendmail.5.gz
+%{_mandir}/man1/newaliases.sendmail.1.gz
+%{_mandir}/man1/mailq.sendmail.1.gz
 
 %dir %{stdir}
-%config(noreplace)		%{stdir}/statistics
-%config(noreplace)		/etc/mail/sendmail.cf
-%config(noreplace)		/etc/mail/submit.cf
-%attr(0644,root,root) %config(noreplace)	/etc/mail/sendmail.mc
-%attr(0644,root,root) %config(noreplace)	/etc/mail/submit.mc
-%config(noreplace)		/etc/mail/local-host-names
-%if "%{old_setup}" == "yes"
-%config(noreplace)		/etc/aliases
-%endif
-%attr(0644,root,root) %ghost	/etc/aliases.db
-%attr(0770,smmsp,smmsp) %dir	/var/spool/clientmqueue
-%attr(0700,root,mail) %dir	/var/spool/mqueue
-%dir /etc/smrsh
-%dir /etc/mail
-
-%config(noreplace) /etc/mail/Makefile
-%attr(0644,root,root) %ghost			/etc/mail/virtusertable.db
-%attr(0644,root,root) %config(noreplace)	/etc/mail/virtusertable
-
-%attr(0644,root,root) %ghost			/etc/mail/access.db
-%attr(0644,root,root) %config(noreplace)	/etc/mail/access
-
-%attr(0644,root,root) %ghost			/etc/mail/domaintable.db
-%attr(0644,root,root) %config(noreplace)	/etc/mail/domaintable
-
-%attr(0644,root,root) %ghost			/etc/mail/mailertable.db
-%attr(0644,root,root) %config(noreplace)	/etc/mail/mailertable
-
-%attr(0644,root,root) %config(noreplace)	/etc/mail/helpfile
-%attr(0644,root,root) %config(noreplace)	/etc/mail/trusted-users
-
-%config(noreplace) /etc/sysconfig/sendmail
-
-%config %{initdir}/sendmail
+%dir %{_sysconfdir}/smrsh
+%dir %{maildir}
+%attr(0770,smmsp,smmsp) %dir %{spooldir}/clientmqueue
+%attr(0700,root,mail) %dir %{spooldir}/mqueue
+
+%config(noreplace) %{stdir}/statistics
+%config(noreplace) %{maildir}/Makefile
+%config(noreplace) %{maildir}/sendmail.cf
+%config(noreplace) %{maildir}/submit.cf
+%config(noreplace) %{maildir}/helpfile
+%config(noreplace) %{maildir}/sendmail.mc
+%config(noreplace) %{maildir}/submit.mc
+%config(noreplace) %{maildir}/access
+%config(noreplace) %{maildir}/domaintable
+%config(noreplace) %{maildir}/local-host-names
+%config(noreplace) %{maildir}/mailertable
+%config(noreplace) %{maildir}/trusted-users
+%config(noreplace) %{maildir}/virtusertable
+
+%ghost %{_sysconfdir}/aliases.db
+%ghost %{maildir}/virtusertable.db
+%ghost %{maildir}/access.db
+%ghost %{maildir}/domaintable.db
+%ghost %{maildir}/mailertable.db
+
+%attr(0755,root,root) %config(noreplace) %{_initrddir}/sendmail
+%config(noreplace) %{_sysconfdir}/sysconfig/sendmail
+%config(noreplace) %{_sysconfdir}/pam.d/smtp.sendmail
 
 %config %{_libdir}/sasl*/Sendmail*.conf
-%config(noreplace) /etc/pam.d/smtp.sendmail
 
 %files cf
 %defattr(-,root,root)
-%{sendmailcf}
+%doc %{sendmailcf}/README
+%dir %{sendmailcf}
+%{sendmailcf}/*/
+%{sendmailcf}/sendmail.schema
 
 %files devel
 %defattr(-,root,root)
+%doc libmilter/docs/*
 %dir %{_includedir}/libmilter
 %{_includedir}/libmilter/*.h
 %{_libdir}/libmilter.a
@@ -586,9 +527,22 @@
 
 %files doc
 %defattr(-,root,root)
-%{_docdir}/sendmail
+%{_docdir}/sendmail-%{version}/README.cf
+%{_docdir}/sendmail-%{version}/README.libmilter
+%{_docdir}/sendmail-%{version}/README.redhat
+%{_docdir}/sendmail-%{version}/README.sendmail
+%{_docdir}/sendmail-%{version}/README.smrsh
+%{_docdir}/sendmail-%{version}/SECURITY
+%{_docdir}/sendmail-%{version}/op.pdf
+
 
 %changelog
+* Thu Apr 12 2007 Thomas Woerner <twoerner at redhat.com> 8.14.1-1
+- new version 8.14.1
+- spec file cleanup for merge review (rhbz#226407)
+- dropped update support for sendmail versions prior to 8.12.0
+- using pdf documentation
+
 * Tue Feb  6 2007 Thomas Woerner <twoerner at redhat.com> 8.14.0-1
 - new version 8.14.0
 - adapted patches: makemapman, dynamic
@@ -1041,7 +995,7 @@
 - run chkconfig --add before alternatives
 
 * Thu Feb 28 2002 Bill Nottingham <notting at redhat.com> 8.12.2-3
-- run alternatives --remove in %preun
+- run alternatives --remove in %%preun
 - add some prereqs
 
 * Mon Feb 25 2002 Nalin Dahyabhai <nalin at redhat.com> 8.12.2-2
@@ -1062,7 +1016,7 @@
   to build this for older releases
 
 * Fri Feb  1 2002 Bill Nottingham <notting at redhat.com> 8.11.6-12
-- %triggerpostun on older versions to make sure alternatives work on
+- %%triggerpostun on older versions to make sure alternatives work on
   upgrades
 
 * Thu Jan 31 2002 Bill Nottingham <notting at redhat.com> 8.11.6-11
@@ -1340,7 +1294,7 @@
 
 * Mon Mar 22 1999 Jeff Johnson <jbj at redhat.com>
 - correxct dangling symlinks.
-- check for map file existence in %post.
+- check for map file existence in %%post.
 
 * Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
 - auto rebuild in the new build environment (release 3)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sendmail/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	6 Feb 2007 16:15:48 -0000	1.20
+++ sources	12 Apr 2007 14:35:58 -0000	1.21
@@ -1 +1 @@
-bc0dee396b8090b3f696e748a9caf83d  sendmail.8.14.0.tar.gz
+462bc9e00fdbef3a71b046b967c9a157  sendmail.8.14.1.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 12 14:41:10 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 10:41:10 -0400
Subject: rpms/sendmail/devel sendmail-8.14.1-noversion.patch, NONE,
	1.1 sendmail-8.12.11-smrsh-paths.patch, 1.1,
	NONE sendmail-8.12.2-makemapman.patch, 1.1,
	NONE sendmail-8.13.0-dynamic.patch, 1.1,
	NONE sendmail-8.13.0-pid.patch, 1.1,
	NONE sendmail-8.13.1-errata_cataddr.patch, 1.1,
	NONE sendmail-8.13.2-dynamic.patch, 1.1,
	NONE sendmail-8.13.3-close_wait.p2.patch, 1.1,
	NONE sendmail-8.13.4-dynamic.patch, 1.1,
	NONE sendmail-8.13.4-libmilter-sigwait.patch, 1.1,
	NONE sendmail-8.13.6-dynamic.patch, 1.1,
	NONE sendmail-8.13.8-noversion.patch, 1.1, NONE
Message-ID: <200704121441.l3CEfAEr021771@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/sendmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21464

Added Files:
	sendmail-8.14.1-noversion.patch 
Removed Files:
	sendmail-8.12.11-smrsh-paths.patch 
	sendmail-8.12.2-makemapman.patch sendmail-8.13.0-dynamic.patch 
	sendmail-8.13.0-pid.patch sendmail-8.13.1-errata_cataddr.patch 
	sendmail-8.13.2-dynamic.patch 
	sendmail-8.13.3-close_wait.p2.patch 
	sendmail-8.13.4-dynamic.patch 
	sendmail-8.13.4-libmilter-sigwait.patch 
	sendmail-8.13.6-dynamic.patch sendmail-8.13.8-noversion.patch 
Log Message:
[tw]
- new noversion patch for 8.14.1
- removed old patches


sendmail-8.14.1-noversion.patch:
 helpfile |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE sendmail-8.14.1-noversion.patch ---
--- sendmail-8.14.1/sendmail/helpfile.noversion	2007-02-01 19:29:44.000000000 +0100
+++ sendmail-8.14.1/sendmail/helpfile	2007-04-10 16:58:16.000000000 +0200
@@ -11,9 +11,7 @@
 cpyr	forth in the LICENSE file which can be found at the top level of
 cpyr	the sendmail distribution.
 cpyr
-cpyr	$$Id: helpfile,v 8.48 2007/02/01 18:29:44 ca Exp $$
-cpyr
-smtp	This is sendmail version $v
+smtp	This is sendmail
 smtp	Topics:
 smtp		HELO	EHLO	MAIL	RCPT	DATA
 smtp		RSET	NOOP	QUIT	HELP	VRFY


--- sendmail-8.12.11-smrsh-paths.patch DELETED ---


--- sendmail-8.12.2-makemapman.patch DELETED ---


--- sendmail-8.13.0-dynamic.patch DELETED ---


--- sendmail-8.13.0-pid.patch DELETED ---


--- sendmail-8.13.1-errata_cataddr.patch DELETED ---


--- sendmail-8.13.2-dynamic.patch DELETED ---


--- sendmail-8.13.3-close_wait.p2.patch DELETED ---


--- sendmail-8.13.4-dynamic.patch DELETED ---


--- sendmail-8.13.4-libmilter-sigwait.patch DELETED ---


--- sendmail-8.13.6-dynamic.patch DELETED ---


--- sendmail-8.13.8-noversion.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 12 15:19:13 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 11:19:13 -0400
Subject: rpms/sendmail/devel sendmail.spec,1.79,1.80
Message-ID: <200704121519.l3CFJDJe017291@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/sendmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17144

Modified Files:
	sendmail.spec 
Log Message:
[tw]
- replaced prereq tags with requires() tags.




Index: sendmail.spec
===================================================================
RCS file: /cvs/dist/rpms/sendmail/devel/sendmail.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- sendmail.spec	12 Apr 2007 14:35:58 -0000	1.79
+++ sendmail.spec	12 Apr 2007 15:19:10 -0000	1.80
@@ -16,7 +16,7 @@
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
 Version: 8.14.1
-Release: 1
+Release: 1.1
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
@@ -54,14 +54,15 @@
 BuildRequires: groff
 BuildRequires: ghostscript
 BuildRequires: m4
-PreReq: %{_sbindir}/alternatives
 Provides: %{_sbindir}/sendmail %{_bindir}/mailq %{_bindir}/newaliases
 Provides: %{_bindir}/rmail /usr/lib/sendmail
 Provides: %{_sysconfdir}/pam.d/smtp
 Provides: %{_mandir}/man1/mailq.1.gz %{_mandir}/man1/newaliases.1.gz
 Provides: %{_mandir}/man5/aliases.5.gz %{_mandir}/man8/sendmail.8.gz
-PreReq: chkconfig >= 1.3
-PreReq: %{_sbindir}/useradd sed coreutils
+Requires(pre): shadow-utils
+Requires(preun): %{_sbindir}/alternatives chkconfig
+Requires(post): %{_sbindir}/alternatives coreutils
+Requires(postun): %{_sbindir}/alternatives coreutils chkconfig
 Requires: procmail
 Requires: bash >= 2.0
 Requires: setup >= 2.5.31-1
@@ -537,6 +538,9 @@
 
 
 %changelog
+* Thu Apr 12 2007 Thomas Woerner <twoerner at redhat.com> 8.14.1-1.1
+- replaced prereq tags with requires() tags.
+
 * Thu Apr 12 2007 Thomas Woerner <twoerner at redhat.com> 8.14.1-1
 - new version 8.14.1
 - spec file cleanup for merge review (rhbz#226407)



From fedora-cvs-commits at redhat.com  Thu Apr 12 15:34:56 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 11:34:56 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.2.0.ooo53397.linkopt.patch, 1.8,
	1.9 openoffice.org.spec, 1.1162,
	1.1163 workspace.glyphadv.patch, 1.1, NONE
Message-ID: <200704121534.l3CFYuP6028604@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-2.2.0.ooo53397.linkopt.patch 
	openoffice.org.spec 
Removed Files:
	workspace.glyphadv.patch 
Log Message:
linkopt work

openoffice.org-2.2.0.ooo53397.linkopt.patch:
 OOF680_m14/solenv/bin/mklinkscript.pl                            |   48 
 OOF680_m14/sw/util/symbolorder                                   | 5110 ++++++++++
 UnoControls/prj/build.lst                                        |    2 
 UnoControls/util/makefile.mk                                     |    3 
 automation/prj/build.lst                                         |    2 
 automation/util/makefile.mk                                      |   52 
 avmedia/source/gstreamer/makefile.mk                             |    2 
 avmedia/source/xine/makefile.mk                                  |    2 
 avmedia/util/makefile.mk                                         |    2 
 basctl/util/makefile.mk                                          |   13 
 basegfx/prj/d.lst                                                |    2 
 basegfx/util/makefile.mk                                         |    2 
 basic/prj/d.lst                                                  |    2 
 basic/source/uno/sbservices.cxx                                  |   13 
 basic/util/makefile.mk                                           |    2 
 bf_forms/util/makefile.mk                                        |    0 
 bf_goodies/util/makefile.mk                                      |    0 
 bf_linguistic/source/makefile.mk                                 |    0 
 bf_offmgr/util/makefile.mk                                       |    0 
 bf_sc/util/makefile.mk                                           |    0 
 bf_sch/util/makefile.mk                                          |    0 
 bf_sd/util/makefile.mk                                           |    0 
 bf_starmath/util/makefile.mk                                     |    0 
 bf_svx/util/makefile.mk                                          |    0 
 bf_sw/util/makefile.mk                                           |    0 
 bf_xmloff/util/makefile.mk                                       |    0 
 binfilter/bf_forms/util/makefile.mk                              |   11 
 binfilter/bf_goodies/util/makefile.mk                            |    3 
 binfilter/bf_linguistic/source/makefile.mk                       |    9 
 binfilter/bf_offmgr/util/makefile.mk                             |   10 
 binfilter/bf_sc/util/makefile.mk                                 |   14 
 binfilter/bf_sch/util/makefile.mk                                |    9 
 binfilter/bf_sd/util/makefile.mk                                 |   14 
 binfilter/bf_starmath/util/makefile.mk                           |   10 
 binfilter/bf_svx/util/makefile.mk                                |   16 
 binfilter/bf_sw/util/makefile.mk                                 |   13 
 binfilter/bf_xmloff/util/makefile.mk                             |   13 
 binfilter/binfilterdetect/source/makefile.mk                     |    8 
 binfilter/filter/source/bf_migrate/makefile.mk                   |    9 
 binfilter/filter/source/bf_offwrp/makefile.mk                    |   14 
 binfilter/inc/bf_sfx2/docfile.hxx                                |    2 
 binfilterdetect/source/makefile.mk                               |    0 
 bmpmaker/makefile.mk                                             |    0 
 bootstrp/addexes2/makefile.mk                                    |    0 
 bootstrp/makefile.mk                                             |    0 
 canvas/prj/build.lst                                             |    2 
 canvas/source/cairo/makefile.mk                                  |    2 
 canvas/source/null/makefile.mk                                   |    2 
 canvas/source/tools/makefile.mk                                  |    2 
 canvas/source/vcl/makefile.mk                                    |    2 
 chart2/source/controller/makefile.mk                             |   15 
 chart2/source/model/makefile.mk                                  |    4 
 chart2/source/tools/makefile.mk                                  |    5 
 chart2/source/view/makefile.mk                                   |   14 
 comphelper/prj/d.lst                                             |    2 
 comphelper/source/misc/facreg.cxx                                |    9 
 comphelper/util/makefile.mk                                      |    2 
 configmgr/prj/d.lst                                              |    2 
 configmgr/source/backendhelper/componentdf.cxx                   |   13 
 configmgr/source/backendhelper/makefile.mk                       |    2 
 configmgr/source/misc/configunoreg.cxx                           |   13 
 configmgr/source/platformbe/componentdefn.cxx                    |   14 
 configmgr/source/platformbe/makefile.mk                          |    2 
 configmgr/util/makefile.mk                                       |   22 
 connectivity/source/cpool/makefile.mk                            |    3 
 connectivity/source/dbtools/makefile.mk                          |    5 
 connectivity/source/drivers/adabas/makefile.mk                   |    3 
 connectivity/source/drivers/calc/makefile.mk                     |    9 
 connectivity/source/drivers/dbase/makefile.mk                    |    8 
 connectivity/source/drivers/evoab/makefile.mk                    |   11 
 connectivity/source/drivers/evoab2/makefile.mk                   |   10 
 connectivity/source/drivers/file/makefile.mk                     |    8 
 connectivity/source/drivers/flat/makefile.mk                     |   11 
 connectivity/source/drivers/hsqldb/makefile.mk                   |    3 
 connectivity/source/drivers/jdbc/makefile.mk                     |    3 
 connectivity/source/drivers/mysql/makefile.mk                    |    4 
 connectivity/source/drivers/odbc/makefile.mk                     |    3 
 connectivity/source/manager/makefile.mk                          |    1 
 dbaccess/source/filter/migration/makefile.mk                     |    7 
 dbaccess/source/filter/xml/makefile.mk                           |   13 
 desktop/prj/build.lst                                            |   16 
 desktop/prj/d.lst                                                |    2 
 desktop/source/app/appinit.cxx                                   |  152 
 desktop/source/app/makefile.mk                                   |   44 
 desktop/source/deployment/gui/makefile.mk                        |   12 
 desktop/source/deployment/makefile.mk                            |    8 
 desktop/source/deployment/misc/makefile.mk                       |    5 
 desktop/source/migration/services/makefile.mk                    |    6 
 desktop/source/offacc/makefile.mk                                |    2 
 desktop/source/pkgchk/makefile.mk                                |   13 
 desktop/source/pkgchk/unopkg/makefile.mk                         |   12 
 desktop/source/so_comp/makefile.mk                               |    8 
 desktop/source/splash/makefile.mk                                |   15 
 desktop/source/splash/services_spl.cxx                           |   12 
 desktop/util/makefile.mk                                         |  148 
 dtrans/prj/build.lst                                             |    2 
 dtrans/prj/d.lst                                                 |    2 
 dtrans/source/X11/X11_service.cxx                                |   11 
 dtrans/source/X11/makefile.mk                                    |   12 
 embeddedobj/source/msole/makefile.mk                             |    7 
 embeddedobj/util/makefile.mk                                     |    2 
 extensions/source/abpilot/makefile.mk                            |   11 
 extensions/source/bibliography/makefile.mk                       |    9 
 extensions/source/dbpilots/makefile.mk                           |    7 
 extensions/source/nsplugin/source/makefile.mk                    |    9 
 extensions/source/packer/makefile.mk                             |    2 
 extensions/source/plugin/unx/makefile.mk                         |    3 
 extensions/source/plugin/util/makefile.mk                        |   10 
 extensions/source/preload/makefile.mk                            |    7 
 extensions/source/propctrlr/makefile.mk                          |   10 
 extensions/source/resource/makefile.mk                           |    9 
 extensions/source/scanner/makefile.mk                            |   17 
 extensions/source/svg/makefile.mk                                |    4 
 extensions/source/update/ui/makefile.mk                          |    6 
 extensions/source/xmlextract/makefile.mk                         |    4 
 fileaccess/prj/build.lst                                         |    2 
 fileaccess/prj/d.lst                                             |    2 
 fileaccess/source/FileAccess.cxx                                 |   10 
 fileaccess/source/makefile.mk                                    |   18 
 filter/source/bf_migrate/makefile.mk                             |    0 
 filter/source/bf_offwrp/makefile.mk                              |    0 
 filter/source/config/cache/makefile.mk                           |    7 
 filter/source/filtertracer/makefile.mk                           |    5 
 filter/source/flash/makefile.mk                                  |    7 
 filter/source/msfilter/powerpoint/makefile.mk                    |    3 
 filter/source/pdf/makefile.mk                                    |    9 
 filter/source/svg/makefile.mk                                    |    7 
 filter/source/xmlfilteradaptor/makefile.mk                       |    4 
 filter/source/xmlfilterdetect/makefile.mk                        |    3 
 filter/source/xsltdialog/makefile.mk                             |   11 
 filter/source/xsltfilter/makefile.mk                             |    6 
 fpicker/source/generic/makefile.mk                               |    3 
 fpicker/source/office/makefile.mk                                |    9 
 fpicker/source/unx/gnome/makefile.mk                             |    4 
 framework/inc/macros/registration.hxx                            |   20 
 framework/prj/d.lst                                              |    2 
 framework/source/register/register3rdcomponents.cxx              |   10 
 framework/source/register/registerservices.cxx                   |   10 
 framework/source/register/registertemp.cxx                       |   10 
 framework/util/makefile.mk                                       |   61 
 goodies/prj/d.lst                                                |    2 
 goodies/source/filter.vcl/egif/makefile.mk                       |    2 
 goodies/source/filter.vcl/eos2met/makefile.mk                    |    2 
 goodies/source/filter.vcl/epbm/makefile.mk                       |    2 
 goodies/source/filter.vcl/epgm/makefile.mk                       |    2 
 goodies/source/filter.vcl/epict/makefile.mk                      |    2 
 goodies/source/filter.vcl/eppm/makefile.mk                       |    2 
 goodies/source/filter.vcl/eps/makefile.mk                        |    2 
 goodies/source/filter.vcl/eras/makefile.mk                       |    2 
 goodies/source/filter.vcl/etiff/makefile.mk                      |    2 
 goodies/source/filter.vcl/expm/makefile.mk                       |    2 
 goodies/source/filter.vcl/icgm/makefile.mk                       |    5 
 goodies/source/filter.vcl/idxf/makefile.mk                       |    2 
 goodies/source/filter.vcl/ieps/makefile.mk                       |    2 
 goodies/source/filter.vcl/ios2met/makefile.mk                    |    2 
 goodies/source/filter.vcl/ipbm/makefile.mk                       |    2 
 goodies/source/filter.vcl/ipcd/makefile.mk                       |    2 
 goodies/source/filter.vcl/ipcx/makefile.mk                       |    2 
 goodies/source/filter.vcl/ipict/makefile.mk                      |    2 
 goodies/source/filter.vcl/ipsd/makefile.mk                       |    2 
 goodies/source/filter.vcl/iras/makefile.mk                       |    2 
 goodies/source/filter.vcl/itga/makefile.mk                       |    2 
 goodies/source/filter.vcl/itiff/makefile.mk                      |    2 
 goodies/source/inv/makefile.mk                                   |   17 
 goodies/source/unographic/graphicuno.cxx                         |   13 
 goodies/util/makefile.mk                                         |    2 
 i18npool/prj/d.lst                                               |    2 
 i18npool/source/isolang/makefile.mk                              |    2 
 i18npool/source/registerservices/registerservices.cxx            |    9 
 i18npool/util/makefile.mk                                        |    2 
 i18nutil/prj/d.lst                                               |    3 
 i18nutil/source/utility/makefile.mk                              |   15 
 idl/util/makefile.mk                                             |    5 
 inc/bf_sfx2/docfile.hxx                                          |    0 
 inc/insdlg.hxx                                                   |    0 
 inc/macros/registration.hxx                                      |    0 
 inc/transbnd.hxx                                                 |    0 
 instsetoo_native/util/openoffice.lst                             |    6 
 lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk |    8 
 lingucomponent/source/spellcheck/spell/makefile.mk               |    8 
 lingucomponent/source/thesaurus/libnth/makefile.mk               |    8 
 linguistic/source/makefile.mk                                    |   12 
 msole/makefile.mk                                                |    0 
 openoffice.org/cppcanvas/util/makefile.mk                        |    2 
 openoffice.org/dbaccess/util/makefile.mk                         |   29 
 openoffice.org/forms/util/makefile.mk                            |   13 
 openoffice.org/libsofficecheckpoint1/makefile.mk                 |   36 
 openoffice.org/libsofficecheckpoint1/prj/build.lst               |    3 
 openoffice.org/libsofficecheckpoint1/prj/d.lst                   |    1 
 package/prj/build.lst                                            |    2 
 package/prj/d.lst                                                |    2 
 package/source/manifest/UnoRegister.cxx                          |   10 
 package/source/xstor/makefile.mk                                 |    4 
 package/util/makefile.mk                                         |    9 
 padmin/source/makefile.mk                                        |   11 
 prj/build.lst                                                    |    2 
 prj/d.lst                                                        |    0 
 psprint/prj/d.lst                                                |    2 
 psprint/util/makefile.mk                                         |    2 
 regexp/source/makefile.mk                                        |    2 
 rsc/prj/build.lst                                                |    2 
 rsc/source/prj/makefile.mk                                       |    6 
 sc/util/makefile.mk                                              |   36 
 scaddins/source/analysis/makefile.mk                             |    4 
 scaddins/source/datefunc/makefile.mk                             |    4 
 sch/util/makefile.mk                                             |   18 
 scp2/source/gnome/file_gnome.scp                                 |   18 
 scp2/source/gnome/module_gnome.scp                               |    2 
 scp2/source/ooo/file_library_ooo.scp                             |  245 
 scp2/source/ooo/module_hidden_ooo.scp                            |   37 
 scripting/source/basprov/makefile.mk                             |    8 
 scripting/source/dlgprov/makefile.mk                             |    5 
 scripting/source/protocolhandler/makefile.mk                     |    4 
 scripting/source/stringresource/makefile.mk                      |    2 
 scripting/source/vbaevents/makefile.mk                           |    5 
 scripting/util/makefile.mk                                       |    4 
 sd/prj/build.lst                                                 |    2 
 sd/source/filter/eppt/makefile.mk                                |   12 
 sd/util/makefile.mk                                              |   45 
 sfx2/prj/build.lst                                               |    2 
 sfx2/prj/d.lst                                                   |    3 
 sfx2/source/appl/appuno.cxx                                      |   11 
 sfx2/util/makefile.mk                                            |   70 
 shell/prj/d.lst                                                  |    2 
 shell/source/backends/desktopbe/desktopbecdef.cxx                |   13 
 shell/source/backends/desktopbe/makefile.mk                      |   12 
 shell/source/backends/gconfbe/gconfbecdef.cxx                    |   12 
 shell/source/backends/gconfbe/makefile.mk                        |   12 
 shell/source/backends/localebe/localebecdef.cxx                  |   12 
 shell/source/backends/localebe/makefile.mk                       |   12 
 shell/source/unix/sysshell/makefile.mk                           |    4 
 sj2/prj/d.lst                                                    |    2 
 sj2/util/makefile.mk                                             |    6 
 slideshow/util/makefile.mk                                       |    9 
 so3/inc/insdlg.hxx                                               |    7 
 so3/inc/transbnd.hxx                                             |   12 
 so3/prj/d.lst                                                    |    2 
 so3/source/dialog/insdlg.cxx                                     |    4 
 so3/source/inplace/outplace.cxx                                  |    1 
 so3/source/persist/transbnd.cxx                                  |    4 
 so3/util/makefile.mk                                             |    3 
 solenv/bin/modules/installer/configuration.pm                    |    4 
 solenv/bin/modules/installer/profiles.pm                         |    4 
 sot/prj/d.lst                                                    |    2 
 sot/source/unoolestorage/register.cxx                            |    9 
 sot/util/makefile.mk                                             |    2 
 source/FileAccess.cxx                                            |    0 
 source/X11/X11_service.cxx                                       |    0 
 source/X11/makefile.mk                                           |    0 
 source/abpilot/makefile.mk                                       |    0 
 source/analysis/makefile.mk                                      |    0 
 source/app/appinit.cxx                                           |    0 
 source/app/makefile.mk                                           |    0 
 source/app/svapp.cxx                                             |    0 
 source/appl/appuno.cxx                                           |    0 
 source/awt/vclxtoolkit.cxx                                       |    0 
 source/awt/vclxwindow.cxx                                        |    0 
 source/backendhelper/componentdf.cxx                             |    0 
 source/backendhelper/makefile.mk                                 |    0 
 source/backends/desktopbe/desktopbecdef.cxx                      |    0 
 source/backends/desktopbe/makefile.mk                            |    0 
 source/backends/gconfbe/gconfbecdef.cxx                          |    0 
 source/backends/gconfbe/makefile.mk                              |    0 
 source/backends/localebe/localebecdef.cxx                        |    0 
 source/backends/localebe/makefile.mk                             |    0 
 source/basprov/makefile.mk                                       |    0 
 source/bibliography/makefile.mk                                  |    0 
 source/cairo/makefile.mk                                         |    0 
 source/components/factory.cxx                                    |    0 
 source/config/cache/makefile.mk                                  |    0 
 source/controller/makefile.mk                                    |    0 
 source/core/facreg.cxx                                           |    0 
 source/core/makefile.mk                                          |    0 
 source/core/ucbserv.cxx                                          |    0 
 source/cpool/makefile.mk                                         |    0 
 source/datefunc/makefile.mk                                      |    0 
 source/dbpilots/makefile.mk                                      |    0 
 source/dbtools/makefile.mk                                       |    0 
 source/deployment/gui/makefile.mk                                |    0 
 source/deployment/makefile.mk                                    |    0 
 source/deployment/misc/makefile.mk                               |    0 
 source/dialog/insdlg.cxx                                         |    0 
 source/dlgprov/makefile.mk                                       |    0 
 source/drivers/adabas/makefile.mk                                |    0 
 source/drivers/calc/makefile.mk                                  |    0 
 source/drivers/dbase/makefile.mk                                 |    0 
 source/drivers/evoab/makefile.mk                                 |    0 
 source/drivers/evoab2/makefile.mk                                |    0 
 source/drivers/file/makefile.mk                                  |    0 
 source/drivers/flat/makefile.mk                                  |    0 
 source/drivers/hsqldb/makefile.mk                                |    0 
 source/drivers/jdbc/makefile.mk                                  |    0 
 source/drivers/mysql/makefile.mk                                 |    0 
 source/drivers/odbc/makefile.mk                                  |    0 
 source/filter.vcl/egif/makefile.mk                               |    0 
 source/filter.vcl/eos2met/makefile.mk                            |    0 
 source/filter.vcl/epbm/makefile.mk                               |    0 
 source/filter.vcl/epgm/makefile.mk                               |    0 
 source/filter.vcl/epict/makefile.mk                              |    0 
 source/filter.vcl/eppm/makefile.mk                               |    0 
 source/filter.vcl/eps/makefile.mk                                |    0 
 source/filter.vcl/eras/makefile.mk                               |    0 
 source/filter.vcl/etiff/makefile.mk                              |    0 
 source/filter.vcl/expm/makefile.mk                               |    0 
 source/filter.vcl/icgm/makefile.mk                               |    0 
 source/filter.vcl/idxf/makefile.mk                               |    0 
 source/filter.vcl/ieps/makefile.mk                               |    0 
 source/filter.vcl/ios2met/makefile.mk                            |    0 
 source/filter.vcl/ipbm/makefile.mk                               |    0 
 source/filter.vcl/ipcd/makefile.mk                               |    0 
 source/filter.vcl/ipcx/makefile.mk                               |    0 
 source/filter.vcl/ipict/makefile.mk                              |    0 
 source/filter.vcl/ipsd/makefile.mk                               |    0 
 source/filter.vcl/iras/makefile.mk                               |    0 
 source/filter.vcl/itga/makefile.mk                               |    0 
 source/filter.vcl/itiff/makefile.mk                              |    0 
 source/filter/eppt/makefile.mk                                   |    0 
 source/filter/migration/makefile.mk                              |    0 
 source/filter/xml/makefile.mk                                    |    0 
 source/filtertracer/makefile.mk                                  |    0 
 source/flash/makefile.mk                                         |    0 
 source/fsstor/fsfactory.cxx                                      |    0 
 source/fsstor/fsstorage.cxx                                      |    0 
 source/fsstor/makefile.mk                                        |    0 
 source/generic/makefile.mk                                       |    0 
 source/gengal/makefile.mk                                        |    0 
 source/gnome/file_gnome.scp                                      |    0 
 source/gnome/module_gnome.scp                                    |    0 
 source/hatchwindow/makefile.mk                                   |    0 
 source/helper/registerservices.cxx                               |    0 
 source/helpprovider/makefile.mk                                  |    0 
 source/hyphenator/altlinuxhyph/hyphen/makefile.mk                |    0 
 source/inplace/outplace.cxx                                      |    0 
 source/inv/makefile.mk                                           |    0 
 source/isolang/makefile.mk                                       |    0 
 source/makefile.mk                                               |    0 
 source/manager/makefile.mk                                       |    0 
 source/manifest/UnoRegister.cxx                                  |    0 
 source/migration/services/makefile.mk                            |    0 
 source/misc/configunoreg.cxx                                     |    0 
 source/misc/facreg.cxx                                           |    0 
 source/misc/unoservices.cxx                                      |    0 
 source/model/makefile.mk                                         |    0 
 source/msfilter/powerpoint/makefile.mk                           |    0 
 source/nsplugin/source/makefile.mk                               |    0 
 source/null/makefile.mk                                          |    0 
 source/offacc/makefile.mk                                        |    0 
 source/office/makefile.mk                                        |    0 
 source/ooo/file_library_ooo.scp                                  |    0 
 source/ooo/module_hidden_ooo.scp                                 |    0 
 source/packer/makefile.mk                                        |    0 
 source/passwordcontainer/makefile.mk                             |    0 
 source/pdf/makefile.mk                                           |    0 
 source/persist/transbnd.cxx                                      |    0 
 source/pkgchk/makefile.mk                                        |    0 
 source/pkgchk/unopkg/makefile.mk                                 |    0 
 source/platformbe/componentdefn.cxx                              |    0 
 source/platformbe/makefile.mk                                    |    0 
 source/plugin/unx/makefile.mk                                    |    0 
 source/plugin/util/makefile.mk                                   |    0 
 source/preload/makefile.mk                                       |    0 
 source/prj/makefile.mk                                           |    0 
 source/productregistration/makefile.mk                           |    0 
 source/propctrlr/makefile.mk                                     |    0 
 source/protocolhandler/makefile.mk                               |    0 
 source/register/register3rdcomponents.cxx                        |    0 
 source/register/registerservices.cxx                             |    0 
 source/register/registertemp.cxx                                 |    0 
 source/registerservices/registerservices.cxx                     |    0 
 source/resource/makefile.mk                                      |    0 
 source/scanner/makefile.mk                                       |    0 
 source/service/makefile.mk                                       |    0 
 source/so_comp/makefile.mk                                       |    0 
 source/spellcheck/spell/makefile.mk                              |    0 
 source/splash/makefile.mk                                        |    0 
 source/splash/services_spl.cxx                                   |    0 
 source/stringresource/makefile.mk                                |    0 
 source/svg/makefile.mk                                           |    0 
 source/thesaurus/libnth/makefile.mk                              |    0 
 source/tools/makefile.mk                                         |    0 
 source/transform/makefile.mk                                     |    0 
 source/treeview/makefile.mk                                      |    0 
 source/ucbhelper/xtempfile.cxx                                   |    0 
 source/ucp/expand/makefile.mk                                    |    0 
 source/ucp/file/makefile.mk                                      |    0 
 source/ucp/file/prov.cxx                                         |    0 
 source/ucp/ftp/makefile.mk                                       |    0 
 source/ucp/gvfs/makefile.mk                                      |    0 
 source/ucp/gvfs/provider.cxx                                     |    0 
 source/ucp/hierarchy/makefile.mk                                 |    0 
 source/ucp/package/makefile.mk                                   |    0 
 source/ucp/tdoc/makefile.mk                                      |    0 
 source/ucp/webdav/makefile.mk                                    |    0 
 source/unix/sysshell/makefile.mk                                 |    0 
 source/uno/registerservices.cxx                                  |    0 
 source/uno/sbservices.cxx                                        |    0 
 source/unodialogs/textconversiondlgs/makefile.mk                 |    0 
 source/unographic/graphicuno.cxx                                 |    0 
 source/unoolestorage/register.cxx                                |    0 
 source/unx/gnome/makefile.mk                                     |    0 
 source/update/ui/makefile.mk                                     |    0 
 source/utility/makefile.mk                                       |    0 
 source/vcl/makefile.mk                                           |    0 
 source/view/makefile.mk                                          |    0 
 source/xine/makefile.mk                                          |    0 
 source/xmlextract/makefile.mk                                    |    0 
 source/xmlfilteradaptor/makefile.mk                              |    0 
 source/xmlfilterdetect/makefile.mk                               |    0 
 source/xsltdialog/makefile.mk                                    |    0 
 source/xsltfilter/makefile.mk                                    |    0 
 source/xstor/makefile.mk                                         |    0 
 starmath/util/makefile.mk                                        |   19 
 svtools/bmpmaker/makefile.mk                                     |    8 
 svtools/prj/build.lst                                            |    6 
 svtools/prj/d.lst                                                |    3 
 svtools/source/fsstor/fsfactory.cxx                              |   10 
 svtools/source/fsstor/fsstorage.cxx                              |    2 
 svtools/source/fsstor/makefile.mk                                |   16 
 svtools/source/hatchwindow/makefile.mk                           |    4 
 svtools/source/passwordcontainer/makefile.mk                     |    3 
 svtools/source/productregistration/makefile.mk                   |    5 
 svtools/source/uno/registerservices.cxx                          |   10 
 svtools/uno/makefile.mk                                          |    9 
 svtools/util/makefile.mk                                         |  130 
 svx/prj/build.lst                                                |    2 
 svx/source/gengal/makefile.mk                                    |   14 
 svx/source/unodialogs/textconversiondlgs/makefile.mk             |    8 
 svx/util/makefile.mk                                             |   33 
 sw/prj/build.lst                                                 |    2 
 sw/util/makefile.mk                                              |   49 
 toolkit/prj/d.lst                                                |    2 
 toolkit/source/awt/vclxtoolkit.cxx                               |   12 
 toolkit/source/awt/vclxwindow.cxx                                |    6 
 toolkit/source/helper/registerservices.cxx                       |    9 
 toolkit/util/makefile.mk                                         |    3 
 tools/bootstrp/addexes2/makefile.mk                              |    2 
 tools/bootstrp/makefile.mk                                       |    6 
 tools/prj/d.lst                                                  |    2 
 tools/util/makefile.mk                                           |    2 
 transex3/source/makefile.mk                                      |   37 
 ucb/prj/build.lst                                                |    2 
 ucb/prj/d.lst                                                    |    2 
 ucb/source/core/makefile.mk                                      |   19 
 ucb/source/core/ucbserv.cxx                                      |   11 
 ucb/source/ucp/expand/makefile.mk                                |    2 
 ucb/source/ucp/file/makefile.mk                                  |    2 
 ucb/source/ucp/file/prov.cxx                                     |   11 
 ucb/source/ucp/ftp/makefile.mk                                   |    2 
 ucb/source/ucp/gvfs/makefile.mk                                  |   17 
 ucb/source/ucp/gvfs/provider.cxx                                 |   11 
 ucb/source/ucp/hierarchy/makefile.mk                             |    5 
 ucb/source/ucp/package/makefile.mk                               |    5 
 ucb/source/ucp/tdoc/makefile.mk                                  |    5 
 ucb/source/ucp/webdav/makefile.mk                                |    3 
 ucbhelper/prj/d.lst                                              |    2 
 ucbhelper/util/makefile.mk                                       |    2 
 uno/makefile.mk                                                  |    0 
 unotools/prj/d.lst                                               |    2 
 unotools/source/ucbhelper/xtempfile.cxx                          |   10 
 unotools/util/makefile.mk                                        |    2 
 unoxml/prj/build.lst                                             |    2 
 unoxml/source/service/makefile.mk                                |    3 
 util/makefile.mk                                                 |    0 
 util/openoffice.lst                                              |    0 
 uui/util/makefile.mk                                             |    7 
 vcl/prj/d.lst                                                    |    3 
 vcl/source/app/svapp.cxx                                         |   13 
 vcl/source/components/factory.cxx                                |   11 
 vcl/util/makefile.mk                                             |   60 
 vcl/workben/makefile.mk                                          |   22 
 vos/util/makefile.mk                                             |   22 
 workben/makefile.mk                                              |    0 
 writerperfect/util/makefile.mk                                   |   10 
 xmlhelp/source/helpprovider/makefile.mk                          |    3 
 xmlhelp/source/treeview/makefile.mk                              |    3 
 xmlhelp/util/makefile.mk                                         |    4 
 xmloff/prj/build.lst                                             |    2 
 xmloff/prj/d.lst                                                 |    3 
 xmloff/source/core/facreg.cxx                                    |    9 
 xmloff/source/transform/makefile.mk                              |   10 
 xmloff/util/makefile.mk                                          |   67 
 xmlscript/prj/d.lst                                              |    2 
 xmlscript/source/misc/unoservices.cxx                            |   10 
 xmlscript/util/makefile.mk                                       |    3 
 xmlsecurity/util/makefile.mk                                     |   21 
 485 files changed, 6269 insertions(+), 2001 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.8 -r 1.9 openoffice.org-2.2.0.ooo53397.linkopt.patch
Index: openoffice.org-2.2.0.ooo53397.linkopt.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo53397.linkopt.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- openoffice.org-2.2.0.ooo53397.linkopt.patch	31 Mar 2007 15:54:41 -0000	1.8
+++ openoffice.org-2.2.0.ooo53397.linkopt.patch	12 Apr 2007 15:34:53 -0000	1.9
@@ -3252,86 +3252,6 @@
  			$(CPPUHELPERLIB) \
  			$(CPPULIB) \
  			$(SALLIB)
-Index: util/makefile.mk
-===================================================================
-RCS file: /cvs/sw/sw/util/makefile.mk,v
-retrieving revision 1.57
-diff -u -r1.57 makefile.mk
---- openoffice.org.orig/sw/util/makefile.mk	2 Jan 2007 16:55:04 -0000	1.57
-+++ openoffice.org/sw/util/makefile.mk	27 Mar 2007 19:29:53 -0000
-@@ -107,29 +107,13 @@
- 
- # dynamic libraries
- SHL1STDLIBS+= \
-+	-lsoffice \
- 	$(SVXLIB) \
--	$(SFXLIB) \
--	$(XMLOFFLIB) \
--	$(BASICLIB) \
--	$(GOODIESLIB) \
--	$(BASEGFXLIB) \
--	$(SVTOOLLIB) \
--	$(TKLIB) \
--	$(VCLLIB) \
--	$(SVLLIB)	\
--	$(SOTLIB) \
--	$(UNOTOOLSLIB) \
--	$(TOOLSLIB) \
--	$(I18NISOLANGLIB) \
--	$(COMPHELPERLIB) \
--	$(UCBHELPERLIB) \
- 	$(CPPUHELPERLIB) \
- 	$(CPPULIB) \
--	$(VOSLIB) \
- 	$(SALLIB) \
- 	$(SALHELPERLIB) \
-     $(ICUUCLIB) \
--	$(I18NUTILLIB)	\
-         $(AVMEDIALIB) \
-         $(XML2LIB)
- 
-@@ -155,15 +139,7 @@
- DEF2NAME=       $(SHL2TARGET)
- 
- SHL2STDLIBS= \
--            $(SFX2LIB) \
--            $(SVTOOLLIB) \
--            $(SVLLIB) \
--            $(VCLLIB) \
--            $(SOTLIB) \
--            $(TOOLSLIB) \
--	    $(UCBHELPERLIB) \
--	    $(UNOTOOLSLIB) \
--            $(COMPHELPERLIB) \
-+            -lsoffice \
-             $(CPPUHELPERLIB) \
-             $(CPPULIB) \
-             $(SALLIB)
-@@ -189,22 +165,11 @@
- 
- SHL3STDLIBS= \
- 		$(ISWLIB) \
-+	    -lsoffice \
-             $(SVXLIB) \
--            $(SFX2LIB) \
--            $(BASICLIB) \
--            $(SVTOOLLIB) \
--            $(TKLIB) \
--            $(VCLLIB) \
--            $(SOTLIB) \
--			$(SVLLIB) \
--			$(UNOTOOLSLIB) \
--            $(TOOLSLIB) \
--			$(COMPHELPERLIB) \
--			$(UCBHELPERLIB)	\
- 			$(CPPUHELPERLIB)	\
- 			$(CPPULIB) \
--            $(SALLIB) \
--			$(SOTLIB)
-+            $(SALLIB)
- 
- SHL3LIBS=   $(SLB)$/swui.lib
- LIB3TARGET = $(SLB)$/swui.lib
 Index: prj/d.lst
 ===================================================================
 RCS file: /cvs/gsl/toolkit/prj/d.lst,v
@@ -7331,333 +7251,119 @@
      const sal_Char* pImplementationName,
      void* pServiceManager,
      void*)
-Index: util/makefile.mk
+Index: source/app/svapp.cxx
 ===================================================================
-RCS file: /cvs/framework/desktop/util/makefile.mk,v
-retrieving revision 1.65
-diff -u -r1.65 makefile.mk
---- openoffice.org.orig/desktop/util/makefile.mk	2 Jan 2007 16:17:33 -0000	1.65
-+++ openoffice.org/desktop/util/makefile.mk	29 Mar 2007 08:03:52 -0000
-@@ -48,25 +48,24 @@
- VERINFONAME=verinfo
- 
- TARGETOBJS=	\
--			$(OBJ)$/main.obj				\
--			$(OBJ)$/app.obj					\
--			$(OBJ)$/lockfile.obj			\
--			$(OBJ)$/lockfile2.obj			\
--			$(OBJ)$/intro.obj				\
--			$(OBJ)$/officeipcthread.obj		\
--			$(OBJ)$/appinit.obj				\
--			$(OBJ)$/cmdlineargs.obj			\
--			$(OBJ)$/oinstanceprovider.obj	\
--			$(OBJ)$/opluginframefactory.obj	\
--			$(OBJ)$/appsys.obj				\
--			$(OBJ)$/desktopresid.obj		\
--			$(OBJ)$/dispatchwatcher.obj		\
--			$(OBJ)$/configinit.obj				\
--			$(OBJ)$/checkinstall.obj		\
--			$(OBJ)$/cmdlinehelp.obj         \
--			$(OBJ)$/langselect.obj          \
--			$(OBJ)$/userinstall.obj         \
--			$(OBJ)$/desktopcontext.obj
-+			$(SLO)$/main.obj				\
-+			$(SLO)$/app.obj					\
-+			$(SLO)$/lockfile.obj			\
-+			$(SLO)$/lockfile2.obj			\
-+			$(SLO)$/intro.obj				\
-+			$(SLO)$/officeipcthread.obj		\
-+			$(SLO)$/appinit.obj				\
-+			$(SLO)$/cmdlineargs.obj			\
-+			$(SLO)$/oinstanceprovider.obj	\
-+			$(SLO)$/opluginframefactory.obj	\
-+			$(SLO)$/desktopresid.obj		\
-+			$(SLO)$/dispatchwatcher.obj		\
-+			$(SLO)$/configinit.obj				\
-+			$(SLO)$/checkinstall.obj		\
-+			$(SLO)$/cmdlinehelp.obj         \
-+			$(SLO)$/langselect.obj          \
-+			$(SLO)$/userinstall.obj         \
-+			$(SLO)$/desktopcontext.obj
+RCS file: /cvs/gsl/vcl/source/app/svapp.cxx,v
+retrieving revision 1.72.106.2
+diff -u -r1.72.106.2 svapp.cxx
+--- openoffice.org.orig/vcl/source/app/svapp.cxx	24 Jan 2007 13:31:59 -0000	1.72.106.2
++++ openoffice.org/vcl/source/app/svapp.cxx	20 Mar 2007 11:00:24 -0000
+@@ -144,6 +144,7 @@
  
+ #include <utility>
+ #include "lazydelete.hxx"
++#include <dlfcn.h>
  
+ using namespace ::com::sun::star::uno;
  
-@@ -82,7 +81,7 @@
+@@ -1667,16 +1669,10 @@
+     static BOOL bAlreadyTriedToCreate = FALSE;
+     if ( !pSVData->mpUnoWrapper && bCreateIfNotExist && !bAlreadyTriedToCreate )
+     {
+-        ::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName( "tk", TRUE );
+-        oslModule hTkLib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_DEFAULT );
+-        if ( hTkLib )
++	FN_TkCreateUnoWrapper fnCreateWrapper = (FN_TkCreateUnoWrapper)dlsym(RTLD_DEFAULT, "CreateUnoWrapper");
++        if ( fnCreateWrapper )
+         {
+-            ::rtl::OUString aFunctionName( RTL_CONSTASCII_USTRINGPARAM( "CreateUnoWrapper" ) );
+-            FN_TkCreateUnoWrapper fnCreateWrapper = (FN_TkCreateUnoWrapper)osl_getFunctionSymbol( hTkLib, aFunctionName.pData );
+-            if ( fnCreateWrapper )
+-            {
+-                pSVData->mpUnoWrapper = fnCreateWrapper();
+-            }
++            pSVData->mpUnoWrapper = fnCreateWrapper();
+         }
+         DBG_ASSERT( pSVData->mpUnoWrapper, "UnoWrapper could not be created!" );
+         bAlreadyTriedToCreate = TRUE;
+Index: source/awt/vclxtoolkit.cxx
+===================================================================
+RCS file: /cvs/gsl/toolkit/source/awt/vclxtoolkit.cxx,v
+retrieving revision 1.53
+diff -u -r1.53 vclxtoolkit.cxx
+--- openoffice.org.orig/toolkit/source/awt/vclxtoolkit.cxx	20 Dec 2006 13:52:30 -0000	1.53
++++ openoffice.org/toolkit/source/awt/vclxtoolkit.cxx	20 Mar 2007 11:01:15 -0000
+@@ -249,6 +249,8 @@
+ #include <comphelper/processfactory.hxx>
+ #endif
  
- LIB1TARGET=$(SLB)$/$(TARGET).lib
- LIB1FILES=$(TARGETOBJS)
--LIB1FILES += $(OBJ)$/copyright_ascii_sun.obj
-+LIB1FILES += $(SLO)$/copyright_ascii_sun.obj
++#include <dlfcn.h>
++
+ namespace css = ::com::sun::star;
[...5624 lines suppressed...]
+-			$(OBJ)$/dispatchwatcher.obj		\
+-			$(OBJ)$/configinit.obj				\
+-			$(OBJ)$/checkinstall.obj		\
+-			$(OBJ)$/cmdlinehelp.obj         \
+-			$(OBJ)$/langselect.obj          \
+-			$(OBJ)$/userinstall.obj         \
+-			$(OBJ)$/desktopcontext.obj
++			$(SLO)$/main.obj				\
++			$(SLO)$/app.obj					\
++			$(SLO)$/lockfile.obj			\
++			$(SLO)$/lockfile2.obj			\
++			$(SLO)$/intro.obj				\
++			$(SLO)$/officeipcthread.obj		\
++			$(SLO)$/appinit.obj				\
++			$(SLO)$/cmdlineargs.obj			\
++			$(SLO)$/oinstanceprovider.obj	\
++			$(SLO)$/opluginframefactory.obj	\
++			$(SLO)$/desktopresid.obj		\
++			$(SLO)$/dispatchwatcher.obj		\
++			$(SLO)$/configinit.obj				\
++			$(SLO)$/checkinstall.obj		\
++			$(SLO)$/cmdlinehelp.obj         \
++			$(SLO)$/langselect.obj          \
++			$(SLO)$/userinstall.obj         \
++			$(SLO)$/desktopcontext.obj
+ 
+ 
+ 
+@@ -82,7 +81,7 @@
+ 
+ LIB1TARGET=$(SLB)$/$(TARGET).lib
+ LIB1FILES=$(TARGETOBJS)
+-LIB1FILES += $(OBJ)$/copyright_ascii_sun.obj
++LIB1FILES += $(SLO)$/copyright_ascii_sun.obj
+ 
+ #LIB2TARGET=$(SLB)$/officeloader.lib
+ #LIB2FILES=$(OBJ)$/officeloader.obj
+@@ -101,9 +100,9 @@
+ # winXX is handled like solaris for now
+ APP1_STDPRE=
+ APP1_STDPOST=$(CPPULIB) $(CPPUHELPERLIB) $(UNOLIB) $(TOOLSLIB) \
+-	$(VOSLIB) $(SALLIB)
++	$(SALLIB)
+ .ELSE
+-APP1_STDPRE=$(SALLIB) $(VOSLIB) $(TOOLSLIB) $(UNOLIB) $(CPPULIB) \
++APP1_STDPRE=$(SALLIB) $(UNOLIB) $(CPPULIB) \
+ 	$(CPPUHELPERLIB)
+ APP1_STDPOST=
+ .ENDIF
+@@ -114,20 +113,79 @@
+                     $(SRS)$/wizard.srs
+ 
+ APP1TARGET=so$/$(TARGET)
++SHL1TARGET=$(TARGET)
++SHL1OBJS=$(TARGETOBJS)
++SHL1DEPN=$(MISC)$/ldorder
++
++PKGCONFIG_MODULES=gtk+-unix-print-2.0 gnome-vfs-2.0 gconf-2.0 gobject-2.0 ORBit-2.0 glib-2.0
++.INCLUDE: pkg_config.mk
++
++SHL1STDLIBS+= \
++	-Wl,-T,$(MISC)$/ldorder \
++        -Wl,--whole-archive \
++        -llinkopt.comphelp \
++        -llinkopt.basegfx \
++        -llinkopt.vos \
++	-llinkopt.i18npool.uno \
++	-llinkopt.i18nutil \
++        -llinkopt.sot \
++        -llinkopt.fwe \
++        -llinkopt.svt \
++        -llinkopt.fwi \
++        -llinkopt.tk \
++        -llinkopt.fwk \
++        -llinkopt.tl \
++        -llinkopt.fwl \
++        -llinkopt.ucbhelper \
++        -llinkopt.fwm \
++        -llinkopt.ucb \
++        -llinkopt.ucpgvfs \
++        -llinkopt.ucpfile \
++        -llinkopt.go \
++        -llinkopt.utl \
++        -llinkopt.i18nisolang \
++        -llinkopt.vcl \
++        -llinkopt.psp \
++        -llinkopt.xo \
++        -llinkopt.sb \
++        -llinkopt.xcr \
++        -llinkopt.sfx \
++        -llinkopt.so \
++        -llinkopt.j_g \
++	-llinkopt.fileacc \
++	-llinkopt.desktopbe \
++	-llinkopt.gconfbe \
++	-llinkopt.localebe \
++	-llinkopt.dtransX11 \
++	-llinkopt.spl \
++	-llinkopt.configmgr \
++	-llinkopt.sysmgr \
++	-llinkopt.behelper \
++	-llinkopt.package \
++	-llinkopt.fsstorage.uno \
++        -Wl,--no-whole-archive \
++        $(ICUUCLIB)                 \
++        $(ICUINLIB)                 \
++        $(ICULELIB)                 \
++        $(JVMFWKLIB)            \
++        $(JVMACCESSLIB)         \
++        $(SYSSHELLLIB) \
++        $(CPPULIB) \
++        $(CPPUHELPERLIB) \
++        $(SALHELPERLIB) \
++        $(SALLIB) \
++        $(PKGCONFIG_LIBS) \
++        $(FREETYPELIB) \
++        -lfontconfig \
++        -lX11 \
++        $(JPEG3RDLIB) \
++        $(ZLIB3RDLIB)
++
+ APP1NOSAL=TRUE
+ APP1STDLIBS=			\
+-	$(VCLLIB)			\
+-    $(SVLLIB)           \
+-    $(SVTOOLLIB)            \
+-	$(UNOTOOLSLIB)		\
+-	$(TOOLSLIB)			\
+-	$(I18NISOLANGLIB)   \
+-	$(COMPHELPERLIB)	\
+-	$(UCBHELPERLIB)		\
+-	$(VOSLIB)			\
++	-lsoffice \
+ 	$(CPPUHELPERLIB)	\
+ 	$(CPPULIB)			\
+-    $(TKLIB)            \
+         $(SALLIB)
+ 
+ 
+@@ -141,8 +199,7 @@
+ #	$(COMPHELPERLIB)	\
+ #	$(SALHELPERLIB)		\
+ 
+-APP1OBJS=$(TARGETOBJS)
+-APP1OBJS += $(OBJ)$/copyright_ascii_sun.obj
++APP1OBJS += $(SLO)$/copyright_ascii_sun.obj
+ 
+ .IF "$(GUI)" == "UNX"
+ .IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
+@@ -170,22 +227,12 @@
+ APP5TARGET=soffice
+ APP5NOSAL=TRUE
+ APP5STDLIBS=			\
+-	$(VCLLIB)			\
+-	$(SVLLIB)			\
+-    $(SVTOOLLIB)        \
+-    $(UNOTOOLSLIB)      \
+-	$(TOOLSLIB)			\
+-	$(I18NISOLANGLIB)   \
+-	$(COMPHELPERLIB)	\
+-	$(UCBHELPERLIB)		\
+-	$(VOSLIB)			\
++	-lsoffice \
+ 	$(CPPUHELPERLIB)	\
+ 	$(CPPULIB)			\
+-	$(SALLIB)			\
+-	$(TKLIB)
++	$(SALLIB)
+ 
+-APP5OBJS=$(TARGETOBJS)
+-APP5OBJS += $(OBJ)$/copyright_ascii_ooo.obj
++APP5OBJS += $(SLO)$/copyright_ascii_ooo.obj
+ 
+ .IF "$(OS)" == "LINUX"
+ APP5STDLIBS+= -lXext -lSM -lICE
+@@ -211,7 +258,7 @@
+ APP6LINKRES=$(MISC)$/soffice6.res
+ APP6ICON=$(SOLARRESDIR)$/icons/so8-main-app.ico
+ APP6OBJS = \
+-		$(OBJ)$/officeloader.obj
++		$(SLO)$/officeloader.obj
+ STDLIB6=advapi32.lib
+ 
+ APP7TARGET=officeloader
+@@ -222,7 +269,7 @@
+ APP7LINKRES=$(MISC)$/ooffice7.res
+ APP7ICON=$(SOLARRESDIR)$/icons/ooo-main-app.ico
+ APP7OBJS = \
+-		$(OBJ)$/officeloader.obj
++		$(SLO)$/officeloader.obj
+ STDLIB7=advapi32.lib
+ .ENDIF # WNT
+ 
+@@ -286,3 +333,6 @@
+ $(BIN)$/so: makefile.mk
+ 	@echo APP5 : $(APP5TARGET)
+ 	@+-mkdir $(BIN)$/so >& $(NULLDEV)
++
++$(MISC)$/ldorder: symbolorder
++   mklinkscript.pl symbolorder > $(MISC)$/ldorder


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1162
retrieving revision 1.1163
diff -u -r1.1162 -r1.1163
--- openoffice.org.spec	11 Apr 2007 07:15:05 -0000	1.1162
+++ openoffice.org.spec	12 Apr 2007 15:34:54 -0000	1.1163
@@ -128,11 +128,8 @@
 Patch69: openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch
 Patch70: openoffice.org-2.2.0.ooo75329.xdguserdir.patch
 Patch71: openoffice.org-2.2.0.rh232389.tango.patch
-%if %{linkopt}
 Patch72: openoffice.org-2.2.0.ooo53397.linkopt.patch
-%endif
 Patch73: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
-Patch74: workspace.glyphadv.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1056,10 +1053,13 @@
 %patch72 -p1 -b .ooo53397.linkopt.patch
 %endif
 %patch73 -p1 -b .ooo75790.sc.pa-IN.translate.patch
-%patch74 -p1 -b .workspace.glyphadv.patch
 
 cp %{SOURCE1} extras/source/database/evolocal.odb
 
+%if %{linkopt}
+chmod a+x solenv/bin/mklinkscript.pl
+%endif
+
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
 #don't build localized helps which are poorly translated
@@ -2629,6 +2629,7 @@
 %changelog
 * Wed Apr 11 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.5
 - Resolves: rhbz#235828 INIFILE optimization breaks addins
+- Resolves: rhbz#235325 crash on launch of x86_64 soffice.bin
 
 * Fri Apr 06 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.4
 - Resolves: rhbz#235341 pdf overlapping characters


--- workspace.glyphadv.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 12 15:57:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 11:57:36 -0400
Subject: rpms/kernel/FC-6/configs config-generic, 1.266,
	1.266.6.1 config-powerpc64-iseries, 1.16,
	1.16.14.1 config-s390-generic, 1.22, 1.22.48.1
Message-ID: <200704121557.l3CFvaFE025480@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-jwltest-fc6-31-branch
	config-generic config-powerpc64-iseries config-s390-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-generic,v
retrieving revision 1.266
retrieving revision 1.266.6.1
diff -u -r1.266 -r1.266.6.1
--- config-generic	16 Mar 2007 21:48:02 -0000	1.266
+++ config-generic	12 Apr 2007 15:57:34 -0000	1.266.6.1
@@ -933,6 +933,9 @@
 # CONFIG_TIPC_DEBUG is not set
 
 CONFIG_NETLABEL=y
+CONFIG_CFG80211=m
+# CONFIG_CFG80211_WEXT_COMPAT is not set
+# CONFIG_NL80211 is not set
 
 #
 # QoS and/or fair queueing
@@ -1091,6 +1094,7 @@
 CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_ADAPTEC_STARFIRE_NAPI=y
 CONFIG_B44=m
+CONFIG_B44_PCI=y
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
 # CONFIG_DGRS is not set
@@ -1178,26 +1182,27 @@
 # CONFIG_SLIP_MODE_SLIP6 is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
+# Wireless LAN
 #
+CONFIG_WLAN_PRE80211=y
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
+CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 
-#
-# Wireless 802.11b ISA/PCI cards support
-#
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+CONFIG_MAC80211_DEBUG=y
+# CONFIG_MAC80211_VERBOSE_DEBUG is not set
+CONFIG_MAC80211_LOWTX_FRAME_DUMP=y
+CONFIG_TKIP_DEBUG=y
+CONFIG_MAC80211_DEBUG_COUNTERS=y
+CONFIG_HOSTAPD_WPA_TESTING=y
+CONFIG_MAC80211_IBSS_DEBUG=y
+CONFIG_MAC80211_VERBOSE_PS_DEBUG=y
 CONFIG_IEEE80211=m
 CONFIG_IEEE80211_DEBUG=y
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -1212,6 +1217,38 @@
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_BCM43XX_MAC80211=m
+CONFIG_BCM43XX_MAC80211_PCI=y
+CONFIG_BCM43XX_MAC80211_PCMCIA=y
+CONFIG_BCM43XX_MAC80211_DEBUG=y
+CONFIG_BCM43XX_MAC80211_DMA=y
+CONFIG_BCM43XX_MAC80211_PIO=y
+CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set
+# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set
+CONFIG_RT2X00=y
+CONFIG_RT2400PCI=m
+CONFIG_RT2400PCI_DEBUG=y
+CONFIG_RT2500PCI=m
+CONFIG_RT2500PCI_DEBUG=y
+CONFIG_RT61PCI=m
+CONFIG_RT61PCI_DEBUG=y
+CONFIG_RT2500USB=m
+CONFIG_RT2500USB_DEBUG=y
+CONFIG_RT73USB=m
+CONFIG_RT73USB_DEBUG=y
+CONFIG_RT2X00_DEBUGFS=m
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_ADM8211=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_ZD1211RW_MAC80211=m
+CONFIG_ZD1211RW_MAC80211_DEBUG=y
+CONFIG_RTL818X=y
+CONFIG_RTL8187=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_DEBUG=y
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1223,10 +1260,6 @@
 CONFIG_PRISM54=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
@@ -1561,6 +1594,7 @@
 CONFIG_N_HDLC=m
 # CONFIG_STALDRV is not set
 # CONFIG_IBM_ASM is not set
+CONFIG_SONICS_SILICON_BACKPLANE=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
 CONFIG_TCG_TPM=m
@@ -1848,6 +1882,14 @@
 CONFIG_MAX_RAW_DEVS=8192
 CONFIG_HANGCHECK_TIMER=m
 
+CONFIG_SSB=m
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SILENT=n
+CONFIG_SSB_DEBUG=n
+CONFIG_SSB_SERIAL=n
+CONFIG_SSB_DRIVER_PCICORE=y
+
 #
 # Multimedia devices
 #
@@ -2233,6 +2275,7 @@
 CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_CS=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
 
 #
 # USB Device Class drivers
@@ -2780,6 +2823,8 @@
 #
 CONFIG_CRC16=m
 CONFIG_CRC32=m
+CONFIG_CRC_ITU_T=m
+CONFIG_EEPROM_93CX6=m
 CONFIG_CRC_CCITT=m
 
 CONFIG_ZLIB_INFLATE=y


Index: config-powerpc64-iseries
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-powerpc64-iseries,v
retrieving revision 1.16
retrieving revision 1.16.14.1
diff -u -r1.16 -r1.16.14.1
--- config-powerpc64-iseries	15 Feb 2007 17:29:30 -0000	1.16
+++ config-powerpc64-iseries	12 Apr 2007 15:57:34 -0000	1.16.14.1
@@ -58,6 +58,7 @@
 CONFIG_SCSI_IBMVSCSI=m
 CONFIG_SERIAL_ICOM=m
 # CONFIG_ISDN is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_DVB is not set
 # CONFIG_VIDEO_DEV is not set


Index: config-s390-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-s390-generic,v
retrieving revision 1.22
retrieving revision 1.22.48.1
diff -u -r1.22 -r1.22.48.1
--- config-s390-generic	21 Dec 2006 21:45:14 -0000	1.22
+++ config-s390-generic	12 Apr 2007 15:57:34 -0000	1.22.48.1
@@ -116,6 +116,7 @@
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 # CONFIG_NET_RADIO is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 
 # The s390 CPU does not have hardware support for big pages at all.



From fedora-cvs-commits at redhat.com  Thu Apr 12 15:57:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 11:57:36 -0400
Subject: rpms/kernel/FC-6 jwltest-iwlwifi-fixes.patch, NONE,
	1.1.6.1 jwltest-iwlwifi.patch, NONE,
	1.1.18.1 jwltest-mac80211-backport-2_6_20-fixup.patch, NONE,
	1.1.8.1 jwltest-mac80211-backport.patch, NONE,
	1.1.18.1 jwltest-softmac_wx_get_rate-running-check.patch, NONE,
	1.1.34.1 kernel-2.6.spec, 1.2933, 1.2933.6.1
Message-ID: <200704121557.l3CFvasC025465@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-jwltest-fc6-31-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-linville-jwltest-fc6-31-branch
	jwltest-iwlwifi-fixes.patch jwltest-iwlwifi.patch 
	jwltest-mac80211-backport-2_6_20-fixup.patch 
	jwltest-mac80211-backport.patch 
	jwltest-softmac_wx_get_rate-running-check.patch 
Log Message:


jwltest-iwlwifi-fixes.patch:
 base.c    |    1 +
 iwlwifi.h |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE jwltest-iwlwifi-fixes.patch ---
--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig	2007-04-12 11:36:00.000000000 -0400
+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-04-12 11:37:18.000000000 -0400
@@ -12970,6 +12970,7 @@ static int ipw_pci_probe(struct pci_dev 
 	err = ipw_read_ucode(priv);
 	if (err) {
 		IPW_ERROR("Could not read microcode from disk: %d\n", err);
+		mutex_unlock(&priv->mutex);
 		goto out_remove_sysfs;
 	}
 
--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h.orig	2007-04-12 11:36:00.000000000 -0400
+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h	2007-04-12 11:37:18.000000000 -0400
@@ -180,7 +180,7 @@ do { if (ipw_debug_level & (level)) \
 #define IPW_DL_QOS           (1<<31)
 
 #define IPW_ERROR(f, a...) printk(KERN_ERR DRV_NAME ": " f, ## a)
-#define IPW_WARNING(f, a...) printk(KERN_ERR DRV_NAME ": " f, ## a)
+#define IPW_WARNING(f, a...) printk(KERN_WARNING DRV_NAME ": " f, ## a)
 #define IPW_DEBUG_INFO(f, a...)    IPW_DEBUG(IPW_DL_INFO, f, ## a)
 
 #define IPW_DEBUG_MAC80211(f, a...)     IPW_DEBUG(IPW_DL_MAC80211, f, ## a)

jwltest-iwlwifi.patch:
 Kconfig              |    1 
 Makefile             |    1 
 iwlwifi/Kconfig      |   52 
 iwlwifi/Makefile     |    2 
 iwlwifi/base.c       |13762 +++++++++++++++++++++++++++++++++++++++++++++++++++
 iwlwifi/iwlwifi.h    | 1297 ++++
 iwlwifi/iwlwifi_hw.h | 1877 ++++++
 7 files changed, 16992 insertions(+)

--- NEW FILE jwltest-iwlwifi.patch ---
--- /dev/null	2007-03-09 11:47:32.684268720 -0500
+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-04-12 11:36:00.000000000 -0400
@@ -0,0 +1,13762 @@
+/******************************************************************************
+
+  Copyright(c) 2003 - 2006 Intel Corporation. All rights reserved.
+
+  Portions of this file are derived from the ipw3945 project, as well
+  as portions of the ieee80211 subsystem header files.
+
+  802.11 status code portion of this file from ethereal-0.10.6:
+    Copyright 2000, Axis Communications AB
+    Ethereal - Network traffic analyzer
+    By Gerald Combs <gerald at ethereal.com>
+    Copyright 1998 Gerald Combs
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of version 2 of the GNU General Public License as
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+
+  Contact Information:
+  James P. Ketrenos <ipw2100-admin at linux.intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+******************************************************************************/
+
+/*
+ * Theory of operation:
+ *
+ * The primary NIC mode of operation is configured within the RXON command.
+ * As such, there are two instances of RXON data -- staging_rxon and
+ * active_rxon.  The former is used to configure the device, the later to
+ * reflect the actual currently active configuration.
+ *
+ * After configuring staging_rxon, it is activated by calling
+ * ipw_commit_rxon(). The ipw_commit_rxon() will ensure the correct sequence
+ * of commands are invoked on the hardware to result in Tx being possible
+ * (if the channel is appropriate for Tx)
+ *
+ * About the threading and lock model of the driver...
+ *
+ * There are three paths of execution through the driver.
+ *
+ * 1.  ioctl based (wireless extensions, netdev, etc.)
+ * 2.  interrupt based
+ * 3.  scheduled work queue items
+ *
+ * As soon as an interrupt comes in, it schedules a tasklet.  That tasklet,
+ * when run, does any HW checks, pulls any data from the read queue,
+ * and schedules other layers to do the actual work.
+ *
+ * NOTE: This driver is a work in progress.  It is currently structured
+ * in a way that we can add support for the next wireless adapter
+ * available from Intel.
+ *
+ * Our current focus is as follows:
+ * 1.  Get the driver working w/ mac80211 in STA(client) mode.
+ * 2.  Clean up the dual-driver code from function redirection to
+ *     if/else switches where the code detlas are minimal.
+ * 3.  Evaluate the amount of delta between the hardware versions and
+ *     possibly split iwlwifi into multiple drivers for each piece of
+ *     HW, sharing as much base code as possible (would result in
+ *     multiple driver files on disk vs. a single module that works
+ *     with multiple hardware types)
+ * 4.  Document the uCode regulatory enforcement
+ * 5.  Document the rate scaling capabilities of the 3945
+ * 6.  Provide an initial rate scaling algorithm tailored for the
+ *     statistic data exposed by the 3945.
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/dma-mapping.h>
+#include <linux/delay.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/wireless.h>
+#include <linux/firmware.h>
+#include <net/iw_handler.h>
+
+//#define BIT(x) (1 << (x))
+#include <net/mac80211.h>
+#include <net/ieee80211.h>
+
+#include <../net/mac80211/ieee80211_rate.h>
+
+#include <net/ieee80211_radiotap.h>
+	
+#ifndef ETH_P_80211_RAW
+#define ETH_P_80211_RAW (ETH_P_ECONET + 1)
+#endif
+
+#include <linux/if_arp.h>
+#include <asm/div64.h>
+
+#include "iwlwifi.h"
+
+#define IWLWIFI_VERSION "0.0.12k"
+
+#define DRV_DESCRIPTION	"Intel(R) Wireless Link driver for Linux"
+#define DRV_COPYRIGHT	"Copyright(c) 2003-2006 Intel Corporation"
+#define DRV_VERSION     IWLWIFI_VERSION
+
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR(DRV_COPYRIGHT);
+MODULE_LICENSE("GPL");
+
+/*MAC80211  move this to mac80211 files */
+#define IEEE80211_FC(type, stype) cpu_to_le16((type << 2) | (stype << 4))
+
+#define IEEE80211_CHAN_W_RADAR_DETECT 0x00000010
+
+#define IEEE80211_24GHZ_BAND     (1<<0)
+#define IEEE80211_52GHZ_BAND     (1<<1)
+
+#define IEEE80211_CCK_RATE_1MB                  0x02
+#define IEEE80211_CCK_RATE_2MB                  0x04
+#define IEEE80211_CCK_RATE_5MB                  0x0B
+#define IEEE80211_CCK_RATE_11MB                 0x16
+#define IEEE80211_OFDM_RATE_6MB                 0x0C
+#define IEEE80211_OFDM_RATE_9MB                 0x12
+#define IEEE80211_OFDM_RATE_12MB                0x18
+#define IEEE80211_OFDM_RATE_18MB                0x24
+#define IEEE80211_OFDM_RATE_24MB                0x30
+#define IEEE80211_OFDM_RATE_36MB                0x48
+#define IEEE80211_OFDM_RATE_48MB                0x60
+#define IEEE80211_OFDM_RATE_54MB                0x6C
+#define IEEE80211_BASIC_RATE_MASK               0x80
+
+#define IEEE80211_CCK_RATE_1MB_MASK             (1<<0)
+#define IEEE80211_CCK_RATE_2MB_MASK             (1<<1)
+#define IEEE80211_CCK_RATE_5MB_MASK             (1<<2)
+#define IEEE80211_CCK_RATE_11MB_MASK            (1<<3)
+#define IEEE80211_OFDM_RATE_6MB_MASK            (1<<4)
+#define IEEE80211_OFDM_RATE_9MB_MASK            (1<<5)
+#define IEEE80211_OFDM_RATE_12MB_MASK           (1<<6)
+#define IEEE80211_OFDM_RATE_18MB_MASK           (1<<7)
+#define IEEE80211_OFDM_RATE_24MB_MASK           (1<<8)
+#define IEEE80211_OFDM_RATE_36MB_MASK           (1<<9)
+#define IEEE80211_OFDM_RATE_48MB_MASK           (1<<10)
+#define IEEE80211_OFDM_RATE_54MB_MASK           (1<<11)
+
+#define IEEE80211_CCK_RATES_MASK                0x0000000F
+#define IEEE80211_CCK_BASIC_RATES_MASK  (IEEE80211_CCK_RATE_1MB_MASK | \
+        IEEE80211_CCK_RATE_2MB_MASK)
+#define IEEE80211_CCK_DEFAULT_RATES_MASK        (IEEE80211_CCK_BASIC_RATES_MASK | \
+        IEEE80211_CCK_RATE_5MB_MASK | \
+        IEEE80211_CCK_RATE_11MB_MASK)
+
+#define IEEE80211_OFDM_RATES_MASK               0x00000FF0
+#define IEEE80211_OFDM_BASIC_RATES_MASK (IEEE80211_OFDM_RATE_6MB_MASK | \
+        IEEE80211_OFDM_RATE_12MB_MASK | \
+        IEEE80211_OFDM_RATE_24MB_MASK)
+#define IEEE80211_OFDM_DEFAULT_RATES_MASK       (IEEE80211_OFDM_BASIC_RATES_MASK | \
+        IEEE80211_OFDM_RATE_9MB_MASK  | \
+        IEEE80211_OFDM_RATE_18MB_MASK | \
+        IEEE80211_OFDM_RATE_36MB_MASK | \
+        IEEE80211_OFDM_RATE_48MB_MASK | \
+        IEEE80211_OFDM_RATE_54MB_MASK)
+#define IEEE80211_DEFAULT_RATES_MASK (IEEE80211_OFDM_DEFAULT_RATES_MASK | \
+                                IEEE80211_CCK_DEFAULT_RATES_MASK)
+
+#define IEEE80211_NUM_OFDM_RATES            8
+#define IEEE80211_NUM_CCK_RATES             4
+#define IEEE80211_OFDM_SHIFT_MASK_A         4
+
+/*MAC80211 end */
+
+static u32 ipw_debug_level;
+
+static int param_debug = 0;
+static int param_channel = 0;
+static int param_mode = 0;
+static int param_auto_create = 1;	/* def: create new adhoc network if needed */
+static int param_led = 1;	/* def: use LEDs */
+static int param_disable = 0;	/* def: enable radio */
+static int param_antenna = 0;	/* def: 0 = both antennas (use diversity) */
+static int param_hwcrypto = 0;	/* def: using software encryption */
+static int param_qos_enable = 1;
+static int param_rtap_iface = 0;
+
+static const char ipw_modes[] = {
+	'a', 'b', 'g', '?'
+};
[...16620 lines suppressed...]
+	u8 flags;
+	/* We have 15 LSB to use as we please (MSB indicates
+	 * a frame Rx'd from the HW).  We encode the following
+	 * information into the sequence field:
+	 *
+	 *  0:7    index in fifo
+	 *  8:13   fifo selection
+	 * 14:14   bit indicating if this packet references the 'extra'
+	 *         storage at the end of the memory queue
+	 * 15:15   (Rx indication)
+	 *
+	 */
+	u16 sequence;
+
+	/* command data follows immediately */
+	u8 data[0];
+} __attribute__ ((packed));
+
+// Used for passing to driver number of successes and failures per rate
+struct rate_histogram {
+	union {
+		u32 a[SUP_RATE_11A_MAX_NUM_CHANNELS];
+		u32 b[SUP_RATE_11B_MAX_NUM_CHANNELS];
+		u32 g[SUP_RATE_11G_MAX_NUM_CHANNELS];
+	} success;
+	union {
+		u32 a[SUP_RATE_11A_MAX_NUM_CHANNELS];
+		u32 b[SUP_RATE_11B_MAX_NUM_CHANNELS];
+		u32 g[SUP_RATE_11G_MAX_NUM_CHANNELS];
+	} failed;
+} __attribute__ ((packed));
+
+/* statistics command response */
+
+struct statistics_rx_phy {
+	u32 ina_cnt;
+	u32 fina_cnt;
+	u32 plcp_err;
+	u32 crc32_err;
+	u32 overrun_err;
+	u32 early_overrun_err;
+	u32 crc32_good;
+	u32 false_alarm_cnt;
+	u32 fina_sync_err_cnt;
+	u32 sfd_timeout;
+	u32 fina_timeout;
+	u32 unresponded_rts;
+	u32 rxe_frame_limit_overrun;
+	u32 sent_ack_cnt;
+	u32 sent_cts_cnt;
+} __attribute__ ((packed));
+
+struct statistics_rx {
+	struct statistics_rx_phy ofdm;
+	struct statistics_rx_phy cck;
+	u32 bogus_cts;
+	u32 bogus_ack;
+	u32 non_bssid_frames;
+	u32 filtered_frames;
+	u32 non_channel_beacons;
+} __attribute__ ((packed));
+
+struct statistics_tx {
+	u32 preamble_cnt;
+	u32 rx_detected_cnt;
+	u32 bt_prio_defer_cnt;
+	u32 bt_prio_kill_cnt;
+	u32 few_bytes_cnt;
+	u32 cts_timeout;
+	u32 ack_timeout;
+	u32 expected_ack_cnt;
+	u32 actual_ack_cnt;
+} __attribute__ ((packed));
+
+struct statistics_dbg {
+	u32 burst_check;
+	u32 burst_count;
+	u32 reserved[4];
+} __attribute__ ((packed));
+
+struct statistics_div {
+	u32 tx_on_a;
+	u32 tx_on_b;
+	u32 exec_time;
+	u32 probe_time;
+} __attribute__ ((packed));
+
+struct statistics_general {
+	u32 temperature;
+	struct statistics_dbg dbg;
+	u32 sleep_time;
+	u32 slots_out;
+	u32 slots_idle;
+	u32 ttl_timestamp;
+	struct statistics_div div;
+} __attribute__ ((packed));
+
+struct ipw_notif_statistics {
+	u32 flag;
+	struct statistics_rx rx;
+	struct statistics_tx tx;
+	struct statistics_general general;
+} __attribute__ ((packed));
+
+struct ipw_rx_packet {
+	u32 len;
+	struct ipw_cmd_header hdr;
+	union {
+		struct ipw_alive_resp alive_frame;
+		struct ipw_rx_frame rx_frame;
+		struct ipw_tx_resp tx_resp;
+		struct ipw_spectrum_notification spectrum_notif;
+		struct ipw_csa_notification csa_notif;
+		struct ipw_error_resp err_resp;
+		struct ipw_card_state_notif card_state_notif;
+		struct ipw_notif_statistics stats;
+		struct BeaconNtfSpecifics beacon_status;
+		struct ipw_add_sta_resp add_sta;
+		struct ipw_sleep_notification sleep_notif;
+		u32 status;
+		u8 raw[0];
+	} u;
+} __attribute__ ((packed));
+
+#define IPW_RX_FRAME_SIZE        (4 + sizeof(struct ipw_rx_frame))
+
+struct ipw_multicast_addr {
+	u8 num_of_multicast_addresses;
+	u8 reserved[3];
+	u8 mac1[6];
+	u8 mac2[6];
+	u8 mac3[6];
+	u8 mac4[6];
+} __attribute__ ((packed));
+
+struct ipw_tgi_tx_key {
+	u8 key_id;
+	u8 security_type;
+	u8 station_index;
+	u8 flags;
+	u8 key[16];
+	u32 tx_counter[2];
+} __attribute__ ((packed));
+
+struct ipw_associate {
+	u8 channel;
+	u8 auth_type:4, auth_key:4;
+	u8 assoc_type;
+	u8 reserved;
+	u16 policy_support;
+	u8 preamble_length;
+	u8 ieee_mode;
+	u8 bssid[ETH_ALEN];
+	u32 assoc_tsf_msw;
+	u32 assoc_tsf_lsw;
+	u16 capability;
+	u16 listen_interval;
+	u16 beacon_interval;
+	u8 dest[ETH_ALEN];
+	u16 atim_window;
+	u8 smr;
+	u8 reserved1;
+	u16 reserved2;
+	u16 assoc_id;
+	u8 erp_value;
+} __attribute__ ((packed));
+
+#define IPW_SUPPORTED_RATES_IE_LEN         8
+
+struct ipw_supported_rates {
+	u8 ieee_mode;
+	u8 num_rates;
+	u8 purpose;
+	u8 reserved;
+	u8 supported_rates[IPW_MAX_RATES];
+} __attribute__ ((packed));
+
+struct ipw_channel_tx_power {
+	u8 channel_number;
+	s8 tx_power;
+} __attribute__ ((packed));
+
+
+#define IPW_RX_BUF_SIZE 3000
+
+#endif				/* __iwlwifi_hw_h__ */
--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile.orig	2007-04-12 11:08:17.000000000 -0400
+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile	2007-04-12 11:36:00.000000000 -0400
@@ -4,3 +4,4 @@ obj-$(CONFIG_ADM8211)		+= adm8211/
 obj-$(CONFIG_P54_COMMON)	+= p54/
 obj-$(CONFIG_ZD1211RW_MAC80211)	+= zd1211rw/
 obj-$(CONFIG_RTL818X)		+= rtl818x/
+obj-$(CONFIG_IWLWIFI)		+= iwlwifi/
--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig.orig	2007-04-12 11:08:17.000000000 -0400
+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig	2007-04-12 11:36:00.000000000 -0400
@@ -4,3 +4,4 @@ source "drivers/net/wireless/mac80211/ad
 source "drivers/net/wireless/mac80211/p54/Kconfig"
 source "drivers/net/wireless/mac80211/zd1211rw/Kconfig"
 source "drivers/net/wireless/mac80211/rtl818x/Kconfig"
+source "drivers/net/wireless/mac80211/iwlwifi/Kconfig"

jwltest-mac80211-backport-2_6_20-fixup.patch:
 core.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE jwltest-mac80211-backport-2_6_20-fixup.patch ---
--- linux-2.6.20.noarch/net/wireless/core.c.orig	2007-04-12 11:08:24.000000000 -0400
+++ linux-2.6.20.noarch/net/wireless/core.c	2007-04-12 11:17:34.000000000 -0400
@@ -291,7 +291,7 @@ static int cfg80211_netdev_notifier_call
 	case NETDEV_REGISTER:
 		mutex_lock(&rdev->devlist_mtx);
 		list_add(&dev->ieee80211_ptr->list, &rdev->netdev_list);
-		if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj,
+		if (sysfs_create_link(&dev->class_dev.kobj, &rdev->wiphy.dev.kobj,
 				      "phy80211")) {
 			printk(KERN_ERR "wireless: failed to add phy80211 symlink to netdev!\n");
 		}
@@ -301,7 +301,7 @@ static int cfg80211_netdev_notifier_call
 	case NETDEV_UNREGISTER:
 		mutex_lock(&rdev->devlist_mtx);
 		if (!list_empty(&dev->ieee80211_ptr->list)) {
-			sysfs_remove_link(&dev->dev.kobj, "phy80211");
+			sysfs_remove_link(&dev->class_dev.kobj, "phy80211");
 			list_del_init(&dev->ieee80211_ptr->list);
 		}
 		mutex_unlock(&rdev->devlist_mtx);

jwltest-mac80211-backport.patch:
 CREDITS                                                 |   37 
 MAINTAINERS                                             |   62 
 drivers/Kconfig                                         |    2 
 drivers/Makefile                                        |    1 
 drivers/misc/Kconfig                                    |    8 
 drivers/misc/Makefile                                   |    1 
 drivers/misc/eeprom_93cx6.c                             |  344 +
 drivers/net/Makefile                                    |    2 
 drivers/net/wireless/Kconfig                            |  120 
 drivers/net/wireless/Makefile                           |    3 
 drivers/net/wireless/bcm43xx/Kconfig                    |    3 
 drivers/net/wireless/hostap/Kconfig                     |    3 
 drivers/net/wireless/mac80211/Kconfig                   |    6 
 drivers/net/wireless/mac80211/Makefile                  |    6 
 drivers/net/wireless/mac80211/README                    |    2 
 drivers/net/wireless/mac80211/adm8211/Kconfig           |   25 
 drivers/net/wireless/mac80211/adm8211/Makefile          |    1 
 drivers/net/wireless/mac80211/adm8211/adm8211.c         | 2172 ++++++
 drivers/net/wireless/mac80211/adm8211/adm8211.h         |  622 +
 drivers/net/wireless/mac80211/bcm43xx/Kconfig           |  100 
 drivers/net/wireless/mac80211/bcm43xx/Makefile          |   18 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h         |  875 ++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c |  433 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h |  110 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c     | 1297 ++++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h     |  361 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c    |  300 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h    |   56 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c      | 1110 +++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h      |   92 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c    | 3984 ++++++++++++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h    |  156 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c  |  163 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h  |   22 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c     | 4262 +++++++++++++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h     |  309 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c     |  671 ++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h     |  170 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c   |   82 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h   |   41 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c   |  232 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h   |    9 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c  |  376 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h  |   28 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c    |  611 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h    |  250 
 drivers/net/wireless/mac80211/p54/Kconfig               |   10 
 drivers/net/wireless/mac80211/p54/Makefile              |    4 
 drivers/net/wireless/mac80211/p54/net2280.h             |  452 +
 drivers/net/wireless/mac80211/p54/prism54.h             |   77 
 drivers/net/wireless/mac80211/p54/prism54common.c       |  821 ++
 drivers/net/wireless/mac80211/p54/prism54common.h       |  328 +
 drivers/net/wireless/mac80211/p54/prism54magic.h        |   77 
 drivers/net/wireless/mac80211/p54/prism54pci.c          |  700 ++
 drivers/net/wireless/mac80211/p54/prism54pci.h          |  106 
 drivers/net/wireless/mac80211/p54/prism54usb.c          |  946 ++
 drivers/net/wireless/mac80211/p54/prism54usb.h          |  133 
 drivers/net/wireless/mac80211/rt2x00/Kconfig            |   86 
 drivers/net/wireless/mac80211/rt2x00/Makefile           |    9 
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.c        | 2595 ++++++++
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.h        |  931 ++
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.c        | 2892 +++++++++
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.h        | 1198 +++
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.c        | 2727 ++++++++
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.h        |  746 ++
 drivers/net/wireless/mac80211/rt2x00/rt2x00.h           | 1069 +++
 drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c      |  380 +
 drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h      |   70 
 drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c        |  231 
 drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h        |   74 
 drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c        |  540 +
 drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h        |   39 
 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h        |   82 
 drivers/net/wireless/mac80211/rt2x00/rt61pci.c          | 3362 ++++++++++
 drivers/net/wireless/mac80211/rt2x00/rt61pci.h          | 1361 ++++
 drivers/net/wireless/mac80211/rt2x00/rt73usb.c          | 3024 +++++++++
 drivers/net/wireless/mac80211/rt2x00/rt73usb.h          |  945 ++
 drivers/net/wireless/mac80211/rtl818x/Kconfig           |    9 
 drivers/net/wireless/mac80211/rtl818x/Makefile          |    2 
 drivers/net/wireless/mac80211/rtl818x/rtl8187.h         |  126 
 drivers/net/wireless/mac80211/rtl818x/rtl8187_dev.c     |  726 ++
 drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.c |  747 ++
 drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.h |   30 
 drivers/net/wireless/mac80211/rtl818x/rtl818x.h         |  180 
 drivers/net/wireless/mac80211/zd1211rw/Kconfig          |   19 
 drivers/net/wireless/mac80211/zd1211rw/Makefile         |   11 
 drivers/net/wireless/mac80211/zd1211rw/zd_chip.c        | 1679 +++++
 drivers/net/wireless/mac80211/zd1211rw/zd_chip.h        |  910 ++
 drivers/net/wireless/mac80211/zd1211rw/zd_def.h         |   57 
 drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h   |   67 
 drivers/net/wireless/mac80211/zd1211rw/zd_mac.c         |  700 ++
 drivers/net/wireless/mac80211/zd1211rw/zd_mac.h         |  250 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf.c          |  170 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf.h          |   80 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c   |  436 +
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c  |  491 +
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c   |  279 
 drivers/net/wireless/mac80211/zd1211rw/zd_usb.c         | 1337 ++++
 drivers/net/wireless/mac80211/zd1211rw/zd_usb.h         |  241 
 drivers/net/wireless/mac80211/zd1211rw/zd_util.c        |   82 
 drivers/net/wireless/mac80211/zd1211rw/zd_util.h        |   29 
 drivers/net/wireless/zd1211rw/Kconfig                   |    4 
 drivers/ssb/Kconfig                                     |   93 
 drivers/ssb/Makefile                                    |   11 
 drivers/ssb/driver_chipcommon.c                         |  402 +
 drivers/ssb/driver_mipscore.c                           |  258 
 drivers/ssb/driver_pcicore.c                            |  556 +
 drivers/ssb/main.c                                      | 1050 +++
 drivers/ssb/pci.c                                       |  667 ++
 drivers/ssb/pcihost_wrapper.c                           |  104 
 drivers/ssb/pcmcia.c                                    |  256 
 drivers/ssb/scan.c                                      |  407 +
 drivers/ssb/ssb_private.h                               |  151 
 drivers/usb/host/Kconfig                                |   13 
 drivers/usb/host/ohci-hcd.c                             |    6 
 drivers/usb/host/ohci-ssb.c                             |  254 
 include/linux/Kbuild                                    |    2 
 include/linux/crc-itu-t.h                               |   27 
 include/linux/eeprom_93cx6.h                            |   77 
 include/linux/ieee80211.h                               |  403 +
 include/linux/netdevice.h                               |    7 
 include/linux/nl80211.h                                 |  302 
 include/linux/ssb/ssb.h                                 |  403 +
 include/linux/ssb/ssb_driver_chipcommon.h               |  387 +
 include/linux/ssb/ssb_driver_extif.h                    |  163 
 include/linux/ssb/ssb_driver_mips.h                     |   47 
 include/linux/ssb/ssb_driver_pci.h                      |  108 
 include/linux/ssb/ssb_regs.h                            |  294 
 include/net/cfg80211.h                                  |  153 
 include/net/iw_handler.h                                |   13 
 include/net/mac80211.h                                  | 1106 +++
 include/net/wireless.h                                  |  159 
 lib/Kconfig                                             |    8 
 lib/Makefile                                            |    1 
 lib/crc-itu-t.c                                         |   64 
 net/Kconfig                                             |   12 
 net/Makefile                                            |    2 
 net/core/Makefile                                       |    1 
 net/core/dev.c                                          |   33 
 net/core/rtnetlink.c                                    |   29 
 net/core/wireless.c                                     | 2353 -------
 net/ieee80211/Kconfig                                   |    3 
 net/mac80211/Kconfig                                    |   81 
 net/mac80211/Makefile                                   |   21 
 net/mac80211/aes_ccm.c                                  |  155 
 net/mac80211/aes_ccm.h                                  |   26 
 net/mac80211/debugfs.c                                  |  436 +
 net/mac80211/debugfs.h                                  |   16 
 net/mac80211/debugfs_key.c                              |  253 
 net/mac80211/debugfs_key.h                              |   34 
 net/mac80211/debugfs_netdev.c                           |  440 +
 net/mac80211/debugfs_netdev.h                           |   30 
 net/mac80211/debugfs_sta.c                              |  247 
 net/mac80211/debugfs_sta.h                              |   12 
 net/mac80211/hostapd_ioctl.h                            |  347 +
 net/mac80211/ieee80211.c                                | 5097 ++++++++++++++++
 net/mac80211/ieee80211_cfg.c                            |   90 
 net/mac80211/ieee80211_cfg.h                            |    9 
 net/mac80211/ieee80211_common.h                         |   98 
 net/mac80211/ieee80211_i.h                              |  848 ++
 net/mac80211/ieee80211_iface.c                          |  366 +
 net/mac80211/ieee80211_ioctl.c                          | 3290 ++++++++++
 net/mac80211/ieee80211_key.h                            |  106 
 net/mac80211/ieee80211_led.c                            |   91 
 net/mac80211/ieee80211_led.h                            |   32 
 net/mac80211/ieee80211_rate.c                           |  140 
 net/mac80211/ieee80211_rate.h                           |  144 
 net/mac80211/ieee80211_scan.c                           |  344 +
 net/mac80211/ieee80211_sta.c                            | 3210 ++++++++++
 net/mac80211/michael.c                                  |  104 
 net/mac80211/michael.h                                  |   20 
 net/mac80211/rc80211_simple.c                           |  432 +
 net/mac80211/sta_info.c                                 |  463 +
 net/mac80211/sta_info.h                                 |  167 
 net/mac80211/tkip.c                                     |  341 +
 net/mac80211/tkip.h                                     |   36 
 net/mac80211/wep.c                                      |  328 +
 net/mac80211/wep.h                                      |   40 
 net/mac80211/wme.c                                      |  685 ++
 net/mac80211/wme.h                                      |   38 
 net/mac80211/wpa.c                                      |  846 ++
 net/mac80211/wpa.h                                      |   31 
 net/wireless/Kconfig                                    |   46 
 net/wireless/Makefile                                   |   17 
 net/wireless/core.c                                     |  359 +
 net/wireless/core.h                                     |   80 
 net/wireless/nl80211.c                                  |  982 +++
 net/wireless/nl80211.h                                  |   24 
 net/wireless/sysfs.c                                    |  125 
 net/wireless/sysfs.h                                    |    9 
 net/wireless/wext-common.c                              |  663 ++
 net/wireless/wext-compat.c                              |  789 ++
 net/wireless/wext-export.c                              |   29 
 net/wireless/wext-mod.c                                 |   20 
 net/wireless/wext-old.c                                 |  829 ++
 net/wireless/wext.h                                     |   51 
 196 files changed, 85609 insertions(+), 2508 deletions(-)

--- NEW FILE jwltest-mac80211-backport.patch ---
--- /dev/null	2007-03-09 11:47:32.684268720 -0500
+++ linux-2.6.20.noarch/include/net/wireless.h	2007-04-12 11:08:17.000000000 -0400
@@ -0,0 +1,159 @@
+#ifndef __NET_WIRELESS_H
+#define __NET_WIRELESS_H
+
+/*
+ * 802.11 device management
+ *
+ * Copyright 2007	Johannes Berg <johannes at sipsolutions.net>
+ */
+
+#include <linux/netdevice.h>
+#include <linux/debugfs.h>
+#include <linux/list.h>
+#include <net/cfg80211.h>
+
+/**
+ * struct wiphy - wireless hardware description
+ * @idx: the wiphy index assigned to this item
+ * @class_dev: the class device representing /sys/class/ieee80211/<wiphy-name>
+ */
+struct wiphy {
+	/* assign these fields before you register the wiphy */
+
+	/* permanent MAC address */
+	u8 perm_addr[ETH_ALEN];
+
+	/* If multiple wiphys are registered and you're handed e.g.
+	 * a regular netdev with assigned ieee80211_ptr, you won't
+	 * know whether it points to a wiphy your driver has registered
+	 * or not. Assign this to something global to your driver to
+	 * help determine whether you own this wiphy or not. */
+	void *privid;
+
+	/* fields below are read-only, assigned by cfg80211 */
+
+	/* the item in /sys/class/ieee80211/ points to this,
+	 * you need use set_wiphy_dev() (see below) */
+	struct device dev;
+
+	/* dir in debugfs: ieee80211/<wiphyname> */
+	struct dentry *debugfsdir;
+
+	char priv[0] __attribute__((__aligned__(NETDEV_ALIGN)));
+};
+
+/** struct wireless_dev - wireless per-netdev state
+ *
+ * This structure must be allocated by the driver/stack
+ * that uses the ieee80211_ptr field in struct net_device
+ * (this is intentional so it can be allocated along with
+ * the netdev.)
+ *
+ * @wiphy: pointer to hardware description
+ */
+struct wireless_dev {
+	struct wiphy *wiphy;
+
+	/* private to the generic wireless code */
+	struct list_head list;
+	struct net_device *netdev;
+};
+
+/**
+ * wiphy_priv - return priv from wiphy
+ */
+static inline void *wiphy_priv(struct wiphy *wiphy)
+{
+	BUG_ON(!wiphy);
+	return &wiphy->priv;
+}
+
+/**
+ * set_wiphy_dev - set device pointer for wiphy
+ */
+static inline void set_wiphy_dev(struct wiphy *wiphy, struct device *dev)
+{
+	wiphy->dev.parent = dev;
+}
+
+/**
+ * wiphy_dev - get wiphy dev pointer
+ */
+static inline struct device *wiphy_dev(struct wiphy *wiphy)
+{
+	return wiphy->dev.parent;
+}
+
+/**
+ * wiphy_name - get wiphy name
+ */
+static inline char *wiphy_name(struct wiphy *wiphy)
+{
+	return wiphy->dev.bus_id;
+}
+
+/**
+ * wdev_priv - return wiphy priv from wireless_dev
+ */
+static inline void *wdev_priv(struct wireless_dev *wdev)
+{
+	BUG_ON(!wdev);
+	return wiphy_priv(wdev->wiphy);
+}
+
+/**
+ * wiphy_new - create a new wiphy for use with cfg80211
+ *
+ * create a new wiphy and associate the given operations with it.
+ * @sizeof_priv bytes are allocated for private use.
+ *
+ * the returned pointer must be assigned to each netdev's
+ * ieee80211_ptr for proper operation.
+ */
+struct wiphy *wiphy_new(struct cfg80211_ops *ops, int sizeof_priv);
+
+/**
+ * wiphy_register - register a wiphy with cfg80211
+ *
+ * register the given wiphy
+ *
+ * Returns a non-negative wiphy index or a negative error code.
+ */
+extern int wiphy_register(struct wiphy *wiphy);
+
+/**
+ * wiphy_unregister - deregister a wiphy from cfg80211
+ *
+ * unregister a device with the given priv pointer.
+ * After this call, no more requests can be made with this priv
+ * pointer, but the call may sleep to wait for an outstanding
+ * request that is being handled.
+ */
+extern void wiphy_unregister(struct wiphy *wiphy);
+
+/**
+ * wiphy_free - free wiphy
+ */
+extern void wiphy_free(struct wiphy *wiphy);
+
+
+/*
+ * internal definitions for wireless
+ */
+
+#if defined(CONFIG_CFG80211_WEXT_COMPAT) || defined(CONFIG_WIRELESS_EXT)
+int wext_ioctl(unsigned int cmd, struct ifreq *ifreq, void __user *arg);
+int wireless_proc_init(void);
+#else
+static inline
+int wext_ioctl(unsigned int cmd, struct ifreq *ifreq, void __user *arg)
+{
+	return -EINVAL;
+}
+static inline int wireless_proc_init(void)
+{
+	return 0;
+}
+#endif
+
+#endif /* __NET_WIRELESS_H */
--- /dev/null	2007-03-09 11:47:32.684268720 -0500
+++ linux-2.6.20.noarch/include/net/mac80211.h	2007-04-12 11:08:17.000000000 -0400
@@ -0,0 +1,1106 @@
+/*
+ * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface
+ * Copyright 2002-2005, Devicescape Software, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef MAC80211_H
+#define MAC80211_H
+
+#include <linux/kernel.h>
+#include <linux/if_ether.h>
+#include <linux/skbuff.h>
+#include <linux/wireless.h>
+#include <linux/device.h>
+#include <linux/ieee80211.h>
+#include <net/wireless.h>
+#include <net/cfg80211.h>
+
+/* Note! Only ieee80211_tx_status_irqsafe() and ieee80211_rx_irqsafe() can be
+ * called in hardware interrupt context. The low-level driver must not call any
+ * other functions in hardware interrupt context. If there is a need for such
+ * call, the low-level driver should first ACK the interrupt and perform the
+ * IEEE 802.11 code call after this, e.g., from a scheduled tasklet (in
+ * software interrupt context).
+ */
+
+/*
+ * Frame format used when passing frame between low-level hardware drivers
+ * and IEEE 802.11 driver the same as used in the wireless media, i.e.,
+ * buffers start with IEEE 802.11 header and include the same octets that
+ * are sent over air.
[...88785 lines suppressed...]
+
+		memset(&iwe, 0, sizeof(iwe));
+		iwe.cmd = IWEVCUSTOM;
+		sprintf(buf, "capab=0x%04x", bss->capability);
+		iwe.u.data.length = strlen(buf);
+		current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+						  buf);
+
+		/* dispaly all support rates in readable format */
+		p = current_ev + IW_EV_LCP_LEN;
+		iwe.cmd = SIOCGIWRATE;
+		/* Those two flags are ignored... */
+		iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;
+
+		for (i = 0; i < bss->supp_rates_len; i++) {
+			iwe.u.bitrate.value = ((bss->supp_rates[i] &
+							0x7f) * 500000);
+			p = iwe_stream_add_value(current_ev, p,
+					end_buf, &iwe, IW_EV_PARAM_LEN);
+		}
+		/* Check if we added any rate */
+		if((p - current_ev) > IW_EV_LCP_LEN)
+			current_ev = p;
+
+		kfree(buf);
+		break;
+	} while (0);
+
+	return current_ev;
+}
+
+
+int ieee80211_sta_scan_results(struct net_device *dev, char *buf, size_t len)
+{
+	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+	char *current_ev = buf;
+	char *end_buf = buf + len;
+	struct ieee80211_sta_bss *bss;
+
+	spin_lock_bh(&local->sta_bss_lock);
+	list_for_each_entry(bss, &local->sta_bss_list, list) {
+		if (buf + len - current_ev <= IW_EV_ADDR_LEN) {
+			spin_unlock_bh(&local->sta_bss_lock);
+			return -E2BIG;
+		}
+		current_ev = ieee80211_sta_scan_result(dev, bss, current_ev,
+						       end_buf);
+	}
+	spin_unlock_bh(&local->sta_bss_lock);
+	return current_ev - buf;
+}
+
+
+int ieee80211_sta_set_extra_ie(struct net_device *dev, char *ie, size_t len)
+{
+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+	struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+	kfree(ifsta->extra_ie);
+	if (len == 0) {
+		ifsta->extra_ie = NULL;
+		ifsta->extra_ie_len = 0;
+		return 0;
+	}
+	ifsta->extra_ie = kmalloc(len, GFP_KERNEL);
+	if (!ifsta->extra_ie) {
+		ifsta->extra_ie_len = 0;
+		return -ENOMEM;
+	}
+	memcpy(ifsta->extra_ie, ie, len);
+	ifsta->extra_ie_len = len;
+	return 0;
+}
+
+
+struct sta_info * ieee80211_ibss_add_sta(struct net_device *dev,
+					 struct sk_buff *skb, u8 *bssid,
+					 u8 *addr)
+{
+	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+	struct sta_info *sta;
+	struct ieee80211_sub_if_data *sdata = NULL;
+	struct net_device *sta_dev = NULL;
+
+	/* TODO: Could consider removing the least recently used entry and
+	 * allow new one to be added. */
+	if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) {
+		if (net_ratelimit()) {
+			printk(KERN_DEBUG "%s: No room for a new IBSS STA "
+			       "entry " MAC_FMT "\n", dev->name, MAC_ARG(addr));
+		}
+		return NULL;
+	}
+
+	spin_lock_bh(&local->sub_if_lock);
+	list_for_each_entry(sdata, &local->sub_if_list, list)
+		if (sdata->type == IEEE80211_IF_TYPE_IBSS &&
+		    memcmp(bssid, sdata->u.sta.bssid, ETH_ALEN) == 0) {
+			sta_dev = sdata->dev;
+			break;
+		}
+	spin_unlock_bh(&local->sub_if_lock);
+
+	if (!sta_dev)
+		return NULL;
+
+	printk(KERN_DEBUG "%s: Adding new IBSS station " MAC_FMT " (dev=%s)\n",
+	       dev->name, MAC_ARG(addr), sta_dev->name);
+
+	sta = sta_info_add(local, dev, addr, GFP_ATOMIC);
+	if (!sta)
+		return NULL;
+
+	sta->dev = sta_dev;
+	sta->supp_rates = sdata->u.sta.supp_rates_bits;
+
+	rate_control_rate_init(sta, local);
+
+	return sta; /* caller will call sta_info_put() */
+}
+
+
+int ieee80211_sta_deauthenticate(struct net_device *dev, u16 reason)
+{
+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+	struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+
+	printk(KERN_DEBUG "%s: deauthenticate(reason=%d)\n",
+	       dev->name, reason);
+
+	if (sdata->type != IEEE80211_IF_TYPE_STA &&
+	    sdata->type != IEEE80211_IF_TYPE_IBSS)
+		return -EINVAL;
+
+	ieee80211_send_deauth(dev, ifsta, reason);
+	ieee80211_set_disassoc(dev, ifsta, 1);
+	return 0;
+}
+
+
+int ieee80211_sta_disassociate(struct net_device *dev, u16 reason)
+{
+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+	struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+
+	printk(KERN_DEBUG "%s: disassociate(reason=%d)\n",
+	       dev->name, reason);
+
+	if (sdata->type != IEEE80211_IF_TYPE_STA)
+		return -EINVAL;
+
+	if (!ifsta->associated)
+		return -1;
+
+	ieee80211_send_disassoc(dev, ifsta, reason);
+	ieee80211_set_disassoc(dev, ifsta, 0);
+	return 0;
+}
--- /dev/null	2007-03-09 11:47:32.684268720 -0500
+++ linux-2.6.20.noarch/net/mac80211/ieee80211_cfg.h	2007-04-12 11:08:24.000000000 -0400
@@ -0,0 +1,9 @@
+/*
+ * mac80211 configuration hooks for cfg80211
+ */
+#ifndef __IEEE80211_CFG_H
+#define __IEEE80211_CFG_H
+
+extern struct cfg80211_ops mac80211_config_ops;
+
+#endif /* __IEEE80211_CFG_H */
--- /dev/null	2007-03-09 11:47:32.684268720 -0500
+++ linux-2.6.20.noarch/net/mac80211/debugfs.h	2007-04-12 11:08:24.000000000 -0400
@@ -0,0 +1,16 @@
+#ifndef __MAC80211_DEBUGFS_H
+#define __MAC80211_DEBUGFS_H
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+extern void debugfs_hw_add(struct ieee80211_local *local);
+extern void debugfs_hw_del(struct ieee80211_local *local);
+extern int mac80211_open_file_generic(struct inode *inode, struct file *file);
+#else
+static inline void debugfs_hw_add(struct ieee80211_local *local)
+{
+	return;
+}
+static inline void debugfs_hw_del(struct ieee80211_local *local) {}
+#endif
+
+#endif /* __MAC80211_DEBUGFS_H */
--- linux-2.6.20.noarch/net/ieee80211/Kconfig.orig	2007-04-12 10:56:42.000000000 -0400
+++ linux-2.6.20.noarch/net/ieee80211/Kconfig	2007-04-12 11:08:24.000000000 -0400
@@ -56,7 +56,8 @@ config IEEE80211_CRYPT_CCMP
 
 config IEEE80211_CRYPT_TKIP
 	tristate "IEEE 802.11i TKIP encryption"
-	depends on IEEE80211 && NET_RADIO
+	depends on IEEE80211
+	select WIRELESS_EXT
 	select CRYPTO
 	select CRYPTO_MICHAEL_MIC
 	select CRYPTO_ECB

jwltest-softmac_wx_get_rate-running-check.patch:
 ieee80211softmac_wx.c |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE jwltest-softmac_wx_get_rate-running-check.patch ---
--- linux-2.6.18.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c.orig	2006-12-12 13:16:33.000000000 -0500
+++ linux-2.6.18.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c	2006-12-12 13:22:05.000000000 -0500
@@ -265,6 +265,12 @@ ieee80211softmac_wx_get_rate(struct net_
 	int err = -EINVAL;
 
 	spin_lock_irqsave(&mac->lock, flags);
+
+	if (unlikely(!mac->running)) {
+		err = -ENODEV;
+		goto out_unlock;
+	}
+
 	switch (mac->txrates.default_rate) {
 	case IEEE80211_CCK_RATE_1MB:
 		data->bitrate.value = 1000000;


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2933
retrieving revision 1.2933.6.1
diff -u -r1.2933 -r1.2933.6.1
--- kernel-2.6.spec	19 Mar 2007 14:28:02 -0000	1.2933
+++ kernel-2.6.spec	12 Apr 2007 15:57:34 -0000	1.2933.6.1
@@ -38,7 +38,7 @@
 %define sublevel 20
 %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.31
 %define signmodules 0
 %define xen_hv_cset 11774
 %define make_target bzImage
@@ -418,6 +418,9 @@
 # core networking changes.
 
 # NIC driver fixes
+Patch1350: jwltest-softmac_wx_get_rate-running-check.patch
+
+# Sound driver fixes
 
 # Filesystem stuff.
 # Squashfs
@@ -529,6 +532,14 @@
 Patch5060: linux-2.6-olpc-battery.patch
 
 #
+# mac80211 backport
+#
+Patch6000: jwltest-mac80211-backport.patch
+Patch6001: jwltest-mac80211-backport-2_6_20-fixup.patch
+Patch6002: jwltest-iwlwifi.patch
+Patch6003: jwltest-iwlwifi-fixes.patch
+
+#
 # 10000 to 20000 is for stuff that has to come last due to the
 # amount of drivers they touch. But only these should go here.
 # Not patches you're too lazy for to put in the proper place.
@@ -1096,6 +1107,10 @@
 # core networking changes.
 
 # NIC driver fixes
+# check mac->running to avoid assert in ieee80211softmac_wx_get_rate
+%patch1350 -p1
+
+# sound driver fixes
 
 # Filesystem patches.
 # Squashfs
@@ -1247,6 +1262,12 @@
 # final stuff
 #
 
+# mac80211 stuff
+%patch6000 -p1
+%patch6001 -p1
+%patch6002 -p1
+%patch6003 -p1
+
 #
 # misc small stuff to make things compile or otherwise improve performance
 #



From fedora-cvs-commits at redhat.com  Thu Apr 12 16:47:48 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 12:47:48 -0400
Subject: rpms/vixie-cron/devel vixie-cron-4.1-mancrond.patch, NONE,
	1.1 vixie-cron-4.1-bz220376.patch, 1.1, 1.2 vixie-cron.spec,
	1.97, 1.98
Message-ID: <200704121647.l3CGlm9k018934@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18793

Modified Files:
	vixie-cron-4.1-bz220376.patch vixie-cron.spec 
Added Files:
	vixie-cron-4.1-mancrond.patch 
Log Message:
Changes in patches.


vixie-cron-4.1-mancrond.patch:
 crontab.5 |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletion(-)

--- NEW FILE vixie-cron-4.1-mancrond.patch ---
--- vixie-cron-4.1/crontab.5.mancrond	2007-03-27 17:59:59.000000000 +0200
+++ vixie-cron-4.1/crontab.5	2007-04-12 18:16:06.000000000 +0200
@@ -196,7 +196,18 @@
 0 22 * * 1-5    mail -s "It's 10pm" joe%Joe,%%Where are your kids?%                                                           
 23 0-23/2 * * * echo "run 23 minutes after midn, 2am, 4am ..., everyday"                                                      
 5 4 * * sun     echo "run at 5 after 4 every sunday"                                                                          
-.fi     
+.fi
+.SH Jobs in /etc/cron.d/
+The jobs in cron.d are system jobs, which are used usually for more than
+one user. That's the reason why is name of the user needed. MAILTO on the first line
+is optional.
+.SH EXAMPLE FOR JOB IN /etc/cron.d/job
+.nf
+#login as root
+#create job with preferred editor (e.g. vim)
+MAILTO=root
+* * * * * root touch /tmp/file
+.fi
 .SH SELinux with multi level security (MLS)
 In crontab is important specified security level by \fIcrontab\ -s\fR or specifying 
 the required level on the first line of the crontab. Each level is specified 

vixie-cron-4.1-bz220376.patch:
 misc.c |   33 ++++++++++++++++++++++++++++++++-
 1 files changed, 32 insertions(+), 1 deletion(-)

Index: vixie-cron-4.1-bz220376.patch
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron-4.1-bz220376.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vixie-cron-4.1-bz220376.patch	5 Apr 2007 08:01:31 -0000	1.1
+++ vixie-cron-4.1-bz220376.patch	12 Apr 2007 16:47:46 -0000	1.2
@@ -1,185 +1,49 @@
---- vixie-cron-4.1/misc.c.old	2007-04-05 09:04:51.000000000 +0200
-+++ vixie-cron-4.1/misc.c	2007-04-05 09:08:39.000000000 +0200
-@@ -206,6 +206,41 @@
+--- vixie-cron-4.1/misc.c.myska	2007-04-12 13:20:23.000000000 +0200
++++ vixie-cron-4.1/misc.c	2007-04-12 15:38:50.000000000 +0200
+@@ -214,7 +214,7 @@
+ #ifdef CRON_GROUP
+ 	grp = getgrnam(CRON_GROUP);
  #endif
- }
- 
-+void check_dirs(char* dirs,struct stat sb, struct group *grp) {
-+    /* CRONDIR okay (now==CWD), now look at SPOOL_DIR ("tabs" or some such)
-+     */
-+    if (stat(dirs, &sb) < OK && errno == ENOENT) {
-+        perror(dirs);
-+        if (OK == mkdir(dirs, 0700)) {
-+            fprintf(stderr, "%s: created\n", dirs);
-+            stat(dirs, &sb);
+-	/* first check for CRONDIR ("/var/cron" or some such)
++	/* first check for CRONDIR ("/var/spool" or some such)
+ 	 */
+ 	if (stat(CRONDIR, &sb) < OK && errno == ENOENT) {
+ 		perror(CRONDIR);
+@@ -270,6 +270,37 @@
+ 			exit(ERROR_EXIT);
+ 		    }
+ 	}
++	/* now check the RH_CROND_DIR */
++	if (stat(RH_CROND_DIR, &sb) < OK && errno == ENOENT) {
++        perror(RH_CROND_DIR);
++        if (OK == mkdir(RH_CROND_DIR, 0700)) {
++            fprintf(stderr, "%s: created\n", RH_CROND_DIR);
++            stat(RH_CROND_DIR, &sb);
 +        } else {
-+            fprintf(stderr, "%s: ", dirs);
++            fprintf(stderr, "%s: ", RH_CROND_DIR);
 +            perror("mkdir");
 +            exit(ERROR_EXIT);
 +        }
 +    }
 +    if (!S_ISDIR(sb.st_mode)) {
 +        fprintf(stderr, "'%s' is not a directory, bailing out.\n",
-+            dirs);
++            RH_CROND_DIR);
 +        exit(ERROR_EXIT);
 +    }
 +    if (grp != NULL) {
 +        if (sb.st_gid != grp->gr_gid)
-+            if( chown(dirs, -1, grp->gr_gid) == -1 )
++            if( chown(RH_CROND_DIR, -1, grp->gr_gid) == -1 )
 +            {
-+            fprintf(stderr,"chdir %s failed: %s\n", dirs, strerror(errno));
++            fprintf(stderr,"chdir %s failed: %s\n", RH_CROND_DIR, strerror(errno));
 +            exit(ERROR_EXIT);
 +            }
 +        if (sb.st_mode != 01730)
-+            if( chmod(dirs, 01730) == -1 )
++            if( chmod(RH_CROND_DIR, 01730) == -1 )
 +            {
-+            fprintf(stderr,"chmod 01730 %s failed: %s\n", dirs, strerror(errno));
++            fprintf(stderr,"chmod 01730 %s failed: %s\n", RH_CROND_DIR, strerror(errno));
 +            exit(ERROR_EXIT);
 +            }
 +    }
-+}
-+
- void
- set_cron_cwd(void) {
- 	struct stat sb;
-@@ -237,39 +272,7 @@
- 		perror(CRONDIR);
- 		exit(ERROR_EXIT);
- 	}
--
--	/* CRONDIR okay (now==CWD), now look at SPOOL_DIR ("tabs" or some such)
--	 */
--	if (stat(SPOOL_DIR, &sb) < OK && errno == ENOENT) {
--		perror(SPOOL_DIR);
--		if (OK == mkdir(SPOOL_DIR, 0700)) {
--			fprintf(stderr, "%s: created\n", SPOOL_DIR);
--			stat(SPOOL_DIR, &sb);
--		} else {
--			fprintf(stderr, "%s: ", SPOOL_DIR);
--			perror("mkdir");
--			exit(ERROR_EXIT);
--		}
--	}
--	if (!S_ISDIR(sb.st_mode)) {
--		fprintf(stderr, "'%s' is not a directory, bailing out.\n",
--			SPOOL_DIR);
--		exit(ERROR_EXIT);
--	}
--	if (grp != NULL) {
--		if (sb.st_gid != grp->gr_gid)
--		    if( chown(SPOOL_DIR, -1, grp->gr_gid) == -1 )
--		    {
--			fprintf(stderr,"chdir %s failed: %s\n", SPOOL_DIR, strerror(errno));
--			exit(ERROR_EXIT);
--		    }
--		if (sb.st_mode != 01730)
--		    if( chmod(SPOOL_DIR, 01730) == -1 )
--		    {
--			fprintf(stderr,"chmod 01730 %s failed: %s\n", SPOOL_DIR, strerror(errno));
--			exit(ERROR_EXIT);
--		    }
--	}
-+	check_dirs(SPOOL_DIR,sb,grp); check_dirs(RH_CROND_DIR,sb,grp);
  }
  
  /* acquire_daemonlock() - write our PID into /etc/cron.pid, unless
---- vixie-cron-4.1/database.c.old	2007-04-05 09:12:02.000000000 +0200
-+++ vixie-cron-4.1/database.c	2007-04-05 09:16:11.000000000 +0200
-@@ -150,6 +150,27 @@
- 	}
- 	closedir(dir);
- 
-+	if (!(dir = opendir(RH_CROND_DIR))) {
-+        log_it("CRON", getpid(), "OPENDIR FAILED", RH_CROND_DIR);
-+        (void) exit(ERROR_EXIT);
-+    }
-+
-+	while (NULL != (dp = readdir(dir))) {
-+        char fname[MAXNAMLEN+1], tabname[MAXNAMLEN+1];
-+
-+        if ( not_a_crontab( dp ) )
-+            continue;
-+
-+        strncpy(fname, dp->d_name, MAXNAMLEN);
-+
-+        if (!glue_strings(tabname, sizeof tabname, RH_CROND_DIR, fname, '/'))
-+            continue;   /* XXX log? */
-+
-+        process_crontab(fname, fname, tabname,
-+                &statbuf, &new_db, old_db);
-+    }
-+    closedir(dir);
-+
- 	/* if we don't do this, then when our children eventually call
- 	 * getpwnam() in do_command.c's child_process to verify MAILTO=,
- 	 * they will screw us up (and v-v).
-@@ -357,6 +378,9 @@
- 		if (!glue_strings(tabname, sizeof tabname, SPOOL_DIR, dp->d_name, '/'))
- 			continue;	/* XXX log? */
- 
-+		if (!glue_strings(tabname, sizeof tabname, RH_CROND_DIR, dp->d_name, '/'))
-+            continue;   /* XXX log? */
-+
- 		if ( stat( tabname, &st ) < OK )
- 			continue;       /* XXX log? */
- 		
---- vixie-cron-4.1/crontab.c.old	2007-04-05 09:16:33.000000000 +0200
-+++ vixie-cron-4.1/crontab.c	2007-04-05 09:32:04.000000000 +0200
-@@ -287,6 +287,10 @@
- 		fprintf(stderr, "path too long\n");
- 		exit(ERROR_EXIT);
- 	}
-+	if (!glue_strings(n, sizeof n, RH_CROND_DIR, User, '/')) {
-+        fprintf(stderr, "path too long\n");
-+        exit(ERROR_EXIT);
-+    }
- 	if (!(f = fopen(n, "r"))) {
- 		if (errno == ENOENT)
- 			fprintf(stderr, "no crontab for %s\n", User);
-@@ -320,6 +324,10 @@
- 		fprintf(stderr, "path too long\n");
- 		exit(ERROR_EXIT);
- 	}
-+	if (!glue_strings(n, sizeof n, RH_CROND_DIR, User, '/')) {
-+        fprintf(stderr, "path too long\n");
-+        exit(ERROR_EXIT);
-+    }
- 	if (unlink(n) != 0) {
- 		if (errno == ENOENT)
- 			fprintf(stderr, "no crontab for %s\n", User);
-@@ -351,6 +359,10 @@
- 		fprintf(stderr, "path too long\n");
- 		exit(ERROR_EXIT);
- 	}
-+	if (!glue_strings(n, sizeof n, RH_CROND_DIR, User, '/')) {
-+        fprintf(stderr, "path too long\n");
-+        exit(ERROR_EXIT);
-+    }
- 	if (!(f = fopen(n, "r"))) {
- 		if (errno != ENOENT) {
- 			perror(n);
-@@ -627,6 +639,12 @@
- 		fprintf(stderr, "path too long\n");
- 		return (-2);
- 	}
-+	if (!glue_strings(TempFilename, sizeof TempFilename, RH_CROND_DIR,
-+        "tmp.XXXXXXXXXX", '/')) {
-+        TempFilename[0] = '\0';
-+        fprintf(stderr, "path too long\n");
-+        return (-2);
-+    }
- 	if ((fd = mkstemp(TempFilename)) == -1 || !(tmp = fdopen(fd, "w+"))) {
- 		perror(TempFilename);
- 		if (fd != -1) {
-@@ -742,6 +760,11 @@
- 		error = -2;
- 		goto done;
- 	}
-+	if (!glue_strings(n, sizeof n, RH_CROND_DIR, User, '/')) {
-+        fprintf(stderr, "path too long\n");
-+        error = -2;
-+        goto done;
-+    }
- 	if (rename(TempFilename, n)) {
- 		fprintf(stderr, "%s: error renaming %s to %s\n",
- 			ProgramName, TempFilename, n);


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- vixie-cron.spec	10 Apr 2007 20:52:43 -0000	1.97
+++ vixie-cron.spec	12 Apr 2007 16:47:46 -0000	1.98
@@ -10,7 +10,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times
 Name: vixie-cron
 Version: 4.1
-Release: 81%{?dist}
+Release: 82%{?dist}
 Epoch: 4
 License: BSD
 Group: System Environment/Base
@@ -85,6 +85,7 @@
 Patch65: vixie-cron-4.1-_63newavc.patch
 Patch66: vixie-cron-4.1-bz220376.patch
 Patch67: vixie-cron-4.1-hardlink.patch
+Patch68: vixie-cron-4.1-mancrond.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: syslog, bash >= 2.0
@@ -191,8 +192,9 @@
 %patch63 -p1 -b .manual
 %patch64 -p1 -b ._62newyear
 %patch65 -p1 -b ._63newavc
-%patch66 -p1 -b .bz220376
-%patch67 -p1 -b .link
+#%patch66 -p1 -b .bz220376
+%patch67 -p1 -b .hardlink
+%patch68 -p1 -b .mancrond
 
 %build
 # RPM_OPT_FLAGS are better here, because we don't have configure for set up variables ;-)
@@ -264,6 +266,11 @@
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Thu Apr 12 2007 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-82
+- removed bz220376.patch
+- change in manual - using jobs in cron.d
+- Resolves: rhbz#235932, rhbz#235998
+
 * Tue Apr 10 2007 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-81
 - hard link from /etc/crontab cause stop running jobs
 - rhbz#235880



From fedora-cvs-commits at redhat.com  Thu Apr 12 16:50:56 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 12:50:56 -0400
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.115,
	1.116 libselinux.spec, 1.260, 1.261
Message-ID: <200704121650.l3CGoubU021177@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Thu Apr 12 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.12-2


libselinux-rhat.patch:
 man/man8/matchpathcon.8 |    2 -
 src/selinux.pyc         |binary
 src/selinuxswig.i       |   50 +++++++++++++++++++++++++++++++++++++++++++++---
 utils/getsebool.c       |    5 +++-
 4 files changed, 52 insertions(+), 5 deletions(-)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- libselinux-rhat.patch	9 Apr 2007 19:50:05 -0000	1.115
+++ libselinux-rhat.patch	12 Apr 2007 16:50:49 -0000	1.116
@@ -1,19 +1,56 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/matchpathcon.8 libselinux-2.0.9/man/man8/matchpathcon.8
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/matchpathcon.8 libselinux-2.0.12/man/man8/matchpathcon.8
 --- nsalibselinux/man/man8/matchpathcon.8	2007-01-17 11:11:35.000000000 -0500
-+++ libselinux-2.0.9/man/man8/matchpathcon.8	2007-04-05 13:20:43.000000000 -0400
++++ libselinux-2.0.12/man/man8/matchpathcon.8	2007-04-12 12:29:25.000000000 -0400
 @@ -28,4 +28,4 @@
  
  .SH "SEE ALSO"
  .BR selinux "(8), "
 -.BR mathpathcon "(3), " 
 +.BR matchpathcon "(3), " 
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-2.0.9/src/selinuxswig.i
+Binary files nsalibselinux/src/selinux.pyc and libselinux-2.0.12/src/selinux.pyc differ
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-2.0.12/src/selinuxswig.i
 --- nsalibselinux/src/selinuxswig.i	2007-02-22 08:53:23.000000000 -0500
-+++ libselinux-2.0.9/src/selinuxswig.i	2007-04-05 16:47:42.000000000 -0400
-@@ -115,9 +115,38 @@
++++ libselinux-2.0.12/src/selinuxswig.i	2007-04-12 12:39:51.000000000 -0400
+@@ -44,6 +44,8 @@
+ 
+ extern int is_selinux_enabled(void);
+ extern int is_selinux_mls_enabled(void);
++extern void freecon(security_context_t con);
++extern void freeconary(security_context_t * con);
+ extern int getcon(security_context_t *con);
+ extern int setcon(security_context_t con);
+ extern int getpidcon(int pid, security_context_t *con);
+@@ -90,6 +92,11 @@
+ 			mode_t mode,
+ 			security_context_t *con);
+ 
++extern int matchpathcon_init_prefix(const char *path,
++				    const char *prefix);
++extern void matchpathcon_fini(void);
++
++
+ extern int matchmediacon(const char *media,
+ 		 security_context_t *con);
+ 
+@@ -106,6 +113,7 @@
+ extern const char *selinux_homedir_context_path(void);
+ extern const char *selinux_media_context_path(void);
+ extern const char *selinux_contexts_path(void);
++extern const char *selinux_securetty_types_path(void);
+ extern const char *selinux_booleans_path(void);
+ extern const char *selinux_customizable_types_path(void);
+ extern const char *selinux_users_path(void);
+@@ -113,11 +121,43 @@
+ extern const char *selinux_translations_path(void);
+ extern const char *selinux_netfilter_context_path(void);
  extern const char *selinux_path(void);
- extern int selinux_check_passwd_access(access_vector_t requested);
- extern int checkPasswdAccess(access_vector_t requested);
+-extern int selinux_check_passwd_access(access_vector_t requested);
+-extern int checkPasswdAccess(access_vector_t requested);
++#extern int selinux_check_passwd_access(access_vector_t requested);
++#extern int checkPasswdAccess(access_vector_t requested);
++
++extern int selinux_check_securetty_context(security_context_t tty_context);
++void set_selinuxmnt(char *mnt);
 +
 +// This tells SWIG to treat char ** as a special case
 +%typemap(python,in) char ** {
@@ -50,9 +87,17 @@
  
  extern int is_context_customizable (security_context_t scontext);
  
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/getsebool.c libselinux-2.0.9/utils/getsebool.c
+@@ -135,3 +175,7 @@
+ }
+ extern int selinux_getpolicytype(char **enforce);
+ extern int getseuserbyname(const char *linuxuser, char **seuser, char **level);
++
++int selinux_file_context_cmp(const security_context_t a, const security_context_t b);
++int selinux_file_context_verify(const char *path, mode_t mode);
++int selinux_lsetfilecon_default(const char *path);
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/getsebool.c libselinux-2.0.12/utils/getsebool.c
 --- nsalibselinux/utils/getsebool.c	2006-11-16 17:15:17.000000000 -0500
-+++ libselinux-2.0.9/utils/getsebool.c	2007-04-05 16:57:51.000000000 -0400
++++ libselinux-2.0.12/utils/getsebool.c	2007-04-12 12:29:25.000000000 -0400
 @@ -14,7 +14,7 @@
  
  int main(int argc, char **argv)


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- libselinux.spec	11 Apr 2007 13:12:34 -0000	1.260
+++ libselinux.spec	12 Apr 2007 16:50:49 -0000	1.261
@@ -2,7 +2,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -121,6 +121,8 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Thu Apr 12 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.12-2
+
 * Wed Apr 11 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.12-1
 - Upgrade to upstream
 	* Merged support for getting initial contexts from James Carter.



From fedora-cvs-commits at redhat.com  Thu Apr 12 16:51:52 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 12:51:52 -0400
Subject: rpms/policycoreutils/devel .cvsignore, 1.146,
	1.147 policycoreutils.spec, 1.393, 1.394 sources, 1.151, 1.152
Message-ID: <200704121651.l3CGpq8p021938@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore policycoreutils.spec sources 
Log Message:
* Thu Apr 12 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-1
- Updated version of sepolgen
	* Merged seobject setransRecords patch to return the first alias from Xavier Toth.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- .cvsignore	11 Apr 2007 13:14:53 -0000	1.146
+++ .cvsignore	12 Apr 2007 16:51:50 -0000	1.147
@@ -144,3 +144,4 @@
 sepolgen-1.0.7.tgz
 policycoreutils-2.0.8.tgz
 sepolgen-1.0.8.tgz
+policycoreutils-2.0.9.tgz


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -r1.393 -r1.394
--- policycoreutils.spec	11 Apr 2007 13:14:53 -0000	1.393
+++ policycoreutils.spec	12 Apr 2007 16:51:50 -0000	1.394
@@ -5,7 +5,7 @@
 %define sepolgenver 1.0.8
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 2.0.8
+Version: 2.0.9
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -186,6 +186,10 @@
 fi
 
 %changelog
+* Thu Apr 12 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-1
+- Updated version of sepolgen
+	* Merged seobject setransRecords patch to return the first alias from Xavier Toth.
+
 * Wed Apr 11 2007 Dan Walsh <dwalsh at redhat.com> 2.0.8-1
 - Updated version of sepolgen
 	* Merged updates to sepolgen-ifgen from Karl MacMillan.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- sources	11 Apr 2007 13:14:53 -0000	1.151
+++ sources	12 Apr 2007 16:51:50 -0000	1.152
@@ -1,2 +1,2 @@
-3adbd3e84611903fb973e656b373ca59  policycoreutils-2.0.8.tgz
 4d6e57c7fc396efbcf96b7accab4ba30  sepolgen-1.0.8.tgz
+daa0a6e388b811b1a64a1504ca37b41d  policycoreutils-2.0.9.tgz



From fedora-cvs-commits at redhat.com  Thu Apr 12 16:59:35 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 12:59:35 -0400
Subject: rpms/kernel/FC-6 jwltest-mac80211-backport-2_6_20-fixup.patch,
	1.1.8.1, 1.1.8.2
Message-ID: <200704121659.l3CGxZAX027968@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-jwltest-fc6-31-branch
	jwltest-mac80211-backport-2_6_20-fixup.patch 
Log Message:


jwltest-mac80211-backport-2_6_20-fixup.patch:
 core.c    |    6 ++++--
 nl80211.c |    4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

Index: jwltest-mac80211-backport-2_6_20-fixup.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/Attic/jwltest-mac80211-backport-2_6_20-fixup.patch,v
retrieving revision 1.1.8.1
retrieving revision 1.1.8.2
diff -u -r1.1.8.1 -r1.1.8.2
--- jwltest-mac80211-backport-2_6_20-fixup.patch	12 Apr 2007 15:57:32 -0000	1.1.8.1
+++ jwltest-mac80211-backport-2_6_20-fixup.patch	12 Apr 2007 16:59:33 -0000	1.1.8.2
@@ -1,6 +1,42 @@
---- linux-2.6.20.noarch/net/wireless/core.c.orig	2007-04-12 11:08:24.000000000 -0400
-+++ linux-2.6.20.noarch/net/wireless/core.c	2007-04-12 11:17:34.000000000 -0400
-@@ -291,7 +291,7 @@ static int cfg80211_netdev_notifier_call
+--- linux-2.6.20.noarch/net/wireless/nl80211.c.orig	2007-04-12 12:57:55.000000000 -0400
++++ linux-2.6.20.noarch/net/wireless/nl80211.c	2007-04-12 12:57:51.000000000 -0400
+@@ -694,6 +694,7 @@ static int nl80211_rename_wiphy(struct s
+ 	struct cfg80211_registered_device *rdev;
+ 	int result;
+ 
++#if 0 /* Not in FC6 */
+ 	if (!info->attrs[NL80211_ATTR_WIPHY_NAME])
+ 		return -EINVAL;
+ 
+@@ -705,6 +706,9 @@ static int nl80211_rename_wiphy(struct s
+ 
+ 	cfg80211_put_dev(rdev);
+ 	return result;
++#else
++	return -EINVAL;
++#endif
+ }
+ 
+ static int nl80211_key_cmd(struct sk_buff *skb, struct genl_info *info)
+--- linux-2.6.20.noarch/net/wireless/core.c.orig	2007-04-12 12:55:32.000000000 -0400
++++ linux-2.6.20.noarch/net/wireless/core.c	2007-04-12 12:58:36.000000000 -0400
+@@ -141,6 +141,7 @@ void cfg80211_put_dev(struct cfg80211_re
+ 	mutex_unlock(&drv->mtx);
+ }
+ 
++#if 0 /* Not in FC6 */
+ int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
+ 			char *newname)
+ {
+@@ -172,6 +173,7 @@ int cfg80211_dev_rename(struct cfg80211_
+ 
+ 	return 0;
+ }
++#endif
+ 
+ /* exported functions */
+ 
+@@ -291,7 +293,7 @@ static int cfg80211_netdev_notifier_call
  	case NETDEV_REGISTER:
  		mutex_lock(&rdev->devlist_mtx);
  		list_add(&dev->ieee80211_ptr->list, &rdev->netdev_list);
@@ -9,7 +45,7 @@
  				      "phy80211")) {
  			printk(KERN_ERR "wireless: failed to add phy80211 symlink to netdev!\n");
  		}
-@@ -301,7 +301,7 @@ static int cfg80211_netdev_notifier_call
+@@ -301,7 +303,7 @@ static int cfg80211_netdev_notifier_call
  	case NETDEV_UNREGISTER:
  		mutex_lock(&rdev->devlist_mtx);
  		if (!list_empty(&dev->ieee80211_ptr->list)) {



From fedora-cvs-commits at redhat.com  Thu Apr 12 17:19:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 13:19:30 -0400
Subject: rpms/freetype/devel freetype.spec,1.53,1.54
Message-ID: <200704121719.l3CHJUAj010188@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/freetype/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9998

Modified Files:
	freetype.spec 
Log Message:
* Thu Apr 12 2007 Behdad Esfahbod <besfahbo at redhat.com> 2.3.4-2
- Add alpha to 64-bit archs (#236166)



Index: freetype.spec
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- freetype.spec	10 Apr 2007 15:59:28 -0000	1.53
+++ freetype.spec	12 Apr 2007 17:19:23 -0000	1.54
@@ -8,7 +8,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype
 Version: 2.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD/GPL dual license
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -126,7 +126,7 @@
 %endif
 
 # fix multilib issues
-%ifarch x86_64 s390x ia64 ppc64
+%ifarch x86_64 s390x ia64 ppc64 alpha
 %define wordsize 64
 %else
 %define wordsize 32
@@ -205,6 +205,9 @@
 %{_libdir}/pkgconfig/
 
 %changelog
+* Thu Apr 12 2007 Behdad Esfahbod <besfahbo at redhat.com> 2.3.4-2
+- Add alpha to 64-bit archs (#236166)
+
 * Tue Apr 05 2007 Behdad Esfahbod <besfahbo at redhat.com> 2.3.4-1
 - Update to 2.3.4.
 



From fedora-cvs-commits at redhat.com  Thu Apr 12 17:30:46 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 13:30:46 -0400
Subject: rpms/newt/devel newt-0.52.6-countitems.patch, NONE,
	1.1 newt-0.52.6-cursor.patch, NONE,
	1.1 newt-0.52.6-memleaks.patch, NONE, 1.1 newt.spec, 1.47, 1.48
Message-ID: <200704121730.l3CHUjBf018201@cvs.devel.redhat.com>

Author: mlichvar

Update of /cvs/dist/rpms/newt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18049

Modified Files:
	newt.spec 
Added Files:
	newt-0.52.6-countitems.patch newt-0.52.6-cursor.patch 
	newt-0.52.6-memleaks.patch 
Log Message:
- fix cursor positioning when setting entry or checkbox flags
- fix counting of items in checkboxtree
- fix some memory leaks


newt-0.52.6-countitems.patch:
 checkboxtree.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE newt-0.52.6-countitems.patch ---
Index: checkboxtree.c
===================================================================
RCS file: /usr/local/CVS/newt/checkboxtree.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- checkboxtree.c	30 Jan 2007 14:03:18 -0000	1.32
+++ checkboxtree.c	12 Apr 2007 16:57:33 -0000	1.33
@@ -38,8 +38,7 @@
 static struct items * findItem(struct items * items, const void * data);
 static void buildFlatList(newtComponent co);
 static void doBuildFlatList(struct CheckboxTree * ct, struct items * item);
-enum countWhat { COUNT_EXPOSED=0, COUNT_SELECTED=1 };
-static int countItems(struct items * item, enum countWhat justExposed);
+static int countItems(struct items * item, int what);
 static inline void updateWidth(newtComponent co, struct CheckboxTree * ct,
 				int maxField);
 
@@ -60,13 +59,14 @@
 	ct->sb->left = co->left + co->width - 1;
 }
 
-static int countItems(struct items * item, enum countWhat what) {
+static int countItems(struct items * item, int what) {
     int count = 0;
 
     while (item) {
-        if ((!item->branch && item->selected == what) || (what == COUNT_EXPOSED))
+	if (what < 0 || !item->branch && (what > 0 && item->selected == what
+		    || what == 0 && item->selected))
 	    count++;
-	if (item->branch || (what == COUNT_EXPOSED && item->selected))
+	if (item->branch && (what >= 0 || what < 0 && item->selected))
 	    count += countItems(item->branch, what);
 	item = item->next;
     }
@@ -88,7 +88,7 @@
     struct CheckboxTree * ct = co->data;
 
     if (ct->flatList) free(ct->flatList);
-    ct->flatCount = countItems(ct->itemlist, COUNT_EXPOSED);
+    ct->flatCount = countItems(ct->itemlist, -1);
 
     ct->flatList = malloc(sizeof(*ct->flatList) * (ct->flatCount+1));
     ct->flatCount = 0;
@@ -273,7 +273,7 @@
 
 static void listSelected(struct items * items, int * num, const void ** list, int seqindex) {
     while (items) {
-	    if ((seqindex ? items->selected==seqindex : items->selected) && !items->branch)
+	if ((seqindex ? items->selected==seqindex : items->selected) && !items->branch)
 	    list[(*num)++] = (void *) items->data;
 	if (items->branch)
 	    listSelected(items->branch, num, list, seqindex);
@@ -312,7 +312,7 @@
 	    seqindex = 0;
     }
 
-    *numitems = countItems(ct->itemlist, (seqindex ? seqindex : COUNT_SELECTED));
+    *numitems = countItems(ct->itemlist, seqindex);
     if (!*numitems) return NULL;
     
     retval = malloc(*numitems * sizeof(void *));

newt-0.52.6-cursor.patch:
 newt.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE newt-0.52.6-cursor.patch ---
Index: newt.c
===================================================================
RCS file: /usr/local/CVS/newt/newt.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- newt.c	28 Feb 2007 17:35:01 -0000	1.75
+++ newt.c	11 Apr 2007 14:31:40 -0000	1.76
@@ -778,8 +778,13 @@
 }
 
 void newtGetrc(int * row, int * col) {
-   *row = cursorRow;
-   *col = cursorCol;
+    *row = cursorRow;
+    *col = cursorCol;
+
+    if (currentWindow) {
+	*row -= currentWindow->top;
+	*col -= currentWindow->left;
+    }
 }
 
 void newtGotorc(int newRow, int newCol) {

newt-0.52.6-memleaks.patch:
 checkboxtree.c |   18 +++++++++++++-----
 textbox.c      |    4 ++++
 2 files changed, 17 insertions(+), 5 deletions(-)

--- NEW FILE newt-0.52.6-memleaks.patch ---
Index: checkboxtree.c
===================================================================
RCS file: /usr/local/CVS/newt/checkboxtree.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- checkboxtree.c	12 Apr 2007 16:57:33 -0000	1.33
+++ checkboxtree.c	12 Apr 2007 17:03:57 -0000	1.34
@@ -531,19 +531,26 @@
 		    (*ct->currItem ? (*ct->currItem)->depth : 0) * 3 + 4);
 }
 
-static void ctDestroy(newtComponent co) {
-    struct CheckboxTree * ct = co->data;
-    struct items * item, * nextitem;
-
-    nextitem = item = ct->itemlist;
+static void destroyItems(struct items * item) {
+    struct items * nextitem;
 
     while (item != NULL) {
 	nextitem = item->next;
 	free(item->text);
+	if (item->branch)
+	    destroyItems(item->branch);
 	free(item);
 	item = nextitem;
     }
+}
+
+static void ctDestroy(newtComponent co) {
+    struct CheckboxTree * ct = co->data;
 
+    destroyItems(ct->itemlist);
+    free(ct->flatList);
+    if (ct->sb)
+	ct->sb->ops->destroy(ct->sb);
     free(ct->seq);
     free(ct);
     free(co);
@@ -802,6 +809,7 @@
 	treeTop = item->branch;
     }
 
+    free(path);
     buildFlatList(co);
 	
     item = findItem(ct->itemlist, data);
Index: textbox.c
===================================================================
RCS file: /usr/local/CVS/newt/textbox.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- textbox.c	12 Oct 2006 14:18:38 -0000	1.38
+++ textbox.c	12 Apr 2007 17:03:57 -0000	1.39
@@ -451,6 +451,10 @@
     int i;
     struct textbox * tb = co->data;
 
+    if (tb->sb)
+	tb->sb->ops->destroy(tb->sb);
+    if (tb->sb_act)
+	tb->sb_act->ops->destroy(tb->sb_act);
     for (i = 0; i < tb->numLines; i++) 
 	free(tb->lines[i]);
     free(tb->lines);


Index: newt.spec
===================================================================
RCS file: /cvs/dist/rpms/newt/devel/newt.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- newt.spec	4 Apr 2007 16:06:20 -0000	1.47
+++ newt.spec	12 Apr 2007 17:30:43 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: A development library for text mode user interfaces
 Name: newt
 Version: 0.52.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 # The source for this package was pulled from upstream's vcs.  Use the
@@ -13,6 +13,9 @@
 Provides: snack = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch1: newt-0.52.6-entry.patch
+Patch2: newt-0.52.6-cursor.patch
+Patch3: newt-0.52.6-countitems.patch
+Patch4: newt-0.52.6-memleaks.patch
 
 %package devel
 Summary: Newt windowing toolkit development files
@@ -51,6 +54,9 @@
 %prep
 %setup -q
 %patch1 -p0 -b .entry
+%patch2 -p0 -b .cursor
+%patch3 -p0 -b .countitems
+%patch4 -p0 -b .memleaks
 
 %build
 # gpm support seems to smash the stack w/ we use help in anaconda??
@@ -90,6 +96,11 @@
 %{_libdir}/libnewt.a
 
 %changelog
+* Thu Apr 12 2007 Miroslav Lichvar <mlichvar at redhat.com> - 0.52.6-3
+- fix cursor positioning when setting entry or checkbox flags
+- fix counting of items in checkboxtree
+- fix some memory leaks
+
 * Wed Apr 04 2007 Miroslav Lichvar <mlichvar at redhat.com> - 0.52.6-2
 - fix entry scrolling (#234829)
 - fix multibyte character handling in entry



From fedora-cvs-commits at redhat.com  Thu Apr 12 17:40:04 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 13:40:04 -0400
Subject: rpms/kernel-xen-2.6/devel kernel-xen.spec,1.18.2.2,1.18.2.3
Message-ID: <200704121740.l3CHe4Mh018165@cvs.devel.redhat.com>

Author: ehabkost

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

Modified Files:
      Tag: private-ehabkost-2_6_21-branch
	kernel-xen.spec 
Log Message:
Importing spec file comments on patches from kernel/devel

On the previous commits, I've imported only the patches from kernel/devel,
but the comments describing them were lost. Restoring them.




Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -u -r1.18.2.2 -r1.18.2.3
--- kernel-xen.spec	10 Apr 2007 13:11:45 -0000	1.18.2.2
+++ kernel-xen.spec	12 Apr 2007 17:40:02 -0000	1.18.2.3
@@ -312,6 +312,7 @@
 Patch13: git-iwlwifi.patch
 Patch14: git-iwlwifi-fixes.patch
 Patch15: linux-2.6-rt2x00-scan-fix.patch
+
 Patch16: linux-2.6-fix-pmops-1.patch
 Patch17: linux-2.6-fix-pmops-2.patch
 Patch18: linux-2.6-fix-pmops-3.patch
@@ -353,6 +354,7 @@
 Patch340: linux-2.6-mpc52xx-sdma.patch
 Patch341: linux-2.6-mpc52xx-fec.patch
 
+# Patches from ps3-linux-patches.git
 Patch350: linux-2.6-ps3-stable-patches.patch
 Patch351: linux-2.6-ps3-replace-irq-alloc-free.patch
 Patch352: linux-2.6-ps3-storage.patch
@@ -360,6 +362,7 @@
 Patch354: linux-2.6-ps3-device-init.patch
 Patch355: linux-2.6-ps3-fix-slowdown-bug.patch
 Patch356: linux-2.6-ps3-sound.patch
+# And then some minor tweaks...
 Patch360: linux-2.6-ps3-memory-probe.patch
 Patch361: linux-2.6-ps3-legacy-ioport.patch
 Patch362: linux-2.6-ps3fb-panic.patch
@@ -486,11 +489,14 @@
 # ACPI bits
 
 # Add the new firewire stack. Diff between the v2.6.20 tag and commit
-# 5468ee91741092a711327628c7c524a4d4d0cd6a in the linux1394 git tree.
+# a0ab4547b23c09541bc47a294a1397b3b0415bfe in the linux1394 git tree.
 Patch5000: linux-2.6-firewire.patch
+
+# These two are going upstream and will get folded into patch 5000,
+# this is just to get some testing ASAP.
 Patch5001: linux-2.6-firewire-context-run.patch
 Patch5002: linux-2.6-firewire-check-condition.patch
-
+ 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
 # amount of drivers they touch. But only these should go here.
@@ -808,10 +814,16 @@
 %patch10 -p1
 
 %patch11 -p1
+
+# Add the new wireless stack and drivers from wireless-dev
 %patch12 -p1
+# ...and the iwlwifi driver from Intel
 %patch13 -p1
+# ...plus some fixes not yet in Intel's tree
 %patch14 -p1
+# fix up scanning in rt2x00
 %patch15 -p1
+# Power management fixes
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
@@ -850,6 +862,7 @@
 %patch303 -p1
 # Fix up ibmvscsi for combined pSeries/iSeries build
 %patch304 -p1
+# Move pmac_zilog to its newly-registered device number
 %patch305 -p1
 
 # uevent support for of_platform device
@@ -858,15 +871,18 @@
 %patch312 -p1
 %patch313 -p1
 %patch314 -p1
+# Big-endian USB support (Celleb, PS3, Efika)
 #%patch320 -p1
-# MPC52xx PATA
-%patch330 -p1
 
+%patch330 -p1
 %patch331 -p1
 %patch332 -p1
 %patch333 -p1
+# Efika Ethernet
 %patch340 -p1
 %patch341 -p1
+
+# PlayStation 3 support
 %patch350 -p1
 %patch351 -p1
 %patch352 -p1
@@ -874,6 +890,7 @@
 %patch354 -p1
 %patch355 -p1
 %patch356 -p1
+
 %patch360 -p1
 %patch361 -p1
 %patch362 -p1
@@ -1007,7 +1024,7 @@
 %patch1601 -p1
 # The input layer spews crap no-one cares about.
 %patch1610 -p1
-# Tickle the NMI whilst doing serial writes.
+# don't wakeup ondemand timer whilst idle.
 %patch1620 -p1
 # Allow to use 480600 baud on 16C950 UARTs
 %patch1650 -p1
@@ -1015,6 +1032,7 @@
 %patch1681 -p1
 # Align kernel data segment to page boundary.
 %patch1690 -p1
+# DVB spinlock bug
 %patch1700 -p1
 # setuid /proc/self/maps fix.
 %patch1720 -p1
@@ -1035,7 +1053,9 @@
 
 # temporarily restore START_ARRAY ioctl
 %patch1793 -p1
+# Fix i82875 EDAC driver setup so X will start
 %patch1794 -p1
+# Work around sysfs/uevent use-after-free problems with Bluetooth HID
 %patch1795 -p1
 
 # Fix the SELinux mprotect checks on executable mappings
@@ -1060,10 +1080,13 @@
 %patch2103 -p1
 # Disable NMI watchdog by default.
 %patch2105 -p1
+# Disable MMCONFIG & MSI by default.
 %patch2106 -p1
 
 # Enable PATA ports on Promise SATA.
 #%patch2200 -p1
+# libata: don't initialize sg in ata_exec_internal() if DMA_NONE
+# ia64 ata quirk
 %patch2204 -p1
 
 # ACPI patches
@@ -1073,7 +1096,7 @@
 # be merged upstream
 #
 
-# Pull in the new firewire stack from 2.6.20-rc3-mm1.
+# Pull in the new firewire stack
 %patch5000 -p1
 %patch5001 -p1
 %patch5002 -p1



From fedora-cvs-commits at redhat.com  Thu Apr 12 17:46:20 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 13:46:20 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1163,1.1164
Message-ID: <200704121746.l3CHkK5D018443@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
link ordering complete


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1163
retrieving revision 1.1164
diff -u -r1.1163 -r1.1164
--- openoffice.org.spec	12 Apr 2007 15:34:54 -0000	1.1163
+++ openoffice.org.spec	12 Apr 2007 17:46:18 -0000	1.1164
@@ -2630,6 +2630,8 @@
 * Wed Apr 11 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.5
 - Resolves: rhbz#235828 INIFILE optimization breaks addins
 - Resolves: rhbz#235325 crash on launch of x86_64 soffice.bin
+- finish ld reordering -> apparent 0.4 warm launch improvement
+  http://people.redhat.com/caolanm/speed/ldreorder.ods
 
 * Fri Apr 06 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.4
 - Resolves: rhbz#235341 pdf overlapping characters



From fedora-cvs-commits at redhat.com  Thu Apr 12 18:19:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 14:19:49 -0400
Subject: rpms/libXrandr/devel libXrandr.spec,1.18,1.19
Message-ID: <200704121819.l3CIJnbP020097@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXrandr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20083

Modified Files:
	libXrandr.spec 
Log Message:
* Thu Apr 12 2007 Adam Jackson <ajax at redhat.com> 1.2.0-3
- BuildRequire on the randrproto virtual instead of a magic x-x-p-d version.
- Fix -devel package to require sufficiently new randrproto.



Index: libXrandr.spec
===================================================================
RCS file: /cvs/dist/rpms/libXrandr/devel/libXrandr.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libXrandr.spec	28 Feb 2007 20:03:02 -0000	1.18
+++ libXrandr.spec	12 Apr 2007 18:19:47 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXrandr runtime library
 Name: libXrandr
 Version: 1.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -11,8 +11,8 @@
 Patch0: libXrandr-1.2.0-appease-cee-plus-plus.patch
 
 BuildRequires: pkgconfig
-# xrandr.pc Requires: xproto randrproto >= 1.2.1
-BuildRequires: xorg-x11-proto-devel >= 7.2
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: randrproto >= 1.2.1
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 BuildRequires: libXrender-devel
@@ -28,8 +28,8 @@
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: %{name} = %{version}-%{release}
 
-# xrandr.pc Requires: xproto randrproto >= 1.2.1
 Requires: xorg-x11-proto-devel
+Requires: randrproto >= 1.2.1
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -75,6 +75,10 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Apr 12 2007 Adam Jackson <ajax at redhat.com> 1.2.0-3
+- BuildRequire on the randrproto virtual instead of a magic x-x-p-d version.
+- Fix -devel package to require sufficiently new randrproto.
+
 * Wed Feb 28 2007 Adam Jackson <ajax at redhat.com> 1.2.0-2
 - libXrandr-1.2.0-appease-cee-plus-plus.patch: don't use C++ keywords as
   function argument names.



From fedora-cvs-commits at redhat.com  Thu Apr 12 18:20:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 14:20:47 -0400
Subject: rpms/control-center/devel control-center.spec,1.240,1.241
Message-ID: <200704121820.l3CIKlaT020169@cvs.devel.redhat.com>

Author: davidz

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20154

Modified Files:
	control-center.spec 
Log Message:
* Thu Apr 12 2007 David Zeuthen <davidz at redhat.com> - 2.18.0-8
- Disable start-at-helper patch for now (#223669)
- Disable gnome-bg patch as it's empty
- BR metacity-devel




Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- control-center.spec	3 Apr 2007 13:48:48 -0000	1.240
+++ control-center.spec	12 Apr 2007 18:20:40 -0000	1.241
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.18.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -49,11 +49,11 @@
 # We should either wait for it to get upstream, or
 # hunt through the 6.1MB (!!) patch file against
 # control-center
-Patch12: control-center-2.16.0-start-at-helper.patch
+#Patch12: control-center-2.16.0-start-at-helper.patch
 
 Patch13: control-center-2.17.91-no-gnome-common.patch
 
-Patch14: control-center-2.18.0-gnome-bg.patch
+#Patch14: control-center-2.18.0-gnome-bg.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=425650
 Patch15: control-center-2.18.0-ellipsize-sound-devices.patch
@@ -102,6 +102,7 @@
 BuildRequires: fontconfig-devel >= %{fontconfig_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: metacity >= %{metacity_version}
+BuildRequires: metacity-devel >= %{metacity_version}
 BuildRequires: libxklavier-devel >= %{libxklavier_version}
 BuildRequires: libXcursor-devel
 BuildRequires: alsa-lib-devel
@@ -168,9 +169,9 @@
 %patch3 -p1 -b .about-me-help
 %patch5 -p1 -b .compiz-support
 
-%patch12 -p1 -b .start-at-helper
+#%patch12 -p1 -b .start-at-helper
 %patch13 -p1 -b .no-gnome-common
-%patch14 -p1 -b .gnome-bg
+#%patch14 -p1 -b .gnome-bg
 %patch15 -p1 -b .ellipsize-sound-devices
 
 
@@ -323,6 +324,11 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Apr 12 2007 David Zeuthen <davidz at redhat.com> - 2.18.0-8
+- Disable start-at-helper patch for now (#223669)
+- Disable gnome-bg patch as it's empty
+- BR metacity-devel
+
 * Tue Apr  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-7
 - Fix a problem with the previous patch
 



From fedora-cvs-commits at redhat.com  Thu Apr 12 18:48:55 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 14:48:55 -0400
Subject: rpms/gnome-session/devel
	gnome-session-2.17.91-use-gdm-at-hints-3.patch, NONE,
	1.1 gnome-session.spec, 1.116, 1.117
Message-ID: <200704121848.l3CImtMo014254@cvs.devel.redhat.com>

Author: davidz

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

Modified Files:
	gnome-session.spec 
Added Files:
	gnome-session-2.17.91-use-gdm-at-hints-3.patch 
Log Message:
* Thu Apr 12 2007 David Zeuthen <davidz at redhat.com> - 2.18.0-4
- start same kind of AT's in session as started in gdm (#229912)



gnome-session-2.17.91-use-gdm-at-hints-3.patch:
 gsm-at-startup.c |   60 +++++++++++++++++++++++++++++++++++++++++++++++++------
 main.c           |   11 ++++++++++
 2 files changed, 65 insertions(+), 6 deletions(-)

--- NEW FILE gnome-session-2.17.91-use-gdm-at-hints-3.patch ---
--- gnome-session/main.c.gdm-hints	2007-04-12 14:31:38.000000000 -0400
+++ gnome-session/main.c	2007-04-12 14:38:56.000000000 -0400
@@ -388,6 +388,12 @@
   gconf_client = gsm_get_conf_client ();
   gconf_client_add_dir (gconf_client, GSM_GCONF_CONFIG_PREFIX, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); 
   a_t_support = gconf_client_get_bool (gconf_client, ACCESSIBILITY_KEY, NULL);
+  if (g_getenv ("GDM_ATS") != NULL && !a_t_support)
+    {
+      a_t_support = TRUE;
+      gconf_client_set_bool (gconf_client, ACCESSIBILITY_KEY, TRUE, NULL);
+    }
+
 
   if (a_t_support)
     {
@@ -436,6 +442,11 @@
   autosave       = gconf_client_get_bool (gconf_client, AUTOSAVE_MODE_KEY, NULL);
   logout_prompt  = gconf_client_get_bool (gconf_client, LOGOUT_PROMPT_KEY, NULL);
   a_t_support    = gconf_client_get_bool (gconf_client, ACCESSIBILITY_KEY, NULL);
+  if (g_getenv ("GDM_ATS") != NULL)
+    {
+      a_t_support = TRUE;
+    }
+
 
   gconf_client_notify_add (gconf_client,
 			   AUTOSAVE_MODE_KEY,
--- gnome-session/gsm-at-startup.c.gdm-hints	2007-04-12 14:31:38.000000000 -0400
+++ gnome-session/gsm-at-startup.c	2007-04-12 14:31:38.000000000 -0400
@@ -17,16 +17,24 @@
 static void
 gsm_assistive_tech_exec (gchar *exec_string)
 {
-  gchar    *s;
   gboolean  success;
-  
+  char     **v;
+
   success = FALSE;
-  s = g_find_program_in_path (exec_string);
 
-  if (s) {
-    success = gsm_exec_command_line_async (exec_string, NULL);
-    g_free (s);
+  v = g_strsplit (exec_string, " ", 0);
+  if (v[0] != NULL) {
+	  gchar    *s;
+	  fprintf (stderr, "v[0]='%s'\n", v[0]);
+	  s = g_find_program_in_path (v[0]);
+	  fprintf (stderr, "s='%s'\n", s);
+	  if (s) {
+		  success = gsm_exec_command_line_async (exec_string, NULL);
+		  fprintf (stderr, "bar %d '%s'\n", success, exec_string);
+		  g_free (s);
+	  }
   }
+  g_strfreev (v);
   
   if (!success && !strcmp (exec_string, "gnopernicus")) {
     /* backwards compatibility for 2.14 */
@@ -34,6 +42,33 @@
   }
 }
 
+static void
+gsm_assistive_tech_exec_type (gchar *at_type)
+{
+	gchar *at;
+
+	at = NULL;
+
+	fprintf (stderr, "at_type='%s'\n", at_type);
+
+	/* TODO: should 
+	 *
+	 * 1. read from preferred applications in gconf 
+	 * 2. make sure that AT's execed don't overlap with users choice
+	 */
+	if (strcmp (at_type, "screenreader") == 0) {
+		at = "orca";
+	} else if (strcmp (at_type, "magnifier") == 0) {
+		at = "orca -n -d main-window -d speech -e magnifier";
+	} else if (strcmp (at_type, "onscreenkeyboard") == 0) {
+		at = "gok";
+	}
+
+	if (at != NULL) {
+		gsm_assistive_tech_exec (at);
+	}
+}
+
 static GdkFilterReturn 
 gsm_assistive_filter_watch (GdkXEvent *xevent, GdkEvent *event, gpointer data){
      XEvent *xev = (XEvent *)xevent;
@@ -103,6 +138,7 @@
   GError *error = NULL;
   GConfClient *client;
   GSList *list;
+  const char *at_suggested_by_gdm;
 
   client  = gsm_get_conf_client ();
   list = gconf_client_get_list (client, AT_STARTUP_KEY, GCONF_VALUE_STRING, &error);
@@ -122,6 +158,18 @@
 	}
       g_slist_free (list);
     }
+
+  /* start AT's if user have started them from gdm */
+  if ((at_suggested_by_gdm = g_getenv ("GDM_ATS")) != NULL) {
+	  int i;
+	  char **at_list;
+	  at_list = g_strsplit (at_suggested_by_gdm, " ", 0);
+	  for (i = 0; at_list[i] != NULL; i++) {
+		  gsm_assistive_tech_exec_type (at_list[i]);
+	  }
+	  g_strfreev (at_list);
+  }  
+
 }
 
 void


Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- gnome-session.spec	30 Mar 2007 15:49:20 -0000	1.116
+++ gnome-session.spec	12 Apr 2007 18:48:53 -0000	1.117
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.18.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-session/2.18/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -58,6 +58,9 @@
 # don't pop up the dialog as it can take longer than 5 seconds
 Patch20: gnome-session-2.17.91-atspi-timeout.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=411506
+Patch21: gnome-session-2.17.91-use-gdm-at-hints-3.patch
+
 BuildRequires: esound-devel >= %{esound_version}
 BuildRequires: /usr/bin/esd
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -104,6 +107,7 @@
 %patch9 -p1 -b .no-crashes
 %patch13 -p1 -b .window-manager
 %patch20 -p1 -b .timeout
+%patch21 -p0 -b .use-gdm-hints
 
 %build
 
@@ -195,6 +199,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/session-properties.svg
 
 %changelog
+* Thu Apr 12 2007 David Zeuthen <davidz at redhat.com> - 2.18.0-4
+- start same kind of AT's in session as started in gdm (#229912)
+
 * Fri Mar 30 2007 Ray Strode <rstrode at redhat.com> - 2.18.0-3
 - remove xdg autostart dir since it's part of filesystem now
 



From fedora-cvs-commits at redhat.com  Thu Apr 12 18:53:11 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 14:53:11 -0400
Subject: rpms/readahead/devel .cvsignore, 1.3, 1.4 readahead.spec, 1.36,
	1.37 sources, 1.5, 1.6
Message-ID: <200704121853.l3CIrBPo017425@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/readahead/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17379

Modified Files:
	.cvsignore readahead.spec sources 
Log Message:
* Thu Apr 12 2007 Karel Zak <kzak at redhat.com> - 1:1.4.1-1
- upgrade to new upstream version 1.4.1
- generate new lists



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/readahead/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Feb 2007 12:42:32 -0000	1.3
+++ .cvsignore	12 Apr 2007 18:53:09 -0000	1.4
@@ -1,3 +1,3 @@
-readahead-1.4.tar.bz2
+readahead-1.4.1.tar.bz2
 default.early
 default.later


Index: readahead.spec
===================================================================
RCS file: /cvs/dist/rpms/readahead/devel/readahead.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- readahead.spec	28 Feb 2007 14:16:49 -0000	1.36
+++ readahead.spec	12 Apr 2007 18:53:09 -0000	1.37
@@ -1,6 +1,6 @@
 Summary:        Read a preset list of files into memory
 Name:           readahead
-Version:        1.4
+Version:        1.4.1
 Release:        1%{?dist}
 Epoch:          1
 Group:          System Environment/Base
@@ -48,6 +48,7 @@
 %attr(0755, root, root)                    %{_sysconfdir}/rc.d/init.d/readahead_later
 %attr(0755, root, root)                    %{_sysconfdir}/rc.d/init.d/readahead_early
 %attr(0644, root, root) %config(noreplace) %{_sysconfdir}/readahead.conf
+%dir                                       %{_sysconfdir}/readahead.d
 %attr(0644, root, root) %config            %{_sysconfdir}/readahead.d/default.early
 %attr(0644, root, root) %config            %{_sysconfdir}/readahead.d/default.later
 %{_sbindir}/readahead
@@ -70,7 +71,11 @@
 exit 0
 
 %changelog
-* Tue Feb 27  2007 Karel Zak <kzak at redhat.com> - 1:1.4-1
+* Thu Apr 12 2007 Karel Zak <kzak at redhat.com> - 1:1.4.1-1
+- upgrade to new upstream version 1.4.1
+- generate new lists
+
+* Tue Feb 27 2007 Karel Zak <kzak at redhat.com> - 1:1.4-1
 - upgrade to new upstream version
 - cleanup spec file
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/readahead/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Mar 2007 09:33:38 -0000	1.5
+++ sources	12 Apr 2007 18:53:09 -0000	1.6
@@ -1,3 +1,3 @@
-30639d2368ca2e3affb36d18c8206467  readahead-1.4.tar.bz2
-4602d7d85013d09068cc13e11032adb6  default.early
-bca200a779fe5dd6aa134459c6ab0c16  default.later
+61436ab8695807f5e24908f080e5a1ae  readahead-1.4.1.tar.bz2
+ab09181d67c2112aa40743b7754188d4  default.early
+afb25a9d3494ea6e6366b57a3fd04583  default.later



From fedora-cvs-commits at redhat.com  Thu Apr 12 19:06:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 15:06:01 -0400
Subject: rpms/dhcp/devel dhcp.spec,1.155,1.156
Message-ID: <200704121906.l3CJ61We026734@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26690

Modified Files:
	dhcp.spec 
Log Message:
* Thu Apr 12 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-31
- Spec file cleanups (#225691)
- Put libdhcpctl.a and libomapi.a in dhcp-devel-static package
- Put libdhcp4client.a in libdhcp4client-devel-static package



Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- dhcp.spec	11 Apr 2007 20:12:51 -0000	1.155
+++ dhcp.spec	12 Apr 2007 19:05:59 -0000	1.156
@@ -77,7 +77,8 @@
 Summary: Provides the dhclient ISC DHCP client daemon and dhclient-script
 Group: System Environment/Base
 Requires: initscripts >= 6.75
-Obsoletes: dhcpcd <= 1.3.22
+Obsoletes: dhcpcd <= 1.3.22pl1-7
+Provides: dhcpcd = 1.3.22pl1-8
 
 %description -n dhclient
 DHCP (Dynamic Host Configuration Protocol) is a protocol which allows



From fedora-cvs-commits at redhat.com  Thu Apr 12 19:13:56 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 15:13:56 -0400
Subject: rpms/dbus/devel dbus-1.0.2-selinux.patch, NONE, 1.1 dbus.spec, 1.116,
	1.117
Message-ID: <200704121913.l3CJDue2000486@cvs.devel.redhat.com>

Author: davidz

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv340

Modified Files:
	dbus.spec 
Added Files:
	dbus-1.0.2-selinux.patch 
Log Message:
* Thu Apr 12 2007 David Zeuthen <davidz at redhat.com> - 1.0.2-3
- Start SELinux thread after setuid call (#221168)



dbus-1.0.2-selinux.patch:
 bus.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE dbus-1.0.2-selinux.patch ---
--- dbus-1.0.2/bus/bus.c.audit_session	2006-12-11 14:21:23.000000000 -0500
+++ dbus-1.0.2/bus/bus.c	2007-03-30 11:53:46.000000000 -0400
@@ -746,11 +746,6 @@
       _dbus_string_free (&pid);
     }
 
-  if (!bus_selinux_full_init ())
-    {
-      _dbus_warn ("SELinux initialization failed\n");
-    }
-
   if (!process_config_postinit (context, parser, error))
     {
       _DBUS_ASSERT_ERROR_IS_SET (error);
@@ -775,6 +770,11 @@
 	}
     }
   
+  if (!bus_selinux_full_init ())
+    {
+      _dbus_warn ("SELinux initialization failed\n");
+    }
+
   dbus_server_free_data_slot (&server_data_slot);
   
   return context;


Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- dbus.spec	28 Mar 2007 20:29:25 -0000	1.116
+++ dbus.spec	12 Apr 2007 19:13:54 -0000	1.117
@@ -8,7 +8,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 1.0.2 
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
 Source1: doxygen_to_devhelp.xsl
@@ -37,6 +37,7 @@
 Patch1: dbus-0.60-start-early.patch
 Patch2: dbus-0.92-audit-system.patch
 Patch4: dbus-1.0.1-generate-xml-docs.patch
+Patch5: dbus-1.0.2-selinux.patch
 
 %description
 
@@ -72,6 +73,7 @@
 %patch1 -p1 -b .start-early
 %patch2 -p1 -b .audit_system
 %patch4 -p1 -b .generate-xml-docs
+%patch5 -p1 -b .selinux-send-to-audit
 
 autoreconf -f -i
 
@@ -183,6 +185,9 @@
 %{_datadir}/devhelp/books/dbus
 
 %changelog
+* Thu Apr 12 2007 David Zeuthen <davidz at redhat.com> - 1.0.2-3
+- Start SELinux thread after setuid call (#221168)
+
 * Wed Mar 28 2007 Matthias Clasen <mclasen at redhat.com> - 1.0.2-2
 - Require pkgconfig in the -devel package
 



From fedora-cvs-commits at redhat.com  Thu Apr 12 19:16:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 15:16:26 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.3059, 1.3060 nouveau-drm.patch,
	1.3, 1.4
Message-ID: <200704121916.l3CJGQvx002330@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec nouveau-drm.patch 
Log Message:
* Thu Apr 12 2007 Dave Jones <davej at redhat.com>
- Update nouveau patch. (Richard Hughes)



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3059
retrieving revision 1.3060
diff -u -r1.3059 -r1.3060
--- kernel-2.6.spec	11 Apr 2007 21:18:18 -0000	1.3059
+++ kernel-2.6.spec	12 Apr 2007 19:16:23 -0000	1.3060
@@ -2263,6 +2263,9 @@
 #  - tux.
 
 %changelog
+* Thu Apr 12 2007 Dave Jones <davej at redhat.com>
+- Update nouveau patch. (Richard Hughes)
+
 * Wed Apr 11 2007 Dave Jones <davej at redhat.com>
 - DRM support for Intel 965GM
 

nouveau-drm.patch:
 Kconfig          |    6 
 Makefile         |   10 
 drm_bufs.c       |    1 
 drm_pciids.h     |  231 +++++++++
 nouveau_drm.h    |  152 ++++++
 nouveau_drv.c    |   96 ++++
 nouveau_drv.h    |  304 ++++++++++++
 nouveau_fifo.c   |  711 +++++++++++++++++++++++++++++
 nouveau_ioc32.c  |   73 +++
 nouveau_irq.c    |  440 ++++++++++++++++++
 nouveau_mem.c    |  674 ++++++++++++++++++++++++++++
 nouveau_object.c |  604 +++++++++++++++++++++++++
 nouveau_reg.h    |  467 +++++++++++++++++++
 nouveau_state.c  |  375 +++++++++++++++
 nv04_fb.c        |   24 +
 nv04_graph.c     |  397 ++++++++++++++++
 nv04_mc.c        |   25 +
 nv04_timer.c     |   24 +
 nv10_fb.c        |   26 +
 nv10_graph.c     |  662 +++++++++++++++++++++++++++
 nv20_graph.c     |  234 +++++++++
 nv30_graph.c     |  222 +++++++++
 nv40_fb.c        |   56 ++
 nv40_graph.c     | 1317 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 nv40_mc.c        |   41 +
 25 files changed, 7172 insertions(+)

Index: nouveau-drm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/nouveau-drm.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nouveau-drm.patch	30 Mar 2007 20:13:11 -0000	1.3
+++ nouveau-drm.patch	12 Apr 2007 19:16:23 -0000	1.4
@@ -1,9 +1,3 @@
-commit e6f9ecee6c5ad2e996c6262c0b64e49a3d5d0719
-Author: Kristian H??gsberg <krh at redhat.com>
-Date:   Thu Mar 29 18:52:53 2007 -0400
-
-    Ported over latest nouveau drm.
-
 diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig
 index ef833a1..065f499 100644
 --- a/drivers/char/drm/Kconfig
@@ -3409,10 +3403,10 @@
 +
 diff --git a/drivers/char/drm/nouveau_reg.h b/drivers/char/drm/nouveau_reg.h
 new file mode 100644
-index 0000000..3360fec
+index 0000000..ea4a2f6
 --- /dev/null
 +++ b/drivers/char/drm/nouveau_reg.h
-@@ -0,0 +1,463 @@
+@@ -0,0 +1,467 @@
 +
 +
 +#define NV03_BOOT_0                                        0x00100000
@@ -3480,6 +3474,10 @@
 +#define NV03_PMC_ENABLE                                    0x00000200
 +#    define NV_PMC_ENABLE_PFIFO                               (1<< 8)
 +#    define NV_PMC_ENABLE_PGRAPH                              (1<<12)
++/* Disabling the below bit breaks newer (G7X only?) mobile chipsets,
++ * the card will hang early on in the X init process.
++ */
++#    define NV_PMC_ENABLE_UNK13                               (1<<13)
 +#define NV40_PMC_1700                                      0x00001700
 +#define NV40_PMC_1704                                      0x00001704
 +#define NV40_PMC_1708                                      0x00001708
@@ -4692,10 +4690,10 @@
 +
 diff --git a/drivers/char/drm/nv04_mc.c b/drivers/char/drm/nv04_mc.c
 new file mode 100644
-index 0000000..2619eb7
+index 0000000..0e23efb
 --- /dev/null
 +++ b/drivers/char/drm/nv04_mc.c
-@@ -0,0 +1,20 @@
+@@ -0,0 +1,25 @@
 +#include "drmP.h"
 +#include "drm.h"
 +#include "nouveau_drv.h"
@@ -4706,6 +4704,11 @@
 +{
 +	drm_nouveau_private_t *dev_priv = dev->dev_private;
 +
++	/* Power up everything, resetting each individual unit will
++	 * be done later if needed.
++	 */
++	NV_WRITE(NV03_PMC_ENABLE, 0xFFFFFFFF);
++
 +	NV_WRITE(NV03_PMC_INTR_EN_0, 0);
 +
 +	return 0;
@@ -4780,7 +4783,7 @@
 +
 diff --git a/drivers/char/drm/nv10_graph.c b/drivers/char/drm/nv10_graph.c
 new file mode 100644
-index 0000000..3ca843d
+index 0000000..db2757d
 --- /dev/null
 +++ b/drivers/char/drm/nv10_graph.c
 @@ -0,0 +1,662 @@
@@ -4972,7 +4975,7 @@
 +static int nv10_graph_ctx_regs [] = {
 +NV03_PGRAPH_XY_LOGIC_MISC0,
 +
-+//NV10_PGRAPH_CTX_SWITCH1, make ctx switch crash
++NV10_PGRAPH_CTX_SWITCH1,
 +NV10_PGRAPH_CTX_SWITCH2,
 +NV10_PGRAPH_CTX_SWITCH3,
 +NV10_PGRAPH_CTX_SWITCH4,
@@ -5340,7 +5343,7 @@
 +	
 +	nouveau_wait_for_idle(dev);
 +
-+	NV_WRITE(NV03_PGRAPH_CTX_CONTROL, 0x10000000);
++	NV_WRITE(NV10_PGRAPH_CTX_CONTROL, 0x10000000);
 +	NV_WRITE(NV10_PGRAPH_CTX_USER, (NV_READ(NV10_PGRAPH_CTX_USER) & 0xffffff) | (0x1f << 24));
 +
 +	nouveau_wait_for_idle(dev);
@@ -5356,7 +5359,7 @@
 +	nouveau_wait_for_idle(dev);
 +#endif
 +	
-+	NV_WRITE(NV03_PGRAPH_CTX_CONTROL, 0x10010100);
++	NV_WRITE(NV10_PGRAPH_CTX_CONTROL, 0x10010100);
 +	NV_WRITE(NV10_PGRAPH_CTX_USER, channel << 24);
 +	NV_WRITE(NV10_PGRAPH_FFINTFC_ST2, NV_READ(NV10_PGRAPH_FFINTFC_ST2)&0xCFFFFFFF);
 +
@@ -5419,7 +5422,7 @@
 +		NV_WRITE(NV10_PGRAPH_TSTATUS(i), NV_READ(NV10_PFB_TSTATUS(i)));
 +	}
 +
-+	NV_WRITE(NV04_PGRAPH_CTX_CONTROL, 0x10010100);
++	NV_WRITE(NV10_PGRAPH_CTX_CONTROL, 0x10010100);
 +	NV_WRITE(NV10_PGRAPH_STATE      , 0xFFFFFFFF);
 +	NV_WRITE(NV04_PGRAPH_FIFO       , 0x00000001);
 +
@@ -5448,7 +5451,7 @@
 +
 diff --git a/drivers/char/drm/nv20_graph.c b/drivers/char/drm/nv20_graph.c
 new file mode 100644
-index 0000000..45d88d6
+index 0000000..7190fc8
 --- /dev/null
 +++ b/drivers/char/drm/nv20_graph.c
 @@ -0,0 +1,234 @@
@@ -5571,7 +5574,7 @@
 +	
 +	nouveau_wait_for_idle(dev);
 +
-+	NV_WRITE(NV03_PGRAPH_CTX_CONTROL, 0x10000000);
++	NV_WRITE(NV10_PGRAPH_CTX_CONTROL, 0x10000000);
 +
 +	nv20_graph_context_restore(dev, channel);
 +
@@ -5580,7 +5583,7 @@
 +	if ((NV_READ(NV10_PGRAPH_CTX_USER) >> 24) != channel)
 +		DRM_ERROR("nouveau_nv20_context_switch : wrong channel restored %x %x!!!\n", channel, NV_READ(NV10_PGRAPH_CTX_USER) >> 24);
 +
-+	NV_WRITE(NV03_PGRAPH_CTX_CONTROL, 0x10010100);
++	NV_WRITE(NV10_PGRAPH_CTX_CONTROL, 0x10010100);
 +	NV_WRITE(NV10_PGRAPH_FFINTFC_ST2, NV_READ(NV10_PGRAPH_FFINTFC_ST2)&0xCFFFFFFF);
 +
 +	NV_WRITE(NV04_PGRAPH_FIFO,0x1);
@@ -5648,7 +5651,7 @@
 +		NV_WRITE(NV10_PGRAPH_TSTATUS(i), NV_READ(NV10_PFB_TSTATUS(i)));
 +	}
 +
-+	NV_WRITE(NV04_PGRAPH_CTX_CONTROL, 0x10010100);
++	NV_WRITE(NV10_PGRAPH_CTX_CONTROL, 0x10010100);
 +	NV_WRITE(NV10_PGRAPH_STATE      , 0xFFFFFFFF);
 +	NV_WRITE(NV04_PGRAPH_FIFO       , 0x00000001);
 +
@@ -5688,7 +5691,7 @@
 +
 diff --git a/drivers/char/drm/nv30_graph.c b/drivers/char/drm/nv30_graph.c
 new file mode 100644
-index 0000000..391a106
+index 0000000..f4faadd
 --- /dev/null
 +++ b/drivers/char/drm/nv30_graph.c
 @@ -0,0 +1,222 @@
@@ -5876,7 +5879,7 @@
 +		NV_WRITE(NV10_PGRAPH_TSTATUS(i), NV_READ(NV10_PFB_TSTATUS(i)));
 +	}
 +
-+	NV_WRITE(NV04_PGRAPH_CTX_CONTROL, 0x10010100);
++	NV_WRITE(NV10_PGRAPH_CTX_CONTROL, 0x10010100);
 +	NV_WRITE(NV10_PGRAPH_STATE      , 0xFFFFFFFF);
 +	NV_WRITE(NV04_PGRAPH_FIFO       , 0x00000001);
 +
@@ -5978,10 +5981,10 @@
 +
 diff --git a/drivers/char/drm/nv40_graph.c b/drivers/char/drm/nv40_graph.c
 new file mode 100644
-index 0000000..510ffa7
+index 0000000..792734e
 --- /dev/null
 +++ b/drivers/char/drm/nv40_graph.c
-@@ -0,0 +1,1130 @@
+@@ -0,0 +1,1317 @@
 +#include "drmP.h"
 +#include "drm.h"
 +#include "nouveau_drv.h"
@@ -5994,6 +5997,7 @@
 + */
 +#define NV40_GRCTX_SIZE (175*1024)
 +#define NV43_GRCTX_SIZE (70*1024)
++#define NV46_GRCTX_SIZE (70*1024) /* probably ~64KiB */
 +#define NV4A_GRCTX_SIZE (64*1024)
 +#define NV4C_GRCTX_SIZE (25*1024)
 +#define NV4E_GRCTX_SIZE (25*1024)
@@ -6258,6 +6262,156 @@
 +		INSTANCE_WR(ctx, i/4, 0x3f800000);
 +};
 +
++static void nv46_graph_context_init(drm_device_t *dev, struct mem_block *ctx)
++{
++	drm_nouveau_private_t *dev_priv = dev->dev_private;
++	int i;
++
++	INSTANCE_WR(ctx, 0x00000/4, nouveau_chip_instance_get(dev, ctx));
++	INSTANCE_WR(ctx, 0x00040/4, 0x0000ffff);
++	INSTANCE_WR(ctx, 0x00044/4, 0x0000ffff);
++	INSTANCE_WR(ctx, 0x0004c/4, 0x00000001);
++	INSTANCE_WR(ctx, 0x00138/4, 0x20010001);
++	INSTANCE_WR(ctx, 0x0013c/4, 0x0f73ef00);
++	INSTANCE_WR(ctx, 0x00144/4, 0x02008821);
++	INSTANCE_WR(ctx, 0x00174/4, 0x00000001);
++	INSTANCE_WR(ctx, 0x00178/4, 0x00000001);
++	INSTANCE_WR(ctx, 0x0017c/4, 0x00000001);
++	INSTANCE_WR(ctx, 0x00180/4, 0x00000001);
++	INSTANCE_WR(ctx, 0x00184/4, 0x00000001);
++	INSTANCE_WR(ctx, 0x00188/4, 0x00000001);
++	INSTANCE_WR(ctx, 0x0018c/4, 0x00000001);
++	INSTANCE_WR(ctx, 0x00190/4, 0x00000001);
++	INSTANCE_WR(ctx, 0x00194/4, 0x00000040);
++	INSTANCE_WR(ctx, 0x00198/4, 0x00000040);
++	INSTANCE_WR(ctx, 0x0019c/4, 0x00000040);
++	INSTANCE_WR(ctx, 0x001a4/4, 0x00000040);
++	INSTANCE_WR(ctx, 0x001ec/4, 0x0b0b0b0c);
++	INSTANCE_WR(ctx, 0x0035c/4, 0x00040000);
++	INSTANCE_WR(ctx, 0x0036c/4, 0x55555555);
++	INSTANCE_WR(ctx, 0x00370/4, 0x55555555);
++	INSTANCE_WR(ctx, 0x00374/4, 0x55555555);
++	INSTANCE_WR(ctx, 0x00378/4, 0x55555555);
++	INSTANCE_WR(ctx, 0x003a4/4, 0x00000008);
++	INSTANCE_WR(ctx, 0x003b8/4, 0x00003010);
++	INSTANCE_WR(ctx, 0x003dc/4, 0x00000111);
++	INSTANCE_WR(ctx, 0x003e0/4, 0x00000111);
++	INSTANCE_WR(ctx, 0x003e4/4, 0x00000111);
++	INSTANCE_WR(ctx, 0x003e8/4, 0x00000111);
++	INSTANCE_WR(ctx, 0x003ec/4, 0x00000111);
++	INSTANCE_WR(ctx, 0x003f0/4, 0x00000111);
++	INSTANCE_WR(ctx, 0x003f4/4, 0x00000111);
++	INSTANCE_WR(ctx, 0x003f8/4, 0x00000111);
++	INSTANCE_WR(ctx, 0x003fc/4, 0x00000111);
++	INSTANCE_WR(ctx, 0x00400/4, 0x00000111);
++	INSTANCE_WR(ctx, 0x00404/4, 0x00000111);
++	INSTANCE_WR(ctx, 0x00408/4, 0x00000111);
++	INSTANCE_WR(ctx, 0x0040c/4, 0x00000111);
++	INSTANCE_WR(ctx, 0x00410/4, 0x00000111);
++	INSTANCE_WR(ctx, 0x00414/4, 0x00000111);
++	INSTANCE_WR(ctx, 0x00418/4, 0x00000111);
++	INSTANCE_WR(ctx, 0x004b0/4, 0x00000111);
++	INSTANCE_WR(ctx, 0x004b4/4, 0x00080060);
++	INSTANCE_WR(ctx, 0x004d0/4, 0x00000080);
++	INSTANCE_WR(ctx, 0x004d4/4, 0xffff0000);
++	INSTANCE_WR(ctx, 0x004d8/4, 0x00000001);
++	INSTANCE_WR(ctx, 0x004ec/4, 0x46400000);
++	INSTANCE_WR(ctx, 0x004fc/4, 0xffff0000);
++	INSTANCE_WR(ctx, 0x00500/4, 0x88888888);
++	INSTANCE_WR(ctx, 0x00504/4, 0x88888888);
++	INSTANCE_WR(ctx, 0x00508/4, 0x88888888);
++	INSTANCE_WR(ctx, 0x0050c/4, 0x88888888);
++	INSTANCE_WR(ctx, 0x00510/4, 0x88888888);
++	INSTANCE_WR(ctx, 0x00514/4, 0x88888888);
++	INSTANCE_WR(ctx, 0x00518/4, 0x88888888);
++	INSTANCE_WR(ctx, 0x0051c/4, 0x88888888);
++	INSTANCE_WR(ctx, 0x00520/4, 0x88888888);
++	INSTANCE_WR(ctx, 0x00524/4, 0x88888888);
++	INSTANCE_WR(ctx, 0x00528/4, 0x88888888);
++	INSTANCE_WR(ctx, 0x0052c/4, 0x88888888);
++	INSTANCE_WR(ctx, 0x00530/4, 0x88888888);
++	INSTANCE_WR(ctx, 0x00534/4, 0x88888888);
++	INSTANCE_WR(ctx, 0x00538/4, 0x88888888);
++	INSTANCE_WR(ctx, 0x0053c/4, 0x88888888);
++	INSTANCE_WR(ctx, 0x00550/4, 0x0fff0000);
++	INSTANCE_WR(ctx, 0x00554/4, 0x0fff0000);
++	INSTANCE_WR(ctx, 0x0055c/4, 0x00011100);
++	for (i=0x00578; i<0x005b4; i+=4)
++		INSTANCE_WR(ctx, i/4, 0x07ff0000);
++	INSTANCE_WR(ctx, 0x005c0/4, 0x4b7fffff);
++	INSTANCE_WR(ctx, 0x005e8/4, 0x30201000);
++	INSTANCE_WR(ctx, 0x005ec/4, 0x70605040);
++	INSTANCE_WR(ctx, 0x005f0/4, 0xb8a89888);
++	INSTANCE_WR(ctx, 0x005f4/4, 0xf8e8d8c8);
++	INSTANCE_WR(ctx, 0x00608/4, 0x40100000);
++	INSTANCE_WR(ctx, 0x00624/4, 0x0000ffff);
++	INSTANCE_WR(ctx, 0x00658/4, 0x435185d6);
++	INSTANCE_WR(ctx, 0x0065c/4, 0x2155b699);
++	INSTANCE_WR(ctx, 0x00660/4, 0xfedcba98);
++	INSTANCE_WR(ctx, 0x00664/4, 0x00000098);
++	INSTANCE_WR(ctx, 0x00674/4, 0xffffffff);
++	INSTANCE_WR(ctx, 0x00678/4, 0x00ff7000);
++	INSTANCE_WR(ctx, 0x0067c/4, 0x0000ffff);
++	INSTANCE_WR(ctx, 0x0068c/4, 0x00ff0000);
++	INSTANCE_WR(ctx, 0x006c8/4, 0x00ffff00);
++	for (i=0x0070c; i<=0x00748; i+=4)
++		INSTANCE_WR(ctx, i/4, 0x00018488);
++	for (i=0x0074c; i<=0x00788; i+=4)
++		INSTANCE_WR(ctx, i/4, 0x00028202);
++	for (i=0x007cc; i<=0x00808; i+=4)
++		INSTANCE_WR(ctx, i/4, 0x0000aae4);
++	for (i=0x0080c; i<=0x00848; i+=4)
++		INSTANCE_WR(ctx, i/4, 0x01012000);
++	for (i=0x0084c; i<=0x00888; i+=4)
++		INSTANCE_WR(ctx, i/4, 0x00080008);
++	for (i=0x008cc; i<=0x00908; i+=4)
++		INSTANCE_WR(ctx, i/4, 0x00100008);
++	for (i=0x0095c; i<=0x00968; i+=4)
++		INSTANCE_WR(ctx, i/4, 0x0001bc80);
++	for (i=0x0096c; i<=0x00978; i+=4)
++		INSTANCE_WR(ctx, i/4, 0x00000202);
++	for (i=0x0098c; i<=0x00998; i+=4)
++		INSTANCE_WR(ctx, i/4, 0x00000008);
++	for (i=0x009ac; i<=0x009b8; i+=4)
++		INSTANCE_WR(ctx, i/4, 0x00080008);
++	INSTANCE_WR(ctx, 0x009cc/4, 0x00000002);
++	INSTANCE_WR(ctx, 0x00a00/4, 0x00000421);
++	INSTANCE_WR(ctx, 0x00a04/4, 0x030c30c3);
++	INSTANCE_WR(ctx, 0x00a08/4, 0x00011001);
++	INSTANCE_WR(ctx, 0x00a14/4, 0x3e020200);
++	INSTANCE_WR(ctx, 0x00a18/4, 0x00ffffff);
++	INSTANCE_WR(ctx, 0x00a1c/4, 0x0c103f00);
++	INSTANCE_WR(ctx, 0x00a28/4, 0x00040000);
++	INSTANCE_WR(ctx, 0x00a60/4, 0x00008100);
++	INSTANCE_WR(ctx, 0x00aec/4, 0x00000001);
++	INSTANCE_WR(ctx, 0x00b30/4, 0x00001001);
++	INSTANCE_WR(ctx, 0x00b38/4, 0x00000003);
++	INSTANCE_WR(ctx, 0x00b3c/4, 0x00888001);
++	INSTANCE_WR(ctx, 0x00bc0/4, 0x00000005);
++	INSTANCE_WR(ctx, 0x00bcc/4, 0x0000ffff);
++	INSTANCE_WR(ctx, 0x00be8/4, 0x00005555);
++	INSTANCE_WR(ctx, 0x00bec/4, 0x00005555);
++	INSTANCE_WR(ctx, 0x00bf0/4, 0x00005555);
++	INSTANCE_WR(ctx, 0x00bf4/4, 0x00000001);
++	INSTANCE_WR(ctx, 0x00c2c/4, 0x00000001);
++	INSTANCE_WR(ctx, 0x00c30/4, 0x08e00001);
++	INSTANCE_WR(ctx, 0x00c34/4, 0x000e3000);
++	for (i=0x017f8; i<=0x01870; i+=8)
++		INSTANCE_WR(ctx, i/4, 0x3f800000);
++	for (i=0x035b8; i<=0x057a8; i+=24)
++		INSTANCE_WR(ctx, i/4, 0x00000001);
++	for (i=0x057b8; i<=0x05ba8; i+=16)
++		INSTANCE_WR(ctx, i/4, 0x3f800000);
++	for (i=0x07f38; i<=0x0a128; i+=24)
++		INSTANCE_WR(ctx, i/4, 0x00000001);
++	for (i=0x0a138; i<=0x0a528; i+=16)
++		INSTANCE_WR(ctx, i/4, 0x3f800000);
++	for (i=0x0c8b8; i<=0x0eaa8; i+=24)
++		INSTANCE_WR(ctx, i/4, 0x00000001);
++	for (i=0x0eab8; i<=0x0eea8; i+=16)
++		INSTANCE_WR(ctx, i/4, 0x3f800000);
++}
++
 +static void nv4a_graph_context_init(drm_device_t *dev, struct mem_block *ctx)
 +{
 +	drm_nouveau_private_t *dev_priv = dev->dev_private;
@@ -6606,6 +6760,10 @@
 +		ctx_size = NV43_GRCTX_SIZE;
 +		ctx_init = nv43_graph_context_init;
 +		break;
++	case 0x46:
++		ctx_size = NV46_GRCTX_SIZE;
++		ctx_init = nv46_graph_context_init;
++		break;
 +	case 0x4a:
 +		ctx_size = NV4A_GRCTX_SIZE;
 +		ctx_init = nv4a_graph_context_init;
@@ -6805,6 +6963,37 @@
 +	~0
 +};
 +
++static uint32_t nv46_ctx_voodoo[] = {
++	0x00400889, 0x00200000, 0x0060000a, 0x00200000, 0x00300000, 0x00800001,
++	0x00700009, 0x0060000e, 0x00400d64, 0x00400d05, 0x00408f65, 0x00409306,
++	0x0040a068, 0x0040198f, 0x00200001, 0x0060000a, 0x00700080, 0x00104042,
++	0x00200001, 0x0060000a, 0x00700000, 0x001040c5, 0x00401826, 0x00401968,
++	0x0060000d, 0x00200000, 0x0060000a, 0x00700000, 0x00106000, 0x00700080,
++	0x004020e6, 0x007000a0, 0x00500060, 0x00200008, 0x0060000a, 0x0011814d,
++	0x00110158, 0x00105401, 0x0020003a, 0x00100051, 0x001040c5, 0x0010c1c4,
++	0x001041c9, 0x0010c1dc, 0x00150210, 0x0012c225, 0x00108238, 0x0010823e,
++	0x001242c0, 0x00200040, 0x00100280, 0x00128100, 0x00128120, 0x00128143,
++	0x0011415f, 0x0010815c, 0x0010c140, 0x00104029, 0x00110400, 0x00104d10,
++	0x00500060, 0x00403f87, 0x0060000d, 0x004079e6, 0x002000f7, 0x0060000a,
++	0x00200045, 0x00100620, 0x00104668, 0x0017466d, 0x0011068b, 0x00168691,
++	0x001046ae, 0x001046b0, 0x001206b4, 0x001046c4, 0x001146c6, 0x00200022,
++	0x001006cc, 0x001246f0, 0x002000c0, 0x00100700, 0x0010c3d7, 0x001043e1,
++	0x00500060, 0x0020027f, 0x0060000a, 0x00104800, 0x00108901, 0x00104910,
++	0x00124920, 0x0020001f, 0x00100940, 0x00140965, 0x00148a00, 0x00108a14,
++	0x00160b00, 0x00134b2c, 0x0010cd00, 0x0010cd04, 0x0010cd08, 0x00104d80,
++	0x00104e00, 0x0012d600, 0x00105c00, 0x00104f06, 0x00105406, 0x00105709,
++	0x00200316, 0x0060000a, 0x00300000, 0x00200080, 0x00407200, 0x00200084,
++	0x00800001, 0x0020055e, 0x0060000a, 0x002037e0, 0x0040788a, 0x00201320,
++	0x00800029, 0x00408900, 0x00600006, 0x004085e6, 0x00700080, 0x00200081,
++	0x0060000a, 0x00104280, 0x00200316, 0x0060000a, 0x00200004, 0x00800001,
++	0x00700000, 0x00200000, 0x0060000a, 0x00106002, 0x0040a068, 0x00700000,
++	0x00200000, 0x0060000a, 0x00106002, 0x00700080, 0x00400a68, 0x00500060,
++	0x00600007, 0x00409388, 0x0060000f, 0x00500060, 0x00200000, 0x0060000a,
++	0x00700000, 0x00106001, 0x00910880, 0x00901ffe, 0x01940000, 0x00200020,
++	0x0060000b, 0x00500069, 0x0060000c, 0x00402168, 0x0040a206, 0x0040a305,
++	0x00600009, 0x00700005, 0x00700006, 0x0060000e, ~0
++};
++
 +static uint32_t nv4a_ctx_voodoo[] = {
 +	0x00400889, 0x00200000, 0x0060000a, 0x00200000, 0x00300000, 0x00800001, 
 +	0x00700009, 0x0060000e, 0x00400d64, 0x00400d05, 0x00409965, 0x00409e06, 
@@ -6875,7 +7064,7 @@
 + * G70		0x47
 + * G71		0x49
 + * NV45		0x48
-+ * G72		0x46
++ * G72[M]	0x46
 + * G73		0x4b
 + * C51_G7X	0x4c
 + * C51		0x4e
@@ -6897,6 +7086,7 @@
 +	switch (dev_priv->chipset) {
 +	case 0x40: ctx_voodoo = nv40_ctx_voodoo; break;
 +	case 0x43: ctx_voodoo = nv43_ctx_voodoo; break;
++	case 0x46: ctx_voodoo = nv46_ctx_voodoo; break;
 +	case 0x4a: ctx_voodoo = nv4a_ctx_voodoo; break;
 +	case 0x4e: ctx_voodoo = nv4e_ctx_voodoo; break;
 +	default:
@@ -6931,7 +7121,7 @@
 +	NV_WRITE(NV10_PGRAPH_DEBUG_4, 0x00008000);
 +	NV_WRITE(NV04_PGRAPH_LIMIT_VIOL_PIX, 0x00be3c5f);
 +
-+	NV_WRITE(NV04_PGRAPH_CTX_CONTROL, 0x10010100);
++	NV_WRITE(NV10_PGRAPH_CTX_CONTROL, 0x10010100);
 +	NV_WRITE(NV10_PGRAPH_STATE      , 0xFFFFFFFF);
 +	NV_WRITE(NV04_PGRAPH_FIFO       , 0x00000001);
 +
@@ -7114,10 +7304,10 @@
 +
 diff --git a/drivers/char/drm/nv40_mc.c b/drivers/char/drm/nv40_mc.c
 new file mode 100644
-index 0000000..554a224
+index 0000000..8dbd96f
 --- /dev/null
 +++ b/drivers/char/drm/nv40_mc.c
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,41 @@
 +#include "drmP.h"
 +#include "drm.h"
 +#include "nouveau_drv.h"
@@ -7129,6 +7319,11 @@
 +	drm_nouveau_private_t *dev_priv = dev->dev_private;
 +	uint32_t tmp;
 +
++	/* Power up everything, resetting each individual unit will
++	 * be done later if needed.
++	 */
++	NV_WRITE(NV03_PMC_ENABLE, 0xFFFFFFFF);
++
 +	NV_WRITE(NV03_PMC_INTR_EN_0, 0);
 +
 +	switch (dev_priv->chipset) {



From fedora-cvs-commits at redhat.com  Thu Apr 12 19:19:29 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 15:19:29 -0400
Subject: rpms/gnome-mount/devel .cvsignore, 1.8, 1.9 gnome-mount.spec, 1.26,
	1.27 sources, 1.8, 1.9
Message-ID: <200704121919.l3CJJTqY004663@cvs.devel.redhat.com>

Author: davidz

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

Modified Files:
	.cvsignore gnome-mount.spec sources 
Log Message:
* Thu Apr 12 2007 David Zeuthen <davidz at redhat.com> - 0.6-1
- Update to upstream release 0.6
- No significant changes apart from better i18n coverage




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	26 Sep 2006 22:07:40 -0000	1.8
+++ .cvsignore	12 Apr 2007 19:19:27 -0000	1.9
@@ -5,3 +5,4 @@
 gnome-mount-0.4.tar.gz
 gnome-mount-0.4.0.2006.07.24.tar.gz
 gnome-mount-0.5.tar.gz
+gnome-mount-0.6.tar.gz


Index: gnome-mount.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gnome-mount.spec	26 Mar 2007 23:32:15 -0000	1.26
+++ gnome-mount.spec	12 Apr 2007 19:19:27 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Mount replacement which uses HAL to do the mounting 
 Name: gnome-mount
-Version: 0.5
-Release: 4%{?dist} 
+Version: 0.6
+Release: 1%{?dist} 
 License: GPL
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
@@ -94,6 +94,10 @@
 %{_libdir}/nautilus/extensions-1.0/libgnome-mount.so
 
 %changelog
+* Thu Apr 12 2007 David Zeuthen <davidz at redhat.com> - 0.6-1
+- Update to upstream release 0.6
+- No significant changes apart from better i18n coverage
+
 * Mon Mar 26 2007 Matthias Clasen <mclasen at redhat.com> - 0.5.0-4
 - Fix a directory ownership issue (#233959)
 - Other spec cleanups


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	26 Sep 2006 22:07:40 -0000	1.8
+++ sources	12 Apr 2007 19:19:27 -0000	1.9
@@ -1 +1 @@
-76622ff9af0131fc44687aed7204f84f  gnome-mount-0.5.tar.gz
+d2612aecfa73806e072316033d78b203  gnome-mount-0.6.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 12 19:34:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 15:34:53 -0400
Subject: rpms/kernel/devel patch-2.6.21-rc6-git5.bz2.sign, NONE,
	1.1 .cvsignore, 1.603, 1.604 kernel-2.6.spec, 1.3060,
	1.3061 linux-2.6-silence-noise.patch, 1.6, 1.7 sources, 1.566,
	1.567 upstream, 1.494, 1.495 patch-2.6.21-rc6-git4.bz2.sign,
	1.1, NONE
Message-ID: <200704121934.l3CJYr8D015758@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-silence-noise.patch 
	sources upstream 
Added Files:
	patch-2.6.21-rc6-git5.bz2.sign 
Removed Files:
	patch-2.6.21-rc6-git4.bz2.sign 
Log Message:
* Thu Apr 12 2007 Dave Jones <davej at redhat.com>
- 2.6.21-rc6-git5



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

iD8DBQBGHeRxyGugalF9Dw4RAmXcAJ9XkhXTQg89XFmHakkiaTPtdETHugCbB1KH
wyRhvSO5UbhAKUG/Hfcz3Xo=
=Ouh5
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.603
retrieving revision 1.604
diff -u -r1.603 -r1.604
--- .cvsignore	11 Apr 2007 20:40:48 -0000	1.603
+++ .cvsignore	12 Apr 2007 19:34:51 -0000	1.604
@@ -5,4 +5,4 @@
 kernel-2.6.20
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc6.bz2
-patch-2.6.21-rc6-git4.bz2
+patch-2.6.21-rc6-git5.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3060
retrieving revision 1.3061
diff -u -r1.3060 -r1.3061
--- kernel-2.6.spec	12 Apr 2007 19:16:23 -0000	1.3060
+++ kernel-2.6.spec	12 Apr 2007 19:34:51 -0000	1.3061
@@ -371,7 +371,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.21-rc6.bz2
-Patch2: patch-2.6.21-rc6-git4.bz2
+Patch2: patch-2.6.21-rc6-git5.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -2264,6 +2264,9 @@
 
 %changelog
 * Thu Apr 12 2007 Dave Jones <davej at redhat.com>
+- 2.6.21-rc6-git5
+
+* Thu Apr 12 2007 Dave Jones <davej at redhat.com>
 - Update nouveau patch. (Richard Hughes)
 
 * Wed Apr 11 2007 Dave Jones <davej at redhat.com>

linux-2.6-silence-noise.patch:
 linux-2.6.18.noarch/arch/x86_64/mm/init.c     |    4 ----
 linux-2.6.18.noarch/drivers/pci/setup-res.c   |    4 ++--
 linux-2.6.19.noarch/arch/i386/pci/i386.c      |    4 ++--
 linux-2.6.20.noarch/drivers/base/power/main.c |    6 ------
 4 files changed, 4 insertions(+), 14 deletions(-)

Index: linux-2.6-silence-noise.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-silence-noise.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-silence-noise.patch	4 Apr 2007 05:41:09 -0000	1.6
+++ linux-2.6-silence-noise.patch	12 Apr 2007 19:34:51 -0000	1.7
@@ -52,27 +52,25 @@
  						"resource region %d "
  						"of device %s\n",
  						idx, pci_name(dev));
---- linux-2.6.20.noarch/drivers/base/power/main.c~	2007-04-04 01:39:45.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/base/power/main.c	2007-04-04 01:39:58.000000000 -0400
-@@ -53,8 +53,8 @@ int device_pm_add(struct device * dev)
+--- linux-2.6.20.noarch/drivers/base/power/main.c~	2007-04-12 15:29:10.000000000 -0400
++++ linux-2.6.20.noarch/drivers/base/power/main.c	2007-04-12 15:29:34.000000000 -0400
+@@ -53,9 +53,6 @@ int device_pm_add(struct device * dev)
  {
  	int error;
  
 -	pr_debug("PM: Adding info for %s:%s\n",
--		 dev->bus ? dev->bus->name : "No Bus", dev->kobj.name);
-+//	pr_debug("PM: Adding info for %s:%s\n",
-+//		 dev->bus ? dev->bus->name : "No Bus", dev->kobj.name);
+-		 dev->bus ? dev->bus->name : "No Bus",
+-		 kobject_name(&dev->kobj));
  	down(&dpm_list_sem);
  	list_add_tail(&dev->power.entry, &dpm_active);
  	device_pm_set_parent(dev, dev->parent);
-@@ -66,8 +66,8 @@ int device_pm_add(struct device * dev)
+@@ -67,9 +64,6 @@ int device_pm_add(struct device * dev)
  
  void device_pm_remove(struct device * dev)
  {
 -	pr_debug("PM: Removing info for %s:%s\n",
--		 dev->bus ? dev->bus->name : "No Bus", dev->kobj.name);
-+//	pr_debug("PM: Removing info for %s:%s\n",
-+//		 dev->bus ? dev->bus->name : "No Bus", dev->kobj.name);
+-		 dev->bus ? dev->bus->name : "No Bus",
+-		 kobject_name(&dev->kobj));
  	down(&dpm_list_sem);
  	dpm_sysfs_remove(dev);
  	put_device(dev->power.pm_parent);


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.566
retrieving revision 1.567
diff -u -r1.566 -r1.567
--- sources	11 Apr 2007 20:40:48 -0000	1.566
+++ sources	12 Apr 2007 19:34:51 -0000	1.567
@@ -1,4 +1,4 @@
 2618cbcc9c9ac1c3c04be903fe3338a7  sparse-0.2.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 291cbc4c09c5111e4a2030a04ee69b65  patch-2.6.21-rc6.bz2
-7dd28cd22a68f082dead576313621c2c  patch-2.6.21-rc6-git4.bz2
+82bb55226ee8c8c33d88f233f936c384  patch-2.6.21-rc6-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -r1.494 -r1.495
--- upstream	11 Apr 2007 20:40:48 -0000	1.494
+++ upstream	12 Apr 2007 19:34:51 -0000	1.495
@@ -1,3 +1,3 @@
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc6.bz2
-patch-2.6.21-rc6-git4.bz2
+patch-2.6.21-rc6-git5.bz2


--- patch-2.6.21-rc6-git4.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 12 19:44:48 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 15:44:48 -0400
Subject: rpms/lslk/devel lslk.spec,1.19,1.20
Message-ID: <200704121944.l3CJimWJ013350@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/lslk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13336

Modified Files:
	lslk.spec 
Log Message:
* Thu Apr 12 2007 Karel Zak <kzak at redhat.com> 1.29-18
- fix according to rmplint



Index: lslk.spec
===================================================================
RCS file: /cvs/dist/rpms/lslk/devel/lslk.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- lslk.spec	19 Jul 2006 21:55:03 -0000	1.19
+++ lslk.spec	12 Apr 2007 19:44:46 -0000	1.20
@@ -1,16 +1,16 @@
-Summary: A lock file lister.
+Summary: A lock file lister
 Name: lslk
 Version: 1.29
-Release: 17
-License: Free
+Release: 18%{?dist}
+License: Distributable
 Group: Development/Debuggers
+URL: ftp://vic.cc.purdue.edu/pub/tools/unix/lslk
 Source: ftp://vic.cc.purdue.edu/pub/tools/unix/lslk/lslk_%{version}_W.tar.gz
 
 Patch0: lslk_1.29_W-misc.patch
 Patch1: lslk_1.29_W-readlink.patch
 
-Prefix: %{_prefix}
-Buildroot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Lslk is a lock file lister.  Lslk attempts to list all of the locks on
@@ -50,6 +50,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Thu Apr 12 2007 Karel Zak <kzak at redhat.com> 1.29-18
+- fix according to rmplint
+
 * Wed Jul 19 2006 Karel Zak <kzak at redhat.com> 1.29-17
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Apr 12 19:54:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 15:54:47 -0400
Subject: rpms/selinux-policy/FC-6 policy-20061106.patch, 1.33,
	1.34 policy-apcupsd.patch, 1.1, 1.2 selinux-policy.spec, 1.356,
	1.357
Message-ID: <200704121954.l3CJslhk013786@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20061106.patch policy-apcupsd.patch selinux-policy.spec 
Log Message:
* Wed Apr 11 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-56
- Allow lvm mls_file_read_up to look at Fixed disks
Resolves: #236060
- More fixes for apcupsd


policy-20061106.patch:
 Rules.modular                                |   10 
 config/appconfig-strict-mcs/seusers          |    1 
 config/appconfig-strict-mls/default_contexts |    6 
 config/appconfig-strict-mls/seusers          |    1 
 config/appconfig-strict/seusers              |    1 
 man/man8/kerberos_selinux.8                  |    2 
 policy/flask/access_vectors                  |    2 
 policy/global_tunables                       |   89 ++++
 policy/mls                                   |   31 +
 policy/modules/admin/acct.te                 |    1 
 policy/modules/admin/amanda.if               |   17 
 policy/modules/admin/amanda.te               |    6 
 policy/modules/admin/amtu.fc                 |    3 
 policy/modules/admin/amtu.if                 |   57 ++
 policy/modules/admin/amtu.te                 |   56 ++
 policy/modules/admin/backup.te               |    5 
 policy/modules/admin/bootloader.fc           |    5 
 policy/modules/admin/bootloader.te           |   14 
 policy/modules/admin/consoletype.te          |   21 
 policy/modules/admin/ddcprobe.te             |   10 
 policy/modules/admin/dmesg.te                |    7 
 policy/modules/admin/dmidecode.te            |    5 
 policy/modules/admin/firstboot.if            |    6 
 policy/modules/admin/kudzu.te                |   14 
 policy/modules/admin/logrotate.te            |    5 
 policy/modules/admin/logwatch.te             |   12 
 policy/modules/admin/netutils.te             |   13 
 policy/modules/admin/portage.te              |    5 
 policy/modules/admin/prelink.te              |   18 
 policy/modules/admin/quota.fc                |    7 
 policy/modules/admin/quota.te                |   24 -
 policy/modules/admin/rpm.fc                  |    3 
 policy/modules/admin/rpm.if                  |   43 ++
 policy/modules/admin/rpm.te                  |   49 --
 policy/modules/admin/su.if                   |   28 -
 policy/modules/admin/su.te                   |    2 
 policy/modules/admin/sudo.if                 |   10 
 policy/modules/admin/tripwire.te             |   11 
 policy/modules/admin/usbmodules.te           |    5 
 policy/modules/admin/usermanage.if           |    1 
 policy/modules/admin/usermanage.te           |   42 +
 policy/modules/admin/vpn.te                  |    1 
 policy/modules/apps/ethereal.te              |    5 
 policy/modules/apps/evolution.if             |  107 ++++-
 policy/modules/apps/evolution.te             |    1 
 policy/modules/apps/games.fc                 |    1 
 policy/modules/apps/gnome.fc                 |    2 
 policy/modules/apps/gnome.if                 |  108 +++++
 policy/modules/apps/gnome.te                 |    5 
 policy/modules/apps/gpg.if                   |    1 
 policy/modules/apps/java.fc                  |    2 
 policy/modules/apps/java.if                  |   38 +
 policy/modules/apps/java.te                  |    2 
 policy/modules/apps/loadkeys.if              |   17 
 policy/modules/apps/mozilla.if               |  210 ++++++++-
 policy/modules/apps/mplayer.if               |   84 +++
 policy/modules/apps/mplayer.te               |    1 
 policy/modules/apps/slocate.te               |    3 
 policy/modules/apps/thunderbird.if           |   81 +++
 policy/modules/apps/userhelper.if            |   19 
 policy/modules/apps/webalizer.te             |    6 
 policy/modules/apps/wine.fc                  |    1 
 policy/modules/apps/yam.te                   |    5 
 policy/modules/kernel/corecommands.fc        |   19 
 policy/modules/kernel/corecommands.if        |   77 +++
 policy/modules/kernel/corenetwork.if.in      |  140 ++++++
 policy/modules/kernel/corenetwork.te.in      |   14 
 policy/modules/kernel/devices.fc             |    8 
 policy/modules/kernel/devices.if             |   18 
 policy/modules/kernel/devices.te             |    8 
 policy/modules/kernel/domain.if              |   58 ++
 policy/modules/kernel/domain.te              |   22 +
 policy/modules/kernel/files.fc               |    2 
 policy/modules/kernel/files.if               |  224 ++++++++++
 policy/modules/kernel/filesystem.if          |   62 ++
 policy/modules/kernel/filesystem.te          |   19 
 policy/modules/kernel/kernel.if              |   84 +++
 policy/modules/kernel/kernel.te              |   22 -
 policy/modules/kernel/mls.if                 |   28 +
 policy/modules/kernel/mls.te                 |    6 
 policy/modules/kernel/storage.fc             |    3 
 policy/modules/kernel/storage.if             |    2 
 policy/modules/kernel/terminal.fc            |    1 
 policy/modules/kernel/terminal.if            |    2 
 policy/modules/kernel/terminal.te            |    1 
 policy/modules/services/afs.pp               |binary
 policy/modules/services/aide.fc              |    4 
 policy/modules/services/aide.pp              |binary
 policy/modules/services/aide.te              |    7 
 policy/modules/services/amavis.pp            |binary
 policy/modules/services/amavis.te            |    2 
 policy/modules/services/apache.fc            |   17 
 policy/modules/services/apache.if            |   22 -
 policy/modules/services/apache.pp            |binary
 policy/modules/services/apache.te            |   43 +-
 policy/modules/services/apm.pp               |binary
 policy/modules/services/apm.te               |    3 
 policy/modules/services/arpwatch.pp          |binary
 policy/modules/services/asterisk.pp          |binary
 policy/modules/services/audioentropy.pp      |binary
 policy/modules/services/automount.fc         |    1 
 policy/modules/services/automount.te         |    9 
 policy/modules/services/avahi.if             |   40 +
 policy/modules/services/bind.fc              |    1 
 policy/modules/services/bind.te              |    5 
 policy/modules/services/bluetooth.te         |    8 
 policy/modules/services/ccs.fc               |    1 
 policy/modules/services/ccs.te               |   11 
 policy/modules/services/clamav.te            |    2 
 policy/modules/services/cron.fc              |    6 
 policy/modules/services/cron.if              |   92 ++--
 policy/modules/services/cron.te              |   52 ++
 policy/modules/services/cups.fc              |    3 
 policy/modules/services/cups.te              |   13 
 policy/modules/services/cvs.te               |    1 
 policy/modules/services/cyrus.te             |    5 
 policy/modules/services/dbus.fc              |    1 
 policy/modules/services/dbus.if              |   62 ++
 policy/modules/services/dcc.te               |    9 
 policy/modules/services/dhcp.te              |    2 
 policy/modules/services/dovecot.te           |    6 
 policy/modules/services/ftp.te               |   18 
 policy/modules/services/hal.fc               |    4 
 policy/modules/services/hal.if               |   57 ++
 policy/modules/services/hal.te               |   22 -
 policy/modules/services/inetd.te             |   28 +
 policy/modules/services/irqbalance.te        |    4 
 policy/modules/services/kerberos.if          |   25 +
 policy/modules/services/kerberos.te          |   15 
 policy/modules/services/ktalk.fc             |    3 
 policy/modules/services/ktalk.te             |    5 
 policy/modules/services/lpd.if               |   57 +-
 policy/modules/services/lpd.te               |    5 
 policy/modules/services/mta.fc               |    1 
 policy/modules/services/mta.if               |   20 
 policy/modules/services/mta.te               |    2 
 policy/modules/services/munin.te             |    5 
 policy/modules/services/networkmanager.fc    |    2 
 policy/modules/services/networkmanager.te    |    2 
 policy/modules/services/nis.fc               |    3 
 policy/modules/services/nis.if               |    8 
 policy/modules/services/nis.te               |   34 +
 policy/modules/services/nscd.if              |   20 
 policy/modules/services/nscd.te              |   24 -
 policy/modules/services/oav.te               |    5 
 policy/modules/services/oddjob.te            |    3 
 policy/modules/services/openca.if            |    4 
 policy/modules/services/openca.te            |    2 
 policy/modules/services/openvpn.te           |    4 
 policy/modules/services/pcscd.fc             |    9 
 policy/modules/services/pcscd.if             |   62 ++
 policy/modules/services/pcscd.te             |   78 +++
 policy/modules/services/pegasus.if           |   31 +
 policy/modules/services/pegasus.te           |    6 
 policy/modules/services/portmap.te           |    5 
 policy/modules/services/postfix.fc           |    1 
 policy/modules/services/postfix.if           |    3 
 policy/modules/services/postfix.te           |   21 
 policy/modules/services/procmail.te          |   28 +
 policy/modules/services/pyzor.if             |   18 
 policy/modules/services/pyzor.te             |   13 
 policy/modules/services/radius.te            |    1 
 policy/modules/services/radvd.te             |    2 
 policy/modules/services/rhgb.if              |   76 +++
 policy/modules/services/rhgb.te              |    3 
 policy/modules/services/ricci.te             |   21 
 policy/modules/services/rlogin.te            |   10 
 policy/modules/services/rpc.fc               |    1 
 policy/modules/services/rpc.if               |    3 
 policy/modules/services/rpc.te               |   26 -
 policy/modules/services/rsync.te             |    1 
 policy/modules/services/samba.fc             |    5 
 policy/modules/services/samba.if             |   41 +
 policy/modules/services/samba.te             |   63 ++
 policy/modules/services/sasl.te              |   12 
 policy/modules/services/sendmail.if          |   22 +
 policy/modules/services/sendmail.te          |    8 
 policy/modules/services/setroubleshoot.if    |   20 
 policy/modules/services/setroubleshoot.te    |    2 
 policy/modules/services/smartmon.te          |    1 
 policy/modules/services/snmp.if              |   17 
 policy/modules/services/snmp.te              |   17 
 policy/modules/services/spamassassin.fc      |    2 
 policy/modules/services/spamassassin.if      |   42 +
 policy/modules/services/spamassassin.te      |   18 
 policy/modules/services/squid.fc             |    2 
 policy/modules/services/squid.if             |   21 
 policy/modules/services/squid.te             |   11 
 policy/modules/services/ssh.if               |   83 +++
 policy/modules/services/ssh.te               |   10 
 policy/modules/services/telnet.te            |    3 
 policy/modules/services/tftp.te              |    2 
 policy/modules/services/uucp.fc              |    1 
 policy/modules/services/uucp.if              |   67 +++
 policy/modules/services/uucp.te              |   44 +-
 policy/modules/services/xserver.fc           |    2 
 policy/modules/services/xserver.if           |  190 ++++++++-
 policy/modules/services/xserver.te           |   12 
 policy/modules/system/authlogin.if           |   76 +++
 policy/modules/system/authlogin.te           |    6 
 policy/modules/system/clock.te               |   13 
 policy/modules/system/fstools.fc             |    1 
 policy/modules/system/fstools.te             |   11 
 policy/modules/system/getty.te               |   14 
 policy/modules/system/hostname.te            |   19 
 policy/modules/system/init.if                |   64 +++
 policy/modules/system/init.te                |   51 ++
 policy/modules/system/ipsec.fc               |    5 
 policy/modules/system/ipsec.if               |   99 ++++
 policy/modules/system/ipsec.te               |  122 +++++
 policy/modules/system/iptables.te            |   22 -
 policy/modules/system/libraries.fc           |   39 +
 policy/modules/system/libraries.te           |   11 
 policy/modules/system/locallogin.if          |   37 +
 policy/modules/system/locallogin.te          |    6 
 policy/modules/system/logging.fc             |    5 
 policy/modules/system/logging.te             |   27 +
 policy/modules/system/lvm.fc                 |    2 
 policy/modules/system/lvm.if                 |   44 ++
 policy/modules/system/lvm.te                 |   79 +++
 policy/modules/system/miscfiles.fc           |    3 
 policy/modules/system/miscfiles.if           |   79 +++
 policy/modules/system/modutils.te            |   25 -
 policy/modules/system/mount.te               |   27 -
 policy/modules/system/netlabel.te            |    6 
 policy/modules/system/pcmcia.te              |    5 
 policy/modules/system/raid.te                |   15 
 policy/modules/system/selinuxutil.fc         |    2 
 policy/modules/system/selinuxutil.if         |  119 +++++
 policy/modules/system/selinuxutil.te         |  124 ++---
 policy/modules/system/sysnetwork.te          |   10 
 policy/modules/system/tzdata.fc              |    3 
 policy/modules/system/tzdata.if              |   23 +
 policy/modules/system/tzdata.te              |   51 ++
 policy/modules/system/unconfined.fc          |    4 
 policy/modules/system/unconfined.if          |   19 
 policy/modules/system/unconfined.te          |   23 +
 policy/modules/system/userdomain.if          |  569 ++++++++++++++++++++++++---
 policy/modules/system/userdomain.te          |   76 +--
 policy/modules/system/xen.fc                 |    1 
 policy/modules/system/xen.te                 |   46 +-
 241 files changed, 5473 insertions(+), 625 deletions(-)

Index: policy-20061106.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-20061106.patch,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- policy-20061106.patch	10 Apr 2007 19:12:48 -0000	1.33
+++ policy-20061106.patch	12 Apr 2007 19:54:45 -0000	1.34
@@ -655,28 +655,31 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.4.6/policy/modules/admin/kudzu.te
 --- nsaserefpolicy/policy/modules/admin/kudzu.te	2006-11-29 12:04:49.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/kudzu.te	2007-04-02 13:29:23.000000000 -0400
-@@ -22,7 +22,7 @@
++++ serefpolicy-2.4.6/policy/modules/admin/kudzu.te	2007-04-11 13:47:12.000000000 -0400
+@@ -21,8 +21,8 @@
+ # Local policy
  #
  
- allow kudzu_t self:capability { dac_override sys_admin sys_rawio net_admin sys_tty_config mknod };
+-allow kudzu_t self:capability { dac_override sys_admin sys_rawio net_admin sys_tty_config mknod };
 -dontaudit kudzu_t self:capability sys_tty_config;
-+dontaudit kudzu_t self:capability { sys_ptrace sys_tty_config };
++allow kudzu_t self:capability { dac_override sys_admin sys_ptrace sys_rawio net_admin sys_tty_config mknod };
++dontaudit kudzu_t self:capability { sys_tty_config };
  allow kudzu_t self:process { signal_perms execmem };
  allow kudzu_t self:fifo_file rw_file_perms;
  allow kudzu_t self:unix_stream_socket { connectto create_stream_socket_perms };
-@@ -102,6 +102,10 @@
+@@ -102,6 +102,11 @@
  init_use_fds(kudzu_t)
  init_use_script_ptys(kudzu_t)
  init_stream_connect_script(kudzu_t)
 +init_read_init_state(kudzu_t)
++init_ptrace_init_domain(kudzu_t)
 +# kudzu will telinit to make init re-read
 +# the inittab after configuring serial consoles
 +init_telinit(kudzu_t)
  
  libs_use_ld_so(kudzu_t)
  libs_use_shared_libs(kudzu_t)
-@@ -167,3 +171,8 @@
+@@ -167,3 +172,8 @@
  ')
  allow kudzu_t cupsd_rw_etc_t:dir r_dir_perms;
  ')
@@ -2666,7 +2669,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-2.4.6/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/kernel/corecommands.if	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/kernel/corecommands.if	2007-04-12 09:25:36.000000000 -0400
 @@ -456,6 +456,25 @@
  
  ########################################
@@ -4018,6 +4021,7 @@
  fs_type(devpts_t)
  fs_use_trans devpts gen_context(system_u:object_r:devpts_t,s0);
  
+Binary files nsaserefpolicy/policy/modules/services/afs.pp and serefpolicy-2.4.6/policy/modules/services/afs.pp differ
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aide.fc serefpolicy-2.4.6/policy/modules/services/aide.fc
 --- nsaserefpolicy/policy/modules/services/aide.fc	2006-11-29 12:04:49.000000000 -0500
 +++ serefpolicy-2.4.6/policy/modules/services/aide.fc	2007-04-02 15:31:12.000000000 -0400
@@ -4029,6 +4033,7 @@
 +/var/lib/aide(/.*)?		gen_context(system_u:object_r:aide_db_t,mls_systemhigh)
  
  /var/log/aide.log	--	gen_context(system_u:object_r:aide_log_t,mls_systemhigh)
+Binary files nsaserefpolicy/policy/modules/services/aide.pp and serefpolicy-2.4.6/policy/modules/services/aide.pp differ
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aide.te serefpolicy-2.4.6/policy/modules/services/aide.te
 --- nsaserefpolicy/policy/modules/services/aide.te	2006-11-29 12:04:49.000000000 -0500
 +++ serefpolicy-2.4.6/policy/modules/services/aide.te	2007-04-02 15:34:06.000000000 -0400
@@ -4052,6 +4057,7 @@
 +locallogin_use_fds(aide_t)
 +
  seutil_use_newrole_fds(aide_t)
+Binary files nsaserefpolicy/policy/modules/services/amavis.pp and serefpolicy-2.4.6/policy/modules/services/amavis.pp differ
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.4.6/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2006-11-29 12:04:51.000000000 -0500
 +++ serefpolicy-2.4.6/policy/modules/services/amavis.te	2007-04-09 14:51:43.000000000 -0400
@@ -4116,7 +4122,7 @@
 +/var/lib/bugzilla(/.*)?			gen_context(system_u:object_r:httpd_bugzilla_script_rw_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.4.6/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/apache.if	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/services/apache.if	2007-04-11 11:40:43.000000000 -0400
 @@ -76,7 +76,7 @@
  	logging_search_logs(httpd_$1_script_t)
  
@@ -4126,7 +4132,15 @@
  
  	allow httpd_$1_script_t httpd_$1_script_ra_t:dir ra_dir_perms;
  	allow httpd_$1_script_t httpd_$1_script_ra_t:file ra_file_perms;
-@@ -1031,3 +1031,22 @@
+@@ -954,6 +954,7 @@
+ 		type httpd_squirrelmail_t;
+ 	')
+ 
++	allow $1 httpd_squirrelmail_t:dir search_dir_perms;
+ 	allow $1 httpd_squirrelmail_t:file { getattr read };
+ ')
+ 
+@@ -1031,3 +1032,22 @@
  
  	allow $1 httpd_sys_script_t:dir search;
  ')
@@ -4149,9 +4163,10 @@
 +
 +	allow $1 httpd_bugzilla_content_t:dir search_dir_perms;
 +')
+Binary files nsaserefpolicy/policy/modules/services/apache.pp and serefpolicy-2.4.6/policy/modules/services/apache.pp differ
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.4.6/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/apache.te	2007-03-14 16:39:44.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/services/apache.te	2007-04-11 11:40:58.000000000 -0400
 @@ -143,6 +143,8 @@
  allow httpd_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow httpd_t self:tcp_socket create_stream_socket_perms;
@@ -4224,7 +4239,17 @@
  tunable_policy(`httpd_tty_comm',`
  	# cjp: this is redundant:
  	term_use_controlling_term(httpd_helper_t)
-@@ -695,6 +712,7 @@
+@@ -645,7 +662,8 @@
+ 
+ dontaudit httpd_sys_script_t httpd_config_t:dir search;
+ 
+-allow httpd_sys_script_t httpd_squirrelmail_t:file { append read };
++apache_read_squirrelmail_data(httpd_sys_script_t)
++apache_append_squirrelmail_data(httpd_sys_script_t)
+ 
+ allow httpd_sys_script_t squirrelmail_spool_t:dir r_dir_perms;
+ allow httpd_sys_script_t squirrelmail_spool_t:file r_file_perms;
+@@ -695,6 +713,7 @@
  
  optional_policy(`
  	snmp_dontaudit_read_snmp_var_lib_files(httpd_t)
@@ -4232,7 +4257,7 @@
  ')
  
  ########################################
-@@ -704,6 +722,8 @@
+@@ -704,6 +723,8 @@
  
  allow httpd_rotatelogs_t httpd_log_t:dir rw_dir_perms;
  allow httpd_rotatelogs_t httpd_log_t:file manage_file_perms;
@@ -4241,7 +4266,7 @@
  
  kernel_read_kernel_sysctls(httpd_rotatelogs_t)
  kernel_dontaudit_list_proc(httpd_rotatelogs_t)
-@@ -714,9 +734,27 @@
+@@ -714,9 +735,27 @@
  libs_use_ld_so(httpd_rotatelogs_t)
  libs_use_shared_libs(httpd_rotatelogs_t)
  
@@ -4269,6 +4294,7 @@
 +	postgresql_stream_connect(httpd_bugzilla_script_t)
 +')
 +
+Binary files nsaserefpolicy/policy/modules/services/apm.pp and serefpolicy-2.4.6/policy/modules/services/apm.pp differ
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.4.6/policy/modules/services/apm.te
 --- nsaserefpolicy/policy/modules/services/apm.te	2006-11-29 12:04:51.000000000 -0500
 +++ serefpolicy-2.4.6/policy/modules/services/apm.te	2007-03-09 13:35:58.000000000 -0500
@@ -4296,6 +4322,9 @@
  ')
  
  optional_policy(`
+Binary files nsaserefpolicy/policy/modules/services/arpwatch.pp and serefpolicy-2.4.6/policy/modules/services/arpwatch.pp differ
+Binary files nsaserefpolicy/policy/modules/services/asterisk.pp and serefpolicy-2.4.6/policy/modules/services/asterisk.pp differ
+Binary files nsaserefpolicy/policy/modules/services/audioentropy.pp and serefpolicy-2.4.6/policy/modules/services/audioentropy.pp differ
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.fc serefpolicy-2.4.6/policy/modules/services/automount.fc
 --- nsaserefpolicy/policy/modules/services/automount.fc	2006-11-29 12:04:49.000000000 -0500
 +++ serefpolicy-2.4.6/policy/modules/services/automount.fc	2007-03-09 13:35:58.000000000 -0500
@@ -4897,7 +4926,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.4.6/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-11-29 12:04:49.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/cups.te	2007-04-03 09:38:06.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/services/cups.te	2007-04-11 09:36:33.000000000 -0400
 @@ -118,6 +118,8 @@
  allow cupsd_t cupsd_tmp_t:file create_file_perms;
  allow cupsd_t cupsd_tmp_t:fifo_file create_file_perms;
@@ -4939,7 +4968,18 @@
  ')
  
  ifdef(`targeted_policy',`
-@@ -518,6 +526,7 @@
+@@ -295,6 +303,10 @@
+ ')
+ 
+ optional_policy(`
++	sendmail_domtrans(cupsd_t)
++')
++
++optional_policy(`
+ 	seutil_sigchld_newrole(cupsd_t)
+ ')
+ 
+@@ -518,6 +530,7 @@
  corenet_tcp_connect_ipp_port(cupsd_lpd_t)
  
  dev_read_urand(cupsd_lpd_t)
@@ -6959,7 +6999,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.4.6/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/samba.te	2007-04-05 13:57:44.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/services/samba.te	2007-04-12 15:03:59.000000000 -0400
 @@ -10,6 +10,13 @@
  type nmbd_exec_t;
  init_daemon_domain(nmbd_t,nmbd_exec_t)
@@ -6974,16 +7014,36 @@
  type nmbd_var_run_t;
  files_pid_file(nmbd_var_run_t)
  
-@@ -235,6 +242,9 @@
+@@ -106,9 +113,7 @@
+ allow samba_net_t samba_net_tmp_t:file create_file_perms;
+ files_tmp_filetrans(samba_net_t, samba_net_tmp_t, { file dir })
+ 
+-allow samba_net_t samba_var_t:dir rw_dir_perms;
+-allow samba_net_t samba_var_t:lnk_file create_lnk_perms;
+-allow samba_net_t samba_var_t:file create_file_perms;
++samba_manage_var_files(samba_net_t)
+ 
+ kernel_read_proc_symlinks(samba_net_t)
+ 
+@@ -235,6 +240,10 @@
  corenet_tcp_connect_ipp_port(smbd_t)
  corenet_tcp_connect_smbd_port(smbd_t)
  
 +corecmd_exec_shell(smbd_t)
 +corecmd_exec_bin(smbd_t)
++corecmd_read_sbin_symlinks(smbd_t)
 +
  dev_read_sysfs(smbd_t)
  dev_read_urand(smbd_t)
  dev_getattr_mtrr_dev(smbd_t)
+@@ -244,6 +253,7 @@
+ fs_get_xattr_fs_quotas(smbd_t)
+ fs_search_auto_mountpoints(smbd_t)
+ fs_getattr_rpc_dirs(smbd_t)
++fs_list_inotifyfs(smbd_t)
+ 
+ term_dontaudit_use_console(smbd_t)
+ 
 @@ -279,6 +289,12 @@
  userdom_dontaudit_use_unpriv_user_fds(smbd_t)
  userdom_use_unpriv_users_fds(smbd_t)
@@ -7006,7 +7066,24 @@
  
  allow nmbd_t samba_var_t:dir rw_dir_perms;
  allow nmbd_t samba_var_t:file { lock unlink create write setattr read getattr rename };
-@@ -502,7 +518,7 @@
+@@ -387,6 +403,7 @@
+ 
+ files_read_usr_files(nmbd_t)
+ files_read_etc_files(nmbd_t)
++files_list_var_lib(nmbd_t)
+ 
+ init_use_fds(nmbd_t)
+ init_use_script_ptys(nmbd_t)
+@@ -449,6 +466,8 @@
+ allow smbmount_t samba_var_t:file create_file_perms;
+ allow smbmount_t samba_var_t:lnk_file create_lnk_perms;
+ 
++files_list_var_lib(smbmount_t)
++
+ kernel_read_system_state(smbmount_t)
+ 
+ corenet_tcp_sendrecv_all_if(smbmount_t)
+@@ -502,7 +521,7 @@
  userdom_use_sysadm_ttys(smbmount_t)
  
  optional_policy(`
@@ -7015,7 +7092,7 @@
  ')
  
  optional_policy(`
-@@ -525,7 +541,7 @@
+@@ -525,7 +544,7 @@
  allow swat_t self:netlink_audit_socket create;
  allow swat_t self:tcp_socket create_stream_socket_perms;
  allow swat_t self:udp_socket create_socket_perms;
@@ -7024,7 +7101,7 @@
  
  allow swat_t nmbd_exec_t:file { execute read };
  
-@@ -533,7 +549,7 @@
+@@ -533,7 +552,7 @@
  allow swat_t samba_etc_t:file { getattr write read };
  
  allow swat_t samba_log_t:dir search;
@@ -7033,7 +7110,7 @@
  
  allow swat_t smbd_exec_t:file execute ;
  
-@@ -566,9 +582,8 @@
+@@ -566,9 +585,8 @@
  corenet_raw_sendrecv_all_nodes(swat_t)
  corenet_tcp_sendrecv_all_ports(swat_t)
  corenet_udp_sendrecv_all_ports(swat_t)
@@ -7044,7 +7121,7 @@
  
  dev_read_urand(swat_t)
  
-@@ -591,6 +606,7 @@
+@@ -591,6 +609,7 @@
  
  optional_policy(`
  	cups_read_rw_config(swat_t)
@@ -7052,7 +7129,7 @@
  ')
  
  optional_policy(`
-@@ -614,6 +630,8 @@
+@@ -614,6 +633,8 @@
  # Winbind local policy
  #
  
@@ -7061,7 +7138,24 @@
  dontaudit winbind_t self:capability sys_tty_config;
  allow winbind_t self:process signal_perms;
  allow winbind_t self:fifo_file { read write };
-@@ -763,3 +781,24 @@
+@@ -681,6 +702,7 @@
+ domain_use_interactive_fds(winbind_t)
+ 
+ files_read_etc_files(winbind_t)
++files_list_var_lib(winbind_t)
+ 
+ init_use_fds(winbind_t)
+ init_use_script_ptys(winbind_t)
+@@ -743,6 +765,8 @@
+ 
+ domain_use_interactive_fds(winbind_helper_t)
+ 
++files_list_var_lib(windbind_helper_t)
++
+ libs_use_ld_so(winbind_helper_t)
+ libs_use_shared_libs(winbind_helper_t)
+ 
+@@ -763,3 +787,24 @@
  	squid_read_log(winbind_helper_t)
  	squid_append_log(winbind_helper_t)
  ')
@@ -8544,7 +8638,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.4.6/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/system/init.if	2007-04-05 10:18:18.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/system/init.if	2007-04-11 09:55:26.000000000 -0400
 @@ -221,11 +221,14 @@
  	gen_require(`
  		type initrc_t;
@@ -9493,7 +9587,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.4.6/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/system/lvm.te	2007-03-09 13:35:59.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/system/lvm.te	2007-04-11 15:22:17.000000000 -0400
 @@ -13,6 +13,9 @@
  type clvmd_var_run_t;
  files_pid_file(clvmd_var_run_t)
@@ -9645,9 +9739,11 @@
  
  storage_relabel_fixed_disk(lvm_t)
  storage_dontaudit_read_removable_device(lvm_t)
-@@ -213,14 +261,14 @@
+@@ -212,15 +260,16 @@
+ storage_dev_filetrans_fixed_disk(lvm_t)
  # Access raw devices and old /dev/lvm (c 109,0).  Is this needed?
  storage_manage_fixed_disk(lvm_t)
++mls_file_read_up(lvm_t)
  
 -term_dontaudit_getattr_all_user_ttys(lvm_t)
 -term_dontaudit_getattr_pty_dirs(lvm_t)
@@ -9664,7 +9760,7 @@
  files_read_etc_files(lvm_t)
  files_read_etc_runtime_files(lvm_t)
  # for when /usr is not mounted:
-@@ -248,8 +296,8 @@
+@@ -248,8 +297,8 @@
  ')
  
  ifdef(`targeted_policy', `
@@ -9675,7 +9771,7 @@
  
  	files_dontaudit_read_root_files(lvm_t)
  ')
-@@ -259,6 +307,16 @@
+@@ -259,6 +308,16 @@
  ')
  
  optional_policy(`

policy-apcupsd.patch:
 apcupsd.fc |    9 +++++
 apcupsd.if |  108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 apcupsd.te |   91 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 208 insertions(+)

Index: policy-apcupsd.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-apcupsd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- policy-apcupsd.patch	10 Apr 2007 19:15:17 -0000	1.1
+++ policy-apcupsd.patch	12 Apr 2007 19:54:45 -0000	1.2
@@ -1,6 +1,6 @@
 --- serefpolicy-2.4.6/policy/modules/services/apcupsd.te.apcupsd	2007-04-10 14:44:39.000000000 -0400
-+++ serefpolicy-2.4.6/policy/modules/services/apcupsd.te	2007-04-10 14:43:06.000000000 -0400
-@@ -0,0 +1,81 @@
++++ serefpolicy-2.4.6/policy/modules/services/apcupsd.te	2007-04-12 15:16:39.000000000 -0400
+@@ -0,0 +1,91 @@
 +policy_module(apcupsd,1.0.0)
 +
 +########################################
@@ -13,14 +13,15 @@
 +domain_type(apcupsd_t)
 +init_daemon_domain(apcupsd_t, apcupsd_exec_t)
 +
-+# pid files
-+type apcupsd_var_run_t;
-+files_pid_file(apcupsd_var_run_t)
++type apcupsd_lock_t;
++files_lock_file(apcupsd_lock_t)
 +
-+# log files
 +type apcupsd_log_t;
 +logging_log_file(apcupsd_log_t)
 +
++type apcupsd_var_run_t;
++files_pid_file(apcupsd_var_run_t)
++
 +########################################
 +#
 +# apcupsd local policy
@@ -31,9 +32,17 @@
 +init_use_script_ptys(apcupsd_t)
 +domain_use_interactive_fds(apcupsd_t)
 +
-+## internal communication is often done using fifo and unix sockets.
 +allow apcupsd_t self:fifo_file rw_file_perms;
 +allow apcupsd_t self:unix_stream_socket create_stream_socket_perms;
++allow apcupsd_t self:tcp_socket create_stream_socket_perms;
++
++corenet_tcp_bind_apcupsd_port(apcupsd_t)
++corenet_tcp_bind_all_nodes(apcupsd_t)
++corenet_tcp_sendrecv_generic_if(apcupsd_t)
++corenet_tcp_sendrecv_all_nodes(apcupsd_t)
++corenet_tcp_sendrecv_all_ports(apcupsd_t)
++
++dev_rw_generic_usb_dev(apcupsd_t)
 +
 +files_read_etc_files(apcupsd_t)
 +files_search_locks(apcupsd_t)
@@ -48,17 +57,17 @@
 +	term_dontaudit_use_generic_ptys(apcupsd_t)
 +')
 +
++allow apcupsd_t apcupsd_lock_t:file manage_file_perms;
++files_lock_filetrans(apcupsd_t,apcupsd_lock_t,file)
 +
-+# pid file
-+allow apcupsd_t apcupsd_var_run_t:file manage_file_perms;
-+allow apcupsd_t apcupsd_var_run_t:dir rw_dir_perms;
-+files_pid_filetrans(apcupsd_t,apcupsd_var_run_t, file)
-+
-+# log files
 +allow apcupsd_t apcupsd_log_t:file manage_file_perms;
 +allow apcupsd_t apcupsd_log_t:dir { rw_dir_perms setattr };
 +logging_log_filetrans(apcupsd_t,apcupsd_log_t,{ file dir })
 +
++allow apcupsd_t apcupsd_var_run_t:file manage_file_perms;
++allow apcupsd_t apcupsd_var_run_t:dir rw_dir_perms;
++files_pid_filetrans(apcupsd_t,apcupsd_var_run_t, file)
++
 +logging_send_syslog_msg(apcupsd_t)
 +
 +########################################
@@ -82,6 +91,7 @@
 +corenet_udp_sendrecv_all_if(httpd_apcupsd_cgi_script_t)
 +corenet_udp_sendrecv_all_nodes(httpd_apcupsd_cgi_script_t)
 +corenet_udp_sendrecv_all_ports(httpd_apcupsd_cgi_script_t)
++
 --- serefpolicy-2.4.6/policy/modules/services/apcupsd.if.apcupsd	2007-04-10 14:44:42.000000000 -0400
 +++ serefpolicy-2.4.6/policy/modules/services/apcupsd.if	2007-04-10 14:43:06.000000000 -0400
 @@ -0,0 +1,108 @@


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/selinux-policy.spec,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -r1.356 -r1.357
--- selinux-policy.spec	10 Apr 2007 19:12:49 -0000	1.356
+++ selinux-policy.spec	12 Apr 2007 19:54:45 -0000	1.357
@@ -360,6 +360,17 @@
 %endif
 
 %changelog
+* Wed Apr 11 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-56
+- Allow lvm mls_file_read_up to look at Fixed disks
+Resolves: #236060
+- More fixes for apcupsd
+
+* Wed Apr 12 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-55
+- Allow samba to list inotifyfs
+- Allow cups to send mail
+- kudzu Needs to ptrace init
+Resolves: #225443
+
 * Mon Apr 10 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-54
 - syslog needs to be run as SystemHigh
 - Fix file context mapping



From fedora-cvs-commits at redhat.com  Thu Apr 12 20:05:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 16:05:30 -0400
Subject: rpms/checkpolicy/devel .cvsignore, 1.69, 1.70 checkpolicy.spec,
	1.112, 1.113 sources, 1.70, 1.71
Message-ID: <200704122005.l3CK5UDj014151@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore checkpolicy.spec sources 
Log Message:
* Thu Apr 12 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.2-1
- Latest update from NSA
	* Merged checkmodule man page fix from Dan Walsh.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- .cvsignore	20 Feb 2007 14:59:15 -0000	1.69
+++ .cvsignore	12 Apr 2007 20:05:28 -0000	1.70
@@ -55,3 +55,4 @@
 checkpolicy-1.34.0.tgz
 checkpolicy-2.0.0.tgz
 checkpolicy-2.0.1.tgz
+checkpolicy-2.0.2.tgz


Index: checkpolicy.spec
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/devel/checkpolicy.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- checkpolicy.spec	30 Mar 2007 16:14:13 -0000	1.112
+++ checkpolicy.spec	12 Apr 2007 20:05:28 -0000	1.113
@@ -1,8 +1,8 @@
 %define libsepolver 2.0.2-1
 Summary: SELinux policy compiler
 Name: checkpolicy
-Version: 2.0.1
-Release: 3%{?dist}
+Version: 2.0.2
+Release: 1%{?dist}
 License: GPL
 Group: Development/System
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -47,6 +47,10 @@
 %{_mandir}/man8/checkmodule.8.gz
 
 %changelog
+* Thu Apr 12 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.2-1
+- Latest update from NSA
+	* Merged checkmodule man page fix from Dan Walsh.
+
 * Fri Mar 30 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.1-3
 - Rebuild with new libsepol
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	20 Feb 2007 14:59:15 -0000	1.70
+++ sources	12 Apr 2007 20:05:28 -0000	1.71
@@ -1 +1 @@
-8ddb47d6372beca68b76c38ad26b6e06  checkpolicy-2.0.1.tgz
+239e425dab3ea97ca032e8339270ca02  checkpolicy-2.0.2.tgz



From fedora-cvs-commits at redhat.com  Thu Apr 12 20:06:00 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 16:06:00 -0400
Subject: rpms/dhcp/devel dhcp.spec,1.156,1.157
Message-ID: <200704122006.l3CK60gc014243@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14222

Modified Files:
	dhcp.spec 
Log Message:
* Thu Apr 12 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-31
- Spec file cleanups (#225691)
- Put libdhcpctl.a and libomapi.a in dhcp-devel-static package
- Put libdhcp4client.a in libdhcp4client-devel-static package



Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- dhcp.spec	12 Apr 2007 19:05:59 -0000	1.156
+++ dhcp.spec	12 Apr 2007 20:05:58 -0000	1.157
@@ -404,7 +404,7 @@
 %defattr(-,root,root,-)
 %{_includedir}/dhcpctl.h
 %{_includedir}/isc-dhcp
-%{_includedir}/omapi
+%{_includedir}/omapip
 %attr(0644,root,root) %{_mandir}/man3/omshell.3.gz
 %attr(0644,root,root) %{_mandir}/man3/dhcpctl.3.gz
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
@@ -412,7 +412,7 @@
 %files devel-static
 %defattr(-,root,root,-)
 %{_libdir}/libdhcpctl.a
-%{_libdir}/libomapi
+%{_libdir}/libomapi.a
 
 %files -n libdhcp4client
 %defattr(0755,root,root,0755)



From fedora-cvs-commits at redhat.com  Thu Apr 12 20:07:41 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 16:07:41 -0400
Subject: rpms/libselinux/devel .cvsignore, 1.137, 1.138 libselinux-rhat.patch,
	1.116, 1.117 libselinux.spec, 1.261, 1.262 sources, 1.139, 1.140
Message-ID: <200704122007.l3CK7fPF014343@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libselinux-rhat.patch libselinux.spec sources 
Log Message:
* Thu Apr 12 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.13-1
- Upgrade to upstream
	* Merged rpm_execcon python binding fix, matchpathcon man page fix, and getsebool -a handling for EACCES from Dan Walsh.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- .cvsignore	11 Apr 2007 13:12:34 -0000	1.137
+++ .cvsignore	12 Apr 2007 20:07:39 -0000	1.138
@@ -116,3 +116,4 @@
 libselinux-2.0.9.tgz
 libselinux-2.0.11.tgz
 libselinux-2.0.12.tgz
+libselinux-2.0.13.tgz

libselinux-rhat.patch:
 selinuxswig.i |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- libselinux-rhat.patch	12 Apr 2007 16:50:49 -0000	1.116
+++ libselinux-rhat.patch	12 Apr 2007 20:07:39 -0000	1.117
@@ -1,15 +1,5 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/matchpathcon.8 libselinux-2.0.12/man/man8/matchpathcon.8
---- nsalibselinux/man/man8/matchpathcon.8	2007-01-17 11:11:35.000000000 -0500
-+++ libselinux-2.0.12/man/man8/matchpathcon.8	2007-04-12 12:29:25.000000000 -0400
-@@ -28,4 +28,4 @@
- 
- .SH "SEE ALSO"
- .BR selinux "(8), "
--.BR mathpathcon "(3), " 
-+.BR matchpathcon "(3), " 
-Binary files nsalibselinux/src/selinux.pyc and libselinux-2.0.12/src/selinux.pyc differ
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-2.0.12/src/selinuxswig.i
---- nsalibselinux/src/selinuxswig.i	2007-02-22 08:53:23.000000000 -0500
+--- nsalibselinux/src/selinuxswig.i	2007-04-12 16:02:48.000000000 -0400
 +++ libselinux-2.0.12/src/selinuxswig.i	2007-04-12 12:39:51.000000000 -0400
 @@ -44,6 +44,8 @@
  
@@ -40,7 +30,7 @@
  extern const char *selinux_booleans_path(void);
  extern const char *selinux_customizable_types_path(void);
  extern const char *selinux_users_path(void);
-@@ -113,11 +121,43 @@
+@@ -113,8 +121,11 @@
  extern const char *selinux_translations_path(void);
  extern const char *selinux_netfilter_context_path(void);
  extern const char *selinux_path(void);
@@ -51,43 +41,10 @@
 +
 +extern int selinux_check_securetty_context(security_context_t tty_context);
 +void set_selinuxmnt(char *mnt);
-+
-+// This tells SWIG to treat char ** as a special case
-+%typemap(python,in) char ** {
-+  /* Check if is a list */
-+  if (PyList_Check($input)) {
-+    int size = PyList_Size($input);
-+    int i = 0;
-+    $1 = (char **) malloc((size+1)*sizeof(char *));
-+    if ($1 == NULL) {
-+	PyErr_SetString(PyExc_MemoryError,"Out of memory");
-+	return NULL;
-+    }
-+    for (i = 0; i < size; i++) {
-+      PyObject *o = PyList_GetItem($input,i);
-+      if (PyString_Check(o))
-+	$1[i] = PyString_AsString(PyList_GetItem($input,i));
-+      else {
-+	PyErr_SetString(PyExc_TypeError,"list must contain strings");
-+	free($1);
-+	return NULL;
-+      }
-+    }
-+    $1[i] = 0;
-+  } else {
-+    PyErr_SetString(PyExc_TypeError,"not a list");
-+    return NULL;
-+  }
-+}
-+
- extern int rpm_execcon(unsigned int verified, 
- 		       const char *filename, 
--		       char *const argv[], char *const envp[]);
-+		       char **, char **);
  
- extern int is_context_customizable (security_context_t scontext);
- 
-@@ -135,3 +175,7 @@
+ // This tells SWIG to treat char ** as a special case
+ %typemap(python,in) char ** {
+@@ -164,3 +175,7 @@
  }
  extern int selinux_getpolicytype(char **enforce);
  extern int getseuserbyname(const char *linuxuser, char **seuser, char **level);
@@ -95,32 +52,3 @@
 +int selinux_file_context_cmp(const security_context_t a, const security_context_t b);
 +int selinux_file_context_verify(const char *path, mode_t mode);
 +int selinux_lsetfilecon_default(const char *path);
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/getsebool.c libselinux-2.0.12/utils/getsebool.c
---- nsalibselinux/utils/getsebool.c	2006-11-16 17:15:17.000000000 -0500
-+++ libselinux-2.0.12/utils/getsebool.c	2007-04-12 12:29:25.000000000 -0400
-@@ -14,7 +14,7 @@
- 
- int main(int argc, char **argv)
- {
--	int i, rc = 0, active, pending, len = 0, opt;
-+	int i, get_all = 0, rc = 0, active, pending, len = 0, opt;
- 	char **names;
- 
- 	while ((opt = getopt(argc, argv, "a")) > 0) {
-@@ -39,6 +39,7 @@
- 				printf("No booleans\n");
- 				return 0;
- 			}
-+			get_all = 1;
- 			break;
- 		default:
- 			usage(argv[0]);
-@@ -72,6 +73,8 @@
- 	for (i = 0; i < len; i++) {
- 		active = security_get_boolean_active(names[i]);
- 		if (active < 0) {
-+			if (get_all && errno == EACCES) 
-+				continue;
- 			fprintf(stderr, "Error getting active value for %s\n",
- 				names[i]);
- 			rc = -1;


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- libselinux.spec	12 Apr 2007 16:50:49 -0000	1.261
+++ libselinux.spec	12 Apr 2007 20:07:39 -0000	1.262
@@ -1,8 +1,8 @@
 %define libsepolver 2.0.1-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.12
-Release: 2%{?dist}
+Version: 2.0.13
+Release: 1%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -121,7 +121,12 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Thu Apr 12 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.13-1
+- Upgrade to upstream
+	* Merged rpm_execcon python binding fix, matchpathcon man page fix, and getsebool -a handling for EACCES from Dan Walsh.
+
 * Thu Apr 12 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.12-2
+- Add missing interface
 
 * Wed Apr 11 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.12-1
 - Upgrade to upstream


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/sources,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- sources	11 Apr 2007 13:12:34 -0000	1.139
+++ sources	12 Apr 2007 20:07:39 -0000	1.140
@@ -1 +1 @@
-4f5114ea42063b1e3331e84d02bcb0cc  libselinux-2.0.12.tgz
+757f1175a62d14c66938ff5f177d2c6d  libselinux-2.0.13.tgz



From fedora-cvs-commits at redhat.com  Thu Apr 12 20:17:40 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 16:17:40 -0400
Subject: rpms/hal/devel hal-0.5.9-fixes.patch, NONE, 1.1 hal.spec, 1.126,
	1.127 hal-0.5.9-fix-luks-locking.patch, 1.1, NONE
Message-ID: <200704122017.l3CKHeTU014964@cvs.devel.redhat.com>

Author: davidz

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

Modified Files:
	hal.spec 
Added Files:
	hal-0.5.9-fixes.patch 
Removed Files:
	hal-0.5.9-fix-luks-locking.patch 
Log Message:
* Thu Apr 12 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-3
- Add patches from 0.5.9 stable branch



hal-0.5.9-fixes.patch:
 NEWS                                         |   28 +++++++++++++++++++++++-
 configure.in                                 |    4 +--
 doc/spec/hal-spec-fdi-files.xml              |    8 +++---
 fdi/policy/10osvendor/10-keyboard-policy.fdi |    8 +++++-
 hald/device_info.c                           |   31 +++++++++++++--------------
 hald/hald.c                                  |    3 --
 hald/hald_dbus.c                             |    1 
 hald/mmap_cache.c                            |    6 ++---
 tools/hal-luks-setup                         |   14 ++++++------
 tools/hal-luks-teardown                      |   14 ++++++------
 10 files changed, 73 insertions(+), 44 deletions(-)

--- NEW FILE hal-0.5.9-fixes.patch ---
diff --git a/NEWS b/NEWS
index d7d98c1..184fc12 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,30 @@
 ==========
+HAL 0.5.9.1
+==========
+
+Not yet released.
+
+Requirements for HAL 0.5.9.1.
+
+ - Linux kernel     >= 2.6.17
+ - util-linux       >= 2.12r1    (--enable-umount-helper requires patch from RH #188193)
+ - bash             >= 2.0
+ - udev             >= 089
+ - dbus             >= 0.61      (with glib bindings)
+ - glib             >= 2.6.0
+ - expat            >= 1.95.8
+ - hal-info         >= 20070402
+ - libusb           >= 0 0.1.10a (optional)
+ - pciutils         >= 2.2.3     (optional
+ - dmidecode        >= 2.7       (optional)
+ - parted           == 1.7.1, 1.8.0, 1.8.1, 1.8.2, 1.86 (optional)
+ - cryptsetup-luks  >= 1.0.1     (optional, needs LUKS patches)
+ - libsmbios	    >= 0.13.4    (optional for DELL machines, Linux only)
+ - dellWirelessCtl  >= 0.13.4    (optional, for Dell machines, must live in /usr/bin/, Linux only)
+ - ConsoleKit       >= 0.2.0     (optional)
+ - pm-utils         >= 0.99.2 or newer (optional)
+
+==========
 HAL 0.5.9 "Precipice"
 ==========
 
@@ -21,7 +47,7 @@ Requirements for HAL 0.5.9 "Precipice":
  - cryptsetup-luks  >= 1.0.1     (optional, needs LUKS patches)
  - libsmbios	    >= 0.13.4    (optional for DELL machines, Linux only)
  - dellWirelessCtl  >= 0.13.4    (optional, for Dell machines, must live in /usr/bin/, Linux only)
- - ConsoleKit       >= 0.2.0
+ - ConsoleKit       >= 0.2.0     (optional)
  - pm-utils         >= 0.99.2 or newer (optional)
 
 Contributors to HAL 0.5.9 "Precipice":
diff --git a/configure.in b/configure.in
index cb520af..bef2f61 100644
--- a/configure.in
+++ b/configure.in
@@ -7,8 +7,8 @@ dnl Process this file with autoconf to produce a configure script.
 #
 
 AC_PREREQ(2.59c)
-AC_INIT(hal, 0.5.9, david at fubar.dk)
-AM_INIT_AUTOMAKE(hal, 0.5.9)
+AC_INIT(hal, 0.5.9.1, david at fubar.dk)
+AM_INIT_AUTOMAKE(hal, 0.5.9.1)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
diff --git a/doc/spec/hal-spec-fdi-files.xml b/doc/spec/hal-spec-fdi-files.xml
index a51e5f5..1fdb8d6 100644
--- a/doc/spec/hal-spec-fdi-files.xml
+++ b/doc/spec/hal-spec-fdi-files.xml
@@ -156,10 +156,10 @@
           <para>
             <literal>contains_not</literal> - can only be used with strlist (string list) 
 	    and string properties.
-            For a string list this match if the given string is not match any of the
-            item of the list for a string this match of the property not contains the
-	    (sub-)string. You can use this attribute to construct if/else blocks together 
-	    with e.g. <literal>contains</literal>.
+            For a string list this match if the given string not match any of the
+            item of the list (or the property is not set for the device). For a string  
+	    this match of the property not contains the (sub-)string. You can use this 
+	    attribute to construct if/else blocks together with e.g. <literal>contains</literal>.
           </para>
         </listitem>
         <listitem>
diff --git a/fdi/policy/10osvendor/10-keyboard-policy.fdi b/fdi/policy/10osvendor/10-keyboard-policy.fdi
index 9599384..d1885c5 100644
--- a/fdi/policy/10osvendor/10-keyboard-policy.fdi
+++ b/fdi/policy/10osvendor/10-keyboard-policy.fdi
@@ -5,10 +5,14 @@
   <device>
     <match key="info.capabilities" contains="input">
       <match key="info.capabilities" contains="button">
-	<append key="info.addons" type="strlist">hald-addon-keyboard</append>
+        <match key="info.addons" contains_not="hald-addon-keyboard">
+	  <append key="info.addons" type="strlist">hald-addon-keyboard</append>
+        </match>
       </match>
       <match key="info.capabilities" contains="input.keyboard">
-	<append key="info.addons" type="strlist">hald-addon-keyboard</append>
+        <match key="info.addons" contains_not="hald-addon-keyboard">
+	  <append key="info.addons" type="strlist">hald-addon-keyboard</append>
+        </match>
         <match key="info.capabilities" contains_not="button">
 	  <append key="info.capabilities" type="strlist">button</append>
         </match>
diff --git a/hald/device_info.c b/hald/device_info.c
index 8355011..3b9cf7b 100644
--- a/hald/device_info.c
+++ b/hald/device_info.c
@@ -447,27 +447,28 @@ handle_match (struct rule *rule, HalDevice *d)
 	{
 		dbus_bool_t contains = FALSE;
 
-		if (hal_device_property_get_type (d, prop_to_check) == HAL_PROPERTY_TYPE_STRING) {
-			if (hal_device_has_property (d, prop_to_check)) {
+		if (hal_device_has_property (d, prop_to_check) && value != NULL) {
+
+			if (hal_device_property_get_type (d, prop_to_check) == HAL_PROPERTY_TYPE_STRING) {
 				const char *haystack;
 
 				haystack = hal_device_property_get_string (d, prop_to_check);
-				if (value != NULL && haystack != NULL &&  (strstr(haystack, value) != NULL))
+				if (haystack != NULL &&  (strstr(haystack, value) != NULL))
 					contains = TRUE;
-			}
-		} else if (hal_device_property_get_type (d, prop_to_check) == HAL_PROPERTY_TYPE_STRLIST && value != NULL) {
-			HalDeviceStrListIter iter;
-			for (hal_device_property_strlist_iter_init (d, prop_to_check, &iter);
-			     hal_device_property_strlist_iter_is_valid (&iter);
-			     hal_device_property_strlist_iter_next (&iter)) {
-				const char *str = hal_device_property_strlist_iter_get_value (&iter);
-				if (strcmp (str, value) == 0) {
-					contains = TRUE;
-					break;
+			} else if (hal_device_property_get_type (d, prop_to_check) == HAL_PROPERTY_TYPE_STRLIST) {
+				HalDeviceStrListIter iter;
+				for (hal_device_property_strlist_iter_init (d, prop_to_check, &iter);
+				     hal_device_property_strlist_iter_is_valid (&iter);
+				     hal_device_property_strlist_iter_next (&iter)) {
+					const char *str = hal_device_property_strlist_iter_get_value (&iter);
+					if (strcmp (str, value) == 0) {
+						contains = TRUE;
+						break;
+					}
 				}
+			} else {
+				return FALSE;
 			}
-		} else {
-			return FALSE;
 		}
 	
 		if (rule->type_match == MATCH_CONTAINS) {	
diff --git a/hald/hald.c b/hald/hald.c
index 1a13a31..9135440 100644
--- a/hald/hald.c
+++ b/hald/hald.c
@@ -203,9 +203,6 @@ hald_get_gdl (void)
 				  "device_capability_added",
 				  G_CALLBACK (gdl_capability_added), NULL);
 		g_signal_connect (global_device_list,
-				  "device_property_changed",
-				  G_CALLBACK (gdl_property_changed), NULL);
-		g_signal_connect (global_device_list,
 				  "device_lock_acquired",
 				  G_CALLBACK (gdl_lock_acquired), NULL);
 		g_signal_connect (global_device_list,
diff --git a/hald/hald_dbus.c b/hald/hald_dbus.c
index 90dc9f7..5078c43 100644
--- a/hald/hald_dbus.c
+++ b/hald/hald_dbus.c
@@ -2161,6 +2161,7 @@ device_is_caller_locked_out (DBusConnection *connection, DBusMessage *message, d
         /* only allow HAL helpers / privileged users to ask this question */
         if (!local_interface && !access_check_message_caller_is_root_or_hal (ci_tracker, message)) {
                 raise_permission_denied (connection, message, "IsCallerLockedOut: not privileged");
+                return DBUS_HANDLER_RESULT_HANDLED;
         }
 
 	dbus_error_init (&error);
diff --git a/hald/mmap_cache.c b/hald/mmap_cache.c
index 1711f3f..1170bd8 100644
--- a/hald/mmap_cache.c
+++ b/hald/mmap_cache.c
@@ -137,10 +137,10 @@ regen_cache_cb (HalDevice *d,
 	HAL_INFO (("In regen_cache_cb exit_type=%d, return_code=%d", exit_type, return_code));
 
 	/* see create_cache.c - rc==0 means success - rc==2 means "success, but some fdi files skipped" */
-	if (exit_type != HALD_RUN_SUCCESS || return_code != 0 || return_code != 2) {
-		regen_cache_success = FALSE;
-	} else {
+	if (exit_type == HALD_RUN_SUCCESS && ( return_code == 0 || return_code == 2)) {
 		regen_cache_success = TRUE;
+	} else {
+		regen_cache_success = FALSE;
 	}
 
 	regen_cache_done = TRUE;
diff --git a/tools/hal-luks-setup b/tools/hal-luks-setup
index 154bde6..4e91d55 100755
--- a/tools/hal-luks-setup
+++ b/tools/hal-luks-setup
@@ -22,17 +22,17 @@ fi
 # Respect the same locks as Mount()/Unmount() etc.
 if [ -n "$HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME" ] ; then
     hal-is-caller-locked-out --udi $HAL_PROP_INFO_UDI \
-        --interface org.freedesktop.Hal.Volume \
-        --caller $HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME
+        --interface org.freedesktop.Hal.Device.Volume \
+        --caller "$HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME"
     RET=$?
-    if [ "$RET" != "1" ] ; then
+    if [ "$RET" != "0" ] ; then
         locked_out
     fi
-    hal-is-caller-locked-out --udi $HAL_PROP_STORAGE_ORIGINATING_DEVICE \
-        --interface org.freedesktop.Hal.Storage \
-        --caller $HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME
+    hal-is-caller-locked-out --udi $HAL_PROP_BLOCK_STORAGE_DEVICE \
+        --interface org.freedesktop.Hal.Device.Storage \
+        --caller "$HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME"
     RET=$?
-    if [ "$RET" != "1" ] ; then
+    if [ "$RET" != "0" ] ; then
         locked_out
     fi
 fi
diff --git a/tools/hal-luks-teardown b/tools/hal-luks-teardown
index 387cdfa..1c987d0 100755
--- a/tools/hal-luks-teardown
+++ b/tools/hal-luks-teardown
@@ -23,17 +23,17 @@ fi
 # Respect the same locks as Mount()/Unmount() etc.
 if [ -n "$HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME" ] ; then
     hal-is-caller-locked-out --udi $HAL_PROP_INFO_UDI \
-        --interface org.freedesktop.Hal.Volume \
-        --caller $HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME
+        --interface org.freedesktop.Hal.Device.Volume \
+        --caller "$HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME"
     RET=$?
-    if [ "$RET" != "1" ] ; then
+    if [ "$RET" != "0" ] ; then
         locked_out
     fi
-    hal-is-caller-locked-out --udi $HAL_PROP_STORAGE_ORIGINATING_DEVICE \
-        --interface org.freedesktop.Hal.Storage \
-        --caller $HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME
+    hal-is-caller-locked-out --udi $HAL_PROP_BLOCK_STORAGE_DEVICE \
+        --interface org.freedesktop.Hal.Device.Storage \
+        --caller "$HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME"
     RET=$?
-    if [ "$RET" != "1" ] ; then
+    if [ "$RET" != "0" ] ; then
         locked_out
     fi
 fi


Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- hal.spec	3 Apr 2007 20:04:46 -0000	1.126
+++ hal.spec	12 Apr 2007 20:17:38 -0000	1.127
@@ -26,13 +26,13 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://people.freedesktop.org/~david/dist/%{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
 Source2: hal-device-manager.desktop
 Source3: http://people.freedesktop.org/~david/dist/hal-info-%{hal_info_version}.tar.gz
-Patch0: hal-0.5.9-fix-luks-locking.patch
+Patch0: hal-0.5.9-fixes.patch
 
 License: AFL/GPL
 Group: System Environment/Libraries
@@ -128,7 +128,7 @@
 
 %prep
 %setup -q -a 3
-%patch0 -p 1 -b .luks-locking
+%patch0 -p 1 -b .fixes
 
 %build
 %configure --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version} --with-os-type=redhat --enable-console-kit --enable-acl-management --enable-umount-helper --enable-acpi-ibm --enable-acpi-toshiba --with-eject=/usr/sbin/eject
@@ -268,6 +268,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Thu Apr 12 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-3
+- Add patches from 0.5.9 stable branch
+
 * Tue Apr 03 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-2
 - Fix a bug with how LUKS interacts with locking
 - Obsolete older HAL packages to provide an upgrade path for multilib


--- hal-0.5.9-fix-luks-locking.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 12 20:20:41 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 16:20:41 -0400
Subject: rpms/libdhcp/devel libdhcp.spec,1.50,1.51
Message-ID: <200704122020.l3CKKfxG015150@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/libdhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15134

Modified Files:
	libdhcp.spec 
Log Message:
* Thu Apr 12 2007 David Cantrell <dcantrell at redhat.com> - 1.24-3
- Put libdhcp.a in the libdhcp-devel-static package



Index: libdhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/libdhcp.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- libdhcp.spec	11 Apr 2007 21:18:52 -0000	1.50
+++ libdhcp.spec	12 Apr 2007 20:20:34 -0000	1.51
@@ -1,15 +1,17 @@
-Summary:    A library for network interface configuration with DHCP
-Name:       libdhcp
-Version:    1.24
-Release:    2%{?dist}
-License:    GPL
-Group:      Development/Libraries
-URL:        http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.bz2
-Source0:    %{name}-%{version}.tar.bz2
-Patch0:     %{name}-1.24-option-list.patch
+Summary: A library for network interface configuration with DHCP
+Name:    libdhcp
+Version: 1.24
+Release: 3%{?dist}
+License: GPL
+Group:   Development/Libraries
+URL:     http://people.redhat.com/dcantrel/%{name}/
+
+Source:  http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.bz2
+Patch0:  %{name}-1.24-option-list.patch
+
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: dhcp-devel, libdhcp4client-devel >= 12:3.0.4-18
-BuildRequires: libdhcp6client-devel >= 0.10-38 , libnl-devel >= 1.0-0.10.pre5.4
+BuildRequires: libdhcp6client-devel >= 0.10-38, libnl-devel >= 1.0-0.10.pre5.4
 BuildRequires: pkgconfig
 
 %description
@@ -22,7 +24,7 @@
 network parameter autoconfiguration with DHCP.
 
 %package devel
-Summary:	 C header files for development with libdhcp.
+Summary:  C header files for development with libdhcp
 Group:    Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: libdhcp4client-devel, libdhcp6client-devel, libnl-devel
@@ -30,6 +32,14 @@
 %description devel
 C header files for development with libdhcp.
 
+%package devel-static
+Summary:  Static archive of libdhcp
+Group:    Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}, libdhcp4client-devel-static
+
+%description devel-static
+The libdhcp-devel-static package contains the static archive for libdhcp.
+
 %prep
 %setup -q
 %patch0 -p1 -b .optionlist
@@ -56,11 +66,17 @@
 %defattr(-,root,root,-)
 %doc examples/
 %{_libdir}/libdhcp.so
-%{_libdir}/libdhcp.a
 %{_includedir}/libdhcp
 %{_libdir}/pkgconfig/libdhcp.pc
 
+%files devel-static
+%defattr(-,root,root,-)
+%{_libdir}/libdhcp.a
+
 %changelog
+* Thu Apr 12 2007 David Cantrell <dcantrell at redhat.com> - 1.24-3
+- Put libdhcp.a in the libdhcp-devel-static package
+
 * Wed Apr 11 2007 David Cantrell <dcantrell at redhat.com> - 1.24-2
 - Request and handle static-routes option for IPv4 requests (#149736)
 



From fedora-cvs-commits at redhat.com  Thu Apr 12 20:32:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 16:32:43 -0400
Subject: rpms/thunderbird/devel firefox-2.0-link-layout.patch, NONE,
	1.1 firefox-2.0-pango-printing.patch, NONE,
	1.1 thunderbird-2.0-default-applications.patch, NONE,
	1.1 .cvsignore, 1.13, 1.14 sources, 1.20,
	1.21 thunderbird-mozconfig, 1.6, 1.7 thunderbird.sh.in, 1.6,
	1.7 thunderbird.spec, 1.94,
	1.95 firefox-1.5-pango-printing.patch, 1.4,
	NONE thunderbird-0.8-default-applications.patch, 1.2,
	NONE thunderbird-0.8-software-update.patch, 1.2, NONE
Message-ID: <200704122032.l3CKWhKj029705@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	.cvsignore sources thunderbird-mozconfig thunderbird.sh.in 
	thunderbird.spec 
Added Files:
	firefox-2.0-link-layout.patch firefox-2.0-pango-printing.patch 
	thunderbird-2.0-default-applications.patch 
Removed Files:
	firefox-1.5-pango-printing.patch 
	thunderbird-0.8-default-applications.patch 
	thunderbird-0.8-software-update.patch 
Log Message:
* Thu Apr 12 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.0-0.4.rc1
- Rebuild into Fedora

* Wed Apr 11 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.0-0.3.rc1
- Update langpacks

* Thu Apr  5 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.0-0.2.rc1
- Build option tweaks
- Bring the install section to parity with Firefox's

* Thu Apr  5 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.0-0.1.rc1
- Update to 2.0.0.0 RC1



firefox-2.0-link-layout.patch:
 Makefile.in |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE firefox-2.0-link-layout.patch ---
Index: mozilla/layout/build/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/layout/build/Makefile.in,v
retrieving revision 1.127.8.7
diff -d -u -p -r1.127.8.7 Makefile.in
--- mozilla/layout/build/Makefile.in	17 Jul 2006 19:05:13 -0000	1.127.8.7
+++ mozilla/layout/build/Makefile.in	10 Oct 2006 04:29:16 -0000
@@ -240,6 +240,11 @@ EXTRA_DSO_LDOPTS += \
 	$(NULL)
 endif
 
+# Add explicit X11 dependency when building against X11 toolkits
+ifneq (,$(filter gtk gtk2 qt xlib,$(MOZ_WIDGET_TOOLKIT)))
+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) -lXrender
+endif
+
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	+= -I$(srcdir)/../base \

firefox-2.0-pango-printing.patch:
 config/system-headers               |    3 
 gfx/src/freetype/nsFreeType.cpp     |   18 
 gfx/src/freetype/nsFreeType.h       |    7 
 gfx/src/ps/Makefile.in              |   11 
 gfx/src/ps/mozilla-ps-decoder.cpp   |  376 ++++++
 gfx/src/ps/mozilla-ps-decoder.h     |   72 +
 gfx/src/ps/nsDeviceContextPS.cpp    |   56 
 gfx/src/ps/nsFontMetricsPS.cpp      |  298 ++++-
 gfx/src/ps/nsFontMetricsPS.h        |   68 +
 gfx/src/ps/nsFontMetricsPSPango.cpp | 2107 ++++++++++++++++++++++++++++++++++++
 gfx/src/ps/nsFontMetricsPSPango.h   |  305 +++++
 gfx/src/ps/nsPostScriptObj.cpp      |   91 +
 gfx/src/ps/nsPostScriptObj.h        |   32 
 gfx/src/ps/nsRenderingContextPS.cpp |  206 ---
 gfx/src/ps/nsRenderingContextPS.h   |   11 
 gfx/src/ps/nsType1.cpp              |  261 +++-
 gfx/src/ps/nsType1.h                |    3 
 17 files changed, 3609 insertions(+), 316 deletions(-)

--- NEW FILE firefox-2.0-pango-printing.patch ---
Patch for Firefox 1.5.0.7 to add support for printing via Pango.
This also implements printing MathML via Pango, and prints bitmap
fonts too.

Authors:
	Behdad Esfahbod
	Chris Blizzard
	Akira TAGOH

Index: gfx/src/freetype/nsFreeType.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v
retrieving revision 1.28
diff -u -p -d -r1.28 nsFreeType.cpp
--- gfx/src/freetype/nsFreeType.cpp	13 Jul 2005 18:21:10 -0000	1.28
+++ gfx/src/freetype/nsFreeType.cpp	23 Oct 2006 17:37:09 -0000
@@ -123,6 +123,8 @@ FtFuncList nsFreeType2::FtFuncs [] = {
 // #endif
   {"FT_Get_First_Char",       NS_FT2_OFFSET(nsFT_Get_First_Char),       PR_FALSE},
   {"FT_Get_Next_Char",        NS_FT2_OFFSET(nsFT_Get_Next_Char),        PR_FALSE},
+  {"FT_Has_PS_Glyph_Names",   NS_FT2_OFFSET(nsFT_Has_PS_Glyph_Names),   PR_FALSE},
+  {"FT_Get_Glyph_Name",       NS_FT2_OFFSET(nsFT_Get_Glyph_Name),       PR_TRUE},
   {nsnull,                    0, 0}
 };
 
@@ -388,6 +390,22 @@ nsFreeType2::GetNextChar(FT_Face face, F
 } 
 
 NS_IMETHODIMP
+nsFreeType2::HasPSGlyphNames(FT_Face face, FT_Int *result)
+{
+  // call the FreeType2 function via the function pointer
+  *result = nsFT_Has_PS_Glyph_Names(face);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFreeType2::GetGlyphName(FT_Face face, FT_UInt glyph_index, FT_Pointer buffer, FT_UInt buffer_max)
+{
+  // call the FreeType2 function via the function pointer
+  FT_Error error = nsFT_Get_Glyph_Name(face, glyph_index, buffer, buffer_max);
+  return error ? NS_ERROR_FAILURE : NS_OK;
+}
+
+NS_IMETHODIMP
 nsFreeType2::SupportsExtFunc(PRBool *res)
 { 
   *res = gHasExtFunc;
Index: gfx/src/freetype/nsFreeType.h
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v
retrieving revision 1.18
diff -u -p -d -r1.18 nsFreeType.h
--- gfx/src/freetype/nsFreeType.h	1 May 2005 17:36:19 -0000	1.18
+++ gfx/src/freetype/nsFreeType.h	23 Oct 2006 17:37:09 -0000
@@ -52,6 +52,7 @@
 #include FT_CACHE_H
 #include FT_CACHE_IMAGE_H
 #include FT_TRUETYPE_TABLES_H
+#include FT_TYPE1_TABLES_H
 #include "nsIFreeType2.h"
 
 typedef struct FT_FaceRec_*  FT_Face;
@@ -138,6 +139,8 @@ typedef FT_Error (*FT_Glyph_To_Bitmap_t)
 
 typedef FT_ULong (*FT_Get_First_Char_t)(FT_Face, FT_UInt*);
 typedef FT_ULong (*FT_Get_Next_Char_t)(FT_Face, FT_ULong, FT_UInt*);
+typedef FT_Int   (*FT_Has_PS_Glyph_Names_t)(FT_Face);
+typedef FT_Error (*FT_Get_Glyph_Name_t)(FT_Face, FT_UInt, FT_Pointer, FT_UInt);
 
 class nsFreeTypeFace;
 
@@ -193,11 +196,13 @@ protected:
 // #endif
   FT_Get_First_Char_t       nsFT_Get_First_Char;
   FT_Get_Next_Char_t        nsFT_Get_Next_Char;
+  FT_Has_PS_Glyph_Names_t   nsFT_Has_PS_Glyph_Names;
+  FT_Get_Glyph_Name_t       nsFT_Get_Glyph_Name;
 
   // this array needs to be big enough to hold all the function pointers
   // plus one extra for the null at the end
 // #ifdef MOZ_SVG
-  static FtFuncList FtFuncs[24];
+  static FtFuncList FtFuncs[28];
 // #else
 //  static FtFuncList FtFuncs[20];
 // #endif
Index: gfx/src/ps/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/ps/Makefile.in,v
retrieving revision 1.57.8.1
diff -d -u -p -r1.57.8.1 Makefile.in
--- gfx/src/ps/Makefile.in	17 Jun 2006 15:16:14 -0000	1.57.8.1
+++ gfx/src/ps/Makefile.in	24 Oct 2006 18:36:45 -0000
@@ -98,6 +98,15 @@ EXTRA_DSO_LDOPTS = \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(NULL)
 
+ifdef MOZ_ENABLE_PANGO
+CPPSRCS                += \
+               nsFontMetricsPSPango.cpp \
+               mozilla-ps-decoder.cpp
+EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS)
+CXXFLAGS       += $(MOZ_PANGO_CFLAGS)
+CFLAGS         += $(MOZ_PANGO_CFLAGS)
+endif
+
 ifdef MOZ_ENABLE_XFT
 EXTRA_DSO_LDOPTS += \
 		$(MOZ_XFT_LIBS) \
@@ -105,7 +114,7 @@ EXTRA_DSO_LDOPTS += \
 		$(NULL)
 endif
 
-ifneq (,$(MOZ_ENABLE_FREETYPE2)$(MOZ_ENABLE_XFT))
+ifneq (,$(MOZ_ENABLE_FREETYPE2)$(MOZ_ENABLE_XFT)$(MOZ_ENABLE_PANGO))
 CPPSRCS		+= \
 		nsType1.cpp \
 		$(NULL)
Index: gfx/src/ps/mozilla-ps-decoder.cpp
===================================================================
RCS file: gfx/src/ps/mozilla-ps-decoder.cpp
diff -N gfx/src/ps/mozilla-ps-decoder.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gfx/src/ps/mozilla-ps-decoder.cpp	23 Oct 2006 17:37:10 -0000
@@ -0,0 +1,376 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Christopher Blizzard
+ * <blizzard at mozilla.org>.  Portions created by the Initial Developer
+ * are Copyright (C) 2004 the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#define PANGO_ENABLE_BACKEND
+#define PANGO_ENABLE_ENGINE
+
+#include "mozilla-ps-decoder.h"
+#include <pango/pangofc-fontmap.h>
+#include <pango/pangofc-font.h>
+
+#include "nsString.h"
+#include "nsIPersistentProperties2.h"
+#include "nsNetUtil.h"
+#include "nsReadableUtils.h"
+#include "nsICharsetConverterManager.h"
+#include "nsICharRepresentable.h"
+#include "nsCompressedCharMap.h"
+
+#undef DEBUG_CUSTOM_ENCODER
+
+G_DEFINE_TYPE (MozillaPSDecoder, mozilla_ps_decoder, PANGO_TYPE_FC_DECODER)
+
+MozillaPSDecoder *mozilla_ps_decoder_new      (void);
+
+static FcCharSet  *mozilla_ps_decoder_get_charset (PangoFcDecoder *decoder,
+                                                PangoFcFont    *fcfont);
+static PangoGlyph  mozilla_ps_decoder_get_glyph   (PangoFcDecoder *decoder,
+                                                PangoFcFont    *fcfont,
+                                                guint32         wc);
+
+static PangoFcDecoder *mozilla_find_ps_decoder    (FcPattern *pattern,
+                                                gpointer   user_data);
+
+typedef struct _MozillaPSDecoderPrivate MozillaPSDecoderPrivate;
+
+#define MOZILLA_PS_DECODER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), MOZILLA_TYPE_DECODER, MozillaPSDecoderPrivate))
+
+struct _MozillaPSDecoderPrivate {
[...4195 lines suppressed...]
+
+  PRUint32 len = aLen;
+  PRUint32 i;
+
   if (len < 10) { 
     // Add a small set of characters to the subset of the user
     // defined font to produce to make sure the font ends up
@@ -584,25 +682,47 @@ outputType1SubFont(nsIFreeType2 *aFt2, F
     // XXX : need to check if this is true of type 1 fonts as well.
     // I suspect it's only the case of CID-keyed fonts (type 9) we used to
     // generate. 
-    charIDstr.AppendLiteral("1234567890"); 
+    for (i = 1; i <= 10; i++) {
+      glyphs.AppendValue(i);
+    }
     len += 10;
   }
   
-  const PRUnichar *charIDs = charIDstr.get();
-
-  PRUint32 i;
+  FT_Int has_glyph_name;
+#if defined (MOZ_ENABLE_XFT) || defined (MOZ_ENABLE_PANGO)
+  has_glyph_name = FT_Has_PS_Glyph_Names(aFace);
+#else
+  has_glyph_name = aFt2->hasPSGlyphNames(aFace);
+#endif
 
   // construct an Encoding vector : the 0th element
   // is /.notdef
-  fputs("/Encoding [\n/.notdef\n", aFile); 
-  for (i = 0; i < len; ++i) {
-      fprintf(aFile, "/uni%04X", charIDs[i]); 
-      if (i % 8 == 7) fputc('\n', aFile);
+  fputs("/Encoding [\n/.notdef", aFile); 
+  for (i = aOffset; i < aOffset + aLen; ++i) {
+      nsCString name;
+      char buffer[256];
+
+      if (glyphs.ValueAt(i) == 0) {
+        name = "/.notdef";
+      } else if (!has_glyph_name ||
+#if defined (MOZ_ENABLE_XFT) || defined (MOZ_ENABLE_PANGO)
+                 FT_Get_Glyph_Name(aFace, glyphs.ValueAt(i), buffer, 255) != FT_Err_Ok
+#else
+                 NS_FAILED(aFt2->getGlyphName(aFace, glyphs.ValueAt(i), buffer, 255))
+#endif
+      ) {
+        name = nsPrintfCString(256, "/idx%04X", glyphs.ValueAt(i));
+      } else {
+        name = nsPrintfCString(256, "/%s", buffer);
+      }
+      glyphnames.AppendCString(name);
+      fprintf(aFile, name.get());
+      if ((i-aOffset) % 8 == 6) fputc('\n', aFile);
   }
 
-  for (i = len; i < 255; ++i) {
+  for (i = PR_MAX (0, 255 - int(aLen)); i; --i) {
       fputs("/.notdef", aFile);
-      if (i % 8 == 7) fputc('\n', aFile);
+      if (i % 8 == 1) fputc('\n', aFile);
   }
   fputs("] def\n", aFile); 
 
@@ -630,23 +750,21 @@ outputType1SubFont(nsIFreeType2 *aFt2, F
   // get the maximum charstring length without actually filling up the buffer
   PRInt32 charStringLen;
   PRInt32 maxCharStringLen =
-#ifdef MOZ_ENABLE_XFT
+#if defined(MOZ_ENABLE_XFT) || defined(MOZ_ENABLE_PANGO)
     FT2GlyphToType1CharString(aFace, 0, aWmode, aLenIV, nsnull);
 #else
     FT2GlyphToType1CharString(aFt2, aFace, 0, aWmode, aLenIV, nsnull);
 #endif
 
-  PRUint32 glyphID;
-
-  for (i = 0; i < len; i++) {
-#ifdef MOZ_ENABLE_XFT
-    glyphID = FT_Get_Char_Index(aFace, charIDs[i]);
+  for (i = aOffset; i < aOffset + aLen; i++) {
+#if defined(MOZ_ENABLE_XFT) || defined(MOZ_ENABLE_PANGO)
     charStringLen =
-      FT2GlyphToType1CharString(aFace, glyphID, aWmode, aLenIV, nsnull);
+      FT2GlyphToType1CharString(aFace, glyphs.ValueAt(i), aWmode, aLenIV,
+                                nsnull);
 #else
-    aFt2->GetCharIndex(aFace, charIDs[i], &glyphID);
     charStringLen =
-      FT2GlyphToType1CharString(aFt2, aFace, glyphID, aWmode, aLenIV, nsnull);
+      FT2GlyphToType1CharString(aFt2, aFace, glyphs.ValueAt(i), aWmode, aLenIV,
+                                nsnull);
 #endif
 
     if (charStringLen > maxCharStringLen)
@@ -666,7 +784,7 @@ outputType1SubFont(nsIFreeType2 *aFt2, F
                                    len + 1).get()); 
 
   // output the notdef glyph
-#ifdef MOZ_ENABLE_XFT
+#if defined(MOZ_ENABLE_XFT) || defined(MOZ_ENABLE_PANGO)
   charStringLen = FT2GlyphToType1CharString(aFace, 0, aWmode, aLenIV,
                                             charString.get());
 #else
@@ -676,22 +794,20 @@ outputType1SubFont(nsIFreeType2 *aFt2, F
 
   // enclose charString with  "/.notdef RD .....  ND" 
   charStringOut(aFile, &pos, &key, NS_REINTERPRET_CAST(const char*, charString.get()),
-                charStringLen, 0); 
+                charStringLen, "/.notdef");
 
 
   // output the charstrings for each glyph in this sub font
-  for (i = 0; i < len; i++) {
-#ifdef MOZ_ENABLE_XFT
-    glyphID = FT_Get_Char_Index(aFace, charIDs[i]);
-    charStringLen = FT2GlyphToType1CharString(aFace, glyphID, aWmode,
+  for (i = aOffset; i < aOffset + aLen; i++) {
+#if defined(MOZ_ENABLE_XFT) || defined(MOZ_ENABLE_PANGO)
+    charStringLen = FT2GlyphToType1CharString(aFace, glyphs.ValueAt(i), aWmode,
                                               aLenIV, charString.get());
 #else
-    aFt2->GetCharIndex(aFace, charIDs[i], &glyphID);
-    charStringLen = FT2GlyphToType1CharString(aFt2, aFace, glyphID, aWmode,
-                                              aLenIV, charString.get());
+    charStringLen = FT2GlyphToType1CharString(aFt2, aFace, glyphs.ValueAt(i),
+                                              aWmode, aLenIV, charString.get());
 #endif
     charStringOut(aFile, &pos, &key, NS_REINTERPRET_CAST(const char*, charString.get()),
-                  charStringLen, charIDs[i]);
+                  charStringLen, glyphnames.CStringAt(i - aOffset)->get());
   }
 
   // wrap up the encrypted part of the font definition
@@ -753,15 +869,12 @@ void encryptAndHexOut(FILE *aFile, PRUin
 
 /* static */ 
 void charStringOut(FILE* aFile,  PRUint32* aPos, PRUint16* aKey, 
-                   const char *aStr, PRUint32 aLen, PRUnichar aId)
+                   const char *aStr, PRUint32 aLen, const char *aGlyphName)
 {
     // use a local buffer instead of nsPrintfCString to avoid alloc.
     char buf[30];
     int oLen;
-    if (aId == 0)
-      oLen = PR_snprintf(buf, 30, "/.notdef %d RD ", aLen); 
-    else 
-      oLen = PR_snprintf(buf, 30, "/uni%04X %d RD ", aId, aLen); 
+    oLen = PR_snprintf(buf, 30, "%s %d RD ", aGlyphName, aLen);
 
     if (oLen >= 30) {
       NS_WARNING("buffer size exceeded. charstring will be truncated");
Index: gfx/src/ps/nsType1.h
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/ps/nsType1.h,v
retrieving revision 1.5
diff -u -p -d -r1.5 nsType1.h
--- gfx/src/ps/nsType1.h	4 Mar 2005 07:39:27 -0000	1.5
+++ gfx/src/ps/nsType1.h	23 Oct 2006 17:37:39 -0000
@@ -122,8 +122,9 @@ FT_Error FT2GlyphToType1CharString(nsIFr
 
 class nsString;
 class nsCString;
+class nsValueArray;
 
-PRBool FT2SubsetToType1FontSet(FT_Face aFace, const nsString& aSubset,
+PRBool FT2SubsetToType1FontSet(FT_Face aFace, nsValueArray *aGlyphSubset,
                                int aWmode,  FILE *aFile);
 nsresult FT2ToType1FontName(FT_Face aFace, int aWmode,
                             nsCString& aFontName);
Index: config/system-headers
===================================================================
--- config/system-headers	2006-10-26 12:21:39.000000000 -0400
+++ config/system-headers	2006-10-26 12:23:29.000000000 -0400
@@ -199,6 +199,7 @@
 freetype/ftoutln.h
 freetype/ttnameid.h
 freetype/tttables.h
+freetype/t1tables.h
 fribidi/fribidi.h
 FSp_fopen.h
 fstream.h
@@ -208,6 +209,7 @@
 gdk/gdkevents.h
 gdk/gdk.h
 gdk/gdkkeysyms.h
+gdk/gdkpango.h
 gdk/gdkprivate.h
 gdk/gdkregion.h
 gdk/gdkwindow.h
@@ -501,6 +503,7 @@
 pango/pangofc-fontmap.h
 pango/pango-fontmap.h
 pango/pango.h
+pango/pangoft2.h
 pango/pangoxft.h
 pango/pangox.h
 pango-types.h


thunderbird-2.0-default-applications.patch:
 nsMailGNOMEIntegration.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE thunderbird-2.0-default-applications.patch ---
Index: mozilla/mail/components/shell/nsMailGNOMEIntegration.cpp
===================================================================
RCS file: /cvsroot/mozilla/mail/components/shell/nsMailGNOMEIntegration.cpp,v
retrieving revision 1.8.2.1
diff -d -u -p -r1.8.2.1 nsMailGNOMEIntegration.cpp
--- mozilla/mail/components/shell/nsMailGNOMEIntegration.cpp	23 Oct 2006 03:32:47 -0000	1.8.2.1
+++ mozilla/mail/components/shell/nsMailGNOMEIntegration.cpp	11 Apr 2007 18:50:02 -0000
@@ -69,7 +69,7 @@ static const char* const sFeedProtocols[
   "feed"
 };
 
-nsMailGNOMEIntegration::nsMailGNOMEIntegration(): mCheckedThisSession(PR_FALSE)
+nsMailGNOMEIntegration::nsMailGNOMEIntegration(): mCheckedThisSession(PR_TRUE)
 {}
 
 nsresult


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	3 Aug 2006 18:53:22 -0000	1.13
+++ .cvsignore	12 Apr 2007 20:32:40 -0000	1.14
@@ -1,2 +1,2 @@
-thunderbird-1.5.0.5-source.tar.bz2
-thunderbird-langpacks-1.5.0.5-20060726.tar.bz2
+thunderbird-2.0.0.0rc1-source.tar.bz2
+thunderbird-langpacks-2.0.0.0-20070411.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	2 Mar 2007 14:16:26 -0000	1.20
+++ sources	12 Apr 2007 20:32:40 -0000	1.21
@@ -1,2 +1,2 @@
-65087f8a7adb0773ae7198ec21cc2975  thunderbird-1.5.0.10-source.tar.bz2
-0ac9a4a17d12422858c07fe553ee9ac2  thunderbird-langpacks-1.5.0.10-20070301.tar.bz2
+8e672d9f9206e0e1f03790dacb51e1bb  thunderbird-2.0.0.0rc1-source.tar.bz2
+f77c5bbdf6aa126e60d22a14d0db6129  thunderbird-langpacks-2.0.0.0-20070411.tar.bz2


Index: thunderbird-mozconfig
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird-mozconfig,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- thunderbird-mozconfig	16 Dec 2005 07:25:44 -0000	1.6
+++ thunderbird-mozconfig	12 Apr 2007 20:32:40 -0000	1.7
@@ -1,5 +1,7 @@
 . $topsrcdir/mail/config/mozconfig
 
+ac_add_options --prefix="$PREFIX"
+ac_add_options --libdir="$LIBDIR"
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg


Index: thunderbird.sh.in
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.sh.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- thunderbird.sh.in	5 Sep 2006 08:45:49 -0000	1.6
+++ thunderbird.sh.in	12 Apr 2007 20:32:40 -0000	1.7
@@ -14,9 +14,9 @@
 MRE_HOME="$MOZ_LIB_DIR/thunderbird-TBIRD_VERSION"
 export MOZILLA_FIVE_HOME MRE_HOME
 
-MOZ_PROGRAM=$MRE_HOME/thunderbird
+MOZ_PROGRAM=$MRE_HOME/thunderbird-bin
 #MOZ_CLIENT_PROGRAM="$MRE_HOME/mozilla-xremote-client -a thunderbird"
-MOZ_CLIENT_PROGRAM="$MRE_HOME/thunderbird -remote" 
+MOZ_CLIENT_PROGRAM="$MRE_HOME/thunderbird-bin -remote" 
 
 ##
 ## Set MOZ_ENABLE_PANGO is no longer used because Pango is enabled by default


Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- thunderbird.spec	2 Mar 2007 14:14:43 -0000	1.94
+++ thunderbird.spec	12 Apr 2007 20:32:40 -0000	1.95
@@ -7,18 +7,18 @@
 
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
-Version:	1.5.0.10
-Release:	1%{?dist}
+Version:	2.0.0.0
+Release:	0.4.rc1%{?dist}
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPL
 Group:		Applications/Internet
-%if %{official_branding}
+%if ! %{official_branding}
 %define tarball thunderbird-%{version}-source.tar.bz2
 %else
-%define tarball thunderbird-1.5rc1-source.tar.bz2
+%define tarball thunderbird-2.0.0.0rc1-source.tar.bz2
 %endif
 Source0:        %{tarball}
-Source1:        thunderbird-langpacks-%{version}-20070301.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20070411.tar.bz2
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
 Source12:       thunderbird-redhat-default-prefs.js
@@ -29,6 +29,7 @@
 Source100:      find-external-requires
 
 # Build patches
+Patch1:         firefox-2.0-link-layout.patch
 Patch2:         firefox-1.0-prdtoa.patch
 Patch4:         firefox-1.5.0.10-with-system-nss.patch
 Patch5:         thunderbird-1.5-visibility.patch
@@ -38,7 +39,7 @@
 Patch11:        thunderbird-0.7.3-gnome-uriloader.patch
 
 # customization patches
-Patch24:        thunderbird-0.8-default-applications.patch
+Patch24:        thunderbird-2.0-default-applications.patch
 Patch25:        thunderbird-1.1-software-update.patch
 
 # local bugfixes
@@ -49,7 +50,7 @@
 Patch81:        firefox-1.5-nopangoxft.patch
 Patch82:        firefox-1.5-pango-mathml.patch
 Patch83:        firefox-1.5-pango-cursor-position.patch
-Patch84:        firefox-1.5-pango-printing.patch
+Patch84:        firefox-2.0-pango-printing.patch
 Patch85:        firefox-1.5-pango-cursor-position-more.patch
 Patch86:        firefox-1.5-pango-justified-range.patch
 Patch87:        firefox-1.5-pango-underline.patch
@@ -104,24 +105,24 @@
 
 %prep
 %setup -q -n mozilla
-
+%patch1 -p1 -b .link-layout
 %patch2 -p0
-%patch4 -p1
+#%patch4 -p1
 #%patch5 -p1 -b .visibility
 
-%patch6 -p1
+#%patch6 -p1
 %patch10 -p1 -b .psfonts
 %patch11 -p1 -b .gnome-uriloader
-%patch24 -p1
-%patch25 -p0
+%patch24 -p1 -b .default-applications
+#%patch25 -p0 -b .software-update
 %patch40 -p1
 %patch42 -p0
 
 # font system fixes
 %patch81 -p1 -b .nopangoxft
-%patch82 -p1 -b .pango-mathml
+#%patch82 -p1 -b .pango-mathml
 %patch83 -p1 -b .pango-cursor-position
-%patch84 -p1 -b .pango-printing
+%patch84 -p0 -b .pango-printing
 %patch85 -p1 -b .pango-cursor-position-more
 %patch86 -p1 -b .pango-justified-range
 %patch87 -p1 -b .pango-underline
@@ -183,22 +184,14 @@
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 
-cd mail/installer
-%{__make} STRIP=/bin/true
-cd -
+DESTDIR=$RPM_BUILD_ROOT make install
 
 %{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
 
-%{__tar} -C $RPM_BUILD_ROOT%{_libdir}/ -xzf dist/%{name}-*linux*.tar.gz
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name} $RPM_BUILD_ROOT%{mozappdir}
-
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}-*linux*.tar
-
 %{__install} -p -D %{SOURCE22} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
 
 desktop-file-install --vendor mozilla \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
   --add-category Application \
   --add-category Network \
   %{SOURCE20}
@@ -209,8 +202,9 @@
 %{__chmod} 755 $RPM_BUILD_ROOT/%{_bindir}/thunderbird
 
 install -m755 %{SOURCE30} $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
-perl -pi -e 's|LIBDIR|%{_libdir}|g' $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
+%{__sed} -i -e 's|LIBDIR|%{_libdir}|g' $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
 
+# set up our default preferences
 %{__cat} %{SOURCE12} | %{__sed} -e 's,THUNDERBIRD_RPM_VR,%{version}-%{release},g' \
                                 -e 's,COMMAND,%{mozappdir}/open-browser.sh,g' > \
         $RPM_BUILD_ROOT/rh-default-prefs
@@ -218,7 +212,7 @@
 %{__cp} $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/all-redhat.js
 %{__rm} $RPM_BUILD_ROOT/rh-default-prefs
 
-%{__rm} -f $RPM_BUILD_ROOT%{mozappdir}/thunderbird-config
+%{__rm} -f $RPM_BUILD_ROOT%{_bindir}/thunderbird-config
 
 cd $RPM_BUILD_ROOT%{mozappdir}/chrome
 find . -name "*" -type d -maxdepth 1 -exec %{__rm} -rf {} \;
@@ -243,20 +237,31 @@
   unzip $langpack -d $extensiondir
   find $extensiondir -type f | xargs chmod 644
 
-  langtmp=%{_tmpdir}/%{name}/langpack-$language
+  tmpdir=`mktemp -d %{name}.XXXXXXXX`
+  langtmp=$tmpdir/%{name}/langpack-$language
   %{__mkdir_p} $langtmp
   jarfile=$extensiondir/chrome/$language.jar
   unzip $jarfile -d $langtmp
+
   find $langtmp -type f | xargs chmod 644
   %{__rm} -rf $jarfile
   cd $langtmp
   zip -r -D $jarfile locale
   %{__rm} -rf locale
   cd -
+  %{__rm} -rf $tmpdir
 done
 %{__rm} -rf thunderbird-langpacks
 
 
+# Copy over the LICENSE
+install -c -m 644 LICENSE $RPM_BUILD_ROOT%{mozappdir}
+
+# ghost files
+touch $RPM_BUILD_ROOT%{mozappdir}/components/compreg.dat
+touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
+
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -272,11 +277,30 @@
 %attr(755,root,root) %{_bindir}/thunderbird
 %attr(644,root,root) %{_datadir}/applications/mozilla-thunderbird.desktop
 %attr(644,root,root) %{_datadir}/pixmaps/thunderbird.png
+%exclude %{_includedir}/%{name}-%{version}
+%exclude %{_datadir}/idl/%{name}-%{version}
+%exclude %{_libdir}/pkgconfig/*.pc
 %{mozappdir}
 
 #===============================================================================
 
 %changelog
+* Thu Apr 12 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.0-0.3.rc1
+- Rebuild into Fedora
+
+* Wed Apr 11 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.0-0.3.rc1
+- Update langpacks
+
+* Thu Apr  5 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.0-0.2.rc1
+- Build option tweaks
+- Bring the install section to parity with Firefox's
+
+* Thu Apr  5 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.0-0.1.rc1
+- Update to 2.0.0.0 RC1
+
+* Sun Mar 25 2007 Christopher Aillon <caillon at redhat.com> 1.5.0.11-1
+- Update to 1.5.0.11
+
 * Fri Mar 2 2007 Martin Stransky <stransky at redhat.com> 1.5.0.10-1
 - Update to 1.5.0.10
 


--- firefox-1.5-pango-printing.patch DELETED ---


--- thunderbird-0.8-default-applications.patch DELETED ---


--- thunderbird-0.8-software-update.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 12 20:34:56 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 16:34:56 -0400
Subject: rpms/kernel/FC-6/configs config-generic, 1.266,
	1.266.8.1 config-s390-generic, 1.22, 1.22.50.1
Message-ID: <200704122034.l3CKYuA2031332@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-netdev-fc6-9-branch
	config-generic config-s390-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-generic,v
retrieving revision 1.266
retrieving revision 1.266.8.1
diff -u -r1.266 -r1.266.8.1
--- config-generic	16 Mar 2007 21:48:02 -0000	1.266
+++ config-generic	12 Apr 2007 20:34:53 -0000	1.266.8.1
@@ -637,7 +637,9 @@
 CONFIG_TCP_CONG_LP=m
 CONFIG_TCP_CONG_VENO=m
 
+CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_MD5SIG=y
+CONFIG_TCP_MD5SIG_DEBUG=y
 
 #
 # Networking options
@@ -646,6 +648,7 @@
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -703,6 +706,7 @@
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
@@ -725,6 +729,7 @@
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
@@ -782,6 +787,7 @@
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
@@ -848,6 +854,7 @@
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RT=m
@@ -884,6 +891,7 @@
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
@@ -1091,8 +1099,10 @@
 CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_ADAPTEC_STARFIRE_NAPI=y
 CONFIG_B44=m
+CONFIG_B44_PCI=y
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_E100=m
@@ -1117,6 +1127,7 @@
 CONFIG_VIA_RHINE_MMIO=y
 CONFIG_VIA_RHINE_NAPI=y
 CONFIG_VIA_VELOCITY=m
+CONFIG_SC92031=m
 CONFIG_NET_POCKET=y
 CONFIG_ATP=m
 CONFIG_DE600=m
@@ -1153,9 +1164,12 @@
 CONFIG_S2IO_NAPI=y
 CONFIG_MYRI10GE=m
 CONFIG_NETXEN_NIC=m
+CONFIG_PASEMI_MAC=m
+CONFIG_VIOC=m
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y
+CONFIG_CHELSIO_T3=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1183,18 +1197,33 @@
 CONFIG_NET_RADIO=y
 
 #
-# Obsolete Wireless cards support (pre-802.11)
+# Wireless LAN
 #
+CONFIG_WLAN_PRE80211=y
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
+CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+CONFIG_MAC80211_DEBUG=y
+# CONFIG_MAC80211_VERBOSE_DEBUG is not set
+# CONFIG_MAC80211_LOWTX_FRAME_DUMP is not set
+CONFIG_TKIP_DEBUG=y
+CONFIG_MAC80211_DEBUG_COUNTERS=y
+# CONFIG_HOSTAPD_WPA_TESTING is not set
+CONFIG_MAC80211_IBSS_DEBUG=y
+# CONFIG_MAC80211_VERBOSE_PS_DEBUG is not set
+
+CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT_COMPAT=y
+CONFIG_CFG80211_WEXTNL_COMPAT=y
+CONFIG_NL80211=y
+
 #
 # Wireless 802.11b ISA/PCI cards support
 #
@@ -1212,6 +1241,8 @@
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_USB_DEBUG=y
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1221,6 +1252,7 @@
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_PRISM54=m
+CONFIG_PRISM54_USB=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
 
@@ -1242,6 +1274,30 @@
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HOSTAP_CS=m
 
+CONFIG_BCM43XX_MAC80211=m
+CONFIG_BCM43XX_MAC80211_PCI=y
+CONFIG_BCM43XX_MAC80211_PCMCIA=y
+CONFIG_BCM43XX_MAC80211_DEBUG=y
+CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
+CONFIG_RT2X00=y
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2X00_DEBUGFS=m
+CONFIG_RT2X00_DEBUG=y
+CONFIG_ADM8211=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_ZD1211RW_MAC80211=m
+CONFIG_ZD1211RW_MAC80211_DEBUG=y
+CONFIG_RTL818X=y
+CONFIG_RTL8187=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_DEBUG=y
+
 #
 # Token Ring devices
 #
@@ -1848,6 +1904,14 @@
 CONFIG_MAX_RAW_DEVS=8192
 CONFIG_HANGCHECK_TIMER=m
 
+CONFIG_SSB=m
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SILENT=n
+CONFIG_SSB_DEBUG=n
+CONFIG_SSB_SERIAL=n
+CONFIG_SSB_DRIVER_PCICORE=y
+
 #
 # Multimedia devices
 #
@@ -2233,6 +2297,7 @@
 CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_CS=m
+CONFIG_USB_OHCI_HCD_SSB=y
 
 #
 # USB Device Class drivers
@@ -2780,6 +2845,8 @@
 #
 CONFIG_CRC16=m
 CONFIG_CRC32=m
+CONFIG_CRC_ITU_T=m
+CONFIG_EEPROM_93CX6=m
 CONFIG_CRC_CCITT=m
 
 CONFIG_ZLIB_INFLATE=y


Index: config-s390-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-s390-generic,v
retrieving revision 1.22
retrieving revision 1.22.50.1
diff -u -r1.22 -r1.22.50.1
--- config-s390-generic	21 Dec 2006 21:45:14 -0000	1.22
+++ config-s390-generic	12 Apr 2007 20:34:53 -0000	1.22.50.1
@@ -106,6 +106,7 @@
 CONFIG_LCS=m
 CONFIG_CTC=m
 CONFIG_IUCV=m
+CONFIG_AFIUCV=m
 CONFIG_QETH=m
 CONFIG_QETH_IPV6=y
 CONFIG_QETH_VLAN=y



From fedora-cvs-commits at redhat.com  Thu Apr 12 20:35:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 16:35:47 -0400
Subject: rpms/kernel/FC-6 mac80211.patch,NONE,1.1.8.1
Message-ID: <200704122035.l3CKZlSA031900@cvs.devel.redhat.com>

Author: linville

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

Added Files:
      Tag: private-linville-netdev-fc6-9-branch
	mac80211.patch 
Log Message:


mac80211.patch:
 CREDITS                                                 |   37 
 MAINTAINERS                                             |   61 
 drivers/Kconfig                                         |    2 
 drivers/Makefile                                        |    1 
 drivers/misc/Kconfig                                    |    8 
 drivers/misc/Makefile                                   |    1 
 drivers/misc/eeprom_93cx6.c                             |  344 
 drivers/net/Makefile                                    |    2 
 drivers/net/wireless/Kconfig                            |  120 
 drivers/net/wireless/Makefile                           |    3 
 drivers/net/wireless/bcm43xx/Kconfig                    |    3 
 drivers/net/wireless/hostap/Kconfig                     |    3 
 drivers/net/wireless/mac80211/Kconfig                   |    7 
 drivers/net/wireless/mac80211/Makefile                  |    7 
 drivers/net/wireless/mac80211/README                    |    2 
 drivers/net/wireless/mac80211/adm8211/Kconfig           |   25 
 drivers/net/wireless/mac80211/adm8211/Makefile          |    1 
 drivers/net/wireless/mac80211/adm8211/adm8211.c         | 2172 ++
 drivers/net/wireless/mac80211/adm8211/adm8211.h         |  622 
 drivers/net/wireless/mac80211/bcm43xx/Kconfig           |  100 
 drivers/net/wireless/mac80211/bcm43xx/Makefile          |   18 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h         |  875 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c |  433 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h |  110 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c     | 1297 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h     |  361 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c    |  300 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h    |   56 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c      | 1110 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h      |   92 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c    | 3984 ++++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h    |  156 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c  |  163 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h  |   22 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c     | 4262 ++++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h     |  309 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c     |  671 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h     |  170 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c   |   82 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h   |   41 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c   |  232 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h   |    9 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c  |  376 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h  |   28 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c    |  611 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h    |  250 
 drivers/net/wireless/mac80211/iwlwifi/Kconfig           |   52 
 drivers/net/wireless/mac80211/iwlwifi/Makefile          |    2 
 drivers/net/wireless/mac80211/iwlwifi/base.c            |13763 ++++++++++++++++
 drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h         | 1297 +
 drivers/net/wireless/mac80211/iwlwifi/iwlwifi_hw.h      | 1877 ++
 drivers/net/wireless/mac80211/p54/Kconfig               |   10 
 drivers/net/wireless/mac80211/p54/Makefile              |    4 
 drivers/net/wireless/mac80211/p54/net2280.h             |  452 
 drivers/net/wireless/mac80211/p54/prism54.h             |   77 
 drivers/net/wireless/mac80211/p54/prism54common.c       |  821 
 drivers/net/wireless/mac80211/p54/prism54common.h       |  328 
 drivers/net/wireless/mac80211/p54/prism54magic.h        |   77 
 drivers/net/wireless/mac80211/p54/prism54pci.c          |  700 
 drivers/net/wireless/mac80211/p54/prism54pci.h          |  106 
 drivers/net/wireless/mac80211/p54/prism54usb.c          |  946 +
 drivers/net/wireless/mac80211/p54/prism54usb.h          |  133 
 drivers/net/wireless/mac80211/rt2x00/Kconfig            |   86 
 drivers/net/wireless/mac80211/rt2x00/Makefile           |    9 
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.c        | 2595 +++
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.h        |  931 +
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.c        | 2892 +++
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.h        | 1198 +
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.c        | 2727 +++
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.h        |  746 
 drivers/net/wireless/mac80211/rt2x00/rt2x00.h           | 1069 +
 drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c      |  380 
 drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h      |   70 
 drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c        |  231 
 drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h        |   74 
 drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c        |  540 
 drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h        |   39 
 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h        |   82 
 drivers/net/wireless/mac80211/rt2x00/rt61pci.c          | 3362 +++
 drivers/net/wireless/mac80211/rt2x00/rt61pci.h          | 1361 +
 drivers/net/wireless/mac80211/rt2x00/rt73usb.c          | 3024 +++
 drivers/net/wireless/mac80211/rt2x00/rt73usb.h          |  945 +
 drivers/net/wireless/mac80211/rtl818x/Kconfig           |    9 
 drivers/net/wireless/mac80211/rtl818x/Makefile          |    2 
 drivers/net/wireless/mac80211/rtl818x/rtl8187.h         |  126 
 drivers/net/wireless/mac80211/rtl818x/rtl8187_dev.c     |  726 
 drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.c |  747 
 drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.h |   30 
 drivers/net/wireless/mac80211/rtl818x/rtl818x.h         |  180 
 drivers/net/wireless/mac80211/zd1211rw/Kconfig          |   19 
 drivers/net/wireless/mac80211/zd1211rw/Makefile         |   11 
 drivers/net/wireless/mac80211/zd1211rw/zd_chip.c        | 1679 +
 drivers/net/wireless/mac80211/zd1211rw/zd_chip.h        |  910 +
 drivers/net/wireless/mac80211/zd1211rw/zd_def.h         |   57 
 drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h   |   67 
 drivers/net/wireless/mac80211/zd1211rw/zd_mac.c         |  700 
 drivers/net/wireless/mac80211/zd1211rw/zd_mac.h         |  250 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf.c          |  170 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf.h          |   80 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c   |  436 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c  |  491 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c   |  279 
 drivers/net/wireless/mac80211/zd1211rw/zd_usb.c         | 1337 +
 drivers/net/wireless/mac80211/zd1211rw/zd_usb.h         |  241 
 drivers/net/wireless/mac80211/zd1211rw/zd_util.c        |   82 
 drivers/net/wireless/mac80211/zd1211rw/zd_util.h        |   29 
 drivers/net/wireless/zd1211rw/Kconfig                   |    4 
 drivers/ssb/Kconfig                                     |   93 
 drivers/ssb/Makefile                                    |   11 
 drivers/ssb/driver_chipcommon.c                         |  402 
 drivers/ssb/driver_mipscore.c                           |  258 
 drivers/ssb/driver_pcicore.c                            |  556 
 drivers/ssb/main.c                                      | 1050 +
 drivers/ssb/pci.c                                       |  667 
 drivers/ssb/pcihost_wrapper.c                           |  104 
 drivers/ssb/pcmcia.c                                    |  256 
 drivers/ssb/scan.c                                      |  407 
 drivers/ssb/ssb_private.h                               |  151 
 drivers/usb/host/Kconfig                                |   13 
 drivers/usb/host/ohci-hcd.c                             |    6 
 drivers/usb/host/ohci-ssb.c                             |  254 
 include/linux/Kbuild                                    |    2 
 include/linux/crc-itu-t.h                               |   27 
 include/linux/eeprom_93cx6.h                            |   77 
 include/linux/ieee80211.h                               |  403 
 include/linux/netdevice.h                               |    7 
 include/linux/nl80211.h                                 |  302 
 include/linux/ssb/ssb.h                                 |  403 
 include/linux/ssb/ssb_driver_chipcommon.h               |  387 
 include/linux/ssb/ssb_driver_extif.h                    |  163 
 include/linux/ssb/ssb_driver_mips.h                     |   47 
 include/linux/ssb/ssb_driver_pci.h                      |  108 
 include/linux/ssb/ssb_regs.h                            |  294 
 include/net/cfg80211.h                                  |  153 
 include/net/iw_handler.h                                |   13 
 include/net/mac80211.h                                  | 1106 +
 include/net/wireless.h                                  |  159 
 lib/Kconfig                                             |    8 
 lib/Makefile                                            |    1 
 lib/crc-itu-t.c                                         |   64 
 net/Kconfig                                             |   12 
 net/Makefile                                            |    2 
 net/core/Makefile                                       |    1 
 net/core/dev.c                                          |   33 
 net/core/rtnetlink.c                                    |   30 
 net/ieee80211/Kconfig                                   |    3 
 net/mac80211/Kconfig                                    |   81 
 net/mac80211/Makefile                                   |   21 
 net/mac80211/aes_ccm.c                                  |  155 
 net/mac80211/aes_ccm.h                                  |   26 
 net/mac80211/debugfs.c                                  |  436 
 net/mac80211/debugfs.h                                  |   16 
 net/mac80211/debugfs_key.c                              |  253 
 net/mac80211/debugfs_key.h                              |   34 
 net/mac80211/debugfs_netdev.c                           |  440 
 net/mac80211/debugfs_netdev.h                           |   30 
 net/mac80211/debugfs_sta.c                              |  247 
 net/mac80211/debugfs_sta.h                              |   12 
 net/mac80211/hostapd_ioctl.h                            |  347 
 net/mac80211/ieee80211.c                                | 5097 +++++
 net/mac80211/ieee80211_cfg.c                            |   90 
 net/mac80211/ieee80211_cfg.h                            |    9 
 net/mac80211/ieee80211_common.h                         |   98 
 net/mac80211/ieee80211_i.h                              |  848 
 net/mac80211/ieee80211_iface.c                          |  366 
 net/mac80211/ieee80211_ioctl.c                          | 3290 +++
 net/mac80211/ieee80211_key.h                            |  106 
 net/mac80211/ieee80211_led.c                            |   91 
 net/mac80211/ieee80211_led.h                            |   32 
 net/mac80211/ieee80211_rate.c                           |  140 
 net/mac80211/ieee80211_rate.h                           |  144 
 net/mac80211/ieee80211_scan.c                           |  344 
 net/mac80211/ieee80211_sta.c                            | 3210 +++
 net/mac80211/michael.c                                  |  104 
 net/mac80211/michael.h                                  |   20 
 net/mac80211/rc80211_simple.c                           |  432 
 net/mac80211/sta_info.c                                 |  463 
 net/mac80211/sta_info.h                                 |  167 
 net/mac80211/tkip.c                                     |  341 
 net/mac80211/tkip.h                                     |   36 
 net/mac80211/wep.c                                      |  328 
 net/mac80211/wep.h                                      |   40 
 net/mac80211/wme.c                                      |  685 
 net/mac80211/wme.h                                      |   38 
 net/mac80211/wpa.c                                      |  846 
 net/mac80211/wpa.h                                      |   31 
 net/wireless/Kconfig                                    |   46 
 net/wireless/Makefile                                   |   17 
 net/wireless/core.c                                     |  361 
 net/wireless/core.h                                     |   80 
 net/wireless/nl80211.c                                  |  986 +
 net/wireless/nl80211.h                                  |   24 
 net/wireless/sysfs.c                                    |  125 
 net/wireless/sysfs.h                                    |    9 
 net/wireless/wext-common.c                              |  663 
 net/wireless/wext-compat.c                              |  789 
 net/wireless/wext-export.c                              |   29 
 net/wireless/wext-mod.c                                 |   20 
 net/wireless/wext-old.c                                 |  829 
 net/wireless/wext.h                                     |   51 
 200 files changed, 102607 insertions(+), 156 deletions(-)

--- NEW FILE mac80211.patch ---
--- /dev/null	2007-03-09 11:47:32.684268720 -0500
+++ linux-2.6.20.noarch/include/net/wireless.h	2007-04-12 15:18:10.000000000 -0400
@@ -0,0 +1,159 @@
+#ifndef __NET_WIRELESS_H
+#define __NET_WIRELESS_H
+
+/*
+ * 802.11 device management
+ *
+ * Copyright 2007	Johannes Berg <johannes at sipsolutions.net>
+ */
+
+#include <linux/netdevice.h>
+#include <linux/debugfs.h>
+#include <linux/list.h>
+#include <net/cfg80211.h>
+
+/**
+ * struct wiphy - wireless hardware description
+ * @idx: the wiphy index assigned to this item
+ * @class_dev: the class device representing /sys/class/ieee80211/<wiphy-name>
+ */
+struct wiphy {
+	/* assign these fields before you register the wiphy */
+
+	/* permanent MAC address */
+	u8 perm_addr[ETH_ALEN];
+
+	/* If multiple wiphys are registered and you're handed e.g.
+	 * a regular netdev with assigned ieee80211_ptr, you won't
+	 * know whether it points to a wiphy your driver has registered
+	 * or not. Assign this to something global to your driver to
+	 * help determine whether you own this wiphy or not. */
+	void *privid;
+
+	/* fields below are read-only, assigned by cfg80211 */
+
+	/* the item in /sys/class/ieee80211/ points to this,
+	 * you need use set_wiphy_dev() (see below) */
+	struct device dev;
+
+	/* dir in debugfs: ieee80211/<wiphyname> */
+	struct dentry *debugfsdir;
+
+	char priv[0] __attribute__((__aligned__(NETDEV_ALIGN)));
+};
+
+/** struct wireless_dev - wireless per-netdev state
+ *
+ * This structure must be allocated by the driver/stack
+ * that uses the ieee80211_ptr field in struct net_device
+ * (this is intentional so it can be allocated along with
+ * the netdev.)
+ *
+ * @wiphy: pointer to hardware description
+ */
+struct wireless_dev {
+	struct wiphy *wiphy;
+
+	/* private to the generic wireless code */
+	struct list_head list;
+	struct net_device *netdev;
+};
+
+/**
+ * wiphy_priv - return priv from wiphy
+ */
+static inline void *wiphy_priv(struct wiphy *wiphy)
+{
+	BUG_ON(!wiphy);
+	return &wiphy->priv;
+}
+
+/**
+ * set_wiphy_dev - set device pointer for wiphy
+ */
+static inline void set_wiphy_dev(struct wiphy *wiphy, struct device *dev)
+{
+	wiphy->dev.parent = dev;
+}
+
+/**
+ * wiphy_dev - get wiphy dev pointer
+ */
+static inline struct device *wiphy_dev(struct wiphy *wiphy)
+{
+	return wiphy->dev.parent;
+}
+
+/**
+ * wiphy_name - get wiphy name
+ */
+static inline char *wiphy_name(struct wiphy *wiphy)
+{
+	return wiphy->dev.bus_id;
+}
+
+/**
+ * wdev_priv - return wiphy priv from wireless_dev
+ */
+static inline void *wdev_priv(struct wireless_dev *wdev)
+{
+	BUG_ON(!wdev);
+	return wiphy_priv(wdev->wiphy);
+}
+
+/**
+ * wiphy_new - create a new wiphy for use with cfg80211
+ *
+ * create a new wiphy and associate the given operations with it.
+ * @sizeof_priv bytes are allocated for private use.
+ *
+ * the returned pointer must be assigned to each netdev's
+ * ieee80211_ptr for proper operation.
+ */
+struct wiphy *wiphy_new(struct cfg80211_ops *ops, int sizeof_priv);
+
+/**
+ * wiphy_register - register a wiphy with cfg80211
+ *
+ * register the given wiphy
+ *
+ * Returns a non-negative wiphy index or a negative error code.
+ */
+extern int wiphy_register(struct wiphy *wiphy);
+
+/**
+ * wiphy_unregister - deregister a wiphy from cfg80211
+ *
+ * unregister a device with the given priv pointer.
+ * After this call, no more requests can be made with this priv
+ * pointer, but the call may sleep to wait for an outstanding
+ * request that is being handled.
+ */
+extern void wiphy_unregister(struct wiphy *wiphy);
+
+/**
+ * wiphy_free - free wiphy
+ */
+extern void wiphy_free(struct wiphy *wiphy);
+
+
+/*
+ * internal definitions for wireless
+ */
+
+#if defined(CONFIG_CFG80211_WEXT_COMPAT) || defined(CONFIG_WIRELESS_EXT)
+int wext_ioctl(unsigned int cmd, struct ifreq *ifreq, void __user *arg);
+int wireless_proc_init(void);
+#else
+static inline
+int wext_ioctl(unsigned int cmd, struct ifreq *ifreq, void __user *arg)
+{
+	return -EINVAL;
+}
+static inline int wireless_proc_init(void)
+{
+	return 0;
+}
+#endif
+
+#endif /* __NET_WIRELESS_H */
--- /dev/null	2007-03-09 11:47:32.684268720 -0500
+++ linux-2.6.20.noarch/include/net/mac80211.h	2007-04-12 15:18:10.000000000 -0400
@@ -0,0 +1,1106 @@
+/*
+ * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface
+ * Copyright 2002-2005, Devicescape Software, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef MAC80211_H
+#define MAC80211_H
+
+#include <linux/kernel.h>
+#include <linux/if_ether.h>
+#include <linux/skbuff.h>
+#include <linux/wireless.h>
+#include <linux/device.h>
+#include <linux/ieee80211.h>
+#include <net/wireless.h>
+#include <net/cfg80211.h>
+
+/* Note! Only ieee80211_tx_status_irqsafe() and ieee80211_rx_irqsafe() can be
+ * called in hardware interrupt context. The low-level driver must not call any
+ * other functions in hardware interrupt context. If there is a need for such
+ * call, the low-level driver should first ACK the interrupt and perform the
+ * IEEE 802.11 code call after this, e.g., from a scheduled tasklet (in
+ * software interrupt context).
+ */
+
+/*
+ * Frame format used when passing frame between low-level hardware drivers
+ * and IEEE 802.11 driver the same as used in the wireless media, i.e.,
+ * buffers start with IEEE 802.11 header and include the same octets that
+ * are sent over air.
[...103436 lines suppressed...]
+
+		memset(&iwe, 0, sizeof(iwe));
+		iwe.cmd = IWEVCUSTOM;
+		sprintf(buf, "capab=0x%04x", bss->capability);
+		iwe.u.data.length = strlen(buf);
+		current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+						  buf);
+
+		/* dispaly all support rates in readable format */
+		p = current_ev + IW_EV_LCP_LEN;
+		iwe.cmd = SIOCGIWRATE;
+		/* Those two flags are ignored... */
+		iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;
+
+		for (i = 0; i < bss->supp_rates_len; i++) {
+			iwe.u.bitrate.value = ((bss->supp_rates[i] &
+							0x7f) * 500000);
+			p = iwe_stream_add_value(current_ev, p,
+					end_buf, &iwe, IW_EV_PARAM_LEN);
+		}
+		/* Check if we added any rate */
+		if((p - current_ev) > IW_EV_LCP_LEN)
+			current_ev = p;
+
+		kfree(buf);
+		break;
+	} while (0);
+
+	return current_ev;
+}
+
+
+int ieee80211_sta_scan_results(struct net_device *dev, char *buf, size_t len)
+{
+	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+	char *current_ev = buf;
+	char *end_buf = buf + len;
+	struct ieee80211_sta_bss *bss;
+
+	spin_lock_bh(&local->sta_bss_lock);
+	list_for_each_entry(bss, &local->sta_bss_list, list) {
+		if (buf + len - current_ev <= IW_EV_ADDR_LEN) {
+			spin_unlock_bh(&local->sta_bss_lock);
+			return -E2BIG;
+		}
+		current_ev = ieee80211_sta_scan_result(dev, bss, current_ev,
+						       end_buf);
+	}
+	spin_unlock_bh(&local->sta_bss_lock);
+	return current_ev - buf;
+}
+
+
+int ieee80211_sta_set_extra_ie(struct net_device *dev, char *ie, size_t len)
+{
+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+	struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+	kfree(ifsta->extra_ie);
+	if (len == 0) {
+		ifsta->extra_ie = NULL;
+		ifsta->extra_ie_len = 0;
+		return 0;
+	}
+	ifsta->extra_ie = kmalloc(len, GFP_KERNEL);
+	if (!ifsta->extra_ie) {
+		ifsta->extra_ie_len = 0;
+		return -ENOMEM;
+	}
+	memcpy(ifsta->extra_ie, ie, len);
+	ifsta->extra_ie_len = len;
+	return 0;
+}
+
+
+struct sta_info * ieee80211_ibss_add_sta(struct net_device *dev,
+					 struct sk_buff *skb, u8 *bssid,
+					 u8 *addr)
+{
+	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+	struct sta_info *sta;
+	struct ieee80211_sub_if_data *sdata = NULL;
+	struct net_device *sta_dev = NULL;
+
+	/* TODO: Could consider removing the least recently used entry and
+	 * allow new one to be added. */
+	if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) {
+		if (net_ratelimit()) {
+			printk(KERN_DEBUG "%s: No room for a new IBSS STA "
+			       "entry " MAC_FMT "\n", dev->name, MAC_ARG(addr));
+		}
+		return NULL;
+	}
+
+	spin_lock_bh(&local->sub_if_lock);
+	list_for_each_entry(sdata, &local->sub_if_list, list)
+		if (sdata->type == IEEE80211_IF_TYPE_IBSS &&
+		    memcmp(bssid, sdata->u.sta.bssid, ETH_ALEN) == 0) {
+			sta_dev = sdata->dev;
+			break;
+		}
+	spin_unlock_bh(&local->sub_if_lock);
+
+	if (!sta_dev)
+		return NULL;
+
+	printk(KERN_DEBUG "%s: Adding new IBSS station " MAC_FMT " (dev=%s)\n",
+	       dev->name, MAC_ARG(addr), sta_dev->name);
+
+	sta = sta_info_add(local, dev, addr, GFP_ATOMIC);
+	if (!sta)
+		return NULL;
+
+	sta->dev = sta_dev;
+	sta->supp_rates = sdata->u.sta.supp_rates_bits;
+
+	rate_control_rate_init(sta, local);
+
+	return sta; /* caller will call sta_info_put() */
+}
+
+
+int ieee80211_sta_deauthenticate(struct net_device *dev, u16 reason)
+{
+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+	struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+
+	printk(KERN_DEBUG "%s: deauthenticate(reason=%d)\n",
+	       dev->name, reason);
+
+	if (sdata->type != IEEE80211_IF_TYPE_STA &&
+	    sdata->type != IEEE80211_IF_TYPE_IBSS)
+		return -EINVAL;
+
+	ieee80211_send_deauth(dev, ifsta, reason);
+	ieee80211_set_disassoc(dev, ifsta, 1);
+	return 0;
+}
+
+
+int ieee80211_sta_disassociate(struct net_device *dev, u16 reason)
+{
+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+	struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+
+	printk(KERN_DEBUG "%s: disassociate(reason=%d)\n",
+	       dev->name, reason);
+
+	if (sdata->type != IEEE80211_IF_TYPE_STA)
+		return -EINVAL;
+
+	if (!ifsta->associated)
+		return -1;
+
+	ieee80211_send_disassoc(dev, ifsta, reason);
+	ieee80211_set_disassoc(dev, ifsta, 0);
+	return 0;
+}
--- /dev/null	2007-03-09 11:47:32.684268720 -0500
+++ linux-2.6.20.noarch/net/mac80211/ieee80211_cfg.h	2007-04-12 15:18:15.000000000 -0400
@@ -0,0 +1,9 @@
+/*
+ * mac80211 configuration hooks for cfg80211
+ */
+#ifndef __IEEE80211_CFG_H
+#define __IEEE80211_CFG_H
+
+extern struct cfg80211_ops mac80211_config_ops;
+
+#endif /* __IEEE80211_CFG_H */
--- /dev/null	2007-03-09 11:47:32.684268720 -0500
+++ linux-2.6.20.noarch/net/mac80211/debugfs.h	2007-04-12 15:18:15.000000000 -0400
@@ -0,0 +1,16 @@
+#ifndef __MAC80211_DEBUGFS_H
+#define __MAC80211_DEBUGFS_H
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+extern void debugfs_hw_add(struct ieee80211_local *local);
+extern void debugfs_hw_del(struct ieee80211_local *local);
+extern int mac80211_open_file_generic(struct inode *inode, struct file *file);
+#else
+static inline void debugfs_hw_add(struct ieee80211_local *local)
+{
+	return;
+}
+static inline void debugfs_hw_del(struct ieee80211_local *local) {}
+#endif
+
+#endif /* __MAC80211_DEBUGFS_H */
--- linux-2.6.20.noarch/net/ieee80211/Kconfig.orig	2007-04-12 15:15:58.000000000 -0400
+++ linux-2.6.20.noarch/net/ieee80211/Kconfig	2007-04-12 15:18:15.000000000 -0400
@@ -56,7 +56,8 @@ config IEEE80211_CRYPT_CCMP
 
 config IEEE80211_CRYPT_TKIP
 	tristate "IEEE 802.11i TKIP encryption"
-	depends on IEEE80211 && NET_RADIO
+	depends on IEEE80211
+	select WIRELESS_EXT
 	select CRYPTO
 	select CRYPTO_MICHAEL_MIC
 	select CRYPTO_ECB



From fedora-cvs-commits at redhat.com  Thu Apr 12 20:44:51 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 16:44:51 -0400
Subject: rpms/gdm/devel default.desktop,NONE,1.1 gdm.spec,1.244,1.245
Message-ID: <200704122044.l3CKipf7006307@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6173

Modified Files:
	gdm.spec 
Added Files:
	default.desktop 
Log Message:
- add "Default" session back to the sessions menu (bug 234218)



--- NEW FILE default.desktop ---
[Desktop Entry]
Encoding=UTF-8
# The names/descriptions should really be better
Name=Default System Session
Name[af]=Verstekstelselsessie
Name[ar]=???????? ???????????? ????????????????????
Name[az]=??n Qur??ulu Sistem ??clas??
Name[be]=???????????????? ?????????????????? ??????????
Name[bg]=???????????????????? ???????????????? ??????????
Name[bn]=?????????????????? ????????????????????? ????????????
Name[bn_IN]=??????????????????????????? ?????????????????? ???????????????
Name[bs]=Uobi????ajna sesija sistema
Name[ca]=Sessi?? predeterminada del sistema
Name[cs]=Implicitn?? sezen?? syst??mu
Name[cy]=Sesiwn Rhagosodedig y System
Name[da]=Forvalgt systemsession
Name[de]=Voreingestellte Systemsitzung
Name[dz]=?????????????????????????????????????????????????????????????????????????????????
Name[el]=?????????????????????????? ???????????????? ????????????????????
Name[en_CA]=Default System Session
Name[en_GB]=Default System Session
Name[es]=Sesi??n predeterminada del sistema
Name[et]=Vaikimisi s??steemne seanss
Name[eu]=Sistema-saio lehenetsia
Name[fa]=???????? ??????????????? ??????????
Name[fi]=J??rjestelm??n oletusistunto
Name[fr]=Session par d??faut du syst??me
Name[gl]=Sesi??n por defecto do sistema
Name[gu]=?????????????????? ?????????????????? ????????????
Name[he]=?????????? ???????????? ?????????? ?????????? ???? ????????????
Name[hi]=?????????????????? ?????????????????? ????????????
Name[hr]=Uobi??ajena sesija na sistemu
Name[hu]=Alap??rtelmezett rendszerk??rnyezet
Name[id]=Sesi Sistem Standar
Name[it]=Sessione di sistema predefinita
Name[ja]=????????????????????????????????????????????????
Name[ka]=???????????????????????? ????????????????????????????????? ???????????????
Name[ko]=?????? ????????? ??????
Name[ku]=R??ni??tina pergal?? ya hey??
Name[lt]=Numatytoji sistemos sesija
Name[lv]=Noklus??t?? sist??mas sesija
Name[mg]=Session'ny rafitra tsotra
Name[mk]=???????????????????? ????????????
Name[ml]=????????????????????????????????? ???????????????????????? ??????????????????
Name[mn]=?????????????????? ???????????????? ??????????
Name[mr]=?????????????????? ????????????????????? ????????????
Name[ms]=Sesi Sistem Default
Name[nb]=Forvalgt sesjon for systemet
Name[ne]=?????????????????????????????????????????? ????????????????????? ????????????
Name[nl]=Standaard systeemsessie
Name[nn]=Systemet si standard??kt
Name[nso]=Lenaneo la Tshepedi??o la Tlhaelelo
Name[or]=??????????????? ????????????????????????????????? ?????????????????? ?????????????????????
Name[pa]=????????? ??????????????? ???????????????
Name[pl]=Domy??lna sesja systemu
Name[pt]=Sess??o de Sistema por Omiss??o
Name[pt_BR]=Sess??o Padr??o do Sistema
Name[ro]=Sesiune implicit??
Name[ru]=?????????????????? ?????????? ???? ??????????????????
Name[sk]=??tandardn?? sedenie syst??mu
Name[sl]=Privzeta seja sistema
Name[sq]=Seanca e prezgjedhur e sistemit
Name[sr]=?????????????????????????? ???????????? ???? ??????????????
Name[sr at Latn]=Podrazumevana sesija na sistemu
Name[sv]=Standardsystemsession
Name[ta]=???????????????????????????????????? ??????????????? ??????????????????
Name[th]=??????????????????????????????????????????
Name[tr]=??ntan??ml?? Sistem Oturumu
Name[uk]=?????????????? ?????????????????? ??????????
Name[vi]=Phi??n ch???y h??? th???ng m???c ?????nh
Name[wa]=Pr??metowe session do sistinme
Name[xh]=ISeshoni yeNkqubo eMiselweyo
Name[zh_CN]=??????????????????
Name[zh_HK]=????????????????????????
Name[zh_TW]=????????????????????????
Name[zu]=inhlangano yohlelo enephutha
Comment=This is the default system session
Comment[af]=Hierdie is die verstekstelselsessie
Comment[ar]=?????? ???????? ???????????? ????????????????????
Comment[az]=Bu ??n qur??ulu sistem iclas??d??r
Comment[be]=???????? ?????????????? ?????????????????? ??????????
Comment[bg]=???????? ?? ???????????????????????? ???????????????? ??????????
Comment[bn]=????????? ??????????????? ??????????????????????????? ?????????????????? ????????????
Comment[bn_IN]=????????? ??????????????????????????? ?????????????????? ???????????????
Comment[bs]=Ovo je uobi????ajna sesija sistema
Comment[ca]=Aquesta ??s la sessi?? predeterminada del sistema
Comment[cs]=Toto je implicitn?? sezen?? syst??mu
Comment[cy]=Dyma sesiwn rhagosodedig y system
Comment[da]=Dette er den forvalgte systemsession
Comment[de]=Dies ist die voreingestellte Systemsitzung
Comment[dz]=?????????????????????????????????????????????????????????????????????????????????????????????????????????
Comment[el]=???????? ?????????? ?? ?????????????????????????? ???????????????? ????????????????????
Comment[en_CA]=This is the default system session
Comment[en_GB]=This is the default system session
Comment[es]=??sta es la sesi??n predeterminada del sistema
Comment[et]=See on vaikimisi s??steemne seanss
Comment[eu]=Hau sistema-saio lehenetsia da
Comment[fa]=?????? ???????? ??????????????? ?????????? ??????
Comment[fi]=T??m?? on j??rjestelm??n oletusistunto
Comment[fr]=Ceci est la session par d??faut du syst??me
Comment[gl]=Esta ?? a sesi??n do sistema por defecto
Comment[gu]=??? ?????? ?????????????????? ?????????????????? ???????????? ??????
Comment[he]=???????? ?????????? ???????????? ?????????? ?????????? ???? ????????????
Comment[hi]=?????? ?????????????????? ?????????????????? ???????????? ??????
Comment[hr]=Ovo je uobi??ajena sesija na sistemu
Comment[hu]=Ez az alap??rtelmezett rendszerk??rnyezet
Comment[id]=Login dengan sesi sistem standar
Comment[it]=Questa ?? la sessione di sistema predefinita
Comment[ja]=???????????????????????????????????????????????????????????????
Comment[ka]=?????? ???????????? ???????????????????????? ????????????????????????????????? ???????????????
Comment[ko]=?????? ????????? ????????? ????????? ??????????????????
Comment[ku]=Ev r??ni??tina ya hey?? ya pergal?? ye
Comment[lt]=Tai numatytoji sistemos sesija
Comment[lv]=???? ir noklus??t?? sist??mas sesija
Comment[mg]=Io ny session'ny rafitra tsotra
Comment[mk]=?????? ?? ???????????????????????? ????????????
Comment[ml]=??????????????? ???????????????????????????????????????????????? ??????????????????????????????????????? ??????????????????
Comment[mn]=?????? ?????? ?????????????????? ???????????????? ??????????
Comment[mr]=?????? ?????????????????? ????????????????????? ???????????? ?????????
Comment[ms]=Ini ialah sesi default sistem
Comment[nb]=Dette er forvalgt sesjon for systemet
Comment[ne]=?????? ?????????????????????????????????????????? ????????????????????? ???????????? ??????
Comment[nl]=Dit is de standaardsessie op het systeem
Comment[nn]=Dette er systemet si standard??kt
Comment[nso]=Le ke lenaneo la tshepedi??o la tlhaelelo
Comment[or]=????????? ??????????????? ????????????????????????????????? ?????????????????? ????????????????????? ?????????
Comment[pa]=?????? ????????? ??????????????? ??????????????? ??????
Comment[pl]=Domy??lna sesja systemu
Comment[pt]=Esta ?? a sess??o de sistema por omiss??o
Comment[pt_BR]=Esta ?? uma sess??o padr??o do sistema
Comment[ro]=Aceasta este sesiunea implicit?? a sistemului
Comment[ru]=?????? ?????????????????? ?????????? ???? ??????????????????
Comment[sk]=Toto je ??tandardn?? sedenie syst??mu
Comment[sl]=To je privzeta seja sistema
Comment[sq]=Kjo ??sht?? seanca e prezgjedhur e sistemit
Comment[sr]=?????? ???? ?????????????????????????? ???????????? ???? ??????????????
Comment[sr at Latn]=Ovo je podrazumevana sesija na sistemu
Comment[sv]=Det h??r ??r standardsystemsessionen
Comment[ta]=????????? ????????? ???????????????????????????????????? ??????????????? ??????????????????
Comment[th]=?????????????????????????????????????????????????????????????????????
Comment[tr]=Bu ??ntan??ml?? sistem oturumudur
Comment[uk]=???? ?????????????? ?????????????????? ??????????
Comment[vi]=????y l?? phi??n ch???y h??? th???ng m???c ?????nh
Comment[wa]=??ouci est li pr??metowe session do sistinme, po s'??elodj?? tot-z eployant li lingaedje defini dins les pr??metow??s valixhances do sistinme
Comment[xh]=Le yiseshoni yenkqubo emiselweyo
Comment[zh_CN]=?????????????????????
Comment[zh_HK]=?????????????????????????????????
Comment[zh_TW]=?????????????????????????????????
Comment[zu]=Lokho inhlangano yohlelo enephutha
Exec=default
# The "default" Exec is a very special one and is handled specially in
# the Xsession script, you could also have "custom" which would just run
# "~/.xsession" directly
Icon=
Type=Application


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- gdm.spec	5 Apr 2007 16:18:38 -0000	1.244
+++ gdm.spec	12 Apr 2007 20:44:48 -0000	1.245
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.18.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -27,6 +27,7 @@
 Source3: gdmsetup-pam
 Source4: 90-grant-audio-devices-to-gdm.fdi
 Source5: fedora-faces-20070319.tar.bz2
+Source6: default.desktop
 
 Patch1: gdm-2.18.0-change-defaults.patch
 Patch4: gdm-2.13.0.4-update-switchdesk-location.patch
@@ -208,8 +209,10 @@
 # remove the other gnome session file, since we put it in gnome-session
 rm -rf $RPM_BUILD_ROOT%{_datadir}/xsessions
 
-# we don't want this either
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gdm/BuiltInSessions/default.desktop
+# This got given an unfortunate name, so revert the name for now.
+# See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=234218
+# and http://bugzilla.gnome.org/show_bug.cgi?id=403690
+cp %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/gdm/BuiltInSessions/default.desktop
 
 # no dumb flexiserver thing, Xnest is too broken
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/gdmflexiserver-xnest.desktop
@@ -381,6 +384,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Thu Apr 12 2007 Ray Strode <rstrode at redhat.com> - 1:2.18.0-10
+- add "Default" session back to the sessions menu (bug 234218)
+
 * Thu Apr  5 2007 Ray Strode <rstrode at redhat.com> - 1:2.18.0-9
 - don't expect utf-8 usernames for plain greeter face browser
   either.



From fedora-cvs-commits at redhat.com  Thu Apr 12 20:52:27 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 16:52:27 -0400
Subject: rpms/lockdev/devel lockdev.spec,1.25,1.26
Message-ID: <200704122052.l3CKqR9r011857@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/lockdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11809

Modified Files:
	lockdev.spec 
Log Message:
* Thu Apr 12 2007 Karel Zak <kzak at redhat.com> - 1.0.1-11
- fix rpmlint issues
- change lockdev permissions from 2755 to 2711



Index: lockdev.spec
===================================================================
RCS file: /cvs/dist/rpms/lockdev/devel/lockdev.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- lockdev.spec	19 Jul 2006 21:47:39 -0000	1.25
+++ lockdev.spec	12 Apr 2007 20:52:23 -0000	1.26
@@ -1,9 +1,10 @@
-Summary: A library for locking devices.
+Summary: A library for locking devices
 Name: lockdev
 Version: 1.0.1
-Release: 10
+Release: 11%{?dist}
 License: LGPL
 Group: System Environment/Libraries
+URL: http://packages.debian.org/unstable/source/lockdev
 Source: http://ftp.debian.org/debian/pool/main/l/lockdev/%{name}_%{version}.orig.tar.gz
 
 Patch0: lockdev-1.0.0-rh.patch
@@ -21,7 +22,8 @@
 Requires(postun): glibc
 PreReq: filesystem >= 2.1.4-1
 
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRequires: perl
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Lockdev provides a reliable way to put an exclusive lock to devices
@@ -75,8 +77,7 @@
 
 %files
 %defattr(-,root,root)
-%attr(2755,root,lock)	%{_sbindir}/lockdev
-%dir %attr(775,root,lock) /var/lock
+%attr(2711,root,lock)	%{_sbindir}/lockdev
 %{_libdir}/*.so.*
 
 %files devel
@@ -87,6 +88,10 @@
 %{_includedir}/*
 
 %changelog
+* Thu Apr 12 2007 Karel Zak <kzak at redhat.com> - 1.0.1-11
+- fix rpmlint issues
+- change lockdev permissions from 2755 to 2711
+
 * Wed Jul 19 2006 Karel Zak <kzak at redhat.com> - 1.0.1-10
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Apr 12 21:09:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 17:09:36 -0400
Subject: rpms/selinux-policy/devel policy-20070219.patch, 1.45,
	1.46 selinux-policy.spec, 1.431, 1.432
Message-ID: <200704122109.l3CL9aid024609@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20070219.patch selinux-policy.spec 
Log Message:
* Thu Apr 12 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-2
- Fix samba_net to allow it to view samba_var_t


policy-20070219.patch:
 Rules.modular                           |   12 +
 policy/flask/access_vectors             |    4 
 policy/global_booleans                  |    2 
 policy/global_tunables                  |    7 
 policy/mls                              |   31 ++-
 policy/modules/admin/acct.te            |    1 
 policy/modules/admin/amtu.fc            |    3 
 policy/modules/admin/amtu.if            |   53 ++++++
 policy/modules/admin/amtu.te            |   56 ++++++
 policy/modules/admin/bootloader.te      |    2 
 policy/modules/admin/consoletype.te     |   10 -
 policy/modules/admin/dmesg.te           |    1 
 policy/modules/admin/kudzu.te           |    6 
 policy/modules/admin/logwatch.te        |    4 
 policy/modules/admin/netutils.te        |    6 
 policy/modules/admin/rpm.fc             |    3 
 policy/modules/admin/rpm.if             |   85 +++++++---
 policy/modules/admin/rpm.te             |    2 
 policy/modules/admin/su.if              |    4 
 policy/modules/admin/usermanage.te      |   25 ++
 policy/modules/apps/gnome.if            |   26 ++-
 policy/modules/apps/gpg.fc              |    2 
 policy/modules/apps/loadkeys.if         |   44 +----
 policy/modules/apps/mozilla.if          |    1 
 policy/modules/apps/slocate.te          |    4 
 policy/modules/apps/uml.if              |   27 ---
 policy/modules/kernel/corecommands.fc   |    5 
 policy/modules/kernel/corecommands.if   |   20 ++
 policy/modules/kernel/corenetwork.te.in |   14 +
 policy/modules/kernel/devices.if        |   36 ++++
 policy/modules/kernel/domain.if         |   18 ++
 policy/modules/kernel/domain.te         |   46 +++++
 policy/modules/kernel/files.fc          |    1 
 policy/modules/kernel/files.if          |   83 ++++++++-
 policy/modules/kernel/filesystem.if     |   39 ++++
 policy/modules/kernel/filesystem.te     |   12 +
 policy/modules/kernel/kernel.if         |   23 ++
 policy/modules/kernel/kernel.te         |    2 
 policy/modules/kernel/mls.if            |   20 ++
 policy/modules/kernel/mls.te            |    3 
 policy/modules/kernel/selinux.if        |   38 ++++
 policy/modules/kernel/storage.if        |    2 
 policy/modules/kernel/terminal.if       |    2 
 policy/modules/kernel/terminal.te       |    1 
 policy/modules/services/amavis.te       |    3 
 policy/modules/services/apache.fc       |   14 -
 policy/modules/services/apache.if       |  171 +++++++++++++++++++-
 policy/modules/services/apache.te       |   72 ++++++++
 policy/modules/services/apcupsd.fc      |    9 +
 policy/modules/services/apcupsd.if      |  108 ++++++++++++
 policy/modules/services/apcupsd.te      |   91 ++++++++++
 policy/modules/services/automount.te    |    2 
 policy/modules/services/avahi.if        |   19 ++
 policy/modules/services/bluetooth.te    |    2 
 policy/modules/services/consolekit.te   |   13 +
 policy/modules/services/cron.fc         |    1 
 policy/modules/services/cron.if         |   33 +--
 policy/modules/services/cron.te         |   43 ++++-
 policy/modules/services/cups.te         |    6 
 policy/modules/services/cvs.te          |    1 
 policy/modules/services/cyrus.te        |    1 
 policy/modules/services/dbus.if         |   63 +++++++
 policy/modules/services/dhcp.te         |    2 
 policy/modules/services/djbdns.te       |    5 
 policy/modules/services/dovecot.te      |    5 
 policy/modules/services/ftp.te          |    5 
 policy/modules/services/hal.fc          |    8 
 policy/modules/services/hal.if          |   19 ++
 policy/modules/services/hal.te          |  142 ++++++++++++++++
 policy/modules/services/inetd.te        |    5 
 policy/modules/services/kerberos.if     |   79 ++-------
 policy/modules/services/kerberos.te     |   36 ++++
 policy/modules/services/mta.if          |   19 ++
 policy/modules/services/mta.te          |    2 
 policy/modules/services/nis.if          |    4 
 policy/modules/services/nis.te          |    4 
 policy/modules/services/nscd.te         |   10 +
 policy/modules/services/ntp.te          |    4 
 policy/modules/services/pegasus.if      |   18 ++
 policy/modules/services/pegasus.te      |    6 
 policy/modules/services/postfix.if      |    1 
 policy/modules/services/postfix.te      |    8 
 policy/modules/services/procmail.te     |    1 
 policy/modules/services/pyzor.te        |    7 
 policy/modules/services/radius.te       |    4 
 policy/modules/services/rpc.if          |    5 
 policy/modules/services/rsync.te        |    1 
 policy/modules/services/samba.fc        |    3 
 policy/modules/services/samba.if        |   86 ++++++++++
 policy/modules/services/samba.te        |   82 +++++++++
 policy/modules/services/sendmail.if     |   22 ++
 policy/modules/services/smartmon.te     |    1 
 policy/modules/services/snmp.te         |   15 +
 policy/modules/services/spamassassin.te |    7 
 policy/modules/services/squid.fc        |    2 
 policy/modules/services/squid.if        |   22 ++
 policy/modules/services/squid.te        |   12 +
 policy/modules/services/ssh.if          |   39 ++++
 policy/modules/services/ssh.te          |    5 
 policy/modules/services/w3c.fc          |    2 
 policy/modules/services/w3c.if          |    1 
 policy/modules/services/w3c.te          |   14 +
 policy/modules/system/application.fc    |    1 
 policy/modules/system/application.if    |  104 ++++++++++++
 policy/modules/system/application.te    |   14 +
 policy/modules/system/authlogin.if      |   83 ++++++++-
 policy/modules/system/authlogin.te      |    3 
 policy/modules/system/fstools.fc        |    1 
 policy/modules/system/fstools.te        |    1 
 policy/modules/system/fusermount.fc     |    6 
 policy/modules/system/fusermount.if     |   41 ++++
 policy/modules/system/fusermount.te     |   45 +++++
 policy/modules/system/getty.te          |    3 
 policy/modules/system/hostname.te       |   14 +
 policy/modules/system/init.if           |   42 ++++
 policy/modules/system/init.te           |   35 +++-
 policy/modules/system/ipsec.if          |   20 ++
 policy/modules/system/iptables.te       |    4 
 policy/modules/system/libraries.fc      |    2 
 policy/modules/system/locallogin.te     |    7 
 policy/modules/system/logging.if        |   21 ++
 policy/modules/system/logging.te        |    2 
 policy/modules/system/lvm.te            |    6 
 policy/modules/system/modutils.te       |    6 
 policy/modules/system/mount.fc          |    3 
 policy/modules/system/mount.if          |   37 ++++
 policy/modules/system/mount.te          |   64 +++++++
 policy/modules/system/raid.te           |    1 
 policy/modules/system/selinuxutil.fc    |    1 
 policy/modules/system/selinuxutil.if    |    5 
 policy/modules/system/selinuxutil.te    |   52 +++---
 policy/modules/system/sysnetwork.te     |    1 
 policy/modules/system/udev.te           |    6 
 policy/modules/system/unconfined.fc     |    1 
 policy/modules/system/unconfined.if     |   10 -
 policy/modules/system/unconfined.te     |   24 ++
 policy/modules/system/userdomain.if     |  269 +++++++++++++++++++-------------
 policy/modules/system/userdomain.te     |   46 ++++-
 policy/modules/system/xen.te            |   35 ++++
 policy/support/obj_perm_sets.spt        |   12 +
 140 files changed, 2746 insertions(+), 433 deletions(-)

Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- policy-20070219.patch	11 Apr 2007 20:55:28 -0000	1.45
+++ policy-20070219.patch	12 Apr 2007 21:09:34 -0000	1.46
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.5.12/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2007-02-26 09:43:33.000000000 -0500
-+++ serefpolicy-2.5.12/policy/flask/access_vectors	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/flask/access_vectors	2007-04-11 17:07:34.000000000 -0400
 @@ -598,6 +598,8 @@
  	shmempwd
  	shmemgrp
@@ -21,7 +21,7 @@
  class key
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.5.12/policy/global_booleans
 --- nsaserefpolicy/policy/global_booleans	2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-2.5.12/policy/global_booleans	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/global_booleans	2007-04-11 17:07:34.000000000 -0400
 @@ -4,7 +4,6 @@
  # file should be used.
  #
@@ -40,7 +40,7 @@
  ## <p>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.5.12/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2007-03-26 16:24:14.000000000 -0400
-+++ serefpolicy-2.5.12/policy/global_tunables	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/global_tunables	2007-04-11 17:07:34.000000000 -0400
 @@ -102,12 +102,6 @@
  ## </desc>
  gen_tunable(use_samba_home_dirs,false)
@@ -61,7 +61,7 @@
 -')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.5.12/policy/mls
 --- nsaserefpolicy/policy/mls	2007-03-09 13:02:20.000000000 -0500
-+++ serefpolicy-2.5.12/policy/mls	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/mls	2007-04-11 17:07:34.000000000 -0400
 @@ -89,12 +89,14 @@
  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
@@ -135,7 +135,7 @@
  mlsconstrain association { polmatch }
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.5.12/policy/modules/admin/acct.te
 --- nsaserefpolicy/policy/modules/admin/acct.te	2007-03-26 10:39:08.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/admin/acct.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/admin/acct.te	2007-04-11 17:07:34.000000000 -0400
 @@ -9,6 +9,7 @@
  type acct_t;
  type acct_exec_t;
@@ -146,14 +146,14 @@
  logging_log_file(acct_data_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.fc serefpolicy-2.5.12/policy/modules/admin/amtu.fc
 --- nsaserefpolicy/policy/modules/admin/amtu.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/admin/amtu.fc	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/admin/amtu.fc	2007-04-11 17:07:34.000000000 -0400
 @@ -0,0 +1,3 @@
 +
 +/usr/bin/amtu    --    gen_context(system_u:object_r:amtu_exec_t,s0)
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.if serefpolicy-2.5.12/policy/modules/admin/amtu.if
 --- nsaserefpolicy/policy/modules/admin/amtu.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/admin/amtu.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/admin/amtu.if	2007-04-11 17:07:34.000000000 -0400
 @@ -0,0 +1,53 @@
 +## <summary>
 +##	abstract Machine Test Utility 
@@ -210,7 +210,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.te serefpolicy-2.5.12/policy/modules/admin/amtu.te
 --- nsaserefpolicy/policy/modules/admin/amtu.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/admin/amtu.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/admin/amtu.te	2007-04-11 17:07:34.000000000 -0400
 @@ -0,0 +1,56 @@
 +policy_module(amtu,1.0.23)
 +
@@ -270,7 +270,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.5.12/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2007-02-19 11:32:54.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/admin/bootloader.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/admin/bootloader.te	2007-04-11 17:07:34.000000000 -0400
 @@ -65,6 +65,8 @@
  files_tmp_filetrans(bootloader_t,bootloader_tmp_t,{ dir file lnk_file chr_file blk_file })
  # for tune2fs (cjp: ?)
@@ -282,7 +282,7 @@
  kernel_read_network_state(bootloader_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.5.12/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2007-02-19 11:32:54.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/admin/consoletype.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/admin/consoletype.te	2007-04-11 17:07:34.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -316,7 +316,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-2.5.12/policy/modules/admin/dmesg.te
 --- nsaserefpolicy/policy/modules/admin/dmesg.te	2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/admin/dmesg.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/admin/dmesg.te	2007-04-11 17:07:34.000000000 -0400
 @@ -10,6 +10,7 @@
  	type dmesg_t;
  	type dmesg_exec_t;
@@ -327,7 +327,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.5.12/policy/modules/admin/kudzu.te
 --- nsaserefpolicy/policy/modules/admin/kudzu.te	2007-04-10 12:52:58.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/admin/kudzu.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/admin/kudzu.te	2007-04-11 17:07:34.000000000 -0400
 @@ -21,8 +21,8 @@
  # Local policy
  #
@@ -350,7 +350,7 @@
  init_telinit(kudzu_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.5.12/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2007-04-10 12:52:58.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/admin/logwatch.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/admin/logwatch.te	2007-04-11 17:07:34.000000000 -0400
 @@ -95,6 +95,10 @@
  ')
  
@@ -364,7 +364,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.5.12/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2007-03-26 16:24:13.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/admin/netutils.te	2007-04-11 16:22:25.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/admin/netutils.te	2007-04-11 17:07:34.000000000 -0400
 @@ -31,6 +31,7 @@
  type traceroute_t;
  type traceroute_exec_t;
@@ -401,7 +401,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.5.12/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/admin/rpm.fc	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/admin/rpm.fc	2007-04-11 17:07:34.000000000 -0400
 @@ -21,6 +21,9 @@
  /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)
@@ -414,7 +414,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.5.12/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2007-04-11 10:19:43.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/admin/rpm.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/admin/rpm.if	2007-04-11 17:07:34.000000000 -0400
 @@ -211,26 +211,6 @@
  
  ########################################
@@ -513,7 +513,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.5.12/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2007-02-19 11:32:54.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/admin/rpm.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/admin/rpm.te	2007-04-11 17:07:34.000000000 -0400
 @@ -9,6 +9,8 @@
  type rpm_t;
  type rpm_exec_t;
@@ -525,7 +525,7 @@
  domain_system_change_exemption(rpm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.5.12/policy/modules/admin/su.if
 --- nsaserefpolicy/policy/modules/admin/su.if	2007-03-26 10:39:08.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/admin/su.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/admin/su.if	2007-04-11 17:07:34.000000000 -0400
 @@ -206,6 +206,8 @@
  	auth_domtrans_user_chk_passwd($1,$1_su_t)
  	auth_dontaudit_read_shadow($1_su_t)
@@ -546,7 +546,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.5.12/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2007-03-26 10:39:08.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/admin/usermanage.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/admin/usermanage.te	2007-04-11 17:07:34.000000000 -0400
 @@ -252,8 +252,13 @@
  ')
  
@@ -609,7 +609,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-2.5.12/policy/modules/apps/gnome.if
 --- nsaserefpolicy/policy/modules/apps/gnome.if	2007-02-19 11:32:52.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/apps/gnome.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/apps/gnome.if	2007-04-11 17:07:34.000000000 -0400
 @@ -35,6 +35,7 @@
  template(`gnome_per_role_template',`
  	gen_require(`
@@ -665,7 +665,7 @@
  ##	This is a templated interface, and should only
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.fc serefpolicy-2.5.12/policy/modules/apps/gpg.fc
 --- nsaserefpolicy/policy/modules/apps/gpg.fc	2006-11-16 17:15:07.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/apps/gpg.fc	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/apps/gpg.fc	2007-04-11 17:07:34.000000000 -0400
 @@ -7,6 +7,4 @@
  /usr/lib/gnupg/.*	--	gen_context(system_u:object_r:gpg_exec_t,s0)
  /usr/lib/gnupg/gpgkeys.* --	gen_context(system_u:object_r:gpg_helper_exec_t,s0)
@@ -675,7 +675,7 @@
 -')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/loadkeys.if serefpolicy-2.5.12/policy/modules/apps/loadkeys.if
 --- nsaserefpolicy/policy/modules/apps/loadkeys.if	2007-01-02 12:57:22.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/apps/loadkeys.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/apps/loadkeys.if	2007-04-11 17:07:34.000000000 -0400
 @@ -11,16 +11,12 @@
  ## </param>
  #
@@ -744,7 +744,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.5.12/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2007-03-26 16:24:09.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/apps/mozilla.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/apps/mozilla.if	2007-04-11 17:07:34.000000000 -0400
 @@ -150,6 +150,7 @@
  	corenet_dontaudit_tcp_bind_generic_port($1_mozilla_t)
  
@@ -755,7 +755,7 @@
  	dev_dontaudit_rw_dri($1_mozilla_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.te serefpolicy-2.5.12/policy/modules/apps/slocate.te
 --- nsaserefpolicy/policy/modules/apps/slocate.te	2007-02-19 11:32:52.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/apps/slocate.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/apps/slocate.te	2007-04-11 17:07:34.000000000 -0400
 @@ -42,9 +42,7 @@
  files_read_etc_runtime_files(locate_t)
  files_read_etc_files(locate_t)
@@ -769,7 +769,7 @@
  libs_use_ld_so(locate_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/uml.if serefpolicy-2.5.12/policy/modules/apps/uml.if
 --- nsaserefpolicy/policy/modules/apps/uml.if	2007-03-26 10:38:58.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/apps/uml.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/apps/uml.if	2007-04-11 17:07:34.000000000 -0400
 @@ -193,33 +193,6 @@
  		nis_use_ypbind($1_uml_t)
  	')
@@ -806,7 +806,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.5.12/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2007-04-11 15:52:53.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/kernel/corecommands.fc	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/kernel/corecommands.fc	2007-04-11 17:07:34.000000000 -0400
 @@ -36,6 +36,11 @@
  /etc/cipe/ip-up.*		--	gen_context(system_u:object_r:bin_t,s0)
  /etc/cipe/ip-down.*		--	gen_context(system_u:object_r:bin_t,s0)
@@ -821,7 +821,7 @@
  /etc/hotplug/hotplug\.functions --	gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-2.5.12/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2007-03-26 10:38:57.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/kernel/corecommands.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/kernel/corecommands.if	2007-04-11 17:07:34.000000000 -0400
 @@ -988,3 +988,23 @@
  
  	mmap_files_pattern($1,bin_t,exec_type)
@@ -848,7 +848,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.5.12/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2007-04-11 15:52:53.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/kernel/corenetwork.te.in	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/kernel/corenetwork.te.in	2007-04-11 17:07:34.000000000 -0400
 @@ -48,6 +48,11 @@
  type reserved_port_t, port_type, reserved_port_type;
  
@@ -907,7 +907,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.5.12/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2007-03-26 16:24:09.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/kernel/devices.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/kernel/devices.if	2007-04-11 17:07:34.000000000 -0400
 @@ -2729,6 +2729,24 @@
  
  ########################################
@@ -960,7 +960,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-2.5.12/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2007-02-19 11:32:51.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/kernel/domain.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/kernel/domain.if	2007-04-11 17:07:34.000000000 -0400
 @@ -1254,3 +1254,21 @@
  	typeattribute $1 can_change_object_identity;
  	typeattribute $1 set_curr_context;
@@ -985,7 +985,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-2.5.12/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2007-02-19 11:32:51.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/kernel/domain.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/kernel/domain.te	2007-04-11 17:07:34.000000000 -0400
 @@ -6,6 +6,29 @@
  # Declarations
  #
@@ -1045,7 +1045,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.5.12/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2006-11-16 17:15:04.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/kernel/files.fc	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/kernel/files.fc	2007-04-11 17:07:34.000000000 -0400
 @@ -54,6 +54,7 @@
  /etc/issue\.net		--	gen_context(system_u:object_r:etc_runtime_t,s0)
  /etc/localtime		-l	gen_context(system_u:object_r:etc_t,s0)
@@ -1056,7 +1056,7 @@
  /etc/nologin.*		--	gen_context(system_u:object_r:etc_runtime_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.5.12/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2007-02-26 14:17:21.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/kernel/files.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/kernel/files.if	2007-04-12 09:30:24.000000000 -0400
 @@ -343,8 +343,7 @@
  
  ########################################
@@ -1098,6 +1098,15 @@
  	allow $1 { file_type -security_file_type }:file mounton;
  ')
  
+@@ -376,7 +392,7 @@
+ 		attribute file_type, security_file_type;
+ 	')
+ 
+-	allow $1 { file_type -security_file_type }:dir write;
++	allow $1 { file_type -security_file_type }:dir rw_dir_perms;
+ ')
+ 
+ ########################################
 @@ -992,7 +1008,7 @@
  		attribute file_type;
  	')
@@ -1226,7 +1235,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.5.12/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2007-03-26 16:24:09.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/kernel/filesystem.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/kernel/filesystem.if	2007-04-11 17:07:34.000000000 -0400
 @@ -1291,6 +1291,26 @@
  
  ########################################
@@ -1279,7 +1288,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.5.12/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2007-03-26 16:24:09.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/kernel/filesystem.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/kernel/filesystem.te	2007-04-11 17:07:34.000000000 -0400
 @@ -54,17 +54,29 @@
  
  type capifs_t;
@@ -1312,7 +1321,7 @@
  genfscon futexfs / gen_context(system_u:object_r:futexfs_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.5.12/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2007-02-19 11:32:51.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/kernel/kernel.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/kernel/kernel.if	2007-04-11 17:07:34.000000000 -0400
 @@ -1830,6 +1830,26 @@
  
  ########################################
@@ -1352,7 +1361,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.5.12/policy/modules/kernel/kernel.te
 --- nsaserefpolicy/policy/modules/kernel/kernel.te	2007-03-26 10:38:57.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/kernel/kernel.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/kernel/kernel.te	2007-04-11 17:07:34.000000000 -0400
 @@ -146,6 +146,8 @@
  type unlabeled_t;
  sid unlabeled gen_context(system_u:object_r:unlabeled_t,mls_systemhigh)
@@ -1364,7 +1373,7 @@
  sid file_labels		gen_context(system_u:object_r:unlabeled_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.if serefpolicy-2.5.12/policy/modules/kernel/mls.if
 --- nsaserefpolicy/policy/modules/kernel/mls.if	2006-11-16 17:15:04.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/kernel/mls.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/kernel/mls.if	2007-04-11 17:07:34.000000000 -0400
 @@ -154,6 +154,26 @@
  ########################################
  ## <summary>
@@ -1394,7 +1403,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.5.12/policy/modules/kernel/mls.te
 --- nsaserefpolicy/policy/modules/kernel/mls.te	2007-01-02 12:57:13.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/kernel/mls.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/kernel/mls.te	2007-04-11 17:07:34.000000000 -0400
 @@ -18,6 +18,7 @@
  attribute mlsnetreadtoclr;
  attribute mlsnetwrite;
@@ -1414,7 +1423,7 @@
  attribute privrangetrans;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-2.5.12/policy/modules/kernel/selinux.if
 --- nsaserefpolicy/policy/modules/kernel/selinux.if	2007-02-27 14:37:10.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/kernel/selinux.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/kernel/selinux.if	2007-04-11 17:07:34.000000000 -0400
 @@ -51,6 +51,44 @@
  
  ########################################
@@ -1462,7 +1471,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.if serefpolicy-2.5.12/policy/modules/kernel/storage.if
 --- nsaserefpolicy/policy/modules/kernel/storage.if	2007-01-02 12:57:13.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/kernel/storage.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/kernel/storage.if	2007-04-11 17:07:34.000000000 -0400
 @@ -100,6 +100,7 @@
  
  	dev_list_all_dev_nodes($1)
@@ -1481,7 +1490,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.5.12/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2007-02-20 16:35:52.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/kernel/terminal.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/kernel/terminal.if	2007-04-11 17:07:34.000000000 -0400
 @@ -1052,7 +1052,7 @@
  	')
  
@@ -1493,7 +1502,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.te serefpolicy-2.5.12/policy/modules/kernel/terminal.te
 --- nsaserefpolicy/policy/modules/kernel/terminal.te	2007-02-20 16:35:52.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/kernel/terminal.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/kernel/terminal.te	2007-04-11 17:07:34.000000000 -0400
 @@ -28,6 +28,7 @@
  type devpts_t;
  files_mountpoint(devpts_t)
@@ -1504,7 +1513,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.5.12/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/amavis.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/amavis.te	2007-04-11 17:07:34.000000000 -0400
 @@ -50,6 +50,7 @@
  allow amavis_t self:unix_stream_socket create_stream_socket_perms;
  allow amavis_t self:unix_dgram_socket create_socket_perms;
@@ -1529,7 +1538,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.5.12/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2007-02-23 16:50:01.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/services/apache.fc	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/apache.fc	2007-04-11 17:07:34.000000000 -0400
 @@ -1,10 +1,5 @@
  # temporary hack till genhomedircon is fixed
 -ifdef(`targeted_policy',`
@@ -1563,7 +1572,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.5.12/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2007-04-02 10:58:34.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/apache.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/apache.if	2007-04-11 17:07:34.000000000 -0400
 @@ -18,10 +18,6 @@
  		attribute httpd_script_exec_type;
  		type httpd_t, httpd_suexec_t, httpd_log_t;
@@ -1784,7 +1793,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.5.12/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2007-04-10 13:21:52.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/apache.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/apache.te	2007-04-11 17:07:34.000000000 -0400
 @@ -106,6 +106,27 @@
  ## </desc>
  gen_tunable(httpd_unified,false)
@@ -1929,7 +1938,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.fc serefpolicy-2.5.12/policy/modules/services/apcupsd.fc
 --- nsaserefpolicy/policy/modules/services/apcupsd.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/services/apcupsd.fc	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/apcupsd.fc	2007-04-11 17:07:34.000000000 -0400
 @@ -0,0 +1,9 @@
 +
 +/usr/sbin/apcupsd		--	gen_context(system_u:object_r:apcupsd_exec_t,s0)
@@ -1942,7 +1951,7 @@
 +/var/www/apcupsd/upsstats.cgi		--	gen_context(system_u:object_r:httpd_apcupsd_cgi_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.if serefpolicy-2.5.12/policy/modules/services/apcupsd.if
 --- nsaserefpolicy/policy/modules/services/apcupsd.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/services/apcupsd.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/apcupsd.if	2007-04-11 17:07:34.000000000 -0400
 @@ -0,0 +1,108 @@
 +
 +## <summary>policy for apcupsd</summary>
@@ -2054,8 +2063,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.te serefpolicy-2.5.12/policy/modules/services/apcupsd.te
 --- nsaserefpolicy/policy/modules/services/apcupsd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/services/apcupsd.te	2007-04-11 16:04:22.000000000 -0400
-@@ -0,0 +1,81 @@
++++ serefpolicy-2.5.12/policy/modules/services/apcupsd.te	2007-04-12 15:16:19.000000000 -0400
+@@ -0,0 +1,91 @@
 +policy_module(apcupsd,1.0.0)
 +
 +########################################
@@ -2068,14 +2077,15 @@
 +domain_type(apcupsd_t)
 +init_daemon_domain(apcupsd_t, apcupsd_exec_t)
 +
-+# pid files
-+type apcupsd_var_run_t;
-+files_pid_file(apcupsd_var_run_t)
++type apcupsd_lock_t;
++files_lock_file(apcupsd_lock_t)
 +
-+# log files
 +type apcupsd_log_t;
 +logging_log_file(apcupsd_log_t)
 +
++type apcupsd_var_run_t;
++files_pid_file(apcupsd_var_run_t)
++
 +########################################
 +#
 +# apcupsd local policy
@@ -2086,9 +2096,17 @@
 +init_use_script_ptys(apcupsd_t)
 +domain_use_interactive_fds(apcupsd_t)
 +
-+## internal communication is often done using fifo and unix sockets.
 +allow apcupsd_t self:fifo_file rw_file_perms;
 +allow apcupsd_t self:unix_stream_socket create_stream_socket_perms;
++allow apcupsd_t self:tcp_socket create_stream_socket_perms;
++
++corenet_tcp_bind_apcupsd_port(apcupsd_t)
++corenet_tcp_bind_all_nodes(apcupsd_t)
++corenet_tcp_sendrecv_generic_if(apcupsd_t)
++corenet_tcp_sendrecv_all_nodes(apcupsd_t)
++corenet_tcp_sendrecv_all_ports(apcupsd_t)
++
++dev_rw_generic_usb_dev(apcupsd_t)
 +
 +files_read_etc_files(apcupsd_t)
 +files_search_locks(apcupsd_t)
@@ -2103,17 +2121,17 @@
 +	term_dontaudit_use_generic_ptys(apcupsd_t)
 +')
 +
++allow apcupsd_t apcupsd_lock_t:file manage_file_perms;
++files_lock_filetrans(apcupsd_t,apcupsd_lock_t,file)
 +
-+# pid file
-+allow apcupsd_t apcupsd_var_run_t:file manage_file_perms;
-+allow apcupsd_t apcupsd_var_run_t:dir rw_dir_perms;
-+files_pid_filetrans(apcupsd_t,apcupsd_var_run_t, file)
-+
-+# log files
 +allow apcupsd_t apcupsd_log_t:file manage_file_perms;
 +allow apcupsd_t apcupsd_log_t:dir { rw_dir_perms setattr };
 +logging_log_filetrans(apcupsd_t,apcupsd_log_t,{ file dir })
 +
++allow apcupsd_t apcupsd_var_run_t:file manage_file_perms;
++allow apcupsd_t apcupsd_var_run_t:dir rw_dir_perms;
++files_pid_filetrans(apcupsd_t,apcupsd_var_run_t, file)
++
 +logging_send_syslog_msg(apcupsd_t)
 +
 +########################################
@@ -2137,9 +2155,10 @@
 +corenet_udp_sendrecv_all_if(httpd_apcupsd_cgi_script_t)
 +corenet_udp_sendrecv_all_nodes(httpd_apcupsd_cgi_script_t)
 +corenet_udp_sendrecv_all_ports(httpd_apcupsd_cgi_script_t)
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.5.12/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/automount.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/automount.te	2007-04-11 17:07:34.000000000 -0400
 @@ -69,6 +69,7 @@
  files_mounton_all_mountpoints(automount_t)
  files_mount_all_file_type_fs(automount_t)
@@ -2158,7 +2177,7 @@
  domain_use_interactive_fds(automount_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.if serefpolicy-2.5.12/policy/modules/services/avahi.if
 --- nsaserefpolicy/policy/modules/services/avahi.if	2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/services/avahi.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/avahi.if	2007-04-11 17:07:34.000000000 -0400
 @@ -39,3 +39,22 @@
  	files_search_pids($1)
  	stream_connect_pattern($1,avahi_var_run_t,avahi_var_run_t,avahi_t)
@@ -2184,7 +2203,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.5.12/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2007-03-20 23:38:04.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/bluetooth.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/bluetooth.te	2007-04-11 17:07:34.000000000 -0400
 @@ -98,7 +98,7 @@
  
  fs_getattr_all_fs(bluetooth_t)
@@ -2196,7 +2215,7 @@
  term_use_unallocated_ttys(bluetooth_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-2.5.12/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2007-04-11 16:04:02.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/consolekit.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/consolekit.te	2007-04-11 17:07:34.000000000 -0400
 @@ -38,18 +38,23 @@
  # needs to read /var/lib/dbus/machine-id
  files_read_var_lib_files(consolekit_t)
@@ -2227,7 +2246,7 @@
  	dbus_send_system_bus(consolekit_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-2.5.12/policy/modules/services/cron.fc
 --- nsaserefpolicy/policy/modules/services/cron.fc	2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/services/cron.fc	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/cron.fc	2007-04-11 17:07:34.000000000 -0400
 @@ -45,3 +45,4 @@
  /var/spool/fcron/systab\.orig	--	gen_context(system_u:object_r:system_cron_spool_t,s0)
  /var/spool/fcron/systab		--	gen_context(system_u:object_r:system_cron_spool_t,s0)
@@ -2235,7 +2254,7 @@
 +/var/lib/misc(/.*)?			gen_context(system_u:object_r:crond_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.5.12/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2007-03-26 10:39:05.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/cron.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/cron.if	2007-04-11 17:07:34.000000000 -0400
 @@ -35,6 +35,7 @@
  #
  template(`cron_per_role_template',`
@@ -2346,7 +2365,7 @@
  		# fcron wants an instant update of a crontab change for the administrator
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.5.12/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2007-03-26 16:24:12.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/cron.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/cron.te	2007-04-11 17:07:34.000000000 -0400
 @@ -42,6 +42,9 @@
  type cron_log_t;
  logging_log_file(cron_log_t)
@@ -2462,7 +2481,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.5.12/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/cups.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/cups.te	2007-04-11 17:07:34.000000000 -0400
 @@ -151,9 +151,11 @@
  corenet_tcp_bind_reserved_port(cupsd_t)
  corenet_dontaudit_tcp_bind_all_reserved_ports(cupsd_t)
@@ -2488,7 +2507,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-2.5.12/policy/modules/services/cvs.te
 --- nsaserefpolicy/policy/modules/services/cvs.te	2007-03-26 16:24:12.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/cvs.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/cvs.te	2007-04-11 17:07:34.000000000 -0400
 @@ -16,6 +16,7 @@
  type cvs_t;
  type cvs_exec_t;
@@ -2499,7 +2518,7 @@
  type cvs_data_t; # customizable
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.5.12/policy/modules/services/cyrus.te
 --- nsaserefpolicy/policy/modules/services/cyrus.te	2007-04-10 12:52:58.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/cyrus.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/cyrus.te	2007-04-11 17:07:34.000000000 -0400
 @@ -145,6 +145,7 @@
  
  optional_policy(`
@@ -2510,7 +2529,7 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.5.12/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/dbus.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/dbus.if	2007-04-11 17:07:34.000000000 -0400
 @@ -49,6 +49,12 @@
  ## </param>
  #
@@ -2608,7 +2627,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.te serefpolicy-2.5.12/policy/modules/services/dhcp.te
 --- nsaserefpolicy/policy/modules/services/dhcp.te	2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/dhcp.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/dhcp.te	2007-04-11 17:07:34.000000000 -0400
 @@ -119,6 +119,8 @@
  	dbus_system_bus_client_template(dhcpd,dhcpd_t)
  	dbus_connect_system_bus(dhcpd_t)
@@ -2620,7 +2639,7 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/djbdns.te serefpolicy-2.5.12/policy/modules/services/djbdns.te
 --- nsaserefpolicy/policy/modules/services/djbdns.te	2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/services/djbdns.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/djbdns.te	2007-04-11 17:07:34.000000000 -0400
 @@ -44,4 +44,7 @@
  libs_use_ld_so(djbdns_axfrdns_t)
  libs_use_shared_libs(djbdns_axfrdns_t)
@@ -2632,7 +2651,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.5.12/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2007-03-20 23:38:12.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/dovecot.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/dovecot.te	2007-04-11 17:07:34.000000000 -0400
 @@ -46,6 +46,7 @@
  allow dovecot_t self:tcp_socket create_stream_socket_perms;
  allow dovecot_t self:unix_dgram_socket create_socket_perms;
@@ -2654,7 +2673,7 @@
  # dovecot auth local policy
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.5.12/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2007-03-26 16:24:12.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/ftp.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/ftp.te	2007-04-11 17:07:34.000000000 -0400
 @@ -223,10 +223,15 @@
  	userdom_manage_all_users_home_content_dirs(ftpd_t)
  	userdom_manage_all_users_home_content_files(ftpd_t)
@@ -2673,7 +2692,7 @@
  tunable_policy(`ftp_home_dir && use_nfs_home_dirs',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-2.5.12/policy/modules/services/hal.fc
 --- nsaserefpolicy/policy/modules/services/hal.fc	2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/services/hal.fc	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/hal.fc	2007-04-11 17:07:34.000000000 -0400
 @@ -8,4 +8,12 @@
  
  /var/lib/hal(/.*)?				gen_context(system_u:object_r:hald_var_lib_t,s0)
@@ -2689,7 +2708,7 @@
 +/var/log/pm-suspend.log				gen_context(system_u:object_r:hald_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.5.12/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2007-02-19 11:32:53.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/services/hal.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/hal.if	2007-04-11 17:07:34.000000000 -0400
 @@ -208,3 +208,22 @@
  	files_search_pids($1)
  	allow $1 hald_var_run_t:file rw_file_perms;
@@ -2715,7 +2734,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.5.12/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2007-03-20 23:38:00.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/hal.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/hal.te	2007-04-11 17:07:34.000000000 -0400
 @@ -16,9 +16,33 @@
  type hald_var_run_t;
  files_pid_file(hald_var_run_t)
@@ -2924,7 +2943,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-2.5.12/policy/modules/services/inetd.te
 --- nsaserefpolicy/policy/modules/services/inetd.te	2007-03-26 16:24:12.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/inetd.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/inetd.te	2007-04-11 17:07:34.000000000 -0400
 @@ -135,8 +135,8 @@
  mls_fd_use_all_levels(inetd_t)
  mls_fd_share_all_levels(inetd_t)
@@ -2947,7 +2966,7 @@
  manage_dirs_pattern(inetd_child_t,inetd_child_tmp_t,inetd_child_tmp_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-2.5.12/policy/modules/services/kerberos.if
 --- nsaserefpolicy/policy/modules/services/kerberos.if	2007-04-10 13:21:52.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/kerberos.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/kerberos.if	2007-04-11 17:07:34.000000000 -0400
 @@ -33,43 +33,10 @@
  #
  interface(`kerberos_use',`
@@ -3096,7 +3115,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-2.5.12/policy/modules/services/kerberos.te
 --- nsaserefpolicy/policy/modules/services/kerberos.te	2007-04-10 13:21:52.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/kerberos.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/kerberos.te	2007-04-11 17:07:34.000000000 -0400
 @@ -1,10 +1,11 @@
  
 -policy_module(kerberos,1.3.5)
@@ -3149,7 +3168,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-2.5.12/policy/modules/services/mta.if
 --- nsaserefpolicy/policy/modules/services/mta.if	2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/mta.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/mta.if	2007-04-11 17:07:34.000000000 -0400
 @@ -847,6 +847,25 @@
  	manage_files_pattern($1,mqueue_spool_t,mqueue_spool_t)
  ')
@@ -3178,7 +3197,7 @@
  ##	Read sendmail binary.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.5.12/policy/modules/services/mta.te
 --- nsaserefpolicy/policy/modules/services/mta.te	2007-02-19 11:32:53.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/services/mta.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/mta.te	2007-04-11 17:07:34.000000000 -0400
 @@ -27,6 +27,7 @@
  
  type sendmail_exec_t;
@@ -3197,7 +3216,7 @@
  	apache_dontaudit_append_log(system_mail_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-2.5.12/policy/modules/services/nis.if
 --- nsaserefpolicy/policy/modules/services/nis.if	2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/nis.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/nis.if	2007-04-11 17:07:34.000000000 -0400
 @@ -48,8 +48,8 @@
  	corenet_udp_bind_all_nodes($1)
  	corenet_tcp_bind_generic_port($1)
@@ -3211,7 +3230,7 @@
  	corenet_tcp_connect_portmap_port($1)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.5.12/policy/modules/services/nis.te
 --- nsaserefpolicy/policy/modules/services/nis.te	2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/nis.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/nis.te	2007-04-11 17:07:34.000000000 -0400
 @@ -258,6 +258,8 @@
  corenet_udp_bind_all_nodes(ypserv_t)
  corenet_tcp_bind_reserved_port(ypserv_t)
@@ -3232,7 +3251,7 @@
  corenet_tcp_connect_all_ports(ypxfr_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-2.5.12/policy/modules/services/nscd.te
 --- nsaserefpolicy/policy/modules/services/nscd.te	2007-03-20 23:37:51.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/nscd.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/nscd.te	2007-04-11 17:07:34.000000000 -0400
 @@ -30,7 +30,7 @@
  
  allow nscd_t self:capability { kill setgid setuid audit_write };
@@ -3256,7 +3275,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.5.12/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2007-04-10 12:52:58.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/ntp.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/ntp.te	2007-04-11 17:07:34.000000000 -0400
 @@ -137,6 +137,10 @@
  ')
  
@@ -3270,7 +3289,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.5.12/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/services/pegasus.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/pegasus.if	2007-04-11 17:07:34.000000000 -0400
 @@ -1 +1,19 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -3293,7 +3312,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.5.12/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/pegasus.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/pegasus.te	2007-04-11 17:07:34.000000000 -0400
 @@ -96,13 +96,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -3320,7 +3339,7 @@
  userdom_dontaudit_search_sysadm_home_dirs(pegasus_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-2.5.12/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/postfix.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/postfix.if	2007-04-11 17:07:34.000000000 -0400
 @@ -122,6 +122,7 @@
  	allow postfix_$1_t postfix_master_t:unix_stream_socket { connectto rw_stream_socket_perms };
  	allow postfix_$1_t self:tcp_socket create_socket_perms;
@@ -3331,7 +3350,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.5.12/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2007-03-26 10:39:05.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/postfix.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/postfix.te	2007-04-11 17:07:34.000000000 -0400
 @@ -169,6 +169,8 @@
  mta_rw_aliases(postfix_master_t)
  mta_read_sendmail_bin(postfix_master_t)
@@ -3363,7 +3382,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.5.12/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2007-03-26 10:39:05.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/procmail.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/procmail.te	2007-04-11 17:07:34.000000000 -0400
 @@ -10,6 +10,7 @@
  type procmail_exec_t;
  domain_type(procmail_t)
@@ -3374,7 +3393,7 @@
  type procmail_tmp_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-2.5.12/policy/modules/services/pyzor.te
 --- nsaserefpolicy/policy/modules/services/pyzor.te	2007-03-08 13:52:43.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/services/pyzor.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/pyzor.te	2007-04-11 17:07:34.000000000 -0400
 @@ -54,6 +54,11 @@
  corenet_udp_sendrecv_all_nodes(pyzor_t)
  corenet_udp_sendrecv_all_ports(pyzor_t)
@@ -3405,7 +3424,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.te serefpolicy-2.5.12/policy/modules/services/radius.te
 --- nsaserefpolicy/policy/modules/services/radius.te	2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/radius.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/radius.te	2007-04-11 17:07:34.000000000 -0400
 @@ -130,3 +130,7 @@
  optional_policy(`
  	udev_read_db(radiusd_t)
@@ -3416,7 +3435,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-2.5.12/policy/modules/services/rpc.if
 --- nsaserefpolicy/policy/modules/services/rpc.if	2007-03-20 23:38:10.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/rpc.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/rpc.if	2007-04-11 17:07:34.000000000 -0400
 @@ -89,8 +89,11 @@
  	# bind to arbitary unused ports
  	corenet_tcp_bind_generic_port($1_t)
@@ -3432,7 +3451,7 @@
  	fs_search_auto_mountpoints($1_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-2.5.12/policy/modules/services/rsync.te
 --- nsaserefpolicy/policy/modules/services/rsync.te	2007-03-26 16:24:12.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/rsync.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/rsync.te	2007-04-11 17:07:34.000000000 -0400
 @@ -17,6 +17,7 @@
  type rsync_t;
  type rsync_exec_t;
@@ -3443,7 +3462,7 @@
  type rsync_data_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-2.5.12/policy/modules/services/samba.fc
 --- nsaserefpolicy/policy/modules/services/samba.fc	2007-02-23 16:50:01.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/services/samba.fc	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/samba.fc	2007-04-11 17:07:34.000000000 -0400
 @@ -27,6 +27,9 @@
  /var/cache/samba/winbindd_privileged(/.*)? gen_context(system_u:object_r:winbind_var_run_t,s0)
  
@@ -3456,7 +3475,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.5.12/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/services/samba.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/samba.if	2007-04-12 15:08:34.000000000 -0400
 @@ -177,6 +177,27 @@
  
  ########################################
@@ -3493,7 +3512,7 @@
  	allow $1 samba_var_t:dir search_dir_perms;
  ')
  
-@@ -250,11 +272,33 @@
+@@ -250,11 +272,55 @@
  	')
  
  	files_search_var($1)
@@ -3504,6 +3523,28 @@
  ########################################
  ## <summary>
 +##	Allow the specified domain to
++##	read and write samba /var files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`samba_manage_var_files',`
++	gen_require(`
++		type samba_var_t;
++	')
++
++	files_search_var($1)
++	files_search_var_lib($1)
++	manage_files_pattern($1,samba_var_t,samba_var_t)
++	manage_lnk_files_pattern($1,samba_var_t,samba_var_t)
++')
++
++########################################
++## <summary>
++##	Allow the specified domain to
 +##	read samba /var files.
 +## </summary>
 +## <param name="domain">
@@ -3527,7 +3568,7 @@
  ##	Allow the specified domain to write to smbmount tcp sockets.
  ## </summary>
  ## <param name="domain">
-@@ -377,3 +421,23 @@
+@@ -377,3 +443,23 @@
  	allow $1 samba_var_t:dir search_dir_perms;
  	stream_connect_pattern($1,winbind_var_run_t,winbind_var_run_t,winbind_t)
  ')
@@ -3553,7 +3594,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.5.12/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2007-03-26 16:24:12.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/samba.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/samba.te	2007-04-12 14:55:44.000000000 -0400
 @@ -28,10 +28,39 @@
  ## </desc>
  gen_tunable(samba_share_nfs,false)
@@ -3594,7 +3635,16 @@
  type nmbd_var_run_t;
  files_pid_file(nmbd_var_run_t)
  
-@@ -256,6 +285,9 @@
+@@ -159,6 +188,8 @@
+ 
+ miscfiles_read_localization(samba_net_t) 
+ 
++samba_read_var_files(samba_net_t) 
++
+ sysnet_read_config(samba_net_t)
+ sysnet_use_ldap(samba_net_t)
+ 
+@@ -256,6 +287,9 @@
  corenet_tcp_connect_ipp_port(smbd_t)
  corenet_tcp_connect_smbd_port(smbd_t)
  
@@ -3604,7 +3654,7 @@
  dev_read_sysfs(smbd_t)
  dev_read_urand(smbd_t)
  dev_getattr_mtrr_dev(smbd_t)
-@@ -265,6 +297,7 @@
+@@ -265,6 +299,7 @@
  fs_get_xattr_fs_quotas(smbd_t)
  fs_search_auto_mountpoints(smbd_t)
  fs_getattr_rpc_dirs(smbd_t)
@@ -3612,7 +3662,7 @@
  
  auth_use_nsswitch(smbd_t)
  auth_domtrans_chk_passwd(smbd_t)
-@@ -296,6 +329,12 @@
+@@ -296,6 +331,12 @@
  userdom_dontaudit_use_unpriv_user_fds(smbd_t)
  userdom_use_unpriv_users_fds(smbd_t)
  
@@ -3625,7 +3675,7 @@
  ifdef(`hide_broken_symptoms', `
  	files_dontaudit_getattr_default_dirs(smbd_t)
  	files_dontaudit_getattr_boot_dirs(smbd_t)
-@@ -339,6 +378,21 @@
+@@ -339,6 +380,21 @@
  	udev_read_db(smbd_t)
  ')
  
@@ -3647,7 +3697,7 @@
  ########################################
  #
  # nmbd Local policy
-@@ -362,9 +416,12 @@
+@@ -362,9 +418,12 @@
  files_pid_filetrans(nmbd_t,nmbd_var_run_t,file)
  
  read_files_pattern(nmbd_t,samba_etc_t,samba_etc_t)
@@ -3661,7 +3711,7 @@
  read_files_pattern(nmbd_t,samba_log_t,samba_log_t)
  create_files_pattern(nmbd_t,samba_log_t,samba_log_t)
  allow nmbd_t samba_log_t:dir setattr;
-@@ -457,6 +514,7 @@
+@@ -457,6 +516,7 @@
  
  allow smbmount_t samba_secrets_t:file manage_file_perms;
  
@@ -3669,7 +3719,7 @@
  allow smbmount_t samba_var_t:dir rw_dir_perms;
  manage_files_pattern(smbmount_t,samba_var_t,samba_var_t)
  manage_lnk_files_pattern(smbmount_t,samba_var_t,samba_var_t)
-@@ -514,7 +572,7 @@
+@@ -514,7 +574,7 @@
  userdom_use_sysadm_ttys(smbmount_t)
  
  optional_policy(`
@@ -3678,7 +3728,7 @@
  ')
  
  optional_policy(`
-@@ -625,6 +683,8 @@
+@@ -625,6 +685,8 @@
  # Winbind local policy
  #
  
@@ -3687,7 +3737,7 @@
  dontaudit winbind_t self:capability sys_tty_config;
  allow winbind_t self:process signal_perms;
  allow winbind_t self:fifo_file { read write };
-@@ -634,6 +694,9 @@
+@@ -634,6 +696,9 @@
  allow winbind_t self:tcp_socket create_stream_socket_perms;
  allow winbind_t self:udp_socket create_socket_perms;
  
@@ -3697,7 +3747,7 @@
  allow winbind_t samba_etc_t:dir list_dir_perms;
  read_files_pattern(winbind_t,samba_etc_t,samba_etc_t)
  read_lnk_files_pattern(winbind_t,samba_etc_t,samba_etc_t)
-@@ -645,6 +708,7 @@
+@@ -645,6 +710,7 @@
  manage_files_pattern(winbind_t,samba_log_t,samba_log_t)
  manage_lnk_files_pattern(winbind_t,samba_log_t,samba_log_t)
  
@@ -3705,7 +3755,7 @@
  manage_files_pattern(winbind_t,samba_var_t,samba_var_t)
  manage_lnk_files_pattern(winbind_t,samba_var_t,samba_var_t)
  
-@@ -736,6 +800,7 @@
+@@ -736,6 +802,7 @@
  read_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t)
  read_lnk_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t)
  
@@ -3713,7 +3763,7 @@
  allow winbind_helper_t samba_var_t:dir search;
  
  stream_connect_pattern(winbind_helper_t,winbind_var_run_t,winbind_var_run_t,winbind_t)
-@@ -764,3 +829,14 @@
+@@ -764,3 +831,14 @@
  	squid_read_log(winbind_helper_t)
  	squid_append_log(winbind_helper_t)
  ')
@@ -3730,7 +3780,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-2.5.12/policy/modules/services/sendmail.if
 --- nsaserefpolicy/policy/modules/services/sendmail.if	2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/services/sendmail.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/sendmail.if	2007-04-11 17:07:34.000000000 -0400
 @@ -76,6 +76,26 @@
  
  ########################################
@@ -3769,7 +3819,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-2.5.12/policy/modules/services/smartmon.te
 --- nsaserefpolicy/policy/modules/services/smartmon.te	2007-03-20 23:38:13.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/smartmon.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/smartmon.te	2007-04-11 17:07:34.000000000 -0400
 @@ -60,6 +60,7 @@
  fs_search_auto_mountpoints(fsdaemon_t)
  
@@ -3780,7 +3830,7 @@
  storage_raw_write_fixed_disk(fsdaemon_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-2.5.12/policy/modules/services/snmp.te
 --- nsaserefpolicy/policy/modules/services/snmp.te	2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/snmp.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/snmp.te	2007-04-11 17:07:34.000000000 -0400
 @@ -134,6 +134,11 @@
  ')
  
@@ -3815,7 +3865,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.5.12/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2007-03-26 16:24:12.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/spamassassin.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/spamassassin.te	2007-04-11 17:07:34.000000000 -0400
 @@ -6,14 +6,12 @@
  # Declarations
  #
@@ -3859,7 +3909,7 @@
  # spamassassin 3.1 needs this for its
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.fc serefpolicy-2.5.12/policy/modules/services/squid.fc
 --- nsaserefpolicy/policy/modules/services/squid.fc	2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/services/squid.fc	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/squid.fc	2007-04-11 17:07:34.000000000 -0400
 @@ -12,3 +12,5 @@
  /var/run/squid\.pid	--	gen_context(system_u:object_r:squid_var_run_t,s0)
  
@@ -3868,7 +3918,7 @@
 +/usr/lib64/squid/cachemgr\.cgi	--	gen_context(system_u:object_r:httpd_squid_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.if serefpolicy-2.5.12/policy/modules/services/squid.if
 --- nsaserefpolicy/policy/modules/services/squid.if	2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/squid.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/squid.if	2007-04-11 17:07:34.000000000 -0400
 @@ -36,7 +36,7 @@
  	')
  
@@ -3904,7 +3954,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.5.12/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2007-03-26 16:24:12.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/squid.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/squid.te	2007-04-11 17:07:34.000000000 -0400
 @@ -89,6 +89,8 @@
  corenet_tcp_bind_ftp_port(squid_t)
  corenet_tcp_bind_gopher_port(squid_t)
@@ -3937,7 +3987,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.5.12/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2007-03-26 16:24:12.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/ssh.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/ssh.if	2007-04-11 17:07:34.000000000 -0400
 @@ -708,3 +708,42 @@
  
  	dontaudit $1 sshd_key_t:file { getattr read };
@@ -3983,7 +4033,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-2.5.12/policy/modules/services/ssh.te
 --- nsaserefpolicy/policy/modules/services/ssh.te	2007-03-26 16:24:12.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/ssh.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/ssh.te	2007-04-11 17:07:34.000000000 -0400
 @@ -24,11 +24,11 @@
  
  # Type for the ssh-agent executable.
@@ -4008,18 +4058,18 @@
  tunable_policy(`ssh_sysadm_login',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.fc serefpolicy-2.5.12/policy/modules/services/w3c.fc
 --- nsaserefpolicy/policy/modules/services/w3c.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/services/w3c.fc	2007-04-11 16:34:53.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/w3c.fc	2007-04-11 17:07:34.000000000 -0400
 @@ -0,0 +1,2 @@
 +/usr/share/w3c-markup-validator(/.*)?		gen_context(system_u:object_r:httpd_w3c_validator_content_t,s0)
 +/usr/share/w3c-markup-validator/cgi-bin(/.*)?	gen_context(system_u:object_r:httpd_w3c_validator_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.if serefpolicy-2.5.12/policy/modules/services/w3c.if
 --- nsaserefpolicy/policy/modules/services/w3c.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/services/w3c.if	2007-04-11 16:36:59.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/w3c.if	2007-04-11 17:07:34.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>W3C</summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.te serefpolicy-2.5.12/policy/modules/services/w3c.te
 --- nsaserefpolicy/policy/modules/services/w3c.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/services/w3c.te	2007-04-11 16:36:14.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/w3c.te	2007-04-11 17:07:34.000000000 -0400
 @@ -0,0 +1,14 @@
 +policy_module(w3c,1.2.1)
 +
@@ -4037,12 +4087,12 @@
 +miscfiles_read_certs(httpd_w3c_validator_script_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.fc serefpolicy-2.5.12/policy/modules/system/application.fc
 --- nsaserefpolicy/policy/modules/system/application.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/system/application.fc	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/application.fc	2007-04-11 17:07:34.000000000 -0400
 @@ -0,0 +1 @@
 +# No application file contexts.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.if serefpolicy-2.5.12/policy/modules/system/application.if
 --- nsaserefpolicy/policy/modules/system/application.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/system/application.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/application.if	2007-04-11 17:07:34.000000000 -0400
 @@ -0,0 +1,104 @@
 +## <summary>Policy for application domains</summary>
 +
@@ -4150,7 +4200,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.te serefpolicy-2.5.12/policy/modules/system/application.te
 --- nsaserefpolicy/policy/modules/system/application.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/system/application.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/application.te	2007-04-11 17:07:34.000000000 -0400
 @@ -0,0 +1,14 @@
 +
 +policy_module(application,1.0.0)
@@ -4168,7 +4218,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.5.12/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/authlogin.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/authlogin.if	2007-04-11 17:07:34.000000000 -0400
 @@ -152,21 +152,12 @@
  ## </param>
  #
@@ -4287,7 +4337,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.5.12/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/authlogin.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/authlogin.te	2007-04-11 17:07:34.000000000 -0400
 @@ -9,6 +9,7 @@
  attribute can_read_shadow_passwords;
  attribute can_write_shadow_passwords;
@@ -4307,7 +4357,7 @@
  corecmd_search_bin(system_chkpwd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.fc serefpolicy-2.5.12/policy/modules/system/fstools.fc
 --- nsaserefpolicy/policy/modules/system/fstools.fc	2006-11-16 17:15:24.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/system/fstools.fc	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/fstools.fc	2007-04-11 17:07:34.000000000 -0400
 @@ -19,7 +19,6 @@
  /sbin/mkfs.*		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
  /sbin/mkraid		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
@@ -4318,7 +4368,7 @@
  /sbin/partx		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.5.12/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/fstools.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/fstools.te	2007-04-11 17:07:34.000000000 -0400
 @@ -9,6 +9,7 @@
  type fsadm_t;
  type fsadm_exec_t;
@@ -4329,7 +4379,7 @@
  type fsadm_log_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fusermount.fc serefpolicy-2.5.12/policy/modules/system/fusermount.fc
 --- nsaserefpolicy/policy/modules/system/fusermount.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/system/fusermount.fc	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/fusermount.fc	2007-04-11 17:07:34.000000000 -0400
 @@ -0,0 +1,6 @@
 +# fusermount executable will have:
 +# label: system_u:object_r:fusermount_exec_t
@@ -4339,7 +4389,7 @@
 +/usr/bin/fusermount		--	gen_context(system_u:object_r:fusermount_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fusermount.if serefpolicy-2.5.12/policy/modules/system/fusermount.if
 --- nsaserefpolicy/policy/modules/system/fusermount.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/system/fusermount.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/fusermount.if	2007-04-11 17:07:34.000000000 -0400
 @@ -0,0 +1,41 @@
 +## <summary>policy for fusermount</summary>
 +
@@ -4385,7 +4435,7 @@
 \ No newline at end of file
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fusermount.te serefpolicy-2.5.12/policy/modules/system/fusermount.te
 --- nsaserefpolicy/policy/modules/system/fusermount.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/system/fusermount.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/fusermount.te	2007-04-11 17:07:34.000000000 -0400
 @@ -0,0 +1,45 @@
 +policy_module(fusermount,1.0.0)
 +
@@ -4434,7 +4484,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-2.5.12/policy/modules/system/getty.te
 --- nsaserefpolicy/policy/modules/system/getty.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/getty.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/getty.te	2007-04-11 17:07:34.000000000 -0400
 @@ -33,7 +33,8 @@
  #
  
@@ -4447,7 +4497,7 @@
  allow getty_t self:fifo_file rw_fifo_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.5.12/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2007-01-02 12:57:49.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/system/hostname.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/hostname.te	2007-04-11 17:07:34.000000000 -0400
 @@ -8,8 +8,12 @@
  
  type hostname_t;
@@ -4476,7 +4526,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.5.12/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/init.if	2007-04-11 16:41:11.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/init.if	2007-04-11 17:07:34.000000000 -0400
 @@ -194,11 +194,14 @@
  	gen_require(`
  		type initrc_t;
@@ -4537,7 +4587,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.5.12/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2007-03-26 16:24:13.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/init.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/init.te	2007-04-11 17:07:34.000000000 -0400
 @@ -10,13 +10,20 @@
  # Declarations
  #
@@ -4619,7 +4669,7 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.if serefpolicy-2.5.12/policy/modules/system/ipsec.if
 --- nsaserefpolicy/policy/modules/system/ipsec.if	2007-03-26 16:24:13.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/ipsec.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/ipsec.if	2007-04-11 17:07:34.000000000 -0400
 @@ -114,6 +114,26 @@
  
  ########################################
@@ -4649,7 +4699,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-2.5.12/policy/modules/system/iptables.te
 --- nsaserefpolicy/policy/modules/system/iptables.te	2007-03-26 16:24:13.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/iptables.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/iptables.te	2007-04-11 17:07:34.000000000 -0400
 @@ -112,3 +112,7 @@
  optional_policy(`
  	udev_read_db(iptables_t)
@@ -4660,7 +4710,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.5.12/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2007-04-10 16:13:39.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/libraries.fc	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/libraries.fc	2007-04-11 17:07:34.000000000 -0400
 @@ -59,7 +59,6 @@
  ')
  
@@ -4679,7 +4729,7 @@
  # despite the extensions, they are actually libs
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.5.12/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/locallogin.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/locallogin.te	2007-04-11 17:07:34.000000000 -0400
 @@ -48,6 +48,8 @@
  allow local_login_t self:msgq create_msgq_perms;
  allow local_login_t self:msg { send receive };
@@ -4710,7 +4760,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.5.12/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/logging.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/logging.if	2007-04-11 17:07:34.000000000 -0400
 @@ -480,6 +480,8 @@
  	files_search_var($1)
  	manage_files_pattern($1,logfile,logfile)
@@ -4745,7 +4795,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.5.12/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/logging.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/logging.te	2007-04-11 17:07:34.000000000 -0400
 @@ -11,6 +11,7 @@
  type auditctl_t;
  type auditctl_exec_t;
@@ -4764,7 +4814,7 @@
  files_dontaudit_search_isid_type_dirs(syslogd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.5.12/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/lvm.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/lvm.te	2007-04-11 17:07:34.000000000 -0400
 @@ -16,6 +16,7 @@
  type lvm_t;
  type lvm_exec_t;
@@ -4794,7 +4844,7 @@
  term_list_ptys(lvm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.5.12/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2007-04-11 15:52:54.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/modutils.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/modutils.te	2007-04-11 17:07:34.000000000 -0400
 @@ -101,6 +101,7 @@
  init_use_fds(insmod_t)
  init_use_script_fds(insmod_t)
@@ -4824,7 +4874,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.fc serefpolicy-2.5.12/policy/modules/system/mount.fc
 --- nsaserefpolicy/policy/modules/system/mount.fc	2006-11-16 17:15:24.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/system/mount.fc	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/mount.fc	2007-04-11 17:07:34.000000000 -0400
 @@ -1,4 +1,3 @@
  /bin/mount.*			--	gen_context(system_u:object_r:mount_exec_t,s0)
  /bin/umount.*			--	gen_context(system_u:object_r:mount_exec_t,s0)
@@ -4833,7 +4883,7 @@
 +/sbin/mount.ntfs-3g		--	gen_context(system_u:object_r:mount_ntfs_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-2.5.12/policy/modules/system/mount.if
 --- nsaserefpolicy/policy/modules/system/mount.if	2007-01-02 12:57:49.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/system/mount.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/mount.if	2007-04-11 17:07:34.000000000 -0400
 @@ -143,3 +143,40 @@
  		mount_domtrans($1)
  	')
@@ -4877,7 +4927,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.5.12/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2007-03-26 16:24:13.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/mount.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/mount.te	2007-04-11 17:07:34.000000000 -0400
 @@ -9,6 +9,13 @@
  ifdef(`targeted_policy',`
  ## <desc>
@@ -4981,7 +5031,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-2.5.12/policy/modules/system/raid.te
 --- nsaserefpolicy/policy/modules/system/raid.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/raid.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/raid.te	2007-04-11 17:07:34.000000000 -0400
 @@ -46,6 +46,7 @@
  # RAID block device access
  storage_manage_fixed_disk(mdadm_t)
@@ -4992,7 +5042,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.5.12/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2006-11-16 17:15:24.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/system/selinuxutil.fc	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/selinuxutil.fc	2007-04-11 17:07:34.000000000 -0400
 @@ -40,6 +40,7 @@
  /usr/sbin/setfiles.*		--	gen_context(system_u:object_r:setfiles_exec_t,s0)
  /usr/sbin/setsebool		--	gen_context(system_u:object_r:semanage_exec_t,s0)
@@ -5003,7 +5053,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.5.12/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/selinuxutil.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/selinuxutil.if	2007-04-11 17:07:34.000000000 -0400
 @@ -616,7 +616,7 @@
  	gen_require(`
  		type selinux_config_t;
@@ -5032,7 +5082,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.5.12/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/selinuxutil.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/selinuxutil.te	2007-04-11 17:07:34.000000000 -0400
 @@ -1,10 +1,8 @@
  
  policy_module(selinuxutil,1.4.2)
@@ -5161,7 +5211,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.5.12/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/sysnetwork.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/sysnetwork.te	2007-04-11 17:07:34.000000000 -0400
 @@ -221,6 +221,7 @@
  optional_policy(`
  	seutil_sigchld_newrole(dhcpc_t)
@@ -5172,7 +5222,7 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.5.12/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2007-04-11 15:52:54.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/udev.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/udev.te	2007-04-11 17:07:34.000000000 -0400
 @@ -89,6 +89,7 @@
  dev_manage_all_dev_nodes(udev_t)
  dev_rw_generic_files(udev_t)
@@ -5194,7 +5244,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.5.12/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2007-02-19 11:32:53.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/system/unconfined.fc	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/unconfined.fc	2007-04-11 17:07:34.000000000 -0400
 @@ -10,4 +10,5 @@
  /usr/bin/valgrind 		--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  /usr/local/RealPlayer/realplay\.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
@@ -5203,7 +5253,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.5.12/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2007-02-19 11:32:53.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/system/unconfined.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/unconfined.if	2007-04-11 17:07:34.000000000 -0400
 @@ -18,7 +18,7 @@
  	')
  
@@ -5230,7 +5280,7 @@
  	corenet_unconfined($1)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.5.12/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2007-03-20 09:23:14.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/unconfined.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/unconfined.te	2007-04-11 17:07:34.000000000 -0400
 @@ -6,6 +6,15 @@
  # Declarations
  #
@@ -5296,7 +5346,7 @@
  		init_dbus_chat_script(unconfined_execmem_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.5.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-03-26 16:24:13.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/userdomain.if	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/userdomain.if	2007-04-11 17:07:34.000000000 -0400
 @@ -114,6 +114,10 @@
  		# Allow making the stack executable via mprotect.
  		allow $1_t self:process execstack;
@@ -5732,7 +5782,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.5.12/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2007-03-26 16:24:13.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/userdomain.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/userdomain.te	2007-04-11 17:07:34.000000000 -0400
 @@ -15,7 +15,6 @@
  # Declarations
  #
@@ -5852,7 +5902,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.5.12/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/xen.te	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/xen.te	2007-04-11 17:07:34.000000000 -0400
 @@ -25,6 +25,10 @@
  domain_type(xend_t)
  init_daemon_domain(xend_t, xend_exec_t)
@@ -5937,7 +5987,7 @@
 +fs_read_dos_files(xend_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-2.5.12/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2007-01-02 12:57:51.000000000 -0500
-+++ serefpolicy-2.5.12/policy/support/obj_perm_sets.spt	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/policy/support/obj_perm_sets.spt	2007-04-11 17:07:34.000000000 -0400
 @@ -215,7 +215,7 @@
  define(`getattr_file_perms',`{ getattr }')
  define(`setattr_file_perms',`{ setattr }')
@@ -5963,7 +6013,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.5.12/Rules.modular
 --- nsaserefpolicy/Rules.modular	2007-03-22 14:30:10.000000000 -0400
-+++ serefpolicy-2.5.12/Rules.modular	2007-04-11 16:04:22.000000000 -0400
++++ serefpolicy-2.5.12/Rules.modular	2007-04-11 17:07:34.000000000 -0400
 @@ -167,7 +167,7 @@
  # these have to run individually because order matters:
  	$(verbose) $(GREP) '^sid ' $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -r1.431 -r1.432
--- selinux-policy.spec	11 Apr 2007 20:23:53 -0000	1.431
+++ selinux-policy.spec	12 Apr 2007 21:09:34 -0000	1.432
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.5.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -358,6 +358,9 @@
 %endif
 
 %changelog
+* Thu Apr 12 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-2
+- Fix samba_net to allow it to view samba_var_t
+
 * Tue Apr 10 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-1
 - Update to upstream
 



From fedora-cvs-commits at redhat.com  Thu Apr 12 21:10:14 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 17:10:14 -0400
Subject: rpms/selinux-policy/FC-6 selinux-policy.spec,1.357,1.358
Message-ID: <200704122110.l3CLAEFp025073@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	selinux-policy.spec 
Log Message:
* Thu Apr 12 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-56
- Allow lvm mls_file_read_up to look at Fixed disks
Resolves: #236060
- More fixes for apcupsd



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/selinux-policy.spec,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- selinux-policy.spec	12 Apr 2007 19:54:45 -0000	1.357
+++ selinux-policy.spec	12 Apr 2007 21:10:07 -0000	1.358
@@ -360,7 +360,7 @@
 %endif
 
 %changelog
-* Wed Apr 11 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-56
+* Thu Apr 12 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-56
 - Allow lvm mls_file_read_up to look at Fixed disks
 Resolves: #236060
 - More fixes for apcupsd



From fedora-cvs-commits at redhat.com  Thu Apr 12 21:24:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 17:24:32 -0400
Subject: rpms/libraw1394/devel fw-device-cdev.h, 1.1,
	1.2 libraw1394-juju.patch, 1.4, 1.5 libraw1394.spec, 1.27, 1.28
Message-ID: <200704122124.l3CLOWp3002980@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/libraw1394/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2929

Modified Files:
	fw-device-cdev.h libraw1394-juju.patch libraw1394.spec 
Log Message:
* Thu Apr 12 2007 Kristian H??gsberg <krh at redhat.com> - 1.2.1-5
- Make rawiso support actually work.
- Update fw-device-cdev.h to sync with latest kernel patch.



Index: fw-device-cdev.h
===================================================================
RCS file: /cvs/dist/rpms/libraw1394/devel/fw-device-cdev.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fw-device-cdev.h	19 Mar 2007 23:09:25 -0000	1.1
+++ fw-device-cdev.h	12 Apr 2007 21:24:30 -0000	1.2
@@ -74,7 +74,13 @@
  * event.  It's a 64-bit type so that it's a fixed size type big
  * enough to hold a pointer on all platforms. */
 
+struct fw_cdev_event_common {
+	__u64 closure;
+	__u32 type;
+};
+
 struct fw_cdev_event_bus_reset {
+	__u64 closure;
 	__u32 type;
 	__u32 node_id;
 	__u32 local_node_id;
@@ -85,41 +91,52 @@
 };
 
 struct fw_cdev_event_response {
+	__u64 closure;
 	__u32 type;
 	__u32 rcode;
-	__u64 closure;
 	__u32 length;
 	__u32 data[0];
 };
 
 struct fw_cdev_event_request {
+	__u64 closure;
 	__u32 type;
 	__u32 tcode;
 	__u64 offset;
-	__u64 closure;
-	__u32 serial;
+	__u32 handle;
 	__u32 length;
 	__u32 data[0];
 };
 
 struct fw_cdev_event_iso_interrupt {
+	__u64 closure;
 	__u32 type;
 	__u32 cycle;
-	__u64 closure;
 	__u32 header_length;	/* Length in bytes of following headers. */
 	__u32 header[0];
 };
 
+union fw_cdev_event {
+	struct fw_cdev_event_common common;
+	struct fw_cdev_event_bus_reset bus_reset;
+	struct fw_cdev_event_response response;
+	struct fw_cdev_event_request request;
+	struct fw_cdev_event_iso_interrupt iso_interrupt;
+};
+
 #define FW_CDEV_IOC_GET_INFO		_IO('#', 0x00)
 #define FW_CDEV_IOC_SEND_REQUEST	_IO('#', 0x01)
 #define FW_CDEV_IOC_ALLOCATE		_IO('#', 0x02)
 #define FW_CDEV_IOC_DEALLOCATE		_IO('#', 0x03)
 #define FW_CDEV_IOC_SEND_RESPONSE	_IO('#', 0x04)
 #define FW_CDEV_IOC_INITIATE_BUS_RESET	_IO('#', 0x05)
-#define FW_CDEV_IOC_CREATE_ISO_CONTEXT	_IO('#', 0x06)
-#define FW_CDEV_IOC_QUEUE_ISO		_IO('#', 0x07)
-#define FW_CDEV_IOC_START_ISO		_IO('#', 0x08)
-#define FW_CDEV_IOC_STOP_ISO		_IO('#', 0x09)
+#define FW_CDEV_IOC_ADD_DESCRIPTOR	_IO('#', 0x06)
+#define FW_CDEV_IOC_REMOVE_DESCRIPTOR	_IO('#', 0x07)
+
+#define FW_CDEV_IOC_CREATE_ISO_CONTEXT	_IO('#', 0x08)
+#define FW_CDEV_IOC_QUEUE_ISO		_IO('#', 0x09)
+#define FW_CDEV_IOC_START_ISO		_IO('#', 0x0a)
+#define FW_CDEV_IOC_STOP_ISO		_IO('#', 0x0b)
 
 /* FW_CDEV_VERSION History
  *
@@ -145,8 +162,12 @@
 	__u64 rom;
 
 	/* If non-zero, a fw_cdev_event_bus_reset struct will be
-	 * copied here with the current state of the bus. */
+	 * copied here with the current state of the bus.  This does
+	 * not cause a bus reset to happen.  The value of closure in
+	 * this and sub-sequent bus reset events is set to
+	 * bus_reset_closure. */
 	__u64 bus_reset;
+	__u64 bus_reset_closure;
 
 	/* The index of the card this devices belongs to. */
 	__u32 card;
@@ -165,17 +186,18 @@
 	__u32 rcode;
 	__u32 length;
 	__u64 data;
-	__u32 serial;
+	__u32 handle;
 };
 
 struct fw_cdev_allocate {
 	__u64 offset;
 	__u64 closure;
 	__u32 length;
+	__u32 handle;
 };
 
 struct fw_cdev_deallocate {
-	__u64 offset;
+	__u32 handle;
 };
 
 #define FW_CDEV_LONG_RESET	0
@@ -185,6 +207,18 @@
 	__u32 type;
 };
 
+struct fw_cdev_add_descriptor {
+	__u32 immediate;
+	__u32 key;
+	__u64 data;
+	__u32 length;
+	__u32 handle;
+};
+
+struct fw_cdev_remove_descriptor {
+	__u32 handle;
+};
+
 #define FW_CDEV_ISO_CONTEXT_TRANSMIT	0
 #define FW_CDEV_ISO_CONTEXT_RECEIVE	1
 
@@ -212,9 +246,9 @@
 };
 
 struct fw_cdev_queue_iso {
-	__u32 size;
 	__u64 packets;
 	__u64 data;
+	__u32 size;
 };
 
 struct fw_cdev_start_iso {

libraw1394-juju.patch:
 Makefile.am        |    3 
 configure.ac       |   22 
 juju/Makefile.am   |    8 
 juju/juju.h        |  143 +++++
 juju/raw1394-iso.c |  513 ++++++++++++++++++
 juju/raw1394.c     | 1441 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 tools/Makefile.am  |    2 
 tools/testlibraw.c |   76 ++
 8 files changed, 2189 insertions(+), 19 deletions(-)

Index: libraw1394-juju.patch
===================================================================
RCS file: /cvs/dist/rpms/libraw1394/devel/libraw1394-juju.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libraw1394-juju.patch	4 Apr 2007 01:26:40 -0000	1.4
+++ libraw1394-juju.patch	12 Apr 2007 21:24:30 -0000	1.5
@@ -67,7 +67,7 @@
 +pkginclude_HEADERS = ../src/raw1394.h ../src/csr.h ../src/ieee1394.h
 diff --git a/juju/juju.h b/juju/juju.h
 new file mode 100644
-index 0000000..8c18630
+index 0000000..d78d362
 --- /dev/null
 +++ b/juju/juju.h
 @@ -0,0 +1,143 @@
@@ -196,9 +196,9 @@
 +		int irq_interval;
 +		int packet_phase;
 +		int packet_count;
++		int packet_index;
 +		int buf_packets;
 +		int max_packet_size;
-+		int packet_header_index;
 +		int prebuffer;
 +		int start_on_cycle;
 +		enum raw1394_iso_dma_recv_mode recv_mode;
@@ -216,10 +216,10 @@
 +#endif
 diff --git a/juju/raw1394-iso.c b/juju/raw1394-iso.c
 new file mode 100644
-index 0000000..bbf49f0
+index 0000000..a320440
 --- /dev/null
 +++ b/juju/raw1394-iso.c
-@@ -0,0 +1,547 @@
+@@ -0,0 +1,513 @@
 +/*						-*- c-basic-offset: 8 -*-
 + *
 + * raw1394-iso.c -- Emulation of the raw1394 rawiso API on the juju stack
@@ -252,76 +252,73 @@
 +
 +#include "juju.h"
 +
-+static enum raw1394_iso_disposition
-+queue_xmit_packets(raw1394handle_t handle)
++static int
++queue_packet(raw1394handle_t handle,
++	     unsigned int length, unsigned int header_length,
++	     unsigned char tag, unsigned char sy)
 +{
-+	struct fw_cdev_iso_packet *p = handle->iso.packets;
 +	struct fw_cdev_queue_iso queue_iso;
-+	enum raw1394_iso_disposition d;
-+	unsigned int len, dropped;
-+	unsigned char tag, sy, *first_payload;
-+	int cycle, i;
-+
-+	first_payload = handle->iso.head;
-+	for (i = 0; i < handle->iso.irq_interval; i++) {
-+		cycle = -1;
-+		dropped = 0;
-+
-+		if (handle->iso.head + handle->iso.max_packet_size >
-+		    handle->iso.buffer_end) {
-+			handle->iso.head = handle->iso.buffer;
-+			break;
-+		}
++	struct fw_cdev_iso_packet *p;
++	int err;
 +
-+		d = handle->iso.xmit_handler(handle, handle->iso.head,
-+					     &len, &tag, &sy, cycle, dropped);
-+		if (d != RAW1394_ISO_OK)
-+			break;
++	p = &handle->iso.packets[handle->iso.packet_index];
++	p->payload_length = length;
++	p->interrupt =
++		handle->iso.packet_phase == handle->iso.irq_interval - 1;
++	p->skip = 0;
++	p->tag = tag;
++	p->sy = sy;
++	p->header_length = header_length;
 +
-+		p->payload_length = len;
-+		p->interrupt =
-+			handle->iso.packet_phase == handle->iso.irq_interval - 1;
-+		p->skip = 0;
-+		p->tag = tag;
-+		p->sy = sy;
-+		p->header_length = 0;
-+
-+		handle->iso.head += len;
-+		handle->iso.packet_count++;
-+		handle->iso.packet_phase++;
-+
-+		if (handle->iso.packet_phase == handle->iso.irq_interval)
-+			handle->iso.packet_phase = 0;
-+	}
-+
-+	queue_iso.packets = ptr_to_u64(handle->iso.packets);
-+	queue_iso.size    = i * sizeof handle->iso.packets[0];
-+	queue_iso.data    = ptr_to_u64(first_payload);
++	handle->iso.head += length;
++	handle->iso.packet_count++;
++	handle->iso.packet_phase++;
++	handle->iso.packet_index++;
 +
-+	len = ioctl(handle->iso.fd, FW_CDEV_IOC_QUEUE_ISO, &queue_iso);
-+	if (len < 0)
-+		return RAW1394_ISO_ERROR;
++	if (handle->iso.packet_phase == handle->iso.irq_interval)
++		handle->iso.packet_phase = 0;
++
++	if (handle->iso.head + handle->iso.max_packet_size > handle->iso.buffer_end)
++		handle->iso.head = handle->iso.buffer;
++
++	/* Queue the packets in the kernel if we filled up the packets
++	 * array or wrapped the payload buffer. */
++	if (handle->iso.packet_index == handle->iso.irq_interval ||
++	    handle->iso.head == handle->iso.buffer) {
++		queue_iso.packets = ptr_to_u64(handle->iso.packets);
++		queue_iso.size    = handle->iso.packet_index * sizeof handle->iso.packets[0];
++		queue_iso.data    = ptr_to_u64(handle->iso.first_payload);
++		handle->iso.packet_index = 0;
++		handle->iso.first_payload = handle->iso.head;
 +
-+	return d;
++		err = ioctl(handle->iso.fd, FW_CDEV_IOC_QUEUE_ISO, &queue_iso);
++		if (err < 0)
++			return -1;
++	}
 +}
 +
 +static int
-+flush_xmit_packets(raw1394handle_t handle, int limit)
++queue_xmit_packets(raw1394handle_t handle, int limit)
 +{
 +	enum raw1394_iso_disposition d;
-+	int len;
++	unsigned char tag, sy;
++	int len, cycle, dropped;
 +
 +	if (handle->iso.xmit_handler == NULL)
 +		return 0;
 +
-+	if (limit < handle->iso.irq_interval)
-+		limit = handle->iso.irq_interval;
++	while (handle->iso.packet_count < limit) {
++
++		d = handle->iso.xmit_handler(handle, handle->iso.head,
++					     &len, &tag, &sy, cycle, dropped);
 +
-+	while (handle->iso.packet_count + handle->iso.irq_interval <= limit) {
-+		d = queue_xmit_packets(handle);
 +		switch (d) {
++		case RAW1394_ISO_OK:
++			queue_packet(handle, len, 0, tag, sy);
++			break;
 +		case RAW1394_ISO_DEFER:
 +		case RAW1394_ISO_AGAIN:
++		default:
 +			return 0;
 +		case RAW1394_ISO_ERROR:
 +			return -1;
@@ -346,7 +343,7 @@
 +	handle->iso.prebuffer = prebuffer_packets;
 +	handle->iso.start_on_cycle = start_on_cycle;
 +
-+	flush_xmit_packets(handle, prebuffer_packets);
++	queue_xmit_packets(handle, prebuffer_packets);
 +
 +	if (handle->iso.prebuffer <= handle->iso.packet_count) {
 +		start_iso.cycle = start_on_cycle;
@@ -357,48 +354,14 @@
 +			return retval;
 +	}
 +
-+	return flush_xmit_packets(handle, handle->iso.buf_packets);
++	return queue_xmit_packets(handle, handle->iso.buf_packets);
 +}
 +
 +static int
 +queue_recv_packets(raw1394handle_t handle)
 +{
-+	struct fw_cdev_queue_iso queue_iso;
-+	struct fw_cdev_iso_packet *p = handle->iso.packets;
-+	unsigned int len;
-+	unsigned char *first_payload;
-+	int i;
-+
-+	first_payload = handle->iso.head;
-+	for (i = 0; i < handle->iso.irq_interval; i++, p++) {
-+		if (handle->iso.head + handle->iso.max_packet_size >
-+		    handle->iso.buffer_end) {
-+			handle->iso.head = handle->iso.buffer;
-+			break;
-+		}
-+
-+		p->payload_length = handle->iso.max_packet_size;
-+		p->interrupt = handle->iso.packet_phase == handle->iso.irq_interval - 1;
-+		p->skip = 0;
-+		p->tag = 0;
-+		p->sy = 0;
-+		p->header_length = 4;
-+
-+		handle->iso.head += handle->iso.max_packet_size;
-+		handle->iso.packet_count++;
-+		handle->iso.packet_phase++;
-+
-+		if (handle->iso.packet_phase == handle->iso.irq_interval)
-+			handle->iso.packet_phase = 0;
-+	}
-+
-+	queue_iso.packets = ptr_to_u64(handle->iso.packets);
-+	queue_iso.size    = i * sizeof handle->iso.packets[0];
-+	queue_iso.data    = ptr_to_u64(first_payload);
-+
-+	len = ioctl(handle->iso.fd, FW_CDEV_IOC_QUEUE_ISO, &queue_iso);
-+	if (len < 0)
-+		return -1;
++	while (handle->iso.packet_count <= handle->iso.buf_packets)
++		queue_packet(handle, handle->iso.max_packet_size, 4, 0, 0);
 +
 +	return 0;
 +}
@@ -411,12 +374,12 @@
 +	quadlet_t header, *p, *end;
 +	unsigned int len, cycle, dropped;
 +	unsigned char channel, tag, sy;
-+	unsigned char *data;
 +
 +	p = interrupt->header;
 +	end = (void *) interrupt->header + interrupt->header_length;
 +	cycle = interrupt->cycle;
 +	dropped = 0;
++	d = RAW1394_ISO_OK;
 +
 +	while (p < end) {
 +		header = be32_to_cpu(*p++);
@@ -435,13 +398,15 @@
 +
 +		handle->iso.tail += handle->iso.max_packet_size;
 +		handle->iso.packet_count--;
-+		if (handle->iso.tail == handle->iso.buffer_end)
++
++		if (handle->iso.tail + handle->iso.max_packet_size > handle->iso.buffer_end)
 +			handle->iso.tail = handle->iso.buffer;
 +	}
 +
 +	switch (d) {
 +	case RAW1394_ISO_OK:
 +	case RAW1394_ISO_DEFER:
++	default:
 +		break;
 +		
 +	case RAW1394_ISO_ERROR:
@@ -452,9 +417,7 @@
 +		return 0;		
 +	}
 +
-+	while (handle->iso.packet_count + handle->iso.irq_interval <=
-+	       handle->iso.buf_packets)
-+		queue_recv_packets(handle);
++	queue_recv_packets(handle);
 +
 +	return 0;
 +}
@@ -464,9 +427,7 @@
 +{
 +	struct fw_cdev_start_iso start_iso;
 +
-+	while (handle->iso.packet_count + handle->iso.irq_interval <=
-+	       handle->iso.buf_packets)
-+		queue_recv_packets(handle);
++	queue_recv_packets(handle);
 +
 +	start_iso.cycle = start_on_cycle;
 +	start_iso.tags =
@@ -494,7 +455,7 @@
 +	switch (handle->iso.type) {
 +	case FW_CDEV_ISO_CONTEXT_TRANSMIT:
 +		handle->iso.packet_count -= handle->iso.irq_interval;
-+		return flush_xmit_packets(handle, handle->iso.buf_packets);
++		return queue_xmit_packets(handle, handle->iso.buf_packets);
 +	case FW_CDEV_ISO_CONTEXT_RECEIVE:
 +		return flush_recv_packets(handle, interrupt);
 +	default:
@@ -511,15 +472,6 @@
 +	struct fw_cdev_start_iso start_iso;
 +	struct fw_cdev_iso_packet *p;
 +
-+	{
-+		int i;
-+		__u32 *p = (__u32 *) data;
-+
-+		for (i = 0; i < 10; i++)
-+			fprintf(stderr, "0x%08x ", p[i]);
-+		fprintf(stderr, "\n");
-+	}
-+
 +	if (len > handle->iso.max_packet_size) {
 +		errno = EINVAL;
 +		return -1;
@@ -529,43 +481,10 @@
 +	while (handle->iso.packet_count + handle->iso.irq_interval >
 +	       handle->iso.buf_packets)
 +		raw1394_loop_iterate(handle);
-+
-+	p = &handle->iso.packets[handle->iso.packet_header_index];
-+	p->payload_length = len;
-+	p->interrupt =
-+		handle->iso.packet_phase == handle->iso.irq_interval - 1;
-+	p->skip = 0;
-+	p->tag = tag;
-+	p->sy = sy;
-+	p->header_length = 0;
 +		
 +	memcpy(handle->iso.head, data, len);
-+
-+	handle->iso.head += len;
-+	handle->iso.packet_count++;
-+	handle->iso.packet_phase++;
-+	handle->iso.packet_header_index++;
-+
-+	if (handle->iso.packet_phase == handle->iso.irq_interval)
-+		handle->iso.packet_phase = 0;
-+
-+	if (handle->iso.head + handle->iso.max_packet_size > handle->iso.buffer_end)
-+		handle->iso.head = handle->iso.buffer;
-+
-+	/* Queue the packets in the kernel if we filled up the packets
-+	 * array or wrapped the payload buffer. */
-+	if (handle->iso.packet_header_index == handle->iso.irq_interval ||
-+	    handle->iso.head == handle->iso.buffer) {
-+		queue_iso.packets = ptr_to_u64(handle->iso.packets);
-+		queue_iso.size    = handle->iso.packet_header_index * sizeof handle->iso.packets[0];
-+		queue_iso.data    = ptr_to_u64(handle->iso.first_payload);
-+		handle->iso.packet_header_index = 0;
-+		handle->iso.first_payload = handle->iso.head;
-+
-+		len = ioctl(handle->iso.fd, FW_CDEV_IOC_QUEUE_ISO, &queue_iso);
-+		if (len < 0)
-+			return -1;
-+	}
++	if (queue_packet(handle, len, 0, tag, sy) < 0)
++		return -1;
 +
 +	/* Start the streaming if it's not already running and if
 +	 * we've buffered up enough packets. */
@@ -586,7 +505,39 @@
 +
 +int raw1394_iso_xmit_sync(raw1394handle_t handle)
 +{
-+	/* FIXME: queue a skip packet and wait for that interrupt. */
++	struct fw_cdev_iso_packet skip;
++	struct fw_cdev_queue_iso queue_iso;
++	int len;
++
++	skip.payload_length = 0;
++	skip.interrupt = 1;
++	skip.skip = 1;
++	skip.tag = 0;
++	skip.sy = 0;
++	skip.header_length = 0;
++
++	queue_iso.packets = ptr_to_u64(&skip);
++	queue_iso.size    = sizeof skip;
++	queue_iso.data    = 0;
++
++	len = ioctl(handle->iso.fd, FW_CDEV_IOC_QUEUE_ISO, &queue_iso);
++	if (len < 0)
++		return -1;
++
++	/* Now that we've queued the skip packet, we'll get an
++	 * interrupt when the transmit buffer is flushed, so all we do
++	 * here is wait. */
++	while (handle->iso.packet_count > 0)
++		raw1394_loop_iterate(handle);
++
++	/* The iso mainloop thinks that interrutps indicate another
++	 * irq_interval number of packets was sent, so the skip
++	 * interrupt makes it go out of whack.  We just reset it. */
++	handle->iso.head = handle->iso.buffer;
++	handle->iso.tail = handle->iso.buffer;
++	handle->iso.first_payload = handle->iso.buffer;
++	handle->iso.packet_phase = 0;
++	handle->iso.packet_count = 0;
 +
 +	return 0;
 +}
@@ -598,6 +549,18 @@
 +	return 0;
 +}
 +
++static unsigned int
++round_to_power_of_two(unsigned int value)
++{
++	unsigned int pot;
++
++	pot = 1;
++	while (pot < value)
++		pot <<= 1;
++
++	return pot;
++}
++
 +static int
 +iso_init(raw1394handle_t handle, int type,
 +	 raw1394_iso_xmit_handler_t xmit_handler,
@@ -617,6 +580,18 @@
 +		return -1;
 +	}
 +
++	switch (type) {
++	case FW_CDEV_ISO_CONTEXT_TRANSMIT:
++		prot = PROT_READ | PROT_WRITE;
++		break;
++	case FW_CDEV_ISO_CONTEXT_RECEIVE:
++		prot = PROT_READ;
++		break;
++	default:
++		errno = EINVAL;
++		return -1;
++	}
++
 +	handle->iso.type = type;
 +	if (irq_interval < 0)
 +		handle->iso.irq_interval = 256;
@@ -625,7 +600,7 @@
 +	handle->iso.xmit_handler = xmit_handler;
 +	handle->iso.recv_handler = recv_handler;
 +	handle->iso.buf_packets = buf_packets;
-+	handle->iso.max_packet_size = max_packet_size;
++	handle->iso.max_packet_size = round_to_power_of_two(max_packet_size);
 +	handle->iso.packet_phase = 0;
 +	handle->iso.packet_count = 0;
 +	handle->iso.packets =
@@ -662,15 +637,6 @@
 +		return retval;
 +	}
 +
-+	switch (type) {
-+	case FW_CDEV_ISO_CONTEXT_TRANSMIT:
-+		prot = PROT_READ | PROT_WRITE;
-+		break;
-+	case FW_CDEV_ISO_CONTEXT_RECEIVE:
-+		prot = PROT_READ;
-+		break;
-+	}
-+
 +	handle->iso.buffer =
 +		mmap(NULL, buf_packets * max_packet_size,
 +		     prot, MAP_SHARED, handle->iso.fd, 0);
@@ -769,10 +735,10 @@
 +}
 diff --git a/juju/raw1394.c b/juju/raw1394.c
 new file mode 100644
-index 0000000..fd5756d
+index 0000000..7f73b3b
 --- /dev/null
 +++ b/juju/raw1394.c
-@@ -0,0 +1,1440 @@
+@@ -0,0 +1,1441 @@
 +/*						-*- c-basic-offset: 8 -*-
 + *
 + * raw1394.c -- Emulation of the raw1394 API on the juju stack
@@ -804,6 +770,7 @@
 +#include <unistd.h>
 +#include <fcntl.h>
 +#include <errno.h>
++#include <arpa/inet.h> /* for ntohl and htonl */
 +
 +#include "juju.h"
 +
@@ -1840,7 +1807,7 @@
 +	case RAW1394_EXTCODE_WRAP_ADD:
 +		buffer[0] = arg;
 +		buffer[1] = data;
-+		return sizeof buffer;
++		return 2 * sizeof buffer[0];
 +
 +	default:
 +		errno = EINVAL;
@@ -1863,7 +1830,7 @@
 +	case RAW1394_EXTCODE_WRAP_ADD:
 +		buffer[0] = arg;
 +		buffer[1] = data;
-+		return sizeof buffer;
++		return 2 * sizeof buffer[0];
 +
 +	default:
 +		errno = EINVAL;


Index: libraw1394.spec
===================================================================
RCS file: /cvs/dist/rpms/libraw1394/devel/libraw1394.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- libraw1394.spec	4 Apr 2007 01:26:40 -0000	1.27
+++ libraw1394.spec	12 Apr 2007 21:24:30 -0000	1.28
@@ -1,7 +1,7 @@
 Summary:        Library providing low-level IEEE-1394 access
 Name:           libraw1394
 Version:        1.2.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 Source:         http://www.linux1394.org/dl/libraw1394-%{version}.tar.gz
@@ -28,7 +28,7 @@
 %prep
 %setup -q
 
-%patch0 -p0 -b .juju
+%patch0 -p1 -b .juju
 
 %build
 
@@ -75,6 +75,10 @@
 
 
 %changelog
+* Thu Apr 12 2007 Kristian H??gsberg <krh at redhat.com> - 1.2.1-5
+- Make rawiso support actually work.
+- Update fw-device-cdev.h to sync with latest kernel patch.
+
 * Tue Apr  3 2007 Kristian H??gsberg <krh at redhat.com> - 1.2.1-4
 - Update juju patch with rawiso support.
 



From fedora-cvs-commits at redhat.com  Thu Apr 12 21:26:03 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 17:26:03 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.3061,
	1.3062 linux-2.6-firewire.patch, 1.5, 1.6
Message-ID: <200704122126.l3CLQ3d9004159@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	kernel-2.6.spec linux-2.6-firewire.patch 
Log Message:
* Thu Apr 12 2007 Kristian H??gsberg <krh at redhat.com>
- Add a few more firewire bug fixes, incorporate last couple of
  changes to userspace interface.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3061
retrieving revision 1.3062
diff -u -r1.3061 -r1.3062
--- kernel-2.6.spec	12 Apr 2007 19:34:51 -0000	1.3061
+++ kernel-2.6.spec	12 Apr 2007 21:26:01 -0000	1.3062
@@ -572,11 +572,6 @@
 # a0ab4547b23c09541bc47a294a1397b3b0415bfe in the linux1394 git tree.
 Patch5000: linux-2.6-firewire.patch
 
-# These two are going upstream and will get folded into patch 5000,
-# this is just to get some testing ASAP.
-Patch5001: linux-2.6-firewire-context-run.patch
-Patch5002: linux-2.6-firewire-check-condition.patch
- 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
 # amount of drivers they touch. But only these should go here.
@@ -1284,8 +1279,6 @@
 
 # Pull in the new firewire stack
 %patch5000 -p1
-%patch5001 -p1
-%patch5002 -p1
 
 #
 # final stuff
@@ -2263,6 +2256,10 @@
 #  - tux.
 
 %changelog
+* Thu Apr 12 2007 Kristian H??gsberg <krh at redhat.com>
+- Add a few more firewire bug fixes, incorporate last couple of
+  changes to userspace interface.
+
 * Thu Apr 12 2007 Dave Jones <davej at redhat.com>
 - 2.6.21-rc6-git5
 

linux-2.6-firewire.patch:
 Makefile                  |    1 
 firewire/Kconfig          |   60 +
 firewire/Makefile         |   10 
 firewire/fw-card.c        |  542 +++++++++++++
 firewire/fw-device-cdev.c |  974 +++++++++++++++++++++++
 firewire/fw-device-cdev.h |  260 ++++++
 firewire/fw-device.c      |  780 ++++++++++++++++++
 firewire/fw-device.h      |  149 +++
 firewire/fw-iso.c         |  163 +++
 firewire/fw-ohci.c        | 1890 ++++++++++++++++++++++++++++++++++++++++++++++
 firewire/fw-ohci.h        |  153 +++
 firewire/fw-sbp2.c        | 1165 ++++++++++++++++++++++++++++
 firewire/fw-topology.c    |  519 ++++++++++++
 firewire/fw-topology.h    |   94 ++
 firewire/fw-transaction.c |  889 +++++++++++++++++++++
 firewire/fw-transaction.h |  505 ++++++++++++
 ieee1394/Kconfig          |    2 
 17 files changed, 8156 insertions(+)

Index: linux-2.6-firewire.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-firewire.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-firewire.patch	23 Mar 2007 19:43:59 -0000	1.5
+++ linux-2.6-firewire.patch	12 Apr 2007 21:26:01 -0000	1.6
@@ -94,10 +94,10 @@
 +obj-$(CONFIG_FIREWIRE_SBP2) += fw-sbp2.o
 diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
 new file mode 100644
-index 0000000..d929eb6
+index 0000000..3eb0655
 --- /dev/null
 +++ b/drivers/firewire/fw-card.c
-@@ -0,0 +1,536 @@
+@@ -0,0 +1,542 @@
 +/*						-*- c-basic-offset: 8 -*-
 + *
 + * fw-card.c - card level functions
@@ -260,7 +260,7 @@
 +		i += (desc->data[i] >> 16) + 1;
 +
 +	if (i != desc->length)
-+		return -1;
++		return -EINVAL;
 +
 +	down_write(&fw_bus_type.subsys.rwsem);
 +
@@ -495,9 +495,9 @@
 +	card->link_speed = link_speed;
 +	card->guid = guid;
 +
-+	/* FIXME: add #define's for phy registers. */
 +	/* Activate link_on bit and contender bit in our self ID packets.*/
-+	if (card->driver->update_phy_reg(card, 4, 0, 0x80 | 0x40) < 0)
++	if (card->driver->update_phy_reg(card, 4, 0,
++					 PHY_LINK_ACTIVE | PHY_CONTENDER) < 0)
 +		return -EIO;
 +
 +	/* The subsystem grabs a reference when the card is added and
@@ -583,7 +583,8 @@
 +void
 +fw_core_remove_card(struct fw_card *card)
 +{
-+	card->driver->update_phy_reg(card, 4, 0x80 | 0x40, 0);
++	card->driver->update_phy_reg(card, 4,
++				     PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
 +	fw_core_initiate_bus_reset(card, 1);
 +
 +	down_write(&fw_bus_type.subsys.rwsem);
@@ -631,15 +632,20 @@
 +int
 +fw_core_initiate_bus_reset(struct fw_card *card, int short_reset)
 +{
-+	return card->driver->update_phy_reg(card, short_reset ? 5 : 1, 0, 0x40);
++	int reg = short_reset ? 5 : 1;
++	/* The following values happen to be the same bit. However be
++	 * explicit for clarity. */
++	int bit = short_reset ? PHY_BUS_SHORT_RESET : PHY_BUS_RESET;
++
++	return card->driver->update_phy_reg(card, reg, 0, bit);
 +}
 +EXPORT_SYMBOL(fw_core_initiate_bus_reset);
 diff --git a/drivers/firewire/fw-device-cdev.c b/drivers/firewire/fw-device-cdev.c
 new file mode 100644
-index 0000000..f9f2688
+index 0000000..fab6dfb
 --- /dev/null
 +++ b/drivers/firewire/fw-device-cdev.c
-@@ -0,0 +1,879 @@
+@@ -0,0 +1,974 @@
 +/*						-*- c-basic-offset: 8 -*-
 + *
 + * fw-device-cdev.c - Char device for device raw access
@@ -678,16 +684,16 @@
 +#include "fw-device.h"
 +#include "fw-device-cdev.h"
 +
-+/*
-+ * todo
-+ *
-+ * - bus resets sends a new packet with new generation and node id
-+ *
-+ */
-+
 +/* dequeue_event() just kfree()'s the event, so the event has to be
 + * the first field in the struct. */
 +
++struct client;
++struct client_resource {
++	struct list_head link;
++	void (*release)(struct client *client, struct client_resource *r);
++	u32 handle;
++};
++
 +struct event {
 +	struct { void *data; size_t size; } v[2];
 +	struct list_head link;
@@ -702,7 +708,7 @@
 +	struct event event;
 +	struct fw_transaction transaction;
 +	struct client *client;
-+	struct list_head link;
++	struct client_resource resource;
 +	struct fw_cdev_event_response response;
 +};
 +
@@ -715,12 +721,11 @@
 +	u32 version;
 +	struct fw_device *device;
 +	spinlock_t lock;
-+	struct list_head handler_list;
-+	struct list_head request_list;
-+	struct list_head transaction_list;
-+	u32 request_serial;
++	u32 resource_handle;
++	struct list_head resource_list;
 +	struct list_head event_list;
 +	wait_queue_head_t wait;
++	u64 bus_reset_closure;
 +
 +	struct fw_iso_context *iso_context;
 +	struct fw_iso_buffer buffer;
@@ -757,9 +762,7 @@
 +
 +	client->device = fw_device_get(device);
 +	INIT_LIST_HEAD(&client->event_list);
-+	INIT_LIST_HEAD(&client->handler_list);
-+	INIT_LIST_HEAD(&client->request_list);
-+	INIT_LIST_HEAD(&client->transaction_list);
++	INIT_LIST_HEAD(&client->resource_list);
 +	spin_lock_init(&client->lock);
 +	init_waitqueue_head(&client->wait);
 +
@@ -841,12 +844,13 @@
 +
 +static void
 +fill_bus_reset_event(struct fw_cdev_event_bus_reset *event,
-+		     struct fw_device *device)
++		     struct client *client)
 +{
-+	struct fw_card *card = device->card;
++	struct fw_card *card = client->device->card;
 +
++	event->closure	     = client->bus_reset_closure;
 +	event->type          = FW_CDEV_EVENT_BUS_RESET;
-+	event->node_id       = device->node_id;
++	event->node_id       = client->device->node_id;
 +	event->local_node_id = card->local_node->node_id;
 +	event->bm_node_id    = 0; /* FIXME: We don't track the BM. */
 +	event->irm_node_id   = card->irm_node->node_id;
@@ -874,7 +878,6 @@
 +queue_bus_reset_event(struct client *client)
 +{
 +	struct bus_reset *bus_reset;
-+	struct fw_device *device = client->device;
 +
 +	bus_reset = kzalloc(sizeof *bus_reset, GFP_ATOMIC);
 +	if (bus_reset == NULL) {
@@ -882,7 +885,7 @@
 +		return;
 +	}
 +
-+	fill_bus_reset_event(&bus_reset->reset, device);
++	fill_bus_reset_event(&bus_reset->reset, client);
 +
 +	queue_event(client, &bus_reset->event,
 +		    &bus_reset->reset, sizeof bus_reset->reset, NULL, 0);
@@ -925,10 +928,11 @@
 +	}
 +	get_info.rom_length = client->device->config_rom_length * 4;
 +
++	client->bus_reset_closure = get_info.bus_reset_closure;
 +	if (get_info.bus_reset != 0) {
 +		void __user *uptr = u64_to_uptr(get_info.bus_reset);
 +
-+		fill_bus_reset_event(&bus_reset, client->device);
++		fill_bus_reset_event(&bus_reset, client);
 +		if (copy_to_user(uptr, &bus_reset, sizeof bus_reset))
 +			return -EFAULT;
 +	}
@@ -942,6 +946,53 @@
 +}
 +
 +static void
++add_client_resource(struct client *client, struct client_resource *resource)
++{
++	unsigned long flags;
++
++	spin_lock_irqsave(&client->lock, flags);
++	list_add_tail(&resource->link, &client->resource_list);
++	resource->handle = client->resource_handle++;
++	spin_unlock_irqrestore(&client->lock, flags);
++}
++
++static int
++release_client_resource(struct client *client, u32 handle,
++			struct client_resource **resource)
++{
++	struct client_resource *r;
++	unsigned long flags;
++
++	spin_lock_irqsave(&client->lock, flags);
++	list_for_each_entry(r, &client->resource_list, link) {
++		if (r->handle == handle) {
++			list_del(&r->link);
++			break;
++		}
++	}
++	spin_unlock_irqrestore(&client->lock, flags);
++
++	if (&r->link == &client->resource_list)
++		return -EINVAL;
++
++	if (resource)
++		*resource = r;
++	else
++		r->release(client, r);
++
++	return 0;
++}
++
++static void
++release_transaction(struct client *client, struct client_resource *resource)
++{
++	struct response *response =
++		container_of(resource, struct response, resource);
++
++	fw_cancel_transaction(client->device->card, &response->transaction);
++}
++
++static void
 +complete_transaction(struct fw_card *card, int rcode,
 +		     void *payload, size_t length, void *data)
 +{
@@ -956,7 +1007,7 @@
 +		       response->response.length);
 +
 +	spin_lock_irqsave(&client->lock, flags);
-+	list_del(&response->link);
++	list_del(&response->resource.link);
 +	spin_unlock_irqrestore(&client->lock, flags);
 +
 +	response->response.type   = FW_CDEV_EVENT_RESPONSE;
@@ -971,7 +1022,6 @@
 +	struct fw_device *device = client->device;
 +	struct fw_cdev_send_request request;
 +	struct response *response;
-+	unsigned long flags;
 +
 +	if (copy_from_user(&request, arg, sizeof request))
 +		return -EFAULT;
@@ -995,9 +1045,8 @@
 +		return -EFAULT;
 +	}
 +
-+	spin_lock_irqsave(&client->lock, flags);
-+	list_add_tail(&response->link, &client->transaction_list);
-+	spin_unlock_irqrestore(&client->lock, flags);
++	response->resource.release = release_transaction;
++	add_client_resource(client, &response->resource);
 +
 +	fw_send_request(device->card, &response->transaction,
 +			request.tcode & 0x1f,
@@ -1018,15 +1067,14 @@
 +	struct fw_address_handler handler;
 +	__u64 closure;
 +	struct client *client;
-+	struct list_head link;
++	struct client_resource resource;
 +};
 +
 +struct request {
 +	struct fw_request *request;
 +	void *data;
 +	size_t length;
-+	u32 serial;
-+	struct list_head link;
++	struct client_resource resource;
 +};
 +
 +struct request_event {
@@ -1035,6 +1083,17 @@
 +};
 +
 +static void
++release_request(struct client *client, struct client_resource *resource)
++{
++	struct request *request =
++		container_of(resource, struct request, resource);
++
++	fw_send_response(client->device->card, request->request,
++			 RCODE_CONFLICT_ERROR);
++	kfree(request);
++}
++
++static void
 +handle_request(struct fw_card *card, struct fw_request *r,
 +	       int tcode, int destination, int source,
 +	       int generation, int speed,
@@ -1044,7 +1103,6 @@
 +	struct address_handler *handler = callback_data;
 +	struct request *request;
 +	struct request_event *e;
-+	unsigned long flags;
 +	struct client *client = handler->client;
 +
 +	request = kmalloc(sizeof *request, GFP_ATOMIC);
@@ -1060,27 +1118,35 @@
 +	request->data    = payload;
 +	request->length  = length;
 +
-+	spin_lock_irqsave(&client->lock, flags);
-+	request->serial = client->request_serial++;
-+	list_add_tail(&request->link, &client->request_list);
-+	spin_unlock_irqrestore(&client->lock, flags);
++	request->resource.release = release_request;
++	add_client_resource(client, &request->resource);
 +
 +	e->request.type    = FW_CDEV_EVENT_REQUEST;
 +	e->request.tcode   = tcode;
 +	e->request.offset  = offset;
 +	e->request.length  = length;
-+	e->request.serial  = request->serial;
++	e->request.handle  = request->resource.handle;
 +	e->request.closure = handler->closure;
 +
 +	queue_event(client, &e->event,
 +		    &e->request, sizeof e->request, payload, length);
 +}
 +
++static void
++release_address_handler(struct client *client,
++			struct client_resource *resource)
++{
++	struct address_handler *handler =
++		container_of(resource, struct address_handler, resource);
++
++	fw_core_remove_address_handler(&handler->handler);
++	kfree(handler);
++}
++
 +static int ioctl_allocate(struct client *client, void __user *arg)
 +{
 +	struct fw_cdev_allocate request;
 +	struct address_handler *handler;
-+	unsigned long flags;
 +	struct fw_address_region region;
 +
 +	if (copy_from_user(&request, arg, sizeof request))
@@ -1103,9 +1169,12 @@
 +		return -EBUSY;
 +	}
 +
-+	spin_lock_irqsave(&client->lock, flags);
-+	list_add_tail(&handler->link, &client->handler_list);
-+	spin_unlock_irqrestore(&client->lock, flags);
++	handler->resource.release = release_address_handler;
++	add_client_resource(client, &handler->resource);
++	request.handle = handler->resource.handle;
++
++	if (copy_to_user(arg, &request, sizeof request))
++		return -EFAULT;
 +
 +	return 0;
 +}
@@ -1113,57 +1182,30 @@
 +static int ioctl_deallocate(struct client *client, void __user *arg)
 +{
 +	struct fw_cdev_deallocate request;
-+	struct address_handler *handler;
-+	unsigned long flags;
 +
 +	if (copy_from_user(&request, arg, sizeof request))
 +		return -EFAULT;
 +
-+	spin_lock_irqsave(&client->lock, flags);
-+	list_for_each_entry(handler, &client->handler_list, link) {
-+		if (handler->handler.offset == request.offset) {
-+			list_del(&handler->link);
-+			break;
-+		}
-+	}
-+	spin_unlock_irqrestore(&client->lock, flags);
-+
-+	if (&handler->link == &client->handler_list)
-+		return -EINVAL;
-+
-+	fw_core_remove_address_handler(&handler->handler);
-+
-+	return 0;
++	return release_client_resource(client, request.handle, NULL);
 +}
 +
 +static int ioctl_send_response(struct client *client, void __user *arg)
 +{
 +	struct fw_cdev_send_response request;
++	struct client_resource *resource;
 +	struct request *r;
-+	unsigned long flags;
 +
 +	if (copy_from_user(&request, arg, sizeof request))
 +		return -EFAULT;
-+
-+	spin_lock_irqsave(&client->lock, flags);
-+	list_for_each_entry(r, &client->request_list, link) {
-+		if (r->serial == request.serial) {
-+			list_del(&r->link);
-+			break;
-+		}
-+	}
-+	spin_unlock_irqrestore(&client->lock, flags);
-+
-+	if (&r->link == &client->request_list)
++	if (release_client_resource(client, request.handle, &resource) < 0)
 +		return -EINVAL;
-+
++	r = container_of(resource, struct request, resource);
 +	if (request.length < r->length)
 +		r->length = request.length;
 +	if (copy_from_user(r->data, u64_to_uptr(request.data), r->length))
 +		return -EFAULT;
 +
 +	fw_send_response(client->device->card, r->request, request.rcode);
-+
 +	kfree(r);
 +
 +	return 0;
@@ -1182,6 +1224,76 @@
 +	return fw_core_initiate_bus_reset(client->device->card, short_reset);
 +}
 +
++struct descriptor {
++	struct fw_descriptor d;
++	struct client_resource resource;
++	u32 data[0];
++};
++
++static void release_descriptor(struct client *client,
++			       struct client_resource *resource)
++{
++	struct descriptor *descriptor =
++		container_of(resource, struct descriptor, resource);
++
++	fw_core_remove_descriptor(&descriptor->d);
++	kfree(descriptor);
++}
++
++static int ioctl_add_descriptor(struct client *client, void __user *arg)
++{
++	struct fw_cdev_add_descriptor request;
++	struct descriptor *descriptor;
++	int retval;
++
++	if (copy_from_user(&request, arg, sizeof request))
++		return -EFAULT;
++
++	if (request.length > 256)
++		return -EINVAL;
++
++	descriptor =
++		kmalloc(sizeof *descriptor + request.length * 4, GFP_KERNEL);
++	if (descriptor == NULL)
++		return -ENOMEM;
++
++	if (copy_from_user(descriptor->data,
++			   u64_to_uptr(request.data), request.length * 4)) {
++		kfree(descriptor);
++		return -EFAULT;
++	}
++
++	descriptor->d.length = request.length;
++	descriptor->d.immediate = request.immediate;
++	descriptor->d.key = request.key;
++	descriptor->d.data = descriptor->data;
++
++	retval = fw_core_add_descriptor(&descriptor->d);
++	if (retval < 0) {
++		kfree(descriptor);
++		return retval;
++	}
++
++	descriptor->resource.release = release_descriptor;
++	add_client_resource(client, &descriptor->resource);
++	request.handle = descriptor->resource.handle;
++
++	if (copy_to_user(arg, &request, sizeof request))
++		return -EFAULT;
++
++	return 0;
++}
++
++static int ioctl_remove_descriptor(struct client *client, void __user *arg)
++{
++	struct fw_cdev_remove_descriptor request;
++
++	if (copy_from_user(&request, arg, sizeof request))
++		return -EFAULT;
++
++	return release_client_resource(client, request.handle, NULL);
++}
++
 +static void
 +iso_callback(struct fw_iso_context *context, u32 cycle,
 +	     size_t header_length, void *header, void *data)
@@ -1247,7 +1359,7 @@
 +	struct fw_cdev_queue_iso request;
 +	struct fw_cdev_iso_packet __user *p, *end, *next;
 +	struct fw_iso_context *ctx = client->iso_context;
-+	unsigned long payload, payload_end, header_length;
++	unsigned long payload, buffer_end, header_length;
 +	int count;
 +	struct {
 +		struct fw_iso_packet packet;
@@ -1268,11 +1380,11 @@
 +	 * and the request.data pointer is ignored.*/
 +
 +	payload = (unsigned long)request.data - client->vm_start;
-+	payload_end = payload + (client->buffer.page_count << PAGE_SHIFT);
++	buffer_end = client->buffer.page_count << PAGE_SHIFT;
 +	if (request.data == 0 || client->buffer.pages == NULL ||
-+	    payload >= payload_end) {
++	    payload >= buffer_end) {
 +		payload = 0;
-+		payload_end = 0;
++		buffer_end = 0;
 +	}
 +
 +	if (!access_ok(VERIFY_READ, request.packets, request.size))
@@ -1309,7 +1421,7 @@
 +		if (u.packet.skip && ctx->type == FW_ISO_CONTEXT_TRANSMIT &&
 +		    u.packet.header_length + u.packet.payload_length > 0)
 +			return -EINVAL;
-+		if (payload + u.packet.payload_length > payload_end)
++		if (payload + u.packet.payload_length > buffer_end)
 +			return -EINVAL;
 +
 +		if (fw_iso_context_queue(ctx, &u.packet,
@@ -1371,6 +1483,10 @@
 +		return ioctl_send_response(client, arg);
 +	case FW_CDEV_IOC_INITIATE_BUS_RESET:
 +		return ioctl_initiate_bus_reset(client, arg);
++	case FW_CDEV_IOC_ADD_DESCRIPTOR:
++		return ioctl_add_descriptor(client, arg);
++	case FW_CDEV_IOC_REMOVE_DESCRIPTOR:
++		return ioctl_remove_descriptor(client, arg);
 +	case FW_CDEV_IOC_CREATE_ISO_CONTEXT:
 +		return ioctl_create_iso_context(client, arg);
 +	case FW_CDEV_IOC_QUEUE_ISO:
@@ -1447,10 +1563,8 @@
 +static int fw_device_op_release(struct inode *inode, struct file *file)
 +{
 +	struct client *client = file->private_data;
-+	struct address_handler *h, *next_h;
-+	struct request *r, *next_r;
 +	struct event *e, *next_e;
-+	struct response *t, *next_t;
++	struct client_resource *r, *next_r;
 +	unsigned long flags;
 +
 +	if (client->buffer.pages)
@@ -1459,21 +1573,8 @@
 +	if (client->iso_context)
 +		fw_iso_context_destroy(client->iso_context);
 +
-+	list_for_each_entry_safe(h, next_h, &client->handler_list, link) {
-+		fw_core_remove_address_handler(&h->handler);
-+		kfree(h);
-+	}
-+
-+	list_for_each_entry_safe(r, next_r, &client->request_list, link) {
-+		fw_send_response(client->device->card, r->request,
-+				 RCODE_CONFLICT_ERROR);
-+		kfree(r);
-+	}
-+
-+	list_for_each_entry_safe(t, next_t, &client->transaction_list, link) {
-+		fw_cancel_transaction(client->device->card, &t->transaction);
-+		kfree(t);
-+	}
++	list_for_each_entry_safe(r, next_r, &client->resource_list, link)
++		r->release(client, r);
 +
 +	/* FIXME: We should wait for the async tasklets to stop
 +	 * running before freeing the memory. */
@@ -1521,10 +1622,10 @@
 +};
 diff --git a/drivers/firewire/fw-device-cdev.h b/drivers/firewire/fw-device-cdev.h
 new file mode 100644
-index 0000000..10b8322
+index 0000000..a6340bf
 --- /dev/null
 +++ b/drivers/firewire/fw-device-cdev.h
-@@ -0,0 +1,226 @@
+@@ -0,0 +1,260 @@
 +/*						-*- c-basic-offset: 8 -*-
 + *
 + * fw-device-cdev.h -- Char device interface.
@@ -1601,7 +1702,13 @@
 + * event.  It's a 64-bit type so that it's a fixed size type big
 + * enough to hold a pointer on all platforms. */
 +
++struct fw_cdev_event_common {
++	__u64 closure;
++	__u32 type;
++};
++
 +struct fw_cdev_event_bus_reset {
++	__u64 closure;
 +	__u32 type;
 +	__u32 node_id;
 +	__u32 local_node_id;
@@ -1612,41 +1719,52 @@
 +};
 +
 +struct fw_cdev_event_response {
++	__u64 closure;
 +	__u32 type;
 +	__u32 rcode;
-+	__u64 closure;
 +	__u32 length;
 +	__u32 data[0];
 +};
 +
 +struct fw_cdev_event_request {
++	__u64 closure;
 +	__u32 type;
 +	__u32 tcode;
 +	__u64 offset;
-+	__u64 closure;
-+	__u32 serial;
++	__u32 handle;
 +	__u32 length;
 +	__u32 data[0];
 +};
 +
 +struct fw_cdev_event_iso_interrupt {
++	__u64 closure;
 +	__u32 type;
 +	__u32 cycle;
-+	__u64 closure;
 +	__u32 header_length;	/* Length in bytes of following headers. */
 +	__u32 header[0];
 +};
 +
++union fw_cdev_event {
++	struct fw_cdev_event_common common;
++	struct fw_cdev_event_bus_reset bus_reset;
++	struct fw_cdev_event_response response;
++	struct fw_cdev_event_request request;
++	struct fw_cdev_event_iso_interrupt iso_interrupt;
++};
++
 +#define FW_CDEV_IOC_GET_INFO		_IO('#', 0x00)
 +#define FW_CDEV_IOC_SEND_REQUEST	_IO('#', 0x01)
 +#define FW_CDEV_IOC_ALLOCATE		_IO('#', 0x02)
 +#define FW_CDEV_IOC_DEALLOCATE		_IO('#', 0x03)
 +#define FW_CDEV_IOC_SEND_RESPONSE	_IO('#', 0x04)
 +#define FW_CDEV_IOC_INITIATE_BUS_RESET	_IO('#', 0x05)
-+#define FW_CDEV_IOC_CREATE_ISO_CONTEXT	_IO('#', 0x06)
-+#define FW_CDEV_IOC_QUEUE_ISO		_IO('#', 0x07)
-+#define FW_CDEV_IOC_START_ISO		_IO('#', 0x08)
-+#define FW_CDEV_IOC_STOP_ISO		_IO('#', 0x09)
++#define FW_CDEV_IOC_ADD_DESCRIPTOR	_IO('#', 0x06)
++#define FW_CDEV_IOC_REMOVE_DESCRIPTOR	_IO('#', 0x07)
++
++#define FW_CDEV_IOC_CREATE_ISO_CONTEXT	_IO('#', 0x08)
++#define FW_CDEV_IOC_QUEUE_ISO		_IO('#', 0x09)
++#define FW_CDEV_IOC_START_ISO		_IO('#', 0x0a)
++#define FW_CDEV_IOC_STOP_ISO		_IO('#', 0x0b)
 +
 +/* FW_CDEV_VERSION History
 + *
@@ -1672,8 +1790,12 @@
 +	__u64 rom;
 +
 +	/* If non-zero, a fw_cdev_event_bus_reset struct will be
-+	 * copied here with the current state of the bus. */
++	 * copied here with the current state of the bus.  This does
++	 * not cause a bus reset to happen.  The value of closure in
++	 * this and sub-sequent bus reset events is set to
++	 * bus_reset_closure. */
 +	__u64 bus_reset;
++	__u64 bus_reset_closure;
 +
 +	/* The index of the card this devices belongs to. */
 +	__u32 card;
@@ -1692,17 +1814,18 @@
 +	__u32 rcode;
 +	__u32 length;
 +	__u64 data;
-+	__u32 serial;
++	__u32 handle;
 +};
 +
 +struct fw_cdev_allocate {
 +	__u64 offset;
 +	__u64 closure;
 +	__u32 length;
++	__u32 handle;
 +};
 +
 +struct fw_cdev_deallocate {
-+	__u64 offset;
++	__u32 handle;
 +};
 +
 +#define FW_CDEV_LONG_RESET	0
@@ -1712,6 +1835,18 @@
 +	__u32 type;
 +};
 +
++struct fw_cdev_add_descriptor {
++	__u32 immediate;
++	__u32 key;
++	__u64 data;
++	__u32 length;
++	__u32 handle;
++};
++
++struct fw_cdev_remove_descriptor {
++	__u32 handle;
++};
++
 +#define FW_CDEV_ISO_CONTEXT_TRANSMIT	0
 +#define FW_CDEV_ISO_CONTEXT_RECEIVE	1
 +
@@ -1739,9 +1874,9 @@
 +};
 +
 +struct fw_cdev_queue_iso {
-+	__u32 size;
 +	__u64 packets;
 +	__u64 data;
++	__u32 size;
 +};
 +
 +struct fw_cdev_start_iso {
@@ -1753,10 +1888,10 @@
 +#endif /* __fw_cdev_h */
 diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c
 new file mode 100644
-index 0000000..2bf86aa
+index 0000000..7197657
 --- /dev/null
 +++ b/drivers/firewire/fw-device.c
-@@ -0,0 +1,795 @@
+@@ -0,0 +1,780 @@
 +/*						-*- c-basic-offset: 8 -*-
 + *
 + * fw-device.c - Device probing and sysfs code.
@@ -2048,32 +2183,29 @@
 +};
 +
 +static void
-+remove_config_rom_attributes(struct device *dev)
-+{
-+	int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(config_rom_attributes); i++)
-+		device_remove_file(dev, &config_rom_attributes[i].attr);
-+}
-+
-+static int
-+add_config_rom_attributes(struct device *dev)
++init_fw_attribute_group(struct device *dev,
++			struct device_attribute *attrs,
++			struct fw_attribute_group *group)
 +{
 +	struct device_attribute *attr;
-+	int i, err = 0;
++	int i, j;
++
++	for (j = 0; attrs[j].attr.name != NULL; j++)
++		group->attrs[j] = &attrs[j].attr;
 +
 +	for (i = 0; i < ARRAY_SIZE(config_rom_attributes); i++) {
 +		attr = &config_rom_attributes[i].attr;
 +		if (attr->show(dev, attr, NULL) < 0)
 +			continue;
-+		err = device_create_file(dev, attr);
-+		if (err < 0) {
-+			remove_config_rom_attributes(dev);
-+			break;
-+		}
++		group->attrs[j++] = &attr->attr;
 +	}
 +
-+	return err;
++	BUG_ON(j >= ARRAY_SIZE(group->attrs));
++	group->attrs[j++] = NULL;
++	group->groups[0] = &group->group;
++	group->groups[1] = NULL;
++	group->group.attrs = group->attrs;
++	dev->groups = group->groups;
 +}
 +
 +static ssize_t
@@ -2256,7 +2388,6 @@
 +}
 +
 +static struct device_type fw_unit_type = {
-+	.attrs		= fw_unit_attributes,
 +	.uevent		= fw_unit_uevent,
 +	.release	= fw_unit_release,
 +};
@@ -2293,16 +2424,14 @@
 +		snprintf(unit->device.bus_id, sizeof unit->device.bus_id,
 +			 "%s.%d", device->device.bus_id, i++);
 +
++		init_fw_attribute_group(&unit->device,
++					fw_unit_attributes,
++					&unit->attribute_group);
 +		if (device_register(&unit->device) < 0)
 +			goto skip_unit;
 +
-+		if (add_config_rom_attributes(&unit->device) < 0)
-+			goto skip_unregister;
-+
 +		continue;
 +
-+	skip_unregister:
-+		device_unregister(&unit->device);
 +	skip_unit:
 +		kfree(unit);
 +	}
@@ -2310,9 +2439,6 @@
 +
 +static int shutdown_unit(struct device *device, void *data)
 +{
-+	struct fw_unit *unit = fw_unit(device);
-+
-+	remove_config_rom_attributes(&unit->device);
 +	device_unregister(device);
 +
 +	return 0;
@@ -2342,15 +2468,12 @@
 +	idr_remove(&fw_device_idr, minor);
 +	up_write(&fw_bus_type.subsys.rwsem);
 +
-+	remove_config_rom_attributes(&device->device);
-+
 +	fw_device_cdev_remove(device);
 +	device_for_each_child(&device->device, NULL, shutdown_unit);
 +	device_unregister(&device->device);
 +}
 +
 +static struct device_type fw_device_type = {
-+	.attrs		= fw_device_attributes,
 +	.release	= fw_device_release,
 +};
 +
@@ -2363,8 +2486,8 @@
 + * aggressive than that, since it scales pretty well; if 10 devices
 + * are plugged in, they're all getting read within one second. */
 +
-+#define MAX_RETRIES	5
-+#define RETRY_DELAY	(2 * HZ)
++#define MAX_RETRIES	10
++#define RETRY_DELAY	(3 * HZ)
 +#define INITIAL_DELAY	(HZ / 2)
 +
 +static void fw_device_init(struct work_struct *work)
@@ -2406,15 +2529,14 @@
 +	snprintf(device->device.bus_id, sizeof device->device.bus_id,
 +		 "fw%d", minor);
 +
++	init_fw_attribute_group(&device->device,
++				fw_device_attributes,
++				&device->attribute_group);
 +	if (device_add(&device->device)) {
 +		fw_error("Failed to add device.\n");
 +		goto error_with_cdev;
 +	}
 +
-+	err = add_config_rom_attributes(&device->device);
-+	if (err < 0)
-+		goto error_with_register;
-+
 +	create_units(device);
 +
 +	/* Transition the device to running state.  If it got pulled
@@ -2441,8 +2563,6 @@
 +
 +	return;
 +
-+ error_with_register:
-+	device_unregister(&device->device);
 + error_with_cdev:
 +	down_write(&fw_bus_type.subsys.rwsem);
 +	idr_remove(&fw_device_idr, minor);
@@ -2554,10 +2674,10 @@
 +}
 diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h
 new file mode 100644
-index 0000000..ce47ab9
+index 0000000..c167d59
 --- /dev/null
 +++ b/drivers/firewire/fw-device.h
-@@ -0,0 +1,141 @@
+@@ -0,0 +1,149 @@
 +/*						-*- c-basic-offset: 8 -*-
 + *
 + * fw-device.h - Device probing and sysfs code.
@@ -2592,6 +2712,12 @@
 +	FW_DEVICE_SHUTDOWN,
 +};
 +
++struct fw_attribute_group {
++	struct attribute_group *groups[2];
++	struct attribute_group group;
++	struct attribute *attrs[11];
++};
++
 +struct fw_device {
 +	atomic_t state;
 +	struct fw_node *node;
@@ -2605,6 +2731,7 @@
 +	size_t config_rom_length;
 +	int config_rom_retries;
 +	struct delayed_work work;
++	struct fw_attribute_group attribute_group;
 +};
 +
 +static inline struct fw_device *
@@ -2632,6 +2759,7 @@
 +struct fw_unit {
 +	struct device device;
 +	u32 *directory;
++	struct fw_attribute_group attribute_group;
 +};
 +
 +static inline struct fw_unit *
@@ -2870,10 +2998,10 @@
 +EXPORT_SYMBOL(fw_iso_context_stop);
 diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
 new file mode 100644
-index 0000000..abb9dc1
+index 0000000..b941239
 --- /dev/null
 +++ b/drivers/firewire/fw-ohci.c
-@@ -0,0 +1,1885 @@
+@@ -0,0 +1,1890 @@
 +/*						-*- c-basic-offset: 8 -*-
 + *
 + * fw-ohci.c - Driver for OHCI 1394 boards
@@ -3504,6 +3632,7 @@
 +
 +	driver_data = (struct driver_data *) &d[3];
 +	driver_data->packet = packet;
++	packet->driver_data = driver_data;
 +	
 +	if (packet->payload_length > 0) {
 +		payload_bus =
@@ -4237,28 +4366,32 @@
 +{
 +	struct iso_context *ctx = container_of(base, struct iso_context, base);
 +	struct fw_ohci *ohci = ctx->context.ohci;
-+	u32 cycle_match = 0;
++	u32 control, match;
 +	int index;
 +
 +	if (ctx->base.type == FW_ISO_CONTEXT_TRANSMIT) {
 +		index = ctx - ohci->it_context_list;
-+		if (cycle > 0)
-+			cycle_match = IT_CONTEXT_CYCLE_MATCH_ENABLE |
++		match = 0;
++		if (cycle >= 0)
++			match = IT_CONTEXT_CYCLE_MATCH_ENABLE |
 +				(cycle & 0x7fff) << 16;
 +
 +		reg_write(ohci, OHCI1394_IsoXmitIntEventClear, 1 << index);
 +		reg_write(ohci, OHCI1394_IsoXmitIntMaskSet, 1 << index);
-+		context_run(&ctx->context, cycle_match);
++		context_run(&ctx->context, match);
 +	} else {
 +		index = ctx - ohci->ir_context_list;
++		control = IR_CONTEXT_DUAL_BUFFER_MODE | IR_CONTEXT_ISOCH_HEADER;
++		match = (tags << 28) | (sync << 8) | ctx->base.channel;
++		if (cycle >= 0) {
++			match |= (cycle & 0x07fff) << 12;
++			control |= IR_CONTEXT_CYCLE_MATCH_ENABLE;
++		}
 +
 +		reg_write(ohci, OHCI1394_IsoRecvIntEventClear, 1 << index);
 +		reg_write(ohci, OHCI1394_IsoRecvIntMaskSet, 1 << index);
-+		reg_write(ohci, context_match(ctx->context.regs),
-+			  (tags << 28) | (sync << 8) | ctx->base.channel);
-+		context_run(&ctx->context,
-+			    IR_CONTEXT_DUAL_BUFFER_MODE |
-+			    IR_CONTEXT_ISOCH_HEADER);
++		reg_write(ohci, context_match(ctx->context.regs), match);
++		context_run(&ctx->context, control);
 +	}
 +
 +	return 0;
@@ -6091,10 +6224,10 @@
 +module_exit(sbp2_cleanup);
 diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/fw-topology.c
 new file mode 100644
-index 0000000..7923463
+index 0000000..bc8a348
 --- /dev/null
 +++ b/drivers/firewire/fw-topology.c
-@@ -0,0 +1,518 @@
+@@ -0,0 +1,519 @@
 +/*						-*- c-basic-offset: 8 -*-
 + *
 + * fw-topology.c - Incremental bus scan, based on bus topology
@@ -6263,7 +6396,7 @@
 +static struct fw_node *build_tree(struct fw_card *card,
 +				  u32 *sid, int self_id_count)
 +{
-+	struct fw_node *node, *child, *local_node;
++	struct fw_node *node, *child, *local_node, *irm_node;
 +	struct list_head stack, *h;
 +	u32 *next_sid, *end, q;
 +	int i, port_count, child_port_count, phy_id, parent_count, stack_depth;
@@ -6275,7 +6408,7 @@
 +	stack_depth = 0;
 +	end = sid + self_id_count;
 +	phy_id = 0;
-+	card->irm_node = NULL;
++	irm_node = NULL;
 +	gap_count = self_id_gap_count(*sid);
 +	topology_type = 0;
 +
@@ -6315,7 +6448,7 @@
 +			local_node = node;
 +
 +		if (self_id_contender(q))
-+			card->irm_node = node;
++			irm_node = node;
 +
 +		if (node->phy_speed == SCODE_BETA)
 +			topology_type |= FW_TOPOLOGY_B;
@@ -6379,6 +6512,7 @@
 +	}
 +
 +	card->root_node = node;
++	card->irm_node = irm_node;
 +	card->gap_count = gap_count;
 +	card->topology_type = topology_type;
 +
@@ -7610,10 +7744,10 @@
 +module_exit(fw_core_cleanup);
 diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h
 new file mode 100644
-index 0000000..6621497
+index 0000000..6352734
 --- /dev/null
 +++ b/drivers/firewire/fw-transaction.h
-@@ -0,0 +1,499 @@
+@@ -0,0 +1,505 @@
 +/*						-*- c-basic-offset: 8 -*-
 + *
 + * fw-transaction.h - Header for IEEE1394 transaction logic
@@ -7723,6 +7857,12 @@
 +#define PHY_PACKET_LINK_ON	0x1
 +#define PHY_PACKET_SELF_ID	0x2
 +
++/* Bit fields _within_ the PHY registers. */
++#define PHY_LINK_ACTIVE		0x80
++#define PHY_CONTENDER		0x40
++#define PHY_BUS_RESET		0x40
++#define PHY_BUS_SHORT_RESET	0x40
++
 +#define CSR_REGISTER_BASE		0xfffff0000000ULL
 +
 +/* register offsets relative to CSR_REGISTER_BASE */



From fedora-cvs-commits at redhat.com  Thu Apr 12 21:30:04 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 17:30:04 -0400
Subject: rpms/libraw1394/devel libraw1394.spec,1.28,1.29
Message-ID: <200704122130.l3CLU42d007046@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/libraw1394/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7017

Modified Files:
	libraw1394.spec 
Log Message:
* Thu Apr 12 2007 Kristian H??gsberg <krh at redhat.com> - 1.2.1-5
- Make rawiso support actually work.
- Update fw-device-cdev.h to sync with latest kernel patch.
- Add Requires to pull in a recent enough kernel.



Index: libraw1394.spec
===================================================================
RCS file: /cvs/dist/rpms/libraw1394/devel/libraw1394.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libraw1394.spec	12 Apr 2007 21:24:30 -0000	1.28
+++ libraw1394.spec	12 Apr 2007 21:30:02 -0000	1.29
@@ -12,6 +12,7 @@
 
 Source1:	fw-device-cdev.h
 Patch0:		libraw1394-juju.patch
+Requires:	kernel >= 2.6.20-1.3062.fc7
 
 %description
 The libraw1394 library provides direct access to the IEEE-1394 bus through
@@ -78,6 +79,7 @@
 * Thu Apr 12 2007 Kristian H??gsberg <krh at redhat.com> - 1.2.1-5
 - Make rawiso support actually work.
 - Update fw-device-cdev.h to sync with latest kernel patch.
+- Add Requires to pull in a recent enough kernel.
 
 * Tue Apr  3 2007 Kristian H??gsberg <krh at redhat.com> - 1.2.1-4
 - Update juju patch with rawiso support.



From fedora-cvs-commits at redhat.com  Thu Apr 12 21:32:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 17:32:42 -0400
Subject: rpms/gnome-applet-vm/devel gnome-applet-vm.spec,1.12,1.13
Message-ID: <200704122132.l3CLWgu6008434@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/gnome-applet-vm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8348

Modified Files:
	gnome-applet-vm.spec 
Log Message:
* Thu Apr 12 2007 Karel Zak <kzak at redhat.com> 0.1.0-2
- fix rpmlint issues



Index: gnome-applet-vm.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applet-vm/devel/gnome-applet-vm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome-applet-vm.spec	27 Sep 2006 21:48:38 -0000	1.12
+++ gnome-applet-vm.spec	12 Apr 2007 21:32:36 -0000	1.13
@@ -1,12 +1,12 @@
 Summary: Simple virtual domains monitor which embed themselves in the GNOME panel
 Name: gnome-applet-vm
 Version: 0.1.0
-Release: 1
+Release: 2%{?dist}
 %define upstreamname %{name}-%{version}
 License: GPL
 Group: User Interface/Desktops
 Source: %{upstreamname}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://people.redhat.com/kzak/gnome-applet-vm
 ExclusiveArch: i386 x86_64
 
@@ -35,7 +35,7 @@
 BuildRequires:  perl-XML-Parser
 BuildRequires:  pkgconfig
 
-Prereq:         gtk2 >= %{gtk2_version}
+Requires:	gtk2 >= %{gtk2_version}
 Requires:	xen
 Requires:	libvirt
 Requires:	gnome-panel >= %{gnome_panel_version}
@@ -98,6 +98,9 @@
 %config %{_sysconfdir}/security/console.apps/vm_applet_wrapper
 
 %changelog
+* Thu Apr 12 2007 Karel Zak <kzak at redhat.com> 0.1.0-2
+- fix rpmlint issues
+
 * Wed Sep 27 2006 Karel Zak <kzak at redhat.com> 0.1.0-1
 - upgrade to stable upstream release
 - fix build requires



From fedora-cvs-commits at redhat.com  Thu Apr 12 21:39:10 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 17:39:10 -0400
Subject: rpms/gnome-applet-vm/devel gnome-applet-vm.spec,1.13,1.14
Message-ID: <200704122139.l3CLdAI8012085@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/gnome-applet-vm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11994

Modified Files:
	gnome-applet-vm.spec 
Log Message:
fix typo


Index: gnome-applet-vm.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applet-vm/devel/gnome-applet-vm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-applet-vm.spec	12 Apr 2007 21:32:36 -0000	1.13
+++ gnome-applet-vm.spec	12 Apr 2007 21:39:05 -0000	1.14
@@ -1,4 +1,4 @@
-Summary: Simple virtual domains monitor which embed themselves in the GNOME panel
+Summary: Simple virtual domains monitor which embeds itself in the GNOME panel
 Name: gnome-applet-vm
 Version: 0.1.0
 Release: 2%{?dist}



From fedora-cvs-commits at redhat.com  Thu Apr 12 22:21:46 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 18:21:46 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.400, 1.401 anaconda.spec, 1.530,
	1.531 sources, 1.525, 1.526
Message-ID: <200704122221.l3CMLkq4009271@cvs.devel.redhat.com>

Author: dcantrel

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

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
* Thu Apr 12 2007 David Cantrell <dcantrell at redhat.com - 11.2.0.48-1
- Don't write out remove lines for packages that don't exist on the
  installation arch (clumens)
- Remove unused code from partedUtils.py (clumens)
- Fix handling of plain text release notes (Elliot Peele)
- Fix RAID minor number allocation in text mode UI (clumens)
- Force /sbin and /usr/sbin in the PATH (katzj)
- Don't copy stage2.img if it is not found (katzj)
- Test given URL for HTTP/FTP install modes when stage2 is loaded from CD



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -r1.400 -r1.401
--- .cvsignore	10 Apr 2007 03:44:46 -0000	1.400
+++ .cvsignore	12 Apr 2007 22:21:44 -0000	1.401
@@ -1 +1 @@
-anaconda-11.2.0.47.tar.bz2
+anaconda-11.2.0.48.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.530
retrieving revision 1.531
diff -u -r1.530 -r1.531
--- anaconda.spec	10 Apr 2007 03:44:46 -0000	1.530
+++ anaconda.spec	12 Apr 2007 22:21:44 -0000	1.531
@@ -1,7 +1,7 @@
 %define livearches %{ix86} x86_64
 
 Name: anaconda
-Version: 11.2.0.47
+Version: 11.2.0.48
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -21,7 +21,7 @@
 BuildRequires: slang-devel >= 2.0.6-2, slang-static
 BuildRequires: newt-devel, newt-static
 BuildRequires: glib2-devel >= 2.11.1-5, glib2-static
-BuildRequires: libdhcp-devel >= 1.24, mkinitrd-devel >= 5.1.2-1
+BuildRequires: libdhcp-devel-static >= 1.24-3, mkinitrd-devel >= 5.1.2-1
 BuildRequires: audit-libs-devel
 %ifarch %livearches
 BuildRequires: desktop-file-utils
@@ -142,9 +142,19 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Apr 12 2007 David Cantrell <dcantrell at redhat.com - 11.2.0.48-1
+- Don't write out remove lines for packages that don't exist on the
+  installation arch (clumens)
+- Remove unused code from partedUtils.py (clumens)
+- Fix handling of plain text release notes (Elliot Peele)
+- Fix RAID minor number allocation in text mode UI (clumens)
+- Force /sbin and /usr/sbin in the PATH (katzj)
+- Don't copy stage2.img if it is not found (katzj)
+- Test given URL for HTTP/FTP install modes when stage2 is loaded from CD
+
 * Mon Apr  9 2007 Jeremy Katz <katzj at redhat.com> - 11.2.0.47-1
 - Fix build on s390
-- Ensure we exit at the end of the install. 
+- Ensure we exit at the end of the install.
 
 * Sun Apr  8 2007 Peter Jones <pjones at redhat.com> - 11.2.0.46-2
 - Rebuild because aparently the s390 build produced a corrupt package...


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.525
retrieving revision 1.526
diff -u -r1.525 -r1.526
--- sources	10 Apr 2007 03:44:46 -0000	1.525
+++ sources	12 Apr 2007 22:21:44 -0000	1.526
@@ -1 +1 @@
-920efbca835434d3fbdb96bef2c0f7d5  anaconda-11.2.0.47.tar.bz2
+62fb1da131b5df8ef50f8290fdde356b  anaconda-11.2.0.48.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr 13 02:13:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 12 Apr 2007 22:13:42 -0400
Subject: rpms/file-roller/devel .cvsignore, 1.51, 1.52 file-roller.spec, 1.90,
	1.91 sources, 1.52, 1.53
Message-ID: <200704130213.l3D2DgoS024151@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
* Thu Apr 12 2007 Christopher Aillon <caillon at redhat.com> - 2.18.1-1
- Update to 2.18.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	13 Mar 2007 05:53:22 -0000	1.51
+++ .cvsignore	13 Apr 2007 02:13:40 -0000	1.52
@@ -1 +1 @@
-file-roller-2.18.0.tar.bz2
+file-roller-2.18.1.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- file-roller.spec	13 Mar 2007 05:53:22 -0000	1.90
+++ file-roller.spec	13 Apr 2007 02:13:40 -0000	1.91
@@ -10,7 +10,7 @@
 
 Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
-Version:	2.18.0
+Version:	2.18.1
 Release: 	1%{?dist}
 
 License:	GPL
@@ -131,6 +131,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Thu Apr 12 2007 Christopher Aillon <caillon at redhat.com> - 2.18.1-1
+- Update to 2.18.1
+
 * Tue Mar 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-1
 - Update to 2.18.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	13 Mar 2007 05:53:22 -0000	1.52
+++ sources	13 Apr 2007 02:13:40 -0000	1.53
@@ -1 +1 @@
-8f8b6b0e4598f2773f6948a631ca8721  file-roller-2.18.0.tar.bz2
+8cbd7292146da7d6fe3a586c77263079  file-roller-2.18.1.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr 13 07:09:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 03:09:49 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.2.0.ooo53397.linkopt.patch, 1.9, 1.10
Message-ID: <200704130709.l3D79nZV016623@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-2.2.0.ooo53397.linkopt.patch 
Log Message:
lost the desktop order file

openoffice.org-2.2.0.ooo53397.linkopt.patch:
 OOF680_m14/solenv/bin/mklinkscript.pl                            |   48 
 OOF680_m14/sw/util/symbolorder                                   | 5110 ++
 UnoControls/prj/build.lst                                        |    2 
 UnoControls/util/makefile.mk                                     |    3 
 automation/prj/build.lst                                         |    2 
 automation/util/makefile.mk                                      |   52 
 avmedia/source/gstreamer/makefile.mk                             |    2 
 avmedia/source/xine/makefile.mk                                  |    2 
 avmedia/util/makefile.mk                                         |    2 
 basctl/util/makefile.mk                                          |   13 
 basegfx/prj/d.lst                                                |    2 
 basegfx/util/makefile.mk                                         |    2 
 basic/prj/d.lst                                                  |    2 
 basic/source/uno/sbservices.cxx                                  |   13 
 basic/util/makefile.mk                                           |    2 
 bf_forms/util/makefile.mk                                        |    0 
 bf_goodies/util/makefile.mk                                      |    0 
 bf_linguistic/source/makefile.mk                                 |    0 
 bf_offmgr/util/makefile.mk                                       |    0 
 bf_sc/util/makefile.mk                                           |    0 
 bf_sch/util/makefile.mk                                          |    0 
 bf_sd/util/makefile.mk                                           |    0 
 bf_starmath/util/makefile.mk                                     |    0 
 bf_svx/util/makefile.mk                                          |    0 
 bf_sw/util/makefile.mk                                           |    0 
 bf_xmloff/util/makefile.mk                                       |    0 
 binfilter/bf_forms/util/makefile.mk                              |   11 
 binfilter/bf_goodies/util/makefile.mk                            |    3 
 binfilter/bf_linguistic/source/makefile.mk                       |    9 
 binfilter/bf_offmgr/util/makefile.mk                             |   10 
 binfilter/bf_sc/util/makefile.mk                                 |   14 
 binfilter/bf_sch/util/makefile.mk                                |    9 
 binfilter/bf_sd/util/makefile.mk                                 |   14 
 binfilter/bf_starmath/util/makefile.mk                           |   10 
 binfilter/bf_svx/util/makefile.mk                                |   16 
 binfilter/bf_sw/util/makefile.mk                                 |   13 
 binfilter/bf_xmloff/util/makefile.mk                             |   13 
 binfilter/binfilterdetect/source/makefile.mk                     |    8 
 binfilter/filter/source/bf_migrate/makefile.mk                   |    9 
 binfilter/filter/source/bf_offwrp/makefile.mk                    |   14 
 binfilter/inc/bf_sfx2/docfile.hxx                                |    2 
 binfilterdetect/source/makefile.mk                               |    0 
 bmpmaker/makefile.mk                                             |    0 
 bootstrp/addexes2/makefile.mk                                    |    0 
 bootstrp/makefile.mk                                             |    0 
 canvas/prj/build.lst                                             |    2 
 canvas/source/cairo/makefile.mk                                  |    2 
 canvas/source/null/makefile.mk                                   |    2 
 canvas/source/tools/makefile.mk                                  |    2 
 canvas/source/vcl/makefile.mk                                    |    2 
 chart2/source/controller/makefile.mk                             |   15 
 chart2/source/model/makefile.mk                                  |    4 
 chart2/source/tools/makefile.mk                                  |    5 
 chart2/source/view/makefile.mk                                   |   14 
 comphelper/prj/d.lst                                             |    2 
 comphelper/source/misc/facreg.cxx                                |    9 
 comphelper/util/makefile.mk                                      |    2 
 configmgr/prj/d.lst                                              |    2 
 configmgr/source/backendhelper/componentdf.cxx                   |   13 
 configmgr/source/backendhelper/makefile.mk                       |    2 
 configmgr/source/misc/configunoreg.cxx                           |   13 
 configmgr/source/platformbe/componentdefn.cxx                    |   14 
 configmgr/source/platformbe/makefile.mk                          |    2 
 configmgr/util/makefile.mk                                       |   22 
 connectivity/source/cpool/makefile.mk                            |    3 
 connectivity/source/dbtools/makefile.mk                          |    5 
 connectivity/source/drivers/adabas/makefile.mk                   |    3 
 connectivity/source/drivers/calc/makefile.mk                     |    9 
 connectivity/source/drivers/dbase/makefile.mk                    |    8 
 connectivity/source/drivers/evoab/makefile.mk                    |   11 
 connectivity/source/drivers/evoab2/makefile.mk                   |   10 
 connectivity/source/drivers/file/makefile.mk                     |    8 
 connectivity/source/drivers/flat/makefile.mk                     |   11 
 connectivity/source/drivers/hsqldb/makefile.mk                   |    3 
 connectivity/source/drivers/jdbc/makefile.mk                     |    3 
 connectivity/source/drivers/mysql/makefile.mk                    |    4 
 connectivity/source/drivers/odbc/makefile.mk                     |    3 
 connectivity/source/manager/makefile.mk                          |    1 
 dbaccess/source/filter/migration/makefile.mk                     |    7 
 dbaccess/source/filter/xml/makefile.mk                           |   13 
 desktop/prj/build.lst                                            |   16 
 desktop/prj/d.lst                                                |    2 
 desktop/source/app/appinit.cxx                                   |  152 
 desktop/source/app/makefile.mk                                   |   44 
 desktop/source/deployment/gui/makefile.mk                        |   12 
 desktop/source/deployment/makefile.mk                            |    8 
 desktop/source/deployment/misc/makefile.mk                       |    5 
 desktop/source/migration/services/makefile.mk                    |    6 
 desktop/source/offacc/makefile.mk                                |    2 
 desktop/source/pkgchk/makefile.mk                                |   13 
 desktop/source/pkgchk/unopkg/makefile.mk                         |   12 
 desktop/source/so_comp/makefile.mk                               |    8 
 desktop/source/splash/makefile.mk                                |   15 
 desktop/source/splash/services_spl.cxx                           |   12 
 desktop/util/makefile.mk                                         |  148 
 dtrans/prj/build.lst                                             |    2 
 dtrans/prj/d.lst                                                 |    2 
 dtrans/source/X11/X11_service.cxx                                |   11 
 dtrans/source/X11/makefile.mk                                    |   12 
 embeddedobj/source/msole/makefile.mk                             |    7 
 embeddedobj/util/makefile.mk                                     |    2 
 extensions/source/abpilot/makefile.mk                            |   11 
 extensions/source/bibliography/makefile.mk                       |    9 
 extensions/source/dbpilots/makefile.mk                           |    7 
 extensions/source/nsplugin/source/makefile.mk                    |    9 
 extensions/source/packer/makefile.mk                             |    2 
 extensions/source/plugin/unx/makefile.mk                         |    3 
 extensions/source/plugin/util/makefile.mk                        |   10 
 extensions/source/preload/makefile.mk                            |    7 
 extensions/source/propctrlr/makefile.mk                          |   10 
 extensions/source/resource/makefile.mk                           |    9 
 extensions/source/scanner/makefile.mk                            |   17 
 extensions/source/svg/makefile.mk                                |    4 
 extensions/source/update/ui/makefile.mk                          |    6 
 extensions/source/xmlextract/makefile.mk                         |    4 
 fileaccess/prj/build.lst                                         |    2 
 fileaccess/prj/d.lst                                             |    2 
 fileaccess/source/FileAccess.cxx                                 |   10 
 fileaccess/source/makefile.mk                                    |   18 
 filter/source/bf_migrate/makefile.mk                             |    0 
 filter/source/bf_offwrp/makefile.mk                              |    0 
 filter/source/config/cache/makefile.mk                           |    7 
 filter/source/filtertracer/makefile.mk                           |    5 
 filter/source/flash/makefile.mk                                  |    7 
 filter/source/msfilter/powerpoint/makefile.mk                    |    3 
 filter/source/pdf/makefile.mk                                    |    9 
 filter/source/svg/makefile.mk                                    |    7 
 filter/source/xmlfilteradaptor/makefile.mk                       |    4 
 filter/source/xmlfilterdetect/makefile.mk                        |    3 
 filter/source/xsltdialog/makefile.mk                             |   11 
 filter/source/xsltfilter/makefile.mk                             |    6 
 fpicker/source/generic/makefile.mk                               |    3 
 fpicker/source/office/makefile.mk                                |    9 
 fpicker/source/unx/gnome/makefile.mk                             |    4 
 framework/inc/macros/registration.hxx                            |   20 
 framework/prj/d.lst                                              |    2 
 framework/source/register/register3rdcomponents.cxx              |   10 
 framework/source/register/registerservices.cxx                   |   10 
 framework/source/register/registertemp.cxx                       |   10 
 framework/util/makefile.mk                                       |   61 
 goodies/prj/d.lst                                                |    2 
 goodies/source/filter.vcl/egif/makefile.mk                       |    2 
 goodies/source/filter.vcl/eos2met/makefile.mk                    |    2 
 goodies/source/filter.vcl/epbm/makefile.mk                       |    2 
 goodies/source/filter.vcl/epgm/makefile.mk                       |    2 
 goodies/source/filter.vcl/epict/makefile.mk                      |    2 
 goodies/source/filter.vcl/eppm/makefile.mk                       |    2 
 goodies/source/filter.vcl/eps/makefile.mk                        |    2 
 goodies/source/filter.vcl/eras/makefile.mk                       |    2 
 goodies/source/filter.vcl/etiff/makefile.mk                      |    2 
 goodies/source/filter.vcl/expm/makefile.mk                       |    2 
 goodies/source/filter.vcl/icgm/makefile.mk                       |    5 
 goodies/source/filter.vcl/idxf/makefile.mk                       |    2 
 goodies/source/filter.vcl/ieps/makefile.mk                       |    2 
 goodies/source/filter.vcl/ios2met/makefile.mk                    |    2 
 goodies/source/filter.vcl/ipbm/makefile.mk                       |    2 
 goodies/source/filter.vcl/ipcd/makefile.mk                       |    2 
 goodies/source/filter.vcl/ipcx/makefile.mk                       |    2 
 goodies/source/filter.vcl/ipict/makefile.mk                      |    2 
 goodies/source/filter.vcl/ipsd/makefile.mk                       |    2 
 goodies/source/filter.vcl/iras/makefile.mk                       |    2 
 goodies/source/filter.vcl/itga/makefile.mk                       |    2 
 goodies/source/filter.vcl/itiff/makefile.mk                      |    2 
 goodies/source/inv/makefile.mk                                   |   17 
 goodies/source/unographic/graphicuno.cxx                         |   13 
 goodies/util/makefile.mk                                         |    2 
 i18npool/prj/d.lst                                               |    2 
 i18npool/source/isolang/makefile.mk                              |    2 
 i18npool/source/registerservices/registerservices.cxx            |    9 
 i18npool/util/makefile.mk                                        |    2 
 i18nutil/prj/d.lst                                               |    3 
 i18nutil/source/utility/makefile.mk                              |   15 
 idl/util/makefile.mk                                             |    5 
 inc/bf_sfx2/docfile.hxx                                          |    0 
 inc/insdlg.hxx                                                   |    0 
 inc/macros/registration.hxx                                      |    0 
 inc/transbnd.hxx                                                 |    0 
 instsetoo_native/util/openoffice.lst                             |    6 
 lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk |    8 
 lingucomponent/source/spellcheck/spell/makefile.mk               |    8 
 lingucomponent/source/thesaurus/libnth/makefile.mk               |    8 
 linguistic/source/makefile.mk                                    |   12 
 msole/makefile.mk                                                |    0 
 openoffice.org/cppcanvas/util/makefile.mk                        |    2 
 openoffice.org/dbaccess/util/makefile.mk                         |   29 
 openoffice.org/desktop/util/symbolorder                          |19993 ++++++++++
 openoffice.org/forms/util/makefile.mk                            |   13 
 openoffice.org/libsofficecheckpoint1/makefile.mk                 |   36 
 openoffice.org/libsofficecheckpoint1/prj/build.lst               |    3 
 openoffice.org/libsofficecheckpoint1/prj/d.lst                   |    1 
 package/prj/build.lst                                            |    2 
 package/prj/d.lst                                                |    2 
 package/source/manifest/UnoRegister.cxx                          |   10 
 package/source/xstor/makefile.mk                                 |    4 
 package/util/makefile.mk                                         |    9 
 padmin/source/makefile.mk                                        |   11 
 prj/build.lst                                                    |    2 
 prj/d.lst                                                        |    0 
 psprint/prj/d.lst                                                |    2 
 psprint/util/makefile.mk                                         |    2 
 regexp/source/makefile.mk                                        |    2 
 rsc/prj/build.lst                                                |    2 
 rsc/source/prj/makefile.mk                                       |    6 
 sc/util/makefile.mk                                              |   36 
 scaddins/source/analysis/makefile.mk                             |    4 
 scaddins/source/datefunc/makefile.mk                             |    4 
 sch/util/makefile.mk                                             |   18 
 scp2/source/gnome/file_gnome.scp                                 |   18 
 scp2/source/gnome/module_gnome.scp                               |    2 
 scp2/source/ooo/file_library_ooo.scp                             |  245 
 scp2/source/ooo/module_hidden_ooo.scp                            |   37 
 scripting/source/basprov/makefile.mk                             |    8 
 scripting/source/dlgprov/makefile.mk                             |    5 
 scripting/source/protocolhandler/makefile.mk                     |    4 
 scripting/source/stringresource/makefile.mk                      |    2 
 scripting/source/vbaevents/makefile.mk                           |    5 
 scripting/util/makefile.mk                                       |    4 
 sd/prj/build.lst                                                 |    2 
 sd/source/filter/eppt/makefile.mk                                |   12 
 sd/util/makefile.mk                                              |   45 
 sfx2/prj/build.lst                                               |    2 
 sfx2/prj/d.lst                                                   |    3 
 sfx2/source/appl/appuno.cxx                                      |   11 
 sfx2/util/makefile.mk                                            |   70 
 shell/prj/d.lst                                                  |    2 
 shell/source/backends/desktopbe/desktopbecdef.cxx                |   13 
 shell/source/backends/desktopbe/makefile.mk                      |   12 
 shell/source/backends/gconfbe/gconfbecdef.cxx                    |   12 
 shell/source/backends/gconfbe/makefile.mk                        |   12 
 shell/source/backends/localebe/localebecdef.cxx                  |   12 
 shell/source/backends/localebe/makefile.mk                       |   12 
 shell/source/unix/sysshell/makefile.mk                           |    4 
 sj2/prj/d.lst                                                    |    2 
 sj2/util/makefile.mk                                             |    6 
 slideshow/util/makefile.mk                                       |    9 
 so3/inc/insdlg.hxx                                               |    7 
 so3/inc/transbnd.hxx                                             |   12 
 so3/prj/d.lst                                                    |    2 
 so3/source/dialog/insdlg.cxx                                     |    4 
 so3/source/inplace/outplace.cxx                                  |    1 
 so3/source/persist/transbnd.cxx                                  |    4 
 so3/util/makefile.mk                                             |    3 
 solenv/bin/modules/installer/configuration.pm                    |    4 
 solenv/bin/modules/installer/profiles.pm                         |    4 
 sot/prj/d.lst                                                    |    2 
 sot/source/unoolestorage/register.cxx                            |    9 
 sot/util/makefile.mk                                             |    2 
 source/FileAccess.cxx                                            |    0 
 source/X11/X11_service.cxx                                       |    0 
 source/X11/makefile.mk                                           |    0 
 source/abpilot/makefile.mk                                       |    0 
 source/analysis/makefile.mk                                      |    0 
 source/app/appinit.cxx                                           |    0 
 source/app/makefile.mk                                           |    0 
 source/app/svapp.cxx                                             |    0 
 source/appl/appuno.cxx                                           |    0 
 source/awt/vclxtoolkit.cxx                                       |    0 
 source/awt/vclxwindow.cxx                                        |    0 
 source/backendhelper/componentdf.cxx                             |    0 
 source/backendhelper/makefile.mk                                 |    0 
 source/backends/desktopbe/desktopbecdef.cxx                      |    0 
 source/backends/desktopbe/makefile.mk                            |    0 
 source/backends/gconfbe/gconfbecdef.cxx                          |    0 
 source/backends/gconfbe/makefile.mk                              |    0 
 source/backends/localebe/localebecdef.cxx                        |    0 
 source/backends/localebe/makefile.mk                             |    0 
 source/basprov/makefile.mk                                       |    0 
 source/bibliography/makefile.mk                                  |    0 
 source/cairo/makefile.mk                                         |    0 
 source/components/factory.cxx                                    |    0 
 source/config/cache/makefile.mk                                  |    0 
 source/controller/makefile.mk                                    |    0 
 source/core/facreg.cxx                                           |    0 
 source/core/makefile.mk                                          |    0 
 source/core/ucbserv.cxx                                          |    0 
 source/cpool/makefile.mk                                         |    0 
 source/datefunc/makefile.mk                                      |    0 
 source/dbpilots/makefile.mk                                      |    0 
 source/dbtools/makefile.mk                                       |    0 
 source/deployment/gui/makefile.mk                                |    0 
 source/deployment/makefile.mk                                    |    0 
 source/deployment/misc/makefile.mk                               |    0 
 source/dialog/insdlg.cxx                                         |    0 
 source/dlgprov/makefile.mk                                       |    0 
 source/drivers/adabas/makefile.mk                                |    0 
 source/drivers/calc/makefile.mk                                  |    0 
 source/drivers/dbase/makefile.mk                                 |    0 
 source/drivers/evoab/makefile.mk                                 |    0 
 source/drivers/evoab2/makefile.mk                                |    0 
 source/drivers/file/makefile.mk                                  |    0 
 source/drivers/flat/makefile.mk                                  |    0 
 source/drivers/hsqldb/makefile.mk                                |    0 
 source/drivers/jdbc/makefile.mk                                  |    0 
 source/drivers/mysql/makefile.mk                                 |    0 
 source/drivers/odbc/makefile.mk                                  |    0 
 source/filter.vcl/egif/makefile.mk                               |    0 
 source/filter.vcl/eos2met/makefile.mk                            |    0 
 source/filter.vcl/epbm/makefile.mk                               |    0 
 source/filter.vcl/epgm/makefile.mk                               |    0 
 source/filter.vcl/epict/makefile.mk                              |    0 
 source/filter.vcl/eppm/makefile.mk                               |    0 
 source/filter.vcl/eps/makefile.mk                                |    0 
 source/filter.vcl/eras/makefile.mk                               |    0 
 source/filter.vcl/etiff/makefile.mk                              |    0 
 source/filter.vcl/expm/makefile.mk                               |    0 
 source/filter.vcl/icgm/makefile.mk                               |    0 
 source/filter.vcl/idxf/makefile.mk                               |    0 
 source/filter.vcl/ieps/makefile.mk                               |    0 
 source/filter.vcl/ios2met/makefile.mk                            |    0 
 source/filter.vcl/ipbm/makefile.mk                               |    0 
 source/filter.vcl/ipcd/makefile.mk                               |    0 
 source/filter.vcl/ipcx/makefile.mk                               |    0 
 source/filter.vcl/ipict/makefile.mk                              |    0 
 source/filter.vcl/ipsd/makefile.mk                               |    0 
 source/filter.vcl/iras/makefile.mk                               |    0 
 source/filter.vcl/itga/makefile.mk                               |    0 
 source/filter.vcl/itiff/makefile.mk                              |    0 
 source/filter/eppt/makefile.mk                                   |    0 
 source/filter/migration/makefile.mk                              |    0 
 source/filter/xml/makefile.mk                                    |    0 
 source/filtertracer/makefile.mk                                  |    0 
 source/flash/makefile.mk                                         |    0 
 source/fsstor/fsfactory.cxx                                      |    0 
 source/fsstor/fsstorage.cxx                                      |    0 
 source/fsstor/makefile.mk                                        |    0 
 source/generic/makefile.mk                                       |    0 
 source/gengal/makefile.mk                                        |    0 
 source/gnome/file_gnome.scp                                      |    0 
 source/gnome/module_gnome.scp                                    |    0 
 source/hatchwindow/makefile.mk                                   |    0 
 source/helper/registerservices.cxx                               |    0 
 source/helpprovider/makefile.mk                                  |    0 
 source/hyphenator/altlinuxhyph/hyphen/makefile.mk                |    0 
 source/inplace/outplace.cxx                                      |    0 
 source/inv/makefile.mk                                           |    0 
 source/isolang/makefile.mk                                       |    0 
 source/makefile.mk                                               |    0 
 source/manager/makefile.mk                                       |    0 
 source/manifest/UnoRegister.cxx                                  |    0 
 source/migration/services/makefile.mk                            |    0 
 source/misc/configunoreg.cxx                                     |    0 
 source/misc/facreg.cxx                                           |    0 
 source/misc/unoservices.cxx                                      |    0 
 source/model/makefile.mk                                         |    0 
 source/msfilter/powerpoint/makefile.mk                           |    0 
 source/nsplugin/source/makefile.mk                               |    0 
 source/null/makefile.mk                                          |    0 
 source/offacc/makefile.mk                                        |    0 
 source/office/makefile.mk                                        |    0 
 source/ooo/file_library_ooo.scp                                  |    0 
 source/ooo/module_hidden_ooo.scp                                 |    0 
 source/packer/makefile.mk                                        |    0 
 source/passwordcontainer/makefile.mk                             |    0 
 source/pdf/makefile.mk                                           |    0 
 source/persist/transbnd.cxx                                      |    0 
 source/pkgchk/makefile.mk                                        |    0 
 source/pkgchk/unopkg/makefile.mk                                 |    0 
 source/platformbe/componentdefn.cxx                              |    0 
 source/platformbe/makefile.mk                                    |    0 
 source/plugin/unx/makefile.mk                                    |    0 
 source/plugin/util/makefile.mk                                   |    0 
 source/preload/makefile.mk                                       |    0 
 source/prj/makefile.mk                                           |    0 
 source/productregistration/makefile.mk                           |    0 
 source/propctrlr/makefile.mk                                     |    0 
 source/protocolhandler/makefile.mk                               |    0 
 source/register/register3rdcomponents.cxx                        |    0 
 source/register/registerservices.cxx                             |    0 
 source/register/registertemp.cxx                                 |    0 
 source/registerservices/registerservices.cxx                     |    0 
 source/resource/makefile.mk                                      |    0 
 source/scanner/makefile.mk                                       |    0 
 source/service/makefile.mk                                       |    0 
 source/so_comp/makefile.mk                                       |    0 
 source/spellcheck/spell/makefile.mk                              |    0 
 source/splash/makefile.mk                                        |    0 
 source/splash/services_spl.cxx                                   |    0 
 source/stringresource/makefile.mk                                |    0 
 source/svg/makefile.mk                                           |    0 
 source/thesaurus/libnth/makefile.mk                              |    0 
 source/tools/makefile.mk                                         |    0 
 source/transform/makefile.mk                                     |    0 
 source/treeview/makefile.mk                                      |    0 
 source/ucbhelper/xtempfile.cxx                                   |    0 
 source/ucp/expand/makefile.mk                                    |    0 
 source/ucp/file/makefile.mk                                      |    0 
 source/ucp/file/prov.cxx                                         |    0 
 source/ucp/ftp/makefile.mk                                       |    0 
 source/ucp/gvfs/makefile.mk                                      |    0 
 source/ucp/gvfs/provider.cxx                                     |    0 
 source/ucp/hierarchy/makefile.mk                                 |    0 
 source/ucp/package/makefile.mk                                   |    0 
 source/ucp/tdoc/makefile.mk                                      |    0 
 source/ucp/webdav/makefile.mk                                    |    0 
 source/unix/sysshell/makefile.mk                                 |    0 
 source/uno/registerservices.cxx                                  |    0 
 source/uno/sbservices.cxx                                        |    0 
 source/unodialogs/textconversiondlgs/makefile.mk                 |    0 
 source/unographic/graphicuno.cxx                                 |    0 
 source/unoolestorage/register.cxx                                |    0 
 source/unx/gnome/makefile.mk                                     |    0 
 source/update/ui/makefile.mk                                     |    0 
 source/utility/makefile.mk                                       |    0 
 source/vcl/makefile.mk                                           |    0 
 source/view/makefile.mk                                          |    0 
 source/xine/makefile.mk                                          |    0 
 source/xmlextract/makefile.mk                                    |    0 
 source/xmlfilteradaptor/makefile.mk                              |    0 
 source/xmlfilterdetect/makefile.mk                               |    0 
 source/xsltdialog/makefile.mk                                    |    0 
 source/xsltfilter/makefile.mk                                    |    0 
 source/xstor/makefile.mk                                         |    0 
 starmath/util/makefile.mk                                        |   19 
 svtools/bmpmaker/makefile.mk                                     |    8 
 svtools/prj/build.lst                                            |    6 
 svtools/prj/d.lst                                                |    3 
 svtools/source/fsstor/fsfactory.cxx                              |   10 
 svtools/source/fsstor/fsstorage.cxx                              |    2 
 svtools/source/fsstor/makefile.mk                                |   16 
 svtools/source/hatchwindow/makefile.mk                           |    4 
 svtools/source/passwordcontainer/makefile.mk                     |    3 
 svtools/source/productregistration/makefile.mk                   |    5 
 svtools/source/uno/registerservices.cxx                          |   10 
 svtools/uno/makefile.mk                                          |    9 
 svtools/util/makefile.mk                                         |  130 
 svx/prj/build.lst                                                |    2 
 svx/source/gengal/makefile.mk                                    |   14 
 svx/source/unodialogs/textconversiondlgs/makefile.mk             |    8 
 svx/util/makefile.mk                                             |   33 
 sw/prj/build.lst                                                 |    2 
 sw/util/makefile.mk                                              |   49 
 toolkit/prj/d.lst                                                |    2 
 toolkit/source/awt/vclxtoolkit.cxx                               |   12 
 toolkit/source/awt/vclxwindow.cxx                                |    6 
 toolkit/source/helper/registerservices.cxx                       |    9 
 toolkit/util/makefile.mk                                         |    3 
 tools/bootstrp/addexes2/makefile.mk                              |    2 
 tools/bootstrp/makefile.mk                                       |    6 
 tools/prj/d.lst                                                  |    2 
 tools/util/makefile.mk                                           |    2 
 transex3/source/makefile.mk                                      |   37 
 ucb/prj/build.lst                                                |    2 
 ucb/prj/d.lst                                                    |    2 
 ucb/source/core/makefile.mk                                      |   19 
 ucb/source/core/ucbserv.cxx                                      |   11 
 ucb/source/ucp/expand/makefile.mk                                |    2 
 ucb/source/ucp/file/makefile.mk                                  |    2 
 ucb/source/ucp/file/prov.cxx                                     |   11 
 ucb/source/ucp/ftp/makefile.mk                                   |    2 
 ucb/source/ucp/gvfs/makefile.mk                                  |   17 
 ucb/source/ucp/gvfs/provider.cxx                                 |   11 
 ucb/source/ucp/hierarchy/makefile.mk                             |    5 
 ucb/source/ucp/package/makefile.mk                               |    5 
 ucb/source/ucp/tdoc/makefile.mk                                  |    5 
 ucb/source/ucp/webdav/makefile.mk                                |    3 
 ucbhelper/prj/d.lst                                              |    2 
 ucbhelper/util/makefile.mk                                       |    2 
 uno/makefile.mk                                                  |    0 
 unotools/prj/d.lst                                               |    2 
 unotools/source/ucbhelper/xtempfile.cxx                          |   10 
 unotools/util/makefile.mk                                        |    2 
 unoxml/prj/build.lst                                             |    2 
 unoxml/source/service/makefile.mk                                |    3 
 util/makefile.mk                                                 |    0 
 util/openoffice.lst                                              |    0 
 uui/util/makefile.mk                                             |    7 
 vcl/prj/d.lst                                                    |    3 
 vcl/source/app/svapp.cxx                                         |   13 
 vcl/source/components/factory.cxx                                |   11 
 vcl/util/makefile.mk                                             |   60 
 vcl/workben/makefile.mk                                          |   22 
 vos/util/makefile.mk                                             |   22 
 workben/makefile.mk                                              |    0 
 writerperfect/util/makefile.mk                                   |   10 
 xmlhelp/source/helpprovider/makefile.mk                          |    3 
 xmlhelp/source/treeview/makefile.mk                              |    3 
 xmlhelp/util/makefile.mk                                         |    4 
 xmloff/prj/build.lst                                             |    2 
 xmloff/prj/d.lst                                                 |    3 
 xmloff/source/core/facreg.cxx                                    |    9 
 xmloff/source/transform/makefile.mk                              |   10 
 xmloff/util/makefile.mk                                          |   67 
 xmlscript/prj/d.lst                                              |    2 
 xmlscript/source/misc/unoservices.cxx                            |   10 
 xmlscript/util/makefile.mk                                       |    3 
 xmlsecurity/util/makefile.mk                                     |   21 
 486 files changed, 26262 insertions(+), 2001 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.9 -r 1.10 openoffice.org-2.2.0.ooo53397.linkopt.patch
Index: openoffice.org-2.2.0.ooo53397.linkopt.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo53397.linkopt.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openoffice.org-2.2.0.ooo53397.linkopt.patch	12 Apr 2007 15:34:53 -0000	1.9
+++ openoffice.org-2.2.0.ooo53397.linkopt.patch	13 Apr 2007 07:09:47 -0000	1.10
@@ -13848,3 +13848,19999 @@
 +
 +$(MISC)$/ldorder: symbolorder
 +   mklinkscript.pl symbolorder > $(MISC)$/ldorder
+--- /dev/null	2007-04-12 12:58:02.161901192 +0100
++++ openoffice.org/desktop/util/symbolorder	2007-04-11 14:21:18.000000000 +0100
+@@ -0,0 +1,19993 @@
++_GLOBAL__I__ZN11SystemShell24get_absolute_library_urlERKN3rtl8OUStringE
++_Z41__static_initialization_and_destruction_0ii
++_ZN3rtl8OUString15createFromAsciiEPKc
++_ZN3rtl8OUStringC1EP12_rtl_uStringPNS0_14DO_NOT_ACQUIREE
++_GLOBAL__I__Z19ThreeByteToFourBytePKhllRN3rtl14OUStringBufferE
++_ZN3rtl8OUStringC1EPKcltm
++_GLOBAL__I__ZN16ZipPackageStream17aImplementationIdE
++_ZN3com3sun4star3uno8SequenceIaEC1Ev
++_ZN4cppu21getTypeFavourUnsignedIaEERKN3com3sun4star3uno4TypeEPKNS4_8SequenceIT_EE
++_ZN4cppu21getTypeFavourUnsignedIaEERKN3com3sun4star3uno4TypeEPKT_
++_ZN4cppu7UnoTypeIaE3getEv
++_ZN4cppu6detail22cppu_detail_getUnoTypeEPKa
++_ZN4cppu6detail20getTypeFromTypeClassE18_typelib_TypeClass
++_ZN4cppu6detail35getTypeFromTypeDescriptionReferenceEPKP33_typelib_TypeDescriptionReference
++_ZNK3com3sun4star3uno4Type14getTypeLibTypeEv
++_GLOBAL__I__ZN16ZipPackageFolder17aImplementationIdE
++_GLOBAL__I__ZN9configmgr8sharable13allocSequenceEhPK13_sal_Sequence
++_ZN3osl5MutexC1Ev
++_GLOBAL__I__ZN9configmgr3xml13NS_PREFIX_OORE
++_ZN9configmgr18UStringDescriptionC1EPKclt
++_GLOBAL__I__ZN9configmgr7localbe19LocalSchemaSupplierC2ERKN3com3sun4star3uno9ReferenceINS5_17XComponentContextEEE
++_GLOBAL__I__ZN9configmgr7localbe18LocalSingleBackendC2ERKN3com3sun4star3uno9ReferenceINS5_17XComponentContextEEE
++_GLOBAL__I__ZN9configmgr7backend16checkOptionalArgERN3rtl8OUStringE
++_GLOBAL__I__ZNK9configmgr7backend11BinaryCache15getCacheFileURLERKN3rtl8OUStringE
++_GLOBAL__I__ZN9configmgr7backend20SingleBackendAdapterC2ERKN3com3sun4star3uno9ReferenceINS5_17XComponentContextEEE
++_GLOBAL__I__ZN9configmgr7backend18DataBuilderContextC2ERKN3com3sun4star3uno9ReferenceINS5_17XComponentContextEEE
++_GLOBAL__I__ZN9configmgr12TYPE_BOOLEANE
++_GLOBAL__I__ZN9configmgr7backend15CacheController14createDisposerERKN3com3sun4star3uno9ReferenceINS5_17XComponentContextEEE
++_GLOBAL__I__ZN7desktop9Migration11doMigrationEv
++_GLOBAL__I__ZN7desktop16FirstStartWizard13STATE_WELCOMEE
++_GLOBAL__I_spl_component_writeInfo
++_GLOBAL__I__ZN7desktop12SplashScreenC2ERKN3com3sun4star3uno9ReferenceINS3_4lang20XMultiServiceFactoryEEE
++_GLOBAL__I__ZN24SvBindingCancelable_ImplC2EP16SfxCancelManagerR9SvBinding
++_ZN4LinkC1Ev
++_GLOBAL__I__ZN18SfxStylesInfo_ImplC2Ev
++_GLOBAL__I__ZN24SfxAccCfgLBoxString_ImplC2EP11SvLBoxEntrytRK6String
++_GLOBAL__I__ZN20SfxImageManager_ImplC2EP9SfxModule
++_ZN4_STL8hash_mapIxxNS_4hashIxEENS_8equal_toIxEENS_9allocatorINS_4pairIKxxEEEEEC1Ev
++_ZN4_STL9allocatorINS_4pairIKxxEEEC1Ev
++_ZN4_STL9hashtableINS_4pairIKxxEExNS_4hashIxEENS_10_Select1stIS3_EENS_8equal_toIxEENS_9allocatorIS3_EEEC1EjRKS5_RKS9_RKSB_
++_ZN4_STL9allocatorIPvEC1INS_4pairIKxxEEEERKNS0_IT_EE
++_ZN4_STL6vectorIPvNS_9allocatorIS1_EEEC1ERKS3_
++_ZN4_STL12_Vector_baseIPvNS_9allocatorIS1_EEEC2ERKS3_
++_ZN4_STL17_STLP_alloc_proxyIPPvS1_NS_9allocatorIS1_EEEC1ERKS4_S2_
++_ZN4_STL9allocatorIPvEC2ERKS2_
++_ZN4_STL9allocatorIPvED1Ev
++_ZN4_STL9allocatorINS_15_Hashtable_nodeINS_4pairIKxxEEEEEC1IS4_EERKNS0_IT_EE
++_ZN4_STL17_STLP_alloc_proxyIjNS_15_Hashtable_nodeINS_4pairIKxxEEEENS_9allocatorIS5_EEEC1ERKS7_j
++_ZN4_STL9allocatorINS_15_Hashtable_nodeINS_4pairIKxxEEEEEC2ERKS6_
++_ZN4_STL9allocatorINS_15_Hashtable_nodeINS_4pairIKxxEEEEED1Ev
++_ZN4_STL9hashtableINS_4pairIKxxEExNS_4hashIxEENS_10_Select1stIS3_EENS_8equal_toIxEENS_9allocatorIS3_EEE21_M_initialize_bucketsEj
++_ZNK4_STL9hashtableINS_4pairIKxxEExNS_4hashIxEENS_10_Select1stIS3_EENS_8equal_toIxEENS_9allocatorIS3_EEE12_M_next_sizeEj
++_ZN4_STL6__lessIjEENS_4lessIT_EEPS2_
++_ZN4_STL13__lower_boundIPKjjNS_4lessIjEEiEET_S5_S5_RKT0_T1_PT2_
++_ZN4_STL8distanceIPKjEENS_15iterator_traitsIT_E15difference_typeERKS4_S8_
++_ZN4_STL10__distanceIPKjEENS_15iterator_traitsIT_E15difference_typeERKS4_S8_RKNS_26random_access_iterator_tagE
++_ZN4_STL7advanceIPKjiEEvRT_T0_
++_ZN4_STL9__advanceIPKjiEEvRT_T0_RKNS_26random_access_iterator_tagE
++_ZNK4_STL4lessIjEclERKjS3_
++_ZN4_STL6vectorIPvNS_9allocatorIS1_EEE7reserveEj
++_ZNK4_STL6vectorIPvNS_9allocatorIS1_EEE8capacityEv
++_ZNK4_STL6vectorIPvNS_9allocatorIS1_EEE4sizeEv
++_ZNK4_STL9allocatorIPvE8allocateEjPKv
++_ZN4_STL12__node_allocILb1ELi0EE8allocateEj
++_ZN4_STL9__stl_newEj
++_ZN4_STL6vectorIPvNS_9allocatorIS1_EEE6_M_setEPS1_S5_S5_
++_ZN4_STL6vectorIPvNS_9allocatorIS1_EEE3endEv
++_ZN4_STL6vectorIPvNS_9allocatorIS1_EEE6insertEPS1_jRKS1_
++_ZN4_STL6vectorIPvNS_9allocatorIS1_EEE14_M_fill_insertEPS1_jRKS1_
++_ZN4_STL20uninitialized_fill_nIPPvjS1_EET_S3_T0_RKT1_
++_ZN4_STL22__uninitialized_fill_nIPPvjS1_EET_S3_T0_RKT1_RKNS_11__true_typeE
++_ZN4_STL6fill_nIPPvjS1_EET_S3_T0_RKT1_
++_ZN4_STL20__uninitialized_copyIPPvS2_EET0_T_S4_S3_RKNS_11__true_typeE
++_ZN4_STL12_BothPtrTypeIPPvS2_E4_RetEv
++_ZN4_STL10__copy_auxIPPvS2_EET0_T_S4_S3_RKNS_11__true_typeE
++_ZN4_STL13_IsOKToMemCpyIPvS1_EENS_11_OKToMemCpyIT_T0_EEPS3_PS4_
++_ZN4_STL11_OKToMemCpyIPvS1_E4_RetEv
++_ZN4_STL11__copy_ptrsIPPvS2_EET0_T_S4_S3_RKNS_11__true_typeE
++_ZN4_STL14__copy_trivialEPKvS1_Pv
++_ZN4_STL4fillIPPvS1_EEvT_S3_RKT0_
++_ZN4_STL9allocatorINS_4pairIKxxEEED1Ev
++_GLOBAL__I__ZN14ModelData_ImplC2ER16SfxStoringHelperRKN3com3sun4star3uno9ReferenceINS4_5frame6XModelEEERKNS5_8SequenceINS4_5beans13PropertyValueEEE
++_GLOBAL__I_aDocInfoPropertyMap_Impl
++_Z11getCppuTypePKN3rtl8OUStringE
++_ZN4cppu7UnoTypeIN3rtl8OUStringEE3getEv
++_ZN4cppu6detail22cppu_detail_getUnoTypeEPKN3rtl8OUStringE
++_Z18getBooleanCppuTypev
++_ZN4cppu7UnoTypeIbE3getEv
++_ZN4cppu6detail22cppu_detail_getUnoTypeEPKb
++_Z11getCppuTypePKs
++_ZN4cppu7UnoTypeIsE3getEv
++_ZN4cppu6detail22cppu_detail_getUnoTypeEPKs
++_Z11getCppuTypePKN3com3sun4star4lang6LocaleE
++_ZN4cppu7UnoTypeIN3com3sun4star4lang6LocaleEE3getEv
++_ZN3com3sun4star4lang22cppu_detail_getUnoTypeEPKNS2_6LocaleE
++_Z11getCppuTypePKN3com3sun4star4util8DateTimeE
++_ZN4cppu7UnoTypeIN3com3sun4star4util8DateTimeEE3getEv
++_ZN3com3sun4star4util22cppu_detail_getUnoTypeEPKNS2_8DateTimeE
++_Z11getCppuTypeIN3com3sun4star5beans10NamedValueEERKNS2_3uno4TypeEPKNS5_8SequenceIT_EE
++_ZN4cppu21getTypeFavourUnsignedIN3com3sun4star5beans10NamedValueEEERKNS3_3uno4TypeEPKNS6_8SequenceIT_EE
++_ZN4cppu21getTypeFavourUnsignedIN3com3sun4star5beans10NamedValueEEERKNS3_3uno4TypeEPKT_
++_ZN4cppu7UnoTypeIN3com3sun4star5beans10NamedValueEE3getEv
++_ZN3com3sun4star5beans22cppu_detail_getUnoTypeEPKNS2_10NamedValueE
++_Z11getCppuTypePKl
++_ZN4cppu7UnoTypeIlE3getEv
++_ZN4cppu6detail22cppu_detail_getUnoTypeEPKl
++_GLOBAL__I__ZN4sfx217PluginWindow_Impl6ResizeEv
++_Z11getCppuTypeIN3com3sun4star5beans13PropertyValueEERKNS2_3uno4TypeEPKNS5_8SequenceIT_EE
++_ZN4cppu21getTypeFavourUnsignedIN3com3sun4star5beans13PropertyValueEEERKNS3_3uno4TypeEPKNS6_8SequenceIT_EE
++_ZN4cppu21getTypeFavourUnsignedIN3com3sun4star5beans13PropertyValueEEERKNS3_3uno4TypeEPKT_
++_ZN4cppu7UnoTypeIN3com3sun4star5beans13PropertyValueEE3getEv
++_ZN3com3sun4star5beans22cppu_detail_getUnoTypeEPKNS2_13PropertyValueE
++_GLOBAL__I__ZN4sfx217AppletWindow_Impl6ResizeEv
++_GLOBAL__I__ZN4sfx217IFrameWindow_ImplC2EP6Windowhx
++_GLOBAL__I__ZN21LayoutManagerListener7acquireEv
++_ZN4_STL8hash_mapIlN3rtl8OUStringENS_4hashIlEENS_8equal_toIlEENS_9allocatorINS_4pairIKlS2_EEEEEC1Ev
++_ZN4_STL9allocatorINS_4pairIKlN3rtl8OUStringEEEEC1Ev
++_ZN4_STL9hashtableINS_4pairIKlN3rtl8OUStringEEElNS_4hashIlEENS_10_Select1stIS5_EENS_8equal_toIlEENS_9allocatorIS5_EEEC1EjRKS7_RKSB_RKSD_
++_ZN4_STL9allocatorIPvEC1INS_4pairIKlN3rtl8OUStringEEEEERKNS0_IT_EE
++_ZN4_STL9allocatorINS_15_Hashtable_nodeINS_4pairIKlN3rtl8OUStringEEEEEEC1IS6_EERKNS0_IT_EE
++_ZN4_STL17_STLP_alloc_proxyIjNS_15_Hashtable_nodeINS_4pairIKlN3rtl8OUStringEEEEENS_9allocatorIS7_EEEC1ERKS9_j
++_ZN4_STL9allocatorINS_15_Hashtable_nodeINS_4pairIKlN3rtl8OUStringEEEEEEC2ERKS8_
++_ZN4_STL9allocatorINS_15_Hashtable_nodeINS_4pairIKlN3rtl8OUStringEEEEEED1Ev
++_ZN4_STL9hashtableINS_4pairIKlN3rtl8OUStringEEElNS_4hashIlEENS_10_Select1stIS5_EENS_8equal_toIlEENS_9allocatorIS5_EEE21_M_initialize_bucketsEj
++_ZNK4_STL9hashtableINS_4pairIKlN3rtl8OUStringEEElNS_4hashIlEENS_10_Select1stIS5_EENS_8equal_toIlEENS_9allocatorIS5_EEE12_M_next_sizeEj
++_ZN4_STL9allocatorINS_4pairIKlN3rtl8OUStringEEEED1Ev
++_GLOBAL__I__ZN14NoHelpErrorBoxC2EP6Window
++_ZN6StringC1EPKcttm
++_ZNK6StringcvN3rtl8OUStringEEv
++_ZN3rtl8OUStringC1EP12_rtl_uString
++_ZN6StringD1Ev
++_GLOBAL__I__Z8GetImageRN3com3sun4star3uno9ReferenceINS1_5frame6XFrameEEERKN3rtl8OUStringEhh
++_ZN3com3sun4star3uno13WeakReferenceINS1_5frame14XModuleManagerEEC1Ev
++_ZN3com3sun4star3uno19WeakReferenceHelperC2Ev
++_ZN3com3sun4star3uno13WeakReferenceINS1_2ui37XModuleUIConfigurationManagerSupplierEEC1Ev
++_ZN3com3sun4star3uno13WeakReferenceINS1_4util15XURLTransformerEEC1Ev
++_ZN4_STL8hash_mapIN3rtl8OUStringEN3com3sun4star3uno13WeakReferenceINS5_2ui13XImageManagerEEENS1_12OUStringHashENS_8equal_toIS2_EENS_9allocatorINS_4pairIKS2_SA_EEEEEC1Ev
++_ZN4_STL9allocatorINS_4pairIKN3rtl8OUStringEN3com3sun4star3uno13WeakReferenceINS7_2ui13XImageManagerEEEEEEC1Ev
++_ZN4_STL9hashtableINS_4pairIKN3rtl8OUStringEN3com3sun4star3uno13WeakReferenceINS7_2ui13XImageManagerEEEEES3_NS2_12OUStringHashENS_10_Select1stISD_EENS_8equal_toIS3_EENS_9allocatorISD_EEEC1EjRKSE_RKSI_RKSK_
++_ZN4_STL9allocatorIPvEC1INS_4pairIKN3rtl8OUStringEN3com3sun4star3uno13WeakReferenceINSA_2ui13XImageManagerEEEEEEERKNS0_IT_EE
++_ZN4_STL9allocatorINS_15_Hashtable_nodeINS_4pairIKN3rtl8OUStringEN3com3sun4star3uno13WeakReferenceINS8_2ui13XImageManagerEEEEEEEEC1ISE_EERKNS0_IT_EE
++_ZN4_STL17_STLP_alloc_proxyIjNS_15_Hashtable_nodeINS_4pairIKN3rtl8OUStringEN3com3sun4star3uno13WeakReferenceINS8_2ui13XImageManagerEEEEEEENS_9allocatorISF_EEEC1ERKSH_j
++_ZN4_STL9allocatorINS_15_Hashtable_nodeINS_4pairIKN3rtl8OUStringEN3com3sun4star3uno13WeakReferenceINS8_2ui13XImageManagerEEEEEEEEC2ERKSG_
++_ZN4_STL9allocatorINS_15_Hashtable_nodeINS_4pairIKN3rtl8OUStringEN3com3sun4star3uno13WeakReferenceINS8_2ui13XImageManagerEEEEEEEED1Ev
++_ZN4_STL9hashtableINS_4pairIKN3rtl8OUStringEN3com3sun4star3uno13WeakReferenceINS7_2ui13XImageManagerEEEEES3_NS2_12OUStringHashENS_10_Select1stISD_EENS_8equal_toIS3_EENS_9allocatorISD_EEE21_M_initialize_bucketsEj
++_ZNK4_STL9hashtableINS_4pairIKN3rtl8OUStringEN3com3sun4star3uno13WeakReferenceINS7_2ui13XImageManagerEEEEES3_NS2_12OUStringHashENS_10_Select1stISD_EENS_8equal_toIS3_EENS_9allocatorISD_EEE12_M_next_sizeEj
++_ZN4_STL9allocatorINS_4pairIKN3rtl8OUStringEN3com3sun4star3uno13WeakReferenceINS7_2ui13XImageManagerEEEEEED1Ev
++_GLOBAL__I__Z19TransformParameterstRKN3com3sun4star3uno8SequenceINS1_5beans13PropertyValueEEER13SfxAllItemSetPK7SfxSlot
++_ZN6String15CreateFromAsciiEPKc
++_Z13ImplStringLenPKc
++_ZN6StringC1Ev
++_ZN6String11AllocBufferEt
++_Z13ImplAllocDatal
++_Z16ImplCopyAsciiStrPtPKcl
++_GLOBAL__I_aSfxStringItem_Impl
++_ZN13SfxStringItem10StaticTypeEv
++_ZN11SfxBoolItem10StaticTypeEv
++_ZN12SfxInt16Item10StaticTypeEv
++_ZN19SfxDocumentInfoItem10StaticTypeEv
++_ZN11SfxVoidItem10StaticTypeEv
++_ZN13SfxUInt16Item10StaticTypeEv
++_ZN16SfxRectangleItem10StaticTypeEv
++_ZN12SfxFrameItem10StaticTypeEv
++_ZN22SfxScriptOrganizerItem10StaticTypeEv
++_ZN13SfxUInt32Item10StaticTypeEv
++_GLOBAL__I__ZN14SfxApplication4pAppE
++_GLOBAL__I__ZN9xmlscript22exportLibraryContainerERKN3com3sun4star3uno9ReferenceINS2_3xml3sax24XExtendedDocumentHandlerEEEPKNS_18LibDescriptorArrayE
++_GLOBAL__I__Z11SbRtl_CBoolP9StarBASICR8SbxArrayh
++_ZN12IntervalInfoC1E8IntervalPKcdb
++_GLOBAL__I__Z13getVBAGlobalsP9StarBASIC
++_GLOBAL__I__ZN5basic25SfxDialogLibraryContainer4initERKN3rtl8OUStringERKN3com3sun4star3uno9ReferenceINS7_5embed8XStorageEEE
++_GLOBAL__I__ZN10SbiScannerC2ERKN3rtl8OUStringEP9StarBASIC
++_ZN11LetterTableC1Ev
++_GLOBAL__I__ZN11SbUnoMethod10CreateTypeEv
++_GLOBAL__I__ZN8SbModule10CreateTypeEv
++_GLOBAL__I__ZN14SbTextPortionsC2Eth
++_ZN10SbxInfoRefC1EP7SbxInfo
++_GLOBAL__I__ZN12BasicManager10CreateTypeEv
++_GLOBAL__I__Z12exportXFormsR11SvXMLExport
++_GLOBAL__I__ZN6xmloff16PROPERTY_CLASSIDE
++_ZN6xmloff16ConstAsciiStringC1EPKcl
++_GLOBAL__I__ZN6xmloff15OElementNameMap22s_sElementTranslationsE
++_ZN4_STL3mapIN3rtl8OUStringEN6xmloff15OControlElement11ElementTypeEN10comphelper11UStringLessENS_9allocatorINS_4pairIKS2_S5_EEEEEC1Ev
++_ZN4_STL9allocatorINS_4pairIKN3rtl8OUStringEN6xmloff15OControlElement11ElementTypeEEEEC1Ev
++_ZN4_STL8_Rb_treeIN3rtl8OUStringENS_4pairIKS2_N6xmloff15OControlElement11ElementTypeEEENS_10_Select1stIS8_EEN10comphelper11UStringLessENS_9allocatorIS8_EEEC1ERKSC_RKSE_
[...19608 lines suppressed...]
++_ZNK10SfxItemSet5CountEv
++_ZNK11SfxItemPool17GetFrozenIdRangesEv
++_ZNK11SfxVoidItem3IsAEPFPvvE
++_ZN11SfxVoidItem4IsOfEPFPvvE
++_ZN3com3sun4star4util3URLaSERKS3_
++_ZNK3com3sun4star3uno9ReferenceINS1_5frame15XStatusListenerEEptEv
++_ZN17SfxToolBoxControl13statusChangedERKN3com3sun4star5frame17FeatureStateEventE
++_ZNK3svt17ToolboxController17getFrameInterfaceEv
++_ZN25SfxAppToolBoxControl_Impl12StateChangedEttPK11SfxPoolItem
++_ZN11SfxPoolItem4IsOfEPFPvvE
++_ZN11SfxPoolItem10StaticTypeEv
++_ZN17SfxToolBoxControl12StateChangedEttPK11SfxPoolItem
++_ZN11SfxVoidItemD0Ev
++_ZN11SfxPoolItemD2Ev
++_ZN4_STL6vectorIN3svt17ToolboxController8ListenerENS_9allocatorIS3_EEED1Ev
++_ZN4_STL8_DestroyIN3svt17ToolboxController8ListenerEEEvPT_
++_ZN4_STL12_Vector_baseIN3svt17ToolboxController8ListenerENS_9allocatorIS3_EEED2Ev
++_ZN4_STL17_STLP_alloc_proxyIPN3svt17ToolboxController8ListenerES3_NS_9allocatorIS3_EEED1Ev
++_ZN4_STL9allocatorIN3svt17ToolboxController8ListenerEED2Ev
++_ZNK9Container9GetCurPosEv
++_ZN12ImplIdleList4NextEv
++_ZN9Container4NextEv
++_ZN9framework24GenericToolbarController13statusChangedERKN3com3sun4star5frame17FeatureStateEventE
++_ZN3com3sun4star5frame6status10ItemStatusC1Ev
++_ZN3com3sun4star5frame6status10VisibilityC1Ev
++_ZN3com3sun4star3unorSINS1_5frame6status10ItemStatusEEEhRKNS2_3AnyERT_
++_ZN4cppu21getTypeFavourUnsignedIN3com3sun4star5frame6status10ItemStatusEEERKNS3_3uno4TypeEPKT_
++_ZN4cppu7UnoTypeIN3com3sun4star5frame6status10ItemStatusEE3getEv
++_ZN3com3sun4star5frame6status22cppu_detail_getUnoTypeEPKNS3_10ItemStatusE
++_ZN3com3sun4star3unorSINS1_5frame6status10VisibilityEEEhRKNS2_3AnyERT_
++_ZN4cppu21getTypeFavourUnsignedIN3com3sun4star5frame6status10VisibilityEEERKNS3_3uno4TypeEPKT_
++_ZN4cppu7UnoTypeIN3com3sun4star5frame6status10VisibilityEE3getEv
++_ZN3com3sun4star5frame6status22cppu_detail_getUnoTypeEPKNS3_10VisibilityE
++_ZN3com3sun4star5frame6status10ItemStatusD1Ev
++_Z35SfxStubSfxApplicationMiscState_ImplP8SfxShellR10SfxItemSet
++_ZN14SfxApplication14MiscState_ImplER10SfxItemSet
++_ZNK11AllSettings9GetLocaleEv
++_ZN17LocaleDataWrapperC1ERKN3com3sun4star3uno9ReferenceINS2_4lang20XMultiServiceFactoryEEERKNS5_6LocaleE
++_ZN3com3sun4star3uno9ReferenceINS1_4i18n12XLocaleData2EEC1Ev
++_ZN3com3sun4star3uno9ReferenceINS1_4i18n8CalendarEEC1Ev
++_ZN3com3sun4star4i18n14LocaleDataItemC1Ev
++_ZN3utl14ReadWriteMutexC1Ev
++_ZN17LocaleDataWrapper9setLocaleERKN3com3sun4star4lang6LocaleE
++_ZN3utl14ReadWriteGuardC1ERNS_14ReadWriteMutexEl
++_ZN17LocaleDataWrapper14invalidateDataEv
++_ZN3com3sun4star3uno9ReferenceINS1_4i18n8CalendarEEaSEPS5_
++_ZN3com3sun4star3uno9ReferenceINS1_4i18n8CalendarEE3setEPS5_
++_ZN3com3sun4star3uno9ReferenceINS1_4i18n8CalendarEE16castToXInterfaceEPS5_
++_ZN3utl14ReadWriteGuardD1Ev
++_Z25LocaleData_CreateInstanceRKN3com3sun4star3uno9ReferenceINS1_4lang20XMultiServiceFactoryEEE
++_ZN3com3sun4star4i18n10LocaleDataC1Ev
++_ZN4cppu15WeakImplHelper2IN3com3sun4star4i18n12XLocaleData2ENS3_4lang12XServiceInfoEEC2Ev
++_ZN3com3sun4star4i18n12XLocaleData2C2Ev
++_ZN3com3sun4star4i18n11XLocaleDataC2Ev
++_ZN4_STL9allocatorIPN3com3sun4star4i18n10LocaleData15lookupTableItemEEC1Ev
++_ZN4_STL6vectorIPN3com3sun4star4i18n10LocaleData15lookupTableItemENS_9allocatorIS7_EEEC1ERKS9_
++_ZN4_STL12_Vector_baseIPN3com3sun4star4i18n10LocaleData15lookupTableItemENS_9allocatorIS7_EEEC2ERKS9_
++_ZN4_STL17_STLP_alloc_proxyIPPN3com3sun4star4i18n10LocaleData15lookupTableItemES7_NS_9allocatorIS7_EEEC1ERKSA_S8_
++_ZN4_STL9allocatorIPN3com3sun4star4i18n10LocaleData15lookupTableItemEEC2ERKS8_
++_ZN4_STL9allocatorIPN3com3sun4star4i18n10LocaleData15lookupTableItemEED1Ev
++_ZN3com3sun4star4i18n8CalendarC1Ev
++_ZN3com3sun4star3uno8SequenceINS1_4i18n12CalendarItemEEC1Ev
++_ZN4cppu21getTypeFavourUnsignedIN3com3sun4star4i18n12CalendarItemEEERKNS3_3uno4TypeEPKNS6_8SequenceIT_EE
++_ZN4cppu21getTypeFavourUnsignedIN3com3sun4star4i18n12CalendarItemEEERKNS3_3uno4TypeEPKT_
++_ZN4cppu7UnoTypeIN3com3sun4star4i18n12CalendarItemEE3getEv
++_ZN3com3sun4star4i18n22cppu_detail_getUnoTypeEPKNS2_12CalendarItemE
++_ZN4cppu15WeakImplHelper2IN3com3sun4star4i18n12XLocaleData2ENS3_4lang12XServiceInfoEE7acquireEv
++_ZN4cppu15WeakImplHelper2IN3com3sun4star4i18n12XLocaleData2ENS3_4lang12XServiceInfoEE7releaseEv
++_ZN3com3sun4star3uno9ReferenceINS1_4i18n12XLocaleData2EEC1ERKNS2_13BaseReferenceENS2_18UnoReference_QueryE
++_ZN3com3sun4star3uno9ReferenceINS1_4i18n12XLocaleData2EE6iqueryEPNS2_10XInterfaceE
++_ZN3com3sun4star4i18n12XLocaleData211static_typeEPv
++_Z11getCppuTypePKN3com3sun4star3uno9ReferenceINS1_4i18n12XLocaleData2EEE
++_ZN4cppu7UnoTypeIN3com3sun4star3uno9ReferenceINS3_4i18n12XLocaleData2EEEE3getEv
++_ZN4cppu6detail22cppu_detail_getUnoTypeIN3com3sun4star4i18n12XLocaleData2EEERKNS4_3uno4TypeEPKNS7_9ReferenceIT_EE
++_ZN4cppu7UnoTypeIN3com3sun4star4i18n12XLocaleData2EE3getEv
++_ZN3com3sun4star4i18n22cppu_detail_getUnoTypeEPKNS2_12XLocaleData2E
++_ZN4cppu15WeakImplHelper2IN3com3sun4star4i18n12XLocaleData2ENS3_4lang12XServiceInfoEE14queryInterfaceERKNS3_3uno4TypeE
++_ZN3rtl15StaticAggregateIN4cppu10class_dataENS1_14ImplClassData2IN3com3sun4star4i18n12XLocaleData2ENS6_4lang12XServiceInfoENS1_15WeakImplHelper2IS8_SA_EEEEE3getEv
++_ZN4cppu14ImplClassData2IN3com3sun4star4i18n12XLocaleData2ENS3_4lang12XServiceInfoENS_15WeakImplHelper2IS5_S7_EEEclEv
++_ZN3com3sun4star3uno9ReferenceINS1_4i18n12XLocaleData2EEaSERKS6_
++_ZN3com3sun4star3uno9ReferenceINS1_4i18n12XLocaleData2EE18castFromXInterfaceEPNS2_10XInterfaceE
++_ZN3com3sun4star3uno9ReferenceINS1_4i18n12XLocaleData2EE3setEPS5_
++_ZN3com3sun4star3uno9ReferenceINS1_4i18n12XLocaleData2EE16castToXInterfaceEPS5_
++_ZN3com3sun4star3uno9ReferenceINS1_4i18n12XLocaleData2EED1Ev
++_ZNK10SfxItemSet9GetRangesEv
++_ZN17LocaleDataWrapperD1Ev
++_ZN3utl14ReadWriteMutexD1Ev
++_ZN3com3sun4star4i18n14LocaleDataItemD1Ev
++_ZN3com3sun4star3uno9ReferenceINS1_4i18n8CalendarEED1Ev
++_ZN3com3sun4star4i18n10LocaleDataD0Ev
++_ZNK4_STL6vectorIPN3com3sun4star4i18n10LocaleData15lookupTableItemENS_9allocatorIS7_EEE4sizeEv
++_ZN4_STL6vectorIPN3com3sun4star4i18n10LocaleData15lookupTableItemENS_9allocatorIS7_EEE5clearEv
++_ZN4_STL6vectorIPN3com3sun4star4i18n10LocaleData15lookupTableItemENS_9allocatorIS7_EEE3endEv
++_ZN4_STL6vectorIPN3com3sun4star4i18n10LocaleData15lookupTableItemENS_9allocatorIS7_EEE5beginEv
++_ZN4_STL6vectorIPN3com3sun4star4i18n10LocaleData15lookupTableItemENS_9allocatorIS7_EEE5eraseEPS7_SB_
++_ZN4_STL11__copy_ptrsIPPN3com3sun4star4i18n10LocaleData15lookupTableItemES8_EET0_T_SA_S9_RKNS_11__true_typeE
++_ZN4_STL8_DestroyIPPN3com3sun4star4i18n10LocaleData15lookupTableItemEEEvT_S9_
++_ZN4_STL9__destroyIPPN3com3sun4star4i18n10LocaleData15lookupTableItemES7_EEvT_S9_PT0_
++_ZN4_STL13__destroy_auxIPPN3com3sun4star4i18n10LocaleData15lookupTableItemEEEvT_S9_RKNS_11__true_typeE
++_ZN3com3sun4star4i18n8CalendarD1Ev
++_ZN3com3sun4star3uno8SequenceINS1_4i18n12CalendarItemEED1Ev
++_ZN4_STL6vectorIPN3com3sun4star4i18n10LocaleData15lookupTableItemENS_9allocatorIS7_EEED1Ev
++_ZN4_STL12_Vector_baseIPN3com3sun4star4i18n10LocaleData15lookupTableItemENS_9allocatorIS7_EEED2Ev
++_ZNK4_STL9allocatorIPN3com3sun4star4i18n10LocaleData15lookupTableItemEE10deallocateEPS7_j
++_ZN4_STL17_STLP_alloc_proxyIPPN3com3sun4star4i18n10LocaleData15lookupTableItemES7_NS_9allocatorIS7_EEED1Ev
++_ZN4_STL9allocatorIPN3com3sun4star4i18n10LocaleData15lookupTableItemEED2Ev
++_ZN4cppu15WeakImplHelper2IN3com3sun4star4i18n12XLocaleData2ENS3_4lang12XServiceInfoEED2Ev
++_ZN6Window26LinkStubImplHandlePaintHdlEPvS0_
++_ZN6Window18ImplHandlePaintHdlEPv
++_ZN6Window20ImplCallOverlapPaintEv
++_ZN22ImplNoBorderWindowView10DrawWindowEtP12OutputDevicePK5Point
++_ZN13MenuBarWindow5PaintERK9Rectangle
++_ZN12MenubarValueC1Ev
++_Z27ImplGetTopDockingAreaHeightP6Window
++_Z19ImplAddNWFSeparatorP6WindowRK12MenubarValue
++_ZNK4Menu9ImplPaintEP6WindowtlP12MenuItemDatahb
++_ZN12OutputDevice12DrawCtrlTextERK5PointRK6StringtttPN4_STL6vectorI9RectangleNS6_9allocatorIS8_EEEEPS3_
++_ZNK12OutputDevice17GetCaretPositionsERK6StringPlttS3_lh
++_ZNK16GenericSalLayout17GetCaretPositionsEiPl
++_ZNK9GlyphItem10IsRTLGlyphEv
++_ZNK12OutputDevice13GetFontMetricEv
++_ZN10FontMetricC1Ev
++_ZN8FontInfoC2Ev
++_ZN4FontC2Ev
++_ZN14ImplFontMetricC1Ev
++_ZN4Font12SetStyleNameERK6String
++_ZN4Font9SetFamilyE10FontFamily
++_ZN4Font14SetOrientationEs
++_ZNK12OutputDevice28ImplDevicePixelToLogicHeightEl
++_ZNK10FontMetric9GetAscentEv
++_ZNK14ImplFontMetric9GetAscentEv
++_ZN10FontMetricD1Ev
++_ZN8FontInfoD2Ev
++_ZN14ImplFontMetric11DeReferenceEv
++_ZN4FontD2Ev
++_ZN5PointpLERKS_
++_ZN12OutputDevice8DrawTextERK5PointRK6StringttPN4_STL6vectorI9RectangleNS6_9allocatorIS8_EEEEPS3_
++_ZN11SalGraphics10filterTextERK6StringRS0_tRtS4_S4_
++_ZN12OutputDevice12ImplDrawTextER9SalLayout
++_ZN12OutputDevice17ImplInitTextColorEv
++_ZNK12OutputDevice15IsTextFillColorEv
++_ZN12OutputDevice18ImplDrawTextDirectER9SalLayouth
++_ZNK16ServerFontLayout8DrawTextER11SalGraphics
++_ZNK18FreetypeServerFont18GetAntialiasAdviceEv
++_ZNK16GenericSalLayout13GetNextGlyphsEiPlR5PointRiS0_Pi
++_ZNK9SalLayout15GetDrawPositionERK5Point
++_ZN10ServerFont16IsGlyphInvisibleEi
++_ZNK18FreetypeServerFont15GetGlyphBitmap8EiR9RawBitmap
++_ZN12OutputDevice20ImplDrawMnemonicLineElll
++_ZN12OutputDevice16ImplDrawTextLineEllll13FontStrikeout13FontUnderlineh
++_ZNK12OutputDevice16GetTextLineColorEv
++_ZNK12OutputDevice15IsTextLineColorEv
++_ZN12OutputDevice16ImplDrawTextRectEllllll
++_ZN9StatusBar5PaintERK9Rectangle
++_ZN9StatusBar10ImplFormatEv
++_ZN11ImplIdleMgr18LinkStubTimeoutHdlEPvS0_
++_ZN11ImplIdleMgr10TimeoutHdlEP5Timer
++_ZN21SfxItemDesruptor_Impl14LinkStubDeleteEPvS0_
++_ZN21SfxItemDesruptor_Impl6DeleteEPv
++_ZN21SfxItemDesruptor_ImplD1Ev
++_ZN11Application13RemoveIdleHdlERK4Link
++_ZN11ImplIdleMgr13RemoveIdleHdlERK4Link
++_ZN12ImplIdleList6RemoveEv
++_ZN9Container6RemoveEv
++_ZN6CBlock6RemoveEtt
++_ZNK25SfxItemDesruptorList_Impl6GetPosERPK21SfxItemDesruptor_Impl
++_ZN25SfxItemDesruptorList_Impl6RemoveEtt
++_ZN11SfxPoolItem11SetRefCountEm
++_ZNK12ImplIdleList6GetPosEPK12ImplIdleData
++_Z19ImplHandleSalKeyModP6WindowP14SalKeyModEvent
++_Z21ImplGetKeyInputWindowP6Window
++_ZN28TopWindowListenerMultiplexer17windowDeactivatedERKN3com3sun4star4lang11EventObjectE
++_ZN9framework5Frame17windowDeactivatedERKN3com3sun4star4lang11EventObjectE
++_Z23ImplHandleSalMouseLeaveP6WindowP13SalMouseEvent
++_Z13ImplHandleKeyP6Windowtttth
++_ZNK7KeyCode7GetCodeEv
++_ZN8KeyEventC1EtRK7KeyCodet
++_ZN11Application9HandleKeyEmP6WindowP8KeyEvent
++_ZN6Window5KeyUpERK8KeyEvent
++_ZNK11NotifyEvent11GetKeyEventEv
++_ZN3com3sun4star3awt8KeyEventC1Ev
++_ZN3com3sun4star3awt10InputEventC2Ev
++_Z16ImplInitKeyEventRN3com3sun4star3awt8KeyEventERK8KeyEvent
++_ZNK8KeyEvent10GetKeyCodeEv
++_ZNK7KeyCode7IsShiftEv
++_ZNK7KeyCode6IsMod1Ev
++_ZNK7KeyCode6IsMod2Ev
++_ZNK8KeyEvent11GetCharCodeEv
++_ZNK7KeyCode11GetFunctionEv
++_ZNK7KeyCode11GetModifierEv
++_Z14ImplGetKeyCode11KeyFuncTypeRtS0_S0_
++_ZN3sal15static_int_castIs11KeyFuncTypeEET_T0_
++_ZN22KeyListenerMultiplexer11keyReleasedERKN3com3sun4star3awt8KeyEventE
++_ZN3com3sun4star3awt8KeyEventC1ERKS3_
++_ZN3com3sun4star3awt10InputEventC2ERKS3_
++_ZN3com3sun4star3uno9ReferenceINS1_3awt12XKeyListenerEEC1EPS5_
++_ZN3com3sun4star3uno9ReferenceINS1_3awt12XKeyListenerEE16castToXInterfaceEPS5_
++_ZNK3com3sun4star3uno9ReferenceINS1_3awt12XKeyListenerEEptEv
++_ZN3com3sun4star3uno9ReferenceINS1_3awt12XKeyListenerEE18castFromXInterfaceEPNS2_10XInterfaceE
++_ZN9framework11BackingComp11keyReleasedERKN3com3sun4star3awt8KeyEventE



From fedora-cvs-commits at redhat.com  Fri Apr 13 09:36:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 05:36:36 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.420,1.421
Message-ID: <200704130936.l3D9aaKx023214@cvs.devel.redhat.com>

Author: bkonrath

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

Modified Files:
	eclipse.spec 
Log Message:
add BR: eclipse-pde to work around a GCJ classloading bug


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -r1.420 -r1.421
--- eclipse.spec	11 Apr 2007 10:21:11 -0000	1.420
+++ eclipse.spec	13 Apr 2007 09:36:34 -0000	1.421
@@ -126,6 +126,8 @@
 %if %{gcj_support}
 BuildRequires:  gcc-java >= 4.0.2
 BuildRequires:  java-gcj-compat-devel >= 1.0.64
+# GCJ class loading bug requires this
+BuildRequires:  eclipse-pde
 %else
 BuildRequires:  java-devel >= 1.4.2
 %endif



From fedora-cvs-commits at redhat.com  Fri Apr 13 10:29:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 06:29:31 -0400
Subject: rpms/dovecot/devel .cvsignore, 1.21.2.1, 1.21.2.2 dovecot.spec,
	1.70.2.4, 1.70.2.5 sources, 1.22.2.1, 1.22.2.2
Message-ID: <200704131029.l3DATVEr024039@cvs.devel.redhat.com>

Author: tjanouse

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

Modified Files:
      Tag: private-145241-branch
	.cvsignore dovecot.spec sources 
Log Message:
* Fri Apr 13 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0-11.5.rc32
- update to latest upstream
- specfile merge from devel



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dovecot/devel/.cvsignore,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -r1.21.2.1 -r1.21.2.2
--- .cvsignore	27 Mar 2007 09:32:28 -0000	1.21.2.1
+++ .cvsignore	13 Apr 2007 10:29:29 -0000	1.21.2.2
@@ -1,4 +1,4 @@
-dovecot-1.0.rc28.tar.gz
-dovecot-1.0.rc28.tar.gz.sig
+dovecot-1.0.rc32.tar.gz
+dovecot-1.0.rc32.tar.gz.sig
 dovecot-sieve-1.0.1.tar.gz
 dovecot-sieve-1.0.1.tar.gz.sig


Index: dovecot.spec
===================================================================
RCS file: /cvs/dist/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.70.2.4
retrieving revision 1.70.2.5
diff -u -r1.70.2.4 -r1.70.2.5
--- dovecot.spec	30 Mar 2007 12:05:35 -0000	1.70.2.4
+++ dovecot.spec	13 Apr 2007 10:29:29 -0000	1.70.2.5
@@ -1,6 +1,8 @@
+%define upstream 1.0.rc32
+%define sieve_upstream 1.0.1
 %define pkg_version 1.0
-%define my_release 8.6
-%define pkg_release %{my_release}.rc28%{?dist}
+%define my_release 11.5
+%define pkg_release %{my_release}.rc32%{?dist}
 %define pkg_sieve_version 1.0.1
 %define pkg_sieve_release %{my_release}%{?dist}
 
@@ -14,11 +16,9 @@
 %define build_postgres 1
 %define build_mysql 1
 %define build_sqlite 1
-%define upstream 1.0.rc28
 
 %define build_sieve 1
 %define sieve_name dovecot-sieve
-%define sieve_upstream 1.0.1
 
 Source: http://dovecot.org/releases/%{name}-%{upstream}.tar.gz
 Source1: dovecot.init
@@ -355,6 +355,10 @@
 %endif
 
 %changelog
+* Fri Apr 13 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0-11.5.rc32
+- update to latest upstream
+- specfile merge from devel
+
 * Wed Mar 28 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0-8.6.rc28
 - support for not building all sql modules
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dovecot/devel/sources,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -r1.22.2.1 -r1.22.2.2
--- sources	27 Mar 2007 09:32:28 -0000	1.22.2.1
+++ sources	13 Apr 2007 10:29:29 -0000	1.22.2.2
@@ -1,4 +1,4 @@
-e6fd617f3210f914815186c176796881  dovecot-1.0.rc28.tar.gz
-a3198c2db6b43472bc3afdd51e538711  dovecot-1.0.rc28.tar.gz.sig
+e74f9ff5d1349c0ee8cfafffbe5d45c7  dovecot-1.0.rc32.tar.gz
+388f05a0619052fd68b348473fdab1f3  dovecot-1.0.rc32.tar.gz.sig
 b070d2177009bb555cd7e25c710047d5  dovecot-sieve-1.0.1.tar.gz
 c9f5a39ef66e427968141f265c879d60  dovecot-sieve-1.0.1.tar.gz.sig



From fedora-cvs-commits at redhat.com  Fri Apr 13 10:38:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 06:38:45 -0400
Subject: rpms/hplip/FC-6 hplip.spec,1.104,1.105
Message-ID: <200704131038.l3DAcjLw009953@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
* Fri Apr 13 2007 Tim Waugh <twaugh at redhat.com>
- Bumped selinux-policy conflict version (bug #236092).
- Resolves: rhbz#236092



Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-6/hplip.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- hplip.spec	11 Apr 2007 16:46:05 -0000	1.104
+++ hplip.spec	13 Apr 2007 10:38:43 -0000	1.105
@@ -9,7 +9,7 @@
 Obsoletes: xojpanel <= 0.91
 
 # Need selinux-policy to know about new port numbers (bug #201357).
-Conflicts: selinux-policy < 2.3.4-1
+Conflicts: selinux-policy < 2.4.6-52
 
 Url: http://hplip.sourceforge.net/
 Source: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
@@ -193,6 +193,9 @@
 exit 0
 
 %changelog
+* Fri Apr 13 2007 Tim Waugh <twaugh at redhat.com>
+- Bumped selinux-policy conflict version (bug #236092).
+
 * Wed Apr 11 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-1
 - 1.7.2.
 - Better media-empty-error state handling: always set the state.



From fedora-cvs-commits at redhat.com  Fri Apr 13 10:38:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 06:38:49 -0400
Subject: rpms/hplip/devel hplip.spec,1.116,1.117
Message-ID: <200704131038.l3DAcnUJ010021@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
* Fri Apr 13 2007 Tim Waugh <twaugh at redhat.com>
- Bumped selinux-policy conflict version (bug #236092).
- Resolves: rhbz#236092



Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- hplip.spec	5 Apr 2007 15:39:29 -0000	1.116
+++ hplip.spec	13 Apr 2007 10:38:46 -0000	1.117
@@ -9,7 +9,7 @@
 Obsoletes: xojpanel <= 0.91
 
 # Need selinux-policy to know about new port numbers (bug #201357).
-Conflicts: selinux-policy < 2.3.4-1
+Conflicts: selinux-policy < 2.4.6-52
 
 Url: http://hplip.sourceforge.net/
 Source: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
@@ -251,6 +251,9 @@
 exit 0
 
 %changelog
+* Fri Apr 13 2007 Tim Waugh <twaugh at redhat.com>
+- Bumped selinux-policy conflict version (bug #236092).
+
 * Thu Apr  5 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-5
 - Better media-empty-error state handling: always set the state.
 



From fedora-cvs-commits at redhat.com  Fri Apr 13 10:51:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 06:51:57 -0400
Subject: rpms/selinux-policy/FC-6 selinux-policy.spec,1.358,1.359
Message-ID: <200704131051.l3DApvOj019561@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	selinux-policy.spec 
Log Message:
* Thu Apr 12 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-56
- Allow lvm mls_file_read_up to look at Fixed disks
Resolves: #236060
- More fixes for apcupsd



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/selinux-policy.spec,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- selinux-policy.spec	12 Apr 2007 21:10:07 -0000	1.358
+++ selinux-policy.spec	13 Apr 2007 10:51:55 -0000	1.359
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.4.6
-Release: 54%{?dist}
+Release: 56%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz



From fedora-cvs-commits at redhat.com  Fri Apr 13 11:17:54 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 07:17:54 -0400
Subject: rpms/hplip/FC-6 hplip.spec,1.105,1.106
Message-ID: <200704131117.l3DBHsZn006213@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
1.7.2-2


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-6/hplip.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- hplip.spec	13 Apr 2007 10:38:43 -0000	1.105
+++ hplip.spec	13 Apr 2007 11:17:52 -0000	1.106
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 1.7.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -193,7 +193,7 @@
 exit 0
 
 %changelog
-* Fri Apr 13 2007 Tim Waugh <twaugh at redhat.com>
+* Fri Apr 13 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-2
 - Bumped selinux-policy conflict version (bug #236092).
 
 * Wed Apr 11 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-1



From fedora-cvs-commits at redhat.com  Fri Apr 13 11:54:25 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 07:54:25 -0400
Subject: rpms/hplip/devel hplip.spec,1.117,1.118
Message-ID: <200704131154.l3DBsPlM015189@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
* Fri Apr 13 2007 Tim Waugh <twaugh at redhat.com>
- Run update-desktop-database in the gui package's %post scriptlet
  (bug #236163).
- Moved desktop-file-utils requirement to gui package (bug #236163).
- Resolves: rhbz#236163


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- hplip.spec	13 Apr 2007 10:38:46 -0000	1.117
+++ hplip.spec	13 Apr 2007 11:54:23 -0000	1.118
@@ -24,8 +24,6 @@
 Patch9: hplip-media-empty.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
-Requires: desktop-file-utils >= 0.2.92
-
 %define hpijs_epoch 1
 Requires: hpijs = %{hpijs_epoch}:%{version}-%{release}
 
@@ -47,6 +45,7 @@
 Group: Applications/System
 License: BSD
 Requires: PyQt
+Requires: desktop-file-utils >= 0.2.92
 Requires: %{name} = %{version}-%{release}
 
 %description gui
@@ -242,6 +241,9 @@
 fi
 exit 0
 
+%post gui
+/usr/bin/update-desktop-database &>/dev/null ||:
+
 %post -n libsane-hpaio
 /sbin/ldconfig
 if [ -f /etc/sane.d/dll.conf ] && \
@@ -252,6 +254,9 @@
 
 %changelog
 * Fri Apr 13 2007 Tim Waugh <twaugh at redhat.com>
+- Run update-desktop-database in the gui package's %%post scriptlet
+  (bug #236163).
+- Moved desktop-file-utils requirement to gui package (bug #236163).
 - Bumped selinux-policy conflict version (bug #236092).
 
 * Thu Apr  5 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-5



From fedora-cvs-commits at redhat.com  Fri Apr 13 12:00:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 08:00:47 -0400
Subject: rpms/hplip/devel hplip.spec,1.118,1.119
Message-ID: <200704131200.l3DC0lOB015362@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
* Fri Apr 13 2007 Tim Waugh <twaugh at redhat.com>
- Don't ship fax PPD and backend twice (bug #236092).
- Resolves: rhbz#236092



Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- hplip.spec	13 Apr 2007 11:54:23 -0000	1.118
+++ hplip.spec	13 Apr 2007 12:00:40 -0000	1.119
@@ -154,6 +154,8 @@
 rm -f %{buildroot}%{_datadir}/hplip/hplip-install
 rm -rf %{buildroot}%{_datadir}/hplip/install*
 rm -f %{buildroot}%{_datadir}/hplip/hpaio.desc
+rm -rf %{buildroot}%{_datadir}/hplip/fax/ppd
+rm -rf %{buildroot}%{_datadir}/hplip/fax/backend
 
 %clean
 rm -rf %{buildroot}
@@ -254,6 +256,7 @@
 
 %changelog
 * Fri Apr 13 2007 Tim Waugh <twaugh at redhat.com>
+- Don't ship fax PPD and backend twice (bug #236092).
 - Run update-desktop-database in the gui package's %%post scriptlet
   (bug #236163).
 - Moved desktop-file-utils requirement to gui package (bug #236163).



From fedora-cvs-commits at redhat.com  Fri Apr 13 12:04:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 08:04:43 -0400
Subject: rpms/openoffice.org/FC-6 openoffice.org-cairoupdate.patch, NONE,
	1.1 openoffice.org.spec, 1.939, 1.940 workspace.glyphadv.patch,
	1.3, NONE
Message-ID: <200704131204.l3DC4hoP015496@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-cairoupdate.patch 
Removed Files:
	workspace.glyphadv.patch 
Log Message:
openoffice.org-cairoupdate.patch

openoffice.org-cairoupdate.patch:
 gcach_ftyp.cxx |   44 ++++++++++++++++++++++----------------------
 1 files changed, 22 insertions(+), 22 deletions(-)

--- NEW FILE openoffice.org-cairoupdate.patch ---
diff -ru vcl/source/glyphs/gcach_ftyp.cxx vcl/source/glyphs/gcach_ftyp.cxx
--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx	2007-04-13 12:43:26.000000000 +0100
+++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx	2007-04-13 12:52:07.000000000 +0100
@@ -851,38 +851,38 @@
     // enable "light hinting" if available
     if( !(mnLoadFlags & FT_LOAD_NO_HINTING) && (nFTVERSION >= 2103))
     {
+       mnLoadFlags |= FT_LOAD_TARGET_NORMAL;
        switch (aHints.GetHintStyle())
        {
-           default:
+           case HINT_NONE:
+                mnLoadFlags |= FT_LOAD_NO_HINTING;
+                break;
            case HINT_SLIGHT:
-           case HINT_MEDIUM:
                 mnLoadFlags |= FT_LOAD_TARGET_LIGHT;
+           case HINT_MEDIUM:
                 break;
            case HINT_FULL:
-                mnLoadFlags |= FT_LOAD_TARGET_NORMAL;
-                break;
-           case HINT_NONE:
-                break;
+           default:
+               switch (aHints.GetSubPixel())
+               {
+                       case SUBPIXEL_NONE:
+                           break;
+                       default:
+                       case SUBPIXEL_UNKNOWN:
+                       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;
+               }
+               break;
        }
     }
 #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;
 }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v
retrieving revision 1.939
retrieving revision 1.940
diff -u -r1.939 -r1.940
--- openoffice.org.spec	6 Apr 2007 12:53:21 -0000	1.939
+++ openoffice.org.spec	13 Apr 2007 12:04:40 -0000	1.940
@@ -1,6 +1,6 @@
 %define oootag OOD680
 %define ooomilestone 5
-%define rh_rpm_release 5.19
+%define rh_rpm_release 5.20
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -162,7 +162,7 @@
 Patch94: openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch
 Patch95: workspace.sixtyfour11.patch
 Patch96: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
-Patch97: workspace.glyphadv.patch
+Patch97: openoffice.org-cairoupdate.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1059,7 +1059,7 @@
 %patch94 -p1 -b .ooo74451.sw.typemismatch.patch
 %patch95 -p1 -b .workspace.sixtyfour11.patch
 %patch96 -p1 -b .ooo75167.framework.workspacerestore.patch
-%patch97 -p1 -b .workspace.glyphadv.patch
+%patch97 -p1 -b .openoffice.org-cairoupdate.patch
 
 tar xzf %{SOURCE1}
 
@@ -2589,8 +2589,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Fri Apr 13 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.20
+- Resolves: rhbz#235834 update subpixel logic
+
 * Thu Apr 05 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.19
-- Resolves: rhbz#235341 workspace.glyphadv.patch
 - add some valgrind fixes
 
 * Thu Mar 29 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.18


--- workspace.glyphadv.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 13 12:29:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 08:29:36 -0400
Subject: rpms/telnet/devel netkit-telnet-0.17-nodns.patch, NONE,
	1.1 telnet.spec, 1.28, 1.29
Message-ID: <200704131229.l3DCTa1O015811@cvs.devel.redhat.com>

Author: atkac

Update of /cvs/dist/rpms/telnet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15775

Modified Files:
	telnet.spec 
Added Files:
	netkit-telnet-0.17-nodns.patch 
Log Message:
added new option (-c) which disables reverse dns checking
added smp_mflags and dist macros


netkit-telnet-0.17-nodns.patch:
 telnetd.8 |    2 ++
 telnetd.c |   15 ++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

--- NEW FILE netkit-telnet-0.17-nodns.patch ---
--- netkit-telnet-0.17/telnetd/telnetd.8.nodns	2000-07-31 01:57:10.000000000 +0200
+++ netkit-telnet-0.17/telnetd/telnetd.8	2007-04-13 10:58:27.000000000 +0200
@@ -123,6 +123,8 @@
 .Xr login 1
 program.
 .El
+.It Fl c
+This option disables reverse dns checking. Of course that security is lower with this option
 .It Fl D Ar debugmode
 This option may be used for debugging purposes.  This allows
 .Nm telnetd
--- netkit-telnet-0.17/telnetd/telnetd.c.nodns	2007-04-13 10:49:57.000000000 +0200
+++ netkit-telnet-0.17/telnetd/telnetd.c	2007-04-13 10:49:57.000000000 +0200
@@ -83,6 +83,7 @@
 
 int debug = 0;
 int keepalive = 1;
+int nodns = 0;
 char *loginprg = _PATH_LOGIN;
 char *progname;
 
@@ -111,7 +112,7 @@
 
 	progname = *argv;
 
-	while ((ch = getopt(argc, argv, "d:a:e:lhnr:I:D:B:sS:a:X:L:")) != EOF) {
+	while ((ch = getopt(argc, argv, "cd:a:e:lhnr:I:D:B:sS:a:X:L:")) != EOF) {
 		switch(ch) {
 
 #ifdef	AUTHENTICATE
@@ -147,7 +148,9 @@
 			bftpd++;
 			break;
 #endif /* BFTPDAEMON */
-
+		case 'c':
+			nodns++;
+			break;
 		case 'd':
 			if (strcmp(optarg, "ebug") == 0) {
 				debug++;
@@ -652,6 +655,9 @@
 	char namebuf[255];
 
 	error = getnameinfo(who, wholen, namebuf, sizeof(namebuf), NULL, 0, 0);
+
+	if ((error == EAI_AGAIN) && nodns)
+		error = getnameinfo(who, wholen, namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
 	
 	if (error) {
 		perror("getnameinfo: localhost");
@@ -688,7 +694,10 @@
 		hints.ai_socktype = SOCK_STREAM;
 		hints.ai_flags = AI_ADDRCONFIG;
 
-		gethostname(host_name, sizeof(host_name));
+		if(nodns)
+			sprintf(host_name, "localhost", sizeof(host_name));
+		else
+			gethostname(host_name, sizeof(host_name));
 		if ((e = getaddrinfo(host_name, NULL, &hints, &res)) != 0) {
 			perror("getaddrinfo: localhost");
 			perror(gai_strerror(e));


Index: telnet.spec
===================================================================
RCS file: /cvs/dist/rpms/telnet/devel/telnet.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- telnet.spec	14 Jul 2006 11:15:09 -0000	1.28
+++ telnet.spec	13 Apr 2007 12:29:34 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: The client program for the telnet remote login protocol.
 Name: telnet
 Version: 0.17
-Release: 37
+Release: 38%{?dist}
 Epoch: 1
 License: BSD
 Group: Applications/Internet
@@ -25,6 +25,7 @@
 Patch17: telnet-0.17-linemode.patch
 Patch18: telnet-gethostbyname.patch
 Patch19: netkit-telnet-0.17-ipv6.diff
+Patch20: netkit-telnet-0.17-nodns.patch
 
 BuildPreReq: ncurses-devel
 Buildroot: %{_tmppath}/%{name}-root
@@ -66,6 +67,7 @@
 #%patch17 -p1 -b .linemode
 %patch18 -p1 -b .gethost
 %patch19 -p1 -b .gethost
+%patch20 -p1 -b .nodns
 
 %build
 export OPT_FLAGS="$RPM_OPT_FLAGS -g"
@@ -99,7 +101,7 @@
 	./telnetlogin/Makefile \
 	./telnet-NETKIT/Makefile
 
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -131,6 +133,11 @@
 %{_mandir}/man8/telnetd.8*
 
 %changelog
+* Fri Apr 13 2007 Adam Tkac <atkac redhat com> - 1:0.17-38.fc7
+- added -c option which disables reverse dns checking (#223448)
+- added smp_mflags to make
+- start using dist macro
+
 * Fri Jul 14 2006 Harald Hoyer <harald at redhat.com> - 1:0.17-37
 - added netkit-telnet-0.17-ipv6.diff from Marek Gr??c, 
   which adds IPv6 support to telnetd



From fedora-cvs-commits at redhat.com  Fri Apr 13 12:31:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 08:31:26 -0400
Subject: rpms/dovecot/devel .cvsignore, 1.24, 1.25 dovecot.spec, 1.74,
	1.75 sources, 1.25, 1.26
Message-ID: <200704131231.l3DCVQJP029561@cvs.devel.redhat.com>

Author: tjanouse

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

Modified Files:
	.cvsignore dovecot.spec sources 
Log Message:
* Fri Apr 13 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0.0-11
- update to latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dovecot/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	10 Apr 2007 16:51:43 -0000	1.24
+++ .cvsignore	13 Apr 2007 12:31:23 -0000	1.25
@@ -1,4 +1,4 @@
-dovecot-1.0.rc31.tar.gz
-dovecot-1.0.rc31.tar.gz.sig
+dovecot-1.0.0.tar.gz
+dovecot-1.0.0.tar.gz.sig
 dovecot-sieve-1.0.1.tar.gz
 dovecot-sieve-1.0.1.tar.gz.sig


Index: dovecot.spec
===================================================================
RCS file: /cvs/dist/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- dovecot.spec	10 Apr 2007 16:51:43 -0000	1.74
+++ dovecot.spec	13 Apr 2007 12:31:23 -0000	1.75
@@ -1,8 +1,8 @@
-%define upstream 1.0.rc31
+%define upstream 1.0.0
 %define sieve_upstream 1.0.1
-%define pkg_version 1.0
-%define my_release 10
-%define pkg_release %{my_release}.rc31%{?dist}
+%define pkg_version 1.0.0
+%define my_release 11
+%define pkg_release %{my_release}%{?dist}
 %define pkg_sieve_version 1.0.1
 %define pkg_sieve_release %{my_release}%{?dist}
 
@@ -295,6 +295,9 @@
 
 
 %changelog
+* Fri Apr 13 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0.0-11
+- update to latest upstream
+
 * Tue Apr 10 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0-10.rc31
 - update to latest upstream
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dovecot/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	10 Apr 2007 16:51:43 -0000	1.25
+++ sources	13 Apr 2007 12:31:23 -0000	1.26
@@ -1,4 +1,4 @@
-246b74f72bc710b3348307955de29292  dovecot-1.0.rc31.tar.gz
-4ea850201debd538caa107c9d363ad4b  dovecot-1.0.rc31.tar.gz.sig
+65ccc71e66c495c536d8fb8a7ae39bb3  dovecot-1.0.0.tar.gz
+621f2d7bd2099b729e689bf35dcd30e8  dovecot-1.0.0.tar.gz.sig
 b070d2177009bb555cd7e25c710047d5  dovecot-sieve-1.0.1.tar.gz
 c9f5a39ef66e427968141f265c879d60  dovecot-sieve-1.0.1.tar.gz.sig



From fedora-cvs-commits at redhat.com  Fri Apr 13 12:32:41 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 08:32:41 -0400
Subject: rpms/hplip/devel hplip.spec,1.119,1.120
Message-ID: <200704131232.l3DCWfGw030484@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
* Fri Apr 13 2007 Tim Waugh <twaugh at redhat.com>
- Fixed dangling symlinks (bug #236156).
- Move all fax bits to the gui package (bug #236161).
- Resolves: rhbz#236156 rhbz#236161


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- hplip.spec	13 Apr 2007 12:00:40 -0000	1.119
+++ hplip.spec	13 Apr 2007 12:32:39 -0000	1.120
@@ -166,7 +166,17 @@
 %dir %{_sysconfdir}/hp
 %config(noreplace) %{_sysconfdir}/hp/hplip.conf
 %config(noreplace) %{_sysconfdir}/rc.d/init.d/hplip
-%{_bindir}/hp-*
+%{_bindir}/hp-align
+%{_bindir}/hp-check
+%{_bindir}/hp-clean
+%{_bindir}/hp-colorcal
+%{_bindir}/hp-firmware
+%{_bindir}/hp-info
+%{_bindir}/hp-levels
+%{_bindir}/hp-makeuri
+%{_bindir}/hp-probe
+%{_bindir}/hp-testpage
+%{_bindir}/hp-unload
 %{_sbindir}/hpiod
 /usr/lib/cups/backend/hp
 /usr/lib/cups/backend/hpfax
@@ -174,6 +184,7 @@
 %dir %{_datadir}/hplip
 # Files
 %{_datadir}/hplip/align
+%{_datadir}/hplip/check
 %{_datadir}/hplip/clean
 %{_datadir}/hplip/colorcal
 %{_datadir}/hplip/firmware
@@ -185,6 +196,7 @@
 %{_datadir}/hplip/probe
 %{_datadir}/hplip/testpage
 %{_datadir}/hplip/timedate
+%{_datadir}/hplip/unload
 # Directories
 %{_datadir}/hplip/base
 %{_datadir}/hplip/Cheetah
@@ -201,8 +213,14 @@
 %{_datadir}/hplip/scan
 
 %files gui
+%{_bindir}/hp-fab
+%{_bindir}/hp-makecopies
+%{_bindir}/hp-print
+%{_bindir}/hp-sendfax
+%{_bindir}/hp-setup
+%{_bindir}/hp-timedate
+%{_bindir}/hp-toolbox
 # Files
-%{_datadir}/hplip/check
 %{_datadir}/hplip/data/images
 %{_datadir}/hplip/fab
 %{_datadir}/hplip/fax
@@ -211,7 +229,6 @@
 %{_datadir}/hplip/sendfax
 %{_datadir}/hplip/setup
 %{_datadir}/hplip/toolbox
-%{_datadir}/hplip/unload
 # Directories
 %{_datadir}/hplip/ui
 %{_datadir}/hplip/plugins
@@ -256,6 +273,8 @@
 
 %changelog
 * Fri Apr 13 2007 Tim Waugh <twaugh at redhat.com>
+- Fixed dangling symlinks (bug #236156).
+- Move all fax bits to the gui package (bug #236161).
 - Don't ship fax PPD and backend twice (bug #236092).
 - Run update-desktop-database in the gui package's %%post scriptlet
   (bug #236163).



From fedora-cvs-commits at redhat.com  Fri Apr 13 12:32:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 08:32:53 -0400
Subject: rpms/hplip/devel hplip.spec,1.120,1.121
Message-ID: <200704131232.l3DCWrVp030634@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
1.7.2-6


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- hplip.spec	13 Apr 2007 12:32:39 -0000	1.120
+++ hplip.spec	13 Apr 2007 12:32:50 -0000	1.121
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 1.7.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -272,7 +272,7 @@
 exit 0
 
 %changelog
-* Fri Apr 13 2007 Tim Waugh <twaugh at redhat.com>
+* Fri Apr 13 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-6
 - Fixed dangling symlinks (bug #236156).
 - Move all fax bits to the gui package (bug #236161).
 - Don't ship fax PPD and backend twice (bug #236092).



From fedora-cvs-commits at redhat.com  Fri Apr 13 12:59:02 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 08:59:02 -0400
Subject: rpms/selinux-policy/FC-6 policy-20061106.patch,1.34,1.35
Message-ID: <200704131259.l3DCx2dg017273@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20061106.patch 
Log Message:
* Thu Apr 12 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-56
- Allow lvm mls_file_read_up to look at Fixed disks
Resolves: #236060
- More fixes for apcupsd


policy-20061106.patch:
 Rules.modular                                |   10 
 config/appconfig-strict-mcs/seusers          |    1 
 config/appconfig-strict-mls/default_contexts |    6 
 config/appconfig-strict-mls/seusers          |    1 
 config/appconfig-strict/seusers              |    1 
 man/man8/kerberos_selinux.8                  |    2 
 policy/flask/access_vectors                  |    2 
 policy/global_tunables                       |   89 ++++
 policy/mls                                   |   31 +
 policy/modules/admin/acct.te                 |    1 
 policy/modules/admin/amanda.if               |   17 
 policy/modules/admin/amanda.te               |    6 
 policy/modules/admin/amtu.fc                 |    3 
 policy/modules/admin/amtu.if                 |   57 ++
 policy/modules/admin/amtu.te                 |   56 ++
 policy/modules/admin/backup.te               |    5 
 policy/modules/admin/bootloader.fc           |    5 
 policy/modules/admin/bootloader.te           |   14 
 policy/modules/admin/consoletype.te          |   21 
 policy/modules/admin/ddcprobe.te             |   10 
 policy/modules/admin/dmesg.te                |    7 
 policy/modules/admin/dmidecode.te            |    5 
 policy/modules/admin/firstboot.if            |    6 
 policy/modules/admin/kudzu.te                |   14 
 policy/modules/admin/logrotate.te            |    5 
 policy/modules/admin/logwatch.te             |   12 
 policy/modules/admin/netutils.te             |   13 
 policy/modules/admin/portage.te              |    5 
 policy/modules/admin/prelink.te              |   18 
 policy/modules/admin/quota.fc                |    7 
 policy/modules/admin/quota.te                |   24 -
 policy/modules/admin/rpm.fc                  |    3 
 policy/modules/admin/rpm.if                  |   43 ++
 policy/modules/admin/rpm.te                  |   49 --
 policy/modules/admin/su.if                   |   28 -
 policy/modules/admin/su.te                   |    2 
 policy/modules/admin/sudo.if                 |   10 
 policy/modules/admin/tripwire.te             |   11 
 policy/modules/admin/usbmodules.te           |    5 
 policy/modules/admin/usermanage.if           |    2 
 policy/modules/admin/usermanage.te           |   42 +
 policy/modules/admin/vpn.te                  |    1 
 policy/modules/apps/ethereal.te              |    5 
 policy/modules/apps/evolution.if             |  107 ++++-
 policy/modules/apps/evolution.te             |    1 
 policy/modules/apps/games.fc                 |    1 
 policy/modules/apps/gnome.fc                 |    2 
 policy/modules/apps/gnome.if                 |  108 +++++
 policy/modules/apps/gnome.te                 |    5 
 policy/modules/apps/gpg.if                   |    1 
 policy/modules/apps/java.fc                  |    2 
 policy/modules/apps/java.if                  |   38 +
 policy/modules/apps/java.te                  |    2 
 policy/modules/apps/loadkeys.if              |   17 
 policy/modules/apps/mozilla.if               |  210 ++++++++-
 policy/modules/apps/mplayer.if               |   84 +++
 policy/modules/apps/mplayer.te               |    1 
 policy/modules/apps/slocate.te               |    3 
 policy/modules/apps/thunderbird.if           |   81 +++
 policy/modules/apps/userhelper.if            |   19 
 policy/modules/apps/webalizer.te             |    6 
 policy/modules/apps/wine.fc                  |    1 
 policy/modules/apps/yam.te                   |    5 
 policy/modules/kernel/corecommands.fc        |   19 
 policy/modules/kernel/corecommands.if        |   77 +++
 policy/modules/kernel/corenetwork.if.in      |  140 ++++++
 policy/modules/kernel/corenetwork.te.in      |   14 
 policy/modules/kernel/devices.fc             |    8 
 policy/modules/kernel/devices.if             |   18 
 policy/modules/kernel/devices.te             |    8 
 policy/modules/kernel/domain.if              |   58 ++
 policy/modules/kernel/domain.te              |   22 +
 policy/modules/kernel/files.fc               |    2 
 policy/modules/kernel/files.if               |  224 ++++++++++
 policy/modules/kernel/filesystem.if          |   62 ++
 policy/modules/kernel/filesystem.te          |   19 
 policy/modules/kernel/kernel.if              |   84 +++
 policy/modules/kernel/kernel.te              |   22 -
 policy/modules/kernel/mls.if                 |   28 +
 policy/modules/kernel/mls.te                 |    6 
 policy/modules/kernel/storage.fc             |    3 
 policy/modules/kernel/storage.if             |    2 
 policy/modules/kernel/terminal.fc            |    1 
 policy/modules/kernel/terminal.if            |    2 
 policy/modules/kernel/terminal.te            |    1 
 policy/modules/services/afs.pp               |binary
 policy/modules/services/aide.fc              |    4 
 policy/modules/services/aide.pp              |binary
 policy/modules/services/aide.te              |    7 
 policy/modules/services/amavis.pp            |binary
 policy/modules/services/amavis.te            |    2 
 policy/modules/services/apache.fc            |   17 
 policy/modules/services/apache.if            |   22 -
 policy/modules/services/apache.pp            |binary
 policy/modules/services/apache.te            |   43 +-
 policy/modules/services/apm.pp               |binary
 policy/modules/services/apm.te               |    3 
 policy/modules/services/arpwatch.pp          |binary
 policy/modules/services/asterisk.pp          |binary
 policy/modules/services/audioentropy.pp      |binary
 policy/modules/services/automount.fc         |    1 
 policy/modules/services/automount.te         |    9 
 policy/modules/services/avahi.if             |   40 +
 policy/modules/services/bind.fc              |    1 
 policy/modules/services/bind.te              |    5 
 policy/modules/services/bluetooth.te         |    8 
 policy/modules/services/ccs.fc               |    1 
 policy/modules/services/ccs.te               |   11 
 policy/modules/services/clamav.te            |    2 
 policy/modules/services/cron.fc              |    6 
 policy/modules/services/cron.if              |   92 ++--
 policy/modules/services/cron.te              |   52 ++
 policy/modules/services/cups.fc              |    3 
 policy/modules/services/cups.te              |   13 
 policy/modules/services/cvs.te               |    1 
 policy/modules/services/cyrus.te             |    5 
 policy/modules/services/dbus.fc              |    1 
 policy/modules/services/dbus.if              |   62 ++
 policy/modules/services/dcc.te               |    9 
 policy/modules/services/dhcp.te              |    2 
 policy/modules/services/dovecot.te           |    6 
 policy/modules/services/ftp.te               |   18 
 policy/modules/services/hal.fc               |    4 
 policy/modules/services/hal.if               |   57 ++
 policy/modules/services/hal.te               |   22 -
 policy/modules/services/inetd.te             |   28 +
 policy/modules/services/irqbalance.te        |    4 
 policy/modules/services/kerberos.if          |   25 +
 policy/modules/services/kerberos.te          |   15 
 policy/modules/services/ktalk.fc             |    3 
 policy/modules/services/ktalk.te             |    5 
 policy/modules/services/lpd.if               |   57 +-
 policy/modules/services/lpd.te               |    5 
 policy/modules/services/mta.fc               |    1 
 policy/modules/services/mta.if               |   20 
 policy/modules/services/mta.te               |    2 
 policy/modules/services/munin.te             |    5 
 policy/modules/services/networkmanager.fc    |    2 
 policy/modules/services/networkmanager.te    |    2 
 policy/modules/services/nis.fc               |    3 
 policy/modules/services/nis.if               |    8 
 policy/modules/services/nis.te               |   34 +
 policy/modules/services/nscd.if              |   20 
 policy/modules/services/nscd.te              |   24 -
 policy/modules/services/oav.te               |    5 
 policy/modules/services/oddjob.te            |    3 
 policy/modules/services/openca.if            |    4 
 policy/modules/services/openca.te            |    2 
 policy/modules/services/openvpn.te           |    4 
 policy/modules/services/pcscd.fc             |    9 
 policy/modules/services/pcscd.if             |   62 ++
 policy/modules/services/pcscd.te             |   78 +++
 policy/modules/services/pegasus.if           |   31 +
 policy/modules/services/pegasus.te           |    6 
 policy/modules/services/portmap.te           |    5 
 policy/modules/services/postfix.fc           |    1 
 policy/modules/services/postfix.if           |    3 
 policy/modules/services/postfix.te           |   21 
 policy/modules/services/procmail.te          |   28 +
 policy/modules/services/pyzor.if             |   18 
 policy/modules/services/pyzor.te             |   13 
 policy/modules/services/radius.te            |    1 
 policy/modules/services/radvd.te             |    2 
 policy/modules/services/rhgb.if              |   76 +++
 policy/modules/services/rhgb.te              |    3 
 policy/modules/services/ricci.te             |   21 
 policy/modules/services/rlogin.te            |   10 
 policy/modules/services/rpc.fc               |    1 
 policy/modules/services/rpc.if               |    3 
 policy/modules/services/rpc.te               |   26 -
 policy/modules/services/rsync.te             |    1 
 policy/modules/services/samba.fc             |    5 
 policy/modules/services/samba.if             |   62 ++
 policy/modules/services/samba.te             |   63 ++
 policy/modules/services/sasl.te              |   12 
 policy/modules/services/sendmail.if          |   22 +
 policy/modules/services/sendmail.te          |    8 
 policy/modules/services/setroubleshoot.if    |   20 
 policy/modules/services/setroubleshoot.te    |    2 
 policy/modules/services/smartmon.te          |    1 
 policy/modules/services/snmp.if              |   17 
 policy/modules/services/snmp.te              |   17 
 policy/modules/services/spamassassin.fc      |    2 
 policy/modules/services/spamassassin.if      |   42 +
 policy/modules/services/spamassassin.te      |   18 
 policy/modules/services/squid.fc             |    2 
 policy/modules/services/squid.if             |   21 
 policy/modules/services/squid.te             |   11 
 policy/modules/services/ssh.if               |   83 +++
 policy/modules/services/ssh.te               |   14 
 policy/modules/services/telnet.te            |    3 
 policy/modules/services/tftp.te              |    2 
 policy/modules/services/uucp.fc              |    1 
 policy/modules/services/uucp.if              |   67 +++
 policy/modules/services/uucp.te              |   44 +-
 policy/modules/services/xserver.fc           |    2 
 policy/modules/services/xserver.if           |  190 ++++++++-
 policy/modules/services/xserver.te           |   12 
 policy/modules/system/authlogin.if           |   76 +++
 policy/modules/system/authlogin.te           |    6 
 policy/modules/system/clock.te               |   13 
 policy/modules/system/fstools.fc             |    1 
 policy/modules/system/fstools.te             |   11 
 policy/modules/system/getty.te               |   14 
 policy/modules/system/hostname.te            |   19 
 policy/modules/system/init.if                |   64 +++
 policy/modules/system/init.te                |   51 ++
 policy/modules/system/ipsec.fc               |    5 
 policy/modules/system/ipsec.if               |   99 ++++
 policy/modules/system/ipsec.te               |  122 +++++
 policy/modules/system/iptables.te            |   22 -
 policy/modules/system/libraries.fc           |   39 +
 policy/modules/system/libraries.te           |   11 
 policy/modules/system/locallogin.if          |   37 +
 policy/modules/system/locallogin.te          |    6 
 policy/modules/system/logging.fc             |    5 
 policy/modules/system/logging.te             |   27 +
 policy/modules/system/lvm.fc                 |    2 
 policy/modules/system/lvm.if                 |   44 ++
 policy/modules/system/lvm.te                 |   79 +++
 policy/modules/system/miscfiles.fc           |    3 
 policy/modules/system/miscfiles.if           |   79 +++
 policy/modules/system/modutils.te            |   25 -
 policy/modules/system/mount.te               |   27 -
 policy/modules/system/netlabel.te            |    6 
 policy/modules/system/pcmcia.te              |    5 
 policy/modules/system/raid.te                |   15 
 policy/modules/system/selinuxutil.fc         |    2 
 policy/modules/system/selinuxutil.if         |  119 +++++
 policy/modules/system/selinuxutil.te         |  124 ++---
 policy/modules/system/sysnetwork.te          |   10 
 policy/modules/system/tzdata.fc              |    3 
 policy/modules/system/tzdata.if              |   23 +
 policy/modules/system/tzdata.te              |   51 ++
 policy/modules/system/unconfined.fc          |    4 
 policy/modules/system/unconfined.if          |   19 
 policy/modules/system/unconfined.te          |   23 +
 policy/modules/system/userdomain.if          |  569 ++++++++++++++++++++++++---
 policy/modules/system/userdomain.te          |   76 +--
 policy/modules/system/xen.fc                 |    1 
 policy/modules/system/xen.te                 |   46 +-
 241 files changed, 5499 insertions(+), 625 deletions(-)

Index: policy-20061106.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-20061106.patch,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- policy-20061106.patch	12 Apr 2007 19:54:45 -0000	1.34
+++ policy-20061106.patch	13 Apr 2007 12:59:00 -0000	1.35
@@ -1260,7 +1260,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.if serefpolicy-2.4.6/policy/modules/admin/usermanage.if
 --- nsaserefpolicy/policy/modules/admin/usermanage.if	2006-11-29 12:04:48.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/usermanage.if	2007-03-27 11:12:44.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/admin/usermanage.if	2007-04-13 07:11:06.000000000 -0400
 @@ -244,6 +244,7 @@
  	')
  
@@ -1269,6 +1269,13 @@
  	corecmd_search_sbin($1)
  	domain_auto_trans($1,useradd_exec_t,useradd_t)
  
+@@ -300,5 +301,6 @@
+ 		type crack_db_t;
+ 	')
+ 
++	allow $1 crack_db_t:dir search_dir_perms;
+ 	allow $1 crack_db_t:file r_file_perms;
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.4.6/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-11-29 12:04:48.000000000 -0500
 +++ serefpolicy-2.4.6/policy/modules/admin/usermanage.te	2007-03-09 13:35:58.000000000 -0500
@@ -6930,7 +6937,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.4.6/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/samba.if	2007-04-05 09:15:12.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/services/samba.if	2007-04-13 08:42:46.000000000 -0400
 @@ -140,6 +140,7 @@
  	')
  
@@ -6975,7 +6982,35 @@
  ##	Execute samba log in the caller domain.
  ## </summary>
  ## <param name="domain">
-@@ -395,3 +418,21 @@
+@@ -266,6 +289,27 @@
+ 
+ ########################################
+ ## <summary>
++##	Allow the specified domain to
++##	create, read and write samba /var files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`samba_manage_var_files',`
++	gen_require(`
++		type samba_var_t;
++	')
++
++	files_search_var($1)
++	allow $1 samba_var_t:dir rw_dir_perms;
++	allow $1 samba_var_t:file manage_file_perms;
++')
++
++########################################
++## <summary>
+ ##	Allow the specified domain to write to smbmount tcp sockets.
+ ## </summary>
+ ## <param name="domain">
+@@ -395,3 +439,21 @@
  	allow $1 winbind_var_run_t:sock_file { getattr read write };
  	allow $1 winbind_t:unix_stream_socket connectto;
  ')
@@ -6999,7 +7034,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.4.6/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/samba.te	2007-04-12 15:03:59.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/services/samba.te	2007-04-13 08:54:04.000000000 -0400
 @@ -10,6 +10,13 @@
  type nmbd_exec_t;
  init_daemon_domain(nmbd_t,nmbd_exec_t)
@@ -7150,7 +7185,7 @@
  
  domain_use_interactive_fds(winbind_helper_t)
  
-+files_list_var_lib(windbind_helper_t)
++files_list_var_lib(winbind_helper_t)
 +
  libs_use_ld_so(winbind_helper_t)
  libs_use_shared_libs(winbind_helper_t)
@@ -7731,7 +7766,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-2.4.6/policy/modules/services/ssh.te
 --- nsaserefpolicy/policy/modules/services/ssh.te	2006-11-29 12:04:49.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/ssh.te	2007-03-09 13:35:59.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/services/ssh.te	2007-04-13 07:10:34.000000000 -0400
 @@ -10,7 +10,7 @@
  
  # ssh client executable.
@@ -7769,7 +7804,18 @@
  	kernel_link_key(sshd_t)
  
  	# for X forwarding
-@@ -154,6 +158,7 @@
+@@ -122,6 +126,10 @@
+ 		rssh_read_all_users_ro_content(sshd_t)
+ 	')
+ 
++	optional_policy(`
++		usermanage_read_crack_db(sshd_t)
++	')
++
+ 	ifdef(`TODO',`
+ 	tunable_policy(`ssh_sysadm_login',`
+ 		# Relabel and access ptys created by sshd
+@@ -154,6 +162,7 @@
  #
  
  ifdef(`strict_policy',`
@@ -7777,7 +7823,7 @@
  	ifdef(`TODO',`
  	domain_trans(sshd_extern_t, shell_exec_t, user_mini_domain)
  	# Signal the user domains.
-@@ -259,3 +264,4 @@
+@@ -259,3 +268,4 @@
  optional_policy(`
  	udev_read_db(ssh_keygen_t)
  ')



From fedora-cvs-commits at redhat.com  Fri Apr 13 13:16:55 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 09:16:55 -0400
Subject: rpms/kernel/devel linux-2.6-ps3-usb-autoload.patch, NONE,
	1.1 kernel-2.6.spec, 1.3062,
	1.3063 linux-2.6-ps3-ethernet.patch, 1.1, 1.2
Message-ID: <200704131316.l3DDGtLq029968@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec linux-2.6-ps3-ethernet.patch 
Added Files:
	linux-2.6-ps3-usb-autoload.patch 
Log Message:
fix PS3 IPv6, and USB autoload

linux-2.6-ps3-usb-autoload.patch:
 ehci-ps3.c |    1 +
 ohci-ps3.c |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE linux-2.6-ps3-usb-autoload.patch ---
diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c
index 4d781a2..fe485a0 100644
--- a/drivers/usb/host/ehci-ps3.c
+++ b/drivers/usb/host/ehci-ps3.c
@@ -182,6 +182,7 @@ static int ps3_ehci_sb_remove(struct ps3_system_bus_device *dev)
 }
 
 MODULE_ALIAS("ps3-ehci");
+MODULE_ALIAS("ps3:1");
 
 static struct ps3_system_bus_driver ps3_ehci_sb_driver = {
 	.match_id = PS3_MATCH_ID_EHCI,
diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c
index 62283a3..1004d91 100644
--- a/drivers/usb/host/ohci-ps3.c
+++ b/drivers/usb/host/ohci-ps3.c
@@ -185,6 +185,7 @@ static int ps3_ohci_sb_remove (struct ps3_system_bus_device *dev)
 }
 
 MODULE_ALIAS("ps3-ohci");
+MODULE_ALIAS("ps3:2");
 
 static struct ps3_system_bus_driver ps3_ohci_sb_driver = {
 	.match_id = PS3_MATCH_ID_OHCI,


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3062
retrieving revision 1.3063
diff -u -r1.3062 -r1.3063
--- kernel-2.6.spec	12 Apr 2007 21:26:01 -0000	1.3062
+++ kernel-2.6.spec	13 Apr 2007 13:16:51 -0000	1.3063
@@ -446,6 +446,7 @@
 Patch364: linux-2.6-ps3-exports.patch
 Patch365: linux-2.6-ps3-ethernet-autoload.patch
 Patch366: linux-2.6-ps3av-export-header.patch
+Patch367: linux-2.6-ps3-usb-autoload.patch
 
 # 500 - 599   s390(x)
 
@@ -1064,6 +1065,7 @@
 %patch364 -p1
 %patch365 -p1
 %patch366 -p1
+%patch367 -p1
 
 # S390
 
@@ -2256,6 +2258,9 @@
 #  - tux.
 
 %changelog
+* Fri Apr 13 2007 David Woodhouse <dwmw2 at redhat.com>
+- Fix PS3 Ethernet IPv6 checksum problems, autoload PS3 USB modules
+
 * Thu Apr 12 2007 Kristian H??gsberg <krh at redhat.com>
 - Add a few more firewire bug fixes, incorporate last couple of
   changes to userspace interface.

linux-2.6-ps3-ethernet.patch:
 drivers/net/Makefile                  |    1 
 ps3-linux-dev/drivers/net/Kconfig     |   10 
 ps3-linux-dev/drivers/net/gelic_net.c | 1877 ++++++++++++++++++++++++++++++++++
 3 files changed, 1888 insertions(+)

Index: linux-2.6-ps3-ethernet.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-ps3-ethernet.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-ps3-ethernet.patch	30 Mar 2007 20:10:34 -0000	1.1
+++ linux-2.6-ps3-ethernet.patch	13 Apr 2007 13:16:51 -0000	1.2
@@ -1542,16 +1542,16 @@
 +static uint32_t
 +gelic_net_get_tx_csum(struct net_device *netdev)
 +{
-+	return (netdev->features & NETIF_F_HW_CSUM) != 0;
++	return (netdev->features & NETIF_F_IP_CSUM) != 0;
 +}
 +
 +static int
 +gelic_net_set_tx_csum(struct net_device *netdev, uint32_t data)
 +{
 +	if (data)
-+		netdev->features |= NETIF_F_HW_CSUM;
++		netdev->features |= NETIF_F_IP_CSUM;
 +	else
-+		netdev->features &= ~NETIF_F_HW_CSUM;
++		netdev->features &= ~NETIF_F_IP_CSUM;
 +
 +	return 0;
 +}
@@ -1730,7 +1730,7 @@
 +
 +	gelic_net_setup_netdev_ops(netdev);
 +
-+	netdev->features = NETIF_F_HW_CSUM;
++	netdev->features = NETIF_F_IP_CSUM;
 +
 +	status = lv1_net_control(card->dev->did.bus_id, card->dev->did.dev_id,
 +				GELIC_NET_GET_MAC_ADDRESS,



From fedora-cvs-commits at redhat.com  Fri Apr 13 13:23:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 09:23:49 -0400
Subject: rpms/dovecot/devel dovecot-1.0.rc32-split.patch, NONE,
	1.1.2.1 dovecot.spec, 1.70.2.5,
	1.70.2.6 dovecot-1.0.rc27-split.patch, 1.1.2.2, NONE
Message-ID: <200704131323.l3DDNn58001960@cvs.devel.redhat.com>

Author: tjanouse

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

Modified Files:
      Tag: private-145241-branch
	dovecot.spec 
Added Files:
      Tag: private-145241-branch
	dovecot-1.0.rc32-split.patch 
Removed Files:
      Tag: private-145241-branch
	dovecot-1.0.rc27-split.patch 
Log Message:
* Fri Apr 13 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0-11.6.rc32
- new sql split patch


dovecot-1.0.rc32-split.patch:
 configure.in            |   50 ++++++++++++++++++++++++++++++++++++++-------
 src/auth/main.c         |    6 +++++
 src/dict/main.c         |    4 +++
 src/lib-sql/Makefile.am |   53 ++++++++++++++++++++++++++++++++++++++++++++++--
 src/lib-sql/sql-api.c   |    7 ++++++
 src/lib-sql/sql-api.h   |    2 +
 6 files changed, 112 insertions(+), 10 deletions(-)

--- NEW FILE dovecot-1.0.rc32-split.patch ---
--- dovecot-1.0.rc32/src/dict/main.c.split	2007-02-22 15:32:11.000000000 +0100
+++ dovecot-1.0.rc32/src/dict/main.c	2007-04-13 13:56:55.000000000 +0200
@@ -22,6 +22,7 @@
 
 static struct io *log_io;
 static struct module *modules;
+static struct module *sql_modules;
 static struct dict_server *dict_server;
 
 static void sig_die(int signo, void *context __attr_unused__)
@@ -50,6 +51,8 @@
 	/* Load built-in SQL drivers (if any) */
 	sql_drivers_init();
 	sql_drivers_register_all();
+	sql_modules = sql_drivers_modules_load();
+	module_dir_init(sql_modules);
 
 	restrict_access_by_env(FALSE);
 }
@@ -100,6 +103,7 @@
 	dict_sql_unregister();
 	dict_client_unregister();
 
+	module_dir_unload(&sql_modules);
 	sql_drivers_deinit();
 	random_deinit();
 	lib_signals_deinit();
--- dovecot-1.0.rc32/src/lib-sql/Makefile.am.split	2007-02-22 22:09:16.000000000 +0100
+++ dovecot-1.0.rc32/src/lib-sql/Makefile.am	2007-04-13 15:11:18.000000000 +0200
@@ -1,21 +1,66 @@
 noinst_LIBRARIES = libsql.a
 
+if DYNAMIC_SQL
+if BUILD_MYSQL
+MYSQL_LIB=libdriver_mysql.la
+endif
+if BUILD_PGSQL
+PGSQL_LIB=libdriver_pgsql.la
+endif
+if BUILD_SQLITE
+SQLITE_LIB=libdriver_sqlite.la
+endif
+
+sql_module_LTLIBRARIES = \
+	$(MYSQL_LIB) \
+	$(PGSQL_LIB) \
+	$(SQLITE_LIB)
+
+sql_moduledir = $(moduledir)/sql
+endif
+
 sql_drivers = @sql_drivers@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib \
+	-DMODULEDIR=\""$(moduledir)"\" \
 	$(SQL_CFLAGS)
 
 dist_sources = \
+	sql-api.c
+
+if ! DYNAMIC_SQL
+driver_sources = \
 	driver-mysql.c \
 	driver-pgsql.c \
-	driver-sqlite.c \
-	sql-api.c
+	driver-sqlite.c
+endif
 
 libsql_a_SOURCES = \
 	$(dist_sources) \
+	$(driver_sources) \
 	sql-drivers-register.c
 
+if DYNAMIC_SQL
+libdriver_mysql_la_LDFLAGS = -module -avoid-version
+libdriver_mysql_la_LIBADD = $(MYSQL_LIBS)
+libdriver_mysql_la_CPPFLAGS = -I$(top_srcdir)/src/lib $(MYSQL_CFLAGS)
+libdriver_mysql_la_SOURCES = \
+	driver-mysql.c
+
+libdriver_pgsql_la_LDFLAGS = -module -avoid-version
+libdriver_pgsql_la_LIBADD = $(PGSQL_LIBS)
+libdriver_pgsql_la_CPPFLAGS = -I$(top_srcdir)/src/lib $(PGSQL_CFLAGS)
+libdriver_pgsql_la_SOURCES = \
+	driver-pgsql.c
+
+libdriver_sqlite_la_LDFLAGS = -module -avoid-version
+libdriver_sqlite_la_LIBADD = $(SQLITE_LIBS)
+libdriver_sqlite_la_CPPFLAGS = -I$(top_srcdir)/src/lib $(SQLITE_CFLAGS)
+libdriver_sqlite_la_SOURCES = \
+	driver-sqlite.c
+endif
+
 headers = \
 	sql-api.h \
 	sql-api-private.h
@@ -32,17 +77,21 @@
 	echo '/* this file automatically generated by Makefile */' >$@
 	echo '#include "lib.h"' >>$@
 	echo '#include "sql-api.h"' >>$@
+if ! DYNAMIC_SQL
 	for i in $(sql_drivers) null; do \
 	  if [ "$${i}" != "null" ]; then \
 	        echo "extern struct sql_db driver_$${i}_db;" >>$@ ; \
 	  fi \
 	done
+endif
 	echo 'void sql_drivers_register_all(void) {' >>$@
+if ! DYNAMIC_SQL
 	for i in $(sql_drivers) null; do \
 	  if [ "$${i}" != "null" ]; then \
 	        echo "sql_driver_register(&driver_$${i}_db);" >>$@ ; \
 	  fi \
 	done
+endif
 	echo '}' >>$@
 
 DISTFILES = $(DIST_COMMON) $(dist_sources) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--- dovecot-1.0.rc32/src/lib-sql/sql-api.h.split	2006-07-01 19:23:52.000000000 +0200
+++ dovecot-1.0.rc32/src/lib-sql/sql-api.h	2007-04-13 13:56:55.000000000 +0200
@@ -20,6 +20,8 @@
 
 /* register all built-in SQL drivers */
 void sql_drivers_register_all(void);
+struct module;
+struct module *sql_drivers_modules_load(void);
 
 void sql_driver_register(const struct sql_db *driver);
 void sql_driver_unregister(const struct sql_db *driver);
--- dovecot-1.0.rc32/src/lib-sql/sql-api.c.split	2006-07-01 19:23:52.000000000 +0200
+++ dovecot-1.0.rc32/src/lib-sql/sql-api.c	2007-04-13 13:56:55.000000000 +0200
@@ -2,6 +2,7 @@
 
 #include "lib.h"
 #include "array.h"
+#include "module-dir.h"
 #include "sql-api-private.h"
 
 array_t ARRAY_DEFINE(sql_drivers, const struct sql_db *);
@@ -16,6 +17,12 @@
 	array_free(&sql_drivers);
 }
 
+struct module *sql_drivers_modules_load(void)
+{
+	return module_dir_load(MODULEDIR"/sql",
+			NULL, TRUE, PACKAGE_VERSION);
+}
+
 void sql_driver_register(const struct sql_db *driver)
 {
 	array_append(&sql_drivers, &driver, 1);
--- dovecot-1.0.rc32/src/auth/main.c.split	2007-03-15 16:48:13.000000000 +0100
+++ dovecot-1.0.rc32/src/auth/main.c	2007-04-13 13:56:55.000000000 +0200
@@ -10,6 +10,7 @@
 #include "sql-api.h"
 #include "randgen.h"
 #include "password-scheme.h"
+#include "module-dir.h"
 #include "mech.h"
 #include "auth.h"
 #include "auth-request-handler.h"
@@ -35,6 +36,8 @@
 static struct auth *auth;
 static struct auth_worker_client *worker_client;
 
+static struct module *sql_modules;
+
 static void sig_die(int signo, void *context __attr_unused__)
 {
 	/* warn about being killed because of some signal, except SIGINT (^C)
@@ -189,6 +192,8 @@
 	/* Load built-in SQL drivers (if any) */
 	sql_drivers_init();
 	sql_drivers_register_all();
+	sql_modules = sql_drivers_modules_load();
+	module_dir_init(sql_modules);
 
 	/* Initialize databases so their configuration files can be readable
 	   only by root. Also load all modules here. */
@@ -287,6 +292,7 @@
 	mech_deinit();
 
         password_schemes_deinit();
+	module_dir_unload(&sql_modules);
 	sql_drivers_deinit();
 	random_deinit();
 
--- dovecot-1.0.rc32/configure.in.split	2007-04-12 19:16:36.000000000 +0200
+++ dovecot-1.0.rc32/configure.in	2007-04-13 13:56:55.000000000 +0200
@@ -225,6 +225,15 @@
 	fi,
 	want_sqlite=no)
 
+AC_ARG_WITH(dynamic-sql,
+[  --with-dynamic-sql    Build SQL modules as shared libs],
+	if test x$withval = xno; then
+		want_dynamic_sql=no
+	else
+		want_dynamic_sql=yes
+	fi,
+	want_dynamic_sql=no)
+
 AC_ARG_WITH(ssl,
 [  --with-ssl=[gnutls|openssl] Build with GNUTLS or OpenSSL (default)],
 	if test x$withval = xno; then
@@ -1559,12 +1568,12 @@
 		fi
 		AC_CHECK_HEADER(libpq-fe.h, [
 			if test "$PGSQL_INCLUDE" != ""; then
-				SQL_CFLAGS="$SQL_CFLAGS -I$PGSQL_INCLUDE"
+				PGSQL_CFLAGS="$PGSQL_CFLAGS -I$PGSQL_INCLUDE"
 			fi
 			if test "$PGSQL_LIBDIR" != ""; then
-				SQL_LIBS="$SQL_LIBS -L$PGSQL_LIBDIR"
+				PGSQL_LIBS="$PGSQL_LIBS -L$PGSQL_LIBDIR"
 			fi
-			SQL_LIBS="$SQL_LIBS -lpq"
+			PGSQL_LIBS="$PGSQL_LIBS -lpq"
 			AC_DEFINE(HAVE_PGSQL,, Build with PostgreSQL support)
 			found_sql_drivers="$found_sql_drivers pgsql"
 
@@ -1610,12 +1619,12 @@
 		fi
 		AC_CHECK_HEADER(mysql.h, [
 			if test "$MYSQL_INCLUDE" != ""; then
-				SQL_CFLAGS="$SQL_CFLAGS -I$MYSQL_INCLUDE"
+				MYSQL_CFLAGS="$MYSQL_CFLAGS -I$MYSQL_INCLUDE"
 			fi
 			if test "$MYSQL_LIBDIR" != ""; then
-				SQL_LIBS="$SQL_LIBS -L$MYSQL_LIBDIR"
+				MYSQL_LIBS="$MYSQL_LIBS -L$MYSQL_LIBDIR"
 			fi
-			SQL_LIBS="$SQL_LIBS $mysql_lib"
+			MYSQL_LIBS="$MYSQL_LIBS $mysql_lib"
 
 			AC_CHECK_LIB(mysqlclient, mysql_ssl_set, [
 				AC_DEFINE(HAVE_MYSQL_SSL,, Define if your MySQL library has SSL functions)
@@ -1646,13 +1655,18 @@
 if test $want_sqlite = yes; then
 	AC_CHECK_LIB(sqlite3, sqlite3_open, [
 		AC_CHECK_HEADER(sqlite3.h, [
-			SQL_LIBS="$SQL_LIBS -lsqlite3 -lz"
+			SQLITE_LIBS="$SQLITE_LIBS -lsqlite3 -lz"
 
 			AC_DEFINE(HAVE_SQLITE,, Build with SQLite3 support)
 			found_sql_drivers="$found_sql_drivers sqlite"
 		])
 	])
 fi
+	
+SQL_CFLAGS="$MYSQL_CFLAGS $PGSQL_CFLAGS $SQLITE_CFLAGS"
+if test "$want_dynamic_sql" = "no"; then
+	SQL_LIBS="$MYSQL_LIBS $PGSQL_LIBS $SQLITE_LIBS"
+fi
 
 if test "$found_sql_drivers" != "" -o "$want_sql" = "yes"; then
 	if test "$all_sql_drivers" = "yes"; then
@@ -1716,6 +1730,12 @@
 AC_SUBST(AUTH_LIBS)
 AC_SUBST(SQL_CFLAGS)
 AC_SUBST(SQL_LIBS)
+AC_SUBST(MYSQL_CFLAGS)
+AC_SUBST(MYSQL_LIBS)
+AC_SUBST(PGSQL_CFLAGS)
+AC_SUBST(PGSQL_LIBS)
+AC_SUBST(SQLITE_CFLAGS)
+AC_SUBST(SQLITE_LIBS)
 
 dnl **
 dnl ** Index file compatibility flags
@@ -1783,17 +1803,27 @@
 dnl ** SQL drivers
 dnl **
 
+build_pgsql=no
+build_mysql=no
+build_sqlite=no
 for driver in $sql_drivers; do
   if test "$driver" = "pgsql"; then
     AC_DEFINE(BUILD_PGSQL,, Built-in PostgreSQL support)
+    build_pgsql=yes
   elif test "$driver" = "mysql"; then
     AC_DEFINE(BUILD_MYSQL,, Built-in MySQL support)
+    build_mysql=yes
   elif test "$driver" = "sqlite"; then
     AC_DEFINE(BUILD_SQLITE,, Built-in SQLite support)
+    build_sqlite=yes
   fi
 done
 
 AC_SUBST(sql_drivers)
+AM_CONDITIONAL(BUILD_PGSQL, test "$build_pgsql" = "yes")
+AM_CONDITIONAL(BUILD_MYSQL, test "$build_mysql" = "yes")
+AM_CONDITIONAL(BUILD_SQLITE, test "$build_sqlite" = "yes")
+AM_CONDITIONAL(DYNAMIC_SQL, test "$want_dynamic_sql" = "yes")
 
 dnl **
 dnl ** Plugins
@@ -1873,4 +1903,8 @@
 echo "Building with GSSAPI support ........ : $have_gssapi"
 echo "Building with user database modules . :$userdb"
 echo "Building with password lookup modules :$passdb"
-echo "Building with SQL drivers ............:$sql_drivers"
+if test "$want_dynamic_sql" = "yes"; then
+	echo "Building with SQL drivers ............:$sql_drivers (dynamic)"
+else
+	echo "Building with SQL drivers ............:$sql_drivers"
+fi


Index: dovecot.spec
===================================================================
RCS file: /cvs/dist/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.70.2.5
retrieving revision 1.70.2.6
diff -u -r1.70.2.5 -r1.70.2.6
--- dovecot.spec	13 Apr 2007 10:29:29 -0000	1.70.2.5
+++ dovecot.spec	13 Apr 2007 13:23:47 -0000	1.70.2.6
@@ -1,7 +1,7 @@
 %define upstream 1.0.rc32
 %define sieve_upstream 1.0.1
 %define pkg_version 1.0
-%define my_release 11.5
+%define my_release 11.6
 %define pkg_release %{my_release}.rc32%{?dist}
 %define pkg_sieve_version 1.0.1
 %define pkg_sieve_release %{my_release}%{?dist}
@@ -36,7 +36,7 @@
 # 104 not applied
 #Patch104: dovecot-1.0.beta2-lib64.patch
 Patch105: dovecot-1.0.rc7-mkcert-paths.patch
-Patch106: dovecot-1.0.rc27-split.patch
+Patch106: dovecot-1.0.rc32-split.patch
 #Patch105: dovecot-1.0.beta2-sqlite-check.patch
 
 # XXX this patch needs review and forward porting
@@ -146,9 +146,6 @@
 %patch105 -p1 -b .mkcert-paths
 
 %patch106 -p1 -b .split
-mv -f src/lib-sql/driver-mysql.c src/plugins/sql-mysql/
-mv -f src/lib-sql/driver-pgsql.c src/plugins/sql-pgsql/
-mv -f src/lib-sql/driver-sqlite.c src/plugins/sql-sqlite/
 
 %if %{build_sieve}
 %setup -q -n %{name}-%{upstream} -D -T -a 8
@@ -157,7 +154,7 @@
 %build
 rm -f ./configure
 libtoolize -f
-autoreconf
+autoreconf -i
 %configure                           \
     INSTALL_DATA="install -c -p -m644" \
     --with-doc                         \
@@ -170,6 +167,7 @@
 %if %{build_sqlite}
     --with-sqlite                \
 %endif
+    --with-dynamic-sql           \
     --with-ssl=openssl           \
     --with-ssldir=%{ssldir}      \
     --with-ldap                  \
@@ -258,7 +256,7 @@
 (
     find ${RPM_BUILD_ROOT}/%{_libdir}/%{name} -type d | sed -e "s|^|%dir |";
     find ${RPM_BUILD_ROOT}/%{_libdir}/%{name} -! -type d | \
-	grep -v 'lib90_cmusieve_plugin.so\|lib90_sql_.*_plugin.so';
+	grep -v 'lib90_cmusieve_plugin.so\|libdriver_.*.so';
 ) | sed -e "s|$RPM_BUILD_ROOT||" >libs.filelist
 
 %pre
@@ -341,20 +339,23 @@
 
 %if %{build_mysql}
 %files mysql
-%{_libdir}/%{name}/sql/lib90_sql_mysql_plugin.so
+%{_libdir}/%{name}/sql/libdriver_mysql.so
 %endif
 
 %if %{build_postgres}
 %files pgsql
-%{_libdir}/%{name}/sql/lib90_sql_pgsql_plugin.so
+%{_libdir}/%{name}/sql/libdriver_pgsql.so
 %endif
 
 %if %{build_sqlite}
 %files sqlite
-%{_libdir}/%{name}/sql/lib90_sql_sqlite_plugin.so
+%{_libdir}/%{name}/sql/libdriver_sqlite.so
 %endif
 
 %changelog
+* Fri Apr 13 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0-11.6.rc32
+- new sql split patch
+
 * Fri Apr 13 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0-11.5.rc32
 - update to latest upstream
 - specfile merge from devel


--- dovecot-1.0.rc27-split.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 13 13:46:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 09:46:57 -0400
Subject: rpms/gnome-panel/devel gnome-panel-2.18.0-fix-tasks.patch, NONE,
	1.1 gnome-panel.spec, 1.193, 1.194
Message-ID: <200704131346.l3DDkvZT007402@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.18.0-fix-tasks.patch 
Log Message:
- Apply upstream patch from Ross Burton (upstream bug 416120)
  to show completed tasks in the clock applet as completed.


gnome-panel-2.18.0-fix-tasks.patch:
 0 files changed

--- NEW FILE gnome-panel-2.18.0-fix-tasks.patch ---
--- gnome-panel-2.18.0/applets/clock/calendar-client.c	(revision 10319)
+++ gnome-panel-2.18.0/applets/clock/calendar-client.c	(working copy)
@@ -614,8 +614,13 @@
 get_ical_percent_complete (icalcomponent *ical)
 {
   icalproperty *prop;
+  icalproperty_status status;
   int           percent_complete;
 
+  status = icalcomponent_get_status (ical);
+  if (status == ICAL_STATUS_COMPLETED)
+    return 100;
+
   prop = icalcomponent_get_first_property (ical, ICAL_COMPLETED_PROPERTY);
   if (prop)
     return 100;


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- gnome-panel.spec	4 Apr 2007 19:50:27 -0000	1.193
+++ gnome-panel.spec	13 Apr 2007 13:46:55 -0000	1.194
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.18.0
-Release: 8%{?dist} 
+Release: 9%{?dist} 
 URL: http://www.gnome.org
 Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.18/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -107,6 +107,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=413921
 Patch21: gnome-panel-2.18.0-fix-invalid-read.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=416120
+Patch22: gnome-panel-2.18.0-fix-tasks.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -143,6 +146,7 @@
 %patch19 -p1 -b .update-clock-immediately
 %patch20 -p1 -b .fix-name-too-long-error
 %patch21 -p1 -b .fix-invalid-read
+%patch22 -p1 -b .fix-tasks
 
 . %{SOURCE4}
 
@@ -323,6 +327,10 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Apr 13 2007 Ray Strode <rstrode at redhat.com> - 2.18.0-9
+- Apply upstream patch from Ross Burton (upstream bug 416120)
+  to show completed tasks in the clock applet as completed.
+
 * Wed Apr  4 2007 Ray Strode <rstrode at redhat.com> - 2.18.0-8
 - fix invalid read and potentially fix 234544
 



From fedora-cvs-commits at redhat.com  Fri Apr 13 13:48:58 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 09:48:58 -0400
Subject: rpms/logwatch/devel logwatch-7.3.4-sshd.patch, NONE,
	1.1 logwatch-7.3.4-xntpd2.patch, NONE, 1.1 logwatch.spec, 1.66, 1.67
Message-ID: <200704131348.l3DDmwQt007529@cvs.devel.redhat.com>

Author: varekova

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

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.4-sshd.patch logwatch-7.3.4-xntpd2.patch 
Log Message:
- remove another xntpd service logs
- add sshd logs with two spaces after the date tag


logwatch-7.3.4-sshd.patch:
 onlyservice |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.4-sshd.patch ---
--- logwatch-7.3.4/scripts/shared/onlyservice.pom	2005-12-01 00:52:27.000000000 +0100
+++ logwatch-7.3.4/scripts/shared/onlyservice	2007-04-13 15:15:15.000000000 +0200
@@ -20,7 +20,7 @@
 }
 
 while (defined($ThisLine = <STDIN>)) {
-    if ($ThisLine =~ m/^... .. ..:..:.. [^ ]* $ServiceName\[[0123456789]*\]: /io) {
+    if ($ThisLine =~ m/^... .. ..:..:..[ ]*[^ ]* $ServiceName\[[0123456789]*\]: /io) {
       print $ThisLine;
     }
     elsif ($ThisLine =~ m/^... .. ..:..:.. [^ ]* [^ ]*\[[0123456789]*\]: \[ID [0-9]+ $ServiceName/io) {

logwatch-7.3.4-xntpd2.patch:
 xntpd |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.4-xntpd2.patch ---
--- logwatch-7.3.4/scripts/services/xntpd.pom	2007-04-13 15:22:15.000000000 +0200
+++ logwatch-7.3.4/scripts/services/xntpd	2007-04-13 15:38:30.000000000 +0200
@@ -106,7 +106,7 @@
         ($ThisLine =~ m/signal_no_reset: signal \d+ had flags \d+/) or
         ($ThisLine =~ /Deleting interface \#[0-9] [^,]*, [^,]*, interface stats: received=.*, sent=.*, dropped=.*, active_time=.* secs/) or
         ($ThisLine =~ /Invalid argument/) or 
-        ($ThisLine =~ /Listening on interface #[0-9]* (vmnet[0-9]|eth[0-9]|lo), [0-9a-z:.]+\#[0-9]* Enabled/) or
+        ($ThisLine =~ /Listening on interface #[0-9]* (vmnet[0-9]|eth[0-9]|lo|tun[0-9]), [0-9a-z:.]+\#[a-z0-9]* Enabled/) or
         ($ThisLine =~ /Listening on interface #[0-9]* wildcard, [0-9a-z:.]+\#[0-9]* Disabled/)
     ) {
        # Ignore these


Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- logwatch.spec	10 Apr 2007 10:49:04 -0000	1.66
+++ logwatch.spec	13 Apr 2007 13:48:56 -0000	1.67
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -11,6 +11,8 @@
 Patch3: logwatch-7.3.4-pam_unix.patch
 Patch4: logwatch-7.3.4-secure.patch
 Patch5: logwatch-7.3.4-xntpd.patch
+Patch6: logwatch-7.3.4-sshd.patch
+Patch7: logwatch-7.3.4-xntpd2.patch
 
 Requires: textutils sh-utils grep mailx
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,6 +31,8 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 
@@ -142,6 +146,10 @@
 %doc License project/CHANGES 
 
 %changelog
+* Fri Apr 13 2007 Ivana Varekova <varekova at redhat.com> 7.3.4-6
+- remove another xntpd service logs
+- add sshd logs with two spaces after the date tag
+
 * Tue Apr 10 2007 Ivana Varekova <varekova at redhat.com> 7.3.4-5
 - logwatch will ignore more useless secure logs
 



From fedora-cvs-commits at redhat.com  Fri Apr 13 14:18:10 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 10:18:10 -0400
Subject: rpms/ipsec-tools/devel ipsec-tools.spec,1.37,1.38
Message-ID: <200704131418.l3DEIAS8008536@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/ipsec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8522

Modified Files:
	ipsec-tools.spec 
Log Message:
* Fri Apr 13 2007 Steve Grubb <sgrubb at redhat.com> - 0.6.6-4.fc7
- Resolves: #236121 increase buffer for context
- Resolves: #234491 kernel sends ACQUIRES that racoon is not catching
- Resolves: #218386 labeled ipsec does not work over loopback



Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ipsec-tools.spec	20 Mar 2007 14:46:01 -0000	1.37
+++ ipsec-tools.spec	13 Apr 2007 14:18:08 -0000	1.38
@@ -1,6 +1,6 @@
 Name: ipsec-tools
 Version: 0.6.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Tools for configuring and using IPSEC
 License: BSD
 Group: System Environment/Base
@@ -18,6 +18,10 @@
 Patch7: ipsec-tools-0.6.5-mls.patch
 Patch9: racoon-lspp-ipsec.patch
 Patch10: ipsec-tools-0.6.5-ctx.patch
+Patch11: ipsec-tools-0.6.5-acquires.patch
+Patch12: ipsec-tools-0.6.5-loopback.patch
+Patch13: ipsec-tools-0.6.5-context-increase.patch
+
 
 BuildRequires: openssl-devel, krb5-devel, bison, flex, automake, libtool
 BuildRequires: libselinux-devel >= 1.30.28-2
@@ -40,6 +44,9 @@
 %patch7 -p1 -b .mls
 %patch9 -p1 -b .sctx
 %patch10 -p1 -b .hctx
+%patch11 -p1 -b .acquires
+%patch12 -p1 -b .loopback
+%patch13 -p1 -b .context
 
 mkdir -p kernel-headers/linux
 cp %{SOURCE1} %{SOURCE2} %{SOURCE5} %{SOURCE6} kernel-headers/linux
@@ -57,7 +64,8 @@
  --enable-dpd \
  --enable-gssapi \
  --enable-natt \
- --enable-security-context
+ --enable-security-context \
+ --enable-racoon-over-loopback
 make
 
 %install
@@ -98,6 +106,11 @@
 %config(noreplace) /etc/racoon/racoon.conf
 
 %changelog
+* Fri Apr 13 2007 Steve Grubb <sgrubb at redhat.com> - 0.6.6-4%{?dist}
+- Resolves: #236121 increase buffer for context
+- Resolves: #234491 kernel sends ACQUIRES that racoon is not catching
+- Resolves: #218386 labeled ipsec does not work over loopback
+
 * Tue Mar 20 2007 Harald Hoyer <harald at redhat.com> - 0.6.6-3%{?dist}
 - fix for setting the security context into a 
   proposal (32<->64bit) (rhbz#232508)



From fedora-cvs-commits at redhat.com  Fri Apr 13 14:22:02 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 10:22:02 -0400
Subject: rpms/ipsec-tools/devel ipsec-tools-0.6.5-acquires.patch, NONE,
	1.1 ipsec-tools-0.6.5-context-increase.patch, NONE,
	1.1 ipsec-tools-0.6.5-loopback.patch, NONE, 1.1
Message-ID: <200704131422.l3DEM2VH008697@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/ipsec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8676

Added Files:
	ipsec-tools-0.6.5-acquires.patch 
	ipsec-tools-0.6.5-context-increase.patch 
	ipsec-tools-0.6.5-loopback.patch 
Log Message:
* Fri Apr 13 2007 Steve Grubb <sgrubb at redhat.com> - 0.6.6-4.fc7
- Resolves: #236121 increase buffer for context
- Resolves: #234491 kernel sends ACQUIRES that racoon is not catching
- Resolves: #218386 labeled ipsec does not work over loopback


ipsec-tools-0.6.5-acquires.patch:
 handler.h |    2 ++
 pfkey.c   |   35 ++++++++++++++++++++++++++++++-----
 2 files changed, 32 insertions(+), 5 deletions(-)

--- NEW FILE ipsec-tools-0.6.5-acquires.patch ---
diff -urpN ipsec-tools-0.6.5/src/racoon/handler.h ipsec-tools-0.6.5.sandbox/src/racoon/handler.h
--- ipsec-tools-0.6.5/src/racoon/handler.h	2005-05-07 12:26:05.000000000 -0500
+++ ipsec-tools-0.6.5.sandbox/src/racoon/handler.h	2007-04-10 10:57:52.000000000 -0500
@@ -279,6 +279,8 @@ struct ph2handle {
 	u_int8_t flags;			/* Flags for phase 2 */
 	u_int32_t msgid;		/* msgid for phase 2 */
 
+	u_int32_t sa_count;		/* num of SAs sent in SADB_ADD */
+	
 	struct sainfo *sainfo;		/* place holder of sainfo */
 	struct saprop *proposal;	/* SA(s) proposal. */
 	struct saprop *approval;	/* SA(s) approved. */
diff -urpN ipsec-tools-0.6.5/src/racoon/pfkey.c ipsec-tools-0.6.5.sandbox/src/racoon/pfkey.c
--- ipsec-tools-0.6.5/src/racoon/pfkey.c	2007-04-10 10:17:40.000000000 -0500
+++ ipsec-tools-0.6.5.sandbox/src/racoon/pfkey.c	2007-04-10 10:56:39.000000000 -0500
@@ -1287,7 +1287,9 @@ pk_recvupdate(mhp)
 	SCHED_KILL(iph2->sce);
 	
 	/* update status */
-	iph2->status = PHASE2ST_ESTABLISHED;
+	/* Do this in pk_recvadd
+	 * iph2->status = PHASE2ST_ESTABLISHED;
+	 */
 
 #ifdef ENABLE_STATS
 	gettimeofday(&iph2->end, NULL);
@@ -1333,6 +1335,7 @@ pk_sendadd(iph2)
 	u_int8_t ctxdoi = 0, ctxalg = 0;
 	u_int16_t ctxstrlen = 0;
 	caddr_t ctxstr = NULL;
+	u_int32_t sa_sent = 0;
 
 	/* sanity check */
 	if (iph2->approval == NULL) {
@@ -1470,6 +1473,9 @@ pk_sendadd(iph2)
 		}
 #endif /* ENABLE_NATT */
 
+		/* keep count of SAs added. */
+		sa_sent++;
+
 		if (!lcconf->pathinfo[LC_PATHTYPE_BACKUPSA])
 			continue;
 
@@ -1497,6 +1503,7 @@ pk_sendadd(iph2)
 			satype, pr->spi_p, mode));
 	}
 
+	iph2->sa_count = sa_sent;
 	return 0;
 }
 
@@ -1552,9 +1559,18 @@ pk_recvadd(mhp)
 	}
 
 	/*
-	 * NOTE don't update any status of phase2 handle
-	 * because they must be updated by SADB_UPDATE message
+	 * Thus, update the status of phase 2 handle after all SADB_ADD
+	 * msgs have been received for the handle, rather than
+	 * after SADB_UPDATE.
+	 *
+	 * This also removes the possibilty of processing an ACQUIRE
+	 * received by kernel for SAs we are still adding.
 	 */
+	if (iph2->sa_count) {
+		iph2->sa_count = iph2->sa_count - 1;
+		if (iph2->sa_count == 0)
+			iph2->status = PHASE2ST_ESTABLISHED;
+	}
 
 	plog(LLV_INFO, LOCATION, NULL,
 		"IPsec-SA established: %s\n",
@@ -1639,8 +1655,6 @@ pk_recvexpire(mhp)
 	/* turn off the timer for calling isakmp_ph2expire() */ 
 	SCHED_KILL(iph2->sce);
 
-	iph2->status = PHASE2ST_EXPIRED;
-
 	/* INITIATOR, begin phase 2 exchange. */
 	/* allocate buffer for status management of pfkey message */
 	if (iph2->side == INITIATOR) {
@@ -1668,6 +1682,7 @@ pk_recvexpire(mhp)
 	/* If not received SADB_EXPIRE, INITIATOR delete ph2handle. */
 	/* RESPONDER always delete ph2handle, keep silent.  RESPONDER doesn't
 	 * manage IPsec SA, so delete the list */
+	iph2->status = PHASE2ST_EXPIRED;
 	unbindph12(iph2);
 	remph2(iph2);
 	delph2(iph2);
@@ -1789,8 +1804,18 @@ pk_recvacquire(mhp)
 	 *    2. its state is equal to PHASE2ST_ESTABLISHED, then racoon
 	 *       has to prcesss such a acquire message because racoon may
 	 *       lost the expire message.
+	 *
+	 * When in responder role, an spid doesn't get added to
+	 * the handler since responder didn't receive acquire.
+	 * Thus there is the case that a negotiation can be occurring
+	 * and responder receives acquire for same policy. So to prevent
+	 * another identical negotiation, also check by address.
 	 */
+
 	iph2[0] = getph2byid(src, dst, xpl->sadb_x_policy_id);
+	if (iph2[0] == NULL)
+		iph2[0] = getph2bysaddr(src, dst);
+
 	if (iph2[0] != NULL) {
 		if (iph2[0]->status < PHASE2ST_ESTABLISHED) {
 			plog(LLV_DEBUG, LOCATION, NULL,


ipsec-tools-0.6.5-context-increase.patch:
 ipsec-tools-0.6.5.patch/src/racoon/pfkey.c |    6 ++++++
 ipsec-tools-0.6.5/src/racoon/policy.h      |    6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE ipsec-tools-0.6.5-context-increase.patch ---
diff -urp ipsec-tools-0.6.5.orig/src/racoon/policy.h ipsec-tools-0.6.5/src/racoon/policy.h
--- ipsec-tools-0.6.5.orig/src/racoon/policy.h	2007-04-12 09:56:11.000000000 -0400
+++ ipsec-tools-0.6.5/src/racoon/policy.h	2007-04-12 10:57:30.000000000 -0400
@@ -36,7 +36,11 @@
 
 #ifdef HAVE_SECCTX
 
-#define MAX_CTXSTR_SIZE 50
+/* Current LSPP policy is 1024 compartments, 5 chars each 'c1024'. SE Linux
+ * will attempt to combine so, worst case is all odd or even numbers. The
+ * context size of SE Linux types is max'ed around 256. We allow 16 for
+ * sensitivity */
+#define MAX_CTXSTR_SIZE 3344  /* (6 * 512) + 256 + 16 */
 struct security_ctx {
 	u_int8_t ctx_doi;	/* Security Context DOI */
 	u_int8_t ctx_alg;	/* Security Context Algorithm */
diff -urpN ipsec-tools-0.6.5/src/racoon/pfkey.c ipsec-tools-0.6.5.patch/src/racoon/pfkey.c
--- ipsec-tools-0.6.5/src/racoon/pfkey.c	2007-04-12 09:21:35.000000000 -0500
+++ ipsec-tools-0.6.5.patch/src/racoon/pfkey.c	2007-04-12 09:23:10.000000000 -0500
@@ -1735,6 +1735,12 @@ pk_recvacquire(mhp)
 	m_sec_ctx = (struct sadb_x_sec_ctx *)mhp[SADB_X_EXT_SEC_CTX];
 
 	if (m_sec_ctx != NULL) {
+		if (m_sec_ctx->sadb_x_ctx_len > MAX_CTXSTR_SIZE) {
+			plog(LLV_ERROR, LOCATION, NULL,
+			     "ignoring ACQUIRE: security context is greater than MAX, %d.\n",
+			     MAX_CTXSTR_SIZE);
+			return -1;
+		}
 		plog(LLV_INFO, LOCATION, NULL, 
 			"security context doi: %u\n",
 			m_sec_ctx->sadb_x_ctx_doi);

ipsec-tools-0.6.5-loopback.patch:
 configure.ac              |   10 ++++
 src/racoon/admin.c        |    4 -
 src/racoon/handler.c      |   49 ++++++++++++++++++----
 src/racoon/handler.h      |   15 +++---
 src/racoon/isakmp.c       |  102 ++++++++++++++++++++++++++++++++++++++++------
 src/racoon/isakmp.h       |    2 
 src/racoon/isakmp_inf.c   |    6 +-
 src/racoon/isakmp_xauth.c |    2 
 src/racoon/pfkey.c        |   15 ++++--
 9 files changed, 168 insertions(+), 37 deletions(-)

--- NEW FILE ipsec-tools-0.6.5-loopback.patch ---
diff -urpN ipsec-tools-0.6.5.sandbox/configure.ac ipsec-tools-0.6.5.sandbox2/configure.ac
--- ipsec-tools-0.6.5.sandbox/configure.ac	2007-04-10 10:35:48.000000000 -0500
+++ ipsec-tools-0.6.5.sandbox2/configure.ac	2007-04-10 11:33:53.000000000 -0500
@@ -624,6 +624,16 @@ if test "$enable_security_context" = "ye
 	fi
 fi
 
+# Option --enable-racoon-over-loopback
+AC_MSG_CHECKING(if --enable-racoon-over-loopback option is specified)
+AC_ARG_ENABLE(racoon-over-loopback,
+	[  --enable-racoon-over-loopback        enable racoon to use loopback],
+	[], [enable_racoon_over_loopback=no])
+if test $enable_racoon_over_loopback = "yes"; then
+	AC_DEFINE([ENABLE_RACOON_OVER_LOOPBACK], [], [Enable racoon to use loopback])
+fi
+AC_MSG_RESULT($enable_racoon_over_loopback)
+
 CFLAGS="$CFLAGS $CFLAGS_ADD"
 CPPFLAGS="$CPPFLAGS $CPPFLAGS_ADD"
 
diff -urpN ipsec-tools-0.6.5.sandbox/src/racoon/admin.c ipsec-tools-0.6.5.sandbox2/src/racoon/admin.c
--- ipsec-tools-0.6.5.sandbox/src/racoon/admin.c	2007-04-10 10:35:48.000000000 -0500
+++ ipsec-tools-0.6.5.sandbox2/src/racoon/admin.c	2007-04-10 11:40:09.000000000 -0500
@@ -289,7 +289,7 @@ admin_process(so2, combuf)
 			break;
 		}
 
-		if ((iph1 = getph1byaddrwop(src, dst)) == NULL) {
+		if ((iph1 = getph1byaddrwop(src, dst, ANYSIDE)) == NULL) {
 			plog(LLV_ERROR, LOCATION, NULL, 
 			    "phase 1 for %s -> %s not found\n", loc, rem);
 		} else {
@@ -322,7 +322,7 @@ admin_process(so2, combuf)
 		plog(LLV_INFO, LOCATION, NULL, 
 		    "Flushing all SAs for peer %s\n", rem);
 
-		while ((iph1 = getph1bydstaddrwop(dst)) != NULL) {
+		while ((iph1 = getph1bydstaddrwop(dst, ANYSIDE)) != NULL) {
 			if ((loc = strdup(saddrwop2str(iph1->local))) == NULL) {
 				plog(LLV_ERROR, LOCATION, NULL, 
 				    "cannot allocate memory\n");
diff -urpN ipsec-tools-0.6.5.sandbox/src/racoon/handler.c ipsec-tools-0.6.5.sandbox2/src/racoon/handler.c
--- ipsec-tools-0.6.5.sandbox/src/racoon/handler.c	2007-04-10 10:35:48.000000000 -0500
+++ ipsec-tools-0.6.5.sandbox2/src/racoon/handler.c	2007-04-10 11:47:24.000000000 -0500
@@ -93,14 +93,19 @@ static void sweep_recvdpkt __P((void *))
 extern caddr_t val2str(const char *, size_t);
 
 struct ph1handle *
-getph1byindex(index)
+getph1byindex(index, side)
 	isakmp_index *index;
+	int side;
 {
 	struct ph1handle *p;
 
 	LIST_FOREACH(p, &ph1tree, chain) {
 		if (p->status == PHASE1ST_EXPIRED)
 			continue;
+#ifdef ENABLE_RACOON_OVER_LOOPBACK
+		if (p->side != side && side != ANYSIDE)
+			continue;
+#endif
 		if (memcmp(&p->index, index, sizeof(*index)) == 0)
 			return p;
 	}
@@ -112,14 +117,19 @@ getph1byindex(index)
  * search for isakmp handler by i_ck in index.
  */
 struct ph1handle *
-getph1byindex0(index)
+getph1byindex0(index, side)
 	isakmp_index *index;
+	int side;
 {
 	struct ph1handle *p;
 
 	LIST_FOREACH(p, &ph1tree, chain) {
 		if (p->status == PHASE1ST_EXPIRED)
 			continue;
+#ifdef ENABLE_RACOON_OVER_LOOPBACK
+		if (p->side != side && side != ANYSIDE)
+			continue;
+#endif
 		if (memcmp(&p->index, index, sizeof(cookie_t)) == 0)
 			return p;
 	}
@@ -133,14 +143,19 @@ getph1byindex0(index)
  * with phase 2's destinaion.
  */
 struct ph1handle *
-getph1byaddr(local, remote)
+getph1byaddr(local, remote, side)
 	struct sockaddr *local, *remote;
+	int side;
 {
 	struct ph1handle *p;
 
 	LIST_FOREACH(p, &ph1tree, chain) {
 		if (p->status == PHASE1ST_EXPIRED)
 			continue;
+#ifdef ENABLE_RACOON_OVER_LOOPBACK
+		if (p->side != side && side != ANYSIDE)
+			continue;
+#endif
 		if (CMPSADDR(local, p->local) == 0
 		 && CMPSADDR(remote, p->remote) == 0)
 			return p;
@@ -150,14 +165,19 @@ getph1byaddr(local, remote)
 }
 
 struct ph1handle *
-getph1byaddrwop(local, remote)
+getph1byaddrwop(local, remote, side)
 	struct sockaddr *local, *remote;
+	int side;
 {
 	struct ph1handle *p;
 
 	LIST_FOREACH(p, &ph1tree, chain) {
 		if (p->status == PHASE1ST_EXPIRED)
 			continue;
+#ifdef ENABLE_RACOON_OVER_LOOPBACK
+		if (p->side != side && side != ANYSIDE)
+			continue;
+#endif
 		if (cmpsaddrwop(local, p->local) == 0
 		 && cmpsaddrwop(remote, p->remote) == 0)
 			return p;
@@ -172,14 +192,19 @@ getph1byaddrwop(local, remote)
  * with phase 2's destinaion.
  */
 struct ph1handle *
-getph1bydstaddrwop(remote)
+getph1bydstaddrwop(remote, side)
 	struct sockaddr *remote;
+	int side;
 {
 	struct ph1handle *p;
 
 	LIST_FOREACH(p, &ph1tree, chain) {
 		if (p->status == PHASE1ST_EXPIRED)
 			continue;
+#ifdef ENABLE_RACOON_OVER_LOOPBACK
+		if (p->side != side && side != ANYSIDE)
+			continue;
+#endif
 		if (cmpsaddrwop(remote, p->remote) == 0)
 			return p;
 	}
@@ -444,13 +469,18 @@ getph2byseq(seq)
  * search ph2handle with message id.
  */
 struct ph2handle *
-getph2bymsgid(iph1, msgid)
+getph2bymsgid(iph1, msgid, side)
 	struct ph1handle *iph1;
 	u_int32_t msgid;
+	int side;
 {
 	struct ph2handle *p;
 
 	LIST_FOREACH(p, &ph2tree, chain) {
+#ifdef ENABLE_RACOON_OVER_LOOPBACK
+		if (p->side != side && side != ANYSIDE)
+			continue;
+#endif
 		if (p->msgid == msgid)
 			return p;
 	}
@@ -476,12 +506,17 @@ getph2byid(src, dst, spid)
 }
 
 struct ph2handle *
-getph2bysaddr(src, dst)
+getph2bysaddr(src, dst, side)
 	struct sockaddr *src, *dst;
+	int side;
 {
 	struct ph2handle *p;
 
 	LIST_FOREACH(p, &ph2tree, chain) {
+#ifdef ENABLE_RACOON_OVER_LOOPBACK
+		if (p->side != side && side != ANYSIDE)
+			continue;
+#endif
 		if (cmpsaddrstrict(src, p->src) == 0 &&
 		    cmpsaddrstrict(dst, p->dst) == 0)
 			return p;
diff -urpN ipsec-tools-0.6.5.sandbox/src/racoon/handler.h ipsec-tools-0.6.5.sandbox2/src/racoon/handler.h
--- ipsec-tools-0.6.5.sandbox/src/racoon/handler.h	2007-04-10 10:57:52.000000000 -0500
+++ ipsec-tools-0.6.5.sandbox2/src/racoon/handler.h	2007-04-10 11:40:09.000000000 -0500
@@ -419,13 +419,13 @@ struct ph1handle;
 struct ph2handle;
 struct policyindex;
 
-extern struct ph1handle *getph1byindex __P((isakmp_index *));
-extern struct ph1handle *getph1byindex0 __P((isakmp_index *));
+extern struct ph1handle *getph1byindex __P((isakmp_index *, int));
+extern struct ph1handle *getph1byindex0 __P((isakmp_index *, int));
 extern struct ph1handle *getph1byaddr __P((struct sockaddr *,
-	struct sockaddr *));
+					   struct sockaddr *, int));
 extern struct ph1handle *getph1byaddrwop __P((struct sockaddr *,
-	struct sockaddr *));
-extern struct ph1handle *getph1bydstaddrwop __P((struct sockaddr *));
+	struct sockaddr *, int));
+extern struct ph1handle *getph1bydstaddrwop __P((struct sockaddr *, int));
 extern vchar_t *dumpph1 __P((void));
 extern struct ph1handle *newph1 __P((void));
 extern void delph1 __P((struct ph1handle *));
@@ -438,8 +438,9 @@ extern struct ph2handle *getph2byspidx _
 extern struct ph2handle *getph2byspid __P((u_int32_t));
 extern struct ph2handle *getph2byseq __P((u_int32_t));
 extern struct ph2handle *getph2bysaddr __P((struct sockaddr *,
-	struct sockaddr *));
-extern struct ph2handle *getph2bymsgid __P((struct ph1handle *, u_int32_t));
+	struct sockaddr *, int));
+extern struct ph2handle *getph2bymsgid __P((struct ph1handle *, u_int32_t,
+	int));
 extern struct ph2handle *getph2byid __P((struct sockaddr *,
 	struct sockaddr *, u_int32_t));
 extern struct ph2handle *getph2bysaidx __P((struct sockaddr *,
diff -urpN ipsec-tools-0.6.5.sandbox/src/racoon/isakmp.c ipsec-tools-0.6.5.sandbox2/src/racoon/isakmp.c
--- ipsec-tools-0.6.5.sandbox/src/racoon/isakmp.c	2007-04-10 10:35:48.000000000 -0500
+++ ipsec-tools-0.6.5.sandbox2/src/racoon/isakmp.c	2007-04-10 13:22:58.000000000 -0500
@@ -368,6 +368,36 @@ end:
 	return(error);
 }
 
+#ifdef ENABLE_RACOON_OVER_LOOPBACK
+/*
+ * isakmp phase 1 search helper
+ */
+static struct ph1handle *
+isakmp_ph1pickside(iph1_i, iph1_r, local)
+	struct ph1handle *iph1_i, *iph1_r;
+	struct sockaddr *local;
+{
+	if (iph1_i == NULL && iph1_r != NULL) {
+		if (cmpsaddrstrict(iph1_r->remote, local) != 0)
+			return iph1_r;
+		else
+			return NULL;
+	} else if (iph1_i != NULL && iph1_r == NULL) {
+		if (cmpsaddrstrict(iph1_i->remote, local) != 0)
+			return iph1_i;
+		else
+			return NULL;
+	} else if (iph1_i != NULL && iph1_r != NULL) {
+		if (iph1_r->status < iph1_i->status)
+			return iph1_r;
+		else
+			return iph1_i;
+	}
+
+	return NULL;
+}
+#endif
+
 /*
  * main processing to handle isakmp payload
  */
@@ -434,7 +464,15 @@ isakmp_main(msg, remote, local)
 		}
 	}
 
-	iph1 = getph1byindex(index);
+
+#ifdef ENABLE_RACOON_OVER_LOOPBACK
+	iph1 = isakmp_ph1pickside(getph1byindex(index, INITIATOR),
+				  getph1byindex(index, RESPONDER),
+				  local);
+#else
+	iph1 = getph1byindex(index, ANYSIDE);
+#endif
+
 	if (iph1 != NULL) {
 		/* validity check */
 		if (memcmp(&isakmp->r_ck, r_ck0, sizeof(cookie_t)) == 0 &&
@@ -516,7 +554,15 @@ isakmp_main(msg, remote, local)
 			 */
 
 			/* search for phase1 handle by index without r_ck */
-			iph1 = getph1byindex0(index);
+#ifdef ENABLE_RACOON_OVER_LOOPBACK
+			iph1 = isakmp_ph1pickside(
+				getph1byindex0(index, INITIATOR),
+				getph1byindex0(index, RESPONDER),
+				local);
+#else
+			iph1=getph1byindex0(index, ANYSIDE);
+#endif
+
 			if (iph1 == NULL) {
 				/*it must be the 1st message from a initiator.*/
 				if (memcmp(&isakmp->r_ck, r_ck0,
@@ -592,7 +638,7 @@ isakmp_main(msg, remote, local)
 		 * NOTE: We think such informational exchange should be ignored.
 		 */
 		if (iph1 == NULL) {
-			iph1 = getph1byindex0(index);
+			iph1 = getph1byindex0(index, INITIATOR);
 			if (iph1 == NULL) {
 				plog(LLV_ERROR, LOCATION, remote,
 					"unknown Informational "
@@ -619,6 +665,9 @@ isakmp_main(msg, remote, local)
 	case ISAKMP_ETYPE_QUICK:
 	{
 		struct ph2handle *iph2;
+#ifdef ENABLE_RACOON_OVER_LOOPBACK
+		struct ph2handle *iph2_i, *iph2_r;
+#endif
 
 		if (iph1 == NULL) {
 			isakmp_info_send_nx(isakmp, remote, local,
@@ -645,8 +694,31 @@ isakmp_main(msg, remote, local)
 			return -1;
 		}
 
-		/* search isakmp phase 2 stauts record. */
-		iph2 = getph2bymsgid(iph1, msgid);
+		/* search isakmp phase 2 status record. */
+#ifdef ENABLE_RACOON_OVER_LOOPBACK
+		iph2_i = getph2bymsgid(iph1, msgid, INITIATOR);
+		iph2_r = getph2bymsgid(iph1, msgid, RESPONDER);
+		if (iph2_i == NULL && iph2_r != NULL) {
+			if (cmpsaddrstrict(iph1->remote, local) != 0)
+				iph2 = iph2_r;
+			else
+				iph2 = NULL;
+		} else if (iph2_i != NULL && iph2_r == NULL) {
+			if (cmpsaddrstrict(iph1->remote, local) != 0)
+				iph2 = iph2_i;
+			else
+				iph2 = NULL;
+		} else if (iph2_i != NULL && iph2_r != NULL) {
+			if (iph2_r->status < iph2_i->status)
+				iph2 = iph2_r;
+			else
+				iph2 = iph2_i;
+		} else
+			iph2 = NULL;
+#else
+		iph2 = getph2bymsgid(iph1, msgid, ANYSIDE);
+#endif
+
 		if (iph2 == NULL) {
 			/* it must be new negotiation as responder */
 			if (isakmp_ph2begin_r(iph1, msg) < 0)
@@ -2041,15 +2113,17 @@ isakmp_post_acquire(iph2)
 	 */
 #ifdef ENABLE_NATT
 	if (!extract_port(iph2->src) && !extract_port(iph2->dst)) {
-		if ((iph1 = getph1byaddrwop(iph2->src, iph2->dst)) != NULL) {
+		if ((iph1 = getph1byaddrwop(iph2->src,
+					    iph2->dst,
+					    ANYSIDE)) != NULL) {
 			set_port(iph2->src, extract_port(iph1->local));
 			set_port(iph2->dst, extract_port(iph1->remote));
 		}
 	} else {
-		iph1 = getph1byaddr(iph2->src, iph2->dst);
+		iph1 = getph1byaddr(iph2->src, iph2->dst, ANYSIDE);
 	}
 #else
-	iph1 = getph1byaddr(iph2->src, iph2->dst);
+	iph1 = getph1byaddr(iph2->src, iph2->dst, ANYSIDE);
 #endif
 
 	/* no ISAKMP-SA found. */
@@ -2175,15 +2249,17 @@ isakmp_chkph1there(iph2)
 	 */
 #ifdef ENABLE_NATT
 	if (!extract_port(iph2->src) && !extract_port(iph2->dst)) {
-		if ((iph1 = getph1byaddrwop(iph2->src, iph2->dst)) != NULL) {
+		if ((iph1 = getph1byaddrwop(iph2->src,
+					    iph2->dst,
+					    ANYSIDE)) != NULL) {
 			set_port(iph2->src, extract_port(iph1->local));
 			set_port(iph2->dst, extract_port(iph1->remote));
 		}
 	} else {
-		iph1 = getph1byaddr(iph2->src, iph2->dst);
+		iph1 = getph1byaddr(iph2->src, iph2->dst, ANYSIDE);
 	}
 #else
-	iph1 = getph1byaddr(iph2->src, iph2->dst);
+	iph1 = getph1byaddr(iph2->src, iph2->dst, ANYSIDE);
 #endif
 
 	/* XXX Even if ph1 as responder is there, should we not start
@@ -2432,7 +2508,7 @@ isakmp_newmsgid2(iph1)
 
 	do {
 		msgid2 = eay_random();
-	} while (getph2bymsgid(iph1, msgid2));
+	} while (getph2bymsgid(iph1, msgid2, iph1->side));
 
 	return msgid2;
 }
@@ -3094,7 +3170,7 @@ purge_remote(iph1)
 	iph1->status = PHASE1ST_EXPIRED;
 
 	/* Check if we have another, still valid, phase1 SA. */
-	new_iph1 = getph1byaddr(iph1->local, iph1->remote);
+	new_iph1 = getph1byaddr(iph1->local, iph1->remote, ANYSIDE);
 
 	/*
 	 * Delete all orphaned or binded to the deleting ph1handle phase2 SAs.
diff -urpN ipsec-tools-0.6.5.sandbox/src/racoon/isakmp.h ipsec-tools-0.6.5.sandbox2/src/racoon/isakmp.h
--- ipsec-tools-0.6.5.sandbox/src/racoon/isakmp.h	2007-04-10 10:35:48.000000000 -0500
+++ ipsec-tools-0.6.5.sandbox2/src/racoon/isakmp.h	2007-04-10 11:40:09.000000000 -0500
@@ -37,6 +37,8 @@
 /* must include <netinet/in.h> first. */
 /* must include "isakmp_var.h" first. */
 
+#define ANYSIDE		-1	/* either INITIATOR or RESPONDER */
+
 #define INITIATOR	0	/* synonym sender */
 #define RESPONDER	1	/* synonym receiver */
 
diff -urpN ipsec-tools-0.6.5.sandbox/src/racoon/isakmp_inf.c ipsec-tools-0.6.5.sandbox2/src/racoon/isakmp_inf.c
--- ipsec-tools-0.6.5.sandbox/src/racoon/isakmp_inf.c	2007-04-10 10:35:48.000000000 -0500
+++ ipsec-tools-0.6.5.sandbox2/src/racoon/isakmp_inf.c	2007-04-10 11:40:09.000000000 -0500
@@ -363,7 +363,7 @@ isakmp_info_send_d2(iph2)
 	 * don't send delete information if there is no phase 1 handler.
 	 * It's nonsensical to negotiate phase 1 to send the information.
 	 */
-	iph1 = getph1byaddr(iph2->src, iph2->dst); 
+	iph1 = getph1byaddr(iph2->src, iph2->dst, ANYSIDE);
 	if (iph1 == NULL)
 		return 0;
 
@@ -892,7 +892,7 @@ isakmp_info_recv_n(iph1, msg)
 				"delete phase1 handle.\n");
 			return -1;
 		} else {
-			iph2 = getph2bymsgid(iph1, msgid);
+			iph2 = getph2bymsgid(iph1, msgid, iph1->side);
 			if (iph2 == NULL) {
 				plog(LLV_ERROR, LOCATION, iph1->remote,
 					"unknown notify message, "
@@ -937,7 +937,7 @@ purge_isakmp_spi(proto, spi, n)
 	size_t i;
 
 	for (i = 0; i < n; i++) {
-		iph1 = getph1byindex(&spi[i]);
+		iph1 = getph1byindex(&spi[i], ANYSIDE);
 		if (!iph1)
 			continue;
 
diff -urpN ipsec-tools-0.6.5.sandbox/src/racoon/isakmp_xauth.c ipsec-tools-0.6.5.sandbox2/src/racoon/isakmp_xauth.c
--- ipsec-tools-0.6.5.sandbox/src/racoon/isakmp_xauth.c	2007-04-10 10:35:48.000000000 -0500
+++ ipsec-tools-0.6.5.sandbox2/src/racoon/isakmp_xauth.c	2007-04-10 11:40:09.000000000 -0500
@@ -338,7 +338,7 @@ xauth_reply_stub(args)
 	struct xauth_reply_arg *xra = (struct xauth_reply_arg *)args;
 	struct ph1handle *iph1;
 
-	if ((iph1 = getph1byindex(&xra->index)) != NULL)
+	if ((iph1 = getph1byindex(&xra->index, ANYSIDE)) != NULL)
 		xauth_reply(iph1, xra->port, xra->id, xra->res);
 	else
 		plog(LLV_ERROR, LOCATION, NULL, 
diff -urpN ipsec-tools-0.6.5.sandbox/src/racoon/pfkey.c ipsec-tools-0.6.5.sandbox2/src/racoon/pfkey.c
--- ipsec-tools-0.6.5.sandbox/src/racoon/pfkey.c	2007-04-10 10:56:39.000000000 -0500
+++ ipsec-tools-0.6.5.sandbox2/src/racoon/pfkey.c	2007-04-10 13:31:24.000000000 -0500
@@ -1286,10 +1286,11 @@ pk_recvupdate(mhp)
 	/* turn off the timer for calling pfkey_timeover() */
 	SCHED_KILL(iph2->sce);
 	
+#ifdef ENABLE_RACOON_OVER_LOOPBACK
 	/* update status */
-	/* Do this in pk_recvadd
-	 * iph2->status = PHASE2ST_ESTABLISHED;
-	 */
+	if (cmpsaddrstrict(iph2->ph1->local, iph2->ph1->remote) == 0)
+		iph2->status = PHASE2ST_ESTABLISHED;
+#endif
 
 #ifdef ENABLE_STATS
 	gettimeofday(&iph2->end, NULL);
@@ -1343,6 +1344,12 @@ pk_sendadd(iph2)
 			"no approvaled SAs found.\n");
 	}
 
+#ifdef ENABLE_RACOON_OVER_LOOPBACK
+	/* This prevents adding the same SA twice, since done in update */
+	if (cmpsaddrstrict(iph2->ph1->local, iph2->ph1->remote) == 0)
+		return 0;
+#endif
+
 	if (iph2->side == INITIATOR)
 		proxy = iph2->ph1->rmconf->support_proxy;
 	else if (iph2->sainfo && iph2->sainfo->id_i)
@@ -1814,7 +1821,7 @@ pk_recvacquire(mhp)
 
 	iph2[0] = getph2byid(src, dst, xpl->sadb_x_policy_id);
 	if (iph2[0] == NULL)
-		iph2[0] = getph2bysaddr(src, dst);
+		iph2[0] = getph2bysaddr(src, dst, ANYSIDE);
 
 	if (iph2[0] != NULL) {
 		if (iph2[0]->status < PHASE2ST_ESTABLISHED) {




From fedora-cvs-commits at redhat.com  Fri Apr 13 14:22:58 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 10:22:58 -0400
Subject: rpms/xorg-x11-server/devel xserver-rc5-to-now.patch, NONE,
	1.1 xorg-x11-server.spec, 1.222, 1.223
Message-ID: <200704131422.l3DEMwrT008797@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-rc5-to-now.patch 
Log Message:
* Fri Apr 13 2007 Adam Jackson <ajax at redhat.com> 1.2.99.905-5
- xserver-rc5-to-now.patch: Updates from git.


xserver-rc5-to-now.patch:
 GL/glx/glxdri.c                |    6 +++++-
 hw/xfree86/modes/xf86Crtc.c    |   10 ++++++++--
 hw/xfree86/modes/xf86RandR12.c |   22 ++++++++++++++++++++++
 hw/xfree86/modes/xf86RandR12.h |    1 +
 randr/rrscreen.c               |   13 ++++++++++---
 5 files changed, 46 insertions(+), 6 deletions(-)

--- NEW FILE xserver-rc5-to-now.patch ---
diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index 36464a6..788b87d 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -815,12 +815,16 @@ static Bool
 glxDRIEnterVT (int index, int flags)
 {
     __GLXDRIscreen *screen = (__GLXDRIscreen *) __glXgetActiveScreen(index);
+    Bool ret;
 
     LogMessage(X_INFO, "AIGLX: Resuming AIGLX clients after VT switch\n");
 
+    if (!(*screen->enterVT) (index, flags))
+	return FALSE;
+    
     glxResumeClients();
 
-    return (*screen->enterVT) (index, flags);
+    return TRUE;
 }
 
 static void
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 325fb64..eba32e4 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -233,8 +233,6 @@ xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
     int			saved_x, saved_y;
     Rotation		saved_rotation;
 
-    adjusted_mode = xf86DuplicateMode(mode);
-
     crtc->enabled = xf86CrtcInUse (crtc);
     
     if (!crtc->enabled)
@@ -243,6 +241,8 @@ xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
 	return TRUE;
     }
 
+    adjusted_mode = xf86DuplicateMode(mode);
+
     didLock = crtc->funcs->lock (crtc);
 
     saved_mode = crtc->mode;
@@ -1817,6 +1817,11 @@ xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation)
 	    else
 		crtc_mode = xf86OutputFindClosestMode (output, desired);
 	}
+	if (!crtc_mode)
+	{
+	    crtc->enabled = FALSE;
+	    continue;
+	}
 	if (!xf86CrtcSetMode (crtc, crtc_mode, rotation, 0, 0))
 	    ok = FALSE;
 	else
@@ -1828,6 +1833,7 @@ xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation)
 	}
     }
     xf86DisableUnusedFunctions(pScrn);
+    xf86RandR12TellChanged (pScrn->pScreen);
     return ok;
 }
 
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index 6f52ee2..90de585 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -1048,6 +1048,28 @@ xf86RandR12CreateScreenResources12 (ScreenPtr pScreen)
     return TRUE;
 }
 
+/*
+ * Something happened within the screen configuration due
+ * to DGA, VidMode or hot key. Tell RandR
+ */
+
+void
+xf86RandR12TellChanged (ScreenPtr pScreen)
+{
+    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);
+    XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);
+    int			c;
+
+    if (!randrp)
+	return;
+    xf86RandR12SetInfo12 (pScreen);
+    for (c = 0; c < config->num_crtc; c++)
+	xf86RandR12CrtcNotify (config->crtc[c]->randr_crtc);
+
+    RRTellChanged (pScreen);
+}
+
 static void
 xf86RandR12PointerMoved (int scrnIndex, int x, int y)
 {
diff --git a/hw/xfree86/modes/xf86RandR12.h b/hw/xfree86/modes/xf86RandR12.h
index 8a4668b..0d3346a 100644
--- a/hw/xfree86/modes/xf86RandR12.h
+++ b/hw/xfree86/modes/xf86RandR12.h
@@ -33,5 +33,6 @@ Bool xf86RandR12SetConfig(ScreenPtr pScreen, Rotation rotation, int rate,
 Rotation xf86RandR12GetRotation(ScreenPtr pScreen);
 void xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr pScrn, int *x, int *y);
 Bool xf86RandR12PreInit (ScrnInfoPtr pScrn);
+void xf86RandR12TellChanged (ScreenPtr pScreen);
 
 #endif /* _XF86_RANDR_H_ */
diff --git a/randr/rrscreen.c b/randr/rrscreen.c
index 8aa26fa..f2981b0 100644
--- a/randr/rrscreen.c
+++ b/randr/rrscreen.c
@@ -741,6 +741,7 @@ ProcRRSetScreenConfig (ClientPtr client)
     RRModePtr		    mode;
     RR10DataPtr		    pData = NULL;
     RRScreenSizePtr    	    pSize;
+    int			    width, height;
     
     UpdateCurrentTime ();
 
@@ -882,8 +883,14 @@ ProcRRSetScreenConfig (ClientPtr client)
      * If the screen size is changing, adjust all of the other outputs
      * to fit the new size, mirroring as much as possible
      */
-    if (mode->mode.width != pScreen->width || 
-	mode->mode.height != pScreen->height)
+    width = mode->mode.width;
+    height = mode->mode.height;
+    if (rotation & (RR_Rotate_90|RR_Rotate_270))
+    {
+	width = mode->mode.height;
+	height = mode->mode.width;
+    }
+    if (width != pScreen->width || height != pScreen->height)
     {
 	int	c;
 
@@ -897,7 +904,7 @@ ProcRRSetScreenConfig (ClientPtr client)
 		goto sendReply;
 	    }
 	}
-	if (!RRScreenSizeSet (pScreen, mode->mode.width, mode->mode.height,
+	if (!RRScreenSizeSet (pScreen, width, height,
 			      pScreen->mmWidth, pScreen->mmHeight))
 	{
 	    rep.status = RRSetConfigFailed;


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- xorg-x11-server.spec	12 Apr 2007 00:08:39 -0000	1.222
+++ xorg-x11-server.spec	13 Apr 2007 14:22:56 -0000	1.223
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.2.99.905
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -66,6 +66,9 @@
 Patch2504:  xserver-1.3.0-domain-obiwan.patch
 Patch2505:  xserver-1.3.0-pci-device-enable.patch
 
+# XXX should be dropped when 1.3 releases
+Patch99999: xserver-rc5-to-now.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -298,6 +301,8 @@
 %patch2504 -p1 -b .domain-obiwan
 %patch2505 -p1 -b .device-enable
 
+%patch99999 -p1 -b .git
+
 %build
 
 # --with-rgb-path should be superfluous now ?
@@ -555,6 +560,9 @@
 
 
 %changelog
+* Fri Apr 13 2007 Adam Jackson <ajax at redhat.com> 1.2.99.905-5
+- xserver-rc5-to-now.patch: Updates from git.
+
 * Wed Apr 11 2007 Adam Jackson <ajax at redhat.com> 1.2.99.905-4
 - xserver-1.3.0-no-prerelease-warning.patch: Hush the useless prerelease
   warning if we happen to be building one (and even if not).



From fedora-cvs-commits at redhat.com  Fri Apr 13 14:23:07 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 10:23:07 -0400
Subject: rpms/kernel/FC-6 kernel-2.6.spec, 1.2933.8.1, 1.2933.8.2
	5319-ieee80211-crypt-Make-some-TKIP-and-CCMP-error-logging-conditional.txt,
	1.1.2.1, NONE
Message-ID: <200704131423.l3DEN7oU008857@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-netdev-fc6-9-branch
	kernel-2.6.spec 
Removed Files:
      Tag: private-linville-netdev-fc6-9-branch
	5319-ieee80211-crypt-Make-some-TKIP-and-CCMP-error-logging-conditional.txt 
Log Message:



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2933.8.1
retrieving revision 1.2933.8.2
diff -u -r1.2933.8.1 -r1.2933.8.2
--- kernel-2.6.spec	12 Apr 2007 20:34:52 -0000	1.2933.8.1
+++ kernel-2.6.spec	13 Apr 2007 14:23:05 -0000	1.2933.8.2
@@ -1317,28 +1317,27 @@
 Patch30772: 5316-zd1211rw-rework-band-edge-patching.txt
 Patch30773: 5317-zd1211rw-Add-AL7230B-RF-support-for-ZD1211B.txt
 Patch30774: 5318-zd1211rw-Add-ID-for-ZyXEL-AG-220.txt
-Patch30775: 5319-ieee80211-crypt-Make-some-TKIP-and-CCMP-error-logging-conditional.txt
-Patch30776: 5320-prism54usb-fix-breakage-from-skb-input_device-removal.txt
-Patch30777: 5321-NET-loopback-driver-can-use-loopback_dev-integrated-net_device_stats.txt
-Patch30778: 5322-NETFILTER-ipt_CLUSTERIP-fix-oops-in-checkentry-function.txt
-Patch30779: 5330-skge-turn-carrier-off-when-down.txt
-Patch30780: 5331-sky2-turn-carrier-off-when-down.txt
-Patch30781: 5332-sky2-turn-on-clocks-when-doing-resume.txt
-Patch30782: 5333-sky2-phy-workarounds-for-Yukon-EC-U-A1.txt
-Patch30783: 5334-skge-fix-wake-on-lan.txt
-Patch30784: 5335-cxgb3-avoid-deadlock-with-mac-watchdog.txt
-Patch30785: 5336-cxgb3-MAC-watchdog-update.txt
-Patch30786: 5337-cxgb3-missing-CPL-hanler-and-register-setting.txt
-Patch30787: 5338-myri10ge-fix-management-of-the-firmware-4KB-boundary-crossing-restriction.txt
-Patch30788: 5339-myri10ge-more-Intel-chipsets-providing-aligned-PCIe-completions.txt
-Patch30789: 5340-myri10ge-update-driver-version-to-1.3.0-1.233.txt
-Patch30790: 5341-Fabric7-VIOC-driver-source-code.txt
-Patch30791: 5342-Fabric7-VIOC-driver-fixes.txt
-Patch30792: 5343-drivers-net-vioc-vioc_driver.c-replace-pci_module_init-with-pci_register_driver.txt
-Patch30793: 5344-netdrvr-e100-experiment-with-doing-RX-in-a-similar-manner-to-eepro100.txt
-Patch30794: 5345-e1000-FIX-be-ready-for-incoming-irq-at-pci_request_irq.txt
-Patch30795: 5346-e1000-FIX-firmware-handover-bits.txt
-Patch30796: 5347-e1000-FIX-Stop-raw-interrupts-disabled-nag-from-RT.txt
+Patch30775: 5320-prism54usb-fix-breakage-from-skb-input_device-removal.txt
+Patch30776: 5321-NET-loopback-driver-can-use-loopback_dev-integrated-net_device_stats.txt
+Patch30777: 5322-NETFILTER-ipt_CLUSTERIP-fix-oops-in-checkentry-function.txt
+Patch30778: 5330-skge-turn-carrier-off-when-down.txt
+Patch30779: 5331-sky2-turn-carrier-off-when-down.txt
+Patch30780: 5332-sky2-turn-on-clocks-when-doing-resume.txt
+Patch30781: 5333-sky2-phy-workarounds-for-Yukon-EC-U-A1.txt
+Patch30782: 5334-skge-fix-wake-on-lan.txt
+Patch30783: 5335-cxgb3-avoid-deadlock-with-mac-watchdog.txt
+Patch30784: 5336-cxgb3-MAC-watchdog-update.txt
+Patch30785: 5337-cxgb3-missing-CPL-hanler-and-register-setting.txt
+Patch30786: 5338-myri10ge-fix-management-of-the-firmware-4KB-boundary-crossing-restriction.txt
+Patch30787: 5339-myri10ge-more-Intel-chipsets-providing-aligned-PCIe-completions.txt
+Patch30788: 5340-myri10ge-update-driver-version-to-1.3.0-1.233.txt
+Patch30789: 5341-Fabric7-VIOC-driver-source-code.txt
+Patch30790: 5342-Fabric7-VIOC-driver-fixes.txt
+Patch30791: 5343-drivers-net-vioc-vioc_driver.c-replace-pci_module_init-with-pci_register_driver.txt
+Patch30792: 5344-netdrvr-e100-experiment-with-doing-RX-in-a-similar-manner-to-eepro100.txt
+Patch30793: 5345-e1000-FIX-be-ready-for-incoming-irq-at-pci_request_irq.txt
+Patch30794: 5346-e1000-FIX-firmware-handover-bits.txt
+Patch30795: 5347-e1000-FIX-Stop-raw-interrupts-disabled-nag-from-RT.txt
 
 Patch40000: mac80211.patch
 
@@ -3602,50 +3601,48 @@
 %patch30773 -p1
 # [PATCH] zd1211rw: Add ID for ZyXEL AG-220
 %patch30774 -p1
-# [PATCH] ieee80211-crypt: Make some TKIP and CCMP error logging conditional
-%patch30775 -p1
 # [PATCH] prism54usb: fix breakage from skb->input_device removal
-%patch30776 -p1
+%patch30775 -p1
 # [NET]: loopback driver can use loopback_dev integrated net_device_stats
-%patch30777 -p1
+%patch30776 -p1
 # [NETFILTER]: ipt_CLUSTERIP: fix oops in checkentry function
-%patch30778 -p1
+%patch30777 -p1
 # skge: turn carrier off when down
-%patch30779 -p1
+%patch30778 -p1
 # sky2: turn carrier off when down
-%patch30780 -p1
+%patch30779 -p1
 # sky2: turn on clocks when doing resume
-%patch30781 -p1
+%patch30780 -p1
 # sky2: phy workarounds for Yukon EC-U A1
-%patch30782 -p1
+%patch30781 -p1
 # skge: fix wake on lan
-%patch30783 -p1
+%patch30782 -p1
 # cxgb3 - avoid deadlock with mac watchdog
-%patch30784 -p1
+%patch30783 -p1
 # cxgb3 - MAC watchdog update
-%patch30785 -p1
+%patch30784 -p1
 # cxgb3 - missing CPL hanler and register setting.
-%patch30786 -p1
+%patch30785 -p1
 # myri10ge: fix management of the firmware 4KB boundary crossing restriction
-%patch30787 -p1
+%patch30786 -p1
 # myri10ge: more Intel chipsets providing aligned PCIe completions
-%patch30788 -p1
+%patch30787 -p1
 # myri10ge: update driver version to 1.3.0-1.233
-%patch30789 -p1
+%patch30788 -p1
 # Fabric7 VIOC driver source code
-%patch30790 -p1
+%patch30789 -p1
 # Fabric7 VIOC driver fixes
-%patch30791 -p1
+%patch30790 -p1
 # drivers/net/vioc/vioc_driver.c: replace pci_module_init with pci_register_driver
-%patch30792 -p1
+%patch30791 -p1
 # [netdrvr e100] experiment with doing RX in a similar manner to eepro100
-%patch30793 -p1
+%patch30792 -p1
 # e1000: FIX: be ready for incoming irq at pci_request_irq
-%patch30794 -p1
+%patch30793 -p1
 # e1000: FIX: firmware handover bits
-%patch30795 -p1
+%patch30794 -p1
 # e1000: FIX: Stop raw interrupts disabled nag from RT
-%patch30796 -p1
+%patch30795 -p1
 
 # Add mac80211 stack and drivers
 %patch40000 -p1
@@ -5326,7 +5323,6 @@
 - [PATCH] zd1211rw: rework band edge patching
 - [PATCH] zd1211rw: Add AL7230B RF support for ZD1211B
 - [PATCH] zd1211rw: Add ID for ZyXEL AG-220
-- [PATCH] ieee80211-crypt: Make some TKIP and CCMP error logging conditional
 - [PATCH] prism54usb: fix breakage from skb->input_device removal
 - [NET]: loopback driver can use loopback_dev integrated net_device_stats
 - [NETFILTER]: ipt_CLUSTERIP: fix oops in checkentry function


--- 5319-ieee80211-crypt-Make-some-TKIP-and-CCMP-error-logging-conditional.txt DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 13 14:54:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 10:54:45 -0400
Subject: rpms/selinux-policy/FC-6 policy-20061106.patch,1.35,1.36
Message-ID: <200704131454.l3DEsj9d006840@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20061106.patch 
Log Message:
* Thu Apr 12 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-56
- Allow lvm mls_file_read_up to look at Fixed disks
Resolves: #236060
- More fixes for apcupsd


policy-20061106.patch:
 Rules.modular                                |   10 
 config/appconfig-strict-mcs/seusers          |    1 
 config/appconfig-strict-mls/default_contexts |    6 
 config/appconfig-strict-mls/seusers          |    1 
 config/appconfig-strict/seusers              |    1 
 man/man8/kerberos_selinux.8                  |    2 
 policy/flask/access_vectors                  |    2 
 policy/global_tunables                       |   89 ++++
 policy/mls                                   |   31 +
 policy/modules/admin/acct.te                 |    1 
 policy/modules/admin/amanda.if               |   17 
 policy/modules/admin/amanda.te               |    6 
 policy/modules/admin/amtu.fc                 |    3 
 policy/modules/admin/amtu.if                 |   57 ++
 policy/modules/admin/amtu.te                 |   56 ++
 policy/modules/admin/backup.te               |    5 
 policy/modules/admin/bootloader.fc           |    5 
 policy/modules/admin/bootloader.te           |   14 
 policy/modules/admin/consoletype.te          |   21 
 policy/modules/admin/ddcprobe.te             |   10 
 policy/modules/admin/dmesg.te                |    7 
 policy/modules/admin/dmidecode.te            |    5 
 policy/modules/admin/firstboot.if            |    6 
 policy/modules/admin/kudzu.te                |   14 
 policy/modules/admin/logrotate.te            |    5 
 policy/modules/admin/logwatch.te             |   12 
 policy/modules/admin/netutils.te             |   13 
 policy/modules/admin/portage.te              |    5 
 policy/modules/admin/prelink.te              |   18 
 policy/modules/admin/quota.fc                |    7 
 policy/modules/admin/quota.te                |   24 -
 policy/modules/admin/rpm.fc                  |    3 
 policy/modules/admin/rpm.if                  |   43 ++
 policy/modules/admin/rpm.te                  |   49 --
 policy/modules/admin/su.if                   |   28 -
 policy/modules/admin/su.te                   |    2 
 policy/modules/admin/sudo.if                 |   10 
 policy/modules/admin/tripwire.te             |   11 
 policy/modules/admin/usbmodules.te           |    5 
 policy/modules/admin/usermanage.if           |    2 
 policy/modules/admin/usermanage.te           |   42 +
 policy/modules/admin/vpn.te                  |    1 
 policy/modules/apps/ethereal.te              |    5 
 policy/modules/apps/evolution.if             |  107 ++++-
 policy/modules/apps/evolution.te             |    1 
 policy/modules/apps/games.fc                 |    1 
 policy/modules/apps/gnome.fc                 |    2 
 policy/modules/apps/gnome.if                 |  108 +++++
 policy/modules/apps/gnome.te                 |    5 
 policy/modules/apps/gpg.if                   |    1 
 policy/modules/apps/java.fc                  |    2 
 policy/modules/apps/java.if                  |   38 +
 policy/modules/apps/java.te                  |    2 
 policy/modules/apps/loadkeys.if              |   17 
 policy/modules/apps/mozilla.if               |  210 ++++++++-
 policy/modules/apps/mplayer.if               |   84 +++
 policy/modules/apps/mplayer.te               |    1 
 policy/modules/apps/slocate.te               |    3 
 policy/modules/apps/thunderbird.if           |   81 +++
 policy/modules/apps/userhelper.if            |   19 
 policy/modules/apps/webalizer.te             |    6 
 policy/modules/apps/wine.fc                  |    1 
 policy/modules/apps/yam.te                   |    5 
 policy/modules/kernel/corecommands.fc        |   19 
 policy/modules/kernel/corecommands.if        |   77 +++
 policy/modules/kernel/corenetwork.if.in      |  140 ++++++
 policy/modules/kernel/corenetwork.te.in      |   14 
 policy/modules/kernel/devices.fc             |    8 
 policy/modules/kernel/devices.if             |   18 
 policy/modules/kernel/devices.te             |    8 
 policy/modules/kernel/domain.if              |   58 ++
 policy/modules/kernel/domain.te              |   22 +
 policy/modules/kernel/files.fc               |    2 
 policy/modules/kernel/files.if               |  224 ++++++++++
 policy/modules/kernel/filesystem.if          |   62 ++
 policy/modules/kernel/filesystem.te          |   20 
 policy/modules/kernel/kernel.if              |   84 +++
 policy/modules/kernel/kernel.te              |   22 -
 policy/modules/kernel/mls.if                 |   28 +
 policy/modules/kernel/mls.te                 |    6 
 policy/modules/kernel/storage.fc             |    3 
 policy/modules/kernel/storage.if             |    2 
 policy/modules/kernel/terminal.fc            |    1 
 policy/modules/kernel/terminal.if            |    2 
 policy/modules/kernel/terminal.te            |    1 
 policy/modules/services/afs.pp               |binary
 policy/modules/services/aide.fc              |    4 
 policy/modules/services/aide.pp              |binary
 policy/modules/services/aide.te              |    7 
 policy/modules/services/amavis.pp            |binary
 policy/modules/services/amavis.te            |    2 
 policy/modules/services/apache.fc            |   17 
 policy/modules/services/apache.if            |   22 -
 policy/modules/services/apache.pp            |binary
 policy/modules/services/apache.te            |   43 +-
 policy/modules/services/apm.pp               |binary
 policy/modules/services/apm.te               |    3 
 policy/modules/services/arpwatch.pp          |binary
 policy/modules/services/asterisk.pp          |binary
 policy/modules/services/audioentropy.pp      |binary
 policy/modules/services/automount.fc         |    1 
 policy/modules/services/automount.te         |    9 
 policy/modules/services/avahi.if             |   40 +
 policy/modules/services/bind.fc              |    1 
 policy/modules/services/bind.te              |    5 
 policy/modules/services/bluetooth.te         |    8 
 policy/modules/services/ccs.fc               |    1 
 policy/modules/services/ccs.te               |   11 
 policy/modules/services/clamav.te            |    2 
 policy/modules/services/cron.fc              |    6 
 policy/modules/services/cron.if              |   92 ++--
 policy/modules/services/cron.te              |   52 ++
 policy/modules/services/cups.fc              |    3 
 policy/modules/services/cups.te              |   13 
 policy/modules/services/cvs.te               |    1 
 policy/modules/services/cyrus.te             |    5 
 policy/modules/services/dbus.fc              |    1 
 policy/modules/services/dbus.if              |   62 ++
 policy/modules/services/dcc.te               |    9 
 policy/modules/services/dhcp.te              |    2 
 policy/modules/services/dovecot.te           |    6 
 policy/modules/services/ftp.te               |   18 
 policy/modules/services/hal.fc               |    4 
 policy/modules/services/hal.if               |   57 ++
 policy/modules/services/hal.te               |   22 -
 policy/modules/services/inetd.te             |   28 +
 policy/modules/services/irqbalance.te        |    4 
 policy/modules/services/kerberos.if          |   25 +
 policy/modules/services/kerberos.te          |   15 
 policy/modules/services/ktalk.fc             |    3 
 policy/modules/services/ktalk.te             |    5 
 policy/modules/services/lpd.if               |   57 +-
 policy/modules/services/lpd.te               |    5 
 policy/modules/services/mta.fc               |    1 
 policy/modules/services/mta.if               |   20 
 policy/modules/services/mta.te               |    2 
 policy/modules/services/munin.te             |    5 
 policy/modules/services/networkmanager.fc    |    2 
 policy/modules/services/networkmanager.te    |    2 
 policy/modules/services/nis.fc               |    3 
 policy/modules/services/nis.if               |    8 
 policy/modules/services/nis.te               |   34 +
 policy/modules/services/nscd.if              |   20 
 policy/modules/services/nscd.te              |   24 -
 policy/modules/services/oav.te               |    5 
 policy/modules/services/oddjob.te            |    3 
 policy/modules/services/openca.if            |    4 
 policy/modules/services/openca.te            |    2 
 policy/modules/services/openvpn.te           |    4 
 policy/modules/services/pcscd.fc             |    9 
 policy/modules/services/pcscd.if             |   62 ++
 policy/modules/services/pcscd.te             |   78 +++
 policy/modules/services/pegasus.if           |   31 +
 policy/modules/services/pegasus.te           |    6 
 policy/modules/services/portmap.te           |    5 
 policy/modules/services/postfix.fc           |    1 
 policy/modules/services/postfix.if           |    3 
 policy/modules/services/postfix.te           |   21 
 policy/modules/services/procmail.te          |   28 +
 policy/modules/services/pyzor.if             |   18 
 policy/modules/services/pyzor.te             |   13 
 policy/modules/services/radius.te            |    1 
 policy/modules/services/radvd.te             |    2 
 policy/modules/services/rhgb.if              |   76 +++
 policy/modules/services/rhgb.te              |    3 
 policy/modules/services/ricci.te             |   21 
 policy/modules/services/rlogin.te            |   10 
 policy/modules/services/rpc.fc               |    1 
 policy/modules/services/rpc.if               |    3 
 policy/modules/services/rpc.te               |   26 -
 policy/modules/services/rsync.te             |    1 
 policy/modules/services/samba.fc             |    5 
 policy/modules/services/samba.if             |   62 ++
 policy/modules/services/samba.te             |   63 ++
 policy/modules/services/sasl.te              |   12 
 policy/modules/services/sendmail.if          |   22 +
 policy/modules/services/sendmail.te          |    8 
 policy/modules/services/setroubleshoot.if    |   20 
 policy/modules/services/setroubleshoot.te    |    2 
 policy/modules/services/smartmon.te          |    1 
 policy/modules/services/snmp.if              |   17 
 policy/modules/services/snmp.te              |   17 
 policy/modules/services/spamassassin.fc      |    2 
 policy/modules/services/spamassassin.if      |   42 +
 policy/modules/services/spamassassin.te      |   18 
 policy/modules/services/squid.fc             |    2 
 policy/modules/services/squid.if             |   21 
 policy/modules/services/squid.te             |   11 
 policy/modules/services/ssh.if               |   83 +++
 policy/modules/services/ssh.te               |   14 
 policy/modules/services/telnet.te            |    3 
 policy/modules/services/tftp.te              |    2 
 policy/modules/services/uucp.fc              |    1 
 policy/modules/services/uucp.if              |   67 +++
 policy/modules/services/uucp.te              |   44 +-
 policy/modules/services/xserver.fc           |    2 
 policy/modules/services/xserver.if           |  190 ++++++++-
 policy/modules/services/xserver.te           |   12 
 policy/modules/system/authlogin.if           |   76 +++
 policy/modules/system/authlogin.te           |    6 
 policy/modules/system/clock.te               |   13 
 policy/modules/system/fstools.fc             |    1 
 policy/modules/system/fstools.te             |   11 
 policy/modules/system/getty.te               |   14 
 policy/modules/system/hostname.te            |   19 
 policy/modules/system/init.if                |   64 +++
 policy/modules/system/init.te                |   51 ++
 policy/modules/system/ipsec.fc               |    5 
 policy/modules/system/ipsec.if               |   99 ++++
 policy/modules/system/ipsec.te               |  122 +++++
 policy/modules/system/iptables.te            |   22 -
 policy/modules/system/libraries.fc           |   39 +
 policy/modules/system/libraries.te           |   11 
 policy/modules/system/locallogin.if          |   37 +
 policy/modules/system/locallogin.te          |    6 
 policy/modules/system/logging.fc             |    5 
 policy/modules/system/logging.te             |   27 +
 policy/modules/system/lvm.fc                 |    2 
 policy/modules/system/lvm.if                 |   44 ++
 policy/modules/system/lvm.te                 |   79 +++
 policy/modules/system/miscfiles.fc           |    3 
 policy/modules/system/miscfiles.if           |   79 +++
 policy/modules/system/modutils.te            |   25 -
 policy/modules/system/mount.te               |   27 -
 policy/modules/system/netlabel.te            |    6 
 policy/modules/system/pcmcia.te              |    5 
 policy/modules/system/raid.te                |   15 
 policy/modules/system/selinuxutil.fc         |    2 
 policy/modules/system/selinuxutil.if         |  119 +++++
 policy/modules/system/selinuxutil.te         |  124 ++---
 policy/modules/system/sysnetwork.te          |   10 
 policy/modules/system/tzdata.fc              |    3 
 policy/modules/system/tzdata.if              |   23 +
 policy/modules/system/tzdata.te              |   51 ++
 policy/modules/system/unconfined.fc          |    4 
 policy/modules/system/unconfined.if          |   19 
 policy/modules/system/unconfined.te          |   23 +
 policy/modules/system/userdomain.if          |  569 ++++++++++++++++++++++++---
 policy/modules/system/userdomain.te          |   76 +--
 policy/modules/system/xen.fc                 |    1 
 policy/modules/system/xen.te                 |   46 +-
 241 files changed, 5500 insertions(+), 625 deletions(-)

Index: policy-20061106.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-20061106.patch,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- policy-20061106.patch	13 Apr 2007 12:59:00 -0000	1.35
+++ policy-20061106.patch	13 Apr 2007 14:54:43 -0000	1.36
@@ -3620,7 +3620,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.4.6/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/kernel/filesystem.te	2007-04-09 16:05:21.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/kernel/filesystem.te	2007-04-13 10:53:29.000000000 -0400
 @@ -21,9 +21,11 @@
  
  # Use xattrs for the following filesystem types.
@@ -3641,19 +3641,20 @@
  genfscon capifs / gen_context(system_u:object_r:capifs_t,s0)
  
  type configfs_t;
-@@ -63,6 +66,11 @@
+@@ -63,6 +66,12 @@
  # change to task SID 20060628
  #genfscon eventpollfs / gen_context(system_u:object_r:eventpollfs_t,s0)
  
 +type fusefs_t;
 +fs_type(fusefs_t)
 +allow fusefs_t self:filesystem associate;
++fs_noxattr_type(fusefs_t)
 +genfscon fuse / gen_context(system_u:object_r:fusefs_t,s0)
 +
  type futexfs_t;
  fs_type(futexfs_t)
  genfscon futexfs / gen_context(system_u:object_r:futexfs_t,s0)
-@@ -101,6 +109,7 @@
+@@ -101,6 +110,7 @@
  type rpc_pipefs_t;
  fs_type(rpc_pipefs_t)
  genfscon rpc_pipefs / gen_context(system_u:object_r:rpc_pipefs_t,s0)
@@ -3661,7 +3662,7 @@
  
  #
  # tmpfs_t is the type for tmpfs filesystems
-@@ -137,6 +146,7 @@
+@@ -137,6 +147,7 @@
  #
  type cifs_t alias sambafs_t;
  fs_noxattr_type(cifs_t)
@@ -3669,7 +3670,7 @@
  genfscon cifs / gen_context(system_u:object_r:cifs_t,s0)
  genfscon smbfs / gen_context(system_u:object_r:cifs_t,s0)
  
-@@ -146,9 +156,9 @@
+@@ -146,9 +157,9 @@
  #
  type dosfs_t;
  fs_noxattr_type(dosfs_t)
@@ -3680,7 +3681,7 @@
  genfscon ntfs / gen_context(system_u:object_r:dosfs_t,s0)
  genfscon vfat / gen_context(system_u:object_r:dosfs_t,s0)
  
-@@ -182,7 +192,6 @@
+@@ -182,7 +193,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)
@@ -3688,7 +3689,7 @@
  
  ########################################
  #
-@@ -202,3 +211,9 @@
+@@ -202,3 +212,9 @@
  # pseudo filesystem types that are applied to both the filesystem
  # and its files.
  allow filesystem_unconfined_type filesystem_type:{ dir file lnk_file sock_file fifo_file chr_file blk_file } *;



From fedora-cvs-commits at redhat.com  Fri Apr 13 14:57:06 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 10:57:06 -0400
Subject: rpms/spamassassin/devel .cvsignore, 1.35, 1.36 sources, 1.34,
	1.35 spamassassin.spec, 1.92, 1.93
Message-ID: <200704131457.l3DEv6dH008701@cvs.devel.redhat.com>

Author: wtogami

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

Modified Files:
	.cvsignore sources spamassassin.spec 
Log Message:
3.2.0 rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	2 Apr 2007 14:54:11 -0000	1.35
+++ .cvsignore	13 Apr 2007 14:57:04 -0000	1.36
@@ -1 +1 @@
-Mail-SpamAssassin-3.2.0-rc1.tar.bz2
+Mail-SpamAssassin-3.2.0-rc2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	2 Apr 2007 14:54:11 -0000	1.34
+++ sources	13 Apr 2007 14:57:04 -0000	1.35
@@ -1 +1 @@
-2be09ab4fad7960e739ecf8a0bacc8cb  Mail-SpamAssassin-3.2.0-rc1.tar.bz2
+fcc0242642826191a58d45bf5777e3b2  Mail-SpamAssassin-3.2.0-rc2.tar.bz2


Index: spamassassin.spec
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- spamassassin.spec	2 Apr 2007 14:54:11 -0000	1.92
+++ spamassassin.spec	13 Apr 2007 14:57:04 -0000	1.93
@@ -12,12 +12,12 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 # temporary pre-release number
-%define pre rc1
+%define pre rc2
 
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: spamassassin
 Version: 3.2.0
-Release: 0.3.%{pre}%{?dist}
+Release: 0.4.%{pre}%{?dist}
 License: Apache License
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -192,6 +192,9 @@
 exit 0
 
 %changelog
+* Mon Apr 13 2007 Warren Togami <wtogami at redhat.com> 3.2.0-0.4.rc2
+- 3.2.0 rc2
+
 * Mon Apr 02 2007 Warren Togami <wtogami at redhat.com> 3.2.0-0.3.rc1
 - 3.2.0 rc1
 



From fedora-cvs-commits at redhat.com  Fri Apr 13 14:58:11 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 10:58:11 -0400
Subject: rpms/selinux-policy/FC-6 selinux-policy.spec,1.359,1.360
Message-ID: <200704131458.l3DEwBAd009572@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	selinux-policy.spec 
Log Message:
* Fri Apr 13 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-57
- Allow fusefs_t to associate any file type so mv command will work.



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/selinux-policy.spec,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- selinux-policy.spec	13 Apr 2007 10:51:55 -0000	1.359
+++ selinux-policy.spec	13 Apr 2007 14:58:09 -0000	1.360
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.4.6
-Release: 56%{?dist}
+Release: 57%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -360,6 +360,9 @@
 %endif
 
 %changelog
+* Fri Apr 13 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-57
+- Allow fusefs_t to associate any file type so mv command will work.
+
 * Thu Apr 12 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-56
 - Allow lvm mls_file_read_up to look at Fixed disks
 Resolves: #236060



From fedora-cvs-commits at redhat.com  Fri Apr 13 15:23:51 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 11:23:51 -0400
Subject: rpms/parted/devel parted-1.8.6-primary-boundary.patch, NONE,
	1.1 parted.spec, 1.105, 1.106
Message-ID: <200704131523.l3DFNpcv028709@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/parted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28664

Modified Files:
	parted.spec 
Added Files:
	parted-1.8.6-primary-boundary.patch 
Log Message:
* Fri Apr 13 2007 David Cantrell <dcantrell at redhat.com> - 1.8.6-4
- Fix primary partition cylinder alignment error for DOS disk labels (#229745)
- Do not build and package up libparted.a, only the shared library


parted-1.8.6-primary-boundary.patch:
 dos.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE parted-1.8.6-primary-boundary.patch ---
--- parted-1.8.6/libparted/labels/dos.c.boundary	2007-03-13 13:01:09.000000000 -0400
+++ parted-1.8.6/libparted/labels/dos.c	2007-04-11 14:56:54.000000000 -0400
@@ -1696,8 +1696,7 @@
 					 _primary_start_constraint (disk, part,
 						 bios_geom, min_geom)));
 
-	if (!solution)
-		solution = _best_solution (part, bios_geom, solution,
+	solution = _best_solution (part, bios_geom, solution,
 			_try_constraint (part, constraint,
 				_primary_constraint (disk, bios_geom,
 				min_geom)));


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- parted.spec	11 Apr 2007 16:33:52 -0000	1.105
+++ parted.spec	13 Apr 2007 15:23:49 -0000	1.106
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 1.8.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group:   Applications/System
 Source:  ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
@@ -12,6 +12,7 @@
 Patch0: %{name}-1.8.6-warnings.patch
 Patch1: %{name}-1.8.6-notransname.patch
 Patch2: %{name}-1.8.6-off-by-one.patch
+Patch3: %{name}-1.8.6-primary-boundary.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: e2fsprogs-devel readline-devel ncurses-devel
@@ -44,9 +45,10 @@
 %patch0 -p1 -b .warnings
 %patch1 -p1 -b .notransname
 %patch2 -p1 -b .offbyone
+%patch3 -p1 -b .boundary
 
 %build
-%configure --enable-device-mapper --enable-selinux
+%configure --enable-device-mapper --enable-selinux --disable-static
 %{__make} %{?_smp_mflags}
 
 %install
@@ -85,11 +87,14 @@
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/parted
-%{_libdir}/libparted.a
 %{_libdir}/libparted.so
 %{_libdir}/pkgconfig/libparted.pc
 
 %changelog
+* Fri Apr 13 2007 David Cantrell <dcantrell at redhat.com> - 1.8.6-4
+- Fix primary partition cylinder alignment error for DOS disk labels (#229745)
+- Do not build and package up libparted.a, only the shared library
+
 * Wed Apr 11 2007 David Cantrell <dcantrell at redhat.com> - 1.8.6-3
 - Fix off-by-one bug in parted(8) when displaying disk label (#235901)
 



From fedora-cvs-commits at redhat.com  Fri Apr 13 16:13:28 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 12:13:28 -0400
Subject: rpms/pykickstart/devel .cvsignore, 1.53, 1.54 pykickstart.spec, 1.58,
	1.59 sources, 1.58, 1.59
Message-ID: <200704131613.l3DGDS6s001590@cvs.devel.redhat.com>

Author: clumens

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

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
This is pykickstart version 1.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	19 Mar 2007 21:25:32 -0000	1.53
+++ .cvsignore	13 Apr 2007 16:13:26 -0000	1.54
@@ -15,3 +15,4 @@
 pykickstart-0.98.tar.gz
 pykickstart-0.99.tar.gz
 pykickstart-0.100.tar.gz
+pykickstart-1.0.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- pykickstart.spec	19 Mar 2007 21:25:33 -0000	1.58
+++ pykickstart.spec	13 Apr 2007 16:13:26 -0000	1.59
@@ -3,7 +3,7 @@
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
-Version: 0.100
+Version: 1.0
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -38,6 +38,10 @@
 %{_bindir}/ksvalidator
 
 %changelog
+* Fri Apr 13 2007 Chris Lumens <clumens at redhat.com> - 1.0-1
+- Update documentation.
+- Update translations.
+
 * Mon Mar 19 2007 Chris Lumens <clumens at redhat.com> - 0.100-1
 - bootloader should be written out after upgrade/install.
 - Treat class names as unicode strings (#231053).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	19 Mar 2007 21:25:33 -0000	1.58
+++ sources	13 Apr 2007 16:13:26 -0000	1.59
@@ -1 +1 @@
-eaf0316dfc2f88a789715a767858e7d3  pykickstart-0.100.tar.gz
+0302d28bc6eeaef6fcbade01b5e86f1f  pykickstart-1.0.tar.gz



From fedora-cvs-commits at redhat.com  Fri Apr 13 16:14:40 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 12:14:40 -0400
Subject: rpms/pam/devel pam-0.99.6.2-selinux-audit-context.patch, NONE,
	1.1 pam-0.99.7.1-namespace-unknown-user.patch, NONE,
	1.1 pam.spec, 1.145, 1.146
Message-ID: <200704131614.l3DGEeam001681@cvs.devel.redhat.com>

Author: tmraz

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

Modified Files:
	pam.spec 
Added Files:
	pam-0.99.6.2-selinux-audit-context.patch 
	pam-0.99.7.1-namespace-unknown-user.patch 
Log Message:
* Fri Apr 13 2007 Tomas Mraz <tmraz at redhat.com> 0.99.7.1-5
- pam_selinux: improve context change auditing (#234781)
- pam_namespace: fix parsing config file with unknown users (#234513)


pam-0.99.6.2-selinux-audit-context.patch:
 pam_selinux.c |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)

--- NEW FILE pam-0.99.6.2-selinux-audit-context.patch ---
--- Linux-PAM-0.99.6.2/modules/pam_selinux/pam_selinux.c.audit-context	2007-04-03 17:51:29.000000000 +0200
+++ Linux-PAM-0.99.6.2/modules/pam_selinux/pam_selinux.c	2007-04-03 18:15:06.000000000 +0200
@@ -88,33 +88,36 @@
 	security_context_t selected_raw=NULL;
 	rc = -1;
 	if (audit_fd < 0) {
-		pam_syslog(pamh, LOG_ERR, _("Error connecting to audit system.\n"));
+		if (errno == EINVAL || errno == EPROTONOSUPPORT ||
+                                        errno == EAFNOSUPPORT)
+                        return 0; /* No audit support in kernel */
+		pam_syslog(pamh, LOG_ERR, _("Error connecting to audit system."));
 		return rc;
 	}
 	if (selinux_trans_to_raw_context(default_context, &default_raw) < 0) {
-		pam_syslog(pamh, LOG_ERR, _("Error translating default context.\n"));
-		goto out;
+		pam_syslog(pamh, LOG_ERR, _("Error translating default context."));
+		default_raw = NULL;
 	}
 	if (selinux_trans_to_raw_context(selected_context, &selected_raw) < 0) {
-		pam_syslog(pamh, LOG_ERR, _("Error translating selected context.\n"));
-		goto out;
+		pam_syslog(pamh, LOG_ERR, _("Error translating selected context."));
+		selected_raw = NULL;
 	}
 	if (asprintf(&msg, "pam: default-context=%s selected-context=%s",
-		     default_context ? default_raw : "?",
-		     selected_context ? selected_raw : "?") < 0) {
-		pam_syslog(pamh, LOG_ERR, ("Error allocating memory.\n"));
+		     default_raw ? default_raw : (default_context ? default_context : "?"),
+		     selected_raw ? selected_raw : (selected_context ? selected_context : "?")) < 0) {
+		pam_syslog(pamh, LOG_ERR, ("Error allocating memory."));
 		goto out;
 	}
 	if (audit_log_user_message(audit_fd, AUDIT_USER_ROLE_CHANGE,
 				   msg, NULL, NULL, NULL, success) <= 0) {
-		pam_syslog(pamh, LOG_ERR, _("Error sending audit message.\n"));
+		pam_syslog(pamh, LOG_ERR, _("Error sending audit message."));
 		goto out;
 	}
 	rc = 0;
       out:
 	free(msg);
 	freecon(default_raw);
-	free(selected_raw);
+	freecon(selected_raw);
 	close(audit_fd);
 #else
 	pam_syslog(pamh, LOG_NOTICE, "pam: default-context=%s selected-context=%s success %d", default_context, selected_context, success);
@@ -298,14 +301,17 @@
           if (mls_enabled && !mls_range_allowed(pamh, puser_context, newcon, debug)) {
 	    pam_syslog(pamh, LOG_NOTICE, "Security context %s is not allowed for %s", puser_context, newcon);
 
+    	    send_audit_message(pamh, 0, puser_context, newcon);
 
+	    free(newcon);
             goto fail_range;
 	  }
 	  return newcon;
 	}
-	else
+	else {
+	  send_audit_message(pamh, 0, puser_context, context_str(new_context));
 	  send_text(pamh,_("Not a valid security context"),debug);
-
+	}
         context_free(new_context); /* next time around allocates another */
       }
     else
@@ -318,6 +324,7 @@
   free(type);
   _pam_drop(responses);
   context_free (new_context);
+  send_audit_message(pamh, 0, puser_context, NULL);
  fail_range:
   return NULL;  
 }
@@ -509,7 +516,6 @@
     if (select_context && has_tty) {
       user_context = config_context(pamh, default_user_context, debug);
       if (user_context == NULL) {
-        send_audit_message(pamh, 0, default_user_context, default_user_context);
 	freecon(default_user_context);
 	pam_syslog(pamh, LOG_ERR, _("Unable to get valid context for %s"),
 		    username);

pam-0.99.7.1-namespace-unknown-user.patch:
 pam_namespace.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE pam-0.99.7.1-namespace-unknown-user.patch ---
--- Linux-PAM-0.99.7.1/modules/pam_namespace/pam_namespace.c.unknown-user	2007-04-13 17:12:40.000000000 +0200
+++ Linux-PAM-0.99.7.1/modules/pam_namespace/pam_namespace.c	2007-04-13 18:11:57.000000000 +0200
@@ -302,11 +302,14 @@
                 *tptr = '\0';
 
             pwd = pam_modutil_getpwnam(idata->pamh, ustr);
-            *uidptr = pwd->pw_uid;
-            if (i < count - 1) {
-                ustr = tptr + 1;
+            if (pwd == NULL) {
+        	pam_syslog(idata->pamh, LOG_ERR, "Unknown user %s in configuration", ustr);
+        	poly.num_uids--;	
+            } else {
+                *uidptr = pwd->pw_uid;
                 uidptr++;
             }
+            ustr = tptr + 1;
         }
     }
 


Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- pam.spec	23 Mar 2007 11:02:35 -0000	1.145
+++ pam.spec	13 Apr 2007 16:14:38 -0000	1.146
@@ -11,7 +11,7 @@
 Summary: A security tool which provides authentication for applications
 Name: pam
 Version: 0.99.7.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL or BSD
 Group: System Environment/Base
 Source0: http://ftp.us.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -43,6 +43,8 @@
 Patch94: pam-0.99.7.0-namespace-unmnt-override.patch
 Patch95: pam-0.99.6.2-selinux-use-current-range.patch
 Patch96: pam-0.99.6.2-namespace-dirnames.patch
+Patch97: pam-0.99.7.1-namespace-unknown-user.patch
+Patch98: pam-0.99.6.2-selinux-audit-context.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: cracklib, cracklib-dicts >= 2.8
@@ -114,6 +116,8 @@
 %patch94 -p1 -b .unmnt-override
 %patch95 -p1 -b .range
 %patch96 -p1 -b .dirnames
+%patch97 -p1 -b .unknown-user
+%patch98 -p1 -b .audit-context
 
 autoreconf
 
@@ -402,6 +406,10 @@
 %doc doc/adg/*.txt doc/adg/html
 
 %changelog
+* Fri Apr 13 2007 Tomas Mraz <tmraz at redhat.com> 0.99.7.1-5
+- pam_selinux: improve context change auditing (#234781)
+- pam_namespace: fix parsing config file with unknown users (#234513)
+
 * Fri Mar 23 2007 Tomas Mraz <tmraz at redhat.com> 0.99.7.1-4
 - pam_console: always decrement use count (#230823)
 - pam_namespace: use raw context for poly dir name (#227345)



From fedora-cvs-commits at redhat.com  Fri Apr 13 16:34:17 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 12:34:17 -0400
Subject: rpms/sharutils/devel .cvsignore, 1.4, 1.5 sharutils.spec, 1.27,
	1.28 sources, 1.4, 1.5
Message-ID: <200704131634.l3DGYH31017154@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/sharutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16909

Modified Files:
	.cvsignore sharutils.spec sources 
Log Message:
4.6.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sharutils/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Feb 2006 08:35:37 -0000	1.4
+++ .cvsignore	13 Apr 2007 16:34:15 -0000	1.5
@@ -1,3 +1,4 @@
 sharutils-4.2.1.tar.gz
 sharutils-4.6.tar.bz2
 sharutils-4.6.1.tar.bz2
+sharutils-4.6.3.tar.bz2


Index: sharutils.spec
===================================================================
RCS file: /cvs/dist/rpms/sharutils/devel/sharutils.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sharutils.spec	15 Jul 2006 03:32:52 -0000	1.27
+++ sharutils.spec	13 Apr 2007 16:34:15 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: The GNU shar utilities for packaging and unpackaging shell archives.
 Name: sharutils
-Version: 4.6.1
-Release: 2
+Version: 4.6.3
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Archiving
 Source: ftp://ftp.gnu.org/gnu/sharutils/REL-%{version}/sharutils-%{version}.tar.bz2
@@ -61,6 +61,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Apr 10 2007 Than Ngo <than at redhat.com> - 4.6.3-1
+- 4.6.3
+
 * Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 4.6.1-2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sharutils/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Feb 2006 08:35:37 -0000	1.4
+++ sources	13 Apr 2007 16:34:15 -0000	1.5
@@ -1 +1 @@
-947eb4b05e004013dce84d5422be7fef  sharutils-4.6.1.tar.bz2
+ec4c932d0704efe288d82219b089a3dc  sharutils-4.6.3.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr 13 17:21:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 13:21:57 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.9,
	1.10 policycoreutils.spec, 1.394, 1.395
Message-ID: <200704131721.l3DHLv0N019064@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Fri Apr 13 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-2
- Add polgengui


policycoreutils-gui.patch:
 Makefile                    |   34 
 booleansPage.py             |  224 +++
 fcontextPage.py             |  185 ++
 loginsPage.py               |  173 ++
 mappingsPage.py             |   54 
 modulesPage.py              |  172 ++
 polgen.glade                | 1127 ++++++++++++++++
 polgen.py                   |  436 ++++++
 polgengui.py                |  211 +++
 portsPage.py                |  227 +++
 selinux.tbl                 |  274 ++++
 semanagePage.py             |  115 +
 statusPage.py               |  220 +++
 system-config-selinux.glade | 2956 ++++++++++++++++++++++++++++++++++++++++++++
 system-config-selinux.py    |  169 ++
 templates/__init__.py       |   18 
 templates/executable.py     |  156 ++
 templates/network.py        |   46 
 templates/rw.py             |  106 +
 templates/script.py         |   42 
 templates/semodule.py       |   41 
 templates/tmp.py            |   74 +
 templates/var_lib.py        |  107 +
 templates/var_log.py        |   91 +
 templates/var_run.py        |   93 +
 templates/var_spool.py      |  107 +
 translationsPage.py         |  111 +
 usersPage.py                |  166 ++
 28 files changed, 7735 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- policycoreutils-gui.patch	9 Apr 2007 14:15:34 -0000	1.9
+++ policycoreutils-gui.patch	13 Apr 2007 17:21:54 -0000	1.10
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.7/gui/booleansPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.9/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/booleansPage.py	2007-04-06 15:20:14.000000000 -0400
++++ policycoreutils-2.0.9/gui/booleansPage.py	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,224 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -226,9 +226,9 @@
 +
 +        setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val)
 +        commands.getstatusoutput(setsebool)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.7/gui/fcontextPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.9/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/fcontextPage.py	2007-03-23 09:03:56.000000000 -0400
++++ policycoreutils-2.0.9/gui/fcontextPage.py	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,185 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -415,9 +415,9 @@
 +        self.store.set_value(iter, SPEC_COL, fspec)
 +        self.store.set_value(iter, FTYPE_COL, ftype)
 +        self.store.set_value(iter, TYPE_COL, "system_u:object_r:%s:%s" % (type, mls))
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.7/gui/loginsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.9/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/loginsPage.py	2007-03-23 09:03:56.000000000 -0400
++++ policycoreutils-2.0.9/gui/loginsPage.py	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,173 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -592,10 +592,10 @@
 +        self.store.set_value(iter, 1, seuser)
 +        self.store.set_value(iter, 2, seobject.translate(serange))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.7/gui/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.9/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/Makefile	2007-03-23 09:03:56.000000000 -0400
-@@ -0,0 +1,30 @@
++++ policycoreutils-2.0.9/gui/Makefile	2007-04-13 13:17:40.000000000 -0400
+@@ -0,0 +1,34 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
 +SHAREDIR ?= $(PREFIX)/share/system-config-selinux
@@ -606,6 +606,8 @@
 +loginsPage.py \
 +mappingsPage.py \
 +modulesPage.py \
++polgen.py \
++polgen.glade \
 +portsPage.py \
 +semanagePage.py \
 +statusPage.py \
@@ -614,21 +616,23 @@
 +usersPage.py \
 +selinux.tbl
 +
-+all: $(TARGETS) system-config-selinux.py 
++all: $(TARGETS) system-config-selinux.py polgengui.py templates
 +
 +install: all
-+	-mkdir -p $(SHAREDIR)
++	-mkdir -p $(SHAREDIR)/templates
 +	install -m 755 system-config-selinux.py $(SHAREDIR)
++	install -m 755 polgengui.py $(SHAREDIR)
 +	install -m 644 $(TARGETS) $(SHAREDIR)
++	install -m 644 templates/*.py $(SHAREDIR)/templates/
 +
 +clean:
 +
 +indent:
 +
 +relabel:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.7/gui/mappingsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.9/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/mappingsPage.py	2007-03-23 09:03:56.000000000 -0400
++++ policycoreutils-2.0.9/gui/mappingsPage.py	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,54 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -684,9 +688,9 @@
 +        for k in keys:
 +            print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1]))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.7/gui/modulesPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.9/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/modulesPage.py	2007-04-05 10:09:19.000000000 -0400
++++ policycoreutils-2.0.9/gui/modulesPage.py	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,172 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -860,9 +864,9 @@
 +        
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.7/gui/polgen.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.9/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/polgen.glade	2007-03-29 12:10:32.000000000 -0400
++++ policycoreutils-2.0.9/gui/polgen.glade	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,1127 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -1991,9 +1995,9 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.7/gui/polgengui.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.9/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/polgengui.py	2007-03-29 12:10:27.000000000 -0400
++++ policycoreutils-2.0.9/gui/polgengui.py	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,211 @@
 +#!/usr/bin/python
 +#
@@ -2206,9 +2210,9 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.7/gui/polgen.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.9/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/polgen.py	2007-04-03 14:54:50.000000000 -0400
++++ policycoreutils-2.0.9/gui/polgen.py	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,436 @@
 +#! /usr/bin/python
 +# Copyright (C) 2007 Red Hat 
@@ -2646,9 +2650,9 @@
 +    sys.exit(0)
 +    
 +	
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.7/gui/portsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.9/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/portsPage.py	2007-03-23 09:03:56.000000000 -0400
++++ policycoreutils-2.0.9/gui/portsPage.py	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,227 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -2877,9 +2881,9 @@
 +        self.store.set_value(iter, MLS_COL, mls)
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.7/gui/selinux.tbl
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.9/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/selinux.tbl	2007-04-06 15:33:02.000000000 -0400
++++ policycoreutils-2.0.9/gui/selinux.tbl	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,274 @@
 +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
 +allow_cvs_read_shadow  _("CVS") _("Allow cvs daemon to read shadow")
@@ -3155,9 +3159,9 @@
 +webadm_manage_users_files _("HTTPD Service") _("Allow httpd to access nfs file systems.")
 +webadm_read_users_files _("HTTPD Service") _("Allow httpd to access nfs file systems.")
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.7/gui/semanagePage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.9/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/semanagePage.py	2007-03-23 09:03:56.000000000 -0400
++++ policycoreutils-2.0.9/gui/semanagePage.py	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,115 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -3274,9 +3278,9 @@
 +        self.dialog.hide()
 +
 +    
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.7/gui/statusPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.9/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/statusPage.py	2007-03-30 12:14:46.000000000 -0400
++++ policycoreutils-2.0.9/gui/statusPage.py	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,220 @@
 +## statusPage.py - show selinux status
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -3498,9 +3502,9 @@
 +        return self.types[self.selinuxTypeOptionMenu.get_active()]
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.7/gui/system-config-selinux.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.9/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/system-config-selinux.glade	2007-04-06 15:13:41.000000000 -0400
++++ policycoreutils-2.0.9/gui/system-config-selinux.glade	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,2956 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -6458,9 +6462,9 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.7/gui/system-config-selinux.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.9/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/system-config-selinux.py	2007-03-30 12:14:36.000000000 -0400
++++ policycoreutils-2.0.9/gui/system-config-selinux.py	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,169 @@
 +#!/usr/bin/python
 +#
@@ -6631,9 +6635,9 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.7/gui/templates/executable.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.9/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/templates/executable.py	2007-03-29 12:11:05.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/executable.py	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,156 @@
 +#! /usr/bin/env python
 +# Copyright (C) 2007 Red Hat 
@@ -6791,9 +6795,9 @@
 +EXECUTABLE		--	gen_context(system_u:object_r:TEMPLATETYPE_exec_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.7/gui/templates/__init__.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.9/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/templates/__init__.py	2007-03-29 12:11:05.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/__init__.py	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -6813,9 +6817,9 @@
 +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 +#
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.7/gui/templates/network.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.9/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/templates/network.py	2007-03-29 12:11:05.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/network.py	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,46 @@
 +te_port_types="""\
 +# Default Networking
@@ -6863,9 +6867,9 @@
 +allow TEMPLATETYPE_t TEMPLATETYPE_port_t:udp_socket name_bind;
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.7/gui/templates/rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.9/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/templates/rw.py	2007-03-29 12:11:05.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/rw.py	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,106 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -6973,9 +6977,9 @@
 +fc_dir="""
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.7/gui/templates/script.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.9/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/templates/script.py	2007-03-29 12:11:05.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/script.py	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,42 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7019,9 +7023,9 @@
 +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.7/gui/templates/semodule.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.9/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/templates/semodule.py	2007-03-29 12:11:05.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/semodule.py	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7064,9 +7068,9 @@
 +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.7/gui/templates/tmp.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.9/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/templates/tmp.py	2007-03-29 12:11:05.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/tmp.py	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,74 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7142,9 +7146,9 @@
 +	dontaudit $1 TEMPLATETYPE_tmp_t:file r_file_perms;
 +')
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.7/gui/templates/var_lib.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.9/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/templates/var_lib.py	2007-03-29 12:11:05.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/var_lib.py	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,107 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7253,9 +7257,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.7/gui/templates/var_log.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.9/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/templates/var_log.py	2007-03-29 12:11:05.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/var_log.py	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,91 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7348,9 +7352,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.7/gui/templates/var_run.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.9/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/templates/var_run.py	2007-03-29 12:11:05.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/var_run.py	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,93 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7445,9 +7449,9 @@
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.7/gui/templates/var_spool.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.9/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/templates/var_spool.py	2007-03-29 12:11:05.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/var_spool.py	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,107 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7556,9 +7560,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.7/gui/translationsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.9/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/translationsPage.py	2007-03-23 09:03:56.000000000 -0400
++++ policycoreutils-2.0.9/gui/translationsPage.py	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,111 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -7671,9 +7675,9 @@
 +        store, iter = self.view.get_selection().get_selected()
 +        self.store.set_value(iter, 0, level)
 +        self.store.set_value(iter, 1, translation)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.7/gui/usersPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.9/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.7/gui/usersPage.py	2007-03-23 09:03:56.000000000 -0400
++++ policycoreutils-2.0.9/gui/usersPage.py	2007-04-13 13:16:13.000000000 -0400
 @@ -0,0 +1,166 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -r1.394 -r1.395
--- policycoreutils.spec	12 Apr 2007 16:51:50 -0000	1.394
+++ policycoreutils.spec	13 Apr 2007 17:21:54 -0000	1.395
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 2.0.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -108,7 +108,9 @@
 %files gui
 %{_bindir}/system-config-selinux
 %{_datadir}/applications/fedora-system-config-selinux.desktop
-%{_datadir}/system-config-selinux/
+%{_datadir}/system-config-selinux/*.py
+%{_datadir}/system-config-selinux/*.glade
+%{_datadir}/system-config-selinux/templates/*.py
 %config(noreplace) %{_sysconfdir}/pam.d/system-config-selinux
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-selinux
 
@@ -186,6 +188,9 @@
 fi
 
 %changelog
+* Fri Apr 13 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-2
+- Add polgengui
+
 * Thu Apr 12 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-1
 - Updated version of sepolgen
 	* Merged seobject setransRecords patch to return the first alias from Xavier Toth.



From fedora-cvs-commits at redhat.com  Fri Apr 13 17:29:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 13:29:21 -0400
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.395,1.396
Message-ID: <200704131729.l3DHTL7e024555@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils.spec 
Log Message:
* Fri Apr 13 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-2
- Add polgengui



Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -r1.395 -r1.396
--- policycoreutils.spec	13 Apr 2007 17:21:54 -0000	1.395
+++ policycoreutils.spec	13 Apr 2007 17:29:19 -0000	1.396
@@ -108,9 +108,11 @@
 %files gui
 %{_bindir}/system-config-selinux
 %{_datadir}/applications/fedora-system-config-selinux.desktop
-%{_datadir}/system-config-selinux/*.py
+%{_datadir}/system-config-selinux/*.py*
+%{_datadir}/system-config-selinux/selinux.tbl
+%{_datadir}/system-config-selinux/*png
 %{_datadir}/system-config-selinux/*.glade
-%{_datadir}/system-config-selinux/templates/*.py
+%{_datadir}/system-config-selinux/templates/*.py*
 %config(noreplace) %{_sysconfdir}/pam.d/system-config-selinux
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-selinux
 



From fedora-cvs-commits at redhat.com  Fri Apr 13 18:34:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 14:34:43 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.3063,
	1.3064 linux-2.6-firewire.patch, 1.6, 1.7
Message-ID: <200704131834.l3DIYhV1009994@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	kernel-2.6.spec linux-2.6-firewire.patch 
Log Message:
* Fri Apr 13 2007 Kristian H??gsberg <krh at redhat.com>
- Redo diff against the 'juju' upstream branch so we get the right
  fixes in the firewire patch.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3063
retrieving revision 1.3064
diff -u -r1.3063 -r1.3064
--- kernel-2.6.spec	13 Apr 2007 13:16:51 -0000	1.3063
+++ kernel-2.6.spec	13 Apr 2007 18:34:41 -0000	1.3064
@@ -2258,6 +2258,10 @@
 #  - tux.
 
 %changelog
+* Fri Apr 13 2007 Kristian H??gsberg <krh at redhat.com>
+- Redo diff against the 'juju' upstream branch so we get the right
+  fixes in the firewire patch.
+
 * Fri Apr 13 2007 David Woodhouse <dwmw2 at redhat.com>
 - Fix PS3 Ethernet IPv6 checksum problems, autoload PS3 USB modules
 

linux-2.6-firewire.patch:
 Makefile                  |    1 
 firewire/Kconfig          |   60 +
 firewire/Makefile         |   10 
 firewire/fw-card.c        |  542 +++++++++++++
 firewire/fw-device-cdev.c |  974 +++++++++++++++++++++++
 firewire/fw-device-cdev.h |  260 ++++++
 firewire/fw-device.c      |  780 ++++++++++++++++++
 firewire/fw-device.h      |  149 +++
 firewire/fw-iso.c         |  163 +++
 firewire/fw-ohci.c        | 1896 ++++++++++++++++++++++++++++++++++++++++++++++
 firewire/fw-ohci.h        |  153 +++
 firewire/fw-sbp2.c        | 1165 ++++++++++++++++++++++++++++
 firewire/fw-topology.c    |  519 ++++++++++++
 firewire/fw-topology.h    |   94 ++
 firewire/fw-transaction.c |  889 +++++++++++++++++++++
 firewire/fw-transaction.h |  505 ++++++++++++
 ieee1394/Kconfig          |    2 
 17 files changed, 8162 insertions(+)

Index: linux-2.6-firewire.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-firewire.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-firewire.patch	12 Apr 2007 21:26:01 -0000	1.6
+++ linux-2.6-firewire.patch	13 Apr 2007 18:34:41 -0000	1.7
@@ -2998,10 +2998,10 @@
 +EXPORT_SYMBOL(fw_iso_context_stop);
 diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
 new file mode 100644
-index 0000000..b941239
+index 0000000..34eb468
 --- /dev/null
 +++ b/drivers/firewire/fw-ohci.c
-@@ -0,0 +1,1890 @@
+@@ -0,0 +1,1896 @@
 +/*						-*- c-basic-offset: 8 -*-
 + *
 + * fw-ohci.c - Driver for OHCI 1394 boards
@@ -3666,7 +3666,7 @@
 +
 +	/* If the context isn't already running, start it up. */
 +	reg = reg_read(ctx->ohci, control_set(ctx->regs));
-+	if ((reg & CONTEXT_ACTIVE) == 0)
++	if ((reg & CONTEXT_RUN) == 0)
 +		context_run(ctx, 0);
 +
 +	return 0;
@@ -4261,7 +4261,13 @@
 +	p = db + 1;
 +	end = p + header_length;
 +	while (p < end && i + ctx->base.header_size <= PAGE_SIZE) {
-+		memcpy(ctx->header + i, p + 4, ctx->base.header_size);
++		/* The iso header is byteswapped to little endian by
++		 * the controller, but the remaining header quadlets
++		 * are big endian.  We want to present all the headers
++		 * as big endian, so we have to swap the first
++		 * quadlet. */
++		*(u32 *) (ctx->header + i) = __swab32(*(u32 *) (p + 4));
++		memcpy(ctx->header + i + 4, p + 8, ctx->base.header_size - 4);
 +		i += ctx->base.header_size;
 +		p += ctx->base.header_size + 4;
 +	}
@@ -5053,7 +5059,7 @@
 +#endif /* __fw_ohci_h */
 diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
 new file mode 100644
-index 0000000..d7940db
+index 0000000..7ce9b81
 --- /dev/null
 +++ b/drivers/firewire/fw-sbp2.c
 @@ -0,0 +1,1165 @@
@@ -5352,7 +5358,8 @@
 +	spin_lock_irqsave(&card->lock, flags);
 +	list_for_each_entry(orb, &sd->orb_list, link) {
 +		if (status_get_orb_high(status) == 0 &&
-+		    status_get_orb_low(status) == orb->request_bus) {
++		    status_get_orb_low(status) == orb->request_bus &&
++		    orb->rcode == RCODE_COMPLETE) {
 +			list_del(&orb->link);
 +			break;
 +		}
@@ -5823,8 +5830,11 @@
 +	.id_table = sbp2_id_table,
 +};
 +
-+static unsigned int sbp2_status_to_sense_data(u8 * sbp2_status, u8 * sense_data)
++static unsigned int
++sbp2_status_to_sense_data(u8 *sbp2_status, u8 *sense_data)
 +{
++	int sam_status;
++
 +	sense_data[0] = 0x70;
 +	sense_data[1] = 0x0;
 +	sense_data[2] = sbp2_status[1];
@@ -5842,22 +5852,19 @@
 +	sense_data[14] = sbp2_status[12];
 +	sense_data[15] = sbp2_status[13];
 +
-+	switch (sbp2_status[0] & 0x3f) {
-+	case SAM_STAT_GOOD:
-+		return DID_OK;
++	sam_status = sbp2_status[0] & 0x3f;
 +
++	switch (sam_status) {
++	case SAM_STAT_GOOD:
 +	case SAM_STAT_CHECK_CONDITION:
-+		/* return CHECK_CONDITION << 1 | DID_OK << 16; */
-+		return DID_OK;
-+
-+	case SAM_STAT_BUSY:
-+		return DID_BUS_BUSY;
-+
 +	case SAM_STAT_CONDITION_MET:
++	case SAM_STAT_BUSY:
 +	case SAM_STAT_RESERVATION_CONFLICT:
 +	case SAM_STAT_COMMAND_TERMINATED:
++		return DID_OK << 16 | sam_status;
++
 +	default:
-+		return DID_ERROR;
++		return DID_ERROR << 16;
 +	}
 +}
 +
@@ -5871,33 +5878,31 @@
 +	int result;
 +
 +	if (status != NULL) {
-+		if (status_get_dead(*status)) {
-+			fw_notify("agent died, issuing agent reset\n");
++		if (status_get_dead(*status))
 +			sbp2_agent_reset(unit);
-+		}
 +
 +		switch (status_get_response(*status)) {
 +		case SBP2_STATUS_REQUEST_COMPLETE:
-+			result = DID_OK;
++			result = DID_OK << 16;
 +			break;
 +		case SBP2_STATUS_TRANSPORT_FAILURE:
-+			result = DID_BUS_BUSY;
++			result = DID_BUS_BUSY << 16;
 +			break;
 +		case SBP2_STATUS_ILLEGAL_REQUEST:
 +		case SBP2_STATUS_VENDOR_DEPENDENT:
 +		default:
-+			result = DID_ERROR;
++			result = DID_ERROR << 16;
 +			break;
 +		}
 +
-+		if (result == DID_OK && status_get_len(*status) > 1)
++		if (result == DID_OK << 16 && status_get_len(*status) > 1)
 +			result = sbp2_status_to_sense_data(status_get_data(*status),
 +							   orb->cmd->sense_buffer);
 +	} else {
 +		/* If the orb completes with status == NULL, something
 +		 * went wrong, typically a bus reset happened mid-orb
 +		 * or when sending the write (less likely). */
-+		result = DID_BUS_BUSY;
++		result = DID_BUS_BUSY << 16;
 +	}
 +
 +	dma_unmap_single(device->card->device, orb->base.request_bus,
@@ -5918,9 +5923,8 @@
 +				 sizeof orb->request_buffer_bus,
 +				 DMA_FROM_DEVICE);
 +
-+	orb->cmd->result = result << 16;
++	orb->cmd->result = result;
 +	orb->done(orb->cmd);
-+
 +	kfree(orb);
 +}
 +
@@ -6030,6 +6034,8 @@
 +		goto fail_alloc;
 +	}
 +
++	/* Initialize rcode to something not RCODE_COMPLETE. */
++	orb->base.rcode = -1;
 +	orb->base.request_bus =
 +		dma_map_single(device->card->device, &orb->request,
 +			       sizeof orb->request, DMA_TO_DEVICE);
@@ -6135,7 +6141,7 @@
 +	struct fw_unit *unit = (struct fw_unit *)cmd->device->host->hostdata[0];
 +
 +	fw_notify("sbp2_scsi_abort\n");
-+
++	sbp2_agent_reset(unit);
 +	sbp2_cancel_orbs(unit);
 +
 +	return SUCCESS;



From fedora-cvs-commits at redhat.com  Fri Apr 13 18:41:10 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 14:41:10 -0400
Subject: rpms/kernel-xen-2.6/devel linux-2.6-xen-execshield.patch, 1.3.2.2,
	1.3.2.3
Message-ID: <200704131841.l3DIfAKj014804@cvs.devel.redhat.com>

Author: ehabkost

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

Modified Files:
      Tag: private-ehabkost-2_6_21-branch
	linux-2.6-xen-execshield.patch 
Log Message:
Fixing linux-2.6-xen-execshield.patch

Some chunks (mostly mach-xen headers) vanished when the patch was remade
for the new kernel. Don't ask me how this happened.



linux-2.6-xen-execshield.patch:
 arch/i386/kernel/cpu/common-xen.c         |    7 ++
 arch/i386/kernel/process-xen.c            |   60 +++++++++++++++++++
 arch/i386/kernel/smp-xen.c                |    3 
 arch/i386/kernel/traps-xen.c              |   93 +++++++++++++++++++++++++++++-
 arch/i386/mm/init-xen.c                   |    6 +
 arch/x86_64/kernel/process-xen.c          |    6 -
 arch/x86_64/kernel/setup64-xen.c          |   40 ------------
 arch/x86_64/mm/fault-xen.c                |    2 
 include/asm-i386/mach-xen/asm/desc.h      |   14 ++++
 include/asm-i386/mach-xen/asm/pgalloc.h   |    1 
 include/asm-i386/mach-xen/asm/processor.h |    8 ++
 include/asm-x86_64/mach-xen/asm/pgalloc.h |    7 ++
 12 files changed, 197 insertions(+), 50 deletions(-)

Index: linux-2.6-xen-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/linux-2.6-xen-execshield.patch,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- linux-2.6-xen-execshield.patch	10 Apr 2007 13:11:45 -0000	1.3.2.2
+++ linux-2.6-xen-execshield.patch	13 Apr 2007 18:41:08 -0000	1.3.2.3
@@ -1,7 +1,7 @@
-Index: linux-2.6.20.i386/arch/i386/kernel/cpu/common-xen.c
+Index: linux-2.6.20.patching/arch/i386/kernel/cpu/common-xen.c
 ===================================================================
---- linux-2.6.20.i386.orig/arch/i386/kernel/cpu/common-xen.c
-+++ linux-2.6.20.i386/arch/i386/kernel/cpu/common-xen.c
+--- linux-2.6.20.patching.orig/arch/i386/kernel/cpu/common-xen.c
++++ linux-2.6.20.patching/arch/i386/kernel/cpu/common-xen.c
 @@ -447,6 +447,13 @@ void __cpuinit identify_cpu(struct cpuin
  	if (disable_pse)
  		clear_bit(X86_FEATURE_PSE, c->x86_capability);
@@ -16,10 +16,10 @@
  	/* If the model name is still unset, do table lookup. */
  	if ( !c->x86_model_id[0] ) {
  		char *p;
-Index: linux-2.6.20.i386/arch/i386/kernel/process-xen.c
+Index: linux-2.6.20.patching/arch/i386/kernel/process-xen.c
 ===================================================================
---- linux-2.6.20.i386.orig/arch/i386/kernel/process-xen.c
-+++ linux-2.6.20.i386/arch/i386/kernel/process-xen.c
+--- linux-2.6.20.patching.orig/arch/i386/kernel/process-xen.c
++++ linux-2.6.20.patching/arch/i386/kernel/process-xen.c
 @@ -500,6 +500,9 @@ static inline void disable_tsc(struct ta
  {
  	struct thread_info *prev, *next;
@@ -91,10 +91,10 @@
 +		current->mm->brk = new_brk;
 +}
 +
-Index: linux-2.6.20.i386/arch/i386/kernel/smp-xen.c
+Index: linux-2.6.20.patching/arch/i386/kernel/smp-xen.c
 ===================================================================
---- linux-2.6.20.i386.orig/arch/i386/kernel/smp-xen.c
-+++ linux-2.6.20.i386/arch/i386/kernel/smp-xen.c
+--- linux-2.6.20.patching.orig/arch/i386/kernel/smp-xen.c
++++ linux-2.6.20.patching/arch/i386/kernel/smp-xen.c
 @@ -23,6 +23,7 @@
  
  #include <asm/mtrr.h>
@@ -112,10 +112,10 @@
  
  	if (!cpu_isset(cpu, flush_cpumask))
  		goto out;
-Index: linux-2.6.20.i386/arch/i386/kernel/traps-xen.c
+Index: linux-2.6.20.patching/arch/i386/kernel/traps-xen.c
 ===================================================================
---- linux-2.6.20.i386.orig/arch/i386/kernel/traps-xen.c
-+++ linux-2.6.20.i386/arch/i386/kernel/traps-xen.c
+--- linux-2.6.20.patching.orig/arch/i386/kernel/traps-xen.c
++++ linux-2.6.20.patching/arch/i386/kernel/traps-xen.c
 @@ -573,11 +573,88 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv
  DO_ERROR(11, SIGBUS,  "segment not present", segment_not_present)
  DO_ERROR(12, SIGBUS,  "stack segment", stack_segment)
@@ -238,10 +238,10 @@
  	if (!fixup_exception(regs)) {
  		if (notify_die(DIE_GPF, "general protection fault", regs,
  				error_code, 13, SIGSEGV) == NOTIFY_STOP)
-Index: linux-2.6.20.i386/arch/i386/mm/init-xen.c
+Index: linux-2.6.20.patching/arch/i386/mm/init-xen.c
 ===================================================================
---- linux-2.6.20.i386.orig/arch/i386/mm/init-xen.c
-+++ linux-2.6.20.i386/arch/i386/mm/init-xen.c
+--- linux-2.6.20.patching.orig/arch/i386/mm/init-xen.c
++++ linux-2.6.20.patching/arch/i386/mm/init-xen.c
 @@ -465,7 +465,7 @@ EXPORT_SYMBOL(__supported_pte_mask);
   * Control non executable mappings.
   *
@@ -270,10 +270,10 @@
  
  	pagetable_init();
  
-Index: linux-2.6.20.i386/arch/x86_64/kernel/process-xen.c
+Index: linux-2.6.20.patching/arch/x86_64/kernel/process-xen.c
 ===================================================================
---- linux-2.6.20.i386.orig/arch/x86_64/kernel/process-xen.c
-+++ linux-2.6.20.i386/arch/x86_64/kernel/process-xen.c
+--- linux-2.6.20.patching.orig/arch/x86_64/kernel/process-xen.c
++++ linux-2.6.20.patching/arch/x86_64/kernel/process-xen.c
 @@ -670,12 +670,6 @@ void set_personality_64bit(void)
  
  	/* Make sure to be in 64bit mode */
@@ -287,10 +287,10 @@
  }
  
  asmlinkage long sys_fork(struct pt_regs *regs)
-Index: linux-2.6.20.i386/arch/x86_64/kernel/setup64-xen.c
+Index: linux-2.6.20.patching/arch/x86_64/kernel/setup64-xen.c
 ===================================================================
---- linux-2.6.20.i386.orig/arch/x86_64/kernel/setup64-xen.c
-+++ linux-2.6.20.i386/arch/x86_64/kernel/setup64-xen.c
+--- linux-2.6.20.patching.orig/arch/x86_64/kernel/setup64-xen.c
++++ linux-2.6.20.patching/arch/x86_64/kernel/setup64-xen.c
 @@ -49,46 +49,6 @@ unsigned long __supported_pte_mask __rea
  EXPORT_SYMBOL(__supported_pte_mask);
  static int do_not_nx __cpuinitdata = 0;
@@ -338,10 +338,10 @@
  /*
   * Great future plan:
   * Declare PDA itself and support (irqstack,tss,pgd) as per cpu data.
-Index: linux-2.6.20.i386/arch/x86_64/mm/fault-xen.c
+Index: linux-2.6.20.patching/arch/x86_64/mm/fault-xen.c
 ===================================================================
---- linux-2.6.20.i386.orig/arch/x86_64/mm/fault-xen.c
-+++ linux-2.6.20.i386/arch/x86_64/mm/fault-xen.c
+--- linux-2.6.20.patching.orig/arch/x86_64/mm/fault-xen.c
++++ linux-2.6.20.patching/arch/x86_64/mm/fault-xen.c
 @@ -87,7 +87,7 @@ static noinline int is_prefetch(struct p
  	instr = (unsigned char __user *)convert_rip_to_linear(current, regs);
  	max_instr = instr + 15;
@@ -351,3 +351,84 @@
  		return 0;
  
  	while (scan_more && instr < max_instr) { 
+Index: linux-2.6.20.patching/include/asm-i386/mach-xen/asm/desc.h
+===================================================================
+--- linux-2.6.20.patching.orig/include/asm-i386/mach-xen/asm/desc.h
++++ linux-2.6.20.patching/include/asm-i386/mach-xen/asm/desc.h
+@@ -194,6 +194,20 @@ static inline unsigned long get_desc_bas
+ 	return base;
+ }
+ 
++static inline void set_user_cs(struct desc_struct *desc, unsigned long limit)
++{
++	limit = (limit - 1) / PAGE_SIZE;
++	desc->a = limit & 0xffff;
++	desc->b = (limit & 0xf0000) | 0x00c0fb00;
++}
++
++#define load_user_cs_desc(cpu, mm) \
++	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
++
++extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
++extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
++extern void arch_flush_exec_range(struct mm_struct *mm);
++
+ #else /* __ASSEMBLY__ */
+ 
+ /*
+Index: linux-2.6.20.patching/include/asm-i386/mach-xen/asm/pgalloc.h
+===================================================================
+--- linux-2.6.20.patching.orig/include/asm-i386/mach-xen/asm/pgalloc.h
++++ linux-2.6.20.patching/include/asm-i386/mach-xen/asm/pgalloc.h
+@@ -2,6 +2,7 @@
+ #define _I386_PGALLOC_H
+ 
+ #include <asm/fixmap.h>
++#include <asm/desc.h>
+ #include <linux/threads.h>
+ #include <linux/mm.h>		/* for struct page */
+ #include <asm/io.h>		/* for phys_to_virt and page_to_pseudophys */
+Index: linux-2.6.20.patching/include/asm-i386/mach-xen/asm/processor.h
+===================================================================
+--- linux-2.6.20.patching.orig/include/asm-i386/mach-xen/asm/processor.h
++++ linux-2.6.20.patching/include/asm-i386/mach-xen/asm/processor.h
+@@ -280,7 +280,10 @@ extern int bootloader_type;
+ /* This decides where the kernel will search for a free chunk of vm
+  * space during mmap's.
+  */
+-#define TASK_UNMAPPED_BASE	(PAGE_ALIGN(TASK_SIZE / 3))
++#define TASK_UNMAPPED_BASE	PAGE_ALIGN(TASK_SIZE/3)
++
++#define __HAVE_ARCH_ALIGN_STACK
++extern unsigned long arch_align_stack(unsigned long sp);
+ 
+ #define HAVE_ARCH_PICK_MMAP_LAYOUT
+ 
+@@ -460,6 +463,9 @@ struct thread_struct {
+ 	regs->xcs = __USER_CS;					\
+ 	regs->eip = new_eip;					\
+ 	regs->esp = new_esp;					\
++	preempt_disable();					\
++	load_user_cs_desc(smp_processor_id(), current->mm);	\
++	preempt_enable();					\
+ } while (0)
+ 
+ /* Forward declaration, a strange C thing */
+Index: linux-2.6.20.patching/include/asm-x86_64/mach-xen/asm/pgalloc.h
+===================================================================
+--- linux-2.6.20.patching.orig/include/asm-x86_64/mach-xen/asm/pgalloc.h
++++ linux-2.6.20.patching/include/asm-x86_64/mach-xen/asm/pgalloc.h
+@@ -13,6 +13,13 @@ void make_page_writable(void *va, unsign
+ void make_pages_readonly(void *va, unsigned int nr, unsigned int feature);
+ void make_pages_writable(void *va, unsigned int nr, unsigned int feature);
+ 
++#define arch_add_exec_range(mm, limit) \
++		do { (void)(mm), (void)(limit); } while (0)
++#define arch_flush_exec_range(mm) \
++		do { (void)(mm); } while (0)
++#define arch_remove_exec_range(mm, limit) \
++		do { (void)(mm), (void)(limit); } while (0)
++
+ #define __user_pgd(pgd) ((pgd) + PTRS_PER_PGD)
+ 
+ static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, pte_t *pte)



From fedora-cvs-commits at redhat.com  Fri Apr 13 19:01:02 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 15:01:02 -0400
Subject: rpms/f-spot/devel f-spot-0.3.5-desktop-file-validate.patch, NONE,
	1.1 f-spot.spec, 1.44, 1.45
Message-ID: <200704131901.l3DJ12Qm029365@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	f-spot.spec 
Added Files:
	f-spot-0.3.5-desktop-file-validate.patch 
Log Message:
* Fri Apr 13 2007 Christopher Aillon <caillon at redhat.com> - 0.3.5-2
- Now with validated desktop files!


f-spot-0.3.5-desktop-file-validate.patch:
 f-spot-view.desktop |    2 +-
 f-spot.desktop      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE f-spot-0.3.5-desktop-file-validate.patch ---
--- f-spot-0.3.5/f-spot.desktop.desktop-file-validate	2007-04-13 14:41:32.000000000 -0400
+++ f-spot-0.3.5/f-spot.desktop	2007-04-13 14:41:50.000000000 -0400
@@ -93,7 +93,7 @@
 StartupNotify=true
 Terminal=false
 Type=Application
-Categories=Application;Graphics;Photography;GNOME;GTK
+Categories=Graphics;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=f-spot
 X-GNOME-Bugzilla-Component=General
--- f-spot-0.3.5/f-spot-view.desktop.desktop-file-validate	2007-04-13 14:40:07.000000000 -0400
+++ f-spot-0.3.5/f-spot-view.desktop	2007-04-13 14:42:05.000000000 -0400
@@ -68,7 +68,7 @@
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=Application;Graphics;Viewer;GNOME;GTK
+Categories=Graphics;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=f-spot
 X-GNOME-Bugzilla-Component=General


Index: f-spot.spec
===================================================================
RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- f-spot.spec	7 Mar 2007 19:08:38 -0000	1.44
+++ f-spot.spec	13 Apr 2007 19:00:57 -0000	1.45
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.3.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -10,6 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: f-spot-0.3.2-libdir.patch
+Patch2: f-spot-0.3.5-desktop-file-validate.patch
 
 BuildRequires:  mono-devel mono-web mono-data mono-data-sqlite lcms-devel
 BuildRequires:  libexif-devel gphoto2-devel >= 2.1.4 
@@ -43,6 +44,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .libdir
+%patch2 -p1 -b .desktop-file-validate
 
 %build
 autoconf
@@ -96,6 +98,9 @@
 %{_datadir}/omf/f-spot
 
 %changelog
+* Fri Apr 13 2007 Christopher Aillon <caillon at redhat.com> - 0.3.5-2
+- Now with validated desktop files!
+
 * Wed Mar  7 2007 Christopher Aillon <caillon at redhat.com> - 0.3.5-1
 - Update to 0.3.5
 



From fedora-cvs-commits at redhat.com  Fri Apr 13 19:24:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 15:24:43 -0400
Subject: rpms/kernel-xen-2.6/devel .cvsignore,1.3,1.3.2.1
Message-ID: <200704131924.l3DJOhi6014411@cvs.devel.redhat.com>

Author: ehabkost

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

Modified Files:
      Tag: private-ehabkost-2_6_21-branch
	.cvsignore 
Log Message:
Adding source files to .cvsignore

After running 'make upload' correctly, instead of just updating 'sources'
manually.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- .cvsignore	22 Mar 2007 16:01:16 -0000	1.3
+++ .cvsignore	13 Apr 2007 19:24:40 -0000	1.3.2.1
@@ -3,3 +3,5 @@
 xen-3.0.4-13132.tar.bz2
 linux-2.6.20.tar.bz2
 patch-2.6.20.3.bz2
+patch-2.6.21-rc5.bz2
+patch-2.6.21-rc5-git12.bz2



From fedora-cvs-commits at redhat.com  Fri Apr 13 19:52:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 15:52:26 -0400
Subject: rpms/nasm/devel nasm.spec,1.20,1.21
Message-ID: <200704131952.l3DJqQoC019650@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/nasm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19636

Modified Files:
	nasm.spec 
Log Message:
Remove explicit sourcefoge download site.



Index: nasm.spec
===================================================================
RCS file: /cvs/dist/rpms/nasm/devel/nasm.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nasm.spec	7 Feb 2007 18:56:45 -0000	1.20
+++ nasm.spec	13 Apr 2007 19:52:24 -0000	1.21
@@ -6,7 +6,7 @@
 License: LGPL
 Group: Development/Languages
 URL: http://nasm.sourceforge.net/
-Source: http://prdownloads.sourceforge.net/nasm/nasm-%{version}.tar.bz2
+Source: nasm-%{version}.tar.bz2
 Patch0: nasm-0.98-boguself2.patch
 Patch1: nasm-0.98.39-overfl.patch
 BuildRequires: perl



From fedora-cvs-commits at redhat.com  Fri Apr 13 20:40:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 16:40:53 -0400
Subject: rpms/kernel/devel/configs config-x86-generic, 1.85,
	1.86 config-x86_64-generic, 1.67, 1.68
Message-ID: <200704132040.l3DKergo009580@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-x86-generic config-x86_64-generic 
Log Message:
* Fri Apr 13 2007 Dave Jones <davej at redhat.com>
- Make NMI timeout a config option.



Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- config-x86-generic	30 Mar 2007 06:03:16 -0000	1.85
+++ config-x86-generic	13 Apr 2007 20:40:51 -0000	1.86
@@ -211,8 +211,8 @@
 CONFIG_DEBUG_STACKOVERFLOW=y
 CONFIG_DEBUG_STACK_USAGE=y
 CONFIG_4KSTACKS=y
+CONFIG_DEBUG_NMI_TIMEOUT=5
 
-# FIXME: Disable before release.
 # CONFIG_DEBUG_PAGEALLOC is not set
 
 CONFIG_PCI_DIRECT=y


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- config-x86_64-generic	12 Mar 2007 23:55:08 -0000	1.67
+++ config-x86_64-generic	13 Apr 2007 20:40:51 -0000	1.68
@@ -174,6 +174,7 @@
 
 CONFIG_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_DEBUG_NMI_TIMEOUT=5
 
 CONFIG_PC8736x_GPIO=m
 



From fedora-cvs-commits at redhat.com  Fri Apr 13 20:40:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 16:40:53 -0400
Subject: rpms/kernel/devel linux-2.6-debug-nmi-timeout.patch, NONE,
	1.1 kernel-2.6.spec, 1.3064, 1.3065
Message-ID: <200704132040.l3DKerN3009569@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-debug-nmi-timeout.patch 
Log Message:
* Fri Apr 13 2007 Dave Jones <davej at redhat.com>
- Make NMI timeout a config option.


linux-2.6-debug-nmi-timeout.patch:
 arch/i386/kernel/nmi.c   |    2 +-
 arch/x86_64/kernel/nmi.c |    2 +-
 lib/Kconfig.debug        |    8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-debug-nmi-timeout.patch ---
--- linux-2.6.20.noarch/arch/i386/kernel/nmi.c~	2007-04-13 15:52:37.000000000 -0400
+++ linux-2.6.20.noarch/arch/i386/kernel/nmi.c	2007-04-13 15:53:06.000000000 -0400
@@ -1044,7 +1044,7 @@ __kprobes int nmi_watchdog_tick(struct p
 		 * wait a few IRQs (5 seconds) before doing the oops ...
 		 */
 		alert_counter[cpu]++;
-		if (alert_counter[cpu] == 5*nmi_hz)
+		if (alert_counter[cpu] == CONFIG_DEBUG_NMI_TIMEOUT*nmi_hz)
 			/*
 			 * die_nmi will return ONLY if NOTIFY_STOP happens..
 			 */
--- linux-2.6.20.noarch/arch/x86_64/kernel/nmi.c~	2007-04-13 15:53:09.000000000 -0400
+++ linux-2.6.20.noarch/arch/x86_64/kernel/nmi.c	2007-04-13 15:53:29.000000000 -0400
@@ -923,7 +923,7 @@ int __kprobes nmi_watchdog_tick(struct p
 		 * wait a few IRQs (5 seconds) before doing the oops ...
 		 */
 		local_inc(&__get_cpu_var(alert_counter));
-		if (local_read(&__get_cpu_var(alert_counter)) == 5*nmi_hz)
+		if (local_read(&__get_cpu_var(alert_counter)) == CONFIG_DEBUG_NMI_TIMEOUT*nmi_hz)
 			die_nmi("NMI Watchdog detected LOCKUP on CPU %d\n", regs,
 				panic_on_timeout);
 	} else {
--- linux-2.6.20.noarch/lib/Kconfig.debug~	2007-04-13 15:53:48.000000000 -0400
+++ linux-2.6.20.noarch/lib/Kconfig.debug	2007-04-13 15:55:18.000000000 -0400
@@ -133,6 +133,14 @@ config DETECT_SOFTLOCKUP
 	   can be detected via the NMI-watchdog, on platforms that
 	   support it.)
 
+config DEBUG_NMI_TIMEOUT
+	int "Number of seconds before NMI timeout"
+	depends on X86
+	default 5
+	help
+	  This value is the number of seconds the NMI watchdog will tick
+	  before it decides the machine has hung.
+
 config SCHEDSTATS
 	bool "Collect scheduler statistics"
 	depends on DEBUG_KERNEL && PROC_FS


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3064
retrieving revision 1.3065
diff -u -r1.3064 -r1.3065
--- kernel-2.6.spec	13 Apr 2007 18:34:41 -0000	1.3064
+++ kernel-2.6.spec	13 Apr 2007 20:40:51 -0000	1.3065
@@ -494,6 +494,7 @@
 
 Patch1010: linux-2.6-debug-sizeof-structs.patch
 Patch1011: linux-2.6-debug-slab-backtrace.patch
+Patch1012: linux-2.6-debug-nmi-timeout.patch
 Patch1013: linux-2.6-debug-taint-vm.patch
 Patch1015: linux-2.6-debug-spinlock-taint.patch
 Patch1016: linux-2.6-debug-extra-warnings.patch
@@ -1149,6 +1150,7 @@
 # Various low-impact patches to aid debugging.
 %patch1010 -p1
 %patch1011 -p1
+%patch1012 -p1
 %patch1013 -p1
 %patch1015 -p1
 %patch1016 -p1
@@ -2258,6 +2260,9 @@
 #  - tux.
 
 %changelog
+* Fri Apr 13 2007 Dave Jones <davej at redhat.com>
+- Make NMI timeout a config option.
+
 * Fri Apr 13 2007 Kristian H??gsberg <krh at redhat.com>
 - Redo diff against the 'juju' upstream branch so we get the right
   fixes in the firewire patch.



From fedora-cvs-commits at redhat.com  Fri Apr 13 20:44:58 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 16:44:58 -0400
Subject: rpms/kernel/devel/configs config-generic,1.305,1.306
Message-ID: <200704132044.l3DKiwbO012588@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
	config-generic 
Log Message:
update wireless bits


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -r1.305 -r1.306
--- config-generic	5 Apr 2007 19:58:28 -0000	1.305
+++ config-generic	13 Apr 2007 20:44:51 -0000	1.306
@@ -1182,6 +1182,7 @@
 
 CONFIG_MAC80211=m
 CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
 # CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 CONFIG_IEEE80211_DEBUG=y
@@ -1220,7 +1221,6 @@
 # CONFIG_RT2500USB_DEBUG is not set
 CONFIG_RT73USB=m
 # CONFIG_RT73USB_DEBUG is not set
-CONFIG_RT2X00_DEBUGFS=m
 # CONFIG_RT2X00_DEBUG is not set
 CONFIG_ADM8211=m
 CONFIG_P54_COMMON=m



From fedora-cvs-commits at redhat.com  Fri Apr 13 20:44:58 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 16:44:58 -0400
Subject: rpms/kernel/devel git-iwlwifi.patch, 1.2, 1.3 git-wireless-dev.patch,
	1.5, 1.6 kernel-2.6.spec, 1.3065,
	1.3066 linux-2.6-warnings-inline.patch, 1.3,
	1.4 git-wireless-dev-fixes.patch, 1.1,
	NONE linux-2.6-rt2x00-scan-fix.patch, 1.1, NONE
Message-ID: <200704132044.l3DKiwlU012579@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
	git-iwlwifi.patch git-wireless-dev.patch kernel-2.6.spec 
	linux-2.6-warnings-inline.patch 
Removed Files:
	git-wireless-dev-fixes.patch linux-2.6-rt2x00-scan-fix.patch 
Log Message:
update wireless bits

git-iwlwifi.patch:
 Kconfig              |    1 
 Makefile             |    1 
 iwlwifi/Kconfig      |   52 
 iwlwifi/Makefile     |    2 
 iwlwifi/base.c       |13762 +++++++++++++++++++++++++++++++++++++++++++++++++++
 iwlwifi/iwlwifi.h    | 1297 ++++
 iwlwifi/iwlwifi_hw.h | 1877 ++++++
 7 files changed, 16992 insertions(+)

Index: git-iwlwifi.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/git-iwlwifi.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- git-iwlwifi.patch	23 Mar 2007 18:13:09 -0000	1.2
+++ git-iwlwifi.patch	13 Apr 2007 20:44:49 -0000	1.3
@@ -1,6 +1,10 @@
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig	2007-03-22 15:13:39.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-03-22 15:14:05.000000000 -0400
-@@ -0,0 +1,13753 @@
+http://www.intellinuxwireless.org/repos/iwlwifi.git
+
+commit 54fa65b1135566728167bbab1d2f20c739632e2d
+
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig	2007-04-11 14:45:40.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-04-11 14:46:30.000000000 -0400
+@@ -0,0 +1,13762 @@
 +/******************************************************************************
 +
 +  Copyright(c) 2003 - 2006 Intel Corporation. All rights reserved.
@@ -109,7 +113,7 @@
 +
 +#include "iwlwifi.h"
 +
-+#define IWLWIFI_VERSION "0.0.11k"
++#define IWLWIFI_VERSION "0.0.12k"
 +
 +#define DRV_DESCRIPTION	"Intel(R) Wireless Link driver for Linux"
 +#define DRV_COPYRIGHT	"Copyright(c) 2003-2006 Intel Corporation"
@@ -1911,7 +1915,7 @@
 +
 +	len +=
 +	    sprintf(&buf[len],
-+		    "Displaying %d channels in 2.4Ghz band "
++		    "Displaying %d channels in 2.4GHz band "
 +		    "(802.11bg):\n", count);
 +
 +	for (i = 0; i < count; i++) {
@@ -1942,7 +1946,7 @@
 +
 +	len +=
 +	    sprintf(&buf[len],
-+		    "Displaying %d channels in 5.2Ghz band "
++		    "Displaying %d channels in 5.2GHz band "
 +		    "(802.11a):\n", count);
 +
 +	for (i = 0; i < count; i++) {
@@ -2279,7 +2283,7 @@
 +	/* The scan completion notification came in, so kill that timer... */
 +	cancel_delayed_work(&priv->scan_check);
 +
-+	IPW_DEBUG_INFO("Scan pass on %sGhz took %dms\n",
++	IPW_DEBUG_INFO("Scan pass on %sGHz took %dms\n",
 +		       (priv->scan_bands == 2) ? "2.4" : "5.2",
 +		       jiffies_to_msecs(elapsed_jiffies
 +					(priv->scan_pass_start, jiffies)));
@@ -4430,7 +4434,7 @@
 + * band.
 + *
 + * For example, ipw_priv->eeprom.band_3_channels[4] from the band_3
-+ * definition below maps to physical channel 42 in the 5.2Ghz spectrum.
++ * definition below maps to physical channel 42 in the 5.2GHz spectrum.
 + * The specific geography and calibration information for that channel
 + * is contained in the eeprom map itself.
 + *
@@ -4439,7 +4443,7 @@
 + *
 + * channel_map_24/52 provides the index in the channel_info array for a
 + * given channel.  We have to have two separate maps as there is channel
-+ * overlap with the 2.4Ghz and 5.2Ghz spectrum as seen in band_1 and
++ * overlap with the 2.4GHz and 5.2GHz spectrum as seen in band_1 and
 + * band_2
 + *
 + * A value of 0xff stored in the channel_map indicates that the channel
@@ -4459,7 +4463,7 @@
 +	1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
 +};
 +
-+/* 5.2 Ghz bands */
++/* 5.2 GHz bands */
 +static u8 ipw_eeprom_band_2[] = {
 +	183, 184, 185, 187, 188, 189, 192, 196, 7, 8, 11, 12, 16
 +};
@@ -4483,27 +4487,27 @@
 +				    const u8 ** eeprom_ch_index)
 +{
 +	switch (band) {
-+	case 1:		/* 2.4Ghz band */
++	case 1:		/* 2.4GHz band */
 +		*eeprom_ch_count = ARRAY_SIZE(ipw_eeprom_band_1);
 +		*eeprom_ch_info = priv->eeprom.band_1_channels;
 +		*eeprom_ch_index = ipw_eeprom_band_1;
 +		break;
-+	case 2:		/* 5.2Ghz band */
++	case 2:		/* 5.2GHz band */
 +		*eeprom_ch_count = ARRAY_SIZE(ipw_eeprom_band_2);
 +		*eeprom_ch_info = priv->eeprom.band_2_channels;
 +		*eeprom_ch_index = ipw_eeprom_band_2;
 +		break;
-+	case 3:		/* 5.2Ghz band */
++	case 3:		/* 5.2GHz band */
 +		*eeprom_ch_count = ARRAY_SIZE(ipw_eeprom_band_3);
 +		*eeprom_ch_info = priv->eeprom.band_3_channels;
 +		*eeprom_ch_index = ipw_eeprom_band_3;
 +		break;
-+	case 4:		/* 5.2Ghz band */
++	case 4:		/* 5.2GHz band */
 +		*eeprom_ch_count = ARRAY_SIZE(ipw_eeprom_band_4);
 +		*eeprom_ch_info = priv->eeprom.band_4_channels;
 +		*eeprom_ch_index = ipw_eeprom_band_4;
 +		break;
-+	case 5:		/* 5.2Ghz band */
++	case 5:		/* 5.2GHz band */
 +		*eeprom_ch_count = ARRAY_SIZE(ipw_eeprom_band_5);
 +		*eeprom_ch_info = priv->eeprom.band_5_channels;
 +		*eeprom_ch_index = ipw_eeprom_band_5;
@@ -4571,7 +4575,7 @@
 +			ch_info->flags = eeprom_ch_info[c].flags;
 +
 +			if (!(is_channel_valid(ch_info))) {
-+				IPW_DEBUG_INFO("Ch. %d [%sGhz] - No Tx\n",
++				IPW_DEBUG_INFO("Ch. %d [%sGHz] - No Tx\n",
 +					       ch_info->channel,
 +					       is_channel_a_band(ch_info) ?
 +					       "5.2" : "2.4");
@@ -4591,7 +4595,7 @@
 +				ch_info->rx_unlock = 0;
 +			}
 +
-+			IPW_DEBUG_INFO("Ch. %d [%sGhz] %s%s%s%s%s%s(" BIT_FMT8
++			IPW_DEBUG_INFO("Ch. %d [%sGHz] %s%s%s%s%s%s(" BIT_FMT8
 +				       " %ddBm): Ad-Hoc %ssupported\n",
 +				       ch_info->channel,
 +				       is_channel_a_band(ch_info) ?
@@ -4876,7 +4880,7 @@
 +	 * 2 = 802.11g
 +	 */
 +
-+	/* 5.2Ghz channels start after the 2.4Ghz channels */
++	/* 5.2GHz channels start after the 2.4GHz channels */
 +	modes[A].mode = MODE_IEEE80211A;
 +	modes[A].channels = &channels[ARRAY_SIZE(ipw_eeprom_band_1)];
 +	modes[A].rates = &rates[4];
@@ -4905,7 +4909,7 @@
 +
 +		if (!is_channel_valid(ch)) {
 +			IPW_WARNING
-+				("Channel %d [%sGhz] is Tx only -- skipping.\n",
++				("Channel %d [%sGHz] is Tx only -- skipping.\n",
 +				 ch->channel, is_channel_a_band(ch) ? "5.2" : "2.4");
 +			continue;
 +		}
@@ -4914,7 +4918,7 @@
 +			if (ch->channel < IEEE80211_52GHZ_MIN_CHANNEL ||
 +			    ch->channel > IEEE80211_52GHZ_MAX_CHANNEL) {
 +				IPW_WARNING
-+				    ("Channel %d [5.2Ghz] not supported by "
++				    ("Channel %d [5.2GHz] not supported by "
 +				     "mac80211.\n", ch->channel);
 +				continue;
 +			}
@@ -4924,7 +4928,7 @@
 +			if (ch->channel < IEEE80211_24GHZ_MIN_CHANNEL ||
 +			    ch->channel > IEEE80211_24GHZ_MAX_CHANNEL) {
 +				IPW_WARNING
-+				    ("Channel %d [2.4Ghz] not supported by "
++				    ("Channel %d [2.4GHz] not supported by "
 +				     "mac80211.\n", ch->channel);
 +				continue;
 +			}
@@ -4935,13 +4939,12 @@
 +
 +		geo_ch->freq = ieee80211chan2mhz((ch->channel));
 +		geo_ch->chan = ch->channel;
-+		geo_ch->val = ch->channel;
 +		geo_ch->power_level = ch->max_power_avg;
 +		geo_ch->antenna_max = 0xff;
 +
 +		if (is_channel_valid(ch)) {
 +			geo_ch->flag = IEEE80211_CHAN_W_SCAN;
-+			if (!(ch->flags & IPW_CHANNEL_IBSS))
++			if (ch->flags & IPW_CHANNEL_IBSS)
 +				geo_ch->flag |= IEEE80211_CHAN_W_IBSS;
 +
 +			if (ch->flags & IPW_CHANNEL_ACTIVE)
@@ -4955,7 +4958,7 @@
 +				    ch->max_power_avg;
 +		}
 +
-+		geo_ch->val = ch->flags;
++		geo_ch->val = geo_ch->flag;
 +
 +	}
 +
@@ -7772,7 +7775,7 @@
 +
 +	ipw_rt->rt_tsf = tsf;
 +
-+	/* Convert to DBM */
++	/* Convert to dBm */
 +	ipw_rt->rt_dbmsignal = signal;
 +	ipw_rt->rt_dbmnoise = noise;
 +
@@ -7899,7 +7902,7 @@
 +	u16 filter = priv->prom_priv->filter;
 +	int hdr_only = 0;
 +	struct sk_buff *dst;
-+	struct ipw_rt_rx_hdr *ipw_rt;
++	struct ipw_rt_tx_hdr *ipw_rt;
 +	int len;
 +
 +	if (filter & IPW_PROM_NO_TX)
@@ -7945,7 +7948,7 @@
 +	     (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL) |
 +	     (1 << IEEE80211_RADIOTAP_ANTENNA));
 +
-+	/* Convert to DBM */
++	/* Convert to dBm */
 +	ipw_rt->rt_dbmsignal = ctl->power_level;
 +
 +	/* Convert the channel data and set the flags */
@@ -8097,7 +8100,7 @@
 +
 +	ipw_rt->rt_tsf = tsf;
 +
-+	/* Convert to DBM */
++	/* Convert to dBm */
 +	ipw_rt->rt_dbmsignal = signal;
 +	ipw_rt->rt_dbmnoise = noise;
 +
@@ -10980,6 +10983,16 @@
 +		return -EIO;
 +	}
 +
++	if (ipw_is_associated(priv)) {
++		if (ipw_rxon_add_station(priv, 
++					 priv->active_rxon.bssid_addr, 
++				         1) == IPW_INVALID_STATION) {
++			IPW_ERROR("Error adding AP address for "
++				  "transmit.\n");
++			return -EIO;
++		}
++	}
++
 +	return 0;
 +}
 +
@@ -11366,8 +11379,6 @@
 +
 +	priv->assoc_id = 0xFFFD;
 +
-+	queue_work(priv->workqueue, &priv->associate_timeout);
-+
 +	spin_unlock_irqrestore(&priv->lock, flags);
 +	return 0;
 +}
@@ -12192,6 +12203,7 @@
 +{
 +	int i;
 +	struct ipw_priv *priv = (struct ipw_priv *) priv_rate;
++	struct ieee80211_hw_mode *mode;
 +
 +	sta->txrate = 4;
 +	IPW_DEBUG_RATE("rate scale global init\n");
@@ -12207,9 +12219,11 @@
 +					 0, (CMD_ASYNC | CMD_NO_LOCK));
 +	}
 +
-+	for (i = 0; i < local->num_curr_rates; i++) {
++	mode = local->oper_hw_mode;
++
++	for (i = 0; i < mode->num_rates; i++) {
 +		if ((sta->supp_rates & BIT(i)) &&
-+		    (local->curr_rates[i].flags & IEEE80211_RATE_SUPPORTED))
++		    (mode->rates[i].flags & IEEE80211_RATE_SUPPORTED))
 +			sta->txrate = i;
 +	}
 +	sta->last_txrate = ipw_convert_to_rate_index(priv, sta->txrate);
@@ -12219,8 +12233,6 @@
 +
 +	IPW_WARNING("XXXY is HT network %d \n", sta->ht_info.is_ht);
 +#endif
-+	if (priv && (priv->iw_mode != IEEE80211_IF_TYPE_STA))
-+		queue_work(priv->workqueue, &priv->associate_timeout);
 +
 +}
 +
@@ -12377,15 +12389,16 @@
 +						  *local)
 +{
 +	int i;
++	struct ieee80211_hw_mode *mode = local->oper_hw_mode;
 +
-+	for (i = 0; i < local->num_curr_rates; i++) {
-+		struct ieee80211_rate *rate = &local->curr_rates[i];
++	for (i = 0; i < mode->num_rates; i++) {
++		struct ieee80211_rate *rate = &mode->rates[i];
 +
 +		if (rate->flags & IEEE80211_RATE_SUPPORTED)
 +			return rate;
 +	}
 +
-+	return &local->curr_rates[0];
++	return &mode->rates[0];
 +}
 +
 +static int ipw_get_adjacent_rate(struct ipw_priv *priv,
@@ -13754,13 +13767,13 @@
 +
 +	return 0;
 +}
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/Makefile.orig	2007-03-22 15:13:39.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/Makefile	2007-03-22 15:13:46.000000000 -0400
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/Makefile.orig	2007-04-11 14:45:40.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/Makefile	2007-04-11 14:46:00.000000000 -0400
 @@ -0,0 +1,2 @@
 +iwlwifi-objs		:= base.o
 +obj-$(CONFIG_IWLWIFI)	+= iwlwifi.o
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h.orig	2007-03-22 15:13:39.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h	2007-03-22 15:14:05.000000000 -0400
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h.orig	2007-04-11 14:45:40.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h	2007-04-11 14:46:30.000000000 -0400
 @@ -0,0 +1,1297 @@
 +/******************************************************************************
 +
@@ -14426,9 +14439,9 @@
 +	u64 rt_tsf;		/* TSF */
 +	u8 rt_flags;		/* radiotap packet flags */
 +	u8 rt_rate;		/* rate in 500kb/s */
-+	u16 rt_channel;		/* channel in mhz */
++	u16 rt_channel;		/* channel in mHz */
 +	u16 rt_chbitmask;	/* channel bitfield */
-+	s8 rt_dbmsignal;	/* signal in dbM, kluged to signed */
++	s8 rt_dbmsignal;	/* signal in dBm, kluged to signed */
 +	s8 rt_dbmnoise;
 +	u8 rt_antenna;		/* antenna number */
 +	u8 payload[0];		/* payload... */
@@ -14437,9 +14450,10 @@
 +struct ipw_rt_tx_hdr {
 +	struct ieee80211_radiotap_header rt_hdr;
 +	u8 rt_rate;		/* rate in 500kb/s */
-+	u16 rt_channel;		/* channel in mhz */
++	u16 rt_channel;		/* channel in mHz */
 +	u16 rt_chbitmask;	/* channel bitfield */
-+	s8 rt_dbmsignal;	/* signal in dbM, kluged to signed */
++	s8 rt_dbmsignal;	/* signal in dBm, kluged to signed */
++	u8 rt_antenna;		/* antenna number */
 +	u8 payload[0];		/* payload... */
 +} __attribute__ ((packed));
 +
@@ -14910,7 +14924,7 @@
 +
 +	struct iw_statistics wstats;
 +
-+	int freq_band;		/* 2.4Ghz, 5.2Ghz, Mixed */
++	int freq_band;		/* 2.4GHz, 5.2GHz, Mixed */
 +	int iw_mode;
 +	int perfect_rssi;
 +	int worst_rssi;
@@ -14940,7 +14954,6 @@
 +	struct work_struct link_up;
 +	struct work_struct update_link_led;
 +	struct work_struct link_down;
-+	struct work_struct associate_timeout;
 +	struct work_struct auth_work;
 +	struct work_struct post_associate;
 +	struct work_struct report_work;
@@ -15059,8 +15072,8 @@
 +#define IPW3945_RX_BUF_SIZE 3000
 +
 +#endif				/* __iwlwifi_h__ */
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/Kconfig.orig	2007-03-22 15:13:39.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/Kconfig	2007-03-22 15:14:05.000000000 -0400
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/Kconfig.orig	2007-04-11 14:45:40.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/Kconfig	2007-04-11 14:46:00.000000000 -0400
 @@ -0,0 +1,52 @@
 +config IWLWIFI
 +	tristate "Intel PRO/Wireless 3945ABG Network Connection adapter"
@@ -15114,8 +15127,8 @@
 +	  If this is your first time using this driver, you should say Y here
 +	  as the debug information can assist others in helping you resolve
 +	  any problems you may encounter.
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi_hw.h.orig	2007-03-22 15:13:39.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi_hw.h	2007-03-22 15:14:05.000000000 -0400
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi_hw.h.orig	2007-04-11 14:45:40.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi_hw.h	2007-04-11 14:46:30.000000000 -0400
 @@ -0,0 +1,1877 @@
 +/******************************************************************************
 +
@@ -15838,7 +15851,7 @@
 +	   struct ipw_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
++	   can not mix 2.4GHz channels and 5.2GHz channels and must
 +	   request a scan multiple times (not concurrently)
 +
 +	 */
@@ -16994,15 +17007,15 @@
 +#define IPW_RX_BUF_SIZE 3000
 +
 +#endif				/* __iwlwifi_hw_h__ */
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile.orig	2007-03-22 15:13:39.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile	2007-03-22 15:13:46.000000000 -0400
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile.orig	2007-04-11 14:45:40.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile	2007-04-11 14:46:00.000000000 -0400
 @@ -4,3 +4,4 @@ obj-$(CONFIG_ADM8211)		+= adm8211/
  obj-$(CONFIG_P54_COMMON)	+= p54/
  obj-$(CONFIG_ZD1211RW_MAC80211)	+= zd1211rw/
  obj-$(CONFIG_RTL818X)		+= rtl818x/
 +obj-$(CONFIG_IWLWIFI)		+= iwlwifi/
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig.orig	2007-03-22 15:13:39.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig	2007-03-22 15:13:46.000000000 -0400
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig.orig	2007-04-11 14:45:40.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig	2007-04-11 14:46:00.000000000 -0400
 @@ -4,3 +4,4 @@ source "drivers/net/wireless/mac80211/ad
  source "drivers/net/wireless/mac80211/p54/Kconfig"
  source "drivers/net/wireless/mac80211/zd1211rw/Kconfig"

git-wireless-dev.patch:
 b/.mailmap                                                |    1 
 b/CREDITS                                                 |   37 
 b/Documentation/feature-removal-schedule.txt              |   11 
 b/MAINTAINERS                                             |   60 
 b/drivers/Kconfig                                         |    2 
 b/drivers/Makefile                                        |    1 
 b/drivers/misc/Kconfig                                    |    8 
 b/drivers/misc/Makefile                                   |    1 
 b/drivers/misc/eeprom_93cx6.c                             |  344 
 b/drivers/net/Makefile                                    |    2 
 b/drivers/net/wireless/Kconfig                            |  120 
 b/drivers/net/wireless/Makefile                           |    3 
 b/drivers/net/wireless/bcm43xx/Kconfig                    |    4 
 b/drivers/net/wireless/hostap/Kconfig                     |    3 
 b/drivers/net/wireless/mac80211/Kconfig                   |    6 
 b/drivers/net/wireless/mac80211/Makefile                  |    6 
 b/drivers/net/wireless/mac80211/README                    |    2 
 b/drivers/net/wireless/mac80211/adm8211/Kconfig           |   25 
 b/drivers/net/wireless/mac80211/adm8211/Makefile          |    1 
 b/drivers/net/wireless/mac80211/adm8211/adm8211.c         | 2172 +++++
 b/drivers/net/wireless/mac80211/adm8211/adm8211.h         |  622 +
 b/drivers/net/wireless/mac80211/bcm43xx/Kconfig           |  100 
 b/drivers/net/wireless/mac80211/bcm43xx/Makefile          |   18 
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h         |  875 ++
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c |  433 +
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h |  110 
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c     | 1297 +++
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h     |  361 
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c    |  300 
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h    |   56 
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c      | 1110 +++
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h      |   92 
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c    | 3984 ++++++++++
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h    |  156 
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c  |  163 
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h  |   22 
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c     | 4262 +++++++++++
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h     |  309 
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c     |  671 +
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h     |  170 
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c   |   82 
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h   |   41 
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c   |  232 
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h   |    9 
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c  |  376 +
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h  |   28 
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c    |  611 +
 b/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h    |  250 
 b/drivers/net/wireless/mac80211/p54/Kconfig               |   10 
 b/drivers/net/wireless/mac80211/p54/Makefile              |    4 
 b/drivers/net/wireless/mac80211/p54/net2280.h             |  452 +
 b/drivers/net/wireless/mac80211/p54/prism54.h             |   77 
 b/drivers/net/wireless/mac80211/p54/prism54common.c       |  821 ++
 b/drivers/net/wireless/mac80211/p54/prism54common.h       |  328 
 b/drivers/net/wireless/mac80211/p54/prism54magic.h        |   77 
 b/drivers/net/wireless/mac80211/p54/prism54pci.c          |  700 +
 b/drivers/net/wireless/mac80211/p54/prism54pci.h          |  106 
 b/drivers/net/wireless/mac80211/p54/prism54usb.c          |  946 ++
 b/drivers/net/wireless/mac80211/p54/prism54usb.h          |  133 
 b/drivers/net/wireless/mac80211/rt2x00/Kconfig            |   99 
 b/drivers/net/wireless/mac80211/rt2x00/Makefile           |   12 
 b/drivers/net/wireless/mac80211/rt2x00/rt2400pci.c        | 2562 +++++++
 b/drivers/net/wireless/mac80211/rt2x00/rt2400pci.h        |  925 ++
 b/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c        | 2859 +++++++
 b/drivers/net/wireless/mac80211/rt2x00/rt2500pci.h        | 1192 +++
 b/drivers/net/wireless/mac80211/rt2x00/rt2500usb.c        | 2695 +++++++
 b/drivers/net/wireless/mac80211/rt2x00/rt2500usb.h        |  740 ++
 b/drivers/net/wireless/mac80211/rt2x00/rt2x00.h           | 1070 ++
 b/drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c      |  354 
 b/drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h      |   71 
 b/drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c        |  282 
 b/drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h        |   80 
 b/drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c        |  540 +
 b/drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h        |   39 
 b/drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h        |   82 
 b/drivers/net/wireless/mac80211/rt2x00/rt61pci.c          | 3333 +++++++++
 b/drivers/net/wireless/mac80211/rt2x00/rt61pci.h          | 1355 +++
 b/drivers/net/wireless/mac80211/rt2x00/rt73usb.c          | 2993 ++++++++
 b/drivers/net/wireless/mac80211/rt2x00/rt73usb.h          |  939 ++
 b/drivers/net/wireless/mac80211/rtl818x/Kconfig           |    9 
 b/drivers/net/wireless/mac80211/rtl818x/Makefile          |    2 
 b/drivers/net/wireless/mac80211/rtl818x/rtl8187.h         |  126 
 b/drivers/net/wireless/mac80211/rtl818x/rtl8187_dev.c     |  726 +
 b/drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.c |  747 ++
 b/drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.h |   30 
 b/drivers/net/wireless/mac80211/rtl818x/rtl818x.h         |  180 
 b/drivers/net/wireless/mac80211/zd1211rw/Kconfig          |   19 
 b/drivers/net/wireless/mac80211/zd1211rw/Makefile         |   11 
 b/drivers/net/wireless/mac80211/zd1211rw/zd_chip.c        | 1679 ++++
 b/drivers/net/wireless/mac80211/zd1211rw/zd_chip.h        |  910 ++
 b/drivers/net/wireless/mac80211/zd1211rw/zd_def.h         |   57 
 b/drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h   |   67 
 b/drivers/net/wireless/mac80211/zd1211rw/zd_mac.c         |  700 +
 b/drivers/net/wireless/mac80211/zd1211rw/zd_mac.h         |  250 
 b/drivers/net/wireless/mac80211/zd1211rw/zd_rf.c          |  170 
 b/drivers/net/wireless/mac80211/zd1211rw/zd_rf.h          |   80 
 b/drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c   |  436 +
 b/drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c  |  491 +
 b/drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c   |  279 
 b/drivers/net/wireless/mac80211/zd1211rw/zd_usb.c         | 1337 +++
 b/drivers/net/wireless/mac80211/zd1211rw/zd_usb.h         |  241 
 b/drivers/net/wireless/mac80211/zd1211rw/zd_util.c        |   82 
 b/drivers/net/wireless/mac80211/zd1211rw/zd_util.h        |   29 
 b/drivers/net/wireless/zd1211rw/Kconfig                   |    4 
 b/drivers/ssb/Kconfig                                     |   93 
 b/drivers/ssb/Makefile                                    |   11 
 b/drivers/ssb/driver_chipcommon.c                         |  402 +
 b/drivers/ssb/driver_mipscore.c                           |  258 
 b/drivers/ssb/driver_pcicore.c                            |  556 +
 b/drivers/ssb/main.c                                      | 1050 ++
 b/drivers/ssb/pci.c                                       |  667 +
 b/drivers/ssb/pcihost_wrapper.c                           |  104 
 b/drivers/ssb/pcmcia.c                                    |  256 
 b/drivers/ssb/scan.c                                      |  407 +
 b/drivers/ssb/ssb_private.h                               |  151 
 b/drivers/usb/host/Kconfig                                |   13 
 b/drivers/usb/host/ohci-hcd.c                             |   21 
 b/drivers/usb/host/ohci-ssb.c                             |  254 
 b/include/linux/Kbuild                                    |    2 
 b/include/linux/crc-itu-t.h                               |   27 
 b/include/linux/eeprom_93cx6.h                            |   77 
 b/include/linux/ieee80211.h                               |  403 +
 b/include/linux/netdevice.h                               |    7 
 b/include/linux/nl80211.h                                 |  301 
 b/include/linux/ssb/ssb.h                                 |  403 +
 b/include/linux/ssb/ssb_driver_chipcommon.h               |  387 +
 b/include/linux/ssb/ssb_driver_extif.h                    |  163 
 b/include/linux/ssb/ssb_driver_mips.h                     |   47 
 b/include/linux/ssb/ssb_driver_pci.h                      |  108 
 b/include/linux/ssb/ssb_regs.h                            |  294 
 b/include/net/cfg80211.h                                  |  150 
 b/include/net/iw_handler.h                                |   13 
 b/include/net/mac80211.h                                  | 1106 +++
 b/include/net/wireless.h                                  |  159 
 b/lib/Kconfig                                             |    8 
 b/lib/Makefile                                            |    1 
 b/lib/crc-itu-t.c                                         |   64 
 b/net/Kconfig                                             |   12 
 b/net/Makefile                                            |    2 
 b/net/core/Makefile                                       |    1 
 b/net/core/dev.c                                          |   33 
 b/net/core/rtnetlink.c                                    |   31 
 b/net/ieee80211/Kconfig                                   |    3 
 b/net/mac80211/Kconfig                                    |   81 
 b/net/mac80211/Makefile                                   |   21 
 b/net/mac80211/aes_ccm.c                                  |  155 
 b/net/mac80211/aes_ccm.h                                  |   26 
 b/net/mac80211/debugfs.c                                  |  436 +
 b/net/mac80211/debugfs.h                                  |   16 
 b/net/mac80211/debugfs_key.c                              |  253 
 b/net/mac80211/debugfs_key.h                              |   34 
 b/net/mac80211/debugfs_netdev.c                           |  440 +
 b/net/mac80211/debugfs_netdev.h                           |   30 
 b/net/mac80211/debugfs_sta.c                              |  247 
 b/net/mac80211/debugfs_sta.h                              |   12 
 b/net/mac80211/hostapd_ioctl.h                            |  347 
 b/net/mac80211/ieee80211.c                                | 5097 ++++++++++++++
 b/net/mac80211/ieee80211_cfg.c                            |   90 
 b/net/mac80211/ieee80211_cfg.h                            |    9 
 b/net/mac80211/ieee80211_common.h                         |   98 
 b/net/mac80211/ieee80211_i.h                              |  848 ++
 b/net/mac80211/ieee80211_iface.c                          |  366 +
 b/net/mac80211/ieee80211_ioctl.c                          | 3290 +++++++++
 b/net/mac80211/ieee80211_key.h                            |  106 
 b/net/mac80211/ieee80211_led.c                            |   91 
 b/net/mac80211/ieee80211_led.h                            |   32 
 b/net/mac80211/ieee80211_rate.c                           |  140 
 b/net/mac80211/ieee80211_rate.h                           |  144 
 b/net/mac80211/ieee80211_scan.c                           |  344 
 b/net/mac80211/ieee80211_sta.c                            | 3207 ++++++++
 b/net/mac80211/michael.c                                  |  104 
 b/net/mac80211/michael.h                                  |   20 
 b/net/mac80211/rc80211_simple.c                           |  432 +
 b/net/mac80211/sta_info.c                                 |  463 +
 b/net/mac80211/sta_info.h                                 |  167 
 b/net/mac80211/tkip.c                                     |  341 
 b/net/mac80211/tkip.h                                     |   36 
 b/net/mac80211/wep.c                                      |  328 
 b/net/mac80211/wep.h                                      |   40 
 b/net/mac80211/wme.c                                      |  685 +
 b/net/mac80211/wme.h                                      |   38 
 b/net/mac80211/wpa.c                                      |  846 ++
 b/net/mac80211/wpa.h                                      |   31 
 b/net/wireless/Kconfig                                    |   46 
 b/net/wireless/Makefile                                   |   17 
 b/net/wireless/core.c                                     |  359 
 b/net/wireless/core.h                                     |   80 
 b/net/wireless/nl80211.c                                  |  974 ++
 b/net/wireless/nl80211.h                                  |   24 
 b/net/wireless/sysfs.c                                    |  125 
 b/net/wireless/sysfs.h                                    |    9 
 b/net/wireless/wext-common.c                              |  663 +
 b/net/wireless/wext-compat.c                              |  789 ++
 b/net/wireless/wext-export.c                              |   29 
 b/net/wireless/wext-mod.c                                 |   20 
 b/net/wireless/wext-old.c                                 |  829 ++
 b/net/wireless/wext.h                                     |   51 
 net/core/wireless.c                                       | 2371 ------
 198 files changed, 85470 insertions(+), 2539 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.5 -r 1.6 git-wireless-dev.patch
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/git-wireless-dev.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- git-wireless-dev.patch	30 Mar 2007 06:27:57 -0000	1.5
+++ git-wireless-dev.patch	13 Apr 2007 20:44:49 -0000	1.6
@@ -1,13163 +1,12971 @@
---- /dev/null	2007-03-09 11:47:32.684268720 -0500
-+++ linux-2.6.20.noarch/include/net/wireless.h	2007-03-20 11:29:04.000000000 -0400
-@@ -0,0 +1,160 @@
-+#ifndef __NET_WIRELESS_H
-+#define __NET_WIRELESS_H
+git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-dev.git
+
+commit 5363171f929bc62290a1119e492f3ae7d9636c5e
+
+diff --git a/.mailmap b/.mailmap
+index bf62dbe..5662cc7 100644
+--- a/.mailmap
++++ b/.mailmap
+@@ -57,6 +57,7 @@ Jean Tourrilhes <jt at hpl.hp.com>
+ Jeff Garzik <jgarzik at pretzel.yyz.us>
+ Jens Axboe <axboe at suse.de>
+ Jens Osterkamp <Jens.Osterkamp at de.ibm.com>
++Johannes Berg <johannes at sipsolutions.net>
+ John Stultz <johnstul at us.ibm.com>
+ Juha Yrjola <at solidboot.com>
+ Juha Yrjola <juha.yrjola at nokia.com>
+diff --git a/CREDITS b/CREDITS
+index 6bd8ab8..f95e8af 100644
+--- a/CREDITS
++++ b/CREDITS
+@@ -317,6 +317,12 @@ S: 2322 37th Ave SW
+ S: Seattle, Washington 98126-2010
+ S: USA
+ 
++N: Johannes Berg
++E: johannes at sipsolutions.net
++W: http://johannes.sipsolutions.net/
++P: 1024D/9AB78CA5 AD02 0176 4E29 C137 1DF6 08D2 FC44 CF86 9AB7 8CA5
++D: powerpc & 802.11 hacker
++
+ N: Stephen R. van den Berg (AKA BuGless)
+ E: berg at pool.informatik.rwth-aachen.de
+ D: General kernel, gcc, and libc hacker
+@@ -659,6 +665,11 @@ D: Minor updates to SCSI code for the Co
+ S: (ask for current address)
+ S: USA
+ 
++N: Robin Cornelius
++E: robincornelius at users.sourceforge.net
++D: Ralink rt2x00 WLAN driver
++S: Cornwall, U.K.
 +
-+/*
-+ * 802.11 device management
-+ *
-+ * Copyright 2007	Johannes Berg <johannes at sipsolutions.net>
-+ */
+ N: Mark Corner
+ E: mcorner at umich.edu
+ W: http://www.eecs.umich.edu/~mcorner/
+@@ -673,6 +684,11 @@ D: Kernel module SMART utilities
+ S: Santa Cruz, California
+ S: USA
+ 
++N: Luis Correia
++E: lfcorreia at users.sf.net
++D: Ralink rt2x00 WLAN driver
++S: Belas, Portugal
 +
-+#include <linux/netdevice.h>
-+#include <linux/debugfs.h>
-+#include <linux/list.h>
-+#include <net/cfg80211.h>
+ N: Alan Cox
+ W: http://www.linux.org.uk/diary/
+ D: Linux Networking (0.99.10->2.0.29)
+@@ -827,6 +843,12 @@ S: Lancs
+ S: PR4 6AX
+ S: United Kingdom
+ 
++N: Ivo van Doorn
++E: IvDoorn at gmail.com
++W: http://www.mendiosus.nl
++D: Ralink rt2x00 WLAN driver
++S: Haarlem, The Netherlands
 +
-+/**
-+ * struct wiphy - wireless hardware description
-+ * @idx: the wiphy index assigned to this item
-+ * @class_dev: the class device representing /sys/class/ieee80211/<wiphy-name>
-+ */
-+struct wiphy {
-+	/* assign these fields before you register the wiphy */
+ N: John G Dorsey
+ E: john+ at cs.cmu.edu
+ D: ARM Linux ports to Assabet/Neponset, Spot
+@@ -3510,6 +3532,12 @@ S: Maastrichterweg 63
+ S: 5554 GG Valkenswaard
+ S: The Netherlands
+ 
++N: Mark Wallis
++E: mwallis at serialmonkey.com
++W: http://mark.serialmonkey.com
++D: Ralink rt2x00 WLAN driver
++S: Newcastle, Australia
 +
-+	/* permanent MAC address */
-+	u8 perm_addr[ETH_ALEN];
+ N: Peter Shaobo Wang
+ E: pwang at mmdcorp.com
+ W: http://www.mmdcorp.com/pw/linux
+@@ -3644,6 +3672,15 @@ S: Alte Regensburger Str. 11a
+ S: 93149 Nittenau
+ S: Germany
+ 
++N: Gertjan van Wingerde
++E: gwingerde at home.nl
++D: Ralink rt2x00 WLAN driver
++D: Minix V2 file-system
++D: Misc fixes
++S: Geessinkweg 177
++S: 7544 TX Enschede
++S: The Netherlands
 +
-+	/* If multiple wiphys are registered and you're handed e.g.
-+	 * a regular netdev with assigned ieee80211_ptr, you won't
-+	 * know whether it points to a wiphy your driver has registered
-+	 * or not. Assign this to something global to your driver to
-+	 * help determine whether you own this wiphy or not. */
-+	void *privid;
+ N: Lars Wirzenius
+ E: liw at iki.fi
+ D: Linux System Administrator's Guide, author, former maintainer
+diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
+index 0bc8b0b..0f7a323 100644
+--- a/Documentation/feature-removal-schedule.txt
++++ b/Documentation/feature-removal-schedule.txt
+@@ -305,18 +305,6 @@ Who:	Richard Purdie <rpurdie at rpsys.net>
+ 
+ ---------------------------
+ 
+-What:	Wireless extensions over netlink (CONFIG_NET_WIRELESS_RTNETLINK)
+-When:	with the merge of wireless-dev, 2.6.22 or later
+-Why:	The option/code is
+-	 * not enabled on most kernels
+-	 * not required by any userspace tools (except an experimental one,
+-	   and even there only for some parts, others use ioctl)
+-	 * pointless since wext is no longer evolving and the ioctl
+-	   interface needs to be kept
+-Who:	Johannes Berg <johannes at sipsolutions.net>
+-
+----------------------------
+-
+ What:	i8xx_tco watchdog driver
+ When:	in 2.6.22
+ Why:	the i8xx_tco watchdog driver has been replaced by the iTCO_wdt
+diff --git a/MAINTAINERS b/MAINTAINERS
+index 829407f..233ba0d 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -296,6 +296,14 @@ M:	corentin.labbe at geomatys.fr
+ L:	lm-sensors at lm-sensors.org
+ S:	Maintained
+ 
++ADM8211 WIRELESS DRIVER
++P:	Michael Wu
++M:	flamingice at sourmilk.net
++L:	linux-wireless at vger.kernel.org
++W:	http://aluminum.sourmilk.net/adm8211/
++T:	git kernel.org:/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
++S:	Maintained
 +
-+	/* fields below are read-only, assigned by cfg80211 */
+ ADT746X FAN DRIVER
+ P:	Colin Leroy
+ M:	colin at colino.net
+@@ -656,6 +664,7 @@ S:	Supported
+ ATMEL WIRELESS DRIVER
+ P:	Simon Kelley
+ M:	simon at thekelleys.org.uk
++L:	linux-wireless at vger.kernel.org
+ W:	http://www.thekelleys.org.uk/atmel
+ W:	http://atmelwlandriver.sourceforge.net/
+ S:	Maintained
+@@ -706,11 +715,21 @@ L:	linux-hams at vger.kernel.org
+ W:	http://www.baycom.org/~tom/ham/ham.html
+ S:	Maintained
+ 
++BCM43XX WIRELESS DRIVER (DEVICESCAPE BASED VERSION)
++P:	Michael Buesch
++M:	mb at bu3sch.de
++P:	Stefano Brivio
++M:	st3 at riseup.net
++L:	linux-wireless at vger.kernel.org
++W:	http://bcm43xx.berlios.de/
++S:	Maintained
[...149571 lines suppressed...]
-+int ieee80211_sta_deauthenticate(struct net_device *dev, u16 reason)
++/*------------------------------------------------------------------*/
++/*
++ * Standard Wireless Handler : get spy threshold
++ */
++int iw_handler_get_thrspy(struct net_device *	dev,
++			  struct iw_request_info *info,
++			  union iwreq_data *	wrqu,
++			  char *		extra)
 +{
-+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-+	struct ieee80211_if_sta *ifsta = &sdata->u.sta;
++	struct iw_spy_data *	spydata = get_spydata(dev);
++	struct iw_thrspy *	threshold = (struct iw_thrspy *) extra;
 +
-+	printk(KERN_DEBUG "%s: deauthenticate(reason=%d)\n",
-+	       dev->name, reason);
++	/* Make sure driver is not buggy or using the old API */
++	if(!spydata)
++		return -EOPNOTSUPP;
 +
-+	if (sdata->type != IEEE80211_IF_TYPE_STA &&
-+	    sdata->type != IEEE80211_IF_TYPE_IBSS)
-+		return -EINVAL;
++	/* Just do it */
++	memcpy(&(threshold->low), &(spydata->spy_thr_low),
++	       2 * sizeof(struct iw_quality));
 +
-+	ieee80211_send_deauth(dev, ifsta, reason);
-+	ieee80211_set_disassoc(dev, ifsta, 1);
 +	return 0;
 +}
++EXPORT_SYMBOL(iw_handler_get_thrspy);
 +
-+
-+int ieee80211_sta_disassociate(struct net_device *dev, u16 reason)
++/*------------------------------------------------------------------*/
++/*
++ * Prepare and send a Spy Threshold event
++ */
++static void iw_send_thrspy_event(struct net_device *	dev,
++				 struct iw_spy_data *	spydata,
++				 unsigned char *	address,
++				 struct iw_quality *	wstats)
 +{
-+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-+	struct ieee80211_if_sta *ifsta = &sdata->u.sta;
++	union iwreq_data	wrqu;
++	struct iw_thrspy	threshold;
 +
-+	printk(KERN_DEBUG "%s: disassociate(reason=%d)\n",
-+	       dev->name, reason);
++	/* Init */
++	wrqu.data.length = 1;
++	wrqu.data.flags = 0;
++	/* Copy address */
++	memcpy(threshold.addr.sa_data, address, ETH_ALEN);
++	threshold.addr.sa_family = ARPHRD_ETHER;
++	/* Copy stats */
++	memcpy(&(threshold.qual), wstats, sizeof(struct iw_quality));
++	/* Copy also thresholds */
++	memcpy(&(threshold.low), &(spydata->spy_thr_low),
++	       2 * sizeof(struct iw_quality));
 +
-+	if (sdata->type != IEEE80211_IF_TYPE_STA)
-+		return -EINVAL;
++	/* Send event to user space */
++	wireless_send_event(dev, SIOCGIWTHRSPY, &wrqu, (char *) &threshold);
++}
 +
-+	if (!ifsta->associated)
-+		return -1;
++/* ---------------------------------------------------------------- */
++/*
++ * Call for the driver to update the spy data.
++ * For now, the spy data is a simple array. As the size of the array is
++ * small, this is good enough. If we wanted to support larger number of
++ * spy addresses, we should use something more efficient...
++ */
++void wireless_spy_update(struct net_device *	dev,
++			 unsigned char *	address,
++			 struct iw_quality *	wstats)
++{
++	struct iw_spy_data *	spydata = get_spydata(dev);
++	int			i;
++	int			match = -1;
 +
-+	ieee80211_send_disassoc(dev, ifsta, reason);
-+	ieee80211_set_disassoc(dev, ifsta, 0);
-+	return 0;
++	/* Make sure driver is not buggy or using the old API */
++	if(!spydata)
++		return;
++
++	/* Update all records that match */
++	for(i = 0; i < spydata->spy_number; i++)
++		if(!compare_ether_addr(address, spydata->spy_address[i])) {
++			memcpy(&(spydata->spy_stat[i]), wstats,
++			       sizeof(struct iw_quality));
++			match = i;
++		}
++
++	/* Generate an event if we cross the spy threshold.
++	 * To avoid event storms, we have a simple hysteresis : we generate
++	 * event only when we go under the low threshold or above the
++	 * high threshold. */
++	if(match >= 0) {
++		if(spydata->spy_thr_under[match]) {
++			if(wstats->level > spydata->spy_thr_high.level) {
++				spydata->spy_thr_under[match] = 0;
++				iw_send_thrspy_event(dev, spydata,
++						     address, wstats);
++			}
++		} else {
++			if(wstats->level < spydata->spy_thr_low.level) {
++				spydata->spy_thr_under[match] = 1;
++				iw_send_thrspy_event(dev, spydata,
++						     address, wstats);
++			}
++		}
++	}
 +}
---- /dev/null	2007-03-09 11:47:32.684268720 -0500
-+++ linux-2.6.20.noarch/net/mac80211/ieee80211_cfg.h	2007-03-20 11:29:04.000000000 -0400
-@@ -0,0 +1,9 @@
++EXPORT_SYMBOL(wireless_spy_update);
+diff --git a/net/wireless/wext.h b/net/wireless/wext.h
+new file mode 100644
+index 0000000..ced6667
+--- /dev/null
++++ b/net/wireless/wext.h
+@@ -0,0 +1,51 @@
 +/*
-+ * mac80211 configuration hooks for cfg80211
++ * some foo for wext compat/wext interoperability
 + */
-+#ifndef __IEEE80211_CFG_H
-+#define __IEEE80211_CFG_H
++#ifndef _WEXT_H
++#define _WEXT_H
++#include <linux/netdevice.h>
++#include <linux/if.h>
++#include <linux/wireless.h>
++#include <net/iw_handler.h>
 +
-+extern struct cfg80211_ops mac80211_config_ops;
++/* wext compatibility must be compiled in...
++ * this extern is in wext-compat.c */
++struct cfg80211_ioctl_ops {
++	/* used to make sure the module isn't going away
++	 * can't really happen, except if no driver has cfg80211
++	 * in use, but in that case  */
++	struct module *module;
 +
-+#endif /* __IEEE80211_CFG_H */
---- linux-2.6.20.noarch/net/ieee80211/Kconfig.orig	2007-03-20 11:27:30.000000000 -0400
-+++ linux-2.6.20.noarch/net/ieee80211/Kconfig	2007-03-20 11:29:04.000000000 -0400
-@@ -56,7 +56,8 @@ config IEEE80211_CRYPT_CCMP
- 
- config IEEE80211_CRYPT_TKIP
- 	tristate "IEEE 802.11i TKIP encryption"
--	depends on IEEE80211 && NET_RADIO
-+	depends on IEEE80211
-+	select WIRELESS_EXT
- 	select CRYPTO
- 	select CRYPTO_MICHAEL_MIC
- 	select CRYPTO_ECB
++	/* and finally this is used to do work */
++	int (*do_wext_ioctl)(struct ifreq *ifr, unsigned int cmd);
++};
++extern struct cfg80211_ioctl_ops cfg80211_ioctl_ops;
++
++
++struct iw_statistics *get_wireless_stats(struct net_device *dev,
++					 struct iw_statistics *out);
++int wireless_process_ioctl(struct ifreq *ifr, unsigned int cmd);
++
++int cfg80211_wext_ioctl(struct ifreq *ifr, unsigned int cmd);
++#ifdef CFG80211_MODULE
++int call_cfg80211_wext_ioctl(struct ifreq *ifr, unsigned int cmd);
++#else
++#define call_cfg80211_wext_ioctl cfg80211_wext_ioctl
++#endif
++
++#if defined(CONFIG_CFG80211_WEXT_COMPAT) && defined(CFG80211_MODULE)
++int cfg80211_wext_init(void);
++void cfg80211_wext_exit(void);
++#else
++static inline int cfg80211_wext_init(void)
++{
++	return 0;
++}
++static inline void cfg80211_wext_exit(void) {}
++#endif
++
++extern const struct iw_ioctl_description wext_standard_ioctl[];
++extern const unsigned wext_standard_ioctl_num;
++extern const struct iw_ioctl_description standard_event[];
++extern const int event_type_size[];
++#endif /* _WEXT_H */


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3065
retrieving revision 1.3066
diff -u -r1.3065 -r1.3066
--- kernel-2.6.spec	13 Apr 2007 20:40:51 -0000	1.3065
+++ kernel-2.6.spec	13 Apr 2007 20:44:51 -0000	1.3066
@@ -378,24 +378,22 @@
 Patch10: linux-2.6-utrace.patch
 Patch11: nouveau-drm.patch
 Patch12: git-wireless-dev.patch
-Patch13: git-wireless-dev-fixes.patch
-Patch14: git-iwlwifi.patch
-Patch15: git-iwlwifi-fixes.patch
-Patch16: linux-2.6-rt2x00-scan-fix.patch
-Patch17: linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch
+Patch13: git-iwlwifi.patch
+Patch14: git-iwlwifi-fixes.patch
+Patch15: linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch
 # FIXME: The wireless stuff really belongs in its own section given there's so much of it.
 
-Patch18: linux-2.6-fix-pmops-1.patch
-Patch19: linux-2.6-fix-pmops-2.patch
-Patch20: linux-2.6-fix-pmops-3.patch
-Patch21: linux-2.6-fix-pmops-4.patch
+Patch16: linux-2.6-fix-pmops-1.patch
+Patch17: linux-2.6-fix-pmops-2.patch
+Patch18: linux-2.6-fix-pmops-3.patch
+Patch19: linux-2.6-fix-pmops-4.patch
 
 # enable sysrq-c on all kernels, not only kexec
 # FIXME: upstream soon? When? It's been here for ages.
-Patch22: linux-2.6-sysrq-c.patch
+Patch20: linux-2.6-sysrq-c.patch
 
 # DRM bits for 965
-Patch23: linux-2.6-i965gm-support.patch
+Patch21: linux-2.6-i965gm-support.patch
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -978,27 +976,23 @@
 
 # Add the new wireless stack and drivers from wireless-dev
 %patch12 -p1
-# ...plus some fixes not yet in the wireless-dev tree
-%patch13 -p1
 # ...and the iwlwifi driver from Intel
-%patch14 -p1
+%patch13 -p1
 # ...plus some fixes not yet in Intel's tree
+%patch14 -p1
+# fix oops on ppc for bcm43xx-mac80211 w/ phy rev 1
 %patch15 -p1
-# fix up scanning in rt2x00
+# Power management fixes
 %patch16 -p1
-# fix oops on ppc for bcm43xx-mac80211 w/ phy rev 1
 %patch17 -p1
-# Power management fixes
 %patch18 -p1
 %patch19 -p1
-%patch20 -p1
-%patch21 -p1
 
 # sysrq works always
-%patch22 -p1
+%patch20 -p1
 
 # DRM support for 965GM
-%patch23 -p1
+%patch21 -p1
 
 # Architecture patches
 
@@ -2260,6 +2254,12 @@
 #  - tux.
 
 %changelog
+* Fri Apr 13 2007 John W. Linville <linville at redhat.com>
+- Update git-wireless-dev.patch
+- Remove linux-2.6-rt2x00-scan-fix.patch (obsoleted by update above)
+- Remove git-wireless-dev-fixes.patch (obsoleted by update above)
+- Update git-iwlwifi.patch
+
 * Fri Apr 13 2007 Dave Jones <davej at redhat.com>
 - Make NMI timeout a config option.
 
@@ -2288,7 +2288,7 @@
 
 * Tue Apr 11 2007 John W. Linville <linville at redhat.com>
 - Add fix for bcm43xx-mac80211 oops on ppc w/ phy rev 1
-- Set IPW_WARNING to KERN_WARN to make iwlwifi less chatty
+- Set IPW_WARNING to KERN_WARNING to make iwlwifi less chatty
 
 * Tue Apr 10 2007 John W. Linville <linville at redhat.com>
 - Add fix for using WPA with mac80211 drivers

linux-2.6-warnings-inline.patch:
 b/arch/i386/oprofile/op_model_p4.c                               |    2 -
 b/arch/powerpc/kernel/prom_init.c                                |    4 +-
 b/drivers/acpi/tables/tbfadt.c                                   |    4 +-
 b/drivers/isdn/hardware/eicon/divasmain.c                        |   12 +++----
 b/drivers/isdn/hardware/eicon/platform.h                         |    4 +-
 b/drivers/media/common/ir-functions.c                            |    2 -
 b/drivers/media/video/cx88/cx88-core.c                           |   12 +++----
 b/drivers/media/video/cx88/cx88.h                                |    4 +-
 b/drivers/net/sky2.c                                             |    2 -
 b/drivers/net/wireless/ipw2200.c                                 |    2 -
 b/drivers/scsi/tmscsim.c                                         |   16 +++++-----
 b/drivers/usb/serial/safe_serial.c                               |    2 -
 b/drivers/video/intelfb/intelfbdrv.c                             |    2 -
 b/fs/ocfs2/namei.c                                               |    2 -
 b/include/asm-powerpc/spinlock.h                                 |   10 +++---
 b/include/linux/cpuset.h                                         |    4 +-
 b/kernel/mutex.c                                                 |    2 -
 b/sound/drivers/opl4/opl4_lib.c                                  |    2 -
 b/sound/pci/au88x0/au88x0.h                                      |    4 +-
 b/sound/pci/au88x0/au88x0_core.c                                 |    4 +-
 linux-2.6.20.noarch/arch/ia64/kernel/mca.c                       |    2 -
 linux-2.6.20.noarch/arch/ia64/sn/pci/pcibr/pcibr_ate.c           |    2 -
 linux-2.6.20.noarch/arch/ia64/sn/pci/tioce_provider.c            |    4 +-
 linux-2.6.20.noarch/arch/s390/kernel/traps.c                     |    4 +-
 linux-2.6.20.noarch/drivers/char/mmtimer.c                       |   16 +++++-----
 linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c |   10 +++---
 linux-2.6.20.noarch/drivers/s390/net/ctcmain.c                   |    2 -
 linux-2.6.20.noarch/drivers/serial/ioc3_serial.c                 |    4 +-
 linux-2.6.20.noarch/drivers/serial/ioc4_serial.c                 |    4 +-
 linux-2.6.20.noarch/include/asm-powerpc/spinlock.h               |    8 ++---
 linux-2.6.20.noarch/net/mac80211/ieee80211.c                     |    6 +--
 31 files changed, 79 insertions(+), 79 deletions(-)

Index: linux-2.6-warnings-inline.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-warnings-inline.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-warnings-inline.patch	4 Apr 2007 23:45:39 -0000	1.3
+++ linux-2.6-warnings-inline.patch	13 Apr 2007 20:44:51 -0000	1.4
@@ -549,11 +549,11 @@
  
  /* Device in tx->dev has a reference added; use dev_put(tx->dev) when
   * finished with it. */
--static void inline ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
+-static int inline ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
 +static inline int ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
- 					struct sk_buff *skb,
- 					struct net_device *mdev,
- 					struct ieee80211_tx_control *control)
+ 				       struct sk_buff *skb,
+ 				       struct net_device *mdev,
+ 				       struct ieee80211_tx_control *control)
 --- linux-2.6.20.noarch/arch/ia64/kernel/mca.c~	2007-04-04 19:33:39.000000000 -0400
 +++ linux-2.6.20.noarch/arch/ia64/kernel/mca.c	2007-04-04 19:33:43.000000000 -0400
 @@ -303,7 +303,7 @@ static void ia64_mlogbuf_dump_from_init(


--- git-wireless-dev-fixes.patch DELETED ---


--- linux-2.6-rt2x00-scan-fix.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 13 20:48:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 16:48:26 -0400
Subject: rpms/control-center/devel control-center-2.18.0-be-more-async.patch,
	NONE, 1.1 control-center.spec, 1.241, 1.242
Message-ID: <200704132048.l3DKmQvH015231@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15064

Modified Files:
	control-center.spec 
Added Files:
	control-center-2.18.0-be-more-async.patch 
Log Message:
- Load settings-daemon parts more asynchronously (to help with
  bug 236296)


control-center-2.18.0-be-more-async.patch:
 gnome-settings-daemon.c |  251 ++++++++++++++++++++++++++++++++----------------
 1 files changed, 168 insertions(+), 83 deletions(-)

--- NEW FILE control-center-2.18.0-be-more-async.patch ---
--- control-center-2.18.0/gnome-settings-daemon/gnome-settings-daemon.c.be-more-async	2007-01-02 07:47:00.000000000 -0500
+++ control-center-2.18.0/gnome-settings-daemon/gnome-settings-daemon.c	2007-04-13 16:44:36.000000000 -0400
@@ -255,15 +255,179 @@
 G_DEFINE_TYPE (GnomeSettingsDaemon, gnome_settings_daemon,
                G_TYPE_OBJECT)
 
+static void load_subsystems (void);
+
+typedef void (* GnomeSettingsSubsystemInitFunc) (GConfClient *client);
+
+static GnomeSettingsSubsystemInitFunc subsystem_init_funcs[] = 
+{
+/*  gnome_settings_disk_init  */
+  gnome_settings_font_init,
+  gnome_settings_xsettings_init,
+  gnome_settings_mouse_init,
+  gnome_settings_keyboard_xkb_init,
+  gnome_settings_keyboard_init,
+  gnome_settings_multimedia_keys_init,
+/* */
+  gnome_settings_sound_init,
+  gnome_settings_accessibility_keyboard_init,
+  gnome_settings_screensaver_init,
+  gnome_settings_default_editor_init,
+  gnome_settings_background_init,
+  gnome_settings_keybindings_init,
+  gnome_settings_gtk1_theme_init,
+  gnome_settings_xrdb_init,
+  gnome_settings_typing_break_init,
+  (GnomeSettingsSubsystemInitFunc) load_subsystems,
+  NULL
+};
+
+static gboolean
+call_init_func_and_queue_next (guint func_index)
+{
+  GConfClient *client;
+
+  client = gnome_settings_daemon_get_conf_client ();
+
+  subsystem_init_funcs[func_index] (client);
+
+  if (subsystem_init_funcs[func_index + 1] != NULL)
+    g_idle_add ((GSourceFunc) call_init_func_and_queue_next,
+                GUINT_TO_POINTER (func_index + 1));
+  
+  return FALSE;
+}
+
+static void
+initialize_subsystems (void)
+{
+  /* Essential - xkb initialization should happen before */
+  gnome_settings_keyboard_xkb_set_post_activation_callback ((PostActivationCallback)gnome_settings_load_modmap_files, NULL);
+
+  g_idle_add ((GSourceFunc) call_init_func_and_queue_next,
+              GUINT_TO_POINTER (0));
+}
+
+typedef void (* GnomeSettingsSubsystemLoadFunc) (GConfClient *client);
+
+static GnomeSettingsSubsystemLoadFunc subsystem_load_funcs[] = 
+{
+/* gnome_settings_disk_load,*/
+  gnome_settings_font_load,
+  gnome_settings_xsettings_load,
+  gnome_settings_mouse_load,
+  gnome_settings_keyboard_xkb_load,
+  gnome_settings_keyboard_load,
+  gnome_settings_multimedia_keys_load,
+  gnome_settings_sound_load,
+  gnome_settings_accessibility_keyboard_load,
+  gnome_settings_screensaver_load,
+  gnome_settings_default_editor_load,
+  gnome_settings_background_load,
+  gnome_settings_keybindings_load,
+  gnome_settings_gtk1_theme_load,
+  gnome_settings_xrdb_load,
+  gnome_settings_typing_break_load,
+  NULL
+};
+
+static gboolean
+call_load_func_and_queue_next (guint func_index)
+{
+  GConfClient *client;
+
+  client = gnome_settings_daemon_get_conf_client ();
+
+  subsystem_load_funcs[func_index] (client);
+
+  if (subsystem_load_funcs[func_index + 1] != NULL)
+    g_idle_add ((GSourceFunc) call_load_func_and_queue_next,
+                GUINT_TO_POINTER (func_index + 1));
+  
+  return FALSE;
+}
+
+static void
+load_subsystems (void)
+{
+  g_idle_add ((GSourceFunc) call_load_func_and_queue_next,
+              GUINT_TO_POINTER (0));
+}
+
+static void
+watch_for_xsetting_changes (void)
+{
+  GdkDisplay *display;
+  int i;
+  int n_screens;
+
+  display = gdk_display_get_default ();
+  n_screens = gdk_display_get_n_screens (display);
+
+  for (i = 0; i < n_screens; i++) 
+    {
+      GdkScreen *screen;
+
+      screen = gdk_display_get_screen (display, i);
+      gdk_window_add_filter (
+		gdk_screen_get_root_window (screen),
+		manager_event_filter, GINT_TO_POINTER (i));
+    }
+}
+
+static void
+watch_for_configuration_changes (void)
+{
+  GConfClient *client;
+  GSList *list;
+
+  client = gnome_settings_daemon_get_conf_client ();
+
+  for (list = directories; list; list = list->next)
+    {
+      GError *error = NULL;
+      DirElement *dir_element = list->data;
+
+      gconf_client_add_dir (client,
+			    dir_element->dir,
+			    GCONF_CLIENT_PRELOAD_ONELEVEL,
+			    NULL);
+      
+      gconf_client_notify_add (client,
+                               dir_element->dir,
+                               config_notify,
+                               NULL,
+			       NULL,
+                               &error);
+
+      if (error)
+        {
+          fprintf (stderr, "Could not listen for changes to configuration in '%s': %s\n",
+                   dir_element->dir, error->message);
+          g_error_free (error);
+        }
+    }
+}
+
+static gboolean
+initialize_and_load (GnomeSettingsDaemon *daemon)
+{
+  GObject *dbus_service;
+  
+  dbus_service = g_object_new (gnome_settings_server_get_type (), NULL);
+
+  initialize_subsystems ();
+  watch_for_xsetting_changes ();
+  watch_for_configuration_changes ();
+  return FALSE;
+}
+
 GObject *
 gnome_settings_daemon_new (void)
 {
   gboolean terminated = FALSE;
-  GConfClient *client;
-  GSList *list;
   GnomeSettingsDaemon *daemon;
   GdkDisplay *display;
-  GObject *dbusServer;
   int i;
   int n_screens;
 
@@ -316,86 +480,7 @@
 						 NULL);
     }
 
-  /* We use GConfClient not GConfClient because a cache isn't useful
-   * for us
-   */
-  client = gnome_settings_daemon_get_conf_client ();
-
-/*  gnome_settings_disk_init (client);*/
-  gnome_settings_font_init (client);
-  gnome_settings_xsettings_init (client);
-  gnome_settings_mouse_init (client);
-/* Essential - xkb initialization should happen before */
-  gnome_settings_keyboard_xkb_set_post_activation_callback ((PostActivationCallback)gnome_settings_load_modmap_files, NULL);
-  gnome_settings_keyboard_xkb_init (client);
-  gnome_settings_keyboard_init (client);
-  gnome_settings_multimedia_keys_init (client);
-/* */
-  gnome_settings_sound_init (client);
-  gnome_settings_accessibility_keyboard_init (client);
-  gnome_settings_screensaver_init (client);
-  gnome_settings_default_editor_init (client);
-  gnome_settings_background_init (client);
-  gnome_settings_keybindings_init (client);
-  gnome_settings_gtk1_theme_init (client);
-  gnome_settings_xrdb_init (client);
-  gnome_settings_typing_break_init (client);
-
-  for (list = directories; list; list = list->next)
-    {
-      GError *error = NULL;
-      DirElement *dir_element = list->data;
-
-      gconf_client_add_dir (client,
-			    dir_element->dir,
-			    GCONF_CLIENT_PRELOAD_ONELEVEL,
-			    NULL);
-      
-      gconf_client_notify_add (client,
-                               dir_element->dir,
-                               config_notify,
-                               NULL,
-			       NULL,
-                               &error);
-
-      if (error)
-        {
-          fprintf (stderr, "Could not listen for changes to configuration in '%s': %s\n",
-                   dir_element->dir, error->message);
-          g_error_free (error);
-        }
-    }
-
-  for (i = 0; i < n_screens; i++) 
-    {
-      GdkScreen *screen;
-
-      screen = gdk_display_get_screen (display, i);
-      gdk_window_add_filter (
-		gdk_screen_get_root_window (screen),
-		manager_event_filter, GINT_TO_POINTER (i));
-    }
-
-/*  gnome_settings_disk_load (client);*/
-  gnome_settings_font_load (client);
-  gnome_settings_xsettings_load (client);
-  gnome_settings_mouse_load (client);
-/* Essential - xkb initialization should happen before */
-  gnome_settings_keyboard_xkb_load (client);
-  gnome_settings_keyboard_load (client);
-  gnome_settings_multimedia_keys_load (client);
-/* */
-  gnome_settings_sound_load (client);
-  gnome_settings_accessibility_keyboard_load (client);
-  gnome_settings_screensaver_load (client);
-  gnome_settings_default_editor_load (client);
-  gnome_settings_background_load (client);
-  gnome_settings_keybindings_load (client);
-  gnome_settings_gtk1_theme_load (client);
-  gnome_settings_xrdb_load (client);
-  gnome_settings_typing_break_load (client);
-
-  dbusServer = g_object_new (gnome_settings_server_get_type (), NULL);
+  g_idle_add ((GSourceFunc) initialize_and_load, daemon);
 
   return G_OBJECT (daemon);
 }


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- control-center.spec	12 Apr 2007 18:20:40 -0000	1.241
+++ control-center.spec	13 Apr 2007 20:48:24 -0000	1.242
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.18.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -58,6 +58,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=425650
 Patch15: control-center-2.18.0-ellipsize-sound-devices.patch
 
+# http://
+Patch16: control-center-2.18.0-be-more-async.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: control-center-2.17.91-passwd.patch
 Patch96: control-center-2.17.92-gecos.patch
@@ -173,6 +176,7 @@
 %patch13 -p1 -b .no-gnome-common
 #%patch14 -p1 -b .gnome-bg
 %patch15 -p1 -b .ellipsize-sound-devices
+%patch16 -p1 -b .be-more-async
 
 
 # vendor configuration patches
@@ -324,6 +328,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Apr 13 2007 Ray Strode <rstrode at redhat.com> - 2.18.0-9
+- Load settings-daemon parts more asynchronously (to help with
+  bug 236296)
+
 * Thu Apr 12 2007 David Zeuthen <davidz at redhat.com> - 2.18.0-8
 - Disable start-at-helper patch for now (#223669)
 - Disable gnome-bg patch as it's empty



From fedora-cvs-commits at redhat.com  Fri Apr 13 20:56:19 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 16:56:19 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.401, 1.402 anaconda.spec, 1.531,
	1.532 sources, 1.526, 1.527
Message-ID: <200704132056.l3DKuJ3P020979@cvs.devel.redhat.com>

Author: katzj

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -r1.401 -r1.402
--- .cvsignore	12 Apr 2007 22:21:44 -0000	1.401
+++ .cvsignore	13 Apr 2007 20:56:17 -0000	1.402
@@ -1 +1 @@
-anaconda-11.2.0.48.tar.bz2
+anaconda-11.2.0.49.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.531
retrieving revision 1.532
diff -u -r1.531 -r1.532
--- anaconda.spec	12 Apr 2007 22:21:44 -0000	1.531
+++ anaconda.spec	13 Apr 2007 20:56:17 -0000	1.532
@@ -1,7 +1,7 @@
 %define livearches %{ix86} x86_64
 
 Name: anaconda
-Version: 11.2.0.48
+Version: 11.2.0.49
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -142,7 +142,11 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
-* Thu Apr 12 2007 David Cantrell <dcantrell at redhat.com - 11.2.0.48-1
+* Fri Apr 13 2007 Jeremy Katz <katzj at redhat.com> - 11.2.0.49-1
+- Fix SELinux labels on moved files with live install (#236282)
+- Add vmmouse driver
+
+* Thu Apr 12 2007 David Cantrell <dcantrell at redhat.com> - 11.2.0.48-1
 - Don't write out remove lines for packages that don't exist on the
   installation arch (clumens)
 - Remove unused code from partedUtils.py (clumens)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.526
retrieving revision 1.527
diff -u -r1.526 -r1.527
--- sources	12 Apr 2007 22:21:44 -0000	1.526
+++ sources	13 Apr 2007 20:56:17 -0000	1.527
@@ -1 +1 @@
-62fb1da131b5df8ef50f8290fdde356b  anaconda-11.2.0.48.tar.bz2
+26da9bf1e7392fe8fc657065dfd609a8  anaconda-11.2.0.49.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr 13 21:54:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 17:54:32 -0400
Subject: rpms/gnome-power-manager/devel .cvsignore, 1.31,
	1.32 gnome-power-manager.spec, 1.81, 1.82 sources, 1.31, 1.32
Message-ID: <200704132154.l3DLsWMv013648@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13634

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
- Update to 2.18.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	23 Mar 2007 21:19:02 -0000	1.31
+++ .cvsignore	13 Apr 2007 21:54:28 -0000	1.32
@@ -1 +1 @@
-gnome-power-manager-2.18.1.tar.bz2
+gnome-power-manager-2.18.2.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- gnome-power-manager.spec	31 Mar 2007 22:25:53 -0000	1.81
+++ gnome-power-manager.spec	13 Apr 2007 21:54:28 -0000	1.82
@@ -4,8 +4,8 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.18.1
-Release: 2%{?dist}
+Version: 2.18.2
+Release: 1%{?dist}
 License: GPL
 Group: Applications/System
 Source: http://ftp.gnome.org/pub/gnome/sources/gnome-power-manager/2.18/gnome-power-manager-%{version}.tar.bz2
@@ -126,6 +126,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* Fri Apr 13 2007 Ray Strode <rstrode at redhat.com> - 2.18.2-1
+- Update to 2.18.2
+
 * Sat Mar 31 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.1-2
 - Add bug-buddy support to the applets 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	23 Mar 2007 21:19:02 -0000	1.31
+++ sources	13 Apr 2007 21:54:28 -0000	1.32
@@ -1 +1 @@
-8cc94654608f649214aa3a0c9b792fe5  gnome-power-manager-2.18.1.tar.bz2
+0f8412b9c6d800886d2ba479a47c73ea  gnome-power-manager-2.18.2.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr 13 22:03:29 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 18:03:29 -0400
Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.82,1.83
Message-ID: <200704132203.l3DM3TGa013896@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13869

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



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- gnome-power-manager.spec	13 Apr 2007 21:54:28 -0000	1.82
+++ gnome-power-manager.spec	13 Apr 2007 22:03:25 -0000	1.83
@@ -11,8 +11,6 @@
 Source: http://ftp.gnome.org/pub/gnome/sources/gnome-power-manager/2.18/gnome-power-manager-%{version}.tar.bz2
 Patch0: gnome-power-manager-2.15.4-nodefaultbeep.patch
 Patch1: gnome-power-manager-2.17.92-dpms-query-less.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=425000
-Patch2: gnome-power-manager-2.18.1-bug-buddy.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gnome-power.sourceforge.net/
 BuildPrereq: libgnomeui-devel
@@ -49,7 +47,6 @@
 %setup -q
 %patch0 -p1 -b .nodefaultbeep
 %patch1 -p1 -b .dpms-query
-%patch2 -p1 -b .bug-buddy
 
 %build
 %configure \



From fedora-cvs-commits at redhat.com  Fri Apr 13 22:30:04 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 18:30:04 -0400
Subject: rpms/dovecot/devel dovecot.spec,1.75,1.76
Message-ID: <200704132230.l3DMU4Aq014449@cvs.devel.redhat.com>

Author: tjanouse

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

Modified Files:
	dovecot.spec 
Log Message:
* Sat Apr 14 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0.0-11.1
- dovecot-1.0.beta2-pam-tty.patch is no longer needed



Index: dovecot.spec
===================================================================
RCS file: /cvs/dist/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- dovecot.spec	13 Apr 2007 12:31:23 -0000	1.75
+++ dovecot.spec	13 Apr 2007 22:30:02 -0000	1.76
@@ -1,7 +1,7 @@
 %define upstream 1.0.0
 %define sieve_upstream 1.0.1
 %define pkg_version 1.0.0
-%define my_release 11
+%define my_release 11.1
 %define pkg_release %{my_release}%{?dist}
 %define pkg_sieve_version 1.0.1
 %define pkg_sieve_release %{my_release}%{?dist}
@@ -29,7 +29,7 @@
 Source7: dovecot-REDHAT-FAQ.txt
 Source8: http://dovecot.org/releases/sieve/%{sieve_name}-%{sieve_upstream}.tar.gz
 Patch100: dovecot-1.0.rc15-default-settings.patch
-Patch101: dovecot-1.0.beta2-pam-tty.patch
+#Patch101: dovecot-1.0.beta2-pam-tty.patch
 Patch102: dovecot-1.0.rc2-pam-setcred.patch
 Patch103: dovecot-1.0.beta2-mkcert-permissions.patch
 # 104 not applied
@@ -102,7 +102,7 @@
 %setup -q -n %{name}-%{upstream}
 
 %patch100 -p1 -b .default-settings
-%patch101 -p2 -b .pam-tty
+#%patch101 -p2 -b .pam-tty
 %patch102 -p1 -b .pam-setcred
 %patch103 -p1 -b .mkcert-permissions
 #%patch104 -p1 -b .lib64
@@ -295,6 +295,9 @@
 
 
 %changelog
+* Sat Apr 14 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0.0-11.1
+- dovecot-1.0.beta2-pam-tty.patch is no longer needed
+
 * Fri Apr 13 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0.0-11
 - update to latest upstream
 



From fedora-cvs-commits at redhat.com  Fri Apr 13 22:35:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 18:35:31 -0400
Subject: rpms/gnome-mount/devel gnome-mount.spec,1.27,1.28
Message-ID: <200704132235.l3DMZV9C030740@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-mount.spec 
Log Message:
Fix GConf scriptlets



Index: gnome-mount.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gnome-mount.spec	12 Apr 2007 19:19:27 -0000	1.27
+++ gnome-mount.spec	13 Apr 2007 22:35:28 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Mount replacement which uses HAL to do the mounting 
 Name: gnome-mount
 Version: 0.6
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 License: GPL
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
@@ -68,8 +68,14 @@
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-mount.schemas > /dev/null || :
 
+%pre
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnome-mount.schemas > /dev/null || :
+fi
+
 %preun
-if [ "$1" -gt 0 ]; then
+if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnome-mount.schemas > /dev/null || :
 fi
@@ -94,6 +100,9 @@
 %{_libdir}/nautilus/extensions-1.0/libgnome-mount.so
 
 %changelog
+* Sat Apr 14 2007 Matthias Clasen <mclasen at redhat.com> - 0.6.2
+- Fix the GConf scriptlets (#234716)
+
 * Thu Apr 12 2007 David Zeuthen <davidz at redhat.com> - 0.6-1
 - Update to upstream release 0.6
 - No significant changes apart from better i18n coverage



From fedora-cvs-commits at redhat.com  Fri Apr 13 23:23:54 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 19:23:54 -0400
Subject: rpms/gnome-session/devel gnome-session.spec,1.117,1.118
Message-ID: <200704132323.l3DNNsJb001115@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-session.spec 
Log Message:
Require dbus-x11



Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- gnome-session.spec	12 Apr 2007 18:48:53 -0000	1.117
+++ gnome-session.spec	13 Apr 2007 23:23:52 -0000	1.118
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.18.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.gnome.org
 Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-session/2.18/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -32,6 +32,9 @@
 Requires: gnome-volume-manager
 %endif
 
+# pull in dbus-x11, see bug 209924
+Requires: dbus-x11
+
 ## we conflict with gdm that contains the GNOME gdm xsession
 Conflicts: gdm < 1:2.6.0.8-5
 
@@ -199,6 +202,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/session-properties.svg
 
 %changelog
+* Sat Apr 14 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-5
+- Add a dependency on dbus-x11
+
 * Thu Apr 12 2007 David Zeuthen <davidz at redhat.com> - 2.18.0-4
 - start same kind of AT's in session as started in gdm (#229912)
 



From fedora-cvs-commits at redhat.com  Fri Apr 13 23:30:00 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 19:30:00 -0400
Subject: rpms/dbus/devel dbus.spec,1.117,1.118
Message-ID: <200704132330.l3DNU0h0005637@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4136

Modified Files:
	dbus.spec 
Log Message:
move dbus-launch man page to x11 subpackage



Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- dbus.spec	12 Apr 2007 19:13:54 -0000	1.117
+++ dbus.spec	13 Apr 2007 23:29:58 -0000	1.118
@@ -8,7 +8,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 1.0.2 
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
 Source1: doxygen_to_devhelp.xsl
@@ -165,7 +165,11 @@
 /bin/dbus-monitor
 /bin/dbus-uuidgen
 /%{_lib}/*dbus-1*.so.*
-%{_datadir}/man/man*/*
+%{_datadir}/man/man*/dbus-cleanup-sockets.1.gz
+%{_datadir}/man/man*/dbus-daemon.1.gz
+%{_datadir}/man/man*/dbus-monitor.1.gz
+%{_datadir}/man/man*/dbus-send.1.gz
+%{_datadir}/man/man*/dbus-uuidgen.1.gz
 %dir %{_datadir}/dbus-1
 %{_datadir}/dbus-1/services
 
@@ -173,6 +177,7 @@
 %defattr(-,root,root)
 
 %{_bindir}/dbus-launch
+%{_datadir}/man/man*/dbus-launch.1.gz
 
 %files devel
 %defattr(-,root,root)
@@ -185,6 +190,9 @@
 %{_datadir}/devhelp/books/dbus
 
 %changelog
+* Sat Apr 14 2007 Matthias Clasen <mclasen at redhat.com> - 1.0.2-4
+- Move the dbus-launch man page to the x11 subpackage
+
 * Thu Apr 12 2007 David Zeuthen <davidz at redhat.com> - 1.0.2-3
 - Start SELinux thread after setuid call (#221168)
 



From fedora-cvs-commits at redhat.com  Sat Apr 14 00:14:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 20:14:30 -0400
Subject: rpms/kudzu/devel .cvsignore, 1.148, 1.149 kudzu.spec, 1.169,
	1.170 sources, 1.165, 1.166 kudzu-1.2.67-sizeof.patch, 1.1,
	NONE kudzu-1.2.67-zlib.patch, 1.1, NONE
Message-ID: <200704140014.l3E0EUit005868@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5851

Modified Files:
	.cvsignore kudzu.spec sources 
Removed Files:
	kudzu-1.2.67-sizeof.patch kudzu-1.2.67-zlib.patch 
Log Message:
1.2.68-1

Resolves: bug #227281



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- .cvsignore	29 Mar 2007 17:25:09 -0000	1.148
+++ .cvsignore	14 Apr 2007 00:14:28 -0000	1.149
@@ -1 +1 @@
-kudzu-1.2.67.tar.gz
+kudzu-1.2.68.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- kudzu.spec	5 Apr 2007 20:14:34 -0000	1.169
+++ kudzu.spec	14 Apr 2007 00:14:28 -0000	1.170
@@ -1,20 +1,17 @@
 Name: kudzu
-Version: 1.2.67
-Release: 2
+Version: 1.2.68
+Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
 Group: Applications/System
-URL: http://fedora.redhat.com/projects/additional-projects/kudzu/
 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
 Conflicts: netconfig < 0.8.18, kernel < 2.6.13, initscripts < 8.40-1
 Requires: hwdata >= 0.169-1, hal >= 0.2.96
-BuildPrereq: pciutils-devel >= 2.2.3-4, python-devel python gettext, zlib-devel
+BuildPrereq: pciutils-devel >= 2.2.3-4, python-devel python gettext zlib-devel
 BuildRoot: %{_tmppath}/%{name}-root
-Patch0: kudzu-1.2.67-zlib.patch
-Patch1: kudzu-1.2.67-sizeof.patch
 
 %description
 Kudzu is a hardware probing tool run at system boot time to determine
@@ -32,8 +29,6 @@
 %prep
 
 %setup
-%patch0 -p1 -b .zlib
-%patch1 -p1 -b .sizeof
 
 %build
 ln -s `pwd` kudzu
@@ -77,9 +72,10 @@
 %{_includedir}/kudzu
 
 %changelog
-* Thu Apr  5 2007 Peter Jones <pjones at redhat.com>- 1.2.67-2
-- Fix size of memset in pci scanning
-- require zlib during build
+* Fri Apr 13 2007 Bill Nottingham <notting at redhat.com> - 1.2.68-1
+- pata_hpt* matching (#227281)
+- Fix size of memset in pci scanning (<pjones at redhat.com>)
+- require zlib during build (<pjones at redhat.com>)
 
 * Thu Mar 29 2007 Jeremy Katz <katzj at redhat.com> - 1.2.67-1
 - try to get the "best" match for a pci device when matching aliases 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- sources	29 Mar 2007 17:25:09 -0000	1.165
+++ sources	14 Apr 2007 00:14:28 -0000	1.166
@@ -1 +1 @@
-1b8ad21cd631c304fccc71d43c98db02  kudzu-1.2.67.tar.gz
+8a90261b4ca99ba65fbfdc99e7f97078  kudzu-1.2.68.tar.gz


--- kudzu-1.2.67-sizeof.patch DELETED ---


--- kudzu-1.2.67-zlib.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sat Apr 14 03:06:03 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 13 Apr 2007 23:06:03 -0400
Subject: rpms/evolution/devel evolution-2.10.1-fix-help.patch, NONE,
	1.1 evolution.spec, 1.244, 1.245
Message-ID: <200704140306.l3E363S6003522@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.10.1-fix-help.patch 
Log Message:

* Fri Apr 13 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-3.fc7
- Add patch for RH bug #235878 (make Help->Contents work again).


evolution-2.10.1-fix-help.patch:
 addressbook/gui/contact-editor/e-contact-editor.c   |   11 ++--
 calendar/gui/dialogs/comp-editor.c                  |   11 ++--
 composer/e-msg-composer.c                           |   11 ++--
 plugins/exchange-operations/exchange-send-options.c |   25 ++++------
 shell/e-shell-window.c                              |    2 
 widgets/misc/e-multi-config-dialog.c                |   11 ++--
 widgets/misc/e-send-options.c                       |   50 +++++++++-----------
 7 files changed, 57 insertions(+), 64 deletions(-)

--- NEW FILE evolution-2.10.1-fix-help.patch ---
--- evolution-2.10.1/widgets/misc/e-multi-config-dialog.c.fix-help	2007-04-09 09:10:24.000000000 -0400
+++ evolution-2.10.1/widgets/misc/e-multi-config-dialog.c	2007-04-13 22:26:25.000000000 -0400
@@ -192,13 +192,12 @@
 
 	switch (response_id) {
 	case GTK_RESPONSE_HELP:
-		gnome_help_display_desktop (NULL,
-					    "evolution-" BASE_VERSION,
-					    "evolution-" BASE_VERSION ".xml", 
-					    "config-prefs",
-					    &error);
-		if (error != NULL)
+		gnome_help_display (
+			"evolution.xml", "config-prefs", &error);
+		if (error != NULL) {
 			g_warning ("%s", error->message);
+			g_error_free (error);
+		}
 		break;
 	case GTK_RESPONSE_CLOSE:
 	default:
--- evolution-2.10.1/widgets/misc/e-send-options.c.fix-help	2007-04-13 22:25:21.000000000 -0400
+++ evolution-2.10.1/widgets/misc/e-send-options.c	2007-04-13 22:26:25.000000000 -0400
@@ -588,34 +588,32 @@
 
 static void e_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data)
 {
+	ESendOptionsDialogPrivate *priv;
+	ESendOptionsDialog *sod;
+	GError *error = NULL;     
 
-    ESendOptionsDialogPrivate *priv;
-    ESendOptionsDialog *sod;
-    GError *error = NULL;     
-
-    sod = func_data;
-    priv = sod->priv;
-	
-    switch (state) {
-	case GTK_RESPONSE_OK:
-	    e_send_options_get_widgets_data (sod);
-	case GTK_RESPONSE_CANCEL:
-	    gtk_widget_hide (priv->main);
-	    gtk_widget_destroy (priv->main);
-	    g_object_unref (priv->xml);
-	    break;
-	case GTK_RESPONSE_HELP:
-	gnome_help_display_desktop (NULL,
-				    "evolution-" BASE_VERSION,
-				    "evolution-" BASE_VERSION ".xml",
-				    priv->help_section,
-				    &error);
-	    if (error != NULL)
-		g_warning ("%s", error->message);
-	    break;
-    }
-    g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state);
+	sod = func_data;
+	priv = sod->priv;
+
+	switch (state) {
+		case GTK_RESPONSE_OK:
+			e_send_options_get_widgets_data (sod);
+		case GTK_RESPONSE_CANCEL:
+			gtk_widget_hide (priv->main);
+			gtk_widget_destroy (priv->main);
+			g_object_unref (priv->xml);
+			break;
+		case GTK_RESPONSE_HELP:
+			gnome_help_display (
+				"evolution.xml", priv->help_section, &error);
+			if (error != NULL) {
+				g_warning ("%s", error->message);
+				g_error_free (error);
+			}
+    			break;
+	}
 
+	g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state);
 }
 
 gboolean 
--- evolution-2.10.1/plugins/exchange-operations/exchange-send-options.c.fix-help	2007-04-13 22:25:21.000000000 -0400
+++ evolution-2.10.1/plugins/exchange-operations/exchange-send-options.c	2007-04-13 22:26:25.000000000 -0400
@@ -191,21 +191,20 @@
 	
 	switch (state) {
 		case GTK_RESPONSE_OK:
-		     exchange_send_options_get_widgets_data (sod);	
+			exchange_send_options_get_widgets_data (sod);	
 		case GTK_RESPONSE_CANCEL:
-		     gtk_widget_hide (priv->main);
-	    	     gtk_widget_destroy (priv->main);
-	             g_object_unref (priv->xml);
-	             break;	     
+			gtk_widget_hide (priv->main);
+			gtk_widget_destroy (priv->main);
+			g_object_unref (priv->xml);
+			break;	     
 		case GTK_RESPONSE_HELP:
-		     gnome_help_display_desktop (NULL,
-				    "evolution-" BASE_VERSION,
-				    "evolution-" BASE_VERSION ".xml",
-				    priv->help_section,
-				    &error); 	
-		     if (error != NULL)
-			g_warning ("%s", error->message);
-	    	     break;
+			gnome_help_display (
+				"evolution.xml", priv->help_section, &error);
+			if (error != NULL) {
+				g_warning ("%s", error->message);
+				g_error_free (error);
+			}
+			break;
 	}
 	g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state);
 
--- evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor.c.fix-help	2007-04-13 22:25:21.000000000 -0400
+++ evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor.c	2007-04-13 22:26:02.000000000 -0400
@@ -3235,13 +3235,12 @@
 {
 	GError *error = NULL;
 
-	gnome_help_display_desktop (NULL,
-				    "evolution-" BASE_VERSION,
-				    "evolution-" BASE_VERSION ".xml",
-				    "usage-contact-cards",
-				    &error);
-	if (error != NULL)
+	gnome_help_display (
+		"evolution.xml", "usage-contact-cards", &error);
+	if (error != NULL) {
 		g_warning ("%s", error->message);
+		g_error_free (error);
+	}
 }
 
 static GList *
--- evolution-2.10.1/composer/e-msg-composer.c.fix-help	2007-04-13 22:25:21.000000000 -0400
+++ evolution-2.10.1/composer/e-msg-composer.c	2007-04-13 22:26:25.000000000 -0400
@@ -2886,13 +2886,12 @@
 	GError *error = NULL;
 	EMsgComposerPrivate *p = composer->priv;
 
-	gnome_help_display_desktop (NULL,
-				    "evolution-" BASE_VERSION,
-				    "evolution-" BASE_VERSION ".xml",
-				    "usage-composer",
-				    &error);
-	if (error != NULL)
+	gnome_help_display (
+		"evolution.xml", "usage-composer", &error);
+	if (error != NULL) {
 		g_warning ("%s", error->message);
+		g_error_free (error);
+	}
 }
 
 
--- evolution-2.10.1/shell/e-shell-window.c.fix-help	2007-04-13 22:25:21.000000000 -0400
+++ evolution-2.10.1/shell/e-shell-window.c	2007-04-13 22:26:02.000000000 -0400
@@ -1042,7 +1042,7 @@
 	bonobo_ui_util_set_ui (priv->ui_component,
 			       PREFIX,
 			       xmlfile,
-			       "evolution-" BASE_VERSION, NULL);
+			       "evolution", NULL);
 	g_free (xmlfile);
 
 	e_shell_window_commands_setup (window);
--- evolution-2.10.1/calendar/gui/dialogs/comp-editor.c.fix-help	2007-04-13 22:25:21.000000000 -0400
+++ evolution-2.10.1/calendar/gui/dialogs/comp-editor.c	2007-04-13 22:26:25.000000000 -0400
@@ -1693,13 +1693,12 @@
 
 	priv = editor->priv;
 
-	gnome_help_display_desktop (NULL,
-				    "evolution-" BASE_VERSION,
-				    "evolution-" BASE_VERSION ".xml",
-				    priv->help_section,
-				    &error);
-	if (error != NULL)
+	gnome_help_display (
+		"evolution.xml", priv->help_section, &error);
+	if (error != NULL) {
 		g_warning ("%s", error->message);
+		g_error_free (error);
+	}
 }
 
 


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- evolution.spec	11 Apr 2007 03:11:35 -0000	1.244
+++ evolution.spec	14 Apr 2007 03:06:01 -0000	1.245
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -161,6 +161,9 @@
 # GNOME bug #427939 (gnome-doc-utils)
 Patch48: evolution-2.10.1-fix-gnome-doc-utils.patch
 
+# RH bug 235878 / GNOME bug #386503
+Patch49: evolution-2.10.1-fix-help.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -314,6 +317,7 @@
 %patch46 -p1 -b .use-glib-i18n
 %patch47 -p1 -b .drop-old-glib-support
 %patch48 -p1 -b .fix-gnome-doc-utils
+%patch49 -p1 -b .fix-help
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -730,6 +734,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Fri Apr 13 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-3.fc7
+- Add patch for RH bug #235878 (make Help->Contents work again).
+
 * Tue Apr 10 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-2.fc7
 - Revise patch for GNOME bug #362638 to fix RH bug #235096
   (crash when displaying a mail server message to user).



From fedora-cvs-commits at redhat.com  Sat Apr 14 15:21:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 14 Apr 2007 11:21:09 -0400
Subject: rpms/binutils/devel binutils-2.17.50.0.12-rh235747.patch, NONE,
	1.1 binutils.spec, 1.114, 1.115
Message-ID: <200704141521.l3EFL9gs026599@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	binutils.spec 
Added Files:
	binutils-2.17.50.0.12-rh235747.patch 
Log Message:
2.17.50.0.12-4

binutils-2.17.50.0.12-rh235747.patch:
 elflink.c |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

--- NEW FILE binutils-2.17.50.0.12-rh235747.patch ---
2007-04-14  Jakub Jelinek  <jakub at redhat.com>

	* elflink.c (bfd_elf_final_link): Don't free symbuf for
	non-elf input bfds.
	(bfd_elf_size_dynamic_sections): Don't access elf_section_data
	for non-elf input bfds.

--- bfd/elflink.c.jj	2007-04-07 10:19:03.000000000 +0200
+++ bfd/elflink.c	2007-04-14 14:49:15.000000000 +0200
@@ -5522,15 +5522,16 @@ bfd_elf_size_dynamic_sections (bfd *outp
 
 	      for (sub = info->input_bfds; sub != NULL;
 		   sub = sub->link_next)
-		for (o = sub->sections; o != NULL; o = o->next)
-		  if (elf_section_data (o)->this_hdr.sh_type
-		      == SHT_PREINIT_ARRAY)
-		    {
-		      (*_bfd_error_handler)
-			(_("%B: .preinit_array section is not allowed in DSO"),
-			 sub);
-		      break;
-		    }
+		if (bfd_get_flavour (sub) == bfd_target_elf_flavour)
+		  for (o = sub->sections; o != NULL; o = o->next)
+		    if (elf_section_data (o)->this_hdr.sh_type
+			== SHT_PREINIT_ARRAY)
+		      {
+			(*_bfd_error_handler)
+			  (_("%B: .preinit_array section is not allowed in DSO"),
+			   sub);
+			break;
+		      }
 
 	      bfd_set_error (bfd_error_nonrepresentable_section);
 	      return FALSE;
@@ -9533,7 +9534,8 @@ bfd_elf_final_link (bfd *abfd, struct bf
   if (!info->reduce_memory_overheads)
     {
       for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
-	if (elf_tdata (sub)->symbuf)
+	if (bfd_get_flavour (sub) == bfd_target_elf_flavour
+	    && elf_tdata (sub)->symbuf)
 	  {
 	    free (elf_tdata (sub)->symbuf);
 	    elf_tdata (sub)->symbuf = NULL;


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- binutils.spec	14 Mar 2007 10:00:36 -0000	1.114
+++ binutils.spec	14 Apr 2007 15:21:02 -0000	1.115
@@ -1,7 +1,7 @@
 Summary: A GNU collection of binary utilities.
 Name: binutils
 Version: 2.17.50.0.12
-Release: 3
+Release: 4
 License: GPL
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -14,6 +14,7 @@
 Patch6: binutils-2.17.50.0.12-build-fixes.patch
 Patch7: binutils-2.17.50.0.12-symbolic-envvar-revert.patch
 Patch8: binutils-2.17.50.0.12-osabi.patch
+Patch9: binutils-2.17.50.0.12-rh235747.patch
 
 Buildroot: %{_tmppath}/binutils-root
 BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison
@@ -63,6 +64,7 @@
 %patch6 -p0 -b .build-fixes~
 %patch7 -p0 -b .tekhex~
 %patch8 -p0 -b .osabi~
+%patch9 -p0 -b .rh235747~
 
 # On ppc64 we might use 64K pages
 sed -i -e '/#define.*ELF_COMMONPAGESIZE/s/0x1000$/0x10000/' bfd/elf*ppc.c
@@ -212,6 +214,9 @@
 %{_infodir}/bfd*info*
 
 %changelog
+* Sat Apr 14 2007 Jakub Jelinek <jakub at redhat.com> 2.17.50.0.12-4
+- fix linking non-ELF input objects into ELF output (#235747)
+
 * Wed Mar 14 2007 Jakub Jelinek <jakub at redhat.com> 2.17.50.0.12-3
 - don't require matching ELF_OSABI for target vecs with ELFOSABI_NONE,
   only prefer specific osabi target vecs over the generic ones



From fedora-cvs-commits at redhat.com  Sat Apr 14 17:25:05 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 14 Apr 2007 13:25:05 -0400
Subject: rpms/kernel/devel linux-2.6-powerpc-reserve-initrd-1.patch, NONE,
	1.1 linux-2.6-powerpc-reserve-initrd-2.patch, NONE,
	1.1 linux-2.6-ps3-sysbus-modalias.patch, NONE,
	1.1 kernel-2.6.spec, 1.3066, 1.3067
Message-ID: <200704141725.l3EHP5Wx019948@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-powerpc-reserve-initrd-1.patch 
	linux-2.6-powerpc-reserve-initrd-2.patch 
	linux-2.6-ps3-sysbus-modalias.patch 
Log Message:
* Sat Apr 14 2007 David Woodhouse <dwmw2 at redhat.com>
- Add modalias attributes to ps3_system_bus devices in the (probably vain)
  hope that they'll fix the installer.
- Ensure initrd memory is reserved when the PPC64 kernel is booted from a
  bootwrapper instead of OF.


linux-2.6-powerpc-reserve-initrd-1.patch:
 kernel/prom.c |    3 ---
 mm/lmb.c      |    4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-powerpc-reserve-initrd-1.patch ---
>From linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org Wed Feb 28 03:12:45 2007
Return-path: <linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org>
Envelope-to: dwmw2 at baythorne.infradead.org
Delivery-date: Wed, 28 Feb 2007 03:12:45 +0000
Received: from pentafluge.infradead.org ([2001:4bd0:203e::1]) by
	baythorne.infradead.org with esmtps (Exim 4.63 #1 (Red Hat Linux)) id
	1HMFFE-00054K-V7 for dwmw2 at baythorne.infradead.org; Wed, 28 Feb 2007
	03:12:45 +0000
Received: from ozlabs.org ([203.10.76.45]) by pentafluge.infradead.org with
	esmtps (Exim 4.63 #1 (Red Hat Linux)) id 1HMFFB-0000pp-L0 for
	dwmw2 at infradead.org; Wed, 28 Feb 2007 03:12:44 +0000
Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix)
	with ESMTP id 6FE7DDDECB for <dwmw2 at infradead.org>; Wed, 28 Feb 2007
	14:12:34 +1100 (EST)
X-Original-To: linuxppc-dev at ozlabs.org
Delivered-To: linuxppc-dev at ozlabs.org
Received: by ozlabs.org (Postfix, from userid 1007) id 430F3DDDF6; Wed, 28
	Feb 2007 14:12:29 +1100 (EST)
To: Paul Mackerras <paulus at samba.org>, Benjamin Herrenschmidt <benh at kernel.crashing.org>, <linuxppc-dev at ozlabs.org>
From: David Gibson <david at gibson.dropbear.id.au>
Subject: [PATCH 1/2] powerpc: Allow duplicate lmb_reserve() calls
In-Reply-To: <20070228031120.GF11775 at localhost.localdomain>
Message-Id: <20070228031229.430F3DDDF6 at ozlabs.org>
Date: Wed, 28 Feb 2007 14:12:29 +1100 (EST)
X-BeenThere: linuxppc-dev at ozlabs.org
X-Mailman-Version: 2.1.9
Precedence: list
List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.ozlabs.org>
List-Unsubscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-dev>,
	<mailto:linuxppc-dev-request at ozlabs.org?subject=unsubscribe>
List-Archive: <http://ozlabs.org/pipermail/linuxppc-dev>
List-Post: <mailto:linuxppc-dev at ozlabs.org>
List-Help: <mailto:linuxppc-dev-request at ozlabs.org?subject=help>
List-Subscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-dev>,
	<mailto:linuxppc-dev-request at ozlabs.org?subject=subscribe>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Sender: linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org
Errors-To: linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org
X-Bad-Reply: In-Reply-To but no 'Re:' in Subject.
X-Spam-Score: 0.0 (/)
X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/
Content-Transfer-Encoding: 8bit

At present calling lmb_reserve() (and hence lmb_add_region()) twice
for exactly the same memory region will cause strange behaviour.

This makes life difficult when booting from a flat device tree with
memory reserve map.  Which regions are automatically reserved by the
kernel has changed over time, so it's quite possible a newer kernel
could attempt to auto-reserve a region which is also explicitly listed
in the device tree's reserve map, leading to trouble.

This patch avoids the problem by making lmb_reserve() ignore a call to
reserve a previously reserved region.  It also removes a now redundant
test designed to avoid one specific case of the problem noted above.

At present, this patch deals only with duplicate reservations of an
identical region.  Attempting to reserve two different, but
overlapping regions will still cause problems.  I might post another
patch later dealing with this case, but I'm avoiding it now since it
is substantially more complicated to deal with, less likely to occur
and more likely to indicate a genuine bug elsewhere if it does occur.

Signed-off-by: David Gibson <dwg at au1.ibm.com>
---


 arch/powerpc/kernel/prom.c |    3 ---
 arch/powerpc/mm/lmb.c      |    4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

Index: working-2.6/arch/powerpc/mm/lmb.c
===================================================================
--- working-2.6.orig/arch/powerpc/mm/lmb.c	2007-02-06 16:21:02.000000000 +1100
+++ working-2.6/arch/powerpc/mm/lmb.c	2007-02-06 16:22:32.000000000 +1100
@@ -146,6 +146,10 @@ static long __init lmb_add_region(struct
 		unsigned long rgnbase = rgn->region[i].base;
 		unsigned long rgnsize = rgn->region[i].size;
 
+		if ((rgnbase == base) && (rgnsize == size))
+			/* Already have this region, so we're done */
+			return 0;
+
 		adjacent = lmb_addrs_adjacent(base,size,rgnbase,rgnsize);
 		if ( adjacent > 0 ) {
 			rgn->region[i].base -= size;
Index: working-2.6/arch/powerpc/kernel/prom.c
===================================================================
--- working-2.6.orig/arch/powerpc/kernel/prom.c	2007-02-06 16:22:48.000000000 +1100
+++ working-2.6/arch/powerpc/kernel/prom.c	2007-02-06 16:22:57.000000000 +1100
@@ -954,9 +954,6 @@ static void __init early_reserve_mem(voi
 		size = *(reserve_map++);
 		if (size == 0)
 			break;
-		/* skip if the reservation is for the blob */
-		if (base == self_base && size == self_size)
-			continue;
 		DBG("reserving: %llx -> %llx\n", base, size);
 		lmb_reserve(base, size);
 	}
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev at ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev

linux-2.6-powerpc-reserve-initrd-2.patch:
 prom.c         |   23 +++++++++++++++++++++++
 setup-common.c |   22 ++--------------------
 2 files changed, 25 insertions(+), 20 deletions(-)

--- NEW FILE linux-2.6-powerpc-reserve-initrd-2.patch ---
>From linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org Wed Feb 28 03:13:44 2007
Return-path: <linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org>
Envelope-to: dwmw2 at baythorne.infradead.org
Delivery-date: Wed, 28 Feb 2007 03:13:44 +0000
Received: from pentafluge.infradead.org ([2001:4bd0:203e::1]) by
	baythorne.infradead.org with esmtps (Exim 4.63 #1 (Red Hat Linux)) id
	1HMFGC-00054U-CH for dwmw2 at baythorne.infradead.org; Wed, 28 Feb 2007
	03:13:44 +0000
Received: from ozlabs.org ([203.10.76.45]) by pentafluge.infradead.org with
	esmtps (Exim 4.63 #1 (Red Hat Linux)) id 1HMFG8-0000q5-Ua for
	dwmw2 at infradead.org; Wed, 28 Feb 2007 03:13:43 +0000
Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix)
	with ESMTP id 73887DE044 for <dwmw2 at infradead.org>; Wed, 28 Feb 2007
	14:13:05 +1100 (EST)
X-Original-To: linuxppc-dev at ozlabs.org
Delivered-To: linuxppc-dev at ozlabs.org
Received: by ozlabs.org (Postfix, from userid 1007) id 55D11DDDF9; Wed, 28
	Feb 2007 14:12:29 +1100 (EST)
To: Paul Mackerras <paulus at samba.org>, Benjamin Herrenschmidt <benh at kernel.crashing.org>, <linuxppc-dev at ozlabs.org>
From: David Gibson <david at gibson.dropbear.id.au>
Subject: [PATCH 2/2] Automatically lmb_reserve() initrd
In-Reply-To: <20070228031120.GF11775 at localhost.localdomain>
Message-Id: <20070228031229.55D11DDDF9 at ozlabs.org>
Date: Wed, 28 Feb 2007 14:12:29 +1100 (EST)
X-BeenThere: linuxppc-dev at ozlabs.org
X-Mailman-Version: 2.1.9
Precedence: list
List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.ozlabs.org>
List-Unsubscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-dev>,
	<mailto:linuxppc-dev-request at ozlabs.org?subject=unsubscribe>
List-Archive: <http://ozlabs.org/pipermail/linuxppc-dev>
List-Post: <mailto:linuxppc-dev at ozlabs.org>
List-Help: <mailto:linuxppc-dev-request at ozlabs.org?subject=help>
List-Subscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-dev>,
	<mailto:linuxppc-dev-request at ozlabs.org?subject=subscribe>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Sender: linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org
Errors-To: linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org
X-Bad-Reply: In-Reply-To but no 'Re:' in Subject.
X-Spam-Score: 0.0 (/)
X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/
Content-Transfer-Encoding: 8bit

At present, when an initrd is passed to the kernel used flat device
tree properties, the memory the initrd occupies must also be reserved
in the flat tree's reserve map, or the kernel may overwrite it.  That
makes life more complicated than it could be for the bootwrapper.

This patch makes the kernel automatically reserve the initrd's space.
That in turn requires parsing the initrd parameters earlier than they
are currently, in early_init_dt_scan_chosen() instead of
check_for_initrd().

Signed-off-by: David Gibson <dwg at au1.ibm.com>
---

 arch/powerpc/kernel/prom.c         |   23 +++++++++++++++++++++++
 arch/powerpc/kernel/setup-common.c |   22 ++--------------------
 2 files changed, 25 insertions(+), 20 deletions(-)

Index: working-2.6/arch/powerpc/kernel/prom.c
===================================================================
--- working-2.6.orig/arch/powerpc/kernel/prom.c	2007-02-09 15:12:00.000000000 +1100
+++ working-2.6/arch/powerpc/kernel/prom.c	2007-02-09 15:14:27.000000000 +1100
@@ -719,6 +719,7 @@ static int __init early_init_dt_scan_cho
 					    const char *uname, int depth, void *data)
 {
 	unsigned long *lprop;
+	u32 *prop;
 	unsigned long l;
 	char *p;
 
@@ -760,6 +761,22 @@ static int __init early_init_dt_scan_cho
                crashk_res.end = crashk_res.start + *lprop - 1;
 #endif
 
+#ifdef CONFIG_BLK_DEV_INITRD
+	DBG("Looking for initrd properties... ");
+	prop = of_get_flat_dt_prop(node, "linux,initrd-start", &l);
+	if (prop) {
+		initrd_start = (unsigned long)__va(of_read_ulong(prop, l/4));
+		prop = of_get_flat_dt_prop(node, "linux,initrd-end", &l);
+		if (prop) {
+			initrd_end = (unsigned long)__va(of_read_ulong(prop, l/4));
+			initrd_below_start_ok = 1;
+		} else {
+			initrd_start = 0;
+		}
+	}
+	DBG("initrd_start=0x%lx  initrd_end=0x%lx\n", initrd_start, initrd_end);
+#endif /* CONFIG_BLK_DEV_INITRD */
+
 	/* Retreive command line */
  	p = of_get_flat_dt_prop(node, "bootargs", &l);
 	if (p != NULL && l > 0)
@@ -926,6 +943,12 @@ static void __init early_reserve_mem(voi
 	self_size = initial_boot_params->totalsize;
 	lmb_reserve(self_base, self_size);
 
+#ifdef CONFIG_BLK_DEV_INITRD
+	/* then reserve the initrd, if any */
+	if (initrd_start && (initrd_end > initrd_start))
+		lmb_reserve(__pa(initrd_start), initrd_end - initrd_start);
+#endif /* CONFIG_BLK_DEV_INITRD */
+
 #ifdef CONFIG_PPC32
 	/* 
 	 * Handle the case where we might be booting from an old kexec
Index: working-2.6/arch/powerpc/kernel/setup-common.c
===================================================================
--- working-2.6.orig/arch/powerpc/kernel/setup-common.c	2007-01-24 12:01:17.000000000 +1100
+++ working-2.6/arch/powerpc/kernel/setup-common.c	2007-02-09 15:15:15.000000000 +1100
@@ -304,26 +304,8 @@ struct seq_operations cpuinfo_op = {
 void __init check_for_initrd(void)
 {
 #ifdef CONFIG_BLK_DEV_INITRD
-	const unsigned int *prop;
-	int len;
-
-	DBG(" -> check_for_initrd()\n");
-
-	if (of_chosen) {
-		prop = get_property(of_chosen, "linux,initrd-start", &len);
-		if (prop != NULL) {
-			initrd_start = (unsigned long)
-				__va(of_read_ulong(prop, len / 4));
-			prop = get_property(of_chosen,
-					"linux,initrd-end", &len);
-			if (prop != NULL) {
-				initrd_end = (unsigned long)
-					__va(of_read_ulong(prop, len / 4));
-				initrd_below_start_ok = 1;
-			} else
-				initrd_start = 0;
-		}
-	}
+	DBG(" -> check_for_initrd()  initrd_start=0x%lx  initrd_end=0x%lx\n",
+	    initrd_start, initrd_end);
 
 	/* If we were passed an initrd, set the ROOT_DEV properly if the values
 	 * look sensible. If not, clear initrd reference.
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev at ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev

linux-2.6-ps3-sysbus-modalias.patch:
 system-bus.c |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-ps3-sysbus-modalias.patch ---
[PATCH] Add modinfo attribute to ps3_system_bus devices

Also make them all children of the same ps3_system_bus 'device' so
they appear in a corresponding subdirectory under /sys/devices

Signed-off-by: David Woodhouse <dwmw2 at infradead.org>

--- linux-2.6.20.ppc64/arch/powerpc/platforms/ps3/system-bus.c~	2007-04-14 16:10:23.000000000 +0100
+++ linux-2.6.20.ppc64/arch/powerpc/platforms/ps3/system-bus.c	2007-04-14 18:16:58.000000000 +0100
@@ -32,6 +32,10 @@
 
 #include "platform.h"
 
+static struct device ps3_system_bus = {
+        .bus_id         = "ps3_system",
+};
+
 #define dump_mmio_region(_a) _dump_mmio_region(_a, __func__, __LINE__)
 static void _dump_mmio_region(const struct ps3_mmio_region* r,
 	const char* func, int line)
@@ -178,12 +182,27 @@ static int ps3_system_bus_uevent(struct 
 	return 0;
 }
 
+static ssize_t modalias_show(struct device *_dev, struct device_attribute *a,
+			     char *buf)
+{
+	struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
+        int len = snprintf(buf, PAGE_SIZE, "ps3:%d\n", dev->match_id);
+
+        return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
+}
+
+static struct device_attribute ps3_system_bus_dev_attrs[] = {
+        __ATTR_RO(modalias),
+        __ATTR_NULL,
+};
+
 struct bus_type ps3_system_bus_type = {
 	.name = "ps3_system_bus",
 	.match = ps3_system_bus_match,
 	.probe = ps3_system_bus_probe,
 	.remove = ps3_system_bus_remove,
 	.uevent = ps3_system_bus_uevent,
+	.dev_attrs = ps3_system_bus_dev_attrs,
 };
 
 int __init ps3_system_bus_init(void)
@@ -192,7 +211,8 @@ int __init ps3_system_bus_init(void)
 
 	if (!firmware_has_feature(FW_FEATURE_PS3_LV1))
 		return -ENODEV;
-
+	result = device_register(&ps3_system_bus);
+	BUG_ON(result);
 	result = bus_register(&ps3_system_bus_type);
 	BUG_ON(result);
 	return result;
@@ -372,6 +392,9 @@ int ps3_system_bus_device_register(struc
 	dev->core.archdata.dma_ops = &ps3_dma_ops;
 	dev->core.archdata.numa_node = 0;
 
+	if (!dev->core.parent)
+		dev->core.parent = &ps3_system_bus;
+
 	snprintf(dev->core.bus_id, sizeof(dev->core.bus_id), "sb_%02x",
 		dev_count++);
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3066
retrieving revision 1.3067
diff -u -r1.3066 -r1.3067
--- kernel-2.6.spec	13 Apr 2007 20:44:51 -0000	1.3066
+++ kernel-2.6.spec	14 Apr 2007 17:25:03 -0000	1.3067
@@ -411,6 +411,8 @@
 Patch303: linux-2.6-ppc32-ucmpdi2.patch
 Patch304: linux-2.6-ibmvscsi-schizo.patch
 Patch305: linux-2.6-pmac-zilog.patch
+Patch306: linux-2.6-powerpc-reserve-initrd-1.patch
+Patch307: linux-2.6-powerpc-reserve-initrd-2.patch
 
 Patch310: linux-2.6-common-uevent.patch
 Patch311: linux-2.6-uevent-macio.patch
@@ -445,6 +447,7 @@
 Patch365: linux-2.6-ps3-ethernet-autoload.patch
 Patch366: linux-2.6-ps3av-export-header.patch
 Patch367: linux-2.6-ps3-usb-autoload.patch
+Patch368: linux-2.6-ps3-sysbus-modalias.patch
 
 # 500 - 599   s390(x)
 
@@ -1026,6 +1029,9 @@
 %patch304 -p1
 # Move pmac_zilog to its newly-registered device number
 %patch305 -p1
+# Ensure initrd memory is reserved at boot
+%patch306 -p1
+%patch307 -p1
 
 # uevent support for of_platform device
 %patch310 -p1
@@ -1061,6 +1067,7 @@
 %patch365 -p1
 %patch366 -p1
 %patch367 -p1
+%patch368 -p1
 
 # S390
 
@@ -2254,6 +2261,12 @@
 #  - tux.
 
 %changelog
+* Sat Apr 14 2007 David Woodhouse <dwmw2 at redhat.com>
+- Add modalias attributes to ps3_system_bus devices in the (probably vain)
+  hope that they'll fix the installer.
+- Ensure initrd memory is reserved when the PPC64 kernel is booted from a
+  bootwrapper instead of OF.
+
 * Fri Apr 13 2007 John W. Linville <linville at redhat.com>
 - Update git-wireless-dev.patch
 - Remove linux-2.6-rt2x00-scan-fix.patch (obsoleted by update above)



From fedora-cvs-commits at redhat.com  Sat Apr 14 17:40:15 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 14 Apr 2007 13:40:15 -0400
Subject: rpms/thunderbird/devel thunderbird-2.0-default-applications.patch,
	1.1, 1.2 thunderbird.spec, 1.95, 1.96
Message-ID: <200704141740.l3EHeF1B023318@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	thunderbird-2.0-default-applications.patch thunderbird.spec 
Log Message:
* Fri Apr 13 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.0-0.5.rc1
- Fix the desktop file
- Clean up the files list
- Remove the default client stuff from the pref window


thunderbird-2.0-default-applications.patch:
 preferences/general.xul          |    2 +-
 shell/nsMailGNOMEIntegration.cpp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: thunderbird-2.0-default-applications.patch
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird-2.0-default-applications.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- thunderbird-2.0-default-applications.patch	12 Apr 2007 20:32:40 -0000	1.1
+++ thunderbird-2.0-default-applications.patch	14 Apr 2007 17:40:08 -0000	1.2
@@ -14,3 +14,19 @@
  {}
  
  nsresult
+Index: mozilla/mail/components/preferences/general.xul
+===================================================================
+RCS file: /cvsroot/mozilla/mail/components/preferences/general.xul,v
+retrieving revision 1.4.2.9
+diff -d -u -p -r1.4.2.9 general.xul
+--- mozilla/mail/components/preferences/general.xul	18 Feb 2007 20:26:46 -0000	1.4.2.9
++++ mozilla/mail/components/preferences/general.xul	13 Apr 2007 19:34:19 -0000
+@@ -70,7 +70,7 @@
+ 
+     <stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
+ 
+-#ifdef HAVE_SHELL_SERVICE
++#ifdef 0
+     <stringbundle id="bundleShell" src="chrome://messenger/locale/shellservice.properties"/>
+     <stringbundle id="bundleBrand" src="chrome://branding/locale/brand.properties"/>
+     


Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- thunderbird.spec	12 Apr 2007 20:32:40 -0000	1.95
+++ thunderbird.spec	14 Apr 2007 17:40:08 -0000	1.96
@@ -8,7 +8,7 @@
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
 Version:	2.0.0.0
-Release:	0.4.rc1%{?dist}
+Release:	0.5.rc1%{?dist}
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPL
 Group:		Applications/Internet
@@ -192,8 +192,8 @@
 
 desktop-file-install --vendor mozilla \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category Application \
   --add-category Network \
+  --add-category Email \
   %{SOURCE20}
 
 # set up the thunderbird start script
@@ -277,15 +277,44 @@
 %attr(755,root,root) %{_bindir}/thunderbird
 %attr(644,root,root) %{_datadir}/applications/mozilla-thunderbird.desktop
 %attr(644,root,root) %{_datadir}/pixmaps/thunderbird.png
+%{mozappdir}/LICENSE
+%{mozappdir}/chrome
+%{mozappdir}/components
+%{mozappdir}/defaults
+%{mozappdir}/dictionaries
+%{mozappdir}/extensions
+%{mozappdir}/greprefs
+%{mozappdir}/icons
+%{mozappdir}/init.d
+%{mozappdir}/isp
+%{mozappdir}/mozilla-xremote-client
+%{mozappdir}/open-browser.sh
+%{mozappdir}/regxpcom
+%{mozappdir}/res
+%{mozappdir}/run-mozilla.sh
+%{mozappdir}/thunderbird-bin
+%{mozappdir}/updater
+%{mozappdir}/*.so
+
 %exclude %{_includedir}/%{name}-%{version}
 %exclude %{_datadir}/idl/%{name}-%{version}
 %exclude %{_libdir}/pkgconfig/*.pc
-%{mozappdir}
+%exclude %{mozappdir}/TestGtkEmbed
+%exclude %{mozappdir}/xpidl
+%exclude %{mozappdir}/xpcshell
+%exclude %{mozappdir}/xpt_dump
+%exclude %{mozappdir}/xpt_link
+%exclude %{mozappdir}/xpicleanup
 
 #===============================================================================
 
 %changelog
-* Thu Apr 12 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.0-0.3.rc1
+* Fri Apr 13 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.0-0.5.rc1
+- Fix the desktop file
+- Clean up the files list
+- Remove the default client stuff from the pref window
+
+* Thu Apr 12 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.0-0.4.rc1
 - Rebuild into Fedora
 
 * Wed Apr 11 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.0-0.3.rc1



From fedora-cvs-commits at redhat.com  Sat Apr 14 20:37:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 14 Apr 2007 16:37:18 -0400
Subject: rpms/ipsec-tools/devel ipsec-tools-0.6.5-leak.patch, NONE,
	1.1 ipsec-tools.spec, 1.38, 1.39
Message-ID: <200704142037.l3EKbI7e032438@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/ipsec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32387

Modified Files:
	ipsec-tools.spec 
Added Files:
	ipsec-tools-0.6.5-leak.patch 
Log Message:
* Sat Apr 14 2007 Steve Grubb <sgrubb at redhat.com> - 0.6.6-5%{?dist}
- Resolves: #235680 racoon socket descriptor exhaustion


ipsec-tools-0.6.5-leak.patch:
 main.c     |    5 ++++-
 policy.h   |    1 +
 security.c |    9 +--------
 3 files changed, 6 insertions(+), 9 deletions(-)

--- NEW FILE ipsec-tools-0.6.5-leak.patch ---
diff -urp ipsec-tools-0.6.5.orig/src/racoon/main.c ipsec-tools-0.6.5/src/racoon/main.c
--- ipsec-tools-0.6.5.orig/src/racoon/main.c	2007-04-14 16:00:16.000000000 -0400
+++ ipsec-tools-0.6.5/src/racoon/main.c	2007-04-14 16:10:12.000000000 -0400
@@ -163,7 +163,10 @@ main(ac, av)
 #ifdef DEBUG_RECORD_MALLOCATION
 	DRM_init();
 #endif
-
+#ifdef HAVE_SECCTX
+	if (init_avc() != 0)
+		errx(1, "Could not init avcs");
+#endif
 	eay_init();
 	initlcconf();
 	initrmconf();
diff -urp ipsec-tools-0.6.5.orig/src/racoon/policy.h ipsec-tools-0.6.5/src/racoon/policy.h
--- ipsec-tools-0.6.5.orig/src/racoon/policy.h	2007-04-14 16:00:17.000000000 -0400
+++ ipsec-tools-0.6.5/src/racoon/policy.h	2007-04-14 16:06:13.000000000 -0400
@@ -154,6 +154,7 @@ extern const char *spidx2str __P((const 
 #ifdef HAVE_SECCTX
 #include <selinux/selinux.h>
 extern int get_security_context __P((vchar_t *, struct policyindex *));
+extern int init_avc __P((void));
 extern int within_range __P((security_context_t, security_context_t));
 extern void set_secctx_in_proposal __P((struct ph2handle *, struct policyindex));
 #endif
diff -urp ipsec-tools-0.6.5.orig/src/racoon/security.c ipsec-tools-0.6.5/src/racoon/security.c
--- ipsec-tools-0.6.5.orig/src/racoon/security.c	2007-04-14 16:00:17.000000000 -0400
+++ ipsec-tools-0.6.5/src/racoon/security.c	2007-04-14 16:09:40.000000000 -0400
@@ -182,7 +182,7 @@ set_secctx_in_proposal(iph2, spidx)
  * 		1	if the avc could not be initialized
  */
 
-static int
+int
 init_avc(void)
 {
 	int rtn = 0;
@@ -225,13 +225,6 @@ within_range(security_context_t sl, secu
 	if (!*range)	/* This policy doesn't have security context */
 		return 1;
 
-	rtn = init_avc();
-	if (rtn != 0) {
-		plog(LLV_ERROR, LOCATION, NULL, 
-			"within_range: couldn't initialize the AVC\n");
-		return 0;
-	}
-
 	/*
 	 * Get the sids for the sl and range contexts
 	 */


Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ipsec-tools.spec	13 Apr 2007 14:18:08 -0000	1.38
+++ ipsec-tools.spec	14 Apr 2007 20:37:16 -0000	1.39
@@ -1,6 +1,6 @@
 Name: ipsec-tools
 Version: 0.6.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Tools for configuring and using IPSEC
 License: BSD
 Group: System Environment/Base
@@ -21,7 +21,7 @@
 Patch11: ipsec-tools-0.6.5-acquires.patch
 Patch12: ipsec-tools-0.6.5-loopback.patch
 Patch13: ipsec-tools-0.6.5-context-increase.patch
-
+Patch14: ipsec-tools-0.6.5-leak.patch
 
 BuildRequires: openssl-devel, krb5-devel, bison, flex, automake, libtool
 BuildRequires: libselinux-devel >= 1.30.28-2
@@ -47,6 +47,7 @@
 %patch11 -p1 -b .acquires
 %patch12 -p1 -b .loopback
 %patch13 -p1 -b .context
+%patch14 -p1 -b .leak
 
 mkdir -p kernel-headers/linux
 cp %{SOURCE1} %{SOURCE2} %{SOURCE5} %{SOURCE6} kernel-headers/linux
@@ -106,6 +107,9 @@
 %config(noreplace) /etc/racoon/racoon.conf
 
 %changelog
+* Sat Apr 14 2007 Steve Grubb <sgrubb at redhat.com> - 0.6.6-5%{?dist}
+- Resolves: #235680 racoon socket descriptor exhaustion
+
 * Fri Apr 13 2007 Steve Grubb <sgrubb at redhat.com> - 0.6.6-4%{?dist}
 - Resolves: #236121 increase buffer for context
 - Resolves: #234491 kernel sends ACQUIRES that racoon is not catching



From fedora-cvs-commits at redhat.com  Sat Apr 14 20:46:11 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 14 Apr 2007 16:46:11 -0400
Subject: rpms/evolution/devel evolution-2.10.1-saving-attachments.patch, NONE,
	1.1 evolution.spec, 1.245, 1.246
Message-ID: <200704142046.l3EKkB3i006668@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.10.1-saving-attachments.patch 
Log Message:

* Sat Apr 14 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-4.fc7
- Add patch for RH bug #234315 (fix saving attachments).


evolution-2.10.1-saving-attachments.patch:
 em-format-html-display.c |   18 ++++-
 em-utils.c               |  156 +++++++++++++++++++++--------------------------
 2 files changed, 88 insertions(+), 86 deletions(-)

--- NEW FILE evolution-2.10.1-saving-attachments.patch ---
--- evolution-2.10.1/mail/em-utils.c.saving-attachments	2007-04-14 14:25:40.000000000 -0400
+++ evolution-2.10.1/mail/em-utils.c	2007-04-14 15:08:50.000000000 -0400
@@ -354,28 +354,23 @@
 
 /* Saving messages... */
 
-static void
-emu_save_part_response(GtkWidget *filesel, int response, CamelMimePart *part)
+static const gchar *
+emu_save_get_filename_for_part (CamelMimePart *part)
 {
-	char *uri;
-	
-	if (response == GTK_RESPONSE_OK) {
-		uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (filesel));
+	const gchar *filename;
 
-		if (!e_file_can_save((GtkWindow *)filesel, uri)) {
-			g_free(uri);
-			return;
-		}
-
-		e_file_update_save_path(gtk_file_chooser_get_current_folder_uri(
-					GTK_FILE_CHOOSER(filesel)), TRUE);
-		/* FIXME: popup error if it fails? */
-		mail_save_part(part, uri, NULL, NULL, FALSE);
-		g_free(uri);
+	filename = camel_mime_part_get_filename (part);
+	if (filename == NULL) {
+		if (CAMEL_IS_MIME_MESSAGE (part)) {
+			filename = camel_mime_message_get_subject (
+				CAMEL_MIME_MESSAGE (part));
+			if (filename == NULL)
+				filename = _("message");
+		} else
+			filename = _("attachment");
 	}
 
-	gtk_widget_destroy((GtkWidget *)filesel);
-	camel_object_unref(part);
+	return filename;
 }
 
 /**
@@ -387,83 +382,78 @@
  * Saves a mime part to disk (prompting the user for filename).
  **/
 void
-em_utils_save_part(GtkWidget *parent, const char *prompt, CamelMimePart *part)
+em_utils_save_part (GtkWidget *parent, const char *prompt, CamelMimePart *part)
 {
-	const char *name;
-	GtkWidget *filesel;
+	GtkWidget *file_chooser;
+	const gchar *filename;
+	gchar *uri = NULL;
 
-	name = camel_mime_part_get_filename(part);
-	if (name == NULL) {
-		if (CAMEL_IS_MIME_MESSAGE(part)) {
-			name = camel_mime_message_get_subject((CamelMimeMessage *)part);
-			if (name == NULL)
-				name = _("message");
-		} else {
-			name = _("attachment");
-		}
+	filename = emu_save_get_filename_for_part (part);
+
+	file_chooser = e_file_get_save_filesel (
+		parent, prompt, filename, GTK_FILE_CHOOSER_ACTION_SAVE);
+
+	if (gtk_dialog_run (GTK_DIALOG (file_chooser)) != GTK_RESPONSE_OK)
+		goto exit;
+
+	uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (file_chooser));
+
+	/* XXX Would be nice to mention _why_ we can't save. */
+	if (!e_file_can_save (GTK_WINDOW (file_chooser), uri)) {
+		g_warning ("Unable to save %s", uri);
+		goto exit;
 	}
 
-	filesel = e_file_get_save_filesel(parent, prompt, name, GTK_FILE_CHOOSER_ACTION_SAVE);
-	camel_object_ref(part);
-	g_signal_connect (filesel, "response", G_CALLBACK (emu_save_part_response), part);
-	gtk_widget_show (filesel);
+	e_file_update_save_path (
+		gtk_file_chooser_get_current_folder_uri (
+		GTK_FILE_CHOOSER (file_chooser)), TRUE);
+
+	mail_save_part (part, uri, NULL, NULL, FALSE);
+
+exit:
+	gtk_widget_destroy (file_chooser);
+	g_free (uri);
 }
 
-static void
-emu_save_parts_response (GtkWidget *filesel, int response, GSList *parts)
+void
+em_utils_save_parts (GtkWidget *parent, const gchar *prompt, GSList *parts)
 {
-        GSList *selected;
-		char *uri = NULL;
-        if (response == GTK_RESPONSE_OK) {
-		uri = gtk_file_chooser_get_current_folder_uri(GTK_FILE_CHOOSER (filesel));
-                e_file_update_save_path(uri, FALSE);
-
-                for ( selected = parts; selected != NULL; selected = selected->next) {
-                        const char *file_name;
-			char *safe_name = NULL;
-                        char *file_path;
-                        CamelMimePart *part = selected->data;
-
-                        file_name = camel_mime_part_get_filename(part);
-                        if (file_name == NULL) {
-                                if (CAMEL_IS_MIME_MESSAGE(part)) {
-                                        file_name = camel_mime_message_get_subject((CamelMimeMessage *)part);
-                                        if (file_name == NULL)
-                                                file_name = _("message");
-                                } else {
-                                	file_name = _("attachment");
-                                }
-                        } else {
-				safe_name = g_strdup(file_name);
-				em_filename_make_safe(safe_name);
-				file_name = safe_name;
-			}
-			
-			file_path = g_build_filename (uri, file_name, NULL);
-			if (!e_file_check_local(file_path) || !g_file_test(file_path, (G_FILE_TEST_EXISTS)) || e_error_run(NULL, E_ERROR_ASK_FILE_EXISTS_OVERWRITE, file_name, NULL) == GTK_RESPONSE_OK)
-				mail_save_part(part, file_path, NULL, NULL, FALSE);
-			else
-				g_warning ("Could not save %s. File already exists", file_path);
+        GtkWidget *file_chooser;
+	gchar *path_uri;
+	GSList *iter;
+
+        file_chooser = e_file_get_save_filesel (
+		parent, prompt, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+
+	if (gtk_dialog_run (GTK_DIALOG (file_chooser)) != GTK_RESPONSE_OK)
+		goto exit;
+
+	path_uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (file_chooser));
+
+	e_file_update_save_path (path_uri, FALSE);
 
-			g_free (file_path);
-			g_free (safe_name);
-                }
+	for (iter = parts; iter != NULL; iter = iter->next) {
+		CamelMimePart *part = iter->data;
+		const gchar *filename;
+		gchar *uri;
+
+		filename = emu_save_get_filename_for_part (part);
+
+		uri = g_build_path ("/", path_uri, filename, NULL);
+
+		/* XXX Would be nice to mention _why_ we can't save. */
+		if (e_file_can_save (GTK_WINDOW (file_chooser), uri))
+			mail_save_part (part, uri, NULL, NULL, FALSE);
+		else
+			g_warning ("Unable to save %s", uri);
 
 		g_free (uri);
-        }
-	
-	g_slist_free (parts);
-	gtk_widget_destroy((GtkWidget *)filesel);
-}
+	}
 
-void
-em_utils_save_parts (GtkWidget *parent, const char *prompt, GSList * parts)
-{
-        GtkWidget *filesel;
+	g_free (path_uri);
 
-        filesel = e_file_get_save_filesel (parent, prompt, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-        g_signal_connect (filesel, "response", G_CALLBACK (emu_save_parts_response), parts);
-        gtk_widget_show (filesel);
+exit:
+	gtk_widget_destroy (file_chooser);
 }
 
 
--- evolution-2.10.1/mail/em-format-html-display.c.saving-attachments	2007-04-14 14:25:40.000000000 -0400
+++ evolution-2.10.1/mail/em-format-html-display.c	2007-04-14 15:08:50.000000000 -0400
@@ -2099,12 +2099,24 @@
 }
 
 static void
-attachments_save_all_clicked(GtkWidget *w, EMFormatHTMLDisplay *efhd)
+attachments_save_all_clicked (GtkWidget *widget, EMFormatHTMLDisplay *efhd)
 {
 	GSList *attachment_parts;
+	guint n_attachment_parts;
 
-	attachment_parts = e_attachment_bar_get_parts(E_ATTACHMENT_BAR(efhd->priv->attachment_bar));
-	em_utils_save_parts(w, _("Select folder to save all attachments..."), attachment_parts);
+	attachment_parts = e_attachment_bar_get_parts (
+		E_ATTACHMENT_BAR (efhd->priv->attachment_bar));
+	n_attachment_parts = g_slist_length (attachment_parts);
+	g_return_if_fail (n_attachment_parts > 0);
+
+	if (n_attachment_parts == 1)
+		em_utils_save_part (
+			widget, _("Save attachment as"),
+			attachment_parts->data);
+	else
+		em_utils_save_parts (
+			widget, _("Select folder to save all attachments"),
+			attachment_parts);
 }
 
 static void


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- evolution.spec	14 Apr 2007 03:06:01 -0000	1.245
+++ evolution.spec	14 Apr 2007 20:46:09 -0000	1.246
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -164,6 +164,9 @@
 # RH bug 235878 / GNOME bug #386503
 Patch49: evolution-2.10.1-fix-help.patch
 
+# RH bug 234315 / GNOME bug #423766
+Patch50: evolution-2.10.1-saving-attachments.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -318,6 +321,7 @@
 %patch47 -p1 -b .drop-old-glib-support
 %patch48 -p1 -b .fix-gnome-doc-utils
 %patch49 -p1 -b .fix-help
+%patch50 -p1 -b .saving-attachments
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -734,6 +738,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Sat Apr 14 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-4.fc7
+- Add patch for RH bug #234315 (fix saving attachments).
+
 * Fri Apr 13 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-3.fc7
 - Add patch for RH bug #235878 (make Help->Contents work again).
 



From fedora-cvs-commits at redhat.com  Sat Apr 14 20:48:56 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 14 Apr 2007 16:48:56 -0400
Subject: rpms/kernel/devel linux-2.6-ps3-async-scsi-hack.patch, NONE,
	1.1 kernel-2.6.spec, 1.3067, 1.3068
Message-ID: <200704142048.l3EKmu41008790@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-ps3-async-scsi-hack.patch 
Log Message:
Evil workaround for generic mkinitrd/kernel bug #236475, just for PS3


linux-2.6-ps3-async-scsi-hack.patch:
 ps3_storage.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE linux-2.6-ps3-async-scsi-hack.patch ---
--- linux-2.6.20.ppc64/drivers/block/ps3_storage.c~	2007-04-14 19:40:13.000000000 +0100
+++ linux-2.6.20.ppc64/drivers/block/ps3_storage.c	2007-04-14 21:46:06.000000000 +0100
@@ -2582,6 +2582,8 @@ static struct platform_driver ps3_stor_p
 	.shutdown       = ps3_stor_driver_shutdown
 };
 
+extern void scsi_complete_async_scans(void);
+
 static int __init ps3_stor_init(void)
 {
 	int host_to_add;
@@ -2667,6 +2669,8 @@ static int __init ps3_stor_init(void)
 		}
 	}
 
+	/* Evil hack till rawhide mkinitrd is fixed (#235475) */
+	scsi_complete_async_scans();
 	FUNC_END;
 	return 0;
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3067
retrieving revision 1.3068
diff -u -r1.3067 -r1.3068
--- kernel-2.6.spec	14 Apr 2007 17:25:03 -0000	1.3067
+++ kernel-2.6.spec	14 Apr 2007 20:48:53 -0000	1.3068
@@ -448,6 +448,7 @@
 Patch366: linux-2.6-ps3av-export-header.patch
 Patch367: linux-2.6-ps3-usb-autoload.patch
 Patch368: linux-2.6-ps3-sysbus-modalias.patch
+Patch369: linux-2.6-ps3-async-scsi-hack.patch
 
 # 500 - 599   s390(x)
 
@@ -1068,6 +1069,7 @@
 %patch366 -p1
 %patch367 -p1
 %patch368 -p1
+%patch369 -p1
 
 # S390
 



From fedora-cvs-commits at redhat.com  Sat Apr 14 21:02:17 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 14 Apr 2007 17:02:17 -0400
Subject: rpms/ipsec-tools/devel ipsec-tools-0.6.5-leak.patch, 1.1,
	1.2 ipsec-tools.spec, 1.39, 1.40
Message-ID: <200704142102.l3EL2Hp6018453@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/ipsec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18410

Modified Files:
	ipsec-tools-0.6.5-leak.patch ipsec-tools.spec 
Log Message:
* Sat Apr 14 2007 Steve Grubb <sgrubb at redhat.com> - 0.6.6-6%{?dist}
- Resolves: #235680 racoon socket descriptor exhaustion


ipsec-tools-0.6.5-leak.patch:
 main.c     |    4 +++-
 policy.h   |    1 +
 security.c |   25 +++++++++----------------
 3 files changed, 13 insertions(+), 17 deletions(-)

Index: ipsec-tools-0.6.5-leak.patch
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/ipsec-tools-0.6.5-leak.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ipsec-tools-0.6.5-leak.patch	14 Apr 2007 20:37:16 -0000	1.1
+++ ipsec-tools-0.6.5-leak.patch	14 Apr 2007 21:02:15 -0000	1.2
@@ -1,42 +1,65 @@
 diff -urp ipsec-tools-0.6.5.orig/src/racoon/main.c ipsec-tools-0.6.5/src/racoon/main.c
 --- ipsec-tools-0.6.5.orig/src/racoon/main.c	2007-04-14 16:00:16.000000000 -0400
-+++ ipsec-tools-0.6.5/src/racoon/main.c	2007-04-14 16:10:12.000000000 -0400
-@@ -163,7 +163,10 @@ main(ac, av)
++++ ipsec-tools-0.6.5/src/racoon/main.c	2007-04-14 16:46:32.000000000 -0400
+@@ -163,7 +163,9 @@ main(ac, av)
  #ifdef DEBUG_RECORD_MALLOCATION
  	DRM_init();
  #endif
 -
 +#ifdef HAVE_SECCTX
-+	if (init_avc() != 0)
-+		errx(1, "Could not init avcs");
++	init_avc();
 +#endif
  	eay_init();
  	initlcconf();
  	initrmconf();
 diff -urp ipsec-tools-0.6.5.orig/src/racoon/policy.h ipsec-tools-0.6.5/src/racoon/policy.h
 --- ipsec-tools-0.6.5.orig/src/racoon/policy.h	2007-04-14 16:00:17.000000000 -0400
-+++ ipsec-tools-0.6.5/src/racoon/policy.h	2007-04-14 16:06:13.000000000 -0400
++++ ipsec-tools-0.6.5/src/racoon/policy.h	2007-04-14 16:51:37.000000000 -0400
 @@ -154,6 +154,7 @@ extern const char *spidx2str __P((const 
  #ifdef HAVE_SECCTX
  #include <selinux/selinux.h>
  extern int get_security_context __P((vchar_t *, struct policyindex *));
-+extern int init_avc __P((void));
++extern void init_avc __P((void));
  extern int within_range __P((security_context_t, security_context_t));
  extern void set_secctx_in_proposal __P((struct ph2handle *, struct policyindex));
  #endif
 diff -urp ipsec-tools-0.6.5.orig/src/racoon/security.c ipsec-tools-0.6.5/src/racoon/security.c
 --- ipsec-tools-0.6.5.orig/src/racoon/security.c	2007-04-14 16:00:17.000000000 -0400
-+++ ipsec-tools-0.6.5/src/racoon/security.c	2007-04-14 16:09:40.000000000 -0400
-@@ -182,7 +182,7 @@ set_secctx_in_proposal(iph2, spidx)
++++ ipsec-tools-0.6.5/src/racoon/security.c	2007-04-14 16:50:53.000000000 -0400
+@@ -181,24 +181,21 @@ set_secctx_in_proposal(iph2, spidx)
+  * return:	0	if avc was successfully initialized
   * 		1	if the avc could not be initialized
   */
- 
+-
 -static int
-+int
++static int mls_ready = 0;
++void
  init_avc(void)
  {
- 	int rtn = 0;
-@@ -225,13 +225,6 @@ within_range(security_context_t sl, secu
+-	int rtn = 0;
+-
+ 	if (!is_selinux_mls_enabled()) {
+ 		plog(LLV_ERROR, LOCATION, NULL, "racoon: MLS support is not"
+ 				" enabled.\n");
+-		return 1;
++		return;
+ 	}
+ 
+-	rtn = avc_init("racoon", NULL, NULL, NULL, NULL);
+-	if (rtn != 0) {
+-		plog(LLV_ERROR, LOCATION, NULL, "racoon: could not initialize avc.\n");
+-		rtn = 1;
+-	}
+-	return rtn;
++	if (avc_init("racoon", NULL, NULL, NULL, NULL) == 0)
++		mls_ready = 1;
++	else
++		plog(LLV_ERROR, LOCATION, NULL,
++				"racoon: could not initialize avc.\n");
+ }
+ 
+ /*
+@@ -225,12 +222,8 @@ within_range(security_context_t sl, secu
  	if (!*range)	/* This policy doesn't have security context */
  		return 1;
  
@@ -44,9 +67,9 @@
 -	if (rtn != 0) {
 -		plog(LLV_ERROR, LOCATION, NULL, 
 -			"within_range: couldn't initialize the AVC\n");
--		return 0;
++	if (!mls_ready) /* mls may not be enabled */
+ 		return 0;
 -	}
--
+ 
  	/*
  	 * Get the sids for the sl and range contexts
- 	 */


Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ipsec-tools.spec	14 Apr 2007 20:37:16 -0000	1.39
+++ ipsec-tools.spec	14 Apr 2007 21:02:15 -0000	1.40
@@ -1,6 +1,6 @@
 Name: ipsec-tools
 Version: 0.6.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Tools for configuring and using IPSEC
 License: BSD
 Group: System Environment/Base
@@ -107,7 +107,7 @@
 %config(noreplace) /etc/racoon/racoon.conf
 
 %changelog
-* Sat Apr 14 2007 Steve Grubb <sgrubb at redhat.com> - 0.6.6-5%{?dist}
+* Sat Apr 14 2007 Steve Grubb <sgrubb at redhat.com> - 0.6.6-6%{?dist}
 - Resolves: #235680 racoon socket descriptor exhaustion
 
 * Fri Apr 13 2007 Steve Grubb <sgrubb at redhat.com> - 0.6.6-4%{?dist}



From fedora-cvs-commits at redhat.com  Sun Apr 15 01:42:12 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 14 Apr 2007 21:42:12 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.10,
	1.11 policycoreutils.spec, 1.396, 1.397
Message-ID: <200704150142.l3F1gCjw019441@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Sat Apr 14 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-3
- Fixes for policygengui


policycoreutils-gui.patch:
 Makefile                    |   34 
 booleansPage.py             |  224 +++
 fcontextPage.py             |  207 +++
 loginsPage.py               |  173 ++
 mappingsPage.py             |   54 
 modulesPage.py              |  172 ++
 polgen.glade                | 1127 ++++++++++++++++
 polgen.py                   |  440 ++++++
 polgengui.py                |  211 +++
 portsPage.py                |  227 +++
 selinux.tbl                 |  274 +++
 semanagePage.py             |  115 +
 statusPage.py               |  220 +++
 system-config-selinux.glade | 3034 ++++++++++++++++++++++++++++++++++++++++++++
 system-config-selinux.py    |  169 ++
 templates/__init__.py       |   18 
 templates/executable.py     |  156 ++
 templates/network.py        |   46 
 templates/rw.py             |  106 +
 templates/script.py         |   42 
 templates/semodule.py       |   41 
 templates/tmp.py            |   74 +
 templates/var_lib.py        |  107 +
 templates/var_log.py        |   91 +
 templates/var_run.py        |   93 +
 templates/var_spool.py      |  107 +
 translationsPage.py         |  111 +
 usersPage.py                |  166 ++
 28 files changed, 7839 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- policycoreutils-gui.patch	13 Apr 2007 17:21:54 -0000	1.10
+++ policycoreutils-gui.patch	15 Apr 2007 01:42:09 -0000	1.11
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.9/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/booleansPage.py	2007-04-13 13:16:13.000000000 -0400
++++ policycoreutils-2.0.9/gui/booleansPage.py	2007-04-14 18:20:06.000000000 -0400
 @@ -0,0 +1,224 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -228,8 +228,8 @@
 +        commands.getstatusoutput(setsebool)
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.9/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/fcontextPage.py	2007-04-13 13:16:13.000000000 -0400
-@@ -0,0 +1,185 @@
++++ policycoreutils-2.0.9/gui/fcontextPage.py	2007-04-14 19:43:20.000000000 -0400
+@@ -0,0 +1,207 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
 +
@@ -293,6 +293,9 @@
 +class fcontextPage(semanagePage):
 +    def __init__(self, xml):
 +        semanagePage.__init__(self, xml, "fcontext", _("File Labeling"))
++        self.fcontextFilter = xml.get_widget("fcontextFilterEntry")
++        self.fcontextFilter.connect("focus_out_event", self.filter_changed)
++        self.fcontextFilter.connect("activate", self.filter_changed)
 +        self.view = xml.get_widget("fcontextView")
 +        self.store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING)
 +        self.view.set_model(self.store)
@@ -329,11 +332,25 @@
 +        self.fcontextTypeEntry = xml.get_widget("fcontextTypeEntry")
 +        self.fcontextMLSEntry = xml.get_widget("fcontextMLSEntry")
 +
-+    def load(self):
++    def match(self, fcon, filter):
++        try:
++            f=filter.lower()
++            for con in fcon:
++                k=con.lower()
++                if k.find(f) >= 0:
++                    return True
++        except:
++            pass
++        return False
++
++    def load(self, filter=""):
++        self.filter=filter            
 +        self.fcontext=seobject.fcontextRecords()
 +        fcon_list=self.fcontext.get_all()
 +        self.store.clear()
 +        for fcon in fcon_list:
++            if not self.match(fcon, filter):
++                continue
 +            iter=self.store.append()
 +            self.store.set_value(iter, SPEC_COL, fcon[0])
 +            self.store.set_value(iter, FTYPE_COL, fcon[1])
@@ -344,6 +361,11 @@
 +            self.store.set_value(iter, 1, rec)
 +        self.view.get_selection().select_path ((0,))
 +    
++    def filter_changed(self, *arg):
++        filter =  arg[0].get_text()
++        if filter != self.filter:
++            self.load(filter)
++        
 +    def dialogInit(self):
 +        store, iter = self.view.get_selection().get_selected()
 +        self.fcontextEntry.set_text(store.get_value(iter, SPEC_COL))
@@ -417,7 +439,7 @@
 +        self.store.set_value(iter, TYPE_COL, "system_u:object_r:%s:%s" % (type, mls))
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.9/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/loginsPage.py	2007-04-13 13:16:13.000000000 -0400
++++ policycoreutils-2.0.9/gui/loginsPage.py	2007-04-14 18:20:06.000000000 -0400
 @@ -0,0 +1,173 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -594,7 +616,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.9/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/Makefile	2007-04-13 13:17:40.000000000 -0400
++++ policycoreutils-2.0.9/gui/Makefile	2007-04-13 13:28:43.000000000 -0400
 @@ -0,0 +1,34 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -632,7 +654,7 @@
 +relabel:
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.9/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/mappingsPage.py	2007-04-13 13:16:13.000000000 -0400
++++ policycoreutils-2.0.9/gui/mappingsPage.py	2007-04-14 18:20:06.000000000 -0400
 @@ -0,0 +1,54 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -690,7 +712,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.9/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/modulesPage.py	2007-04-13 13:16:13.000000000 -0400
++++ policycoreutils-2.0.9/gui/modulesPage.py	2007-04-14 18:20:06.000000000 -0400
 @@ -0,0 +1,172 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -866,7 +888,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.9/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/polgen.glade	2007-04-13 13:16:13.000000000 -0400
++++ policycoreutils-2.0.9/gui/polgen.glade	2007-04-14 19:43:04.000000000 -0400
 @@ -0,0 +1,1127 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -1997,7 +2019,7 @@
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.9/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/polgengui.py	2007-04-13 13:16:13.000000000 -0400
++++ policycoreutils-2.0.9/gui/polgengui.py	2007-04-14 18:20:06.000000000 -0400
 @@ -0,0 +1,211 @@
 +#!/usr/bin/python
 +#
@@ -2212,8 +2234,8 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.9/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/polgen.py	2007-04-13 13:16:13.000000000 -0400
-@@ -0,0 +1,436 @@
++++ policycoreutils-2.0.9/gui/polgen.py	2007-04-14 18:20:06.000000000 -0400
+@@ -0,0 +1,440 @@
 +#! /usr/bin/python
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -2380,7 +2402,7 @@
 +                        self.need_tcp_type = True;
 +                    else:
 +                        port_name = rec[0][:-2]
-+                        line = "corenet_tcp_bind_%s(%s)\n" % (port_name, self.name)
++                        line = "corenet_tcp_bind_%s(%s_t)\n" % (port_name, self.name)
 +                        if line not in self.found_tcp_ports:
 +                            self.found_tcp_ports.append(line)
 +
@@ -2390,7 +2412,7 @@
 +                        self.need_tcp_type = True;
 +                    else:
 +                        port_name = rec[0][:-2]
-+                        line = "corenet_tcp_connect_%s(%s)\n" % (port_name, self.name)
++                        line = "corenet_tcp_connect_%s(%s_t)\n" % (port_name, self.name)
 +                        if line not in self.found_tcp_ports:
 +                            self.found_tcp_ports.append(line)
 +                        
@@ -2400,10 +2422,10 @@
 +                        self.need_udp_type = True;
 +                    else:
 +                        port_name = rec[0][:-2]
-+                        line = "corenet_udp_bind_%s(%s)\n" % (port_name, self.name)
++                        line = "corenet_udp_bind_%s(%s_t)\n" % (port_name, self.name)
 +                        if line not in self.found_udp_ports:
 +                            self.found_udp_ports.append(line)
-+                        
++                
 +                if self.need_udp_type == True or self.need_tcp_type == True:
 +                    return re.sub("TEMPLATETYPE", self.name, network.te_port_types)
 +		return ""
@@ -2447,9 +2469,9 @@
 +                        newte += "\n"
 +                        newte += re.sub("TEMPLATETYPE", self.name, network.te_udp)
 +                        if self.need_udp_type and len(self.in_udp) > 0:
-+                            newte += re.sub("TEMPLATETYPE", self.name, network.te_in_udp)
-+                        if len(self.in_udp) > 0:
 +                            newte += re.sub("TEMPLATETYPE", self.name, network.te_in_need_port_udp)
++                        if len(self.in_udp) > 0:
++                            newte += re.sub("TEMPLATETYPE", self.name, network.te_in_udp)
 +                        for i in self.found_udp_ports:
 +                            newte += i
 +		return newte
@@ -2573,11 +2595,14 @@
 +
 +		for i in self.dirs.keys():
 +			newsh += re.sub("FILENAME", i, script.restorecon)
-+		for i in self.in_tcp + self.out_tcp:
-+			t1 = re.sub("PORTNUM", "%d" % i, script.tcp_ports)
-+			newsh += re.sub("TEMPLATETYPE", self.name, t1)
 +
-+		for i in self.in_udp + self.out_udp:
++                for i in self.in_tcp + self.out_tcp:
++                    if self.find_port(i) == None:
++                        t1 = re.sub("PORTNUM", "%d" % i, script.tcp_ports)
++                        newsh += re.sub("TEMPLATETYPE", self.name, t1)
++
++                for i in self.in_udp + self.out_udp:
++                    if self.find_port(i) == None:
 +			t1 = re.sub("PORTNUM", "%d" % i, script.udp_ports)
 +			newsh += re.sub("TEMPLATETYPE", self.name, t1)
 +			
@@ -2628,7 +2653,8 @@
 +
 +if __name__ == '__main__':
 +    mypolicy = policy("cgi", "/var/www/cgi-bin/cgi", 3)
-+    mypolicy.set_in_tcp("8810")
++    mypolicy.set_in_tcp("513")
++    mypolicy.set_in_udp("513")
 +    mypolicy.set_use_uid(True)
 +    mypolicy.set_use_tmp(True)
 +    mypolicy.set_use_syslog(True)
@@ -2652,7 +2678,7 @@
 +	
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.9/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/portsPage.py	2007-04-13 13:16:13.000000000 -0400
++++ policycoreutils-2.0.9/gui/portsPage.py	2007-04-14 18:20:06.000000000 -0400
 @@ -0,0 +1,227 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -2883,7 +2909,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.9/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/selinux.tbl	2007-04-13 13:16:13.000000000 -0400
++++ policycoreutils-2.0.9/gui/selinux.tbl	2007-04-13 13:28:43.000000000 -0400
 @@ -0,0 +1,274 @@
 +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
 +allow_cvs_read_shadow  _("CVS") _("Allow cvs daemon to read shadow")
@@ -3161,7 +3187,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.9/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/semanagePage.py	2007-04-13 13:16:13.000000000 -0400
++++ policycoreutils-2.0.9/gui/semanagePage.py	2007-04-14 18:20:06.000000000 -0400
 @@ -0,0 +1,115 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -3280,7 +3306,7 @@
 +    
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.9/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/statusPage.py	2007-04-13 13:16:13.000000000 -0400
++++ policycoreutils-2.0.9/gui/statusPage.py	2007-04-14 18:20:06.000000000 -0400
 @@ -0,0 +1,220 @@
 +## statusPage.py - show selinux status
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -3504,8 +3530,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.9/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/system-config-selinux.glade	2007-04-13 13:16:13.000000000 -0400
-@@ -0,0 +1,2956 @@
++++ policycoreutils-2.0.9/gui/system-config-selinux.glade	2007-04-14 19:43:07.000000000 -0400
+@@ -0,0 +1,3034 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 +
@@ -5577,16 +5603,94 @@
 +		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 +
 +		      <child>
-+			<widget class="GtkTreeView" id="fcontextView">
++			<widget class="GtkViewport" id="viewport1">
 +			  <property name="visible">True</property>
-+			  <property name="can_focus">True</property>
-+			  <property name="headers_visible">True</property>
-+			  <property name="rules_hint">False</property>
-+			  <property name="reorderable">False</property>
-+			  <property name="enable_search">True</property>
-+			  <property name="fixed_height_mode">False</property>
-+			  <property name="hover_selection">False</property>
-+			  <property name="hover_expand">False</property>
++			  <property name="shadow_type">GTK_SHADOW_IN</property>
++
++			  <child>
++			    <widget class="GtkVBox" id="vbox19">
++			      <property name="visible">True</property>
++			      <property name="homogeneous">False</property>
++			      <property name="spacing">0</property>
++
++			      <child>
++				<widget class="GtkHBox" id="hbox8">
++				  <property name="visible">True</property>
++				  <property name="homogeneous">False</property>
++				  <property name="spacing">0</property>
++
++				  <child>
++				    <widget class="GtkLabel" id="label52">
++				      <property name="visible">True</property>
++				      <property name="label" translatable="yes">Filter</property>
++				      <property name="use_underline">False</property>
++				      <property name="use_markup">False</property>
++				      <property name="justify">GTK_JUSTIFY_LEFT</property>
++				      <property name="wrap">False</property>
++				      <property name="selectable">False</property>
++				      <property name="xalign">0.5</property>
++				      <property name="yalign">0.5</property>
++				      <property name="xpad">0</property>
++				      <property name="ypad">0</property>
++				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++				      <property name="width_chars">-1</property>
++				      <property name="single_line_mode">False</property>
++				      <property name="angle">0</property>
++				    </widget>
++				    <packing>
++				      <property name="padding">10</property>
++				      <property name="expand">False</property>
++				      <property name="fill">False</property>
++				    </packing>
++				  </child>
++
++				  <child>
++				    <widget class="GtkEntry" id="fcontextFilterEntry">
++				      <property name="visible">True</property>
++				      <property name="can_focus">True</property>
++				      <property name="editable">True</property>
++				      <property name="visibility">True</property>
++				      <property name="max_length">0</property>
++				      <property name="text" translatable="yes"></property>
++				      <property name="has_frame">True</property>
++				      <property name="invisible_char">???</property>
++				      <property name="activates_default">False</property>
++				      <signal name="changed" handler="on_booleansFilter_changed" last_modification_time="Fri, 06 Apr 2007 12:39:26 GMT"/>
++				    </widget>
++				    <packing>
++				      <property name="padding">0</property>
++				      <property name="expand">True</property>
++				      <property name="fill">True</property>
++				    </packing>
++				  </child>
++				</widget>
++				<packing>
++				  <property name="padding">5</property>
++				  <property name="expand">False</property>
++				  <property name="fill">True</property>
++				</packing>
++			      </child>
++
++			      <child>
++				<widget class="GtkTreeView" id="fcontextView">
++				  <property name="visible">True</property>
++				  <property name="can_focus">True</property>
++				  <property name="headers_visible">True</property>
++				  <property name="rules_hint">False</property>
++				  <property name="reorderable">False</property>
++				  <property name="enable_search">True</property>
++				  <property name="fixed_height_mode">False</property>
++				  <property name="hover_selection">False</property>
++				  <property name="hover_expand">False</property>
++				</widget>
++				<packing>
++				  <property name="padding">0</property>
++				  <property name="expand">True</property>
++				  <property name="fill">True</property>
++				</packing>
++			      </child>
++			    </widget>
++			  </child>
 +			</widget>
 +		      </child>
 +		    </widget>
@@ -6464,7 +6568,7 @@
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.9/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/system-config-selinux.py	2007-04-13 13:16:13.000000000 -0400
++++ policycoreutils-2.0.9/gui/system-config-selinux.py	2007-04-14 18:20:06.000000000 -0400
 @@ -0,0 +1,169 @@
 +#!/usr/bin/python
 +#
@@ -6637,7 +6741,7 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.9/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/executable.py	2007-04-13 13:16:13.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/executable.py	2007-04-13 13:28:43.000000000 -0400
 @@ -0,0 +1,156 @@
 +#! /usr/bin/env python
 +# Copyright (C) 2007 Red Hat 
@@ -6797,7 +6901,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.9/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/__init__.py	2007-04-13 13:16:13.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/__init__.py	2007-04-13 13:28:43.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -6819,7 +6923,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.9/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/network.py	2007-04-13 13:16:13.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/network.py	2007-04-13 13:28:43.000000000 -0400
 @@ -0,0 +1,46 @@
 +te_port_types="""\
 +# Default Networking
@@ -6869,7 +6973,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.9/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/rw.py	2007-04-13 13:16:13.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/rw.py	2007-04-13 13:28:43.000000000 -0400
 @@ -0,0 +1,106 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -6979,7 +7083,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.9/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/script.py	2007-04-13 13:16:13.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/script.py	2007-04-13 14:15:33.000000000 -0400
 @@ -0,0 +1,42 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7016,16 +7120,16 @@
 +"""
 +
 +tcp_ports="""\
-+semanage ports -a -t TEMPLATETYPE_port_t -p tcp PORTNUM
++semanage port -a -t TEMPLATETYPE_port_t -p tcp PORTNUM
 +"""
 +
 +udp_ports="""\
-+semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM
++semanage port -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.9/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/semodule.py	2007-04-13 13:16:13.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/semodule.py	2007-04-13 13:28:43.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7070,7 +7174,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.9/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/tmp.py	2007-04-13 13:16:13.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/tmp.py	2007-04-13 13:28:43.000000000 -0400
 @@ -0,0 +1,74 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7148,7 +7252,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.9/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_lib.py	2007-04-13 13:16:13.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/var_lib.py	2007-04-13 13:28:43.000000000 -0400
 @@ -0,0 +1,107 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7259,7 +7363,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.9/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_log.py	2007-04-13 13:16:13.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/var_log.py	2007-04-13 13:28:43.000000000 -0400
 @@ -0,0 +1,91 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7354,7 +7458,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.9/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_run.py	2007-04-13 13:16:13.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/var_run.py	2007-04-13 13:28:43.000000000 -0400
 @@ -0,0 +1,93 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7451,7 +7555,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.9/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_spool.py	2007-04-13 13:16:13.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/var_spool.py	2007-04-13 13:28:43.000000000 -0400
 @@ -0,0 +1,107 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7562,7 +7666,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.9/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/translationsPage.py	2007-04-13 13:16:13.000000000 -0400
++++ policycoreutils-2.0.9/gui/translationsPage.py	2007-04-14 18:20:06.000000000 -0400
 @@ -0,0 +1,111 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -7677,7 +7781,7 @@
 +        self.store.set_value(iter, 1, translation)
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.9/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/usersPage.py	2007-04-13 13:16:13.000000000 -0400
++++ policycoreutils-2.0.9/gui/usersPage.py	2007-04-14 18:20:06.000000000 -0400
 @@ -0,0 +1,166 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -r1.396 -r1.397
--- policycoreutils.spec	13 Apr 2007 17:29:19 -0000	1.396
+++ policycoreutils.spec	15 Apr 2007 01:42:09 -0000	1.397
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 2.0.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -108,6 +108,8 @@
 %files gui
 %{_bindir}/system-config-selinux
 %{_datadir}/applications/fedora-system-config-selinux.desktop
+%dir %{_datadir}/system-config-selinux
+%dir %{_datadir}/system-config-selinux/templates
 %{_datadir}/system-config-selinux/*.py*
 %{_datadir}/system-config-selinux/selinux.tbl
 %{_datadir}/system-config-selinux/*png
@@ -190,6 +192,9 @@
 fi
 
 %changelog
+* Sat Apr 14 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-3
+- Fixes for policygengui
+
 * Fri Apr 13 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-2
 - Add polgengui
 



From fedora-cvs-commits at redhat.com  Sun Apr 15 03:45:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 14 Apr 2007 23:45:47 -0400
Subject: rpms/kernel/devel patch-2.6.21-rc6-git7.bz2.sign, NONE,
	1.1 .cvsignore, 1.604, 1.605 kernel-2.6.spec, 1.3068,
	1.3069 sources, 1.567, 1.568 upstream, 1.495,
	1.496 patch-2.6.21-rc6-git5.bz2.sign, 1.1, NONE
Message-ID: <200704150345.l3F3jl9q010364@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.21-rc6-git7.bz2.sign 
Removed Files:
	patch-2.6.21-rc6-git5.bz2.sign 
Log Message:
* Sat Apr 14 2007 Dave Jones <davej at redhat.com>
- 2.6.21-rc6-git7



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

iD8DBQBGIJatyGugalF9Dw4RAlehAJ9kmogSz77NMLEdS4TMHDyrulSbiQCfTBsF
k53RzTZ2EjRDcNZdQ5F2XWs=
=JLkV
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.604
retrieving revision 1.605
diff -u -r1.604 -r1.605
--- .cvsignore	12 Apr 2007 19:34:51 -0000	1.604
+++ .cvsignore	15 Apr 2007 03:45:45 -0000	1.605
@@ -5,4 +5,4 @@
 kernel-2.6.20
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc6.bz2
-patch-2.6.21-rc6-git5.bz2
+patch-2.6.21-rc6-git7.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3068
retrieving revision 1.3069
diff -u -r1.3068 -r1.3069
--- kernel-2.6.spec	14 Apr 2007 20:48:53 -0000	1.3068
+++ kernel-2.6.spec	15 Apr 2007 03:45:45 -0000	1.3069
@@ -371,7 +371,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.21-rc6.bz2
-Patch2: patch-2.6.21-rc6-git5.bz2
+Patch2: patch-2.6.21-rc6-git7.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -2263,6 +2263,9 @@
 #  - tux.
 
 %changelog
+* Sat Apr 14 2007 Dave Jones <davej at redhat.com>
+- 2.6.21-rc6-git7
+
 * Sat Apr 14 2007 David Woodhouse <dwmw2 at redhat.com>
 - Add modalias attributes to ps3_system_bus devices in the (probably vain)
   hope that they'll fix the installer.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.567
retrieving revision 1.568
diff -u -r1.567 -r1.568
--- sources	12 Apr 2007 19:34:51 -0000	1.567
+++ sources	15 Apr 2007 03:45:45 -0000	1.568
@@ -1,4 +1,4 @@
 2618cbcc9c9ac1c3c04be903fe3338a7  sparse-0.2.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 291cbc4c09c5111e4a2030a04ee69b65  patch-2.6.21-rc6.bz2
-82bb55226ee8c8c33d88f233f936c384  patch-2.6.21-rc6-git5.bz2
+b9832b2e18dcfd95ace08c9e9771a196  patch-2.6.21-rc6-git7.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.495
retrieving revision 1.496
diff -u -r1.495 -r1.496
--- upstream	12 Apr 2007 19:34:51 -0000	1.495
+++ upstream	15 Apr 2007 03:45:45 -0000	1.496
@@ -1,3 +1,3 @@
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc6.bz2
-patch-2.6.21-rc6-git5.bz2
+patch-2.6.21-rc6-git7.bz2


--- patch-2.6.21-rc6-git5.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sun Apr 15 10:33:33 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 15 Apr 2007 06:33:33 -0400
Subject: rpms/evolution/devel evolution.spec,1.234.2.6,1.234.2.7
Message-ID: <200704151033.l3FAXXId029587@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
      Tag: private-evo-sanity-2_10_0-branch
	evolution.spec 
Log Message:
update



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.234.2.6
retrieving revision 1.234.2.7
diff -u -r1.234.2.6 -r1.234.2.7
--- evolution.spec	11 Apr 2007 22:49:20 -0000	1.234.2.6
+++ evolution.spec	15 Apr 2007 10:33:31 -0000	1.234.2.7
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.1
-Release: 2%{?dist}.dwmw2.1
+Release: 4%{?dist}.dwmw2.1
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -161,6 +161,12 @@
 # GNOME bug #427939 (gnome-doc-utils)
 Patch48: evolution-2.10.1-fix-gnome-doc-utils.patch
 
+# RH bug 235878 / GNOME bug #386503
+Patch49: evolution-2.10.1-fix-help.patch
+
+# RH bug 234315 / GNOME bug #423766
+Patch50: evolution-2.10.1-saving-attachments.patch
+
 ## Dependencies ###
 
 Patch1000: evolution-2.10.0-check-only-active-folders.patch
@@ -317,6 +323,8 @@
 %patch46 -p1 -b .use-glib-i18n
 %patch47 -p1 -b .drop-old-glib-support
 %patch48 -p1 -b .fix-gnome-doc-utils
+%patch49 -p1 -b .fix-help
+%patch50 -p1 -b .saving-attachments
 
 %patch1000 -p1
 %patch1002 -p1
@@ -736,6 +744,12 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Sat Apr 14 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-4.fc7
+- Add patch for RH bug #234315 (fix saving attachments).
+
+* Fri Apr 13 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-3.fc7
+- Add patch for RH bug #235878 (make Help->Contents work again).
+
 * Tue Apr 10 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-2.fc7
 - Revise patch for GNOME bug #362638 to fix RH bug #235096
   (crash when displaying a mail server message to user).



From fedora-cvs-commits at redhat.com  Sun Apr 15 11:27:29 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 15 Apr 2007 07:27:29 -0400
Subject: rpms/evolution/devel evolution-2.8.1-revert-ethread-parts.patch,
	NONE, 1.1.2.1
Message-ID: <200704151127.l3FBRTV0003559@cvs.devel.redhat.com>

Author: dwmw2

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

Added Files:
      Tag: private-evo-sanity-2_10_0-branch
	evolution-2.8.1-revert-ethread-parts.patch 
Log Message:
Add patch to revert parts of ethread patch


evolution-2.8.1-revert-ethread-parts.patch:
 em-folder-view.c |    1 
 em-sync-stream.c |  340 ++++++++++++++++++++++++++++++++++++++-----------------
 em-sync-stream.h |   64 ++++------
 mail-mt.c        |   31 ++---
 mail-mt.h        |    6 
 mail-ops.h       |    1 
 mail-session.c   |   20 +--
 7 files changed, 297 insertions(+), 166 deletions(-)

--- NEW FILE evolution-2.8.1-revert-ethread-parts.patch ---
--- evolution-2.10.1/mail/em-folder-view.c.orig	2007-04-15 12:19:38.000000000 +0100
+++ evolution-2.10.1/mail/em-folder-view.c	2007-04-15 12:19:53.000000000 +0100
@@ -68,7 +68,6 @@
 #include <gtkhtml/gtkhtml-stream.h>
 
 #include <libedataserver/e-data-server-util.h>
-#include <libedataserver/e-msgport.h>
 
 #include "menus/gal-view-etable.h"
 #include "menus/gal-view-factory-etable.h"
--- evolution-2.10.1/mail/em-sync-stream.h.orig	2007-04-15 12:19:38.000000000 +0100
+++ evolution-2.10.1/mail/em-sync-stream.h	2007-04-15 12:19:55.000000000 +0100
@@ -29,45 +29,41 @@ requests are always handled in the main 
 #ifndef EM_SYNC_STREAM_H
 #define EM_SYNC_STREAM_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
+#define EM_SYNC_STREAM_TYPE     (em_sync_stream_get_type ())
+#define EM_SYNC_STREAM(obj)     (CAMEL_CHECK_CAST((obj), EM_SYNC_STREAM_TYPE, EMSyncStream))
+#define EM_SYNC_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), EM_SYNC_STREAM_TYPE, EMSyncStreamClass))
+#define EM_IS_SYNC_STREAM(o)    (CAMEL_CHECK_TYPE((o), EM_SYNC_STREAM_TYPE))
+
 #include <glib.h>
 #include <camel/camel-stream.h>
 
-#define EM_SYNC_STREAM_TYPE \
-	(em_sync_stream_get_type ())
-#define EM_SYNC_STREAM(obj) \
-	(CAMEL_CHECK_CAST \
-	((obj), EM_SYNC_STREAM_TYPE, EMSyncStream))
-#define EM_SYNC_STREAM_CLASS(cls) \
-	(CAMEL_CHECK_CLASS_CAST \
-	((cls), EM_SYNC_STREAM_TYPE, EMSyncStreamClass))
-#define EM_IS_SYNC_STREAM(obj) \
-	(CAMEL_CHECK_TYPE ((obj), EM_SYNC_STREAM_TYPE))
-
-G_BEGIN_DECLS
-
-typedef struct _EMSyncStream EMSyncStream;
-typedef struct _EMSyncStreamClass EMSyncStreamClass;
-
-struct _EMSyncStream {
-	CamelStream parent;
-	GString *buffer;
-	gboolean cancel;
-};
+typedef struct _EMSyncStream {
+	CamelStream parent_stream;
 
-struct _EMSyncStreamClass {
-	CamelStreamClass parent_class;
+	struct _EMSyncStreamPrivate *priv;
 
-	gssize		(*sync_write)		(CamelStream *stream,
-						 const gchar *string,
-						 gsize len);
-	int		(*sync_close)		(CamelStream *stream);
-	int		(*sync_flush)		(CamelStream *stream);
-};
-
-CamelType	em_sync_stream_get_type		(void);
-void		em_sync_stream_set_buffer_size	(EMSyncStream *stream,
-						 gsize size);
+	int cancel;
+} EMSyncStream;
+
+typedef struct {
+	CamelStreamClass parent_class;
 
-G_END_DECLS
+	ssize_t   (*sync_write)      (CamelStream *stream, const char *buffer, size_t n);
+	int       (*sync_close)      (CamelStream *stream);
+	int       (*sync_flush)      (CamelStream *stream);
+	
+} EMSyncStreamClass;
+
+CamelType    em_sync_stream_get_type (void);
+void em_sync_stream_set_buffer_size(EMSyncStream *, size_t size);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
 
 #endif /* EM_SYNC_STREAM_H */
--- evolution-2.10.1/mail/em-sync-stream.c.orig	2007-04-15 12:19:38.000000000 +0100
+++ evolution-2.10.1/mail/em-sync-stream.c	2007-04-15 12:19:52.000000000 +0100
@@ -25,17 +25,42 @@
 #include <config.h>
 #endif
 
-#include "em-sync-stream.h"
-
-#include <stdio.h>
 #include <string.h>
+#include <stdio.h>
+#include <camel/camel-stream.h>
 #include <camel/camel-object.h>
-#include <libedataserver/e-flag.h>
+#include <gtk/gtkmain.h>
+#include "em-sync-stream.h"
 
 #include "mail-mt.h"
 
+#define LOG_STREAM
+
+#define d(x) 
+
 #define EMSS_CLASS(x) ((EMSyncStreamClass *)(((CamelObject *)(x))->klass))
 
+struct _EMSyncStreamPrivate {
+	/* FIXME: use a single data port/gui channel for all instances */
+	/* TODO: possibly just use one of the mail-mt ports ... */
+	struct _EMsgPort *data_port, *reply_port;
+	struct _GIOChannel *gui_channel;
+	guint gui_watch;
+
+	char *buf_data;
+	int buf_used;
+	int buf_size;
+
+#ifdef LOG_STREAM
+	FILE *logfd;
+#endif
+};
+
+#ifdef LOG_STREAM
+int dolog;
+#endif
+
+/* Should probably expose messages to outside world ... so subclasses can extend */
 enum _write_msg_t {
 	EMSS_WRITE,
 	EMSS_FLUSH,
@@ -43,168 +68,275 @@ enum _write_msg_t {
 };
 
 struct _write_msg {
-	EMSyncStream *emss;
-	EFlag *processed;
+	EMsg msg;
 
 	enum _write_msg_t op;
 
-	const gchar *string;
-	gsize len;
+	const char *data;
+	size_t n;
 };
 
+static void em_sync_stream_class_init (EMSyncStreamClass *klass);
+static void em_sync_stream_init (CamelObject *object);
+static void em_sync_stream_finalize (CamelObject *object);
+
+static ssize_t stream_write(CamelStream *stream, const char *buffer, size_t n);
+static int stream_close(CamelStream *stream);
+static int stream_flush(CamelStream *stream);
+
 static CamelStreamClass *parent_class = NULL;
 
-static gboolean
-emss_process_message (struct _write_msg *msg)
+CamelType
+em_sync_stream_get_type (void)
 {
-	struct _EMSyncStream *emss = msg->emss;
+	static CamelType type = CAMEL_INVALID_TYPE;
+	
+	if (type == CAMEL_INVALID_TYPE) {
+#ifdef LOG_STREAM
+		dolog = getenv("EVOLUTION_MAIL_LOG_HTML") != NULL;
+#endif
+		type = camel_type_register (CAMEL_STREAM_TYPE,
+					    "EMSyncStream",
+					    sizeof (EMSyncStream),
+					    sizeof (EMSyncStreamClass),
+					    (CamelObjectClassInitFunc) em_sync_stream_class_init,
+					    NULL,
+					    (CamelObjectInitFunc) em_sync_stream_init,
+					    (CamelObjectFinalizeFunc) em_sync_stream_finalize);
+	}
+	
+	return type;
+}
 
-	/* Force out any pending data before doing anything else. */
-	if (emss->buffer != NULL && emss->buffer->len > 0) {
-		EMSS_CLASS (emss)->sync_write (
-			CAMEL_STREAM (emss), emss->buffer->str,
-			emss->buffer->len);
-		g_string_set_size (emss->buffer, 0);
+static void
+em_sync_stream_class_init (EMSyncStreamClass *klass)
+{
+	CamelStreamClass *stream_class = CAMEL_STREAM_CLASS (klass);
+	
+	parent_class = (CamelStreamClass *) CAMEL_STREAM_TYPE;
+	
+	/* virtual method overload */
+	stream_class->write = stream_write;
+	stream_class->flush = stream_flush;
+	stream_class->close = stream_close;
+}
+
+static gboolean
+emcs_gui_received(GIOChannel *source, GIOCondition cond, void *data)
+{
+	EMSyncStream *emss = data;
+	struct _EMSyncStreamPrivate *p = emss->priv;
+	struct _write_msg *msg;
+
+	d(printf("%p: gui sync op job waiting\n", emss));
+
+	msg = (struct _write_msg *)e_msgport_get(p->data_port);
+	/* Should never happen ... */
+	if (msg == NULL)
+		return TRUE;
+
+	d(printf("%p: running sync op %d\n", emss, msg->op));
+
+	/* force out any pending data before doing anything else */
+	if (p->buf_used > 0) {
+		EMSS_CLASS(emss)->sync_write((CamelStream *)emss, p->buf_data, p->buf_used);
+#ifdef LOG_STREAM
+		if (p->logfd)
+			fwrite(p->buf_data, 1, p->buf_used, p->logfd);
+#endif
+		p->buf_used = 0;
 	}
 
+	/* FIXME: need to handle return values */
+
 	switch (msg->op) {
-		case EMSS_WRITE:
-			EMSS_CLASS (emss)->sync_write (
-				CAMEL_STREAM (emss), msg->string, msg->len);
-			break;
-		case EMSS_FLUSH:
-			EMSS_CLASS (emss)->sync_flush (
-				CAMEL_STREAM (emss));
-			break;
-		case EMSS_CLOSE:
-			EMSS_CLASS (emss)->sync_close (
-				CAMEL_STREAM (emss));
-			break;
+	case EMSS_WRITE:
+		EMSS_CLASS(emss)->sync_write((CamelStream *)emss, msg->data, msg->n);
+#ifdef LOG_STREAM
+		if (p->logfd)
+			fwrite(msg->data, 1, msg->n, p->logfd);
+#endif
+		break;
+	case EMSS_FLUSH:
+		EMSS_CLASS(emss)->sync_flush((CamelStream *)emss);
+		break;
+	case EMSS_CLOSE:
+		EMSS_CLASS(emss)->sync_close((CamelStream *)emss);
+#ifdef LOG_STREAM
+		if (p->logfd) {
+			fclose(p->logfd);
+			p->logfd = NULL;
+		}
+#endif
+		break;
 	}
+	
+	e_msgport_reply((EMsg *)msg);
+	d(printf("%p: gui sync op jobs done\n", emss));
 
-	e_flag_set (msg->processed);
+	return TRUE;
+}
+
+static void
+em_sync_stream_init (CamelObject *object)
+{
+	EMSyncStream *emss = (EMSyncStream *)object;
+	struct _EMSyncStreamPrivate *p;
+
+	p = emss->priv = g_malloc0(sizeof(*p));
 
-	return FALSE;
+	p->data_port = e_msgport_new();
+	p->reply_port = e_msgport_new();
+
+#ifndef G_OS_WIN32
+	p->gui_channel = g_io_channel_unix_new(e_msgport_fd(p->data_port));
+#else
+	p->gui_channel = g_io_channel_win32_new_socket(e_msgport_fd(p->data_port));
+#endif
+	p->gui_watch = g_io_add_watch(p->gui_channel, G_IO_IN, emcs_gui_received, emss);
+
+#ifdef LOG_STREAM
+	if (dolog) {
+		char name[32];
+		static int count;
+
+		sprintf(name, "sync-stream.%d.html", count++);
+		printf("Saving raw data stream to '%s'\n", name);
+		p->logfd = fopen(name, "w");
+	}
+#endif
+
+	d(printf("%p: new emss\n", emss));
 }
 
 static void
-emss_sync_op (EMSyncStream *emss, enum _write_msg_t op,
-              const gchar *string, gsize len)
+sync_op(EMSyncStream *emss, enum _write_msg_t op, const char *data, size_t n)
 {
+	struct _EMSyncStreamPrivate *p = emss->priv;
 	struct _write_msg msg;
+	EMsg *reply_msg;
+
+	d(printf("%p: launching sync op %d\n", emss, op));
+
+	/* we do everything synchronous, we should never have any locks, and
+	   this prevents overflow from banked up data */
 
-	msg.processed = e_flag_new ();
-	msg.emss = emss;
+	msg.msg.reply_port = p->reply_port;
 	msg.op = op;
-	msg.string = string;
-	msg.len = len;
+	msg.data = data;
+	msg.n = n;
 
-	camel_object_ref (emss);
+	e_msgport_put(p->data_port, &msg.msg);
+	reply_msg = e_msgport_wait(p->reply_port);
+	g_assert(reply_msg == &msg.msg);
 
-	g_idle_add ((GSourceFunc) emss_process_message, &msg);
+	d(printf("%p: returned sync op %d\n", emss, op));
+}
 
-	e_flag_wait (msg.processed);
-	e_flag_free (msg.processed);
+static void
+em_sync_stream_finalize (CamelObject *object)
+{
+	EMSyncStream *emss = (EMSyncStream *)object;
+	struct _EMSyncStreamPrivate *p = emss->priv;
 
-	camel_object_unref (emss);
+	/* TODO: is this stuff safe to do in another thread? */
+	g_source_remove(p->gui_watch);
+	g_io_channel_unref(p->gui_channel);
+
+	e_msgport_destroy(p->data_port);
+	e_msgport_destroy(p->reply_port);
+
+	p->data_port = NULL;
+	p->reply_port = NULL;
+
+	g_free(p->buf_data);
+
+#ifdef LOG_STREAM
+	if (p->logfd)
+		fclose(p->logfd);
+#endif
+
+	g_free(p);
 }
 
-static gssize
-emss_stream_write (CamelStream *stream, const gchar *string, gsize len)
+static ssize_t
+stream_write (CamelStream *stream, const char *buffer, size_t n)
 {
 	EMSyncStream *emss = EM_SYNC_STREAM (stream);
+	struct _EMSyncStreamPrivate *p = emss->priv;
 
 	if (emss->cancel)
 		return -1;
 
 	if (mail_in_main_thread ()) {
-		EMSS_CLASS (emss)->sync_write (stream, string, len);
-	} else if (emss->buffer != NULL) {
-		if (len < (emss->buffer->allocated_len - emss->buffer->len))
-			g_string_append_len (emss->buffer, string, len);
-		else
-			emss_sync_op (emss, EMSS_WRITE, string, len);
+		EMSS_CLASS(emss)->sync_write(stream, buffer, n);
+#ifdef LOG_STREAM
+		if (p->logfd)
+			fwrite(buffer, 1, n, p->logfd);
+#endif
+	} else if (p->buf_size > 0) {
+		size_t left = p->buf_size-p->buf_used;
+
+		if (n >= left) {
+			sync_op(emss, EMSS_WRITE, buffer, n);
+		} else {
+			memcpy(p->buf_data + p->buf_used, buffer, n);
+			p->buf_used += n;
+		}
 	} else {
-		emss_sync_op(emss, EMSS_WRITE, string, len);
+		sync_op(emss, EMSS_WRITE, buffer, n);
 	}
 
-	return (gssize) len;
+	return (ssize_t) n;
 }
 
 static int
-emss_stream_flush (CamelStream *stream)
+stream_flush(CamelStream *stream)
 {
-	EMSyncStream *emss = EM_SYNC_STREAM (stream);
+	EMSyncStream *emss = (EMSyncStream *)stream;
 
 	if (emss->cancel)
 		return -1;
 
 	if (mail_in_main_thread ())
-		return EMSS_CLASS (emss)->sync_flush (stream);
+		return ((EMSyncStreamClass *)(((CamelObject *)emss)->klass))->sync_flush(stream);
 	else
-		emss_sync_op (emss, EMSS_FLUSH, NULL, 0);
+		sync_op(emss, EMSS_FLUSH, NULL, 0);
 
 	return 0;
 }
 
 static int
-emss_stream_close (CamelStream *stream)
+stream_close(CamelStream *stream)
 {
-	EMSyncStream *emss = EM_SYNC_STREAM (stream);
+	EMSyncStream *emss = (EMSyncStream *)stream;
 
 	if (emss->cancel)
 		return -1;
 
-	if (mail_in_main_thread ())
-		return EMSS_CLASS (emss)->sync_close (stream);
-	else
-		emss_sync_op (emss, EMSS_CLOSE, NULL, 0);
-
-	return 0;
-}
-
-static void
-em_sync_stream_class_init (EMSyncStreamClass *class)
-{
-	CamelStreamClass *stream_class = CAMEL_STREAM_CLASS (class);
-
-	parent_class = (CamelStreamClass *) CAMEL_STREAM_TYPE;
-
-	stream_class->write = emss_stream_write;
-	stream_class->flush = emss_stream_flush;
-	stream_class->close = emss_stream_close;
-}
-
-static void
-em_sync_stream_finalize (EMSyncStream *emss)
-{
-	if (emss->buffer != NULL)
-		g_string_free (emss->buffer, TRUE);
-}
+	d(printf("%p: closing stream\n", stream));
 
-CamelType
-em_sync_stream_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-
-	if (G_UNLIKELY (type == CAMEL_INVALID_TYPE))
-		type = camel_type_register (
-			CAMEL_STREAM_TYPE,
-			"EMSyncStream",
-			sizeof (EMSyncStream),
-			sizeof (EMSyncStreamClass),
-			(CamelObjectClassInitFunc) em_sync_stream_class_init,
-			NULL,
-			(CamelObjectInitFunc) NULL,
-			(CamelObjectFinalizeFunc) em_sync_stream_finalize);
+	if (mail_in_main_thread ()) {
+#ifdef LOG_STREAM
+		if (emss->priv->logfd) {
+			fclose(emss->priv->logfd);
+			emss->priv->logfd = NULL;
+		}
+#endif
+		return ((EMSyncStreamClass *)(((CamelObject *)emss)->klass))->sync_close(stream);
+	} else
+		sync_op(emss, EMSS_CLOSE, NULL, 0);
 
-	return type;
+	return 0;
 }
 
 void
-em_sync_stream_set_buffer_size (EMSyncStream *emss, gsize size)
+em_sync_stream_set_buffer_size(EMSyncStream *emss, size_t size)
 {
-	if (emss->buffer != NULL)
-		g_string_free (emss->buffer, TRUE);
-	emss->buffer = g_string_sized_new (size);
+	struct _EMSyncStreamPrivate *p = emss->priv;
+
+	g_free(p->buf_data);
+	p->buf_data = g_malloc(size);
+	p->buf_size = size;
+	p->buf_used = 0;
 }
--- evolution-2.10.1/mail/mail-mt.h.orig	2007-04-15 12:19:38.000000000 +0100
+++ evolution-2.10.1/mail/mail-mt.h	2007-04-15 12:19:53.000000000 +0100
@@ -25,12 +25,12 @@
 
 #include <pthread.h>
 #include "camel/camel-exception.h"
-#include "libedataserver/e-flag.h"
+#include "libedataserver/e-msgport.h"
 #include "camel/camel-object.h"
 #include "camel/camel-operation.h"
 
 typedef struct _mail_msg {
-	EFlag *processed;	/* optional */
+	EMsg msg;		/* parent type */
 	struct _mail_msg_op *ops; /* operation functions */
 	unsigned int seq;	/* seq number for synchronisation */
 	gint priority;		/* priority (default = 0) */
@@ -55,7 +55,7 @@ void mail_msg_cleanup (void);
 gboolean mail_in_main_thread (void);
 
 /* allocate a new message */
-void *mail_msg_new(mail_msg_op_t *ops, EFlag *processed, size_t size);
+void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size);
 void mail_msg_free(void *msg);
 void mail_msg_check_error(void *msg);
 void mail_msg_cancel(unsigned int msgid);
--- evolution-2.10.1/mail/mail-mt.c.orig	2007-04-15 12:19:39.000000000 +0100
+++ evolution-2.10.1/mail/mail-mt.c	2007-04-15 12:19:55.000000000 +0100
@@ -29,6 +29,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
+#include <libedataserver/e-msgport.h>
 #include <libedataserver/e-data-server-util.h>
 
 #include <camel/camel-url.h>
@@ -83,7 +84,7 @@ static pthread_cond_t mail_msg_cond = PT
 
 MailAsyncEvent *mail_async_event;
 
-void *mail_msg_new(mail_msg_op_t *ops, EFlag *processed, size_t size)
+void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size)
 {
 	struct _mail_msg *msg;
 
@@ -117,9 +118,9 @@ void *mail_msg_new(mail_msg_op_t *ops, E
 	}
 #endif
 	msg = g_malloc0(size);
-	msg->processed = processed;  /* owned by caller */
 	msg->ops = ops;
 	msg->seq = mail_msg_seq++;
+	msg->msg.reply_port = reply_port;
 	msg->cancel = camel_operation_new(mail_operation_status, GINT_TO_POINTER(msg->seq));
 	camel_exception_init(&msg->ex);
 	msg->priv = g_malloc0(sizeof(*msg->priv));
@@ -442,11 +443,11 @@ periodic_processing (void)
 	/* check the main loop queue */
 	while ((msg = g_async_queue_try_pop (main_loop_queue)) != NULL) {
 
-		/* If the message has a "processed" EFlag, it must also have
-		 * a receive_msg() callback.  The receive_msg() callback is
-		 * responsible for setting the EFlag, and thread blocked on
-		 * the EFlag is reponsible for freeing it. */
-		if (msg->processed != NULL) {
+		/* If the message has a reply_port, it must also have a
+		 * receive_msg() callback.  The receive_msg() callback is
+		 * responsible for issuing the reply, and the recipient of
+		 * the reply is responsible for freeing the message. */
+		if (msg->msg.reply_port != NULL) {
 			g_assert (msg->ops->receive_msg != NULL);
 			msg->ops->receive_msg (msg);
 		} else {
@@ -785,8 +786,8 @@ do_call(struct _mail_msg *mm)
 		break;
 	}
 
-	if (mm->processed != NULL)
-		e_flag_set (mm->processed);
+	if (mm->msg.reply_port != NULL)
+		e_msgport_reply ((EMsg *) mm);
 }
 
 static struct _mail_msg_op mail_call_op = {
@@ -801,22 +802,22 @@ void *mail_call_main(mail_call_t type, M
 	struct _call_msg *m;
 	void *ret;
 	va_list ap;
-	EFlag *processed = NULL;
+	EMsgPort *reply = NULL;
 
 	va_start(ap, func);
 
 	if (!mail_in_main_thread ())
-		processed = e_flag_new ();
+		reply = e_msgport_new();
 
-	m = mail_msg_new(&mail_call_op, processed, sizeof(*m));
+	m = mail_msg_new(&mail_call_op, reply, sizeof(*m));
 	m->type = type;
 	m->func = func;
 	G_VA_COPY(m->ap, ap);
 
-	if (processed != NULL) {
+	if (reply != NULL) {
 		mail_msg_main_loop_push((mail_msg_t *) m);
-		e_flag_wait (processed);
-		e_flag_free (processed);
+		e_msgport_wait(reply);
+		e_msgport_destroy(reply);
 	} else {
 		do_call(&m->msg);
 	}
--- evolution-2.10.1/mail/mail-ops.h.orig	2007-04-15 12:19:38.000000000 +0100
+++ evolution-2.10.1/mail/mail-ops.h	2007-04-15 12:19:53.000000000 +0100
@@ -38,6 +38,7 @@ extern "C" {
 #include "camel/camel-mime-message.h"
 #include "camel/camel-operation.h"
 
+#include "libedataserver/e-msgport.h"
 #include "libedataserver/e-account.h"
 
 void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info,
--- evolution-2.10.1/mail/mail-session.c.orig	2007-04-15 12:19:38.000000000 +0100
+++ evolution-2.10.1/mail/mail-session.c	2007-04-15 12:24:04.000000000 +0100
@@ -35,7 +35,7 @@
 #include <libgnome/gnome-sound.h>
 
 #include <libedataserverui/e-passwords.h>
-#include <libedataserver/e-flag.h>
+#include <libedataserver/e-msgport.h>
 
 #include <camel/camel.h>	/* FIXME: this is where camel_init is defined, it shouldn't include everything else */
 #include <camel/camel-filter-driver.h>
@@ -283,7 +283,7 @@ user_message_response (GtkDialog *dialog
 	/* if !allow_cancel, then we've already replied */
 	if (m->allow_cancel) {
 		m->result = button == GTK_RESPONSE_OK;
-		e_flag_set (m->msg.processed);
+		e_msgport_reply((EMsg *)m);
 	}
 	
 	/* check for pendings */
@@ -356,16 +356,16 @@ static gboolean
 alert_user(CamelSession *session, CamelSessionAlertType type, const char *prompt, gboolean cancel)
 {
 	MailSession *mail_session = MAIL_SESSION (session);
-	struct _user_message_msg *m;
-	EFlag *processed = NULL;
+	struct _user_message_msg *m, *r;
+	EMsgPort *user_message_reply = NULL;
 	gboolean ret;
 
 	if (!mail_session->interactive)
 		return FALSE;
 
-	processed = e_flag_new ();
+	user_message_reply = e_msgport_new ();  
 
-	m = mail_msg_new (&user_message_op, processed, sizeof (*m));
+	m = mail_msg_new (&user_message_op, user_message_reply, sizeof (*m));
 	m->ismain = mail_in_main_thread();
 	m->type = type;
 	m->prompt = g_strdup(prompt);
@@ -378,10 +378,12 @@ alert_user(CamelSession *session, CamelS
 	}
 
 	if (cancel) {
-		e_flag_wait (processed);
-		e_flag_free (processed);
+		r = (struct _user_message_msg *)e_msgport_wait(user_message_reply);
+		g_assert(m == r);
+
 		ret = m->result;
 		mail_msg_free(m);
+		e_msgport_destroy(user_message_reply);
 	} else
 		ret = TRUE;
 
@@ -673,7 +675,7 @@ mail_session_set_interactive (gboolean i
 		/* flush/cancel pending user messages */
 		while ((um = (struct _user_message_msg *) e_dlist_remhead (&message_list))) {
 			d(printf ("Flusing message request: %s\n", um->prompt));
-			e_flag_set (um->msg.processed);
+			e_msgport_reply((EMsg *) um);
 		}
 		
 		/* and the current */



From fedora-cvs-commits at redhat.com  Sun Apr 15 11:28:19 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 15 Apr 2007 07:28:19 -0400
Subject: rpms/evolution/devel evolution.spec,1.234.2.7,1.234.2.8
Message-ID: <200704151128.l3FBSJGb004233@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
      Tag: private-evo-sanity-2_10_0-branch
	evolution.spec 
Log Message:
revert parts of ethread patch


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.234.2.7
retrieving revision 1.234.2.8
diff -u -r1.234.2.7 -r1.234.2.8
--- evolution.spec	15 Apr 2007 10:33:31 -0000	1.234.2.7
+++ evolution.spec	15 Apr 2007 11:28:17 -0000	1.234.2.8
@@ -170,6 +170,7 @@
 ## Dependencies ###
 
 Patch1000: evolution-2.10.0-check-only-active-folders.patch
+Patch1001: evolution-2.8.1-revert-ethread-parts.patch
 Patch1002: evolution-2.6.0-improve-select-thread.patch
 
 Requires(post): GConf2
@@ -327,6 +328,7 @@
 %patch50 -p1 -b .saving-attachments
 
 %patch1000 -p1
+%patch1001 -p1
 %patch1002 -p1
 
 mkdir -p krb5-fakeprefix/include



From fedora-cvs-commits at redhat.com  Sun Apr 15 11:28:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 15 Apr 2007 07:28:45 -0400
Subject: rpms/evolution/devel evolution.spec,1.234.2.8,1.234.2.9
Message-ID: <200704151128.l3FBSjMw004599@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
      Tag: private-evo-sanity-2_10_0-branch
	evolution.spec 
Log Message:
bump release


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.234.2.8
retrieving revision 1.234.2.9
diff -u -r1.234.2.8 -r1.234.2.9
--- evolution.spec	15 Apr 2007 11:28:17 -0000	1.234.2.8
+++ evolution.spec	15 Apr 2007 11:28:43 -0000	1.234.2.9
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.1
-Release: 4%{?dist}.dwmw2.1
+Release: 4%{?dist}.dwmw2.2
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite



From fedora-cvs-commits at redhat.com  Sun Apr 15 11:57:37 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 15 Apr 2007 07:57:37 -0400
Subject: rpms/evolution/devel evolution-2.8.1-revert-ethread-parts.patch,
	1.1.2.1, 1.1.2.2
Message-ID: <200704151157.l3FBvbIP005337@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
      Tag: private-evo-sanity-2_10_0-branch
	evolution-2.8.1-revert-ethread-parts.patch 
Log Message:
build fix

evolution-2.8.1-revert-ethread-parts.patch:
 em-folder-view.c |    1 
 em-sync-stream.c |  340 ++++++++++++++++++++++++++++++++++++++-----------------
 em-sync-stream.h |   64 ++++------
 mail-mt.c        |   31 ++---
 mail-mt.h        |    6 
 mail-ops.h       |    1 
 mail-session.c   |   21 +--
 7 files changed, 297 insertions(+), 167 deletions(-)

Index: evolution-2.8.1-revert-ethread-parts.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/Attic/evolution-2.8.1-revert-ethread-parts.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- evolution-2.8.1-revert-ethread-parts.patch	15 Apr 2007 11:27:27 -0000	1.1.2.1
+++ evolution-2.8.1-revert-ethread-parts.patch	15 Apr 2007 11:57:34 -0000	1.1.2.2
@@ -699,3 +699,13 @@
  		}
  		
  		/* and the current */
+--- evolution-2.10.1/mail/mail-session.c~	2007-04-15 12:25:11.000000000 +0100
++++ evolution-2.10.1/mail/mail-session.c	2007-04-15 12:55:49.000000000 +0100
+@@ -337,7 +337,6 @@ do_user_message (struct _mail_msg *mm)
+ 		g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_widget_destroy), message_dialog);
+ 		g_object_add_weak_pointer (message_dialog, &message_dialog);
+ 		gtk_widget_show (message_dialog);
+-		e_flag_free (mm->processed);
+ 		mail_msg_free(m);
+ 	}
+ }



From fedora-cvs-commits at redhat.com  Sun Apr 15 20:05:24 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 15 Apr 2007 16:05:24 -0400
Subject: rpms/kernel/devel patch-2.6.21-rc6-git8.bz2.sign, NONE,
	1.1 .cvsignore, 1.605, 1.606 kernel-2.6.spec, 1.3069,
	1.3070 sources, 1.568, 1.569 upstream, 1.496,
	1.497 patch-2.6.21-rc6-git7.bz2.sign, 1.1, NONE
Message-ID: <200704152005.l3FK5O0x001538@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.21-rc6-git8.bz2.sign 
Removed Files:
	patch-2.6.21-rc6-git7.bz2.sign 
Log Message:
* Sun Apr 15 2007 Dave Jones <davej at redhat.com>
- 2.6.21-rc6-git8



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

iD8DBQBGIes9yGugalF9Dw4RAub9AKCFe/IpJCsp2eW5Qd4mEXJ81r0SDQCeI6XF
zANHU255Rte4scGRT4ler+I=
=w/gN
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.605
retrieving revision 1.606
diff -u -r1.605 -r1.606
--- .cvsignore	15 Apr 2007 03:45:45 -0000	1.605
+++ .cvsignore	15 Apr 2007 20:05:21 -0000	1.606
@@ -5,4 +5,4 @@
 kernel-2.6.20
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc6.bz2
-patch-2.6.21-rc6-git7.bz2
+patch-2.6.21-rc6-git8.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3069
retrieving revision 1.3070
diff -u -r1.3069 -r1.3070
--- kernel-2.6.spec	15 Apr 2007 03:45:45 -0000	1.3069
+++ kernel-2.6.spec	15 Apr 2007 20:05:21 -0000	1.3070
@@ -371,7 +371,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.21-rc6.bz2
-Patch2: patch-2.6.21-rc6-git7.bz2
+Patch2: patch-2.6.21-rc6-git8.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -2263,6 +2263,9 @@
 #  - tux.
 
 %changelog
+* Sun Apr 15 2007 Dave Jones <davej at redhat.com>
+- 2.6.21-rc6-git8
+
 * Sat Apr 14 2007 Dave Jones <davej at redhat.com>
 - 2.6.21-rc6-git7
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.568
retrieving revision 1.569
diff -u -r1.568 -r1.569
--- sources	15 Apr 2007 03:45:45 -0000	1.568
+++ sources	15 Apr 2007 20:05:21 -0000	1.569
@@ -1,4 +1,4 @@
 2618cbcc9c9ac1c3c04be903fe3338a7  sparse-0.2.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 291cbc4c09c5111e4a2030a04ee69b65  patch-2.6.21-rc6.bz2
-b9832b2e18dcfd95ace08c9e9771a196  patch-2.6.21-rc6-git7.bz2
+9729a264f4725f8c46db196b85526dfc  patch-2.6.21-rc6-git8.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.496
retrieving revision 1.497
diff -u -r1.496 -r1.497
--- upstream	15 Apr 2007 03:45:45 -0000	1.496
+++ upstream	15 Apr 2007 20:05:21 -0000	1.497
@@ -1,3 +1,3 @@
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc6.bz2
-patch-2.6.21-rc6-git7.bz2
+patch-2.6.21-rc6-git8.bz2


--- patch-2.6.21-rc6-git7.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sun Apr 15 20:38:06 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 15 Apr 2007 16:38:06 -0400
Subject: rpms/pwlib/devel .cvsignore, 1.18, 1.19 pwlib.spec, 1.46,
	1.47 sources, 1.18, 1.19
Message-ID: <200704152038.l3FKc62X019887@cvs.devel.redhat.com>

Author: veillard

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

Modified Files:
	.cvsignore pwlib.spec sources 
Log Message:
Update for latest ekiga, Daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pwlib/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	12 Mar 2007 14:23:29 -0000	1.18
+++ .cvsignore	15 Apr 2007 20:38:04 -0000	1.19
@@ -2,3 +2,5 @@
 pwlib-1.10.3.tar.gz
 pwlib-1.10.4.tar.gz
 pwlib-1.10.5.tar.gz
+pwlib-1.10.6.tar.gz
+pwlib-1.10.7.tar.gz


Index: pwlib.spec
===================================================================
RCS file: /cvs/dist/rpms/pwlib/devel/pwlib.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- pwlib.spec	12 Mar 2007 14:23:29 -0000	1.46
+++ pwlib.spec	15 Apr 2007 20:38:04 -0000	1.47
@@ -1,6 +1,6 @@
 Summary:	Portable Windows Libary
 Name:		pwlib
-Version:	1.10.5
+Version:	1.10.7
 Release:        1%{?dist}
 URL:		http://www.openh323.org/
 Source0:	http://www.ekiga.org/pwlib-%{version}.tar.gz
@@ -96,6 +96,12 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Sun Apr 15 2007 Daniel Veillard <veillard at redhat.com> - 1.10.7-1
+- Update to 1.10.7
+
+* Tue Apr 10 2007 Daniel Veillard <veillard at redhat.com> - 1.10.6-1
+- Update to 1.10.6
+
 * Mon Mar 12 2007 Daniel Veillard <veillard at redhat.com> - 1.10.5-1
 - Update to 1.10.5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pwlib/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	12 Mar 2007 14:23:29 -0000	1.18
+++ sources	15 Apr 2007 20:38:04 -0000	1.19
@@ -1 +1 @@
-1d5f444aedc56f7936bb87ccf21549e7  pwlib-1.10.5.tar.gz
+29c061328e93bda77423edb8bdabbddd  pwlib-1.10.7.tar.gz



From fedora-cvs-commits at redhat.com  Sun Apr 15 20:41:59 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 15 Apr 2007 16:41:59 -0400
Subject: rpms/opal/devel .cvsignore, 1.8, 1.9 opal.spec, 1.18, 1.19 sources,
	1.9, 1.10
Message-ID: <200704152041.l3FKfxt2022830@cvs.devel.redhat.com>

Author: veillard

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

Modified Files:
	.cvsignore opal.spec sources 
Log Message:
Update for version of ekiga-2.0.9, Daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/opal/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	12 Mar 2007 14:26:17 -0000	1.8
+++ .cvsignore	15 Apr 2007 20:41:57 -0000	1.9
@@ -2,3 +2,5 @@
 opal-2.2.4.tar.gz
 opal-2.2.5.tar.gz
 opal-2.2.6.tar.gz
+opal-2.2.7.tar.gz
+opal-2.2.8.tar.gz


Index: opal.spec
===================================================================
RCS file: /cvs/dist/rpms/opal/devel/opal.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- opal.spec	12 Mar 2007 14:26:17 -0000	1.18
+++ opal.spec	15 Apr 2007 20:41:57 -0000	1.19
@@ -1,13 +1,13 @@
 Summary: Open Phone Abstraction Library
 Name: opal
-Version: 2.2.6
+Version: 2.2.8
 Release: 1%{?dist}
 URL: http://www.openh323.org/
 Source0: http://www.ekiga.org/%{name}-%{version}.tar.gz
 License: MPL
 Group: System Environment/Libraries
-Requires: pwlib >= 1.10.5
-BuildRequires: pwlib-devel >= 1.10.5
+Requires: pwlib >= 1.10.7
+BuildRequires: pwlib-devel >= 1.10.7
 BuildRequires: openldap-devel
 BuildRequires: SDL-devel
 BuildRoot: %{_tmppath}/%{name}-root
@@ -21,7 +21,7 @@
 Summary: Development package for opal
 Group: Development/Libraries
 Requires: opal = %{PACKAGE_VERSION}
-Requires: pwlib-devel >= 1.10.5
+Requires: pwlib-devel >= 1.10.7
 Obsoletes: openh323-devel
 %description devel
 Static libraries and header files for development with opal.
@@ -59,6 +59,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Sun Apr 15 2007 Daniel Veillard <veillard at redhat.com> - 2.2.8-1
+- upstream release of 2.2.8
+
 * Mon Mar 12 2007 Daniel Veillard <veillard at redhat.com> - 2.2.6-1
 - upstream release of 2.2.6
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/opal/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	12 Mar 2007 14:26:17 -0000	1.9
+++ sources	15 Apr 2007 20:41:57 -0000	1.10
@@ -1 +1 @@
-7c83abfe93fbe6a868f5230d5bbec7aa  opal-2.2.6.tar.gz
+700b0c3a7606afc0dc6c9d3c12fcb23b  opal-2.2.8.tar.gz



From fedora-cvs-commits at redhat.com  Sun Apr 15 20:46:56 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 15 Apr 2007 16:46:56 -0400
Subject: rpms/ekiga/devel .cvsignore, 1.9, 1.10 ekiga.spec, 1.37,
	1.38 sources, 1.11, 1.12
Message-ID: <200704152046.l3FKkucS026532@cvs.devel.redhat.com>

Author: veillard

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

Modified Files:
	.cvsignore ekiga.spec sources 
Log Message:
Update to Ekiga 2.0.9, Daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ekiga/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	12 Mar 2007 14:38:43 -0000	1.9
+++ .cvsignore	15 Apr 2007 20:46:54 -0000	1.10
@@ -2,3 +2,4 @@
 ekiga-2.0.4.tar.gz
 ekiga-2.0.5.tar.gz
 ekiga-2.0.7.tar.gz
+ekiga-2.0.9.tar.gz


Index: ekiga.spec
===================================================================
RCS file: /cvs/dist/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ekiga.spec	12 Mar 2007 14:38:43 -0000	1.37
+++ ekiga.spec	15 Apr 2007 20:46:54 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: A Gnome based SIP/H323 teleconferencing application
 Name: ekiga
-Version: 2.0.7
-Release: 2%{?dist}
+Version: 2.0.9
+Release: 1%{?dist}
 URL: http://www.ekiga.org/
 Source0: http://www.ekiga.org/ekiga-%{version}.tar.gz
 # fixed in upstream cvs
@@ -9,8 +9,8 @@
 License: GPL
 Group: Applications/Communications
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: pwlib >= 1.10.5
-Requires: opal >= 2.2.6
+Requires: pwlib >= 1.10.7
+Requires: opal >= 2.2.8
 Requires: GConf2 >= 1.2.1
 Requires: libgnomeui >= 2.0
 Requires: libgnome >= 2.0
@@ -25,8 +25,8 @@
 BuildRequires: avahi-devel >= 0.6.9
 BuildRequires: avahi-glib-devel >= 0.6.9
 BuildRequires: openldap-devel
-BuildRequires: pwlib-devel >= 1.10.5
-BuildRequires: opal-devel >= 2.2.6
+BuildRequires: pwlib-devel >= 1.10.7
+BuildRequires: opal-devel >= 2.2.8
 BuildRequires: libxml2-devel >= 2.5.0
 BuildRequires: SDL-devel
 BuildRequires: intltool >= 0.22
@@ -96,6 +96,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Sun Apr 15 2007 Daniel Veillard <veillard at redhat.com> - 2.0.9.1
+- Upgrade to ekiga-2.0.9
+
 * Mon Mar 12 2007 Daniel Veillard <veillard at redhat.com> - 2.0.7-1
 - Upgrade to ekiga-2.0.7
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ekiga/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	12 Mar 2007 14:38:43 -0000	1.11
+++ sources	15 Apr 2007 20:46:54 -0000	1.12
@@ -1 +1 @@
-ec43c03ad942f87fb1d5cbcec5153b64  ekiga-2.0.7.tar.gz
+7dd9f812ce3b940839b12486ddee7e80  ekiga-2.0.9.tar.gz



From fedora-cvs-commits at redhat.com  Sun Apr 15 21:11:06 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 15 Apr 2007 17:11:06 -0400
Subject: rpms/ekiga/devel ekiga.spec,1.38,1.39
Message-ID: <200704152111.l3FLB6ve011704@cvs.devel.redhat.com>

Author: veillard

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

Modified Files:
	ekiga.spec 
Log Message:
Opps old patch not needed anymore, Daniel



Index: ekiga.spec
===================================================================
RCS file: /cvs/dist/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ekiga.spec	15 Apr 2007 20:46:54 -0000	1.38
+++ ekiga.spec	15 Apr 2007 21:11:03 -0000	1.39
@@ -4,8 +4,6 @@
 Release: 1%{?dist}
 URL: http://www.ekiga.org/
 Source0: http://www.ekiga.org/ekiga-%{version}.tar.gz
-# fixed in upstream cvs
-Patch1: ekiga-2.0.2-transparent.patch
 License: GPL
 Group: Applications/Communications
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -47,7 +45,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .transparent
 
 %build
 CXXFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED=1 -fPIC"



From fedora-cvs-commits at redhat.com  Sun Apr 15 21:34:10 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 15 Apr 2007 17:34:10 -0400
Subject: rpms/epiphany/devel epiphany-2.18.1-default-bookmarks.patch, NONE,
	1.1 epiphany.spec, 1.143, 1.144 gnome-common.m4, 1.1,
	NONE gnome-compiler-flags.m4, 1.1, NONE
Message-ID: <200704152134.l3FLYAL0028460@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	epiphany.spec 
Added Files:
	epiphany-2.18.1-default-bookmarks.patch 
Removed Files:
	gnome-common.m4 gnome-compiler-flags.m4 
Log Message:
* Sun Apr 15 2007 Christopher Aillon <caillon at redhat.com> 2.18.1-2
- Use the system default bookmarks
- Remove no longer needed autotools BRs


epiphany-2.18.1-default-bookmarks.patch:
 ephy-bookmarks.c |   15 +--------------
 1 files changed, 1 insertion(+), 14 deletions(-)

--- NEW FILE epiphany-2.18.1-default-bookmarks.patch ---
--- epiphany-2.18.1/src/bookmarks/ephy-bookmarks.c.default-bookmarks	2007-03-11 15:58:34.000000000 -0400
+++ epiphany-2.18.1/src/bookmarks/ephy-bookmarks.c	2007-04-15 17:27:13.000000000 -0400
@@ -167,20 +167,7 @@
 static void
 ephy_bookmarks_init_defaults (EphyBookmarks *eb)
 {
-	int i;
-
-	for (i = 0; i < G_N_ELEMENTS (default_topics); i++)
-	{
-		ephy_bookmarks_add_keyword (eb, _(default_topics[i]));
-	}
-
-	for (i = 0; i < G_N_ELEMENTS (default_bookmarks); i++)
-	{
-		EphyNode *bmk;
-
-		bmk = ephy_bookmarks_add (eb, _(default_bookmarks[i].title),
-					  _(default_bookmarks[i].location));
-	}
+	ephy_bookmarks_import_mozilla (eb, "/usr/share/bookmarks/default-bookmarks.html");
 }
 
 static void


Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- epiphany.spec	10 Apr 2007 16:47:27 -0000	1.143
+++ epiphany.spec	15 Apr 2007 21:34:08 -0000	1.144
@@ -9,7 +9,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.18.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -39,10 +39,6 @@
 BuildRequires: startup-notification-devel
 BuildRequires: gettext-devel
 BuildRequires: perl(XML::Parser)
-# For patch2 
-BuildRequires: automake autoconf libtool
-Source1: gnome-common.m4
-Source2: gnome-compiler-flags.m4
 %ifnarch s390 s390x
 BuildRequires: NetworkManager-devel
 %endif
@@ -51,6 +47,7 @@
 # Patches
 Patch0: epiphany-1.0.1-home-page.patch
 Patch1: epiphany-2.17.3-use-pango.patch
+Patch2: epiphany-2.18.1-default-bookmarks.patch
 
 %description
 epiphany is a simple GNOME web browser based on the Mozilla rendering
@@ -87,15 +84,13 @@
 
 %patch0 -p1 -b .homepage
 %patch1 -p1 -b .use-pango
+%patch2 -p1 -b .default-bookmarks
 
 %build
 %ifnarch s390 s390x
 %define enable_nm --enable-network-manager
 %endif
 
-cp -a %{SOURCE1} %{SOURCE2} m4/
-autoreconf
-
 %configure --disable-scrollkeeper --enable-zeroconf --enable-python %{enable_nm} 
 make %{?_smp_mflags}
 
@@ -183,6 +178,10 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Sun Apr 15 2007 Christopher Aillon <caillon at redhat.com> 2.18.1-2
+- Use the system default bookmarks
+- Remove no longer needed autotools BRs
+
 * Tue Apr 10 2007 Christopher Aillon <caillon at redhat.com> 2.18.1-1
 - Update to 2.18.1
 


--- gnome-common.m4 DELETED ---


--- gnome-compiler-flags.m4 DELETED ---



From fedora-cvs-commits at redhat.com  Sun Apr 15 23:13:27 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 15 Apr 2007 19:13:27 -0400
Subject: rpms/fedora-bookmarks/devel default-bookmarks.html, 1.1,
	1.2 fedora-bookmarks.spec, 1.1, 1.2
Message-ID: <200704152313.l3FNDR8Z004902@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/fedora-bookmarks/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4856

Modified Files:
	default-bookmarks.html fedora-bookmarks.spec 
Log Message:
* Sun Apr 15 2007 Christopher Aillon <caillon at redhat.com> 7-1
- FC7 bookmarks based on http://fedoraproject.org/wiki/Releases/7/Bookmarks



Index: default-bookmarks.html
===================================================================
RCS file: /cvs/dist/rpms/fedora-bookmarks/devel/default-bookmarks.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default-bookmarks.html	20 Mar 2007 17:37:05 -0000	1.1
+++ default-bookmarks.html	15 Apr 2007 23:13:25 -0000	1.2
@@ -7,21 +7,39 @@
 <H1 LAST_MODIFIED="1130967916">Bookmarks</H1>
 
 <DL><p>
-    <DT><H3 ADD_DATE="961112773" LAST_MODIFIED="1158286788" PERSONAL_TOOLBAR_FOLDER="true" ID="NC:PersonalToolbarFolder">Personal Toolbar Folder</H3>
+    <DT><H3 ADD_DATE="961112773" LAST_MODIFIED="1176675480" PERSONAL_TOOLBAR_FOLDER="true" ID="NC:PersonalToolbarFolder">Personal Toolbar Folder</H3>
     <DL><p>
-        <DT><A HREF="http://fedora.redhat.com/docs/release-notes/" ADD_DATE="1158286602" LAST_VISIT="1158286627" LAST_MODIFIED="1158286806" ICON="data:image/x-icon;base64,AAABAAIAEBAAAAAAAABoBQAAJgAAACAgAAAAAAAAqAgAAI4FAAAoAAAAEAAAACAAAAABAAgAAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wDGeQAAxauNAG4uAAClfUwA9uC8AJdXAADerWEA2sOmAI9dJgCtcBoAsI5kAH9GAADp4NQAsGkAAJpuOQC6mnYA28y4AJpiFwDRt5YA+fXyALx3DQCndzgAwaSAAHg5AACMTgAAqYNYAL1tAACmYAAAn3REAJNlMwCwgkgAnmchAKFwMADPup8Aza+KAH5ECQCiZhUAe0ADAL2efADYx7MAn10AAK2CTwDdr2gAhkoAAMB1AAC3aAAArIddAJdqMwByNwAAl1EAAJJUAACfcDkAgEEAAJtaAAC8cgAAw6mJAPbiwAB2PQAAhEYAAJ92SAB7QwAAcTMAALZsAACngVUA/v38AHlAAACQUQAAo3tKAHU6AACJSwAAwKSDAJptNgDo3tIAs2kAAIJEAACVVQAAbzAAAHQ4AAB3OwAAw6qLAH1EAACCRwAAv3MAAKqGXQB5QgAAhEgAAIpOAAC3agAAfEIAAH5FAACARQAAgEcAAIhKAADFeAAAvXEAAG4vAABvLwAAdzoAAHc9AAB8QwAAfEQAAH5EAACBRQAAgEYAAINHAACFRgAAhEcAAINIAACHSgAAxngAAIhLAAC9cgAAnFoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADWshJBQrTDxTaQAAAAAAAGozLAEBATknZ21HXAAAAABEVBY1PUoBRVBbW15bAAAAcgJNMmEFAUhjW1tbRwAAAHICNzsEMQEoTmQ+W21SAAAaOGAmQQMBKTAicGVnbQAAaTQvCAEBAQEBOhwqUlcAAFNlbBMbUQESVRdLXwdTAABSU2ZDBBABEWJGWC4PWwAAAG5bW1BJASM/T2hxQFYAAABTXVtaJQ5CDB8Lbx0AAAAAAEdpW1AeFQEBBlkAAAAAAAAAU25TUAoYCSAAAAAAAAAAAAAAXC02UBkAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAD//wAAgB8AAIAHAACAAwAAgAMAAIABAACAAQAAgAEAAIABAACAAQAAwAE!
 AAMADAAD
gBwAA8A8AAPwfAAD//wAAKAAAACAAAABAAAAAAQAIAAAAAACABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AxoUgAM+5nwB9RAAArotgAOfczwCWaDAAqmUAANqwcADSn1AAv6KAAKZ5QACWXBAA28ivALp2EAD38+8AypNAAO/o3wCOUQAAtpZwAMeujwDfuYAA49O/AIZREACOXCAAunAAAPPlzwDv3L8AnlwAAIZLAACWYiAAwnwQAJZWAACyagAAnnRAAPv27wDr388AgkgAAIpOAADXxa8AmlkAAKZiAADTvJ8Atm0AAL5zAACaazAAuplwAN/RvwCSUwAArmgAAH5FAAB9RQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMzMzMzMzMzMzMzMzMzAAAAAAAAAAAAAAAAAAAAAAAEMzMzMzMzMzMzMzMzMzMzNAAAAAAAAAAAAAAAAAAAADMzMzMmDBUwAxQZMzMzMzMzMzM0AAAAAAAAAAAAAAAzMzMzIREBAQEBAQELMzMzMzMzMzMzNAAAAAAAAAAAADMzMyktCQEBAQEBAQEDMzMzMzMzMzMzMwAAAAAAAAAAMzMTLS0gHAEXAQEBAQELMzMzMzMzMzMzMwAAAAAAAAAzMyItLS0qJjMzFAEBAQEYMzMzMzMzMzMzMwAAAAAAADMeLS0tCDMzMzMzLwEBAQUzMzMzMzMzMzMzNAAAAAAAMxMtLS0TMzMzMzMYAQEBCzMzMzMzMzMzMzMzAAAAAAAzEy0tLR4zMzMzMzMBAQELMzMzMzMzMzMzMzMzAAAAADMTLS0tITMzMzMzMwEBAQszMzMzMzMzMzMzMzMAAAAAMyYtLS0sJjMzMzMzAQEBCzMz!
 MzMzMzMzMzMzMwAAAAAzMyotLS0sIRMjIyMBAQEDIyMuJzMzMzMzMzMzMwAAAD!
 MzJhotLS
0CJAEBAQEBAQEBAQEcLSIxMzMzMzMzAAAAMzMzJxotLQoBAQEBAQEBAQEBAQEtLS0qMzMzMzMAAAAzMzMzJioaAiQBAQEBAQEBAQEBGy0tLS0qMzMzMwAAAAQzMzMzMzMTHyMjIwEBATAjIyMNKi0tLS0TMzMzAAAABDMzMzMzMzMzMzMzAQEBCzMzMzMzIS0tLQgzMzMAAAAAMzMzMzMzMzMzMzMBAQELMzMzMzMzMi0tLTMzNAAAAAAzMzMzMzMzMzMzMwEBAQszMzMzMzMdLS0tMzMAAAAAADQzMzMzMzMzMzMzJQEBDjMzMzMzMx0tLS0zMwAAAAAAADMzMzMzMzMzMzMoAQEBGTMzMzMmLC0tLDM0AAAAAAAANDMzMzMzMzMzMzMBAQEGBzMzJggtLS0xMwAAAAAAAAAAMzMzMzMzMzMzMxIBAQEBBjAcFi0tGh4EAAAAAAAAAAAAMzMzMzMzMzMzMxABAQEBAQEBAi0hNAAAAAAAAAAAAAAEMzMzMzMzMzMzMwYBAQEBASQPMzMAAAAAAAAAAAAAAAAAMzMzMzMzMzMzMzMDMDArMyY0AAAAAAAAAAAAAAAAAAAANDMzMzMzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAADQzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMzMzMzMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////+AAf//AAB//wAAD/4AAAP+AAAB/gAAAP4AAAB+AAAAPgAAAD4AAAAeAAAAHgAAAB4AAAAOAAAADgAAAA4AAAAOAAAADgAAAA8AAAAPAAAAHwAAAB+AAAAfgAAAP8AAAD/gAAB/4AAA//gAAf/8AAP//wAP///g///////8=" LAST_CHARSET="UTF-8" ID="rdf:#$b7+Ar2">Release Notes</A>
-        <DT><A HREF="http://fedoraproject.org/wiki/" ADD_DATE="1158286779" LAST_VISIT="1158286826" LAST_MODIFIED="1158286796" ICON="data:image/x-icon;base64,AAABAAIAEBAAAAAAAABoBQAAJgAAACAgAAAAAAAAqAgAAI4FAAAoAAAAEAAAACAAAAABAAgAAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wDGeQAAxauNAG4uAAClfUwA9uC8AJdXAADerWEA2sOmAI9dJgCtcBoAsI5kAH9GAADp4NQAsGkAAJpuOQC6mnYA28y4AJpiFwDRt5YA+fXyALx3DQCndzgAwaSAAHg5AACMTgAAqYNYAL1tAACmYAAAn3REAJNlMwCwgkgAnmchAKFwMADPup8Aza+KAH5ECQCiZhUAe0ADAL2efADYx7MAn10AAK2CTwDdr2gAhkoAAMB1AAC3aAAArIddAJdqMwByNwAAl1EAAJJUAACfcDkAgEEAAJtaAAC8cgAAw6mJAPbiwAB2PQAAhEYAAJ92SAB7QwAAcTMAALZsAACngVUA/v38AHlAAACQUQAAo3tKAHU6AACJSwAAwKSDAJptNgDo3tIAs2kAAIJEAACVVQAAbzAAAHQ4AAB3OwAAw6qLAH1EAACCRwAAv3MAAKqGXQB5QgAAhEgAAIpOAAC3agAAfEIAAH5FAACARQAAgEcAAIhKAADFeAAAvXEAAG4vAABvLwAAdzoAAHc9AAB8QwAAfEQAAH5EAACBRQAAgEYAAINHAACFRgAAhEcAAINIAACHSgAAxngAAIhLAAC9cgAAnFoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADWshJBQrTDxTaQAAAAAAAGozLAEBATknZ21HXAAAAABEVBY1PUoBRVBbW15bAAAAcgJNMmEFAUhjW1tbRwAAAHICNzsEMQEoTmQ+W21SAAAaOGAmQQMBKTAicGVnbQAAaTQvCAEBAQEBOhwqUlcAAFNlbBMbUQESVRdLXwdTAABSU2ZDBBABEWJGWC4PWwAAAG5bW1BJASM/T2hxQFYAAABTXVtaJQ5CDB8Lbx0AAAAAAEdpW1AeFQEBBlkAAAAAAAAAU25TUAoYCSAAAAAAAAAAAAAAXC02UBkAAAAAAAAAAAAAAAAAAAAAAAAAAAD//wAAgB8!
 AAIAHAACAAwAAgAMAAIABAACAAQAAgAEAAIABAACAAQAAwAEAAMADAADgBwAA8!
 A8AAPwfA
AD//wAAKAAAACAAAABAAAAAAQAIAAAAAACABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AxoUgAM+5nwB9RAAArotgAOfczwCWaDAAqmUAANqwcADSn1AAv6KAAKZ5QACWXBAA28ivALp2EAD38+8AypNAAO/o3wCOUQAAtpZwAMeujwDfuYAA49O/AIZREACOXCAAunAAAPPlzwDv3L8AnlwAAIZLAACWYiAAwnwQAJZWAACyagAAnnRAAPv27wDr388AgkgAAIpOAADXxa8AmlkAAKZiAADTvJ8Atm0AAL5zAACaazAAuplwAN/RvwCSUwAArmgAAH5FAAB9RQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMzMzMzMzMzMzMzMzMzAAAAAAAAAAAAAAAAAAAAAAAEMzMzMzMzMzMzMzMzMzMzNAAAAAAAAAAAAAAAAAAAADMzMzMmDBUwAxQZMzMzMzMzMzM0AAAAAAAAAAAAAAAzMzMzIREBAQEBAQELMzMzMzMzMzMzNAAAAAAAAAAAADMzMyktCQEBAQEBAQEDMzMzMzMzMzMzMwAAAAAAAAAAMzMTLS0gHAEXAQEBAQELMzMzMzMzMzMzMwAAAAAAAAAzMyItLS0qJjMzFAEBAQEYMzMzMzMzMzMzMwAAAAAAADMeLS0tCDMzMzMzLwEBAQUzMzMzMzMzMzMzNAAAAAAAMxMtLS0TMzMzMzMYAQEBCzMzMzMzMzMzMzMzAAAAAAAzEy0tLR4zMzMzMzMBAQELMzMzMzMzMzMzMzMzAAAAADMTLS0tITMzMzMzMwEBAQszMzMzMzMzMzMzMzMAAAAAMyYtLS0sJjMzMzMzAQEBCzMzMzMzMzMzMzMzMw!
 AAAAAzMyotLS0sIRMjIyMBAQEDIyMuJzMzMzMzMzMzMwAAADMzJhotLS0CJAEB!
 AQEBAQEB
AQEcLSIxMzMzMzMzAAAAMzMzJxotLQoBAQEBAQEBAQEBAQEtLS0qMzMzMzMAAAAzMzMzJioaAiQBAQEBAQEBAQEBGy0tLS0qMzMzMwAAAAQzMzMzMzMTHyMjIwEBATAjIyMNKi0tLS0TMzMzAAAABDMzMzMzMzMzMzMzAQEBCzMzMzMzIS0tLQgzMzMAAAAAMzMzMzMzMzMzMzMBAQELMzMzMzMzMi0tLTMzNAAAAAAzMzMzMzMzMzMzMwEBAQszMzMzMzMdLS0tMzMAAAAAADQzMzMzMzMzMzMzJQEBDjMzMzMzMx0tLS0zMwAAAAAAADMzMzMzMzMzMzMoAQEBGTMzMzMmLC0tLDM0AAAAAAAANDMzMzMzMzMzMzMBAQEGBzMzJggtLS0xMwAAAAAAAAAAMzMzMzMzMzMzMxIBAQEBBjAcFi0tGh4EAAAAAAAAAAAAMzMzMzMzMzMzMxABAQEBAQEBAi0hNAAAAAAAAAAAAAAEMzMzMzMzMzMzMwYBAQEBASQPMzMAAAAAAAAAAAAAAAAAMzMzMzMzMzMzMzMDMDArMyY0AAAAAAAAAAAAAAAAAAAANDMzMzMzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAADQzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMzMzMzMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////+AAf//AAB//wAAD/4AAAP+AAAB/gAAAP4AAAB+AAAAPgAAAD4AAAAeAAAAHgAAAB4AAAAOAAAADgAAAA4AAAAOAAAADgAAAA8AAAAPAAAAHwAAAB+AAAAfgAAAP8AAAD/gAAB/4AAA//gAAf/8AAP//wAP///g///////8=" LAST_CHARSET="UTF-8" ID="rdf:#$c7+Ar2">Fedora Project</A>
-        <DT><A HREF="http://fedoranews.org/" ADD_DATE="1130967815" LAST_MODIFIED="1141318033" LAST_CHARSET="UTF-8" ID="rdf:#$y80oc3">Fedora Weekly News</A>
-        <DT><H3 ADD_DATE="1130967903" LAST_MODIFIED="1141318798" ID="rdf:#$A80oc3">Community Support</H3>
+        <DT><A HREF="http://docs.fedoraproject.org/release-notes/" ADD_DATE="1158286602" LAST_VISIT="1158286627" LAST_MODIFIED="1176675660" ICON="data:image/x-icon;base64,AAABAAIAEBAAAAAAAABoBQAAJgAAACAgAAAAAAAAqAgAAI4FAAAoAAAAEAAAACAAAAABAAgAAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wDGeQAAxauNAG4uAAClfUwA9uC8AJdXAADerWEA2sOmAI9dJgCtcBoAsI5kAH9GAADp4NQAsGkAAJpuOQC6mnYA28y4AJpiFwDRt5YA+fXyALx3DQCndzgAwaSAAHg5AACMTgAAqYNYAL1tAACmYAAAn3REAJNlMwCwgkgAnmchAKFwMADPup8Aza+KAH5ECQCiZhUAe0ADAL2efADYx7MAn10AAK2CTwDdr2gAhkoAAMB1AAC3aAAArIddAJdqMwByNwAAl1EAAJJUAACfcDkAgEEAAJtaAAC8cgAAw6mJAPbiwAB2PQAAhEYAAJ92SAB7QwAAcTMAALZsAACngVUA/v38AHlAAACQUQAAo3tKAHU6AACJSwAAwKSDAJptNgDo3tIAs2kAAIJEAACVVQAAbzAAAHQ4AAB3OwAAw6qLAH1EAACCRwAAv3MAAKqGXQB5QgAAhEgAAIpOAAC3agAAfEIAAH5FAACARQAAgEcAAIhKAADFeAAAvXEAAG4vAABvLwAAdzoAAHc9AAB8QwAAfEQAAH5EAACBRQAAgEYAAINHAACFRgAAhEcAAINIAACHSgAAxngAAIhLAAC9cgAAnFoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADWshJBQrTDxTaQAAAAAAAGozLAEBATknZ21HXAAAAABEVBY1PUoBRVBbW15bAAAAcgJNMmEFAUhjW1tbRwAAAHICNzsEMQEoTmQ+W21SAAAaOGAmQQMBKTAicGVnbQAAaTQvCAEBAQEBOhwqUlcAAFNlbBMbUQESVRdLXwdTAABSU2ZDBBABEWJGWC4PWwAAAG5bW1BJASM/T2hxQFYAAABTXVtaJQ5CDB8Lbx0AAAAAAEdpW1AeFQEBBlkAAAAAAAAAU25TUAoYCSAAAAAAAAAAAAAAXC02UBkAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAD//wAAgB8AAIAHAACAAwAAgAMAAIABAACAAQAAgAEAAIABAACAAQAAwAE!
 AAMADAAD
gBwAA8A8AAPwfAAD//wAAKAAAACAAAABAAAAAAQAIAAAAAACABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AxoUgAM+5nwB9RAAArotgAOfczwCWaDAAqmUAANqwcADSn1AAv6KAAKZ5QACWXBAA28ivALp2EAD38+8AypNAAO/o3wCOUQAAtpZwAMeujwDfuYAA49O/AIZREACOXCAAunAAAPPlzwDv3L8AnlwAAIZLAACWYiAAwnwQAJZWAACyagAAnnRAAPv27wDr388AgkgAAIpOAADXxa8AmlkAAKZiAADTvJ8Atm0AAL5zAACaazAAuplwAN/RvwCSUwAArmgAAH5FAAB9RQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMzMzMzMzMzMzMzMzMzAAAAAAAAAAAAAAAAAAAAAAAEMzMzMzMzMzMzMzMzMzMzNAAAAAAAAAAAAAAAAAAAADMzMzMmDBUwAxQZMzMzMzMzMzM0AAAAAAAAAAAAAAAzMzMzIREBAQEBAQELMzMzMzMzMzMzNAAAAAAAAAAAADMzMyktCQEBAQEBAQEDMzMzMzMzMzMzMwAAAAAAAAAAMzMTLS0gHAEXAQEBAQELMzMzMzMzMzMzMwAAAAAAAAAzMyItLS0qJjMzFAEBAQEYMzMzMzMzMzMzMwAAAAAAADMeLS0tCDMzMzMzLwEBAQUzMzMzMzMzMzMzNAAAAAAAMxMtLS0TMzMzMzMYAQEBCzMzMzMzMzMzMzMzAAAAAAAzEy0tLR4zMzMzMzMBAQELMzMzMzMzMzMzMzMzAAAAADMTLS0tITMzMzMzMwEBAQszMzMzMzMzMzMzMzMAAAAAMyYtLS0sJjMzMzMzAQEBCzMz!
 MzMzMzMzMzMzMwAAAAAzMyotLS0sIRMjIyMBAQEDIyMuJzMzMzMzMzMzMwAAAD!
 MzJhotLS
0CJAEBAQEBAQEBAQEcLSIxMzMzMzMzAAAAMzMzJxotLQoBAQEBAQEBAQEBAQEtLS0qMzMzMzMAAAAzMzMzJioaAiQBAQEBAQEBAQEBGy0tLS0qMzMzMwAAAAQzMzMzMzMTHyMjIwEBATAjIyMNKi0tLS0TMzMzAAAABDMzMzMzMzMzMzMzAQEBCzMzMzMzIS0tLQgzMzMAAAAAMzMzMzMzMzMzMzMBAQELMzMzMzMzMi0tLTMzNAAAAAAzMzMzMzMzMzMzMwEBAQszMzMzMzMdLS0tMzMAAAAAADQzMzMzMzMzMzMzJQEBDjMzMzMzMx0tLS0zMwAAAAAAADMzMzMzMzMzMzMoAQEBGTMzMzMmLC0tLDM0AAAAAAAANDMzMzMzMzMzMzMBAQEGBzMzJggtLS0xMwAAAAAAAAAAMzMzMzMzMzMzMxIBAQEBBjAcFi0tGh4EAAAAAAAAAAAAMzMzMzMzMzMzMxABAQEBAQEBAi0hNAAAAAAAAAAAAAAEMzMzMzMzMzMzMwYBAQEBASQPMzMAAAAAAAAAAAAAAAAAMzMzMzMzMzMzMzMDMDArMyY0AAAAAAAAAAAAAAAAAAAANDMzMzMzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAADQzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMzMzMzMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////+AAf//AAB//wAAD/4AAAP+AAAB/gAAAP4AAAB+AAAAPgAAAD4AAAAeAAAAHgAAAB4AAAAOAAAADgAAAA4AAAAOAAAADgAAAA8AAAAPAAAAHwAAAB+AAAAfgAAAP8AAAD/gAAB/4AAA//gAAf/8AAP//wAP///g///////8=" LAST_CHARSET="UTF-8" ID="rdf:#$b7+Ar2">Release Notes</A>
+<DD>Fedora Release Notes
+        <DT><H3 ADD_DATE="1130967903" LAST_MODIFIED="1176675263" ID="rdf:#$A80oc3">Fedora Project</H3>
         <DL><p>
-            <DT><A HREF="http://forum.fedoraforum.org/" ADD_DATE="1130967896" LAST_VISIT="1158286671" LAST_MODIFIED="1141318093" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////ALd9TgC2trUAUz8sAJGLhgBwZFoA3NrZAIlWLAAaHB8A0ZVrALidiwCRbEsAMTIxAGBRQwDUysMAjHZlAPHv7gBpSS0AwI1dAIBfPwBCMiIAqH5eAJ6XkgCkckQACgwNAJNhOQCHfXYAsqumAKKQgABhW1UAd1M2AH5nUAB8cGYAclpGAObm5gCael8AsqWZAJ5xUAC8sqoA+ff3ANDPzgAUEhIAiGNIAJxrPgCsekoAtINYAMiUZAB8XEoAjYR7AF9HLwCurq8AgVcyAG9TPADh4N8AaltSAJB0XQAABAgAwIVgAJVfMQCqckwAuolZAKCThwDX1tUAiXJfANfRzQC6iWEAr39dALeyrwDIjWMAkYeAAI1eOwCeaEQA9fPyAPz7+wBIMyAAimRCALJ5SAC4g1AApndMAIB0aQDEkV8Ay5BnAJFiPgDq6egA3NjUAKlzRQAEBwkAy5VoAJVkPQC+i1kAeV1HAKt3RwC6hlYAiGdJAKJvRgC2gVMAgVw9AM6SaADGkWMAs3xKAJtvUQCcaDwA9/X0APPx8AC8i18AYVJGAI11XgD+/f0A+vr5AKd0RwD29vYA2NfXANvW0wDWz8wAnWlCAMWSYQDOlGkAm3BPAMGNWwDCkF8AhX11AIFePQCkb0YAvo1dAP38/AD29PMA9PLxAPLy8QDy8O8Az87NAP7+/gD7+/oA29rYALd8TwC+ilgA/f38APb09AD19PMA9PPy!
 APLx8ADz8e8Az87OAKd0RgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMzMzMzMzMzMzMzMzMzMzMzONjY2NjY2NjY2NjY2NjTMzf39/fxE2REZQIQWOgX8zM35+fmgpF0BeTGFbeXB+MzNnST8bH25dd1pOTXMOVDMziwMie0V1L3gTh2SGR4UzM4ISYGI6ZTUEMnpcAkgHMzMdGGN2ag0JGVc5S18QijMzJI9PHjcwKwwUFSoxgG0zM1VrIDhSClh0US0GhISEMzNKKG8WJkNpfD0sHEpKSjMzfX19C1lmVi5CNCN9fX0zM4iIiA88OwgaUz6IiIiIMzNsbGyMckFxJSeJbGxsbDMzg4ODg4ODg4ODg4ODg4MzMzMzMzMzMzMzMzMzMzMzMwAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" !
 LAST_CHA
RSET="ISO-8859-1" ID="rdf:#$z80oc3">Fedora Forum</A>
-            <DT><A HREF="http://fedoraproject.org/wiki/Communicate" ADD_DATE="1141318585" LAST_VISIT="1158286676" LAST_MODIFIED="1141318713" ICON="data:image/x-icon;base64,AAABAAIAEBAAAAAAAABoBQAAJgAAACAgAAAAAAAAqAgAAI4FAAAoAAAAEAAAACAAAAABAAgAAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wDGeQAAxauNAG4uAAClfUwA9uC8AJdXAADerWEA2sOmAI9dJgCtcBoAsI5kAH9GAADp4NQAsGkAAJpuOQC6mnYA28y4AJpiFwDRt5YA+fXyALx3DQCndzgAwaSAAHg5AACMTgAAqYNYAL1tAACmYAAAn3REAJNlMwCwgkgAnmchAKFwMADPup8Aza+KAH5ECQCiZhUAe0ADAL2efADYx7MAn10AAK2CTwDdr2gAhkoAAMB1AAC3aAAArIddAJdqMwByNwAAl1EAAJJUAACfcDkAgEEAAJtaAAC8cgAAw6mJAPbiwAB2PQAAhEYAAJ92SAB7QwAAcTMAALZsAACngVUA/v38AHlAAACQUQAAo3tKAHU6AACJSwAAwKSDAJptNgDo3tIAs2kAAIJEAACVVQAAbzAAAHQ4AAB3OwAAw6qLAH1EAACCRwAAv3MAAKqGXQB5QgAAhEgAAIpOAAC3agAAfEIAAH5FAACARQAAgEcAAIhKAADFeAAAvXEAAG4vAABvLwAAdzoAAHc9AAB8QwAAfEQAAH5EAACBRQAAgEYAAINHAACFRgAAhEcAAINIAACHSgAAxngAAIhLAAC9cgAAnFoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADWshJBQrTDxTaQAAAAAAAGozLAEBATknZ21HXAAAAABEVBY1PUoBRVBbW15bAAAAcgJNMmEFAUhjW1tbRwAAAHICNzsEMQEoTmQ+W21SAAAaOGAmQQMBKTAicGVnbQAAaTQvCAEBAQEBOhwqUlcAAFNlbBMbUQESVRdLXwdTAABSU2ZDBBABEWJGWC4PWwAAAG5bW1BJASM/T2hxQFYAAABTXVtaJQ5CDB8Lbx0AAAAAAEdpW1AeFQEBBlkAAAAAAAAAU25TUAoYCSAAAAAAAAAAAAAAXC02UBkAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAD//wAAgB8AAIAHAACAAwAAgAMAAIABAACAAQAAgAEAAIABAACAAQAAwA!
 EAAMADAA
DgBwAA8A8AAPwfAAD//wAAKAAAACAAAABAAAAAAQAIAAAAAACABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AxoUgAM+5nwB9RAAArotgAOfczwCWaDAAqmUAANqwcADSn1AAv6KAAKZ5QACWXBAA28ivALp2EAD38+8AypNAAO/o3wCOUQAAtpZwAMeujwDfuYAA49O/AIZREACOXCAAunAAAPPlzwDv3L8AnlwAAIZLAACWYiAAwnwQAJZWAACyagAAnnRAAPv27wDr388AgkgAAIpOAADXxa8AmlkAAKZiAADTvJ8Atm0AAL5zAACaazAAuplwAN/RvwCSUwAArmgAAH5FAAB9RQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMzMzMzMzMzMzMzMzMzAAAAAAAAAAAAAAAAAAAAAAAEMzMzMzMzMzMzMzMzMzMzNAAAAAAAAAAAAAAAAAAAADMzMzMmDBUwAxQZMzMzMzMzMzM0AAAAAAAAAAAAAAAzMzMzIREBAQEBAQELMzMzMzMzMzMzNAAAAAAAAAAAADMzMyktCQEBAQEBAQEDMzMzMzMzMzMzMwAAAAAAAAAAMzMTLS0gHAEXAQEBAQELMzMzMzMzMzMzMwAAAAAAAAAzMyItLS0qJjMzFAEBAQEYMzMzMzMzMzMzMwAAAAAAADMeLS0tCDMzMzMzLwEBAQUzMzMzMzMzMzMzNAAAAAAAMxMtLS0TMzMzMzMYAQEBCzMzMzMzMzMzMzMzAAAAAAAzEy0tLR4zMzMzMzMBAQELMzMzMzMzMzMzMzMzAAAAADMTLS0tITMzMzMzMwEBAQszMzMzMzMzMzMzMzMAAAAAMyYtLS0sJjMzMzMzAQEBCzM!
 zMzMzMzMzMzMzMwAAAAAzMyotLS0sIRMjIyMBAQEDIyMuJzMzMzMzMzMzMwAAA!
 DMzJhotL
S0CJAEBAQEBAQEBAQEcLSIxMzMzMzMzAAAAMzMzJxotLQoBAQEBAQEBAQEBAQEtLS0qMzMzMzMAAAAzMzMzJioaAiQBAQEBAQEBAQEBGy0tLS0qMzMzMwAAAAQzMzMzMzMTHyMjIwEBATAjIyMNKi0tLS0TMzMzAAAABDMzMzMzMzMzMzMzAQEBCzMzMzMzIS0tLQgzMzMAAAAAMzMzMzMzMzMzMzMBAQELMzMzMzMzMi0tLTMzNAAAAAAzMzMzMzMzMzMzMwEBAQszMzMzMzMdLS0tMzMAAAAAADQzMzMzMzMzMzMzJQEBDjMzMzMzMx0tLS0zMwAAAAAAADMzMzMzMzMzMzMoAQEBGTMzMzMmLC0tLDM0AAAAAAAANDMzMzMzMzMzMzMBAQEGBzMzJggtLS0xMwAAAAAAAAAAMzMzMzMzMzMzMxIBAQEBBjAcFi0tGh4EAAAAAAAAAAAAMzMzMzMzMzMzMxABAQEBAQEBAi0hNAAAAAAAAAAAAAAEMzMzMzMzMzMzMwYBAQEBASQPMzMAAAAAAAAAAAAAAAAAMzMzMzMzMzMzMzMDMDArMyY0AAAAAAAAAAAAAAAAAAAANDMzMzMzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAADQzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMzMzMzMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////+AAf//AAB//wAAD/4AAAP+AAAB/gAAAP4AAAB+AAAAPgAAAD4AAAAeAAAAHgAAAB4AAAAOAAAADgAAAA4AAAAOAAAADgAAAA8AAAAPAAAAHwAAAB+AAAAfgAAAP8AAAD/gAAB/4AAA//gAAf/8AAP//wAP///g///////8=" LAST_CHARSET="UTF-8" ID="rdf:#$ojXGd3">More Support &amp!
 ; Discussion</A>
+            <DT><A HREF="http://fedoraproject.org/wiki/" ADD_DATE="1158286779" LAST_VISIT="1176675005" LAST_MODIFIED="1176675285" ICON="data:image/x-icon;base64,AAABAAIAEBAAAAAAAABoBQAAJgAAACAgAAAAAAAAqAgAAI4FAAAoAAAAEAAAACAAAAABAAgAAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wDGeQAAxauNAG4uAAClfUwA9uC8AJdXAADerWEA2sOmAI9dJgCtcBoAsI5kAH9GAADp4NQAsGkAAJpuOQC6mnYA28y4AJpiFwDRt5YA+fXyALx3DQCndzgAwaSAAHg5AACMTgAAqYNYAL1tAACmYAAAn3REAJNlMwCwgkgAnmchAKFwMADPup8Aza+KAH5ECQCiZhUAe0ADAL2efADYx7MAn10AAK2CTwDdr2gAhkoAAMB1AAC3aAAArIddAJdqMwByNwAAl1EAAJJUAACfcDkAgEEAAJtaAAC8cgAAw6mJAPbiwAB2PQAAhEYAAJ92SAB7QwAAcTMAALZsAACngVUA/v38AHlAAACQUQAAo3tKAHU6AACJSwAAwKSDAJptNgDo3tIAs2kAAIJEAACVVQAAbzAAAHQ4AAB3OwAAw6qLAH1EAACCRwAAv3MAAKqGXQB5QgAAhEgAAIpOAAC3agAAfEIAAH5FAACARQAAgEcAAIhKAADFeAAAvXEAAG4vAABvLwAAdzoAAHc9AAB8QwAAfEQAAH5EAACBRQAAgEYAAINHAACFRgAAhEcAAINIAACHSgAAxngAAIhLAAC9cgAAnFoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADWshJBQrTDxTaQAAAAAAAGozLAEBATknZ21HXAAAAABEVBY1PUoBRVBbW15bAAAAcgJNMmEFAUhjW1tbRwAAAHICNzsEMQEoTmQ+W21SAAAaOGAmQQMBKTAicGVnbQAAaTQvCAEBAQEBOhwqUlcAAFNlbBMbUQESVRdLXwdTAABSU2ZDBBABEWJGWC4PWwAAAG5bW1BJASM/T2hxQFYAAABTXVtaJQ5CDB8Lbx0AAAAAAEdpW1AeFQEBBlkAAAAAAAAAU25TUAoYCSAAAAAAAAAAAAAAXC02UBkAAAAAAAAAAAAAAAAAAAAAAAAAAAD//wA!
 AgB8AAIAHAACAAwAAgAMAAIABAACAAQAAgAEAAIABAACAAQAAwAEAAMADAADgB!
 wAA8A8AA
PwfAAD//wAAKAAAACAAAABAAAAAAQAIAAAAAACABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AxoUgAM+5nwB9RAAArotgAOfczwCWaDAAqmUAANqwcADSn1AAv6KAAKZ5QACWXBAA28ivALp2EAD38+8AypNAAO/o3wCOUQAAtpZwAMeujwDfuYAA49O/AIZREACOXCAAunAAAPPlzwDv3L8AnlwAAIZLAACWYiAAwnwQAJZWAACyagAAnnRAAPv27wDr388AgkgAAIpOAADXxa8AmlkAAKZiAADTvJ8Atm0AAL5zAACaazAAuplwAN/RvwCSUwAArmgAAH5FAAB9RQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMzMzMzMzMzMzMzMzMzAAAAAAAAAAAAAAAAAAAAAAAEMzMzMzMzMzMzMzMzMzMzNAAAAAAAAAAAAAAAAAAAADMzMzMmDBUwAxQZMzMzMzMzMzM0AAAAAAAAAAAAAAAzMzMzIREBAQEBAQELMzMzMzMzMzMzNAAAAAAAAAAAADMzMyktCQEBAQEBAQEDMzMzMzMzMzMzMwAAAAAAAAAAMzMTLS0gHAEXAQEBAQELMzMzMzMzMzMzMwAAAAAAAAAzMyItLS0qJjMzFAEBAQEYMzMzMzMzMzMzMwAAAAAAADMeLS0tCDMzMzMzLwEBAQUzMzMzMzMzMzMzNAAAAAAAMxMtLS0TMzMzMzMYAQEBCzMzMzMzMzMzMzMzAAAAAAAzEy0tLR4zMzMzMzMBAQELMzMzMzMzMzMzMzMzAAAAADMTLS0tITMzMzMzMwEBAQszMzMzMzMzMzMzMzMAAAAAMyYtLS0sJjMzMzMzAQEBCzMzMzMzMzMzMz!
 MzMwAAAAAzMyotLS0sIRMjIyMBAQEDIyMuJzMzMzMzMzMzMwAAADMzJhotLS0C!
 JAEBAQEB
AQEBAQEcLSIxMzMzMzMzAAAAMzMzJxotLQoBAQEBAQEBAQEBAQEtLS0qMzMzMzMAAAAzMzMzJioaAiQBAQEBAQEBAQEBGy0tLS0qMzMzMwAAAAQzMzMzMzMTHyMjIwEBATAjIyMNKi0tLS0TMzMzAAAABDMzMzMzMzMzMzMzAQEBCzMzMzMzIS0tLQgzMzMAAAAAMzMzMzMzMzMzMzMBAQELMzMzMzMzMi0tLTMzNAAAAAAzMzMzMzMzMzMzMwEBAQszMzMzMzMdLS0tMzMAAAAAADQzMzMzMzMzMzMzJQEBDjMzMzMzMx0tLS0zMwAAAAAAADMzMzMzMzMzMzMoAQEBGTMzMzMmLC0tLDM0AAAAAAAANDMzMzMzMzMzMzMBAQEGBzMzJggtLS0xMwAAAAAAAAAAMzMzMzMzMzMzMxIBAQEBBjAcFi0tGh4EAAAAAAAAAAAAMzMzMzMzMzMzMxABAQEBAQEBAi0hNAAAAAAAAAAAAAAEMzMzMzMzMzMzMwYBAQEBASQPMzMAAAAAAAAAAAAAAAAAMzMzMzMzMzMzMzMDMDArMyY0AAAAAAAAAAAAAAAAAAAANDMzMzMzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAADQzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMzMzMzMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////+AAf//AAB//wAAD/4AAAP+AAAB/gAAAP4AAAB+AAAAPgAAAD4AAAAeAAAAHgAAAB4AAAAOAAAADgAAAA4AAAAOAAAADgAAAA8AAAAPAAAAHwAAAB+AAAAfgAAAP8AAAD/gAAB/4AAA//gAAf/8AAP//wAP///g///////8=" LAST_CHARSET="UTF-8" ID="rdf:#$c7+Ar2">Fedora Project</A>
+<DD>Starting point for the Fedora Project
+            <DT><A HREF="http://forums.fedoraforum.org/" ADD_DATE="1130967896" LAST_VISIT="1158286671" LAST_MODIFIED="1176675301" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////ALd9TgC2trUAUz8sAJGLhgBwZFoA3NrZAIlWLAAaHB8A0ZVrALidiwCRbEsAMTIxAGBRQwDUysMAjHZlAPHv7gBpSS0AwI1dAIBfPwBCMiIAqH5eAJ6XkgCkckQACgwNAJNhOQCHfXYAsqumAKKQgABhW1UAd1M2AH5nUAB8cGYAclpGAObm5gCael8AsqWZAJ5xUAC8sqoA+ff3ANDPzgAUEhIAiGNIAJxrPgCsekoAtINYAMiUZAB8XEoAjYR7AF9HLwCurq8AgVcyAG9TPADh4N8AaltSAJB0XQAABAgAwIVgAJVfMQCqckwAuolZAKCThwDX1tUAiXJfANfRzQC6iWEAr39dALeyrwDIjWMAkYeAAI1eOwCeaEQA9fPyAPz7+wBIMyAAimRCALJ5SAC4g1AApndMAIB0aQDEkV8Ay5BnAJFiPgDq6egA3NjUAKlzRQAEBwkAy5VoAJVkPQC+i1kAeV1HAKt3RwC6hlYAiGdJAKJvRgC2gVMAgVw9AM6SaADGkWMAs3xKAJtvUQCcaDwA9/X0APPx8AC8i18AYVJGAI11XgD+/f0A+vr5AKd0RwD29vYA2NfXANvW0wDWz8wAnWlCAMWSYQDOlGkAm3BPAMGNWwDCkF8AhX11AIFePQCkb0YAvo1dAP38/AD29PMA9PLxAPLy8QDy8O8Az87NAP7+/gD7+/oA29rYALd8TwC+ilgA/f38APb09AD19PMA9PP!
 yAPLx8ADz8e8Az87OAKd0RgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMzMzMzMzMzMzMzMzMzMzMzONjY2NjY2NjY2NjY2NjTMzf39/fxE2REZQIQWOgX8zM35+fmgpF0BeTGFbeXB+MzNnST8bH25dd1pOTXMOVDMziwMie0V1L3gTh2SGR4UzM4ISYGI6ZTUEMnpcAkgHMzMdGGN2ag0JGVc5S18QijMzJI9PHjcwKwwUFSoxgG0zM1VrIDhSClh0US0GhISEMzNKKG8WJkNpfD0sHEpKSjMzfX19C1lmVi5CNCN9fX0zM4iIiA88OwgaUz6IiIiIMzNsbGyMckFxJSeJbGxsbDMzg4ODg4ODg4ODg4ODg4MzMzMzMzMzMzMzMzMzMzMzMwAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="!
  LAST_CH
ARSET="ISO-8859-1" ID="rdf:#$z80oc3">Fedora Forum</A>
+<DD>Fedora Community Forums
+            <DT><A HREF="http://fedoraproject.org/wiki/FWN" ADD_DATE="1176675071" LAST_VISIT="1176675075" LAST_MODIFIED="1176675310" ICON="data:image/x-icon;base64,AAABAAIAEBAAAAAAAABoBQAAJgAAACAgAAAAAAAAqAgAAI4FAAAoAAAAEAAAACAAAAABAAgAAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wDGeQAAxauNAG4uAAClfUwA9uC8AJdXAADerWEA2sOmAI9dJgCtcBoAsI5kAH9GAADp4NQAsGkAAJpuOQC6mnYA28y4AJpiFwDRt5YA+fXyALx3DQCndzgAwaSAAHg5AACMTgAAqYNYAL1tAACmYAAAn3REAJNlMwCwgkgAnmchAKFwMADPup8Aza+KAH5ECQCiZhUAe0ADAL2efADYx7MAn10AAK2CTwDdr2gAhkoAAMB1AAC3aAAArIddAJdqMwByNwAAl1EAAJJUAACfcDkAgEEAAJtaAAC8cgAAw6mJAPbiwAB2PQAAhEYAAJ92SAB7QwAAcTMAALZsAACngVUA/v38AHlAAACQUQAAo3tKAHU6AACJSwAAwKSDAJptNgDo3tIAs2kAAIJEAACVVQAAbzAAAHQ4AAB3OwAAw6qLAH1EAACCRwAAv3MAAKqGXQB5QgAAhEgAAIpOAAC3agAAfEIAAH5FAACARQAAgEcAAIhKAADFeAAAvXEAAG4vAABvLwAAdzoAAHc9AAB8QwAAfEQAAH5EAACBRQAAgEYAAINHAACFRgAAhEcAAINIAACHSgAAxngAAIhLAAC9cgAAnFoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADWshJBQrTDxTaQAAAAAAAGozLAEBATknZ21HXAAAAABEVBY1PUoBRVBbW15bAAAAcgJNMmEFAUhjW1tbRwAAAHICNzsEMQEoTmQ+W21SAAAaOGAmQQMBKTAicGVnbQAAaTQvCAEBAQEBOhwqUlcAAFNlbBMbUQESVRdLXwdTAABSU2ZDBBABEWJGWC4PWwAAAG5bW1BJASM/T2hxQFYAAABTXVtaJQ5CDB8Lbx0AAAAAAEdpW1AeFQEBBlkAAAAAAAAAU25TUAoYCSAAAAAAAAAAAAAAXC02UBkAAAAAAAAAAAAAAAAAAAAAAAAAAAD/!
 /wAAgB8AAIAHAACAAwAAgAMAAIABAACAAQAAgAEAAIABAACAAQAAwAEAAMADAA!
 DgBwAA8A
8AAPwfAAD//wAAKAAAACAAAABAAAAAAQAIAAAAAACABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AxoUgAM+5nwB9RAAArotgAOfczwCWaDAAqmUAANqwcADSn1AAv6KAAKZ5QACWXBAA28ivALp2EAD38+8AypNAAO/o3wCOUQAAtpZwAMeujwDfuYAA49O/AIZREACOXCAAunAAAPPlzwDv3L8AnlwAAIZLAACWYiAAwnwQAJZWAACyagAAnnRAAPv27wDr388AgkgAAIpOAADXxa8AmlkAAKZiAADTvJ8Atm0AAL5zAACaazAAuplwAN/RvwCSUwAArmgAAH5FAAB9RQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMzMzMzMzMzMzMzMzMzAAAAAAAAAAAAAAAAAAAAAAAEMzMzMzMzMzMzMzMzMzMzNAAAAAAAAAAAAAAAAAAAADMzMzMmDBUwAxQZMzMzMzMzMzM0AAAAAAAAAAAAAAAzMzMzIREBAQEBAQELMzMzMzMzMzMzNAAAAAAAAAAAADMzMyktCQEBAQEBAQEDMzMzMzMzMzMzMwAAAAAAAAAAMzMTLS0gHAEXAQEBAQELMzMzMzMzMzMzMwAAAAAAAAAzMyItLS0qJjMzFAEBAQEYMzMzMzMzMzMzMwAAAAAAADMeLS0tCDMzMzMzLwEBAQUzMzMzMzMzMzMzNAAAAAAAMxMtLS0TMzMzMzMYAQEBCzMzMzMzMzMzMzMzAAAAAAAzEy0tLR4zMzMzMzMBAQELMzMzMzMzMzMzMzMzAAAAADMTLS0tITMzMzMzMwEBAQszMzMzMzMzMzMzMzMAAAAAMyYtLS0sJjMzMzMzAQEBCzMzMzMzMzM!
 zMzMzMwAAAAAzMyotLS0sIRMjIyMBAQEDIyMuJzMzMzMzMzMzMwAAADMzJhotL!
 S0CJAEBA
QEBAQEBAQEcLSIxMzMzMzMzAAAAMzMzJxotLQoBAQEBAQEBAQEBAQEtLS0qMzMzMzMAAAAzMzMzJioaAiQBAQEBAQEBAQEBGy0tLS0qMzMzMwAAAAQzMzMzMzMTHyMjIwEBATAjIyMNKi0tLS0TMzMzAAAABDMzMzMzMzMzMzMzAQEBCzMzMzMzIS0tLQgzMzMAAAAAMzMzMzMzMzMzMzMBAQELMzMzMzMzMi0tLTMzNAAAAAAzMzMzMzMzMzMzMwEBAQszMzMzMzMdLS0tMzMAAAAAADQzMzMzMzMzMzMzJQEBDjMzMzMzMx0tLS0zMwAAAAAAADMzMzMzMzMzMzMoAQEBGTMzMzMmLC0tLDM0AAAAAAAANDMzMzMzMzMzMzMBAQEGBzMzJggtLS0xMwAAAAAAAAAAMzMzMzMzMzMzMxIBAQEBBjAcFi0tGh4EAAAAAAAAAAAAMzMzMzMzMzMzMxABAQEBAQEBAi0hNAAAAAAAAAAAAAAEMzMzMzMzMzMzMwYBAQEBASQPMzMAAAAAAAAAAAAAAAAAMzMzMzMzMzMzMzMDMDArMyY0AAAAAAAAAAAAAAAAAAAANDMzMzMzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAADQzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMzMzMzMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////+AAf//AAB//wAAD/4AAAP+AAAB/gAAAP4AAAB+AAAAPgAAAD4AAAAeAAAAHgAAAB4AAAAOAAAADgAAAA4AAAAOAAAADgAAAA8AAAAPAAAAHwAAAB+AAAAfgAAAP8AAAD/gAAB/4AAA//gAAf/8AAP//wAP///g///////8=" LAST_CHARSET="ISO-8859-1" ID="rdf:#$NKnQZ2">Fedora Weekly News</!
 A>
+<DD>Fedora Weekly News
+            <DT><A HREF="http://www.fedoraunity.org/" ADD_DATE="1176675136" LAST_VISIT="1176675760" LAST_MODIFIED="1176675183" ICON="data:image/x-icon;base64,AAABAAIAEBAAAAAAAABoBQAAJgAAACAgAAAAAAAAqAgAAI4FAAAoAAAAEAAAACAAAAABAAgAAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wDGeQAAxauNAG4uAAClfUwA9uC8AJdXAADerWEA2sOmAI9dJgCtcBoAsI5kAH9GAADp4NQAsGkAAJpuOQC6mnYA28y4AJpiFwDRt5YA+fXyALx3DQCndzgAwaSAAHg5AACMTgAAqYNYAL1tAACmYAAAn3REAJNlMwCwgkgAnmchAKFwMADPup8Aza+KAH5ECQCiZhUAe0ADAL2efADYx7MAn10AAK2CTwDdr2gAhkoAAMB1AAC3aAAArIddAJdqMwByNwAAl1EAAJJUAACfcDkAgEEAAJtaAAC8cgAAw6mJAPbiwAB2PQAAhEYAAJ92SAB7QwAAcTMAALZsAACngVUA/v38AHlAAACQUQAAo3tKAHU6AACJSwAAwKSDAJptNgDo3tIAs2kAAIJEAACVVQAAbzAAAHQ4AAB3OwAAw6qLAH1EAACCRwAAv3MAAKqGXQB5QgAAhEgAAIpOAAC3agAAfEIAAH5FAACARQAAgEcAAIhKAADFeAAAvXEAAG4vAABvLwAAdzoAAHc9AAB8QwAAfEQAAH5EAACBRQAAgEYAAINHAACFRgAAhEcAAINIAACHSgAAxngAAIhLAAC9cgAAnFoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADWshJBQrTDxTaQAAAAAAAGozLAEBATknZ21HXAAAAABEVBY1PUoBRVBbW15bAAAAcgJNMmEFAUhjW1tbRwAAAHICNzsEMQEoTmQ+W21SAAAaOGAmQQMBKTAicGVnbQAAaTQvCAEBAQEBOhwqUlcAAFNlbBMbUQESVRdLXwdTAABSU2ZDBBABEWJGWC4PWwAAAG5bW1BJASM/T2hxQFYAAABTXVtaJQ5CDB8Lbx0AAAAAAEdpW1AeFQEBBlkAAAAAAAAAU25TUAoYCSAAAAAAAAAAAAAAXC02UBkAAAAAAAAAAAAAAAAAAAAAAAAAAAD//wAAgB!
 8AAIAHAACAAwAAgAMAAIABAACAAQAAgAEAAIABAACAAQAAwAEAAMADAADgBwAA!
 8A8AAPwf
AAD//wAAKAAAACAAAABAAAAAAQAIAAAAAACABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AxoUgAM+5nwB9RAAArotgAOfczwCWaDAAqmUAANqwcADSn1AAv6KAAKZ5QACWXBAA28ivALp2EAD38+8AypNAAO/o3wCOUQAAtpZwAMeujwDfuYAA49O/AIZREACOXCAAunAAAPPlzwDv3L8AnlwAAIZLAACWYiAAwnwQAJZWAACyagAAnnRAAPv27wDr388AgkgAAIpOAADXxa8AmlkAAKZiAADTvJ8Atm0AAL5zAACaazAAuplwAN/RvwCSUwAArmgAAH5FAAB9RQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMzMzMzMzMzMzMzMzMzAAAAAAAAAAAAAAAAAAAAAAAEMzMzMzMzMzMzMzMzMzMzNAAAAAAAAAAAAAAAAAAAADMzMzMmDBUwAxQZMzMzMzMzMzM0AAAAAAAAAAAAAAAzMzMzIREBAQEBAQELMzMzMzMzMzMzNAAAAAAAAAAAADMzMyktCQEBAQEBAQEDMzMzMzMzMzMzMwAAAAAAAAAAMzMTLS0gHAEXAQEBAQELMzMzMzMzMzMzMwAAAAAAAAAzMyItLS0qJjMzFAEBAQEYMzMzMzMzMzMzMwAAAAAAADMeLS0tCDMzMzMzLwEBAQUzMzMzMzMzMzMzNAAAAAAAMxMtLS0TMzMzMzMYAQEBCzMzMzMzMzMzMzMzAAAAAAAzEy0tLR4zMzMzMzMBAQELMzMzMzMzMzMzMzMzAAAAADMTLS0tITMzMzMzMwEBAQszMzMzMzMzMzMzMzMAAAAAMyYtLS0sJjMzMzMzAQEBCzMzMzMzMzMzMzMzM!
 wAAAAAzMyotLS0sIRMjIyMBAQEDIyMuJzMzMzMzMzMzMwAAADMzJhotLS0CJAE!
 BAQEBAQE
BAQEcLSIxMzMzMzMzAAAAMzMzJxotLQoBAQEBAQEBAQEBAQEtLS0qMzMzMzMAAAAzMzMzJioaAiQBAQEBAQEBAQEBGy0tLS0qMzMzMwAAAAQzMzMzMzMTHyMjIwEBATAjIyMNKi0tLS0TMzMzAAAABDMzMzMzMzMzMzMzAQEBCzMzMzMzIS0tLQgzMzMAAAAAMzMzMzMzMzMzMzMBAQELMzMzMzMzMi0tLTMzNAAAAAAzMzMzMzMzMzMzMwEBAQszMzMzMzMdLS0tMzMAAAAAADQzMzMzMzMzMzMzJQEBDjMzMzMzMx0tLS0zMwAAAAAAADMzMzMzMzMzMzMoAQEBGTMzMzMmLC0tLDM0AAAAAAAANDMzMzMzMzMzMzMBAQEGBzMzJggtLS0xMwAAAAAAAAAAMzMzMzMzMzMzMxIBAQEBBjAcFi0tGh4EAAAAAAAAAAAAMzMzMzMzMzMzMxABAQEBAQEBAi0hNAAAAAAAAAAAAAAEMzMzMzMzMzMzMwYBAQEBASQPMzMAAAAAAAAAAAAAAAAAMzMzMzMzMzMzMzMDMDArMyY0AAAAAAAAAAAAAAAAAAAANDMzMzMzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAADQzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMzMzMzMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////+AAf//AAB//wAAD/4AAAP+AAAB/gAAAP4AAAB+AAAAPgAAAD4AAAAeAAAAHgAAAB4AAAAOAAAADgAAAA4AAAAOAAAADgAAAA8AAAAPAAAAHwAAAB+AAAAfgAAAP8AAAD/gAAB/4AAA//gAAf/8AAP//wAP///g///////8=" LAST_CHARSET="UTF-8" ID="rdf:#$OKnQZ2">Fedora Unity Project</A>
+            <DT><A HREF="http://planet.fedoraproject.org/" ADD_DATE="1176675201" LAST_VISIT="1176675207" LAST_MODIFIED="1176675329" ICON="data:image/x-icon;base64,AAABAAIAEBAAAAAAAABoBQAAJgAAACAgAAAAAAAAqAgAAI4FAAAoAAAAEAAAACAAAAABAAgAAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wDGeQAAxauNAG4uAAClfUwA9uC8AJdXAADerWEA2sOmAI9dJgCtcBoAsI5kAH9GAADp4NQAsGkAAJpuOQC6mnYA28y4AJpiFwDRt5YA+fXyALx3DQCndzgAwaSAAHg5AACMTgAAqYNYAL1tAACmYAAAn3REAJNlMwCwgkgAnmchAKFwMADPup8Aza+KAH5ECQCiZhUAe0ADAL2efADYx7MAn10AAK2CTwDdr2gAhkoAAMB1AAC3aAAArIddAJdqMwByNwAAl1EAAJJUAACfcDkAgEEAAJtaAAC8cgAAw6mJAPbiwAB2PQAAhEYAAJ92SAB7QwAAcTMAALZsAACngVUA/v38AHlAAACQUQAAo3tKAHU6AACJSwAAwKSDAJptNgDo3tIAs2kAAIJEAACVVQAAbzAAAHQ4AAB3OwAAw6qLAH1EAACCRwAAv3MAAKqGXQB5QgAAhEgAAIpOAAC3agAAfEIAAH5FAACARQAAgEcAAIhKAADFeAAAvXEAAG4vAABvLwAAdzoAAHc9AAB8QwAAfEQAAH5EAACBRQAAgEYAAINHAACFRgAAhEcAAINIAACHSgAAxngAAIhLAAC9cgAAnFoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADWshJBQrTDxTaQAAAAAAAGozLAEBATknZ21HXAAAAABEVBY1PUoBRVBbW15bAAAAcgJNMmEFAUhjW1tbRwAAAHICNzsEMQEoTmQ+W21SAAAaOGAmQQMBKTAicGVnbQAAaTQvCAEBAQEBOhwqUlcAAFNlbBMbUQESVRdLXwdTAABSU2ZDBBABEWJGWC4PWwAAAG5bW1BJASM/T2hxQFYAAABTXVtaJQ5CDB8Lbx0AAAAAAEdpW1AeFQEBBlkAAAAAAAAAU25TUAoYCSAAAAAAAAAAAAAAXC02UBkAAAAAAAAAAAAAAAAAAAAAAAAAAAD//!
 wAAgB8AAIAHAACAAwAAgAMAAIABAACAAQAAgAEAAIABAACAAQAAwAEAAMADAAD!
 gBwAA8A8
AAPwfAAD//wAAKAAAACAAAABAAAAAAQAIAAAAAACABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AxoUgAM+5nwB9RAAArotgAOfczwCWaDAAqmUAANqwcADSn1AAv6KAAKZ5QACWXBAA28ivALp2EAD38+8AypNAAO/o3wCOUQAAtpZwAMeujwDfuYAA49O/AIZREACOXCAAunAAAPPlzwDv3L8AnlwAAIZLAACWYiAAwnwQAJZWAACyagAAnnRAAPv27wDr388AgkgAAIpOAADXxa8AmlkAAKZiAADTvJ8Atm0AAL5zAACaazAAuplwAN/RvwCSUwAArmgAAH5FAAB9RQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMzMzMzMzMzMzMzMzMzAAAAAAAAAAAAAAAAAAAAAAAEMzMzMzMzMzMzMzMzMzMzNAAAAAAAAAAAAAAAAAAAADMzMzMmDBUwAxQZMzMzMzMzMzM0AAAAAAAAAAAAAAAzMzMzIREBAQEBAQELMzMzMzMzMzMzNAAAAAAAAAAAADMzMyktCQEBAQEBAQEDMzMzMzMzMzMzMwAAAAAAAAAAMzMTLS0gHAEXAQEBAQELMzMzMzMzMzMzMwAAAAAAAAAzMyItLS0qJjMzFAEBAQEYMzMzMzMzMzMzMwAAAAAAADMeLS0tCDMzMzMzLwEBAQUzMzMzMzMzMzMzNAAAAAAAMxMtLS0TMzMzMzMYAQEBCzMzMzMzMzMzMzMzAAAAAAAzEy0tLR4zMzMzMzMBAQELMzMzMzMzMzMzMzMzAAAAADMTLS0tITMzMzMzMwEBAQszMzMzMzMzMzMzMzMAAAAAMyYtLS0sJjMzMzMzAQEBCzMzMzMzMzMz!
 MzMzMwAAAAAzMyotLS0sIRMjIyMBAQEDIyMuJzMzMzMzMzMzMwAAADMzJhotLS!
 0CJAEBAQ
EBAQEBAQEcLSIxMzMzMzMzAAAAMzMzJxotLQoBAQEBAQEBAQEBAQEtLS0qMzMzMzMAAAAzMzMzJioaAiQBAQEBAQEBAQEBGy0tLS0qMzMzMwAAAAQzMzMzMzMTHyMjIwEBATAjIyMNKi0tLS0TMzMzAAAABDMzMzMzMzMzMzMzAQEBCzMzMzMzIS0tLQgzMzMAAAAAMzMzMzMzMzMzMzMBAQELMzMzMzMzMi0tLTMzNAAAAAAzMzMzMzMzMzMzMwEBAQszMzMzMzMdLS0tMzMAAAAAADQzMzMzMzMzMzMzJQEBDjMzMzMzMx0tLS0zMwAAAAAAADMzMzMzMzMzMzMoAQEBGTMzMzMmLC0tLDM0AAAAAAAANDMzMzMzMzMzMzMBAQEGBzMzJggtLS0xMwAAAAAAAAAAMzMzMzMzMzMzMxIBAQEBBjAcFi0tGh4EAAAAAAAAAAAAMzMzMzMzMzMzMxABAQEBAQEBAi0hNAAAAAAAAAAAAAAEMzMzMzMzMzMzMwYBAQEBASQPMzMAAAAAAAAAAAAAAAAAMzMzMzMzMzMzMzMDMDArMyY0AAAAAAAAAAAAAAAAAAAANDMzMzMzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAADQzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMzMzMzMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////+AAf//AAB//wAAD/4AAAP+AAAB/gAAAP4AAAB+AAAAPgAAAD4AAAAeAAAAHgAAAB4AAAAOAAAADgAAAA4AAAAOAAAADgAAAA8AAAAPAAAAHwAAAB+AAAAfgAAAP8AAAD/gAAB/4AAA//gAAf/8AAP//wAP///g///////8=" LAST_CHARSET="UTF-8" ID="rdf:#$PKnQZ2">Fedora People</A>
+<DD>Blogs by Fedora Contributors
+            <DT><A HREF="http://fedoraproject.org/wiki/Communicate" ADD_DATE="1141318585" LAST_VISIT="1176674053" LAST_MODIFIED="1141318713" ICON="data:image/x-icon;base64,AAABAAIAEBAAAAAAAABoBQAAJgAAACAgAAAAAAAAqAgAAI4FAAAoAAAAEAAAACAAAAABAAgAAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wDGeQAAxauNAG4uAAClfUwA9uC8AJdXAADerWEA2sOmAI9dJgCtcBoAsI5kAH9GAADp4NQAsGkAAJpuOQC6mnYA28y4AJpiFwDRt5YA+fXyALx3DQCndzgAwaSAAHg5AACMTgAAqYNYAL1tAACmYAAAn3REAJNlMwCwgkgAnmchAKFwMADPup8Aza+KAH5ECQCiZhUAe0ADAL2efADYx7MAn10AAK2CTwDdr2gAhkoAAMB1AAC3aAAArIddAJdqMwByNwAAl1EAAJJUAACfcDkAgEEAAJtaAAC8cgAAw6mJAPbiwAB2PQAAhEYAAJ92SAB7QwAAcTMAALZsAACngVUA/v38AHlAAACQUQAAo3tKAHU6AACJSwAAwKSDAJptNgDo3tIAs2kAAIJEAACVVQAAbzAAAHQ4AAB3OwAAw6qLAH1EAACCRwAAv3MAAKqGXQB5QgAAhEgAAIpOAAC3agAAfEIAAH5FAACARQAAgEcAAIhKAADFeAAAvXEAAG4vAABvLwAAdzoAAHc9AAB8QwAAfEQAAH5EAACBRQAAgEYAAINHAACFRgAAhEcAAINIAACHSgAAxngAAIhLAAC9cgAAnFoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADWshJBQrTDxTaQAAAAAAAGozLAEBATknZ21HXAAAAABEVBY1PUoBRVBbW15bAAAAcgJNMmEFAUhjW1tbRwAAAHICNzsEMQEoTmQ+W21SAAAaOGAmQQMBKTAicGVnbQAAaTQvCAEBAQEBOhwqUlcAAFNlbBMbUQESVRdLXwdTAABSU2ZDBBABEWJGWC4PWwAAAG5bW1BJASM/T2hxQFYAAABTXVtaJQ5CDB8Lbx0AAAAAAEdpW1AeFQEBBlkAAAAAAAAAU25TUAoYCSAAAAAAAAAAAAAAXC02UBkAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAD//wAAgB8AAIAHAACAAwAAgAMAAIABAACAAQAAgAEAAIABAACAAQAAwA!
 EAAMADAA
DgBwAA8A8AAPwfAAD//wAAKAAAACAAAABAAAAAAQAIAAAAAACABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AxoUgAM+5nwB9RAAArotgAOfczwCWaDAAqmUAANqwcADSn1AAv6KAAKZ5QACWXBAA28ivALp2EAD38+8AypNAAO/o3wCOUQAAtpZwAMeujwDfuYAA49O/AIZREACOXCAAunAAAPPlzwDv3L8AnlwAAIZLAACWYiAAwnwQAJZWAACyagAAnnRAAPv27wDr388AgkgAAIpOAADXxa8AmlkAAKZiAADTvJ8Atm0AAL5zAACaazAAuplwAN/RvwCSUwAArmgAAH5FAAB9RQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMzMzMzMzMzMzMzMzMzAAAAAAAAAAAAAAAAAAAAAAAEMzMzMzMzMzMzMzMzMzMzNAAAAAAAAAAAAAAAAAAAADMzMzMmDBUwAxQZMzMzMzMzMzM0AAAAAAAAAAAAAAAzMzMzIREBAQEBAQELMzMzMzMzMzMzNAAAAAAAAAAAADMzMyktCQEBAQEBAQEDMzMzMzMzMzMzMwAAAAAAAAAAMzMTLS0gHAEXAQEBAQELMzMzMzMzMzMzMwAAAAAAAAAzMyItLS0qJjMzFAEBAQEYMzMzMzMzMzMzMwAAAAAAADMeLS0tCDMzMzMzLwEBAQUzMzMzMzMzMzMzNAAAAAAAMxMtLS0TMzMzMzMYAQEBCzMzMzMzMzMzMzMzAAAAAAAzEy0tLR4zMzMzMzMBAQELMzMzMzMzMzMzMzMzAAAAADMTLS0tITMzMzMzMwEBAQszMzMzMzMzMzMzMzMAAAAAMyYtLS0sJjMzMzMzAQEBCzM!
 zMzMzMzMzMzMzMwAAAAAzMyotLS0sIRMjIyMBAQEDIyMuJzMzMzMzMzMzMwAAA!
 DMzJhotL
S0CJAEBAQEBAQEBAQEcLSIxMzMzMzMzAAAAMzMzJxotLQoBAQEBAQEBAQEBAQEtLS0qMzMzMzMAAAAzMzMzJioaAiQBAQEBAQEBAQEBGy0tLS0qMzMzMwAAAAQzMzMzMzMTHyMjIwEBATAjIyMNKi0tLS0TMzMzAAAABDMzMzMzMzMzMzMzAQEBCzMzMzMzIS0tLQgzMzMAAAAAMzMzMzMzMzMzMzMBAQELMzMzMzMzMi0tLTMzNAAAAAAzMzMzMzMzMzMzMwEBAQszMzMzMzMdLS0tMzMAAAAAADQzMzMzMzMzMzMzJQEBDjMzMzMzMx0tLS0zMwAAAAAAADMzMzMzMzMzMzMoAQEBGTMzMzMmLC0tLDM0AAAAAAAANDMzMzMzMzMzMzMBAQEGBzMzJggtLS0xMwAAAAAAAAAAMzMzMzMzMzMzMxIBAQEBBjAcFi0tGh4EAAAAAAAAAAAAMzMzMzMzMzMzMxABAQEBAQEBAi0hNAAAAAAAAAAAAAAEMzMzMzMzMzMzMwYBAQEBASQPMzMAAAAAAAAAAAAAAAAAMzMzMzMzMzMzMzMDMDArMyY0AAAAAAAAAAAAAAAAAAAANDMzMzMzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAADQzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMzMzMzMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////+AAf//AAB//wAAD/4AAAP+AAAB/gAAAP4AAAB+AAAAPgAAAD4AAAAeAAAAHgAAAB4AAAAOAAAADgAAAA4AAAAOAAAADgAAAA8AAAAPAAAAHwAAAB+AAAAfgAAAP8AAAD/gAAB/4AAA//gAAf/8AAP//wAP///g///////8=" LAST_CHARSET="UTF-8" ID="rdf:#$ojXGd3">More Support &amp!
 ; Discussion</A>
         </DL><p>
-        <DT><H3 ADD_DATE="1141318282" LAST_MODIFIED="1158286710" ID="rdf:#$ljXGd3">Fedora Core 6</H3>
+        <DT><H3 ADD_DATE="1176674113" LAST_MODIFIED="1176678438" ID="rdf:#$jKnQZ2">Red Hat</H3>
         <DL><p>
-            <DT><A HREF="http://download.fedora.redhat.com/pub/fedora/linux/core/6/i386/os/repodata/" ADD_DATE="1141318322" LAST_VISIT="1141318913" LAST_MODIFIED="1158286701" ICON="data:image/x-icon;base64,AAABAAIAEBAAAAAAAABoBQAAJgAAACAgAAAAAAAAqAgAAI4FAAAoAAAAEAAAACAAAAABAAgAAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wDGeQAAxauNAG4uAAClfUwA9uC8AJdXAADerWEA2sOmAI9dJgCtcBoAsI5kAH9GAADp4NQAsGkAAJpuOQC6mnYA28y4AJpiFwDRt5YA+fXyALx3DQCndzgAwaSAAHg5AACMTgAAqYNYAL1tAACmYAAAn3REAJNlMwCwgkgAnmchAKFwMADPup8Aza+KAH5ECQCiZhUAe0ADAL2efADYx7MAn10AAK2CTwDdr2gAhkoAAMB1AAC3aAAArIddAJdqMwByNwAAl1EAAJJUAACfcDkAgEEAAJtaAAC8cgAAw6mJAPbiwAB2PQAAhEYAAJ92SAB7QwAAcTMAALZsAACngVUA/v38AHlAAACQUQAAo3tKAHU6AACJSwAAwKSDAJptNgDo3tIAs2kAAIJEAACVVQAAbzAAAHQ4AAB3OwAAw6qLAH1EAACCRwAAv3MAAKqGXQB5QgAAhEgAAIpOAAC3agAAfEIAAH5FAACARQAAgEcAAIhKAADFeAAAvXEAAG4vAABvLwAAdzoAAHc9AAB8QwAAfEQAAH5EAACBRQAAgEYAAINHAACFRgAAhEcAAINIAACHSgAAxngAAIhLAAC9cgAAnFoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADWshJBQrTDxTaQAAAAAAAGozLAEBATknZ21HXAAAAABEVBY1PUoBRVBbW15bAAAAcgJNMmEFAUhjW1tbRwAAAHICNzsEMQEoTmQ+W21SAAAaOGAmQQMBKTAicGVnbQAAaTQvCAEBAQEBOhwqUlcAAFNlbBMbUQESVRdLXwdTAABSU2ZDBBABEWJGWC4PWwAAAG5bW1BJASM/T2hxQFYAAABTXVtaJQ5CDB8Lbx0AAAAAAEdpW1AeFQEBBlkAAAAAAAAAU25TUAoYCSAAAAAAAA!
 AAAAAAXC02UBkAAAAAAAAAAAAAAAAAAAAAAAAAAAD//wAAgB8AAIAHAACAAwAA!
 gAMAAIAB
AACAAQAAgAEAAIABAACAAQAAwAEAAMADAADgBwAA8A8AAPwfAAD//wAAKAAAACAAAABAAAAAAQAIAAAAAACABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AxoUgAM+5nwB9RAAArotgAOfczwCWaDAAqmUAANqwcADSn1AAv6KAAKZ5QACWXBAA28ivALp2EAD38+8AypNAAO/o3wCOUQAAtpZwAMeujwDfuYAA49O/AIZREACOXCAAunAAAPPlzwDv3L8AnlwAAIZLAACWYiAAwnwQAJZWAACyagAAnnRAAPv27wDr388AgkgAAIpOAADXxa8AmlkAAKZiAADTvJ8Atm0AAL5zAACaazAAuplwAN/RvwCSUwAArmgAAH5FAAB9RQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMzMzMzMzMzMzMzMzMzAAAAAAAAAAAAAAAAAAAAAAAEMzMzMzMzMzMzMzMzMzMzNAAAAAAAAAAAAAAAAAAAADMzMzMmDBUwAxQZMzMzMzMzMzM0AAAAAAAAAAAAAAAzMzMzIREBAQEBAQELMzMzMzMzMzMzNAAAAAAAAAAAADMzMyktCQEBAQEBAQEDMzMzMzMzMzMzMwAAAAAAAAAAMzMTLS0gHAEXAQEBAQELMzMzMzMzMzMzMwAAAAAAAAAzMyItLS0qJjMzFAEBAQEYMzMzMzMzMzMzMwAAAAAAADMeLS0tCDMzMzMzLwEBAQUzMzMzMzMzMzMzNAAAAAAAMxMtLS0TMzMzMzMYAQEBCzMzMzMzMzMzMzMzAAAAAAAzEy0tLR4zMzMzMzMBAQELMzMzMzMzMzMzMzMzAAAAADMTLS0tITMzMzMzMwEBAQszMzMzMzMzM!
 zMzMzMAAAAAMyYtLS0sJjMzMzMzAQEBCzMzMzMzMzMzMzMzMwAAAAAzMyotLS0!
 sIRMjIyM
BAQEDIyMuJzMzMzMzMzMzMwAAADMzJhotLS0CJAEBAQEBAQEBAQEcLSIxMzMzMzMzAAAAMzMzJxotLQoBAQEBAQEBAQEBAQEtLS0qMzMzMzMAAAAzMzMzJioaAiQBAQEBAQEBAQEBGy0tLS0qMzMzMwAAAAQzMzMzMzMTHyMjIwEBATAjIyMNKi0tLS0TMzMzAAAABDMzMzMzMzMzMzMzAQEBCzMzMzMzIS0tLQgzMzMAAAAAMzMzMzMzMzMzMzMBAQELMzMzMzMzMi0tLTMzNAAAAAAzMzMzMzMzMzMzMwEBAQszMzMzMzMdLS0tMzMAAAAAADQzMzMzMzMzMzMzJQEBDjMzMzMzMx0tLS0zMwAAAAAAADMzMzMzMzMzMzMoAQEBGTMzMzMmLC0tLDM0AAAAAAAANDMzMzMzMzMzMzMBAQEGBzMzJggtLS0xMwAAAAAAAAAAMzMzMzMzMzMzMxIBAQEBBjAcFi0tGh4EAAAAAAAAAAAAMzMzMzMzMzMzMxABAQEBAQEBAi0hNAAAAAAAAAAAAAAEMzMzMzMzMzMzMwYBAQEBASQPMzMAAAAAAAAAAAAAAAAAMzMzMzMzMzMzMzMDMDArMyY0AAAAAAAAAAAAAAAAAAAANDMzMzMzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAADQzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMzMzMzMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////+AAf//AAB//wAAD/4AAAP+AAAB/gAAAP4AAAB+AAAAPgAAAD4AAAAeAAAAHgAAAB4AAAAOAAAADgAAAA4AAAAOAAAADgAAAA8AAAAPAAAAHwAAAB+AAAAfgAAAP8AAAD/gAAB/4AAA//gAAf/8AAP//wAP///g///////8=" LAST_CHARSET="UTF-8" I!
 D="rdf:#$mjXGd3">Core Package List</A>
-            <DT><A HREF="http://download.fedora.redhat.com/pub/fedora/linux/extras/6/i386/repodata/" ADD_DATE="1141318371" LAST_VISIT="1141318909" LAST_MODIFIED="1158286744" ICON="data:image/x-icon;base64,AAABAAIAEBAAAAAAAABoBQAAJgAAACAgAAAAAAAAqAgAAI4FAAAoAAAAEAAAACAAAAABAAgAAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wDGeQAAxauNAG4uAAClfUwA9uC8AJdXAADerWEA2sOmAI9dJgCtcBoAsI5kAH9GAADp4NQAsGkAAJpuOQC6mnYA28y4AJpiFwDRt5YA+fXyALx3DQCndzgAwaSAAHg5AACMTgAAqYNYAL1tAACmYAAAn3REAJNlMwCwgkgAnmchAKFwMADPup8Aza+KAH5ECQCiZhUAe0ADAL2efADYx7MAn10AAK2CTwDdr2gAhkoAAMB1AAC3aAAArIddAJdqMwByNwAAl1EAAJJUAACfcDkAgEEAAJtaAAC8cgAAw6mJAPbiwAB2PQAAhEYAAJ92SAB7QwAAcTMAALZsAACngVUA/v38AHlAAACQUQAAo3tKAHU6AACJSwAAwKSDAJptNgDo3tIAs2kAAIJEAACVVQAAbzAAAHQ4AAB3OwAAw6qLAH1EAACCRwAAv3MAAKqGXQB5QgAAhEgAAIpOAAC3agAAfEIAAH5FAACARQAAgEcAAIhKAADFeAAAvXEAAG4vAABvLwAAdzoAAHc9AAB8QwAAfEQAAH5EAACBRQAAgEYAAINHAACFRgAAhEcAAINIAACHSgAAxngAAIhLAAC9cgAAnFoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADWshJBQrTDxTaQAAAAAAAGozLAEBATknZ21HXAAAAABEVBY1PUoBRVBbW15bAAAAcgJNMmEFAUhjW1tbRwAAAHICNzsEMQEoTmQ+W21SAAAaOGAmQQMBKTAicGVnbQAAaTQvCAEBAQEBOhwqUlcAAFNlbBMbUQESVRdLXwdTAABSU2ZDBBABEWJGWC4PWwAAAG5bW1BJASM/T2hxQFYAAABTXVtaJQ5CDB8Lbx0AAAAAAEdpW1AeFQEBBlkAAAAAAAAAU25TUAoYCSAAAAAAAAA!
 AAAAAXC02UBkAAAAAAAAAAAAAAAAAAAAAAAAAAAD//wAAgB8AAIAHAACAAwAAg!
 AMAAIABA
ACAAQAAgAEAAIABAACAAQAAwAEAAMADAADgBwAA8A8AAPwfAAD//wAAKAAAACAAAABAAAAAAQAIAAAAAACABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AxoUgAM+5nwB9RAAArotgAOfczwCWaDAAqmUAANqwcADSn1AAv6KAAKZ5QACWXBAA28ivALp2EAD38+8AypNAAO/o3wCOUQAAtpZwAMeujwDfuYAA49O/AIZREACOXCAAunAAAPPlzwDv3L8AnlwAAIZLAACWYiAAwnwQAJZWAACyagAAnnRAAPv27wDr388AgkgAAIpOAADXxa8AmlkAAKZiAADTvJ8Atm0AAL5zAACaazAAuplwAN/RvwCSUwAArmgAAH5FAAB9RQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMzMzMzMzMzMzMzMzMzAAAAAAAAAAAAAAAAAAAAAAAEMzMzMzMzMzMzMzMzMzMzNAAAAAAAAAAAAAAAAAAAADMzMzMmDBUwAxQZMzMzMzMzMzM0AAAAAAAAAAAAAAAzMzMzIREBAQEBAQELMzMzMzMzMzMzNAAAAAAAAAAAADMzMyktCQEBAQEBAQEDMzMzMzMzMzMzMwAAAAAAAAAAMzMTLS0gHAEXAQEBAQELMzMzMzMzMzMzMwAAAAAAAAAzMyItLS0qJjMzFAEBAQEYMzMzMzMzMzMzMwAAAAAAADMeLS0tCDMzMzMzLwEBAQUzMzMzMzMzMzMzNAAAAAAAMxMtLS0TMzMzMzMYAQEBCzMzMzMzMzMzMzMzAAAAAAAzEy0tLR4zMzMzMzMBAQELMzMzMzMzMzMzMzMzAAAAADMTLS0tITMzMzMzMwEBAQszMzMzMzMzMz!
 MzMzMAAAAAMyYtLS0sJjMzMzMzAQEBCzMzMzMzMzMzMzMzMwAAAAAzMyotLS0s!
 IRMjIyMB
AQEDIyMuJzMzMzMzMzMzMwAAADMzJhotLS0CJAEBAQEBAQEBAQEcLSIxMzMzMzMzAAAAMzMzJxotLQoBAQEBAQEBAQEBAQEtLS0qMzMzMzMAAAAzMzMzJioaAiQBAQEBAQEBAQEBGy0tLS0qMzMzMwAAAAQzMzMzMzMTHyMjIwEBATAjIyMNKi0tLS0TMzMzAAAABDMzMzMzMzMzMzMzAQEBCzMzMzMzIS0tLQgzMzMAAAAAMzMzMzMzMzMzMzMBAQELMzMzMzMzMi0tLTMzNAAAAAAzMzMzMzMzMzMzMwEBAQszMzMzMzMdLS0tMzMAAAAAADQzMzMzMzMzMzMzJQEBDjMzMzMzMx0tLS0zMwAAAAAAADMzMzMzMzMzMzMoAQEBGTMzMzMmLC0tLDM0AAAAAAAANDMzMzMzMzMzMzMBAQEGBzMzJggtLS0xMwAAAAAAAAAAMzMzMzMzMzMzMxIBAQEBBjAcFi0tGh4EAAAAAAAAAAAAMzMzMzMzMzMzMxABAQEBAQEBAi0hNAAAAAAAAAAAAAAEMzMzMzMzMzMzMwYBAQEBASQPMzMAAAAAAAAAAAAAAAAAMzMzMzMzMzMzMzMDMDArMyY0AAAAAAAAAAAAAAAAAAAANDMzMzMzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAADQzMzMzMzMzMzMzBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMzMzMzMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////+AAf//AAB//wAAD/4AAAP+AAAB/gAAAP4AAAB+AAAAPgAAAD4AAAAeAAAAHgAAAB4AAAAOAAAADgAAAA4AAAAOAAAADgAAAA8AAAAPAAAAHwAAAB+AAAAfgAAAP8AAAD/gAAB/4AAA//gAAf/8AAP//wAP///g///////8=" LAST_CHARSET="UTF-8" ID!
 ="rdf:#$njXGd3">Extras Package List</A>
+            <DT><A HREF="http://www.redhatmagazine.com/" ADD_DATE="1176678438" LAST_VISIT="1176678446" LAST_MODIFIED="1176678459" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABMLAAATCwAAAAAAAAAAAAAAAAAAAAAAAL3gugPJ58sBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC737kQvOG+JwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKnZqo+k1qVeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC/4sAmhsmI9pnRm5y84b4MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACi1aNAks+UjYvMjtqDyIX/jc2Q1YnKi5CFyIiViMmLlYjJipWFyIiVicqLmp3TnlvF5scBAAAAAAAAAACw3LFahMiF/4XJh/+QzZL/ks+V/4bJiP+NzI//l9CZ/4fKiv+Ky4z/ltGZ/4nKiv+DyIT/oNWimdLr0xcAAAAAisuN14fJiP+Bx4L/zunP/9ft2P96xH3/t9+4//j8+f+Hyon/mdKb//v9+/+V0Jb/hsmH/4jKiv2j1qR8AAAAAI3Mj+iHyYj/gMaB/8zozf/W7df/ecN7/7bet//5/Pn/hsmI/5fRmf/8/vv/lM+U/4bJh/+Jy4v/m9KcnwAAAACNzI7ohsmH/4jKiv/l9Ob/7Pft/4bJiP/R6tP//////5PPlf+s2q7////!
 //6/bsP+DyIT/icuL/5vSnZ8AAAAAjcyO6IXJhv+RzpP//P78//7//v+Tz5X/6PXp//////+h1aL/wePB///////H5sf/gceC/4nLi/+b0p2fAAAAAI3Mj+iFyYb/kM2R//r8+v/9/v7/kc6T/+b05///////ndOe/7/iwP//////xOXF/4HHgv+Jy4r/mtKcnwAAAACJyoveh8qI/4LIhP/U7NX/3/Hg/37FgP++4r//+fz5/4nKi/+e1KD//v7+/57Un/+EyIb/iMqK/6LWpJ8AAAAAp9ipcYLHhP+Ax4L/veK+/8blx/99xX//qtms/9nu2f+GyYj/k8+V/9zw3f+Tz5X/fcV//53Tn/8AAAAAAAAAAAAAAACf1KFdmtKb6ZTQl+uU0JbqmdKb6pXQl+qTz5XqmNGa6pjRmeqTz5XqldCX6rPdtOoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//9sZf//cmnv/2lu8/9hbuAHZXLAAXN0gAFuZ4AACQmAAAk8gAB5PoAAbS6AAHBswABwcuAAdC7//2Nr//8ubQ==" LAST_CHARSET="UTF-8" ID="rdf:#$+T+iZ2">Red Hat Magazine</A>
+            <DT><A HREF="http://mugshot.org/main" ADD_DATE="1176674240" LAST_VISIT="1176674248" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABMLAAATCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAjxhJjI8YSf+PGEn/jxhJ/48YSf+PGEn9jxhJ/48YSYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACPGEkzjxhJ/48YSf/Sp87/38Db/9/A2//fwNv/38Db/9Knzv+PGEn/jxhJ/48YSTMAAAAAAAAAAAAAAAAAAAAAjxhJ/9CjzP/kwdn/5MHZ/61Wfv+PGEn/jxhJ/61Wfv/kwdn/5MHZ/9CjzP+PGEn/AAAAAAAAAAAAAAAAjxhJjI8YSf/kwdn/5MHZ/48YSf/HkcL/2K6//9iuv//HkcL/jxhJ/+TB2f/kwdn/jxhJ/48YSYwAAAAAAAAAAI8YSf/Sp87/5MHZ/61Wfv+PGEn/jxhJ/48YSf+PGEn/jxhJ/48YSf+tVn7/5MHZ/9Knzv+PGEn/AAAAAAAAAACPGEn/5MHZ/+TB2f/kwdn/5MHZ/+TB2f/kwdn/5MHZ/+TB2f/kwdn/5MHZ/+TB2f/kwdn/jxhJ/QAAAAAAAAAAjxhJ/+TB2f/kwdn/5MHZ/+TB2f/CgJv/jxhJ/48YSf+8dJL/5MHZ/+TB2f/kwdn/5MHZ/48YSf0AAAAAAAAAAI8YSf/kwdn/5MHZ/9iuv/+PGEn/2K6//+TB2f/kwdn/5MHZ/+TB2f/kwdn/5MHZ/+TB2f+PGEn/AAAAAAAAAACPGEn/5MHZ/+TB2f+PGEn/2K6//48YSf/kwdn/5MHZ/9iuv/+PGEn/5MHZ/+TB2f/kwdn/jxhJ/wAAAAAAAAAAjxhJ/!
 +TB2f/kwdn/jxhJ/+TB2f+PGEn/5MHZ/+TB2f/Yrr//jxhJ/+TB2f/kwdn/5MHZ/48YSf8AAAAAAAAAAI8YSf/kwdn/5MHZ/48YSf/Yrr//jxhJ/+TB2f/kwdn/2K6//48YSf/kwdn/5MHZ/+TB2f+PGEn/AAAAAAAAAACPGEn/5MHZ/+TB2f/Yrr//jxhJ/9iuv//kwdn/5MHZ/+TB2f/kwdn/5MHZ/+TB2f/kwdn/jxhJ/wAAAAAAAAAAjxhJ/+TB2f/kwdn/5MHZ/+TB2f/kwdn/5MHZ/+TB2f/kwdn/5MHZ/+TB2f/kwdn/5MHZ/48YSf8AAAAAAAAAAI8YSf/kwdn/jxhJ/+TB2f/kwdn/jxhJ/+TB2f/kwdn/jxhJ/+TB2f/kwdn/jxhJ/+TB2f+PGEn/AAAAAAAAAACPGEn/okiaM48YSZnkwdn/5MHZ/48YSf/kwdn/5MHZ/48YSf/kwdn/5MHZ/48YSZmiSJozjxhJ/wAAAAAAAAAAAAAAAAAAAACPGEmMAAAAAKJImjOPGEmMokiaM6JImjOPGEmMokiaMwAAAACPGEmMAAAAAAAAAAAAAAAA8A9pe+AHAADAA1wAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIABAACgBQAA7bcAAA==" LAST_CHARSET="UTF-8" ID="rdf:#$sKnQZ2">Mugshot</A>
+            <DT><A HREF="http://www.redhat.com/" ADD_DATE="1176674148" LAST_VISIT="1176674165" LAST_MODIFIED="1176674158" ICON="data:image/x-icon;base64,AAABAAEAEBAQAAAAAAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAABxcYQA+fn5AOvr6wChoaMATU1UAM/PzQABAY4AAQGvAAAA2AABAWIACgopAAAAygAAAMwAAAAAAP///wAAAAAA7u7u7u4e7u7u7u7u7jXu7u7u7u7uLT7u7u7u4dDjpETuIu7uVeWt3VPR5UQABK3drVE0l3d3dq3aMHu4zMzIetpsyIu7u7vJp8iHaby7zIm8h5rZvLu3ari5qWjLuGrdqZm4jLvMnd3d27qWzIet3d3Ztnu2tt3a3dp4y5qa3a0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" LAST_CHARSET="ISO-8859-1" ID="rdf:#$qKnQZ2">Red Hat</A>
+            <DT><A HREF="http://www.jboss.com/" ADD_DATE="1176674189" LAST_VISIT="1176674209" LAST_MODIFIED="1176674200" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAABAAAAAAAADEkAAD1sIQB9SCkAfjF7AJl1cwC6mHUAh6JvAIuncQAAAMcABwfLABERzAAjI9MAAFXGAABayQBDQ9cAsH+vAADE/wBB2f8AS9j/AG3g/wB25P8Aq5COAKu+lwC8lLsAyK+TAMWwrgCrwJgAvcyyAN7PvgCamOsApaXsAKHE7ACnyOwAscvvALTR8AC60/EAvtfxAKbq/wC27/8A28PaAOXYygDn3NAA09L3ANzX+QDb2vkA8eriAPLs7ADw8+wA9vPvAOTk+wDv7/wA4Pn/AOf5/wDs+/8A+PL3APX59AD69/gA8vz/APr5+QD6+/4A/fv8AP7+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPj4+Pj4+Pj4+PjMyPj4+Pj4+Pj4+PiUlPi0MCx8+Pj4+Pj4+PiMODiMeCQkPPj4+Pj4+Pj4iDg0gLAwKHj4+Pj4+NhQVOiEgPj4yKz4+Pj4+PiYRESc+Pj4+Pj4+Pj4+Pj40EhM0Pj4+Pj4+Pj4+Pj4+Pjg+Pj4+Pj4+Pj4+Pj4+PhsCFz4+Pj4+Pj4+Pj4+Pj4IAQc+Pj4+Pj4+Pj4+Pj4+MBw4Pj4+Pj4+Pj4+Pj4+Pj4+KRkwPj4+Pj4+Pj4+Pj4+PgYDKjkvPj4+Pj4+Pj4+Pj4uHT4FAz4oGD4+Pj4+Pj4+Pj4+GhY+EAQ+Pj4+Pj4+Pj4+Pj4+Pj43Pj4+PgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" LAST_CHA!
 RSET="UT
F-8" ID="rdf:#$rKnQZ2">JBoss</A>
+        </DL><p>
+        <DT><H3 ADD_DATE="1176674388" LAST_MODIFIED="1176674871" ID="rdf:#$tKnQZ2">Free Content</H3>
+        <DL><p>
+            <DT><A HREF="http://www.wikipedia.org/" ADD_DATE="1176674401" LAST_VISIT="1176674649" LAST_MODIFIED="1176675382" ICON="data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAEAgQAhIOEAMjHyABIR0gA6ejpAGlqaQCpqKkAKCgoAPz9/AAZGBkAmJiYANjZ2ABXWFcAent6ALm6uQA8OjwAiIiIiIiIiIiIiI4oiL6IiIiIgzuIV4iIiIhndo53KIiIiB/WvXoYiIiIfEZfWBSIiIEGi/foqoiIgzuL84i9iIjpGIoMiEHoiMkos3FojmiLlUipYliEWIF+iDe0GoRa7D6GPbjcu1yIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" LAST_CHARSET="UTF-8" ID="rdf:#$uKnQZ2">Wikipedia</A>
+<DD>Online Encyclopedia
+            <DT><A HREF="http://www.jamendo.com/" ADD_DATE="1176674604" LAST_VISIT="1176674681" LAST_MODIFIED="1176675644" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcj8BAHZDAQB6RwEAf0wBAHxJBAB/f38AhFEBAIRSAgCJVgEAj1sBAI9cAgCNXAoAhFYbAJRgAACZZQAAnmoAAJ5rAQCZaA0AkWMbAKNvAACncwAAq3cAAK56AACseAIAsX0AAJBjIgCabiUAk2oxAKB5PACjfkgAoHxKAK6AHgCxhScAs4gsALqQLgCyij4AsItLAL2XRwCmhVoApINeAL6dXQClhWEAqophALCQYgC0lWUAuZhgALiccwC4nXsAuZ99AL+lfwDDnUgAx6RUAMOjYgDIqGAAzq5gAM+vYwDJqmgAxKhzANCzcADQtn0A07h6ANW6fgC+pYIAvqaDAMKpggDEq4AAwaqNANS7gwDWvYcAzbiXAM+7mADLuJwAz7udANC6kADPvKIA2MGOANXAlgDZwpAA2sSUANzHmQDYxqYA08KrANXFrADXx68A3syoAOXWtgDp4dQA7ebaAO/p3wDv6eAA9O/pAPTw6gD39PAA+PbyAG88AQAyB5J8qwaSfOsGknwWAAAAFgAAAAEAAADIBZJ8kJQHAGgQjgBRBZJ8eBMFAG0FknwAAAAAPQSSfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADOM5J8+bUAALgNjg!
 AAAAUAbBKOABjukXzAQJJ8/////7tAknyO1gEARQAAAKwPjgCAABDAbBKOABjukXxwBZJ8/////wAAAAA9BJJ84BCOAHULgXy3AAAAAQAAAAIAAABcEo4AGAAAAAAAAADIEI4AQgAAAAAAAACsEI4AAAAAAAAAAAAAAAAADAAAAAIAAAABAZF8ANz9f2oAAAAAAAAAAwAAAHIAGgKYlAcAAAAAAJiUBwAFAAAA3+KAfAQRjgBPGoB8sAEAAAAAAMAAAAAAAAAAAAIAAACAAAAAAAAAAEQSjgA/ZUsAUDgJAQAAAMAAAAAAOBKOAAIAAACAAAAAAAAAAOgrjgDk9agAAgAAAEM6XEN5cHJpZW5cMXd3dy4FAAAAZXJmbHkuZnJlZS5mclxqYW1lbmRvXGZhdmljb24uaWNvANF3AND9f8wRjgAAAAAASCkJASqI0Xf/6ZF8DhCBfLABAAAAAAAAAAAAAAAAAADAEY4ASCkJARYAAAAAAAAALhCBfBYAAABcEo4AAQAAACAAAAAWAAAAAAAAABYAAACsEY4AKojRd2wSjgDzmYN8OBCBfP////8uEIF81mVLALABAABIKQkBFgAAABASjgAAAAAAAChfX19fX19fX19fX18qACgBAQEBAQEBAQEBAQEBASoCAgICAgICJ0MxMCsNAgICAwMDBR9SWl5dSz9IQBwDAwQEBDJZXFtXUx4aLFQvBAQHBwdJWEETCAcHBx1GLQcHCQkJCQkJCQkJCQxCRxsJCQoKCgoKCgoKCgslUS4KCgoODg4ODg4ODg4SSjoSDg4ODw8PDw8PDw8PKU0kDw8PDxAQEBAQEBAQEFU1ERAQEBAUFBQUFBQUFBRWPCEgIiY5FRUVFRUVFRUVNk9MREVOUBYWFhYWFhYWFhgzPT47NCM3FxcXFxcXFxcXFxcXFxc4ADcZGRkZGRkZGRkZGRk4AIABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAAA=" LAST_C!
 HARSET="
UTF-8" ID="rdf:#$JKnQZ2">Jamendo</A>
+            <DT><A HREF="http://magnatune.com/" ADD_DATE="1176674748" LAST_VISIT="1176675508" LAST_MODIFIED="1176675639" ICON="data:image/x-icon;base64,AAABAAIAICAQAAAAAADoAgAAJgAAABAQEAAAAAAAKAEAAA4DAAAoAAAAIAAAAEAAAAABAAQAAAAAAIACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAgAAAAICAAIAAAACAAIAAgIAAAMDAwACAgIAAAAD/AAD/AAAA//8A/wAAAP8A/wD//wAA////AP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////3eIiHf//////////////3iIiIiIh/////////////eIh///eIh///////////94h/////94h//////////3iH9/9//394h/////////+If4h/iPeI94j////////3iP+If4j3iP+If///////94f/iH+I94j/eH////////iP/4h/iPeI//iP///////4j/+If4j3iP/4j///////+I//iH+I94j/+I////////iP/4j/iP+I//iP///////3h////4j///94f///////94j///+I////iH////////+If///iP//94j/////////eIf//4j//3iH//////////eIf/93//eIf///////////eIh///eIh/////////////eIiIiIiH//////////////93iIh3////////////////////////////////////////////////////////////////////////////////////////////////////!
 ////////////////////////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAEAAAACAAAAABAAQAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAgAAAAICAAIAAAACAAIAAgIAAAMDAwACAgIAAAAD/AAD/AAAA//8A/wAAAP8A/wD//wAA////AP//d4iId/////eId3eIf///eHf//3eH//eHf///93h/eH+Hd39494d4f4d3d3j3h4f/h3d3eP94h/+Hd3d4/3iH/4d3d3j/eIf/d/d/d/94eH//93//94d4f//3f//3h/eH//d//3h//3h39393h///94h3d4h/////d4iId///AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$KKnQZ2">Magnatune</A>
+            <DT><A HREF="http://freesound.iua.upf.edu/" ADD_DATE="1176674764" LAST_VISIT="1176674804" LAST_MODIFIED="1176674833" ICON="data:image/gif;base64,R0lGODlhEAAQAOYAAPn5+f39/fv7+/z8/O/v752dnYaGhsPDw/f39/j4+KCgoPb29uDg4KysrDs7O+np6fLy8tfX19DQ0NXV1cTExPT09NnZ2dbW1u7u7qurq7S0tLi4uKSkpIeHh6Ojo7W1tb6+vpeXl4ODg0hISIiIiMDAwAsLC0tLS5GRkUxMTLa2tmpqatTU1K2trcXFxZ6enpmZmezs7LGxsdzc3G5ubpycnOfn59HR0S4uLmtra/Dw8Le3t5ubm6ampvPz8+3t7djY2GxsbGdnZ5KSkru7uzg4OAMDA3V1dVVVVZ+fn/7+/gAAAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAd4gACCg4SFhoQ8h4cFJoqFEUsHgiqGM0GCSUaCDjmGSDSCKSeCSxKGSzgUACMrAAdLGYMfLihHRQYNGzUAHDJCDkAlhDAhLwAWABcABQw3hQoNPQAsHoIKhxM7QwAUBoItigwdAEQgjoMkABoR54IiAKbty/KDE46BADs=" LAST_CHARSET="UTF-8" ID="rdf:#$LKnQZ2">The Freesound Project</A>
+            <DT><A HREF="http://creativecommons.org/" ADD_DATE="1176674776" LAST_VISIT="1176675582" LAST_MODIFIED="1176675626" ICON="data:image/x-icon;base64,AAABAAIAEBAAAAEACABoBQAAJgAAACAgAAABAAgAqAgAAI4FAAAoAAAAEAAAACAAAAABAAgAAAAAAEABAAAAAAAAAAAAAAABAAAAAAAAAAAAAP///wDu7u4A3d3dAMzMzAC7u7sAqqqqAJmZmQCIiIgAd3d3AGZmZgBVVVUAREREADMzMwAiIiIAERERAP///wABAQEBAwgMDAwMCAIBAQEBAQEBCA8ADAgIDAAPBwEBAQEBCgAJAgEBAQECCwAJAQEBCAAHAQEBAQEBAQEHAAYBAg8LAQEBAQEBAQEBAQsPAQcAAwEECAgCAggIBQEDAAYKDAEDDwsLCgoNCA8DAQ4IDAwBCAABAQEACAEBAQEMCwwMAQcAAgMDDwkBBAEBDAoJDgECDQ4PCQcADQ4DAQ8IBgAFAQEEAwEBAwUBAQYABAENDQIBAQEBAQEBAQIODAEBBA8KAgEBAQEBAQINDwQBAQEFDw4HAQEBAgcODwQBAQEBAQQMAAANDgAADAMBAQEBAQEBAQMICAgHAwEBAQEBAAASAKYCAAAPAgAADAIAADiEbwAHAAAAXgIAAGABAABFBAAA2QIAAAAAAAABAAAAHPYSAAAAAABc+BIAdsDXdyC31Xf/////pgIAAA8CAACs9hIAoWPUdziEbwCmAg8ChAAAAKYCDwIAAAAAAQAAAAAQAAABBAAAAAAAAHgEAgCgNUgAxPYSAHZw1HcM9xIA+2/Ud5oEAgCEAAAAAAAAAKYCDwIBAAAAsm/Ud5oEAgCEAAAAAAAAAMZv1HeEAAAApgIPAgAAAAABAAAAAAAAAAAAAADc9hIAAAAAAF!
 z4EgB2wNd3GLjVd//////Gb9R3DQZBAJoEAgCEAAAAAAAAAKYCDwJM+BIAMARBAAT4EgAAAAAAQwAAAPn///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAMPcSABQAAADpBwqdAgAAAMEGCrHXAQAAAwAAAOYBAADU0MgALh7Hd7jBFgAAAAAA2PcSAAAAAABRAAEBmPgSAAMAAADCztV33PcSAKMblnFM+BIAMARBALjBFgDU0MgA3PcSAKkblnFRAAEB1NDIAC4ex3cE+BIAXzrUd5oEAgCEAAAAAAAAAKYCDwIwBEEAzau63AAAAABM+BIAMARBAGz4EgAuO9R3AOD9f2z4EgA/PNR3OPgSAEI71HcAAAAAmgQCAAcAAAADAAAAAAAAAAAAAAAUAAAAAQAAAAAAAAAAAAAAEAAAAAAAAAABAAAAIPgSAAAAAACw+BIAdsDXdyC31Xf/////QjvUd3RY1HcAAAAAMARBAJoEAgCEAAAAAAAAAKYCDwJMhG8Af1jUdxIBAAA4hG8ABwAAAOYBAAABAAAAlPgSAAIAAACw+RIAdsDXd4i31Xf/////f1jUd6RY1Hc4hG8AhAAAAAAAAAC0WNR3AAAAAAAAAAADCAwMDAwIAgAAAAAAAAAIDwAMCAgMAA8HAAAAAAAKAAkCAQEBAQILAAkAAAAIAAcBAQEBAQEBAQcABgACDwsBAQEBAQEBAQEBCw8ABwADAQQICAICCAgFAQMABgoMAQMPCwsKCg0IDwMBDggMDAEIAAEBAQAIAQEBAQwLDAwBBwACAwMPCQEEAQEMCgkOAQINDg8JBwANDgMBDwgGAAUBAQQDAQEDBQEBBgAEAA0NAgEBAQEBAQEBAg4MAAAEDwoCAQEBAQEBAg0PBAAAAAUPDgcBAQECBw4PBAAAAAAABAwAAA0OAAAMAwAAAAAAAAAAAwgICAcDAAAAAADwD///4A!
 f//8AD//+AAf//AAH//wAA//8AAP//AAD//wAA//8AAP//AAD//4AB//+AAf//!
 wAP//+AH
///4H///KAAAACAAAABAAAAAAQAIAAAAAACABAAAAAAAAAAAAAAAAAAAAAAAAP///wDe3t4Ara2tAIyMjABzc3MAQkJCAFJSUgDOzs4AnJycAAAAAAAhISEAMTExABAQEADv7+8Avb29AGNjYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJBwMEBQUFBgMOCQkJCQkJCQkJCQkJCQkJCQkJCQkJCAoJCQkJCQkJCQkMDwEJCQkJCQkJCQkJCQkJCQkJDgoJCQkJCQkJCQkJCQkJCQMJCQkJCQkJCQkJCQkJCQMJCQkJBggBAAAAAA4ECgkJCQsBCQkJCQkJCQkJCQkPCQkJBgEAAAAAAAAAAAAACAwJCQwHCQkJCQkJCQkJBAkJCQgAAAAAAAAAAAAAAAAADQsJCQwBCQkJCQkJCQIJCQwHAAAAAAAAAAAAAAAAAAAAAA8JCQsJCQkJCQkNDAkJCAAAAAAAAAAAAAAAAAAAAAAAAAsJCQMJCQkJCQMJCQQAAAAAAAAAAAAAAAAAAAAAAAAAAQwJDA0JCQkNDAkMDQAAAAAAAAAAAAAAAAAAAAAAAAAAAwkJAwkJCQgJCQMAAAAAAQMDAw4AAAAACAMDAw0AAAANCQkLCQkJDwkJAQAAAAgJCQkJCQ8ADQsJCQkJDAcAAAAFC!
 QkJCQkFCQoAAAABCQkLCAMMCQgPCQkEAgYJCwAAAAMJCQ4JCQkJBQAAAAMJCQE!
 AAA4OAAk
JBgAAAAgNAAAAAgkJDgkJCQkFAAAABgkJAAAAAAAOCQkDAAAAAAAAAAAOCQkDCQkJCQUAAAAPCQkAAAAAAAcJCQMAAAAAAAAAAA4JCQMJCQkJBQAAAAMJCQ4AAAIBAAwJBQAADQgAAAAACAkJDgkJBQkMAAAADQwJDAMECQkCBAkJBgMLCQUAAAADCQkOCQkECQkHAAAABwwJCQkJBAAADwkJCQkKBwAAAAsJCQkJCQIJCQQAAAAADQgDAwEAAAAABwMDAgAAAAABCQkFCQkJCQwJDA0AAAAAAAAAAAAAAAAAAAAAAAAAAA8JCQgJCQkJAwkJDwAAAAAAAAAAAAAAAAAAAAAAAAAHCQkMDQkJCQkNCgkJCAAAAAAAAAAAAAAAAAAAAAAADQsJCQgJCQkJCQkOCQkJCAAAAAAAAAAAAAAAAAAAAA0LCQkFCQkJCQkJCQkICQkJAwAAAAAAAAAAAAAAAAABCwkJCw0JCQkJCQkJCQkECQkJBQEAAAAAAAAAAAAAAwwJCQoHCQkJCQkJCQkJCQkICQkJCQYIBwAAAA0CBAwJCQkLDQkJCQkJCQkJCQkJCQkHCwkJCQkJCQkJCQkJCQkMAwkJCQkJCQkJCQkJCQkJCQkJCAUJCQkJCQkJCQkKAwEJCQkJCQkJCQkJCQkJCQkJCQkJCQECAwQFBgMDBwkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJ///////gD///gAH//gAA//wAAD/4AAAf8AAAD+AAAA/AAAAHwAAAA4AAAAOAAAADgAAAA4AAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAOAAAADwAAAA8AAAAPAAAAH4AAAD/AAAA/4AAAf/AAAP/4AAP//gAH//+AP//////8=" LAST_CHARSET="UTF-8" ID="rdf:#$MKnQZ2">Creative Commons</A>
+<DD>Free Content Licenses
         </DL><p>
-        <DT><A HREF="http://www.redhat.com/magazine/" ADD_DATE="1130967439" LAST_VISIT="1141658624" ICON="data:image/x-icon;base64,AAABAAEAEBAQAAAAAAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAABxcYQA+fn5AOvr6wChoaMATU1UAM/PzQABAY4AAQGvAAAA2AABAWIACgopAAAAygAAAMwAAAAAAP///wAAAAAA7u7u7u4e7u7u7u7u7jXu7u7u7u7uLT7u7u7u4dDjpETuIu7uVeWt3VPR5UQABK3drVE0l3d3dq3aMHu4zMzIetpsyIu7u7vJp8iHaby7zIm8h5rZvLu3ari5qWjLuGrdqZm4jLvMnd3d27qWzIet3d3Ztnu2tt3a3dp4y5qa3a0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" LAST_CHARSET="ISO-8859-1" ID="rdf:#$w80oc3">Red Hat Magazine</A>
     </DL><p>
 </DL><p>


Index: fedora-bookmarks.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-bookmarks/devel/fedora-bookmarks.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-bookmarks.spec	20 Mar 2007 17:37:05 -0000	1.1
+++ fedora-bookmarks.spec	15 Apr 2007 23:13:25 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           fedora-bookmarks
-Version:        6
-Release:        2
+Version:        7
+Release:        1
 Summary:        Fedora Core bookmarks
 Group:          Applications/Internet
 License:        GFDL
@@ -36,6 +36,9 @@
 %{_datadir}/bookmarks/default-bookmarks.html
 
 %changelog
+* Sun Apr 15 2007 Christopher Aillon <caillon at redhat.com> 7-1
+- FC7 bookmarks based on http://fedoraproject.org/wiki/Releases/7/Bookmarks
+
 * Tue Mar 20 2007 Christopher Aillon <caillon at redhat.com> 6-2
 - Package review updates
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 02:44:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 15 Apr 2007 22:44:57 -0400
Subject: rpms/kernel/devel patch-2.6.21-rc7.bz2.sign, NONE, 1.1 .cvsignore,
	1.606, 1.607 kernel-2.6.spec, 1.3070, 1.3071 sources, 1.569,
	1.570 upstream, 1.497, 1.498 patch-2.6.21-rc6-git8.bz2.sign,
	1.1, NONE patch-2.6.21-rc6.bz2.sign, 1.1, NONE
Message-ID: <200704160244.l3G2ivNU032394@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.21-rc7.bz2.sign 
Removed Files:
	patch-2.6.21-rc6-git8.bz2.sign patch-2.6.21-rc6.bz2.sign 
Log Message:
* Sun Apr 15 2007 Dave Jones <davej at redhat.com>
- 2.6.21-rc7



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

iD8DBQBGItHAyGugalF9Dw4RAlqkAKCV/F+51PYUu6tXIWaBp2HQOG6fbwCfXwoz
FawtmBePYMsAYd4m0E7HFlY=
=63sh
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.606
retrieving revision 1.607
diff -u -r1.606 -r1.607
--- .cvsignore	15 Apr 2007 20:05:21 -0000	1.606
+++ .cvsignore	16 Apr 2007 02:44:55 -0000	1.607
@@ -4,5 +4,4 @@
 sparse-0.2.tar.bz2
 kernel-2.6.20
 linux-2.6.20.tar.bz2
-patch-2.6.21-rc6.bz2
-patch-2.6.21-rc6-git8.bz2
+patch-2.6.21-rc7.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3070
retrieving revision 1.3071
diff -u -r1.3070 -r1.3071
--- kernel-2.6.spec	15 Apr 2007 20:05:21 -0000	1.3070
+++ kernel-2.6.spec	16 Apr 2007 02:44:55 -0000	1.3071
@@ -370,8 +370,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.21-rc6.bz2
-Patch2: patch-2.6.21-rc6-git8.bz2
+Patch1: patch-2.6.21-rc7.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -970,7 +969,6 @@
 
 # Update to latest upstream.
 %patch1 -p1
-%patch2 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
@@ -2264,6 +2262,9 @@
 
 %changelog
 * Sun Apr 15 2007 Dave Jones <davej at redhat.com>
+- 2.6.21-rc7
+
+* Sun Apr 15 2007 Dave Jones <davej at redhat.com>
 - 2.6.21-rc6-git8
 
 * Sat Apr 14 2007 Dave Jones <davej at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.569
retrieving revision 1.570
diff -u -r1.569 -r1.570
--- sources	15 Apr 2007 20:05:21 -0000	1.569
+++ sources	16 Apr 2007 02:44:55 -0000	1.570
@@ -1,4 +1,3 @@
 2618cbcc9c9ac1c3c04be903fe3338a7  sparse-0.2.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
-291cbc4c09c5111e4a2030a04ee69b65  patch-2.6.21-rc6.bz2
-9729a264f4725f8c46db196b85526dfc  patch-2.6.21-rc6-git8.bz2
+3a54bf5a7cf6b124e680e1d08fe1b20b  patch-2.6.21-rc7.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -r1.497 -r1.498
--- upstream	15 Apr 2007 20:05:21 -0000	1.497
+++ upstream	16 Apr 2007 02:44:55 -0000	1.498
@@ -1,3 +1,2 @@
 linux-2.6.20.tar.bz2
-patch-2.6.21-rc6.bz2
-patch-2.6.21-rc6-git8.bz2
+patch-2.6.21-rc7.bz2


--- patch-2.6.21-rc6-git8.bz2.sign DELETED ---


--- patch-2.6.21-rc6.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 16 08:41:58 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 04:41:58 -0400
Subject: rpms/tetex/devel tetex.spec,1.108,1.109
Message-ID: <200704160841.l3G8fwsT005748@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/tetex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5540

Modified Files:
	tetex.spec 
Log Message:
- mark map files as configs (#143661)



Index: tetex.spec
===================================================================
RCS file: /cvs/dist/rpms/tetex/devel/tetex.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- tetex.spec	10 Apr 2007 13:11:28 -0000	1.108
+++ tetex.spec	16 Apr 2007 08:41:55 -0000	1.109
@@ -11,7 +11,7 @@
 Summary: The TeX text formatting system.
 Name: tetex
 Version: 3.0
-Release: 38%{?dist}
+Release: 39%{?dist}
 License: distributable
 Group: Applications/Publishing
 Requires: tmpwatch, dialog, ed
@@ -599,7 +599,7 @@
 find ${RPM_BUILD_ROOT} -type f -or -type l | \
 	sed -e "s,${RPM_BUILD_ROOT},,g" | \
 	grep -v "^%{_sysconfdir}" | grep -v ".orig$" | \
-	sed -e "s,.*\.\(cnf\|cfg\)$,%config(noreplace) &," \
+	sed -e "s,.*\.\(cnf\|cfg\|map\)$,%config(noreplace) &," \
 	    -e "s,.*ls-R$,%ghost &," \
 	    -e "s,^/usr/share/texmf/p\?dvips/config/config\.\(generic\|pdf\|ps\|www\)$,%config(noreplace) &," \
 	    -e "s,^/usr/share/texmf/p\?xdvi/XDvi,%config(noreplace) &," \
@@ -865,6 +865,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Mon Apr 16 2007 Jindrich Novy <jnovy at redhat.com> 3.0-39
+- mark map files as configs (#143661)
+
 * Tue Apr 10 2007 Jindrich Novy <jnovy at redhat.com> 3.0-38
 - update nomencl package from CTAN (#234466)
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 09:14:17 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 05:14:17 -0400
Subject: rpms/autofs/devel autofs-5.0.1-cmd-global-options.patch, NONE,
	1.1 autofs-5.0.1-conf-append-global.patch, NONE,
	1.1 autofs.spec, 1.198, 1.199
Message-ID: <200704160914.l3G9EHTR029271@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-cmd-global-options.patch 
	autofs-5.0.1-conf-append-global.patch 
Log Message:
* Mon Apr 16 2007 Ian Kent <ikent at redhat.com> - 5.0.1-8
- add configuration variable to control appending of global options (bz 214684).
- add command option to set a global mount options string (bz 214684).


autofs-5.0.1-cmd-global-options.patch:
 daemon/automount.c  |   21 +++++++++++++++++++--
 man/automount.8.in  |    6 ++++++
 modules/parse_sun.c |   24 ++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 2 deletions(-)

--- NEW FILE autofs-5.0.1-cmd-global-options.patch ---
diff --git a/daemon/automount.c b/daemon/automount.c
index 37e040b..a8327d1 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -47,6 +47,8 @@ const char *libdir = AUTOFS_LIB_DIR;	/* Location of library modules */
 const char *mapdir = AUTOFS_MAP_DIR;	/* Location of mount maps */
 const char *confdir = AUTOFS_CONF_DIR;	/* Location of autofs config file */
 
+const char *global_options;		/* Global option, from command line */
+
 static char *pid_file = NULL;	/* File in which to keep pid */
 unsigned int random_selection;	/* use random policy when selecting
 				 * which multi-mount host to mount */
@@ -1367,6 +1369,8 @@ static void usage(void)
 		/*"	-f --foreground do not fork into background\n" */
 		"	-r --random-replicated-selection"
 		"			use ramdom replicated server selection\n"
+		"	-O --global-options"
+		"			specify global mount options\n"
 		"	-V --version	print version, build config and exit\n"
 		, program);
 }
@@ -1452,7 +1456,7 @@ int main(int argc, char *argv[])
 {
 	int res, opt, status;
 	unsigned ghost, logging;
-	unsigned foreground;
+	unsigned foreground, have_global_options;
 	time_t timeout;
 	time_t age = time(NULL);
 	sigset_t allsigs;
@@ -1466,6 +1470,7 @@ int main(int argc, char *argv[])
 		{"define", 1, 0, 'D'},
 		{"foreground", 0, 0, 'f'},
 		{"random-selection", 0, 0, 'r'},
+		{"global-options", 1, 0, 'O'},
 		{"version", 0, 0, 'V'},
 		{0, 0, 0, 0}
 	};
@@ -1482,10 +1487,12 @@ int main(int argc, char *argv[])
 	ghost = defaults_get_browse_mode();
 	logging = defaults_get_logging();
 	random_selection = 0;
+	global_options = NULL;
+	have_global_options = 0;
 	foreground = 0;
 
 	opterr = 0;
-	while ((opt = getopt_long(argc, argv, "+hp:t:vdD:fVr", long_options, NULL)) != EOF) {
+	while ((opt = getopt_long(argc, argv, "+hp:t:vdD:fVrO:", long_options, NULL)) != EOF) {
 		switch (opt) {
 		case 'h':
 			usage();
@@ -1523,6 +1530,16 @@ int main(int argc, char *argv[])
 			random_selection = 1;
 			break;
 
+		case 'O':
+			if (!have_global_options) {
+				global_options = strdup(optarg);
+				have_global_options = 1;
+				break;
+			}
+			printf("%s: global options already specified.\n",
+				program);
+			break;
+
 		case '?':
 		case ':':
 			printf("%s: Ambiguous or unknown options\n", program);
diff --git a/man/automount.8.in b/man/automount.8.in
index 59f2805..b01be83 100644
--- a/man/automount.8.in
+++ b/man/automount.8.in
@@ -51,6 +51,12 @@ mount entries.
 Enables the use of ramdom selection when choosing a host from a
 list of replicated servers.
 .TP
+.I "\-O, \-\-global-options"
+Allows the specification of global mount options used for all master
+map entries. These options will either replace or be appened to options
+given in a master map entry depending on the APPEND_OPTIONS configuration
+setting.
+.TP
 .I "\-V, \-\-version"
 Display the version number, then exit.
 .SH ARGUMENTS
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 276493a..0494e76 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -42,6 +42,8 @@ int parse_version = AUTOFS_PARSE_VERSION;	/* Required by protocol */
 static struct mount_mod *mount_nfs = NULL;
 static int init_ctr = 0;
 
+extern const char *global_options;
+
 struct parse_context {
 	char *optstr;		/* Mount options */
 	char *macros;		/* Map wide macro defines */
@@ -65,6 +67,8 @@ static struct parse_context default_context = {
 	1			/* Do slashify_colons */
 };
 
+static char *concat_options(char *left, char *right);
+
 /* Free all storage associated with this context */
 static void kill_context(struct parse_context *ctxt)
 {
@@ -264,6 +268,7 @@ int parse_init(int argc, const char *const *argv, void **context)
 	const char *xopt;
 	int optlen, len, offset;
 	int i, bval;
+	unsigned int append_options;
 
 	/* Get processor information for predefined escapes */
 
@@ -392,6 +397,25 @@ int parse_init(int argc, const char *const *argv, void **context)
 		}
 	}
 
+	if (global_options) {
+		append_options = defaults_get_append_options();
+		if (append_options) {
+			char *tmp = concat_options(global_options, ctxt->optstr);
+			if (!tmp) {
+				char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+				error(LOGOPT_ANY, MODPREFIX "concat_options: %s", estr);
+			} else
+				ctxt->optstr = tmp;
+		} else {
+			if (!ctxt->optstr)
+				ctxt->optstr = strdup(global_options);
+			if (!ctxt->optstr) {
+				char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+				warn(LOGOPT_ANY, MODPREFIX "%s", estr);
+			}
+		}
+	}
+
 	debug(LOGOPT_NONE,
 	      MODPREFIX "init gathered global options: %s", ctxt->optstr);
 

autofs-5.0.1-conf-append-global.patch:
 include/defaults.h             |    2 ++
 lib/defaults.c                 |   13 +++++++++++++
 modules/parse_sun.c            |   27 ++++++++++++++++++++++-----
 redhat/autofs.sysconfig.in     |    4 ++++
 samples/autofs.conf.default.in |    4 ++++
 5 files changed, 45 insertions(+), 5 deletions(-)

--- NEW FILE autofs-5.0.1-conf-append-global.patch ---
diff --git a/include/defaults.h b/include/defaults.h
index b64735f..ef58467 100644
--- a/include/defaults.h
+++ b/include/defaults.h
@@ -34,6 +34,7 @@
 #define DEFAULT_ENTRY_ATTR		"cn"
 #define DEFAULT_VALUE_ATTR		"nisMapEntry"
 
+#define DEFAULT_APPEND_OPTIONS		1
 #define DEFAULT_AUTH_CONF_FILE		AUTOFS_MAP_DIR "/autofs_ldap_auth.conf"
 
 unsigned int defaults_read_config(void);
@@ -47,6 +48,7 @@ const char *defaults_get_entry_obj_class(void);
 const char *defaults_get_map_attr(void);
 const char *defaults_get_entry_attr(void);
 const char *defaults_get_value_attr(void);
+unsigned int defaults_get_append_options(void);
 const char *defaults_get_auth_conf_file(void);
 
 #endif
diff --git a/lib/defaults.c b/lib/defaults.c
index f76478e..4b4acba 100644
--- a/lib/defaults.c
+++ b/lib/defaults.c
@@ -37,6 +37,7 @@
 #define ENV_NAME_ENTRY_ATTR		"ENTRY_ATTRIBUTE"
 #define ENV_NAME_VALUE_ATTR		"VALUE_ATTRIBUTE"
 
+#define ENV_APPEND_OPTIONS		"APPEND_OPTIONS"
 #define ENV_AUTH_CONF_FILE		"AUTH_CONF_FILE"
 
 static const char *default_master_map_name = DEFAULT_MASTER_MAP_NAME;
@@ -200,6 +201,7 @@ unsigned int defaults_read_config(void)
 		    check_set_config_value(res, ENV_NAME_MAP_ATTR, value) ||
 		    check_set_config_value(res, ENV_NAME_ENTRY_ATTR, value) ||
 		    check_set_config_value(res, ENV_NAME_VALUE_ATTR, value) ||
+		    check_set_config_value(res, ENV_APPEND_OPTIONS, value) ||
 		    check_set_config_value(res, ENV_AUTH_CONF_FILE, value))
 			;
 	}
@@ -338,6 +340,17 @@ const char *defaults_get_value_attr(void)
 	return (const char *) va;
 }
 
+unsigned int defaults_get_append_options(void)
+{
+	int res;
+
+	res = get_env_yesno(ENV_APPEND_OPTIONS);
+	if (res < 0)
+		res = DEFAULT_APPEND_OPTIONS;
+
+	return res;
+}
+
 const char *defaults_get_auth_conf_file(void)
 {
 	char *cf;
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 9323e7c..276493a 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -140,7 +140,7 @@ int expandsunent(const char *src, char *dst, const char *key,
 			 * re preserved, we need to escape them here.
 			 */
 			if (strchr(key, ' ')) {
-				char *keyp = key;
+				const char *keyp = key;
 				while (*keyp) {
 					if (isspace(*keyp)) {
 						if (dst) {
@@ -953,6 +953,7 @@ int parse_mount(struct autofs_point *ap, const char *name,
 	int mapent_len, rv = 0;
 	int optlen, cur_state;
 	int slashify = ctxt->slashify_colons;
+	unsigned int append_options;
 
 	source = ap->entry->current;
 	ap->entry->current = NULL;
@@ -998,6 +999,7 @@ int parse_mount(struct autofs_point *ap, const char *name,
 
 	debug(ap->logopt, MODPREFIX "expanded entry: %s", pmapent);
 
+	append_options = defaults_get_append_options();
 	options = strdup(ctxt->optstr ? ctxt->optstr : "");
 	if (!options) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
@@ -1010,10 +1012,10 @@ int parse_mount(struct autofs_point *ap, const char *name,
 
 	/* Deal with 0 or more options */
 	if (*p == '-') {
-		char *mnt_options = NULL;
+		char *tmp, *mnt_options = NULL;
 
 		do {
-			char *tmp, *noptions = NULL;
+			char *noptions = NULL;
 
 			p = parse_options(p, &noptions, ap->logopt);
 			tmp = concat_options(mnt_options, noptions);
@@ -1033,10 +1035,25 @@ int parse_mount(struct autofs_point *ap, const char *name,
 			p = skipspace(p);
 		} while (*p == '-');
 
-		if (options)
+		if (options && !append_options) {
 			free(options);
+			options = NULL;
+		}
 
-		options = mnt_options;
+		if (append_options) {
+			tmp = concat_options(options, mnt_options);
+			if (!tmp) {
+				char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+				error(ap->logopt, MODPREFIX "concat_options: %s", estr);
+				if (options)
+					free(options);
+				if (mnt_options)
+					free(mnt_options);
+				return 1;
+			}
+			options = tmp;
+		} else
+			options = mnt_options;
 	}
 
 	debug(ap->logopt, MODPREFIX "gathered options: %s", options);
diff --git a/redhat/autofs.sysconfig.in b/redhat/autofs.sysconfig.in
index 84d524b..8299b55 100644
--- a/redhat/autofs.sysconfig.in
+++ b/redhat/autofs.sysconfig.in
@@ -13,6 +13,10 @@ TIMEOUT=300
 #
 BROWSE_MODE="no"
 #
+# APPEND_OPTIONS - append to global options instead of replace.
+#
+#APPEND_OPTIONS="yes"
+#
 # LOGGING - set default log level "none", "verbose" or "debug"
 #
 #LOGGING="none"
diff --git a/samples/autofs.conf.default.in b/samples/autofs.conf.default.in
index 84d524b..8299b55 100644
--- a/samples/autofs.conf.default.in
+++ b/samples/autofs.conf.default.in
@@ -13,6 +13,10 @@ TIMEOUT=300
 #
 BROWSE_MODE="no"
 #
+# APPEND_OPTIONS - append to global options instead of replace.
+#
+#APPEND_OPTIONS="yes"
+#
 # LOGGING - set default log level "none", "verbose" or "debug"
 #
 #LOGGING="none"


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- autofs.spec	3 Apr 2007 15:44:16 -0000	1.198
+++ autofs.spec	16 Apr 2007 09:14:14 -0000	1.199
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.1
-Release: 7
+Release: 8
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
@@ -22,6 +22,8 @@
 Patch10: autofs-5.0.1-fix-browse-dir-create.patch
 Patch11: autofs-5.0.1-map-update-source-only.patch
 Patch12: autofs-5.0.1-null-domain-fix.patch
+Patch13: autofs-5.0.1-conf-append-global.patch
+Patch14: autofs-5.0.1-cmd-global-options.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Conflicts: kernel < 2.6.17
@@ -75,6 +77,8 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -127,6 +131,10 @@
 %{_libdir}/autofs/
 
 %changelog
+* Mon Apr 16 2007 Ian Kent <ikent at redhat.com> - 5.0.1-8
+- add configuration variable to control appending of global options (bz 214684).
+- add command option to set a global mount options string (bz 214684).
+
 * Tue Apr 3 2007 Ian Kent <ikent at redhat.com> - 5.0.1-7
 - fix "null" domain netgroup match for "-hosts" map.
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 09:19:48 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 05:19:48 -0400
Subject: rpms/sendmail/devel sendmail.spec,1.80,1.81
Message-ID: <200704160919.l3G9JmGL000876@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/sendmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv701

Modified Files:
	sendmail.spec 
Log Message:
[tw]
- readded chkconfig add for sendmail in post script
- dropped mysql support (useless without further patching)
- fixed executable permissions for /usr/sbin/makemap and /usr/sbin/smrsh
- dropped FFR_UNSAFE_SASL, because it has no effect anymore




Index: sendmail.spec
===================================================================
RCS file: /cvs/dist/rpms/sendmail/devel/sendmail.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- sendmail.spec	12 Apr 2007 15:19:10 -0000	1.80
+++ sendmail.spec	16 Apr 2007 09:19:46 -0000	1.81
@@ -1,22 +1,21 @@
-##   package options
-%define with_tls      yes
-%define with_sasl1    no
-%define with_sasl2    yes
-%define with_milter   yes
-%define with_ldap     yes
-%define with_mysql    no
-%define enable_pie    yes
+# package options
+%define with_tls	yes
+%define with_sasl1	no
+%define with_sasl2	yes
+%define with_milter	yes
+%define with_ldap	yes
+%define enable_pie	yes
 
 %define sendmailcf %{_datadir}/sendmail-cf
-%define stdir /var/log/mail
+%define stdir %{_localstatedir}/log/mail
 %define smshell /sbin/nologin
-%define spooldir /var/spool
+%define spooldir %{_localstatedir}/spool
 %define maildir %{_sysconfdir}/mail
 
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
 Version: 8.14.1
-Release: 1.1
+Release: 2
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
@@ -61,8 +60,8 @@
 Provides: %{_mandir}/man5/aliases.5.gz %{_mandir}/man8/sendmail.8.gz
 Requires(pre): shadow-utils
 Requires(preun): %{_sbindir}/alternatives chkconfig
-Requires(post): %{_sbindir}/alternatives coreutils
-Requires(postun): %{_sbindir}/alternatives coreutils chkconfig
+Requires(post): %{_sbindir}/alternatives chkconfig coreutils
+Requires(postun): %{_sbindir}/alternatives chkconfig coreutils
 Requires: procmail
 Requires: bash >= 2.0
 Requires: setup >= 2.5.31-1
@@ -79,10 +78,6 @@
 BuildRequires: openldap-devel openssl-devel
 Requires: openldap openssl
 %endif
-%if "%{with_mysql}" == "yes"
-BuildRequires: mysql-devel
-Requires: mysql
-%endif
 
 
 %description
@@ -196,7 +191,7 @@
 
 %if "%{with_sasl2}" == "yes"
 cat >> redhat.config.m4 << EOF
-APPENDDEF(\`confENVDEF', \`-DSASL=2 -D_FFR_UNSAFE_SASL')dnl
+APPENDDEF(\`confENVDEF', \`-DSASL=2')dnl
 APPENDDEF(\`confLIBS', \`-lsasl2 -lcrypto')dnl
 EOF
 %endif
@@ -215,13 +210,6 @@
 EOF
 %endif
 
-%if "%{with_mysql}" == "yes"
-cat >> redhat.config.m4 << EOF
-APPENDDEF(\`confMAPDEF',\`-DMYSQLMAP')dnl
-APPENDDEF(\`confLIBS',\`%{l_ldflags mysql .} -lmysqlclient -lz -lm')dnl
-EOF
-%endif
-
 DIRS="libsmutil sendmail mailstats rmail praliases smrsh makemap"
 
 %if "%{with_milter}" == "yes"
@@ -239,6 +227,7 @@
 %install
 rm -rf %{buildroot}
 
+# create directories
 for d in %{_bindir} %{_sbindir} %{_includedir}/libmilter \
 	%{_libdir} %{_mandir}/man{1,5,8} %{maildir} %{stdir} %{spooldir} \
 	%{_docdir}/sendmail-%{version} %{sendmailcf} %{_sysconfdir}/smrsh\
@@ -263,12 +252,12 @@
 		MANROOT=%{_mandir}/man \
 		SBINOWN=${nameuser} SBINGRP=${namegroup} \
 		UBINOWN=${nameuser} UBINGRP=${namegroup} \
-		MANOWN=${nameuser}  MANGRP=${namegroup} \
-		INCOWN=${nameuser}  INCGRP=${namegroup} \
-		LIBOWN=${nameuser}  LIBGRP=${namegroup} \
+		MANOWN=${nameuser} MANGRP=${namegroup} \
+		INCOWN=${nameuser} INCGRP=${namegroup} \
+		LIBOWN=${nameuser} LIBGRP=${namegroup} \
 		GBINOWN=${nameuser} GBINGRP=${namegroup} \
-		CFOWN=${nameuser}   CFGRP=${namegroup} \
-		MSPQOWN=${nameuser} 
+		CFOWN=${nameuser} CFGRP=${namegroup} \
+		MSPQOWN=${nameuser}
 }
 
 OBJDIR=obj.$(uname -s).$(uname -r).$(arch)
@@ -283,9 +272,9 @@
 Make install -C $OBJDIR/makemap
 
 # install libraries
-install -m 644  $OBJDIR/libmilter/libmilter.a %{buildroot}%{_libdir}
-install -m 644  $OBJDIR/libsmutil/libsmutil.a %{buildroot}%{_libdir}
-install -m 644  $OBJDIR/libsm/libsm.a         %{buildroot}%{_libdir}
+install -m 644 $OBJDIR/libmilter/libmilter.a %{buildroot}%{_libdir}
+install -m 644 $OBJDIR/libsmutil/libsmutil.a %{buildroot}%{_libdir}
+install -m 644 $OBJDIR/libsm/libsm.a %{buildroot}%{_libdir}
 
 %if "%{_lib}" == "lib64"
 # libmilter.a is 64 bit, not usable in /usr/lib for 32 bit build
@@ -295,7 +284,7 @@
 # replace absolute with relative symlinks
 ln -sf ../sbin/makemap %{buildroot}%{_bindir}/makemap
 for f in hoststat mailq newaliases purgestat ; do
-    ln -sf ../sbin/sendmail.sendmail %{buildroot}%{_bindir}/${f}
+	ln -sf ../sbin/sendmail.sendmail %{buildroot}%{_bindir}/${f}
 done
 
 # use /usr/lib, even for 64 bit architectures
@@ -361,8 +350,9 @@
 install -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/sendmail
 install -m 644 %{SOURCE5} %{buildroot}%{maildir}/Makefile
 
-chmod u+w %{buildroot}%{_sbindir}/{mailstats,praliases}
-chmod u+w %{buildroot}%{_bindir}/rmail
+# fix permissions to allow debuginfo extraction and stripping
+chmod 755 %{buildroot}%{_sbindir}/{mailstats,makemap,praliases,sendmail,smrsh}
+chmod 755 %{buildroot}%{_bindir}/rmail
 
 %if "%{with_sasl1}" == "yes"
 install -m 755 -d %{buildroot}%{_libdir}/sasl
@@ -374,9 +364,6 @@
 %endif
 install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/pam.d/smtp.sendmail
 
-# allow stripping of the sendmail app
-chmod 755 %{buildroot}%{_sbindir}/sendmail
-
 # fix path for statistics file in man pages
 %if "%{stdir}" != "%{maildir}"
 sed -i -e 's:%{maildir}/statistics:%{stdir}/statistics:' %{buildroot}%{_mandir}/man*/*
@@ -412,13 +399,14 @@
 exit 0
 
 %post
+/sbin/chkconfig --add sendmail
 # Set up the alternatives files for MTAs.
 %{_sbindir}/alternatives --install %{_sbindir}/sendmail mta %{_sbindir}/sendmail.sendmail 90 \
 	--slave %{_bindir}/mailq mta-mailq %{_bindir}/mailq.sendmail \
 	--slave %{_bindir}/newaliases mta-newaliases %{_bindir}/newaliases.sendmail \
 	--slave %{_bindir}/rmail mta-rmail %{_bindir}/rmail.sendmail \
 	--slave /usr/lib/sendmail mta-sendmail /usr/lib/sendmail.sendmail \
-        --slave %{_sysconfdir}/pam.d/smtp mta-pam %{_sysconfdir}/pam.d/smtp.sendmail \
+	--slave %{_sysconfdir}/pam.d/smtp mta-pam %{_sysconfdir}/pam.d/smtp.sendmail \
 	--slave %{_mandir}/man8/sendmail.8.gz mta-sendmailman %{_mandir}/man8/sendmail.sendmail.8.gz \
 	--slave %{_mandir}/man1/mailq.1.gz mta-mailqman %{_mandir}/man1/mailq.sendmail.1.gz \
 	--slave %{_mandir}/man1/newaliases.1.gz mta-newaliasesman %{_mandir}/man1/newaliases.sendmail.1.gz \
@@ -450,6 +438,7 @@
 
 %files
 %defattr(-,root,root)
+%dir %{_docdir}/sendmail-%{version}
 %doc %{_docdir}/sendmail-%{version}/FAQ
 %doc %{_docdir}/sendmail-%{version}/KNOWNBUGS
 %doc %{_docdir}/sendmail-%{version}/LICENSE
@@ -504,7 +493,7 @@
 %ghost %{maildir}/domaintable.db
 %ghost %{maildir}/mailertable.db
 
-%attr(0755,root,root) %config(noreplace) %{_initrddir}/sendmail
+%attr(0755,root,root) %{_initrddir}/sendmail
 %config(noreplace) %{_sysconfdir}/sysconfig/sendmail
 %config(noreplace) %{_sysconfdir}/pam.d/smtp.sendmail
 
@@ -538,6 +527,12 @@
 
 
 %changelog
+* Mon Apr 16 2007 Thomas Woerner <twoerner at redhat.com> 8.14.1-2
+- readded chkconfig add for sendmail in post script
+- dropped mysql support (useless without further patching)
+- fixed executable permissions for /usr/sbin/makemap and /usr/sbin/smrsh
+- dropped FFR_UNSAFE_SASL, because it has no effect anymore
+
 * Thu Apr 12 2007 Thomas Woerner <twoerner at redhat.com> 8.14.1-1.1
 - replaced prereq tags with requires() tags.
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 09:20:46 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 05:20:46 -0400
Subject: rpms/hplip/FC-6 hplip.spec,1.106,1.107
Message-ID: <200704160920.l3G9KkJw001600@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
* Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com>
- Added /sbin/service and /sbin/chkconfig requirements for the scriptlets
  (bug #236445).
- Fixed %post scriptlet's condrestart logic (bug #236445).
- Resolves: rhbz#236445 rhbz#236445



Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-6/hplip.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- hplip.spec	13 Apr 2007 11:17:52 -0000	1.106
+++ hplip.spec	16 Apr 2007 09:20:41 -0000	1.107
@@ -25,6 +25,10 @@
 
 Requires: desktop-file-utils >= 0.2.92
 Requires: PyQt
+Requires(post): /sbin/service
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(preun): /sbin/chkconfig
 
 %define hpijs_epoch 1
 Requires: hpijs = %{hpijs_epoch}:%{version}-%{release}
@@ -152,6 +156,8 @@
 %config(noreplace) %{_sysconfdir}/rc.d/init.d/hplip
 %{_bindir}/hp-*
 %{_sbindir}/hpiod
+# Note: this must be /usr/lib not %{_libdir}, since that's the
+# CUPS serverbin directory.
 /usr/lib/cups/backend/hp
 /usr/lib/cups/backend/hpfax
 %{_datadir}/hplip
@@ -172,7 +178,7 @@
 
 %post
 /sbin/chkconfig --add hplip || :
-if [ "$1" == "1" ]; then
+if [ "$1" -ge "1" ]; then
   /sbin/service hplip condrestart >/dev/null 2>&1 || :
 fi
 exit 0
@@ -193,6 +199,11 @@
 exit 0
 
 %changelog
+* Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com>
+- Added /sbin/service and /sbin/chkconfig requirements for the scriptlets
+  (bug #236445).
+- Fixed %%post scriptlet's condrestart logic (bug #236445).
+
 * Fri Apr 13 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-2
 - Bumped selinux-policy conflict version (bug #236092).
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 09:21:05 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 05:21:05 -0400
Subject: rpms/hplip/FC-6 hplip.spec,1.107,1.108
Message-ID: <200704160921.l3G9L5nL001819@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
1.7.2-3


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-6/hplip.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- hplip.spec	16 Apr 2007 09:20:41 -0000	1.107
+++ hplip.spec	16 Apr 2007 09:21:02 -0000	1.108
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 1.7.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -199,7 +199,7 @@
 exit 0
 
 %changelog
-* Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com>
+* Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-3
 - Added /sbin/service and /sbin/chkconfig requirements for the scriptlets
   (bug #236445).
 - Fixed %%post scriptlet's condrestart logic (bug #236445).



From fedora-cvs-commits at redhat.com  Mon Apr 16 09:31:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 05:31:45 -0400
Subject: rpms/hplip/devel hplip.spec,1.121,1.122
Message-ID: <200704160931.l3G9VjEI009687@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
* Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com>
- Added /sbin/service and /sbin/chkconfig requirements for the scriptlets
  (bug #236445).
- Fixed %post scriptlet's condrestart logic (bug #236445).
- Resolves: rhbz#236445 rhbz#236445



Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- hplip.spec	13 Apr 2007 12:32:50 -0000	1.121
+++ hplip.spec	16 Apr 2007 09:31:43 -0000	1.122
@@ -24,6 +24,11 @@
 Patch9: hplip-media-empty.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
+Requires(post): /sbin/service
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(preun): /sbin/chkconfig
+
 %define hpijs_epoch 1
 Requires: hpijs = %{hpijs_epoch}:%{version}-%{release}
 
@@ -178,6 +183,8 @@
 %{_bindir}/hp-testpage
 %{_bindir}/hp-unload
 %{_sbindir}/hpiod
+# Note: this must be /usr/lib not %{_libdir}, since that's the
+# CUPS serverbin directory.
 /usr/lib/cups/backend/hp
 /usr/lib/cups/backend/hpfax
 %{_libdir}/python*/site-packages/*
@@ -248,7 +255,7 @@
 
 %post
 /sbin/chkconfig --add hplip || :
-if [ "$1" == "1" ]; then
+if [ "$1" -ge "1" ]; then
   /sbin/service hplip condrestart >/dev/null 2>&1 || :
 fi
 exit 0
@@ -272,6 +279,11 @@
 exit 0
 
 %changelog
+* Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com>
+- Added /sbin/service and /sbin/chkconfig requirements for the scriptlets
+  (bug #236445).
+- Fixed %%post scriptlet's condrestart logic (bug #236445).
+
 * Fri Apr 13 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-6
 - Fixed dangling symlinks (bug #236156).
 - Move all fax bits to the gui package (bug #236161).



From fedora-cvs-commits at redhat.com  Mon Apr 16 09:49:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 05:49:30 -0400
Subject: rpms/sendmail/FC-6 sendmail-8.14.0-dynamic.patch, NONE,
	1.1 sendmail-8.14.0-makemapman.patch, NONE,
	1.1 sendmail-8.14.1-noversion.patch, NONE,
	1.1 sendmail-etc-mail-access, NONE,
	1.1 sendmail-etc-mail-domaintable, NONE,
	1.1 sendmail-etc-mail-local-host-names, NONE,
	1.1 sendmail-etc-mail-mailertable, NONE,
	1.1 sendmail-etc-mail-trusted-users, NONE,
	1.1 sendmail-etc-mail-virtusertable, NONE, 1.1 sendmail.spec,
	1.75, 1.76 sendmail-8.12.11-smrsh-paths.patch, 1.1,
	NONE sendmail-8.12.2-makemapman.patch, 1.1,
	NONE sendmail-8.13.0-dynamic.patch, 1.1,
	NONE sendmail-8.13.0-pid.patch, 1.1,
	NONE sendmail-8.13.1-errata_cataddr.patch, 1.1,
	NONE sendmail-8.13.2-dynamic.patch, 1.1,
	NONE sendmail-8.13.3-close_wait.p2.patch, 1.1,
	NONE sendmail-8.13.4-dynamic.patch, 1.1,
	NONE sendmail-8.13.4-libmilter-sigwait.patch, 1.1,
	NONE sendmail-8.13.6-dynamic.patch, 1.1,
	NONE sendmail-8.13.8-noversion.patch, 1.1, NONE
Message-ID: <200704160949.l3G9nU7i008232@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/sendmail/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv8210

Modified Files:
	sendmail.spec 
Added Files:
	sendmail-8.14.0-dynamic.patch sendmail-8.14.0-makemapman.patch 
	sendmail-8.14.1-noversion.patch sendmail-etc-mail-access 
	sendmail-etc-mail-domaintable 
	sendmail-etc-mail-local-host-names 
	sendmail-etc-mail-mailertable sendmail-etc-mail-trusted-users 
	sendmail-etc-mail-virtusertable 
Removed Files:
	sendmail-8.12.11-smrsh-paths.patch 
	sendmail-8.12.2-makemapman.patch sendmail-8.13.0-dynamic.patch 
	sendmail-8.13.0-pid.patch sendmail-8.13.1-errata_cataddr.patch 
	sendmail-8.13.2-dynamic.patch 
	sendmail-8.13.3-close_wait.p2.patch 
	sendmail-8.13.4-dynamic.patch 
	sendmail-8.13.4-libmilter-sigwait.patch 
	sendmail-8.13.6-dynamic.patch sendmail-8.13.8-noversion.patch 
Log Message:
[tw]
- new version 8.14.1
- lots of package changes and cleanups


sendmail-8.14.0-dynamic.patch:
 devtools/OS/Linux |   10 +++++-----
 libsm/Makefile.m4 |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE sendmail-8.14.0-dynamic.patch ---
--- sendmail-8.14.0/devtools/OS/Linux.dynamic	2007-02-06 17:05:00.000000000 +0100
+++ sendmail-8.14.0/devtools/OS/Linux	2007-02-06 17:05:00.000000000 +0100
@@ -6,7 +6,7 @@
 define(`confDEPEND_TYPE', `CC-M')
 define(`confSM_OS_HEADER', `sm_os_linux')
 define(`confMANROOT', `/usr/share/man/man')
-define(`confLIBS', `-ldl')
+define(`confLIBS', `-pie -ldl')
 define(`confEBINDIR', `/usr/sbin')
 APPENDDEF(`confLIBSEARCH', `crypt nsl')
 
@@ -21,19 +21,19 @@
 ifelse(confBLDVARIANT, `DEBUG',
 dnl Debug build
 `
-	define(`confOPTIMIZE',`-g -Wall')
+	define(`confOPTIMIZE',`-g -Wall -fpie')
 ',
 dnl Optimized build
 confBLDVARIANT, `OPTIMIZED',
 `
-	define(`confOPTIMIZE',`-O2')
+	define(`confOPTIMIZE',`-O2 -fpie')
 ',
 dnl Purify build
 confBLDVARIANT, `PURIFY',
 `
-	define(`confOPTIMIZE',`-g')
+	define(`confOPTIMIZE',`-g -fpie')
 ',
 dnl default
 `
-	define(`confOPTIMIZE',`-O2')
+	define(`confOPTIMIZE',`-O2 -fpie')
 ')
--- sendmail-8.14.0/libsm/Makefile.m4.dynamic	2006-08-16 23:06:31.000000000 +0200
+++ sendmail-8.14.0/libsm/Makefile.m4	2007-02-06 17:06:06.000000000 +0100
@@ -6,7 +6,7 @@
 define(`confREQUIRE_SM_OS_H', `true')
 PREPENDDEF(`confENVDEF', `confMAPDEF')
 bldPRODUCT_START(`library', `libsm')
-define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strerror.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c sem.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c memstat.c util.c ')
+define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c sem.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c memstat.c util.c ')
 bldPRODUCT_END
 dnl msg.c
 dnl syslogio.c

sendmail-8.14.0-makemapman.patch:
 cf/cf/Build       |    2 +-
 devtools/OS/Linux |    4 +++-
 makemap/makemap.8 |    6 ------
 rmail/rmail.c     |    1 -
 4 files changed, 4 insertions(+), 9 deletions(-)

--- NEW FILE sendmail-8.14.0-makemapman.patch ---
--- sendmail-8.12.2/devtools/OS/Linux	Tue Feb 19 15:23:34 2002
+++ sendmail-8.12.2/devtools/OS/Linux	Tue Feb 19 15:24:05 2002
@@ -1,7 +1,7 @@
 #	$Id: Linux,v 8.29 2001/08/15 08:55:54 guenther Exp $
 define(`confDEPEND_TYPE', `CC-M')
 define(`confSM_OS_HEADER', `sm_os_linux')
-define(`confMANROOT', `/usr/man/man')
+define(`confMANROOT', `/usr/share/man/man')
 define(`confLIBS', `-ldl')
 define(`confEBINDIR', `/usr/sbin')
 APPENDDEF(`confLIBSEARCH', `crypt nsl')
@@ -11,6 +11,8 @@
 define(`confMTLDOPTS', `-lpthread')
 define(`confLDOPTS_SO', `-shared')
 define(`confSONAME',`-soname')
+define('confSBINGRP', 'mail')
+define('confSBINMODE', '6755')
 
 ifelse(confBLDVARIANT, `DEBUG',
 dnl Debug build
--- sendmail-8.12.2/makemap/makemap.8	Tue Oct  9 23:23:02 2001
+++ sendmail-8.12.2/makemap/makemap.8	Tue Feb 19 15:23:34 2002
@@ -50,12 +50,6 @@
 parameter.  
 They may be
 .TP
-dbm
-DBM format maps.  
-This requires the 
-ndbm(3) 
-library.
-.TP
 btree
 B-Tree format maps.  
 This requires the new Berkeley DB 
--- sendmail-8.12.2/cf/cf/Build	Mon Mar  1 21:37:12 1999
+++ sendmail-8.12.2/cf/cf/Build	Tue Feb 19 15:23:34 2002
@@ -18,7 +18,7 @@
 SMROOT=${SMROOT-../..}
 BUILDTOOLS=${BUILDTOOLS-$SMROOT/devtools}
 
-M4=`sh $BUILDTOOLS/bin/find_m4.sh`
+M4=/usr/bin/m4
 ret=$?
 if [ $ret -ne 0 ]
 then
--- sendmail-8.12.2/rmail/rmail.c	Tue Sep 18 17:45:29 2001
+++ sendmail-8.12.2/rmail/rmail.c	Tue Feb 19 15:23:34 2002
@@ -276,7 +276,6 @@
 	args[i++] = _PATH_SENDMAIL;	/* Build sendmail's argument list. */
 	args[i++] = "-G";		/* relay submission */
 	args[i++] = "-oee";		/* No errors, just status. */
-	args[i++] = "-odq";		/* Queue it, don't try to deliver. */
 	args[i++] = "-oi";		/* Ignore '.' on a line by itself. */
 
 	/* set from system and protocol used */

sendmail-8.14.1-noversion.patch:
 helpfile |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE sendmail-8.14.1-noversion.patch ---
--- sendmail-8.14.1/sendmail/helpfile.noversion	2007-02-01 19:29:44.000000000 +0100
+++ sendmail-8.14.1/sendmail/helpfile	2007-04-10 16:58:16.000000000 +0200
@@ -11,9 +11,7 @@
 cpyr	forth in the LICENSE file which can be found at the top level of
 cpyr	the sendmail distribution.
 cpyr
-cpyr	$$Id: helpfile,v 8.48 2007/02/01 18:29:44 ca Exp $$
-cpyr
-smtp	This is sendmail version $v
+smtp	This is sendmail
 smtp	Topics:
 smtp		HELO	EHLO	MAIL	RCPT	DATA
 smtp		RSET	NOOP	QUIT	HELP	VRFY


--- NEW FILE sendmail-etc-mail-access ---
# Check the /usr/share/doc/sendmail/README.cf file for a description
# of the format of this file. (search for access_db in that file)
# The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
# package.
#
# by default we allow relaying from localhost...
Connect:localhost.localdomain		RELAY
Connect:localhost			RELAY
Connect:127.0.0.1			RELAY



--- NEW FILE sendmail-etc-mail-domaintable ---
# The "domain table" can be used to provide domain name mapping.
# Use of this should really be limited to your own domains.
# It may be useful if you change names (e.g., your company
# changes names from oldname.com to newname.com)


--- NEW FILE sendmail-etc-mail-local-host-names ---
# local-host-names - include all aliases for your machine here.


--- NEW FILE sendmail-etc-mail-mailertable ---
# The "mailer table" can be used to override routing for particular domains
# (which are not in class {w}, i.e. local host names).
#
# hash /etc/mail/mailertable
#
# Keys in this database are fully qualified domain names or partial domains
# preceded by a dot -- for example, "vangogh.CS.Berkeley.EDU" or
# ".CS.Berkeley.EDU". As a special case of the latter, "." matches any domain
# not covered by other keys. Values must be of the form:
#
# mailer:domain
#
# where "mailer" is the internal mailer name, and "domain" is where to send
# the message. These maps are not reflected into the message header. As a
# special case, the forms:
#
# local:user
#
# will forward to the indicated user using the local mailer,
#
# local:
#
# will forward to the original user in the e-mail address using the local
# mailer, and
#
# error:code message
# error:D.S.N:code message
#
# will give an error message with the indicated SMTP reply code and message,
# where D.S.N is an RFC 1893 compliant error code. 


--- NEW FILE sendmail-etc-mail-trusted-users ---
# trusted-users - users that can send mail as others without a warning
# apache, mailman, majordomo, uucp, are good candidates


--- NEW FILE sendmail-etc-mail-virtusertable ---
# A domain-specific form of aliasing, allowing multiple virtual domains to be
# hosted on one machine.
#
# info at foo.com	foo-info
# info at bar.com	bar-info
# joe at bar.com	error:nouser 550 No such user here
# jax at bar.com	error:5.7.0:550 Address invalid
# @baz.org	jane at example.net
#
# then mail addressed to info at foo.com will be sent to the address foo-info,
# mail addressed to info at bar.com will be delivered to bar-info, and mail
# addressed to anyone at baz.org  will be sent to jane at example.net, mail to
# joe at bar.com will be rejected with the specified error message, and mail to
# jax at bar.com will also have a RFC 1893  compliant error code 5.7.0.
#
# The username from the original address is passed as %1 allowing:
#
# @foo.org	%1 at example.com
#
# Additionally, if the local part consists of "user+detail" then "detail" is
# passed as %2 and "+detail" is passed as %3  when a match against user+* is
# attempted, so entries like
#
# old+*@foo.org	new+%2 at example.com
# gen+*@foo.org	%2 at example.com
# +*@foo.org	%1%3 at example.com
# X++ at foo.org	Z%3 at example.com
# @bar.org	%1%3
#
# Note: to preserve "+detail" for a default case (@domain) %1%3 must be used
# as RHS. There are two wildcards after "+": "+" matches only a non-empty
# detail, "*" matches also empty details, e.g., user+ at foo.org  matches#
# +*@foo.org but not ++ at foo.org. This can be used to ensure that the
# parameters %2 and %3 are not empty.
#
# All the host names on the left hand side (foo.com, bar.com, and baz.org)
# must be in class {w} or class {VirtHost}. The latter can be defined by the
# macros VIRTUSER_DOMAIN or VIRTUSER_DOMAIN_FILE (analogously to
# MASQUERADE_DOMAIN and MASQUERADE_DOMAIN_FILE). If VIRTUSER_DOMAIN or
# VIRTUSER_DOMAIN_FILE is used, then the entries of class {VirtHost} are
# added to class {R}, i.e., relaying is allowed to (and from) those domains.


Index: sendmail.spec
===================================================================
RCS file: /cvs/dist/rpms/sendmail/FC-6/sendmail.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- sendmail.spec	21 Nov 2006 14:13:16 -0000	1.75
+++ sendmail.spec	16 Apr 2007 09:49:28 -0000	1.76
@@ -1,32 +1,27 @@
-##   package options
-%define       with_fsl      no
-%define       with_tls      yes
-%define       with_sasl1    no
-%define       with_sasl2    yes
-%define       with_milter   yes
-%define       with_ldap     yes
-%define       with_mysql    no
+# package options
+%define with_tls	yes
+%define with_sasl1	no
+%define with_sasl2	yes
+%define with_milter	yes
+%define with_ldap	yes
+%define enable_pie	yes
 
-%define       enable_pie    yes
-%define       old_setup     no
-
-%define sendmailcf /usr/share/sendmail-cf
-%define stdir /var/log/mail
+%define sendmailcf %{_datadir}/sendmail-cf
+%define stdir %{_localstatedir}/log/mail
 %define smshell /sbin/nologin
-%define initdir /etc/rc.d/init.d
+%define spooldir %{_localstatedir}/spool
+%define maildir %{_sysconfdir}/mail
 
-Summary: A widely used Mail Transport Agent (MTA).
+Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
-Version: 8.13.8
-Release: 2.1
+Version: 8.14.1
+Release: 1.2%{dist}
 License: Sendmail
 Group: System Environment/Daemons
-Provides: smtpdaemon
+URL: http://www.sendmail.org/
+Provides: MTA smtpdaemon
 Source0: ftp://ftp.sendmail.org/pub/sendmail/sendmail.%{version}.tar.gz
 Source1: sendmail.init
-%if "%{old_setup}" == "yes"
-Source3: aliases
-%endif
 Source4: sendmail.sysconfig
 Source5: sendmail.etc-mail-Makefile
 Source6: sendmail-redhat.mc
@@ -34,55 +29,54 @@
 Source8: sendmail.pam
 Source9: sendmail-8.12.5-newconfig.readme
 Source11: Sendmail-sasl2.conf
-Patch3: sendmail-8.12.2-makemapman.patch
+Source12: sendmail-etc-mail-access
+Source13: sendmail-etc-mail-domaintable
+Source14: sendmail-etc-mail-local-host-names
+Source15: sendmail-etc-mail-mailertable
+Source16: sendmail-etc-mail-trusted-users
+Source17: sendmail-etc-mail-virtusertable
+Patch3: sendmail-8.14.0-makemapman.patch
 Patch4: sendmail-8.13.2-smrsh-paths.patch
 Patch5: sendmail-8.12.2-movefiles.patch
 Patch7: sendmail-8.13.7-pid.patch
 Patch9: sendmail-8.12.7-hesiod.patch
 Patch10: sendmail-8.12.7-manpage.patch
-Patch11: sendmail-8.13.6-dynamic.patch
+Patch11: sendmail-8.14.0-dynamic.patch
 Patch12: sendmail-8.13.0-cyrus.patch
 Patch13: sendmail-8.13.7-aliases_dir.patch
 Patch14: sendmail-8.13.7-vacation.patch
-Patch15: sendmail-8.13.8-noversion.patch
-Buildroot: %{_tmppath}/%{name}-root
-BuildRequires: tcp_wrappers
+Patch15: sendmail-8.14.1-noversion.patch
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: tcp_wrappers-devel
 BuildRequires: db4-devel
 BuildRequires: hesiod-devel
 BuildRequires: groff
+BuildRequires: ghostscript
 BuildRequires: m4
-PreReq: /usr/sbin/alternatives
 Provides: %{_sbindir}/sendmail %{_bindir}/mailq %{_bindir}/newaliases
-Provides: %{_bindir}/rmail %{_mandir}/man1/mailq.1.gz
-Provides: %{_mandir}/man1/newaliases.1.gz %{_mandir}/man5/aliases.5.gz
-PreReq: chkconfig >= 1.3
-PreReq: /usr/sbin/useradd /bin/mktemp fileutils gawk sed sh-utils
+Provides: %{_bindir}/rmail /usr/lib/sendmail
+Provides: %{_sysconfdir}/pam.d/smtp
+Provides: %{_mandir}/man1/mailq.1.gz %{_mandir}/man1/newaliases.1.gz
+Provides: %{_mandir}/man5/aliases.5.gz %{_mandir}/man8/sendmail.8.gz
+Requires(pre): shadow-utils
+Requires(preun): %{_sbindir}/alternatives chkconfig
+Requires(post): %{_sbindir}/alternatives chkconfig coreutils
+Requires(postun): %{_sbindir}/alternatives chkconfig coreutils
 Requires: procmail
 Requires: bash >= 2.0
-%if "%{old_setup}" != "yes"
 Requires: setup >= 2.5.31-1
 BuildRequires: setup >= 2.5.31-1
-#Requires: /etc/aliases
-%endif
-%if "%{with_fsl}" == "yes"
-BuildRequires:  fsl >= 1.2.0
-PreReq:       fsl >= 1.2.0
-%endif
 %if "%{with_tls}" == "yes"
-BuildRequires:  openssl-devel
-PreReq:       openssl
+BuildRequires: openssl-devel
+Requires: openssl
 %endif
 %if "%{with_sasl1}" == "yes" || "%{with_sasl2}" == "yes"
-BuildRequires:  cyrus-sasl-devel, openssl-devel
-PreReq:       /usr/sbin/saslauthd, openssl
+BuildRequires: cyrus-sasl-devel openssl-devel
+Requires: %{_sbindir}/saslauthd openssl
 %endif
 %if "%{with_ldap}" == "yes"
-BuildRequires:  openldap-devel, openssl-devel
-PreReq:       openldap, openssl
-%endif
-%if "%{with_mysql}" == "yes"
-BuildRequires:  mysql-devel
-PreReq:       mysql
+BuildRequires: openldap-devel openssl-devel
+Requires: openldap openssl
 %endif
 
 
@@ -94,11 +88,11 @@
 networks or the Internet to where you want it to go.
 
 If you ever need to reconfigure Sendmail, you will also need to have
-the sendmail.cf package installed. If you need documentation on
+the sendmail-cf package installed. If you need documentation on
 Sendmail, you can install the sendmail-doc package.
 
 %package doc
-Summary: Documentation about the Sendmail Mail Transport Agent program.
+Summary: Documentation about the Sendmail Mail Transport Agent program
 Group: Documentation
 Requires: sendmail = %{version}-%{release}
 
@@ -109,8 +103,8 @@
 provided in PostScript(TM) and troff formats.
 
 %package devel
-Summary: Extra development include files and development files.
-Group: System Environment/Daemons
+Summary: Extra development include files and development files
+Group: Development/Libraries
 Requires: sendmail = %{version}-%{release}
 
 %description devel
@@ -118,7 +112,7 @@
 of sendmail.
 
 %package cf
-Summary: The files needed to reconfigure Sendmail.
+Summary: The files needed to reconfigure Sendmail
 Group: System Environment/Daemons
 Requires: sendmail = %{version}-%{release}
 Requires: m4
@@ -142,14 +136,14 @@
 %patch12 -p1 -b .cyrus
 %patch13 -p1 -b .aliases_dir
 %patch14 -p1 -b .vacation
-%patch15 -p1
+%patch15 -p1 -b .noversion
 
 %build
 # generate redhat config file
 cat > redhat.config.m4 << EOF
 define(\`confMAPDEF', \`-DNEWDB -DNIS -DHESIOD -DMAP_REGEX -DSOCKETMAP -DNAMED_BIND=1')
 define(\`confOPTIMIZE', \`\`\`${RPM_OPT_FLAGS}''')
-define(\`confENVDEF', \`-I/usr/include/db4 -I/usr/kerberos/include -Wall -DXDEBUG=0 -DTCPWRAPPERS -DNETINET6 -DHES_GETMAILHOST -DUSE_VENDOR_CF_PATH=1 -D_FFR_WORKAROUND_BROKEN_NAMESERVERS -D_FFR_SMTP_SSL -D_FFR_TLS_1')
+define(\`confENVDEF', \`-I%{_includedir}/db4 -I/usr/kerberos/include -Wall -DXDEBUG=0 -DTCPWRAPPERS -DNETINET6 -DHES_GETMAILHOST -DUSE_VENDOR_CF_PATH=1 -D_FFR_TLS_1')
 define(\`confLIBDIRS', \`-L/usr/kerberos/%{_lib}')
 define(\`confLIBS', \`-lnsl -lwrap -lhesiod -lcrypt -ldb')
 define(\`confMANOWN', \`root')
@@ -163,11 +157,6 @@
 define(\`confLIBSEARCH', \`db resolv 44bsd')
 EOF
 
-# block mail from http proxies
-#cat >> redhat.config.m4 << EOF
-#APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_BLOCK_PROXIES')
-#EOF
-
 %ifarch ppc ppc64 s390x
 cat >> redhat.config.m4 << EOF
 APPENDDEF(\`confOPTIMIZE', \`-DSM_CONF_SHM=0')
@@ -175,7 +164,7 @@
 %endif
 
 %if "%{enable_pie}" == "yes"
-%ifarch s390 s390x
+%ifarch s390 s390x sparc sparc64
 %define _fpie -fPIE
 %else
 %define _fpie -fpie
@@ -195,14 +184,14 @@
 
 %if "%{with_sasl1}" == "yes"
 cat >> redhat.config.m4 << EOF
-APPENDDEF(\`confENVDEF', \`-DSASL=1 -D_FFR_UNSAFE_SASL')dnl
+APPENDDEF(\`confENVDEF', \`-DSASL=1')dnl
 APPENDDEF(\`confLIBS', \`-lsasl -lcrypto')dnl
 EOF
 %endif
 
 %if "%{with_sasl2}" == "yes"
 cat >> redhat.config.m4 << EOF
-APPENDDEF(\`confENVDEF', \`-DSASL=2 -D_FFR_UNSAFE_SASL')dnl
+APPENDDEF(\`confENVDEF', \`-DSASL=2')dnl
 APPENDDEF(\`confLIBS', \`-lsasl2 -lcrypto')dnl
 EOF
 %endif
@@ -210,7 +199,6 @@
 %if "%{with_milter}" == "yes"
 cat >> redhat.config.m4 << EOF
 APPENDDEF(\`conf_sendmail_ENVDEF', \`-DMILTER')dnl
-APPENDDEF(\`conf_libmilter_ENVDEF', \`-D_FFR_MILTER_ROOT_UNSAFE')dnl
 EOF
 %endif
 
@@ -222,13 +210,6 @@
 EOF
 %endif
 
-%if "%{with_mysql}" == "yes"
-cat >> redhat.config.m4 << EOF
-APPENDDEF(\`confMAPDEF',\`-DMYSQLMAP')dnl
-APPENDDEF(\`confLIBS',\`%{l_ldflags mysql .} -lmysqlclient -lz -lm')dnl
-EOF
-%endif
-
 DIRS="libsmutil sendmail mailstats rmail praliases smrsh makemap"
 
 %if "%{with_milter}" == "yes"
@@ -241,35 +222,46 @@
 	popd
 done
 
+make -C doc/op op.pdf
+
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-cd $RPM_BUILD_ROOT
-mkdir -p etc/sysconfig .%{initdir} etc/pam.d
-mkdir -p usr/bin usr/include/libmilter usr/%{_lib} usr/lib
-mkdir -p .%{_mandir}/man{1,5,8}
-mkdir -p usr/sbin var/log var/spool .%{sendmailcf}
-cd -
+# create directories
+for d in %{_bindir} %{_sbindir} %{_includedir}/libmilter \
+	%{_libdir} %{_mandir}/man{1,5,8} %{maildir} %{stdir} %{spooldir} \
+	%{_docdir}/sendmail-%{version} %{sendmailcf} %{_sysconfdir}/smrsh\
+	%{spooldir}/clientmqueue %{_sysconfdir}/sysconfig %{_initrddir} \
+	%{_sysconfdir}/pam.d;
+do
+	install -m 755 -d %{buildroot}$d
+done
+install -m 700 -d %{buildroot}%{spooldir}/mqueue
+
+# create /usr/lib for 64 bit architectures
+%if "%{_libdir}" != "/usr/lib"
+install -m 755 -d %{buildroot}/usr/lib
+%endif
 
-OBJDIR=obj.$(uname -s).$(uname -r).$(arch)
 nameuser=`id -nu`
 namegroup=`id -ng`
 
 Make() {
 	make $@ \
-		DESTDIR=$RPM_BUILD_ROOT \
+		DESTDIR=%{buildroot} \
 		MANROOT=%{_mandir}/man \
 		SBINOWN=${nameuser} SBINGRP=${namegroup} \
 		UBINOWN=${nameuser} UBINGRP=${namegroup} \
-		MANOWN=${nameuser}  MANGRP=${namegroup} \
-		INCOWN=${nameuser}  INCGRP=${namegroup} \
-		LIBOWN=${nameuser}  LIBGRP=${namegroup} \
+		MANOWN=${nameuser} MANGRP=${namegroup} \
+		INCOWN=${nameuser} INCGRP=${namegroup} \
+		LIBOWN=${nameuser} LIBGRP=${namegroup} \
 		GBINOWN=${nameuser} GBINGRP=${namegroup} \
-		CFOWN=${nameuser}   CFGRP=${namegroup} \
-		MSPQOWN=${nameuser} 
+		CFOWN=${nameuser} CFGRP=${namegroup} \
+		MSPQOWN=${nameuser}
 }
 
+OBJDIR=obj.$(uname -s).$(uname -r).$(arch)
+
 Make install -C $OBJDIR/libmilter
 Make install -C $OBJDIR/libsmutil
 Make install -C $OBJDIR/sendmail
@@ -279,305 +271,244 @@
 Make install -C $OBJDIR/smrsh
 Make install -C $OBJDIR/makemap
 
-touch $RPM_BUILD_ROOT/rootfile
-root=..
-while [ ! -r $RPM_BUILD_ROOT/%{_bindir}/${root}/rootfile ] ; do
-	root=${root}/..
-done
-ln -sf ${root}%{_sbindir}/makemap $RPM_BUILD_ROOT/%{_bindir}/makemap
-
-# Install docs by hand for the sendmail-doc package.
-DOC=$RPM_BUILD_ROOT%{_docdir}/sendmail
-mkdir -p $DOC
-cp -ar FAQ LICENSE KNOWNBUGS README RELEASE_NOTES doc $DOC
-cp sendmail/README   $DOC/README.sendmail
-cp sendmail/SECURITY $DOC/SECURITY
-cp smrsh/README      $DOC/README.smrsh
-cp libmilter/README  $DOC/README.libmilter
-cp cf/README         $DOC/README.cf
-cp %{SOURCE9}        $DOC/README.redhat
+# install libraries
+install -m 644 $OBJDIR/libmilter/libmilter.a %{buildroot}%{_libdir}
+install -m 644 $OBJDIR/libsmutil/libsmutil.a %{buildroot}%{_libdir}
+install -m 644 $OBJDIR/libsm/libsm.a %{buildroot}%{_libdir}
+
+%if "%{_lib}" == "lib64"
+# libmilter.a is 64 bit, not usable in /usr/lib for 32 bit build
+rm -fr %{buildroot}/usr/lib/libmilter.a
+%endif
 
-# Install the cf files for the sendmail-cf package.
-cp -ar cf/* $RPM_BUILD_ROOT%{sendmailcf}
-# remove patch backup files
-rm -rf $RPM_BUILD_ROOT%{sendmailcf}/cf/Build.*
-rm -rf $RPM_BUILD_ROOT%{sendmailcf}/*/*.mc.*
-rm -rf $RPM_BUILD_ROOT%{sendmailcf}/*/*.m4.*
+# replace absolute with relative symlinks
+ln -sf ../sbin/makemap %{buildroot}%{_bindir}/makemap
+for f in hoststat mailq newaliases purgestat ; do
+	ln -sf ../sbin/sendmail.sendmail %{buildroot}%{_bindir}/${f}
+done
 
-install -d -m755 $RPM_BUILD_ROOT/etc/mail
+# use /usr/lib, even for 64 bit architectures
+ln -sf ../sbin/sendmail.sendmail %{buildroot}/usr/lib/sendmail.sendmail
 
-sed -e 's|@@PATH@@|%{sendmailcf}|' < %{SOURCE6} > $RPM_BUILD_ROOT/etc/mail/sendmail.mc
+# install docs for sendmail
+install -p -m 644 FAQ %{buildroot}%{_docdir}/sendmail-%{version}
+install -p -m 644 KNOWNBUGS %{buildroot}%{_docdir}/sendmail-%{version}
+install -p -m 644 LICENSE %{buildroot}%{_docdir}/sendmail-%{version}
+install -p -m 644 README %{buildroot}%{_docdir}/sendmail-%{version}
+install -p -m 644 RELEASE_NOTES %{buildroot}%{_docdir}/sendmail-%{version}
+
+# install docs for sendmail-doc
+install -m 644 doc/op/op.pdf %{buildroot}%{_docdir}/sendmail-%{version}
+install -p -m 644 sendmail/README %{buildroot}%{_docdir}/sendmail-%{version}/README.sendmail
+install -p -m 644 sendmail/SECURITY %{buildroot}%{_docdir}/sendmail-%{version}
+install -p -m 644 smrsh/README %{buildroot}%{_docdir}/sendmail-%{version}/README.smrsh
+install -p -m 644 libmilter/README %{buildroot}%{_docdir}/sendmail-%{version}/README.libmilter
+install -p -m 644 cf/README %{buildroot}%{_docdir}/sendmail-%{version}/README.cf
+install -m 644 %{SOURCE9} %{buildroot}%{_docdir}/sendmail-%{version}/README.redhat
 
-sed -e 's|%{sendmailcf}|\.\.|' < $RPM_BUILD_ROOT/etc/mail/sendmail.mc > cf/cf/redhat.mc
-%if "%{stdir}" != "/etc/mail"
-perl -pi -e 's:/etc/mail/statistics:%{stdir}/statistics:' cf/cf/redhat.mc
+# install the cf files for the sendmail-cf package.
+cp -ar cf/* %{buildroot}%{sendmailcf}
+# remove patch backup files
+rm -rf %{buildroot}%{sendmailcf}/cf/Build.*
+rm -rf %{buildroot}%{sendmailcf}/*/*.mc.*
+rm -rf %{buildroot}%{sendmailcf}/*/*.m4.*
+
+# install sendmail.mc with proper paths
+install -m 644 %{SOURCE6} %{buildroot}%{maildir}/sendmail.mc
+sed -i -e 's|@@PATH@@|%{sendmailcf}|' %{buildroot}%{maildir}/sendmail.mc
+
+# create sendmail.cf
+cp %{buildroot}%{maildir}/sendmail.mc cf/cf/redhat.mc
+sed -i -e 's|%{sendmailcf}|\.\.|' cf/cf/redhat.mc
+%if "%{stdir}" != "%{maildir}"
+sed -i -e 's:%{maildir}/statistics:%{stdir}/statistics:' cf/cf/redhat.mc
 %endif
 (cd cf/cf && m4 redhat.mc > redhat.cf)
-install -m 644 cf/cf/redhat.cf $RPM_BUILD_ROOT/etc/mail/sendmail.cf
-install -m 644 cf/cf/submit.mc $RPM_BUILD_ROOT/etc/mail/submit.mc
+install -m 644 cf/cf/redhat.cf %{buildroot}%{maildir}/sendmail.cf
+install -m 644 cf/cf/submit.mc %{buildroot}%{maildir}/submit.mc
 
-echo "# local-host-names - include all aliases for your machine here." \
-	> $RPM_BUILD_ROOT/etc/mail/local-host-names
-( echo "# trusted-users - users that can send mail as others without a warning"
-echo "# apache, mailman, majordomo, uucp, are good candidates" ) \
-	> $RPM_BUILD_ROOT/etc/mail/trusted-users
-
-ln -sf ../sbin/sendmail $RPM_BUILD_ROOT/usr/lib/sendmail.sendmail
-install -d -m775 $RPM_BUILD_ROOT/var/spool/mqueue
-install -d -m755 $RPM_BUILD_ROOT/var/spool/clientmqueue
-
-# dangling symlinks
-root=..
-while [ ! -r $RPM_BUILD_ROOT/%{_bindir}/${root}/rootfile ] ; do
-	root=${root}/..
-done
-for f in hoststat mailq newaliases purgestat ; do
-    ln -sf ${root}%{_sbindir}/sendmail $RPM_BUILD_ROOT%{_bindir}/${f}
-done
-install -d -m755 $RPM_BUILD_ROOT/etc/smrsh
+install -m 644 %{SOURCE12} %{buildroot}%{maildir}/access
+install -m 644 %{SOURCE13} %{buildroot}%{maildir}/domaintable
+install -m 644 %{SOURCE14} %{buildroot}%{maildir}/local-host-names
+install -m 644 %{SOURCE15} %{buildroot}%{maildir}/mailertable
+install -m 644 %{SOURCE16} %{buildroot}%{maildir}/trusted-users
+install -m 644 %{SOURCE17} %{buildroot}%{maildir}/virtusertable
 
-cat <<EOF > $RPM_BUILD_ROOT/etc/mail/access
-# Check the /usr/share/doc/sendmail/README.cf file for a description
-# of the format of this file. (search for access_db in that file)
-# The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
-# package.
-#
-# by default we allow relaying from localhost...
-Connect:localhost.localdomain		RELAY
-Connect:localhost			RELAY
-Connect:127.0.0.1			RELAY
-
-EOF
+# create db files
 for map in virtusertable access domaintable mailertable ; do
-    touch $RPM_BUILD_ROOT/etc/mail/${map}
-    chmod 0644 $RPM_BUILD_ROOT/etc/mail/${map}
-    $RPM_BUILD_ROOT%{_bindir}/makemap -C $RPM_BUILD_ROOT/etc/mail/sendmail.cf hash $RPM_BUILD_ROOT/etc/mail/${map}.db < $RPM_BUILD_ROOT/etc/mail/${map}
-    chmod 0644 $RPM_BUILD_ROOT/etc/mail/${map}.db
+	touch %{buildroot}%{maildir}/${map}
+	chmod 0644 %{buildroot}%{maildir}/${map}
+	%{buildroot}%{_bindir}/makemap -C %{buildroot}%{maildir}/sendmail.cf \
+		hash %{buildroot}%{maildir}/${map}.db \
+		< %{buildroot}%{maildir}/${map}
+	chmod 0644 %{buildroot}%{maildir}/${map}.db
 done
-%if "%{old_setup}" == "yes"
-install -m644 %{SOURCE3} $RPM_BUILD_ROOT/etc/aliases
-$RPM_BUILD_ROOT/usr/bin/makemap -C $RPM_BUILD_ROOT/etc/mail/sendmail.cf hash $RPM_BUILD_ROOT/etc/aliases.db < %{SOURCE3}
-%else
-$RPM_BUILD_ROOT/usr/bin/makemap -C $RPM_BUILD_ROOT/etc/mail/sendmail.cf hash $RPM_BUILD_ROOT/etc/aliases.db < /etc/aliases
-%endif
-
-install -m644 %SOURCE4 $RPM_BUILD_ROOT/etc/sysconfig/sendmail
-install -m755 %SOURCE1 $RPM_BUILD_ROOT%{initdir}/sendmail
+%{buildroot}%{_bindir}/makemap -C %{buildroot}%{maildir}/sendmail.cf \
+	hash %{buildroot}%{_sysconfdir}/aliases.db < %{_sysconfdir}/aliases
 
-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/mail/Makefile
-
-chmod u+w $RPM_BUILD_ROOT/usr/sbin/{mailstats,praliases}
-chmod u+w $RPM_BUILD_ROOT/usr/bin/rmail
+install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/sendmail
+install -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/sendmail
+install -m 644 %{SOURCE5} %{buildroot}%{maildir}/Makefile
+
+# fix permissions to allow debuginfo extraction and stripping
+chmod 755 %{buildroot}%{_sbindir}/{mailstats,makemap,praliases,sendmail,smrsh}
+chmod 755 %{buildroot}%{_bindir}/rmail
 
 %if "%{with_sasl1}" == "yes"
-install -m755 -d $RPM_BUILD_ROOT%{_libdir}/sasl
-install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_libdir}/sasl/Sendmail.conf
+install -m 755 -d %{buildroot}%{_libdir}/sasl
+install -m 644 %{SOURCE7} %{buildroot}%{_libdir}/sasl/Sendmail.conf
 %endif
 %if "%{with_sasl2}" == "yes"
-install -m755 -d $RPM_BUILD_ROOT%{_libdir}/sasl2
-install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_libdir}/sasl2/Sendmail.conf
+install -m 755 -d %{buildroot}%{_libdir}/sasl2
+install -m 644 %{SOURCE11} %{buildroot}%{_libdir}/sasl2/Sendmail.conf
 %endif
-install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/pam.d/smtp.sendmail
-
-install -m 755 -d $RPM_BUILD_ROOT%{_libdir}
-install -m 644  $OBJDIR/libmilter/libmilter.a $RPM_BUILD_ROOT%{_libdir}
-install -m 644  $OBJDIR/libsmutil/libsmutil.a $RPM_BUILD_ROOT%{_libdir}
-install -m 644  $OBJDIR/libsm/libsm.a         $RPM_BUILD_ROOT%{_libdir}
+install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/pam.d/smtp.sendmail
 
-# allow stripping of the sendmail app
-chmod 755 $RPM_BUILD_ROOT%{_sbindir}/sendmail
+# fix path for statistics file in man pages
+%if "%{stdir}" != "%{maildir}"
+sed -i -e 's:%{maildir}/statistics:%{stdir}/statistics:' %{buildroot}%{_mandir}/man*/*
+%endif
 
-mv $RPM_BUILD_ROOT%{_sbindir}/sendmail $RPM_BUILD_ROOT%{_sbindir}/sendmail.sendmail
+# rename files for alternative usage
+mv %{buildroot}%{_sbindir}/sendmail %{buildroot}%{_sbindir}/sendmail.sendmail
 for i in mailq newaliases rmail; do
-	mv $RPM_BUILD_ROOT%{_bindir}/$i $RPM_BUILD_ROOT%{_bindir}/$i.sendmail
+	mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i.sendmail
 done
-mv $RPM_BUILD_ROOT%{_mandir}/man1/mailq.1 $RPM_BUILD_ROOT%{_mandir}/man1/mailq.sendmail.1
-mv $RPM_BUILD_ROOT%{_mandir}/man1/newaliases.1 $RPM_BUILD_ROOT%{_mandir}/man1/newaliases.sendmail.1
-mv $RPM_BUILD_ROOT%{_mandir}/man5/aliases.5 $RPM_BUILD_ROOT%{_mandir}/man5/aliases.sendmail.5
-mv $RPM_BUILD_ROOT%{_mandir}/man8/sendmail.8 $RPM_BUILD_ROOT%{_mandir}/man8/sendmail.sendmail.8
-
-%if "%{stdir}" != "/etc/mail"
-perl -pi -e 's:/etc/mail/statistics:%{stdir}/statistics:' $RPM_BUILD_ROOT%{_mandir}/man*/*
-%endif
-
-%if "%{_libdir}" == "/usr/lib64"
-rm -fr $RPM_BUILD_ROOT/usr/lib/libmilter.a
-%endif
+mv %{buildroot}%{_mandir}/man1/mailq.1 %{buildroot}%{_mandir}/man1/mailq.sendmail.1
+mv %{buildroot}%{_mandir}/man1/newaliases.1 %{buildroot}%{_mandir}/man1/newaliases.sendmail.1
+mv %{buildroot}%{_mandir}/man5/aliases.5 %{buildroot}%{_mandir}/man5/aliases.sendmail.5
+mv %{buildroot}%{_mandir}/man8/sendmail.8 %{buildroot}%{_mandir}/man8/sendmail.sendmail.8
 
-rm -rf $RPM_BUILD_ROOT/rootfile
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %pre
-/usr/sbin/useradd -u 47 -d /var/spool/mqueue -r -s %{smshell} mailnull >/dev/null 2>&1
-/usr/sbin/useradd -u 51 -d /var/spool/mqueue -r -s %{smshell} smmsp >/dev/null 2>&1
+%{_sbindir}/useradd -u 47 -d %{spooldir}/mqueue -r -s %{smshell} mailnull >/dev/null 2>&1
+%{_sbindir}/useradd -u 51 -d %{spooldir}/mqueue -r -s %{smshell} smmsp >/dev/null 2>&1
 exit 0
 
 %postun
 if [ "$1" -ge "1" ]; then
-	%{initdir}/sendmail condrestart >/dev/null 2>&1
-	mta=`readlink /etc/alternatives/mta`
+	%{_initrddir}/sendmail condrestart >/dev/null 2>&1
+	mta=`readlink %{_sysconfdir}/alternatives/mta`
 	if [ "$mta" == "%{_sbindir}/sendmail.sendmail" ]; then
-		/usr/sbin/alternatives --set mta %{_sbindir}/sendmail.sendmail
+		%{_sbindir}/alternatives --set mta %{_sbindir}/sendmail.sendmail
 	fi
 fi
 exit 0
 
 %post
-#
-# Convert old format to new
-#
-if [ -f /etc/mail/deny ] ; then
-    cat /etc/mail/deny | \
-	awk 'BEGIN{ print "# Entries from obsoleted /etc/mail/deny"} \
-		  {print $1" REJECT"}' >> /etc/mail/access
-    cp /etc/mail/deny /etc/mail/deny.rpmorig
-fi
-for oldfile in relay_allow ip_allow name_allow ; do
-    if [ -f /etc/mail/$oldfile ] ; then
-	cat /etc/mail/$oldfile | \
-		awk "BEGIN { print \"# Entries from obsoleted /etc/mail/$oldfile\" ;} \
-	     { print \$1\" RELAY\" }" >> /etc/mail/access
-	cp /etc/mail/$oldfile /etc/mail/$oldfile.rpmorig
-     fi
-done
-
-#
-# Remove deprecated config flags which are probably harmless to remove
-#
-cf=`/bin/mktemp /etc/mail/sendmail.cf.XXXXXX`
-if [ "$cf" != "" ] ; then
-	sed 's/^O AutoRebuildAliases$/#&/g' /etc/mail/sendmail.cf > ${cf} && \
-	cat ${cf} > /etc/mail/sendmail.cf
-	rm ${cf}
-fi
-
 /sbin/chkconfig --add sendmail
-#
 # Set up the alternatives files for MTAs.
-#
-/usr/sbin/alternatives --install %{_sbindir}/sendmail mta %{_sbindir}/sendmail.sendmail 90 \
+%{_sbindir}/alternatives --install %{_sbindir}/sendmail mta %{_sbindir}/sendmail.sendmail 90 \
 	--slave %{_bindir}/mailq mta-mailq %{_bindir}/mailq.sendmail \
 	--slave %{_bindir}/newaliases mta-newaliases %{_bindir}/newaliases.sendmail \
 	--slave %{_bindir}/rmail mta-rmail %{_bindir}/rmail.sendmail \
 	--slave /usr/lib/sendmail mta-sendmail /usr/lib/sendmail.sendmail \
-        --slave %{_sysconfdir}/pam.d/smtp mta-pam %{_sysconfdir}/pam.d/smtp.sendmail \
+	--slave %{_sysconfdir}/pam.d/smtp mta-pam %{_sysconfdir}/pam.d/smtp.sendmail \
 	--slave %{_mandir}/man8/sendmail.8.gz mta-sendmailman %{_mandir}/man8/sendmail.sendmail.8.gz \
 	--slave %{_mandir}/man1/mailq.1.gz mta-mailqman %{_mandir}/man1/mailq.sendmail.1.gz \
 	--slave %{_mandir}/man1/newaliases.1.gz mta-newaliasesman %{_mandir}/man1/newaliases.sendmail.1.gz \
 	--slave %{_mandir}/man5/aliases.5.gz mta-aliasesman %{_mandir}/man5/aliases.sendmail.5.gz \
 	--initscript sendmail
 
-
-#
-# Oops, these files moved
-#
-if [ -f /etc/sendmail.cw ]; then
-    cat /etc/sendmail.cw  | \
-      awk 'BEGIN { print "# Entries from obsoleted /etc/sendmail.cw" ;} \
-           { print $1 }' >> /etc/mail/local-host-names
-    cp /etc/sendmail.cw /etc/sendmail.cw.rpmorig
-fi
-#
 # Rebuild maps (next reboot will rebuild also)
-#
 {
-  chown root /etc/aliases.db /etc/mail/access.db /etc/mail/mailertable.db \
-    /etc/mail/domaintable.db  /etc/mail/virtusertable.db
-  /usr/bin/newaliases
-  for map in virtusertable access domaintable mailertable ; do
-    if [ -f /etc/mail/${map} ]; then
-      /usr/bin/makemap hash /etc/mail/${map} < /etc/mail/${map}
-    fi
-  done
+	chown root %{_sysconfdir}/aliases.db %{maildir}/access.db \
+		%{maildir}/mailertable.db %{maildir}/domaintable.db \
+		%{maildir}/virtusertable.db
+	%{_bindir}/newaliases
+	for map in virtusertable access domaintable mailertable ; do
+		if [ -f %{maildir}/${map} ]; then
+			%{_bindir}/makemap hash %{maildir}/${map} \
+				< %{maildir}/${map}
+		fi
+	done
 } > /dev/null 2>&1
-
+exit 0
 
 %preun
 if [ $1 = 0 ]; then
-	%{initdir}/sendmail stop >/dev/null 2>&1
+	%{_initrddir}/sendmail stop >/dev/null 2>&1
 	/sbin/chkconfig --del sendmail
-	/usr/sbin/alternatives --remove mta %{_sbindir}/sendmail.sendmail
+	%{_sbindir}/alternatives --remove mta %{_sbindir}/sendmail.sendmail
 fi
 exit 0
 
-%triggerpostun -- sendmail < 8.10.0
-/sbin/chkconfig --add sendmail
-
-%triggerpostun -- sendmail < 8.11.6-11
-/usr/sbin/alternatives --auto mta
-
 %files
 %defattr(-,root,root)
-/usr/bin/hoststat
-/usr/bin/makemap
-/usr/bin/purgestat
-/usr/sbin/mailstats
-/usr/sbin/makemap
-/usr/sbin/praliases
-%attr(2755,root,smmsp)/usr/sbin/sendmail.sendmail
-/usr/bin/rmail.sendmail
-/usr/bin/newaliases.sendmail
-/usr/bin/mailq.sendmail
-/usr/sbin/smrsh
+%dir %{_docdir}/sendmail-%{version}
+%doc %{_docdir}/sendmail-%{version}/FAQ
+%doc %{_docdir}/sendmail-%{version}/KNOWNBUGS
+%doc %{_docdir}/sendmail-%{version}/LICENSE
+%doc %{_docdir}/sendmail-%{version}/README
+%doc %{_docdir}/sendmail-%{version}/RELEASE_NOTES
+%{_bindir}/hoststat
+%{_bindir}/makemap
+%{_bindir}/purgestat
+%{_sbindir}/mailstats
+%{_sbindir}/makemap
+%{_sbindir}/praliases
+%attr(2755,root,smmsp) %{_sbindir}/sendmail.sendmail
+%{_bindir}/rmail.sendmail
+%{_bindir}/newaliases.sendmail
+%{_bindir}/mailq.sendmail
+%{_sbindir}/smrsh
 /usr/lib/sendmail.sendmail
 
-%{_mandir}/man8/rmail.8*
-%{_mandir}/man8/praliases.8*
-%{_mandir}/man8/mailstats.8*
-%{_mandir}/man8/makemap.8*
-%{_mandir}/man8/sendmail.sendmail.8*
-%{_mandir}/man8/smrsh.8*
-%{_mandir}/man5/aliases.sendmail.5*
-%{_mandir}/man1/newaliases.sendmail.1*
-%{_mandir}/man1/mailq.sendmail.1*
+%{_mandir}/man8/rmail.8.gz
+%{_mandir}/man8/praliases.8.gz
+%{_mandir}/man8/mailstats.8.gz
+%{_mandir}/man8/makemap.8.gz
+%{_mandir}/man8/sendmail.sendmail.8.gz
+%{_mandir}/man8/smrsh.8.gz
+%{_mandir}/man5/aliases.sendmail.5.gz
+%{_mandir}/man1/newaliases.sendmail.1.gz
+%{_mandir}/man1/mailq.sendmail.1.gz
 
 %dir %{stdir}
-%config(noreplace)		%{stdir}/statistics
-%config(noreplace)		/etc/mail/sendmail.cf
-%config(noreplace)		/etc/mail/submit.cf
-%attr(0644,root,root) %config(noreplace)	/etc/mail/sendmail.mc
-%attr(0644,root,root) %config(noreplace)	/etc/mail/submit.mc
-%config(noreplace)		/etc/mail/local-host-names
-%if "%{old_setup}" == "yes"
-%config(noreplace)		/etc/aliases
-%endif
-%attr(0644,root,root) %ghost	/etc/aliases.db
-%attr(0770,smmsp,smmsp) %dir	/var/spool/clientmqueue
-%attr(0700,root,mail) %dir	/var/spool/mqueue
-%dir /etc/smrsh
-%dir /etc/mail
-
-%config(noreplace) /etc/mail/Makefile
-%attr(0644,root,root) %ghost			/etc/mail/virtusertable.db
-%attr(0644,root,root) %config(noreplace)	/etc/mail/virtusertable
-
-%attr(0644,root,root) %ghost			/etc/mail/access.db
-%attr(0644,root,root) %config(noreplace)	/etc/mail/access
-
-%attr(0644,root,root) %ghost			/etc/mail/domaintable.db
-%attr(0644,root,root) %config(noreplace)	/etc/mail/domaintable
-
-%attr(0644,root,root) %ghost			/etc/mail/mailertable.db
-%attr(0644,root,root) %config(noreplace)	/etc/mail/mailertable
-
-%attr(0644,root,root) %config(noreplace)	/etc/mail/helpfile
-%attr(0644,root,root) %config(noreplace)	/etc/mail/trusted-users
-
-%config(noreplace) /etc/sysconfig/sendmail
-
-%config %{initdir}/sendmail
+%dir %{_sysconfdir}/smrsh
+%dir %{maildir}
+%attr(0770,smmsp,smmsp) %dir %{spooldir}/clientmqueue
+%attr(0700,root,mail) %dir %{spooldir}/mqueue
+
+%config(noreplace) %{stdir}/statistics
+%config(noreplace) %{maildir}/Makefile
+%config(noreplace) %{maildir}/sendmail.cf
+%config(noreplace) %{maildir}/submit.cf
+%config(noreplace) %{maildir}/helpfile
+%config(noreplace) %{maildir}/sendmail.mc
+%config(noreplace) %{maildir}/submit.mc
+%config(noreplace) %{maildir}/access
+%config(noreplace) %{maildir}/domaintable
+%config(noreplace) %{maildir}/local-host-names
+%config(noreplace) %{maildir}/mailertable
+%config(noreplace) %{maildir}/trusted-users
+%config(noreplace) %{maildir}/virtusertable
+
+%ghost %{_sysconfdir}/aliases.db
+%ghost %{maildir}/virtusertable.db
+%ghost %{maildir}/access.db
+%ghost %{maildir}/domaintable.db
+%ghost %{maildir}/mailertable.db
+
+%attr(0755,root,root) %{_initrddir}/sendmail
+%config(noreplace) %{_sysconfdir}/sysconfig/sendmail
+%config(noreplace) %{_sysconfdir}/pam.d/smtp.sendmail
 
 %config %{_libdir}/sasl*/Sendmail*.conf
-%config(noreplace) /etc/pam.d/smtp.sendmail
 
 %files cf
 %defattr(-,root,root)
-%{sendmailcf}
+%doc %{sendmailcf}/README
+%dir %{sendmailcf}
+%{sendmailcf}/*/
+%{sendmailcf}/sendmail.schema
 
 %files devel
 %defattr(-,root,root)
+%doc libmilter/docs/*
 %dir %{_includedir}/libmilter
 %{_includedir}/libmilter/*.h
 %{_libdir}/libmilter.a
@@ -586,10 +517,44 @@
 
 %files doc
 %defattr(-,root,root)
-%{_docdir}/sendmail
+%{_docdir}/sendmail-%{version}/README.cf
+%{_docdir}/sendmail-%{version}/README.libmilter
+%{_docdir}/sendmail-%{version}/README.redhat
+%{_docdir}/sendmail-%{version}/README.sendmail
+%{_docdir}/sendmail-%{version}/README.smrsh
+%{_docdir}/sendmail-%{version}/SECURITY
+%{_docdir}/sendmail-%{version}/op.pdf
+
 
 %changelog
-* Tue Nov 21 2006 Thomas Woerner <twoerner at redhat.com> 8.13.8-2.1
+* Mon Apr 16 2007 Thomas Woerner <twoerner at redhat.com> 8.14.1-1.2%{dist}
+- readded chkconfig add for sendmail in post script
+- dropped mysql support (useless without further patching)
+- fixed executable permissions for /usr/sbin/makemap and /usr/sbin/smrsh
+- dropped FFR_UNSAFE_SASL, because it has no effect anymore
+
+* Thu Apr 12 2007 Thomas Woerner <twoerner at redhat.com> 8.14.1-1.1
+- replaced prereq tags with requires() tags.
+
+* Thu Apr 12 2007 Thomas Woerner <twoerner at redhat.com> 8.14.1-1
+- new version 8.14.1
+- spec file cleanup for merge review (rhbz#226407)
+- dropped update support for sendmail versions prior to 8.12.0
+- using pdf documentation
+
+* Tue Feb  6 2007 Thomas Woerner <twoerner at redhat.com> 8.14.0-1
+- new version 8.14.0
+- adapted patches: makemapman, dynamic
+
+* Tue Jan 23 2007 Florian La Roche <laroche at redhat.com>
+- #205803 add sparc/sparc64 to -fPIE list
+- change sendmail.cf reference into sendmail-cf package name
+
+* Mon Dec  4 2006 Thomas Woerner <twoerner at redhat.com> 8.13.8-3.1
+- tcp_wrappers has a new devel and libs sub package, therefore changing build
+  requirement for tcp_wrappers to tcp_wrappers-devel
+
+* Tue Nov 28 2006 Thomas Woerner <twoerner at redhat.com> 8.13.8-3
 - added missing LDAP_DEPRECATED flag (#206288)
 
 * Mon Sep 04 2006 Florian La Roche <laroche at redhat.com>
@@ -1029,7 +994,7 @@
 - run chkconfig --add before alternatives
 
 * Thu Feb 28 2002 Bill Nottingham <notting at redhat.com> 8.12.2-3
-- run alternatives --remove in %preun
+- run alternatives --remove in %%preun
 - add some prereqs
 
 * Mon Feb 25 2002 Nalin Dahyabhai <nalin at redhat.com> 8.12.2-2
@@ -1050,7 +1015,7 @@
   to build this for older releases
 
 * Fri Feb  1 2002 Bill Nottingham <notting at redhat.com> 8.11.6-12
-- %triggerpostun on older versions to make sure alternatives work on
+- %%triggerpostun on older versions to make sure alternatives work on
   upgrades
 
 * Thu Jan 31 2002 Bill Nottingham <notting at redhat.com> 8.11.6-11
@@ -1328,7 +1293,7 @@
 
 * Mon Mar 22 1999 Jeff Johnson <jbj at redhat.com>
 - correxct dangling symlinks.
-- check for map file existence in %post.
+- check for map file existence in %%post.
 
 * Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
 - auto rebuild in the new build environment (release 3)


--- sendmail-8.12.11-smrsh-paths.patch DELETED ---


--- sendmail-8.12.2-makemapman.patch DELETED ---


--- sendmail-8.13.0-dynamic.patch DELETED ---


--- sendmail-8.13.0-pid.patch DELETED ---


--- sendmail-8.13.1-errata_cataddr.patch DELETED ---


--- sendmail-8.13.2-dynamic.patch DELETED ---


--- sendmail-8.13.3-close_wait.p2.patch DELETED ---


--- sendmail-8.13.4-dynamic.patch DELETED ---


--- sendmail-8.13.4-libmilter-sigwait.patch DELETED ---


--- sendmail-8.13.6-dynamic.patch DELETED ---


--- sendmail-8.13.8-noversion.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 16 09:50:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 05:50:45 -0400
Subject: rpms/sendmail/FC-6 .cvsignore,1.19,1.20 sources,1.19,1.20
Message-ID: <200704160950.l3G9ojIu008310@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/sendmail/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv8295

Modified Files:
	.cvsignore sources 
Log Message:
[tw] new sources



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sendmail/FC-6/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	1 Sep 2006 15:05:31 -0000	1.19
+++ .cvsignore	16 Apr 2007 09:50:43 -0000	1.20
@@ -6,3 +6,4 @@
 sendmail.8.13.6.tar.gz
 sendmail.8.13.7.tar.gz
 sendmail.8.13.8.tar.gz
+sendmail.8.14.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sendmail/FC-6/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	1 Sep 2006 15:05:31 -0000	1.19
+++ sources	16 Apr 2007 09:50:43 -0000	1.20
@@ -1 +1 @@
-5f29c94b42e0bb74d546b2ae84203a1e  sendmail.8.13.8.tar.gz
+462bc9e00fdbef3a71b046b967c9a157  sendmail.8.14.1.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr 16 10:04:14 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 06:04:14 -0400
Subject: rpms/pilot-link/devel pilot-link.spec,1.53,1.54
Message-ID: <200704161004.l3GA4Ebm008590@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/pilot-link/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8576

Modified Files:
	pilot-link.spec 
Log Message:
- add --enable-libusb (#236413)



Index: pilot-link.spec
===================================================================
RCS file: /cvs/dist/rpms/pilot-link/devel/pilot-link.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- pilot-link.spec	9 Mar 2007 15:09:10 -0000	1.53
+++ pilot-link.spec	16 Apr 2007 10:04:12 -0000	1.54
@@ -3,7 +3,7 @@
 
 Name: pilot-link
 Version: 0.12.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 2
 License: GPL
 Group: Applications/Communications
@@ -28,6 +28,8 @@
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
+BuildRequires: libusb
+
 
 %description
 This suite of tools allows you to upload and download programs and
@@ -78,7 +80,8 @@
 %else
   --with-perl=no \
 %endif
-  --enable-conduits
+  --enable-conduits \
+  --enable-libusb
 
 make
 
@@ -140,6 +143,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Mon Apr 16 2007 Ivana Varekova <varekova at redhat.com> - 2:0.12.1-6
+- add --enable-libusb (#236413)
+
 * Fri Mar  9 2007 Ivana Varekova <varekova at redhat.com> - 2:0.12.1-5
 - incorporate the package review feedback
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 10:05:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 06:05:42 -0400
Subject: rpms/sendmail/FC-6 sendmail.spec,1.76,1.77
Message-ID: <200704161005.l3GA5gpi008666@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/sendmail/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv8652

Modified Files:
	sendmail.spec 
Log Message:
[tw]
- using tcp_wrappers buildreq instead of tcp_wrappers-devel



Index: sendmail.spec
===================================================================
RCS file: /cvs/dist/rpms/sendmail/FC-6/sendmail.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- sendmail.spec	16 Apr 2007 09:49:28 -0000	1.76
+++ sendmail.spec	16 Apr 2007 10:05:40 -0000	1.77
@@ -47,7 +47,7 @@
 Patch14: sendmail-8.13.7-vacation.patch
 Patch15: sendmail-8.14.1-noversion.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: tcp_wrappers-devel
+BuildRequires: tcp_wrappers
 BuildRequires: db4-devel
 BuildRequires: hesiod-devel
 BuildRequires: groff



From fedora-cvs-commits at redhat.com  Mon Apr 16 10:06:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 06:06:31 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch, NONE,
	1.1 openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,
	1.13, 1.14 openoffice.org.spec, 1.1164,
	1.1165 openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch,
	1.1, NONE
Message-ID: <200704161006.l3GA6VUj008732@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 
	openoffice.org.spec 
Added Files:
	openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch 
Removed Files:
	openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch 
Log Message:
add openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch

openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch:
 osl/unx/signal.c     |    0 
 sal/osl/unx/signal.c |  113 ++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 102 insertions(+), 11 deletions(-)

--- NEW FILE openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch ---
Index: osl/unx/signal.c
===================================================================
RCS file: /cvs/porting/sal/osl/unx/signal.c,v
retrieving revision 1.32.14.1
diff -u -r1.32.14.1 signal.c
--- openoffice.org.orig/sal/osl/unx/signal.c	19 Jan 2007 11:43:41 -0000	1.32.14.1
+++ openoffice.org/sal/osl/unx/signal.c	15 Apr 2007 15:55:35 -0000
@@ -41,6 +41,7 @@
 
 #ifdef LINUX
 #include <execinfo.h>
+#include <link.h>
 #define INCLUDE_BACKTRACE
 #define STACKTYPE "Linux"
 #endif
@@ -385,6 +394,87 @@
 
 #define REPORTENV_PARAM		"-crashreportenv:"
 
+#ifdef LINUX
+
+typedef struct
+{
+    const char *name;
+    Elf32_Off offset;
+} dynamic_entry;
+
+static int
+callback(struct dl_phdr_info *info, size_t size, void *data)
+{
+    const Elf32_Phdr* pDynamic = NULL;
+
+    if (size == sizeof(struct dl_phdr_info))
+    {
+        int i;
+        for (i = 0; i < info->dlpi_phnum; ++i)
+        {
+            if (info->dlpi_phdr[i].p_type == PT_DYNAMIC)
+            {
+                pDynamic = &(info->dlpi_phdr[i]);
+                break;
+            }
+        }
+    }
+
+    if (pDynamic)
+    {
+        char buffer[100];
+        int len;
+        char exe[PATH_MAX];
+        const char *dsoname = info->dlpi_name;
+
+        dynamic_entry* entry = (dynamic_entry*)data;
+
+        if (strcmp(dsoname, "") == 0)
+        { 
+            snprintf(buffer, sizeof(buffer), "/proc/%d/exe", getpid());
+            if ((len = readlink(buffer, exe, PATH_MAX)) != -1)
+            {
+                exe[len] = '\0';
+                dsoname = exe;
+            }
+        }
+
+        if (strcmp(dsoname, entry->name) == 0)
+        {
+            entry->offset = pDynamic->p_offset;
+            return 1;
+        }
+    }
+    return 0;
+}
+
+/* Get the location of the .dynamic section offset for the given elf file.
+ * i.e. same as the "Offset" value shown for DYNAMIC from readelf -l foo 
+ *
+ * We want to know this value so that if the binaries have been modifed
+ * by prelink then we can still process the call stack on server side 
+ * by comparing this value to that of an "un-prelinked but known to be
+ * otherwise equivalent" version of those binaries and adjust the call 
+ * stack addresses by the differences between .dynamic addresses so as 
+ * to be able to map the prelinked addresses back to the unprelinked 
+ * addresses
+ *
+ * cmc at openoffice.org
+ */
+static Elf32_Off
+dynamic_section_offset(const char *name)
+{
+    dynamic_entry entry;
+
+    entry.name = name;
+    entry.offset = 0;
+
+    dl_iterate_phdr(callback, &entry);
+
+    return entry.offset;
+}
+#endif
+
 static int ReportCrash( int Signal )
 {
 #ifdef SAL_ENABLE_CRASH_REPORT
@@ -507,12 +597,12 @@
 					{
 						Dl_info dl_info;
 
-						fprintf( stackout, "0x%x:",
-							(unsigned int)stackframes[iFrame] );
+						fprintf( stackout, "0x%.*lx:", sizeof(char*)*2,
+							(unsigned long)stackframes[iFrame] );
 
-						fprintf( xmlout, "<errormail:StackInfo pos=\"%d\" ip=\"0x%x\"",
+						fprintf( xmlout, "<errormail:StackInfo pos=\"%d\" ip=\"0x%lx\"",
 							iFrame,
-							(unsigned int)stackframes[iFrame]
+							(unsigned long)stackframes[iFrame]
 							);
 
 						memset( &dl_info, 0, sizeof(dl_info) );
@@ -565,17 +655,26 @@
 
 							if ( dl_info.dli_fbase && dl_info.dli_fname )
 							{
-								fprintf( stackout, " %s + 0x%x",
+#ifdef LINUX
+								unsigned long dynamic_offset = dynamic_section_offset(dl_info.dli_fname);
+								fprintf( stackout, " 0x%.*lx:",
+									sizeof(char*) * 2,
+									dynamic_offset);
+#endif
+								fprintf( stackout, " %s + 0x%lx",
 									dl_info.dli_fname,
-									(char*)stackframes[iFrame] - (char*)dl_info.dli_fbase
+									(unsigned long)(stackframes[iFrame] - dl_info.dli_fbase)
 									);
 
-								fprintf( xmlout, " rel=\"0x%x\"", (char *)stackframes[iFrame] - (char *)dl_info.dli_fbase );
+								fprintf( xmlout, " rel=\"0x%lx\"", (unsigned long)(stackframes[iFrame] - dl_info.dli_fbase) );
 								if ( dli_fname )
 									fprintf( xmlout, " name=\"%s\"", dli_fname );
 
 								if ( dli_fdir )
 									fprintf( xmlout, " path=\"%s\"", dli_fdir );
+#ifdef LINUX
+								fprintf( xmlout, " dynamicoffset=\"0x%lx\"", dynamic_offset );
+#endif
 							}
 							else
 								fprintf( stackout, " ????????" );
@@ -584,13 +683,13 @@
 							{
 								fputs( " (", stackout );
 								fputs_xml( dl_info.dli_sname, stackout );
-								fprintf( stackout, " + 0x%x)", 
-									(char*)stackframes[iFrame] - (char*)dl_info.dli_saddr );
+								fprintf( stackout, " + 0x%lx)", 
+									(unsigned long)(stackframes[iFrame] - dl_info.dli_saddr) );
 
 								fputs( " ordinal=\"", xmlout );
 								fputs_xml( dl_info.dli_sname, xmlout );
-								fprintf( xmlout, "+0x%x\"", 
-									(char *)stackframes[iFrame] - (char *)dl_info.dli_saddr );
+								fprintf( xmlout, "+0x%lx\"", 
+									(unsigned long)(stackframes[iFrame] - dl_info.dli_saddr) );
 							}
 
 						}

openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch:
 psprint/inc/psprint/fontmanager.hxx        |   54 ++++++--
 psprint/source/fontmanager/fontcache.cxx   |   13 -
 psprint/source/fontmanager/fontconfig.cxx  |  135 +++++++++++++++++---
 psprint/source/fontmanager/fontmanager.cxx |    6 
 psprint/source/fontmanager/makefile.mk     |    3 
 psprint/util/makefile.mk                   |    5 
 source/glyphs/gcach_ftyp.cxx               |    0 
 vcl/inc/impfont.hxx                        |   47 ++++++-
 vcl/inc/outdev.hxx                         |    3 
 vcl/inc/outfont.hxx                        |    4 
 vcl/inc/salgdi.hxx                         |    2 
 vcl/inc/vclenum.hxx                        |   29 ++++
 vcl/source/gdi/outdev3.cxx                 |    8 +
 vcl/source/glyphs/gcach_ftyp.cxx           |  103 +++++++++++----
 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             |  191 +++++++++++++++++++++++++++++
 vcl/unx/source/gdi/xlfd_extd.cxx           |    3 
 vcl/win/inc/salgdi.h                       |    1 
 vcl/win/source/gdi/salgdi3.cxx             |    6 
 22 files changed, 537 insertions(+), 113 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	24 Aug 2006 19:46:10 -0000	1.13
+++ openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	16 Apr 2007 10:06:28 -0000	1.14
@@ -146,148 +146,6 @@
  FontMetric OutputDevice::GetFontMetric() const
  {
      DBG_TRACE( "OutputDevice::GetFontMetric()" );
-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
-@@ -41,6 +41,7 @@
- #include <impfont.hxx>
- #include <bitmap.hxx>
- #include <bmpacc.hxx>
-+#include <virdev.hxx>
- 
- #include <tools/poly.hxx>
- #include <basegfx/matrix/b2dhommatrix.hxx>
-@@ -594,9 +595,6 @@
-             aDFA.mbSubsettable= false;
-             aDFA.mbEmbeddable = false;
- 
--            aDFA.meEmbeddedBitmap = EMBEDDEDBITMAP_DONTKNOW;
--            aDFA.meAntiAlias = ANTIALIAS_DONTKNOW;
--
-             FT_Done_Face( aFaceFT );
-             AddFontFile( aCFileName, nFaceNum, ++mnNextFontId, aDFA, NULL );
-             ++nCount;
-@@ -676,6 +674,7 @@
- :   ServerFont( rFSD ),
-     mnPrioEmbedded(nDefaultPrioEmbedded),
-     mnPrioAntiAlias(nDefaultPrioAntiAlias),
-+    mnPrioAutoHint(nDefaultPrioAutoHint),
-     mpFontInfo( pFI ),
-     maFaceFT( NULL ),
-     maSizeFT( NULL ),
-@@ -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;
-+    }
-+
-+    ImplFontHints aHints;
-+    VirtualDevice vdev( 1 );
-+    vdev.ImplGetFontHints( pFI->GetFontAttributes(), mnWidth, aHints );
-+
-+    FontAutoHint eHint = aHints.GetUseAutoHint();
-+    if (eHint == AUTOHINT_DONTKNOW)
-+        eHint = mbUseGamma ? AUTOHINT_TRUE : AUTOHINT_FALSE;
- 
--    //static const int TT_CODEPAGE_RANGE_874  = (1L << 16); // Thai
--    //static const int TT_CODEPAGE_RANGE_932  = (1L << 17); // JIS/Japan
--    //static const int TT_CODEPAGE_RANGE_936  = (1L << 18); // Chinese: Simplified
--    //static const int TT_CODEPAGE_RANGE_949  = (1L << 19); // Korean Wansung
--    //static const int TT_CODEPAGE_RANGE_950  = (1L << 20); // Chinese: Traditional
--    //static const int TT_CODEPAGE_RANGE_1361 = (1L << 21); // Korean Johab
--    static const int TT_CODEPAGE_RANGES1_CJKT = 0x3F0000; // all of the above
--    const TT_OS2* pOs2 = (const TT_OS2*)FT_Get_Sfnt_Table( maFaceFT, ft_sfnt_os2 );
--    if ((pOs2) && (pOs2->ulCodePageRange1 & TT_CODEPAGE_RANGES1_CJKT )
--        && rFSD.mnHeight < 20)
--        mbUseGamma = true;
--    else
--        mbUseGamma = false;
--
--    if (mbUseGamma)
-+    if (eHint == AUTOHINT_TRUE)
-         mnLoadFlags |= FT_LOAD_FORCE_AUTOHINT;
- 
-     if( (mnSin != 0) && (mnCos != 0) ) // hinting for 0/90/180/270 degrees only
-         mnLoadFlags |= FT_LOAD_NO_HINTING;
-     mnLoadFlags |= FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; //#88334#
- 
--    if (mpFontInfo->DontUseAntiAlias())
--        mnPrioAntiAlias = 0;
--    if (mpFontInfo->DontUseEmbeddedBitmaps())
--        mnPrioEmbedded = 0;
-+    if (aHints.DontUseAntiAlias())
-+      mnPrioAntiAlias = 0;
-+    if (aHints.DontUseEmbeddedBitmaps())
-+      mnPrioEmbedded = 0;
-+    if (aHints.DontUseHinting())
-+      mnPrioAutoHint = 0;
- 
- #if (FTVERSION >= 2005) || defined(TT_CONFIG_OPTION_BYTECODE_INTERPRETER)
--    if( nDefaultPrioAutoHint <= 0 )
-+    if( mnPrioAutoHint <= 0 )
- #endif
-         mnLoadFlags |= FT_LOAD_NO_HINTING;
- 
--#ifdef FT_LOAD_TARGET_LIGHT
-+#if defined(FT_LOAD_TARGET_LIGHT) && defined(FT_LOAD_TARGET_NORMAL)
-     // enable "light hinting" if available
-     if( !(mnLoadFlags & FT_LOAD_NO_HINTING) && (nFTVERSION >= 2103))
--        mnLoadFlags |= FT_LOAD_TARGET_LIGHT;
-+    {
-+       switch (aHints.GetHintStyle())
-+       {
-+           default:
-+           case HINT_SLIGHT:
-+           case HINT_MEDIUM:
-+                mnLoadFlags |= FT_LOAD_TARGET_LIGHT;
-+                break;
-+           case HINT_FULL:
-+                mnLoadFlags |= FT_LOAD_TARGET_NORMAL;
-+                break;
-+           case HINT_NONE:
-+                break;
-+       }
-+    }
- #endif
- 
-     if( ((mnCos != 0) && (mnSin != 0)) || (mnPrioEmbedded <= 0) )
-@@ -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
--    if( (mnCos==0 || mnSin==0) && (nDefaultPrioAutoHint > 0) )
-+    if( (mnCos==0 || mnSin==0) && (mnPrioAutoHint > 0) )
-         nLoadFlags &= ~FT_LOAD_NO_HINTING;
- #endif
- 
--    if( mnPrioEmbedded <= nDefaultPrioAutoHint )
-+    if( mnPrioEmbedded <= mnPrioAutoHint )
-         nLoadFlags |= FT_LOAD_NO_BITMAP;
- 
-     FT_Error rc = -1;
-@@ -1446,7 +1470,7 @@
-     // autohinting in FT<=2.0.4 makes antialiased glyphs look worse
-     nLoadFlags |= FT_LOAD_NO_HINTING;
- #else
--    if( (nGlyphFlags & GF_UNHINTED) || (nDefaultPrioAutoHint < mnPrioAntiAlias) )
-+    if( (nGlyphFlags & GF_UNHINTED) || (mnPrioAutoHint < mnPrioAntiAlias) )
-         nLoadFlags |= FT_LOAD_NO_HINTING;
- #endif
- 
 diff -ru vcl/source/glyphs/gcach_ftyp.hxx vcl/source/glyphs/gcach_ftyp.hxx
 --- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.hxx	2006-05-04 08:55:40.000000000 +0100
 +++ openoffice.org/vcl/source/glyphs/gcach_ftyp.hxx	2006-05-04 14:53:16.000000000 +0100
@@ -903,3 +761,421 @@
      rInfo.m_aAliases.clear();
      for( ::std::list< int >::iterator it = pFont->m_aAliases.begin(); it != pFont->m_aAliases.end(); ++it )
          rInfo.m_aAliases.push_back( m_pAtoms->getString( ATOM_FAMILYNAME, *it ) );
+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
+Index: source/glyphs/gcach_ftyp.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.cxx,v
+retrieving revision 1.139.12.2
+diff -u -r1.139.12.2 gcach_ftyp.cxx
+--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx	24 Jan 2007 15:08:39 -0000	1.139.12.2
++++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx	13 Apr 2007 11:33:47 -0000
+@@ -44,6 +44,7 @@
+ #include <impfont.hxx>
+ #include <bitmap.hxx>
+ #include <bmpacc.hxx>
++#include <virdev.hxx>
+ 
+ #include <tools/poly.hxx>
+ #include <basegfx/matrix/b2dhommatrix.hxx>
+@@ -614,9 +617,6 @@
+             aDFA.mbSubsettable= false;
+             aDFA.mbEmbeddable = false;
+ 
+-            aDFA.meEmbeddedBitmap = EMBEDDEDBITMAP_DONTKNOW;
+-            aDFA.meAntiAlias = ANTIALIAS_DONTKNOW;
+-
+             FT_Done_Face( aFaceFT );
+             AddFontFile( aCFileName, nFaceNum, ++mnNextFontId, aDFA, NULL );
+             ++nCount;
+@@ -696,6 +696,7 @@
+ :   ServerFont( rFSD ),
+     mnPrioEmbedded(nDefaultPrioEmbedded),
+     mnPrioAntiAlias(nDefaultPrioAntiAlias),
++    mnPrioAutoHint(nDefaultPrioAutoHint),
+     mpFontInfo( pFI ),
+     maFaceFT( NULL ),
+     maSizeFT( NULL ),
+@@ -825,42 +826,84 @@
+ 
+     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;
++    }
++
++    ImplFontHints aHints;
++    VirtualDevice vdev( 1 );
++    vdev.ImplGetFontHints( pFI->GetFontAttributes(), mnWidth, aHints );
++
++    FontAutoHint eHint = aHints.GetUseAutoHint();
++    if (eHint == AUTOHINT_DONTKNOW)
++        eHint = mbUseGamma ? AUTOHINT_TRUE : AUTOHINT_FALSE;
+ 
+-    //static const int TT_CODEPAGE_RANGE_874  = (1L << 16); // Thai
+-    //static const int TT_CODEPAGE_RANGE_932  = (1L << 17); // JIS/Japan
+-    //static const int TT_CODEPAGE_RANGE_936  = (1L << 18); // Chinese: Simplified
+-    //static const int TT_CODEPAGE_RANGE_949  = (1L << 19); // Korean Wansung
+-    //static const int TT_CODEPAGE_RANGE_950  = (1L << 20); // Chinese: Traditional
+-    //static const int TT_CODEPAGE_RANGE_1361 = (1L << 21); // Korean Johab
+-    static const int TT_CODEPAGE_RANGES1_CJKT = 0x3F0000; // all of the above
+-    const TT_OS2* pOs2 = (const TT_OS2*)FT_Get_Sfnt_Table( maFaceFT, ft_sfnt_os2 );
+-    if ((pOs2) && (pOs2->ulCodePageRange1 & TT_CODEPAGE_RANGES1_CJKT )
+-        && rFSD.mnHeight < 20)
+-        mbUseGamma = true;
+-    else
+-        mbUseGamma = false;
+-
+-    if (mbUseGamma)
++    if (eHint == AUTOHINT_TRUE)
+         mnLoadFlags |= FT_LOAD_FORCE_AUTOHINT;
+ 
+     if( (mnSin != 0) && (mnCos != 0) ) // hinting for 0/90/180/270 degrees only
+         mnLoadFlags |= FT_LOAD_NO_HINTING;
+     mnLoadFlags |= FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; //#88334#
+ 
+-    if (mpFontInfo->DontUseAntiAlias())
+-        mnPrioAntiAlias = 0;
+-    if (mpFontInfo->DontUseEmbeddedBitmaps())
+-        mnPrioEmbedded = 0;
++    if (aHints.DontUseAntiAlias())
++      mnPrioAntiAlias = 0;
++    if (aHints.DontUseEmbeddedBitmaps())
++      mnPrioEmbedded = 0;
++    if (aHints.DontUseHinting())
++      mnPrioAutoHint = 0;
+ 
+ #if (FTVERSION >= 2005) || defined(TT_CONFIG_OPTION_BYTECODE_INTERPRETER)
+-    if( nDefaultPrioAutoHint <= 0 )
++    if( mnPrioAutoHint <= 0 )
+ #endif
+         mnLoadFlags |= FT_LOAD_NO_HINTING;
+ 
+-#ifdef FT_LOAD_TARGET_LIGHT
+-    // enable "light hinting" if available
++#if defined(FT_LOAD_TARGET_LIGHT) && defined(FT_LOAD_TARGET_NORMAL)
+     if( !(mnLoadFlags & FT_LOAD_NO_HINTING) && (nFTVERSION >= 2103))
+-        mnLoadFlags |= FT_LOAD_TARGET_LIGHT;
++    {
++       mnLoadFlags |= FT_LOAD_TARGET_NORMAL;
++       switch (aHints.GetHintStyle())
++       {
++           case HINT_NONE:
++                mnLoadFlags |= FT_LOAD_NO_HINTING;
++                break;
++           case HINT_SLIGHT:
++                mnLoadFlags |= FT_LOAD_TARGET_LIGHT;
++                break;
++           case HINT_MEDIUM:
++                break;
++           case HINT_FULL:
++           default:
++    		switch (aHints.GetSubPixel())
++		{
++		        case SUBPIXEL_NONE:
++		            break;
++		        default:
++		        case SUBPIXEL_UNKNOWN:
++		        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;
++		}
++                break;
++       }
++    }
++
+ #endif
+ 
+     if( ((mnCos != 0) && (mnSin != 0)) || (mnPrioEmbedded <= 0) )
+@@ -1192,13 +1239,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 )
+@@ -1329,11 +1378,11 @@
+ #if (FTVERSION >= 2002)
+     // for 0/90/180/270 degree fonts enable autohinting even if not advisable
+     // non-hinted and non-antialiased bitmaps just look too ugly
+-    if( (mnCos==0 || mnSin==0) && (nDefaultPrioAutoHint > 0) )
++    if( (mnCos==0 || mnSin==0) && (mnPrioAutoHint > 0) )
+         nLoadFlags &= ~FT_LOAD_NO_HINTING;
+ #endif
+ 
+-    if( mnPrioEmbedded <= nDefaultPrioAutoHint )
++    if( mnPrioEmbedded <= mnPrioAutoHint )
+         nLoadFlags |= FT_LOAD_NO_BITMAP;
+ 
+     FT_Error rc = -1;
+@@ -1484,7 +1533,7 @@
+     // autohinting in FT<=2.0.4 makes antialiased glyphs look worse
+     nLoadFlags |= FT_LOAD_NO_HINTING;
+ #else
+-    if( (nGlyphFlags & GF_UNHINTED) || (nDefaultPrioAutoHint < mnPrioAntiAlias) )
++    if( (nGlyphFlags & GF_UNHINTED) || (mnPrioAutoHint < mnPrioAntiAlias) )
+         nLoadFlags |= FT_LOAD_NO_HINTING;
+ #endif
+ 
+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.1164
retrieving revision 1.1165
diff -u -r1.1164 -r1.1165
--- openoffice.org.spec	12 Apr 2007 17:46:18 -0000	1.1164
+++ openoffice.org.spec	16 Apr 2007 10:06:28 -0000	1.1165
@@ -1,6 +1,6 @@
 %define oootag OOF680
 %define ooomilestone 14
-%define rh_rpm_release 5
+%define rh_rpm_release 6
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -86,50 +86,50 @@
 Patch27: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
 Patch28: workspace.fpicker6.patch
 Patch29: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch30: openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.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: ooobuild.VBAObjects.patch
-Patch35: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch36: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
-Patch37: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-Patch38: pseudoworkspace.valgrind1.patch
-Patch39: workspace.thbpp6.patch
-Patch40: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch41: openoffice.org-2.0.4.rh217065.syncbackspace.patch
-Patch42: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
-Patch43: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
-Patch44: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch45: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
-Patch46: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch47: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
-Patch48: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch
-Patch49: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch50: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
-Patch51: openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch
-Patch52: workspace.tl37.patch
-Patch53: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch54: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch
-Patch55: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
-Patch56: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch
-Patch57: workspace.cmcfixes32.patch
-Patch58: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch59: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
-Patch60: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch61: openoffice.org-2.2.0.ooo74255.vcl.depth.mismatch.patch
-Patch62: openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch
-Patch63: openoffice.org-2.2.0.ooo74401.basctl.boost.patch
-Patch64: workspace.configrefactor01.patch
-Patch65: workspace.sixtyfour11.patch
-Patch66: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch67: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch68: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
-Patch69: openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch
-Patch70: openoffice.org-2.2.0.ooo75329.xdguserdir.patch
-Patch71: openoffice.org-2.2.0.rh232389.tango.patch
-Patch72: openoffice.org-2.2.0.ooo53397.linkopt.patch
-Patch73: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.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: ooobuild.VBAObjects.patch
+Patch34: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch35: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
+Patch36: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+Patch37: pseudoworkspace.valgrind1.patch
+Patch38: workspace.thbpp6.patch
+Patch39: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch40: openoffice.org-2.0.4.rh217065.syncbackspace.patch
+Patch41: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
+Patch42: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
+Patch43: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch44: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
+Patch45: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch46: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
+Patch47: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch
+Patch48: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch49: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
+Patch50: openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch
+Patch51: workspace.tl37.patch
+Patch52: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
+Patch53: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch
+Patch54: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
+Patch55: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch
+Patch56: workspace.cmcfixes32.patch
+Patch57: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch58: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
+Patch59: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch60: openoffice.org-2.2.0.ooo74255.vcl.depth.mismatch.patch
+Patch61: openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch
+Patch62: openoffice.org-2.2.0.ooo74401.basctl.boost.patch
+Patch63: workspace.configrefactor01.patch
+Patch64: workspace.sixtyfour11.patch
+Patch65: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch66: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch67: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
+Patch68: openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch
+Patch69: openoffice.org-2.2.0.ooo75329.xdguserdir.patch
+Patch70: openoffice.org-2.2.0.rh232389.tango.patch
+Patch71: openoffice.org-2.2.0.ooo53397.linkopt.patch
+Patch72: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
+Patch73: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1007,52 +1007,52 @@
 %patch27 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
 %patch28 -p1 -b .workspace.fpicker6.patch
 %patch29 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch30 -p1 -b .ooo59127.vcl.honourcairofont.patch
-%patch31 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch32 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
-%patch33 -p1 -b .rh187919.gtkunderkde.patch
-%patch34 -p0 -b .ooobuild.VBAObjects.patch
-%patch35 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch36 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
-%patch37 -p1 -b .ooo69051.vcl.singlekeypress.patch
-%patch38 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch39 -p1 -b .workspace.thbpp6.patch
-%patch40 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch41 -p1 -b .rh217065.syncbackspace.patch
-%patch42 -p1 -b .ooo70155.fasterhelplinking.patch
-%patch43 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch
-%patch44 -p1 -b .ooo65491.psprint.enablenups.patch
-%patch45 -p1 -b .ooo61812.svx.a11ycrash.patch
-cat %{PATCH46} >> svtools/source/dialogs/localize.sdf
-%patch47  -p1 -b .ooo72014.officecfg.malayammenu.patch
-%patch48 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch
-%patch49 -p1 -b .rh217269.officecfg.nosequencecheck.patch
-%patch50 -p1 -b .ooo72129.vcl.fontglyphindex.patch
-%patch51 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch52 -p1 -b .tl37.patch
-%patch53 -p1 -b .ooo73201.sw.a11yloadcrash.patch
-%patch54 -p1 -b .ooo73481.svx.longnotint32.patch
-%patch55 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
-%patch56 -p1 -b .ooo73866.javaunohelper.parallel.patch
-%patch57 -p1 -b .workspace.cmcfixes32.patch
-%patch58 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch59 -p1 -b .ooo73974.bridges.doublereturn.patch
-%patch60 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch61 -p1 -b .ooo74255.vcl.depth.mismatch.patch
-%patch62 -p1 -b .ooo74451.sw.typemismatch.patch
-%patch63 -p1 -b .ooo74401.basctl.boost.patch
-%patch64 -p1 -b .workspace.configrefactor01.patch
-%patch65 -p1 -b .workspace.sixtyfour11.patch
-%patch66 -p1 -b .ooo68717.gstreamer.video.patch
-%patch67 -p1 -b .ooo63159.sal.dtype.patch
-%patch68 -p1 -b .ooo75167.framework.workspacerestore.patch
-%patch69 -p1 -b .ooo75190.shell.newrecentlyused.patch
-%patch70 -p1 -b .ooo75329.xdguserdir.patch
-%patch71 -p1 -b .rh232389.tango.patch
+%patch30 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch31 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
+%patch32 -p1 -b .rh187919.gtkunderkde.patch
+%patch33 -p0 -b .ooobuild.VBAObjects.patch
+%patch34 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch35 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
+%patch36 -p1 -b .ooo69051.vcl.singlekeypress.patch
+%patch37 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch38 -p1 -b .workspace.thbpp6.patch
+%patch39 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch40 -p1 -b .rh217065.syncbackspace.patch
+%patch41 -p1 -b .ooo70155.fasterhelplinking.patch
+%patch42 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch
+%patch43 -p1 -b .ooo65491.psprint.enablenups.patch
+%patch44 -p1 -b .ooo61812.svx.a11ycrash.patch
+cat %{PATCH45} >> svtools/source/dialogs/localize.sdf
+%patch46  -p1 -b .ooo72014.officecfg.malayammenu.patch
+%patch47 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch
+%patch48 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch49 -p1 -b .ooo72129.vcl.fontglyphindex.patch
+%patch50 -p1 -b .gccXXXXX.basegfx.crash.patch
+%patch51 -p1 -b .tl37.patch
+%patch52 -p1 -b .ooo73201.sw.a11yloadcrash.patch
+%patch53 -p1 -b .ooo73481.svx.longnotint32.patch
+%patch54 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
+%patch55 -p1 -b .ooo73866.javaunohelper.parallel.patch
+%patch56 -p1 -b .workspace.cmcfixes32.patch
+%patch57 -p1 -b .ooo73863.vcl.imcommit.patch
+%patch58 -p1 -b .ooo73974.bridges.doublereturn.patch
+%patch59 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch60 -p1 -b .ooo74255.vcl.depth.mismatch.patch
+%patch61 -p1 -b .ooo74451.sw.typemismatch.patch
+%patch62 -p1 -b .ooo74401.basctl.boost.patch
+%patch63 -p1 -b .workspace.configrefactor01.patch
+%patch64 -p1 -b .workspace.sixtyfour11.patch
+%patch65 -p1 -b .ooo68717.gstreamer.video.patch
+%patch66 -p1 -b .ooo63159.sal.dtype.patch
+%patch67 -p1 -b .ooo75167.framework.workspacerestore.patch
+%patch68 -p1 -b .ooo75190.shell.newrecentlyused.patch
+%patch69 -p1 -b .ooo75329.xdguserdir.patch
+%patch70 -p1 -b .rh232389.tango.patch
 %if %{linkopt}
-%patch72 -p1 -b .ooo53397.linkopt.patch
+%patch71 -p1 -b .ooo53397.linkopt.patch
 %endif
-%patch73 -p1 -b .ooo75790.sc.pa-IN.translate.patch
+%patch72 -p1 -b .ooo75790.sc.pa-IN.translate.patch
+%patch73 -p1 -b .ooo76393.sal.dynamicsection.patch
 
 cp %{SOURCE1} extras/source/database/evolocal.odb
 
@@ -2627,6 +2627,12 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Fri Apr 13 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.6
+- merge openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch
+- Resolves: rhbz#235834 update subpixel logic
+- add openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch for
+  better offline debugging support
+
 * Wed Apr 11 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.5
 - Resolves: rhbz#235828 INIFILE optimization breaks addins
 - Resolves: rhbz#235325 crash on launch of x86_64 soffice.bin


--- openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 16 10:07:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 06:07:50 -0400
Subject: rpms/openoffice.org/FC-6
	openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch, NONE,
	1.1 openoffice.org.spec, 1.940, 1.941
Message-ID: <200704161007.l3GA7o1F008772@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch 
Log Message:
openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch

openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch:
 osl/unx/signal.c     |    0 
 sal/osl/unx/signal.c |  113 ++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 102 insertions(+), 11 deletions(-)

--- NEW FILE openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch ---
Index: osl/unx/signal.c
===================================================================
RCS file: /cvs/porting/sal/osl/unx/signal.c,v
retrieving revision 1.32.14.1
diff -u -r1.32.14.1 signal.c
--- openoffice.org.orig/sal/osl/unx/signal.c	19 Jan 2007 11:43:41 -0000	1.32.14.1
+++ openoffice.org/sal/osl/unx/signal.c	15 Apr 2007 15:55:35 -0000
@@ -41,6 +41,7 @@
 
 #ifdef LINUX
 #include <execinfo.h>
+#include <link.h>
 #define INCLUDE_BACKTRACE
 #define STACKTYPE "Linux"
 #endif
@@ -385,6 +394,87 @@
 
 #define REPORTENV_PARAM		"-crashreportenv:"
 
+#ifdef LINUX
+
+typedef struct
+{
+    const char *name;
+    Elf32_Off offset;
+} dynamic_entry;
+
+static int
+callback(struct dl_phdr_info *info, size_t size, void *data)
+{
+    const Elf32_Phdr* pDynamic = NULL;
+
+    if (size == sizeof(struct dl_phdr_info))
+    {
+        int i;
+        for (i = 0; i < info->dlpi_phnum; ++i)
+        {
+            if (info->dlpi_phdr[i].p_type == PT_DYNAMIC)
+            {
+                pDynamic = &(info->dlpi_phdr[i]);
+                break;
+            }
+        }
+    }
+
+    if (pDynamic)
+    {
+        char buffer[100];
+        int len;
+        char exe[PATH_MAX];
+        const char *dsoname = info->dlpi_name;
+
+        dynamic_entry* entry = (dynamic_entry*)data;
+
+        if (strcmp(dsoname, "") == 0)
+        { 
+            snprintf(buffer, sizeof(buffer), "/proc/%d/exe", getpid());
+            if ((len = readlink(buffer, exe, PATH_MAX)) != -1)
+            {
+                exe[len] = '\0';
+                dsoname = exe;
+            }
+        }
+
+        if (strcmp(dsoname, entry->name) == 0)
+        {
+            entry->offset = pDynamic->p_offset;
+            return 1;
+        }
+    }
+    return 0;
+}
+
+/* Get the location of the .dynamic section offset for the given elf file.
+ * i.e. same as the "Offset" value shown for DYNAMIC from readelf -l foo 
+ *
+ * We want to know this value so that if the binaries have been modifed
+ * by prelink then we can still process the call stack on server side 
+ * by comparing this value to that of an "un-prelinked but known to be
+ * otherwise equivalent" version of those binaries and adjust the call 
+ * stack addresses by the differences between .dynamic addresses so as 
+ * to be able to map the prelinked addresses back to the unprelinked 
+ * addresses
+ *
+ * cmc at openoffice.org
+ */
+static Elf32_Off
+dynamic_section_offset(const char *name)
+{
+    dynamic_entry entry;
+
+    entry.name = name;
+    entry.offset = 0;
+
+    dl_iterate_phdr(callback, &entry);
+
+    return entry.offset;
+}
+#endif
+
 static int ReportCrash( int Signal )
 {
 #ifdef SAL_ENABLE_CRASH_REPORT
@@ -507,12 +597,12 @@
 					{
 						Dl_info dl_info;
 
-						fprintf( stackout, "0x%x:",
-							(unsigned int)stackframes[iFrame] );
+						fprintf( stackout, "0x%.*lx:", sizeof(char*)*2,
+							(unsigned long)stackframes[iFrame] );
 
-						fprintf( xmlout, "<errormail:StackInfo pos=\"%d\" ip=\"0x%x\"",
+						fprintf( xmlout, "<errormail:StackInfo pos=\"%d\" ip=\"0x%lx\"",
 							iFrame,
-							(unsigned int)stackframes[iFrame]
+							(unsigned long)stackframes[iFrame]
 							);
 
 						memset( &dl_info, 0, sizeof(dl_info) );
@@ -565,17 +655,26 @@
 
 							if ( dl_info.dli_fbase && dl_info.dli_fname )
 							{
-								fprintf( stackout, " %s + 0x%x",
+#ifdef LINUX
+								unsigned long dynamic_offset = dynamic_section_offset(dl_info.dli_fname);
+								fprintf( stackout, " 0x%.*lx:",
+									sizeof(char*) * 2,
+									dynamic_offset);
+#endif
+								fprintf( stackout, " %s + 0x%lx",
 									dl_info.dli_fname,
-									(char*)stackframes[iFrame] - (char*)dl_info.dli_fbase
+									(unsigned long)(stackframes[iFrame] - dl_info.dli_fbase)
 									);
 
-								fprintf( xmlout, " rel=\"0x%x\"", (char *)stackframes[iFrame] - (char *)dl_info.dli_fbase );
+								fprintf( xmlout, " rel=\"0x%lx\"", (unsigned long)(stackframes[iFrame] - dl_info.dli_fbase) );
 								if ( dli_fname )
 									fprintf( xmlout, " name=\"%s\"", dli_fname );
 
 								if ( dli_fdir )
 									fprintf( xmlout, " path=\"%s\"", dli_fdir );
+#ifdef LINUX
+								fprintf( xmlout, " dynamicoffset=\"0x%lx\"", dynamic_offset );
+#endif
 							}
 							else
 								fprintf( stackout, " ????????" );
@@ -584,13 +683,13 @@
 							{
 								fputs( " (", stackout );
 								fputs_xml( dl_info.dli_sname, stackout );
-								fprintf( stackout, " + 0x%x)", 
-									(char*)stackframes[iFrame] - (char*)dl_info.dli_saddr );
+								fprintf( stackout, " + 0x%lx)", 
+									(unsigned long)(stackframes[iFrame] - dl_info.dli_saddr) );
 
 								fputs( " ordinal=\"", xmlout );
 								fputs_xml( dl_info.dli_sname, xmlout );
-								fprintf( xmlout, "+0x%x\"", 
-									(char *)stackframes[iFrame] - (char *)dl_info.dli_saddr );
+								fprintf( xmlout, "+0x%lx\"", 
+									(unsigned long)(stackframes[iFrame] - dl_info.dli_saddr) );
 							}
 
 						}


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v
retrieving revision 1.940
retrieving revision 1.941
diff -u -r1.940 -r1.941
--- openoffice.org.spec	13 Apr 2007 12:04:40 -0000	1.940
+++ openoffice.org.spec	16 Apr 2007 10:07:48 -0000	1.941
@@ -1,6 +1,6 @@
 %define oootag OOD680
 %define ooomilestone 5
-%define rh_rpm_release 5.20
+%define rh_rpm_release 5.21
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -163,6 +163,7 @@
 Patch95: workspace.sixtyfour11.patch
 Patch96: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
 Patch97: openoffice.org-cairoupdate.patch
+Patch98: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1060,6 +1061,7 @@
 %patch95 -p1 -b .workspace.sixtyfour11.patch
 %patch96 -p1 -b .ooo75167.framework.workspacerestore.patch
 %patch97 -p1 -b .openoffice.org-cairoupdate.patch
+%patch98 -p1 -b .ooo76393.sal.dynamicsection.patch
 
 tar xzf %{SOURCE1}
 
@@ -2589,6 +2591,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Mon Apr 16 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.21
+- add openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch for better
+  offline debugging support
+
 * Fri Apr 13 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.20
 - Resolves: rhbz#235834 update subpixel logic
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 10:19:58 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 06:19:58 -0400
Subject: rpms/autofs/FC-6 autofs-5.0.1-cmd-global-options.patch, NONE,
	1.1 autofs-5.0.1-conf-append-global.patch, NONE,
	1.1 autofs.spec, 1.176, 1.177
Message-ID: <200704161019.l3GAJww0008937@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-cmd-global-options.patch 
	autofs-5.0.1-conf-append-global.patch 
Log Message:
* Mon Apr 16 2007 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc3.27
- add configuration variable to control appending of global options (bz 214684).
- add command option to set a global mount options string (bz 214684).


autofs-5.0.1-cmd-global-options.patch:
 daemon/automount.c  |   19 ++++++++++++++++++-
 man/automount.8.in  |    6 ++++++
 modules/parse_sun.c |   24 ++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 1 deletion(-)

--- NEW FILE autofs-5.0.1-cmd-global-options.patch ---
--- autofs-5.0.1/modules/parse_sun.c.cmd-global-options	2007-04-16 17:46:58.000000000 +0800
+++ autofs-5.0.1/modules/parse_sun.c	2007-04-16 17:47:48.000000000 +0800
@@ -42,6 +42,8 @@ int parse_version = AUTOFS_PARSE_VERSION
 static struct mount_mod *mount_nfs = NULL;
 static int init_ctr = 0;
 
+extern const char *global_options;
+
 struct parse_context {
 	char *optstr;		/* Mount options */
 	char *macros;		/* Map wide macro defines */
@@ -65,6 +67,8 @@ static struct parse_context default_cont
 	1			/* Do slashify_colons */
 };
 
+static char *concat_options(char *left, char *right);
+
 /* Free all storage associated with this context */
 static void kill_context(struct parse_context *ctxt)
 {
@@ -264,6 +268,7 @@ int parse_init(int argc, const char *con
 	const char *xopt;
 	int optlen, len, offset;
 	int i, bval;
+	unsigned int append_options;
 
 	/* Get processor information for predefined escapes */
 
@@ -392,6 +397,25 @@ int parse_init(int argc, const char *con
 		}
 	}
 
+	if (global_options) {
+		append_options = defaults_get_append_options();
+		if (append_options) {
+			char *tmp = concat_options(global_options, ctxt->optstr);
+			if (!tmp) {
+				char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+				error(LOGOPT_ANY, MODPREFIX "concat_options: %s", estr);
+			} else
+				ctxt->optstr = tmp;
+		} else {
+			if (!ctxt->optstr)
+				ctxt->optstr = strdup(global_options);
+			if (!ctxt->optstr) {
+				char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+				warn(LOGOPT_ANY, MODPREFIX "%s", estr);
+			}
+		}
+	}
+
 	debug(LOGOPT_NONE,
 	      MODPREFIX "init gathered global options: %s", ctxt->optstr);
 
--- autofs-5.0.1/daemon/automount.c.cmd-global-options	2007-04-16 17:46:58.000000000 +0800
+++ autofs-5.0.1/daemon/automount.c	2007-04-16 17:55:04.000000000 +0800
@@ -46,6 +46,8 @@ const char *libdir = AUTOFS_LIB_DIR;	/* 
 const char *mapdir = AUTOFS_MAP_DIR;	/* Location of mount maps */
 const char *confdir = AUTOFS_CONF_DIR;	/* Location of autofs config file */
 
+const char *global_options;		/* Global option, from command line */
+
 static char *pid_file = NULL;	/* File in which to keep pid */
 static int start_pipefd[2];
 static int st_stat = 0;
@@ -1342,6 +1344,8 @@ static void usage(void)
 		"	-d --debug	log debuging info\n"
 		"	-D --define	define global macro variable\n"
 		/*"	-f --foreground do not fork into background\n" */
+		"	-O --global-options\n"
+		"			specify global mount options\n"
 		"	-V --version	print version, build config and exit\n"
 		, program);
 }
@@ -1427,7 +1431,7 @@ int main(int argc, char *argv[])
 {
 	int res, opt, status;
 	unsigned ghost, logging;
-	unsigned foreground;
+	unsigned foreground, have_global_options;
 	time_t timeout;
 	time_t age = time(NULL);
 	sigset_t allsigs;
@@ -1440,6 +1444,7 @@ int main(int argc, char *argv[])
 		{"debug", 0, 0, 'd'},
 		{"define", 1, 0, 'D'},
 		{"foreground", 0, 0, 'f'},
+		{"global-options", 1, 0, 'O'},
 		{"version", 0, 0, 'V'},
 		{0, 0, 0, 0}
 	};
@@ -1454,6 +1459,8 @@ int main(int argc, char *argv[])
 	timeout = defaults_get_timeout();
 	ghost = defaults_get_browse_mode();
 	logging = defaults_get_logging();
+	global_options = NULL;
+	have_global_options = 0;
 	foreground = 0;
 
 	opterr = 0;
@@ -1491,6 +1498,16 @@ int main(int argc, char *argv[])
 			show_build_info();
 			exit(0);
 
+		case 'O':
+			if (!have_global_options) {
+				global_options = strdup(optarg);
+				have_global_options = 1;
+				break;
+			}
+			printf("%s: global options already specified.\n",
+				program);
+			break;
+
 		case '?':
 		case ':':
 			printf("%s: Ambiguous or unknown options\n", program);
--- autofs-5.0.1/man/automount.8.in.cmd-global-options	2007-01-04 12:33:40.000000000 +0900
+++ autofs-5.0.1/man/automount.8.in	2007-04-16 17:55:58.000000000 +0800
@@ -49,6 +49,12 @@ Define a global macro substitution varia
 are over-ridden macro definitions of the same name specified in
 mount entries.
 .TP
+.I "\-O, \-\-global-options"
+Allows the specification of global mount options used for all master
+map entries. These options will either replace or be appened to options
+given in a master map entry depending on the DEFAULT_APPEND_OPTIONS configuration
+setting.
+.TP
 .I "\-V, \-\-version"
 Display the version number, then exit.
 .SH ARGUMENTS

autofs-5.0.1-conf-append-global.patch:
 include/defaults.h             |    2 ++
 lib/defaults.c                 |   13 +++++++++++++
 modules/parse_sun.c            |   27 ++++++++++++++++++++++-----
 redhat/autofs.sysconfig.in     |    4 ++++
 samples/autofs.conf.default.in |    4 ++++
 5 files changed, 45 insertions(+), 5 deletions(-)

--- NEW FILE autofs-5.0.1-conf-append-global.patch ---
--- autofs-5.0.1/redhat/autofs.sysconfig.in.conf-append-global.patch	2007-01-04 12:33:40.000000000 +0900
+++ autofs-5.0.1/redhat/autofs.sysconfig.in	2007-04-16 17:40:04.000000000 +0800
@@ -13,6 +13,10 @@ DEFAULT_TIMEOUT=300
 #
 DEFAULT_BROWSE_MODE="no"
 #
+# DEFAULT_APPEND_OPTIONS - append to global options instead of replace.
+#
+#DEFAULT_APPEND_OPTIONS="yes"
+#
 # DEFAULT_LOGGING - set default log level "none", "verbose" or "debug"
 #
 #DEFAULT_LOGGING="none"
--- autofs-5.0.1/include/defaults.h.conf-append-global.patch	2007-01-04 12:33:40.000000000 +0900
+++ autofs-5.0.1/include/defaults.h	2007-04-16 17:35:35.000000000 +0800
@@ -34,6 +34,7 @@
 #define DEFAULT_ENTRY_ATTR		"cn"
 #define DEFAULT_VALUE_ATTR		"nisMapEntry"
 
+#define DEFAULT_APPEND_OPTIONS		1
 #define DEFAULT_AUTH_CONF_FILE		AUTOFS_MAP_DIR "/autofs_ldap_auth.conf"
 
 unsigned int defaults_read_config(void);
@@ -47,6 +48,7 @@ const char *defaults_get_entry_obj_class
 const char *defaults_get_map_attr(void);
 const char *defaults_get_entry_attr(void);
 const char *defaults_get_value_attr(void);
+unsigned int defaults_get_append_options(void);
 const char *defaults_get_auth_conf_file(void);
 
 #endif
--- autofs-5.0.1/modules/parse_sun.c.conf-append-global.patch	2007-04-16 17:34:19.000000000 +0800
+++ autofs-5.0.1/modules/parse_sun.c	2007-04-16 17:35:35.000000000 +0800
@@ -140,7 +140,7 @@ int expandsunent(const char *src, char *
 			 * re preserved, we need to escape them here.
 			 */
 			if (strchr(key, ' ')) {
-				char *keyp = key;
+				const char *keyp = key;
 				while (*keyp) {
 					if (isspace(*keyp)) {
 						if (dst) {
@@ -952,6 +952,7 @@ int parse_mount(struct autofs_point *ap,
 	int mapent_len, rv = 0;
 	int optlen, cur_state;
 	int slashify = ctxt->slashify_colons;
+	unsigned int append_options;
 
 	source = ap->entry->current;
 	ap->entry->current = NULL;
@@ -997,6 +998,7 @@ int parse_mount(struct autofs_point *ap,
 
 	debug(ap->logopt, MODPREFIX "expanded entry: %s", pmapent);
 
+	append_options = defaults_get_append_options();
 	options = strdup(ctxt->optstr ? ctxt->optstr : "");
 	if (!options) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
@@ -1009,10 +1011,10 @@ int parse_mount(struct autofs_point *ap,
 
 	/* Deal with 0 or more options */
 	if (*p == '-') {
-		char *mnt_options = NULL;
+		char *tmp, *mnt_options = NULL;
 
 		do {
-			char *tmp, *noptions = NULL;
+			char *noptions = NULL;
 
 			p = parse_options(p, &noptions, ap->logopt);
 			tmp = concat_options(mnt_options, noptions);
@@ -1032,10 +1034,25 @@ int parse_mount(struct autofs_point *ap,
 			p = skipspace(p);
 		} while (*p == '-');
 
-		if (options)
+		if (options && !append_options) {
 			free(options);
+			options = NULL;
+		}
 
-		options = mnt_options;
+		if (append_options) {
+			tmp = concat_options(options, mnt_options);
+			if (!tmp) {
+				char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+				error(ap->logopt, MODPREFIX "concat_options: %s", estr);
+				if (options)
+					free(options);
+				if (mnt_options)
+					free(mnt_options);
+				return 1;
+			}
+			options = tmp;
+		} else
+			options = mnt_options;
 	}
 
 	debug(ap->logopt, MODPREFIX "gathered options: %s", options);
--- autofs-5.0.1/samples/autofs.conf.default.in.conf-append-global.patch	2007-01-04 12:33:40.000000000 +0900
+++ autofs-5.0.1/samples/autofs.conf.default.in	2007-04-16 17:41:31.000000000 +0800
@@ -13,6 +13,10 @@ DEFAULT_TIMEOUT=300
 #
 DEFAULT_BROWSE_MODE="no"
 #
+# DEFAULT_APPEND_OPTIONS - append to global options instead of replace.
+#
+#DEFAULT_APPEND_OPTIONS="yes"
+#
 # DEFAULT_LOGGING - set default log level "none", "verbose" or "debug"
 #
 #DEFAULT_LOGGING="none"
--- autofs-5.0.1/lib/defaults.c.conf-append-global.patch	2007-01-04 12:33:40.000000000 +0900
+++ autofs-5.0.1/lib/defaults.c	2007-04-16 17:37:54.000000000 +0800
@@ -37,6 +37,7 @@
 #define ENV_NAME_ENTRY_ATTR		"DEFAULT_ENTRY_ATTRIBUTE"
 #define ENV_NAME_VALUE_ATTR		"DEFAULT_VALUE_ATTRIBUTE"
 
+#define ENV_APPEND_OPTIONS		"DEFAULT_APPEND_OPTIONS"
 #define ENV_AUTH_CONF_FILE		"DEFAULT_AUTH_CONF_FILE"
 
 static const char *default_master_map_name = DEFAULT_MASTER_MAP_NAME;
@@ -168,6 +169,7 @@ unsigned int defaults_read_config(void)
 		    !strcasecmp(res, ENV_NAME_MAP_ATTR) ||
 		    !strcasecmp(res, ENV_NAME_ENTRY_ATTR) ||
 		    !strcasecmp(res, ENV_NAME_VALUE_ATTR) ||
+		    !strcasecmp(res, ENV_APPEND_OPTIONS) ||
 		    !strcasecmp(res, ENV_AUTH_CONF_FILE)) {
 			ret = setenv(res, value, 0);
 			if (ret)
@@ -311,6 +313,17 @@ const char *defaults_get_value_attr(void
 	return (const char *) va;
 }
 
+unsigned int defaults_get_append_options(void)
+{
+	int res;
+
+	res = get_env_yesno(ENV_APPEND_OPTIONS);
+	if (res < 0)
+		res = DEFAULT_APPEND_OPTIONS;
+
+	return res;
+}
+
 const char *defaults_get_auth_conf_file(void)
 {
 	char *cf;


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-6/autofs.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- autofs.spec	8 Mar 2007 06:40:55 -0000	1.176
+++ autofs.spec	16 Apr 2007 10:19:56 -0000	1.177
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 %define version 5.0.1
-%define release 0.rc3.26
+%define release 0.rc3.27
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -29,6 +29,8 @@
 Patch16: autofs-5.0.1-rc3-file-map-allow-white-space-only-line.patch
 Patch17: autofs-5.0.1-rc3-export-check-network-fix-2.patch
 Patch18: autofs-5.0.1-rc3-network_match-fix.patch
+Patch19: autofs-5.0.1-conf-append-global.patch
+Patch20: autofs-5.0.1-cmd-global-options.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Conflicts: kernel < 2.6.17
@@ -89,6 +91,8 @@
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
+%patch20 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -145,6 +149,10 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Mon Apr 16 2007 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc3.27
+- add configuration variable to control appending of global options (bz 214684).
+- add command option to set a global mount options string (bz 214684).
+
 * Thu Mar 8 2007 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc3.26
 - fixed numeric export match (bz 231188).
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 10:21:59 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 06:21:59 -0400
Subject: rpms/hplip/devel hplip.spec,1.122,1.123
Message-ID: <200704161021.l3GALx2p009051@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
* Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com>
- Some parts can run without GUI support after all (bug #236161).
- Resolves: rhbz#236161



Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- hplip.spec	16 Apr 2007 09:31:43 -0000	1.122
+++ hplip.spec	16 Apr 2007 10:21:56 -0000	1.123
@@ -175,12 +175,17 @@
 %{_bindir}/hp-check
 %{_bindir}/hp-clean
 %{_bindir}/hp-colorcal
+%{_bindir}/hp-fab
 %{_bindir}/hp-firmware
 %{_bindir}/hp-info
 %{_bindir}/hp-levels
+%{_bindir}/hp-makecopies
 %{_bindir}/hp-makeuri
 %{_bindir}/hp-probe
+%{_bindir}/hp-sendfax
+%{_bindir}/hp-setup
 %{_bindir}/hp-testpage
+%{_bindir}/hp-timedate
 %{_bindir}/hp-unload
 %{_sbindir}/hpiod
 # Note: this must be /usr/lib not %{_libdir}, since that's the
@@ -194,13 +199,18 @@
 %{_datadir}/hplip/check
 %{_datadir}/hplip/clean
 %{_datadir}/hplip/colorcal
+%{_datadir}/hplip/fab
+%{_datadir}/hplip/fax
 %{_datadir}/hplip/firmware
 %{_datadir}/hplip/hpssd*
 %{_datadir}/hplip/info
 %{_datadir}/hplip/__init__*
 %{_datadir}/hplip/levels
+%{_datadir}/hplip/makecopies
 %{_datadir}/hplip/makeuri
 %{_datadir}/hplip/probe
+%{_datadir}/hplip/setup
+%{_datadir}/hplip/sendfax
 %{_datadir}/hplip/testpage
 %{_datadir}/hplip/timedate
 %{_datadir}/hplip/unload
@@ -220,21 +230,11 @@
 %{_datadir}/hplip/scan
 
 %files gui
-%{_bindir}/hp-fab
-%{_bindir}/hp-makecopies
 %{_bindir}/hp-print
-%{_bindir}/hp-sendfax
-%{_bindir}/hp-setup
-%{_bindir}/hp-timedate
 %{_bindir}/hp-toolbox
 # Files
 %{_datadir}/hplip/data/images
-%{_datadir}/hplip/fab
-%{_datadir}/hplip/fax
-%{_datadir}/hplip/makecopies
 %{_datadir}/hplip/print
-%{_datadir}/hplip/sendfax
-%{_datadir}/hplip/setup
 %{_datadir}/hplip/toolbox
 # Directories
 %{_datadir}/hplip/ui
@@ -280,6 +280,7 @@
 
 %changelog
 * Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com>
+- Some parts can run without GUI support after all (bug #236161).
 - Added /sbin/service and /sbin/chkconfig requirements for the scriptlets
   (bug #236445).
 - Fixed %%post scriptlet's condrestart logic (bug #236445).



From fedora-cvs-commits at redhat.com  Mon Apr 16 10:22:11 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 06:22:11 -0400
Subject: rpms/hplip/devel hplip.spec,1.123,1.124
Message-ID: <200704161022.l3GAMBpa009074@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
1.7.2-7


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- hplip.spec	16 Apr 2007 10:21:56 -0000	1.123
+++ hplip.spec	16 Apr 2007 10:22:09 -0000	1.124
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 1.7.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -279,7 +279,7 @@
 exit 0
 
 %changelog
-* Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com>
+* Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-7
 - Some parts can run without GUI support after all (bug #236161).
 - Added /sbin/service and /sbin/chkconfig requirements for the scriptlets
   (bug #236445).



From fedora-cvs-commits at redhat.com  Mon Apr 16 10:35:54 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 06:35:54 -0400
Subject: rpms/autofs/FC-6 autofs-5.0.1-cmd-global-options.patch, 1.1,
	1.2 autofs.spec, 1.177, 1.178
Message-ID: <200704161035.l3GAZs2w025467@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs-5.0.1-cmd-global-options.patch autofs.spec 
Log Message:
* Mon Apr 16 2007 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc3.28
- fix command option patch.


autofs-5.0.1-cmd-global-options.patch:
 daemon/automount.c  |   21 +++++++++++++++++++--
 man/automount.8.in  |    6 ++++++
 modules/parse_sun.c |   24 ++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 2 deletions(-)

Index: autofs-5.0.1-cmd-global-options.patch
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-6/autofs-5.0.1-cmd-global-options.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autofs-5.0.1-cmd-global-options.patch	16 Apr 2007 10:19:56 -0000	1.1
+++ autofs-5.0.1-cmd-global-options.patch	16 Apr 2007 10:35:52 -0000	1.2
@@ -1,5 +1,5 @@
---- autofs-5.0.1/modules/parse_sun.c.cmd-global-options	2007-04-16 17:46:58.000000000 +0800
-+++ autofs-5.0.1/modules/parse_sun.c	2007-04-16 17:47:48.000000000 +0800
+--- autofs-5.0.1/modules/parse_sun.c.cmd-global-options	2007-04-16 18:30:43.000000000 +0800
++++ autofs-5.0.1/modules/parse_sun.c	2007-04-16 18:30:43.000000000 +0800
 @@ -42,6 +42,8 @@ int parse_version = AUTOFS_PARSE_VERSION
  static struct mount_mod *mount_nfs = NULL;
  static int init_ctr = 0;
@@ -52,8 +52,8 @@
  	debug(LOGOPT_NONE,
  	      MODPREFIX "init gathered global options: %s", ctxt->optstr);
  
---- autofs-5.0.1/daemon/automount.c.cmd-global-options	2007-04-16 17:46:58.000000000 +0800
-+++ autofs-5.0.1/daemon/automount.c	2007-04-16 17:55:04.000000000 +0800
+--- autofs-5.0.1/daemon/automount.c.cmd-global-options	2007-04-16 18:30:43.000000000 +0800
++++ autofs-5.0.1/daemon/automount.c	2007-04-16 18:31:18.000000000 +0800
 @@ -46,6 +46,8 @@ const char *libdir = AUTOFS_LIB_DIR;	/* 
  const char *mapdir = AUTOFS_MAP_DIR;	/* Location of mount maps */
  const char *confdir = AUTOFS_CONF_DIR;	/* Location of autofs config file */
@@ -89,7 +89,7 @@
  		{"version", 0, 0, 'V'},
  		{0, 0, 0, 0}
  	};
-@@ -1454,6 +1459,8 @@ int main(int argc, char *argv[])
+@@ -1454,10 +1459,12 @@ int main(int argc, char *argv[])
  	timeout = defaults_get_timeout();
  	ghost = defaults_get_browse_mode();
  	logging = defaults_get_logging();
@@ -98,6 +98,11 @@
  	foreground = 0;
  
  	opterr = 0;
+-	while ((opt = getopt_long(argc, argv, "+hp:t:vdD:fV", long_options, NULL)) != EOF) {
++	while ((opt = getopt_long(argc, argv, "+hp:t:vdD:fVO:", long_options, NULL)) != EOF) {
+ 		switch (opt) {
+ 		case 'h':
+ 			usage();
 @@ -1491,6 +1498,16 @@ int main(int argc, char *argv[])
  			show_build_info();
  			exit(0);
@@ -116,7 +121,7 @@
  		case ':':
  			printf("%s: Ambiguous or unknown options\n", program);
 --- autofs-5.0.1/man/automount.8.in.cmd-global-options	2007-01-04 12:33:40.000000000 +0900
-+++ autofs-5.0.1/man/automount.8.in	2007-04-16 17:55:58.000000000 +0800
++++ autofs-5.0.1/man/automount.8.in	2007-04-16 18:30:43.000000000 +0800
 @@ -49,6 +49,12 @@ Define a global macro substitution varia
  are over-ridden macro definitions of the same name specified in
  mount entries.


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-6/autofs.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- autofs.spec	16 Apr 2007 10:19:56 -0000	1.177
+++ autofs.spec	16 Apr 2007 10:35:52 -0000	1.178
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 %define version 5.0.1
-%define release 0.rc3.27
+%define release 0.rc3.28
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -149,6 +149,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Mon Apr 16 2007 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc3.28
+- fix command option patch.
+
 * Mon Apr 16 2007 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc3.27
 - add configuration variable to control appending of global options (bz 214684).
 - add command option to set a global mount options string (bz 214684).



From fedora-cvs-commits at redhat.com  Mon Apr 16 10:54:37 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 06:54:37 -0400
Subject: rpms/tcp_wrappers/devel tcp_wrappers-7.6-restore_sigalarm.patch,
	NONE, 1.1 tcp_wrappers-7.6-siglongjmp.patch, NONE,
	1.1 tcp_wrappers.spec, 1.24, 1.25
Message-ID: <200704161054.l3GAsa0b006596@cvs.devel.redhat.com>

Author: tjanouse

Update of /cvs/dist/rpms/tcp_wrappers/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6552

Modified Files:
	tcp_wrappers.spec 
Added Files:
	tcp_wrappers-7.6-restore_sigalarm.patch 
	tcp_wrappers-7.6-siglongjmp.patch 
Log Message:
* Mon Apr 16 2007 Tomas Janousek <tjanouse at redhat.com> - 7.6-44
- added restore_sigalarm and siglongjmp patches from Debian, fixes #205129


tcp_wrappers-7.6-restore_sigalarm.patch:
 rfc931.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletion(-)

--- NEW FILE tcp_wrappers-7.6-restore_sigalarm.patch ---
diff -ruN tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c
--- tcp_wrappers_7.6.orig/rfc931.c	2004-08-29 18:40:08.000000000 +0200
+++ tcp_wrappers_7.6/rfc931.c	2004-08-29 18:40:02.000000000 +0200
@@ -92,6 +92,8 @@
     char   *cp;
     char   *result = unknown;
     FILE   *fp;
+    unsigned saved_timeout;
+    struct sigaction nact, oact;
 
 #ifdef INET6
     /* address family must be the same */
@@ -134,7 +136,12 @@
 	 */
 
 	if (setjmp(timebuf) == 0) {
-	    signal(SIGALRM, timeout);
+	    /* Save SIGALRM timer and handler. Sudheer Abdul-Salam, SUN. */
+	    saved_timeout = alarm(0);
+	    nact.sa_handler = timeout;
+	    nact.sa_flags = 0;
+	    (void) sigemptyset(&nact.sa_mask);
+	    (void) sigaction(SIGALRM, &nact, &oact);
 	    alarm(rfc931_timeout);
 
 	    /*
@@ -223,6 +230,10 @@
 	    }
 	    alarm(0);
 	}
+	/* Restore SIGALRM timer and handler. Sudheer Abdul-Salam, SUN. */
+	(void) sigaction(SIGALRM, &oact, NULL);
+	if (saved_timeout > 0)
+	    alarm(saved_timeout);
 	fclose(fp);
     }
     STRN_CPY(dest, result, STRING_LENGTH);

tcp_wrappers-7.6-siglongjmp.patch:
 rfc931.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE tcp_wrappers-7.6-siglongjmp.patch ---
diff -ruNp tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c
--- tcp_wrappers_7.6.orig/rfc931.c	2004-08-29 18:42:25.000000000 +0200
+++ tcp_wrappers_7.6/rfc931.c	2004-08-29 18:41:04.000000000 +0200
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#) rfc931.c 1.
 
 int     rfc931_timeout = RFC931_TIMEOUT;/* Global so it can be changed */
 
-static jmp_buf timebuf;
+static sigjmp_buf timebuf;
 
 /* fsocket - open stdio stream on top of socket */
 
@@ -62,7 +62,7 @@ int     protocol;
 static void timeout(sig)
 int     sig;
 {
-    longjmp(timebuf, sig);
+    siglongjmp(timebuf, sig);
 }
 
 /* rfc931 - return remote user name, given socket structures */
@@ -135,7 +135,7 @@ char   *dest;
 	 * Set up a timer so we won't get stuck while waiting for the server.
 	 */
 
-	if (setjmp(timebuf) == 0) {
+	if (sigsetjmp(timebuf, 1) == 0) {
 	    /* Save SIGALRM timer and handler. Sudheer Abdul-Salam, SUN. */
 	    saved_timeout = alarm(0);
 	    nact.sa_handler = timeout;


Index: tcp_wrappers.spec
===================================================================
RCS file: /cvs/dist/rpms/tcp_wrappers/devel/tcp_wrappers.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- tcp_wrappers.spec	9 Mar 2007 10:12:45 -0000	1.24
+++ tcp_wrappers.spec	16 Apr 2007 10:54:34 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: A security tool which acts as a wrapper for TCP daemons.
 Name: tcp_wrappers
 Version: 7.6
-Release: 43%{?dist}
+Release: 44%{?dist}
 
 %define LIB_MAJOR 0
 %define LIB_MINOR 7
@@ -28,6 +28,8 @@
 Patch15: tcp_wrappers-7.6-fix_sig-bug141110.patch
 Patch16: tcp_wrappers-7.6-162412.patch
 Patch17: tcp_wrappers-7.6-220015.patch
+Patch18: tcp_wrappers-7.6-restore_sigalarm.patch
+Patch19: tcp_wrappers-7.6-siglongjmp.patch
 # required by sin_scope_id in ipv6 patch
 BuildRequires: glibc-devel >= 2.2		
 BuildRoot: %{_tmppath}/%{name}-root
@@ -81,6 +83,8 @@
 %patch15 -p1 -b .fix_sig
 %patch16 -p1 -b .162412
 %patch17 -p1 -b .220015
+%patch18 -p1 -b .restore_sigalarm
+%patch19 -p1 -b .siglongjmp
 
 %build
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -DPIC -D_REENTRANT -DHAVE_STRERROR" LDFLAGS="-pie" MAJOR=%{LIB_MAJOR} MINOR=%{LIB_MINOR} REL=%{LIB_REL} linux
@@ -137,6 +141,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 16 2007 Tomas Janousek <tjanouse at redhat.com> - 7.6-44
+- added restore_sigalarm and siglongjmp patches from Debian, fixes #205129
+
 * Fri Mar 09 2007 Tomas Janousek <tjanouse at redhat.com> - 7.6-43
 - resolve hostnames in hosts.{allow,deny}, should fix a bunch of issues with
   IPv4/6



From fedora-cvs-commits at redhat.com  Mon Apr 16 11:47:35 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 07:47:35 -0400
Subject: rpms/automake15/devel automake-1.5-subdirs-89619.patch,1.1,1.2
Message-ID: <200704161147.l3GBlZa1032273@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	automake-1.5-subdirs-89619.patch 
Log Message:
 update subdirs patch

automake-1.5-subdirs-89619.patch:
 Makefile.in       |    4 ++--
 lib/Makefile.in   |    4 ++--
 lib/am/subdirs.am |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

Index: automake-1.5-subdirs-89619.patch
===================================================================
RCS file: /cvs/dist/rpms/automake15/devel/automake-1.5-subdirs-89619.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- automake-1.5-subdirs-89619.patch	9 Sep 2004 03:23:00 -0000	1.1
+++ automake-1.5-subdirs-89619.patch	16 Apr 2007 11:47:32 -0000	1.2
@@ -18,3 +18,43 @@
  	dot_seen=no; \
  ## For distclean and maintainer-clean we make sure to use the full
  ## list of subdirectories.  We do this so that `configure; make
+--- automake-1.5/lib/Makefile.in.89619	2007-04-16 13:44:31.000000000 +0200
++++ automake-1.5/lib/Makefile.in	2007-04-16 13:44:47.000000000 +0200
+@@ -145,7 +145,7 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $(MAKEFLAGS); amf=$$2; \
++	@set fnord $$MAKEFLAGS; amf=$$2; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -165,7 +165,7 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $(MAKEFLAGS); amf=$$2; \
++	@set fnord $$MAKEFLAGS; amf=$$2; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+--- automake-1.5/Makefile.in.89619	2007-04-16 13:43:38.000000000 +0200
++++ automake-1.5/Makefile.in	2007-04-16 13:44:06.000000000 +0200
+@@ -251,7 +251,7 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $(MAKEFLAGS); amf=$$2; \
++	@set fnord $$MAKEFLAGS; amf=$$2; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -271,7 +271,7 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $(MAKEFLAGS); amf=$$2; \
++	@set fnord $$MAKEFLAGS; amf=$$2; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \



From fedora-cvs-commits at redhat.com  Mon Apr 16 11:59:54 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 07:59:54 -0400
Subject: rpms/rpm/devel rpm-4.4.2-cdiff.patch, NONE,
	1.1 rpm-4.4.2-forkfailed.patch, NONE, 1.1 rpm.spec, 1.225, 1.226
Message-ID: <200704161159.l3GBxs9m032461@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32443

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.4.2-cdiff.patch rpm-4.4.2-forkfailed.patch 
Log Message:
* Mon Apr 16 2007 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-43
- Log failures for fork failing (OLPC)
- Gendiff enhancement from Enrico Scholz (#146981)


rpm-4.4.2-cdiff.patch:
 gendiff |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE rpm-4.4.2-cdiff.patch ---
--- rpm-4.4.2/gendiff.cdiff	2002-07-13 20:54:36.000000000 +0100
+++ rpm-4.4.2/gendiff	2007-04-16 12:48:09.000000000 +0100
@@ -6,14 +6,16 @@
   exit 1
 }
 
+: ${DIFF:=diff -p}
+
 find $1 \( -name "*$2" -o -name ".*$2" \) -print |
 while read f; do
     U=-u
     [ "`basename $f`" = "ChangeLog$2" ] && U=-U0
-#    diff ${U} $f `echo $f | sed s/$2\$//`
+#    ${DIFF} ${U} $f `echo $f | sed s/$2\$//`
     if [ -r "$f" ]; then
-	diff ${U} "${f}" "${f%$2}"
+	${DIFF} ${U} "${f}" "${f%$2}"
     else
-	diff ${U} /dev/null "${f%$2}"
+	${DIFF} ${U} /dev/null "${f%$2}"
     fi
 done

rpm-4.4.2-forkfailed.patch:
 lib/psm.c     |    7 +++++++
 rpmio/rpmsq.c |    1 +
 2 files changed, 8 insertions(+)

--- NEW FILE rpm-4.4.2-forkfailed.patch ---
Print error message if scriptlet fork fails instead if silently
dying. [#152779]

Index: lib/psm.c
===================================================================
--- lib/psm.c.orig
+++ lib/psm.c
@@ -910,6 +910,12 @@ static rpmRC runScript(rpmpsm psm, Heade
     }
     /*@=branchstate@*/
 
+    if (psm->sq.child == (pid_t)-1) {
+	rpmError(RPMERR_FORK, _("Couldn't fork %s: %s\n"), sln, strerror(errno));
+	rc = RPMRC_FAIL;
+	goto exit;
+    }
+
     (void) psmWait(psm);
 
   /* XXX filter order dependent multilib "other" arch helper error. */
@@ -934,6 +940,7 @@ static rpmRC runScript(rpmpsm psm, Heade
     }
   }
 
+exit:
     if (freePrefixes) prefixes = hfd(prefixes, ipt);
 
     xx = Fclose(out);	/* XXX dup'd STDOUT_FILENO */
Index: rpmio/rpmsq.c
===================================================================
--- rpmio/rpmsq.c.orig
+++ rpmio/rpmsq.c
@@ -407,6 +407,7 @@ fprintf(stderr, "    Enable(%p): %p\n", 
 
     pid = fork();
     if (pid < (pid_t) 0) {		/* fork failed.  */
+	sq->child = (pid_t)-1;
 /*@-bounds@*/
 	xx = close(sq->pipes[0]);
 	xx = close(sq->pipes[1]);


Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- rpm.spec	4 Apr 2007 13:16:50 -0000	1.225
+++ rpm.spec	16 Apr 2007 11:59:52 -0000	1.226
@@ -17,7 +17,7 @@
 Name: rpm
 Version: 4.4.2
 %{expand: %%define rpm_version %{version}}
-Release: 42%{?dist}
+Release: 43%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source: rpm-%{rpm_version}.tar.gz
@@ -63,6 +63,8 @@
 Patch37: rpm-4.4.2-noneon.patch
 Patch38: rpm-4.4.2-debugedit-canonicalize-path.patch
 Patch39: rpm-4.4.2-no-ppc-asm.patch
+Patch40: rpm-4.4.2-forkfailed.patch
+Patch41: rpm-4.4.2-cdiff.patch
 License: GPL
 Requires: patch > 2.5
 Prereq: shadow-utils
@@ -204,6 +206,8 @@
 %patch37 -p1 -b .noneon
 %patch38 -p0 -b .debugcan
 %patch39 -p1 -b .noppcasm
+%patch40 -p0 -b .forkfail
+%patch41 -p1 -b .cdiff
 
 # rebuild configure for ipv6
 autoconf
@@ -562,6 +566,10 @@
 %{__includedir}/popt.h
 
 %changelog
+* Mon Apr 16 2007 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-43
+- Log failures for fork failing (OLPC)
+- Gendiff enhancement from Enrico Scholz (#146981)
+
 * Wed Apr 04 2007 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-42
 - Remove ppc64 inline asm (#233145)
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 12:32:34 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 08:32:34 -0400
Subject: rpms/automake15/devel automake-1.5-noautotools.patch, NONE,
	1.1 automake15.spec, 1.19, 1.20
Message-ID: <200704161232.l3GCWYhF014587@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	automake15.spec 
Added Files:
	automake-1.5-noautotools.patch 
Log Message:
- update subdirs patch (#225299)
- don't run autotools during build



automake-1.5-noautotools.patch:
 Makefile.in              |    1 +
 configure                |   12 +++++++++++-
 lib/Automake/Makefile.in |    1 +
 lib/Makefile.in          |    1 +
 lib/am/Makefile.in       |    1 +
 5 files changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE automake-1.5-noautotools.patch ---
--- automake-1.5/lib/Automake/Makefile.in.noautotools	2007-04-16 13:49:31.000000000 +0200
+++ automake-1.5/lib/Automake/Makefile.in	2007-04-16 13:52:40.000000000 +0200
@@ -56,6 +56,7 @@
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 AMTAR = @AMTAR@
+APIVERSION = @APIVERSION@
 AWK = @AWK@
 DEPDIR = @DEPDIR@
 EXEEXT = @EXEEXT@
--- automake-1.5/lib/Makefile.in.noautotools	2007-04-16 13:52:54.000000000 +0200
+++ automake-1.5/lib/Makefile.in	2007-04-16 13:53:10.000000000 +0200
@@ -56,6 +56,7 @@
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 AMTAR = @AMTAR@
+APIVERSION = @APIVERSION@
 AWK = @AWK@
 DEPDIR = @DEPDIR@
 EXEEXT = @EXEEXT@
--- automake-1.5/lib/am/Makefile.in.noautotools	2007-04-16 13:53:23.000000000 +0200
+++ automake-1.5/lib/am/Makefile.in	2007-04-16 13:53:42.000000000 +0200
@@ -56,6 +56,7 @@
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 AMTAR = @AMTAR@
+APIVERSION = @APIVERSION@
 AWK = @AWK@
 DEPDIR = @DEPDIR@
 EXEEXT = @EXEEXT@
--- automake-1.5/Makefile.in.noautotools	2007-04-16 13:48:43.000000000 +0200
+++ automake-1.5/Makefile.in	2007-04-16 13:49:13.000000000 +0200
@@ -56,6 +56,7 @@
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 AMTAR = @AMTAR@
+APIVERSION = @APIVERSION@
 AWK = @AWK@
 DEPDIR = @DEPDIR@
 EXEEXT = @EXEEXT@
--- automake-1.5/configure.noautotools	2007-04-16 13:53:53.000000000 +0200
+++ automake-1.5/configure	2007-04-16 13:56:30.000000000 +0200
@@ -793,7 +793,7 @@
 fi
 
 # Define the identity of the package.
-PACKAGE=automake
+PACKAGE=automake15
 VERSION=1.5
 cat >> confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
@@ -842,6 +842,15 @@
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 
+# The API version is the base version.  We must guarantee
+# compatibility for all releases with the same API version.
+# Our current rule is that:
+# * All releases, including the prereleases, in an X.Y series
+#   are compatible.  So 1.5.1c is compatible with 1.5.
+# * Prereleases on the trunk are all incompatible -- 1.5b and 1.5c
+#   aren't the same.
+APIVERSION=`echo "$VERSION" | sed -e 's/^\([[0-9]]*\.[[0-9]]*[[a-z]]?\).*$/\1/'`
+
 
 ACLOCAL="`pwd`/aclocal --acdir=m4"
 # $AUTOMAKE is always run after a `cd $top_srcdir', hence `.' is really
@@ -1064,6 +1073,7 @@
 s%@AMDEPBACKSLASH@%$AMDEPBACKSLASH%g
 s%@DEPDIR@%$DEPDIR%g
 s%@PERL@%$PERL%g
+s%@APIVERSION@%$APIVERSION%g
 
 CEOF
 EOF


Index: automake15.spec
===================================================================
RCS file: /cvs/dist/rpms/automake15/devel/automake15.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- automake15.spec	19 Mar 2007 11:06:07 -0000	1.19
+++ automake15.spec	16 Apr 2007 12:32:32 -0000	1.20
@@ -1,7 +1,7 @@
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake15
 Version:    1.5
-Release:    21
+Release:    22
 License:    GPL
 Group:      Development/Tools
 URL:        http://sources.redhat.com/automake
@@ -17,6 +17,7 @@
 Patch7:     automake-1.5-tailfix.patch
 Patch8:     automake-1.5-depconf2.patch
 Patch9:     automake-1.5-info.patch
+Patch10:    automake-1.5-noautotools.patch
 Buildrequires:  autoconf, bison, texinfo
 Requires(post):  /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -52,10 +53,13 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1 -b .noautotools
 
 %build
 mv automake.texi automake15.texi
 rm -f automake.info*
+touch -r configure.noautotools configure
+touch -r configure.in.orig configure.in
 # patch 2 touches configure.in
 autoconf
 ./configure --program-suffix=-%{version} --prefix=%{_prefix} \
@@ -98,6 +102,10 @@
 %dir %{_datadir}/aclocal
 
 %changelog
+* Mon Apr 16 2007 Karsten Hopp <karsten at redhat.com> 1.5-22
+- update subdirs patch (#225299)
+- don't run autotools during build
+
 * Mon Mar 19 2007 Karsten Hopp <karsten at redhat.com> 1.5-21
 - remove erroneous provides (#224569)
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 12:37:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 08:37:31 -0400
Subject: rpms/gnome-applet-vm/devel .cvsignore, 1.6, 1.7 gnome-applet-vm.spec,
	1.14, 1.15 sources, 1.7, 1.8
Message-ID: <200704161237.l3GCbVWj018001@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/gnome-applet-vm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17954

Modified Files:
	.cvsignore gnome-applet-vm.spec sources 
Log Message:
* Mon Apr 16 2007 Karel Zak <kzak at redhat.com> 0.1.2-2
- sync with upstream
- remove dependence on dbus libs
- fix collaboration with virt-manager
- fix rh#213790 - not able to create a new virtual machine via the applet
- fix rh#211560 - s/button-press-event/button-release-event/ (GTK events)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-applet-vm/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 Sep 2006 20:50:13 -0000	1.6
+++ .cvsignore	16 Apr 2007 12:37:29 -0000	1.7
@@ -1 +1 @@
-gnome-applet-vm-0.1.0.tar.bz2
+gnome-applet-vm-0.1.2.tar.bz2


Index: gnome-applet-vm.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applet-vm/devel/gnome-applet-vm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnome-applet-vm.spec	12 Apr 2007 21:39:05 -0000	1.14
+++ gnome-applet-vm.spec	16 Apr 2007 12:37:29 -0000	1.15
@@ -1,6 +1,6 @@
 Summary: Simple virtual domains monitor which embeds itself in the GNOME panel
 Name: gnome-applet-vm
-Version: 0.1.0
+Version: 0.1.2
 Release: 2%{?dist}
 %define upstreamname %{name}-%{version}
 License: GPL
@@ -98,6 +98,13 @@
 %config %{_sysconfdir}/security/console.apps/vm_applet_wrapper
 
 %changelog
+* Mon Apr 16 2007 Karel Zak <kzak at redhat.com> 0.1.2-2
+- sync with upstream
+- remove dependence on dbus libs
+- fix collaboration with virt-manager
+- fix rh#213790 - not able to create a new virtual machine via the applet
+- fix rh#211560 - s/button-press-event/button-release-event/ (GTK events)
+
 * Thu Apr 12 2007 Karel Zak <kzak at redhat.com> 0.1.0-2
 - fix rpmlint issues
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-applet-vm/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Sep 2006 21:48:38 -0000	1.7
+++ sources	16 Apr 2007 12:37:29 -0000	1.8
@@ -1 +1 @@
-5cdf8d09bde1f419d86880b64cbf2f43  gnome-applet-vm-0.1.0.tar.bz2
+3201335d63b1ed3c089df9ab2aec443f  gnome-applet-vm-0.1.2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 16 13:15:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 09:15:18 -0400
Subject: rpms/xfig/devel xfig-3.2.5-fhs.patch, NONE,
	1.1 xfig-3.2.5-mkstemp.diff, NONE,
	1.1 xfig-3.2.5-pdfviewer.patch, NONE,
	1.1 xfig.3.2.5-Xaw3d.patch, NONE,
	1.1 xfig.3.2.5-modularX.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 sources, 1.4, 1.5 xfig.spec, 1.39,
	1.40 xfig-3.2.4-fhs.patch, 1.1, NONE xfig-3.2.4-fonts.patch,
	1.1, NONE xfig-3.2.4-mkstemp.diff, 1.1,
	NONE xfig-3.2.4-pdfviewer.patch, 1.1,
	NONE xfig.3.2.4-buffer.patch, 1.2,
	NONE xfig.3.2.4-cleanup.patch, 1.1,
	NONE xfig.3.2.4-modularX.patch, 1.2,
	NONE xfig.3.2.4-xaw3d.patch, 1.1, NONE xfig.3.2.4-xpm.patch,
	1.1, NONE
Message-ID: <200704161315.l3GDFIs8013138@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/xfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13085

Modified Files:
	.cvsignore sources xfig.spec 
Added Files:
	xfig-3.2.5-fhs.patch xfig-3.2.5-mkstemp.diff 
	xfig-3.2.5-pdfviewer.patch xfig.3.2.5-Xaw3d.patch 
	xfig.3.2.5-modularX.patch 
Removed Files:
	xfig-3.2.4-fhs.patch xfig-3.2.4-fonts.patch 
	xfig-3.2.4-mkstemp.diff xfig-3.2.4-pdfviewer.patch 
	xfig.3.2.4-buffer.patch xfig.3.2.4-cleanup.patch 
	xfig.3.2.4-modularX.patch xfig.3.2.4-xaw3d.patch 
	xfig.3.2.4-xpm.patch 
Log Message:
3.2.5


xfig-3.2.5-fhs.patch:
 Imakefile |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE xfig-3.2.5-fhs.patch ---
--- xfig.3.2.5/Imakefile.fhs	2006-10-11 01:19:22.000000000 +0200
+++ xfig.3.2.5/Imakefile	2007-04-16 14:04:45.000000000 +0200
@@ -169,13 +169,11 @@
 XFIGLIBDIR = $(LIBDIR)/xfig
 
 XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
-XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
-XFIGDOCDIR = /usr/local/xfig/doc
+XFIGDOCDIR = $(DOCDIR)/xfig
 
 XCOMM MANDIR tells where the standard man pages should go (no need to change it
 XCOMM if you want the man pages installed in the standard place on your system
-XCOMM MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
-MANDIR = /usr/local/xfig/man
+MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
 
 XCOMM If your system doesn't have strstr undefine the following definition
 XCOMM HAVE_NO_NOSTRSTR = -DNOSTRSTR

xfig-3.2.5-mkstemp.diff:
 f_readeps.c  |   27 ++++++++++++++++++++-------
 f_readgif.c  |   10 ++++++++--
 f_readppm.c  |   10 ++++++++--
 f_readtif.c  |   11 ++++++++---
 f_util.c     |   16 +++++++++++-----
 main.c       |   15 ++++++++++++---
 mode.c       |    2 +-
 u_print.c    |   19 ++++++++++++++++---
 w_print.c    |   26 +++++++++++++++++++++-----
 w_srchrepl.c |   11 +++++++----
 10 files changed, 112 insertions(+), 35 deletions(-)

--- NEW FILE xfig-3.2.5-mkstemp.diff ---
--- xfig.3.2.5/f_readtif.c.mkstemp	2005-07-26 18:39:59.000000000 +0200
+++ xfig.3.2.5/f_readtif.c	2007-04-16 14:05:22.000000000 +0200
@@ -33,11 +33,16 @@
 {
 	char	 buf[2*PATH_MAX+40],pcxname[PATH_MAX];
 	FILE	*tiftopcx;
-	int	 stat;
+	int	 stat, fd;
 
 	/* make name for temp output file */
-	sprintf(pcxname, "%s/%s%06d.pix", TMPDIR, "xfig-pcx", getpid());
-
+	snprintf(pcxname, sizeof(pcxname), "%s/xfig-pcx.XXXXXX", TMPDIR);
+	if ((fd = mkstemp(pcxname)) == -1) {
+	    file_msg("Cannot open temp file %s: %s\n", pcxname, strerror(errno));
+		return FileInvalid;
+	}
+	close(fd);
+	
 	/* make command to convert tif to pnm then to pcx into temp file */
 	/* for some reason, tifftopnm requires a file and can't work in a pipe */
 	sprintf(buf, "tifftopnm %s 2> /dev/null | ppmtopcx > %s 2> /dev/null",
--- xfig.3.2.5/u_print.c.mkstemp	2006-02-24 21:18:11.000000000 +0100
+++ xfig.3.2.5/u_print.c	2007-04-16 14:05:22.000000000 +0200
@@ -92,9 +92,16 @@
     char	    syspr[2*PATH_MAX+200];
     char	    tmpfile[PATH_MAX];
     char	   *name;
+    int     fd;
 
-    sprintf(tmpfile, "%s/%s%06d", TMPDIR, "xfig-print", getpid());
+    snprintf(tmpfile, sizeof(tmpfile), "%s/xfig-print.XXXXXX", TMPDIR);
     warnexist = False;
+    if ((fd = mkstemp(tmpfile)) == -1) {
+       file_msg("Can't open temp file %s: %s\n", tmpfile, strerror(errno));
+       return;
+    }
+    close(fd);
+
     init_write_tmpfile();
     if (write_file(tmpfile, False)) {
       end_write_tmpfile();
@@ -648,10 +655,16 @@
     char   errfname[PATH_MAX];
     FILE  *errfile;
     char   str[400];
-    int	   status;
+    int	   status, fd;
 
     /* make temp filename for any errors */
-    sprintf(errfname, "%s/xfig-export%06d.err", TMPDIR, getpid());
+    snprintf(errfname, sizeof(errfname), "%s/xfig-export.XXXXXX", TMPDIR);
+    if ((fd = mkstemp(errfname)) == -1) {
+	file_msg("Can't open temp file %s: %s\n", errfname, strerror(errno));
+	return 1;
+    }
+    close(fd);
+    
     /* direct any output from fig2dev to this file */
     strcat(command, " 2> "); 
     strcat(command, errfname); 
--- xfig.3.2.5/f_util.c.mkstemp	2007-01-16 18:58:18.000000000 +0100
+++ xfig.3.2.5/f_util.c	2007-04-16 14:05:22.000000000 +0200
@@ -906,14 +906,20 @@
 int strain_out(char *name)
 {
     char    line[RC_BUFSIZ+1], *tok;
+    int fd;
 
     /* make a temp filename in the user's home directory so we
        can just rename it to .xfigrc after creating it */
-    sprintf(tmpname, "%s/%s%06d", userhome, "xfig-xfigrc", getpid());
-    tmpf = fopen(tmpname,"wb");
-    if (tmpf == 0) {
-	file_msg("Can't make temporary file for .xfigrc - error: %s",strerror(errno));
-	return -1;	
+    snprintf(tmpname, sizeof(tmpname), "%s/xfig-xfigrc.XXXXXX", userhome);
+
+    if ((fd = mkstemp(tmpname)) == -1 || (tmpf = fdopen(fd, "wb")) == NULL) {
+       file_msg("Can't make temporary file for .xfigrc - error: %s",
+              strerror(errno));
+       if (fd != -1) {
+          unlink(tmpname);
+          close(fd);
+       }
+       return -1;
     }
     /* read the .xfigrc file and write all to temp file except file names */
     xfigrc = fopen(xfigrc_name,"r");
--- xfig.3.2.5/main.c.mkstemp	2007-01-15 01:24:26.000000000 +0100
+++ xfig.3.2.5/main.c	2007-04-16 14:05:22.000000000 +0200
@@ -653,8 +653,10 @@
     update_figs = False;
 
     /* get the TMPDIR environment variable for temporary files */
-    if ((TMPDIR = getenv("XFIGTMPDIR"))==NULL)
-	TMPDIR = "/tmp";
+    if ((TMPDIR = getenv("XFIGTMPDIR"))==NULL) {
+		if ((TMPDIR = getenv("TMPDIR")) == NULL)
+			TMPDIR = "/tmp";
+	}
 
     /* first check args to see if user wants to scale the figure as it is
 	read in and make sure it is a resonable (positive) number */
@@ -1669,7 +1671,14 @@
     if (userhome != NULL && *strcpy(cut_buf_name, userhome) != '\0') {
 	strcat(cut_buf_name, "/.xfig");
     } else {
-	sprintf(cut_buf_name, "%s/xfig%06d", TMPDIR, getpid());
+		int fd;
+		sprintf(cut_buf_name, "%s/xfig.XXXXXX", TMPDIR);
+		if ((fd = mkstemp(cut_buf_name)) == -1) {
+			fprintf(stderr, "Can't create temporary file for cut_buff: %s\n",
+					strerror(errno));
+			exit(0);
+		}
+		close(fd);
     }
 }
 
--- xfig.3.2.5/w_print.c.mkstemp	2005-07-26 18:40:01.000000000 +0200
+++ xfig.3.2.5/w_print.c	2007-04-16 14:05:22.000000000 +0200
@@ -294,9 +294,10 @@
 do_print_batch(Widget w)
 {
 	FILE	   *infp,*outfp;
-	char	    tmp_exp_file[32];
+	char	    tmp_exp_file[PATH_MAX];
 	char	    str[255];
 	char	    backgrnd[10], grid[80];
+   int       fd;
 
 	if (writing_batch || emptyfigure_msg(print_msg))
 		return;
@@ -305,11 +306,20 @@
 	/* this could happen if the user presses the button too fast */
 	writing_batch = True;
 
-	/* make a temporary name to write the batch stuff to */
-	sprintf(batch_file, "%s/%s%06d", TMPDIR, "xfig-batch", getpid());
 	/* make a temporary name to write this figure to */
-	sprintf(tmp_exp_file, "%s/%s%06d", TMPDIR, "xfig-exp", getpid());
-	batch_exists = True;
+	snprintf(tmp_exp_file, sizeof(tmp_exp_file), "%s/xfig-exp.XXXXXX",
+		TMPDIR);
+
+	if (batch_exists != True) {
+		/* make a temporary name to write the batch stuff to */
+		sprintf(batch_file, "%s/xfig-batch.XXXXXX", TMPDIR);
+		if ((fd = mkstemp(batch_file)) == -1) {
+			file_msg("Error creating temporary file");
+			return;
+		}
+		close(fd);
+		batch_exists = True;
+	}
 	if (!print_popup) 
 		create_print_panel(w);
 
@@ -322,6 +332,12 @@
 	/* make a #rrggbb string from the background color */
 	make_rgb_string(export_background_color, backgrnd);
 
+	if ((fd = mkstemp(tmp_exp_file)) == -1) {
+		file_msg("Error creating temporary file");
+		return;
+	}
+	close(fd);
+
 	/* get grid params and assemble into fig2dev parm */
 	get_grid_spec(grid, print_grid_minor_text, print_grid_major_text);
 
--- xfig.3.2.5/f_readppm.c.mkstemp	2005-07-26 18:39:59.000000000 +0200
+++ xfig.3.2.5/f_readppm.c	2007-04-16 14:05:22.000000000 +0200
@@ -34,10 +34,16 @@
 {
 	char	 buf[BUFLEN],pcxname[PATH_MAX];
 	FILE	*giftopcx;
-	int	 stat, size;
+	int	 stat, size, fd;
 
 	/* make name for temp output file */
-	sprintf(pcxname, "%s/%s%06d.pix", TMPDIR, "xfig-pcx", getpid());
+	snprintf(pcxname, sizeof(pcxname), "%s/xfig-pcx.XXXXXX", TMPDIR);
+	if ((fd = mkstemp(pcxname)) == -1) {
+	    file_msg("Cannot open temp file %s: %s\n", pcxname, strerror(errno));
+	    return FileInvalid;
+	}
+	close(fd);
+
 	/* make command to convert gif to pcx into temp file */
 	sprintf(buf, "ppmtopcx > %s 2> /dev/null", pcxname);
 	if ((giftopcx = popen(buf,"w" )) == 0) {
--- xfig.3.2.5/f_readgif.c.mkstemp	2005-07-26 18:39:59.000000000 +0200
+++ xfig.3.2.5/f_readgif.c	2007-04-16 14:05:22.000000000 +0200
@@ -76,7 +76,7 @@
 	char		buf[BUFLEN],pcxname[PATH_MAX];
 	FILE		*giftopcx;
 	struct Cmap 	localColorMap[MAX_COLORMAP_SIZE];
-	int		i, stat, size;
+	int		i, stat, size, fd;
 	int		useGlobalColormap;
 	unsigned int	bitPixel, red, green, blue;
 	unsigned char	c;
@@ -173,7 +173,13 @@
 	/* now call giftopnm and ppmtopcx */
 
 	/* make name for temp output file */
-	sprintf(pcxname, "%s/%s%06d.pix", TMPDIR, "xfig-pcx", getpid());
+	snprintf(pcxname, sizeof(pcxname), "%s/xfig-pcx.XXXXXX", TMPDIR);
+	if ((fd = mkstemp(pcxname)) == -1) {
+		file_msg("Cannot create temporary file\n");
+		return FileInvalid;
+	}
+	close(fd);
+
 	/* make command to convert gif to pcx into temp file */
 	sprintf(buf, "giftopnm | ppmtopcx > %s 2> /dev/null", pcxname);
 	if ((giftopcx = popen(buf,"w" )) == 0) {
--- xfig.3.2.5/w_srchrepl.c.mkstemp	2005-07-26 18:40:02.000000000 +0200
+++ xfig.3.2.5/w_srchrepl.c	2007-04-16 14:05:22.000000000 +0200
@@ -788,7 +788,7 @@
   char	 *cmd;
   char	  str[300];
   FILE	 *fp;
-  int	  len, i;
+  int	  len, i, fd;
   Boolean done = FALSE;
   static int lines = 0;
 
@@ -804,9 +804,12 @@
   }
   lines = 0;
 
-  sprintf(filename, "%s/xfig-spell.%d", TMPDIR, (int)getpid());
-  fp = fopen(filename, "w");
-  if (fp == NULL) {
+  snprintf(filename, sizeof(filename), "%s/xfig-spell.XXXXXX", TMPDIR);
+  if ((fd = mkstemp(filename)) == -1 || (fp = fdopen(fd, "w")) == NULL) {
+    if (fd != -1) {
+	unlink(filename);
+	close(fd);
+    }
     file_msg("Can't open temporary file: %s: %s\n", filename, strerror(errno));
   } else {
     /* locate all text objects and write them to file fp */
--- xfig.3.2.5/f_readeps.c.mkstemp	2005-10-31 18:40:38.000000000 +0100
+++ xfig.3.2.5/f_readeps.c	2007-04-16 14:19:32.000000000 +0200
@@ -250,11 +250,10 @@
     int         urx, llx, ury, lly;
     int         pdf_flag;
 {
-    static	tempseq = 0;
     char        buf[300];
     FILE       *tmpfp, *pixfile, *gsfile;
     char       *psnam, *driver;
-    int         status, wid, ht, nbitmap;
+    int         status, wid, ht, nbitmap, fd;
     char        tmpfile[PATH_MAX],
 		pixnam[PATH_MAX],
 		errnam[PATH_MAX],
@@ -270,8 +269,12 @@
 	/* re-open the pipe */
 	close_picfile(file, filetype);
 	file = open_picfile(tmpfile, &filetype, PIPEOK, pixnam);
-	sprintf(tmpfile, "%s/%s%06d", TMPDIR, "xfig-eps", getpid());
-	if ((tmpfp = fopen(tmpfile, "wb")) == NULL) {
+   snprintf(tmpfile, sizeof(tmpfile), "%s/xfig-eps.XXXXXX", TMPDIR);
+   if ((fd = mkstemp(tmpfile)) == -1 || (tmpfp = fdopen(fd, "wb")) == NULL) {
+       if (fd != -1) {
+         unlink(tmpfile);
+         close(fd);
+       }
 	    file_msg("Couldn't open tmp file %s, %s", tmpfile, strerror(errno));
 	    return False;
 	}
@@ -280,10 +283,20 @@
 	fclose(tmpfp);
     }
     /* make name /TMPDIR/xfig-pic######.pix */
-    sprintf(pixnam, "%s/%s%06d.pix", TMPDIR, "xfig-pic", tempseq);
+    snprintf(pixnam, sizeof(pixnam), "%s/xfig-pic.XXXXXX", TMPDIR);
+    if ((fd = mkstemp(pixnam)) == -1) {
+        file_msg("Couldn't open tmp file %s, %s", pixnam, strerror(errno));
+        return False;
+    }
+    close(fd);
+
     /* and file name for any error messages from gs */
-    sprintf(errnam, "%s/%s%06d.err", TMPDIR, "xfig-pic", tempseq);
-    tempseq++;
+    snprintf(errnam, sizeof(errnam), "%s/xfig-picerr.XXXXXX", TMPDIR);
+    if ((fd = mkstemp(errnam)) == -1) {
+       file_msg("Couldn't open tmp file %s, %s", errnam, strerror(errno));
+       return False;
+    }
+    close(fd);
 
     /* generate gs command line */
     /* for monochrome, use pbm */
--- xfig.3.2.5/mode.c.mkstemp	2005-07-26 18:40:00.000000000 +0200
+++ xfig.3.2.5/mode.c	2007-04-16 14:05:22.000000000 +0200
@@ -86,7 +86,7 @@
 
 int		cur_exp_lang;		/* gets initialized in main.c */
 Boolean		batch_exists = False;
-char		batch_file[32];
+char		batch_file[PATH_MAX];
 
 /*******************************************************************/
 /* If you change the order of the lang_items[] you must change the */

xfig-3.2.5-pdfviewer.patch:
 Fig.ad |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xfig-3.2.5-pdfviewer.patch ---
--- xfig.3.2.5/Fig.ad.pdfviewer	2007-04-16 14:31:39.000000000 +0200
+++ xfig.3.2.5/Fig.ad	2007-04-16 14:31:56.000000000 +0200
@@ -24,7 +24,7 @@
 
 ! pdfviewer - put your favorite pdf viewer here.  
 !		This is for viewing the xfig how-to guide and man pages
-Fig.pdfviewer:			/usr/bin/xpdf %f
+Fig.pdfviewer:			/usr/bin/evince %f
 
 ! Spell check program - put your favorite spelling check program here.
 !		It must write the misspelled words to standard output.

xfig.3.2.5-Xaw3d.patch:
 Imakefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xfig.3.2.5-Xaw3d.patch ---
--- xfig.3.2.5/Imakefile.Xaw3d	2007-04-16 14:56:58.000000000 +0200
+++ xfig.3.2.5/Imakefile	2007-04-16 14:57:26.000000000 +0200
@@ -50,7 +50,7 @@
 XCOMM Uncomment the following definition for XAW3D if you want to use
 XCOMM the 3d Athena Widget Set (highly recommended!)
 
-#define XAW3D
+XCOMM #define XAW3D
 
 XCOMM Uncomment the following if you have David Hawkey's Xaw3D version 1.5E which has
 XCOMM some new features, including "Tips", which replace xfig's "help balloons"

xfig.3.2.5-modularX.patch:
 Imakefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE xfig.3.2.5-modularX.patch ---
--- xfig.3.2.5/Imakefile.modularX	2007-04-16 14:27:49.000000000 +0200
+++ xfig.3.2.5/Imakefile	2007-04-16 14:29:18.000000000 +0200
@@ -45,7 +45,7 @@
 XCOMM different tree than the "correct" tree that your X system expects. The usual
 XCOMM purpose of DESTDIR is to test an install process by installing in a benign area.
 
-XCOMM XAPPLOADDIR = /home/user/xfig
+XAPPLOADDIR = /usr/share/X11/app-defaults
 
 XCOMM Uncomment the following definition for XAW3D if you want to use
 XCOMM the 3d Athena Widget Set (highly recommended!)
@@ -166,14 +166,14 @@
 XCOMM XFIGLIBDIR = $(LIBDIR)
 
 XCOMM use this if you want the multi-key data base file in the standard X11 tree
-XFIGLIBDIR = $(LIBDIR)/xfig
+XFIGLIBDIR = /usr/share/xfig
 
 XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
 XFIGDOCDIR = $(DOCDIR)/xfig
 
 XCOMM MANDIR tells where the standard man pages should go (no need to change it
 XCOMM if you want the man pages installed in the standard place on your system
-MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
+MANDIR = /usr/share/man/man1
 
 XCOMM If your system doesn't have strstr undefine the following definition
 XCOMM HAVE_NO_NOSTRSTR = -DNOSTRSTR


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xfig/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Sep 2004 14:49:08 -0000	1.4
+++ .cvsignore	16 Apr 2007 13:15:16 -0000	1.5
@@ -1 +1,2 @@
 xfig.3.2.4.full.tar.gz
+xfig.3.2.5.full.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xfig/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2004 14:49:08 -0000	1.4
+++ sources	16 Apr 2007 13:15:16 -0000	1.5
@@ -1 +1 @@
-1911fc0f733cb2f40336a8d0e82513de  xfig.3.2.4.full.tar.gz
+fae0c67a3951bd41c057deb63b6aa47a  xfig.3.2.5.full.tar.gz


Index: xfig.spec
===================================================================
RCS file: /cvs/dist/rpms/xfig/devel/xfig.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xfig.spec	12 Jul 2006 08:53:27 -0000	1.39
+++ xfig.spec	16 Apr 2007 13:15:16 -0000	1.40
@@ -2,8 +2,8 @@
 
 Summary: An X Window System tool for drawing basic vector graphics.
 Name: xfig
-Version: 3.2.4
-Release: 21.1
+Version: 3.2.5
+Release: 1%{?dist}
 License: Freeware
 Group: Applications/Multimedia
 URL: http://www.xfig.org/
@@ -12,36 +12,32 @@
 Source2: xfig.desktop
 
 Patch0: xfig-3.2.4-redhat.patch
-Patch1: xfig-3.2.4-fhs.patch
-Patch2: xfig-3.2.4-mkstemp.diff
-Patch3: xfig.3.2.4-cleanup.patch
-Patch4: xfig-3.2.4-fonts.patch
-Patch5: xfig.3.2.4-buffer.patch
-Patch6: xfig.3.2.4-xpm.patch
-Patch7: xfig.3.2.4-modularX.patch
-Patch8: xfig-3.2.4-pdfviewer.patch
-Patch9: xfig.3.2.4-xaw3d.patch
+Patch1: xfig-3.2.5-fhs.patch
+Patch2: xfig-3.2.5-mkstemp.diff
+Patch7: xfig.3.2.5-modularX.patch
+Patch8: xfig-3.2.5-pdfviewer.patch
+Patch9: xfig.3.2.5-Xaw3d.patch
 
-Requires: transfig >= 1:3.2.4-12
+Requires: transfig >= 1:3.2.5
 Requires: evince
 Requires: ImageMagick
 Requires: aspell
 Requires: htmlview
 
-BuildPrereq: libjpeg-devel
-BuildPrereq: libpng-devel
-BuildPrereq: imake
-BuildPrereq: libICE-devel
-BuildPrereq: libSM-devel
-BuildPrereq: libX11-devel
-BuildPrereq: libXaw-devel
-BuildPrereq: libXext-devel
-BuildPrereq: libXi-devel
-BuildPrereq: libXmu-devel
-BuildPrereq: libXpm-devel
-BuildPrereq: libXt-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: imake
+BuildRequires: libICE-devel
+BuildRequires: libSM-devel
+BuildRequires: libX11-devel
+BuildRequires: libXaw-devel
+BuildRequires: libXext-devel
+BuildRequires: libXi-devel
+BuildRequires: libXmu-devel
+BuildRequires: libXpm-devel
+BuildRequires: libXt-devel
 
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Xfig is an X Window System tool for creating basic vector graphics,
@@ -58,13 +54,9 @@
 %patch0 -p1 -b .redhat
 %patch1 -p1 -b .fhs
 %patch2 -p1 -b .mkstemp
-%patch3 -p1 -b .cleanup
-%patch4 -p1 -b .fonts
-%patch5 -p1 -b .buffer
-%patch6 -p1 -b .xpm
 %patch7 -p1 -b .modularX
 %patch8 -p1 -b .pdfviewer
-%patch9 -p1 -b .xaw3d
+%patch9 -p1 -b .Xaw3d
 
 %build
 xmkmf
@@ -102,6 +94,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Mon Apr 16 2007 Than Ngo <than at redhat.com> - 3.2.5-1.fc7
+- 3.2.5
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.2.4-21.1
 - rebuild
 


--- xfig-3.2.4-fhs.patch DELETED ---


--- xfig-3.2.4-fonts.patch DELETED ---


--- xfig-3.2.4-mkstemp.diff DELETED ---


--- xfig-3.2.4-pdfviewer.patch DELETED ---


--- xfig.3.2.4-buffer.patch DELETED ---


--- xfig.3.2.4-cleanup.patch DELETED ---


--- xfig.3.2.4-modularX.patch DELETED ---


--- xfig.3.2.4-xaw3d.patch DELETED ---


--- xfig.3.2.4-xpm.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 16 13:31:46 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 09:31:46 -0400
Subject: rpms/system-config-printer/devel .cvsignore, 1.125, 1.126 sources,
	1.130, 1.131 system-config-printer.spec, 1.100, 1.101
Message-ID: <200704161331.l3GDVkKh024141@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore sources system-config-printer.spec 
Log Message:
* Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com> 0.7.63.1-1
- 0.7.63.1:
  - Small applet fixes.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- .cvsignore	5 Apr 2007 08:54:56 -0000	1.125
+++ .cvsignore	16 Apr 2007 13:31:44 -0000	1.126
@@ -107,3 +107,4 @@
 system-config-printer-0.7.62.tar.bz2
 pycups-1.9.20.tar.bz2
 system-config-printer-0.7.63.tar.bz2
+system-config-printer-0.7.63.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- sources	5 Apr 2007 08:54:56 -0000	1.130
+++ sources	16 Apr 2007 13:31:44 -0000	1.131
@@ -1,2 +1,2 @@
 95ade8184c74c7373e987b02a58ae451  pycups-1.9.20.tar.bz2
-0202245ebd76a50d76d2338f023323c7  system-config-printer-0.7.63.tar.bz2
+e88db64889abceaeab83bbe3a31b2c17  system-config-printer-0.7.63.1.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- system-config-printer.spec	5 Apr 2007 08:54:56 -0000	1.100
+++ system-config-printer.spec	16 Apr 2007 13:31:44 -0000	1.101
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.63
+Version: 0.7.63.1
 Release: 1%{?dist}
 License: GPL
 URL: http://cyberelk.net/tim/software/system-config-printer/
@@ -129,6 +129,10 @@
 fi
 
 %changelog
+* Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com> 0.7.63.1-1
+- 0.7.63.1:
+  - Small applet fixes.
+
 * Thu Apr  5 2007 Tim Waugh <twaugh at redhat.com> 0.7.63-1
 - 0.7.63:
   - Translation updates.



From fedora-cvs-commits at redhat.com  Mon Apr 16 13:39:13 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 09:39:13 -0400
Subject: rpms/transfig/devel transfig-3.2.5-modularX.patch, NONE,
	1.1 transfig.spec, 1.25, 1.26 transfig-3.2.4-badc.patch, 1.1,
	NONE transfig-3.2.4-gcc33.patch, 1.1,
	NONE transfig-3.2.4-lang.patch, 1.1,
	NONE transfig-3.2.4-modularX.patch, 1.1,
	NONE transfig.3.2.4-broken.patch, 1.2,
	NONE transfig.3.2.4-rgb.patch, 1.1,
	NONE transfig.3.2.4-strerror.patch, 1.1, NONE
Message-ID: <200704161339.l3GDdDmt023942@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/transfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23924

Modified Files:
	transfig.spec 
Added Files:
	transfig-3.2.5-modularX.patch 
Removed Files:
	transfig-3.2.4-badc.patch transfig-3.2.4-gcc33.patch 
	transfig-3.2.4-lang.patch transfig-3.2.4-modularX.patch 
	transfig.3.2.4-broken.patch transfig.3.2.4-rgb.patch 
	transfig.3.2.4-strerror.patch 
Log Message:
3.2.5


transfig-3.2.5-modularX.patch:
 Imakefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE transfig-3.2.5-modularX.patch ---
--- transfig.3.2.5/fig2dev/Imakefile.modularx	2007-04-16 14:49:29.000000000 +0200
+++ transfig.3.2.5/fig2dev/Imakefile	2007-04-16 14:51:15.000000000 +0200
@@ -34,7 +34,7 @@
 XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled
 XCOMM and installed xfig.
 
-XFIGLIBDIR =	/usr/local/lib/X11/xfig
+XFIGLIBDIR =	$(PROJECTROOT)/share/xfig
 
 XCOMM ******
 XCOMM If your system doesn't have the strerror() function (has sys_errlist) then
@@ -62,7 +62,7 @@
 XCOMM the full name (rgb.txt) now.
 XCOMM
 
-RGB = $(LIBDIR)/rgb.txt
+RGB = $(PROJECTROOT)/share/X11/rgb.txt
 
 XCOMM Comment out the following #define USEPNG if you don't want PNG support
 XCOMM Uncomment the #define for USEPNG if you want to be able to import
@@ -141,7 +141,7 @@
 
 #ifdef I18N
 I18N_DEFS = -DI18N 
-FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
+FIG2DEV_LIBDIR = $(PROJECTROOT)/share/fig2dev
 I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=$(FIG2DEV_LIBDIR) -DFIG2DEV_LIBDIR_STR=\\\"$(FIG2DEV_LIBDIR)\\\"
 
 #endif /* I18N */


Index: transfig.spec
===================================================================
RCS file: /cvs/dist/rpms/transfig/devel/transfig.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- transfig.spec	16 Aug 2006 17:51:35 -0000	1.25
+++ transfig.spec	16 Apr 2007 13:39:11 -0000	1.26
@@ -1,18 +1,13 @@
 Summary: A utility for converting FIG files (made by xfig) to other formats.
 Name: transfig
-Version: 3.2.4
-Release: 16
+Version: 3.2.5
+Release: 1%{?dist}
 Epoch: 1
 License: distributable
 Group: Applications/Multimedia
 Source: ftp://www-epb.lbl.gov/xfig/%{name}.%{version}.tar.gz
 
-Patch0: transfig.3.2.4-strerror.patch
-Patch1: transfig-3.2.4-gcc33.patch
-Patch2: transfig.3.2.4-broken.patch
-Patch3: transfig-3.2.4-badc.patch
-Patch4: transfig.3.2.4-rgb.patch
-Patch5: transfig-3.2.4-modularX.patch
+Patch5: transfig-3.2.5-modularX.patch
 Patch6: transfig.3.2.4-pstex.patch
 
 Requires:	ghostscript
@@ -21,7 +16,7 @@
 BuildRequires: libjpeg-devel
 BuildRequires: imake
 
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 The transfig utility creates a makefile which translates FIG (created
@@ -35,11 +30,7 @@
 
 %prep
 %setup -q -n %{name}.%{version}
-%patch0 -p1 -b .strerror
-%patch1 -p1 -b .gcc33
-%patch2 -p1 -b .broken
-%patch3 -p1 -b .badc
-%patch4 -p1 -b .rgb
+
 %patch5 -p1 -b .modularX
 %patch6 -p1 -b .pstex
 
@@ -75,6 +66,9 @@
 %{_datadir}/fig2dev
 
 %changelog
+* Mon Apr 16 2007 Than Ngo <than at redhat.com> - 1:3.2.5-1.fc7
+- 3.2.5
+
 * Wed Aug 16 2006 Stepan Kasal <skasal at redhat.com> - 1:3.2.4-16
 - Require ghostscript; fig2dev calls it.
 


--- transfig-3.2.4-badc.patch DELETED ---


--- transfig-3.2.4-gcc33.patch DELETED ---


--- transfig-3.2.4-lang.patch DELETED ---


--- transfig-3.2.4-modularX.patch DELETED ---


--- transfig.3.2.4-broken.patch DELETED ---


--- transfig.3.2.4-rgb.patch DELETED ---


--- transfig.3.2.4-strerror.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 16 13:39:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 09:39:53 -0400
Subject: rpms/python-virtinst/devel .cvsignore, 1.8, 1.9 python-virtinst.spec,
	1.16, 1.17 sources, 1.8, 1.9
Message-ID: <200704161339.l3GDdrIV024009@cvs.devel.redhat.com>

Author: berrange

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

Modified Files:
	.cvsignore python-virtinst.spec sources 
Log Message:
Updated to 0.103.0


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/python-virtinst/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Mar 2007 17:13:26 -0000	1.8
+++ .cvsignore	16 Apr 2007 13:39:51 -0000	1.9
@@ -1 +1 @@
-virtinst-0.102.0.tar.gz
+virtinst-0.103.0.tar.gz


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/dist/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- python-virtinst.spec	20 Mar 2007 17:13:26 -0000	1.16
+++ python-virtinst.spec	16 Apr 2007 13:39:51 -0000	1.17
@@ -2,17 +2,17 @@
 
 Summary: Python modules for starting Xen guest installations
 Name: python-virtinst
-Version: 0.102.0
+Version: 0.103.0
 Release: 1%{?dist}
 Source0: virtinst-%{version}.tar.gz
 License: GPL
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-ExcludeArch: ppc ppc64 s390 s390x 
-Url: http://hg.et.redhat.com/virt/applications/virtinst--devel
+ExcludeArch: ppc ppc64 s390 s390x
+Url: http://virt-manager.org/
 Provides: virtinst
-Requires: libvirt-python >= 0.2.0-3.fc7
+Requires: libvirt-python >= 0.2.1
 Requires: urlgrabber
 BuildRequires: python-devel
 Obsoletes: python-xeninst < 0.97.0
@@ -50,6 +50,13 @@
 %{_sbindir}/virt-install
 
 %changelog
+* Mon Apr 16 2007 Daniel P. Berrange <berrange at redhat.com> - 0.103.0-1.fc7
+- Updated to 0.103.0 release
+- More validation of UUIDs
+- Automatically reboot Windows guests with CDROM still attached
+- Allow '-'  in guest names
+- Adjust way distro detection is done
+
 * Tue Mar 20 2007 Daniel P. Berrange <berrange at redhat.com> - 0.102.0-1.fc7
 - Updated to 0.102.0 release
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/python-virtinst/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Mar 2007 17:13:26 -0000	1.8
+++ sources	16 Apr 2007 13:39:51 -0000	1.9
@@ -1 +1 @@
-cc7585f98120c27c4e931bc60b071b65  virtinst-0.102.0.tar.gz
+da72ef584f2479be981716af454950f6  virtinst-0.103.0.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr 16 13:43:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 09:43:01 -0400
Subject: rpms/mc/FC-6 mc-cloexec.patch, NONE, 1.1 mc-extensions.patch, 1.8,
	1.9 mc-showfree.patch, 1.10, 1.11 mc-utf8.patch, 1.23,
	1.24 mc.spec, 1.107, 1.108
Message-ID: <200704161343.l3GDh1AA024095@cvs.devel.redhat.com>

Author: jnovy

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

Modified Files:
	mc-extensions.patch mc-showfree.patch mc-utf8.patch mc.spec 
Added Files:
	mc-cloexec.patch 
Log Message:
- update to the CVS snapshot as of 24th Jan 2007 (fixes #220828)
- reenable gpm support as it is now fixed (#168076)
- display free space correctly for multiple filesystems (#225153)
  (thanks to Tomas Heinrich for patch)
- fix unowned directories (#233880)
- spec fixes, bindings fixes


mc-cloexec.patch:
 subshell.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE mc-cloexec.patch ---
--- mc-2006-11-14-16/src/subshell.c.desleak	2006-05-08 22:59:48.000000000 +0200
+++ mc-2006-11-14-16/src/subshell.c	2006-11-23 09:50:30.000000000 +0100
@@ -1150,6 +1152,7 @@
 #endif				/* I_FIND && I_PUSH */
 #endif				/* __osf__ || __linux__ */
 
+    fcntl(pty_slave, F_SETFD, FD_CLOEXEC);
     return pty_slave;
 }
 
@@ -1203,6 +1207,7 @@
     }
     if ((pty_slave = open (pty_name, O_RDWR)) == -1)
 	fprintf (stderr, "open (pty_name, O_RDWR): %s\r\n", pty_name);
+    fcntl(pty_slave, F_SETFD, FD_CLOEXEC);
     return pty_slave;
 }
 

mc-extensions.patch:
 configure     |    2 -
 configure.ac  |    2 -
 lib/mc.ext.in |   82 +++++++++++++++++++++++++++++++++++++++++++---------------
 3 files changed, 64 insertions(+), 22 deletions(-)

Index: mc-extensions.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/FC-6/mc-extensions.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mc-extensions.patch	8 Mar 2006 11:13:51 -0000	1.8
+++ mc-extensions.patch	16 Apr 2007 13:42:59 -0000	1.9
@@ -1,6 +1,6 @@
---- mc-4.6.1a/configure.ac.extensions	2005-11-11 03:03:55.000000000 +0100
-+++ mc-4.6.1a/configure.ac	2006-02-28 11:54:30.000000000 +0100
-@@ -83,7 +83,7 @@ AC_PROG_LN_S
+--- mc/configure.ac.extensions	2006-12-28 06:34:31.000000000 +0100
++++ mc/configure.ac	2007-01-04 15:42:15.000000000 +0100
+@@ -83,7 +83,7 @@
  AC_CHECK_TOOL(AR, ar, ar)
  
  dnl Only list browsers here that can be run in background (i.e. with `&')
@@ -9,9 +9,9 @@
  
  dnl
  dnl Ovverriding mmap support.  This has to be before AC_FUNC_MMAP is used.
---- mc-4.6.1a/configure.extensions	2006-02-15 21:12:35.000000000 +0100
-+++ mc-4.6.1a/configure	2006-02-28 12:03:54.000000000 +0100
-@@ -5791,7 +5791,7 @@ else
+--- mc/configure.extensions	2006-12-28 06:34:48.000000000 +0100
++++ mc/configure	2007-01-04 15:42:15.000000000 +0100
+@@ -7166,7 +7166,7 @@
  fi
  
  
@@ -20,9 +20,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
---- mc-4.6.1a/lib/mc.ext.in.extensions	2005-09-06 11:20:01.000000000 +0200
-+++ mc-4.6.1a/lib/mc.ext.in	2005-12-06 09:22:37.000000000 +0100
-@@ -216,14 +221,25 @@ shell/.7z
+--- mc/lib/mc.ext.in.extensions	2006-12-28 04:45:29.000000000 +0100
++++ mc/lib/mc.ext.in	2007-01-04 15:53:33.000000000 +0100
+@@ -220,14 +220,25 @@
  
  # C
  shell/.c
@@ -50,19 +50,22 @@
  	Open=%var{EDITOR:vi} %f
  
  # Object
-@@ -248,9 +264,11 @@ regex/\.(te?xi|texinfo)$
+@@ -251,10 +262,12 @@
+ 
  # GNU Info page
  type/^Info\ text
- 	Open=info -f %f
-+	#Open=pinfo %f
+-	Open=info -f %f
++	#Open=info -f %f
++	Open=pinfo %f
  
  shell/.info
- 	Open=info -f %f
-+	#Open=pinfo %f
+-	Open=info -f %f
++	#Open=info -f %f
++	Open=pinfo %f
  
  # Manual page
  # Exception - .so libraries are not manual pages
-@@ -319,6 +337,12 @@ type/^PPM
+@@ -328,18 +341,24 @@
  type/^Netpbm
  	Include=image
  
@@ -73,9 +76,14 @@
 +	Include=image
 +
  shell/.xcf
- 	Open=gimp %f
+ 	Open=(gimp %f &)
+ 
+ shell/.xbm
+-	Open=bitmap %f
++	Include=image
  
-@@ -330,7 +354,7 @@ shell/.xpm
+ shell/.xpm
+ 	Include=image
  	View=sxpm %f
  
  include/image
@@ -84,22 +92,37 @@
  	View=%view{ascii} identify %f
  	#View=%view{ascii} asciiview %f
  
-@@ -348,8 +372,12 @@ regex/\.([wW][aA][wW]22)$
+@@ -347,7 +366,8 @@
+ ### Sound files ###
+ 
+ regex/\.([wW][aA][vV]|[sS][nN][dD]|[vV][oO][cC]|[aA][uU]|[sS][mM][pP]|[aA][iI][fF][fF]|[sS][nN][dD])$
+-       Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
++	Open=play %f
++#       Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
+ 
+ regex/\.([mM][oO][dD]|[sS]3[mM]|[xX][mM]|[iI][tT]|[mM][tT][mM]|669|[sS][tT][mM]|[uU][lL][tT]|[fF][aA][rR])$
+        Open=mikmod %f
+@@ -357,11 +377,16 @@
         Open=vplay -s 22 %f
  
  regex/\.([mM][pP]3)$
--	Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f &); fi
+-	Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
 -	View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
 +	Include=audio
-+	#Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f &); fi
-+	#View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
++#	Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
++#	View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
 +
 +regex/\.([mM][kK][aA])$
 +	Include=audio
  
  regex/\.([oO][gG][gG])$
- 	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f &); fi
-@@ -362,6 +390,9 @@ regex/\.([wW][mM][aA])$
+-	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
++	Open=ogg123 %f
++#	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
+ 	View=%view{ascii} ogginfo %s
+ 
+ regex/\.([mM][iI][dD][iI]?|[rR][mM][iI][dD]?)$
+@@ -371,11 +396,15 @@
  	Open=mplayer -vo null %f
  	View=%view{ascii} mplayer -quiet -slave -frames 0 -vo null -ao null -identify %f 2>/dev/null | tail +13 || file %f
  
@@ -109,7 +132,14 @@
  
  ### Play lists ###
  
-@@ -386,20 +417,27 @@ regex/\.([mM][oO][vV]|[qQ][tT])$
+ regex/\.([mM]3[uU]|[pP][lL][sS])$
+-	Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi
++	Open=mplayer -vo null -playlist %f
++#	Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi
+ 
+ 
+ ### Video ###
+@@ -395,20 +424,27 @@
  regex/\.([mM][pP]4|[mM][pP][eE]?[gG])$
  	Include=video
  
@@ -138,7 +168,7 @@
  	#Open=(gtv %f >/dev/null 2>&1 &)
  	#Open=(xanim %f >/dev/null 2>&1 &)
  
-@@ -408,12 +446,13 @@ include/video
+@@ -417,12 +453,13 @@
  
  # Postscript
  type/^PostScript
@@ -154,7 +184,7 @@
  	#Open=(acroread %f &)
  	#Open=(ghostview %f &)
  	View=%view{ascii} pdftotext %f -
-@@ -424,7 +463,7 @@ type/^PDF
+@@ -433,7 +470,7 @@
  # html
  regex/\.([hH][tT][mM][lL]?)$
  	Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null
@@ -163,3 +193,36 @@
  
  # StarOffice 5.2
  shell/.sdw
+@@ -450,22 +487,27 @@
+ 
+ # Microsoft Word Document
+ regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$
+-	Open=(abiword %f >/dev/null 2>&1 &)
++	Open=(ooffice %f &)
++#	Open=(abiword %f >/dev/null 2>&1 &)
+ 	View=%view{ascii} catdoc -w %f || word2x -f text %f - || strings %f
+ type/^Microsoft\ Word
+-	Open=(abiword %f >/dev/null 2>&1 &)
++	Open=(ooffice %f &)
++#	Open=(abiword %f >/dev/null 2>&1 &)
+ 	View=%view{ascii} catdoc -w %f || word2x -f text %f - || strings %f
+ 
+ # RTF document
+ regex/\.([rR][tT][fF])$
+-	Open=(abiword %f >/dev/null 2>&1 &)
++	Open=(ooffice %f &)
++#	Open=(abiword %f >/dev/null 2>&1 &)
+ 
+ # Microsoft Excel Worksheet
+ regex/\.([xX][lL][sSwW])$
+-	Open=(gnumeric %f >/dev/null 2>&1 &)
++	Open=(ooffice %f &)
++#	Open=(gnumeric %f >/dev/null 2>&1 &)
+ 	View=%view{ascii} xls2csv %f || strings %f
+ type/^Microsoft\ Excel
+-	Open=(gnumeric %f >/dev/null 2>&1 &)
++	Open=(ooffice %f &)
++#	Open=(gnumeric %f >/dev/null 2>&1 &)
+ 	View=%view{ascii} xls2csv %f || strings %f
+ 
+ # Use OpenOffice.org to open any MS Office documents

mc-showfree.patch:
 layout.c |   59 +++++++++++++++++++++++++++++++++--------------------------
 layout.h |    1 +
 main.c   |   41 +++++++++++++++++++++++++++++++++++++++++
 main.h   |    2 ++
 screen.c |    5 ++++-
 setup.c  |    1 +
 6 files changed, 82 insertions(+), 27 deletions(-)

Index: mc-showfree.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/FC-6/mc-showfree.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mc-showfree.patch	10 Jul 2006 12:25:08 -0000	1.10
+++ mc-showfree.patch	16 Apr 2007 13:42:59 -0000	1.11
@@ -1,5 +1,5 @@
---- mc-4.6.1a/src/setup.c.showfree	2006-02-23 16:32:18.000000000 +0100
-+++ mc-4.6.1a/src/setup.c	2006-07-10 12:44:43.000000000 +0200
+--- mc-2007-01-24-03/src/setup.c.showfree	2006-02-23 16:45:06.000000000 +0100
++++ mc-2007-01-24-03/src/setup.c	2007-02-15 09:53:48.000000000 +0100
 @@ -134,6 +134,7 @@
      { "show_mini_info", &show_mini_info },
      { "permission_mode", &permission_mode },
@@ -8,8 +8,8 @@
      { 0, 0 }
  };
  
---- mc-4.6.1a/src/main.c.showfree	2006-07-10 12:44:43.000000000 +0200
-+++ mc-4.6.1a/src/main.c	2006-07-10 14:09:24.000000000 +0200
+--- mc-2007-01-24-03/src/main.c.showfree	2007-02-15 09:53:48.000000000 +0100
++++ mc-2007-01-24-03/src/main.c	2007-02-15 09:53:48.000000000 +0100
 @@ -61,6 +61,7 @@
  #include "listmode.h"
  #include "execute.h"
@@ -40,7 +40,7 @@
      update_one_panel (get_current_index (), force_update, current_file);
      if (reload_other)
  	update_one_panel (get_other_index (), force_update, UP_KEEPSEL);
-@@ -467,6 +476,48 @@
+@@ -467,6 +476,38 @@
      }
  }
  
@@ -52,25 +52,15 @@
 +	return;
 +   
 +    if (old_cwd == NULL || strcmp(old_cwd, panel->cwd) != 0) {
-+    	struct stat st;
++	char rpath[PATH_MAX];
 +    
 +	init_my_statfs();
 +	g_free(old_cwd);
 +	old_cwd = g_strdup(panel->cwd);
 +	
-+	if ( mc_lstat (panel->cwd, &st) )
-+	    return;
-+
-+	if ( !S_ISLNK (st.st_mode) ) {
-+	    my_statfs (&myfs_stats, panel->cwd);
-+	} else
-+	{
-+	    char buf[MC_MAXPATHLEN];
-+	    memset (buf, 0, sizeof(buf));
-+	    if ( mc_readlink (panel->cwd, buf, sizeof(buf)-1) <= 0 )
-+	    	return;
-+	    my_statfs (&myfs_stats, buf);
-+	}
++	if (mc_realpath (panel->cwd, rpath) == NULL)
++            return;
++	my_statfs (&myfs_stats, rpath);
 +    }
 +   
 +    if (myfs_stats.avail > 0 || myfs_stats.total > 0) {
@@ -89,8 +79,8 @@
  static int
  quit_cmd_internal (int quiet)
  {
---- mc-4.6.1a/src/main.h.showfree	2006-07-10 12:44:43.000000000 +0200
-+++ mc-4.6.1a/src/main.h	2006-07-10 12:44:43.000000000 +0200
+--- mc-2007-01-24-03/src/main.h.showfree	2007-02-15 09:53:48.000000000 +0100
++++ mc-2007-01-24-03/src/main.h	2007-02-15 09:53:48.000000000 +0100
 @@ -55,6 +55,7 @@
  extern int show_all_if_ambiguous;
  extern int slow_terminal;
@@ -107,8 +97,8 @@
  
  void touch_bar      (void);
  void update_xterm_title_path (void);
---- mc-4.6.1a/src/screen.c.showfree	2006-07-10 12:44:43.000000000 +0200
-+++ mc-4.6.1a/src/screen.c	2006-07-10 12:44:43.000000000 +0200
+--- mc-2007-01-24-03/src/screen.c.showfree	2007-02-15 09:53:48.000000000 +0100
++++ mc-2007-01-24-03/src/screen.c	2007-02-15 09:53:48.000000000 +0100
 @@ -47,7 +47,7 @@
  #include "widget.h"
  #include "menu.h"		/* menubar_visible */
@@ -126,7 +116,7 @@
  }
  
  static void
-@@ -929,6 +930,8 @@
+@@ -910,6 +911,8 @@
      widget_move (&panel->widget, 0, panel->widget.cols - 3);
      addstr ("v");
  
@@ -135,9 +125,9 @@
      if (panel->active)
  	standend ();
  }
---- mc-4.6.1a/src/layout.c.showfree	2006-07-10 12:44:43.000000000 +0200
-+++ mc-4.6.1a/src/layout.c	2006-07-10 12:44:43.000000000 +0200
-@@ -99,6 +99,9 @@
+--- mc-2007-01-24-03/src/layout.c.showfree	2007-02-15 09:53:47.000000000 +0100
++++ mc-2007-01-24-03/src/layout.c	2007-02-15 09:53:48.000000000 +0100
+@@ -96,6 +96,9 @@
  /* Set to show current working dir in xterm window title */
  int xterm_title = 1;
  
@@ -147,7 +137,7 @@
  /* The starting line for the output of the subprogram */
  int output_start_y = 0;
  
-@@ -128,6 +131,7 @@
+@@ -125,6 +128,7 @@
  static int _keybar_visible;
  static int _message_visible;
  static int _xterm_title;
@@ -155,7 +145,7 @@
  static int _permission_mode;
  static int _filetype_mode;
  
-@@ -158,6 +162,7 @@
+@@ -155,6 +159,7 @@
      int    *variable;
      WCheck *widget;
  } check_options [] = {
@@ -163,7 +153,7 @@
      { N_("&Xterm window title"), &xterm_title,   0 },
      { N_("h&Intbar visible"),  &message_visible, 0 },
      { N_("&Keybar visible"),   &keybar_visible,  0 },
-@@ -229,8 +234,8 @@
+@@ -226,8 +231,8 @@
      if (_equal_split){
  	/* Turn equal split off */
  	_equal_split = 0;
@@ -174,7 +164,7 @@
  	dlg_select_widget (bleft_widget);
      }
      _first_panel_size++;
-@@ -244,8 +249,8 @@
+@@ -241,8 +246,8 @@
      if (_equal_split){
  	/* Turn equal split off */
  	_equal_split = 0;
@@ -185,7 +175,7 @@
  	dlg_select_widget (bright_widget);
      }
      _first_panel_size--;
-@@ -291,23 +296,24 @@
+@@ -288,23 +293,24 @@
  	    if (old_output_lines != _output_lines){
  		old_output_lines = _output_lines;
  		attrset (COLOR_NORMAL);
@@ -220,7 +210,7 @@
  	if (console_flag){
  	    int minimum;
  	    if (_output_lines < 0)
-@@ -335,7 +341,7 @@
+@@ -332,7 +338,7 @@
  	    if (old_output_lines != _output_lines){
  		old_output_lines = _output_lines;
  		attrset (COLOR_NORMAL);
@@ -229,7 +219,7 @@
  		tty_printf ("%02d", _output_lines);
  	    }
  	}
-@@ -374,7 +380,7 @@
+@@ -371,7 +377,7 @@
  		first_width = l1;
  	}
  
@@ -238,7 +228,7 @@
  	    check_options[i].text = _(check_options[i].text);
  	    l1 = mbstrlen (check_options[i].text) + 7;
  	    if (l1 > first_width)
-@@ -391,7 +397,7 @@
+@@ -388,7 +394,7 @@
  
  
  	second_width = mbstrlen (title3) + 1;
@@ -247,7 +237,7 @@
  	    check_options[i].text = _(check_options[i].text);
  	    l1 = mbstrlen (check_options[i].text) + 7;
  	    if (l1 > second_width)
-@@ -446,23 +452,23 @@
+@@ -443,23 +449,23 @@
  			    0));
      if (console_flag) {
  	add_widget (layout_dlg,
@@ -278,7 +268,7 @@
  
      _filetype_mode = filetype_mode;
      _permission_mode = permission_mode;
-@@ -472,20 +478,21 @@
+@@ -469,20 +475,21 @@
      _keybar_visible = keybar_visible;
      _message_visible = message_visible;
      _xterm_title = xterm_title;
@@ -302,8 +292,8 @@
      radio_widget = radio_new (3, 6, 2, s_split_direction);
      add_widget (layout_dlg, radio_widget);
      radio_widget->sel = horizontal_split;
---- mc-4.6.1a/src/layout.h.showfree	2004-12-03 20:17:47.000000000 +0100
-+++ mc-4.6.1a/src/layout.h	2006-07-10 12:44:43.000000000 +0200
+--- mc-2007-01-24-03/src/layout.h.showfree	2004-12-03 20:17:47.000000000 +0100
++++ mc-2007-01-24-03/src/layout.h	2007-02-15 09:53:48.000000000 +0100
 @@ -39,6 +39,7 @@
  extern int output_start_y;
  extern int message_visible;

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

Index: mc-utf8.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/FC-6/mc-utf8.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mc-utf8.patch	10 Oct 2006 11:43:56 -0000	1.23
+++ mc-utf8.patch	16 Apr 2007 13:42:59 -0000	1.24
@@ -1,5 +1,5 @@
---- mc-2006-09-25-14/acinclude.m4.utf8	2006-09-09 00:35:29.000000000 +0200
-+++ mc-2006-09-25-14/acinclude.m4	2006-10-10 09:35:14.000000000 +0200
+--- mc/acinclude.m4.utf8	2006-09-09 00:35:29.000000000 +0200
++++ mc/acinclude.m4	2007-01-04 16:20:56.000000000 +0100
 @@ -399,14 +399,14 @@ AC_DEFUN([MC_WITH_SLANG], [
      fi
  
@@ -23,8 +23,8 @@
  
      if test x$with_screen = xslang; then
  	AC_DEFINE(HAVE_SYSTEM_SLANG, 1,
---- mc-2006-09-25-14/src/layout.c.utf8	2006-09-25 16:47:33.000000000 +0200
-+++ mc-2006-09-25-14/src/layout.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/layout.c.utf8	2006-11-10 01:22:30.000000000 +0100
++++ mc/src/layout.c	2007-01-04 16:20:56.000000000 +0100
 @@ -366,36 +366,36 @@ init_layout (void)
  
  	while (i--) {
@@ -98,8 +98,8 @@
  
      widget_set_size (&the_menubar->widget, 0, 0, 1, COLS);
  
---- mc-2006-09-25-14/src/tty.c.utf8	2006-05-23 16:20:39.000000000 +0200
-+++ mc-2006-09-25-14/src/tty.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/tty.c.utf8	2006-05-23 16:20:39.000000000 +0200
++++ mc/src/tty.c	2007-01-04 16:20:56.000000000 +0100
 @@ -134,10 +134,12 @@ tty_print_char(int c)
       * defined or not. Congratulations! At least, they left the API call
       * for SLsmg_write_nchars as it has always been.
@@ -117,8 +117,8 @@
  #else
      addch(c);
  #endif
---- mc-2006-09-25-14/src/option.c.utf8	2006-02-28 18:44:28.000000000 +0100
-+++ mc-2006-09-25-14/src/option.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/option.c.utf8	2006-02-28 18:44:28.000000000 +0100
++++ mc/src/option.c	2007-01-04 16:20:56.000000000 +0100
 @@ -123,12 +123,12 @@ init_configure (void)
  	title2 = _(" Pause after run... ");
  	title3 = _(" Other options ");
@@ -166,8 +166,8 @@
  
  	i18n_config_flag = 1;
      }
---- mc-2006-09-25-14/src/menu.h.utf8	2004-12-03 20:17:47.000000000 +0100
-+++ mc-2006-09-25-14/src/menu.h	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/menu.h.utf8	2004-12-03 20:17:47.000000000 +0100
++++ mc/src/menu.h	2007-01-04 16:20:56.000000000 +0100
 @@ -21,6 +21,8 @@ typedef struct Menu {
      menu_entry *entries;
      int    start_x;		/* position relative to menubar start */
@@ -177,8 +177,8 @@
  } Menu;
  
  extern int menubar_visible;
---- mc-2006-09-25-14/src/menu.c.utf8	2005-09-06 22:36:23.000000000 +0200
-+++ mc-2006-09-25-14/src/menu.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/menu.c.utf8	2005-09-06 22:36:23.000000000 +0200
++++ mc/src/menu.c	2007-01-04 16:20:56.000000000 +0100
 @@ -22,6 +22,7 @@
  #include <string.h>
  
@@ -380,8 +380,8 @@
      g_free (menu->name);
      g_free (menu->help_node);
      g_free (menu);
---- mc-2006-09-25-14/src/filegui.c.utf8	2006-01-30 18:01:58.000000000 +0100
-+++ mc-2006-09-25-14/src/filegui.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/filegui.c.utf8	2006-01-30 18:01:58.000000000 +0100
++++ mc/src/filegui.c	2007-01-04 16:20:56.000000000 +0100
 @@ -65,6 +65,7 @@
  #include "filegui.h"
  #include "key.h"		/* get_event */
@@ -527,8 +527,8 @@
 +    g_free(def_text);
      return dest_dir;
  }
---- mc-2006-09-25-14/src/panelize.c.utf8	2005-05-27 05:35:15.000000000 +0200
-+++ mc-2006-09-25-14/src/panelize.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/panelize.c.utf8	2005-05-27 05:35:15.000000000 +0200
++++ mc/src/panelize.c	2007-01-04 16:20:56.000000000 +0100
 @@ -127,7 +127,7 @@ init_panelize (void)
  	i = sizeof (panelize_but) / sizeof (panelize_but[0]);
  	while (i--) {
@@ -553,8 +553,8 @@
  
  #endif				/* ENABLE_NLS */
  
---- mc-2006-09-25-14/src/slint.c.utf8	2005-09-06 22:36:23.000000000 +0200
-+++ mc-2006-09-25-14/src/slint.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/slint.c.utf8	2005-09-06 22:36:23.000000000 +0200
++++ mc/src/slint.c	2007-01-04 16:20:56.000000000 +0100
 @@ -141,7 +141,9 @@ void
  slang_init (void)
  {
@@ -566,8 +566,8 @@
     /*
      * If the terminal in not in terminfo but begins with a well-known
      * string such as "linux" or "xterm" S-Lang will go on, but the
---- mc-2006-09-25-14/src/main.c.utf8	2006-09-25 16:47:34.000000000 +0200
-+++ mc-2006-09-25-14/src/main.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/main.c.utf8	2006-09-25 16:47:34.000000000 +0200
++++ mc/src/main.c	2007-01-04 16:20:56.000000000 +0100
 @@ -704,7 +704,7 @@ load_prompt (int fd, void *unused)
  	int prompt_len;
  
@@ -589,8 +589,8 @@
  		*s = '?';
  	} while (*++s);
  	fprintf (stdout, "\33]0;mc - %s\7", p);
---- mc-2006-09-25-14/src/view.c.utf8	2006-08-03 17:50:57.000000000 +0200
-+++ mc-2006-09-25-14/src/view.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/view.c.utf8	2006-12-12 18:39:33.000000000 +0100
++++ mc/src/view.c	2007-01-04 16:20:56.000000000 +0100
 @@ -43,6 +43,10 @@
  #include <sys/stat.h>
  #include <unistd.h>
@@ -681,8 +681,8 @@
  	}
  	col++;
  	tty_setcolor (NORMAL_COLOR);
---- mc-2006-09-25-14/src/screen.c.utf8	2006-02-09 02:59:16.000000000 +0100
-+++ mc-2006-09-25-14/src/screen.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/screen.c.utf8	2006-02-09 02:59:16.000000000 +0100
++++ mc/src/screen.c	2007-01-04 16:20:56.000000000 +0100
 @@ -171,21 +171,56 @@ add_permission_string (char *dest, int w
  static const char *
  string_file_name (file_entry *fe, int len)
@@ -1110,8 +1110,8 @@
  
      paint_panel (panel);
  }
---- mc-2006-09-25-14/src/widget.h.utf8	2006-02-28 18:44:28.000000000 +0100
-+++ mc-2006-09-25-14/src/widget.h	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/widget.h.utf8	2006-02-28 18:44:28.000000000 +0100
++++ mc/src/widget.h	2007-01-04 16:20:56.000000000 +0100
 @@ -22,6 +22,7 @@ typedef struct WButton {
      char *text;			/* text of button */
      int hotkey;			/* hot KEY */
@@ -1154,8 +1154,8 @@
      GList *history;		/* The history */
      int  need_push;		/* need to push the current Input on hist? */
      char **completions;		/* Possible completions array */
---- mc-2006-09-25-14/src/tty.h.utf8	2006-05-15 17:46:20.000000000 +0200
-+++ mc-2006-09-25-14/src/tty.h	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/tty.h.utf8	2006-05-15 17:46:20.000000000 +0200
++++ mc/src/tty.h	2007-01-04 16:20:56.000000000 +0100
 @@ -8,6 +8,8 @@
      of ifdefs in the other files small.
   */
@@ -1165,8 +1165,8 @@
  #ifdef HAVE_SLANG
  #   include "myslang.h"
  #endif
---- mc-2006-09-25-14/src/hotlist.c.utf8	2006-08-08 19:55:46.000000000 +0200
-+++ mc-2006-09-25-14/src/hotlist.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/hotlist.c.utf8	2006-08-08 19:55:46.000000000 +0200
++++ mc/src/hotlist.c	2007-01-04 16:20:56.000000000 +0100
 @@ -563,7 +563,7 @@ init_i18n_stuff(int list_type, int cols)
  
  			row = hotlist_but [i].y;
@@ -1227,8 +1227,8 @@
      char *label_string = g_strdup (current_panel->cwd);
  
      strip_password (label_string, 1);
---- mc-2006-09-25-14/src/help.c.utf8	2005-07-22 11:29:50.000000000 +0200
-+++ mc-2006-09-25-14/src/help.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/help.c.utf8	2005-07-22 11:29:50.000000000 +0200
++++ mc/src/help.c	2007-01-04 16:20:56.000000000 +0100
 @@ -449,10 +449,28 @@ static void help_show (Dlg_head *h, cons
  #ifndef HAVE_SLANG
  			addch (acs_map [c]);
@@ -1271,8 +1271,8 @@
  
      if (!filename)
  	g_free (hlpfile);
---- mc-2006-09-25-14/src/wtools.c.utf8	2006-09-14 16:16:10.000000000 +0200
-+++ mc-2006-09-25-14/src/wtools.c	2006-10-10 09:36:13.000000000 +0200
+--- mc/src/wtools.c.utf8	2006-09-14 16:16:10.000000000 +0200
++++ mc/src/wtools.c	2007-01-04 16:20:56.000000000 +0100
 @@ -49,11 +49,11 @@ create_listbox_window (int cols, int lin
      /* Adjust sizes */
      lines = (lines > LINES - 6) ? LINES - 6 : lines;
@@ -1332,8 +1332,8 @@
      quick_widgets[0].x_divisions = quick_widgets[1].x_divisions = len;
  #endif				/* ENABLE_NLS */
  
---- mc-2006-09-25-14/src/util.h.utf8	2006-02-06 17:55:43.000000000 +0100
-+++ mc-2006-09-25-14/src/util.h	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/util.h.utf8	2006-02-06 17:55:43.000000000 +0100
++++ mc/src/util.h	2007-01-04 16:20:56.000000000 +0100
 @@ -103,6 +103,13 @@ void init_uid_gid_cache (void);
  char *get_group (int);
  char *get_owner (int);
@@ -1348,8 +1348,8 @@
  #define MAX_I18NTIMELENGTH 14
  #define MIN_I18NTIMELENGTH 10
  #define STD_I18NTIMELENGTH 12
---- mc-2006-09-25-14/src/widget.c.utf8	2006-05-30 15:46:15.000000000 +0200
-+++ mc-2006-09-25-14/src/widget.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/widget.c.utf8	2006-05-30 15:46:15.000000000 +0200
++++ mc/src/widget.c	2007-01-04 16:20:56.000000000 +0100
 @@ -36,6 +36,9 @@
  
  #include "global.h"
@@ -2065,8 +2065,8 @@
      return in;
  }
  
---- mc-2006-09-25-14/src/util.c.utf8	2005-11-03 03:01:12.000000000 +0100
-+++ mc-2006-09-25-14/src/util.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/util.c.utf8	2005-11-03 03:01:12.000000000 +0100
++++ mc/src/util.c	2007-01-04 16:20:56.000000000 +0100
 @@ -33,7 +33,11 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -2536,8 +2536,8 @@
      }
      *w = 0;
      return s;
---- mc-2006-09-25-14/src/file.c.utf8	2006-05-23 16:20:39.000000000 +0200
-+++ mc-2006-09-25-14/src/file.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/file.c.utf8	2006-05-23 16:20:39.000000000 +0200
++++ mc/src/file.c	2007-01-04 16:20:56.000000000 +0100
 @@ -161,15 +161,20 @@ static const char *
  do_transform_source (FileOpContext *ctx, const char *source)
  {
@@ -2592,8 +2592,8 @@
  	if (i > 0) {
  	    fmd_xlen += i;
  	    fmd_init_i18n (TRUE);	/* to recalculate positions of child widgets */
---- mc-2006-09-25-14/src/find.c.utf8	2006-02-06 17:55:43.000000000 +0100
-+++ mc-2006-09-25-14/src/find.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/find.c.utf8	2006-02-06 17:55:43.000000000 +0100
++++ mc/src/find.c	2007-01-04 16:20:56.000000000 +0100
 @@ -217,7 +217,7 @@ find_parameters (char **start_dir, char 
  	int l1, maxlen = 0;
  
@@ -2641,8 +2641,8 @@
  	    list->list[next_free].fname = name;
  	    list->list[next_free].f.marked = 0;
  	    list->list[next_free].f.link_to_dir = link_to_dir;
---- mc-2006-09-25-14/src/myslang.h.utf8	2005-09-06 22:36:23.000000000 +0200
-+++ mc-2006-09-25-14/src/myslang.h	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/myslang.h.utf8	2005-09-06 22:36:23.000000000 +0200
++++ mc/src/myslang.h	2007-01-04 16:20:56.000000000 +0100
 @@ -11,6 +11,16 @@
  #endif	/* HAVE_SLANG_SLANG_H */
  #endif
@@ -2660,8 +2660,8 @@
  enum {
      KEY_BACKSPACE = 400,
      KEY_END, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT,
---- mc-2006-09-25-14/src/achown.c.utf8	2005-09-06 22:36:23.000000000 +0200
-+++ mc-2006-09-25-14/src/achown.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/achown.c.utf8	2005-09-06 22:36:23.000000000 +0200
++++ mc/src/achown.c	2007-01-04 16:20:56.000000000 +0100
 @@ -584,6 +584,12 @@ init_chown_advanced (void)
      b_att[2] = button_new (XTRACT (6));
      b_user = button_new (XTRACT (5));
@@ -2675,8 +2675,8 @@
  
      add_widget (ch_dlg, b_group);
      add_widget (ch_dlg, b_user);
---- mc-2006-09-25-14/src/dialog.c.utf8	2005-09-06 22:36:23.000000000 +0200
-+++ mc-2006-09-25-14/src/dialog.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/dialog.c.utf8	2005-09-06 22:36:23.000000000 +0200
++++ mc/src/dialog.c	2007-01-04 16:20:56.000000000 +0100
 @@ -166,7 +166,7 @@ common_dialog_repaint (struct Dlg_head *
  
      if (h->title) {
@@ -2686,8 +2686,8 @@
  	addstr (h->title);
      }
  }
---- mc-2006-09-25-14/src/boxes.c.utf8	2006-02-28 18:44:28.000000000 +0100
-+++ mc-2006-09-25-14/src/boxes.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/boxes.c.utf8	2006-02-28 18:44:28.000000000 +0100
++++ mc/src/boxes.c	2007-01-04 16:20:56.000000000 +0100
 @@ -153,23 +153,23 @@ display_init (int radio_sel, char *init_
  	display_title = _(display_title);
  	for (i = 0; i < LIST_TYPES; i++) {
@@ -2860,8 +2860,8 @@
          
          i18n_flag = 1;
      }
---- mc-2006-09-25-14/src/learn.c.utf8	2005-05-27 05:35:15.000000000 +0200
-+++ mc-2006-09-25-14/src/learn.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/learn.c.utf8	2005-05-27 05:35:15.000000000 +0200
++++ mc/src/learn.c	2007-01-04 16:20:56.000000000 +0100
 @@ -237,7 +237,7 @@ init_learn (void)
  	learn_but[0].x = 78 / 2 + 4;
  
@@ -2871,8 +2871,8 @@
  
  	learn_title = _(learn_title);
  	i18n_flag = 1;
---- mc-2006-09-25-14/edit/edit-widget.h.utf8	2006-03-20 17:44:32.000000000 +0100
-+++ mc-2006-09-25-14/edit/edit-widget.h	2006-10-10 09:35:14.000000000 +0200
+--- mc/edit/edit-widget.h.utf8	2006-03-20 17:44:32.000000000 +0100
++++ mc/edit/edit-widget.h	2007-01-04 16:20:56.000000000 +0100
 @@ -30,6 +30,11 @@ typedef struct edit_key_map_type {
      long command;
  } edit_key_map_type;
@@ -2912,8 +2912,8 @@
      unsigned long stack_size;
      unsigned long stack_size_mask;
      unsigned long stack_bottom;
---- mc-2006-09-25-14/edit/editkeys.c.utf8	2006-02-02 00:05:15.000000000 +0100
-+++ mc-2006-09-25-14/edit/editkeys.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/edit/editkeys.c.utf8	2006-02-02 00:05:15.000000000 +0100
++++ mc/edit/editkeys.c	2007-01-04 16:20:56.000000000 +0100
 @@ -182,10 +182,10 @@ static const edit_key_map_type common_ke
   * 'command' is one of the editor commands from editcmddef.h.
   */
@@ -2968,9 +2968,9 @@
  	/* unchanged, key has no function here */
  	return 0;
      }
---- mc-2006-09-25-14/edit/editwidget.c.utf8	2005-09-07 17:53:03.000000000 +0200
-+++ mc-2006-09-25-14/edit/editwidget.c	2006-10-10 09:35:14.000000000 +0200
-@@ -344,7 +344,8 @@ edit_callback (Widget *w, widget_msg_t m
+--- mc/edit/editwidget.c.utf8	2006-12-12 18:39:33.000000000 +0100
++++ mc/edit/editwidget.c	2007-01-04 16:20:56.000000000 +0100
+@@ -331,7 +331,8 @@ edit_callback (Widget *w, widget_msg_t m
  
      case WIDGET_KEY:
  	{
@@ -2980,8 +2980,8 @@
  
  	    /* The user may override the access-keys for the menu bar. */
  	    if (edit_translate_key (e, parm, &cmd, &ch)) {
---- mc-2006-09-25-14/edit/editcmd.c.utf8	2006-03-20 17:44:32.000000000 +0100
-+++ mc-2006-09-25-14/edit/editcmd.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/edit/editcmd.c.utf8	2006-11-27 15:19:29.000000000 +0100
++++ mc/edit/editcmd.c	2007-01-04 16:20:56.000000000 +0100
 @@ -61,7 +61,7 @@
  #define edit_get_save_file(f,h) input_expand_dialog (h, _(" Enter file name: "), f)
  
@@ -3074,7 +3074,7 @@
  /*  If 0 (quick save) then  a) create/truncate <filename> file,
  			    b) save to <filename>;
      if 1 (safe save) then   a) save to <tempnam>,
-@@ -345,32 +391,48 @@ edit_save_file (WEdit *edit, const char 
+@@ -360,32 +406,48 @@ edit_save_file (WEdit *edit, const char 
  	buf = 0;
  	filelen = edit->last_byte;
  	while (buf <= (edit->curs1 >> S_EDIT_BUF_SIZE) - 1) {
@@ -3126,7 +3126,7 @@
  			 EDIT_BUF_SIZE) != EDIT_BUF_SIZE) {
  			filelen = -1;
  			break;
-@@ -686,13 +748,21 @@ edit_delete_macro (WEdit * edit, int k)
+@@ -705,13 +767,21 @@ edit_delete_macro (WEdit * edit, int k)
  	if (!n || n == EOF)
  	    break;
  	n = 0;
@@ -3148,7 +3148,7 @@
  	    fprintf (g, ";\n");
  	}
      }
-@@ -725,7 +795,11 @@ int edit_save_macro_cmd (WEdit * edit, s
+@@ -744,7 +814,11 @@ int edit_save_macro_cmd (WEdit * edit, s
  	if (f) {
  	    fprintf (f, ("key '%d 0': "), s);
  	    for (i = 0; i < n; i++)
@@ -3160,7 +3160,7 @@
  	    fprintf (f, ";\n");
  	    fclose (f);
  	    if (saved_macros_loaded) {
-@@ -775,10 +849,18 @@ int edit_load_macro_cmd (WEdit * edit, s
+@@ -794,10 +868,18 @@ int edit_load_macro_cmd (WEdit * edit, s
  		saved_macro[i++] = s;
  	    if (!found) {
  		*n = 0;
@@ -3179,7 +3179,7 @@
  	    }
  	    fscanf (f, ";\n");
  	    if (s == k)
-@@ -925,7 +1007,7 @@ int eval_marks (WEdit * edit, long *star
+@@ -944,7 +1026,7 @@ int eval_marks (WEdit * edit, long *star
  #define space_width 1
  
  static void
@@ -3188,7 +3188,7 @@
  {
      long cursor;
      int i, col;
-@@ -973,7 +1055,7 @@ edit_block_copy_cmd (WEdit *edit)
+@@ -992,7 +1074,7 @@ edit_block_copy_cmd (WEdit *edit)
  {
      long start_mark, end_mark, current = edit->curs1;
      int size;
@@ -3197,7 +3197,7 @@
  
      edit_update_curs_col (edit);
      if (eval_marks (edit, &start_mark, &end_mark))
-@@ -1013,7 +1095,7 @@ edit_block_move_cmd (WEdit *edit)
+@@ -1032,7 +1114,7 @@ edit_block_move_cmd (WEdit *edit)
  {
      long count;
      long current;
@@ -3206,7 +3206,7 @@
      long start_mark, end_mark;
      int deleted = 0;
      int x = 0;
-@@ -1074,7 +1156,7 @@ edit_block_move_cmd (WEdit *edit)
+@@ -1093,7 +1175,7 @@ edit_block_move_cmd (WEdit *edit)
  	edit_push_action (edit, COLUMN_ON);
  	column_highlighting = 0;
      } else {
@@ -3215,7 +3215,7 @@
  	edit_cursor_move (edit, start_mark - edit->curs1);
  	edit_scroll_screen_over_cursor (edit);
  	count = start_mark;
-@@ -1413,7 +1495,11 @@ static long sargs[NUM_REPL_ARGS][256 / s
+@@ -1432,7 +1514,11 @@ static long sargs[NUM_REPL_ARGS][256 / s
  /* This function is a modification of mc-3.2.10/src/view.c:regexp_view_search() */
  /* returns -3 on error in pattern, -1 on not found, found_len = 0 if either */
  static int
@@ -3227,7 +3227,7 @@
  		      int match_bol, int icase, int *found_len, void *d)
  {
      static regex_t r;
-@@ -1422,6 +1508,11 @@ string_regexp_search (char *pattern, cha
+@@ -1441,6 +1527,11 @@ string_regexp_search (char *pattern, cha
      regmatch_t *pmatch;
      static regmatch_t s[1];
  
@@ -3239,7 +3239,7 @@
      pmatch = (regmatch_t *) d;
      if (!pmatch)
  	pmatch = s;
-@@ -1441,13 +1532,51 @@ string_regexp_search (char *pattern, cha
+@@ -1460,13 +1551,51 @@ string_regexp_search (char *pattern, cha
  	old_type = match_type;
  	old_icase = icase;
      }
@@ -3291,7 +3291,7 @@
      *found_len = pmatch[0].rm_eo - pmatch[0].rm_so;
      return (pmatch[0].rm_so);
  }
-@@ -1455,13 +1584,29 @@ string_regexp_search (char *pattern, cha
+@@ -1474,13 +1603,29 @@ string_regexp_search (char *pattern, cha
  /* thanks to  Liviu Daia <daia at stoilow.imar.ro>  for getting this
     (and the above) routines to work properly - paul */
  
@@ -3322,7 +3322,7 @@
      int n = 0;
  
      for (p = 0; p < l; p++)	/* count conversions... */
-@@ -1470,19 +1615,22 @@ edit_find_string (long start, unsigned c
+@@ -1489,19 +1634,22 @@ edit_find_string (long start, unsigned c
  		n++;
  
      if (replace_scanf || replace_regexp) {
@@ -3352,7 +3352,7 @@
  	    if (replace_case) {
  		for (p = start; p < last_byte && p < start + MAX_REPL_LEN; p++)
  		    buf[p - start] = (*get_byte) (data, p);
-@@ -1496,20 +1644,36 @@ edit_find_string (long start, unsigned c
+@@ -1515,20 +1663,36 @@ edit_find_string (long start, unsigned c
  	    }
  
  	    buf[(q = p - start)] = 0;
@@ -3390,7 +3390,7 @@
  		if (q + start < last_byte) {
  		    if (replace_case) {
  			buf[q] = (*get_byte) (data, q + start);
-@@ -1523,7 +1687,11 @@ edit_find_string (long start, unsigned c
+@@ -1542,7 +1706,11 @@ edit_find_string (long start, unsigned c
  		start++;
  		buf++;		/* move the window along */
  		if (buf == mbuf + MAX_REPL_LEN) {	/* the window is about to go past the end of array, so... */
@@ -3402,7 +3402,7 @@
  		    buf = mbuf;
  		}
  		q--;
-@@ -1549,10 +1717,16 @@ edit_find_string (long start, unsigned c
+@@ -1568,10 +1736,16 @@ edit_find_string (long start, unsigned c
  
  		buf = mbuf;
  		while (q) {
@@ -3420,7 +3420,7 @@
  			return -3;
  		    }
  		    else if (found_start == -1)	/* not found: try next line */
-@@ -1563,15 +1737,27 @@ edit_find_string (long start, unsigned c
+@@ -1582,15 +1756,27 @@ edit_find_string (long start, unsigned c
  			match_bol = 0;
  			continue;
  		    }
@@ -3450,7 +3450,7 @@
  		    memmove (mbuf, buf, q);
  		    p = start + q;
  		    move_win = 1;
-@@ -1581,36 +1767,59 @@ edit_find_string (long start, unsigned c
+@@ -1600,36 +1786,59 @@ edit_find_string (long start, unsigned c
  	    }
  	}
      } else {
@@ -3518,7 +3518,7 @@
      return -2;
  }
  
-@@ -1624,9 +1833,14 @@ edit_find_forwards (long search_start, u
+@@ -1643,9 +1852,14 @@ edit_find_forwards (long search_start, u
  
      while ((p = edit_find_string (p, exp, len, last_byte, get_byte, data, once_only, d)) >= 0) {
  	if (replace_whole) {
@@ -3533,7 +3533,7 @@
  		return p;
  	    if (once_only)
  		return -2;
-@@ -1658,6 +1872,7 @@ edit_find (long search_start, unsigned c
+@@ -1677,6 +1891,7 @@ edit_find (long search_start, unsigned c
  
  #define is_digit(x) ((x) >= '0' && (x) <= '9')
  
@@ -3541,7 +3541,7 @@
  #define snprint(v) { \
  		*p1++ = *p++; \
  		*p1 = '\0'; \
-@@ -1665,33 +1880,48 @@ edit_find (long search_start, unsigned c
+@@ -1684,33 +1899,48 @@ edit_find (long search_start, unsigned c
  		if (n >= (size_t) (e - s)) goto nospc; \
  		s += n; \
  	    }
@@ -3598,7 +3598,7 @@
  	s += n;
  	q = p;
  	p1 = q1;
-@@ -1719,45 +1949,78 @@ static int snprintf_p (char *str, size_t
+@@ -1738,45 +1968,78 @@ static int snprintf_p (char *str, size_t
  	    *p1++ = *p++;
  	if (*p == '*') {
  	    p++;
@@ -3687,7 +3687,7 @@
  	    snprint (*va_arg (ap, long *));
  	} else if (*p == 'p') {
  	    snprint (*va_arg (ap, void **));
-@@ -1766,10 +2029,17 @@ static int snprintf_p (char *str, size_t
+@@ -1785,10 +2048,17 @@ static int snprintf_p (char *str, size_t
  	q = p;
      }
      va_end (ap);
@@ -3705,7 +3705,7 @@
      return s + n - str;
  nospc:
      va_end (ap);
-@@ -1948,8 +2218,11 @@ edit_replace_cmd (WEdit *edit, int again
+@@ -1967,8 +2237,11 @@ edit_replace_cmd (WEdit *edit, int again
  		}
  	    }
  	    if (replace_yes) {	/* delete then insert new */
@@ -3718,7 +3718,7 @@
  		    int ret = 0;
  
  		    /* we need to fill in sargs just like with scanf */
-@@ -1958,17 +2231,25 @@ edit_replace_cmd (WEdit *edit, int again
+@@ -1977,17 +2250,25 @@ edit_replace_cmd (WEdit *edit, int again
  			for (k = 1;
  			     k < NUM_REPL_ARGS && pmatch[k].rm_eo >= 0;
  			     k++) {
@@ -3745,7 +3745,7 @@
  								    edit->
  								    search_start
  								    -
-@@ -1986,14 +2267,23 @@ edit_replace_cmd (WEdit *edit, int again
+@@ -2005,14 +2286,23 @@ edit_replace_cmd (WEdit *edit, int again
  		    }
  		    if (!ret)
  			ret =
@@ -3769,7 +3769,7 @@
  		    } else {
  			edit_error_dialog (_(" Replace "),
  					   ret ==
-@@ -2007,10 +2297,18 @@ edit_replace_cmd (WEdit *edit, int again
+@@ -2026,10 +2316,18 @@ edit_replace_cmd (WEdit *edit, int again
  		    times_replaced++;
  		    while (i--)
  			edit_delete (edit);
@@ -3788,7 +3788,7 @@
  	    }
  	    /* so that we don't find the same string again */
  	    if (replace_backwards) {
-@@ -2183,16 +2481,17 @@ edit_ok_to_exit (WEdit *edit)
+@@ -2202,16 +2500,17 @@ edit_ok_to_exit (WEdit *edit)
  #define TEMP_BUF_LEN 1024
  
  /* Return a null terminated length of text. Result must be g_free'd */
@@ -3810,7 +3810,7 @@
  	    x = edit_move_forward3 (edit, edit_bol (edit, start), 0,
  				    start);
  	    c = edit_get_byte (edit, start);
-@@ -2225,11 +2524,15 @@ edit_save_block (WEdit * edit, const cha
+@@ -2244,11 +2543,15 @@ edit_save_block (WEdit * edit, const cha
  	return 0;
  
      if (column_highlighting) {
@@ -3827,7 +3827,7 @@
  	    if (r < 0)
  		break;
  	    p += r;
-@@ -2237,15 +2540,19 @@ edit_save_block (WEdit * edit, const cha
+@@ -2256,15 +2559,19 @@ edit_save_block (WEdit * edit, const cha
  	}
  	g_free (block);
      } else {
@@ -3849,7 +3849,7 @@
  	    start = end;
  	}
  	g_free (buf);
-@@ -2583,17 +2890,20 @@ edit_block_process_cmd (WEdit *edit, con
+@@ -2602,17 +2909,20 @@ edit_block_process_cmd (WEdit *edit, con
  
  /* prints at the cursor */
  /* returns the number of chars printed */
@@ -3872,7 +3872,7 @@
  static void pipe_mail (WEdit *edit, char *to, char *subject, char *cc)
  {
      FILE *p = 0;
-@@ -2687,15 +2997,20 @@ void edit_mail_dialog (WEdit * edit)
+@@ -2706,15 +3016,20 @@ void edit_mail_dialog (WEdit * edit)
  /* find first character of current word */
  static int edit_find_word_start (WEdit *edit, long *word_start, int *word_len)
  {
@@ -3895,7 +3895,7 @@
  	return 0;
  
  /* search start of word to be completed */
-@@ -2705,11 +3020,19 @@ static int edit_find_word_start (WEdit *
+@@ -2724,11 +3039,19 @@ static int edit_find_word_start (WEdit *
  	    return 0;
  
  	last = c;
@@ -3916,7 +3916,7 @@
  		return 0;
  
  	    *word_start = edit->curs1 - (i - 1); /* start found */
-@@ -2742,7 +3065,7 @@ edit_collect_completions (WEdit *edit, l
+@@ -2761,7 +3084,7 @@ edit_collect_completions (WEdit *edit, l
  			  int *num)
  {
      int len, max_len = 0, i, skip;
@@ -3925,7 +3925,7 @@
  
      /* collect max MAX_WORD_COMPLETIONS completions */
      while (*num < MAX_WORD_COMPLETIONS) {
-@@ -2761,11 +3084,16 @@ edit_collect_completions (WEdit *edit, l
+@@ -2780,11 +3103,16 @@ edit_collect_completions (WEdit *edit, l
  	    buffers1[start >> S_EDIT_BUF_SIZE][start & M_EDIT_BUF_SIZE];
  	skip = 0;
  	for (i = 0; i < *num; i++) {
@@ -3945,7 +3945,7 @@
  		skip = 1;
  		break;		/* skip it, already added */
  	    }
-@@ -2773,7 +3101,7 @@ edit_collect_completions (WEdit *edit, l
+@@ -2792,7 +3120,7 @@ edit_collect_completions (WEdit *edit, l
  	if (skip)
  	    continue;
  
@@ -3954,7 +3954,7 @@
  	compl[*num].len = len;
  	for (i = 0; i < len; i++)
  	    compl[*num].text[i] = *(bufpos + i);
-@@ -2787,6 +3115,18 @@ edit_collect_completions (WEdit *edit, l
+@@ -2806,6 +3134,18 @@ edit_collect_completions (WEdit *edit, l
      return max_len;
  }
  
@@ -3973,7 +3973,7 @@
  
  /* let the user select its preferred completion */
  static void
-@@ -2799,6 +3139,9 @@ edit_completion_dialog (WEdit * edit, in
+@@ -2818,6 +3158,9 @@ edit_completion_dialog (WEdit * edit, in
      WListbox *compl_list;
      int compl_dlg_h;		/* completion dialog height */
      int compl_dlg_w;		/* completion dialog width */
@@ -3983,7 +3983,7 @@
  
      /* calculate the dialog metrics */
      compl_dlg_h = num_compl + 2;
-@@ -2834,9 +3177,18 @@ edit_completion_dialog (WEdit * edit, in
+@@ -2853,9 +3196,18 @@ edit_completion_dialog (WEdit * edit, in
      add_widget (compl_dlg, compl_list);
  
      /* fill the listbox with the completions */
@@ -4002,7 +4002,7 @@
  
      /* pop up the dialog */
      run_dlg (compl_dlg);
-@@ -2844,9 +3196,17 @@ edit_completion_dialog (WEdit * edit, in
+@@ -2863,9 +3215,17 @@ edit_completion_dialog (WEdit * edit, in
      /* apply the choosen completion */
      if (compl_dlg->ret_value == B_ENTER) {
  	listbox_get_current (compl_list, &curr, NULL);
@@ -4021,7 +4021,7 @@
      }
  
      /* destroy dialog before return */
-@@ -2863,8 +3223,9 @@ edit_complete_word_cmd (WEdit *edit)
+@@ -2882,8 +3242,9 @@ edit_complete_word_cmd (WEdit *edit)
  {
      int word_len = 0, i, num_compl = 0, max_len;
      long word_start = 0;
@@ -4033,7 +4033,7 @@
      struct selection compl[MAX_WORD_COMPLETIONS];	/* completions */
  
      /* don't want to disturb another search */
-@@ -2881,16 +3242,32 @@ edit_complete_word_cmd (WEdit *edit)
+@@ -2900,16 +3261,32 @@ edit_complete_word_cmd (WEdit *edit)
      /* prepare match expression */
      bufpos = &edit->buffers1[word_start >> S_EDIT_BUF_SIZE]
  	[word_start & M_EDIT_BUF_SIZE];
@@ -4066,8 +4066,8 @@
  
      if (num_compl > 0) {
  	/* insert completed word if there is only one match */
---- mc-2006-09-25-14/edit/wordproc.c.utf8	2006-06-17 04:55:41.000000000 +0200
-+++ mc-2006-09-25-14/edit/wordproc.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/edit/wordproc.c.utf8	2006-06-17 04:55:41.000000000 +0200
++++ mc/edit/wordproc.c	2007-01-04 16:20:56.000000000 +0100
 @@ -40,7 +40,12 @@
  
  #define tab_width option_tab_spacing
@@ -4287,8 +4287,8 @@
  		    g_free (t);
  		    return;
  		}
---- mc-2006-09-25-14/edit/edit.h.utf8	2006-02-06 17:55:42.000000000 +0100
-+++ mc-2006-09-25-14/edit/edit.h	2006-10-10 09:35:14.000000000 +0200
+--- mc/edit/edit.h.utf8	2006-12-12 18:39:33.000000000 +0100
++++ mc/edit/edit.h	2007-01-04 16:20:56.000000000 +0100
 @@ -25,6 +25,27 @@
  
  #include <stdio.h>
@@ -4349,7 +4349,7 @@
  int edit_count_lines (WEdit * edit, long current, int upto);
  long edit_move_forward (WEdit * edit, long current, int lines, long upto);
  long edit_move_forward3 (WEdit * edit, long current, int cols, long upto);
-@@ -146,11 +173,11 @@ int edit_block_delete_cmd (WEdit * edit)
+@@ -148,11 +175,11 @@ int edit_block_delete_cmd (WEdit * edit)
  void edit_delete_line (WEdit * edit);
  
  int edit_delete (WEdit * edit);
@@ -4363,7 +4363,7 @@
  long edit_write_stream (WEdit * edit, FILE * f);
  char *edit_get_write_filter (const char *writename, const char *filename);
  int edit_save_confirm_cmd (WEdit * edit);
-@@ -181,7 +208,7 @@ void edit_goto_cmd (WEdit * edit);
+@@ -183,7 +210,7 @@ void edit_goto_cmd (WEdit * edit);
  int eval_marks (WEdit * edit, long *start_mark, long *end_mark);
  void edit_status (WEdit * edit);
  void edit_execute_key_command (WEdit *edit, int command,
@@ -4372,7 +4372,7 @@
  void edit_update_screen (WEdit * edit);
  int edit_print_string (WEdit * e, const char *s);
  void edit_move_to_line (WEdit * e, long line);
-@@ -231,7 +258,7 @@ void edit_mail_dialog (WEdit *edit);
+@@ -233,7 +260,7 @@ void edit_mail_dialog (WEdit *edit);
  void format_paragraph (WEdit *edit, int force);
  
  /* either command or char_for_insertion must be passed as -1 */
@@ -4381,8 +4381,8 @@
  
  #define get_sys_error(s) (s)
  
---- mc-2006-09-25-14/edit/editdraw.c.utf8	2005-09-06 22:36:20.000000000 +0200
-+++ mc-2006-09-25-14/edit/editdraw.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/edit/editdraw.c.utf8	2006-12-09 16:19:48.000000000 +0100
++++ mc/edit/editdraw.c	2007-01-04 16:20:56.000000000 +0100
 @@ -69,11 +69,16 @@ static void status_string (WEdit * edit,
       * as decimal and as hex.
       */
@@ -4473,9 +4473,9 @@
 -    unsigned int c;
 +    mc_wint_t c;
      int color;
-     int i, book_mark = -1;
+     int i;
  
-@@ -287,66 +300,96 @@ edit_draw_this_line (WEdit *edit, long b
+@@ -282,62 +295,92 @@ edit_draw_this_line (WEdit *edit, long b
  
  	if (row <= edit->total_lines - edit->start_line) {
  	    while (col <= end_col - edit->start_col) {
@@ -4505,14 +4505,9 @@
 +		    p->style |= MOD_BOLD;
  		c = edit_get_byte (edit, q);
  /* we don't use bg for mc - fg contains both */
- 		if (book_mark == -1) {
- 		    edit_get_syntax_color (edit, q, &color);
--		    *p |= color << 16;
-+		    p->style |= color << 16;
- 		} else {
--		    *p |= book_mark << 16;
-+		    p->style |= book_mark << 16;
- 		}
+ 		edit_get_syntax_color (edit, q, &color);
+-		*p |= color << 16;
++		p->style |= color << 16;
  		q++;
  		switch (c) {
  		case '\n':
@@ -4543,10 +4538,10 @@
  		    if (c < 32) {
 -			*(p++) = '^' | MOD_ABNORMAL;
 -			*(p++) = (c + 0x40) | MOD_ABNORMAL;
-+		        p->ch = '^';
++			p->ch = '^';
 +			p->style = MOD_ABNORMAL;
 +			p++;
-+		        p->ch = c + 0x40;
++			p->ch = c + 0x40;
 +			p->style = MOD_ABNORMAL;
  			col += 2;
  			break;
@@ -4592,7 +4587,7 @@
  		    }
  		    col++;
  		    break;
-@@ -356,7 +399,7 @@ edit_draw_this_line (WEdit *edit, long b
+@@ -347,7 +390,7 @@ edit_draw_this_line (WEdit *edit, long b
      } else {
  	start_col_real = start_col = 0;
      }
@@ -4601,10 +4596,10 @@
  
      print_to_widget (edit, row, start_col, start_col_real, end_col, line);
  }
---- mc-2006-09-25-14/edit/edit.c.utf8	2006-02-13 22:35:05.000000000 +0100
-+++ mc-2006-09-25-14/edit/edit.c	2006-10-10 09:35:14.000000000 +0200
-@@ -103,7 +103,11 @@ char *option_backup_ext = NULL;
- static void edit_move_to_prev_col (WEdit *edit, long p);
+--- mc/edit/edit.c.utf8	2006-12-12 18:39:33.000000000 +0100
++++ mc/edit/edit.c	2007-01-04 16:20:56.000000000 +0100
+@@ -102,7 +102,11 @@ char *option_backup_ext = NULL;
+ 
  static void user_menu (WEdit *edit);
  
 +#ifndef UTF8
@@ -4615,7 +4610,7 @@
  {
      unsigned long p;
      if (byte_index >= (edit->curs1 + edit->curs2) || byte_index < 0)
-@@ -132,7 +136,7 @@ edit_init_buffers (WEdit *edit)
+@@ -131,7 +135,7 @@ edit_init_buffers (WEdit *edit)
  
      edit->curs1 = 0;
      edit->curs2 = 0;
@@ -4624,7 +4619,7 @@
  }
  
  /*
-@@ -157,7 +161,7 @@ edit_load_file_fast (WEdit *edit, const 
+@@ -156,7 +160,7 @@ edit_load_file_fast (WEdit *edit, const 
      }
  
      if (!edit->buffers2[buf2])
@@ -4633,7 +4628,7 @@
  
      mc_read (file,
  	     (char *) edit->buffers2[buf2] + EDIT_BUF_SIZE -
-@@ -167,7 +171,7 @@ edit_load_file_fast (WEdit *edit, const 
+@@ -166,7 +170,7 @@ edit_load_file_fast (WEdit *edit, const 
      for (buf = buf2 - 1; buf >= 0; buf--) {
  	/* edit->buffers2[0] is already allocated */
  	if (!edit->buffers2[buf])
@@ -4642,7 +4637,7 @@
  	mc_read (file, (char *) edit->buffers2[buf], EDIT_BUF_SIZE);
      }
  
-@@ -240,9 +244,44 @@ edit_insert_stream (WEdit * edit, FILE *
+@@ -239,9 +243,44 @@ edit_insert_stream (WEdit * edit, FILE *
  {
      int c;
      long i = 0;
@@ -4688,7 +4683,7 @@
      }
      return i;
  }
-@@ -250,9 +289,32 @@ edit_insert_stream (WEdit * edit, FILE *
+@@ -249,9 +288,32 @@ edit_insert_stream (WEdit * edit, FILE *
  long edit_write_stream (WEdit * edit, FILE * f)
  {
      long i;
@@ -4721,7 +4716,7 @@
      return i;
  }
  
-@@ -291,12 +353,46 @@ edit_insert_file (WEdit *edit, const cha
+@@ -290,12 +352,46 @@ edit_insert_file (WEdit *edit, const cha
  	int i, file, blocklen;
  	long current = edit->curs1;
  	unsigned char *buf;
@@ -4768,7 +4763,7 @@
  	}
  	edit_cursor_move (edit, current - edit->curs1);
  	g_free (buf);
-@@ -386,7 +482,11 @@ cleanup:
+@@ -385,7 +481,11 @@ cleanup:
  static int
  edit_load_file (WEdit *edit)
  {
@@ -4780,7 +4775,7 @@
  
      /* Cannot do fast load if a filter is used */
      if (edit_find_filter (edit->filename) >= 0)
-@@ -452,6 +552,7 @@ edit_load_position (WEdit *edit)
+@@ -451,6 +551,7 @@ edit_load_position (WEdit *edit)
      edit->prev_col = column;
      edit_move_to_prev_col (edit, edit_bol (edit, edit->curs1));
      edit_move_display (edit, line - (edit->num_widget_lines / 2));
@@ -4797,22 +4792,22 @@
      if (edit_load_file (edit)) {
  	/* edit_load_file already gives an error message */
  	if (to_free)
-@@ -689,13 +790,23 @@ void edit_push_action (WEdit * edit, lon
+@@ -689,14 +790,23 @@ void edit_push_action (WEdit * edit, lon
  {
      unsigned long sp = edit->stack_pointer;
      unsigned long spm1;
 -    long *t;
-+  
-+    struct action *t; 
-+    mc_wchar_t ch = 0; 
-+
-+    if (c == CHAR_INSERT || c == CHAR_INSERT_AHEAD) { 
-+      va_list ap; 
-+      va_start (ap, c); 
-+      ch = va_arg (ap, mc_wint_t); 
-+      va_end (ap); 
-+    } 
 +
++    struct action *t;
++    mc_wchar_t ch = 0;
++
++    if (c == CHAR_INSERT || c == CHAR_INSERT_AHEAD) {
++	va_list ap;
++	va_start (ap, c);
++	ch = va_arg (ap, mc_wint_t);
++	va_end (ap);
++    }
+ 
  /* first enlarge the stack if necessary */
      if (sp > edit->stack_size - 10) {	/* say */
  	if (option_max_undo < 256)
@@ -4823,7 +4818,7 @@
  	    if (t) {
  		edit->undo_stack = t;
  		edit->stack_size <<= 1;
-@@ -710,7 +821,7 @@ void edit_push_action (WEdit * edit, lon
+@@ -711,7 +821,7 @@ void edit_push_action (WEdit * edit, lon
  #ifdef FAST_MOVE_CURSOR
      if (c == CURS_LEFT_LOTS || c == CURS_RIGHT_LOTS) {
  	va_list ap;
@@ -4832,7 +4827,7 @@
  	edit->stack_pointer = (edit->stack_pointer + 1) & edit->stack_size_mask;
  	va_start (ap, c);
  	c = -(va_arg (ap, int));
-@@ -721,12 +832,14 @@ void edit_push_action (WEdit * edit, lon
+@@ -722,12 +832,14 @@ void edit_push_action (WEdit * edit, lon
  	&& spm1 != edit->stack_bottom
  	&& ((sp - 2) & edit->stack_size_mask) != edit->stack_bottom) {
  	int d;
@@ -4852,7 +4847,7 @@
  		    return;
  		}
  	    }
-@@ -734,19 +847,20 @@ void edit_push_action (WEdit * edit, lon
+@@ -735,19 +847,20 @@ void edit_push_action (WEdit * edit, lon
  #ifndef NO_STACK_CURSMOVE_ANIHILATION
  	    else if ((c == CURS_LEFT && d == CURS_RIGHT)
  		     || (c == CURS_RIGHT && d == CURS_LEFT)) {	/* a left then a right anihilate each other */
@@ -4878,7 +4873,7 @@
  		goto check_bottom;
  	    }
  #ifndef NO_STACK_CURSMOVE_ANIHILATION
-@@ -758,7 +872,9 @@ void edit_push_action (WEdit * edit, lon
+@@ -759,7 +872,9 @@ void edit_push_action (WEdit * edit, lon
  #endif
  	}
      }
@@ -4889,7 +4884,7 @@
    check_bottom:
  
      edit->stack_pointer = (edit->stack_pointer + 1) & edit->stack_size_mask;
-@@ -771,10 +887,10 @@ void edit_push_action (WEdit * edit, lon
+@@ -772,10 +887,10 @@ void edit_push_action (WEdit * edit, lon
         (((unsigned long) c + 1) & edit->stack_size_mask) == edit->stack_bottom)
  	do {
  	    edit->stack_bottom = (edit->stack_bottom + 1) & edit->stack_size_mask;
@@ -4902,7 +4897,7 @@
  	edit->stack_bottom = edit->stack_pointer = 0;
  }
  
-@@ -783,30 +899,30 @@ void edit_push_action (WEdit * edit, lon
+@@ -784,30 +899,30 @@ void edit_push_action (WEdit * edit, lon
     then the file should be as it was when he loaded up. Then set edit->modified to 0.
   */
  static long
@@ -4944,7 +4939,7 @@
  }
  
  /* is called whenever a modification is made by one of the four routines below */
-@@ -827,7 +943,7 @@ static inline void edit_modification (WE
+@@ -828,7 +943,7 @@ static inline void edit_modification (WE
   */
  
  void
@@ -4953,7 +4948,7 @@
  {
      /* check if file has grown to large */
      if (edit->last_byte >= SIZE_LIMIT)
-@@ -865,12 +981,11 @@ edit_insert (WEdit *edit, int c)
+@@ -866,12 +981,11 @@ edit_insert (WEdit *edit, int c)
      /* add a new buffer if we've reached the end of the last one */
      if (!(edit->curs1 & M_EDIT_BUF_SIZE))
  	edit->buffers1[edit->curs1 >> S_EDIT_BUF_SIZE] =
@@ -4969,7 +4964,7 @@
  
      /* update file length */
      edit->last_byte++;
-@@ -881,7 +996,7 @@ edit_insert (WEdit *edit, int c)
+@@ -882,7 +996,7 @@ edit_insert (WEdit *edit, int c)
  
  
  /* same as edit_insert and move left */
@@ -4978,7 +4973,7 @@
  {
      if (edit->last_byte >= SIZE_LIMIT)
  	return;
-@@ -904,7 +1019,7 @@ void edit_insert_ahead (WEdit * edit, in
+@@ -905,7 +1019,7 @@ void edit_insert_ahead (WEdit * edit, in
      edit->last_get_rule += (edit->last_get_rule >= edit->curs1);
  
      if (!((edit->curs2 + 1) & M_EDIT_BUF_SIZE))
@@ -4987,7 +4982,7 @@
      edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE][EDIT_BUF_SIZE - (edit->curs2 & M_EDIT_BUF_SIZE) - 1] = c;
  
      edit->last_byte++;
-@@ -914,7 +1029,7 @@ void edit_insert_ahead (WEdit * edit, in
+@@ -915,7 +1029,7 @@ void edit_insert_ahead (WEdit * edit, in
  
  int edit_delete (WEdit * edit)
  {
@@ -4996,7 +4991,7 @@
      if (!edit->curs2)
  	return 0;
  
-@@ -938,7 +1053,7 @@ int edit_delete (WEdit * edit)
+@@ -939,7 +1053,7 @@ int edit_delete (WEdit * edit)
  	edit->total_lines--;
  	edit->force |= REDRAW_AFTER_CURSOR;
      }
@@ -5005,7 +5000,7 @@
      if (edit->curs1 < edit->start_display) {
  	edit->start_display--;
  	if (p == '\n')
-@@ -952,7 +1067,7 @@ int edit_delete (WEdit * edit)
+@@ -953,7 +1067,7 @@ int edit_delete (WEdit * edit)
  static int
  edit_backspace (WEdit * edit)
  {
@@ -5014,7 +5009,7 @@
      if (!edit->curs1)
  	return 0;
  
-@@ -976,7 +1091,7 @@ edit_backspace (WEdit * edit)
+@@ -977,7 +1091,7 @@ edit_backspace (WEdit * edit)
  	edit->total_lines--;
  	edit->force |= REDRAW_AFTER_CURSOR;
      }
@@ -5023,7 +5018,7 @@
  
      if (edit->curs1 < edit->start_display) {
  	edit->start_display--;
-@@ -989,10 +1104,18 @@ edit_backspace (WEdit * edit)
+@@ -990,10 +1104,18 @@ edit_backspace (WEdit * edit)
  
  #ifdef FAST_MOVE_CURSOR
  
@@ -5043,7 +5038,7 @@
  	edit->curs_line--;
  	next -= (unsigned long) dest;
  	n -= next;
-@@ -1005,7 +1128,7 @@ int
+@@ -1006,7 +1128,7 @@ int
  edit_move_backward_lots (WEdit *edit, long increment)
  {
      int r, s, t;
@@ -5052,7 +5047,7 @@
  
      if (increment > edit->curs1)
  	increment = edit->curs1;
-@@ -1045,7 +1168,7 @@ edit_move_backward_lots (WEdit *edit, lo
+@@ -1046,7 +1168,7 @@ edit_move_backward_lots (WEdit *edit, lo
  	    edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] = p;
  	else
  	    edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] =
@@ -5061,7 +5056,7 @@
      } else {
  	g_free (p);
      }
-@@ -1083,7 +1206,7 @@ edit_move_backward_lots (WEdit *edit, lo
+@@ -1084,7 +1206,7 @@ edit_move_backward_lots (WEdit *edit, lo
  		edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] = p;
  	    else
  		edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] =
@@ -5070,7 +5065,7 @@
  	} else {
  	    g_free (p);
  	}
-@@ -1115,7 +1238,7 @@ int edit_cursor_move (WEdit * edit, long
+@@ -1116,7 +1238,7 @@ int edit_cursor_move (WEdit * edit, long
  
  	    c = edit_get_byte (edit, edit->curs1 - 1);
  	    if (!((edit->curs2 + 1) & M_EDIT_BUF_SIZE))
@@ -5079,7 +5074,7 @@
  	    edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE][EDIT_BUF_SIZE - (edit->curs2 & M_EDIT_BUF_SIZE) - 1] = c;
  	    edit->curs2++;
  	    c = edit->buffers1[(edit->curs1 - 1) >> S_EDIT_BUF_SIZE][(edit->curs1 - 1) & M_EDIT_BUF_SIZE];
-@@ -1140,7 +1263,7 @@ int edit_cursor_move (WEdit * edit, long
+@@ -1141,7 +1263,7 @@ int edit_cursor_move (WEdit * edit, long
  
  	    c = edit_get_byte (edit, edit->curs1);
  	    if (!(edit->curs1 & M_EDIT_BUF_SIZE))
@@ -5088,7 +5083,7 @@
  	    edit->buffers1[edit->curs1 >> S_EDIT_BUF_SIZE][edit->curs1 & M_EDIT_BUF_SIZE] = c;
  	    edit->curs1++;
  	    c = edit->buffers2[(edit->curs2 - 1) >> S_EDIT_BUF_SIZE][EDIT_BUF_SIZE - ((edit->curs2 - 1) & M_EDIT_BUF_SIZE) - 1];
-@@ -1247,7 +1370,7 @@ long edit_move_forward3 (WEdit * edit, l
+@@ -1248,7 +1370,7 @@ long edit_move_forward3 (WEdit * edit, l
  	q = edit->last_byte + 2;
  
      for (col = 0, p = current; p < q; p++) {
@@ -5097,7 +5092,7 @@
  	if (cols != -10) {
  	    if (col == cols)
  		return p;
-@@ -1265,7 +1388,7 @@ long edit_move_forward3 (WEdit * edit, l
+@@ -1266,7 +1388,7 @@ long edit_move_forward3 (WEdit * edit, l
  	} else if (c < 32 || c == 127)
  	    col += 2; /* Caret notation for control characters */
  	else
@@ -5106,7 +5101,7 @@
      }
      return col;
  }
-@@ -1398,7 +1521,7 @@ static int
+@@ -1399,7 +1521,7 @@ static int
  is_blank (WEdit *edit, long offset)
  {
      long s, f;
@@ -5115,7 +5110,7 @@
      s = edit_bol (edit, offset);
      f = edit_eol (edit, offset) - 1;
      while (s <= f) {
-@@ -1770,13 +1893,13 @@ static void edit_left_delete_word (WEdit
+@@ -1771,13 +1893,13 @@ static void edit_left_delete_word (WEdit
  static void
  edit_do_undo (WEdit * edit)
  {
@@ -5132,7 +5127,7 @@
  	case STACK_BOTTOM:
  	    goto done_undo;
  	case CURS_RIGHT:
-@@ -1797,31 +1920,33 @@ edit_do_undo (WEdit * edit)
+@@ -1798,31 +1920,33 @@ edit_do_undo (WEdit * edit)
  	case COLUMN_OFF:
  	    column_highlighting = 0;
  	    break;
@@ -5179,7 +5174,7 @@
      edit_update_curs_row (edit);
  
    done_undo:;
-@@ -2101,7 +2226,7 @@ static void edit_goto_matching_bracket (
+@@ -2102,7 +2226,7 @@ static void edit_goto_matching_bracket (
   * passed as -1.  Commands are executed, and char_for_insertion is
   * inserted at the cursor.
   */
@@ -5188,7 +5183,7 @@
  {
      if (command == CK_Begin_Record_Macro) {
  	edit->macro_i = 0;
-@@ -2136,7 +2261,7 @@ static const char * const shell_cmd[] = 
+@@ -2137,7 +2261,7 @@ static const char * const shell_cmd[] = 
     all of them. It also does not check for the Undo command.
   */
  void
@@ -5197,7 +5192,7 @@
  {
      edit->force |= REDRAW_LINE;
  
-@@ -2169,7 +2294,7 @@ edit_execute_cmd (WEdit *edit, int comma
+@@ -2170,7 +2294,7 @@ edit_execute_cmd (WEdit *edit, int comma
      }
  
      /* An ordinary key press */


Index: mc.spec
===================================================================
RCS file: /cvs/dist/rpms/mc/FC-6/mc.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- mc.spec	22 Nov 2006 11:46:21 -0000	1.107
+++ mc.spec	16 Apr 2007 13:42:59 -0000	1.108
@@ -1,9 +1,9 @@
-%define date 2006-11-14-16
+%define date 2007-01-24-03
 
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.6.1a
-Release:	35%{?dist}
+Release:	36.20070124cvs%{?dist}
 Epoch:		1
 License:	GPL
 Group:		System Environment/Shells
@@ -13,20 +13,21 @@
 BuildRequires:	glib2-devel e2fsprogs-devel slang-devel
 Requires:	dev >= 0:3.3-3
 
-Patch0:         mc-utf8.patch
-Patch1:         mc-extensions.patch
-Patch2:         mc-userhost.patch
-Patch3:         mc-64bit.patch
-Patch4:         mc-utf8-look-and-feel.patch
-Patch5:         mc-concat.patch
-Patch6:         mc-showfree.patch
-Patch7:         mc-cedit.patch
-Patch8:         mc-delcheck.patch
-Patch9:         mc-etcmc.patch
-Patch10:        mc-exit.patch
-Patch11:        mc-utf8-8bit-hex.patch
-Patch12:        mc-ipv6.patch
-Patch13:        mc-newlinedir.patch
+Patch0:		mc-utf8.patch
+Patch1:		mc-extensions.patch
+Patch2:		mc-userhost.patch
+Patch3:		mc-64bit.patch
+Patch4:		mc-utf8-look-and-feel.patch
+Patch5:		mc-concat.patch
+Patch6:		mc-showfree.patch
+Patch7:		mc-cedit.patch
+Patch8:		mc-delcheck.patch
+Patch9:		mc-etcmc.patch
+Patch10:	mc-exit.patch
+Patch11:	mc-utf8-8bit-hex.patch
+Patch12:	mc-ipv6.patch
+Patch13:	mc-newlinedir.patch
+Patch14:	mc-cloexec.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -52,6 +53,7 @@
 %patch11 -p1 -b .8bit-hex
 %patch12 -p1 -b .ipv6
 %patch13 -p1 -b .newlinedir
+%patch14 -p1 -b .cloexec
 
 # convert files in /lib to UTF-8
 pushd lib
@@ -115,26 +117,10 @@
 %build
 export CFLAGS="-DUTF8=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS"
 %configure --with-screen=slang \
-	     --host=%{_host} --build=%{_build} \
-	     --target=%{_target_platform} \
-	     --program-prefix=%{?_program_prefix} \
-	     --prefix=%{_prefix} \
-	     --exec-prefix=%{_exec_prefix} \
-	     --bindir=%{_bindir} \
-	     --sbindir=%{_sbindir} \
-	     --sysconfdir=%{_sysconfdir} \
-	     --datadir=%{_datadir} \
-	     --includedir=%{_includedir} \
-	     --libdir=%{_libdir} \
-	     --libexecdir=%{_libexecdir} \
-	     --localstatedir=%{_localstatedir} \
-	     --sharedstatedir=%{_sharedstatedir} \
-	     --mandir=%{_mandir} \
-	     --infodir=%{_infodir} \
 	     --enable-charset \
 	     --with-samba \
 	     --without-x \
-	     --without-gpm-mouse
+	     --with-gpm-mouse
 make %{?_smp_mflags}
 
 %install 
@@ -144,7 +130,7 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/mc/extfs
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/mc/syntax
 
-%{makeinstall} sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}
+make install DESTDIR="$RPM_BUILD_ROOT"
 
 install lib/{mc.sh,mc.csh} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 
@@ -190,12 +176,30 @@
 %lang(pl) %{_mandir}/pl/man1/mc.1.gz
 %lang(ru) %{_mandir}/ru/man1/mc.1.gz
 %lang(sr) %{_mandir}/sr/man1/mc.1.gz
-%config %{_sysconfdir}/profile.d/*
-%config %{_sysconfdir}/mc/*
+%{_sysconfdir}/profile.d/*
+%config %{_sysconfdir}/mc/syntax/Syntax
+%config %{_sysconfdir}/mc/mc.charsets
+%config %{_sysconfdir}/mc/mc.lib
+%config(noreplace) %{_sysconfdir}/mc/*edit*
+%config(noreplace) %{_sysconfdir}/mc/mc.ext
+%config(noreplace) %{_sysconfdir}/mc/mc.menu
+%config(noreplace) %{_sysconfdir}/mc/extfs/extfs.ini
+%config(noreplace) %{_sysconfdir}/mc/extfs/sfs.ini
 %dir %{_datadir}/mc
 %dir %{_sysconfdir}/mc
+%dir %{_sysconfdir}/mc/syntax
+%dir %{_sysconfdir}/mc/extfs
+%dir %{_libexecdir}/mc
 
 %changelog
+* Mon Apr 16 2007 Jindrich Novy <jnovy at redhat.com> 4.6.1a-36
+- update to the CVS snapshot as of 24th Jan 2007 (fixes #220828)
+- reenable gpm support as it is now fixed (#168076)
+- display free space correctly for multiple filesystems (#225153)
+  (thanks to Tomas Heinrich for patch)
+- fix unowned directories (#233880)
+- spec fixes, bindings fixes
+
 * Thu Nov 22 2006 Jindrich Novy <jnovy at redhat.com> 4.6.1a-35
 - update to new CVS snapshot
 - fix IPv6 patch (should fix #206234 and #213212), thanks to Dan Kopecek
@@ -606,7 +610,7 @@
 - fix a bunch of buffer overflows and memory leaks (CAN-2004-0226)
 - fix hardlink handling in cpio filesystem
 - fix handling of filenames with single/double quotes and backslashes
-  in %{_datadir}/mc/extfs/rpm
+  in %%{_datadir}/mc/extfs/rpm
 - update php.syntax file (#112645)
 - fix crash with large syntax file (#112644)
 - update CAN-2003-1023 fix to still make vfs symlinks relative,
@@ -779,7 +783,7 @@
 - Updated Japanese translation.
 
 * Sun Jan 14 2001 Florian La Roche <Florian.LaRoche at redhat.de>
-- do not prereq %{_sysconfdir}/init.d
+- do not prereq %%{_sysconfdir}/init.d
 - do not require gpm for s390
 
 * Mon Aug 21 2000 Jonathan Blandford <jrb at redhat.com>
@@ -866,7 +870,7 @@
   script
 
 * Fri Sep 25 1999 Bill Nottingham <notting at redhat.com>
-- chkconfig --del in %preun, not %postun
+- chkconfig --del in %%preun, not %postun
 
 * Wed Sep 22 1999 Michael Fulbright <drmike at redhat.com>
 - updated to 4.5.39-pre9
@@ -914,7 +918,7 @@
 - patched so that TERM variable set to xterm produces color
 
 * Mon Mar 22 1999 Michael Fulbright <drmike at redhat.com>
-- made sure %{_sysconfdir}/pam.d/mcserv has right permissions
+- made sure %%{_sysconfdir}/pam.d/mcserv has right permissions
 
 * Thu Mar 18 1999 Michael Fulbright <drmike at redhat.com>
 - version 4.5.27
@@ -964,7 +968,7 @@
 - removed tkmc
 
 * Wed Apr 8 1998 Marc Ewing <marc at redhat.com>
-- add %{prefix}/lib/mc/layout to gmc
+- add %%{prefix}/lib/mc/layout to gmc
 
 * Tue Dec 23 1997 Tomasz K??oczko <kloczek at rudy.mif.pg.gda.pl>
 - added --without-debug to configure,
@@ -993,10 +997,10 @@
 * Sun Oct 26 1997 Tomasz K??oczko <kloczek at rudy.mif.pg.gda.pl>
 
 - updated to 4.1.6
-- added %attr macros in %%files,
+- added %%attr macros in %%files,
 - a few simplification in %%install,
 - removed glibc patch,
-- fixed installing %{_sysconfdir}/X11/wmconfig/tkmc.
+- fixed installing %%{_sysconfdir}/X11/wmconfig/tkmc.
 
 * Thu Oct 23 1997 Michael K. Johnson <johnsonm at redhat.com>
 
@@ -1020,17 +1024,17 @@
 
 * Thu May 22 1997 Michele Marziani <marziani at fe.infn.it>
 
-- added support for mc alias in %{_sysconfdir}/profile.d/mc.csh (for csh and tcsh)
-- lowered number of SysV init scripts in %{_sysconfdir}/rc.d/rc[0,1,6].d
+- added support for mc alias in %%{_sysconfdir}/profile.d/mc.csh (for csh and tcsh)
+- lowered number of SysV init scripts in %%{_sysconfdir}/rc.d/rc[0,1,6].d
   (mcserv needs to be killed before inet)
-- removed all references to $RPM_SOURCE_DIR
+- removed all references to RPM_SOURCE_DIR
 - restored $RPM_OPT_FLAGS when compiling
 - minor cleanup of spec file: redundant directives and comments removed
 
 * Sun May 18 1997 Michele Marziani <marziani at fe.infn.it>
 
 - removed all references to non-existent mc.rpmfs
-- added mcedit.1 to the %files section
+- added mcedit.1 to the %%files section
 - reverted to un-gzipped man pages (RedHat style)
 - removed double install line for mcserv.pamd
 
@@ -1038,10 +1042,10 @@
 
 - added new rpmfs script,
 - removed mcfn_install from mc (adding mc() to bash enviroment is in
-  %{_sysconfdir}/profile.d/mc.sh),
-- %{_sysconfdir}/profile.d/mc.sh changed to %config,
-- removed %{prefix}/lib/mc/bin/create_vcs,
-- removed %{prefix}/lib/mc/term.
+  %%{_sysconfdir}/profile.d/mc.sh),
+- %%{_sysconfdir}/profile.d/mc.sh changed to %%config,
+- removed %%{prefix}/lib/mc/bin/create_vcs,
+- removed %%{prefix}/lib/mc/term.
 
 * Wed May 9 1997 Tomasz K??oczko <kloczek at rudy.mif.pg.gda.pl>
 
@@ -1051,23 +1055,23 @@
 * Tue May 7 1997 Tomasz K??oczko <kloczek at rudy.mif.pg.gda.pl>
 
 - new version 3.5.27,
-- %dir %{prefix}/lib/mc/icons and icons removed from tkmc,
+- %%dir %%{prefix}/lib/mc/icons and icons removed from tkmc,
 - added commented xmc part.
 
 * Tue Apr 22 1997 Tomasz K??oczko <kloczek at rudy.mif.pg.gda.pl>
 
 - FIX spec:
    - added URL field,
-   - in mc added missing %{prefix}/lib/mc/mc.ext, %{prefix}/lib/mc/mc.hint,
-     %{prefix}/lib/mc/mc.hlp, %{prefix}/lib/mc/mc.lib, %{prefix}/lib/mc/mc.menu.
+   - in mc added missing %%{prefix}/lib/mc/mc.ext, %%{prefix}/lib/mc/mc.hint,
+     %%{prefix}/lib/mc/mc.hlp, %%{prefix}/lib/mc/mc.lib, %%{prefix}/lib/mc/mc.menu.
 
 * Fri Apr 18 1997 Tomasz K??oczko <kloczek at rudy.mif.pg.gda.pl>
 
 - added making packages: tkmc, mcserv (xmc not work yet),
 - gziped man pages,
-- added %{_sysconfdir}/pamd.d/mcserv PAM config file.
+- added %%{_sysconfdir}/pamd.d/mcserv PAM config file.
 - added instaling icons,
-- added %{_sysconfdir}/profile.d/mc.sh,
-- in %doc added NEWS README,
-- removed %{prefix}/lib/mc/FAQ,
+- added %%{_sysconfdir}/profile.d/mc.sh,
+- in %%doc added NEWS README,
+- removed %%{prefix}/lib/mc/FAQ,
 - added mcserv.init script for mcserv (start/stop on level 86).



From fedora-cvs-commits at redhat.com  Mon Apr 16 13:51:37 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 09:51:37 -0400
Subject: rpms/virt-manager/devel .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 virt-manager.spec, 1.22, 1.23
Message-ID: <200704161351.l3GDpbdh024358@cvs.devel.redhat.com>

Author: berrange

Update of /cvs/dist/rpms/virt-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24344

Modified Files:
	.cvsignore sources virt-manager.spec 
Log Message:
Updated to 0.4.0 release


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/virt-manager/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	20 Mar 2007 17:22:45 -0000	1.12
+++ .cvsignore	16 Apr 2007 13:51:34 -0000	1.13
@@ -1,2 +1,2 @@
-virt-manager-0.3.2.tar.gz
 *.src.rpm
+virt-manager-0.4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/virt-manager/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	20 Mar 2007 17:22:45 -0000	1.12
+++ sources	16 Apr 2007 13:51:34 -0000	1.13
@@ -1 +1 @@
-faeacd992429dd770b6a60fbcd5ec27c  virt-manager-0.3.2.tar.gz
+56ea634db2b571c4f8abbe3ccd4b16e4  virt-manager-0.4.0.tar.gz


Index: virt-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/virt-manager/devel/virt-manager.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- virt-manager.spec	27 Mar 2007 19:21:42 -0000	1.22
+++ virt-manager.spec	16 Apr 2007 13:51:34 -0000	1.23
@@ -7,8 +7,8 @@
 %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}}
 
 Name: virt-manager
-Version: 0.3.2
-Release: 2%{_extra_release}
+Version: 0.4.0
+Release: 1%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -36,7 +36,7 @@
 # Minimum we've tested with
 Requires: libxml2-python >= 2.6.23
 # Required to install Xen guests
-Requires: python-virtinst >= 0.102.0
+Requires: python-virtinst >= 0.103.0
 # Required for loading the glade UI
 Requires: pygtk2-libglade
 # Required for our graphics which are currently SVG format
@@ -161,6 +161,16 @@
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Mon Apr 16 2007 Daniel P. Berrange <berrange at redhat.com> - 0.4.0-1.fc7
+- Support for managing virtual networks
+- Ability to attach guest to virtual networks
+- Automatically set VNC keymap based on local keymap
+- Support for disk & network device addition/removal
+
+* Wed Mar 28 2007 Daniel P. Berrange <berrange at redhat.com> - 0.3.2-3.fc7
+- Fix HVM check to allow KVM guests to be created (bz 233644)
+- Fix default file size suggestion
+
 * Tue Mar 27 2007 Daniel P. Berrange <berrange at redhat.com> - 0.3.2-2.fc7
 - Ensure we own all directories we create (bz 233816)
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 13:51:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 09:51:57 -0400
Subject: rpms/transfig/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200704161351.l3GDpvTH024430@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/transfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24411

Modified Files:
	.cvsignore sources 
Log Message:
3.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/transfig/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Sep 2004 13:31:30 -0000	1.4
+++ .cvsignore	16 Apr 2007 13:51:55 -0000	1.5
@@ -1 +1,2 @@
 transfig.3.2.4.tar.gz
+transfig.3.2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/transfig/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2004 13:31:30 -0000	1.4
+++ sources	16 Apr 2007 13:51:55 -0000	1.5
@@ -1 +1 @@
-742de0f7a3cae74d247bbd0c70dd9dd7  transfig.3.2.4.tar.gz
+3b2cffdd25529ae5877e305f29aae6d1  transfig.3.2.5.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr 16 13:56:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 09:56:49 -0400
Subject: rpms/transfig/devel transfig.spec,1.26,1.27
Message-ID: <200704161356.l3GDun4i024538@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/transfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24524

Modified Files:
	transfig.spec 
Log Message:
BuildRequires: libXpm-devel



Index: transfig.spec
===================================================================
RCS file: /cvs/dist/rpms/transfig/devel/transfig.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- transfig.spec	16 Apr 2007 13:39:11 -0000	1.26
+++ transfig.spec	16 Apr 2007 13:56:47 -0000	1.27
@@ -14,6 +14,7 @@
 
 BuildRequires: libpng-devel
 BuildRequires: libjpeg-devel
+BuildRequires: libXpm-devel
 BuildRequires: imake
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-cvs-commits at redhat.com  Mon Apr 16 13:57:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 09:57:09 -0400
Subject: rpms/mc/FC-6 sources,1.35,1.36
Message-ID: <200704161357.l3GDv9gq024597@cvs.devel.redhat.com>

Author: jnovy

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

Modified Files:
	sources 
Log Message:
- upload new tarball



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mc/FC-6/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	22 Nov 2006 11:46:21 -0000	1.35
+++ sources	16 Apr 2007 13:57:07 -0000	1.36
@@ -1 +1 @@
-bd4f2e1c98a283ce7634365c9d4567f0  mc-2006-11-14-16.tar.gz
+21750fc365562ee1f2b20f32defa339d  mc-2007-01-24-03.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr 16 13:59:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 09:59:36 -0400
Subject: rpms/ORBit2/devel ORBit2.spec,1.54,1.55
Message-ID: <200704161359.l3GDxaZD024672@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/ORBit2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24656

Modified Files:
	ORBit2.spec 
Log Message:
add alpha as 64bit arch



Index: ORBit2.spec
===================================================================
RCS file: /cvs/dist/rpms/ORBit2/devel/ORBit2.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ORBit2.spec	25 Mar 2007 04:08:03 -0000	1.54
+++ ORBit2.spec	16 Apr 2007 13:59:34 -0000	1.55
@@ -4,7 +4,7 @@
 Summary: A high-performance CORBA Object Request Broker
 Name: ORBit2
 Version: 2.14.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source: http://ftp.gnome.org/pub/gnome/sources/ORBit/2.14/%{name}-%{version}.tar.bz2
 Group: System Environment/Daemons
 License: LGPL/GPL
@@ -79,7 +79,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/orbit-2.0/*.*a
 
 # fix multilib conflict caused by orbit-config.h
-%ifarch x86_64 s390x ia64 ppc64
+%ifarch x86_64 s390x ia64 ppc64 alpha
 %define wordsize 64
 %else
 %define wordsize 32
@@ -135,6 +135,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Apr 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.14.7-3
+- Add alpha to 64bit arches (#236544)
+
 * Sun Mar 25 2007 Matthias Clasen <mclasen at redhat.com> - 2.14.7-2
 - Fix a directory ownership issue (#233755)
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 14:09:34 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 10:09:34 -0400
Subject: rpms/mc/FC-5 mc-cloexec.patch, NONE, 1.1 mc-extensions.patch, 1.8,
	1.9 mc-showfree.patch, 1.8, 1.9 mc-utf8.patch, 1.21,
	1.22 mc.spec, 1.90, 1.91 sources, 1.33, 1.34
Message-ID: <200704161409.l3GE9YIM025160@cvs.devel.redhat.com>

Author: jnovy

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

Modified Files:
	mc-extensions.patch mc-showfree.patch mc-utf8.patch mc.spec 
	sources 
Added Files:
	mc-cloexec.patch 
Log Message:
- update to the CVS snapshot as of 24th Jan 2007 (fixes #220828)
- reenable gpm support as it is now fixed (#168076)
- display free space correctly for multiple filesystems (#225153)
  (thanks to Tomas Heinrich for patch)
- fix unowned directories (#233880)
- spec fixes, bindings fixes


mc-cloexec.patch:
 subshell.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE mc-cloexec.patch ---
--- mc-2006-11-14-16/src/subshell.c.desleak	2006-05-08 22:59:48.000000000 +0200
+++ mc-2006-11-14-16/src/subshell.c	2006-11-23 09:50:30.000000000 +0100
@@ -1150,6 +1152,7 @@
 #endif				/* I_FIND && I_PUSH */
 #endif				/* __osf__ || __linux__ */
 
+    fcntl(pty_slave, F_SETFD, FD_CLOEXEC);
     return pty_slave;
 }
 
@@ -1203,6 +1207,7 @@
     }
     if ((pty_slave = open (pty_name, O_RDWR)) == -1)
 	fprintf (stderr, "open (pty_name, O_RDWR): %s\r\n", pty_name);
+    fcntl(pty_slave, F_SETFD, FD_CLOEXEC);
     return pty_slave;
 }
 

mc-extensions.patch:
 configure     |    2 -
 configure.ac  |    2 -
 lib/mc.ext.in |   82 +++++++++++++++++++++++++++++++++++++++++++---------------
 3 files changed, 64 insertions(+), 22 deletions(-)

Index: mc-extensions.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/FC-5/mc-extensions.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mc-extensions.patch	8 Mar 2006 11:13:51 -0000	1.8
+++ mc-extensions.patch	16 Apr 2007 14:09:31 -0000	1.9
@@ -1,6 +1,6 @@
---- mc-4.6.1a/configure.ac.extensions	2005-11-11 03:03:55.000000000 +0100
-+++ mc-4.6.1a/configure.ac	2006-02-28 11:54:30.000000000 +0100
-@@ -83,7 +83,7 @@ AC_PROG_LN_S
+--- mc/configure.ac.extensions	2006-12-28 06:34:31.000000000 +0100
++++ mc/configure.ac	2007-01-04 15:42:15.000000000 +0100
+@@ -83,7 +83,7 @@
  AC_CHECK_TOOL(AR, ar, ar)
  
  dnl Only list browsers here that can be run in background (i.e. with `&')
@@ -9,9 +9,9 @@
  
  dnl
  dnl Ovverriding mmap support.  This has to be before AC_FUNC_MMAP is used.
---- mc-4.6.1a/configure.extensions	2006-02-15 21:12:35.000000000 +0100
-+++ mc-4.6.1a/configure	2006-02-28 12:03:54.000000000 +0100
-@@ -5791,7 +5791,7 @@ else
+--- mc/configure.extensions	2006-12-28 06:34:48.000000000 +0100
++++ mc/configure	2007-01-04 15:42:15.000000000 +0100
+@@ -7166,7 +7166,7 @@
  fi
  
  
@@ -20,9 +20,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
---- mc-4.6.1a/lib/mc.ext.in.extensions	2005-09-06 11:20:01.000000000 +0200
-+++ mc-4.6.1a/lib/mc.ext.in	2005-12-06 09:22:37.000000000 +0100
-@@ -216,14 +221,25 @@ shell/.7z
+--- mc/lib/mc.ext.in.extensions	2006-12-28 04:45:29.000000000 +0100
++++ mc/lib/mc.ext.in	2007-01-04 15:53:33.000000000 +0100
+@@ -220,14 +220,25 @@
  
  # C
  shell/.c
@@ -50,19 +50,22 @@
  	Open=%var{EDITOR:vi} %f
  
  # Object
-@@ -248,9 +264,11 @@ regex/\.(te?xi|texinfo)$
+@@ -251,10 +262,12 @@
+ 
  # GNU Info page
  type/^Info\ text
- 	Open=info -f %f
-+	#Open=pinfo %f
+-	Open=info -f %f
++	#Open=info -f %f
++	Open=pinfo %f
  
  shell/.info
- 	Open=info -f %f
-+	#Open=pinfo %f
+-	Open=info -f %f
++	#Open=info -f %f
++	Open=pinfo %f
  
  # Manual page
  # Exception - .so libraries are not manual pages
-@@ -319,6 +337,12 @@ type/^PPM
+@@ -328,18 +341,24 @@
  type/^Netpbm
  	Include=image
  
@@ -73,9 +76,14 @@
 +	Include=image
 +
  shell/.xcf
- 	Open=gimp %f
+ 	Open=(gimp %f &)
+ 
+ shell/.xbm
+-	Open=bitmap %f
++	Include=image
  
-@@ -330,7 +354,7 @@ shell/.xpm
+ shell/.xpm
+ 	Include=image
  	View=sxpm %f
  
  include/image
@@ -84,22 +92,37 @@
  	View=%view{ascii} identify %f
  	#View=%view{ascii} asciiview %f
  
-@@ -348,8 +372,12 @@ regex/\.([wW][aA][wW]22)$
+@@ -347,7 +366,8 @@
+ ### Sound files ###
+ 
+ regex/\.([wW][aA][vV]|[sS][nN][dD]|[vV][oO][cC]|[aA][uU]|[sS][mM][pP]|[aA][iI][fF][fF]|[sS][nN][dD])$
+-       Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
++	Open=play %f
++#       Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
+ 
+ regex/\.([mM][oO][dD]|[sS]3[mM]|[xX][mM]|[iI][tT]|[mM][tT][mM]|669|[sS][tT][mM]|[uU][lL][tT]|[fF][aA][rR])$
+        Open=mikmod %f
+@@ -357,11 +377,16 @@
         Open=vplay -s 22 %f
  
  regex/\.([mM][pP]3)$
--	Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f &); fi
+-	Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
 -	View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
 +	Include=audio
-+	#Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f &); fi
-+	#View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
++#	Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
++#	View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
 +
 +regex/\.([mM][kK][aA])$
 +	Include=audio
  
  regex/\.([oO][gG][gG])$
- 	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f &); fi
-@@ -362,6 +390,9 @@ regex/\.([wW][mM][aA])$
+-	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
++	Open=ogg123 %f
++#	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
+ 	View=%view{ascii} ogginfo %s
+ 
+ regex/\.([mM][iI][dD][iI]?|[rR][mM][iI][dD]?)$
+@@ -371,11 +396,15 @@
  	Open=mplayer -vo null %f
  	View=%view{ascii} mplayer -quiet -slave -frames 0 -vo null -ao null -identify %f 2>/dev/null | tail +13 || file %f
  
@@ -109,7 +132,14 @@
  
  ### Play lists ###
  
-@@ -386,20 +417,27 @@ regex/\.([mM][oO][vV]|[qQ][tT])$
+ regex/\.([mM]3[uU]|[pP][lL][sS])$
+-	Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi
++	Open=mplayer -vo null -playlist %f
++#	Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi
+ 
+ 
+ ### Video ###
+@@ -395,20 +424,27 @@
  regex/\.([mM][pP]4|[mM][pP][eE]?[gG])$
  	Include=video
  
@@ -138,7 +168,7 @@
  	#Open=(gtv %f >/dev/null 2>&1 &)
  	#Open=(xanim %f >/dev/null 2>&1 &)
  
-@@ -408,12 +446,13 @@ include/video
+@@ -417,12 +453,13 @@
  
  # Postscript
  type/^PostScript
@@ -154,7 +184,7 @@
  	#Open=(acroread %f &)
  	#Open=(ghostview %f &)
  	View=%view{ascii} pdftotext %f -
-@@ -424,7 +463,7 @@ type/^PDF
+@@ -433,7 +470,7 @@
  # html
  regex/\.([hH][tT][mM][lL]?)$
  	Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null
@@ -163,3 +193,36 @@
  
  # StarOffice 5.2
  shell/.sdw
+@@ -450,22 +487,27 @@
+ 
+ # Microsoft Word Document
+ regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$
+-	Open=(abiword %f >/dev/null 2>&1 &)
++	Open=(ooffice %f &)
++#	Open=(abiword %f >/dev/null 2>&1 &)
+ 	View=%view{ascii} catdoc -w %f || word2x -f text %f - || strings %f
+ type/^Microsoft\ Word
+-	Open=(abiword %f >/dev/null 2>&1 &)
++	Open=(ooffice %f &)
++#	Open=(abiword %f >/dev/null 2>&1 &)
+ 	View=%view{ascii} catdoc -w %f || word2x -f text %f - || strings %f
+ 
+ # RTF document
+ regex/\.([rR][tT][fF])$
+-	Open=(abiword %f >/dev/null 2>&1 &)
++	Open=(ooffice %f &)
++#	Open=(abiword %f >/dev/null 2>&1 &)
+ 
+ # Microsoft Excel Worksheet
+ regex/\.([xX][lL][sSwW])$
+-	Open=(gnumeric %f >/dev/null 2>&1 &)
++	Open=(ooffice %f &)
++#	Open=(gnumeric %f >/dev/null 2>&1 &)
+ 	View=%view{ascii} xls2csv %f || strings %f
+ type/^Microsoft\ Excel
+-	Open=(gnumeric %f >/dev/null 2>&1 &)
++	Open=(ooffice %f &)
++#	Open=(gnumeric %f >/dev/null 2>&1 &)
+ 	View=%view{ascii} xls2csv %f || strings %f
+ 
+ # Use OpenOffice.org to open any MS Office documents

mc-showfree.patch:
 layout.c |   59 +++++++++++++++++++++++++++++++++--------------------------
 layout.h |    1 +
 main.c   |   41 +++++++++++++++++++++++++++++++++++++++++
 main.h   |    2 ++
 screen.c |    5 ++++-
 setup.c  |    1 +
 6 files changed, 82 insertions(+), 27 deletions(-)

Index: mc-showfree.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/FC-5/mc-showfree.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mc-showfree.patch	11 Jul 2006 15:09:14 -0000	1.8
+++ mc-showfree.patch	16 Apr 2007 14:09:31 -0000	1.9
@@ -1,5 +1,5 @@
---- mc-4.6.1a/src/setup.c.showfree	2006-02-23 16:32:18.000000000 +0100
-+++ mc-4.6.1a/src/setup.c	2006-07-10 12:44:43.000000000 +0200
+--- mc-2007-01-24-03/src/setup.c.showfree	2006-02-23 16:45:06.000000000 +0100
++++ mc-2007-01-24-03/src/setup.c	2007-02-15 09:53:48.000000000 +0100
 @@ -134,6 +134,7 @@
      { "show_mini_info", &show_mini_info },
      { "permission_mode", &permission_mode },
@@ -8,8 +8,8 @@
      { 0, 0 }
  };
  
---- mc-4.6.1a/src/main.c.showfree	2006-07-10 12:44:43.000000000 +0200
-+++ mc-4.6.1a/src/main.c	2006-07-10 14:09:24.000000000 +0200
+--- mc-2007-01-24-03/src/main.c.showfree	2007-02-15 09:53:48.000000000 +0100
++++ mc-2007-01-24-03/src/main.c	2007-02-15 09:53:48.000000000 +0100
 @@ -61,6 +61,7 @@
  #include "listmode.h"
  #include "execute.h"
@@ -40,7 +40,7 @@
      update_one_panel (get_current_index (), force_update, current_file);
      if (reload_other)
  	update_one_panel (get_other_index (), force_update, UP_KEEPSEL);
-@@ -467,6 +476,48 @@
+@@ -467,6 +476,38 @@
      }
  }
  
@@ -52,25 +52,15 @@
 +	return;
 +   
 +    if (old_cwd == NULL || strcmp(old_cwd, panel->cwd) != 0) {
-+    	struct stat st;
++	char rpath[PATH_MAX];
 +    
 +	init_my_statfs();
 +	g_free(old_cwd);
 +	old_cwd = g_strdup(panel->cwd);
 +	
-+	if ( mc_lstat (panel->cwd, &st) )
-+	    return;
-+
-+	if ( !S_ISLNK (st.st_mode) ) {
-+	    my_statfs (&myfs_stats, panel->cwd);
-+	} else
-+	{
-+	    char buf[MC_MAXPATHLEN];
-+	    memset (buf, 0, sizeof(buf));
-+	    if ( mc_readlink (panel->cwd, buf, sizeof(buf)-1) <= 0 )
-+	    	return;
-+	    my_statfs (&myfs_stats, buf);
-+	}
++	if (mc_realpath (panel->cwd, rpath) == NULL)
++            return;
++	my_statfs (&myfs_stats, rpath);
 +    }
 +   
 +    if (myfs_stats.avail > 0 || myfs_stats.total > 0) {
@@ -89,8 +79,8 @@
  static int
  quit_cmd_internal (int quiet)
  {
---- mc-4.6.1a/src/main.h.showfree	2006-07-10 12:44:43.000000000 +0200
-+++ mc-4.6.1a/src/main.h	2006-07-10 12:44:43.000000000 +0200
+--- mc-2007-01-24-03/src/main.h.showfree	2007-02-15 09:53:48.000000000 +0100
++++ mc-2007-01-24-03/src/main.h	2007-02-15 09:53:48.000000000 +0100
 @@ -55,6 +55,7 @@
  extern int show_all_if_ambiguous;
  extern int slow_terminal;
@@ -107,8 +97,8 @@
  
  void touch_bar      (void);
  void update_xterm_title_path (void);
---- mc-4.6.1a/src/screen.c.showfree	2006-07-10 12:44:43.000000000 +0200
-+++ mc-4.6.1a/src/screen.c	2006-07-10 12:44:43.000000000 +0200
+--- mc-2007-01-24-03/src/screen.c.showfree	2007-02-15 09:53:48.000000000 +0100
++++ mc-2007-01-24-03/src/screen.c	2007-02-15 09:53:48.000000000 +0100
 @@ -47,7 +47,7 @@
  #include "widget.h"
  #include "menu.h"		/* menubar_visible */
@@ -126,7 +116,7 @@
  }
  
  static void
-@@ -929,6 +930,8 @@
+@@ -910,6 +911,8 @@
      widget_move (&panel->widget, 0, panel->widget.cols - 3);
      addstr ("v");
  
@@ -135,9 +125,9 @@
      if (panel->active)
  	standend ();
  }
---- mc-4.6.1a/src/layout.c.showfree	2006-07-10 12:44:43.000000000 +0200
-+++ mc-4.6.1a/src/layout.c	2006-07-10 12:44:43.000000000 +0200
-@@ -99,6 +99,9 @@
+--- mc-2007-01-24-03/src/layout.c.showfree	2007-02-15 09:53:47.000000000 +0100
++++ mc-2007-01-24-03/src/layout.c	2007-02-15 09:53:48.000000000 +0100
+@@ -96,6 +96,9 @@
  /* Set to show current working dir in xterm window title */
  int xterm_title = 1;
  
@@ -147,7 +137,7 @@
  /* The starting line for the output of the subprogram */
  int output_start_y = 0;
  
-@@ -128,6 +131,7 @@
+@@ -125,6 +128,7 @@
  static int _keybar_visible;
  static int _message_visible;
  static int _xterm_title;
@@ -155,7 +145,7 @@
  static int _permission_mode;
  static int _filetype_mode;
  
-@@ -158,6 +162,7 @@
+@@ -155,6 +159,7 @@
      int    *variable;
      WCheck *widget;
  } check_options [] = {
@@ -163,7 +153,7 @@
      { N_("&Xterm window title"), &xterm_title,   0 },
      { N_("h&Intbar visible"),  &message_visible, 0 },
      { N_("&Keybar visible"),   &keybar_visible,  0 },
-@@ -229,8 +234,8 @@
+@@ -226,8 +231,8 @@
      if (_equal_split){
  	/* Turn equal split off */
  	_equal_split = 0;
@@ -174,7 +164,7 @@
  	dlg_select_widget (bleft_widget);
      }
      _first_panel_size++;
-@@ -244,8 +249,8 @@
+@@ -241,8 +246,8 @@
      if (_equal_split){
  	/* Turn equal split off */
  	_equal_split = 0;
@@ -185,7 +175,7 @@
  	dlg_select_widget (bright_widget);
      }
      _first_panel_size--;
-@@ -291,23 +296,24 @@
+@@ -288,23 +293,24 @@
  	    if (old_output_lines != _output_lines){
  		old_output_lines = _output_lines;
  		attrset (COLOR_NORMAL);
@@ -220,7 +210,7 @@
  	if (console_flag){
  	    int minimum;
  	    if (_output_lines < 0)
-@@ -335,7 +341,7 @@
+@@ -332,7 +338,7 @@
  	    if (old_output_lines != _output_lines){
  		old_output_lines = _output_lines;
  		attrset (COLOR_NORMAL);
@@ -229,7 +219,7 @@
  		tty_printf ("%02d", _output_lines);
  	    }
  	}
-@@ -374,7 +380,7 @@
+@@ -371,7 +377,7 @@
  		first_width = l1;
  	}
  
@@ -238,7 +228,7 @@
  	    check_options[i].text = _(check_options[i].text);
  	    l1 = mbstrlen (check_options[i].text) + 7;
  	    if (l1 > first_width)
-@@ -391,7 +397,7 @@
+@@ -388,7 +394,7 @@
  
  
  	second_width = mbstrlen (title3) + 1;
@@ -247,7 +237,7 @@
  	    check_options[i].text = _(check_options[i].text);
  	    l1 = mbstrlen (check_options[i].text) + 7;
  	    if (l1 > second_width)
-@@ -446,23 +452,23 @@
+@@ -443,23 +449,23 @@
  			    0));
      if (console_flag) {
  	add_widget (layout_dlg,
@@ -278,7 +268,7 @@
  
      _filetype_mode = filetype_mode;
      _permission_mode = permission_mode;
-@@ -472,20 +478,21 @@
+@@ -469,20 +475,21 @@
      _keybar_visible = keybar_visible;
      _message_visible = message_visible;
      _xterm_title = xterm_title;
@@ -302,8 +292,8 @@
      radio_widget = radio_new (3, 6, 2, s_split_direction);
      add_widget (layout_dlg, radio_widget);
      radio_widget->sel = horizontal_split;
---- mc-4.6.1a/src/layout.h.showfree	2004-12-03 20:17:47.000000000 +0100
-+++ mc-4.6.1a/src/layout.h	2006-07-10 12:44:43.000000000 +0200
+--- mc-2007-01-24-03/src/layout.h.showfree	2004-12-03 20:17:47.000000000 +0100
++++ mc-2007-01-24-03/src/layout.h	2007-02-15 09:53:48.000000000 +0100
 @@ -39,6 +39,7 @@
  extern int output_start_y;
  extern int message_visible;

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

Index: mc-utf8.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/FC-5/mc-utf8.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mc-utf8.patch	22 Nov 2006 12:23:06 -0000	1.21
+++ mc-utf8.patch	16 Apr 2007 14:09:31 -0000	1.22
@@ -1,5 +1,5 @@
---- mc-2006-09-25-14/acinclude.m4.utf8	2006-09-09 00:35:29.000000000 +0200
-+++ mc-2006-09-25-14/acinclude.m4	2006-10-10 09:35:14.000000000 +0200
+--- mc/acinclude.m4.utf8	2006-09-09 00:35:29.000000000 +0200
++++ mc/acinclude.m4	2007-01-04 16:20:56.000000000 +0100
 @@ -399,14 +399,14 @@ AC_DEFUN([MC_WITH_SLANG], [
      fi
  
@@ -23,8 +23,8 @@
  
      if test x$with_screen = xslang; then
  	AC_DEFINE(HAVE_SYSTEM_SLANG, 1,
---- mc-2006-09-25-14/src/layout.c.utf8	2006-09-25 16:47:33.000000000 +0200
-+++ mc-2006-09-25-14/src/layout.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/layout.c.utf8	2006-11-10 01:22:30.000000000 +0100
++++ mc/src/layout.c	2007-01-04 16:20:56.000000000 +0100
 @@ -366,36 +366,36 @@ init_layout (void)
  
  	while (i--) {
@@ -98,8 +98,8 @@
  
      widget_set_size (&the_menubar->widget, 0, 0, 1, COLS);
  
---- mc-2006-09-25-14/src/tty.c.utf8	2006-05-23 16:20:39.000000000 +0200
-+++ mc-2006-09-25-14/src/tty.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/tty.c.utf8	2006-05-23 16:20:39.000000000 +0200
++++ mc/src/tty.c	2007-01-04 16:20:56.000000000 +0100
 @@ -134,10 +134,12 @@ tty_print_char(int c)
       * defined or not. Congratulations! At least, they left the API call
       * for SLsmg_write_nchars as it has always been.
@@ -117,8 +117,8 @@
  #else
      addch(c);
  #endif
---- mc-2006-09-25-14/src/option.c.utf8	2006-02-28 18:44:28.000000000 +0100
-+++ mc-2006-09-25-14/src/option.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/option.c.utf8	2006-02-28 18:44:28.000000000 +0100
++++ mc/src/option.c	2007-01-04 16:20:56.000000000 +0100
 @@ -123,12 +123,12 @@ init_configure (void)
  	title2 = _(" Pause after run... ");
  	title3 = _(" Other options ");
@@ -166,8 +166,8 @@
  
  	i18n_config_flag = 1;
      }
---- mc-2006-09-25-14/src/menu.h.utf8	2004-12-03 20:17:47.000000000 +0100
-+++ mc-2006-09-25-14/src/menu.h	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/menu.h.utf8	2004-12-03 20:17:47.000000000 +0100
++++ mc/src/menu.h	2007-01-04 16:20:56.000000000 +0100
 @@ -21,6 +21,8 @@ typedef struct Menu {
      menu_entry *entries;
      int    start_x;		/* position relative to menubar start */
@@ -177,8 +177,8 @@
  } Menu;
  
  extern int menubar_visible;
---- mc-2006-09-25-14/src/menu.c.utf8	2005-09-06 22:36:23.000000000 +0200
-+++ mc-2006-09-25-14/src/menu.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/menu.c.utf8	2005-09-06 22:36:23.000000000 +0200
++++ mc/src/menu.c	2007-01-04 16:20:56.000000000 +0100
 @@ -22,6 +22,7 @@
  #include <string.h>
  
@@ -380,8 +380,8 @@
      g_free (menu->name);
      g_free (menu->help_node);
      g_free (menu);
---- mc-2006-09-25-14/src/filegui.c.utf8	2006-01-30 18:01:58.000000000 +0100
-+++ mc-2006-09-25-14/src/filegui.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/filegui.c.utf8	2006-01-30 18:01:58.000000000 +0100
++++ mc/src/filegui.c	2007-01-04 16:20:56.000000000 +0100
 @@ -65,6 +65,7 @@
  #include "filegui.h"
  #include "key.h"		/* get_event */
@@ -527,8 +527,8 @@
 +    g_free(def_text);
      return dest_dir;
  }
---- mc-2006-09-25-14/src/panelize.c.utf8	2005-05-27 05:35:15.000000000 +0200
-+++ mc-2006-09-25-14/src/panelize.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/panelize.c.utf8	2005-05-27 05:35:15.000000000 +0200
++++ mc/src/panelize.c	2007-01-04 16:20:56.000000000 +0100
 @@ -127,7 +127,7 @@ init_panelize (void)
  	i = sizeof (panelize_but) / sizeof (panelize_but[0]);
  	while (i--) {
@@ -553,8 +553,8 @@
  
  #endif				/* ENABLE_NLS */
  
---- mc-2006-09-25-14/src/slint.c.utf8	2005-09-06 22:36:23.000000000 +0200
-+++ mc-2006-09-25-14/src/slint.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/slint.c.utf8	2005-09-06 22:36:23.000000000 +0200
++++ mc/src/slint.c	2007-01-04 16:20:56.000000000 +0100
 @@ -141,7 +141,9 @@ void
  slang_init (void)
  {
@@ -566,8 +566,8 @@
     /*
      * If the terminal in not in terminfo but begins with a well-known
      * string such as "linux" or "xterm" S-Lang will go on, but the
---- mc-2006-09-25-14/src/main.c.utf8	2006-09-25 16:47:34.000000000 +0200
-+++ mc-2006-09-25-14/src/main.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/main.c.utf8	2006-09-25 16:47:34.000000000 +0200
++++ mc/src/main.c	2007-01-04 16:20:56.000000000 +0100
 @@ -704,7 +704,7 @@ load_prompt (int fd, void *unused)
  	int prompt_len;
  
@@ -589,8 +589,8 @@
  		*s = '?';
  	} while (*++s);
  	fprintf (stdout, "\33]0;mc - %s\7", p);
---- mc-2006-09-25-14/src/view.c.utf8	2006-08-03 17:50:57.000000000 +0200
-+++ mc-2006-09-25-14/src/view.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/view.c.utf8	2006-12-12 18:39:33.000000000 +0100
++++ mc/src/view.c	2007-01-04 16:20:56.000000000 +0100
 @@ -43,6 +43,10 @@
  #include <sys/stat.h>
  #include <unistd.h>
@@ -681,8 +681,8 @@
  	}
  	col++;
  	tty_setcolor (NORMAL_COLOR);
---- mc-2006-09-25-14/src/screen.c.utf8	2006-02-09 02:59:16.000000000 +0100
-+++ mc-2006-09-25-14/src/screen.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/screen.c.utf8	2006-02-09 02:59:16.000000000 +0100
++++ mc/src/screen.c	2007-01-04 16:20:56.000000000 +0100
 @@ -171,21 +171,56 @@ add_permission_string (char *dest, int w
  static const char *
  string_file_name (file_entry *fe, int len)
@@ -1110,8 +1110,8 @@
  
      paint_panel (panel);
  }
---- mc-2006-09-25-14/src/widget.h.utf8	2006-02-28 18:44:28.000000000 +0100
-+++ mc-2006-09-25-14/src/widget.h	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/widget.h.utf8	2006-02-28 18:44:28.000000000 +0100
++++ mc/src/widget.h	2007-01-04 16:20:56.000000000 +0100
 @@ -22,6 +22,7 @@ typedef struct WButton {
      char *text;			/* text of button */
      int hotkey;			/* hot KEY */
@@ -1154,8 +1154,8 @@
      GList *history;		/* The history */
      int  need_push;		/* need to push the current Input on hist? */
      char **completions;		/* Possible completions array */
---- mc-2006-09-25-14/src/tty.h.utf8	2006-05-15 17:46:20.000000000 +0200
-+++ mc-2006-09-25-14/src/tty.h	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/tty.h.utf8	2006-05-15 17:46:20.000000000 +0200
++++ mc/src/tty.h	2007-01-04 16:20:56.000000000 +0100
 @@ -8,6 +8,8 @@
      of ifdefs in the other files small.
   */
@@ -1165,8 +1165,8 @@
  #ifdef HAVE_SLANG
  #   include "myslang.h"
  #endif
---- mc-2006-09-25-14/src/hotlist.c.utf8	2006-08-08 19:55:46.000000000 +0200
-+++ mc-2006-09-25-14/src/hotlist.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/hotlist.c.utf8	2006-08-08 19:55:46.000000000 +0200
++++ mc/src/hotlist.c	2007-01-04 16:20:56.000000000 +0100
 @@ -563,7 +563,7 @@ init_i18n_stuff(int list_type, int cols)
  
  			row = hotlist_but [i].y;
@@ -1227,8 +1227,8 @@
      char *label_string = g_strdup (current_panel->cwd);
  
      strip_password (label_string, 1);
---- mc-2006-09-25-14/src/help.c.utf8	2005-07-22 11:29:50.000000000 +0200
-+++ mc-2006-09-25-14/src/help.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/help.c.utf8	2005-07-22 11:29:50.000000000 +0200
++++ mc/src/help.c	2007-01-04 16:20:56.000000000 +0100
 @@ -449,10 +449,28 @@ static void help_show (Dlg_head *h, cons
  #ifndef HAVE_SLANG
  			addch (acs_map [c]);
@@ -1271,8 +1271,8 @@
  
      if (!filename)
  	g_free (hlpfile);
---- mc-2006-09-25-14/src/wtools.c.utf8	2006-09-14 16:16:10.000000000 +0200
-+++ mc-2006-09-25-14/src/wtools.c	2006-10-10 09:36:13.000000000 +0200
+--- mc/src/wtools.c.utf8	2006-09-14 16:16:10.000000000 +0200
++++ mc/src/wtools.c	2007-01-04 16:20:56.000000000 +0100
 @@ -49,11 +49,11 @@ create_listbox_window (int cols, int lin
      /* Adjust sizes */
      lines = (lines > LINES - 6) ? LINES - 6 : lines;
@@ -1332,8 +1332,8 @@
      quick_widgets[0].x_divisions = quick_widgets[1].x_divisions = len;
  #endif				/* ENABLE_NLS */
  
---- mc-2006-09-25-14/src/util.h.utf8	2006-02-06 17:55:43.000000000 +0100
-+++ mc-2006-09-25-14/src/util.h	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/util.h.utf8	2006-02-06 17:55:43.000000000 +0100
++++ mc/src/util.h	2007-01-04 16:20:56.000000000 +0100
 @@ -103,6 +103,13 @@ void init_uid_gid_cache (void);
  char *get_group (int);
  char *get_owner (int);
@@ -1348,8 +1348,8 @@
  #define MAX_I18NTIMELENGTH 14
  #define MIN_I18NTIMELENGTH 10
  #define STD_I18NTIMELENGTH 12
---- mc-2006-09-25-14/src/widget.c.utf8	2006-05-30 15:46:15.000000000 +0200
-+++ mc-2006-09-25-14/src/widget.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/widget.c.utf8	2006-05-30 15:46:15.000000000 +0200
++++ mc/src/widget.c	2007-01-04 16:20:56.000000000 +0100
 @@ -36,6 +36,9 @@
  
  #include "global.h"
@@ -2065,8 +2065,8 @@
      return in;
  }
  
---- mc-2006-09-25-14/src/util.c.utf8	2005-11-03 03:01:12.000000000 +0100
-+++ mc-2006-09-25-14/src/util.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/util.c.utf8	2005-11-03 03:01:12.000000000 +0100
++++ mc/src/util.c	2007-01-04 16:20:56.000000000 +0100
 @@ -33,7 +33,11 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -2536,8 +2536,8 @@
      }
      *w = 0;
      return s;
---- mc-2006-09-25-14/src/file.c.utf8	2006-05-23 16:20:39.000000000 +0200
-+++ mc-2006-09-25-14/src/file.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/file.c.utf8	2006-05-23 16:20:39.000000000 +0200
++++ mc/src/file.c	2007-01-04 16:20:56.000000000 +0100
 @@ -161,15 +161,20 @@ static const char *
  do_transform_source (FileOpContext *ctx, const char *source)
  {
@@ -2592,8 +2592,8 @@
  	if (i > 0) {
  	    fmd_xlen += i;
  	    fmd_init_i18n (TRUE);	/* to recalculate positions of child widgets */
---- mc-2006-09-25-14/src/find.c.utf8	2006-02-06 17:55:43.000000000 +0100
-+++ mc-2006-09-25-14/src/find.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/find.c.utf8	2006-02-06 17:55:43.000000000 +0100
++++ mc/src/find.c	2007-01-04 16:20:56.000000000 +0100
 @@ -217,7 +217,7 @@ find_parameters (char **start_dir, char 
  	int l1, maxlen = 0;
  
@@ -2641,8 +2641,8 @@
  	    list->list[next_free].fname = name;
  	    list->list[next_free].f.marked = 0;
  	    list->list[next_free].f.link_to_dir = link_to_dir;
---- mc-2006-09-25-14/src/myslang.h.utf8	2005-09-06 22:36:23.000000000 +0200
-+++ mc-2006-09-25-14/src/myslang.h	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/myslang.h.utf8	2005-09-06 22:36:23.000000000 +0200
++++ mc/src/myslang.h	2007-01-04 16:20:56.000000000 +0100
 @@ -11,6 +11,16 @@
  #endif	/* HAVE_SLANG_SLANG_H */
  #endif
@@ -2660,8 +2660,8 @@
  enum {
      KEY_BACKSPACE = 400,
      KEY_END, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT,
---- mc-2006-09-25-14/src/achown.c.utf8	2005-09-06 22:36:23.000000000 +0200
-+++ mc-2006-09-25-14/src/achown.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/achown.c.utf8	2005-09-06 22:36:23.000000000 +0200
++++ mc/src/achown.c	2007-01-04 16:20:56.000000000 +0100
 @@ -584,6 +584,12 @@ init_chown_advanced (void)
      b_att[2] = button_new (XTRACT (6));
      b_user = button_new (XTRACT (5));
@@ -2675,8 +2675,8 @@
  
      add_widget (ch_dlg, b_group);
      add_widget (ch_dlg, b_user);
---- mc-2006-09-25-14/src/dialog.c.utf8	2005-09-06 22:36:23.000000000 +0200
-+++ mc-2006-09-25-14/src/dialog.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/dialog.c.utf8	2005-09-06 22:36:23.000000000 +0200
++++ mc/src/dialog.c	2007-01-04 16:20:56.000000000 +0100
 @@ -166,7 +166,7 @@ common_dialog_repaint (struct Dlg_head *
  
      if (h->title) {
@@ -2686,8 +2686,8 @@
  	addstr (h->title);
      }
  }
---- mc-2006-09-25-14/src/boxes.c.utf8	2006-02-28 18:44:28.000000000 +0100
-+++ mc-2006-09-25-14/src/boxes.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/boxes.c.utf8	2006-02-28 18:44:28.000000000 +0100
++++ mc/src/boxes.c	2007-01-04 16:20:56.000000000 +0100
 @@ -153,23 +153,23 @@ display_init (int radio_sel, char *init_
  	display_title = _(display_title);
  	for (i = 0; i < LIST_TYPES; i++) {
@@ -2860,8 +2860,8 @@
          
          i18n_flag = 1;
      }
---- mc-2006-09-25-14/src/learn.c.utf8	2005-05-27 05:35:15.000000000 +0200
-+++ mc-2006-09-25-14/src/learn.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/src/learn.c.utf8	2005-05-27 05:35:15.000000000 +0200
++++ mc/src/learn.c	2007-01-04 16:20:56.000000000 +0100
 @@ -237,7 +237,7 @@ init_learn (void)
  	learn_but[0].x = 78 / 2 + 4;
  
@@ -2871,8 +2871,8 @@
  
  	learn_title = _(learn_title);
  	i18n_flag = 1;
---- mc-2006-09-25-14/edit/edit-widget.h.utf8	2006-03-20 17:44:32.000000000 +0100
-+++ mc-2006-09-25-14/edit/edit-widget.h	2006-10-10 09:35:14.000000000 +0200
+--- mc/edit/edit-widget.h.utf8	2006-03-20 17:44:32.000000000 +0100
++++ mc/edit/edit-widget.h	2007-01-04 16:20:56.000000000 +0100
 @@ -30,6 +30,11 @@ typedef struct edit_key_map_type {
      long command;
  } edit_key_map_type;
@@ -2912,8 +2912,8 @@
      unsigned long stack_size;
      unsigned long stack_size_mask;
      unsigned long stack_bottom;
---- mc-2006-09-25-14/edit/editkeys.c.utf8	2006-02-02 00:05:15.000000000 +0100
-+++ mc-2006-09-25-14/edit/editkeys.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/edit/editkeys.c.utf8	2006-02-02 00:05:15.000000000 +0100
++++ mc/edit/editkeys.c	2007-01-04 16:20:56.000000000 +0100
 @@ -182,10 +182,10 @@ static const edit_key_map_type common_ke
   * 'command' is one of the editor commands from editcmddef.h.
   */
@@ -2968,9 +2968,9 @@
  	/* unchanged, key has no function here */
  	return 0;
      }
---- mc-2006-09-25-14/edit/editwidget.c.utf8	2005-09-07 17:53:03.000000000 +0200
-+++ mc-2006-09-25-14/edit/editwidget.c	2006-10-10 09:35:14.000000000 +0200
-@@ -344,7 +344,8 @@ edit_callback (Widget *w, widget_msg_t m
+--- mc/edit/editwidget.c.utf8	2006-12-12 18:39:33.000000000 +0100
++++ mc/edit/editwidget.c	2007-01-04 16:20:56.000000000 +0100
+@@ -331,7 +331,8 @@ edit_callback (Widget *w, widget_msg_t m
  
      case WIDGET_KEY:
  	{
@@ -2980,8 +2980,8 @@
  
  	    /* The user may override the access-keys for the menu bar. */
  	    if (edit_translate_key (e, parm, &cmd, &ch)) {
---- mc-2006-09-25-14/edit/editcmd.c.utf8	2006-03-20 17:44:32.000000000 +0100
-+++ mc-2006-09-25-14/edit/editcmd.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/edit/editcmd.c.utf8	2006-11-27 15:19:29.000000000 +0100
++++ mc/edit/editcmd.c	2007-01-04 16:20:56.000000000 +0100
 @@ -61,7 +61,7 @@
  #define edit_get_save_file(f,h) input_expand_dialog (h, _(" Enter file name: "), f)
  
@@ -3074,7 +3074,7 @@
  /*  If 0 (quick save) then  a) create/truncate <filename> file,
  			    b) save to <filename>;
      if 1 (safe save) then   a) save to <tempnam>,
-@@ -345,32 +391,48 @@ edit_save_file (WEdit *edit, const char 
+@@ -360,32 +406,48 @@ edit_save_file (WEdit *edit, const char 
  	buf = 0;
  	filelen = edit->last_byte;
  	while (buf <= (edit->curs1 >> S_EDIT_BUF_SIZE) - 1) {
@@ -3126,7 +3126,7 @@
  			 EDIT_BUF_SIZE) != EDIT_BUF_SIZE) {
  			filelen = -1;
  			break;
-@@ -686,13 +748,21 @@ edit_delete_macro (WEdit * edit, int k)
+@@ -705,13 +767,21 @@ edit_delete_macro (WEdit * edit, int k)
  	if (!n || n == EOF)
  	    break;
  	n = 0;
@@ -3148,7 +3148,7 @@
  	    fprintf (g, ";\n");
  	}
      }
-@@ -725,7 +795,11 @@ int edit_save_macro_cmd (WEdit * edit, s
+@@ -744,7 +814,11 @@ int edit_save_macro_cmd (WEdit * edit, s
  	if (f) {
  	    fprintf (f, ("key '%d 0': "), s);
  	    for (i = 0; i < n; i++)
@@ -3160,7 +3160,7 @@
  	    fprintf (f, ";\n");
  	    fclose (f);
  	    if (saved_macros_loaded) {
-@@ -775,10 +849,18 @@ int edit_load_macro_cmd (WEdit * edit, s
+@@ -794,10 +868,18 @@ int edit_load_macro_cmd (WEdit * edit, s
  		saved_macro[i++] = s;
  	    if (!found) {
  		*n = 0;
@@ -3179,7 +3179,7 @@
  	    }
  	    fscanf (f, ";\n");
  	    if (s == k)
-@@ -925,7 +1007,7 @@ int eval_marks (WEdit * edit, long *star
+@@ -944,7 +1026,7 @@ int eval_marks (WEdit * edit, long *star
  #define space_width 1
  
  static void
@@ -3188,7 +3188,7 @@
  {
      long cursor;
      int i, col;
-@@ -973,7 +1055,7 @@ edit_block_copy_cmd (WEdit *edit)
+@@ -992,7 +1074,7 @@ edit_block_copy_cmd (WEdit *edit)
  {
      long start_mark, end_mark, current = edit->curs1;
      int size;
@@ -3197,7 +3197,7 @@
  
      edit_update_curs_col (edit);
      if (eval_marks (edit, &start_mark, &end_mark))
-@@ -1013,7 +1095,7 @@ edit_block_move_cmd (WEdit *edit)
+@@ -1032,7 +1114,7 @@ edit_block_move_cmd (WEdit *edit)
  {
      long count;
      long current;
@@ -3206,7 +3206,7 @@
      long start_mark, end_mark;
      int deleted = 0;
      int x = 0;
-@@ -1074,7 +1156,7 @@ edit_block_move_cmd (WEdit *edit)
+@@ -1093,7 +1175,7 @@ edit_block_move_cmd (WEdit *edit)
  	edit_push_action (edit, COLUMN_ON);
  	column_highlighting = 0;
      } else {
@@ -3215,7 +3215,7 @@
  	edit_cursor_move (edit, start_mark - edit->curs1);
  	edit_scroll_screen_over_cursor (edit);
  	count = start_mark;
-@@ -1413,7 +1495,11 @@ static long sargs[NUM_REPL_ARGS][256 / s
+@@ -1432,7 +1514,11 @@ static long sargs[NUM_REPL_ARGS][256 / s
  /* This function is a modification of mc-3.2.10/src/view.c:regexp_view_search() */
  /* returns -3 on error in pattern, -1 on not found, found_len = 0 if either */
  static int
@@ -3227,7 +3227,7 @@
  		      int match_bol, int icase, int *found_len, void *d)
  {
      static regex_t r;
-@@ -1422,6 +1508,11 @@ string_regexp_search (char *pattern, cha
+@@ -1441,6 +1527,11 @@ string_regexp_search (char *pattern, cha
      regmatch_t *pmatch;
      static regmatch_t s[1];
  
@@ -3239,7 +3239,7 @@
      pmatch = (regmatch_t *) d;
      if (!pmatch)
  	pmatch = s;
-@@ -1441,13 +1532,51 @@ string_regexp_search (char *pattern, cha
+@@ -1460,13 +1551,51 @@ string_regexp_search (char *pattern, cha
  	old_type = match_type;
  	old_icase = icase;
      }
@@ -3291,7 +3291,7 @@
      *found_len = pmatch[0].rm_eo - pmatch[0].rm_so;
      return (pmatch[0].rm_so);
  }
-@@ -1455,13 +1584,29 @@ string_regexp_search (char *pattern, cha
+@@ -1474,13 +1603,29 @@ string_regexp_search (char *pattern, cha
  /* thanks to  Liviu Daia <daia at stoilow.imar.ro>  for getting this
     (and the above) routines to work properly - paul */
  
@@ -3322,7 +3322,7 @@
      int n = 0;
  
      for (p = 0; p < l; p++)	/* count conversions... */
-@@ -1470,19 +1615,22 @@ edit_find_string (long start, unsigned c
+@@ -1489,19 +1634,22 @@ edit_find_string (long start, unsigned c
  		n++;
  
      if (replace_scanf || replace_regexp) {
@@ -3352,7 +3352,7 @@
  	    if (replace_case) {
  		for (p = start; p < last_byte && p < start + MAX_REPL_LEN; p++)
  		    buf[p - start] = (*get_byte) (data, p);
-@@ -1496,20 +1644,36 @@ edit_find_string (long start, unsigned c
+@@ -1515,20 +1663,36 @@ edit_find_string (long start, unsigned c
  	    }
  
  	    buf[(q = p - start)] = 0;
@@ -3390,7 +3390,7 @@
  		if (q + start < last_byte) {
  		    if (replace_case) {
  			buf[q] = (*get_byte) (data, q + start);
-@@ -1523,7 +1687,11 @@ edit_find_string (long start, unsigned c
+@@ -1542,7 +1706,11 @@ edit_find_string (long start, unsigned c
  		start++;
  		buf++;		/* move the window along */
  		if (buf == mbuf + MAX_REPL_LEN) {	/* the window is about to go past the end of array, so... */
@@ -3402,7 +3402,7 @@
  		    buf = mbuf;
  		}
  		q--;
-@@ -1549,10 +1717,16 @@ edit_find_string (long start, unsigned c
+@@ -1568,10 +1736,16 @@ edit_find_string (long start, unsigned c
  
  		buf = mbuf;
  		while (q) {
@@ -3420,7 +3420,7 @@
  			return -3;
  		    }
  		    else if (found_start == -1)	/* not found: try next line */
-@@ -1563,15 +1737,27 @@ edit_find_string (long start, unsigned c
+@@ -1582,15 +1756,27 @@ edit_find_string (long start, unsigned c
  			match_bol = 0;
  			continue;
  		    }
@@ -3450,7 +3450,7 @@
  		    memmove (mbuf, buf, q);
  		    p = start + q;
  		    move_win = 1;
-@@ -1581,36 +1767,59 @@ edit_find_string (long start, unsigned c
+@@ -1600,36 +1786,59 @@ edit_find_string (long start, unsigned c
  	    }
  	}
      } else {
@@ -3518,7 +3518,7 @@
      return -2;
  }
  
-@@ -1624,9 +1833,14 @@ edit_find_forwards (long search_start, u
+@@ -1643,9 +1852,14 @@ edit_find_forwards (long search_start, u
  
      while ((p = edit_find_string (p, exp, len, last_byte, get_byte, data, once_only, d)) >= 0) {
  	if (replace_whole) {
@@ -3533,7 +3533,7 @@
  		return p;
  	    if (once_only)
  		return -2;
-@@ -1658,6 +1872,7 @@ edit_find (long search_start, unsigned c
+@@ -1677,6 +1891,7 @@ edit_find (long search_start, unsigned c
  
  #define is_digit(x) ((x) >= '0' && (x) <= '9')
  
@@ -3541,7 +3541,7 @@
  #define snprint(v) { \
  		*p1++ = *p++; \
  		*p1 = '\0'; \
-@@ -1665,33 +1880,48 @@ edit_find (long search_start, unsigned c
+@@ -1684,33 +1899,48 @@ edit_find (long search_start, unsigned c
  		if (n >= (size_t) (e - s)) goto nospc; \
  		s += n; \
  	    }
@@ -3598,7 +3598,7 @@
  	s += n;
  	q = p;
  	p1 = q1;
-@@ -1719,45 +1949,78 @@ static int snprintf_p (char *str, size_t
+@@ -1738,45 +1968,78 @@ static int snprintf_p (char *str, size_t
  	    *p1++ = *p++;
  	if (*p == '*') {
  	    p++;
@@ -3687,7 +3687,7 @@
  	    snprint (*va_arg (ap, long *));
  	} else if (*p == 'p') {
  	    snprint (*va_arg (ap, void **));
-@@ -1766,10 +2029,17 @@ static int snprintf_p (char *str, size_t
+@@ -1785,10 +2048,17 @@ static int snprintf_p (char *str, size_t
  	q = p;
      }
      va_end (ap);
@@ -3705,7 +3705,7 @@
      return s + n - str;
  nospc:
      va_end (ap);
-@@ -1948,8 +2218,11 @@ edit_replace_cmd (WEdit *edit, int again
+@@ -1967,8 +2237,11 @@ edit_replace_cmd (WEdit *edit, int again
  		}
  	    }
  	    if (replace_yes) {	/* delete then insert new */
@@ -3718,7 +3718,7 @@
  		    int ret = 0;
  
  		    /* we need to fill in sargs just like with scanf */
-@@ -1958,17 +2231,25 @@ edit_replace_cmd (WEdit *edit, int again
+@@ -1977,17 +2250,25 @@ edit_replace_cmd (WEdit *edit, int again
  			for (k = 1;
  			     k < NUM_REPL_ARGS && pmatch[k].rm_eo >= 0;
  			     k++) {
@@ -3745,7 +3745,7 @@
  								    edit->
  								    search_start
  								    -
-@@ -1986,14 +2267,23 @@ edit_replace_cmd (WEdit *edit, int again
+@@ -2005,14 +2286,23 @@ edit_replace_cmd (WEdit *edit, int again
  		    }
  		    if (!ret)
  			ret =
@@ -3769,7 +3769,7 @@
  		    } else {
  			edit_error_dialog (_(" Replace "),
  					   ret ==
-@@ -2007,10 +2297,18 @@ edit_replace_cmd (WEdit *edit, int again
+@@ -2026,10 +2316,18 @@ edit_replace_cmd (WEdit *edit, int again
  		    times_replaced++;
  		    while (i--)
  			edit_delete (edit);
@@ -3788,7 +3788,7 @@
  	    }
  	    /* so that we don't find the same string again */
  	    if (replace_backwards) {
-@@ -2183,16 +2481,17 @@ edit_ok_to_exit (WEdit *edit)
+@@ -2202,16 +2500,17 @@ edit_ok_to_exit (WEdit *edit)
  #define TEMP_BUF_LEN 1024
  
  /* Return a null terminated length of text. Result must be g_free'd */
@@ -3810,7 +3810,7 @@
  	    x = edit_move_forward3 (edit, edit_bol (edit, start), 0,
  				    start);
  	    c = edit_get_byte (edit, start);
-@@ -2225,11 +2524,15 @@ edit_save_block (WEdit * edit, const cha
+@@ -2244,11 +2543,15 @@ edit_save_block (WEdit * edit, const cha
  	return 0;
  
      if (column_highlighting) {
@@ -3827,7 +3827,7 @@
  	    if (r < 0)
  		break;
  	    p += r;
-@@ -2237,15 +2540,19 @@ edit_save_block (WEdit * edit, const cha
+@@ -2256,15 +2559,19 @@ edit_save_block (WEdit * edit, const cha
  	}
  	g_free (block);
      } else {
@@ -3849,7 +3849,7 @@
  	    start = end;
  	}
  	g_free (buf);
-@@ -2583,17 +2890,20 @@ edit_block_process_cmd (WEdit *edit, con
+@@ -2602,17 +2909,20 @@ edit_block_process_cmd (WEdit *edit, con
  
  /* prints at the cursor */
  /* returns the number of chars printed */
@@ -3872,7 +3872,7 @@
  static void pipe_mail (WEdit *edit, char *to, char *subject, char *cc)
  {
      FILE *p = 0;
-@@ -2687,15 +2997,20 @@ void edit_mail_dialog (WEdit * edit)
+@@ -2706,15 +3016,20 @@ void edit_mail_dialog (WEdit * edit)
  /* find first character of current word */
  static int edit_find_word_start (WEdit *edit, long *word_start, int *word_len)
  {
@@ -3895,7 +3895,7 @@
  	return 0;
  
  /* search start of word to be completed */
-@@ -2705,11 +3020,19 @@ static int edit_find_word_start (WEdit *
+@@ -2724,11 +3039,19 @@ static int edit_find_word_start (WEdit *
  	    return 0;
  
  	last = c;
@@ -3916,7 +3916,7 @@
  		return 0;
  
  	    *word_start = edit->curs1 - (i - 1); /* start found */
-@@ -2742,7 +3065,7 @@ edit_collect_completions (WEdit *edit, l
+@@ -2761,7 +3084,7 @@ edit_collect_completions (WEdit *edit, l
  			  int *num)
  {
      int len, max_len = 0, i, skip;
@@ -3925,7 +3925,7 @@
  
      /* collect max MAX_WORD_COMPLETIONS completions */
      while (*num < MAX_WORD_COMPLETIONS) {
-@@ -2761,11 +3084,16 @@ edit_collect_completions (WEdit *edit, l
+@@ -2780,11 +3103,16 @@ edit_collect_completions (WEdit *edit, l
  	    buffers1[start >> S_EDIT_BUF_SIZE][start & M_EDIT_BUF_SIZE];
  	skip = 0;
  	for (i = 0; i < *num; i++) {
@@ -3945,7 +3945,7 @@
  		skip = 1;
  		break;		/* skip it, already added */
  	    }
-@@ -2773,7 +3101,7 @@ edit_collect_completions (WEdit *edit, l
+@@ -2792,7 +3120,7 @@ edit_collect_completions (WEdit *edit, l
  	if (skip)
  	    continue;
  
@@ -3954,7 +3954,7 @@
  	compl[*num].len = len;
  	for (i = 0; i < len; i++)
  	    compl[*num].text[i] = *(bufpos + i);
-@@ -2787,6 +3115,18 @@ edit_collect_completions (WEdit *edit, l
+@@ -2806,6 +3134,18 @@ edit_collect_completions (WEdit *edit, l
      return max_len;
  }
  
@@ -3973,7 +3973,7 @@
  
  /* let the user select its preferred completion */
  static void
-@@ -2799,6 +3139,9 @@ edit_completion_dialog (WEdit * edit, in
+@@ -2818,6 +3158,9 @@ edit_completion_dialog (WEdit * edit, in
      WListbox *compl_list;
      int compl_dlg_h;		/* completion dialog height */
      int compl_dlg_w;		/* completion dialog width */
@@ -3983,7 +3983,7 @@
  
      /* calculate the dialog metrics */
      compl_dlg_h = num_compl + 2;
-@@ -2834,9 +3177,18 @@ edit_completion_dialog (WEdit * edit, in
+@@ -2853,9 +3196,18 @@ edit_completion_dialog (WEdit * edit, in
      add_widget (compl_dlg, compl_list);
  
      /* fill the listbox with the completions */
@@ -4002,7 +4002,7 @@
  
      /* pop up the dialog */
      run_dlg (compl_dlg);
-@@ -2844,9 +3196,17 @@ edit_completion_dialog (WEdit * edit, in
+@@ -2863,9 +3215,17 @@ edit_completion_dialog (WEdit * edit, in
      /* apply the choosen completion */
      if (compl_dlg->ret_value == B_ENTER) {
  	listbox_get_current (compl_list, &curr, NULL);
@@ -4021,7 +4021,7 @@
      }
  
      /* destroy dialog before return */
-@@ -2863,8 +3223,9 @@ edit_complete_word_cmd (WEdit *edit)
+@@ -2882,8 +3242,9 @@ edit_complete_word_cmd (WEdit *edit)
  {
      int word_len = 0, i, num_compl = 0, max_len;
      long word_start = 0;
@@ -4033,7 +4033,7 @@
      struct selection compl[MAX_WORD_COMPLETIONS];	/* completions */
  
      /* don't want to disturb another search */
-@@ -2881,16 +3242,32 @@ edit_complete_word_cmd (WEdit *edit)
+@@ -2900,16 +3261,32 @@ edit_complete_word_cmd (WEdit *edit)
      /* prepare match expression */
      bufpos = &edit->buffers1[word_start >> S_EDIT_BUF_SIZE]
  	[word_start & M_EDIT_BUF_SIZE];
@@ -4066,8 +4066,8 @@
  
      if (num_compl > 0) {
  	/* insert completed word if there is only one match */
---- mc-2006-09-25-14/edit/wordproc.c.utf8	2006-06-17 04:55:41.000000000 +0200
-+++ mc-2006-09-25-14/edit/wordproc.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/edit/wordproc.c.utf8	2006-06-17 04:55:41.000000000 +0200
++++ mc/edit/wordproc.c	2007-01-04 16:20:56.000000000 +0100
 @@ -40,7 +40,12 @@
  
  #define tab_width option_tab_spacing
@@ -4287,8 +4287,8 @@
  		    g_free (t);
  		    return;
  		}
---- mc-2006-09-25-14/edit/edit.h.utf8	2006-02-06 17:55:42.000000000 +0100
-+++ mc-2006-09-25-14/edit/edit.h	2006-10-10 09:35:14.000000000 +0200
+--- mc/edit/edit.h.utf8	2006-12-12 18:39:33.000000000 +0100
++++ mc/edit/edit.h	2007-01-04 16:20:56.000000000 +0100
 @@ -25,6 +25,27 @@
  
  #include <stdio.h>
@@ -4349,7 +4349,7 @@
  int edit_count_lines (WEdit * edit, long current, int upto);
  long edit_move_forward (WEdit * edit, long current, int lines, long upto);
  long edit_move_forward3 (WEdit * edit, long current, int cols, long upto);
-@@ -146,11 +173,11 @@ int edit_block_delete_cmd (WEdit * edit)
+@@ -148,11 +175,11 @@ int edit_block_delete_cmd (WEdit * edit)
  void edit_delete_line (WEdit * edit);
  
  int edit_delete (WEdit * edit);
@@ -4363,7 +4363,7 @@
  long edit_write_stream (WEdit * edit, FILE * f);
  char *edit_get_write_filter (const char *writename, const char *filename);
  int edit_save_confirm_cmd (WEdit * edit);
-@@ -181,7 +208,7 @@ void edit_goto_cmd (WEdit * edit);
+@@ -183,7 +210,7 @@ void edit_goto_cmd (WEdit * edit);
  int eval_marks (WEdit * edit, long *start_mark, long *end_mark);
  void edit_status (WEdit * edit);
  void edit_execute_key_command (WEdit *edit, int command,
@@ -4372,7 +4372,7 @@
  void edit_update_screen (WEdit * edit);
  int edit_print_string (WEdit * e, const char *s);
  void edit_move_to_line (WEdit * e, long line);
-@@ -231,7 +258,7 @@ void edit_mail_dialog (WEdit *edit);
+@@ -233,7 +260,7 @@ void edit_mail_dialog (WEdit *edit);
  void format_paragraph (WEdit *edit, int force);
  
  /* either command or char_for_insertion must be passed as -1 */
@@ -4381,8 +4381,8 @@
  
  #define get_sys_error(s) (s)
  
---- mc-2006-09-25-14/edit/editdraw.c.utf8	2005-09-06 22:36:20.000000000 +0200
-+++ mc-2006-09-25-14/edit/editdraw.c	2006-10-10 09:35:14.000000000 +0200
+--- mc/edit/editdraw.c.utf8	2006-12-09 16:19:48.000000000 +0100
++++ mc/edit/editdraw.c	2007-01-04 16:20:56.000000000 +0100
 @@ -69,11 +69,16 @@ static void status_string (WEdit * edit,
       * as decimal and as hex.
       */
@@ -4473,9 +4473,9 @@
 -    unsigned int c;
 +    mc_wint_t c;
      int color;
-     int i, book_mark = -1;
+     int i;
  
-@@ -287,66 +300,96 @@ edit_draw_this_line (WEdit *edit, long b
+@@ -282,62 +295,92 @@ edit_draw_this_line (WEdit *edit, long b
  
  	if (row <= edit->total_lines - edit->start_line) {
  	    while (col <= end_col - edit->start_col) {
@@ -4505,14 +4505,9 @@
 +		    p->style |= MOD_BOLD;
  		c = edit_get_byte (edit, q);
  /* we don't use bg for mc - fg contains both */
- 		if (book_mark == -1) {
- 		    edit_get_syntax_color (edit, q, &color);
--		    *p |= color << 16;
-+		    p->style |= color << 16;
- 		} else {
--		    *p |= book_mark << 16;
-+		    p->style |= book_mark << 16;
- 		}
+ 		edit_get_syntax_color (edit, q, &color);
+-		*p |= color << 16;
++		p->style |= color << 16;
  		q++;
  		switch (c) {
  		case '\n':
@@ -4543,10 +4538,10 @@
  		    if (c < 32) {
 -			*(p++) = '^' | MOD_ABNORMAL;
 -			*(p++) = (c + 0x40) | MOD_ABNORMAL;
-+		        p->ch = '^';
++			p->ch = '^';
 +			p->style = MOD_ABNORMAL;
 +			p++;
-+		        p->ch = c + 0x40;
++			p->ch = c + 0x40;
 +			p->style = MOD_ABNORMAL;
  			col += 2;
  			break;
@@ -4592,7 +4587,7 @@
  		    }
  		    col++;
  		    break;
-@@ -356,7 +399,7 @@ edit_draw_this_line (WEdit *edit, long b
+@@ -347,7 +390,7 @@ edit_draw_this_line (WEdit *edit, long b
      } else {
  	start_col_real = start_col = 0;
      }
@@ -4601,10 +4596,10 @@
  
      print_to_widget (edit, row, start_col, start_col_real, end_col, line);
  }
---- mc-2006-09-25-14/edit/edit.c.utf8	2006-02-13 22:35:05.000000000 +0100
-+++ mc-2006-09-25-14/edit/edit.c	2006-10-10 09:35:14.000000000 +0200
-@@ -103,7 +103,11 @@ char *option_backup_ext = NULL;
- static void edit_move_to_prev_col (WEdit *edit, long p);
+--- mc/edit/edit.c.utf8	2006-12-12 18:39:33.000000000 +0100
++++ mc/edit/edit.c	2007-01-04 16:20:56.000000000 +0100
+@@ -102,7 +102,11 @@ char *option_backup_ext = NULL;
+ 
  static void user_menu (WEdit *edit);
  
 +#ifndef UTF8
@@ -4615,7 +4610,7 @@
  {
      unsigned long p;
      if (byte_index >= (edit->curs1 + edit->curs2) || byte_index < 0)
-@@ -132,7 +136,7 @@ edit_init_buffers (WEdit *edit)
+@@ -131,7 +135,7 @@ edit_init_buffers (WEdit *edit)
  
      edit->curs1 = 0;
      edit->curs2 = 0;
@@ -4624,7 +4619,7 @@
  }
  
  /*
-@@ -157,7 +161,7 @@ edit_load_file_fast (WEdit *edit, const 
+@@ -156,7 +160,7 @@ edit_load_file_fast (WEdit *edit, const 
      }
  
      if (!edit->buffers2[buf2])
@@ -4633,7 +4628,7 @@
  
      mc_read (file,
  	     (char *) edit->buffers2[buf2] + EDIT_BUF_SIZE -
-@@ -167,7 +171,7 @@ edit_load_file_fast (WEdit *edit, const 
+@@ -166,7 +170,7 @@ edit_load_file_fast (WEdit *edit, const 
      for (buf = buf2 - 1; buf >= 0; buf--) {
  	/* edit->buffers2[0] is already allocated */
  	if (!edit->buffers2[buf])
@@ -4642,7 +4637,7 @@
  	mc_read (file, (char *) edit->buffers2[buf], EDIT_BUF_SIZE);
      }
  
-@@ -240,9 +244,44 @@ edit_insert_stream (WEdit * edit, FILE *
+@@ -239,9 +243,44 @@ edit_insert_stream (WEdit * edit, FILE *
  {
      int c;
      long i = 0;
@@ -4688,7 +4683,7 @@
      }
      return i;
  }
-@@ -250,9 +289,32 @@ edit_insert_stream (WEdit * edit, FILE *
+@@ -249,9 +288,32 @@ edit_insert_stream (WEdit * edit, FILE *
  long edit_write_stream (WEdit * edit, FILE * f)
  {
      long i;
@@ -4721,7 +4716,7 @@
      return i;
  }
  
-@@ -291,12 +353,46 @@ edit_insert_file (WEdit *edit, const cha
+@@ -290,12 +352,46 @@ edit_insert_file (WEdit *edit, const cha
  	int i, file, blocklen;
  	long current = edit->curs1;
  	unsigned char *buf;
@@ -4768,7 +4763,7 @@
  	}
  	edit_cursor_move (edit, current - edit->curs1);
  	g_free (buf);
-@@ -386,7 +482,11 @@ cleanup:
+@@ -385,7 +481,11 @@ cleanup:
  static int
  edit_load_file (WEdit *edit)
  {
@@ -4780,7 +4775,7 @@
  
      /* Cannot do fast load if a filter is used */
      if (edit_find_filter (edit->filename) >= 0)
-@@ -452,6 +552,7 @@ edit_load_position (WEdit *edit)
+@@ -451,6 +551,7 @@ edit_load_position (WEdit *edit)
      edit->prev_col = column;
      edit_move_to_prev_col (edit, edit_bol (edit, edit->curs1));
      edit_move_display (edit, line - (edit->num_widget_lines / 2));
@@ -4797,22 +4792,22 @@
      if (edit_load_file (edit)) {
  	/* edit_load_file already gives an error message */
  	if (to_free)
-@@ -689,13 +790,23 @@ void edit_push_action (WEdit * edit, lon
+@@ -689,14 +790,23 @@ void edit_push_action (WEdit * edit, lon
  {
      unsigned long sp = edit->stack_pointer;
      unsigned long spm1;
 -    long *t;
-+  
-+    struct action *t; 
-+    mc_wchar_t ch = 0; 
-+
-+    if (c == CHAR_INSERT || c == CHAR_INSERT_AHEAD) { 
-+      va_list ap; 
-+      va_start (ap, c); 
-+      ch = va_arg (ap, mc_wint_t); 
-+      va_end (ap); 
-+    } 
 +
++    struct action *t;
++    mc_wchar_t ch = 0;
++
++    if (c == CHAR_INSERT || c == CHAR_INSERT_AHEAD) {
++	va_list ap;
++	va_start (ap, c);
++	ch = va_arg (ap, mc_wint_t);
++	va_end (ap);
++    }
+ 
  /* first enlarge the stack if necessary */
      if (sp > edit->stack_size - 10) {	/* say */
  	if (option_max_undo < 256)
@@ -4823,7 +4818,7 @@
  	    if (t) {
  		edit->undo_stack = t;
  		edit->stack_size <<= 1;
-@@ -710,7 +821,7 @@ void edit_push_action (WEdit * edit, lon
+@@ -711,7 +821,7 @@ void edit_push_action (WEdit * edit, lon
  #ifdef FAST_MOVE_CURSOR
      if (c == CURS_LEFT_LOTS || c == CURS_RIGHT_LOTS) {
  	va_list ap;
@@ -4832,7 +4827,7 @@
  	edit->stack_pointer = (edit->stack_pointer + 1) & edit->stack_size_mask;
  	va_start (ap, c);
  	c = -(va_arg (ap, int));
-@@ -721,12 +832,14 @@ void edit_push_action (WEdit * edit, lon
+@@ -722,12 +832,14 @@ void edit_push_action (WEdit * edit, lon
  	&& spm1 != edit->stack_bottom
  	&& ((sp - 2) & edit->stack_size_mask) != edit->stack_bottom) {
  	int d;
@@ -4852,7 +4847,7 @@
  		    return;
  		}
  	    }
-@@ -734,19 +847,20 @@ void edit_push_action (WEdit * edit, lon
+@@ -735,19 +847,20 @@ void edit_push_action (WEdit * edit, lon
  #ifndef NO_STACK_CURSMOVE_ANIHILATION
  	    else if ((c == CURS_LEFT && d == CURS_RIGHT)
  		     || (c == CURS_RIGHT && d == CURS_LEFT)) {	/* a left then a right anihilate each other */
@@ -4878,7 +4873,7 @@
  		goto check_bottom;
  	    }
  #ifndef NO_STACK_CURSMOVE_ANIHILATION
-@@ -758,7 +872,9 @@ void edit_push_action (WEdit * edit, lon
+@@ -759,7 +872,9 @@ void edit_push_action (WEdit * edit, lon
  #endif
  	}
      }
@@ -4889,7 +4884,7 @@
    check_bottom:
  
      edit->stack_pointer = (edit->stack_pointer + 1) & edit->stack_size_mask;
-@@ -771,10 +887,10 @@ void edit_push_action (WEdit * edit, lon
+@@ -772,10 +887,10 @@ void edit_push_action (WEdit * edit, lon
         (((unsigned long) c + 1) & edit->stack_size_mask) == edit->stack_bottom)
  	do {
  	    edit->stack_bottom = (edit->stack_bottom + 1) & edit->stack_size_mask;
@@ -4902,7 +4897,7 @@
  	edit->stack_bottom = edit->stack_pointer = 0;
  }
  
-@@ -783,30 +899,30 @@ void edit_push_action (WEdit * edit, lon
+@@ -784,30 +899,30 @@ void edit_push_action (WEdit * edit, lon
     then the file should be as it was when he loaded up. Then set edit->modified to 0.
   */
  static long
@@ -4944,7 +4939,7 @@
  }
  
  /* is called whenever a modification is made by one of the four routines below */
-@@ -827,7 +943,7 @@ static inline void edit_modification (WE
+@@ -828,7 +943,7 @@ static inline void edit_modification (WE
   */
  
  void
@@ -4953,7 +4948,7 @@
  {
      /* check if file has grown to large */
      if (edit->last_byte >= SIZE_LIMIT)
-@@ -865,12 +981,11 @@ edit_insert (WEdit *edit, int c)
+@@ -866,12 +981,11 @@ edit_insert (WEdit *edit, int c)
      /* add a new buffer if we've reached the end of the last one */
      if (!(edit->curs1 & M_EDIT_BUF_SIZE))
  	edit->buffers1[edit->curs1 >> S_EDIT_BUF_SIZE] =
@@ -4969,7 +4964,7 @@
  
      /* update file length */
      edit->last_byte++;
-@@ -881,7 +996,7 @@ edit_insert (WEdit *edit, int c)
+@@ -882,7 +996,7 @@ edit_insert (WEdit *edit, int c)
  
  
  /* same as edit_insert and move left */
@@ -4978,7 +4973,7 @@
  {
      if (edit->last_byte >= SIZE_LIMIT)
  	return;
-@@ -904,7 +1019,7 @@ void edit_insert_ahead (WEdit * edit, in
+@@ -905,7 +1019,7 @@ void edit_insert_ahead (WEdit * edit, in
      edit->last_get_rule += (edit->last_get_rule >= edit->curs1);
  
      if (!((edit->curs2 + 1) & M_EDIT_BUF_SIZE))
@@ -4987,7 +4982,7 @@
      edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE][EDIT_BUF_SIZE - (edit->curs2 & M_EDIT_BUF_SIZE) - 1] = c;
  
      edit->last_byte++;
-@@ -914,7 +1029,7 @@ void edit_insert_ahead (WEdit * edit, in
+@@ -915,7 +1029,7 @@ void edit_insert_ahead (WEdit * edit, in
  
  int edit_delete (WEdit * edit)
  {
@@ -4996,7 +4991,7 @@
      if (!edit->curs2)
  	return 0;
  
-@@ -938,7 +1053,7 @@ int edit_delete (WEdit * edit)
+@@ -939,7 +1053,7 @@ int edit_delete (WEdit * edit)
  	edit->total_lines--;
  	edit->force |= REDRAW_AFTER_CURSOR;
      }
@@ -5005,7 +5000,7 @@
      if (edit->curs1 < edit->start_display) {
  	edit->start_display--;
  	if (p == '\n')
-@@ -952,7 +1067,7 @@ int edit_delete (WEdit * edit)
+@@ -953,7 +1067,7 @@ int edit_delete (WEdit * edit)
  static int
  edit_backspace (WEdit * edit)
  {
@@ -5014,7 +5009,7 @@
      if (!edit->curs1)
  	return 0;
  
-@@ -976,7 +1091,7 @@ edit_backspace (WEdit * edit)
+@@ -977,7 +1091,7 @@ edit_backspace (WEdit * edit)
  	edit->total_lines--;
  	edit->force |= REDRAW_AFTER_CURSOR;
      }
@@ -5023,7 +5018,7 @@
  
      if (edit->curs1 < edit->start_display) {
  	edit->start_display--;
-@@ -989,10 +1104,18 @@ edit_backspace (WEdit * edit)
+@@ -990,10 +1104,18 @@ edit_backspace (WEdit * edit)
  
  #ifdef FAST_MOVE_CURSOR
  
@@ -5043,7 +5038,7 @@
  	edit->curs_line--;
  	next -= (unsigned long) dest;
  	n -= next;
-@@ -1005,7 +1128,7 @@ int
+@@ -1006,7 +1128,7 @@ int
  edit_move_backward_lots (WEdit *edit, long increment)
  {
      int r, s, t;
@@ -5052,7 +5047,7 @@
  
      if (increment > edit->curs1)
  	increment = edit->curs1;
-@@ -1045,7 +1168,7 @@ edit_move_backward_lots (WEdit *edit, lo
+@@ -1046,7 +1168,7 @@ edit_move_backward_lots (WEdit *edit, lo
  	    edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] = p;
  	else
  	    edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] =
@@ -5061,7 +5056,7 @@
      } else {
  	g_free (p);
      }
-@@ -1083,7 +1206,7 @@ edit_move_backward_lots (WEdit *edit, lo
+@@ -1084,7 +1206,7 @@ edit_move_backward_lots (WEdit *edit, lo
  		edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] = p;
  	    else
  		edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] =
@@ -5070,7 +5065,7 @@
  	} else {
  	    g_free (p);
  	}
-@@ -1115,7 +1238,7 @@ int edit_cursor_move (WEdit * edit, long
+@@ -1116,7 +1238,7 @@ int edit_cursor_move (WEdit * edit, long
  
  	    c = edit_get_byte (edit, edit->curs1 - 1);
  	    if (!((edit->curs2 + 1) & M_EDIT_BUF_SIZE))
@@ -5079,7 +5074,7 @@
  	    edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE][EDIT_BUF_SIZE - (edit->curs2 & M_EDIT_BUF_SIZE) - 1] = c;
  	    edit->curs2++;
  	    c = edit->buffers1[(edit->curs1 - 1) >> S_EDIT_BUF_SIZE][(edit->curs1 - 1) & M_EDIT_BUF_SIZE];
-@@ -1140,7 +1263,7 @@ int edit_cursor_move (WEdit * edit, long
+@@ -1141,7 +1263,7 @@ int edit_cursor_move (WEdit * edit, long
  
  	    c = edit_get_byte (edit, edit->curs1);
  	    if (!(edit->curs1 & M_EDIT_BUF_SIZE))
@@ -5088,7 +5083,7 @@
  	    edit->buffers1[edit->curs1 >> S_EDIT_BUF_SIZE][edit->curs1 & M_EDIT_BUF_SIZE] = c;
  	    edit->curs1++;
  	    c = edit->buffers2[(edit->curs2 - 1) >> S_EDIT_BUF_SIZE][EDIT_BUF_SIZE - ((edit->curs2 - 1) & M_EDIT_BUF_SIZE) - 1];
-@@ -1247,7 +1370,7 @@ long edit_move_forward3 (WEdit * edit, l
+@@ -1248,7 +1370,7 @@ long edit_move_forward3 (WEdit * edit, l
  	q = edit->last_byte + 2;
  
      for (col = 0, p = current; p < q; p++) {
@@ -5097,7 +5092,7 @@
  	if (cols != -10) {
  	    if (col == cols)
  		return p;
-@@ -1265,7 +1388,7 @@ long edit_move_forward3 (WEdit * edit, l
+@@ -1266,7 +1388,7 @@ long edit_move_forward3 (WEdit * edit, l
  	} else if (c < 32 || c == 127)
  	    col += 2; /* Caret notation for control characters */
  	else
@@ -5106,7 +5101,7 @@
      }
      return col;
  }
-@@ -1398,7 +1521,7 @@ static int
+@@ -1399,7 +1521,7 @@ static int
  is_blank (WEdit *edit, long offset)
  {
      long s, f;
@@ -5115,7 +5110,7 @@
      s = edit_bol (edit, offset);
      f = edit_eol (edit, offset) - 1;
      while (s <= f) {
-@@ -1770,13 +1893,13 @@ static void edit_left_delete_word (WEdit
+@@ -1771,13 +1893,13 @@ static void edit_left_delete_word (WEdit
  static void
  edit_do_undo (WEdit * edit)
  {
@@ -5132,7 +5127,7 @@
  	case STACK_BOTTOM:
  	    goto done_undo;
  	case CURS_RIGHT:
-@@ -1797,31 +1920,33 @@ edit_do_undo (WEdit * edit)
+@@ -1798,31 +1920,33 @@ edit_do_undo (WEdit * edit)
  	case COLUMN_OFF:
  	    column_highlighting = 0;
  	    break;
@@ -5179,7 +5174,7 @@
      edit_update_curs_row (edit);
  
    done_undo:;
-@@ -2101,7 +2226,7 @@ static void edit_goto_matching_bracket (
+@@ -2102,7 +2226,7 @@ static void edit_goto_matching_bracket (
   * passed as -1.  Commands are executed, and char_for_insertion is
   * inserted at the cursor.
   */
@@ -5188,7 +5183,7 @@
  {
      if (command == CK_Begin_Record_Macro) {
  	edit->macro_i = 0;
-@@ -2136,7 +2261,7 @@ static const char * const shell_cmd[] = 
+@@ -2137,7 +2261,7 @@ static const char * const shell_cmd[] = 
     all of them. It also does not check for the Undo command.
   */
  void
@@ -5197,7 +5192,7 @@
  {
      edit->force |= REDRAW_LINE;
  
-@@ -2169,7 +2294,7 @@ edit_execute_cmd (WEdit *edit, int comma
+@@ -2170,7 +2294,7 @@ edit_execute_cmd (WEdit *edit, int comma
      }
  
      /* An ordinary key press */


Index: mc.spec
===================================================================
RCS file: /cvs/dist/rpms/mc/FC-5/mc.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- mc.spec	22 Nov 2006 12:23:06 -0000	1.90
+++ mc.spec	16 Apr 2007 14:09:31 -0000	1.91
@@ -1,9 +1,9 @@
-%define date 2006-11-14-16
+%define date 2007-01-24-03
 
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.6.1a
-Release:	35%{?dist}
+Release:	36.20070124cvs%{?dist}
 Epoch:		1
 License:	GPL
 Group:		System Environment/Shells
@@ -20,13 +20,14 @@
 Patch4:		mc-utf8-look-and-feel.patch
 Patch5:		mc-concat.patch
 Patch6:		mc-showfree.patch
-Patch7:		mc-cedit.patch 
+Patch7:		mc-cedit.patch
 Patch8:		mc-delcheck.patch
 Patch9:		mc-etcmc.patch
 Patch10:	mc-exit.patch
 Patch11:	mc-utf8-8bit-hex.patch
 Patch12:	mc-ipv6.patch
 Patch13:	mc-newlinedir.patch
+Patch14:	mc-cloexec.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -52,6 +53,7 @@
 %patch11 -p1 -b .8bit-hex
 %patch12 -p1 -b .ipv6
 %patch13 -p1 -b .newlinedir
+%patch14 -p1 -b .cloexec
 
 # convert files in /lib to UTF-8
 pushd lib
@@ -115,26 +117,10 @@
 %build
 export CFLAGS="-DUTF8=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS"
 %configure --with-screen=slang \
-	     --host=%{_host} --build=%{_build} \
-	     --target=%{_target_platform} \
-	     --program-prefix=%{?_program_prefix} \
-	     --prefix=%{_prefix} \
-	     --exec-prefix=%{_exec_prefix} \
-	     --bindir=%{_bindir} \
-	     --sbindir=%{_sbindir} \
-	     --sysconfdir=%{_sysconfdir} \
-	     --datadir=%{_datadir} \
-	     --includedir=%{_includedir} \
-	     --libdir=%{_libdir} \
-	     --libexecdir=%{_libexecdir} \
-	     --localstatedir=%{_localstatedir} \
-	     --sharedstatedir=%{_sharedstatedir} \
-	     --mandir=%{_mandir} \
-	     --infodir=%{_infodir} \
 	     --enable-charset \
 	     --with-samba \
 	     --without-x \
-	     --without-gpm-mouse
+	     --with-gpm-mouse
 make %{?_smp_mflags}
 
 %install 
@@ -144,7 +130,7 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/mc/extfs
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/mc/syntax
 
-%{makeinstall} sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}
+make install DESTDIR="$RPM_BUILD_ROOT"
 
 install lib/{mc.sh,mc.csh} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 
@@ -190,12 +176,31 @@
 %lang(pl) %{_mandir}/pl/man1/mc.1.gz
 %lang(ru) %{_mandir}/ru/man1/mc.1.gz
 %lang(sr) %{_mandir}/sr/man1/mc.1.gz
-%config %{_sysconfdir}/profile.d/*
-%config %{_sysconfdir}/mc/*
+%{_sysconfdir}/profile.d/*
+%config %{_sysconfdir}/mc/syntax/Syntax
+%config %{_sysconfdir}/mc/mc.charsets
+%config %{_sysconfdir}/mc/mc.lib
+%config(noreplace) %{_sysconfdir}/mc/*edit*
+%config(noreplace) %{_sysconfdir}/mc/mc.ext
+%config(noreplace) %{_sysconfdir}/mc/mc.menu
+%config(noreplace) %{_sysconfdir}/mc/extfs/extfs.ini
+%config(noreplace) %{_sysconfdir}/mc/extfs/sfs.ini
 %dir %{_datadir}/mc
 %dir %{_sysconfdir}/mc
+%dir %{_sysconfdir}/mc/syntax
+%dir %{_sysconfdir}/mc/extfs
+%dir %{_libexecdir}/mc
+
 
 %changelog
+* Mon Apr 16 2007 Jindrich Novy <jnovy at redhat.com> 4.6.1a-36
+- update to the CVS snapshot as of 24th Jan 2007 (fixes #220828)
+- reenable gpm support as it is now fixed (#168076)
+- display free space correctly for multiple filesystems (#225153)
+  (thanks to Tomas Heinrich for patch)
+- fix unowned directories (#233880)
+- spec fixes, bindings fixes
+
 * Wed Nov 22 2006 Jindrich Novy <jnovy at redhat.com> 4.6.1a-35
 - update to new CVS snapshot (2006-11-14-16)
 - don't crash when directory ending with newline is listed (#215909),
@@ -555,7 +560,7 @@
 - fix a bunch of buffer overflows and memory leaks (CAN-2004-0226)
 - fix hardlink handling in cpio filesystem
 - fix handling of filenames with single/double quotes and backslashes
-  in %{_datadir}/mc/extfs/rpm
+  in %%{_datadir}/mc/extfs/rpm
 - update php.syntax file (#112645)
 - fix crash with large syntax file (#112644)
 - update CAN-2003-1023 fix to still make vfs symlinks relative,
@@ -728,7 +733,7 @@
 - Updated Japanese translation.
 
 * Sun Jan 14 2001 Florian La Roche <Florian.LaRoche at redhat.de>
-- do not prereq %{_sysconfdir}/init.d
+- do not prereq %%{_sysconfdir}/init.d
 - do not require gpm for s390
 
 * Mon Aug 21 2000 Jonathan Blandford <jrb at redhat.com>
@@ -815,7 +820,7 @@
   script
 
 * Fri Sep 25 1999 Bill Nottingham <notting at redhat.com>
-- chkconfig --del in %preun, not %postun
+- chkconfig --del in %%preun, not %postun
 
 * Wed Sep 22 1999 Michael Fulbright <drmike at redhat.com>
 - updated to 4.5.39-pre9
@@ -863,7 +868,7 @@
 - patched so that TERM variable set to xterm produces color
 
 * Mon Mar 22 1999 Michael Fulbright <drmike at redhat.com>
-- made sure %{_sysconfdir}/pam.d/mcserv has right permissions
+- made sure %%{_sysconfdir}/pam.d/mcserv has right permissions
 
 * Thu Mar 18 1999 Michael Fulbright <drmike at redhat.com>
 - version 4.5.27
@@ -913,7 +918,7 @@
 - removed tkmc
 
 * Wed Apr 8 1998 Marc Ewing <marc at redhat.com>
-- add %{prefix}/lib/mc/layout to gmc
+- add %%{prefix}/lib/mc/layout to gmc
 
 * Tue Dec 23 1997 Tomasz K??oczko <kloczek at rudy.mif.pg.gda.pl>
 - added --without-debug to configure,
@@ -942,10 +947,10 @@
 * Sun Oct 26 1997 Tomasz K??oczko <kloczek at rudy.mif.pg.gda.pl>
 
 - updated to 4.1.6
-- added %attr macros in %%files,
+- added %%attr macros in %%files,
 - a few simplification in %%install,
 - removed glibc patch,
-- fixed installing %{_sysconfdir}/X11/wmconfig/tkmc.
+- fixed installing %%{_sysconfdir}/X11/wmconfig/tkmc.
 
 * Thu Oct 23 1997 Michael K. Johnson <johnsonm at redhat.com>
 
@@ -969,8 +974,8 @@
 
 * Thu May 22 1997 Michele Marziani <marziani at fe.infn.it>
 
-- added support for mc alias in %{_sysconfdir}/profile.d/mc.csh (for csh and tcsh)
-- lowered number of SysV init scripts in %{_sysconfdir}/rc.d/rc[0,1,6].d
+- added support for mc alias in %%{_sysconfdir}/profile.d/mc.csh (for csh and tcsh)
+- lowered number of SysV init scripts in %%{_sysconfdir}/rc.d/rc[0,1,6].d
   (mcserv needs to be killed before inet)
 - removed all references to $RPM_SOURCE_DIR
 - restored $RPM_OPT_FLAGS when compiling
@@ -979,7 +984,7 @@
 * Sun May 18 1997 Michele Marziani <marziani at fe.infn.it>
 
 - removed all references to non-existent mc.rpmfs
-- added mcedit.1 to the %files section
+- added mcedit.1 to the %%files section
 - reverted to un-gzipped man pages (RedHat style)
 - removed double install line for mcserv.pamd
 
@@ -987,10 +992,10 @@
 
 - added new rpmfs script,
 - removed mcfn_install from mc (adding mc() to bash enviroment is in
-  %{_sysconfdir}/profile.d/mc.sh),
-- %{_sysconfdir}/profile.d/mc.sh changed to %config,
-- removed %{prefix}/lib/mc/bin/create_vcs,
-- removed %{prefix}/lib/mc/term.
+  %%{_sysconfdir}/profile.d/mc.sh),
+- %%{_sysconfdir}/profile.d/mc.sh changed to %config,
+- removed %%{prefix}/lib/mc/bin/create_vcs,
+- removed %%{prefix}/lib/mc/term.
 
 * Wed May 9 1997 Tomasz K??oczko <kloczek at rudy.mif.pg.gda.pl>
 
@@ -1000,23 +1005,23 @@
 * Tue May 7 1997 Tomasz K??oczko <kloczek at rudy.mif.pg.gda.pl>
 
 - new version 3.5.27,
-- %dir %{prefix}/lib/mc/icons and icons removed from tkmc,
+- %%dir %%{prefix}/lib/mc/icons and icons removed from tkmc,
 - added commented xmc part.
 
 * Tue Apr 22 1997 Tomasz K??oczko <kloczek at rudy.mif.pg.gda.pl>
 
 - FIX spec:
    - added URL field,
-   - in mc added missing %{prefix}/lib/mc/mc.ext, %{prefix}/lib/mc/mc.hint,
-     %{prefix}/lib/mc/mc.hlp, %{prefix}/lib/mc/mc.lib, %{prefix}/lib/mc/mc.menu.
+   - in mc added missing %%{prefix}/lib/mc/mc.ext, %%{prefix}/lib/mc/mc.hint,
+     %%{prefix}/lib/mc/mc.hlp, %%{prefix}/lib/mc/mc.lib, %%{prefix}/lib/mc/mc.menu.
 
 * Fri Apr 18 1997 Tomasz K??oczko <kloczek at rudy.mif.pg.gda.pl>
 
 - added making packages: tkmc, mcserv (xmc not work yet),
 - gziped man pages,
-- added %{_sysconfdir}/pamd.d/mcserv PAM config file.
+- added %%{_sysconfdir}/pamd.d/mcserv PAM config file.
 - added instaling icons,
-- added %{_sysconfdir}/profile.d/mc.sh,
-- in %doc added NEWS README,
-- removed %{prefix}/lib/mc/FAQ,
+- added %%{_sysconfdir}/profile.d/mc.sh,
+- in %%doc added NEWS README,
+- removed %%{prefix}/lib/mc/FAQ,
 - added mcserv.init script for mcserv (start/stop on level 86).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mc/FC-5/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	22 Nov 2006 12:23:06 -0000	1.33
+++ sources	16 Apr 2007 14:09:31 -0000	1.34
@@ -1 +1 @@
-bd4f2e1c98a283ce7634365c9d4567f0  mc-2006-11-14-16.tar.gz
+21750fc365562ee1f2b20f32defa339d  mc-2007-01-24-03.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr 16 14:16:41 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 10:16:41 -0400
Subject: rpms/kernel/devel linux-2.6-ps3-read-cd.patch, NONE,
	1.1 linux-2.6-ps3-smp-boot.patch, NONE, 1.1 kernel-2.6.spec,
	1.3071, 1.3072 linux-2.6-ps3-fix-slowdown-bug.patch, 1.1, 1.2
Message-ID: <200704161416.l3GEGfc3025437@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec linux-2.6-ps3-fix-slowdown-bug.patch 
Added Files:
	linux-2.6-ps3-read-cd.patch linux-2.6-ps3-smp-boot.patch 
Log Message:
PS3 fixes

linux-2.6-ps3-read-cd.patch:
 ps3_storage.c |  183 ++++++++++++++++++++++++++++++++++++----------------------
 ps3_storage.h |   20 ++++--
 2 files changed, 127 insertions(+), 76 deletions(-)

--- NEW FILE linux-2.6-ps3-read-cd.patch ---
---
 drivers/block/ps3_storage.c |  183 +++++++++++++++++++++++++++-----------------
 drivers/block/ps3_storage.h |   20 +++-
 2 files changed, 127 insertions(+), 76 deletions(-)

--- ps3-linux-mokuno.orig/drivers/block/ps3_storage.c
+++ ps3-linux-mokuno/drivers/block/ps3_storage.c
@@ -92,6 +92,8 @@ static int ps3_stor_lv1_devnum ; /* numb
 static LIST_HEAD(ps3_stor_host_list);
 static DEFINE_SPINLOCK(ps3_stor_host_list_lock);
 
+static u64 ps3_stor_virtual_to_lpar(struct ps3_stor_dev_info *dev_info,
+				    void *va);
 
 /*
  * fill buf with MODE SENSE page 8 (caching parameter)
@@ -396,55 +398,70 @@ static int issue_atapi_by_srb(struct ps3
 	const struct scsi_command_handler_info * handler_info;
 	unsigned char * cmnd = dev_info->srb->cmnd;
 	int bounce_len = 0;
-	unsigned char * bounce_buf = NULL;
 	int error;
 	unsigned char keys[4];
 
 	handler_info = &(dev_info->handler_info[cmnd[0]]);
 
-	/* alloc bounce buffer if needed */
-        if (handler_info->buflen == USE_SRB_6) {
+	/* check buffer size */
+	switch (handler_info->buflen) {
+	case USE_SRB_6:
 		bounce_len = cmnd[4];
-	} else if (handler_info->buflen == USE_SRB_10) {
-		bounce_len = (cmnd[7] << 8) | cmnd[8];
-	} else {
+		break;
+	case USE_SRB_10:
+ 		bounce_len = (cmnd[7] << 8) | cmnd[8];
+		break;
+	case USE_CDDA_FRAME_RAW:
+		bounce_len = ((cmnd[6] << 16) |
+		       (cmnd[7] <<  8) |
+		       (cmnd[8] <<  0)) * CD_FRAMESIZE_RAW;
+		break;
+	default:
 		bounce_len = handler_info->buflen;
 	}
 
-	if (bounce_len)
-		bounce_buf = kmalloc(bounce_len, GFP_NOIO);
-
+	if (dev_info->dedicated_bounce_size < bounce_len ) {
+		static int printed;
+		if (!printed++)
+			printk(KERN_ERR "%s: data size too large %#x<%#x\n",
+			       __FUNCTION__,
+			       dev_info->dedicated_bounce_size,
+			       bounce_len);
+		dev_info->srb->result = DID_ERROR << 16;
+		memset(dev_info->srb->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
+		dev_info->srb->sense_buffer[0] = 0x70;
+		dev_info->srb->sense_buffer[2] = ILLEGAL_REQUEST;
+		return -1;
+	}
 
 	memset(&atapi_cmnd, 0, sizeof(struct lv1_atapi_cmnd_block));
 	memcpy(&(atapi_cmnd.pkt), cmnd, 12);
 	atapi_cmnd.pktlen = 12;
 	atapi_cmnd.proto = handler_info->proto;
-	if (atapi_cmnd.proto == PIO_DATA_OUT_PROTO) {
-		atapi_cmnd.in_out = DIR_MEMORY_TO_ATAPI;
-		fetch_to_dev_buffer(dev_info->srb, bounce_buf, bounce_len);
-	} else
-		atapi_cmnd.in_out = DIR_ATAPI_TO_MEMORY;
+	if (handler_info->in_out != DIR_NA)
+		atapi_cmnd.in_out = handler_info->in_out;
+
+	if (atapi_cmnd.in_out == DIR_WRITE)
+		fetch_to_dev_buffer(dev_info->srb, dev_info->bounce_buf, bounce_len);
 
 	atapi_cmnd.block_size = 1; /* transfer size is block_size * blocks */
 
 	atapi_cmnd.blocks = atapi_cmnd.arglen = bounce_len;
-	atapi_cmnd.buffer = ps3_mm_phys_to_lpar(__pa(bounce_buf)); /* no need special convert */
+	atapi_cmnd.buffer = ps3_stor_virtual_to_lpar(dev_info, dev_info->bounce_buf);
 
 	/* issue command */
 	init_completion(&(dev_info->irq_done));
 	error = lv1_storage_send_device_command(lv1_dev_info->repo.did.dev_id,
 						LV1_STORAGE_SEND_ATAPI_COMMAND,
-						ps3_mm_phys_to_lpar(__pa(&atapi_cmnd)), /* no need special convert */
+						ps3_mm_phys_to_lpar(__pa(&atapi_cmnd)),
 						sizeof(struct lv1_atapi_cmnd_block),
 						atapi_cmnd.buffer,
-						atapi_cmnd.blocks,
+						atapi_cmnd.arglen,
 						&lv1_dev_info->current_tag);
 	if (error) {
 		printk(KERN_ERR "%s: send_device failed lv1dev=%u ret=%d\n",
 		       __FUNCTION__, lv1_dev_info->repo.did.dev_id, error);
 		dev_info->srb->result = DID_ERROR << 16; /* FIXME: is better other error code ? */
-		if (bounce_buf)
-			kfree(bounce_buf);
 		return -1;
 	}
 
@@ -454,18 +471,12 @@ static int issue_atapi_by_srb(struct ps3
 	/* check error */
 	if (!dev_info->lv1_status) {
 		/* OK, completed */
-		if (atapi_cmnd.proto == PIO_DATA_IN_PROTO)
-			fill_from_dev_buffer(dev_info->srb, bounce_buf, bounce_len);
+		if (atapi_cmnd.in_out == DIR_READ)
+			fill_from_dev_buffer(dev_info->srb, dev_info->bounce_buf, bounce_len);
 		dev_info->srb->result = DID_OK << 16;
-		if (bounce_buf)
-			kfree(bounce_buf);
 		return 0;
 	}
 
-	if (bounce_buf) {
-		kfree(bounce_buf);
-		bounce_buf = NULL;
-	}
 	/* error */
 	if (!auto_sense) {
 		dev_info->srb->result = (DID_ERROR << 16) | (CHECK_CONDITION << 1);
@@ -484,16 +495,15 @@ static int issue_atapi_by_srb(struct ps3
 		dev_info->srb->result = SAM_STAT_CHECK_CONDITION;
 	} else {
 		/* do auto sense by our selves*/
-		bounce_buf = kzalloc(18, GFP_NOIO);
 		memset(&atapi_cmnd, 0, sizeof(struct lv1_atapi_cmnd_block));
 		atapi_cmnd.pkt[0] = REQUEST_SENSE;
 		atapi_cmnd.pkt[4] = 18;
 		atapi_cmnd.pktlen = 12;
 		atapi_cmnd.arglen = atapi_cmnd.blocks = atapi_cmnd.pkt[4];
 		atapi_cmnd.block_size = 1;
-		atapi_cmnd.proto = PIO_DATA_IN_PROTO;
-		atapi_cmnd.in_out = DIR_ATAPI_TO_MEMORY;
-		atapi_cmnd.buffer = ps3_mm_phys_to_lpar(__pa(bounce_buf));
+		atapi_cmnd.proto = DMA_PROTO;
+		atapi_cmnd.in_out = DIR_READ;
+		atapi_cmnd.buffer = ps3_stor_virtual_to_lpar(dev_info,dev_info->bounce_buf);
 
 		/* issue REQUEST_SENSE command */
 		init_completion(&(dev_info->irq_done));
@@ -502,7 +512,7 @@ static int issue_atapi_by_srb(struct ps3
 							ps3_mm_phys_to_lpar(__pa(&atapi_cmnd)),
 							sizeof(struct lv1_atapi_cmnd_block),
 							atapi_cmnd.buffer,
-							atapi_cmnd.blocks,
+							atapi_cmnd.arglen,
 							&lv1_dev_info->current_tag);
 		if (error) {
 			printk(KERN_ERR "%s: send_device for request sense failed lv1dev=%u ret=%d\n", __FUNCTION__,
@@ -522,9 +532,8 @@ static int issue_atapi_by_srb(struct ps3
 			       keys[0], keys[1], keys[2]);
 		}
 
-		memcpy(dev_info->srb->sense_buffer, bounce_buf, min((int)atapi_cmnd.pkt[4], SCSI_SENSE_BUFFERSIZE));
-		if (bounce_buf)
-			kfree(bounce_buf);
+		memcpy(dev_info->srb->sense_buffer, dev_info->bounce_buf,
+		       min((int)atapi_cmnd.pkt[4], SCSI_SENSE_BUFFERSIZE));
 		dev_info->srb->result = SAM_STAT_CHECK_CONDITION;
 	}
 
@@ -1997,48 +2006,84 @@ static int ps3_stor_wait_device_ready(vo
 
 static const struct scsi_command_handler_info scsi_cmnd_info_table_hdd[256] =
 {
-	[INQUIRY]                 = { NOT_AVAIL, NOT_AVAIL, ps3_stor_hdd_handle_inquiry},
-	[REQUEST_SENSE]           = { NOT_AVAIL, NOT_AVAIL, ps3_stor_hdd_handle_request_sense},
-	[TEST_UNIT_READY]         = { NOT_AVAIL, NOT_AVAIL, ps3_stor_hdd_handle_just_ok},
-	[READ_CAPACITY]           = { NOT_AVAIL, NOT_AVAIL, ps3_stor_hdd_handle_read_capacity},
-	[MODE_SENSE_10]           = { NOT_AVAIL, NOT_AVAIL, ps3_stor_hdd_handle_mode_sense},
-	[SYNCHRONIZE_CACHE]       = { NOT_AVAIL, NOT_AVAIL, ps3_stor_hdd_handle_sync_cache},
-	[READ_10]                 = { NOT_AVAIL, NOT_AVAIL, ps3_stor_common_handle_read},
-	[READ_6]                  = { NOT_AVAIL, NOT_AVAIL, ps3_stor_common_handle_read},
-	[WRITE_10]                = { NOT_AVAIL, NOT_AVAIL, ps3_stor_common_handle_write},
-	[WRITE_6]                 = { NOT_AVAIL, NOT_AVAIL, ps3_stor_common_handle_write}
+	[INQUIRY]                 = {NOT_AVAIL, NA_PROTO, DIR_NA,
+				     ps3_stor_hdd_handle_inquiry},
+	[REQUEST_SENSE]           = {NOT_AVAIL, NA_PROTO, DIR_NA,
+				     ps3_stor_hdd_handle_request_sense},
+	[TEST_UNIT_READY]         = {NOT_AVAIL, NA_PROTO, DIR_NA,
+				     ps3_stor_hdd_handle_just_ok},
+	[READ_CAPACITY]           = {NOT_AVAIL, NA_PROTO, DIR_NA,
+				     ps3_stor_hdd_handle_read_capacity},
+	[MODE_SENSE_10]           = {NOT_AVAIL, NA_PROTO, DIR_NA,
+				     ps3_stor_hdd_handle_mode_sense},
+	[SYNCHRONIZE_CACHE]       = {NOT_AVAIL, NA_PROTO, DIR_NA,
+				     ps3_stor_hdd_handle_sync_cache},
+	[READ_10]                 = {NOT_AVAIL, NA_PROTO, DIR_NA,
+				     ps3_stor_common_handle_read},
+	[READ_6]                  = {NOT_AVAIL, NA_PROTO, DIR_NA,
+				     ps3_stor_common_handle_read},
+	[WRITE_10]                = {NOT_AVAIL, NA_PROTO, DIR_NA,
+				     ps3_stor_common_handle_write},
+	[WRITE_6]                 = {NOT_AVAIL, NA_PROTO, DIR_NA,
+				     ps3_stor_common_handle_write}
 };
 
 static const struct scsi_command_handler_info scsi_cmnd_info_table_flash[256] =
 {
-	[INQUIRY]                 = { NOT_AVAIL, NOT_AVAIL, ps3_stor_hdd_handle_inquiry},
-	[REQUEST_SENSE]           = { NOT_AVAIL, NOT_AVAIL, ps3_stor_hdd_handle_request_sense},
-	[TEST_UNIT_READY]         = { NOT_AVAIL, NOT_AVAIL, ps3_stor_hdd_handle_just_ok},
-	[READ_CAPACITY]           = { NOT_AVAIL, NOT_AVAIL, ps3_stor_hdd_handle_read_capacity},
-	[MODE_SENSE_10]           = { NOT_AVAIL, NOT_AVAIL, ps3_stor_hdd_handle_mode_sense},
-	[SYNCHRONIZE_CACHE]       = { NOT_AVAIL, NOT_AVAIL, ps3_stor_hdd_handle_sync_cache},
-	[READ_10]                 = { NOT_AVAIL, NOT_AVAIL, ps3_stor_common_handle_read},
-	[READ_6]                  = { NOT_AVAIL, NOT_AVAIL, ps3_stor_common_handle_read},
-	[WRITE_10]                = { NOT_AVAIL, NOT_AVAIL, ps3_stor_handle_write_flash},
-	[WRITE_6]                 = { NOT_AVAIL, NOT_AVAIL, ps3_stor_handle_write_flash}
+	[INQUIRY]                 = {NOT_AVAIL, NA_PROTO, DIR_NA,
+				     ps3_stor_hdd_handle_inquiry},
+	[REQUEST_SENSE]           = {NOT_AVAIL, NA_PROTO, DIR_NA,
+				     ps3_stor_hdd_handle_request_sense},
+	[TEST_UNIT_READY]         = {NOT_AVAIL, NA_PROTO, DIR_NA,
+				     ps3_stor_hdd_handle_just_ok},
+	[READ_CAPACITY]           = {NOT_AVAIL, NA_PROTO, DIR_NA,
+				     ps3_stor_hdd_handle_read_capacity},
+	[MODE_SENSE_10]           = {NOT_AVAIL, NA_PROTO, DIR_NA,
+				     ps3_stor_hdd_handle_mode_sense},
+	[SYNCHRONIZE_CACHE]       = {NOT_AVAIL, NA_PROTO, DIR_NA,
+				     ps3_stor_hdd_handle_sync_cache},
+	[READ_10]                 = {NOT_AVAIL, NA_PROTO, DIR_NA,
+				     ps3_stor_common_handle_read},
+	[READ_6]                  = {NOT_AVAIL, NA_PROTO, DIR_NA,
+				     ps3_stor_common_handle_read},
+	[WRITE_10]                = {NOT_AVAIL, NA_PROTO, DIR_NA,
+				     ps3_stor_handle_write_flash},
+	[WRITE_6]                 = {NOT_AVAIL, NA_PROTO, DIR_NA,
+				     ps3_stor_handle_write_flash}
 };
 
 static const struct scsi_command_handler_info scsi_cmnd_info_table_atapi[256] =
 {
-	[INQUIRY]                 = {  USE_SRB_6, PIO_DATA_IN_PROTO, ps3_stor_atapi_handle_simple},
-	[REQUEST_SENSE]           = {  USE_SRB_6, PIO_DATA_IN_PROTO, ps3_stor_atapi_handle_request_sense},
-	[START_STOP]              = {          0,    NON_DATA_PROTO, ps3_stor_atapi_handle_simple},
-	[ALLOW_MEDIUM_REMOVAL]    = {          0,    NON_DATA_PROTO, ps3_stor_atapi_handle_simple},
-	[TEST_UNIT_READY]         = {          0,    NON_DATA_PROTO, ps3_stor_atapi_handle_simple},
-	[READ_CAPACITY]           = {          8, PIO_DATA_IN_PROTO, ps3_stor_atapi_handle_simple},
-	[MODE_SENSE_10]           = { USE_SRB_10, PIO_DATA_IN_PROTO, ps3_stor_atapi_handle_simple},
-	[READ_TOC]                = { USE_SRB_10, PIO_DATA_IN_PROTO, ps3_stor_atapi_handle_simple},
-	[GPCMD_GET_CONFIGURATION] = { USE_SRB_10, PIO_DATA_IN_PROTO, ps3_stor_atapi_handle_simple},
-	[GPCMD_READ_DISC_INFO]    = { USE_SRB_10, PIO_DATA_IN_PROTO, ps3_stor_atapi_handle_simple},
-	[READ_10]                 = {  NOT_AVAIL,         NOT_AVAIL, ps3_stor_common_handle_read},
-	[READ_6]                  = {  NOT_AVAIL,         NOT_AVAIL, ps3_stor_common_handle_read},
-	[WRITE_10]                = {  NOT_AVAIL,         NOT_AVAIL, ps3_stor_common_handle_write},
-	[WRITE_6]                 = {  NOT_AVAIL,         NOT_AVAIL, ps3_stor_common_handle_write}
+	[INQUIRY]                 = {USE_SRB_6, PIO_DATA_IN_PROTO, DIR_READ,
+				     ps3_stor_atapi_handle_simple},
+	[REQUEST_SENSE]           = {USE_SRB_6, PIO_DATA_IN_PROTO, DIR_READ,
+				     ps3_stor_atapi_handle_request_sense},
+	[START_STOP]              = {0, NON_DATA_PROTO, DIR_NA,
+				     ps3_stor_atapi_handle_simple},
+	[ALLOW_MEDIUM_REMOVAL]    = {0, NON_DATA_PROTO, DIR_NA,
+				     ps3_stor_atapi_handle_simple},
+	[TEST_UNIT_READY]         = {0, NON_DATA_PROTO, DIR_NA,
+				     ps3_stor_atapi_handle_simple},
+	[READ_CAPACITY]           = {8, PIO_DATA_IN_PROTO,  DIR_READ,
+				     ps3_stor_atapi_handle_simple},
+	[MODE_SENSE_10]           = {USE_SRB_10, PIO_DATA_IN_PROTO, DIR_READ,
+				     ps3_stor_atapi_handle_simple},
+	[READ_TOC]                = {USE_SRB_10, PIO_DATA_IN_PROTO, DIR_READ,
+				     ps3_stor_atapi_handle_simple},
+	[GPCMD_GET_CONFIGURATION] = {USE_SRB_10, PIO_DATA_IN_PROTO, DIR_READ,
+				     ps3_stor_atapi_handle_simple},
+	[GPCMD_READ_DISC_INFO]    = {USE_SRB_10, PIO_DATA_IN_PROTO, DIR_READ,
+				     ps3_stor_atapi_handle_simple},
+	[READ_10]                 = {NOT_AVAIL, NA_PROTO, DIR_NA,
+				     ps3_stor_common_handle_read},
+	[READ_6]                  = {NOT_AVAIL, NA_PROTO, DIR_NA,
+				     ps3_stor_common_handle_read},
+	[WRITE_10]                = {NOT_AVAIL, NA_PROTO, DIR_NA,
+				     ps3_stor_common_handle_write},
+	[WRITE_6]                 = {NOT_AVAIL, NA_PROTO, DIR_NA,
+				     ps3_stor_common_handle_write},
+	[GPCMD_READ_CD]           = {USE_CDDA_FRAME_RAW, DMA_PROTO, DIR_READ,
+				     ps3_stor_atapi_handle_simple}
 };
 
 
--- ps3-linux-mokuno.orig/drivers/block/ps3_storage.h
+++ ps3-linux-mokuno/drivers/block/ps3_storage.h
@@ -47,14 +47,17 @@ struct lv1_atapi_cmnd_block {
 };
 
 enum lv1_atapi_proto {
+	NA_PROTO = -1,
 	NON_DATA_PROTO     = 0,
 	PIO_DATA_IN_PROTO  = 1,
-	PIO_DATA_OUT_PROTO = 2
+	PIO_DATA_OUT_PROTO = 2,
+	DMA_PROTO = 3
 };
 
 enum lv1_atapi_in_out {
-	DIR_MEMORY_TO_ATAPI = 0,
-	DIR_ATAPI_TO_MEMORY = 1
+	DIR_NA = -1,
+	DIR_WRITE = 0, /* memory -> device */
+	DIR_READ = 1 /* device -> memory */
 };
 
 /*
@@ -65,16 +68,19 @@ struct ps3_stor_dev_info;
 struct scsi_command_handler_info {
 	int buflen;
 	int proto;
+	int in_out;
 	int (*cmnd_handler)(struct ps3_stor_dev_info *, struct scsi_cmnd *);
 };
 
 /*
  * to position parameter
  */
-
-#define NOT_AVAIL    (-1)
-#define USE_SRB_10   (-2)
-#define USE_SRB_6    (-3)
+enum {
+	NOT_AVAIL          = -1,
+	USE_SRB_10         = -2,
+	USE_SRB_6          = -3,
+	USE_CDDA_FRAME_RAW = -4
+};
 /*
  * for LV1 maintainance
  */

linux-2.6-ps3-smp-boot.patch:
 head_64.S |   29 ++++++++++++++++++++++++++---
 1 files changed, 26 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-ps3-smp-boot.patch ---
--- linux-2.6.20.ppc64/arch/powerpc/kernel/head_64.S.orig	2007-04-16 14:40:03.000000000 +0100
+++ linux-2.6.20.ppc64/arch/powerpc/kernel/head_64.S	2007-04-16 14:40:18.000000000 +0100
@@ -103,8 +103,8 @@ __secondary_hold_acknowledge:
 
 	. = 0x60
 /*
- * The following code is used on pSeries to hold secondary processors
- * in a spin loop after they have been freed from OpenFirmware, but
+ * The following code is used to hold secondary processors
+ * in a spin loop after they have entered the kernel, but
  * before the bulk of the kernel has been relocated.  This code
  * is relocated to physical address 0x60 before prom_init is run.
  * All of it must fit below the first exception vector at 0x100.
@@ -1689,9 +1689,32 @@ _GLOBAL(__start_initialization_multiplat
 2:
 
 	/* Switch off MMU if not already */
-	LOAD_REG_IMMEDIATE(r4, .__after_prom_start - KERNELBASE)
+	LOAD_REG_IMMEDIATE(r4, __mmu_off_return - KERNELBASE)
 	add	r4,r4,r30
 	bl	.__mmu_off
+__mmu_off_return:
+
+	/* Test if this is a secondary cpu and if so send it off to
+	 * __secondary_hold with a thread number in r3.  Secondary processors
+	 * call _start with regs r3,r4,r5 zeroed.
+	 * Pass cpu number in r6???
+	 */
+	or.	r3, r31, r30
+	bne	1f
+	li	r3, 1
+	b	.__secondary_hold
+1:
+
+	/* The primary cpu waits here for all the expected secondary cpus to
+	 * enter the kernel, after which time it is safe to reclaim the
+	 * memory use by the bootwrapper.
+	 * How to know what to wait for???
+	 * !!! need to use the kexec entry mechanism here!!!!
+	*/
+1:	LOAD_REG_IMMEDIATE(r4, __secondary_hold_acknowledge)
+	cmpwi	r4, 0
+	beq	1b
+	mr	r3, r30
 	b	.__after_prom_start
 
 _STATIC(__boot_from_prom)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3071
retrieving revision 1.3072
diff -u -r1.3071 -r1.3072
--- kernel-2.6.spec	16 Apr 2007 02:44:55 -0000	1.3071
+++ kernel-2.6.spec	16 Apr 2007 14:16:39 -0000	1.3072
@@ -437,6 +437,9 @@
 Patch354: linux-2.6-ps3-device-init.patch
 Patch355: linux-2.6-ps3-fix-slowdown-bug.patch
 Patch356: linux-2.6-ps3-sound.patch
+Patch357: linux-2.6-ps3-smp-boot.patch
+Patch358: linux-2.6-ps3-read-cd.patch
+
 # And then some minor tweaks...
 Patch360: linux-2.6-ps3-memory-probe.patch
 Patch361: linux-2.6-ps3-legacy-ioport.patch
@@ -1057,6 +1060,8 @@
 %patch354 -p1
 %patch355 -p1
 %patch356 -p1
+%patch357 -p1
+%patch358 -p1
 
 %patch360 -p1
 %patch361 -p1
@@ -2261,6 +2266,11 @@
 #  - tux.
 
 %changelog
+* Mon Apr 16 2007 David Woodhouse <dwmw2 at redhat.com>
+- Correct fix for PS3 IRQ slowdown (HV bug)
+- Fix for CDDA reading on PS3
+- Fix handling of secondary PPU on PS3 boot
+
 * Sun Apr 15 2007 Dave Jones <davej at redhat.com>
 - 2.6.21-rc7
 

linux-2.6-ps3-fix-slowdown-bug.patch:
 irq.c |   11 +++++++++++
 1 files changed, 11 insertions(+)

Index: linux-2.6-ps3-fix-slowdown-bug.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-ps3-fix-slowdown-bug.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-ps3-fix-slowdown-bug.patch	30 Mar 2007 20:10:34 -0000	1.1
+++ linux-2.6-ps3-fix-slowdown-bug.patch	16 Apr 2007 14:16:39 -0000	1.2
@@ -1,65 +1,39 @@
-From: Takao Shinohara
+From: Takao Shinohara <shin at sm.sony.co.jp>
 
-Change the PS3 interrupt handler from handle_fasteoi_irq to handle_level_irq.
+The PS3 HV will deliver soft-disabled interrupts at the next HV call or
+interrupt.  Add an HV call to local_irq_restore() to force the timely delivery
+of any pending interrupts.
 
-WIP fix for PS3 slowdown bug http://bugzilla.kernel.org/show_bug.cgi?id=8260.
-
-This solves disk and sound slowness issue.  But gelic network is still slow,
-it may have another problem.  We did not check SPU slowdown was solved or not.
-
-The main reason why the slow down was caused is that it seems lv1 requires
-interrupts are masked just after entering guest os interrupt handler.
-The 2.6.16 interrupt handler does in that way.
-
-
-From: Takao Shinohara
-CC: MOKUNO Masakazu <mokuno at sm.sony.co.jp>
+From: Takao Shinohara <shin at sm.sony.co.jp>
 Signed-off-by: Geoff Levand <geoffrey.levand at am.sony.com>
-
 ---
- arch/powerpc/platforms/ps3/interrupt.c |   14 ++++----------
- 1 file changed, 4 insertions(+), 10 deletions(-)
+ arch/powerpc/kernel/irq.c |   11 +++++++++++
+ 1 file changed, 11 insertions(+)
 
---- ps3-linux-dev.orig/arch/powerpc/platforms/ps3/interrupt.c
-+++ ps3-linux-dev/arch/powerpc/platforms/ps3/interrupt.c
-@@ -466,7 +466,7 @@ static void __attribute__ ((unused)) _du
- static void dump_bmp(struct ps3_private* pd) {};
- #endif /* defined(DEBUG) */
- 
--static void ps3_chip_mask(unsigned int virq)
-+static void ps3_chip_mask_ack(unsigned int virq)
- {
- 	struct ps3_private *pd = get_irq_chip_data(virq);
- 	u64 bit = 0x8000000000000000UL >> virq;
-@@ -511,20 +511,14 @@ static void ps3_chip_unmask(unsigned int
- 		     : "cc" );
- 
- 	lv1_did_update_interrupt_mask(pd->node, pd->cpu);
--	local_irq_restore(flags);
--}
--
--static void ps3_chip_eoi(unsigned int virq)
--{
--	const struct ps3_private *pd = get_irq_chip_data(virq);
- 	lv1_end_of_interrupt_ext(pd->node, pd->cpu, virq);
-+	local_irq_restore(flags);
- }
- 
- static struct irq_chip irq_chip = {
- 	.typename = "ps3",
--	.mask = ps3_chip_mask,
-+	.mask_ack = ps3_chip_mask_ack,
- 	.unmask = ps3_chip_unmask,
--	.eoi = ps3_chip_eoi,
- };
- 
- static void ps3_host_unmap(struct irq_host *h, unsigned int virq)
-@@ -538,7 +532,7 @@ static int ps3_host_map(struct irq_host 
- 	pr_debug("%s:%d: hwirq %lu, virq %u\n", __func__, __LINE__, hwirq,
- 		virq);
- 
--	set_irq_chip_and_handler(virq, &irq_chip, handle_fasteoi_irq);
-+	set_irq_chip_and_handler(virq, &irq_chip, handle_level_irq);
- 
- 	return 0;
+--- ps3-linux-dev.orig/arch/powerpc/kernel/irq.c
++++ ps3-linux-dev/arch/powerpc/kernel/irq.c
+@@ -67,6 +67,7 @@
+ #ifdef CONFIG_PPC64
+ #include <asm/paca.h>
+ #include <asm/firmware.h>
++#include <asm/lv1call.h>
+ #endif
+ 
+ int __irq_offset_value;
+@@ -162,6 +163,16 @@ void local_irq_restore(unsigned long en)
+ 	local_paca->hard_enabled = en;
+ 	if ((int)mfspr(SPRN_DEC) < 0)
+ 		mtspr(SPRN_DEC, 1);
++
++	/*
++	 * Force the delivery of pending soft-disabled interrupts on PS3.
++	 * Any HV call will have this side effect.
++	 */
++	if (firmware_has_feature(FW_FEATURE_PS3_LV1)) {
++		u64 tmp;
++		lv1_get_version_info(&tmp);
++	}
++
+ 	hard_irq_enable();
  }
+ #endif /* CONFIG_PPC64 */



From fedora-cvs-commits at redhat.com  Mon Apr 16 14:20:07 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 10:20:07 -0400
Subject: rpms/cairo/devel .cvsignore, 1.29, 1.30 cairo.spec, 1.71,
	1.72 sources, 1.29, 1.30
Message-ID: <200704161420.l3GEK7GH025648@cvs.devel.redhat.com>

Author: cworth

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

Modified Files:
	.cvsignore cairo.spec sources 
Log Message:
Update to cairo 1.4.4


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	20 Mar 2007 19:35:58 -0000	1.29
+++ .cvsignore	16 Apr 2007 14:20:00 -0000	1.30
@@ -1 +1 @@
-cairo-1.4.2.tar.gz
+cairo-1.4.4.tar.gz


Index: cairo.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- cairo.spec	11 Apr 2007 23:38:51 -0000	1.71
+++ cairo.spec	16 Apr 2007 14:20:00 -0000	1.72
@@ -3,7 +3,7 @@
 
 Summary:	A vector graphics library
 Name:		cairo
-Version:	1.4.2
+Version:	1.4.4
 Release:	1%{?dist}
 URL:		http://cairographics.org
 Source0:	http://cairographics.org/releases/%{name}-%{version}.tar.gz
@@ -82,6 +82,9 @@
 %{_datadir}/gtk-doc/html/cairo
 
 %changelog
+* Mon Apr 16 2007 Carl Worth <cworth at cworth.org> 1.4.4-1
+- Update to 1.4.4
+
 * Tue Mar 20 2007 Carl Worth <cworth at redhat.com> 1.4.2-1
 - Update to 1.4.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	20 Mar 2007 19:35:58 -0000	1.29
+++ sources	16 Apr 2007 14:20:00 -0000	1.30
@@ -1 +1 @@
-b254633046eafe603776d0bee791b751  cairo-1.4.2.tar.gz
+a609118644e1d958d977821c6fd765a9  cairo-1.4.4.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr 16 14:40:11 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 10:40:11 -0400
Subject: rpms/samba/devel pam_winbind.conf, NONE,
	1.1 samba-3-0-25rc1-bugday-apr10.patch, NONE,
	1.1 samba-3.0.25rc1-inotifiy.patch, NONE,
	1.1 samba3_idmap_loop.patch, NONE, 1.1 samba.spec, 1.106, 1.107
Message-ID: <200704161440.l3GEeBEd013031@cvs.devel.redhat.com>

Author: ssorce

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12414

Modified Files:
	samba.spec 
Added Files:
	pam_winbind.conf samba-3-0-25rc1-bugday-apr10.patch 
	samba-3.0.25rc1-inotifiy.patch samba3_idmap_loop.patch 
Log Message:

Release 3.0.25 RC1.
Final will be out very soon.




--- NEW FILE pam_winbind.conf ---
#
# pam_winbind configuration file
#
# /etc/security/pam_winbind.conf
#

[global]

# turn on debugging
;debug = yes

# request a cached login if possible
# (needs "winbind offline logon = yes" in smb.conf)
;cached_login = yes

# authenticate using kerberos
;krb5_auth = yes

# when using kerberos, request a "FILE" krb5 credential cache type
# (leave empty to just do krb5 authentication but not have a ticket
# afterwards)
;krb5_ccache_type = FILE

# make successful authentication dependend on membership of one SID
# (can also take a name)
;require_membership_of =

samba-3-0-25rc1-bugday-apr10.patch:
 packaging/RHEL/samba.spec.tmpl      |    3 -
 source/client/client.c              |    4 -
 source/include/smb_share_modes.h    |    8 ---
 source/lib/replace/README           |    2 
 source/lib/replace/libreplace.m4    |    5 -
 source/lib/replace/replace.c        |   27 ----------
 source/lib/replace/test/testsuite.c |    7 --
 source/libsmb/smb_share_modes.c     |    5 +
 source/modules/vfs_gpfs.c           |    3 -
 source/modules/vfs_readahead.c      |    4 -
 source/nmbd/nmbd_subnetdb.c         |    7 ++
 source/nsswitch/idmap.c             |   94 ++++++++++++++++++++----------------
 source/nsswitch/idmap_ad.c          |   49 +++++++++++-------
 source/rpc_parse/parse_prs.c        |   32 ++++++------
 source/smbd/process.c               |    4 -
 source/smbd/quotas.c                |    2 
 source/smbd/reply.c                 |    4 +
 source/tdb/common/transaction.c     |    2 
 18 files changed, 132 insertions(+), 130 deletions(-)

--- NEW FILE samba-3-0-25rc1-bugday-apr10.patch ---
Index: source/smbd/quotas.c
===================================================================
--- source/smbd/quotas.c	(revision 22167)
+++ source/smbd/quotas.c	(working copy)
@@ -662,7 +662,7 @@
 		BOOL retval;
 		DEBUG(5,("disk_quotas: looking for mountpath (NFS) \"%s\"\n", mnt.mnt_special));
 		retval = nfs_quotas(mnt.mnt_special, euser_id, bsize, dfree, dsize);
-		unbecome();
+		unbecome_root();
 		return retval;
 	}
 
Index: source/smbd/process.c
===================================================================
--- source/smbd/process.c	(revision 22167)
+++ source/smbd/process.c	(working copy)
@@ -1153,8 +1153,8 @@
 	char outbuf_saved[smb_wct];
 	int outsize = smb_len(outbuf) + 4;
 
-	/* maybe its not chained */
-	if (smb_com2 == 0xFF) {
+	/* Maybe its not chained, or it's an error packet. */
+	if (smb_com2 == 0xFF || SVAL(outbuf,smb_rcls) != 0) {
 		SCVAL(outbuf,smb_vwv0,0xFF);
 		return outsize;
 	}
Index: source/smbd/reply.c
===================================================================
--- source/smbd/reply.c	(revision 22167)
+++ source/smbd/reply.c	(working copy)
@@ -2705,8 +2705,10 @@
 	}
 
 	nread = send_file_readX(conn, inbuf, outbuf, length, bufsize, fsp, startpos, smb_maxcnt);
-	if (nread != -1)
+	/* Only call chain_reply if not an error. */
+	if (nread != -1 && SVAL(outbuf,smb_rcls) == 0) {
 		nread = chain_reply(inbuf,outbuf,length,bufsize);
+	}
 
 	END_PROFILE(SMBreadX);
 	return nread;
Index: source/nsswitch/idmap_ad.c
===================================================================
--- source/nsswitch/idmap_ad.c	(revision 22167)
+++ source/nsswitch/idmap_ad.c	(working copy)
@@ -164,14 +164,9 @@
 {
 	struct idmap_ad_context *ctx;
 	char *config_option;
-	const char *range;
-	ADS_STRUCT *ads;
+	const char *range = NULL;
+	const char *schema_mode = NULL;	
 
-	/* verify AD is reachable (not critical, we may just be offline at start) */
-	if ( (ads = ad_idmap_cached_connection()) == NULL ) {
-		DEBUG(1, ("WARNING: Could not init an AD connection! Mapping might not work.\n"));
-	}
-
 	if ( (ctx = talloc_zero(dom, struct idmap_ad_context)) == NULL ) {
 		DEBUG(0, ("Out of memory!\n"));
 		return NT_STATUS_NO_MEMORY;
@@ -194,6 +189,20 @@
 		}
 	}
 
+	/* schema mode */
+	if ( ad_map_type == WB_POSIX_MAP_UNKNOWN )
+		ad_map_type = WB_POSIX_MAP_RFC2307;
+	schema_mode = lp_parm_const_string(-1, config_option, "schema_mode", NULL);
+	if ( schema_mode && schema_mode[0] ) {
+		if ( strequal(schema_mode, "sfu") )
+			ad_map_type = WB_POSIX_MAP_SFU;
+		else if ( strequal(schema_mode, "rfc2307" ) )
+			ad_map_type = WB_POSIX_MAP_RFC2307;
+		else
+			DEBUG(0,("idmap_ad_initialize: Unknown schema_mode (%s)\n",
+				 schema_mode));
+	}
+
 	dom->private_data = ctx;
 
 	talloc_free(config_option);
@@ -251,6 +260,7 @@
 				NULL, /* gidnumber */
 				NULL };
 	LDAPMessage *res = NULL;
+	LDAPMessage *entry = NULL;
 	char *filter = NULL;
 	int idx = 0;
 	int bidx = 0;
@@ -329,7 +339,7 @@
 	}
 	filter = talloc_asprintf_append(filter, ")");
 	CHECK_ALLOC_DONE(filter);
-	DEBUG(10, ("Filter: [%s]\n", filter));
+
 	rc = ads_search_retry(ads, &res, filter, attrs);
 	if (!ADS_ERR_OK(rc)) {
 		DEBUG(1, ("ERROR: ads search returned: %s\n", ads_errstr(rc)));
@@ -341,8 +351,8 @@
 		DEBUG(10, ("No IDs found\n"));
 	}
 
-	for (i = 0; i < count; i++) {
-		LDAPMessage *entry = NULL;
+	entry = res;
+	for (i = 0; (i < count) && entry; i++) {
 		DOM_SID sid;
 		enum id_type type;
 		struct id_map *map;
@@ -350,13 +360,14 @@
 		uint32_t atype;
 
 		if (i == 0) { /* first entry */
-			entry = ads_first_entry(ads, res);
+			entry = ads_first_entry(ads, entry);
 		} else { /* following ones */
 			entry = ads_next_entry(ads, entry);
 		}
-		if ( ! entry) {
+
+		if ( !entry ) {
 			DEBUG(2, ("ERROR: Unable to fetch ldap entries from results\n"));
-			continue;
+			break;
 		}
 
 		/* first check if the SID is present */
@@ -457,6 +468,7 @@
 				NULL, /* attr_gidnumber */
 				NULL };
 	LDAPMessage *res = NULL;
+	LDAPMessage *entry = NULL;
 	char *filter = NULL;
 	int idx = 0;
 	int bidx = 0;
@@ -514,8 +526,8 @@
 		DEBUG(10, ("No IDs found\n"));
 	}
 
-	for (i = 0; i < count; i++) {
-		LDAPMessage *entry = NULL;
+	entry = res;	
+	for (i = 0; (i < count) && entry; i++) {
 		DOM_SID sid;
 		enum id_type type;
 		struct id_map *map;
@@ -523,13 +535,14 @@
 		uint32_t atype;
 
 		if (i == 0) { /* first entry */
-			entry = ads_first_entry(ads, res);
+			entry = ads_first_entry(ads, entry);
 		} else { /* following ones */
 			entry = ads_next_entry(ads, entry);
 		}
-		if ( ! entry) {
+
+		if ( !entry ) {
 			DEBUG(2, ("ERROR: Unable to fetch ldap entries from results\n"));
-			continue;
+			break;
 		}
 
 		/* first check if the SID is present */
Index: source/nsswitch/idmap.c
===================================================================
--- source/nsswitch/idmap.c	(revision 22167)
+++ source/nsswitch/idmap.c	(working copy)
@@ -259,7 +259,7 @@
 	char *compat_backend = NULL;
 	char *compat_params = NULL;
 	const char **dom_list = NULL;
-	char *alloc_backend;
+	char *alloc_backend = NULL;
 	BOOL default_already_defined = False;
 	BOOL pri_dom_is_in_list = False;
 	int compat = 0;
@@ -561,11 +561,11 @@
 	}
 
 
-	/***************************
-	 * initialize alloc module
-	 */
-	DEBUG(1, ("Initializing idmap alloc module\n"));
+	/* Initialize alloc module */
 
+	DEBUG(3, ("Initializing idmap alloc module\n"));
+
+	alloc_backend = NULL;
 	if (compat) {
 		alloc_backend = talloc_strdup(idmap_ctx, compat_backend);
 	} else {
@@ -573,37 +573,37 @@
 		
 		if (ab && (ab[0] != '\0')) {
 			alloc_backend = talloc_strdup(idmap_ctx, lp_idmap_alloc_backend());
-		} else {
-			alloc_backend = talloc_strdup(idmap_ctx, "tdb");
 		}
 	}
-	IDMAP_CHECK_ALLOC(alloc_backend);
 
-	alloc_methods = get_alloc_methods(alloc_backends, alloc_backend);
-	if ( ! alloc_methods) {
-		ret = smb_probe_module("idmap", alloc_backend);
-		if (NT_STATUS_IS_OK(ret)) {
-			alloc_methods = get_alloc_methods(alloc_backends, alloc_backend);
+	if ( alloc_backend ) {
+
+		alloc_methods = get_alloc_methods(alloc_backends, alloc_backend);
+		if ( ! alloc_methods) {
+			ret = smb_probe_module("idmap", alloc_backend);
+			if (NT_STATUS_IS_OK(ret)) {
+				alloc_methods = get_alloc_methods(alloc_backends, alloc_backend);
+			}
 		}
-	}
-	if ( alloc_methods) {
-		ret = alloc_methods->init(compat_params);
-		if ( ! NT_STATUS_IS_OK(ret)) {
-			DEBUG(0, ("idmap_init: Initialization failed for alloc "
-				  "backend %s\n", alloc_backend));
-			ret = NT_STATUS_UNSUCCESSFUL;
-			goto done;
+		if ( alloc_methods) {
+			ret = alloc_methods->init(compat_params);
+			if ( ! NT_STATUS_IS_OK(ret)) {
+				DEBUG(0, ("idmap_init: Initialization failed for alloc "
+					  "backend %s\n", alloc_backend));
+				ret = NT_STATUS_UNSUCCESSFUL;
+				goto done;
 		}
-	} else {
-		DEBUG(2, ("idmap_init: Unable to get methods for alloc backend %s\n", 
-			  alloc_backend));
-		/* certain compat backends are just readonly */
-		if ( compat )
-			ret = NT_STATUS_OK;
-		else
-			ret = NT_STATUS_UNSUCCESSFUL;
+		} else {
+			DEBUG(2, ("idmap_init: Unable to get methods for alloc backend %s\n", 
+				  alloc_backend));
+			/* certain compat backends are just readonly */
+			if ( compat )
+				ret = NT_STATUS_OK;
+			else
+				ret = NT_STATUS_UNSUCCESSFUL;
+		}
 	}
-
+	
 	/* cleanpu temporary strings */
 	TALLOC_FREE( compat_backend );
 	
@@ -633,6 +633,9 @@
 		return ret;
 	}
 
+	if ( !alloc_methods )
+		return NT_STATUS_NOT_SUPPORTED;	
+
 	id->type = ID_TYPE_UID;
 	return alloc_methods->allocate_id(id);
 }
@@ -645,6 +648,9 @@
 		return ret;
 	}
 
+	if ( !alloc_methods )
+		return NT_STATUS_NOT_SUPPORTED;	
+
 	id->type = ID_TYPE_GID;
 	return alloc_methods->allocate_id(id);
 }
@@ -657,6 +663,9 @@
 		return ret;
 	}
 
+	if ( !alloc_methods )
+		return NT_STATUS_NOT_SUPPORTED;	
+
 	id->type = ID_TYPE_UID;
 	return alloc_methods->set_id_hwm(id);
 }
@@ -669,6 +678,9 @@
 		return ret;
 	}
 
+	if ( !alloc_methods )
+		return NT_STATUS_NOT_SUPPORTED;	
+
 	id->type = ID_TYPE_GID;
 	return alloc_methods->set_id_hwm(id);
 }
@@ -1321,16 +1333,18 @@
 		return;
 	}
 
-	allid.type = ID_TYPE_UID;
-	allid.id = 0;
-	alloc_methods->get_id_hwm(&allid);
-	fprintf(dump, "USER HWM %lu\n", (unsigned long)allid.id);
-
-	allid.type = ID_TYPE_GID;
-	allid.id = 0;
-	alloc_methods->get_id_hwm(&allid);
-	fprintf(dump, "GROUP HWM %lu\n", (unsigned long)allid.id);
-
+	if ( alloc_methods ) {		
+		allid.type = ID_TYPE_UID;
+		allid.id = 0;
+		alloc_methods->get_id_hwm(&allid);
+		fprintf(dump, "USER HWM %lu\n", (unsigned long)allid.id);
+		
+		allid.type = ID_TYPE_GID;
+		allid.id = 0;
+		alloc_methods->get_id_hwm(&allid);
+		fprintf(dump, "GROUP HWM %lu\n", (unsigned long)allid.id);
+	}
+	
 	maps = talloc(idmap_ctx, struct id_map);
 	num_maps = 0;
 
Index: source/lib/replace/test/testsuite.c
===================================================================
--- source/lib/replace/test/testsuite.c	(revision 22167)
+++ source/lib/replace/test/testsuite.c	(working copy)
@@ -125,12 +125,6 @@
 	return true;
 }
 
-static int test_innetgr(void)
-{
-	/* FIXME */
-	return true;
-}
-
 static int test_initgroups(void)
 {
 	/* FIXME */
@@ -426,7 +420,6 @@
 	ret &= test_strlcpy();
 	ret &= test_strlcat();
 	ret &= test_mktime();
-	ret &= test_innetgr();
 	ret &= test_initgroups();
 	ret &= test_memmove();
 	ret &= test_strdup();
Index: source/lib/replace/libreplace.m4
===================================================================
--- source/lib/replace/libreplace.m4	(revision 22167)
+++ source/lib/replace/libreplace.m4	(working copy)
@@ -147,7 +147,7 @@
 
 AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror)
 AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename)
-AC_CHECK_FUNCS(waitpid strlcpy strlcat innetgr initgroups memmove strdup)
+AC_CHECK_FUNCS(waitpid strlcpy strlcat initgroups memmove strdup)
 AC_CHECK_FUNCS(pread pwrite strndup strcasestr strtok_r mkdtemp socketpair)
 AC_HAVE_DECL(setresuid, [#include <unistd.h>])
 AC_HAVE_DECL(setresgid, [#include <unistd.h>])
@@ -327,8 +327,7 @@
 m4_include(timegm.m4)
 m4_include(repdir.m4)
 
-AC_CHECK_FUNCS([syslog memset setnetgrent getnetgrent endnetgrent memcpy],,
-			   [AC_MSG_ERROR([Required function not found])])
+AC_CHECK_FUNCS([syslog memset memcpy],,[AC_MSG_ERROR([Required function not found])])
 
 echo "LIBREPLACE_BROKEN_CHECKS: END"
 ]) dnl end AC_LIBREPLACE_BROKEN_CHECKS
Index: source/lib/replace/replace.c
===================================================================
--- source/lib/replace/replace.c	(revision 22167)
+++ source/lib/replace/replace.c	(working copy)
@@ -154,33 +154,6 @@
 #endif /* !HAVE_MKTIME */
 
 
-#ifndef HAVE_INNETGR
-#if defined(HAVE_SETNETGRENT) && defined(HAVE_GETNETGRENT) && defined(HAVE_ENDNETGRENT)
-/*
- * Search for a match in a netgroup. This replaces it on broken systems.
- */
-int rep_innetgr(const char *group, const char *host, const char *user, 
-				const char *dom)
-{
-	char *hst, *usr, *dm;
-  
-	setnetgrent(group);
-	while (getnetgrent(&hst, &usr, &dm)) {
-		if (((host == 0) || (hst == 0) || !strcmp(host, hst)) &&
-		    ((user == 0) || (usr == 0) || !strcmp(user, usr)) &&
-		    ((dom == 0) || (dm == 0) || !strcmp(dom, dm))) {
-			endnetgrent();
-			return (1);
-		}
-	}
-	endnetgrent();
-	return (0);
-}
-#endif /* HAVE_SETNETGRENT HAVE_GETNETGRENT HAVE_ENDNETGRENT */
-#endif /* HAVE_INNETGR */
-
-
-
 #ifndef HAVE_INITGROUPS
 /****************************************************************************
  some systems don't have an initgroups call 
Index: source/lib/replace/README
===================================================================
--- source/lib/replace/README	(revision 22167)
+++ source/lib/replace/README	(working copy)
@@ -12,7 +12,6 @@
 strlcat
 mktime
 rename
-innetgr
 initgroups
 memmove
 strdup
@@ -84,5 +83,4 @@
 Prerequisites:
 memset (for bzero)
 syslog (for vsyslog)
-setnetgrent, getnetgrent, endnetgrent (for innetgr)
 mktemp (for mkstemp and mkdtemp)
Index: source/libsmb/smb_share_modes.c
===================================================================
--- source/libsmb/smb_share_modes.c	(revision 22167)
+++ source/libsmb/smb_share_modes.c	(working copy)
@@ -28,6 +28,11 @@
 #include "includes.h"
 #include "smb_share_modes.h"
 
+/* Database context handle. */
+struct smbdb_ctx {
+	TDB_CONTEXT *smb_tdb;
+};
+
 /* Remove the paranoid malloc checker. */
 #ifdef malloc
 #undef malloc
Index: source/modules/vfs_readahead.c
===================================================================
--- source/modules/vfs_readahead.c	(revision 22167)
+++ source/modules/vfs_readahead.c	(working copy)
@@ -101,12 +101,12 @@
 			(unsigned int)rhd->len,
 			err ));
 #elif defined(HAVE_POSIX_FADVISE)
-		int err = posix_fadvise(fromfd, offset, (off_t)rhd->len, POSIX_FADV_WILLNEED);
+		int err = posix_fadvise(fd, offset, (off_t)rhd->len, POSIX_FADV_WILLNEED);
 		DEBUG(10,("readahead_pread: posix_fadvise on fd %u, offset %llu, len %u returned %d\n",
 			(unsigned int)fd,
 			(unsigned long long)offset,
 			(unsigned int)rhd->len,
-			(err ));
+			err ));
 #else
 		if (!rhd->didmsg) {
 			DEBUG(0,("readahead_pread: no readahead on this platform\n"));
Index: source/modules/vfs_gpfs.c
===================================================================
--- source/modules/vfs_gpfs.c	(revision 22167)
+++ source/modules/vfs_gpfs.c	(working copy)
@@ -597,8 +597,7 @@
 			    files_struct *fsp,
 			    int fd, SMB_ACL_T theacl)
 {
-	errno = ENOTSUP;
-	return -1;
+	return gpfsacl_sys_acl_set_file(handle, fsp->fsp_name, SMB_ACL_TYPE_ACCESS, theacl);
 }
 
 int gpfsacl_sys_acl_delete_def_file(vfs_handle_struct *handle,
Index: source/rpc_parse/parse_prs.c
===================================================================
--- source/rpc_parse/parse_prs.c	(revision 22167)
+++ source/rpc_parse/parse_prs.c	(working copy)
@@ -1456,31 +1456,31 @@
 /* useful function to store a structure in rpc wire format */
 int tdb_prs_store(TDB_CONTEXT *tdb, char *keystr, prs_struct *ps)
 {
-    TDB_DATA kbuf, dbuf;
-    kbuf.dptr = keystr;
-    kbuf.dsize = strlen(keystr)+1;
-    dbuf.dptr = ps->data_p;
-    dbuf.dsize = prs_offset(ps);
-    return tdb_trans_store(tdb, kbuf, dbuf, TDB_REPLACE);
+	TDB_DATA kbuf, dbuf;
+	kbuf.dptr = keystr;
+	kbuf.dsize = strlen(keystr)+1;
+	dbuf.dptr = ps->data_p;
+	dbuf.dsize = prs_offset(ps);
+	return tdb_trans_store(tdb, kbuf, dbuf, TDB_REPLACE);
 }
 
 /* useful function to fetch a structure into rpc wire format */
 int tdb_prs_fetch(TDB_CONTEXT *tdb, char *keystr, prs_struct *ps, TALLOC_CTX *mem_ctx)
 {
-    TDB_DATA kbuf, dbuf;
-    kbuf.dptr = keystr;
-    kbuf.dsize = strlen(keystr)+1;
+	TDB_DATA kbuf, dbuf;
+	kbuf.dptr = keystr;
+	kbuf.dsize = strlen(keystr)+1;
 
-    prs_init(ps, 0, mem_ctx, UNMARSHALL);
+	prs_init(ps, 0, mem_ctx, UNMARSHALL);
 
-    dbuf = tdb_fetch(tdb, kbuf);
-    if (!dbuf.dptr)
-	    return -1;
+	dbuf = tdb_fetch(tdb, kbuf);
+	if (!dbuf.dptr)
+		return -1;
 
-    prs_give_memory(ps, dbuf.dptr, dbuf.dsize, True);
+	prs_give_memory(ps, dbuf.dptr, dbuf.dsize, True);
 
-    return 0;
-} 
+	return 0;
+}
 
 /*******************************************************************
  hash a stream.
Index: source/nmbd/nmbd_subnetdb.c
===================================================================
--- source/nmbd/nmbd_subnetdb.c	(revision 22167)
+++ source/nmbd/nmbd_subnetdb.c	(working copy)
@@ -223,6 +223,13 @@
 			return False;
 	}
 
+        /* We must have at least one subnet. */
+	if (subnetlist == NULL) {
+		DEBUG(0,("create_subnets: unable to create any subnet from "
+				"given interfaces. nmbd is terminating\n"));
+		return False;
+	}
+
 	if (lp_we_are_a_wins_server()) {
 		/* Pick the first interface ip address as the WINS server ip. */
 		struct in_addr *nip = iface_n_ip(0);
Index: source/include/smb_share_modes.h
===================================================================
--- source/include/smb_share_modes.h	(revision 22167)
+++ source/include/smb_share_modes.h	(working copy)
@@ -33,13 +33,9 @@
 # endif
 #endif
 
-#include "tdb.h"
+/* Opaque database context handle. */
+struct smbdb_ctx;
 
-/* Database context handle. */
-struct smbdb_ctx {
-	TDB_CONTEXT *smb_tdb;
-};
-
 /* Share mode entry. */
 /*
  We use 64 bit types for device and inode as
Index: source/tdb/common/transaction.c
===================================================================
--- source/tdb/common/transaction.c	(revision 22167)
+++ source/tdb/common/transaction.c	(working copy)
@@ -526,6 +526,8 @@
 				   F_UNLCK,F_SETLKW, 0, 1);
 		}
 		tdb->num_locks = 0;
+		tdb->num_lockrecs = 0;
+		SAFE_FREE(tdb->lockrecs);
 	}
 
 	/* restore the normal io methods */
Index: source/client/client.c
===================================================================
--- source/client/client.c	(revision 22167)
+++ source/client/client.c	(working copy)
@@ -3976,13 +3976,13 @@
 			/* We must use old option processing for this. Find the
 			 * position of the -T option in the raw argv[]. */
 			{
-				int i, optnum;
+				int i;
 				for (i = 1; i < argc; i++) {
 					if (strncmp("-T", argv[i],2)==0)
 						break;
 				}
 				i++;
-				if (!(optnum = tar_parseargs(argc, argv, poptGetOptArg(pc), i))) {
+				if (!tar_parseargs(argc, argv, poptGetOptArg(pc), i)) {
 					poptPrintUsage(pc, stderr, 0);
 					exit(1);
 				}
Index: packaging/RHEL/samba.spec.tmpl
===================================================================
--- packaging/RHEL/samba.spec.tmpl	(revision 22167)
+++ packaging/RHEL/samba.spec.tmpl	(working copy)
@@ -149,7 +149,8 @@
 	--with-shared-modules=idmap_rid,idmap_ad \
 	--with-smbmount \
 	--with-syslog \
-	--with-utmp 
+	--with-utmp \
+	--with-dnsupdate
 
 make showlayout
 

samba-3.0.25rc1-inotifiy.patch:
 notify_inotify.c |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

--- NEW FILE samba-3.0.25rc1-inotifiy.patch ---
=== modified file 'source/smbd/notify_inotify.c'
--- source/smbd/notify_inotify.c	2007-03-09 12:07:58 +0000
+++ source/smbd/notify_inotify.c	2007-04-10 16:27:47 +0000
@@ -66,6 +66,7 @@
 	struct sys_notify_context *ctx;
 	int fd;
 	struct inotify_watch_context *watches;
+	BOOL broken_inotify;	/* Late stop for broken SELinux policy */
 };
 
 struct inotify_watch_context {
@@ -229,8 +230,16 @@
 	  filenames, and thus can't know how much to allocate
 	  otherwise
 	*/
-	if (ioctl(in->fd, FIONREAD, &bufsize) != 0 || 
-	    bufsize == 0) {
+
+	if ((ioctl(in->fd, FIONREAD, &bufsize) != 0) && (errno == EACCES)) {
+		/*
+		 * Workaround for broken SELinux policies on Fedora
+		 */
+		TALLOC_FREE(fde);
+		in->broken_inotify = True;
+		return;
+	}
+	if (bufsize == 0) {
 		DEBUG(0,("No data on inotify fd?!\n"));
 		return;
 	}
@@ -281,6 +290,7 @@
 	}
 	in->ctx = ctx;
 	in->watches = NULL;
+	in->broken_inotify = False;
 
 	ctx->private_data = in;
 	talloc_set_destructor(in, inotify_destructor);
@@ -375,6 +385,10 @@
 
 	in = talloc_get_type(ctx->private_data, struct inotify_private);
 
+	if (in->broken_inotify) {
+		return NT_STATUS_OK;
+	}
+
 	mask = inotify_map(e);
 	if (mask == 0) {
 		/* this filter can't be handled by inotify */


samba3_idmap_loop.patch:
 idmap.c         |   36 ++++++++++++++++++++++++++++++------
 winbindd.c      |    3 +++
 winbindd_dual.c |    3 +++
 3 files changed, 36 insertions(+), 6 deletions(-)

--- NEW FILE samba3_idmap_loop.patch ---
Index: source/nsswitch/winbindd.c
===================================================================
--- source/nsswitch/winbindd.c	(revision 22203)
+++ source/nsswitch/winbindd.c	(working copy)
@@ -1010,6 +1010,9 @@
 
 	namecache_enable();
 
+	/* quick hack to avoid a loop in idmap, proper fix later */
+	reset_idmap_in_own_child();
+
 	/* Winbind daemon initialisation */
 
 	if ( ! NT_STATUS_IS_OK(idmap_init_cache()) ) {
Index: source/nsswitch/winbindd_dual.c
===================================================================
--- source/nsswitch/winbindd_dual.c	(revision 22203)
+++ source/nsswitch/winbindd_dual.c	(working copy)
@@ -921,6 +921,9 @@
 			child);
 	}
 
+	/* quick hack to avoid a loop in idmap, proper fix later */
+	set_idmap_in_own_child();
+
 	while (1) {
 
 		int ret;
Index: source/nsswitch/idmap.c
===================================================================
--- source/nsswitch/idmap.c	(revision 22203)
+++ source/nsswitch/idmap.c	(working copy)
@@ -84,6 +84,24 @@
 	return NULL;
 }
 
+/* part of a quick hack to avoid loops, need to be sorted out correctly later on */
+static BOOL idmap_in_own_child;
+
+static BOOL idmap_is_in_own_child(void)
+{
+	return idmap_in_own_child;
+}
+
+void reset_idmap_in_own_child(void)
+{
+	idmap_in_own_child = False;
+}
+
+void set_idmap_in_own_child(void)
+{
+	idmap_in_own_child = True;
+}
+
 /**********************************************************************
  Allow a module to register itself as a method.
 **********************************************************************/
@@ -801,13 +819,18 @@
 	if ( ! NT_STATUS_IS_OK(ret)) {
 		return NT_STATUS_NONE_MAPPED;
 	}
-	
-	/* by default calls to winbindd are disabled
-	   the following call will not recurse so this is safe */
-	winbind_on();
-	wbret = winbind_lookup_sid(ctx, map->sid, &domname, &name, &sid_type);
-	winbind_off();
 
+	/* quick hack to make things work, will need proper fix later on */	
+	if (idmap_is_in_own_child()) {
+		/* by default calls to winbindd are disabled
+		   the following call will not recurse so this is safe */
+		winbind_on();
+		wbret = winbind_lookup_sid(ctx, map->sid, &domname, &name, &sid_type);
+		winbind_off();
+	} else {
+		wbret = winbindd_lookup_name_by_sid(ctx, map->sid, &domname, &name, &sid_type);
+	}
+
 	/* check if this is a valid SID and then map it */
 	if (wbret) {
 		switch (sid_type) {
@@ -1395,3 +1418,4 @@
 
 	return ret;
 }
+


Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- samba.spec	10 Apr 2007 14:41:53 -0000	1.106
+++ samba.spec	16 Apr 2007 14:40:03 -0000	1.107
@@ -4,7 +4,7 @@
 Name: samba
 Epoch: 0
 Version: 3.0.25
-Release: 0.1.rc1%{?dist}
+Release: 0.7.rc1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.samba.org/
@@ -24,6 +24,7 @@
 Source8: winbind.init
 Source9: smb.conf.default
 Source10: nmb.init
+Source11: pam_winbind.conf
 
 # Don't depend on Net::LDAP
 Source999: filter-requires-samba.sh
@@ -46,6 +47,10 @@
 Patch111: samba-3.0.13-smbclient.patch
 #Patch112: samba-3.0.15pre2-bug106483.patch
 #Patch113: samba-3.0.21-warnings.patch
+Patch200: samba-3.0.25rc1-inotifiy.patch
+Patch201: samba-3-0-25rc1-bugday-apr10.patch
+Patch202: samba3_idmap_loop.patch
+
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
 Requires: pam >= 0:0.64 %{auth} 
@@ -149,6 +154,7 @@
 cp %{SOURCE8} packaging/Fedora/winbind.init
 cp %{SOURCE9} packaging/Fedora/
 cp %{SOURCE10} packaging/Fedora/
+cp %{SOURCE11} packaging/Fedora/
 
 # Upstream patches
 #(none)
@@ -165,6 +171,9 @@
 %patch111 -p1 -b .smbclient
 #%patch112 -p1 -b .bug106483
 #%patch113 -p1 -b .warnings
+%patch200 -p0 -b .inotify
+%patch201 -p0 -b .bugday
+%patch202 -p0 -b .idmap_loop
 
 # crap
 rm -f examples/VFS/.cvsignore
@@ -206,6 +215,7 @@
 	--with-logfilebase=/var/log/samba \
 	--with-libdir=%{_libdir}/samba \
 	--with-configdir=%{_sysconfdir}/samba \
+	--with-pammodulesdir=%{_sysconfdir}/security \
 	--with-swatdir=%{_datadir}/swat \
 	--with-shared-modules=idmap_ad,idmap_rid \
 
@@ -233,7 +243,7 @@
 mkdir -p $RPM_BUILD_ROOT/sbin
 mkdir -p $RPM_BUILD_ROOT/usr/{sbin,bin}
 mkdir -p $RPM_BUILD_ROOT/%{_initrddir}
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/{pam.d,logrotate.d}
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/{pam.d,logrotate.d,security}
 mkdir -p $RPM_BUILD_ROOT/var/{log,spool}/samba
 mkdir -p $RPM_BUILD_ROOT/var/lib/samba
 mkdir -p $RPM_BUILD_ROOT/var/lib/samba/private
@@ -271,6 +281,7 @@
 install -m755 packaging/Fedora/smb.init $RPM_BUILD_ROOT%{_initrddir}/smb
 install -m755 packaging/Fedora/nmb.init $RPM_BUILD_ROOT%{_initrddir}/nmb
 install -m755 packaging/Fedora/winbind.init $RPM_BUILD_ROOT%{_initrddir}/winbind
+install -m644 packaging/Fedora/pam_winbind.conf $RPM_BUILD_ROOT%{_sysconfdir}/security
 #ln -s ../..%{_initrddir}/smb  $RPM_BUILD_ROOT%{_sbindir}/samba
 install -m644 packaging/Fedora/samba.pamd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/samba
 install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/samba



From fedora-cvs-commits at redhat.com  Mon Apr 16 14:45:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 10:45:23 -0400
Subject: rpms/bind/devel dig-idn.patch, NONE, 1.1 idnkit-autotools.patch,
	NONE, 1.1 bind.spec, 1.171, 1.172
Message-ID: <200704161445.l3GEjNGn017077@cvs.devel.redhat.com>

Author: atkac

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

Modified Files:
	bind.spec 
Added Files:
	dig-idn.patch idnkit-autotools.patch 
Log Message:
added experimental idn support to dig + host utils


dig-idn.patch:
 Makefile.in |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE dig-idn.patch ---
--- bind-9.4.0/bin/dig/Makefile.in.idn	2007-04-16 15:46:29.000000000 +0200
+++ bind-9.4.0/bin/dig/Makefile.in	2007-04-16 15:50:24.000000000 +0200
@@ -24,7 +24,7 @@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =	-I${srcdir}/include ${DNS_INCLUDES} ${BIND9_INCLUDES} \
-		${ISC_INCLUDES} ${LWRES_INCLUDES}
+		${ISC_INCLUDES} ${LWRES_INCLUDES} -I../../contrib/idn/idnkit-1.0-src/include
 
 CDEFINES =	-DVERSION=\"${VERSION}\"
 CWARNINGS =
@@ -42,10 +42,10 @@
 LWRESDEPLIBS =	../../lib/lwres/liblwres. at A@
 
 DEPLIBS =	${DNSDEPLIBS} ${BIND9DEPLIBS} ${ISCDEPLIBS} ${ISCCFGDEPLIBS} \
-		${LWRESDEPLIBS}
+		${LWRESDEPLIBS} 
 
 LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCLIBS} \
-		${ISCCFGLIBS} @IDNLIBS@ @LIBS@
+		${ISCCFGLIBS} ../../contrib/idn/idnkit-1.0-src/lib/libidnkit.la @LIBS@
 
 SUBDIRS =
 

idnkit-autotools.patch:
 Makefile.am               |    6 
 configure.ac              |  553 ++++++++++++++++++++++++++++++++++++++++++++++
 include/Makefile.am       |    3 
 include/idn/Makefile.am   |   32 ++
 include/mdn/Makefile.am   |   10 
 lib/Makefile.am           |   85 +++++++
 man/Makefile.am           |   43 +++
 map/Makefile.am           |    2 
 tools/Makefile.am         |    3 
 tools/idnconv/Makefile.am |   29 ++
 tools/runidn/Makefile.am  |   35 ++
 11 files changed, 801 insertions(+)

--- NEW FILE idnkit-autotools.patch ---
--- idnkit-1.0-src/map/Makefile.am.autotools	2007-04-16 13:40:22.000000000 +0200
+++ idnkit-1.0-src/map/Makefile.am	2007-04-16 12:51:15.000000000 +0200
@@ -0,0 +1,2 @@
+map_DATA = \
+	jp.map
--- idnkit-1.0-src/Makefile.am.autotools	2007-04-16 13:39:09.000000000 +0200
+++ idnkit-1.0-src/Makefile.am	2007-04-15 17:24:51.000000000 +0200
@@ -0,0 +1,6 @@
+SUBDIRS = \
+	include \
+	lib \
+	man \
+	tools \
+	map
--- idnkit-1.0-src/tools/Makefile.am.autotools	2007-04-16 13:40:02.000000000 +0200
+++ idnkit-1.0-src/tools/Makefile.am	2007-04-16 12:03:20.000000000 +0200
@@ -0,0 +1,3 @@
+SUBDIRS = \
+	idnconv \
+	runidn
--- idnkit-1.0-src/tools/runidn/Makefile.am.autotools	2007-04-16 13:40:05.000000000 +0200
+++ idnkit-1.0-src/tools/runidn/Makefile.am	2007-04-16 13:17:17.000000000 +0200
@@ -0,0 +1,35 @@
+if RUNIDN
+bin_SCRIPTS = 
+man1_MANS = 
+lib_LTLIBRARIES = libidnkitres.la
+
+libidnkitres_la_SOURCES = \
+	resolver.lo stub.lo
+
+AM_CPPFLAGS = \
+	-DFOR_RUNIDN \
+	-I$(top_srcdir)/include \
+	$(ICONVINC)
+
+libidnkitres_la_LIBADD = \
+	$(top_srcdir)/lib/libidnkit.la \
+	$(LIBDL)
+
+AM_LDFLAGS = \
+	-version-number 1:0:1
+
+if COMPAT
+bin_SCRIPTS += runmdn
+man1_MANS += runmdn.1
+else
+bin_SCRIPTS += runidn
+man1_MANS += runidn.1
+endif
+
+runmdn: runidn
+	cp -f runidn runmdn
+
+runmdn.1: runidn.1
+	cp -f runidn.1 runmdn.1
+
+endif
--- idnkit-1.0-src/tools/idnconv/Makefile.am.autotools	2007-04-16 13:40:08.000000000 +0200
+++ idnkit-1.0-src/tools/idnconv/Makefile.am	2007-04-16 13:35:51.000000000 +0200
@@ -0,0 +1,29 @@
+if ! LITEONLY
+bin_PROGRAMS =
+man1_MANS = 
+if COMPAT
+bin_PROGRAMS += mdnconva
+man1_MANS += mdnconv.1
+else
+bin_PROGRAMS += idnconv
+man1_MANS += idnconv.1
+endif
+
+idnconv_SOURCES = \
+	idnconv.c \
+	util.c \
+	selectiveencode.c
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	$(ICONVINC)
+
+idnconv_LDADD = \
+	$(top_srcdir)/lib/libidnkit.la
+
+mdnconv: idnconv
+	cp -f idnconv$(EXEEXT) mdnconv$(EXEEXT)
+
+mdnconv.1: idnconv.1
+	cp -f idnconv.1 mdnconv.1
+endif
--- idnkit-1.0-src/lib/Makefile.am.autotools	2007-04-16 13:39:47.000000000 +0200
+++ idnkit-1.0-src/lib/Makefile.am	2007-04-16 13:11:02.000000000 +0200
@@ -0,0 +1,85 @@
+lib_LTLIBRARIES = libidnkitlite.la
+if ! LITEONLY
+lib_LTLIBRARIES += libidnkit.la
+endif
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	$(ICONVINC) \
+	-DIDN_RESCONF_DIR="\"$(sysconfdir)\""
+
+AM_LDFLAGS = \
+	-version-number 1:0:2
+
+libidnkitlite_la_SOURCES = \
+	aliaslist.c \
+	api.c \
+	checker.c \
+	converter.c \
+	debug.c \
+	delimitermap.c \
+	filechecker.c \
+	filemapper.c \
+	log.c \
+	mapper.c \
+	mapselector.c \
+	nameprep.c \
+	normalizer.c \
+	punycode.c \
+	race.c \
+	res.c \
+	resconf.c \
+	result.c \
+	strhash.c \
+	ucsmap.c \
+	ucsset.c \
+	unicode.c \
+	unormalize.c \
+	ucs4.c \
+	utf8.c \
+	util.c \
+	version.c
+
+libidnkitlite_la_CPPFLAGS = \
+	-DWITHOUT_ICONV
+
+if ! LITEONLY
+libidnkit_la_SOURCES = \
+	aliaslist.c \
+	api.c \
+	checker.c \
+	converter.c \
+	debug.c \
+	delimitermap.c \
+	filechecker.c \
+	filemapper.c \
+	localencoding.c \
+	log.c \
+	mapper.c \
+	mapselector.c \
+	nameprep.c \
+	normalizer.c \
+	punycode.c \
+	race.c \
+	res.c \
+	resconf.c \
+	result.c \
+	strhash.c \
+	ucs4.c \
+	ucsmap.c \
+	ucsset.c \
+	unicode.c \
+	unormalize.c \
+	utf8.c \
+	util.c \
+	version.c
+endif
+
+sys_DATA = idn.conf idnalias.conf
+
+idn.conf: idn.conf.sample.in
+	sed -e 's%[@]mapdir[@]%$(datadir)/idnkit%' < idn.conf.sample.in > $@
+
+idnalias.conf: Makefile
+	$(SHELL) aliaslist.sh $(build) $(UTF8_NAME) > $@
+
--- idnkit-1.0-src/include/Makefile.am.autotools	2007-04-16 13:39:19.000000000 +0200
+++ idnkit-1.0-src/include/Makefile.am	2007-04-15 17:25:36.000000000 +0200
@@ -0,0 +1,3 @@
+SUBDIRS = \
+	idn \
+	mdn
--- idnkit-1.0-src/include/mdn/Makefile.am.autotools	2007-04-16 13:39:35.000000000 +0200
+++ idnkit-1.0-src/include/mdn/Makefile.am	2007-04-15 17:28:26.000000000 +0200
@@ -0,0 +1,10 @@
+if COMPAT
+mdn_HEADERS = \
+	api.h \
+	log.h \
+	res.h \
+	resconf.h \
+	result.h \
+	utf8.h \
+	version.h
+endif
--- idnkit-1.0-src/include/idn/Makefile.am.autotools	2007-04-16 13:39:24.000000000 +0200
+++ idnkit-1.0-src/include/idn/Makefile.am	2007-04-15 17:27:12.000000000 +0200
@@ -0,0 +1,32 @@
+idn_HEADERS = \
+	api.h \
+	assert.h \
+	checker.h \
+	converter.h \
+	debug.h \
+	delimitermap.h \
+	export.h \
+	filechecker.h \
+	filemapper.h \
+	localencoding.h \
+	log.h \
+	logmacro.h \
+	mapper.h \
+	mapselector.h \
+	nameprep.h \
+	normalizer.h \
+	punycode.h \
+	race.h \
+	res.h \
+	resconf.h \
+	result.h \
+	strhash.h \
+	ucsmap.h \
+	ucsset.h \
+	unicode.h \
+	unormalize.h \
+	ucs4.h \
+	utf8.h \
+	util.h \
+	version.h
+
--- idnkit-1.0-src/configure.ac.autotools	2007-04-16 13:39:01.000000000 +0200
+++ idnkit-1.0-src/configure.ac	2007-04-16 13:32:59.000000000 +0200
@@ -0,0 +1,553 @@
+dnl $Id: configure.in,v 1.1.1.1 2003/06/04 00:25:25 marka Exp $
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
+dnl  
+dnl By using this file, you agree to the terms and conditions set forth bellow.
+dnl 
+dnl 			LICENSE TERMS AND CONDITIONS 
+dnl 
+dnl The following License Terms and Conditions apply, unless a different
+dnl license is obtained from Japan Network Information Center ("JPNIC"),
+dnl a Japanese association, Kokusai-Kougyou-Kanda Bldg 6F, 2-3-4 Uchi-Kanda,
+dnl Chiyoda-ku, Tokyo 101-0047, Japan.
+dnl 
+dnl 1. Use, Modification and Redistribution (including distribution of any
+dnl    modified or derived work) in source and/or binary forms is permitted
+dnl    under this License Terms and Conditions.
+dnl 
+dnl 2. Redistribution of source code must retain the copyright notices as they
+dnl    appear in each source code file, this License Terms and Conditions.
+dnl 
+dnl 3. Redistribution in binary form must reproduce the Copyright Notice,
+dnl    this License Terms and Conditions, in the documentation and/or other
+dnl    materials provided with the distribution.  For the purposes of binary
+dnl    distribution the "Copyright Notice" refers to the following language:
+dnl    "Copyright (c) 2000-2002 Japan Network Information Center.  All rights reserved."
+dnl 
+dnl 4. The name of JPNIC may not be used to endorse or promote products
+dnl    derived from this Software without specific prior written approval of
+dnl    JPNIC.
+dnl 
+dnl 5. Disclaimer/Limitation of Liability: THIS SOFTWARE IS PROVIDED BY JPNIC
+dnl    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+dnl    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+dnl    PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL JPNIC BE LIABLE
+dnl    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+dnl    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+dnl    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+dnl    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+dnl    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+dnl    OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+dnl    ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+AC_PREREQ(2.59)
+AC_INIT([idnkit], [1.0], [bind9-bugs at isc.org])
+AM_INIT_AUTOMAKE([foreign -Wall -Werror])
+
+idndir="$includedir/idn"
+mdndir="$includedir/mdn"
+sysdir="$sysconfdir"
+mapdir="$datadir/idnkit"
+AC_SUBST(idndir)
+AC_SUBST(mdndir)
+AC_SUBST(sysdir)
+AC_SUBST(mapdir)
+
+AC_ARG_ENABLE([debug],
+	AS_HELP_STRING([--enable-debug], [enable debug codes [default=no]]),
+	[debug=$enableval], [debug=no])
+if test "$debug" = "yes"; then
+	CFLAGS="$CFLAGS -DDEBUG"
+fi
+
+AC_ARG_ENABLE([mdnkit-compat],
+	AS_HELP_STRING([--enable-mdnkit-compat], [enable mDNkit compatibility mode [default=no]]),
+	[mdnkit_compat=$enableval], [mdnkit_compat=no])
+if test "$mdnkit_compat" = "yes"; then
+	AC_DEFINE(ENABLE_MDNKIT_COMPAT, 1, [--enable-mdnkit-compat is specified])
+fi
+AM_CONDITIONAL(COMPAT, [test "$mdnkit_compat" = "yes"])
+
+AC_ARG_ENABLE([extra-ace],
+	AS_HELP_STRING([--enable-extra-ace], [enable additional ACE converters. [default=no]]),
+	[extraace=$enableval], [extraace=no])
+if test "$mdnkit_compat" = "yes"; then
+	AC_DEFINE(IDN_EXTRA_ACE, 1, [additional ACE converters compiled in.])
+fi
+
+AC_ARG_WITH([utf8],
+	AS_HELP_STRING([--with-utf8=NAME], [codeset name for UTF-8 encoding [UTF-8]]),
+	[UTF8_NAME="$withval"], [UTF8_NAME="UTF-8"])
+AC_DEFINE_UNQUOTED(IDN_UTF8_ENCODING_NAME, "$UTF8_NAME", [Define your iconv codeset name for utf-8.])
+AC_SUBST(UTF8_NAME)
+
+AC_ARG_ENABLE([liteonly],
+	AS_HELP_STRING([--enable-liteonly], [compile and install lite library only [default=no]]),
+	[liteonly=$enableval], [liteonly=no])
+AM_CONDITIONAL(LITEONLY, [test "$liteonly" = "yes"])
+
+AC_ARG_ENABLE([runidn],
+	AS_HELP_STRING([--enable-runidn], [compile and install runidn [default=no]]),
+	[install_runidn=$enableval], [install_runidn=no])
+if test "$install_runidn" = "yes"; then
+	if test "$liteonly" = "yes"; then
+		AC_MSG_ERROR([you can't set --enable-runidn and --enable-liteonly simultaneously])
+	fi
+fi
+AM_CONDITIONAL(RUNIDN, [test "$install_runidn" = "yes"])
+
+AC_ARG_WITH([iconv-include],
+	AS_HELP_STRING([--with-iconv-include=DIR], [iconv include files are in DIR []]),
+	[iconv_include="$withval"], [iconv_include="$includedir"])
+ICONVINC="-I$iconv_include"
+AC_SUBST(ICONVINC)
+
+AC_ARG_WITH([iconv],
+	AS_HELP_STRING([--with-iconv=LIB], [library for iconv []]),
+	[iconv="$withval"], [iconv="-lc"])
+ICONVLIB=$iconv
+AC_SUBST(ICONVLIB)
+
+AC_ARG_WITH([iconv-sofile],
+	AS_HELP_STRING([--with-iconv-sofile=PATH], [shared library file for libiconv]),
+        [ICONVSOFILE=$withval], [ICONVSOFILE=guess])
+if test "$ICONVSOFILE" = guess; then
+    if test "$liteonly" != yes ; then
+        if test "$ICONVLIB" = ""; then
+            ICONVSOFILE=none
+        else
+            AC_MSG_CHECKING(pathname of iconv shared library)
+            ic_libdir=
+            ic_libname=
+            case "$host" in
+            *-hpux*)
+                SO=sl
+                ;;
+            *)
+                SO=so
+                ;;
+            esac
+            for arg in $ICONVLIB; do
+                case "$arg" in
+                -L*) ic_libdir="$ic_libdir `echo $arg | sed s/-L//`" ;;
+                -l*) ic_libname=`echo $arg | sed s/-l//` ;;
+                /*.$SO*) ICONVSOFILE=$arg ;;
+                esac
+            done
+            if test "$ICONVSOFILE" = guess; then
+                if test "$ic_libname" = ""; then
+                    AC_MSG_RESULT(unknown)
+                    AC_MSG_WARN([use --with-iconv-sofile for specifying iconv shared library file])
+                    ICONVSOFILE=none
+                else
+                    if test "$ic_libdir" = ""; then
+                        # Standard (and semi-standard) library directories
+                        ic_libdir="/lib /usr/lib /usr/local/lib"
+                    fi
+                    for dir in $ic_libdir; do
+                        ICONVSOFILE=`ls -r $dir/lib$ic_libname.$SO* 2>/dev/null | head -1`
+                        if test "$ICONVSOFILE" != ""; then
+                            break
+                        fi
+                    done
+                    if test "$ICONVSOFILE" != ""; then
+                        AC_MSG_RESULT($ICONVSOFILE)
+                    else
+                        AC_MSG_RESULT(unknown)
+                        AC_MSG_WARN([use --with-iconv-sofile for specifying iconv shared library file])
+                        ICONVSOFILE=none
+                    fi
+                fi
+            fi
+        fi
+    fi
+fi
+AC_SUBST(ICONVSOFILE)
+
+dnl Figure out preload stuff.
+PRELOAD_VAR="LD_PRELOAD"
+PRELOAD_SEP=":"
+PRELOAD_LAST=""
+case "$host" in
+*-solaris*)
+    PRELOAD_SEP=" "
+    ;;
+*-linux*)
+    PRELOAD_SEP=" "
+    ;;
+*-osf*)
+    PRELOAD_VAR="_RLD_LIST"
+    PRELOAD_LAST=":DEFAULT"
+    ;;
+*-netbsd*)
+    if test -x /usr/bin/file -a -x /usr/bin/grep ; then
+        case "`/usr/bin/file /usr/bin/grep`" in
+	*ELF*)
+	    PRELOAD_SEP=" "
+	    ;;
+	esac
+    fi
+    ;;
+esac
+
+AC_SUBST(PRELOAD_VAR)
+AC_SUBST(PRELOAD_SEP)
+AC_SUBST(PRELOAD_LAST)
+
+dnl Checks for standard tools.
+AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_CXX
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_PROG_INSTALL
+AM_PROG_LIBTOOL
+
+AC_PATH_PROGS(PERL, perl, perl)
+
+dnl Checks for header files.
+AC_CHECK_HEADERS(pwd.h langinfo.h locale.h netdb.h stddef.h stdlib.h string.h sys/socket.h unistd.h)
+if test "$install_runidn" = "yes"; then
+    AC_CHECK_HEADERS(dlfcn.h)
+fi
+
+saved_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $ICONVINC"
+if test "$liteonly" != "yes"; then
+    AC_CHECK_HEADERS(iconv.h)
+fi
+CPPFLAGS=$saved_CPPFLAGS
+
+dnl Checks for data types.
+AC_C_CONST
+AC_TYPE_SIZE_T
+AC_HEADER_TIME
+AC_TYPE_UID_T
+AC_CHECK_TYPES([ptrdiff_t])
+
+dnl for dnsproxy.
+AC_CHECK_TYPE(BOOL, int)
+
+dnl Checks for libraries.
+if test "$install_runidn" = yes ; then
+    AC_CHECK_LIB(socket, socket)
+    AC_CHECK_LIB(nsl, inet_addr)
+    AC_CHECK_LIB(dl, dlopen, [
+	LIBS="-ldl $LIBS"
+	LIBDL="-ldl"
+	AC_DEFINE(HAVE_LIBDL, 1, [Define if you have the dl library (-ldl).])
+	AC_SUBST(LIBDL)
+    ])
+fi
+
+dnl Checks for library functions.
+AC_FUNC_MALLOC
+AC_FUNC_MEMCMP
+AC_FUNC_REALLOC
+AC_FUNC_SELECT_ARGTYPES
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS(vsnprintf setvbuf setlocale nl_langinfo memmove bcopy setenv unsetenv inet_ntoa socket gethostname isascii memset putenv select sethostname strchr strerror strpbrk strrchr strtoul)
+if test "$install_runidn" = yes ; then
+    AC_CHECK_FUNCS(gethostbyname gethostbyname2 gethostbyaddr)
+    AC_CHECK_FUNCS(gethostbyname_r gethostbyname2_r gethostbyaddr_r, find_gethost_r=yes)
+    AC_CHECK_FUNCS(getipnodebyname getipnodebyaddr freehostent)
+    AC_CHECK_FUNCS(getaddrinfo freeaddrinfo getnameinfo)
+    AC_CHECK_FUNCS(dlopen dlsym)
+fi
+
+if test "$install_runidn" = yes ; then
+dnl Checks the flavor of gethostbyaddr* functions.
+    AC_CACHE_CHECK(flavor of gethostbyaddr, ac_cv_flavor_gethostbyaddr,
+    [ac_cv_flavor_gethostbyaddr=unknown
+    AC_TRY_RUN(
+    [
+    #include <stddef.h>
+    #include <sys/types.h>
+    #include <sys/socket.h>
+    #include <netdb.h>
+    struct hostent *gethostbyaddr(const void *addr, socklen_t len, int type) {
+	return NULL;
+    }
+    int main() {
+	(void)gethostbyaddr(NULL, 0, 0);
+	return 0;
+    }
+    ], ac_cv_flavor_gethostbyaddr=glibc2_2,,
+       ac_cv_flavor_gethostbyaddr=unknown)
+    AC_TRY_RUN(
+    [
+    #include <stddef.h>
+    #include <sys/types.h>
+    #include <sys/socket.h>
+    #include <netdb.h>
+    struct hostent *gethostbyaddr(const char *addr, size_t len, int type) {
+	return NULL;
+    }
+    int main() {
+	(void)gethostbyaddr(NULL, 0, 0);
+	return 0;
+    }
+    ], ac_cv_flavor_gethostbyaddr=glibc,,
+       ac_cv_flavor_gethostbyaddr=unknown)
+    AC_TRY_RUN(
+    [
+    #include <stddef.h>
+    #include <sys/types.h>
+    #include <sys/socket.h>
+    #include <netdb.h>
+    struct hostent *gethostbyaddr(const char *addr, int len, int type) {
+	return NULL;
+    }
+    int main() {
+	(void)gethostbyaddr(NULL, 0, 0);
+	return 0;
+    }
+    ], ac_cv_flavor_gethostbyaddr=traditional,,
+       ac_cv_flavor_gethostbyaddr=unknown)
+    if test "$ac_cv_func_gethostbyaddr" = no ; then
+	ac_cv_flavor_gethostbyaddr=none
+    fi])
+
+    case "$ac_cv_flavor_gethostbyaddr" in
+    glibc2_2)
+	ac_cv_type_ghba_addr_t='const void *'
+	ac_cv_type_ghba_addrlen_t='socklen_t'
+	;;
+    glibc)
+	ac_cv_type_ghba_addr_t='const char *'
+	ac_cv_type_ghba_addrlen_t='size_t'
+	;;
+    traditional | none)
+	ac_cv_type_ghba_addr_t='const char *'
+	ac_cv_type_ghba_addrlen_t='int'
+	;;
+    *)
+	AC_MSG_ERROR([can't build runidn, since parameter type list of gethostbyaddr() is unknown to configure.])
+	;;
+    esac
+    AC_DEFINE_UNQUOTED(GHBA_ADDR_T, $ac_cv_type_ghba_addr_t,
+	[Define as the type of the 1st argument of gethostbyaddr.])
+    AC_DEFINE_UNQUOTED(GHBA_ADDRLEN_T, $ac_cv_type_ghba_addrlen_t,
+	[Define as the type of the 2nd argument of gethostbyaddr.])
+
+dnl Checks the flavor of getnameinfo functions.
+    AC_CACHE_CHECK(flavor of getnameinfo, ac_cv_flavor_getnameinfo,
+    [ac_cv_flavor_getnameinfo=unknown
+    AC_TRY_RUN(
+    [
+    #include <stddef.h>
+    #include <sys/types.h>
+    #include <sys/socket.h>
+    #include <netdb.h>
+    int getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host,
+                    socklen_t hostlen, char *serv, socklen_t servlen,
+                    unsigned int flags) {
+	return NULL;
+    }
+    int main() {
+	(void)getnameinfo(NULL, 0, NULL, 0, NULL, 0, 0);
+	return 0;
+    }
+    ], ac_cv_flavor_getnameinfo=glibc2_2_2,,
+       ac_cv_flavor_getnameinfo=unknown)
+    AC_TRY_RUN(
+    [
+    #include <stddef.h>
+    #include <sys/types.h>
+    #include <sys/socket.h>
+    #include <netdb.h>
+    int getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host,
+                    socklen_t hostlen, char *serv, socklen_t servlen,
+                    int flags) {
+	return NULL;
+    }
+    int main() {
+	(void)getnameinfo(NULL, 0, NULL, 0, NULL, 0, 0);
+	return 0;
+    }
+    ], ac_cv_flavor_getnameinfo=rfc2553bis_03,,
+       ac_cv_flavor_getnameinfo=unknown)
+    AC_TRY_RUN(
+    [
+    #include <stddef.h>
+    #include <sys/types.h>
+    #include <sys/socket.h>
+    #include <netdb.h>
+    int getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host,
+                    size_t hostlen, char *serv, size_t servlen, int flags) {
+	return NULL;
+    }
+    int main() {
+	(void)getnameinfo(NULL, 0, NULL, 0, NULL, 0, 0);
+	return 0;
+    }
+    ], ac_cv_flavor_getnameinfo=rfc2553,,
+       ac_cv_flavor_getnameinfo=unknown)
+    AC_TRY_RUN(
+    [
+    #include <stddef.h>
+    #include <sys/types.h>
+    #include <sys/socket.h>
+    #include <netdb.h>
+    int getnameinfo(const struct sockaddr *sa, size_t salen, char *host,
+                    size_t hostlen, char *serv, size_t servlen, int flags) {
+	return NULL;
+    }
+    int main() {
+	(void)getnameinfo(NULL, 0, NULL, 0, NULL, 0, 0);
+	return 0;
+    }
+    ], ac_cv_flavor_getnameinfo=rfc2133,,
+       ac_cv_flavor_getnameinfo=unknown)
+    if test "$ac_cv_func_getnameinfo" = no ; then
+	ac_cv_flavor_getnameinfo=none
+    fi])
+
+    case "$ac_cv_flavor_getnameinfo" in
+    glibc2_2_2)
+	ac_cv_type_gni_salen_t='socklen_t'
+	ac_cv_type_gni_hostlen_t='socklen_t'
+	ac_cv_type_gni_servlen_t='socklen_t'
+	ac_cv_type_gni_flags_t='unsigned int'
+	;;
+    rfc2553bis_03)
+	ac_cv_type_gni_salen_t='socklen_t'
+	ac_cv_type_gni_hostlen_t='socklen_t'
+	ac_cv_type_gni_servlen_t='socklen_t'
+	ac_cv_type_gni_flags_t='int'
+	;;
+    rfc2553)
+	ac_cv_type_gni_salen_t='socklen_t'
+	ac_cv_type_gni_hostlen_t='size_t'
+	ac_cv_type_gni_servlen_t='size_t'
+	ac_cv_type_gni_flags_t='int'
+	;;
+    rfc2133 | none)
+	ac_cv_type_gni_salen_t='size_t'
+	ac_cv_type_gni_hostlen_t='size_t'
+	ac_cv_type_gni_servlen_t='size_t'
+	ac_cv_type_gni_flags_t='int'
+	;;
+    *)
+	AC_MSG_ERROR([can't build runidn, since parameter type list of getnameinfo() is unknown to configure.])
+    esac
+    AC_DEFINE_UNQUOTED(GNI_SALEN_T, $ac_cv_type_gni_salen_t,
+	[Define as the type of the 2nd argument of getnameinfo.])
+    AC_DEFINE_UNQUOTED(GNI_HOSTLEN_T, $ac_cv_type_gni_hostlen_t,
+	[Define as the type of the 4th argument of getnameinfo.])
+    AC_DEFINE_UNQUOTED(GNI_SERVLEN_T, $ac_cv_type_gni_servlen_t,
+	[Define as the type of the 6th argument of getnameinfo.])
+    AC_DEFINE_UNQUOTED(GNI_FLAGS_T, $ac_cv_type_gni_flags_t,
+	[Define as the type of the 7th argument of getnameinfo.])
+fi
+
+dnl resume here.
+dnl Checks the flavor of gethost*_r functions.
+if test "$find_gethost_r" = yes; then
+    AC_CACHE_CHECK(flavor of gethostbyname_r, ac_cv_flavor_gethost_r,
+    [AC_TRY_RUN(
+changequote(<<, >>)dnl
+<<
+#include <stddef.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <stdio.h>
+int main()
+{
+    int err = 0;
+    struct hostent hebuf, *hp;
+    char buf[10];
+    /* Try resolving a invalid name using glibc flavor. */
+    (void)gethostbyname_r("@#!", &hebuf, buf, sizeof(buf), &hp, &err);
+    if (err != 0)
+	return 0;	/* glibc flavor */
+    else
+	return 1;	/* Sun flavor */
+}
+>>,
+changequote([, ])dnl
+	ac_cv_flavor_gethost_r=glibc,
+	ac_cv_flavor_gethost_r=sun,
+	ac_cv_flavor_gethost_r=sun)])
+    if test "$ac_cv_flavor_gethost_r" = "glibc"; then
+	AC_DEFINE(GETHOST_R_GLIBC_FLAVOR, 1,
+	    [Define if the prototype of gethost*_r is glibc flavor.])
+    fi
+fi
+
+dnl Checks for iconv library.
+if test "$liteonly" != yes ; then
+    AC_MSG_CHECKING(for iconv)
+    saved_CPPFLAGS=$CPPFLAGS
+    saved_LIBS=$LIBS
+    CPPFLAGS="$CPPFLAGS $ICONVINC"
+    LIBS="$LIBS $ICONVLIB"
+    AC_TRY_LINK([
+    #include <iconv.h>
+    ], [
+	iconv_t i;
+	i = iconv_open("ISO-8859-1", "UTF-8");
+    ], [iconv_try_link=yes], [iconv_try_link=no])
+    LIBS=$saved_LIBS
+    CPPFLAGS=$saved_CPPFLAGS
+    AC_MSG_RESULT($iconv_try_link)
+    if test "$iconv_try_link" = no ; then
+	AC_MSG_ERROR(iconv function not available)
+    fi
+fi
+
+dnl Check for codeset name for UTF-8.
+if test "$liteonly" != yes ; then
+    AC_MSG_CHECKING([for codeset name $UTF8_NAME])
+    saved_CPPFLAGS=$CPPFLAGS
+    saved_LIBS=$LIBS
+    CPPFLAGS="$CPPFLAGS $ICONVINC"
+    LIBS="$LIBS $ICONVLIB"
+    AC_TRY_RUN([
+    #include <stddef.h>
+    #include <stdlib.h>
+    #include <iconv.h>
+    #define UTF8_NAME "$UTF8_NAME"
+    #define ICONV_FAIL ((iconv_t)(-1))
+    /* Check if the codeset name UTF8_NAME is valid by performing iconv_open(). */
+    int main() {
+	int i;
+	/* list of codeset names likely to exist */
+	static char *codeset[] = {
+	    "ASCII", "ISO-8859-1", "ISO8859-1", "iso8859_1", "8859-1",
+	    "Shift_JIS", "SJIS", "sjis", NULL,
+	};
+
+	/* First try null conversion. */
+	if (iconv_open(UTF8_NAME, UTF8_NAME) != ICONV_FAIL) return 0;
+
+	/* Unfortunately, above check fails on certain systems, such as Solaris. */
+	for (i = 0; codeset[i] != NULL; i++) {
+	    if (iconv_open(UTF8_NAME, codeset[i]) != ICONV_FAIL) return 0;
+	}
+	return 1;
+    }
+    ], utf8_name_valid=yes, utf8_name_valid=no, utf8_name_valid=unknown)
+    LIBS=$saved_LIBS
+    CPPFLAGS=$saved_CPPFLAGS
+    AC_MSG_RESULT($utf8_name_valid)
+fi
+
+dnl Output.
+AC_CONFIG_HEADER(include/config.h)
+AC_OUTPUT(
+	Makefile
+	include/Makefile
+	include/idn/Makefile
+	include/mdn/Makefile
+	lib/Makefile
+	man/Makefile
+	tools/Makefile
+	tools/idnconv/Makefile
+	tools/runidn/Makefile
+	tools/runidn/runidn
+	map/Makefile
+	lib/tests/Makefile
+)
--- idnkit-1.0-src/man/Makefile.am.autotools	2007-04-16 13:39:57.000000000 +0200
+++ idnkit-1.0-src/man/Makefile.am	2007-04-16 14:02:24.000000000 +0200
@@ -0,0 +1,43 @@
+man3_MANS =
+man5_MANS = idnrc.5 idnalias.conf.5
+if LITEONLY
+if COMPAT
+man3_MANS += libmdnlite.3
+man5_MANS += mdn.conf.5
+else
+man3_MANS += libidnkitlite.3
+man5_MANS += idn.conf.5
+endif
+else
+if COMPAT
+man3_MANS += libmdn.3 libmdnlite.3 
+man5_MANS += mdn.conf.5
+else
+man3_MANS += libidnkit.3 libidnkitlite.3
+man5_MANS += idn.conf.5
+endif
+endif
+
+idnrc.5: idn.conf.5.in
+	cp -f idn.conf.5.in idnrc.5
+
+idnalias.conf.5: idn.conf.5.in
+	cp -f idn.conf.5.in idnalias.conf.5
+
+libidnkit.3: libidnkit.3.in
+	cp -f libidnkit.3.in libidnkit.3
+
+libidnkitlite.3: libidnkit.3
+	cp -f libidnkit.3 libidnkitlite.3
+
+libmdnlite.3: libidnkit.3
+	cp -f libidnkit.3 libmdnlite.3
+
+libmdn.3: libidnkit.3
+	cp -f  libidnkit.3 libmdn.3
+
+idn.conf.5: idn.conf.5.in
+	sed 's%[@]sysconfdir[@]%$(sysdir)%' < idn.conf.5.in > $@
+
+mdn.conf.5: idn.conf.5
+	cp -f idn.conf.5 mdn.conf.5


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- bind.spec	11 Apr 2007 15:44:47 -0000	1.171
+++ bind.spec	16 Apr 2007 14:45:21 -0000	1.172
@@ -10,6 +10,7 @@
 %{?!bind_uid:   %define bind_uid   25}
 %{?!bind_gid:   %define bind_gid   25}
 %{?!selinux:	%define selinux     1}
+%define		IDN		0
 %define		bind_dir      /var/named
 %define    	chroot_prefix %{bind_dir}/chroot
 #
@@ -17,7 +18,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.4.0
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Epoch:   	31
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -77,6 +78,10 @@
 Patch61:        bind-9.3.4-sdb-sqlite-src.patch
 Patch62:        bind-9.4.0-sdb-sqlite-bld.patch
 Patch63:	bind-9.4.0-dnssec-directory.patch
+%if %{IDN}
+Patch64:	idnkit-autotools.patch
+Patch65:	dig-idn.patch
+%endif
 #
 Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2, mktemp
 Requires(post): grep, chkconfig >= 1.3.26
@@ -117,6 +122,9 @@
 Summary:  Utilities for querying DNS name servers.
 Group:    Applications/System
 Requires: bind-libs = %{epoch}:%{version}-%{release}
+%if %{IDN}
+Requires: bind-idnkit
+%endif
 
 %description utils
 Bind-utils contains a collection of utilities for querying DNS (Domain
@@ -215,6 +223,15 @@
 
 %endif
 
+%if %{IDN}
+%package idnkit
+Summary: BIND's idn implementation libraries
+Group: Applications/System
+
+%description idnkit
+BIND's idn implementation libraries
+%endif
+
 
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
@@ -285,10 +302,24 @@
 %patch62 -p1 -b .sdb-sqlite-bld
 %endif
 %patch63 -p1 -b .directory
+%if %{IDN}
+pushd contrib/idn
+%patch64 -p0 -b .autotools
+popd
+%patch65 -p1 -b .idn
+%endif
 :;
 
 
 %build
+%if %{IDN}
+pushd contrib/idn/idnkit-1.0-src
+libtoolize --copy --force; aclocal; automake -a; autoconf
+%configure
+make %{?_smp_mflags}
+popd
+%endif
+
 libtoolize --copy --force; aclocal; autoconf
 cp -f /usr/share/libtool/config.{guess,sub} .
 %if %{DEBUGINFO}
@@ -323,6 +354,9 @@
 %if %{LIBBIND}
 	--enable-libbind \
 %endif
+%if %{IDN}
+	--with-idn \
+%endif
 	--disable-openssl-version-check \
 	CFLAGS="$CFLAGS" \
 ;
@@ -337,6 +371,12 @@
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
+%if %{IDN}
+pushd contrib/idn/idnkit-1.0-src
+make install DESTDIR=${RPM_BUILD_ROOT}
+popd
+%endif
+
 cp  --preserve=timestamps %{SOURCE5} doc/rfc
 gzip -9       doc/rfc/*
 mkdir -p ${RPM_BUILD_ROOT}/etc/{rc.d/init.d,logrotate.d}
@@ -760,7 +800,29 @@
 
 %endif
 
+%if %{IDN}
+%files idnkit
+%defattr(-,root,root,0755)
+%{_includedir}/idn/*
+%{_libdir}/libidnkit.a
+%{_libdir}/libidnkitlite.a
+%{_mandir}/man1/idnconv.1.gz
+%{_mandir}/man3/libidnkit.3.gz
+%{_mandir}/man3/libidnkitlite.3.gz
+%{_mandir}/man5/idn.conf.5.gz
+%{_mandir}/man5/idnalias.conf.5.gz
+%{_mandir}/man5/idnrc.5.gz
+%{_datadir}/idnkit/jp.map
+%{_bindir}/idnconv
+%config /etc/idn.conf
+%config /etc/idnalias.conf
+%endif
+
+
 %changelog
+* Mon Apr 16 2007 Adam Tkac <atkac redhat com> 31:9.4.0-6.fc7
+- added idn support (still under development with upstream, disabled by default)
+
 * Wed Apr 11 2007 Adam Tkac <atkac redhat com> 31:9.4.0-5.fc7
 - dnssec-signzone utility now doesn't ignore -d parameter
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 14:52:17 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 10:52:17 -0400
Subject: rpms/samba/devel samba.spec,1.107,1.108
Message-ID: <200704161452.l3GEqHqY022091@cvs.devel.redhat.com>

Author: ssorce

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21881

Modified Files:
	samba.spec 
Log Message:

Ouch wrong path here (more coffe)




Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- samba.spec	16 Apr 2007 14:40:03 -0000	1.107
+++ samba.spec	16 Apr 2007 14:52:15 -0000	1.108
@@ -215,7 +215,7 @@
 	--with-logfilebase=/var/log/samba \
 	--with-libdir=%{_libdir}/samba \
 	--with-configdir=%{_sysconfdir}/samba \
-	--with-pammodulesdir=%{_sysconfdir}/security \
+	--with-pammodulesdir=%{_lib}/security \
 	--with-swatdir=%{_datadir}/swat \
 	--with-shared-modules=idmap_ad,idmap_rid \
 
@@ -244,6 +244,7 @@
 mkdir -p $RPM_BUILD_ROOT/usr/{sbin,bin}
 mkdir -p $RPM_BUILD_ROOT/%{_initrddir}
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/{pam.d,logrotate.d,security}
+mkdir -p $RPM_BUILD_ROOT/%{_lib}/security
 mkdir -p $RPM_BUILD_ROOT/var/{log,spool}/samba
 mkdir -p $RPM_BUILD_ROOT/var/lib/samba
 mkdir -p $RPM_BUILD_ROOT/var/lib/samba/private
@@ -289,11 +290,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema
 install -m644 examples/LDAP/samba.schema $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/samba.schema
 
-# pam_smbpass
-mkdir -p $RPM_BUILD_ROOT/%{_lib}/security
-install -m 755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so
-install -m 755 source/bin/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so
-
 # winbind
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
 install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so.2
@@ -342,7 +338,6 @@
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbumount.8*
 
 # why are these getting installed in the wrong place?
-rm -f $RPM_BUILD_ROOT%{_libdir}/samba/security/pam_{smbpass,winbind}.so
 rm -f $RPM_BUILD_ROOT%{_sbindir}/{u,}mount.cifs
 
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 15:07:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 11:07:23 -0400
Subject: rpms/axis/devel axis-build_xml.patch,NONE,1.1 axis.spec,1.21,1.22
Message-ID: <200704161507.l3GF7NMh000742@cvs.devel.redhat.com>

Author: pcheung

Update of /cvs/dist/rpms/axis/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv526

Modified Files:
	axis.spec 
Added Files:
	axis-build_xml.patch 
Log Message:
Fix building javadoc and rpmlint cleanup


axis-build_xml.patch:
 build.xml |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE axis-build_xml.patch ---
--- build.xml	2007-04-04 21:59:46.000000000 -0400
+++ build.xml	2007-04-04 21:59:31.000000000 -0400
@@ -359,6 +359,7 @@ Copyright:
 
     <mkdir dir="${build.javadocs}"/>
     <javadoc packagenames="${packages}"
+             source="1.3"
              sourcepath="${src.dir}"
              classpathref="classpath"
              destdir="${build.javadocs}"


Index: axis.spec
===================================================================
RCS file: /cvs/dist/rpms/axis/devel/axis.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- axis.spec	4 Aug 2006 22:52:01 -0000	1.21
+++ axis.spec	16 Apr 2007 15:07:21 -0000	1.22
@@ -4,21 +4,21 @@
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 %define archivever 1_2_1
-%define section    free
 
 Name:          axis
 Version:       1.2.1
-Release:       2jpp.6
+Release:       2jpp.7%{?dist}
 Epoch:         0
 Summary:       A SOAP implementation in Java
 License:       Apache Software License
 Group:         Development/Libraries/Java
 Url:           http://ws.apache.org/%{name}/
-Source0:       %{name}-src-%{archivever}-RHCLEAN.tar.bz2
+Source0:       http://archive.apache.org/dist/ws/axis/1_2_1/axis-src-1_2_1.tar.gz
 Patch1:        %{name}-bz152255.patch
 Patch2:        %{name}-imageio.patch
 Patch3:        %{name}-objectweb.patch
 Patch4:        %{name}-%{version}-DH.patch
+Patch5:        %{name}-build_xml.patch
 BuildRequires: jpackage-utils >= 0:1.5
 BuildRequires: java-devel
 BuildRequires: ant >= 0:1.6, ant-nodeps
@@ -47,19 +47,19 @@
 Requires:      jakarta-commons-logging
 Requires:      jakarta-commons-httpclient
 Requires:      javamail
-Requires: jaxp_parser_impl
+Requires:      jaxp_parser_impl
 Requires:      log4j
 Requires:      wsdl4j
 
 %if ! %{gcj_support}
 BuildArch:     noarch
 %endif
-BuildRoot:     %{_tmppath}/%{name}-%{version}-buildroot
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
+BuildRequires:       java-gcj-compat-devel
+Requires(post):      java-gcj-compat
+Requires(postun):    java-gcj-compat
 %endif
 
 %description
@@ -80,8 +80,6 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Libraries/Java
-Requires(post):   /bin/rm,/bin/ln
-Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -94,18 +92,28 @@
 Documentation for %{name}.
 
 %prep
-rm -rf $RPM_BUILD_ROOT
 %setup -q -n %{name}-%{archivever}
 %patch1 -p1 -b .orig
 %patch2 -p1 -b .orig
 %patch3 -p1 -b .orig
 %patch4
+%patch5
 
 # Remove provided binaries
 find . -name "*.jar" -exec rm -f {} \;
 find . -name "*.zip" -exec rm -f {} \;
 find . -name "*.class" -exec rm -f {} \;
 
+# Fix for wrong-file-end-of-line-encoding problem
+for i in `find docs -iname "*.html"`; do %{__sed} -i 's/\r//' $i; done
+for i in `find docs -iname "*.css"`; do %{__sed} -i 's/\r//' $i; done
+for i in `find docs -iname "*.bib"`; do %{__sed} -i 's/\r//' $i; done
+%{__sed} -i 's/\r//' README
+%{__sed} -i 's/\r//' LICENSE
+%{__sed} -i 's/\r//' docs/docbook/testing-again.dbk
+%{__sed} -i 's/\r//' release-notes.html
+%{__sed} -i 's/\r//' changelog.html
+
 %build
 
 [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
@@ -131,6 +139,7 @@
     clean compile javadocs
 
 %install
+rm -rf $RPM_BUILD_ROOT
 
 ### Jar files
 
@@ -156,9 +165,11 @@
 
 pushd docs
    rm -fr apiDocs
-   ln -fs %{_javadocdir}/%{name} apiDocs
+   ln -fs %{_javadocdir}/%{name}-%{version} apiDocs
 popd
 
+ln -sf %{_javadocdir}/%{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
 %endif
@@ -166,25 +177,16 @@
 %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}
+%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
@@ -205,13 +207,18 @@
 %defattr(0644,root,root,0755)
 %dir %{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}-%{version}/*
+%{_javadocdir}/%{name}
 
 %files manual
 %defattr(0644,root,root,0755)
 %doc docs/*
 
 %changelog
-* Thu Aug 03 2006 Deepak Bhole <dbhole at redhat.com> 0:0.9.13-4jpp.6
+* Wed Apr 04 2007 Permaine Cheung <pcheung at redhat.com> 0:1.2.1-2jpp.7
+- Fix building javadoc
+- rpmlint cleanup
+
+* Thu Aug 03 2006 Deepak Bhole <dbhole at redhat.com> 0:1.2.1-2jpp.6
 - Added missing requirements
 
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.2.1-2jpp_5fc



From fedora-cvs-commits at redhat.com  Mon Apr 16 15:12:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 11:12:09 -0400
Subject: rpms/axis/devel .cvsignore,1.6,1.7 sources,1.6,1.7
Message-ID: <200704161512.l3GFC9OM004462@cvs.devel.redhat.com>

Author: pcheung

Update of /cvs/dist/rpms/axis/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4348

Modified Files:
	.cvsignore sources 
Log Message:
Update source tar ball




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/axis/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Jun 2005 16:12:08 -0000	1.6
+++ .cvsignore	16 Apr 2007 15:12:07 -0000	1.7
@@ -1,4 +1 @@
-axis-src-1_2_1-RHCLEAN.tar.bz2
-axis-1_2_1
-noarch
-*.src.rpm
+axis-src-1_2_1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/axis/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Jun 2005 16:12:08 -0000	1.6
+++ sources	16 Apr 2007 15:12:07 -0000	1.7
@@ -1 +1 @@
-954f706dc2b3d712565a62ef919b5665  axis-src-1_2_1-RHCLEAN.tar.bz2
+157ad070accf373565bce80de1204a4d  axis-src-1_2_1.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr 16 15:19:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 11:19:09 -0400
Subject: rpms/rpm/devel rpm-4.4.2-docflags.patch, NONE, 1.1 rpm.spec, 1.226,
	1.227
Message-ID: <200704161519.l3GFJ92D009670@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9604

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.4.2-docflags.patch 
Log Message:
* Mon Apr 16 2007 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-44
- Set default verify flags for %doc (#235353)
- Resolves: rhbz#235353


rpm-4.4.2-docflags.patch:
 files.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rpm-4.4.2-docflags.patch ---
--- rpm-4.4.2/build/files.c.docflags	2007-04-16 16:15:42.000000000 +0100
+++ rpm-4.4.2/build/files.c	2007-04-16 16:16:24.000000000 +0100
@@ -2124,7 +2124,7 @@
 	fl.isDir = 0;
 	fl.inFtw = 0;
 	fl.currentFlags = 0;
-	fl.currentVerifyFlags = 0;
+	fl.currentVerifyFlags = fl.defVerifyFlags;
 
 	fl.noGlob = 0;
  	fl.devtype = 0;


Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- rpm.spec	16 Apr 2007 11:59:52 -0000	1.226
+++ rpm.spec	16 Apr 2007 15:19:07 -0000	1.227
@@ -17,7 +17,7 @@
 Name: rpm
 Version: 4.4.2
 %{expand: %%define rpm_version %{version}}
-Release: 43%{?dist}
+Release: 44%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source: rpm-%{rpm_version}.tar.gz
@@ -65,6 +65,7 @@
 Patch39: rpm-4.4.2-no-ppc-asm.patch
 Patch40: rpm-4.4.2-forkfailed.patch
 Patch41: rpm-4.4.2-cdiff.patch
+Patch42: rpm-4.4.2-docflags.patch
 License: GPL
 Requires: patch > 2.5
 Prereq: shadow-utils
@@ -208,6 +209,7 @@
 %patch39 -p1 -b .noppcasm
 %patch40 -p0 -b .forkfail
 %patch41 -p1 -b .cdiff
+%patch42 -p1 -b .docflags
 
 # rebuild configure for ipv6
 autoconf
@@ -566,6 +568,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Mon Apr 16 2007 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-44
+- Set default verify flags for %%doc (#235353)
+
 * Mon Apr 16 2007 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-43
 - Log failures for fork failing (OLPC)
 - Gendiff enhancement from Enrico Scholz (#146981)



From fedora-cvs-commits at redhat.com  Mon Apr 16 15:26:22 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 11:26:22 -0400
Subject: rpms/vim/devel vim.spec,1.163,1.164
Message-ID: <200704161526.l3GFQMPS014836@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	vim.spec 
Log Message:
- use more macros
- drop BR perl
- move license to main doc directory
- set vendor to 'fedora' (desktop-file)
- don't own man directories
- preserve timestamps of non-generated files
- run update-desktop-database
- convert some man-pages to UTF-8




Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- vim.spec	30 Mar 2007 11:16:51 -0000	1.163
+++ vim.spec	16 Apr 2007 15:26:19 -0000	1.164
@@ -21,7 +21,7 @@
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -296,10 +296,10 @@
 Patch3101: vim-selinux2.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Buildrequires: python-devel perl ncurses-devel gettext
-Buildrequires: libacl-devel gpm-devel autoconf
+BuildRequires: python-devel ncurses-devel gettext
+BuildRequires: libacl-devel gpm-devel autoconf
 %if %{WITH_SELINUX}
-Buildrequires: libselinux-devel
+BuildRequires: libselinux-devel
 %endif
 %if %{desktop_file}
 Requires: /usr/bin/desktop-file-install
@@ -314,7 +314,7 @@
 multiple windows, multi-level undo, block highlighting and more.
 
 %package common
-Summary: The common files needed by any version of the VIM editor.
+Summary: The common files needed by any version of the VIM editor
 Group: Applications/Editors
 Conflicts: man-pages-fr < 0.9.7-14
 Conflicts: man-pages-it < 0.3.0-17
@@ -332,7 +332,7 @@
 to install the vim-common package.
 
 %package spell
-Summary: The dictionaries for spell checking. This package is optional.
+Summary: The dictionaries for spell checking. This package is optional
 Group: Applications/Editors
 Requires: vim-common = %{epoch}:%{version}-%{release}
 
@@ -341,7 +341,7 @@
 many different languages.
 
 %package minimal
-Summary: A minimal version of the VIM editor.
+Summary: A minimal version of the VIM editor
 Group: Applications/Editors
 Provides: vi = %{version}-%{release}
 
@@ -356,7 +356,7 @@
 package is installed.
 
 %package enhanced
-Summary: A version of the VIM editor which includes recent enhancements.
+Summary: A version of the VIM editor which includes recent enhancements
 Group: Applications/Editors
 Requires: vim-common = %{epoch}:%{version}-%{release}
 Provides: vim = %{version}-%{release}
@@ -375,9 +375,10 @@
 need to install the vim-common package.
 
 %package X11
-Summary: The VIM version of the vi editor for the X Window System.
+Summary: The VIM version of the vi editor for the X Window System
 Group: Applications/Editors
-Requires: vim-common = %{epoch}:%{version}-%{release} libattr gtk2 >= 2.6
+Requires: vim-common = %{epoch}:%{version}-%{release} libattr >= 2,4 gtk2 >= 2.6
+Provides: gvim = %{version}-%{release}
 BuildRequires: gtk2-devel libSM-devel libXt-devel libXpm-devel
 
 %description X11
@@ -720,9 +721,9 @@
 cp vim gvim
 make clean
 
-%configure --prefix=/usr --with-features=huge --enable-pythoninterp \
+%configure --prefix=%{_prefix} --with-features=huge --enable-pythoninterp \
  --enable-perlinterp --disable-tclinterp --with-x=no \
- --enable-gui=no --exec-prefix=/usr --enable-multibyte \
+ --enable-gui=no --exec-prefix=%{_prefix} --enable-multibyte \
  --enable-cscope --with-modified-by="<bugzilla at redhat.com>" \
  --with-tlib=ncurses \
  --with-compiledby="<bugzilla at redhat.com>" \
@@ -738,7 +739,7 @@
 
 #perl -pi -e "s/help.txt/vi-help.txt/"  os_unix.h ex_cmds.c
 perl -pi -e "s/\/etc\/vimrc/\/etc\/virc/"  os_unix.h
-%configure --prefix='${DEST}'/usr --with-features=small --with-x=no \
+%configure --prefix=%{_prefix} --with-features=small --with-x=no \
   --enable-multibyte \
   --disable-netbeans \
   --disable-pythoninterp --disable-perlinterp --disable-tclinterp \
@@ -751,60 +752,61 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/bin
-mkdir -p $RPM_BUILD_ROOT/usr/bin
+mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/vimfiles/after
 cp -f %{SOURCE11} .
+cp runtime/doc/uganda.txt LICENSE
 
 
 cd src
 make install DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin
-mv $RPM_BUILD_ROOT/bin/xxd $RPM_BUILD_ROOT/usr/bin/xxd
+mv $RPM_BUILD_ROOT/bin/xxd $RPM_BUILD_ROOT/%{_bindir}/xxd
 make installmacros DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps
-install -m755 gvim $RPM_BUILD_ROOT/usr/bin/gvim
-install -m644 %{SOURCE7} \
+install -m755 gvim $RPM_BUILD_ROOT/%{_bindir}/gvim
+install -p -m644 %{SOURCE7} \
    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/gvim.png
-install -m644 %{SOURCE8} \
+install -p -m644 %{SOURCE8} \
    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/gvim.png
-install -m644 %{SOURCE9} \
+install -p -m644 %{SOURCE9} \
    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gvim.png
-install -m644 %{SOURCE10} \
+install -p -m644 %{SOURCE10} \
    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/gvim.png
-install -m755 enhanced-vim $RPM_BUILD_ROOT/usr/bin/vim
+install -m755 enhanced-vim $RPM_BUILD_ROOT/%{_bindir}/vim
 
 ( cd $RPM_BUILD_ROOT
-  mv ./bin/vimtutor ./usr/bin/vimtutor
+  mv ./bin/vimtutor ./%{_bindir}/vimtutor
   mv ./bin/vim ./bin/vi
   rm -f ./bin/rvim
   ln -sf vi ./bin/ex
   ln -sf vi ./bin/rvi
   ln -sf vi ./bin/rview
   ln -sf vi ./bin/view
-  ln -sf vim ./usr/bin/ex
-  ln -sf vim ./usr/bin/rvim
-  ln -sf vim ./usr/bin/vimdiff
+  ln -sf vim ./%{_bindir}/ex
+  ln -sf vim ./%{_bindir}/rvim
+  ln -sf vim ./%{_bindir}/vimdiff
   perl -pi -e "s,$RPM_BUILD_ROOT,," .%{_mandir}/man1/vim.1 .%{_mandir}/man1/vimtutor.1
   rm -f .%{_mandir}/man1/rvim.1
   ln -sf vim.1.gz .%{_mandir}/man1/vi.1.gz
   ln -sf vim.1.gz .%{_mandir}/man1/rvi.1.gz
   ln -sf vim.1.gz .%{_mandir}/man1/rvim.1.gz
   ln -sf vim.1.gz .%{_mandir}/man1/vimdiff.1.gz
-  ln -sf gvim ./usr/bin/gview
-  ln -sf gvim ./usr/bin/gex
-  ln -sf gvim ./usr/bin/evim
-  ln -sf gvim ./usr/bin/gvimdiff
+  ln -sf gvim ./%{_bindir}/gview
+  ln -sf gvim ./%{_bindir}/gex
+  ln -sf gvim ./%{_bindir}/evim
+  ln -sf gvim ./%{_bindir}/gvimdiff
   ln -sf vim.1.gz .%{_mandir}/man1/gvim.1.gz
   ln -sf vim.1.gz .%{_mandir}/man1/gvimdiff.1.gz
-  ln -sf gvim ./usr/bin/vimx
+  ln -sf gvim ./%{_bindir}/vimx
   %if "%{desktop_file}" == "1"
     mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
-    desktop-file-install --vendor net \
+    desktop-file-install --vendor fedora \
         --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
         --add-category "Application;Development;X-Red-Hat-Base" \
         %{SOURCE3}
   %else
-    mkdir -p ./etc/X11/applnk/Applications
-    cp %{SOURCE3} ./etc/X11/applnk/Applications/gvim.desktop
+    mkdir -p ./%{_sysconfdir}/X11/applnk/Applications
+    cp %{SOURCE3} ./%{_sysconfdir}/X11/applnk/Applications/gvim.desktop
   %endif
   # ja_JP.ujis is obsolete, ja_JP.eucJP is recommended.
   ( cd ./%{_datadir}/%{name}/%{vimdir}/lang; \
@@ -844,19 +846,19 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d
 cat >$RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/vim.sh <<EOF
 if [ -n "\$BASH_VERSION" -o -n "\$KSH_VERSION" -o -n "\$ZSH_VERSION" ]; then
-  [ -x /usr/bin/id ] || return
-  [ \`/usr/bin/id -u\` -le 100 ] && return
+  [ -x /%{_bindir}/id ] || return
+  [ \`/%{_bindir}/id -u\` -le 100 ] && return
   # for bash and zsh, only if no alias is already set
   alias vi >/dev/null 2>&1 || alias vi=vim
 fi
 EOF
 cat >$RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/vim.csh <<EOF
-[ -x /usr/bin/id ] || exit
-[ \`/usr/bin/id -u\` -gt 100 ] && alias vi vim
+[ -x /%{_bindir}/id ] || exit
+[ \`/%{_bindir}/id -u\` -gt 100 ] && alias vi vim
 EOF
 chmod 0644 $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/*
-install -m644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/vimrc
-install -m644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/virc
+install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/vimrc
+install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/virc
 (cd $RPM_BUILD_ROOT/%{_datadir}/%{name}/%{vimdir}/doc;
  gzip -9 *.txt
  gzip -d help.txt.gz
@@ -864,18 +866,31 @@
 # cp %{SOURCE12} . 
  )
 (cd ../runtime; rm -rf doc; ln -svf ../../vim/%{vimdir}/doc docs;) 
+rm -f $RPM_BUILD_ROOT/%{_datadir}/vim/%{vimdir}/macros/maze/maze*.c
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/vim/%{vimdir}/tools
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/vim/%{vimdir}/doc/vim2html.pl
+rm -f $RPM_BUILD_ROOT/%{_datadir}/vim/%{vimdir}/tutor/tutor.gr.utf-8~
+( cd $RPM_BUILD_ROOT/%{_mandir}
+  for i in `find ??/ -type f`; do
+    bi=`basename $i`
+    iconv -f latin1 -t UTF8 $i > $RPM_BUILD_ROOT/$bi
+    mv -f $RPM_BUILD_ROOT/$bi $i
+  done
+)
 
 %post X11
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
+if [ -x /%{_bindir}/gtk-update-icon-cache ]; then
   gtk-update-icon-cache --ignore-theme-index -q %{_datadir}/icons/hicolor
 fi
+update-desktop-database &> /dev/null ||:
 
 %postun X11
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
+if [ -x /%{_bindir}/gtk-update-icon-cache ]; then
   gtk-update-icon-cache --ignore-theme-index -q %{_datadir}/icons/hicolor
 fi
+update-desktop-database &> /dev/null ||:
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -883,7 +898,7 @@
 %files common
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/vimrc
-%doc README*
+%doc README* LICENSE
 %doc runtime/docs
 %doc Changelog.rpm
 %dir %{_datadir}/%{name}
@@ -894,7 +909,7 @@
 %{_datadir}/%{name}/%{vimdir}/colors
 %{_datadir}/%{name}/%{vimdir}/compiler
 %{_datadir}/%{name}/%{vimdir}/doc
-#exclude /usr/share/vim/%{vimdir}/doc/vi-help.txt
+#exclude /%{_bindir}/vim/%{vimdir}/doc/vi-help.txt
 %{_datadir}/%{name}/%{vimdir}/*.vim
 %{_datadir}/%{name}/%{vimdir}/ftplugin
 %{_datadir}/%{name}/%{vimdir}/indent
@@ -906,7 +921,6 @@
 %{_datadir}/%{name}/%{vimdir}/plugin
 %{_datadir}/%{name}/%{vimdir}/print
 %{_datadir}/%{name}/%{vimdir}/syntax
-%{_datadir}/%{name}/%{vimdir}/tools
 %{_datadir}/%{name}/%{vimdir}/tutor
 %if ! %{withvimspell}
 %{_datadir}/%{name}/%{vimdir}/spell
@@ -933,7 +947,7 @@
 %lang(zh_TW) %{_datadir}/%{name}/%{vimdir}/lang/zh_TW
 %lang(zh_CN.UTF-8) %{_datadir}/%{name}/%{vimdir}/lang/zh_CN.UTF-8
 %lang(zh_TW.UTF-8) %{_datadir}/%{name}/%{vimdir}/lang/zh_TW.UTF-8
-/usr/bin/xxd
+/%{_bindir}/xxd
 %{_mandir}/man1/vim.*
 %{_mandir}/man1/ex.*
 %{_mandir}/man1/vi.*
@@ -941,13 +955,14 @@
 %{_mandir}/man1/rvi.*
 %{_mandir}/man1/rview.*
 %{_mandir}/man1/xxd.*
-%lang(fr) %{_mandir}/fr*
-%lang(it) %{_mandir}/it*
-%lang(ru) %{_mandir}/ru*
-%lang(pl) %{_mandir}/pl*
+%lang(fr) %{_mandir}/fr*/*/*
+%lang(it) %{_mandir}/it*/*/*
+%lang(ru) %{_mandir}/ru*/*/*
+%lang(pl) %{_mandir}/pl*/*/*
 
 %if %{withvimspell}
 %files spell
+%defattr(-,root,root)
 %dir %{_datadir}/%{name}/%{vimdir}/spell
 %{_datadir}/%{name}/vim70/spell/cleanadd.vim
 %lang(af) %{_datadir}/%{name}/%{vimdir}/spell/af.*
@@ -1014,11 +1029,11 @@
 
 %files enhanced
 %defattr(-,root,root)
-/usr/bin/vim
-/usr/bin/rvim
-/usr/bin/vimdiff
-/usr/bin/ex
-/usr/bin/vimtutor
+%{_bindir}/vim
+%{_bindir}/rvim
+%{_bindir}/vimdiff
+%{_bindir}/ex
+%{_bindir}/vimtutor
 %config(noreplace) %{_sysconfdir}/profile.d/vim.*
 %{_mandir}/man1/rvim.*
 %{_mandir}/man1/vimdiff.*
@@ -1027,22 +1042,34 @@
 %files X11
 %defattr(-,root,root)
 %if "%{desktop_file}" == "1"
-/usr/share/applications/*
+/%{_datadir}/applications/*
 %else
-/etc/X11/applnk/*/gvim.desktop
+/%{_sysconfdir}/X11/applnk/*/gvim.desktop
 %endif
-/usr/bin/gvim
-/usr/bin/gvimdiff
-/usr/bin/gview
-/usr/bin/gex
-/usr/bin/vimx
-/usr/bin/evim
+%{_bindir}/gvim
+%{_bindir}/gvimdiff
+%{_bindir}/gview
+%{_bindir}/gex
+%{_bindir}/vimx
+%{_bindir}/evim
 %{_mandir}/man1/evim.*
 %{_mandir}/man1/gvim*
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
-* Fri Mar 30 2007 Karsten Hopp <karsten at redhat.com> 7.0.224-3
+* Mon Apr 16 2007 Karsten Hopp <karsten at redhat.com> 7.0.224-2
+- use more macros
+- drop BR perl
+- move license to main doc directory
+- set vendor to 'fedora' (desktop-file)
+- don't own man directories
+- preserve timestamps of non-generated files
+- run update-desktop-database
+
+* Thu Apr 05 2007 Karsten Hopp <karsten at redhat.com> 7.0.224-1
+- vim-X11 provides gvim
+
+* Fri Mar 30 2007 Karsten Hopp <karsten at redhat.com> 7.0.224-1
 - patchlevel 224
 
 * Wed Feb 21 2007 Karsten Hopp <karsten at redhat.com> 7.0.195-2



From fedora-cvs-commits at redhat.com  Mon Apr 16 15:52:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 11:52:30 -0400
Subject: rpms/samba/devel samba.spec,1.108,1.109
Message-ID: <200704161552.l3GFqU0G018112@cvs.devel.redhat.com>

Author: ssorce

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18096

Modified Files:
	samba.spec 
Log Message:

some leftovers




Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- samba.spec	16 Apr 2007 14:52:15 -0000	1.108
+++ samba.spec	16 Apr 2007 15:52:28 -0000	1.109
@@ -265,6 +265,7 @@
 	PRIVATEDIR=$RPM_BUILD_ROOT%{_sysconfdir}/samba \
 	LIBDIR=$RPM_BUILD_ROOT%{_libdir}/samba \
 	CONFIGDIR=$RPM_BUILD_ROOT%{_sysconfdir}/samba \
+	PAMMODULESDIR=$RPM_BUILD_ROOT/%{_lib}/security \
 	MANDIR=$RPM_BUILD_ROOT%{_mandir} \
 	VARDIR=$RPM_BUILD_ROOT/var/log/samba \
 	CODEPAGEDIR=$RPM_BUILD_ROOT%{_datadir}/samba/codepages \
@@ -586,6 +587,7 @@
 %config(noreplace) %{_sysconfdir}/samba/smb.conf
 %config(noreplace) %{_sysconfdir}/samba/lmhosts
 %config(noreplace) %{_sysconfdir}/sysconfig/samba
+%config(noreplace) %{_sysconfdir}/security/pam_winbind.conf
 %dir %{_datadir}/samba
 #%dir %{_datadir}/samba/codepages
 %dir %{_sysconfdir}/samba



From fedora-cvs-commits at redhat.com  Mon Apr 16 15:57:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 11:57:45 -0400
Subject: rpms/java-1.5.0-gcj/devel .cvsignore, 1.5, 1.6 java-1.5.0-gcj.spec,
	1.17, 1.18 sources, 1.5, 1.6
Message-ID: <200704161557.l3GFvjDM018290@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.5.0-gcj/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18274

Modified Files:
	.cvsignore java-1.5.0-gcj.spec sources 
Log Message:
* Mon Apr 16 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-14
- Import java-gcj-compat 1.0.76.
- Related: rhbz#200836




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/java-1.5.0-gcj/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Apr 2007 18:52:42 -0000	1.5
+++ .cvsignore	16 Apr 2007 15:57:43 -0000	1.6
@@ -1 +1 @@
-java-gcj-compat-1.0.75.tar.gz
+java-gcj-compat-1.0.76.tar.gz


Index: java-1.5.0-gcj.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.5.0-gcj/devel/java-1.5.0-gcj.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- java-1.5.0-gcj.spec	10 Apr 2007 19:07:22 -0000	1.17
+++ java-1.5.0-gcj.spec	16 Apr 2007 15:57:43 -0000	1.18
@@ -19,7 +19,7 @@
 # the version-release string for the gcj rpms we require
 %define gccver          4.1.2-5
 # the version string for the java-gcj-compat release we require
-%define jgcver          1.0.75
+%define jgcver          1.0.76
 
 # hard-code libdir on 64-bit architectures to make the 64-bit JDK
 # simply be another alternative
@@ -55,7 +55,7 @@
 
 Name:    %{name}
 Version: %{javaver}.%{buildver}
-Release: 13%{?dist}
+Release: 14%{?dist}
 Summary: JPackage runtime compatibility layer for GCJ
 Group:   Development/Languages
 
@@ -712,6 +712,10 @@
 %endif
 
 %changelog
+* Mon Apr 16 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-14
+- Import java-gcj-compat 1.0.76.
+- Related: rhbz#200836
+
 * Tue Apr 10 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-13
 - Import java-gcj-compat 1.0.75.
 - Point URL field at java-gcj-compat home page.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/java-1.5.0-gcj/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Apr 2007 18:52:42 -0000	1.5
+++ sources	16 Apr 2007 15:57:43 -0000	1.6
@@ -1 +1 @@
-f42dabf8c247d18356ee1921ceedb62a  java-gcj-compat-1.0.75.tar.gz
+06eb307d4e9d3fb44a4198d4d501142e  java-gcj-compat-1.0.76.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr 16 16:11:29 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 12:11:29 -0400
Subject: rpms/gnome-vfs2-monikers/devel gnome-vfs2-monikers.spec,1.1,1.2
Message-ID: <200704161611.l3GGBTKp018741@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-vfs2-monikers/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18727

Modified Files:
	gnome-vfs2-monikers.spec 
Log Message:
Improve %description



Index: gnome-vfs2-monikers.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2-monikers/devel/gnome-vfs2-monikers.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-vfs2-monikers.spec	13 Jul 2006 03:49:31 -0000	1.1
+++ gnome-vfs2-monikers.spec	16 Apr 2007 16:11:22 -0000	1.2
@@ -7,7 +7,7 @@
 Summary: Monikers for the GNOME virtual file-system
 Name: gnome-vfs2-monikers
 Version: 2.15.3
-Release: 2
+Release: 3
 License: LGPL
 Group: System Environment/Libraries
 Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-vfs-monikers/2.15/gnome-vfs-monikers-%{version}.tar.bz2
@@ -23,12 +23,9 @@
 BuildRequires: perl(XML::Parser)
 
 %description
-GNOME VFS is the GNOME virtual file system. It is the foundation of
-the Nautilus file manager. It provides a modular architecture and
-ships with several modules that implement support for file systems,
-http, ftp, and others. It provides a URI-based API, backend
-supporting asynchronous file operations, a MIME type manipulation
-library, and other features.
+GNOME VFS is the GNOME virtual file system. 
+Programs using bonobo can use the monikers provided
+in this package to access gnome-vfs.
 
 %prep
 %setup -q -n gnome-vfs-monikers-%{version}
@@ -62,6 +59,9 @@
 %{_libdir}/bonobo
 
 %changelog
+* Tue Apr 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.15.3-3
+- Improve description (#219057)
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-2
 - Incorporate package review feedback
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 16:34:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 12:34:31 -0400
Subject: rpms/ConsoleKit/devel .cvsignore, 1.5, 1.6 ConsoleKit.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <200704161634.l3GGYVRf001849@cvs.devel.redhat.com>

Author: davidz

Update of /cvs/dist/rpms/ConsoleKit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1780

Modified Files:
	.cvsignore ConsoleKit.spec sources 
Log Message:
* Mon Apr 16 2007 David Zeuthen <davidz at redhat.com> - 0.2.1-1
- Update to upstream release 0.2.1
- Drop the patch to daemonize properly as that was merged upstream




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ConsoleKit/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Apr 2007 21:09:41 -0000	1.5
+++ .cvsignore	16 Apr 2007 16:34:29 -0000	1.6
@@ -2,3 +2,4 @@
 ConsoleKit-0.1.3.git20070301.tar.gz
 ConsoleKit-0.2.0.tar.gz
 ConsoleKit-0.2.1.git20070204.tar.gz
+ConsoleKit-0.2.1.tar.gz


Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/dist/rpms/ConsoleKit/devel/ConsoleKit.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ConsoleKit.spec	2 Apr 2007 21:09:41 -0000	1.7
+++ ConsoleKit.spec	16 Apr 2007 16:34:29 -0000	1.8
@@ -5,12 +5,11 @@
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
 Version: 0.2.1
-Release: 0.git20070204%{?dist}
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://consolekit.freedesktop.org
-Source0: http://people.freedesktop.org/~mccann/dist/ConsoleKit-%{version}.git20070204.tar.gz
-Patch0: ConsoleKit-0.2.0-daemonize-properly.patch
+Source0: http://people.freedesktop.org/~mccann/dist/ConsoleKit-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dbus >= %{dbus_version}
 
@@ -72,7 +71,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .daemonize-properly
 
 %build
 %configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs
@@ -139,6 +137,10 @@
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Mon Apr 16 2007 David Zeuthen <davidz at redhat.com> - 0.2.1-1
+- Update to upstream release 0.2.1
+- Drop the patch to daemonize properly as that was merged upstream
+
 * Mon Apr 02 2007 David Zeuthen <davidz at redhat.com> - 0.2.1-0.git20070402
 - Update to git snapshot to get a lot of bug fixes
 - Use libX11 rather than gtk2 to verify X11 sessions; update BR and R


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ConsoleKit/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Apr 2007 21:09:41 -0000	1.5
+++ sources	16 Apr 2007 16:34:29 -0000	1.6
@@ -1 +1 @@
-71fe7a52a7738faa12c74570e0679313  ConsoleKit-0.2.1.git20070204.tar.gz
+8bf5e83931a8a3c2abcd541781e1554c  ConsoleKit-0.2.1.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr 16 16:35:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 12:35:30 -0400
Subject: rpms/yelp/devel yelp-2.18.1-info-bc-crash.patch, NONE, 1.1 yelp.spec,
	1.94, 1.95
Message-ID: <200704161635.l3GGZU7i002549@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	yelp.spec 
Added Files:
	yelp-2.18.1-info-bc-crash.patch 
Log Message:
fix a crash in the info parser


yelp-2.18.1-info-bc-crash.patch:
 yelp-info-parser.c |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE yelp-2.18.1-info-bc-crash.patch ---
--- yelp-info-parser.c.info-bc	2007-03-26 01:33:52.000000000 -0400
+++ yelp-info-parser.c	2007-03-26 01:22:15.000000000 -0400
@@ -354,6 +354,12 @@
       title = gtk_tree_model_get_string_from_iter (model, r);
   }
 
+  if (!g_str_equal (title, reftitle))
+    {
+      gtk_tree_iter_free (tmp);
+      tmp = NULL;
+    }
+
   gtk_tree_iter_free (r);
   g_free (title);
   g_free (reftitle);


Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- yelp.spec	9 Apr 2007 17:34:29 -0000	1.94
+++ yelp.spec	16 Apr 2007 16:35:28 -0000	1.95
@@ -28,6 +28,8 @@
 Patch3: yelp-2.15.91-use-pango.patch 
 # http://bugzilla.gnome.org/show_bug.cgi?id=370167 
 Patch5: yelp-2.16.0-apropos.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=430365 
+Patch6: yelp-2.18.1-info-bc-crash.patch
 
 License: GPL
 Group: Applications/System
@@ -85,6 +87,7 @@
 %patch2 -p1 -b .add-mime-handling
 %patch3 -p1 -b .use-pango
 %patch5 -p1 -b .apropos
+%patch6 -p1 -b .info-bc-crash
 
 %build
 %configure 			\
@@ -149,6 +152,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Tue Apr 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.1-2
+- Fix a crash in the info parser (#216308)
+
 * Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 2.18.1-1
 - Update to 2.18.1
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 16:35:58 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 12:35:58 -0400
Subject: rpms/yelp/devel yelp.spec,1.95,1.96
Message-ID: <200704161635.l3GGZwEf002894@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	yelp.spec 
Log Message:
bump rev



Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- yelp.spec	16 Apr 2007 16:35:28 -0000	1.95
+++ yelp.spec	16 Apr 2007 16:35:56 -0000	1.96
@@ -19,7 +19,7 @@
 Summary: A system documentation reader from the Gnome project
 Name: yelp
 Version: 2.18.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.18/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096



From fedora-cvs-commits at redhat.com  Mon Apr 16 16:43:13 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 12:43:13 -0400
Subject: rpms/yelp/devel yelp-2.18.1-info-bc-crash.patch,1.1,1.2
Message-ID: <200704161643.l3GGhDUc008220@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	yelp-2.18.1-info-bc-crash.patch 
Log Message:
fix patch


yelp-2.18.1-info-bc-crash.patch:
 yelp-info-parser.c |    6 ++++++
 1 files changed, 6 insertions(+)

Index: yelp-2.18.1-info-bc-crash.patch
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp-2.18.1-info-bc-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yelp-2.18.1-info-bc-crash.patch	16 Apr 2007 16:35:28 -0000	1.1
+++ yelp-2.18.1-info-bc-crash.patch	16 Apr 2007 16:43:11 -0000	1.2
@@ -1,5 +1,5 @@
---- yelp-info-parser.c.info-bc	2007-03-26 01:33:52.000000000 -0400
-+++ yelp-info-parser.c	2007-03-26 01:22:15.000000000 -0400
+--- yelp-2.18.1/src/yelp-info-parser.c.info-bc	2007-03-26 01:33:52.000000000 -0400
++++ yelp-2.18.1/src/yelp-info-parser.c	2007-03-26 01:22:15.000000000 -0400
 @@ -354,6 +354,12 @@
        title = gtk_tree_model_get_string_from_iter (model, r);
    }



From fedora-cvs-commits at redhat.com  Mon Apr 16 16:44:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 12:44:47 -0400
Subject: rpms/mc/devel mc-utf8.patch,1.24,1.25 mc.spec,1.121,1.122
Message-ID: <200704161644.l3GGilL1009445@cvs.devel.redhat.com>

Author: jnovy

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

Modified Files:
	mc-utf8.patch mc.spec 
Log Message:
- fix segmentation fault while editing non-UTF8 files (#229383)


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

Index: mc-utf8.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc-utf8.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mc-utf8.patch	4 Jan 2007 16:14:38 -0000	1.24
+++ mc-utf8.patch	16 Apr 2007 16:44:45 -0000	1.25
@@ -5201,3 +5201,106 @@
  	if (edit->overwrite) {
  	    if (edit_get_byte (edit, edit->curs1) != '\n')
  		edit_delete (edit);
+--- mc/edit/edit.c.jn	2007-04-16 18:14:22.000000000 +0200
++++ mc/edit/edit.c	2007-04-16 18:26:25.000000000 +0200
+@@ -1526,7 +1526,11 @@
+     f = edit_eol (edit, offset) - 1;
+     while (s <= f) {
+ 	c = edit_get_byte (edit, s++);
++#ifndef UTF8
+ 	if (!isspace (c))
++#else
++	if (!iswspace (c))
++#endif /* UTF8 */
+ 	    return 0;
+     }
+     return 1;
+@@ -1781,6 +1785,7 @@
+ 	    return 2;
+ 	return 0x80000000UL;
+     }
++#ifndef UTF8
+     if (isupper (c))
+ 	c = 'A';
+     else if (islower (c))
+@@ -1791,6 +1796,18 @@
+ 	c = '0';
+     else if (isspace (c))
+ 	c = ' ';
++#else
++    if (iswupper (c))
++	c = 'A';
++    else if (iswlower (c))
++	c = 'a';
++    else if (iswalpha (c))
++	c = 'a';
++    else if (iswdigit (c))
++	c = '0';
++    else if (iswspace (c))
++	c = ' ';
++#endif /* UTF8 */
+     q = strchr (option_chars_move_whole_word, c);
+     if (!q)
+ 	return 0xFFFFFFFFUL;
+@@ -1815,10 +1832,18 @@
+ 	c2 = edit_get_byte (edit, edit->curs1);
+ 	if (!(my_type_of (c1) & my_type_of (c2)))
+ 	    break;
++#ifndef UTF8
+ 	if (isspace (c1) && !isspace (c2))
++#else
++	if (iswspace (c1) && !iswspace (c2))
++#endif /* UTF8 */
+ 	    break;
+ 	if (s)
++#ifndef UTF8
+ 	    if (!isspace (c1) && isspace (c2))
++#else
++	    if (!iswspace (c1) && iswspace (c2))
++#endif /* UTF8 */
+ 		break;
+     }
+ }
+@@ -1841,10 +1866,18 @@
+ 	c2 = edit_get_byte (edit, edit->curs1);
+ 	if (!(my_type_of (c1) & my_type_of (c2)))
+ 	    break;
++#ifndef UTF8
+ 	if (isspace (c1) && !isspace (c2))
++#else
++	if (iswspace (c1) && !iswspace (c2))
++#endif /* UTF8 */
+ 	    break;
+ 	if (s)
++#ifndef UTF8
+ 	    if (!isspace (c1) && isspace (c2))
++#else
++	    if (!iswspace (c1) && iswspace (c2))
++#endif /* UTF8 */
+ 		break;
+     }
+ }
+@@ -1864,7 +1897,11 @@
+ 	    break;
+ 	c1 = edit_delete (edit);
+ 	c2 = edit_get_byte (edit, edit->curs1);
++#ifndef UTF8
+ 	if ((isspace (c1) == 0) != (isspace (c2) == 0))
++#else
++	if ((iswspace (c1) == 0) != (iswspace (c2) == 0))
++#endif /* UTF8 */
+ 	    break;
+ 	if (!(my_type_of (c1) & my_type_of (c2)))
+ 	    break;
+@@ -1879,7 +1916,11 @@
+ 	    break;
+ 	c1 = edit_backspace (edit);
+ 	c2 = edit_get_byte (edit, edit->curs1 - 1);
++#ifndef UTF8
+ 	if ((isspace (c1) == 0) != (isspace (c2) == 0))
++#else
++	if ((iswspace (c1) == 0) != (iswspace (c2) == 0))
++#endif /* UTF8 */
+ 	    break;
+ 	if (!(my_type_of (c1) & my_type_of (c2)))
+ 	    break;


Index: mc.spec
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- mc.spec	2 Apr 2007 10:21:54 -0000	1.121
+++ mc.spec	16 Apr 2007 16:44:45 -0000	1.122
@@ -3,7 +3,7 @@
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.6.1a
-Release:	44.20070124cvs%{?dist}
+Release:	45.20070124cvs%{?dist}
 Epoch:		1
 License:	GPL
 Group:		System Environment/Shells
@@ -192,6 +192,9 @@
 %dir %{_libexecdir}/mc
 
 %changelog
+* Mon Apr 16 2007 Jindrich Novy <jnovy at redhat.com> 4.6.1a-45
+- fix segmentation fault while editing non-UTF8 files (#229383)
+
 * Mon Apr  2 2007 Jindrich Novy <jnovy at redhat.com> 4.6.1a-44
 - fix unowned directories (#233880)
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 16:58:52 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 12:58:52 -0400
Subject: rpms/foomatic/devel foomatic.spec,1.152,1.153 sources,1.46,1.47
Message-ID: <200704161658.l3GGwqse019732@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/foomatic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19661

Modified Files:
	foomatic.spec sources 
Log Message:
* Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com>
- Removed now-unused with_omni code.



Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- foomatic.spec	30 Mar 2007 11:37:57 -0000	1.152
+++ foomatic.spec	16 Apr 2007 16:58:50 -0000	1.153
@@ -3,8 +3,6 @@
 %define filtersver 20051209
 %define hpijsver 20061031
 
-%define with_omni 0
-
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
@@ -22,9 +20,6 @@
 Source2: http://www.linuxprinting.org/download/foomatic/foomatic-db-3.0-%{dbver}.tar.gz
 Source3: http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-%{hpijsver}.tar.gz
 
-# Build Omni first to get this (you'll have to create the tarball by hand):
-Source4: Omni-printers-0.9.2.tar.bz2
-
 # Use libdir.
 Patch1: foomatic-filters-libdir.patch
 Patch2: foomatic-db-engine-libdir.patch
@@ -107,11 +102,6 @@
 pushd foomatic-db-%{dbver}
 %patch7 -p1 -b .ppdload-ppd
 
-%if %with_omni
-# Omni printers
-tar xjf %{SOURCE4}
-%endif
-
 # For gutenprint printers, use gutenprint-ijs-simplified.5.0.
 perl -pi -e 's,>gutenprint<,>gutenprint-ijs-simplified.5.0<,' printer/*.xml
 
@@ -177,19 +167,6 @@
 	INSTALLSITEARCH=$RPM_BUILD_ROOT/$installvendorarch \
 	install
 
-%if %with_omni
-# Install printers from the Omni project, if there isn't already an entry
-cd Omni-printers
-P_DIR=$RPM_BUILD_ROOT/usr/share/foomatic/db/source/printer
-perl -pi -e 's/driver>omni-xml/driver>omni-compiled/' *.xml
-for P in *.xml; do
-       if [ ! -f $P_DIR/$P ]; then
-               cp $P $P_DIR;
-       fi;
-done;
-cd ..
-%endif
-
 popd
 
 pushd foomatic-db-hpijs-%{hpijsver}
@@ -264,6 +241,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com>
+- Removed now-unused with_omni code.
+
 * Fri Mar 30 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-46
 - Don't ship old gimp-print data (bug #234388).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/foomatic/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	30 Mar 2007 11:37:57 -0000	1.46
+++ sources	16 Apr 2007 16:58:50 -0000	1.47
@@ -1,4 +1,3 @@
-dcfbfbe16d76d0b6e44cb261fccd138f  Omni-printers-0.9.2.tar.bz2
 5876178c3aefd36102bc5eef575d3f9c  foomatic-filters-3.0-20051209.tar.gz
 480ab4a4148667dad1ffc188b6480bce  foomatic-db-hpijs-20061031.tar.gz
 562703c7da605a4c89ac476a3bf7955b  foomatic-db-engine-3.0-20061109.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr 16 17:05:06 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 13:05:06 -0400
Subject: rpms/ConsoleKit/devel ConsoleKit.spec,1.8,1.9
Message-ID: <200704161705.l3GH56bF024092@cvs.devel.redhat.com>

Author: davidz

Update of /cvs/dist/rpms/ConsoleKit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24006

Modified Files:
	ConsoleKit.spec 
Log Message:
* Mon Apr 16 2007 David Zeuthen <davidz at redhat.com> - 0.2.1-2
- Set doc directory correctly




Index: ConsoleKit.spec
===================================================================
RCS file: /cvs/dist/rpms/ConsoleKit/devel/ConsoleKit.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ConsoleKit.spec	16 Apr 2007 16:34:29 -0000	1.8
+++ ConsoleKit.spec	16 Apr 2007 17:05:04 -0000	1.9
@@ -5,7 +5,7 @@
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
 Version: 0.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://consolekit.freedesktop.org
@@ -73,7 +73,7 @@
 %setup -q
 
 %build
-%configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs
+%configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version}
 
 make
 
@@ -137,6 +137,9 @@
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Mon Apr 16 2007 David Zeuthen <davidz at redhat.com> - 0.2.1-2
+- Set doc directory correctly
+
 * Mon Apr 16 2007 David Zeuthen <davidz at redhat.com> - 0.2.1-1
 - Update to upstream release 0.2.1
 - Drop the patch to daemonize properly as that was merged upstream



From fedora-cvs-commits at redhat.com  Mon Apr 16 17:05:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 13:05:47 -0400
Subject: rpms/compiz/devel compiz.spec,1.77,1.78
Message-ID: <200704161705.l3GH5lYs024639@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24598

Modified Files:
	compiz.spec 
Log Message:
* Mon Apr 16 2007 Kristian H??gsberg <krh at hinata.boston.redhat.com> - 0.3.6-8
- Update metacity build requires to metacity-devel.



Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- compiz.spec	4 Apr 2007 23:56:42 -0000	1.77
+++ compiz.spec	16 Apr 2007 17:05:45 -0000	1.78
@@ -6,7 +6,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.3.6
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,7 +36,7 @@
 BuildRequires:  gettext 
 BuildRequires:  dbus-devel
 BuildRequires:  librsvg2-devel
-BuildRequires:  metacity
+BuildRequires:  metacity-devel >= 2.18
 
 Source0:        %{name}-%{version}.tar.bz2
 Source1:	desktop-effects-%{dialogversion}.tar.bz2
@@ -198,6 +198,9 @@
 %{_libdir}/libdecoration.so
 
 %changelog
+* Mon Apr 16 2007 Kristian H??gsberg <krh at hinata.boston.redhat.com> - 0.3.6-8
+- Update metacity build requires to metacity-devel.
+
 * Wed Apr  4 2007 Kristian H??gsberg <krh at hinata.boston.redhat.com> - 0.3.6-7
 - Fix typo in ./configure option.
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 17:11:48 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 13:11:48 -0400
Subject: rpms/selinux-policy/devel policy-20070219.patch, 1.46,
	1.47 selinux-policy.spec, 1.432, 1.433
Message-ID: <200704161711.l3GHBlNn029395@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20070219.patch selinux-policy.spec 
Log Message:
* Fri Apr 12 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-3
- fixes for fusefs


policy-20070219.patch:
 Rules.modular                           |   12 +
 policy/flask/access_vectors             |    4 
 policy/global_booleans                  |    2 
 policy/global_tunables                  |    7 
 policy/mls                              |   31 ++-
 policy/modules/admin/acct.te            |    1 
 policy/modules/admin/amtu.fc            |    3 
 policy/modules/admin/amtu.if            |   53 ++++++
 policy/modules/admin/amtu.te            |   56 ++++++
 policy/modules/admin/bootloader.te      |    3 
 policy/modules/admin/consoletype.te     |   10 -
 policy/modules/admin/dmesg.te           |    1 
 policy/modules/admin/kudzu.te           |    6 
 policy/modules/admin/logwatch.te        |    4 
 policy/modules/admin/netutils.te        |    6 
 policy/modules/admin/rpm.fc             |    3 
 policy/modules/admin/rpm.if             |   85 +++++++---
 policy/modules/admin/rpm.te             |    2 
 policy/modules/admin/su.if              |    4 
 policy/modules/admin/usermanage.if      |    2 
 policy/modules/admin/usermanage.te      |   26 +++
 policy/modules/apps/gnome.if            |   26 ++-
 policy/modules/apps/gpg.fc              |    2 
 policy/modules/apps/loadkeys.if         |   44 +----
 policy/modules/apps/mozilla.if          |    1 
 policy/modules/apps/slocate.te          |    5 
 policy/modules/apps/uml.if              |   27 ---
 policy/modules/kernel/corecommands.fc   |    5 
 policy/modules/kernel/corecommands.if   |   20 ++
 policy/modules/kernel/corenetwork.te.in |   14 +
 policy/modules/kernel/devices.if        |   36 ++++
 policy/modules/kernel/domain.if         |   18 ++
 policy/modules/kernel/domain.te         |   46 +++++
 policy/modules/kernel/files.fc          |    1 
 policy/modules/kernel/files.if          |   83 ++++++++-
 policy/modules/kernel/filesystem.if     |   39 ++++
 policy/modules/kernel/filesystem.te     |   13 +
 policy/modules/kernel/kernel.if         |   23 ++
 policy/modules/kernel/kernel.te         |    2 
 policy/modules/kernel/mls.if            |   20 ++
 policy/modules/kernel/mls.te            |    3 
 policy/modules/kernel/selinux.if        |   38 ++++
 policy/modules/kernel/storage.if        |    2 
 policy/modules/kernel/terminal.if       |    2 
 policy/modules/kernel/terminal.te       |    1 
 policy/modules/services/amavis.te       |    3 
 policy/modules/services/apache.fc       |   14 -
 policy/modules/services/apache.if       |  171 +++++++++++++++++++-
 policy/modules/services/apache.te       |   72 ++++++++
 policy/modules/services/apcupsd.fc      |    9 +
 policy/modules/services/apcupsd.if      |  108 ++++++++++++
 policy/modules/services/apcupsd.te      |   91 ++++++++++
 policy/modules/services/automount.te    |    2 
 policy/modules/services/avahi.if        |   19 ++
 policy/modules/services/bluetooth.te    |    2 
 policy/modules/services/consolekit.te   |   13 +
 policy/modules/services/cron.fc         |    1 
 policy/modules/services/cron.if         |   33 +--
 policy/modules/services/cron.te         |   43 ++++-
 policy/modules/services/cups.te         |    6 
 policy/modules/services/cvs.te          |    1 
 policy/modules/services/cyrus.te        |    1 
 policy/modules/services/dbus.if         |   65 +++++++
 policy/modules/services/dhcp.te         |    2 
 policy/modules/services/djbdns.te       |    5 
 policy/modules/services/dovecot.te      |    5 
 policy/modules/services/ftp.te          |    5 
 policy/modules/services/hal.fc          |    8 
 policy/modules/services/hal.if          |   39 ++++
 policy/modules/services/hal.te          |  143 ++++++++++++++++-
 policy/modules/services/inetd.te        |    5 
 policy/modules/services/kerberos.if     |   79 ++-------
 policy/modules/services/kerberos.te     |   36 ++++
 policy/modules/services/mailman.if      |   19 ++
 policy/modules/services/mta.if          |   19 ++
 policy/modules/services/mta.te          |    2 
 policy/modules/services/nis.if          |    4 
 policy/modules/services/nis.te          |    4 
 policy/modules/services/nscd.te         |   10 +
 policy/modules/services/ntp.te          |    4 
 policy/modules/services/pegasus.if      |   18 ++
 policy/modules/services/pegasus.te      |    6 
 policy/modules/services/postfix.if      |    1 
 policy/modules/services/postfix.te      |    8 
 policy/modules/services/procmail.te     |    1 
 policy/modules/services/pyzor.te        |    7 
 policy/modules/services/radius.te       |    4 
 policy/modules/services/rpc.if          |    5 
 policy/modules/services/rsync.te        |    1 
 policy/modules/services/samba.fc        |    3 
 policy/modules/services/samba.if        |   86 ++++++++++
 policy/modules/services/samba.te        |   83 +++++++++
 policy/modules/services/sendmail.if     |   22 ++
 policy/modules/services/smartmon.te     |    1 
 policy/modules/services/snmp.te         |   15 +
 policy/modules/services/spamassassin.te |    7 
 policy/modules/services/squid.fc        |    2 
 policy/modules/services/squid.if        |   22 ++
 policy/modules/services/squid.te        |   12 +
 policy/modules/services/ssh.if          |   39 ++++
 policy/modules/services/ssh.te          |   10 -
 policy/modules/services/w3c.fc          |    2 
 policy/modules/services/w3c.if          |    1 
 policy/modules/services/w3c.te          |   14 +
 policy/modules/system/application.fc    |    1 
 policy/modules/system/application.if    |  104 ++++++++++++
 policy/modules/system/application.te    |   14 +
 policy/modules/system/authlogin.if      |   83 ++++++++-
 policy/modules/system/authlogin.te      |    3 
 policy/modules/system/fstools.fc        |    1 
 policy/modules/system/fstools.te        |    1 
 policy/modules/system/fusermount.fc     |    6 
 policy/modules/system/fusermount.if     |   41 ++++
 policy/modules/system/fusermount.te     |   45 +++++
 policy/modules/system/getty.te          |    3 
 policy/modules/system/hostname.te       |   14 +
 policy/modules/system/init.if           |   42 ++++
 policy/modules/system/init.te           |   35 +++-
 policy/modules/system/ipsec.if          |   20 ++
 policy/modules/system/iptables.te       |    4 
 policy/modules/system/libraries.fc      |    2 
 policy/modules/system/locallogin.te     |    7 
 policy/modules/system/logging.if        |   21 ++
 policy/modules/system/logging.te        |    2 
 policy/modules/system/lvm.te            |    6 
 policy/modules/system/modutils.te       |    6 
 policy/modules/system/mount.fc          |    3 
 policy/modules/system/mount.if          |   37 ++++
 policy/modules/system/mount.te          |   64 +++++++
 policy/modules/system/raid.te           |    1 
 policy/modules/system/selinuxutil.fc    |    1 
 policy/modules/system/selinuxutil.if    |    5 
 policy/modules/system/selinuxutil.te    |   52 +++---
 policy/modules/system/sysnetwork.te     |    3 
 policy/modules/system/udev.te           |   12 +
 policy/modules/system/unconfined.fc     |    1 
 policy/modules/system/unconfined.if     |   10 -
 policy/modules/system/unconfined.te     |   24 ++
 policy/modules/system/userdomain.if     |  269 +++++++++++++++++++-------------
 policy/modules/system/userdomain.te     |   46 ++++-
 policy/modules/system/xen.te            |   35 ++++
 policy/support/obj_perm_sets.spt        |   12 +
 142 files changed, 2806 insertions(+), 435 deletions(-)

Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- policy-20070219.patch	12 Apr 2007 21:09:34 -0000	1.46
+++ policy-20070219.patch	16 Apr 2007 17:11:45 -0000	1.47
@@ -270,7 +270,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.5.12/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2007-02-19 11:32:54.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/admin/bootloader.te	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/admin/bootloader.te	2007-04-16 11:36:34.000000000 -0400
 @@ -65,6 +65,8 @@
  files_tmp_filetrans(bootloader_t,bootloader_tmp_t,{ dir file lnk_file chr_file blk_file })
  # for tune2fs (cjp: ?)
@@ -280,6 +280,14 @@
  
  kernel_getattr_core_if(bootloader_t)
  kernel_read_network_state(bootloader_t)
+@@ -187,6 +189,7 @@
+ 
+ optional_policy(`
+ 	hal_dontaudit_append_lib_files(bootloader_t)
++	hal_write_log(bootloader_t)
+ ')
+ 
+ optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.5.12/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2007-02-19 11:32:54.000000000 -0500
 +++ serefpolicy-2.5.12/policy/modules/admin/consoletype.te	2007-04-11 17:07:34.000000000 -0400
@@ -544,9 +552,19 @@
  	ifdef(`TODO',`
  	allow $1_su_t $1_home_t:file manage_file_perms;
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.if serefpolicy-2.5.12/policy/modules/admin/usermanage.if
+--- nsaserefpolicy/policy/modules/admin/usermanage.if	2007-03-26 10:39:08.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/admin/usermanage.if	2007-04-13 07:09:32.000000000 -0400
+@@ -278,5 +278,5 @@
+ 		type crack_db_t;
+ 	')
+ 
+-	allow $1 crack_db_t:file read_file_perms;
++	read_files_pattern($1,crack_db_t,crack_db_t)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.5.12/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2007-03-26 10:39:08.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/admin/usermanage.te	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/admin/usermanage.te	2007-04-16 09:39:28.000000000 -0400
 @@ -252,8 +252,13 @@
  ')
  
@@ -570,7 +588,15 @@
  # allow vipw to exec the editor
  corecmd_exec_bin(sysadm_passwd_t)
  corecmd_exec_shell(sysadm_passwd_t)
-@@ -508,6 +515,9 @@
+@@ -433,6 +440,7 @@
+ 
+ optional_policy(`
+ 	nscd_socket_use(sysadm_passwd_t)
++	nscd_domtrans(sysadm_passwd_t)
+ ')
+ 
+ ########################################
+@@ -508,6 +516,9 @@
  seutil_read_default_contexts(useradd_t)
  seutil_domtrans_semanage(useradd_t)
  seutil_domtrans_restorecon(useradd_t)
@@ -580,7 +606,7 @@
  
  userdom_use_unpriv_users_fds(useradd_t)
  # for when /root is the cwd
-@@ -521,11 +531,26 @@
+@@ -521,11 +532,26 @@
  mta_manage_spool(useradd_t)
  
  optional_policy(`
@@ -755,8 +781,8 @@
  	dev_dontaudit_rw_dri($1_mozilla_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.te serefpolicy-2.5.12/policy/modules/apps/slocate.te
 --- nsaserefpolicy/policy/modules/apps/slocate.te	2007-02-19 11:32:52.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/apps/slocate.te	2007-04-11 17:07:34.000000000 -0400
-@@ -42,9 +42,7 @@
++++ serefpolicy-2.5.12/policy/modules/apps/slocate.te	2007-04-16 12:08:09.000000000 -0400
+@@ -42,9 +42,8 @@
  files_read_etc_runtime_files(locate_t)
  files_read_etc_files(locate_t)
  
@@ -764,6 +790,7 @@
 -fs_getattr_rpc_pipefs(locate_t)
 -fs_getattr_rpc_dirs(locate_t)
 +fs_getattr_all_fs(locate_t)
++fs_getattr_all_dirs(locate_t)
  
  libs_use_shared_libs(locate_t)
  libs_use_ld_so(locate_t)
@@ -1288,8 +1315,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.5.12/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2007-03-26 16:24:09.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/kernel/filesystem.te	2007-04-11 17:07:34.000000000 -0400
-@@ -54,17 +54,29 @@
++++ serefpolicy-2.5.12/policy/modules/kernel/filesystem.te	2007-04-13 10:53:14.000000000 -0400
+@@ -54,17 +54,30 @@
  
  type capifs_t;
  fs_type(capifs_t)
@@ -1312,6 +1339,7 @@
  
 +type fusefs_t;
 +fs_type(fusefs_t)
++fs_noxattr_type(fusefs_t)
 +allow fusefs_t self:filesystem associate;
 +genfscon fuse / gen_context(system_u:object_r:fusefs_t,s0)
 +genfscon fuseblk / gen_context(system_u:object_r:fusefs_t,s0)
@@ -1321,7 +1349,7 @@
  genfscon futexfs / gen_context(system_u:object_r:futexfs_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.5.12/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2007-02-19 11:32:51.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/kernel/kernel.if	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/kernel/kernel.if	2007-04-16 11:51:04.000000000 -0400
 @@ -1830,6 +1830,26 @@
  
  ########################################
@@ -2529,7 +2557,13 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.5.12/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/dbus.if	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/dbus.if	2007-04-16 12:03:35.000000000 -0400
+@@ -1,4 +1,4 @@
+-## <summary>Desktop messaging bus</summary>
++# <summary>Desktop messaging bus</summary>
+ 
+ ########################################
+ ## <summary>
 @@ -49,6 +49,12 @@
  ## </param>
  #
@@ -2708,8 +2742,8 @@
 +/var/log/pm-suspend.log				gen_context(system_u:object_r:hald_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.5.12/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2007-02-19 11:32:53.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/services/hal.if	2007-04-11 17:07:34.000000000 -0400
-@@ -208,3 +208,22 @@
++++ serefpolicy-2.5.12/policy/modules/services/hal.if	2007-04-16 11:36:25.000000000 -0400
+@@ -208,3 +208,42 @@
  	files_search_pids($1)
  	allow $1 hald_var_run_t:file rw_file_perms;
  ')
@@ -2732,9 +2766,29 @@
 +
 +	dontaudit $1 hald_log_t:file { append write };
 +')
++
++########################################
++## <summary>
++##	Allow attempts to write the hal
++##	log files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit
++##	</summary>
++## </param>
++#
++interface(`hal_write_log',`
++	gen_require(`
++		type hald_log_t;
++	')
++
++	logging_search_logs($1)
++	allow $1 hald_log_t:file rw_file_perms;
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.5.12/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2007-03-20 23:38:00.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/hal.te	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/hal.te	2007-04-13 11:13:52.000000000 -0400
 @@ -16,9 +16,33 @@
  type hald_var_run_t;
  files_pid_file(hald_var_run_t)
@@ -2839,7 +2893,7 @@
  
  libs_use_ld_so(hald_t)
  libs_use_shared_libs(hald_t)
-@@ -245,3 +281,101 @@
+@@ -245,3 +281,102 @@
  optional_policy(`
  	vbetool_domtrans(hald_t)
  ')
@@ -2924,6 +2978,7 @@
 +allow hald_t hald_sonypic_t : process signal;
 +allow hald_sonypic_t hald_t : unix_stream_socket connectto;
 +
++dev_read_video_dev(hald_sonypic_t)
 +dev_write_video_dev(hald_sonypic_t)
 +
 +files_search_var_lib(hald_sonypic_t)
@@ -3166,6 +3221,35 @@
 +		pcscd_stream_connect(kerberosclient)
 +	')
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-2.5.12/policy/modules/services/mailman.if
+--- nsaserefpolicy/policy/modules/services/mailman.if	2007-01-02 12:57:43.000000000 -0500
++++ serefpolicy-2.5.12/policy/modules/services/mailman.if	2007-04-16 10:22:15.000000000 -0400
+@@ -275,6 +275,25 @@
+ 
+ #######################################
+ ## <summary>
++##	append
++##	mailman logs.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`mailman_append_log',`
++	gen_require(`
++		type mailman_log_t;
++	')
++
++	append_files_pattern($1,mailman_log_t,mailman_log_t)
++')
++
++#######################################
++## <summary>
+ ##	Allow domain to read mailman archive files.
+ ## </summary>
+ ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-2.5.12/policy/modules/services/mta.if
 --- nsaserefpolicy/policy/modules/services/mta.if	2007-03-26 10:39:04.000000000 -0400
 +++ serefpolicy-2.5.12/policy/modules/services/mta.if	2007-04-11 17:07:34.000000000 -0400
@@ -3594,7 +3678,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.5.12/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2007-03-26 16:24:12.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/samba.te	2007-04-12 14:55:44.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/samba.te	2007-04-16 11:08:25.000000000 -0400
 @@ -28,10 +28,39 @@
  ## </desc>
  gen_tunable(samba_share_nfs,false)
@@ -3711,7 +3795,15 @@
  read_files_pattern(nmbd_t,samba_log_t,samba_log_t)
  create_files_pattern(nmbd_t,samba_log_t,samba_log_t)
  allow nmbd_t samba_log_t:dir setattr;
-@@ -457,6 +516,7 @@
+@@ -391,6 +450,7 @@
+ corenet_udp_bind_nmbd_port(nmbd_t)
+ corenet_sendrecv_nmbd_server_packets(nmbd_t)
+ corenet_sendrecv_nmbd_client_packets(nmbd_t)
++corenet_tcp_connect_smbd_port(nmbd_t)
+ 
+ dev_read_sysfs(nmbd_t)
+ dev_getattr_mtrr_dev(nmbd_t)
+@@ -457,6 +517,7 @@
  
  allow smbmount_t samba_secrets_t:file manage_file_perms;
  
@@ -3719,7 +3811,7 @@
  allow smbmount_t samba_var_t:dir rw_dir_perms;
  manage_files_pattern(smbmount_t,samba_var_t,samba_var_t)
  manage_lnk_files_pattern(smbmount_t,samba_var_t,samba_var_t)
-@@ -514,7 +574,7 @@
+@@ -514,7 +575,7 @@
  userdom_use_sysadm_ttys(smbmount_t)
  
  optional_policy(`
@@ -3728,7 +3820,7 @@
  ')
  
  optional_policy(`
-@@ -625,6 +685,8 @@
+@@ -625,6 +686,8 @@
  # Winbind local policy
  #
  
@@ -3737,7 +3829,7 @@
  dontaudit winbind_t self:capability sys_tty_config;
  allow winbind_t self:process signal_perms;
  allow winbind_t self:fifo_file { read write };
-@@ -634,6 +696,9 @@
+@@ -634,6 +697,9 @@
  allow winbind_t self:tcp_socket create_stream_socket_perms;
  allow winbind_t self:udp_socket create_socket_perms;
  
@@ -3747,7 +3839,7 @@
  allow winbind_t samba_etc_t:dir list_dir_perms;
  read_files_pattern(winbind_t,samba_etc_t,samba_etc_t)
  read_lnk_files_pattern(winbind_t,samba_etc_t,samba_etc_t)
-@@ -645,6 +710,7 @@
+@@ -645,6 +711,7 @@
  manage_files_pattern(winbind_t,samba_log_t,samba_log_t)
  manage_lnk_files_pattern(winbind_t,samba_log_t,samba_log_t)
  
@@ -3755,7 +3847,7 @@
  manage_files_pattern(winbind_t,samba_var_t,samba_var_t)
  manage_lnk_files_pattern(winbind_t,samba_var_t,samba_var_t)
  
-@@ -736,6 +802,7 @@
+@@ -736,6 +803,7 @@
  read_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t)
  read_lnk_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t)
  
@@ -3763,7 +3855,7 @@
  allow winbind_helper_t samba_var_t:dir search;
  
  stream_connect_pattern(winbind_helper_t,winbind_var_run_t,winbind_var_run_t,winbind_t)
-@@ -764,3 +831,14 @@
+@@ -764,3 +832,14 @@
  	squid_read_log(winbind_helper_t)
  	squid_append_log(winbind_helper_t)
  ')
@@ -4033,7 +4125,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-2.5.12/policy/modules/services/ssh.te
 --- nsaserefpolicy/policy/modules/services/ssh.te	2007-03-26 16:24:12.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/ssh.te	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/ssh.te	2007-04-13 07:08:39.000000000 -0400
 @@ -24,11 +24,11 @@
  
  # Type for the ssh-agent executable.
@@ -4056,6 +4148,22 @@
  ')
  
  tunable_policy(`ssh_sysadm_login',`
+@@ -122,6 +123,10 @@
+ 	rssh_read_all_users_ro_content(sshd_t)
+ ')
+ 
++optional_policy(`
++	usermanage_read_crack_db(sshd_t)
++')
++
+ ifdef(`TODO',`
+ tunable_policy(`ssh_sysadm_login',`
+ 	# Relabel and access ptys created by sshd
+@@ -252,3 +257,4 @@
+ optional_policy(`
+ 	udev_read_db(ssh_keygen_t)
+ ')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.fc serefpolicy-2.5.12/policy/modules/services/w3c.fc
 --- nsaserefpolicy/policy/modules/services/w3c.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.5.12/policy/modules/services/w3c.fc	2007-04-11 17:07:34.000000000 -0400
@@ -5211,8 +5319,17 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.5.12/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/sysnetwork.te	2007-04-11 17:07:34.000000000 -0400
-@@ -221,6 +221,7 @@
++++ serefpolicy-2.5.12/policy/modules/system/sysnetwork.te	2007-04-16 12:03:06.000000000 -0400
+@@ -164,6 +164,8 @@
+ 	dbus_connect_system_bus(dhcpc_t)
+ 	dbus_send_system_bus(dhcpc_t)
+ 
++	dbus_dontaudit_rw_system_selinux_socket(dhcpc_t)
++
+ 	optional_policy(`
+ 		networkmanager_dbus_chat(dhcpc_t)
+ 	')
+@@ -221,6 +223,7 @@
  optional_policy(`
  	seutil_sigchld_newrole(dhcpc_t)
  	seutil_dontaudit_search_config(dhcpc_t)
@@ -5222,8 +5339,20 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.5.12/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2007-04-11 15:52:54.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/udev.te	2007-04-11 17:07:34.000000000 -0400
-@@ -89,6 +89,7 @@
++++ serefpolicy-2.5.12/policy/modules/system/udev.te	2007-04-16 11:54:18.000000000 -0400
+@@ -83,12 +83,19 @@
+ kernel_dgram_send(udev_t)
+ kernel_signal(udev_t)
+ 
++#https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=235182
++kernel_read_net_sysctls(udev_t)
++kernel_read_network_state(udev_t)
++sysnet_read_dhcpc_pid(udev_t)
++sysnet_delete_dhcpc_pid(udev_t)
++
+ corecmd_exec_all_executables(udev_t)
+ 
+ dev_rw_sysfs(udev_t)
  dev_manage_all_dev_nodes(udev_t)
  dev_rw_generic_files(udev_t)
  dev_delete_generic_files(udev_t)
@@ -5231,7 +5360,7 @@
  
  domain_read_all_domains_state(udev_t)
  domain_dontaudit_ptrace_all_domains(udev_t) #pidof triggers these 
-@@ -194,5 +195,10 @@
+@@ -194,5 +201,10 @@
  ')
  
  optional_policy(`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -r1.432 -r1.433
--- selinux-policy.spec	12 Apr 2007 21:09:34 -0000	1.432
+++ selinux-policy.spec	16 Apr 2007 17:11:45 -0000	1.433
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.5.12
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -358,6 +358,9 @@
 %endif
 
 %changelog
+* Fri Apr 12 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-3
+- fixes for fusefs
+
 * Thu Apr 12 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-2
 - Fix samba_net to allow it to view samba_var_t
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 17:24:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 13:24:49 -0400
Subject: rpms/foomatic/devel foomatic.spec,1.153,1.154
Message-ID: <200704161724.l3GHOne6006564@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/foomatic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6496

Modified Files:
	foomatic.spec 
Log Message:
* Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com>
- Fixed %prep (bug #208851).
- Resolves: rhbz#208851



Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- foomatic.spec	16 Apr 2007 16:58:50 -0000	1.153
+++ foomatic.spec	16 Apr 2007 17:24:47 -0000	1.154
@@ -102,12 +102,17 @@
 pushd foomatic-db-%{dbver}
 %patch7 -p1 -b .ppdload-ppd
 
+cd db/source
+
 # For gutenprint printers, use gutenprint-ijs-simplified.5.0.
 perl -pi -e 's,>gutenprint<,>gutenprint-ijs-simplified.5.0<,' printer/*.xml
 
-# Remove references to foo2zjs and foo2oak (bug #208851).
-find printer -name '*.xml' |xargs grep -l '<driver>foo2'|xargs rm -f
-rm -f driver/foo2zjs.xml driver/foo2oak.xml opt/foo2zjs-* opt/foo2oak-*
+# Remove references to foo2zjs, foo2oak and foo2hp (bug #208851).
+for x in zjs oak hp
+do
+  find printer -name '*.xml' |xargs grep -l "<driver>foo2${x}"|xargs rm -f
+  rm -f driver/foo2${x}.xml opt/foo2${x}-*
+done
 # Same for m2300w/m2400w
 find printer -name '*.xml' |xargs grep -l '<driver>m2[34]00w<'|xargs rm -f
 rm -f driver/m2300w.xml driver/m2400w.xml opt/m2300w-*
@@ -242,6 +247,7 @@
 
 %changelog
 * Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com>
+- Fixed %%prep (bug #208851).
 - Removed now-unused with_omni code.
 
 * Fri Mar 30 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-46



From fedora-cvs-commits at redhat.com  Mon Apr 16 17:25:08 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 13:25:08 -0400
Subject: rpms/foomatic/devel foomatic.spec,1.154,1.155
Message-ID: <200704161725.l3GHP8RO006801@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/foomatic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6746

Modified Files:
	foomatic.spec 
Log Message:
3.0.2-47


Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- foomatic.spec	16 Apr 2007 17:24:47 -0000	1.154
+++ foomatic.spec	16 Apr 2007 17:25:06 -0000	1.155
@@ -6,7 +6,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    46%{?dist}
+Release:    47%{?dist}
 License:	GPL
 Group: System Environment/Libraries
 
@@ -246,7 +246,7 @@
 %{_var}/cache/foomatic
 
 %changelog
-* Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com>
+* Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-47
 - Fixed %%prep (bug #208851).
 - Removed now-unused with_omni code.
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 17:27:51 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 13:27:51 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.296,
	1.297 policycoreutils.spec, 1.397, 1.398
Message-ID: <200704161727.l3GHRp74008821@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Mon Apr 16 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-4
- Add -l flag to restorecon to not traverse file systems


policycoreutils-rhat.patch:
 Makefile                     |    2 +-
 audit2allow/Makefile         |    2 +-
 restorecon/restorecon.c      |   17 ++++++++++++-----
 restorecond/restorecond.c    |   12 +++++++-----
 restorecond/restorecond.conf |    3 +++
 restorecond/restorecond.init |    1 +
 scripts/chcat                |   17 ++++++++++-------
 scripts/fixfiles             |    2 +-
 scripts/genhomedircon        |    6 +++++-
 semanage/seobject.py         |   10 +++++++---
 10 files changed, 48 insertions(+), 24 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- policycoreutils-rhat.patch	9 Apr 2007 20:49:19 -0000	1.296
+++ policycoreutils-rhat.patch	16 Apr 2007 17:27:49 -0000	1.297
@@ -182,3 +182,55 @@
  
  		return ddict
  			
+--- policycoreutils-2.0.7/restorecon/restorecon.c.onefs	2007-04-02 14:35:37.000000000 -0400
++++ policycoreutils-2.0.7/restorecon/restorecon.c	2007-04-02 14:48:05.000000000 -0400
+@@ -16,6 +16,7 @@
+  * -v	Show changes in file labels.  
+  * -o	filename save list of files with incorrect context
+  * -F	Force reset of context to match file_context for customizable files
++ * -l   Limit directory tree walk to a single filesystem
+  *
+  * pathname...	The file(s) to label 
+  *
+@@ -50,6 +51,7 @@
+ static int recurse = 0;
+ static int file_exist = 1;
+ static int force = 0;
++static int onefs = 0;
+ #define STAT_BLOCK_SIZE 1
+ static int pipe_fds[2] = { -1, -1 };
+ static unsigned long long count = 0;
+@@ -326,13 +328,15 @@
+ 			rc = fork();
+ 		if (rc == 0) {
+ 			close(pipe_fds[0]);
+-			nftw(buf, pre_stat, 1024, FTW_PHYS);
++			nftw(buf, pre_stat, 1024, 
++                             FTW_PHYS | (onefs ? FTW_MOUNT : 0));
+ 			exit(1);
+ 		}
+ 		if (rc > 0)
+ 			close(pipe_fds[1]);
+ 		if (rc == -1 || rc > 0) {
+-			if (nftw(buf, apply_spec, 1024, FTW_PHYS)) {
++			if (nftw(buf, apply_spec, 1024, 
++                                 FTW_PHYS | (onefs ? FTW_MOUNT : 0))) {
+ 				if (!file_exist && errno == ENOENT)
+ 					return;
+ 				fprintf(stderr,
+@@ -367,11 +371,14 @@
+ 
+ 	set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
+ 
+-	while ((opt = getopt(argc, argv, "ipFrRnvf:o:e:")) > 0) {
++	while ((opt = getopt(argc, argv, "ipFrRnvfl:o:e:")) > 0) {
+ 		switch (opt) {
+ 		case 'n':
+ 			change = 0;
+ 			break;
++                case 'l':
++                    onefs = 1;
++                    break;
+ 		case 'i':
+ 			file_exist = 0;
+ 			break;


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -r1.397 -r1.398
--- policycoreutils.spec	15 Apr 2007 01:42:09 -0000	1.397
+++ policycoreutils.spec	16 Apr 2007 17:27:49 -0000	1.398
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 2.0.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Mon Apr 16 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-4
+- Add -l flag to restorecon to not traverse file systems
+
 * Sat Apr 14 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-3
 - Fixes for policygengui
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 17:28:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 13:28:32 -0400
Subject: rpms/foomatic/FC-6 foomatic.spec,1.149,1.150
Message-ID: <200704161728.l3GHSWp0009399@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/foomatic/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv9334

Modified Files:
	foomatic.spec 
Log Message:
* Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-39.5
- Fixed %prep (bug #208851).
- Resolves: rhbz#208851



Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/FC-6/foomatic.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- foomatic.spec	9 Jan 2007 12:23:10 -0000	1.149
+++ foomatic.spec	16 Apr 2007 17:28:30 -0000	1.150
@@ -8,7 +8,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    39.4%{?dist}
+Release:    39.5%{?dist}
 License:	GPL
 Group: System Environment/Libraries
 
@@ -130,12 +130,17 @@
       foomatic-3.0.2/foomatic-db-20061031/db/source/printer/$f.xml
   done
 
+cd db/source
+
 # For any remaining gutenprint printers, use gutenprint-ijs-simplified.5.0.
 perl -pi -e 's,>gutenprint<,>gutenprint-ijs-simplified.5.0<,' printer/*.xml
 
-# Remove references to foo2zjs and foo2oak (bug #208851).
-find printer -name '*.xml' |xargs grep -l '<driver>foo2'|xargs rm -f
-rm -f driver/foo2zjs.xml driver/foo2oak.xml opt/foo2zjs-* opt/foo2oak-*
+# Remove references to foo2zjs, foo2oak and foo2hp (bug #208851).
+for x in zjs oak hp
+do
+  find printer -name '*.xml' |xargs grep -l "<driver>foo2${x}"|xargs rm -f
+  rm -f driver/foo2${x}.xml opt/foo2${x}-*
+done
 # Same for m2300w/m2400w
 find printer -name '*.xml' |xargs grep -l '<driver>m2[34]00w<'|xargs rm -f
 rm -f driver/m2300w.xml driver/m2400w.xml opt/m2300w-*
@@ -282,6 +287,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-39.5
+- Fixed %%prep (bug #208851).
+
 * Tue Jan  9 2007 Tim Waugh <twaugh at redhat.com> 3.0.2-39.4
 - Removed m2300w files (bug #203381).
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 17:29:03 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 13:29:03 -0400
Subject: rpms/selinux-policy/devel policy-20070219.patch,1.47,1.48
Message-ID: <200704161729.l3GHT3cs009821@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20070219.patch 
Log Message:
* Fri Apr 12 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-3
- fixes for fusefs


policy-20070219.patch:
 Rules.modular                           |   12 +
 policy/flask/access_vectors             |    4 
 policy/global_booleans                  |    2 
 policy/global_tunables                  |    7 
 policy/mls                              |   31 ++-
 policy/modules/admin/acct.te            |    1 
 policy/modules/admin/amtu.fc            |    3 
 policy/modules/admin/amtu.if            |   53 ++++++
 policy/modules/admin/amtu.te            |   56 ++++++
 policy/modules/admin/bootloader.te      |    3 
 policy/modules/admin/consoletype.te     |   10 -
 policy/modules/admin/dmesg.te           |    1 
 policy/modules/admin/kudzu.te           |    6 
 policy/modules/admin/logwatch.te        |    4 
 policy/modules/admin/netutils.te        |    6 
 policy/modules/admin/rpm.fc             |    3 
 policy/modules/admin/rpm.if             |   85 +++++++---
 policy/modules/admin/rpm.te             |    2 
 policy/modules/admin/su.if              |    4 
 policy/modules/admin/usermanage.if      |    2 
 policy/modules/admin/usermanage.te      |   26 +++
 policy/modules/apps/gnome.if            |   26 ++-
 policy/modules/apps/gpg.fc              |    2 
 policy/modules/apps/loadkeys.if         |   44 +----
 policy/modules/apps/mozilla.if          |    1 
 policy/modules/apps/slocate.te          |    5 
 policy/modules/apps/uml.if              |   27 ---
 policy/modules/kernel/corecommands.fc   |    5 
 policy/modules/kernel/corecommands.if   |   20 ++
 policy/modules/kernel/corenetwork.te.in |   14 +
 policy/modules/kernel/devices.if        |   36 ++++
 policy/modules/kernel/domain.if         |   18 ++
 policy/modules/kernel/domain.te         |   46 +++++
 policy/modules/kernel/files.fc          |    1 
 policy/modules/kernel/files.if          |   83 ++++++++-
 policy/modules/kernel/filesystem.if     |   39 ++++
 policy/modules/kernel/filesystem.te     |   13 +
 policy/modules/kernel/kernel.if         |   23 ++
 policy/modules/kernel/kernel.te         |    2 
 policy/modules/kernel/mls.if            |   20 ++
 policy/modules/kernel/mls.te            |    3 
 policy/modules/kernel/selinux.if        |   38 ++++
 policy/modules/kernel/storage.if        |    2 
 policy/modules/kernel/terminal.if       |    2 
 policy/modules/kernel/terminal.te       |    1 
 policy/modules/services/amavis.te       |    3 
 policy/modules/services/apache.fc       |   14 -
 policy/modules/services/apache.if       |  171 +++++++++++++++++++-
 policy/modules/services/apache.te       |   72 ++++++++
 policy/modules/services/apcupsd.fc      |    9 +
 policy/modules/services/apcupsd.if      |  108 ++++++++++++
 policy/modules/services/apcupsd.te      |   91 ++++++++++
 policy/modules/services/automount.te    |    2 
 policy/modules/services/avahi.if        |   19 ++
 policy/modules/services/bluetooth.te    |    2 
 policy/modules/services/consolekit.te   |   13 +
 policy/modules/services/cron.fc         |    1 
 policy/modules/services/cron.if         |   33 +--
 policy/modules/services/cron.te         |   43 ++++-
 policy/modules/services/cups.te         |    6 
 policy/modules/services/cvs.te          |    1 
 policy/modules/services/cyrus.te        |    1 
 policy/modules/services/dbus.if         |   63 +++++++
 policy/modules/services/dhcp.te         |    2 
 policy/modules/services/djbdns.te       |    5 
 policy/modules/services/dovecot.te      |    5 
 policy/modules/services/ftp.te          |    5 
 policy/modules/services/hal.fc          |    8 
 policy/modules/services/hal.if          |   39 ++++
 policy/modules/services/hal.te          |  143 ++++++++++++++++-
 policy/modules/services/inetd.te        |    5 
 policy/modules/services/kerberos.if     |   79 ++-------
 policy/modules/services/kerberos.te     |   36 ++++
 policy/modules/services/mailman.if      |   19 ++
 policy/modules/services/mta.if          |   19 ++
 policy/modules/services/mta.te          |    2 
 policy/modules/services/nis.if          |    4 
 policy/modules/services/nis.te          |    4 
 policy/modules/services/nscd.te         |   10 +
 policy/modules/services/ntp.te          |    4 
 policy/modules/services/pegasus.if      |   18 ++
 policy/modules/services/pegasus.te      |    6 
 policy/modules/services/postfix.if      |    1 
 policy/modules/services/postfix.te      |    8 
 policy/modules/services/procmail.te     |    1 
 policy/modules/services/pyzor.te        |    7 
 policy/modules/services/radius.te       |    4 
 policy/modules/services/rpc.if          |    5 
 policy/modules/services/rsync.te        |    1 
 policy/modules/services/samba.fc        |    3 
 policy/modules/services/samba.if        |   86 ++++++++++
 policy/modules/services/samba.te        |   83 +++++++++
 policy/modules/services/sendmail.if     |   22 ++
 policy/modules/services/smartmon.te     |    1 
 policy/modules/services/snmp.te         |   15 +
 policy/modules/services/spamassassin.te |    7 
 policy/modules/services/squid.fc        |    2 
 policy/modules/services/squid.if        |   22 ++
 policy/modules/services/squid.te        |   12 +
 policy/modules/services/ssh.if          |   39 ++++
 policy/modules/services/ssh.te          |   10 -
 policy/modules/services/w3c.fc          |    2 
 policy/modules/services/w3c.if          |    1 
 policy/modules/services/w3c.te          |   14 +
 policy/modules/system/application.fc    |    1 
 policy/modules/system/application.if    |  104 ++++++++++++
 policy/modules/system/application.te    |   14 +
 policy/modules/system/authlogin.if      |   83 ++++++++-
 policy/modules/system/authlogin.te      |    3 
 policy/modules/system/fstools.fc        |    1 
 policy/modules/system/fstools.te        |    1 
 policy/modules/system/fusermount.fc     |    6 
 policy/modules/system/fusermount.if     |   41 ++++
 policy/modules/system/fusermount.te     |   45 +++++
 policy/modules/system/getty.te          |    3 
 policy/modules/system/hostname.te       |   14 +
 policy/modules/system/init.if           |   42 ++++
 policy/modules/system/init.te           |   35 +++-
 policy/modules/system/ipsec.if          |   20 ++
 policy/modules/system/iptables.te       |    4 
 policy/modules/system/libraries.fc      |    2 
 policy/modules/system/locallogin.te     |    7 
 policy/modules/system/logging.if        |   21 ++
 policy/modules/system/logging.te        |    2 
 policy/modules/system/lvm.te            |    6 
 policy/modules/system/modutils.te       |    6 
 policy/modules/system/mount.fc          |    3 
 policy/modules/system/mount.if          |   37 ++++
 policy/modules/system/mount.te          |   64 +++++++
 policy/modules/system/raid.te           |    1 
 policy/modules/system/selinuxutil.fc    |    1 
 policy/modules/system/selinuxutil.if    |    5 
 policy/modules/system/selinuxutil.te    |   52 +++---
 policy/modules/system/sysnetwork.te     |    3 
 policy/modules/system/udev.te           |   12 +
 policy/modules/system/unconfined.fc     |    1 
 policy/modules/system/unconfined.if     |   10 -
 policy/modules/system/unconfined.te     |   24 ++
 policy/modules/system/userdomain.if     |  269 +++++++++++++++++++-------------
 policy/modules/system/userdomain.te     |   46 ++++-
 policy/modules/system/xen.te            |   35 ++++
 policy/support/obj_perm_sets.spt        |   12 +
 142 files changed, 2805 insertions(+), 434 deletions(-)

Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- policy-20070219.patch	16 Apr 2007 17:11:45 -0000	1.47
+++ policy-20070219.patch	16 Apr 2007 17:29:00 -0000	1.48
@@ -2557,13 +2557,7 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.5.12/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/dbus.if	2007-04-16 12:03:35.000000000 -0400
-@@ -1,4 +1,4 @@
--## <summary>Desktop messaging bus</summary>
-+# <summary>Desktop messaging bus</summary>
- 
- ########################################
- ## <summary>
++++ serefpolicy-2.5.12/policy/modules/services/dbus.if	2007-04-16 13:19:22.000000000 -0400
 @@ -49,6 +49,12 @@
  ## </param>
  #



From fedora-cvs-commits at redhat.com  Mon Apr 16 17:31:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 13:31:23 -0400
Subject: rpms/xorg-x11-server/devel int10-debug.patch,NONE,1.1
Message-ID: <200704161731.l3GHVNGH011556@cvs.devel.redhat.com>

Author: ajackson

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

Added Files:
	int10-debug.patch 
Log Message:
Add an int10 debugging patch so that I don't lose it.  Not applied by default.


int10-debug.patch:
 int10/Makefile.am   |    2 +-
 int10/helper_exec.c |   17 +++++++++++++++++
 int10/xf86x86emu.c  |    9 +++++++++
 x86emu/Makefile.am  |    2 +-
 x86emu/debug.c      |    2 ++
 5 files changed, 30 insertions(+), 2 deletions(-)

--- NEW FILE int10-debug.patch ---
--- ./hw/xfree86/int10/xf86x86emu.c.jx	2007-03-03 18:31:18.000000000 -0500
+++ ./hw/xfree86/int10/xf86x86emu.c	2007-03-03 20:12:11.000000000 -0500
@@ -32,14 +32,23 @@
 xf86ExecX86int10(xf86Int10InfoPtr pInt)
 {
     int sig = setup_int(pInt);
+    int thing = 0;
 
     if (sig < 0)
 	return;
 
+    if (pInt->ax == 0x4f02) {
+	M.x86.debug = DEBUG_IO_TRACE_F; /* | DEBUG_MEM_TRACE_F; */
+	thing = 1;
+    }
+
     if (int_handler(pInt)) {
 	X86EMU_exec();
     }
 
+    if (thing)
+	M.x86.debug = 0;
+
     finish_int(pInt, sig);
 }
 
--- ./hw/xfree86/int10/helper_exec.c.jx	2007-03-03 18:31:18.000000000 -0500
+++ ./hw/xfree86/int10/helper_exec.c	2007-03-03 23:47:19.000000000 -0500
@@ -14,6 +14,8 @@
  * on PIO.
  */
 
+#define PRINT_PORT
+
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
@@ -27,6 +29,7 @@
 #define _INT10_PRIVATE
 #include "int10Defines.h"
 #include "xf86int10.h"
+#include "x86emu/x86emui.h"
 
 static int pciCfg1in(CARD16 addr, CARD32 *val);
 static int pciCfg1out(CARD16 addr, CARD32 val);
@@ -210,6 +213,7 @@
     register int inc = d_f ? -1 : 1;
     CARD32 dst = base;
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
     ErrorF(" rep_insb(%#x) %d bytes at %p %s\n",
 	     port, count, base, d_f ? "up" : "down");
 #endif
@@ -227,6 +231,7 @@
     register int inc = d_f ? -2 : 2;
     CARD32 dst = base;
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
     ErrorF(" rep_insw(%#x) %d bytes at %p %s\n",
 	     port, count, base, d_f ? "up" : "down");
 #endif
@@ -244,6 +249,7 @@
     register int inc = d_f ? -4 : 4;
     CARD32 dst = base;
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
     ErrorF(" rep_insl(%#x) %d bytes at %p %s\n",
 	     port, count, base, d_f ? "up" : "down");
 #endif
@@ -261,6 +267,7 @@
     register int inc = d_f ? -1 : 1;
     CARD32 dst = base;
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
     ErrorF(" rep_outb(%#x) %d bytes at %p %s\n",
 	     port, count, base, d_f ? "up" : "down");
 #endif
@@ -278,6 +285,7 @@
     register int inc = d_f ? -2 : 2;
     CARD32 dst = base;
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
     ErrorF(" rep_outw(%#x) %d bytes at %p %s\n",
 	     port, count, base, d_f ? "up" : "down");
 #endif
@@ -295,6 +303,7 @@
     register int inc = d_f ? -4 : 4;
     CARD32 dst = base;
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
     ErrorF(" rep_outl(%#x) %d bytes at %p %s\n",
 	     port, count, base, d_f ? "up" : "down");
 #endif
@@ -315,6 +324,7 @@
 	val = (CARD8)(Int10Current->inb40time >>
 		      ((Int10Current->inb40time & 1) << 3));
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
 	ErrorF(" inb(%#x) = %2.2x\n", port, val);
 #endif
 #ifdef __NOT_YET__
@@ -331,6 +341,7 @@
 	if (!pciCfg1inb(port, &val))
 	    val = inb(Int10Current->ioBase + port);
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
 	ErrorF(" inb(%#x) = %2.2x\n", port, val);
 #endif
     }
@@ -356,6 +367,7 @@
 	    val = inw(Int10Current->ioBase + port);
     }
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
     ErrorF(" inw(%#x) = %4.4x\n", port, val);
 #endif
     return val;
@@ -375,6 +387,7 @@
 	X_GETTIMEOFDAY(&tv);
 	Int10Current->inb40time = (CARD16)(tv.tv_usec | 1);
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
 	ErrorF(" outb(%#x, %2.2x)\n", port, val);
 #endif
 #ifdef __NOT_YET__
@@ -388,6 +401,7 @@
 #endif /* __NOT_YET__ */
     } else {
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
 	ErrorF(" outb(%#x, %2.2x)\n", port, val);
 #endif
 	if (!pciCfg1outb(port, val))
@@ -399,6 +413,7 @@
 x_outw(CARD16 port, CARD16 val)
 {
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
     ErrorF(" outw(%#x, %4.4x)\n", port, val);
 #endif
 
@@ -415,6 +430,7 @@
 	val = inl(Int10Current->ioBase + port);
 
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
     ErrorF(" inl(%#x) = %8.8x\n", port, val);
 #endif
     return val;
@@ -424,6 +440,7 @@
 x_outl(CARD16 port, CARD32 val)
 {
 #ifdef PRINT_PORT
+    if (DEBUG_IO_TRACE())
     ErrorF(" outl(%#x, %8.8x)\n", port, val);
 #endif
 
--- ./hw/xfree86/int10/Makefile.am.jx	2007-01-22 22:13:15.000000000 -0500
+++ ./hw/xfree86/int10/Makefile.am	2007-03-03 18:27:47.000000000 -0500
@@ -28,7 +28,7 @@
 
 if INT10_X86EMU
 AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_X86EMU -DNO_SYS_HEADERS \
-           $(XORG_CFLAGS) $(EXTRA_CFLAGS)
+           $(XORG_CFLAGS) $(EXTRA_CFLAGS) -DDEBUG
 INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu
 libint10_la_SOURCES = \
 	$(COMMON_SOURCES) \
--- ./hw/xfree86/x86emu/debug.c.jx	2007-01-22 22:13:15.000000000 -0500
+++ ./hw/xfree86/x86emu/debug.c	2007-03-03 18:33:10.000000000 -0500
@@ -38,6 +38,8 @@
 ****************************************************************************/
 
 #include "x86emu/x86emui.h"
+#include <stdio.h>
+#include <string.h>
 #ifndef NO_SYS_HEADERS
 #include <stdarg.h>
 #include <stdlib.h>
--- ./hw/xfree86/x86emu/Makefile.am.jx	2007-01-22 22:13:15.000000000 -0500
+++ ./hw/xfree86/x86emu/Makefile.am	2007-03-03 18:04:05.000000000 -0500
@@ -11,7 +11,7 @@
 
 INCLUDES = 
 
-AM_CFLAGS = $(XORG_CFLAGS)
+AM_CFLAGS = $(XORG_CFLAGS) -DDEBUG
 
 EXTRA_DIST = validate.c \
              x86emu/debug.h \



From fedora-cvs-commits at redhat.com  Mon Apr 16 17:55:10 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 13:55:10 -0400
Subject: rpms/foomatic/FC-6 foomatic.spec,1.150,1.151
Message-ID: <200704161755.l3GHtAY9011112@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/foomatic/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv11098

Modified Files:
	foomatic.spec 
Log Message:
Fixed thinko.


Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/FC-6/foomatic.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- foomatic.spec	16 Apr 2007 17:28:30 -0000	1.150
+++ foomatic.spec	16 Apr 2007 17:55:08 -0000	1.151
@@ -123,15 +123,11 @@
 
 # Recommend gimp-print-ijs instead of gutenprint for each printer that
 # gimp-print-ijs can actually drive.
-sed -ne 's,^.*<id>printer/\(.*\)</id>.*$,\1,p' \
-  foomatic-3.0.2/foomatic-db-20061031/db/source/driver/gimp-print-ijs.xml |\
+sed -ne 's,^.*<id>printer/\(.*\)</id>.*$,\1,p' driver/gimp-print-ijs.xml |\
   while read f; do
-    perl -pi -e 's,>gutenprint<,>gimp-print-ijs<,' \
-      foomatic-3.0.2/foomatic-db-20061031/db/source/printer/$f.xml
+    perl -pi -e 's,>gutenprint<,>gimp-print-ijs<,' printer/$f.xml
   done
 
-cd db/source
-
 # For any remaining gutenprint printers, use gutenprint-ijs-simplified.5.0.
 perl -pi -e 's,>gutenprint<,>gutenprint-ijs-simplified.5.0<,' printer/*.xml
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 18:04:15 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 14:04:15 -0400
Subject: rpms/policycoreutils/FC-6 policycoreutils-gui.patch, NONE,
	1.1 policycoreutils-rhat.patch, 1.252,
	1.253 policycoreutils.spec, 1.331, 1.332
Message-ID: <200704161804.l3GI4FDc011469@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Added Files:
	policycoreutils-gui.patch 
Log Message:
* Mon Apr 16 2007 Dan Walsh <dwalsh at redhat.com> 1.34.1-6
- Add sepolgen/gui


policycoreutils-gui.patch:
 Makefile                    |   34 
 booleansPage.py             |  224 +++
 fcontextPage.py             |  207 +++
 loginsPage.py               |  173 ++
 mappingsPage.py             |   54 
 modulesPage.py              |  172 ++
 polgen.glade                | 1127 ++++++++++++++++
 polgen.py                   |  440 ++++++
 polgengui.py                |  211 +++
 portsPage.py                |  227 +++
 selinux.tbl                 |  274 +++
 semanagePage.py             |  115 +
 statusPage.py               |  220 +++
 system-config-selinux.glade | 3034 ++++++++++++++++++++++++++++++++++++++++++++
 system-config-selinux.py    |  169 ++
 templates/__init__.py       |   18 
 templates/executable.py     |  156 ++
 templates/network.py        |   46 
 templates/rw.py             |  106 +
 templates/script.py         |   42 
 templates/semodule.py       |   41 
 templates/tmp.py            |   74 +
 templates/var_lib.py        |  107 +
 templates/var_log.py        |   91 +
 templates/var_run.py        |   93 +
 templates/var_spool.py      |  107 +
 translationsPage.py         |  111 +
 usersPage.py                |  166 ++
 28 files changed, 7839 insertions(+)

--- NEW FILE policycoreutils-gui.patch ---
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.9/gui/booleansPage.py
--- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.9/gui/booleansPage.py	2007-04-14 18:20:06.000000000 -0400
@@ -0,0 +1,224 @@
+#
+# booleansPage.py - GUI for Booleans page in system-config-securitylevel
+#
+# Brent Fox <bfox at redhat.com>
+# Dan Walsh <dwalsh at redhat.com>
+#
+# Copyright 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
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+import string
+import gtk
+import gtk.glade
+import os
+import libxml2
+import gobject
+import sys
+import tempfile
+
+INSTALLPATH='/usr/share/system-config-selinux'
+sys.path.append(INSTALLPATH)
+
+import commands
+ENFORCING=0
+PERMISSIVE=1
+DISABLED=2
+
+##
+## I18N
+## 
+PROGNAME="system-config-selinux"
+
+import gettext
+gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
+gettext.textdomain(PROGNAME)
+try:
+    gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1)
+except IOError:
+    import __builtin__
+    __builtin__.__dict__['_'] = unicode
+
+from glob import fnmatch
+
+class Translation:
+    def __init__(self):
+        self.translation={}
+        fd=open(INSTALLPATH + "/selinux.tbl","r")
+        lines=fd.readlines()
+        fd.close()
+        for i in lines:
+            try:
+                line=i.strip().split("_(\"")
+                key=line[0].strip()
+                category=line[1].split("\"")[0]
+                value=line[2].split("\"")[0]
+                self.translation[key]=(category,value)
+            except:
+                continue
+
+    def match(self,key, filter=""):
+        try:
+            f=filter.lower()
+            val=self.get_value(key).lower()
+            k=key.lower()
+            return val.find(f) >= 0 or k.find(f) >= 0
+        except:
+            return False
+
+    def get_category(self,key):
+        try:
+            return _(self.translation[key][0])
+        except:
+            return _("Other")
+
+    def get_value(self,key):
+        try:
+            return _(self.translation[key][1])
+        except:
+            return key
+
+class Modifier:
+    def __init__(self,name, on, save):
+        self.on=on
+        self.name=name
+        self.save=save
+
+    def set(self,value):
+        self.on=value
+        self.save=True
+
+    def isOn(self):
+        return self.on
+
+class Boolean(Modifier):
+    def __init__(self,name, val, save=False):
+        Modifier.__init__(self,name, val, save)
+
+class Modifiers:
+    def __init__(self,store):
+        self.modifiers={}
+        self.translation=Translation()
+        self.store=store
+        self.store.clear()
+
+    def add(self,name,val):
+        if name == "targeted_policy":
+            return
+        category=self.translation.get_category(name)
+        if not self.modifiers.has_key(category):
+            self.modifiers[category]={}
+            iter=self.store.append(None)
+            self.modifiers[category]["iter"] = iter
+            self.store.set_value(iter, 1, category)
+            self.store.set_value(iter, 3, False)
+
+        self.modifiers[category][name]=val;
+        iter=self.store.append(self.modifiers[category]["iter"])
+        self.store.set_value(iter, 0, val.isOn())
+        self.store.set_value(iter, 1, self.translation.get_value(name))
+        self.store.set_value(iter, 2, name)
+        self.store.set_value(iter, 3, True)
+
+    def set(self,name,val):
+        category=self.translation.get_category(name)
+        self.modifiers[category][name].set(val)
+
+    def isBoolean(self,name):
+        c=self.translation.get_category(name)
+        return isinstance(self.modifiers[c][name], Boolean)
+
+    def get_booleans(self):
+        booleans={}
+        for c in self.modifiers.keys():
+            for n in self.modifiers[c].keys():
+                if isinstance(self.modifiers[c][n], Boolean):
+                    booleans[n]=self.modifiers[c][n]
+        return booleans
+
+class booleansPage:
+    def __init__(self, xml, doDebug=None):
+        self.xml = xml
+        self.types=[]
+        self.selinuxsupport = True
+        self.translation = Translation()
+        self.typechanged = False
+        self.doDebug = doDebug
+
+        # Bring in widgets from glade file.
+        self.typeHBox = xml.get_widget("typeHBox")
+        self.booleanSW = xml.get_widget("booleanSW")
+        self.booleansFilter = xml.get_widget("booleansFilter")
+        self.booleansFilter.connect("focus_out_event", self.filter_changed)
+        self.booleansFilter.connect("activate", self.filter_changed)
+        
+        self.booleansView = xml.get_widget("booleansView")
+        self.typeLabel = xml.get_widget("typeLabel")
+        self.modifySeparator = xml.get_widget("modifySeparator")
+
+        listStore = gtk.ListStore(gobject.TYPE_STRING)
+        cell = gtk.CellRendererText()
+
+        self.booleansStore = gtk.TreeStore(gobject.TYPE_BOOLEAN, gobject.TYPE_STRING, gobject.TYPE_PYOBJECT, gobject.TYPE_BOOLEAN)
+        self.booleansStore.set_sort_column_id(1, gtk.SORT_ASCENDING)        
+        self.booleansView.set_model(self.booleansStore)
+
+        checkbox = gtk.CellRendererToggle()
+        checkbox.connect("toggled", self.boolean_toggled)
+        col = gtk.TreeViewColumn('', checkbox, active = 0,visible=3)
+        col.set_fixed_width(20)
+        col.set_clickable(True)
+        self.booleansView.append_column(col)
+
+        col = gtk.TreeViewColumn("", gtk.CellRendererText(), text=1)
+        self.booleansView.append_column(col)
+        self.filter=""
+        self.refreshBooleans(self.filter)
+            
+    def filter_changed(self, *arg):
+        filter =  arg[0].get_text()
+        if filter != self.filter:
+            self.refreshBooleans(filter)
+            self.filter=filter
+        
+    def use_menus(self):
[...7552 lines suppressed...]
+    def dialogClear(self):
+        self.translationsLevelEntry.set_text("")
+        self.translationsLevelEntry.set_sensitive(True)
+        self.translationsEntry.set_text("")
+        
+    def delete(self):
+        store, iter = self.view.get_selection().get_selected()
+        try:
+            level = store.get_value(iter, 0)
+            self.translation.delete(level)
+            store.remove(iter)
+            self.view.get_selection().select_path ((0,))
+        except ValueError, e:
+            self.error(e.args[0])
+
+    def add(self):
+        level = self.translationsLevelEntry.get_text().strip()
+        translation = self.translationsEntry.get_text().strip()
+        self.translation.add(level, translation)
+        iter = self.store.append()
+        self.store.set_value(iter, 0, level)
+        self.store.set_value(iter, 1, translation)
+        
+    def modify(self):
+        level = self.translationsLevelEntry.get_text().strip()
+        translation = self.translationsEntry.get_text().strip()
+        self.translation.modify(level, translation)
+        store, iter = self.view.get_selection().get_selected()
+        self.store.set_value(iter, 0, level)
+        self.store.set_value(iter, 1, translation)
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.9/gui/usersPage.py
--- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.9/gui/usersPage.py	2007-04-14 18:20:06.000000000 -0400
@@ -0,0 +1,166 @@
+## usersPage.py - show selinux mappings
+## 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.
+
+## Author: Dan Walsh
+import string
+import gtk
+import gtk.glade
+import os
+import libxml2
+import gobject
+import sys
+import commands
+import seobject
+from semanagePage import *;
+
+##
+## I18N
+## 
+PROGNAME="policycoreutils"
+import gettext
+gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
+gettext.textdomain(PROGNAME)
+try:
+    gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1)
+except IOError:
+    import __builtin__
+    __builtin__.__dict__['_'] = unicode
+
+class usersPage(semanagePage):
+    def __init__(self, xml):
+        semanagePage.__init__(self, xml, "users", "SELinux User")
+        self.store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING)
+        self.view.set_model(self.store)
+        self.store.set_sort_column_id(0, gtk.SORT_ASCENDING)        
+
+        col = gtk.TreeViewColumn(_("SELinux\nUser"), gtk.CellRendererText(), text = 0)
+        col.set_sort_column_id(0)
+        col.set_resizable(True)
+        self.view.append_column(col)
+
+        col = gtk.TreeViewColumn(_("Labeling\nPrefix"), gtk.CellRendererText(), text = 1)
+        col.set_resizable(True)
+        self.view.append_column(col)
+        col = gtk.TreeViewColumn(_("MLS/\nMCS Level"), gtk.CellRendererText(), text = 2)
+        col.set_resizable(True)
+        self.view.append_column(col)
+        col = gtk.TreeViewColumn(_("MLS/\nMCS Range"), gtk.CellRendererText(), text = 3)
+        col.set_resizable(True)
+        self.view.append_column(col)
+
+        col = gtk.TreeViewColumn(_("SELinux Roles"), gtk.CellRendererText(), text = 4)
+        col.set_resizable(True)
+        self.view.append_column(col)
+
+        self.load()
+        self.selinuxUserEntry = xml.get_widget("selinuxUserEntry")
+        self.labelPrefixEntry = xml.get_widget("labelPrefixEntry")
+        self.mlsLevelEntry = xml.get_widget("mlsLevelEntry")
+        self.mlsRangeEntry = xml.get_widget("mlsRangeEntry")
+        self.selinuxRolesEntry = xml.get_widget("selinuxRolesEntry")
+
+    def load(self):
+        self.user = seobject.seluserRecords()
+        dict = self.user.get_all()
+        keys = dict.keys()
+        keys.sort()
+        self.store.clear()
+        for k in keys:
+            iter = self.store.append()
+            self.store.set_value(iter, 0, k)
+            self.store.set_value(iter, 1, dict[k][0])
+            self.store.set_value(iter, 2, seobject.translate(dict[k][1]))
+            self.store.set_value(iter, 3, seobject.translate(dict[k][2]))
+            self.store.set_value(iter, 4, dict[k][3])
+        self.view.get_selection().select_path ((0,))
+
+    def delete(self):
+        if semanagePage.delete(self) == gtk.RESPONSE_NO:
+                return None
+
+    def dialogInit(self):
+        store, iter = self.view.get_selection().get_selected()
+        self.selinuxUserEntry.set_text(store.get_value(iter, 0))
+        self.selinuxUserEntry.set_sensitive(False)
+        self.labelPrefixEntry.set_text(store.get_value(iter, 1))
+        self.mlsLevelEntry.set_text(store.get_value(iter, 2))
+        self.mlsRangeEntry.set_text(store.get_value(iter, 3))
+        self.selinuxRolesEntry.set_text(store.get_value(iter, 4))
+        protocol=store.get_value(iter, 2)
+        
+    def dialogClear(self):
+        self.selinuxUserEntry.set_text("")
+        self.selinuxUserEntry.set_sensitive(True)
+        self.labelPrefixEntry.set_text("")
+        self.mlsLevelEntry.set_text("s0")
+        self.mlsRangeEntry.set_text("s0")
+        self.selinuxRolesEntry.set_text("")
+        
+    def add(self):
+        user = self.selinuxUserEntry.get_text()
+        prefix = self.labelPrefixEntry.get_text()
+        level = self.mlsLevelEntry.get_text()
+        range = self.mlsRangeEntry.get_text()
+        roles = self.selinuxRolesEntry.get_text()
+
+        (rc, out) = commands.getstatusoutput("semanage user -a -R '%s' -r %s-%s -P %s %s" %  (roles, level, range, prefix, user))
+        if rc != 0:
+            self.error(out)
+            return False
+        iter = self.store.append()
+        self.store.set_value(iter, 0, user)
+        self.store.set_value(iter, 1, prefix)
+        self.store.set_value(iter, 2, level)
+        self.store.set_value(iter, 3, range)
+        self.store.set_value(iter, 4, roles)
+        
+    def modify(self):
+        user = self.selinuxUserEntry.get_text()
+        prefix = self.labelPrefixEntry.get_text()
+        level = self.mlsLevelEntry.get_text()
+        range = self.mlsRangeEntry.get_text()
+        roles = self.selinuxRolesEntry.get_text()
+
+        (rc, out) = commands.getstatusoutput("semanage user -m -R '%s' -r %s-%s -P %s %s" %  (roles, level, range, prefix, user))
+
+        if rc != 0:
+            self.error(out)
+            return False
+        store, iter = self.view.get_selection().get_selected()
+        iter = self.store.append()
+        self.store.set_value(iter, 0, user)
+        self.store.set_value(iter, 1, prefix)
+        self.store.set_value(iter, 2, level)
+        self.store.set_value(iter, 3, range)
+        self.store.set_value(iter, 4, roles)
+
+    def delete(self):
+        store, iter = self.view.get_selection().get_selected()
+        try:
+            user=store.get_value(iter, 0)
+            if user == "root" or user == "user_u":
+                raise ValueError(_("SELinux user '%s' is required") % user)
+                
+            (rc, out) = commands.getstatusoutput("semanage user -d %s" %  user)
+            if rc != 0:
+                self.error(out)
+                return False
+            store.remove(iter)
+            self.view.get_selection().select_path ((0,))
+        except ValueError, e:
+            self.error(e.args[0])
+

policycoreutils-rhat.patch:
 policycoreutils-1.34.1/Makefile                     |    2 
 policycoreutils-1.34.1/audit2allow/audit2allow      |    6 +-
 policycoreutils-1.34.1/restorecon/restorecon.c      |    4 -
 policycoreutils-1.34.1/restorecond/restorecond.c    |   12 +++--
 policycoreutils-1.34.1/restorecond/restorecond.init |   43 ++++++++++++++++----
 policycoreutils-1.34.1/scripts/chcat                |   36 +++++++++++++---
 policycoreutils-1.34.1/scripts/fixfiles.8           |    2 
 policycoreutils-1.34.1/semanage/seobject.py         |   10 +++-
 restorecond/restorecond.conf                        |    3 +
 9 files changed, 88 insertions(+), 30 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.252 -r 1.253 policycoreutils-rhat.patch
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-6/policycoreutils-rhat.patch,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- policycoreutils-rhat.patch	22 Mar 2007 21:37:14 -0000	1.252
+++ policycoreutils-rhat.patch	16 Apr 2007 18:04:13 -0000	1.253
@@ -1,4888 +1,5 @@
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.34.1/audit2allow/audit2allow
---- nsapolicycoreutils/audit2allow/audit2allow	2007-01-24 10:04:01.000000000 -0500
-+++ policycoreutils-1.34.1/audit2allow/audit2allow	2007-03-22 17:11:28.000000000 -0400
-@@ -32,8 +32,10 @@
- 	import re
-         try:
-                 gettext.install('policycoreutils')
--        except:
--                pass
-+	except IOError:
-+		import __builtin__
-+		__builtin__.__dict__['_'] = unicode
-+
- 	def get_mls_flag():
- 		if selinux.is_selinux_mls_enabled():
- 			return "-M"
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.34.1/gui/booleansPage.py
---- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.34.1/gui/booleansPage.py	2007-03-22 17:11:28.000000000 -0400
-@@ -0,0 +1,199 @@
-+#
-+# booleansPage.py - GUI for Booleans page in system-config-securitylevel
-+#
-+# Brent Fox <bfox at redhat.com>
-+# Dan Walsh <dwalsh at redhat.com>
-+#
-+# Copyright 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
-+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+#
-+import string
-+import gtk
-+import gtk.glade
-+import os
-+import libxml2
-+import gobject
-+import sys
-+import tempfile
-+
-+INSTALLPATH='/usr/share/system-config-selinux'
-+sys.path.append(INSTALLPATH)
-+
-+from Conf import *
-+import commands
-+ENFORCING=0
-+PERMISSIVE=1
-+DISABLED=2
-+
-+##
-+## I18N
-+## 
-+PROGNAME="system-config-selinux"
-+
-+import gettext
-+gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
-+gettext.textdomain(PROGNAME)
-+try:
-+    gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1)
-+except IOError:
-+    import __builtin__
-+    __builtin__.__dict__['_'] = unicode
-+
-+class Translation:
-+    def __init__(self):
-+        self.translation={}
-+        fd=open(INSTALLPATH + "/selinux.tbl","r")
-+        lines=fd.readlines()
-+        fd.close()
-+        for i in lines:
-+            try:
-+                line=i.strip().split("_(\"")
-+                key=line[0].strip()
-+                category=line[1].split("\"")[0]
-+                value=line[2].split("\"")[0]
-+                self.translation[key]=(category,value)
-+            except:
-+                continue
-+
-+    def get_category(self,key):
-+        try:
-+            return _(self.translation[key][0])
-+        except:
-+            return _("Other")
-+
-+    def get_value(self,key):
-+        try:
-+            return _(self.translation[key][1])
-+        except:
-+            return key
-+
-+class Modifier:
-+    def __init__(self,name, on, save):
-+        self.on=on
-+        self.name=name
-+        self.save=save
-+
-+    def set(self,value):
-+        self.on=value
-+        self.save=True
-+
-+    def isOn(self):
-+        return self.on
-+
-+class Boolean(Modifier):
-+    def __init__(self,name, val, save=False):
-+        Modifier.__init__(self,name, val, save)
-+
-+class Modifiers:
-+    def __init__(self,store):
-+        self.modifiers={}
-+        self.translation=Translation()
-+        self.store=store
-+        self.store.clear()
-+
-+    def add(self,name,val):
-+        if name == "targeted_policy":
-+            return
-+        category=self.translation.get_category(name)
-+        if not self.modifiers.has_key(category):
-+            self.modifiers[category]={}
-+            iter=self.store.append(None)
-+            self.modifiers[category]["iter"] = iter
-+            self.store.set_value(iter, 1, category)
-+            self.store.set_value(iter, 3, False)
-+
-+        self.modifiers[category][name]=val;
-+        iter=self.store.append(self.modifiers[category]["iter"])
-+        self.store.set_value(iter, 0, val.isOn())
-+        self.store.set_value(iter, 1, self.translation.get_value(name))
-+        self.store.set_value(iter, 2, name)
-+        self.store.set_value(iter, 3, True)
-+
-+    def set(self,name,val):
-+        category=self.translation.get_category(name)
-+        self.modifiers[category][name].set(val)
-+
-+    def isBoolean(self,name):
-+        c=self.translation.get_category(name)
-+        return isinstance(self.modifiers[c][name], Boolean)
-+
-+    def get_booleans(self):
-+        booleans={}
-+        for c in self.modifiers.keys():
-+            for n in self.modifiers[c].keys():
-+                if isinstance(self.modifiers[c][n], Boolean):
-+                    booleans[n]=self.modifiers[c][n]
-+        return booleans
-+
-+class booleansPage:
-+    def __init__(self, xml, doDebug=None):
-+        self.xml = xml
-+        self.types=[]
-+        self.selinuxsupport = True
-+        self.translation = Translation()
-+        self.typechanged = False
-+        self.doDebug = doDebug
-+
-+        # Bring in widgets from glade file.
-+        self.typeHBox = xml.get_widget("typeHBox")
-+        self.booleanSW = xml.get_widget("booleanSW")
-+        self.booleansView = xml.get_widget("booleansView")
-+        self.typeLabel = xml.get_widget("typeLabel")
-+        self.modifySeparator = xml.get_widget("modifySeparator")
-+
-+        listStore = gtk.ListStore(gobject.TYPE_STRING)
-+        cell = gtk.CellRendererText()
-+
-+        self.booleansStore = gtk.TreeStore(gobject.TYPE_BOOLEAN, gobject.TYPE_STRING, gobject.TYPE_PYOBJECT, gobject.TYPE_BOOLEAN)
-+        self.booleansStore.set_sort_column_id(1, gtk.SORT_ASCENDING)        
-+        self.booleansView.set_model(self.booleansStore)
-+
-+        checkbox = gtk.CellRendererToggle()
-+        checkbox.connect("toggled", self.boolean_toggled)
-+        col = gtk.TreeViewColumn('', checkbox, active = 0,visible=3)
-+        col.set_fixed_width(20)
-+        col.set_clickable(True)
-+        self.booleansView.append_column(col)
-+
-+        col = gtk.TreeViewColumn("", gtk.CellRendererText(), text=1)
-+        self.booleansView.append_column(col)
[...4674 lines suppressed...]
- 
- all install relabel clean indent:
- 	@for subdir in $(SUBDIRS); do \
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.34.1/restorecon/restorecon.c
---- nsapolicycoreutils/restorecon/restorecon.c	2007-01-24 10:04:01.000000000 -0500
-+++ policycoreutils-1.34.1/restorecon/restorecon.c	2007-03-22 17:35:16.000000000 -0400
-@@ -336,8 +336,8 @@
- 				if (!file_exist && errno == ENOENT)
- 					return;
- 				fprintf(stderr,
--					"%s:  error while labeling files under %s\n",
--					progname, buf);
-+					"%s: %s: %s\n",
-+					progname, buf, strerror(errno));
- 				errors++;
- 			}
- 		}
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.34.1/restorecond/restorecond.c
---- nsapolicycoreutils/restorecond/restorecond.c	2007-01-24 10:04:01.000000000 -0500
-+++ policycoreutils-1.34.1/restorecond/restorecond.c	2007-03-22 17:11:28.000000000 -0400
+--- policycoreutils-1.34.1/restorecond/restorecond.c.rhat	2007-01-24 10:04:01.000000000 -0500
++++ policycoreutils-1.34.1/restorecond/restorecond.c	2007-04-16 08:04:45.000000000 -0400
 @@ -210,9 +210,10 @@
  			}
  
@@ -4909,18 +26,8 @@
  	}
  	free(scontext);
  	close(fd);
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.34.1/restorecond/restorecond.conf
---- nsapolicycoreutils/restorecond/restorecond.conf	2007-01-24 10:04:01.000000000 -0500
-+++ policycoreutils-1.34.1/restorecond/restorecond.conf	2007-03-22 17:11:28.000000000 -0400
-@@ -1,4 +1,5 @@
- /etc/resolv.conf
-+/etc/localtime
- /etc/samba/secrets.tdb
- /etc/mtab
- /var/run/utmp
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-1.34.1/restorecond/restorecond.init
---- nsapolicycoreutils/restorecond/restorecond.init	2007-01-24 10:04:01.000000000 -0500
-+++ policycoreutils-1.34.1/restorecond/restorecond.init	2007-03-22 17:17:14.000000000 -0400
+--- policycoreutils-1.34.1/restorecond/restorecond.init.rhat	2007-01-24 10:04:01.000000000 -0500
++++ policycoreutils-1.34.1/restorecond/restorecond.init	2007-04-16 08:04:45.000000000 -0400
 @@ -1,43 +1,68 @@
  #!/bin/sh
  #
@@ -5015,9 +122,65 @@
 -exit 0
 +exit $RETVAL
 +
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-1.34.1/scripts/chcat
---- nsapolicycoreutils/scripts/chcat	2007-01-24 10:04:01.000000000 -0500
-+++ policycoreutils-1.34.1/scripts/chcat	2007-03-22 17:11:28.000000000 -0400
+--- policycoreutils-1.34.1/restorecon/restorecon.c.rhat	2007-01-24 10:04:01.000000000 -0500
++++ policycoreutils-1.34.1/restorecon/restorecon.c	2007-04-16 08:04:45.000000000 -0400
+@@ -336,8 +336,8 @@
+ 				if (!file_exist && errno == ENOENT)
+ 					return;
+ 				fprintf(stderr,
+-					"%s:  error while labeling files under %s\n",
+-					progname, buf);
++					"%s: %s: %s\n",
++					progname, buf, strerror(errno));
+ 				errors++;
+ 			}
+ 		}
+--- policycoreutils-1.34.1/semanage/seobject.py.rhat	2007-01-24 10:04:01.000000000 -0500
++++ policycoreutils-1.34.1/semanage/seobject.py	2007-04-16 08:04:45.000000000 -0400
+@@ -209,7 +209,8 @@
+ 		os.write(fd, self.out())
+ 		os.close(fd)
+ 		os.rename(newfilename, self.filename)
+-
++                os.system("/sbin/service mcstrans reload > /dev/null")
++                
+ class semanageRecords:
+ 	def __init__(self):
+ 		self.sh = semanage_handle_create()
+@@ -464,7 +465,8 @@
+ 				rc = semanage_user_set_mlslevel(self.sh, u, selevel)
+ 				if rc < 0:
+ 					raise ValueError(_("Could not set MLS level for %s") % name)
+-
++                        if selinux.security_check_context("system_u:object_r:%s_home_t:s0" % prefix) != 0:
++                               raise ValueError(_("Invalid prefix %s") % prefix)
+ 			rc = semanage_user_set_prefix(self.sh, u, prefix)
+ 			if rc < 0:
+ 				raise ValueError(_("Could not add prefix %s for %s") % (r, prefix))
+@@ -530,7 +532,9 @@
+ 				semanage_user_set_mlslevel(self.sh, u, untranslate(selevel))
+ 
+ 			if prefix != "":
+-				semanage_user_set_prefix(self.sh, u, prefix)
++                               if selinux.security_check_context("system_u:object_r:%s_home_t" % prefix) != 0:
++                                      raise ValueError(_("Invalid prefix %s") % prefix)
++                               semanage_user_set_prefix(self.sh, u, prefix)
+ 
+ 			if len(roles) != 0:
+                                for r in rlist:
+--- policycoreutils-1.34.1/scripts/fixfiles.8.rhat	2007-04-16 08:04:45.000000000 -0400
++++ policycoreutils-1.34.1/scripts/fixfiles.8	2007-04-16 08:04:54.000000000 -0400
+@@ -35,7 +35,7 @@
+ 
+ .TP 
+ .B -f
+-Don't prompt for removal of /tmp directory.
++Don't prompt for removal of /tmp directory, always remove it.
+ 
+ .TP 
+ .B -R rpmpackagename[,rpmpackagename...]
+--- policycoreutils-1.34.1/scripts/chcat.rhat	2007-01-24 10:04:01.000000000 -0500
++++ policycoreutils-1.34.1/scripts/chcat	2007-04-16 08:04:45.000000000 -0400
 @@ -62,12 +62,20 @@
          for i in newcat[1:]:
              if i not in cats:
@@ -5083,49 +246,39 @@
      return errors
      
  def chcat_replace(newcat, objects, login_ind):
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/scripts/fixfiles.8 policycoreutils-1.34.1/scripts/fixfiles.8
---- nsapolicycoreutils/scripts/fixfiles.8	2007-01-24 10:04:01.000000000 -0500
-+++ policycoreutils-1.34.1/scripts/fixfiles.8	2007-03-22 17:22:31.000000000 -0400
-@@ -54,7 +54,7 @@
- change any incorrect file context labels.
- .TP 
- .B relabel
--Prompt for removal of contents of /tmp directory and then change any inccorect file context labels to match the install file_contexts file.
-+Prompt for removal of contents of /tmp directory and then change any incorrect file context labels to match the install file_contexts file.
- .TP 
- .B verify
- List out files with incorrect file context labels, but do not change them.
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.34.1/semanage/seobject.py
---- nsapolicycoreutils/semanage/seobject.py	2007-01-24 10:04:01.000000000 -0500
-+++ policycoreutils-1.34.1/semanage/seobject.py	2007-03-22 17:11:28.000000000 -0400
-@@ -209,7 +209,8 @@
- 		os.write(fd, self.out())
- 		os.close(fd)
- 		os.rename(newfilename, self.filename)
--
-+                os.system("/sbin/service mcstrans reload > /dev/null")
-+                
- class semanageRecords:
- 	def __init__(self):
- 		self.sh = semanage_handle_create()
-@@ -464,7 +465,8 @@
- 				rc = semanage_user_set_mlslevel(self.sh, u, selevel)
- 				if rc < 0:
- 					raise ValueError(_("Could not set MLS level for %s") % name)
--
-+                        if selinux.security_check_context("system_u:object_r:%s_home_t:s0" % prefix) != 0:
-+                               raise ValueError(_("Invalid prefix %s") % prefix)
- 			rc = semanage_user_set_prefix(self.sh, u, prefix)
- 			if rc < 0:
- 				raise ValueError(_("Could not add prefix %s for %s") % (r, prefix))
-@@ -530,7 +532,9 @@
- 				semanage_user_set_mlslevel(self.sh, u, untranslate(selevel))
- 
- 			if prefix != "":
--				semanage_user_set_prefix(self.sh, u, prefix)
-+                               if selinux.security_check_context("system_u:object_r:%s_home_t" % prefix) != 0:
-+                                      raise ValueError(_("Invalid prefix %s") % prefix)
-+                               semanage_user_set_prefix(self.sh, u, prefix)
+--- policycoreutils-1.34.1/audit2allow/audit2allow.rhat	2007-01-24 10:04:01.000000000 -0500
++++ policycoreutils-1.34.1/audit2allow/audit2allow	2007-04-16 08:04:45.000000000 -0400
+@@ -32,8 +32,10 @@
+ 	import re
+         try:
+                 gettext.install('policycoreutils')
+-        except:
+-                pass
++	except IOError:
++		import __builtin__
++		__builtin__.__dict__['_'] = unicode
++
+ 	def get_mls_flag():
+ 		if selinux.is_selinux_mls_enabled():
+ 			return "-M"
+--- policycoreutils-1.34.1/Makefile.rhat	2007-01-24 10:04:00.000000000 -0500
++++ policycoreutils-1.34.1/Makefile	2007-04-16 08:04:45.000000000 -0400
+@@ -1,4 +1,4 @@
+-SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
++SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
  
- 			if len(roles) != 0:
-                                for r in rlist:
+ all install relabel clean indent:
+ 	@for subdir in $(SUBDIRS); do \
+--- nsapolicycoreutils/restorecond/restorecond.conf	2006-11-20 12:19:55.000000000 -0500
++++ policycoreutils-2.0.7/restorecond/restorecond.conf	2007-03-23 09:03:56.000000000 -0400
+@@ -1,7 +1,10 @@
+ /etc/resolv.conf
++/etc/localtime
+ /etc/samba/secrets.tdb
+ /etc/mtab
+ /var/run/utmp
++/var/run/faillog
+ /var/log/wtmp
++/etc/lvm/.cache
+ ~/public_html
+ ~/.mozilla/plugins/libflashplayer.so


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-6/policycoreutils.spec,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -r1.331 -r1.332
--- policycoreutils.spec	22 Mar 2007 21:37:14 -0000	1.331
+++ policycoreutils.spec	16 Apr 2007 18:04:13 -0000	1.332
@@ -2,19 +2,22 @@
 %define libsepolver 1.12.27-1
 %define libsemanagever 1.6.17-1
 %define libselinuxver 1.33.4-1
+%define sepolgenver 1.0.8
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.34.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
-Source1: system-config-selinux.png
-Source2: system-config-selinux.desktop
-Source3: system-config-selinux.pam
-Source4: system-config-selinux.console
+Source1: http://www.nsa.gov/selinux/archives/sepolgen-%{sepolgenver}.tgz
+Source2: system-config-selinux.png
+Source3: system-config-selinux.desktop
+Source4: system-config-selinux.pam
+Source5: system-config-selinux.console
 Patch: policycoreutils-rhat.patch
 Patch1: policycoreutils-po.patch
+Patch3: policycoreutils-gui.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 /bin/rpm
@@ -40,12 +43,14 @@
 context.
 
 %prep
-%setup -q
+%setup -q -a 1 
 %patch -p1 -b .rhat
 %patch1 -p1 -b .rhatpo
+%patch3 -p1 -b .gui
 
 %build
 make LSPP_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fPIE" LDFLAGS="-pie -Wl,-z,relro" all 
+make -C sepolgen-%{sepolgenver} LSPP_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fPIE" LDFLAGS="-pie -Wl,-z,relro" all 
 
 %install
 rm -rf %{buildroot}
@@ -59,15 +64,16 @@
 mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps
 
 make LSPP_PRIV=y  DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" install
-install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/system-config-selinux/
-install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/system-config-selinux
-install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/security/console.apps/system-config-selinux
+make -C sepolgen-%{sepolgenver} DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" install
+install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/system-config-selinux/
+install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/system-config-selinux
+install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/security/console.apps/system-config-selinux
 ln -sf consolehelper %{buildroot}%{_bindir}/system-config-selinux
 
 desktop-file-install --vendor fedora                            \
 	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
         --add-category X-Fedora                                 \
-	%{SOURCE2}
+	%{SOURCE3}
 %find_lang %{name}
 
 %package newrole
@@ -99,7 +105,13 @@
 %files gui
 %{_bindir}/system-config-selinux
 %{_datadir}/applications/fedora-system-config-selinux.desktop
-%{_datadir}/system-config-selinux/
+%dir %{_datadir}/system-config-selinux
+%dir %{_datadir}/system-config-selinux/templates
+%{_datadir}/system-config-selinux/*.py*
+%{_datadir}/system-config-selinux/selinux.tbl
+%{_datadir}/system-config-selinux/*png
+%{_datadir}/system-config-selinux/*.glade
+%{_datadir}/system-config-selinux/templates/*.py*
 %config(noreplace) %{_sysconfdir}/pam.d/system-config-selinux
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-selinux
 
@@ -118,6 +130,7 @@
 %{_sbindir}/load_policy
 %{_sbindir}/audit2why
 %{_sbindir}/genhomedircon
+%{_sbindir}/sepolgen-ifgen
 %{_sbindir}/sestatus
 %{_sbindir}/run_init
 %{_sbindir}/open_init_pty
@@ -155,7 +168,10 @@
 %{_libdir}/python?.?/site-packages/avc.py*
 %attr(755,root,root) /etc/rc.d/init.d/restorecond
 %config(noreplace) /etc/selinux/restorecond.conf
-
+%dir %{_libdir}/python?.?/site-packages/sepolgen
+%{_libdir}/python?.?/site-packages/sepolgen/*
+%dir  /var/lib/sepolgen
+/var/lib/sepolgen/perm_map
 
 %preun
 if [ $1 -eq 0 ]; then
@@ -165,9 +181,18 @@
 
 %post
 /sbin/chkconfig --add restorecond
-[ -x /sbin/service ] && /sbin/service restorecond condrestart  > /dev/null
+[ -f /usr/share/selinux/devel/include/build.conf ] && /usr/sbin/sepolgen-ifgen  > /dev/null 
+exit 0
+
+%postun
+if [ "$1" -ge "1" ]; then 
+   [ -x /sbin/service ] && /sbin/service restorecond condrestart  > /dev/null
+fi
 
 %changelog
+* Mon Apr 16 2007 Dan Walsh <dwalsh at redhat.com> 1.34.1-6
+- Add sepolgen/gui
+
 * Thu Mar 22 2007 Dan Walsh <dwalsh at redhat.com> 1.34.1-5
 - Fix fixfiles manpage
 - Fix restorecond init script



From fedora-cvs-commits at redhat.com  Mon Apr 16 18:05:22 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 14:05:22 -0400
Subject: rpms/policycoreutils/FC-6 .cvsignore, 1.124, 1.125 sources, 1.134,
	1.135
Message-ID: <200704161805.l3GI5MLb011592@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Apr 16 2007 Dan Walsh <dwalsh at redhat.com> 1.34.1-6
- Add sepolgen/gui



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-6/.cvsignore,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- .cvsignore	6 Dec 2006 20:56:19 -0000	1.124
+++ .cvsignore	16 Apr 2007 18:05:20 -0000	1.125
@@ -120,3 +120,4 @@
 policycoreutils-1.33.4.tgz
 policycoreutils-1.33.5.tgz
 policycoreutils-1.33.6.tgz
+sepolgen-1.0.8.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-6/sources,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- sources	1 Feb 2007 21:23:18 -0000	1.134
+++ sources	16 Apr 2007 18:05:20 -0000	1.135
@@ -1 +1,2 @@
 eff759f488ec2ad7dc996ce882527b96  policycoreutils-1.34.1.tgz
+4d6e57c7fc396efbcf96b7accab4ba30  sepolgen-1.0.8.tgz



From fedora-cvs-commits at redhat.com  Mon Apr 16 18:15:28 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 14:15:28 -0400
Subject: rpms/sysklogd/devel sysklogd-1.4.2rh-dispatcher.patch, NONE,
	1.1 sysklogd.spec, 1.53, 1.54
Message-ID: <200704161815.l3GIFS96011951@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/sysklogd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11935

Modified Files:
	sysklogd.spec 
Added Files:
	sysklogd-1.4.2rh-dispatcher.patch 
Log Message:
sysklogd provides new realtime interface (#236356)


sysklogd-1.4.2rh-dispatcher.patch:
 Makefile            |   10 +-
 sysklogd-dispatch.c |  185 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 sysklogd-dispatch.h |   64 +++++++++++++++++
 sysklogd.8          |   24 ++++++
 syslogd.c           |   48 ++++++++++++-
 5 files changed, 323 insertions(+), 8 deletions(-)

--- NEW FILE sysklogd-1.4.2rh-dispatcher.patch ---
--- sysklogd-1.4.2rh/sysklogd.8.dispatcher	2007-04-16 19:27:44.000000000 +0200
+++ sysklogd-1.4.2rh/sysklogd.8	2007-04-16 19:27:44.000000000 +0200
@@ -30,6 +30,9 @@
 .RB [ " \-s "
 .I domainlist
 ]
+.RB [ " \-D "
+.I dispatcher
+]
 .RB [ " \-v " ]
 .RB [ " \-x " ]
 .LP
@@ -178,6 +181,14 @@
 once, the names of the facility and priority are logged with each
 locally-written message.
 .TP
+.BI "\-D " "dispatcher"
+The syslogd daemon will start up a dispatcher program and open
+standard input to the socketpair used to pass events. So, the 
+dispatcher only needs to read stdin. Because IPC communication 
+buffers have a limited size, it must read the events as fast 
+as possible. The syslogd send SIGTERM to indicate that the 
+dispatcher should exit.
+.TP
 .B "\-v"
 Print version and exit.
 .TP
@@ -444,6 +455,19 @@
 	kern.=debug			|/usr/adm/debug
 .fi
 .LP
+.SH OUTPUT TO DISPATCHER
+If you run syslogd with the
+.B \-D 
+option, you can route your messages 
+to dispatcher process. To specify messages, which go to dispatcher, 
+you use "!dispatcher" directive. 
+.IP
+Following configuration routes info messages to a dispatcher process:
+.IP
+.nf
+	*.info				!dispatcher
+.fi
+.LP
 .SH INSTALLATION CONCERNS
 There is probably one important consideration when installing this
 version of syslogd.  This version of syslogd is dependent on proper
--- /dev/null	2007-04-11 16:01:52.461576228 +0200
+++ sysklogd-1.4.2rh/sysklogd-dispatch.h	2007-04-16 19:27:44.000000000 +0200
@@ -0,0 +1,64 @@
+/* sysklogd-dispatch.h -- 
+ * Copyright 2007 Red Hat Inc., Durham, North Carolina.
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Authors:
+ *   Steve Grubb <sgrubb at redhat.com>
+ *   Peter Vrabec <pvrabec at redhat.com>
+ * 
+ */
+
+#ifndef SYSKLOGD_DISPATCH_H
+#define SYSKLOGD_DISPATCH_H
+
+
+typedef enum { QOS_NON_BLOCKING, QOS_BLOCKING } qos_t;
+
+struct daemon_conf
+{
+        char * dispatcher;
+        qos_t qos;              /* use blocking/non-blocking sockets */
+};
+
+/* Sysklogd protocol #1 contains only one type of reply message
+   and that is standart message. */
+#define SYSKLOGD_PROTOCOL_VER	1
+#define MAXLINE			1024 /* Should be same MAXLINE as in syslogd.c */
+typedef enum { STD_MESS } mess_t;   
+
+struct sysklogd_reply {
+        mess_t			type;
+        int			len;
+	union {
+	       	const char		*message;
+	};
+};
+
+struct sysklogd_dispatcher_header {
+        int        ver;    /* The version of this protocol */
+        int        hlen;   /* Header length */
+        mess_t     type;   /* Message type */
+        int        size;   /* Size of data following the header */
+};
+
+
+int init_dispatcher(const struct daemon_conf *config);
+void shutdown_dispatcher(void);
+void reconfigure_dispatcher(void);
+void dispatch_event(const struct sysklogd_reply *rep);
+
+#endif
--- sysklogd-1.4.2rh/Makefile.dispatcher	2007-02-26 10:46:08.000000000 +0100
+++ sysklogd-1.4.2rh/Makefile	2007-04-16 19:30:48.000000000 +0200
@@ -10,6 +10,7 @@
 INSTALL = /usr/bin/install
 BINDIR = $(TOPDIR)/sbin
 MANDIR = $(TOPDIR)/usr/man
+INCLUDEDIR = $(TOPDIR)/usr/include
 
 # There is one report that under an all ELF system there may be a need to
 # explicilty link with libresolv.a.  If linking syslogd fails you may wish
@@ -57,10 +58,10 @@
 
 test: syslog_tst ksym oops_test tsyslogd
 
-install: install_man install_exec
+install: install_man install_exec install_include
 
-syslogd: syslogd.o pidfile.o
-	${CC} ${LDFLAGS} -o syslogd syslogd.o pidfile.o ${LIBS}
+syslogd: syslogd.o pidfile.o sysklogd-dispatch.o
+	${CC} ${LDFLAGS} -o syslogd syslogd.o pidfile.o sysklogd-dispatch.o ${LIBS}
 
 klogd:	klogd.o syslog.o pidfile.o ksym.o ksym_mod.o
 	${CC} ${LDFLAGS} -o klogd klogd.o syslog.o pidfile.o ksym.o \
@@ -121,6 +122,9 @@
 	${INSTALL} -m 644 syslog.conf.5 ${MANDIR}/man5/syslog.conf.5
 	${INSTALL} -m 644 klogd.8 ${MANDIR}/man8/klogd.8
 
+install_include:
+	${INSTALL} -m 644 sysklogd-dispatch.h ${INCLUDEDIR}/sysklogd/sysklogd-dispatch.h
+
 
 ## Red Hat specific additions
 
--- /dev/null	2007-04-11 16:01:52.461576228 +0200
+++ sysklogd-1.4.2rh/sysklogd-dispatch.c	2007-04-16 19:27:44.000000000 +0200
@@ -0,0 +1,185 @@
+/* sysklogd-dispatch.c -- 
+ * Copyright 2007 Red Hat Inc., Durham, North Carolina.
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Authors:
+ *   Steve Grubb <sgrubb at redhat.com>
+ *   Junji Kanemaru <junji.kanemaru at linuon.com>
+ *   Peter Vrabec <pvrabec at redhat.com>
+ */
+
+#include <unistd.h>
+#include <sys/uio.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include "sysklogd-dispatch.h"
+
+/* This is the communications channel between sysklogd & the dispatcher */
+static int disp_pipe[2] = {-1, -1};
+static pid_t pid = 0;
+static int n_errs = 0;
+#define REPORT_LIMIT 10
+
+/* set_flags: to set flags to file desc */
+static int set_flags(int fn, int flags)
+{
+	int fl;
+
+	if ((fl = fcntl(fn, F_GETFL, 0)) < 0) {
+		fprintf(stderr, "fcntl failed. Cannot get flags (%s)\n", 
+			strerror(errno));
+		return fl;
+	}
+
+	fl |= flags;
+
+	return fcntl(fn, F_SETFL, fl);
+}
+
+/* This function returns 1 on error & 0 on success */
+int init_dispatcher(const struct daemon_conf *config)
+{
+	if (config->dispatcher == NULL) 
+		return 0;
+
+	if (socketpair(AF_UNIX, SOCK_STREAM, 0, disp_pipe)) {
+		fprintf(stderr, "Failed creating disp_pipe\n");
+		return 1;
+	}
+
+	/* Make both disp_pipe non-blocking */
+	if (config->qos == QOS_NON_BLOCKING) {
+		if (set_flags(disp_pipe[0], O_NONBLOCK) < 0 ||
+			set_flags(disp_pipe[1], O_NONBLOCK) < 0) {
+			fprintf(stderr, "Failed to set O_NONBLOCK flag\n");
+			return 1;
+		}
+	}
+
+	// do the fork
+	pid = fork();
+	switch(pid) {
+		case 0:	// child
+			dup2(disp_pipe[0], 0);
+			close(disp_pipe[0]);
+			close(disp_pipe[1]);
+			setsid();
+			execl(config->dispatcher, config->dispatcher, NULL);
+			fprintf(stderr, "exec() failed\n");
+			exit(1);
+			break;
+		case -1:	// error
+			return 1;
+			break;
+		default:	// parent
+			close(disp_pipe[0]);
+			disp_pipe[0] = -1;
+			/* Avoid leaking this */
+			if (fcntl(disp_pipe[1], F_SETFD, FD_CLOEXEC) < 0) {
+				fprintf(stderr,
+					"Failed to set FD_CLOEXEC flag\n");
+				return 1;
+			}
+			fprintf(stderr, "Started dispatcher: %s pid: %u\n",
+					config->dispatcher, pid);
+			break;
+	}
+
+	return 0;
+}
+
+void shutdown_dispatcher(void)
+{
+	// kill child
+	if (pid)
+		kill(pid, SIGTERM);
+	// wait for term
+	// if not in time, send sigkill
+	pid = 0;
+
+	// cleanup comm pipe
+	if (disp_pipe[0] >= 0) {
+		close(disp_pipe[0]);
+		disp_pipe[0] = -1;
+	}
+	if (disp_pipe[1] >= 0) {
+		close(disp_pipe[1]);
+		disp_pipe[1] = -1;
+	}
+}
+
+void reconfigure_dispatcher(void)
+{
+	// signal child
+	if (pid)
+		kill(pid, SIGHUP);
+}
+
+void dispatch_event(const struct sysklogd_reply *rep)
+{
+	int rc, count = 0;
+	struct iovec vec[2];
+	struct sysklogd_dispatcher_header hdr;
+
+	if (disp_pipe[1] == -1)
+		return;
+
+	hdr.ver = SYSKLOGD_PROTOCOL_VER; /* Hard-coded to current protocol */
+	hdr.hlen = sizeof(struct sysklogd_dispatcher_header);
+	hdr.type = rep->type;
+	hdr.size = rep->len;
+
+	vec[0].iov_base = (void*)&hdr;
+	vec[0].iov_len = sizeof(hdr);
+	vec[1].iov_base = (void*)rep->message;
+	vec[1].iov_len = rep->len;
+
+	do {
+		rc = writev(disp_pipe[1], vec, 2);
+	} while (rc < 0 && errno == EAGAIN && count++ < 10);
+
+	// close pipe if no child or peer has been lost
+	if (rc <= 0) {
+		if (errno == EPIPE) {
+			shutdown_dispatcher();
+			n_errs = 0;
+		} else {
+			if (n_errs <= REPORT_LIMIT) {
+				fprintf(stderr, 
+					"dispatch err (%s) event lost\n",
+					errno == EAGAIN ? "pipe full" :
+					strerror(errno));
+				n_errs++;
+			}
+			if (n_errs == REPORT_LIMIT) {
+				fprintf(stderr, 
+					"dispatch error reporting limit\n"
+					" reached - ending report"
+					" notification.");
+				n_errs++;
+			}
+		}
+	} else
+		n_errs = 0;
+}
--- sysklogd-1.4.2rh/syslogd.c.dispatcher	2007-04-16 19:27:44.000000000 +0200
+++ sysklogd-1.4.2rh/syslogd.c	2007-04-16 19:27:44.000000000 +0200
@@ -507,6 +507,8 @@
 #endif
 #include "version.h"
 
+#include "sysklogd-dispatch.h"
+
 #if defined(__linux__)
 #include <paths.h>
 #endif
@@ -572,6 +574,8 @@
 static int alarm_signal = 0;
 static int exit_on_signal = 0;
 
+struct daemon_conf disp =  { NULL, QOS_NON_BLOCKING };
+
 #define MAXFUNIX	20
 
 int nfunix = 1;
@@ -674,10 +678,11 @@
 #define F_FORW_SUSP	7		/* suspended host forwarding */
 #define F_FORW_UNKN	8		/* unknown host forwarding */
 #define F_PIPE		9		/* named pipe */
+#define F_DISP		10		/* named pipe */
 char	*TypeNames[] = {
 	"UNUSED",	"FILE",		"TTY",		"CONSOLE",
 	"FORW",		"USERS",	"WALL",		"FORW(SUSPENDED)",
-	"FORW(UNKNOWN)", "PIPE"
+	"FORW(UNKNOWN)", "PIPE",	"DISP"
 };
 
 struct	filed *Files = (struct filed *) 0;
@@ -859,7 +864,7 @@
 		funix[i]  = -1;
 	}
 
-	while ((ch = getopt(argc, argv, "46Aa:dhf:l:m:np:rSs:vx")) != EOF)
+	while ((ch = getopt(argc, argv, "46Aa:dhf:D:l:m:np:rSs:vx")) != EOF)
 		switch((char)ch) {
                 case '4':
                               family = PF_INET;
@@ -881,6 +886,9 @@
 		case 'd':		/* debug */
 			Debug = 1;
 			break;
+		case 'D':		/* dispatcher */
+			disp.dispatcher = optarg;
+			break;
 		case 'f':		/* configuration file */
 			ConfFile = optarg;
 			break;
@@ -1067,6 +1075,15 @@
 	    parts[i] = (char *) 0;
 
 	dprintf("Starting.\n");
+
+	if( disp.dispatcher != NULL ) {
+		dprintf("Dispatcher initialisation.\n");
+	        if( init_dispatcher(&disp) == 1) {
+			dprintf("Dispatcher initialisation FAIL.\n");
+			die(0);
+		}
+        }
+
 	init();
 #ifndef TESTING
 	if ( Debug )
@@ -1249,7 +1266,7 @@
 int usage()
 {
 	fprintf(stderr, "usage: syslogd [-46AdiIrvxh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \
-		" [-s domainlist] [-f conffile]\n");
+		" [-s domainlist] [-D dispatcher] [-f conffile]\n");
 	exit(1);
 }
 
@@ -1767,6 +1784,7 @@
 	time_t fwd_suspend;
 	struct addrinfo *saddr;
 #endif
+	struct sysklogd_reply reply;
 
 	dprintf("Called fprintlog, ");
 
@@ -2012,7 +2030,19 @@
 		} else if (f->f_flags & SYNC_FILE)
 			(void) fsync(f->f_file);
 		break;
-
+	case F_DISP:
+		f->f_time = now;
+		dprintf("\n");
+                v->iov_base = "";
+                v->iov_len = 0;
+		(void) snprintf(line, sizeof(line), "%s%s%s%s%s%s%s\n", (char *) iov[0].iov_base, 
+				(char *) iov[1].iov_base, (char *) iov[2].iov_base, (char *) iov[3].iov_base,
+         			(char *) iov[4].iov_base, (char *) iov[5].iov_base, (char *) iov[6].iov_base);
+                reply.type = STD_MESS;
+		reply.message = line;
+	        reply.len = strlen(reply.message);
+	        dispatch_event(&reply);
+		break;
 	case F_USERS:
 	case F_WALL:
 		f->f_time = now;
@@ -2868,7 +2898,15 @@
 		if (strcmp(p, ctty) == 0)
 			f->f_type = F_CONSOLE;
 		break;
-
+	case '!':
+		if( !strncmp(++p, "dispatcher", 10) ) {
+			dprintf ("sending to: %s\n", disp.dispatcher);
+			f->f_type = F_DISP;
+		}
+		else {
+			dprintf ("\"!\" is not followed by \"dispatcher\"\n");
+		}
+		break;
 	case '*':
 		dprintf ("write-all\n");
 		f->f_type = F_WALL;


Index: sysklogd.spec
===================================================================
RCS file: /cvs/dist/rpms/sysklogd/devel/sysklogd.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sysklogd.spec	11 Apr 2007 15:52:41 -0000	1.53
+++ sysklogd.spec	16 Apr 2007 18:15:26 -0000	1.54
@@ -1,7 +1,7 @@
 Summary: System logging and kernel message trapping daemons
 Name: sysklogd
 Version: 1.4.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.infodrom.org/projects/sysklogd/
@@ -15,6 +15,7 @@
 Source: sysklogd-%{version}rh.tar.gz
 Patch1: sysklogd-1.4.2rh.timezone.patch
 Patch2: sysklogd-1.4.2rh-includeFacPri.patch
+Patch3: sysklogd-1.4.2rh-dispatcher.patch
 Conflicts: logrotate < 3.5.2
 Requires: logrotate
 Requires: bash >= 2.0
@@ -30,6 +31,14 @@
 daemons (background processes) and log system messages to different
 places, like sendmail logs, security logs, error logs, etc.
 
+%package devel
+Group: Development/Libraries
+Summary: Development tools for the sysklogd daemon
+
+%description devel
+The sysklogd-devel package contains the header file, which provides 
+interface for dispatcher extension.
+
 %prep
 %setup -q -n sysklogd-%{version}rh
 %ifarch s390 s390x
@@ -37,13 +46,14 @@
 %endif
 %patch1 -p1 -b .timezone
 %patch2 -p1 -b .includeFacPri
+%patch3 -p1 -b .dispatcher
 
 %build
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT{/etc,%{_bindir},%{_mandir}/man{5,8},/usr/sbin}
+mkdir -p $RPM_BUILD_ROOT{/etc,%{_bindir},%{_mandir}/man{5,8},/usr/sbin,%{_includedir}/sysklogd}
 mkdir -p $RPM_BUILD_ROOT/sbin
 
 make install TOPDIR=$RPM_BUILD_ROOT MANDIR=$RPM_BUILD_ROOT%{_mandir} \
@@ -102,7 +112,15 @@
 /sbin/*
 %{_mandir}/*/*
 
+%files devel
+%defattr(-,root,root)
+%dir %{_includedir}/sysklogd
+%{_includedir}/sysklogd/sysklogd-dispatch.h
+
 %changelog
+* Mon Apr 16 2007 Peter Vrabec <pvrabec at redhat.com> 1.4.2-5
+- sysklogd provides new realtime interface (#236356) 
+
 * Wed Apr 11 2007 Peter Vrabec <pvrabec at redhat.com> 1.4.2-4
 - some fixes of previous release (#223573)
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 18:18:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 14:18:18 -0400
Subject: rpms/policycoreutils/FC-6 policycoreutils-rhat.patch,1.253,1.254
Message-ID: <200704161818.l3GIIIDU012053@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-rhat.patch 
Log Message:
* Mon Apr 16 2007 Dan Walsh <dwalsh at redhat.com> 1.34.1-6
- Add sepolgen/gui


policycoreutils-rhat.patch:
 Makefile                     |    2 
 audit2allow/Makefile         |   16 -
 audit2allow/audit2allow      |  473 +++++++++++++++++++++++--------------------
 audit2allow/sepolgen-ifgen   |   86 +++++++
 restorecon/restorecon.c      |    4 
 restorecond/restorecond.c    |   12 -
 restorecond/restorecond.conf |    3 
 restorecond/restorecond.init |   43 +++
 scripts/chcat                |   36 ++-
 scripts/fixfiles.8           |    2 
 semanage/seobject.py         |   10 
 11 files changed, 432 insertions(+), 255 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-6/policycoreutils-rhat.patch,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- policycoreutils-rhat.patch	16 Apr 2007 18:04:13 -0000	1.253
+++ policycoreutils-rhat.patch	16 Apr 2007 18:18:15 -0000	1.254
@@ -1,5 +1,638 @@
---- policycoreutils-1.34.1/restorecond/restorecond.c.rhat	2007-01-24 10:04:01.000000000 -0500
-+++ policycoreutils-1.34.1/restorecond/restorecond.c	2007-04-16 08:04:45.000000000 -0400
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.34.1/audit2allow/audit2allow
+--- nsapolicycoreutils/audit2allow/audit2allow	2007-01-24 10:04:01.000000000 -0500
++++ policycoreutils-1.34.1/audit2allow/audit2allow	2007-04-16 14:12:28.000000000 -0400
+@@ -1,226 +1,265 @@
+ #! /usr/bin/python -E
+-# Copyright (C) 2005 Red Hat 
+-# see file 'COPYING' for use and warranty information
+-#
+-# Audit2allow is a rewrite of prior perl script.
++# Authors: Karl MacMillan <kmacmillan at mentalrootkit.com>
+ #
+-# Based off original audit2allow perl script: which credits
+-#    newrules.pl, Copyright (C) 2001 Justin R. Smith (jsmith at mcs.drexel.edu)
+-#    2003 Oct 11: Add -l option by Yuichi Nakamura(ynakam at users.sourceforge.jp)
++# Copyright (C) 2006-2007  Red Hat
++# see file 'COPYING' for use and warranty information
+ #
+-#    This program is free software; you can redistribute it and/or
+-#    modify it under the terms of the GNU General Public License as
+-#    published by the Free Software Foundation; either version 2 of
+-#    the License, or (at your option) any later version.
++# This program is free software; you can redistribute it and/or
++# modify it under the terms of the GNU General Public License as
++# published by the Free Software Foundation; version 2 only
+ #
+-#    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.
++# 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
++# 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
+ #
+-#  
+-from avc import *
+ 
+-if __name__ == '__main__':
+-	import commands, sys, os, getopt, selinux
+-        import gettext
+-	import re
++import sys
++import tempfile
++
++import sepolgen.audit as audit
++import sepolgen.policygen as policygen
++import sepolgen.interfaces as interfaces
++import sepolgen.output as output
++import sepolgen.objectmodel as objectmodel
++import sepolgen.defaults as defaults
++import sepolgen.module as module
++from sepolgen.sepolgeni18n import _
++
++class AuditToPolicy:
++    VERSION = "%prog .1"
++    SYSLOG = "/var/log/messages"
++
++    def __init__(self):
++        self.__options = None
++        self.__parser = None
++        self.__avs = None
++
++    def __parse_options(self):
++        from optparse import OptionParser
++
++        parser = OptionParser(version=self.VERSION)
++        parser.add_option("-a", "--audit", action="store_true", dest="audit", default=False,
++                          help="read input from audit log - conflicts with -i")
++        parser.add_option("-d", "--dmesg", action="store_true", dest="dmesg", default=False,
++                          help="read input from dmesg - conflicts with --audit and --input")
++        parser.add_option("-i", "--input", dest="input",
++                          help="read input from <input> - conflicts with -a")
++        parser.add_option("-l", "--lastreload", action="store_true", dest="lastreload", default=False,
++                          help="read input only after the last reload")
++        parser.add_option("-r", "--requires", action="store_true", dest="requires", default=False,
++                          help="generate require statements for rules")
++        parser.add_option("-m", "--module", dest="module",
++                          help="set the module name - implies --requires")
++        parser.add_option("-M", "--module-package", dest="module_package",
++                          help="generate a module package - conflicts with -o and -m")
++        parser.add_option("-o", "--output", dest="output",
++                          help="append output to <filename>, conflicts with -M")
++        parser.add_option("-R", "--reference", action="store_true", dest="refpolicy",
++                          default=False, help="generate refpolicy style output")
++        parser.add_option("-v", "--verbose", action="store_true", dest="verbose",
++                          default=False, help="explain generated output")
++        parser.add_option("-e", "--explain", action="store_true", dest="explain_long",
++                          default=False, help="fully explain generated output")
++        parser.add_option("-t", "--type", help="only process messages with a type that matches this regex",
++                          dest="type")
++        parser.add_option("--perm-map", dest="perm_map", help="file name of perm map")
++        parser.add_option("--interface-info", dest="interface_info", help="file name of interface information")
++        parser.add_option("--debug", dest="debug", action="store_true", default=False,
++                          help="leave generated modules for -M")
++
++        options, args = parser.parse_args()
++
++        # Make -d, -a, and -i conflict
++        if options.audit is True:
++            if options.input is not None:
++                sys.stderr.write("error: --audit conflicts with --input\n")
++            if options.dmesg is True:
++                sys.stderr.write("error: --audit conflicts with --dmesg\n")
++        if options.input is not None and options.dmesg is True:
++            sys.stderr.write("error: --input conflicts with --dmesg\n")
++
++        # Turn on requires generation if a module name is given. Also verify
++        # the module name.
++        if options.module:
++            name = options.module
++        else:
++            name = options.module_package
++        if name:
++            options.requires = True
++            if not module.is_valid_name(name):
++                sys.stderr.write("only letters and numbers allowed in module names\n")
++                sys.exit(2)
++
++        # Make -M and -o conflict
++        if options.module_package:
++            if options.output:
++                sys.stderr.write("error: --module-package conflicts with --output\n")
++                sys.exit(2)
++            if options.module:
++                sys.stderr.write("error: --module-package conflicts with --module\n")
++                sys.exit(2)
++
++        self.__options = options
++
++    def __read_input(self):
++        parser = audit.AuditParser(last_load_only=self.__options.lastreload)
++
++        filename = None
++        messages = None
++        f = None
++
++        # Figure out what input we want
++        if self.__options.input is not None:
++            filename = self.__options.input
++        elif self.__options.dmesg:
++            messages = audit.get_dmesg_msgs()
++        elif self.__options.audit:
++            try:
++                messages = audit.get_audit_msgs()
++            except OSError, e:
++                sys.stderr.write('could not run ausearch - "%s"\n' % str(e))
++                sys.exit(1)
++        else:
++            # This is the default if no input is specified
++            f = sys.stdin
++
++        # Get the input
++        if filename is not None:
++            try:
++                f = open(filename)
++            except IOError, e:
++                sys.stderr.write('could not open file %s - "%s"\n' % (filename, str(e)))
++                sys.exit(1)
++
++        if f is not None:
++            parser.parse_file(f)
++            f.close()
++
++        if messages is not None:
++            parser.parse_string(messages)
++
++        self.__parser = parser
++
++    def __process_input(self):
++        if self.__options.type:
++            filter = audit.TypeFilter(self.__options.type)
++            self.__avs = self.__parser.to_access(filter)
++        else:
++            self.__avs = self.__parser.to_access()
++
++    def __load_interface_info(self):
++        # Load interface info file
++        if self.__options.interface_info:
++            fn = self.__options.interface_info
++        else:
++            fn = defaults.interface_info()
+         try:
+-                gettext.install('policycoreutils')
++            fd = open(fn)
+         except:
+-                pass
+-	def get_mls_flag():
+-		if selinux.is_selinux_mls_enabled():
+-			return "-M"
+-		else:
+-			return ""
+-
+-	def usage(msg = ""):
+-		print _('audit2allow [-adhilrv] [-t file ] [ -f fcfile ] [-i <inputfile> ] [[-m|-M] <modulename> ] [-o <outputfile>]\n\
+-		-a, --all        read input from audit and message log, conflicts with -i\n\
+-		-d, --dmesg      read input from output of /bin/dmesg\n\
+-		-h, --help       display this message\n\
+-		-i, --input      read input from <inputfile> conflicts with -a\n\
+-		-l, --lastreload read input only after last \"load_policy\"\n\
+-		-m, --module     generate module/require output <modulename> \n\
+-		-M               generate loadable module package, conflicts with -o\n\
+-		-o, --output     append output to <outputfile>, conflicts with -M\n\
+-		-r, --requires   generate require output \n\
+-		-t, --tefile     Add input from Existing Type Enforcement file\n\
+-		-f, --fcfile     Existing Type Enforcement file, requires -M\n\
+-		-v, --verbose    verbose output\n\
+-                -A, --analyze    Analyze output\n\
+-                ')
+-		if msg != "":
+-			print msg
+-		sys.exit(1)
+-		
+-	def verify_module(module):
+-		m = re.findall("[^a-zA-Z0-9]", module)
+-		if len(m) != 0:
+-			usage(_("Alphanumeric Charaters Only"))
+-		
+-	def errorExit(error):
+-		sys.stderr.write("%s: " % sys.argv[0])
+-		sys.stderr.write("%s\n" % error)
+-		sys.stderr.flush()
+-		sys.exit(1)
+-
+-	#
+-	# 
+-	#
+-	try:
+-		last_reload = 0
+-		inputfd = sys.stdin
+-		output = sys.stdout
+-		module = ""
+-		requires = 0
+-		verbose = 0
+-		auditlogs = 0
+-		buildPP = 0
+-		input_ind = 0
+-		output_ind = 0
+-		ref_ind = False
+-		analyze = False
+-		te_inputs = []
+-
+-		fc_file = ""
+-		gopts, cmds = getopt.getopt(sys.argv[1:],
+-					    'Aadf:hi:lm:M:o:rt:vR',
+-					    ['all',
+-                                             'analyze',
+-                                             'dmesg',
+-					     'fcfile=',
+-					     'help',
+-					     'input=',
+-					     'lastreload',
+-					     'module=',
+-					     'output=',
+-					     'requires',
+-					     'reference',
+-					     'tefile=',
+-					     'verbose'
+-					     ])
+-		for o,a in gopts:
+-			if o == "-a" or o == "--all":
+-				if input_ind:
+-					usage()
+-				inputfd = open("/var/log/messages", "r")
+-				auditlogs = 1
+-			if o == "-d"  or o == "--dmesg":
+-				inputfd = os.popen("/bin/dmesg", "r")
+-			if o == "-f" or o == "--fcfile":
+-				if a[0] == "-":
+-					usage()
+-				fc_file = a
+-			if o == "-h" or o == "--help":
+-				usage()
+-			if o == "-i"or o == "--input":
+-				if auditlogs  or a[0] == "-":
+-					usage()
+-				input_ind = 1
+-				inputfd = open(a, "r")
+-			if o == '--lastreload' or o == "-l":
+-				last_reload = 1
+-			if o == "-m" or o == "--module":
+-				if module != "" or a[0] == "-":
+-					usage()
+-				module = a
+-				verify_module(module)
+-			if o == "-M":
+-				if module != "" or output_ind  or a[0] == "-":
+-					usage()
+-				module = a
+-				verify_module(module)
+-				outfile = a+".te"
+-				buildPP = 1
+-				if not os.path.exists("/usr/bin/checkmodule"):
+-					errorExit("-M Requires the checkmodule command, you need to install the checkpolicy rpm package")
+-				output = open(outfile, "w")
+-			if o == "-r" or o == "--requires":
+-				requires = 1
+-			if o == "-t" or o == "--tefile":
+-				te_inputs.append(open(a, "r"))
+-                                
+-			if o == "-R" or o == "--reference":
+-				ref_ind = True
+-				
+-			if o == "-o" or o == "--output":
+-				if module != ""  or a[0] == "-":
+-					usage()
+-				output = open(a, "a")
+-				output_ind = 1
+-			if o == "-v" or o == "--verbose":
+-				verbose = 1
+-				
+-			if o == "-A" or o == "--analyze":
+-				analyze = True
+-				
+-		if len(cmds) != 0:
+-			usage()
+-
+-		if fc_file != "" and not buildPP:
+-			usage("Error %s: Option -fc requires -M" % sys.argv[0])
+-			
+-                serules = SERules(last_reload, verbose)
+-
+-                for i in te_inputs:
+-                    te = TERules(serules)
+-                    te.load(i)
+-
+-                serules.load(inputfd)
+-
+-
+-		if ref_ind:
+-			serules.gen_reference_policy()
+-
+-		if analyze:
+-			serules.analyze()
+-			sys.exit(0)
+-
+-		if auditlogs and os.path.exists("/var/log/audit/audit.log"):
+-			inputfd = os.popen("ausearch -m avc,MAC_POLICY_LOAD")
+-			serules.load(inputfd)
+-
+-		if buildPP:
+-			print (_("Generating type enforcment file: %s.te") % module)
+-		output.write(serules.out(requires, module))
+-		output.flush()
+-		if buildPP:
+-			if ref_ind:
+-				rc, type = selinux.selinux_getpolicytype()
+-				cmd = "make -f /usr/share/selinux/%s/include/Makefile %s.pp" % (type, module)
+-				print _("Compiling policy")
+-				print cmd
+-				rc = commands.getstatusoutput(cmd)
+-			else:
+-				cmd = "checkmodule %s -m -o %s.mod %s.te" % (get_mls_flag(), module, module)
+-				print _("Compiling policy")
+-				print cmd
+-				rc = commands.getstatusoutput(cmd)
+-				if rc[0] == 0:
+-					cmd = "semodule_package -o %s.pp -m %s.mod" % (module, module)
+-					if fc_file != "":
+-						cmd = "%s -f %s" % (cmd, fc_file)
+-					
+-					print cmd
+-					rc = commands.getstatusoutput(cmd)
+-			if rc[0] == 0:
+-				print _("\n******************** IMPORTANT ***********************\n")
+-				print (_("In order to load this newly created policy package into the kernel,\nyou are required to execute \n\nsemodule -i %s.pp\n\n") % module)
+-			else:
+-				errorExit(rc[1])
+-
+-	except getopt.error, error:
+-		errorExit(_("Options Error: %s ") % error.msg)
+-	except ValueError, error:
+-		errorExit(error.args[0])
+-	except IOError, error:
+-		errorExit(error)
+-	except KeyboardInterrupt, error:
+-		sys.exit(0)
++            sys.stderr.write("could not open interface info [%s]\n" % fn)
++            sys.exit(1)
++
++        ifs = interfaces.InterfaceSet()
++        ifs.from_file(fd)
++        fd.close()
++
++        # Also load perm maps
++        if self.__options.perm_map:
++            fn = self.__options.perm_map
++        else:
++            fn = defaults.perm_map()
++        try:
++            fd = open(fn)
++        except:
++            sys.stderr.write("could not open perm map [%s]\n" % fn)
++            sys.exit(1)
++
++        perm_maps = objectmodel.PermMappings()
++        perm_maps.from_file(fd)
++
++        return (ifs, perm_maps)
++
++    def __output_modulepackage(self, writer, generator):
++        generator.set_module_name(self.__options.module_package)
++        filename = self.__options.module_package + ".te"
++        packagename = self.__options.module_package + ".pp"
++
++        try:
++            fd = open(filename, "w")
++        except IOError, e:
++            sys.stderr.write("could not write output file: %s\n", str(e))
++            sys.exit(1)
++
++        writer.write(generator.get_module(), fd)
++        fd.close()
++
++        mc = module.ModuleCompiler()
++
++        try:
++            mc.create_module_package(filename, self.__options.refpolicy)
++        except RuntimeError, e:
++            print e
++            sys.exit(1)
++
++        sys.stdout.write(_("******************** IMPORTANT ***********************\n"))
++        sys.stdout.write((_("To make this policy package active, execute:" +\
++                                "\n\nsemodule -i %s\n\n") % packagename))
++
++    def __output(self):
++        g = policygen.PolicyGenerator()
++
++        if self.__options.module:
++            g.set_module_name(self.__options.module)
++
++        # Interface generation
++        if self.__options.refpolicy:
++            ifs, perm_maps = self.__load_interface_info()
++            g.set_gen_refpol(ifs, perm_maps)
++
++        # Explanation
++        if self.__options.verbose:
++            g.set_gen_explain(policygen.SHORT_EXPLANATION)
++        if self.__options.explain_long:
++            g.set_gen_explain(policygen.LONG_EXPLANATION)
++
++        # Requires
++        if self.__options.requires:
++            g.set_gen_requires(True)
++
++        # Generate the policy
++        g.add_access(self.__avs)
++
++        # Output
++        writer = output.ModuleWriter()
++
++        # Module package
++        if self.__options.module_package:
++            self.__output_modulepackage(writer, g)
++        else:
++            # File or stdout
++            if self.__options.module:
++                g.set_module_name(self.__options.module)
++
++            if self.__options.output:
++                fd = open(self.__options.output, "w")
++            else:
++                fd = sys.stdout
++            writer.write(g.get_module(), fd)
++
++    def main(self):
++        try:
++            self.__parse_options()
++            self.__read_input()
++            self.__process_input()
++            self.__output()
++        except KeyboardInterrupt:
++            sys.exit(0)
++
++if __name__ == "__main__":
++    app = AuditToPolicy()
++    app.main()
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-1.34.1/audit2allow/Makefile
+--- nsapolicycoreutils/audit2allow/Makefile	2007-01-24 10:04:01.000000000 -0500
++++ policycoreutils-1.34.1/audit2allow/Makefile	2007-04-16 14:12:03.000000000 -0400
+@@ -4,23 +4,19 @@
+ LIBDIR ?= $(PREFIX)/lib
+ MANDIR ?= $(PREFIX)/share/man
+ LOCALEDIR ?= /usr/share/locale
+-PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]')
+-PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
+ 
+-TARGETS=audit2allow
+-
+-all: $(TARGETS)
++all: ;
+ 
+ install: all
+ 	-mkdir -p $(BINDIR)
+-	install -m 755 $(TARGETS) $(BINDIR)
++	install -m 755 audit2allow $(BINDIR)
++	install -m 755 sepolgen-ifgen $(BINDIR)
+ 	-mkdir -p $(MANDIR)/man1
+ 	install -m 644 audit2allow.1 $(MANDIR)/man1/
+-	test -d $(PYTHONLIBDIR)/site-packages || install -m 755 -d $(PYTHONLIBDIR)/site-packages
+-	install -m 755 avc.py $(PYTHONLIBDIR)/site-packages
+ 
+ clean:
++	rm -f *~
+ 
+-indent:
++indent: ;
+ 
+-relabel:
++relabel: ;
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/sepolgen-ifgen policycoreutils-1.34.1/audit2allow/sepolgen-ifgen
+--- nsapolicycoreutils/audit2allow/sepolgen-ifgen	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-1.34.1/audit2allow/sepolgen-ifgen	2007-04-16 14:12:33.000000000 -0400
+@@ -0,0 +1,86 @@
++#! /usr/bin/python -E
++#
++# Authors: Karl MacMillan <kmacmillan at mentalrootkit.com>
++#
++# Copyright (C) 2006 Red Hat 
++# see file 'COPYING' for use and warranty information
++#
++# This program is free software; you can redistribute it and/or
++# modify it under the terms of the GNU General Public License as
++# published by the Free Software Foundation; version 2 only
++#
++# 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
++#
++
++# Parse interfaces and output extracted information about them
++# suitable for policy generation. By default writes the output
++# to the default location (obtained from sepolgen.defaults), but
++# will output to another file provided as an argument:
++#   sepolgen-ifgen [headers] [output-filename]
++
++
++import sys
++import os
++
++import sepolgen.refparser as refparser
++import sepolgen.defaults as defaults
++import sepolgen.interfaces as interfaces
++
++
++VERSION = "%prog .1"
++
++def parse_options():
++    from optparse import OptionParser
++
++    parser = OptionParser(version=VERSION)
++    parser.add_option("-o", "--output", dest="output", default=defaults.interface_info(),
++                      help="filename to store output")
++    parser.add_option("-i", "--interfaces", dest="headers", default=defaults.headers(),
++                      help="location of the interface header files")
++    parser.add_option("-v", "--verbose", action="store_true", default=False,
++                      help="print debuging output")
++    parser.add_option("-d", "--debug", action="store_true", default=False,
++                     help="extra debugging output")
++    options, args = parser.parse_args()
++    
++    return options
++
++
++def main():
++    options = parse_options()
++
++    # Open the output first to generate errors before parsing
++    try:
++        f = open(options.output, "w")
++    except IOError, e:
++        sys.stderr.write("could not open output file [%s]\n" % options.output)
++        return 1
++
++    if options.verbose:
++        log = sys.stdout
++    else:
++        log = None
++
++    try:
++        headers = refparser.parse_headers(options.headers, output=log, debug=options.debug)
++    except ValueError, e:
++        print "error parsing headers"
++        print str(e)
++        return 1
++
++    if_set = interfaces.InterfaceSet(output=log)
++    if_set.add_headers(headers)
++    if_set.to_file(f)
++    f.close()
++
++    return 0
++    
++if __name__ == "__main__":
++    sys.exit(main())
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.34.1/Makefile
+--- nsapolicycoreutils/Makefile	2007-01-24 10:04:00.000000000 -0500
++++ policycoreutils-1.34.1/Makefile	2007-04-16 14:08:01.000000000 -0400
+@@ -1,4 +1,4 @@
+-SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
++SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
+ 
+ all install relabel clean indent:
+ 	@for subdir in $(SUBDIRS); do \
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.34.1/restorecon/restorecon.c
+--- nsapolicycoreutils/restorecon/restorecon.c	2007-01-24 10:04:01.000000000 -0500
++++ policycoreutils-1.34.1/restorecon/restorecon.c	2007-04-16 14:08:01.000000000 -0400
+@@ -336,8 +336,8 @@
+ 				if (!file_exist && errno == ENOENT)
+ 					return;
+ 				fprintf(stderr,
+-					"%s:  error while labeling files under %s\n",
+-					progname, buf);
++					"%s: %s: %s\n",
++					progname, buf, strerror(errno));
+ 				errors++;
+ 			}
+ 		}
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.34.1/restorecond/restorecond.c
+--- nsapolicycoreutils/restorecond/restorecond.c	2007-01-24 10:04:01.000000000 -0500
++++ policycoreutils-1.34.1/restorecond/restorecond.c	2007-04-16 14:08:01.000000000 -0400
 @@ -210,9 +210,10 @@
  			}
  
@@ -26,8 +659,23 @@
  	}
  	free(scontext);
  	close(fd);
---- policycoreutils-1.34.1/restorecond/restorecond.init.rhat	2007-01-24 10:04:01.000000000 -0500
-+++ policycoreutils-1.34.1/restorecond/restorecond.init	2007-04-16 08:04:45.000000000 -0400
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.34.1/restorecond/restorecond.conf
+--- nsapolicycoreutils/restorecond/restorecond.conf	2007-01-24 10:04:01.000000000 -0500
++++ policycoreutils-1.34.1/restorecond/restorecond.conf	2007-04-16 14:08:01.000000000 -0400
+@@ -1,7 +1,10 @@
+ /etc/resolv.conf
++/etc/localtime
+ /etc/samba/secrets.tdb
+ /etc/mtab
+ /var/run/utmp
++/var/run/faillog
+ /var/log/wtmp
++/etc/lvm/.cache
+ ~/public_html
+ ~/.mozilla/plugins/libflashplayer.so
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-1.34.1/restorecond/restorecond.init
+--- nsapolicycoreutils/restorecond/restorecond.init	2007-01-24 10:04:01.000000000 -0500
++++ policycoreutils-1.34.1/restorecond/restorecond.init	2007-04-16 14:08:01.000000000 -0400
 @@ -1,43 +1,68 @@
  #!/bin/sh
  #
@@ -122,65 +770,9 @@
 -exit 0
 +exit $RETVAL
 +
---- policycoreutils-1.34.1/restorecon/restorecon.c.rhat	2007-01-24 10:04:01.000000000 -0500
-+++ policycoreutils-1.34.1/restorecon/restorecon.c	2007-04-16 08:04:45.000000000 -0400
-@@ -336,8 +336,8 @@
- 				if (!file_exist && errno == ENOENT)
- 					return;
- 				fprintf(stderr,
--					"%s:  error while labeling files under %s\n",
--					progname, buf);
-+					"%s: %s: %s\n",
-+					progname, buf, strerror(errno));
- 				errors++;
- 			}
- 		}
---- policycoreutils-1.34.1/semanage/seobject.py.rhat	2007-01-24 10:04:01.000000000 -0500
-+++ policycoreutils-1.34.1/semanage/seobject.py	2007-04-16 08:04:45.000000000 -0400
-@@ -209,7 +209,8 @@
- 		os.write(fd, self.out())
- 		os.close(fd)
- 		os.rename(newfilename, self.filename)
--
-+                os.system("/sbin/service mcstrans reload > /dev/null")
-+                
- class semanageRecords:
- 	def __init__(self):
- 		self.sh = semanage_handle_create()
-@@ -464,7 +465,8 @@
- 				rc = semanage_user_set_mlslevel(self.sh, u, selevel)
- 				if rc < 0:
- 					raise ValueError(_("Could not set MLS level for %s") % name)
--
-+                        if selinux.security_check_context("system_u:object_r:%s_home_t:s0" % prefix) != 0:
-+                               raise ValueError(_("Invalid prefix %s") % prefix)
- 			rc = semanage_user_set_prefix(self.sh, u, prefix)
- 			if rc < 0:
- 				raise ValueError(_("Could not add prefix %s for %s") % (r, prefix))
-@@ -530,7 +532,9 @@
- 				semanage_user_set_mlslevel(self.sh, u, untranslate(selevel))
- 
- 			if prefix != "":
--				semanage_user_set_prefix(self.sh, u, prefix)
-+                               if selinux.security_check_context("system_u:object_r:%s_home_t" % prefix) != 0:
-+                                      raise ValueError(_("Invalid prefix %s") % prefix)
-+                               semanage_user_set_prefix(self.sh, u, prefix)
- 
- 			if len(roles) != 0:
-                                for r in rlist:
---- policycoreutils-1.34.1/scripts/fixfiles.8.rhat	2007-04-16 08:04:45.000000000 -0400
-+++ policycoreutils-1.34.1/scripts/fixfiles.8	2007-04-16 08:04:54.000000000 -0400
-@@ -35,7 +35,7 @@
- 
- .TP 
- .B -f
--Don't prompt for removal of /tmp directory.
-+Don't prompt for removal of /tmp directory, always remove it.
- 
- .TP 
- .B -R rpmpackagename[,rpmpackagename...]
---- policycoreutils-1.34.1/scripts/chcat.rhat	2007-01-24 10:04:01.000000000 -0500
-+++ policycoreutils-1.34.1/scripts/chcat	2007-04-16 08:04:45.000000000 -0400
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-1.34.1/scripts/chcat
+--- nsapolicycoreutils/scripts/chcat	2007-01-24 10:04:01.000000000 -0500
++++ policycoreutils-1.34.1/scripts/chcat	2007-04-16 14:08:01.000000000 -0400
 @@ -62,12 +62,20 @@
          for i in newcat[1:]:
              if i not in cats:
@@ -246,39 +838,49 @@
      return errors
      
  def chcat_replace(newcat, objects, login_ind):
---- policycoreutils-1.34.1/audit2allow/audit2allow.rhat	2007-01-24 10:04:01.000000000 -0500
-+++ policycoreutils-1.34.1/audit2allow/audit2allow	2007-04-16 08:04:45.000000000 -0400
-@@ -32,8 +32,10 @@
- 	import re
-         try:
-                 gettext.install('policycoreutils')
--        except:
--                pass
-+	except IOError:
-+		import __builtin__
-+		__builtin__.__dict__['_'] = unicode
-+
- 	def get_mls_flag():
- 		if selinux.is_selinux_mls_enabled():
- 			return "-M"
---- policycoreutils-1.34.1/Makefile.rhat	2007-01-24 10:04:00.000000000 -0500
-+++ policycoreutils-1.34.1/Makefile	2007-04-16 08:04:45.000000000 -0400
-@@ -1,4 +1,4 @@
--SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
-+SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles.8 policycoreutils-1.34.1/scripts/fixfiles.8
+--- nsapolicycoreutils/scripts/fixfiles.8	2007-01-24 10:04:01.000000000 -0500
++++ policycoreutils-1.34.1/scripts/fixfiles.8	2007-04-16 14:08:01.000000000 -0400
+@@ -35,7 +35,7 @@
  
- all install relabel clean indent:
- 	@for subdir in $(SUBDIRS); do \
---- nsapolicycoreutils/restorecond/restorecond.conf	2006-11-20 12:19:55.000000000 -0500
-+++ policycoreutils-2.0.7/restorecond/restorecond.conf	2007-03-23 09:03:56.000000000 -0400
-@@ -1,7 +1,10 @@
- /etc/resolv.conf
-+/etc/localtime
- /etc/samba/secrets.tdb
- /etc/mtab
- /var/run/utmp
-+/var/run/faillog
- /var/log/wtmp
-+/etc/lvm/.cache
- ~/public_html
- ~/.mozilla/plugins/libflashplayer.so
+ .TP 
+ .B -f
+-Don't prompt for removal of /tmp directory.
++Don't prompt for removal of /tmp directory, always remove it.
+ 
+ .TP 
+ .B -R rpmpackagename[,rpmpackagename...]
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.34.1/semanage/seobject.py
+--- nsapolicycoreutils/semanage/seobject.py	2007-01-24 10:04:01.000000000 -0500
++++ policycoreutils-1.34.1/semanage/seobject.py	2007-04-16 14:08:01.000000000 -0400
+@@ -209,7 +209,8 @@
+ 		os.write(fd, self.out())
+ 		os.close(fd)
+ 		os.rename(newfilename, self.filename)
+-
++                os.system("/sbin/service mcstrans reload > /dev/null")
++                
+ class semanageRecords:
+ 	def __init__(self):
+ 		self.sh = semanage_handle_create()
+@@ -464,7 +465,8 @@
+ 				rc = semanage_user_set_mlslevel(self.sh, u, selevel)
+ 				if rc < 0:
+ 					raise ValueError(_("Could not set MLS level for %s") % name)
+-
++                        if selinux.security_check_context("system_u:object_r:%s_home_t:s0" % prefix) != 0:
++                               raise ValueError(_("Invalid prefix %s") % prefix)
+ 			rc = semanage_user_set_prefix(self.sh, u, prefix)
+ 			if rc < 0:
+ 				raise ValueError(_("Could not add prefix %s for %s") % (r, prefix))
+@@ -530,7 +532,9 @@
+ 				semanage_user_set_mlslevel(self.sh, u, untranslate(selevel))
+ 
+ 			if prefix != "":
+-				semanage_user_set_prefix(self.sh, u, prefix)
++                               if selinux.security_check_context("system_u:object_r:%s_home_t" % prefix) != 0:
++                                      raise ValueError(_("Invalid prefix %s") % prefix)
++                               semanage_user_set_prefix(self.sh, u, prefix)
+ 
+ 			if len(roles) != 0:
+                                for r in rlist:



From fedora-cvs-commits at redhat.com  Mon Apr 16 18:25:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 14:25:57 -0400
Subject: rpms/bcel/devel bcel.spec,1.25,1.26
Message-ID: <200704161825.l3GIPvjR012236@cvs.devel.redhat.com>

Author: pcheung

Update of /cvs/dist/rpms/bcel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12222

Modified Files:
	bcel.spec 
Log Message:
More rpmlint cleanup



Index: bcel.spec
===================================================================
RCS file: /cvs/dist/rpms/bcel/devel/bcel.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- bcel.spec	16 Mar 2007 17:46:00 -0000	1.25
+++ bcel.spec	16 Apr 2007 18:25:54 -0000	1.26
@@ -112,8 +112,6 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Requires(post): /bin/rm /bin/ln
-Requires(postun): /bin/rm
 
 %description javadoc
 %{summary}.
@@ -128,6 +126,7 @@
 %package demo
 Summary:        Examples for %{name}
 Group:          Development/Libraries/Java
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description demo
 %{summary}.
@@ -167,6 +166,9 @@
 perl -p -i -e 's| depends=\"examples\"||g;' build.xml
 touch manifest.txt
 
+# fix wrong-file-end-of-line-encoding
+sed -i 's/\r//' docs/verifier/V_API_SD.eps docs/eps/classloader.fig
+
 %build
 %if %{with_maven}
 export DEPCAT=$(pwd)/bcel-5.1-depcat.new.xml
@@ -183,7 +185,7 @@
 
 for p in $(find . -name project.xml); do
     pushd $(dirname $p)
-    cp project.xml project.xml.orig
+    cp -pr project.xml project.xml.orig
     /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
     popd
 done
@@ -221,8 +223,11 @@
 %endif
 
 # samples
-%__mkdir_p %{buildroot}%{_datadir}/%{name}-%{version}
-%__cp -pr examples/* %{buildroot}%{_datadir}/%{name}-%{version}
+%__mkdir_p %{buildroot}%{_datadir}/%{name}-%{version}/demo
+%__cp -pr examples/ %{buildroot}%{_datadir}/%{name}-%{version}/demo/
+#TODO: need some kind of doc for the demo package for instructions on how to
+# build and run the demos. 
+
 # manual
 %__mkdir_p %{buildroot}%{_docdir}/%{name}-%{version}
 %if %{with_maven}
@@ -230,6 +235,7 @@
 %else
 %__cp -pr docs/* %{buildroot}%{_docdir}/%{name}-%{version}
 %endif
+%__cp -pr LICENSE.txt %{buildroot}%{_docdir}/%{name}-%{version}/
 
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
@@ -256,7 +262,7 @@
 
 %files
 %defattr(0644,root,root,0755)
-%doc LICENSE.txt 
+%doc %{_docdir}/%{name}-%{version}/LICENSE.txt 
 %{_javadir}/*
 
 %if %{gcj_support}
@@ -273,12 +279,12 @@
 
 %files demo
 %defattr(0644,root,root,0755)
-%{_datadir}/%{name}-%{version}
+%{_datadir}/%{name}-%{version}/demo
 
 # -----------------------------------------------------------------------------
 
 %changelog
-* Fri Mar 16 2007 Permaine Cheung <pcheung at redhat.com> 0:5.1-10jpp.1
+* Fri Apr 13 2007 Permaine Cheung <pcheung at redhat.com> 0:5.1-10jpp.1
 - Merge with upstream version and rpmlint cleanup, fix BR
 
 * Fri Feb 09 2007 Ralph Apel <r.apel at r-apel.de> 0:5.1-10jpp



From fedora-cvs-commits at redhat.com  Mon Apr 16 18:26:29 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 14:26:29 -0400
Subject: rpms/policycoreutils/FC-6 policycoreutils-rhat.patch,1.254,1.255
Message-ID: <200704161826.l3GIQTxZ012266@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-rhat.patch 
Log Message:
* Mon Apr 16 2007 Dan Walsh <dwalsh at redhat.com> 1.34.1-6
- Add sepolgen/gui


policycoreutils-rhat.patch:
 Makefile                     |    2 
 audit2allow/Makefile         |   13 -
 audit2allow/audit2allow      |  473 +++++++++++++++++++++++--------------------
 audit2allow/sepolgen-ifgen   |   86 +++++++
 restorecon/restorecon.c      |    4 
 restorecond/restorecond.c    |   12 -
 restorecond/restorecond.conf |    3 
 restorecond/restorecond.init |   43 +++
 scripts/chcat                |   36 ++-
 scripts/fixfiles.8           |    2 
 semanage/seobject.py         |   10 
 11 files changed, 433 insertions(+), 251 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-6/policycoreutils-rhat.patch,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- policycoreutils-rhat.patch	16 Apr 2007 18:18:15 -0000	1.254
+++ policycoreutils-rhat.patch	16 Apr 2007 18:26:26 -0000	1.255
@@ -486,13 +486,17 @@
 +    app.main()
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-1.34.1/audit2allow/Makefile
 --- nsapolicycoreutils/audit2allow/Makefile	2007-01-24 10:04:01.000000000 -0500
-+++ policycoreutils-1.34.1/audit2allow/Makefile	2007-04-16 14:12:03.000000000 -0400
-@@ -4,23 +4,19 @@
++++ policycoreutils-1.34.1/audit2allow/Makefile	2007-04-16 14:26:04.000000000 -0400
+@@ -1,26 +1,27 @@
+ # Installation directories.
+ PREFIX ?= ${DESTDIR}/usr
+ BINDIR ?= $(PREFIX)/bin
++SBINDIR ?= $(PREFIX)/sbin
  LIBDIR ?= $(PREFIX)/lib
  MANDIR ?= $(PREFIX)/share/man
  LOCALEDIR ?= /usr/share/locale
--PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]')
--PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
+ PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]')
+ PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
  
 -TARGETS=audit2allow
 -
@@ -503,11 +507,11 @@
  	-mkdir -p $(BINDIR)
 -	install -m 755 $(TARGETS) $(BINDIR)
 +	install -m 755 audit2allow $(BINDIR)
-+	install -m 755 sepolgen-ifgen $(BINDIR)
++	install -m 755 sepolgen-ifgen $(SBINDIR)
  	-mkdir -p $(MANDIR)/man1
  	install -m 644 audit2allow.1 $(MANDIR)/man1/
--	test -d $(PYTHONLIBDIR)/site-packages || install -m 755 -d $(PYTHONLIBDIR)/site-packages
--	install -m 755 avc.py $(PYTHONLIBDIR)/site-packages
+ 	test -d $(PYTHONLIBDIR)/site-packages || install -m 755 -d $(PYTHONLIBDIR)/site-packages
+ 	install -m 755 avc.py $(PYTHONLIBDIR)/site-packages
  
  clean:
 +	rm -f *~



From fedora-cvs-commits at redhat.com  Mon Apr 16 18:32:25 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 14:32:25 -0400
Subject: rpms/kernel/devel linux-2.6-net-e1000-revert.patch, NONE,
	1.1 kernel-2.6.spec, 1.3072, 1.3073
Message-ID: <200704161832.l3GIWP9K026278@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-net-e1000-revert.patch 
Log Message:
* Mon Apr 16 2007 Dave Jones <davej at redhat.com>
- Revert e1000 driver to 2.6.20


linux-2.6-net-e1000-revert.patch:
 e1000.h         |    8 --
 e1000_ethtool.c |    8 --
 e1000_hw.h      |    2 
 e1000_main.c    |  201 +++++++++++++++-----------------------------------------
 e1000_osdep.h   |    4 -
 e1000_param.c   |   15 ----
 6 files changed, 61 insertions(+), 177 deletions(-)

--- NEW FILE linux-2.6-net-e1000-revert.patch ---
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index f091042..dd4b728 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -59,17 +59,13 @@
 #include <linux/capability.h>
 #include <linux/in.h>
 #include <linux/ip.h>
-#ifdef NETIF_F_TSO6
 #include <linux/ipv6.h>
-#endif
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <net/pkt_sched.h>
 #include <linux/list.h>
 #include <linux/reboot.h>
-#ifdef NETIF_F_TSO
 #include <net/checksum.h>
-#endif
 #include <linux/mii.h>
 #include <linux/ethtool.h>
 #include <linux/if_vlan.h>
@@ -257,7 +253,6 @@ struct e1000_adapter {
 	spinlock_t tx_queue_lock;
 #endif
 	atomic_t irq_sem;
-	unsigned int detect_link;
 	unsigned int total_tx_bytes;
 	unsigned int total_tx_packets;
 	unsigned int total_rx_bytes;
@@ -342,15 +337,12 @@ struct e1000_adapter {
 	struct e1000_rx_ring test_rx_ring;
 
 
-	uint32_t *config_space;
 	int msg_enable;
 #ifdef CONFIG_PCI_MSI
 	boolean_t have_msi;
 #endif
 	/* to not mess up cache alignment, always add to the bottom */
-#ifdef NETIF_F_TSO
 	boolean_t tso_force;
-#endif
 	boolean_t smart_power_down;	/* phy smart power down */
 	boolean_t quad_port_a;
 	unsigned long flags;
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index fb96c87..6777887 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -166,7 +166,7 @@ e1000_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
 			ecmd->transceiver = XCVR_EXTERNAL;
 	}
 
-	if (netif_carrier_ok(adapter->netdev)) {
+	if (E1000_READ_REG(&adapter->hw, STATUS) & E1000_STATUS_LU) {
 
 		e1000_get_speed_and_duplex(hw, &adapter->link_speed,
 		                                   &adapter->link_duplex);
@@ -338,7 +338,6 @@ e1000_set_tx_csum(struct net_device *netdev, uint32_t data)
 	return 0;
 }
 
-#ifdef NETIF_F_TSO
 static int
 e1000_set_tso(struct net_device *netdev, uint32_t data)
 {
@@ -352,18 +351,15 @@ e1000_set_tso(struct net_device *netdev, uint32_t data)
 	else
 		netdev->features &= ~NETIF_F_TSO;
 
-#ifdef NETIF_F_TSO6
 	if (data)
 		netdev->features |= NETIF_F_TSO6;
 	else
 		netdev->features &= ~NETIF_F_TSO6;
-#endif
 
 	DPRINTK(PROBE, INFO, "TSO is %s\n", data ? "Enabled" : "Disabled");
 	adapter->tso_force = TRUE;
 	return 0;
 }
-#endif /* NETIF_F_TSO */
 
 static uint32_t
 e1000_get_msglevel(struct net_device *netdev)
@@ -1971,10 +1967,8 @@ static const struct ethtool_ops e1000_ethtool_ops = {
 	.set_tx_csum            = e1000_set_tx_csum,
 	.get_sg                 = ethtool_op_get_sg,
 	.set_sg                 = ethtool_op_set_sg,
-#ifdef NETIF_F_TSO
 	.get_tso                = ethtool_op_get_tso,
 	.set_tso                = e1000_set_tso,
-#endif
 	.self_test_count        = e1000_diag_test_count,
 	.self_test              = e1000_diag_test,
 	.get_strings            = e1000_get_strings,
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h
index d671058..bd000b8 100644
--- a/drivers/net/e1000/e1000_hw.h
+++ b/drivers/net/e1000/e1000_hw.h
@@ -3253,7 +3253,7 @@ struct e1000_host_command_info {
 #define IFE_PMC_AUTO_MDIX                    0x0080  /* 1=enable MDI/MDI-X feature, default 0=disabled */
 #define IFE_PMC_FORCE_MDIX                   0x0040  /* 1=force MDIX-X, 0=force MDI */
 #define IFE_PMC_MDIX_STATUS                  0x0020  /* 1=MDI-X, 0=MDI */
-#define IFE_PMC_AUTO_MDIX_COMPLETE           0x0010  /* Resolution algorthm is completed */
+#define IFE_PMC_AUTO_MDIX_COMPLETE           0x0010  /* Resolution algorithm is completed */
 #define IFE_PMC_MDIX_MODE_SHIFT              6
 #define IFE_PHC_MDIX_RESET_ALL_MASK          0x0000  /* Disable auto MDI-X */
 
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index c6259c7..1d08e93 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -36,7 +36,7 @@ static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
 #else
 #define DRIVERNAPI "-NAPI"
 #endif
-#define DRV_VERSION "7.3.15-k2"DRIVERNAPI
+#define DRV_VERSION "7.3.20-k2"DRIVERNAPI
 char e1000_driver_version[] = DRV_VERSION;
 static char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation.";
 
@@ -376,7 +376,7 @@ e1000_update_mng_vlan(struct e1000_adapter *adapter)
 	uint16_t vid = adapter->hw.mng_cookie.vlan_id;
 	uint16_t old_vid = adapter->mng_vlan_id;
 	if (adapter->vlgrp) {
-		if (!adapter->vlgrp->vlan_devices[vid]) {
+		if (!vlan_group_get_device(adapter->vlgrp, vid)) {
 			if (adapter->hw.mng_cookie.status &
 				E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) {
 				e1000_vlan_rx_add_vid(netdev, vid);
@@ -386,7 +386,7 @@ e1000_update_mng_vlan(struct e1000_adapter *adapter)
 
 			if ((old_vid != (uint16_t)E1000_MNG_VLAN_NONE) &&
 					(vid != old_vid) &&
-					!adapter->vlgrp->vlan_devices[old_vid])
+			    !vlan_group_get_device(adapter->vlgrp, old_vid))
 				e1000_vlan_rx_kill_vid(netdev, old_vid);
 		} else
 			adapter->mng_vlan_id = vid;
@@ -990,16 +990,12 @@ e1000_probe(struct pci_dev *pdev,
 			netdev->features &= ~NETIF_F_HW_VLAN_FILTER;
 	}
 
-#ifdef NETIF_F_TSO
 	if ((adapter->hw.mac_type >= e1000_82544) &&
 	   (adapter->hw.mac_type != e1000_82547))
 		netdev->features |= NETIF_F_TSO;
 
-#ifdef NETIF_F_TSO6
 	if (adapter->hw.mac_type > e1000_82547_rev_2)
 		netdev->features |= NETIF_F_TSO6;
-#endif
-#endif
 	if (pci_using_dac)
 		netdev->features |= NETIF_F_HIGHDMA;
 
@@ -1486,7 +1482,7 @@ e1000_close(struct net_device *netdev)
 	if ((adapter->hw.mng_cookie.status &
 			  E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) &&
 	     !(adapter->vlgrp &&
-			  adapter->vlgrp->vlan_devices[adapter->mng_vlan_id])) {
+	       vlan_group_get_device(adapter->vlgrp, adapter->mng_vlan_id))) {
 		e1000_vlan_rx_kill_vid(netdev, adapter->mng_vlan_id);
 	}
 
@@ -2583,15 +2579,22 @@ e1000_watchdog(unsigned long data)
 
 	if (link) {
 		if (!netif_carrier_ok(netdev)) {
+			uint32_t ctrl;
 			boolean_t txb2b = 1;
 			e1000_get_speed_and_duplex(&adapter->hw,
 			                           &adapter->link_speed,
 			                           &adapter->link_duplex);
 
-			DPRINTK(LINK, INFO, "NIC Link is Up %d Mbps %s\n",
-			       adapter->link_speed,
-			       adapter->link_duplex == FULL_DUPLEX ?
-			       "Full Duplex" : "Half Duplex");
+			ctrl = E1000_READ_REG(&adapter->hw, CTRL);
+			DPRINTK(LINK, INFO, "NIC Link is Up %d Mbps %s, "
+			        "Flow Control: %s\n",
+			        adapter->link_speed,
+			        adapter->link_duplex == FULL_DUPLEX ?
+			        "Full Duplex" : "Half Duplex",
+			        ((ctrl & E1000_CTRL_TFCE) && (ctrl &
+			        E1000_CTRL_RFCE)) ? "RX/TX" : ((ctrl &
+			        E1000_CTRL_RFCE) ? "RX" : ((ctrl &
+			        E1000_CTRL_TFCE) ? "TX" : "None" )));
 
 			/* tweak tx_queue_len according to speed/duplex
 			 * and adjust the timeout factor */
@@ -2619,7 +2622,6 @@ e1000_watchdog(unsigned long data)
 				E1000_WRITE_REG(&adapter->hw, TARC0, tarc0);
 			}
 
-#ifdef NETIF_F_TSO
 			/* disable TSO for pcie and 10/100 speeds, to avoid
 			 * some hardware issues */
 			if (!adapter->tso_force &&
@@ -2630,22 +2632,17 @@ e1000_watchdog(unsigned long data)
 					DPRINTK(PROBE,INFO,
 				        "10/100 speed: disabling TSO\n");
 					netdev->features &= ~NETIF_F_TSO;
-#ifdef NETIF_F_TSO6
 					netdev->features &= ~NETIF_F_TSO6;
-#endif
 					break;
 				case SPEED_1000:
 					netdev->features |= NETIF_F_TSO;
-#ifdef NETIF_F_TSO6
 					netdev->features |= NETIF_F_TSO6;
-#endif
 					break;
 				default:
 					/* oops */
 					break;
 				}
 			}
-#endif
 
 			/* enable transmits in the hardware, need to do this
 			 * after setting TARC0 */
@@ -2875,7 +2872,6 @@ static int
 e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
           struct sk_buff *skb)
 {
-#ifdef NETIF_F_TSO
 	struct e1000_context_desc *context_desc;
 	struct e1000_buffer *buffer_info;
 	unsigned int i;
@@ -2904,7 +2900,6 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
 						   0);
 			cmd_length = E1000_TXD_CMD_IP;
 			ipcse = skb->h.raw - skb->data - 1;
-#ifdef NETIF_F_TSO6
 		} else if (skb->protocol == htons(ETH_P_IPV6)) {
 			skb->nh.ipv6h->payload_len = 0;
 			skb->h.th->check =
@@ -2914,7 +2909,6 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
 						 IPPROTO_TCP,
 						 0);
 			ipcse = 0;
-#endif
 		}
 		ipcss = skb->nh.raw - skb->data;
 		ipcso = (void *)&(skb->nh.iph->check) - (void *)skb->data;
@@ -2947,8 +2941,6 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
 
 		return TRUE;
 	}
-#endif
-
 	return FALSE;
 }
 
@@ -2968,8 +2960,9 @@ e1000_tx_csum(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
 		buffer_info = &tx_ring->buffer_info[i];
 		context_desc = E1000_CONTEXT_DESC(*tx_ring, i);
 
+		context_desc->lower_setup.ip_config = 0;
 		context_desc->upper_setup.tcp_fields.tucss = css;
-		context_desc->upper_setup.tcp_fields.tucso = css + skb->csum_offset;
+		context_desc->upper_setup.tcp_fields.tucso = css + skb->csum;
 		context_desc->upper_setup.tcp_fields.tucse = 0;
 		context_desc->tcp_seg_setup.data = 0;
 		context_desc->cmd_and_length = cpu_to_le32(E1000_TXD_CMD_DEXT);
@@ -3005,7 +2998,6 @@ e1000_tx_map(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
 	while (len) {
 		buffer_info = &tx_ring->buffer_info[i];
 		size = min(len, max_per_txd);
-#ifdef NETIF_F_TSO
 		/* Workaround for Controller erratum --
 		 * descriptor for non-tso packet in a linear SKB that follows a
 		 * tso gets written back prematurely before the data is fully
@@ -3020,7 +3012,6 @@ e1000_tx_map(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
 		 * in TSO mode.  Append 4-byte sentinel desc */
 		if (unlikely(mss && !nr_frags && size == len && size > 8))
 			size -= 4;
-#endif
 		/* work-around for errata 10 and it applies
 		 * to all controllers in PCI-X mode
 		 * The fix is to make sure that the first descriptor of a
@@ -3062,12 +3053,10 @@ e1000_tx_map(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
 		while (len) {
 			buffer_info = &tx_ring->buffer_info[i];
 			size = min(len, max_per_txd);
-#ifdef NETIF_F_TSO
 			/* Workaround for premature desc write-backs
 			 * in TSO mode.  Append 4-byte sentinel desc */
 			if (unlikely(mss && f == (nr_frags-1) && size == len && size > 8))
 				size -= 4;
-#endif
 			/* Workaround for potential 82544 hang in PCI-X.
 			 * Avoid terminating buffers within evenly-aligned
 			 * dwords. */
@@ -3292,7 +3281,6 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 	if (adapter->hw.mac_type >= e1000_82571)
 		max_per_txd = 8192;
 
-#ifdef NETIF_F_TSO
 	mss = skb_shinfo(skb)->gso_size;
 	/* The controller does a simple calculation to
 	 * make sure there is enough room in the FIFO before
@@ -3346,16 +3334,10 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 	if ((mss) || (skb->ip_summed == CHECKSUM_PARTIAL))
 		count++;
 	count++;
-#else
-	if (skb->ip_summed == CHECKSUM_PARTIAL)
-		count++;
-#endif
 
-#ifdef NETIF_F_TSO
 	/* Controller Erratum workaround */
 	if (!skb->data_len && tx_ring->last_tx_tso && !skb_is_gso(skb))
 		count++;
-#endif
 
 	count += TXD_USE_COUNT(len, max_txd_pwr);
 
@@ -3602,7 +3584,7 @@ e1000_update_stats(struct e1000_adapter *adapter)
 	 */
 	if (adapter->link_speed == 0)
 		return;
-	if (pdev->error_state && pdev->error_state != pci_channel_io_normal)
+	if (pci_channel_offline(pdev))
 		return;
 
 	spin_lock_irqsave(&adapter->stats_lock, flags);
@@ -3765,8 +3747,8 @@ e1000_update_stats(struct e1000_adapter *adapter)
  * @data: pointer to a network interface device structure
  **/
 
-static
-irqreturn_t e1000_intr_msi(int irq, void *data)
+static irqreturn_t
+e1000_intr_msi(int irq, void *data)
 {
 	struct net_device *netdev = data;
 	struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -3774,49 +3756,27 @@ irqreturn_t e1000_intr_msi(int irq, void *data)
 #ifndef CONFIG_E1000_NAPI
 	int i;
 #endif
+	uint32_t icr = E1000_READ_REG(hw, ICR);
 
-	/* this code avoids the read of ICR but has to get 1000 interrupts
-	 * at every link change event before it will notice the change */
-	if (++adapter->detect_link >= 1000) {
-		uint32_t icr = E1000_READ_REG(hw, ICR);
 #ifdef CONFIG_E1000_NAPI
-		/* read ICR disables interrupts using IAM, so keep up with our
-		 * enable/disable accounting */
-		atomic_inc(&adapter->irq_sem);
+	/* read ICR disables interrupts using IAM, so keep up with our
+	 * enable/disable accounting */
+	atomic_inc(&adapter->irq_sem);
 #endif
-		adapter->detect_link = 0;
-		if ((icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) &&
-		    (icr & E1000_ICR_INT_ASSERTED)) {
-			hw->get_link_status = 1;
-			/* 80003ES2LAN workaround--
-			* For packet buffer work-around on link down event;
-			* disable receives here in the ISR and
-			* reset adapter in watchdog
-			*/
-			if (netif_carrier_ok(netdev) &&
-			    (adapter->hw.mac_type == e1000_80003es2lan)) {
-				/* disable receives */
-				uint32_t rctl = E1000_READ_REG(hw, RCTL);
-				E1000_WRITE_REG(hw, RCTL, rctl & ~E1000_RCTL_EN);
-			}
-			/* guard against interrupt when we're going down */
-			if (!test_bit(__E1000_DOWN, &adapter->flags))
-				mod_timer(&adapter->watchdog_timer,
-				          jiffies + 1);
+	if (icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) {
+		hw->get_link_status = 1;
+		/* 80003ES2LAN workaround-- For packet buffer work-around on
+		 * link down event; disable receives here in the ISR and reset
+		 * adapter in watchdog */
+		if (netif_carrier_ok(netdev) &&
+		    (adapter->hw.mac_type == e1000_80003es2lan)) {
+			/* disable receives */
+			uint32_t rctl = E1000_READ_REG(hw, RCTL);
+			E1000_WRITE_REG(hw, RCTL, rctl & ~E1000_RCTL_EN);
 		}
-	} else {
-		E1000_WRITE_REG(hw, ICR, (0xffffffff & ~(E1000_ICR_RXSEQ |
-		                                         E1000_ICR_LSC)));
-		/* bummer we have to flush here, but things break otherwise as
-		 * some event appears to be lost or delayed and throughput
-		 * drops.  In almost all tests this flush is un-necessary */
-		E1000_WRITE_FLUSH(hw);
-#ifdef CONFIG_E1000_NAPI
-		/* Interrupt Auto-Mask (IAM)...upon writing ICR, interrupts are
-		 * masked.  No need for the IMC write, but it does mean we
-		 * should account for it ASAP. */
-		atomic_inc(&adapter->irq_sem);
-#endif
+		/* guard against interrupt when we're going down */
+		if (!test_bit(__E1000_DOWN, &adapter->flags))
+			mod_timer(&adapter->watchdog_timer, jiffies + 1);
 	}
 
 #ifdef CONFIG_E1000_NAPI
@@ -3836,7 +3796,7 @@ irqreturn_t e1000_intr_msi(int irq, void *data)
 
 	for (i = 0; i < E1000_MAX_INTR; i++)
 		if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &
-		   !e1000_clean_tx_irq(adapter, adapter->tx_ring)))
+		   e1000_clean_tx_irq(adapter, adapter->tx_ring)))
 			break;
 
 	if (likely(adapter->itr_setting & 3))
@@ -3939,7 +3899,7 @@ e1000_intr(int irq, void *data)
 
 	for (i = 0; i < E1000_MAX_INTR; i++)
 		if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &
-		   !e1000_clean_tx_irq(adapter, adapter->tx_ring)))
+		   e1000_clean_tx_irq(adapter, adapter->tx_ring)))
 			break;
 
 	if (likely(adapter->itr_setting & 3))
@@ -3989,7 +3949,7 @@ e1000_clean(struct net_device *poll_dev, int *budget)
 	poll_dev->quota -= work_done;
 
 	/* If no Tx and not enough Rx work done, exit the polling mode */
-	if ((!tx_cleaned && (work_done == 0)) ||
+	if ((tx_cleaned && (work_done < work_to_do)) ||
 	   !netif_running(poll_dev)) {
 quit_polling:
 		if (likely(adapter->itr_setting & 3))
@@ -4019,7 +3979,7 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter,
 #ifdef CONFIG_E1000_NAPI
 	unsigned int count = 0;
 #endif
-	boolean_t cleaned = FALSE;
+	boolean_t cleaned = TRUE;
 	unsigned int total_tx_bytes=0, total_tx_packets=0;
 
 	i = tx_ring->next_to_clean;
@@ -4034,10 +3994,13 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter,
 
 			if (cleaned) {
 				struct sk_buff *skb = buffer_info->skb;
-				unsigned int segs = skb_shinfo(skb)->gso_segs;
+				unsigned int segs, bytecount;
+				segs = skb_shinfo(skb)->gso_segs ?: 1;
+				/* multiply data chunks by size of headers */
+				bytecount = ((segs - 1) * skb_headlen(skb)) +
+				            skb->len;
 				total_tx_packets += segs;
-				total_tx_packets++;
-				total_tx_bytes += skb->len;
+				total_tx_bytes += bytecount;
 			}
 			e1000_unmap_and_free_tx_resource(adapter, buffer_info);
 			tx_desc->upper.data = 0;
@@ -4050,7 +4013,10 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter,
 #ifdef CONFIG_E1000_NAPI
 #define E1000_TX_WEIGHT 64
 		/* weight of a sort for tx, to avoid endless transmit cleanup */
-		if (count++ == E1000_TX_WEIGHT) break;
+		if (count++ == E1000_TX_WEIGHT) {
+			cleaned = FALSE;
+			break;
+		}
 #endif
 	}
 
@@ -5032,10 +4998,7 @@ e1000_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid)
 	uint32_t vfta, index;
 
 	e1000_irq_disable(adapter);
-
-	if (adapter->vlgrp)
-		adapter->vlgrp->vlan_devices[vid] = NULL;
-
+	vlan_group_set_device(adapter->vlgrp, vid, NULL);
 	e1000_irq_enable(adapter);
 
 	if ((adapter->hw.mng_cookie.status &
@@ -5061,7 +5024,7 @@ e1000_restore_vlan(struct e1000_adapter *adapter)
 	if (adapter->vlgrp) {
 		uint16_t vid;
 		for (vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) {
-			if (!adapter->vlgrp->vlan_devices[vid])
+			if (!vlan_group_get_device(adapter->vlgrp, vid))
 				continue;
 			e1000_vlan_rx_add_vid(adapter->netdev, vid);
 		}
@@ -5105,58 +5068,6 @@ e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx)
 	return 0;
 }
 
-#ifdef CONFIG_PM
-/* Save/restore 16 or 64 dwords of PCI config space depending on which
- * bus we're on (PCI(X) vs. PCI-E)
- */
-#define PCIE_CONFIG_SPACE_LEN 256
-#define PCI_CONFIG_SPACE_LEN 64
-static int
-e1000_pci_save_state(struct e1000_adapter *adapter)
-{
-	struct pci_dev *dev = adapter->pdev;
-	int size;
-	int i;
-
-	if (adapter->hw.mac_type >= e1000_82571)
-		size = PCIE_CONFIG_SPACE_LEN;
-	else
-		size = PCI_CONFIG_SPACE_LEN;
-
-	WARN_ON(adapter->config_space != NULL);
-
-	adapter->config_space = kmalloc(size, GFP_KERNEL);
-	if (!adapter->config_space) {
-		DPRINTK(PROBE, ERR, "unable to allocate %d bytes\n", size);
-		return -ENOMEM;
-	}
-	for (i = 0; i < (size / 4); i++)
-		pci_read_config_dword(dev, i * 4, &adapter->config_space[i]);
-	return 0;
-}
-
-static void
-e1000_pci_restore_state(struct e1000_adapter *adapter)
-{
-	struct pci_dev *dev = adapter->pdev;
-	int size;
-	int i;
-
-	if (adapter->config_space == NULL)
-		return;
-
-	if (adapter->hw.mac_type >= e1000_82571)
-		size = PCIE_CONFIG_SPACE_LEN;
-	else
-		size = PCI_CONFIG_SPACE_LEN;
-	for (i = 0; i < (size / 4); i++)
-		pci_write_config_dword(dev, i * 4, adapter->config_space[i]);
-	kfree(adapter->config_space);
-	adapter->config_space = NULL;
-	return;
-}
-#endif /* CONFIG_PM */
-
 static int
 e1000_suspend(struct pci_dev *pdev, pm_message_t state)
 {
@@ -5176,9 +5087,7 @@ e1000_suspend(struct pci_dev *pdev, pm_message_t state)
 	}
 
 #ifdef CONFIG_PM
-	/* Implement our own version of pci_save_state(pdev) because pci-
-	 * express adapters have 256-byte config spaces. */
-	retval = e1000_pci_save_state(adapter);
+	retval = pci_save_state(pdev);
 	if (retval)
 		return retval;
 #endif
@@ -5265,7 +5174,7 @@ e1000_resume(struct pci_dev *pdev)
 	uint32_t err;
 
 	pci_set_power_state(pdev, PCI_D0);
-	e1000_pci_restore_state(adapter);
+	pci_restore_state(pdev);
 	if ((err = pci_enable_device(pdev))) {
 		printk(KERN_ERR "e1000: Cannot enable PCI device from suspend\n");
 		return err;
diff --git a/drivers/net/e1000/e1000_osdep.h b/drivers/net/e1000/e1000_osdep.h
index 18afc0c..10af742 100644
--- a/drivers/net/e1000/e1000_osdep.h
+++ b/drivers/net/e1000/e1000_osdep.h
@@ -48,8 +48,6 @@ typedef enum {
     TRUE = 1
 } boolean_t;
 
-#define MSGOUT(S, A, B)	printk(KERN_DEBUG S "\n", A, B)
-
 #ifdef DBG
 #define DEBUGOUT(S)		printk(KERN_DEBUG S "\n")
 #define DEBUGOUT1(S, A...)	printk(KERN_DEBUG S "\n", A)
@@ -58,7 +56,7 @@ typedef enum {
 #define DEBUGOUT1(S, A...)
 #endif
 
-#define DEBUGFUNC(F) DEBUGOUT(F)
+#define DEBUGFUNC(F) DEBUGOUT(F "\n")
 #define DEBUGOUT2 DEBUGOUT1
 #define DEBUGOUT3 DEBUGOUT2
 #define DEBUGOUT7 DEBUGOUT3
diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c
index cf2a279..f8862e2 100644
--- a/drivers/net/e1000/e1000_param.c
+++ b/drivers/net/e1000/e1000_param.c
@@ -760,22 +760,13 @@ e1000_check_copper_options(struct e1000_adapter *adapter)
 	case SPEED_1000:
 		DPRINTK(PROBE, INFO, "1000 Mbps Speed specified without "
 			"Duplex\n");
-		DPRINTK(PROBE, INFO,
-			"Using Autonegotiation at 1000 Mbps "
-			"Full Duplex only\n");
-		adapter->hw.autoneg = adapter->fc_autoneg = 1;
-		adapter->hw.autoneg_advertised = ADVERTISE_1000_FULL;
-		break;
+		goto full_duplex_only;
 	case SPEED_1000 + HALF_DUPLEX:
 		DPRINTK(PROBE, INFO,
 			"Half Duplex is not supported at 1000 Mbps\n");
-		DPRINTK(PROBE, INFO,
-			"Using Autonegotiation at 1000 Mbps "
-			"Full Duplex only\n");
-		adapter->hw.autoneg = adapter->fc_autoneg = 1;
-		adapter->hw.autoneg_advertised = ADVERTISE_1000_FULL;
-		break;
+		/* fall through */
 	case SPEED_1000 + FULL_DUPLEX:
+full_duplex_only:
 		DPRINTK(PROBE, INFO,
 		       "Using Autonegotiation at 1000 Mbps Full Duplex only\n");
 		adapter->hw.autoneg = adapter->fc_autoneg = 1;


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3072
retrieving revision 1.3073
diff -u -r1.3072 -r1.3073
--- kernel-2.6.spec	16 Apr 2007 14:16:39 -0000	1.3072
+++ kernel-2.6.spec	16 Apr 2007 18:32:23 -0000	1.3073
@@ -526,6 +526,8 @@
 Patch1201: linux-2.6-NFSD-badness.patch
 
 # NIC driver fixes
+# Revert E1000 to 2.6.20
+Patch1300: linux-2.6-net-e1000-revert.patch
 
 # Filesystem stuff.
 # Squashfs
@@ -1203,6 +1205,8 @@
 %patch1201 -p1
 
 # NIC driver fixes
+# revert e1000 to 2.6.20
+%patch1300 -p1 -R
 
 # Filesystem patches.
 # Squashfs
@@ -2266,6 +2270,9 @@
 #  - tux.
 
 %changelog
+* Mon Apr 16 2007 Dave Jones <davej at redhat.com>
+- Revert e1000 driver to 2.6.20
+
 * Mon Apr 16 2007 David Woodhouse <dwmw2 at redhat.com>
 - Correct fix for PS3 IRQ slowdown (HV bug)
 - Fix for CDDA reading on PS3



From fedora-cvs-commits at redhat.com  Mon Apr 16 18:41:35 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 14:41:35 -0400
Subject: rpms/bcel/devel .cvsignore,1.8,1.9 sources,1.7,1.8
Message-ID: <200704161841.l3GIfZsZ032668@cvs.devel.redhat.com>

Author: pcheung

Update of /cvs/dist/rpms/bcel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30984

Modified Files:
	.cvsignore sources 
Log Message:
Update jakarta-site tar ball



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/bcel/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	13 Mar 2007 15:59:35 -0000	1.8
+++ .cvsignore	16 Apr 2007 18:41:33 -0000	1.9
@@ -1,2 +1,3 @@
 bcel-5.1-src.tar.gz
 jakarta-site2.tar.gz
+bcel-jakarta-site2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/bcel/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	13 Mar 2007 15:59:35 -0000	1.7
+++ sources	16 Apr 2007 18:41:33 -0000	1.8
@@ -1,2 +1,2 @@
 f32a91243963d601aa34194657a53d60  bcel-5.1-src.tar.gz
-2c511b30e00109b501c6f3bd757a1ce1  jakarta-site2.tar.gz
+2c511b30e00109b501c6f3bd757a1ce1  bcel-jakarta-site2.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr 16 20:10:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 16:10:42 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.3073,1.3074
Message-ID: <200704162010.l3GKAgNK005216@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
needs more work, disable for now


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3073
retrieving revision 1.3074
diff -u -r1.3073 -r1.3074
--- kernel-2.6.spec	16 Apr 2007 18:32:23 -0000	1.3073
+++ kernel-2.6.spec	16 Apr 2007 20:10:34 -0000	1.3074
@@ -1206,7 +1206,7 @@
 
 # NIC driver fixes
 # revert e1000 to 2.6.20
-%patch1300 -p1 -R
+#%patch1300 -p1 -R
 
 # Filesystem patches.
 # Squashfs



From fedora-cvs-commits at redhat.com  Mon Apr 16 20:39:03 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 16:39:03 -0400
Subject: rpms/libart_lgpl/devel libart_lgpl.spec,1.19,1.20
Message-ID: <200704162039.l3GKd3OP023804@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/libart_lgpl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23642

Modified Files:
	libart_lgpl.spec 
Log Message:
Add alpha to 64-bit archs



Index: libart_lgpl.spec
===================================================================
RCS file: /cvs/dist/rpms/libart_lgpl/devel/libart_lgpl.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libart_lgpl.spec	1 Mar 2007 21:32:05 -0000	1.19
+++ libart_lgpl.spec	16 Apr 2007 20:39:01 -0000	1.20
@@ -42,7 +42,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # fix multilib issues
-%ifarch x86_64 s390x ia64 ppc64
+%ifarch x86_64 s390x ia64 ppc64 alpha
 %define wordsize 64
 %else
 %define wordsize 32



From fedora-cvs-commits at redhat.com  Mon Apr 16 20:39:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 16:39:45 -0400
Subject: rpms/kernel/devel linux-2.6-e1000-revert-01.patch, NONE,
	1.1 linux-2.6-e1000-revert-02.patch, NONE,
	1.1 linux-2.6-e1000-revert-03.patch, NONE,
	1.1 linux-2.6-e1000-revert-04.patch, NONE,
	1.1 linux-2.6-e1000-revert-05.patch, NONE,
	1.1 linux-2.6-e1000-revert-06.patch, NONE,
	1.1 linux-2.6-e1000-revert-07.patch, NONE,
	1.1 linux-2.6-e1000-revert-08.patch, NONE,
	1.1 linux-2.6-e1000-revert-10.patch, NONE,
	1.1 linux-2.6-e1000-revert-11.patch, NONE,
	1.1 linux-2.6-e1000-revert-12.patch, NONE,
	1.1 linux-2.6-e1000-revert-13.patch, NONE,
	1.1 linux-2.6-e1000-revert-14.patch, NONE,
	1.1 linux-2.6-e1000-revert-15.patch, NONE, 1.1 kernel-2.6.spec,
	1.3074, 1.3075 linux-2.6-net-e1000-revert.patch, 1.1, NONE
Message-ID: <200704162039.l3GKdjjl024352@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-e1000-revert-01.patch 
	linux-2.6-e1000-revert-02.patch 
	linux-2.6-e1000-revert-03.patch 
	linux-2.6-e1000-revert-04.patch 
	linux-2.6-e1000-revert-05.patch 
	linux-2.6-e1000-revert-06.patch 
	linux-2.6-e1000-revert-07.patch 
	linux-2.6-e1000-revert-08.patch 
	linux-2.6-e1000-revert-10.patch 
	linux-2.6-e1000-revert-11.patch 
	linux-2.6-e1000-revert-12.patch 
	linux-2.6-e1000-revert-13.patch 
	linux-2.6-e1000-revert-14.patch 
	linux-2.6-e1000-revert-15.patch 
Removed Files:
	linux-2.6-net-e1000-revert.patch 
Log Message:
More complete reverts for e1000

linux-2.6-e1000-revert-01.patch:
 e1000_param.c |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)

--- NEW FILE linux-2.6-e1000-revert-01.patch ---
commit 9990fa3cbd35046cce1eb4667bb2e33057c5ca1a
Author: Jesse Brandeburg <jesse.brandeburg at intel.com>
Date:   Thu Jan 18 09:25:15 2007 -0800

    e1000: simplify case handling gigabit at half duplex
    
    Remvoe duplicate code handling erraneous user supplied wrong case
    of gigabit speed with half duplex.
    
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg at intel.com>
    Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>

diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c
index cf2a279..f8862e2 100644
--- a/drivers/net/e1000/e1000_param.c
+++ b/drivers/net/e1000/e1000_param.c
@@ -760,22 +760,13 @@ e1000_check_copper_options(struct e1000_adapter *adapter)
 	case SPEED_1000:
 		DPRINTK(PROBE, INFO, "1000 Mbps Speed specified without "
 			"Duplex\n");
-		DPRINTK(PROBE, INFO,
-			"Using Autonegotiation at 1000 Mbps "
-			"Full Duplex only\n");
-		adapter->hw.autoneg = adapter->fc_autoneg = 1;
-		adapter->hw.autoneg_advertised = ADVERTISE_1000_FULL;
-		break;
+		goto full_duplex_only;
 	case SPEED_1000 + HALF_DUPLEX:
 		DPRINTK(PROBE, INFO,
 			"Half Duplex is not supported at 1000 Mbps\n");
-		DPRINTK(PROBE, INFO,
-			"Using Autonegotiation at 1000 Mbps "
-			"Full Duplex only\n");
-		adapter->hw.autoneg = adapter->fc_autoneg = 1;
-		adapter->hw.autoneg_advertised = ADVERTISE_1000_FULL;
-		break;
+		/* fall through */
 	case SPEED_1000 + FULL_DUPLEX:
+full_duplex_only:
 		DPRINTK(PROBE, INFO,
 		       "Using Autonegotiation at 1000 Mbps Full Duplex only\n");
 		adapter->hw.autoneg = adapter->fc_autoneg = 1;

linux-2.6-e1000-revert-02.patch:
 e1000_osdep.h |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE linux-2.6-e1000-revert-02.patch ---
commit bf3cea4d8a1a8deb21d247a0622f1aa54270e0f9
Author: Auke Kok <auke\\-jan.h.kok at intel.com>
Date:   Thu Jan 18 09:25:18 2007 -0800

    e1000: clean up debug output defines
    
    Remove unused MSGOUT macro and add "\n" to function debug output.
    
    Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>

diff --git a/drivers/net/e1000/e1000_osdep.h b/drivers/net/e1000/e1000_osdep.h
index 18afc0c..10af742 100644
--- a/drivers/net/e1000/e1000_osdep.h
+++ b/drivers/net/e1000/e1000_osdep.h
@@ -48,8 +48,6 @@ typedef enum {
     TRUE = 1
 } boolean_t;
 
-#define MSGOUT(S, A, B)	printk(KERN_DEBUG S "\n", A, B)
-
 #ifdef DBG
 #define DEBUGOUT(S)		printk(KERN_DEBUG S "\n")
 #define DEBUGOUT1(S, A...)	printk(KERN_DEBUG S "\n", A)
@@ -58,7 +56,7 @@ typedef enum {
 #define DEBUGOUT1(S, A...)
 #endif
 
-#define DEBUGFUNC(F) DEBUGOUT(F)
+#define DEBUGFUNC(F) DEBUGOUT(F "\n")
 #define DEBUGOUT2 DEBUGOUT1
 #define DEBUGOUT3 DEBUGOUT2
 #define DEBUGOUT7 DEBUGOUT3

linux-2.6-e1000-revert-03.patch:
 e1000.h      |    1 
 e1000_main.c |   60 ++++++++++++++++++-----------------------------------------
 2 files changed, 19 insertions(+), 42 deletions(-)

--- NEW FILE linux-2.6-e1000-revert-03.patch ---
commit b5fc8f0c43d388d76ebbb5650b20f4ce4420a5ad
Author: Jesse Brandeburg <jesse.brandeburg at intel.com>
Date:   Thu Jan 18 09:25:21 2007 -0800

    e1000: Fix MSI only interrupt handler routine
    
    Unfortunately the read-free MSI interrupt handler needs to flush write
    the icr register and thus we can't be read-free. Our MSI irq routine
    thus becomes a lot more simpler since we don't need to track link state
    anymore.
    
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg at intel.com>
    Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>

diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index f091042..8e7acb0 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -257,7 +257,6 @@ struct e1000_adapter {
 	spinlock_t tx_queue_lock;
 #endif
 	atomic_t irq_sem;
-	unsigned int detect_link;
 	unsigned int total_tx_bytes;
 	unsigned int total_tx_packets;
 	unsigned int total_rx_bytes;
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index c6259c7..d408949 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3765,8 +3765,8 @@ e1000_update_stats(struct e1000_adapter *adapter)
  * @data: pointer to a network interface device structure
  **/
 
-static
-irqreturn_t e1000_intr_msi(int irq, void *data)
+static irqreturn_t
+e1000_intr_msi(int irq, void *data)
 {
 	struct net_device *netdev = data;
 	struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -3774,49 +3774,27 @@ irqreturn_t e1000_intr_msi(int irq, void *data)
 #ifndef CONFIG_E1000_NAPI
 	int i;
 #endif
+	uint32_t icr = E1000_READ_REG(hw, ICR);
 
-	/* this code avoids the read of ICR but has to get 1000 interrupts
-	 * at every link change event before it will notice the change */
-	if (++adapter->detect_link >= 1000) {
-		uint32_t icr = E1000_READ_REG(hw, ICR);
 #ifdef CONFIG_E1000_NAPI
-		/* read ICR disables interrupts using IAM, so keep up with our
-		 * enable/disable accounting */
-		atomic_inc(&adapter->irq_sem);
+	/* read ICR disables interrupts using IAM, so keep up with our
+	 * enable/disable accounting */
+	atomic_inc(&adapter->irq_sem);
 #endif
-		adapter->detect_link = 0;
-		if ((icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) &&
-		    (icr & E1000_ICR_INT_ASSERTED)) {
-			hw->get_link_status = 1;
-			/* 80003ES2LAN workaround--
-			* For packet buffer work-around on link down event;
-			* disable receives here in the ISR and
-			* reset adapter in watchdog
-			*/
-			if (netif_carrier_ok(netdev) &&
-			    (adapter->hw.mac_type == e1000_80003es2lan)) {
-				/* disable receives */
-				uint32_t rctl = E1000_READ_REG(hw, RCTL);
-				E1000_WRITE_REG(hw, RCTL, rctl & ~E1000_RCTL_EN);
-			}
-			/* guard against interrupt when we're going down */
-			if (!test_bit(__E1000_DOWN, &adapter->flags))
-				mod_timer(&adapter->watchdog_timer,
-				          jiffies + 1);
+	if (icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) {
+		hw->get_link_status = 1;
+		/* 80003ES2LAN workaround-- For packet buffer work-around on
+		 * link down event; disable receives here in the ISR and reset
+		 * adapter in watchdog */
+		if (netif_carrier_ok(netdev) &&
+		    (adapter->hw.mac_type == e1000_80003es2lan)) {
+			/* disable receives */
+			uint32_t rctl = E1000_READ_REG(hw, RCTL);
+			E1000_WRITE_REG(hw, RCTL, rctl & ~E1000_RCTL_EN);
 		}
-	} else {
-		E1000_WRITE_REG(hw, ICR, (0xffffffff & ~(E1000_ICR_RXSEQ |
-		                                         E1000_ICR_LSC)));
-		/* bummer we have to flush here, but things break otherwise as
-		 * some event appears to be lost or delayed and throughput
-		 * drops.  In almost all tests this flush is un-necessary */
-		E1000_WRITE_FLUSH(hw);
-#ifdef CONFIG_E1000_NAPI
-		/* Interrupt Auto-Mask (IAM)...upon writing ICR, interrupts are
-		 * masked.  No need for the IMC write, but it does mean we
-		 * should account for it ASAP. */
-		atomic_inc(&adapter->irq_sem);
-#endif
+		/* guard against interrupt when we're going down */
+		if (!test_bit(__E1000_DOWN, &adapter->flags))
+			mod_timer(&adapter->watchdog_timer, jiffies + 1);
 	}
 
 #ifdef CONFIG_E1000_NAPI

linux-2.6-e1000-revert-04.patch:
 e1000_main.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

--- NEW FILE linux-2.6-e1000-revert-04.patch ---
commit 60cba200f11b6f90f35634c5cd608773ae3721b7
Author: Jesse Brandeburg <jesse.brandeburg at intel.com>
Date:   Thu Jan 18 09:25:23 2007 -0800

    e1000: fix NAPI performance on 4-port adapters
    
    This fix attempts to solve a customer (IBM) reported issue with NAPI
    enabled e1000 having bad performance when transmitting simultaneously
    on four ports.  The issue comes down to an interaction between NAPI,
    hardware interrupt balancing, and the driver rescheduling poll on
    the same processor.  Try to fix by allowing the driver to re-enable
    interrupts sooner instead of polling one more time, when there was
    recently all the work completed in cleanup.
    
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg at intel.com>
    Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index d408949..ab1b40f 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3814,7 +3814,7 @@ e1000_intr_msi(int irq, void *data)
 
 	for (i = 0; i < E1000_MAX_INTR; i++)
 		if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &
-		   !e1000_clean_tx_irq(adapter, adapter->tx_ring)))
+		   e1000_clean_tx_irq(adapter, adapter->tx_ring)))
 			break;
 
 	if (likely(adapter->itr_setting & 3))
@@ -3917,7 +3917,7 @@ e1000_intr(int irq, void *data)
 
 	for (i = 0; i < E1000_MAX_INTR; i++)
 		if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &
-		   !e1000_clean_tx_irq(adapter, adapter->tx_ring)))
+		   e1000_clean_tx_irq(adapter, adapter->tx_ring)))
 			break;
 
 	if (likely(adapter->itr_setting & 3))
@@ -3967,7 +3967,7 @@ e1000_clean(struct net_device *poll_dev, int *budget)
 	poll_dev->quota -= work_done;
 
 	/* If no Tx and not enough Rx work done, exit the polling mode */
-	if ((!tx_cleaned && (work_done == 0)) ||
+	if ((tx_cleaned && (work_done < work_to_do)) ||
 	   !netif_running(poll_dev)) {
 quit_polling:
 		if (likely(adapter->itr_setting & 3))
@@ -3997,7 +3997,7 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter,
 #ifdef CONFIG_E1000_NAPI
 	unsigned int count = 0;
 #endif
-	boolean_t cleaned = FALSE;
+	boolean_t cleaned = TRUE;
 	unsigned int total_tx_bytes=0, total_tx_packets=0;
 
 	i = tx_ring->next_to_clean;
@@ -4028,7 +4028,10 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter,
 #ifdef CONFIG_E1000_NAPI
 #define E1000_TX_WEIGHT 64
 		/* weight of a sort for tx, to avoid endless transmit cleanup */
-		if (count++ == E1000_TX_WEIGHT) break;
+		if (count++ == E1000_TX_WEIGHT) {
+			cleaned = FALSE;
+			break;
+		}
 #endif
 	}
 

linux-2.6-e1000-revert-05.patch:
 e1000_main.c |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-e1000-revert-05.patch ---
commit 9669f53b98974ede4728e288316296666722ab8c
Author: Auke Kok <auke\\-jan.h.kok at intel.com>
Date:   Thu Jan 18 09:25:26 2007 -0800

    e1000: display flow control of link status at link up
    
    Print RX/TX flow control setting at link up time to display the
    actual link FC properties instead of the advertised values.
    
    Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index ab1b40f..43dde27 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2583,15 +2583,22 @@ e1000_watchdog(unsigned long data)
 
 	if (link) {
 		if (!netif_carrier_ok(netdev)) {
+			uint32_t ctrl;
 			boolean_t txb2b = 1;
 			e1000_get_speed_and_duplex(&adapter->hw,
 			                           &adapter->link_speed,
 			                           &adapter->link_duplex);
 
-			DPRINTK(LINK, INFO, "NIC Link is Up %d Mbps %s\n",
-			       adapter->link_speed,
-			       adapter->link_duplex == FULL_DUPLEX ?
-			       "Full Duplex" : "Half Duplex");
+			ctrl = E1000_READ_REG(&adapter->hw, CTRL);
+			DPRINTK(LINK, INFO, "NIC Link is Up %d Mbps %s, "
+			        "Flow Control: %s\n",
+			        adapter->link_speed,
+			        adapter->link_duplex == FULL_DUPLEX ?
+			        "Full Duplex" : "Half Duplex",
+			        ((ctrl & E1000_CTRL_TFCE) && (ctrl &
+			        E1000_CTRL_RFCE)) ? "RX/TX" : ((ctrl &
+			        E1000_CTRL_RFCE) ? "RX" : ((ctrl &
+			        E1000_CTRL_TFCE) ? "TX" : "None" )));
 
 			/* tweak tx_queue_len according to speed/duplex
 			 * and adjust the timeout factor */

linux-2.6-e1000-revert-06.patch:
 e1000_main.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-e1000-revert-06.patch ---
commit f6c57bafcdebed4429cdda206149ddcbb1d46e91
Author: Bruce Allan <bruce.w.allan at intel.com>
Date:   Thu Jan 18 09:25:28 2007 -0800

    e1000: clear ip csum info from context descriptor
    
    Since the driver sets the IP checksum insertion bit (IXSM in Status
    field) in transmit context descriptors, it should clear the IP checksum
    bits of any garbage so as not to confuse the hardware.
    
    Signed-off-by: Bruce Allan <bruce.w.allan at intel.com>
    Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 43dde27..8c6c74d 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2975,8 +2975,9 @@ e1000_tx_csum(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
 		buffer_info = &tx_ring->buffer_info[i];
 		context_desc = E1000_CONTEXT_DESC(*tx_ring, i);
 
+		context_desc->lower_setup.ip_config = 0;
 		context_desc->upper_setup.tcp_fields.tucss = css;
-		context_desc->upper_setup.tcp_fields.tucso = css + skb->csum_offset;
+		context_desc->upper_setup.tcp_fields.tucso = css + skb->csum;
 		context_desc->upper_setup.tcp_fields.tucse = 0;
 		context_desc->tcp_seg_setup.data = 0;
 		context_desc->cmd_and_length = cpu_to_le32(E1000_TXD_CMD_DEXT);

linux-2.6-e1000-revert-07.patch:
 e1000_main.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-e1000-revert-07.patch ---
commit 7753b171c4e7604294060d4039214c8c8319bfca
Author: Jesse Brandeburg <jesse.brandeburg at intel.com>
Date:   Thu Jan 18 09:25:31 2007 -0800

    e1000: tune our dynamic itr transmit packet accounting
    
    The driver was still mis-calculating the number of bytes sent during
    transmit, now the driver computes what appears to be exactly 100%
    correct byte counts (not including CRC) when figuring out how many
    bytes and frames were sent during the current transmit packet.

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 8c6c74d..ae76479 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -4020,10 +4020,13 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter,
 
 			if (cleaned) {
 				struct sk_buff *skb = buffer_info->skb;
-				unsigned int segs = skb_shinfo(skb)->gso_segs;
+				unsigned int segs, bytecount;
+				segs = skb_shinfo(skb)->gso_segs ?: 1;
+				/* multiply data chunks by size of headers */
+				bytecount = ((segs - 1) * skb_headlen(skb)) +
+				            skb->len;
 				total_tx_packets += segs;
-				total_tx_packets++;
-				total_tx_bytes += skb->len;
+				total_tx_bytes += bytecount;
 			}
 			e1000_unmap_and_free_tx_resource(adapter, buffer_info);
 			tx_desc->upper.data = 0;

linux-2.6-e1000-revert-08.patch:
 e1000_main.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-e1000-revert-08.patch ---
commit 7e721579479350b15b2bf1e232cd372c704aff7b
Author: Auke Kok <auke\\-jan.h.kok at intel.com>
Date:   Thu Jan 18 09:25:33 2007 -0800

    e1000: update version to 7.3.20-k2
    
    Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index ae76479..2035ca4 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -36,7 +36,7 @@ static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
 #else
 #define DRIVERNAPI "-NAPI"
 #endif
-#define DRV_VERSION "7.3.15-k2"DRIVERNAPI
+#define DRV_VERSION "7.3.20-k2"DRIVERNAPI
 char e1000_driver_version[] = DRV_VERSION;
 static char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation.";
 

linux-2.6-e1000-revert-10.patch:
 e1000/e1000_main.c |    2 +-
 ixgb/ixgb_main.c   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-e1000-revert-10.patch ---
commit 81b1955eef786c1b2fe29f6783543ce13d8b0bc4
Author: Linas Vepstas <linas at linas.org>
Date:   Tue Dec 12 18:29:15 2006 -0600

    PCI: Use newly defined PCI channel offline routine
    
    Use newly minted routine to access the PCI channel state.
    
    Signed-off-by: Linas Vepstas <linas at linas.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index c6259c7..8424a8e 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3602,7 +3602,7 @@ e1000_update_stats(struct e1000_adapter *adapter)
 	 */
 	if (adapter->link_speed == 0)
 		return;
-	if (pdev->error_state && pdev->error_state != pci_channel_io_normal)
+	if (pci_channel_offline(pdev))
 		return;
 
 	spin_lock_irqsave(&adapter->stats_lock, flags);
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index a083a91..f274217 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -1609,7 +1609,7 @@ ixgb_update_stats(struct ixgb_adapter *adapter)
 	struct pci_dev *pdev = adapter->pdev;
 
 	/* Prevent stats update while adapter is being reset */
-	if (pdev->error_state && pdev->error_state != pci_channel_io_normal)
+	if (pci_channel_offline(pdev))
 		return;
 
 	if((netdev->flags & IFF_PROMISC) || (netdev->flags & IFF_ALLMULTI) ||

linux-2.6-e1000-revert-11.patch:
 Documentation/video4linux/bttv/Insmod-options |    2 +-
 arch/m32r/lib/usercopy.c                      |    4 ++--
 arch/m68knommu/platform/5307/timers.c         |    2 +-
 drivers/infiniband/hw/ipath/ipath_iba6110.c   |    2 +-
 drivers/infiniband/hw/ipath/ipath_iba6120.c   |    2 +-
 drivers/isdn/i4l/isdn_ppp.c                   |    2 +-
 drivers/net/e1000/e1000_hw.h                  |    2 +-
 drivers/net/wireless/wavelan_cs.c             |    8 ++++----
 drivers/sbus/char/vfc_i2c.c                   |    2 +-
 include/linux/seqlock.h                       |    2 +-
 lib/textsearch.c                              |    2 +-
 net/ipv4/tcp_cong.c                           |    2 +-
 12 files changed, 16 insertions(+), 16 deletions(-)

--- NEW FILE linux-2.6-e1000-revert-11.patch ---
commit d08df601a30df9e36c29f3214315f4f0c8784c68
Author: Robert P. J. Day <rpjday at mindspring.com>
Date:   Sat Feb 17 19:07:33 2007 +0100

    Various typo fixes.
    
    Correct mis-spellings of "algorithm", "appear", "consistent" and
    (shame, shame) "kernel".
    
    Signed-off-by: Robert P. J. Day <rpjday at mindspring.com>
    Signed-off-by: Adrian Bunk <bunk at stusta.de>

diff --git a/Documentation/video4linux/bttv/Insmod-options b/Documentation/video4linux/bttv/Insmod-options
index bb7c2ca..5ef7578 100644
--- a/Documentation/video4linux/bttv/Insmod-options
+++ b/Documentation/video4linux/bttv/Insmod-options
@@ -57,7 +57,7 @@ bttv.o
 		i2c_udelay=     Allow reduce I2C speed. Default is 5 usecs
 				(meaning 66,67 Kbps). The default is the
 				maximum supported speed by kernel bitbang
-				algoritm. You may use lower numbers, if I2C
+				algorithm. You may use lower numbers, if I2C
 				messages are lost (16 is known to work on
 				all supported cards).
 
diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
index 896cef1..82abd15 100644
--- a/arch/m32r/lib/usercopy.c
+++ b/arch/m32r/lib/usercopy.c
@@ -293,7 +293,7 @@ long strnlen_user(const char __user *s, long n)
 		: "0" (n), "1" (s), "r" (n & 3), "r" (mask), "r"(0x01010101)
 		: "r0", "r1", "cbit");
 
-	/* NOTE: strnlen_user() algorism:
+	/* NOTE: strnlen_user() algorithm:
 	 * {
 	 *   char *p;
 	 *   for (p = s; n-- && *p != '\0'; ++p)
@@ -369,7 +369,7 @@ long strnlen_user(const char __user *s, long n)
 		: "0" (n), "1" (s), "r" (n & 3), "r" (mask), "r"(0x01010101)
 		: "r0", "r1", "r2", "r3", "cbit");
 
-	/* NOTE: strnlen_user() algorism:
+	/* NOTE: strnlen_user() algorithm:
 	 * {
 	 *   char *p;
 	 *   for (p = s; n-- && *p != '\0'; ++p)
diff --git a/arch/m68knommu/platform/5307/timers.c b/arch/m68knommu/platform/5307/timers.c
index 87b112b..92e5807 100644
--- a/arch/m68knommu/platform/5307/timers.c
+++ b/arch/m68knommu/platform/5307/timers.c
@@ -104,7 +104,7 @@ unsigned long coldfire_timer_offset(void)
 
 /*
  *	Choose a reasonably fast profile timer. Make it an odd value to
- *	try and get good coverage of kernal operations.
+ *	try and get good coverage of kernel operations.
  */
 #define	PROFILEHZ	1013
 
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6110.c b/drivers/infiniband/hw/ipath/ipath_iba6110.c
index 7468477..9934825 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba6110.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6110.c
@@ -1534,7 +1534,7 @@ static int ipath_ht_early_init(struct ipath_devdata *dd)
  * @kbase: ipath_base_info pointer
  *
  * We set the PCIE flag because the lower bandwidth on PCIe vs
- * HyperTransport can affect some user packet algorithims.
+ * HyperTransport can affect some user packet algorithms.
  */
 static int ipath_ht_get_base_info(struct ipath_portdata *pd, void *kbase)
 {
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6120.c b/drivers/infiniband/hw/ipath/ipath_iba6120.c
index ae8bf99..05918e1 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba6120.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6120.c
@@ -1293,7 +1293,7 @@ int __attribute__((weak)) ipath_unordered_wc(void)
  * @kbase: ipath_base_info pointer
  *
  * We set the PCIE flag because the lower bandwidth on PCIe vs
- * HyperTransport can affect some user packet algorithims.
+ * HyperTransport can affect some user packet algorithms.
  */
 static int ipath_pe_get_base_info(struct ipath_portdata *pd, void *kbase)
 {
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index 4e3f127..1b2df80 100644
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -1680,7 +1680,7 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,
 	 * - we hit a gap in the sequence, so no reassembly/processing is 
 	 *   possible ('start' would be set to NULL)
 	 *
-	 * algorightm for this code is derived from code in the book
+	 * algorithm for this code is derived from code in the book
 	 * 'PPP Design And Debugging' by James Carlson (Addison-Wesley)
 	 */
   	while (start != NULL || newfrag != NULL) {
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h
index d671058..bd000b8 100644
--- a/drivers/net/e1000/e1000_hw.h
+++ b/drivers/net/e1000/e1000_hw.h
@@ -3253,7 +3253,7 @@ struct e1000_host_command_info {
 #define IFE_PMC_AUTO_MDIX                    0x0080  /* 1=enable MDI/MDI-X feature, default 0=disabled */
 #define IFE_PMC_FORCE_MDIX                   0x0040  /* 1=force MDIX-X, 0=force MDI */
 #define IFE_PMC_MDIX_STATUS                  0x0020  /* 1=MDI-X, 0=MDI */
-#define IFE_PMC_AUTO_MDIX_COMPLETE           0x0010  /* Resolution algorthm is completed */
+#define IFE_PMC_AUTO_MDIX_COMPLETE           0x0010  /* Resolution algorithm is completed */
 #define IFE_PMC_MDIX_MODE_SHIFT              6
 #define IFE_PHC_MDIX_RESET_ALL_MASK          0x0000  /* Disable auto MDI-X */
 
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index 5eb8163..b042397 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -1168,7 +1168,7 @@ wv_mmc_show(struct net_device *	dev)
 	 m.mmr_unused0[6],
 	 m.mmr_unused0[7]);
 #endif	/* DEBUG_SHOW_UNUSED */
-  printk(KERN_DEBUG "Encryption algorythm: %02X - Status: %02X\n",
+  printk(KERN_DEBUG "Encryption algorithm: %02X - Status: %02X\n",
 	 m.mmr_des_avail, m.mmr_des_status);
 #ifdef DEBUG_SHOW_UNUSED
   printk(KERN_DEBUG "mmc_unused1[]: %02X:%02X:%02X:%02X:%02X\n",
@@ -3590,9 +3590,9 @@ wv_82593_config(struct net_device *	dev)
   cfblk.acloc = TRUE;           /* Disable source addr insertion by i82593 */
   cfblk.preamb_len = 0;         /* 2 bytes preamble (SFD) */
   cfblk.loopback = FALSE;
-  cfblk.lin_prio = 0;   	/* conform to 802.3 backoff algoritm */
-  cfblk.exp_prio = 5;	        /* conform to 802.3 backoff algoritm */
-  cfblk.bof_met = 1;	        /* conform to 802.3 backoff algoritm */
+  cfblk.lin_prio = 0;   	/* conform to 802.3 backoff algorithm */
+  cfblk.exp_prio = 5;	        /* conform to 802.3 backoff algorithm */
+  cfblk.bof_met = 1;	        /* conform to 802.3 backoff algorithm */
   cfblk.ifrm_spc = 0x20 >> 4;	/* 32 bit times interframe spacing */
   cfblk.slottim_low = 0x20 >> 5;	/* 32 bit times slot time */
   cfblk.slottim_hi = 0x0;
diff --git a/drivers/sbus/char/vfc_i2c.c b/drivers/sbus/char/vfc_i2c.c
index ceec306..9efed77 100644
--- a/drivers/sbus/char/vfc_i2c.c
+++ b/drivers/sbus/char/vfc_i2c.c
@@ -14,7 +14,7 @@
 /* NOTE: It seems to me that the documentation regarding the
 pcd8584t/pcf8584 does not show the correct way to address the i2c bus.
 Based on the information on the I2C bus itself and the remainder of
-the Phillips docs the following algorithims apper to be correct.  I am
+the Phillips docs the following algorithms appear to be correct.  I am
 fairly certain that the flowcharts in the phillips docs are wrong. */
 
 
diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h
index 6b0648c..52c9eb9 100644
--- a/include/linux/seqlock.h
+++ b/include/linux/seqlock.h
@@ -2,7 +2,7 @@
 #define __LINUX_SEQLOCK_H
 /*
  * Reader/writer consistent mechanism without starving writers. This type of
- * lock for data where the reader wants a consitent set of information
+ * lock for data where the reader wants a consistent set of information
  * and is willing to retry if the information changes.  Readers never
  * block but they may have to retry if a writer is in
  * progress. Writers do not wait for readers. 
diff --git a/lib/textsearch.c b/lib/textsearch.c
index 9e2a002..88c98a2 100644
--- a/lib/textsearch.c
+++ b/lib/textsearch.c
@@ -40,7 +40,7 @@
  *       configuration according to the specified parameters.
  *   (3) User starts the search(es) by calling _find() or _next() to
  *       fetch subsequent occurrences. A state variable is provided
- *       to the algorihtm to store persistent variables.
+ *       to the algorithm to store persistent variables.
  *   (4) Core eventually resets the search offset and forwards the find()
  *       request to the algorithm.
  *   (5) Algorithm calls get_next_block() provided by the user continously
diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c
index c1b34f1..5c8caf4 100644
--- a/net/ipv4/tcp_cong.c
+++ b/net/ipv4/tcp_cong.c
@@ -29,7 +29,7 @@ static struct tcp_congestion_ops *tcp_ca_find(const char *name)
 }
 
 /*
- * Attach new congestion control algorthim to the list
+ * Attach new congestion control algorithm to the list
  * of available options.
  */
 int tcp_register_congestion_control(struct tcp_congestion_ops *ca)

linux-2.6-e1000-revert-12.patch:
 e1000_main.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE linux-2.6-e1000-revert-12.patch ---
commit d2ed16356ff4fb9de23fbc5e5d582ce580390106
Author: Kok, Auke <auke-jan.h.kok at intel.com>
Date:   Fri Feb 16 14:39:26 2007 -0800

    e1000: fix shared interrupt warning message
    
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg at intel.com>
    Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Jeff Garzik <jeff at garzik.org>

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 619c892..f293690 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -1417,10 +1417,6 @@ e1000_open(struct net_device *netdev)
 	if ((err = e1000_setup_all_rx_resources(adapter)))
 		goto err_setup_rx;
 
-	err = e1000_request_irq(adapter);
-	if (err)
-		goto err_req_irq;
-
 	e1000_power_up_phy(adapter);
 
 	if ((err = e1000_up(adapter)))
@@ -1431,6 +1427,10 @@ e1000_open(struct net_device *netdev)
 		e1000_update_mng_vlan(adapter);
 	}
 
+	err = e1000_request_irq(adapter);
+	if (err)
+		goto err_req_irq;
+
 	/* If AMT is enabled, let the firmware know that the network
 	 * interface is now open */
 	if (adapter->hw.mac_type == e1000_82573 &&
@@ -1439,10 +1439,10 @@ e1000_open(struct net_device *netdev)
 
 	return E1000_SUCCESS;
 
+err_req_irq:
+	e1000_down(adapter);
 err_up:
 	e1000_power_down_phy(adapter);
-	e1000_free_irq(adapter);
-err_req_irq:
 	e1000_free_all_rx_resources(adapter);
 err_setup_rx:
 	e1000_free_all_tx_resources(adapter);

linux-2.6-e1000-revert-13.patch:
 e1000.h      |    1 -
 e1000_main.c |   58 ++--------------------------------------------------------
 2 files changed, 2 insertions(+), 57 deletions(-)

--- NEW FILE linux-2.6-e1000-revert-13.patch ---
commit 1d33e9c606bcf3d00bf67477e34253e861bb71c3
Author: Kok, Auke <auke-jan.h.kok at intel.com>
Date:   Fri Feb 16 14:39:28 2007 -0800

    e1000: remove obsolete custom pci_save_state code
    
    Now that 2.6.19 provides a proper implementation that saves MSI, PCI-E
    config space, we can have the e1000 driver use those instead of it's
    custom implementation.
    
    Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>
    Signed-off-by: Jeff Garzik <jeff at garzik.org>

diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index 689f158..dd4b728 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -337,7 +337,6 @@ struct e1000_adapter {
 	struct e1000_rx_ring test_rx_ring;
 
 
-	uint32_t *config_space;
 	int msg_enable;
 #ifdef CONFIG_PCI_MSI
 	boolean_t have_msi;
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index f293690..a710237 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -5071,58 +5071,6 @@ e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx)
 	return 0;
 }
 
-#ifdef CONFIG_PM
-/* Save/restore 16 or 64 dwords of PCI config space depending on which
- * bus we're on (PCI(X) vs. PCI-E)
- */
-#define PCIE_CONFIG_SPACE_LEN 256
-#define PCI_CONFIG_SPACE_LEN 64
-static int
-e1000_pci_save_state(struct e1000_adapter *adapter)
-{
-	struct pci_dev *dev = adapter->pdev;
-	int size;
-	int i;
-
-	if (adapter->hw.mac_type >= e1000_82571)
-		size = PCIE_CONFIG_SPACE_LEN;
-	else
-		size = PCI_CONFIG_SPACE_LEN;
-
-	WARN_ON(adapter->config_space != NULL);
-
-	adapter->config_space = kmalloc(size, GFP_KERNEL);
-	if (!adapter->config_space) {
-		DPRINTK(PROBE, ERR, "unable to allocate %d bytes\n", size);
-		return -ENOMEM;
-	}
-	for (i = 0; i < (size / 4); i++)
-		pci_read_config_dword(dev, i * 4, &adapter->config_space[i]);
-	return 0;
-}
-
-static void
-e1000_pci_restore_state(struct e1000_adapter *adapter)
-{
-	struct pci_dev *dev = adapter->pdev;
-	int size;
-	int i;
-
-	if (adapter->config_space == NULL)
-		return;
-
-	if (adapter->hw.mac_type >= e1000_82571)
-		size = PCIE_CONFIG_SPACE_LEN;
-	else
-		size = PCI_CONFIG_SPACE_LEN;
-	for (i = 0; i < (size / 4); i++)
-		pci_write_config_dword(dev, i * 4, adapter->config_space[i]);
-	kfree(adapter->config_space);
-	adapter->config_space = NULL;
-	return;
-}
-#endif /* CONFIG_PM */
-
 static int
 e1000_suspend(struct pci_dev *pdev, pm_message_t state)
 {
@@ -5142,9 +5090,7 @@ e1000_suspend(struct pci_dev *pdev, pm_message_t state)
 	}
 
 #ifdef CONFIG_PM
-	/* Implement our own version of pci_save_state(pdev) because pci-
-	 * express adapters have 256-byte config spaces. */
-	retval = e1000_pci_save_state(adapter);
+	retval = pci_save_state(pdev);
 	if (retval)
 		return retval;
 #endif
@@ -5231,7 +5177,7 @@ e1000_resume(struct pci_dev *pdev)
 	uint32_t err;
 
 	pci_set_power_state(pdev, PCI_D0);
-	e1000_pci_restore_state(adapter);
+	pci_restore_state(pdev);
 	if ((err = pci_enable_device(pdev))) {
 		printk(KERN_ERR "e1000: Cannot enable PCI device from suspend\n");
 		return err;

linux-2.6-e1000-revert-14.patch:
 e1000_ethtool.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-e1000-revert-14.patch ---
commit ca6efb7d6c9336acda2e7b76a39b59bbfe77ec13
Author: Kok, Auke <auke-jan.h.kok at intel.com>
Date:   Fri Feb 16 14:39:30 2007 -0800

    e1000: allow ethtool to see link status when down
    
    By reading the MAC status register we can detect whether the MAC has
    seen the PHY see link. This allows us to show the link properties before
    the device is up in ethtool.
    
    Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>
    Signed-off-by: Jeff Garzik <jeff at garzik.org>

diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 44ebc72..6777887 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -166,7 +166,7 @@ e1000_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
 			ecmd->transceiver = XCVR_EXTERNAL;
 	}
 
-	if (netif_carrier_ok(adapter->netdev)) {
+	if (E1000_READ_REG(&adapter->hw, STATUS) & E1000_STATUS_LU) {
 
 		e1000_get_speed_and_duplex(hw, &adapter->link_speed,
 		                                   &adapter->link_duplex);

linux-2.6-e1000-revert-15.patch:
 e1000_main.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE linux-2.6-e1000-revert-15.patch ---
commit b5bf28cde894b3bb3bd25c13a7647020562f9ea0
Author: Linus Torvalds <torvalds at woody.linux-foundation.org>
Date:   Wed Feb 21 11:21:44 2007 -0800

    Revert "e1000: fix shared interrupt warning message"
    
    This reverts commit d2ed16356ff4fb9de23fbc5e5d582ce580390106.
    
    As Thomas Gleixner reports:
      "e1000 is not working anymore. ifup fails permanentely.
        ADDRCONF(NETDEV_UP): eth0: link is not ready
       nothing else"
    
    The broken commit was identified with "git bisect".
    
    Auke Kok says:
      "I think we need to drop this now.  The report that says that this
       *fixes* something might have been on regular interrupts only.  I
       currently suspect that it breaks all MSI interrupts, which would make
       sense if I look a the code.  Very bad indeed."
    
    Cc: Jesse Brandeburg <jesse.brandeburg at intel.com>
    Acked-by: Auke Kok <auke-jan.h.kok at intel.com>
    Cc: Andrew Morton <akpm at linux-foundation.org>
    Cc: Jeff Garzik <jeff at garzik.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index a710237..98215fd 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -1417,6 +1417,10 @@ e1000_open(struct net_device *netdev)
 	if ((err = e1000_setup_all_rx_resources(adapter)))
 		goto err_setup_rx;
 
+	err = e1000_request_irq(adapter);
+	if (err)
+		goto err_req_irq;
+
 	e1000_power_up_phy(adapter);
 
 	if ((err = e1000_up(adapter)))
@@ -1427,10 +1431,6 @@ e1000_open(struct net_device *netdev)
 		e1000_update_mng_vlan(adapter);
 	}
 
-	err = e1000_request_irq(adapter);
-	if (err)
-		goto err_req_irq;
-
 	/* If AMT is enabled, let the firmware know that the network
 	 * interface is now open */
 	if (adapter->hw.mac_type == e1000_82573 &&
@@ -1439,10 +1439,10 @@ e1000_open(struct net_device *netdev)
 
 	return E1000_SUCCESS;
 
-err_req_irq:
-	e1000_down(adapter);
 err_up:
 	e1000_power_down_phy(adapter);
+	e1000_free_irq(adapter);
+err_req_irq:
 	e1000_free_all_rx_resources(adapter);
 err_setup_rx:
 	e1000_free_all_tx_resources(adapter);


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3074
retrieving revision 1.3075
diff -u -r1.3074 -r1.3075
--- kernel-2.6.spec	16 Apr 2007 20:10:34 -0000	1.3074
+++ kernel-2.6.spec	16 Apr 2007 20:39:43 -0000	1.3075
@@ -527,7 +527,20 @@
 
 # NIC driver fixes
 # Revert E1000 to 2.6.20
-Patch1300: linux-2.6-net-e1000-revert.patch
+Patch1300: linux-2.6-e1000-revert-01.patch
+Patch1301: linux-2.6-e1000-revert-02.patch
+Patch1302: linux-2.6-e1000-revert-03.patch
+Patch1303: linux-2.6-e1000-revert-04.patch
+Patch1304: linux-2.6-e1000-revert-05.patch
+Patch1305: linux-2.6-e1000-revert-06.patch
+Patch1306: linux-2.6-e1000-revert-07.patch
+Patch1307: linux-2.6-e1000-revert-08.patch
+Patch1309: linux-2.6-e1000-revert-10.patch
+Patch1310: linux-2.6-e1000-revert-11.patch
+Patch1311: linux-2.6-e1000-revert-12.patch
+Patch1312: linux-2.6-e1000-revert-13.patch
+Patch1313: linux-2.6-e1000-revert-14.patch
+Patch1314: linux-2.6-e1000-revert-15.patch
 
 # Filesystem stuff.
 # Squashfs
@@ -1206,7 +1219,20 @@
 
 # NIC driver fixes
 # revert e1000 to 2.6.20
-#%patch1300 -p1 -R
+%patch1314 -p1 -R
+%patch1313 -p1 -R
+%patch1312 -p1 -R
+%patch1311 -p1 -R
+%patch1310 -p1 -R
+%patch1309 -p1 -R
+%patch1307 -p1 -R
+%patch1306 -p1 -R
+%patch1305 -p1 -R
+%patch1304 -p1 -R
+%patch1303 -p1 -R
+%patch1302 -p1 -R
+%patch1301 -p1 -R
+%patch1300 -p1 -R
 
 # Filesystem patches.
 # Squashfs


--- linux-2.6-net-e1000-revert.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 16 21:26:38 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 17:26:38 -0400
Subject: rpms/kernel/FC-6/configs config-generic, 1.268,
	1.268.4.1 config-powerpc64-iseries, 1.16,
	1.16.18.1 config-s390-generic, 1.22, 1.22.52.1
Message-ID: <200704162126.l3GLQcIT026388@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-jwltest-fc6-32-branch
	config-generic config-powerpc64-iseries config-s390-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-generic,v
retrieving revision 1.268
retrieving revision 1.268.4.1
diff -u -r1.268 -r1.268.4.1
--- config-generic	29 Mar 2007 22:19:24 -0000	1.268
+++ config-generic	16 Apr 2007 21:26:35 -0000	1.268.4.1
@@ -933,6 +933,9 @@
 # CONFIG_TIPC_DEBUG is not set
 
 CONFIG_NETLABEL=y
+CONFIG_CFG80211=m
+# CONFIG_CFG80211_WEXT_COMPAT is not set
+# CONFIG_NL80211 is not set
 
 #
 # QoS and/or fair queueing
@@ -1091,6 +1094,7 @@
 CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_ADAPTEC_STARFIRE_NAPI=y
 CONFIG_B44=m
+CONFIG_B44_PCI=y
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
 # CONFIG_DGRS is not set
@@ -1178,26 +1182,27 @@
 # CONFIG_SLIP_MODE_SLIP6 is not set
 
 #
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
+# Wireless LAN
 #
+CONFIG_WLAN_PRE80211=y
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
+CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 
-#
-# Wireless 802.11b ISA/PCI cards support
-#
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+CONFIG_MAC80211_DEBUG=y
+# CONFIG_MAC80211_VERBOSE_DEBUG is not set
+CONFIG_MAC80211_LOWTX_FRAME_DUMP=y
+CONFIG_TKIP_DEBUG=y
+CONFIG_MAC80211_DEBUG_COUNTERS=y
+CONFIG_HOSTAPD_WPA_TESTING=y
+CONFIG_MAC80211_IBSS_DEBUG=y
+CONFIG_MAC80211_VERBOSE_PS_DEBUG=y
 CONFIG_IEEE80211=m
 CONFIG_IEEE80211_DEBUG=y
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -1212,6 +1217,38 @@
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_BCM43XX_MAC80211=m
+CONFIG_BCM43XX_MAC80211_PCI=y
+CONFIG_BCM43XX_MAC80211_PCMCIA=y
+CONFIG_BCM43XX_MAC80211_DEBUG=y
+CONFIG_BCM43XX_MAC80211_DMA=y
+CONFIG_BCM43XX_MAC80211_PIO=y
+CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set
+# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set
+CONFIG_RT2X00=y
+CONFIG_RT2400PCI=m
+CONFIG_RT2400PCI_DEBUG=y
+CONFIG_RT2500PCI=m
+CONFIG_RT2500PCI_DEBUG=y
+CONFIG_RT61PCI=m
+CONFIG_RT61PCI_DEBUG=y
+CONFIG_RT2500USB=m
+CONFIG_RT2500USB_DEBUG=y
+CONFIG_RT73USB=m
+CONFIG_RT73USB_DEBUG=y
+CONFIG_RT2X00_DEBUGFS=m
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_ADM8211=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_ZD1211RW_MAC80211=m
+CONFIG_ZD1211RW_MAC80211_DEBUG=y
+CONFIG_RTL818X=y
+CONFIG_RTL8187=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_DEBUG=y
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1223,10 +1260,6 @@
 CONFIG_PRISM54=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
@@ -1561,6 +1594,7 @@
 CONFIG_N_HDLC=m
 # CONFIG_STALDRV is not set
 # CONFIG_IBM_ASM is not set
+CONFIG_SONICS_SILICON_BACKPLANE=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
 CONFIG_TCG_TPM=m
@@ -1848,6 +1882,14 @@
 CONFIG_MAX_RAW_DEVS=8192
 CONFIG_HANGCHECK_TIMER=m
 
+CONFIG_SSB=m
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SILENT=n
+CONFIG_SSB_DEBUG=n
+CONFIG_SSB_SERIAL=n
+CONFIG_SSB_DRIVER_PCICORE=y
+
 #
 # Multimedia devices
 #
@@ -2233,6 +2275,7 @@
 CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_CS=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
 
 #
 # USB Device Class drivers
@@ -2780,6 +2823,8 @@
 #
 CONFIG_CRC16=m
 CONFIG_CRC32=m
+CONFIG_CRC_ITU_T=m
+CONFIG_EEPROM_93CX6=m
 CONFIG_CRC_CCITT=m
 
 CONFIG_ZLIB_INFLATE=y


Index: config-powerpc64-iseries
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-powerpc64-iseries,v
retrieving revision 1.16
retrieving revision 1.16.18.1
diff -u -r1.16 -r1.16.18.1
--- config-powerpc64-iseries	15 Feb 2007 17:29:30 -0000	1.16
+++ config-powerpc64-iseries	16 Apr 2007 21:26:35 -0000	1.16.18.1
@@ -58,6 +58,7 @@
 CONFIG_SCSI_IBMVSCSI=m
 CONFIG_SERIAL_ICOM=m
 # CONFIG_ISDN is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_DVB is not set
 # CONFIG_VIDEO_DEV is not set


Index: config-s390-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-s390-generic,v
retrieving revision 1.22
retrieving revision 1.22.52.1
diff -u -r1.22 -r1.22.52.1
--- config-s390-generic	21 Dec 2006 21:45:14 -0000	1.22
+++ config-s390-generic	16 Apr 2007 21:26:35 -0000	1.22.52.1
@@ -116,6 +116,7 @@
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 # CONFIG_NET_RADIO is not set
+# CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 
 # The s390 CPU does not have hardware support for big pages at all.



From fedora-cvs-commits at redhat.com  Mon Apr 16 21:26:37 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 17:26:37 -0400
Subject: rpms/kernel/FC-6 jwltest-iwlwifi-fixes.patch, NONE,
	1.1.8.1 jwltest-iwlwifi.patch, NONE,
	1.1.20.1 jwltest-mac80211-backport-2_6_20-fixup.patch, NONE,
	1.1.10.1 jwltest-mac80211-backport.patch, NONE,
	1.1.20.1 kernel-2.6.spec, 1.2944, 1.2944.2.1
Message-ID: <200704162126.l3GLQbPe026362@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-jwltest-fc6-32-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-linville-jwltest-fc6-32-branch
	jwltest-iwlwifi-fixes.patch jwltest-iwlwifi.patch 
	jwltest-mac80211-backport-2_6_20-fixup.patch 
	jwltest-mac80211-backport.patch 
Log Message:


jwltest-iwlwifi-fixes.patch:
 base.c    |    1 +
 iwlwifi.h |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE jwltest-iwlwifi-fixes.patch ---
--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig	2007-04-12 11:36:00.000000000 -0400
+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-04-12 11:37:18.000000000 -0400
@@ -12970,6 +12970,7 @@ static int ipw_pci_probe(struct pci_dev 
 	err = ipw_read_ucode(priv);
 	if (err) {
 		IPW_ERROR("Could not read microcode from disk: %d\n", err);
+		mutex_unlock(&priv->mutex);
 		goto out_remove_sysfs;
 	}
 
--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h.orig	2007-04-12 11:36:00.000000000 -0400
+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h	2007-04-12 11:37:18.000000000 -0400
@@ -180,7 +180,7 @@ do { if (ipw_debug_level & (level)) \
 #define IPW_DL_QOS           (1<<31)
 
 #define IPW_ERROR(f, a...) printk(KERN_ERR DRV_NAME ": " f, ## a)
-#define IPW_WARNING(f, a...) printk(KERN_ERR DRV_NAME ": " f, ## a)
+#define IPW_WARNING(f, a...) printk(KERN_WARNING DRV_NAME ": " f, ## a)
 #define IPW_DEBUG_INFO(f, a...)    IPW_DEBUG(IPW_DL_INFO, f, ## a)
 
 #define IPW_DEBUG_MAC80211(f, a...)     IPW_DEBUG(IPW_DL_MAC80211, f, ## a)

jwltest-iwlwifi.patch:
 Kconfig              |    1 
 Makefile             |    1 
 iwlwifi/Kconfig      |   52 
 iwlwifi/Makefile     |    2 
 iwlwifi/base.c       |13762 +++++++++++++++++++++++++++++++++++++++++++++++++++
 iwlwifi/iwlwifi.h    | 1297 ++++
 iwlwifi/iwlwifi_hw.h | 1877 ++++++
 7 files changed, 16992 insertions(+)

--- NEW FILE jwltest-iwlwifi.patch ---
--- /dev/null	2007-03-09 11:47:32.684268720 -0500
+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-04-12 11:36:00.000000000 -0400
@@ -0,0 +1,13762 @@
+/******************************************************************************
+
+  Copyright(c) 2003 - 2006 Intel Corporation. All rights reserved.
+
+  Portions of this file are derived from the ipw3945 project, as well
+  as portions of the ieee80211 subsystem header files.
+
+  802.11 status code portion of this file from ethereal-0.10.6:
+    Copyright 2000, Axis Communications AB
+    Ethereal - Network traffic analyzer
+    By Gerald Combs <gerald at ethereal.com>
+    Copyright 1998 Gerald Combs
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of version 2 of the GNU General Public License as
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+
+  Contact Information:
+  James P. Ketrenos <ipw2100-admin at linux.intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+******************************************************************************/
+
+/*
+ * Theory of operation:
+ *
+ * The primary NIC mode of operation is configured within the RXON command.
+ * As such, there are two instances of RXON data -- staging_rxon and
+ * active_rxon.  The former is used to configure the device, the later to
+ * reflect the actual currently active configuration.
+ *
+ * After configuring staging_rxon, it is activated by calling
+ * ipw_commit_rxon(). The ipw_commit_rxon() will ensure the correct sequence
+ * of commands are invoked on the hardware to result in Tx being possible
+ * (if the channel is appropriate for Tx)
+ *
+ * About the threading and lock model of the driver...
+ *
+ * There are three paths of execution through the driver.
+ *
+ * 1.  ioctl based (wireless extensions, netdev, etc.)
+ * 2.  interrupt based
+ * 3.  scheduled work queue items
+ *
+ * As soon as an interrupt comes in, it schedules a tasklet.  That tasklet,
+ * when run, does any HW checks, pulls any data from the read queue,
+ * and schedules other layers to do the actual work.
+ *
+ * NOTE: This driver is a work in progress.  It is currently structured
+ * in a way that we can add support for the next wireless adapter
+ * available from Intel.
+ *
+ * Our current focus is as follows:
+ * 1.  Get the driver working w/ mac80211 in STA(client) mode.
+ * 2.  Clean up the dual-driver code from function redirection to
+ *     if/else switches where the code detlas are minimal.
+ * 3.  Evaluate the amount of delta between the hardware versions and
+ *     possibly split iwlwifi into multiple drivers for each piece of
+ *     HW, sharing as much base code as possible (would result in
+ *     multiple driver files on disk vs. a single module that works
+ *     with multiple hardware types)
+ * 4.  Document the uCode regulatory enforcement
+ * 5.  Document the rate scaling capabilities of the 3945
+ * 6.  Provide an initial rate scaling algorithm tailored for the
+ *     statistic data exposed by the 3945.
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/dma-mapping.h>
+#include <linux/delay.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/wireless.h>
+#include <linux/firmware.h>
+#include <net/iw_handler.h>
+
+//#define BIT(x) (1 << (x))
+#include <net/mac80211.h>
+#include <net/ieee80211.h>
+
+#include <../net/mac80211/ieee80211_rate.h>
+
+#include <net/ieee80211_radiotap.h>
+	
+#ifndef ETH_P_80211_RAW
+#define ETH_P_80211_RAW (ETH_P_ECONET + 1)
+#endif
+
+#include <linux/if_arp.h>
+#include <asm/div64.h>
+
+#include "iwlwifi.h"
+
+#define IWLWIFI_VERSION "0.0.12k"
+
+#define DRV_DESCRIPTION	"Intel(R) Wireless Link driver for Linux"
+#define DRV_COPYRIGHT	"Copyright(c) 2003-2006 Intel Corporation"
+#define DRV_VERSION     IWLWIFI_VERSION
+
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR(DRV_COPYRIGHT);
+MODULE_LICENSE("GPL");
+
+/*MAC80211  move this to mac80211 files */
+#define IEEE80211_FC(type, stype) cpu_to_le16((type << 2) | (stype << 4))
+
+#define IEEE80211_CHAN_W_RADAR_DETECT 0x00000010
+
+#define IEEE80211_24GHZ_BAND     (1<<0)
+#define IEEE80211_52GHZ_BAND     (1<<1)
+
+#define IEEE80211_CCK_RATE_1MB                  0x02
+#define IEEE80211_CCK_RATE_2MB                  0x04
+#define IEEE80211_CCK_RATE_5MB                  0x0B
+#define IEEE80211_CCK_RATE_11MB                 0x16
+#define IEEE80211_OFDM_RATE_6MB                 0x0C
+#define IEEE80211_OFDM_RATE_9MB                 0x12
+#define IEEE80211_OFDM_RATE_12MB                0x18
+#define IEEE80211_OFDM_RATE_18MB                0x24
+#define IEEE80211_OFDM_RATE_24MB                0x30
+#define IEEE80211_OFDM_RATE_36MB                0x48
+#define IEEE80211_OFDM_RATE_48MB                0x60
+#define IEEE80211_OFDM_RATE_54MB                0x6C
+#define IEEE80211_BASIC_RATE_MASK               0x80
+
+#define IEEE80211_CCK_RATE_1MB_MASK             (1<<0)
+#define IEEE80211_CCK_RATE_2MB_MASK             (1<<1)
+#define IEEE80211_CCK_RATE_5MB_MASK             (1<<2)
+#define IEEE80211_CCK_RATE_11MB_MASK            (1<<3)
+#define IEEE80211_OFDM_RATE_6MB_MASK            (1<<4)
+#define IEEE80211_OFDM_RATE_9MB_MASK            (1<<5)
+#define IEEE80211_OFDM_RATE_12MB_MASK           (1<<6)
+#define IEEE80211_OFDM_RATE_18MB_MASK           (1<<7)
+#define IEEE80211_OFDM_RATE_24MB_MASK           (1<<8)
+#define IEEE80211_OFDM_RATE_36MB_MASK           (1<<9)
+#define IEEE80211_OFDM_RATE_48MB_MASK           (1<<10)
+#define IEEE80211_OFDM_RATE_54MB_MASK           (1<<11)
+
+#define IEEE80211_CCK_RATES_MASK                0x0000000F
+#define IEEE80211_CCK_BASIC_RATES_MASK  (IEEE80211_CCK_RATE_1MB_MASK | \
+        IEEE80211_CCK_RATE_2MB_MASK)
+#define IEEE80211_CCK_DEFAULT_RATES_MASK        (IEEE80211_CCK_BASIC_RATES_MASK | \
+        IEEE80211_CCK_RATE_5MB_MASK | \
+        IEEE80211_CCK_RATE_11MB_MASK)
+
+#define IEEE80211_OFDM_RATES_MASK               0x00000FF0
+#define IEEE80211_OFDM_BASIC_RATES_MASK (IEEE80211_OFDM_RATE_6MB_MASK | \
+        IEEE80211_OFDM_RATE_12MB_MASK | \
+        IEEE80211_OFDM_RATE_24MB_MASK)
+#define IEEE80211_OFDM_DEFAULT_RATES_MASK       (IEEE80211_OFDM_BASIC_RATES_MASK | \
+        IEEE80211_OFDM_RATE_9MB_MASK  | \
+        IEEE80211_OFDM_RATE_18MB_MASK | \
+        IEEE80211_OFDM_RATE_36MB_MASK | \
+        IEEE80211_OFDM_RATE_48MB_MASK | \
+        IEEE80211_OFDM_RATE_54MB_MASK)
+#define IEEE80211_DEFAULT_RATES_MASK (IEEE80211_OFDM_DEFAULT_RATES_MASK | \
+                                IEEE80211_CCK_DEFAULT_RATES_MASK)
+
+#define IEEE80211_NUM_OFDM_RATES            8
+#define IEEE80211_NUM_CCK_RATES             4
+#define IEEE80211_OFDM_SHIFT_MASK_A         4
+
+/*MAC80211 end */
+
+static u32 ipw_debug_level;
+
+static int param_debug = 0;
+static int param_channel = 0;
+static int param_mode = 0;
+static int param_auto_create = 1;	/* def: create new adhoc network if needed */
+static int param_led = 1;	/* def: use LEDs */
+static int param_disable = 0;	/* def: enable radio */
+static int param_antenna = 0;	/* def: 0 = both antennas (use diversity) */
+static int param_hwcrypto = 0;	/* def: using software encryption */
+static int param_qos_enable = 1;
+static int param_rtap_iface = 0;
+
+static const char ipw_modes[] = {
+	'a', 'b', 'g', '?'
+};
[...16620 lines suppressed...]
+	u8 flags;
+	/* We have 15 LSB to use as we please (MSB indicates
+	 * a frame Rx'd from the HW).  We encode the following
+	 * information into the sequence field:
+	 *
+	 *  0:7    index in fifo
+	 *  8:13   fifo selection
+	 * 14:14   bit indicating if this packet references the 'extra'
+	 *         storage at the end of the memory queue
+	 * 15:15   (Rx indication)
+	 *
+	 */
+	u16 sequence;
+
+	/* command data follows immediately */
+	u8 data[0];
+} __attribute__ ((packed));
+
+// Used for passing to driver number of successes and failures per rate
+struct rate_histogram {
+	union {
+		u32 a[SUP_RATE_11A_MAX_NUM_CHANNELS];
+		u32 b[SUP_RATE_11B_MAX_NUM_CHANNELS];
+		u32 g[SUP_RATE_11G_MAX_NUM_CHANNELS];
+	} success;
+	union {
+		u32 a[SUP_RATE_11A_MAX_NUM_CHANNELS];
+		u32 b[SUP_RATE_11B_MAX_NUM_CHANNELS];
+		u32 g[SUP_RATE_11G_MAX_NUM_CHANNELS];
+	} failed;
+} __attribute__ ((packed));
+
+/* statistics command response */
+
+struct statistics_rx_phy {
+	u32 ina_cnt;
+	u32 fina_cnt;
+	u32 plcp_err;
+	u32 crc32_err;
+	u32 overrun_err;
+	u32 early_overrun_err;
+	u32 crc32_good;
+	u32 false_alarm_cnt;
+	u32 fina_sync_err_cnt;
+	u32 sfd_timeout;
+	u32 fina_timeout;
+	u32 unresponded_rts;
+	u32 rxe_frame_limit_overrun;
+	u32 sent_ack_cnt;
+	u32 sent_cts_cnt;
+} __attribute__ ((packed));
+
+struct statistics_rx {
+	struct statistics_rx_phy ofdm;
+	struct statistics_rx_phy cck;
+	u32 bogus_cts;
+	u32 bogus_ack;
+	u32 non_bssid_frames;
+	u32 filtered_frames;
+	u32 non_channel_beacons;
+} __attribute__ ((packed));
+
+struct statistics_tx {
+	u32 preamble_cnt;
+	u32 rx_detected_cnt;
+	u32 bt_prio_defer_cnt;
+	u32 bt_prio_kill_cnt;
+	u32 few_bytes_cnt;
+	u32 cts_timeout;
+	u32 ack_timeout;
+	u32 expected_ack_cnt;
+	u32 actual_ack_cnt;
+} __attribute__ ((packed));
+
+struct statistics_dbg {
+	u32 burst_check;
+	u32 burst_count;
+	u32 reserved[4];
+} __attribute__ ((packed));
+
+struct statistics_div {
+	u32 tx_on_a;
+	u32 tx_on_b;
+	u32 exec_time;
+	u32 probe_time;
+} __attribute__ ((packed));
+
+struct statistics_general {
+	u32 temperature;
+	struct statistics_dbg dbg;
+	u32 sleep_time;
+	u32 slots_out;
+	u32 slots_idle;
+	u32 ttl_timestamp;
+	struct statistics_div div;
+} __attribute__ ((packed));
+
+struct ipw_notif_statistics {
+	u32 flag;
+	struct statistics_rx rx;
+	struct statistics_tx tx;
+	struct statistics_general general;
+} __attribute__ ((packed));
+
+struct ipw_rx_packet {
+	u32 len;
+	struct ipw_cmd_header hdr;
+	union {
+		struct ipw_alive_resp alive_frame;
+		struct ipw_rx_frame rx_frame;
+		struct ipw_tx_resp tx_resp;
+		struct ipw_spectrum_notification spectrum_notif;
+		struct ipw_csa_notification csa_notif;
+		struct ipw_error_resp err_resp;
+		struct ipw_card_state_notif card_state_notif;
+		struct ipw_notif_statistics stats;
+		struct BeaconNtfSpecifics beacon_status;
+		struct ipw_add_sta_resp add_sta;
+		struct ipw_sleep_notification sleep_notif;
+		u32 status;
+		u8 raw[0];
+	} u;
+} __attribute__ ((packed));
+
+#define IPW_RX_FRAME_SIZE        (4 + sizeof(struct ipw_rx_frame))
+
+struct ipw_multicast_addr {
+	u8 num_of_multicast_addresses;
+	u8 reserved[3];
+	u8 mac1[6];
+	u8 mac2[6];
+	u8 mac3[6];
+	u8 mac4[6];
+} __attribute__ ((packed));
+
+struct ipw_tgi_tx_key {
+	u8 key_id;
+	u8 security_type;
+	u8 station_index;
+	u8 flags;
+	u8 key[16];
+	u32 tx_counter[2];
+} __attribute__ ((packed));
+
+struct ipw_associate {
+	u8 channel;
+	u8 auth_type:4, auth_key:4;
+	u8 assoc_type;
+	u8 reserved;
+	u16 policy_support;
+	u8 preamble_length;
+	u8 ieee_mode;
+	u8 bssid[ETH_ALEN];
+	u32 assoc_tsf_msw;
+	u32 assoc_tsf_lsw;
+	u16 capability;
+	u16 listen_interval;
+	u16 beacon_interval;
+	u8 dest[ETH_ALEN];
+	u16 atim_window;
+	u8 smr;
+	u8 reserved1;
+	u16 reserved2;
+	u16 assoc_id;
+	u8 erp_value;
+} __attribute__ ((packed));
+
+#define IPW_SUPPORTED_RATES_IE_LEN         8
+
+struct ipw_supported_rates {
+	u8 ieee_mode;
+	u8 num_rates;
+	u8 purpose;
+	u8 reserved;
+	u8 supported_rates[IPW_MAX_RATES];
+} __attribute__ ((packed));
+
+struct ipw_channel_tx_power {
+	u8 channel_number;
+	s8 tx_power;
+} __attribute__ ((packed));
+
+
+#define IPW_RX_BUF_SIZE 3000
+
+#endif				/* __iwlwifi_hw_h__ */
--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile.orig	2007-04-12 11:08:17.000000000 -0400
+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile	2007-04-12 11:36:00.000000000 -0400
@@ -4,3 +4,4 @@ obj-$(CONFIG_ADM8211)		+= adm8211/
 obj-$(CONFIG_P54_COMMON)	+= p54/
 obj-$(CONFIG_ZD1211RW_MAC80211)	+= zd1211rw/
 obj-$(CONFIG_RTL818X)		+= rtl818x/
+obj-$(CONFIG_IWLWIFI)		+= iwlwifi/
--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig.orig	2007-04-12 11:08:17.000000000 -0400
+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig	2007-04-12 11:36:00.000000000 -0400
@@ -4,3 +4,4 @@ source "drivers/net/wireless/mac80211/ad
 source "drivers/net/wireless/mac80211/p54/Kconfig"
 source "drivers/net/wireless/mac80211/zd1211rw/Kconfig"
 source "drivers/net/wireless/mac80211/rtl818x/Kconfig"
+source "drivers/net/wireless/mac80211/iwlwifi/Kconfig"

jwltest-mac80211-backport-2_6_20-fixup.patch:
 core.c    |    6 ++++--
 nl80211.c |    4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE jwltest-mac80211-backport-2_6_20-fixup.patch ---
--- linux-2.6.20.noarch/net/wireless/nl80211.c.orig	2007-04-12 12:57:55.000000000 -0400
+++ linux-2.6.20.noarch/net/wireless/nl80211.c	2007-04-12 12:57:51.000000000 -0400
@@ -694,6 +694,7 @@ static int nl80211_rename_wiphy(struct s
 	struct cfg80211_registered_device *rdev;
 	int result;
 
+#if 0 /* Not in FC6 */
 	if (!info->attrs[NL80211_ATTR_WIPHY_NAME])
 		return -EINVAL;
 
@@ -705,6 +706,9 @@ static int nl80211_rename_wiphy(struct s
 
 	cfg80211_put_dev(rdev);
 	return result;
+#else
+	return -EINVAL;
+#endif
 }
 
 static int nl80211_key_cmd(struct sk_buff *skb, struct genl_info *info)
--- linux-2.6.20.noarch/net/wireless/core.c.orig	2007-04-12 12:55:32.000000000 -0400
+++ linux-2.6.20.noarch/net/wireless/core.c	2007-04-12 12:58:36.000000000 -0400
@@ -141,6 +141,7 @@ void cfg80211_put_dev(struct cfg80211_re
 	mutex_unlock(&drv->mtx);
 }
 
+#if 0 /* Not in FC6 */
 int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
 			char *newname)
 {
@@ -172,6 +173,7 @@ int cfg80211_dev_rename(struct cfg80211_
 
 	return 0;
 }
+#endif
 
 /* exported functions */
 
@@ -291,7 +293,7 @@ static int cfg80211_netdev_notifier_call
 	case NETDEV_REGISTER:
 		mutex_lock(&rdev->devlist_mtx);
 		list_add(&dev->ieee80211_ptr->list, &rdev->netdev_list);
-		if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj,
+		if (sysfs_create_link(&dev->class_dev.kobj, &rdev->wiphy.dev.kobj,
 				      "phy80211")) {
 			printk(KERN_ERR "wireless: failed to add phy80211 symlink to netdev!\n");
 		}
@@ -301,7 +303,7 @@ static int cfg80211_netdev_notifier_call
 	case NETDEV_UNREGISTER:
 		mutex_lock(&rdev->devlist_mtx);
 		if (!list_empty(&dev->ieee80211_ptr->list)) {
-			sysfs_remove_link(&dev->dev.kobj, "phy80211");
+			sysfs_remove_link(&dev->class_dev.kobj, "phy80211");
 			list_del_init(&dev->ieee80211_ptr->list);
 		}
 		mutex_unlock(&rdev->devlist_mtx);

jwltest-mac80211-backport.patch:
 CREDITS                                                 |   37 
 MAINTAINERS                                             |   62 
 drivers/Kconfig                                         |    2 
 drivers/Makefile                                        |    1 
 drivers/misc/Kconfig                                    |    8 
 drivers/misc/Makefile                                   |    1 
 drivers/misc/eeprom_93cx6.c                             |  344 +
 drivers/net/Makefile                                    |    2 
 drivers/net/wireless/Kconfig                            |  120 
 drivers/net/wireless/Makefile                           |    3 
 drivers/net/wireless/bcm43xx/Kconfig                    |    4 
 drivers/net/wireless/hostap/Kconfig                     |    3 
 drivers/net/wireless/mac80211/Kconfig                   |    6 
 drivers/net/wireless/mac80211/Makefile                  |    6 
 drivers/net/wireless/mac80211/README                    |    2 
 drivers/net/wireless/mac80211/adm8211/Kconfig           |   25 
 drivers/net/wireless/mac80211/adm8211/Makefile          |    1 
 drivers/net/wireless/mac80211/adm8211/adm8211.c         | 2172 ++++++
 drivers/net/wireless/mac80211/adm8211/adm8211.h         |  622 +
 drivers/net/wireless/mac80211/bcm43xx/Kconfig           |  100 
 drivers/net/wireless/mac80211/bcm43xx/Makefile          |   18 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h         |  875 ++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c |  433 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h |  110 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c     | 1297 ++++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h     |  361 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c    |  300 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h    |   56 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c      | 1110 +++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h      |   92 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c    | 3984 ++++++++++++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h    |  156 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c  |  163 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h  |   22 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c     | 4262 +++++++++++++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h     |  309 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c     |  671 ++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h     |  170 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c   |   82 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h   |   41 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c   |  232 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h   |    9 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c  |  376 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h  |   28 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c    |  611 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h    |  250 
 drivers/net/wireless/mac80211/p54/Kconfig               |   10 
 drivers/net/wireless/mac80211/p54/Makefile              |    4 
 drivers/net/wireless/mac80211/p54/net2280.h             |  452 +
 drivers/net/wireless/mac80211/p54/prism54.h             |   77 
 drivers/net/wireless/mac80211/p54/prism54common.c       |  821 ++
 drivers/net/wireless/mac80211/p54/prism54common.h       |  328 +
 drivers/net/wireless/mac80211/p54/prism54magic.h        |   77 
 drivers/net/wireless/mac80211/p54/prism54pci.c          |  700 ++
 drivers/net/wireless/mac80211/p54/prism54pci.h          |  106 
 drivers/net/wireless/mac80211/p54/prism54usb.c          |  946 ++
 drivers/net/wireless/mac80211/p54/prism54usb.h          |  133 
 drivers/net/wireless/mac80211/rt2x00/Kconfig            |   99 
 drivers/net/wireless/mac80211/rt2x00/Makefile           |   12 
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.c        | 2562 ++++++++
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.h        |  925 ++
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.c        | 2859 ++++++++
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.h        | 1192 +++
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.c        | 2695 ++++++++
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.h        |  740 ++
 drivers/net/wireless/mac80211/rt2x00/rt2x00.h           | 1070 +++
 drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c      |  354 +
 drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h      |   71 
 drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c        |  282 
 drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h        |   80 
 drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c        |  540 +
 drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h        |   39 
 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h        |   82 
 drivers/net/wireless/mac80211/rt2x00/rt61pci.c          | 3333 ++++++++++
 drivers/net/wireless/mac80211/rt2x00/rt61pci.h          | 1355 ++++
 drivers/net/wireless/mac80211/rt2x00/rt73usb.c          | 2993 +++++++++
 drivers/net/wireless/mac80211/rt2x00/rt73usb.h          |  939 ++
 drivers/net/wireless/mac80211/rtl818x/Kconfig           |    9 
 drivers/net/wireless/mac80211/rtl818x/Makefile          |    2 
 drivers/net/wireless/mac80211/rtl818x/rtl8187.h         |  126 
 drivers/net/wireless/mac80211/rtl818x/rtl8187_dev.c     |  726 ++
 drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.c |  747 ++
 drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.h |   30 
 drivers/net/wireless/mac80211/rtl818x/rtl818x.h         |  180 
 drivers/net/wireless/mac80211/zd1211rw/Kconfig          |   19 
 drivers/net/wireless/mac80211/zd1211rw/Makefile         |   11 
 drivers/net/wireless/mac80211/zd1211rw/zd_chip.c        | 1679 +++++
 drivers/net/wireless/mac80211/zd1211rw/zd_chip.h        |  910 ++
 drivers/net/wireless/mac80211/zd1211rw/zd_def.h         |   57 
 drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h   |   67 
 drivers/net/wireless/mac80211/zd1211rw/zd_mac.c         |  700 ++
 drivers/net/wireless/mac80211/zd1211rw/zd_mac.h         |  250 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf.c          |  170 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf.h          |   80 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c   |  436 +
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c  |  491 +
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c   |  279 
 drivers/net/wireless/mac80211/zd1211rw/zd_usb.c         | 1337 ++++
 drivers/net/wireless/mac80211/zd1211rw/zd_usb.h         |  241 
 drivers/net/wireless/mac80211/zd1211rw/zd_util.c        |   82 
 drivers/net/wireless/mac80211/zd1211rw/zd_util.h        |   29 
 drivers/net/wireless/zd1211rw/Kconfig                   |    4 
 drivers/ssb/Kconfig                                     |   93 
 drivers/ssb/Makefile                                    |   11 
 drivers/ssb/driver_chipcommon.c                         |  402 +
 drivers/ssb/driver_mipscore.c                           |  258 
 drivers/ssb/driver_pcicore.c                            |  556 +
 drivers/ssb/main.c                                      | 1050 +++
 drivers/ssb/pci.c                                       |  667 ++
 drivers/ssb/pcihost_wrapper.c                           |  104 
 drivers/ssb/pcmcia.c                                    |  256 
 drivers/ssb/scan.c                                      |  407 +
 drivers/ssb/ssb_private.h                               |  151 
 drivers/usb/host/Kconfig                                |   13 
 drivers/usb/host/ohci-hcd.c                             |    6 
 drivers/usb/host/ohci-ssb.c                             |  254 
 include/linux/Kbuild                                    |    2 
 include/linux/crc-itu-t.h                               |   27 
 include/linux/eeprom_93cx6.h                            |   77 
 include/linux/ieee80211.h                               |  403 +
 include/linux/netdevice.h                               |    7 
 include/linux/nl80211.h                                 |  301 
 include/linux/ssb/ssb.h                                 |  403 +
 include/linux/ssb/ssb_driver_chipcommon.h               |  387 +
 include/linux/ssb/ssb_driver_extif.h                    |  163 
 include/linux/ssb/ssb_driver_mips.h                     |   47 
 include/linux/ssb/ssb_driver_pci.h                      |  108 
 include/linux/ssb/ssb_regs.h                            |  294 
 include/net/cfg80211.h                                  |  150 
 include/net/iw_handler.h                                |   13 
 include/net/mac80211.h                                  | 1106 +++
 include/net/wireless.h                                  |  159 
 lib/Kconfig                                             |    8 
 lib/Makefile                                            |    1 
 lib/crc-itu-t.c                                         |   64 
 net/Kconfig                                             |   12 
 net/Makefile                                            |    2 
 net/core/Makefile                                       |    1 
 net/core/dev.c                                          |   33 
 net/core/rtnetlink.c                                    |   29 
 net/core/wireless.c                                     | 2353 -------
 net/ieee80211/Kconfig                                   |    3 
 net/mac80211/Kconfig                                    |   81 
 net/mac80211/Makefile                                   |   21 
 net/mac80211/aes_ccm.c                                  |  155 
 net/mac80211/aes_ccm.h                                  |   26 
 net/mac80211/debugfs.c                                  |  436 +
 net/mac80211/debugfs.h                                  |   16 
 net/mac80211/debugfs_key.c                              |  253 
 net/mac80211/debugfs_key.h                              |   34 
 net/mac80211/debugfs_netdev.c                           |  440 +
 net/mac80211/debugfs_netdev.h                           |   30 
 net/mac80211/debugfs_sta.c                              |  247 
 net/mac80211/debugfs_sta.h                              |   12 
 net/mac80211/hostapd_ioctl.h                            |  347 +
 net/mac80211/ieee80211.c                                | 5097 ++++++++++++++++
 net/mac80211/ieee80211_cfg.c                            |   90 
 net/mac80211/ieee80211_cfg.h                            |    9 
 net/mac80211/ieee80211_common.h                         |   98 
 net/mac80211/ieee80211_i.h                              |  848 ++
 net/mac80211/ieee80211_iface.c                          |  366 +
 net/mac80211/ieee80211_ioctl.c                          | 3290 ++++++++++
 net/mac80211/ieee80211_key.h                            |  106 
 net/mac80211/ieee80211_led.c                            |   91 
 net/mac80211/ieee80211_led.h                            |   32 
 net/mac80211/ieee80211_rate.c                           |  140 
 net/mac80211/ieee80211_rate.h                           |  144 
 net/mac80211/ieee80211_scan.c                           |  344 +
 net/mac80211/ieee80211_sta.c                            | 3207 ++++++++++
 net/mac80211/michael.c                                  |  104 
 net/mac80211/michael.h                                  |   20 
 net/mac80211/rc80211_simple.c                           |  432 +
 net/mac80211/sta_info.c                                 |  463 +
 net/mac80211/sta_info.h                                 |  167 
 net/mac80211/tkip.c                                     |  341 +
 net/mac80211/tkip.h                                     |   36 
 net/mac80211/wep.c                                      |  328 +
 net/mac80211/wep.h                                      |   40 
 net/mac80211/wme.c                                      |  685 ++
 net/mac80211/wme.h                                      |   38 
 net/mac80211/wpa.c                                      |  846 ++
 net/mac80211/wpa.h                                      |   31 
 net/wireless/Kconfig                                    |   46 
 net/wireless/Makefile                                   |   17 
 net/wireless/core.c                                     |  359 +
 net/wireless/core.h                                     |   80 
 net/wireless/nl80211.c                                  |  974 +++
 net/wireless/nl80211.h                                  |   24 
 net/wireless/sysfs.c                                    |  125 
 net/wireless/sysfs.h                                    |    9 
 net/wireless/wext-common.c                              |  663 ++
 net/wireless/wext-compat.c                              |  789 ++
 net/wireless/wext-export.c                              |   29 
 net/wireless/wext-mod.c                                 |   20 
 net/wireless/wext-old.c                                 |  829 ++
 net/wireless/wext.h                                     |   51 
 196 files changed, 85456 insertions(+), 2508 deletions(-)

--- NEW FILE jwltest-mac80211-backport.patch ---
--- /dev/null	2007-04-16 13:58:59.302022784 -0400
+++ linux-2.6.20.noarch/include/net/wireless.h	2007-04-16 16:59:55.000000000 -0400
@@ -0,0 +1,159 @@
+#ifndef __NET_WIRELESS_H
+#define __NET_WIRELESS_H
+
+/*
+ * 802.11 device management
+ *
+ * Copyright 2007	Johannes Berg <johannes at sipsolutions.net>
+ */
+
+#include <linux/netdevice.h>
+#include <linux/debugfs.h>
+#include <linux/list.h>
+#include <net/cfg80211.h>
+
+/**
+ * struct wiphy - wireless hardware description
+ * @idx: the wiphy index assigned to this item
+ * @class_dev: the class device representing /sys/class/ieee80211/<wiphy-name>
+ */
+struct wiphy {
+	/* assign these fields before you register the wiphy */
+
+	/* permanent MAC address */
+	u8 perm_addr[ETH_ALEN];
+
+	/* If multiple wiphys are registered and you're handed e.g.
+	 * a regular netdev with assigned ieee80211_ptr, you won't
+	 * know whether it points to a wiphy your driver has registered
+	 * or not. Assign this to something global to your driver to
+	 * help determine whether you own this wiphy or not. */
+	void *privid;
+
+	/* fields below are read-only, assigned by cfg80211 */
+
+	/* the item in /sys/class/ieee80211/ points to this,
+	 * you need use set_wiphy_dev() (see below) */
+	struct device dev;
+
+	/* dir in debugfs: ieee80211/<wiphyname> */
+	struct dentry *debugfsdir;
+
+	char priv[0] __attribute__((__aligned__(NETDEV_ALIGN)));
+};
+
+/** struct wireless_dev - wireless per-netdev state
+ *
+ * This structure must be allocated by the driver/stack
+ * that uses the ieee80211_ptr field in struct net_device
+ * (this is intentional so it can be allocated along with
+ * the netdev.)
+ *
+ * @wiphy: pointer to hardware description
+ */
+struct wireless_dev {
+	struct wiphy *wiphy;
+
+	/* private to the generic wireless code */
+	struct list_head list;
+	struct net_device *netdev;
+};
+
+/**
+ * wiphy_priv - return priv from wiphy
+ */
+static inline void *wiphy_priv(struct wiphy *wiphy)
+{
+	BUG_ON(!wiphy);
+	return &wiphy->priv;
+}
+
+/**
+ * set_wiphy_dev - set device pointer for wiphy
+ */
+static inline void set_wiphy_dev(struct wiphy *wiphy, struct device *dev)
+{
+	wiphy->dev.parent = dev;
+}
+
+/**
+ * wiphy_dev - get wiphy dev pointer
+ */
+static inline struct device *wiphy_dev(struct wiphy *wiphy)
+{
+	return wiphy->dev.parent;
+}
+
+/**
+ * wiphy_name - get wiphy name
+ */
+static inline char *wiphy_name(struct wiphy *wiphy)
+{
+	return wiphy->dev.bus_id;
+}
+
+/**
+ * wdev_priv - return wiphy priv from wireless_dev
+ */
+static inline void *wdev_priv(struct wireless_dev *wdev)
+{
+	BUG_ON(!wdev);
+	return wiphy_priv(wdev->wiphy);
+}
+
+/**
+ * wiphy_new - create a new wiphy for use with cfg80211
+ *
+ * create a new wiphy and associate the given operations with it.
+ * @sizeof_priv bytes are allocated for private use.
+ *
+ * the returned pointer must be assigned to each netdev's
+ * ieee80211_ptr for proper operation.
+ */
+struct wiphy *wiphy_new(struct cfg80211_ops *ops, int sizeof_priv);
+
+/**
+ * wiphy_register - register a wiphy with cfg80211
+ *
+ * register the given wiphy
+ *
+ * Returns a non-negative wiphy index or a negative error code.
+ */
+extern int wiphy_register(struct wiphy *wiphy);
+
+/**
+ * wiphy_unregister - deregister a wiphy from cfg80211
+ *
+ * unregister a device with the given priv pointer.
+ * After this call, no more requests can be made with this priv
+ * pointer, but the call may sleep to wait for an outstanding
+ * request that is being handled.
+ */
+extern void wiphy_unregister(struct wiphy *wiphy);
+
+/**
+ * wiphy_free - free wiphy
+ */
+extern void wiphy_free(struct wiphy *wiphy);
+
+
+/*
+ * internal definitions for wireless
+ */
+
+#if defined(CONFIG_CFG80211_WEXT_COMPAT) || defined(CONFIG_WIRELESS_EXT)
+int wext_ioctl(unsigned int cmd, struct ifreq *ifreq, void __user *arg);
+int wireless_proc_init(void);
+#else
+static inline
+int wext_ioctl(unsigned int cmd, struct ifreq *ifreq, void __user *arg)
+{
+	return -EINVAL;
+}
+static inline int wireless_proc_init(void)
+{
+	return 0;
+}
+#endif
+
+#endif /* __NET_WIRELESS_H */
--- /dev/null	2007-04-16 13:58:59.302022784 -0400
+++ linux-2.6.20.noarch/include/net/mac80211.h	2007-04-16 16:59:55.000000000 -0400
@@ -0,0 +1,1106 @@
+/*
+ * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface
+ * Copyright 2002-2005, Devicescape Software, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef MAC80211_H
+#define MAC80211_H
+
+#include <linux/kernel.h>
+#include <linux/if_ether.h>
+#include <linux/skbuff.h>
+#include <linux/wireless.h>
+#include <linux/device.h>
+#include <linux/ieee80211.h>
+#include <net/wireless.h>
+#include <net/cfg80211.h>
+
+/* Note! Only ieee80211_tx_status_irqsafe() and ieee80211_rx_irqsafe() can be
+ * called in hardware interrupt context. The low-level driver must not call any
+ * other functions in hardware interrupt context. If there is a need for such
+ * call, the low-level driver should first ACK the interrupt and perform the
+ * IEEE 802.11 code call after this, e.g., from a scheduled tasklet (in
+ * software interrupt context).
+ */
+
+/*
+ * Frame format used when passing frame between low-level hardware drivers
+ * and IEEE 802.11 driver the same as used in the wireless media, i.e.,
+ * buffers start with IEEE 802.11 header and include the same octets that
+ * are sent over air.
[...88632 lines suppressed...]
+
+		memset(&iwe, 0, sizeof(iwe));
+		iwe.cmd = IWEVCUSTOM;
+		sprintf(buf, "capab=0x%04x", bss->capability);
+		iwe.u.data.length = strlen(buf);
+		current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+						  buf);
+
+		/* dispaly all support rates in readable format */
+		p = current_ev + IW_EV_LCP_LEN;
+		iwe.cmd = SIOCGIWRATE;
+		/* Those two flags are ignored... */
+		iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;
+
+		for (i = 0; i < bss->supp_rates_len; i++) {
+			iwe.u.bitrate.value = ((bss->supp_rates[i] &
+							0x7f) * 500000);
+			p = iwe_stream_add_value(current_ev, p,
+					end_buf, &iwe, IW_EV_PARAM_LEN);
+		}
+		/* Check if we added any rate */
+		if((p - current_ev) > IW_EV_LCP_LEN)
+			current_ev = p;
+
+		kfree(buf);
+		break;
+	} while (0);
+
+	return current_ev;
+}
+
+
+int ieee80211_sta_scan_results(struct net_device *dev, char *buf, size_t len)
+{
+	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+	char *current_ev = buf;
+	char *end_buf = buf + len;
+	struct ieee80211_sta_bss *bss;
+
+	spin_lock_bh(&local->sta_bss_lock);
+	list_for_each_entry(bss, &local->sta_bss_list, list) {
+		if (buf + len - current_ev <= IW_EV_ADDR_LEN) {
+			spin_unlock_bh(&local->sta_bss_lock);
+			return -E2BIG;
+		}
+		current_ev = ieee80211_sta_scan_result(dev, bss, current_ev,
+						       end_buf);
+	}
+	spin_unlock_bh(&local->sta_bss_lock);
+	return current_ev - buf;
+}
+
+
+int ieee80211_sta_set_extra_ie(struct net_device *dev, char *ie, size_t len)
+{
+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+	struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+	kfree(ifsta->extra_ie);
+	if (len == 0) {
+		ifsta->extra_ie = NULL;
+		ifsta->extra_ie_len = 0;
+		return 0;
+	}
+	ifsta->extra_ie = kmalloc(len, GFP_KERNEL);
+	if (!ifsta->extra_ie) {
+		ifsta->extra_ie_len = 0;
+		return -ENOMEM;
+	}
+	memcpy(ifsta->extra_ie, ie, len);
+	ifsta->extra_ie_len = len;
+	return 0;
+}
+
+
+struct sta_info * ieee80211_ibss_add_sta(struct net_device *dev,
+					 struct sk_buff *skb, u8 *bssid,
+					 u8 *addr)
+{
+	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+	struct sta_info *sta;
+	struct ieee80211_sub_if_data *sdata = NULL;
+	struct net_device *sta_dev = NULL;
+
+	/* TODO: Could consider removing the least recently used entry and
+	 * allow new one to be added. */
+	if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) {
+		if (net_ratelimit()) {
+			printk(KERN_DEBUG "%s: No room for a new IBSS STA "
+			       "entry " MAC_FMT "\n", dev->name, MAC_ARG(addr));
+		}
+		return NULL;
+	}
+
+	spin_lock_bh(&local->sub_if_lock);
+	list_for_each_entry(sdata, &local->sub_if_list, list)
+		if (sdata->type == IEEE80211_IF_TYPE_IBSS &&
+		    memcmp(bssid, sdata->u.sta.bssid, ETH_ALEN) == 0) {
+			sta_dev = sdata->dev;
+			break;
+		}
+	spin_unlock_bh(&local->sub_if_lock);
+
+	if (!sta_dev)
+		return NULL;
+
+	printk(KERN_DEBUG "%s: Adding new IBSS station " MAC_FMT " (dev=%s)\n",
+	       dev->name, MAC_ARG(addr), sta_dev->name);
+
+	sta = sta_info_add(local, dev, addr, GFP_ATOMIC);
+	if (!sta)
+		return NULL;
+
+	sta->dev = sta_dev;
+	sta->supp_rates = sdata->u.sta.supp_rates_bits;
+
+	rate_control_rate_init(sta, local);
+
+	return sta; /* caller will call sta_info_put() */
+}
+
+
+int ieee80211_sta_deauthenticate(struct net_device *dev, u16 reason)
+{
+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+	struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+
+	printk(KERN_DEBUG "%s: deauthenticate(reason=%d)\n",
+	       dev->name, reason);
+
+	if (sdata->type != IEEE80211_IF_TYPE_STA &&
+	    sdata->type != IEEE80211_IF_TYPE_IBSS)
+		return -EINVAL;
+
+	ieee80211_send_deauth(dev, ifsta, reason);
+	ieee80211_set_disassoc(dev, ifsta, 1);
+	return 0;
+}
+
+
+int ieee80211_sta_disassociate(struct net_device *dev, u16 reason)
+{
+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+	struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+
+	printk(KERN_DEBUG "%s: disassociate(reason=%d)\n",
+	       dev->name, reason);
+
+	if (sdata->type != IEEE80211_IF_TYPE_STA)
+		return -EINVAL;
+
+	if (!ifsta->associated)
+		return -1;
+
+	ieee80211_send_disassoc(dev, ifsta, reason);
+	ieee80211_set_disassoc(dev, ifsta, 0);
+	return 0;
+}
--- /dev/null	2007-04-16 13:58:59.302022784 -0400
+++ linux-2.6.20.noarch/net/mac80211/ieee80211_cfg.h	2007-04-16 17:00:03.000000000 -0400
@@ -0,0 +1,9 @@
+/*
+ * mac80211 configuration hooks for cfg80211
+ */
+#ifndef __IEEE80211_CFG_H
+#define __IEEE80211_CFG_H
+
+extern struct cfg80211_ops mac80211_config_ops;
+
+#endif /* __IEEE80211_CFG_H */
--- /dev/null	2007-04-16 13:58:59.302022784 -0400
+++ linux-2.6.20.noarch/net/mac80211/debugfs.h	2007-04-16 17:00:03.000000000 -0400
@@ -0,0 +1,16 @@
+#ifndef __MAC80211_DEBUGFS_H
+#define __MAC80211_DEBUGFS_H
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+extern void debugfs_hw_add(struct ieee80211_local *local);
+extern void debugfs_hw_del(struct ieee80211_local *local);
+extern int mac80211_open_file_generic(struct inode *inode, struct file *file);
+#else
+static inline void debugfs_hw_add(struct ieee80211_local *local)
+{
+	return;
+}
+static inline void debugfs_hw_del(struct ieee80211_local *local) {}
+#endif
+
+#endif /* __MAC80211_DEBUGFS_H */
--- linux-2.6.20.noarch/net/ieee80211/Kconfig.orig	2007-04-16 16:59:27.000000000 -0400
+++ linux-2.6.20.noarch/net/ieee80211/Kconfig	2007-04-16 17:00:03.000000000 -0400
@@ -56,7 +56,8 @@ config IEEE80211_CRYPT_CCMP
 
 config IEEE80211_CRYPT_TKIP
 	tristate "IEEE 802.11i TKIP encryption"
-	depends on IEEE80211 && NET_RADIO
+	depends on IEEE80211
+	select WIRELESS_EXT
 	select CRYPTO
 	select CRYPTO_MICHAEL_MIC
 	select CRYPTO_ECB


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2944
retrieving revision 1.2944.2.1
diff -u -r1.2944 -r1.2944.2.1
--- kernel-2.6.spec	10 Apr 2007 21:15:52 -0000	1.2944
+++ kernel-2.6.spec	16 Apr 2007 21:26:35 -0000	1.2944.2.1
@@ -54,7 +54,7 @@
 # that the kernel isn't the stock distribution kernel, for example,
 # by setting the define to ".local" or ".bz123456"
 #
-#% define buildid .local
+%define buildid .jwltest.32
 #
 %define sublevel 20
 %define kversion 2.6.%{sublevel}
@@ -478,7 +478,7 @@
 
 # core networking changes.
 
-# NIC driver fixes
+# Sound driver fixes
 
 # Filesystem stuff.
 # Squashfs
@@ -586,6 +586,14 @@
 Patch5060: linux-2.6-olpc-battery.patch
 
 #
+# mac80211 backport
+#
+Patch6000: jwltest-mac80211-backport.patch
+Patch6001: jwltest-mac80211-backport-2_6_20-fixup.patch
+Patch6002: jwltest-iwlwifi.patch
+Patch6003: jwltest-iwlwifi-fixes.patch
+
+#
 # 10000 to 20000 is for stuff that has to come last due to the
 # amount of drivers they touch. But only these should go here.
 # Not patches you're too lazy for to put in the proper place.
@@ -1199,6 +1207,8 @@
 
 # NIC driver fixes
 
+# sound driver fixes
+
 # Filesystem patches.
 # Squashfs
 %patch1400 -p1
@@ -1366,6 +1376,12 @@
 # final stuff
 #
 
+# mac80211 stuff
+%patch6000 -p1
+%patch6001 -p1
+%patch6002 -p1
+%patch6003 -p1
+
 #
 # misc small stuff to make things compile or otherwise improve performance
 #



From fedora-cvs-commits at redhat.com  Mon Apr 16 21:28:39 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 17:28:39 -0400
Subject: rpms/kernel/devel linux-2.6-warnings-inline.patch,1.4,1.5
Message-ID: <200704162128.l3GLSd8f027889@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-warnings-inline.patch 
Log Message:
warning fix

linux-2.6-warnings-inline.patch:
 b/arch/i386/oprofile/op_model_p4.c                               |    2 -
 b/arch/powerpc/kernel/prom_init.c                                |    4 +-
 b/drivers/acpi/tables/tbfadt.c                                   |    4 +-
 b/drivers/isdn/hardware/eicon/divasmain.c                        |   12 +++----
 b/drivers/isdn/hardware/eicon/platform.h                         |    4 +-
 b/drivers/media/common/ir-functions.c                            |    2 -
 b/drivers/media/video/cx88/cx88-core.c                           |   12 +++----
 b/drivers/media/video/cx88/cx88.h                                |    4 +-
 b/drivers/net/sky2.c                                             |    2 -
 b/drivers/net/wireless/ipw2200.c                                 |    2 -
 b/drivers/scsi/tmscsim.c                                         |   16 +++++-----
 b/drivers/usb/serial/safe_serial.c                               |    2 -
 b/drivers/video/intelfb/intelfbdrv.c                             |    2 -
 b/fs/ocfs2/namei.c                                               |    4 +-
 b/include/asm-powerpc/spinlock.h                                 |   10 +++---
 b/include/linux/cpuset.h                                         |    4 +-
 b/kernel/mutex.c                                                 |    2 -
 b/sound/drivers/opl4/opl4_lib.c                                  |    2 -
 b/sound/pci/au88x0/au88x0.h                                      |    4 +-
 b/sound/pci/au88x0/au88x0_core.c                                 |    4 +-
 linux-2.6.20.noarch/arch/ia64/kernel/mca.c                       |    2 -
 linux-2.6.20.noarch/arch/ia64/sn/pci/pcibr/pcibr_ate.c           |    2 -
 linux-2.6.20.noarch/arch/ia64/sn/pci/tioce_provider.c            |    4 +-
 linux-2.6.20.noarch/arch/s390/kernel/traps.c                     |    4 +-
 linux-2.6.20.noarch/drivers/char/mmtimer.c                       |   16 +++++-----
 linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c |   10 +++---
 linux-2.6.20.noarch/drivers/s390/net/ctcmain.c                   |    2 -
 linux-2.6.20.noarch/drivers/serial/ioc3_serial.c                 |    4 +-
 linux-2.6.20.noarch/drivers/serial/ioc4_serial.c                 |    4 +-
 linux-2.6.20.noarch/include/asm-powerpc/spinlock.h               |    8 ++---
 linux-2.6.20.noarch/net/mac80211/ieee80211.c                     |    6 +--
 31 files changed, 80 insertions(+), 80 deletions(-)

Index: linux-2.6-warnings-inline.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-warnings-inline.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-warnings-inline.patch	13 Apr 2007 20:44:51 -0000	1.4
+++ linux-2.6-warnings-inline.patch	16 Apr 2007 21:28:37 -0000	1.5
@@ -331,6 +331,15 @@
 index 28dd757..f8de8e7 100644
 --- a/fs/ocfs2/namei.c
 +++ b/fs/ocfs2/namei.c
+@@ -69,7 +69,7 @@
+ #define NAMEI_RA_SIZE        (NAMEI_RA_CHUNKS * NAMEI_RA_BLOCKS)
+ #define NAMEI_RA_INDEX(c,b)  (((c) * NAMEI_RA_BLOCKS) + (b))
+ 
+-static int inline ocfs2_search_dirblock(struct buffer_head *bh,
++static inline int ocfs2_search_dirblock(struct buffer_head *bh,
+ 					struct inode *dir,
+ 					const char *name, int namelen,
+ 					unsigned long offset,
 @@ -1926,7 +1926,7 @@ bail:
  /*
   * Returns 0 if not found, -1 on failure, and 1 on success



From fedora-cvs-commits at redhat.com  Mon Apr 16 21:30:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 17:30:45 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.147, 1.148 mkinitrd.spec, 1.197,
	1.198 sources, 1.181, 1.182
Message-ID: <200704162130.l3GLUjX3029342@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29248

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to 6.0.9-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- .cvsignore	27 Feb 2007 18:02:52 -0000	1.147
+++ .cvsignore	16 Apr 2007 21:30:38 -0000	1.148
@@ -1 +1 @@
-mkinitrd-6.0.8.tar.bz2
+mkinitrd-6.0.9.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- mkinitrd.spec	20 Mar 2007 18:32:52 -0000	1.197
+++ mkinitrd.spec	16 Apr 2007 21:30:38 -0000	1.198
@@ -2,8 +2,8 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 6.0.8
-Release: 4
+Version: 6.0.9
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
@@ -111,14 +111,17 @@
 %{_libdir}/libbdevid.so.*
 
 %changelog
-* Tue Mar 20 2007 David Cantrell <dcantrell at redhat.com> - 6.0.8-4
-- Rebuild for GNU parted-1.8.6
+* Mon Apr 16 2007 Peter Jones <pjones at redhat.com> - 6.0.9-1
+- Use scsi_wait_scan.ko with scsi storage modules (#220470)
 
-* Tue Mar 20 2007 David Cantrell <dcantrell at redhat.com> - 6.0.8-3
-- Rebuild for GNU parted-1.8.5
+* Wed Mar 28 2007 Peter Jones <pjones at redhat.com>
+- Fix perms on libbdevid
 
-* Mon Mar 19 2007 David Cantrell <dcantrell at redhat.com> - 6.0.8-2
-- Rebuild for GNU parted-1.8.4
+* Fri Mar 23 2007 Jeremy Katz <katzj at redhat.com>
+- handle new firewire stack (#231708)
+
+* Wed Feb 28 2007 Peter Jones <pjones at redhat.com>
+- Fix linking error on bdevid probe modules
 
 * Tue Feb 27 2007 Peter Jones <pjones at redhat.com> - 6.0.8-1
 - nash and mkinitrd shouldn't both provide libbdevid.so.*


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- sources	27 Feb 2007 18:02:52 -0000	1.181
+++ sources	16 Apr 2007 21:30:38 -0000	1.182
@@ -1 +1 @@
-0025db1b5a341b50d9db8ed35117a3ab  mkinitrd-6.0.8.tar.bz2
+04d91e94fe2812f00d5ceb7a5a564d51  mkinitrd-6.0.9.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 16 21:35:14 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 17:35:14 -0400
Subject: rpms/kernel/devel linux-2.6-warnings-emptymacros.patch, NONE,
	1.1 kernel-2.6.spec, 1.3075, 1.3076
Message-ID: <200704162135.l3GLZEdK032422@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-warnings-emptymacros.patch 
Log Message:
* Mon Apr 16 2007 Dave Jones <davej at redhat.com>
- Fix up some more warnings.


linux-2.6-warnings-emptymacros.patch:
 arch/i386/pci/early.c            |    2 -
 drivers/acpi/glue.c              |    2 -
 drivers/message/fusion/mptbase.h |    2 -
 fs/ext2/xattr.c                  |    4 +--
 include/acpi/acmacros.h          |   40 +++++++++++++++++++--------------------
 kernel/audit.h                   |    4 +--
 6 files changed, 27 insertions(+), 27 deletions(-)

--- NEW FILE linux-2.6-warnings-emptymacros.patch ---
ACPI has a ton of macros which make a bunch of empty if's
when configured in non-debug mode.

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

diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 4334c20..5955cfd 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -16,7 +16,7 @@
 #if ACPI_GLUE_DEBUG
 #define DBG(x...) printk(PREFIX x)
 #else
-#define DBG(x...)
+#define DBG(x...) do { } while(0)
 #endif
 static LIST_HEAD(bus_type_list);
 static DECLARE_RWSEM(bus_type_sem);
diff --git a/include/acpi/acmacros.h b/include/acpi/acmacros.h
index 8948a64..e64a748 100644
--- a/include/acpi/acmacros.h
+++ b/include/acpi/acmacros.h
@@ -599,26 +599,26 @@
 #define ACPI_DEBUG_EXEC(a)
 #define ACPI_NORMAL_EXEC(a)             a;
 
-#define ACPI_DEBUG_DEFINE(a)
-#define ACPI_DEBUG_ONLY_MEMBERS(a)
-#define ACPI_FUNCTION_NAME(a)
-#define ACPI_FUNCTION_TRACE(a)
-#define ACPI_FUNCTION_TRACE_PTR(a,b)
-#define ACPI_FUNCTION_TRACE_U32(a,b)
-#define ACPI_FUNCTION_TRACE_STR(a,b)
-#define ACPI_FUNCTION_EXIT
-#define ACPI_FUNCTION_STATUS_EXIT(s)
-#define ACPI_FUNCTION_VALUE_EXIT(s)
-#define ACPI_FUNCTION_ENTRY()
-#define ACPI_DUMP_STACK_ENTRY(a)
-#define ACPI_DUMP_OPERANDS(a,b,c,d,e)
-#define ACPI_DUMP_ENTRY(a,b)
-#define ACPI_DUMP_TABLES(a,b)
-#define ACPI_DUMP_PATHNAME(a,b,c,d)
-#define ACPI_DUMP_RESOURCE_LIST(a)
-#define ACPI_DUMP_BUFFER(a,b)
-#define ACPI_DEBUG_PRINT(pl)
-#define ACPI_DEBUG_PRINT_RAW(pl)
+#define ACPI_DEBUG_DEFINE(a)		do { } while(0)
+#define ACPI_DEBUG_ONLY_MEMBERS(a)	do { } while(0)
+#define ACPI_FUNCTION_NAME(a)		do { } while(0)
+#define ACPI_FUNCTION_TRACE(a)		do { } while(0)
+#define ACPI_FUNCTION_TRACE_PTR(a,b)	do { } while(0)
+#define ACPI_FUNCTION_TRACE_U32(a,b)	do { } while(0)
+#define ACPI_FUNCTION_TRACE_STR(a,b)	do { } while(0)
+#define ACPI_FUNCTION_EXIT		do { } while(0)
+#define ACPI_FUNCTION_STATUS_EXIT(s)	do { } while(0)
+#define ACPI_FUNCTION_VALUE_EXIT(s)	do { } while(0)
+#define ACPI_FUNCTION_ENTRY()		do { } while(0)
+#define ACPI_DUMP_STACK_ENTRY(a)	do { } while(0)
+#define ACPI_DUMP_OPERANDS(a,b,c,d,e)	do { } while(0)
+#define ACPI_DUMP_ENTRY(a,b)		do { } while(0)
+#define ACPI_DUMP_TABLES(a,b)		do { } while(0)
+#define ACPI_DUMP_PATHNAME(a,b,c,d)	do { } while(0)
+#define ACPI_DUMP_RESOURCE_LIST(a)	do { } while(0)
+#define ACPI_DUMP_BUFFER(a,b)		do { } while(0)
+#define ACPI_DEBUG_PRINT(pl)		do { } while(0)
+#define ACPI_DEBUG_PRINT_RAW(pl)	do { } while(0)
 
 #define return_VOID                     return
 #define return_ACPI_STATUS(s)           return(s)


The xattr debug macros create a ton of empty if statements.
Thankfully, gcc does the right thing, but just to be on
the safe side, we should probably guard them correctly.

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

diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
index 247efd0..88ae7a2 100644
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
@@ -85,8 +85,8 @@
 		printk("\n"); \
 	} while (0)
 #else
-# define ea_idebug(f...)
-# define ea_bdebug(f...)
+# define ea_idebug(f...) do { } while(0)
+# define ea_bdebug(f...) do { } while(0)
 #endif
 
 static int ext2_xattr_set2(struct inode *, struct buffer_head *,


Another debug macro which gets expanded to nothing in the non-debug case.

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

diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index e3a3927..3ea7f6c 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -714,7 +714,7 @@ typedef struct _mpt_sge {
 #ifdef MPT_DEBUG
 #define dprintk(x)  printk x
 #else
-#define dprintk(x)
+#define dprintk(x) do {} while(0)
 #endif
 
 #ifdef MPT_DEBUG_INIT



arch/x86_64/pci/../../i386/pci/early.c: In function ???read_pci_config???:
arch/x86_64/pci/../../i386/pci/early.c:18: warning: empty body in an if-statement

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

diff --git a/arch/i386/pci/early.c b/arch/i386/pci/early.c
index 42df4b6..339b37e 100644
--- a/arch/i386/pci/early.c
+++ b/arch/i386/pci/early.c
@@ -7,7 +7,7 @@
 /* Direct PCI access. This is used for PCI accesses in early boot before
    the PCI subsystem works. */
 
-#define PDprintk(x...)
+#define PDprintk(x...) do { } while(0)
 
 u32 read_pci_config(u8 bus, u8 slot, u8 func, u8 offset)
 {


If CONFIG_AUDIT_SYSCALL is undefined, we end up with
empty if's...  Looks harmless, but a nasty trap all the same
that should be fixed.

kernel/signal.c: In function ???check_kill_permission???:
kernel/signal.c:621: warning: empty body in an if-statement

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

diff --git a/kernel/audit.h b/kernel/audit.h
index a337023..3ce4cf8 100644
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -141,7 +141,7 @@ extern enum audit_state audit_filter_inodes(struct task_struct *,
 					    struct audit_context *);
 extern void audit_set_auditable(struct audit_context *);
 #else
-#define audit_signal_info(s,t)
+#define audit_signal_info(s,t) do { } while(0)
 #define audit_filter_inodes(t,c) AUDIT_DISABLED
-#define audit_set_auditable(c)
+#define audit_set_auditable(c) do { } while(0)
 #endif



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3075
retrieving revision 1.3076
diff -u -r1.3075 -r1.3076
--- kernel-2.6.spec	16 Apr 2007 20:39:43 -0000	1.3075
+++ kernel-2.6.spec	16 Apr 2007 21:35:11 -0000	1.3076
@@ -601,6 +601,7 @@
 
 Patch10000: linux-2.6-compile-fixes.patch
 Patch10001: linux-2.6-warnings-inline.patch
+Patch10002: linux-2.6-warnings-emptymacros.patch
 
 # Xen hypervisor patches (20000+)
 Patch20000: xen-printf-rate-limit.patch
@@ -1329,6 +1330,7 @@
 #
 #%patch10000 -p1
 %patch10001 -p1
+%patch10002 -p1
 
 # END OF PATCH APPLICATIONS
 
@@ -2297,6 +2299,9 @@
 
 %changelog
 * Mon Apr 16 2007 Dave Jones <davej at redhat.com>
+- Fix up some more warnings.
+
+* Mon Apr 16 2007 Dave Jones <davej at redhat.com>
 - Revert e1000 driver to 2.6.20
 
 * Mon Apr 16 2007 David Woodhouse <dwmw2 at redhat.com>



From fedora-cvs-commits at redhat.com  Mon Apr 16 22:01:14 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 18:01:14 -0400
Subject: rpms/mkinitrd/devel sources,1.182,1.183
Message-ID: <200704162201.l3GM1Een030356@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30335

Modified Files:
	sources 
Log Message:
- fix the scsi_wait_scan thing to run later



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- sources	16 Apr 2007 21:30:38 -0000	1.182
+++ sources	16 Apr 2007 22:01:10 -0000	1.183
@@ -1 +1 @@
-04d91e94fe2812f00d5ceb7a5a564d51  mkinitrd-6.0.9.tar.bz2
+d0f36074e17bea66672567e2227f7a3f  mkinitrd-6.0.9.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 16 22:01:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 18:01:45 -0400
Subject: rpms/kernel/devel linux-2.6-warnings-register.patch, NONE,
	1.1 kernel-2.6.spec, 1.3076, 1.3077
Message-ID: <200704162201.l3GM1jwc030426@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-warnings-register.patch 
Log Message:
more warning fixes

linux-2.6-warnings-register.patch:
 hwmon/w83791d.c                |    4 ++--
 isdn/hardware/eicon/platform.h |    2 +-
 net/wireless/airo.c            |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE linux-2.6-warnings-register.patch ---
'register' is a reserved keyword.  Gcc is smart enough to ignore this,
but gets whiney when you turn up the warnings.

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

--- linux-2.6.20.noarch/drivers/isdn/hardware/eicon/platform.h~	2007-04-16 17:55:55.000000000 -0400
+++ linux-2.6.20.noarch/drivers/isdn/hardware/eicon/platform.h	2007-04-16 17:56:08.000000000 -0400
@@ -207,7 +207,7 @@ void PCIread (byte bus, byte func, int o
 /*
 **  I/O Port utilities
 */
-int diva_os_register_io_port (void *adapter, int register, unsigned long port,
+int diva_os_register_io_port (void *adapter, int reg, unsigned long port,
 				unsigned long length, const char* name, int id);
 /*
 **  I/O port access abstraction
--- linux-2.6.20.noarch/drivers/net/wireless/airo.c~	2007-04-16 17:56:48.000000000 -0400
+++ linux-2.6.20.noarch/drivers/net/wireless/airo.c	2007-04-16 17:57:01.000000000 -0400
@@ -1090,8 +1090,8 @@ static const char version[] = "airo.c 0.
 struct airo_info;
 
 static int get_dec_u16( char *buffer, int *start, int limit );
-static void OUT4500( struct airo_info *, u16 register, u16 value );
-static unsigned short IN4500( struct airo_info *, u16 register );
+static void OUT4500( struct airo_info *, u16 reg, u16 value );
+static unsigned short IN4500( struct airo_info *, u16 reg);
 static u16 setup_card(struct airo_info*, u8 *mac, int lock);
 static int enable_MAC( struct airo_info *ai, Resp *rsp, int lock );
 static void disable_MAC(struct airo_info *ai, int lock);
--- linux-2.6.20.noarch/drivers/hwmon/w83791d.c~	2007-04-16 17:57:12.000000000 -0400
+++ linux-2.6.20.noarch/drivers/hwmon/w83791d.c	2007-04-16 17:57:29.000000000 -0400
@@ -289,8 +289,8 @@ static int w83791d_attach_adapter(struct
 static int w83791d_detect(struct i2c_adapter *adapter, int address, int kind);
 static int w83791d_detach_client(struct i2c_client *client);
 
-static int w83791d_read(struct i2c_client *client, u8 register);
-static int w83791d_write(struct i2c_client *client, u8 register, u8 value);
+static int w83791d_read(struct i2c_client *client, u8 reg);
+static int w83791d_write(struct i2c_client *client, u8 reg, u8 value);
 static struct w83791d_data *w83791d_update_device(struct device *dev);
 
 #ifdef DEBUG


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3076
retrieving revision 1.3077
diff -u -r1.3076 -r1.3077
--- kernel-2.6.spec	16 Apr 2007 21:35:11 -0000	1.3076
+++ kernel-2.6.spec	16 Apr 2007 22:01:38 -0000	1.3077
@@ -602,6 +602,7 @@
 Patch10000: linux-2.6-compile-fixes.patch
 Patch10001: linux-2.6-warnings-inline.patch
 Patch10002: linux-2.6-warnings-emptymacros.patch
+Patch10003: linux-2.6-warnings-register.patch
 
 # Xen hypervisor patches (20000+)
 Patch20000: xen-printf-rate-limit.patch
@@ -1331,6 +1332,7 @@
 #%patch10000 -p1
 %patch10001 -p1
 %patch10002 -p1
+%patch10003 -p1
 
 # END OF PATCH APPLICATIONS
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 22:02:27 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 18:02:27 -0400
Subject: rpms/redhat-artwork/devel redhat-artwork-5.0.12-kde.patch, NONE,
	1.1 redhat-artwork.spec, 1.177, 1.178
Message-ID: <200704162202.l3GM2QFw030469@cvs.devel.redhat.com>

Author: davidz

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

Modified Files:
	redhat-artwork.spec 
Added Files:
	redhat-artwork-5.0.12-kde.patch 
Log Message:
* Mon Apr 16 2007 David Zeuthen <davidz at redhat.com> 5.0.12-4
- omit kde style/widgets (for now) (Rex Dieter, #236633)



redhat-artwork-5.0.12-kde.patch:
 art/Makefile.am |    2 +-
 configure.in    |   15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

--- NEW FILE redhat-artwork-5.0.12-kde.patch ---
--- redhat-artwork-5.0.12/art/Makefile.am.kde	2005-04-01 15:53:52.000000000 -0600
+++ redhat-artwork-5.0.12/art/Makefile.am	2007-04-16 12:42:27.000000000 -0500
@@ -1,5 +1,5 @@
 ## icon must be built before gtk, or the gtkrc won't get the stock icons
-SUBDIRS=tools cursor nautilus xmms gdm kdm icon gtk metacity kde qt
+SUBDIRS=tools cursor nautilus xmms gdm icon gtk metacity qt
 
 themedir = $(datadir)/themes/Bluecurve
 theme_DATA = index.theme
--- redhat-artwork-5.0.12/configure.in.kde	2007-03-22 10:56:27.000000000 -0500
+++ redhat-artwork-5.0.12/configure.in	2007-04-16 12:42:08.000000000 -0500
@@ -57,11 +57,11 @@
 AC_SUBST(GDK_PIXBUF2_CFLAGS)
 AC_SUBST(GDK_PIXBUF2_LIBS)
 
-KDE_SET_PREFIX
-KDE_CHECK_FINAL
+dnl #KDE_SET_PREFIX
+dnl #KDE_CHECK_FINAL
 
-dnl KDE_USE_QT
-AC_PATH_KDE
+KDE_USE_QT
+dnl #AC_PATH_KDE
 	
 AC_OUTPUT([
 Makefile
@@ -72,18 +72,11 @@
 art/gdm/FedoraBubbles/Makefile
 art/gdm/FedoraDNA/Makefile
 art/gdm/FedoraFlyingHigh/Makefile
-art/kdm/Makefile
-art/kdm/Bluecurve/Makefile
-art/kdm/FedoraDNA/Makefile
-art/kdm/FedoraFlyingHigh/Makefile
 art/gtk/Makefile
 art/gtk/Bluecurve/Makefile
 art/gtk/Bluecurve/gtk-2.0/Makefile
 art/qt/Makefile
 art/qt/Bluecurve/Makefile
-art/kde/Makefile
-art/kde/kwin/Makefile
-art/kde/kwin/Bluecurve/Makefile
 art/metacity/Makefile
 art/icon/Makefile
 art/icon/Bluecurve/Makefile


Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- redhat-artwork.spec	4 Apr 2007 13:30:31 -0000	1.177
+++ redhat-artwork.spec	16 Apr 2007 22:02:22 -0000	1.178
@@ -1,10 +1,13 @@
+
+# define to include kde widget/styles
+#define kde 1
 %define qtdir qt-3.3
 %define po_package redhat-artwork
 
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
 Version: 5.0.12
-Release: 3%{?dist} 
+Release: 4%{?dist} 
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
@@ -13,21 +16,22 @@
 Source4: coverage-tool-links.xml
 Patch0: redhat-artwork-5.0.5-add-dirs-to-bluecurve-theme-index.patch
 Patch1: redhat-artwork-5.0.11-lowres-mode-fix.patch
+Patch2: redhat-artwork-5.0.12-kde.patch
 Group: User Interface/Desktops
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-root
-Conflicts: qt < 1:3.0.4-11
 Conflicts: gtk-engines < 0.11-13
 Conflicts: gnome-session <= 2.0.1-3
-Conflicts: kdebase <= 6:3.0.3-1
+%{?kde:Conflicts: qt < 1:3.0.4-11}
+%{?kde:Conflicts: kdebase <= 6:3.0.3-1}
 Conflicts: gdm <= 2.6.0.8-5
 Conflicts: redhat-menus < 5.5.5
 # we don't want to require gtk/qt
 Autoreq: 0
 
 BuildRequires: gtk2-devel >= 2.9.0
-#BuildRequires: qt-devel >= 1:3.3.4-10
-BuildRequires: kdebase-devel >= 3.2.0
+BuildRequires: qt-devel >= 1:3.3.4-10
+%{?kde:BuildRequires: kdebase-devel >= 3.2.0}
 BuildRequires: xorg-x11-apps
 BuildRequires: icon-slicer >= 0.3-6
 BuildRequires: netpbm-progs
@@ -49,8 +53,6 @@
 # for gtk-update-icon-cache
 Requires(post): gtk2 >= 2.9.0
 
-# Required for mcopidl in configure, but we don't use that...
-BuildRequires: arts-devel
 
 %description
 redhat-artwork contains the themes and icons that make up the Red Hat default 
@@ -64,9 +66,16 @@
 mkdir post-install
 (cd post-install; tar xzvf %{SOURCE2})
 
+%if "%{?kde}" != "1"
+%patch2 -p1 -b .kde
+%endif
+
 autoreconf
+
+
 %build
 
+%if "%{?kde}" == "1"
 ## this is apparently how Qt finds itself.
 ## they need pkg-config gospel.
 unset QTDIR
@@ -74,6 +83,7 @@
 . /etc/profile.d/qt.sh
 echo "QTDIR is $QTDIR"
 export QTDIR
+%endif
 
 export LANG=en_US.ISO-8859-1 ## workaround for intltool sucking in UTF-8
 %configure
@@ -368,10 +378,13 @@
 popd
 
 # save some space
+%if "%{?kde}" == "1"
 pushd $RPM_BUILD_ROOT%{_datadir}/apps/kdm/themes/FedoraFlyingHigh
   rm -f background.jpg
   ln -s ../../../../gdm/themes/FedoraFlyingHigh/background.jpg .
 popd
+%endif
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -393,17 +406,19 @@
 %{_datadir}/gdm/themes/*
 %{_datadir}/icons
 %ghost %{_datadir}/icons/Bluecurve/icon-theme.cache
-%{_datadir}/apps
 %{_datadir}/pixmaps
 %{_datadir}/xmms
-%{_libdir}/kde3
+%{?kde:%{_libdir}/kde3}
+%{?kde:%{_datadir}/apps/kdm/themes/Bluecurve}
 %{_libdir}/gtk-2.0
 %{_libdir}/%{qtdir}
-%{_datadir}/apps/kdm/themes/Bluecurve
 %dir %{_sysconfdir}/gtk-2.0
 %config %{_sysconfdir}/gtk-2.0/gtkrc
 
 %changelog
+* Mon Apr 16 2007 David Zeuthen <davidz at redhat.com> 5.0.12-4
+- omit kde style/widgets (for now) (Rex Dieter, #236633)
+
 * Wed Apr 04 2007 Than Ngo <than at redhat.com> - 5.0.12-3
 - fix broken symlink
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 22:16:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 18:16:26 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.3077,
	1.3078 linux-2.6-silence-noise.patch, 1.7, 1.8
Message-ID: <200704162216.l3GMGQwJ031112@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-silence-noise.patch 
Log Message:
* Mon Apr 16 2007 Dave Jones <davej at redhat.com>
- Silence some more PM related noisy printk's.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3077
retrieving revision 1.3078
diff -u -r1.3077 -r1.3078
--- kernel-2.6.spec	16 Apr 2007 22:01:38 -0000	1.3077
+++ kernel-2.6.spec	16 Apr 2007 22:16:22 -0000	1.3078
@@ -2301,6 +2301,9 @@
 
 %changelog
 * Mon Apr 16 2007 Dave Jones <davej at redhat.com>
+- Silence some more PM related noisy printk's.
+
+* Mon Apr 16 2007 Dave Jones <davej at redhat.com>
 - Fix up some more warnings.
 
 * Mon Apr 16 2007 Dave Jones <davej at redhat.com>

linux-2.6-silence-noise.patch:
 linux-2.6.18.noarch/arch/x86_64/mm/init.c     |    4 ----
 linux-2.6.18.noarch/drivers/pci/setup-res.c   |    4 ++--
 linux-2.6.19.noarch/arch/i386/pci/i386.c      |    4 ++--
 linux-2.6.20.noarch/drivers/base/power/main.c |    6 ------
 linux-2.6.20.noarch/drivers/pci/pci.c         |    7 +------
 5 files changed, 5 insertions(+), 20 deletions(-)

Index: linux-2.6-silence-noise.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-silence-noise.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-silence-noise.patch	12 Apr 2007 19:34:51 -0000	1.7
+++ linux-2.6-silence-noise.patch	16 Apr 2007 22:16:22 -0000	1.8
@@ -74,3 +74,26 @@
  	down(&dpm_list_sem);
  	dpm_sysfs_remove(dev);
  	put_device(dev->power.pm_parent);
+Remove noisy PM printk.
+This has served its purpose.
+
+Signed-off-by: Dave Jones <davej at redhat.com>
+
+--- linux-2.6.20.noarch/drivers/pci/pci.c~	2007-04-16 18:14:14.000000000 -0400
++++ linux-2.6.20.noarch/drivers/pci/pci.c	2007-04-16 18:14:33.000000000 -0400
+@@ -664,14 +664,9 @@ pci_restore_state(struct pci_dev *dev)
+ 	 */
+ 	for (i = 15; i >= 0; i--) {
+ 		pci_read_config_dword(dev, i * 4, &val);
+-		if (val != dev->saved_config_space[i]) {
+-			printk(KERN_DEBUG "PM: Writing back config space on "
+-				"device %s at offset %x (was %x, writing %x)\n",
+-				pci_name(dev), i,
+-				val, (int)dev->saved_config_space[i]);
++		if (val != dev->saved_config_space[i])
+ 			pci_write_config_dword(dev,i * 4,
+ 				dev->saved_config_space[i]);
+-		}
+ 	}
+ 	pci_restore_pcix_state(dev);
+ 	pci_restore_msi_state(dev);



From fedora-cvs-commits at redhat.com  Mon Apr 16 22:19:20 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 18:19:20 -0400
Subject: rpms/mkinitrd/devel mkinitrd.spec,1.198,1.199 sources,1.183,1.184
Message-ID: <200704162219.l3GMJKx8031179@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31164

Modified Files:
	mkinitrd.spec sources 
Log Message:
- update to fix grubby bug



Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- mkinitrd.spec	16 Apr 2007 21:30:38 -0000	1.198
+++ mkinitrd.spec	16 Apr 2007 22:19:16 -0000	1.199
@@ -113,6 +113,7 @@
 %changelog
 * Mon Apr 16 2007 Peter Jones <pjones at redhat.com> - 6.0.9-1
 - Use scsi_wait_scan.ko with scsi storage modules (#220470)
+- Fix handling of config files with no 'default' line in grubby
 
 * Wed Mar 28 2007 Peter Jones <pjones at redhat.com>
 - Fix perms on libbdevid


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- sources	16 Apr 2007 22:01:10 -0000	1.183
+++ sources	16 Apr 2007 22:19:16 -0000	1.184
@@ -1 +1 @@
-d0f36074e17bea66672567e2227f7a3f  mkinitrd-6.0.9.tar.bz2
+3eafe12296e169bafc64644805c972b7  mkinitrd-6.0.9.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 16 22:22:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 18:22:53 -0400
Subject: rpms/eclipse-cdt/FC-6 .cvsignore, 1.25, 1.26 eclipse-cdt.spec, 1.66,
	1.67 sources, 1.30, 1.31
Message-ID: <200704162222.l3GMMrer031370@cvs.devel.redhat.com>

Author: jjohnstn

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

Modified Files:
	.cvsignore eclipse-cdt.spec sources 
Log Message:

* Mon Apr 16 2007 Jeff Johnston <jjohnstn at redhat.com> 3.1.2-3
- Add missing gif to org.eclipse.cdt.make.ui.
- Resolves: #236558




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/FC-6/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	28 Feb 2007 00:05:33 -0000	1.25
+++ .cvsignore	16 Apr 2007 22:22:49 -0000	1.26
@@ -7,3 +7,4 @@
 eclipse-cdt-fetched-src-3.1.2.tar.bz2
 eclipse-cdt-autotools-0.0.8.tar.gz
 eclipse-cdt-autotools-0.0.8.1.tar.gz
+eclipse-cdt-target_filter.gif.gz


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/FC-6/eclipse-cdt.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- eclipse-cdt.spec	28 Feb 2007 00:05:33 -0000	1.66
+++ eclipse-cdt.spec	16 Apr 2007 22:22:49 -0000	1.67
@@ -18,7 +18,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        Eclipse Public License / CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -55,6 +55,11 @@
 
 Source2: %{name}-cppunit-20061102.tar.gz
 
+# Binary gif file that is currently missing from the CDT.  Since
+# binary patches are not possible, the gif is included as a source file.
+
+Source3: %{name}-target_filter.gif.gz
+
 # Patch to add special "ForAllElements" targets to CDT sdk/customTargets.xml.
 Patch1: %{name}-no-cvs2-patch
 # Patch to remove tests from CDT build.xml.
@@ -136,6 +141,11 @@
 %patch6 -p0
 %patch7 -p0
 %patch11 -p0
+# Following is a patch to the CDT which is missing a b/w version
+# of an icon.  This patch can be removed once fixed upstream.
+pushd results/plugins/org.eclipse.cdt.make.ui/icons/dtool16
+tar -xzf %{SOURCE3}
+popd
 popd
 
 # Autotools stuff
@@ -305,6 +315,10 @@
 %doc %{eclipse_base}/features/org.eclipse.cdt.sdk_*/epl-v10.html
 
 %changelog
+* Mon Apr 16 2007 Jeff Johnston <jjohnstn at redhat.com> 3.1.2-3
+- Add missing gif to org.eclipse.cdt.make.ui.
+- Resolves: #236558
+
 * Tue Feb 27 2007 Jeff Johnston <jjohnstn at redhat.com> 3.1.2-2
 - Resolves: #229891, #230253, #205310, #229893
 - Rebase autotools to 0.0.8.1 source.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/FC-6/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	28 Feb 2007 00:05:33 -0000	1.30
+++ sources	16 Apr 2007 22:22:49 -0000	1.31
@@ -1,3 +1,4 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 00ce7b1810685e56375f8df48cc9ae26  eclipse-cdt-fetched-src-3.1.2.tar.bz2
 622927df0c7bc770dbb43579e3668fa9  eclipse-cdt-autotools-0.0.8.1.tar.gz
+2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz



From fedora-cvs-commits at redhat.com  Mon Apr 16 22:23:54 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 18:23:54 -0400
Subject: rpms/SysVinit/devel SysVinit.spec, 1.58,
	1.59 sysvinit-2.86-chroot.patch, 1.1, 1.2
Message-ID: <200704162223.l3GMNrdh031467@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/SysVinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31446

Modified Files:
	SysVinit.spec sysvinit-2.86-chroot.patch 
Log Message:
pidof: ignore -c when called as non-root (#230829)



Index: SysVinit.spec
===================================================================
RCS file: /cvs/dist/rpms/SysVinit/devel/SysVinit.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- SysVinit.spec	13 Feb 2007 21:08:56 -0000	1.58
+++ SysVinit.spec	16 Apr 2007 22:23:48 -0000	1.59
@@ -1,7 +1,7 @@
 Summary: Programs which control basic system processes
 Name: SysVinit
 Version: 2.86
-Release: 15
+Release: 16
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-%{version}.tar.gz
@@ -139,6 +139,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Apr 16 2007 Bill Nottingham <notting at redhat.com> - 2.86-16
+- pidof: ignore '-c' when called as non-root (#230829)
+
 * Tue Feb 13 2007 Bill Nottingham <notting at redhat.com> - 2.86-15
 - spec cleanups; remove initunlvl part of %%post, as that hasn't
   been supported for nearly 4 years

sysvinit-2.86-chroot.patch:
 man/pidof.8    |    5 +++++
 src/killall5.c |   28 +++++++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

Index: sysvinit-2.86-chroot.patch
===================================================================
RCS file: /cvs/dist/rpms/SysVinit/devel/sysvinit-2.86-chroot.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sysvinit-2.86-chroot.patch	19 Dec 2005 21:12:52 -0000	1.1
+++ sysvinit-2.86-chroot.patch	16 Apr 2007 22:23:48 -0000	1.2
@@ -14,8 +14,8 @@
  Single shot - this instructs the program to only return one \fIpid\fP.
 +.IP -c
 +Only return process ids that are running with the same root directory.
-+This option does not make sense for non-root users, as they will be
-+unable to check the current root directory of processes they do not own.
++This option is ignored for non-root users, as they will be unable to check
++the current root directory of processes they do not own.
  .IP -x
  Scripts too - this causes the program to also return process id's of
  shells running the named scripts.
@@ -40,7 +40,7 @@
  			closelog();
  			exit(1);
 +		case 'c':
-+			chroot_check = 1;
++			if (geteuid() == 0) chroot_check = 1;
 +			break;
  		case 'o':
  			if (oind >= PIDOF_OMITSZ -1) {



From fedora-cvs-commits at redhat.com  Mon Apr 16 22:27:55 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 18:27:55 -0400
Subject: rpms/kernel/devel linux-2.6-libata-hpa.patch, NONE,
	1.1 kernel-2.6.spec, 1.3078, 1.3079
Message-ID: <200704162227.l3GMRt9h031591@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-libata-hpa.patch 
Log Message:
* Mon Apr 16 2007 Dave Jones <davej at redhat.com>
- libata HPA support.


linux-2.6-libata-hpa.patch:
 drivers/ata/libata-core.c |  209 ++++++++++++++++++++++++++++++++++++++++++++++
 include/linux/ata.h       |    2 
 include/linux/libata.h    |    1 
 3 files changed, 212 insertions(+)

--- NEW FILE linux-2.6-libata-hpa.patch ---

Signed-off-by: Alan Cox <alan at redhat.com>

Add support for ignoring the BIOS HPA result (off by default) and setting
the disk to the full available size unless already frozen.

Tested with various platforms/disks and confirmed to work with the
Macintosh (which broke earlier) and ata_piix (breakage due to the LBA48
readback that Tejun fixed).

For normal users this brings us, I believe, to feature parity with old IDE
(and of course more featured in some areas too).

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 735f0b0..e4fc33e 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -89,6 +89,10 @@ int libata_fua = 0;
 module_param_named(fua, libata_fua, int, 0444);
 MODULE_PARM_DESC(fua, "FUA support (0=off, 1=on)");
 
+static int ata_ignore_hpa = 0;
+module_param_named(ignore_hpa, ata_ignore_hpa, int, 0644);
+MODULE_PARM_DESC(ignore_hpa, "Ignore HPA (0=keep BIOS setting 1=ignore it)");
+
 static int ata_probe_timeout = ATA_TMOUT_INTERNAL / HZ;
 module_param(ata_probe_timeout, int, 0444);
 MODULE_PARM_DESC(ata_probe_timeout, "Set ATA probing timeout (seconds)");
@@ -808,6 +812,202 @@ void ata_id_c_string(const u16 *id, unsi
 	*p = '\0';
 }
 
+static u64 ata_tf_to_lba48(struct ata_taskfile *tf)
+{
+	u64 sectors = 0;
+
+	sectors |= ((u64)(tf->hob_lbah & 0xff)) << 40;
+	sectors |= ((u64)(tf->hob_lbam & 0xff)) << 32;
+	sectors |= (tf->hob_lbal & 0xff) << 24;
+	sectors |= (tf->lbah & 0xff) << 16;
+	sectors |= (tf->lbam & 0xff) << 8;
+	sectors |= (tf->lbal & 0xff);
+
+	return ++sectors;
+}
+
+static u64 ata_tf_to_lba(struct ata_taskfile *tf)
+{
+	u64 sectors = 0;
+
+	sectors |= (tf->device & 0x0f) << 24;
+	sectors |= (tf->lbah & 0xff) << 16;
+	sectors |= (tf->lbam & 0xff) << 8;
+	sectors |= (tf->lbal & 0xff);
+
+	return ++sectors;
+}
+
+/**
+ *	ata_read_native_max_address_ext	-	LBA48 native max query
+ *	@dev: Device to query
+ *
+ *	Perform an LBA48 size query upon the device in question. Return the
+ *	actual LBA48 size or zero if the command fails.
+ */
+
+static u64 ata_read_native_max_address_ext(struct ata_device *dev)
+{
+	unsigned int err;
+	struct ata_taskfile tf;
+
+	ata_tf_init(dev, &tf);
+
+	tf.command = ATA_CMD_READ_NATIVE_MAX_EXT;
+	tf.flags |= ATA_TFLAG_DEVICE | ATA_TFLAG_LBA48 | ATA_TFLAG_ISADDR;
+	tf.protocol |= ATA_PROT_NODATA;
+	tf.device |= 0x40;
+
+	err = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0);
+	if (err)
+		return 0;
+
+	return ata_tf_to_lba48(&tf);
+}
+
+/**
+ *	ata_read_native_max_address	-	LBA28 native max query
+ *	@dev: Device to query
+ *
+ *	Performa an LBA28 size query upon the device in question. Return the
+ *	actual LBA28 size or zero if the command fails.
+ */
+
+static u64 ata_read_native_max_address(struct ata_device *dev)
+{
+	unsigned int err;
+	struct ata_taskfile tf;
+
+	ata_tf_init(dev, &tf);
+
+	tf.command = ATA_CMD_READ_NATIVE_MAX;
+	tf.flags |= ATA_TFLAG_DEVICE | ATA_TFLAG_ISADDR;
+	tf.protocol |= ATA_PROT_NODATA;
+	tf.device |= 0x40;
+
+	err = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0);
+	if (err)
+		return 0;
+
+	return ata_tf_to_lba(&tf);
+}
+
+/**
+ *	ata_set_native_max_address_ext	-	LBA48 native max set
+ *	@dev: Device to query
+ *
+ *	Perform an LBA48 size set max upon the device in question. Return the
+ *	actual LBA48 size or zero if the command fails.
+ */
+
+static u64 ata_set_native_max_address_ext(struct ata_device *dev, u64 new_sectors)
+{
+	unsigned int err;
+	struct ata_taskfile tf;
+
+	new_sectors--;
+
+	ata_tf_init(dev, &tf);
+
+	tf.command = ATA_CMD_SET_MAX_EXT;
+	tf.flags |= ATA_TFLAG_DEVICE | ATA_TFLAG_LBA48 | ATA_TFLAG_ISADDR;
+	tf.protocol |= ATA_PROT_NODATA;
+	tf.device |= 0x40;
+
+	tf.lbal = (new_sectors >> 0) & 0xff;
+	tf.lbam = (new_sectors >> 8) & 0xff;
+	tf.lbah = (new_sectors >> 16) & 0xff;
+
+	tf.hob_lbal = (new_sectors >> 24) & 0xff;
+	tf.hob_lbam = (new_sectors >> 32) & 0xff;
+	tf.hob_lbah = (new_sectors >> 40) & 0xff;
+
+	err = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0);
+	if (err)
+		return 0;
+
+	return ata_tf_to_lba48(&tf);
+}
+
+/**
+ *	ata_set_native_max_address	-	LBA28 native max set
+ *	@dev: Device to query
+ *
+ *	Perform an LBA28 size set max upon the device in question. Return the
+ *	actual LBA28 size or zero if the command fails.
+ */
+
+static u64 ata_set_native_max_address(struct ata_device *dev, u64 new_sectors)
+{
+	unsigned int err;
+	struct ata_taskfile tf;
+
+	new_sectors--;
+
+	ata_tf_init(dev, &tf);
+
+	tf.command = ATA_CMD_SET_MAX;
+	tf.flags |= ATA_TFLAG_DEVICE | ATA_TFLAG_ISADDR;
+	tf.protocol |= ATA_PROT_NODATA;
+
+	tf.lbal = (new_sectors >> 0) & 0xff;
+	tf.lbam = (new_sectors >> 8) & 0xff;
+	tf.lbah = (new_sectors >> 16) & 0xff;
+	tf.device |= ((new_sectors >> 24) & 0x0f) | 0x40;
+
+	err = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0);
+	if (err)
+		return 0;
+
+	return ata_tf_to_lba(&tf);
+}
+
+/**
+ *	ata_hpa_resize		-	Resize a device with an HPA set
+ *	@dev: Device to resize
+ *
+ *	Read the size of an LBA28 or LBA48 disk with HPA features and resize
+ *	it if required to the full size of the media. The caller must check
+ *	the drive has the HPA feature set enabled.
+ */
+
+static u64 ata_hpa_resize(struct ata_device *dev)
+{
+	u64 sectors = dev->n_sectors;
+	u64 hpa_sectors;
+	
+	if (ata_id_has_lba48(dev->id))
+		hpa_sectors = ata_read_native_max_address_ext(dev);
+	else
+		hpa_sectors = ata_read_native_max_address(dev);
+
+	/* if no hpa, both should be equal */
+	ata_dev_printk(dev, KERN_INFO, "%s 1: sectors = %lld, hpa_sectors = %lld\n",
+		__FUNCTION__, sectors, hpa_sectors);
+
+	if (hpa_sectors > sectors) {
+		ata_dev_printk(dev, KERN_INFO,
+			"Host Protected Area detected:\n"
+			"\tcurrent size: %lld sectors\n"
+			"\tnative size: %lld sectors\n",
+			sectors, hpa_sectors);
+
+		if (ata_ignore_hpa) {
+			if (ata_id_has_lba48(dev->id))
+				hpa_sectors = ata_set_native_max_address_ext(dev, hpa_sectors);
+			else
+				hpa_sectors = ata_set_native_max_address(dev, hpa_sectors);
+
+			if (hpa_sectors) {
+				ata_dev_printk(dev, KERN_INFO,
+					"native size increased to %lld sectors\n", hpa_sectors);
+				return hpa_sectors;
+			}
+		}
+	}
+	return sectors;
+}
+
 static u64 ata_id_n_sectors(const u16 *id)
 {
 	if (ata_id_has_lba(id)) {
@@ -1658,6 +1858,7 @@ int ata_dev_configure(struct ata_device 
 			snprintf(revbuf, 7, "ATA-%d",  ata_id_major_version(id));
 
 		dev->n_sectors = ata_id_n_sectors(id);
+		dev->n_sectors_boot = dev->n_sectors;
 
 		/* SCSI only uses 4-char revisions, dump full 8 chars from ATA */
 		ata_id_c_string(dev->id, fwrevbuf, ATA_ID_FW_REV,
@@ -1684,6 +1885,9 @@ int ata_dev_configure(struct ata_device 
 					dev->flags |= ATA_DFLAG_FLUSH_EXT;
 			}
 
+			if (ata_id_hpa_enabled(dev->id))
+				dev->n_sectors = ata_hpa_resize(dev);
+
 			/* config NCQ */
 			ata_dev_config_ncq(dev, ncq_desc, sizeof(ncq_desc));
 
@@ -3341,6 +3545,11 @@ static int ata_dev_same_device(struct at
 			       "%llu != %llu\n",
 			       (unsigned long long)dev->n_sectors,
 			       (unsigned long long)new_n_sectors);
+		/* Are we the boot time size - if so we appear to be the
+		   same disk at this point and our HPA got reapplied */
+		if (ata_ignore_hpa && dev->n_sectors_boot == new_n_sectors 
+		    && ata_id_hpa_enabled(new_id))
+			return 1;
 		return 0;
 	}
 
diff --git a/include/linux/ata.h b/include/linux/ata.h
index ffb6cdc..f4dc8df 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -159,6 +159,8 @@ enum {
 	ATA_CMD_INIT_DEV_PARAMS	= 0x91,
 	ATA_CMD_READ_NATIVE_MAX	= 0xF8,
 	ATA_CMD_READ_NATIVE_MAX_EXT = 0x27,
+	ATA_CMD_SET_MAX		= 0xF9,
+	ATA_CMD_SET_MAX_EXT	= 0x37,
 	ATA_CMD_READ_LOG_EXT	= 0x2f,
 
 	/* READ_LOG_EXT pages */
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 12237d4..b29850b 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -473,6 +473,7 @@ struct ata_device {
 	struct scsi_device	*sdev;		/* attached SCSI device */
 	/* n_sector is used as CLEAR_OFFSET, read comment above CLEAR_OFFSET */
 	u64			n_sectors;	/* size of device, if ATA */
+	u64			n_sectors_boot;	/* size of ATA device at startup */
 	unsigned int		class;		/* ATA_DEV_xxx */
 	u16			id[ATA_ID_WORDS]; /* IDENTIFY xxx DEVICE data */
 	u8			pio_mode;



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3078
retrieving revision 1.3079
diff -u -r1.3078 -r1.3079
--- kernel-2.6.spec	16 Apr 2007 22:16:22 -0000	1.3078
+++ kernel-2.6.spec	16 Apr 2007 22:27:52 -0000	1.3079
@@ -585,6 +585,7 @@
 
 # SATA Bits
 Patch2200: linux-2.6-sata-promise-pata-ports.patch
+Patch2201: linux-2.6-libata-hpa.patch
 Patch2204: linux-2.6-ata-quirk.patch
 
 # ACPI bits
@@ -1307,6 +1308,8 @@
 
 # Enable PATA ports on Promise SATA.
 #%patch2200 -p1
+# HPA support for libata.
+%patch2201 -p1
 # libata: don't initialize sg in ata_exec_internal() if DMA_NONE
 # ia64 ata quirk
 %patch2204 -p1
@@ -2301,6 +2304,9 @@
 
 %changelog
 * Mon Apr 16 2007 Dave Jones <davej at redhat.com>
+- libata HPA support.
+
+* Mon Apr 16 2007 Dave Jones <davej at redhat.com>
 - Silence some more PM related noisy printk's.
 
 * Mon Apr 16 2007 Dave Jones <davej at redhat.com>



From fedora-cvs-commits at redhat.com  Mon Apr 16 22:34:19 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 18:34:19 -0400
Subject: rpms/chkconfig/devel .cvsignore, 1.35, 1.36 chkconfig.spec, 1.44,
	1.45 sources, 1.36, 1.37
Message-ID: <200704162234.l3GMYJNP014357@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/chkconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14147

Modified Files:
	.cvsignore chkconfig.spec sources 
Log Message:
1.3.34-1

Resolves: bug #197399



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/chkconfig/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	13 Feb 2007 21:15:18 -0000	1.35
+++ .cvsignore	16 Apr 2007 22:34:16 -0000	1.36
@@ -1 +1 @@
-chkconfig-1.3.33.tar.gz
+chkconfig-1.3.34.tar.gz


Index: chkconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/chkconfig/devel/chkconfig.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- chkconfig.spec	13 Feb 2007 21:15:18 -0000	1.44
+++ chkconfig.spec	16 Apr 2007 22:34:16 -0000	1.45
@@ -1,6 +1,6 @@
 Summary: A system tool for maintaining the /etc/rc*.d hierarchy
 Name: chkconfig
-Version: 1.3.33
+Version: 1.3.34
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -72,6 +72,11 @@
 %{_mandir}/*/ntsysv.8*
 
 %changelog
+* Mon Apr 16 2007 Bill Nottingham <notting at redhat.com> 1.3.34-1
+- translation updates: as, bg, bn_IN, bs, ca, de, fr, hi, hu, id, ja,
+  ka, ml, ms, nb, or, sk, sl
+- add resetpriorities to the man page (#197399)
+  
 * Tue Feb  6 2007 Bill Nottingham <notting at redhat.com> 1.3.33-1
 - various changes from review - support alternate %%{_sbindir}, fix
   summaries, add version to requires, assorted other bits


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/chkconfig/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	13 Feb 2007 21:15:18 -0000	1.36
+++ sources	16 Apr 2007 22:34:16 -0000	1.37
@@ -1 +1 @@
-4cf0b1ec8facfabb543290d32ebb6bb5  chkconfig-1.3.33.tar.gz
+2b36b0693df40512b0b3fdec6eed01c3  chkconfig-1.3.34.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr 16 22:37:13 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 18:37:13 -0400
Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.31,1.32
Message-ID: <200704162237.l3GMbDbh016420@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/nautilus-sendto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16350

Modified Files:
	nautilus-sendto.spec 
Log Message:
disable gaim dep temporarily during transition to pidgin



Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- nautilus-sendto.spec	11 Mar 2007 22:58:05 -0000	1.31
+++ nautilus-sendto.spec	16 Apr 2007 22:37:11 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           nautilus-sendto
 Version:        0.10
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:        Nautilus context menu for sending files
 
 Group:          User Interface/Desktops
@@ -14,7 +14,8 @@
 BuildRequires:  evolution-data-server-devel >= 1.9.1
 BuildRequires:  libgnomeui-devel
 BuildRequires:	nautilus-devel >= 2.5.4
-BuildRequires:  gaim-devel >= 1.0
+# Disabling gaim temporarily during transition to pidgin
+#BuildRequires:  gaim-devel >= 1.0
 BuildRequires:  gettext
 BuildRequires:  perl-XML-Parser
 BuildRequires:  dbus-glib-devel >= 0.70
@@ -94,6 +95,9 @@
 %{_datadir}/man/man1/nautilus-sendto.1.gz
 
 %changelog
+* Mon Apr 16 2007 Warren Togami <wtogami at redhat.com> - 0.10-2
+- disable gaim dep temporarily during transition to pidgin
+
 * Sun Mar 11 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10-1
 - Update to 0.10, as 0.9 didn't compile
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 22:48:13 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 18:48:13 -0400
Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.32,1.33
Message-ID: <200704162248.l3GMmDr1024502@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/nautilus-sendto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24209

Modified Files:
	nautilus-sendto.spec 
Log Message:
gaim is no longer built on s390 and s390x
(it never did work there)



Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- nautilus-sendto.spec	16 Apr 2007 22:37:11 -0000	1.32
+++ nautilus-sendto.spec	16 Apr 2007 22:48:11 -0000	1.33
@@ -90,7 +90,9 @@
 %{_libdir}/nautilus-sendto/plugins/*.so
 %{_datadir}/nautilus-sendto
 %{_bindir}/nautilus-sendto
+%ifnarch s390 s390x
 %{_libdir}/gaim/nautilus.so
+%endif
 %{_sysconfdir}/gconf/schemas/nst.schemas
 %{_datadir}/man/man1/nautilus-sendto.1.gz
 



From fedora-cvs-commits at redhat.com  Mon Apr 16 22:53:06 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 18:53:06 -0400
Subject: rpms/control-center/devel control-center.spec,1.242,1.243
Message-ID: <200704162253.l3GMr6CR027958@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27692

Modified Files:
	control-center.spec 
Log Message:
- Remove trailing space after escaped newline in schema post
  install.  Reported by Yanko Kaneti.



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- control-center.spec	13 Apr 2007 20:48:24 -0000	1.242
+++ control-center.spec	16 Apr 2007 22:53:04 -0000	1.243
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.18.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -256,7 +256,7 @@
      %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas \
      %{_sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas \
      %{_sysconfdir}/gconf/schemas/fontilus.schemas \
-     %{_sysconfdir}/gconf/schemas/themus.schemas \ 
+     %{_sysconfdir}/gconf/schemas/themus.schemas \
      > /dev/null || :
     gconftool-2 --makefile-uninstall-rule \
      %{_sysconfdir}/gconf/schemas/control-center.schemas \
@@ -328,6 +328,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Apr 16 2007 Ray Strode <rstrode at redhat.com> - 2.18.0-10
+- Remove trailing space after escaped newline in schema post
+  install.  Reported by Yanko Kaneti.
+
 * Fri Apr 13 2007 Ray Strode <rstrode at redhat.com> - 2.18.0-9
 - Load settings-daemon parts more asynchronously (to help with
   bug 236296)



From fedora-cvs-commits at redhat.com  Mon Apr 16 22:59:00 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 18:59:00 -0400
Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.33,1.34
Message-ID: <200704162259.l3GMx0vh032355@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/nautilus-sendto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32148

Modified Files:
	nautilus-sendto.spec 
Log Message:
exclude gaim plugin so the build succeeds



Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- nautilus-sendto.spec	16 Apr 2007 22:48:11 -0000	1.33
+++ nautilus-sendto.spec	16 Apr 2007 22:58:58 -0000	1.34
@@ -90,9 +90,10 @@
 %{_libdir}/nautilus-sendto/plugins/*.so
 %{_datadir}/nautilus-sendto
 %{_bindir}/nautilus-sendto
-%ifnarch s390 s390x
-%{_libdir}/gaim/nautilus.so
-%endif
+# Disabling gaim temporarily during transition to pidgin
+#%ifnarch s390 s390x
+#%{_libdir}/gaim/nautilus.so
+#%endif
 %{_sysconfdir}/gconf/schemas/nst.schemas
 %{_datadir}/man/man1/nautilus-sendto.1.gz
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 00:12:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 20:12:47 -0400
Subject: rpms/glibc/devel .cvsignore, 1.201, 1.202 glibc-fedora.patch, 1.221,
	1.222 glibc.spec, 1.300, 1.301 sources, 1.225,
	1.226 glibc-bz3306.patch, 1.1, NONE glibc-bz3427.patch, 1.1,
	NONE glibc-fnmatch-speedup.patch, 1.1,
	NONE glibc-libio-__THROW.patch, 1.1, NONE
Message-ID: <200704170012.l3H0ClCf023397@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Removed Files:
	glibc-bz3306.patch glibc-bz3427.patch 
	glibc-fnmatch-speedup.patch glibc-libio-__THROW.patch 
Log Message:
auto-import glibc-2.5.90-21 on branch devel from glibc-2.5.90-21.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- .cvsignore	31 Mar 2007 17:37:19 -0000	1.201
+++ .cvsignore	17 Apr 2007 00:12:44 -0000	1.202
@@ -1,2 +1,2 @@
-glibc-20070331T1609.tar.bz2
-glibc-fedora-20070331T1609.tar.bz2
+glibc-20070416T2350.tar.bz2
+glibc-fedora-20070416T2350.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   13 
 ChangeLog.15                                   |   37 ++
 ChangeLog.16                                   |  101 +++++++
 csu/Makefile                                   |    3 
 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 ++
 locale/programs/locarchive.c                   |   10 
 localedata/Makefile                            |    1 
 localedata/SUPPORTED                           |    6 
 localedata/locales/cy_GB                       |    7 
 localedata/locales/en_GB                       |    4 
 localedata/locales/no_NO                       |   69 ++++
 localedata/locales/zh_TW                       |    6 
 malloc/mcheck.c                                |   30 +-
 malloc/mtrace.c                                |   20 +
 manual/libc.texinfo                            |    2 
 nis/nss                                        |    2 
 nptl/ChangeLog                                 |   19 +
 nptl/Makefile                                  |   11 
 nptl/sysdeps/unix/sysv/linux/kernel-features.h |    6 
 nptl/tst-stackguard1.c                         |    8 
 nscd/connections.c                             |   18 +
 nscd/nscd.c                                    |    4 
 nscd/nscd.conf                                 |    4 
 nscd/nscd.init                                 |   19 -
 posix/Makefile                                 |   18 -
 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/powerpc/powerpc64/Makefile             |    1 
 sysdeps/unix/nice.c                            |    7 
 sysdeps/unix/sysv/linux/check_pf.c             |    5 
 sysdeps/unix/sysv/linux/dl-osinfo.h            |   29 ++
 sysdeps/unix/sysv/linux/futimesat.c            |   23 -
 sysdeps/unix/sysv/linux/i386/clone.S           |    4 
 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/netlinkaccess.h        |   18 +
 sysdeps/unix/sysv/linux/paths.h                |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c            |   32 ++
 sysdeps/unix/sysv/linux/x86_64/clone.S         |    4 
 58 files changed, 818 insertions(+), 486 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- glibc-fedora.patch	31 Mar 2007 18:38:35 -0000	1.221
+++ glibc-fedora.patch	17 Apr 2007 00:12:44 -0000	1.222
@@ -1,6 +1,14 @@
---- glibc-20070331T1609/ChangeLog	26 Mar 2007 20:41:09 -0000	1.10570
-+++ glibc-20070331T1609-fedora/ChangeLog	31 Mar 2007 17:23:53 -0000	1.8782.2.237
-@@ -1054,6 +1054,15 @@
+--- glibc-20070416T2350/ChangeLog	16 Apr 2007 23:44:21 -0000	1.10587
++++ glibc-20070416T2350-fedora/ChangeLog	16 Apr 2007 23:59:01 -0000	1.8782.2.239
+@@ -1,3 +1,7 @@
++2007-04-16  Jakub Jelinek  <jakub at redhat.com>
++
++	* locale/programs/locarchive.c (add_alias, insert_name): Remove static.
++
+ 2007-04-16  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	[BZ #4364]
+@@ -1255,6 +1259,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -16,8 +24,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-20070331T1609/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20070331T1609-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
+--- glibc-20070416T2350/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20070416T2350-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -83,8 +91,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20070331T1609/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20070331T1609-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20070416T2350/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20070416T2350-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.
@@ -256,8 +264,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20070331T1609/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
-+++ glibc-20070331T1609-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
+--- glibc-20070416T2350/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
++++ glibc-20070416T2350-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -268,8 +276,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-20070331T1609/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20070331T1609-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20070416T2350/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20070416T2350-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;
@@ -294,8 +302,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20070331T1609/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
-+++ glibc-20070331T1609-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
+--- glibc-20070416T2350/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
++++ glibc-20070416T2350-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.  */
@@ -324,8 +332,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20070331T1609/elf/ldconfig.c	3 Jan 2007 05:44:11 -0000	1.58
-+++ glibc-20070331T1609-fedora/elf/ldconfig.c	17 Jan 2007 10:42:36 -0000	1.47.2.13
+--- glibc-20070416T2350/elf/ldconfig.c	13 Apr 2007 19:53:20 -0000	1.59
++++ glibc-20070416T2350-fedora/elf/ldconfig.c	16 Apr 2007 23:59:03 -0000	1.47.2.14
 @@ -965,17 +965,19 @@ search_dirs (void)
  
  
@@ -407,8 +415,8 @@
      }
  
    search_dirs ();
---- glibc-20070331T1609/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20070331T1609-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20070416T2350/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20070416T2350-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;
@@ -433,8 +441,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20070331T1609/iconv/iconvconfig.c	3 Jan 2007 05:44:11 -0000	1.27
-+++ glibc-20070331T1609-fedora/iconv/iconvconfig.c	17 Jan 2007 10:42:36 -0000	1.19.2.8
+--- glibc-20070416T2350/iconv/iconvconfig.c	3 Jan 2007 05:44:11 -0000	1.27
++++ glibc-20070416T2350-fedora/iconv/iconvconfig.c	17 Jan 2007 10:42:36 -0000	1.19.2.8
 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed)
                                module name offset
                           (following last entry with step count 0)
@@ -511,8 +519,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20070331T1609/include/features.h	10 Dec 2006 01:54:13 -0000	1.45
-+++ glibc-20070331T1609-fedora/include/features.h	10 Dec 2006 10:38:54 -0000	1.35.2.14
+--- glibc-20070416T2350/include/features.h	10 Dec 2006 01:54:13 -0000	1.45
++++ glibc-20070416T2350-fedora/include/features.h	10 Dec 2006 10:38:54 -0000	1.35.2.14
 @@ -275,7 +275,13 @@
  #endif
  
@@ -528,16 +536,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20070331T1609/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070331T1609-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20070416T2350/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070416T2350-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-20070331T1609/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070331T1609-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20070416T2350/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070416T2350-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-20070331T1609/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20070331T1609-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20070416T2350/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20070416T2350-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
@@ -547,8 +555,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20070331T1609/libio/stdio.h	17 Feb 2007 18:26:15 -0000	1.89
-+++ glibc-20070331T1609-fedora/libio/stdio.h	21 Feb 2007 11:15:50 -0000	1.78.2.11
+--- glibc-20070416T2350/libio/stdio.h	17 Feb 2007 18:26:15 -0000	1.89
++++ glibc-20070416T2350-fedora/libio/stdio.h	21 Feb 2007 11:15:50 -0000	1.78.2.11
 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -562,8 +570,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20070331T1609/libio/bits/stdio2.h	17 Mar 2007 17:04:08 -0000	1.5
-+++ glibc-20070331T1609-fedora/libio/bits/stdio2.h	17 Mar 2007 21:52:49 -0000	1.1.2.7
+--- glibc-20070416T2350/libio/bits/stdio2.h	17 Mar 2007 17:04:08 -0000	1.5
++++ glibc-20070416T2350-fedora/libio/bits/stdio2.h	17 Mar 2007 21:52:49 -0000	1.1.2.7
 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr
  extern int __vprintf_chk (int __flag, __const char *__restrict __format,
  			  _G_va_list __ap);
@@ -594,8 +602,8 @@
  
  #endif
  
---- glibc-20070331T1609/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
-+++ glibc-20070331T1609-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
+--- glibc-20070416T2350/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
++++ glibc-20070416T2350-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -687,8 +695,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20070331T1609/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20070331T1609-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20070416T2350/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20070416T2350-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,
  	}
      }
@@ -732,8 +740,41 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20070331T1609/localedata/Makefile	14 Mar 2007 22:32:43 -0000	1.105
-+++ glibc-20070331T1609-fedora/localedata/Makefile	17 Mar 2007 21:52:52 -0000	1.101.2.5
+--- glibc-20070416T2350/locale/programs/locarchive.c	16 Apr 2007 23:30:58 -0000	1.24
++++ glibc-20070416T2350-fedora/locale/programs/locarchive.c	16 Apr 2007 23:59:03 -0000	1.21.2.3
+@@ -221,9 +221,9 @@ oldlocrecentcmp (const void *a, const vo
+ /* forward decls for below */
+ static uint32_t add_locale (struct locarhandle *ah, const char *name,
+ 			    locale_data_t data, bool replace);
+-static void add_alias (struct locarhandle *ah, const char *alias,
+-		       bool replace, const char *oldname,
+-		       uint32_t *locrec_offset_p);
++void add_alias (struct locarhandle *ah, const char *alias,
++		bool replace, const char *oldname,
++		uint32_t *locrec_offset_p);
+ 
+ static void
+ enlarge_archive (struct locarhandle *ah, const struct locarhead *head)
+@@ -541,7 +541,7 @@ close_archive (struct locarhandle *ah)
+ #include "../../intl/explodename.c"
+ #include "../../intl/l10nflist.c"
+ 
+-static struct namehashent *
++struct namehashent *
+ insert_name (struct locarhandle *ah,
+ 	     const char *name, size_t name_len, bool replace)
+ {
+@@ -599,7 +599,7 @@ insert_name (struct locarhandle *ah,
+   return &namehashtab[idx];
+ }
+ 
+-static void
++void
+ add_alias (struct locarhandle *ah, const char *alias, bool replace,
+ 	   const char *oldname, uint32_t *locrec_offset_p)
+ {
+--- glibc-20070416T2350/localedata/Makefile	14 Mar 2007 22:32:43 -0000	1.105
++++ glibc-20070416T2350-fedora/localedata/Makefile	17 Mar 2007 21:52:52 -0000	1.101.2.5
 @@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -742,8 +783,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20070331T1609/localedata/SUPPORTED	18 Feb 2007 04:52:09 -0000	1.102
-+++ glibc-20070331T1609-fedora/localedata/SUPPORTED	21 Feb 2007 11:15:50 -0000	1.71.2.16
+--- glibc-20070416T2350/localedata/SUPPORTED	18 Feb 2007 04:52:09 -0000	1.102
++++ glibc-20070416T2350-fedora/localedata/SUPPORTED	21 Feb 2007 11:15:50 -0000	1.71.2.16
 @@ -78,6 +78,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -785,8 +826,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20070331T1609/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20070331T1609-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20070416T2350/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20070416T2350-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>"
@@ -801,8 +842,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20070331T1609/localedata/locales/en_GB	1 Oct 2006 16:18:33 -0000	1.14
-+++ glibc-20070331T1609-fedora/localedata/locales/en_GB	2 Oct 2006 19:02:41 -0000	1.10.2.4
+--- glibc-20070416T2350/localedata/locales/en_GB	1 Oct 2006 16:18:33 -0000	1.14
++++ glibc-20070416T2350-fedora/localedata/locales/en_GB	2 Oct 2006 19:02:41 -0000	1.10.2.4
 @@ -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>"
@@ -814,8 +855,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-20070331T1609/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070331T1609-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20070416T2350/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20070416T2350-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -886,8 +927,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20070331T1609/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20070331T1609-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20070416T2350/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20070416T2350-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -915,8 +956,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20070331T1609/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20070331T1609-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20070416T2350/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20070416T2350-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>
@@ -992,8 +1033,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20070331T1609/malloc/mtrace.c	25 Jan 2007 00:43:38 -0000	1.43
-+++ glibc-20070331T1609-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20070416T2350/malloc/mtrace.c	25 Jan 2007 00:43:38 -0000	1.43
++++ glibc-20070416T2350-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)
@@ -1049,8 +1090,8 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20070331T1609/manual/libc.texinfo	12 Nov 2003 00:37:03 -0000	1.94
-+++ glibc-20070331T1609-fedora/manual/libc.texinfo	3 Nov 2006 16:31:21 -0000	1.94.2.1
+--- glibc-20070416T2350/manual/libc.texinfo	12 Nov 2003 00:37:03 -0000	1.94
++++ glibc-20070416T2350-fedora/manual/libc.texinfo	3 Nov 2006 16:31:21 -0000	1.94.2.1
 @@ -5,7 +5,7 @@
  @setchapternewpage odd
  
@@ -1060,17 +1101,17 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-20070331T1609/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20070331T1609-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20070416T2350/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20070416T2350-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-20070331T1609/nptl/ChangeLog	26 Mar 2007 20:12:19 -0000	1.956
-+++ glibc-20070331T1609-fedora/nptl/ChangeLog	31 Mar 2007 17:23:55 -0000	1.706.2.119
-@@ -1409,6 +1409,15 @@
+--- glibc-20070416T2350/nptl/ChangeLog	6 Apr 2007 22:19:54 -0000	1.957
++++ glibc-20070416T2350-fedora/nptl/ChangeLog	16 Apr 2007 23:59:05 -0000	1.706.2.120
+@@ -1414,6 +1414,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1086,7 +1127,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -2145,6 +2154,11 @@
+@@ -2150,6 +2159,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1098,7 +1139,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -4219,6 +4233,11 @@
+@@ -4224,6 +4238,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1110,8 +1151,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20070331T1609/nptl/Makefile	8 Sep 2006 10:40:49 -0000	1.188
-+++ glibc-20070331T1609-fedora/nptl/Makefile	28 Nov 2006 11:18:18 -0000	1.157.2.29
+--- glibc-20070416T2350/nptl/Makefile	8 Sep 2006 10:40:49 -0000	1.188
++++ glibc-20070416T2350-fedora/nptl/Makefile	28 Nov 2006 11:18:18 -0000	1.157.2.29
 @@ -340,7 +340,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1144,8 +1185,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20070331T1609/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20070331T1609-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20070416T2350/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20070416T2350-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;
@@ -1170,8 +1211,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20070331T1609/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070331T1609-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20070416T2350/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070416T2350-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>
 +
@@ -1179,8 +1220,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20070331T1609/nscd/connections.c	1 Feb 2007 16:05:31 -0000	1.98
-+++ glibc-20070331T1609-fedora/nscd/connections.c	2 Feb 2007 09:48:23 -0000	1.55.2.28
+--- glibc-20070416T2350/nscd/connections.c	1 Feb 2007 16:05:31 -0000	1.98
++++ glibc-20070416T2350-fedora/nscd/connections.c	2 Feb 2007 09:48:23 -0000	1.55.2.28
 @@ -1947,3 +1947,21 @@ finish_drop_privileges (void)
    install_real_capabilities (new_caps);
  #endif
@@ -1203,8 +1244,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX, -1);
 +}
 +
---- glibc-20070331T1609/nscd/nscd.c	16 Feb 2007 19:14:58 -0000	1.57
-+++ glibc-20070331T1609-fedora/nscd/nscd.c	21 Feb 2007 11:15:53 -0000	1.38.2.16
+--- glibc-20070416T2350/nscd/nscd.c	16 Feb 2007 19:14:58 -0000	1.57
++++ glibc-20070416T2350-fedora/nscd/nscd.c	21 Feb 2007 11:15:53 -0000	1.38.2.16
 @@ -119,6 +119,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -1223,8 +1264,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20070331T1609/nscd/nscd.conf	14 Jan 2007 05:24:04 -0000	1.14
-+++ glibc-20070331T1609-fedora/nscd/nscd.conf	17 Jan 2007 10:42:40 -0000	1.8.2.6
+--- glibc-20070416T2350/nscd/nscd.conf	14 Jan 2007 05:24:04 -0000	1.14
++++ glibc-20070416T2350-fedora/nscd/nscd.conf	17 Jan 2007 10:42:40 -0000	1.8.2.6
 @@ -33,8 +33,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -1236,8 +1277,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20070331T1609/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
-+++ glibc-20070331T1609-fedora/nscd/nscd.init	5 Dec 2006 21:50:20 -0000	1.6.2.5
+--- glibc-20070416T2350/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
++++ glibc-20070416T2350-fedora/nscd/nscd.init	5 Dec 2006 21:50:20 -0000	1.6.2.5
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1278,8 +1319,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20070331T1609/posix/Makefile	5 Feb 2007 15:22:40 -0000	1.195
-+++ glibc-20070331T1609-fedora/posix/Makefile	11 Feb 2007 16:21:43 -0000	1.171.2.23
+--- glibc-20070416T2350/posix/Makefile	3 Apr 2007 23:28:20 -0000	1.197
++++ glibc-20070416T2350-fedora/posix/Makefile	16 Apr 2007 23:59:05 -0000	1.171.2.24
 @@ -110,7 +110,7 @@ generated := $(addprefix wordexp-test-re
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
  	     tst-pcre-mem tst-pcre.mtrace tst-boost-mem tst-boost.mtrace \
@@ -1312,8 +1353,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20070331T1609/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070331T1609-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20070416T2350/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070416T2350-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 =
@@ -1330,8 +1371,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20070331T1609/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20070331T1609-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20070416T2350/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20070416T2350-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
@@ -1347,8 +1388,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-20070331T1609/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
-+++ glibc-20070331T1609-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
+--- glibc-20070416T2350/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
++++ glibc-20070416T2350-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)))
@@ -1362,8 +1403,8 @@
 +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
 +CFLAGS-.oS += -mno-tls-direct-seg-refs
  endif
---- glibc-20070331T1609/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20070331T1609-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20070416T2350/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20070416T2350-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))
@@ -1375,8 +1416,8 @@
  endif
  endif
  
---- glibc-20070331T1609/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20070331T1609-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20070416T2350/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20070416T2350-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.  */
@@ -1728,8 +1769,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20070331T1609/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070331T1609-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20070416T2350/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20070416T2350-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.
@@ -1815,8 +1856,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20070331T1609/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
-+++ glibc-20070331T1609-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
+--- glibc-20070416T2350/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
++++ glibc-20070416T2350-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1825,8 +1866,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20070331T1609/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20070331T1609-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20070416T2350/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20070416T2350-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);
      }
@@ -1841,8 +1882,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20070331T1609/sysdeps/unix/sysv/linux/check_pf.c	15 Mar 2007 20:02:24 -0000	1.9
-+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/check_pf.c	17 Mar 2007 21:53:00 -0000	1.3.2.6
+--- glibc-20070416T2350/sysdeps/unix/sysv/linux/check_pf.c	15 Mar 2007 20:02:24 -0000	1.9
++++ glibc-20070416T2350-fedora/sysdeps/unix/sysv/linux/check_pf.c	17 Mar 2007 21:53:00 -0000	1.3.2.6
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1858,8 +1899,8 @@
  
  #ifndef IFA_F_TEMPORARY
  # define IFA_F_TEMPORARY IFA_F_SECONDARY
---- glibc-20070331T1609/sysdeps/unix/sysv/linux/dl-osinfo.h	1 Aug 2006 06:55:27 -0000	1.23
-+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	2 Aug 2006 16:57:42 -0000	1.14.2.9
+--- glibc-20070416T2350/sysdeps/unix/sysv/linux/dl-osinfo.h	1 Aug 2006 06:55:27 -0000	1.23
++++ glibc-20070416T2350-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.  */
  
@@ -1907,8 +1948,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20070331T1609/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20070416T2350/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20070416T2350-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;
@@ -1951,8 +1992,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20070331T1609/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
-+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
+--- glibc-20070416T2350/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
++++ glibc-20070416T2350-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -1978,8 +2019,8 @@
  
  struct netlink_res
  {
---- glibc-20070331T1609/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20070416T2350/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20070416T2350-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"
@@ -1989,8 +2030,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20070331T1609/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20070416T2350/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20070416T2350-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;
@@ -2036,8 +2077,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20070331T1609/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
-+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
+--- glibc-20070416T2350/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
++++ glibc-20070416T2350-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -2056,8 +2097,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-20070331T1609/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20070416T2350/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070416T2350-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -2118,8 +2159,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20070331T1609/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20070416T2350/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20070416T2350-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2152,29 +2193,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20070331T1609/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20070416T2350/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20070416T2350-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-20070331T1609/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20070416T2350/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070416T2350-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-20070331T1609/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20070416T2350/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20070416T2350-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- glibc-20070331T1609/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
-+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
+--- glibc-20070416T2350/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
++++ glibc-20070416T2350-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  
@@ -2193,30 +2234,3 @@
  
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
---- libc/sysdeps/unix/sysv/linux/sync_file_range.c	24 Apr 2006 17:07:53 -0000	1.2
-+++ libc/sysdeps/unix/sysv/linux/sync_file_range.c	31 Mar 2007 18:37:51 -0000
-@@ -1,5 +1,5 @@
- /* Selective file content synch'ing.
--   Copyright (C) 2006 Free Software Foundation, Inc.
-+   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -27,7 +27,7 @@
- 
- #ifdef __NR_sync_file_range
- int
--sync_file_range (int fd, __off64_t from, __off64_t to, int flags)
-+sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags)
- {
-   return INLINE_SYSCALL (sync_file_range, 6, fd,
- 			 __LONG_LONG_PAIR ((long) (from >> 32), (long) from),
-@@ -36,7 +36,7 @@ sync_file_range (int fd, __off64_t from,
- }
- #else
- int
--sync_file_range (int fd, __off64_t from, __off64_t to, int flags)
-+sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags)
- {
-   __set_errno (ENOSYS);
-   return -1;


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- glibc.spec	31 Mar 2007 17:47:41 -0000	1.300
+++ glibc.spec	17 Apr 2007 00:12:45 -0000	1.301
@@ -1,9 +1,9 @@
-%define glibcdate 20070331T1609
+%define glibcdate 20070416T2350
 %define glibcname glibc
-%define glibcsrcdir glibc-20070331T1609
+%define glibcsrcdir glibc-20070416T2350
 %define glibc_release_tarballs 0
 %define glibcversion 2.5.90
-%define glibcrelease 20
+%define glibcrelease 21
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -36,10 +36,6 @@
 Source3: %{glibcname}-fedora-%{glibcdate}.tar.bz2
 Patch0: %{glibcname}-fedora.patch
 Patch1: %{name}-ia64-lib64.patch
-Patch2: glibc-bz3427.patch
-Patch3: glibc-fnmatch-speedup.patch
-Patch4: glibc-bz3306.patch
-Patch5: glibc-libio-__THROW.patch
 Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root
 Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers,
 Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile
@@ -251,10 +247,6 @@
 %patch1 -p1
 %endif
 %endif
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 # Hack till glibc-kernheaders get updated, argh
 mkdir -p override_headers/linux
@@ -982,11 +974,6 @@
 cd ..
 %endif
 
-# compatibility hack: this locale has vanished from glibc, but some other
-# programs are still using it. Normally we would handle it in the %pre
-# section but with glibc that is simply not an option
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/locale/ru_RU/LC_MESSAGES
-
 # Remove the files we don't want to distribute
 rm -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libNoVersion*
 rm -f $RPM_BUILD_ROOT/%{_lib}/libNoVersion*
@@ -1064,7 +1051,19 @@
 # Hardlink identical locale files together
 %ifnarch %{auxarches}
 gcc -O2 -o build-%{nptl_target_cpu}-linuxnptl/hardlink fedora/hardlink.c
-build-%{nptl_target_cpu}-linuxnptl/hardlink -vc $RPM_BUILD_ROOT%{_prefix}/lib/locale
+rm ${RPM_BUILD_ROOT}${_prefix}/lib/locale/locale-archive || :
+olddir=`pwd`
+pushd ${RPM_BUILD_ROOT}${_prefix}/lib/locale
+# Intentionally we do not pass --alias-file=, aliases will be added
+# by build-locale-archive.
+$olddir/build-%{nptl_target_cpu}-linuxnptl/elf/ld.so \
+  --library-path $olddir/build-%{nptl_target_cpu}-linuxnptl/ \
+  $olddir/build-%{nptl_target_cpu}-linuxnptl/locale/localedef \
+    --prefix ${RPM_BUILD_ROOT} --add-to-archive \
+    *_*
+rm -rf *_*
+popd
+#build-%{nptl_target_cpu}-linuxnptl/hardlink -vc $RPM_BUILD_ROOT%{_prefix}/lib/locale
 %endif
 
 rm -f ${RPM_BUILD_ROOT}/%{_lib}/libnss1-*
@@ -1138,7 +1137,7 @@
 	grep -v 'nscd' > rpm.filelist
 
 grep '%{_prefix}/bin' < rpm.filelist >> common.filelist
-grep '%{_prefix}/lib/locale' < rpm.filelist >> common.filelist
+grep '%{_prefix}/lib/locale' < rpm.filelist | grep -v /locale-archive.tmpl >> common.filelist
 grep '%{_prefix}/libexec/pt_chown' < rpm.filelist >> common.filelist
 grep '%{_prefix}/sbin/[^gi]' < rpm.filelist >> common.filelist
 grep '%{_prefix}/share' < rpm.filelist \
@@ -1508,6 +1507,7 @@
 %ifnarch %{auxarches}
 %files -f common.filelist common
 %defattr(-,root,root)
+%attr(0644,root,root) %config(missingok) %{_prefix}/lib/locale/locale-archive.tmpl
 %attr(0644,root,root) %verify(not md5 size mtime mode) %ghost %config(missingok,noreplace) %{_prefix}/lib/locale/locale-archive
 %dir %attr(755,root,root) /etc/default
 %verify(not md5 size mtime) %config(noreplace) /etc/default/nss
@@ -1562,6 +1562,18 @@
 %endif
 
 %changelog
+* Mon Apr 16 2007 Jakub Jelinek <jakub at redhat.com> 2.5.90-21
+- don't include individual locale files in glibc-common,
+  rather include prepared locale-archive template and let
+  build-locale-archive create locale-archive from the template
+  and any user supplied /usr/lib/locale/*_* directories,
+  then unlink the locale-archive template - this should save
+  > 80MB of glibc-common occupied disk space
+- fix _XOPEN_VERSION (BZ#4364)
+- fix printf with %g and values tiny bit smaller than 1.e-4 (#235864,
+  BZ#4362)
+- fix NIS+ __nisfind_server (#235229)
+
 * Sat Mar 31 2007 Jakub Jelinek <jakub at redhat.com> 2.5.90-20
 - assorted NIS+ speedups (#223467)
 - fix HAVE_LIBCAP configure detection (#178934)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- sources	31 Mar 2007 17:37:20 -0000	1.225
+++ sources	17 Apr 2007 00:12:45 -0000	1.226
@@ -1,2 +1,2 @@
-18892a96076bf9f99cf0d32111e3a088  glibc-20070331T1609.tar.bz2
-b2dbae683fefa2b5f40fed0f4b7d682f  glibc-fedora-20070331T1609.tar.bz2
+21547b2c3508dd995804f0482e79b8ac  glibc-20070416T2350.tar.bz2
+dd38de284d9b36cbe984dcc4684f4ca1  glibc-fedora-20070416T2350.tar.bz2


--- glibc-bz3306.patch DELETED ---


--- glibc-bz3427.patch DELETED ---


--- glibc-fnmatch-speedup.patch DELETED ---


--- glibc-libio-__THROW.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 17 00:17:56 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 20:17:56 -0400
Subject: rpms/mdadm/devel mdadm.spec, 1.42, 1.43 mdadm-1.5.0-email.patch, 1.1,
	NONE
Message-ID: <200704170017.l3H0HuZt023578@cvs.devel.redhat.com>

Author: dledford

Update of /cvs/dist/rpms/mdadm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23564

Modified Files:
	mdadm.spec 
Removed Files:
	mdadm-1.5.0-email.patch 
Log Message:
* Mon Apr 16 2007 Doug Ledford <dledford at redhat.com> - 2.6.1-4
- More cleanups for merge review process
- Related: bz226134



Index: mdadm.spec
===================================================================
RCS file: /cvs/dist/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- mdadm.spec	11 Apr 2007 15:34:04 -0000	1.42
+++ mdadm.spec	17 Apr 2007 00:17:54 -0000	1.43
@@ -1,40 +1,38 @@
-Summary:     mdadm controls Linux md devices (software RAID arrays)
+Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     2.6.1
-Release:     3%{?dist}
+Release:     4%{?dist}
 Source:      http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz
 Source1:     mdmonitor.init
-Patch1:	     mdadm-1.5.0-email.patch
-Patch2:      mdadm-2.5.2-s390-build.patch
-Patch3:      mdadm-2.5.2-static.patch
-Patch4:      mdadm-2.2-nodiet.patch
-Patch5:      mdadm-2.5.2-cflags.patch
-Patch6:      mdadm-2.6.1-build.patch
+Patch1:      mdadm-2.5.2-s390-build.patch
+Patch2:      mdadm-2.5.2-static.patch
+Patch3:      mdadm-2.2-nodiet.patch
+Patch4:      mdadm-2.5.2-cflags.patch
+Patch5:      mdadm-2.6.1-build.patch
 URL:         http://www.cse.unsw.edu.au/~neilb/source/mdadm/
 License:     GPL
 Group:       System Environment/Base
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:   mdctl,raidtools
-Requires:    smtpdaemon
+Requires:    /usr/sbin/sendmail
 Requires(post): /sbin/service, /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
 Requires(postun): /sbin/service
 
 %description 
-mdadm is used to create, manage, and monitor Linux MD (software RAID)
-devices.  As such, it provides similar functionality to the raidtools
+The mdadm program is used to create, manage, and monitor Linux MD (software
+RAID) devices.  As such, it provides similar functionality to the raidtools
 package.  However, mdadm is a single program, and it can perform
 almost all functions without a configuration file, though a configuration
 file can be used to help with some common tasks.
 
 %prep
 %setup -q
-%patch1 -p1 -b .email
-%patch2 -p1 -b .s390
-%patch3 -p1 -b .static
-%patch4 -p1 -b .nodiet
-%patch5 -p1 -b .cflags
-%patch6 -p1 -b .build
+%patch1 -p1 -b .s390
+%patch2 -p1 -b .static
+%patch3 -p1 -b .nodiet
+%patch4 -p1 -b .cflags
+%patch5 -p1 -b .build
 
 %build
 make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" MDASSEMBLE_AUTO=1 mdassemble.static mdassemble mdadm.static mdadm
@@ -74,7 +72,7 @@
 fi
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc TODO ChangeLog mdadm.conf-example COPYING misc/*
 /sbin/*
 %{_initrddir}/*
@@ -82,6 +80,10 @@
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Mon Apr 16 2007 Doug Ledford <dledford at redhat.com> - 2.6.1-4
+- More cleanups for merge review process
+- Related: bz226134
+
 * Wed Apr 11 2007 Doug Ledford <dledford at redhat.com> - 2.6.1-3
 - Various cleanups as part of merge review process
 - Related: bz226134
@@ -275,7 +277,7 @@
 * Wed Mar 12 2002 NeilBrown <neilb at cse.unsw.edu.au>
 - Add md.4 and mdadm.conf.5 man pages
 
-* Fri Mar 08 2002		Chris Siebenmann <cks at cquest.utoronto.ca>
+* Fri Mar 08 2002 Chris Siebenmann <cks at cquest.utoronto.ca>
 - builds properly as non-root.
 
 * Fri Mar 08 2002 Derek Vadala <derek at cynicism.com>


--- mdadm-1.5.0-email.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 17 00:30:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 20:30:32 -0400
Subject: rpms/glibc/devel glibc.spec,1.301,1.302
Message-ID: <200704170030.l3H0UW5J023732@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	glibc.spec 
Log Message:
2.5.90-21


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- glibc.spec	17 Apr 2007 00:12:45 -0000	1.301
+++ glibc.spec	17 Apr 2007 00:30:25 -0000	1.302
@@ -1051,9 +1051,9 @@
 # Hardlink identical locale files together
 %ifnarch %{auxarches}
 gcc -O2 -o build-%{nptl_target_cpu}-linuxnptl/hardlink fedora/hardlink.c
-rm ${RPM_BUILD_ROOT}${_prefix}/lib/locale/locale-archive || :
+rm ${RPM_BUILD_ROOT}%{_prefix}/lib/locale/locale-archive || :
 olddir=`pwd`
-pushd ${RPM_BUILD_ROOT}${_prefix}/lib/locale
+pushd ${RPM_BUILD_ROOT}%{_prefix}/lib/locale
 # Intentionally we do not pass --alias-file=, aliases will be added
 # by build-locale-archive.
 $olddir/build-%{nptl_target_cpu}-linuxnptl/elf/ld.so \



From fedora-cvs-commits at redhat.com  Tue Apr 17 00:52:15 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 20:52:15 -0400
Subject: rpms/kernel/FC-6 .cvsignore, 1.559, 1.560 sources, 1.523,
	1.524 upstream, 1.443, 1.444
Message-ID: <200704170052.l3H0qFgX019132@cvs.devel.redhat.com>

Author: cebbert

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

Modified Files:
	.cvsignore sources upstream 
Log Message:
Pull 2.6.20.7 into CVS.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/.cvsignore,v
retrieving revision 1.559
retrieving revision 1.560
diff -u -r1.559 -r1.560
--- .cvsignore	10 Apr 2007 21:15:52 -0000	1.559
+++ .cvsignore	17 Apr 2007 00:52:13 -0000	1.560
@@ -9,4 +9,5 @@
 patch-2.6.20.3-4.bz2
 patch-2.6.20.4-5.bz2
 patch-2.6.20.5-6.bz2
+patch-2.6.20.6-7.bz2
 xen-3.0.3-11774.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/sources,v
retrieving revision 1.523
retrieving revision 1.524
diff -u -r1.523 -r1.524
--- sources	10 Apr 2007 21:15:52 -0000	1.523
+++ sources	17 Apr 2007 00:52:13 -0000	1.524
@@ -5,4 +5,5 @@
 39b98fdb6320cc986a67e76fbeb35a0c  patch-2.6.20.3-4.bz2
 5eba73d99e55d62450961bdb5fe04b74  patch-2.6.20.4-5.bz2
 f979e94c4e44928bd122604fdf586933  patch-2.6.20.5-6.bz2
+557549a69f3ec7b615d252f302ad5099  patch-2.6.20.6-7.bz2
 a9d44b2651b0898e103395b2a7a4f263  xen-3.0.3-11774.tar.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/upstream,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -r1.443 -r1.444
--- upstream	10 Apr 2007 21:15:52 -0000	1.443
+++ upstream	17 Apr 2007 00:52:13 -0000	1.444
@@ -5,3 +5,4 @@
 patch-2.6.20.3-4.bz2
 patch-2.6.20.4-5.bz2
 patch-2.6.20.5-6.bz2
+patch-2.6.20.6-7.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 17 00:52:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 20:52:50 -0400
Subject: rpms/kernel/FC-5 patch-2.6.20.6-7.bz2.sign, NONE, 1.1 .cvsignore,
	1.440, 1.441 sources, 1.380, 1.381 upstream, 1.343, 1.344
Message-ID: <200704170052.l3H0qoeo019585@cvs.devel.redhat.com>

Author: cebbert

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

Modified Files:
	.cvsignore sources upstream 
Added Files:
	patch-2.6.20.6-7.bz2.sign 
Log Message:
Pull 2.6.20.7 into CVS.



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

iD8DBQBGIBGOyGugalF9Dw4RAopWAJ9y/mI7Fn+oqboe2RMDzl1u2cnV4wCfUMaD
aQQGT8m4d3wN7EHtUt60Iz0=
=k3fY
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -r1.440 -r1.441
--- .cvsignore	10 Apr 2007 18:16:46 -0000	1.440
+++ .cvsignore	17 Apr 2007 00:52:48 -0000	1.441
@@ -9,4 +9,5 @@
 patch-2.6.20.3-4.bz2
 patch-2.6.20.4-5.bz2
 patch-2.6.20.5-6.bz2
+patch-2.6.20.6-7.bz2
 xen-3.0.3-11774.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -r1.380 -r1.381
--- sources	10 Apr 2007 18:16:47 -0000	1.380
+++ sources	17 Apr 2007 00:52:48 -0000	1.381
@@ -5,4 +5,5 @@
 39b98fdb6320cc986a67e76fbeb35a0c  patch-2.6.20.3-4.bz2
 5eba73d99e55d62450961bdb5fe04b74  patch-2.6.20.4-5.bz2
 f979e94c4e44928bd122604fdf586933  patch-2.6.20.5-6.bz2
+557549a69f3ec7b615d252f302ad5099  patch-2.6.20.6-7.bz2
 a9d44b2651b0898e103395b2a7a4f263  xen-3.0.3-11774.tar.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- upstream	10 Apr 2007 18:16:47 -0000	1.343
+++ upstream	17 Apr 2007 00:52:48 -0000	1.344
@@ -5,3 +5,4 @@
 patch-2.6.20.3-4.bz2
 patch-2.6.20.4-5.bz2
 patch-2.6.20.5-6.bz2
+patch-2.6.20.6-7.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 17 00:53:20 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 20:53:20 -0400
Subject: rpms/kernel/FC-6 patch-2.6.20.6-7.bz2.sign,NONE,1.1
Message-ID: <200704170053.l3H0rKMT019980@cvs.devel.redhat.com>

Author: cebbert

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

Added Files:
	patch-2.6.20.6-7.bz2.sign 
Log Message:
Add signature for 2.6.20.7



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

iD8DBQBGIBGOyGugalF9Dw4RAopWAJ9y/mI7Fn+oqboe2RMDzl1u2cnV4wCfUMaD
aQQGT8m4d3wN7EHtUt60Iz0=
=k3fY
-----END PGP SIGNATURE-----



From fedora-cvs-commits at redhat.com  Tue Apr 17 01:18:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 21:18:09 -0400
Subject: rpms/glibc/devel glibc.spec,1.302,1.303
Message-ID: <200704170118.l3H1I9cQ005136@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	glibc.spec 
Log Message:
2.5.90-21


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -r1.302 -r1.303
--- glibc.spec	17 Apr 2007 00:30:25 -0000	1.302
+++ glibc.spec	17 Apr 2007 01:18:06 -0000	1.303
@@ -1051,9 +1051,9 @@
 # Hardlink identical locale files together
 %ifnarch %{auxarches}
 gcc -O2 -o build-%{nptl_target_cpu}-linuxnptl/hardlink fedora/hardlink.c
-rm ${RPM_BUILD_ROOT}%{_prefix}/lib/locale/locale-archive || :
 olddir=`pwd`
 pushd ${RPM_BUILD_ROOT}%{_prefix}/lib/locale
+rm locale-archive || :
 # Intentionally we do not pass --alias-file=, aliases will be added
 # by build-locale-archive.
 $olddir/build-%{nptl_target_cpu}-linuxnptl/elf/ld.so \
@@ -1062,6 +1062,7 @@
     --prefix ${RPM_BUILD_ROOT} --add-to-archive \
     *_*
 rm -rf *_*
+mv locale-archive{,.tmpl}
 popd
 #build-%{nptl_target_cpu}-linuxnptl/hardlink -vc $RPM_BUILD_ROOT%{_prefix}/lib/locale
 %endif
@@ -1095,7 +1096,7 @@
 LIB_LANG='s|.*/lib/locale/\([^/_]\+\)|%lang(\1) &|'
 # rpm does not handle %lang() tagged files hardlinked together accross
 # languages very well, temporarily disable
-# LIB_LANG=''
+LIB_LANG=''
 sed -e "s|$RPM_BUILD_ROOT||" -e "$LIB_LANG" -e "$SHARE_LANG" < rpm.filelist.in |
 	grep -v '/etc/\(localtime\|nsswitch.conf\|ld.so.conf\|ld.so.cache\|default\)'  | \
 	grep -v '/%{_lib}/lib\(pcprofile\|memusage\).so' | \
@@ -1137,7 +1138,7 @@
 	grep -v 'nscd' > rpm.filelist
 
 grep '%{_prefix}/bin' < rpm.filelist >> common.filelist
-grep '%{_prefix}/lib/locale' < rpm.filelist | grep -v /locale-archive.tmpl >> common.filelist
+#grep '%{_prefix}/lib/locale' < rpm.filelist | grep -v /locale-archive.tmpl >> common.filelist
 grep '%{_prefix}/libexec/pt_chown' < rpm.filelist >> common.filelist
 grep '%{_prefix}/sbin/[^gi]' < rpm.filelist >> common.filelist
 grep '%{_prefix}/share' < rpm.filelist \
@@ -1507,6 +1508,7 @@
 %ifnarch %{auxarches}
 %files -f common.filelist common
 %defattr(-,root,root)
+%dir %{_prefix}/lib/locale
 %attr(0644,root,root) %config(missingok) %{_prefix}/lib/locale/locale-archive.tmpl
 %attr(0644,root,root) %verify(not md5 size mtime mode) %ghost %config(missingok,noreplace) %{_prefix}/lib/locale/locale-archive
 %dir %attr(755,root,root) /etc/default



From fedora-cvs-commits at redhat.com  Tue Apr 17 01:30:51 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 21:30:51 -0400
Subject: rpms/scim/devel initial-locale-hotkey-186861.patch, 1.2,
	1.3 scim.spec, 1.82, 1.83
Message-ID: <200704170130.l3H1Up2m013989@cvs.devel.redhat.com>

Author: petersen

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

Modified Files:
	initial-locale-hotkey-186861.patch scim.spec 
Log Message:
- update initial-locale-hotkey-186861.patch to really turn off the Ctrl-Space
  hotkey by default for non-Asian users (#235435)


initial-locale-hotkey-186861.patch:
 scim_hotkey.cpp |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

Index: initial-locale-hotkey-186861.patch
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/initial-locale-hotkey-186861.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- initial-locale-hotkey-186861.patch	15 Dec 2006 08:36:36 -0000	1.2
+++ initial-locale-hotkey-186861.patch	17 Apr 2007 01:30:49 -0000	1.3
@@ -1,7 +1,10 @@
---- scim-1.4.5/src/scim_hotkey.cpp.8-hotkey	2005-06-18 23:19:35.000000000 +1000
-+++ scim-1.4.5/src/scim_hotkey.cpp	2006-12-12 16:22:59.000000000 +1000
-@@ -332,9 +332,9 @@
-     "Control+space",
+--- scim-1.4.5/src/scim_hotkey.cpp.8-hotkey~	2005-06-18 23:19:35.000000000 +1000
++++ scim-1.4.5/src/scim_hotkey.cpp	2007-04-17 10:15:41.000000000 +1000
+@@ -329,12 +329,12 @@
+ static char *__scim_frontend_hotkey_defaults [] =
+ {
+     0,
+-    "Control+space",
      "",
      "",
 -    "Control+Alt+Down,Control+Shift+Shift_L+KeyRelease,Control+Shift+Shift_R+KeyRelease",
@@ -10,6 +13,7 @@
 +    "",
 +    "",
 +    "",
++    "",
      0
  };
  


Index: scim.spec
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/scim.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- scim.spec	11 Apr 2007 08:18:47 -0000	1.82
+++ scim.spec	17 Apr 2007 01:30:49 -0000	1.83
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.5
-Release:   13%{?dist}
+Release:   14%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -254,6 +254,10 @@
 
 
 %changelog
+* Tue Apr 17 2007 Jens Petersen <petersen at redhat.com> - 1.4.5-14
+- update initial-locale-hotkey-186861.patch to really turn off the Ctrl-Space
+  hotkey by default for non-Asian users (#235435)
+
 * Wed Apr 11 2007 Jens Petersen <petersen at redhat.com> - 1.4.5-13
 - do not set a hotkey by default for non-Asian users (#235435)
 - move the scim system config file from scim-system-default-config.patch



From fedora-cvs-commits at redhat.com  Tue Apr 17 01:39:02 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 21:39:02 -0400
Subject: rpms/unixODBC/devel unixODBC.spec,1.37,1.38
Message-ID: <200704170139.l3H1d2D0014902@cvs.devel.redhat.com>

Author: tgl

Update of /cvs/dist/rpms/unixODBC/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14888

Modified Files:
	unixODBC.spec 
Log Message:
Drop BuildRequires for kdelibs-devel.
Resolves: #152717


Index: unixODBC.spec
===================================================================
RCS file: /cvs/dist/rpms/unixODBC/devel/unixODBC.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- unixODBC.spec	6 Dec 2006 17:50:00 -0000	1.37
+++ unixODBC.spec	17 Apr 2007 01:38:59 -0000	1.38
@@ -1,7 +1,7 @@
-Summary: A complete ODBC driver manager for Linux.
+Summary: A complete ODBC driver manager for Linux
 Name: unixODBC
 Version: 2.2.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.unixODBC.org/
@@ -16,10 +16,10 @@
 Patch6: unixODBC-2.2.11-stricmp.patch
 
 Conflicts: iodbc
-BuildPrereq: libX11-devel libXt-devel libXext-devel
-BuildPrereq: kdelibs-devel qt-devel libmng-devel readline-devel
-BuildPrereq: automake autoconf libtool bison
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: libX11-devel libXt-devel libXext-devel
+BuildRequires: qt-devel readline-devel
+BuildRequires: automake autoconf libtool bison
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 Install unixODBC if you want to access databases through ODBC.  This
@@ -42,7 +42,7 @@
 %package kde
 Summary: KDE driver manager components for ODBC.
 Group: System Environment/Libraries
-Requires: qt >= 2.1  %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description kde
 This package contains components for the ODBCConfig and DataManager
@@ -172,6 +172,11 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Apr 16 2007 Tom Lane <tgl at redhat.com> 2.2.12-2
+- Drop BuildRequires for kdelibs-devel
+Resolves: #152717
+- Clean up a few rpmlint complaints
+
 * Wed Dec  6 2006 Tom Lane <tgl at redhat.com> 2.2.12-1
 - Update to unixODBC 2.2.12.
 - Add missing BuildPrereq for bison.
@@ -334,14 +339,14 @@
 * Tue Nov 19 2002 Elliot Lee <sopwith at redhat.com> 2.2.3-1
 - Rebuild, update to 2.2.3
 
-* Mon Aug 26 2002 Trond Eivind Glomsr?d <teg at redhat.com> 2.2.2-3
+* Mon Aug 26 2002 Trond Eivind Glomsrd <teg at redhat.com> 2.2.2-3
 - Move libodbc.so to the main package, so programs dlopening 
   it don't break (#72653)
 
 * Sat Aug 10 2002 Elliot Lee <sopwith at redhat.com>
 - rebuilt with gcc-3.2 (we hope)
 
-* Mon Jul 22 2002 Trond Eivind Glomsr?d <teg at redhat.com> 2.2.2-1
+* Mon Jul 22 2002 Trond Eivind Glomsrd <teg at redhat.com> 2.2.2-1
 - 2.2.2
 - desktop file changes (# 69371)
 
@@ -351,7 +356,7 @@
 * Sun May 26 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Mon May 20 2002 Trond Eivind Glomsr?d <teg at redhat.com> 2.2.1-1
+* Mon May 20 2002 Trond Eivind Glomsrd <teg at redhat.com> 2.2.1-1
 - 2.2.1
 - Reenable other archs, as this should now build on 64 bit archs
 
@@ -361,27 +366,27 @@
 * Wed Apr 17 2002 Bernhard Rosenkraenzer <bero at redhat.com> 2.2.0-5
 - rebuild
 
-* Fri Apr  5 2002 Trond Eivind Glomsr?d <teg at redhat.com> 2.2.0-4
+* Fri Apr  5 2002 Trond Eivind Glomsrd <teg at redhat.com> 2.2.0-4
 - Avoid having files in more than one package (#62755)
 
-* Tue Mar 26 2002 Trond Eivind Glomsr?d <teg at redhat.com> 2.2.0-3
+* Tue Mar 26 2002 Trond Eivind Glomsrd <teg at redhat.com> 2.2.0-3
 - Don't include kde plugin .so as a devel symlink (#61039)
 
 * Fri Mar  8 2002 Bernhard Rosenkraenzer <bero at redhat.com> 2.2.0-2
 - Rebuild with KDE 3.x
 
-* Tue Feb 26 2002 Trond Eivind Glomsr?d <teg at redhat.com> 2.2.0-1
+* Tue Feb 26 2002 Trond Eivind Glomsrd <teg at redhat.com> 2.2.0-1
 - Just build on i386 now, there are 64 bit oddities 
 - 2.2.0
 
-* Fri Jan 11 2002 Trond Eivind Glomsr?d <teg at redhat.com> 2.1.1-2
+* Fri Jan 11 2002 Trond Eivind Glomsrd <teg at redhat.com> 2.1.1-2
 - move libodbcinstQ* to the kde subpackage
 
-* Fri Jan 11 2002 Trond Eivind Glomsr?d <teg at redhat.com> 2.1.1-1
+* Fri Jan 11 2002 Trond Eivind Glomsrd <teg at redhat.com> 2.1.1-1
 - 2.1.1
 - minor cleanups
 
-* Fri Dec 14 2001 Trond Eivind Glomsr?d <teg at redhat.com> 2.0.7-5
+* Fri Dec 14 2001 Trond Eivind Glomsrd <teg at redhat.com> 2.0.7-5
 - Rebuild
 
 * Wed Sep 12 2001 Tim Powers <timp at redhat.com>
@@ -390,27 +395,27 @@
 * Sun Jun 24 2001 Than Ngo <than at redhat.com>
 - rebuild against qt-2.3.1, kde-2.1.x
 
-* Fri Jun 15 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Jun 15 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - Better default odbcinst.ini
 - Minor cleanups
 
-* Wed Jun  6 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Wed Jun  6 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - 2.0.7
 
-* Wed Apr 25 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Wed Apr 25 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - Fix for isql segfault on EOF/ctrl-d exit
 
-* Fri Apr 20 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Apr 20 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - 2.0.6
 - add patch for 64 bit archs (dword shouldn't be "long int")
 
-* Wed Feb 28 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Wed Feb 28 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - rebuild
 
-* Tue Nov 28 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Tue Nov 28 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - 1.8.13
 
-* Tue Oct 10 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Tue Oct 10 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - enable GUI now that we have KDE compiled with the standard
   compiler
 - move the applnk entries to the KDE package
@@ -421,7 +426,7 @@
 * Wed Aug 23 2000 Preston Brown <pbrown at redhat.com>
 - 1.8.12 fixes problems with the postgresql driver
 
-* Mon Jul 31 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon Jul 31 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - disable KDE subpackage to avoid the mess that is C++ binary
   compatibility 
 
@@ -431,7 +436,7 @@
 * Fri Jun 30 2000 Florian La Roche <laroche at redhat.com>
 - improved QTDIR detection
 
-* Thu Jun 28 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Thu Jun 28 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - 1.8.10
 - use %%{_tmppath}
 - update URL



From fedora-cvs-commits at redhat.com  Tue Apr 17 01:54:35 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 21:54:35 -0400
Subject: rpms/echo-icon-theme/devel .cvsignore, 1.5, 1.6 echo-icon-theme.spec,
	1.7, 1.8 sources, 1.6, 1.7
Message-ID: <200704170154.l3H1sZjT015189@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/echo-icon-theme/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15171

Modified Files:
	.cvsignore echo-icon-theme.spec sources 
Log Message:
new snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/echo-icon-theme/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Mar 2007 15:34:01 -0000	1.5
+++ .cvsignore	17 Apr 2007 01:54:33 -0000	1.6
@@ -1 +1 @@
-echo-icon-theme-0.2-20070326wiki.tar.bz2
+echo-icon-theme-0.2-20070417wiki.tar.bz2


Index: echo-icon-theme.spec
===================================================================
RCS file: /cvs/dist/rpms/echo-icon-theme/devel/echo-icon-theme.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- echo-icon-theme.spec	27 Mar 2007 04:06:17 -0000	1.7
+++ echo-icon-theme.spec	17 Apr 2007 01:54:33 -0000	1.8
@@ -1,4 +1,4 @@
-%define alphatag 20070326wiki
+%define alphatag 20070417wiki
 
 Name:           echo-icon-theme
 Version:        0.2
@@ -49,6 +49,10 @@
 
 
 %changelog
+* Tue Apr 17 2007 Matthias Clasen <mclasen at redhat.com> - 0.2.2.20070417wiki
+- New snapshot
+- Include scalable images
+
 * Tue Mar 27 2007 Matthias Clasen <mclasen at redhat.com> - 0.2-2.20070326wiki
 - Fix n-v-r ordering problem
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/echo-icon-theme/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Mar 2007 15:34:01 -0000	1.6
+++ sources	17 Apr 2007 01:54:33 -0000	1.7
@@ -1 +1 @@
-278900e223c6b6dc3675ab0fbbff4e9c  echo-icon-theme-0.2-20070326wiki.tar.bz2
+f5ee79992797ae5332471aeee9542b06  echo-icon-theme-0.2-20070417wiki.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 17 02:05:07 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 22:05:07 -0400
Subject: rpms/initscripts/devel .cvsignore, 1.121, 1.122 initscripts.spec,
	1.138, 1.139 sources, 1.134, 1.135
Message-ID: <200704170205.l3H257PJ015500@cvs.devel.redhat.com>

Author: notting

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

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
8.52-1

Resolves: bug #229996, bug #234756, bug #234916, bug #219339,
Resolves: bug #235952, bug #234075, bug #230776, bug #230157,
Resolves: bug #229343, bug #228253, bug #220322, bug #217595,
Resolves: bug #208043, bug #195845, bug #229919



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- .cvsignore	23 Feb 2007 14:54:13 -0000	1.121
+++ .cvsignore	17 Apr 2007 02:05:05 -0000	1.122
@@ -1 +1 @@
-initscripts-8.51.tar.bz2
+initscripts-8.52.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- initscripts.spec	23 Feb 2007 14:54:13 -0000	1.138
+++ initscripts.spec	17 Apr 2007 02:05:05 -0000	1.139
@@ -1,11 +1,10 @@
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 8.51
+Version: 8.52
 License: GPL
 Group: System Environment/Base
 Release: 1
 Source: initscripts-%{version}.tar.bz2
-URL: http://fedora.redhat.com/projects/additional-projects/initscripts/
 BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15
 Requires: /sbin/sysctl, syslog
@@ -29,7 +28,7 @@
 
 %description
 The initscripts package contains the basic system scripts used to boot
-your Red Hat system, change runlevels, and shut the system down
+your Red Hat or Fedora system, change runlevels, and shut the system down
 cleanly.  Initscripts also contains the scripts that activate and
 deactivate most network interfaces.
 
@@ -68,6 +67,7 @@
 
 /sbin/chkconfig --add netfs
 /sbin/chkconfig --add network
+/sbin/chkconfig --add netconsole
 
 # Handle converting prefdm back to respawn
 if fgrep -q "x:5:once:/etc/X11/prefdm -nodaemon" /etc/inittab ; then
@@ -78,6 +78,7 @@
 if [ $1 = 0 ]; then
   /sbin/chkconfig --del netfs
   /sbin/chkconfig --del network
+  /sbin/chkconfig --del netconsole
 fi
 
 %triggerun -- initscripts < 7.62
@@ -93,6 +94,7 @@
 %dir /etc/sysconfig/network-scripts
 %config(noreplace) %verify(not md5 mtime size) /etc/adjtime
 %config(noreplace) /etc/sysconfig/init
+%config(noreplace) /etc/sysconfig/netconsole
 %config(noreplace) /etc/sysconfig/readonly-root
 /etc/sysconfig/network-scripts/ifdown
 /sbin/ifdown
@@ -200,6 +202,24 @@
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Mon Apr 16 2007 Bill Nottingham <notting at redhat.com> 8.52-1
+- lang.sh: fix locales where SYSFONT is not the default (#229996)
+- ifup-wireless: properly quote arguments (#234756)
+- readonly-root: add options for mounting state (#234916)
+- rwtab: updates (#219339, <law at redhat.com>)
+- add netconsole init script (#235952)
+- disable link checking when PERSISTENT_DHCLIENT is set (#234075)
+- restore file context on /etc/resolv.conf (#230776, <dwalsh at redhat.com>)
+- ifup-post: only use the first address (#230157, <michal at harddata.com>)
+- ifup-ipsec: allow overriding of my_identifier (#229343, <cmadams at hiwaay.net>)
+- ifup-wireless: set link up before itweaking wireless parameters (#228253)
+- rc.sysinit: restorecon on mount points when relabeling (#220322)
+- init.ipv6-global: cleanup & optimize sysctl usage (#217595)
+- ifup-eth: support ETHTOOL_OPTS on bridge devices (#208043, <bbaetz at acm.org>)
+- network-functions-ipv6: as we don't use NETWORKING_IPV6, silence errors (#195845)
+- fix description (#229919)
+- translation updates
+
 * Fri Feb 23 2007 Bill Nottingham <notting at redhat.com> 8.51-1
 - fix 'Fedora Fedora' in rc.sysinit
 - halt: use kexec -x to not shut down network (#223932, <mchristi at redhat.com>)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/sources,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- sources	23 Feb 2007 14:54:13 -0000	1.134
+++ sources	17 Apr 2007 02:05:05 -0000	1.135
@@ -1 +1 @@
-2f3c5304d4b92d135e47c695493be398  initscripts-8.51.tar.bz2
+22133ef21bf3eb8cdb04c0dcd696c4bb  initscripts-8.52.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 17 02:25:40 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 16 Apr 2007 22:25:40 -0400
Subject: rpms/glibc/devel glibc.spec,1.303,1.304
Message-ID: <200704170225.l3H2PeII015841@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	glibc.spec 
Log Message:
2.5.90-21


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -r1.303 -r1.304
--- glibc.spec	17 Apr 2007 01:18:06 -0000	1.303
+++ glibc.spec	17 Apr 2007 02:25:38 -0000	1.304
@@ -1398,7 +1398,9 @@
 touch $RPM_BUILD_ROOT/var/run/nscd/{socket,nscd.pid}
 %endif
 
+%ifnarch %{auxarches}
 touch $RPM_BUILD_ROOT/%{_prefix}/lib/locale/locale-archive
+%endif
 
 %post -p /usr/sbin/glibc_post_upgrade.%{_target_cpu}
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 04:05:40 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 00:05:40 -0400
Subject: rpms/kernel/devel linux-2.6-kvm-19.patch, NONE, 1.1 kernel-2.6.spec,
	1.3079, 1.3080
Message-ID: <200704170405.l3H45eCs006805@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-kvm-19.patch 
Log Message:
* Tue Apr 17 2007 Dave Jones <davej at redhat.com>
- Update KVM to v19


linux-2.6-kvm-19.patch:
 drivers/kvm/Makefile      |    2 
 drivers/kvm/debug.h       |   23 
 drivers/kvm/kvm.h         |   60 +-
 drivers/kvm/kvm_main.c    |  675 ++++++++++++++++++++++++++--
 drivers/kvm/kvm_svm.h     |    2 
 drivers/kvm/mmu.c         |  144 ++++--
 drivers/kvm/paging_tmpl.h |   10 
 drivers/kvm/svm.c         |  124 +++--
 drivers/kvm/svm.h         |    6 
 drivers/kvm/vmx-debug.c   | 1078 ++++++++++++++++++++++++++++++++++++++++++++++
 drivers/kvm/vmx.c         |   90 +--
 drivers/kvm/x86_emulate.c |    5 
 include/linux/kvm.h       |  135 ++++-
 13 files changed, 2093 insertions(+), 261 deletions(-)

--- NEW FILE linux-2.6-kvm-19.patch ---
--- linux-2.6.20.noarch/drivers/kvm/vmx.c.kvmorig	2007-04-16 20:54:19.000000000 -0400
+++ linux-2.6.20.noarch/drivers/kvm/vmx.c	2007-04-16 20:54:50.000000000 -0400
@@ -712,6 +712,8 @@
 
 	vmcs_write32(GUEST_CS_AR_BYTES, 0xf3);
 	vmcs_write32(GUEST_CS_LIMIT, 0xffff);
+	if (vmcs_readl(GUEST_CS_BASE) == 0xffff0000)
+		vmcs_writel(GUEST_CS_BASE, 0xf0000);
 	vmcs_write16(GUEST_CS_SELECTOR, vmcs_readl(GUEST_CS_BASE) >> 4);
 
 	fix_rmode_seg(VCPU_SREG_ES, &vcpu->rmode.es);
@@ -786,22 +788,6 @@
 	vcpu->cr0 = cr0;
 }
 
-/*
- * Used when restoring the VM to avoid corrupting segment registers
- */
-static void vmx_set_cr0_no_modeswitch(struct kvm_vcpu *vcpu, unsigned long cr0)
-{
-	if (!vcpu->rmode.active && !(cr0 & CR0_PE_MASK))
-		enter_rmode(vcpu);
-
-	vcpu->rmode.active = ((cr0 & CR0_PE_MASK) == 0);
-	update_exception_bitmap(vcpu);
-	vmcs_writel(CR0_READ_SHADOW, cr0);
-	vmcs_writel(GUEST_CR0,
-		    (cr0 & ~KVM_GUEST_CR0_MASK) | KVM_VM_CR0_ALWAYS_ON);
-	vcpu->cr0 = cr0;
-}
-
 static void vmx_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)
 {
 	vmcs_writel(GUEST_CR3, cr3);
@@ -878,7 +864,14 @@
 	vmcs_writel(sf->base, var->base);
 	vmcs_write32(sf->limit, var->limit);
 	vmcs_write16(sf->selector, var->selector);
-	if (var->unusable)
+	if (vcpu->rmode.active && var->s) {
+		/*
+		 * Hack real-mode segments into vm86 compatibility.
+		 */
+		if (var->base == 0xffff0000 && var->selector == 0xf000)
+			vmcs_writel(sf->base, 0xf0000);
+		ar = 0xf3;
+	} else if (var->unusable)
 		ar = 1 << 16;
 	else {
 		ar = var->type & 15;
@@ -933,9 +926,9 @@
 	gfn_t fn = rmode_tss_base(kvm) >> PAGE_SHIFT;
 	char *page;
 
-	p1 = _gfn_to_page(kvm, fn++);
-	p2 = _gfn_to_page(kvm, fn++);
-	p3 = _gfn_to_page(kvm, fn);
+	p1 = gfn_to_page(kvm, fn++);
+	p2 = gfn_to_page(kvm, fn++);
+	p3 = gfn_to_page(kvm, fn);
 
 	if (!p1 || !p2 || !p3) {
 		kvm_printf(kvm,"%s: gfn_to_page failed\n", __FUNCTION__);
@@ -1138,7 +1131,6 @@
 		vcpu->guest_msrs[j] = vcpu->host_msrs[j];
 		++vcpu->nmsrs;
 	}
-	printk(KERN_DEBUG "kvm: msrs: %d\n", vcpu->nmsrs);
 
 	nr_good_msrs = vcpu->nmsrs - NR_BAD_MSRS;
 	vmcs_writel(VM_ENTRY_MSR_LOAD_ADDR,
@@ -1190,7 +1182,7 @@
 	u16 sp =  vmcs_readl(GUEST_RSP);
 	u32 ss_limit = vmcs_read32(GUEST_SS_LIMIT);
 
-	if (sp > ss_limit || sp - 6 > sp) {
+	if (sp > ss_limit || sp < 6 ) {
 		vcpu_printf(vcpu, "%s: #SS, rsp 0x%lx ss 0x%lx limit 0x%x\n",
 			    __FUNCTION__,
 			    vmcs_readl(GUEST_RSP),
@@ -1394,7 +1386,7 @@
 	return 0;
 }
 
-static int get_io_count(struct kvm_vcpu *vcpu, u64 *count)
+static int get_io_count(struct kvm_vcpu *vcpu, unsigned long *count)
 {
 	u64 inst;
 	gva_t rip;
@@ -1439,33 +1431,35 @@
 done:
 	countr_size *= 8;
 	*count = vcpu->regs[VCPU_REGS_RCX] & (~0ULL >> (64 - countr_size));
+	//printk("cx: %lx\n", vcpu->regs[VCPU_REGS_RCX]);
 	return 1;
 }
 
 static int handle_io(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 {
 	u64 exit_qualification;
+	int size, down, in, string, rep;
+	unsigned port;
+	unsigned long count;
+	gva_t address;
 
 	++kvm_stat.io_exits;
 	exit_qualification = vmcs_read64(EXIT_QUALIFICATION);
-	kvm_run->exit_reason = KVM_EXIT_IO;
-	if (exit_qualification & 8)
-		kvm_run->io.direction = KVM_EXIT_IO_IN;
-	else
-		kvm_run->io.direction = KVM_EXIT_IO_OUT;
-	kvm_run->io.size = (exit_qualification & 7) + 1;
-	kvm_run->io.string = (exit_qualification & 16) != 0;
-	kvm_run->io.string_down
-		= (vmcs_readl(GUEST_RFLAGS) & X86_EFLAGS_DF) != 0;
-	kvm_run->io.rep = (exit_qualification & 32) != 0;
-	kvm_run->io.port = exit_qualification >> 16;
-	if (kvm_run->io.string) {
-		if (!get_io_count(vcpu, &kvm_run->io.count))
+	in = (exit_qualification & 8) != 0;
+	size = (exit_qualification & 7) + 1;
+	string = (exit_qualification & 16) != 0;
+	down = (vmcs_readl(GUEST_RFLAGS) & X86_EFLAGS_DF) != 0;
+	count = 1;
+	rep = (exit_qualification & 32) != 0;
+	port = exit_qualification >> 16;
+	address = 0;
+	if (string) {
+		if (rep && !get_io_count(vcpu, &count))
 			return 1;
-		kvm_run->io.address = vmcs_readl(GUEST_LINEAR_ADDRESS);
-	} else
-		kvm_run->io.value = vcpu->regs[VCPU_REGS_RAX]; /* rax */
-	return 0;
+		address = vmcs_readl(GUEST_LINEAR_ADDRESS);
+	}
+	return kvm_setup_pio(vcpu, kvm_run, in, size, count, string, down,
+			     address, rep, port);
 }
 
 static void
@@ -1583,8 +1577,8 @@
 
 static int handle_cpuid(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 {
-	kvm_run->exit_reason = KVM_EXIT_CPUID;
-	return 0;
+	kvm_emulate_cpuid(vcpu);
+	return 1;
 }
 
 static int handle_rdmsr(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
@@ -1658,7 +1652,7 @@
 
 static int handle_vmcall(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 {
-	vmcs_writel(GUEST_RIP, vmcs_readl(GUEST_RIP)+3);
+	skip_emulated_instruction(vcpu);
 	return kvm_hypercall(vcpu, kvm_run);
 }
 
@@ -1920,10 +1914,10 @@
 
 	asm ("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));
 
-	kvm_run->exit_type = 0;
 	if (fail) {
-		kvm_run->exit_type = KVM_EXIT_TYPE_FAIL_ENTRY;
-		kvm_run->exit_reason = vmcs_read32(VM_INSTRUCTION_ERROR);
+		kvm_run->exit_reason = KVM_EXIT_FAIL_ENTRY;
+		kvm_run->fail_entry.hardware_entry_failure_reason
+			= vmcs_read32(VM_INSTRUCTION_ERROR);
 		r = 0;
 	} else {
 		/*
@@ -1933,19 +1927,20 @@
 			profile_hit(KVM_PROFILING, (void *)vmcs_readl(GUEST_RIP));
 
 		vcpu->launched = 1;
-		kvm_run->exit_type = KVM_EXIT_TYPE_VM_EXIT;
 		r = kvm_handle_exit(kvm_run, vcpu);
 		if (r > 0) {
 			/* Give scheduler a change to reschedule. */
 			if (signal_pending(current)) {
 				++kvm_stat.signal_exits;
 				post_kvm_run_save(vcpu, kvm_run);
+				kvm_run->exit_reason = KVM_EXIT_INTR;
 				return -EINTR;
 			}
 
 			if (dm_request_for_irq_injection(vcpu, kvm_run)) {
 				++kvm_stat.request_irq_exits;
 				post_kvm_run_save(vcpu, kvm_run);
+				kvm_run->exit_reason = KVM_EXIT_INTR;
 				return -EINTR;
 			}
 
@@ -2064,7 +2059,6 @@
[...2986 lines suppressed...]
 	KVM_EXIT_EXCEPTION        = 1,
 	KVM_EXIT_IO               = 2,
-	KVM_EXIT_CPUID            = 3,
+	KVM_EXIT_HYPERCALL        = 3,
 	KVM_EXIT_DEBUG            = 4,
 	KVM_EXIT_HLT              = 5,
 	KVM_EXIT_MMIO             = 6,
 	KVM_EXIT_IRQ_WINDOW_OPEN  = 7,
 	KVM_EXIT_SHUTDOWN         = 8,
+	KVM_EXIT_FAIL_ENTRY       = 9,
+	KVM_EXIT_INTR             = 10,
 };
 
-/* for KVM_RUN */
+/* for KVM_RUN, returned by mmap(vcpu_fd, offset=0) */
 struct kvm_run {
 	/* in */
-	__u32 emulated;  /* skip current instruction */
-	__u32 mmio_completed; /* mmio request completed */
+	__u32 io_completed; /* mmio/pio request completed */
 	__u8 request_interrupt_window;
-	__u8 padding1[7];
+	__u8 padding1[3];
 
 	/* out */
-	__u32 exit_type;
 	__u32 exit_reason;
 	__u32 instruction_length;
 	__u8 ready_for_interrupt_injection;
 	__u8 if_flag;
-	__u16 padding2;
+	__u8 padding2[6];
 
 	/* in (pre_kvm_run), out (post_kvm_run) */
 	__u64 cr8;
@@ -72,29 +76,26 @@
 	union {
 		/* KVM_EXIT_UNKNOWN */
 		struct {
-			__u32 hardware_exit_reason;
+			__u64 hardware_exit_reason;
 		} hw;
+		/* KVM_EXIT_FAIL_ENTRY */
+		struct {
+			__u64 hardware_entry_failure_reason;
+		} fail_entry;
 		/* KVM_EXIT_EXCEPTION */
 		struct {
 			__u32 exception;
 			__u32 error_code;
 		} ex;
 		/* KVM_EXIT_IO */
-		struct {
+		struct kvm_io {
 #define KVM_EXIT_IO_IN  0
 #define KVM_EXIT_IO_OUT 1
 			__u8 direction;
 			__u8 size; /* bytes */
-			__u8 string;
-			__u8 string_down;
-			__u8 rep;
-			__u8 pad;
 			__u16 port;
-			__u64 count;
-			union {
-				__u64 address;
-				__u32 value;
-			};
+			__u32 count;
+			__u64 data_offset; /* relative to kvm_run start */
 		} io;
 		struct {
 		} debug;
@@ -105,6 +106,13 @@
 			__u32 len;
 			__u8  is_write;
 		} mmio;
+		/* KVM_EXIT_HYPERCALL */
+		struct {
+			__u64 args[6];
+			__u64 ret;
+			__u32 longmode;
+			__u32 pad;
+		} hypercall;
 	};
 };
 
@@ -118,6 +126,21 @@
 	__u64 rip, rflags;
 };
 
+/* for KVM_GET_FPU and KVM_SET_FPU */
+struct kvm_fpu {
+	__u8  fpr[8][16];
+	__u16 fcw;
+	__u16 fsw;
+	__u8  ftwx;  /* in fxsave format */
+	__u8  pad1;
+	__u16 last_opcode;
+	__u64 last_ip;
+	__u64 last_dp;
+	__u8  xmm[16][16];
+	__u32 mxcsr;
+	__u32 pad2;
+};
+
 struct kvm_segment {
 	__u64 base;
 	__u32 limit;
@@ -210,38 +233,74 @@
 	};
 };
 
+struct kvm_cpuid_entry {
+	__u32 function;
+	__u32 eax;
+	__u32 ebx;
+	__u32 ecx;
+	__u32 edx;
+	__u32 padding;
+};
+
+/* for KVM_SET_CPUID */
+struct kvm_cpuid {
+	__u32 nent;
+	__u32 padding;
+	struct kvm_cpuid_entry entries[0];
+};
+
+/* for KVM_SET_SIGNAL_MASK */
+struct kvm_signal_mask {
+	__u32 len;
+	__u8  sigset[0];
+};
+
 #define KVMIO 0xAE
 
 /*
  * ioctls for /dev/kvm fds:
  */
-#define KVM_GET_API_VERSION       _IO(KVMIO, 1)
-#define KVM_CREATE_VM             _IO(KVMIO, 2) /* returns a VM fd */
-#define KVM_GET_MSR_INDEX_LIST    _IOWR(KVMIO, 15, struct kvm_msr_list)
+#define KVM_GET_API_VERSION       _IO(KVMIO,   0x00)
+#define KVM_CREATE_VM             _IO(KVMIO,   0x01) /* returns a VM fd */
+#define KVM_GET_MSR_INDEX_LIST    _IOWR(KVMIO, 0x02, struct kvm_msr_list)
+/*
+ * Check if a kvm extension is available.  Argument is extension number,
+ * return is 1 (yes) or 0 (no, sorry).
+ */
+#define KVM_CHECK_EXTENSION       _IO(KVMIO,   0x03)
+/*
+ * Get size for mmap(vcpu_fd)
+ */
+#define KVM_GET_VCPU_MMAP_SIZE    _IO(KVMIO,   0x04) /* in bytes */
 
 /*
  * ioctls for VM fds
  */
-#define KVM_SET_MEMORY_REGION     _IOW(KVMIO, 10, struct kvm_memory_region)
+#define KVM_SET_MEMORY_REGION     _IOW(KVMIO, 0x40, struct kvm_memory_region)
 /*
  * KVM_CREATE_VCPU receives as a parameter the vcpu slot, and returns
  * a vcpu fd.
  */
-#define KVM_CREATE_VCPU           _IOW(KVMIO, 11, int)
-#define KVM_GET_DIRTY_LOG         _IOW(KVMIO, 12, struct kvm_dirty_log)
+#define KVM_CREATE_VCPU           _IO(KVMIO,  0x41)
+#define KVM_GET_DIRTY_LOG         _IOW(KVMIO, 0x42, struct kvm_dirty_log)
+#define KVM_SET_MEMORY_ALIAS      _IOW(KVMIO, 0x43, struct kvm_memory_alias)
 
 /*
  * ioctls for vcpu fds
  */
-#define KVM_RUN                   _IOWR(KVMIO, 2, struct kvm_run)
-#define KVM_GET_REGS              _IOR(KVMIO, 3, struct kvm_regs)
-#define KVM_SET_REGS              _IOW(KVMIO, 4, struct kvm_regs)
-#define KVM_GET_SREGS             _IOR(KVMIO, 5, struct kvm_sregs)
-#define KVM_SET_SREGS             _IOW(KVMIO, 6, struct kvm_sregs)
-#define KVM_TRANSLATE             _IOWR(KVMIO, 7, struct kvm_translation)
-#define KVM_INTERRUPT             _IOW(KVMIO, 8, struct kvm_interrupt)
-#define KVM_DEBUG_GUEST           _IOW(KVMIO, 9, struct kvm_debug_guest)
-#define KVM_GET_MSRS              _IOWR(KVMIO, 13, struct kvm_msrs)
-#define KVM_SET_MSRS              _IOW(KVMIO, 14, struct kvm_msrs)
+#define KVM_RUN                   _IO(KVMIO,   0x80)
+#define KVM_GET_REGS              _IOR(KVMIO,  0x81, struct kvm_regs)
+#define KVM_SET_REGS              _IOW(KVMIO,  0x82, struct kvm_regs)
+#define KVM_GET_SREGS             _IOR(KVMIO,  0x83, struct kvm_sregs)
+#define KVM_SET_SREGS             _IOW(KVMIO,  0x84, struct kvm_sregs)
+#define KVM_TRANSLATE             _IOWR(KVMIO, 0x85, struct kvm_translation)
+#define KVM_INTERRUPT             _IOW(KVMIO,  0x86, struct kvm_interrupt)
+#define KVM_DEBUG_GUEST           _IOW(KVMIO,  0x87, struct kvm_debug_guest)
+#define KVM_GET_MSRS              _IOWR(KVMIO, 0x88, struct kvm_msrs)
+#define KVM_SET_MSRS              _IOW(KVMIO,  0x89, struct kvm_msrs)
+#define KVM_SET_CPUID             _IOW(KVMIO,  0x8a, struct kvm_cpuid)
+#define KVM_SET_SIGNAL_MASK       _IOW(KVMIO,  0x8b, struct kvm_signal_mask)
+#define KVM_GET_FPU               _IOR(KVMIO,  0x8c, struct kvm_fpu)
+#define KVM_SET_FPU               _IOW(KVMIO,  0x8d, struct kvm_fpu)
 
 #endif


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3079
retrieving revision 1.3080
diff -u -r1.3079 -r1.3080
--- kernel-2.6.spec	16 Apr 2007 22:27:52 -0000	1.3079
+++ kernel-2.6.spec	17 Apr 2007 04:05:33 -0000	1.3080
@@ -551,6 +551,7 @@
 Patch1601: linux-2.6-sha_alignment.patch
 Patch1610: linux-2.6-input-kill-stupid-messages.patch
 Patch1620: linux-2.6-ondemand-timer.patch
+Patch1630: linux-2.6-kvm-19.patch
 Patch1650: linux-2.6-serial-460800.patch
 Patch1681: linux-2.6-xfs-umount-fix.patch
 Patch1690: linux-2.6-PT_LOAD-align.patch
@@ -1250,6 +1251,8 @@
 %patch1610 -p1
 # don't wakeup ondemand timer whilst idle.
 %patch1620 -p1
+# Update KVM.
+%patch1630 -p1
 # Allow to use 480600 baud on 16C950 UARTs
 %patch1650 -p1
 # Fix XFS umount bug.
@@ -2303,6 +2306,9 @@
 #  - tux.
 
 %changelog
+* Tue Apr 17 2007 Dave Jones <davej at redhat.com>
+- Update KVM to v19
+
 * Mon Apr 16 2007 Dave Jones <davej at redhat.com>
 - libata HPA support.
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 04:14:44 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 00:14:44 -0400
Subject: rpms/kernel/FC-3-kprobe linux-2.6.9-NFSD-putrootfh-return.patch,
	1.1.1.1, NONE
Message-ID: <200704170414.l3H4EisV006978@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-3-kprobe
In directory cvs.devel.redhat.com:/tmp/cvs-serv6943

Removed Files:
	linux-2.6.9-NFSD-putrootfh-return.patch 
Log Message:
dead


--- linux-2.6.9-NFSD-putrootfh-return.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 17 07:36:15 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 03:36:15 -0400
Subject: rpms/gtk-sharp2/devel gtk-sharp2.spec,1.20,1.21
Message-ID: <200704170736.l3H7aFC3028123@cvs.devel.redhat.com>

Author: alexl

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

Modified Files:
	gtk-sharp2.spec 
Log Message:
* Tue Apr 17 2007 Alexander Larsson <alexl at redhat.com> 2.10.0-4
- Rebuild (#236295)



Index: gtk-sharp2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-sharp2/devel/gtk-sharp2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gtk-sharp2.spec	12 Sep 2006 09:40:12 -0000	1.20
+++ gtk-sharp2.spec	17 Apr 2007 07:36:12 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           gtk-sharp2
 Version:        2.10.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
@@ -116,6 +116,9 @@
 %{_libdir}/monodoc
 
 %changelog
+* Tue Apr 17 2007 Alexander Larsson <alexl at redhat.com> 2.10.0-4
+- Rebuild (#236295)
+
 * Tue Sep 12 2006 Alexander Larsson <alexl at redhat.com> - 2.10.0-3
 - Add -doc subpackage with the monodoc docs (#205561)
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 08:10:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 04:10:45 -0400
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.96,1.97
Message-ID: <200704170810.l3H8AjEe025465@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdegraphics.spec 
Log Message:
cleanup



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- kdegraphics.spec	7 Feb 2007 15:28:36 -0000	1.96
+++ kdegraphics.spec	17 Apr 2007 08:10:38 -0000	1.97
@@ -1,22 +1,11 @@
 %define rhel 0
-
 %define debug 0
 %define final 0
 
-%define kdelibs_epoch 6
-%define kdebase_epoch 6
-
-%define kpovmodeler 0
-%define kfract 0
-%define arts 1
 %define make_cvs 1
 
-%define appdir %{_datadir}/applications/kde
-
-%define no_scanner_archs s390 s390x
-
 Version: 3.5.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
@@ -31,48 +20,56 @@
 Patch3: kdegraphics-3.5.1-warning.patch
 Patch4: kdegraphics-3.5.2-kpdf-xft.patch
 
-%ifnarch %{no_scanner_archs}
-BuildRequires: sane-backends-devel >= 1.0.3-10
+Requires: kdelibs >= 6:%{version}
+Requires: ghostscript
+Requires: ghostscript-fonts
+
+%ifnarch s390 s390x
+%define kamera 1
 BuildRequires: gphoto2-devel
-BuildRequires: libexif-devel
+%define kooka 1
+BuildRequires: sane-backends-devel
+BuildRequires: libusb-devel
 %endif
 
-%if %{kpovmodeler}
-BuildRequires: freeglut-devel
-%endif
-BuildRequires: kdebase-devel
-BuildRequires: fribidi-devel 
-BuildRequires: libieee1284-devel
-BuildRequires: libXxf86vm-devel
+# kpdf
 BuildRequires: freetype-devel
+BuildRequires: poppler-qt-devel
+BuildRequires: libXxf86vm-devel
+
+# ksvg
+BuildRequires: fontconfig-devel
+BuildRequires: fribidi-devel
 BuildRequires: lcms-devel
 BuildRequires: libart_lgpl-devel
+BuildRequires: libXmu-devel
+
+%if !%{rhel}
+BuildRequires: freeglut-devel
+%endif
+
 %if %{make_cvs}
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
 %endif
 
-Requires: kdebase >= %{kdebase_epoch}:%{version}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
+Obsoletes: kolourpaint < 0:1.4.3
+Provides:  kolourpaint = 0:1.4.3
 
 %description
-Graphics applications for the K Desktop Environment.
-
-Includes:
-  kdvi (displays TeX .dvi files)
-  kghostview (displays postscript files)
-  kcoloredit (palette editor and color chooser)
-  kiconedit (icon editor)
-  kolourpaint (a simple drawing program)
-  ksnapshot (screen capture utility)
-  kview (image viewer for GIF, JPEG, TIFF, etc.)
-  kooka (scanner application)
-  kruler (screen ruler and color measurement tool)
-  kpdf (display pdf files)
+Graphics applications for the K Desktop Environment, including
+%{?kamera:* kamera (digital camera support)}
+* kcoloredit (palette editor and color chooser)
+* kdvi (displays TeX .dvi files)
+* kfax (displays faxfiles)
+* kghostview (displays postscript files)
+* kiconedit (icon editor)
+%{?kooka:* kooka (scanner application)}
+* kpdf (displays PDF files)
+* kruler (screen ruler and color measurement tool)
+* ksnapshot (screen capture utility)
+* kview (image viewer for GIF, JPEG, TIFF, etc.)
 
 %package devel
 Summary: Development files for kdegraphics
@@ -91,12 +88,10 @@
 %patch4 -p1 -b .kpdf-xft
 
 %if %{rhel}
-  echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in
-  echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfaxview\"" >kfaxview/configure.in.in
-%endif
-
-%if !%{kpovmodeler}
-   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kpovmodeler\"" >kpovmodeler/configure.in.in
+  DO_NOT_COMPILE=""
+  export DO_NOT_COMPILE="$DO_NOT_COMPILE kfax"
+  export DO_NOT_COMPILE="$DO_NOT_COMPILE kfaxview"
+  export DO_NOT_COMPILE="$DO_NOT_COMPILE kpovmodeler"
 %endif
 
 %if %{make_cvs}
@@ -109,12 +104,8 @@
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
-   --with-qt-libraries=$QTDIR/lib \
    --disable-rpath \
    --disable-gcc-hidden-visibility \
-%if %{arts} == 0
-   --without-arts \
-%endif
 %if %{debug} == 0
    --disable-debug \
    --disable-warnings \
@@ -123,11 +114,7 @@
    --enable-final \
 %endif
    --includedir=%{_includedir}/kde \
-%ifnarch %{no_scanner_archs}
-   --with-kamera \
-%else
-   --without-kamera \
-%endif
+   %{!?kamera:--without-kamera} \
    --with-xinerama
 
 make %{?_smp_mflags}
@@ -137,68 +124,79 @@
 
 make install DESTDIR=%{buildroot}
 
-pushd %{buildroot}%{_docdir}/HTML/en
-for i in *; do
-   if [ -d $i -a -L $i/common ]; then
-      rm -f $i/common
-      ln -sf ../common $i
-   fi
+# locale's
+%find_lang %{name} || touch %{name}.lang
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
+  if [ -d $lang_dir ]; then
+    lang=$(basename $lang_dir)
+    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
+    # replace absolute symlinks with relative ones
+    pushd $lang_dir
+      for i in *; do
+        [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
+      done
+    popd
+  fi
 done
-popd
+fi
 
-for i in kcmkmrml ksnapshot ; do
-  [ -f %{buildroot}%{appdir}/$i.desktop ] && echo "OnlyShowIn=KDE;" >> %{buildroot}%{appdir}/$i.desktop
+# rpmdocs
+for dir in k* ; do
+  for file in AUTHORS ChangeLog README TODO ; do
+    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
+  done
 done
 
 %clean
 rm -rf %{buildroot}
 
 %post
-/sbin/ldconfig
-for f in crystalsvg hicolor locolor ; do
+/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 locolor ; do
+/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/*
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+%doc rpmdocs/*
 %{_bindir}/*
-%{_libdir}/libkdeinit_*.so
-%{_libdir}/libkfaximage.so
-%{_libdir}/*.so.*
-%{_libdir}/*.la
-%{_libdir}/kde3/*
-%{_datadir}/applications/kde/*
-%{_datadir}/applnk/*
+%{_datadir}/applications/kde/*.desktop
+%dir %{_datadir}/applnk/Graphics
+%{_datadir}/applnk/Graphics/*kruler.desktop
 %{_datadir}/apps/*
-%{_datadir}/config.kcfg/*
-%ifnarch %{no_scanner_archs}
-%{_datadir}/config/*
-%endif
-%{_datadir}/icons/*/*/*/*
-%{_datadir}/mimelnk/text/*
-%{_datadir}/services/*
-%{_datadir}/servicetypes/*
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%config %{_datadir}/config*/*
+%{_datadir}/service*/*
+%{_datadir}/mimelnk/*/*
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
+%{_libdir}/libkdeinit_*.*
+%{_libdir}/kde3/*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_includedir}/kde/*
-%{_libdir}/*.so
-%exclude %{_libdir}/libkdeinit_*.so
-%exclude %{_libdir}/libkfaximage.so
+%{_libdir}/lib*.so
+%exclude %{_libdir}/libkdeinit_*.*
 
 %changelog
+* Mon Mar 12 2007 Than Ngo <than at redhat.com> - 7:3.5.6-2.fc7
+- cleanup
+
 * Tue Feb 07 2007 Than Ngo <than at redhat.com> 7:3.5.6-1.fc7
 - 3.5.6
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 08:35:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 04:35:50 -0400
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.97,1.98
Message-ID: <200704170835.l3H8ZoNu010076@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdegraphics.spec 
Log Message:
cleanup



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- kdegraphics.spec	17 Apr 2007 08:10:38 -0000	1.97
+++ kdegraphics.spec	17 Apr 2007 08:35:48 -0000	1.98
@@ -1,3 +1,5 @@
+%define kpovmodeler 0
+
 %define rhel 0
 %define debug 0
 %define final 0
@@ -44,7 +46,7 @@
 BuildRequires: libart_lgpl-devel
 BuildRequires: libXmu-devel
 
-%if !%{rhel}
+%if %{kpovmodeler}
 BuildRequires: freeglut-devel
 %endif
 
@@ -184,14 +186,20 @@
 %{_datadir}/mimelnk/*/*
 %{_libdir}/lib*.so.*
 %{_libdir}/lib*.la
-%{_libdir}/libkdeinit_*.*
+%if !%{rhel}
+%{_libdir}/libkfaximage.so
+%endif
+%{_libdir}/libkdeinit_*.so
 %{_libdir}/kde3/*
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/kde/*
 %{_libdir}/lib*.so
-%exclude %{_libdir}/libkdeinit_*.*
+%exclude %{_libdir}/libkdeinit_*.so
+%if !%{rhel}
+%exclude %{_libdir}/libkfaximage.so
+%endif
 
 %changelog
 * Mon Mar 12 2007 Than Ngo <than at redhat.com> - 7:3.5.6-2.fc7



From fedora-cvs-commits at redhat.com  Tue Apr 17 08:45:16 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 04:45:16 -0400
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.98,1.99
Message-ID: <200704170845.l3H8jGpT017049@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdegraphics.spec 
Log Message:
cleanup



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- kdegraphics.spec	17 Apr 2007 08:35:48 -0000	1.98
+++ kdegraphics.spec	17 Apr 2007 08:45:14 -0000	1.99
@@ -26,6 +26,13 @@
 Requires: ghostscript
 Requires: ghostscript-fonts
 
+BuildRequires: gettext
+BuildRequires: kdelibs-devel >= 6:%{version}
+BuildRequires: libmng-devel
+BuildRequires: libtiff-devel
+BuildRequires: libungif-devel
+BuildRequires: libpng-devel
+
 %ifnarch s390 s390x
 %define kamera 1
 BuildRequires: gphoto2-devel



From fedora-cvs-commits at redhat.com  Tue Apr 17 08:50:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 04:50:43 -0400
Subject: rpms/hplip/devel hplip.spec,1.124,1.125
Message-ID: <200704170850.l3H8ohis021069@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
* Tue Apr 17 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-8
- Update desktop database on %postun as well (bug #236163).
- Resolves: rhbz#236163



Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- hplip.spec	16 Apr 2007 10:22:09 -0000	1.124
+++ hplip.spec	17 Apr 2007 08:50:36 -0000	1.125
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 1.7.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -50,7 +50,8 @@
 Group: Applications/System
 License: BSD
 Requires: PyQt
-Requires: desktop-file-utils >= 0.2.92
+Requires(post): desktop-file-utils >= 0.2.92
+Requires(postun): desktop-file-utils >= 0.2.92
 Requires: %{name} = %{version}-%{release}
 
 %description gui
@@ -270,6 +271,9 @@
 %post gui
 /usr/bin/update-desktop-database &>/dev/null ||:
 
+%postun gui
+/usr/bin/update-desktop-database &>/dev/null ||:
+
 %post -n libsane-hpaio
 /sbin/ldconfig
 if [ -f /etc/sane.d/dll.conf ] && \
@@ -279,6 +283,9 @@
 exit 0
 
 %changelog
+* Tue Apr 17 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-8
+- Update desktop database on %%postun as well (bug #236163).
+
 * Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-7
 - Some parts can run without GUI support after all (bug #236161).
 - Added /sbin/service and /sbin/chkconfig requirements for the scriptlets



From fedora-cvs-commits at redhat.com  Tue Apr 17 08:52:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 04:52:47 -0400
Subject: rpms/ppc64-utils/devel ppc64-utils.spec, 1.24, 1.25 sources, 1.12,
	1.13
Message-ID: <200704170852.l3H8qlK7022550@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	ppc64-utils.spec sources 
Log Message:
fix PS3 ROM boot


Index: ppc64-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/ppc64-utils/devel/ppc64-utils.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ppc64-utils.spec	8 Apr 2007 04:37:24 -0000	1.24
+++ ppc64-utils.spec	17 Apr 2007 08:52:45 -0000	1.25
@@ -5,7 +5,7 @@
 Summary: Linux/PPC64 specific utilities
 Name: ppc64-utils
 Version: 0.11
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL and OSL
 Group: System Environment/Base
 Source0: http://powerpc-utils.ozlabs.org/releases/powerpc-utils-%{powerpcutilsver}.tar.gz
@@ -94,6 +94,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Mon Apr 16 2007 David Woodhouse <dwmw2 at redhat.com> - 0.11-4
+- Fix handling of PS3 secondary PPU in bootwrapper
+
 * Sun Apr  8 2007 David Woodhouse <dwmw2 at redhat.com> - 0.11-3
 - Update kernel bootwrapper magic
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ppc64-utils/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	8 Apr 2007 04:45:58 -0000	1.12
+++ sources	17 Apr 2007 08:52:45 -0000	1.13
@@ -4,4 +4,4 @@
 19ae37d109ccafa4feeb714925b022b1  powerpc-utils-papr-1.0.3.tar.gz
 0a7cccf1de3287e669898e3f41cddf3e  ps3pf_utils-1.0.9.tar.bz2
 787839c782f8ab9812903cfb501455c8  ps3.dtb
-d25ea5cbe4da2528781bf8be284de3ad  zImage-wrapper.tar.gz
+cbef15544b5335e8a646d497456f3313  zImage-wrapper.tar.gz



From fedora-cvs-commits at redhat.com  Tue Apr 17 08:59:56 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 04:59:56 -0400
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.99,1.100
Message-ID: <200704170859.l3H8xuUZ027972@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdegraphics.spec 
Log Message:
cleanup



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- kdegraphics.spec	17 Apr 2007 08:45:14 -0000	1.99
+++ kdegraphics.spec	17 Apr 2007 08:59:54 -0000	1.100
@@ -55,6 +55,7 @@
 
 %if %{kpovmodeler}
 BuildRequires: freeglut-devel
+BuildRequires: libXi-devel
 %endif
 
 %if %{make_cvs}



From fedora-cvs-commits at redhat.com  Tue Apr 17 09:12:46 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 05:12:46 -0400
Subject: rpms/scim-tables/devel scim-tables.spec,1.33,1.34
Message-ID: <200704170912.l3H9CkRF004899@cvs.devel.redhat.com>

Author: petersen

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

Modified Files:
	scim-tables.spec 
Log Message:
make the main package own the tables directory (#226399)



Index: scim-tables.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-tables/devel/scim-tables.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- scim-tables.spec	27 Mar 2007 03:58:07 -0000	1.33
+++ scim-tables.spec	17 Apr 2007 09:12:44 -0000	1.34
@@ -6,7 +6,7 @@
 
 Name:           scim-tables
 Version:        0.5.7
-Release:        2.1%{?dist}
+Release:        3%{?dist}
 Summary:        SCIM Generic Table IMEngine
 
 License:        GPL
@@ -236,19 +236,18 @@
 %{_libdir}/scim-1.0/*/IMEngine/table.so
 %{_libdir}/scim-1.0/*/SetupUI/table-imengine-setup.so
 %{_datadir}/scim/icons/table.png
+%dir %{_datadir}/scim/tables
 %{_mandir}/man1/scim-make-table.1*
 
 
 %files amharic
 %defattr(-, root, root, -)
-%dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/Amharic.bin
 %{_datadir}/scim/icons/Amharic.png
 
 
 %files arabic
 %defattr(-, root, root, -)
-%dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/Arabic.bin
 %{_datadir}/scim/icons/Arabic.png
 
@@ -256,7 +255,6 @@
 %if %{indic_tables}
 %files bengali
 %defattr(-, root, root, -)
-%dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/Bengali-inscript.bin
 %{_datadir}/scim/tables/Bengali-probhat.bin
 %{_datadir}/scim/icons/Bengali-inscript.png
@@ -266,7 +264,6 @@
 %files chinese
 %defattr(-, root, root, -)
 %doc tables/zh/README-*.txt
-%dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/Array30.bin
 %{_datadir}/scim/tables/CNS11643.bin
 %{_datadir}/scim/tables/CangJie*.bin
@@ -306,7 +303,6 @@
 %if %{indic_tables}
 %files gujarati
 %defattr(-, root, root, -)
-%dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/Gujarati-inscript.bin
 %{_datadir}/scim/tables/Gujarati-phonetic.bin
 %{_datadir}/scim/icons/Gujarati-inscript.png
@@ -314,7 +310,6 @@
 
 %files hindi
 %defattr(-, root, root, -)
-%dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/Hindi-inscript.bin
 %{_datadir}/scim/tables/Hindi-phonetic.bin
 %{_datadir}/scim/icons/Hindi-inscript.png
@@ -325,7 +320,6 @@
 %files japanese
 %defattr(-, root, root, -)
 %doc tables/ja/kanjidic*
-%dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/HIRAGANA.bin
 %{_datadir}/scim/tables/KATAKANA.bin
 %{_datadir}/scim/tables/Nippon.bin
@@ -338,7 +332,6 @@
 %if %{indic_tables}
 %files kannada
 %defattr(-, root, root, -)
-%dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/Kannada-inscript.bin
 %{_datadir}/scim/tables/Kannada-kgp.bin
 %{_datadir}/scim/icons/Kannada-inscript.png
@@ -348,7 +341,6 @@
 %if %{jk_tables}
 %files korean
 %defattr(-, root, root, -)
-%dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/Hangul.bin
 %{_datadir}/scim/tables/HangulRomaja.bin
 %{_datadir}/scim/tables/Hanja.bin
@@ -360,14 +352,12 @@
 %if %{indic_tables}
 %files malayalam
 %defattr(-, root, root, -)
-%dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/Malayalam-inscript.bin
 %{_datadir}/scim/icons/Malayalam-inscript.png
 %endif
 
 %files nepali
 %defattr(-, root, root, -)
-%dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/Nepali_*.bin
 %{_datadir}/scim/icons/Nepali.png
 
@@ -375,7 +365,6 @@
 %if %{indic_tables}
 %files punjabi
 %defattr(-, root, root, -)
-%dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/Punjabi-inscript.bin
 %{_datadir}/scim/tables/Punjabi-jhelum.bin
 %{_datadir}/scim/tables/Punjabi-phonetic.bin
@@ -387,7 +376,6 @@
 
 %files russian
 %defattr(-, root, root, -)
-%dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/Yawerty.bin
 %{_datadir}/scim/icons/Yawerty.png
 
@@ -395,7 +383,6 @@
 %if %{indic_tables}
 %files tamil
 %defattr(-, root, root, -)
-%dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/Tamil-inscript.bin
 %{_datadir}/scim/tables/Tamil-phonetic.bin
 %{_datadir}/scim/icons/Tamil-inscript.png
@@ -405,7 +392,6 @@
 
 %files thai
 %defattr(-, root, root, -)
-%dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/Thai.bin
 %{_datadir}/scim/icons/Thai.png
 
@@ -413,7 +399,6 @@
 %if %{indic_tables}
 %files telugu
 %defattr(-, root, root, -)
-%dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/Telugu-inscript.bin
 %{_datadir}/scim/icons/Telugu-inscript.png
 %endif
@@ -421,14 +406,12 @@
 
 %files vietnamese
 %defattr(-, root, root, -)
-%dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/Viqr.bin
 %{_datadir}/scim/icons/Viqr.png
 
 
 %files additional
 %defattr(-, root, root, -)
-%dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/IPA-X-SAMPA.bin
 %{_datadir}/scim/tables/LaTeX.bin
 %{_datadir}/scim/icons/IPA-X-SAMPA.png
@@ -436,6 +419,9 @@
 
 
 %changelog
+* Tue Apr 17 2007 Jens Petersen <petersen at redhat.com> - 0.5.7-3
+- make the main package own the tables directory (#226399)
+
 * Tue Mar 27 2007 Caius Chance <cchance at redhat.com> - 0.5.7-2.1
 - Fixed bz#226399: Merge Review, scim-tables.
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 09:22:20 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 05:22:20 -0400
Subject: rpms/sound-juicer/devel .cvsignore, 1.31, 1.32 sound-juicer.spec,
	1.69, 1.70 sources, 1.33, 1.34
Message-ID: <200704170922.l3H9MKep011839@cvs.devel.redhat.com>

Author: bnocera

Update of /cvs/dist/rpms/sound-juicer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11644

Modified Files:
	.cvsignore sound-juicer.spec sources 
Log Message:
* Tue Apr 17 2007 - Bastien Nocera <bnocera at redhat.com> - 2.16.4-1
- Update to 2.16.4 to get xdg-users-dir support, fix #236658, and
  follow the device selection in the control-center



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	20 Feb 2007 11:14:57 -0000	1.31
+++ .cvsignore	17 Apr 2007 09:22:18 -0000	1.32
@@ -1,2 +1 @@
-sound-juicer-2.16.2.tar.bz2
-sound-juicer-2.16.3.tar.bz2
+sound-juicer-2.16.4.tar.bz2


Index: sound-juicer.spec
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sound-juicer.spec	20 Feb 2007 11:21:23 -0000	1.69
+++ sound-juicer.spec	17 Apr 2007 09:22:18 -0000	1.70
@@ -12,7 +12,7 @@
 
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
-Version:	2.16.3
+Version:	2.16.4
 Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Multimedia
@@ -120,6 +120,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Apr 17 2007 - Bastien Nocera <bnocera at redhat.com> - 2.16.4-1
+- Update to 2.16.4 to get xdg-users-dir support, fix #236658, and
+  follow the device selection in the control-center
+
 * Tue Feb 20 2007 - Bastien Nocera <bnocera at redhat.com> - 2.16.3-1
 - Update to 2.16.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	20 Feb 2007 11:14:57 -0000	1.33
+++ sources	17 Apr 2007 09:22:18 -0000	1.34
@@ -1 +1 @@
-cfe4199f4f50c2a8f8178db4097209e4  sound-juicer-2.16.3.tar.bz2
+bcf1f77027b1d1d4c1667b20c6448122  sound-juicer-2.16.4.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 17 09:25:17 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 05:25:17 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.2.0.ooo68717.gstreamer.video.patch, 1.1, 1.2
Message-ID: <200704170925.l3H9PH7A014147@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 
Log Message:
remove printf

openoffice.org-2.2.0.ooo68717.gstreamer.video.patch:
 Source/avmedia/prj/build.lst                             |    3 
 Source/avmedia/source/gstreamer/exports.dxp              |    4 
 Source/avmedia/source/gstreamer/gstcommon.hxx            |   83 +
 Source/avmedia/source/gstreamer/gstframegrabber.cxx      |  244 +++++
 Source/avmedia/source/gstreamer/gstframegrabber.hxx      |   78 +
 Source/avmedia/source/gstreamer/gstmanager.cxx           |  114 ++
 Source/avmedia/source/gstreamer/gstmanager.hxx           |   74 +
 Source/avmedia/source/gstreamer/gstplayer.cxx            |  628 +++++++++++++++
 Source/avmedia/source/gstreamer/gstplayer.hxx            |  120 ++
 Source/avmedia/source/gstreamer/gstuno.cxx               |  111 ++
 Source/avmedia/source/gstreamer/gstwindow.cxx            |  365 ++++++++
 Source/avmedia/source/gstreamer/gstwindow.hxx            |  119 ++
 Source/avmedia/source/gstreamer/makefile.mk              |   85 ++
 Source/avmedia/source/inc/mediamisc.hxx                  |    5 
 Source/avmedia/source/viewer/mediawindow.cxx             |    2 
 Source/avmedia/source/viewer/mediawindow_impl.cxx        |   50 +
 Source/avmedia/source/viewer/mediawindow_impl.hxx        |    8 
 Source/scp2/source/ooo/file_library_ooo.scp              |    4 
 Source/scp2/source/ooo/module_hidden_ooo.scp             |    1 
 Source/sd/source/ui/animations/CustomAnimationDialog.cxx |    4 
 Source/slideshow/source/engine/soundplayer.cxx           |    5 
 Source/slideshow/source/engine/viewmediashape.cxx        |   41 
 Source/slideshow/source/inc/viewmediashape.hxx           |    5 
 Source/solenv/inc/settings.mk                            |    4 
 Source/svtools/inc/inettype.hxx                          |    4 
 Source/svtools/inc/svtools.hrc                           |  210 ++---
 Source/svtools/source/misc1/inettype.cxx                 |    5 
 Source/svtools/source/misc1/mediatyp.src                 |   14 
 Source/vcl/inc/salobj.hxx                                |    2 
 Source/vcl/inc/syschild.hxx                              |    1 
 Source/vcl/source/window/syschild.cxx                    |    6 
 Source/vcl/unx/gtk/window/gtkobject.cxx                  |    8 
 Source/vcl/unx/inc/plugins/gtk/gtkobject.hxx             |    2 
 configure.in                                             |   25 
 set_soenv.in                                             |    1 
 35 files changed, 2323 insertions(+), 112 deletions(-)

Index: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo68717.gstreamer.video.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.2.0.ooo68717.gstreamer.video.patch	27 Feb 2007 15:16:21 -0000	1.1
+++ openoffice.org-2.2.0.ooo68717.gstreamer.video.patch	17 Apr 2007 09:25:15 -0000	1.2
@@ -2193,14 +2193,13 @@
 diff -u -r1.11 gtkobject.cxx
 --- Source/vcl/unx/gtk/window/gtkobject.cxx	6 Oct 2006 10:00:15 -0000	1.11
 +++ Source/vcl/unx/gtk/window/gtkobject.cxx	26 Feb 2007 16:00:33 -0000
-@@ -214,3 +214,12 @@
+@@ -214,3 +214,11 @@
          pThis->m_pSocket = NULL;
      }
  }
 +
 +void GtkSalObject::SetForwardKey( BOOL bEnable )
 +{
-+    printf ("GtkSalObject::SetForwardKey\n");
 +    if( bEnable )
 +        gtk_widget_add_events( GTK_WIDGET( m_pSocket ), GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE );
 +    else



From fedora-cvs-commits at redhat.com  Tue Apr 17 09:42:17 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 05:42:17 -0400
Subject: rpms/libvirt/devel .cvsignore, 1.19, 1.20 libvirt.spec, 1.51,
	1.52 sources, 1.20, 1.21 libvirt-0.2.0-Werror.patch, 1.1,
	NONE libvirt-0.2.0-config-load.patch, 1.1,
	NONE libvirt-0.2.0-disable-kqemu.patch, 1.1,
	NONE libvirt-0.2.0-qemu-fixes.patch, 1.1,
	NONE libvirt-0.2.0-vnc-port.patch, 1.1,
	NONE libvirt-xendconfig-2.patch, 1.1, NONE
Message-ID: <200704170942.l3H9gHEJ017285@cvs.devel.redhat.com>

Author: veillard

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

Modified Files:
	.cvsignore libvirt.spec sources 
Removed Files:
	libvirt-0.2.0-Werror.patch libvirt-0.2.0-config-load.patch 
	libvirt-0.2.0-disable-kqemu.patch 
	libvirt-0.2.0-qemu-fixes.patch libvirt-0.2.0-vnc-port.patch 
	libvirt-xendconfig-2.patch 
Log Message:
Upstream release 0.2.2 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	16 Mar 2007 19:44:21 -0000	1.19
+++ .cvsignore	17 Apr 2007 09:42:15 -0000	1.20
@@ -16,3 +16,4 @@
 libvirt-0.1.11.tar.gz
 libvirt-0.2.0.tar.gz
 libvirt-0.2.1.tar.gz
+libvirt-0.2.2.tar.gz


Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- libvirt.spec	26 Mar 2007 09:42:53 -0000	1.51
+++ libvirt.spec	17 Apr 2007 09:42:15 -0000	1.52
@@ -8,8 +8,8 @@
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.2.1
-Release: 3%{?_extra_release}
+Version: 0.2.2
+Release: 1%{?_extra_release}
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -126,6 +126,7 @@
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/
+%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart
 %{_sysconfdir}/rc.d/init.d/libvirtd
 %dir %{_sysconfdir}/libvirt
 %dir %{_sysconfdir}/libvirt/qemu
@@ -168,15 +169,17 @@
 %doc docs/examples/python
 
 %changelog
-* Mon Mar 26 2007 Daniel Veillard <veillard at redhat.com> - 2.0.1-3.fc7
-- add missing directory ownership fixes rhbz#233874
+* Tue Apr 17 2007 Daniel Veillard <veillard at redhat.com> - 0.2.2-1.fc7
+- Release of 0.2.2
+- lot of assorted bugfixes and cleanups
+- preparing for Xen-3.0.5
 
 * Thu Mar 22 2007 Jeremy Katz <katzj at redhat.com> - 0.2.1-2.fc7
 - don't require xen; we don't need the daemon and can control non-xen now
 - fix scriptlet error (need to own more directories)
 - update description text
 
-* Fri Mar 16 2007 Daniel Veillard <veillard at redhat.com> - 2.0.1-1.fc7
+* Fri Mar 16 2007 Daniel Veillard <veillard at redhat.com> - 0.2.1-1.fc7
 - Release of 0.2.1
 - lot of bug and portability fixes
 - Add support for network autostart and init scripts


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	16 Mar 2007 19:44:21 -0000	1.20
+++ sources	17 Apr 2007 09:42:15 -0000	1.21
@@ -1 +1 @@
-c5ff72800c3540d486489fec2df737b3  libvirt-0.2.1.tar.gz
+5abe4b1fd6b57948ce259036afdc9194  libvirt-0.2.2.tar.gz


--- libvirt-0.2.0-Werror.patch DELETED ---


--- libvirt-0.2.0-config-load.patch DELETED ---


--- libvirt-0.2.0-disable-kqemu.patch DELETED ---


--- libvirt-0.2.0-qemu-fixes.patch DELETED ---


--- libvirt-0.2.0-vnc-port.patch DELETED ---


--- libvirt-xendconfig-2.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 17 10:05:25 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 06:05:25 -0400
Subject: rpms/ghostscript/devel CIDFnmap, 1.2,
	1.3 ghostscript-Fontmap.local.patch, NONE, 1.1 FAPIcidfmap,
	1.1, 1.2 cidfmap, 1.1, 1.2 ghostscript.spec, 1.135, 1.136
Message-ID: <200704171005.l3HA5Pr8017652@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17634

Modified Files:
	FAPIcidfmap cidfmap ghostscript.spec 
Added Files:
	CIDFnmap ghostscript-Fontmap.local.patch 
Log Message:
* Tue Apr 17 2007 Tim Waugh <twaugh at redhat.com> 8.15.4-3
- New file CIDFmap (bug #233966).
- Allow local overrides for FAPIcidfmap, cidfmap and Fontmap (bug #233966).
- Resolves: rhbz#233966 rhbz#233966



Index: CIDFnmap
===================================================================
RCS file: CIDFnmap
diff -N CIDFnmap
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ CIDFnmap	17 Apr 2007 10:05:22 -0000	1.3
@@ -0,0 +1,9 @@
+%!
+% following lines are for CJK fonts.
+(CIDFnmap.ja) .runlibfileifexists
+(CIDFnmap.ko) .runlibfileifexists
+(CIDFnmap.zh_CN) .runlibfileifexists
+(CIDFnmap.zh_TW) .runlibfileifexists
+% must be at the bottom of line to allow people overriding everything.
+(CIDFnmap.local) .runlibfileifexists
+

ghostscript-Fontmap.local.patch:
 Fontmap |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE ghostscript-Fontmap.local.patch ---
--- espgs-8.15.4/lib/Fontmap.Fontmap.local	2007-04-17 11:02:58.000000000 +0100
+++ espgs-8.15.4/lib/Fontmap	2007-04-17 11:03:16.000000000 +0100
@@ -2,3 +2,5 @@
 % See Fontmap.GS for the syntax of real Fontmap files.
 %% Replace 1 (Fontmap.GS)
 (Fontmap.GS) .runlibfile
+% must be at the bottom of line to allow people overriding everything.
+(Fontmap.local) .runlibfileifexists


Index: FAPIcidfmap
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/FAPIcidfmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FAPIcidfmap	13 Jul 2005 13:29:36 -0000	1.1
+++ FAPIcidfmap	17 Apr 2007 10:05:22 -0000	1.2
@@ -6,3 +6,5 @@
 (FAPIcidfmap.ko) .runlibfileifexists
 (FAPIcidfmap.zh_CN) .runlibfileifexists
 (FAPIcidfmap.zh_TW) .runlibfileifexists
+% must be at the bottom of line to allow people overriding everything.
+(FAPIcidfmap.local) .runlibfileifexists


Index: cidfmap
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/cidfmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cidfmap	15 Aug 2005 12:18:44 -0000	1.1
+++ cidfmap	17 Apr 2007 10:05:22 -0000	1.2
@@ -6,3 +6,5 @@
 (cidfmap.ko) .runlibfileifexists
 (cidfmap.zh_CN) .runlibfileifexists
 (cidfmap.zh_TW) .runlibfileifexists
+% must be at the bottom of line to allow people overriding everything.
+(cidfmap.local) .runlibfileifexists


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- ghostscript.spec	3 Apr 2007 13:39:01 -0000	1.135
+++ ghostscript.spec	17 Apr 2007 10:05:22 -0000	1.136
@@ -5,13 +5,14 @@
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 URL: http://www.cups.org/espgs/
 Group: Applications/Publishing
 Source0: ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/%{?gs_rc:test/}espgs-%{gs_ver}%{?gs_rc:gs_rc}-source.tar.bz2
 Source1: FAPIcidfmap
+Source2: CIDFnmap
 Source4: cidfmap
 
 Patch1: ghostscript-multilib.patch
@@ -21,6 +22,7 @@
 Patch5: ghostscript-split-cidfnmap.patch
 Patch6: ghostscript-gxcht-64bit-crash.patch
 Patch7: ghostscript-dvipdf.patch
+Patch8: ghostscript-Fontmap.local.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: libjpeg-devel, libXt-devel
@@ -95,6 +97,9 @@
 # dvipdf script fixes (bug #88906).
 %patch7 -p1 -b .dvipdf
 
+# Allow local overrides for Fontmap (bug #233966).
+%patch8 -p1 -b .Fontmap.local
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -174,6 +179,7 @@
 # Install our own FAPIcidfmap/cidfmap to allow the separated
 # FAPIcidfmap/cidfmap which the font packages own.
 install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/lib/FAPIcidfmap
+install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/lib/CIDFnmap
 install -m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/lib/cidfmap
 
 # Don't ship sysvlp.sh.
@@ -262,6 +268,10 @@
 %{_libdir}/libgs.so
 
 %changelog
+* Tue Apr 17 2007 Tim Waugh <twaugh at redhat.com> 8.15.4-3
+- New file CIDFmap (bug #233966).
+- Allow local overrides for FAPIcidfmap, cidfmap and Fontmap (bug #233966).
+
 * Tue Apr  3 2007 Tim Waugh <twaugh at redhat.com> 8.15.4-2
 - Fixed configuration file locations (bug #233966).
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 10:11:05 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 06:11:05 -0400
Subject: rpms/netatalk/devel netatalk-2.0.3-wrong_script_interpreter.patch,
	NONE, 1.1 netatalk.spec, 1.31, 1.32
Message-ID: <200704171011.l3HAB5Kh017768@cvs.devel.redhat.com>

Author: mbarabas

Update of /cvs/dist/rpms/netatalk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17752

Modified Files:
	netatalk.spec 
Added Files:
	netatalk-2.0.3-wrong_script_interpreter.patch 
Log Message:
Fixed review #226190

netatalk-2.0.3-wrong_script_interpreter.patch:
 ICDumpSuffixMap |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletion(-)

--- NEW FILE netatalk-2.0.3-wrong_script_interpreter.patch ---
--- netatalk-2.0.3/contrib/ICDumpSuffixMap.old	2007-04-17 11:19:28.000000000 +0200
+++ netatalk-2.0.3/contrib/ICDumpSuffixMap	2007-04-17 11:33:12.000000000 +0200
@@ -1 +1,25 @@
-#!perl
#
# ICDumpMap
#     ---  Dump suffix mappings from your Internet Config extension.
#
# iNOUE Koich! <inoue at ma.ns.musashi-tech.ac.jp>
#

use Mac::InternetConfig;

open MAP, ">AppleVolumes";
printf MAP "%-9s \"%4s\"  \"%4s\"      %-30s %-25s %-15s\n\n",
".", "TEXT", "ttxt", "ASCII Text", "SimpleText", "text/plain";
print MAP "\# The following lines are extracted from Internet Config Preference.\n\n";
for my $entry (keys %InternetConfigMap) {
   next unless $entry->extension =~ /^\./;
   $_ = sprintf "%-9s \"%4s\"  \"%4s\"      %-30s %-25s %-15s",
      $entry->extension, $entry->file_type, $entry->file_creator,
      $entry->entry_name, $entry->creator_app_name,
      $entry->MIME_type;
   s/\s*$/\n/;
   print MAP;
}
close MAP;
\ No newline at end of file
+#!@PERL@
+#
+# ICDumpMap
+#     ---  Dump suffix mappings from your Internet Config extension.
+#
+# iNOUE Koich! <inoue at ma.ns.musashi-tech.ac.jp>
+#
+
+use Mac::InternetConfig;
+
+open MAP, ">AppleVolumes";
+printf MAP "%-9s \"%4s\"  \"%4s\"      %-30s %-25s %-15s\n\n",
+".", "TEXT", "ttxt", "ASCII Text", "SimpleText", "text/plain";
+print MAP "\# The following lines are extracted from Internet Config Preference.\n\n";
+for my $entry (keys %InternetConfigMap) {
+   next unless $entry->extension =~ /^\./;
+   $_ = sprintf "%-9s \"%4s\"  \"%4s\"      %-30s %-25s %-15s",
+      $entry->extension, $entry->file_type, $entry->file_creator,
+      $entry->entry_name, $entry->creator_app_name,
+      $entry->MIME_type;
+   s/\s*$/\n/;
+   print MAP;
+}
+close MAP;
+


Index: netatalk.spec
===================================================================
RCS file: /cvs/dist/rpms/netatalk/devel/netatalk.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- netatalk.spec	23 Jan 2007 13:42:18 -0000	1.31
+++ netatalk.spec	17 Apr 2007 10:11:03 -0000	1.32
@@ -1,12 +1,10 @@
- %define initdir /etc/rc.d/init.d
-
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 Epoch:   4
 License: GPL
-Group: 	 System Environment/Daemons
+Group:   System Environment/Daemons
 Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2
 Source1: atalk.init
 #Source2: netatalk.config
@@ -21,11 +19,15 @@
 Patch2:  netatalk-2.0.2-uams_no_pie.patch
 Patch3:  netatalk-2.0.2-extern_ucreator.patch
 Patch4:  netatalk-2.0.3-nodefault.patch
+Patch5:  netatalk-2.0.3-wrong_script_interpreter.patch
 Url:	 http://netatalk.sourceforge.net/
-Prereq:  /sbin/chkconfig, /sbin/service 
-Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib
-BuildRequires: cracklib-devel openssl-devel pam quota libtool automake autoconf db4-devel pam-devel
-BuildRoot: %{_tmppath}/%{name}-root
+Requires: pam
+Requires(post): /sbin/chkconfig /sbin/ldconfig
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(postun): /sbin/service /sbin/ldconfig
+BuildRequires: cracklib-devel openssl-devel pam quota libtool automake autoconf db4-devel pam-devel tcp_wrappers-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 This package enables Linux to talk to Macintosh computers via the
@@ -50,6 +52,7 @@
 %patch2  -p1 -b .uams_no_pie
 %patch3  -p1 -b .extern_ucreator
 %patch4  -p1
+%patch5  -p1
 
 ln -s ./NEWS ChangeLog
 
@@ -92,13 +95,13 @@
 	-e 's,-L/lib,-L/%{_lib},g'
 fi
 
-make all
+make %{?_smp_mflags} all
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 #mkdir -p $RPM_BUILD_ROOT/etc/pam.d
-#mkdir -p $RPM_BUILD_ROOT%{initdir}
+#mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 #mkdir -p $RPM_BUILD_ROOT/usr/include/{netatalk,atalk}
 
 make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
@@ -114,7 +117,7 @@
 #
 # Use netatalk's redhat initscript
 #
-#install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{initdir}/atalk
+#install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/atalk
 #cp include/atalk/*.h $RPM_BUILD_ROOT/usr/include/atalk/
 #cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/
 chmod a-x bin/afile/acleandir.rc
@@ -133,6 +136,7 @@
 
 %post
 /sbin/chkconfig --add atalk
+/sbin/ldconfig
 
 %preun
 if [ "$1" = "0" ] ; then
@@ -144,6 +148,7 @@
 if [ "$1" -ge "1" ]; then
   /sbin/service atalk condrestart > /dev/null 2>&1 || :
 fi
+/sbin/ldconfig
 
 %files
 %defattr(-,root,root)
@@ -152,7 +157,7 @@
 %doc bin/afile/acleandir.rc
 %doc config.example
 %dir /etc/atalk
-%attr(755,root,root) %config %{initdir}/atalk
+%attr(755,root,root) %config %{_initrddir}/atalk
 %config(noreplace) /etc/atalk/AppleVolumes.default
 %config(noreplace) /etc/atalk/AppleVolumes.system
 %config(noreplace) /etc/atalk/netatalk.conf
@@ -177,8 +182,13 @@
 %{_datadir}/aclocal/netatalk.m4
 %{_libdir}/atalk/*.a
 %{_libdir}/atalk/*.la
-
+%{_bindir}/netatalk-config
 %changelog
+* Tue Apr 17 2007 Maros Barabas <mbarabas at redhat.com> - 4:2.0.3-10
+- fix merge review
+- fix nonstandard line endings
+- Resolves: #226190
+
 * Tue Jan 23 2007 Jindrich Novy <jnovy at redhat.com> - 4:2.0.3-9
 - rebuild against new db4
 
@@ -304,7 +314,7 @@
 
 * Thu Jan 04 2001 Than Ngo <than at redhat.com>
 - fixed uams-path
-- added noreplace to %config
+- added noreplace to %%config
 
 * Mon Nov 20 2000 Tim Powers <timp at redhat.com>
 - rebuilt to fix bad dir perms
@@ -372,7 +382,7 @@
 - gzip man pages
 - fixed netatalk-asun.librpcsvc.patch, -lnss_nis too
 - changed group
-- added %defattr to %files section
+- added %%defattr to %%files section
 
 * Tue Aug 3 1999 iNOUE Koich! <inoue at ma.ns.musashi-tech.ac.jp>
 - rpm-3.0 needs to remove vogus files from source.
@@ -413,7 +423,7 @@
 * Mon Nov 16 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
 - Fix rcX.d's symbolic links.
 * Wed Oct 28 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
-- Use pre-asun2.1.0a-2 source. Remove '%exclusiveos linux' line.
+- Use pre-asun2.1.0a-2 source. Remove '%%exclusiveos linux' line.
 * Sat Oct 24 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
 - Use stable version source netatalk-1.4b2+asun2.1.0.tar.gz.
 * Mon Oct 5 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>



From fedora-cvs-commits at redhat.com  Tue Apr 17 10:12:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 06:12:32 -0400
Subject: rpms/ghostscript/devel ghostscript-exactly-enable-cidfnmap.patch,
	NONE, 1.1 ghostscript.spec, 1.136, 1.137
Message-ID: <200704171012.l3HACWdJ017832@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17816

Modified Files:
	ghostscript.spec 
Added Files:
	ghostscript-exactly-enable-cidfnmap.patch 
Log Message:
* Tue Apr 17 2007 Tim Waugh <twaugh at redhat.com> 8.15.4-3
- Apply fonts in CIDFnmap even if the same fontnames are already registered
  (bug #163231).
- Resolves: rhbz#163231


ghostscript-exactly-enable-cidfnmap.patch:
 cjkfnmap.ps |    6 ++++++
 tt11util.ps |   16 +++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

--- NEW FILE ghostscript-exactly-enable-cidfnmap.patch ---
--- espgs-8.15.4/lib/cjkv/tt11util.ps.exactly-enable-cidfnmap	2006-06-06 10:59:04.000000000 +0100
+++ espgs-8.15.4/lib/cjkv/tt11util.ps	2007-04-17 11:09:56.000000000 +0100
@@ -179,6 +179,7 @@
                 %dup /gsubhog exch _cjkv_type11_tmp /gsubost get _cjkv_type11_tmp /gsubocv get add 4 add _cjkv_type11_tmp /gsubglc get getinterval _cjkv_type11_tmp 3 1 roll put
                 dup /gsubvog exch _cjkv_type11_tmp /gsubost get 6 add _cjkv_type11_tmp /gsubglc get 2 mul getinterval _cjkv_type11_tmp 3 1 roll put
                 dup /cvfmt exch _cjkv_type11_tmp /gsubost get _cjkv_type11_tmp /gsubocv get add 0 add .cjkv_getu16 _cjkv_type11_tmp 3 1 roll put
+                _cjkv_type11_tmp /cvfmt get 1 eq {
                 dup /cvglc exch _cjkv_type11_tmp /gsubost get _cjkv_type11_tmp /gsubocv get add 2 add .cjkv_getu16 _cjkv_type11_tmp 3 1 roll put
                 dup /gsubhog exch _cjkv_type11_tmp /gsubost get _cjkv_type11_tmp /gsubocv get add 4 add _cjkv_type11_tmp /cvglc get 2 mul getinterval _cjkv_type11_tmp 3 1 roll put
                 CJKV_DEBUG_GSUB {
@@ -194,25 +195,26 @@
                     _cjkv_type11_tmp /gsubvog get exch .cjkv_getu16 =
                   } for
                 } if
-                _cjkv_type11_tmp /cvfmt get 1 eq {
                   /gsubh2v << 0 2 _cjkv_type11_tmp /gsubhog get length 2 sub {
                     dup _cjkv_type11_tmp /gsubhog get exch .cjkv_getu16
                     exch _cjkv_type11_tmp /gsubvog get exch .cjkv_getu16
                   } for >> _cjkv_type11_tmp 3 1 roll put
                 } {
                   _cjkv_type11_tmp /cvfmt get 2 eq {
-                    /gsubh2v << 0 6 _cjkv_type11_tmp /gsubhog get length 6 sub {
-                      dup 0 add /fgid exch _cjkv_type11_tmp /gsubhog get exch .cjkv_getu16 _cjkv_type11_tmp 3 1 roll put
-                      dup 2 add /lgid exch _cjkv_type11_tmp /gsubhog get exch .cjkv_getu16 _cjkv_type11_tmp 3 1 roll put
-                      4 add /cvidx exch _cjkv_type11_tmp /gsubhog get exch .cjkv_getu16 _cjkv_type11_tmp 3 1 roll put
+                    dup /cvrngc exch _cjkv_type11_tmp /gsubost get _cjkv_type11_tmp /gsubocv get add 2 add .cjkv_getu16 _cjkv_type11_tmp 3 1 roll put
+                    dup /cvrngs exch _cjkv_type11_tmp /gsubost get _cjkv_type11_tmp /gsubocv get add 4 add _cjkv_type11_tmp /cvrngc get 6 mul getinterval _cjkv_type11_tmp 3 1 roll put
+                    /gsubh2v << 0 6 _cjkv_type11_tmp /cvrngs get length 6 sub {
+                      dup 0 add /fgid exch _cjkv_type11_tmp /cvrngs get exch .cjkv_getu16 _cjkv_type11_tmp 3 1 roll put
+                      dup 2 add /lgid exch _cjkv_type11_tmp /cvrngs get exch .cjkv_getu16 _cjkv_type11_tmp 3 1 roll put
+                      4 add /cvidx exch _cjkv_type11_tmp /cvrngs get exch .cjkv_getu16 _cjkv_type11_tmp 3 1 roll put
                       CJKV_DEBUG_GSUB {
                         (fgid: ) print _cjkv_type11_tmp /fgid get =
                         (lgid: ) print _cjkv_type11_tmp /lgid get =
                         (cvidx: ) print _cjkv_type11_tmp /cvidx get =
                       } if
                       _cjkv_type11_tmp /fgid get 1 _cjkv_type11_tmp /lgid get {
-                        dup _cjkv_type11_tmp /cvidx get add _cjkv_type11_tmp /fgid get sub
-                        exch _cjkv_type11_tmp /gsubvog get exch .cjkv_getu16
+                        dup _cjkv_type11_tmp /cvidx get add _cjkv_type11_tmp /fgid get sub 2 mul
+                        _cjkv_type11_tmp /gsubvog get exch .cjkv_getu16
                       } for
                     } for >> _cjkv_type11_tmp 3 1 roll put
                   } {
--- espgs-8.15.4/lib/cjkv/cjkfnmap.ps.exactly-enable-cidfnmap	2007-04-17 11:04:52.000000000 +0100
+++ espgs-8.15.4/lib/cjkv/cjkfnmap.ps	2007-04-17 11:09:56.000000000 +0100
@@ -56,6 +56,11 @@
 % Define the name of the CID font map file.
 userdict /_cjkv_CIDFontmap 10 dict put
 
+  /.cjkv_erase_cidfmap_entry {
+    CJKV_DEBUG_FNMAP { (erase cidfmap entry for: ) print dup == } if
+    /CIDFont /Category findresource /.map get exch undef
+  } bind def
+
 % <dict> <file> .readCIDFontmap <dict>
 % Code from gs_fonts.ps::.readFontmap
   /.cjkv_readCIDFontmap {
@@ -67,6 +72,7 @@
          ( has no associated file or alias name!  Giving up.) = flush
          {.cjkv_readCIDFontmap} 0 get 1 .quit
        } if
+      1 index .cjkv_erase_cidfmap_entry
       dup type dup /stringtype eq exch /nametype eq or not
        { (CIDFontmap entry for ) print 1 index =only
          ( has an invalid file or alias name!  Giving up.) = flush


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- ghostscript.spec	17 Apr 2007 10:05:22 -0000	1.136
+++ ghostscript.spec	17 Apr 2007 10:12:30 -0000	1.137
@@ -23,6 +23,7 @@
 Patch6: ghostscript-gxcht-64bit-crash.patch
 Patch7: ghostscript-dvipdf.patch
 Patch8: ghostscript-Fontmap.local.patch
+Patch9: ghostscript-exactly-enable-cidfnmap.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: libjpeg-devel, libXt-devel
@@ -100,6 +101,10 @@
 # Allow local overrides for Fontmap (bug #233966).
 %patch8 -p1 -b .Fontmap.local
 
+# Apply fonts in CIDFnmap even if the same fontnames are already registered
+# (bug #163231).
+%patch9 -p1 -b .exactly-enable-cidfnmap
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -269,6 +274,8 @@
 
 %changelog
 * Tue Apr 17 2007 Tim Waugh <twaugh at redhat.com> 8.15.4-3
+- Apply fonts in CIDFnmap even if the same fontnames are already registered
+  (bug #163231).
 - New file CIDFmap (bug #233966).
 - Allow local overrides for FAPIcidfmap, cidfmap and Fontmap (bug #233966).
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 10:17:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 06:17:45 -0400
Subject: rpms/netatalk/devel netatalk.spec, 1.32,
	1.33 netatalk-2.0.3-wrong_script_interpreter.patch, 1.1, NONE
Message-ID: <200704171017.l3HAHjOR017942@cvs.devel.redhat.com>

Author: mbarabas

Update of /cvs/dist/rpms/netatalk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17924

Modified Files:
	netatalk.spec 
Removed Files:
	netatalk-2.0.3-wrong_script_interpreter.patch 
Log Message:
Few problems in spec file


Index: netatalk.spec
===================================================================
RCS file: /cvs/dist/rpms/netatalk/devel/netatalk.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- netatalk.spec	17 Apr 2007 10:11:03 -0000	1.32
+++ netatalk.spec	17 Apr 2007 10:17:43 -0000	1.33
@@ -19,7 +19,6 @@
 Patch2:  netatalk-2.0.2-uams_no_pie.patch
 Patch3:  netatalk-2.0.2-extern_ucreator.patch
 Patch4:  netatalk-2.0.3-nodefault.patch
-Patch5:  netatalk-2.0.3-wrong_script_interpreter.patch
 Url:	 http://netatalk.sourceforge.net/
 Requires: pam
 Requires(post): /sbin/chkconfig /sbin/ldconfig
@@ -52,7 +51,6 @@
 %patch2  -p1 -b .uams_no_pie
 %patch3  -p1 -b .extern_ucreator
 %patch4  -p1
-%patch5  -p1
 
 ln -s ./NEWS ChangeLog
 
@@ -185,9 +183,7 @@
 %{_bindir}/netatalk-config
 %changelog
 * Tue Apr 17 2007 Maros Barabas <mbarabas at redhat.com> - 4:2.0.3-10
-- fix merge review
-- fix nonstandard line endings
-- Resolves: #226190
+- fix fiew problems in spec
 
 * Tue Jan 23 2007 Jindrich Novy <jnovy at redhat.com> - 4:2.0.3-9
 - rebuild against new db4


--- netatalk-2.0.3-wrong_script_interpreter.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 17 10:54:19 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 06:54:19 -0400
Subject: rpms/gnome-mime-data/devel .cvsignore, 1.11,
	1.12 gnome-mime-data.spec, 1.22, 1.23 sources, 1.11, 1.12
Message-ID: <200704171054.l3HAsJvM015424@cvs.devel.redhat.com>

Author: bnocera

Update of /cvs/dist/rpms/gnome-mime-data/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15256

Modified Files:
	.cvsignore gnome-mime-data.spec sources 
Log Message:
* Tue Apr 17 2007 - Bastien Nocera <bnocera at redhat.com> - 2.18.0-1
- Upgrade to 2.18.0 and make noarch



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-mime-data/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	8 Nov 2006 05:11:15 -0000	1.11
+++ .cvsignore	17 Apr 2007 10:54:17 -0000	1.12
@@ -1 +1 @@
-gnome-mime-data-2.4.3.tar.bz2
+gnome-mime-data-2.18.0.tar.bz2


Index: gnome-mime-data.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mime-data/devel/gnome-mime-data.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnome-mime-data.spec	27 Nov 2006 02:31:51 -0000	1.22
+++ gnome-mime-data.spec	17 Apr 2007 10:54:17 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: MIME type data files for GNOME desktop
 Name: gnome-mime-data
-Version: 2.4.3
-Release: 2%{?dist}
+Version: 2.18.0
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -11,9 +11,6 @@
 BuildRequires: gettext
 Requires: pkgconfig
 
-### WE ARE NOT NOARCH, /usr/lib/pkgconfig is not noarch. 
-### don't change this and don't file a bug. ;-)
-
 Patch0: gnome-mime-data-2.2.0-openoffice.patch
 Patch1: gnome-mime-data-2.2.0-rpminstall.patch
 Patch2: gnome-mime-data-2.3.2-nohtmlcomponent.patch
@@ -62,9 +59,12 @@
 %dir %{_datadir}/mime-info
 %{_datadir}/mime-info/*.keys
 %{_datadir}/mime-info/*.mime
-%{_libdir}/pkgconfig/*
+%{_datadir}/pkgconfig/*
 
 %changelog
+* Tue Apr 17 2007 - Bastien Nocera <bnocera at redhat.com> - 2.18.0-1
+- Upgrade to 2.18.0 and make noarch
+
 * Sun Nov 26 2006 Matthias Clasen <mclasen at redhat.com> - 2.4.3-2
 - Own the /usr/share/mime-info directory (#216922)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-mime-data/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Nov 2006 05:11:15 -0000	1.11
+++ sources	17 Apr 2007 10:54:17 -0000	1.12
@@ -1 +1 @@
-2abe573a6e84b71c58a661d4bafa9bd6  gnome-mime-data-2.4.3.tar.bz2
+541858188f80090d12a33b5a7c34d42c  gnome-mime-data-2.18.0.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 17 10:56:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 06:56:30 -0400
Subject: rpms/shared-mime-info/devel defaults.list, 1.14,
	1.15 shared-mime-info.spec, 1.48, 1.49
Message-ID: <200704171056.l3HAuUDI017113@cvs.devel.redhat.com>

Author: bnocera

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

Modified Files:
	defaults.list shared-mime-info.spec 
Log Message:
* Tue Apr 17 2007 - Bastien Nocera <bnocera at redhat.com> - 0.20-2
- Fix the dia association (#194313)



Index: defaults.list
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/defaults.list,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- defaults.list	26 Jul 2006 17:26:43 -0000	1.14
+++ defaults.list	17 Apr 2007 10:56:28 -0000	1.15
@@ -1,5 +1,5 @@
 [Default Applications]
-application/x-dia-diagram=dia.desktop
+application/x-dia-diagram=fedora-dia.desktop
 text/x-vcard=evolution-2.0.desktop
 text/x-vcalendar=evolution-2.0.desktop
 text/calendar=evolution-2.0.desktop


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/shared-mime-info.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- shared-mime-info.spec	6 Feb 2007 12:46:14 -0000	1.48
+++ shared-mime-info.spec	17 Apr 2007 10:56:28 -0000	1.49
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.20
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -61,6 +61,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Tue Apr 17 2007 - Bastien Nocera <bnocera at redhat.com> - 0.20-2
+- Fix the dia association (#194313)
+
 * Tue Feb 06 2007 - Bastien Nocera <bnocera at redhat.com> - 0.20-1
 - Update to 0.20, and remove outdated patches
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 10:59:46 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 06:59:46 -0400
Subject: rpms/gnome-mime-data/devel gnome-mime-data.spec,1.23,1.24
Message-ID: <200704171059.l3HAxkcT019645@cvs.devel.redhat.com>

Author: bnocera

Update of /cvs/dist/rpms/gnome-mime-data/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19321

Modified Files:
	gnome-mime-data.spec 
Log Message:
- really make it noarch, duh



Index: gnome-mime-data.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mime-data/devel/gnome-mime-data.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gnome-mime-data.spec	17 Apr 2007 10:54:17 -0000	1.23
+++ gnome-mime-data.spec	17 Apr 2007 10:59:44 -0000	1.24
@@ -7,6 +7,7 @@
 License: GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
+BuildArch: noarch
 BuildRequires: perl-XML-Parser
 BuildRequires: gettext
 Requires: pkgconfig



From fedora-cvs-commits at redhat.com  Tue Apr 17 11:43:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 07:43:09 -0400
Subject: rpms/coreutils/FC-6 coreutils-selinux.patch, 1.29,
	1.30 coreutils.spec, 1.152,
	1.153 coreutils-dangling-full-path.patch, 1.1, NONE
Message-ID: <200704171143.l3HBh9Fm008971@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	coreutils-selinux.patch coreutils.spec 
Removed Files:
	coreutils-dangling-full-path.patch 
Log Message:
* Tue Apr 17 2007 Tim Waugh <twaugh at redhat.com> 5.97-12.5
- Fixed dangling symlinks fix (bug #230052, bug #236311).
- Resolves: rhbz#230052 rhbz#236311


coreutils-selinux.patch:
 README             |    4 
 config.hin         |   33 +---
 configure.ac       |    7 
 man/Makefile.am    |    4 
 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       |   45 +++++
 man/runcon.x       |   14 +
 man/stat.1         |    6 
 man/vdir.1         |   14 +
 src/Makefile.am    |   23 +-
 src/chcon.c        |  421 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/copy.c         |   73 +++++++++
 src/copy.h         |    4 
 src/cp.c           |   67 ++++++++
 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           |   13 +
 src/runcon.c       |  253 +++++++++++++++++++++++++++++++
 src/stat.c         |  146 ++++++++++++++----
 tests/help-version |    4 
 33 files changed, 1699 insertions(+), 101 deletions(-)

Index: coreutils-selinux.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/FC-6/coreutils-selinux.patch,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- coreutils-selinux.patch	11 Apr 2007 18:31:15 -0000	1.29
+++ coreutils-selinux.patch	17 Apr 2007 11:43:06 -0000	1.30
@@ -1,5 +1,5 @@
---- coreutils-5.97/tests/help-version.selinux	2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/tests/help-version	2007-04-11 18:15:32.000000000 +0100
+--- coreutils-5.97/tests/help-version.selinux	2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/tests/help-version	2007-04-17 12:34:48.000000000 +0100
 @@ -46,6 +46,8 @@
  
      # Skip `test'; it doesn't accept --help or --version.
@@ -18,8 +18,8 @@
  
    rm -rf $tmp_in $tmp_in2 $tmp_dir $tmp_out
    echo > $tmp_in
---- coreutils-5.97/src/ls.c.selinux	2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/src/ls.c	2007-04-11 18:16:16.000000000 +0100
+--- coreutils-5.97/src/ls.c.selinux	2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/src/ls.c	2007-04-17 12:36:02.000000000 +0100
 @@ -135,6 +135,18 @@
  
  #define AUTHORS "Richard Stallman", "David MacKenzie"
@@ -259,10 +259,10 @@
        || (format_needs_type
 -	  && (type == unknown
 +	  && (type == unknown || type == command_line
- 	      /* --indicator-style=classify (aka -F)
- 		 requires that we stat each regular file
- 		 to see if it's executable.  */
-@@ -2541,6 +2625,11 @@
+ 
+ 	      /* FIXME: remove this disjunct.
+ 		 I don't think we care about symlinks here, but for now
+@@ -2547,6 +2631,11 @@
  	{
  	case DEREF_ALWAYS:
  	  err = stat (absolute_name, &f->stat);
@@ -274,7 +274,7 @@
  	  break;
  
  	case DEREF_COMMAND_LINE_ARGUMENTS:
-@@ -2549,6 +2638,11 @@
+@@ -2555,6 +2644,11 @@
  	    {
  	      bool need_lstat;
  	      err = stat (absolute_name, &f->stat);
@@ -286,7 +286,7 @@
  
  	      if (dereference == DEREF_COMMAND_LINE_ARGUMENTS)
  		break;
-@@ -2567,17 +2661,41 @@
+@@ -2573,17 +2667,41 @@
  
  	default: /* DEREF_NEVER */
  	  err = lstat (absolute_name, &f->stat);
@@ -315,7 +315,7 @@
 +	  f->filetype = type;
 +	  memset (&f->stat, '\0', sizeof (f->stat));
 +
-+	  f->name = xstrdup (absolute_name);
++	  f->name = xstrdup (name);
 +	  files_index++;
 +
  	  return 0;
@@ -331,7 +331,7 @@
  	{
  	  int n = file_has_acl (absolute_name, &f->stat);
  	  f->have_acl = (0 < n);
-@@ -3066,6 +3184,16 @@
+@@ -3072,6 +3190,16 @@
  	  DIRED_PUTCHAR ('\n');
  	}
        break;
@@ -348,7 +348,7 @@
      }
  }
  
-@@ -3173,17 +3301,19 @@
+@@ -3179,17 +3307,19 @@
     WIDTH.  */
  
  static void
@@ -372,7 +372,7 @@
  }
  
  /* Return the number of columns that format_user_or_group will print.  */
-@@ -3273,7 +3403,7 @@
+@@ -3279,7 +3409,7 @@
      {
        char hbuf[INT_BUFSIZE_BOUND (uintmax_t)];
        sprintf (p, "%*s ", inode_number_width,
@@ -381,7 +381,7 @@
        p += inode_number_width + 1;
      }
  
-@@ -3281,8 +3411,10 @@
+@@ -3287,8 +3417,10 @@
      {
        char hbuf[LONGEST_HUMAN_READABLE + 1];
        char const *blocks =
@@ -394,7 +394,7 @@
        int pad;
        for (pad = block_size_width - mbswidth (blocks, 0); 0 < pad; pad--)
  	*p++ = ' ';
-@@ -3296,10 +3428,18 @@
+@@ -3302,10 +3434,18 @@
    {
      char hbuf[INT_BUFSIZE_BOUND (uintmax_t)];
      sprintf (p, "%s %*s ", modebuf, nlink_width,
@@ -414,7 +414,7 @@
    DIRED_INDENT ();
  
    if (print_owner | print_group | print_author)
-@@ -3307,18 +3447,19 @@
+@@ -3313,18 +3453,19 @@
        DIRED_FPUTS (buf, stdout, p - buf);
  
        if (print_owner)
@@ -438,7 +438,7 @@
      {
        char majorbuf[INT_BUFSIZE_BOUND (uintmax_t)];
        char minorbuf[INT_BUFSIZE_BOUND (uintmax_t)];
-@@ -3336,8 +3477,10 @@
+@@ -3342,8 +3483,10 @@
      {
        char hbuf[LONGEST_HUMAN_READABLE + 1];
        char const *size =
@@ -451,7 +451,7 @@
        int pad;
        for (pad = file_size_width - mbswidth (size, 0); 0 < pad; pad--)
  	*p++ = ' ';
-@@ -3350,7 +3493,7 @@
+@@ -3356,7 +3499,7 @@
    s = 0;
    *p = '\1';
  
@@ -460,7 +460,7 @@
      {
        time_t six_months_ago;
        bool recent;
-@@ -3397,15 +3540,17 @@
+@@ -3403,15 +3546,17 @@
  	 print it as a huge integer number of seconds.  */
        char hbuf[INT_BUFSIZE_BOUND (intmax_t)];
        sprintf (p, "%*s ", long_time_expected_width (),
@@ -482,7 +482,7 @@
  
    if (f->filetype == symbolic_link)
      {
-@@ -3413,7 +3558,7 @@
+@@ -3419,7 +3564,7 @@
  	{
  	  DIRED_FPUTS_LITERAL (" -> ", stdout);
  	  print_name_with_quoting (f->linkname, f->linkmode, f->linkok - 1,
@@ -491,7 +491,7 @@
  	  if (indicator_style != none)
  	    print_type_indicator (f->linkmode);
  	}
-@@ -3595,10 +3740,10 @@
+@@ -3601,10 +3746,10 @@
  
  static void
  print_name_with_quoting (const char *p, mode_t mode, int linkok,
@@ -504,7 +504,7 @@
  
    if (stack)
      PUSH_CURRENT_DIRED_POS (stack);
-@@ -3646,7 +3791,8 @@
+@@ -3652,7 +3797,8 @@
  	    human_readable (ST_NBLOCKS (f->stat), buf, human_output_opts,
  			    ST_NBLOCKSIZE, output_block_size));
  
@@ -514,7 +514,7 @@
  
    if (indicator_style != none)
      print_type_indicator (f->stat.st_mode);
-@@ -3687,7 +3833,8 @@
+@@ -3693,7 +3839,8 @@
  }
  
  static void
@@ -524,7 +524,7 @@
  {
    int type = C_FILE;
    struct color_ext_type *ext;	/* Color extension */
-@@ -3726,6 +3873,8 @@
+@@ -3732,6 +3879,8 @@
  	type = C_CHR;
        else if (S_ISDOOR (mode))
  	type = C_DOOR;
@@ -533,7 +533,7 @@
  
        if (type == C_FILE)
  	{
-@@ -4215,6 +4364,16 @@
+@@ -4221,6 +4370,16 @@
    -X                         sort alphabetically by entry extension\n\
    -1                         list one file per line\n\
  "), stdout);
@@ -550,7 +550,7 @@
        fputs (HELP_OPTION_DESCRIPTION, stdout);
        fputs (VERSION_OPTION_DESCRIPTION, stdout);
        fputs (_("\n\
-@@ -4238,3 +4397,70 @@
+@@ -4244,3 +4403,70 @@
      }
    exit (status);
  }
@@ -621,8 +621,8 @@
 +  }
 +}
 +#endif
---- coreutils-5.97/src/cp.c.selinux	2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/src/cp.c	2007-04-11 18:15:32.000000000 +0100
+--- coreutils-5.97/src/cp.c.selinux	2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/src/cp.c	2007-04-17 12:34:48.000000000 +0100
 @@ -52,6 +52,11 @@
  
  #define AUTHORS "Torbjorn Granlund", "David MacKenzie", "Jim Meyering"
@@ -788,8 +788,8 @@
  
  	case REPLY_OPTION: /* Deprecated */
  	  x.interactive = XARGMATCH ("--reply", optarg,
---- coreutils-5.97/src/Makefile.am.selinux	2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/src/Makefile.am	2007-04-11 18:15:32.000000000 +0100
+--- coreutils-5.97/src/Makefile.am.selinux	2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/src/Makefile.am	2007-04-17 12:34:48.000000000 +0100
 @@ -20,14 +20,14 @@
  EXTRA_PROGRAMS = chroot df hostid nice pinky stty su runuser uname uptime users who
  
@@ -842,8 +842,8 @@
  
  ## If necessary, add -lm to resolve use of pow in lib/strtod.c.
  sort_LDADD = $(LDADD) $(POW_LIB)
---- coreutils-5.97/src/copy.h.selinux	2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/src/copy.h	2007-04-11 18:15:32.000000000 +0100
+--- coreutils-5.97/src/copy.h.selinux	2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/src/copy.h	2007-04-17 12:34:48.000000000 +0100
 @@ -127,6 +127,10 @@
    bool preserve_ownership;
    bool preserve_mode;
@@ -855,8 +855,8 @@
  
    /* Enabled for mv, and for cp by the --preserve=links option.
       If true, attempt to preserve in the destination files any
---- /dev/null	2007-04-11 11:08:35.527429462 +0100
-+++ coreutils-5.97/src/chcon.c	2007-04-11 18:15:32.000000000 +0100
+--- /dev/null	2007-04-17 09:18:47.810494296 +0100
++++ coreutils-5.97/src/chcon.c	2007-04-17 12:34:48.000000000 +0100
 @@ -0,0 +1,421 @@
 +/* chcontext -- change security context of a pathname */
 +
@@ -1280,7 +1280,7 @@
 +  exit (errors);
 +}
 --- coreutils-5.97/src/mkdir.c.selinux	2005-06-15 00:55:47.000000000 +0100
-+++ coreutils-5.97/src/mkdir.c	2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/src/mkdir.c	2007-04-17 12:34:48.000000000 +0100
 @@ -34,11 +34,18 @@
  
  #define AUTHORS "David MacKenzie"
@@ -1346,7 +1346,7 @@
  	case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
  	default:
 --- coreutils-5.97/src/stat.c.selinux	2005-12-15 21:25:53.000000000 +0000
-+++ coreutils-5.97/src/stat.c	2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/src/stat.c	2007-04-17 12:34:48.000000000 +0100
 @@ -42,6 +42,13 @@
  # endif
  #endif
@@ -1639,7 +1639,7 @@
    exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
  }
 --- coreutils-5.97/src/mkfifo.c.selinux	2005-05-14 08:58:37.000000000 +0100
-+++ coreutils-5.97/src/mkfifo.c	2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/src/mkfifo.c	2007-04-17 12:34:48.000000000 +0100
 @@ -32,11 +32,18 @@
  
  #define AUTHORS "David MacKenzie"
@@ -1703,7 +1703,7 @@
  	case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
  	default:
 --- coreutils-5.97/src/mknod.c.selinux	2005-05-14 08:58:37.000000000 +0100
-+++ coreutils-5.97/src/mknod.c	2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/src/mknod.c	2007-04-17 12:34:48.000000000 +0100
 @@ -36,8 +36,15 @@
  /* The name this program was run with. */
  char *program_name;
@@ -1764,8 +1764,8 @@
  	case_GETOPT_HELP_CHAR;
  	case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
  	default:
---- coreutils-5.97/src/id.c.selinux	2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/src/id.c	2007-04-11 18:15:32.000000000 +0100
+--- coreutils-5.97/src/id.c.selinux	2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/src/id.c	2007-04-17 12:34:48.000000000 +0100
 @@ -37,6 +37,20 @@
  
  int getugroups ();
@@ -1896,8 +1896,8 @@
 +  }
 +#endif
  }
---- coreutils-5.97/src/mv.c.selinux	2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/src/mv.c	2007-04-11 18:15:32.000000000 +0100
+--- coreutils-5.97/src/mv.c.selinux	2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/src/mv.c	2007-04-17 12:34:48.000000000 +0100
 @@ -34,6 +34,11 @@
  #include "quote.h"
  #include "remove.h"
@@ -1932,8 +1932,8 @@
    /* FIXME: consider not calling getenv for SIMPLE_BACKUP_SUFFIX unless
       we'll actually use backup_suffix_string.  */
    backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
---- /dev/null	2007-04-11 11:08:35.527429462 +0100
-+++ coreutils-5.97/src/runcon.c	2007-04-11 18:15:32.000000000 +0100
+--- /dev/null	2007-04-17 09:18:47.810494296 +0100
++++ coreutils-5.97/src/runcon.c	2007-04-17 12:34:48.000000000 +0100
 @@ -0,0 +1,253 @@
 +/*
 + * runcon [ context |
@@ -2188,8 +2188,8 @@
 +  }
 +  return 1; /* can't reach this statement.... */
 +}
---- coreutils-5.97/src/copy.c.selinux	2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/src/copy.c	2007-04-11 18:15:32.000000000 +0100
+--- coreutils-5.97/src/copy.c.selinux	2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/src/copy.c	2007-04-17 12:34:48.000000000 +0100
 @@ -52,6 +52,11 @@
  #include "xreadlink.h"
  #include "yesno.h"
@@ -2305,8 +2305,8 @@
    /* We have failed to create the destination file.
       If we've just added a dev/ino entry via the remember_copied
       call above (i.e., unless we've just failed to create a hard link),
---- coreutils-5.97/src/install.c.selinux	2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/src/install.c	2007-04-11 18:15:32.000000000 +0100
+--- coreutils-5.97/src/install.c.selinux	2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/src/install.c	2007-04-17 12:34:48.000000000 +0100
 @@ -48,6 +48,43 @@
  # include <sys/wait.h>
  #endif
@@ -2469,8 +2469,8 @@
        fputs (HELP_OPTION_DESCRIPTION, stdout);
        fputs (VERSION_OPTION_DESCRIPTION, stdout);
        fputs (_("\
---- coreutils-5.97/config.hin.selinux	2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/config.hin	2007-04-11 18:15:32.000000000 +0100
+--- coreutils-5.97/config.hin.selinux	2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/config.hin	2007-04-17 12:34:48.000000000 +0100
 @@ -411,10 +411,6 @@
     don't. */
  #undef HAVE_DECL_TTYNAME
@@ -2573,8 +2573,8 @@
  #undef size_t
  
  /* Map `socklen_t' to `int' if it is missing. */
---- coreutils-5.97/configure.ac.selinux	2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/configure.ac	2007-04-11 18:15:32.000000000 +0100
+--- coreutils-5.97/configure.ac.selinux	2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/configure.ac	2007-04-17 12:34:48.000000000 +0100
 @@ -34,6 +34,13 @@
  LIB_PAM="-ldl -lpam -lpam_misc"
  AC_SUBST(LIB_PAM)])
@@ -2590,7 +2590,7 @@
  gl_USE_SYSTEM_EXTENSIONS
  gl_PERL
 --- coreutils-5.97/man/stat.1.selinux	2006-05-25 18:27:38.000000000 +0100
-+++ coreutils-5.97/man/stat.1	2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/man/stat.1	2007-04-17 12:34:48.000000000 +0100
 @@ -28,6 +28,9 @@
  \fB\-t\fR, \fB\-\-terse\fR
  print the information in terse form
@@ -2611,15 +2611,15 @@
  %D
  Device number in hex
  .TP
---- /dev/null	2007-04-11 11:08:35.527429462 +0100
-+++ coreutils-5.97/man/chcon.x	2007-04-11 18:15:32.000000000 +0100
+--- /dev/null	2007-04-17 09:18:47.810494296 +0100
++++ coreutils-5.97/man/chcon.x	2007-04-17 12:34:48.000000000 +0100
 @@ -0,0 +1,4 @@
 +[NAME]
 +chcon \- change file security context
 +[DESCRIPTION]
 +.\" Add any additional description here
---- /dev/null	2007-04-11 11:08:35.527429462 +0100
-+++ coreutils-5.97/man/chcon.1	2007-04-11 18:15:32.000000000 +0100
+--- /dev/null	2007-04-17 09:18:47.810494296 +0100
++++ coreutils-5.97/man/chcon.1	2007-04-17 12:34:48.000000000 +0100
 @@ -0,0 +1,64 @@
 +.TH CHCON 1 "July 2003" "chcon (coreutils) 5.0" "User Commands"
 +.SH NAME
@@ -2686,7 +2686,7 @@
 +.PP
 +should give you access to the complete manual.
 --- coreutils-5.97/man/dir.1.selinux	2006-06-01 08:33:14.000000000 +0100
-+++ coreutils-5.97/man/dir.1	2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/man/dir.1	2007-04-17 12:34:48.000000000 +0100
 @@ -201,6 +201,20 @@
  .TP
  \fB\-1\fR
@@ -2709,7 +2709,7 @@
  \fB\-\-help\fR
  display this help and exit
 --- coreutils-5.97/man/mkfifo.1.selinux	2006-05-25 18:27:36.000000000 +0100
-+++ coreutils-5.97/man/mkfifo.1	2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/man/mkfifo.1	2007-04-17 12:34:48.000000000 +0100
 @@ -12,6 +12,9 @@
  .PP
  Mandatory arguments to long options are mandatory for short options too.
@@ -2720,8 +2720,8 @@
  \fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR
  set permission mode (as in chmod), not a=rw \- umask
  .TP
---- coreutils-5.97/man/Makefile.am.selinux	2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/man/Makefile.am	2007-04-11 18:15:32.000000000 +0100
+--- coreutils-5.97/man/Makefile.am.selinux	2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/man/Makefile.am	2007-04-17 12:34:48.000000000 +0100
 @@ -11,7 +11,7 @@
    shred.1 sleep.1 sort.1 split.1 stat.1 stty.1 \
    su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
@@ -2741,7 +2741,7 @@
  SUFFIXES = .x .1
  
 --- coreutils-5.97/man/cp.1.selinux	2006-05-25 18:27:33.000000000 +0100
-+++ coreutils-5.97/man/cp.1	2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/man/cp.1	2007-04-17 12:34:48.000000000 +0100
 @@ -57,7 +57,7 @@
  .TP
  \fB\-\-preserve\fR[=\fIATTR_LIST\fR]
@@ -2762,7 +2762,7 @@
  output version information and exit
  .PP
 --- coreutils-5.97/man/id.1.selinux	2006-05-25 18:27:35.000000000 +0100
-+++ coreutils-5.97/man/id.1	2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/man/id.1	2007-04-17 12:34:48.000000000 +0100
 @@ -13,6 +13,9 @@
  \fB\-a\fR
  ignore, for compatibility with other versions
@@ -2773,8 +2773,8 @@
  \fB\-g\fR, \fB\-\-group\fR
  print only the effective group ID
  .TP
---- /dev/null	2007-04-11 11:08:35.527429462 +0100
-+++ coreutils-5.97/man/runcon.x	2007-04-11 18:15:32.000000000 +0100
+--- /dev/null	2007-04-17 09:18:47.810494296 +0100
++++ coreutils-5.97/man/runcon.x	2007-04-17 12:34:48.000000000 +0100
 @@ -0,0 +1,14 @@
 +[NAME]
 +runcon \- run command with specified security context
@@ -2790,8 +2790,8 @@
 +.PP
 +Note that only carefully-chosen contexts are likely to successfully
 +run.
---- /dev/null	2007-04-11 11:08:35.527429462 +0100
-+++ coreutils-5.97/man/runcon.1	2007-04-11 18:15:32.000000000 +0100
+--- /dev/null	2007-04-17 09:18:47.810494296 +0100
++++ coreutils-5.97/man/runcon.1	2007-04-17 12:34:48.000000000 +0100
 @@ -0,0 +1,45 @@
 +.TH RUNCON "1" "February 2005" "runcon (coreutils) 5.0" "selinux"
 +.SH NAME
@@ -2839,7 +2839,7 @@
 +Note that only carefully-chosen contexts are likely to successfully
 +run.
 --- coreutils-5.97/man/mknod.1.selinux	2006-05-25 18:27:36.000000000 +0100
-+++ coreutils-5.97/man/mknod.1	2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/man/mknod.1	2007-04-17 12:34:48.000000000 +0100
 @@ -12,6 +12,9 @@
  .PP
  Mandatory arguments to long options are mandatory for short options too.
@@ -2851,7 +2851,7 @@
  set permission mode (as in chmod), not a=rw \- umask
  .TP
 --- coreutils-5.97/man/ls.1.selinux	2006-06-01 08:33:14.000000000 +0100
-+++ coreutils-5.97/man/ls.1	2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/man/ls.1	2007-04-17 12:34:48.000000000 +0100
 @@ -201,6 +201,20 @@
  .TP
  \fB\-1\fR
@@ -2874,7 +2874,7 @@
  \fB\-\-help\fR
  display this help and exit
 --- coreutils-5.97/man/mkdir.1.selinux	2006-05-25 18:27:35.000000000 +0100
-+++ coreutils-5.97/man/mkdir.1	2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/man/mkdir.1	2007-04-17 12:34:48.000000000 +0100
 @@ -12,6 +12,8 @@
  .PP
  Mandatory arguments to long options are mandatory for short options too.
@@ -2885,7 +2885,7 @@
  set permission mode (as in chmod), not rwxrwxrwx \- umask
  .TP
 --- coreutils-5.97/man/vdir.1.selinux	2006-06-01 08:33:14.000000000 +0100
-+++ coreutils-5.97/man/vdir.1	2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/man/vdir.1	2007-04-17 12:34:48.000000000 +0100
 @@ -201,6 +201,20 @@
  .TP
  \fB\-1\fR
@@ -2908,7 +2908,7 @@
  \fB\-\-help\fR
  display this help and exit
 --- coreutils-5.97/man/install.1.selinux	2006-05-25 18:27:35.000000000 +0100
-+++ coreutils-5.97/man/install.1	2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/man/install.1	2007-04-17 12:34:48.000000000 +0100
 @@ -65,6 +65,11 @@
  .TP
  \fB\-v\fR, \fB\-\-verbose\fR
@@ -2921,8 +2921,8 @@
  .TP
  \fB\-\-help\fR
  display this help and exit
---- coreutils-5.97/README.selinux	2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/README	2007-04-11 18:15:32.000000000 +0100
+--- coreutils-5.97/README.selinux	2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/README	2007-04-17 12:34:48.000000000 +0100
 @@ -8,11 +8,11 @@
  The programs that can be built with this package are:
  


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/FC-6/coreutils.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- coreutils.spec	11 Apr 2007 18:31:15 -0000	1.152
+++ coreutils.spec	17 Apr 2007 11:43:06 -0000	1.153
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 5.97
-Release: 12.4%{?dist}
+Release: 12.5%{?dist}
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -25,7 +25,6 @@
 Patch3: coreutils-cut-coredump.patch
 Patch4: coreutils-223869.patch
 Patch5: coreutils-rm-race.patch
-Patch6: coreutils-dangling-full-path.patch
 Patch10: coreutils-newhashes.patch
 
 # Our patches
@@ -89,7 +88,6 @@
 %patch3 -p1 -b .cut-coredump
 %patch4 -p1 -b .223869
 %patch5 -p1 -b .rm-race
-%patch6 -p1 -b .dangling-full-path
 %patch10 -p1 -b .newhashes
 
 # Our patches
@@ -292,6 +290,9 @@
 /sbin/runuser
 
 %changelog
+* Tue Apr 17 2007 Tim Waugh <twaugh at redhat.com> 5.97-12.5
+- Fixed dangling symlinks fix (bug #230052, bug #236311).
+
 * Wed Apr 11 2007 Tim Waugh <twaugh at redhat.com> 5.97-12.4
 - Backported ls fix for 'ls -lL' showing dangling links with full paths
   (bug #230052).


--- coreutils-dangling-full-path.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 17 11:56:54 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 07:56:54 -0400
Subject: rpms/vim/devel vim.spec,1.164,1.165
Message-ID: <200704171156.l3HBus5g009182@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	vim.spec 
Log Message:
- fix typo in require line (vim-X11 - 2:7.0.224-2.fc7.i386 requires 4)


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- vim.spec	16 Apr 2007 15:26:19 -0000	1.164
+++ vim.spec	17 Apr 2007 11:56:52 -0000	1.165
@@ -21,7 +21,7 @@
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -377,7 +377,7 @@
 %package X11
 Summary: The VIM version of the vi editor for the X Window System
 Group: Applications/Editors
-Requires: vim-common = %{epoch}:%{version}-%{release} libattr >= 2,4 gtk2 >= 2.6
+Requires: vim-common = %{epoch}:%{version}-%{release} libattr >= 2.4 gtk2 >= 2.6
 Provides: gvim = %{version}-%{release}
 BuildRequires: gtk2-devel libSM-devel libXt-devel libXpm-devel
 
@@ -1057,6 +1057,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Apr 17 2007 Karsten Hopp <karsten at redhat.com> 7.0.224-3
+- fix typo in require line (vim-X11 - 2:7.0.224-2.fc7.i386 requires 4)
+
 * Mon Apr 16 2007 Karsten Hopp <karsten at redhat.com> 7.0.224-2
 - use more macros
 - drop BR perl



From fedora-cvs-commits at redhat.com  Tue Apr 17 12:12:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 08:12:01 -0400
Subject: rpms/lm_sensors/devel .cvsignore, 1.16, 1.17 lm_sensors.spec, 1.44,
	1.45 sources, 1.16, 1.17
Message-ID: <200704171212.l3HCC1qt009463@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/lm_sensors/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9442

Modified Files:
	.cvsignore lm_sensors.spec sources 
Log Message:
- Update to lm_sensors-2.10.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/lm_sensors/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	6 Feb 2007 12:33:04 -0000	1.16
+++ .cvsignore	17 Apr 2007 12:11:59 -0000	1.17
@@ -1 +1 @@
-lm_sensors-2.10.2.tar.gz
+lm_sensors-2.10.3.tar.gz


Index: lm_sensors.spec
===================================================================
RCS file: /cvs/dist/rpms/lm_sensors/devel/lm_sensors.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- lm_sensors.spec	15 Mar 2007 14:35:31 -0000	1.44
+++ lm_sensors.spec	17 Apr 2007 12:11:59 -0000	1.45
@@ -1,6 +1,6 @@
 Name: lm_sensors
-Version: 2.10.2
-Release: 2%{?dist}
+Version: 2.10.3
+Release: 1%{?dist}
 URL: http://secure.netroedge.com/~lm78/
 Source: http://secure.netroedge.com/~lm78/archive/lm_sensors-%{version}.tar.gz
 Source1: lm_sensors.sysconfig
@@ -109,6 +109,9 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Tue Apr 17 2007 Phil Knirsch <pknirsch at redhat.com> - 2.10.3-1
+- Update to lm_sensors-2.10.3
+
 * Thu Mar 15 2007 Phil Knirsch <pknirsch at redhat.com> - 2.10.2-2
 - Only require dmidecode on supported archs (#232264)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/lm_sensors/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	6 Feb 2007 12:33:04 -0000	1.16
+++ sources	17 Apr 2007 12:11:59 -0000	1.17
@@ -1 +1 @@
-a424c54006483e978cc3f885f50989a5  lm_sensors-2.10.2.tar.gz
+55d77146fbd56c205a9f81d262b9453c  lm_sensors-2.10.3.tar.gz



From fedora-cvs-commits at redhat.com  Tue Apr 17 12:23:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 08:23:18 -0400
Subject: rpms/lm_sensors/devel lm_sensors-2.10.1-local.patch, 1.1,
	1.2 lm_sensors.spec, 1.45, 1.46
Message-ID: <200704171223.l3HCNIo2009624@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/lm_sensors/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9608

Modified Files:
	lm_sensors-2.10.1-local.patch lm_sensors.spec 
Log Message:
- Fixed one more problem with sensors-detect (#215984)


lm_sensors-2.10.1-local.patch:
 sensors-detect |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Index: lm_sensors-2.10.1-local.patch
===================================================================
RCS file: /cvs/dist/rpms/lm_sensors/devel/lm_sensors-2.10.1-local.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lm_sensors-2.10.1-local.patch	23 Nov 2006 14:08:35 -0000	1.1
+++ lm_sensors-2.10.1-local.patch	17 Apr 2007 12:23:16 -0000	1.2
@@ -1,5 +1,17 @@
---- lm_sensors-2.10.1/prog/detect/sensors-detect.local	2006-11-23 13:48:46.000000000 +0100
-+++ lm_sensors-2.10.1/prog/detect/sensors-detect	2006-11-23 14:27:29.000000000 +0100
+diff -uNr lm_sensors-2.10.1.orig/prog/detect/sensors-detect lm_sensors-2.10.1/prog/detect/sensors-detect
+--- lm_sensors-2.10.1.orig/prog/detect/sensors-detect	2006-09-25 00:30:10.000000000 +0200
++++ lm_sensors-2.10.1/prog/detect/sensors-detect	2006-11-16 19:00:36.000000000 +0100
+@@ -40,8 +40,8 @@
+ 	unless $ENV{PATH} =~ m,(^|:)/sbin/?(:|$),;
+ # Same for /usr/local/sbin since we need i2cdetect which is installed there
+ # by default (reported by Lennard Klein)
+-$ENV{PATH} = '/usr/local/sbin:'.$ENV{PATH}
+-	unless $ENV{PATH} =~ m,(^|:)/usr/local/sbin/?(:|$),;
++$ENV{PATH} = '/usr/sbin:'.$ENV{PATH}
++	unless $ENV{PATH} =~ m,(^|:)/usr/sbin/?(:|$),;
+ 
+ #########################
+ # CONSTANT DECLARATIONS #
 @@ -5430,7 +5430,7 @@
    print "#----cut here----\n".
          $modprobes.


Index: lm_sensors.spec
===================================================================
RCS file: /cvs/dist/rpms/lm_sensors/devel/lm_sensors.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- lm_sensors.spec	17 Apr 2007 12:11:59 -0000	1.45
+++ lm_sensors.spec	17 Apr 2007 12:23:16 -0000	1.46
@@ -1,6 +1,6 @@
 Name: lm_sensors
 Version: 2.10.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://secure.netroedge.com/~lm78/
 Source: http://secure.netroedge.com/~lm78/archive/lm_sensors-%{version}.tar.gz
 Source1: lm_sensors.sysconfig
@@ -109,6 +109,9 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Tue Apr 17 2007 Phil Knirsch <pknirsch at redhat.com> - 2.10.3-2
+- Fixed one more problem with sensors-detect (#215984)
+
 * Tue Apr 17 2007 Phil Knirsch <pknirsch at redhat.com> - 2.10.3-1
 - Update to lm_sensors-2.10.3
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 12:26:28 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 08:26:28 -0400
Subject: rpms/pygtk2/devel pygtk2.spec,1.2,1.3
Message-ID: <200704171226.l3HCQSPq009724@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/pygtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9708

Modified Files:
	pygtk2.spec 
Log Message:

* Tue Apr 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.4-2.fc7
- Make pygtk-demo executable (RH bug #236716).



Index: pygtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/pygtk2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pygtk2.spec	6 Feb 2007 01:53:02 -0000	1.2
+++ pygtk2.spec	17 Apr 2007 12:26:25 -0000	1.3
@@ -6,7 +6,7 @@
 
 Name: pygtk2
 Version: 2.10.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: Development/Languages
 Summary: Python bindings for GTK+
@@ -103,12 +103,12 @@
 %dir %{python_sitearch}/gtk-2.0
 %dir %{python_sitearch}/gtk-2.0/gtk
 %{python_sitearch}/gtk-2.0/gtk/*.py*
-%{_bindir}/pygtk-demo
 %dir %{_libdir}/pygtk
 %dir %{_libdir}/pygtk/2.0
 %{_libdir}/pygtk/2.0/*
 
 %defattr(755, root, root, 755)
+%{_bindir}/pygtk-demo
 %{python_sitearch}/gtk-2.0/atk.so
 %{python_sitearch}/gtk-2.0/pango.so
 %{python_sitearch}/gtk-2.0/gtk/_gtk.so
@@ -144,6 +144,9 @@
 %{_datadir}/gtk-doc/html/pygtk
 
 %changelog
+* Tue Apr 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.4-2.fc7
+- Make pygtk-demo executable (RH bug #236716).
+
 * Mon Feb 05 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.4-1.fc7
 - Update to 2.10.4
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 12:28:08 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 08:28:08 -0400
Subject: rpms/pygtk2/FC-6 pygtk.spec,1.75,1.76
Message-ID: <200704171228.l3HCS84T009812@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/pygtk2/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv9794

Modified Files:
	pygtk.spec 
Log Message:

* Tue Apr 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.4-2.fc6
- Make pygtk-demo executable (RH bug #236716).



Index: pygtk.spec
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/FC-6/pygtk.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- pygtk.spec	6 Feb 2007 02:28:22 -0000	1.75
+++ pygtk.spec	17 Apr 2007 12:28:06 -0000	1.76
@@ -6,7 +6,7 @@
 
 Name: pygtk2
 Version: 2.10.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: Development/Languages
 Summary: Python bindings for GTK+
@@ -103,12 +103,12 @@
 %dir %{python_sitearch}/gtk-2.0
 %dir %{python_sitearch}/gtk-2.0/gtk
 %{python_sitearch}/gtk-2.0/gtk/*.py*
-%{_bindir}/pygtk-demo
 %dir %{_libdir}/pygtk
 %dir %{_libdir}/pygtk/2.0
 %{_libdir}/pygtk/2.0/*
 
 %defattr(755, root, root, 755)
+%{_bindir}/pygtk-demo
 %{python_sitearch}/gtk-2.0/atk.so
 %{python_sitearch}/gtk-2.0/pango.so
 %{python_sitearch}/gtk-2.0/gtk/_gtk.so
@@ -144,6 +144,9 @@
 %{_datadir}/gtk-doc/html/pygtk
 
 %changelog
+* Tue Apr 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.4-2.fc6
+- Make pygtk-demo executable (RH bug #236716).
+
 * Mon Feb 05 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.4-1.fc6
 - Update to 2.10.4
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 12:30:27 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 08:30:27 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.11,
	1.12 policycoreutils.spec, 1.398, 1.399
Message-ID: <200704171230.l3HCURMR009973@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Tue Apr 16 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-5
- Fully path script.py


policycoreutils-gui.patch:
 Makefile                    |   34 
 booleansPage.py             |  224 +++
 fcontextPage.py             |  207 +++
 loginsPage.py               |  173 ++
 mappingsPage.py             |   54 
 modulesPage.py              |  172 ++
 polgen.glade                | 1127 ++++++++++++++++
 polgen.py                   |  440 ++++++
 polgengui.py                |  211 +++
 portsPage.py                |  227 +++
 selinux.tbl                 |  274 +++
 semanagePage.py             |  115 +
 statusPage.py               |  220 +++
 system-config-selinux.glade | 3034 ++++++++++++++++++++++++++++++++++++++++++++
 system-config-selinux.py    |  169 ++
 templates/__init__.py       |   18 
 templates/executable.py     |  156 ++
 templates/network.py        |   46 
 templates/rw.py             |  106 +
 templates/script.py         |   42 
 templates/semodule.py       |   41 
 templates/tmp.py            |   74 +
 templates/var_lib.py        |  107 +
 templates/var_log.py        |   91 +
 templates/var_run.py        |   93 +
 templates/var_spool.py      |  107 +
 translationsPage.py         |  111 +
 usersPage.py                |  166 ++
 28 files changed, 7839 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- policycoreutils-gui.patch	15 Apr 2007 01:42:09 -0000	1.11
+++ policycoreutils-gui.patch	17 Apr 2007 12:30:19 -0000	1.12
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.9/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/booleansPage.py	2007-04-14 18:20:06.000000000 -0400
++++ policycoreutils-2.0.9/gui/booleansPage.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,224 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -228,7 +228,7 @@
 +        commands.getstatusoutput(setsebool)
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.9/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/fcontextPage.py	2007-04-14 19:43:20.000000000 -0400
++++ policycoreutils-2.0.9/gui/fcontextPage.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,207 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -439,7 +439,7 @@
 +        self.store.set_value(iter, TYPE_COL, "system_u:object_r:%s:%s" % (type, mls))
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.9/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/loginsPage.py	2007-04-14 18:20:06.000000000 -0400
++++ policycoreutils-2.0.9/gui/loginsPage.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,173 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -616,7 +616,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.9/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/Makefile	2007-04-13 13:28:43.000000000 -0400
++++ policycoreutils-2.0.9/gui/Makefile	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,34 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -654,7 +654,7 @@
 +relabel:
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.9/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/mappingsPage.py	2007-04-14 18:20:06.000000000 -0400
++++ policycoreutils-2.0.9/gui/mappingsPage.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,54 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -712,7 +712,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.9/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/modulesPage.py	2007-04-14 18:20:06.000000000 -0400
++++ policycoreutils-2.0.9/gui/modulesPage.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,172 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -888,7 +888,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.9/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/polgen.glade	2007-04-14 19:43:04.000000000 -0400
++++ policycoreutils-2.0.9/gui/polgen.glade	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,1127 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -2019,7 +2019,7 @@
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.9/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/polgengui.py	2007-04-14 18:20:06.000000000 -0400
++++ policycoreutils-2.0.9/gui/polgengui.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,211 @@
 +#!/usr/bin/python
 +#
@@ -2234,7 +2234,7 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.9/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/polgen.py	2007-04-14 18:20:06.000000000 -0400
++++ policycoreutils-2.0.9/gui/polgen.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,440 @@
 +#! /usr/bin/python
 +# Copyright (C) 2007 Red Hat 
@@ -2678,7 +2678,7 @@
 +	
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.9/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/portsPage.py	2007-04-14 18:20:06.000000000 -0400
++++ policycoreutils-2.0.9/gui/portsPage.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,227 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -2909,7 +2909,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.9/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/selinux.tbl	2007-04-13 13:28:43.000000000 -0400
++++ policycoreutils-2.0.9/gui/selinux.tbl	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,274 @@
 +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
 +allow_cvs_read_shadow  _("CVS") _("Allow cvs daemon to read shadow")
@@ -3187,7 +3187,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.9/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/semanagePage.py	2007-04-14 18:20:06.000000000 -0400
++++ policycoreutils-2.0.9/gui/semanagePage.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,115 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -3306,7 +3306,7 @@
 +    
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.9/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/statusPage.py	2007-04-14 18:20:06.000000000 -0400
++++ policycoreutils-2.0.9/gui/statusPage.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,220 @@
 +## statusPage.py - show selinux status
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -3530,7 +3530,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.9/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/system-config-selinux.glade	2007-04-14 19:43:07.000000000 -0400
++++ policycoreutils-2.0.9/gui/system-config-selinux.glade	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,3034 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -6568,7 +6568,7 @@
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.9/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/system-config-selinux.py	2007-04-14 18:20:06.000000000 -0400
++++ policycoreutils-2.0.9/gui/system-config-selinux.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,169 @@
 +#!/usr/bin/python
 +#
@@ -6741,7 +6741,7 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.9/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/executable.py	2007-04-13 13:28:43.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/executable.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,156 @@
 +#! /usr/bin/env python
 +# Copyright (C) 2007 Red Hat 
@@ -6901,7 +6901,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.9/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/__init__.py	2007-04-13 13:28:43.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/__init__.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -6923,7 +6923,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.9/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/network.py	2007-04-13 13:28:43.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/network.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,46 @@
 +te_port_types="""\
 +# Default Networking
@@ -6973,7 +6973,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.9/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/rw.py	2007-04-13 13:28:43.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/rw.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,106 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7083,7 +7083,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.9/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/script.py	2007-04-13 14:15:33.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/script.py	2007-04-17 08:27:34.000000000 -0400
 @@ -0,0 +1,42 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7111,25 +7111,25 @@
 +compile="""
 +#!/bin/sh
 +make -f /usr/share/selinux/devel/Makefile
-+semodule -i PACKAGEFILENAME.pp
++/usr/sbin/semodule -i PACKAGEFILENAME.pp
 +
 +"""
 +
 +restorecon="""\
-+restorecon -F -R -v FILENAME
++/sbin/restorecon -F -R -v FILENAME
 +"""
 +
 +tcp_ports="""\
-+semanage port -a -t TEMPLATETYPE_port_t -p tcp PORTNUM
++/usr/sbin/semanage port -a -t TEMPLATETYPE_port_t -p tcp PORTNUM
 +"""
 +
 +udp_ports="""\
-+semanage port -a -t TEMPLATETYPE_port_t -p udp PORTNUM
++/usr/sbin/semanage port -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.9/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/semodule.py	2007-04-13 13:28:43.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/semodule.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7174,7 +7174,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.9/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/tmp.py	2007-04-13 13:28:43.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/tmp.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,74 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7252,7 +7252,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.9/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_lib.py	2007-04-13 13:28:43.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/var_lib.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,107 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7363,7 +7363,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.9/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_log.py	2007-04-13 13:28:43.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/var_log.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,91 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7458,7 +7458,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.9/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_run.py	2007-04-13 13:28:43.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/var_run.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,93 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7555,7 +7555,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.9/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_spool.py	2007-04-13 13:28:43.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/var_spool.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,107 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7666,7 +7666,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.9/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/translationsPage.py	2007-04-14 18:20:06.000000000 -0400
++++ policycoreutils-2.0.9/gui/translationsPage.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,111 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -7781,7 +7781,7 @@
 +        self.store.set_value(iter, 1, translation)
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.9/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/usersPage.py	2007-04-14 18:20:06.000000000 -0400
++++ policycoreutils-2.0.9/gui/usersPage.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,166 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -r1.398 -r1.399
--- policycoreutils.spec	16 Apr 2007 17:27:49 -0000	1.398
+++ policycoreutils.spec	17 Apr 2007 12:30:20 -0000	1.399
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 2.0.9
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Tue Apr 16 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-5
+- Fully path script.py
+
 * Mon Apr 16 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-4
 - Add -l flag to restorecon to not traverse file systems
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 12:31:51 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 08:31:51 -0400
Subject: rpms/policycoreutils/FC-6 policycoreutils-gui.patch, 1.1,
	1.2 policycoreutils.spec, 1.332, 1.333
Message-ID: <200704171231.l3HCVp85023411@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Tue Apr 17 2007 Dan Walsh <dwalsh at redhat.com> 1.34.1-7
- Fully path script.py


policycoreutils-gui.patch:
 Makefile                    |   34 
 booleansPage.py             |  224 +++
 fcontextPage.py             |  207 +++
 loginsPage.py               |  173 ++
 mappingsPage.py             |   54 
 modulesPage.py              |  172 ++
 polgen.glade                | 1127 ++++++++++++++++
 polgen.py                   |  440 ++++++
 polgengui.py                |  211 +++
 portsPage.py                |  227 +++
 selinux.tbl                 |  274 +++
 semanagePage.py             |  115 +
 statusPage.py               |  220 +++
 system-config-selinux.glade | 3034 ++++++++++++++++++++++++++++++++++++++++++++
 system-config-selinux.py    |  169 ++
 templates/__init__.py       |   18 
 templates/executable.py     |  156 ++
 templates/network.py        |   46 
 templates/rw.py             |  106 +
 templates/script.py         |   42 
 templates/semodule.py       |   41 
 templates/tmp.py            |   74 +
 templates/var_lib.py        |  107 +
 templates/var_log.py        |   91 +
 templates/var_run.py        |   93 +
 templates/var_spool.py      |  107 +
 translationsPage.py         |  111 +
 usersPage.py                |  166 ++
 28 files changed, 7839 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-6/policycoreutils-gui.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- policycoreutils-gui.patch	16 Apr 2007 18:04:13 -0000	1.1
+++ policycoreutils-gui.patch	17 Apr 2007 12:31:49 -0000	1.2
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.9/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/booleansPage.py	2007-04-14 18:20:06.000000000 -0400
++++ policycoreutils-2.0.9/gui/booleansPage.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,224 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -228,7 +228,7 @@
 +        commands.getstatusoutput(setsebool)
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.9/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/fcontextPage.py	2007-04-14 19:43:20.000000000 -0400
++++ policycoreutils-2.0.9/gui/fcontextPage.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,207 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -439,7 +439,7 @@
 +        self.store.set_value(iter, TYPE_COL, "system_u:object_r:%s:%s" % (type, mls))
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.9/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/loginsPage.py	2007-04-14 18:20:06.000000000 -0400
++++ policycoreutils-2.0.9/gui/loginsPage.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,173 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -616,7 +616,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.9/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/Makefile	2007-04-13 13:28:43.000000000 -0400
++++ policycoreutils-2.0.9/gui/Makefile	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,34 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -654,7 +654,7 @@
 +relabel:
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.9/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/mappingsPage.py	2007-04-14 18:20:06.000000000 -0400
++++ policycoreutils-2.0.9/gui/mappingsPage.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,54 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -712,7 +712,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.9/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/modulesPage.py	2007-04-14 18:20:06.000000000 -0400
++++ policycoreutils-2.0.9/gui/modulesPage.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,172 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -888,7 +888,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.9/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/polgen.glade	2007-04-14 19:43:04.000000000 -0400
++++ policycoreutils-2.0.9/gui/polgen.glade	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,1127 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -2019,7 +2019,7 @@
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.9/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/polgengui.py	2007-04-14 18:20:06.000000000 -0400
++++ policycoreutils-2.0.9/gui/polgengui.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,211 @@
 +#!/usr/bin/python
 +#
@@ -2234,7 +2234,7 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.9/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/polgen.py	2007-04-14 18:20:06.000000000 -0400
++++ policycoreutils-2.0.9/gui/polgen.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,440 @@
 +#! /usr/bin/python
 +# Copyright (C) 2007 Red Hat 
@@ -2678,7 +2678,7 @@
 +	
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.9/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/portsPage.py	2007-04-14 18:20:06.000000000 -0400
++++ policycoreutils-2.0.9/gui/portsPage.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,227 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -2909,7 +2909,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.9/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/selinux.tbl	2007-04-13 13:28:43.000000000 -0400
++++ policycoreutils-2.0.9/gui/selinux.tbl	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,274 @@
 +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
 +allow_cvs_read_shadow  _("CVS") _("Allow cvs daemon to read shadow")
@@ -3187,7 +3187,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.9/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/semanagePage.py	2007-04-14 18:20:06.000000000 -0400
++++ policycoreutils-2.0.9/gui/semanagePage.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,115 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -3306,7 +3306,7 @@
 +    
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.9/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/statusPage.py	2007-04-14 18:20:06.000000000 -0400
++++ policycoreutils-2.0.9/gui/statusPage.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,220 @@
 +## statusPage.py - show selinux status
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -3530,7 +3530,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.9/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/system-config-selinux.glade	2007-04-14 19:43:07.000000000 -0400
++++ policycoreutils-2.0.9/gui/system-config-selinux.glade	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,3034 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -6568,7 +6568,7 @@
 +</glade-interface>
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.9/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/system-config-selinux.py	2007-04-14 18:20:06.000000000 -0400
++++ policycoreutils-2.0.9/gui/system-config-selinux.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,169 @@
 +#!/usr/bin/python
 +#
@@ -6741,7 +6741,7 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.9/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/executable.py	2007-04-13 13:28:43.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/executable.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,156 @@
 +#! /usr/bin/env python
 +# Copyright (C) 2007 Red Hat 
@@ -6901,7 +6901,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.9/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/__init__.py	2007-04-13 13:28:43.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/__init__.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -6923,7 +6923,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.9/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/network.py	2007-04-13 13:28:43.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/network.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,46 @@
 +te_port_types="""\
 +# Default Networking
@@ -6973,7 +6973,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.9/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/rw.py	2007-04-13 13:28:43.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/rw.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,106 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7083,7 +7083,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.9/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/script.py	2007-04-13 14:15:33.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/script.py	2007-04-17 08:27:34.000000000 -0400
 @@ -0,0 +1,42 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7111,25 +7111,25 @@
 +compile="""
 +#!/bin/sh
 +make -f /usr/share/selinux/devel/Makefile
-+semodule -i PACKAGEFILENAME.pp
++/usr/sbin/semodule -i PACKAGEFILENAME.pp
 +
 +"""
 +
 +restorecon="""\
-+restorecon -F -R -v FILENAME
++/sbin/restorecon -F -R -v FILENAME
 +"""
 +
 +tcp_ports="""\
-+semanage port -a -t TEMPLATETYPE_port_t -p tcp PORTNUM
++/usr/sbin/semanage port -a -t TEMPLATETYPE_port_t -p tcp PORTNUM
 +"""
 +
 +udp_ports="""\
-+semanage port -a -t TEMPLATETYPE_port_t -p udp PORTNUM
++/usr/sbin/semanage port -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.9/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/semodule.py	2007-04-13 13:28:43.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/semodule.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7174,7 +7174,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.9/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/tmp.py	2007-04-13 13:28:43.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/tmp.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,74 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7252,7 +7252,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.9/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_lib.py	2007-04-13 13:28:43.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/var_lib.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,107 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7363,7 +7363,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.9/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_log.py	2007-04-13 13:28:43.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/var_log.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,91 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7458,7 +7458,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.9/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_run.py	2007-04-13 13:28:43.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/var_run.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,93 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7555,7 +7555,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.9/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_spool.py	2007-04-13 13:28:43.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/var_spool.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,107 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7666,7 +7666,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.9/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/translationsPage.py	2007-04-14 18:20:06.000000000 -0400
++++ policycoreutils-2.0.9/gui/translationsPage.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,111 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -7781,7 +7781,7 @@
 +        self.store.set_value(iter, 1, translation)
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.9/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/usersPage.py	2007-04-14 18:20:06.000000000 -0400
++++ policycoreutils-2.0.9/gui/usersPage.py	2007-04-16 13:26:34.000000000 -0400
 @@ -0,0 +1,166 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-6/policycoreutils.spec,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -r1.332 -r1.333
--- policycoreutils.spec	16 Apr 2007 18:04:13 -0000	1.332
+++ policycoreutils.spec	17 Apr 2007 12:31:49 -0000	1.333
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.34.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -190,6 +190,9 @@
 fi
 
 %changelog
+* Tue Apr 17 2007 Dan Walsh <dwalsh at redhat.com> 1.34.1-7
+- Fully path script.py
+
 * Mon Apr 16 2007 Dan Walsh <dwalsh at redhat.com> 1.34.1-6
 - Add sepolgen/gui
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 12:35:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 08:35:32 -0400
Subject: rpms/libsepol/devel .cvsignore, 1.116, 1.117 libsepol.spec, 1.155,
	1.156 sources, 1.117, 1.118
Message-ID: <200704171235.l3HCZWOO025925@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libsepol.spec sources 
Log Message:
* Tue Apr 17 2007 Dan Walsh <dwalsh at redhat.com> 2.0.3-1
- Upgrade to latest from NSA
	* Merged add boolmap argument to expand_module_avrules() from Chris PeBenito.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- .cvsignore	30 Mar 2007 16:05:14 -0000	1.116
+++ .cvsignore	17 Apr 2007 12:35:30 -0000	1.117
@@ -116,3 +116,4 @@
 libsepol-1.16.0.tgz
 libsepol-2.0.1.tgz
 libsepol-2.0.2.tgz
+libsepol-2.0.3.tgz


Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- libsepol.spec	30 Mar 2007 16:05:14 -0000	1.155
+++ libsepol.spec	17 Apr 2007 12:35:30 -0000	1.156
@@ -1,6 +1,6 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
-Version: 2.0.2
+Version: 2.0.3
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
@@ -85,6 +85,10 @@
 /%{_lib}/libsepol.so.1
 
 %changelog
+* Tue Apr 17 2007 Dan Walsh <dwalsh at redhat.com> 2.0.3-1
+- Upgrade to latest from NSA
+	* Merged add boolmap argument to expand_module_avrules() from Chris PeBenito.
+
 * Fri Mar 30 2007 Dan Walsh <dwalsh at redhat.com> 2.0.2-1
 - Upgrade to latest from NSA
 	* Merged fix from Karl to remap booleans at expand time to 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/sources,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- sources	30 Mar 2007 16:05:14 -0000	1.117
+++ sources	17 Apr 2007 12:35:30 -0000	1.118
@@ -1 +1 @@
-eba6e81c2b06d7d957c150a67007edcc  libsepol-2.0.2.tgz
+69676a7ddfb74c72e1283db689729fbd  libsepol-2.0.3.tgz



From fedora-cvs-commits at redhat.com  Tue Apr 17 12:44:13 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 08:44:13 -0400
Subject: rpms/filesystem/devel filesystem.spec,1.36,1.37
Message-ID: <200704171244.l3HCiDkB032270@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/filesystem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32127

Modified Files:
	filesystem.spec 
Log Message:
- Added several more /usr/share directories (#222905)



Index: filesystem.spec
===================================================================
RCS file: /cvs/dist/rpms/filesystem/devel/filesystem.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- filesystem.spec	31 Mar 2007 23:25:10 -0000	1.36
+++ filesystem.spec	17 Apr 2007 12:44:11 -0000	1.37
@@ -1,6 +1,6 @@
 Summary: The basic directory layout for a Linux system
 Name: filesystem
-Version: 2.4.5
+Version: 2.4.6
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -28,7 +28,7 @@
 	bin boot dev \
 	etc/{X11/{applnk,sysconfig,serverconfig},xdg,xdg/menus,xdg/autostart,opt,xinetd.d,skel,sysconfig,pki} \
 	home lib/modules %{_lib}/tls media mnt opt proc root sbin selinux srv sys tmp \
-        usr/{bin,etc,games,include,%{_lib}/{games,sse2,tls,X11},lib/{games,locale,X11},libexec,local/{bin,etc,games,lib,%{_lib},sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{applications,doc,dict,games,info,icons,mime-info,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},misc,empty,pixmaps,xsessions},src} \
+        usr/{bin,etc,games,include,%{_lib}/{games,sse2,tls,X11},lib/{games,locale,X11},libexec,local/{bin,etc,games,lib,%{_lib},sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{applications,desktop-directories,dict,doc,empty,games,gtk-doc,icons,info,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},mime-info,misc,pixmaps,omf,xsessions},src} \
         var/{empty,lib/{games,misc},local,lock/subsys,log,nis,preserve,run,spool/{mail,lpd},tmp,db,cache,opt,games,yp}
 
 ln -snf ../var/tmp usr/tmp
@@ -96,16 +96,20 @@
 /usr/sbin
 %dir /usr/share
 /usr/share/applications
-/usr/share/doc
+/usr/share/desktop-directories
 /usr/share/dict
-/usr/share/games
+/usr/share/doc
 %attr(555,root,root) %dir /usr/share/empty
+/usr/share/games
+/usr/share/gtk-doc
+/usr/share/icons
 /usr/share/info
 %dir /usr/share/locale
 /usr/share/man
 /usr/share/mime-info
 /usr/share/misc
 /usr/share/pixmaps
+/usr/share/omf
 /usr/share/xsessions
 /usr/src
 %dir /var
@@ -130,6 +134,9 @@
 /var/yp
 
 %changelog
+* Tue Apr 17 2007 Phil Knirsch <pknirsch at redhat.com> - 2.4.6-1
+- Added several more /usr/share directories (#222905)
+
 * Sat Mar 31 2007 Peter Jones <pjones at redhat.com> - 2.4.5-1
 - add /usr/local/share/applications
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 12:50:37 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 08:50:37 -0400
Subject: rpms/autofs/devel autofs-5.0.1-cmd-global-options-fix.patch, NONE,
	1.1 autofs-5.0.1-disable-exports-check.patch, NONE,
	1.1 autofs-5.0.1-localfs-label-check.patch, NONE,
	1.1 autofs.spec, 1.199, 1.200
Message-ID: <200704171250.l3HCobw6004595@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-cmd-global-options-fix.patch 
	autofs-5.0.1-disable-exports-check.patch 
	autofs-5.0.1-localfs-label-check.patch 
Log Message:
* Tue Apr 17 2007 Ian Kent <ikent at redhat.com> - 5.0.1-9
- upstream fix for filesystem is local check.
- disable exports access control check (bz 203277).
- fix patch to add command option for set a global mount options (bz 214684).


autofs-5.0.1-cmd-global-options-fix.patch:
 parse_sun.c |  101 ++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 61 insertions(+), 40 deletions(-)

--- NEW FILE autofs-5.0.1-cmd-global-options-fix.patch ---
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 0494e76..99961c3 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -264,7 +264,7 @@ int parse_init(int argc, const char *const *argv, void **context)
 {
 	struct parse_context *ctxt;
 	char buf[MAX_ERR_BUF];
-	char *noptstr, *def, *val, *macros;
+	char *noptstr, *def, *val, *macros, *gbl_options;
 	const char *xopt;
 	int optlen, len, offset;
 	int i, bval;
@@ -397,25 +397,31 @@ int parse_init(int argc, const char *const *argv, void **context)
 		}
 	}
 
+	gbl_options = NULL;
 	if (global_options) {
+		if (ctxt->optstr && strstr(ctxt->optstr, global_options))
+			goto options_done;
+		gbl_options = strdup(global_options);
+	}
+
+	if (gbl_options) {
 		append_options = defaults_get_append_options();
 		if (append_options) {
-			char *tmp = concat_options(global_options, ctxt->optstr);
+			char *tmp = concat_options(gbl_options, ctxt->optstr);
 			if (!tmp) {
 				char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 				error(LOGOPT_ANY, MODPREFIX "concat_options: %s", estr);
+				free(gbl_options);
 			} else
 				ctxt->optstr = tmp;
 		} else {
 			if (!ctxt->optstr)
-				ctxt->optstr = strdup(global_options);
-			if (!ctxt->optstr) {
-				char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
-				warn(LOGOPT_ANY, MODPREFIX "%s", estr);
-			}
+				ctxt->optstr = gbl_options;
+			else
+				free(gbl_options);
 		}
 	}
-
+options_done:
 	debug(LOGOPT_NONE,
 	      MODPREFIX "init gathered global options: %s", ctxt->optstr);
 
@@ -799,18 +805,23 @@ static int parse_mapent(const char *ent, char *g_options, char **options, char *
 			char *tmp, *newopt = NULL;
 
 			p = parse_options(p, &newopt, logopt);
-			tmp = concat_options(myoptions, newopt);
-			if (!tmp) {
-				char *estr;
-				estr = strerror_r(errno, buf, MAX_ERR_BUF);
-				error(logopt, MODPREFIX
-				      "concat_options: %s", estr);
-				if (newopt)
-					free(newopt);
+			if (newopt && strstr(newopt, myoptions)) {
 				free(myoptions);
-				return 0;
+				myoptions = newopt;
+			} else {
+				tmp = concat_options(myoptions, newopt);
+				if (!tmp) {
+					char *estr;
+					estr = strerror_r(errno, buf, MAX_ERR_BUF);
+					error(logopt, MODPREFIX
+					      "concat_options: %s", estr);
+					if (newopt)
+						free(newopt);
+					free(myoptions);
+					return 0;
+				}
+				myoptions = tmp;
 			}
-			myoptions = tmp;
 
 			p = skipspace(p);
 		} while (*p == '-');
@@ -1042,19 +1053,24 @@ int parse_mount(struct autofs_point *ap, const char *name,
 			char *noptions = NULL;
 
 			p = parse_options(p, &noptions, ap->logopt);
-			tmp = concat_options(mnt_options, noptions);
-			if (!tmp) {
-				char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
-				error(ap->logopt,
-				      MODPREFIX "concat_options: %s", estr);
-				if (noptions)
-					free(noptions);
-				if (mnt_options)
-					free(mnt_options);
-				free(options);
-				return 1;
+			if (mnt_options && noptions && strstr(noptions, mnt_options)) {
+				free(mnt_options);
+				mnt_options = noptions;
+			} else {
+				tmp = concat_options(mnt_options, noptions);
+				if (!tmp) {
+					char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+					error(ap->logopt,
+					      MODPREFIX "concat_options: %s", estr);
+					if (noptions)
+						free(noptions);
+					if (mnt_options)
+						free(mnt_options);
+					free(options);
+					return 1;
+				}
+				mnt_options = tmp;
 			}
-			mnt_options = tmp;
 
 			p = skipspace(p);
 		} while (*p == '-');
@@ -1065,17 +1081,22 @@ int parse_mount(struct autofs_point *ap, const char *name,
 		}
 
 		if (append_options) {
-			tmp = concat_options(options, mnt_options);
-			if (!tmp) {
-				char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
-				error(ap->logopt, MODPREFIX "concat_options: %s", estr);
-				if (options)
-					free(options);
-				if (mnt_options)
-					free(mnt_options);
-				return 1;
+			if (options && mnt_options && strstr(mnt_options, options)) {
+				free(options);
+				options = mnt_options;
+			} else {
+				tmp = concat_options(options, mnt_options);
+				if (!tmp) {
+					char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+					error(ap->logopt, MODPREFIX "concat_options: %s", estr);
+					if (options)
+						free(options);
+					if (mnt_options)
+						free(mnt_options);
+					return 1;
+				}
+				options = tmp;
 			}
-			options = tmp;
 		} else
 			options = mnt_options;
 	}

autofs-5.0.1-disable-exports-check.patch:
 lookup_hosts.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE autofs-5.0.1-disable-exports-check.patch ---
diff --git a/modules/lookup_hosts.c b/modules/lookup_hosts.c
index f6a65ae..a9a4c75 100644
--- a/modules/lookup_hosts.c
+++ b/modules/lookup_hosts.c
@@ -208,7 +208,7 @@ done:
 	exp = rpc_get_exports(name, 10, 0, RPC_CLOSE_NOLINGER);
 
 	/* Check exports for obvious ones we don't have access to */
-	exp = rpc_exports_prune(exp);
+	/*exp = rpc_exports_prune(exp);*/
 
 	mapent = NULL;
 	while (exp) {

autofs-5.0.1-localfs-label-check.patch:
 mounts.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE autofs-5.0.1-localfs-label-check.patch ---
diff --git a/lib/mounts.c b/lib/mounts.c
index 524f0ee..0e428e8 100644
--- a/lib/mounts.c
+++ b/lib/mounts.c
@@ -371,7 +371,9 @@ int contained_in_local_fs(const char *path)
 						ret = 1;
 				} else
 					ret = 1;
-			}
+			} else if (!strncmp("LABEL=", this->fs_name, 6) ||
+				   !strncmp("UUID=", this->fs_name, 5))
+				ret = 1;
 			break;
 		}
 	}


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- autofs.spec	16 Apr 2007 09:14:14 -0000	1.199
+++ autofs.spec	17 Apr 2007 12:50:30 -0000	1.200
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.1
-Release: 8
+Release: 9
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
@@ -24,6 +24,9 @@
 Patch12: autofs-5.0.1-null-domain-fix.patch
 Patch13: autofs-5.0.1-conf-append-global.patch
 Patch14: autofs-5.0.1-cmd-global-options.patch
+Patch15: autofs-5.0.1-localfs-label-check.patch
+Patch16: autofs-5.0.1-disable-exports-check.patch
+Patch17: autofs-5.0.1-cmd-global-options-fix.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Conflicts: kernel < 2.6.17
@@ -79,6 +82,9 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -131,6 +137,11 @@
 %{_libdir}/autofs/
 
 %changelog
+* Tue Apr 17 2007 Ian Kent <ikent at redhat.com> - 5.0.1-9
+- upstream fix for filesystem is local check.
+- disable exports access control check (bz 203277).
+- fix patch to add command option for set a global mount options (bz 214684).
+
 * Mon Apr 16 2007 Ian Kent <ikent at redhat.com> - 5.0.1-8
 - add configuration variable to control appending of global options (bz 214684).
 - add command option to set a global mount options string (bz 214684).



From fedora-cvs-commits at redhat.com  Tue Apr 17 12:52:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 08:52:53 -0400
Subject: rpms/selinux-policy/FC-6 policy-20061106.patch, 1.36,
	1.37 selinux-policy.spec, 1.360, 1.361
Message-ID: <200704171252.l3HCqr46006308@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20061106.patch selinux-policy.spec 
Log Message:
* Mon Apr 16 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-59
- Allow racoon to send audit messages
Resolves: #232508


policy-20061106.patch:
 Rules.modular                                |   10 
 config/appconfig-strict-mcs/seusers          |    1 
 config/appconfig-strict-mls/default_contexts |    6 
 config/appconfig-strict-mls/seusers          |    1 
 config/appconfig-strict/seusers              |    1 
 man/man8/kerberos_selinux.8                  |    2 
 policy/flask/access_vectors                  |    2 
 policy/global_tunables                       |   89 ++++
 policy/mls                                   |   31 +
 policy/modules/admin/acct.te                 |    1 
 policy/modules/admin/amanda.if               |   17 
 policy/modules/admin/amanda.te               |    6 
 policy/modules/admin/amtu.fc                 |    3 
 policy/modules/admin/amtu.if                 |   57 ++
 policy/modules/admin/amtu.te                 |   56 ++
 policy/modules/admin/backup.te               |    5 
 policy/modules/admin/bootloader.fc           |    5 
 policy/modules/admin/bootloader.te           |   14 
 policy/modules/admin/consoletype.te          |   21 
 policy/modules/admin/ddcprobe.te             |   10 
 policy/modules/admin/dmesg.te                |    7 
 policy/modules/admin/dmidecode.te            |    5 
 policy/modules/admin/firstboot.if            |    6 
 policy/modules/admin/kudzu.te                |   14 
 policy/modules/admin/logrotate.te            |    5 
 policy/modules/admin/logwatch.te             |   12 
 policy/modules/admin/netutils.te             |   13 
 policy/modules/admin/portage.te              |    5 
 policy/modules/admin/prelink.te              |   18 
 policy/modules/admin/quota.fc                |    7 
 policy/modules/admin/quota.te                |   24 -
 policy/modules/admin/rpm.fc                  |    3 
 policy/modules/admin/rpm.if                  |   43 ++
 policy/modules/admin/rpm.te                  |   49 --
 policy/modules/admin/su.if                   |   28 -
 policy/modules/admin/su.te                   |    2 
 policy/modules/admin/sudo.if                 |   10 
 policy/modules/admin/tripwire.te             |   11 
 policy/modules/admin/usbmodules.te           |    5 
 policy/modules/admin/usermanage.if           |    2 
 policy/modules/admin/usermanage.te           |   42 +
 policy/modules/admin/vpn.te                  |    1 
 policy/modules/apps/ethereal.te              |    5 
 policy/modules/apps/evolution.if             |  107 ++++-
 policy/modules/apps/evolution.te             |    1 
 policy/modules/apps/games.fc                 |    1 
 policy/modules/apps/gnome.fc                 |    2 
 policy/modules/apps/gnome.if                 |  108 +++++
 policy/modules/apps/gnome.te                 |    5 
 policy/modules/apps/gpg.if                   |    1 
 policy/modules/apps/java.fc                  |    2 
 policy/modules/apps/java.if                  |   38 +
 policy/modules/apps/java.te                  |    2 
 policy/modules/apps/loadkeys.if              |   17 
 policy/modules/apps/mozilla.if               |  210 ++++++++-
 policy/modules/apps/mplayer.if               |   84 +++
 policy/modules/apps/mplayer.te               |    1 
 policy/modules/apps/slocate.te               |    3 
 policy/modules/apps/thunderbird.if           |   81 +++
 policy/modules/apps/userhelper.if            |   19 
 policy/modules/apps/webalizer.te             |    6 
 policy/modules/apps/wine.fc                  |    1 
 policy/modules/apps/yam.te                   |    5 
 policy/modules/kernel/corecommands.fc        |   19 
 policy/modules/kernel/corecommands.if        |   77 +++
 policy/modules/kernel/corenetwork.if.in      |  140 ++++++
 policy/modules/kernel/corenetwork.te.in      |   14 
 policy/modules/kernel/devices.fc             |    8 
 policy/modules/kernel/devices.if             |   18 
 policy/modules/kernel/devices.te             |    8 
 policy/modules/kernel/domain.if              |   58 ++
 policy/modules/kernel/domain.te              |   22 +
 policy/modules/kernel/files.fc               |    2 
 policy/modules/kernel/files.if               |  224 ++++++++++
 policy/modules/kernel/filesystem.if          |   62 ++
 policy/modules/kernel/filesystem.te          |   20 
 policy/modules/kernel/kernel.if              |   84 +++
 policy/modules/kernel/kernel.te              |   22 -
 policy/modules/kernel/mls.if                 |   28 +
 policy/modules/kernel/mls.te                 |    6 
 policy/modules/kernel/storage.fc             |    3 
 policy/modules/kernel/storage.if             |    2 
 policy/modules/kernel/terminal.fc            |    1 
 policy/modules/kernel/terminal.if            |    2 
 policy/modules/kernel/terminal.te            |    1 
 policy/modules/services/afs.pp               |binary
 policy/modules/services/aide.fc              |    2 
 policy/modules/services/aide.pp              |binary
 policy/modules/services/aide.te              |    7 
 policy/modules/services/amavis.pp            |binary
 policy/modules/services/amavis.te            |    2 
 policy/modules/services/apache.fc            |   17 
 policy/modules/services/apache.if            |   22 -
 policy/modules/services/apache.pp            |binary
 policy/modules/services/apache.te            |   43 +-
 policy/modules/services/apm.pp               |binary
 policy/modules/services/apm.te               |    3 
 policy/modules/services/arpwatch.pp          |binary
 policy/modules/services/asterisk.pp          |binary
 policy/modules/services/audioentropy.pp      |binary
 policy/modules/services/automount.fc         |    1 
 policy/modules/services/automount.te         |    9 
 policy/modules/services/avahi.if             |   40 +
 policy/modules/services/bind.fc              |    1 
 policy/modules/services/bind.te              |    5 
 policy/modules/services/bluetooth.te         |    8 
 policy/modules/services/ccs.fc               |    1 
 policy/modules/services/ccs.te               |   11 
 policy/modules/services/clamav.te            |    2 
 policy/modules/services/cron.fc              |    6 
 policy/modules/services/cron.if              |   92 ++--
 policy/modules/services/cron.te              |   52 ++
 policy/modules/services/cups.fc              |    3 
 policy/modules/services/cups.te              |   13 
 policy/modules/services/cvs.te               |    1 
 policy/modules/services/cyrus.te             |    5 
 policy/modules/services/dbus.fc              |    1 
 policy/modules/services/dbus.if              |   62 ++
 policy/modules/services/dcc.te               |    9 
 policy/modules/services/dhcp.te              |    2 
 policy/modules/services/dovecot.te           |    6 
 policy/modules/services/ftp.te               |   18 
 policy/modules/services/hal.fc               |    4 
 policy/modules/services/hal.if               |   57 ++
 policy/modules/services/hal.te               |   22 -
 policy/modules/services/inetd.te             |   28 +
 policy/modules/services/irqbalance.te        |    4 
 policy/modules/services/kerberos.if          |   25 +
 policy/modules/services/kerberos.te          |   15 
 policy/modules/services/ktalk.fc             |    3 
 policy/modules/services/ktalk.te             |    5 
 policy/modules/services/lpd.if               |   57 +-
 policy/modules/services/lpd.te               |    5 
 policy/modules/services/mailman.if           |   20 
 policy/modules/services/mta.fc               |    1 
 policy/modules/services/mta.if               |   20 
 policy/modules/services/mta.te               |    2 
 policy/modules/services/munin.te             |    5 
 policy/modules/services/networkmanager.fc    |    2 
 policy/modules/services/networkmanager.te    |    2 
 policy/modules/services/nis.fc               |    3 
 policy/modules/services/nis.if               |    8 
 policy/modules/services/nis.te               |   34 +
 policy/modules/services/nscd.if              |   20 
 policy/modules/services/nscd.te              |   24 -
 policy/modules/services/oav.te               |    5 
 policy/modules/services/oddjob.te            |    3 
 policy/modules/services/openca.if            |    4 
 policy/modules/services/openca.te            |    2 
 policy/modules/services/openvpn.te           |    4 
 policy/modules/services/pcscd.fc             |    9 
 policy/modules/services/pcscd.if             |   62 ++
 policy/modules/services/pcscd.te             |   78 +++
 policy/modules/services/pegasus.if           |   31 +
 policy/modules/services/pegasus.te           |    6 
 policy/modules/services/portmap.te           |    5 
 policy/modules/services/postfix.fc           |    1 
 policy/modules/services/postfix.if           |    3 
 policy/modules/services/postfix.te           |   22 +
 policy/modules/services/procmail.te          |   28 +
 policy/modules/services/pyzor.if             |   18 
 policy/modules/services/pyzor.te             |   13 
 policy/modules/services/radius.te            |    1 
 policy/modules/services/radvd.te             |    2 
 policy/modules/services/rhgb.if              |   76 +++
 policy/modules/services/rhgb.te              |    3 
 policy/modules/services/ricci.te             |   21 
 policy/modules/services/rlogin.te            |   10 
 policy/modules/services/rpc.fc               |    1 
 policy/modules/services/rpc.if               |    3 
 policy/modules/services/rpc.te               |   26 -
 policy/modules/services/rsync.te             |    1 
 policy/modules/services/samba.fc             |    5 
 policy/modules/services/samba.if             |   62 ++
 policy/modules/services/samba.te             |   64 ++-
 policy/modules/services/sasl.te              |   12 
 policy/modules/services/sendmail.if          |   22 +
 policy/modules/services/sendmail.te          |    8 
 policy/modules/services/setroubleshoot.if    |   20 
 policy/modules/services/setroubleshoot.te    |    2 
 policy/modules/services/smartmon.te          |    1 
 policy/modules/services/snmp.if              |   17 
 policy/modules/services/snmp.te              |   17 
 policy/modules/services/spamassassin.fc      |    2 
 policy/modules/services/spamassassin.if      |   42 +
 policy/modules/services/spamassassin.te      |   18 
 policy/modules/services/squid.fc             |    2 
 policy/modules/services/squid.if             |   21 
 policy/modules/services/squid.te             |   11 
 policy/modules/services/ssh.if               |   83 +++
 policy/modules/services/ssh.te               |   14 
 policy/modules/services/telnet.te            |    3 
 policy/modules/services/tftp.te              |    2 
 policy/modules/services/uucp.fc              |    1 
 policy/modules/services/uucp.if              |   67 +++
 policy/modules/services/uucp.te              |   44 +-
 policy/modules/services/xserver.fc           |    2 
 policy/modules/services/xserver.if           |  190 ++++++++-
 policy/modules/services/xserver.te           |   12 
 policy/modules/system/authlogin.if           |   76 +++
 policy/modules/system/authlogin.te           |    6 
 policy/modules/system/clock.te               |   13 
 policy/modules/system/fstools.fc             |    1 
 policy/modules/system/fstools.te             |   11 
 policy/modules/system/getty.te               |   14 
 policy/modules/system/hostname.te            |   19 
 policy/modules/system/init.if                |   64 +++
 policy/modules/system/init.te                |   51 ++
 policy/modules/system/ipsec.fc               |    5 
 policy/modules/system/ipsec.if               |   99 ++++
 policy/modules/system/ipsec.te               |  121 +++++
 policy/modules/system/iptables.te            |   22 -
 policy/modules/system/libraries.fc           |   39 +
 policy/modules/system/libraries.te           |   11 
 policy/modules/system/locallogin.if          |   37 +
 policy/modules/system/locallogin.te          |    6 
 policy/modules/system/logging.fc             |    5 
 policy/modules/system/logging.te             |   27 +
 policy/modules/system/lvm.fc                 |    2 
 policy/modules/system/lvm.if                 |   44 ++
 policy/modules/system/lvm.te                 |   79 +++
 policy/modules/system/miscfiles.fc           |    3 
 policy/modules/system/miscfiles.if           |   79 +++
 policy/modules/system/modutils.te            |   25 -
 policy/modules/system/mount.te               |   27 -
 policy/modules/system/netlabel.te            |    6 
 policy/modules/system/pcmcia.te              |    5 
 policy/modules/system/raid.te                |   15 
 policy/modules/system/selinuxutil.fc         |    2 
 policy/modules/system/selinuxutil.if         |  119 +++++
 policy/modules/system/selinuxutil.te         |  124 ++---
 policy/modules/system/sysnetwork.te          |   10 
 policy/modules/system/tzdata.fc              |    3 
 policy/modules/system/tzdata.if              |   23 +
 policy/modules/system/tzdata.te              |   51 ++
 policy/modules/system/unconfined.fc          |    4 
 policy/modules/system/unconfined.if          |   19 
 policy/modules/system/unconfined.te          |   23 +
 policy/modules/system/userdomain.if          |  569 ++++++++++++++++++++++++---
 policy/modules/system/userdomain.te          |   76 +--
 policy/modules/system/xen.fc                 |    1 
 policy/modules/system/xen.te                 |   46 +-
 242 files changed, 5520 insertions(+), 624 deletions(-)

Index: policy-20061106.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-20061106.patch,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- policy-20061106.patch	13 Apr 2007 14:54:43 -0000	1.36
+++ policy-20061106.patch	17 Apr 2007 12:52:50 -0000	1.37
@@ -4032,10 +4032,9 @@
 Binary files nsaserefpolicy/policy/modules/services/afs.pp and serefpolicy-2.4.6/policy/modules/services/afs.pp differ
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aide.fc serefpolicy-2.4.6/policy/modules/services/aide.fc
 --- nsaserefpolicy/policy/modules/services/aide.fc	2006-11-29 12:04:49.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/aide.fc	2007-04-02 15:31:12.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/services/aide.fc	2007-04-16 09:32:49.000000000 -0400
 @@ -1,5 +1,5 @@
--/usr/sbin/aide		--	gen_context(system_u:object_r:aide_exec_t,mls_systemhigh)
-+l/usr/sbin/aide		--	gen_context(system_u:object_r:aide_exec_t,mls_systemhigh)
+ /usr/sbin/aide		--	gen_context(system_u:object_r:aide_exec_t,mls_systemhigh)
  
 -/var/lib/aide(/.*)		gen_context(system_u:object_r:aide_db_t,mls_systemhigh)
 +/var/lib/aide(/.*)?		gen_context(system_u:object_r:aide_db_t,mls_systemhigh)
@@ -5731,6 +5730,36 @@
 +	ssh_sigchld(checkpc_t)
 +	ssh_rw_stream_sockets(checkpc_t)
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-2.4.6/policy/modules/services/mailman.if
+--- nsaserefpolicy/policy/modules/services/mailman.if	2006-11-29 12:04:49.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/services/mailman.if	2007-04-16 11:03:00.000000000 -0400
+@@ -291,6 +291,26 @@
+ 
+ #######################################
+ ## <summary>
++##	Append
++##	mailman logs.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`mailman_append_log',`
++	gen_require(`
++		type mailman_log_t;
++	')
++
++	allow $1 mailman_log_t:dir search_dir_perms;
++	allow $1 mailman_log_t:file ra_file_perms;
++')
++
++#######################################
++## <summary>
+ ##	Allow domain to read mailman archive files.
+ ## </summary>
+ ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-2.4.6/policy/modules/services/mta.fc
 --- nsaserefpolicy/policy/modules/services/mta.fc	2006-11-29 12:04:49.000000000 -0500
 +++ serefpolicy-2.4.6/policy/modules/services/mta.fc	2007-03-09 13:35:58.000000000 -0500
@@ -6385,7 +6414,7 @@
  	allow postfix_master_t postfix_$1_t:fd use;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.4.6/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-11-29 12:04:49.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/postfix.te	2007-04-02 13:36:02.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/services/postfix.te	2007-04-16 10:59:59.000000000 -0400
 @@ -171,6 +171,8 @@
  mta_rw_aliases(postfix_master_t)
  mta_read_sendmail_bin(postfix_master_t)
@@ -6395,7 +6424,15 @@
  ifdef(`targeted_policy',`
  	term_dontaudit_use_unallocated_ttys(postfix_master_t)
  	term_dontaudit_use_generic_ptys(postfix_master_t)
-@@ -382,6 +384,10 @@
+@@ -298,6 +300,7 @@
+ optional_policy(`
+ #	for postalias
+ 	mailman_manage_data_files(postfix_local_t)
++	mailman_append_log(postfix_local_t)
+ ')
+ 
+ optional_policy(`
+@@ -382,6 +385,10 @@
  	locallogin_dontaudit_use_fds(postfix_map_t)
  ')
  
@@ -6406,7 +6443,7 @@
  # a "run" interface needs to be
  # added, and have sysadm_t use it
  # in a optional_policy block.
-@@ -431,6 +437,10 @@
+@@ -431,6 +438,10 @@
  	mailman_domtrans_queue(postfix_pipe_t)
  ')
  
@@ -6417,7 +6454,7 @@
  ########################################
  #
  # Postfix postdrop local policy
-@@ -574,9 +584,14 @@
+@@ -574,9 +585,14 @@
  allow postfix_smtp_t postfix_master_t:unix_stream_socket connectto;
  allow postfix_smtp_t { postfix_private_t postfix_public_t }:dir search;
  allow postfix_smtp_t { postfix_private_t postfix_public_t }:sock_file write;
@@ -6432,7 +6469,7 @@
  ########################################
  #
  # Postfix smtpd local policy
-@@ -594,9 +609,15 @@
+@@ -594,9 +610,15 @@
  
  corecmd_exec_bin(postfix_smtpd_t)
  
@@ -7035,7 +7072,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.4.6/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/services/samba.te	2007-04-13 08:54:04.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/services/samba.te	2007-04-16 11:08:04.000000000 -0400
 @@ -10,6 +10,13 @@
  type nmbd_exec_t;
  init_daemon_domain(nmbd_t,nmbd_exec_t)
@@ -7102,7 +7139,15 @@
  
  allow nmbd_t samba_var_t:dir rw_dir_perms;
  allow nmbd_t samba_var_t:file { lock unlink create write setattr read getattr rename };
-@@ -387,6 +403,7 @@
+@@ -374,6 +390,7 @@
+ corenet_udp_bind_nmbd_port(nmbd_t)
+ corenet_sendrecv_nmbd_server_packets(nmbd_t)
+ corenet_sendrecv_nmbd_client_packets(nmbd_t)
++corenet_tcp_connect_smbd_port(nmbd_t)
+ 
+ dev_read_sysfs(nmbd_t)
+ dev_getattr_mtrr_dev(nmbd_t)
+@@ -387,6 +404,7 @@
  
  files_read_usr_files(nmbd_t)
  files_read_etc_files(nmbd_t)
@@ -7110,7 +7155,7 @@
  
  init_use_fds(nmbd_t)
  init_use_script_ptys(nmbd_t)
-@@ -449,6 +466,8 @@
+@@ -449,6 +467,8 @@
  allow smbmount_t samba_var_t:file create_file_perms;
  allow smbmount_t samba_var_t:lnk_file create_lnk_perms;
  
@@ -7119,7 +7164,7 @@
  kernel_read_system_state(smbmount_t)
  
  corenet_tcp_sendrecv_all_if(smbmount_t)
-@@ -502,7 +521,7 @@
+@@ -502,7 +522,7 @@
  userdom_use_sysadm_ttys(smbmount_t)
  
  optional_policy(`
@@ -7128,7 +7173,7 @@
  ')
  
  optional_policy(`
-@@ -525,7 +544,7 @@
+@@ -525,7 +545,7 @@
  allow swat_t self:netlink_audit_socket create;
  allow swat_t self:tcp_socket create_stream_socket_perms;
  allow swat_t self:udp_socket create_socket_perms;
@@ -7137,7 +7182,7 @@
  
  allow swat_t nmbd_exec_t:file { execute read };
  
-@@ -533,7 +552,7 @@
+@@ -533,7 +553,7 @@
  allow swat_t samba_etc_t:file { getattr write read };
  
  allow swat_t samba_log_t:dir search;
@@ -7146,7 +7191,7 @@
  
  allow swat_t smbd_exec_t:file execute ;
  
-@@ -566,9 +585,8 @@
+@@ -566,9 +586,8 @@
  corenet_raw_sendrecv_all_nodes(swat_t)
  corenet_tcp_sendrecv_all_ports(swat_t)
  corenet_udp_sendrecv_all_ports(swat_t)
@@ -7157,7 +7202,7 @@
  
  dev_read_urand(swat_t)
  
-@@ -591,6 +609,7 @@
+@@ -591,6 +610,7 @@
  
  optional_policy(`
  	cups_read_rw_config(swat_t)
@@ -7165,7 +7210,7 @@
  ')
  
  optional_policy(`
-@@ -614,6 +633,8 @@
+@@ -614,6 +634,8 @@
  # Winbind local policy
  #
  
@@ -7174,7 +7219,7 @@
  dontaudit winbind_t self:capability sys_tty_config;
  allow winbind_t self:process signal_perms;
  allow winbind_t self:fifo_file { read write };
-@@ -681,6 +702,7 @@
+@@ -681,6 +703,7 @@
  domain_use_interactive_fds(winbind_t)
  
  files_read_etc_files(winbind_t)
@@ -7182,7 +7227,7 @@
  
  init_use_fds(winbind_t)
  init_use_script_ptys(winbind_t)
-@@ -743,6 +765,8 @@
+@@ -743,6 +766,8 @@
  
  domain_use_interactive_fds(winbind_helper_t)
  
@@ -7191,7 +7236,7 @@
  libs_use_ld_so(winbind_helper_t)
  libs_use_shared_libs(winbind_helper_t)
  
-@@ -763,3 +787,24 @@
+@@ -763,3 +788,24 @@
  	squid_read_log(winbind_helper_t)
  	squid_append_log(winbind_helper_t)
  ')
@@ -9049,7 +9094,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-2.4.6/policy/modules/system/ipsec.te
 --- nsaserefpolicy/policy/modules/system/ipsec.te	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/system/ipsec.te	2007-03-12 09:10:01.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/system/ipsec.te	2007-04-16 14:45:56.000000000 -0400
 @@ -11,6 +11,19 @@
  init_daemon_domain(ipsec_t,ipsec_exec_t)
  role system_r types ipsec_t;
@@ -9108,7 +9153,7 @@
  
  libs_use_ld_so(ipsec_mgmt_t)
  libs_use_shared_libs(ipsec_mgmt_t)
-@@ -272,3 +287,102 @@
+@@ -272,3 +287,101 @@
  
  allow ipsec_mgmt_t dev_fs:file_class_set getattr;
  ') dnl end TODO
@@ -9153,16 +9198,15 @@
 +# ipsec-tools utilities <racoon>
 +#
 +
-+allow racoon_t self:udp_socket { create_socket_perms };
++allow racoon_t self:capability { net_admin net_bind_service audit_control };
++allow racoon_t self:netlink_route_socket { create_netlink_socket_perms };
 +allow racoon_t self:unix_dgram_socket { connect create ioctl write };
-+allow racoon_t self:capability { net_admin net_bind_service };
-+
-+# allow racoon to use avc_has_perm to check context on proposed SA
 +allow racoon_t self:netlink_selinux_socket { bind create read };
-+selinux_compute_access_vector(racoon_t)
-+
++allow racoon_t self:udp_socket { create_socket_perms };
 +allow racoon_t self:key_socket { create read setopt write };
-+allow racoon_t self:netlink_route_socket { create_netlink_socket_perms };
++allow racoon_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
++
++selinux_compute_access_vector(racoon_t)
 +
 +corenet_udp_bind_generic_node(racoon_t)
 +corenet_tcp_bind_all_nodes(racoon_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/selinux-policy.spec,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- selinux-policy.spec	13 Apr 2007 14:58:09 -0000	1.360
+++ selinux-policy.spec	17 Apr 2007 12:52:50 -0000	1.361
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.4.6
-Release: 57%{?dist}
+Release: 59%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -218,8 +218,8 @@
 
 %if %{BUILD_MLS}
 # Build mls policy
-%setupCmds mls strict-mls y y
-%installCmds mls strict-mls y y 
+%setupCmds mls strict-mls n y
+%installCmds mls strict-mls n y 
 %endif
 
 %clean
@@ -360,6 +360,14 @@
 %endif
 
 %changelog
+* Mon Apr 16 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-59
+- Allow racoon to send audit messages
+Resolves: #232508
+
+* Mon Apr 16 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-58
+- Fix aide specification 
+Resolves: #234885
+
 * Fri Apr 13 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-57
 - Allow fusefs_t to associate any file type so mv command will work.
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 13:04:12 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 09:04:12 -0400
Subject: rpms/autofs/FC-6 autofs-5.0.1-cmd-global-options-fix.patch, NONE,
	1.1 autofs-5.0.1-disable-exports-check.patch, NONE,
	1.1 autofs-5.0.1-localfs-label-check.patch, NONE,
	1.1 autofs.spec, 1.178, 1.179
Message-ID: <200704171304.l3HD4Cf8014590@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-cmd-global-options-fix.patch 
	autofs-5.0.1-disable-exports-check.patch 
	autofs-5.0.1-localfs-label-check.patch 
Log Message:
* Tue Apr 17 2007 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc3.29
- upstream fix for filesystem is local check.
- disable exports access control check (bz 203277).
- fix patch to add command option for set a global mount options (bz 214684).


autofs-5.0.1-cmd-global-options-fix.patch:
 parse_sun.c |  101 ++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 61 insertions(+), 40 deletions(-)

--- NEW FILE autofs-5.0.1-cmd-global-options-fix.patch ---
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 0494e76..99961c3 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -264,7 +264,7 @@ int parse_init(int argc, const char *const *argv, void **context)
 {
 	struct parse_context *ctxt;
 	char buf[MAX_ERR_BUF];
-	char *noptstr, *def, *val, *macros;
+	char *noptstr, *def, *val, *macros, *gbl_options;
 	const char *xopt;
 	int optlen, len, offset;
 	int i, bval;
@@ -397,25 +397,31 @@ int parse_init(int argc, const char *const *argv, void **context)
 		}
 	}
 
+	gbl_options = NULL;
 	if (global_options) {
+		if (ctxt->optstr && strstr(ctxt->optstr, global_options))
+			goto options_done;
+		gbl_options = strdup(global_options);
+	}
+
+	if (gbl_options) {
 		append_options = defaults_get_append_options();
 		if (append_options) {
-			char *tmp = concat_options(global_options, ctxt->optstr);
+			char *tmp = concat_options(gbl_options, ctxt->optstr);
 			if (!tmp) {
 				char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 				error(LOGOPT_ANY, MODPREFIX "concat_options: %s", estr);
+				free(gbl_options);
 			} else
 				ctxt->optstr = tmp;
 		} else {
 			if (!ctxt->optstr)
-				ctxt->optstr = strdup(global_options);
-			if (!ctxt->optstr) {
-				char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
-				warn(LOGOPT_ANY, MODPREFIX "%s", estr);
-			}
+				ctxt->optstr = gbl_options;
+			else
+				free(gbl_options);
 		}
 	}
-
+options_done:
 	debug(LOGOPT_NONE,
 	      MODPREFIX "init gathered global options: %s", ctxt->optstr);
 
@@ -799,18 +805,23 @@ static int parse_mapent(const char *ent, char *g_options, char **options, char *
 			char *tmp, *newopt = NULL;
 
 			p = parse_options(p, &newopt, logopt);
-			tmp = concat_options(myoptions, newopt);
-			if (!tmp) {
-				char *estr;
-				estr = strerror_r(errno, buf, MAX_ERR_BUF);
-				error(logopt, MODPREFIX
-				      "concat_options: %s", estr);
-				if (newopt)
-					free(newopt);
+			if (newopt && strstr(newopt, myoptions)) {
 				free(myoptions);
-				return 0;
+				myoptions = newopt;
+			} else {
+				tmp = concat_options(myoptions, newopt);
+				if (!tmp) {
+					char *estr;
+					estr = strerror_r(errno, buf, MAX_ERR_BUF);
+					error(logopt, MODPREFIX
+					      "concat_options: %s", estr);
+					if (newopt)
+						free(newopt);
+					free(myoptions);
+					return 0;
+				}
+				myoptions = tmp;
 			}
-			myoptions = tmp;
 
 			p = skipspace(p);
 		} while (*p == '-');
@@ -1042,19 +1053,24 @@ int parse_mount(struct autofs_point *ap, const char *name,
 			char *noptions = NULL;
 
 			p = parse_options(p, &noptions, ap->logopt);
-			tmp = concat_options(mnt_options, noptions);
-			if (!tmp) {
-				char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
-				error(ap->logopt,
-				      MODPREFIX "concat_options: %s", estr);
-				if (noptions)
-					free(noptions);
-				if (mnt_options)
-					free(mnt_options);
-				free(options);
-				return 1;
+			if (mnt_options && noptions && strstr(noptions, mnt_options)) {
+				free(mnt_options);
+				mnt_options = noptions;
+			} else {
+				tmp = concat_options(mnt_options, noptions);
+				if (!tmp) {
+					char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+					error(ap->logopt,
+					      MODPREFIX "concat_options: %s", estr);
+					if (noptions)
+						free(noptions);
+					if (mnt_options)
+						free(mnt_options);
+					free(options);
+					return 1;
+				}
+				mnt_options = tmp;
 			}
-			mnt_options = tmp;
 
 			p = skipspace(p);
 		} while (*p == '-');
@@ -1065,17 +1081,22 @@ int parse_mount(struct autofs_point *ap, const char *name,
 		}
 
 		if (append_options) {
-			tmp = concat_options(options, mnt_options);
-			if (!tmp) {
-				char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
-				error(ap->logopt, MODPREFIX "concat_options: %s", estr);
-				if (options)
-					free(options);
-				if (mnt_options)
-					free(mnt_options);
-				return 1;
+			if (options && mnt_options && strstr(mnt_options, options)) {
+				free(options);
+				options = mnt_options;
+			} else {
+				tmp = concat_options(options, mnt_options);
+				if (!tmp) {
+					char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+					error(ap->logopt, MODPREFIX "concat_options: %s", estr);
+					if (options)
+						free(options);
+					if (mnt_options)
+						free(mnt_options);
+					return 1;
+				}
+				options = tmp;
 			}
-			options = tmp;
 		} else
 			options = mnt_options;
 	}

autofs-5.0.1-disable-exports-check.patch:
 lookup_hosts.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE autofs-5.0.1-disable-exports-check.patch ---
diff --git a/modules/lookup_hosts.c b/modules/lookup_hosts.c
index f6a65ae..a9a4c75 100644
--- a/modules/lookup_hosts.c
+++ b/modules/lookup_hosts.c
@@ -208,7 +208,7 @@ done:
 	exp = rpc_get_exports(name, 10, 0, RPC_CLOSE_NOLINGER);
 
 	/* Check exports for obvious ones we don't have access to */
-	exp = rpc_exports_prune(exp);
+	/*exp = rpc_exports_prune(exp);*/
 
 	mapent = NULL;
 	while (exp) {

autofs-5.0.1-localfs-label-check.patch:
 mounts.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE autofs-5.0.1-localfs-label-check.patch ---
diff --git a/lib/mounts.c b/lib/mounts.c
index 524f0ee..0e428e8 100644
--- a/lib/mounts.c
+++ b/lib/mounts.c
@@ -371,7 +371,9 @@ int contained_in_local_fs(const char *path)
 						ret = 1;
 				} else
 					ret = 1;
-			}
+			} else if (!strncmp("LABEL=", this->fs_name, 6) ||
+				   !strncmp("UUID=", this->fs_name, 5))
+				ret = 1;
 			break;
 		}
 	}


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-6/autofs.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- autofs.spec	16 Apr 2007 10:35:52 -0000	1.178
+++ autofs.spec	17 Apr 2007 13:04:10 -0000	1.179
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 %define version 5.0.1
-%define release 0.rc3.28
+%define release 0.rc3.29
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -31,6 +31,9 @@
 Patch18: autofs-5.0.1-rc3-network_match-fix.patch
 Patch19: autofs-5.0.1-conf-append-global.patch
 Patch20: autofs-5.0.1-cmd-global-options.patch
+Patch21: autofs-5.0.1-localfs-label-check.patch
+Patch22: autofs-5.0.1-disable-exports-check.patch
+Patch23: autofs-5.0.1-cmd-global-options-fix.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Conflicts: kernel < 2.6.17
@@ -93,6 +96,9 @@
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -149,6 +155,11 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Tue Apr 17 2007 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc3.29
+- upstream fix for filesystem is local check.
+- disable exports access control check (bz 203277).
+- fix patch to add command option for set a global mount options (bz 214684).
+
 * Mon Apr 16 2007 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc3.28
 - fix command option patch.
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 13:18:56 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 09:18:56 -0400
Subject: rpms/ypbind/devel ypbind.init,1.15,1.16 ypbind.spec,1.39,1.40
Message-ID: <200704171318.l3HDIudt025102@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/ypbind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24988

Modified Files:
	ypbind.init ypbind.spec 
Log Message:
Fixed typo in init script (bz 233459)



Index: ypbind.init
===================================================================
RCS file: /cvs/dist/rpms/ypbind/devel/ypbind.init,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ypbind.init	1 Dec 2006 21:10:33 -0000	1.15
+++ ypbind.init	17 Apr 2007 13:18:53 -0000	1.16
@@ -37,7 +37,7 @@
         [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled || return
 	allow_ypbind=0
 	.  /etc/selinux/config
-	if [ -e /etc/selinux/${SELINUXTYPE}/modules1/active/booleans.local ]; then
+	if [ -e /etc/selinux/${SELINUXTYPE}/modules/active/booleans.local ]; then
 		. /etc/selinux/${SELINUXTYPE}/modules/active/booleans.local
 	fi
 	if [ $allow_ypbind == 0 ]; then


Index: ypbind.spec
===================================================================
RCS file: /cvs/dist/rpms/ypbind/devel/ypbind.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ypbind.spec	3 Apr 2007 19:17:05 -0000	1.39
+++ ypbind.spec	17 Apr 2007 13:18:53 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain.
 Name: ypbind
 Version: 1.19
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2
@@ -90,6 +90,9 @@
 %doc README NEWS
 
 %changelog
+* Tue Apr 17 2007 Steve Dickson <steved at redhat.com> - 3:1.19-9
+- Fixed typo in init script (bz 233459)
+
 * Tue Apr  3 2007 Steve Dickson <steved at redhat.com> - 3:1.19-8
 - Replace portmap dependency with an rpcbind dependency (bz 228894)
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 13:22:52 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 09:22:52 -0400
Subject: rpms/avalon-framework/devel avalon-framework-target.patch,1.2,1.3
Message-ID: <200704171322.l3HDMqbX027652@cvs.devel.redhat.com>

Author: pcheung

Update of /cvs/dist/rpms/avalon-framework/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27555

Modified Files:
	avalon-framework-target.patch 
Log Message:
Fix building javadoc


avalon-framework-target.patch:
 build.xml |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

Index: avalon-framework-target.patch
===================================================================
RCS file: /cvs/dist/rpms/avalon-framework/devel/avalon-framework-target.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- avalon-framework-target.patch	5 Apr 2007 04:19:31 -0000	1.2
+++ avalon-framework-target.patch	17 Apr 2007 13:22:50 -0000	1.3
@@ -1,6 +1,6 @@
---- Avalon-4.1.4/build.xml~	2003-02-27 16:24:59.000000000 +0000
-+++ Avalon-4.1.4/build.xml	2005-12-15 10:39:51.000000000 +0000
-@@ -156,8 +156,7 @@
+--- Avalon-4.1.4/build.xml	2007-04-16 15:18:55.000000000 -0400
++++ Avalon-4.1.4/build.xml	2007-04-16 15:19:26.000000000 -0400
+@@ -156,8 +156,7 @@ Legal:
              destdir="${target.classes}"
              debug="${debug}"
              optimize="${optimize}"
@@ -10,11 +10,21 @@
              <classpath refid="project.class.path" />
              <src path="${test.dir}"/>
              <exclude name="org/apache/avalon/framework/logger/LogKit*.java"
-@@ -329,6 +330,7 @@ Legal:
-         <mkdir dir="${target.javadocs}"/>
- 
-         <javadoc packagenames="org.apache.*"
-+            source="1.4"
+@@ -332,7 +331,7 @@ Legal:
              sourcepath="${java.dir}"
              destdir="${target.javadocs}">
              <classpath refid="project.class.path" />
+-            <doclet name="com.sun.tools.doclets.standard.Standard">
++            <!-- doclet name="com.sun.tools.doclets.standard.Standard">
+                 <param name="-author"/>
+                 <param name="-version"/>
+                 <param name="-doctitle" value="${Name}"/>
+@@ -340,7 +339,7 @@ Legal:
+                 <param name="-bottom"
+                     value="&quot;Copyright &#169; 2001 Apache Jakarta Project. All Rights Reserved.&quot;"/>
+                 <param name="-link" value="http://java.sun.com/j2se/1.4/docs/api/"/>
+-            </doclet>
++            </doclet -->
+         </javadoc>
+ 
+     </target>



From fedora-cvs-commits at redhat.com  Tue Apr 17 13:34:46 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 09:34:46 -0400
Subject: rpms/mdadm/FC-6 mdadm-2.6.1-build.patch, NONE,
	1.1 mdadm-2.5.2-static.patch, 1.2, 1.3 mdadm.spec, 1.38,
	1.39 mdadm-1.5.0-email.patch, 1.1, NONE
Message-ID: <200704171334.l3HDYkIe003719@cvs.devel.redhat.com>

Author: dledford

Update of /cvs/dist/rpms/mdadm/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv3635

Modified Files:
	mdadm-2.5.2-static.patch mdadm.spec 
Added Files:
	mdadm-2.6.1-build.patch 
Removed Files:
	mdadm-1.5.0-email.patch 
Log Message:
* Tue Apr 17 2007 Doug Ledford <dledford at redhat.com> - 2.6.1-2
- Integrate changes from Fedora review process


mdadm-2.6.1-build.patch:
 Makefile |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

--- NEW FILE mdadm-2.6.1-build.patch ---
--- mdadm-2.6.1/Makefile.build	2007-04-11 11:12:46.000000000 -0400
+++ mdadm-2.6.1/Makefile	2007-04-11 11:18:54.000000000 -0400
@@ -100,9 +100,11 @@ mdadm.static : $(OBJS) $(STATICOBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -static -o mdadm.static $(OBJS) $(STATICOBJS)
 
 mdadm.tcc : $(SRCS) mdadm.h
+	rm -f $(OBJS)
 	$(TCC) -o mdadm.tcc $(SRCS)
 
 mdadm.uclibc : $(SRCS) mdadm.h
+	rm -f $(OBJS) $(STATICOBJS)
 	$(UCLIBC_GCC) -DUCLIBC -DHAVE_STDINT_H -o mdadm.uclibc $(SRCS) $(STATICSRC)
 
 mdadm.klibc : $(SRCS) mdadm.h
@@ -113,15 +115,15 @@ test_stripe : restripe.c mdadm.h
 	$(CC) $(CXFLAGS) $(LDFLAGS) -o test_stripe -DMAIN restripe.c
 
 mdassemble : $(ASSEMBLE_SRCS) mdadm.h
-	rm -f $(OBJS)
-	$(DIET_GCC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS)  $(STATICSRC)
+	rm -f $(OBJS) $(STATICOBJS)
+	$(CC) $(ASSEMBLE_FLAGS) $(LDFLAGS) -DHAVE_STDINT_H -o mdassemble.static $(ASSEMBLE_SRCS) $(STATICSRC)
 
-mdassemble.static : $(ASSEMBLE_SRCS) mdadm.h
-	rm -f $(OBJS)
+mdassemble.static : $(ASSEMBLE_SRCS) $(STATICSRC) mdadm.h
+	rm -f $(OBJS) $(STATICOBJS)
 	$(CC) $(ASSEMBLE_FLAGS) $(LDFLAGS) -static -DHAVE_STDINT_H -o mdassemble.static $(ASSEMBLE_SRCS) $(STATICSRC)
 
-mdassemble.uclibc : $(ASSEMBLE_SRCS) mdadm.h
-	rm -f $(OJS)
+mdassemble.uclibc : $(ASSEMBLE_SRCS) $(STATICSRC) mdadm.h
+	rm -f $(OBJS) $(STATICOBJS)
 	$(UCLIBC_GCC) $(ASSEMBLE_FLAGS) -DUCLIBC -DHAVE_STDINT_H -static -o mdassemble.uclibc $(ASSEMBLE_SRCS) $(STATICSRC)
 
 # This doesn't work
@@ -164,10 +166,10 @@ install-klibc : mdadm.klibc install-man
 	$(INSTALL) -D -m 755 mdadm.klibc $(DESTDIR)$(BINDIR)/mdadm
 
 install-man: mdadm.8 mdassemble.8 md.4 mdadm.conf.5
-	$(INSTALL) -D -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR)/mdadm.8
-	$(INSTALL) -D -m 644 mdassemble.8 $(DESTDIR)$(MAN8DIR)/mdassemble.8
-	$(INSTALL) -D -m 644 md.4 $(DESTDIR)$(MAN4DIR)/md.4
-	$(INSTALL) -D -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5
+	$(INSTALL) -Dp -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR)/mdadm.8
+	$(INSTALL) -Dp -m 644 mdassemble.8 $(DESTDIR)$(MAN8DIR)/mdassemble.8
+	$(INSTALL) -Dp -m 644 md.4 $(DESTDIR)$(MAN4DIR)/md.4
+	$(INSTALL) -Dp -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5
 
 uninstall:
 	rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 md.4 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm

mdadm-2.5.2-static.patch:
 Makefile |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

Index: mdadm-2.5.2-static.patch
===================================================================
RCS file: /cvs/dist/rpms/mdadm/FC-6/mdadm-2.5.2-static.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mdadm-2.5.2-static.patch	31 Mar 2007 13:34:29 -0000	1.2
+++ mdadm-2.5.2-static.patch	17 Apr 2007 13:34:43 -0000	1.3
@@ -1,5 +1,5 @@
---- mdadm-2.6.1/Makefile.static	2007-03-31 09:31:17.000000000 -0400
-+++ mdadm-2.6.1/Makefile	2007-03-31 09:32:08.000000000 -0400
+--- mdadm-2.6.1/Makefile.static	2007-03-31 09:43:56.000000000 -0400
++++ mdadm-2.6.1/Makefile	2007-03-31 09:44:32.000000000 -0400
 @@ -146,23 +146,26 @@ $(OBJS) : mdadm.h bitmap.h
  sha1.o : sha1.c sha1.h md5.h
  	$(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c


Index: mdadm.spec
===================================================================
RCS file: /cvs/dist/rpms/mdadm/FC-6/mdadm.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mdadm.spec	31 Mar 2007 13:34:29 -0000	1.38
+++ mdadm.spec	17 Apr 2007 13:34:43 -0000	1.39
@@ -1,51 +1,53 @@
-Summary:     mdadm controls Linux md devices (software RAID arrays)
+Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     2.6.1
-Release:     1%{?dist}
+Release:     2%{?dist}
 Source:      http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz
 Source1:     mdmonitor.init
 Source2:     mdmpd-0.4.tgz
 Source3:     mdmpd.init
-Patch:	     mdadm-1.5.0-email.patch
 Patch1:      mdmpd-0.4-node.patch
 Patch2:      mdadm-2.5.2-s390-build.patch
 Patch3:      mdadm-2.5.2-static.patch
 Patch5:      mdadm-2.2-nodiet.patch
 Patch6:      mdadm-2.5.2-cflags.patch
+Patch7:      mdadm-2.6.1-build.patch
 URL:         http://www.cse.unsw.edu.au/~neilb/source/mdadm/
 License:     GPL
 Group:       System Environment/Base
-BuildRoot:   %{_tmppath}/%{name}-root
+BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:   mdctl,raidtools
-Requires:    smtpdaemon
+Requires:    /usr/sbin/sendmail
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
 Requires(postun): /sbin/service
 
 %description 
-mdadm is used to create, manage, and monitor Linux MD (software RAID)
-devices.  As such, it provides similar functionality to the raidtools
+The mdadm program is used to create, manage, and monitor Linux MD (software
+RAID) devices.  As such, it provides similar functionality to the raidtools
 package.  However, mdadm is a single program, and it can perform
 almost all functions without a configuration file, though a configuration
 file can be used to help with some common tasks.
 
 %prep
 %setup -q -a 2
-%patch -p1 -b .email
 %patch1 -p1 -b .node
 %patch2 -p1 -b .s390
 %patch3 -p1 -b .static
 %patch5 -p1 -b .nodiet
 %patch6 -p1 -b .cflags
+%patch7 -p1 -b .build
+
 %build
-make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" MDASSEMBLE_AUTO=1 mdadm mdadm.static mdassemble.static
+make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" MDASSEMBLE_AUTO=1 mdassemble.static mdassemble mdadm.static mdadm
 make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" -C mdmpd mdmpd
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin install
 make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin -C mdmpd install
-install -D -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/mdmonitor
-install -D -m755 %{SOURCE3} $RPM_BUILD_ROOT/%{_initrddir}/mdmpd
+install -Dp -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/mdmonitor
+install -Dp -m755 %{SOURCE3} $RPM_BUILD_ROOT/%{_initrddir}/mdmpd
 
 mkdir -p -m 700 $RPM_BUILD_ROOT/var/run/mdmpd
 mkdir -p -m 700 $RPM_BUILD_ROOT/var/run/mdadm
@@ -78,8 +80,8 @@
 fi
 
 %files
-%defattr(-,root,root)
-%doc ANNOUNCE-* TODO ChangeLog mdadm.conf-example COPYING misc/*
+%defattr(-,root,root,-)
+%doc TODO ChangeLog mdadm.conf-example COPYING misc/*
 /sbin/*
 %{_initrddir}/*
 %{_mandir}/man*/md*
@@ -87,6 +89,9 @@
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Tue Apr 17 2007 Doug Ledford <dledford at redhat.com> - 2.6.1-2
+- Integrate changes from Fedora review process
+
 * Sat Mar 31 2007 Doug Ledford <dledford at redhat.com> - 2.6.1-1
 - Update to latest upstream version
 - Minor spec file cleanups
@@ -193,7 +198,7 @@
 - add patch with reallyforce mode on creation to be used by anaconda
 
 * Wed May 12 2004 Doug Ledford <dledford at redhat.com> 2.5.0-6
-- Fix a bug in the %postun scriptlet related to downgrading to a version
+- Fix a bug in the postun scriptlet related to downgrading to a version
   of mdadm that doesn't include the mdmpd daemon.
 
 * Fri May 07 2004 Doug Ledford <dledford at redhat.com> 1.5.0-5
@@ -268,7 +273,7 @@
 * Wed Mar 12 2002 NeilBrown <neilb at cse.unsw.edu.au>
 - Add md.4 and mdadm.conf.5 man pages
 
-* Fri Mar 08 2002		Chris Siebenmann <cks at cquest.utoronto.ca>
+* Fri Mar 08 2002 Chris Siebenmann <cks at cquest.utoronto.ca>
 - builds properly as non-root.
 
 * Fri Mar 08 2002 Derek Vadala <derek at cynicism.com>


--- mdadm-1.5.0-email.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 17 13:47:14 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 09:47:14 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch, NONE,
	1.1 openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch,
	1.1, 1.2 openoffice.org.spec, 1.1165, 1.1166
Message-ID: <200704171347.l3HDlEAt001893@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch 
	openoffice.org.spec 
Added Files:
	openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch 
Log Message:
just a test

openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch:
 shell/source/unix/sysshell/recently_used_file.cxx |    7 ++++---
 shell/source/unix/sysshell/systemshell.cxx        |    9 +++++----
 source/unix/sysshell/recently_used_file.cxx       |    0 
 source/unix/sysshell/systemshell.cxx              |    0 
 4 files changed, 9 insertions(+), 7 deletions(-)

--- NEW FILE openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch ---
Index: source/unix/sysshell/recently_used_file.cxx
===================================================================
RCS file: /cvs/gsl/shell/source/unix/sysshell/recently_used_file.cxx,v
retrieving revision 1.6
diff -u -r1.6 recently_used_file.cxx
--- openoffice.org.orig/shell/source/unix/sysshell/recently_used_file.cxx	17 Sep 2006 01:42:27 -0000	1.6
+++ openoffice.org/shell/source/unix/sysshell/recently_used_file.cxx	17 Apr 2007 13:37:48 -0000
@@ -66,13 +66,12 @@
 
 #include <unistd.h>
 
-const rtl::OUString RECENTLY_USED_FILE_NAME = rtl::OUString::createFromAscii(".recently-used");
-const rtl::OUString SLASH = rtl::OUString::createFromAscii("/");
-
 namespace /* private */ {
     
 inline void ensure_final_slash(/*inout*/ rtl::OUString& path)
 {    
+    const rtl::OUString SLASH = rtl::OUString::createFromAscii("/");
+
     if ((path.getLength() > 0) && 
 		(SLASH.pData->buffer[0] != path.pData->buffer[path.getLength() - 1]))
         path += SLASH;    
@@ -89,6 +88,8 @@
     
     if (sec.getHomeDir(homedir_url))
     {
+        const rtl::OUString RECENTLY_USED_FILE_NAME = rtl::OUString::createFromAscii(".recently-used");
+
 		rtl::OUString homedir;
 		osl::FileBase::getSystemPathFromFileURL(homedir_url, homedir);
 		
Index: source/unix/sysshell/systemshell.cxx
===================================================================
RCS file: /cvs/gsl/shell/source/unix/sysshell/systemshell.cxx,v
retrieving revision 1.7
diff -u -r1.7 systemshell.cxx
--- openoffice.org.orig/shell/source/unix/sysshell/systemshell.cxx	17 Sep 2006 01:42:56 -0000	1.7
+++ openoffice.org/shell/source/unix/sysshell/systemshell.cxx	17 Apr 2007 13:37:48 -0000
@@ -42,9 +42,6 @@
 
 #include "osl/module.hxx"
 
-const rtl::OUString SYM_ADD_TO_RECENTLY_USED_FILE_LIST = rtl::OUString::createFromAscii("add_to_recently_used_file_list");
-const rtl::OUString LIB_RECENT_FILE = rtl::OUString::createFromAscii("librecentfile.so");
-
 namespace SystemShell {
     
     typedef void (*PFUNC_ADD_TO_RECENTLY_USED_LIST)(const rtl::OUString&, const rtl::OUString&);
@@ -55,6 +52,8 @@
         rtl::OUString url;
         if (osl::Module::getUrlFromAddress(reinterpret_cast<oslGenericFunction>(AddToRecentDocumentList), url))
         {        
+            const rtl::OUString LIB_RECENT_FILE = rtl::OUString::createFromAscii("librecentfile.so");
+
             sal_Int32 index = url.lastIndexOf('/');
             url = url.copy(0, index + 1);
             url += LIB_RECENT_FILE;
@@ -65,7 +64,7 @@
     //##############################
     void AddToRecentDocumentList(const rtl::OUString& aFileUrl, const rtl::OUString& aMimeType)
     {
-        rtl::OUString librecentfile_url = get_absolute_library_url(LIB_RECENT_FILE);
+        rtl::OUString librecentfile_url = get_absolute_library_url();
         
         if (librecentfile_url.getLength())
         {
@@ -73,6 +72,8 @@
             
             if (module.is())
             {
+                const rtl::OUString SYM_ADD_TO_RECENTLY_USED_FILE_LIST = 
+                    rtl::OUString::createFromAscii("add_to_recently_used_file_list");
                // convert from reinterpret_cast<PFUNC_ADD_TO_RECENTLY_USED_LIST>
 			   // not allowed in gcc 3.3 without permissive.
                 PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = 

openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch:
 shell/source/unix/sysshell/makefile.mk                    |    6 
 shell/source/unix/sysshell/recently_used_file_handler.cxx |  504 --------------
 source/unix/sysshell/makefile.mk                          |    0 
 source/unix/sysshell/recently_used_file_handler.cxx       |    0 
 4 files changed, 14 insertions(+), 496 deletions(-)

Index: openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch	7 Mar 2007 09:05:22 -0000	1.1
+++ openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch	17 Apr 2007 13:47:11 -0000	1.2
@@ -32,7 +32,7 @@
 diff -u -r1.8 recently_used_file_handler.cxx
 --- openoffice.org.orig/shell/source/unix/sysshell/recently_used_file_handler.cxx	17 Sep 2006 01:42:41 -0000	1.8
 +++ openoffice.org/shell/source/unix/sysshell/recently_used_file_handler.cxx	7 Mar 2007 09:02:21 -0000
-@@ -95,477 +95,11 @@
+@@ -95,479 +95,11 @@
  #include <vector>
  #include <algorithm>
  #include <functional>
@@ -273,8 +273,7 @@
 -            }
 -            current_element_.clear();
 -        }
-+#include <stdio.h>
- 
+-
 -        virtual void characters(const string_t& character)
 -        {
 -            if (character != "\n")
@@ -302,7 +301,8 @@
 -        recently_used_file_filter(const recently_used_file_filter&);
 -        recently_used_file_filter& operator=(const recently_used_file_filter&);
 -    };
--
++#include <stdio.h>
+ 
 -    //------------------------------------------------        
 -    void read_recently_used_items(
 -        recently_used_file& file, 
@@ -509,10 +509,21 @@
 -                    </RecentItem>
 -                </RecentFiles>
 -*/
+-
+-const rtl::OUString DEFAULT_CONTEXT = rtl::OUString::createFromAscii("DefaultContext");
 +using namespace ::com::sun::star;
  
- const rtl::OUString DEFAULT_CONTEXT = rtl::OUString::createFromAscii("DefaultContext");
- 
+ // 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.
+@@ -582,6 +114,8 @@
+ 		sm->queryInterface( getCppuType( &pset )) >>= pset;
+ 		if (pset.is())
+ 		{
++                        const rtl::OUString DEFAULT_CONTEXT = rtl::OUString::createFromAscii("DefaultContext");
++
+ 			uno::Reference< uno::XComponentContext > context;
+ 			pset->getPropertyValue(DEFAULT_CONTEXT) >>= context;
+ 			if (context.is())
 @@ -591,31 +125,9 @@
  	return extUrl;
  }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1165
retrieving revision 1.1166
diff -u -r1.1165 -r1.1166
--- openoffice.org.spec	16 Apr 2007 10:06:28 -0000	1.1165
+++ openoffice.org.spec	17 Apr 2007 13:47:11 -0000	1.1166
@@ -1,6 +1,6 @@
 %define oootag OOF680
 %define ooomilestone 14
-%define rh_rpm_release 6
+%define rh_rpm_release 5.1test
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -130,6 +130,7 @@
 Patch71: openoffice.org-2.2.0.ooo53397.linkopt.patch
 Patch72: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
 Patch73: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch74: openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1053,6 +1054,7 @@
 %endif
 %patch72 -p1 -b .ooo75790.sc.pa-IN.translate.patch
 %patch73 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch74 -p1 -b .oooXXXXX.shell.reduceglobals.patch
 
 cp %{SOURCE1} extras/source/database/evolocal.odb
 
@@ -2627,11 +2629,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Fri Apr 13 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.6
+* Tue Apr 17 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.6
 - merge openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch
-- Resolves: rhbz#235834 update subpixel logic
-- add openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch for
-  better offline debugging support
+- Resolves: rhbz#235834 update font subpixel logic
+- add dynamicsection patch for better offline debugging
 
 * Wed Apr 11 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.5
 - Resolves: rhbz#235828 INIFILE optimization breaks addins



From fedora-cvs-commits at redhat.com  Tue Apr 17 14:03:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 10:03:36 -0400
Subject: rpms/xorg-x11-drv-amd/devel xorg-x11-drv-amd.spec,1.12,1.13
Message-ID: <200704171403.l3HE3a1l002387@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-drv-amd.spec 
Log Message:
* Tue Apr 17 2007 Adam Jackson <ajax at redhat.com> 0.0-9.20061016git
- Fix the license.



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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-amd.spec	16 Oct 2006 23:05:00 -0000	1.12
+++ xorg-x11-drv-amd.spec	17 Apr 2007 14:03:34 -0000	1.13
@@ -7,11 +7,11 @@
 Summary:   Xorg X11 AMD Geode video driver
 Name:      xorg-x11-drv-amd
 Version:   0.0
-Release:   8.%{gitdate}git%{?dist}
+Release:   9.%{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
-License:   MIT/X11
+License: MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -78,10 +78,12 @@
 %{driverdir}/amd_drv.so
 %{driverdir}/ztv_drv.so
 #%{_datadir}/hwdata/videoaliases/amd.xinf
-#%dir %{_mandir}/man4x
 %{_mandir}/man4/amd.4*
 
 %changelog
+* Tue Apr 17 2007 Adam Jackson <ajax at redhat.com> 0.0-9.20061016git
+- Fix the license.
+
 * Mon Oct 16 2006 Adam Jackson <ajackson at redhat.com> 0.0-8.20061016git.fc7
 - Today's snapshot: More Xv love.
 - Add check for (and abort on existance of) .git directory in the work dir.



From fedora-cvs-commits at redhat.com  Tue Apr 17 14:32:06 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 10:32:06 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.3080,1.3081
Message-ID: <200704171432.l3HEW6B6017177@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
* Tue Apr 17 2007 Dave Jones <davej at redhat.com>
- disable kvm update patch (debugging)



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3080
retrieving revision 1.3081
diff -u -r1.3080 -r1.3081
--- kernel-2.6.spec	17 Apr 2007 04:05:33 -0000	1.3080
+++ kernel-2.6.spec	17 Apr 2007 14:32:04 -0000	1.3081
@@ -1252,7 +1252,7 @@
 # don't wakeup ondemand timer whilst idle.
 %patch1620 -p1
 # Update KVM.
-%patch1630 -p1
+#%patch1630 -p1
 # Allow to use 480600 baud on 16C950 UARTs
 %patch1650 -p1
 # Fix XFS umount bug.
@@ -2307,6 +2307,9 @@
 
 %changelog
 * Tue Apr 17 2007 Dave Jones <davej at redhat.com>
+- disable kvm update patch (debugging)
+
+* Tue Apr 17 2007 Dave Jones <davej at redhat.com>
 - Update KVM to v19
 
 * Mon Apr 16 2007 Dave Jones <davej at redhat.com>



From fedora-cvs-commits at redhat.com  Tue Apr 17 14:45:02 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 10:45:02 -0400
Subject: rpms/pyorbit/devel pyorbit.spec,1.22,1.23
Message-ID: <200704171445.l3HEj2Fi026528@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/pyorbit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26422

Modified Files:
	pyorbit.spec 
Log Message:

* Tue Apr 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.14.2-2.fc7
- Fix some file permissions (RH bug #236738).
- Spec file cleanups.



Index: pyorbit.spec
===================================================================
RCS file: /cvs/dist/rpms/pyorbit/devel/pyorbit.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- pyorbit.spec	25 Feb 2007 21:28:59 -0000	1.22
+++ pyorbit.spec	17 Apr 2007 14:45:00 -0000	1.23
@@ -1,25 +1,35 @@
-%define python python2
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
+### Abstract ###
 
-Summary: Python bindings for ORBit2.
 Name: pyorbit
 Version: 2.14.2
-Release: 1
+Release: 2%{?dist}
 License: LGPL
 Group: Development/Languages
-Source: %{name}-%{version}.tar.bz2
+Summary: Python bindings for ORBit2.
 BuildRoot: %{_tmppath}/%{name}-root
+Source: %{name}-%{version}.tar.bz2
+
+Obsoletes: orbit-python
+
+### Dependencies ###
+
 Requires: ORBit2 >= 2.3.103
-Requires: libIDL >= 0.8.0
 Requires: glib2 >= 2.4.0
-Requires: %{python} >= 2.3
-Buildrequires: %{python}-devel >= 2.3
-Buildrequires: ORBit2-devel >= 2.6.0
-Buildrequires: libIDL-devel >= 0.8.0
-Buildrequires: glib2-devel >= 2.4.0
+Requires: libIDL >= 0.8.0
+Requires: python2 >= 2.3
+
+### Build Dependencies ###
+
+BuildRequires: ORBit2-devel >= 2.6.0
+BuildRequires: autoconf
+BuildRequires: automake >= 1.6.3-5
+BuildRequires: glib2-devel >= 2.4.0
+BuildRequires: libIDL-devel >= 0.8.0
+BuildRequires: libtool
 BuildRequires: pygtk2 >= 2.4.0
-Obsoletes: orbit-python
-# needed for automake/autoconf to work right with multilib python
-Buildrequires: automake >= 1.6.3-5, autoconf, libtool
+BuildRequires: python2-devel >= 2.3
 
 %description
 pyorbit is an extension module for python that gives you access
@@ -36,10 +46,9 @@
 libraries so that they interoperate with pyorbit
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
 
 %build
-#[ -x /usr/bin/python2.2 ] && export PYTHON=/usr/bin/python2.2
 %configure
 make
 
@@ -52,20 +61,24 @@
 rm -fr $RPM_BUILD_ROOT
 
 %files
-%defattr(755, root, root, 755)
+%defattr(-, root, root)
 %doc AUTHORS NEWS README ChangeLog
-%{_libdir}/python?.?/site-packages/*.so
-%{_libdir}/python?.?/site-packages/*.py
-%{_libdir}/python?.?/site-packages/*.pyc
-%{_libdir}/python?.?/site-packages/*.pyo
 
-%files devel
 %defattr(755, root, root, 755)
-%dir %{_includedir}/pyorbit-2
-%{_includedir}/pyorbit-2/*.h
+%{python_sitearch}/*.so
+%defattr(644, root, root, 755)
+%{python_sitearch}/*.py*
+
+%files devel
+%defattr(644, root, root, 755)
+%{_includedir}/pyorbit-2
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Apr 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.14.2-2.fc7
+- Fix some file permissions (RH bug #236738).
+- Spec file cleanups.
+
 * Sun Feb 25 2007 Matthew Barnes <mbarnes at redhat.com> - 2.14.2-1.fc7
 - Update to 2.14.2
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 14:45:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 10:45:32 -0400
Subject: rpms/libxml2/devel .cvsignore, 1.35, 1.36 libxml2.spec, 1.42,
	1.43 sources, 1.37, 1.38
Message-ID: <200704171445.l3HEjWwF026945@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/libxml2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26800

Modified Files:
	.cvsignore libxml2.spec sources 
Log Message:
Release of 2.6.28, Daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libxml2/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	25 Oct 2006 16:18:24 -0000	1.35
+++ .cvsignore	17 Apr 2007 14:45:30 -0000	1.36
@@ -13,3 +13,4 @@
 libxml2-2.6.25.tar.gz
 libxml2-2.6.26.tar.gz
 libxml2-2.6.27.tar.gz
+libxml2-2.6.28.tar.gz


Index: libxml2.spec
===================================================================
RCS file: /cvs/dist/rpms/libxml2/devel/libxml2.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- libxml2.spec	7 Dec 2006 15:56:01 -0000	1.42
+++ libxml2.spec	17 Apr 2007 14:45:30 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.6.27
-Release: 2
+Version: 2.6.28
+Release: 1
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
@@ -130,6 +130,10 @@
 %doc doc/python.html
 
 %changelog
+* Tue Apr 17 2007 Daniel Veillard <veillard at redhat.com> 2.6.28-1
+- upstream release 2.6.28 see http://xmlsoft.org/news.html
+- many bug fixed upstream
+
 * Thu Dec  7 2006 Jeremy Katz <katzj at redhat.com> - 2.6.27-2
 - rebuild against python 2.5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libxml2/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	25 Oct 2006 16:18:24 -0000	1.37
+++ sources	17 Apr 2007 14:45:30 -0000	1.38
@@ -1 +1 @@
-f5806f5059ef7bd4d3fcf36cf116d1ef  libxml2-2.6.27.tar.gz
+ddf3c369964980a238fad0b6ad40532c  libxml2-2.6.28.tar.gz



From fedora-cvs-commits at redhat.com  Tue Apr 17 14:45:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 10:45:49 -0400
Subject: rpms/dhcp/devel dhcp-3.0.5-dhclient-usage.patch, 1.1, 1.2 dhcp.spec,
	1.157, 1.158
Message-ID: <200704171445.l3HEjn2k027195@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27151

Modified Files:
	dhcp-3.0.5-dhclient-usage.patch dhcp.spec 
Log Message:
* Tue Apr 17 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-32
- Added missing newline on usage() screen in dhclient


dhcp-3.0.5-dhclient-usage.patch:
 dhclient.c |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

Index: dhcp-3.0.5-dhclient-usage.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0.5-dhclient-usage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dhcp-3.0.5-dhclient-usage.patch	1 Apr 2007 20:52:27 -0000	1.1
+++ dhcp-3.0.5-dhclient-usage.patch	17 Apr 2007 14:45:46 -0000	1.2
@@ -1,5 +1,5 @@
---- dhcp-3.0.5/client/dhclient.c.usage	2007-04-01 13:49:43.000000000 -0400
-+++ dhcp-3.0.5/client/dhclient.c	2007-04-01 13:51:25.000000000 -0400
+--- dhcp-3.0.5/client/dhclient.c.usage	2007-04-17 10:43:00.000000000 -0400
++++ dhcp-3.0.5/client/dhclient.c	2007-04-17 10:43:30.000000000 -0400
 @@ -819,20 +819,29 @@
  
  static void usage ()
@@ -34,7 +34,7 @@
 +	printf ("                [ -H <host-name> | -F <fqdn.fqdn> ] [ -T <timeout> ]\n");
 +	printf ("                [ -V <vendor-class-identifier> ]\n");
 +	printf ("                [ -R <request option list> ]\n");
-+	printf ("                [-sf script-file] [interface]");
++	printf ("                [-sf script-file] [interface]\n");
 +
 +	exit (EXIT_FAILURE);
  }


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- dhcp.spec	12 Apr 2007 20:05:58 -0000	1.157
+++ dhcp.spec	17 Apr 2007 14:45:46 -0000	1.158
@@ -10,7 +10,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.5
-Release:  31%{?dist}
+Release:  32%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -429,6 +429,9 @@
 %{_libdir}/libdhcp4client.a
 
 %changelog
+* Tue Apr 17 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-32
+- Added missing newline on usage() screen in dhclient
+
 * Thu Apr 12 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-31
 - Spec file cleanups (#225691)
 - Put libdhcpctl.a and libomapi.a in dhcp-devel-static package



From fedora-cvs-commits at redhat.com  Tue Apr 17 14:48:00 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 10:48:00 -0400
Subject: rpms/control-center/devel control-center-2.18.0-gecos.patch, NONE,
	1.1 control-center.spec, 1.243,
	1.244 control-center-2.17.92-gecos.patch, 1.1, NONE
Message-ID: <200704171448.l3HEm0F7028855@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28700

Modified Files:
	control-center.spec 
Added Files:
	control-center-2.18.0-gecos.patch 
Removed Files:
	control-center-2.17.92-gecos.patch 
Log Message:
remove debugging spew


control-center-2.18.0-gecos.patch:
 capplets/about-me/Makefile.am          |    6 
 capplets/about-me/gnome-about-me.c     |  225 ++++++++++++++++++++++++++++++---
 capplets/about-me/gnome-about-me.glade |   41 +++---
 configure.in                           |    1 
 4 files changed, 234 insertions(+), 39 deletions(-)

--- NEW FILE control-center-2.18.0-gecos.patch ---
--- control-center-2.18.0/capplets/about-me/gnome-about-me.glade.gecos	2007-04-17 09:27:17.000000000 +0200
+++ control-center-2.18.0/capplets/about-me/gnome-about-me.glade	2007-04-17 09:27:17.000000000 +0200
@@ -100,23 +100,30 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkLabel" id="fullname">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Full Name</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
+                    <widget class="GtkButton" id="fullnamebox">
+                      <property name="relief">GTK_RELIEF_NONE</property>
+                      <property name="focus_on_click">True</property>
+ 
+                      <child>
+                        <widget class="GtkLabel" id="fullname">
+                          <property name="visible">True</property>
+                          <property name="label" translatable="yes">Full Name</property>
+                          <property name="use_underline">False</property>
+                          <property name="use_markup">False</property>
+                          <property name="justify">GTK_JUSTIFY_LEFT</property>
+                          <property name="wrap">False</property>
+                          <property name="selectable">False</property>
+                          <property name="xalign">0</property>
+                          <property name="yalign">0.5</property>
+                          <property name="xpad">0</property>
+                          <property name="ypad">0</property>
+                          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                          <property name="width_chars">-1</property>
+                          <property name="single_line_mode">False</property>
+                          <property name="angle">0</property>
+                        </widget>
+                      </child>
+                    </widget>
 		    <packing>
 		      <property name="padding">0</property>
 		      <property name="expand">False</property>
--- control-center-2.18.0/capplets/about-me/Makefile.am.gecos	2007-02-26 20:39:50.000000000 +0100
+++ control-center-2.18.0/capplets/about-me/Makefile.am	2007-04-17 09:27:18.000000000 +0200
@@ -8,12 +8,9 @@
 	gnome-about-me-lock.png		\
 	gnome-about-me-lock-open.png
 
-gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) $(ABOUTME_LIBS)
+gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) $(ABOUTME_LIBS) $(EEL_LIBS)
 gnome_about_me_LDFLAGS = -export-dynamic
 gnome_about_me_SOURCES = 		\
-	eel-alert-dialog.c		\
-	eel-alert-dialog.h		\
-	eel-gtk-macros.h		\
 	gnome-about-me-password.c	\
 	gnome-about-me-password.h	\
 	e-image-chooser.c		\
@@ -32,6 +29,7 @@
 INCLUDES = \
 	$(GNOMECC_CAPPLETS_CFLAGS) \
 	$(LIBEBOOK_CFLAGS) \
+	$(EEL_CFLAGS) \
 	-DDATADIR="\"$(datadir)\"" \
 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
 	-DGNOMECC_GLADE_DIR="\"$(gladedir)\"" \
--- control-center-2.18.0/capplets/about-me/gnome-about-me.c.gecos	2007-04-17 09:27:17.000000000 +0200
+++ control-center-2.18.0/capplets/about-me/gnome-about-me.c	2007-04-17 09:31:49.000000000 +0200
@@ -36,6 +36,7 @@
 #include <libebook/e-book.h>
 
 #include "e-image-chooser.h"
+#include <eel/eel-editable-label.h>
 
 #include "capplet-util.h"
 
@@ -58,6 +59,7 @@
 	gboolean      	 have_image;
 	gboolean      	 image_changed;
 	gboolean      	 create_self;
+        gboolean         editing_username;
 
 	gchar        	*person;
 	gchar 		*login;
@@ -132,7 +134,7 @@
 
 
 static void about_me_set_address_field (EContactAddress *, guint, gchar *);
-
+static gchar *about_me_get_address_field (EContactAddress *, guint);
 
 /*** Utility functions ***/
 static void
@@ -215,6 +217,50 @@
 	me->create_self = FALSE;
 }
 
+static void
+update_gecos (GnomeAboutMe *me)
+{
+       const gchar *argv[12];
+       gint i = 0;
+       const gchar *fullname;
+       const gchar *office;
+       const gchar *office_phone;
+       const gchar *home_phone;
+
+       argv[i++] = "/usr/bin/userinfo";
+
+       fullname = e_contact_get_const (me->contact, E_CONTACT_FULL_NAME);
+       office = about_me_get_address_field (me->addr2, ADDRESS_LOCALITY);
+       office_phone = e_contact_get_const (me->contact, E_CONTACT_PHONE_BUSINESS);
+       home_phone = e_contact_get_const (me->contact, E_CONTACT_PHONE_HOME);
+
+       if (fullname) {
+               argv[i++] = "-f";
+               argv[i++] = fullname;
+       }
+
+       if (office) {
+               argv[i++] = "-o";
+               argv[i++] = office;
+       }
+
+       if (office_phone) {
+               argv[i++] = "-p";
+               argv[i++] = office_phone;
+       }
+
+       if (home_phone) {
+               argv[i++] = "-h";
+               argv[i++] = home_phone;
+       }
+
+       argv[i++] = "-x";
+       argv[i++] = NULL;
+
+       g_spawn_sync (NULL, (gchar **)argv, NULL, 0,
+                     NULL, NULL, NULL, NULL, NULL, NULL);
+}
+
 static gboolean 
 about_me_commit_from_timeout (GnomeAboutMe *me)
 {
@@ -281,22 +327,6 @@
 	return FALSE;
 }
 
-static char *
-get_user_login (void)
-{
-	char buf[LINE_MAX * 4];
-	struct passwd pwd, *err;
-
-	int i;
-#if __sun
-	i = getpwuid_r (getuid (), &pwd, buf, sizeof (buf));
-	return (i != 0) ? g_strdup (pwd.pw_name) : NULL;
-#else
-	i = getpwuid_r (getuid (), &pwd, buf, sizeof (buf), &err);
-	return ((i == 0) && (err == &pwd)) ? g_strdup (pwd.pw_name) : NULL;
-#endif
-}
-
 /*
  * Helpers
  */
@@ -720,6 +750,8 @@
 			g_source_remove (me->commit_timeout_id);
 			about_me_commit (me);
 		}
+                 
+                update_gecos (me);
 
 		about_me_destroy (me);
 		gtk_main_quit ();
@@ -730,13 +762,149 @@
 about_me_passwd_clicked_cb (GtkWidget *button, GnomeAboutMe *me)
 {
         gchar *argv[2]; 
-	GladeXML *dialog;
 	
         argv[0] = "/usr/bin/userpasswd";
         argv[1] = NULL;
 	g_spawn_async (NULL, argv, NULL, 0, NULL, NULL, NULL, NULL);
 }
 
+static GtkWidget *
+find_fullname_editable_label (GnomeAboutMe *me)
+{
+       GtkWidget    *widget;
+       GList        *list;
+       GtkWidget    *c;
+       GladeXML     *dialog;
+
+       dialog = me->dialog;
+
+       widget = WID ("fullnamebox");
+
+       list = gtk_container_get_children (GTK_CONTAINER (widget->parent));
+
+       while (list) {
+               c = list->data;
+
+               if (EEL_IS_EDITABLE_LABEL (c))
+                      break;
+
+               c = NULL;
+
+               list = list->next;
+       }
+
+       g_list_free (list);
+
+       return c;
+}
+
+static void
+about_me_button_clicked (GtkWidget      *button,
+                        GnomeAboutMe   *me)
+{
+       GtkWidget    *label;
+       GtkWidget    *entry;
+       PangoFontDescription *font;
+       gint size;
+       const gchar *text;
+
+       label = gtk_bin_get_child (GTK_BIN (button));
+       entry = find_fullname_editable_label (me);
+
+       font = pango_font_description_copy (label->style->font_desc);
+        size = pango_font_description_get_size (font);
+        if (size == 0)
+               size = 10;
+       pango_font_description_set_size (font, size * PANGO_SCALE_XX_LARGE);
+       pango_font_description_set_weight (font, PANGO_WEIGHT_BOLD);
+
+       eel_editable_label_set_font_description (EEL_EDITABLE_LABEL (entry), font);
+       pango_font_description_free (font);
+
+       gtk_misc_set_alignment (GTK_MISC (entry), 0.0, 0.5);
+
+        me->editing_username = TRUE;
+
+        text = gtk_label_get_text (GTK_LABEL (label));
+        eel_editable_label_set_text (EEL_EDITABLE_LABEL (entry), text);
+
+       gtk_widget_hide (button);
+       gtk_widget_show (entry);
+       gtk_widget_grab_focus (entry);
+}
+
+static void stop_editing (GnomeAboutMe *me, gboolean commit)
+{
+       GtkWidget   *button;
+       GtkWidget   *label;
+       GtkWidget   *entry;
+       GtkWidget   *main_dialog;
+       const gchar *text;
+       gchar *str;
+       GladeXML     *dialog;
+
+       if (!me->editing_username)
+               return;
+
+       me->editing_username = FALSE;
+
+       dialog = me->dialog;
+
+       button = WID ("fullnamebox");
+       label = gtk_bin_get_child (GTK_BIN (button));
+       entry = find_fullname_editable_label (me);
+
+       if (commit) {
+               text = eel_editable_label_get_text (EEL_EDITABLE_LABEL (entry));
+               str = g_strdup_printf ("<b><span size=\"xx-large\">%s</span></b>", text);
+               gtk_label_set_markup (GTK_LABEL (label), str);
+               g_free (str);
+
+               g_free (me->username);
+               me->username = g_strdup (text);
+               e_contact_set (me->contact, E_CONTACT_FULL_NAME, me->username);
+
+               main_dialog = WID ("about-me-dialog");
+               str = g_strdup_printf (_("About %s"), me->username);
+               gtk_window_set_title (GTK_WINDOW (main_dialog), str);
+               g_free (str);
+       }
+
+       gtk_widget_hide (entry);
+       gtk_widget_show (button);
+}
+
+static gboolean
+about_me_entry_focus_out (GtkWidget     *entry,
+                         GdkEventFocus *event,
+                         GnomeAboutMe  *me)
+{
+       stop_editing (me, TRUE);
+
+       return FALSE;
+}
+
+static gboolean
+about_me_entry_key_press (GtkWidget    *entry,
+                         GdkEventKey  *event,
+                         GnomeAboutMe *me)
+{
+        switch (event->keyval)
+        {
+        case GDK_Return:
+        case GDK_KP_Enter:
+                stop_editing (me, TRUE);
+                return TRUE;
+        case GDK_Escape:
+                stop_editing (me, FALSE);
+                return TRUE;
+        default:
+                break;
+        }
+
+        return FALSE;
+}
+
 static gint
 about_me_setup_dialog (void)
 {
@@ -746,6 +914,8 @@
 	GladeXML     *dialog;
 	GError 	     *error = NULL;
         gchar        *str;
+        GtkWidget    *entry;
+        GtkWidget    *button;
 
 	me = g_new0 (GnomeAboutMe, 1);
 
@@ -825,6 +995,25 @@
 	gtk_label_set_markup (GTK_LABEL (widget), str);
 	g_free (str);
 
+       button = WID ("fullnamebox");
+       g_signal_connect (button, "clicked",
+                         G_CALLBACK (about_me_button_clicked), me);
+
+       entry = eel_editable_label_new (me->username);
+       eel_editable_label_set_line_wrap (EEL_EDITABLE_LABEL (entry), TRUE);
+        gtk_container_add (GTK_CONTAINER (button->parent), entry);
+       gtk_box_reorder_child (GTK_BOX (button->parent), entry, 3);
+       g_signal_connect (entry, "focus-out-event",
+                         G_CALLBACK (about_me_entry_focus_out), me);
+       g_signal_connect (entry, "key-press-event",
+                         G_CALLBACK (about_me_entry_key_press), me);
+
+       gtk_widget_set_no_show_all (button, TRUE);
+       gtk_widget_set_no_show_all (entry, TRUE);
+       gtk_widget_show (widget);
+       gtk_widget_show (button);
+       gtk_widget_hide (entry);
+
 	widget = WID ("login");
 	gtk_label_set_text (GTK_LABEL (widget), me->login);
 
--- control-center-2.18.0/configure.in.gecos	2007-04-17 09:27:17.000000000 +0200
+++ control-center-2.18.0/configure.in	2007-04-17 09:27:18.000000000 +0200
@@ -334,6 +334,7 @@
        
      PKG_CHECK_MODULES(LIBEBOOK, libebook-1.2)
   fi
+  PKG_CHECK_MODULES(EEL, eel-2.0)
 fi
 
 if test -n "$LIBEBOOK_REQUIREMENT"; then


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- control-center.spec	16 Apr 2007 22:53:04 -0000	1.243
+++ control-center.spec	17 Apr 2007 14:47:58 -0000	1.244
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.18.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -63,7 +63,7 @@
 
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: control-center-2.17.91-passwd.patch
-Patch96: control-center-2.17.92-gecos.patch
+Patch96: control-center-2.18.0-gecos.patch
 
 # change default wallpaper directory to where we ship our
 # backgrounds
@@ -328,6 +328,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-11
+- Remove debugging spew from the about-me capplet
+
 * Mon Apr 16 2007 Ray Strode <rstrode at redhat.com> - 2.18.0-10
 - Remove trailing space after escaped newline in schema post
   install.  Reported by Yanko Kaneti.


--- control-center-2.17.92-gecos.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 17 14:50:46 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 10:50:46 -0400
Subject: rpms/system-config-samba/devel .cvsignore, 1.34, 1.35 sources, 1.35,
	1.36 system-config-samba.spec, 1.39, 1.40
Message-ID: <200704171450.l3HEokSe030968@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
don't access smbpasswd directly but use pdbedit to allow for tdb/ldap backends (#236557)
update URL
mention that we are upstream
clean buildroot before installing
fix licensing blurb in PO files
Resolves: #236557



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	15 Jan 2007 10:20:35 -0000	1.34
+++ .cvsignore	17 Apr 2007 14:50:40 -0000	1.35
@@ -1 +1 @@
-system-config-samba-1.2.39.tar.bz2
+system-config-samba-1.2.40.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-samba/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	15 Jan 2007 10:20:35 -0000	1.35
+++ sources	17 Apr 2007 14:50:40 -0000	1.36
@@ -1 +1 @@
-17d9dd02257b8b5d95950c301e5465c7  system-config-samba-1.2.39.tar.bz2
+539e80af3b3d188a8a5b7f468c2a5cd5  system-config-samba-1.2.40.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- system-config-samba.spec	15 Jan 2007 10:20:35 -0000	1.39
+++ system-config-samba.spec	17 Apr 2007 14:50:40 -0000	1.40
@@ -1,13 +1,15 @@
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.39
+Version: 1.2.40
 Release: 1%{?dist}
-URL: http://www.redhat.com/
+URL: http://fedoraproject.org/wiki/SystemConfig/samba
 License: GPL
 ExclusiveOS: Linux
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
 BuildArch: noarch
+# We are upstream, thus the source is only available from within this source
+# package.
 Source0: %{name}-%{version}.tar.bz2
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -35,6 +37,7 @@
 make
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
 desktop-file-install --vendor system --delete-original       \
@@ -78,6 +81,18 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-samba
 
 %changelog
+* Tue Apr 17 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.40
+- don't access smbpasswd directly but use pdbedit to allow for tdb/ldap
+  backends (#236557)
+
+* Thu Mar 22 2007 Nils Philippsen <nphilipp at redhat.com>
+- update URL
+
+* Tue Mar 20 2007 Nils Philippsen <nphilipp at redhat.com>
+- mention that we are upstream
+- clean buildroot before installing
+- fix licensing blurb in PO files
+
 * Mon Jan 15 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.39
 - handle synonyms and inverted synonyms gracefully (#222595)
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 14:51:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 10:51:42 -0400
Subject: rpms/gdm/devel gdm-2.18.0-be-more-verbose.patch, NONE, 1.1 gdm.spec,
	1.245, 1.246
Message-ID: <200704171451.l3HEpgNF031633@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31351

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.18.0-be-more-verbose.patch 
Log Message:
- Be more verbose to help isolate the problem in bug 234567


gdm-2.18.0-be-more-verbose.patch:
 slave.c |   44 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 44 insertions(+)

--- NEW FILE gdm-2.18.0-be-more-verbose.patch ---
--- gdm-2.18.0/daemon/slave.c.be-more-verbose	2007-04-17 10:17:28.000000000 -0400
+++ gdm-2.18.0/daemon/slave.c	2007-04-17 10:47:30.000000000 -0400
@@ -966,6 +966,8 @@
 static void 
 gdm_screen_init (GdmDisplay *display) 
 {
+
+        gdm_debug ("gdm_screen_init: initializing xinerama, etc");
 #ifdef HAVE_XFREE_XINERAMA
 	int (* old_xerror_handler) (Display *, XErrorEvent *);
 	gboolean have_xinerama = FALSE;
@@ -982,36 +984,52 @@
 		have_xinerama = FALSE;
 
 	if (have_xinerama) {
+                gdm_debug ("gdm_screen_init: machine has xinerama");
 		int screen_num;
 		int xineramascreen;
 		XineramaScreenInfo *xscreens =
 			XineramaQueryScreens (display->dsp,
 					      &screen_num);
 
+                gdm_debug ("gdm_screen_init: display %s has %d screens", display->name, screen_num);
 
 		if G_UNLIKELY (screen_num <= 0)
 			gdm_fail ("Xinerama active, but <= 0 screens?");
 
 		if (screen_num <= gdm_get_value_int (GDM_KEY_XINERAMA_SCREEN))
+                  {
+                        gdm_debug ("gdm_screen_init: xinerama screen key is bogus (%d when screen_num is %d)",
+                                   gdm_get_value_int (GDM_KEY_XINERAMA_SCREEN), screen_num);
 			gdm_set_value_int (GDM_KEY_XINERAMA_SCREEN, 0);
+                  }
 
 		xineramascreen = gdm_get_value_int (GDM_KEY_XINERAMA_SCREEN);
+                gdm_debug ("gdm_screen_init: using head %d", screen_num);
 
 		display->screenx = xscreens[xineramascreen].x_org;
 		display->screeny = xscreens[xineramascreen].y_org;
 		display->screenwidth = xscreens[xineramascreen].width;
 		display->screenheight = xscreens[xineramascreen].height;
 
+                gdm_debug ("gdm_screen_init: head %d has dimensions (%dx%d+%d+%d)", 
+                           display->screenwidth, display->screenheight,
+                           display->screenx, display->screeny);
+
 		display->lrh_offsetx =
 			DisplayWidth (display->dsp,
 				      DefaultScreen (display->dsp))
 			- (display->screenx + display->screenwidth);
+
+                gdm_debug ("gdm_screen_init: display->lrh_offsetx = %d\n", display->lrh_offsetx);
 		display->lrh_offsety =
 			DisplayHeight (display->dsp,
 				       DefaultScreen (display->dsp))
 			- (display->screeny + display->screenheight);
+                gdm_debug ("gdm_screen_init: display->lrh_offsety = %d\n", display->lrh_offsety);
 
 		XFree (xscreens);
+
+                gdm_debug ("gdm_screen_init: xinerama configured\n");
 	} else
 #elif HAVE_SOLARIS_XINERAMA
  /* This code from GDK, Copyright (C) 2002 Sun Microsystems */
@@ -1034,6 +1052,7 @@
 		unsigned char  hints[16];
 		int xineramascreen;
 		
+                gdm_debug ("gdm_screen_init: machine has sun xinerama");
 		result = XineramaGetInfo (display->dsp, 0, monitors, hints, &n_monitors);
 		/* Yes I know it should be Success but the current implementation 
 		 * returns the num of monitor
@@ -1062,6 +1081,8 @@
 	} else
 #endif
 	{
+
+                gdm_debug ("gdm_screen_init: machine doesn't have xinerama");
 		display->screenx = 0;
 		display->screeny = 0;
 		display->screenwidth = 0; /* we'll use the gdk size */
@@ -1412,6 +1433,7 @@
     else
 	    maxtries = 10;
     
+    gdm_debug ("gdm_slave_run: maxtries = %d\n", maxtries);
     while (d->handled &&
 	   openretries < maxtries &&
 	   d->dsp == NULL &&
@@ -1428,9 +1450,11 @@
 	}
     }
 
+    gdm_debug ("gdm_slave_run: display %s is now open\n", d->name);
     /* Really this will only be useful for the first local server,
        since that's the only time this can really be on */
     while G_UNLIKELY (gdm_wait_for_go) {
+            gdm_debug ("gdm_slave_run: blocking until told to continue\n");
 	    struct timeval tv;
 	    /* Wait 1 second. */
 	    tv.tv_sec = 1;
@@ -1443,6 +1467,7 @@
 
     /* Set the busy cursor */
     if (d->dsp != NULL) {
+            gdm_debug ("gdm_slave_run: settings a busy cursor\n");
 	    Cursor xcursor = XCreateFontCursor (d->dsp, GDK_WATCH);
 	    XDefineCursor (d->dsp,
 			   DefaultRootWindow (d->dsp),
@@ -1451,20 +1476,24 @@
 	    XSync (d->dsp, False);
     }
 
+    gdm_debug ("gdm_slave_run: pausing for no reason at all\n");
     /* Just a race avoiding sleep, probably not necessary though,
      * but doesn't hurt anything */
     if ( ! d->handled)
 	    gdm_sleep_no_signal (1);
 
     if (SERVER_IS_LOCAL (d)) {
+            gdm_debug ("gdm_slave_run: display %s is local\n", d->name);
 	    gdm_slave_send (GDM_SOP_START_NEXT_LOCAL, FALSE);
     }
 
+    gdm_debug ("gdm_slave_run: checking pending notifies\n");
     check_notifies_now ();
 
     /* something may have gone wrong, try xfailed, if local (non-flexi),
      * the toplevel loop of death will handle us */ 
     if G_UNLIKELY (d->handled && d->dsp == NULL) {
+            gdm_debug ("gdm_slave_run: d->dsp is NULL\n");
 	    if (d->type == TYPE_STATIC)
 		    gdm_slave_quick_exit (DISPLAY_XFAILED);
 	    else
@@ -1477,6 +1506,7 @@
 
     /* If XDMCP setup pinging */
     if ( ! SERVER_IS_LOCAL (d) && pinginterval > 0) {
+            gdm_debug ("gdm_slave_run: installing a ping alarm at interval %d\n", pinginterval);
 	    alarm (pinginterval);
     }
 
@@ -1492,17 +1522,27 @@
 
     /* check log stuff for the server, this is done here
      * because it's really a race */
+
     if (SERVER_IS_LOCAL (d))
+      {
+            gdm_debug ("gdm_slave_run: checklog for vt");
 	    gdm_server_checklog (d);
+      }
 
     if ( ! d->handled) {
+
+            gdm_debug ("gdm_slave_run: !d->handled and servpid = %d", d->servpid);
 	    /* yay, we now wait for the server to die */
 	    while (d->servpid > 0) {
+                    gdm_debug ("gdm_slave_run: waiting for signal");
 		    pause ();
 	    }
+
+            gdm_debug ("gdm_slave_run: quick exit");
 	    gdm_slave_quick_exit (DISPLAY_REMANAGE);
     } else if (d->use_chooser) {
 	    /* this usually doesn't return */
+            gdm_debug ("gdm_slave_run: running chooser");
 	    gdm_slave_chooser ();  /* Run the chooser */
 	    return;
     } else if (d->type == TYPE_STATIC &&
@@ -1511,6 +1551,7 @@
 	       strcmp (ParsedAutomaticLogin, gdm_root_user ()) != 0) {
 	    gdm_first_login = FALSE;
 
+            gdm_debug ("gdm_slave_run: starting automatic login");
 	    d->logged_in = TRUE;
 	    gdm_slave_send_num (GDM_SOP_LOGGED_IN, TRUE);
 	    gdm_slave_send_string (GDM_SOP_LOGIN, ParsedAutomaticLogin);
@@ -1540,9 +1581,12 @@
 	    gdm_first_login = FALSE;
 
     do {
+
+            gdm_debug ("gdm_slave_run: checking notifies");
 	    check_notifies_now ();
 
 	    if ( ! greet) {
+                    gdm_debug ("gdm_slave_run: starting greeter");
 		    gdm_slave_greeter ();  /* Start the greeter */
 		    greeter_no_focus = FALSE;
 		    greeter_disabled = FALSE;


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- gdm.spec	12 Apr 2007 20:44:48 -0000	1.245
+++ gdm.spec	17 Apr 2007 14:51:40 -0000	1.246
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.18.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -75,6 +75,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=426647
 Patch36: gdm-2.18.0-dont-expect-utf8.patch
 
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=234567
+Patch99: gdm-2.18.0-be-more-verbose.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Prereq: /usr/sbin/useradd
@@ -162,6 +165,7 @@
 %patch34 -p1 -b .add-lowres-fix
 %patch35 -p1 -b .dont-strcpy-overlapping-strings
 %patch36 -p1 -b .dont-expect-utf8
+%patch99 -p1 -b .be-more-verbose
 
 %build
 cp -f %{SOURCE1} config/gdm
@@ -384,6 +388,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Tue Apr 17 2007 Ray Strode <rstrode at redhat.com> - 1:2.18.0-11
+- Be more verbose to help isolate the problem in bug 234567
+
 * Thu Apr 12 2007 Ray Strode <rstrode at redhat.com> - 1:2.18.0-10
 - add "Default" session back to the sessions menu (bug 234218)
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 15:38:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 11:38:57 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.3081,1.3082
Message-ID: <200704171538.l3HFcv4H026832@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
* Tue Apr 17 2007 Dave Jones <davej at redhat.com>
- disable sparse checking (segfault)



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3081
retrieving revision 1.3082
diff -u -r1.3081 -r1.3082
--- kernel-2.6.spec	17 Apr 2007 14:32:04 -0000	1.3081
+++ kernel-2.6.spec	17 Apr 2007 15:38:55 -0000	1.3082
@@ -37,7 +37,7 @@
 %define with_modsign 1
 
 # Whether or not to do C=1 builds with sparse
-%define usesparse 1
+%define usesparse 0
 
 # Whether or not to apply the Xen patches -- leave this enabled
 %define includexen 0
@@ -1252,7 +1252,7 @@
 # don't wakeup ondemand timer whilst idle.
 %patch1620 -p1
 # Update KVM.
-#%patch1630 -p1
+%patch1630 -p1
 # Allow to use 480600 baud on 16C950 UARTs
 %patch1650 -p1
 # Fix XFS umount bug.
@@ -2307,7 +2307,7 @@
 
 %changelog
 * Tue Apr 17 2007 Dave Jones <davej at redhat.com>
-- disable kvm update patch (debugging)
+- disable sparse checking (segfault)
 
 * Tue Apr 17 2007 Dave Jones <davej at redhat.com>
 - Update KVM to v19



From fedora-cvs-commits at redhat.com  Tue Apr 17 15:41:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 11:41:45 -0400
Subject: rpms/system-config-samba/devel .cvsignore, 1.35, 1.36 sources, 1.36,
	1.37 system-config-samba.spec, 1.40, 1.41
Message-ID: <200704171541.l3HFfjF1026979@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
cope with separate nmb service (#234687)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	17 Apr 2007 14:50:40 -0000	1.35
+++ .cvsignore	17 Apr 2007 15:41:43 -0000	1.36
@@ -1 +1 @@
-system-config-samba-1.2.40.tar.bz2
+system-config-samba-1.2.41.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-samba/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	17 Apr 2007 14:50:40 -0000	1.36
+++ sources	17 Apr 2007 15:41:43 -0000	1.37
@@ -1 +1 @@
-539e80af3b3d188a8a5b7f468c2a5cd5  system-config-samba-1.2.40.tar.bz2
+f49763da5d0e808daac19ea84bc864f4  system-config-samba-1.2.41.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- system-config-samba.spec	17 Apr 2007 14:50:40 -0000	1.40
+++ system-config-samba.spec	17 Apr 2007 15:41:43 -0000	1.41
@@ -1,6 +1,6 @@
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.40
+Version: 1.2.41
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/samba
 License: GPL
@@ -81,6 +81,9 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-samba
 
 %changelog
+* Tue Apr 17 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.41
+- cope with separate nmb service (#234687)
+
 * Tue Apr 17 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.40
 - don't access smbpasswd directly but use pdbedit to allow for tdb/ldap
   backends (#236557)



From fedora-cvs-commits at redhat.com  Tue Apr 17 15:51:16 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 11:51:16 -0400
Subject: rpms/system-config-securitylevel/devel .cvsignore, 1.67,
	1.68 sources, 1.82, 1.83 system-config-securitylevel.spec,
	1.93, 1.94
Message-ID: <200704171551.l3HFpG5N027205@cvs.devel.redhat.com>

Author: twoerner

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

Modified Files:
	.cvsignore sources system-config-securitylevel.spec 
Log Message:
[tw]
- Lots of interface changes and cleanup
- New ability to disable ipsec, ipp and mdns entries




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	12 Jan 2007 15:37:08 -0000	1.67
+++ .cvsignore	17 Apr 2007 15:51:14 -0000	1.68
@@ -55,3 +55,4 @@
 system-config-securitylevel-1.6.30.tar.bz2
 system-config-securitylevel-1.6.31.tar.bz2
 system-config-securitylevel-1.7.0.tar.bz2
+system-config-securitylevel-1.8.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- sources	12 Jan 2007 15:37:08 -0000	1.82
+++ sources	17 Apr 2007 15:51:14 -0000	1.83
@@ -1 +1 @@
-061b47bbd27554dd3ae8a510b833210e  system-config-securitylevel-1.7.0.tar.bz2
+a59fd3b3c297cf27994d1bbbed1dfe40  system-config-securitylevel-1.8.0.tar.bz2


Index: system-config-securitylevel.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/system-config-securitylevel.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- system-config-securitylevel.spec	12 Jan 2007 15:37:08 -0000	1.93
+++ system-config-securitylevel.spec	17 Apr 2007 15:51:14 -0000	1.94
@@ -1,6 +1,6 @@
 Summary: A graphical interface for modifying the system security level
 Name: system-config-securitylevel
-Version: 1.7.0
+Version: 1.8.0
 Release: 1%{?dist}
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -93,6 +93,10 @@
 /usr/bin/system-config-securitylevel-tui
 
 %changelog
+* Tue Apr 17 2007 Thomas Woerner <twoerner at redhat.com> 1.8.0-1
+- Lots of interface changes and cleanup
+- New ability to disable ipsec, ipp and mdns entries
+
 * Fri Jan 12 2007 Chris Lumens <clumens at redhat.com> 1.7.0-1
 - Change .desktop file (#218925).
 - Make iptables default FORWARD rule REJECT (#221828).



From fedora-cvs-commits at redhat.com  Tue Apr 17 15:52:17 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 11:52:17 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch, 1.1, 1.2
Message-ID: <200704171552.l3HFqH3E027280@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch 
Log Message:
fix p

openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch:
 shell/source/unix/sysshell/recently_used_file.cxx |    7 ++++---
 shell/source/unix/sysshell/systemshell.cxx        |   11 ++++++-----
 source/unix/sysshell/recently_used_file.cxx       |    0 
 source/unix/sysshell/systemshell.cxx              |    0 
 4 files changed, 10 insertions(+), 8 deletions(-)

Index: openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch	17 Apr 2007 13:47:11 -0000	1.1
+++ openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch	17 Apr 2007 15:52:15 -0000	1.2
@@ -37,7 +37,7 @@
 diff -u -r1.7 systemshell.cxx
 --- openoffice.org.orig/shell/source/unix/sysshell/systemshell.cxx	17 Sep 2006 01:42:56 -0000	1.7
 +++ openoffice.org/shell/source/unix/sysshell/systemshell.cxx	17 Apr 2007 13:37:48 -0000
-@@ -42,9 +42,6 @@
+@@ -42,19 +42,18 @@
  
  #include "osl/module.hxx"
  
@@ -47,7 +47,11 @@
  namespace SystemShell {
      
      typedef void (*PFUNC_ADD_TO_RECENTLY_USED_LIST)(const rtl::OUString&, const rtl::OUString&);
-@@ -55,6 +52,8 @@
+         
+     //##############################
+-    rtl::OUString get_absolute_library_url(const rtl::OUString& /*lib_name*/)
++    rtl::OUString get_absolute_library_url()
+     {
          rtl::OUString url;
          if (osl::Module::getUrlFromAddress(reinterpret_cast<oslGenericFunction>(AddToRecentDocumentList), url))
          {        



From fedora-cvs-commits at redhat.com  Tue Apr 17 15:57:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 11:57:49 -0400
Subject: rpms/system-config-securitylevel/devel .cvsignore, 1.68,
	1.69 sources, 1.83, 1.84
Message-ID: <200704171557.l3HFvnEE027392@cvs.devel.redhat.com>

Author: twoerner

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

Modified Files:
	.cvsignore sources 
Log Message:
[tw]
- checked in wrong tar ball



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- .cvsignore	17 Apr 2007 15:51:14 -0000	1.68
+++ .cvsignore	17 Apr 2007 15:57:47 -0000	1.69
@@ -1,58 +1 @@
-system-config-securitylevel-1.4.5.tar.bz2
-system-config-securitylevel-1.4.7.tar.bz2
-system-config-securitylevel-1.4.8.tar.bz2
-system-config-securitylevel-1.4.9.tar.bz2
-system-config-securitylevel-1.4.10.tar.bz2
-system-config-securitylevel-1.4.11.tar.bz2
-system-config-securitylevel-1.4.12.tar.bz2
-system-config-securitylevel-1.4.13.tar.bz2
-system-config-securitylevel-1.4.15.tar.bz2
-system-config-securitylevel-1.4.16.tar.bz2
-system-config-securitylevel-1.4.17.tar.bz2
-system-config-securitylevel-1.4.18.tar.bz2
-system-config-securitylevel-1.4.20.tar.bz2
-system-config-securitylevel-1.4.21.tar.bz2
-system-config-securitylevel-1.4.22.tar.bz2
-system-config-securitylevel-1.5.0.tar.bz2
-system-config-securitylevel-1.5.1.tar.bz2
-system-config-securitylevel-1.5.3.tar.bz2
-system-config-securitylevel-1.5.4.tar.bz2
-system-config-securitylevel-1.5.5.tar.bz2
-system-config-securitylevel-1.5.7.tar.bz2
-system-config-securitylevel-1.5.8.tar.bz2
-system-config-securitylevel-1.5.9.tar.bz2
-system-config-securitylevel-1.5.10.tar.bz2
-system-config-securitylevel-1.5.11.tar.bz2
-system-config-securitylevel-1.6.0.tar.bz2
-system-config-securitylevel-1.6.1.tar.bz2
-system-config-securitylevel-1.6.2.tar.bz2
-system-config-securitylevel-1.6.3.tar.bz2
-system-config-securitylevel-1.6.4.tar.bz2
-system-config-securitylevel-1.6.5.tar.bz2
-system-config-securitylevel-1.6.6.tar.bz2
-system-config-securitylevel-1.6.7.tar.bz2
-system-config-securitylevel-1.6.8.tar.bz2
-system-config-securitylevel-1.6.9.tar.bz2
-system-config-securitylevel-1.6.10.tar.bz2
-system-config-securitylevel-1.6.11.tar.bz2
-system-config-securitylevel-1.6.12.tar.bz2
-system-config-securitylevel-1.6.13.tar.bz2
-system-config-securitylevel-1.6.14.tar.bz2
-system-config-securitylevel-1.6.15.tar.bz2
-system-config-securitylevel-1.6.16.tar.bz2
-system-config-securitylevel-1.6.17.tar.bz2
-system-config-securitylevel-1.6.18.tar.bz2
-system-config-securitylevel-1.6.19.tar.bz2
-system-config-securitylevel-1.6.20.tar.bz2
-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
-system-config-securitylevel-1.6.25.tar.bz2
-system-config-securitylevel-1.6.26.tar.bz2
-system-config-securitylevel-1.6.28.tar.bz2
-system-config-securitylevel-1.6.29.tar.bz2
-system-config-securitylevel-1.6.30.tar.bz2
-system-config-securitylevel-1.6.31.tar.bz2
-system-config-securitylevel-1.7.0.tar.bz2
 system-config-securitylevel-1.8.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- sources	17 Apr 2007 15:51:14 -0000	1.83
+++ sources	17 Apr 2007 15:57:47 -0000	1.84
@@ -1 +1 @@
-a59fd3b3c297cf27994d1bbbed1dfe40  system-config-securitylevel-1.8.0.tar.bz2
+446194534b5fbba4e9d7b11594600551  system-config-securitylevel-1.8.0.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 17 15:59:27 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 11:59:27 -0400
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.100,1.101
Message-ID: <200704171559.l3HFxR2e027449@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdegraphics.spec 
Log Message:
cleanup



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- kdegraphics.spec	17 Apr 2007 08:59:54 -0000	1.100
+++ kdegraphics.spec	17 Apr 2007 15:59:25 -0000	1.101
@@ -1,9 +1,6 @@
-%define kpovmodeler 0
-
 %define rhel 0
 %define debug 0
 %define final 0
-
 %define make_cvs 1
 
 Version: 3.5.6
@@ -53,8 +50,10 @@
 BuildRequires: libart_lgpl-devel
 BuildRequires: libXmu-devel
 
-%if %{kpovmodeler}
-BuildRequires: freeglut-devel
+# kpovmodeler
+%if !%{rhel}
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libGLU-devel
 BuildRequires: libXi-devel
 %endif
 
@@ -72,7 +71,6 @@
 %{?kamera:* kamera (digital camera support)}
 * kcoloredit (palette editor and color chooser)
 * kdvi (displays TeX .dvi files)
-* kfax (displays faxfiles)
 * kghostview (displays postscript files)
 * kiconedit (icon editor)
 %{?kooka:* kooka (scanner application)}
@@ -90,6 +88,17 @@
 Graphic applications for the K Desktop Environment.
 This package contains header files for developing applications using kdegraphics.
 
+%package extras
+Summary: Extras packages from kdegraphics
+Group: Applications/Multimedia
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description extras
+Extra graphics applications for the K Desktop Environment, including:
+* kfax
+* kfaxview
+* kpovmodler
+
 %prep
 %setup -q
 %patch1 -p1 -b .misc
@@ -155,7 +164,13 @@
 # rpmdocs
 for dir in k* ; do
   for file in AUTHORS ChangeLog README TODO ; do
-    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
+    if test -s  "$dir/$file" ; then
+       install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
+       # exclude for RHEL
+       if [ "$dir" != kfax -a "$dir" != kfaxview -a "$dir" == kpovmodeler ] ; then
+         echo "%doc rpmdocs/$dir/" >> %{name}.lang
+       fi
+    fi
   done
 done
 
@@ -178,10 +193,97 @@
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
+%if !%{rhel} 
+%post extras
+/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 extras
+/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 || :
+%endif
+
+%if !%{rhel}
+%files extras
+%defattr(-,root,root,-)
+
+# kfax
+%doc rpmdocs/kfax/
+%{_bindir}/kfax
+%{_datadir}/applications/kde/kfax.desktop
+%{_datadir}/apps/kfax/
+%{_datadir}/icons/hicolor/??x??/apps/kfax.png
+%{_datadir}/icons/hicolor/scalable/apps/kfax.svgz
+
+# kfaxview
+%doc rpmdocs/kfaxview/
+%{_bindir}/kfaxview
+%{_libdir}/libkfaximage.so
+%{_libdir}/libkfaximage.la
+%{_libdir}/kde3/kfaxviewpart.*
+%{_datadir}/applications/kde/kfaxview.desktop
+%{_datadir}/apps/kfaxview/
+%{_datadir}/icons/hicolor/??x??/apps/kfaxview.png
+%{_datadir}/icons/hicolor/scalable/apps/kfaxview.svgz
+%{_datadir}/services/kfaxmultipage.desktop
+%{_datadir}/services/kfaxmultipage_tiff.desktop
+
+# kpovmodeler
+%doc rpmdocs/kpovmodeler/
+%doc %{_docdir}/HTML/en/kpovmodeler/
+%{_bindir}/kpovmodeler
+%{_libdir}/libkpovmodeler.*
+%{_libdir}/kde3/libkpovmodelerpart.*
+%{_datadir}/applications/kde/kpovmodeler.desktop
+%{_datadir}/apps/kpovmodeler/
+%{_datadir}/icons/crystalsvg/??x??/mimetypes/kpovmodeler_doc.png
+%{_datadir}/icons/hicolor/??x??/apps/kpovmodeler.png
+%endif
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %doc rpmdocs/*
+
+%if !%{rhel}
+# kfax
+%exclude %{_bindir}/kfax
+%exclude %{_datadir}/applications/kde/kfax.desktop
+%exclude %{_datadir}/apps/kfax/
+%exclude %{_datadir}/icons/hicolor/??x??/apps/kfax.png
+%exclude %{_datadir}/icons/hicolor/scalable/apps/kfax.svgz
+
+# kfaxview
+%exclude %{_bindir}/kfaxview
+%exclude %{_libdir}/libkfaximage.so
+%exclude %{_libdir}/libkfaximage.la
+%exclude %{_libdir}/kde3/kfaxviewpart.*
+%exclude %{_datadir}/applications/kde/kfaxview.desktop
+%exclude %{_datadir}/apps/kfaxview/
+%exclude %{_datadir}/icons/hicolor/??x??/apps/kfaxview.png
+%exclude %{_datadir}/icons/hicolor/scalable/apps/kfaxview.svgz
+%exclude %{_datadir}/services/kfaxmultipage.desktop
+%exclude %{_datadir}/services/kfaxmultipage_tiff.desktop
+
+# kpovmodeler
+%exclude %{_docdir}/HTML/en/kpovmodeler/
+%exclude %{_bindir}/kpovmodeler
+%exclude %{_libdir}/libkpovmodeler.*
+%exclude %{_libdir}/kde3/libkpovmodelerpart.*
+%exclude %{_datadir}/applications/kde/kpovmodeler.desktop
+%exclude %{_datadir}/apps/kpovmodeler/
+%exclude %{_datadir}/icons/crystalsvg/??x??/mimetypes/kpovmodeler_doc.png
+%exclude %{_datadir}/icons/hicolor/??x??/apps/kpovmodeler.png
+%endif
+
 %{_bindir}/*
 %{_datadir}/applications/kde/*.desktop
 %dir %{_datadir}/applnk/Graphics
@@ -194,9 +296,6 @@
 %{_datadir}/mimelnk/*/*
 %{_libdir}/lib*.so.*
 %{_libdir}/lib*.la
-%if !%{rhel}
-%{_libdir}/libkfaximage.so
-%endif
 %{_libdir}/libkdeinit_*.so
 %{_libdir}/kde3/*
 
@@ -205,9 +304,6 @@
 %{_includedir}/kde/*
 %{_libdir}/lib*.so
 %exclude %{_libdir}/libkdeinit_*.so
-%if !%{rhel}
-%exclude %{_libdir}/libkfaximage.so
-%endif
 
 %changelog
 * Mon Mar 12 2007 Than Ngo <than at redhat.com> - 7:3.5.6-2.fc7



From fedora-cvs-commits at redhat.com  Tue Apr 17 16:34:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 12:34:31 -0400
Subject: rpms/python-virtinst/devel virtinst-0.103.0-urlgrabber-import.patch,
	NONE, 1.1 python-virtinst.spec, 1.17, 1.18
Message-ID: <200704171634.l3HGYV83010454@cvs.devel.redhat.com>

Author: markmc

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

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.103.0-urlgrabber-import.patch 
Log Message:
* Tue Apr 17 2007 Mark McLoughlin <markmc at redhat.com> - 0.103.0-2.fc7
- Fix urlgrabber import error


virtinst-0.103.0-urlgrabber-import.patch:
 Guest.py |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE virtinst-0.103.0-urlgrabber-import.patch ---
--- virtinst-0.103.0/virtinst/Guest.py.urlgrabber-import	2007-04-16 08:35:35.000000000 -0400
+++ virtinst-0.103.0/virtinst/Guest.py	2007-04-17 12:30:41.514314000 -0400
@@ -23,6 +23,8 @@
 
 import logging
 
+import urlgrabber.progress as progress
+
 class VirtualDisk:
     DRIVER_FILE = "file"
     DRIVER_PHY = "phy"


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/dist/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- python-virtinst.spec	16 Apr 2007 13:39:51 -0000	1.17
+++ python-virtinst.spec	17 Apr 2007 16:34:29 -0000	1.18
@@ -3,8 +3,9 @@
 Summary: Python modules for starting Xen guest installations
 Name: python-virtinst
 Version: 0.103.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: virtinst-%{version}.tar.gz
+Patch0: virtinst-0.103.0-urlgrabber-import.patch
 License: GPL
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,6 +31,8 @@
 %prep
 %setup -q -n virtinst-%{version}
 
+%patch0 -p1 -b .urlgrabber-import
+
 %build
 python setup.py build
 
@@ -50,6 +53,9 @@
 %{_sbindir}/virt-install
 
 %changelog
+* Tue Apr 17 2007 Mark McLoughlin <markmc at redhat.com> - 0.103.0-2.fc7
+- Fix urlgrabber import error
+
 * Mon Apr 16 2007 Daniel P. Berrange <berrange at redhat.com> - 0.103.0-1.fc7
 - Updated to 0.103.0 release
 - More validation of UUIDs



From fedora-cvs-commits at redhat.com  Tue Apr 17 16:36:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 12:36:50 -0400
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.101,1.102
Message-ID: <200704171636.l3HGaoL0012068@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdegraphics.spec 
Log Message:
cleanup



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- kdegraphics.spec	17 Apr 2007 15:59:25 -0000	1.101
+++ kdegraphics.spec	17 Apr 2007 16:36:48 -0000	1.102
@@ -166,8 +166,8 @@
   for file in AUTHORS ChangeLog README TODO ; do
     if test -s  "$dir/$file" ; then
        install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
-       # exclude for RHEL
-       if [ "$dir" != kfax -a "$dir" != kfaxview -a "$dir" == kpovmodeler ] ; then
+       # exlucde for RHEL
+       if [ $dir != kfax -a $dir != kfaxview -a $dir != kpovmodeler ] ; then
          echo "%doc rpmdocs/$dir/" >> %{name}.lang
        fi
     fi



From fedora-cvs-commits at redhat.com  Tue Apr 17 16:52:46 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 12:52:46 -0400
Subject: rpms/squirrelmail/devel .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 squirrelmail-1.4.6-japanese-multibyte-view-text.patch, 1.2,
	1.3 squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch,
	1.1, 1.2 squirrelmail.spec, 1.50, 1.51
Message-ID: <200704171652.l3HGqk3x023628@cvs.devel.redhat.com>

Author: mbacovsk

Update of /cvs/dist/rpms/squirrelmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23352

Modified Files:
	.cvsignore sources 
	squirrelmail-1.4.6-japanese-multibyte-view-text.patch 
	squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch 
	squirrelmail.spec 
Log Message:
* Tue Apr 17 2007 Martin Bacovsky <mbacovsk at redhat.com> - 1.4.9a-1
- upgarde to new upstream 1.4.9a
- resolves: #235560 Many SM errors in apache logs



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	11 Sep 2006 09:29:55 -0000	1.17
+++ .cvsignore	17 Apr 2007 16:52:44 -0000	1.18
@@ -1,2 +1,4 @@
 squirrelmail-1.4.8.tar.bz2
 all_locales-1.4.7-20060702.tar.bz2
+squirrelmail-1.4.9a.tar.bz2
+all_locales-1.4.9-20070106.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	11 Aug 2006 19:25:12 -0000	1.17
+++ sources	17 Apr 2007 16:52:44 -0000	1.18
@@ -1,2 +1,2 @@
-ba3306e4790bbdb10eaccb00195f5107  squirrelmail-1.4.8.tar.bz2
-4b78f4612ef0a68e5a81a818a113497c  all_locales-1.4.7-20060702.tar.bz2
+3adf66bfe2e816ba8375cf811d8ef3f6  squirrelmail-1.4.9a.tar.bz2
+eaa0e8835b8d7d451500aad907c22e24  all_locales-1.4.9-20070106.tar.bz2

squirrelmail-1.4.6-japanese-multibyte-view-text.patch:
 view_text.php |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletion(-)

Index: squirrelmail-1.4.6-japanese-multibyte-view-text.patch
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail-1.4.6-japanese-multibyte-view-text.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- squirrelmail-1.4.6-japanese-multibyte-view-text.patch	9 Jul 2006 20:50:24 -0000	1.2
+++ squirrelmail-1.4.6-japanese-multibyte-view-text.patch	17 Apr 2007 16:52:44 -0000	1.3
@@ -5,6 +5,7 @@
      if (! empty($charset))
          $body = charset_decode($charset,$body,false,true);
  } else {
+     $ishtml = FALSE;
 -    translateText($body, $wrap_at, $charset);
 +    if($squirrelmail_language != 'ja_JP'){
 +        translateText($body, $wrap_at, $charset);

squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch:
 mime.php |   51 ++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 38 insertions(+), 13 deletions(-)

Index: squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch	16 Aug 2006 02:07:24 -0000	1.1
+++ squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch	17 Apr 2007 16:52:44 -0000	1.2
@@ -9,10 +9,12 @@
      $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
+@@ -312,6 +313,16 @@ function formatBody($imap_stream, $messa
      }
  
      $body = '';
++    $charset_converted = false;
++    $charset = strtolower($body_message->header->getParameter('charset'));
 +    if (!$charset_converted) {
 +        if ($charset == 'iso-2022-jp' || $charset == 'shift_jis' || $charset == 'euc-jp' ||
 +           ($squirrelmail_language == 'ja_JP' &&


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- squirrelmail.spec	9 Feb 2007 17:02:18 -0000	1.50
+++ squirrelmail.spec	17 Apr 2007 16:52:44 -0000	1.51
@@ -5,8 +5,8 @@
 
 Summary: SquirrelMail webmail client
 Name: squirrelmail
-Version: 1.4.8
-Release: 5%{?dist}
+Version: 1.4.9a
+Release: 1%{?dist}
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -14,17 +14,17 @@
 Source1: squirrelmail.conf
 Source2: squirrelmail-splash-fedora.png
 Source3: squirrelmail-splash-rhel.png
-Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.7-20060702.tar.bz2
+Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.9-20070106.tar.bz2
 Source5: config_local.php
 Patch1:  squirrelmail-1.4.6-zenkaku-subject-convert.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
+#Patch5:  squirrelmail-1.4.7-ja-translate.patch
 # CVE-2006-6142
-Patch100:  squirrelmail-1.4.8-CVE-2006-6142-draft_composesess.patch
-Patch101:  squirrelmail-1.4.8-CVE-2006-6142-mailto.patch
-Patch102:  squirrelmail-1.4.8-CVE-2006-6142-mime.php.patch
+#Patch100:  squirrelmail-1.4.8-CVE-2006-6142-draft_composesess.patch
+#Patch101:  squirrelmail-1.4.8-CVE-2006-6142-mailto.patch
+#Patch102:  squirrelmail-1.4.8-CVE-2006-6142-mime.php.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -49,14 +49,14 @@
 %patch4 -p1
 
 # CVE-2006-6142
-%patch100 -p0
-%patch101 -p0
-%patch102 -p1
+#%patch100 -p0
+#%patch101 -p0
+#%patch102 -p1
 
 mkdir locale_tempdir
 cd locale_tempdir
 tar xfj %SOURCE4
-%patch5 -p2
+#%patch5 -p2
 
 %build
 rm -f plugins/make_archive.pl
@@ -257,6 +257,10 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Tue Apr 17 2007 Martin Bacovsky <mbacovsk at redhat.com> - 1.4.9a-1
+- upgarde to new upstream 1.4.9a
+- resolves: #235560 Many SM errors in apache logs
+
 * Mon Jan 22 2007 Warren Togami <wtogami at redhat.com> 1.4.8-4
 - Clean up .orig files (#223648)
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 17:14:00 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 13:14:00 -0400
Subject: rpms/openoffice.org/FC-6
	openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch,
	1.3, 1.4 openoffice.org.spec, 1.941, 1.942
Message-ID: <200704171714.l3HHE06r006856@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch 
	openoffice.org.spec 
Log Message:
Resolves: rhbz#236773 unbelieveably impress fails on using the file dialog

openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch:
 cppuhelper/inc/cppuhelper/implbase1.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase10.hxx  |    2 +-
 cppuhelper/inc/cppuhelper/implbase11.hxx  |    2 +-
 cppuhelper/inc/cppuhelper/implbase12.hxx  |    2 +-
 cppuhelper/inc/cppuhelper/implbase2.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase3.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase4.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase5.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase6.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase7.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase8.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase9.hxx   |    2 +-
 cppuhelper/inc/cppuhelper/implbase_ex.hxx |   15 +++++++++++++++
 inc/cppuhelper/implbase1.hxx              |    0 
 inc/cppuhelper/implbase10.hxx             |    0 
 inc/cppuhelper/implbase11.hxx             |    0 
 inc/cppuhelper/implbase12.hxx             |    0 
 inc/cppuhelper/implbase2.hxx              |    0 
 inc/cppuhelper/implbase3.hxx              |    0 
 inc/cppuhelper/implbase4.hxx              |    0 
 inc/cppuhelper/implbase5.hxx              |    0 
 inc/cppuhelper/implbase6.hxx              |    0 
 inc/cppuhelper/implbase7.hxx              |    0 
 inc/cppuhelper/implbase8.hxx              |    0 
 inc/cppuhelper/implbase9.hxx              |    0 
 inc/cppuhelper/implbase_ex.hxx            |    0 
 26 files changed, 27 insertions(+), 12 deletions(-)

Index: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch	6 Apr 2007 12:49:45 -0000	1.3
+++ openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch	17 Apr 2007 17:13:58 -0000	1.4
@@ -226,647 +226,3 @@
  
  /** ImplHelper
      @internal
-Index: inc/cppuhelper/compbase.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase.hxx
---- openoffice.org/cppuhelper/inc/cppuhelper/compbase.hxx	8 Sep 2005 09:03:54 -0000	1.13
-+++ openoffice.org.orig/cppuhelperinc/cppuhelper/compbase.hxx	26 Feb 2007 10:08:02 -0000
-@@ -41,7 +41,7 @@
- #ifndef _CPPUHELPER_IMPLBASE_HXX_
- #include <cppuhelper/implbase.hxx>
- #endif
--
-+#pragma GCC visibility push(default)
- /* This header should not be used anymore.
-    @deprecated
- */
-@@ -124,4 +124,5 @@
- __DEF_COMPIMPLHELPER_B( N ) \
- __DEF_COMPIMPLHELPER_C( N )
- 
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase1.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase1.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase1.hxx
---- openoffice.org/cppuhelper/inc/cppuhelper/compbase1.hxx	19 Jun 2006 10:28:17 -0000	1.13
-+++ openoffice.org.orig/cppuhelperinc/cppuhelper/compbase1.hxx	26 Feb 2007 10:08:03 -0000
-@@ -45,7 +45,7 @@
- /*
- __DEF_COMPIMPLHELPER_EX( 1 )
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -146,5 +146,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase10.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase10.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase10.hxx
---- openoffice.org/cppuhelper/inc/cppuhelper/compbase10.hxx	19 Jun 2006 10:28:29 -0000	1.13
-+++ openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase10.hxx	26 Feb 2007 10:08:03 -0000
-@@ -45,7 +45,7 @@
- /*
- __DEF_COMPIMPLHELPER_EX( 10 )
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -146,5 +146,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase11.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase11.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase11.hxx
---- openoffice.org/cppuhelper/inc/cppuhelper/compbase11.hxx	19 Jun 2006 10:28:40 -0000	1.13
-+++ openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase11.hxx	26 Feb 2007 10:08:03 -0000
-@@ -45,7 +45,7 @@
- /*
- __DEF_COMPIMPLHELPER_EX( 11 )
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -146,5 +146,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase12.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase12.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase12.hxx
---- openoffice.org/cppuhelper/inc/cppuhelper/compbase12.hxx	19 Jun 2006 10:28:52 -0000	1.13
-+++ openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase12.hxx	26 Feb 2007 10:08:03 -0000
-@@ -45,7 +45,7 @@
- /*
- __DEF_COMPIMPLHELPER_EX( 12 )
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -146,5 +146,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase2.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase2.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase2.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase2.hxx	19 Jun 2006 10:29:03 -0000	1.13
-+++ openoffice.org/cppuhelper/inc/cppuhelper/compbase2.hxx	26 Feb 2007 10:08:03 -0000
-@@ -45,7 +45,7 @@
- /*
- __DEF_COMPIMPLHELPER_EX( 2 )
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -146,5 +146,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase3.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase3.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase3.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase3.hxx	19 Jun 2006 10:29:15 -0000	1.13
-+++ /openoffice.org/cppuhelper/inc/cppuhelper/compbase3.hxx	26 Feb 2007 10:08:03 -0000
-@@ -45,7 +45,7 @@
- /*
- __DEF_COMPIMPLHELPER_EX( 3 )
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -146,5 +146,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase4.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase4.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase4.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase4.hxx	19 Jun 2006 10:29:26 -0000	1.13
-+++ openoffice.org/cppuhelper/inc/cppuhelper/compbase4.hxx	26 Feb 2007 10:08:04 -0000
-@@ -45,7 +45,7 @@
- /*
- __DEF_COMPIMPLHELPER_EX( 4 )
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -146,5 +146,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase5.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase5.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase5.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase5.hxx	19 Jun 2006 10:29:38 -0000	1.13
-+++ openoffice.org/cppuhelper/inc/cppuhelper/compbase5.hxx	26 Feb 2007 10:08:04 -0000
-@@ -45,7 +45,7 @@
- /*
- __DEF_COMPIMPLHELPER_EX( 5 )
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -146,5 +146,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase6.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase6.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase6.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase6.hxx	19 Jun 2006 10:29:53 -0000	1.13
-+++ openoffice.org/cppuhelper/inc/cppuhelper/compbase6.hxx	26 Feb 2007 10:08:04 -0000
-@@ -45,7 +45,7 @@
- /*
- __DEF_COMPIMPLHELPER_EX( 6 )
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -146,5 +146,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase7.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase7.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase7.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase7.hxx	19 Jun 2006 10:30:06 -0000	1.13
-+++ openoffice.org/cppuhelper/inc/cppuhelper/compbase7.hxx	26 Feb 2007 10:08:04 -0000
-@@ -45,7 +45,7 @@
- /*
- __DEF_COMPIMPLHELPER_EX( 7 )
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -146,5 +146,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase8.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase8.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase8.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase8.hxx	19 Jun 2006 10:30:19 -0000	1.13
-+++ openoffice.org/cppuhelper/inc/cppuhelper/compbase8.hxx	26 Feb 2007 10:08:05 -0000
-@@ -45,7 +45,7 @@
- /*
- __DEF_COMPIMPLHELPER_EX( 8 )
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -146,5 +146,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase9.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase9.hxx,v
-retrieving revision 1.13
-diff -u -r1.13 compbase9.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase9.hxx	19 Jun 2006 10:30:40 -0000	1.13
-+++ openoffice.org/cppuhelper/inc/cppuhelper/compbase9.hxx	26 Feb 2007 10:08:05 -0000
-@@ -45,7 +45,7 @@
- /*
- __DEF_COMPIMPLHELPER_EX( 9 )
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -145,5 +145,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/compbase_ex.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/compbase_ex.hxx,v
-retrieving revision 1.3
-diff -u -r1.3 compbase_ex.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/compbase_ex.hxx	8 Sep 2005 09:10:47 -0000	1.3
-+++ openoffice.org/cppuhelper/inc/cppuhelper/compbase_ex.hxx	26 Feb 2007 10:08:05 -0000
-@@ -50,7 +50,7 @@
- #include <com/sun/star/lang/XComponent.hpp>
- #endif
- 
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -190,5 +190,5 @@
-     SAL_THROW( (::com::sun::star::uno::RuntimeException) );
- 
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/implbase.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase.hxx,v
-retrieving revision 1.14
-diff -u -r1.14 implbase.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase.hxx	8 Sep 2005 09:12:29 -0000	1.14
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase.hxx	26 Feb 2007 10:08:05 -0000
-@@ -54,7 +54,7 @@
- /* This header should not be used anymore.
-    @deprecated
- */
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -310,5 +310,7 @@
- __DEF_IMPLHELPER_POST_A( N ) \
- __DEF_IMPLHELPER_POST_B( N ) \
- __DEF_IMPLHELPER_POST_C( N )
-+
-+#pragma GCC visibility pop
- #endif
- 
-Index: inc/cppuhelper/implbase1.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase1.hxx,v
-retrieving revision 1.16
-diff -u -r1.16 implbase1.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase1.hxx	13 Dec 2006 14:51:42 -0000	1.16
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase1.hxx	26 Feb 2007 10:08:05 -0000
-@@ -44,7 +44,7 @@
- #ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_
- #include <com/sun/star/uno/XComponentContext.hpp>
- #endif
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
-     /** @internal */
-@@ -305,5 +305,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/implbase10.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase10.hxx,v
-retrieving revision 1.15
-diff -u -r1.15 implbase10.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase10.hxx	5 Oct 2005 14:24:09 -0000	1.15
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase10.hxx	26 Feb 2007 10:08:05 -0000
-@@ -41,7 +41,7 @@
- #ifndef INCLUDED_RTL_INSTANCE_HXX
- #include <rtl/instance.hxx>
- #endif
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
-     /** @internal */
-@@ -308,5 +308,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/implbase11.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase11.hxx,v
-retrieving revision 1.15
-diff -u -r1.15 implbase11.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase11.hxx	5 Oct 2005 14:24:35 -0000	1.15
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase11.hxx	26 Feb 2007 10:08:06 -0000
-@@ -41,7 +41,7 @@
- #ifndef INCLUDED_RTL_INSTANCE_HXX
- #include <rtl/instance.hxx>
- #endif
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
-     /** @internal */
-@@ -309,5 +309,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/implbase12.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase12.hxx,v
-retrieving revision 1.15
-diff -u -r1.15 implbase12.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase12.hxx	5 Oct 2005 14:25:08 -0000	1.15
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase12.hxx	26 Feb 2007 10:08:06 -0000
-@@ -41,7 +41,7 @@
- #ifndef INCLUDED_RTL_INSTANCE_HXX
- #include <rtl/instance.hxx>
- #endif
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
-     /** @internal */
-@@ -310,5 +310,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/implbase2.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase2.hxx,v
-retrieving revision 1.15
-diff -u -r1.15 implbase2.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase2.hxx	5 Oct 2005 14:25:28 -0000	1.15
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase2.hxx	26 Feb 2007 10:08:06 -0000
-@@ -41,7 +41,7 @@
- #ifndef INCLUDED_RTL_INSTANCE_HXX
- #include <rtl/instance.hxx>
- #endif
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
-     /** @internal */
-@@ -299,5 +299,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/implbase3.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase3.hxx,v
-retrieving revision 1.15
-diff -u -r1.15 implbase3.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase3.hxx	5 Oct 2005 14:25:47 -0000	1.15
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase3.hxx	26 Feb 2007 10:08:06 -0000
-@@ -41,7 +41,7 @@
- #ifndef INCLUDED_RTL_INSTANCE_HXX
- #include <rtl/instance.hxx>
- #endif
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
-     /** @internal */
-@@ -301,5 +301,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/implbase4.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase4.hxx,v
-retrieving revision 1.15
-diff -u -r1.15 implbase4.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase4.hxx	5 Oct 2005 14:26:03 -0000	1.15
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase4.hxx	26 Feb 2007 10:08:07 -0000
-@@ -41,7 +41,7 @@
- #ifndef INCLUDED_RTL_INSTANCE_HXX
- #include <rtl/instance.hxx>
- #endif
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
-     /** @internal */
-@@ -302,5 +302,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/implbase5.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase5.hxx,v
-retrieving revision 1.15
-diff -u -r1.15 implbase5.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase5.hxx	5 Oct 2005 14:26:20 -0000	1.15
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase5.hxx	26 Feb 2007 10:08:07 -0000
-@@ -41,7 +41,7 @@
- #ifndef INCLUDED_RTL_INSTANCE_HXX
- #include <rtl/instance.hxx>
- #endif
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
-     /** @internal */
-@@ -303,5 +303,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/implbase6.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase6.hxx,v
-retrieving revision 1.15
-diff -u -r1.15 implbase6.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase6.hxx	5 Oct 2005 14:26:37 -0000	1.15
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase6.hxx	26 Feb 2007 10:08:07 -0000
-@@ -41,7 +41,7 @@
- #ifndef INCLUDED_RTL_INSTANCE_HXX
- #include <rtl/instance.hxx>
- #endif
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
-     /** @internal */
-@@ -304,5 +304,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/implbase7.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase7.hxx,v
-retrieving revision 1.15
-diff -u -r1.15 implbase7.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase7.hxx	5 Oct 2005 14:26:54 -0000	1.15
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase7.hxx	26 Feb 2007 10:08:07 -0000
-@@ -41,7 +41,7 @@
- #ifndef INCLUDED_RTL_INSTANCE_HXX
- #include <rtl/instance.hxx>
- #endif
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
-     /** @internal */
-@@ -306,5 +306,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/implbase8.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase8.hxx,v
-retrieving revision 1.15
-diff -u -r1.15 implbase8.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase8.hxx	5 Oct 2005 14:27:12 -0000	1.15
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase8.hxx	26 Feb 2007 10:08:08 -0000
-@@ -41,7 +41,7 @@
- #ifndef INCLUDED_RTL_INSTANCE_HXX
- #include <rtl/instance.hxx>
- #endif
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
-     /** @internal */
-@@ -306,5 +306,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/implbase9.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase9.hxx,v
-retrieving revision 1.15
-diff -u -r1.15 implbase9.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase9.hxx	5 Oct 2005 14:27:40 -0000	1.15
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase9.hxx	26 Feb 2007 10:08:08 -0000
-@@ -41,7 +41,7 @@
- #ifndef INCLUDED_RTL_INSTANCE_HXX
- #include <rtl/instance.hxx>
- #endif
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
-     /** @internal */
-@@ -308,5 +308,5 @@
-             { return ImplHelper_getImplementationId( cd::get() ); }
-     };
- }
--
-+#pragma GCC visibility pop
- #endif
-Index: inc/cppuhelper/implbase_ex.hxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase_ex.hxx,v
-retrieving revision 1.6
-diff -u -r1.6 implbase_ex.hxx
---- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase_ex.hxx	5 Oct 2005 14:27:57 -0000	1.6
-+++ openoffice.org/cppuhelper/inc/cppuhelper/implbase_ex.hxx	26 Feb 2007 10:08:08 -0000
-@@ -64,7 +64,7 @@
- __DEF_IMPLHELPER_EX( 3 )
- */
- 
--
-+#pragma GCC visibility push(default)
- namespace cppu
- {
- 
-@@ -187,5 +187,5 @@
-     SAL_THROW( (::com::sun::star::uno::RuntimeException) );
- 
- }
--
-+#pragma GCC visibility pop
- #endif


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v
retrieving revision 1.941
retrieving revision 1.942
diff -u -r1.941 -r1.942
--- openoffice.org.spec	16 Apr 2007 10:07:48 -0000	1.941
+++ openoffice.org.spec	17 Apr 2007 17:13:58 -0000	1.942
@@ -1,6 +1,6 @@
 %define oootag OOD680
 %define ooomilestone 5
-%define rh_rpm_release 5.21
+%define rh_rpm_release 5.22
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -2591,6 +2591,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Tue Apr 17 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.22
+- Resolves: rhbz#236773 unbelieveably impress fails on using the file dialog
+
 * Mon Apr 16 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.21
 - add openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch for better
   offline debugging support



From fedora-cvs-commits at redhat.com  Tue Apr 17 17:32:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 13:32:49 -0400
Subject: rpms/mikmod/devel .cvsignore, 1.3, 1.4 libmikmod-64bit.patch, 1.2,
	1.3 libmikmod-esd.patch, 1.2, 1.3 libmikmod-strip-lib.patch,
	1.2, 1.3 mikmod-3.1.6-multilib.patch, 1.1, 1.2 mikmod.spec,
	1.32, 1.33 sources, 1.3, 1.4 libmikmod-3.1.11-a.diff, 1.1,
	NONE mikmod-3.1.6-security.patch, 1.1,
	NONE mikmod-3.1.6-tar.patch, 1.1,
	NONE mikmod-3.1.6-varargs.patch, 1.1, NONE mikmod-strip.patch,
	1.1, NONE patch-mikmod-3.1.6-a, 1.1, NONE
Message-ID: <200704171732.l3HHWnMk020381@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/mikmod/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20231

Modified Files:
	.cvsignore libmikmod-64bit.patch libmikmod-esd.patch 
	libmikmod-strip-lib.patch mikmod-3.1.6-multilib.patch 
	mikmod.spec sources 
Removed Files:
	libmikmod-3.1.11-a.diff mikmod-3.1.6-security.patch 
	mikmod-3.1.6-tar.patch mikmod-3.1.6-varargs.patch 
	mikmod-strip.patch patch-mikmod-3.1.6-a 
Log Message:
- update to mikmod-3.2.2-beta1
- drop useless libtool, texinfo BuildRequires
- don't use undefined macros, spec fixes
- fix install-info scriptlet usage (#223711), thanks to Ville Skytta



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mikmod/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Sep 2004 08:32:55 -0000	1.3
+++ .cvsignore	17 Apr 2007 17:32:46 -0000	1.4
@@ -1,2 +1,4 @@
 libmikmod-3.1.11.tar.gz
 mikmod-3.1.6.tar.gz
+mikmod-3.2.2-beta1.tar.gz
+libmikmod-3.2.0-beta2.tar.gz

libmikmod-64bit.patch:
 mikmod.h.in        |    3 ++-
 mikmod_internals.h |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

Index: libmikmod-64bit.patch
===================================================================
RCS file: /cvs/dist/rpms/mikmod/devel/libmikmod-64bit.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libmikmod-64bit.patch	9 Sep 2004 08:32:55 -0000	1.2
+++ libmikmod-64bit.patch	17 Apr 2007 17:32:47 -0000	1.3
@@ -1,5 +1,5 @@
---- mikmod-3.1.6/libmikmod-3.1.11/include/mikmod_internals.h.64bit	2004-08-04 05:08:06.604109384 +0200
-+++ mikmod-3.1.6/libmikmod-3.1.11/include/mikmod_internals.h	2004-08-04 05:09:56.700372208 +0200
+--- mikmod-3.2.2-beta1/libmikmod-3.2.0-beta2/include/mikmod_internals.h.64bit	2004-08-04 05:08:06.604109384 +0200
++++ mikmod-3.2.2-beta1/libmikmod-3.2.0-beta2/include/mikmod_internals.h	2004-08-04 05:09:56.700372208 +0200
 @@ -50,7 +50,8 @@
  /*========== More type definitions */
  
@@ -10,13 +10,13 @@
  typedef long		SLONGLONG;
  #define NATIVE_64BIT_INT
  #elif defined(__WATCOMC__)
---- mikmod-3.1.6/libmikmod-3.1.11/include/mikmod.h.in.64bit	2004-08-04 05:07:56.092707360 +0200
-+++ mikmod-3.1.6/libmikmod-3.1.11/include/mikmod.h.in	2004-08-04 05:09:06.217046840 +0200
+--- mikmod-3.2.2-beta1/libmikmod-3.2.0-beta2/include/mikmod.h.in.64bit	2004-08-04 05:07:56.092707360 +0200
++++ mikmod-3.2.2-beta1/libmikmod-3.2.0-beta2/include/mikmod.h.in	2004-08-04 05:09:06.217046840 +0200
 @@ -85,7 +85,8 @@
  
  @DOES_NOT_HAVE_SIGNED@
  
--#if defined(__arch64__) || defined(__alpha) || defined(__x86_64)
+-#if defined(__arch64__) || defined(__alpha)
 +#include <stdint.h>
 +#if __WORDSIZE == 64
  /* 64 bit architectures */

libmikmod-esd.patch:
 drv_esd.c |   62 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 34 insertions(+), 28 deletions(-)

Index: libmikmod-esd.patch
===================================================================
RCS file: /cvs/dist/rpms/mikmod/devel/libmikmod-esd.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libmikmod-esd.patch	9 Sep 2004 08:32:55 -0000	1.2
+++ libmikmod-esd.patch	17 Apr 2007 17:32:47 -0000	1.3
@@ -1,5 +1,5 @@
---- mikmod-3.1.6/libmikmod-3.1.11/drivers/drv_esd.c.esd	2004-08-04 05:04:58.990630968 +0200
-+++ mikmod-3.1.6/libmikmod-3.1.11/drivers/drv_esd.c	2004-08-04 05:05:32.940469808 +0200
+--- mikmod-3.2.2-beta1/libmikmod-3.2.0-beta2/drivers/drv_esd.c.esd	2004-08-04 05:04:58.990630968 +0200
++++ mikmod-3.2.2-beta1/libmikmod-3.2.0-beta2/drivers/drv_esd.c	2004-08-04 05:05:32.940469808 +0200
 @@ -127,20 +127,19 @@
  /* I hope to have this function integrated into libesd someday...*/
  static ssize_t esd_writebuf(int fd,const void *buffer,size_t count)

libmikmod-strip-lib.patch:
 Makefile.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: libmikmod-strip-lib.patch
===================================================================
RCS file: /cvs/dist/rpms/mikmod/devel/libmikmod-strip-lib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libmikmod-strip-lib.patch	22 Dec 2004 12:24:33 -0000	1.2
+++ libmikmod-strip-lib.patch	17 Apr 2007 17:32:47 -0000	1.3
@@ -1,6 +1,6 @@
---- mikmod-3.1.6/libmikmod-3.1.11/libmikmod/Makefile.in.old	2004-01-21 18:43:52.000000000 +0100
-+++ mikmod-3.1.6/libmikmod-3.1.11/libmikmod/Makefile.in	2004-12-22 11:44:28.143658832 +0100
-@@ -51,7 +51,7 @@
+--- mikmod-3.2.2-beta1/libmikmod-3.2.0-beta2/libmikmod/Makefile.in.old	2004-02-19 14:34:00.000000000 +0100
++++ mikmod-3.2.2-beta1/libmikmod-3.2.0-beta2/libmikmod/Makefile.in	2007-04-17 19:06:37.000000000 +0200
+@@ -52,7 +52,7 @@
  
  install:	$(LIB)
  	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)

mikmod-3.1.6-multilib.patch:
 configure           |    2 +-
 libmikmod-config.in |   14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

Index: mikmod-3.1.6-multilib.patch
===================================================================
RCS file: /cvs/dist/rpms/mikmod/devel/mikmod-3.1.6-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mikmod-3.1.6-multilib.patch	31 May 2006 15:52:45 -0000	1.1
+++ mikmod-3.1.6-multilib.patch	17 Apr 2007 17:32:47 -0000	1.2
@@ -1,5 +1,5 @@
---- mikmod-3.1.6/libmikmod-3.1.11/libmikmod-config.in.old	2004-01-21 18:43:52.000000000 +0100
-+++ mikmod-3.1.6/libmikmod-3.1.11/libmikmod-config.in	2006-05-31 17:36:12.000000000 +0200
+--- mikmod-3.2.2-beta1/libmikmod-3.2.0-beta2/libmikmod-config.in.old	2004-01-21 18:43:52.000000000 +0100
++++ mikmod-3.2.2-beta1/libmikmod-3.2.0-beta2/libmikmod-config.in	2006-05-31 17:36:12.000000000 +0200
 @@ -5,7 +5,7 @@
  exec_prefix_set=no
  
@@ -31,8 +31,8 @@
  	*)
  		echo "${usage}" 1>&2
  		exit 1
---- mikmod-3.1.6/libmikmod-3.1.11/configure.old	2004-01-21 18:43:52.000000000 +0100
-+++ mikmod-3.1.6/libmikmod-3.1.11/configure	2006-05-31 17:37:10.000000000 +0200
+--- mikmod-3.2.2-beta1/libmikmod-3.2.0-beta2/configure.old	2004-01-21 18:43:52.000000000 +0100
++++ mikmod-3.2.2-beta1/libmikmod-3.2.0-beta2/configure	2006-05-31 17:37:10.000000000 +0200
 @@ -6390,7 +6390,7 @@
  cross_compiling=$ac_cv_prog_cc_cross
  


Index: mikmod.spec
===================================================================
RCS file: /cvs/dist/rpms/mikmod/devel/mikmod.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mikmod.spec	9 Nov 2006 15:05:17 -0000	1.32
+++ mikmod.spec	17 Apr 2007 17:32:47 -0000	1.33
@@ -1,29 +1,20 @@
-# libmikmod rpm specification file
-%define lversion 3.1.11
+%define lversion 3.2.0-beta2
 
-Summary: A MOD music file player.
+Summary: A MOD music file player
 Name: mikmod
-Version: 3.1.6
-Release: 39%{?dist}
+Version: 3.2.2
+Release: 1%{?dist}
 License: GPL/LGPL
 Group: Applications/Multimedia
-Prereq: /sbin/ldconfig
-Prefix: /usr
-Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildPrereq: ncurses-devel texinfo libtool
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: ncurses-devel
 URL: http://mikmod.raphnet.net/
-Source0: http://mikmod.raphnet.net/files/mikmod-%{version}.tar.gz
+Source0: http://mikmod.raphnet.net/files/mikmod-%{version}-beta1.tar.gz
 Source1: http://mikmod.raphnet.net/files/libmikmod-%{lversion}.tar.gz
-Patch0:  http://mikmod.raphnet.net/files/libmikmod-3.1.11-a.diff
-Patch1:  mikmod-strip.patch
-Patch2:  libmikmod-esd.patch
-Patch3:  libmikmod-64bit.patch
-Patch4:  patch-mikmod-3.1.6-a
-Patch5:  mikmod-3.1.6-varargs.patch
-Patch6:  libmikmod-strip-lib.patch
-Patch7:  mikmod-3.1.6-security.patch
-Patch8:  mikmod-3.1.6-tar.patch
-Patch9:  mikmod-3.1.6-multilib.patch
+Patch0:  libmikmod-esd.patch
+Patch1:  libmikmod-64bit.patch
+Patch2:  libmikmod-strip-lib.patch
+Patch3:  mikmod-3.1.6-multilib.patch
 
 %description
 MikMod is one of the best and most well known MOD music file players
@@ -48,56 +39,47 @@
 applications for mikmod.
 
 %prep
-%setup -q -a 1 
-%patch0 -p0
-%patch1 -p1 -b .strip
-%patch2 -p1 -b .esd
-%patch3 -p1
-%patch4 -p1 -b .orig
-%patch5 -p1 
-%patch6 -p1 -b .lib-strip
-%patch7 -p1 -b .sec
-%patch8 -p1 -b .tar
-%patch9 -p1 -b .multi
+%setup -q -a 1 -n %{name}-%{version}-beta1
+%patch0 -p1 -b .esd
+%patch1 -p1 -b .64bit
+%patch2 -p1 -b .lib-strip
+%patch3 -p1 -b .multi
 
 %build
 rm -rf $RPM_BUILD_ROOT
-cd libmikmod-%{lversion}
-cp /usr/share/libtool/config.{sub,guess} .
+pushd libmikmod-%{lversion}
 %configure
-make
-%makeinstall
-cd ..
+make install DESTDIR=$RPM_BUILD_ROOT
+popd
 
 # Trick it into compiling while libmikmod is not installed...
-export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{prefix}/lib:$LD_LIBRARY_PATH
-perl -pi -e "s,-lmikmod,-I$RPM_BUILD_ROOT%{prefix}/include -L$RPM_BUILD_ROOT%{_libdir} -lmikmod,g" libmikmod-%{lversion}/libmikmod-config
+export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_prefix}/lib:$LD_LIBRARY_PATH
+perl -pi -e "s,-lmikmod,-I$RPM_BUILD_ROOT%{_prefix}/include -L$RPM_BUILD_ROOT%{_libdir} -lmikmod,g" libmikmod-%{lversion}/libmikmod-config
 export LIBMIKMOD_CONFIG=`pwd`/libmikmod-%{lversion}/libmikmod-config
-cp /usr/share/libtool/config.{sub,guess} .
 %configure \
-	--with-libmikmod-prefix=$RPM_BUILD_ROOT%{prefix} \
-	--with-libmikmod-exec-prefix=$RPM_BUILD_ROOT%{prefix}/bin \
+	--with-libmikmod-prefix=$RPM_BUILD_ROOT%{_prefix} \
+	--with-libmikmod-exec-prefix=$RPM_BUILD_ROOT%{_prefix}/bin \
 	--disable-libmikmodtest
-make CFLAGS="$RPM_OPT_FLAGS `libmikmod-%{lversion}/libmikmod-config --cflags` -I."
+make CFLAGS="$RPM_OPT_FLAGS `libmikmod-%{lversion}/libmikmod-config --cflags`" LDFLAGS="-lm"
 
 %install
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 find $RPM_BUILD_ROOT | grep "\\.la$" | xargs rm -f
 
 %clean
-rm -fr $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info %{_infodir}/mikmod.info.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/mikmod.info.gz %{_infodir}/dir || :
 
 %postun -p /sbin/ldconfig
 
 %postun devel
 if [ $1 = 0 ] ; then
-	/sbin/install-info  --delete %{_infodir}/mikmod.info.gz %{_infodir}/dir
+	/sbin/install-info  --delete %{_infodir}/mikmod.info.gz %{_infodir}/dir || :
 fi
 
 %files
@@ -113,13 +95,19 @@
 %{_bindir}/*-config
 %{_libdir}/*.a
 %{_libdir}/*.so
-#%{_libdir}/*.la
 %{_datadir}/aclocal/*
+%{_datadir}/mikmod/mikmodrc
 %{_includedir}/*
 %{_infodir}/mikmod*
 %{_mandir}/man1/libmikmod-config*
 
 %changelog
+* Tue Apr 17 2007 Jindrich Novy <jnovy at redhat.com> 3.2.2-1
+- update to mikmod-3.2.2-beta1
+- drop useless libtool, texinfo BuildRequires
+- don't use undefined macros, spec fixes
+- fix install-info scriptlet usage (#223711), thanks to Ville Skytta
+
 * Thu Nov  9 2006 Martin Stransky <stransky at redhat.com> - 3.1.6-39
 - removed obsoletes on tracker (#214112)
 
@@ -227,7 +215,7 @@
 - Bump release + rebuild.
 
 * Thu Dec  7 2000 Bill Nottingham <notting at redhat.com>
-- fix %doc generation
+- fix %%doc generation
 
 * Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
 - automatic rebuild


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mikmod/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Sep 2004 08:32:55 -0000	1.3
+++ sources	17 Apr 2007 17:32:47 -0000	1.4
@@ -1,2 +1,2 @@
-705106da305e8de191549f1e7393185c  libmikmod-3.1.11.tar.gz
-71d8142ae3ae27034535913e906b1384  mikmod-3.1.6.tar.gz
+9a9534a054afe8d28cc784041e6d1519  mikmod-3.2.2-beta1.tar.gz
+19fc0879aebd1610813a23bd84726362  libmikmod-3.2.0-beta2.tar.gz


--- libmikmod-3.1.11-a.diff DELETED ---


--- mikmod-3.1.6-security.patch DELETED ---


--- mikmod-3.1.6-tar.patch DELETED ---


--- mikmod-3.1.6-varargs.patch DELETED ---


--- mikmod-strip.patch DELETED ---


--- patch-mikmod-3.1.6-a DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 17 17:34:29 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 13:34:29 -0400
Subject: rpms/squirrelmail/devel squirrelmail-1.4.9a-id_plural.patch, NONE,
	1.1 squirrelmail.spec, 1.51, 1.52
Message-ID: <200704171734.l3HHYTaK021554@cvs.devel.redhat.com>

Author: mbacovsk

Update of /cvs/dist/rpms/squirrelmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21258

Modified Files:
	squirrelmail.spec 
Added Files:
	squirrelmail-1.4.9a-id_plural.patch 
Log Message:
* Tue Apr 17 2007 Martin Bacovsky <mbacovsk at redhat.com> - 1.4.9a-1
- patch fixing indonesian translation plurals


squirrelmail-1.4.9a-id_plural.patch:
 squirrelmail.po |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE squirrelmail-1.4.9a-id_plural.patch ---
--- squirrelmail-1.4.9a/locale_tempdir/locale/id_ID/LC_MESSAGES/squirrelmail.po.id_plural	2007-04-17 19:28:49.000000000 +0200
+++ squirrelmail-1.4.9a/locale_tempdir/locale/id_ID/LC_MESSAGES/squirrelmail.po	2007-04-17 19:30:29.000000000 +0200
@@ -4336,7 +4336,6 @@
 msgid "%d Minute"
 msgid_plural "%d Minutes"
 msgstr[0] "%d Menit"
-msgstr[1] "%d Menit"
 
 msgid "XP"
 msgstr "Windows XP"
@@ -4613,7 +4612,6 @@
 msgid "Login OK: Inbox contains %s message"
 msgid_plural "Login OK: Inbox contains %s messages"
 msgstr[0] "BERHASIL masuk: KOTAK POS berisi %s pesan"
-msgstr[1] "BERHASIL masuk: KOTAK POS berisi %s pesan"
 
 msgid "Width of popup window:"
 msgstr "Lebar jendela popup:"


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- squirrelmail.spec	17 Apr 2007 16:52:44 -0000	1.51
+++ squirrelmail.spec	17 Apr 2007 17:34:27 -0000	1.52
@@ -21,6 +21,7 @@
 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
+Patch6:  squirrelmail-1.4.9a-id_plural.patch
 # CVE-2006-6142
 #Patch100:  squirrelmail-1.4.8-CVE-2006-6142-draft_composesess.patch
 #Patch101:  squirrelmail-1.4.8-CVE-2006-6142-mailto.patch
@@ -56,7 +57,7 @@
 mkdir locale_tempdir
 cd locale_tempdir
 tar xfj %SOURCE4
-#%patch5 -p2
+%patch6 -p2
 
 %build
 rm -f plugins/make_archive.pl



From fedora-cvs-commits at redhat.com  Tue Apr 17 18:30:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 14:30:31 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.3082,1.3083
Message-ID: <200704171830.l3HIUVSO020076@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
* Tue Apr 17 2007 Dave Jones <davej at redhat.com>
- disable libata hpa patch (needs debugging)



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3082
retrieving revision 1.3083
diff -u -r1.3082 -r1.3083
--- kernel-2.6.spec	17 Apr 2007 15:38:55 -0000	1.3082
+++ kernel-2.6.spec	17 Apr 2007 18:30:23 -0000	1.3083
@@ -1312,7 +1312,7 @@
 # Enable PATA ports on Promise SATA.
 #%patch2200 -p1
 # HPA support for libata.
-%patch2201 -p1
+#%patch2201 -p1
 # libata: don't initialize sg in ata_exec_internal() if DMA_NONE
 # ia64 ata quirk
 %patch2204 -p1
@@ -2307,6 +2307,9 @@
 
 %changelog
 * Tue Apr 17 2007 Dave Jones <davej at redhat.com>
+- disable libata hpa patch (needs debugging)
+
+* Tue Apr 17 2007 Dave Jones <davej at redhat.com>
 - disable sparse checking (segfault)
 
 * Tue Apr 17 2007 Dave Jones <davej at redhat.com>



From fedora-cvs-commits at redhat.com  Tue Apr 17 19:00:12 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 15:00:12 -0400
Subject: rpms/kernel/devel linux-2.6-libata-sata_nv-adma.patch, NONE,
	1.1 kernel-2.6.spec, 1.3083, 1.3084
Message-ID: <200704171900.l3HJ0CPZ021870@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-libata-sata_nv-adma.patch 
Log Message:
* Tue Apr 17 2007 Dave Jones <davej at redhat.com>
- sata_nv: Don't attempt using ADMA for (READ|SET)_MAX commands


linux-2.6-libata-sata_nv-adma.patch:
 sata_nv.c |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-libata-sata_nv-adma.patch ---
>From davej  Tue Apr 17 14:48:11 2007
Return-path: <kyle at athena.road.mcmartin.ca>
X-Spam-Checker-Version: SpamAssassin 3.1.8 (2007-02-13) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.5 required=5.0 tests=AWL,BAYES_00,FORGED_RCVD_HELO
	autolearn=ham version=3.1.8
Envelope-to: davej at codemonkey.org.uk
Delivery-date: Tue, 17 Apr 2007 19:47:53 +0100
Received: from testure.choralone.org [194.9.77.134]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.6)
	for <davej at localhost> (single-drop); Tue, 17 Apr 2007 14:48:11 -0400 (EDT)
Received: from stout.engsoc.carleton.ca ([134.117.69.22])
	by testure.choralone.org with esmtp (Exim 4.63)
	(envelope-from <kyle at athena.road.mcmartin.ca>)
	id 1HdsiW-0002XC-Ij
	for davej at codemonkey.org.uk; Tue, 17 Apr 2007 19:47:53 +0100
Received: from localhost (stout [127.0.0.1])
	by stout.engsoc.carleton.ca (Postfix) with ESMTP id D6A9C58409A
	for <davej at codemonkey.org.uk>; Tue, 17 Apr 2007 14:47:45 -0400 (EDT)
Received: from fattire.cabal.ca (cabal.ca [134.117.69.58])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by stout.engsoc.carleton.ca (Postfix) with ESMTP id 236F9584099
	for <davej at codemonkey.org.uk>; Tue, 17 Apr 2007 14:47:45 -0400 (EDT)
Received: from athena.road.mcmartin.ca (206-248-151-76.dsl.ncf.ca [206.248.151.76])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client CN "roadwarrior.mcmartin.ca", Issuer "there.is.no.cabal.ca" (verified OK))
	by fattire.cabal.ca (Postfix) with ESMTP id B4120837DB
	for <davej at codemonkey.org.uk>; Tue, 17 Apr 2007 14:47:44 -0400 (EDT)
Received: by athena.road.mcmartin.ca (Postfix, from userid 1000)
	id 7DF183B06E; Tue, 17 Apr 2007 14:45:42 -0400 (EDT)
Resent-From: kyle at athena.road.mcmartin.ca
Resent-Date: Tue, 17 Apr 2007 14:45:41 -0400
Resent-Message-ID: <20070417184541.GB24014 at athena.road.mcmartin.ca>
Resent-To: davej at codemonkey.org.uk
X-Original-To: kyle at mcmartin.ca
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by fattire.cabal.ca (Postfix) with ESMTP id 474E8837DD
	for <kyle at mcmartin.ca>; Fri, 13 Apr 2007 13:10:30 -0400 (EDT)
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1754104AbXDMRKR (ORCPT <rfc822;kyle at mcmartin.ca>);
	Fri, 13 Apr 2007 13:10:17 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1754107AbXDMRKR
	(ORCPT <rfc822;linux-ide-outgoing>); Fri, 13 Apr 2007 13:10:17 -0400
Received: from stout.engsoc.carleton.ca ([134.117.69.22]:55761 "EHLO
	stout.engsoc.carleton.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1754104AbXDMRKP (ORCPT
	<rfc822;linux-ide at vger.kernel.org>); Fri, 13 Apr 2007 13:10:15 -0400
Received: from localhost (stout [127.0.0.1])
	by stout.engsoc.carleton.ca (Postfix) with ESMTP id 8E62058408C;
	Fri, 13 Apr 2007 13:10:14 -0400 (EDT)
Received: from fattire.cabal.ca (cabal.ca [134.117.69.58])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by stout.engsoc.carleton.ca (Postfix) with ESMTP id DE73E584097;
	Fri, 13 Apr 2007 13:10:13 -0400 (EDT)
Received: from athena.road.mcmartin.ca (206-248-151-76.dsl.ncf.ca [206.248.151.76])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client CN "roadwarrior.mcmartin.ca", Issuer "there.is.no.cabal.ca" (verified OK))
	by fattire.cabal.ca (Postfix) with ESMTP id 79979837DD;
	Fri, 13 Apr 2007 13:10:13 -0400 (EDT)
Received: by athena.road.mcmartin.ca (Postfix, from userid 1000)
	id 079373B06E; Fri, 13 Apr 2007 13:08:31 -0400 (EDT)
Date:	Fri, 13 Apr 2007 13:08:31 -0400
From: Kyle McMartin <kyle at canonical.com>
To: Robert Hancock <hancockr at shaw.ca>
Cc: linux-ide at vger.kernel.org, jgarzik at pobox.com, bcollins at ubuntu.com
Subject: [PATCH] sata_nv: Don't attempt using ADMA for (READ|SET)_MAX commands
Message-ID: <20070413170831.GC27674 at athena.road.mcmartin.ca>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.13 (2006-08-11)
X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at engsoc.carleton.ca
Sender: linux-ide-owner at vger.kernel.org
Precedence: bulk
X-Mailing-List:	linux-ide at vger.kernel.org
X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at engsoc.carleton.ca
Status: RO
Content-Length: 1715
Lines: 57

READ_NATIVE_MAX and SET_MAX were causing timeouts on sata_nv controllers.
Disabling ADMA helped, but that is quite a large hammer to use. Reverting
382a6652e91b34d5480cfc0ed840c196650493d4 also helped, but we might as well
fix it right, instead of disabling the performance gain on cache flushes
by using ADMA mode.

Signed-off-by: Kyle McMartin <kyle at canonical.com>

---

This patch depends on the Host Protected Area patch Alan sent to linux-ide
this week.

diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 9d9670a..eaf9b76 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -1162,6 +1162,20 @@ static void nv_adma_fill_sg(struct ata_queued_cmd *qc, struct nv_adma_cpb *cpb)
 		cpb->next_aprd = cpu_to_le64(0);
 }
 
+static int nv_blacklist_adma_for_hpa_cmds(struct ata_taskfile *tf)
+{
+	switch(tf->command) {
+	case ATA_CMD_READ_NATIVE_MAX:
+	case ATA_CMD_READ_NATIVE_MAX_EXT:
+	case ATA_CMD_SET_MAX:
+	case ATA_CMD_SET_MAX_EXT:
+		return 1;
+
+	default:
+		return 0;
+	}
+}
+
 static int nv_adma_use_reg_mode(struct ata_queued_cmd *qc)
 {
 	struct nv_adma_port_priv *pp = qc->ap->private_data;
@@ -1173,8 +1187,12 @@ static int nv_adma_use_reg_mode(struct ata_queued_cmd *qc)
 		return 1;
 
 	if((qc->flags & ATA_QCFLAG_DMAMAP) ||
-	   (qc->tf.protocol == ATA_PROT_NODATA))
-		return 0;
+	   (qc->tf.protocol == ATA_PROT_NODATA)) {
+		if (nv_blacklist_adma_for_hpa_cmds(&qc->tf))
+			return 1;	/* (SET|READ)_NATIVE_MAX time out in ADMA mdoe */
+		else
+			return 0;
+	}
 
 	return 1;
 }
-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3083
retrieving revision 1.3084
diff -u -r1.3083 -r1.3084
--- kernel-2.6.spec	17 Apr 2007 18:30:23 -0000	1.3083
+++ kernel-2.6.spec	17 Apr 2007 19:00:05 -0000	1.3084
@@ -587,6 +587,7 @@
 # SATA Bits
 Patch2200: linux-2.6-sata-promise-pata-ports.patch
 Patch2201: linux-2.6-libata-hpa.patch
+Patch2202: linux-2.6-libata-sata_nv-adma.patch
 Patch2204: linux-2.6-ata-quirk.patch
 
 # ACPI bits
@@ -1312,7 +1313,9 @@
 # Enable PATA ports on Promise SATA.
 #%patch2200 -p1
 # HPA support for libata.
-#%patch2201 -p1
+%patch2201 -p1
+# sata_nv: Don't attempt using ADMA for (READ|SET)_MAX commands
+%patch2202 -p1
 # libata: don't initialize sg in ata_exec_internal() if DMA_NONE
 # ia64 ata quirk
 %patch2204 -p1
@@ -2307,7 +2310,7 @@
 
 %changelog
 * Tue Apr 17 2007 Dave Jones <davej at redhat.com>
-- disable libata hpa patch (needs debugging)
+- sata_nv: Don't attempt using ADMA for (READ|SET)_MAX commands
 
 * Tue Apr 17 2007 Dave Jones <davej at redhat.com>
 - disable sparse checking (segfault)



From fedora-cvs-commits at redhat.com  Tue Apr 17 19:28:17 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 15:28:17 -0400
Subject: rpms/selinux-policy/devel modules-strict.conf, 1.27,
	1.28 modules-targeted.conf, 1.55, 1.56 policy-20070219.patch,
	1.48, 1.49 selinux-policy.spec, 1.433, 1.434
Message-ID: <200704171928.l3HJSHIr009596@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	modules-strict.conf modules-targeted.conf 
	policy-20070219.patch selinux-policy.spec 
Log Message:
* Tue Apr 17 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-4
- Rwho policy
- Fixes for consolekit



Index: modules-strict.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-strict.conf,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- modules-strict.conf	11 Apr 2007 20:55:28 -0000	1.27
+++ modules-strict.conf	17 Apr 2007 19:28:14 -0000	1.28
@@ -1145,6 +1145,13 @@
 rsync = module
 
 # Layer: services
+# Module: rwho
+#
+# who is logged in on local machines
+# 
+rwho = module
+
+# Layer: services
 # Module: djbdns
 #
 # small and secure DNS daemon


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- modules-targeted.conf	11 Apr 2007 20:55:28 -0000	1.55
+++ modules-targeted.conf	17 Apr 2007 19:28:14 -0000	1.56
@@ -1036,6 +1036,12 @@
 # 
 rsync = base
 
+# Layer: services
+# Module: rwho
+#
+# who is logged in on local machines
+# 
+rwho = module
 
 # Layer: services
 # Module: sasl

policy-20070219.patch:
 Rules.modular                           |   12 +
 policy/flask/access_vectors             |    4 
 policy/global_booleans                  |    2 
 policy/global_tunables                  |    7 
 policy/mls                              |   31 ++-
 policy/modules/admin/acct.te            |    1 
 policy/modules/admin/amtu.fc            |    3 
 policy/modules/admin/amtu.if            |   53 ++++++
 policy/modules/admin/amtu.te            |   56 ++++++
 policy/modules/admin/bootloader.te      |    3 
 policy/modules/admin/consoletype.te     |   10 -
 policy/modules/admin/dmesg.te           |    1 
 policy/modules/admin/kudzu.te           |    6 
 policy/modules/admin/logwatch.te        |    4 
 policy/modules/admin/netutils.te        |    6 
 policy/modules/admin/rpm.fc             |    3 
 policy/modules/admin/rpm.if             |   85 +++++++---
 policy/modules/admin/rpm.te             |    2 
 policy/modules/admin/su.if              |    4 
 policy/modules/admin/usermanage.if      |    2 
 policy/modules/admin/usermanage.te      |   26 +++
 policy/modules/apps/gnome.if            |   26 ++-
 policy/modules/apps/gpg.fc              |    2 
 policy/modules/apps/loadkeys.if         |   44 +----
 policy/modules/apps/mozilla.if          |    1 
 policy/modules/apps/slocate.te          |    5 
 policy/modules/apps/uml.if              |   27 ---
 policy/modules/kernel/corecommands.fc   |    5 
 policy/modules/kernel/corecommands.if   |   20 ++
 policy/modules/kernel/corenetwork.te.in |   15 +
 policy/modules/kernel/devices.if        |   36 ++++
 policy/modules/kernel/domain.if         |   18 ++
 policy/modules/kernel/domain.te         |   46 +++++
 policy/modules/kernel/files.fc          |    1 
 policy/modules/kernel/files.if          |   83 ++++++++-
 policy/modules/kernel/filesystem.if     |   39 ++++
 policy/modules/kernel/filesystem.te     |   13 +
 policy/modules/kernel/kernel.if         |   23 ++
 policy/modules/kernel/kernel.te         |    2 
 policy/modules/kernel/mls.if            |   20 ++
 policy/modules/kernel/mls.te            |    3 
 policy/modules/kernel/selinux.if        |   38 ++++
 policy/modules/kernel/storage.if        |    2 
 policy/modules/kernel/terminal.if       |    2 
 policy/modules/kernel/terminal.te       |    1 
 policy/modules/services/amavis.te       |    3 
 policy/modules/services/apache.fc       |   14 -
 policy/modules/services/apache.if       |  171 +++++++++++++++++++-
 policy/modules/services/apache.te       |   72 ++++++++
 policy/modules/services/apcupsd.fc      |    9 +
 policy/modules/services/apcupsd.if      |  108 ++++++++++++
 policy/modules/services/apcupsd.te      |   91 ++++++++++
 policy/modules/services/automount.te    |    2 
 policy/modules/services/avahi.if        |   19 ++
 policy/modules/services/bluetooth.te    |    2 
 policy/modules/services/consolekit.te   |   21 +-
 policy/modules/services/cron.fc         |    1 
 policy/modules/services/cron.if         |   33 +--
 policy/modules/services/cron.te         |   43 ++++-
 policy/modules/services/cups.te         |    6 
 policy/modules/services/cvs.te          |    1 
 policy/modules/services/cyrus.te        |    1 
 policy/modules/services/dbus.if         |   63 +++++++
 policy/modules/services/dhcp.te         |    2 
 policy/modules/services/djbdns.te       |    5 
 policy/modules/services/dovecot.te      |    5 
 policy/modules/services/ftp.te          |    5 
 policy/modules/services/hal.fc          |    8 
 policy/modules/services/hal.if          |   39 ++++
 policy/modules/services/hal.te          |  143 ++++++++++++++++-
 policy/modules/services/inetd.te        |    5 
 policy/modules/services/kerberos.if     |   79 ++-------
 policy/modules/services/kerberos.te     |   36 ++++
 policy/modules/services/mailman.if      |   19 ++
 policy/modules/services/mta.if          |   19 ++
 policy/modules/services/mta.te          |    2 
 policy/modules/services/nis.if          |    4 
 policy/modules/services/nis.te          |    4 
 policy/modules/services/nscd.te         |   10 +
 policy/modules/services/ntp.te          |    4 
 policy/modules/services/pegasus.if      |   18 ++
 policy/modules/services/pegasus.te      |    6 
 policy/modules/services/postfix.if      |    1 
 policy/modules/services/postfix.te      |    8 
 policy/modules/services/procmail.te     |    1 
 policy/modules/services/pyzor.te        |    7 
 policy/modules/services/radius.te       |    4 
 policy/modules/services/rpc.if          |    5 
 policy/modules/services/rsync.te        |    1 
 policy/modules/services/rwho.fc         |    3 
 policy/modules/services/rwho.if         |   84 +++++++++
 policy/modules/services/rwho.te         |   65 +++++++
 policy/modules/services/samba.fc        |    3 
 policy/modules/services/samba.if        |   86 ++++++++++
 policy/modules/services/samba.te        |   83 +++++++++
 policy/modules/services/sendmail.if     |   22 ++
 policy/modules/services/smartmon.te     |    1 
 policy/modules/services/snmp.te         |   15 +
 policy/modules/services/spamassassin.te |    7 
 policy/modules/services/squid.fc        |    2 
 policy/modules/services/squid.if        |   22 ++
 policy/modules/services/squid.te        |   12 +
 policy/modules/services/ssh.if          |   39 ++++
 policy/modules/services/ssh.te          |   10 -
 policy/modules/services/w3c.fc          |    2 
 policy/modules/services/w3c.if          |    1 
 policy/modules/services/w3c.te          |   14 +
 policy/modules/system/application.fc    |    1 
 policy/modules/system/application.if    |  104 ++++++++++++
 policy/modules/system/application.te    |   14 +
 policy/modules/system/authlogin.if      |   83 ++++++++-
 policy/modules/system/authlogin.te      |    3 
 policy/modules/system/fstools.fc        |    1 
 policy/modules/system/fstools.te        |    1 
 policy/modules/system/fusermount.fc     |    6 
 policy/modules/system/fusermount.if     |   41 ++++
 policy/modules/system/fusermount.te     |   45 +++++
 policy/modules/system/getty.te          |    3 
 policy/modules/system/hostname.te       |   14 +
 policy/modules/system/init.if           |   42 ++++
 policy/modules/system/init.te           |   35 +++-
 policy/modules/system/ipsec.if          |   20 ++
 policy/modules/system/ipsec.te          |    3 
 policy/modules/system/iptables.te       |    4 
 policy/modules/system/libraries.fc      |    3 
 policy/modules/system/locallogin.te     |    7 
 policy/modules/system/logging.if        |   21 ++
 policy/modules/system/logging.te        |    2 
 policy/modules/system/lvm.te            |    6 
 policy/modules/system/modutils.te       |    6 
 policy/modules/system/mount.fc          |    3 
 policy/modules/system/mount.if          |   37 ++++
 policy/modules/system/mount.te          |   64 +++++++
 policy/modules/system/raid.te           |    1 
 policy/modules/system/selinuxutil.fc    |    1 
 policy/modules/system/selinuxutil.if    |    5 
 policy/modules/system/selinuxutil.te    |   52 +++---
 policy/modules/system/sysnetwork.te     |    3 
 policy/modules/system/udev.te           |   12 +
 policy/modules/system/unconfined.fc     |    1 
 policy/modules/system/unconfined.if     |   10 -
 policy/modules/system/unconfined.te     |   24 ++
 policy/modules/system/userdomain.if     |  269 +++++++++++++++++++-------------
 policy/modules/system/userdomain.te     |   46 ++++-
 policy/modules/system/xen.te            |   35 ++++
 policy/support/obj_perm_sets.spt        |   12 +
 146 files changed, 2967 insertions(+), 437 deletions(-)

Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- policy-20070219.patch	16 Apr 2007 17:29:00 -0000	1.48
+++ policy-20070219.patch	17 Apr 2007 19:28:14 -0000	1.49
@@ -875,7 +875,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.5.12/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2007-04-11 15:52:53.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/kernel/corenetwork.te.in	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/kernel/corenetwork.te.in	2007-04-17 15:19:50.000000000 -0400
 @@ -48,6 +48,11 @@
  type reserved_port_t, port_type, reserved_port_type;
  
@@ -914,7 +914,15 @@
  type lrrd_port_t, port_type; dnl network_port(lrrd_port_t) # no defined portcon
  network_port(lmtp, tcp,24,s0, udp,24,s0)
  network_port(mail, tcp,2000,s0)
-@@ -140,6 +146,7 @@
+@@ -132,6 +138,7 @@
+ network_port(router, udp,520,s0)
+ network_port(rsh, tcp,514,s0)
+ network_port(rsync, tcp,873,s0, udp,873,s0)
++network_port(rwho, udp,513,s0)
+ network_port(smbd, tcp,139,s0, tcp,445,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)
+@@ -140,6 +147,7 @@
  network_port(soundd, tcp,8000,s0, tcp,9433,s0)
  type socks_port_t, port_type; dnl network_port(socks) # no defined portcon
  type stunnel_port_t, port_type; dnl network_port(stunnel) # no defined portcon in current strict
@@ -922,7 +930,7 @@
  network_port(swat, tcp,901,s0)
  network_port(syslogd, udp,514,s0)
  network_port(telnetd, tcp,23,s0)
-@@ -157,6 +164,9 @@
+@@ -157,6 +165,9 @@
  
  # Defaults for reserved ports.  Earlier portcon entries take precedence;
  # these entries just cover any remaining reserved ports not otherwise declared.
@@ -2243,13 +2251,27 @@
  term_use_unallocated_ttys(bluetooth_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-2.5.12/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2007-04-11 16:04:02.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/consolekit.te	2007-04-11 17:07:34.000000000 -0400
-@@ -38,18 +38,23 @@
++++ serefpolicy-2.5.12/policy/modules/services/consolekit.te	2007-04-17 15:08:20.000000000 -0400
+@@ -23,10 +23,9 @@
+ allow consolekit_t self:process { getsched signal };
+ allow consolekit_t self:fifo_file rw_fifo_file_perms;
+ allow consolekit_t self:unix_stream_socket create_stream_socket_perms;
++allow consolekit_t self:unix_dgram_socket create_socket_perms;
+ 
+-# pid file
+-manage_files_pattern(consolekit_t,consolekit_var_run_t,consolekit_var_run_t)
+-files_pid_filetrans(consolekit_t,consolekit_var_run_t, file)
++corecmd_search_bin(consolekit_t)
+ 
+ dev_read_urand(consolekit_t)
+ dev_read_sysfs(consolekit_t)
+@@ -38,18 +37,28 @@
  # needs to read /var/lib/dbus/machine-id
  files_read_var_lib_files(consolekit_t)
  
 -term_use_console(consolekit_t)
--
++fs_list_inotifyfs(consolekit_t)
+ 
  libs_use_ld_so(consolekit_t)
  libs_use_shared_libs(consolekit_t)
  
@@ -2257,6 +2279,9 @@
  
 +term_use_all_terms(consolekit_t)
 +
++manage_files_pattern(consolekit_t,consolekit_var_run_t,consolekit_var_run_t)
++files_pid_filetrans(consolekit_t,consolekit_var_run_t, file)
++
  ifdef(`targeted_policy',`
 -	term_dontaudit_use_unallocated_ttys(consolekit_t)
 -	term_dontaudit_use_generic_ptys(consolekit_t)
@@ -3538,6 +3563,170 @@
  role system_r types rsync_t;
  
  type rsync_data_t;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.fc serefpolicy-2.5.12/policy/modules/services/rwho.fc
+--- nsaserefpolicy/policy/modules/services/rwho.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.5.12/policy/modules/services/rwho.fc	2007-04-17 15:22:46.000000000 -0400
+@@ -0,0 +1,3 @@
++
++/usr/sbin/rwhod		--	gen_context(system_u:object_r:rwho_exec_t,s0)
++/var/spool/rwho(/.*)?		gen_context(system_u:object_r:rwho_spool_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.if serefpolicy-2.5.12/policy/modules/services/rwho.if
+--- nsaserefpolicy/policy/modules/services/rwho.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.5.12/policy/modules/services/rwho.if	2007-04-17 15:09:15.000000000 -0400
+@@ -0,0 +1,84 @@
++
++## <summary>policy for rwho</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run rwho.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`rwho_domtrans',`
++	gen_require(`
++		type rwho_t, rwho_exec_t;
++	')
++
++	domain_auto_trans($1,rwho_exec_t,rwho_t)
++
++	allow rwho_t $1:fd use;
++	allow rwho_t $1:fifo_file rw_file_perms;
++	allow rwho_t $1:process sigchld;
++')
++
++########################################
++## <summary>
++##	Search rwho spool directories.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`rwho_search_spool',`
++	gen_require(`
++		type rwho_spool_t;
++	')
++
++	allow $1 rwho_spool_t:dir search_dir_perms;
++	files_search_spool($1)
++')
++
++########################################
++## <summary>
++##	Read rwho spool files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`rwho_read_spool_files',`
++	gen_require(`
++		type rwho_spool_t;
++	')
++
++	allow $1 rwho_spool_t:file r_file_perms;
++	allow $1 rwho_spool_t:dir list_dir_perms;
++	files_search_spool($1)
++')
++
++########################################
++## <summary>
++##	Create, read, write, and delete
++##	rwho spool files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`rwho_manage_spool_files',`
++	gen_require(`
++		type rwho_spool_t;
++	')
++
++	allow $1 rwho_spool_t:file manage_file_perms;
++	allow $1 rwho_spool_t:dir rw_dir_perms;
++	files_search_spool($1)
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.te serefpolicy-2.5.12/policy/modules/services/rwho.te
+--- nsaserefpolicy/policy/modules/services/rwho.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.5.12/policy/modules/services/rwho.te	2007-04-17 15:21:00.000000000 -0400
+@@ -0,0 +1,65 @@
++policy_module(rwho,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type rwho_t;
++type rwho_exec_t;
++domain_type(rwho_t)
++init_daemon_domain(rwho_t, rwho_exec_t)
++
++# var/spool files
++type rwho_spool_t;
++files_type(rwho_spool_t)
++
++########################################
++#
++# rwho local policy
++#
++
++#============= rwho_t ==============
++allow rwho_t self:capability sys_chroot;
++allow rwho_t self:unix_dgram_socket create;
++allow rwho_t self:fifo_file rw_file_perms;
++allow rwho_t self:unix_stream_socket create_stream_socket_perms;
++allow rwho_t self:udp_socket create_socket_perms;
++
++# var/spool files for rwho
++allow rwho_t rwho_spool_t:dir manage_dir_perms;
++allow rwho_t rwho_spool_t:file manage_file_perms;
++files_spool_filetrans(rwho_t,rwho_spool_t, { file dir })
++
++domain_use_interactive_fds(rwho_t)
++
++files_read_etc_files(rwho_t)
++
++init_read_utmp(rwho_t)
++init_dontaudit_write_utmp(rwho_t)
++init_use_fds(rwho_t)
++init_use_script_ptys(rwho_t)
++
++kernel_read_system_state(rwho_t)
++
++libs_use_ld_so(rwho_t)
++libs_use_shared_libs(rwho_t)
++
++miscfiles_read_localization(rwho_t)
++
++# Default Networking
++corenet_non_ipsec_sendrecv(rwho_t)
++corenet_udp_sendrecv_all_if(rwho_t)
++corenet_udp_sendrecv_all_nodes(rwho_t)
++corenet_udp_sendrecv_all_ports(rwho_t)
++corenet_udp_bind_all_nodes(rwho_t)
++corenet_udp_bind_rwho_port(rwho_t)
++
++sysnet_dns_name_resolve(rwho_t)
++
++ifdef(`targeted_policy',`
++	term_dontaudit_use_unallocated_ttys(rwho_t)
++	term_dontaudit_use_generic_ptys(rwho_t)
++')
++
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-2.5.12/policy/modules/services/samba.fc
 --- nsaserefpolicy/policy/modules/services/samba.fc	2007-02-23 16:50:01.000000000 -0500
 +++ serefpolicy-2.5.12/policy/modules/services/samba.fc	2007-04-11 17:07:34.000000000 -0400
@@ -4320,7 +4509,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.5.12/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/authlogin.if	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/authlogin.if	2007-04-16 14:43:27.000000000 -0400
 @@ -152,21 +152,12 @@
  ## </param>
  #
@@ -4799,6 +4988,24 @@
  ##	Execute racoon in the racoon domain.
  ## </summary>
  ## <param name="domain">
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-2.5.12/policy/modules/system/ipsec.te
+--- nsaserefpolicy/policy/modules/system/ipsec.te	2007-03-28 14:09:41.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/ipsec.te	2007-04-16 14:47:37.000000000 -0400
+@@ -283,12 +283,13 @@
+ # Racoon local policy
+ #
+ 
+-allow racoon_t self:capability { net_admin net_bind_service };
++allow racoon_t self:capability { net_admin net_bind_service audit_control };
+ allow racoon_t self:netlink_route_socket create_netlink_socket_perms;
+ allow racoon_t self:unix_dgram_socket { connect create ioctl write };
+ allow racoon_t self:netlink_selinux_socket { bind create read };
+ allow racoon_t self:udp_socket create_socket_perms;
+ allow racoon_t self:key_socket { create read setopt write };
++allow racoon_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
+ 
+ # manage pid file
+ manage_files_pattern(racoon_t,ipsec_var_run_t,ipsec_var_run_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-2.5.12/policy/modules/system/iptables.te
 --- nsaserefpolicy/policy/modules/system/iptables.te	2007-03-26 16:24:13.000000000 -0400
 +++ serefpolicy-2.5.12/policy/modules/system/iptables.te	2007-04-11 17:07:34.000000000 -0400
@@ -4812,7 +5019,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.5.12/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2007-04-10 16:13:39.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/libraries.fc	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/libraries.fc	2007-04-17 10:00:22.000000000 -0400
 @@ -59,7 +59,6 @@
  ')
  
@@ -4829,6 +5036,14 @@
  
  ifdef(`distro_gentoo',`
  # despite the extensions, they are actually libs
+@@ -132,6 +132,7 @@
+ /usr/(.*/)?nvidia/.+\.so(\..*)?		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+ /usr/lib/win32/.*			--	gen_context(system_u:object_r:shlib_t,s0)
++/usr/lib/transgaming_cedega/gddb_parser.so --	gen_context(system_u:object_r:shlib_t,s0)
+ 
+ /usr/(.*/)?lib(64)?(/.*)?/nvidia/.+\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?(/.*)?/nvidia/.+\.so(\..*)? --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.5.12/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2007-03-26 10:39:07.000000000 -0400
 +++ serefpolicy-2.5.12/policy/modules/system/locallogin.te	2007-04-11 17:07:34.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.433
retrieving revision 1.434
diff -u -r1.433 -r1.434
--- selinux-policy.spec	16 Apr 2007 17:11:45 -0000	1.433
+++ selinux-policy.spec	17 Apr 2007 19:28:14 -0000	1.434
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.5.12
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -358,6 +358,10 @@
 %endif
 
 %changelog
+* Tue Apr 17 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-4
+- Rwho policy
+- Fixes for consolekit
+
 * Fri Apr 12 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-3
 - fixes for fusefs
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 19:51:00 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 15:51:00 -0400
Subject: rpms/ypbind/devel ypbind.init,1.16,1.17 ypbind.spec,1.40,1.41
Message-ID: <200704171951.l3HJp0ca011518@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/ypbind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11502

Modified Files:
	ypbind.init ypbind.spec 
Log Message:
- Changed init script to look in /etc/yp.conf for the
  domain name when not already set. (bz 113386)
- Reworked init script to eliminate unreasonable
  hangs when ypbind cannot bind to nis server. (bz 112770)



Index: ypbind.init
===================================================================
RCS file: /cvs/dist/rpms/ypbind/devel/ypbind.init,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ypbind.init	17 Apr 2007 13:18:53 -0000	1.16
+++ ypbind.init	17 Apr 2007 19:50:58 -0000	1.17
@@ -22,14 +22,16 @@
 # Check for and source configuration file otherwise set defaults
 [ -f /etc/sysconfig/ypbind ] && . /etc/sysconfig/ypbind
 
-[ -z "$NISTIMEOUT" ] && NISTIMEOUT=20
+# NISTIMEOUT should be a multiple of 15 since
+# ypwhich has a hardcoded 15sec timeout
+[ -z "$NISTIMEOUT" ] && NISTIMEOUT=45
 
 # 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"
+	#echo $"Turning on allow_ypbind SELinux boolean"
         setsebool allow_ypbind=1
 }
 
@@ -41,7 +43,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
 }
@@ -49,63 +51,79 @@
 start() {
 	DOMAINNAME=`domainname`
 	if [ "$DOMAINNAME" = "(none)" -o "$DOMAINNAME" = "" ]; then
-	   if [ -n "$NISDOMAIN" ]; then
-		action $"Setting NIS domain name $NISDOMAIN: " domainname $NISDOMAIN
-	   else
-	        exit 1
-	   fi
+		echo -n $"Setting  NIS domain: "
+		if [ -n "$NISDOMAIN" ]; then
+			action $"domain is '$NISDOMAIN' " domainname $NISDOMAIN
+		else # See if the domain is set in config file
+			NISDOMAIN=`grep "domain" /etc/yp.conf | grep -v ^# | \
+				awk '{print $2}'`
+	   		if [ -n "$NISDOMAIN" ]; then
+				action $"domain is '$NISDOMAIN' " \
+					domainname $NISDOMAIN
+	   		else
+				action $"domain not found" /bin/false
+				logger -t ypbind $"domain not found"
+	        		return 1
+			fi
+		fi
 	fi
-        selinux_on
-	echo -n $"Binding to the NIS domain: "
+	echo -n $"Starting NIS service: "
+	selinux_on
 	daemon ypbind $OTHER_YPBIND_OPTS
 	RETVAL=$?
 	echo
 	if [ $RETVAL -ne 0 ]; then
 	    selinux_off
+	    logger -t ypbind "failed to start!"
 	    return $RETVAL
 	fi
+	echo -n $"Binding  NIS service: "
 	# the following fixes problems with the init scripts continuing
 	# even when we are really not bound yet to a server, and then things
 	# that need NIS fail.
-	echo -n $"Listening for an NIS domain server."
-	for (( times = 1; times < $NISTIMEOUT; times++ )); do
-	    /usr/sbin/rpcinfo -p | LC_ALL=C fgrep -q ypbind && ypwhich > /dev/null 2>&1
+	timeout=$NISTIMEOUT
+	while [ $timeout -gt 0 ]; do
+	    /usr/sbin/rpcinfo -p | LC_ALL=C fgrep -q ypbind && \
+			/usr/bin/ypwhich > /dev/null 2>&1
 	    RETVAL=$?
 	    if [ $RETVAL -eq 0 ]; then
 		break;
 	    fi
-	    sleep 1
-	    echo -n "."
+	    echo -n "..."
+	    # ypwhich has a hardcode 15sec timeout
+	    # so subtract that from NISTIMEOUT to
+	    # to see of we should continue to wait
+	    timeout=`expr $timeout - 15` 
 	done
 	if [ $RETVAL -eq 0 ]; then
-	    logger -t ypbind "bound to NIS server `ypwhich 2> /dev/null`"
+	    logger -t ypbind \
+	    	"NIS domain: `domainname`, NIS server: `ypwhich 2> /dev/null`"
 	    touch /var/lock/subsys/ypbind
+	    success
 	else
-	    killproc ypbind
-	    # if  we used brute force (like kill -9) we don't want those around
-	    if [ x$(domainname) != x ] ; then
-		rm -f /var/yp/binding/$(domainname)*
-	    fi
-	    failure "attempting to contact yp server"
+	    logger -t ypbind \
+	    	"NIS server for domain `domainname` is not responding."
+	    failure
 	    selinux_off
+		RETVAL=100
 	fi
 	echo
 	return $RETVAL
 }
 
 stop() {
-	echo -n $"Shutting down NIS services: "
+	echo -n $"Shutting down NIS service: "
 	killproc ypbind
 	RETVAL=$?
 	if [ $RETVAL -eq 0 ] ; then
-	  rm -f /var/lock/subsys/ypbind
-	  # if  we used brute force (like kill -9) we don't want those around
-	  if [ x$(domainname) != x ] ; then
-	    rm -f /var/yp/binding/$(domainname)*
-	  fi
+		rm -f /var/lock/subsys/ypbind
+		# if  we used brute force (like kill -9) we don't want those around
+		if [ x$(domainname) != x ] ; then
+			rm -f /var/yp/binding/$(domainname)*
+		fi
 	fi
 	echo
-       	selinux_off
+	selinux_off
 	return $RETVAL
 }
 
@@ -119,7 +137,8 @@
 # See how we were called.
 case "$1" in
   start)
-	start
+	start 
+	[ $? -eq 100 ] && stop
 	;;
   stop)
 	stop


Index: ypbind.spec
===================================================================
RCS file: /cvs/dist/rpms/ypbind/devel/ypbind.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ypbind.spec	17 Apr 2007 13:18:53 -0000	1.40
+++ ypbind.spec	17 Apr 2007 19:50:58 -0000	1.41
@@ -92,6 +92,10 @@
 %changelog
 * Tue Apr 17 2007 Steve Dickson <steved at redhat.com> - 3:1.19-9
 - Fixed typo in init script (bz 233459)
+- Changed init script to look in /etc/yp.conf for the
+  domain name when not already set. (bz 113386)
+- Reworked init script to eliminate unreasonable
+  hangs when ypbind cannot bind to nis server. (bz 112770)
 
 * Tue Apr  3 2007 Steve Dickson <steved at redhat.com> - 3:1.19-8
 - Replace portmap dependency with an rpcbind dependency (bz 228894)



From fedora-cvs-commits at redhat.com  Tue Apr 17 20:33:27 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 16:33:27 -0400
Subject: rpms/kernel/devel linux-2.6-libata-sata_nv-adma.patch,1.1,1.2
Message-ID: <200704172033.l3HKXRgC027236@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-libata-sata_nv-adma.patch 
Log Message:
better fix

linux-2.6-libata-sata_nv-adma.patch:
 sata_nv.c |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 deletions(-)

Index: linux-2.6-libata-sata_nv-adma.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-libata-sata_nv-adma.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-libata-sata_nv-adma.patch	17 Apr 2007 19:00:05 -0000	1.1
+++ linux-2.6-libata-sata_nv-adma.patch	17 Apr 2007 20:33:24 -0000	1.2
@@ -1,141 +1,95 @@
-From davej  Tue Apr 17 14:48:11 2007
-Return-path: <kyle at athena.road.mcmartin.ca>
-X-Spam-Checker-Version: SpamAssassin 3.1.8 (2007-02-13) on
-	gelk.kernelslacker.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-2.5 required=5.0 tests=AWL,BAYES_00,FORGED_RCVD_HELO
-	autolearn=ham version=3.1.8
-Envelope-to: davej at codemonkey.org.uk
-Delivery-date: Tue, 17 Apr 2007 19:47:53 +0100
-Received: from testure.choralone.org [194.9.77.134]
-	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.6)
-	for <davej at localhost> (single-drop); Tue, 17 Apr 2007 14:48:11 -0400 (EDT)
-Received: from stout.engsoc.carleton.ca ([134.117.69.22])
-	by testure.choralone.org with esmtp (Exim 4.63)
-	(envelope-from <kyle at athena.road.mcmartin.ca>)
-	id 1HdsiW-0002XC-Ij
-	for davej at codemonkey.org.uk; Tue, 17 Apr 2007 19:47:53 +0100
-Received: from localhost (stout [127.0.0.1])
-	by stout.engsoc.carleton.ca (Postfix) with ESMTP id D6A9C58409A
-	for <davej at codemonkey.org.uk>; Tue, 17 Apr 2007 14:47:45 -0400 (EDT)
-Received: from fattire.cabal.ca (cabal.ca [134.117.69.58])
-	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
-	(No client certificate requested)
-	by stout.engsoc.carleton.ca (Postfix) with ESMTP id 236F9584099
-	for <davej at codemonkey.org.uk>; Tue, 17 Apr 2007 14:47:45 -0400 (EDT)
-Received: from athena.road.mcmartin.ca (206-248-151-76.dsl.ncf.ca [206.248.151.76])
-	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
-	(Client CN "roadwarrior.mcmartin.ca", Issuer "there.is.no.cabal.ca" (verified OK))
-	by fattire.cabal.ca (Postfix) with ESMTP id B4120837DB
-	for <davej at codemonkey.org.uk>; Tue, 17 Apr 2007 14:47:44 -0400 (EDT)
-Received: by athena.road.mcmartin.ca (Postfix, from userid 1000)
-	id 7DF183B06E; Tue, 17 Apr 2007 14:45:42 -0400 (EDT)
-Resent-From: kyle at athena.road.mcmartin.ca
-Resent-Date: Tue, 17 Apr 2007 14:45:41 -0400
-Resent-Message-ID: <20070417184541.GB24014 at athena.road.mcmartin.ca>
-Resent-To: davej at codemonkey.org.uk
-X-Original-To: kyle at mcmartin.ca
-Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
-	by fattire.cabal.ca (Postfix) with ESMTP id 474E8837DD
-	for <kyle at mcmartin.ca>; Fri, 13 Apr 2007 13:10:30 -0400 (EDT)
-Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
-	id S1754104AbXDMRKR (ORCPT <rfc822;kyle at mcmartin.ca>);
-	Fri, 13 Apr 2007 13:10:17 -0400
-Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1754107AbXDMRKR
-	(ORCPT <rfc822;linux-ide-outgoing>); Fri, 13 Apr 2007 13:10:17 -0400
-Received: from stout.engsoc.carleton.ca ([134.117.69.22]:55761 "EHLO
-	stout.engsoc.carleton.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
-	with ESMTP id S1754104AbXDMRKP (ORCPT
-	<rfc822;linux-ide at vger.kernel.org>); Fri, 13 Apr 2007 13:10:15 -0400
-Received: from localhost (stout [127.0.0.1])
-	by stout.engsoc.carleton.ca (Postfix) with ESMTP id 8E62058408C;
-	Fri, 13 Apr 2007 13:10:14 -0400 (EDT)
-Received: from fattire.cabal.ca (cabal.ca [134.117.69.58])
-	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
-	(No client certificate requested)
-	by stout.engsoc.carleton.ca (Postfix) with ESMTP id DE73E584097;
-	Fri, 13 Apr 2007 13:10:13 -0400 (EDT)
-Received: from athena.road.mcmartin.ca (206-248-151-76.dsl.ncf.ca [206.248.151.76])
-	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
-	(Client CN "roadwarrior.mcmartin.ca", Issuer "there.is.no.cabal.ca" (verified OK))
-	by fattire.cabal.ca (Postfix) with ESMTP id 79979837DD;
-	Fri, 13 Apr 2007 13:10:13 -0400 (EDT)
-Received: by athena.road.mcmartin.ca (Postfix, from userid 1000)
-	id 079373B06E; Fri, 13 Apr 2007 13:08:31 -0400 (EDT)
-Date:	Fri, 13 Apr 2007 13:08:31 -0400
-From: Kyle McMartin <kyle at canonical.com>
-To: Robert Hancock <hancockr at shaw.ca>
-Cc: linux-ide at vger.kernel.org, jgarzik at pobox.com, bcollins at ubuntu.com
-Subject: [PATCH] sata_nv: Don't attempt using ADMA for (READ|SET)_MAX commands
-Message-ID: <20070413170831.GC27674 at athena.road.mcmartin.ca>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-User-Agent: Mutt/1.5.13 (2006-08-11)
-X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at engsoc.carleton.ca
-Sender: linux-ide-owner at vger.kernel.org
-Precedence: bulk
-X-Mailing-List:	linux-ide at vger.kernel.org
-X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at engsoc.carleton.ca
-Status: RO
-Content-Length: 1715
-Lines: 57
-
-READ_NATIVE_MAX and SET_MAX were causing timeouts on sata_nv controllers.
-Disabling ADMA helped, but that is quite a large hammer to use. Reverting
-382a6652e91b34d5480cfc0ed840c196650493d4 also helped, but we might as well
-fix it right, instead of disabling the performance gain on cache flushes
-by using ADMA mode.
-
-Signed-off-by: Kyle McMartin <kyle at canonical.com>
-
----
-
-This patch depends on the Host Protected Area patch Alan sent to linux-ide
-this week.
+commit eb20a5742d230c67b9af4efd71b8b6b680ca3a09
+Author: Robert Hancock <hancockr at shaw.ca>
+Date:   Mon Mar 26 21:43:36 2007 -0800
+
+    sata_nv: don't read shadow registers when in ADMA mode
+    
+    Reading from the ATA shadow registers while we are in ADMA mode may cause
+    undefined behavior.  Don't read the ATA status register when completing
+    commands for this reason, it shouldn't be needed as the controller will
+    notify us if the command failed.  Also, don't allow commands with result
+    taskfile requested to execute in ADMA mode, since that requires accessing
+    the shadow registers.  We also still need to override tf_read since libata
+    will read the result taskfile on a command failure, and we need to go into
+    port register mode before allowing this.
+    
+    Signed-off-by: Robert Hancock <hancockr at shaw.ca>
+    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+    Signed-off-by: Jeff Garzik <jeff at garzik.org>
 
 diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
-index 9d9670a..eaf9b76 100644
+index 9d9670a..8a9473b 100644
 --- a/drivers/ata/sata_nv.c
 +++ b/drivers/ata/sata_nv.c
-@@ -1162,6 +1162,20 @@ static void nv_adma_fill_sg(struct ata_queued_cmd *qc, struct nv_adma_cpb *cpb)
- 		cpb->next_aprd = cpu_to_le64(0);
+@@ -260,6 +260,7 @@ static int nv_adma_port_resume(struct ata_port *ap);
+ static void nv_adma_error_handler(struct ata_port *ap);
+ static void nv_adma_host_stop(struct ata_host *host);
+ static void nv_adma_post_internal_cmd(struct ata_queued_cmd *qc);
++static void nv_adma_tf_read(struct ata_port *ap, struct ata_taskfile *tf);
+ 
+ enum nv_host_type
+ {
+@@ -435,7 +436,7 @@ static const struct ata_port_operations nv_ck804_ops = {
+ static const struct ata_port_operations nv_adma_ops = {
+ 	.port_disable		= ata_port_disable,
+ 	.tf_load		= ata_tf_load,
+-	.tf_read		= ata_tf_read,
++	.tf_read		= nv_adma_tf_read,
+ 	.check_atapi_dma	= nv_adma_check_atapi_dma,
+ 	.exec_command		= ata_exec_command,
+ 	.check_status		= ata_check_status,
+@@ -667,6 +668,18 @@ static int nv_adma_check_atapi_dma(struct ata_queued_cmd *qc)
+ 	return !(pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE);
  }
  
-+static int nv_blacklist_adma_for_hpa_cmds(struct ata_taskfile *tf)
++static void nv_adma_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
 +{
-+	switch(tf->command) {
-+	case ATA_CMD_READ_NATIVE_MAX:
-+	case ATA_CMD_READ_NATIVE_MAX_EXT:
-+	case ATA_CMD_SET_MAX:
-+	case ATA_CMD_SET_MAX_EXT:
-+		return 1;
++	/* Since commands where a result TF is requested are not
++	   executed in ADMA mode, the only time this function will be called
++	   in ADMA mode will be if a command fails. In this case we
++	   don't care about going into register mode with ADMA commands
++	   pending, as the commands will all shortly be aborted anyway. */
++	nv_adma_register_mode(ap);
 +
-+	default:
-+		return 0;
-+	}
++	ata_tf_read(ap, tf);
 +}
 +
- static int nv_adma_use_reg_mode(struct ata_queued_cmd *qc)
+ static unsigned int nv_adma_tf_to_cpb(struct ata_taskfile *tf, __le16 *cpb)
  {
+ 	unsigned int idx = 0;
+@@ -738,19 +751,11 @@ static int nv_adma_check_cpb(struct ata_port *ap, int cpb_num, int force_err)
+ 		return 1;
+ 	}
+ 
+-	if (flags & NV_CPB_RESP_DONE) {
++	if (likely(flags & NV_CPB_RESP_DONE)) {
+ 		struct ata_queued_cmd *qc = ata_qc_from_tag(ap, cpb_num);
+ 		VPRINTK("CPB flags done, flags=0x%x\n", flags);
+ 		if (likely(qc)) {
+-			/* Grab the ATA port status for non-NCQ commands.
+-			   For NCQ commands the current status may have nothing to do with
+-			   the command just completed. */
+-			if (qc->tf.protocol != ATA_PROT_NCQ) {
+-				u8 ata_status = readb(pp->ctl_block + (ATA_REG_STATUS * 4));
+-				qc->err_mask |= ac_err_mask(ata_status);
+-			}
+-			DPRINTK("Completing qc from tag %d with err_mask %u\n",cpb_num,
+-				qc->err_mask);
++			DPRINTK("Completing qc from tag %d\n",cpb_num);
+ 			ata_qc_complete(qc);
+ 		} else {
+ 			struct ata_eh_info *ehi = &ap->eh_info;
+@@ -1167,9 +1172,11 @@ static int nv_adma_use_reg_mode(struct ata_queued_cmd *qc)
  	struct nv_adma_port_priv *pp = qc->ap->private_data;
-@@ -1173,8 +1187,12 @@ static int nv_adma_use_reg_mode(struct ata_queued_cmd *qc)
+ 
+ 	/* ADMA engine can only be used for non-ATAPI DMA commands,
+-	   or interrupt-driven no-data commands. */
++	   or interrupt-driven no-data commands, where a result taskfile
++	   is not required. */
+ 	if((pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) ||
+-	   (qc->tf.flags & ATA_TFLAG_POLLING))
++	   (qc->tf.flags & ATA_TFLAG_POLLING) ||
++	   (qc->flags & ATA_QCFLAG_RESULT_TF))
  		return 1;
  
  	if((qc->flags & ATA_QCFLAG_DMAMAP) ||
--	   (qc->tf.protocol == ATA_PROT_NODATA))
--		return 0;
-+	   (qc->tf.protocol == ATA_PROT_NODATA)) {
-+		if (nv_blacklist_adma_for_hpa_cmds(&qc->tf))
-+			return 1;	/* (SET|READ)_NATIVE_MAX time out in ADMA mdoe */
-+		else
-+			return 0;
-+	}
- 
- 	return 1;
- }
--
-To unsubscribe from this list: send the line "unsubscribe linux-ide" 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  Tue Apr 17 20:40:22 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 16:40:22 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2312,
	1.2313 linux-2.6-20.5z-ide_use_proper_error_recovery.patch,
	1.1, NONE linux-2.6-20.5z-nfs_allow_64bit_cookies.patch, 1.1,
	NONE linux-2.6-20.5z-softmac_check_if_running.patch, 1.1,
	NONE linux-2.6-20.7a-ahci_ATI_SB600_workaround.patch, 1.1,
	NONE linux-2.6-20.7a-libata-lba48.patch, 1.1,
	NONE linux-2.6-20.7b-libata_blacklist.patch, 1.2,
	NONE linux-2.6-20.7b-libata_clear_tf_before_sense.patch, 1.1,
	NONE linux-2.6-20.7b-scsi_eh_scatterlist.patch, 1.1,
	NONE linux-2.6.20.5-rc1-ata_scsi_preserve_lba_bit.patch, 1.1,
	NONE linux-2.6.20.5-rc1-crypto_walk_fix_advance_by.patch, 1.1, NONE
Message-ID: <200704172040.l3HKeMXl032069@cvs.devel.redhat.com>

Author: cebbert

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-20.5z-ide_use_proper_error_recovery.patch 
	linux-2.6-20.5z-nfs_allow_64bit_cookies.patch 
	linux-2.6-20.5z-softmac_check_if_running.patch 
	linux-2.6-20.7a-ahci_ATI_SB600_workaround.patch 
	linux-2.6-20.7a-libata-lba48.patch 
	linux-2.6-20.7b-libata_blacklist.patch 
	linux-2.6-20.7b-libata_clear_tf_before_sense.patch 
	linux-2.6-20.7b-scsi_eh_scatterlist.patch 
	linux-2.6.20.5-rc1-ata_scsi_preserve_lba_bit.patch 
	linux-2.6.20.5-rc1-crypto_walk_fix_advance_by.patch 
Log Message:
* Tue Apr 17 2007 Chuck Ebbert <cebbert at redhat.com>		1.2313
- 2.6.20.7



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2312
retrieving revision 1.2313
diff -u -r1.2312 -r1.2313
--- kernel-2.6.spec	10 Apr 2007 18:16:46 -0000	1.2312
+++ kernel-2.6.spec	17 Apr 2007 20:40:15 -0000	1.2313
@@ -316,7 +316,7 @@
 Patch4: patch-2.6.20.3-4.bz2
 Patch5: patch-2.6.20.4-5.bz2
 Patch6: patch-2.6.20.5-6.bz2
-Patch7: linux-2.6.20.5-rc1-ata_scsi_preserve_lba_bit.patch
+Patch7: patch-2.6.20.6-7.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 
@@ -457,19 +457,11 @@
 
 # post 2.6.20.5
 Patch1800: linux-2.6-20.5y-dm_crypt_disable_barriers.patch
-Patch1801: linux-2.6-20.5z-ide_use_proper_error_recovery.patch
 Patch1802: linux-2.6-20.5z-mmap_dont_spam_logs.patch
-Patch1803: linux-2.6-20.5z-nfs_allow_64bit_cookies.patch
-Patch1804: linux-2.6-20.5z-softmac_check_if_running.patch
 Patch1805: linux-2.6-proposed-i82875p-edac-fix.patch
-Patch1806: linux-2.6-20.7a-ahci_ATI_SB600_workaround.patch
 Patch1807: linux-2.6-20.7a-fib_rules_fix_return_value.patch
-Patch1808: linux-2.6-20.7a-libata-lba48.patch
 Patch1809: linux-2.6-21-rc6-readahead.patch
 Patch1810: linux-2.6-i386_pci-add_debugging.patch
-Patch1811: linux-2.6-20.7b-libata_blacklist.patch
-Patch1812: linux-2.6-20.7b-libata_clear_tf_before_sense.patch
-Patch1813: linux-2.6-20.7b-scsi_eh_scatterlist.patch
 
 # SELinux/audit patches.
 Patch1850: linux-2.6-selinux-mprotect-checks.patch
@@ -1101,19 +1093,11 @@
 
 # post 2.6.20.6
 %patch1800 -p1
-%patch1801 -p1
 %patch1802 -p1
-%patch1803 -p1
-%patch1804 -p1
 %patch1805 -p1
-%patch1806 -p1
 %patch1807 -p1
-%patch1808 -p1
 %patch1809 -p1
 %patch1810 -p1
-%patch1811 -p1
-%patch1812 -p1
-%patch1813 -p1
 
 # Fix the SELinux mprotect checks on executable mappings
 %patch1850 -p1
@@ -1904,6 +1888,9 @@
 %endif
 
 %changelog
+* Tue Apr 17 2007 Chuck Ebbert <cebbert at redhat.com>		1.2313
+- 2.6.20.7
+
 * Tue Apr 10 2007 Chuck Ebbert <cebbert at redhat.com>		1.2312
 - 2.6.20.5
 - 2.6.20.6


--- linux-2.6-20.5z-ide_use_proper_error_recovery.patch DELETED ---


--- linux-2.6-20.5z-nfs_allow_64bit_cookies.patch DELETED ---


--- linux-2.6-20.5z-softmac_check_if_running.patch DELETED ---


--- linux-2.6-20.7a-ahci_ATI_SB600_workaround.patch DELETED ---


--- linux-2.6-20.7a-libata-lba48.patch DELETED ---


--- linux-2.6-20.7b-libata_blacklist.patch DELETED ---


--- linux-2.6-20.7b-libata_clear_tf_before_sense.patch DELETED ---


--- linux-2.6-20.7b-scsi_eh_scatterlist.patch DELETED ---


--- linux-2.6.20.5-rc1-ata_scsi_preserve_lba_bit.patch DELETED ---


--- linux-2.6.20.5-rc1-crypto_walk_fix_advance_by.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 17 20:42:34 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 16:42:34 -0400
Subject: rpms/selinux-policy/devel policy-20070219.patch, 1.49,
	1.50 selinux-policy.spec, 1.434, 1.435
Message-ID: <200704172042.l3HKgYof001303@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20070219.patch selinux-policy.spec 
Log Message:
* Tue Apr 17 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-5
- Allow insmod_t to mount kvmfs_t filesystems


policy-20070219.patch:
 Rules.modular                           |   12 +
 policy/flask/access_vectors             |    4 
 policy/global_booleans                  |    2 
 policy/global_tunables                  |    7 
 policy/mls                              |   31 ++-
 policy/modules/admin/acct.te            |    1 
 policy/modules/admin/amtu.fc            |    3 
 policy/modules/admin/amtu.if            |   53 ++++++
 policy/modules/admin/amtu.te            |   56 ++++++
 policy/modules/admin/bootloader.te      |    3 
 policy/modules/admin/consoletype.te     |   10 -
 policy/modules/admin/dmesg.te           |    1 
 policy/modules/admin/kudzu.te           |    6 
 policy/modules/admin/logwatch.te        |    4 
 policy/modules/admin/netutils.te        |    6 
 policy/modules/admin/rpm.fc             |    3 
 policy/modules/admin/rpm.if             |   85 +++++++---
 policy/modules/admin/rpm.te             |    2 
 policy/modules/admin/su.if              |    4 
 policy/modules/admin/usermanage.if      |    2 
 policy/modules/admin/usermanage.te      |   26 +++
 policy/modules/apps/gnome.if            |   26 ++-
 policy/modules/apps/gpg.fc              |    2 
 policy/modules/apps/loadkeys.if         |   44 +----
 policy/modules/apps/mozilla.if          |    1 
 policy/modules/apps/slocate.te          |    5 
 policy/modules/apps/uml.if              |   27 ---
 policy/modules/kernel/corecommands.fc   |    5 
 policy/modules/kernel/corecommands.if   |   20 ++
 policy/modules/kernel/corenetwork.te.in |   15 +
 policy/modules/kernel/devices.if        |   36 ++++
 policy/modules/kernel/domain.if         |   18 ++
 policy/modules/kernel/domain.te         |   46 +++++
 policy/modules/kernel/files.fc          |    1 
 policy/modules/kernel/files.if          |   83 ++++++++-
 policy/modules/kernel/filesystem.if     |   39 ++++
 policy/modules/kernel/filesystem.te     |   13 +
 policy/modules/kernel/kernel.if         |   42 ++++
 policy/modules/kernel/kernel.te         |    2 
 policy/modules/kernel/mls.if            |   20 ++
 policy/modules/kernel/mls.te            |    3 
 policy/modules/kernel/selinux.if        |   38 ++++
 policy/modules/kernel/storage.if        |    2 
 policy/modules/kernel/terminal.if       |    2 
 policy/modules/kernel/terminal.te       |    1 
 policy/modules/services/amavis.te       |    3 
 policy/modules/services/apache.fc       |   14 -
 policy/modules/services/apache.if       |  171 +++++++++++++++++++-
 policy/modules/services/apache.te       |   72 ++++++++
 policy/modules/services/apcupsd.fc      |    9 +
 policy/modules/services/apcupsd.if      |  108 ++++++++++++
 policy/modules/services/apcupsd.te      |   91 ++++++++++
 policy/modules/services/automount.te    |    2 
 policy/modules/services/avahi.if        |   19 ++
 policy/modules/services/bluetooth.te    |    2 
 policy/modules/services/consolekit.te   |   21 +-
 policy/modules/services/cron.fc         |    1 
 policy/modules/services/cron.if         |   33 +--
 policy/modules/services/cron.te         |   43 ++++-
 policy/modules/services/cups.te         |    6 
 policy/modules/services/cvs.te          |    1 
 policy/modules/services/cyrus.te        |    1 
 policy/modules/services/dbus.if         |   63 +++++++
 policy/modules/services/dhcp.te         |    2 
 policy/modules/services/djbdns.te       |    5 
 policy/modules/services/dovecot.te      |    5 
 policy/modules/services/ftp.te          |    5 
 policy/modules/services/hal.fc          |    8 
 policy/modules/services/hal.if          |   39 ++++
 policy/modules/services/hal.te          |  143 ++++++++++++++++-
 policy/modules/services/inetd.te        |    5 
 policy/modules/services/kerberos.if     |   79 ++-------
 policy/modules/services/kerberos.te     |   36 ++++
 policy/modules/services/mailman.if      |   19 ++
 policy/modules/services/mta.if          |   19 ++
 policy/modules/services/mta.te          |    2 
 policy/modules/services/nis.if          |    4 
 policy/modules/services/nis.te          |    4 
 policy/modules/services/nscd.te         |   10 +
 policy/modules/services/ntp.te          |    4 
 policy/modules/services/pegasus.if      |   18 ++
 policy/modules/services/pegasus.te      |    6 
 policy/modules/services/postfix.if      |    1 
 policy/modules/services/postfix.te      |    8 
 policy/modules/services/procmail.te     |    1 
 policy/modules/services/pyzor.te        |    7 
 policy/modules/services/radius.te       |    4 
 policy/modules/services/rpc.if          |    5 
 policy/modules/services/rsync.te        |    1 
 policy/modules/services/rwho.fc         |    3 
 policy/modules/services/rwho.if         |   84 +++++++++
 policy/modules/services/rwho.te         |   65 +++++++
 policy/modules/services/samba.fc        |    3 
 policy/modules/services/samba.if        |   86 ++++++++++
 policy/modules/services/samba.te        |   83 +++++++++
 policy/modules/services/sendmail.if     |   22 ++
 policy/modules/services/smartmon.te     |    1 
 policy/modules/services/snmp.te         |   15 +
 policy/modules/services/spamassassin.te |    7 
 policy/modules/services/squid.fc        |    2 
 policy/modules/services/squid.if        |   22 ++
 policy/modules/services/squid.te        |   12 +
 policy/modules/services/ssh.if          |   39 ++++
 policy/modules/services/ssh.te          |   10 -
 policy/modules/services/w3c.fc          |    2 
 policy/modules/services/w3c.if          |    1 
 policy/modules/services/w3c.te          |   14 +
 policy/modules/system/application.fc    |    1 
 policy/modules/system/application.if    |  104 ++++++++++++
 policy/modules/system/application.te    |   14 +
 policy/modules/system/authlogin.if      |   83 ++++++++-
 policy/modules/system/authlogin.te      |    3 
 policy/modules/system/fstools.fc        |    1 
 policy/modules/system/fstools.te        |    1 
 policy/modules/system/fusermount.fc     |    6 
 policy/modules/system/fusermount.if     |   41 ++++
 policy/modules/system/fusermount.te     |   45 +++++
 policy/modules/system/getty.te          |    3 
 policy/modules/system/hostname.te       |   14 +
 policy/modules/system/init.if           |   42 ++++
 policy/modules/system/init.te           |   35 +++-
 policy/modules/system/ipsec.if          |   20 ++
 policy/modules/system/ipsec.te          |    3 
 policy/modules/system/iptables.te       |    4 
 policy/modules/system/libraries.fc      |    3 
 policy/modules/system/libraries.te      |    3 
 policy/modules/system/locallogin.te     |    7 
 policy/modules/system/logging.if        |   21 ++
 policy/modules/system/logging.te        |    2 
 policy/modules/system/lvm.te            |    6 
 policy/modules/system/modutils.te       |    7 
 policy/modules/system/mount.fc          |    3 
 policy/modules/system/mount.if          |   37 ++++
 policy/modules/system/mount.te          |   64 +++++++
 policy/modules/system/raid.te           |    1 
 policy/modules/system/selinuxutil.fc    |    1 
 policy/modules/system/selinuxutil.if    |    5 
 policy/modules/system/selinuxutil.te    |   52 +++---
 policy/modules/system/sysnetwork.te     |    3 
 policy/modules/system/udev.te           |   12 +
 policy/modules/system/unconfined.fc     |    1 
 policy/modules/system/unconfined.if     |   10 -
 policy/modules/system/unconfined.te     |   24 ++
 policy/modules/system/userdomain.if     |  269 +++++++++++++++++++-------------
 policy/modules/system/userdomain.te     |   46 ++++-
 policy/modules/system/xen.te            |   35 ++++
 policy/support/obj_perm_sets.spt        |   12 +
 147 files changed, 2989 insertions(+), 438 deletions(-)

Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- policy-20070219.patch	17 Apr 2007 19:28:14 -0000	1.49
+++ policy-20070219.patch	17 Apr 2007 20:42:32 -0000	1.50
@@ -1357,7 +1357,7 @@
  genfscon futexfs / gen_context(system_u:object_r:futexfs_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.5.12/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2007-02-19 11:32:51.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/kernel/kernel.if	2007-04-16 11:51:04.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/kernel/kernel.if	2007-04-17 15:50:55.000000000 -0400
 @@ -1830,6 +1830,26 @@
  
  ########################################
@@ -1395,9 +1395,32 @@
  ')
  
  ########################################
+@@ -2408,3 +2425,22 @@
+ 
+ 	typeattribute $1 kern_unconfined;
+ ')
++
++########################################
++## <summary>
++##	Mount a kernel vm filesystem.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the domain mounting the filesystem.
++##	</summary>
++## </param>
++#
++interface(`kernel_mount_kvmfs',`
++	gen_require(`
++		type kvmfs_t;
++	')
++
++	allow $1 kvmfs_t:filesystem mount;
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.5.12/policy/modules/kernel/kernel.te
 --- nsaserefpolicy/policy/modules/kernel/kernel.te	2007-03-26 10:38:57.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/kernel/kernel.te	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/kernel/kernel.te	2007-04-17 15:50:59.000000000 -0400
 @@ -146,6 +146,8 @@
  type unlabeled_t;
  sid unlabeled gen_context(system_u:object_r:unlabeled_t,mls_systemhigh)
@@ -5044,6 +5067,19 @@
  
  /usr/(.*/)?lib(64)?(/.*)?/nvidia/.+\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?(/.*)?/nvidia/.+\.so(\..*)? --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-2.5.12/policy/modules/system/libraries.te
+--- nsaserefpolicy/policy/modules/system/libraries.te	2007-04-11 10:19:43.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/libraries.te	2007-04-17 15:56:34.000000000 -0400
+@@ -62,7 +62,8 @@
+ 
+ manage_dirs_pattern(ldconfig_t,ldconfig_tmp_t,ldconfig_tmp_t)
+ manage_files_pattern(ldconfig_t,ldconfig_tmp_t,ldconfig_tmp_t)
+-files_tmp_filetrans(ldconfig_t, ldconfig_tmp_t, { file dir })
++manage_lnk_files_pattern(ldconfig_t,ldconfig_tmp_t,ldconfig_tmp_t)
++files_tmp_filetrans(ldconfig_t, ldconfig_tmp_t, { file dir lnk_file })
+ 
+ manage_lnk_files_pattern(ldconfig_t,lib_t,lib_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.5.12/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2007-03-26 10:39:07.000000000 -0400
 +++ serefpolicy-2.5.12/policy/modules/system/locallogin.te	2007-04-11 17:07:34.000000000 -0400
@@ -5161,8 +5197,16 @@
  term_list_ptys(lvm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.5.12/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2007-04-11 15:52:54.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/modutils.te	2007-04-11 17:07:34.000000000 -0400
-@@ -101,6 +101,7 @@
++++ serefpolicy-2.5.12/policy/modules/system/modutils.te	2007-04-17 15:50:53.000000000 -0400
+@@ -58,6 +58,7 @@
+ kernel_read_system_state(insmod_t)
+ kernel_write_proc_files(insmod_t)
+ kernel_mount_debugfs(insmod_t)
++kernel_mount_kvmfs(insmod_t)
+ kernel_read_debugfs(insmod_t)
+ # Rules for /proc/sys/kernel/tainted
+ kernel_read_kernel_sysctls(insmod_t)
+@@ -101,6 +102,7 @@
  init_use_fds(insmod_t)
  init_use_script_fds(insmod_t)
  init_use_script_ptys(insmod_t)
@@ -5170,7 +5214,7 @@
  
  libs_use_ld_so(insmod_t)
  libs_use_shared_libs(insmod_t)
-@@ -163,6 +164,10 @@
+@@ -163,6 +165,10 @@
  	xserver_getattr_log(insmod_t)
  ')
  
@@ -5181,7 +5225,7 @@
  ########################################
  #
  # depmod local policy
-@@ -180,6 +185,7 @@
+@@ -180,6 +186,7 @@
  
  files_read_kernel_symbol_table(depmod_t)
  files_read_kernel_modules(depmod_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -r1.434 -r1.435
--- selinux-policy.spec	17 Apr 2007 19:28:14 -0000	1.434
+++ selinux-policy.spec	17 Apr 2007 20:42:32 -0000	1.435
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.5.12
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -358,6 +358,9 @@
 %endif
 
 %changelog
+* Tue Apr 17 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-5
+- Allow insmod_t to mount kvmfs_t filesystems
+
 * Tue Apr 17 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-4
 - Rwho policy
 - Fixes for consolekit



From fedora-cvs-commits at redhat.com  Tue Apr 17 21:47:39 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 17:47:39 -0400
Subject: rpms/firefox/devel firefox.spec,1.180,1.181
Message-ID: <200704172147.l3HLldY4003243@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	firefox.spec 
Log Message:
* Tue Apr 17 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.3-4
- Fix permissions of the man page



Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- firefox.spec	10 Apr 2007 20:56:21 -0000	1.180
+++ firefox.spec	17 Apr 2007 21:47:36 -0000	1.181
@@ -12,7 +12,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        2.0.0.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -244,7 +244,7 @@
   $RPM_BUILD_ROOT%{mozappdir}/firefox-xremote-client
 
 %{__chmod} 755 $RPM_BUILD_ROOT%{mozappdir}/firefox-xremote-client
-%{__install} -p -D %{SOURCE23} $RPM_BUILD_ROOT%{_mandir}/man1/firefox.1
+%{__install} -p -D -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_mandir}/man1/firefox.1
 
 %{__rm} -f $RPM_BUILD_ROOT%{mozappdir}/firefox-config
 
@@ -420,6 +420,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Apr 17 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.3-4
+- Fix permissions of the man page
+
 * Tue Apr 10 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.3-3
 - Ensure initial homepage on all locales is our proper default
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 22:16:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 18:16:32 -0400
Subject: rpms/comps-extras/devel .cvsignore, 1.14, 1.15 comps-extras.spec,
	1.23, 1.24 sources, 1.18, 1.19
Message-ID: <200704172216.l3HMGWo7003905@cvs.devel.redhat.com>

Author: notting

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

Modified Files:
	.cvsignore comps-extras.spec sources 
Log Message:
11.3-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/comps-extras/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	1 Aug 2006 15:46:58 -0000	1.14
+++ .cvsignore	17 Apr 2007 22:16:28 -0000	1.15
@@ -1 +1 @@
-comps-extras-11.2.tar.gz
+comps-extras-11.3.tar.gz


Index: comps-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/comps-extras/devel/comps-extras.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- comps-extras.spec	7 Feb 2007 18:32:51 -0000	1.23
+++ comps-extras.spec	17 Apr 2007 22:16:28 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Images for components included in Fedora
 Name: comps-extras
-Version: 11.2
-Release: 3
+Version: 11.3
+Release: 1
 # no upstream source releases; the src.rpm is the source much like 
 # with fedora-release, etc.  anonymous cvs available via
 # cvs -d:pserver:anonymous at rhlinux.redhat.com:/usr/local/CVS co comps-extras
@@ -33,8 +33,10 @@
 %dir %{_datadir}/pixmaps/comps
 %{_datadir}/pixmaps/comps/*
 
-
 %changelog
+* Tue Apr 17 2007 Bill Nottingham <notting at redhat.com> - 11.3-1
+- add icons: clustering, virt, window-managers, uncategorized
+
 * Wed Feb  7 2007 Jeremy Katz <katzj at redhat.com> - 11.2-3
 - and a few more
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/comps-extras/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	1 Aug 2006 15:46:58 -0000	1.18
+++ sources	17 Apr 2007 22:16:28 -0000	1.19
@@ -1 +1 @@
-f3cd99e837824178ac919f5626d11af0  comps-extras-11.2.tar.gz
+d16f7b4ffab8a50e74e9f79f0144b451  comps-extras-11.3.tar.gz



From fedora-cvs-commits at redhat.com  Tue Apr 17 22:17:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 18:17:30 -0400
Subject: rpms/kernel/FC-6 kernel-2.6.spec, 1.2944,
	1.2945 linux-2.6-20.5t-sky2_latest_tx_timout.patch, 1.1,
	NONE linux-2.6-20.5z-ide_use_proper_error_recovery.patch, 1.1,
	NONE linux-2.6-20.5z-nfs_allow_64bit_cookies.patch, 1.1,
	NONE linux-2.6-20.5z-softmac_check_if_running.patch, 1.1,
	NONE linux-2.6-20.7a-ahci_ATI_SB600_workaround.patch, 1.1,
	NONE linux-2.6-20.7a-libata-lba48.patch, 1.1,
	NONE linux-2.6-20.7b-libata_blacklist.patch, 1.1,
	NONE linux-2.6-20.7b-libata_clear_tf_before_sense.patch, 1.1,
	NONE linux-2.6-20.7b-scsi_eh_scatterlist.patch, 1.1,
	NONE linux-2.6.20.5-rc1-ata_scsi_preserve_lba_bit.patch, 1.1,
	NONE linux-2.6.20.5-rc1-crypto_walk_fix_advance_by.patch, 1.1, NONE
Message-ID: <200704172217.l3HMHU1t003983@cvs.devel.redhat.com>

Author: cebbert

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-20.5t-sky2_latest_tx_timout.patch 
	linux-2.6-20.5z-ide_use_proper_error_recovery.patch 
	linux-2.6-20.5z-nfs_allow_64bit_cookies.patch 
	linux-2.6-20.5z-softmac_check_if_running.patch 
	linux-2.6-20.7a-ahci_ATI_SB600_workaround.patch 
	linux-2.6-20.7a-libata-lba48.patch 
	linux-2.6-20.7b-libata_blacklist.patch 
	linux-2.6-20.7b-libata_clear_tf_before_sense.patch 
	linux-2.6-20.7b-scsi_eh_scatterlist.patch 
	linux-2.6.20.5-rc1-ata_scsi_preserve_lba_bit.patch 
	linux-2.6.20.5-rc1-crypto_walk_fix_advance_by.patch 
Log Message:
* Tue Apr 17 2007 Chuck Ebbert <cebbert at redhat.com>		1.2945
- 2.6.20.7



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2944
retrieving revision 1.2945
diff -u -r1.2944 -r1.2945
--- kernel-2.6.spec	10 Apr 2007 21:15:52 -0000	1.2944
+++ kernel-2.6.spec	17 Apr 2007 22:17:22 -0000	1.2945
@@ -376,7 +376,7 @@
 Patch4: patch-2.6.20.3-4.bz2
 Patch5: patch-2.6.20.4-5.bz2
 Patch6: patch-2.6.20.5-6.bz2
-Patch7: linux-2.6.20.5-rc1-ata_scsi_preserve_lba_bit.patch
+Patch7: patch-2.6.20.6-7.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 # needed to get utrace patch to apply cleanly
@@ -523,31 +523,21 @@
 # post 2.6.20.6 fixes
 Patch1800: linux-2.6-20.5t-cx88-dvb-autoload.patch
 Patch1801: linux-2.6-20.5t-net_xfrm_audit_add_space.patch
-Patch1802: linux-2.6-20.5t-sky2_latest_tx_timout.patch
 Patch1803: linux-2.6-20.5y-dm_crypt_disable_barriers.patch
 Patch1804: linux-2.6-20.5y_msix_flush_writes.patch
 Patch1805: linux-2.6-jmicron_debug.patch
 Patch1806: linux-2.6-20.5t-dvb-bt8xx-autoload.patch
-Patch1807: linux-2.6-20.5z-ide_use_proper_error_recovery.patch
 Patch1808: linux-2.6-20.5z-mmap_dont_spam_logs.patch
-Patch1809: linux-2.6-20.5z-nfs_allow_64bit_cookies.patch
-Patch1810: linux-2.6-20.5z-softmac_check_if_running.patch
 Patch1811: linux-2.6-20_bluetooth_broadcom_quirk.patch
 Patch1812: linux-2.6-mm-udf-fixes.patch
 Patch1813: linux-2.6-proposed-i82875p-edac-fix.patch
 
 # more post 2.6.20.6
-Patch1820: linux-2.6-20.7a-ahci_ATI_SB600_workaround.patch
 Patch1821: linux-2.6-20.7a-fib_rules_fix_return_value.patch
-Patch1822: linux-2.6-20.7a-libata-lba48.patch
-Patch1823: linux-2.6-20.7b-libata_blacklist.patch
-Patch1824: linux-2.6-20.7b-libata_clear_tf_before_sense.patch
-Patch1825: linux-2.6-20.7b-scsi_eh_scatterlist.patch
 Patch1826: linux-2.6-21-rc6-readahead.patch
 Patch1827: linux-2.6-21-rc6-sched_align_runqueue.patch
 Patch1828: linux-2.6-i386_pci-add_debugging.patch
 
-
 # SELinux/audit patches.
 Patch1850: linux-2.6-selinux-mprotect-checks.patch
 
@@ -1259,8 +1249,6 @@
 %patch1800 -p1
 # audit xfrm add space
 %patch1801 -p1
-# sky2 timeout
-%patch1802 -p1
 # dm crypt disable barriers (send)
 %patch1803 -p1
 # msix flush writes
@@ -1269,14 +1257,8 @@
 %patch1805 -p1
 # bt8xx autoload (fedora)
 %patch1806 -p1
-# ide error recovery (send)
-%patch1807 -p1
 # mmap dont spam logs (send?)
 %patch1808 -p1
-# nfs allow 64bit cookies (send?)
-%patch1809 -p1
-# softmac check if running (send)
-%patch1810 -p1
 # bluetooth quirk (sent to maintainer, ignored)
 %patch1811 -p1
 # UDF fixes from -mm
@@ -1285,12 +1267,7 @@
 %patch1813 -p1
 
 # more post 2.6.20.6 fixes
-%patch1820 -p1
 %patch1821 -p1
-%patch1822 -p1
-%patch1823 -p1
-%patch1824 -p1
-%patch1825 -p1
 %patch1826 -p1
 %patch1827 -p1
 %patch1828 -p1
@@ -2311,6 +2288,9 @@
 %endif
 
 %changelog
+* Tue Apr 17 2007 Chuck Ebbert <cebbert at redhat.com>		1.2945
+- 2.6.20.7
+
 * Tue Apr 10 2007 Chuck Ebbert <cebbert at redhat.com>		1.2944
 - 2.6.20.5
 - 2.6.20.6


--- linux-2.6-20.5t-sky2_latest_tx_timout.patch DELETED ---


--- linux-2.6-20.5z-ide_use_proper_error_recovery.patch DELETED ---


--- linux-2.6-20.5z-nfs_allow_64bit_cookies.patch DELETED ---


--- linux-2.6-20.5z-softmac_check_if_running.patch DELETED ---


--- linux-2.6-20.7a-ahci_ATI_SB600_workaround.patch DELETED ---


--- linux-2.6-20.7a-libata-lba48.patch DELETED ---


--- linux-2.6-20.7b-libata_blacklist.patch DELETED ---


--- linux-2.6-20.7b-libata_clear_tf_before_sense.patch DELETED ---


--- linux-2.6-20.7b-scsi_eh_scatterlist.patch DELETED ---


--- linux-2.6.20.5-rc1-ata_scsi_preserve_lba_bit.patch DELETED ---


--- linux-2.6.20.5-rc1-crypto_walk_fix_advance_by.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 17 22:21:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 18:21:50 -0400
Subject: rpms/control-center/devel control-center-2.18.0-be-more-async.patch,
	1.1, 1.2 control-center.spec, 1.244, 1.245
Message-ID: <200704172221.l3HMLocK004123@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4102

Modified Files:
	control-center-2.18.0-be-more-async.patch control-center.spec 
Log Message:
- Make theme changes work again (among other things). 
  Bug 236752. 


control-center-2.18.0-be-more-async.patch:
 gnome-settings-daemon.c |  249 ++++++++++++++++++++++++++++++++----------------
 1 files changed, 166 insertions(+), 83 deletions(-)

Index: control-center-2.18.0-be-more-async.patch
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center-2.18.0-be-more-async.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- control-center-2.18.0-be-more-async.patch	13 Apr 2007 20:48:24 -0000	1.1
+++ control-center-2.18.0-be-more-async.patch	17 Apr 2007 22:21:45 -0000	1.2
@@ -1,10 +1,12 @@
 --- control-center-2.18.0/gnome-settings-daemon/gnome-settings-daemon.c.be-more-async	2007-01-02 07:47:00.000000000 -0500
-+++ control-center-2.18.0/gnome-settings-daemon/gnome-settings-daemon.c	2007-04-13 16:44:36.000000000 -0400
-@@ -255,15 +255,179 @@
++++ control-center-2.18.0/gnome-settings-daemon/gnome-settings-daemon.c	2007-04-17 18:14:47.000000000 -0400
+@@ -255,15 +255,177 @@
  G_DEFINE_TYPE (GnomeSettingsDaemon, gnome_settings_daemon,
                 G_TYPE_OBJECT)
  
 +static void load_subsystems (void);
++static void watch_for_xsetting_changes (void);
++static void watch_for_configuration_changes (GConfClient *client);
 +
 +typedef void (* GnomeSettingsSubsystemInitFunc) (GConfClient *client);
 +
@@ -17,7 +19,6 @@
 +  gnome_settings_keyboard_xkb_init,
 +  gnome_settings_keyboard_init,
 +  gnome_settings_multimedia_keys_init,
-+/* */
 +  gnome_settings_sound_init,
 +  gnome_settings_accessibility_keyboard_init,
 +  gnome_settings_screensaver_init,
@@ -27,6 +28,8 @@
 +  gnome_settings_gtk1_theme_init,
 +  gnome_settings_xrdb_init,
 +  gnome_settings_typing_break_init,
++  watch_for_configuration_changes,
++  (GnomeSettingsSubsystemInitFunc) watch_for_xsetting_changes,
 +  (GnomeSettingsSubsystemInitFunc) load_subsystems,
 +  NULL
 +};
@@ -125,13 +128,10 @@
 +}
 +
 +static void
-+watch_for_configuration_changes (void)
++watch_for_configuration_changes (GConfClient *client)
 +{
-+  GConfClient *client;
 +  GSList *list;
 +
-+  client = gnome_settings_daemon_get_conf_client ();
-+
 +  for (list = directories; list; list = list->next)
 +    {
 +      GError *error = NULL;
@@ -166,8 +166,6 @@
 +  dbus_service = g_object_new (gnome_settings_server_get_type (), NULL);
 +
 +  initialize_subsystems ();
-+  watch_for_xsetting_changes ();
-+  watch_for_configuration_changes ();
 +  return FALSE;
 +}
 +
@@ -183,7 +181,7 @@
    int i;
    int n_screens;
  
-@@ -316,86 +480,7 @@
+@@ -316,86 +478,7 @@
  						 NULL);
      }
  


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- control-center.spec	17 Apr 2007 14:47:58 -0000	1.244
+++ control-center.spec	17 Apr 2007 22:21:46 -0000	1.245
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.18.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -328,6 +328,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr 17 2007 Ray Strode <rstrode at redhat.com> - 2.18.0-12
+- Make theme changes work again (among other things). 
+  Bug 236752. 
+
 * Tue Apr 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-11
 - Remove debugging spew from the about-me capplet
 



From fedora-cvs-commits at redhat.com  Tue Apr 17 23:27:58 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 19:27:58 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.402, 1.403 anaconda.spec, 1.532,
	1.533 sources, 1.527, 1.528
Message-ID: <200704172327.l3HNRwwO024728@cvs.devel.redhat.com>

Author: katzj

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -r1.402 -r1.403
--- .cvsignore	13 Apr 2007 20:56:17 -0000	1.402
+++ .cvsignore	17 Apr 2007 23:27:56 -0000	1.403
@@ -1 +1 @@
-anaconda-11.2.0.49.tar.bz2
+anaconda-11.2.0.50.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.532
retrieving revision 1.533
diff -u -r1.532 -r1.533
--- anaconda.spec	13 Apr 2007 20:56:17 -0000	1.532
+++ anaconda.spec	17 Apr 2007 23:27:56 -0000	1.533
@@ -1,7 +1,7 @@
 %define livearches %{ix86} x86_64
 
 Name: anaconda
-Version: 11.2.0.49
+Version: 11.2.0.50
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -142,6 +142,17 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Apr 17 2007 Jeremy Katz <katzj at redhat.com> - 11.2.0.50-1
+- Some PS3 fixes (dwmw2)
+- Try to handle some of the problem cases with the ide -> libata driver 
+  changes (clumens, katzj, #229704)
+- Fix text mode package descriptions (clumens, #233662)
+- Fix netlink buffer size (dcantrell, #234764)
+- Fix how we disable ipv6 (dcantrell)
+- Add a few more packages to upgrade blacklists
+- Warn and try not to blow up with scsi disks with more than
+  15 partitions (dcantrell, katzj)
+
 * Fri Apr 13 2007 Jeremy Katz <katzj at redhat.com> - 11.2.0.49-1
 - Fix SELinux labels on moved files with live install (#236282)
 - Add vmmouse driver


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.527
retrieving revision 1.528
diff -u -r1.527 -r1.528
--- sources	13 Apr 2007 20:56:17 -0000	1.527
+++ sources	17 Apr 2007 23:27:56 -0000	1.528
@@ -1 +1 @@
-26da9bf1e7392fe8fc657065dfd609a8  anaconda-11.2.0.49.tar.bz2
+2f3bd9ae97c84e79b0b0ef4fcd9d0126  anaconda-11.2.0.50.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 17 23:46:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 19:46:47 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.403, 1.404 anaconda.spec, 1.533,
	1.534 sources, 1.528, 1.529
Message-ID: <200704172346.l3HNklfh028030@cvs.devel.redhat.com>

Author: katzj

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -r1.403 -r1.404
--- .cvsignore	17 Apr 2007 23:27:56 -0000	1.403
+++ .cvsignore	17 Apr 2007 23:46:45 -0000	1.404
@@ -1 +1 @@
-anaconda-11.2.0.50.tar.bz2
+anaconda-11.2.0.51.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.533
retrieving revision 1.534
diff -u -r1.533 -r1.534
--- anaconda.spec	17 Apr 2007 23:27:56 -0000	1.533
+++ anaconda.spec	17 Apr 2007 23:46:45 -0000	1.534
@@ -1,7 +1,7 @@
 %define livearches %{ix86} x86_64
 
 Name: anaconda
-Version: 11.2.0.50
+Version: 11.2.0.51
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -142,7 +142,7 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
-* Tue Apr 17 2007 Jeremy Katz <katzj at redhat.com> - 11.2.0.50-1
+* Tue Apr 17 2007 Jeremy Katz <katzj at redhat.com> - 11.2.0.51-1
 - Some PS3 fixes (dwmw2)
 - Try to handle some of the problem cases with the ide -> libata driver 
   changes (clumens, katzj, #229704)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.528
retrieving revision 1.529
diff -u -r1.528 -r1.529
--- sources	17 Apr 2007 23:27:56 -0000	1.528
+++ sources	17 Apr 2007 23:46:45 -0000	1.529
@@ -1 +1 @@
-2f3bd9ae97c84e79b0b0ef4fcd9d0126  anaconda-11.2.0.50.tar.bz2
+25cea2e7719ffce44bfa4b899785ec5a  anaconda-11.2.0.51.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 17 23:48:56 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 19:48:56 -0400
Subject: rpms/scim-tables/FC-6 scim-tables.spec,1.30,1.31
Message-ID: <200704172348.l3HNmuBr028116@cvs.devel.redhat.com>

Author: cchance

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

Modified Files:
	scim-tables.spec 
Log Message:
bz#236130: Description tag of scim-tables-arabic is incorrect.


Index: scim-tables.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-tables/FC-6/scim-tables.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- scim-tables.spec	19 Mar 2007 06:31:29 -0000	1.30
+++ scim-tables.spec	17 Apr 2007 23:48:54 -0000	1.31
@@ -6,7 +6,7 @@
 
 Name:		scim-tables
 Version:	0.5.7
-Release:	2%{?dist}
+Release:	2.1%{?dist}
 Summary:	SCIM Generic Table IMEngine
 
 License:	GPL
@@ -41,7 +41,7 @@
 Requires:	scim-tables = %{version}
 
 %description arabic
-This package contains scim-tables files for Chinese input.
+This package contains scim-tables files for Arabic input.
 
 %if %{indic_tables}
 %package bengali
@@ -439,6 +439,9 @@
 
 
 %changelog
+* Wed Apr 18 2007 Caius Chance <cchance at redhat.com> - 0.5.7-2.1.fc6
+- Fixed bz#236130: Description tag of scim-tables-arabic is incorrect. 
+
 * Mon Mar 19 2007 Caius Chance <cchance at redhat.com> - 0.5.7-2.fc6
 - Fixed bz#232875: scim-tables Chang-Jie preedit was not cleared after focus 
                    out then focus in.



From fedora-cvs-commits at redhat.com  Tue Apr 17 23:58:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 19:58:36 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.3084,
	1.3085 linux-2.6-firewire.patch, 1.7, 1.8
Message-ID: <200704172358.l3HNwaq1028436@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	kernel-2.6.spec linux-2.6-firewire.patch 
Log Message:
* Tue Apr 17 2007 Kristian H??gsberg <krh at redhat.com>
- Fix firewire ioctl numbers; use the right size and direction values.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3084
retrieving revision 1.3085
diff -u -r1.3084 -r1.3085
--- kernel-2.6.spec	17 Apr 2007 19:00:05 -0000	1.3084
+++ kernel-2.6.spec	17 Apr 2007 23:58:34 -0000	1.3085
@@ -2309,6 +2309,9 @@
 #  - tux.
 
 %changelog
+* Tue Apr 17 2007 Kristian H??gsberg <krh at redhat.com>
+- Fix firewire ioctl numbers; use the right size and direction values.
+
 * Tue Apr 17 2007 Dave Jones <davej at redhat.com>
 - sata_nv: Don't attempt using ADMA for (READ|SET)_MAX commands
 

linux-2.6-firewire.patch:
 drivers/Makefile                  |    1 
 drivers/firewire/Kconfig          |   60 +
 drivers/firewire/Makefile         |   10 
 drivers/firewire/fw-card.c        |  544 ++++++++++
 drivers/firewire/fw-cdev.c        |  951 +++++++++++++++++++
 drivers/firewire/fw-device.c      |  781 +++++++++++++++
 drivers/firewire/fw-device.h      |  149 ++
 drivers/firewire/fw-iso.c         |  163 +++
 drivers/firewire/fw-ohci.c        | 1896 ++++++++++++++++++++++++++++++++++++++
 drivers/firewire/fw-ohci.h        |  153 +++
 drivers/firewire/fw-sbp2.c        | 1165 +++++++++++++++++++++++
 drivers/firewire/fw-topology.c    |  519 ++++++++++
 drivers/firewire/fw-topology.h    |   94 +
 drivers/firewire/fw-transaction.c |  889 +++++++++++++++++
 drivers/firewire/fw-transaction.h |  505 ++++++++++
 drivers/ieee1394/Kconfig          |    2 
 include/linux/firewire-cdev.h     |  267 +++++
 17 files changed, 8149 insertions(+)

Index: linux-2.6-firewire.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-firewire.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-firewire.patch	13 Apr 2007 18:34:41 -0000	1.7
+++ linux-2.6-firewire.patch	17 Apr 2007 23:58:34 -0000	1.8
@@ -78,7 +78,7 @@
 +
 diff --git a/drivers/firewire/Makefile b/drivers/firewire/Makefile
 new file mode 100644
-index 0000000..eddc16c
+index 0000000..7f02d6f
 --- /dev/null
 +++ b/drivers/firewire/Makefile
 @@ -0,0 +1,10 @@
@@ -87,17 +87,17 @@
 +#
 +
 +fw-core-objs := fw-card.o fw-topology.o fw-transaction.o fw-iso.o \
-+	fw-device.o fw-device-cdev.o
++	fw-device.o fw-cdev.o
 +
 +obj-$(CONFIG_FIREWIRE) += fw-core.o
 +obj-$(CONFIG_FIREWIRE_OHCI) += fw-ohci.o
 +obj-$(CONFIG_FIREWIRE_SBP2) += fw-sbp2.o
 diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
 new file mode 100644
-index 0000000..3eb0655
+index 0000000..a2de680
 --- /dev/null
 +++ b/drivers/firewire/fw-card.c
-@@ -0,0 +1,542 @@
+@@ -0,0 +1,544 @@
 +/*						-*- c-basic-offset: 8 -*-
 + *
 + * fw-card.c - card level functions
@@ -122,6 +122,7 @@
 +#include <linux/module.h>
 +#include <linux/errno.h>
 +#include <linux/device.h>
++#include <linux/rwsem.h>
 +#include "fw-transaction.h"
 +#include "fw-topology.h"
 +#include "fw-device.h"
@@ -149,6 +150,7 @@
 +	return crc;
 +}
 +
++static DECLARE_RWSEM(card_rwsem);
 +static LIST_HEAD(card_list);
 +
 +static LIST_HEAD(descriptor_list);
@@ -262,7 +264,7 @@
 +	if (i != desc->length)
 +		return -EINVAL;
 +
-+	down_write(&fw_bus_type.subsys.rwsem);
++	down_write(&card_rwsem);
 +
 +	list_add_tail (&desc->link, &descriptor_list);
 +	descriptor_count++;
@@ -270,7 +272,7 @@
 +		descriptor_count++;
 +	update_config_roms();
 +
-+	up_write(&fw_bus_type.subsys.rwsem);
++	up_write(&card_rwsem);
 +
 +	return 0;
 +}
@@ -279,7 +281,7 @@
 +void
 +fw_core_remove_descriptor (struct fw_descriptor *desc)
 +{
-+	down_write(&fw_bus_type.subsys.rwsem);
++	down_write(&card_rwsem);
 +
 +	list_del(&desc->link);
 +	descriptor_count--;
@@ -287,7 +289,7 @@
 +		descriptor_count--;
 +	update_config_roms();
 +
-+	up_write(&fw_bus_type.subsys.rwsem);
++	up_write(&card_rwsem);
 +}
 +EXPORT_SYMBOL(fw_core_remove_descriptor);
 +
@@ -504,10 +506,10 @@
 +	 * drops it when the driver calls fw_core_remove_card. */
 +	fw_card_get(card);
 +
-+	down_write(&fw_bus_type.subsys.rwsem);
++	down_write(&card_rwsem);
 +	config_rom = generate_config_rom (card, &length);
 +	list_add_tail(&card->link, &card_list);
-+	up_write(&fw_bus_type.subsys.rwsem);
++	up_write(&card_rwsem);
 +
 +	return card->driver->enable(card, config_rom, length);
 +}
@@ -587,9 +589,9 @@
 +				     PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
 +	fw_core_initiate_bus_reset(card, 1);
 +
-+	down_write(&fw_bus_type.subsys.rwsem);
++	down_write(&card_rwsem);
 +	list_del(&card->link);
-+	up_write(&fw_bus_type.subsys.rwsem);
++	up_write(&card_rwsem);
 +
 +	/* Set up the dummy driver. */
 +	card->driver = &dummy_driver;
@@ -640,12 +642,12 @@
 +	return card->driver->update_phy_reg(card, reg, 0, bit);
 +}
 +EXPORT_SYMBOL(fw_core_initiate_bus_reset);
-diff --git a/drivers/firewire/fw-device-cdev.c b/drivers/firewire/fw-device-cdev.c
+diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c
 new file mode 100644
-index 0000000..fab6dfb
+index 0000000..3a3a42f
 --- /dev/null
-+++ b/drivers/firewire/fw-device-cdev.c
-@@ -0,0 +1,974 @@
++++ b/drivers/firewire/fw-cdev.c
+@@ -0,0 +1,951 @@
 +/*						-*- c-basic-offset: 8 -*-
 + *
 + * fw-device-cdev.c - Char device for device raw access
@@ -678,11 +680,11 @@
 +#include <linux/mm.h>
 +#include <linux/idr.h>
 +#include <linux/compat.h>
++#include <linux/firewire-cdev.h>
 +#include <asm/uaccess.h>
 +#include "fw-transaction.h"
 +#include "fw-topology.h"
 +#include "fw-device.h"
-+#include "fw-device-cdev.h"
 +
 +/* dequeue_event() just kfree()'s the event, so the event has to be
 + * the first field in the struct. */
@@ -906,41 +908,35 @@
 +	for_each_client(device, wake_up_client);
 +}
 +
-+static int ioctl_get_info(struct client *client, void __user *arg)
++static int ioctl_get_info(struct client *client, void *buffer)
 +{
-+	struct fw_cdev_get_info get_info;
++	struct fw_cdev_get_info *get_info = buffer;
 +	struct fw_cdev_event_bus_reset bus_reset;
 +
-+	if (copy_from_user(&get_info, arg, sizeof get_info))
-+		return -EFAULT;
-+
-+	client->version = get_info.version;
-+	get_info.version = FW_CDEV_VERSION;
++	client->version = get_info->version;
++	get_info->version = FW_CDEV_VERSION;
 +
-+	if (get_info.rom != 0) {
-+		void __user *uptr = u64_to_uptr(get_info.rom);
-+		size_t want = get_info.rom_length;
++	if (get_info->rom != 0) {
++		void __user *uptr = u64_to_uptr(get_info->rom);
++		size_t want = get_info->rom_length;
 +		size_t have = client->device->config_rom_length * 4;
 +
 +		if (copy_to_user(uptr, client->device->config_rom,
 +				 min(want, have)))
 +			return -EFAULT;
 +	}
-+	get_info.rom_length = client->device->config_rom_length * 4;
++	get_info->rom_length = client->device->config_rom_length * 4;
 +
-+	client->bus_reset_closure = get_info.bus_reset_closure;
-+	if (get_info.bus_reset != 0) {
-+		void __user *uptr = u64_to_uptr(get_info.bus_reset);
++	client->bus_reset_closure = get_info->bus_reset_closure;
++	if (get_info->bus_reset != 0) {
++		void __user *uptr = u64_to_uptr(get_info->bus_reset);
 +
 +		fill_bus_reset_event(&bus_reset, client);
 +		if (copy_to_user(uptr, &bus_reset, sizeof bus_reset))
 +			return -EFAULT;
 +	}
 +
-+	get_info.card = client->device->card->index;
-+
-+	if (copy_to_user(arg, &get_info, sizeof get_info))
-+		return -EFAULT;
++	get_info->card = client->device->card->index;
 +
 +	return 0;
 +}
@@ -1017,30 +1013,27 @@
 +		    response->response.data, response->response.length);
 +}
 +
-+static ssize_t ioctl_send_request(struct client *client, void __user *arg)
++static ssize_t ioctl_send_request(struct client *client, void *buffer)
 +{
 +	struct fw_device *device = client->device;
-+	struct fw_cdev_send_request request;
++	struct fw_cdev_send_request *request = buffer;
 +	struct response *response;
 +
-+	if (copy_from_user(&request, arg, sizeof request))
-+		return -EFAULT;
-+
 +	/* What is the biggest size we'll accept, really? */
-+	if (request.length > 4096)
++	if (request->length > 4096)
 +		return -EINVAL;
 +
-+	response = kmalloc(sizeof *response + request.length, GFP_KERNEL);
++	response = kmalloc(sizeof *response + request->length, GFP_KERNEL);
 +	if (response == NULL)
 +		return -ENOMEM;
 +
 +	response->client = client;
-+	response->response.length = request.length;
-+	response->response.closure = request.closure;
++	response->response.length = request->length;
++	response->response.closure = request->closure;
 +
-+	if (request.data &&
++	if (request->data &&
 +	    copy_from_user(response->response.data,
-+			   u64_to_uptr(request.data), request.length)) {
++			   u64_to_uptr(request->data), request->length)) {
 +		kfree(response);
 +		return -EFAULT;
 +	}
@@ -1049,16 +1042,16 @@
 +	add_client_resource(client, &response->resource);
 +
 +	fw_send_request(device->card, &response->transaction,
-+			request.tcode & 0x1f,
++			request->tcode & 0x1f,
 +			device->node->node_id,
-+			request.generation,
++			request->generation,
 +			device->node->max_speed,
-+			request.offset,
-+			response->response.data, request.length,
++			request->offset,
++			response->response.data, request->length,
 +			complete_transaction, response);
 +
-+	if (request.data)
-+		return sizeof request + request.length;
++	if (request->data)
++		return sizeof request + request->length;
 +	else
 +		return sizeof request;
 +}
@@ -1143,25 +1136,22 @@
 +	kfree(handler);
 +}
 +
-+static int ioctl_allocate(struct client *client, void __user *arg)
++static int ioctl_allocate(struct client *client, void *buffer)
 +{
-+	struct fw_cdev_allocate request;
++	struct fw_cdev_allocate *request = buffer;
 +	struct address_handler *handler;
 +	struct fw_address_region region;
 +
-+	if (copy_from_user(&request, arg, sizeof request))
-+		return -EFAULT;
-+
 +	handler = kmalloc(sizeof *handler, GFP_KERNEL);
 +	if (handler == NULL)
 +		return -ENOMEM;
 +
-+	region.start = request.offset;
-+	region.end = request.offset + request.length;
-+	handler->handler.length = request.length;
++	region.start = request->offset;
++	region.end = request->offset + request->length;
++	handler->handler.length = request->length;
 +	handler->handler.address_callback = handle_request;
 +	handler->handler.callback_data = handler;
-+	handler->closure = request.closure;
++	handler->closure = request->closure;
 +	handler->client = client;
 +
 +	if (fw_core_add_address_handler(&handler->handler, &region) < 0) {
@@ -1171,55 +1161,44 @@
 +
 +	handler->resource.release = release_address_handler;
 +	add_client_resource(client, &handler->resource);
-+	request.handle = handler->resource.handle;
-+
-+	if (copy_to_user(arg, &request, sizeof request))
-+		return -EFAULT;
++	request->handle = handler->resource.handle;
 +
 +	return 0;
 +}
 +
-+static int ioctl_deallocate(struct client *client, void __user *arg)
++static int ioctl_deallocate(struct client *client, void *buffer)
 +{
-+	struct fw_cdev_deallocate request;
-+
-+	if (copy_from_user(&request, arg, sizeof request))
-+		return -EFAULT;
++	struct fw_cdev_deallocate *request = buffer;
 +
-+	return release_client_resource(client, request.handle, NULL);
++	return release_client_resource(client, request->handle, NULL);
 +}
 +
-+static int ioctl_send_response(struct client *client, void __user *arg)
++static int ioctl_send_response(struct client *client, void *buffer)
 +{
-+	struct fw_cdev_send_response request;
++	struct fw_cdev_send_response *request = buffer;
 +	struct client_resource *resource;
 +	struct request *r;
 +
-+	if (copy_from_user(&request, arg, sizeof request))
-+		return -EFAULT;
-+	if (release_client_resource(client, request.handle, &resource) < 0)
++	if (release_client_resource(client, request->handle, &resource) < 0)
 +		return -EINVAL;
 +	r = container_of(resource, struct request, resource);
-+	if (request.length < r->length)
-+		r->length = request.length;
-+	if (copy_from_user(r->data, u64_to_uptr(request.data), r->length))
++	if (request->length < r->length)
++		r->length = request->length;
++	if (copy_from_user(r->data, u64_to_uptr(request->data), r->length))
 +		return -EFAULT;
 +
-+	fw_send_response(client->device->card, r->request, request.rcode);
++	fw_send_response(client->device->card, r->request, request->rcode);
 +	kfree(r);
 +
 +	return 0;
 +}
 +
-+static int ioctl_initiate_bus_reset(struct client *client, void __user *arg)
++static int ioctl_initiate_bus_reset(struct client *client, void *buffer)
 +{
-+	struct fw_cdev_initiate_bus_reset request;
++	struct fw_cdev_initiate_bus_reset *request = buffer;
 +	int short_reset;
 +
-+	if (copy_from_user(&request, arg, sizeof request))
-+		return -EFAULT;
-+
-+	short_reset = (request.type == FW_CDEV_SHORT_RESET);
++	short_reset = (request->type == FW_CDEV_SHORT_RESET);
 +
 +	return fw_core_initiate_bus_reset(client->device->card, short_reset);
 +}
@@ -1240,32 +1219,29 @@
 +	kfree(descriptor);
 +}
 +
-+static int ioctl_add_descriptor(struct client *client, void __user *arg)
++static int ioctl_add_descriptor(struct client *client, void *buffer)
 +{
-+	struct fw_cdev_add_descriptor request;
++	struct fw_cdev_add_descriptor *request = buffer;
 +	struct descriptor *descriptor;
 +	int retval;
 +
-+	if (copy_from_user(&request, arg, sizeof request))
-+		return -EFAULT;
-+
-+	if (request.length > 256)
++	if (request->length > 256)
 +		return -EINVAL;
 +
 +	descriptor =
-+		kmalloc(sizeof *descriptor + request.length * 4, GFP_KERNEL);
++		kmalloc(sizeof *descriptor + request->length * 4, GFP_KERNEL);
 +	if (descriptor == NULL)
 +		return -ENOMEM;
 +
 +	if (copy_from_user(descriptor->data,
-+			   u64_to_uptr(request.data), request.length * 4)) {
++			   u64_to_uptr(request->data), request->length * 4)) {
 +		kfree(descriptor);
 +		return -EFAULT;
 +	}
 +
-+	descriptor->d.length = request.length;
-+	descriptor->d.immediate = request.immediate;
-+	descriptor->d.key = request.key;
++	descriptor->d.length = request->length;
++	descriptor->d.immediate = request->immediate;
++	descriptor->d.key = request->key;
 +	descriptor->d.data = descriptor->data;
 +
 +	retval = fw_core_add_descriptor(&descriptor->d);
@@ -1276,22 +1252,16 @@
 +
 +	descriptor->resource.release = release_descriptor;
 +	add_client_resource(client, &descriptor->resource);
-+	request.handle = descriptor->resource.handle;
-+
-+	if (copy_to_user(arg, &request, sizeof request))
-+		return -EFAULT;
++	request->handle = descriptor->resource.handle;
 +
 +	return 0;
 +}
 +
-+static int ioctl_remove_descriptor(struct client *client, void __user *arg)
++static int ioctl_remove_descriptor(struct client *client, void *buffer)
 +{
-+	struct fw_cdev_remove_descriptor request;
-+
-+	if (copy_from_user(&request, arg, sizeof request))
-+		return -EFAULT;
++	struct fw_cdev_remove_descriptor *request = buffer;
 +
-+	return release_client_resource(client, request.handle, NULL);
++	return release_client_resource(client, request->handle, NULL);
 +}
 +
 +static void
@@ -1315,25 +1285,22 @@
 +		    sizeof interrupt->interrupt + header_length, NULL, 0);
 +}
 +
-+static int ioctl_create_iso_context(struct client *client, void __user *arg)
++static int ioctl_create_iso_context(struct client *client, void *buffer)
 +{
-+	struct fw_cdev_create_iso_context request;
-+
-+	if (copy_from_user(&request, arg, sizeof request))
-+		return -EFAULT;
++	struct fw_cdev_create_iso_context *request = buffer;
 +
-+	if (request.channel > 63)
++	if (request->channel > 63)
 +		return -EINVAL;
 +
-+	switch (request.type) {
++	switch (request->type) {
 +	case FW_ISO_CONTEXT_RECEIVE:
-+		if (request.header_size < 4 || (request.header_size & 3))
++		if (request->header_size < 4 || (request->header_size & 3))
 +			return -EINVAL;
 +
 +		break;
 +
 +	case FW_ISO_CONTEXT_TRANSMIT:
-+		if (request.speed > SCODE_3200)
++		if (request->speed > SCODE_3200)
 +			return -EINVAL;
 +
 +		break;
@@ -1343,20 +1310,23 @@
 +	}
 +
 +	client->iso_context = fw_iso_context_create(client->device->card,
-+						    request.type,
-+						    request.channel,
-+						    request.speed,
-+						    request.header_size,
++						    request->type,
++						    request->channel,
++						    request->speed,
++						    request->header_size,
 +						    iso_callback, client);
 +	if (IS_ERR(client->iso_context))
 +		return PTR_ERR(client->iso_context);
 +
++	/* We only support one context at this time. */
++	request->handle = 0;
++
 +	return 0;
 +}
 +
-+static int ioctl_queue_iso(struct client *client, void __user *arg)
++static int ioctl_queue_iso(struct client *client, void *buffer)
 +{
-+	struct fw_cdev_queue_iso request;
++	struct fw_cdev_queue_iso *request = buffer;
 +	struct fw_cdev_iso_packet __user *p, *end, *next;
 +	struct fw_iso_context *ctx = client->iso_context;
 +	unsigned long payload, buffer_end, header_length;
@@ -1366,10 +1336,8 @@
 +		u8 header[256];
 +	} u;
 +
-+	if (ctx == NULL)
++	if (ctx == NULL || request->handle != 0)
 +		return -EINVAL;
-+	if (copy_from_user(&request, arg, sizeof request))
-+		return -EFAULT;
 +
 +	/* If the user passes a non-NULL data pointer, has mmap()'ed
 +	 * the iso buffer, and the pointer points inside the buffer,
@@ -1377,21 +1345,21 @@
 +	 * set them both to 0, which will still let packets with
 +	 * payload_length == 0 through.  In other words, if no packets
 +	 * use the indirect payload, the iso buffer need not be mapped
-+	 * and the request.data pointer is ignored.*/
++	 * and the request->data pointer is ignored.*/
 +
-+	payload = (unsigned long)request.data - client->vm_start;
++	payload = (unsigned long)request->data - client->vm_start;
 +	buffer_end = client->buffer.page_count << PAGE_SHIFT;
-+	if (request.data == 0 || client->buffer.pages == NULL ||
++	if (request->data == 0 || client->buffer.pages == NULL ||
 +	    payload >= buffer_end) {
 +		payload = 0;
 +		buffer_end = 0;
 +	}
 +
-+	if (!access_ok(VERIFY_READ, request.packets, request.size))
++	if (!access_ok(VERIFY_READ, request->packets, request->size))
 +		return -EFAULT;
 +
-+	p = (struct fw_cdev_iso_packet __user *)u64_to_uptr(request.packets);
-+	end = (void __user *)p + request.size;
++	p = (struct fw_cdev_iso_packet __user *)u64_to_uptr(request->packets);
++	end = (void __user *)p + request->size;
 +	count = 0;
 +	while (p < end) {
 +		if (__copy_from_user(&u.packet, p, sizeof *p))
@@ -1433,71 +1401,82 @@
 +		count++;
 +	}
 +
-+	request.size    -= uptr_to_u64(p) - request.packets;
-+	request.packets  = uptr_to_u64(p);
-+	request.data     = client->vm_start + payload;
-+
-+	if (copy_to_user(arg, &request, sizeof request))
-+		return -EFAULT;
++	request->size    -= uptr_to_u64(p) - request->packets;
++	request->packets  = uptr_to_u64(p);
++	request->data     = client->vm_start + payload;
 +
 +	return count;
 +}
 +
-+static int ioctl_start_iso(struct client *client, void __user *arg)
++static int ioctl_start_iso(struct client *client, void *buffer)
 +{
-+	struct fw_cdev_start_iso request;
-+
-+	if (copy_from_user(&request, arg, sizeof request))
-+		return -EFAULT;
++	struct fw_cdev_start_iso *request = buffer;
 +
++	if (request->handle != 0)
++		return -EINVAL;
 +	if (client->iso_context->type == FW_ISO_CONTEXT_RECEIVE) {
-+		if (request.tags == 0 || request.tags > 15)
++		if (request->tags == 0 || request->tags > 15)
 +			return -EINVAL;
 +
-+		if (request.sync > 15)
++		if (request->sync > 15)
 +			return -EINVAL;
 +	}
 +
-+	return fw_iso_context_start(client->iso_context,
-+				    request.cycle, request.sync, request.tags);
++	return fw_iso_context_start(client->iso_context, request->cycle,
++				    request->sync, request->tags);
 +}
 +
-+static int ioctl_stop_iso(struct client *client, void __user *arg)
++static int ioctl_stop_iso(struct client *client, void *buffer)
 +{
++	struct fw_cdev_stop_iso *request = buffer;
++
++	if (request->handle != 0)
++		return -EINVAL;
++
 +	return fw_iso_context_stop(client->iso_context);
 +}
 +
++static int (* const ioctl_handlers[])(struct client *client, void *buffer) = {
++	ioctl_get_info,
++	ioctl_send_request,
++	ioctl_allocate,
++	ioctl_deallocate,
++	ioctl_send_response,
++	ioctl_initiate_bus_reset,
++	ioctl_add_descriptor,
++	ioctl_remove_descriptor,
++	ioctl_create_iso_context,
++	ioctl_queue_iso,
++	ioctl_start_iso,
++	ioctl_stop_iso,
++};
++
 +static int
 +dispatch_ioctl(struct client *client, unsigned int cmd, void __user *arg)
 +{
-+	switch (cmd) {
-+	case FW_CDEV_IOC_GET_INFO:
-+		return ioctl_get_info(client, arg);
-+	case FW_CDEV_IOC_SEND_REQUEST:
-+		return ioctl_send_request(client, arg);
-+	case FW_CDEV_IOC_ALLOCATE:
-+		return ioctl_allocate(client, arg);
-+	case FW_CDEV_IOC_DEALLOCATE:
-+		return ioctl_deallocate(client, arg);
-+	case FW_CDEV_IOC_SEND_RESPONSE:
-+		return ioctl_send_response(client, arg);
-+	case FW_CDEV_IOC_INITIATE_BUS_RESET:
-+		return ioctl_initiate_bus_reset(client, arg);
-+	case FW_CDEV_IOC_ADD_DESCRIPTOR:
-+		return ioctl_add_descriptor(client, arg);
-+	case FW_CDEV_IOC_REMOVE_DESCRIPTOR:
-+		return ioctl_remove_descriptor(client, arg);
-+	case FW_CDEV_IOC_CREATE_ISO_CONTEXT:
-+		return ioctl_create_iso_context(client, arg);
-+	case FW_CDEV_IOC_QUEUE_ISO:
-+		return ioctl_queue_iso(client, arg);
-+	case FW_CDEV_IOC_START_ISO:
-+		return ioctl_start_iso(client, arg);
-+	case FW_CDEV_IOC_STOP_ISO:
-+		return ioctl_stop_iso(client, arg);
-+	default:
++	char buffer[256];
++	int retval;
++
++	if (_IOC_DIR(cmd) & _IOC_WRITE) {
++		if (_IOC_SIZE(cmd) > sizeof buffer ||
++		    copy_from_user(buffer, arg, _IOC_SIZE(cmd)))
++			return -EFAULT;
++	}
++
++	if (_IOC_TYPE(cmd) >= ARRAY_SIZE(ioctl_handlers))
 +		return -EINVAL;
++
++	retval = ioctl_handlers[_IOC_TYPE(cmd)](client, buffer);
++	if (retval < 0)
++		return retval;
++
++	if (_IOC_DIR(cmd) == _IOC_READ) {
++		if (_IOC_SIZE(cmd) > sizeof buffer ||
++		    copy_to_user(arg, buffer, _IOC_SIZE(cmd)))
++			return -EFAULT;
 +	}
++
++	return 0;
 +}
 +
 +static long
@@ -1619,279 +1598,13 @@
 +#ifdef CONFIG_COMPAT
 +	.compat_ioctl	= fw_device_op_compat_ioctl,
 +#endif
-+};
-diff --git a/drivers/firewire/fw-device-cdev.h b/drivers/firewire/fw-device-cdev.h
-new file mode 100644
-index 0000000..a6340bf
---- /dev/null
-+++ b/drivers/firewire/fw-device-cdev.h
-@@ -0,0 +1,260 @@
-+/*						-*- c-basic-offset: 8 -*-
-+ *
-+ * fw-device-cdev.h -- Char device interface.
-+ *
-+ * Copyright (C) 2005-2006  Kristian Hoegsberg <krh at bitplanet.net>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * 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 __fw_cdev_h
-+#define __fw_cdev_h
-+
-+#include <asm/ioctl.h>
-+#include <asm/types.h>
-+
-+#define TCODE_WRITE_QUADLET_REQUEST	0
-+#define TCODE_WRITE_BLOCK_REQUEST	1
-+#define TCODE_WRITE_RESPONSE		2
-+#define TCODE_READ_QUADLET_REQUEST	4
-+#define TCODE_READ_BLOCK_REQUEST	5
-+#define TCODE_READ_QUADLET_RESPONSE	6
-+#define TCODE_READ_BLOCK_RESPONSE	7
-+#define TCODE_CYCLE_START		8
-+#define TCODE_LOCK_REQUEST		9
-+#define TCODE_STREAM_DATA		10
-+#define TCODE_LOCK_RESPONSE		11
-+
-+#define TCODE_LOCK_MASK_SWAP		0x11
-+#define TCODE_LOCK_COMPARE_SWAP		0x12
-+#define TCODE_LOCK_FETCH_ADD		0x13
-+#define TCODE_LOCK_LITTLE_ADD		0x14
-+#define TCODE_LOCK_BOUNDED_ADD		0x15
-+#define TCODE_LOCK_WRAP_ADD		0x16
-+#define TCODE_LOCK_VENDOR_DEPENDENT	0x17
-+
-+#define RCODE_COMPLETE			0x0
-+#define RCODE_CONFLICT_ERROR		0x4
-+#define RCODE_DATA_ERROR		0x5
-+#define RCODE_TYPE_ERROR		0x6
-+#define RCODE_ADDRESS_ERROR		0x7
-+
-+#define RCODE_SEND_ERROR		0x10
-+#define RCODE_CANCELLED			0x11
-+#define RCODE_BUSY			0x12
-+#define RCODE_GENERATION		0x13
-+#define RCODE_NO_ACK			0x14
-+
-+#define SCODE_100			0x0
-+#define SCODE_200			0x1
-+#define SCODE_400			0x2
-+#define SCODE_800			0x3
-+#define SCODE_1600			0x4
-+#define SCODE_3200			0x5
-+
-+#define FW_CDEV_EVENT_BUS_RESET		0x00
-+#define FW_CDEV_EVENT_RESPONSE		0x01
-+#define FW_CDEV_EVENT_REQUEST		0x02
-+#define FW_CDEV_EVENT_ISO_INTERRUPT	0x03
-+
-+/* The 'closure' fields are for user space to use.  Data passed in the
-+ * 'closure' field for a request will be returned in the corresponding
-+ * event.  It's a 64-bit type so that it's a fixed size type big
-+ * enough to hold a pointer on all platforms. */
-+
-+struct fw_cdev_event_common {
-+	__u64 closure;
-+	__u32 type;
-+};
-+
-+struct fw_cdev_event_bus_reset {
-+	__u64 closure;
-+	__u32 type;
-+	__u32 node_id;
-+	__u32 local_node_id;
-+	__u32 bm_node_id;
-+	__u32 irm_node_id;
-+	__u32 root_node_id;
-+	__u32 generation;
-+};
-+
-+struct fw_cdev_event_response {
-+	__u64 closure;
-+	__u32 type;
-+	__u32 rcode;
-+	__u32 length;
-+	__u32 data[0];
-+};
-+
-+struct fw_cdev_event_request {
-+	__u64 closure;
-+	__u32 type;
-+	__u32 tcode;
-+	__u64 offset;
-+	__u32 handle;
-+	__u32 length;
-+	__u32 data[0];
-+};
-+
-+struct fw_cdev_event_iso_interrupt {
-+	__u64 closure;
-+	__u32 type;
-+	__u32 cycle;
-+	__u32 header_length;	/* Length in bytes of following headers. */
-+	__u32 header[0];
-+};
-+
-+union fw_cdev_event {
-+	struct fw_cdev_event_common common;
-+	struct fw_cdev_event_bus_reset bus_reset;
-+	struct fw_cdev_event_response response;
-+	struct fw_cdev_event_request request;
-+	struct fw_cdev_event_iso_interrupt iso_interrupt;
-+};
-+
-+#define FW_CDEV_IOC_GET_INFO		_IO('#', 0x00)
-+#define FW_CDEV_IOC_SEND_REQUEST	_IO('#', 0x01)
-+#define FW_CDEV_IOC_ALLOCATE		_IO('#', 0x02)
-+#define FW_CDEV_IOC_DEALLOCATE		_IO('#', 0x03)
-+#define FW_CDEV_IOC_SEND_RESPONSE	_IO('#', 0x04)
-+#define FW_CDEV_IOC_INITIATE_BUS_RESET	_IO('#', 0x05)
-+#define FW_CDEV_IOC_ADD_DESCRIPTOR	_IO('#', 0x06)
-+#define FW_CDEV_IOC_REMOVE_DESCRIPTOR	_IO('#', 0x07)
-+
-+#define FW_CDEV_IOC_CREATE_ISO_CONTEXT	_IO('#', 0x08)
-+#define FW_CDEV_IOC_QUEUE_ISO		_IO('#', 0x09)
-+#define FW_CDEV_IOC_START_ISO		_IO('#', 0x0a)
-+#define FW_CDEV_IOC_STOP_ISO		_IO('#', 0x0b)
-+
-+/* FW_CDEV_VERSION History
-+ *
-+ * 1	Feb 18, 2007:  Initial version.
-+ */
-+#define FW_CDEV_VERSION		1
-+
-+struct fw_cdev_get_info {
-+	/* The version field is just a running serial number.  We
-+	 * never break backwards compatibility.  Userspace passes in
-+	 * the version it expects and the kernel passes back the
-+	 * highest version it can provide.  Even if the structs in
-+	 * this interface are extended in a later version, the kernel
-+	 * will not copy back more data than what was present in the
-+	 * interface version userspace expects. */
-+	__u32 version;
-+
-+	/* If non-zero, at most rom_length bytes of config rom will be
-+	 * copied into that user space address.  In either case,
-+	 * rom_length is updated with the actual length of the config
-+	 * rom. */
-+	__u32 rom_length;
-+	__u64 rom;
-+
-+	/* If non-zero, a fw_cdev_event_bus_reset struct will be
-+	 * copied here with the current state of the bus.  This does
-+	 * not cause a bus reset to happen.  The value of closure in
-+	 * this and sub-sequent bus reset events is set to
-+	 * bus_reset_closure. */
-+	__u64 bus_reset;
-+	__u64 bus_reset_closure;
-+
-+	/* The index of the card this devices belongs to. */
-+	__u32 card;
-+};
-+
-+struct fw_cdev_send_request {
-+	__u32 tcode;
-+	__u32 length;
-+	__u64 offset;
-+	__u64 closure;
-+	__u64 data;
-+	__u32 generation;
-+};
-+
-+struct fw_cdev_send_response {
-+	__u32 rcode;
-+	__u32 length;
-+	__u64 data;
-+	__u32 handle;
-+};
-+
-+struct fw_cdev_allocate {
-+	__u64 offset;
-+	__u64 closure;
-+	__u32 length;
-+	__u32 handle;
-+};
-+
-+struct fw_cdev_deallocate {
-+	__u32 handle;
-+};
-+
-+#define FW_CDEV_LONG_RESET	0
-+#define FW_CDEV_SHORT_RESET	1
-+
-+struct fw_cdev_initiate_bus_reset {
-+	__u32 type;
-+};
-+
-+struct fw_cdev_add_descriptor {
-+	__u32 immediate;
-+	__u32 key;
-+	__u64 data;
-+	__u32 length;
-+	__u32 handle;
-+};
-+
-+struct fw_cdev_remove_descriptor {
-+	__u32 handle;
-+};
-+
-+#define FW_CDEV_ISO_CONTEXT_TRANSMIT	0
-+#define FW_CDEV_ISO_CONTEXT_RECEIVE	1
-+
-+#define FW_CDEV_ISO_CONTEXT_MATCH_TAG0		 1
-+#define FW_CDEV_ISO_CONTEXT_MATCH_TAG1		 2
-+#define FW_CDEV_ISO_CONTEXT_MATCH_TAG2		 4
-+#define FW_CDEV_ISO_CONTEXT_MATCH_TAG3		 8
-+#define FW_CDEV_ISO_CONTEXT_MATCH_ALL_TAGS	15
-+
-+struct fw_cdev_create_iso_context {
-+	__u32 type;
-+	__u32 header_size;
-+	__u32 channel;
-+	__u32 speed;
-+};
-+
-+struct fw_cdev_iso_packet {
-+	__u16 payload_length;	/* Length of indirect payload. */
-+	__u32 interrupt : 1;	/* Generate interrupt on this packet */
-+	__u32 skip : 1;		/* Set to not send packet at all. */
-+	__u32 tag : 2;
-+	__u32 sy : 4;
-+	__u32 header_length : 8;	/* Length of immediate header. */
-+	__u32 header[0];
-+};
-+
-+struct fw_cdev_queue_iso {
-+	__u64 packets;
-+	__u64 data;
-+	__u32 size;
-+};
-+
-+struct fw_cdev_start_iso {
-+	__s32 cycle;
-+	__u32 sync;
-+	__u32 tags;
-+};
-+
-+#endif /* __fw_cdev_h */
++};
 diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c
 new file mode 100644
-index 0000000..7197657
+index 0000000..7503b8d
 --- /dev/null
 +++ b/drivers/firewire/fw-device.c
-@@ -0,0 +1,780 @@
+@@ -0,0 +1,781 @@
 +/*						-*- c-basic-offset: 8 -*-
 + *
 + * fw-device.c - Device probing and sysfs code.
@@ -2444,6 +2157,7 @@
 +	return 0;
 +}
 +
++static DECLARE_RWSEM(idr_rwsem);
 +static DEFINE_IDR(fw_device_idr);
 +int fw_cdev_major;
 +
@@ -2451,9 +2165,9 @@
 +{
 +	struct fw_device *device;
 +
-+	down_read(&fw_bus_type.subsys.rwsem);
++	down_read(&idr_rwsem);
 +	device = idr_find(&fw_device_idr, MINOR(devt));
-+	up_read(&fw_bus_type.subsys.rwsem);
++	up_read(&idr_rwsem);
 +
 +	return device;
 +}
@@ -2464,9 +2178,9 @@
 +		container_of(work, struct fw_device, work.work);
 +	int minor = MINOR(device->device.devt);
 +
-+	down_write(&fw_bus_type.subsys.rwsem);
++	down_write(&idr_rwsem);
 +	idr_remove(&fw_device_idr, minor);
-+	up_write(&fw_bus_type.subsys.rwsem);
++	up_write(&idr_rwsem);
 +
 +	fw_device_cdev_remove(device);
 +	device_for_each_child(&device->device, NULL, shutdown_unit);
@@ -2515,10 +2229,10 @@
 +	}
 +
 +	err = -ENOMEM;
-+	down_write(&fw_bus_type.subsys.rwsem);
++	down_write(&idr_rwsem);
 +	if (idr_pre_get(&fw_device_idr, GFP_KERNEL))
 +		err = idr_get_new(&fw_device_idr, device, &minor);
-+	up_write(&fw_bus_type.subsys.rwsem);
++	up_write(&idr_rwsem);
 +	if (err < 0)
 +		goto error;
 +
@@ -2564,9 +2278,9 @@
 +	return;
 +
 + error_with_cdev:
-+	down_write(&fw_bus_type.subsys.rwsem);
++	down_write(&idr_rwsem);
 +	idr_remove(&fw_device_idr, minor);
-+	up_write(&fw_bus_type.subsys.rwsem);
++	up_write(&idr_rwsem);
 + error:
 +	put_device(&device->device);
 +}
@@ -8272,3 +7986,276 @@
  config IEEE1394
  	tristate "IEEE 1394 (FireWire) support"
  	depends on PCI || BROKEN
+diff --git a/include/linux/firewire-cdev.h b/include/linux/firewire-cdev.h
+new file mode 100644
+index 0000000..1fbd8bf
+--- /dev/null
++++ b/include/linux/firewire-cdev.h
+@@ -0,0 +1,267 @@
++/*						-*- c-basic-offset: 8 -*-
++ *
++ * fw-device-cdev.h -- Char device interface.
++ *
++ * Copyright (C) 2005-2006  Kristian Hoegsberg <krh at bitplanet.net>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * 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 __fw_cdev_h
++#define __fw_cdev_h
++
++#include <asm/ioctl.h>
++#include <asm/types.h>
++
++#define TCODE_WRITE_QUADLET_REQUEST	0
++#define TCODE_WRITE_BLOCK_REQUEST	1
++#define TCODE_WRITE_RESPONSE		2
++#define TCODE_READ_QUADLET_REQUEST	4
++#define TCODE_READ_BLOCK_REQUEST	5
++#define TCODE_READ_QUADLET_RESPONSE	6
++#define TCODE_READ_BLOCK_RESPONSE	7
++#define TCODE_CYCLE_START		8
++#define TCODE_LOCK_REQUEST		9
++#define TCODE_STREAM_DATA		10
++#define TCODE_LOCK_RESPONSE		11
++
++#define TCODE_LOCK_MASK_SWAP		0x11
++#define TCODE_LOCK_COMPARE_SWAP		0x12
++#define TCODE_LOCK_FETCH_ADD		0x13
++#define TCODE_LOCK_LITTLE_ADD		0x14
++#define TCODE_LOCK_BOUNDED_ADD		0x15
++#define TCODE_LOCK_WRAP_ADD		0x16
++#define TCODE_LOCK_VENDOR_DEPENDENT	0x17
++
++#define RCODE_COMPLETE			0x0
++#define RCODE_CONFLICT_ERROR		0x4
++#define RCODE_DATA_ERROR		0x5
++#define RCODE_TYPE_ERROR		0x6
++#define RCODE_ADDRESS_ERROR		0x7
++
++#define RCODE_SEND_ERROR		0x10
++#define RCODE_CANCELLED			0x11
++#define RCODE_BUSY			0x12
++#define RCODE_GENERATION		0x13
++#define RCODE_NO_ACK			0x14
++
++#define SCODE_100			0x0
++#define SCODE_200			0x1
++#define SCODE_400			0x2
++#define SCODE_800			0x3
++#define SCODE_1600			0x4
++#define SCODE_3200			0x5
++
++#define FW_CDEV_EVENT_BUS_RESET		0x00
++#define FW_CDEV_EVENT_RESPONSE		0x01
++#define FW_CDEV_EVENT_REQUEST		0x02
++#define FW_CDEV_EVENT_ISO_INTERRUPT	0x03
++
++/* The 'closure' fields are for user space to use.  Data passed in the
++ * 'closure' field for a request will be returned in the corresponding
++ * event.  It's a 64-bit type so that it's a fixed size type big
++ * enough to hold a pointer on all platforms. */
++
++struct fw_cdev_event_common {
++	__u64 closure;
++	__u32 type;
++};
++
++struct fw_cdev_event_bus_reset {
++	__u64 closure;
++	__u32 type;
++	__u32 node_id;
++	__u32 local_node_id;
++	__u32 bm_node_id;
++	__u32 irm_node_id;
++	__u32 root_node_id;
++	__u32 generation;
++};
++
++struct fw_cdev_event_response {
++	__u64 closure;
++	__u32 type;
++	__u32 rcode;
++	__u32 length;
++	__u32 data[0];
++};
++
++struct fw_cdev_event_request {
++	__u64 closure;
++	__u32 type;
++	__u32 tcode;
++	__u64 offset;
++	__u32 handle;
++	__u32 length;
++	__u32 data[0];
++};
++
++struct fw_cdev_event_iso_interrupt {
++	__u64 closure;
++	__u32 type;
++	__u32 cycle;
++	__u32 header_length;	/* Length in bytes of following headers. */
++	__u32 header[0];
++};
++
++union fw_cdev_event {
++	struct fw_cdev_event_common common;
++	struct fw_cdev_event_bus_reset bus_reset;
++	struct fw_cdev_event_response response;
++	struct fw_cdev_event_request request;
++	struct fw_cdev_event_iso_interrupt iso_interrupt;
++};
++
++#define FW_CDEV_IOC_GET_INFO		_IOWR('#', 0x00, struct fw_cdev_get_info)
++#define FW_CDEV_IOC_SEND_REQUEST	_IOW('#', 0x01, struct fw_cdev_send_request)
++#define FW_CDEV_IOC_ALLOCATE		_IOWR('#', 0x02, struct fw_cdev_allocate)
++#define FW_CDEV_IOC_DEALLOCATE		_IOW('#', 0x03, struct fw_cdev_deallocate)
++#define FW_CDEV_IOC_SEND_RESPONSE	_IOW('#', 0x04, struct fw_cdev_send_response)
++#define FW_CDEV_IOC_INITIATE_BUS_RESET	_IOW('#', 0x05, struct fw_cdev_initiate_bus_reset)
++#define FW_CDEV_IOC_ADD_DESCRIPTOR	_IOWR('#', 0x06, struct fw_cdev_add_descriptor)
++#define FW_CDEV_IOC_REMOVE_DESCRIPTOR	_IOW('#', 0x07, struct fw_cdev_remove_descriptor)
++
++#define FW_CDEV_IOC_CREATE_ISO_CONTEXT	_IOW('#', 0x08, struct fw_cdev_create_iso_context)
++#define FW_CDEV_IOC_QUEUE_ISO		_IOWR('#', 0x09, struct fw_cdev_queue_iso)
++#define FW_CDEV_IOC_START_ISO		_IOW('#', 0x0a, struct fw_cdev_start_iso)
++#define FW_CDEV_IOC_STOP_ISO		_IOW('#', 0x0b, struct fw_cdev_stop_iso)
++
++/* FW_CDEV_VERSION History
++ *
++ * 1	Feb 18, 2007:  Initial version.
++ */
++#define FW_CDEV_VERSION		1
++
++struct fw_cdev_get_info {
++	/* The version field is just a running serial number.  We
++	 * never break backwards compatibility.  Userspace passes in
++	 * the version it expects and the kernel passes back the
++	 * highest version it can provide.  Even if the structs in
++	 * this interface are extended in a later version, the kernel
++	 * will not copy back more data than what was present in the
++	 * interface version userspace expects. */
++	__u32 version;
++
++	/* If non-zero, at most rom_length bytes of config rom will be
++	 * copied into that user space address.  In either case,
++	 * rom_length is updated with the actual length of the config
++	 * rom. */
++	__u32 rom_length;
++	__u64 rom;
++
++	/* If non-zero, a fw_cdev_event_bus_reset struct will be
++	 * copied here with the current state of the bus.  This does
++	 * not cause a bus reset to happen.  The value of closure in
++	 * this and sub-sequent bus reset events is set to
++	 * bus_reset_closure. */
++	__u64 bus_reset;
++	__u64 bus_reset_closure;
++
++	/* The index of the card this devices belongs to. */
++	__u32 card;
++};
++
++struct fw_cdev_send_request {
++	__u32 tcode;
++	__u32 length;
++	__u64 offset;
++	__u64 closure;
++	__u64 data;
++	__u32 generation;
++};
++
++struct fw_cdev_send_response {
++	__u32 rcode;
++	__u32 length;
++	__u64 data;
++	__u32 handle;
++};
++
++struct fw_cdev_allocate {
++	__u64 offset;
++	__u64 closure;
++	__u32 length;
++	__u32 handle;
++};
++
++struct fw_cdev_deallocate {
++	__u32 handle;
++};
++
++#define FW_CDEV_LONG_RESET	0
++#define FW_CDEV_SHORT_RESET	1
++
++struct fw_cdev_initiate_bus_reset {
++	__u32 type;
++};
++
++struct fw_cdev_add_descriptor {
++	__u32 immediate;
++	__u32 key;
++	__u64 data;
++	__u32 length;
++	__u32 handle;
++};
++
++struct fw_cdev_remove_descriptor {
++	__u32 handle;
++};
++
++#define FW_CDEV_ISO_CONTEXT_TRANSMIT	0
++#define FW_CDEV_ISO_CONTEXT_RECEIVE	1
++
++#define FW_CDEV_ISO_CONTEXT_MATCH_TAG0		 1
++#define FW_CDEV_ISO_CONTEXT_MATCH_TAG1		 2
++#define FW_CDEV_ISO_CONTEXT_MATCH_TAG2		 4
++#define FW_CDEV_ISO_CONTEXT_MATCH_TAG3		 8
++#define FW_CDEV_ISO_CONTEXT_MATCH_ALL_TAGS	15
++
++struct fw_cdev_create_iso_context {
++	__u32 type;
++	__u32 header_size;
++	__u32 channel;
++	__u32 speed;
++	__u32 handle;
++};
++
++struct fw_cdev_iso_packet {
++	__u16 payload_length;	/* Length of indirect payload. */
++	__u32 interrupt : 1;	/* Generate interrupt on this packet */
++	__u32 skip : 1;		/* Set to not send packet at all. */
++	__u32 tag : 2;
++	__u32 sy : 4;
++	__u32 header_length : 8;	/* Length of immediate header. */
++	__u32 header[0];
++};
++
++struct fw_cdev_queue_iso {
++	__u64 packets;
++	__u64 data;
++	__u32 size;
++	__u32 handle;
++};
++
++struct fw_cdev_start_iso {
++	__s32 cycle;
++	__u32 sync;
++	__u32 tags;
++	__u32 handle;
++};
++
++struct fw_cdev_stop_iso {
++	__u32 handle;
++};
++
++#endif /* __fw_cdev_h */



From fedora-cvs-commits at redhat.com  Wed Apr 18 00:15:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 20:15:53 -0400
Subject: rpms/kudzu/devel .cvsignore, 1.149, 1.150 kudzu.spec, 1.170,
	1.171 sources, 1.166, 1.167
Message-ID: <200704180015.l3I0FruN028875@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28851

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
1.2.69-1

Resolves: Bug #236469



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- .cvsignore	14 Apr 2007 00:14:28 -0000	1.149
+++ .cvsignore	18 Apr 2007 00:15:51 -0000	1.150
@@ -1 +1 @@
-kudzu-1.2.68.tar.gz
+kudzu-1.2.69.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- kudzu.spec	14 Apr 2007 00:14:28 -0000	1.170
+++ kudzu.spec	18 Apr 2007 00:15:51 -0000	1.171
@@ -1,5 +1,5 @@
 Name: kudzu
-Version: 1.2.68
+Version: 1.2.69
 Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
@@ -72,6 +72,9 @@
 %{_includedir}/kudzu
 
 %changelog
+* Tue Apr 17 2007 Bill Nottingham <notting at redhat.com> - 1.2.69-1
+- PS3 support (#236469, <dwmw2 at redhat.com>)
+
 * Fri Apr 13 2007 Bill Nottingham <notting at redhat.com> - 1.2.68-1
 - pata_hpt* matching (#227281)
 - Fix size of memset in pci scanning (<pjones at redhat.com>)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- sources	14 Apr 2007 00:14:28 -0000	1.166
+++ sources	18 Apr 2007 00:15:51 -0000	1.167
@@ -1 +1 @@
-8a90261b4ca99ba65fbfdc99e7f97078  kudzu-1.2.68.tar.gz
+3b17644eea5aac0e1b9fd99f6cd6f978  kudzu-1.2.69.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 18 00:22:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 20:22:32 -0400
Subject: rpms/kudzu/devel sources,1.167,1.168
Message-ID: <200704180022.l3I0MWPv029007@cvs.devel.redhat.com>

Author: notting

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

Modified Files:
	sources 
Log Message:
fix build



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- sources	18 Apr 2007 00:15:51 -0000	1.167
+++ sources	18 Apr 2007 00:22:30 -0000	1.168
@@ -1 +1 @@
-3b17644eea5aac0e1b9fd99f6cd6f978  kudzu-1.2.69.tar.gz
+61351f6a756544a7cbd7f993ec09aac1  kudzu-1.2.69.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 18 00:25:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 20:25:47 -0400
Subject: rpms/xorg-x11-drv-nv/devel .cvsignore, 1.17, 1.18 nv.xinf, 1.9,
	1.10 sources, 1.17, 1.18 xorg-x11-drv-nv.spec, 1.40,
	1.41 nv-1.2.0-panel-range-hack.patch, 1.1, NONE
Message-ID: <200704180025.l3I0PlbN029126@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	.cvsignore nv.xinf sources xorg-x11-drv-nv.spec 
Removed Files:
	nv-1.2.0-panel-range-hack.patch 
Log Message:
auto-import xorg-x11-drv-nv-2.0.2-1.fc7 on branch devel from xorg-x11-drv-nv-2.0.2-1.fc7.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	30 Mar 2007 20:31:57 -0000	1.17
+++ .cvsignore	18 Apr 2007 00:25:45 -0000	1.18
@@ -1,2 +1,2 @@
-xf86-video-nv-2.0.1.tar.bz2
 nouveau-20070330.tar.bz2
+xf86-video-nv-2.0.2.tar.bz2


Index: nv.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/nv.xinf,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nv.xinf	23 Mar 2007 17:12:19 -0000	1.9
+++ nv.xinf	18 Apr 2007 00:25:45 -0000	1.10
@@ -159,10 +159,23 @@
 alias pcivideo:v000010DEd0000018Csv*sd*bc*sc*i* nv # nv18 GL
 alias pcivideo:v000010DEd0000018Dsv*sd*bc*sc*i* nv # nv18 M
 
+# preemptive strike against g80
+alias pcivideo:v000010DEd00000190sv*sd*bc*sc*i* nv # g80
 alias pcivideo:v000010DEd00000191sv*sd*bc*sc*i* nv # GeForce 8800 GTX
+alias pcivideo:v000010DEd00000192sv*sd*bc*sc*i* nv # g80
 alias pcivideo:v000010DEd00000193sv*sd*bc*sc*i* nv # GeForce 8800 GTS
+alias pcivideo:v000010DEd00000194sv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd00000195sv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd00000196sv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd00000197sv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd00000198sv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd00000199sv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd0000019Asv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd0000019Bsv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd0000019Csv*sd*bc*sc*i* nv # g80
 alias pcivideo:v000010DEd0000019Dsv*sd*bc*sc*i* nv # Quadro FX 5600
 alias pcivideo:v000010DEd0000019Esv*sd*bc*sc*i* nv # Quadro FX 4600
+alias pcivideo:v000010DEd0000019Fsv*sd*bc*sc*i* nv # g80
 
 alias pcivideo:v000010DEd000001A0sv*sd*bc*sc*i* nv # nv11
 
@@ -314,6 +327,42 @@
 alias pcivideo:v000010DEd000003D2sv*sd*bc*sc*i* nv # GF 6100 nForce 400
 alias pcivideo:v000010DEd000003D5sv*sd*bc*sc*i* nv # GF 6100 nForce 420
 
+# preemptive strike against g80.
+alias pcivideo:v000010DEd00000400sv*sd*bc*sc*i* nv # g80 official
+alias pcivideo:v000010DEd00000401sv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd00000402sv*sd*bc*sc*i* nv # g80 official
+alias pcivideo:v000010DEd00000403sv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd00000404sv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd00000405sv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd00000406sv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd00000407sv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd00000408sv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd00000409sv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd0000040Asv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd0000040Bsv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd0000040Csv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd0000040Dsv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd0000040Esv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd0000040Fsv*sd*bc*sc*i* nv # g80
+
+# preemptive strike against g80.
+alias pcivideo:v000010DEd00000420sv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd00000421sv*sd*bc*sc*i* nv # g80 official
+alias pcivideo:v000010DEd00000422sv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd00000423sv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd00000424sv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd00000425sv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd00000426sv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd00000427sv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd00000428sv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd00000429sv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd0000042Asv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd0000042Bsv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd0000042Csv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd0000042Dsv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd0000042Esv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd0000042Fsv*sd*bc*sc*i* nv # g80
+
 # SGS Thompson joint venture
 # This is a bit inaccurate - the driver only knows about 12d2:0018 -
 # but I'd rather get bug reports if these cards are actually in the field.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	30 Mar 2007 20:31:57 -0000	1.17
+++ sources	18 Apr 2007 00:25:45 -0000	1.18
@@ -1,2 +1,2 @@
-22079c0d0b479dcb36aedc11fcd6fd28  xf86-video-nv-2.0.1.tar.bz2
 cf1f7a86307e691f4b82ec8aadbd9087  nouveau-20070330.tar.bz2
+bbcf04a6b1b95c16bd9fa91e80cc5e43  xf86-video-nv-2.0.2.tar.bz2


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xorg-x11-drv-nv.spec	2 Apr 2007 15:46:01 -0000	1.40
+++ xorg-x11-drv-nv.spec	18 Apr 2007 00:25:45 -0000	1.41
@@ -8,8 +8,8 @@
 
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
-Version:   2.0.1
-Release:   3%{?dist}
+Version:   2.0.2
+Release:   1%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -29,7 +29,6 @@
 Requires:  kernel-drm-nouveau = 6
 
 Patch0:     nv-1.1.1-nv34-tweaks.patch
-Patch2:	    nv-1.2.0-panel-range-hack.patch
 
 %description 
 X.Org X11 nv video driver.
@@ -38,12 +37,10 @@
 %setup -q -n %{tarball}-%{version}
 
 %patch0 -p1 -b .nv34-tweak
-%patch2 -p1 -b .range-hack
 
 tar jxf %{SOURCE1}
 cd nouveau-%{gitdate}
 %patch0 -p1 -b .nv34-tweak
-%patch2 -p1 -b .range-hack
 
 %build
 %configure --disable-static
@@ -79,6 +76,11 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Tue Apr 17 2007 Adam Jackson <ajax at redhat.com> 2.0.2-1
+- nv 2.0.2
+- nv.xinf: PCI ID updates for yet more G80 cards.
+- Drop panel-range-hack, superceded upstream now.
+
 * Mon Apr  2 2007 Kristian H??gsberg <krh at redhat.com> - 2.0.1-3
 - Add nv patches to nouveau too.
 


--- nv-1.2.0-panel-range-hack.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 18 00:28:56 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 20:28:56 -0400
Subject: rpms/kudzu/devel sources,1.168,1.169
Message-ID: <200704180028.l3I0SuYP029237@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29223

Modified Files:
	sources 
Log Message:
fix build



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- sources	18 Apr 2007 00:22:30 -0000	1.168
+++ sources	18 Apr 2007 00:28:54 -0000	1.169
@@ -1 +1 @@
-61351f6a756544a7cbd7f993ec09aac1  kudzu-1.2.69.tar.gz
+50745d00912e947334bac1fb004629f6  kudzu-1.2.69.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 18 00:56:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 20:56:50 -0400
Subject: rpms/kernel/devel linux-2.6-firewire.patch,1.8,1.9
Message-ID: <200704180056.l3I0uoso029108@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	linux-2.6-firewire.patch 
Log Message:
Fix typos in firewire patch.

linux-2.6-firewire.patch:
 drivers/Makefile                  |    1 
 drivers/firewire/Kconfig          |   60 +
 drivers/firewire/Makefile         |   10 
 drivers/firewire/fw-card.c        |  544 ++++++++++
 drivers/firewire/fw-cdev.c        |  952 +++++++++++++++++++
 drivers/firewire/fw-device.c      |  781 +++++++++++++++
 drivers/firewire/fw-device.h      |  149 ++
 drivers/firewire/fw-iso.c         |  163 +++
 drivers/firewire/fw-ohci.c        | 1896 ++++++++++++++++++++++++++++++++++++++
 drivers/firewire/fw-ohci.h        |  153 +++
 drivers/firewire/fw-sbp2.c        | 1165 +++++++++++++++++++++++
 drivers/firewire/fw-topology.c    |  519 ++++++++++
 drivers/firewire/fw-topology.h    |   94 +
 drivers/firewire/fw-transaction.c |  889 +++++++++++++++++
 drivers/firewire/fw-transaction.h |  505 ++++++++++
 drivers/ieee1394/Kconfig          |    2 
 include/linux/firewire-cdev.h     |  267 +++++
 17 files changed, 8150 insertions(+)

Index: linux-2.6-firewire.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-firewire.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-firewire.patch	17 Apr 2007 23:58:34 -0000	1.8
+++ linux-2.6-firewire.patch	18 Apr 2007 00:56:48 -0000	1.9
@@ -644,10 +644,10 @@
 +EXPORT_SYMBOL(fw_core_initiate_bus_reset);
 diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c
 new file mode 100644
-index 0000000..3a3a42f
+index 0000000..91f6715
 --- /dev/null
 +++ b/drivers/firewire/fw-cdev.c
-@@ -0,0 +1,951 @@
+@@ -0,0 +1,952 @@
 +/*						-*- c-basic-offset: 8 -*-
 + *
 + * fw-device-cdev.c - Char device for device raw access
@@ -1457,20 +1457,21 @@
 +	char buffer[256];
 +	int retval;
 +
++	if (_IOC_TYPE(cmd) != '#' ||
++	    _IOC_NR(cmd) >= ARRAY_SIZE(ioctl_handlers))
++		return -EINVAL;
++
 +	if (_IOC_DIR(cmd) & _IOC_WRITE) {
 +		if (_IOC_SIZE(cmd) > sizeof buffer ||
 +		    copy_from_user(buffer, arg, _IOC_SIZE(cmd)))
 +			return -EFAULT;
 +	}
 +
-+	if (_IOC_TYPE(cmd) >= ARRAY_SIZE(ioctl_handlers))
-+		return -EINVAL;
-+
-+	retval = ioctl_handlers[_IOC_TYPE(cmd)](client, buffer);
++	retval = ioctl_handlers[_IOC_NR(cmd)](client, buffer);
 +	if (retval < 0)
 +		return retval;
 +
-+	if (_IOC_DIR(cmd) == _IOC_READ) {
++	if (_IOC_DIR(cmd) & _IOC_READ) {
 +		if (_IOC_SIZE(cmd) > sizeof buffer ||
 +		    copy_to_user(arg, buffer, _IOC_SIZE(cmd)))
 +			return -EFAULT;



From fedora-cvs-commits at redhat.com  Wed Apr 18 00:59:17 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 20:59:17 -0400
Subject: rpms/libraw1394/devel firewire-cdev.h, NONE,
	1.1 libraw1394-juju.patch, 1.5, 1.6 libraw1394.spec, 1.29,
	1.30 fw-device-cdev.h, 1.2, NONE
Message-ID: <200704180059.l3I0xH2X031022@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/libraw1394/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30985

Modified Files:
	libraw1394-juju.patch libraw1394.spec 
Added Files:
	firewire-cdev.h 
Removed Files:
	fw-device-cdev.h 
Log Message:
* Tue Apr 17 2007 Kristian H??gsberg <krh at redhat.com> - 1.2.1--6
- Update to latest ioctl changes.



--- NEW FILE firewire-cdev.h ---
/*						-*- c-basic-offset: 8 -*-
 *
 * fw-device-cdev.h -- Char device interface.
 *
 * Copyright (C) 2005-2006  Kristian Hoegsberg <krh at bitplanet.net>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * 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 __fw_cdev_h
#define __fw_cdev_h

#include <asm/ioctl.h>
#include <asm/types.h>

#define TCODE_WRITE_QUADLET_REQUEST	0
#define TCODE_WRITE_BLOCK_REQUEST	1
#define TCODE_WRITE_RESPONSE		2
#define TCODE_READ_QUADLET_REQUEST	4
#define TCODE_READ_BLOCK_REQUEST	5
#define TCODE_READ_QUADLET_RESPONSE	6
#define TCODE_READ_BLOCK_RESPONSE	7
#define TCODE_CYCLE_START		8
#define TCODE_LOCK_REQUEST		9
#define TCODE_STREAM_DATA		10
#define TCODE_LOCK_RESPONSE		11

#define TCODE_LOCK_MASK_SWAP		0x11
#define TCODE_LOCK_COMPARE_SWAP		0x12
#define TCODE_LOCK_FETCH_ADD		0x13
#define TCODE_LOCK_LITTLE_ADD		0x14
#define TCODE_LOCK_BOUNDED_ADD		0x15
#define TCODE_LOCK_WRAP_ADD		0x16
#define TCODE_LOCK_VENDOR_DEPENDENT	0x17

#define RCODE_COMPLETE			0x0
#define RCODE_CONFLICT_ERROR		0x4
#define RCODE_DATA_ERROR		0x5
#define RCODE_TYPE_ERROR		0x6
#define RCODE_ADDRESS_ERROR		0x7

#define RCODE_SEND_ERROR		0x10
#define RCODE_CANCELLED			0x11
#define RCODE_BUSY			0x12
#define RCODE_GENERATION		0x13
#define RCODE_NO_ACK			0x14

#define SCODE_100			0x0
#define SCODE_200			0x1
#define SCODE_400			0x2
#define SCODE_800			0x3
#define SCODE_1600			0x4
#define SCODE_3200			0x5

#define FW_CDEV_EVENT_BUS_RESET		0x00
#define FW_CDEV_EVENT_RESPONSE		0x01
#define FW_CDEV_EVENT_REQUEST		0x02
#define FW_CDEV_EVENT_ISO_INTERRUPT	0x03

/* The 'closure' fields are for user space to use.  Data passed in the
 * 'closure' field for a request will be returned in the corresponding
 * event.  It's a 64-bit type so that it's a fixed size type big
 * enough to hold a pointer on all platforms. */

struct fw_cdev_event_common {
	__u64 closure;
	__u32 type;
};

struct fw_cdev_event_bus_reset {
	__u64 closure;
	__u32 type;
	__u32 node_id;
	__u32 local_node_id;
	__u32 bm_node_id;
	__u32 irm_node_id;
	__u32 root_node_id;
	__u32 generation;
};

struct fw_cdev_event_response {
	__u64 closure;
	__u32 type;
	__u32 rcode;
	__u32 length;
	__u32 data[0];
};

struct fw_cdev_event_request {
	__u64 closure;
	__u32 type;
	__u32 tcode;
	__u64 offset;
	__u32 handle;
	__u32 length;
	__u32 data[0];
};

struct fw_cdev_event_iso_interrupt {
	__u64 closure;
	__u32 type;
	__u32 cycle;
	__u32 header_length;	/* Length in bytes of following headers. */
	__u32 header[0];
};

union fw_cdev_event {
	struct fw_cdev_event_common common;
	struct fw_cdev_event_bus_reset bus_reset;
	struct fw_cdev_event_response response;
	struct fw_cdev_event_request request;
	struct fw_cdev_event_iso_interrupt iso_interrupt;
};

#define FW_CDEV_IOC_GET_INFO		_IOWR('#', 0x00, struct fw_cdev_get_info)
#define FW_CDEV_IOC_SEND_REQUEST	_IOW('#', 0x01, struct fw_cdev_send_request)
#define FW_CDEV_IOC_ALLOCATE		_IOWR('#', 0x02, struct fw_cdev_allocate)
#define FW_CDEV_IOC_DEALLOCATE		_IOW('#', 0x03, struct fw_cdev_deallocate)
#define FW_CDEV_IOC_SEND_RESPONSE	_IOW('#', 0x04, struct fw_cdev_send_response)
#define FW_CDEV_IOC_INITIATE_BUS_RESET	_IOW('#', 0x05, struct fw_cdev_initiate_bus_reset)
#define FW_CDEV_IOC_ADD_DESCRIPTOR	_IOWR('#', 0x06, struct fw_cdev_add_descriptor)
#define FW_CDEV_IOC_REMOVE_DESCRIPTOR	_IOW('#', 0x07, struct fw_cdev_remove_descriptor)

#define FW_CDEV_IOC_CREATE_ISO_CONTEXT	_IOW('#', 0x08, struct fw_cdev_create_iso_context)
#define FW_CDEV_IOC_QUEUE_ISO		_IOWR('#', 0x09, struct fw_cdev_queue_iso)
#define FW_CDEV_IOC_START_ISO		_IOW('#', 0x0a, struct fw_cdev_start_iso)
#define FW_CDEV_IOC_STOP_ISO		_IOW('#', 0x0b, struct fw_cdev_stop_iso)

/* FW_CDEV_VERSION History
 *
 * 1	Feb 18, 2007:  Initial version.
 */
#define FW_CDEV_VERSION		1

struct fw_cdev_get_info {
	/* The version field is just a running serial number.  We
	 * never break backwards compatibility.  Userspace passes in
	 * the version it expects and the kernel passes back the
	 * highest version it can provide.  Even if the structs in
	 * this interface are extended in a later version, the kernel
	 * will not copy back more data than what was present in the
	 * interface version userspace expects. */
	__u32 version;

	/* If non-zero, at most rom_length bytes of config rom will be
	 * copied into that user space address.  In either case,
	 * rom_length is updated with the actual length of the config
	 * rom. */
	__u32 rom_length;
	__u64 rom;

	/* If non-zero, a fw_cdev_event_bus_reset struct will be
	 * copied here with the current state of the bus.  This does
	 * not cause a bus reset to happen.  The value of closure in
	 * this and sub-sequent bus reset events is set to
	 * bus_reset_closure. */
	__u64 bus_reset;
	__u64 bus_reset_closure;

	/* The index of the card this devices belongs to. */
	__u32 card;
};

struct fw_cdev_send_request {
	__u32 tcode;
	__u32 length;
	__u64 offset;
	__u64 closure;
	__u64 data;
	__u32 generation;
};

struct fw_cdev_send_response {
	__u32 rcode;
	__u32 length;
	__u64 data;
	__u32 handle;
};

struct fw_cdev_allocate {
	__u64 offset;
	__u64 closure;
	__u32 length;
	__u32 handle;
};

struct fw_cdev_deallocate {
	__u32 handle;
};

#define FW_CDEV_LONG_RESET	0
#define FW_CDEV_SHORT_RESET	1

struct fw_cdev_initiate_bus_reset {
	__u32 type;
};

struct fw_cdev_add_descriptor {
	__u32 immediate;
	__u32 key;
	__u64 data;
	__u32 length;
	__u32 handle;
};

struct fw_cdev_remove_descriptor {
	__u32 handle;
};

#define FW_CDEV_ISO_CONTEXT_TRANSMIT	0
#define FW_CDEV_ISO_CONTEXT_RECEIVE	1

#define FW_CDEV_ISO_CONTEXT_MATCH_TAG0		 1
#define FW_CDEV_ISO_CONTEXT_MATCH_TAG1		 2
#define FW_CDEV_ISO_CONTEXT_MATCH_TAG2		 4
#define FW_CDEV_ISO_CONTEXT_MATCH_TAG3		 8
#define FW_CDEV_ISO_CONTEXT_MATCH_ALL_TAGS	15

struct fw_cdev_create_iso_context {
	__u32 type;
	__u32 header_size;
	__u32 channel;
	__u32 speed;
	__u32 handle;
};

struct fw_cdev_iso_packet {
	__u16 payload_length;	/* Length of indirect payload. */
	__u32 interrupt : 1;	/* Generate interrupt on this packet */
	__u32 skip : 1;		/* Set to not send packet at all. */
	__u32 tag : 2;
	__u32 sy : 4;
	__u32 header_length : 8;	/* Length of immediate header. */
	__u32 header[0];
};

struct fw_cdev_queue_iso {
	__u64 packets;
	__u64 data;
	__u32 size;
	__u32 handle;
};

struct fw_cdev_start_iso {
	__s32 cycle;
	__u32 sync;
	__u32 tags;
	__u32 handle;
};

struct fw_cdev_stop_iso {
	__u32 handle;
};

#endif /* __fw_cdev_h */

libraw1394-juju.patch:
 Makefile.am        |    3 
 configure.ac       |   22 
 juju/Makefile.am   |    8 
 juju/juju.h        |  143 +++++
 juju/raw1394-iso.c |  522 +++++++++++++++++++
 juju/raw1394.c     | 1441 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 tools/Makefile.am  |    2 
 tools/testlibraw.c |   76 ++
 8 files changed, 2198 insertions(+), 19 deletions(-)

Index: libraw1394-juju.patch
===================================================================
RCS file: /cvs/dist/rpms/libraw1394/devel/libraw1394-juju.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libraw1394-juju.patch	12 Apr 2007 21:24:30 -0000	1.5
+++ libraw1394-juju.patch	18 Apr 2007 00:59:15 -0000	1.6
@@ -67,7 +67,7 @@
 +pkginclude_HEADERS = ../src/raw1394.h ../src/csr.h ../src/ieee1394.h
 diff --git a/juju/juju.h b/juju/juju.h
 new file mode 100644
-index 0000000..d78d362
+index 0000000..c7a2ebd
 --- /dev/null
 +++ b/juju/juju.h
 @@ -0,0 +1,143 @@
@@ -97,7 +97,7 @@
 +
 +#include <stdlib.h>
 +#include <byteswap.h>
-+#include <fw-device-cdev.h>
++#include <linux/firewire-cdev.h>
 +#include "../src/raw1394.h"
 +#include "../src/csr.h"
 +#include "config.h"
@@ -216,10 +216,10 @@
 +#endif
 diff --git a/juju/raw1394-iso.c b/juju/raw1394-iso.c
 new file mode 100644
-index 0000000..a320440
+index 0000000..5e18dab
 --- /dev/null
 +++ b/juju/raw1394-iso.c
-@@ -0,0 +1,513 @@
+@@ -0,0 +1,522 @@
 +/*						-*- c-basic-offset: 8 -*-
 + *
 + * raw1394-iso.c -- Emulation of the raw1394 rawiso API on the juju stack
@@ -288,6 +288,7 @@
 +		queue_iso.packets = ptr_to_u64(handle->iso.packets);
 +		queue_iso.size    = handle->iso.packet_index * sizeof handle->iso.packets[0];
 +		queue_iso.data    = ptr_to_u64(handle->iso.first_payload);
++		queue_iso.handle  = 0;
 +		handle->iso.packet_index = 0;
 +		handle->iso.first_payload = handle->iso.head;
 +
@@ -346,7 +347,8 @@
 +	queue_xmit_packets(handle, prebuffer_packets);
 +
 +	if (handle->iso.prebuffer <= handle->iso.packet_count) {
-+		start_iso.cycle = start_on_cycle;
++		start_iso.cycle  = start_on_cycle;
++		start_iso.handle = 0;
 +
 +		retval = ioctl(handle->iso.fd,
 +			       FW_CDEV_IOC_START_ISO, &start_iso);
@@ -434,6 +436,7 @@
 +		tag_mask == -1 ? FW_CDEV_ISO_CONTEXT_MATCH_ALL_TAGS : tag_mask;
 +	/* sync is documented as 'not used' */
 +	start_iso.sync = 0;
++	start_iso.handle = 0;
 +
 +	return ioctl(handle->iso.fd, FW_CDEV_IOC_START_ISO, &start_iso);
 +}
@@ -492,7 +495,8 @@
 +	    handle->iso.packet_count >= handle->iso.prebuffer) {
 +		/* Set this to 0 to indicate that we're running. */
 +		handle->iso.prebuffer = 0;
-+		start_iso.cycle = handle->iso.start_on_cycle;
++		start_iso.cycle  = handle->iso.start_on_cycle;
++		start_iso.handle = 0;
 +
 +		len = ioctl(handle->iso.fd,
 +			       FW_CDEV_IOC_START_ISO, &start_iso);
@@ -519,6 +523,7 @@
 +	queue_iso.packets = ptr_to_u64(&skip);
 +	queue_iso.size    = sizeof skip;
 +	queue_iso.data    = 0;
++	queue_iso.handle  = 0;
 +
 +	len = ioctl(handle->iso.fd, FW_CDEV_IOC_QUEUE_ISO, &queue_iso);
 +	if (len < 0)
@@ -718,7 +723,11 @@
 +
 +void raw1394_iso_stop(raw1394handle_t handle)
 +{
++	struct fw_cdev_stop_iso stop_iso;
++
++	stop_iso.handle = 0;
 +	ioctl(handle->iso.fd, FW_CDEV_IOC_STOP_ISO);
++
 +	handle->iso.head = handle->iso.buffer;
 +	handle->iso.tail = handle->iso.buffer;
 +	handle->iso.first_payload = handle->iso.buffer;


Index: libraw1394.spec
===================================================================
RCS file: /cvs/dist/rpms/libraw1394/devel/libraw1394.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- libraw1394.spec	12 Apr 2007 21:30:02 -0000	1.29
+++ libraw1394.spec	18 Apr 2007 00:59:15 -0000	1.30
@@ -1,7 +1,7 @@
 Summary:        Library providing low-level IEEE-1394 access
 Name:           libraw1394
 Version:        1.2.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 Source:         http://www.linux1394.org/dl/libraw1394-%{version}.tar.gz
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	autoconf automake libtool
 
-Source1:	fw-device-cdev.h
+Source1:	firewire-cdev.h
 Patch0:		libraw1394-juju.patch
 Requires:	kernel >= 2.6.20-1.3062.fc7
 
@@ -33,8 +33,10 @@
 
 %build
 
-test -e %{_builddir}/fw-device-cdev.h || \
-	cp %{_sourcedir}/fw-device-cdev.h %{_builddir}
+if test ! -e %{_builddir}/linux/firewire-cdev.h; then
+	mkdir %{_builddir}/linux
+	cp %{_sourcedir}/firewire-cdev.h %{_builddir}/linux
+fi
 
 aclocal
 autoheader
@@ -76,6 +78,9 @@
 
 
 %changelog
+* Tue Apr 17 2007 Kristian H??gsberg <krh at redhat.com> - 1.2.1--6
+- Update to latest ioctl changes.
+
 * Thu Apr 12 2007 Kristian H??gsberg <krh at redhat.com> - 1.2.1-5
 - Make rawiso support actually work.
 - Update fw-device-cdev.h to sync with latest kernel patch.


--- fw-device-cdev.h DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 18 01:36:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 21:36:49 -0400
Subject: rpms/hal/devel hal.spec,1.127,1.128 sources,1.48,1.49
Message-ID: <200704180136.l3I1annZ027010@cvs.devel.redhat.com>

Author: davidz

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

Modified Files:
	hal.spec sources 
Log Message:
* Tue Apr 17 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-4
- Rebuild without hal-info bits and Require new package hal-info (#230707)




Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- hal.spec	12 Apr 2007 20:17:38 -0000	1.127
+++ hal.spec	18 Apr 2007 01:36:47 -0000	1.128
@@ -21,17 +21,14 @@
 
 %define hal_user_uid            68
 
-%define hal_info_version        20070402
-
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://people.freedesktop.org/~david/dist/%{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
 Source2: hal-device-manager.desktop
-Source3: http://people.freedesktop.org/~david/dist/hal-info-%{hal_info_version}.tar.gz
 Patch0: hal-0.5.9-fixes.patch
 
 License: AFL/GPL
@@ -81,6 +78,7 @@
 Requires: ConsoleKit >= %{consolekit_version}
 Requires: acl >= %{acl_version}
 Requires: hal-libs = %{version}-%{release}
+Requires: hal-info
 Obsoletes: %{name} < 0.5.9-1
 
 %description
@@ -127,15 +125,12 @@
 API docs for HAL.
 
 %prep
-%setup -q -a 3
+%setup -q
 %patch0 -p 1 -b .fixes
 
 %build
 %configure --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version} --with-os-type=redhat --enable-console-kit --enable-acl-management --enable-umount-helper --enable-acpi-ibm --enable-acpi-toshiba --with-eject=/usr/sbin/eject
 
-cd hal-info-%{hal_info_version}
-%configure
-
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
@@ -152,9 +147,6 @@
 
 %find_lang hal
 
-cd hal-info-%{hal_info_version}
-make install DESTDIR=$RPM_BUILD_ROOT
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -268,6 +260,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Tue Apr 17 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-4
+- Rebuild without hal-info bits and Require new package hal-info (#230707)
+
 * Thu Apr 12 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-3
 - Add patches from 0.5.9 stable branch
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	3 Apr 2007 05:23:37 -0000	1.48
+++ sources	18 Apr 2007 01:36:47 -0000	1.49
@@ -1,2 +1 @@
 a6f532770cf9286e1de38d6570cbc6bc  hal-0.5.9.tar.gz
-21dbda966482245c42c0356e087417dd  hal-info-20070402.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 18 02:04:20 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 22:04:20 -0400
Subject: rpms/g-wrap/devel g-wrap-1.9.6-shaddup.patch, NONE, 1.1 g-wrap.spec,
	1.36, 1.37
Message-ID: <200704180204.l3I24Khq021050@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/g-wrap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21034

Modified Files:
	g-wrap.spec 
Added Files:
	g-wrap-1.9.6-shaddup.patch 
Log Message:
add the patch that fixes the build with -Werror


g-wrap-1.9.6-shaddup.patch:
 core-runtime.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE g-wrap-1.9.6-shaddup.patch ---
--- g-wrap-1.9.6/g-wrap/core-runtime.c.foo	2007-01-16 23:40:25.000000000 -0500
+++ g-wrap-1.9.6/g-wrap/core-runtime.c	2007-01-16 23:40:52.000000000 -0500
@@ -49,10 +49,11 @@
 gw_raise_error (GWLangArena arena, const char *proc, const char *fmt, ...)
 {
   char *message = NULL;
+  int x;
   va_list args;
 
   va_start (args, fmt);
-  vasprintf (&message, fmt, args);
+  x = vasprintf (&message, fmt, args);
   va_end (args);
   
   gw_lang->raise_error (arena, proc, message);


Index: g-wrap.spec
===================================================================
RCS file: /cvs/dist/rpms/g-wrap/devel/g-wrap.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- g-wrap.spec	18 Jan 2007 17:21:58 -0000	1.36
+++ g-wrap.spec	18 Apr 2007 02:04:17 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: A tool for creating Scheme interfaces to C libraries
 Name: g-wrap
 Version: 1.9.6
-Release: 9
+Release: 10
 Group: Development/Libraries
 License: GPL
 Requires: guile



From fedora-cvs-commits at redhat.com  Wed Apr 18 03:30:48 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 17 Apr 2007 23:30:48 -0400
Subject: rpms/control-center/devel control-center-2.18.0-be-more-async.patch,
	1.2, 1.3 control-center.spec, 1.245, 1.246
Message-ID: <200704180330.l3I3Umaa012755@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12571

Modified Files:
	control-center-2.18.0-be-more-async.patch control-center.spec 
Log Message:
- clean up be-more-async patch to have less repetitive code 


control-center-2.18.0-be-more-async.patch:
 gnome-settings-daemon.c |  282 +++++++++++++++++++++++++++++-------------------
 1 files changed, 173 insertions(+), 109 deletions(-)

Index: control-center-2.18.0-be-more-async.patch
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center-2.18.0-be-more-async.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- control-center-2.18.0-be-more-async.patch	17 Apr 2007 22:21:45 -0000	1.2
+++ control-center-2.18.0-be-more-async.patch	18 Apr 2007 03:30:45 -0000	1.3
@@ -1,17 +1,48 @@
 --- control-center-2.18.0/gnome-settings-daemon/gnome-settings-daemon.c.be-more-async	2007-01-02 07:47:00.000000000 -0500
-+++ control-center-2.18.0/gnome-settings-daemon/gnome-settings-daemon.c	2007-04-17 18:14:47.000000000 -0400
-@@ -255,15 +255,177 @@
- G_DEFINE_TYPE (GnomeSettingsDaemon, gnome_settings_daemon,
-                G_TYPE_OBJECT)
++++ control-center-2.18.0/gnome-settings-daemon/gnome-settings-daemon.c	2007-04-17 23:25:30.000000000 -0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright ?? 2001 Red Hat, Inc.
++ * Copyright ?? 2001, 2007 Red Hat, Inc.
+  *
+  * Permission to use, copy, modify, distribute, and sell this software and its
+  * documentation for any purpose is hereby granted without fee, provided that
+@@ -18,7 +18,7 @@
+  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
+  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  *
+- * Authors:  Owen Taylor, Havoc Pennington
++ * Authors:  Owen Taylor, Havoc Pennington, Ray Strode
+  */
+ #include <config.h>
+ #include <stdlib.h>
+@@ -61,16 +61,67 @@
  
-+static void load_subsystems (void);
-+static void watch_for_xsetting_changes (void);
+ #include "clipboard-manager.h"
+ 
+-static GObjectClass *parent_class = NULL;
+-
+ struct _GnomeSettingsDaemonPrivate {
+-	int dummy;
++  GObject *dbus_service;	
+ };
+ 
+ static GSList *directories = NULL;
+ XSettingsManager **managers = NULL;
+ static ClipboardManager *clipboard_manager;
+ 
++static gboolean process_action (guint action_number);
++static void queue_action (guint action_number);
++static void queue_transaction (void);
++
++static void watch_for_xsetting_changes (GConfClient *client);
 +static void watch_for_configuration_changes (GConfClient *client);
 +
-+typedef void (* GnomeSettingsSubsystemInitFunc) (GConfClient *client);
++typedef void (* GnomeSettingsActionFunc) (GConfClient *client);
 +
-+static GnomeSettingsSubsystemInitFunc subsystem_init_funcs[] = 
++static GnomeSettingsActionFunc transaction[] = 
 +{
++  /* Subsystem Initialization */
 +/*  gnome_settings_disk_init  */
 +  gnome_settings_font_init,
 +  gnome_settings_xsettings_init,
@@ -28,42 +59,12 @@
 +  gnome_settings_gtk1_theme_init,
 +  gnome_settings_xrdb_init,
 +  gnome_settings_typing_break_init,
-+  watch_for_configuration_changes,
-+  (GnomeSettingsSubsystemInitFunc) watch_for_xsetting_changes,
-+  (GnomeSettingsSubsystemInitFunc) load_subsystems,
-+  NULL
-+};
-+
-+static gboolean
-+call_init_func_and_queue_next (guint func_index)
-+{
-+  GConfClient *client;
-+
-+  client = gnome_settings_daemon_get_conf_client ();
-+
-+  subsystem_init_funcs[func_index] (client);
-+
-+  if (subsystem_init_funcs[func_index + 1] != NULL)
-+    g_idle_add ((GSourceFunc) call_init_func_and_queue_next,
-+                GUINT_TO_POINTER (func_index + 1));
-+  
-+  return FALSE;
-+}
-+
-+static void
-+initialize_subsystems (void)
-+{
-+  /* Essential - xkb initialization should happen before */
-+  gnome_settings_keyboard_xkb_set_post_activation_callback ((PostActivationCallback)gnome_settings_load_modmap_files, NULL);
-+
-+  g_idle_add ((GSourceFunc) call_init_func_and_queue_next,
-+              GUINT_TO_POINTER (0));
-+}
 +
-+typedef void (* GnomeSettingsSubsystemLoadFunc) (GConfClient *client);
++  /* Post initialization setup */
++  watch_for_configuration_changes,
++  watch_for_xsetting_changes,
 +
-+static GnomeSettingsSubsystemLoadFunc subsystem_load_funcs[] = 
-+{
++  /* Subsystem work */
 +/* gnome_settings_disk_load,*/
 +  gnome_settings_font_load,
 +  gnome_settings_xsettings_load,
@@ -83,31 +84,154 @@
 +  NULL
 +};
 +
-+static gboolean
-+call_load_func_and_queue_next (guint func_index)
-+{
-+  GConfClient *client;
+ typedef struct DirElement
+ {
+   char *dir;
+@@ -212,6 +263,8 @@
+     return GDK_FILTER_CONTINUE;
+ }
+ 
++G_DEFINE_TYPE (GnomeSettingsDaemon, gnome_settings_daemon, G_TYPE_OBJECT)
 +
-+  client = gnome_settings_daemon_get_conf_client ();
+ static void
+ finalize (GObject *object)
+ {
+@@ -219,19 +272,15 @@
+ 	int                  i;
+ 
+ 	daemon = GNOME_SETTINGS_DAEMON (object);
+-	if (daemon->private == NULL) {
+-	  return;
+-	}
+ 
+ 	for (i = 0; managers && managers [i]; i++)
+ 		xsettings_manager_destroy (managers [i]);
+ 
+ 	clipboard_manager_destroy (clipboard_manager);
+ 
+-	g_free (daemon->private);
+-	daemon->private = NULL;
++	g_object_unref (daemon->private->dbus_service);
+ 
+-	G_OBJECT_CLASS (parent_class)->finalize (object);
++	G_OBJECT_CLASS (gnome_settings_daemon_parent_class)->finalize (object);
+ }
+ 
+ static void
+@@ -243,103 +292,94 @@
+ 
+   object_class->finalize = finalize;
+ 
+-  parent_class = g_type_class_peek_parent (klass);
++  gnome_settings_daemon_parent_class = g_type_class_peek_parent (klass);
 +
-+  subsystem_load_funcs[func_index] (client);
++  g_type_class_add_private (object_class, 
++                            sizeof (GnomeSettingsDaemonPrivate));
+ }
+ 
+ static void
+ gnome_settings_daemon_init (GnomeSettingsDaemon *settings)
+ {
+-  settings->private = g_new (GnomeSettingsDaemonPrivate, 1);
++  settings->private = G_TYPE_INSTANCE_GET_PRIVATE (settings,
++                                                   GNOME_SETTINGS_DAEMON_TYPE,
++                                                   GnomeSettingsDaemonPrivate);
 +
-+  if (subsystem_load_funcs[func_index + 1] != NULL)
-+    g_idle_add ((GSourceFunc) call_load_func_and_queue_next,
-+                GUINT_TO_POINTER (func_index + 1));
-+  
-+  return FALSE;
-+}
++  settings->private->dbus_service = g_object_new (gnome_settings_server_get_type (), NULL);
 +
++  queue_transaction ();
+ }
+ 
+-G_DEFINE_TYPE (GnomeSettingsDaemon, gnome_settings_daemon,
+-               G_TYPE_OBJECT)
 +static void
-+load_subsystems (void)
++queue_action (guint action_number)
 +{
-+  g_idle_add ((GSourceFunc) call_load_func_and_queue_next,
-+              GUINT_TO_POINTER (0));
++  g_assert (action_number < G_N_ELEMENTS (transaction));
+ 
+-GObject *
+-gnome_settings_daemon_new (void)
++  if (transaction[action_number] == NULL)
++    return;
++
++  g_idle_add ((GSourceFunc) process_action, GUINT_TO_POINTER (action_number));
 +}
 +
++static gboolean
++process_action (guint action_number)
+ {
+-  gboolean terminated = FALSE;
++  GnomeSettingsActionFunc action;
+   GConfClient *client;
+-  GSList *list;
+-  GnomeSettingsDaemon *daemon;
+-  GdkDisplay *display;
+-  GObject *dbusServer;
+-  int i;
+-  int n_screens;
+ 
+-  display = gdk_display_get_default ();
+-  n_screens = gdk_display_get_n_screens (display);
++  g_assert (action_number < G_N_ELEMENTS (transaction));
+ 
+-  daemon = g_object_new (gnome_settings_daemon_get_type (), NULL);
++  action = transaction[action_number];
+ 
+-  if (xsettings_manager_check_running (
+-		gdk_x11_display_get_xdisplay (display),
+-		gdk_screen_get_number (gdk_screen_get_default ())))
+-    {
+-      fprintf (stderr, "You can only run one xsettings manager at a time; exiting\n");
+-      exit (1);
+-    }
++  g_assert (action != NULL);
+ 
+-  
+-  if (!terminated)
+-    {
+-      managers = g_new (XSettingsManager *, n_screens + 1);
++  client = gnome_settings_daemon_get_conf_client ();
++  action (client);
+ 
+-      for (i = 0; i < n_screens; i++)
+-        {
+-          GdkScreen *screen;
++  queue_action (action_number + 1);
+ 
+-          screen = gdk_display_get_screen (display, i);
++  return FALSE;
++}
+ 
+-          managers [i] = xsettings_manager_new (
+-				gdk_x11_display_get_xdisplay (display),
+-				gdk_screen_get_number (screen),
+-				terminate_cb, &terminated);
+-          if (!managers [i])
+-	    {
+-	      fprintf (stderr, "Could not create xsettings manager for screen %d!\n", i);
+-	      exit (1);
+-	    }
+-        }
 +static void
-+watch_for_xsetting_changes (void)
++queue_transaction (void)
++{
++  /* Essential - xkb initialization should happen before */
++  gnome_settings_keyboard_xkb_set_post_activation_callback ((PostActivationCallback)
++                                                            gnome_settings_load_modmap_files,
++                                                            NULL);
+ 
+-      g_assert (i == n_screens);
+-      managers [i] = NULL;
+-    }
++  /* queue first action in transaction array to run on idle and get the ball
++   * rolling (the first action will queue the second and so on)
++   */
++  queue_action (0);
++}
+ 
+-  if (!clipboard_manager_check_running (GDK_DISPLAY_XDISPLAY (display)))
++static void
++watch_for_xsetting_changes (GConfClient *client)
 +{
 +  GdkDisplay *display;
 +  int i;
@@ -117,79 +241,27 @@
 +  n_screens = gdk_display_get_n_screens (display);
 +
 +  for (i = 0; i < n_screens; i++) 
-+    {
+     {
+-      clipboard_manager = clipboard_manager_new (GDK_DISPLAY_XDISPLAY (display),
+-						 gdk_error_trap_push,
+-						 gdk_error_trap_pop,
+-						 clipboard_manager_terminate_cb,
+-						 clipboard_manager_watch_cb,
+-						 NULL);
+-    }
 +      GdkScreen *screen;
-+
+ 
+-  /* We use GConfClient not GConfClient because a cache isn't useful
+-   * for us
+-   */
+-  client = gnome_settings_daemon_get_conf_client ();
 +      screen = gdk_display_get_screen (display, i);
 +      gdk_window_add_filter (
 +		gdk_screen_get_root_window (screen),
 +		manager_event_filter, GINT_TO_POINTER (i));
 +    }
 +}
-+
-+static void
-+watch_for_configuration_changes (GConfClient *client)
-+{
-+  GSList *list;
-+
-+  for (list = directories; list; list = list->next)
-+    {
-+      GError *error = NULL;
-+      DirElement *dir_element = list->data;
-+
-+      gconf_client_add_dir (client,
-+			    dir_element->dir,
-+			    GCONF_CLIENT_PRELOAD_ONELEVEL,
-+			    NULL);
-+      
-+      gconf_client_notify_add (client,
-+                               dir_element->dir,
-+                               config_notify,
-+                               NULL,
-+			       NULL,
-+                               &error);
-+
-+      if (error)
-+        {
-+          fprintf (stderr, "Could not listen for changes to configuration in '%s': %s\n",
-+                   dir_element->dir, error->message);
-+          g_error_free (error);
-+        }
-+    }
-+}
-+
-+static gboolean
-+initialize_and_load (GnomeSettingsDaemon *daemon)
-+{
-+  GObject *dbus_service;
-+  
-+  dbus_service = g_object_new (gnome_settings_server_get_type (), NULL);
-+
-+  initialize_subsystems ();
-+  return FALSE;
-+}
-+
- GObject *
- gnome_settings_daemon_new (void)
- {
-   gboolean terminated = FALSE;
--  GConfClient *client;
--  GSList *list;
-   GnomeSettingsDaemon *daemon;
-   GdkDisplay *display;
--  GObject *dbusServer;
-   int i;
-   int n_screens;
- 
-@@ -316,86 +478,7 @@
- 						 NULL);
-     }
  
--  /* We use GConfClient not GConfClient because a cache isn't useful
--   * for us
--   */
--  client = gnome_settings_daemon_get_conf_client ();
--
 -/*  gnome_settings_disk_init (client);*/
 -  gnome_settings_font_init (client);
 -  gnome_settings_xsettings_init (client);
@@ -209,42 +281,62 @@
 -  gnome_settings_gtk1_theme_init (client);
 -  gnome_settings_xrdb_init (client);
 -  gnome_settings_typing_break_init (client);
--
--  for (list = directories; list; list = list->next)
--    {
--      GError *error = NULL;
--      DirElement *dir_element = list->data;
--
--      gconf_client_add_dir (client,
--			    dir_element->dir,
--			    GCONF_CLIENT_PRELOAD_ONELEVEL,
--			    NULL);
--      
--      gconf_client_notify_add (client,
--                               dir_element->dir,
--                               config_notify,
--                               NULL,
--			       NULL,
--                               &error);
--
--      if (error)
--        {
--          fprintf (stderr, "Could not listen for changes to configuration in '%s': %s\n",
--                   dir_element->dir, error->message);
--          g_error_free (error);
--        }
--    }
--
++static void
++watch_for_configuration_changes (GConfClient *client)
++{
++  GSList *list;
+ 
+   for (list = directories; list; list = list->next)
+     {
+@@ -365,37 +405,61 @@
+           g_error_free (error);
+         }
+     }
++}
+ 
 -  for (i = 0; i < n_screens; i++) 
--    {
--      GdkScreen *screen;
--
--      screen = gdk_display_get_screen (display, i);
++GObject *
++gnome_settings_daemon_new (void)
++{
++  gboolean terminated = FALSE;
++  GnomeSettingsDaemon *daemon;
++  GdkDisplay *display;
++  int i;
++  int n_screens;
++
++  display = gdk_display_get_default ();
++  n_screens = gdk_display_get_n_screens (display);
++
++  if (xsettings_manager_check_running (
++		gdk_x11_display_get_xdisplay (display),
++		gdk_screen_get_number (gdk_screen_get_default ())))
++    {
++      fprintf (stderr, "You can only run one xsettings manager at a time; exiting\n");
++      exit (1);
++    }
++
++  managers = g_new (XSettingsManager *, n_screens + 1);
++
++  for (i = 0; i < n_screens; i++)
+     {
+       GdkScreen *screen;
+ 
+       screen = gdk_display_get_screen (display, i);
 -      gdk_window_add_filter (
 -		gdk_screen_get_root_window (screen),
 -		manager_event_filter, GINT_TO_POINTER (i));
--    }
--
++
++      managers [i] = xsettings_manager_new (
++              gdk_x11_display_get_xdisplay (display),
++              gdk_screen_get_number (screen),
++              terminate_cb, &terminated);
++      if (!managers [i])
++        {
++          fprintf (stderr, "Could not create xsettings manager for screen %d!\n", i);
++          exit (1);
++        }
+     }
+ 
 -/*  gnome_settings_disk_load (client);*/
 -  gnome_settings_font_load (client);
 -  gnome_settings_xsettings_load (client);
@@ -263,9 +355,21 @@
 -  gnome_settings_gtk1_theme_load (client);
 -  gnome_settings_xrdb_load (client);
 -  gnome_settings_typing_break_load (client);
--
++  g_assert (i == n_screens);
++  managers [i] = NULL;
++
++  if (!clipboard_manager_check_running (GDK_DISPLAY_XDISPLAY (display)))
++    {
++      clipboard_manager = clipboard_manager_new (GDK_DISPLAY_XDISPLAY (display),
++						 gdk_error_trap_push,
++						 gdk_error_trap_pop,
++						 clipboard_manager_terminate_cb,
++						 clipboard_manager_watch_cb,
++						 NULL);
++    }
+ 
 -  dbusServer = g_object_new (gnome_settings_server_get_type (), NULL);
-+  g_idle_add ((GSourceFunc) initialize_and_load, daemon);
++  daemon = g_object_new (GNOME_SETTINGS_DAEMON_TYPE, NULL);
  
    return G_OBJECT (daemon);
  }


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- control-center.spec	17 Apr 2007 22:21:46 -0000	1.245
+++ control-center.spec	18 Apr 2007 03:30:45 -0000	1.246
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.18.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -328,6 +328,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr 17 2007 Ray Strode <rstrode at redhat.com> - 2.18.0-13
+- clean up be-more-async patch to have less repetitive code 
+
 * Tue Apr 17 2007 Ray Strode <rstrode at redhat.com> - 2.18.0-12
 - Make theme changes work again (among other things). 
   Bug 236752. 



From fedora-cvs-commits at redhat.com  Wed Apr 18 04:15:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 00:15:21 -0400
Subject: rpms/control-center/devel control-center.spec,1.246,1.247
Message-ID: <200704180415.l3I4FLcY012546@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12510

Modified Files:
	control-center.spec 
Log Message:
add upstream bug reference



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- control-center.spec	18 Apr 2007 03:30:45 -0000	1.246
+++ control-center.spec	18 Apr 2007 04:15:17 -0000	1.247
@@ -58,7 +58,7 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=425650
 Patch15: control-center-2.18.0-ellipsize-sound-devices.patch
 
-# http://
+# http://bugzilla.gnome.org/show_bug.cgi?id=430889
 Patch16: control-center-2.18.0-be-more-async.patch
 
 # call the Fedora/RHEL graphical passwd changing apps



From fedora-cvs-commits at redhat.com  Wed Apr 18 08:41:16 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 04:41:16 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch, 1.1, 1.2
Message-ID: <200704180841.l3I8fGY0017358@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch 
Log Message:
better x86_64 support

openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch:
 osl/unx/signal.c     |    0 
 sal/osl/unx/signal.c |  113 ++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 102 insertions(+), 11 deletions(-)

Index: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch	16 Apr 2007 10:06:28 -0000	1.1
+++ openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch	18 Apr 2007 08:41:13 -0000	1.2
@@ -4,7 +4,7 @@
 retrieving revision 1.32.14.1
 diff -u -r1.32.14.1 signal.c
 --- openoffice.org.orig/sal/osl/unx/signal.c	19 Jan 2007 11:43:41 -0000	1.32.14.1
-+++ openoffice.org/sal/osl/unx/signal.c	15 Apr 2007 15:55:35 -0000
++++ openoffice.org/sal/osl/unx/signal.c	18 Apr 2007 08:37:08 -0000
 @@ -41,6 +41,7 @@
  
  #ifdef LINUX
@@ -22,13 +22,13 @@
 +typedef struct
 +{
 +    const char *name;
-+    Elf32_Off offset;
++    ElfW(Off) offset;
 +} dynamic_entry;
 +
 +static int
 +callback(struct dl_phdr_info *info, size_t size, void *data)
 +{
-+    const Elf32_Phdr* pDynamic = NULL;
++    const ElfW(Phdr) *pDynamic = NULL;
 +
 +    if (size == sizeof(struct dl_phdr_info))
 +    {
@@ -84,7 +84,7 @@
 + *
 + * cmc at openoffice.org
 + */
-+static Elf32_Off
++static ElfW(Off)
 +dynamic_section_offset(const char *name)
 +{
 +    dynamic_entry entry;



From fedora-cvs-commits at redhat.com  Wed Apr 18 08:41:27 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 04:41:27 -0400
Subject: rpms/openoffice.org/FC-6
	openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch, 1.1, 1.2
Message-ID: <200704180841.l3I8fRlQ017527@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch 
Log Message:
better x86_64 support

openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch:
 osl/unx/signal.c     |    0 
 sal/osl/unx/signal.c |  113 ++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 102 insertions(+), 11 deletions(-)

Index: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch	16 Apr 2007 10:07:48 -0000	1.1
+++ openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch	18 Apr 2007 08:41:25 -0000	1.2
@@ -4,7 +4,7 @@
 retrieving revision 1.32.14.1
 diff -u -r1.32.14.1 signal.c
 --- openoffice.org.orig/sal/osl/unx/signal.c	19 Jan 2007 11:43:41 -0000	1.32.14.1
-+++ openoffice.org/sal/osl/unx/signal.c	15 Apr 2007 15:55:35 -0000
++++ openoffice.org/sal/osl/unx/signal.c	18 Apr 2007 08:37:08 -0000
 @@ -41,6 +41,7 @@
  
  #ifdef LINUX
@@ -22,13 +22,13 @@
 +typedef struct
 +{
 +    const char *name;
-+    Elf32_Off offset;
++    ElfW(Off) offset;
 +} dynamic_entry;
 +
 +static int
 +callback(struct dl_phdr_info *info, size_t size, void *data)
 +{
-+    const Elf32_Phdr* pDynamic = NULL;
++    const ElfW(Phdr) *pDynamic = NULL;
 +
 +    if (size == sizeof(struct dl_phdr_info))
 +    {
@@ -84,7 +84,7 @@
 + *
 + * cmc at openoffice.org
 + */
-+static Elf32_Off
++static ElfW(Off)
 +dynamic_section_offset(const char *name)
 +{
 +    dynamic_entry entry;



From fedora-cvs-commits at redhat.com  Wed Apr 18 08:52:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 04:52:42 -0400
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.102,1.103
Message-ID: <200704180852.l3I8qgYp025583@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdegraphics.spec 
Log Message:
cleanup



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- kdegraphics.spec	17 Apr 2007 16:36:48 -0000	1.102
+++ kdegraphics.spec	18 Apr 2007 08:52:40 -0000	1.103
@@ -164,9 +164,9 @@
 # rpmdocs
 for dir in k* ; do
   for file in AUTHORS ChangeLog README TODO ; do
-    if test -s  "$dir/$file" ; then
+    if test -s "$dir/$file" ; then
        install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
-       # exlucde for RHEL
+       # exclude for RHEL
        if [ $dir != kfax -a $dir != kfaxview -a $dir != kpovmodeler ] ; then
          echo "%doc rpmdocs/$dir/" >> %{name}.lang
        fi
@@ -224,7 +224,6 @@
 %{_datadir}/icons/hicolor/scalable/apps/kfax.svgz
 
 # kfaxview
-%doc rpmdocs/kfaxview/
 %{_bindir}/kfaxview
 %{_libdir}/libkfaximage.so
 %{_libdir}/libkfaximage.la



From fedora-cvs-commits at redhat.com  Wed Apr 18 08:54:48 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 04:54:48 -0400
Subject: rpms/setup/devel .cvsignore, 1.42, 1.43 setup.spec, 1.47,
	1.48 sources, 1.43, 1.44
Message-ID: <200704180854.l3I8smN0027234@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/setup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27043

Modified Files:
	.cvsignore setup.spec sources 
Log Message:
- Modified the 111/[tcp/udp] entries to work with rpcbind (#236639)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setup/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	12 Mar 2007 17:09:24 -0000	1.42
+++ .cvsignore	18 Apr 2007 08:54:46 -0000	1.43
@@ -1 +1 @@
-setup-2.6.3.tar.bz2
+setup-2.6.4.tar.bz2


Index: setup.spec
===================================================================
RCS file: /cvs/dist/rpms/setup/devel/setup.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- setup.spec	12 Mar 2007 17:09:24 -0000	1.47
+++ setup.spec	18 Apr 2007 08:54:46 -0000	1.48
@@ -1,6 +1,6 @@
 Summary: A set of system configuration and setup files.
 Name: setup
-Version: 2.6.3
+Version: 2.6.4
 Release: 1%{?dist}
 License: public domain
 Group: System Environment/Base
@@ -76,6 +76,9 @@
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Wed Apr 18 2007 Phil Knirsch <pknirsch at redhat.com> 2.6.4-1
+- Modified the 111/[tcp/udp] entries to work with rpcbind (#236639)
+
 * Mon Mar 12 2007 Phil Knirsch <pknirsch at redhat.com> 2.6.3-1
 - Changed winbind_auth to wbpriv by request of the samba maintainer
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setup/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	12 Mar 2007 17:09:24 -0000	1.43
+++ sources	18 Apr 2007 08:54:46 -0000	1.44
@@ -1 +1 @@
-ddc1cfe85e4e83df29cda2ea232a6466  setup-2.6.3.tar.bz2
+c2333e971ec99b8e5af342ace4e664ea  setup-2.6.4.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 18 09:50:39 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 05:50:39 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1166,1.1167
Message-ID: <200704180950.l3I9odYr020221@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
sigh


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1166
retrieving revision 1.1167
diff -u -r1.1166 -r1.1167
--- openoffice.org.spec	17 Apr 2007 13:47:11 -0000	1.1166
+++ openoffice.org.spec	18 Apr 2007 09:50:31 -0000	1.1167
@@ -1,6 +1,6 @@
 %define oootag OOF680
 %define ooomilestone 14
-%define rh_rpm_release 5.1test
+%define rh_rpm_release 6
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -9,7 +9,7 @@
 # undef to revert to the traditional print dialog
 %define gtkprintui 1
 # undef to revert from combining startup libs into a single libsoffice 
-%define linkopt 1
+%define linkopt 0
 
 %if %{stlvisibilityfcked}
 %define stlflags --with-stlport4
@@ -2633,6 +2633,7 @@
 - merge openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch
 - Resolves: rhbz#235834 update font subpixel logic
 - add dynamicsection patch for better offline debugging
+- Resolves: rhbz#236671 backup ldmerge
 
 * Wed Apr 11 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.5
 - Resolves: rhbz#235828 INIFILE optimization breaks addins



From fedora-cvs-commits at redhat.com  Wed Apr 18 11:12:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 07:12:53 -0400
Subject: rpms/gnome-mime-data/devel gnome-mime-data.spec,1.24,1.25
Message-ID: <200704181112.l3IBCrZ8031398@cvs.devel.redhat.com>

Author: bnocera

Update of /cvs/dist/rpms/gnome-mime-data/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31196

Modified Files:
	gnome-mime-data.spec 
Log Message:
* Wed Apr 18 2007 - Bastien Nocera <bnocera at redhat.com> - 2.18.0-2
- Really make noarch



Index: gnome-mime-data.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mime-data/devel/gnome-mime-data.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gnome-mime-data.spec	17 Apr 2007 10:59:44 -0000	1.24
+++ gnome-mime-data.spec	18 Apr 2007 11:12:50 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: MIME type data files for GNOME desktop
 Name: gnome-mime-data
 Version: 2.18.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -63,6 +63,9 @@
 %{_datadir}/pkgconfig/*
 
 %changelog
+* Wed Apr 18 2007 - Bastien Nocera <bnocera at redhat.com> - 2.18.0-2
+- Really make noarch
+
 * Tue Apr 17 2007 - Bastien Nocera <bnocera at redhat.com> - 2.18.0-1
 - Upgrade to 2.18.0 and make noarch
 



From fedora-cvs-commits at redhat.com  Wed Apr 18 11:25:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 07:25:23 -0400
Subject: rpms/bind/devel bind-9.4.0-dig-idn.patch, NONE,
	1.1 bind-9.4.0-idnkit-autotools.patch, NONE,
	1.1 bind-9.4.0-zone-freeze.patch, NONE, 1.1 bind.spec, 1.172,
	1.173 dig-idn.patch, 1.1, NONE idnkit-autotools.patch, 1.1, NONE
Message-ID: <200704181125.l3IBPN0W007996@cvs.devel.redhat.com>

Author: atkac

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

Modified Files:
	bind.spec 
Added Files:
	bind-9.4.0-dig-idn.patch bind-9.4.0-idnkit-autotools.patch 
	bind-9.4.0-zone-freeze.patch 
Removed Files:
	dig-idn.patch idnkit-autotools.patch 
Log Message:
- renamed idn patches
- named could find zone to freeze correctly now (#236426)


bind-9.4.0-dig-idn.patch:
 Makefile.in |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE bind-9.4.0-dig-idn.patch ---
--- bind-9.4.0/bin/dig/Makefile.in.idn	2007-04-16 15:46:29.000000000 +0200
+++ bind-9.4.0/bin/dig/Makefile.in	2007-04-16 15:50:24.000000000 +0200
@@ -24,7 +24,7 @@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =	-I${srcdir}/include ${DNS_INCLUDES} ${BIND9_INCLUDES} \
-		${ISC_INCLUDES} ${LWRES_INCLUDES}
+		${ISC_INCLUDES} ${LWRES_INCLUDES} -I../../contrib/idn/idnkit-1.0-src/include
 
 CDEFINES =	-DVERSION=\"${VERSION}\"
 CWARNINGS =
@@ -42,10 +42,10 @@
 LWRESDEPLIBS =	../../lib/lwres/liblwres. at A@
 
 DEPLIBS =	${DNSDEPLIBS} ${BIND9DEPLIBS} ${ISCDEPLIBS} ${ISCCFGDEPLIBS} \
-		${LWRESDEPLIBS}
+		${LWRESDEPLIBS} 
 
 LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCLIBS} \
-		${ISCCFGLIBS} @IDNLIBS@ @LIBS@
+		${ISCCFGLIBS} ../../contrib/idn/idnkit-1.0-src/lib/libidnkit.la @LIBS@
 
 SUBDIRS =
 

bind-9.4.0-idnkit-autotools.patch:
 Makefile.am               |    6 
 configure.ac              |  553 ++++++++++++++++++++++++++++++++++++++++++++++
 include/Makefile.am       |    3 
 include/idn/Makefile.am   |   32 ++
 include/mdn/Makefile.am   |   10 
 lib/Makefile.am           |   85 +++++++
 man/Makefile.am           |   43 +++
 map/Makefile.am           |    2 
 tools/Makefile.am         |    3 
 tools/idnconv/Makefile.am |   29 ++
 tools/runidn/Makefile.am  |   35 ++
 11 files changed, 801 insertions(+)

--- NEW FILE bind-9.4.0-idnkit-autotools.patch ---
--- idnkit-1.0-src/map/Makefile.am.autotools	2007-04-16 13:40:22.000000000 +0200
+++ idnkit-1.0-src/map/Makefile.am	2007-04-16 12:51:15.000000000 +0200
@@ -0,0 +1,2 @@
+map_DATA = \
+	jp.map
--- idnkit-1.0-src/Makefile.am.autotools	2007-04-16 13:39:09.000000000 +0200
+++ idnkit-1.0-src/Makefile.am	2007-04-15 17:24:51.000000000 +0200
@@ -0,0 +1,6 @@
+SUBDIRS = \
+	include \
+	lib \
+	man \
+	tools \
+	map
--- idnkit-1.0-src/tools/Makefile.am.autotools	2007-04-16 13:40:02.000000000 +0200
+++ idnkit-1.0-src/tools/Makefile.am	2007-04-16 12:03:20.000000000 +0200
@@ -0,0 +1,3 @@
+SUBDIRS = \
+	idnconv \
+	runidn
--- idnkit-1.0-src/tools/runidn/Makefile.am.autotools	2007-04-16 13:40:05.000000000 +0200
+++ idnkit-1.0-src/tools/runidn/Makefile.am	2007-04-16 13:17:17.000000000 +0200
@@ -0,0 +1,35 @@
+if RUNIDN
+bin_SCRIPTS = 
+man1_MANS = 
+lib_LTLIBRARIES = libidnkitres.la
+
+libidnkitres_la_SOURCES = \
+	resolver.lo stub.lo
+
+AM_CPPFLAGS = \
+	-DFOR_RUNIDN \
+	-I$(top_srcdir)/include \
+	$(ICONVINC)
+
+libidnkitres_la_LIBADD = \
+	$(top_srcdir)/lib/libidnkit.la \
+	$(LIBDL)
+
+AM_LDFLAGS = \
+	-version-number 1:0:1
+
+if COMPAT
+bin_SCRIPTS += runmdn
+man1_MANS += runmdn.1
+else
+bin_SCRIPTS += runidn
+man1_MANS += runidn.1
+endif
+
+runmdn: runidn
+	cp -f runidn runmdn
+
+runmdn.1: runidn.1
+	cp -f runidn.1 runmdn.1
+
+endif
--- idnkit-1.0-src/tools/idnconv/Makefile.am.autotools	2007-04-16 13:40:08.000000000 +0200
+++ idnkit-1.0-src/tools/idnconv/Makefile.am	2007-04-16 13:35:51.000000000 +0200
@@ -0,0 +1,29 @@
+if ! LITEONLY
+bin_PROGRAMS =
+man1_MANS = 
+if COMPAT
+bin_PROGRAMS += mdnconva
+man1_MANS += mdnconv.1
+else
+bin_PROGRAMS += idnconv
+man1_MANS += idnconv.1
+endif
+
+idnconv_SOURCES = \
+	idnconv.c \
+	util.c \
+	selectiveencode.c
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	$(ICONVINC)
+
+idnconv_LDADD = \
+	$(top_srcdir)/lib/libidnkit.la
+
+mdnconv: idnconv
+	cp -f idnconv$(EXEEXT) mdnconv$(EXEEXT)
+
+mdnconv.1: idnconv.1
+	cp -f idnconv.1 mdnconv.1
+endif
--- idnkit-1.0-src/lib/Makefile.am.autotools	2007-04-16 13:39:47.000000000 +0200
+++ idnkit-1.0-src/lib/Makefile.am	2007-04-16 13:11:02.000000000 +0200
@@ -0,0 +1,85 @@
+lib_LTLIBRARIES = libidnkitlite.la
+if ! LITEONLY
+lib_LTLIBRARIES += libidnkit.la
+endif
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	$(ICONVINC) \
+	-DIDN_RESCONF_DIR="\"$(sysconfdir)\""
+
+AM_LDFLAGS = \
+	-version-number 1:0:2
+
+libidnkitlite_la_SOURCES = \
+	aliaslist.c \
+	api.c \
+	checker.c \
+	converter.c \
+	debug.c \
+	delimitermap.c \
+	filechecker.c \
+	filemapper.c \
+	log.c \
+	mapper.c \
+	mapselector.c \
+	nameprep.c \
+	normalizer.c \
+	punycode.c \
+	race.c \
+	res.c \
+	resconf.c \
+	result.c \
+	strhash.c \
+	ucsmap.c \
+	ucsset.c \
+	unicode.c \
+	unormalize.c \
+	ucs4.c \
+	utf8.c \
+	util.c \
+	version.c
+
+libidnkitlite_la_CPPFLAGS = \
+	-DWITHOUT_ICONV
+
+if ! LITEONLY
+libidnkit_la_SOURCES = \
+	aliaslist.c \
+	api.c \
+	checker.c \
+	converter.c \
+	debug.c \
+	delimitermap.c \
+	filechecker.c \
+	filemapper.c \
+	localencoding.c \
+	log.c \
+	mapper.c \
+	mapselector.c \
+	nameprep.c \
+	normalizer.c \
+	punycode.c \
+	race.c \
+	res.c \
+	resconf.c \
+	result.c \
+	strhash.c \
+	ucs4.c \
+	ucsmap.c \
+	ucsset.c \
+	unicode.c \
+	unormalize.c \
+	utf8.c \
+	util.c \
+	version.c
+endif
+
+sys_DATA = idn.conf idnalias.conf
+
+idn.conf: idn.conf.sample.in
+	sed -e 's%[@]mapdir[@]%$(datadir)/idnkit%' < idn.conf.sample.in > $@
+
+idnalias.conf: Makefile
+	$(SHELL) aliaslist.sh $(build) $(UTF8_NAME) > $@
+
--- idnkit-1.0-src/include/Makefile.am.autotools	2007-04-16 13:39:19.000000000 +0200
+++ idnkit-1.0-src/include/Makefile.am	2007-04-15 17:25:36.000000000 +0200
@@ -0,0 +1,3 @@
+SUBDIRS = \
+	idn \
+	mdn
--- idnkit-1.0-src/include/mdn/Makefile.am.autotools	2007-04-16 13:39:35.000000000 +0200
+++ idnkit-1.0-src/include/mdn/Makefile.am	2007-04-15 17:28:26.000000000 +0200
@@ -0,0 +1,10 @@
+if COMPAT
+mdn_HEADERS = \
+	api.h \
+	log.h \
+	res.h \
+	resconf.h \
+	result.h \
+	utf8.h \
+	version.h
+endif
--- idnkit-1.0-src/include/idn/Makefile.am.autotools	2007-04-16 13:39:24.000000000 +0200
+++ idnkit-1.0-src/include/idn/Makefile.am	2007-04-15 17:27:12.000000000 +0200
@@ -0,0 +1,32 @@
+idn_HEADERS = \
+	api.h \
+	assert.h \
+	checker.h \
+	converter.h \
+	debug.h \
+	delimitermap.h \
+	export.h \
+	filechecker.h \
+	filemapper.h \
+	localencoding.h \
+	log.h \
+	logmacro.h \
+	mapper.h \
+	mapselector.h \
+	nameprep.h \
+	normalizer.h \
+	punycode.h \
+	race.h \
+	res.h \
+	resconf.h \
+	result.h \
+	strhash.h \
+	ucsmap.h \
+	ucsset.h \
+	unicode.h \
+	unormalize.h \
+	ucs4.h \
+	utf8.h \
+	util.h \
+	version.h
+
--- idnkit-1.0-src/configure.ac.autotools	2007-04-16 13:39:01.000000000 +0200
+++ idnkit-1.0-src/configure.ac	2007-04-16 13:32:59.000000000 +0200
@@ -0,0 +1,553 @@
+dnl $Id: configure.in,v 1.1.1.1 2003/06/04 00:25:25 marka Exp $
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
+dnl  
+dnl By using this file, you agree to the terms and conditions set forth bellow.
+dnl 
+dnl 			LICENSE TERMS AND CONDITIONS 
+dnl 
+dnl The following License Terms and Conditions apply, unless a different
+dnl license is obtained from Japan Network Information Center ("JPNIC"),
+dnl a Japanese association, Kokusai-Kougyou-Kanda Bldg 6F, 2-3-4 Uchi-Kanda,
+dnl Chiyoda-ku, Tokyo 101-0047, Japan.
+dnl 
+dnl 1. Use, Modification and Redistribution (including distribution of any
+dnl    modified or derived work) in source and/or binary forms is permitted
+dnl    under this License Terms and Conditions.
+dnl 
+dnl 2. Redistribution of source code must retain the copyright notices as they
+dnl    appear in each source code file, this License Terms and Conditions.
+dnl 
+dnl 3. Redistribution in binary form must reproduce the Copyright Notice,
+dnl    this License Terms and Conditions, in the documentation and/or other
+dnl    materials provided with the distribution.  For the purposes of binary
+dnl    distribution the "Copyright Notice" refers to the following language:
+dnl    "Copyright (c) 2000-2002 Japan Network Information Center.  All rights reserved."
+dnl 
+dnl 4. The name of JPNIC may not be used to endorse or promote products
+dnl    derived from this Software without specific prior written approval of
+dnl    JPNIC.
+dnl 
+dnl 5. Disclaimer/Limitation of Liability: THIS SOFTWARE IS PROVIDED BY JPNIC
+dnl    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+dnl    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+dnl    PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL JPNIC BE LIABLE
+dnl    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+dnl    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+dnl    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+dnl    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+dnl    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+dnl    OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+dnl    ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+AC_PREREQ(2.59)
+AC_INIT([idnkit], [1.0], [bind9-bugs at isc.org])
+AM_INIT_AUTOMAKE([foreign -Wall -Werror])
+
+idndir="$includedir/idn"
+mdndir="$includedir/mdn"
+sysdir="$sysconfdir"
+mapdir="$datadir/idnkit"
+AC_SUBST(idndir)
+AC_SUBST(mdndir)
+AC_SUBST(sysdir)
+AC_SUBST(mapdir)
+
+AC_ARG_ENABLE([debug],
+	AS_HELP_STRING([--enable-debug], [enable debug codes [default=no]]),
+	[debug=$enableval], [debug=no])
+if test "$debug" = "yes"; then
+	CFLAGS="$CFLAGS -DDEBUG"
+fi
+
+AC_ARG_ENABLE([mdnkit-compat],
+	AS_HELP_STRING([--enable-mdnkit-compat], [enable mDNkit compatibility mode [default=no]]),
+	[mdnkit_compat=$enableval], [mdnkit_compat=no])
+if test "$mdnkit_compat" = "yes"; then
+	AC_DEFINE(ENABLE_MDNKIT_COMPAT, 1, [--enable-mdnkit-compat is specified])
+fi
+AM_CONDITIONAL(COMPAT, [test "$mdnkit_compat" = "yes"])
+
+AC_ARG_ENABLE([extra-ace],
+	AS_HELP_STRING([--enable-extra-ace], [enable additional ACE converters. [default=no]]),
+	[extraace=$enableval], [extraace=no])
+if test "$mdnkit_compat" = "yes"; then
+	AC_DEFINE(IDN_EXTRA_ACE, 1, [additional ACE converters compiled in.])
+fi
+
+AC_ARG_WITH([utf8],
+	AS_HELP_STRING([--with-utf8=NAME], [codeset name for UTF-8 encoding [UTF-8]]),
+	[UTF8_NAME="$withval"], [UTF8_NAME="UTF-8"])
+AC_DEFINE_UNQUOTED(IDN_UTF8_ENCODING_NAME, "$UTF8_NAME", [Define your iconv codeset name for utf-8.])
+AC_SUBST(UTF8_NAME)
+
+AC_ARG_ENABLE([liteonly],
+	AS_HELP_STRING([--enable-liteonly], [compile and install lite library only [default=no]]),
+	[liteonly=$enableval], [liteonly=no])
+AM_CONDITIONAL(LITEONLY, [test "$liteonly" = "yes"])
+
+AC_ARG_ENABLE([runidn],
+	AS_HELP_STRING([--enable-runidn], [compile and install runidn [default=no]]),
+	[install_runidn=$enableval], [install_runidn=no])
+if test "$install_runidn" = "yes"; then
+	if test "$liteonly" = "yes"; then
+		AC_MSG_ERROR([you can't set --enable-runidn and --enable-liteonly simultaneously])
+	fi
+fi
+AM_CONDITIONAL(RUNIDN, [test "$install_runidn" = "yes"])
+
+AC_ARG_WITH([iconv-include],
+	AS_HELP_STRING([--with-iconv-include=DIR], [iconv include files are in DIR []]),
+	[iconv_include="$withval"], [iconv_include="$includedir"])
+ICONVINC="-I$iconv_include"
+AC_SUBST(ICONVINC)
+
+AC_ARG_WITH([iconv],
+	AS_HELP_STRING([--with-iconv=LIB], [library for iconv []]),
+	[iconv="$withval"], [iconv="-lc"])
+ICONVLIB=$iconv
+AC_SUBST(ICONVLIB)
+
+AC_ARG_WITH([iconv-sofile],
+	AS_HELP_STRING([--with-iconv-sofile=PATH], [shared library file for libiconv]),
+        [ICONVSOFILE=$withval], [ICONVSOFILE=guess])
+if test "$ICONVSOFILE" = guess; then
+    if test "$liteonly" != yes ; then
+        if test "$ICONVLIB" = ""; then
+            ICONVSOFILE=none
+        else
+            AC_MSG_CHECKING(pathname of iconv shared library)
+            ic_libdir=
+            ic_libname=
+            case "$host" in
+            *-hpux*)
+                SO=sl
+                ;;
+            *)
+                SO=so
+                ;;
+            esac
+            for arg in $ICONVLIB; do
+                case "$arg" in
+                -L*) ic_libdir="$ic_libdir `echo $arg | sed s/-L//`" ;;
+                -l*) ic_libname=`echo $arg | sed s/-l//` ;;
+                /*.$SO*) ICONVSOFILE=$arg ;;
+                esac
+            done
+            if test "$ICONVSOFILE" = guess; then
+                if test "$ic_libname" = ""; then
+                    AC_MSG_RESULT(unknown)
+                    AC_MSG_WARN([use --with-iconv-sofile for specifying iconv shared library file])
+                    ICONVSOFILE=none
+                else
+                    if test "$ic_libdir" = ""; then
+                        # Standard (and semi-standard) library directories
+                        ic_libdir="/lib /usr/lib /usr/local/lib"
+                    fi
+                    for dir in $ic_libdir; do
+                        ICONVSOFILE=`ls -r $dir/lib$ic_libname.$SO* 2>/dev/null | head -1`
+                        if test "$ICONVSOFILE" != ""; then
+                            break
+                        fi
+                    done
+                    if test "$ICONVSOFILE" != ""; then
+                        AC_MSG_RESULT($ICONVSOFILE)
+                    else
+                        AC_MSG_RESULT(unknown)
+                        AC_MSG_WARN([use --with-iconv-sofile for specifying iconv shared library file])
+                        ICONVSOFILE=none
+                    fi
+                fi
+            fi
+        fi
+    fi
+fi
+AC_SUBST(ICONVSOFILE)
+
+dnl Figure out preload stuff.
+PRELOAD_VAR="LD_PRELOAD"
+PRELOAD_SEP=":"
+PRELOAD_LAST=""
+case "$host" in
+*-solaris*)
+    PRELOAD_SEP=" "
+    ;;
+*-linux*)
+    PRELOAD_SEP=" "
+    ;;
+*-osf*)
+    PRELOAD_VAR="_RLD_LIST"
+    PRELOAD_LAST=":DEFAULT"
+    ;;
+*-netbsd*)
+    if test -x /usr/bin/file -a -x /usr/bin/grep ; then
+        case "`/usr/bin/file /usr/bin/grep`" in
+	*ELF*)
+	    PRELOAD_SEP=" "
+	    ;;
+	esac
+    fi
+    ;;
+esac
+
+AC_SUBST(PRELOAD_VAR)
+AC_SUBST(PRELOAD_SEP)
+AC_SUBST(PRELOAD_LAST)
+
+dnl Checks for standard tools.
+AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_CXX
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_PROG_INSTALL
+AM_PROG_LIBTOOL
+
+AC_PATH_PROGS(PERL, perl, perl)
+
+dnl Checks for header files.
+AC_CHECK_HEADERS(pwd.h langinfo.h locale.h netdb.h stddef.h stdlib.h string.h sys/socket.h unistd.h)
+if test "$install_runidn" = "yes"; then
+    AC_CHECK_HEADERS(dlfcn.h)
+fi
+
+saved_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $ICONVINC"
+if test "$liteonly" != "yes"; then
+    AC_CHECK_HEADERS(iconv.h)
+fi
+CPPFLAGS=$saved_CPPFLAGS
+
+dnl Checks for data types.
+AC_C_CONST
+AC_TYPE_SIZE_T
+AC_HEADER_TIME
+AC_TYPE_UID_T
+AC_CHECK_TYPES([ptrdiff_t])
+
+dnl for dnsproxy.
+AC_CHECK_TYPE(BOOL, int)
+
+dnl Checks for libraries.
+if test "$install_runidn" = yes ; then
+    AC_CHECK_LIB(socket, socket)
+    AC_CHECK_LIB(nsl, inet_addr)
+    AC_CHECK_LIB(dl, dlopen, [
+	LIBS="-ldl $LIBS"
+	LIBDL="-ldl"
+	AC_DEFINE(HAVE_LIBDL, 1, [Define if you have the dl library (-ldl).])
+	AC_SUBST(LIBDL)
+    ])
+fi
+
+dnl Checks for library functions.
+AC_FUNC_MALLOC
+AC_FUNC_MEMCMP
+AC_FUNC_REALLOC
+AC_FUNC_SELECT_ARGTYPES
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS(vsnprintf setvbuf setlocale nl_langinfo memmove bcopy setenv unsetenv inet_ntoa socket gethostname isascii memset putenv select sethostname strchr strerror strpbrk strrchr strtoul)
+if test "$install_runidn" = yes ; then
+    AC_CHECK_FUNCS(gethostbyname gethostbyname2 gethostbyaddr)
+    AC_CHECK_FUNCS(gethostbyname_r gethostbyname2_r gethostbyaddr_r, find_gethost_r=yes)
+    AC_CHECK_FUNCS(getipnodebyname getipnodebyaddr freehostent)
+    AC_CHECK_FUNCS(getaddrinfo freeaddrinfo getnameinfo)
+    AC_CHECK_FUNCS(dlopen dlsym)
+fi
+
+if test "$install_runidn" = yes ; then
+dnl Checks the flavor of gethostbyaddr* functions.
+    AC_CACHE_CHECK(flavor of gethostbyaddr, ac_cv_flavor_gethostbyaddr,
+    [ac_cv_flavor_gethostbyaddr=unknown
+    AC_TRY_RUN(
+    [
+    #include <stddef.h>
+    #include <sys/types.h>
+    #include <sys/socket.h>
+    #include <netdb.h>
+    struct hostent *gethostbyaddr(const void *addr, socklen_t len, int type) {
+	return NULL;
+    }
+    int main() {
+	(void)gethostbyaddr(NULL, 0, 0);
+	return 0;
+    }
+    ], ac_cv_flavor_gethostbyaddr=glibc2_2,,
+       ac_cv_flavor_gethostbyaddr=unknown)
+    AC_TRY_RUN(
+    [
+    #include <stddef.h>
+    #include <sys/types.h>
+    #include <sys/socket.h>
+    #include <netdb.h>
+    struct hostent *gethostbyaddr(const char *addr, size_t len, int type) {
+	return NULL;
+    }
+    int main() {
+	(void)gethostbyaddr(NULL, 0, 0);
+	return 0;
+    }
+    ], ac_cv_flavor_gethostbyaddr=glibc,,
+       ac_cv_flavor_gethostbyaddr=unknown)
+    AC_TRY_RUN(
+    [
+    #include <stddef.h>
+    #include <sys/types.h>
+    #include <sys/socket.h>
+    #include <netdb.h>
+    struct hostent *gethostbyaddr(const char *addr, int len, int type) {
+	return NULL;
+    }
+    int main() {
+	(void)gethostbyaddr(NULL, 0, 0);
+	return 0;
+    }
+    ], ac_cv_flavor_gethostbyaddr=traditional,,
+       ac_cv_flavor_gethostbyaddr=unknown)
+    if test "$ac_cv_func_gethostbyaddr" = no ; then
+	ac_cv_flavor_gethostbyaddr=none
+    fi])
+
+    case "$ac_cv_flavor_gethostbyaddr" in
+    glibc2_2)
+	ac_cv_type_ghba_addr_t='const void *'
+	ac_cv_type_ghba_addrlen_t='socklen_t'
+	;;
+    glibc)
+	ac_cv_type_ghba_addr_t='const char *'
+	ac_cv_type_ghba_addrlen_t='size_t'
+	;;
+    traditional | none)
+	ac_cv_type_ghba_addr_t='const char *'
+	ac_cv_type_ghba_addrlen_t='int'
+	;;
+    *)
+	AC_MSG_ERROR([can't build runidn, since parameter type list of gethostbyaddr() is unknown to configure.])
+	;;
+    esac
+    AC_DEFINE_UNQUOTED(GHBA_ADDR_T, $ac_cv_type_ghba_addr_t,
+	[Define as the type of the 1st argument of gethostbyaddr.])
+    AC_DEFINE_UNQUOTED(GHBA_ADDRLEN_T, $ac_cv_type_ghba_addrlen_t,
+	[Define as the type of the 2nd argument of gethostbyaddr.])
+
+dnl Checks the flavor of getnameinfo functions.
+    AC_CACHE_CHECK(flavor of getnameinfo, ac_cv_flavor_getnameinfo,
+    [ac_cv_flavor_getnameinfo=unknown
+    AC_TRY_RUN(
+    [
+    #include <stddef.h>
+    #include <sys/types.h>
+    #include <sys/socket.h>
+    #include <netdb.h>
+    int getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host,
+                    socklen_t hostlen, char *serv, socklen_t servlen,
+                    unsigned int flags) {
+	return NULL;
+    }
+    int main() {
+	(void)getnameinfo(NULL, 0, NULL, 0, NULL, 0, 0);
+	return 0;
+    }
+    ], ac_cv_flavor_getnameinfo=glibc2_2_2,,
+       ac_cv_flavor_getnameinfo=unknown)
+    AC_TRY_RUN(
+    [
+    #include <stddef.h>
+    #include <sys/types.h>
+    #include <sys/socket.h>
+    #include <netdb.h>
+    int getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host,
+                    socklen_t hostlen, char *serv, socklen_t servlen,
+                    int flags) {
+	return NULL;
+    }
+    int main() {
+	(void)getnameinfo(NULL, 0, NULL, 0, NULL, 0, 0);
+	return 0;
+    }
+    ], ac_cv_flavor_getnameinfo=rfc2553bis_03,,
+       ac_cv_flavor_getnameinfo=unknown)
+    AC_TRY_RUN(
+    [
+    #include <stddef.h>
+    #include <sys/types.h>
+    #include <sys/socket.h>
+    #include <netdb.h>
+    int getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host,
+                    size_t hostlen, char *serv, size_t servlen, int flags) {
+	return NULL;
+    }
+    int main() {
+	(void)getnameinfo(NULL, 0, NULL, 0, NULL, 0, 0);
+	return 0;
+    }
+    ], ac_cv_flavor_getnameinfo=rfc2553,,
+       ac_cv_flavor_getnameinfo=unknown)
+    AC_TRY_RUN(
+    [
+    #include <stddef.h>
+    #include <sys/types.h>
+    #include <sys/socket.h>
+    #include <netdb.h>
+    int getnameinfo(const struct sockaddr *sa, size_t salen, char *host,
+                    size_t hostlen, char *serv, size_t servlen, int flags) {
+	return NULL;
+    }
+    int main() {
+	(void)getnameinfo(NULL, 0, NULL, 0, NULL, 0, 0);
+	return 0;
+    }
+    ], ac_cv_flavor_getnameinfo=rfc2133,,
+       ac_cv_flavor_getnameinfo=unknown)
+    if test "$ac_cv_func_getnameinfo" = no ; then
+	ac_cv_flavor_getnameinfo=none
+    fi])
+
+    case "$ac_cv_flavor_getnameinfo" in
+    glibc2_2_2)
+	ac_cv_type_gni_salen_t='socklen_t'
+	ac_cv_type_gni_hostlen_t='socklen_t'
+	ac_cv_type_gni_servlen_t='socklen_t'
+	ac_cv_type_gni_flags_t='unsigned int'
+	;;
+    rfc2553bis_03)
+	ac_cv_type_gni_salen_t='socklen_t'
+	ac_cv_type_gni_hostlen_t='socklen_t'
+	ac_cv_type_gni_servlen_t='socklen_t'
+	ac_cv_type_gni_flags_t='int'
+	;;
+    rfc2553)
+	ac_cv_type_gni_salen_t='socklen_t'
+	ac_cv_type_gni_hostlen_t='size_t'
+	ac_cv_type_gni_servlen_t='size_t'
+	ac_cv_type_gni_flags_t='int'
+	;;
+    rfc2133 | none)
+	ac_cv_type_gni_salen_t='size_t'
+	ac_cv_type_gni_hostlen_t='size_t'
+	ac_cv_type_gni_servlen_t='size_t'
+	ac_cv_type_gni_flags_t='int'
+	;;
+    *)
+	AC_MSG_ERROR([can't build runidn, since parameter type list of getnameinfo() is unknown to configure.])
+    esac
+    AC_DEFINE_UNQUOTED(GNI_SALEN_T, $ac_cv_type_gni_salen_t,
+	[Define as the type of the 2nd argument of getnameinfo.])
+    AC_DEFINE_UNQUOTED(GNI_HOSTLEN_T, $ac_cv_type_gni_hostlen_t,
+	[Define as the type of the 4th argument of getnameinfo.])
+    AC_DEFINE_UNQUOTED(GNI_SERVLEN_T, $ac_cv_type_gni_servlen_t,
+	[Define as the type of the 6th argument of getnameinfo.])
+    AC_DEFINE_UNQUOTED(GNI_FLAGS_T, $ac_cv_type_gni_flags_t,
+	[Define as the type of the 7th argument of getnameinfo.])
+fi
+
+dnl resume here.
+dnl Checks the flavor of gethost*_r functions.
+if test "$find_gethost_r" = yes; then
+    AC_CACHE_CHECK(flavor of gethostbyname_r, ac_cv_flavor_gethost_r,
+    [AC_TRY_RUN(
+changequote(<<, >>)dnl
+<<
+#include <stddef.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <stdio.h>
+int main()
+{
+    int err = 0;
+    struct hostent hebuf, *hp;
+    char buf[10];
+    /* Try resolving a invalid name using glibc flavor. */
+    (void)gethostbyname_r("@#!", &hebuf, buf, sizeof(buf), &hp, &err);
+    if (err != 0)
+	return 0;	/* glibc flavor */
+    else
+	return 1;	/* Sun flavor */
+}
+>>,
+changequote([, ])dnl
+	ac_cv_flavor_gethost_r=glibc,
+	ac_cv_flavor_gethost_r=sun,
+	ac_cv_flavor_gethost_r=sun)])
+    if test "$ac_cv_flavor_gethost_r" = "glibc"; then
+	AC_DEFINE(GETHOST_R_GLIBC_FLAVOR, 1,
+	    [Define if the prototype of gethost*_r is glibc flavor.])
+    fi
+fi
+
+dnl Checks for iconv library.
+if test "$liteonly" != yes ; then
+    AC_MSG_CHECKING(for iconv)
+    saved_CPPFLAGS=$CPPFLAGS
+    saved_LIBS=$LIBS
+    CPPFLAGS="$CPPFLAGS $ICONVINC"
+    LIBS="$LIBS $ICONVLIB"
+    AC_TRY_LINK([
+    #include <iconv.h>
+    ], [
+	iconv_t i;
+	i = iconv_open("ISO-8859-1", "UTF-8");
+    ], [iconv_try_link=yes], [iconv_try_link=no])
+    LIBS=$saved_LIBS
+    CPPFLAGS=$saved_CPPFLAGS
+    AC_MSG_RESULT($iconv_try_link)
+    if test "$iconv_try_link" = no ; then
+	AC_MSG_ERROR(iconv function not available)
+    fi
+fi
+
+dnl Check for codeset name for UTF-8.
+if test "$liteonly" != yes ; then
+    AC_MSG_CHECKING([for codeset name $UTF8_NAME])
+    saved_CPPFLAGS=$CPPFLAGS
+    saved_LIBS=$LIBS
+    CPPFLAGS="$CPPFLAGS $ICONVINC"
+    LIBS="$LIBS $ICONVLIB"
+    AC_TRY_RUN([
+    #include <stddef.h>
+    #include <stdlib.h>
+    #include <iconv.h>
+    #define UTF8_NAME "$UTF8_NAME"
+    #define ICONV_FAIL ((iconv_t)(-1))
+    /* Check if the codeset name UTF8_NAME is valid by performing iconv_open(). */
+    int main() {
+	int i;
+	/* list of codeset names likely to exist */
+	static char *codeset[] = {
+	    "ASCII", "ISO-8859-1", "ISO8859-1", "iso8859_1", "8859-1",
+	    "Shift_JIS", "SJIS", "sjis", NULL,
+	};
+
+	/* First try null conversion. */
+	if (iconv_open(UTF8_NAME, UTF8_NAME) != ICONV_FAIL) return 0;
+
+	/* Unfortunately, above check fails on certain systems, such as Solaris. */
+	for (i = 0; codeset[i] != NULL; i++) {
+	    if (iconv_open(UTF8_NAME, codeset[i]) != ICONV_FAIL) return 0;
+	}
+	return 1;
+    }
+    ], utf8_name_valid=yes, utf8_name_valid=no, utf8_name_valid=unknown)
+    LIBS=$saved_LIBS
+    CPPFLAGS=$saved_CPPFLAGS
+    AC_MSG_RESULT($utf8_name_valid)
+fi
+
+dnl Output.
+AC_CONFIG_HEADER(include/config.h)
+AC_OUTPUT(
+	Makefile
+	include/Makefile
+	include/idn/Makefile
+	include/mdn/Makefile
+	lib/Makefile
+	man/Makefile
+	tools/Makefile
+	tools/idnconv/Makefile
+	tools/runidn/Makefile
+	tools/runidn/runidn
+	map/Makefile
+	lib/tests/Makefile
+)
--- idnkit-1.0-src/man/Makefile.am.autotools	2007-04-16 13:39:57.000000000 +0200
+++ idnkit-1.0-src/man/Makefile.am	2007-04-16 14:02:24.000000000 +0200
@@ -0,0 +1,43 @@
+man3_MANS =
+man5_MANS = idnrc.5 idnalias.conf.5
+if LITEONLY
+if COMPAT
+man3_MANS += libmdnlite.3
+man5_MANS += mdn.conf.5
+else
+man3_MANS += libidnkitlite.3
+man5_MANS += idn.conf.5
+endif
+else
+if COMPAT
+man3_MANS += libmdn.3 libmdnlite.3 
+man5_MANS += mdn.conf.5
+else
+man3_MANS += libidnkit.3 libidnkitlite.3
+man5_MANS += idn.conf.5
+endif
+endif
+
+idnrc.5: idn.conf.5.in
+	cp -f idn.conf.5.in idnrc.5
+
+idnalias.conf.5: idn.conf.5.in
+	cp -f idn.conf.5.in idnalias.conf.5
+
+libidnkit.3: libidnkit.3.in
+	cp -f libidnkit.3.in libidnkit.3
+
+libidnkitlite.3: libidnkit.3
+	cp -f libidnkit.3 libidnkitlite.3
+
+libmdnlite.3: libidnkit.3
+	cp -f libidnkit.3 libmdnlite.3
+
+libmdn.3: libidnkit.3
+	cp -f  libidnkit.3 libmdn.3
+
+idn.conf.5: idn.conf.5.in
+	sed 's%[@]sysconfdir[@]%$(sysdir)%' < idn.conf.5.in > $@
+
+mdn.conf.5: idn.conf.5
+	cp -f idn.conf.5 mdn.conf.5

bind-9.4.0-zone-freeze.patch:
 bin/named/server.c         |   22 +++++++++++++---------
 bin/named_sdb/server.c     |   23 ++++++++++++++---------
 lib/dns/include/dns/view.h |   13 +++++++++++++
 lib/dns/view.c             |   22 ++++++++++++++++++++++
 4 files changed, 62 insertions(+), 18 deletions(-)

--- NEW FILE bind-9.4.0-zone-freeze.patch ---
--- bind-9.4.0/lib/dns/view.c.freeze	2007-04-18 11:51:02.000000000 +0200
+++ bind-9.4.0/lib/dns/view.c	2007-04-18 12:50:30.000000000 +0200
@@ -1140,6 +1140,28 @@
 }
 
 isc_result_t
+dns_viewlist_findzone(dns_viewlist_t *list, const char* name,
+                      dns_rdataclass_t rdclass, dns_zone_t **zonep)
+{
+	dns_view_t *view;
+	isc_result_t result;
+
+	REQUIRE(list != NULL);
+
+	for (view = ISC_LIST_HEAD(*list);
+             view != NULL;
+             view = ISC_LIST_NEXT(view, link)) {
+		if (view->rdclass != rdclass)
+			continue;
+		result = dns_zt_find(view->zonetable, name,
+                                     0, NULL, zonep);
+		if (result == ISC_R_SUCCESS)
+			return ISC_R_SUCCESS;
+	}
+	return ISC_R_NOTFOUND;
+}
+
+isc_result_t
 dns_view_load(dns_view_t *view, isc_boolean_t stop) {
 
 	REQUIRE(DNS_VIEW_VALID(view));
--- bind-9.4.0/lib/dns/include/dns/view.h.freeze	2007-04-18 12:03:13.000000000 +0200
+++ bind-9.4.0/lib/dns/include/dns/view.h	2007-04-18 12:49:47.000000000 +0200
@@ -592,6 +592,19 @@
  */
 
 isc_result_t
+dns_viewlist_findzone(dns_viewlist_t *list, const char* name,
+                      dns_rdataclass_t rdclass, dns_zone_t **zonep);
+
+/*%<
+ * Search zone with 'name' in view with 'rdclass' in viewlist 'list'
+ * If found, zone is returned in *zonep
+ *
+ * Returns:
+ *\li	#ISC_R_SUCCESS          A matching zone was found.
+ *\li	#ISC_R_NOTFOUND         No matching zone was found.
+ */
+
+isc_result_t
 dns_view_findzone(dns_view_t *view, dns_name_t *name, dns_zone_t **zonep);
 /*%<
  * Search for the zone 'name' in the zone table of 'view'.
--- bind-9.4.0/bin/named/server.c.freeze	2007-04-18 12:44:26.000000000 +0200
+++ bind-9.4.0/bin/named/server.c	2007-04-18 12:48:02.000000000 +0200
@@ -3922,19 +3922,23 @@
 		rdclass = dns_rdataclass_in;
 	}
 	
-	if (viewtxt == NULL)
-		viewtxt = "_default";
-	result = dns_viewlist_find(&server->viewlist, viewtxt,
-				   rdclass, &view);
-	if (result != ISC_R_SUCCESS)
-		goto fail1;
+	if (viewtxt == NULL) {
+		result = dns_viewlist_findzone(&server->viewlist, dns_fixedname_name(&name),
+					       rdclass, zonep);
+	}
+	else {
+		result = dns_viewlist_find(&server->viewlist, viewtxt,
+					   rdclass, &view);
+		if (result != ISC_R_SUCCESS)
+			goto fail1;
 	
-	result = dns_zt_find(view->zonetable, dns_fixedname_name(&name),
-			     0, NULL, zonep);
+		result = dns_zt_find(view->zonetable, dns_fixedname_name(&name),
+				     0, NULL, zonep);
+		dns_view_detach(&view);
+	}
 	/* Partial match? */
 	if (result != ISC_R_SUCCESS && *zonep != NULL)
 		dns_zone_detach(zonep);
-	dns_view_detach(&view);
  fail1:
 	return (result);
 }
--- bind-9.4.0/bin/named_sdb/server.c.freeze	2007-04-18 12:52:58.000000000 +0200
+++ bind-9.4.0/bin/named_sdb/server.c	2007-04-18 12:54:29.000000000 +0200
@@ -3917,15 +3917,20 @@
 		rdclass = dns_rdataclass_in;
 	}
 	
-	if (viewtxt == NULL)
-		viewtxt = "_default";
-	result = dns_viewlist_find(&server->viewlist, viewtxt,
-				   rdclass, &view);
-	if (result != ISC_R_SUCCESS)
-		goto fail1;
-	
-	result = dns_zt_find(view->zonetable, dns_fixedname_name(&name),
-			     0, NULL, zonep);
+	if (viewtxt == NULL) {
+                result = dns_viewlist_findzone(&server->viewlist, dns_fixedname_name(&name),
+                                               rdclass, zonep);
+        }
+        else {
+                result = dns_viewlist_find(&server->viewlist, viewtxt,
+                                           rdclass, &view);
+                if (result != ISC_R_SUCCESS)
+                        goto fail1;
+
+                result = dns_zt_find(view->zonetable, dns_fixedname_name(&name),
+                                     0, NULL, zonep);
+                dns_view_detach(&view);
+        }
 	/* Partial match? */
 	if (result != ISC_R_SUCCESS && *zonep != NULL)
 		dns_zone_detach(zonep);


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- bind.spec	16 Apr 2007 14:45:21 -0000	1.172
+++ bind.spec	18 Apr 2007 11:25:21 -0000	1.173
@@ -6,7 +6,6 @@
 %{?!efence:     %define efence      0}
 %{?!test:       %define test        0}
 %{?!WITH_DBUS:  %define WITH_DBUS   1} # + dynamic forwarder table management with D-BUS
-%{?!DEBUGINFO:  %define DEBUGINFO   1}
 %{?!bind_uid:   %define bind_uid   25}
 %{?!bind_gid:   %define bind_gid   25}
 %{?!selinux:	%define selinux     1}
@@ -18,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.4.0
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 Epoch:   	31
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -79,9 +78,10 @@
 Patch62:        bind-9.4.0-sdb-sqlite-bld.patch
 Patch63:	bind-9.4.0-dnssec-directory.patch
 %if %{IDN}
-Patch64:	idnkit-autotools.patch
-Patch65:	dig-idn.patch
+Patch64:	bind-9.4.0-idnkit-autotools.patch
+Patch65:	bind-9.4.0-dig-idn.patch
 %endif
+Patch66:	bind-9.4.0-zone-freeze.patch
 #
 Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2, mktemp
 Requires(post): grep, chkconfig >= 1.3.26
@@ -308,10 +308,13 @@
 popd
 %patch65 -p1 -b .idn
 %endif
+%patch66 -p1 -b .freeze
 :;
 
 
 %build
+export CFLAGS="$RPM_OPT_FLAGS"
+
 %if %{IDN}
 pushd contrib/idn/idnkit-1.0-src
 libtoolize --copy --force; aclocal; automake -a; autoconf
@@ -322,13 +325,6 @@
 
 libtoolize --copy --force; aclocal; autoconf
 cp -f /usr/share/libtool/config.{guess,sub} .
-%if %{DEBUGINFO}
-export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -O0"
-export CFLAGS="$RPM_OPT_FLAGS";
-%else
-export CFLAGS=`echo $RPM_OPT_FLAGS | sed 's/-O2 -g/-g3 -gdwarf-2/g'`;
-%endif
-export CPPFLAGS="$CFLAGS";
 %if %{WITH_DBUS}
 %ifarch s390x x86_64 ppc64
 # every 64-bit arch EXCEPT ia64 has dbus architecture dependant
@@ -363,11 +359,6 @@
 if [ -s openssl_config.h ]; then cat openssl_config.h >> config.h ; fi;
 make %{?_smp_mflags}
 
-
-%if !%{DEBUGINFO}
-%define debug_package %{nil}
-%endif
-
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -493,11 +484,6 @@
  * differ from the following default contents:
 ;d}' > sample/etc/rndc.conf;
 #
-%if !%{DEBUGINFO}
-echo 'WARNING - NOT generating debuginfo!'
-/usr/lib/rpm/brp-compress
-exit 0
-%endif
 chmod 0755 ${RPM_BUILD_ROOT}%{_libdir}/lib*so.*
 :;
 
@@ -820,6 +806,12 @@
 
 
 %changelog
+* Tue Apr 17 2007 Adam Tkac <atkac redhat com> 31:9.4.0-7.fc7
+- removed DEBUGINFO option because with this option (default) was bind
+  builded with -O0 and without this flag no debuginfo package was produced.
+  (I want faster bind => -O2 + debuginfo)
+- fixed zone finding (#236426)
+
 * Mon Apr 16 2007 Adam Tkac <atkac redhat com> 31:9.4.0-6.fc7
 - added idn support (still under development with upstream, disabled by default)
 


--- dig-idn.patch DELETED ---


--- idnkit-autotools.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 18 11:39:46 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 07:39:46 -0400
Subject: rpms/gob2/devel gob2.spec,1.12,1.13
Message-ID: <200704181139.l3IBdkqR011344@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/gob2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11306

Modified Files:
	gob2.spec 
Log Message:
-specfile review


Index: gob2.spec
===================================================================
RCS file: /cvs/dist/rpms/gob2/devel/gob2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gob2.spec	12 Jul 2006 06:12:40 -0000	1.12
+++ gob2.spec	18 Apr 2007 11:39:44 -0000	1.13
@@ -1,12 +1,12 @@
 Summary: GOB2, The GObject Builder
 Name: gob2
 Version: 2.0.14
-Release: 1.1
+Release: 2%{?dist}
 License: GPL
 Group: Development/Tools
 Source: gob2-%{version}.tar.gz
 Url: http://www.5z.com/jirka/gob.html
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel 
 BuildRequires: bison flex
 
@@ -17,7 +17,7 @@
 by java and yacc.  It supports generating C++ code
 
 %prep
-%setup
+%setup -q
 
 %build
 %configure 
@@ -41,6 +41,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Wed Apr 18 2007 Harald Hoyer <harald at redhat.com> - 2.0.14-2
+- specfile review
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0.14-1.1
 - rebuild
 
@@ -83,10 +86,13 @@
 
 * Fri Sep 28 2001  George Lebl <jirka at 5z.com>
 - Updated for gob2
+
 * Tue Feb 7 2000  George Lebl <jirka at 5z.com>
-- added %{prefix}/share/aclocal/* to %files
+- added %%{prefix}/share/aclocal/* to %%files
+
 * Tue Dec 14 1999  George Lebl <jirka at 5z.com>
-- added the examples dir to the %doc
+- added the examples dir to the %%doc
+
 * Mon Aug 16 1999  George Lebl <jirka at 5z.com>
 - added gob.spec.in file
 



From fedora-cvs-commits at redhat.com  Wed Apr 18 11:57:24 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 07:57:24 -0400
Subject: rpms/libwvstreams/devel libwvstreams.spec,1.23,1.24
Message-ID: <200704181157.l3IBvOAc011570@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/libwvstreams/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11556

Modified Files:
	libwvstreams.spec 
Log Message:
specfile review


Index: libwvstreams.spec
===================================================================
RCS file: /cvs/dist/rpms/libwvstreams/devel/libwvstreams.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libwvstreams.spec	24 Jan 2007 15:24:15 -0000	1.23
+++ libwvstreams.spec	18 Apr 2007 11:57:22 -0000	1.24
@@ -1,7 +1,7 @@
 Name: libwvstreams
 Version: 4.2.2
-Release: 3%{?dist}
-Summary: WvStreams is a network programming library written in C++.
+Release: 4%{?dist}
+Summary: WvStreams is a network programming library written in C++
 Source: http://open.nit.ca/download/wvstreams-%{version}.tar.gz
 Patch1: libwvstreams-3.70-gcc3.patch
 Patch2: wvstreams-4.2.1-lib64.patch
@@ -9,7 +9,7 @@
 Patch4: wvstreams-4.2.2-multilib.patch
 URL: http://open.nit.ca/wiki/?page=WvStreams
 Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/libwvstreams-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, pkgconfig, zlib-devel
 License: LGPL
 
@@ -18,7 +18,7 @@
 doing network applications development.
 
 %package devel
-Summary: Development files for WvStreams.
+Summary: Development files for WvStreams
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
@@ -96,6 +96,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Apr 18 2007 Harald Hoyer <harald at redhat.com> - 4.2.2-4
+- specfile review
+
 * Wed Jan 24 2007 Harald Hoyer <harald at redhat.com> - 4.2.2-3
 - fixed code for new g++ version
 



From fedora-cvs-commits at redhat.com  Wed Apr 18 12:02:12 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 08:02:12 -0400
Subject: rpms/wvdial/devel wvdial.spec,1.21,1.22
Message-ID: <200704181202.l3IC2C9W011767@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/wvdial/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11753

Modified Files:
	wvdial.spec 
Log Message:
specfile review


Index: wvdial.spec
===================================================================
RCS file: /cvs/dist/rpms/wvdial/devel/wvdial.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- wvdial.spec	12 Jul 2006 08:51:34 -0000	1.21
+++ wvdial.spec	18 Apr 2007 12:02:09 -0000	1.22
@@ -1,14 +1,14 @@
-Summary: A heuristic autodialer for PPP connections.
+Summary: A heuristic autodialer for PPP connections
 Name: wvdial
 Version: 1.54.0
-Release: 5.2.2.1
+Release: 6%{?dist}
 License: LGPL
-URL: http://open.nit.ca/wvdial/
+URL: http://open.nit.ca/wiki/index.php?page=WvDial
 Group: System Environment/Daemons
 Source0: http://open.nit.ca/download/wvdial-%{version}.tar.gz
 Patch1: wvdial-1.53-remotename.patch
-Buildroot: %{_tmppath}/wvdial-root
-BuildRequires: libwvstreams-devel >= 0:3.75.0 lockdev-devel openssl-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: libwvstreams-devel >= 0:4.2.2 lockdev-devel openssl-devel
 Requires: ppp >= 0:2.3.7
 
 %description
@@ -23,8 +23,7 @@
 
 %build
 make \
-	CFLAGS="$RPM_OPT_FLAGS -DUSE_LOCKDEV=1" \
-	CXXFLAGS="$RPM_OPT_FLAGS -DUSE_LOCKDEV=1 -fno-rtti" \
+	CPPOPTS="$RPM_OPT_FLAGS -DUSE_LOCKDEV=1 -fno-rtti" \
 	LOCKDEV=-llockdev \
 	XX_LIBS="-lcrypt -llockdev" \
 	PREFIX=%{_prefix} \



From fedora-cvs-commits at redhat.com  Wed Apr 18 12:05:39 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 08:05:39 -0400
Subject: rpms/wvdial/devel wvdial.spec,1.22,1.23
Message-ID: <200704181205.l3IC5d9G011870@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/wvdial/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11856a

Modified Files:
	wvdial.spec 
Log Message:
specfile review


Index: wvdial.spec
===================================================================
RCS file: /cvs/dist/rpms/wvdial/devel/wvdial.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- wvdial.spec	18 Apr 2007 12:02:09 -0000	1.22
+++ wvdial.spec	18 Apr 2007 12:05:37 -0000	1.23
@@ -54,6 +54,9 @@
 %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/wvdial.conf
 
 %changelog
+* Wed Apr 18 2007 Harald Hoyer <harald at redhat.com> - 1.54.0-6
+- specfile review
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.54.0-5.2.2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Apr 18 12:28:24 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 08:28:24 -0400
Subject: rpms/alsa-utils/devel alsa-utils.spec,1.51,1.52 salsa.c,1.5,1.6
Message-ID: <200704181228.l3ICSOeu012136@cvs.devel.redhat.com>

Author: stransky

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

Modified Files:
	alsa-utils.spec salsa.c 
Log Message:
added more funcionality to salsa (save/load sound settings), moved volume settings to /etc/alsa/


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- alsa-utils.spec	10 Apr 2007 11:58:19 -0000	1.51
+++ alsa-utils.spec	18 Apr 2007 12:28:22 -0000	1.52
@@ -4,7 +4,7 @@
 Summary: 	Advanced Linux Sound Architecture (ALSA) utilities
 Name: 		alsa-utils
 Version: 	1.0.14
-Release: 	0.4%{?prever_dot}%{?dist}
+Release: 	0.5%{?prever_dot}%{?dist}
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -39,15 +39,19 @@
 %{__rm} -rf ${RPM_BUILD_ROOT}
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
-ln -s ../../sbin/alsactl $RPM_BUILD_ROOT/%{_sbindir}/alsactl
-
-install -m 755 salsa $RPM_BUILD_ROOT/sbin
+# Install ALSA udev rules
 mkdir -p -m755 $RPM_BUILD_ROOT/etc/udev/rules.d/
 install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/etc/udev/rules.d/90-alsa.rules
+
+# Install support utilities
 mkdir -p -m755 $RPM_BUILD_ROOT/bin
 install -m 755 alsaunmute  %{buildroot}/bin
 install -m 755 alsacard  %{buildroot}/bin
+install -m 755 salsa %{buildroot}/sbin
+
+# Link alsactl to /usr/sbin
+mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
+ln -s ../../sbin/alsactl $RPM_BUILD_ROOT/%{_sbindir}/alsactl
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -57,9 +61,9 @@
 %doc COPYING ChangeLog README TODO
 /etc/udev/rules.d/*
 /bin/*
+/sbin/*
 %{_bindir}/*
 %{_sbindir}/*
-/sbin/*
 %{_mandir}/man?/*
 %dir %{_datadir}/sounds
 %dir %{_datadir}/sounds/alsa
@@ -70,6 +74,10 @@
 /usr/share/locale/*
 
 %changelog
+* Wed Apr 18 2007 Martin Stransky <stransky at redhat.com> 1.0.14-0.5.rc2
+- added more funcionality to salsa (save/load sound settings),
+  moved volume settings to /etc/alsa/
+
 * Thu Apr 10 2007 Martin Stransky <stransky at redhat.com> 1.0.14-0.4.rc2
 - added support for large files
 - minor fix in alsaunmute


Index: salsa.c
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/salsa.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- salsa.c	21 Jul 2005 14:45:20 -0000	1.5
+++ salsa.c	18 Apr 2007 12:28:22 -0000	1.6
@@ -1,4 +1,4 @@
-/* Copyright 2005 Red Hat, Inc.
+/* Copyright 2007 Red Hat, Inc.
  *
  * Portions extraced from various ALSA code:
  *  Copyright (c) by Abramo Bagnara <abramo at alsa-project.org>
@@ -16,10 +16,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 #include <alsa/asoundlib.h>
 
-#define ALSA_CONFIG_PATH	"/etc/asound.state"
+#define ALSA_CONFIG_PATH	"/etc/alsa/asound.state"
+#define ALL_CARDS         	(-1)
+
 
 int get_card_number()
 {
@@ -46,8 +49,8 @@
   snd_ctl_t *handle;
   snd_ctl_card_info_t *info;
   const char *id;
-  char path[32];
-
+  char path[32];  
+  
   rc = snd_config_top(&config);
   if (rc < 0)
     goto out;
@@ -75,15 +78,30 @@
 
 }
 
-int run_alsactl(int index)
+void load_volume_settings(int index)
 {
-  char *args[] = { "/sbin/alsactl", "restore", NULL, NULL };
-  char num[10];
+  char *args[] = { "/sbin/alsactl", "-f", ALSA_CONFIG_PATH, "restore", NULL, NULL };
+  char  num[10];
+
+  if(index != ALL_CARDS) {
+    snprintf(num, 10, "%d", index);
+    args[4] = num;
+  }
+  
+  execv(args[0], args);  
+}
 
-  sprintf(num, "%d", index);
-  args[2] = num;
+void save_volume_settings(int index)
+{
+  char *args[] = { "/sbin/alsactl", "-f", ALSA_CONFIG_PATH, "store", NULL, NULL };
+  char  num[10];
+  
+  if(index != ALL_CARDS) {
+    snprintf(num, 10, "%d", index);
+    args[4] = num;    
+  }
+  
   execv(args[0], args);
-  return 1;
 }
 
 void frob_mixer(int index)
@@ -94,17 +112,55 @@
   execl("/bin/alsaunmute","/bin/alsaunmute", tmp, "-v", NULL);
 }
 
+void banner(void)
+{
+  printf("ALSA volume settings handler, Copyright 2007 Red Hat, Inc.\n");
+  printf("This software may be freely redistributed under\nthe terms of the GNU public license.\n\n");
+  
+  printf("Usage: salsa [options] [card number]\n\n");
+  printf(" Options:\n");
+  printf("    -l      - Load volume settings\n");
+  printf("    -s      - Save volume settings\n\n");
+  printf(" Card number:\n");
+  printf("    ##      - An affected card. If it isn't specified,\n");
+  printf("              configure all installed sound cards.\n\n");
+  
+  exit(0);   
+}
+
 int main(int argc, char **argv)
 {
   int i;
-
-  i = get_card_number();
-  if (i < 0)
-    return 0;
-  if (has_config(i))
-    return run_alsactl(i);
-  else
-    frob_mixer(i);
+  
+  if(argc == 1) {
+    i = get_card_number();
+    if (i < 0) {
+      return 0;
+    }
+    if (has_config(i)) {
+      load_volume_settings(i);
+    }
+    else {
+      frob_mixer(i);
+    }
+  }
+  else if(argc >= 2) {
+    
+    int card_number = ALL_CARDS;
+    if(argc == 3) {
+      card_number = atoi(argv[2]);
+    }
+    
+    if(argv[1][1] == 'l') {
+      load_volume_settings(card_number);
+    }
+    else if(argv[1][1] == 's') {
+      save_volume_settings(card_number);
+    }
+    else {
+      banner();
+    }
+  }
   
   return(0);
 }



From fedora-cvs-commits at redhat.com  Wed Apr 18 12:39:44 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 08:39:44 -0400
Subject: rpms/kdeutils/devel kdeutils.spec,1.85,1.86
Message-ID: <200704181239.l3ICdiTf031750@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdeutils.spec 
Log Message:
cleanup



Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- kdeutils.spec	7 Feb 2007 23:16:14 -0000	1.85
+++ kdeutils.spec	18 Apr 2007 12:39:37 -0000	1.86
@@ -4,22 +4,24 @@
 %define arts 1
 %define redhatify 1
 
-%define qt_version 3.3.7
+%define qt_version 3.3.8
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 
 %define appdir %{_datadir}/applications/kde
 
 Version: 3.5.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Name: kdeutils
 Summary: K Desktop Environment - Utilities
 Epoch: 6
+
 License: GPL
 Group: Applications/System
 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
+
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: klaptop_acpi_helper.pam
 Source2: klaptop_acpi_helper.console
 Source3: kcmlaptoprc
@@ -28,16 +30,15 @@
 Patch2: kdeutils-3.5.4-bz#205553.patch
 Patch3: kdeutils-3.5.4-suspend.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
+Requires: usermode
 
 BuildRequires: kdebase-devel
 BuildRequires: automake
-BuildRequires: autoconf
 BuildRequires: libtool
 BuildRequires: gettext
 BuildRequires: net-snmp-devel
@@ -46,7 +47,6 @@
 BuildRequires: gmp-devel
 
 Obsoletes: ark
-Obsoletes: kcalc
 Obsoletes: kcharselect
 Obsoletes: kdepasswd
 Obsoletes: kdessh
@@ -63,34 +63,56 @@
 Obsoletes: kregexpeditor-devel
 Obsoletes: ktimer
 Obsoletes: superkaramba
-Provides: superkaramba
+Provides:  superkaramba
 
 %description
 Utilities for the K Desktop Environment.
-Includes: ark (tar/gzip archive manager); kcalc (scientific calculator);
-kcharselect (character selector); kdepasswd (change password);
-kdessh (ssh front end); kdf (view disk usage); kedit (simple text editor);
-kfloppy (floppy formatting tool); khexedit (hex editor); kjots (note taker);
-klaptopdaemon (battery monitoring and management for laptops);
-ksim (system information monitor); ktimer (task scheduler);
-kwikdisk (removable media utility)
+Includes:
+  * ark (tar/gzip archive manager);
+  * kcharselect (character selector);
+  * kdepasswd (change password);
+  * kdessh (ssh front end);
+  * kdf (view disk usage);
+  * kedit (simple text editor);
+  * kfloppy (floppy formatting tool);
+  * khexedit (hex editor);
+  * kjots (note taker);
+  * ktimer (task scheduler);
+  * kwikdisk (removable media utility)
 
 %package devel
 Summary: Development files for kdeutils
 Group: Development/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-extras = %{epoch}:%{version}-%{release}
 Requires: kdebase-devel
 
 %description devel
 Development files for kdeutils. Install kdeutils-devel if you wish
 to develop or compile KDE utils applications.
 
+%package extras
+Summary: Extras packages from KDEnetwork
+Group: Applications/Internet
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+Obsoletes: kcalc
+
+%description extras
+More Utilities for the K Desktop Environment:
+ * kcalc (scientific calculator);
+ * kmilo
+ * ksim (system information monitor);
+ * klaptopdaemon (battery monitoring and management for laptops);
+
 %prep
 %setup -q
+
 %patch1 -p1 -b .label
 %patch2 -p1 -b .bz#205553
 %patch3 -p1 -b .suspend
 
+
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
@@ -119,6 +141,7 @@
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 
@@ -128,34 +151,52 @@
 for i in kcalc kregexpeditor Kjots ktimer kdf kcmdf ksim KFloppy KEdit \
          KCharSelect ark kwalletmanager kwalletconfig \
          irkick kcmlirc laptop pcmcia kvaio thinkpad kwikdisk; do
-   if [ -f %{buildroot}%{appdir}/$i.desktop ] ; then
-     echo "OnlyShowIn=KDE;" >> %{buildroot}%{appdir}/$i.desktop
-   fi
+    if [ -f %{buildroot}%{appdir}/$i.desktop ] ; then
+        echo "OnlyShowIn=KDE;" >> %{buildroot}%{appdir}/$i.desktop
+    fi
 done
 
-# Make symlinks relative
-pushd %{buildroot}%{_docdir}/HTML/en
-for i in *; do
-   [ -d $i -a -L $i/common ] && ln -sf ../common $i
+## File lists
+# locale's
+%find_lang %{name} || touch %{name}.lang
+# HTML (1.0)
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
+  if [ -d $lang_dir ]; then
+    lang=$(basename $lang_dir)
+    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
+    # replace absolute symlinks with relative ones
+    pushd $lang_dir
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+      done
+    popd
+    pushd $lang_dir/kcontrol
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
+      done
+    popd
+  fi
 done
-popd
+fi
 
 # using pam
-install -m 755 -d %{buildroot}/%{_sysconfdir}/pam.d
+install -m 755 -d %{buildroot}%{_sysconfdir}/pam.d
 install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/pam.d/klaptop_acpi_helper
 
-install -m 755 -d %{buildroot}/%{_sysconfdir}/security/console.apps/
-install -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/security/console.apps/klaptop_acpi_helper
+install -m 755 -d %{buildroot}%{_sysconfdir}/security/console.apps/
+install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/klaptop_acpi_helper
 
-pushd %{buildroot}/%{_bindir}
-mkdir -p %{buildroot}/%{_sbindir}
-mv klaptop_acpi_helper ../sbin
-ln -s consolehelper klaptop_acpi_helper
+pushd %{buildroot}%{_bindir}
+  mkdir -p %{buildroot}%{_sbindir}
+  mv klaptop_acpi_helper ../sbin
+  ln -s consolehelper klaptop_acpi_helper
 popd
 
 # klaptop setting
-mkdir -p %{buildroot}/%{_datadir}/config
-install -m 644 %{SOURCE3} %{buildroot}/%{_datadir}/config/
+mkdir -p %{buildroot}%{_datadir}/config
+install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/config/
 
 %clean
 rm -rf %{buildroot}
@@ -176,7 +217,125 @@
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%files
+%post extras
+/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
+
+%postun extras
+/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
+
+%files extras
+%defattr(-,root,root,-)
+
+# kcalc
+%doc %{_docdir}/HTML/??/kcalc/
+%{_bindir}/kcalc
+%{_libdir}/kde3/kcalc.*
+%{_libdir}/libkdeinit_kcalc.la
+%{_libdir}/libkdeinit_kcalc.so
+%{_datadir}/applications/kde/kcalc.desktop
+%{_datadir}/apps/kcalc
+%config %{_datadir}/config.kcfg/kcalc.kcfg
+%{_datadir}/icons/hicolor/??x??/apps/kcalc.png
+%{_datadir}/icons/hicolor/scalable/apps/kcalc.svgz
+
+# kmilo
+%{_libdir}/kde3/kded_kmilod.*
+%{_libdir}/kde3/kmilo*
+%{_libdir}/libkmilo.la
+%{_libdir}/libkmilo.so.*
+%{_datadir}/services/kded/kmilod.desktop
+%{_datadir}/services/kmilo
+%{_datadir}/servicetypes/kmilo
+
+# ksim
+%doc %{_docdir}/HTML/??/ksim/
+%{_libdir}/kde3/ksim*
+%{_libdir}/libksimcore.la
+%{_libdir}/libksimcore.so.*
+%{_datadir}/apps/kicker/extensions/ksim.desktop
+%{_datadir}/apps/ksim/
+%config %{_datadir}/config/ksim_panelextensionrc
+%{_datadir}/icons/crystalsvg/??x??/apps/ksim.png
+%{_datadir}/icons/crystalsvg/16x16/devices/ksim_cpu.png
+
+# klaptop
+%doc %{_docdir}/HTML/en/kcontrol
+%{_sysconfdir}/pam.d/klaptop_acpi_helper
+%attr(644,root,root) %{_sysconfdir}/security/console.apps/klaptop_acpi_helper
+%{_bindir}/klaptop*
+%{_libdir}/kde3/kded_klaptopdaemon.*
+%{_sbindir}/klaptop_acpi_helper
+%{_datadir}/apps/klaptopdaemon
+%{_datadir}/services/kded/klaptopdaemon.desktop
+%{_libdir}/kde3/kcm_laptop.*
+%{_libdir}/libkcmlaptop.*
+%{_datadir}/applications/kde/laptop.desktop
+%config %{_datadir}/config/kcmlaptoprc
+%{_datadir}/icons/crystalsvg/128x128/apps/laptop_battery.png
+%{_datadir}/icons/crystalsvg/??x??/apps/laptop_battery.png
+%{_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz
+
+
+%files -f %{name}.lang
+
+# kcalc
+%exclude %{_docdir}/HTML/??/kcalc/
+%exclude %{_bindir}/kcalc
+%exclude %{_libdir}/kde3/kcalc.*
+%exclude %{_libdir}/libkdeinit_kcalc.la
+%exclude %{_libdir}/libkdeinit_kcalc.so
+%exclude %{_datadir}/applications/kde/kcalc.desktop
+%exclude %{_datadir}/apps/kcalc
+%exclude %{_datadir}/config.kcfg/kcalc.kcfg
+%exclude %{_datadir}/icons/hicolor/??x??/apps/kcalc.png
+%exclude %{_datadir}/icons/hicolor/scalable/apps/kcalc.svgz
+
+# kmilo
+%exclude %{_libdir}/kde3/kded_kmilod.*
+%exclude %{_libdir}/kde3/kmilo*
+%exclude %{_libdir}/libkmilo.la
+%exclude %{_libdir}/libkmilo.so.*
+%exclude %{_datadir}/services/kded/kmilod.desktop
+%exclude %{_datadir}/services/kmilo
+%exclude %{_datadir}/servicetypes/kmilo
+
+
+# ksim
+%exclude %{_docdir}/HTML/??/ksim/
+%exclude %{_libdir}/kde3/ksim*
+%exclude %{_libdir}/libksimcore.la
+%exclude %{_libdir}/libksimcore.so.*
+%exclude %{_datadir}/apps/kicker/extensions/ksim.desktop
+%exclude %{_datadir}/apps/ksim/
+%exclude %{_datadir}/config/ksim_panelextensionrc
+%exclude %{_datadir}/icons/crystalsvg/??x??/apps/ksim.png
+%exclude %{_datadir}/icons/crystalsvg/16x16/devices/ksim_cpu.png
+
+# klaptop
+%exclude %{_sysconfdir}/pam.d/klaptop_acpi_helper
+%exclude %{_sysconfdir}/security/console.apps/klaptop_acpi_helper
+%exclude %{_bindir}/klaptop*
+%exclude %{_libdir}/kde3/kded_klaptopdaemon.*
+%exclude %{_sbindir}/klaptop_acpi_helper
+%exclude %{_datadir}/apps/klaptopdaemon
+%exclude %{_datadir}/services/kded/klaptopdaemon.desktop
+%exclude %{_libdir}/kde3/kcm_laptop.*
+%exclude %{_libdir}/libkcmlaptop.*
+%exclude %{_datadir}/applications/kde/laptop.desktop
+%exclude %{_datadir}/config/kcmlaptoprc
+%exclude %{_docdir}/HTML/en/kcontrol/
+%exclude %{_datadir}/icons/crystalsvg/128x128/apps/laptop_battery.png
+%exclude %{_datadir}/icons/crystalsvg/??x??/apps/laptop_battery.png
+%exclude %{_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz
+
 %defattr(-,root,root)
 %doc %{_docdir}/HTML/en/*
 %attr(644,root,root) %{_sysconfdir}/security/console.apps/*
@@ -205,6 +364,15 @@
 %exclude %{_libdir}/libkdeinit*.so
 
 %changelog
+* Wed Apr 18 2007 Than Ngo <than at redhat.com> - 6:3.5.6-2
+- cleanup
+
+* Sun Feb 18 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 6:3.5.6-0.2
+- kcalc, kmilo, klaptop and ksim Split into an extra package - kde-utils
+- Dropped explicit BR - autoconf
+- Minor clean ups
+- since the package uses consolehelper, it requires: usermode
+
 * Thu Feb 08 2007 Than Ngo <than at redhat.com> 6:3.5.6-1.fc7
 - 3.5.6
 
@@ -218,6 +386,9 @@
 - rebuild with new net-snmp-libs
 - fix automake version check
 
+* Wed Jan 31 2007 Than Ngo <than at redhat.com> 6:3.5.6-0.1.fc6
+- 3.5.6
+
 * Thu Oct 26 2006 Than Ngo <than at redhat.com> 6:3.5.5-0.1
 - 3.5.5
 
@@ -269,7 +440,7 @@
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Sun Feb 05 2006 Than Ngo <than at redhat.com> 6:3.5.1-1 
+* Sun Feb 05 2006 Than Ngo <than at redhat.com> 6:3.5.1-1
 - 3.5.1
 
 * Mon Jan 16 2006 Than Ngo <than at redhat.com> 6:3.5.0-4
@@ -279,7 +450,7 @@
 - rebuilt against new libnetsnmp
 
 * Tue Dec 20 2005 Than Ngo <than at redhat.com> 6:3.5.0-2
-- fix file conflict with superkaramba #176044 
+- fix file conflict with superkaramba #176044
 
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
@@ -287,10 +458,10 @@
 * Wed Nov 30 2005 Than Ngo <than at redhat.com> 6:3.5.0-1
 - 3.5
 
-* Wed Nov 09 2005 Than Ngo <than at redhat.com> 6:3.4.92-4 
+* Wed Nov 09 2005 Than Ngo <than at redhat.com> 6:3.4.92-4
 - rebuilt against new openssl
-  
-* Thu Nov 03 2005 Than Ngo <than at redhat.com> 6:3.4.92-3 
+
+* Thu Nov 03 2005 Than Ngo <than at redhat.com> 6:3.4.92-3
 - rebuilt against new net-snmp
 
 * Fri Oct 28 2005 Than Ngo <than at redhat.com> 6:3.4.92-2
@@ -326,7 +497,7 @@
 * Tue Mar 01 2005 Than Ngo <than at redhat.com> 6:3.4.0-0.rc1.1
 - KDE 3.4.0 rc1
 
-* Mon Feb 21 2005 Than Ngo <than at redhat.com> 6:3.3.92-0.1 
+* Mon Feb 21 2005 Than Ngo <than at redhat.com> 6:3.3.92-0.1
 - KDE-3.4 beta2
 
 * Tue Feb 08 2005 Than Ngo <than at redhat.com> 6:3.3.2-0.2



From fedora-cvs-commits at redhat.com  Wed Apr 18 12:40:37 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 08:40:37 -0400
Subject: rpms/kdeutils/devel kdeutils.spec,1.86,1.87
Message-ID: <200704181240.l3ICebWj032544@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdeutils.spec 
Log Message:
cleanup



Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- kdeutils.spec	18 Apr 2007 12:39:37 -0000	1.86
+++ kdeutils.spec	18 Apr 2007 12:40:35 -0000	1.87
@@ -376,19 +376,6 @@
 * Thu Feb 08 2007 Than Ngo <than at redhat.com> 6:3.5.6-1.fc7
 - 3.5.6
 
-* Thu Dec 14 2006 Karsten Hopp <karsten at redhat.com> 3.5.5-3
-- ExcludeArch: ppc64 (#219629)
-
-* Thu Dec 14 2006 Karsten Hopp <karsten at redhat.com> 3.5.5-2
-- rebuild with python-2.5
-
-* Wed Nov 29 2006 Karsten Hopp <karsten at redhat.com> 3.5.5-1
-- rebuild with new net-snmp-libs
-- fix automake version check
-
-* Wed Jan 31 2007 Than Ngo <than at redhat.com> 6:3.5.6-0.1.fc6
-- 3.5.6
-
 * Thu Oct 26 2006 Than Ngo <than at redhat.com> 6:3.5.5-0.1
 - 3.5.5
 



From fedora-cvs-commits at redhat.com  Wed Apr 18 13:40:39 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 09:40:39 -0400
Subject: rpms/tcp_wrappers/FC-5 tcp_wrappers-7.6-restore_sigalarm.patch, NONE,
	1.1 tcp_wrappers-7.6-siglongjmp.patch, NONE,
	1.1 tcp_wrappers.spec, 1.20, 1.21
Message-ID: <200704181340.l3IDedhK002977@cvs.devel.redhat.com>

Author: tjanouse

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

Modified Files:
	tcp_wrappers.spec 
Added Files:
	tcp_wrappers-7.6-restore_sigalarm.patch 
	tcp_wrappers-7.6-siglongjmp.patch 
Log Message:
* Wed Apr 18 2007 Tomas Janousek <tjanouse at redhat.com> - 7.6-40.3
- added restore_sigalarm and siglongjmp patches from Debian, fixes #205129


tcp_wrappers-7.6-restore_sigalarm.patch:
 rfc931.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletion(-)

--- NEW FILE tcp_wrappers-7.6-restore_sigalarm.patch ---
diff -ruN tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c
--- tcp_wrappers_7.6.orig/rfc931.c	2004-08-29 18:40:08.000000000 +0200
+++ tcp_wrappers_7.6/rfc931.c	2004-08-29 18:40:02.000000000 +0200
@@ -92,6 +92,8 @@
     char   *cp;
     char   *result = unknown;
     FILE   *fp;
+    unsigned saved_timeout;
+    struct sigaction nact, oact;
 
 #ifdef INET6
     /* address family must be the same */
@@ -134,7 +136,12 @@
 	 */
 
 	if (setjmp(timebuf) == 0) {
-	    signal(SIGALRM, timeout);
+	    /* Save SIGALRM timer and handler. Sudheer Abdul-Salam, SUN. */
+	    saved_timeout = alarm(0);
+	    nact.sa_handler = timeout;
+	    nact.sa_flags = 0;
+	    (void) sigemptyset(&nact.sa_mask);
+	    (void) sigaction(SIGALRM, &nact, &oact);
 	    alarm(rfc931_timeout);
 
 	    /*
@@ -223,6 +230,10 @@
 	    }
 	    alarm(0);
 	}
+	/* Restore SIGALRM timer and handler. Sudheer Abdul-Salam, SUN. */
+	(void) sigaction(SIGALRM, &oact, NULL);
+	if (saved_timeout > 0)
+	    alarm(saved_timeout);
 	fclose(fp);
     }
     STRN_CPY(dest, result, STRING_LENGTH);

tcp_wrappers-7.6-siglongjmp.patch:
 rfc931.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE tcp_wrappers-7.6-siglongjmp.patch ---
diff -ruNp tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c
--- tcp_wrappers_7.6.orig/rfc931.c	2004-08-29 18:42:25.000000000 +0200
+++ tcp_wrappers_7.6/rfc931.c	2004-08-29 18:41:04.000000000 +0200
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#) rfc931.c 1.
 
 int     rfc931_timeout = RFC931_TIMEOUT;/* Global so it can be changed */
 
-static jmp_buf timebuf;
+static sigjmp_buf timebuf;
 
 /* fsocket - open stdio stream on top of socket */
 
@@ -62,7 +62,7 @@ int     protocol;
 static void timeout(sig)
 int     sig;
 {
-    longjmp(timebuf, sig);
+    siglongjmp(timebuf, sig);
 }
 
 /* rfc931 - return remote user name, given socket structures */
@@ -135,7 +135,7 @@ char   *dest;
 	 * Set up a timer so we won't get stuck while waiting for the server.
 	 */
 
-	if (setjmp(timebuf) == 0) {
+	if (sigsetjmp(timebuf, 1) == 0) {
 	    /* Save SIGALRM timer and handler. Sudheer Abdul-Salam, SUN. */
 	    saved_timeout = alarm(0);
 	    nact.sa_handler = timeout;


Index: tcp_wrappers.spec
===================================================================
RCS file: /cvs/dist/rpms/tcp_wrappers/FC-5/tcp_wrappers.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- tcp_wrappers.spec	5 Mar 2007 16:10:35 -0000	1.20
+++ tcp_wrappers.spec	18 Apr 2007 13:40:32 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A security tool which acts as a wrapper for TCP daemons.
 Name: tcp_wrappers
 Version: 7.6
-Release: 40.2%{?dist}
+Release: 40.3%{?dist}
 
 %define LIB_MAJOR 0
 %define LIB_MINOR 7
@@ -27,6 +27,8 @@
 Patch14: tcp_wrappers-7.6-ldflags.patch
 Patch15: tcp_wrappers-7.6-fix_sig-bug141110.patch
 Patch16: tcp_wrappers-7.6-162412.patch
+Patch17: tcp_wrappers-7.6-restore_sigalarm.patch
+Patch18: tcp_wrappers-7.6-siglongjmp.patch
 # required by sin_scope_id in ipv6 patch
 BuildPreReq: glibc-devel >= 2.2		
 BuildRoot: %{_tmppath}/%{name}-root
@@ -59,6 +61,8 @@
 %patch14 -p1 -b .cflags
 %patch15 -p1 -b .fix_sig
 %patch16 -p1 -b .162412
+%patch17 -p1 -b .restore_sigalarm
+%patch18 -p1 -b .siglongjmp
 
 %build
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -DPIC -D_REENTRANT -DHAVE_STRERROR" LDFLAGS="-pie" MAJOR=%{LIB_MAJOR} MINOR=%{LIB_MINOR} REL=%{LIB_REL} linux
@@ -106,6 +110,9 @@
 %{_sbindir}/*
 
 %changelog
+* Wed Apr 18 2007 Tomas Janousek <tjanouse at redhat.com> - 7.6-40.3
+- added restore_sigalarm and siglongjmp patches from Debian, fixes #205129
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 7.6-40.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Apr 18 13:41:25 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 09:41:25 -0400
Subject: rpms/tcp_wrappers/FC-6 tcp_wrappers-7.6-restore_sigalarm.patch, NONE,
	1.1 tcp_wrappers-7.6-siglongjmp.patch, NONE,
	1.1 tcp_wrappers.spec, 1.21, 1.22
Message-ID: <200704181341.l3IDfP0Q003056@cvs.devel.redhat.com>

Author: tjanouse

Update of /cvs/dist/rpms/tcp_wrappers/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv3033

Modified Files:
	tcp_wrappers.spec 
Added Files:
	tcp_wrappers-7.6-restore_sigalarm.patch 
	tcp_wrappers-7.6-siglongjmp.patch 
Log Message:
* Wed Apr 18 2007 Tomas Janousek <tjanouse at redhat.com> - 7.6-40.3
- added restore_sigalarm and siglongjmp patches from Debian, fixes #205129


tcp_wrappers-7.6-restore_sigalarm.patch:
 rfc931.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletion(-)

--- NEW FILE tcp_wrappers-7.6-restore_sigalarm.patch ---
diff -ruN tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c
--- tcp_wrappers_7.6.orig/rfc931.c	2004-08-29 18:40:08.000000000 +0200
+++ tcp_wrappers_7.6/rfc931.c	2004-08-29 18:40:02.000000000 +0200
@@ -92,6 +92,8 @@
     char   *cp;
     char   *result = unknown;
     FILE   *fp;
+    unsigned saved_timeout;
+    struct sigaction nact, oact;
 
 #ifdef INET6
     /* address family must be the same */
@@ -134,7 +136,12 @@
 	 */
 
 	if (setjmp(timebuf) == 0) {
-	    signal(SIGALRM, timeout);
+	    /* Save SIGALRM timer and handler. Sudheer Abdul-Salam, SUN. */
+	    saved_timeout = alarm(0);
+	    nact.sa_handler = timeout;
+	    nact.sa_flags = 0;
+	    (void) sigemptyset(&nact.sa_mask);
+	    (void) sigaction(SIGALRM, &nact, &oact);
 	    alarm(rfc931_timeout);
 
 	    /*
@@ -223,6 +230,10 @@
 	    }
 	    alarm(0);
 	}
+	/* Restore SIGALRM timer and handler. Sudheer Abdul-Salam, SUN. */
+	(void) sigaction(SIGALRM, &oact, NULL);
+	if (saved_timeout > 0)
+	    alarm(saved_timeout);
 	fclose(fp);
     }
     STRN_CPY(dest, result, STRING_LENGTH);

tcp_wrappers-7.6-siglongjmp.patch:
 rfc931.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE tcp_wrappers-7.6-siglongjmp.patch ---
diff -ruNp tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c
--- tcp_wrappers_7.6.orig/rfc931.c	2004-08-29 18:42:25.000000000 +0200
+++ tcp_wrappers_7.6/rfc931.c	2004-08-29 18:41:04.000000000 +0200
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#) rfc931.c 1.
 
 int     rfc931_timeout = RFC931_TIMEOUT;/* Global so it can be changed */
 
-static jmp_buf timebuf;
+static sigjmp_buf timebuf;
 
 /* fsocket - open stdio stream on top of socket */
 
@@ -62,7 +62,7 @@ int     protocol;
 static void timeout(sig)
 int     sig;
 {
-    longjmp(timebuf, sig);
+    siglongjmp(timebuf, sig);
 }
 
 /* rfc931 - return remote user name, given socket structures */
@@ -135,7 +135,7 @@ char   *dest;
 	 * Set up a timer so we won't get stuck while waiting for the server.
 	 */
 
-	if (setjmp(timebuf) == 0) {
+	if (sigsetjmp(timebuf, 1) == 0) {
 	    /* Save SIGALRM timer and handler. Sudheer Abdul-Salam, SUN. */
 	    saved_timeout = alarm(0);
 	    nact.sa_handler = timeout;


Index: tcp_wrappers.spec
===================================================================
RCS file: /cvs/dist/rpms/tcp_wrappers/FC-6/tcp_wrappers.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- tcp_wrappers.spec	5 Mar 2007 16:11:26 -0000	1.21
+++ tcp_wrappers.spec	18 Apr 2007 13:41:23 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: A security tool which acts as a wrapper for TCP daemons.
 Name: tcp_wrappers
 Version: 7.6
-Release: 40.2.1%{?dist}
+Release: 40.3%{?dist}
 
 %define LIB_MAJOR 0
 %define LIB_MINOR 7
@@ -27,6 +27,8 @@
 Patch14: tcp_wrappers-7.6-ldflags.patch
 Patch15: tcp_wrappers-7.6-fix_sig-bug141110.patch
 Patch16: tcp_wrappers-7.6-162412.patch
+Patch17: tcp_wrappers-7.6-restore_sigalarm.patch
+Patch18: tcp_wrappers-7.6-siglongjmp.patch
 # required by sin_scope_id in ipv6 patch
 BuildPreReq: glibc-devel >= 2.2		
 BuildRoot: %{_tmppath}/%{name}-root
@@ -59,6 +61,8 @@
 %patch14 -p1 -b .cflags
 %patch15 -p1 -b .fix_sig
 %patch16 -p1 -b .162412
+%patch17 -p1 -b .restore_sigalarm
+%patch18 -p1 -b .siglongjmp
 
 %build
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -DPIC -D_REENTRANT -DHAVE_STRERROR" LDFLAGS="-pie" MAJOR=%{LIB_MAJOR} MINOR=%{LIB_MINOR} REL=%{LIB_REL} linux
@@ -106,6 +110,9 @@
 %{_sbindir}/*
 
 %changelog
+* Wed Apr 18 2007 Tomas Janousek <tjanouse at redhat.com> - 7.6-40.3
+- added restore_sigalarm and siglongjmp patches from Debian, fixes #205129
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 7.6-40.2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Apr 18 14:50:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 10:50:31 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.3086,
	1.3087 linux-2.6-firewire.patch, 1.9, 1.10
Message-ID: <200704181450.l3IEoVIf030780@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	kernel-2.6.spec linux-2.6-firewire.patch 
Log Message:
* Wed Apr 18 2007 Kristian H??gsberg <krh at redhat.com> 
- Add missing _IOC_WRITE for create iso context ioctl code.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3086
retrieving revision 1.3087
diff -u -r1.3086 -r1.3087
--- kernel-2.6.spec	18 Apr 2007 14:46:35 -0000	1.3086
+++ kernel-2.6.spec	18 Apr 2007 14:50:24 -0000	1.3087
@@ -2311,6 +2311,9 @@
 #  - tux.
 
 %changelog
+* Wed Apr 18 2007 Kristian H??gsberg <krh at redhat.com> 
+- Add missing _IOC_WRITE for create iso context ioctl code.
+
 * Wed Apr 18 2007 Jeremy Katz <katzj at redhat.com>
 - add fix for kvm with non-PAE kernels
 - another firewire fix (krh)

linux-2.6-firewire.patch:
 drivers/Makefile                  |    1 
 drivers/firewire/Kconfig          |   60 +
 drivers/firewire/Makefile         |   10 
 drivers/firewire/fw-card.c        |  544 ++++++++++
 drivers/firewire/fw-cdev.c        |  954 +++++++++++++++++++
 drivers/firewire/fw-device.c      |  781 +++++++++++++++
 drivers/firewire/fw-device.h      |  149 ++
 drivers/firewire/fw-iso.c         |  163 +++
 drivers/firewire/fw-ohci.c        | 1896 ++++++++++++++++++++++++++++++++++++++
 drivers/firewire/fw-ohci.h        |  153 +++
 drivers/firewire/fw-sbp2.c        | 1165 +++++++++++++++++++++++
 drivers/firewire/fw-topology.c    |  519 ++++++++++
 drivers/firewire/fw-topology.h    |   94 +
 drivers/firewire/fw-transaction.c |  889 +++++++++++++++++
 drivers/firewire/fw-transaction.h |  505 ++++++++++
 drivers/ieee1394/Kconfig          |    2 
 include/linux/firewire-cdev.h     |  268 +++++
 17 files changed, 8153 insertions(+)

Index: linux-2.6-firewire.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-firewire.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-firewire.patch	18 Apr 2007 00:56:48 -0000	1.9
+++ linux-2.6-firewire.patch	18 Apr 2007 14:50:24 -0000	1.10
@@ -644,10 +644,10 @@
 +EXPORT_SYMBOL(fw_core_initiate_bus_reset);
 diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c
 new file mode 100644
-index 0000000..91f6715
+index 0000000..88b8fd9
 --- /dev/null
 +++ b/drivers/firewire/fw-cdev.c
-@@ -0,0 +1,952 @@
+@@ -0,0 +1,954 @@
 +/*						-*- c-basic-offset: 8 -*-
 + *
 + * fw-device-cdev.c - Char device for device raw access
@@ -730,6 +730,7 @@
 +	u64 bus_reset_closure;
 +
 +	struct fw_iso_context *iso_context;
++	u64 iso_closure;
 +	struct fw_iso_buffer buffer;
 +	unsigned long vm_start;
 +
@@ -1276,7 +1277,7 @@
 +		return;
 +
 +	interrupt->interrupt.type      = FW_CDEV_EVENT_ISO_INTERRUPT;
-+	interrupt->interrupt.closure   = 0;
++	interrupt->interrupt.closure   = client->iso_closure;
 +	interrupt->interrupt.cycle     = cycle;
 +	interrupt->interrupt.header_length = header_length;
 +	memcpy(interrupt->interrupt.header, header, header_length);
@@ -1309,6 +1310,7 @@
 +		return -EINVAL;
 +	}
 +
++	client->iso_closure = request->closure;
 +	client->iso_context = fw_iso_context_create(client->device->card,
 +						    request->type,
 +						    request->channel,
@@ -7989,10 +7991,10 @@
  	depends on PCI || BROKEN
 diff --git a/include/linux/firewire-cdev.h b/include/linux/firewire-cdev.h
 new file mode 100644
-index 0000000..1fbd8bf
+index 0000000..026c768
 --- /dev/null
 +++ b/include/linux/firewire-cdev.h
-@@ -0,0 +1,267 @@
+@@ -0,0 +1,268 @@
 +/*						-*- c-basic-offset: 8 -*-
 + *
 + * fw-device-cdev.h -- Char device interface.
@@ -8128,7 +8130,7 @@
 +#define FW_CDEV_IOC_ADD_DESCRIPTOR	_IOWR('#', 0x06, struct fw_cdev_add_descriptor)
 +#define FW_CDEV_IOC_REMOVE_DESCRIPTOR	_IOW('#', 0x07, struct fw_cdev_remove_descriptor)
 +
-+#define FW_CDEV_IOC_CREATE_ISO_CONTEXT	_IOW('#', 0x08, struct fw_cdev_create_iso_context)
++#define FW_CDEV_IOC_CREATE_ISO_CONTEXT	_IOWR('#', 0x08, struct fw_cdev_create_iso_context)
 +#define FW_CDEV_IOC_QUEUE_ISO		_IOWR('#', 0x09, struct fw_cdev_queue_iso)
 +#define FW_CDEV_IOC_START_ISO		_IOW('#', 0x0a, struct fw_cdev_start_iso)
 +#define FW_CDEV_IOC_STOP_ISO		_IOW('#', 0x0b, struct fw_cdev_stop_iso)
@@ -8228,6 +8230,7 @@
 +	__u32 header_size;
 +	__u32 channel;
 +	__u32 speed;
++	__u64 closure;
 +	__u32 handle;
 +};
 +



From fedora-cvs-commits at redhat.com  Wed Apr 18 14:52:05 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 10:52:05 -0400
Subject: rpms/samba/devel samba3_idmap_offline.patch, NONE, 1.1 samba.spec,
	1.109, 1.110
Message-ID: <200704181452.l3IEq58G031866@cvs.devel.redhat.com>

Author: ssorce

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31719

Modified Files:
	samba.spec 
Added Files:
	samba3_idmap_offline.patch 
Log Message:

offline patch (experimental)



samba3_idmap_offline.patch:
 include/idmap.h         |    4 
 include/smb.h           |    3 
 nsswitch/idmap.c        |  244 ++++++++++++++++++++++++++++--------------------
 nsswitch/idmap_ad.c     |   43 ++++++--
 nsswitch/idmap_cache.c  |  118 +++++++++--------------
 nsswitch/idmap_ldap.c   |   95 ++++++++++++++----
 nsswitch/idmap_nss.c    |    3 
 nsswitch/idmap_passdb.c |    3 
 nsswitch/idmap_tdb.c    |   43 ++++++++
 9 files changed, 351 insertions(+), 205 deletions(-)

--- NEW FILE samba3_idmap_offline.patch ---
Index: source/nsswitch/idmap_cache.c
===================================================================
--- source/nsswitch/idmap_cache.c	(revision 22320)
+++ source/nsswitch/idmap_cache.c	(working copy)
@@ -365,7 +365,7 @@
 
 /* search the cahce for the SID an return a mapping if found *
  *
- * 3 cases are possible
+ * 4 cases are possible
  *
  * 1 map found
  * 	in this case id->status = ID_MAPPED and NT_STATUS_OK is returned
@@ -373,21 +373,20 @@
  * 	in this case id->status = ID_UNKNOWN and NT_STATUS_NONE_MAPPED is returned
  * 3 negative cache found
  * 	in this case id->status = ID_UNMAPPED and NT_STATUS_OK is returned
- *
- * As a special case if the cache is expired NT_STATUS_SYNCHRONIZATION_REQUIRED
- * is returned instead of NT_STATUS_OK. In this case revalidation of the cache
- * is needed.
+ * 4 map found but timer expired
+ *      in this case id->status = ID_EXPIRED and NT_STATUS_SYNCHRONIZATION_REQUIRED
+ *      is returned. In this case revalidation of the cache is needed.
  */
 
 NTSTATUS idmap_cache_map_sid(struct idmap_cache_ctx *cache, struct id_map *id)
 {
 	NTSTATUS ret;
 	TDB_DATA keybuf, databuf;
-	time_t t;
+	time_t t, now;
 	char *sidkey;
 	char *endptr;
 
-	/* make sure it is marked as not mapped by default */
+	/* make sure it is marked as unknown by default */
 	id->status = ID_UNKNOWN;
 	
 	ret = idmap_cache_build_sidkey(cache, &sidkey, id);
@@ -413,11 +412,13 @@
 		goto done;
 	}
 
+	now = time(NULL);
+
 	/* check it is not negative */
 	if (strcmp("IDMAP/NEGATIVE", endptr+1) != 0) {
-		
+
 		DEBUG(10, ("Returning %s cache entry: key = %s, value = %s, "
-			   "timeout = %s", t > time(NULL) ? "valid" :
+			   "timeout = %s", t > now ? "valid" :
 			   "expired", sidkey, endptr+1, ctime(&t)));
 
 		/* this call if successful will also mark the entry as mapped */
@@ -431,35 +432,21 @@
 
 		/* here ret == NT_STATUS_OK and id->status = ID_MAPPED */
 
-		if (t <= time(NULL)) {
-			/* If we've been told to be offline - stay in 
-			   that state... */
-			if (lp_winbind_offline_logon() && 
-			    get_global_winbindd_state_offline()) 
-			{
-				DEBUG(10,("idmap_cache_map_sid: winbindd is "
-					  "globally offline.\n"));
-			} else {
-				/* We're expired, set an error code
-				   for upper layer */
-				ret = NT_STATUS_SYNCHRONIZATION_REQUIRED;
-			}			
+		if (t <= now) {
+	
+			/* we have it, but it is expired */
+			id->status = ID_EXPIRED;
+				
+			/* We're expired, set an error code
+			   for upper layer */
+			ret = NT_STATUS_SYNCHRONIZATION_REQUIRED;
 		}
 	} else {
-		if (t <= time(NULL)) {
-			/* If we've been told to be offline - stay in 
-			   that state... */
-			if (lp_winbind_offline_logon() && 
-			    get_global_winbindd_state_offline()) 
-			{
-				DEBUG(10,("idmap_cache_map_sid: winbindd is "
-					  "globally offline.\n"));
-			} else {				
-				/* We're expired, delete the entry and return
-				   not mapped */
-				tdb_delete(cache->tdb, keybuf);
-				ret = NT_STATUS_NONE_MAPPED;
-			}			
+		if (t <= now) {
+			/* We're expired, delete the NEGATIVE entry and return
+			   not mapped */
+			tdb_delete(cache->tdb, keybuf);
+			ret = NT_STATUS_NONE_MAPPED;
 		} else {
 			/* this is not mapped as it was a negative cache hit */
 			id->status = ID_UNMAPPED;
@@ -483,21 +470,20 @@
  * 	in this case id->status = ID_UNKNOWN and NT_STATUS_NONE_MAPPED is returned
  * 3 negative cache found
  * 	in this case id->status = ID_UNMAPPED and NT_STATUS_OK is returned
- *
- * As a special case if the cache is expired NT_STATUS_SYNCHRONIZATION_REQUIRED
- * is returned instead of NT_STATUS_OK. In this case revalidation of the cache
- * is needed.
+ * 4 map found but timer expired
+ *      in this case id->status = ID_EXPIRED and NT_STATUS_SYNCHRONIZATION_REQUIRED
+ *      is returned. In this case revalidation of the cache is needed.
  */
 
 NTSTATUS idmap_cache_map_id(struct idmap_cache_ctx *cache, struct id_map *id)
 {
 	NTSTATUS ret;
 	TDB_DATA keybuf, databuf;
-	time_t t;
+	time_t t, now;
 	char *idkey;
 	char *endptr;
 
-	/* make sure it is marked as not mapped by default */
+	/* make sure it is marked as unknown by default */
 	id->status = ID_UNKNOWN;
 	
 	ret = idmap_cache_build_idkey(cache, &idkey, id);
@@ -523,11 +509,13 @@
 		goto done;
 	}
 
+	now = time(NULL);
+
 	/* check it is not negative */
 	if (strcmp("IDMAP/NEGATIVE", endptr+1) != 0) {
 		
 		DEBUG(10, ("Returning %s cache entry: key = %s, value = %s, "
-			   "timeout = %s", t > time(NULL) ? "valid" :
+			   "timeout = %s", t > now ? "valid" :
 			   "expired", idkey, endptr+1, ctime(&t)));
 
 		/* this call if successful will also mark the entry as mapped */
@@ -539,39 +527,25 @@
 			goto done;
 		}
 
-		/* here ret == NT_STATUS_OK and id->mapped = True */
+		/* here ret == NT_STATUS_OK and id->mapped = ID_MAPPED */
 
-		if (t <= time(NULL)) {
-			/* If we've been told to be offline - stay in
-			   that state... */
-			if (lp_winbind_offline_logon() && 
-			    get_global_winbindd_state_offline()) 
-			{
-				DEBUG(10,("idmap_cache_map_sid: winbindd is "
-					  "globally offline.\n"));
-			} else {
-				/* We're expired, set an error code
-				   for upper layer */
-				ret = NT_STATUS_SYNCHRONIZATION_REQUIRED;
-			}			
+		if (t <= now) {
+
+			/* we have it, but it is expired */
+			id->status = ID_EXPIRED;
+
+			/* We're expired, set an error code
+			   for upper layer */
+			ret = NT_STATUS_SYNCHRONIZATION_REQUIRED;
 		}
 	} else {
-		if (t <= time(NULL)) {
-			/* If we've been told to be offline - stay in
-			   that state... */
-			if (lp_winbind_offline_logon() && 
-			    get_global_winbindd_state_offline()) 
-			{
-				DEBUG(10,("idmap_cache_map_sid: winbindd is "
-					  "globally offline.\n"));
-			} else {
-				/* We're expired, delete the entry and
-				   return not mapped */
-				tdb_delete(cache->tdb, keybuf);
-				ret = NT_STATUS_NONE_MAPPED;
-			}			
+		if (t <= now) {
+			/* We're expired, delete the NEGATIVE entry and return
+			   not mapped */
+			tdb_delete(cache->tdb, keybuf);
+			ret = NT_STATUS_NONE_MAPPED;
 		} else {
-			/* this is not mapped is it was a negative cache hit */
+			/* this is not mapped as it was a negative cache hit */
 			id->status = ID_UNMAPPED;
 			ret = NT_STATUS_OK;
 		}
Index: source/nsswitch/idmap_passdb.c
===================================================================
--- source/nsswitch/idmap_passdb.c	(revision 22320)
+++ source/nsswitch/idmap_passdb.c	(working copy)
@@ -29,8 +29,9 @@
  Initialise idmap database. 
 *****************************/
 
-static NTSTATUS idmap_pdb_init(struct idmap_domain *dom, const char *compat_params)
+static NTSTATUS idmap_pdb_init(struct idmap_domain *dom)
 {	
+	dom->initialized = True;
 	return NT_STATUS_OK;
 }
 
Index: source/nsswitch/idmap_ad.c
===================================================================
--- source/nsswitch/idmap_ad.c	(revision 22320)
+++ source/nsswitch/idmap_ad.c	(working copy)
@@ -160,7 +160,7 @@
 /************************************************************************
  ***********************************************************************/
 
-static NTSTATUS idmap_ad_initialize(struct idmap_domain *dom, const char *params)
+static NTSTATUS idmap_ad_initialize(struct idmap_domain *dom)
 {
 	struct idmap_ad_context *ctx;
 	char *config_option;
@@ -204,6 +204,7 @@
 	}
 
 	dom->private_data = ctx;
+	dom->initialized = True;
 
 	talloc_free(config_option);
 
@@ -269,6 +270,19 @@
 	char *u_filter = NULL;
 	char *g_filter = NULL;
 
+	/* Only do query if we are online */
+	if (idmap_is_offline())	{
+		return NT_STATUS_FILE_IS_OFFLINE;
+	}
+
+	/* Initilization my have been deferred because we were offline */
+	if ( ! dom->initialized) {
+		ret = idmap_ad_initialize(dom);
+		if ( ! NT_STATUS_IS_OK(ret)) {
+			return ret;
+		}
+	}
+
 	ctx = talloc_get_type(dom->private_data, struct idmap_ad_context);
 
 	if ( (memctx = talloc_new(ctx)) == NULL ) {
@@ -320,7 +334,7 @@
 			break;
 
 		default:
-			DEBUG(3, ("Unknown ID type\n"));
+			DEBUG(3, ("Error: mapping requested but Unknown ID type\n"));
 			ids[idx]->status = ID_UNKNOWN;
 			continue;
 		}
@@ -441,9 +455,9 @@
 
 	ret = NT_STATUS_OK;
 
-	/* mark all unknown ones as unmapped */
+	/* mark all unknown/expired ones as unmapped */
 	for (i = 0; ids[i]; i++) {
-		if (ids[i]->status == ID_UNKNOWN) 
+		if (ids[i]->status != ID_MAPPED) 
 			ids[i]->status = ID_UNMAPPED;
 	}
 
@@ -476,6 +490,19 @@
 	int i;
 	char *sidstr;
 
+	/* Only do query if we are online */
+	if (idmap_is_offline())	{
+		return NT_STATUS_FILE_IS_OFFLINE;
+	}
+
+	/* Initilization my have been deferred because we were offline */
+	if ( ! dom->initialized) {
+		ret = idmap_ad_initialize(dom);
+		if ( ! NT_STATUS_IS_OK(ret)) {
+			return ret;
+		}
+	}
+
 	ctx = talloc_get_type(dom->private_data, struct idmap_ad_context);	
 
 	if ( (memctx = talloc_new(ctx)) == NULL ) {		
@@ -615,9 +642,9 @@
 
 	ret = NT_STATUS_OK;
 
-	/* mark all unknwon ones as unmapped */
+	/* mark all unknwoni/expired ones as unmapped */
 	for (i = 0; ids[i]; i++) {
-		if (ids[i]->status == ID_UNKNOWN) 
+		if (ids[i]->status != ID_MAPPED) 
 			ids[i]->status = ID_UNMAPPED;
 	}
 
@@ -669,7 +696,7 @@
 	ad_map_type =  WB_POSIX_MAP_SFU;	
 
 	if ( !ad_idmap_ads ) 
-		return idmap_ad_initialize( NULL, NULL );	
+		return idmap_ad_initialize(NULL);
 
 	return NT_STATUS_OK;
 }
@@ -690,7 +717,7 @@
 	ad_map_type =  WB_POSIX_MAP_RFC2307;
 
 	if ( !ad_idmap_ads ) 
-		return idmap_ad_initialize( NULL, NULL );	
+		return idmap_ad_initialize(NULL);	
 
 	return NT_STATUS_OK;
 }
Index: source/nsswitch/idmap_nss.c
===================================================================
--- source/nsswitch/idmap_nss.c	(revision 22320)
+++ source/nsswitch/idmap_nss.c	(working copy)
@@ -30,8 +30,9 @@
  Initialise idmap database. 
 *****************************/
 
-static NTSTATUS idmap_nss_int_init(struct idmap_domain *dom, const char *compat_params)
+static NTSTATUS idmap_nss_int_init(struct idmap_domain *dom)
 {	
+	dom->initialized = True;
 	return NT_STATUS_OK;
 }
 
Index: source/nsswitch/idmap_tdb.c
===================================================================
--- source/nsswitch/idmap_tdb.c	(revision 22320)
+++ source/nsswitch/idmap_tdb.c	(working copy)
@@ -611,7 +611,7 @@
  Initialise idmap database. 
 *****************************/
 
-static NTSTATUS idmap_tdb_db_init(struct idmap_domain *dom, const char *compat_params)
+static NTSTATUS idmap_tdb_db_init(struct idmap_domain *dom)
 {
 	NTSTATUS ret;
 	struct idmap_tdb_context *ctx;
@@ -645,6 +645,7 @@
 	}
 
 	dom->private_data = ctx;
+	dom->initialized = True;
 
 	talloc_free(config_option);
 	return NT_STATUS_OK;
@@ -799,6 +800,14 @@
 	NTSTATUS ret;
 	int i;
 
+	/* make sure we initialized */
+	if ( ! dom->initialized) {
+		ret = idmap_tdb_db_init(dom);
+		if ( ! NT_STATUS_IS_OK(ret)) {
+			return ret;
+		}
+	}
+
 	ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
 
 	for (i = 0; ids[i]; i++) {
@@ -837,6 +846,14 @@
 	NTSTATUS ret;
 	int i;
 
+	/* make sure we initialized */
+	if ( ! dom->initialized) {
+		ret = idmap_tdb_db_init(dom);
+		if ( ! NT_STATUS_IS_OK(ret)) {
+			return ret;
+		}
+	}
+
 	ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
 
 	for (i = 0; ids[i]; i++) {
@@ -875,6 +892,14 @@
 	NTSTATUS ret;
 	TDB_DATA ksid, kid, data;
 
+	/* make sure we initialized */
+	if ( ! dom->initialized) {
+		ret = idmap_tdb_db_init(dom);
+		if ( ! NT_STATUS_IS_OK(ret)) {
+			return ret;
+		}
+	}
+
 	if (!map || !map->sid) {
 		return NT_STATUS_INVALID_PARAMETER;
 	}
@@ -978,6 +1003,14 @@
 	NTSTATUS ret;
 	TDB_DATA ksid, kid, data;
 
+	/* make sure we initialized */
+	if ( ! dom->initialized) {
+		ret = idmap_tdb_db_init(dom);
+		if ( ! NT_STATUS_IS_OK(ret)) {
+			return ret;
+		}
+	}
+
 	if (!map || !map->sid) {
 		return NT_STATUS_INVALID_PARAMETER;
 	}
@@ -1155,6 +1188,14 @@
 	struct dump_data *data;
 	NTSTATUS ret = NT_STATUS_OK;
 
+	/* make sure we initialized */
+	if ( ! dom->initialized) {
+		ret = idmap_tdb_db_init(dom);
+		if ( ! NT_STATUS_IS_OK(ret)) {
+			return ret;
+		}
+	}
+
 	ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
 
 	data = talloc_zero(ctx, struct dump_data);
Index: source/nsswitch/idmap.c
===================================================================
--- source/nsswitch/idmap.c	(revision 22320)
+++ source/nsswitch/idmap.c	(working copy)
@@ -43,6 +43,12 @@
 
 struct idmap_cache_ctx;
 
+struct idmap_alloc_context {
+	const char *params;
+	struct idmap_alloc_methods *methods;
+	BOOL initialized;
+};
+
 static TALLOC_CTX *idmap_ctx = NULL;
 static struct idmap_cache_ctx *idmap_cache;
 
@@ -53,9 +59,10 @@
 static int def_dom_num = -1;
 
 static struct idmap_alloc_backend *alloc_backends = NULL;
-static struct idmap_alloc_methods *alloc_methods = NULL;
+static struct idmap_alloc_context *idmap_alloc_ctx = NULL;
 
 #define IDMAP_CHECK_RET(ret) do { if ( ! NT_STATUS_IS_OK(ret)) { DEBUG(2, ("ERROR: NTSTATUS = 0x%08x\n", NT_STATUS_V(ret))); goto done; } } while(0)
+#define IDMAP_REPORT_RET(ret) do { if ( ! NT_STATUS_IS_OK(ret)) { DEBUG(2, ("ERROR: NTSTATUS = 0x%08x\n", NT_STATUS_V(ret))); } } while(0)
 #define IDMAP_CHECK_ALLOC(mem) do { if (!mem) { DEBUG(0, ("Out of memory!\n")); ret = NT_STATUS_NO_MEMORY; goto done; } } while(0)
 
 static struct idmap_methods *get_methods(struct idmap_backend *be, const char *name)
@@ -102,6 +109,12 @@
 	idmap_in_own_child = True;
 }
 
+BOOL idmap_is_offline(void)
+{
+	return ( lp_winbind_offline_logon() &&
+	     get_global_winbindd_state_offline() );
+}
+
 /**********************************************************************
  Allow a module to register itself as a method.
 **********************************************************************/
@@ -221,9 +234,9 @@
 NTSTATUS idmap_close(void)
 {
 	/* close the alloc backend first before freeing idmap_ctx */
-	if (alloc_methods) {
-		alloc_methods->close_fn();
-		alloc_methods = NULL;
+	if (idmap_alloc_ctx) {
+		idmap_alloc_ctx->methods->close_fn();
+		idmap_alloc_ctx->methods = NULL;
 	}
 	alloc_backends = NULL;
 
@@ -272,7 +285,7 @@
 NTSTATUS idmap_init(void)
 {	
 	NTSTATUS ret;
-	static NTSTATUS backend_init_status = NT_STATUS_UNSUCCESSFUL;	
+	static NTSTATUS idmap_init_status = NT_STATUS_UNSUCCESSFUL;
 	struct idmap_domain *dom;
 	char *compat_backend = NULL;
 	char *compat_params = NULL;
@@ -283,25 +296,13 @@
 	int compat = 0;
 	int i;
 
-	/* Always initialize the cache.  We'll have to delay initialization
-	   of backends if we are offline */
-
 	ret = idmap_init_cache();
 	if ( !NT_STATUS_IS_OK(ret) )
 		return ret;
 
-	if ( NT_STATUS_IS_OK(backend_init_status) ) {
+	if (NT_STATUS_IS_OK(idmap_init_status))
 		return NT_STATUS_OK;
-	}
-	
-	/* We can't reliably call intialization code here unless 
-	   we are online */
 
-	if ( get_global_winbindd_state_offline() ) {
-		backend_init_status = NT_STATUS_FILE_IS_OFFLINE;
-		return backend_init_status;		
-	}
-
 	static_init_idmap;
 
 	dom_list = lp_idmap_domains();
@@ -432,13 +433,18 @@
 		/* now that we have methods, set the destructor for this domain */
 		talloc_set_destructor(dom, close_domain_destructor);
 
+		if (compat_params) {
+			dom->params = talloc_strdup(dom, compat_params);
+			IDMAP_CHECK_ALLOC(dom->params);
+		} else {
+			dom->params = NULL;
+		}
+
 		/* Finally instance a backend copy for this domain */
-		ret = dom->methods->init(dom, compat_params);
+		ret = dom->methods->init(dom);
 		if ( ! NT_STATUS_IS_OK(ret)) {
-			DEBUG(0, ("ERROR: Initialization failed for backend %s (domain %s)\n",
+			DEBUG(0, ("ERROR: Initialization failed for backend %s (domain %s), deferred!\n",
 						parm_backend, dom->name));
-			ret = NT_STATUS_UNSUCCESSFUL;
-			goto done;
 		}
 		idmap_domains = talloc_realloc(idmap_ctx, idmap_domains, struct idmap_domain *, i+1);
 		if ( ! idmap_domains) {
@@ -489,8 +495,15 @@
 		/* now that we have methods, set the destructor for this domain */
 		talloc_set_destructor(dom, close_domain_destructor);
 
+		if (compat_params) {
+			dom->params = talloc_strdup(dom, compat_params);
+			IDMAP_CHECK_ALLOC(dom->params);
+		} else {
+			dom->params = NULL;
+		}
+
 		/* Finally instance a backend copy for this domain */
-		ret = dom->methods->init(dom, compat_params);
+		ret = dom->methods->init(dom);
 		if ( ! NT_STATUS_IS_OK(ret)) {
 			DEBUG(0, ("ERROR: Initialization failed for idmap_nss ?!\n"));
 			ret = NT_STATUS_UNSUCCESSFUL;
@@ -533,8 +546,15 @@
 	/* now that we have methods, set the destructor for this domain */
 	talloc_set_destructor(dom, close_domain_destructor);
 
+	if (compat_params) {
+		dom->params = talloc_strdup(dom, compat_params);
+		IDMAP_CHECK_ALLOC(dom->params);
+	} else {
+		dom->params = NULL;
+	}
+
 	/* Finally instance a backend copy for this domain */
-	ret = dom->methods->init(dom, compat_params);
+	ret = dom->methods->init(dom);
 	if ( ! NT_STATUS_IS_OK(ret)) {
 		DEBUG(0, ("ERROR: Initialization failed for idmap_passdb ?!\n"));
 		ret = NT_STATUS_UNSUCCESSFUL;
@@ -595,50 +615,86 @@
 	}
 
 	if ( alloc_backend ) {
+		
+		idmap_alloc_ctx = talloc_zero(idmap_ctx, struct idmap_alloc_context);
+		IDMAP_CHECK_ALLOC(idmap_alloc_ctx);
 
-		alloc_methods = get_alloc_methods(alloc_backends, alloc_backend);
-		if ( ! alloc_methods) {
+		idmap_alloc_ctx->methods = get_alloc_methods(alloc_backends, alloc_backend);
+		if ( ! idmap_alloc_ctx->methods) {
 			ret = smb_probe_module("idmap", alloc_backend);
 			if (NT_STATUS_IS_OK(ret)) {
-				alloc_methods = get_alloc_methods(alloc_backends, alloc_backend);
+				idmap_alloc_ctx->methods = get_alloc_methods(alloc_backends, alloc_backend);
 			}
 		}
-		if ( alloc_methods) {
-			ret = alloc_methods->init(compat_params);
+		if (idmap_alloc_ctx->methods) {
+
+			if (compat_params) {
+				idmap_alloc_ctx->params = talloc_strdup(idmap_alloc_ctx, compat_params);
+				IDMAP_CHECK_ALLOC(idmap_alloc_ctx->params);
+			} else {
+				idmap_alloc_ctx->params = NULL;
+			}
+
+			ret = idmap_alloc_ctx->methods->init(idmap_alloc_ctx->params);
 			if ( ! NT_STATUS_IS_OK(ret)) {
-				DEBUG(0, ("idmap_init: Initialization failed for alloc "
-					  "backend %s\n", alloc_backend));
-				ret = NT_STATUS_UNSUCCESSFUL;
-				goto done;
-		}
+				DEBUG(0, ("ERROR: Initialization failed for alloc "
+					  "backend %s, deferred!\n", alloc_backend));
+			} else {
+				idmap_alloc_ctx->initialized = True;
+			}
 		} else {
 			DEBUG(2, ("idmap_init: Unable to get methods for alloc backend %s\n", 
 				  alloc_backend));
 			/* certain compat backends are just readonly */
-			if ( compat )
+			if ( compat ) {
+				TALLOC_FREE(idmap_alloc_ctx);
 				ret = NT_STATUS_OK;
-			else
+			} else {
 				ret = NT_STATUS_UNSUCCESSFUL;
+			}
 		}
 	}
 	
 	/* cleanpu temporary strings */
 	TALLOC_FREE( compat_backend );
+
+	idmap_init_status = NT_STATUS_OK;
 	
-	backend_init_status = NT_STATUS_OK;
-	
 	return ret;
 
 done:
 	DEBUG(0, ("Aborting IDMAP Initialization ...\n"));
 	idmap_close();
 
-	/* save the init status for later checks */
-	backend_init_status = ret;
-	
 	return ret;
 }
 
+static NTSTATUS idmap_alloc_init(void)
+{
+	NTSTATUS ret;
+
+	if (! NT_STATUS_IS_OK(ret = idmap_init())) {
+		return ret;
+	}
+
+	if ( ! idmap_alloc_ctx) {
+		return NT_STATUS_NOT_SUPPORTED;
+	}
+
+	if ( ! idmap_alloc_ctx->initialized) {
+		ret = idmap_alloc_ctx->methods->init(idmap_alloc_ctx->params);
+		if ( ! NT_STATUS_IS_OK(ret)) {
+			DEBUG(0, ("ERROR: Initialization failed for alloc "
+				  "backend, deferred!\n"));
+			return ret;
+		} else {
+			idmap_alloc_ctx->initialized = True;
+		}
+	}
+
+	return NT_STATUS_OK;
+}
+
 /**************************************************************************
  idmap allocator interface functions
 **************************************************************************/
@@ -647,60 +703,48 @@
 {
 	NTSTATUS ret;
 
-	if (! NT_STATUS_IS_OK(ret = idmap_init())) {
+	if (! NT_STATUS_IS_OK(ret = idmap_alloc_init())) {
 		return ret;
 	}
 
-	if ( !alloc_methods )
-		return NT_STATUS_NOT_SUPPORTED;	
-
 	id->type = ID_TYPE_UID;
-	return alloc_methods->allocate_id(id);
+	return idmap_alloc_ctx->methods->allocate_id(id);
 }
 
 NTSTATUS idmap_allocate_gid(struct unixid *id)
 {
 	NTSTATUS ret;
 
-	if (! NT_STATUS_IS_OK(ret = idmap_init())) {
+	if (! NT_STATUS_IS_OK(ret = idmap_alloc_init())) {
 		return ret;
 	}
 
-	if ( !alloc_methods )
-		return NT_STATUS_NOT_SUPPORTED;	
-
 	id->type = ID_TYPE_GID;
-	return alloc_methods->allocate_id(id);
+	return idmap_alloc_ctx->methods->allocate_id(id);
 }
 
 NTSTATUS idmap_set_uid_hwm(struct unixid *id)
 {
 	NTSTATUS ret;
 
-	if (! NT_STATUS_IS_OK(ret = idmap_init())) {
+	if (! NT_STATUS_IS_OK(ret = idmap_alloc_init())) {
 		return ret;
 	}
 
-	if ( !alloc_methods )
-		return NT_STATUS_NOT_SUPPORTED;	
-
 	id->type = ID_TYPE_UID;
-	return alloc_methods->set_id_hwm(id);
+	return idmap_alloc_ctx->methods->set_id_hwm(id);
 }
 
 NTSTATUS idmap_set_gid_hwm(struct unixid *id)
 {
 	NTSTATUS ret;
 
-	if (! NT_STATUS_IS_OK(ret = idmap_init())) {
+	if (! NT_STATUS_IS_OK(ret = idmap_alloc_init())) {
 		return ret;
 	}
 
-	if ( !alloc_methods )
-		return NT_STATUS_NOT_SUPPORTED;	
-
 	id->type = ID_TYPE_GID;
-	return alloc_methods->set_id_hwm(id);
+	return idmap_alloc_ctx->methods->set_id_hwm(id);
 }
 
 /******************************************************************************
@@ -815,6 +859,11 @@
 	enum lsa_SidType sid_type;
 	BOOL wbret;
 
+	/* If we are offline we cannot lookup SIDs, deny mapping */
+	if (idmap_is_offline())	{
+		return NT_STATUS_FILE_IS_OFFLINE;
+	}
+
 	ret = idmap_can_map(map, &dom);
 	if ( ! NT_STATUS_IS_OK(ret)) {
 		return NT_STATUS_NONE_MAPPED;
@@ -937,11 +986,6 @@
 
 	_ids = ids;
 
-	/* make sure all maps are marked as in UNKNOWN status */
-	for (i = 0; _ids[i]; i++) {
-		_ids[i]->status = ID_UNKNOWN;
-	}
-
 	unmapped = NULL;
 	for (n = num_domains-1; n >= 0; n--) { /* cycle backwards */
 
@@ -950,12 +994,12 @@
 		DEBUG(10, ("Query sids from domain %s\n", dom->name));
 		
 		ret = dom->methods->unixids_to_sids(dom, _ids);
-		IDMAP_CHECK_RET(ret);
+		IDMAP_REPORT_RET(ret);
 
 		unmapped = NULL;
 
 		for (i = 0, u = 0; _ids[i]; i++) {
-			if (_ids[i]->status == ID_UNKNOWN || _ids[i]->status == ID_UNMAPPED) {
+			if (_ids[i]->status != ID_MAPPED) {
 				unmapped = talloc_realloc(ctx, unmapped, struct id_map *, u + 2);
 				IDMAP_CHECK_ALLOC(unmapped);
 				unmapped[u] = _ids[i];
@@ -975,7 +1019,9 @@
 
 	if (unmapped) {
 		/* there are still unmapped ids, map them to the unix users/groups domains */
+		/* except for expired entries, these will be returned as valid (offline mode) */
 		for (i = 0; unmapped[i]; i++) {
+			if (unmapped[i]->status == ID_EXPIRED) continue;
 			switch (unmapped[i]->xid.type) {
 			case ID_TYPE_UID:
 				uid_to_unix_users_sid((uid_t)unmapped[i]->xid.id, unmapped[i]->sid);
@@ -1025,11 +1071,8 @@
 	for (i = 0; ids[i]; i++) {
 		uint32 idx;		
 
-		/* make sure they are unknown to start off */
-		ids[i]->status = ID_UNKNOWN;
-
 		if ( (dom = find_idmap_domain_from_sid( ids[i]->sid )) == NULL ) {
-			/* no vailable idmap_domain.  Move on */
+			/* no available idmap_domain.  Move on */
 			continue;
 		}
 
@@ -1057,7 +1100,7 @@
 			dom = idmap_domains[i];
 			DEBUG(10, ("Query ids from domain %s\n", dom->name));
 			ret = dom->methods->sids_to_unixids(dom, dom_ids[i]);
-			IDMAP_CHECK_RET(ret);
+			IDMAP_REPORT_RET(ret);
 		}
 	}
 
@@ -1065,6 +1108,8 @@
 	/* let's see if we have any unmapped SID left and act accordingly */
 
 	for (i = 0; ids[i]; i++) {
+		/* NOTE: this will NOT touch ID_EXPIRED entries that the backend
+		 * was not able to confirm/deny (offline mode) */
 		if (ids[i]->status == ID_UNKNOWN || ids[i]->status == ID_UNMAPPED) {
 			/* ok this is an unmapped one, see if we can map it */
 			ret = idmap_new_mapping(ctx, ids[i]);
@@ -1075,7 +1120,8 @@
 				/* could not map it */
 				ids[i]->status = ID_UNMAPPED;
 			} else {
-				/* Something very bad happened down there */
+				/* Something very bad happened down there
+				 * OR we are offline */
 				ids[i]->status = ID_UNKNOWN;
 			}
 		}
@@ -1164,13 +1210,6 @@
 
 	/* let's see if there is any id mapping to be retieved from the backends */
 	if (bi) {
-		/* Only do query if we are online */
-		if ( lp_winbind_offline_logon() &&
-		     get_global_winbindd_state_offline() )
-		{
-			ret = NT_STATUS_FILE_IS_OFFLINE;
-			goto done;
-		}
 
 		ret = idmap_backends_unixids_to_sids(bids);
 		IDMAP_CHECK_RET(ret);
@@ -1179,11 +1218,17 @@
 		for (i = 0; i < bi; i++) {
 			if (bids[i]->status == ID_MAPPED) {
 				ret = idmap_cache_set(idmap_cache, bids[i]);
+			} else if (bids[i]->status == ID_EXPIRED) {
+				/* the cache returned an expired entry and the backend was
+				 * was not able to clear the situation (offline).
+				 * This handles a previous NT_STATUS_SYNCHRONIZATION_REQUIRED
+				 * for disconnected mode, */
+				bids[i]->status = ID_MAPPED;
 			} else if (bids[i]->status == ID_UNKNOWN) {
-				/* return an expired entry in the cache or an unknown */
-				/* this handles a previous NT_STATUS_SYNCHRONIZATION_REQUIRED
-				 * for disconnected mode */
-				idmap_cache_map_id(idmap_cache, ids[i]);
+				/* something bad here. We were not able to handle this for some
+				 * reason, mark it as unmapped and hope next time things will
+				 * settle down. */
+				bids[i]->status = ID_UNMAPPED;
 			} else { /* unmapped */
 				ret = idmap_cache_set_negative_id(idmap_cache, bids[i]);
 			}
@@ -1270,13 +1315,6 @@
 
 	/* let's see if there is any id mapping to be retieved from the backends */
 	if (bids) {
-		/* Only do query if we are online */
-		if ( lp_winbind_offline_logon() &&
-		     get_global_winbindd_state_offline() )
-		{
-			ret = NT_STATUS_FILE_IS_OFFLINE;
-			goto done;
-		}
 		
 		ret = idmap_backends_sids_to_unixids(bids);
 		IDMAP_CHECK_RET(ret);
@@ -1285,12 +1323,18 @@
 		for (i = 0; bids[i]; i++) {
 			if (bids[i]->status == ID_MAPPED) {
 				ret = idmap_cache_set(idmap_cache, bids[i]);
+			} else if (bids[i]->status == ID_EXPIRED) {
+				/* the cache returned an expired entry and the backend was
+				 * was not able to clear the situation (offline).
+				 * This handles a previous NT_STATUS_SYNCHRONIZATION_REQUIRED
+				 * for disconnected mode, */
+				bids[i]->status = ID_MAPPED;
 			} else if (bids[i]->status == ID_UNKNOWN) {
-				/* return an expired entry in the cache or an unknown */
-				/* this handles a previous NT_STATUS_SYNCHRONIZATION_REQUIRED
-				 * for disconnected mode */
-				idmap_cache_map_id(idmap_cache, ids[i]);
-			} else {
+				/* something bad here. We were not able to handle this for some
+				 * reason, mark it as unmapped and hope next time things will
+				 * settle down. */
+				bids[i]->status = ID_UNMAPPED;
+			} else { /* unmapped */
 				ret = idmap_cache_set_negative_sid(idmap_cache, bids[i]);
 			}
 			IDMAP_CHECK_RET(ret);
@@ -1362,15 +1406,15 @@
 		return;
 	}
 
-	if ( alloc_methods ) {		
+	if (NT_STATUS_IS_OK(ret = idmap_alloc_init())) {		
 		allid.type = ID_TYPE_UID;
 		allid.id = 0;
-		alloc_methods->get_id_hwm(&allid);
+		idmap_alloc_ctx->methods->get_id_hwm(&allid);
 		fprintf(dump, "USER HWM %lu\n", (unsigned long)allid.id);
 		
 		allid.type = ID_TYPE_GID;
 		allid.id = 0;
-		alloc_methods->get_id_hwm(&allid);
+		idmap_alloc_ctx->methods->get_id_hwm(&allid);
 		fprintf(dump, "GROUP HWM %lu\n", (unsigned long)allid.id);
 	}
 	
Index: source/nsswitch/idmap_ldap.c
===================================================================
--- source/nsswitch/idmap_ldap.c	(revision 22320)
+++ source/nsswitch/idmap_ldap.c	(working copy)
@@ -151,6 +151,7 @@
 				&result);
 
 	if (rc != LDAP_SUCCESS) {
+		DEBUG(1, ("Unable to verify the idpool, cannot continue initialization!\n"));
 		return NT_STATUS_UNSUCCESSFUL;
 	}
 
@@ -209,6 +210,11 @@
 	gid_t low_gid = 0;
 	gid_t high_gid = 0;
 
+	/* Only do init if we are online */
+	if (idmap_is_offline())	{
+		return NT_STATUS_FILE_IS_OFFLINE;
+	}
+
 	idmap_alloc_ldap = talloc_zero(NULL, struct idmap_ldap_alloc_context);
         CHECK_ALLOC_DONE( idmap_alloc_ldap );
 	
@@ -344,6 +350,11 @@
 	const char **attr_list;
 	const char *type;
 
+	/* Only do query if we are online */
+	if (idmap_is_offline())	{
+		return NT_STATUS_FILE_IS_OFFLINE;
+	}
+
 	if ( ! idmap_alloc_ldap) {
 		return NT_STATUS_UNSUCCESSFUL;
 	}
@@ -490,6 +501,11 @@
 	const char **attr_list;
 	const char *type;
 
+	/* Only do query if we are online */
+	if (idmap_is_offline())	{
+		return NT_STATUS_FILE_IS_OFFLINE;
+	}
+
 	if ( ! idmap_alloc_ldap) {
 		return NT_STATUS_UNSUCCESSFUL;
 	}
@@ -580,6 +596,11 @@
 	const char **attr_list;
 	const char *type;
 
+	/* Only do query if we are online */
+	if (idmap_is_offline())	{
+		return NT_STATUS_FILE_IS_OFFLINE;
+	}
+
 	if ( ! idmap_alloc_ldap) {
 		return NT_STATUS_UNSUCCESSFUL;
 	}
@@ -700,14 +721,19 @@
  Initialise idmap database. 
 ********************************/
 
-static NTSTATUS idmap_ldap_db_init(struct idmap_domain *dom, const char *params)
+static NTSTATUS idmap_ldap_db_init(struct idmap_domain *dom)
 {
 	NTSTATUS ret;
 	struct idmap_ldap_context *ctx = NULL;
 	char *config_option = NULL;
 	const char *range = NULL;
 	const char *tmp = NULL;
-	
+
+	/* Only do init if we are online */
+	if (idmap_is_offline())	{
+		return NT_STATUS_FILE_IS_OFFLINE;
+	}
+
 	ctx = talloc_zero(dom, struct idmap_ldap_context);
 	if ( ! ctx) {
 		DEBUG(0, ("Out of memory!\n"));
@@ -732,9 +758,9 @@
 		}
 	}
 
-	if (params && *params) {
+	if (dom->params && *(dom->params)) {
 		/* assume location is the only parameter */
-		ctx->url = talloc_strdup(ctx, params);
+		ctx->url = talloc_strdup(ctx, dom->params);
 	} else {
 		tmp = lp_parm_const_string(-1, config_option, "ldap_url", NULL);
 
@@ -837,6 +863,19 @@
 	int rc;
 	int i;
 
+	/* Only do query if we are online */
+	if (idmap_is_offline())	{
+		return NT_STATUS_FILE_IS_OFFLINE;
+	}
+
+	/* Initilization my have been deferred because we were offline */
+	if ( ! dom->initialized) {
+		ret = idmap_ldap_db_init(dom);
+		if ( ! NT_STATUS_IS_OK(ret)) {
+			return ret;
+		}
+	}
+
 	ctx = talloc_get_type(dom->private_data, struct idmap_ldap_context);	
 
 	memctx = talloc_new(ctx);
@@ -991,10 +1030,10 @@
 
 	ret = NT_STATUS_OK;
 
-
-	/* mark all unknwon ones as unmapped */
+	/* mark all unknwon/expired ones as unmapped */
 	for (i = 0; ids[i]; i++) {
-		if (ids[i]->status == ID_UNKNOWN) ids[i]->status = ID_UNMAPPED;
+		if (ids[i]->status != ID_MAPPED)
+			ids[i]->status = ID_UNMAPPED;
 	}
 
 done:
@@ -1040,6 +1079,19 @@
 	int rc;
 	int i;
 
+	/* Only do query if we are online */
+	if (idmap_is_offline())	{
+		return NT_STATUS_FILE_IS_OFFLINE;
+	}
+
+	/* Initilization my have been deferred because we were offline */
+	if ( ! dom->initialized) {
+		ret = idmap_ldap_db_init(dom);
+		if ( ! NT_STATUS_IS_OK(ret)) {
+			return ret;
+		}
+	}
+
 	ctx = talloc_get_type(dom->private_data, struct idmap_ldap_context);	
 
 	memctx = talloc_new(ctx);
@@ -1192,9 +1244,10 @@
 
 	ret = NT_STATUS_OK;
 
-	/* mark all unknwon ones as unmapped */
+	/* mark all unknwon/expired ones as unmapped */
 	for (i = 0; ids[i]; i++) {
-		if (ids[i]->status == ID_UNKNOWN) ids[i]->status = ID_UNMAPPED;
+		if (ids[i]->status != ID_MAPPED)
+			ids[i]->status = ID_UNMAPPED;
 	}
 
 done:
@@ -1221,6 +1274,19 @@
 	char *dn;
 	int rc = -1;
 
+	/* Only do query if we are online */
+	if (idmap_is_offline())	{
+		return NT_STATUS_FILE_IS_OFFLINE;
+	}
+
+	/* Initilization my have been deferred because we were offline */
+	if ( ! dom->initialized) {
+		ret = idmap_ldap_db_init(dom);
+		if ( ! NT_STATUS_IS_OK(ret)) {
+			return ret;
+		}
+	}
+
 	ctx = talloc_get_type(dom->private_data, struct idmap_ldap_context);	
 
 	switch(map->xid.type) {
@@ -1301,15 +1367,6 @@
 }
 
 /**********************************
- remove a mapping. 
-**********************************/
-
-static NTSTATUS idmap_ldap_remove_mapping(struct idmap_domain *dom, const struct id_map *map)
-{
-	return NT_STATUS_UNSUCCESSFUL;
-}
-
-/**********************************
  Close the idmap ldap instance 
 **********************************/
 
@@ -1333,8 +1390,6 @@
 	.unixids_to_sids = idmap_ldap_unixids_to_sids,
 	.sids_to_unixids = idmap_ldap_sids_to_unixids,
 	.set_mapping = idmap_ldap_set_mapping,
-	.remove_mapping = idmap_ldap_remove_mapping,
-	/* .dump_data = TODO */
 	.close_fn = idmap_ldap_close
 };
 
Index: source/include/idmap.h
===================================================================
--- source/include/idmap.h	(revision 22320)
+++ source/include/idmap.h	(working copy)
@@ -42,13 +42,15 @@
 	BOOL readonly;
 	void *private_data;
 	struct idmap_methods *methods;
+	BOOL initialized;
+	const char *params;
 };
 
 /* Filled out by IDMAP backends */
 struct idmap_methods {
 
 	/* Called when backend is first loaded */
-	NTSTATUS (*init)(struct idmap_domain *dom, const char *compat_params);
+	NTSTATUS (*init)(struct idmap_domain *dom);
 
 	NTSTATUS (*unixids_to_sids)(struct idmap_domain *dom, struct id_map **ids);
 	NTSTATUS (*sids_to_unixids)(struct idmap_domain *dom, struct id_map **ids);
Index: source/include/smb.h
===================================================================
--- source/include/smb.h	(revision 22320)
+++ source/include/smb.h	(working copy)
@@ -288,7 +288,8 @@
 enum id_mapping {
 	ID_UNKNOWN,
 	ID_MAPPED,
-	ID_UNMAPPED
+	ID_UNMAPPED,
+	ID_EXPIRED
 };
 
 enum id_type {


Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- samba.spec	16 Apr 2007 15:52:28 -0000	1.109
+++ samba.spec	18 Apr 2007 14:52:03 -0000	1.110
@@ -4,7 +4,7 @@
 Name: samba
 Epoch: 0
 Version: 3.0.25
-Release: 0.7.rc1%{?dist}
+Release: 0.7.rc1%{?dist}.2
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.samba.org/
@@ -50,6 +50,7 @@
 Patch200: samba-3.0.25rc1-inotifiy.patch
 Patch201: samba-3-0-25rc1-bugday-apr10.patch
 Patch202: samba3_idmap_loop.patch
+Patch203: samba3_idmap_offline.patch
 
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
@@ -174,6 +175,7 @@
 %patch200 -p0 -b .inotify
 %patch201 -p0 -b .bugday
 %patch202 -p0 -b .idmap_loop
+%patch203 -p0 -b .idmap_offline
 
 # crap
 rm -f examples/VFS/.cvsignore



From fedora-cvs-commits at redhat.com  Wed Apr 18 14:55:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 10:55:45 -0400
Subject: rpms/libraw1394/devel firewire-cdev.h, 1.1, 1.2 libraw1394.spec,
	1.30, 1.31
Message-ID: <200704181455.l3IEtj8w002018@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/libraw1394/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1968

Modified Files:
	firewire-cdev.h libraw1394.spec 
Log Message:
* Wed Apr 18 2007 Kristian H??gsberg <krh at redhat.com> - 1.2.1-7
- Update firewire-cdev.h again to get the iso context create ioctl changes.
- Bump kernel requires accordingly.



Index: firewire-cdev.h
===================================================================
RCS file: /cvs/dist/rpms/libraw1394/devel/firewire-cdev.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firewire-cdev.h	18 Apr 2007 00:59:15 -0000	1.1
+++ firewire-cdev.h	18 Apr 2007 14:55:42 -0000	1.2
@@ -133,7 +133,7 @@
 #define FW_CDEV_IOC_ADD_DESCRIPTOR	_IOWR('#', 0x06, struct fw_cdev_add_descriptor)
 #define FW_CDEV_IOC_REMOVE_DESCRIPTOR	_IOW('#', 0x07, struct fw_cdev_remove_descriptor)
 
-#define FW_CDEV_IOC_CREATE_ISO_CONTEXT	_IOW('#', 0x08, struct fw_cdev_create_iso_context)
+#define FW_CDEV_IOC_CREATE_ISO_CONTEXT	_IOWR('#', 0x08, struct fw_cdev_create_iso_context)
 #define FW_CDEV_IOC_QUEUE_ISO		_IOWR('#', 0x09, struct fw_cdev_queue_iso)
 #define FW_CDEV_IOC_START_ISO		_IOW('#', 0x0a, struct fw_cdev_start_iso)
 #define FW_CDEV_IOC_STOP_ISO		_IOW('#', 0x0b, struct fw_cdev_stop_iso)
@@ -233,6 +233,7 @@
 	__u32 header_size;
 	__u32 channel;
 	__u32 speed;
+	__u64 closure;
 	__u32 handle;
 };
 


Index: libraw1394.spec
===================================================================
RCS file: /cvs/dist/rpms/libraw1394/devel/libraw1394.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- libraw1394.spec	18 Apr 2007 00:59:15 -0000	1.30
+++ libraw1394.spec	18 Apr 2007 14:55:42 -0000	1.31
@@ -12,7 +12,7 @@
 
 Source1:	firewire-cdev.h
 Patch0:		libraw1394-juju.patch
-Requires:	kernel >= 2.6.20-1.3062.fc7
+Requires:	kernel >= 2.6.20-1.3087.fc7
 
 %description
 The libraw1394 library provides direct access to the IEEE-1394 bus through
@@ -78,7 +78,11 @@
 
 
 %changelog
-* Tue Apr 17 2007 Kristian H??gsberg <krh at redhat.com> - 1.2.1--6
+* Wed Apr 18 2007 Kristian H??gsberg <krh at redhat.com> - 1.2.1-7
+- Update firewire-cdev.h again to get the iso context create ioctl changes.
+- Bump kernel requires accordingly.
+
+* Tue Apr 17 2007 Kristian H??gsberg <krh at redhat.com> - 1.2.1-6
 - Update to latest ioctl changes.
 
 * Thu Apr 12 2007 Kristian H??gsberg <krh at redhat.com> - 1.2.1-5



From fedora-cvs-commits at redhat.com  Wed Apr 18 14:56:34 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 10:56:34 -0400
Subject: rpms/libraw1394/devel libraw1394.spec,1.31,1.32
Message-ID: <200704181456.l3IEuY9F002705@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/libraw1394/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2650

Modified Files:
	libraw1394.spec 
Log Message:
Bump release.


Index: libraw1394.spec
===================================================================
RCS file: /cvs/dist/rpms/libraw1394/devel/libraw1394.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- libraw1394.spec	18 Apr 2007 14:55:42 -0000	1.31
+++ libraw1394.spec	18 Apr 2007 14:56:32 -0000	1.32
@@ -1,7 +1,7 @@
 Summary:        Library providing low-level IEEE-1394 access
 Name:           libraw1394
 Version:        1.2.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 Source:         http://www.linux1394.org/dl/libraw1394-%{version}.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 18 15:18:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 11:18:31 -0400
Subject: rpms/control-center/devel control-center-2.18.0-gnome-bg.patch, 1.2,
	1.3 control-center-2.9.4-filesel.patch, 1.1,
	1.2 control-center.spec, 1.247, 1.248
Message-ID: <200704181518.l3IFIVcg018454@cvs.devel.redhat.com>

Author: sandmann

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18411

Modified Files:
	control-center-2.18.0-gnome-bg.patch 
	control-center-2.9.4-filesel.patch control-center.spec 
Log Message:
Add gnome bg patch again

control-center-2.18.0-gnome-bg.patch:
 capplets/background/gnome-wp-capplet.c            |   41 +++
 capplets/background/gnome-wp-info.c               |   21 -
 capplets/background/gnome-wp-info.h               |    1 
 capplets/background/gnome-wp-item.c               |  251 +++++-----------------
 capplets/background/gnome-wp-item.h               |    6 
 capplets/background/gnome-wp-xml.c                |    7 
 gnome-settings-daemon/gnome-settings-background.c |  205 +++++++++++++++--
 7 files changed, 287 insertions(+), 245 deletions(-)

Index: control-center-2.18.0-gnome-bg.patch
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center-2.18.0-gnome-bg.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- control-center-2.18.0-gnome-bg.patch	23 Mar 2007 21:37:29 -0000	1.2
+++ control-center-2.18.0-gnome-bg.patch	18 Apr 2007 15:18:29 -0000	1.3
@@ -0,0 +1,731 @@
+--- control-center-2.18.0/capplets/background/gnome-wp-item.h.gnome-bg	2007-01-02 07:47:00.000000000 -0500
++++ control-center-2.18.0/capplets/background/gnome-wp-item.h	2007-04-18 10:32:59.000000000 -0400
+@@ -24,6 +24,7 @@
+ #include <libgnomeui/gnome-thumbnail.h>
+ #include <gnome-wp-info.h>
+ #include <libgnomevfs/gnome-vfs.h>
++#include <libgnomeui/gnome-bg.h>
+ 
+ #ifndef _GNOME_WP_ITEM_H_
+ #define _GNOME_WP_ITEM_H_
+@@ -31,6 +32,8 @@
+ typedef struct _GnomeWPItem GnomeWPItem;
+ 
+ struct _GnomeWPItem {
++  GnomeBG *bg;
++    
+   gchar * name;
+   gchar * filename;
+   gchar * description;
+@@ -48,7 +51,6 @@
+   GdkColor * scolor;
+ 
+   GnomeWPInfo * fileinfo;
+-  GnomeWPInfo * uriinfo;
+ 
+   /* Did the user remove us? */
+   gboolean deleted;
+@@ -62,10 +64,10 @@
+ 				 GHashTable * wallpapers,
+ 				 GnomeThumbnailFactory * thumbnails);
+ void gnome_wp_item_free (GnomeWPItem * item);
+-GnomeWPItem * gnome_wp_item_dup (GnomeWPItem * item);
+ GdkPixbuf * gnome_wp_item_get_thumbnail (GnomeWPItem * item,
+ 					 GnomeThumbnailFactory * thumbs);
+ void gnome_wp_item_update_description (GnomeWPItem * item);
++void gnome_wp_item_ensure_gnome_bg (GnomeWPItem *item);
+ 
+ #endif
+ 
+--- control-center-2.18.0/capplets/background/gnome-wp-capplet.c.gnome-bg	2007-03-06 04:40:46.000000000 -0500
++++ control-center-2.18.0/capplets/background/gnome-wp-capplet.c	2007-04-18 11:12:56.000000000 -0400
+@@ -17,7 +17,7 @@
+  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+  *
+  */
+-
++#include <libgnomeui/gnome-bg.h>
+ #include "gnome-wp-capplet.h"
+ 
+ enum {
+@@ -193,6 +193,43 @@
+   }
+ }
+ 
++static gboolean predicate (gpointer key, gpointer value, gpointer data)
++{
++  GnomeBG *bg = data;
++  GnomeWPItem *item = value;
++
++  return item->bg == bg;
++}
++
++static void on_item_changed (GnomeBG *bg, GnomeWPCapplet *capplet) {
++  GtkTreeModel *model;
++  GtkTreeIter iter;
++  GtkTreePath *path;
++  GnomeWPItem *item;
++
++  item = g_hash_table_find (capplet->wphash, predicate, bg);
++
++  if (!item)
++    return;
++  
++  model = gtk_tree_row_reference_get_model (item->rowref);
++  path = gtk_tree_row_reference_get_path (item->rowref);
++
++  if (gtk_tree_model_get_iter (model, &iter, path)) {
++    g_signal_handlers_block_by_func (bg, G_CALLBACK (on_item_changed), capplet);
++      
++    GdkPixbuf *pixbuf = gnome_wp_item_get_thumbnail (item, capplet->thumbs);
++    if (pixbuf) {
++      gtk_list_store_set (GTK_LIST_STORE (capplet->model), &iter,
++			  0, pixbuf,
++			  -1);
++      g_object_unref (pixbuf);
++    }
++
++    g_signal_handlers_unblock_by_func (bg, G_CALLBACK (on_item_changed), capplet);
++  }
++}
++
+ static void wp_props_load_wallpaper (gchar * key,
+ 				     GnomeWPItem * item,
+ 				     GnomeWPCapplet * capplet) {
+@@ -224,6 +261,7 @@
+   }
+   path = gtk_tree_model_get_path (capplet->model, &iter);
+   item->rowref = gtk_tree_row_reference_new (capplet->model, path);
++  g_signal_connect (item->bg, "changed", G_CALLBACK (on_item_changed), capplet);
+   gtk_tree_path_free (path);
+ }
+ 
+@@ -1052,7 +1090,6 @@
+ 							       NULL);
+   gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (capplet->filesel),
+ 					TRUE);
+-
+   gtk_file_chooser_set_use_preview_label (GTK_FILE_CHOOSER (capplet->filesel),
+ 					  FALSE);
+ 
+--- control-center-2.18.0/capplets/background/gnome-wp-info.h.gnome-bg	2007-01-02 07:47:00.000000000 -0500
++++ control-center-2.18.0/capplets/background/gnome-wp-info.h	2007-04-18 10:32:59.000000000 -0400
+@@ -40,7 +40,6 @@
+ 
+ GnomeWPInfo * gnome_wp_info_new (const gchar * uri,
+ 				 GnomeThumbnailFactory * thumbs);
+-GnomeWPInfo * gnome_wp_info_dup (const GnomeWPInfo * info);
+ void gnome_wp_info_free (GnomeWPInfo * info);
+ 
+ #endif
+--- control-center-2.18.0/capplets/background/gnome-wp-xml.c.gnome-bg	2007-03-06 04:40:46.000000000 -0500
++++ control-center-2.18.0/capplets/background/gnome-wp-xml.c	2007-04-18 10:45:34.000000000 -0400
+@@ -223,16 +223,19 @@
+ 	   g_file_test (wp->filename, G_FILE_TEST_EXISTS)) ||
+ 	  !strcmp (wp->filename, "(none)")) {
+ 	wp->fileinfo = gnome_wp_info_new (wp->filename, capplet->thumbs);
+-
+ 	if (wp->name == NULL || !strcmp (wp->filename, "(none)")) {
+ 	  wp->name = g_strdup (wp->fileinfo->name);
+ 	}
+-
++	
+ 	gnome_wp_item_update_description (wp);
+ 	g_hash_table_insert (capplet->wphash, wp->filename, wp);
+       } else {
+ 	gnome_wp_item_free (wp);
++	wp = NULL;
+       }
++
++      if (wp)
++	gnome_wp_item_ensure_gnome_bg (wp);
+     }
+   }
+   xmlFreeDoc (wplist);
+--- control-center-2.18.0/capplets/background/gnome-wp-item.c.gnome-bg	2007-03-06 04:40:46.000000000 -0500
++++ control-center-2.18.0/capplets/background/gnome-wp-item.c	2007-04-18 10:41:00.000000000 -0400
+@@ -25,10 +25,56 @@
+ #include <gnome.h>
+ #include <string.h>
+ #include <libgnomevfs/gnome-vfs-mime-handlers.h>
++#include <libgnomeui/gnome-bg.h>
+ 
+ #include "gnome-wp-item.h"
+ #include "gnome-wp-utils.h"
+ 
++static void set_bg_properties (GnomeWPItem *item)
++{
++  GnomeBGColorType color;
++  GnomeBGPlacement placement;
++
++  color = GNOME_BG_COLOR_SOLID;
++  
++  if (item->shade_type) {
++    if (!strcmp (item->shade_type, "horizontal-gradient")) {
++      color = GNOME_BG_COLOR_H_GRADIENT;
++    } else if (!strcmp (item->shade_type, "vertical-gradient")) {
++      color = GNOME_BG_COLOR_V_GRADIENT;
++    }
++  }
++
++  placement = GNOME_BG_PLACEMENT_TILED;
++  
++  if (item->options) {
++    if (!strcmp (item->options, "centered")) {
++      placement = GNOME_BG_PLACEMENT_CENTERED;
++    } else if (!strcmp (item->options, "stretched")) {
++      placement = GNOME_BG_PLACEMENT_FILL_SCREEN;
++    } else if (!strcmp (item->options, "scaled")) {
++      placement = GNOME_BG_PLACEMENT_SCALED;
++    } else if (!strcmp (item->options, "zoom")) {
++      placement = GNOME_BG_PLACEMENT_ZOOMED;
++    }
++  }
++
++  if (item->filename)
++    gnome_bg_set_uri (item->bg, item->filename);
++
++  gnome_bg_set_color (item->bg, color, item->pcolor, item->scolor);
++  gnome_bg_set_placement (item->bg, placement);
++}
++
++void gnome_wp_item_ensure_gnome_bg (GnomeWPItem *item)
++{
++  if (!item->bg) {
++    item->bg = gnome_bg_new ();
++
++    set_bg_properties (item);
++  }
++}
++
+ GnomeWPItem * gnome_wp_item_new (const gchar * filename,
+ 				 GHashTable * wallpapers,
+ 				 GnomeThumbnailFactory * thumbnails) {
+@@ -54,8 +100,11 @@
+   item->pcolor = gdk_color_copy (&color1);
+   item->scolor = gdk_color_copy (&color2);
+ 
+-  if (item->fileinfo != NULL &&
++  if (item->fileinfo != NULL) {
++#if 0
++      &&
+       !strncmp (item->fileinfo->mime_type, "image/", strlen ("image/"))) {
++#endif
+     if (item->name == NULL) {
+       if (g_utf8_validate (item->fileinfo->name, -1, NULL))
+ 	item->name = g_strdup (item->fileinfo->name);
+@@ -76,6 +125,10 @@
+     item = NULL;
+   }
+ 
++  if (item) {
++    gnome_wp_item_ensure_gnome_bg (item);
++  }
++  
+   g_object_unref (client);
+ 
+   return item;
+@@ -103,51 +156,15 @@
+     gdk_color_free (item->scolor);
+ 
+   gnome_wp_info_free (item->fileinfo);
+-  gnome_wp_info_free (item->uriinfo);
+ 
+   gtk_tree_row_reference_free (item->rowref);
+ 
++  if (item->bg)
++      g_object_unref (item->bg);
++  
+   item = NULL;
+ }
+ 
+-GnomeWPItem * gnome_wp_item_dup (GnomeWPItem * item) {
+-  GnomeWPItem * new_item;
+-  GdkColor color1, color2;
+-
+-  if (item == NULL) {
+-    return NULL;
+-  }
+-
+-  new_item = g_new0 (GnomeWPItem, 1);
+-
+-  new_item->name = g_strdup (item->name);
+-  new_item->filename = g_strdup (item->filename);
+-  new_item->description = g_strdup (item->description);
+-  new_item->imguri = g_strdup (item->imguri);
+-  new_item->options = g_strdup (item->options);
+-  new_item->shade_type = g_strdup (item->shade_type);
+-
+-  new_item->pri_color = g_strdup (item->pri_color);
+-  new_item->sec_color = g_strdup (item->sec_color);
+-
+-  gdk_color_parse (item->pri_color, &color1);
+-  gdk_color_parse (item->sec_color, &color2);
+-
+-  item->pcolor = gdk_color_copy (&color1);
+-  item->scolor = gdk_color_copy (&color2);
+-
+-  new_item->fileinfo = gnome_wp_info_dup (item->fileinfo);
+-  new_item->uriinfo = gnome_wp_info_dup (item->uriinfo);
+-
+-  new_item->rowref = gtk_tree_row_reference_copy (item->rowref);
+-
+-  new_item->deleted = item->deleted;
+-  new_item->width = item->width;
+-  new_item->height = item->height;
+-
+-  return new_item;
+-}
+-
+ static void collect_save_options (GdkPixbuf * pixbuf,
+ 				  gchar *** keys,
+ 				  gchar *** vals,
+@@ -201,153 +218,19 @@
+ 
+ GdkPixbuf * gnome_wp_item_get_thumbnail (GnomeWPItem * item,
+ 					 GnomeThumbnailFactory * thumbs) {
+-  GdkPixbuf * pixbuf, * bgpixbuf;
+-  GdkPixbuf * scaled = NULL;
+-  gint sw, sh, bw, bh, pw, ph, tw, th;
+-  gdouble ratio;
+-
+-  sw = sh = bw = bh = pw = ph = tw = th = 0;
+-
+-  /*
+-     Get the size of the screen and calculate our aspect ratio divisor
+-     We do this, so that images are thumbnailed as they would look on
+-     the screen in reality
+-  */
+-  sw = gdk_screen_get_width (gdk_screen_get_default ());
+-  sh = gdk_screen_get_height (gdk_screen_get_default ());
+-  ratio = (gdouble) sw / (gdouble) LIST_IMAGE_WIDTH;
+-  bw = sw / ratio;
+-  bh = sh / ratio;
+-
+-  /*
+-     Create the pixbuf for the background colors, which will show up for
+-     oddly sized images, smaller images that are centered, or alpha images
+-  */
+-  if (!strcmp (item->shade_type, "solid")) {
+-    bgpixbuf = gnome_wp_pixbuf_new_solid (item->pcolor, bw, bh);
+-  } else if (!strcmp (item->shade_type, "vertical-gradient")) {
+-    bgpixbuf = gnome_wp_pixbuf_new_gradient (GTK_ORIENTATION_VERTICAL,
+-					     item->pcolor, item->scolor,
+-					     bw, bh);
+-  } else {
+-    bgpixbuf = gnome_wp_pixbuf_new_gradient (GTK_ORIENTATION_HORIZONTAL,
+-					     item->pcolor, item->scolor,
+-					     bw, bh);
+-  }
+ 
+-  /*
+-     Load up the thumbnail image using the thumbnail spec
+-     If the image doesn't exist, we create it
+-     If we are creating the thumbnail for "No Wallpaper", then we just copy
+-     the background colors pixbuf we created above, here
+-  */
+-  pixbuf = NULL;
+-  if (!strcmp (item->filename, "(none)")) {
+-    return bgpixbuf;
+-  } else {
+-    gchar * escaped_path, * thumbnail_filename;
+-
+-    escaped_path = gnome_vfs_escape_path_string (item->filename);
+-    thumbnail_filename = gnome_thumbnail_factory_lookup (thumbs,
+-                                                         escaped_path,
+-                                                         item->fileinfo->mtime);
+-
+-    if (thumbnail_filename == NULL) {
+-    pixbuf = gnome_thumbnail_factory_generate_thumbnail (thumbs,
+-							 escaped_path,
+-							 item->fileinfo->mime_type);
+-    gnome_thumbnail_factory_save_thumbnail (thumbs, pixbuf,
+-					    escaped_path,
+-					    item->fileinfo->mtime);
+-       g_object_unref (pixbuf);
+-       pixbuf = NULL;
+-
+-       thumbnail_filename = gnome_thumbnail_factory_lookup (thumbs,
+-                                                            escaped_path,
+-                                                            item->fileinfo->mtime);
+-    }
++  GdkPixbuf *pixbuf;
++  double aspect =
++    (double)gdk_screen_get_height (gdk_screen_get_default()) / 
++    gdk_screen_get_width (gdk_screen_get_default());
+ 
+-    if (thumbnail_filename != NULL) {
+- 
+-      pixbuf = gdk_pixbuf_new_from_file (thumbnail_filename, NULL);
+-
+-      if (pixbuf != NULL) {
+-      	g_free (item->fileinfo->thumburi);
+-        item->fileinfo->thumburi = thumbnail_filename;
+-        thumbnail_filename = NULL;
+-      }
+-
+-      g_free (thumbnail_filename);
+-    }
+-
+-    g_free (escaped_path);
+-  }
+-
+-  if (pixbuf != NULL) {
+-    const gchar * w_val, * h_val;
+-
+-    w_val = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Width");
+-    h_val = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Height");
+-    if (item->width <= 0 || item->height <= 0) {
+-      if (w_val && h_val) {
+-	item->width = atoi (w_val);
+-	item->height = atoi (h_val);
+-      } else {
+-	gchar ** keys = NULL;
+-	gchar ** vals = NULL;
+-
+-        gdk_pixbuf_get_file_info (item->filename, 
+-                                  &item->width, &item->height); 
+-	collect_save_options (pixbuf, &keys, &vals, item->width, item->height);
+-	gdk_pixbuf_savev (pixbuf, item->fileinfo->thumburi, "png",
+-			  keys, vals, NULL);
+-
+-	g_strfreev (keys);
+-	g_strfreev (vals);
+-      }
+-    }
+-
+-    pw = gdk_pixbuf_get_width (pixbuf);
+-    ph = gdk_pixbuf_get_height (pixbuf);
+-
+-    if (item->width <= bw && item->height <= bh)
+-      ratio = 1.0;
+-
+-    tw = item->width / ratio;
+-    th = item->height / ratio;
+-
+-    if (!strcmp (item->options, "wallpaper")) {
+-      scaled = gnome_wp_pixbuf_tile (pixbuf, bgpixbuf, tw, th);
+-    } else if (!strcmp (item->options, "centered")) {
+-      scaled = gnome_wp_pixbuf_center (pixbuf, bgpixbuf, tw, th);
+-    } else if (!strcmp (item->options, "stretched")) {
+-      scaled = gnome_wp_pixbuf_center (pixbuf, bgpixbuf, bw, bh);
+-    } else if (!strcmp (item->options, "scaled")) {
+-      if ((gdouble) ph * (gdouble) bw > (gdouble) pw * (gdouble) bh) {
+-	tw = 0.5 + (gdouble) pw * (gdouble) bh / (gdouble) ph;
+-	th = bh;
+-      } else {
+-	th = 0.5 + (gdouble) ph * (gdouble) bw / (gdouble) pw;
+-	tw = bw;
+-      }
+-      scaled = gnome_wp_pixbuf_center (pixbuf, bgpixbuf, tw, th);
+-    } else if (!strcmp (item->options, "zoom")) {
+-      if ((gdouble) ph * (gdouble) bw < (gdouble) pw * (gdouble) bh) {
+-	tw = 0.5 + (gdouble) pw * (gdouble) bh / (gdouble) ph; 
+-	th = bh;
+-      } else {
+-	th = 0.5 + (gdouble) ph * (gdouble) bw / (gdouble) pw;
+-	tw = bw;
+-      }
+-      scaled = gnome_wp_pixbuf_center (pixbuf, bgpixbuf, tw, th);
+-    }
+-
+-    g_object_unref (pixbuf);
+-  }
+-
+-  g_object_unref (bgpixbuf);
++  set_bg_properties (item);
++  
++  pixbuf = gnome_bg_create_thumbnail (item->bg, thumbs, gdk_screen_get_default(), LIST_IMAGE_WIDTH, LIST_IMAGE_WIDTH * aspect);
+ 
+-  return scaled;
++  gnome_bg_get_image_size (item->bg, thumbs, &item->width, &item->height);
++  
++  return pixbuf;
+ }
+ 
+ void gnome_wp_item_update_description (GnomeWPItem * item) {
+--- control-center-2.18.0/capplets/background/gnome-wp-info.c.gnome-bg	2007-01-08 13:15:11.000000000 -0500
++++ control-center-2.18.0/capplets/background/gnome-wp-info.c	2007-04-18 10:32:59.000000000 -0400
+@@ -67,27 +67,6 @@
+   return new;
+ }
+ 
+-GnomeWPInfo * gnome_wp_info_dup (const GnomeWPInfo * info) {
+-  GnomeWPInfo * new;
+-
+-  if (info == NULL) {
+-    return NULL;
+-  }
+-
+-  new = g_new0 (GnomeWPInfo, 1);
+-
+-  new->uri = g_strdup (info->uri);
+-  new->thumburi = g_strdup (info->uri);
+-
+-  new->name = g_strdup (info->name);
+-  new->mime_type = g_strdup (info->mime_type);
+-
+-  new->size = info->size;
+-  new->mtime = info->mtime;
+-
+-  return new;
+-}
+-
+ void gnome_wp_info_free (GnomeWPInfo * info) {
+   if (info == NULL) {
+     return;
+--- control-center-2.18.0/gnome-settings-daemon/gnome-settings-background.c.gnome-bg	2007-01-30 11:50:36.000000000 -0500
++++ control-center-2.18.0/gnome-settings-daemon/gnome-settings-background.c	2007-04-18 10:32:59.000000000 -0400
+@@ -30,73 +30,148 @@
+ #include <gdk/gdk.h>
+ #include <gdk/gdkx.h>
+ #include <gconf/gconf.h>
++#include <libgnomeui/gnome-bg.h>
++#include <X11/Xatom.h>
++#include <string.h>
+ 
+ #include "gnome-settings-background.h"
+ #include "gnome-settings-keyboard.h"
+ #include "gnome-settings-daemon.h"
+ 
+ #include "preferences.h"
+-#include "applier.h"
+ 
+-static BGApplier **bg_appliers;
+ static BGPreferences *prefs;
++static GnomeBG *bg;
+ 
+-static guint applier_idle_id = 0;
++static guint timeout_id = 0;
++
++static gboolean nautilus_is_running (void);
+ 
+ static gboolean
+-applier_idle (gpointer data)
++apply_prefs (gpointer data)
+ {
+-	int i;
+-	for (i = 0; bg_appliers [i]; i++)
+-		bg_applier_apply_prefs (bg_appliers [i], prefs);
+-	applier_idle_id = 0;
++	if (!nautilus_is_running()) {
++		GdkDisplay *display;
++		int n_screens, i;
++		GnomeBGPlacement placement;
++		GnomeBGColorType color;
++		const char *uri;
++		
++		display = gdk_display_get_default ();
++		n_screens = gdk_display_get_n_screens (display);
++		
++		uri = prefs->wallpaper_filename;
++	
++		placement = GNOME_BG_PLACEMENT_TILED;
++		
++		switch (prefs->wallpaper_type) {
++		case WPTYPE_TILED:
++			placement = GNOME_BG_PLACEMENT_TILED;
++			break;
++		case WPTYPE_CENTERED:
++			placement = GNOME_BG_PLACEMENT_CENTERED;
++			break;
++		case WPTYPE_SCALED:
++			placement = GNOME_BG_PLACEMENT_SCALED;
++			break;
++		case WPTYPE_STRETCHED:
++			placement = GNOME_BG_PLACEMENT_FILL_SCREEN;
++			break;
++		case WPTYPE_ZOOM:
++			placement = GNOME_BG_PLACEMENT_ZOOMED;
++			break;
++		case WPTYPE_NONE:
++		case WPTYPE_UNSET:
++			uri = NULL;
++			break;
++		}
++
++		switch (prefs->orientation) {
++		case ORIENTATION_SOLID:
++			color = GNOME_BG_COLOR_SOLID;
++			break;
++		case ORIENTATION_HORIZ:
++			color = GNOME_BG_COLOR_H_GRADIENT;
++			break;
++		case ORIENTATION_VERT:
++			color = GNOME_BG_COLOR_V_GRADIENT;
++			break;
++		default:
++			color = GNOME_BG_COLOR_SOLID;
++			break;
++		}
++		
++		gnome_bg_set_uri (bg, uri);
++		gnome_bg_set_placement (bg, placement);
++		gnome_bg_set_color (bg, color, prefs->color1, prefs->color2);
++		
++		for (i = 0; i < n_screens; ++i) {
++			GdkScreen *screen;
++			GdkWindow *root_window;
++			GdkPixmap *pixmap;
++			
++			screen = gdk_display_get_screen (display, i);
++			
++			root_window = gdk_screen_get_root_window (screen);
++
++			pixmap = gnome_bg_create_pixmap (bg, root_window,
++							 gdk_screen_get_width (screen),
++							 gdk_screen_get_height (screen),
++							 TRUE);
++
++			gnome_bg_set_pixmap_as_root (screen, pixmap);
++
++			g_object_unref (pixmap);
++		}
++	}
++	
+ 	return FALSE;
+ }
+ 
+ static void
++queue_apply (void)
++{
++	if (timeout_id) {
++		g_source_remove (timeout_id);
++	}
++
++	timeout_id = g_timeout_add (100, apply_prefs, NULL);
++}	
++       
++
++static void
+ background_callback (GConfEntry *entry) 
+ {
+ 	bg_preferences_merge_entry (prefs, entry);
+ 
+-	if (applier_idle_id != 0) {
+-		g_source_remove (applier_idle_id);
+-	}
++	queue_apply ();
++}
+ 
+-	applier_idle_id = g_timeout_add (100, applier_idle, NULL);
++static void
++on_bg_changed (GnomeBG *bg)
++{
++	queue_apply ();
+ }
+ 
+ void
+ gnome_settings_background_init (GConfClient *client)
+ {
+-	GdkDisplay *display;
+-	int         n_screens;
+-	int         i;
+-
+-	display = gdk_display_get_default ();
+-	n_screens = gdk_display_get_n_screens (display);
+-
+-	bg_appliers = g_new (BGApplier *, n_screens + 1);
+-
+-	for (i = 0; i < n_screens; i++) {
+-		GdkScreen *screen;
+-
+-		screen = gdk_display_get_screen (display, i);
++	prefs = BG_PREFERENCES (bg_preferences_new ());
+ 
+-		bg_appliers [i] = BG_APPLIER (bg_applier_new_for_screen (BG_APPLIER_ROOT, screen));
+-	}
+-	bg_appliers [i] = NULL;
++	bg = gnome_bg_new ();
+ 
+-	prefs = BG_PREFERENCES (bg_preferences_new ());
++	g_signal_connect (bg, "changed", G_CALLBACK (on_bg_changed), NULL);
++	
+ 	bg_preferences_load (prefs);
+ 
++	apply_prefs (NULL);
++	
+ 	gnome_settings_daemon_register_callback ("/desktop/gnome/background", background_callback);
+ }
+ 
+ void
+ gnome_settings_background_load (GConfClient *client)
+ {
+-	int i;
+-
+ 	/* If this is set, nautilus will draw the background and is
+ 	 * almost definitely in our session.  however, it may not be
+ 	 * running yet (so is_nautilus_running() will fail).  so, on
+@@ -108,6 +183,70 @@
+ 	if (gconf_client_get_bool (client, "/apps/nautilus/preferences/show_desktop", NULL))
+ 		return;
+ 
+-	for (i = 0; bg_appliers [i]; i++)
+-		bg_applier_apply_prefs (bg_appliers [i], prefs);
++	apply_prefs (NULL);
++}
++
++static gboolean
++nautilus_is_running (void)
++{
++	Atom window_id_atom;
++	Window nautilus_xid;
++	Atom actual_type;
++	int actual_format;
++	unsigned long nitems, bytes_after;
++	unsigned char *data;
++	int retval;
++	Atom wmclass_atom;
++	gboolean running;
++	gint error;
++
++	window_id_atom = XInternAtom (GDK_DISPLAY (), 
++				      "NAUTILUS_DESKTOP_WINDOW_ID", True);
++
++	if (window_id_atom == None) return FALSE;
++
++	retval = XGetWindowProperty (GDK_DISPLAY (), GDK_ROOT_WINDOW (),
++				     window_id_atom, 0, 1, False, XA_WINDOW,
++				     &actual_type, &actual_format, &nitems,
++				     &bytes_after, &data);
++
++	if (data != NULL) {
++		nautilus_xid = *(Window *) data;
++		XFree (data);
++	} else {
++		return FALSE;
++	}
++
++	if (actual_type != XA_WINDOW) return FALSE;
++	if (actual_format != 32) return FALSE;
++
++	wmclass_atom = XInternAtom (GDK_DISPLAY (), "WM_CLASS", False);
++
++	gdk_error_trap_push ();
++
++	retval = XGetWindowProperty (GDK_DISPLAY (), nautilus_xid,
++				     wmclass_atom, 0, 24, False, XA_STRING,
++				     &actual_type, &actual_format, &nitems,
++				     &bytes_after, &data);
++
++	error = gdk_error_trap_pop ();
++
++	if (error == BadWindow) return FALSE;
++
++	if (actual_type == XA_STRING &&
++	    nitems == 24 &&
++	    bytes_after == 0 &&
++	    actual_format == 8 &&
++	    data != NULL &&
++	    !strcmp ((char *)data, "desktop_window") &&
++	    !strcmp ((char *)data + strlen ((char *)data) + 1, "Nautilus"))
++		running = TRUE;
++	else
++		running = FALSE;
++
++	if (data != NULL)
++		XFree (data);
++
++	return running;
+ }
++

control-center-2.9.4-filesel.patch:
 gnome-wp-capplet.c |    2 ++
 1 files changed, 2 insertions(+)

Index: control-center-2.9.4-filesel.patch
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center-2.9.4-filesel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- control-center-2.9.4-filesel.patch	2 Feb 2005 17:52:23 -0000	1.1
+++ control-center-2.9.4-filesel.patch	18 Apr 2007 15:18:29 -0000	1.2
@@ -1,12 +1,11 @@
---- control-center-2.9.4/capplets/background/gnome-wp-capplet.c.filesel	2005-02-02 12:48:58.000000000 -0500
-+++ control-center-2.9.4/capplets/background/gnome-wp-capplet.c	2005-02-02 12:49:27.000000000 -0500
-@@ -1270,7 +1270,8 @@
- 						  NULL);
+--- control-center-2.18.0/capplets/background/gnome-wp-capplet.c.filesel	2007-04-18 10:31:02.000000000 -0400
++++ control-center-2.18.0/capplets/background/gnome-wp-capplet.c	2007-04-18 10:31:18.000000000 -0400
+@@ -1086,6 +1086,8 @@
+ 							       NULL);
    gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (capplet->filesel),
  					TRUE);
--
 +  gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (capplet->filesel),
-+                                      "/usr/share/backgrounds");
++				       "/usr/share/backgrounds");
    gtk_file_chooser_set_use_preview_label (GTK_FILE_CHOOSER (capplet->filesel),
  					  FALSE);
  


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- control-center.spec	18 Apr 2007 04:15:17 -0000	1.247
+++ control-center.spec	18 Apr 2007 15:18:29 -0000	1.248
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.18.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -53,7 +53,7 @@
 
 Patch13: control-center-2.17.91-no-gnome-common.patch
 
-#Patch14: control-center-2.18.0-gnome-bg.patch
+Patch14: control-center-2.18.0-gnome-bg.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=425650
 Patch15: control-center-2.18.0-ellipsize-sound-devices.patch
@@ -174,11 +174,10 @@
 
 #%patch12 -p1 -b .start-at-helper
 %patch13 -p1 -b .no-gnome-common
-#%patch14 -p1 -b .gnome-bg
+%patch14 -p1 -b .gnome-bg
 %patch15 -p1 -b .ellipsize-sound-devices
 %patch16 -p1 -b .be-more-async
 
-
 # vendor configuration patches
 %patch95 -p1 -b .passwd
 %patch96 -p1 -b .gecos
@@ -328,6 +327,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Apr 18 2007 Soren Sandmann <sandmann at redhat.com> - 2.18.0-14
+- Add control-center-2.18.0-gnome-bg.patch contents. Apply it again
+
 * Tue Apr 17 2007 Ray Strode <rstrode at redhat.com> - 2.18.0-13
 - clean up be-more-async patch to have less repetitive code 
 



From fedora-cvs-commits at redhat.com  Wed Apr 18 15:22:14 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 11:22:14 -0400
Subject: rpms/hal/devel firewire-ioctl-changes.patch, NONE, 1.1 hal.spec,
	1.128, 1.129
Message-ID: <200704181522.l3IFMEHo021045@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	hal.spec 
Added Files:
	firewire-ioctl-changes.patch 
Log Message:
* Wed Apr 18 2007 Kristian H??gsberg <krh at redhat.com> - 0.5.9-5
- Update firewire prober to use correct ioctl codes.


firewire-ioctl-changes.patch:
 probe-ieee1394-unit.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

--- NEW FILE firewire-ioctl-changes.patch ---
diff --git a/hald/linux/probing/probe-ieee1394-unit.c b/hald/linux/probing/probe-ieee1394-unit.c
index bfa3ed0..70facfd 100644
--- a/hald/linux/probing/probe-ieee1394-unit.c
+++ b/hald/linux/probing/probe-ieee1394-unit.c
@@ -83,14 +83,11 @@ struct fw_cdev_event_request {
 	__u32 data[0];
 };
 
-#define FW_CDEV_IOC_GET_INFO		_IO('#', 0x00)
-#define FW_CDEV_IOC_SEND_REQUEST	_IO('#', 0x01)
-#define FW_CDEV_IOC_ALLOCATE		_IO('#', 0x02)
-#define FW_CDEV_IOC_DEALLOCATE		_IO('#', 0x03)
-#define FW_CDEV_IOC_SEND_RESPONSE	_IO('#', 0x04)
-#define FW_CDEV_IOC_INITIATE_BUS_RESET	_IO('#', 0x05)
-#define FW_CDEV_IOC_ADD_DESCRIPTOR	_IO('#', 0x06)
-#define FW_CDEV_IOC_REMOVE_DESCRIPTOR	_IO('#', 0x07)
+#define FW_CDEV_IOC_GET_INFO		_IOWR('#', 0x00, struct fw_cdev_get_info)
+#define FW_CDEV_IOC_SEND_REQUEST	_IOW('#', 0x01, struct fw_cdev_send_request)
+#define FW_CDEV_IOC_ALLOCATE		_IOWR('#', 0x02, struct fw_cdev_allocate)
+#define FW_CDEV_IOC_DEALLOCATE		_IOW('#', 0x03, struct fw_cdev_deallocate)
+#define FW_CDEV_IOC_SEND_RESPONSE	_IOW('#', 0x04, struct fw_cdev_send_response)
 
 /* FW_CDEV_VERSION History
  *


Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- hal.spec	18 Apr 2007 01:36:47 -0000	1.128
+++ hal.spec	18 Apr 2007 15:22:12 -0000	1.129
@@ -24,12 +24,13 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.9
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://people.freedesktop.org/~david/dist/%{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
 Source2: hal-device-manager.desktop
 Patch0: hal-0.5.9-fixes.patch
+Patch500: firewire-ioctl-changes.patch
 
 License: AFL/GPL
 Group: System Environment/Libraries
@@ -127,6 +128,7 @@
 %prep
 %setup -q
 %patch0 -p 1 -b .fixes
+%patch500 -p1 -b .firewire-ioctl-changes
 
 %build
 %configure --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version} --with-os-type=redhat --enable-console-kit --enable-acl-management --enable-umount-helper --enable-acpi-ibm --enable-acpi-toshiba --with-eject=/usr/sbin/eject
@@ -260,6 +262,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Wed Apr 18 2007 Kristian H??gsberg <krh at redhat.com> - 0.5.9-5
+- Update firewire prober to use correct ioctl codes.
+
 * Tue Apr 17 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-4
 - Rebuild without hal-info bits and Require new package hal-info (#230707)
 



From fedora-cvs-commits at redhat.com  Wed Apr 18 15:31:59 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 11:31:59 -0400
Subject: rpms/eel2/devel eel2-2.18.0.1-gnome-bg.patch, 1.2, 1.3 eel2.spec,
	1.67, 1.68
Message-ID: <200704181531.l3IFVxD1028140@cvs.devel.redhat.com>

Author: sandmann

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

Modified Files:
	eel2-2.18.0.1-gnome-bg.patch eel2.spec 
Log Message:
Fix reset, bug 234694

eel2-2.18.0.1-gnome-bg.patch:
 eel-background.c            | 1521 +++++---------------------------------------
 eel-background.h            |   89 --
 eel-gdk-pixbuf-extensions.c |    2 
 3 files changed, 196 insertions(+), 1416 deletions(-)

Index: eel2-2.18.0.1-gnome-bg.patch
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/eel2-2.18.0.1-gnome-bg.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eel2-2.18.0.1-gnome-bg.patch	20 Mar 2007 18:59:36 -0000	1.2
+++ eel2-2.18.0.1-gnome-bg.patch	18 Apr 2007 15:31:57 -0000	1.3
@@ -1,5 +1,5 @@
 --- eel-2.18.0.1/eel/eel-background.h.gnome-bg	2007-01-03 03:49:22.000000000 -0500
-+++ eel-2.18.0.1/eel/eel-background.h	2007-03-19 20:10:32.000000000 -0400
++++ eel-2.18.0.1/eel/eel-background.h	2007-04-18 09:39:55.000000000 -0400
 @@ -90,83 +90,29 @@
   * size. This means that EelBackground can use background pixmaps
   * even for backgrounds that otherwise would change when the size
@@ -126,7 +126,7 @@
  	 * was successfully loaded or not.
  	 */
 --- eel-2.18.0.1/eel/eel-gdk-pixbuf-extensions.c.gnome-bg	2007-01-03 03:49:22.000000000 -0500
-+++ eel-2.18.0.1/eel/eel-gdk-pixbuf-extensions.c	2007-03-19 20:10:32.000000000 -0400
++++ eel-2.18.0.1/eel/eel-gdk-pixbuf-extensions.c	2007-04-18 09:39:55.000000000 -0400
 @@ -431,7 +431,7 @@
  				     min_width, min_height,
  				     &scaled_width, &scaled_height);
@@ -137,7 +137,7 @@
  
  /**
 --- eel-2.18.0.1/eel/eel-background.c.gnome-bg	2007-03-02 06:20:11.000000000 -0500
-+++ eel-2.18.0.1/eel/eel-background.c	2007-03-20 14:54:06.000000000 -0400
++++ eel-2.18.0.1/eel/eel-background.c	2007-04-18 09:47:01.000000000 -0400
 @@ -37,71 +37,31 @@
  #include <gtk/gtkprivate.h>
  #include <gtk/gtkselection.h>
@@ -892,7 +892,7 @@
  }
  
  static void
-@@ -809,150 +255,67 @@
+@@ -809,152 +255,63 @@
  	}
  	background->details->background_entire_width = 0;
  	background->details->background_entire_height = 0;
@@ -1047,37 +1047,42 @@
 -
 +	
          eel_background_ensure_image_nonswapped (background);
--
-+	
- 	start_color_spec = eel_gradient_get_start_color_spec (background->details->color);
  
+-	start_color_spec = eel_gradient_get_start_color_spec (background->details->color);
+-
 -	if (start_color_spec && eel_gdk_color_parse (start_color_spec, &color))
 -		background->details->background_color = color;
 -	else {
-+	if (start_color_spec && eel_gdk_color_parse (start_color_spec, &color)) {
-+		background->details->default_color = color;
-+	} else {
- 		/* Get the widget to which the window belongs and its style as well */
- 		gdk_window_get_user_data (window, (void **) &widget);
- 		if (widget != NULL) {
-     			style = gtk_widget_get_style (widget);
- 	    		if (background->details->use_base) {
+-		/* Get the widget to which the window belongs and its style as well */
+-		gdk_window_get_user_data (window, (void **) &widget);
+-		if (widget != NULL) {
+-    			style = gtk_widget_get_style (widget);
+-	    		if (background->details->use_base) {
 -				background->details->background_color = style->base[GTK_STATE_NORMAL];
-+				background->details->default_color = style->base[GTK_STATE_NORMAL];
- 			} else {
+-			} else {
 -		    		background->details->background_color = style->bg[GTK_STATE_NORMAL];
-+		    		background->details->default_color = style->bg[GTK_STATE_NORMAL];
- 			}
-+
-+			gdk_rgb_find_color (style->colormap, &(background->details->default_color));
+-			}
++	/* Set the default color */
++	
++	/* Get the widget to which the window belongs and its style as well */
++	gdk_window_get_user_data (window, (void **) &widget);
++	if (widget != NULL) {
++		style = gtk_widget_get_style (widget);
++		if (background->details->use_base) {
++			background->details->default_color = style->base[GTK_STATE_NORMAL];
++		} else {
++			background->details->default_color = style->bg[GTK_STATE_NORMAL];
  		}
++		
++		gdk_rgb_find_color (style->colormap, &(background->details->default_color));
  	}
--
-+	
- 	g_free (start_color_spec);
  
+-	g_free (start_color_spec);
+-
  	/* If the pixmap doesn't change with the window size, never update
-@@ -975,44 +338,38 @@
+ 	 * it again.
+ 	 */
+@@ -975,44 +332,38 @@
  	}
  
  	changed = FALSE;
@@ -1141,7 +1146,7 @@
  	*changes_with_size = background->details->background_changes_with_size;
  	
  	if (background->details->background_pixmap != NULL) {
-@@ -1039,18 +396,16 @@
+@@ -1039,18 +390,16 @@
  	if (event->window != widget->window) {
  		return;
  	}
@@ -1163,7 +1168,7 @@
          if (!changes_with_size) {
                  /* The background was already drawn by X, since we set
                   * the GdkWindow background/back_pixmap.
-@@ -1087,319 +442,62 @@
+@@ -1087,319 +436,62 @@
  	}
  }
  
@@ -1276,11 +1281,12 @@
 -	}
 -}
 -
--static void
+ static void
 -canvas_draw_pixbuf_helper_alpha (art_u8 *dst, int dst_rowstride,
 -				 const art_u8 *src, int src_rowstride,
 -				 int copy_width, int copy_height)
--{
++set_image_properties (EelBackground *background)
+ {
 -	art_u8 *dst_limit = dst + copy_height * dst_rowstride;
 -	int dst_bytes_per_row = copy_width * 3;
 -	
@@ -1321,43 +1327,44 @@
 -		src += src_rowstride;
 -	}
 -}
--
++	GnomeBGPlacement placement;
+ 
 -/* Draws a pixbuf into a canvas update buffer (unscaled). The x,y coords are the location
 - * of the pixbuf in canvas space (NOT relative to the canvas buffer).
 - */
- static void
+-static void
 -canvas_draw_pixbuf (EelCanvasBuf *buf, const GdkPixbuf *pixbuf, int x, int y)
-+set_image_properties (EelBackground *background)
- {
+-{
 -	art_u8 *dst;
 -	int pixbuf_width, pixbuf_height;
--
++	if (!background->details->color) {
++		gnome_bg_set_color (background->details->bg, GNOME_BG_COLOR_SOLID,
++				 &background->details->default_color, NULL);
++	} else if (!eel_gradient_is_gradient (background->details->color)) {
++		GdkColor c;
+ 
 -	/* copy_left/top/right/bottom define the rect of the pixbuf (pixbuf relative)
 -	 * we will copy into the canvas buffer
 -	 */
 -	int copy_left, copy_top, copy_right, copy_bottom;
 -	
 -	dst = buf->buf;
-+	GnomeBGPlacement placement;
- 
+-
 -	pixbuf_width = gdk_pixbuf_get_width (pixbuf);
 -	pixbuf_height = gdk_pixbuf_get_height (pixbuf);
-+	if (!background->details->color) {
-+		gnome_bg_set_color (background->details->bg, GNOME_BG_COLOR_SOLID,
-+				 &background->details->default_color, NULL);
-+	} else if (!eel_gradient_is_gradient (background->details->color)) {
-+		GdkColor c;
- 
+-
 -	if (x > buf->rect.x0) {
 -		copy_left = 0;
 -		dst += (x - buf->rect.x0) * 3;
 -	} else {
 -		copy_left = buf->rect.x0 - x;
 -	}
--	
++		eel_gdk_color_parse_with_white_default (background->details->color, &c);
+ 	
 -	if (x + pixbuf_width > buf->rect.x1) {
 -		copy_right = buf->rect.x1 - x;
--	} else {
++		gnome_bg_set_color (background->details->bg, GNOME_BG_COLOR_SOLID, &c, NULL);
+ 	} else {
 -		copy_right = pixbuf_width;		
 -	}
 -	
@@ -1371,18 +1378,23 @@
 -	} else {
 -		copy_top = buf->rect.y0 - y;
 -	}
-+		eel_gdk_color_parse_with_white_default (background->details->color, &c);
- 	
+-	
 -	if (y + pixbuf_height > buf->rect.y1) {
 -		copy_bottom = buf->rect.y1 - y;
 -	} else {
 -		copy_bottom = pixbuf_height;		
 -	}
--
++		GdkColor c1;
++		GdkColor c2;
++		char *spec;
+ 
 -	if (copy_top >= copy_bottom) {
 -		return;
 -	}
--
++		spec = eel_gradient_get_start_color_spec (background->details->color);
++		eel_gdk_color_parse_with_white_default (spec, &c1);
++		g_free (spec);
+ 
 -	if (gdk_pixbuf_get_has_alpha (pixbuf)) {
 -		canvas_draw_pixbuf_helper_alpha (
 -			dst,
@@ -1391,8 +1403,7 @@
 -			gdk_pixbuf_get_rowstride (pixbuf),
 -			copy_right - copy_left,
 -			copy_bottom - copy_top);
-+		gnome_bg_set_color (background->details->bg, GNOME_BG_COLOR_SOLID, &c, NULL);
- 	} else {
+-	} else {
 -		canvas_draw_pixbuf_helper (
 -			dst,
 -			buf->buf_rowstride,
@@ -1403,10 +1414,7 @@
 -	}
 -}
 -
-+		GdkColor c1;
-+		GdkColor c2;
-+		char *spec;
- 
+-
 -/* fill the canvas buffer with a tiled pixbuf */
 -static void
 -draw_pixbuf_tiled_aa (GdkPixbuf *pixbuf, EelCanvasBuf *buffer)
@@ -1420,8 +1428,8 @@
 -	
 -	start_x = buffer->rect.x0 - (buffer->rect.x0 % tile_width);
 -	start_y = buffer->rect.y0 - (buffer->rect.y0 % tile_height);
-+		spec = eel_gradient_get_start_color_spec (background->details->color);
-+		eel_gdk_color_parse_with_white_default (spec, &c1);
++		spec = eel_gradient_get_end_color_spec (background->details->color);
++		eel_gdk_color_parse_with_white_default (spec, &c2);
 +		g_free (spec);
  
 -	for (y = start_y; y < buffer->rect.y1; y += tile_height) {
@@ -1430,10 +1438,7 @@
 -		}
 -	}
 -}
-+		spec = eel_gradient_get_end_color_spec (background->details->color);
-+		eel_gdk_color_parse_with_white_default (spec, &c2);
-+		g_free (spec);
- 
+-
 -/* draw the background on the anti-aliased canvas */
 -static void
 -eel_background_draw_aa (EelBackground *background, EelCanvasBuf *buffer)
@@ -1526,7 +1531,7 @@
  }
  
  char *
-@@ -1418,22 +516,6 @@
+@@ -1418,22 +510,6 @@
  	return g_strdup (background->details->image_uri);
  }
  
@@ -1549,7 +1554,7 @@
  /* Use style->base as the default color instead of bg */
  void
  eel_background_set_use_base (EelBackground *background,
-@@ -1446,106 +528,25 @@
+@@ -1446,106 +522,25 @@
  eel_background_set_color (EelBackground *background,
  			  const char *color)
  {
@@ -1558,14 +1563,20 @@
 -		if (!eel_background_image_totally_obscures (background)) {
 -			g_signal_emit (GTK_OBJECT (background), signals[APPEARANCE_CHANGED], 0);
 -		}
--	}
--}
--
--static void
++	if (eel_strcmp (background->details->color, color) != 0) {
++		g_free (background->details->color);
++		background->details->color = g_strdup (color);
++		
++		set_image_properties (background);
+ 	}
+ }
+ 
+ static void
 -eel_background_load_image_callback (GnomeVFSResult error,
 -				    GdkPixbuf *pixbuf,
 -				    gpointer callback_data)
--{
++eel_background_reload_image (EelBackground *background)
+ {
 -	EelBackground *background;
 -
 -	background = EEL_BACKGROUND (callback_data);
@@ -1616,19 +1627,13 @@
 -		eel_cancel_gdk_pixbuf_load (background->details->load_image_handle);
 -		background->details->load_image_handle = NULL;
 -		g_signal_emit (GTK_OBJECT (background), signals[IMAGE_LOADING_DONE], 0, FALSE);
-+	if (eel_strcmp (background->details->color, color) != 0) {
-+		g_free (background->details->color);
-+		background->details->color = g_strdup (color);
-+		
-+		set_image_properties (background);
- 	}
- }
- 
- static void
+-	}
+-}
+-
+-static void
 -eel_background_start_loading_image (EelBackground *background, gboolean emit_appearance_change,
 -				    gboolean load_async)
-+eel_background_reload_image (EelBackground *background)
- {
+-{
 -	GdkPixbuf *pixbuf;
 -	background->details->emit_after_load = emit_appearance_change;
 -
@@ -1664,7 +1669,7 @@
  {
          time_t mtime;
          GnomeVFSFileInfo *info;
-@@ -1563,12 +564,9 @@
+@@ -1563,12 +558,9 @@
  	}
  	if (eel_strcmp (background->details->image_uri, image_uri) == 0 &&
  	    mtime == background->details->image_mtime) {
@@ -1677,7 +1682,7 @@
  	g_free (background->details->image_uri);
  	background->details->image_uri = g_strdup (image_uri);
          background->details->image_mtime = mtime;
-@@ -1578,55 +576,27 @@
+@@ -1578,55 +570,27 @@
  	 * current image can be used if an update is needed before the load completes.
  	 */
  	
@@ -1738,7 +1743,7 @@
  }
  
  /* Use this fn to set both the image and color and avoid flash. The color isn't
-@@ -1634,37 +604,22 @@
+@@ -1634,37 +598,22 @@
   * before then, it will use the old color and image.
   */
  static void
@@ -1785,7 +1790,7 @@
  }
  
  void
-@@ -1676,7 +631,7 @@
+@@ -1676,7 +625,7 @@
  	 * We rely on eel_background_set_image_uri_and_color to emit
  	 * the SETTINGS_CHANGED & APPEARANCE_CHANGE signals.
  	 */
@@ -1794,7 +1799,7 @@
  	
  	eel_background_set_image_uri_and_color (background, action, image_uri, NULL);
  }
-@@ -1695,18 +650,6 @@
+@@ -1695,18 +644,6 @@
  		|| background->details->image_uri != NULL;
  }
  
@@ -1813,7 +1818,7 @@
  /**
   * eel_background_reset:
   *
-@@ -1725,39 +668,24 @@
+@@ -1725,39 +662,24 @@
  eel_background_set_up_widget (EelBackground *background, GtkWidget *widget)
  {
  	GtkStyle *style;
@@ -1855,7 +1860,7 @@
  						      &color, 
  						      &changes_with_size);
  
-@@ -1770,8 +698,8 @@
+@@ -1770,8 +692,8 @@
  	} else {
  		window = widget->window;
  	}
@@ -1866,7 +1871,7 @@
  		gdk_window_set_back_pixmap (window, pixmap, FALSE);
  	} else {
  		gdk_window_set_back_pixmap (window, NULL, FALSE);
-@@ -1779,34 +707,23 @@
+@@ -1779,34 +701,23 @@
  	}
  	
  
@@ -1911,7 +1916,7 @@
  	
  	if (pixmap) {
  		g_object_unref (pixmap);
-@@ -1837,7 +754,7 @@
+@@ -1837,7 +748,7 @@
  
  static void
  screen_size_changed (GdkScreen *screen, EelBackground *background)
@@ -1920,7 +1925,7 @@
  	g_signal_emit (background, signals[APPEARANCE_CHANGED], 0);
  }
  
-@@ -1975,70 +892,12 @@
+@@ -1975,70 +886,12 @@
  	return background;
  }
  
@@ -1992,7 +1997,7 @@
  }
     
  /* handle dropped colors */
-@@ -2117,4 +976,4 @@
+@@ -2117,4 +970,4 @@
  	gtk_object_sink (GTK_OBJECT (background));
  }
  


Index: eel2.spec
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- eel2.spec	20 Mar 2007 18:59:36 -0000	1.67
+++ eel2.spec	18 Apr 2007 15:31:57 -0000	1.68
@@ -16,7 +16,7 @@
 Name:		eel2
 Summary:        Eazel Extensions Library
 Version: 	2.18.0.1
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 License: 	LGPL
 Group: System Environment/Libraries
 Source: 	eel-%{version}.tar.bz2
@@ -115,6 +115,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Wed Apr 18 2007 Soren Sandmann <sandmann at redhat.com> - 2.18.0.1-4
+- Fix bug in gnome-bg patch where resetting backgrounds didn't work.
+
 * Tue Mar 20 2007 Soren Sandmann <sandmann at redhat.com> - 2.18.0.1-3
 - Fix bug in gnome-bg patch where backgrounds would get an uninitialized
   color.



From fedora-cvs-commits at redhat.com  Wed Apr 18 15:54:22 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 11:54:22 -0400
Subject: rpms/booty/devel .cvsignore, 1.54, 1.55 booty.spec, 1.59,
	1.60 sources, 1.58, 1.59
Message-ID: <200704181554.l3IFsMwX027968@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/booty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27952

Modified Files:
	.cvsignore booty.spec sources 
Log Message:
- update to 0.84-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	23 Mar 2007 14:47:04 -0000	1.54
+++ .cvsignore	18 Apr 2007 15:54:20 -0000	1.55
@@ -1 +1 @@
-booty-0.83.tar.bz2
+booty-0.84.tar.bz2


Index: booty.spec
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/booty.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- booty.spec	23 Mar 2007 14:47:04 -0000	1.59
+++ booty.spec	18 Apr 2007 15:54:20 -0000	1.60
@@ -1,6 +1,6 @@
 Summary: simple python bootloader config lib
 Name: booty
-Version: 0.83
+Version: 0.84
 Release: 1
 License: LGPL
 Source0: %{name}-%{version}.tar.bz2
@@ -35,6 +35,9 @@
 
 
 %changelog
+* Wed Apr 18 2007 Peter Jones <pjones at redhat.com> - 0.84-1
+- Fix mkofboot setup on non-pmac, non-pseries ppc machines (#236513)
+
 * Fri Mar 23 2007 Jeremy Katz <katzj at redhat.com> - 0.83-1
 - make driveorder a property to fix autopart screen boot selection with dmraid
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	23 Mar 2007 14:47:04 -0000	1.58
+++ sources	18 Apr 2007 15:54:20 -0000	1.59
@@ -1 +1 @@
-ceecf324f22e0ec86ea2ac1ce3f8c9ed  booty-0.83.tar.bz2
+a1b1fcccc15808f14d56a93dbbeb7677  booty-0.84.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 18 16:06:19 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 12:06:19 -0400
Subject: rpms/rhpl/devel .cvsignore, 1.77, 1.78 rhpl.spec, 1.96, 1.97 sources,
	1.85, 1.86
Message-ID: <200704181606.l3IG6JkN028282@cvs.devel.redhat.com>

Author: clumens

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- .cvsignore	1 Mar 2007 16:24:22 -0000	1.77
+++ .cvsignore	18 Apr 2007 16:06:17 -0000	1.78
@@ -1 +1,2 @@
 rhpl-0.203.tar.gz
+rhpl-0.204.tar.gz


Index: rhpl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/rhpl.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- rhpl.spec	15 Mar 2007 21:12:03 -0000	1.96
+++ rhpl.spec	18 Apr 2007 16:06:17 -0000	1.97
@@ -1,7 +1,7 @@
 Summary: Library of python code used by programs in Red Hat Linux
 Name: rhpl
-Version: 0.203
-Release: 2
+Version: 0.204
+Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Libraries
@@ -38,6 +38,9 @@
 %{_libdir}/python?.?/site-packages/rhpl
 
 %changelog
+* Wed Apr 18 2007 Chris Lumens <clumens at redhat.com> - 0.204-1
+- Fix PS3 platform detection (#236507).
+
 * Thu Mar 15 2007 David Cantrell <dcantrell at redhat.com> - 0.203-2
 - Remove 'Red Hat Linux' from the package description (#208444)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/sources,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- sources	15 Mar 2007 21:12:03 -0000	1.85
+++ sources	18 Apr 2007 16:06:17 -0000	1.86
@@ -1 +1 @@
-d55a0b34d120cc4102b571922350576a  rhpl-0.203.tar.gz
+2e39cc23298e6d80937447bba9f5961a  rhpl-0.204.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 18 17:18:17 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 13:18:17 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.12,
	1.13 policycoreutils.spec, 1.399, 1.400
Message-ID: <200704181718.l3IHIHql012913@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Wed Apr 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-6
- Change polgengui to a druid


policycoreutils-gui.patch:
 Makefile                    |   34 
 booleansPage.py             |  224 +++
 fcontextPage.py             |  207 +++
 loginsPage.py               |  173 ++
 mappingsPage.py             |   54 
 modulesPage.py              |  172 ++
 polgen.glade                | 1167 ++++++++++++++++
 polgen.py                   |  455 ++++++
 polgengui.py                |  253 +++
 portsPage.py                |  227 +++
 selinux.tbl                 |  274 +++
 semanagePage.py             |  115 +
 statusPage.py               |  220 +++
 system-config-selinux.glade | 3034 ++++++++++++++++++++++++++++++++++++++++++++
 system-config-selinux.py    |  169 ++
 templates/__init__.py       |   18 
 templates/executable.py     |  156 ++
 templates/network.py        |   44 
 templates/rw.py             |  104 +
 templates/script.py         |   42 
 templates/semodule.py       |   41 
 templates/tmp.py            |   72 +
 templates/var_lib.py        |  137 +
 templates/var_log.py        |   89 +
 templates/var_run.py        |   95 +
 templates/var_spool.py      |  107 +
 translationsPage.py         |  111 +
 usersPage.py                |  166 ++
 28 files changed, 7960 insertions(+)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.12 -r 1.13 policycoreutils-gui.patch
Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- policycoreutils-gui.patch	17 Apr 2007 12:30:19 -0000	1.12
+++ policycoreutils-gui.patch	18 Apr 2007 17:18:15 -0000	1.13
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.9/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/booleansPage.py	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.9/gui/booleansPage.py	2007-04-18 13:14:57.000000000 -0400
 @@ -0,0 +1,224 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -228,7 +228,7 @@
 +        commands.getstatusoutput(setsebool)
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.9/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/fcontextPage.py	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.9/gui/fcontextPage.py	2007-04-18 13:14:57.000000000 -0400
 @@ -0,0 +1,207 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -439,7 +439,7 @@
 +        self.store.set_value(iter, TYPE_COL, "system_u:object_r:%s:%s" % (type, mls))
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.9/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/loginsPage.py	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.9/gui/loginsPage.py	2007-04-18 13:14:57.000000000 -0400
 @@ -0,0 +1,173 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -654,7 +654,7 @@
 +relabel:
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.9/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/mappingsPage.py	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.9/gui/mappingsPage.py	2007-04-18 13:14:57.000000000 -0400
 @@ -0,0 +1,54 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -712,7 +712,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.9/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/modulesPage.py	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.9/gui/modulesPage.py	2007-04-18 13:14:57.000000000 -0400
 @@ -0,0 +1,172 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -888,12 +888,13 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.9/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/polgen.glade	2007-04-16 13:26:34.000000000 -0400
-@@ -0,0 +1,1127 @@
++++ policycoreutils-2.0.9/gui/polgen.glade	2007-04-18 12:27:57.000000000 -0400
+@@ -0,0 +1,1167 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 +
 +<glade-interface>
++<requires lib="gnome"/>
 +
 +<widget class="GtkWindow" id="main_window">
 +  <property name="visible">True</property>
@@ -918,210 +919,300 @@
 +      <property name="spacing">0</property>
 +
 +      <child>
-+	<widget class="GtkTable" id="table1">
++	<widget class="GnomeDruid" id="druid1">
++	  <property name="border_width">4</property>
 +	  <property name="visible">True</property>
-+	  <property name="n_rows">5</property>
-+	  <property name="n_columns">4</property>
-+	  <property name="homogeneous">False</property>
-+	  <property name="row_spacing">0</property>
-+	  <property name="column_spacing">0</property>
++	  <property name="show_help">False</property>
 +
 +	  <child>
-+	    <widget class="GtkLabel" id="label1">
++	    <widget class="GnomeDruidPageEdge" id="druidpagestart1">
 +	      <property name="visible">True</property>
-+	      <property name="label" translatable="yes">Name</property>
-+	      <property name="use_underline">False</property>
-+	      <property name="use_markup">False</property>
-+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-+	      <property name="wrap">False</property>
-+	      <property name="selectable">False</property>
-+	      <property name="xalign">0</property>
-+	      <property name="yalign">0.5</property>
-+	      <property name="xpad">0</property>
-+	      <property name="ypad">0</property>
-+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+	      <property name="width_chars">-1</property>
-+	      <property name="single_line_mode">False</property>
-+	      <property name="angle">0</property>
++	      <property name="position">GNOME_EDGE_START</property>
++	      <property name="title" translatable="yes">SELinux Policy Generation Druid</property>
++	      <property name="text" translatable="yes">This tool can be used to generate a policy framework, to confine an application using SELinux.   The tool will generate a Type Enforcement File (te), an interface file (if), a File Context File (fc) and a shell script (sh) used to compile the policy. </property>
 +	    </widget>
-+	    <packing>
-+	      <property name="left_attach">0</property>
-+	      <property name="right_attach">1</property>
-+	      <property name="top_attach">0</property>
-+	      <property name="bottom_attach">1</property>
-+	      <property name="x_options">fill</property>
-+	      <property name="y_options"></property>
-+	    </packing>
 +	  </child>
 +
 +	  <child>
-+	    <widget class="GtkLabel" id="label2">
++	    <widget class="GnomeDruidPageStandard" id="name_page">
 +	      <property name="visible">True</property>
-+	      <property name="label" translatable="yes">Executable</property>
-+	      <property name="use_underline">False</property>
-+	      <property name="use_markup">False</property>
-+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-+	      <property name="wrap">False</property>
-+	      <property name="selectable">False</property>
-+	      <property name="xalign">0</property>
-+	      <property name="yalign">0.5</property>
-+	      <property name="xpad">0</property>
-+	      <property name="ypad">0</property>
-+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+	      <property name="width_chars">-1</property>
-+	      <property name="single_line_mode">False</property>
-+	      <property name="angle">0</property>
-+	    </widget>
-+	    <packing>
-+	      <property name="left_attach">0</property>
-+	      <property name="right_attach">1</property>
-+	      <property name="top_attach">1</property>
-+	      <property name="bottom_attach">2</property>
-+	      <property name="y_padding">5</property>
-+	      <property name="x_options">fill</property>
-+	      <property name="y_options"></property>
-+	    </packing>
-+	  </child>
++	      <property name="title" translatable="yes">Name of application to be confined</property>
 +
-+	  <child>
-+	    <widget class="GtkLabel" id="label14">
-+	      <property name="visible">True</property>
-+	      <property name="label" translatable="yes">Application Type</property>
-+	      <property name="use_underline">False</property>
-+	      <property name="use_markup">False</property>
-+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-+	      <property name="wrap">False</property>
-+	      <property name="selectable">False</property>
-+	      <property name="xalign">0</property>
-+	      <property name="yalign">0.5</property>
-+	      <property name="xpad">0</property>
-+	      <property name="ypad">0</property>
-+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+	      <property name="width_chars">-1</property>
-+	      <property name="single_line_mode">False</property>
-+	      <property name="angle">0</property>
-+	    </widget>
-+	    <packing>
-+	      <property name="left_attach">0</property>
-+	      <property name="right_attach">1</property>
-+	      <property name="top_attach">2</property>
-+	      <property name="bottom_attach">3</property>
-+	      <property name="x_options">fill</property>
-+	      <property name="y_options"></property>
-+	    </packing>
-+	  </child>
++	      <child internal-child="vbox">
++		<widget class="GtkVBox" id="druid-vbox5">
++		  <property name="border_width">16</property>
++		  <property name="visible">True</property>
++		  <property name="homogeneous">False</property>
++		  <property name="spacing">6</property>
 +
-+	  <child>
-+	    <widget class="GtkButton" id="button1">
-+	      <property name="visible">True</property>
-+	      <property name="can_focus">True</property>
-+	      <property name="label" translatable="yes">...</property>
-+	      <property name="use_underline">True</property>
-+	      <property name="relief">GTK_RELIEF_NORMAL</property>
-+	      <property name="focus_on_click">True</property>
-+	      <signal name="clicked" handler="on_exec_select_clicked" last_modification_time="Wed, 21 Feb 2007 18:45:26 GMT"/>
-+	    </widget>
-+	    <packing>
-+	      <property name="left_attach">3</property>
-+	      <property name="right_attach">4</property>
-+	      <property name="top_attach">1</property>
-+	      <property name="bottom_attach">2</property>
-+	      <property name="x_options">fill</property>
-+	      <property name="y_options"></property>
-+	    </packing>
-+	  </child>
++		  <child>
[...1814 lines suppressed...]
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.9/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/tmp.py	2007-04-16 13:26:34.000000000 -0400
-@@ -0,0 +1,74 @@
++++ policycoreutils-2.0.9/gui/templates/tmp.py	2007-04-18 13:13:36.000000000 -0400
+@@ -0,0 +1,72 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -7200,13 +7293,11 @@
 +########################### tmp Template File #############################
 +
 +te_types="""
-+# log files
 +type TEMPLATETYPE_tmp_t;
 +files_tmp_file(TEMPLATETYPE_tmp_t)
 +"""
 +
 +te_rules="""
-+# tmp  files
 +allow TEMPLATETYPE_t TEMPLATETYPE_tmp_t:file manage_file_perms;
 +allow TEMPLATETYPE_t TEMPLATETYPE_tmp_t:dir create_dir_perms;
 +files_pid_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_tmp_t, { file dir })
@@ -7252,8 +7343,8 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.9/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_lib.py	2007-04-16 13:26:34.000000000 -0400
-@@ -0,0 +1,107 @@
++++ policycoreutils-2.0.9/gui/templates/var_lib.py	2007-04-18 13:13:36.000000000 -0400
+@@ -0,0 +1,137 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -7279,18 +7370,21 @@
 +
 +########################### Type Enforcement File #############################
 +te_types="""
-+# var/lib files
 +type TEMPLATETYPE_var_lib_t;
 +files_type(TEMPLATETYPE_var_lib_t)
 +"""
 +te_rules="""
-+# var/lib files for TEMPLATETYPE
-+allow TEMPLATETYPE_t TEMPLATETYPE_var_lib_t:file create_file_perms;
-+allow TEMPLATETYPE_t TEMPLATETYPE_var_lib_t:sock_file create_file_perms;
-+allow TEMPLATETYPE_t TEMPLATETYPE_var_lib_t:dir create_dir_perms;
-+files_var_lib_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_lib_t, { file dir sock_file })
++allow TEMPLATETYPE_t TEMPLATETYPE_var_lib_t:file manage_file_perms;
++allow TEMPLATETYPE_t TEMPLATETYPE_var_lib_t:dir manage_dir_perms;
++files_var_lib_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_lib_t, { file dir })
++"""
++
++te_stream_rules="""\
++allow TEMPLATETYPE_t TEMPLATETYPE_var_lib_t:sock_file manage_file_perms;
++files_pid_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_lib_t, sock_file)
 +"""
 +
++
 +########################### Interface File #############################
 +if_rules="""
 +########################################
@@ -7353,18 +7447,45 @@
 +	files_search_var_lib($1)
 +')
 +"""
++
++if_stream_rules="""
++########################################
++## <summary>
++##	Connect to TEMPLATETYPE over an unix stream socket.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`TEMPLATETYPE_stream_connect',`
++	gen_require(`
++		type TEMPLATETYPE_t, TEMPLATETYPE_var_lib_t;
++	')
++
++	files_search_pids($1)
++	allow $1 TEMPLATETYPE_var_lib_t:sock_file write;
++	allow $1 TEMPLATETYPE_t:unix_stream_socket connectto;
++')
++"""
++
 +########################### File Context ##################################
 +fc_file="""\
 +FILENAME		--	gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
 +
++fc_sock_file="""\
++FILENAME		-s	gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
++"""
++
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.9/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_log.py	2007-04-16 13:26:34.000000000 -0400
-@@ -0,0 +1,91 @@
++++ policycoreutils-2.0.9/gui/templates/var_log.py	2007-04-18 13:13:36.000000000 -0400
+@@ -0,0 +1,89 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -7390,13 +7511,11 @@
 +
 +########################### Type Enforcement File #############################
 +te_types="""
-+# log files
 +type TEMPLATETYPE_log_t;
 +logging_log_file(TEMPLATETYPE_log_t)
 +"""
 +
 +te_rules="""
-+# log files
 +allow TEMPLATETYPE_t TEMPLATETYPE_log_t:file manage_file_perms;
 +allow TEMPLATETYPE_t TEMPLATETYPE_log_t:dir { rw_dir_perms setattr };
 +logging_log_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_log_t,{ file dir })
@@ -7458,8 +7577,8 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.9/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_run.py	2007-04-16 13:26:34.000000000 -0400
-@@ -0,0 +1,93 @@
++++ policycoreutils-2.0.9/gui/templates/var_run.py	2007-04-18 13:13:36.000000000 -0400
+@@ -0,0 +1,95 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -7484,16 +7603,14 @@
 +########################### var_run Template File #############################
 +
 +te_types="""
-+# pid files
 +type TEMPLATETYPE_var_run_t;
 +files_pid_file(TEMPLATETYPE_var_run_t)
 +"""
 +
 +te_rules="""
-+# pid file
 +allow TEMPLATETYPE_t TEMPLATETYPE_var_run_t:file manage_file_perms;
-+allow TEMPLATETYPE_t TEMPLATETYPE_var_run_t:dir rw_dir_perms;
-+files_pid_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_run_t, file)
++allow TEMPLATETYPE_t TEMPLATETYPE_var_run_t:dir manage_dir_perms;
++files_pid_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_run_t, { file dir })
 +"""
 +
 +te_stream_rules="""
@@ -7523,7 +7640,7 @@
 +
 +"""
 +
-+if_stream_rules="""
++if_stream_rules="""\
 +########################################
 +## <summary>
 +##	Connect to TEMPLATETYPE over an unix stream socket.
@@ -7549,13 +7666,17 @@
 +FILENAME		--	gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
 +
++fc_sock_file="""\
++FILENAME		-s	gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
++"""
++
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.9/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_spool.py	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/var_spool.py	2007-04-18 13:13:36.000000000 -0400
 @@ -0,0 +1,107 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7666,7 +7787,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.9/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/translationsPage.py	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.9/gui/translationsPage.py	2007-04-18 13:14:57.000000000 -0400
 @@ -0,0 +1,111 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -7781,7 +7902,7 @@
 +        self.store.set_value(iter, 1, translation)
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.9/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/usersPage.py	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.9/gui/usersPage.py	2007-04-18 13:14:57.000000000 -0400
 @@ -0,0 +1,166 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -r1.399 -r1.400
--- policycoreutils.spec	17 Apr 2007 12:30:20 -0000	1.399
+++ policycoreutils.spec	18 Apr 2007 17:18:15 -0000	1.400
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 2.0.9
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Wed Apr 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-6
+- Change polgengui to a druid
+
 * Tue Apr 16 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-5
 - Fully path script.py
 



From fedora-cvs-commits at redhat.com  Wed Apr 18 18:25:08 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 14:25:08 -0400
Subject: rpms/rpcbind/devel rpcbind.spec,1.12,1.13
Message-ID: <200704181825.l3IIP8QX022597@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/rpcbind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22581

Modified Files:
	rpcbind.spec 
Log Message:
- Added dependency on setup which contains the correct
  rpcbind /etc/service entry which in turns stops
  rpcbind from haning when NIS is enabled. (bz 236865)



Index: rpcbind.spec
===================================================================
RCS file: /cvs/dist/rpms/rpcbind/devel/rpcbind.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rpcbind.spec	11 Apr 2007 15:25:51 -0000	1.12
+++ rpcbind.spec	18 Apr 2007 18:25:06 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           rpcbind
 Version:        0.1.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary:        Universal Addresses to RPC Program Number Napper
 Group:          System Environment/Daemons
 License:        GPL
@@ -13,6 +13,7 @@
 Source1: rpcbind.init
 
 Requires: glibc-common >= 2.5.90-20 
+Requires: setup >= 2.6.4-1
 Conflicts: man-pages < 2.43-12
 BuildRequires: automake, autoconf, libtool
 BuildRequires: libtirpc-devel quota
@@ -117,6 +118,11 @@
 %dir %attr(700,rpc,rpc) /var/lib/rpcbind
 
 %changelog
+* Wed Apr 18 2007 Steve Dickson <steved at redhat.com> 0.1.4-5
+- Added dependency on setup which contains the correct
+  rpcbind /etc/service entry which in turns stops 
+  rpcbind from haning when NIS is enabled. (bz 236865)
+
 * Wed Apr 11 2007 Jeremy Katz <katzj at redhat.com> - 0.1.4-4
 - change man-pages requires into a conflicts as we don't have to have 
   man-pages installed, but if we do, we need the newer version



From fedora-cvs-commits at redhat.com  Wed Apr 18 18:35:07 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 14:35:07 -0400
Subject: rpms/policycoreutils/devel policycoreutils-po.patch, 1.22,
	1.23 policycoreutils-rhat.patch, 1.297,
	1.298 policycoreutils.spec, 1.400, 1.401
Message-ID: <200704181835.l3IIZ7Wd006319@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-po.patch policycoreutils-rhat.patch 
	policycoreutils.spec 
Log Message:
* Wed Apr 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-7
- Fix restorecon crash


policycoreutils-po.patch:
 .cvsignore  |   16 ++
 Makefile    |    5 
 POTFILES    |    1 
 POTFILES.in |    1 
 bg.po       |  427 ++++++++++++++++++++++++++++++------------------------------
 da.po       |   63 ++++----
 de.po       |  131 ++++++++----------
 hu.po       |   72 ++++------
 ms.po       |   54 +++----
 sk.po       |  294 +++++++++++++++++++++++++----------------
 sv.po       |    2 
 11 files changed, 577 insertions(+), 489 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.22 -r 1.23 policycoreutils-po.patch
Index: policycoreutils-po.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-po.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- policycoreutils-po.patch	22 Feb 2007 15:14:00 -0000	1.22
+++ policycoreutils-po.patch	18 Apr 2007 18:35:04 -0000	1.23
@@ -1,18 +1,3046 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-2.0.2/po/da.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.9/po/bg.po
+--- nsapolicycoreutils/po/bg.po	2007-01-19 08:50:13.000000000 -0500
++++ policycoreutils-2.0.9/po/bg.po	2007-04-18 13:32:01.000000000 -0400
+@@ -1,303 +1,303 @@
+-# SOME DESCRIPTIVE TITLE.
++# translation of policycoreutils.pot to Bulgarian
+ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+ # This file is distributed under the same license as the PACKAGE package.
+-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+ #
+-#, fuzzy
++# Doncho N. Gunchev <gunchev at gmail.com>, 2007.
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: PACKAGE VERSION\n"
++"Project-Id-Version: policycoreutils\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2006-11-21 14:21-0500\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"
++"PO-Revision-Date: 2007-03-31 17:41+0300\n"
++"Last-Translator: Doncho N. Gunchev <gunchev at gmail.com>\n"
++"Language-Team: Bulgarian <Bulgarian Translators' Team <dict at fsa-bg.org>>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
++"X-Generator: KBabel 1.11.4\n"
+ 
+ #: ../load_policy/load_policy.c:22
+ #, c-format
+ msgid "usage:  %s [-bq]\n"
+-msgstr ""
++msgstr "????????????????:  %s [-bq]\n"
+ 
+ #: ../load_policy/load_policy.c:66
+ #, c-format
+ msgid "%s:  Can't load policy:  %s\n"
+-msgstr ""
++msgstr "%s:  ???? ???????? ???? ???? ???????????? ????????????????:  %s\n"
+ 
+ #: ../newrole/newrole.c:188
+ #, c-format
+ msgid "failed to set PAM_TTY\n"
+-msgstr ""
++msgstr "?????????????????? ?????????????????? ???? PAM_TTY\n"
+ 
+ #: ../newrole/newrole.c:218 ../run_init/run_init.c:162
+ msgid "Password:"
+-msgstr ""
++msgstr "????????????:"
+ 
+ #: ../newrole/newrole.c:243 ../run_init/run_init.c:197
+ #, c-format
+ msgid "Cannot find your entry in the shadow passwd file.\n"
+-msgstr ""
++msgstr "???? ???????? ???? ???? ???????????? ?????????? ?????????? ?????? ?????????? shadow.\n"
+ 
+ #: ../newrole/newrole.c:250 ../run_init/run_init.c:203
+ #, c-format
+ msgid "getpass cannot open /dev/tty\n"
+-msgstr ""
++msgstr "getpass ???? ???????? ???? ???? ???????????? /dev/tty\n"
+ 
+ #: ../newrole/newrole.c:316
+ #, c-format
+ msgid "cannot find valid entry in the passwd file.\n"
+-msgstr ""
++msgstr "???? ???????? ???? ???? ???????????? ?????????????? ?????????? ?????? ?????????? passwd.\n"
+ 
+ #: ../newrole/newrole.c:327
+ #, c-format
+ msgid "Out of memory!\n"
+-msgstr ""
++msgstr "?????????????? ????????????!\n"
+ 
+ #: ../newrole/newrole.c:332
+ #, c-format
+ msgid "Error!  Shell is not valid.\n"
+-msgstr ""
++msgstr "????????????!  ?????????????????? ???? ?? ??????????????.\n"
+ 
+ #: ../newrole/newrole.c:389
+ #, c-format
+ msgid "Unable to clear environment\n"
+-msgstr ""
++msgstr "???? ???????? ???? ???????? ?????????????????? ??????????????\n"
+ 
+ #: ../newrole/newrole.c:436 ../newrole/newrole.c:513
+ #, c-format
+ msgid "Error initing capabilities, aborting.\n"
+-msgstr ""
++msgstr "???????????? ?????? ???????????????????????????? ???? ??????????????, ?????????????? ??????????.\n"
+ 
+ #: ../newrole/newrole.c:444 ../newrole/newrole.c:519
+ #, c-format
+ msgid "Error setting capabilities, aborting\n"
+-msgstr ""
++msgstr "???????????? ?????? ?????????????????? ???? ??????????????, ?????????????? ??????????.\n"
+ 
+ #: ../newrole/newrole.c:450
+ #, c-format
+ msgid "Error setting KEEPCAPS, aborting\n"
+-msgstr ""
++msgstr "???????????? ?????? ?????????????????? ???? KEEPCAPS, ?????????????? ??????????\n"
+ 
+ #: ../newrole/newrole.c:458 ../newrole/newrole.c:531
+ #, c-format
+ msgid "Error dropping capabilities, aborting\n"
+-msgstr ""
++msgstr "???????????? ?????? ?????????? ???? ??????????????, ?????????????? ??????????.\n"
+ 
+ #: ../newrole/newrole.c:464 ../newrole/newrole.c:562
+ #, c-format
+ msgid "Error changing uid, aborting.\n"
+-msgstr ""
++msgstr "???????????? ?????? ?????????? ???? uid, ?????????????? ??????????.\n"
+ 
+ #: ../newrole/newrole.c:470 ../newrole/newrole.c:525 ../newrole/newrole.c:557
+ #, c-format
+ msgid "Error resetting KEEPCAPS, aborting\n"
+-msgstr ""
++msgstr "???????????? ?????? ???????????????????????? ???? KEEPCAPS, ?????????????? ??????????\n"
+ 
+ #: ../newrole/newrole.c:477
+ #, c-format
+ msgid "Error dropping SETUID capability, aborting\n"
+-msgstr ""
++msgstr "???????????? ?????? ?????????? ???? SETUID ??????????, ?????????????? ??????????\n"
+ 
+ #: ../newrole/newrole.c:482 ../newrole/newrole.c:536
+ #, c-format
+ msgid "Error freeing caps\n"
+-msgstr ""
++msgstr "???????????? ?????? ?????????????????????????? ???? ??????????\n"
+ 
+ #: ../newrole/newrole.c:580
+ #, c-format
+ msgid "Error connecting to audit system.\n"
+-msgstr ""
++msgstr "???????????? ?????? ???????????? ?????? ?????????????????? ???? ????????.\n"
+ 
+ #: ../newrole/newrole.c:586
+ #, c-format
+ msgid "Error allocating memory.\n"
+-msgstr ""
++msgstr "???????????? ?????? ???????????????? ???? ??????????.\n"
+ 
+ #: ../newrole/newrole.c:593
+ #, c-format
+ msgid "Error sending audit message.\n"
+-msgstr ""
++msgstr "???????????? ?????? ?????????????????? ???? ???????? ??????????????????.\n"
+ 
+ #: ../newrole/newrole.c:634 ../newrole/newrole.c:978
+ #, c-format
+ msgid "Could not determine enforcing mode.\n"
+-msgstr ""
++msgstr "???? ???????? ???? ???? ???????????????? ???????????? ???? ????????????????.\n"
+ 
+ #: ../newrole/newrole.c:641
+ #, c-format
+ msgid "Error!  Could not open %s.\n"
+-msgstr ""
++msgstr "????????????!  ???? ???????? ???? ???? ???????????? %s.\n"
+ 
+ #: ../newrole/newrole.c:646
+ #, c-format
+ msgid "%s!  Could not get current context for %s, not relabeling tty.\n"
+-msgstr ""
++msgstr "%s!  ???? ???????? ???? ???? ???????????????? ?????????????? ???????????????? ???? %s, tty ???????? ???? ???? ????????????????????.\n"
+ 
+ #: ../newrole/newrole.c:656
+ #, c-format
+ msgid "%s!  Could not get new context for %s, not relabeling tty.\n"
+-msgstr ""
++msgstr "%s!  ???? ???????? ???? ???? ???????????????? ?????????? ???????????????? ???? %s, tty ???????? ???? ???? ????????????????????.\n"
+ 
+ #: ../newrole/newrole.c:666
+ #, c-format
+ msgid "%s!  Could not set new context for %s\n"
+-msgstr ""
++msgstr "%s!  ???? ???????? ???? ???? ???????????????? ?????????? ???????????????? ???? %s\n"
+ 
+ #: ../newrole/newrole.c:710
+ #, c-format
+ msgid "%s changed labels.\n"
+-msgstr ""
++msgstr "%s ?????????????? ???? ??????????????????.\n"
+ 
[...2662 lines suppressed...]
+-#: ../semanage/seobject.py:792 ../semanage/seobject.py:811
++#: ../semanage/seobject.py:792
++#: ../semanage/seobject.py:811
+ msgid "Could not list ports"
+ msgstr "Nemo??no listova?? portami"
+ 
+-#: ../semanage/seobject.py:855 ../semanage/seobject.py:1027
++#: ../semanage/seobject.py:855
++#: ../semanage/seobject.py:1027
+ msgid "SELinux Type is required"
+ msgstr "SELinux typ je po??adovan??"
+ 
+-#: ../semanage/seobject.py:859 ../semanage/seobject.py:923
+-#: ../semanage/seobject.py:960 ../semanage/seobject.py:1031
++#: ../semanage/seobject.py:859
++#: ../semanage/seobject.py:923
++#: ../semanage/seobject.py:960
++#: ../semanage/seobject.py:1031
+ #, python-format
+ msgid "Could not create key for %s"
+ msgstr "Nemo??no vytvori?? k?????? pre %s"
+ 
+-#: ../semanage/seobject.py:863 ../semanage/seobject.py:927
+-#: ../semanage/seobject.py:964 ../semanage/seobject.py:970
++#: ../semanage/seobject.py:863
++#: ../semanage/seobject.py:927
++#: ../semanage/seobject.py:964
++#: ../semanage/seobject.py:970
+ #, python-format
+ msgid "Could not check if interface %s is defined"
+ msgstr "Nemo??no skontrolova?? ??i rozhranie %s je definovan??"
+@@ -812,7 +872,8 @@
+ msgid "Could not create interface for %s"
+ msgstr "Nemo??no vytvori?? rozhranie pre %s"
+ 
+-#: ../semanage/seobject.py:874 ../semanage/seobject.py:1046
++#: ../semanage/seobject.py:874
++#: ../semanage/seobject.py:1046
+ #, python-format
+ msgid "Could not create context for %s"
+ msgstr "Nemo??no vytvori?? kontext pre %s"
+@@ -847,12 +908,14 @@
+ msgid "Could not set message context for %s"
+ msgstr "Nemo??no nastavi?? kontext spr??vy pre %s"
+ 
+-#: ../semanage/seobject.py:907 ../semanage/seobject.py:911
++#: ../semanage/seobject.py:907
++#: ../semanage/seobject.py:911
+ #, python-format
+ msgid "Could not add interface %s"
+ msgstr "Nemo??no prida?? rozhranie %s"
+ 
+-#: ../semanage/seobject.py:929 ../semanage/seobject.py:966
++#: ../semanage/seobject.py:929
++#: ../semanage/seobject.py:966
+ #, python-format
+ msgid "Interface %s is not defined"
+ msgstr "Rozhranie %s nie je definovan??"
+@@ -862,7 +925,8 @@
+ msgid "Could not query interface %s"
+ msgstr "Nemo??no overi?? rozhranie %s"
+ 
+-#: ../semanage/seobject.py:948 ../semanage/seobject.py:952
++#: ../semanage/seobject.py:948
++#: ../semanage/seobject.py:952
+ #, python-format
+ msgid "Could not modify interface %s"
+ msgstr "Nemo??no zmeni?? rozhranie %s"
+@@ -872,7 +936,8 @@
+ msgid "Interface %s is defined in policy, cannot be deleted"
+ msgstr "Rozhranie %s je definovan?? v pravidl??ch, nem????e by?? zmazan??"
+ 
+-#: ../semanage/seobject.py:980 ../semanage/seobject.py:984
++#: ../semanage/seobject.py:980
++#: ../semanage/seobject.py:984
+ #, python-format
+ msgid "Could not delete interface %s"
+ msgstr "Nemo??no zmaza?? rozhranie %s"
+@@ -881,8 +946,10 @@
+ msgid "Could not list interfaces"
+ msgstr "Nemo??no listova?? rozhraniami"
+ 
+-#: ../semanage/seobject.py:1035 ../semanage/seobject.py:1097
+-#: ../semanage/seobject.py:1136 ../semanage/seobject.py:1140
++#: ../semanage/seobject.py:1035
++#: ../semanage/seobject.py:1097
++#: ../semanage/seobject.py:1136
++#: ../semanage/seobject.py:1140
+ #, python-format
+ msgid "Could not check if file context for %s is defined"
+ msgstr "Nemo??no skontrolova?? ??i kontext s??boru pre %s je definovan??"
+@@ -922,7 +989,8 @@
+ msgid "Could not set file context for %s"
+ msgstr "Nemo??no nastavit kontext s??boru pre %s"
+ 
+-#: ../semanage/seobject.py:1077 ../semanage/seobject.py:1081
++#: ../semanage/seobject.py:1077
++#: ../semanage/seobject.py:1081
+ #, python-format
+ msgid "Could not add file context for %s"
+ msgstr "Nemo??no prida?? kontext s??boru pre %s"
+@@ -931,7 +999,8 @@
+ msgid "Requires setype, serange or seuser"
+ msgstr "Po??aduje setype, serange alebo seuser"
+ 
+-#: ../semanage/seobject.py:1099 ../semanage/seobject.py:1144
++#: ../semanage/seobject.py:1099
++#: ../semanage/seobject.py:1144
+ #, python-format
+ msgid "File context for %s is not defined"
+ msgstr "Kontext s??boru pre %s nie je definovan??"
+@@ -941,7 +1010,8 @@
+ msgid "Could not query file context for %s"
+ msgstr "Nemo??no overi?? kontext s??boru pre %s"
+ 
+-#: ../semanage/seobject.py:1120 ../semanage/seobject.py:1124
++#: ../semanage/seobject.py:1120
++#: ../semanage/seobject.py:1124
+ #, python-format
+ msgid "Could not modify file context for %s"
+ msgstr "Nemo??no zmeni?? kontext s??boru pre %s"
+@@ -951,7 +1021,8 @@
+ msgid "File context for %s is defined in policy, cannot be deleted"
+ msgstr "Kontext s??boru pre %s je definovan?? v pravidl??ch, nem????e by?? zmazan??"
+ 
+-#: ../semanage/seobject.py:1152 ../semanage/seobject.py:1156
++#: ../semanage/seobject.py:1152
++#: ../semanage/seobject.py:1156
+ #, python-format
+ msgid "Could not delete file context for %s"
+ msgstr "Nemo??no zmaza?? kontext s??boru pre %s"
+@@ -961,21 +1032,22 @@
+ msgstr "Nemo??no listova?? kontextami s??boru"
+ 
+ #: ../semanage/seobject.py:1168
+-#, fuzzy
+ msgid "Could not list local file contexts"
+-msgstr "Nemo??no listova?? kontextami s??boru"
++msgstr "Nemo??no listova?? kontextami lok??lnych s??borov"
+ 
+ #: ../semanage/seobject.py:1203
+ msgid "Requires value"
+ msgstr "Po??aduje hodnotu"
+ 
+-#: ../semanage/seobject.py:1211 ../semanage/seobject.py:1245
++#: ../semanage/seobject.py:1211
++#: ../semanage/seobject.py:1245
+ #: ../semanage/seobject.py:1251
+ #, python-format
+ msgid "Could not check if boolean %s is defined"
+ msgstr "Nemo??no skontrolova?? ??i logick?? hodnota %s je definovan??"
+ 
+-#: ../semanage/seobject.py:1213 ../semanage/seobject.py:1247
++#: ../semanage/seobject.py:1213
++#: ../semanage/seobject.py:1247
+ #, python-format
+ msgid "Boolean %s is not defined"
+ msgstr "Logick?? hodnota %s nie je definovan??"
+@@ -985,7 +1057,8 @@
+ msgid "Could not query file context %s"
+ msgstr "Nemo??no overi?? kontext s??boru %s"
+ 
+-#: ../semanage/seobject.py:1229 ../semanage/seobject.py:1233
++#: ../semanage/seobject.py:1229
++#: ../semanage/seobject.py:1233
+ #, python-format
+ msgid "Could not modify boolean %s"
+ msgstr "Nemo??no zmeni?? logick?? hodnotu %s"
+@@ -995,7 +1068,8 @@
+ msgid "Boolean %s is defined in policy, cannot be deleted"
+ msgstr "Logick?? hodnota %s je definovan?? v pravidl??ch, nemo??no ju zmaza??"
+ 
+-#: ../semanage/seobject.py:1261 ../semanage/seobject.py:1265
++#: ../semanage/seobject.py:1261
++#: ../semanage/seobject.py:1265
+ #, python-format
+ msgid "Could not delete boolean %s"
+ msgstr "Nemo??no zmaza?? logick?? hodnotu %s"
+@@ -1009,7 +1083,8 @@
+ msgid "Generating type enforcment file: %s.te"
+ msgstr "Vytv??ranie s??boru vyn??tenia typov: %s.te"
+ 
+-#: ../audit2allow/audit2allow:189 ../audit2allow/audit2allow:194
++#: ../audit2allow/audit2allow:189
++#: ../audit2allow/audit2allow:194
+ msgid "Compiling policy"
+ msgstr "Zostavujem pravidl??"
+ 
+@@ -1040,3 +1115,4 @@
+ #, c-format
+ msgid "Options Error: %s "
+ msgstr "Chyba volieb: %s"
++
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-2.0.9/po/sv.po
 --- nsapolicycoreutils/po/sv.po	2007-02-22 08:53:22.000000000 -0500
-+++ policycoreutils-2.0.2/po/sv.po	2007-02-20 17:00:15.000000000 -0500
++++ policycoreutils-2.0.9/po/sv.po	2007-04-18 13:32:01.000000000 -0400
 @@ -2,7 +2,7 @@
  # Copyright (C) Christian Rose <menthos at menthos.com>, 2006.
  # Copyright (C) Magnus Larsson <fedoratrans at gmail.com>, 2007.

policycoreutils-rhat.patch:
 Makefile                     |    2 +-
 audit2allow/Makefile         |    3 ++-
 audit2why/Makefile           |    2 +-
 restorecon/restorecon.c      |   17 ++++++++++++-----
 restorecond/restorecond.c    |   12 +++++++-----
 restorecond/restorecond.conf |    3 +++
 restorecond/restorecond.init |    1 +
 scripts/chcat                |   17 ++++++++++-------
 scripts/fixfiles             |    2 +-
 scripts/genhomedircon        |    6 +++++-
 semanage/seobject.py         |   10 +++++++---
 11 files changed, 50 insertions(+), 25 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -r1.297 -r1.298
--- policycoreutils-rhat.patch	16 Apr 2007 17:27:49 -0000	1.297
+++ policycoreutils-rhat.patch	18 Apr 2007 18:35:05 -0000	1.298
@@ -1,27 +1,77 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.7 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-2.0.7/audit2allow/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-2.0.9/audit2allow/Makefile
 --- nsapolicycoreutils/audit2allow/Makefile	2007-02-07 12:11:49.000000000 -0500
-+++ policycoreutils-2.0.7/audit2allow/Makefile	2007-03-23 09:03:56.000000000 -0400
-@@ -1,6 +1,6 @@
++++ policycoreutils-2.0.9/audit2allow/Makefile	2007-04-18 14:32:01.000000000 -0400
+@@ -1,6 +1,7 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
--BINDIR ?= $(PREFIX)/bin
-+BINDIR ?= $(PREFIX)/sbin
+ BINDIR ?= $(PREFIX)/bin
++SBINDIR ?= $(PREFIX)/sbin
  LIBDIR ?= $(PREFIX)/lib
  MANDIR ?= $(PREFIX)/share/man
  LOCALEDIR ?= /usr/share/locale
-diff --exclude-from=exclude --exclude=sepolgen-1.0.7 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.7/Makefile
+@@ -10,7 +11,7 @@
+ install: all
+ 	-mkdir -p $(BINDIR)
+ 	install -m 755 audit2allow $(BINDIR)
+-	install -m 755 sepolgen-ifgen $(BINDIR)
++	install -m 755 sepolgen-ifgen $(SBINDIR)
+ 	-mkdir -p $(MANDIR)/man1
+ 	install -m 644 audit2allow.1 $(MANDIR)/man1/
+ 
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2why/Makefile policycoreutils-2.0.9/audit2why/Makefile
+--- nsapolicycoreutils/audit2why/Makefile	2006-11-16 17:14:26.000000000 -0500
++++ policycoreutils-2.0.9/audit2why/Makefile	2007-04-18 14:28:26.000000000 -0400
+@@ -1,6 +1,6 @@
+ # Installation directories.
+ PREFIX ?= ${DESTDIR}/usr
+-BINDIR ?= $(PREFIX)/sbin
++BINDIR ?= $(PREFIX)/bin
+ LIBDIR ?= ${PREFIX}/lib
+ MANDIR ?= $(PREFIX)/share/man
+ LOCALEDIR ?= /usr/share/locale
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.9/Makefile
 --- nsapolicycoreutils/Makefile	2006-11-16 17:15:00.000000000 -0500
-+++ policycoreutils-2.0.7/Makefile	2007-03-23 09:03:56.000000000 -0400
++++ policycoreutils-2.0.9/Makefile	2007-04-16 13:26:34.000000000 -0400
 @@ -1,4 +1,4 @@
 -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
  
  all install relabel clean indent:
  	@for subdir in $(SUBDIRS); do \
-diff --exclude-from=exclude --exclude=sepolgen-1.0.7 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-2.0.7/restorecon/restorecon.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-2.0.9/restorecon/restorecon.c
 --- nsapolicycoreutils/restorecon/restorecon.c	2006-11-16 17:14:26.000000000 -0500
-+++ policycoreutils-2.0.7/restorecon/restorecon.c	2007-03-23 09:03:56.000000000 -0400
-@@ -336,8 +336,8 @@
++++ policycoreutils-2.0.9/restorecon/restorecon.c	2007-04-18 14:26:39.000000000 -0400
+@@ -16,6 +16,7 @@
+  * -v	Show changes in file labels.  
+  * -o	filename save list of files with incorrect context
+  * -F	Force reset of context to match file_context for customizable files
++ * -l   Limit directory tree walk to a single filesystem
+  *
+  * pathname...	The file(s) to label 
+  *
+@@ -50,6 +51,7 @@
+ static int recurse = 0;
+ static int file_exist = 1;
+ static int force = 0;
++static int onefs = 0;
+ #define STAT_BLOCK_SIZE 1
+ static int pipe_fds[2] = { -1, -1 };
+ static unsigned long long count = 0;
+@@ -326,18 +328,20 @@
+ 			rc = fork();
+ 		if (rc == 0) {
+ 			close(pipe_fds[0]);
+-			nftw(buf, pre_stat, 1024, FTW_PHYS);
++			nftw(buf, pre_stat, 1024, 
++                             FTW_PHYS | (onefs ? FTW_MOUNT : 0));
+ 			exit(1);
+ 		}
+ 		if (rc > 0)
+ 			close(pipe_fds[1]);
+ 		if (rc == -1 || rc > 0) {
+-			if (nftw(buf, apply_spec, 1024, FTW_PHYS)) {
++			if (nftw(buf, apply_spec, 1024, 
++                                 FTW_PHYS | (onefs ? FTW_MOUNT : 0))) {
  				if (!file_exist && errno == ENOENT)
  					return;
  				fprintf(stderr,
@@ -32,9 +82,25 @@
  				errors++;
  			}
  		}
-diff --exclude-from=exclude --exclude=sepolgen-1.0.7 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.7/restorecond/restorecond.c
+@@ -367,11 +371,14 @@
+ 
+ 	set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
+ 
+-	while ((opt = getopt(argc, argv, "ipFrRnvf:o:e:")) > 0) {
++	while ((opt = getopt(argc, argv, "ipFrRnvf:lo:e:")) > 0) {
+ 		switch (opt) {
+ 		case 'n':
+ 			change = 0;
+ 			break;
++                case 'l':
++                    onefs = 1;
++                    break;
+ 		case 'i':
+ 			file_exist = 0;
+ 			break;
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.9/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2007-02-22 08:53:22.000000000 -0500
-+++ policycoreutils-2.0.7/restorecond/restorecond.c	2007-03-23 09:03:56.000000000 -0400
++++ policycoreutils-2.0.9/restorecond/restorecond.c	2007-04-16 13:26:34.000000000 -0400
 @@ -210,9 +210,10 @@
  			}
  
@@ -61,9 +127,9 @@
  	}
  	free(scontext);
  	close(fd);
-diff --exclude-from=exclude --exclude=sepolgen-1.0.7 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.7/restorecond/restorecond.conf
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.9/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2006-11-20 12:19:55.000000000 -0500
-+++ policycoreutils-2.0.7/restorecond/restorecond.conf	2007-03-23 09:03:56.000000000 -0400
++++ policycoreutils-2.0.9/restorecond/restorecond.conf	2007-04-16 13:26:34.000000000 -0400
 @@ -1,7 +1,10 @@
  /etc/resolv.conf
 +/etc/localtime
@@ -75,9 +141,9 @@
 +/etc/lvm/.cache
  ~/public_html
  ~/.mozilla/plugins/libflashplayer.so
-diff --exclude-from=exclude --exclude=sepolgen-1.0.7 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.7/restorecond/restorecond.init
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.9/restorecond/restorecond.init
 --- nsapolicycoreutils/restorecond/restorecond.init	2007-03-01 17:23:40.000000000 -0500
-+++ policycoreutils-2.0.7/restorecond/restorecond.init	2007-03-23 09:03:56.000000000 -0400
++++ policycoreutils-2.0.9/restorecond/restorecond.init	2007-04-16 13:26:34.000000000 -0400
 @@ -73,6 +73,7 @@
          ;;
    status)
@@ -86,9 +152,9 @@
  	;;
    restart|reload)
  	restart
-diff --exclude-from=exclude --exclude=sepolgen-1.0.7 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.7/scripts/chcat
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.9/scripts/chcat
 --- nsapolicycoreutils/scripts/chcat	2007-02-22 08:53:22.000000000 -0500
-+++ policycoreutils-2.0.7/scripts/chcat	2007-03-23 09:03:56.000000000 -0400
++++ policycoreutils-2.0.9/scripts/chcat	2007-04-16 13:26:34.000000000 -0400
 @@ -74,9 +74,11 @@
              if i not in cats:
                  cats.append(i)
@@ -120,9 +186,9 @@
          if add_ind:
              cmd = "semanage login -a -r %s -s %s %s" % (new_serange, user[0], u)
          else:
-diff --exclude-from=exclude --exclude=sepolgen-1.0.7 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.7/scripts/fixfiles
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.9/scripts/fixfiles
 --- nsapolicycoreutils/scripts/fixfiles	2007-01-11 08:56:30.000000000 -0500
-+++ policycoreutils-2.0.7/scripts/fixfiles	2007-03-23 14:24:15.000000000 -0400
++++ policycoreutils-2.0.9/scripts/fixfiles	2007-04-16 13:26:34.000000000 -0400
 @@ -138,7 +138,7 @@
      exit $?
  fi
@@ -132,9 +198,9 @@
  exit $?
  }
  
-diff --exclude-from=exclude --exclude=sepolgen-1.0.7 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-2.0.7/scripts/genhomedircon
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-2.0.9/scripts/genhomedircon
 --- nsapolicycoreutils/scripts/genhomedircon	2006-11-28 09:24:33.000000000 -0500
-+++ policycoreutils-2.0.7/scripts/genhomedircon	2007-04-09 15:44:47.000000000 -0400
++++ policycoreutils-2.0.9/scripts/genhomedircon	2007-04-16 13:26:34.000000000 -0400
 @@ -26,6 +26,7 @@
  
  import sys, os, pwd, string, getopt, re
@@ -155,10 +221,10 @@
  		fd.close()
  		return ret
  
-diff --exclude-from=exclude --exclude=sepolgen-1.0.7 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.7/semanage/seobject.py
---- nsapolicycoreutils/semanage/seobject.py	2007-02-22 08:53:22.000000000 -0500
-+++ policycoreutils-2.0.7/semanage/seobject.py	2007-03-23 09:03:56.000000000 -0400
-@@ -209,6 +209,7 @@
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.9/semanage/seobject.py
+--- nsapolicycoreutils/semanage/seobject.py	2007-04-12 12:43:06.000000000 -0400
++++ policycoreutils-2.0.9/semanage/seobject.py	2007-04-16 13:26:34.000000000 -0400
+@@ -210,6 +210,7 @@
  		os.write(fd, self.out())
  		os.close(fd)
  		os.rename(newfilename, self.filename)
@@ -166,7 +232,7 @@
                  
  class semanageRecords:
  	def __init__(self):
-@@ -1282,9 +1283,12 @@
+@@ -1283,9 +1284,12 @@
  			raise ValueError(_("Could not list booleans"))
  
  		for boolean in self.blist:
@@ -182,55 +248,3 @@
  
  		return ddict
  			
---- policycoreutils-2.0.7/restorecon/restorecon.c.onefs	2007-04-02 14:35:37.000000000 -0400
-+++ policycoreutils-2.0.7/restorecon/restorecon.c	2007-04-02 14:48:05.000000000 -0400
-@@ -16,6 +16,7 @@
-  * -v	Show changes in file labels.  
-  * -o	filename save list of files with incorrect context
-  * -F	Force reset of context to match file_context for customizable files
-+ * -l   Limit directory tree walk to a single filesystem
-  *
-  * pathname...	The file(s) to label 
-  *
-@@ -50,6 +51,7 @@
- static int recurse = 0;
- static int file_exist = 1;
- static int force = 0;
-+static int onefs = 0;
- #define STAT_BLOCK_SIZE 1
- static int pipe_fds[2] = { -1, -1 };
- static unsigned long long count = 0;
-@@ -326,13 +328,15 @@
- 			rc = fork();
- 		if (rc == 0) {
- 			close(pipe_fds[0]);
--			nftw(buf, pre_stat, 1024, FTW_PHYS);
-+			nftw(buf, pre_stat, 1024, 
-+                             FTW_PHYS | (onefs ? FTW_MOUNT : 0));
- 			exit(1);
- 		}
- 		if (rc > 0)
- 			close(pipe_fds[1]);
- 		if (rc == -1 || rc > 0) {
--			if (nftw(buf, apply_spec, 1024, FTW_PHYS)) {
-+			if (nftw(buf, apply_spec, 1024, 
-+                                 FTW_PHYS | (onefs ? FTW_MOUNT : 0))) {
- 				if (!file_exist && errno == ENOENT)
- 					return;
- 				fprintf(stderr,
-@@ -367,11 +371,14 @@
- 
- 	set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
- 
--	while ((opt = getopt(argc, argv, "ipFrRnvf:o:e:")) > 0) {
-+	while ((opt = getopt(argc, argv, "ipFrRnvfl:o:e:")) > 0) {
- 		switch (opt) {
- 		case 'n':
- 			change = 0;
- 			break;
-+                case 'l':
-+                    onefs = 1;
-+                    break;
- 		case 'i':
- 			file_exist = 0;
- 			break;


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -r1.400 -r1.401
--- policycoreutils.spec	18 Apr 2007 17:18:15 -0000	1.400
+++ policycoreutils.spec	18 Apr 2007 18:35:05 -0000	1.401
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 2.0.9
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -16,12 +16,12 @@
 Source4: system-config-selinux.pam
 Source5: system-config-selinux.console
 Patch: policycoreutils-rhat.patch
-#Patch1: policycoreutils-po.patch
+Patch1: policycoreutils-po.patch
 #Patch2: policycoreutils-sepolgen.patch
 Patch3: policycoreutils-gui.patch
 
 BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver}  libcap-devel audit-libs-devel >=  %{libauditver} gettext
-Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff /bin/rpm
+Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff /bin/rpm /bin/sed
 Requires: libsepol >= %{libsepolver} libsemanage >= %{libsemanagever} libselinux-python coreutils audit-libs-python >=  %{libauditver} 
 Requires(post): /sbin/service /sbin/chkconfig 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,7 +46,7 @@
 %prep
 %setup -q -a 1 
 %patch -p1 -b .rhat
-#%patch1 -p1 -b .rhatpo
+%patch1 -p1 -b .rhatpo
 #%patch2 -p1 -b .sepolgen
 %patch3 -p1 -b .gui
 
@@ -131,13 +131,13 @@
 %{_sbindir}/semodule
 %{_sbindir}/semanage
 %{_sbindir}/load_policy
-%{_sbindir}/audit2allow
-%{_sbindir}/audit2why
 %{_sbindir}/genhomedircon
 %{_sbindir}/sepolgen-ifgen
 %{_sbindir}/sestatus
 %{_sbindir}/run_init
 %{_sbindir}/open_init_pty
+%{_bindir}/audit2allow
+%{_bindir}/audit2why
 %{_bindir}/chcat
 %{_bindir}/secon
 %{_bindir}/semodule_deps
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Wed Apr 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-7
+- Fix restorecon crash
+
 * Wed Apr 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-6
 - Change polgengui to a druid
 



From fedora-cvs-commits at redhat.com  Wed Apr 18 18:43:51 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 14:43:51 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.3087,
	1.3088 linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch, 1.1, 1.2
Message-ID: <200704181843.l3IIhptt012758@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
	kernel-2.6.spec linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch 
Log Message:
update bcm43xx phy rev 1 fix


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3087
retrieving revision 1.3088
diff -u -r1.3087 -r1.3088
--- kernel-2.6.spec	18 Apr 2007 14:50:24 -0000	1.3087
+++ kernel-2.6.spec	18 Apr 2007 18:43:49 -0000	1.3088
@@ -2311,6 +2311,9 @@
 #  - tux.
 
 %changelog
+* Wed Apr 18 2007 John W. Linville <linville at redhat.com> 
+- Update fix for bcm43xx-mac80211 oops on ppc w/ phy rev 1
+
 * Wed Apr 18 2007 Kristian H??gsberg <krh at redhat.com> 
 - Add missing _IOC_WRITE for create iso context ioctl code.
 

linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch:
 bcm43xx_main.c |    8 ++-
 bcm43xx_phy.c  |  128 ++++++++++++++++++++++++++++++++-------------------------
 2 files changed, 78 insertions(+), 58 deletions(-)

Index: linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch	11 Apr 2007 19:47:58 -0000	1.1
+++ linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch	18 Apr 2007 18:43:49 -0000	1.2
@@ -1,6 +1,91 @@
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c.orig	2007-04-11 14:52:39.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c	2007-04-11 14:53:22.000000000 -0400
-@@ -1362,7 +1362,7 @@ static void bcm43xx_phy_initb6(struct bc
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c.orig	2007-04-18 14:31:55.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c	2007-04-18 14:36:09.000000000 -0400
+@@ -830,6 +830,7 @@ static void bcm43xx_switch_analog(struct
+ 
+ void bcm43xx_wireless_core_reset(struct bcm43xx_wldev *dev, u32 flags)
+ {
++	struct bcm43xx_phy *phy = &dev->phy;
+ 	u32 tmslow;
+ 	u32 macctl;
+ 
+@@ -853,10 +854,13 @@ void bcm43xx_wireless_core_reset(struct 
+ 	/* Turn Analog ON */
+ 	bcm43xx_switch_analog(dev, 1);
+ 
+-	macctl = bcm43xx_read32(dev, BCM43xx_MMIO_MACCTL);
++	macctl = bcm43xx_read32(dev, BCM43xx_MMIO_MACCTL) & ~BCM43xx_MACCTL_GMODE;
+ 	macctl |= BCM43xx_MACCTL_IHR_ENABLED;
+-	if (flags & BCM43xx_TMSLOW_GMODE)
++	if (flags & BCM43xx_TMSLOW_GMODE) {
+ 		macctl |= BCM43xx_MACCTL_GMODE;
++		phy->gmode = 1;
++	} else
++		phy->gmode = 0;
+ 	bcm43xx_write32(dev, BCM43xx_MMIO_MACCTL, macctl);
+ }
+ 
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c.orig	2007-04-18 14:35:13.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c	2007-04-18 14:36:09.000000000 -0400
+@@ -599,16 +599,16 @@ static void bcm43xx_phy_agcsetup(struct 
+ 	bcm43xx_phy_write(dev, 0x04A1,
+ 			  (bcm43xx_phy_read(dev, 0x04A1)
+ 			   & 0xF0FF) | 0x0600);
+-	bcm43xx_phy_write(dev, 0x04A2,
+-			  (bcm43xx_phy_read(dev, 0x04A2)
++	bcm43xx_phy_write(dev, 0x0412,
++			  (bcm43xx_phy_read(dev, 0x0412)
+ 			   & 0xF0FF) | 0x0700);
+-	bcm43xx_phy_write(dev, 0x04A0,
+-			  (bcm43xx_phy_read(dev, 0x04A0)
++	bcm43xx_phy_write(dev, 0x0410,
++			  (bcm43xx_phy_read(dev, 0x0410)
+ 			   & 0xF0FF) | 0x0100);
+ 
+ 	if (phy->rev == 1) {
+-		bcm43xx_phy_write(dev, 0x04A2,
+-				  (bcm43xx_phy_read(dev, 0x04A2)
++		bcm43xx_phy_write(dev, 0x0412,
++				  (bcm43xx_phy_read(dev, 0x0412)
+ 				   & 0xFFF0) | 0x0007);
+ 	}
+ 
+@@ -655,7 +655,7 @@ static void bcm43xx_phy_agcsetup(struct 
+ 				   & 0xFFF0) | 0x0004);
+ 	}
+ 
+-	if (phy->rev < 6) {
++	if (phy->rev >= 6) {
+ 		bcm43xx_phy_write(dev, 0x0422, 0x287A);
+ 		bcm43xx_phy_write(dev, 0x0420,
+ 				  (bcm43xx_phy_read(dev, 0x0420)
+@@ -664,7 +664,7 @@ static void bcm43xx_phy_agcsetup(struct 
+ 
+ 	bcm43xx_phy_write(dev, 0x04A8,
+ 			  (bcm43xx_phy_read(dev, 0x04A8)
+-			   & 0x8080) | 0x7874);
++			   & 0x7F7F) | 0x7874);
+ 	bcm43xx_phy_write(dev, 0x048E, 0x1C00);
+ 
+ 	offset = 0x0800;
+@@ -955,7 +955,7 @@ static void bcm43xx_phy_inita(struct bcm
+ 		bcm43xx_phy_setupa(dev);
+ 	} else {
+ 		bcm43xx_phy_setupg(dev);
+-		if (dev->dev->bus->sprom.r1.boardflags_lo & BCM43xx_BFL_PACTRL)
++		if (phy->gmode && dev->dev->bus->sprom.r1.boardflags_lo & BCM43xx_BFL_PACTRL)
+ 			bcm43xx_phy_write(dev, 0x046E, 0x03CF);
+ 		return;
+ 	}
+@@ -1139,7 +1139,7 @@ static void bcm43xx_phy_initb5(struct bc
+ 	if (phy->radio_ver == 0x2050)
+ 		bcm43xx_phy_write(dev, 0x0038, 0x0667);
+ 
+-	if (phy->type == BCM43xx_PHYTYPE_G) {
++	if (phy->gmode || phy->rev >= 2) {
+ 		if (phy->radio_ver == 0x2050) {
+ 			bcm43xx_radio_write16(dev, 0x007A,
+ 					      bcm43xx_radio_read16(dev, 0x007A)
+@@ -1361,7 +1361,7 @@ static void bcm43xx_phy_initb6(struct bc
  static void bcm43xx_calc_loopback_gain(struct bcm43xx_wldev *dev)
  {
  	struct bcm43xx_phy *phy = &dev->phy;
@@ -9,7 +94,7 @@
  	u16 backup_radio[3];
  	u16 backup_bband;
  	u16 i, j, loop_i_max;
-@@ -1373,8 +1373,10 @@ static void bcm43xx_calc_loopback_gain(s
+@@ -1372,8 +1372,10 @@ static void bcm43xx_calc_loopback_gain(s
  	backup_phy[1] = bcm43xx_phy_read(dev, BCM43xx_PHY_CCKBBANDCFG);
  	backup_phy[2] = bcm43xx_phy_read(dev, BCM43xx_PHY_RFOVER);
  	backup_phy[3] = bcm43xx_phy_read(dev, BCM43xx_PHY_RFOVERVAL);
@@ -22,7 +107,7 @@
  	backup_phy[6] = bcm43xx_phy_read(dev, BCM43xx_PHY_BASE(0x5A));
  	backup_phy[7] = bcm43xx_phy_read(dev, BCM43xx_PHY_BASE(0x59));
  	backup_phy[8] = bcm43xx_phy_read(dev, BCM43xx_PHY_BASE(0x58));
-@@ -1402,14 +1404,16 @@ static void bcm43xx_calc_loopback_gain(s
+@@ -1401,14 +1403,16 @@ static void bcm43xx_calc_loopback_gain(s
  			  bcm43xx_phy_read(dev, BCM43xx_PHY_RFOVER) | 0x0001);
  	bcm43xx_phy_write(dev, BCM43xx_PHY_RFOVERVAL,
  			  bcm43xx_phy_read(dev, BCM43xx_PHY_RFOVERVAL) & 0xFFFE);
@@ -47,7 +132,7 @@
  	bcm43xx_phy_write(dev, BCM43xx_PHY_RFOVER,
  			  bcm43xx_phy_read(dev, BCM43xx_PHY_RFOVER) | 0x000C);
  	bcm43xx_phy_write(dev, BCM43xx_PHY_RFOVER,
-@@ -1426,10 +1430,12 @@ static void bcm43xx_calc_loopback_gain(s
+@@ -1425,10 +1429,12 @@ static void bcm43xx_calc_loopback_gain(s
  
  	bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x0A),
  			  bcm43xx_phy_read(dev, BCM43xx_PHY_BASE(0x0A)) | 0x2000);
@@ -64,7 +149,7 @@
  	bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x03),
  			  (bcm43xx_phy_read(dev, BCM43xx_PHY_BASE(0x03))
  			   & 0xFF9F) | 0x40);
-@@ -1522,8 +1528,10 @@ exit_loop1:
+@@ -1521,8 +1527,10 @@ exit_loop1:
  		trsw_rx = 0x18;
  exit_loop2:
  
@@ -77,32 +162,211 @@
  	bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x5A), backup_phy[6]);
  	bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x59), backup_phy[7]);
  	bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x58), backup_phy[8]);
-@@ -1576,7 +1584,7 @@ static void bcm43xx_phy_initg(struct bcm
+@@ -1560,7 +1568,7 @@ static void bcm43xx_phy_initg(struct bcm
+ 	else
+ 		bcm43xx_phy_initb6(dev);
+ 
+-	if (has_loopback_gain(phy))
++	if (phy->rev >= 2 || phy->gmode)
+ 		bcm43xx_phy_inita(dev);
+ 
+ 	if (phy->rev >= 2) {
+@@ -1575,7 +1583,7 @@ static void bcm43xx_phy_initg(struct bcm
  		bcm43xx_phy_write(dev, BCM43xx_PHY_RFOVER, 0x400);
  		bcm43xx_phy_write(dev, BCM43xx_PHY_PGACTL, 0xC0);
  	}
 -	if (phy->gmode) {
-+	if (phy->gmode && phy->rev >= 2) {
++	if (phy->gmode || phy->rev >= 2) {
  		tmp = bcm43xx_phy_read(dev, BCM43xx_PHY_VERSION_OFDM);
  		tmp &= BCM43xx_PHYVER_VERSION;
  		if (tmp == 3 || tmp == 5) {
-@@ -1635,7 +1643,7 @@ static void bcm43xx_phy_initg(struct bcm
+@@ -1588,7 +1596,7 @@ static void bcm43xx_phy_initg(struct bcm
+ 					   & 0x00FF) | 0x1F00);
+ 		}
+ 	}
+-	if (phy->rev <= 2 && phy->gmode)
++	if ((phy->rev == 1 && phy->gmode) || phy->rev >= 2)
+ 		bcm43xx_phy_write(dev, BCM43xx_PHY_OFDM(0x7E), 0x78);
+ 	if (phy->radio_rev == 8) {
+ 		bcm43xx_phy_write(dev, BCM43xx_PHY_EXTG(0x01),
+@@ -1634,7 +1642,7 @@ static void bcm43xx_phy_initg(struct bcm
  		else
  			bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x2F), 0x202);
  	}
 -	if (phy->gmode) {
-+	if (phy->gmode && phy->rev != 1) {
++	if (phy->gmode || phy->rev >= 2) {
  		bcm43xx_lo_adjust(dev);
  		bcm43xx_phy_write(dev, BCM43xx_PHY_LO_MASK, 0x8078);
  	}
-@@ -1649,8 +1657,8 @@ static void bcm43xx_phy_initg(struct bcm
- 		 */
- 		bcm43xx_nrssi_hw_update(dev, 0xFFFF);//FIXME?
+@@ -2428,8 +2436,10 @@ static void bcm43xx_calc_nrssi_offset(st
+ 	backup[0] = bcm43xx_phy_read(dev, 0x0001);
+ 	backup[1] = bcm43xx_phy_read(dev, 0x0811);
+ 	backup[2] = bcm43xx_phy_read(dev, 0x0812);
+-	backup[3] = bcm43xx_phy_read(dev, 0x0814);
+-	backup[4] = bcm43xx_phy_read(dev, 0x0815);
++	if (phy->rev != 1) {
++		backup[3] = bcm43xx_phy_read(dev, 0x0814);
++		backup[4] = bcm43xx_phy_read(dev, 0x0815);
++	}
+ 	backup[5] = bcm43xx_phy_read(dev, 0x005A);
+ 	backup[6] = bcm43xx_phy_read(dev, 0x0059);
+ 	backup[7] = bcm43xx_phy_read(dev, 0x0058);
+@@ -2495,10 +2505,12 @@ static void bcm43xx_calc_nrssi_offset(st
+ 	} else {
+ 		bcm43xx_radio_write16(dev, 0x007A,
+ 				      bcm43xx_radio_read16(dev, 0x007A) & 0x007F);
+-		bcm43xx_phy_write(dev, 0x0814,
+-				  bcm43xx_phy_read(dev, 0x0814) | 0x0001);
+-		bcm43xx_phy_write(dev, 0x0815,
+-				  bcm43xx_phy_read(dev, 0x0815) & 0xFFFE);
++		if (phy->rev != 1) {
++			bcm43xx_phy_write(dev, 0x0814,
++					  bcm43xx_phy_read(dev, 0x0814) | 0x0001);
++			bcm43xx_phy_write(dev, 0x0815,
++					  bcm43xx_phy_read(dev, 0x0815) & 0xFFFE);
++		}
+ 		bcm43xx_phy_write(dev, 0x0811,
+ 				  bcm43xx_phy_read(dev, 0x0811) | 0x000C);
+ 		bcm43xx_phy_write(dev, 0x0812,
+@@ -2517,10 +2529,12 @@ static void bcm43xx_calc_nrssi_offset(st
+ 					  bcm43xx_phy_read(dev, 0x000A)
+ 					  | 0x2000);
+ 		}
+-		bcm43xx_phy_write(dev, 0x0814,
+-				  bcm43xx_phy_read(dev, 0x0814) | 0x0004);
+-		bcm43xx_phy_write(dev, 0x0815,
+-				  bcm43xx_phy_read(dev, 0x0815) & 0xFFFB);
++		if (phy->rev != 1) {
++			bcm43xx_phy_write(dev, 0x0814,
++					  bcm43xx_phy_read(dev, 0x0814) | 0x0004);
++			bcm43xx_phy_write(dev, 0x0815,
++					  bcm43xx_phy_read(dev, 0x0815) & 0xFFFB);
++		}
+ 		bcm43xx_phy_write(dev, 0x0003,
+ 				  (bcm43xx_phy_read(dev, 0x0003) & 0xFF9F)
+ 				  | 0x0040);
+@@ -2557,8 +2571,10 @@ static void bcm43xx_calc_nrssi_offset(st
+ 		bcm43xx_phy_write(dev, 0x080F, backup[14]);
+ 		bcm43xx_phy_write(dev, 0x0810, backup[15]);
+ 	}
+-	bcm43xx_phy_write(dev, 0x0814, backup[3]);
+-	bcm43xx_phy_write(dev, 0x0815, backup[4]);
++	if (phy->rev != 1) {
++		bcm43xx_phy_write(dev, 0x0814, backup[3]);
++		bcm43xx_phy_write(dev, 0x0815, backup[4]);
++	}
+ 	bcm43xx_phy_write(dev, 0x005A, backup[5]);
+ 	bcm43xx_phy_write(dev, 0x0059, backup[6]);
+ 	bcm43xx_phy_write(dev, 0x0058, backup[7]);
+@@ -3239,7 +3255,7 @@ bcm43xx_radio_interference_mitigation_di
+ 			                  bcm43xx_phy_read(dev, BCM43xx_PHY_G_CRS) | 0x4000);
+ 			break;
+ 		}
+-		phy_stackrestore(0x0078);
++		radio_stackrestore(0x0078);
  		bcm43xx_calc_nrssi_threshold(dev);
--	} else {
--		if (phy->gmode && phy->nrssi[0] == -1000) {
-+	} else if (phy->gmode && phy->rev != 1) {
-+		if (phy->nrssi[0] == -1000) {
- 			assert(phy->nrssi[1] == -1000);
- 			bcm43xx_calc_nrssi_slope(dev);
- 		} else
+ 		phy_stackrestore(0x0406);
+ 		bcm43xx_phy_write(dev, 0x042B,
+@@ -3299,7 +3315,7 @@ bcm43xx_radio_interference_mitigation_di
+ 			ofdmtab_stackrestore(0x1A00, 0x3);
+ 		}
+ 		phy_stackrestore(0x04A2);
+-		phy_stackrestore(0x04A8);
++		phy_stackrestore(0x048A);
+ 		phy_stackrestore(0x042B);
+ 		phy_stackrestore(0x048C);
+ 		bcm43xx_hf_write(dev, bcm43xx_hf_read(dev) & ~BCM43xx_HF_ACIW);
+@@ -3553,7 +3569,7 @@ u16 bcm43xx_radio_init2050(struct bcm43x
+ 
+ 		bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x30), 0xFF);
+ 		bcm43xx_write16(dev, 0x3EC, 0x3F3F);
+-	} else if (phy->gmode) {
++	} else if (phy->gmode || phy->rev >= 2) {
+ 		sav.phy_rfover = bcm43xx_phy_read(dev, BCM43xx_PHY_RFOVER);
+ 		sav.phy_rfoverval = bcm43xx_phy_read(dev, BCM43xx_PHY_RFOVERVAL);
+ 		sav.phy_analogover = bcm43xx_phy_read(dev, BCM43xx_PHY_ANALOGOVER);
+@@ -3615,14 +3631,14 @@ u16 bcm43xx_radio_init2050(struct bcm43x
+ 
+ 	if (phy->type == BCM43xx_PHYTYPE_B)
+ 		bcm43xx_radio_write16(dev, 0x78, 0x26);
+-	if (phy->gmode) {
++	if (phy->gmode || phy->rev >= 2) {
+ 		bcm43xx_phy_write(dev, BCM43xx_PHY_RFOVERVAL,
+ 				  radio2050_rfover_val(dev, BCM43xx_PHY_RFOVERVAL,
+ 						       LPD(0, 1, 1)));
+ 	}
+ 	bcm43xx_phy_write(dev, BCM43xx_PHY_PGACTL, 0xBFAF);
+ 	bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x2B), 0x1403);
+-	if (phy->gmode) {
++	if (phy->gmode || phy->rev >= 2) {
+ 		bcm43xx_phy_write(dev, BCM43xx_PHY_RFOVERVAL,
+ 				  radio2050_rfover_val(dev, BCM43xx_PHY_RFOVERVAL,
+ 						       LPD(0, 0, 1)));
+@@ -3645,21 +3661,21 @@ u16 bcm43xx_radio_init2050(struct bcm43x
+ 		bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x5A), 0x0480);
+ 		bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x59), 0xC810);
+ 		bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x58), 0x000D);
+-		if (phy->gmode) {
++		if (phy->gmode || phy->rev >= 2) {
+ 			bcm43xx_phy_write(dev, BCM43xx_PHY_RFOVERVAL,
+ 					  radio2050_rfover_val(dev, BCM43xx_PHY_RFOVERVAL,
+ 							       LPD(1, 0, 1)));
+ 		}
+ 		bcm43xx_phy_write(dev, BCM43xx_PHY_PGACTL, 0xAFB0);
+ 		udelay(10);
+-		if (phy->gmode) {
++		if (phy->gmode || phy->rev >= 2) {
+ 			bcm43xx_phy_write(dev, BCM43xx_PHY_RFOVERVAL,
+ 					  radio2050_rfover_val(dev, BCM43xx_PHY_RFOVERVAL,
+ 							       LPD(1, 0, 1)));
+ 		}
+ 		bcm43xx_phy_write(dev, BCM43xx_PHY_PGACTL, 0xEFB0);
+ 		udelay(10);
+-		if (phy->gmode) {
++		if (phy->gmode || phy->rev >= 2) {
+ 			bcm43xx_phy_write(dev, BCM43xx_PHY_RFOVERVAL,
+ 					  radio2050_rfover_val(dev, BCM43xx_PHY_RFOVERVAL,
+ 							       LPD(1, 0, 0)));
+@@ -3668,7 +3684,7 @@ u16 bcm43xx_radio_init2050(struct bcm43x
+ 		udelay(20);
+ 		tmp1 += bcm43xx_phy_read(dev, BCM43xx_PHY_LO_LEAKAGE);
+ 		bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x58), 0);
+-		if (phy->gmode) {
++		if (phy->gmode || phy->rev >= 2) {
+ 			bcm43xx_phy_write(dev, BCM43xx_PHY_RFOVERVAL,
+ 					  radio2050_rfover_val(dev, BCM43xx_PHY_RFOVERVAL,
+ 							       LPD(1, 0, 1)));
+@@ -3689,21 +3705,21 @@ u16 bcm43xx_radio_init2050(struct bcm43x
+ 			bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x5A), 0x0D80);
+ 			bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x59), 0xC810);
+ 			bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x58), 0x000D);
+-			if (phy->gmode) {
++			if (phy->gmode || phy->rev >= 2) {
+ 				bcm43xx_phy_write(dev, BCM43xx_PHY_RFOVERVAL,
+ 						  radio2050_rfover_val(dev, BCM43xx_PHY_RFOVERVAL,
+ 								       LPD(1, 0, 1)));
+ 			}
+ 			bcm43xx_phy_write(dev, BCM43xx_PHY_PGACTL, 0xAFB0);
+ 			udelay(10);
+-			if (phy->gmode) {
++			if (phy->gmode || phy->rev >= 2) {
+ 				bcm43xx_phy_write(dev, BCM43xx_PHY_RFOVERVAL,
+ 						  radio2050_rfover_val(dev, BCM43xx_PHY_RFOVERVAL,
+ 								       LPD(1, 0, 1)));
+ 			}
+ 			bcm43xx_phy_write(dev, BCM43xx_PHY_PGACTL, 0xEFB0);
+ 			udelay(10);
+-			if (phy->gmode) {
++			if (phy->gmode || phy->rev >= 2) {
+ 				bcm43xx_phy_write(dev, BCM43xx_PHY_RFOVERVAL,
+ 						  radio2050_rfover_val(dev, BCM43xx_PHY_RFOVERVAL,
+ 								       LPD(1, 0, 0)));
+@@ -3712,7 +3728,7 @@ u16 bcm43xx_radio_init2050(struct bcm43x
+ 			udelay(10);
+ 			tmp2 += bcm43xx_phy_read(dev, BCM43xx_PHY_LO_LEAKAGE);
+ 			bcm43xx_phy_write(dev, BCM43xx_PHY_BASE(0x58), 0);
+-			if (phy->gmode) {
++			if (phy->gmode || phy->rev >= 2) {
+ 				bcm43xx_phy_write(dev, BCM43xx_PHY_RFOVERVAL,
+ 						  radio2050_rfover_val(dev, BCM43xx_PHY_RFOVERVAL,
+ 								       LPD(1, 0, 1)));



From fedora-cvs-commits at redhat.com  Wed Apr 18 19:19:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 15:19:32 -0400
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.401,1.402
Message-ID: <200704181919.l3IJJWdc006774@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils.spec 
Log Message:
* Wed Apr 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-8
- Fix size and use_tmp problem on gui



Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -r1.401 -r1.402
--- policycoreutils.spec	18 Apr 2007 18:35:05 -0000	1.401
+++ policycoreutils.spec	18 Apr 2007 19:19:25 -0000	1.402
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 2.0.9
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Wed Apr 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-8
+- Fix size and use_tmp problem on gui
+
 * Wed Apr 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-7
 - Fix restorecon crash
 



From fedora-cvs-commits at redhat.com  Wed Apr 18 20:05:10 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 16:05:10 -0400
Subject: rpms/perl/devel perl.spec,1.110,1.111
Message-ID: <200704182005.l3IK5Aai015337@cvs.devel.redhat.com>

Author: rnorwood

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

Modified Files:
	perl.spec 
Log Message:
fix the 'epoch' issue, add a Requires: perl(Test::Harness) to perl-ExtUtils-MakeMaker.


Index: perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- perl.spec	28 Mar 2007 18:53:53 -0000	1.110
+++ perl.spec	18 Apr 2007 20:05:08 -0000	1.111
@@ -1,14 +1,15 @@
 %define multilib_64_archs x86_64 s390x ppc64 sparc64
 %define perl_archname %{_arch}-%{_os}-thread-multi
 %define perlmodcompat 5.8.7 5.8.6 5.8.5
-%define new_perl_lib  $RPM_BUILD_ROOT%{_libdir}/perl5/%{version}:$RPM_BUILD_ROOT/usr/lib/perl5/%{version}
-%define comp_perl_lib $RPM_BUILD_ROOT/usr/lib/perl5/%{version}:$RPM_BUILD_ROOT/usr/lib/perl5/%{version}
+%define new_perl_lib  $RPM_BUILD_ROOT%{_libdir}/perl5/%{version}:$RPM_BUILD_ROOT%{_prefix}/lib/perl5/%{version}
+%define comp_perl_lib $RPM_BUILD_ROOT%{_prefix}/lib/perl5/%{version}:$RPM_BUILD_ROOT%{_prefix}/lib/perl5/%{version}
 %define new_arch_lib  $RPM_BUILD_ROOT%{_libdir}/perl5/%{version}/%{perl_archname}
-%define comp_arch_lib $RPM_BUILD_ROOT/usr/lib/perl5/%{version}/%{perl_archname}
+%define comp_arch_lib $RPM_BUILD_ROOT%{_prefix}/lib/perl5/%{version}/%{perl_archname}
 %define new_perl_flags LD_PRELOAD=/%{new_arch_lib}/CORE/libperl.so LD_LIBRARY_PATH=%{new_arch_lib}/CORE PERL5LIB=%{new_perl_lib}:%{comp_perl_lib}
 %define new_perl %{new_perl_flags} $RPM_BUILD_ROOT/%{_bindir}/perl
 
 %define perl_version    5.8.8
+%define perl_epoch      4
 
 # Use this for SUPER PERL DEBUGGING MODE.
 %{?!perl_debugging:    %define perl_debugging 0}
@@ -19,8 +20,8 @@
 
 Name:           perl
 Version:        5.8.8
-Release:        16%{?dist}
-Epoch:          4
+Release:        16.2%{?dist}
+Epoch:          %{perl_epoch}
 Summary:        The Perl programming language
 Group:          Development/Languages
 License:        Artistic or GPL
@@ -197,7 +198,7 @@
 %package devel
 Summary:        Header files for use in perl development
 Group:          Development/Languages
-Requires:       perl = %{epoch}:%{perl_version}-%{release}
+Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description devel
 This package contains header files and development modules.
@@ -207,7 +208,7 @@
 %package suidperl
 Summary:        Suidperl, for use with setuid perl scripts
 Group:          Development/Languages
-Requires:       perl = %{epoch}:%{perl_version}-%{release}
+Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description suidperl
 Suidperl is a setuid binary copy of perl that allows for (hopefully)
@@ -218,7 +219,8 @@
 Group:          Development/Languages
 Epoch:          0
 Version:        1.76_02
-Requires:       perl = %{epoch}:%{perl_version}-%{release}
+Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
+Provides:	cpan
 
 %description CPAN
 Query, download and build perl modules from CPAN sites.
@@ -229,7 +231,7 @@
 Epoch:          0
 Version:        1.26
 Requires:       perl-devel
-Requires:       perl = %{epoch}:%{perl_version}-%{release}
+Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description ExtUtils-Embed
 Utilities for embedding Perl in C/C++ applications.
@@ -240,7 +242,8 @@
 Epoch:          0
 Version:        6.30
 Requires:       perl-devel
-Requires:       perl = %{epoch}:%{perl_version}-%{release}
+Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
+Requires:	perl(Test::Harness)
 
 %description ExtUtils-MakeMaker
 Create a module Makefile.
@@ -251,7 +254,7 @@
 Epoch:          0
 Version:        2.56
 Requires:       perl-devel
-Requires:       perl = %{epoch}:%{perl_version}-%{release}
+Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description Test-Harness
 Run Perl standard test scripts with statistics.
@@ -262,7 +265,7 @@
 Epoch:          0
 Version:        0.62
 Requires:       perl-devel
-Requires:       perl = %{epoch}:%{perl_version}-%{release}
+Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description Test-Simple
 Basic utilities for writing tests.
@@ -359,7 +362,7 @@
 # arches work correctly :\ the Configure lines below hardcode lib for
 # similar reasons.
 
-sh Configure -des -Doptimize="$RPM_OPT_FLAGS" \
+/bin/sh Configure -des -Doptimize="$RPM_OPT_FLAGS" \
         -Dversion=%{perl_version} \
         -Dmyhostname=localhost \
         -Dperladmin=root at localhost \
@@ -368,10 +371,10 @@
         -Dinstallprefix=%{_prefix} \
         -Dprefix=%{_prefix} \
 %ifarch %{multilib_64_archs}
-        -Dlibpth="/usr/local/lib64 /lib64 /usr/lib64" \
-        -Dprivlib="/usr/lib/perl5/%{perl_version}" \
-        -Dsitelib="/usr/lib/perl5/site_perl/%{perl_version}" \
-        -Dvendorlib="/usr/lib/perl5/vendor_perl/%{perl_version}" \
+        -Dlibpth="/usr/local/lib64 /lib64 %{_prefix}/lib64" \
+        -Dprivlib="%{_prefix}/lib/perl5/%{perl_version}" \
+        -Dsitelib="%{_prefix}/lib/perl5/site_perl/%{perl_version}" \
+        -Dvendorlib="%{_prefix}/lib/perl5/vendor_perl/%{perl_version}" \
         -Darchlib="%{_libdir}/perl5/%{perl_version}/%{perl_archname}" \
         -Dsitearch="%{_libdir}/perl5/site_perl/%{perl_version}/%{perl_archname}" \
         -Dvendorarch="%{_libdir}/perl5/vendor_perl/%{perl_version}/%{perl_archname}" \
@@ -413,13 +416,13 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %ifarch %{multilib_64_archs}
-mkdir -p -m 755 $RPM_BUILD_ROOT/usr/lib/perl5/%{perl_version}
-mkdir -p -m 755 $RPM_BUILD_ROOT/usr/lib/perl5/site_perl/%{perl_version}
-mkdir -p -m 755 $RPM_BUILD_ROOT/usr/lib/perl5/vendor_perl/%{perl_version}
+mkdir -p -m 755 $RPM_BUILD_ROOT%{_prefix}/lib/perl5/%{perl_version}
+mkdir -p -m 755 $RPM_BUILD_ROOT%{_prefix}/lib/perl5/site_perl/%{perl_version}
+mkdir -p -m 755 $RPM_BUILD_ROOT%{_prefix}/lib/perl5/vendor_perl/%{perl_version}
 %endif
 
 %ifarch %{multilib_64_archs}
-mkdir -p -m 755 ${RPM_BUILD_ROOT}/usr/lib64/perl5/vendor_perl/%{perl_version}/%{_arch}-%{_os}
+mkdir -p -m 755 ${RPM_BUILD_ROOT}%{_prefix}/lib64/perl5/vendor_perl/%{perl_version}/%{_arch}-%{_os}
 %endif
 
 #
@@ -444,7 +447,7 @@
 done
 
 
-for dir in $(%{new_perl} -le 'print join("\n", @INC)' | grep '^/usr/lib')
+for dir in $(%{new_perl} -le 'print join("\n", @INC)' | grep '^%{_prefix}/lib')
 do
   mkdir -p $RPM_BUILD_ROOT/$dir
 done
@@ -476,13 +479,13 @@
 # Cleanup binary paths and make cgi files executable
 pushd $RPM_BUILD_ROOT/usr/lib/perl5/%{perl_version}/CGI/eg/
   for i in *.cgi make_links.pl RunMeFirst ; do
-    sed -i 's|/usr/local/bin/perl|/usr/bin/perl|g' $i
+    sed -i 's|/usr/local/bin/perl|%{_bindir}/perl|g' $i
     chmod +x $i
   done
 popd
 
 # miniperl? As an interpreter? How odd.
-sed -i 's|./miniperl|/usr/bin/perl|' $RPM_BUILD_ROOT/usr/lib/perl5/%{perl_version}/ExtUtils/xsubpp
+sed -i 's|./miniperl|%{_bindir}/perl|' $RPM_BUILD_ROOT/usr/lib/perl5/%{perl_version}/ExtUtils/xsubpp
 chmod +x $RPM_BUILD_ROOT/usr/lib/perl5/%{perl_version}/ExtUtils/xsubpp
 
 # Don't need the .packlist
@@ -517,7 +520,7 @@
 %{_bindir}/*
 %{_libdir}/perl5/
 %ifarch %{multilib_64_archs}
-/usr/lib/perl5/
+%{_prefix}/lib/perl5/
 %endif
 
 # devel
@@ -539,34 +542,34 @@
 
 # CPAN
 %exclude %{_bindir}/cpan
-%exclude /usr/lib/perl5/%{perl_version}/CPAN/
-%exclude /usr/lib/perl5/%{perl_version}/CPAN.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/CPAN/
+%exclude %{_prefix}/lib/perl5/%{perl_version}/CPAN.pm
 %exclude %{_mandir}/man1/cpan.1*
 %exclude %{_mandir}/man3/CPAN*
 
 # ExtUtils-Embed
-%exclude /usr/lib/perl5/%{perl_version}/ExtUtils/Embed.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Embed.pm
 %exclude %{_mandir}/man3/ExtUtils::Embed*
 
 # ExtUtils-MakeMaker
 %exclude %{_bindir}/instmodsh
-%exclude /usr/lib/perl5/%{perl_version}/ExtUtils/Command/
-%exclude /usr/lib/perl5/%{perl_version}/ExtUtils/Install.pm
-%exclude /usr/lib/perl5/%{perl_version}/ExtUtils/Installed.pm
-%exclude /usr/lib/perl5/%{perl_version}/ExtUtils/Liblist/
-%exclude /usr/lib/perl5/%{perl_version}/ExtUtils/Liblist.pm
-%exclude /usr/lib/perl5/%{perl_version}/ExtUtils/MakeMaker/
-%exclude /usr/lib/perl5/%{perl_version}/ExtUtils/MakeMaker.pm
-%exclude /usr/lib/perl5/%{perl_version}/ExtUtils/MANIFEST.SKIP
-%exclude /usr/lib/perl5/%{perl_version}/ExtUtils/MM*.pm
-%exclude /usr/lib/perl5/%{perl_version}/ExtUtils/MY.pm
-%exclude /usr/lib/perl5/%{perl_version}/ExtUtils/Manifest.pm
-%exclude /usr/lib/perl5/%{perl_version}/ExtUtils/Mkbootstrap.pm
-%exclude /usr/lib/perl5/%{perl_version}/ExtUtils/Mksymlists.pm
-%exclude /usr/lib/perl5/%{perl_version}/ExtUtils/NOTES
-%exclude /usr/lib/perl5/%{perl_version}/ExtUtils/Packlist.pm
-%exclude /usr/lib/perl5/%{perl_version}/ExtUtils/PATCHING
-%exclude /usr/lib/perl5/%{perl_version}/ExtUtils/testlib.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Command/
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Install.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Installed.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Liblist/
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Liblist.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MakeMaker/
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MakeMaker.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MANIFEST.SKIP
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MM*.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MY.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Manifest.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Mkbootstrap.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Mksymlists.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/NOTES
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Packlist.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/PATCHING
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/testlib.pm
 %exclude %{_mandir}/man1/instmodsh.1*
 %exclude %{_mandir}/man3/ExtUtils::Command::MM*
 %exclude %{_mandir}/man3/ExtUtils::Install.3*
@@ -583,15 +586,15 @@
 
 # Test::Harness
 %exclude %{_bindir}/prove
-%exclude /usr/lib/perl5/%{perl_version}/Test/Harness*
+%exclude %{_prefix}/lib/perl5/%{perl_version}/Test/Harness*
 %exclude %{_mandir}/man1/prove.1*
 %exclude %{_mandir}/man3/Test::Harness*
 
 # Test::Simple
-%exclude /usr/lib/perl5/%{perl_version}/Test/More*
-%exclude /usr/lib/perl5/%{perl_version}/Test/Builder*
-%exclude /usr/lib/perl5/%{perl_version}/Test/Simple*
-%exclude /usr/lib/perl5/%{perl_version}/Test/Tutorial*
+%exclude %{_prefix}/lib/perl5/%{perl_version}/Test/More*
+%exclude %{_prefix}/lib/perl5/%{perl_version}/Test/Builder*
+%exclude %{_prefix}/lib/perl5/%{perl_version}/Test/Simple*
+%exclude %{_prefix}/lib/perl5/%{perl_version}/Test/Tutorial*
 %exclude %{_mandir}/man3/Test::More*
 %exclude %{_mandir}/man3/Test::Builder*
 %exclude %{_mandir}/man3/Test::Simple*
@@ -620,36 +623,36 @@
 %files CPAN
 %defattr(-,root,root,-)
 %{_bindir}/cpan
-/usr/lib/perl5/%{perl_version}/CPAN/
-/usr/lib/perl5/%{perl_version}/CPAN.pm
+%{_prefix}/lib/perl5/%{perl_version}/CPAN/
+%{_prefix}/lib/perl5/%{perl_version}/CPAN.pm
 %{_mandir}/man1/cpan.1*
 %{_mandir}/man3/CPAN*
 
 %files ExtUtils-Embed
 %defattr(-,root,root,-)
-/usr/lib/perl5/%{perl_version}/ExtUtils/Embed.pm
+%{_libdir}/perl5/%{perl_version}/ExtUtils/Embed.pm
 %{_mandir}/man3/ExtUtils::Embed*
 
 %files ExtUtils-MakeMaker
 %defattr(-,root,root,-)
 %{_bindir}/instmodsh
-/usr/lib/perl5/%{perl_version}/ExtUtils/Command/
-/usr/lib/perl5/%{perl_version}/ExtUtils/Install.pm
-/usr/lib/perl5/%{perl_version}/ExtUtils/Installed.pm
-/usr/lib/perl5/%{perl_version}/ExtUtils/Liblist/
-/usr/lib/perl5/%{perl_version}/ExtUtils/Liblist.pm
-/usr/lib/perl5/%{perl_version}/ExtUtils/MakeMaker/
-/usr/lib/perl5/%{perl_version}/ExtUtils/MakeMaker.pm
-/usr/lib/perl5/%{perl_version}/ExtUtils/MANIFEST.SKIP
-/usr/lib/perl5/%{perl_version}/ExtUtils/MM*.pm
-/usr/lib/perl5/%{perl_version}/ExtUtils/MY.pm
-/usr/lib/perl5/%{perl_version}/ExtUtils/Manifest.pm
-/usr/lib/perl5/%{perl_version}/ExtUtils/Mkbootstrap.pm
-/usr/lib/perl5/%{perl_version}/ExtUtils/Mksymlists.pm
-/usr/lib/perl5/%{perl_version}/ExtUtils/NOTES
-/usr/lib/perl5/%{perl_version}/ExtUtils/Packlist.pm
-/usr/lib/perl5/%{perl_version}/ExtUtils/PATCHING
-/usr/lib/perl5/%{perl_version}/ExtUtils/testlib.pm
+%{_libdir}/perl5/%{perl_version}/ExtUtils/Command/
+%{_libdir}/perl5/%{perl_version}/ExtUtils/Install.pm
+%{_libdir}/perl5/%{perl_version}/ExtUtils/Installed.pm
+%{_libdir}/perl5/%{perl_version}/ExtUtils/Liblist/
+%{_libdir}/perl5/%{perl_version}/ExtUtils/Liblist.pm
+%{_libdir}/perl5/%{perl_version}/ExtUtils/MakeMaker/
+%{_libdir}/perl5/%{perl_version}/ExtUtils/MakeMaker.pm
+%{_libdir}/perl5/%{perl_version}/ExtUtils/MANIFEST.SKIP
+%{_libdir}/perl5/%{perl_version}/ExtUtils/MM*.pm
+%{_libdir}/perl5/%{perl_version}/ExtUtils/MY.pm
+%{_libdir}/perl5/%{perl_version}/ExtUtils/Manifest.pm
+%{_libdir}/perl5/%{perl_version}/ExtUtils/Mkbootstrap.pm
+%{_libdir}/perl5/%{perl_version}/ExtUtils/Mksymlists.pm
+%{_libdir}/perl5/%{perl_version}/ExtUtils/NOTES
+%{_libdir}/perl5/%{perl_version}/ExtUtils/Packlist.pm
+%{_libdir}/perl5/%{perl_version}/ExtUtils/PATCHING
+%{_libdir}/perl5/%{perl_version}/ExtUtils/testlib.pm
 %{_mandir}/man1/instmodsh.1*
 %{_mandir}/man3/ExtUtils::Command::MM*
 %{_mandir}/man3/ExtUtils::Install.3*
@@ -667,23 +670,23 @@
 %files Test-Harness
 %defattr(-,root,root,-)
 %{_bindir}/prove
-/usr/lib/perl5/%{perl_version}/Test/Harness*
+%{_libdir}/perl5/%{perl_version}/Test/Harness*
 %{_mandir}/man1/prove.1*
 %{_mandir}/man3/Test::Harness*
 
 %files Test-Simple
 %defattr(-,root,root,-)
-/usr/lib/perl5/%{perl_version}/Test/More*
-/usr/lib/perl5/%{perl_version}/Test/Builder*
-/usr/lib/perl5/%{perl_version}/Test/Simple*
-/usr/lib/perl5/%{perl_version}/Test/Tutorial*
+%{_libdir}/perl5/%{perl_version}/Test/More*
+%{_libdir}/perl5/%{perl_version}/Test/Builder*
+%{_libdir}/perl5/%{perl_version}/Test/Simple*
+%{_libdir}/perl5/%{perl_version}/Test/Tutorial*
 %{_mandir}/man3/Test::More*
 %{_mandir}/man3/Test::Builder*
 %{_mandir}/man3/Test::Simple*
 %{_mandir}/man3/Test::Tutorial*
 
 %changelog
-* Wed Mar 28 2007 Robin Norwood <rnorwood at redhat.com> - 4:5.8.8-16
+* Wed Mar 28 2007 Robin Norwood <rnorwood at redhat.com> - 4:5.8.8-16.2
 - Includes patch from Ralf Corsepius to split out some more perl modules.
 - Further split out development related perl modules.
 - Remove Requires: perl-devel from perl



From fedora-cvs-commits at redhat.com  Wed Apr 18 20:07:51 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 16:07:51 -0400
Subject: rpms/gcc/devel gcc41.spec,1.156,1.157 gcc41-pr25874.patch,1.2,NONE
Message-ID: <200704182007.l3IK7p0r015368@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	gcc41.spec 
Removed Files:
	gcc41-pr25874.patch 
Log Message:
4.1.2-9


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- gcc41.spec	3 Apr 2007 13:14:16 -0000	1.156
+++ gcc41.spec	18 Apr 2007 20:07:48 -0000	1.157
@@ -1,6 +1,6 @@
-%define DATE 20070403
+%define DATE 20070418
 %define gcc_version 4.1.2
-%define gcc_release 8
+%define gcc_release 9
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -124,22 +124,21 @@
 Patch13: gcc41-pr20297-test.patch
 Patch14: gcc41-objc-rh185398.patch
 Patch15: gcc41-tests.patch
-Patch16: gcc41-pr25874.patch
-Patch17: gcc41-hash-style-gnu.patch
-Patch18: gcc41-java-libdotdotlib.patch
-Patch19: gcc41-pr28709.patch
-Patch20: gcc41-pr28755.patch
-Patch21: gcc41-pr27898.patch
-Patch22: gcc41-pr27567.patch
-Patch23: gcc41-pr29272.patch
-Patch24: gcc41-pr29059.patch
-Patch25: gcc41-strncat-chk.patch
-Patch26: gcc41-pr29299.patch
-Patch27: gcc41-java-bogus-debugline.patch
-Patch28: gcc41-libjava-visibility.patch
-Patch29: gcc41-pr31187.patch
-Patch30: gcc41-rh231818.patch
-Patch31: gcc41-rh234515.patch
+Patch16: gcc41-hash-style-gnu.patch
+Patch17: gcc41-java-libdotdotlib.patch
+Patch18: gcc41-pr28709.patch
+Patch19: gcc41-pr28755.patch
+Patch20: gcc41-pr27898.patch
+Patch21: gcc41-pr27567.patch
+Patch22: gcc41-pr29272.patch
+Patch23: gcc41-pr29059.patch
+Patch24: gcc41-strncat-chk.patch
+Patch25: gcc41-pr29299.patch
+Patch26: gcc41-java-bogus-debugline.patch
+Patch27: gcc41-libjava-visibility.patch
+Patch28: gcc41-pr31187.patch
+Patch29: gcc41-rh231818.patch
+Patch30: gcc41-rh234515.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -317,15 +316,17 @@
 Prereq: /sbin/install-info
 Requires: zip >= 2.1
 Requires: gtk2 >= 2.4.0
-BuildRequires: gtk2-devel >= 2.4.0
 Requires: glib2 >= 2.4.0
-BuildRequires: glib2-devel >= 2.4.0
 Requires: libart_lgpl >= 2.1.0
+%if %{build_java}
+BuildRequires: gtk2-devel >= 2.4.0
+BuildRequires: glib2-devel >= 2.4.0
 BuildRequires: firefox-devel
 BuildRequires: libart_lgpl-devel >= 2.1.0
 BuildRequires: alsa-lib-devel
 BuildRequires: libXtst-devel
 BuildRequires: libXt-devel
+%endif
 Obsoletes: gcc-libgcj
 Obsoletes: libgcj3
 Obsoletes: libgcj34
@@ -432,22 +433,21 @@
 %patch13 -p0 -E -b .pr20297-test~
 %patch14 -p0 -b .objc-rh185398~
 %patch15 -p0 -b .tests~
-%patch16 -p0 -b .pr25874~
-%patch17 -p0 -b .hash-style-gnu~
-%patch18 -p0 -b .java-libdotdotlib~
-%patch19 -p0 -b .pr28709~
-%patch20 -p0 -b .pr28755~
-%patch21 -p0 -b .pr27898~
-%patch22 -p0 -b .pr27567~
-%patch23 -p0 -b .pr29272~
-%patch24 -p0 -b .pr29059~
-%patch25 -p0 -b .strncat-chk~
-%patch26 -p0 -b .pr29299~
-%patch27 -p0 -b .java-bogus-debugline~
-%patch28 -p0 -b .libjava-visibility~
-%patch29 -p0 -b .pr31187~
-%patch30 -p0 -b .rh231818~
-%patch31 -p0 -b .rh234515~
+%patch16 -p0 -b .hash-style-gnu~
+%patch17 -p0 -b .java-libdotdotlib~
+%patch18 -p0 -b .pr28709~
+%patch19 -p0 -b .pr28755~
+%patch20 -p0 -b .pr27898~
+%patch21 -p0 -b .pr27567~
+%patch22 -p0 -b .pr29272~
+%patch23 -p0 -b .pr29059~
+%patch24 -p0 -b .strncat-chk~
+%patch25 -p0 -b .pr29299~
+%patch26 -p0 -b .java-bogus-debugline~
+%patch27 -p0 -b .libjava-visibility~
+%patch28 -p0 -b .pr31187~
+%patch29 -p0 -b .rh231818~
+%patch30 -p0 -b .rh234515~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1502,13 +1502,13 @@
 %{_prefix}/%{_lib}/pkgconfig/libgcj-*.pc
 %doc rpm.doc/boehm-gc/* rpm.doc/fastjar/* rpm.doc/libffi/*
 %doc rpm.doc/libjava/*
-%endif
 
 %files -n libgcj-src
 %defattr(-,root,root)
 %dir %{_prefix}/share/java
 %{_prefix}/share/java/src*.zip
 %{_prefix}/share/java/libgcj-tools-%{version}.jar
+%endif
 
 %if %{build_ada}
 %files gnat
@@ -1571,6 +1571,17 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Wed Apr 18 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-9
+- update from gcc-4_1-branch (-r123462:123951)
+  - PRs c++/30168, c++/31074, c++/31449, c++/31517, c/31520, middle-end/30729,
+	target/25448, target/30289, target/30483, target/31361, target/31582,
+	testsuite/31578
+- fix %%build_java 0 build (#235500)
+- fix libjava build on alpha (#236337)
+- fix for Java AWT programs that could hang X server (Francis Kung,
+  PR classpath/31311)
+- fix gnu.javax.net.ssl.provider.SSLSocketFactoryImpl (Tom Tromey, #236614)
+
 * Tue Apr  3 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-8
 - update from gcc-4_1-branch (-r123245:123462)
   - PRs target/31137, target/31380


--- gcc41-pr25874.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 18 20:11:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 16:11:01 -0400
Subject: rpms/gcc/devel .cvsignore,1.203,1.204 sources,1.205,1.206
Message-ID: <200704182011.l3IKB12i015543@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	.cvsignore sources 
Log Message:
4.1.2-9


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- .cvsignore	3 Apr 2007 13:14:16 -0000	1.203
+++ .cvsignore	18 Apr 2007 20:10:59 -0000	1.204
@@ -1 +1 @@
-gcc-4.1.2-20070403.tar.bz2
+gcc-4.1.2-20070418.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- sources	3 Apr 2007 13:14:16 -0000	1.205
+++ sources	18 Apr 2007 20:10:59 -0000	1.206
@@ -1 +1 @@
-b79f9ba06ee8097ace35d0b338dd9332  gcc-4.1.2-20070403.tar.bz2
+d315aa245a891a2b44415851d93afa54  gcc-4.1.2-20070418.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 18 20:36:58 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 16:36:58 -0400
Subject: rpms/dejavu-lgc-fonts/devel .cvsignore, 1.7,
	1.8 dejavu-lgc-fonts.spec, 1.11, 1.12 sources, 1.7, 1.8
Message-ID: <200704182036.l3IKawY1000917@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/dejavu-lgc-fonts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv817

Modified Files:
	.cvsignore dejavu-lgc-fonts.spec sources 
Log Message:
* Thu Apr 18 2007 Behdad Esfahbod <besfahbo at redhat.com> - 2.16-1
- Update to 2.16



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dejavu-lgc-fonts/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Mar 2007 21:19:22 -0000	1.7
+++ .cvsignore	18 Apr 2007 20:36:56 -0000	1.8
@@ -1 +1 @@
-dejavu-lgc-ttf-2.15.tar.bz2
+dejavu-lgc-ttf-2.16.tar.bz2


Index: dejavu-lgc-fonts.spec
===================================================================
RCS file: /cvs/dist/rpms/dejavu-lgc-fonts/devel/dejavu-lgc-fonts.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dejavu-lgc-fonts.spec	1 Mar 2007 21:19:22 -0000	1.11
+++ dejavu-lgc-fonts.spec	18 Apr 2007 20:36:56 -0000	1.12
@@ -4,7 +4,7 @@
 %define fontconffile	%{fontconfdir}/59-%{name}.conf
 
 Name:      dejavu-lgc-fonts
-Version:   2.15
+Version:   2.16
 Release:   1
 Summary:   DejaVu LGC Fonts
 Group:     User Interface/X
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Thu Apr 18 2007 Behdad Esfahbod <besfahbo at redhat.com> - 2.16-1
+- Update to 2.16
+
 * Thu Mar 01 2007 Behdad Esfahbod <besfahbo at redhat.com> - 2.15-1
 - Update to 2.15
 - Define fontconffile and use it


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dejavu-lgc-fonts/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Mar 2007 21:19:22 -0000	1.7
+++ sources	18 Apr 2007 20:36:56 -0000	1.8
@@ -1 +1 @@
-b3b685e5885117ca4c7057b99174c343  dejavu-lgc-ttf-2.15.tar.bz2
+b2313091ff68ffc2b7f81d333e617dbc  dejavu-lgc-ttf-2.16.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 18 20:45:22 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 16:45:22 -0400
Subject: rpms/selinux-policy/devel policy-20070219.patch, 1.50,
	1.51 selinux-policy.spec, 1.435, 1.436
Message-ID: <200704182045.l3IKjMGF007167@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20070219.patch selinux-policy.spec 
Log Message:
* Wed Apr 18 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-6
- Fixes for consolekit


policy-20070219.patch:
 Rules.modular                           |   12 +
 policy/flask/access_vectors             |    4 
 policy/global_booleans                  |    2 
 policy/global_tunables                  |    7 
 policy/mls                              |   31 ++-
 policy/modules/admin/acct.te            |    1 
 policy/modules/admin/amtu.fc            |    3 
 policy/modules/admin/amtu.if            |   53 ++++++
 policy/modules/admin/amtu.te            |   56 ++++++
 policy/modules/admin/bootloader.te      |    3 
 policy/modules/admin/consoletype.te     |   10 -
 policy/modules/admin/dmesg.te           |    1 
 policy/modules/admin/kudzu.te           |    6 
 policy/modules/admin/logwatch.te        |    4 
 policy/modules/admin/netutils.te        |    6 
 policy/modules/admin/rpm.fc             |    3 
 policy/modules/admin/rpm.if             |   85 +++++++---
 policy/modules/admin/rpm.te             |    2 
 policy/modules/admin/su.if              |    4 
 policy/modules/admin/usermanage.if      |    2 
 policy/modules/admin/usermanage.te      |   26 +++
 policy/modules/apps/gnome.if            |   26 ++-
 policy/modules/apps/gpg.fc              |    2 
 policy/modules/apps/loadkeys.if         |   44 +----
 policy/modules/apps/mozilla.if          |    1 
 policy/modules/apps/slocate.te          |    5 
 policy/modules/apps/uml.if              |   27 ---
 policy/modules/kernel/corecommands.fc   |    5 
 policy/modules/kernel/corecommands.if   |   20 ++
 policy/modules/kernel/corenetwork.te.in |   15 +
 policy/modules/kernel/devices.if        |   36 ++++
 policy/modules/kernel/domain.if         |   18 ++
 policy/modules/kernel/domain.te         |   46 +++++
 policy/modules/kernel/files.fc          |    1 
 policy/modules/kernel/files.if          |   83 ++++++++-
 policy/modules/kernel/filesystem.if     |   39 ++++
 policy/modules/kernel/filesystem.te     |   13 +
 policy/modules/kernel/kernel.if         |   42 ++++
 policy/modules/kernel/kernel.te         |    2 
 policy/modules/kernel/mls.if            |   20 ++
 policy/modules/kernel/mls.te            |    3 
 policy/modules/kernel/selinux.if        |   38 ++++
 policy/modules/kernel/storage.if        |    2 
 policy/modules/kernel/terminal.if       |    2 
 policy/modules/kernel/terminal.te       |    1 
 policy/modules/services/amavis.te       |    3 
 policy/modules/services/apache.fc       |   14 -
 policy/modules/services/apache.if       |  171 +++++++++++++++++++-
 policy/modules/services/apache.te       |   72 ++++++++
 policy/modules/services/apcupsd.fc      |    9 +
 policy/modules/services/apcupsd.if      |  108 ++++++++++++
 policy/modules/services/apcupsd.te      |   91 ++++++++++
 policy/modules/services/automount.te    |    2 
 policy/modules/services/avahi.if        |   19 ++
 policy/modules/services/avahi.te        |    4 
 policy/modules/services/bluetooth.te    |    2 
 policy/modules/services/consolekit.te   |   31 ++-
 policy/modules/services/cron.fc         |    1 
 policy/modules/services/cron.if         |   33 +--
 policy/modules/services/cron.te         |   43 ++++-
 policy/modules/services/cups.te         |    6 
 policy/modules/services/cvs.te          |    1 
 policy/modules/services/cyrus.te        |    1 
 policy/modules/services/dbus.if         |   63 +++++++
 policy/modules/services/dhcp.te         |    2 
 policy/modules/services/djbdns.te       |    5 
 policy/modules/services/dovecot.te      |    5 
 policy/modules/services/ftp.te          |    5 
 policy/modules/services/hal.fc          |    8 
 policy/modules/services/hal.if          |   39 ++++
 policy/modules/services/hal.te          |  143 ++++++++++++++++-
 policy/modules/services/inetd.te        |    5 
 policy/modules/services/kerberos.if     |   79 ++-------
 policy/modules/services/kerberos.te     |   36 ++++
 policy/modules/services/mailman.if      |   19 ++
 policy/modules/services/mta.if          |   19 ++
 policy/modules/services/mta.te          |    2 
 policy/modules/services/nis.if          |    4 
 policy/modules/services/nis.te          |    4 
 policy/modules/services/nscd.te         |   10 +
 policy/modules/services/ntp.te          |    4 
 policy/modules/services/pegasus.if      |   18 ++
 policy/modules/services/pegasus.te      |    6 
 policy/modules/services/postfix.if      |    1 
 policy/modules/services/postfix.te      |    8 
 policy/modules/services/procmail.te     |    1 
 policy/modules/services/pyzor.te        |    7 
 policy/modules/services/radius.te       |    4 
 policy/modules/services/rpc.if          |    5 
 policy/modules/services/rsync.te        |    1 
 policy/modules/services/rwho.fc         |    3 
 policy/modules/services/rwho.if         |   84 +++++++++
 policy/modules/services/rwho.te         |   65 +++++++
 policy/modules/services/samba.fc        |    3 
 policy/modules/services/samba.if        |   86 ++++++++++
 policy/modules/services/samba.te        |   85 +++++++++-
 policy/modules/services/sendmail.if     |   22 ++
 policy/modules/services/smartmon.te     |    1 
 policy/modules/services/snmp.te         |   15 +
 policy/modules/services/spamassassin.te |    7 
 policy/modules/services/squid.fc        |    2 
 policy/modules/services/squid.if        |   22 ++
 policy/modules/services/squid.te        |   12 +
 policy/modules/services/ssh.if          |   39 ++++
 policy/modules/services/ssh.te          |   10 -
 policy/modules/services/w3c.fc          |    2 
 policy/modules/services/w3c.if          |    1 
 policy/modules/services/w3c.te          |   14 +
 policy/modules/system/application.fc    |    1 
 policy/modules/system/application.if    |  104 ++++++++++++
 policy/modules/system/application.te    |   14 +
 policy/modules/system/authlogin.if      |   83 ++++++++-
 policy/modules/system/authlogin.te      |    3 
 policy/modules/system/fstools.fc        |    1 
 policy/modules/system/fstools.te        |    1 
 policy/modules/system/fusermount.fc     |    6 
 policy/modules/system/fusermount.if     |   41 ++++
 policy/modules/system/fusermount.te     |   45 +++++
 policy/modules/system/getty.te          |    3 
 policy/modules/system/hostname.te       |   14 +
 policy/modules/system/init.if           |   42 ++++
 policy/modules/system/init.te           |   35 +++-
 policy/modules/system/ipsec.if          |   20 ++
 policy/modules/system/ipsec.te          |    3 
 policy/modules/system/iptables.te       |    4 
 policy/modules/system/libraries.fc      |    3 
 policy/modules/system/libraries.te      |    4 
 policy/modules/system/locallogin.te     |    7 
 policy/modules/system/logging.if        |   21 ++
 policy/modules/system/logging.te        |    2 
 policy/modules/system/lvm.te            |    6 
 policy/modules/system/modutils.te       |    7 
 policy/modules/system/mount.fc          |    3 
 policy/modules/system/mount.if          |   37 ++++
 policy/modules/system/mount.te          |   64 +++++++
 policy/modules/system/raid.te           |    1 
 policy/modules/system/selinuxutil.fc    |    1 
 policy/modules/system/selinuxutil.if    |    5 
 policy/modules/system/selinuxutil.te    |   59 +++----
 policy/modules/system/setrans.if        |    1 
 policy/modules/system/sysnetwork.te     |    3 
 policy/modules/system/udev.te           |   12 +
 policy/modules/system/unconfined.fc     |    1 
 policy/modules/system/unconfined.if     |   10 -
 policy/modules/system/unconfined.te     |   24 ++
 policy/modules/system/userdomain.if     |  269 +++++++++++++++++++-------------
 policy/modules/system/userdomain.te     |   46 ++++-
 policy/modules/system/xen.te            |   35 ++++
 policy/support/obj_perm_sets.spt        |   12 +
 149 files changed, 3013 insertions(+), 439 deletions(-)

Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- policy-20070219.patch	17 Apr 2007 20:42:32 -0000	1.50
+++ policy-20070219.patch	18 Apr 2007 20:45:20 -0000	1.51
@@ -2260,6 +2260,17 @@
 +	dontaudit $1 avahi_var_run_t:dir search_dir_perms;
 +')
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.5.12/policy/modules/services/avahi.te
+--- nsaserefpolicy/policy/modules/services/avahi.te	2007-03-20 23:38:05.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/avahi.te	2007-04-18 16:04:51.000000000 -0400
+@@ -105,3 +105,7 @@
+ optional_policy(`
+ 	udev_read_db(avahi_t)
+ ')
++
++optional_policy(`
++	samba_stream_connect_winbind(avahi_t)
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.5.12/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2007-03-20 23:38:04.000000000 -0400
 +++ serefpolicy-2.5.12/policy/modules/services/bluetooth.te	2007-04-11 17:07:34.000000000 -0400
@@ -2274,8 +2285,13 @@
  term_use_unallocated_ttys(bluetooth_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-2.5.12/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2007-04-11 16:04:02.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/consolekit.te	2007-04-17 15:08:20.000000000 -0400
-@@ -23,10 +23,9 @@
++++ serefpolicy-2.5.12/policy/modules/services/consolekit.te	2007-04-18 15:27:17.000000000 -0400
+@@ -19,14 +19,13 @@
+ # consolekit local policy
+ #
+ 
+-allow consolekit_t self:capability { sys_tty_config dac_override sys_nice sys_ptrace };
++allow consolekit_t self:capability { setuid setgid sys_tty_config dac_override sys_nice sys_ptrace };
  allow consolekit_t self:process { getsched signal };
  allow consolekit_t self:fifo_file rw_fifo_file_perms;
  allow consolekit_t self:unix_stream_socket create_stream_socket_perms;
@@ -2284,16 +2300,18 @@
 -# pid file
 -manage_files_pattern(consolekit_t,consolekit_var_run_t,consolekit_var_run_t)
 -files_pid_filetrans(consolekit_t,consolekit_var_run_t, file)
-+corecmd_search_bin(consolekit_t)
++corecmd_exec_bin(consolekit_t)
  
  dev_read_urand(consolekit_t)
  dev_read_sysfs(consolekit_t)
-@@ -38,18 +37,28 @@
+@@ -38,18 +37,32 @@
  # needs to read /var/lib/dbus/machine-id
  files_read_var_lib_files(consolekit_t)
  
 -term_use_console(consolekit_t)
 +fs_list_inotifyfs(consolekit_t)
++
++kernel_read_system_state(consolekit_t)
  
  libs_use_ld_so(consolekit_t)
  libs_use_shared_libs(consolekit_t)
@@ -2310,6 +2328,8 @@
 -	term_dontaudit_use_generic_ptys(consolekit_t)
 +	term_use_unallocated_ttys(consolekit_t)
 +	term_use_generic_ptys(consolekit_t)
++	#reading .Xauthity
++	userdom_read_generic_user_home_content_files(consolekit_t)
  ')
  
 +# Init script handling
@@ -2320,6 +2340,14 @@
  optional_policy(`
  	dbus_system_bus_client_template(consolekit, consolekit_t)
  	dbus_send_system_bus(consolekit_t)
+@@ -61,3 +74,7 @@
+ 		unconfined_dbus_chat(consolekit_t)
+ 	')
+ ')
++
++optional_policy(`
++	xserver_stream_connect_xdm_xserver(consolekit_t)
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-2.5.12/policy/modules/services/cron.fc
 --- nsaserefpolicy/policy/modules/services/cron.fc	2006-11-16 17:15:21.000000000 -0500
 +++ serefpolicy-2.5.12/policy/modules/services/cron.fc	2007-04-11 17:07:34.000000000 -0400
@@ -3765,7 +3793,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.5.12/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/services/samba.if	2007-04-12 15:08:34.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/samba.if	2007-04-18 16:04:30.000000000 -0400
 @@ -177,6 +177,27 @@
  
  ########################################
@@ -3884,7 +3912,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.5.12/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2007-03-26 16:24:12.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/samba.te	2007-04-16 11:08:25.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/samba.te	2007-04-18 16:08:21.000000000 -0400
 @@ -28,10 +28,39 @@
  ## </desc>
  gen_tunable(samba_share_nfs,false)
@@ -4031,11 +4059,11 @@
  #
  
 +
-+allow winbind_t self:capability setuid;
++allow winbind_t self:capability { dac_override ipc_lock setuid };
  dontaudit winbind_t self:capability sys_tty_config;
  allow winbind_t self:process signal_perms;
  allow winbind_t self:fifo_file { read write };
-@@ -634,6 +697,9 @@
+@@ -634,10 +697,15 @@
  allow winbind_t self:tcp_socket create_stream_socket_perms;
  allow winbind_t self:udp_socket create_socket_perms;
  
@@ -4045,7 +4073,13 @@
  allow winbind_t samba_etc_t:dir list_dir_perms;
  read_files_pattern(winbind_t,samba_etc_t,samba_etc_t)
  read_lnk_files_pattern(winbind_t,samba_etc_t,samba_etc_t)
-@@ -645,6 +711,7 @@
+ 
++rw_files_pattern(winbind_t,smbd_tmp_t,smbd_tmp_t)
++
+ manage_files_pattern(winbind_t,samba_etc_t,samba_secrets_t)
+ filetrans_pattern(winbind_t,samba_etc_t,samba_secrets_t,file)
+ 
+@@ -645,6 +713,7 @@
  manage_files_pattern(winbind_t,samba_log_t,samba_log_t)
  manage_lnk_files_pattern(winbind_t,samba_log_t,samba_log_t)
  
@@ -4053,7 +4087,7 @@
  manage_files_pattern(winbind_t,samba_var_t,samba_var_t)
  manage_lnk_files_pattern(winbind_t,samba_var_t,samba_var_t)
  
-@@ -736,6 +803,7 @@
+@@ -736,6 +805,7 @@
  read_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t)
  read_lnk_files_pattern(winbind_helper_t,samba_etc_t,samba_etc_t)
  
@@ -4061,7 +4095,7 @@
  allow winbind_helper_t samba_var_t:dir search;
  
  stream_connect_pattern(winbind_helper_t,winbind_var_run_t,winbind_var_run_t,winbind_t)
-@@ -764,3 +832,14 @@
+@@ -764,3 +834,14 @@
  	squid_read_log(winbind_helper_t)
  	squid_append_log(winbind_helper_t)
  ')
@@ -5069,7 +5103,7 @@
  /usr/lib(64)?(/.*)?/nvidia/.+\.so(\..*)? --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-2.5.12/policy/modules/system/libraries.te
 --- nsaserefpolicy/policy/modules/system/libraries.te	2007-04-11 10:19:43.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/libraries.te	2007-04-17 15:56:34.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/libraries.te	2007-04-18 16:10:26.000000000 -0400
 @@ -62,7 +62,8 @@
  
  manage_dirs_pattern(ldconfig_t,ldconfig_tmp_t,ldconfig_tmp_t)
@@ -5080,6 +5114,14 @@
  
  manage_lnk_files_pattern(ldconfig_t,lib_t,lib_t)
  
+@@ -101,6 +102,7 @@
+ 	files_read_generic_tmp_symlinks(ldconfig_t)
+ 	term_dontaudit_use_generic_ptys(ldconfig_t)
+ 	term_dontaudit_use_unallocated_ttys(ldconfig_t)
++	files_read_generic_tmp_files(ldconfig_t)
+ ')
+ 
+ optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.5.12/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2007-03-26 10:39:07.000000000 -0400
 +++ serefpolicy-2.5.12/policy/modules/system/locallogin.te	2007-04-11 17:07:34.000000000 -0400
@@ -5443,7 +5485,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.5.12/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/selinuxutil.te	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/selinuxutil.te	2007-04-18 16:29:19.000000000 -0400
 @@ -1,10 +1,8 @@
  
  policy_module(selinuxutil,1.4.2)
@@ -5553,16 +5595,30 @@
  
  tunable_policy(`allow_polyinstantiation',`
  	files_polyinstantiate_all(newrole_t)
-@@ -571,6 +569,8 @@
+@@ -571,7 +569,10 @@
  kernel_read_system_state(semanage_t)
  kernel_read_kernel_sysctls(semanage_t)
  
 +can_exec(semanage_t, semanage_exec_t)
 +
  corecmd_exec_bin(semanage_t)
++corecmd_exec_shell(semanage_t)
  
  dev_read_urand(semanage_t)
-@@ -700,6 +700,6 @@
+ 
+@@ -621,6 +622,11 @@
+ 
+ userdom_search_sysadm_home_dirs(semanage_t)
+ 
++optional_policy(`
++	#signal mcstrans on reload
++	init_spec_domtrans_script(semanage_t)
++')
++
+ # cjp: need a more general way to handle this:
+ ifdef(`enable_mls',`
+ 	# read secadm tmp files
+@@ -700,6 +706,7 @@
  ifdef(`hide_broken_symptoms',`
  	# cjp: cover up stray file descriptors.
  	optional_policy(`
@@ -5570,6 +5626,15 @@
 +		unconfined_dontaudit_rw_pipes(setfiles_t)
  	')
  ')
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-2.5.12/policy/modules/system/setrans.if
+--- nsaserefpolicy/policy/modules/system/setrans.if	2007-01-02 12:57:49.000000000 -0500
++++ serefpolicy-2.5.12/policy/modules/system/setrans.if	2007-04-18 16:30:37.000000000 -0400
+@@ -20,3 +20,4 @@
+ 	stream_connect_pattern($1,setrans_var_run_t,setrans_var_run_t,setrans_t)
+ 	files_list_pids($1)
+ ')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.5.12/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2007-03-26 10:39:07.000000000 -0400
 +++ serefpolicy-2.5.12/policy/modules/system/sysnetwork.te	2007-04-16 12:03:06.000000000 -0400
@@ -5728,7 +5793,7 @@
  		init_dbus_chat_script(unconfined_execmem_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.5.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-03-26 16:24:13.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/userdomain.if	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/userdomain.if	2007-04-18 15:31:48.000000000 -0400
 @@ -114,6 +114,10 @@
  		# Allow making the stack executable via mprotect.
  		allow $1_t self:process execstack;


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.435
retrieving revision 1.436
diff -u -r1.435 -r1.436
--- selinux-policy.spec	17 Apr 2007 20:42:32 -0000	1.435
+++ selinux-policy.spec	18 Apr 2007 20:45:20 -0000	1.436
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.5.12
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -358,6 +358,9 @@
 %endif
 
 %changelog
+* Wed Apr 18 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-6
+- Fixes for consolekit
+
 * Tue Apr 17 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-5
 - Allow insmod_t to mount kvmfs_t filesystems
 



From fedora-cvs-commits at redhat.com  Wed Apr 18 20:46:15 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 16:46:15 -0400
Subject: rpms/dmraid/devel dmraid-1.0.0.rc14-jmicron-name.patch, NONE,
	1.1 dmraid.spec, 1.81, 1.82
Message-ID: <200704182046.l3IKkFSB007860@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7741

Modified Files:
	dmraid.spec 
Added Files:
	dmraid-1.0.0.rc14-jmicron-name.patch 
Log Message:
- Fix jmicron name parsing (#219058)


dmraid-1.0.0.rc14-jmicron-name.patch:
 jm.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE dmraid-1.0.0.rc14-jmicron-name.patch ---
--- 1.0.0.rc13.orig/lib/format/ataraid/jm.c
+++ 1.0.0.rc13/lib/format/ataraid/jm.c
@@ -28,10 +28,15 @@ static char *name(struct lib_context *lc
 	size_t len;
 	struct jm *jm = META(rd, jm);
 	char buf[2], *ret, *name = (char *) jm->name;
+	char buf0[JM_NAME_LEN+1] = { '\0' };
+	size_t i = JM_NAME_LEN-1;
 
-	/* Name always 0 terminated ? */
-	if ((len = strlen(name)) > JM_NAME_LEN)
-		len = JM_NAME_LEN;
+	strncpy(buf0, jm->name, JM_NAME_LEN);
+	while (i!=0 && buf0[i]==' ') {
+		buf0[i]='\0';
+		--i;
+	}
+	len = strlen(buf0);
 
 	len += sizeof(HANDLER) + 2;
 	if (jm->mode == JM_T_RAID01)


Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- dmraid.spec	5 Feb 2007 20:28:19 -0000	1.81
+++ dmraid.spec	18 Apr 2007 20:46:12 -0000	1.82
@@ -7,7 +7,7 @@
 Summary: Device-mapper RAID tool and library.
 Name: dmraid
 Version: 1.0.0.rc14
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -18,6 +18,7 @@
 Requires(postun): ldconfig
 Requires(post): ldconfig
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
+Patch0: dmraid-1.0.0.rc14-jmicron-name.patch
 
 %description
 DMRAID supports RAID device discovery, RAID set activation and display of
@@ -33,6 +34,7 @@
 
 %prep
 %setup -q -n dmraid/%{version}
+%patch0 -p1 -b .jmicron-name
 
 %build
 %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --enable-static_link
@@ -78,6 +80,9 @@
 %{_libdir}/libdmraid.so
 
 %changelog
+* Wed Apr 18 2007 Peter Jones <pjones at redhat.com> - 1.0.0.rc14-3
+- Fix jmicron name parsing (#219058)
+
 * Mon Feb 05 2007 Alasdair Kergon <agk at redhat.com> - 1.0.0.rc14-2
 - Add build dependency on new device-mapper-devel package.
 - Add dependency on device-mapper.



From fedora-cvs-commits at redhat.com  Wed Apr 18 20:50:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 16:50:09 -0400
Subject: rpms/selinux-policy/devel policy-20070219.patch, 1.51,
	1.52 selinux-policy.spec, 1.436, 1.437
Message-ID: <200704182050.l3IKo99m010770@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20070219.patch selinux-policy.spec 
Log Message:
* Wed Apr 18 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-7
- Fixes for alsactl and pppd_t


policy-20070219.patch:
 Rules.modular                           |   12 +
 policy/flask/access_vectors             |    4 
 policy/global_booleans                  |    2 
 policy/global_tunables                  |    7 
 policy/mls                              |   31 ++-
 policy/modules/admin/acct.te            |    1 
 policy/modules/admin/alsa.fc            |    1 
 policy/modules/admin/amtu.fc            |    3 
 policy/modules/admin/amtu.if            |   53 ++++++
 policy/modules/admin/amtu.te            |   56 ++++++
 policy/modules/admin/bootloader.te      |    3 
 policy/modules/admin/consoletype.te     |   10 -
 policy/modules/admin/dmesg.te           |    1 
 policy/modules/admin/kudzu.te           |    6 
 policy/modules/admin/logwatch.te        |    4 
 policy/modules/admin/netutils.te        |    6 
 policy/modules/admin/rpm.fc             |    3 
 policy/modules/admin/rpm.if             |   85 +++++++---
 policy/modules/admin/rpm.te             |    2 
 policy/modules/admin/su.if              |    4 
 policy/modules/admin/usermanage.if      |    2 
 policy/modules/admin/usermanage.te      |   26 +++
 policy/modules/apps/gnome.if            |   26 ++-
 policy/modules/apps/gpg.fc              |    2 
 policy/modules/apps/loadkeys.if         |   44 +----
 policy/modules/apps/mozilla.if          |    1 
 policy/modules/apps/slocate.te          |    5 
 policy/modules/apps/uml.if              |   27 ---
 policy/modules/kernel/corecommands.fc   |    5 
 policy/modules/kernel/corecommands.if   |   20 ++
 policy/modules/kernel/corenetwork.te.in |   15 +
 policy/modules/kernel/devices.if        |   36 ++++
 policy/modules/kernel/domain.if         |   18 ++
 policy/modules/kernel/domain.te         |   46 +++++
 policy/modules/kernel/files.fc          |    1 
 policy/modules/kernel/files.if          |   83 ++++++++-
 policy/modules/kernel/filesystem.if     |   39 ++++
 policy/modules/kernel/filesystem.te     |   13 +
 policy/modules/kernel/kernel.if         |   42 ++++
 policy/modules/kernel/kernel.te         |    2 
 policy/modules/kernel/mls.if            |   20 ++
 policy/modules/kernel/mls.te            |    3 
 policy/modules/kernel/selinux.if        |   38 ++++
 policy/modules/kernel/storage.if        |    2 
 policy/modules/kernel/terminal.if       |    2 
 policy/modules/kernel/terminal.te       |    1 
 policy/modules/services/amavis.te       |    3 
 policy/modules/services/apache.fc       |   14 -
 policy/modules/services/apache.if       |  171 +++++++++++++++++++-
 policy/modules/services/apache.te       |   72 ++++++++
 policy/modules/services/apcupsd.fc      |    9 +
 policy/modules/services/apcupsd.if      |  108 ++++++++++++
 policy/modules/services/apcupsd.te      |   91 ++++++++++
 policy/modules/services/automount.te    |    2 
 policy/modules/services/avahi.if        |   19 ++
 policy/modules/services/avahi.te        |    4 
 policy/modules/services/bluetooth.te    |    2 
 policy/modules/services/consolekit.te   |   31 ++-
 policy/modules/services/cron.fc         |    1 
 policy/modules/services/cron.if         |   33 +--
 policy/modules/services/cron.te         |   43 ++++-
 policy/modules/services/cups.te         |    6 
 policy/modules/services/cvs.te          |    1 
 policy/modules/services/cyrus.te        |    1 
 policy/modules/services/dbus.if         |   63 +++++++
 policy/modules/services/dhcp.te         |    2 
 policy/modules/services/djbdns.te       |    5 
 policy/modules/services/dovecot.te      |    5 
 policy/modules/services/ftp.te          |    5 
 policy/modules/services/hal.fc          |    8 
 policy/modules/services/hal.if          |   39 ++++
 policy/modules/services/hal.te          |  145 ++++++++++++++++-
 policy/modules/services/inetd.te        |    5 
 policy/modules/services/kerberos.if     |   79 ++-------
 policy/modules/services/kerberos.te     |   36 ++++
 policy/modules/services/mailman.if      |   19 ++
 policy/modules/services/mta.if          |   19 ++
 policy/modules/services/mta.te          |    2 
 policy/modules/services/nis.if          |    4 
 policy/modules/services/nis.te          |    4 
 policy/modules/services/nscd.te         |   10 +
 policy/modules/services/ntp.te          |    4 
 policy/modules/services/pegasus.if      |   18 ++
 policy/modules/services/pegasus.te      |    6 
 policy/modules/services/postfix.if      |    1 
 policy/modules/services/postfix.te      |    8 
 policy/modules/services/ppp.te          |    2 
 policy/modules/services/procmail.te     |    1 
 policy/modules/services/pyzor.te        |    7 
 policy/modules/services/radius.te       |    4 
 policy/modules/services/rpc.if          |    5 
 policy/modules/services/rsync.te        |    1 
 policy/modules/services/rwho.fc         |    3 
 policy/modules/services/rwho.if         |   84 +++++++++
 policy/modules/services/rwho.te         |   65 +++++++
 policy/modules/services/samba.fc        |    3 
 policy/modules/services/samba.if        |   86 ++++++++++
 policy/modules/services/samba.te        |   85 +++++++++-
 policy/modules/services/sendmail.if     |   22 ++
 policy/modules/services/smartmon.te     |    1 
 policy/modules/services/snmp.te         |   15 +
 policy/modules/services/spamassassin.te |    7 
 policy/modules/services/squid.fc        |    2 
 policy/modules/services/squid.if        |   22 ++
 policy/modules/services/squid.te        |   12 +
 policy/modules/services/ssh.if          |   39 ++++
 policy/modules/services/ssh.te          |   10 -
 policy/modules/services/w3c.fc          |    2 
 policy/modules/services/w3c.if          |    1 
 policy/modules/services/w3c.te          |   14 +
 policy/modules/system/application.fc    |    1 
 policy/modules/system/application.if    |  104 ++++++++++++
 policy/modules/system/application.te    |   14 +
 policy/modules/system/authlogin.if      |   83 ++++++++-
 policy/modules/system/authlogin.te      |    3 
 policy/modules/system/fstools.fc        |    1 
 policy/modules/system/fstools.te        |    1 
 policy/modules/system/fusermount.fc     |    6 
 policy/modules/system/fusermount.if     |   41 ++++
 policy/modules/system/fusermount.te     |   45 +++++
 policy/modules/system/getty.te          |    3 
 policy/modules/system/hostname.te       |   14 +
 policy/modules/system/init.if           |   42 ++++
 policy/modules/system/init.te           |   35 +++-
 policy/modules/system/ipsec.if          |   20 ++
 policy/modules/system/ipsec.te          |    3 
 policy/modules/system/iptables.te       |    4 
 policy/modules/system/libraries.fc      |    3 
 policy/modules/system/libraries.te      |    4 
 policy/modules/system/locallogin.te     |    7 
 policy/modules/system/logging.if        |   21 ++
 policy/modules/system/logging.te        |    2 
 policy/modules/system/lvm.te            |    6 
 policy/modules/system/modutils.te       |    7 
 policy/modules/system/mount.fc          |    3 
 policy/modules/system/mount.if          |   37 ++++
 policy/modules/system/mount.te          |   64 +++++++
 policy/modules/system/raid.te           |    1 
 policy/modules/system/selinuxutil.fc    |    1 
 policy/modules/system/selinuxutil.if    |    5 
 policy/modules/system/selinuxutil.te    |   59 +++----
 policy/modules/system/setrans.if        |    1 
 policy/modules/system/sysnetwork.te     |    3 
 policy/modules/system/udev.te           |   12 +
 policy/modules/system/unconfined.fc     |    1 
 policy/modules/system/unconfined.if     |   10 -
 policy/modules/system/unconfined.te     |   24 ++
 policy/modules/system/userdomain.if     |  269 +++++++++++++++++++-------------
 policy/modules/system/userdomain.te     |   46 ++++-
 policy/modules/system/xen.te            |   35 ++++
 policy/support/obj_perm_sets.spt        |   12 +
 151 files changed, 3017 insertions(+), 440 deletions(-)

Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- policy-20070219.patch	18 Apr 2007 20:45:20 -0000	1.51
+++ policy-20070219.patch	18 Apr 2007 20:50:02 -0000	1.52
@@ -144,6 +144,15 @@
  
  type acct_data_t;
  logging_log_file(acct_data_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.fc serefpolicy-2.5.12/policy/modules/admin/alsa.fc
+--- nsaserefpolicy/policy/modules/admin/alsa.fc	2006-11-16 17:15:26.000000000 -0500
++++ serefpolicy-2.5.12/policy/modules/admin/alsa.fc	2007-04-18 16:47:23.000000000 -0400
+@@ -1,4 +1,5 @@
+ 
+ /etc/alsa/pcm(/.*)?		gen_context(system_u:object_r:alsa_etc_rw_t,s0)
++/etc/asound(/.*)?		gen_context(system_u:object_r:alsa_etc_rw_t,s0)
+ 
+ /usr/bin/ainit 		--	gen_context(system_u:object_r:alsa_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.fc serefpolicy-2.5.12/policy/modules/admin/amtu.fc
 --- nsaserefpolicy/policy/modules/admin/amtu.fc	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.5.12/policy/modules/admin/amtu.fc	2007-04-11 17:07:34.000000000 -0400
@@ -2858,7 +2867,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.5.12/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2007-03-20 23:38:00.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/hal.te	2007-04-13 11:13:52.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/hal.te	2007-04-18 16:48:38.000000000 -0400
 @@ -16,9 +16,33 @@
  type hald_var_run_t;
  files_pid_file(hald_var_run_t)
@@ -2902,7 +2911,16 @@
  allow hald_t self:process signal_perms;
  allow hald_t self:fifo_file rw_fifo_file_perms;
  allow hald_t self:unix_stream_socket { create_stream_socket_perms connectto };
-@@ -48,14 +72,20 @@
+@@ -39,6 +63,8 @@
+ 
+ send_audit_msgs_pattern(hald_t)
+ 
++alsa_read_rw_config(hald_t)
++
+ manage_dirs_pattern(hald_t,hald_tmp_t,hald_tmp_t)
+ manage_files_pattern(hald_t,hald_tmp_t,hald_tmp_t)
+ files_tmp_filetrans(hald_t, hald_tmp_t, { file dir })
+@@ -48,14 +74,20 @@
  manage_files_pattern(hald_t,hald_var_lib_t,hald_var_lib_t)
  manage_sock_files_pattern(hald_t,hald_var_lib_t,hald_var_lib_t)
  
@@ -2925,7 +2943,7 @@
  kernel_rw_vm_sysctls(hald_t)
  kernel_write_proc_files(hald_t)
  
-@@ -85,9 +115,13 @@
+@@ -85,9 +117,13 @@
  dev_rw_power_management(hald_t)
  # hal is now execing pm-suspend
  dev_rw_sysfs(hald_t)
@@ -2939,7 +2957,7 @@
  
  files_exec_etc_files(hald_t)
  files_read_etc_files(hald_t)
-@@ -101,9 +135,11 @@
+@@ -101,9 +137,11 @@
  files_create_boot_flag(hald_t)
  files_getattr_all_dirs(hald_t)
  files_read_kernel_img(hald_t)
@@ -2951,7 +2969,7 @@
  fs_list_auto_mountpoints(hald_t)
  files_getattr_all_mountpoints(hald_t)
  
-@@ -128,10 +164,10 @@
+@@ -128,10 +166,10 @@
  auth_use_nsswitch(hald_t)
  
  init_domtrans_script(hald_t)
@@ -2963,7 +2981,7 @@
  
  libs_use_ld_so(hald_t)
  libs_use_shared_libs(hald_t)
-@@ -245,3 +281,102 @@
+@@ -245,3 +283,102 @@
  optional_policy(`
  	vbetool_domtrans(hald_t)
  ')
@@ -3534,6 +3552,18 @@
  	postgrey_stream_connect(postfix_smtpd_t)
  ')
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-2.5.12/policy/modules/services/ppp.te
+--- nsaserefpolicy/policy/modules/services/ppp.te	2007-03-26 16:24:12.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/ppp.te	2007-04-18 16:35:40.000000000 -0400
+@@ -155,7 +155,7 @@
+ 
+ files_exec_etc_files(pppd_t)
+ files_manage_etc_runtime_files(pppd_t)
+-files_etc_filetrans_etc_runtime(pppd_t, { dir file })
++sysnet_etc_filetrans_config(pppd_t)
+ files_dontaudit_write_etc_files(pppd_t)
+ 
+ # for scripts
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.5.12/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2007-03-26 10:39:05.000000000 -0400
 +++ serefpolicy-2.5.12/policy/modules/services/procmail.te	2007-04-11 17:07:34.000000000 -0400
@@ -5637,7 +5667,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.5.12/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/sysnetwork.te	2007-04-16 12:03:06.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/sysnetwork.te	2007-04-18 16:40:12.000000000 -0400
 @@ -164,6 +164,8 @@
  	dbus_connect_system_bus(dhcpc_t)
  	dbus_send_system_bus(dhcpc_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -r1.436 -r1.437
--- selinux-policy.spec	18 Apr 2007 20:45:20 -0000	1.436
+++ selinux-policy.spec	18 Apr 2007 20:50:02 -0000	1.437
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.5.12
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -358,6 +358,9 @@
 %endif
 
 %changelog
+* Wed Apr 18 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-7
+- Fixes for alsactl and pppd_t
+
 * Wed Apr 18 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-6
 - Fixes for consolekit
 



From fedora-cvs-commits at redhat.com  Wed Apr 18 21:00:59 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 17:00:59 -0400
Subject: rpms/selinux-policy/devel policy-20070219.patch, 1.52,
	1.53 selinux-policy.spec, 1.437, 1.438
Message-ID: <200704182100.l3IL0xcZ018596@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20070219.patch selinux-policy.spec 
Log Message:
* Wed Apr 18 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-8
- Fix path of /etc/lvm/cache directory
- Fixes for alsactl and pppd_t
- Fixes for consolekit


policy-20070219.patch:
 Rules.modular                           |   12 +
 policy/flask/access_vectors             |    4 
 policy/global_booleans                  |    2 
 policy/global_tunables                  |    7 
 policy/mls                              |   31 ++-
 policy/modules/admin/acct.te            |    1 
 policy/modules/admin/alsa.fc            |    1 
 policy/modules/admin/amtu.fc            |    3 
 policy/modules/admin/amtu.if            |   53 ++++++
 policy/modules/admin/amtu.te            |   56 ++++++
 policy/modules/admin/bootloader.te      |    3 
 policy/modules/admin/consoletype.te     |   10 -
 policy/modules/admin/dmesg.te           |    1 
 policy/modules/admin/kudzu.te           |    6 
 policy/modules/admin/logwatch.te        |    4 
 policy/modules/admin/netutils.te        |    6 
 policy/modules/admin/rpm.fc             |    3 
 policy/modules/admin/rpm.if             |   85 +++++++---
 policy/modules/admin/rpm.te             |    2 
 policy/modules/admin/su.if              |    4 
 policy/modules/admin/usermanage.if      |    2 
 policy/modules/admin/usermanage.te      |   26 +++
 policy/modules/apps/gnome.if            |   26 ++-
 policy/modules/apps/gpg.fc              |    2 
 policy/modules/apps/loadkeys.if         |   44 +----
 policy/modules/apps/mozilla.if          |    1 
 policy/modules/apps/slocate.te          |    5 
 policy/modules/apps/uml.if              |   27 ---
 policy/modules/kernel/corecommands.fc   |    5 
 policy/modules/kernel/corecommands.if   |   20 ++
 policy/modules/kernel/corenetwork.te.in |   15 +
 policy/modules/kernel/devices.if        |   36 ++++
 policy/modules/kernel/domain.if         |   18 ++
 policy/modules/kernel/domain.te         |   46 +++++
 policy/modules/kernel/files.fc          |    1 
 policy/modules/kernel/files.if          |   83 ++++++++-
 policy/modules/kernel/filesystem.if     |   39 ++++
 policy/modules/kernel/filesystem.te     |   13 +
 policy/modules/kernel/kernel.if         |   42 ++++
 policy/modules/kernel/kernel.te         |    2 
 policy/modules/kernel/mls.if            |   20 ++
 policy/modules/kernel/mls.te            |    3 
 policy/modules/kernel/selinux.if        |   38 ++++
 policy/modules/kernel/storage.if        |    2 
 policy/modules/kernel/terminal.if       |    2 
 policy/modules/kernel/terminal.te       |    1 
 policy/modules/services/amavis.te       |    3 
 policy/modules/services/apache.fc       |   14 -
 policy/modules/services/apache.if       |  171 +++++++++++++++++++-
 policy/modules/services/apache.te       |   72 ++++++++
 policy/modules/services/apcupsd.fc      |    9 +
 policy/modules/services/apcupsd.if      |  108 ++++++++++++
 policy/modules/services/apcupsd.te      |   91 ++++++++++
 policy/modules/services/automount.te    |    2 
 policy/modules/services/avahi.if        |   19 ++
 policy/modules/services/avahi.te        |    4 
 policy/modules/services/bluetooth.te    |    2 
 policy/modules/services/consolekit.te   |   31 ++-
 policy/modules/services/cron.fc         |    1 
 policy/modules/services/cron.if         |   33 +--
 policy/modules/services/cron.te         |   43 ++++-
 policy/modules/services/cups.te         |    6 
 policy/modules/services/cvs.te          |    1 
 policy/modules/services/cyrus.te        |    1 
 policy/modules/services/dbus.if         |   63 +++++++
 policy/modules/services/dhcp.te         |    2 
 policy/modules/services/djbdns.te       |    5 
 policy/modules/services/dovecot.te      |    5 
 policy/modules/services/ftp.te          |    5 
 policy/modules/services/hal.fc          |    8 
 policy/modules/services/hal.if          |   39 ++++
 policy/modules/services/hal.te          |  145 ++++++++++++++++-
 policy/modules/services/inetd.te        |    5 
 policy/modules/services/kerberos.if     |   79 ++-------
 policy/modules/services/kerberos.te     |   36 ++++
 policy/modules/services/mailman.if      |   19 ++
 policy/modules/services/mta.if          |   19 ++
 policy/modules/services/mta.te          |    2 
 policy/modules/services/nis.if          |    4 
 policy/modules/services/nis.te          |    4 
 policy/modules/services/nscd.te         |   10 +
 policy/modules/services/ntp.te          |    4 
 policy/modules/services/pegasus.if      |   18 ++
 policy/modules/services/pegasus.te      |    6 
 policy/modules/services/postfix.if      |    1 
 policy/modules/services/postfix.te      |    8 
 policy/modules/services/ppp.te          |    2 
 policy/modules/services/procmail.te     |    1 
 policy/modules/services/pyzor.te        |    7 
 policy/modules/services/radius.te       |    4 
 policy/modules/services/rpc.if          |    5 
 policy/modules/services/rsync.te        |    1 
 policy/modules/services/rwho.fc         |    3 
 policy/modules/services/rwho.if         |   84 +++++++++
 policy/modules/services/rwho.te         |   65 +++++++
 policy/modules/services/samba.fc        |    3 
 policy/modules/services/samba.if        |   86 ++++++++++
 policy/modules/services/samba.te        |   85 +++++++++-
 policy/modules/services/sendmail.if     |   22 ++
 policy/modules/services/smartmon.te     |    1 
 policy/modules/services/snmp.te         |   15 +
 policy/modules/services/spamassassin.te |    7 
 policy/modules/services/squid.fc        |    2 
 policy/modules/services/squid.if        |   22 ++
 policy/modules/services/squid.te        |   12 +
 policy/modules/services/ssh.if          |   39 ++++
 policy/modules/services/ssh.te          |   10 -
 policy/modules/services/w3c.fc          |    2 
 policy/modules/services/w3c.if          |    1 
 policy/modules/services/w3c.te          |   14 +
 policy/modules/system/application.fc    |    1 
 policy/modules/system/application.if    |  104 ++++++++++++
 policy/modules/system/application.te    |   14 +
 policy/modules/system/authlogin.if      |   83 ++++++++-
 policy/modules/system/authlogin.te      |    3 
 policy/modules/system/fstools.fc        |    1 
 policy/modules/system/fstools.te        |    1 
 policy/modules/system/fusermount.fc     |    6 
 policy/modules/system/fusermount.if     |   41 ++++
 policy/modules/system/fusermount.te     |   45 +++++
 policy/modules/system/getty.te          |    3 
 policy/modules/system/hostname.te       |   14 +
 policy/modules/system/init.if           |   42 ++++
 policy/modules/system/init.te           |   35 +++-
 policy/modules/system/ipsec.if          |   20 ++
 policy/modules/system/ipsec.te          |    3 
 policy/modules/system/iptables.te       |    4 
 policy/modules/system/libraries.fc      |    3 
 policy/modules/system/libraries.te      |    4 
 policy/modules/system/locallogin.te     |    7 
 policy/modules/system/logging.if        |   21 ++
 policy/modules/system/logging.te        |    2 
 policy/modules/system/lvm.fc            |    1 
 policy/modules/system/lvm.te            |    6 
 policy/modules/system/modutils.te       |    7 
 policy/modules/system/mount.fc          |    3 
 policy/modules/system/mount.if          |   37 ++++
 policy/modules/system/mount.te          |   64 +++++++
 policy/modules/system/raid.te           |    1 
 policy/modules/system/selinuxutil.fc    |    1 
 policy/modules/system/selinuxutil.if    |    5 
 policy/modules/system/selinuxutil.te    |   59 +++----
 policy/modules/system/setrans.if        |    1 
 policy/modules/system/sysnetwork.te     |    3 
 policy/modules/system/udev.te           |   12 +
 policy/modules/system/unconfined.fc     |    1 
 policy/modules/system/unconfined.if     |   10 -
 policy/modules/system/unconfined.te     |   24 ++
 policy/modules/system/userdomain.if     |  269 +++++++++++++++++++-------------
 policy/modules/system/userdomain.te     |   46 ++++-
 policy/modules/system/xen.te            |   35 ++++
 policy/support/obj_perm_sets.spt        |   12 +
 152 files changed, 3018 insertions(+), 440 deletions(-)

Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- policy-20070219.patch	18 Apr 2007 20:50:02 -0000	1.52
+++ policy-20070219.patch	18 Apr 2007 21:00:52 -0000	1.53
@@ -5237,6 +5237,17 @@
  files_read_etc_runtime_files(syslogd_t)
  # /initrd is not umounted before minilog starts
  files_dontaudit_search_isid_type_dirs(syslogd_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-2.5.12/policy/modules/system/lvm.fc
+--- nsaserefpolicy/policy/modules/system/lvm.fc	2007-01-02 12:57:49.000000000 -0500
++++ serefpolicy-2.5.12/policy/modules/system/lvm.fc	2007-04-18 16:56:58.000000000 -0400
+@@ -15,6 +15,7 @@
+ #
+ /etc/lvm(/.*)?			gen_context(system_u:object_r:lvm_etc_t,s0)
+ /etc/lvm/\.cache	--	gen_context(system_u:object_r:lvm_metadata_t,s0)
++/etc/lvm/cache(./*)?		gen_context(system_u:object_r:lvm_metadata_t,s0)
+ /etc/lvm/archive(/.*)?		gen_context(system_u:object_r:lvm_metadata_t,s0)
+ /etc/lvm/backup(/.*)?		gen_context(system_u:object_r:lvm_metadata_t,s0)
+ /etc/lvm/lock(/.*)?		gen_context(system_u:object_r:lvm_lock_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.5.12/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2007-03-26 10:39:07.000000000 -0400
 +++ serefpolicy-2.5.12/policy/modules/system/lvm.te	2007-04-11 17:07:34.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -r1.437 -r1.438
--- selinux-policy.spec	18 Apr 2007 20:50:02 -0000	1.437
+++ selinux-policy.spec	18 Apr 2007 21:00:52 -0000	1.438
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.5.12
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -358,10 +358,9 @@
 %endif
 
 %changelog
-* Wed Apr 18 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-7
+* Wed Apr 18 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-8
+- Fix path of /etc/lvm/cache directory
 - Fixes for alsactl and pppd_t
-
-* Wed Apr 18 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-6
 - Fixes for consolekit
 
 * Tue Apr 17 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-5



From fedora-cvs-commits at redhat.com  Wed Apr 18 21:05:28 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 17:05:28 -0400
Subject: rpms/dmraid/FC-6 dmraid-1.0.0.rc14-jmicron-name.patch, NONE,
	1.1 dmraid.spec, 1.71, 1.72
Message-ID: <200704182105.l3IL5S65021909@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/dmraid/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv21816

Modified Files:
	dmraid.spec 
Added Files:
	dmraid-1.0.0.rc14-jmicron-name.patch 
Log Message:
- Fix jmicron name parsing (#219058)


dmraid-1.0.0.rc14-jmicron-name.patch:
 jm.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE dmraid-1.0.0.rc14-jmicron-name.patch ---
--- 1.0.0.rc13.orig/lib/format/ataraid/jm.c
+++ 1.0.0.rc13/lib/format/ataraid/jm.c
@@ -28,10 +28,15 @@ static char *name(struct lib_context *lc
 	size_t len;
 	struct jm *jm = META(rd, jm);
 	char buf[2], *ret, *name = (char *) jm->name;
+	char buf0[JM_NAME_LEN+1] = { '\0' };
+	size_t i = JM_NAME_LEN-1;
 
-	/* Name always 0 terminated ? */
-	if ((len = strlen(name)) > JM_NAME_LEN)
-		len = JM_NAME_LEN;
+	strncpy(buf0, jm->name, JM_NAME_LEN);
+	while (i!=0 && buf0[i]==' ') {
+		buf0[i]='\0';
+		--i;
+	}
+	len = strlen(buf0);
 
 	len += sizeof(HANDLER) + 2;
 	if (jm->mode == JM_T_RAID01)


Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/FC-6/dmraid.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- dmraid.spec	8 Nov 2006 18:02:33 -0000	1.71
+++ dmraid.spec	18 Apr 2007 21:05:26 -0000	1.72
@@ -7,7 +7,7 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc14
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -15,6 +15,7 @@
 BuildRequires: device-mapper >= 1.02.02-2, libselinux-devel, libsepol-devel
 Requires: kpartx
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
+Patch0: dmraid-1.0.0.rc14-jmicron-name.patch
 
 %description
 DMRAID supports RAID device discovery, RAID set activation and display of
@@ -30,6 +31,7 @@
 
 %prep
 %setup -q -n dmraid/%{version}
+%patch0 -p1 -b .jmicron-name
 
 %build
 %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --enable-static_link
@@ -71,6 +73,9 @@
 %{_libdir}/libdmraid.so
 
 %changelog
+* Wed Apr 18 2007 Peter Jones <pjones at redhat.com> - 1.0.0.rc14-2
+- Fix jmicron name parsing (#219058)
+
 * Wed Nov 08 2006 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc14-1
 - asr.c: fixed Adaptec HostRAID DDF1 metadata discovery (bz#211016)
 - ddf1_crc.c: added crc() routine to avoid linking to zlib alltogether,



From fedora-cvs-commits at redhat.com  Wed Apr 18 21:17:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 17:17:36 -0400
Subject: rpms/gnome-pilot/devel gnome-pilot-2.0.15-unresolved-symbols.patch,
	NONE, 1.1 gnome-pilot.spec, 1.55, 1.56
Message-ID: <200704182117.l3ILHaeP031009@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	gnome-pilot.spec 
Added Files:
	gnome-pilot-2.0.15-unresolved-symbols.patch 
Log Message:

* Wed Apr 18 2007 Matthew Barnes <mbarnes at redhat.com> - 2.0.15-5.fc7
- Add patch for RH bug #198211 (unresolved symbols in libraries).
- Add autoconf and automake as build requirements, since we now have to
  run autoreconf before configure.


gnome-pilot-2.0.15-unresolved-symbols.patch:
 gpilotd/Makefile.am      |    8 ++++++++
 libgpilotdCM/Makefile.am |    4 ++++
 2 files changed, 12 insertions(+)

--- NEW FILE gnome-pilot-2.0.15-unresolved-symbols.patch ---
--- gnome-pilot-2.0.15/libgpilotdCM/Makefile.am.unresolved-symbols	2007-04-18 17:08:43.000000000 -0400
+++ gnome-pilot-2.0.15/libgpilotdCM/Makefile.am	2007-04-18 17:12:57.000000000 -0400
@@ -40,6 +40,10 @@
 	gnome-pilot-conduit-management.h 	\
 	gnome-pilot-conduit-config.h
 
+libgpilotdcm_la_LIBADD =		\
+	$(GNOME_PILOT_LIBS)		\
+	$(NULL)
+
 libgpilotdcm_la_LDFLAGS = \
 	-version-info $(GPILOTD_CM_CURRENT):$(GPILOTD_CM_REVISION):$(GPILOTD_CM_AGE)
 
--- gnome-pilot-2.0.15/gpilotd/Makefile.am.unresolved-symbols	2006-10-14 14:17:35.000000000 -0400
+++ gnome-pilot-2.0.15/gpilotd/Makefile.am	2007-04-18 17:08:43.000000000 -0400
@@ -110,6 +110,10 @@
 
 libgpilotdinclude_HEADERS = gnome-pilot-client.h
 
+libgpilotd_la_LIBADD = \
+	$(GNOME_PILOT_LIBS)	\
+	$(NONE)
+
 libgpilotd_la_LDFLAGS = \
 	-version-info $(GPILOTD_CURRENT):$(GPILOTD_REVISION):$(GPILOTD_AGE)
 
@@ -139,6 +143,10 @@
 
 libgpilotdconduitincludedir = $(includedir)/gpilotd
 
+libgpilotdconduit_la_LIBADD =	\
+	$(GNOME_PILOT_LIBS)	\
+	$(NULL)
+
 libgpilotdconduit_la_LDFLAGS = \
 	-version-info $(GPILOTD_CONDUIT_CURRENT):$(GPILOTD_CONDUIT_REVISION):$(GPILOTD_CONDUIT_AGE)
 


Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/devel/gnome-pilot.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gnome-pilot.spec	7 Feb 2007 15:56:55 -0000	1.55
+++ gnome-pilot.spec	18 Apr 2007 21:17:34 -0000	1.56
@@ -4,7 +4,7 @@
 
 Name: gnome-pilot
 Version: 2.0.15
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPL
 Group: Applications/Communications
 Summary: GNOME pilot programs
@@ -17,6 +17,9 @@
 # RH bug #135304 (sort of)
 Patch1: gnome-pilot-2.0.14-fix-conduit-dir.patch
 
+# RH bug #198211
+Patch2: gnome-pilot-2.0.15-unresolved-symbols.patch
+
 ### Dependencies ###
 
 Requires(post): scrollkeeper
@@ -32,7 +35,10 @@
 
 BuildRequires: GConf2-devel >= 2.0
 BuildRequires: ORBit2-devel >= 2.0.0
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: bonobo-activation-devel >= 1.0.3
+BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: gnome-panel-devel >= 2.0.6
 BuildRequires: gob2 >= 2.0.3
@@ -43,7 +49,6 @@
 BuildRequires: libgnomeui-devel >= 2.0.0
 BuildRequires: libtool
 BuildRequires: pilot-link-devel >= %{pilot_link_version}
-BuildRequires: desktop-file-utils
 
 %description
 gnome-pilot is a collection of programs and daemon for integrating
@@ -64,8 +69,10 @@
 %prep
 %setup -q
 %patch1 -p1 -b .fix-conduit-dir
+%patch2 -p1 -b .unresolved-symbols
 
 %build
+autoreconf --force
 %configure --disable-static
 cp %{_bindir}/libtool .
 perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool
@@ -88,6 +95,7 @@
 mv $RPM_BUILD_ROOT/%{_datadir}/gnome-pilot/conduits/*.conduit \
    $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/
 
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
@@ -147,6 +155,11 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Apr 18 2007 Matthew Barnes <mbarnes at redhat.com> - 2.0.15-5.fc7
+- Add patch for RH bug #198211 (unresolved symbols in libraries).
+- Add autoconf and automake as build requirements, since we now have to
+  run autoreconf before configure.
+
 * Wed Feb  7 2007 Matthias Clasen <mclasen at redhat.com> - 2.0.15-4
 - Use desktop-file-install
 - Remove invalid category Application, add HardwareSettings



From fedora-cvs-commits at redhat.com  Wed Apr 18 21:49:41 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 17:49:41 -0400
Subject: rpms/kernel/devel patch-2.6.21-rc7-git2.bz2.sign, NONE,
	1.1 .cvsignore, 1.607, 1.608 kernel-2.6.spec, 1.3088,
	1.3089 sources, 1.570, 1.571 upstream, 1.498, 1.499
Message-ID: <200704182149.l3ILnflV008118@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.21-rc7-git2.bz2.sign 
Log Message:
* Wed Apr 18 2007 Dave Jones <davej at redhat.com>
- 2.6.21-rc7-git2



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

iD8DBQBGJdAbyGugalF9Dw4RAjxfAJ4427aH+HkYCIB9RiuhxSLu9TAqhgCfbwnP
t9FqrdUu5mv4EBwFLmrlhUQ=
=P2ls
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.607
retrieving revision 1.608
diff -u -r1.607 -r1.608
--- .cvsignore	16 Apr 2007 02:44:55 -0000	1.607
+++ .cvsignore	18 Apr 2007 21:49:38 -0000	1.608
@@ -5,3 +5,4 @@
 kernel-2.6.20
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc7.bz2
+patch-2.6.21-rc7-git2.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3088
retrieving revision 1.3089
diff -u -r1.3088 -r1.3089
--- kernel-2.6.spec	18 Apr 2007 18:43:49 -0000	1.3088
+++ kernel-2.6.spec	18 Apr 2007 21:49:38 -0000	1.3089
@@ -371,6 +371,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.21-rc7.bz2
+Patch2: patch-2.6.21-rc7-git2.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -993,6 +994,7 @@
 
 # Update to latest upstream.
 %patch1 -p1
+%patch2 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
@@ -2311,10 +2313,13 @@
 #  - tux.
 
 %changelog
-* Wed Apr 18 2007 John W. Linville <linville at redhat.com> 
+* Wed Apr 18 2007 Dave Jones <davej at redhat.com>
+- 2.6.21-rc7-git2
+
+* Wed Apr 18 2007 John W. Linville <linville at redhat.com>
 - Update fix for bcm43xx-mac80211 oops on ppc w/ phy rev 1
 
-* Wed Apr 18 2007 Kristian H??gsberg <krh at redhat.com> 
+* Wed Apr 18 2007 Kristian H??gsberg <krh at redhat.com>
 - Add missing _IOC_WRITE for create iso context ioctl code.
 
 * Wed Apr 18 2007 Jeremy Katz <katzj at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.570
retrieving revision 1.571
diff -u -r1.570 -r1.571
--- sources	16 Apr 2007 02:44:55 -0000	1.570
+++ sources	18 Apr 2007 21:49:38 -0000	1.571
@@ -1,3 +1,4 @@
 2618cbcc9c9ac1c3c04be903fe3338a7  sparse-0.2.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 3a54bf5a7cf6b124e680e1d08fe1b20b  patch-2.6.21-rc7.bz2
+425d9f01aca38bc9acd04d025529bfc2  patch-2.6.21-rc7-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.498
retrieving revision 1.499
diff -u -r1.498 -r1.499
--- upstream	16 Apr 2007 02:44:55 -0000	1.498
+++ upstream	18 Apr 2007 21:49:38 -0000	1.499
@@ -1,2 +1,3 @@
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc7.bz2
+patch-2.6.21-rc7-git2.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 18 21:56:35 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 17:56:35 -0400
Subject: rpms/kernel/devel linux-2.6-module-override-modparam-cmdline.patch,
	NONE, 1.1 kernel-2.6.spec, 1.3089, 1.3090
Message-ID: <200704182156.l3ILuZIG008428@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-module-override-modparam-cmdline.patch 
Log Message:
* Wed Apr 18 2007 Dave Jones <davej at redhat.com>
- Allow overriding module parameters from kernel command_line


linux-2.6-module-override-modparam-cmdline.patch:
 include/linux/moduleparam.h |    2 +-
 init/main.c                 |    4 ++--
 kernel/module.c             |   13 ++++++++++++-
 kernel/params.c             |   14 ++++++++++----
 4 files changed, 25 insertions(+), 8 deletions(-)

--- NEW FILE linux-2.6-module-override-modparam-cmdline.patch ---
With the move to initramfs and heavily modular configs, which include
loading storage drivers from early userspace, it's becoming harder
to provide users with a way of overriding module parameters at boot.

Currently, users would have to break into the initramfs, edit the
modprobe options, and then let boot continue. They have a much easier time
dealing with adding options on the command line from Grub or what have you.

I hacked out this patch quickly to re-parse saved_command_line[] when we
load a module in an attempt to rectify this.

(The specific use-case I was looking at here was HPA commands failing on
 sata_nv controllers, and needing to pass the adma=0 option to the module...
 Users had a hard time testing without an easy way of overriding the module.)

Clearly this is not entirely optimal, because we're parsing command_line
after the module params are parsed. This ends of being a policy decision,
whether the /sbin/modprobe commandline should override the kernel
command_line, or vice versa.

Anyway, please comment...

Cheers,
	Kyle

diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
index c83588c..e8465db 100644
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@ -98,7 +98,7 @@ struct kparam_array
 extern int parse_args(const char *name,
 		      char *args,
 		      struct kernel_param *params,
-		      unsigned num,
+		      unsigned num, unsigned strip_module,
 		      int (*unknown)(char *param, char *val));
 
 /* All the helper functions */
diff --git a/init/main.c b/init/main.c
index a92989e..a3d647f 100644
--- a/init/main.c
+++ b/init/main.c
@@ -478,7 +478,7 @@ void __init parse_early_param(void)
 
 	/* All fall through to do_early_param. */
 	strlcpy(tmp_cmdline, boot_command_line, COMMAND_LINE_SIZE);
-	parse_args("early options", tmp_cmdline, NULL, 0, do_early_param);
+	parse_args("early options", tmp_cmdline, NULL, 0, 0, do_early_param);
 	done = 1;
 }
 
@@ -549,7 +549,7 @@ asmlinkage void __init start_kernel(void)
 	printk(KERN_NOTICE "Kernel command line: %s\n", boot_command_line);
 	parse_early_param();
 	parse_args("Booting kernel", static_command_line, __start___param,
-		   __stop___param - __start___param,
+		   __stop___param - __start___param, 0,
 		   &unknown_bootoption);
 	if (!irqs_disabled()) {
 		printk(KERN_WARNING "start_kernel(): bug: interrupts were "
diff --git a/kernel/module.c b/kernel/module.c
index dcdb32b..e576242 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1914,10 +1914,21 @@ static struct module *load_module(void __user *umod,
 			 sechdrs[setupindex].sh_addr,
 			 sechdrs[setupindex].sh_size
 			 / sizeof(struct kernel_param),
-			 NULL);
+			 0, NULL);
 	if (err < 0)
 		goto arch_cleanup;
 
+	/* Allow user to override module params from the command line. */
+	err = parse_args(mod->name, saved_command_line,
+			 (struct kernel_param *)
+			 sechdrs[setupindex].sh_addr,
+			 sechdrs[setupindex].sh_size
+			 / sizeof(struct kernel_param),
+			 1, NULL);
+	if (err < 0)
+		printk(KERN_WARNING "%s: Ignoring bad module parameters passed on "
+		       "kernel command line\n", mod->name);
+
 	err = mod_sysfs_setup(mod, 
 			      (struct kernel_param *)
 			      sechdrs[setupindex].sh_addr,
diff --git a/kernel/params.c b/kernel/params.c
index 1fc4ac7..7c9d3a0 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -50,10 +50,17 @@ static int parse_one(char *param,
 		     char *val,
 		     struct kernel_param *params, 
 		     unsigned num_params,
-		     int (*handle_unknown)(char *param, char *val))
+		     int (*handle_unknown)(char *param, char *val),
+		     unsigned strip_module)
 {
 	unsigned int i;
 
+	/* If we're parsing command_line[] for the module,
+	 * strip off the module name before looking the param up.
+	 */
+	if (strip_module)
+		strsep(&param, ".");
+
 	/* Find parameter */
 	for (i = 0; i < num_params; i++) {
 		if (parameq(param, params[i].name)) {
@@ -130,7 +137,7 @@ static char *next_arg(char *args, char **param, char **val)
 int parse_args(const char *name,
 	       char *args,
 	       struct kernel_param *params,
-	       unsigned num,
+	       unsigned num, unsigned strip_module,
 	       int (*unknown)(char *param, char *val))
 {
 	char *param, *val;
@@ -147,7 +154,7 @@ int parse_args(const char *name,
 
 		args = next_arg(args, &param, &val);
 		irq_was_disabled = irqs_disabled();
-		ret = parse_one(param, val, params, num, unknown);
+		ret = parse_one(param, val, params, num, unknown, strip_module);
 		if (irq_was_disabled && !irqs_disabled()) {
 			printk(KERN_WARNING "parse_args(): option '%s' enabled "
 					"irq's!\n", param);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3089
retrieving revision 1.3090
diff -u -r1.3089 -r1.3090
--- kernel-2.6.spec	18 Apr 2007 21:49:38 -0000	1.3089
+++ kernel-2.6.spec	18 Apr 2007 21:56:32 -0000	1.3090
@@ -554,6 +554,7 @@
 Patch1620: linux-2.6-ondemand-timer.patch
 Patch1630: linux-2.6-kvm-19.patch
 Patch1631: linux-2.6-kvm-misc-fixes.patch
+Patch1640: linux-2.6-module-override-modparam-cmdline.patch
 Patch1650: linux-2.6-serial-460800.patch
 Patch1681: linux-2.6-xfs-umount-fix.patch
 Patch1690: linux-2.6-PT_LOAD-align.patch
@@ -1258,6 +1259,8 @@
 # Update KVM.
 %patch1630 -p1
 %patch1631 -p1
+# Allow overriding module parameters from kernel command_line
+%patch1640 -p1
 # Allow to use 480600 baud on 16C950 UARTs
 %patch1650 -p1
 # Fix XFS umount bug.
@@ -2314,6 +2317,9 @@
 
 %changelog
 * Wed Apr 18 2007 Dave Jones <davej at redhat.com>
+- Allow overriding module parameters from kernel command_line
+
+* Wed Apr 18 2007 Dave Jones <davej at redhat.com>
 - 2.6.21-rc7-git2
 
 * Wed Apr 18 2007 John W. Linville <linville at redhat.com>



From fedora-cvs-commits at redhat.com  Wed Apr 18 22:12:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 18:12:47 -0400
Subject: rpms/linuxwacom/devel 60-wacom.rules, 1.2, 1.3 linuxwacom.spec, 1.38,
	1.39 sources, 1.7, 1.8
Message-ID: <200704182212.l3IMCluT009049@cvs.devel.redhat.com>

Author: arozansk

Update of /cvs/dist/rpms/linuxwacom/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8942

Modified Files:
	60-wacom.rules linuxwacom.spec sources 
Log Message:
- updated to 0.7.6-4
- updated udev rules to generated symlinks based on model and usb port
- fixed /dev/input/wacom symlink rule
- missing directory added as owned by this package




Index: 60-wacom.rules
===================================================================
RCS file: /cvs/dist/rpms/linuxwacom/devel/60-wacom.rules,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 60-wacom.rules	21 May 2006 20:58:37 -0000	1.2
+++ 60-wacom.rules	18 Apr 2007 22:12:45 -0000	1.3
@@ -1,3 +1,54 @@
-# udev rule to create /dev/input/wacomN for wacom tablets
+# udev rules for wacom devices
+# will create:
+#	/dev/input/wacom
+#	/dev/input/wacom-tablets/<model>
+#	/dev/input/wacom-tablets/<model>-<device id>
+#
+# The last rule is intended for cases when you have more than one tablet
+# of the same model. The id is usb port dependent.
+#
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYMLINK+="input/wacom"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0000", SYMLINK+="input/wacom-tablets/penpartner input/wacom-tablets/penpartner-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0010", SYMLINK+="input/wacom-tablets/graphire input/wacom-tablets/graphire-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0011", SYMLINK+="input/wacom-tablets/graphire2-4x5 input/wacom-tablets/graphire2-4x5-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0012", SYMLINK+="input/wacom-tablets/graphire2-5x7 input/wacom-tablets/graphire2-5x7-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0013", SYMLINK+="input/wacom-tablets/graphire3 input/wacom-tablets/graphire3-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0014", SYMLINK+="input/wacom-tablets/graphire3-6x8 input/wacom-tablets/graphire3-6x8-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0015", SYMLINK+="input/wacom-tablets/graphire4-4x5 input/wacom-tablets/graphire4-4x5-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0016", SYMLINK+="input/wacom-tablets/graphire4-6x8 input/wacom-tablets/graphire4-6x8-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0060", SYMLINK+="input/wacom-tablets/volito input/wacom-tablets/volito-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0061", SYMLINK+="input/wacom-tablets/penstation2 input/wacom-tablets/penstation2-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0062", SYMLINK+="input/wacom-tablets/volito2-4x5 input/wacom-tablets/volito2-4x5-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0063", SYMLINK+="input/wacom-tablets/volito2-2x3 input/wacom-tablets/volito2-2x3-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0064", SYMLINK+="input/wacom-tablets/penpartner2 input/wacom-tablets/penpartner2-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0020", SYMLINK+="input/wacom-tablets/intuos-4x5 input/wacom-tablets/intuos-4x5-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0021", SYMLINK+="input/wacom-tablets/intuos-6x8 input/wacom-tablets/intuos-6x8-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0022", SYMLINK+="input/wacom-tablets/intuos-9x12 input/wacom-tablets/intuos-9x12-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0023", SYMLINK+="input/wacom-tablets/intuos-12x12 input/wacom-tablets/intuos-12x12-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0024", SYMLINK+="input/wacom-tablets/intuos-12x18 input/wacom-tablets/intuos-12x18-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0030", SYMLINK+="input/wacom-tablets/pl400 input/wacom-tablets/pl400-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0031", SYMLINK+="input/wacom-tablets/pl500 input/wacom-tablets/pl500-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0032", SYMLINK+="input/wacom-tablets/pl600 input/wacom-tablets/pl600-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0033", SYMLINK+="input/wacom-tablets/pl600sx input/wacom-tablets/pl600sx-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0034", SYMLINK+="input/wacom-tablets/pl550 input/wacom-tablets/pl550-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0035", SYMLINK+="input/wacom-tablets/pl800 input/wacom-tablets/pl800-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0037", SYMLINK+="input/wacom-tablets/pl700 input/wacom-tablets/pl700-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0038", SYMLINK+="input/wacom-tablets/pl510 input/wacom-tablets/pl510-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0039", SYMLINK+="input/wacom-tablets/dtu710 input/wacom-tablets/dtu710-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="00c0", SYMLINK+="input/wacom-tablets/dtf521 input/wacom-tablets/dtf521-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="00c4", SYMLINK+="input/wacom-tablets/dtf720 input/wacom-tablets/dtf720-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0003", SYMLINK+="input/wacom-tablets/cintiq_partner input/wacom-tablets/cintiq_partner-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0041", SYMLINK+="input/wacom-tablets/intuos2-4x5 input/wacom-tablets/intuos2-4x5-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0042", SYMLINK+="input/wacom-tablets/intuos2-6x8 input/wacom-tablets/intuos2-6x8-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0043", SYMLINK+="input/wacom-tablets/intuos2-9x12 input/wacom-tablets/intuos2-9x12-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0044", SYMLINK+="input/wacom-tablets/intuos2-12x12 input/wacom-tablets/intuos2-12x12-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0045", SYMLINK+="input/wacom-tablets/intuos2-12x18 input/wacom-tablets/intuos2-12x18-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="00b0", SYMLINK+="input/wacom-tablets/intuos3-4x5 input/wacom-tablets/intuos3-4x5-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="00b1", SYMLINK+="input/wacom-tablets/intuos3-6x8 input/wacom-tablets/intuos3-6x8-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="00b2", SYMLINK+="input/wacom-tablets/intuos3-9x12 input/wacom-tablets/intuos3-9x12-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="00b3", SYMLINK+="input/wacom-tablets/intuos3-12x12 input/wacom-tablets/intuos3-12x12-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="00b4", SYMLINK+="input/wacom-tablets/intuos3-12x19 input/wacom-tablets/intuos3-12x19-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="00b5", SYMLINK+="input/wacom-tablets/intuos3-6x11 input/wacom-tablets/intuos3-6x11-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="003f", SYMLINK+="input/wacom-tablets/cintiq21ux input/wacom-tablets/cintiq21ux-%b"
+BUS=="usb", KERNEL=="event*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0047", SYMLINK+="input/wacom-tablets/intuos2-6x8a input/wacom-tablets/intuos2-6x8a-%b"
 
-KERNEL=="event*", SYSFS{idVendor}=="056a", NAME="input/%k", SYMLINK="input/wacom%e"


Index: linuxwacom.spec
===================================================================
RCS file: /cvs/dist/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- linuxwacom.spec	27 Nov 2006 22:58:11 -0000	1.38
+++ linuxwacom.spec	18 Apr 2007 22:12:45 -0000	1.39
@@ -1,11 +1,11 @@
 %define _x11dir		/usr
 %define _x11libdir	%{_x11dir}/%{_lib}
 %define _x11sdkdir	%(pkg-config --variable=sdkdir xorg-server)
-%define tarname		%{name}-0.7.6-3
+%define tarname		%{name}-0.7.6-4
 
 # Upstream's versioning is goofy.  Note the mapping from tarname to version.
 Name:		linuxwacom
-Version:	0.7.6.3
+Version:	0.7.6.4
 Release:	1%{?dist}
 Summary:	Wacom Drivers from Linux Wacom Project
 
@@ -88,11 +88,17 @@
 
 %files devel
 %defattr(-,root,root,-)
+%dir %{_includedir}/wacomcfg
 %{_includedir}/wacomcfg/wacomcfg.h
 %{_libdir}/libwacomcfg*.a
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Tue Mar 27 2007 Aristeu Rozanski <arozansk at redhat.com> 0.7.6.4-1.fc7
+- Update to 0.7.6-4.
+- add unowned directory to list (BZ#233877)
+- updated 60-wacom.rules with newer udev rules.
+
 * Mon Nov 27 2006 Adam Jackson <ajax at redhat.com> 0.7.6.3-1.fc7
 - Update to 0.7.6-3.
 - linuxwacom-fsp.patch: Disable, dlloader shouldn't need it.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/linuxwacom/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Nov 2006 22:50:40 -0000	1.7
+++ sources	18 Apr 2007 22:12:45 -0000	1.8
@@ -1 +1 @@
-f6c58d22505380c0bc62626dee3e9fcd  linuxwacom-0.7.6-3.tar.bz2
+7b3632e23edb454925008e4512eeb6c2  linuxwacom-0.7.6-4.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 18 22:22:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 18:22:47 -0400
Subject: rpms/rhythmbox/devel rhythmbox-first-time-load.patch, NONE,
	1.1 rhythmbox.spec, 1.109, 1.110
Message-ID: <200704182222.l3IMMlgO009166@cvs.devel.redhat.com>

Author: bnocera

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

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-first-time-load.patch 
Log Message:
* Wed Apr 18 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-5.fc7
- Set the first time flag on startup, otherwise the iRadio's initial
  playlist is never loaded (Gnoem BZ #431167)


rhythmbox-first-time-load.patch:
 rb-shell.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE rhythmbox-first-time-load.patch ---
Index: rb-shell.c
===================================================================
--- rb-shell.c	(revision 5040)
+++ rb-shell.c	(working copy)
@@ -1402,6 +1402,10 @@
 	rb_shell_sync_paned (shell);
 	gtk_widget_show_all (GTK_WIDGET (shell->priv->tray_icon));
 
+	/* Do as if we ran the first time druid */
+	if (!eel_gconf_get_boolean (CONF_FIRST_TIME))
+		eel_gconf_set_boolean (CONF_FIRST_TIME, TRUE);
+
 	rb_shell_set_visibility (shell, eel_gconf_get_boolean (CONF_STATE_WINDOW_VISIBLE), TRUE);
 	gdk_notify_startup_complete ();
 


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- rhythmbox.spec	11 Apr 2007 15:23:07 -0000	1.109
+++ rhythmbox.spec	18 Apr 2007 22:22:45 -0000	1.110
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.10.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -45,6 +45,7 @@
 ExcludeArch:    s390 s390x
 
 Patch0: rhythmbox-0.10.0-xdg-user-dirs-no-autoconf.patch
+Patch1: rhythmbox-first-time-load.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -56,6 +57,8 @@
 %setup -q
 
 %patch0 -p0 -b .xdg-user-dirs
+cd shell/
+%patch1 -p0 -b .set-first-time
 
 %build
 
@@ -144,6 +147,10 @@
 %{_libexecdir}/rhythmbox-metadata
 
 %changelog
+* Wed Apr 18 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-5.fc7
+- Set the first time flag on startup, otherwise the iRadio's initial
+  playlist is never loaded (Gnoem BZ #431167)
+
 * Wed Apr 11 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-4.fc7
 - Provide some quality Ogg radios in the default iRadio catalogue
   (#229677)



From fedora-cvs-commits at redhat.com  Wed Apr 18 22:31:02 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 18:31:02 -0400
Subject: rpms/rhgb/devel .cvsignore, 1.24, 1.25 rhgb.spec, 1.71, 1.72 sources,
	1.25, 1.26
Message-ID: <200704182231.l3IMV2RX009451@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/rhgb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9435

Modified Files:
	.cvsignore rhgb.spec sources 
Log Message:
fix a small color glitch



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	4 Apr 2007 15:10:31 -0000	1.24
+++ .cvsignore	18 Apr 2007 22:30:58 -0000	1.25
@@ -1 +1 @@
-rhgb-0.17.5.tar.gz
+rhgb-0.17.6.tar.gz


Index: rhgb.spec
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/rhgb.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- rhgb.spec	4 Apr 2007 15:10:31 -0000	1.71
+++ rhgb.spec	18 Apr 2007 22:30:58 -0000	1.72
@@ -2,19 +2,16 @@
 
 Summary: Red Hat Graphical Boot
 Name: rhgb
-Version: 0.17.5
-Release: 1%{?dist}
+Version: 0.17.6
+Release: 5
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Base
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-root
 ExcludeArch: s390 s390x ppc64
 BuildRequires: vte-devel
-BuildRequires: gettext
-BuildRequires: libxf86config-devel >= 1.1.1-7
 Requires: initscripts >= 7.22-1
-Requires: system-logos
 
 %description
 Red Hat Graphical Boot provides a clean and simple interface to the boot process
@@ -24,15 +21,11 @@
 
 %build
 %configure
-
-# FIXME: need to drop the CPPFLAGS junk and fix this upstream 
-# (as well as upstream all the patches that have built up)
-make %{?_smp_mflags} \
-     CPPFLAGS="-I$(pkg-config --variable sdkdir xorg-server)"
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT \
+%makeinstall
 
 %find_lang %{gettext_package}
 
@@ -41,147 +34,14 @@
 
 %files -f %{gettext_package}.lang
 %defattr(-,root,root)
-%doc doc/HOW_IT_WORKS
+
 %{_bindir}/*
-%dir %{_datadir}/rhgb
 %{_datadir}/rhgb
-%dir %{_sysconfdir}/rhgb
-%{_sysconfdir}/rhgb/*
-%dir %{_sysconfdir}/rhgb/temp
+/etc/rhgb
+/etc/rhgb/temp
+%doc doc/HOW_IT_WORKS
 
 %changelog
-* Tue Apr  3 2007 Ray Strode <rstrode at redhat.com> - 0.17.5-1
-- don't bail if /etc/mtab isn't around. Patch by Jeremy Katz
-  <katzj at redhat.com>, bug 235146.
-
-* Tue Apr  3 2007 Ray Strode <rstrode at redhat.com> - 0.17.4-1
-- Fix some descriptions. Patch by Baris Cicek <baris at nerd.com.tr>
-  bug 143954
-
-* Wed Mar 21 2007 Matthias Clasen  <mclasen at redhat.com> - 0.17.3-1
-- Fix some more small color issues
-
-* Tue Mar 20 2007 Ray Strode <rstrode at redhat.com> - 0.17.2-2
-- pass -br by default
-
-* Wed Feb 21 2007 Matthias Clasen <mclasen at redhat.com> - 0.17.2-1
-- Fix some small color issues
-
-* Mon Feb 19 2007 Matthias Clasen <mclasen at redhat.com> - 0.17.1-1
-- Fix some glitches in the new theme
-
-* Sun Feb 18 2007 Matthias Clasen <mclasen at redhat.com> - 0.17-1
-- New artwork
-- All patches moved to cvs
-
-* Tue Dec 19 2006 Adam Jackson <ajax at redhat.com> - 0.16.4-4
-- rhgb-0.16.4-wait-for-server-to-exit.patch: Added, wait for the X server
-  to shut down before exiting.
-
-* Wed Oct 25 2006 Ray Strode <rstrode at redhat.com> - 0.16.4-3
-- kill rhgb before gdm starts to prevent weird vt switching
-  behavior (bug 211848)
-
-* Wed Oct 18 2006 Ray Strode <rstrode at redhat.com> - 0.16.4-2
-- don't execute interactive bash shell during setup (bug 209457)
-- drop the change vts code in the exit path, Adam Jackson says 
-  that the code is dead code and X will do the right thing.
-
-* Thu Oct 12 2006 Matthias Clasen <mclasen at redhat.com> - 0.16.4-1
-- Update to 0.16.4 to pick up new translations  (#
-
-* Tue Sep 26 2006 Ray Strode <rstrode at redhat.com> - 0.16.3-6
-- don't SIGKILL X server
-- wait for signal from X server that it's ready instead of
-  just launching it an hoping for the best
-- only vt switch if things go bad, X and gdm will handle 
-  making sure the right vt is active.
-- don't ever change the busy cursor to not busy (if we're not
-  busy then rhgb shouldn't be running).  
-
-* Wed Jul 26 2006 Mike A. Harris <mharris at redhat.com> 0.16.3-5
-- Bump libxf86config-devel dep to ensure the fix for (#198653) is present.
-- Ensure the package has ownership of the dirs it creates.
-- Use Fedora Extras style BuildRoot tag.
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.16.3-4.1
-- rebuild
-
-* Wed Jul  5 2006 Ray Strode <rstrode at redhat.com> - 0.16.3-4
-- remove erroneous space from x conf filename.  Problem discovered
-  from Mary Ellen Foster <mefoster at gmail.com> (bug 196885)
-
-* Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 0.16.3-3
-- Require system-logos, not fedora-logos
-
-* Wed May 10 2006 Matthias Clasen <mclasen at redhat.com> - 0.16.3-2
-- Rebuild
-
-* Wed Feb 22 2006 Matthias Clasen <mclasen at redhat.com> - 0.16.3-1
-- don't include the (old, unused) Fedora logo 
-
-* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 0.16.2-21.2.1
-- rebump for build order issues during double-long bump
-
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.16.2-21.2
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.16.2-21.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Wed Jan 25 2006 Ray Strode <rstrode at redhat.com> 0.16.2-21
-- add lame hack to scale logos down if in low resolutions (bug 178737)
-
-* Fri Jan 20 2006 Ray Strode <rstrode at redhat.com> 0.16.2-20
-- update the logo in the corner
-
-* Thu Jan 19 2006 Ray Strode <rstrode at redhat.com> 0.16.2-19
-- change color scheme and use new images by Diana Fong
-
-* Sun Jan 8 2006 Ray Strode <rstrode at redhat.com> 0.16.2-18
-- rebuild against modular X
-
-* Thu Dec 22 2005 Jesse Keating <jkeating at redhat.com> 0.16.2-16
-- versioned BuildRequires of libxf86config-devel
-
-* Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt for new gcc
-
-* Mon Nov 21 2005 Ray Strode <rstrode at redhat.com> 0.16.2-13
-- Don't run /sbin/chvt and never call waitpid on child.  Instead
-  just change vts using the VT_ACTIVATE ioctl.  Patch from Peter
-  Jones <pjones at redhat.com>.
-- Get rid of some other calls to waitpid and just let glib
-  handle it.  The code was ignoring the return values anyway...
-- add a buildreq on libxf86config-devel
-
-* Sun Nov 13 2005 Jeremy Katz <katzj at redhat.com> - 0.16.2-12
-- fix fontpath for modular x
-
-* Sun Nov 13 2005 Jeremy Katz <katzj at redhat.com> - 0.16.2-11
-- switch paths to work with modular X
-
-* Thu Nov 10 2005 Ray Strode <rstrode at redhat.com> 0.16.2-10
-- Don't switch out of details view if the user switched into
-  it intially.  Patch from Mary Ellen Foster <mefoster at gmail.com>
-  (bug 151239).
-
-* Mon Oct 31 2005 Ray Strode <rstrode at redhat.com> 0.16.2-9
-- add BuildRequires: gettext
-- don't build in-tree copy of gtkexpander.c
-- don't switch to vt1 automatically after 35 seconds (bug 135783)
-
-* Wed Oct 26 2005 Ray Strode <rstrode at redhat.com> 0.16.2-8
-- clumens, zombie-hunter, spotted another one of the 
-  brain eaters
-
-* Wed Oct 26 2005 Ray Strode <rstrode at redhat.com> 0.16.2-7
-- initialize utf-8 mode on console
-
-* Wed Oct 26 2005 Ray Strode <rstrode at redhat.com> 0.16.2-6
-- Don't make setxkbmap hungry for brains 
-  (reported by Chris Lumens).
-
 * Sun Oct 09 2005 Florian La Roche <laroche at redhat.com>
 - fix rebuild problems
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	4 Apr 2007 15:10:31 -0000	1.25
+++ sources	18 Apr 2007 22:30:58 -0000	1.26
@@ -1 +1 @@
-f1729b758443f122a8fc67b5d30b3f08  rhgb-0.17.5.tar.gz
+473d6335457d12bb0c233517c73a91f7  rhgb-0.17.6.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 18 22:31:37 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 18:31:37 -0400
Subject: rpms/rhgb/devel rhgb.spec,1.72,1.73
Message-ID: <200704182231.l3IMVb7u022683@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/rhgb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22595

Modified Files:
	rhgb.spec 
Log Message:
fix release



Index: rhgb.spec
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/rhgb.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- rhgb.spec	18 Apr 2007 22:30:58 -0000	1.72
+++ rhgb.spec	18 Apr 2007 22:31:35 -0000	1.73
@@ -3,7 +3,7 @@
 Summary: Red Hat Graphical Boot
 Name: rhgb
 Version: 0.17.6
-Release: 5
+Release: 1
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL



From fedora-cvs-commits at redhat.com  Wed Apr 18 22:39:33 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 18:39:33 -0400
Subject: rpms/rhgb/devel rhgb.spec,1.73,1.74
Message-ID: <200704182239.l3IMdXPn028193@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/rhgb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28021

Modified Files:
	rhgb.spec 
Log Message:
fix a spec file accident



Index: rhgb.spec
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/rhgb.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- rhgb.spec	18 Apr 2007 22:31:35 -0000	1.73
+++ rhgb.spec	18 Apr 2007 22:39:30 -0000	1.74
@@ -3,15 +3,18 @@
 Summary: Red Hat Graphical Boot
 Name: rhgb
 Version: 0.17.6
-Release: 1
+Release: 1%{?dist}
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Base
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch: s390 s390x ppc64
 BuildRequires: vte-devel
+BuildRequires: gettext
+BuildRequires: libxf86config-devel >= 1.1.1-7
 Requires: initscripts >= 7.22-1
+Requires: system-logos
 
 %description
 Red Hat Graphical Boot provides a clean and simple interface to the boot process
@@ -21,11 +24,15 @@
 
 %build
 %configure
-make %{?_smp_mflags}
+
+# FIXME: need to drop the CPPFLAGS junk and fix this upstream 
+# (as well as upstream all the patches that have built up)
+make %{?_smp_mflags} \
+     CPPFLAGS="-I$(pkg-config --variable sdkdir xorg-server)"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT \
 
 %find_lang %{gettext_package}
 
@@ -34,14 +41,150 @@
 
 %files -f %{gettext_package}.lang
 %defattr(-,root,root)
-
+%doc doc/HOW_IT_WORKS
 %{_bindir}/*
+%dir %{_datadir}/rhgb
 %{_datadir}/rhgb
-/etc/rhgb
-/etc/rhgb/temp
-%doc doc/HOW_IT_WORKS
+%dir %{_sysconfdir}/rhgb
+%{_sysconfdir}/rhgb/*
+%dir %{_sysconfdir}/rhgb/temp
 
 %changelog
+* Wed Apr 18 2007 Matthias Clasen <mclasen at redhat.com> - 0.17.6-1
+- Fix two swapped highlight colors
+
+* Tue Apr  3 2007 Ray Strode <rstrode at redhat.com> - 0.17.5-1
+- don't bail if /etc/mtab isn't around. Patch by Jeremy Katz
+  <katzj at redhat.com>, bug 235146.
+
+* Tue Apr  3 2007 Ray Strode <rstrode at redhat.com> - 0.17.4-1
+- Fix some descriptions. Patch by Baris Cicek <baris at nerd.com.tr>
+  bug 143954
+
+* Wed Mar 21 2007 Matthias Clasen  <mclasen at redhat.com> - 0.17.3-1
+- Fix some more small color issues
+
+* Tue Mar 20 2007 Ray Strode <rstrode at redhat.com> - 0.17.2-2
+- pass -br by default
+
+* Wed Feb 21 2007 Matthias Clasen <mclasen at redhat.com> - 0.17.2-1
+- Fix some small color issues
+
+* Mon Feb 19 2007 Matthias Clasen <mclasen at redhat.com> - 0.17.1-1
+- Fix some glitches in the new theme
+
+* Sun Feb 18 2007 Matthias Clasen <mclasen at redhat.com> - 0.17-1
+- New artwork
+- All patches moved to cvs
+
+* Tue Dec 19 2006 Adam Jackson <ajax at redhat.com> - 0.16.4-4
+- rhgb-0.16.4-wait-for-server-to-exit.patch: Added, wait for the X server
+  to shut down before exiting.
+
+* Wed Oct 25 2006 Ray Strode <rstrode at redhat.com> - 0.16.4-3
+- kill rhgb before gdm starts to prevent weird vt switching
+  behavior (bug 211848)
+
+* Wed Oct 18 2006 Ray Strode <rstrode at redhat.com> - 0.16.4-2
+- don't execute interactive bash shell during setup (bug 209457)
+- drop the change vts code in the exit path, Adam Jackson says 
+  that the code is dead code and X will do the right thing.
+
+* Thu Oct 12 2006 Matthias Clasen <mclasen at redhat.com> - 0.16.4-1
+- Update to 0.16.4 to pick up new translations  (#
+
+* Tue Sep 26 2006 Ray Strode <rstrode at redhat.com> - 0.16.3-6
+- don't SIGKILL X server
+- wait for signal from X server that it's ready instead of
+  just launching it an hoping for the best
+- only vt switch if things go bad, X and gdm will handle 
+  making sure the right vt is active.
+- don't ever change the busy cursor to not busy (if we're not
+  busy then rhgb shouldn't be running).  
+
+* Wed Jul 26 2006 Mike A. Harris <mharris at redhat.com> 0.16.3-5
+- Bump libxf86config-devel dep to ensure the fix for (#198653) is present.
+- Ensure the package has ownership of the dirs it creates.
+- Use Fedora Extras style BuildRoot tag.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.16.3-4.1
+- rebuild
+
+* Wed Jul  5 2006 Ray Strode <rstrode at redhat.com> - 0.16.3-4
+- remove erroneous space from x conf filename.  Problem discovered
+  from Mary Ellen Foster <mefoster at gmail.com> (bug 196885)
+
+* Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 0.16.3-3
+- Require system-logos, not fedora-logos
+
+* Wed May 10 2006 Matthias Clasen <mclasen at redhat.com> - 0.16.3-2
+- Rebuild
+
+* Wed Feb 22 2006 Matthias Clasen <mclasen at redhat.com> - 0.16.3-1
+- don't include the (old, unused) Fedora logo 
+
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 0.16.2-21.2.1
+- rebump for build order issues during double-long bump
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.16.2-21.2
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.16.2-21.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Wed Jan 25 2006 Ray Strode <rstrode at redhat.com> 0.16.2-21
+- add lame hack to scale logos down if in low resolutions (bug 178737)
+
+* Fri Jan 20 2006 Ray Strode <rstrode at redhat.com> 0.16.2-20
+- update the logo in the corner
+
+* Thu Jan 19 2006 Ray Strode <rstrode at redhat.com> 0.16.2-19
+- change color scheme and use new images by Diana Fong
+
+* Sun Jan 8 2006 Ray Strode <rstrode at redhat.com> 0.16.2-18
+- rebuild against modular X
+
+* Thu Dec 22 2005 Jesse Keating <jkeating at redhat.com> 0.16.2-16
+- versioned BuildRequires of libxf86config-devel
+
+* Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt for new gcc
+
+* Mon Nov 21 2005 Ray Strode <rstrode at redhat.com> 0.16.2-13
+- Don't run /sbin/chvt and never call waitpid on child.  Instead
+  just change vts using the VT_ACTIVATE ioctl.  Patch from Peter
+  Jones <pjones at redhat.com>.
+- Get rid of some other calls to waitpid and just let glib
+  handle it.  The code was ignoring the return values anyway...
+- add a buildreq on libxf86config-devel
+
+* Sun Nov 13 2005 Jeremy Katz <katzj at redhat.com> - 0.16.2-12
+- fix fontpath for modular x
+
+* Sun Nov 13 2005 Jeremy Katz <katzj at redhat.com> - 0.16.2-11
+- switch paths to work with modular X
+
+* Thu Nov 10 2005 Ray Strode <rstrode at redhat.com> 0.16.2-10
+- Don't switch out of details view if the user switched into
+  it intially.  Patch from Mary Ellen Foster <mefoster at gmail.com>
+  (bug 151239).
+
+* Mon Oct 31 2005 Ray Strode <rstrode at redhat.com> 0.16.2-9
+- add BuildRequires: gettext
+- don't build in-tree copy of gtkexpander.c
+- don't switch to vt1 automatically after 35 seconds (bug 135783)
+
+* Wed Oct 26 2005 Ray Strode <rstrode at redhat.com> 0.16.2-8
+- clumens, zombie-hunter, spotted another one of the 
+  brain eaters
+
+* Wed Oct 26 2005 Ray Strode <rstrode at redhat.com> 0.16.2-7
+- initialize utf-8 mode on console
+
+* Wed Oct 26 2005 Ray Strode <rstrode at redhat.com> 0.16.2-6
+- Don't make setxkbmap hungry for brains 
+  (reported by Chris Lumens).
+
 * Sun Oct 09 2005 Florian La Roche <laroche at redhat.com>
 - fix rebuild problems
 



From fedora-cvs-commits at redhat.com  Wed Apr 18 23:05:58 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 19:05:58 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.3090,1.3091
Message-ID: <200704182305.l3IN5wHt013797@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
* Wed Apr 18 2007 Dave Jones <davej at redhat.com>
- Bump mkinitrd require: to 6.0.9-1 for scsi_wait_scan fixes.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3090
retrieving revision 1.3091
diff -u -r1.3090 -r1.3091
--- kernel-2.6.spec	18 Apr 2007 21:56:32 -0000	1.3090
+++ kernel-2.6.spec	18 Apr 2007 23:05:55 -0000	1.3091
@@ -283,7 +283,7 @@
 # Packages that need to be installed before the kernel is, because the %post
 # scripts use them.
 #
-%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.4-1
+%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.9-1
 
 Name: kernel
 Group: System Environment/Kernel
@@ -2317,6 +2317,9 @@
 
 %changelog
 * Wed Apr 18 2007 Dave Jones <davej at redhat.com>
+- Bump mkinitrd require: to 6.0.9-1 for scsi_wait_scan fixes.
+
+* Wed Apr 18 2007 Dave Jones <davej at redhat.com>
 - Allow overriding module parameters from kernel command_line
 
 * Wed Apr 18 2007 Dave Jones <davej at redhat.com>



From fedora-cvs-commits at redhat.com  Thu Apr 19 00:01:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 20:01:01 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.404, 1.405 anaconda.spec, 1.534,
	1.535 sources, 1.529, 1.530
Message-ID: <200704190001.l3J011q5000896@cvs.devel.redhat.com>

Author: katzj

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -r1.404 -r1.405
--- .cvsignore	17 Apr 2007 23:46:45 -0000	1.404
+++ .cvsignore	19 Apr 2007 00:00:59 -0000	1.405
@@ -1 +1 @@
-anaconda-11.2.0.51.tar.bz2
+anaconda-11.2.0.52.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.534
retrieving revision 1.535
diff -u -r1.534 -r1.535
--- anaconda.spec	17 Apr 2007 23:46:45 -0000	1.534
+++ anaconda.spec	19 Apr 2007 00:00:59 -0000	1.535
@@ -1,13 +1,13 @@
 %define livearches %{ix86} x86_64
 
 Name: anaconda
-Version: 11.2.0.51
+Version: 11.2.0.52
 Release: 1
 License: GPL
 Summary: Graphical system installer
 Group: Applications/System
 Source: anaconda-%{version}.tar.bz2
-BuildRequires: kudzu-devel >= 1.2.42, pciutils-devel
+BuildRequires: kudzu-devel >= 1.2.68, pciutils-devel
 BuildRequires: bzip2-devel, e2fsprogs-devel, python-devel, gtk2-devel
 BuildRequires: rpm-python >= 4.2-0.61, rpm-devel, gettext >= 0.11
 BuildRequires: rhpl, booty, libxml2-python, zlib-devel, elfutils-devel
@@ -28,7 +28,7 @@
 %endif
 Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, booty
 Requires: parted >= 1.8.1, pyparted >= 1.8.1
-Requires: kudzu >= 1.2.42, yum >= 2.9.2, pirut >= 1.1.0
+Requires: kudzu >= 1.2.68, yum >= 2.9.2, pirut >= 1.1.0
 Requires: libxml2-python, python-urlgrabber
 Requires: system-logos, pykickstart >= 0.96, system-config-date
 Requires: device-mapper >= %{dmver}, device-mapper-libs >= %{dmver}
@@ -142,6 +142,15 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Apr 18 2007 Jeremy Katz <katzj at redhat.com> - 11.2.0.52-1
+- More PS3 fixes (dwmw2, #236480, #236508)
+- Fix broadcast calculation (dcantrell, #236266)
+- Allow anaconda to install debuginfo (#236033)
+- Fixes for installs from live image running off of USB key
+- Don't nuke locale-archive (clumens, #236978)
+- Fix rescue image default (clumens, #236453)
+- Try to be smarter about resolution for 480i ps3 (#236510)
+
 * Tue Apr 17 2007 Jeremy Katz <katzj at redhat.com> - 11.2.0.51-1
 - Some PS3 fixes (dwmw2)
 - Try to handle some of the problem cases with the ide -> libata driver 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.529
retrieving revision 1.530
diff -u -r1.529 -r1.530
--- sources	17 Apr 2007 23:46:45 -0000	1.529
+++ sources	19 Apr 2007 00:00:59 -0000	1.530
@@ -1 +1 @@
-25cea2e7719ffce44bfa4b899785ec5a  anaconda-11.2.0.51.tar.bz2
+53b21ff16abe65855d485388293a665e  anaconda-11.2.0.52.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 19 02:54:22 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 22:54:22 -0400
Subject: rpms/yelp/devel yelp-2.18.1-info-gnutls.patch, NONE,
	1.1 yelp-2.18.1-man-xrefs.patch, NONE,
	1.1 yelp-2.18.1-posix-man.patch, NONE, 1.1 yelp.spec, 1.96,
	1.97 yelp-2.12.1-doublefree.patch, 1.1,
	NONE yelp-2.12.1-fedora-docs.patch, 1.1,
	NONE yelp-2.13.2-new-mimetype-for-docbook-xml.patch, 1.1,
	NONE yelp-2.16.1-crash-fixes.patch, 1.2, NONE
Message-ID: <200704190254.l3J2sMvx022918@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	yelp.spec 
Added Files:
	yelp-2.18.1-info-gnutls.patch yelp-2.18.1-man-xrefs.patch 
	yelp-2.18.1-posix-man.patch 
Removed Files:
	yelp-2.12.1-doublefree.patch yelp-2.12.1-fedora-docs.patch 
	yelp-2.13.2-new-mimetype-for-docbook-xml.patch 
	yelp-2.16.1-crash-fixes.patch 
Log Message:
fix another crash in the info parser


yelp-2.18.1-info-gnutls.patch:
 yelp-info-parser.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE yelp-2.18.1-info-gnutls.patch ---
--- yelp-2.18.1/src/yelp-info-parser.c.info-gnutls	2007-04-18 22:38:23.000000000 -0400
+++ yelp-2.18.1/src/yelp-info-parser.c	2007-04-18 22:38:30.000000000 -0400
@@ -184,10 +184,16 @@
 		  filename = find_info_part (items[0], file);
 		  str = open_info_file (filename);
 		  if (!str) {
-		  	return NULL;
+			g_strfreev (items);
+		  	continue;
 		  }
 			pages = g_strsplit (str, "", 2);
 			g_free (str);
+			if (!pages[1]) {
+				g_strfreev (items);
+				g_strfreev (pages);
+		  		continue;
+			}
 
 			offset =  atoi(items[1]);
 			plength = strlen(pages[1]);

yelp-2.18.1-man-xrefs.patch:
 yelp-man-parser.c |   45 +++++++++++++++++++++++++++++++++++----------
 1 files changed, 35 insertions(+), 10 deletions(-)

--- NEW FILE yelp-2.18.1-man-xrefs.patch ---
--- yelp-2.18.1/src/yelp-man-parser.c.man-xrefs	2007-04-18 13:33:14.000000000 -0400
+++ yelp-2.18.1/src/yelp-man-parser.c	2007-04-18 13:33:19.000000000 -0400
@@ -339,6 +339,20 @@
 	else
 	    parser->ins = parser_append_node (parser, b);
 	
+	if (ptr->next) {
+		gchar *tmp = ptr->next->data;
+
+		if (tmp[0] == '(' && g_ascii_isdigit (tmp[1]) &&
+                    (tmp[2] == ')' || (g_ascii_isalpha (tmp[2]) && tmp[3] == ')'))) {
+			tmp = g_strconcat (ptr->data, " ", tmp, NULL);
+                        parser_append_given_text_handle_escapes (parser, tmp, TRUE);
+			g_free (tmp);
+                        parser->ins = parser->ins->parent;
+			ptr = ptr->next->next;
+			continue;
+		}  
+	}
+
 	parser_append_given_text_handle_escapes (parser, ptr->data, TRUE);
 	parser->ins = parser->ins->parent;
 	
@@ -1554,15 +1568,18 @@
 	}
         else if ((make_links) && (*ptr == '(')) {
 	    gchar *space_pos;
-	    gchar *tmp_cur;
 	    gchar *url;
 	    gchar  c;
+            gchar *name_end;
+            gchar *num_start;
+            gchar *num_end;
 	   
 	    space_pos = ptr;
 	    
 	    while (space_pos != anc && *(space_pos - 1) == ' ') {
 		space_pos--;
 	    }
+            name_end = space_pos;
 
 	    while (space_pos != anc && *(space_pos - 1) != ' ') {
 		space_pos--;
@@ -1570,13 +1587,18 @@
 	    
 	    if (space_pos != ptr &&
 	        g_ascii_isdigit(*(ptr+1)) &&
-		*(ptr+2) == ')') {
-	    
+		(*(ptr+2) == ')' || (g_ascii_isalpha (*(ptr+2)) && *(ptr+3) == ')'))) {
+                num_start = ptr;
+	        if (*(ptr+2) == ')')
+                  num_end = ptr + 2;
+                else
+                  num_end = ptr + 3;
+
+                g_print ("text %s\n", anc);    
 		ptr+=3;
 	    
 		parser_ensure_P (parser);
 	    
-		tmp_cur = ptr;
 		ptr = space_pos;
 	    
 		c = (*ptr);
@@ -1584,13 +1606,15 @@
 		parser_append_given_text (parser, anc);
 		*ptr = c;
 		anc = ptr;
+		ptr = num_start;
 	    
-		ptr = tmp_cur;
-	    
-		c = *(ptr);
-		*(ptr) = '\0';
-		url = g_strdup_printf ("man:%s(%c)", anc, *(ptr - 1));
+		c = *name_end;
+		*name_end = '\0';
+                *num_end = '\0';
+                g_print ("name part %s, num %s\n", anc, num_start + 1);
+		url = g_strdup_printf ("man:%s(%s)", anc, num_start + 1);
 	    
+                g_print ("link %s\n", url);
 		parser->ins = parser_append_node (parser, "UR");
 	
 		parser->ins = parser_append_node (parser, "URI");
@@ -1600,7 +1624,8 @@
 		parser_append_given_text (parser, anc);
 		parser->ins = parser->ins->parent;
 	    
-		*(ptr) = c;
+		*name_end = c;
+                *num_end = ')';
 		anc = ptr;
 	    
 		g_free (url);

yelp-2.18.1-posix-man.patch:
 yelp-utils.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE yelp-2.18.1-posix-man.patch ---
--- yelp-2.18.1/src/yelp-utils.c.posix-man	2007-04-18 12:51:28.000000000 -0400
+++ yelp-2.18.1/src/yelp-utils.c	2007-04-18 12:51:32.000000000 -0400
@@ -807,8 +807,11 @@
 	if ((cur = strchr (path, ')')))
 	    man_num = g_strndup (path, cur - path);
 	if (man_num[0]) {
-	    man_dir = g_new (gchar, 5);
-	    g_snprintf (man_dir, 5, "man%c", man_num[0]);
+	    man_dir = g_new (gchar, 6);
+	    if (man_num[1] == 'p')
+              g_snprintf (man_dir, 6, "man%cp", man_num[0]);
+            else
+	      g_snprintf (man_dir, 5, "man%c", man_num[0]);
 	}
     } else {
 	man_name = g_strdup (path);


Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- yelp.spec	16 Apr 2007 16:35:56 -0000	1.96
+++ yelp.spec	19 Apr 2007 02:54:20 -0000	1.97
@@ -19,7 +19,7 @@
 Summary: A system documentation reader from the Gnome project
 Name: yelp
 Version: 2.18.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.18/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
@@ -30,6 +30,12 @@
 Patch5: yelp-2.16.0-apropos.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=430365 
 Patch6: yelp-2.18.1-info-bc-crash.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=431077 
+Patch7: yelp-2.18.1-posix-man.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=431078
+Patch8: yelp-2.18.1-man-xrefs.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=430365 
+Patch9: yelp-2.18.1-info-gnutls.patch
 
 License: GPL
 Group: Applications/System
@@ -88,6 +94,9 @@
 %patch3 -p1 -b .use-pango
 %patch5 -p1 -b .apropos
 %patch6 -p1 -b .info-bc-crash
+%patch7 -p1 -b .posix-man
+%patch8 -p1 -b .man-xrefs
+%patch9 -p1 -b .info-gnutls
 
 %build
 %configure 			\
@@ -152,6 +161,10 @@
 %{_datadir}/yelp
 
 %changelog
+* Wed Apr 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.1-3
+- Improve the man parser a bit
+- Fix another crash in the info parser 
+
 * Tue Apr 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.1-2
 - Fix a crash in the info parser (#216308)
 


--- yelp-2.12.1-doublefree.patch DELETED ---


--- yelp-2.12.1-fedora-docs.patch DELETED ---


--- yelp-2.13.2-new-mimetype-for-docbook-xml.patch DELETED ---


--- yelp-2.16.1-crash-fixes.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 19 03:22:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 23:22:45 -0400
Subject: rpms/adaptx/devel adaptx-0.9.13-build-xml.patch, NONE,
	1.1 adaptx.spec, 1.16, 1.17
Message-ID: <200704190322.l3J3MjLE009637@cvs.devel.redhat.com>

Author: pcheung

Update of /cvs/dist/rpms/adaptx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9521

Modified Files:
	adaptx.spec 
Added Files:
	adaptx-0.9.13-build-xml.patch 
Log Message:
Fixed the building of javadoc



adaptx-0.9.13-build-xml.patch:
 build.xml |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE adaptx-0.9.13-build-xml.patch ---
--- src/build.xml.orig	2007-04-18 17:10:00.000000000 -0400
+++ src/build.xml	2007-04-18 17:37:22.000000000 -0400
@@ -121,7 +121,7 @@
     <mkdir   dir="${build}/doc/javadoc" />
     <javadoc sourcepath="${source}/main" destdir="${build}/doc/javadoc"
              doctitle="Adaptx" public="true" noindex="true" author="true"
-             packagenames="org.exolab.adaptx.*" />
+             packagenames="org.exolab.adaptx.*" source="1.4"/>
   </target>
 
 


Index: adaptx.spec
===================================================================
RCS file: /cvs/dist/rpms/adaptx/devel/adaptx.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- adaptx.spec	12 Feb 2007 04:49:12 -0000	1.16
+++ adaptx.spec	19 Apr 2007 03:22:43 -0000	1.17
@@ -34,7 +34,7 @@
 
 Name:          adaptx
 Version:       0.9.13
-Release:       4jpp.1%{?dist}
+Release:       4jpp.2%{?dist}
 Summary:       AdaptX XSLT processor and XPath engine
 License:       BSD
 Group:         Applications/Text
@@ -44,6 +44,7 @@
 
 Patch0:        %{name}-%{version}-xsl.patch
 Patch1:        %{name}-%{version}-missingstubs.patch
+Patch2:        %{name}-%{version}-build-xml.patch
 Url:           http://castor.codehaus.org/
 BuildRequires: ant >= 0:1.6
 BuildRequires: jpackage-utils >= 0:1.6
@@ -96,6 +97,7 @@
 
 %patch0
 %patch1
+%patch2
 
 %build
 perl -p -i -e 's|classic|modern|' src/build.xml
@@ -166,6 +168,9 @@
 %doc build/doc/*
 
 %changelog
+* Wed Apr 18 2007 Permaine Cheung <pcheung at redhat.com> 0.9.13-4jpp.2
+- Fixed the building of javadoc
+
 * Wed Jan 31 2007 Deepak Bhole <dbhole at redhat.com> 0.9.13-4jpp.1
 - Fixed issues raised by rpmlint
 



From fedora-cvs-commits at redhat.com  Thu Apr 19 03:28:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 23:28:36 -0400
Subject: rpms/yelp/devel yelp-2.18.1-man-xrefs.patch, 1.1, 1.2 yelp.spec,
	1.97, 1.98
Message-ID: <200704190328.l3J3Sa32013824@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	yelp-2.18.1-man-xrefs.patch yelp.spec 
Log Message:
fix patch to apply


yelp-2.18.1-man-xrefs.patch:
 yelp-man-parser.c |   50 ++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 38 insertions(+), 12 deletions(-)

Index: yelp-2.18.1-man-xrefs.patch
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp-2.18.1-man-xrefs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yelp-2.18.1-man-xrefs.patch	19 Apr 2007 02:54:20 -0000	1.1
+++ yelp-2.18.1-man-xrefs.patch	19 Apr 2007 03:28:34 -0000	1.2
@@ -1,27 +1,27 @@
---- yelp-2.18.1/src/yelp-man-parser.c.man-xrefs	2007-04-18 13:33:14.000000000 -0400
-+++ yelp-2.18.1/src/yelp-man-parser.c	2007-04-18 13:33:19.000000000 -0400
+--- yelp-2.18.1/src/yelp-man-parser.c.man-xrefs	2007-04-18 23:05:11.000000000 -0400
++++ yelp-2.18.1/src/yelp-man-parser.c	2007-04-18 23:11:46.000000000 -0400
 @@ -339,6 +339,20 @@
  	else
  	    parser->ins = parser_append_node (parser, b);
  	
-+	if (ptr->next) {
-+		gchar *tmp = ptr->next->data;
-+
-+		if (tmp[0] == '(' && g_ascii_isdigit (tmp[1]) &&
-+                    (tmp[2] == ')' || (g_ascii_isalpha (tmp[2]) && tmp[3] == ')'))) {
-+			tmp = g_strconcat (ptr->data, " ", tmp, NULL);
-+                        parser_append_given_text_handle_escapes (parser, tmp, TRUE);
-+			g_free (tmp);
++        if (ptr->next) {
++                gchar *tmp = ptr->next->data;
++ 
++                if (tmp[0] == '(' && g_ascii_isdigit (tmp[1]) &&
++                     (tmp[2] == ')' || (g_ascii_isalpha (tmp[2]) && tmp[3] == ')'))) {
++                        tmp = g_strconcat (ptr->data, " ", tmp, NULL);
++                         parser_append_given_text_handle_escapes (parser, tmp, TRUE);
++                        g_free (tmp);
 +                        parser->ins = parser->ins->parent;
-+			ptr = ptr->next->next;
-+			continue;
-+		}  
-+	}
++                        ptr = ptr->next->next;
++                        continue;
++                }  
++        } 
 +
  	parser_append_given_text_handle_escapes (parser, ptr->data, TRUE);
  	parser->ins = parser->ins->parent;
  	
-@@ -1554,15 +1568,18 @@
+@@ -1554,25 +1568,36 @@
  	}
          else if ((make_links) && (*ptr == '(')) {
  	    gchar *space_pos;
@@ -34,62 +34,61 @@
  	   
  	    space_pos = ptr;
  	    
- 	    while (space_pos != anc && *(space_pos - 1) == ' ') {
- 		space_pos--;
- 	    }
-+            name_end = space_pos;
- 
++	    while (space_pos != anc && *(space_pos - 1) == ' ') {
++		space_pos--;
++	    }
++	    name_end = space_pos;
++
  	    while (space_pos != anc && *(space_pos - 1) != ' ') {
  		space_pos--;
-@@ -1570,13 +1587,18 @@
+ 	    }
  	    
  	    if (space_pos != ptr &&
  	        g_ascii_isdigit(*(ptr+1)) &&
 -		*(ptr+2) == ')') {
 -	    
-+		(*(ptr+2) == ')' || (g_ascii_isalpha (*(ptr+2)) && *(ptr+3) == ')'))) {
++                (*(ptr+2) == ')' || (g_ascii_isalpha (*(ptr+2)) && *(ptr+3) == ')'))) {
 +                num_start = ptr;
-+	        if (*(ptr+2) == ')')
++                if (*(ptr+2) == ')')
 +                  num_end = ptr + 2;
 +                else
 +                  num_end = ptr + 3;
 +
-+                g_print ("text %s\n", anc);    
  		ptr+=3;
- 	    
+-	    
++    
  		parser_ensure_P (parser);
  	    
 -		tmp_cur = ptr;
  		ptr = space_pos;
  	    
  		c = (*ptr);
-@@ -1584,13 +1606,15 @@
+@@ -1580,13 +1605,13 @@
  		parser_append_given_text (parser, anc);
  		*ptr = c;
  		anc = ptr;
-+		ptr = num_start;
++                ptr = num_start;
  	    
 -		ptr = tmp_cur;
 -	    
 -		c = *(ptr);
 -		*(ptr) = '\0';
--		url = g_strdup_printf ("man:%s(%c)", anc, *(ptr - 1));
-+		c = *name_end;
-+		*name_end = '\0';
+-		url = g_strdup_printf ("man:%s", anc);
+-	    
++                c = *name_end;
++                *name_end = '\0';
 +                *num_end = '\0';
-+                g_print ("name part %s, num %s\n", anc, num_start + 1);
-+		url = g_strdup_printf ("man:%s(%s)", anc, num_start + 1);
- 	    
-+                g_print ("link %s\n", url);
++                url = g_strdup_printf ("man:%s(%s)", anc, num_start + 1);
++
  		parser->ins = parser_append_node (parser, "UR");
  	
  		parser->ins = parser_append_node (parser, "URI");
-@@ -1600,7 +1624,8 @@
+@@ -1596,7 +1621,8 @@
  		parser_append_given_text (parser, anc);
  		parser->ins = parser->ins->parent;
  	    
 -		*(ptr) = c;
-+		*name_end = c;
++                *name_end = c;
 +                *num_end = ')';
  		anc = ptr;
  	    


Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- yelp.spec	19 Apr 2007 02:54:20 -0000	1.97
+++ yelp.spec	19 Apr 2007 03:28:34 -0000	1.98
@@ -30,12 +30,11 @@
 Patch5: yelp-2.16.0-apropos.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=430365 
 Patch6: yelp-2.18.1-info-bc-crash.patch
+Patch7: yelp-2.18.1-info-gnutls.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=431077 
-Patch7: yelp-2.18.1-posix-man.patch
+Patch8: yelp-2.18.1-posix-man.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=431078
-Patch8: yelp-2.18.1-man-xrefs.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=430365 
-Patch9: yelp-2.18.1-info-gnutls.patch
+Patch9: yelp-2.18.1-man-xrefs.patch
 
 License: GPL
 Group: Applications/System
@@ -94,9 +93,9 @@
 %patch3 -p1 -b .use-pango
 %patch5 -p1 -b .apropos
 %patch6 -p1 -b .info-bc-crash
-%patch7 -p1 -b .posix-man
-%patch8 -p1 -b .man-xrefs
-%patch9 -p1 -b .info-gnutls
+%patch7 -p1 -b .info-gnutls
+%patch8 -p1 -b .posix-man
+%patch9 -p1 -b .man-xrefs
 
 %build
 %configure 			\



From fedora-cvs-commits at redhat.com  Thu Apr 19 03:40:44 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 18 Apr 2007 23:40:44 -0400
Subject: rpms/scim/devel initial-locale-hotkey-186861.patch, 1.3,
	1.4 scim.spec, 1.83, 1.84
Message-ID: <200704190340.l3J3eiqk006936@cvs.devel.redhat.com>

Author: wtogami

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

Modified Files:
	initial-locale-hotkey-186861.patch scim.spec 
Log Message:
- revert previous change made in #235435 due to a more complete solution
  in #236974.  SCIM will no longer start by default on non-Asian locales.
  Non-Asian desktop users can choose to enable scim explicitly with im-chooser.


initial-locale-hotkey-186861.patch:
 scim_hotkey.cpp |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

Index: initial-locale-hotkey-186861.patch
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/initial-locale-hotkey-186861.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- initial-locale-hotkey-186861.patch	17 Apr 2007 01:30:49 -0000	1.3
+++ initial-locale-hotkey-186861.patch	19 Apr 2007 03:40:38 -0000	1.4
@@ -1,10 +1,7 @@
---- scim-1.4.5/src/scim_hotkey.cpp.8-hotkey~	2005-06-18 23:19:35.000000000 +1000
-+++ scim-1.4.5/src/scim_hotkey.cpp	2007-04-17 10:15:41.000000000 +1000
-@@ -329,12 +329,12 @@
- static char *__scim_frontend_hotkey_defaults [] =
- {
-     0,
--    "Control+space",
+--- scim-1.4.5/src/scim_hotkey.cpp.8-hotkey	2005-06-18 23:19:35.000000000 +1000
++++ scim-1.4.5/src/scim_hotkey.cpp	2006-12-12 16:22:59.000000000 +1000
+@@ -332,9 +332,9 @@
+     "Control+space",
      "",
      "",
 -    "Control+Alt+Down,Control+Shift+Shift_L+KeyRelease,Control+Shift+Shift_R+KeyRelease",
@@ -13,7 +10,6 @@
 +    "",
 +    "",
 +    "",
-+    "",
      0
  };
  


Index: scim.spec
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/scim.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- scim.spec	17 Apr 2007 01:30:49 -0000	1.83
+++ scim.spec	19 Apr 2007 03:40:38 -0000	1.84
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.5
-Release:   14%{?dist}
+Release:   15%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -254,6 +254,11 @@
 
 
 %changelog
+* Wed Apr 18 2007 Warren Togami <wtogami at redhat.com> - 1.4.5-15
+- revert previous change made in #235435 due to a more complete solution
+  in #236974.  SCIM will no longer start by default on non-Asian locales.
+  Non-Asian desktop users can choose to enable scim explicitly with im-chooser.
+
 * Tue Apr 17 2007 Jens Petersen <petersen at redhat.com> - 1.4.5-14
 - update initial-locale-hotkey-186861.patch to really turn off the Ctrl-Space
   hotkey by default for non-Asian users (#235435)



From fedora-cvs-commits at redhat.com  Thu Apr 19 07:09:37 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 19 Apr 2007 03:09:37 -0400
Subject: rpms/elfutils/devel .cvsignore,1.34,1.35 sources,1.36,1.37
Message-ID: <200704190709.l3J79bmP018195@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18150

Modified Files:
	.cvsignore sources 
Log Message:
new upstream tarball 0.127


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	5 Feb 2007 21:46:13 -0000	1.34
+++ .cvsignore	19 Apr 2007 07:09:35 -0000	1.35
@@ -1,3 +1,3 @@
-elfutils-0.126.tar.gz
 testfile16.symtab.bz2
 testfile16.symtab.debug.bz2
+elfutils-0.127.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	5 Feb 2007 22:33:26 -0000	1.36
+++ sources	19 Apr 2007 07:09:35 -0000	1.37
@@ -1,3 +1,3 @@
 07a924423a05b1bf6d0f9fe8b35dbe6b  testfile16.symtab.bz2
 bd40d1aaca8eaf1c7aea54bf4b29bda2  testfile16.symtab.debug.bz2
-573db6e31f37b4af8b17138371b0c5f2  elfutils-0.126.tar.gz
+d4dd925c8520af026406faaf28f02a1b  elfutils-0.127.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 19 07:15:48 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 19 Apr 2007 03:15:48 -0400
Subject: rpms/m4/devel m4.spec,1.27,1.28
Message-ID: <200704190715.l3J7FmoA022839@cvs.devel.redhat.com>

Author: vcrhonek

Update of /cvs/dist/rpms/m4/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22797

Modified Files:
	m4.spec 
Log Message:
Rebuild


Index: m4.spec
===================================================================
RCS file: /cvs/dist/rpms/m4/devel/m4.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- m4.spec	26 Nov 2006 05:42:17 -0000	1.27
+++ m4.spec	19 Apr 2007 07:15:46 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: The GNU macro processor
 Name: m4
 Version: 1.4.8
-Release: 1
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/gnu/m4/m4-%{version}.tar.bz2
@@ -53,6 +53,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Apr 19 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.4.8-2
+- Rebuild
+
 * Sun Nov 26 2006 Miloslav Trmac <mitr at redhat.com> - 1.4.8-1
 - Update to m4-1.4.8
 



From fedora-cvs-commits at redhat.com  Thu Apr 19 08:51:27 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 19 Apr 2007 04:51:27 -0400
Subject: rpms/rpm/devel rpm.spec,1.227,1.228
Message-ID: <200704190851.l3J8pRPw030108@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30031

Modified Files:
	rpm.spec 
Log Message:
Fix build



Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- rpm.spec	16 Apr 2007 15:19:07 -0000	1.227
+++ rpm.spec	19 Apr 2007 08:51:25 -0000	1.228
@@ -222,7 +222,10 @@
 WITH_PYTHON="--with-python=%{with_python_version}"
 
 CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
-%configure $WITH_PYTHON --enable-posixmutexes --without-javaglue
+./configure --prefix=%{__prefix} --sysconfdir=/etc \
+        --localstatedir=/var --infodir='${prefix}%{__share}/info' \
+        --mandir='${prefix}%{__share}/man' \
+        $WITH_PYTHON --enable-posixmutexes --without-javaglue
 
 make -C zlib || :
 
@@ -570,6 +573,7 @@
 %changelog
 * Mon Apr 16 2007 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-44
 - Set default verify flags for %%doc (#235353)
+- Revert to old configure line 
 
 * Mon Apr 16 2007 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-43
 - Log failures for fork failing (OLPC)



From fedora-cvs-commits at redhat.com  Thu Apr 19 10:00:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 19 Apr 2007 06:00:53 -0400
Subject: rpms/gnome-media/FC-6 gnome-media-set-modal.patch, NONE,
	1.1 gnome-media.spec, 1.80, 1.81
Message-ID: <200704191000.l3JA0rZL025710@cvs.devel.redhat.com>

Author: bnocera

Update of /cvs/dist/rpms/gnome-media/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv25673

Modified Files:
	gnome-media.spec 
Added Files:
	gnome-media-set-modal.patch 
Log Message:
* Thu Apr 19 2007 - Bastien Nocera <bnocera at redhat.com> - 2.16.1-4
- Fix modality so that you can actually edit profiles in sound-juicer
  and Rhythmbox (#230872)


gnome-media-set-modal.patch:
 audio-profile-edit.c  |    1 +
 audio-profiles-edit.c |   39 +++++----------------------------------
 2 files changed, 6 insertions(+), 34 deletions(-)

--- NEW FILE gnome-media-set-modal.patch ---
Index: profiles/audio-profiles-edit.c
===================================================================
--- profiles/audio-profiles-edit.c	(revision 3619)
+++ profiles/audio-profiles-edit.c	(working copy)
@@ -387,8 +387,8 @@
 
     /* FIXME: is this the right function name ? */
     edit_dialog = gm_audio_profile_edit_new ((GConfClient *)profile, gm_audio_profile_get_id (profile));
-                       //GTK_WINDOW (dialog));
     g_return_if_fail (edit_dialog != NULL);
+    gtk_window_set_modal (GTK_WINDOW (edit_dialog), TRUE);
     gtk_widget_show_all (GTK_WIDGET (edit_dialog));
   }
   else
@@ -482,7 +482,7 @@
   }
 
   confirm_dialog = gtk_message_dialog_new (GTK_WINDOW (dialog),
-                                   GTK_DIALOG_DESTROY_WITH_PARENT,
+                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                    GTK_MESSAGE_QUESTION,
                                    GTK_BUTTONS_NONE,
                                    "%s",
@@ -769,6 +769,8 @@
   else
     dialog->priv->transient_parent = GTK_WINDOW (dialog);
 
+  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+
   /* subscribe to changes to profile list */
 /*
   err = NULL;
@@ -789,38 +791,6 @@
   return GTK_WIDGET (dialog);
 }
 
-/* show the given profile manage dialog
- * if it doesn't exist, create it
- * return the profile manage dialog widget
- */
-GtkWidget*
-gm_audio_profile_manage_dialog (GtkWidget *dialog, GConfClient *conf, GtkWindow *transient_parent)
-{
-  GtkWindow *old_transient_parent = NULL;
-  GtkWidget *new;
-
-  if (dialog == NULL)
-  {
-    new = GTK_WIDGET (gm_audio_profiles_edit_new (conf, transient_parent));
-
-    return new;
-  }
-
-  /* do stuff with the already existing dialog */
-
-  old_transient_parent = gtk_window_get_transient_for (GTK_WINDOW (dialog));
-
-  if (old_transient_parent != transient_parent)
-  {
-    gtk_window_set_transient_for (GTK_WINDOW (dialog), transient_parent);
-    gtk_widget_hide (dialog); /* re-show the window on its new parent */
-  }
-
-  gtk_widget_show_all (dialog);
-  gtk_window_present (GTK_WINDOW (dialog));
-  return dialog;
-}
-
 /*
  * creating a new profile from the Edit Profiles dialog
  */
@@ -1011,6 +981,7 @@
   create_button = g_object_get_data (G_OBJECT (dialog->priv->new_profile_dialog), "create_button");
   gtk_widget_set_sensitive (create_button, FALSE);
 
+  gtk_window_set_modal (GTK_WINDOW (dialog->priv->new_profile_dialog), TRUE);
   gtk_widget_show_all (dialog->priv->new_profile_dialog);
   gtk_window_present (GTK_WINDOW (dialog->priv->new_profile_dialog));
   
Index: profiles/audio-profile-edit.c
===================================================================
--- profiles/audio-profile-edit.c	(revision 3619)
+++ profiles/audio-profile-edit.c	(working copy)
@@ -270,6 +270,7 @@
                     G_CALLBACK (on_profile_active_toggled), dialog->priv->profile);
 
 
+  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
   gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
 
   /* connect to profile changes */


Index: gnome-media.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-media/FC-6/gnome-media.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- gnome-media.spec	18 Oct 2006 20:56:22 -0000	1.80
+++ gnome-media.spec	19 Apr 2007 10:00:46 -0000	1.81
@@ -11,12 +11,13 @@
 Summary:        GNOME media programs.
 Name:           gnome-media
 Version:        2.16.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.11/gnome-media-%{version}.tar.bz2
 Patch4:         gnome-media-2.16.0-settings.patch
 Patch5:         gnome-media-2.13.5-hide-help-button.patch
+Patch6:         gnome-media-set-modal.patch
 
 Requires:       scrollkeeper >= 0.1.4
 BuildRoot:      %{_tmppath}/%{name}-%{PACKAGE_VERSION}-root
@@ -68,6 +69,7 @@
 %setup -q
 %patch4 -p1 -b .settings
 %patch5 -p1 -b .hide-help-button
+%patch6 -p1 -b .modal
 
 %build
 /usr/bin/gst-inspect-0.10 --print-all > /dev/null
@@ -178,6 +180,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Apr 19 2007 - Bastien Nocera <bnocera at redhat.com> - 2.16.1-4
+- Fix modality so that you can actually edit profiles in sound-juicer
+  and Rhythmbox (#230872)
+
 * Wed Oct 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.1-3
 - Fix scripts according to packaging guidelines
 
@@ -471,7 +477,7 @@
 - Version 1.2.2
 - Fix bogus scrollkeeper version in dependency
 
-* Fri Feb 23 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Feb 23 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - langify
 - move changelog to end of file
 - don't use and define "ver" at the top of the spec file



From fedora-cvs-commits at redhat.com  Thu Apr 19 10:01:20 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 19 Apr 2007 06:01:20 -0400
Subject: rpms/gnome-media/devel gnome-media-set-modal.patch, NONE,
	1.1 gnome-media.spec, 1.94, 1.95
Message-ID: <200704191001.l3JA1KXD025813@cvs.devel.redhat.com>

Author: bnocera

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

Modified Files:
	gnome-media.spec 
Added Files:
	gnome-media-set-modal.patch 
Log Message:
* Thu Apr 19 2007 - Bastien Nocera <bnocera at redhat.com> - 2.18.0-2
- Fix modality so that you can actually edit profiles in sound-juicer
  and Rhythmbox (#230872)


gnome-media-set-modal.patch:
 audio-profile-edit.c  |    1 +
 audio-profiles-edit.c |   39 +++++----------------------------------
 2 files changed, 6 insertions(+), 34 deletions(-)

--- NEW FILE gnome-media-set-modal.patch ---
Index: profiles/audio-profiles-edit.c
===================================================================
--- profiles/audio-profiles-edit.c	(revision 3619)
+++ profiles/audio-profiles-edit.c	(working copy)
@@ -387,8 +387,8 @@
 
     /* FIXME: is this the right function name ? */
     edit_dialog = gm_audio_profile_edit_new ((GConfClient *)profile, gm_audio_profile_get_id (profile));
-                       //GTK_WINDOW (dialog));
     g_return_if_fail (edit_dialog != NULL);
+    gtk_window_set_modal (GTK_WINDOW (edit_dialog), TRUE);
     gtk_widget_show_all (GTK_WIDGET (edit_dialog));
   }
   else
@@ -482,7 +482,7 @@
   }
 
   confirm_dialog = gtk_message_dialog_new (GTK_WINDOW (dialog),
-                                   GTK_DIALOG_DESTROY_WITH_PARENT,
+                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                    GTK_MESSAGE_QUESTION,
                                    GTK_BUTTONS_NONE,
                                    "%s",
@@ -769,6 +769,8 @@
   else
     dialog->priv->transient_parent = GTK_WINDOW (dialog);
 
+  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+
   /* subscribe to changes to profile list */
 /*
   err = NULL;
@@ -789,38 +791,6 @@
   return GTK_WIDGET (dialog);
 }
 
-/* show the given profile manage dialog
- * if it doesn't exist, create it
- * return the profile manage dialog widget
- */
-GtkWidget*
-gm_audio_profile_manage_dialog (GtkWidget *dialog, GConfClient *conf, GtkWindow *transient_parent)
-{
-  GtkWindow *old_transient_parent = NULL;
-  GtkWidget *new;
-
-  if (dialog == NULL)
-  {
-    new = GTK_WIDGET (gm_audio_profiles_edit_new (conf, transient_parent));
-
-    return new;
-  }
-
-  /* do stuff with the already existing dialog */
-
-  old_transient_parent = gtk_window_get_transient_for (GTK_WINDOW (dialog));
-
-  if (old_transient_parent != transient_parent)
-  {
-    gtk_window_set_transient_for (GTK_WINDOW (dialog), transient_parent);
-    gtk_widget_hide (dialog); /* re-show the window on its new parent */
-  }
-
-  gtk_widget_show_all (dialog);
-  gtk_window_present (GTK_WINDOW (dialog));
-  return dialog;
-}
-
 /*
  * creating a new profile from the Edit Profiles dialog
  */
@@ -1011,6 +981,7 @@
   create_button = g_object_get_data (G_OBJECT (dialog->priv->new_profile_dialog), "create_button");
   gtk_widget_set_sensitive (create_button, FALSE);
 
+  gtk_window_set_modal (GTK_WINDOW (dialog->priv->new_profile_dialog), TRUE);
   gtk_widget_show_all (dialog->priv->new_profile_dialog);
   gtk_window_present (GTK_WINDOW (dialog->priv->new_profile_dialog));
   
Index: profiles/audio-profile-edit.c
===================================================================
--- profiles/audio-profile-edit.c	(revision 3619)
+++ profiles/audio-profile-edit.c	(working copy)
@@ -270,6 +270,7 @@
                     G_CALLBACK (on_profile_active_toggled), dialog->priv->profile);
 
 
+  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
   gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
 
   /* connect to profile changes */


Index: gnome-media.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- gnome-media.spec	13 Mar 2007 16:35:59 -0000	1.94
+++ gnome-media.spec	19 Apr 2007 10:01:18 -0000	1.95
@@ -12,12 +12,13 @@
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.18.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.18/gnome-media-%{version}.tar.bz2
 Patch0:         gnome-media-2.17.90-disable-scrollkeeper.patch
 Patch5:         gnome-media-2.13.5-hide-help-button.patch
+Patch6:         gnome-media-set-modal.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Obsoletes:      gnome
@@ -79,6 +80,7 @@
 %setup -q
 %patch0 -p1 -b .scrollkeeper-disable
 %patch5 -p1 -b .hide-help-button
+%patch6 -p1 -b .modal
 
 %build
 libtoolize --force
@@ -196,6 +198,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Apr 19 2007 - Bastien Nocera <bnocera at redhat.com> - 2.18.0-2
+- Fix modality so that you can actually edit profiles in sound-juicer
+  and Rhythmbox (#230872)
+
 * Tue Mar 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-1
 - Update to 2.18.0
 - Drop obsolete patch



From fedora-cvs-commits at redhat.com  Thu Apr 19 10:08:20 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 19 Apr 2007 06:08:20 -0400
Subject: rpms/gnome-media/devel gnome-media.spec,1.95,1.96
Message-ID: <200704191008.l3JA8KR7025986@cvs.devel.redhat.com>

Author: bnocera

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

Modified Files:
	gnome-media.spec 
Log Message:
- -p0 not -p1



Index: gnome-media.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- gnome-media.spec	19 Apr 2007 10:01:18 -0000	1.95
+++ gnome-media.spec	19 Apr 2007 10:08:18 -0000	1.96
@@ -80,7 +80,7 @@
 %setup -q
 %patch0 -p1 -b .scrollkeeper-disable
 %patch5 -p1 -b .hide-help-button
-%patch6 -p1 -b .modal
+%patch6 -p0 -b .modal
 
 %build
 libtoolize --force



From fedora-cvs-commits at redhat.com  Thu Apr 19 10:08:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 19 Apr 2007 06:08:31 -0400
Subject: rpms/gnome-media/FC-6 gnome-media.spec,1.81,1.82
Message-ID: <200704191008.l3JA8VTK026007@cvs.devel.redhat.com>

Author: bnocera

Update of /cvs/dist/rpms/gnome-media/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv25971

Modified Files:
	gnome-media.spec 
Log Message:
- -p0 not -p1



Index: gnome-media.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-media/FC-6/gnome-media.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- gnome-media.spec	19 Apr 2007 10:00:46 -0000	1.81
+++ gnome-media.spec	19 Apr 2007 10:08:29 -0000	1.82
@@ -69,7 +69,7 @@
 %setup -q
 %patch4 -p1 -b .settings
 %patch5 -p1 -b .hide-help-button
-%patch6 -p1 -b .modal
+%patch6 -p0 -b .modal
 
 %build
 /usr/bin/gst-inspect-0.10 --print-all > /dev/null



From fedora-cvs-commits at redhat.com  Thu Apr 19 10:29:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 19 Apr 2007 06:29:31 -0400
Subject: rpms/gnome-media/FC-6 gnome-media-2.16.1-set-modal.patch, NONE,
	1.1 gnome-media.spec, 1.82, 1.83 gnome-media-set-modal.patch,
	1.1, NONE
Message-ID: <200704191029.l3JATVYp026365@cvs.devel.redhat.com>

Author: bnocera

Update of /cvs/dist/rpms/gnome-media/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv26349

Modified Files:
	gnome-media.spec 
Added Files:
	gnome-media-2.16.1-set-modal.patch 
Removed Files:
	gnome-media-set-modal.patch 
Log Message:
- Fix patch so it applies to 2.16.1


gnome-media-2.16.1-set-modal.patch:
 audio-profiles-edit.c |   39 +++++----------------------------------
 1 files changed, 5 insertions(+), 34 deletions(-)

--- NEW FILE gnome-media-2.16.1-set-modal.patch ---
--- gnome-media-2.16.1/profiles/audio-profiles-edit.c.modal	2007-04-19 11:22:59.000000000 +0100
+++ gnome-media-2.16.1/profiles/audio-profiles-edit.c	2007-04-19 11:24:34.000000000 +0100
@@ -420,8 +420,8 @@ edit_button_clicked (GtkWidget   *button
 
     /* FIXME: is this the right function name ? */
     edit_dialog = gm_audio_profile_edit_new ((GConfClient *)profile, gm_audio_profile_get_id (profile));
-                       //GTK_WINDOW (dialog));
     g_return_if_fail (edit_dialog != NULL);
+    gtk_window_set_modal (GTK_WINDOW (edit_dialog), TRUE);
     gtk_widget_show_all (GTK_WIDGET (edit_dialog));
     gtk_dialog_run (GTK_DIALOG(edit_dialog));
   }
@@ -522,7 +522,7 @@ delete_button_clicked (GtkWidget   *butt
   }
 
   confirm_dialog = gtk_message_dialog_new (dialog->priv->transient_parent,
-                                   GTK_DIALOG_DESTROY_WITH_PARENT,
+                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                    GTK_MESSAGE_QUESTION,
                                    GTK_BUTTONS_NONE,
                                    "%s",
@@ -832,6 +832,8 @@ gm_audio_profiles_edit_new (GConfClient 
   else
     dialog->priv->transient_parent = GTK_WINDOW (dialog);
 
+  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+
   /* subscribe to changes to profile list */
 /*
   err = NULL;
@@ -852,38 +854,6 @@ gm_audio_profiles_edit_new (GConfClient 
   return GTK_WIDGET (dialog);
 }
 
-/* show the given profile manage dialog
- * if it doesn't exist, create it
- * return the profile manage dialog widget
- */
-GtkWidget*
-gm_audio_profile_manage_dialog (GtkWidget *dialog, GConfClient *conf, GtkWindow *transient_parent)
-{
-  GtkWindow *old_transient_parent = NULL;
-  GtkWidget *new;
-
-  if (dialog == NULL)
-  {
-    new = GTK_WIDGET (gm_audio_profiles_edit_new (conf, transient_parent));
-
-    return new;
-  }
-
-  /* do stuff with the already existing dialog */
-
-  old_transient_parent = gtk_window_get_transient_for (GTK_WINDOW (dialog));
-
-  if (old_transient_parent != transient_parent)
-  {
-    gtk_window_set_transient_for (GTK_WINDOW (dialog), transient_parent);
-    gtk_widget_hide (dialog); /* re-show the window on its new parent */
-  }
-
-  gtk_widget_show_all (dialog);
-  gtk_window_present (GTK_WINDOW (dialog));
-  return dialog;
-}
-
 /*
  * creating a new profile from the Edit Profiles dialog
  */
@@ -1073,6 +1043,7 @@ gm_audio_profiles_edit_new_profile (GMAu
   create_button = g_object_get_data (G_OBJECT (dialog->priv->new_profile_dialog), "create_button");
   gtk_widget_set_sensitive (create_button, FALSE);
 
+  gtk_window_set_modal (GTK_WINDOW (dialog->priv->new_profile_dialog), TRUE);
   gtk_widget_show_all (dialog->priv->new_profile_dialog);
   gtk_window_present (GTK_WINDOW (dialog->priv->new_profile_dialog));
   gtk_dialog_run (GTK_DIALOG (dialog->priv->new_profile_dialog));


Index: gnome-media.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-media/FC-6/gnome-media.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- gnome-media.spec	19 Apr 2007 10:08:29 -0000	1.82
+++ gnome-media.spec	19 Apr 2007 10:29:29 -0000	1.83
@@ -17,7 +17,7 @@
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.11/gnome-media-%{version}.tar.bz2
 Patch4:         gnome-media-2.16.0-settings.patch
 Patch5:         gnome-media-2.13.5-hide-help-button.patch
-Patch6:         gnome-media-set-modal.patch
+Patch6:         gnome-media-2.16.1-set-modal.patch
 
 Requires:       scrollkeeper >= 0.1.4
 BuildRoot:      %{_tmppath}/%{name}-%{PACKAGE_VERSION}-root
@@ -69,7 +69,7 @@
 %setup -q
 %patch4 -p1 -b .settings
 %patch5 -p1 -b .hide-help-button
-%patch6 -p0 -b .modal
+%patch6 -p1 -b .modal
 
 %build
 /usr/bin/gst-inspect-0.10 --print-all > /dev/null


--- gnome-media-set-modal.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 19 10:34:55 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 19 Apr 2007 06:34:55 -0400
Subject: rpms/kdemultimedia/devel kdemultimedia-3.5.6-config.patch, NONE,
	1.1 kdemultimedia.spec, 1.79, 1.80 kde-libtool.patch, 1.1,
	NONE kdemultimedia-3.5.3-config.patch, 1.1, NONE
Message-ID: <200704191034.l3JAYtG2009611@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdemultimedia.spec 
Added Files:
	kdemultimedia-3.5.6-config.patch 
Removed Files:
	kde-libtool.patch kdemultimedia-3.5.3-config.patch 
Log Message:
- kaboodle, noatun, juk Split into an extra package


kdemultimedia-3.5.6-config.patch:
 kdemultimedia-3.4.0-patched/kscd/libwm/Makefile.am |    4 ++--
 kdemultimedia-3.5.6/configure.in                   |    2 +-
 kdemultimedia-3.5.6/configure.in.in                |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE kdemultimedia-3.5.6-config.patch ---
--- kdemultimedia-3.5.6/configure.in.in.orig	2007-04-18 18:57:41.000000000 +0200
+++ kdemultimedia-3.5.6/configure.in.in	2007-04-18 18:58:05.000000000 +0200
@@ -542,7 +542,7 @@
 if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then
 	LIB_ARTS="-lartskde"
 	ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`]
-	ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts"
+	ARTS_CFLAGS="-I$ARTS_PREFIX/include/kde/arts"
 	AC_DEFINE(HAVE_ARTS, 1, [have arts support in juk])
 else
 	build_arts="no"
--- kdemultimedia-3.5.6/configure.in.orig	2007-04-18 18:58:18.000000000 +0200
+++ kdemultimedia-3.5.6/configure.in	2007-04-18 18:58:43.000000000 +0200
@@ -607,7 +607,7 @@
 if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then
 	LIB_ARTS="-lartskde"
 	ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`]
-	ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts"
+	ARTS_CFLAGS="-I$ARTS_PREFIX/include/kde/arts"
 	AC_DEFINE(HAVE_ARTS, 1, [have arts support in juk])
 else
 	build_arts="no"
--- kdemultimedia-3.4.0-patched/kscd/libwm/Makefile.am.config	2005-02-03 23:48:26.000000000 +0100
+++ kdemultimedia-3.4.0-patched/kscd/libwm/Makefile.am	2005-02-28 20:47:00.223979671 +0100
@@ -9,8 +9,8 @@
 
 noinst_LTLIBRARIES  = libworkman.la
 
-libworkman_la_LDFLAGS = $(ARTSC_LIBS) $(all_libraries)
-libworkman_la_LIBADD = audio/libworkmanaudio.la $(ARTS_LIBASOUND)
+libworkman_la_LDFLAGS = $(all_libraries)
+libworkman_la_LIBADD = audio/libworkmanaudio.la $(ARTSC_LIBS) $(ARTS_LIBASOUND)
 
 libworkman_la_SOURCES = cddb.c cdinfo.c cdrom.c wm_helpers.c cdtext.c\
 database.c index.c scsi.c cdda.c plat_linux_cdda.c plat_sun_cdda.c\


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- kdemultimedia.spec	12 Mar 2007 13:18:22 -0000	1.79
+++ kdemultimedia.spec	19 Apr 2007 10:34:52 -0000	1.80
@@ -1,18 +1,13 @@
+%define extras 0
+
 %define debug 0
 %define final 0
 %define make_cvs 1
 
-%define qt_version 3.3.7
-
-%define libtool 1
-%define arts 1
-
-%define redhatify 1
-
 %define appdir %{_datadir}/applications/kde
 
 Version: 3.5.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 6
 Name: kdemultimedia
 Summary: Multimedia applications for the K Desktop Environment (KDE)
@@ -21,7 +16,8 @@
 License: GPL
 Url: http://www.kde.org
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}-patched.tar.bz2
-Patch2: kdemultimedia-3.5.3-config.patch
+
+Patch2: kdemultimedia-3.5.6-config.patch
 Patch3: kdemultimedia-3.4.0-xdg.patch
 Patch4: kdemultimedia-3.5.3-examples.patch
 
@@ -36,19 +32,29 @@
 
 BuildRequires: zlib-devel
 BuildRequires: kdebase-devel
-BuildRequires: perl
 BuildRequires: libvorbis-devel
 BuildRequires: audiofile-devel
 BuildRequires: glib2-devel
 BuildRequires: desktop-file-utils
 BuildRequires: libtheora-devel
 BuildRequires: flac-devel
-%if %{make_cvs}
-BuildRequires: autoconf automake libtool
-%endif
 BuildRequires: alsa-lib-devel >= 1.0.2
 BuildRequires: cdparanoia
 BuildRequires: cdparanoia-devel
+BuildRequires: gstreamer-devel
+
+%if %{make_cvs}
+BuildRequires: autoconf automake libtool
+%endif
+
+%if %{extras}
+BuildRequires: taglib-devel
+BuildRequires: libmusicbrainz-devel
+BuildRequires: libtunepimp-devel
+BuildRequires: akode-devel
+BuildRequires: libsamplerate-devel
+BuildRequires: xine-lib-devel >= 0:1.0
+%endif
 
 %description
 The K Desktop Environment (KDE) is a GUI desktop for the X Window
@@ -58,8 +64,6 @@
   kmid, a midi player
   kmix, an audio mixer
   arts, additional functionality for the aRts sound system
-  kaboodle, a media player
-  noatun, a media player
   krec, a recording tool
   kscd, an Audio-CD player
   kaudiocreator, a graphical frontend for audio file creation 
@@ -69,6 +73,7 @@
 Summary: Development files for aRts plugins
 Group: Development/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-extras = %{epoch}:%{version}-%{release}
 Requires: kdebase-devel
 
 %description devel
@@ -77,8 +82,20 @@
 applications using aRtsbuilder, aRtsmidi, aRtskde, aRts modules or
 noatun plugins.
 
+%package extras
+Summary: Extras packages from kdemultimedia
+Group: Applications/Multimedia
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description extras
+More multimedia applications for the K Desktop Environment:
+ * juk, a media player
+ * kaboodle, a media player
+ * noatun, a media player
+
 %prep
 %setup -q -n %{name}-%{version}-patched
+
 %patch2 -p1 -b .config
 %patch3 -p1 -b .xdg
 %patch4 -p1 -b .examples
@@ -93,6 +110,11 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
+%if !%{extras}
+  DO_NOT_COMPILE=""
+  export DO_NOT_COMPILE="$DO_NOT_COMPILE juk"
+%endif
+
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
@@ -103,12 +125,10 @@
    --with-flac \
    --with-theora \
    --with-vorbis \
-%if %{arts} == 0
-   --without-arts \
-%endif
    --with-alsa \
    --with-arts-alsa \
    --with-xinerama \
+   --with-gstreamer \
 %if %{debug} == 0
    --disable-debug \
    --without-debug \
@@ -117,6 +137,12 @@
 %if %{final}
    --enable-final \
 %endif
+%if %{extras}
+   --with-akode \
+   --with-taglib \
+   --with_libsamplerate \
+   --with-xine \
+%endif
    --disable-rpath
 
 
@@ -129,21 +155,45 @@
 make install DESTDIR=%{buildroot}
 make -C kaudiocreator DESTDIR=%{buildroot} install
 
-%if %{redhatify}
-  for f in %{buildroot}%{appdir}/*.desktop ; do
-    if [ -f %{buildroot}%{appdir}/*.desktop ] ; then
-      echo "OnlyShowIn=KDE;" >> $f
-    fi
-  done
-%endif
+# only show in KDE
+for f in %{buildroot}%{appdir}/*.desktop ; do
+  if [ -f %{buildroot}%{appdir}/*.desktop ] ; then
+    echo "OnlyShowIn=KDE;" >> $f
+  fi
+done
 
 # don't make these world-writeable
 chmod go-w %{buildroot}%{_datadir}/apps/kscd/*
 
-cd %{buildroot}%{_docdir}/HTML/en
-for i in *; do
-   rm -f $i/common
-   ln -sf ../common $i
+# locale's
+%find_lang %{name} || touch %{name}.lang
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
+  if [ -d $lang_dir ]; then
+    lang=$(basename $lang_dir)
+    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
+    # replace absolute symlinks with relative ones
+    pushd $lang_dir
+      for i in *; do
+        [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
+      done
+    popd
+  fi
+done
+fi
+
+# rpmdocs
+for dir in k* ; do
+  for file in AUTHORS ChangeLog README TODO ; do
+    if test -s "$dir/$file" ; then
+       install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
+       # exclude kaboodle, juk, noatun
+       if [ $dir != kaboodle -a $dir != juk -a $dir != noatun ] ; then
+         echo "%doc rpmdocs/$dir/" >> %{name}.lang
+       fi
+    fi
+  done
 done
 
 %post
@@ -165,29 +215,96 @@
 %clean
 rm -rf %{buildroot}
 
-%files
-%defattr(-,root,root)
-/etc/xdg/menus/applications-merged/*
+%files extras
+%defattr(-,root,root,-)
+
+# kaboodle
+%doc rpmdocs/kaboodle/
+%doc %lang(en) %{_docdir}/HTML/en/kaboodle/
+%{_bindir}/kaboodle
+%{_libdir}/kde3/libkaboodlepart.*
+%{_datadir}/applications/kde/kaboodle.desktop
+%{_datadir}/apps/kaboodle/
+%{_datadir}/icons/hicolor/*/apps/kaboodle.png
+%{_datadir}/services/kaboodle*
+
+# noatun
+%doc %lang(en) %{_docdir}/HTML/en/noatun/
+%{_bindir}/noatun
+%{_libdir}/kconf_update_bin/noatun20update
+%{_libdir}/kde3/noatun*
+%{_libdir}/libartseffects.*
+%{_libdir}/libkdeinit_noatun.*
+%{_libdir}/libnoatunarts.*
+%{_libdir}/libnoatuncontrols.*
+%{_libdir}/libnoatun.*
+%{_libdir}/libnoatuntags.*
+%{_libdir}/libwinskinvis.*
+%{_datadir}/applications/kde/noatun.desktop
+%{_datadir}/apps/kconf_update/noatun.upd
+%{_datadir}/apps/noatun/
+%{_datadir}/icons/hicolor/*/apps/noatun.png
+%{_datadir}/mimelnk/interface/x-winamp-skin.desktop
+
+%if %{extras}
+# juk
+%doc %lang(en) %{_docdir}/HTML/en/juk/
+%{_bindir}/juk
+%{_datadir}/applications/kde/juk.desktop
+%{_datadir}/apps/juk/
+%{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
+%{_datadir}/icons/crystalsvg/*/*/juk*
+%{_datadir}/icons/hicolor/*/apps/juk.png
+%endif
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
 %doc COPYING COPYING-DOCS
-%doc %{_docdir}/HTML/en/artsbuilder
-%exclude %doc %{_docdir}/HTML/en/juk
-%doc %{_docdir}/HTML/en/kaboodle
-%doc %{_docdir}/HTML/en/kaudiocreator
-%doc %{_docdir}/HTML/en/kdemultimedia-patched-apidocs
-%doc %{_docdir}/HTML/en/kioslave
-%doc %{_docdir}/HTML/en/kmid
-%doc %{_docdir}/HTML/en/kmix
-%doc %{_docdir}/HTML/en/krec
-%doc %{_docdir}/HTML/en/kscd
-%doc %{_docdir}/HTML/en/noatun
+
+# kaboodle
+%exclude %{_docdir}/HTML/en/kaboodle/
+%exclude %{_bindir}/kaboodle
+%exclude %{_libdir}/kde3/libkaboodlepart.*
+%exclude %{_datadir}/applications/kde/kaboodle.desktop
+%exclude %{_datadir}/apps/kaboodle/
+%exclude %{_datadir}/icons/hicolor/*/apps/kaboodle.png
+%exclude %{_datadir}/services/kaboodle*
+
+# noatun
+%exclude %{_docdir}/HTML/en/noatun/
+%exclude %{_bindir}/noatun
+%exclude %{_libdir}/kconf_update_bin/noatun20update
+%exclude %{_libdir}/kde3/noatun*
+%exclude %{_libdir}/libartseffects.*
+%exclude %{_libdir}/libkdeinit_noatun.*
+%exclude %{_libdir}/libnoatunarts.*
+%exclude %{_libdir}/libnoatuncontrols.*
+%exclude %{_libdir}/libnoatun.*
+%exclude %{_libdir}/libnoatuntags.*
+%exclude %{_libdir}/libwinskinvis.*
+%exclude %{_datadir}/applications/kde/noatun.desktop
+%exclude %{_datadir}/apps/kconf_update/noatun.upd
+%exclude %{_datadir}/apps/noatun/
+%exclude %{_datadir}/icons/hicolor/*/apps/noatun.png
+%exclude %{_datadir}/mimelnk/interface/x-winamp-skin.desktop
+
+%if %{extras}
+# juk
+%exclude %{_docdir}/HTML/en/juk/
+%exclude %{_bindir}/juk
+%exclude %{_datadir}/applications/kde/juk.desktop
+%exclude %{_datadir}/apps/juk/
+%exclude %{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
+%exclude %{_datadir}/icons/crystalsvg/*/*/juk*
+%exclude %{_datadir}/icons/hicolor/*/apps/juk.png
+%endif
+
+/etc/xdg/menus/applications-merged/*
 %{_libdir}/mcop/*
 %{_libdir}/*.la
 %{_libdir}/libkdeinit_*.so
 %{_libdir}/lib*.so.*
-%{_libdir}/libartseffects.so
-%{_libdir}/libnoatunarts.so
 %{_libdir}/liboggarts.so
-%{_libdir}/libwinskinvis.so
 %{_libdir}/kde3/*
 %{_libdir}/kconf_update_bin/*
 %{_bindir}/*
@@ -212,6 +329,9 @@
 %exclude %{_libdir}/libwinskinvis.so
 
 %changelog
+* Wed Apr 18 2007 Than Ngo <than at redhat.com> - 6:3.5.6-4.fc7
+- kaboodle, noatun, juk Split into an extra package
+
 * Mon Mar 12 2007 Than Ngo <than at redhat.com> - 6:3.5.6-3.fc7
 - cleanup specfile
 


--- kde-libtool.patch DELETED ---


--- kdemultimedia-3.5.3-config.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 19 12:43:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 19 Apr 2007 08:43:26 -0400
Subject: rpms/libvirt/FC-6 libvirt.spec,1.43,1.44 sources,1.19,1.20
Message-ID: <200704191243.l3JChQAv007595@cvs.devel.redhat.com>

Author: veillard

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

Modified Files:
	libvirt.spec sources 
Log Message:
Update to 0.2.2, Daniel



Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/FC-6/libvirt.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- libvirt.spec	19 Mar 2007 21:16:49 -0000	1.43
+++ libvirt.spec	19 Apr 2007 12:43:24 -0000	1.44
@@ -6,10 +6,10 @@
 # Fedora RPM builds
 %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}}
 
-Summary: Library providing an API to use the Xen virtualization
+Summary: Library providing a simple API for virtualization
 Name: libvirt
-Version: 0.2.1
-Release: 2%{?_extra_release}
+Version: 0.2.2
+Release: 1%{?_extra_release}
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -32,8 +32,8 @@
 Patch0:libvirt-0.2.0-pvfb-new-config.patch
 
 %description
-This C library provides an API to use the Xen virtualization framework,
-and the virsh command line tool to control virtual domains.
+Libvirt is a C toolkit to interract with the virtualization capabilities
+of recent versions of Linux (and other OSes).
 
 %package devel
 Summary: Libraries, includes, etc. to compile with the libvirt library
@@ -44,7 +44,7 @@
 
 %description devel
 Includes and documentations for the C library providing an API to use
-the Xen virtualization framework
+the virtualization capabilities of recent versions of Linux (and other OSes).
 
 %package python
 Summary: Python bindings for the libvirt library
@@ -55,7 +55,8 @@
 %description python
 The libvirt-python package contains a module that permits applications
 written in the Python programming language to use the interface
-supplied by the libvirt library to use the Xen virtualization framework.
+supplied by the libvirt library to use the the virtualization capabilities 
+of recent versions of Linux (and other OSes).
 
 %prep
 %setup -q
@@ -128,7 +129,12 @@
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/
+%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart
 %{_sysconfdir}/rc.d/init.d/libvirtd
+%dir %{_sysconfdir}/libvirt
+%dir %{_sysconfdir}/libvirt/qemu
+%dir %{_sysconfdir}/libvirt/qemu/networks
+%dir %{_sysconfdir}/libvirt/qemu/networks/autostart
 %dir %{_datadir}/libvirt/
 %dir %{_datadir}/libvirt/networks/
 %{_datadir}/libvirt/networks/default.xml
@@ -142,6 +148,7 @@
 %defattr(-, root, root)
 
 %{_libdir}/lib*.so
+%dir %{_includedir}/libvirt
 %{_includedir}/libvirt/*.h
 %{_libdir}/pkgconfig/libvirt.pc
 %doc %{_datadir}/gtk-doc/html/libvirt/*.devhelp
@@ -165,6 +172,11 @@
 %doc docs/examples/python
 
 %changelog
+* Thu Apr 19 2007 Daniel Veillard <veillard at redhat.com> - 0.2.2-1.fc6
+- Release of 0.2.2
+- lot of assorted bugfixes and cleanups
+- preparing for Xen-3.0.5
+
 * Mon Mar 19 2007 Daniel Veillard <veillard at redhat.com> - 2.0.1-2.fc6
 - We still need to force use of new PVFB config style
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libvirt/FC-6/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	19 Mar 2007 09:33:41 -0000	1.19
+++ sources	19 Apr 2007 12:43:24 -0000	1.20
@@ -1 +1 @@
-c5ff72800c3540d486489fec2df737b3  libvirt-0.2.1.tar.gz
+5abe4b1fd6b57948ce259036afdc9194  libvirt-0.2.2.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 19 12:51:38 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 19 Apr 2007 08:51:38 -0400
Subject: rpms/libvirt/FC-6 libvirt-0.2.2-pvfb-new-config.patch, NONE,
	1.1 libvirt.spec, 1.44, 1.45
Message-ID: <200704191251.l3JCpcYY013640@cvs.devel.redhat.com>

Author: veillard

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

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-0.2.2-pvfb-new-config.patch 
Log Message:
The pvfb patch needed to be updated, Daniel


libvirt-0.2.2-pvfb-new-config.patch:
 xml.c |    4 !!!!
 1 files changed, 4 modifications(!)

--- NEW FILE libvirt-0.2.2-pvfb-new-config.patch ---
*** libvirt-0.2.2/src/xml.c.orig	2007-04-19 14:48:28.000000000 +0200
--- libvirt-0.2.2/src/xml.c	2007-04-19 14:49:29.000000000 +0200
*************** virDomainParseXMLOSDescPV(virConnectPtr 
*** 826,832 ****
          virBufferVSprintf(buf, "(args '%s')", (const char *) cmdline);
  
      /* PV graphics for xen <= 3.0.4 */
!     if (xendConfigVersion < 3) {
          cur = virXPathNode("/domain/devices/graphics[1]", ctxt);
          if (cur != NULL) {
              res = virDomainParseXMLGraphicsDescImage(conn, cur, buf,
--- 826,832 ----
          virBufferVSprintf(buf, "(args '%s')", (const char *) cmdline);
  
      /* PV graphics for xen <= 3.0.4 */
!     if (xendConfigVersion < 2) {
          cur = virXPathNode("/domain/devices/graphics[1]", ctxt);
          if (cur != NULL) {
              res = virDomainParseXMLGraphicsDescImage(conn, cur, buf,
*************** virDomainParseXMLDesc(virConnectPtr conn
*** 1348,1354 ****
  
      /* New style PV graphics config xen >= 3.0.4,
       * or HVM graphics config xen >= 3.0.5 */
!     if ((xendConfigVersion >= 3 && !hvm) ||
          (xendConfigVersion >= 4 && hvm)) {
          nb_nodes = virXPathNodeSet("/domain/devices/graphics", ctxt, &nodes);
          if (nb_nodes > 0) {
--- 1348,1354 ----
  
      /* New style PV graphics config xen >= 3.0.4,
       * or HVM graphics config xen >= 3.0.5 */
!     if ((xendConfigVersion >= 2 && !hvm) ||
          (xendConfigVersion >= 4 && hvm)) {
          nb_nodes = virXPathNodeSet("/domain/devices/graphics", ctxt, &nodes);
          if (nb_nodes > 0) {


Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/FC-6/libvirt.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- libvirt.spec	19 Apr 2007 12:43:24 -0000	1.44
+++ libvirt.spec	19 Apr 2007 12:51:35 -0000	1.45
@@ -29,7 +29,7 @@
 BuildRequires: /sbin/iptables
 Obsoletes: libvir
 ExclusiveArch: i386 x86_64 ia64
-Patch0:libvirt-0.2.0-pvfb-new-config.patch
+Patch0:libvirt-0.2.2-pvfb-new-config.patch
 
 %description
 Libvirt is a C toolkit to interract with the virtualization capabilities



From fedora-cvs-commits at redhat.com  Thu Apr 19 13:12:29 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 19 Apr 2007 09:12:29 -0400
Subject: rpms/libxml2/FC-6 libxml2.spec,1.42,1.43 sources,1.37,1.38
Message-ID: <200704191312.l3JDCTGR028747@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/libxml2/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv28568

Modified Files:
	libxml2.spec sources 
Log Message:
Update to updatrem 2.6.28, Daniel



Index: libxml2.spec
===================================================================
RCS file: /cvs/dist/rpms/libxml2/FC-6/libxml2.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- libxml2.spec	26 Oct 2006 15:42:42 -0000	1.42
+++ libxml2.spec	19 Apr 2007 13:12:26 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.6.27
-Release: 1.FC6
+Version: 2.6.28
+Release: 1%{?_extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
@@ -46,7 +46,6 @@
 Summary: Python bindings for the libxml2 library
 Group: Development/Libraries
 Requires: libxml2 = %{version}
-Requires: %{_libdir}/python%(echo `python -c "import sys; print sys.version[0:3]"`)
 
 %description python
 The libxml2-python package contains a module that permits applications
@@ -131,6 +130,10 @@
 %doc doc/python.html
 
 %changelog
+* Thu Apr 19 2007 Daniel Veillard <veillard at redhat.com> 2.6.28-1.fc6
+- upstream release 2.6.28 see http://xmlsoft.org/news.html
+- very large amount of bug fixes reported upstream
+
 * Wed Oct 26 2006 Daniel Veillard <veillard at redhat.com> 2.6.27-1.FC6
 - upstream release 2.6.27 see http://xmlsoft.org/news.html
 - very large amount of bug fixes reported upstream


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libxml2/FC-6/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	26 Oct 2006 11:34:46 -0000	1.37
+++ sources	19 Apr 2007 13:12:26 -0000	1.38
@@ -1 +1 @@
-f5806f5059ef7bd4d3fcf36cf116d1ef  libxml2-2.6.27.tar.gz
+ddf3c369964980a238fad0b6ad40532c  libxml2-2.6.28.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 19 13:14:28 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 19 Apr 2007 09:14:28 -0400
Subject: rpms/libxml2/FC-6 libxml2.spec,1.43,1.44
Message-ID: <200704191314.l3JDESW8030244@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/libxml2/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv30117

Modified Files:
	libxml2.spec 
Log Message:
Fix Release, daniel



Index: libxml2.spec
===================================================================
RCS file: /cvs/dist/rpms/libxml2/FC-6/libxml2.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- libxml2.spec	19 Apr 2007 13:12:26 -0000	1.43
+++ libxml2.spec	19 Apr 2007 13:14:26 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
 Version: 2.6.28
-Release: 1%{?_extra_release}
+Release: 1%{?dist}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 19 13:30:15 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 19 Apr 2007 09:30:15 -0400
Subject: rpms/gnome-media/devel gnome-media-cd-last-track-mode.patch, NONE,
	1.1 gnome-media.spec, 1.96,
	1.97 gnome-media-2.10.2-gnome-cd-deadlock-fix.patch, 1.1,
	NONE gnome-media-2.12.0-settings.patch, 1.1,
	NONE gnome-media-2.13.91-settings.patch, 1.1,
	NONE gnome-media-2.7.92-cd-sink-fix.patch, 1.1,
	NONE gnome-media-2.7.92-help.patch, 1.1,
	NONE gnome-media-2.8.0-gst-mixer-nomodem.patch, 1.2,
	NONE gnome-media-2.8.0-no-oss-mixer.patch, 1.2,
	NONE gnome-media-2.9.90-no-oss-mixer.patch, 1.1, NONE
Message-ID: <200704191330.l3JDUF0v008365@cvs.devel.redhat.com>

Author: bnocera

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

Modified Files:
	gnome-media.spec 
Added Files:
	gnome-media-cd-last-track-mode.patch 
Removed Files:
	gnome-media-2.10.2-gnome-cd-deadlock-fix.patch 
	gnome-media-2.12.0-settings.patch 
	gnome-media-2.13.91-settings.patch 
	gnome-media-2.7.92-cd-sink-fix.patch 
	gnome-media-2.7.92-help.patch 
	gnome-media-2.8.0-gst-mixer-nomodem.patch 
	gnome-media-2.8.0-no-oss-mixer.patch 
	gnome-media-2.9.90-no-oss-mixer.patch 
Log Message:
- Kill dead patches
* Thu Apr 19 2007 - Bastien Nocera <bnocera at redhat.com> - 2.18.0-3
- Fix playback of last track in track mode (#142722)


gnome-media-cd-last-track-mode.patch:
 gst-cdrom.c |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletion(-)

--- NEW FILE gnome-media-cd-last-track-mode.patch ---
Index: gst-cdrom.c
===================================================================
--- gst-cdrom.c	(revision 3619)
+++ gst-cdrom.c	(working copy)
@@ -575,7 +575,23 @@
 
   GST_DEBUG ("received EOS %s", (was_last) ? "(last track)" : "");
 
-  if (was_last) {
+  if (was_last && GNOME_CDROM (cdrom)->playmode == GNOME_CDROM_SINGLE_TRACK) {
+    GnomeCDRomMSF start_msf, end_msf;
+    start_msf.minute = 0;
+    start_msf.second = 0;
+    start_msf.frame = 0;
+
+    end_msf.minute = 0;
+    end_msf.second = 0;
+    end_msf.frame = 0;
+
+    gst_cdrom_play (GNOME_CDROM (cdrom),
+		    cdrom->priv->status.track,
+		    &start_msf,
+		    cdrom->priv->status.track,
+		    &end_msf,
+		    NULL);
+  } else if (was_last) {
     gst_cdrom_set_playbin_state_to_null (cdrom);
     cdrom->priv->status.audio = GNOME_CDROM_AUDIO_COMPLETE;
   } else {


Index: gnome-media.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- gnome-media.spec	19 Apr 2007 10:08:18 -0000	1.96
+++ gnome-media.spec	19 Apr 2007 13:30:11 -0000	1.97
@@ -12,13 +12,14 @@
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.18.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.18/gnome-media-%{version}.tar.bz2
 Patch0:         gnome-media-2.17.90-disable-scrollkeeper.patch
-Patch5:         gnome-media-2.13.5-hide-help-button.patch
-Patch6:         gnome-media-set-modal.patch
+Patch1:         gnome-media-2.13.5-hide-help-button.patch
+Patch2:         gnome-media-set-modal.patch
+Patch3:         gnome-media-cd-last-track-mode.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Obsoletes:      gnome
@@ -79,8 +80,10 @@
 %prep
 %setup -q
 %patch0 -p1 -b .scrollkeeper-disable
-%patch5 -p1 -b .hide-help-button
-%patch6 -p0 -b .modal
+%patch1 -p1 -b .hide-help-button
+%patch2 -p0 -b .modal
+cd gnome-cd/
+%patch3 -p0 -b .last-track-mode
 
 %build
 libtoolize --force
@@ -198,6 +201,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Apr 19 2007 - Bastien Nocera <bnocera at redhat.com> - 2.18.0-3
+- Fix playback of last track in track mode (#142722)
+
 * Thu Apr 19 2007 - Bastien Nocera <bnocera at redhat.com> - 2.18.0-2
 - Fix modality so that you can actually edit profiles in sound-juicer
   and Rhythmbox (#230872)


--- gnome-media-2.10.2-gnome-cd-deadlock-fix.patch DELETED ---


--- gnome-media-2.12.0-settings.patch DELETED ---


--- gnome-media-2.13.91-settings.patch DELETED ---


--- gnome-media-2.7.92-cd-sink-fix.patch DELETED ---


--- gnome-media-2.7.92-help.patch DELETED ---


--- gnome-media-2.8.0-gst-mixer-nomodem.patch DELETED ---


--- gnome-media-2.8.0-no-oss-mixer.patch DELETED ---


--- gnome-media-2.9.90-no-oss-mixer.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 19 13:38:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 19 Apr 2007 09:38:23 -0400
Subject: rpms/libuser/devel .cvsignore, 1.42, 1.43 libuser.spec, 1.63,
	1.64 sources, 1.44, 1.45
Message-ID: <200704191338.l3JDcNM2008946@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/libuser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8930

Modified Files:
	.cvsignore libuser.spec sources 
Log Message:
* Thu Apr 19 2007 Miloslav Trmac <mitr at redhat.com> - 0.56.2-1
- New release with updated translations



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libuser/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	23 Feb 2007 15:37:16 -0000	1.42
+++ .cvsignore	19 Apr 2007 13:38:21 -0000	1.43
@@ -1 +1 @@
-libuser-0.56.1.tar.bz2
+libuser-0.56.2.tar.bz2


Index: libuser.spec
===================================================================
RCS file: /cvs/dist/rpms/libuser/devel/libuser.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- libuser.spec	23 Feb 2007 15:37:16 -0000	1.63
+++ libuser.spec	19 Apr 2007 13:38:21 -0000	1.64
@@ -4,7 +4,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: libuser
-Version: 0.56.1
+Version: 0.56.2
 Release: 1
 Group: System Environment/Base
 License: LGPL
@@ -94,6 +94,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Apr 19 2007 Miloslav Trmac <mitr at redhat.com> - 0.56.2-1
+- New release with updated translations
+
 * Fri Feb 23 2007 Miloslav Trmac <mitr at redhat.com> - 0.56.1-1
 - When changing passwords, only silently ignore know shadow markers, not all
   invalid hashes


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libuser/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	23 Feb 2007 15:37:16 -0000	1.44
+++ sources	19 Apr 2007 13:38:21 -0000	1.45
@@ -1 +1 @@
-05578ae8b44e2c80de2e72252b5d65aa  libuser-0.56.1.tar.bz2
+0af3aac1baa7f0cbab8874899938ccc2  libuser-0.56.2.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 19 13:38:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 19 Apr 2007 09:38:43 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.13,
	1.14 policycoreutils.spec, 1.402, 1.403
Message-ID: <200704191338.l3JDchhw009005@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Wed Apr 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-9
- More cleanups for gui


policycoreutils-gui.patch:
 Makefile                    |   34 
 booleansPage.py             |  224 +++
 fcontextPage.py             |  207 +++
 loginsPage.py               |  173 ++
 mappingsPage.py             |   54 
 modulesPage.py              |  172 ++
 polgen.glade                | 1167 ++++++++++++++++
 polgen.py                   |  455 ++++++
 polgengui.py                |  253 +++
 portsPage.py                |  227 +++
 selinux.tbl                 |  274 +++
 semanagePage.py             |  115 +
 statusPage.py               |  220 +++
 system-config-selinux.glade | 3034 ++++++++++++++++++++++++++++++++++++++++++++
 system-config-selinux.py    |  169 ++
 templates/__init__.py       |   18 
 templates/executable.py     |  156 ++
 templates/network.py        |   44 
 templates/rw.py             |  104 +
 templates/script.py         |   42 
 templates/semodule.py       |   41 
 templates/tmp.py            |   72 +
 templates/var_lib.py        |  137 +
 templates/var_log.py        |   89 +
 templates/var_run.py        |   95 +
 templates/var_spool.py      |  105 +
 translationsPage.py         |  111 +
 usersPage.py                |  166 ++
 28 files changed, 7958 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- policycoreutils-gui.patch	18 Apr 2007 17:18:15 -0000	1.13
+++ policycoreutils-gui.patch	19 Apr 2007 13:38:40 -0000	1.14
@@ -888,7 +888,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.9/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/polgen.glade	2007-04-18 12:27:57.000000000 -0400
++++ policycoreutils-2.0.9/gui/polgen.glade	2007-04-18 15:15:26.000000000 -0400
 @@ -0,0 +1,1167 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -1565,7 +1565,7 @@
 +	  <child>
 +	    <widget class="GnomeDruidPageStandard" id="druidpagestandard9">
 +	      <property name="visible">True</property>
-+	      <property name="title" translatable="yes">Files and Directories that the application Creates/Modifies</property>
++	      <property name="title" translatable="yes">Files and Directories</property>
 +
 +	      <child internal-child="vbox">
 +		<widget class="GtkVBox" id="druid-vbox9">
@@ -2316,7 +2316,7 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.9/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/polgen.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.9/gui/polgen.py	2007-04-18 15:18:32.000000000 -0400
 @@ -0,0 +1,455 @@
 +#! /usr/bin/python
 +# Copyright (C) 2007 Red Hat 
@@ -2461,7 +2461,7 @@
 +            if val == True:
 +		self.DEFAULT_DIRS["tmp"][1].append("/tmp");
 +                return
-+            if val != False:
++            if val == False:
 +		self.DEFAULT_DIRS["tmp"][1]=[]
 +                return
 +            raise  ValueError(_("use_tmp must be a boolean value "))
@@ -7020,11 +7020,11 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.9/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/network.py	2007-04-18 13:13:36.000000000 -0400
++++ policycoreutils-2.0.9/gui/templates/network.py	2007-04-18 15:15:55.000000000 -0400
 @@ -0,0 +1,44 @@
 +te_port_types="""\
 +type TEMPLATETYPE_port_t;
-+corenet_port_type(TEMPLATETYPE_port_t)
++corenet_port(TEMPLATETYPE_port_t)
 +"""
 +
 +te_network="""\
@@ -7676,8 +7676,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.9/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_spool.py	2007-04-18 13:13:36.000000000 -0400
-@@ -0,0 +1,107 @@
++++ policycoreutils-2.0.9/gui/templates/var_spool.py	2007-04-19 09:35:34.000000000 -0400
+@@ -0,0 +1,105 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -7703,12 +7703,10 @@
 +
 +########################### Type Enforcement File #############################
 +te_types="""
-+# var/spool files
 +type TEMPLATETYPE_spool_t;
 +files_type(TEMPLATETYPE_spool_t)
 +"""
 +te_rules="""
-+# var/spool files for TEMPLATETYPE
 +allow TEMPLATETYPE_t TEMPLATETYPE_spool_t:dir manage_dir_perms;
 +allow TEMPLATETYPE_t TEMPLATETYPE_spool_t:file manage_file_perms;
 +allow TEMPLATETYPE_t TEMPLATETYPE_spool_t:sock_file create_file_perms;


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -r1.402 -r1.403
--- policycoreutils.spec	18 Apr 2007 19:19:25 -0000	1.402
+++ policycoreutils.spec	19 Apr 2007 13:38:40 -0000	1.403
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 2.0.9
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Wed Apr 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-9
+- More cleanups for gui
+
 * Wed Apr 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-8
 - Fix size and use_tmp problem on gui
 



From fedora-cvs-commits at redhat.com  Thu Apr 19 13:40:34 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 19 Apr 2007 09:40:34 -0400
Subject: rpms/selinux-policy/devel policy-20070219.patch, 1.53,
	1.54 selinux-policy.spec, 1.438, 1.439
Message-ID: <200704191340.l3JDeYW1009127@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20070219.patch selinux-policy.spec 
Log Message:
* Thu Apr 19 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-9
- MLS Fixes


policy-20070219.patch:
 Rules.modular                           |   12 +
 policy/flask/access_vectors             |    4 
 policy/global_booleans                  |    2 
 policy/global_tunables                  |    7 
 policy/mls                              |   31 ++-
 policy/modules/admin/acct.te            |    1 
 policy/modules/admin/alsa.fc            |    1 
 policy/modules/admin/amtu.fc            |    3 
 policy/modules/admin/amtu.if            |   53 ++++++
 policy/modules/admin/amtu.te            |   56 ++++++
 policy/modules/admin/bootloader.te      |    3 
 policy/modules/admin/consoletype.te     |   10 -
 policy/modules/admin/dmesg.te           |    1 
 policy/modules/admin/kudzu.te           |    6 
 policy/modules/admin/logwatch.te        |    4 
 policy/modules/admin/netutils.te        |    6 
 policy/modules/admin/rpm.fc             |    3 
 policy/modules/admin/rpm.if             |   85 +++++++---
 policy/modules/admin/rpm.te             |    2 
 policy/modules/admin/su.if              |    4 
 policy/modules/admin/usermanage.if      |    2 
 policy/modules/admin/usermanage.te      |   26 +++
 policy/modules/apps/gnome.if            |   26 ++-
 policy/modules/apps/gpg.fc              |    2 
 policy/modules/apps/loadkeys.if         |   44 +----
 policy/modules/apps/mozilla.if          |    1 
 policy/modules/apps/slocate.te          |    5 
 policy/modules/apps/uml.if              |   27 ---
 policy/modules/kernel/corecommands.fc   |    5 
 policy/modules/kernel/corecommands.if   |   20 ++
 policy/modules/kernel/corenetwork.te.in |   15 +
 policy/modules/kernel/devices.if        |   36 ++++
 policy/modules/kernel/domain.if         |   18 ++
 policy/modules/kernel/domain.te         |   46 +++++
 policy/modules/kernel/files.fc          |    1 
 policy/modules/kernel/files.if          |   83 ++++++++-
 policy/modules/kernel/filesystem.if     |   39 ++++
 policy/modules/kernel/filesystem.te     |   13 +
 policy/modules/kernel/kernel.if         |   42 ++++
 policy/modules/kernel/kernel.te         |    2 
 policy/modules/kernel/mls.if            |   20 ++
 policy/modules/kernel/mls.te            |    3 
 policy/modules/kernel/selinux.if        |   38 ++++
 policy/modules/kernel/storage.if        |    2 
 policy/modules/kernel/terminal.if       |    2 
 policy/modules/kernel/terminal.te       |    1 
 policy/modules/services/aide.fc         |    1 
 policy/modules/services/aide.te         |    2 
 policy/modules/services/amavis.te       |    3 
 policy/modules/services/apache.fc       |   14 -
 policy/modules/services/apache.if       |  171 +++++++++++++++++++-
 policy/modules/services/apache.te       |   72 ++++++++
 policy/modules/services/apcupsd.fc      |    9 +
 policy/modules/services/apcupsd.if      |  108 ++++++++++++
 policy/modules/services/apcupsd.te      |   91 ++++++++++
 policy/modules/services/automount.te    |    2 
 policy/modules/services/avahi.if        |   19 ++
 policy/modules/services/avahi.te        |    4 
 policy/modules/services/bluetooth.te    |    2 
 policy/modules/services/consolekit.te   |   31 ++-
 policy/modules/services/cron.fc         |    1 
 policy/modules/services/cron.if         |   33 +--
 policy/modules/services/cron.te         |   43 ++++-
 policy/modules/services/cups.te         |    6 
 policy/modules/services/cvs.te          |    1 
 policy/modules/services/cyrus.te        |    1 
 policy/modules/services/dbus.if         |   63 +++++++
 policy/modules/services/dhcp.te         |    2 
 policy/modules/services/djbdns.te       |    5 
 policy/modules/services/dovecot.te      |    5 
 policy/modules/services/ftp.te          |    5 
 policy/modules/services/hal.fc          |    8 
 policy/modules/services/hal.if          |   39 ++++
 policy/modules/services/hal.te          |  145 ++++++++++++++++-
 policy/modules/services/inetd.te        |    5 
 policy/modules/services/kerberos.if     |   79 ++-------
 policy/modules/services/kerberos.te     |   36 ++++
 policy/modules/services/mailman.if      |   19 ++
 policy/modules/services/mta.if          |   19 ++
 policy/modules/services/mta.te          |    2 
 policy/modules/services/nis.if          |    4 
 policy/modules/services/nis.te          |    4 
 policy/modules/services/nscd.te         |   10 +
 policy/modules/services/ntp.te          |    4 
 policy/modules/services/pegasus.if      |   18 ++
 policy/modules/services/pegasus.te      |    6 
 policy/modules/services/postfix.if      |    1 
 policy/modules/services/postfix.te      |    8 
 policy/modules/services/ppp.te          |    2 
 policy/modules/services/procmail.te     |    1 
 policy/modules/services/pyzor.te        |    7 
 policy/modules/services/radius.te       |    4 
 policy/modules/services/rpc.if          |    5 
 policy/modules/services/rsync.te        |    1 
 policy/modules/services/rwho.fc         |    3 
 policy/modules/services/rwho.if         |   84 +++++++++
 policy/modules/services/rwho.te         |   65 +++++++
 policy/modules/services/samba.fc        |    3 
 policy/modules/services/samba.if        |   86 ++++++++++
 policy/modules/services/samba.te        |   85 +++++++++-
 policy/modules/services/sendmail.if     |   22 ++
 policy/modules/services/smartmon.te     |    1 
 policy/modules/services/snmp.te         |   15 +
 policy/modules/services/spamassassin.te |    7 
 policy/modules/services/squid.fc        |    2 
 policy/modules/services/squid.if        |   22 ++
 policy/modules/services/squid.te        |   12 +
 policy/modules/services/ssh.if          |   39 ++++
 policy/modules/services/ssh.te          |   10 -
 policy/modules/services/w3c.fc          |    2 
 policy/modules/services/w3c.if          |    1 
 policy/modules/services/w3c.te          |   14 +
 policy/modules/system/application.fc    |    1 
 policy/modules/system/application.if    |  104 ++++++++++++
 policy/modules/system/application.te    |   14 +
 policy/modules/system/authlogin.if      |   83 ++++++++-
 policy/modules/system/authlogin.te      |    3 
 policy/modules/system/fstools.fc        |    1 
 policy/modules/system/fstools.te        |    1 
 policy/modules/system/fusermount.fc     |    6 
 policy/modules/system/fusermount.if     |   41 ++++
 policy/modules/system/fusermount.te     |   45 +++++
 policy/modules/system/getty.te          |    3 
 policy/modules/system/hostname.te       |   14 +
 policy/modules/system/init.if           |   42 ++++
 policy/modules/system/init.te           |   35 +++-
 policy/modules/system/ipsec.if          |   20 ++
 policy/modules/system/ipsec.te          |    3 
 policy/modules/system/iptables.te       |    4 
 policy/modules/system/libraries.fc      |    3 
 policy/modules/system/libraries.te      |    4 
 policy/modules/system/locallogin.te     |    7 
 policy/modules/system/logging.if        |   21 ++
 policy/modules/system/logging.te        |    2 
 policy/modules/system/lvm.fc            |    1 
 policy/modules/system/lvm.te            |    6 
 policy/modules/system/modutils.te       |    7 
 policy/modules/system/mount.fc          |    3 
 policy/modules/system/mount.if          |   37 ++++
 policy/modules/system/mount.te          |   64 +++++++
 policy/modules/system/raid.te           |    1 
 policy/modules/system/selinuxutil.fc    |    1 
 policy/modules/system/selinuxutil.if    |    5 
 policy/modules/system/selinuxutil.te    |   59 +++---
 policy/modules/system/setrans.if        |    1 
 policy/modules/system/sysnetwork.te     |    3 
 policy/modules/system/udev.te           |   12 +
 policy/modules/system/unconfined.fc     |    1 
 policy/modules/system/unconfined.if     |   10 -
 policy/modules/system/unconfined.te     |   24 ++
 policy/modules/system/userdomain.if     |  271 +++++++++++++++++++-------------
 policy/modules/system/userdomain.te     |   46 ++++-
 policy/modules/system/xen.te            |   35 ++++
 policy/support/obj_perm_sets.spt        |   12 +
 154 files changed, 3021 insertions(+), 442 deletions(-)

Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- policy-20070219.patch	18 Apr 2007 21:00:52 -0000	1.53
+++ policy-20070219.patch	19 Apr 2007 13:40:31 -0000	1.54
@@ -1579,6 +1579,26 @@
  fs_type(devpts_t)
  fs_use_trans devpts gen_context(system_u:object_r:devpts_t,s0);
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aide.fc serefpolicy-2.5.12/policy/modules/services/aide.fc
+--- nsaserefpolicy/policy/modules/services/aide.fc	2006-11-16 17:15:21.000000000 -0500
++++ serefpolicy-2.5.12/policy/modules/services/aide.fc	2007-04-18 22:31:58.000000000 -0400
+@@ -3,3 +3,4 @@
+ /var/lib/aide(/.*)		gen_context(system_u:object_r:aide_db_t,mls_systemhigh)
+ 
+ /var/log/aide.log	--	gen_context(system_u:object_r:aide_log_t,mls_systemhigh)
++/var/log/aide(/.*)?		gen_context(system_u:object_r:aide_log_t,mls_systemhigh)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aide.te serefpolicy-2.5.12/policy/modules/services/aide.te
+--- nsaserefpolicy/policy/modules/services/aide.te	2007-01-02 12:57:43.000000000 -0500
++++ serefpolicy-2.5.12/policy/modules/services/aide.te	2007-04-18 22:31:08.000000000 -0400
+@@ -32,7 +32,7 @@
+ manage_files_pattern(aide_t,aide_db_t,aide_db_t)
+ 
+ # logs
+-allow aide_t aide_log_t:file manage_file_perms;
++manage_files_pattern(aide_t, aide_log_t, aide_log_t)
+ logging_log_filetrans(aide_t,aide_log_t,file)
+ 
+ files_read_all_files(aide_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.5.12/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2007-03-26 10:39:04.000000000 -0400
 +++ serefpolicy-2.5.12/policy/modules/services/amavis.te	2007-04-11 17:07:34.000000000 -0400
@@ -5834,7 +5854,7 @@
  		init_dbus_chat_script(unconfined_execmem_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.5.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-03-26 16:24:13.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/userdomain.if	2007-04-18 15:31:48.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/userdomain.if	2007-04-18 22:32:59.000000000 -0400
 @@ -114,6 +114,10 @@
  		# Allow making the stack executable via mprotect.
  		allow $1_t self:process execstack;
@@ -5863,6 +5883,15 @@
  
  	# 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)
+@@ -1126,7 +1131,7 @@
+ 	# $1_t local policy
+ 	#
+ 
+-	allow $1_t self:capability ~sys_module;
++	allow $1_t self:capability ~{ sys_module audit_control };
+ 	allow $1_t self:process { setexec setfscreate };
+ 
+ 	# Set password information for other users.
 @@ -1369,11 +1374,7 @@
  ## <rolecap/>
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -r1.438 -r1.439
--- selinux-policy.spec	18 Apr 2007 21:00:52 -0000	1.438
+++ selinux-policy.spec	19 Apr 2007 13:40:31 -0000	1.439
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.5.12
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -358,6 +358,9 @@
 %endif
 
 %changelog
+* Thu Apr 19 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-9
+- MLS Fixes
+
 * Wed Apr 18 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-8
 - Fix path of /etc/lvm/cache directory
 - Fixes for alsactl and pppd_t



From fedora-cvs-commits at redhat.com  Thu Apr 19 13:59:02 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 19 Apr 2007 09:59:02 -0400
Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.56,
	1.57 policy-20070219.patch, 1.54, 1.55 selinux-policy.spec,
	1.439, 1.440
Message-ID: <200704191359.l3JDx2XZ009968@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	modules-targeted.conf policy-20070219.patch 
	selinux-policy.spec 
Log Message:
* Thu Apr 19 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-10
- MLS Fixes



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- modules-targeted.conf	17 Apr 2007 19:28:14 -0000	1.56
+++ modules-targeted.conf	19 Apr 2007 13:58:54 -0000	1.57
@@ -23,7 +23,7 @@
 #
 # Ainit ALSA configuration tool
 # 
-alsa = off
+alsa = base
 
 # Layer: apps
 # Module: ada

policy-20070219.patch:
 Rules.modular                           |   12 +
 policy/flask/access_vectors             |    4 
 policy/global_booleans                  |    2 
 policy/global_tunables                  |    7 
 policy/mls                              |   31 ++-
 policy/modules/admin/acct.te            |    1 
 policy/modules/admin/alsa.fc            |    1 
 policy/modules/admin/amtu.fc            |    3 
 policy/modules/admin/amtu.if            |   53 +++++
 policy/modules/admin/amtu.te            |   56 ++++++
 policy/modules/admin/bootloader.te      |    3 
 policy/modules/admin/consoletype.te     |   10 -
 policy/modules/admin/dmesg.te           |    1 
 policy/modules/admin/kudzu.te           |    6 
 policy/modules/admin/logwatch.te        |    4 
 policy/modules/admin/netutils.te        |    6 
 policy/modules/admin/rpm.fc             |    3 
 policy/modules/admin/rpm.if             |   85 +++++++--
 policy/modules/admin/rpm.te             |    2 
 policy/modules/admin/su.if              |    4 
 policy/modules/admin/usermanage.if      |    2 
 policy/modules/admin/usermanage.te      |   26 ++
 policy/modules/apps/gnome.if            |   26 ++
 policy/modules/apps/gpg.fc              |    2 
 policy/modules/apps/loadkeys.if         |   44 +---
 policy/modules/apps/mozilla.if          |    1 
 policy/modules/apps/slocate.te          |    5 
 policy/modules/apps/uml.if              |   27 ---
 policy/modules/kernel/corecommands.fc   |    5 
 policy/modules/kernel/corecommands.if   |   20 ++
 policy/modules/kernel/corenetwork.te.in |   15 +
 policy/modules/kernel/devices.if        |   36 ++++
 policy/modules/kernel/domain.if         |   18 ++
 policy/modules/kernel/domain.te         |   46 +++++
 policy/modules/kernel/files.fc          |    1 
 policy/modules/kernel/files.if          |   83 ++++++++-
 policy/modules/kernel/filesystem.if     |   39 ++++
 policy/modules/kernel/filesystem.te     |   13 +
 policy/modules/kernel/kernel.if         |   42 ++++
 policy/modules/kernel/kernel.te         |    2 
 policy/modules/kernel/mls.if            |   20 ++
 policy/modules/kernel/mls.te            |    3 
 policy/modules/kernel/selinux.if        |   38 ++++
 policy/modules/kernel/storage.if        |    2 
 policy/modules/kernel/terminal.if       |    2 
 policy/modules/kernel/terminal.te       |    1 
 policy/modules/services/aide.fc         |    1 
 policy/modules/services/aide.te         |    2 
 policy/modules/services/amavis.te       |    3 
 policy/modules/services/apache.fc       |   14 -
 policy/modules/services/apache.if       |  171 +++++++++++++++++--
 policy/modules/services/apache.te       |   72 +++++++-
 policy/modules/services/apcupsd.fc      |    9 +
 policy/modules/services/apcupsd.if      |  108 ++++++++++++
 policy/modules/services/apcupsd.te      |   91 ++++++++++
 policy/modules/services/automount.te    |    2 
 policy/modules/services/avahi.if        |   19 ++
 policy/modules/services/avahi.te        |    4 
 policy/modules/services/bluetooth.te    |    2 
 policy/modules/services/consolekit.te   |   31 ++-
 policy/modules/services/cron.fc         |    1 
 policy/modules/services/cron.if         |   33 +--
 policy/modules/services/cron.te         |   43 ++++
 policy/modules/services/cups.te         |    6 
 policy/modules/services/cvs.te          |    1 
 policy/modules/services/cyrus.te        |    1 
 policy/modules/services/dbus.if         |   63 +++++++
 policy/modules/services/dhcp.te         |    2 
 policy/modules/services/djbdns.te       |    5 
 policy/modules/services/dovecot.te      |    5 
 policy/modules/services/ftp.te          |    5 
 policy/modules/services/hal.fc          |    8 
 policy/modules/services/hal.if          |   39 ++++
 policy/modules/services/hal.te          |  147 +++++++++++++++-
 policy/modules/services/inetd.te        |    5 
 policy/modules/services/kerberos.if     |   79 ++------
 policy/modules/services/kerberos.te     |   36 +++-
 policy/modules/services/mailman.if      |   19 ++
 policy/modules/services/mta.if          |   19 ++
 policy/modules/services/mta.te          |    2 
 policy/modules/services/nis.if          |    4 
 policy/modules/services/nis.te          |    4 
 policy/modules/services/nscd.te         |   10 +
 policy/modules/services/ntp.te          |    4 
 policy/modules/services/pegasus.if      |   18 ++
 policy/modules/services/pegasus.te      |    6 
 policy/modules/services/postfix.if      |    1 
 policy/modules/services/postfix.te      |    8 
 policy/modules/services/ppp.te          |    2 
 policy/modules/services/procmail.te     |    1 
 policy/modules/services/pyzor.te        |    7 
 policy/modules/services/radius.te       |    4 
 policy/modules/services/rpc.if          |    5 
 policy/modules/services/rsync.te        |    1 
 policy/modules/services/rwho.fc         |    3 
 policy/modules/services/rwho.if         |   84 +++++++++
 policy/modules/services/rwho.te         |   65 +++++++
 policy/modules/services/samba.fc        |    3 
 policy/modules/services/samba.if        |   86 +++++++++
 policy/modules/services/samba.te        |   85 +++++++++
 policy/modules/services/sendmail.if     |   22 ++
 policy/modules/services/smartmon.te     |    1 
 policy/modules/services/snmp.te         |   15 +
 policy/modules/services/spamassassin.te |    7 
 policy/modules/services/squid.fc        |    2 
 policy/modules/services/squid.if        |   22 ++
 policy/modules/services/squid.te        |   12 +
 policy/modules/services/ssh.if          |   39 ++++
 policy/modules/services/ssh.te          |   10 -
 policy/modules/services/w3c.fc          |    2 
 policy/modules/services/w3c.if          |    1 
 policy/modules/services/w3c.te          |   14 +
 policy/modules/system/application.fc    |    1 
 policy/modules/system/application.if    |  104 +++++++++++
 policy/modules/system/application.te    |   14 +
 policy/modules/system/authlogin.if      |   83 +++++++--
 policy/modules/system/authlogin.te      |    3 
 policy/modules/system/fstools.fc        |    1 
 policy/modules/system/fstools.te        |    1 
 policy/modules/system/fusermount.fc     |    6 
 policy/modules/system/fusermount.if     |   41 ++++
 policy/modules/system/fusermount.te     |   45 +++++
 policy/modules/system/getty.te          |    3 
 policy/modules/system/hostname.te       |   14 +
 policy/modules/system/init.if           |   42 ++++
 policy/modules/system/init.te           |   35 +++
 policy/modules/system/ipsec.if          |   20 ++
 policy/modules/system/ipsec.te          |    3 
 policy/modules/system/iptables.te       |    4 
 policy/modules/system/libraries.fc      |    3 
 policy/modules/system/libraries.te      |    4 
 policy/modules/system/locallogin.te     |    7 
 policy/modules/system/logging.if        |   21 ++
 policy/modules/system/logging.te        |    2 
 policy/modules/system/lvm.fc            |    1 
 policy/modules/system/lvm.te            |    6 
 policy/modules/system/modutils.te       |    7 
 policy/modules/system/mount.fc          |    3 
 policy/modules/system/mount.if          |   37 ++++
 policy/modules/system/mount.te          |   64 ++++++-
 policy/modules/system/raid.te           |    1 
 policy/modules/system/selinuxutil.fc    |    1 
 policy/modules/system/selinuxutil.if    |    5 
 policy/modules/system/selinuxutil.te    |   59 +++---
 policy/modules/system/setrans.if        |    1 
 policy/modules/system/sysnetwork.te     |    3 
 policy/modules/system/udev.te           |   12 +
 policy/modules/system/unconfined.fc     |    1 
 policy/modules/system/unconfined.if     |   10 -
 policy/modules/system/unconfined.te     |   24 ++
 policy/modules/system/userdomain.if     |  287 ++++++++++++++++++--------------
 policy/modules/system/userdomain.te     |   63 +++++--
 policy/modules/system/xen.te            |   35 +++
 policy/support/obj_perm_sets.spt        |   12 +
 154 files changed, 3040 insertions(+), 458 deletions(-)

Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- policy-20070219.patch	19 Apr 2007 13:40:31 -0000	1.54
+++ policy-20070219.patch	19 Apr 2007 13:58:54 -0000	1.55
@@ -2887,7 +2887,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.5.12/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2007-03-20 23:38:00.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/hal.te	2007-04-18 16:48:38.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/hal.te	2007-04-19 09:51:36.000000000 -0400
 @@ -16,9 +16,33 @@
  type hald_var_run_t;
  files_pid_file(hald_var_run_t)
@@ -2931,16 +2931,7 @@
  allow hald_t self:process signal_perms;
  allow hald_t self:fifo_file rw_fifo_file_perms;
  allow hald_t self:unix_stream_socket { create_stream_socket_perms connectto };
-@@ -39,6 +63,8 @@
- 
- send_audit_msgs_pattern(hald_t)
- 
-+alsa_read_rw_config(hald_t)
-+
- manage_dirs_pattern(hald_t,hald_tmp_t,hald_tmp_t)
- manage_files_pattern(hald_t,hald_tmp_t,hald_tmp_t)
- files_tmp_filetrans(hald_t, hald_tmp_t, { file dir })
-@@ -48,14 +74,20 @@
+@@ -48,14 +72,20 @@
  manage_files_pattern(hald_t,hald_var_lib_t,hald_var_lib_t)
  manage_sock_files_pattern(hald_t,hald_var_lib_t,hald_var_lib_t)
  
@@ -2963,7 +2954,7 @@
  kernel_rw_vm_sysctls(hald_t)
  kernel_write_proc_files(hald_t)
  
-@@ -85,9 +117,13 @@
+@@ -85,9 +115,13 @@
  dev_rw_power_management(hald_t)
  # hal is now execing pm-suspend
  dev_rw_sysfs(hald_t)
@@ -2977,7 +2968,7 @@
  
  files_exec_etc_files(hald_t)
  files_read_etc_files(hald_t)
-@@ -101,9 +137,11 @@
+@@ -101,9 +135,11 @@
  files_create_boot_flag(hald_t)
  files_getattr_all_dirs(hald_t)
  files_read_kernel_img(hald_t)
@@ -2989,7 +2980,7 @@
  fs_list_auto_mountpoints(hald_t)
  files_getattr_all_mountpoints(hald_t)
  
-@@ -128,10 +166,10 @@
+@@ -128,10 +164,10 @@
  auth_use_nsswitch(hald_t)
  
  init_domtrans_script(hald_t)
@@ -3001,7 +2992,18 @@
  
  libs_use_ld_so(hald_t)
  libs_use_shared_libs(hald_t)
-@@ -245,3 +283,102 @@
+@@ -160,6 +196,10 @@
+ ')
+ 
+ optional_policy(`
++	alsa_read_rw_config(hald_t)
++')
++
++optional_policy(`
+ 	bootloader_domtrans(hald_t)
+ ')
+ 
+@@ -245,3 +285,102 @@
  optional_policy(`
  	vbetool_domtrans(hald_t)
  ')
@@ -5854,7 +5856,7 @@
  		init_dbus_chat_script(unconfined_execmem_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.5.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-03-26 16:24:13.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/userdomain.if	2007-04-18 22:32:59.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/userdomain.if	2007-04-19 09:43:55.000000000 -0400
 @@ -114,6 +114,10 @@
  		# Allow making the stack executable via mprotect.
  		allow $1_t self:process execstack;
@@ -5892,7 +5894,30 @@
  	allow $1_t self:process { setexec setfscreate };
  
  	# Set password information for other users.
-@@ -1369,11 +1374,7 @@
+@@ -1225,22 +1230,6 @@
+ 	')
+ 
+ 	optional_policy(`
+-		cron_admin_template($1,$1_t,$1_r)
+-	')
+-
+-	optional_policy(`
+-		ethereal_admin_template($1,$1_t,$1_r)
+-	')
+-
+-	optional_policy(`
+-		lpr_admin_template($1,$1_t,$1_r)
+-	')
+-
+-	optional_policy(`
+-		mta_admin_template($1,$1_t,$1_r)
+-	')
+-
+-	optional_policy(`
+ 		userhelper_exec($1_t)
+ 	')
+ ')
+@@ -1369,11 +1358,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_generic_user',`
@@ -5905,7 +5930,7 @@
  ')
  
  ########################################
-@@ -1400,11 +1401,7 @@
+@@ -1400,11 +1385,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_from_generic_user',`
@@ -5918,7 +5943,7 @@
  ')
  
  ########################################
-@@ -1430,11 +1427,7 @@
+@@ -1430,11 +1411,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_staff',`
@@ -5931,7 +5956,7 @@
  ')
  
  ########################################
-@@ -1461,11 +1454,7 @@
+@@ -1461,11 +1438,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_from_staff',`
@@ -5944,7 +5969,7 @@
  ')
  
  ########################################
-@@ -1491,11 +1480,7 @@
+@@ -1491,11 +1464,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_sysadm',`
@@ -5957,7 +5982,7 @@
  ')
  
  ########################################
-@@ -1522,11 +1507,7 @@
+@@ -1522,11 +1491,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_from_sysadm',`
@@ -5970,7 +5995,7 @@
  ')
  
  ########################################
-@@ -1714,13 +1695,11 @@
+@@ -1714,13 +1679,11 @@
  ## </param>
  #
  template(`userdom_setattr_user_ptys',`
@@ -5988,7 +6013,7 @@
  ')
  
  ########################################
-@@ -1749,13 +1728,11 @@
+@@ -1749,13 +1712,11 @@
  ## </param>
  #
  template(`userdom_create_user_pty',`
@@ -6006,7 +6031,7 @@
  ')
  
  ########################################
-@@ -3640,13 +3617,12 @@
+@@ -3640,13 +3601,12 @@
  template(`userdom_setattr_user_ttys',`
  	ifdef(`targeted_policy',`
  		term_setattr_unallocated_ttys($2)
@@ -6025,7 +6050,7 @@
  ')
  
  ########################################
-@@ -3677,13 +3653,12 @@
+@@ -3677,13 +3637,12 @@
  template(`userdom_use_user_ttys',`
  	ifdef(`targeted_policy',`
  		term_use_unallocated_ttys($2)
@@ -6044,7 +6069,7 @@
  ')
  
  ########################################
-@@ -3712,18 +3687,13 @@
+@@ -3712,18 +3671,13 @@
  ## </param>
  #
  template(`userdom_use_user_terminals',`
@@ -6069,7 +6094,7 @@
  ')
  
  ########################################
-@@ -5369,14 +5339,13 @@
+@@ -5369,14 +5323,13 @@
  interface(`userdom_use_unpriv_users_ptys',`
  	ifdef(`targeted_policy',`
  		term_use_generic_ptys($1)
@@ -6090,7 +6115,7 @@
  ')
  
  ########################################
-@@ -5393,13 +5362,13 @@
+@@ -5393,13 +5346,13 @@
  interface(`userdom_dontaudit_use_unpriv_users_ptys',`
  	ifdef(`targeted_policy',`
  		term_dontaudit_use_generic_ptys($1)
@@ -6109,7 +6134,7 @@
  ')
  
  ########################################
-@@ -5452,13 +5421,12 @@
+@@ -5452,13 +5405,12 @@
  interface(`userdom_list_unpriv_users_tmp',`
  	ifdef(`targeted_policy',`
  		files_list_tmp($1)
@@ -6128,7 +6153,7 @@
  ')
  
  ########################################
-@@ -5474,13 +5442,12 @@
+@@ -5474,13 +5426,12 @@
  interface(`userdom_read_unpriv_users_tmp_files',`
  	ifdef(`targeted_policy',`
  		files_read_generic_tmp_files($1)
@@ -6147,7 +6172,7 @@
  ')
  
  ########################################
-@@ -5496,13 +5463,12 @@
+@@ -5496,13 +5447,12 @@
  interface(`userdom_read_unpriv_users_tmp_symlinks',`
  	ifdef(`targeted_policy',`
  		files_read_generic_tmp_symlinks($1)
@@ -6166,7 +6191,7 @@
  ')
  
  ########################################
-@@ -5536,13 +5502,12 @@
+@@ -5536,13 +5486,12 @@
  interface(`userdom_use_unpriv_users_ttys',`
  	ifdef(`targeted_policy',`
  		term_use_unallocated_ttys($1)
@@ -6185,7 +6210,7 @@
  ')
  
  ########################################
-@@ -5559,13 +5524,12 @@
+@@ -5559,13 +5508,12 @@
  interface(`userdom_dontaudit_use_unpriv_users_ttys',`
  	ifdef(`targeted_policy',`
  		term_dontaudit_use_unallocated_ttys($1)
@@ -6204,7 +6229,7 @@
  ')
  
  ########################################
-@@ -5737,3 +5701,92 @@
+@@ -5737,3 +5685,92 @@
  	allow $1 user_home_dir_t:dir manage_dir_perms;
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
@@ -6299,7 +6324,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.5.12/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2007-03-26 16:24:13.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/userdomain.te	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/userdomain.te	2007-04-19 09:48:39.000000000 -0400
 @@ -15,7 +15,6 @@
  # Declarations
  #
@@ -6326,19 +6351,36 @@
  # The privhome attribute identifies every domain that can create files under
  # regular user home directories in the regular context (IE act on behalf of
  # a user in writing regular files)
-@@ -101,10 +102,10 @@
+@@ -101,10 +102,27 @@
  # Local policy
  #
  
 +userdom_unpriv_user_template(user)
  ifdef(`strict_policy',`
  	userdom_admin_user_template(sysadm)
++
++	optional_policy(`
++		cron_admin_template(sysadm,sysadm_t,sysadm_r)
++	')
++
++	optional_policy(`
++		ethereal_admin_template(sysadm,sysadm_t,sysadm_r)
++	')
++
++	optional_policy(`
++		lpr_admin_template(sysadm,sysadm_t,sysadm_r)
++	')
++
++	optional_policy(`
++		mta_admin_template(sysadm,sysadm_t,sysadm_r)
++	')
++
  	userdom_unpriv_user_template(staff)
 -	userdom_unpriv_user_template(user)
  
  	# user role change rules:
  	# sysadm_r can change to user roles
-@@ -157,6 +158,11 @@
+@@ -157,6 +175,11 @@
  
  	init_exec(sysadm_t)
  
@@ -6350,7 +6392,7 @@
  	# Following for sending reboot and wall messages
  	userdom_use_unpriv_users_ptys(sysadm_t)
  	userdom_use_unpriv_users_ttys(sysadm_t)
-@@ -227,6 +233,10 @@
+@@ -227,6 +250,10 @@
  	')
  
  	optional_policy(`
@@ -6361,7 +6403,7 @@
  		apache_run_helper(sysadm_t,sysadm_r,admin_terminal)
  		#apache_run_all_scripts(sysadm_t,sysadm_r)
  		#apache_domtrans_sys_script(sysadm_t)
-@@ -384,6 +394,10 @@
+@@ -384,6 +411,10 @@
  	')
  
  	optional_policy(`
@@ -6372,7 +6414,7 @@
  		netutils_run(sysadm_t,sysadm_r,admin_terminal)
  		netutils_run_ping(sysadm_t,sysadm_r,admin_terminal)
  		netutils_run_traceroute(sysadm_t,sysadm_r,admin_terminal)
-@@ -442,6 +456,9 @@
+@@ -442,6 +473,9 @@
  
  		ifdef(`enable_mls',`
  			userdom_security_admin_template(secadm_t,secadm_r,{ secadm_tty_device_t sysadm_devpts_t })
@@ -6382,7 +6424,7 @@
  		', `
  			userdom_security_admin_template(sysadm_t,sysadm_r,admin_terminal)
  		')
-@@ -494,15 +511,15 @@
+@@ -494,15 +528,15 @@
  	unconfined_alias_domain(sysadm_t)
  
  	# User home directory type.
@@ -6407,7 +6449,7 @@
  
  	# compatibility for switching from strict
  #	dominance { role secadm_r { role system_r; }}
-@@ -538,4 +555,9 @@
+@@ -538,4 +572,9 @@
  	optional_policy(`
  		samba_per_role_template(user)
  	')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -r1.439 -r1.440
--- selinux-policy.spec	19 Apr 2007 13:40:31 -0000	1.439
+++ selinux-policy.spec	19 Apr 2007 13:58:54 -0000	1.440
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.5.12
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -358,7 +358,7 @@
 %endif
 
 %changelog
-* Thu Apr 19 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-9
+* Thu Apr 19 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-10
 - MLS Fixes
 
 * Wed Apr 18 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-8



From fedora-cvs-commits at redhat.com  Thu Apr 19 17:32:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 19 Apr 2007 13:32:42 -0400
Subject: rpms/elfutils/FC-6 .cvsignore, 1.34, 1.35 elfutils-portability.patch,
	1.27, 1.28 elfutils-robustify.patch, 1.6, 1.7 elfutils.spec,
	1.79, 1.80 sources, 1.35, 1.36
Message-ID: <200704191732.l3JHWgbM030051@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/elfutils/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv29999

Modified Files:
	.cvsignore elfutils-portability.patch elfutils-robustify.patch 
	elfutils.spec sources 
Log Message:
Update to 0.127


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/elfutils/FC-6/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	6 Feb 2007 00:10:38 -0000	1.34
+++ .cvsignore	19 Apr 2007 17:32:40 -0000	1.35
@@ -1,3 +1,3 @@
-elfutils-0.126.tar.gz
 testfile16.symtab.bz2
 testfile16.symtab.debug.bz2
+elfutils-0.127.tar.gz

elfutils-portability.patch:
 ChangeLog            |   15 ++++++++
 Makefile.in          |    2 +
 backends/ChangeLog   |    8 ++++
 backends/Makefile.am |    6 ++-
 backends/Makefile.in |    8 ++--
 config/Makefile.in   |    2 +
 configure            |   90 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac         |   28 +++++++++++++++
 lib/ChangeLog        |    5 ++
 lib/Makefile.am      |    3 +
 lib/Makefile.in      |    6 ++-
 libasm/ChangeLog     |    5 ++
 libasm/Makefile.am   |    3 +
 libasm/Makefile.in   |    6 ++-
 libcpu/ChangeLog     |    5 ++
 libcpu/Makefile.am   |    3 +
 libcpu/Makefile.in   |    4 +-
 libdw/ChangeLog      |    5 ++
 libdw/Makefile.am    |    3 +
 libdw/Makefile.in    |    7 ++-
 libdwfl/ChangeLog    |    5 ++
 libdwfl/Makefile.am  |    3 +
 libdwfl/Makefile.in  |    6 ++-
 libebl/ChangeLog     |    5 ++
 libebl/Makefile.am   |    3 +
 libebl/Makefile.in   |    6 ++-
 libelf/ChangeLog     |    5 ++
 libelf/Makefile.am   |    6 ++-
 libelf/Makefile.in   |    8 ++--
 libelf/common.h      |    4 +-
 m4/Makefile.in       |    2 +
 src/ChangeLog        |   13 +++++++
 src/Makefile.am      |    3 +
 src/Makefile.in      |    6 ++-
 src/findtextrel.c    |    6 ++-
 src/strings.c        |    9 +++++
 src/strip.c          |   20 ++++++++++-
 tests/ChangeLog      |    5 ++
 tests/Makefile.am    |    5 +-
 tests/Makefile.in    |    6 ++-
 40 files changed, 301 insertions(+), 39 deletions(-)

Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/dist/rpms/elfutils/FC-6/elfutils-portability.patch,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- elfutils-portability.patch	6 Feb 2007 00:10:38 -0000	1.27
+++ elfutils-portability.patch	19 Apr 2007 17:32:40 -0000	1.28
@@ -1,6 +1,6 @@
 --- elfutils/backends/ChangeLog
 +++ elfutils/backends/ChangeLog
-@@ -130,6 +130,11 @@
+@@ -135,6 +135,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.
-@@ -152,6 +157,9 @@
+@@ -157,6 +162,9 @@
  	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
  	(CLEANFILES): Add libebl_$(m).so.
  
@@ -121,7 +121,7 @@
  	* configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.
 --- elfutils/config/Makefile.in
 +++ elfutils/config/Makefile.in
-@@ -84,6 +84,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -83,6 +83,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -129,7 +129,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -124,6 +125,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -123,6 +124,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -139,7 +139,7 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/configure
 +++ elfutils/configure
-@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.126'
+@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.127'
  PACKAGE_BUGREPORT='http://bugzilla.redhat.com/bugzilla/'
  
  ac_unique_file="libelf/libelf.h"
@@ -461,7 +461,7 @@
  libcpu_i386_a_SOURCES = i386_dis.c
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -329,6 +329,11 @@
+@@ -370,6 +370,11 @@
  
  2005-05-31  Roland McGrath  <roland at redhat.com>
  
@@ -525,7 +525,7 @@
  						       $(COMPILE)))
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -409,6 +409,11 @@
+@@ -474,6 +474,11 @@
  
  2005-07-21  Roland McGrath  <roland at redhat.com>
  
@@ -586,7 +586,7 @@
  
 --- elfutils/libebl/ChangeLog
 +++ elfutils/libebl/ChangeLog
-@@ -460,6 +460,11 @@
+@@ -465,6 +465,11 @@
  	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
  	tracking works right.
  
@@ -647,7 +647,7 @@
  
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -206,6 +206,11 @@
+@@ -221,6 +221,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
-@@ -76,6 +76,10 @@
+@@ -87,6 +87,10 @@
  	* elflint.c (valid_e_machine): Add EM_ALPHA.
  	Reported by Christian Aichinger <Greek0 at gmx.net>.
  
@@ -790,7 +790,7 @@
  2006-08-08  Ulrich Drepper  <drepper at redhat.com>
  
  	* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
-@@ -152,6 +156,10 @@
+@@ -163,6 +167,10 @@
  	* Makefile.am: Add hacks to create dependency files for non-generic
  	linker.
  
@@ -801,7 +801,7 @@
  2006-06-12  Ulrich Drepper  <drepper at redhat.com>
  
  	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -500,6 +508,11 @@
+@@ -511,6 +519,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -962,7 +962,7 @@
  cannot set access and modification date of '%s'"), fname);
 --- elfutils/tests/ChangeLog
 +++ elfutils/tests/ChangeLog
-@@ -449,6 +449,11 @@
+@@ -473,6 +473,11 @@
  	* Makefile.am (TESTS): Add run-elflint-test.sh.
  	(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
  
@@ -994,7 +994,7 @@
  endif
 --- elfutils/tests/Makefile.in
 +++ elfutils/tests/Makefile.in
-@@ -297,6 +297,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -310,6 +310,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -1002,7 +1002,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -337,6 +338,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -350,6 +351,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -1010,7 +1010,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -378,10 +380,10 @@ sbindir = @sbindir@
+@@ -391,10 +393,10 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@

elfutils-robustify.patch:
 libelf/elf32_getphdr.c        |   10 ++++
 libelf/elf32_getshdr.c        |   13 ++++-
 libelf/elf32_newphdr.c        |    6 ++
 libelf/elf32_updatefile.c     |    7 ++
 libelf/elf_begin.c            |   46 +++++++++++++++++-
 libelf/elf_getarsym.c         |    3 +
 libelf/elf_getshstrndx.c      |   38 +++++++++++++--
 libelf/elf_newscn.c           |   10 +++-
 libelf/gelf_getdyn.c          |    6 +-
 libelf/gelf_getlib.c          |    3 -
 libelf/gelf_getmove.c         |    3 -
 libelf/gelf_getrel.c          |   12 +---
 libelf/gelf_getrela.c         |   12 +---
 libelf/gelf_getsym.c          |    6 +-
 libelf/gelf_getsyminfo.c      |    3 -
 libelf/gelf_getsymshndx.c     |   10 ++--
 libelf/gelf_getversym.c       |    3 -
 libelf/gelf_update_dyn.c      |   12 +---
 libelf/gelf_update_lib.c      |    9 ---
 libelf/gelf_update_move.c     |    2 
 libelf/gelf_update_rel.c      |   12 +---
 libelf/gelf_update_rela.c     |   12 +---
 libelf/gelf_update_sym.c      |   12 +---
 libelf/gelf_update_syminfo.c  |    9 ---
 libelf/gelf_update_symshndx.c |   12 +---
 libelf/gelf_update_versym.c   |    2 
 libelf/libelfP.h              |    9 +++
 src/elflint.c                 |  103 +++++++++++++++++++++++++++++++-----------
 src/readelf.c                 |   92 ++++++++++++++++++++++++++-----------
 src/strip.c                   |   73 +++++++++++++++++++----------
 30 files changed, 383 insertions(+), 167 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.6 -r 1.7 elfutils-robustify.patch
Index: elfutils-robustify.patch
===================================================================
RCS file: /cvs/dist/rpms/elfutils/FC-6/elfutils-robustify.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- elfutils-robustify.patch	6 Feb 2007 00:10:38 -0000	1.6
+++ elfutils-robustify.patch	19 Apr 2007 17:32:40 -0000	1.7
@@ -65,757 +65,504 @@
 	(check_symtab, is_rel_dyn, check_rela, check_rel, check_dynamic,
 	check_symtab_shndx, check_hash, check_versym): Robustify.
 
---- elfutils-0.122/libelf/elf32_getphdr.c
-+++ elfutils-0.122/libelf/elf32_getphdr.c
-@@ -115,6 +115,16 @@ elfw2(LIBELFBITS,getphdr) (elf)
+--- elfutils-0.127/src/readelf.c.robustify
++++ elfutils-0.127/src/readelf.c
+@@ -958,6 +958,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
+   Elf32_Word *grpref = (Elf32_Word *) data->d_buf;
  
-       if (elf->map_address != NULL)
- 	{
-+	  /* First see whether the information in the ELF header is
-+	     valid and it does not ask for too much.  */
-+	  if (unlikely (ehdr->e_phoff >= elf->maximum_size)
-+	      || unlikely (ehdr->e_phoff + size > elf->maximum_size))
-+	    {
-+	      /* Something is wrong.  */
-+	      __libelf_seterrno (ELF_E_INVALID_PHDR);
-+	      goto out;
-+	    }
+   GElf_Sym sym_mem;
++  GElf_Sym *sym = gelf_getsym (symdata, shdr->sh_info, &sym_mem);
 +
- 	  /* All the data is already mapped.  Use it.  */
- 	  if (ehdr->e_ident[EI_DATA] == MY_ELFDATA
- 	      && (ALLOW_UNALIGNED
---- elfutils-0.126/libelf/elf32_getshdr.c
-+++ elfutils-0.126/libelf/elf32_getshdr.c
-@@ -101,7 +101,8 @@ elfw2(LIBELFBITS,getshdr) (scn)
- 	goto out;
- 
-       size_t shnum;
--      if (INTUSE (elf_getshnum) (elf, &shnum) != 0)
-+      if (INTUSE (elf_getshnum) (elf, &shnum) != 0
-+	  || shnum > SIZE_MAX / sizeof (ElfW2(LIBELFBITS,Shdr)))
- 	goto out;
-       size_t size = shnum * sizeof (ElfW2(LIBELFBITS,Shdr));
+   printf ((grpref[0] & GRP_COMDAT)
+ 	  ? ngettext ("\
+ \nCOMDAT section group [%2zu] '%s' with signature '%s' contains %zu entry:\n",
+@@ -970,8 +972,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
+ 		      data->d_size / sizeof (Elf32_Word) - 1),
+ 	  elf_ndxscn (scn),
+ 	  elf_strptr (ebl->elf, shstrndx, shdr->sh_name),
+-	  elf_strptr (ebl->elf, symshdr->sh_link,
+-		      gelf_getsym (symdata, shdr->sh_info, &sym_mem)->st_name)
++	  (sym == NULL ? NULL
++	   : elf_strptr (ebl->elf, symshdr->sh_link, sym->st_name))
+ 	  ?: gettext ("<INVALID SYMBOL>"),
+ 	  data->d_size / sizeof (Elf32_Word) - 1);
  
-@@ -118,6 +119,16 @@ elfw2(LIBELFBITS,getshdr) (scn)
+@@ -1122,7 +1124,8 @@ static void
+ handle_dynamic (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr)
+ {
+   int class = gelf_getclass (ebl->elf);
+-  GElf_Shdr glink;
++  GElf_Shdr glink_mem;
++  GElf_Shdr *glink;
+   Elf_Data *data;
+   size_t cnt;
+   size_t shstrndx;
+@@ -1137,6 +1140,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, 
+     error (EXIT_FAILURE, 0,
+ 	   gettext ("cannot get section header string table index"));
  
-       if (elf->map_address != NULL)
- 	{
-+	  /* First see whether the information in the ELF header is
-+	     valid and it does not ask for too much.  */
-+	  if (unlikely (ehdr->e_shoff >= elf->maximum_size)
-+	      || unlikely (ehdr->e_shoff + size > elf->maximum_size))
-+	    {
-+	      /* Something is wrong.  */
-+	      __libelf_seterrno (ELF_E_INVALID_SECTION_HEADER);
-+	      goto free_and_out;
-+	    }
++  glink = gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link), &glink_mem);
++  if (glink == NULL)
++    error (EXIT_FAILURE, 0, gettext ("invalid sh_link value in section %Zu"),
++	   elf_ndxscn (scn));
 +
- 	  ElfW2(LIBELFBITS,Shdr) *notcvt;
+   printf (ngettext ("\
+ \nDynamic segment contains %lu entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
+ 		    "\
+@@ -1146,9 +1154,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn, 
+ 	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
+ 	  shdr->sh_offset,
+ 	  (int) shdr->sh_link,
+-	  elf_strptr (ebl->elf, shstrndx,
+-		      gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link),
+-				    &glink)->sh_name));
++	  elf_strptr (ebl->elf, shstrndx, glink->sh_name));
+   fputs_unlocked (gettext ("  Type              Value\n"), stdout);
  
- 	  /* All the data is already mapped.  If we could use it
-
---- elfutils-0.122/libelf/elf32_newphdr.c
-+++ elfutils-0.122/libelf/elf32_newphdr.c
-@@ -124,6 +124,12 @@ elfw2(LIBELFBITS,newphdr) (elf, count)
-   else if (elf->state.ELFW(elf,LIBELFBITS).ehdr->e_phnum != count
- 	   || elf->state.ELFW(elf,LIBELFBITS).phdr == NULL)
-     {
-+      if (unlikely (count > SIZE_MAX / sizeof (ElfW2(LIBELFBITS,Phdr))))
-+	{
-+	  result = NULL;
-+	  goto out;
-+	}
-+
-       /* Allocate a new program header with the appropriate number of
- 	 elements.  */
-       result = (ElfW2(LIBELFBITS,Phdr) *)
---- elfutils-0.122/libelf/elf32_updatefile.c
-+++ elfutils-0.122/libelf/elf32_updatefile.c
-@@ -201,6 +201,9 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf
-   /* Write all the sections.  Well, only those which are modified.  */
-   if (shnum > 0)
-     {
-+      if (unlikely (shnum > SIZE_MAX / sizeof (Elf_Scn *)))
-+ 	return 1;
+   for (cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)
+@@ -1666,6 +1672,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
+     error (EXIT_FAILURE, 0,
+ 	   gettext ("cannot get section header string table index"));
+ 
++  GElf_Shdr glink_mem;
++  GElf_Shdr *glink = gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link),
++				   &glink_mem);
++  if (glink == NULL)
++    error (EXIT_FAILURE, 0, gettext ("invalid sh_link value in section %Zu"),
++	   elf_ndxscn (scn));
 +
-       Elf_ScnList *list = &elf->state.ELFW(elf,LIBELFBITS).scns;
-       Elf_Scn **scns = (Elf_Scn **) alloca (shnum * sizeof (Elf_Scn *));
-       char *const shdr_start = ((char *) elf->map_address + elf->start_offset
-@@ -571,6 +574,10 @@ __elfw2(LIBELFBITS,updatefile) (Elf *elf
-   /* Write all the sections.  Well, only those which are modified.  */
-   if (shnum > 0)
-     {
-+      if (unlikely (shnum > SIZE_MAX / (sizeof (Elf_Scn *)
-+					+ sizeof (ElfW2(LIBELFBITS,Shdr)))))
-+	return 1;
+   /* Now we can compute the number of entries in the section.  */
+   unsigned int nsyms = data->d_size / (class == ELFCLASS32
+ 				       ? sizeof (Elf32_Sym)
+@@ -1676,15 +1689,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
+ 		    nsyms),
+ 	  (unsigned int) elf_ndxscn (scn),
+ 	  elf_strptr (ebl->elf, shstrndx, shdr->sh_name), nsyms);
+-  GElf_Shdr glink;
+   printf (ngettext (" %lu local symbol  String table: [%2u] '%s'\n",
+ 		    " %lu local symbols  String table: [%2u] '%s'\n",
+ 		    shdr->sh_info),
+ 	  (unsigned long int) shdr->sh_info,
+ 	  (unsigned int) shdr->sh_link,
+-	  elf_strptr (ebl->elf, shstrndx,
+-		      gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link),
+-				    &glink)->sh_name));
++	  elf_strptr (ebl->elf, shstrndx, glink->sh_name));
+ 
+   fputs_unlocked (class == ELFCLASS32
+ 		  ? gettext ("\
+@@ -1920,7 +1930,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, 
+     error (EXIT_FAILURE, 0,
+ 	   gettext ("cannot get section header string table index"));
+ 
+-  GElf_Shdr glink;
++  GElf_Shdr glink_mem;
++  GElf_Shdr *glink = gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link),
++				   &glink_mem);
++  if (glink == NULL)
++    error (EXIT_FAILURE, 0, gettext ("invalid sh_link value in section %Zu"),
++	   elf_ndxscn (scn));
 +
-       off_t shdr_offset = elf->start_offset + ehdr->e_shoff;
- #if EV_NUM != 2
-       xfct_t shdr_fctp = __elf_xfctstom[__libelf_version - 1][EV_CURRENT - 1][ELFW(ELFCLASS, LIBELFBITS) - 1][ELF_T_SHDR];
---- elfutils-0.122/libelf/elf_begin.c
-+++ elfutils-0.122/libelf/elf_begin.c
-@@ -155,7 +155,8 @@ get_shnum (void *map_address, unsigned c
+   printf (ngettext ("\
+ \nVersion needs section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
+ 		    "\
+@@ -1931,9 +1947,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn, 
+ 	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
+ 	  shdr->sh_offset,
+ 	  (unsigned int) shdr->sh_link,
+-	  elf_strptr (ebl->elf, shstrndx,
[...2181 lines suppressed...]
+-      if (unlikely ((ndx + 1) * sizeof (Elf32_Rel) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf32_Rel)
++	  || unlikely ((ndx + 1) * sizeof (Elf32_Rel) > data_scn->d.d_size))
+ 	{
+ 	  __libelf_seterrno (ELF_E_INVALID_INDEX);
+ 	  goto out;
+@@ -114,7 +109,8 @@ gelf_update_rel (Elf_Data *dst, int ndx,
+   else
+     {
+       /* Check whether we have to resize the data buffer.  */
+-      if (unlikely ((ndx + 1) * sizeof (Elf64_Rel) > data_scn->d.d_size))
++      if (INVALID_NDX (ndx, Elf64_Rel)
++	  || unlikely ((ndx + 1) * sizeof (Elf64_Rel) > data_scn->d.d_size))
+ 	{
+ 	  __libelf_seterrno (ELF_E_INVALID_INDEX);
+ 	  goto out;
+--- elfutils-0.127/libelf/elf_newscn.c.robustify
++++ elfutils-0.127/libelf/elf_newscn.c
+@@ -104,10 +104,18 @@ elf_newscn (elf)
+   else
+     {
+       /* We must allocate a new element.  */
+-      Elf_ScnList *newp;
++      Elf_ScnList *newp = NULL;
  
- 		if (destidx != inner)
-@@ -1371,11 +1396,11 @@ handle_elf (int fd, Elf *elf, const char
- 		    {
- 		      GElf_Sym sym_mem;
- 		      GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem);
--		      assert (sym != NULL);
-+		      elf_assert (sym != NULL);
+       assert (elf->state.elf.scnincr > 0);
  
- 		      const char *name = elf_strptr (elf, strshndx,
- 						     sym->st_name);
--		      assert (name != NULL);
-+		      elf_assert (name != NULL);
- 		      size_t hidx = elf_hash (name) % nbucket;
++      if (
++#if SIZE_MAX <= 4294967295U
++	  likely (elf->state.elf.scnincr
++		  < SIZE_MAX / 2 / sizeof (Elf_Scn) - sizeof (Elf_ScnList))
++#else
++	  1
++#endif
++	  )
+       newp = (Elf_ScnList *) calloc (sizeof (Elf_ScnList)
+ 				     + ((elf->state.elf.scnincr *= 2)
+ 					* sizeof (Elf_Scn)), 1);
+--- elfutils-0.127/libelf/gelf_update_lib.c.robustify
++++ elfutils-0.127/libelf/gelf_update_lib.c
+@@ -68,12 +68,6 @@ gelf_update_lib (data, ndx, src)
+   if (data == NULL)
+     return 0;
  
- 		      if (bucket[hidx] == 0)
-@@ -1394,7 +1419,7 @@ handle_elf (int fd, Elf *elf, const char
+-  if (unlikely (ndx < 0))
+-    {
+-      __libelf_seterrno (ELF_E_INVALID_INDEX);
+-      return 0;
+-    }
+-
+   Elf_Data_Scn *data_scn = (Elf_Data_Scn *) data;
+   if (unlikely (data_scn->d.d_type != ELF_T_LIB))
+     {
+@@ -87,7 +81,8 @@ gelf_update_lib (data, ndx, src)
+ 
+   /* Check whether we have to resize the data buffer.  */
+   int result = 0;
+-  if (unlikely ((ndx + 1) * sizeof (Elf64_Lib) > data_scn->d.d_size))
++  if (INVALID_NDX (ndx, Elf64_Lib)
++      || unlikely ((ndx + 1) * sizeof (Elf64_Lib) > data_scn->d.d_size))
+     __libelf_seterrno (ELF_E_INVALID_INDEX);
+   else
+     {
+--- elfutils-0.127/libelf/elf_getshstrndx.c.robustify
++++ elfutils-0.127/libelf/elf_getshstrndx.c
+@@ -125,10 +125,25 @@ elf_getshstrndx (elf, dst)
+ 	      if (elf->map_address != NULL
+ 		  && elf->state.elf32.ehdr->e_ident[EI_DATA] == MY_ELFDATA
+ 		  && (ALLOW_UNALIGNED
+-		      || (((size_t) ((char *) elf->map_address + offset))
++		      || (((size_t) ((char *) elf->map_address
++			   + elf->start_offset + offset))
+ 			  & (__alignof__ (Elf32_Shdr) - 1)) == 0))
++		{
++		  /* First see whether the information in the ELF header is
++		     valid and it does not ask for too much.  */
++		  if (unlikely (offset + sizeof (Elf32_Shdr)
++				> elf->maximum_size))
++		    {
++		      /* Something is wrong.  */
++		      __libelf_seterrno (ELF_E_INVALID_SECTION_HEADER);
++		      result = -1;
++		      goto out;
++		    }
++
+ 		/* We can directly access the memory.  */
+-		num = ((Elf32_Shdr *) (elf->map_address + offset))->sh_link;
++		  num = ((Elf32_Shdr *) (elf->map_address + elf->start_offset
++					 + offset))->sh_link;
++		}
  	      else
  		{
- 		  /* Alpha and S390 64-bit use 64-bit SHT_HASH entries.  */
--		  assert (shdr_info[cnt].shdr.sh_entsize
-+		  elf_assert (shdr_info[cnt].shdr.sh_entsize
- 			  == sizeof (Elf64_Xword));
+ 		  /* We avoid reading in all the section headers.  Just read
+@@ -163,10 +178,25 @@ elf_getshstrndx (elf, dst)
+ 	      if (elf->map_address != NULL
+ 		  && elf->state.elf64.ehdr->e_ident[EI_DATA] == MY_ELFDATA
+ 		  && (ALLOW_UNALIGNED
+-		      || (((size_t) ((char *) elf->map_address + offset))
++		      || (((size_t) ((char *) elf->map_address
++			   + elf->start_offset + offset))
+ 			  & (__alignof__ (Elf64_Shdr) - 1)) == 0))
++		{
++		  /* First see whether the information in the ELF header is
++		     valid and it does not ask for too much.  */
++		  if (unlikely (offset + sizeof (Elf64_Shdr)
++				> elf->maximum_size))
++		    {
++		      /* Something is wrong.  */
++		      __libelf_seterrno (ELF_E_INVALID_SECTION_HEADER);
++		      result = -1;
++		      goto out;
++		    }
++
+ 		/* We can directly access the memory.  */
+-		num = ((Elf64_Shdr *) (elf->map_address + offset))->sh_link;
++		  num = ((Elf64_Shdr *) (elf->map_address
++			 + elf->start_offset + offset))->sh_link;
++		}
+ 	      else
+ 		{
+ 		  /* We avoid reading in all the section headers.  Just read
+--- elfutils-0.127/libelf/elf32_getshdr.c.robustify
++++ elfutils-0.127/libelf/elf32_getshdr.c
+@@ -101,7 +101,8 @@ elfw2(LIBELFBITS,getshdr) (scn)
+ 	goto out;
  
- 		  Elf64_Xword *bucket = (Elf64_Xword *) hashd->d_buf;
-@@ -1428,11 +1453,11 @@ handle_elf (int fd, Elf *elf, const char
- 		    {
- 		      GElf_Sym sym_mem;
- 		      GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem);
--		      assert (sym != NULL);
-+		      elf_assert (sym != NULL);
+       size_t shnum;
+-      if (INTUSE (elf_getshnum) (elf, &shnum) != 0)
++      if (INTUSE (elf_getshnum) (elf, &shnum) != 0
++	  || shnum > SIZE_MAX / sizeof (ElfW2(LIBELFBITS,Shdr)))
+ 	goto out;
+       size_t size = shnum * sizeof (ElfW2(LIBELFBITS,Shdr));
  
- 		      const char *name = elf_strptr (elf, strshndx,
- 						     sym->st_name);
--		      assert (name != NULL);
-+		      elf_assert (name != NULL);
- 		      size_t hidx = elf_hash (name) % nbucket;
+@@ -118,6 +119,16 @@ elfw2(LIBELFBITS,getshdr) (scn)
  
- 		      if (bucket[hidx] == 0)
+       if (elf->map_address != NULL)
+ 	{
++	  /* First see whether the information in the ELF header is
++	     valid and it does not ask for too much.  */
++	  if (unlikely (ehdr->e_shoff >= elf->maximum_size)
++	      || unlikely (ehdr->e_shoff + size > elf->maximum_size))
++	    {
++	      /* Something is wrong.  */
++	      __libelf_seterrno (ELF_E_INVALID_SECTION_HEADER);
++	      goto free_and_out;
++	    }
++
+ 	  ElfW2(LIBELFBITS,Shdr) *notcvt;
+ 
+ 	  /* All the data is already mapped.  If we could use it
+--- elfutils-0.127/libelf/elf32_getphdr.c.robustify
++++ elfutils-0.127/libelf/elf32_getphdr.c
+@@ -116,6 +116,16 @@ elfw2(LIBELFBITS,getphdr) (elf)
+ 
+       if (elf->map_address != NULL)
+ 	{
++	  /* First see whether the information in the ELF header is
++	     valid and it does not ask for too much.  */
++	  if (unlikely (ehdr->e_phoff >= elf->maximum_size)
++	      || unlikely (ehdr->e_phoff + size > elf->maximum_size))
++	    {
++	      /* Something is wrong.  */
++	      __libelf_seterrno (ELF_E_INVALID_PHDR);
++	      goto out;
++	    }
++
+ 	  /* All the data is already mapped.  Use it.  */
+ 	  void *file_phdr = ((char *) elf->map_address
+ 			     + elf->start_offset + ehdr->e_phoff);


Index: elfutils.spec
===================================================================
RCS file: /cvs/dist/rpms/elfutils/FC-6/elfutils.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- elfutils.spec	6 Feb 2007 00:10:38 -0000	1.79
+++ elfutils.spec	19 Apr 2007 17:32:40 -0000	1.80
@@ -1,4 +1,4 @@
-%define eu_version 0.126
+%define eu_version 0.127
 %define eu_release 1
 
 %if %{?_with_compat:1}%{!?_with_compat:0}
@@ -14,7 +14,7 @@
 %define separate_devel_static 1
 %endif
 
-Summary: A collection of utilities and DSOs to handle compiled objects.
+Summary: A collection of utilities and DSOs to handle compiled objects
 Name: elfutils
 Version: %{eu_version}
 %if !%{compat}
@@ -35,9 +35,7 @@
 Source2: testfile16.symtab.bz2
 Source3: testfile16.symtab.debug.bz2
 
-# ExcludeArch: xxx
-
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: bison >= 1.875
 BuildRequires: flex >= 2.5.4a
 BuildRequires: bzip2
@@ -146,8 +144,8 @@
 Conflicts: elfutils-libelf-devel > %{version}-%{release}
 
 %description libelf-devel-static
-The elfutils-libelf-devel-static package contains
-the static archive for libelf.
+The elfutils-libelf-static package contains the static archive
+for libelf.
 
 %prep
 %setup -q
@@ -182,9 +180,7 @@
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}%{_prefix}
-
-%makeinstall
+make -s install DESTDIR=${RPM_BUILD_ROOT}
 
 chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/lib*.so*
 chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/elfutils/lib*.so*
@@ -200,7 +196,7 @@
 }
 
 %check
-make check
+make -s check
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -271,6 +267,12 @@
 %{_libdir}/libelf.a
 
 %changelog
+* Wed Apr 18 2007 Roland McGrath <roland at redhat.com> - 0.127-1
+- Update to 0.127
+  - libdw: new function dwarf_getsrcdirs
+  - libdwfl: new functions dwfl_module_addrsym, dwfl_report_begin_add,
+	     dwfl_module_address_section
+
 * Mon Feb  5 2007 Roland McGrath <roland at redhat.com> - 0.126-1
 - Update to 0.126
   - New program eu-ar.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/elfutils/FC-6/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	6 Feb 2007 00:10:39 -0000	1.35
+++ sources	19 Apr 2007 17:32:40 -0000	1.36
@@ -1,3 +1,3 @@
 07a924423a05b1bf6d0f9fe8b35dbe6b  testfile16.symtab.bz2
 bd40d1aaca8eaf1c7aea54bf4b29bda2  testfile16.symtab.debug.bz2
-573db6e31f37b4af8b17138371b0c5f2  elfutils-0.126.tar.gz
+905411e1deda0aee17ae99dbdeaf7506  elfutils-0.127.tar.gz



From fedora-cvs-commits at redhat.com  Fri Apr 20 01:38:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 19 Apr 2007 21:38:49 -0400
Subject: rpms/pygobject2/FC-6 pygobject-2.12.3-memory-leak.patch, NONE,
	1.1 pygobject2.spec, 1.21, 1.22 pygobject-2.11.4-docs.patch,
	1.1, NONE
Message-ID: <200704200138.l3K1cnrQ002671@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/pygobject2/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv2654

Modified Files:
	pygobject2.spec 
Added Files:
	pygobject-2.12.3-memory-leak.patch 
Removed Files:
	pygobject-2.11.4-docs.patch 
Log Message:

* Thu Apr 19 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.3-2.fc6
- Add patch for RH bug #237179 (memory leak).


pygobject-2.12.3-memory-leak.patch:
 pygflags.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE pygobject-2.12.3-memory-leak.patch ---
--- pygobject-2.12.3/gobject/pygflags.c.memory-leak	2007-04-19 21:29:49.000000000 -0400
+++ pygobject-2.12.3/gobject/pygflags.c	2007-04-19 21:30:33.000000000 -0400
@@ -176,7 +176,9 @@
     retval = PyDict_GetItem(values, pyint);
     Py_DECREF(pyint);
 
-    if (!retval) {
+    if (retval) {
+	Py_INCREF(retval);
+    } else {
 	PyErr_Clear();
 
 	retval = ((PyTypeObject *)pyclass)->tp_alloc((PyTypeObject *)pyclass, 0);
@@ -186,7 +188,6 @@
 	((PyGFlags*)retval)->gtype = gtype;
     } 
 
-    Py_INCREF(retval);
     return retval;
 }
 


Index: pygobject2.spec
===================================================================
RCS file: /cvs/dist/rpms/pygobject2/FC-6/pygobject2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- pygobject2.spec	18 Nov 2006 19:23:54 -0000	1.21
+++ pygobject2.spec	20 Apr 2007 01:38:47 -0000	1.22
@@ -4,7 +4,7 @@
 
 Name: pygobject2
 Version: 2.12.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: Development/Languages
 Summary: Python bindings for GObject
@@ -12,6 +12,11 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Source: pygobject-%{version}.tar.bz2
 
+### Patches ###
+
+# RH bug #237179 / GNOME bug #428726
+Patch1: pygobject-2.12.3-memory-leak.patch
+
 ### Dependencies ###
 
 Requires: glib2 >= 2.8
@@ -49,6 +54,7 @@
 
 %prep
 %setup -q -n pygobject-%{version}
+%patch1 -p1 -b .memory-leak
 
 %build
 %configure --enable-thread --disable-docs
@@ -91,6 +97,9 @@
 %{_datadir}/pygobject/xsl
 
 %changelog
+* Thu Apr 19 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.3-2.fc6
+- Add patch for RH bug #237179 (memory leak).
+
 * Sat Nov 18 2006 Matthew Barnes <mbarnes at redhat.com> - 2.12.3-1.fc6
 - Update to 2.12.3
 


--- pygobject-2.11.4-docs.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 20 12:46:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 08:46:18 -0400
Subject: rpms/dovecot/FC-6 dovecot.spec,1.66,1.67
Message-ID: <200704201246.l3KCkIu4020197@cvs.devel.redhat.com>

Author: tjanouse

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

Modified Files:
	dovecot.spec 
Log Message:
* Fri Apr 20 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0.0-3
- merge from devel:
    - dovecot-1.0.beta2-pam-tty.patch is no longer needed
    - update to latest upstream (1.0.0)
    - update to latest upstream (1.0.rc31)
    - update to latest upstream (1.0.rc30)



Index: dovecot.spec
===================================================================
RCS file: /cvs/dist/rpms/dovecot/FC-6/dovecot.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- dovecot.spec	30 Mar 2007 12:04:12 -0000	1.66
+++ dovecot.spec	20 Apr 2007 12:46:16 -0000	1.67
@@ -1,6 +1,8 @@
-%define pkg_version 1.0
-%define my_release 2
-%define pkg_release %{my_release}.rc28%{?dist}
+%define upstream 1.0.0
+%define sieve_upstream 1.0.1
+%define pkg_version 1.0.0
+%define my_release 3
+%define pkg_release %{my_release}%{?dist}
 %define pkg_sieve_version 1.0.1
 %define pkg_sieve_release %{my_release}%{?dist}
 
@@ -13,11 +15,9 @@
 
 %define build_postgres 1
 %define build_mysql 1
-%define upstream 1.0.rc28
 
 %define build_sieve 0
 %define sieve_name dovecot-sieve
-%define sieve_upstream 1.0.1
 
 Source: http://dovecot.org/releases/%{name}-%{upstream}.tar.gz
 Source1: dovecot.init
@@ -29,7 +29,7 @@
 Source7: dovecot-REDHAT-FAQ.txt
 Source8: http://dovecot.org/releases/sieve/%{sieve_name}-%{sieve_upstream}.tar.gz
 Patch100: dovecot-1.0.rc15-default-settings.patch
-Patch101: dovecot-1.0.beta2-pam-tty.patch
+#Patch101: dovecot-1.0.beta2-pam-tty.patch
 Patch102: dovecot-1.0.rc2-pam-setcred.patch
 Patch103: dovecot-1.0.beta2-mkcert-permissions.patch
 # 104 not applied
@@ -102,7 +102,7 @@
 %setup -q -n %{name}-%{upstream}
 
 %patch100 -p1 -b .default-settings
-%patch101 -p2 -b .pam-tty
+#%patch101 -p2 -b .pam-tty
 %patch102 -p1 -b .pam-setcred
 %patch103 -p1 -b .mkcert-permissions
 #%patch104 -p1 -b .lib64
@@ -295,6 +295,13 @@
 
 
 %changelog
+* Fri Apr 20 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0.0-3
+- merge from devel:
+    - dovecot-1.0.beta2-pam-tty.patch is no longer needed
+    - update to latest upstream (1.0.0)
+    - update to latest upstream (1.0.rc31)
+    - update to latest upstream (1.0.rc30)
+
 * Fri Mar 30 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0-2.rc28
 - merge from devel:
     - spec file cleanup (fixes docs path)



From fedora-cvs-commits at redhat.com  Fri Apr 20 12:52:56 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 08:52:56 -0400
Subject: rpms/dovecot/FC-6 .cvsignore,1.17,1.18 sources,1.18,1.19
Message-ID: <200704201252.l3KCquLg024978@cvs.devel.redhat.com>

Author: tjanouse

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

Modified Files:
	.cvsignore sources 
Log Message:
Forgot to merge cvsignore and sources.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dovecot/FC-6/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	30 Mar 2007 09:27:07 -0000	1.17
+++ .cvsignore	20 Apr 2007 12:52:54 -0000	1.18
@@ -1,4 +1,4 @@
-dovecot-1.0.rc28.tar.gz
-dovecot-1.0.rc28.tar.gz.sig
+dovecot-1.0.0.tar.gz
+dovecot-1.0.0.tar.gz.sig
 dovecot-sieve-1.0.1.tar.gz
 dovecot-sieve-1.0.1.tar.gz.sig


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dovecot/FC-6/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	30 Mar 2007 09:27:07 -0000	1.18
+++ sources	20 Apr 2007 12:52:54 -0000	1.19
@@ -1,4 +1,4 @@
-e6fd617f3210f914815186c176796881  dovecot-1.0.rc28.tar.gz
-a3198c2db6b43472bc3afdd51e538711  dovecot-1.0.rc28.tar.gz.sig
+65ccc71e66c495c536d8fb8a7ae39bb3  dovecot-1.0.0.tar.gz
+621f2d7bd2099b729e689bf35dcd30e8  dovecot-1.0.0.tar.gz.sig
 b070d2177009bb555cd7e25c710047d5  dovecot-sieve-1.0.1.tar.gz
 c9f5a39ef66e427968141f265c879d60  dovecot-sieve-1.0.1.tar.gz.sig



From fedora-cvs-commits at redhat.com  Fri Apr 20 15:31:22 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 11:31:22 -0400
Subject: rpms/selinux-policy/FC-6 policy-20061106.patch, 1.37,
	1.38 policy-apcupsd.patch, 1.2, 1.3 selinux-policy.spec, 1.361,
	1.362
Message-ID: <200704201531.l3KFVML6012009@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20061106.patch policy-apcupsd.patch selinux-policy.spec 
Log Message:
* Fri Apr 20 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-62
- Revert patch to stop secadm and sysadm from having audit_control
Resolves: #236855
- Allow clamav to create pid files in amavis_var_run
- Allow apcupsd to send itselef signals


policy-20061106.patch:
 Rules.modular                                |   10 
 config/appconfig-strict-mcs/seusers          |    1 
 config/appconfig-strict-mls/default_contexts |    6 
 config/appconfig-strict-mls/seusers          |    1 
 config/appconfig-strict/seusers              |    1 
 man/man8/kerberos_selinux.8                  |    2 
 policy/flask/access_vectors                  |    2 
 policy/global_tunables                       |   89 ++++
 policy/mls                                   |   31 +
 policy/modules/admin/acct.te                 |    1 
 policy/modules/admin/amanda.if               |   17 
 policy/modules/admin/amanda.te               |    6 
 policy/modules/admin/amtu.fc                 |    3 
 policy/modules/admin/amtu.if                 |   57 ++
 policy/modules/admin/amtu.te                 |   56 ++
 policy/modules/admin/backup.te               |    5 
 policy/modules/admin/bootloader.fc           |    5 
 policy/modules/admin/bootloader.te           |   14 
 policy/modules/admin/consoletype.te          |   21 
 policy/modules/admin/ddcprobe.te             |   10 
 policy/modules/admin/dmesg.te                |    7 
 policy/modules/admin/dmidecode.te            |    5 
 policy/modules/admin/firstboot.if            |    6 
 policy/modules/admin/kudzu.te                |   14 
 policy/modules/admin/logrotate.te            |    5 
 policy/modules/admin/logwatch.te             |   12 
 policy/modules/admin/netutils.te             |   13 
 policy/modules/admin/portage.te              |    5 
 policy/modules/admin/prelink.te              |   18 
 policy/modules/admin/quota.fc                |    7 
 policy/modules/admin/quota.te                |   24 -
 policy/modules/admin/rpm.fc                  |    3 
 policy/modules/admin/rpm.if                  |   43 ++
 policy/modules/admin/rpm.te                  |   49 --
 policy/modules/admin/su.if                   |   28 -
 policy/modules/admin/su.te                   |    2 
 policy/modules/admin/sudo.if                 |   10 
 policy/modules/admin/tripwire.te             |   11 
 policy/modules/admin/usbmodules.te           |    5 
 policy/modules/admin/usermanage.if           |    2 
 policy/modules/admin/usermanage.te           |   42 +
 policy/modules/admin/vpn.te                  |    1 
 policy/modules/apps/ethereal.te              |    5 
 policy/modules/apps/evolution.if             |  107 ++++
 policy/modules/apps/evolution.te             |    1 
 policy/modules/apps/games.fc                 |    1 
 policy/modules/apps/gnome.fc                 |    2 
 policy/modules/apps/gnome.if                 |  108 ++++-
 policy/modules/apps/gnome.te                 |    5 
 policy/modules/apps/gpg.if                   |    1 
 policy/modules/apps/java.fc                  |    2 
 policy/modules/apps/java.if                  |   38 +
 policy/modules/apps/java.te                  |    2 
 policy/modules/apps/loadkeys.if              |   17 
 policy/modules/apps/mozilla.if               |  210 ++++++++-
 policy/modules/apps/mplayer.if               |   84 +++
 policy/modules/apps/mplayer.te               |    1 
 policy/modules/apps/slocate.te               |    3 
 policy/modules/apps/thunderbird.if           |   81 +++
 policy/modules/apps/userhelper.if            |   19 
 policy/modules/apps/webalizer.te             |    6 
 policy/modules/apps/wine.fc                  |    1 
 policy/modules/apps/yam.te                   |    5 
 policy/modules/kernel/corecommands.fc        |   19 
 policy/modules/kernel/corecommands.if        |   77 +++
 policy/modules/kernel/corenetwork.if.in      |  140 ++++++
 policy/modules/kernel/corenetwork.te.in      |   14 
 policy/modules/kernel/devices.fc             |    8 
 policy/modules/kernel/devices.if             |   18 
 policy/modules/kernel/devices.te             |    8 
 policy/modules/kernel/domain.if              |   58 ++
 policy/modules/kernel/domain.te              |   22 +
 policy/modules/kernel/files.fc               |    2 
 policy/modules/kernel/files.if               |  224 ++++++++++
 policy/modules/kernel/filesystem.if          |   62 ++
 policy/modules/kernel/filesystem.te          |   20 
 policy/modules/kernel/kernel.if              |   84 +++
 policy/modules/kernel/kernel.te              |   22 -
 policy/modules/kernel/mls.if                 |   28 +
 policy/modules/kernel/mls.te                 |    6 
 policy/modules/kernel/storage.fc             |    3 
 policy/modules/kernel/storage.if             |    2 
 policy/modules/kernel/terminal.fc            |    1 
 policy/modules/kernel/terminal.if            |    2 
 policy/modules/kernel/terminal.te            |    1 
 policy/modules/services/aide.fc              |    3 
 policy/modules/services/aide.te              |    8 
 policy/modules/services/amavis.if            |   19 
 policy/modules/services/amavis.te            |    2 
 policy/modules/services/apache.fc            |   17 
 policy/modules/services/apache.if            |   22 -
 policy/modules/services/apache.te            |   43 +-
 policy/modules/services/apm.te               |    3 
 policy/modules/services/automount.fc         |    1 
 policy/modules/services/automount.te         |    9 
 policy/modules/services/avahi.if             |   40 +
 policy/modules/services/bind.fc              |    1 
 policy/modules/services/bind.te              |    5 
 policy/modules/services/bluetooth.te         |    8 
 policy/modules/services/ccs.fc               |    1 
 policy/modules/services/ccs.te               |   11 
 policy/modules/services/clamav.te            |    3 
 policy/modules/services/cron.fc              |    6 
 policy/modules/services/cron.if              |   92 ++--
 policy/modules/services/cron.te              |   52 ++
 policy/modules/services/cups.fc              |    3 
 policy/modules/services/cups.te              |   13 
 policy/modules/services/cvs.te               |    1 
 policy/modules/services/cyrus.te             |    5 
 policy/modules/services/dbus.fc              |    1 
 policy/modules/services/dbus.if              |   62 ++
 policy/modules/services/dcc.te               |    9 
 policy/modules/services/dhcp.te              |    2 
 policy/modules/services/dovecot.te           |    6 
 policy/modules/services/ftp.te               |   18 
 policy/modules/services/hal.fc               |    4 
 policy/modules/services/hal.if               |   57 ++
 policy/modules/services/hal.te               |   22 -
 policy/modules/services/inetd.te             |   28 +
 policy/modules/services/irqbalance.te        |    4 
 policy/modules/services/kerberos.if          |   25 +
 policy/modules/services/kerberos.te          |   15 
 policy/modules/services/ktalk.fc             |    3 
 policy/modules/services/ktalk.te             |    5 
 policy/modules/services/lpd.if               |   57 +-
 policy/modules/services/lpd.te               |    5 
 policy/modules/services/mailman.if           |   20 
 policy/modules/services/mta.fc               |    1 
 policy/modules/services/mta.if               |   20 
 policy/modules/services/mta.te               |    2 
 policy/modules/services/munin.te             |    5 
 policy/modules/services/networkmanager.fc    |    2 
 policy/modules/services/networkmanager.te    |    2 
 policy/modules/services/nis.fc               |    3 
 policy/modules/services/nis.if               |    8 
 policy/modules/services/nis.te               |   34 +
 policy/modules/services/nscd.if              |   20 
 policy/modules/services/nscd.te              |   24 -
 policy/modules/services/oav.te               |    5 
 policy/modules/services/oddjob.te            |    3 
 policy/modules/services/openca.if            |    4 
 policy/modules/services/openca.te            |    2 
 policy/modules/services/openvpn.te           |    4 
 policy/modules/services/pcscd.fc             |    9 
 policy/modules/services/pcscd.if             |   62 ++
 policy/modules/services/pcscd.te             |   78 +++
 policy/modules/services/pegasus.if           |   31 +
 policy/modules/services/pegasus.te           |    6 
 policy/modules/services/portmap.te           |    5 
 policy/modules/services/postfix.fc           |    1 
 policy/modules/services/postfix.if           |    3 
 policy/modules/services/postfix.te           |   22 +
 policy/modules/services/ppp.te               |    2 
 policy/modules/services/procmail.te          |   28 +
 policy/modules/services/pyzor.if             |   18 
 policy/modules/services/pyzor.te             |   13 
 policy/modules/services/radius.te            |    1 
 policy/modules/services/radvd.te             |    2 
 policy/modules/services/rhgb.if              |   76 +++
 policy/modules/services/rhgb.te              |    3 
 policy/modules/services/ricci.te             |   21 
 policy/modules/services/rlogin.te            |   10 
 policy/modules/services/rpc.fc               |    1 
 policy/modules/services/rpc.if               |    3 
 policy/modules/services/rpc.te               |   26 -
 policy/modules/services/rsync.te             |    1 
 policy/modules/services/samba.fc             |    5 
 policy/modules/services/samba.if             |   62 ++
 policy/modules/services/samba.te             |   64 ++
 policy/modules/services/sasl.te              |   12 
 policy/modules/services/sendmail.if          |   22 +
 policy/modules/services/sendmail.te          |    8 
 policy/modules/services/setroubleshoot.if    |   20 
 policy/modules/services/setroubleshoot.te    |    2 
 policy/modules/services/smartmon.te          |    1 
 policy/modules/services/snmp.if              |   17 
 policy/modules/services/snmp.te              |   17 
 policy/modules/services/spamassassin.fc      |    2 
 policy/modules/services/spamassassin.if      |   42 +
 policy/modules/services/spamassassin.te      |   18 
 policy/modules/services/squid.fc             |    2 
 policy/modules/services/squid.if             |   21 
 policy/modules/services/squid.te             |   11 
 policy/modules/services/ssh.if               |   83 +++
 policy/modules/services/ssh.te               |   14 
 policy/modules/services/telnet.te            |    3 
 policy/modules/services/tftp.te              |    2 
 policy/modules/services/uucp.fc              |    1 
 policy/modules/services/uucp.if              |   67 +++
 policy/modules/services/uucp.te              |   44 +-
 policy/modules/services/xserver.fc           |    2 
 policy/modules/services/xserver.if           |  190 ++++++++
 policy/modules/services/xserver.te           |   12 
 policy/modules/system/authlogin.if           |   76 +++
 policy/modules/system/authlogin.te           |    6 
 policy/modules/system/clock.te               |   13 
 policy/modules/system/fstools.fc             |    1 
 policy/modules/system/fstools.te             |   11 
 policy/modules/system/getty.te               |   14 
 policy/modules/system/hostname.te            |   19 
 policy/modules/system/init.if                |   64 ++
 policy/modules/system/init.te                |   51 ++
 policy/modules/system/ipsec.fc               |    5 
 policy/modules/system/ipsec.if               |   99 ++++
 policy/modules/system/ipsec.te               |  121 +++++
 policy/modules/system/iptables.te            |   23 -
 policy/modules/system/libraries.fc           |   42 +
 policy/modules/system/libraries.te           |   11 
 policy/modules/system/locallogin.if          |   37 +
 policy/modules/system/locallogin.te          |    6 
 policy/modules/system/logging.fc             |    5 
 policy/modules/system/logging.te             |   27 +
 policy/modules/system/lvm.fc                 |    2 
 policy/modules/system/lvm.if                 |   44 ++
 policy/modules/system/lvm.te                 |   81 +++
 policy/modules/system/miscfiles.fc           |    3 
 policy/modules/system/miscfiles.if           |   79 +++
 policy/modules/system/modutils.te            |   25 -
 policy/modules/system/mount.te               |   27 -
 policy/modules/system/netlabel.te            |    6 
 policy/modules/system/pcmcia.te              |    5 
 policy/modules/system/raid.te                |   15 
 policy/modules/system/selinuxutil.fc         |    2 
 policy/modules/system/selinuxutil.if         |  119 +++++
 policy/modules/system/selinuxutil.te         |  124 ++---
 policy/modules/system/sysnetwork.te          |   12 
 policy/modules/system/tzdata.fc              |    3 
 policy/modules/system/tzdata.if              |   23 +
 policy/modules/system/tzdata.te              |   51 ++
 policy/modules/system/unconfined.fc          |    4 
 policy/modules/system/unconfined.if          |   19 
 policy/modules/system/unconfined.te          |   23 +
 policy/modules/system/userdomain.if          |  579 +++++++++++++++++++++++----
 policy/modules/system/userdomain.te          |   93 ++--
 policy/modules/system/xen.fc                 |    1 
 policy/modules/system/xen.te                 |   46 +-
 236 files changed, 5565 insertions(+), 638 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.37 -r 1.38 policy-20061106.patch
Index: policy-20061106.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-20061106.patch,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- policy-20061106.patch	17 Apr 2007 12:52:50 -0000	1.37
+++ policy-20061106.patch	20 Apr 2007 15:31:18 -0000	1.38
@@ -1,20 +1,20 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict/seusers serefpolicy-2.4.6/config/appconfig-strict/seusers
 --- nsaserefpolicy/config/appconfig-strict/seusers	2006-11-29 12:04:52.000000000 -0500
-+++ serefpolicy-2.4.6/config/appconfig-strict/seusers	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/config/appconfig-strict/seusers	2007-04-20 09:05:19.000000000 -0400
 @@ -1,2 +1,3 @@
 +system_u:system_u
  root:root
  __default__:user_u
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mcs/seusers serefpolicy-2.4.6/config/appconfig-strict-mcs/seusers
 --- nsaserefpolicy/config/appconfig-strict-mcs/seusers	2006-11-29 12:04:52.000000000 -0500
-+++ serefpolicy-2.4.6/config/appconfig-strict-mcs/seusers	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/config/appconfig-strict-mcs/seusers	2007-04-20 09:05:19.000000000 -0400
 @@ -1,2 +1,3 @@
 +system_u:system_u:s0-mcs_systemhigh
  root:root:s0-mcs_systemhigh
  __default__:user_u:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/default_contexts serefpolicy-2.4.6/config/appconfig-strict-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-strict-mls/default_contexts	2006-11-29 12:04:52.000000000 -0500
-+++ serefpolicy-2.4.6/config/appconfig-strict-mls/default_contexts	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/config/appconfig-strict-mls/default_contexts	2007-04-20 09:05:19.000000000 -0400
 @@ -1,7 +1,7 @@
  system_r:sulogin_t:s0	sysadm_r:sysadm_t:s0
 -system_r:local_login_t:s0	staff_r:staff_t:s0 user_r:user_t:s0 sysadm_r:sysadm_t:s0
@@ -28,14 +28,14 @@
  staff_r:staff_su_t:s0	staff_r:staff_t:s0 user_r:user_t:s0 sysadm_r:sysadm_t:s0 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/seusers serefpolicy-2.4.6/config/appconfig-strict-mls/seusers
 --- nsaserefpolicy/config/appconfig-strict-mls/seusers	2006-11-29 12:04:52.000000000 -0500
-+++ serefpolicy-2.4.6/config/appconfig-strict-mls/seusers	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/config/appconfig-strict-mls/seusers	2007-04-20 09:05:19.000000000 -0400
 @@ -1,2 +1,3 @@
 +system_u:system_u:s0-mls_systemhigh
  root:root:s0-mls_systemhigh
  __default__:user_u:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/kerberos_selinux.8 serefpolicy-2.4.6/man/man8/kerberos_selinux.8
 --- nsaserefpolicy/man/man8/kerberos_selinux.8	2006-11-29 12:04:48.000000000 -0500
-+++ serefpolicy-2.4.6/man/man8/kerberos_selinux.8	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/man/man8/kerberos_selinux.8	2007-04-20 09:05:19.000000000 -0400
 @@ -18,7 +18,7 @@
  .br
  service krb5kdc restart
@@ -47,7 +47,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.4.6/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2006-11-29 12:04:48.000000000 -0500
-+++ serefpolicy-2.4.6/policy/flask/access_vectors	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/flask/access_vectors	2007-04-20 09:05:19.000000000 -0400
 @@ -619,6 +619,8 @@
  	send
  	recv
@@ -59,7 +59,7 @@
  class key
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.4.6/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/global_tunables	2007-04-05 09:10:05.000000000 -0400
++++ serefpolicy-2.4.6/policy/global_tunables	2007-04-20 09:05:19.000000000 -0400
 @@ -82,6 +82,14 @@
  
  ## <desc>
@@ -203,7 +203,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.4.6/policy/mls
 --- nsaserefpolicy/policy/mls	2006-11-29 12:04:48.000000000 -0500
-+++ serefpolicy-2.4.6/policy/mls	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/mls	2007-04-20 09:05:19.000000000 -0400
 @@ -89,12 +89,14 @@
  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
@@ -277,7 +277,7 @@
  mlsconstrain association { polmatch }
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.4.6/policy/modules/admin/acct.te
 --- nsaserefpolicy/policy/modules/admin/acct.te	2006-11-29 12:04:48.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/acct.te	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/admin/acct.te	2007-04-20 09:05:19.000000000 -0400
 @@ -9,6 +9,7 @@
  type acct_t;
  type acct_exec_t;
@@ -288,7 +288,7 @@
  logging_log_file(acct_data_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.if serefpolicy-2.4.6/policy/modules/admin/amanda.if
 --- nsaserefpolicy/policy/modules/admin/amanda.if	2006-11-29 12:04:48.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/amanda.if	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/admin/amanda.if	2007-04-20 09:05:19.000000000 -0400
 @@ -127,4 +127,21 @@
  	allow $1 amanda_log_t:file ra_file_perms;
  ')
@@ -313,7 +313,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.4.6/policy/modules/admin/amanda.te
 --- nsaserefpolicy/policy/modules/admin/amanda.te	2006-11-29 12:04:48.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/amanda.te	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/admin/amanda.te	2007-04-20 09:05:19.000000000 -0400
 @@ -75,6 +75,7 @@
  allow amanda_t self:unix_dgram_socket create_socket_perms;
  allow amanda_t self:tcp_socket create_stream_socket_perms;
@@ -333,14 +333,14 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.fc serefpolicy-2.4.6/policy/modules/admin/amtu.fc
 --- nsaserefpolicy/policy/modules/admin/amtu.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/amtu.fc	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/admin/amtu.fc	2007-04-20 09:05:19.000000000 -0400
 @@ -0,0 +1,3 @@
 +
 +/usr/bin/amtu    --    gen_context(system_u:object_r:amtu_exec_t,s0)
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.if serefpolicy-2.4.6/policy/modules/admin/amtu.if
 --- nsaserefpolicy/policy/modules/admin/amtu.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/amtu.if	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/admin/amtu.if	2007-04-20 09:05:19.000000000 -0400
 @@ -0,0 +1,57 @@
 +## <summary>
 +##	abstract Machine Test Utility 
@@ -401,7 +401,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.te serefpolicy-2.4.6/policy/modules/admin/amtu.te
 --- nsaserefpolicy/policy/modules/admin/amtu.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/amtu.te	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/admin/amtu.te	2007-04-20 09:05:19.000000000 -0400
 @@ -0,0 +1,56 @@
 +policy_module(amtu,1.0.23)
 +
@@ -461,7 +461,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/backup.te serefpolicy-2.4.6/policy/modules/admin/backup.te
 --- nsaserefpolicy/policy/modules/admin/backup.te	2006-11-29 12:04:48.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/backup.te	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/admin/backup.te	2007-04-20 09:05:19.000000000 -0400
 @@ -82,3 +82,8 @@
  optional_policy(`
  	nis_use_ypbind(backup_t)
@@ -473,7 +473,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.fc serefpolicy-2.4.6/policy/modules/admin/bootloader.fc
 --- nsaserefpolicy/policy/modules/admin/bootloader.fc	2006-11-29 12:04:48.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/bootloader.fc	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/admin/bootloader.fc	2007-04-20 09:05:19.000000000 -0400
 @@ -2,11 +2,6 @@
  /etc/lilo\.conf.*	--	gen_context(system_u:object_r:bootloader_etc_t,s0)
  /etc/yaboot\.conf.*	--	gen_context(system_u:object_r:bootloader_etc_t,s0)
@@ -488,7 +488,7 @@
  /sbin/ybin.*		--	gen_context(system_u:object_r:bootloader_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.4.6/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-11-29 12:04:48.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/bootloader.te	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/admin/bootloader.te	2007-04-20 09:05:19.000000000 -0400
 @@ -93,6 +93,8 @@
  fs_manage_dos_files(bootloader_t)
  
@@ -523,7 +523,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.4.6/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-11-29 12:04:48.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/consoletype.te	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/admin/consoletype.te	2007-04-20 09:05:19.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -579,7 +579,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ddcprobe.te serefpolicy-2.4.6/policy/modules/admin/ddcprobe.te
 --- nsaserefpolicy/policy/modules/admin/ddcprobe.te	2006-11-29 12:04:48.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/ddcprobe.te	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/admin/ddcprobe.te	2007-04-20 09:05:19.000000000 -0400
 @@ -53,3 +53,13 @@
  
  #reh why? this does not seem even necessary to function properly
@@ -596,7 +596,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-2.4.6/policy/modules/admin/dmesg.te
 --- nsaserefpolicy/policy/modules/admin/dmesg.te	2006-11-29 12:04:49.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/dmesg.te	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/admin/dmesg.te	2007-04-20 09:05:19.000000000 -0400
 @@ -10,6 +10,7 @@
  	type dmesg_t;
  	type dmesg_exec_t;
@@ -618,7 +618,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmidecode.te serefpolicy-2.4.6/policy/modules/admin/dmidecode.te
 --- nsaserefpolicy/policy/modules/admin/dmidecode.te	2006-11-29 12:04:48.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/dmidecode.te	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/admin/dmidecode.te	2007-04-20 09:05:19.000000000 -0400
 @@ -38,3 +38,8 @@
  	term_use_generic_ptys(dmidecode_t)
  	term_use_unallocated_ttys(dmidecode_t)
@@ -630,7 +630,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.if serefpolicy-2.4.6/policy/modules/admin/firstboot.if
 --- nsaserefpolicy/policy/modules/admin/firstboot.if	2006-11-29 12:04:48.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/firstboot.if	2007-03-09 13:35:58.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/admin/firstboot.if	2007-04-20 09:05:19.000000000 -0400
 @@ -96,7 +96,7 @@
  
[...2228 lines suppressed...]
-@@ -3996,7 +4050,7 @@
+@@ -3996,7 +4034,7 @@
  		type staff_home_dir_t;
  	')
  
@@ -11147,7 +11229,7 @@
  ')
  
  ########################################
-@@ -4343,7 +4397,7 @@
+@@ -4343,7 +4381,7 @@
  		type sysadm_home_dir_t;
  	')
  
@@ -11156,7 +11238,7 @@
  ')
  
  ########################################
-@@ -4501,41 +4555,13 @@
+@@ -4501,41 +4539,13 @@
  ## </param>
  #
  interface(`userdom_read_sysadm_home_content_files',`
@@ -11203,7 +11285,7 @@
  ')
  
  ########################################
-@@ -4858,7 +4884,7 @@
+@@ -4858,7 +4868,7 @@
  		type user_home_t;
  	')
  
@@ -11212,7 +11294,7 @@
  ')
  
  ########################################
-@@ -4905,6 +4931,28 @@
+@@ -4905,6 +4915,28 @@
  
  ########################################
  ## <summary>
@@ -11241,7 +11323,7 @@
  ##	Read files in generic user home directories.
  ## </summary>
  ## <param name="domain">
-@@ -5497,3 +5545,410 @@
+@@ -5497,3 +5529,410 @@
  	allow $1 user_home_dir_t:dir create_dir_perms;
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
@@ -11654,7 +11736,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.4.6/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/system/userdomain.te	2007-03-22 16:20:20.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/system/userdomain.te	2007-04-20 09:05:19.000000000 -0400
 @@ -24,6 +24,9 @@
  # users home directory contents
  attribute home_type;
@@ -11665,7 +11747,31 @@
  # The privhome attribute identifies every domain that can create files under
  # regular user home directories in the regular context (IE act on behalf of
  # a user in writing regular files)
-@@ -68,6 +71,7 @@
+@@ -58,6 +61,23 @@
+ 
+ ifdef(`strict_policy',`
+ 	userdom_admin_user_template(sysadm)
++
++	optional_policy(`
++		cron_admin_template(sysadm,sysadm_t,sysadm_r)
++	')
++
++	optional_policy(`
++		ethereal_admin_template(sysadm,sysadm_t,sysadm_r)
++	')
++
++	optional_policy(`
++		lpr_admin_template(sysadm,sysadm_t,sysadm_r)
++	')
++
++	optional_policy(`
++		mta_admin_template(sysadm,sysadm_t,sysadm_r)
++	')
++
+ 	userdom_unpriv_user_template(staff)
+ 	userdom_unpriv_user_template(user)
+ 
+@@ -68,6 +88,7 @@
  
  	# only staff_r can change to sysadm_r
  	userdom_role_change_template(staff, sysadm)
@@ -11673,7 +11779,7 @@
  
  	ifdef(`enable_mls',`
  		userdom_unpriv_user_template(secadm)
-@@ -111,6 +115,11 @@
+@@ -111,6 +132,11 @@
  
  	init_exec(sysadm_t)
  
@@ -11685,7 +11791,7 @@
  	# Following for sending reboot and wall messages
  	userdom_use_unpriv_users_ptys(sysadm_t)
  	userdom_use_unpriv_users_ttys(sysadm_t)
-@@ -141,25 +150,6 @@
+@@ -141,25 +167,6 @@
  		logging_run_auditd(auditadm_t, auditadm_r, { auditadm_tty_device_t auditadm_devpts_t })
  		userdom_dontaudit_read_sysadm_home_content_files(auditadm_t)
  
@@ -11711,7 +11817,7 @@
  	',`
  		logging_manage_audit_log(sysadm_t)
  		logging_manage_audit_config(sysadm_t)
-@@ -175,12 +165,24 @@
+@@ -175,12 +182,24 @@
  	')
  
  	optional_policy(`
@@ -11736,7 +11842,7 @@
  		# cjp: why is this not apm_run_client
  		apm_domtrans_client(sysadm_t)
  	')
-@@ -229,7 +231,6 @@
+@@ -229,7 +248,6 @@
  		consoletype_exec(sysadm_t)
  
  		ifdef(`enable_mls',`
@@ -11744,7 +11850,7 @@
  			consoletype_exec(auditadm_t)
  		')
  	')
-@@ -248,7 +249,6 @@
+@@ -248,7 +266,6 @@
  		dmesg_exec(sysadm_t)
  
  		ifdef(`enable_mls',`
@@ -11752,7 +11858,7 @@
  			dmesg_exec(auditadm_t)
  		')
  	')
-@@ -285,6 +285,8 @@
+@@ -285,6 +302,8 @@
  		ipsec_stream_connect(sysadm_t)
  		# for lsof
  		ipsec_getattr_key_sockets(sysadm_t)
@@ -11761,7 +11867,7 @@
  	')
  
  	optional_policy(`
-@@ -326,6 +328,10 @@
+@@ -326,6 +345,10 @@
  	')
  
  	optional_policy(`
@@ -11772,7 +11878,7 @@
  		netutils_run(sysadm_t,sysadm_r,admin_terminal)
  		netutils_run_ping(sysadm_t,sysadm_r,admin_terminal)
  		netutils_run_traceroute(sysadm_t,sysadm_r,admin_terminal)
-@@ -383,27 +389,12 @@
+@@ -383,27 +406,12 @@
  		seutil_run_runinit(sysadm_t,sysadm_r,admin_terminal)
  
  		ifdef(`enable_mls',`
@@ -11805,7 +11911,7 @@
  		')
  	')
  
-@@ -428,6 +419,9 @@
+@@ -428,6 +436,9 @@
  	')
  
  	optional_policy(`
@@ -11817,7 +11923,7 @@
  		usermanage_run_useradd(sysadm_t,sysadm_r,admin_terminal)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-2.4.6/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/system/xen.fc	2007-03-09 13:35:59.000000000 -0500
++++ serefpolicy-2.4.6/policy/modules/system/xen.fc	2007-04-20 09:05:19.000000000 -0400
 @@ -8,6 +8,7 @@
  /usr/sbin/xm		--	gen_context(system_u:object_r:xm_exec_t,s0)
  
@@ -11828,7 +11934,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.4.6/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/system/xen.te	2007-04-02 17:02:56.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/system/xen.te	2007-04-20 09:05:19.000000000 -0400
 @@ -20,12 +20,15 @@
  type xenctl_t;
  files_type(xenctl_t)
@@ -11950,7 +12056,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.4.6/Rules.modular
 --- nsaserefpolicy/Rules.modular	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/Rules.modular	2007-03-09 13:35:59.000000000 -0500
++++ serefpolicy-2.4.6/Rules.modular	2007-04-20 09:05:19.000000000 -0400
 @@ -219,6 +219,16 @@
  
  ########################################

policy-apcupsd.patch:
 apcupsd.fc |    9 +++++
 apcupsd.if |  108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 apcupsd.te |   92 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 209 insertions(+)

Index: policy-apcupsd.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-apcupsd.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- policy-apcupsd.patch	12 Apr 2007 19:54:45 -0000	1.2
+++ policy-apcupsd.patch	20 Apr 2007 15:31:18 -0000	1.3
@@ -1,6 +1,6 @@
 --- serefpolicy-2.4.6/policy/modules/services/apcupsd.te.apcupsd	2007-04-10 14:44:39.000000000 -0400
-+++ serefpolicy-2.4.6/policy/modules/services/apcupsd.te	2007-04-12 15:16:39.000000000 -0400
-@@ -0,0 +1,91 @@
++++ serefpolicy-2.4.6/policy/modules/services/apcupsd.te	2007-04-20 09:22:51.000000000 -0400
+@@ -0,0 +1,92 @@
 +policy_module(apcupsd,1.0.0)
 +
 +########################################
@@ -32,6 +32,7 @@
 +init_use_script_ptys(apcupsd_t)
 +domain_use_interactive_fds(apcupsd_t)
 +
++allow apcupsd_t self:process signal;
 +allow apcupsd_t self:fifo_file rw_file_perms;
 +allow apcupsd_t self:unix_stream_socket create_stream_socket_perms;
 +allow apcupsd_t self:tcp_socket create_stream_socket_perms;


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/selinux-policy.spec,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- selinux-policy.spec	17 Apr 2007 12:52:50 -0000	1.361
+++ selinux-policy.spec	20 Apr 2007 15:31:18 -0000	1.362
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.4.6
-Release: 59%{?dist}
+Release: 62%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -360,6 +360,23 @@
 %endif
 
 %changelog
+* Fri Apr 20 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-62
+- Revert patch to stop secadm and sysadm from having audit_control
+Resolves: #236855
+- Allow clamav to create pid files in amavis_var_run
+- Allow apcupsd to send itselef signals
+
+* Thu Apr 19 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-61 
+- Fix admin_domain_template to allow custom user types
+Resolves: #237133
+-Allow lvm to create/delete generic device_t direcories/files under /dev 
+Resolves: #237128 
+
+* Wed Apr 18 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-60
+- Fixes for AIDE at SystemHigh
+- Stop secadm and sysadm from having audit_control
+Resolves: #236855
+
 * Mon Apr 16 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-59
 - Allow racoon to send audit messages
 Resolves: #232508



From fedora-cvs-commits at redhat.com  Fri Apr 20 15:38:03 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 11:38:03 -0400
Subject: rpms/pyparted/devel .cvsignore, 1.16, 1.17 pyparted.spec, 1.36,
	1.37 sources, 1.19, 1.20
Message-ID: <200704201538.l3KFc31k011849@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/pyparted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11832

Modified Files:
	.cvsignore pyparted.spec sources 
Log Message:
* Fri Apr 19 2007 David Cantrell <dcantrell at redhat.com> - 1.8.6-1
- Merge review (#226337)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pyparted/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	8 Feb 2007 17:34:10 -0000	1.16
+++ .cvsignore	20 Apr 2007 15:37:57 -0000	1.17
@@ -1 +1 @@
-pyparted-1.8.5.tar.gz
+pyparted-1.8.6.tar.bz2


Index: pyparted.spec
===================================================================
RCS file: /cvs/dist/rpms/pyparted/devel/pyparted.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- pyparted.spec	20 Mar 2007 18:32:34 -0000	1.36
+++ pyparted.spec	20 Apr 2007 15:37:57 -0000	1.37
@@ -2,14 +2,15 @@
 
 Summary: Python module for GNU parted
 Name:    pyparted
-Version: 1.8.5
-Release: 4%{?dist}
+Version: 1.8.6
+Release: 1%{?dist}
 License: GPL
 Group:   System Environment/Libraries
+URL:     http://people.redhat.com/dcantrel/%{name}
 
 Source0: http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python-devel, parted-devel >= 1.8.6
 Requires: parted >= 1.8.6
 
@@ -21,27 +22,24 @@
 %setup -q
 
 %build
-export CFLAGS="-fPIC -O2 -g2"
-PYVER=$(%{__python} -c "import sys; print sys.version[:3]")
-if [ ! -x configure ]; then
-	./autogen.sh --with-python-version=$PYVER
-fi
-%configure --with-python-version=$PYVER
-make
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING
+%doc README COPYING AUTHORS ChangeLog
 %{python_sitearch}/partedmodule.so
 
 %changelog
+* Fri Apr 19 2007 David Cantrell <dcantrell at redhat.com> - 1.8.6-1
+- Merge review (#226337)
+
 * Tue Mar 20 2007 David Cantrell <dcantrell at redhat.com> - 1.8.5-4
 - Rebuild for GNU parted-1.8.6
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pyparted/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	8 Feb 2007 17:34:10 -0000	1.19
+++ sources	20 Apr 2007 15:37:57 -0000	1.20
@@ -1 +1 @@
-9097bc19e06350d865db38016ef98f4c  pyparted-1.8.5.tar.gz
+6aae2a503d21044d6354128d99458d11  pyparted-1.8.6.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr 20 15:40:20 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 11:40:20 -0400
Subject: rpms/pyparted/devel pyparted.spec,1.37,1.38 sources,1.20,1.21
Message-ID: <200704201540.l3KFeKAj011944@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/pyparted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11929

Modified Files:
	pyparted.spec sources 
Log Message:
* Fri Apr 19 2007 David Cantrell <dcantrell at redhat.com> - 1.8.6-1
- Merge review (#226337)



Index: pyparted.spec
===================================================================
RCS file: /cvs/dist/rpms/pyparted/devel/pyparted.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- pyparted.spec	20 Apr 2007 15:37:57 -0000	1.37
+++ pyparted.spec	20 Apr 2007 15:40:18 -0000	1.38
@@ -8,7 +8,7 @@
 Group:   System Environment/Libraries
 URL:     http://people.redhat.com/dcantrel/%{name}
 
-Source0: http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.gz
+Source0: http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python-devel, parted-devel >= 1.8.6


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pyparted/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	20 Apr 2007 15:37:57 -0000	1.20
+++ sources	20 Apr 2007 15:40:18 -0000	1.21
@@ -1 +1 @@
-6aae2a503d21044d6354128d99458d11  pyparted-1.8.6.tar.bz2
+b81b6c991eb99ce13030bad229d36951  pyparted-1.8.6.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr 20 16:47:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 12:47:49 -0400
Subject: rpms/pyparted/devel sources,1.21,1.22
Message-ID: <200704201647.l3KGln8B005729@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/pyparted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5691

Modified Files:
	sources 
Log Message:
* Fri Apr 19 2007 David Cantrell <dcantrell at redhat.com> - 1.8.6-1
- Merge review (#226337)



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pyparted/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	20 Apr 2007 15:40:18 -0000	1.21
+++ sources	20 Apr 2007 16:47:47 -0000	1.22
@@ -1 +1 @@
-b81b6c991eb99ce13030bad229d36951  pyparted-1.8.6.tar.bz2
+009fd06ca6007c6be020823ef99eaa12  pyparted-1.8.6.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr 20 16:54:08 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 12:54:08 -0400
Subject: rpms/dhcp/devel dhcp.spec,1.158,1.159
Message-ID: <200704201654.l3KGs8Xu010275@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10231

Modified Files:
	dhcp.spec 
Log Message:
* Fri Apr 20 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-33
- Rename -devel-static packages to -static (#225691)



Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- dhcp.spec	17 Apr 2007 14:45:46 -0000	1.158
+++ dhcp.spec	20 Apr 2007 16:54:05 -0000	1.159
@@ -10,7 +10,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.5
-Release:  32%{?dist}
+Release:  33%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -99,13 +99,13 @@
 %description devel
 Header files and API documentation for using the ISC DHCP libraries.
 
-%package devel-static
+%package static
 Summary: Static archives of libdhcpctl and libomapi
 Group: Development/Libraries
 Requires: dhcp-devel = %{epoch}:%{version}-%{release}, openldap-devel
 
-%description devel-static
-The dhcp-devel-static package contains the static archive for
+%description static
+The dhcp-static package contains the static archive for
 libdhcpctl and libomapi.
 
 %package -n libdhcp4client
@@ -128,13 +128,13 @@
 Dynamic Host Configuration Protocol (DHCP) Internet Protocol version 4 (IPv4)
 client library.
 
-%package -n libdhcp4client-devel-static
+%package -n libdhcp4client-static
 Summary: Static archive for libdhcp4client
 Group: Development/Libraries
 Requires: libdhcp4client-devel = %{epoch}:%{version}-%{release}
 
-%description -n libdhcp4client-devel-static
-The libdhcp4client-devel-static package contains the static archive for
+%description -n libdhcp4client-static
+The libdhcp4client-static package contains the static archive for
 libdhcp4client.
 
 %prep
@@ -409,7 +409,7 @@
 %attr(0644,root,root) %{_mandir}/man3/dhcpctl.3.gz
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
-%files devel-static
+%files static
 %defattr(-,root,root,-)
 %{_libdir}/libdhcpctl.a
 %{_libdir}/libomapi.a
@@ -424,11 +424,14 @@
 %{_libdir}/pkgconfig/libdhcp4client.pc
 %{_libdir}/libdhcp4client.so
 
-%files -n libdhcp4client-devel-static
+%files -n libdhcp4client-static
 %defattr(0644,root,root,0755)
 %{_libdir}/libdhcp4client.a
 
 %changelog
+* Fri Apr 20 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-33
+- Rename -devel-static packages to -static (#225691)
+
 * Tue Apr 17 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-32
 - Added missing newline on usage() screen in dhclient
 



From fedora-cvs-commits at redhat.com  Fri Apr 20 16:59:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 12:59:36 -0400
Subject: rpms/unixODBC/devel multilib-config.patch, NONE, 1.1 unixODBC.spec,
	1.38, 1.39
Message-ID: <200704201659.l3KGxa5J014494@cvs.devel.redhat.com>

Author: tgl

Update of /cvs/dist/rpms/unixODBC/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14446

Modified Files:
	unixODBC.spec 
Added Files:
	multilib-config.patch 
Log Message:
Make configure find correct Qt libraries when building on a multilib machine

multilib-config.patch:
 qt.m4 |   25 +------------------------
 1 files changed, 1 insertion(+), 24 deletions(-)

--- NEW FILE multilib-config.patch ---
unixODBC's configure tends to pick the wrong libraries on a multilib
machine.  Force it to use the location reported by /etc/profile.d/qt.sh
which we invoke in the specfile (yeah, a crude hack...)


diff -Naur unixODBC-2.2.12.orig/qt.m4 unixODBC-2.2.12/qt.m4
--- unixODBC-2.2.12.orig/qt.m4	2006-05-16 13:42:26.000000000 -0400
+++ unixODBC-2.2.12/qt.m4	2007-04-20 12:32:55.000000000 -0400
@@ -207,30 +207,7 @@
 
   # Ensure we have the lib dir...
   if test "x$qt_libraries" = "x" ; then
-    # see if it is relative to the includes
-    qt_tree="$qt_includes"
-    while test "x$qt_tree" != "x" ; do
-      # first go around will fail...
-      if expr "$QTVERSION" '>=' "040000" > /dev/null ; then
-        if ls $qt_tree/lib/libQt* > /dev/null 2> /dev/null ; then
-          qt_libraries=$qt_tree/lib
-          break
-        else
-          # lop off tail of path
-          dnl not as portable as it should be...
-          qt_tree="`dirname $qt_tree`"
-	fi
-      else
-        if ls $qt_tree/lib/libqt* > /dev/null 2> /dev/null ; then
-          qt_libraries=$qt_tree/lib
-          break
-        else
-          # lop off tail of path
-          dnl not as portable as it should be...
-          qt_tree="`dirname $qt_tree`"
-	fi
-      fi
-    done
+    qt_libraries="$QTLIB"
   fi  
 
   # Use QTVERSION and gotthread to set libs we need...


Index: unixODBC.spec
===================================================================
RCS file: /cvs/dist/rpms/unixODBC/devel/unixODBC.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- unixODBC.spec	17 Apr 2007 01:38:59 -0000	1.38
+++ unixODBC.spec	20 Apr 2007 16:59:34 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: A complete ODBC driver manager for Linux
 Name: unixODBC
 Version: 2.2.12
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.unixODBC.org/
@@ -11,6 +11,7 @@
 Source2: ODBCConfig.desktop
 Source3: DataManager.desktop
 Patch1: depcomp.patch
+Patch2: multilib-config.patch
 Patch4: parserupdate.patch
 Patch5: nortldglobal.patch
 Patch6: unixODBC-2.2.11-stricmp.patch
@@ -51,6 +52,7 @@
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 %patch4 -p1
 %patch6 -p1
 
@@ -172,6 +174,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Apr 20 2007 Tom Lane <tgl at redhat.com> 2.2.12-3
+- Make configure find correct Qt libraries when building on a multilib machine
+
 * Mon Apr 16 2007 Tom Lane <tgl at redhat.com> 2.2.12-2
 - Drop BuildRequires for kdelibs-devel
 Resolves: #152717



From fedora-cvs-commits at redhat.com  Fri Apr 20 17:05:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 13:05:21 -0400
Subject: rpms/dbus/FC-6 dbus.spec,1.114,1.115
Message-ID: <200704201705.l3KH5L6J018726@cvs.devel.redhat.com>

Author: davidz

Update of /cvs/dist/rpms/dbus/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv18641

Modified Files:
	dbus.spec 
Log Message:
* Fri Apr 20 2007 David Zeuthen <davidz at redhat.com> - 1.0.1-10
- Start SELinux thread after setuid call (#237289)




Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/FC-6/dbus.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- dbus.spec	21 Dec 2006 18:39:02 -0000	1.114
+++ dbus.spec	20 Apr 2007 17:05:19 -0000	1.115
@@ -8,7 +8,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 1.0.1 
-Release: 9%{?dist}
+Release: 10%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 Source1: session.conf
@@ -40,6 +40,7 @@
 Patch8: dbus-1.0.1-fix-upgrade-mess.patch
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=219665
 Patch9: dbus-0.22-fix-match-rule-equal.patch
+Patch10: dbus-1.0.2-selinux.patch
 
 %description
 
@@ -77,6 +78,7 @@
 %patch7 -p1 -b .pthread-holder-fix
 %patch8 -p1 -b .fix-upgrade-mess
 %patch9 -p1 -b .dbus-0.22-fix-match-rule-equal.patch
+%patch10 -p1 -b .selinux
 
 autoreconf -f -i
 
@@ -187,6 +189,9 @@
 %{_includedir}/*
 
 %changelog
+* Fri Apr 20 2007 David Zeuthen <davidz at redhat.com> - 1.0.1-10
+- Start SELinux thread after setuid call (#237289)
+
 * Thu Dec 21 2006 Ray Strode <rstrode at redhat.com> - 1.0.1-9
 - instead of moving config file like we did in 1.0.1-5, just
   ship a compatible config file and upgrade on reboot



From fedora-cvs-commits at redhat.com  Fri Apr 20 17:08:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 13:08:23 -0400
Subject: rpms/dbus/FC-6 dbus.spec,1.115,1.116
Message-ID: <200704201708.l3KH8NpE021225@cvs.devel.redhat.com>

Author: davidz

Update of /cvs/dist/rpms/dbus/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv21156

Modified Files:
	dbus.spec 
Log Message:
* Fri Apr 20 2007 David Zeuthen <davidz at redhat.com> - 1.0.1-11
- Bump and rebuild




Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/FC-6/dbus.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- dbus.spec	20 Apr 2007 17:05:19 -0000	1.115
+++ dbus.spec	20 Apr 2007 17:08:21 -0000	1.116
@@ -8,7 +8,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 1.0.1 
-Release: 10%{?dist}
+Release: 11%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 Source1: session.conf
@@ -189,6 +189,9 @@
 %{_includedir}/*
 
 %changelog
+* Fri Apr 20 2007 David Zeuthen <davidz at redhat.com> - 1.0.1-11
+- Bump and rebuild
+
 * Fri Apr 20 2007 David Zeuthen <davidz at redhat.com> - 1.0.1-10
 - Start SELinux thread after setuid call (#237289)
 



From fedora-cvs-commits at redhat.com  Fri Apr 20 17:09:25 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 13:09:25 -0400
Subject: rpms/dbus/FC-6 dbus-1.0.2-selinux.patch,NONE,1.1
Message-ID: <200704201709.l3KH9PDQ022067@cvs.devel.redhat.com>

Author: davidz

Update of /cvs/dist/rpms/dbus/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv22027

Added Files:
	dbus-1.0.2-selinux.patch 
Log Message:
forget to add patch file

dbus-1.0.2-selinux.patch:
 bus.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE dbus-1.0.2-selinux.patch ---
--- dbus-1.0.2/bus/bus.c.audit_session	2006-12-11 14:21:23.000000000 -0500
+++ dbus-1.0.2/bus/bus.c	2007-03-30 11:53:46.000000000 -0400
@@ -746,11 +746,6 @@
       _dbus_string_free (&pid);
     }
 
-  if (!bus_selinux_full_init ())
-    {
-      _dbus_warn ("SELinux initialization failed\n");
-    }
-
   if (!process_config_postinit (context, parser, error))
     {
       _DBUS_ASSERT_ERROR_IS_SET (error);
@@ -775,6 +770,11 @@
 	}
     }
   
+  if (!bus_selinux_full_init ())
+    {
+      _dbus_warn ("SELinux initialization failed\n");
+    }
+
   dbus_server_free_data_slot (&server_data_slot);
   
   return context;



From fedora-cvs-commits at redhat.com  Fri Apr 20 17:10:34 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 13:10:34 -0400
Subject: rpms/dbus/FC-6 dbus.spec,1.116,1.117
Message-ID: <200704201710.l3KHAYAI022890@cvs.devel.redhat.com>

Author: davidz

Update of /cvs/dist/rpms/dbus/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv22780

Modified Files:
	dbus.spec 
Log Message:
* Fri Apr 20 2007 David Zeuthen <davidz at redhat.com> - 1.0.1-12
- Bump and rebuild




Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/FC-6/dbus.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- dbus.spec	20 Apr 2007 17:08:21 -0000	1.116
+++ dbus.spec	20 Apr 2007 17:10:27 -0000	1.117
@@ -8,7 +8,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 1.0.1 
-Release: 11%{?dist}
+Release: 12%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 Source1: session.conf
@@ -189,6 +189,9 @@
 %{_includedir}/*
 
 %changelog
+* Fri Apr 20 2007 David Zeuthen <davidz at redhat.com> - 1.0.1-12
+- Bump and rebuild
+
 * Fri Apr 20 2007 David Zeuthen <davidz at redhat.com> - 1.0.1-11
 - Bump and rebuild
 



From fedora-cvs-commits at redhat.com  Fri Apr 20 17:14:25 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 13:14:25 -0400
Subject: rpms/libbonobo/devel libbonobo-2.18.0-env-leak.patch, 1.1,
	1.2 libbonobo.spec, 1.54, 1.55
Message-ID: <200704201714.l3KHEPsT025990@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libbonobo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25824

Modified Files:
	libbonobo-2.18.0-env-leak.patch libbonobo.spec 
Log Message:
Better fix for the string leak fixed in -2


libbonobo-2.18.0-env-leak.patch:
 bonobo-activation-activate.c |   70 +++++++++++--------------------------------
 1 files changed, 18 insertions(+), 52 deletions(-)

Index: libbonobo-2.18.0-env-leak.patch
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo-2.18.0-env-leak.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libbonobo-2.18.0-env-leak.patch	10 Apr 2007 11:52:41 -0000	1.1
+++ libbonobo-2.18.0-env-leak.patch	20 Apr 2007 17:14:23 -0000	1.2
@@ -1,12 +1,131 @@
---- libbonobo-2.18.0/bonobo-activation/bonobo-activation-activate.c.env-leak	2007-04-09 21:07:53.000000000 +0200
-+++ libbonobo-2.18.0/bonobo-activation/bonobo-activation-activate.c	2007-04-09 21:08:27.000000000 +0200
-@@ -817,8 +817,7 @@
- 	activation_environment._release = TRUE;
+--- libbonobo-2.18.0/bonobo-activation/bonobo-activation-activate.c.env-leak	2007-01-01 18:46:56.000000000 -0500
++++ libbonobo-2.18.0/bonobo-activation/bonobo-activation-activate.c	2007-04-20 13:12:59.000000000 -0400
+@@ -37,7 +37,7 @@
+ #include <bonobo-activation/bonobo-activation-i18n.h>
+ #include <bonobo-activation/Bonobo_ActivationContext.h>
  
- 	for (i = 0; i < activation_environment._length - 1; i++)
+-static Bonobo_ActivationEnvironment activation_environment;
++static Bonobo_ActivationEnvironment *activation_environment = NULL;
+ 
+ /* FIXME: deprecated internal functions. Should we just remove?
+  */
+@@ -378,7 +378,7 @@
+ 	copy_strv_to_sequence (selection_order, &selorder);
+         
+         result = Bonobo_ActivationContext_activateMatchingFull
+-                (ac, requirements, &selorder, &activation_environment,
++                (ac, requirements, &selorder, activation_environment,
+                  flags, bonobo_activation_client_get (),
+                  bonobo_activation_context_get (), ev);
+         
+@@ -387,7 +387,7 @@
+         {
+                 g_message ("TESTME: Fall-back activate");
+                 result = Bonobo_ActivationContext_activateMatching
+-                        (ac, requirements, &selorder, &activation_environment,
++                        (ac, requirements, &selorder, activation_environment,
+                          flags, bonobo_activation_context_get (), ev);
+         }
+ 
+@@ -619,7 +619,7 @@
+ 
+         args [0] = &requirements;
+ 	args [1] = &selorder;
+-	args [2] = &activation_environment;
++	args [2] = activation_environment;
+ 	args [3] = &flags;
+ 	args [4] = &client;
+ 
+@@ -738,7 +738,7 @@
+ void
+ bonobo_activation_init_activation_env (void)
+ {
+-	int i, j, num_items = 0;
++	int i;
+ 
+ 	struct {
+ 		const char *name;
+@@ -760,70 +760,36 @@
+ 		{ NULL,		     NULL }
+ 	};
+ 
+-	for (i = 0; getenv_values [i].name; i++) {
+-		getenv_values [i].value = getenv (getenv_values [i].name);
+-
+-		if (getenv_values [i].value)
+-			num_items++;
+-	}
+-
+-	if (!num_items)
+-		return;
+-
+-	activation_environment._length  = activation_environment._maximum = num_items;
+-	activation_environment._buffer  = Bonobo_ActivationEnvironment_allocbuf (num_items);
+-	activation_environment._release = TRUE;
+-
+-	j = 0;
++        g_assert (activation_environment == NULL);
++        activation_environment = Bonobo_ActivationEnvironment__alloc ();
+ 
+ 	for (i = 0; getenv_values [i].name; i++) {
++                Bonobo_ActivationEnvValue value = {
++                        (CORBA_char *) getenv_values [i].name,
++                        (CORBA_char *) getenv_values [i].value,
++                        0 /* flags */ };
+ 		if (!getenv_values [i].value)
+ 			continue;
+-
+-		Bonobo_ActivationEnvValue_set (
+-			&activation_environment._buffer [j++],
+-			getenv_values [i].name,
+-			getenv_values [i].value);
++                ORBit_sequence_append (activation_environment, &value);
+ 	}
+-
+-	g_assert (j == num_items);
+ }
+ 
+ void
+ bonobo_activation_set_activation_env_value (const char *name,
+ 					    const char *value)
+ {
+-	Bonobo_ActivationEnvValue *old_buffer;
+ 	int                        i;
++        Bonobo_ActivationEnvValue env_value = { (CORBA_char *) name, (CORBA_char *) value, 0 };
+ 
+ 	g_return_if_fail (name != NULL);
+ 
+-	for (i = 0; i < activation_environment._length; i++)
+-		if (!strcmp (activation_environment._buffer [i].name, name)) {
+-			Bonobo_ActivationEnvValue_set (
+-				&activation_environment._buffer [i], name, value);
++	for (i = 0; i < activation_environment->_length; i++) {
++		if (!strcmp (activation_environment->_buffer [i].name, name)) {
++                        ORBit_sequence_remove (activation_environment, i);
+ 			break;
+ 		}
+-
+-	if (i > 0 && i != activation_environment._length)
+-		return; /* We've overwritten a value */
+-
+-	old_buffer = activation_environment._buffer;
+-
+-	activation_environment._length++;
+-	activation_environment._maximum++;
+-	activation_environment._buffer  = Bonobo_ActivationEnvironment_allocbuf (
+-							activation_environment._length);
+-	activation_environment._release = TRUE;
+-
+-	for (i = 0; i < activation_environment._length - 1; i++)
 -		Bonobo_ActivationEnvValue_copy (
 -			&activation_environment._buffer [i], &old_buffer [i]);
-+		activation_environment._buffer[i] = old_buffer[i];
- 
- 	Bonobo_ActivationEnvValue_set (&activation_environment._buffer [i], name, value);
+-
+-	Bonobo_ActivationEnvValue_set (&activation_environment._buffer [i], name, value);
+-
+-	if (old_buffer)
+-		CORBA_free (old_buffer);
++        }
++        ORBit_sequence_append (activation_environment, &env_value);
+ }
  
+ /**


Index: libbonobo.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- libbonobo.spec	10 Apr 2007 11:52:41 -0000	1.54
+++ libbonobo.spec	20 Apr 2007 17:14:23 -0000	1.55
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.18.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://ftp.gnome.org
 Source0: http://ftp.gnome.org/pub/gnome/sources/libbonobo/2.18/%{name}-%{version}.tar.bz2
 License: LGPL
@@ -123,6 +123,9 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Fri Apr 20 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-3
+- Use the more correct upstream fix for the leak fixed in -2
+
 * Mon Apr  9 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-2
 - Don't leak strings from the bonobo activation environment
 



From fedora-cvs-commits at redhat.com  Fri Apr 20 17:24:11 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 13:24:11 -0400
Subject: rpms/libdhcp/devel libdhcp.spec,1.51,1.52
Message-ID: <200704201724.l3KHOBnW000552@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/libdhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv506

Modified Files:
	libdhcp.spec 
Log Message:
* Fri Apr 20 2007 David Cantrell <dcantrell at redhat.com> - 1.24-4
- Rename -devel-static package to -static



Index: libdhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/libdhcp.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- libdhcp.spec	12 Apr 2007 20:20:34 -0000	1.51
+++ libdhcp.spec	20 Apr 2007 17:24:09 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: A library for network interface configuration with DHCP
 Name:    libdhcp
 Version: 1.24
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group:   Development/Libraries
 URL:     http://people.redhat.com/dcantrel/%{name}/
@@ -32,13 +32,13 @@
 %description devel
 C header files for development with libdhcp.
 
-%package devel-static
+%package static
 Summary:  Static archive of libdhcp
 Group:    Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}, libdhcp4client-devel-static
+Requires: %{name}-devel = %{version}-%{release}, libdhcp4client-static
 
-%description devel-static
-The libdhcp-devel-static package contains the static archive for libdhcp.
+%description static
+The libdhcp-static package contains the static archive for libdhcp.
 
 %prep
 %setup -q
@@ -69,11 +69,14 @@
 %{_includedir}/libdhcp
 %{_libdir}/pkgconfig/libdhcp.pc
 
-%files devel-static
+%files static
 %defattr(-,root,root,-)
 %{_libdir}/libdhcp.a
 
 %changelog
+* Fri Apr 20 2007 David Cantrell <dcantrell at redhat.com> - 1.24-4
+- Rename -devel-static package to -static
+
 * Thu Apr 12 2007 David Cantrell <dcantrell at redhat.com> - 1.24-3
 - Put libdhcp.a in the libdhcp-devel-static package
 



From fedora-cvs-commits at redhat.com  Fri Apr 20 17:29:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 13:29:31 -0400
Subject: rpms/kernel/devel patch-2.6.21-rc7-git4.bz2.sign, NONE,
	1.1 .cvsignore, 1.609, 1.610 kernel-2.6.spec, 1.3101,
	1.3102 sources, 1.572, 1.573 upstream, 1.500,
	1.501 linux-2.6-e1000-revert-04.patch, 1.1,
	NONE linux-2.6-libata-pata_sis-oops.patch, 1.1,
	NONE patch-2.6.21-rc7-git3.bz2.sign, 1.1, NONE
Message-ID: <200704201729.l3KHTVdK004671@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.21-rc7-git4.bz2.sign 
Removed Files:
	linux-2.6-e1000-revert-04.patch 
	linux-2.6-libata-pata_sis-oops.patch 
	patch-2.6.21-rc7-git3.bz2.sign 
Log Message:
* Fri Apr 20 2007 Dave Jones <davej at redhat.com>
- 2.6.21-rc7-git4



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

iD8DBQBGKG8NyGugalF9Dw4RAv2UAKCI0TyeWiwZi7QWNRGlgXaxrmvjSwCeNJZ1
vH4waAqmCDiEuxKSRLWWQ/o=
=fR/8
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.609
retrieving revision 1.610
diff -u -r1.609 -r1.610
--- .cvsignore	19 Apr 2007 23:23:15 -0000	1.609
+++ .cvsignore	20 Apr 2007 17:29:29 -0000	1.610
@@ -5,4 +5,4 @@
 kernel-2.6.20
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc7.bz2
-patch-2.6.21-rc7-git3.bz2
+patch-2.6.21-rc7-git4.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3101
retrieving revision 1.3102
diff -u -r1.3101 -r1.3102
--- kernel-2.6.spec	20 Apr 2007 05:11:34 -0000	1.3101
+++ kernel-2.6.spec	20 Apr 2007 17:29:29 -0000	1.3102
@@ -371,7 +371,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.21-rc7.bz2
-Patch2: patch-2.6.21-rc7-git3.bz2
+Patch2: patch-2.6.21-rc7-git4.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -525,7 +525,6 @@
 Patch1300: linux-2.6-e1000-revert-01.patch
 Patch1301: linux-2.6-e1000-revert-02.patch
 Patch1302: linux-2.6-e1000-revert-03.patch
-Patch1303: linux-2.6-e1000-revert-04.patch
 Patch1304: linux-2.6-e1000-revert-05.patch
 Patch1305: linux-2.6-e1000-revert-06.patch
 Patch1306: linux-2.6-e1000-revert-07.patch
@@ -587,7 +586,6 @@
 Patch2200: linux-2.6-sata-promise-pata-ports.patch
 Patch2201: linux-2.6-libata-hpa.patch
 Patch2202: linux-2.6-libata-sata_nv-adma.patch
-Patch2203: linux-2.6-libata-pata_sis-oops.patch
 Patch2204: linux-2.6-ata-quirk.patch
 Patch2205: linux-2.6-libata-debug.patch
 
@@ -1224,20 +1222,19 @@
 
 # NIC driver fixes
 # revert e1000 to 2.6.20
-%patch1314 -p1 -R
-%patch1313 -p1 -R
-%patch1312 -p1 -R
-%patch1311 -p1 -R
-%patch1310 -p1 -R
-%patch1309 -p1 -R
-%patch1307 -p1 -R
-%patch1306 -p1 -R
-%patch1305 -p1 -R
-%patch1304 -p1 -R
-%patch1303 -p1 -R
-%patch1302 -p1 -R
-%patch1301 -p1 -R
-%patch1300 -p1 -R
+#%patch1314 -p1 -R
+#%patch1313 -p1 -R
+#%patch1312 -p1 -R
+#%patch1311 -p1 -R
+#%patch1310 -p1 -R
+#%patch1309 -p1 -R
+#%patch1307 -p1 -R
+#%patch1306 -p1 -R
+#%patch1305 -p1 -R
+#%patch1304 -p1 -R
+#%patch1302 -p1 -R
+#%patch1301 -p1 -R
+#%patch1300 -p1 -R
 
 # Filesystem patches.
 # Squashfs
@@ -1322,8 +1319,6 @@
 %patch2201 -p1
 # sata_nv: Don't attempt using ADMA for (READ|SET)_MAX commands
 %patch2202 -p1
-# fix oops in pata_sis
-%patch2203 -p1
 # libata: don't initialize sg in ata_exec_internal() if DMA_NONE
 # ia64 ata quirk
 %patch2204 -p1
@@ -2330,6 +2325,9 @@
 
 %changelog
 * Fri Apr 20 2007 Dave Jones <davej at redhat.com>
+- 2.6.21-rc7-git4
+
+* Fri Apr 20 2007 Dave Jones <davej at redhat.com>
 - Drop broken sata debug patch.
 
 * Thu Apr 19 2007 Dave Jones <davej at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.572
retrieving revision 1.573
diff -u -r1.572 -r1.573
--- sources	19 Apr 2007 23:23:15 -0000	1.572
+++ sources	20 Apr 2007 17:29:29 -0000	1.573
@@ -1,4 +1,4 @@
 2618cbcc9c9ac1c3c04be903fe3338a7  sparse-0.2.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 3a54bf5a7cf6b124e680e1d08fe1b20b  patch-2.6.21-rc7.bz2
-7a604f926086e4abb18a09219010ee40  patch-2.6.21-rc7-git3.bz2
+8a967ac2d7c74ddbbd24c106d9d2518b  patch-2.6.21-rc7-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.500
retrieving revision 1.501
diff -u -r1.500 -r1.501
--- upstream	19 Apr 2007 23:23:15 -0000	1.500
+++ upstream	20 Apr 2007 17:29:29 -0000	1.501
@@ -1,3 +1,3 @@
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc7.bz2
-patch-2.6.21-rc7-git3.bz2
+patch-2.6.21-rc7-git4.bz2


--- linux-2.6-e1000-revert-04.patch DELETED ---


--- linux-2.6-libata-pata_sis-oops.patch DELETED ---


--- patch-2.6.21-rc7-git3.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 20 17:30:04 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 13:30:04 -0400
Subject: rpms/libvte-java/devel libvte-java-alias2.patch, NONE,
	1.1 libvte-java.spec, 1.31, 1.32 libvte-java-alias.patch, 1.1, NONE
Message-ID: <200704201730.l3KHU4Jx005160@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libvte-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5125

Modified Files:
	libvte-java.spec 
Added Files:
	libvte-java-alias2.patch 
Removed Files:
	libvte-java-alias.patch 
Log Message:
- Fix permissions for libvte-java-alias.patch; because of CVS limitations,
  the patch has to be renamed, say to libvte-java-alias2.patch
- Adhere to packaging guidelines.
- Resolves: #226057
- Make sure we will notice when the project starts using the NEWS file.

libvte-java-alias2.patch:
 Terminal.java |    8 ++++++++
 1 files changed, 8 insertions(+)

--- NEW FILE libvte-java-alias2.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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- libvte-java.spec	6 Mar 2007 15:23:35 -0000	1.31
+++ libvte-java.spec	20 Apr 2007 17:30:02 -0000	1.32
@@ -1,15 +1,15 @@
-Summary:   Wrapper library for GNOME VTE
-Name:      libvte-java 
-Version:   0.12.1
-Release:   8%{?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
+Summary:	Wrapper library for GNOME VTE
+Name:		libvte-java 
+Version:	0.12.1
+Release:	9%{?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:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-Patch:	libvte-java-alias.patch
-Patch1:	%{name}-gjavah.patch
+Patch:		libvte-java-alias2.patch
+Patch1:		%{name}-gjavah.patch
 
 Requires: 	glib-java >= 0.2.4
 Requires:	libgtk-java >= 2.8.4
@@ -20,13 +20,13 @@
 BuildRequires: 	pkgconfig
 
 %description 
-libvte-java is a Java wrapper library for the GNOME VTE library. Allowing access
-to the terminal widget from Java.
+libvte-java is a Java wrapper library for the GNOME VTE library, allowing
+access to the terminal widget from Java.
 
 %package        devel
-Summary:        Compressed Java source files for %{name}.
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Summary:	Compressed Java source files for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 Requires:	vte-devel, libgtk-java-devel
 
 %description    devel
@@ -34,8 +34,6 @@
 
 
 %prep
-rm -rf $RPM_BUILD_ROOT
-
 %setup -q -n %{name}-%{version}
 %patch
 %patch1
@@ -80,6 +78,9 @@
 (cd $RPM_BUILD_ROOT%{_datadir}/java &&
   ln -sf $zipfile $jarname$jarversion-src.zip)
 
+# Is the NEWS file still empty?  See the file list below.
+test -f NEWS -a ! -s NEWS
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -89,7 +90,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README 
+# Do not distribute the NEWS file, it is empty.
+%doc AUTHORS ChangeLog COPYING README 
 %{_libdir}/libvtejava-*.so
 %{_libdir}/libvtejni-*.so
 %{_datadir}/java/*.jar
@@ -103,6 +105,13 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Tue Apr  3 2007 Stepan Kasal <skasal at redhat.com> - 0.12.1-9
+- Fix permissions for libvte-java-alias.patch; because of CVS limitations,
+  the patch has to be renamed, say to libvte-java-alias2.patch 
+- Adhere to packaging guidelines.
+- Resolves: #226057
+- Make sure we will notice when the project starts using the NEWS file.
+
 * Tue Mar  6 2007 Stepan Kasal <skasal at redhat.com> - 0.12.1-8
 - Rename the gcjh -> gjavah patch.
 


--- libvte-java-alias.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 20 17:30:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 13:30:47 -0400
Subject: rpms/grep/devel grep.spec,1.65,1.66
Message-ID: <200704201730.l3KHUlVW005627@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/grep/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5594

Modified Files:
	grep.spec 
Log Message:
- Adhere to packaging guidelines.
- Resolves: #225857
- Use CPPFLAGS= argument to configure to add an -I option.
- Do not set LDFLAGS=-s for "make install".


Index: grep.spec
===================================================================
RCS file: /cvs/dist/rpms/grep/devel/grep.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- grep.spec	22 Jan 2007 17:57:53 -0000	1.65
+++ grep.spec	20 Apr 2007 17:30:41 -0000	1.66
@@ -1,7 +1,9 @@
-Summary: The GNU versions of grep pattern matching utilities.
+Summary: The GNU versions of grep pattern matching utilities
+- Adhere to packaging guidelines.
+- Resolves: #225857
 Name: grep
 Version: 2.5.1
-Release: 57%{?dist}
+Release: 58%{?dist}
 License: GPL
 Group: Applications/Text
 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}a.tar.bz2
@@ -21,9 +23,10 @@
 Patch15: grep-mem-exhausted.patch
 Patch16: grep-empty-pattern.patch
 URL: http://www.gnu.org/software/grep/
-Prereq: /sbin/install-info
-Buildroot: %{_tmppath}/%{name}-%{version}-root
-Buildrequires: pcre-devel >= 3.9-10, texinfo, gettext, gzip
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRequires: pcre-devel >= 3.9-10, texinfo, gettext
 
 %description
 The GNU versions of commonly used grep utilities.  Grep searches
@@ -55,13 +58,12 @@
 
 %build
 [ ! -e configure ] && ./autogen.sh
-%configure --without-included-regex
-make CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/pcre"
-make check
+%configure --without-included-regex CPPFLAGS="-I%{_includedir}/pcre"
+make %{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-%makeinstall LDFLAGS=-s prefix=${RPM_BUILD_ROOT}%{_prefix} exec_prefix=${RPM_BUILD_ROOT}
+make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
 %ifos Linux
 mkdir -p $RPM_BUILD_ROOT/bin
 mv -f $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT/bin
@@ -76,6 +78,9 @@
 
 %find_lang %name
 
+%check
+make check
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -89,7 +94,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc ABOUT-NLS AUTHORS THANKS TODO NEWS README ChangeLog
+%doc ABOUT-NLS AUTHORS THANKS TODO NEWS README ChangeLog COPYING
 
 %ifos Linux
 /bin/*
@@ -100,6 +105,12 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Apr 20 2007 Stepan Kasal <skasal at redhat.com> - 2.5.1-58
+- Adhere to packaging guidelines.
+- Resolves: #225857
+- Use CPPFLAGS= argument to configure to add an -I option.
+- Do not set LDFLAGS=-s for "make install".
+
 * Mon Jan 22 2007 Tim Waugh <twaugh at redhat.com> 2.5.1-57
 - Make preun scriptlet unconditionally succeed (bug #223697).
 
@@ -380,7 +391,7 @@
 * Sun May 13 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.5e-1
 - 2.5e
 
-* Tue Feb 27 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Tue Feb 27 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - use %%{_tmppath}
 - langify
 
@@ -413,7 +424,7 @@
 - auto rebuild in the new build environment (release 2)
 
 * Mon Mar 08 1999 Preston Brown <pbrown at redhat.com>
-- upgraded to grep 2.3, added install-info %post/%preun for info
+- upgraded to grep 2.3, added install-info %%post/%%preun for info
 
 * Wed Feb 24 1999 Preston Brown <pbrown at redhat.com>
 - Injected new description and group.



From fedora-cvs-commits at redhat.com  Fri Apr 20 17:32:39 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 13:32:39 -0400
Subject: rpms/grep/devel grep.spec,1.66,1.67
Message-ID: <200704201732.l3KHWdKQ006899@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/grep/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6859

Modified Files:
	grep.spec 
Log Message:
- Adhere to packaging guidelines.
- Resolves: #225857
- Use CPPFLAGS= argument to configure to add an -I option.
- Do not set LDFLAGS=-s for "make install".


Index: grep.spec
===================================================================
RCS file: /cvs/dist/rpms/grep/devel/grep.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- grep.spec	20 Apr 2007 17:30:41 -0000	1.66
+++ grep.spec	20 Apr 2007 17:32:36 -0000	1.67
@@ -1,6 +1,4 @@
 Summary: The GNU versions of grep pattern matching utilities
-- Adhere to packaging guidelines.
-- Resolves: #225857
 Name: grep
 Version: 2.5.1
 Release: 58%{?dist}



From fedora-cvs-commits at redhat.com  Fri Apr 20 17:35:48 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 13:35:48 -0400
Subject: rpms/glib-java/devel glib-java.spec,1.52,1.53
Message-ID: <200704201735.l3KHZmii009093@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/glib-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9053

Modified Files:
	glib-java.spec 
Log Message:
- Adhere to packaging guidelines.
- Resolves: #225807
- Make sure we will notice when the project starts using the NEWS file.


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- glib-java.spec	3 Apr 2007 13:14:23 -0000	1.52
+++ glib-java.spec	20 Apr 2007 17:35:46 -0000	1.53
@@ -15,7 +15,7 @@
 Summary:	Base Library for the Java-GNOME libraries 
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	0.2.6
-Release:	8%{?dist}
+Release:	9%{?dist}
 URL:		http://java-gnome.sourceforge.net
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.2/%{name_base}-%{version}.tar.bz2
 Patch0:		%{name}-gjavah.patch
@@ -34,7 +34,7 @@
 GNOME through Java.
 
 %package        devel
-Summary:	Compressed Java source files for %{name}.
+Summary:	Compressed Java source files for %{name}
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	glib2-devel
@@ -92,6 +92,9 @@
 (cd $RPM_BUILD_ROOT%{_datadir}/java &&
   ln -sf $zipfile $jarname$jarversion-src.zip)
 
+# Is the NEWS file still empty?  See the file list below.
+test -f NEWS -a ! -s NEWS
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -101,7 +104,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README 
+# Do not distribute the NEWS file, it is empty.
+%doc AUTHORS ChangeLog COPYING README 
 %dir %{_includedir}/%{name_base}
 %{_includedir}/%{name_base}/*
 %{_libdir}/libglibjava-*.so
@@ -119,6 +123,11 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Fri Apr 20 2007 Stepan Kasal <skasal at redhat.com> - 0.2.6-9
+- Adhere to packaging guidelines.
+- Resolves: #225807
+- Make sure we will notice when the project starts using the NEWS file.
+
 * Mon Mar  5 2007 Stepan Kasal <skasal at redhat.com> - 0.2.6-8
 - Touch aclocal.m4, configure, Makefile.in after applying the patch.
 
@@ -196,7 +205,7 @@
 * Thu Dec 22 2005 Adam Jocksch <ajocksch at redhat.com>
 - bumped version to 0.2.2, updated tarball.
 
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0 9.2.1-3.5
+* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0.2.1-3.5
 - rebuilt
 
 * Tue Dec 13 2005 Jesse Keating <jkeating at redhat.com>



From fedora-cvs-commits at redhat.com  Fri Apr 20 17:36:41 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 13:36:41 -0400
Subject: rpms/cairo-java/devel cairo-java.spec,1.45,1.46
Message-ID: <200704201736.l3KHafVk009727@cvs.devel.redhat.com>

Author: skasal

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

Modified Files:
	cairo-java.spec 
Log Message:
- Adhere to packaging guidelines.
- Resolves: #225636


Index: cairo-java.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/cairo-java.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- cairo-java.spec	27 Mar 2007 17:42:06 -0000	1.45
+++ cairo-java.spec	20 Apr 2007 17:36:38 -0000	1.46
@@ -15,13 +15,13 @@
 Summary:	Java bindings for the Cairo library
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	1.0.5
-Release: 	7%{?dist}
+Release: 	8%{?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
 Patch0:		%{name}-gjavah.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	fontconfig >= 2.3.1
 Requires: 	%{java_pkg_prefix}cairo >= 1.0.0
@@ -38,9 +38,9 @@
 applications in Java.  It is part of Java-GNOME.
 
 %package        devel
-Summary:        Compressed Java source files for %{name}.
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Summary:	Compressed Java source files for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 Requires:	cairo-devel
 Requires:	fontconfig-devel
 Requires:	glib-java-devel
@@ -106,7 +106,7 @@
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING INSTALL README NEWS 
+%doc AUTHORS ChangeLog COPYING README NEWS 
 %{_libdir}/libcairojava-*.so
 %{_libdir}/libcairojni-*.so
 %{_datadir}/java/*.jar
@@ -121,6 +121,10 @@
 
 
 %changelog
+* Fri Apr 20 2007 Stepan Kasal <skasal at redhat.com> - 1.0.5-8
+- Adhere to packaging guidelines.
+- Resolves: #225636
+
 * Tue Mar 27 2007 Stepan Kasal <skasal at redhat.com> - 1.0.5-7
 - BuildRequire java-devel instead of java-1.4.2-gcj-compat-devel.
 
@@ -176,7 +180,7 @@
 - Add -X to src zip and ensure Config.java has the same mod time across 
   platforms - needed for multilib. 
 
-* Fri Apr 28 2006 Stepan Kasal <skasal at redhat.com>    - 1.0.3-0
+* Fri Apr 28 2006 Stepan Kasal <skasal at redhat.com> - 1.0.3-0
 - New version.
 
 * Wed Mar 01 2006 Adam Jocksch <ajocksch at redhat.com> - 1.0.2.0.20060301.rh1-0
@@ -189,8 +193,8 @@
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2-0.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Thu Dec 22 2005 Andrw Cagney <cagney at redhat.com> - 1.0.2-0
-                  Adam Jocksch <ajocksch at redhat.com>
+* Thu Dec 22 2005 Andrew Cagney <cagney at redhat.com> - 1.0.2-0
+		  Adam Jocksch <ajocksch at redhat.com>
 - import cairo-java-1.0.2.tar.gz.
 
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 1.0.0-5



From fedora-cvs-commits at redhat.com  Fri Apr 20 17:37:44 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 13:37:44 -0400
Subject: rpms/libgtk-java/devel libgtk-java.spec,1.73,1.74
Message-ID: <200704201737.l3KHbiZB010541@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgtk-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6427

Modified Files:
	libgtk-java.spec 
Log Message:
- Adhere to packaging guidelines.
- Resolves: #226025


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- libgtk-java.spec	5 Mar 2007 18:47:14 -0000	1.73
+++ libgtk-java.spec	20 Apr 2007 17:37:42 -0000	1.74
@@ -18,19 +18,18 @@
 Summary:	Java bindings for GTK+
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	2.8.7
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
 Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/2.8/%{name_base}-%{version}.tar.bz2
 Patch0:		libgtk-java-Drawable-region.patch
 Patch1:		%{name}-gjavah.patch
-
-BuildRoot:	%{_tmppath}/%{name_base}-%{version}-root
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	%{c_pkg_prefix}gtk2 >= 2.8.0
 Requires:	%{java_pkg_prefix}cairo-java >= 1.0.5
-Requires:       %{java_pkg_prefix}glib-java >= 0.2.6
+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
@@ -41,9 +40,9 @@
 applications in Java.  It is part of Java-GNOME.
 
 %package        devel
-Summary:        Compressed Java source files for %{name}.
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+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
@@ -112,7 +111,7 @@
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING INSTALL README NEWS THANKS doc/FAQ.html
+%doc AUTHORS COPYING README NEWS THANKS doc/FAQ.html
 %dir %{_includedir}/%{name_base}
 %{_includedir}/%{name_base}/*
 %{_libdir}/libgtkjava-*.so
@@ -131,6 +130,10 @@
 
 
 %changelog
+* Fri Apr 20 2007 Stepan Kasal <skasal at redhat.com> - 2.8.7-5
+- Adhere to packaging guidelines.
+- Resolves: #226025
+
 * Mon Mar  5 2007 Stepan Kasal <skasal at redhat.com> - 2.8.7-4
 - Touch aclocal.m4, configure, Makefile.in after applying patch1.
 - Force -fPIC and avoid -Wall with gcj/ecj.
@@ -194,11 +197,11 @@
 - Add -X to src zip and ensure Config.java has the same mod time across
   platforms - needed for multilib.
 
-* Thu May 11 2006 Stepan Kasal <skasal at redhat.com>    - 2.8.4-2
+* Thu May 11 2006 Stepan Kasal <skasal at redhat.com> - 2.8.4-2
 - Fix a typo in the Makefile.jni snippet.
 - Re-run autotools.
 
-* Wed May 10 2006 Stepan Kasal <skasal at redhat.com>    - 2.8.4-1
+* Wed May 10 2006 Stepan Kasal <skasal at redhat.com> - 2.8.4-1
 - Incorporated the three patches to the spec file.
 - Removed Makefile.jni from the cellrenderer patch.
 - Fixed the treerowreferences patch according to Adam's advice.
@@ -207,7 +210,7 @@
 - Committed patches for treerowreferences, treemodelsort functions,
 and cellrenderer properties, no changes to spec file.
 
-* Fri Apr 28 2006 Stepan Kasal <skasal at redhat.com>    - 2.8.4-0
+* 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.
@@ -232,7 +235,7 @@
 - updated tarball to libgtk-java-2.8.3.tar.gz.
 
 * Thu Dec 22 2005 Andrew Cagney <cagney at redhat.com> - 2.8.2-0
-                  Adam Jocksch <ajocksch at redhat.com>
+		  Adam Jocksch <ajocksch at redhat.com>
 - import libgtk-java-2.8.2.tar.gz
 
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 2.8.1-3
@@ -332,4 +335,3 @@
 - Few cleanups.
 * Fri Oct 08 2004 Luca De Rugeriis <piedamaro at fastwebnet.it> 2.4.3-1
 - Initial release.
-                                                              164,1         Bo



From fedora-cvs-commits at redhat.com  Fri Apr 20 17:38:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 13:38:26 -0400
Subject: rpms/libgconf-java/devel libgconf-java.spec,1.43,1.44
Message-ID: <200704201738.l3KHcQJJ006093@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgconf-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6077

Modified Files:
	libgconf-java.spec 
Log Message:
- Adhere to packaging guidelines.
- Resolves: #226007


Index: libgconf-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/devel/libgconf-java.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- libgconf-java.spec	21 Mar 2007 13:36:48 -0000	1.43
+++ libgconf-java.spec	20 Apr 2007 17:38:24 -0000	1.44
@@ -3,12 +3,12 @@
 Summary:	Java bindings for GConf
 Name:		%{name_base}
 Version:	2.12.4
-Release: 	8%{?dist}
+Release: 	9%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
 Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/2.12/%{name_base}-%{version}.tar.bz2
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Patch:		%{name}-gjavah.patch
 
@@ -28,10 +28,10 @@
 libgconf-java is a language binding that allows developers to use the
 GConf APIs from Java applications.  It is part of Java-GNOME.
 
-%package       	devel
-Summary:        Compressed Java source files for %{name}.
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+%package        devel
+Summary:	Compressed Java source files for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 Requires:	GConf2-devel
 Requires:	glib-java-devel
 
@@ -68,7 +68,7 @@
 
 # rename doc dir to reflect package rename, if the names differ
 if [ 'x%{name_base}' != 'x%{name_base}' ] ; then
-        mv $RPM_BUILD_ROOT%{_docdir}/%{name_base}-%{version} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+	mv $RPM_BUILD_ROOT%{_docdir}/%{name_base}-%{version} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 fi
 
 # Remove unpackaged files:
@@ -105,6 +105,10 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Fri Apr 20 2007 Stepan Kasal <skasal at redhat.com> - 2.12.4-9
+- Adhere to packaging guidelines.
+- Resolves: #226007
+
 * Wed Mar 21 2007 Stepan Kasal <skasal at redhat.com> - 2.12.4-8
 - BuildRequire java-devel instead of java-1.4.2-gcj-compat-devel.
 



From fedora-cvs-commits at redhat.com  Fri Apr 20 17:38:58 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 13:38:58 -0400
Subject: rpms/libglade-java/devel libglade-java.spec,1.49,1.50
Message-ID: <200704201738.l3KHcvbh006167@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libglade-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6153

Modified Files:
	libglade-java.spec 
Log Message:
- Adhere to packaging guidelines.
- Resolves: #226011



Index: libglade-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/devel/libglade-java.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- libglade-java.spec	5 Mar 2007 19:16:49 -0000	1.49
+++ libglade-java.spec	20 Apr 2007 17:38:55 -0000	1.50
@@ -15,12 +15,12 @@
 Summary:	Java bindings for libglade
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	2.12.5
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
 Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/2.12/%{name_base}-%{version}.tar.bz2
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Patch:		%{name}-gjavah.patch
 
@@ -38,9 +38,9 @@
 Java applications that use libglade.  It is part of Java-GNOME.
 
 %package        devel
-Summary:        Compressed Java source files for %{name}.
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Summary:	Compressed Java source files for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 Requires:	libglade2-devel
 Requires:	libgnome-java-devel
 
@@ -118,6 +118,10 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Fri Apr 20 2007 Stepan Kasal <skasal at redhat.com> - 2.12.5-7
+- Adhere to packaging guidelines.
+- Resolves: #226011
+
 * Mon Mar  5 2007 Stepan Kasal <skasal at redhat.com> - 2.12.5-6
 - Add patch for gcjh -> gjavah; touch aclocal.m4, configure, Makefile.in
   after applying it.
@@ -173,7 +177,7 @@
 - Add -X to src zip and ensure Config.java has the same mod time across
   platforms - needed for multilib.
 
-* Sat Apr 29 2006 Stepan Kasal <skasal at redhat.com>    - 2.12.3-0
+* Sat Apr 29 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-0
 - New version.
 - Try to build on s390x again.
 



From fedora-cvs-commits at redhat.com  Fri Apr 20 17:39:38 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 13:39:38 -0400
Subject: rpms/libgnome-java/devel libgnome-java.spec,1.47,1.48
Message-ID: <200704201739.l3KHdcaC006229@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgnome-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6215

Modified Files:
	libgnome-java.spec 
Log Message:
- Adhere to packaging guidelines.
- Resolves: #226014


Index: libgnome-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/devel/libgnome-java.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- libgnome-java.spec	5 Mar 2007 19:07:00 -0000	1.47
+++ libgnome-java.spec	20 Apr 2007 17:39:35 -0000	1.48
@@ -15,12 +15,12 @@
 Summary:	Java bindings for libgnome
 Name:		%{java_pkg_prefix}%{name_base}	
 Version:	2.12.4
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
 Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/2.12/%{name_base}-%{version}.tar.bz2
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Patch:		%{name}-gjavah.patch
 
@@ -38,10 +38,10 @@
 libgnome-java is a language binding that allows developers to write
 GNOME applications in Java.  It is part of Java-GNOME.
 
-%package       	devel
-Summary:        Compressed Java source files for %{name}.
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+%package       devel
+Summary:	Compressed Java source files for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 Requires:	libgnomeui-devel
 Requires:	libgnomecanvas-devel
 Requires:	libgtk-java-devel
@@ -61,7 +61,7 @@
 # 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
+	export PKG_CONFIG_PATH=/opt/frysk/lib/pkgconfig
 fi
 
 # Two workarounds:
@@ -85,7 +85,7 @@
 
 # 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}
+	mv $RPM_BUILD_ROOT%{_docdir}/%{name_base}-%{version} $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}
 fi
 
 # Remove unpackaged files:
@@ -122,6 +122,10 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Fri Apr 20 2007 Stepan Kasal <skasal at redhat.com> - 2.12.4-7
+- Adhere to packaging guidelines.
+- Resolves: #226014
+
 * Mon Mar  5 2007 Stepan Kasal <skasal at redhat.com> - 2.12.4-6
 - Add patch for gcjh -> gjavah; touch aclocal.m4, configure, Makefile.in
   after applying it.
@@ -171,7 +175,7 @@
 - Add -X to src zip and ensure Config.java has the same mod time across
   platforms - needed for multilib.
 
-* Tue May  2 2006 Stepan Kasal <skasal at redhat.com>    - 2.12.2-0
+* Tue May  2 2006 Stepan Kasal <skasal at redhat.com> - 2.12.2-0
 - New upstream version.
 - Fix the (Build)Requires according to the configure.ac.
 - Try to build on s390x again.



From fedora-cvs-commits at redhat.com  Fri Apr 20 17:58:56 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 13:58:56 -0400
Subject: rpms/mysql-connector-odbc/devel myodbc-multilib.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 myodbc-shutdown.patch, 1.1,
	1.2 mysql-connector-odbc.spec, 1.7, 1.8 sources, 1.2, 1.3
Message-ID: <200704201758.l3KHwuDn006596@cvs.devel.redhat.com>

Author: tgl

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

Modified Files:
	.cvsignore myodbc-shutdown.patch mysql-connector-odbc.spec 
	sources 
Added Files:
	myodbc-multilib.patch 
Log Message:
Update to mysql-connector-odbc 3.51.14r248-1

myodbc-multilib.patch:
 configure.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE myodbc-multilib.patch ---
Get rid of useless and pernicious -L/usr/lib


diff -Naur mysql-connector-odbc-3.51.14r248.orig/configure.in mysql-connector-odbc-3.51.14r248/configure.in
--- mysql-connector-odbc-3.51.14r248.orig/configure.in	2007-03-08 12:26:58.000000000 -0500
+++ mysql-connector-odbc-3.51.14r248/configure.in	2007-04-20 13:35:35.000000000 -0400
@@ -183,7 +183,7 @@
   else
    LTDL_LIB="-L$withval/lib -lltdl"
   fi
-], [LTDL_LIB="-L/usr/lib -lltdl"])
+], [LTDL_LIB="-lltdl"])
 AC_SUBST(LTDL_LIB)
 
 dnl AC_CHECK_LIB(ltdl, lt_dlinit, [],


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mysql-connector-odbc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Nov 2005 22:19:01 -0000	1.2
+++ .cvsignore	20 Apr 2007 17:58:49 -0000	1.3
@@ -1 +1 @@
-mysql-connector-odbc-3.51.12.tar.gz
+mysql-connector-odbc-3.51.14r248.tar.gz

myodbc-shutdown.patch:
 handle.c |    1 -
 1 files changed, 1 deletion(-)

Index: myodbc-shutdown.patch
===================================================================
RCS file: /cvs/dist/rpms/mysql-connector-odbc/devel/myodbc-shutdown.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- myodbc-shutdown.patch	27 Mar 2006 17:57:44 -0000	1.1
+++ myodbc-shutdown.patch	20 Apr 2007 17:58:49 -0000	1.2
@@ -3,14 +3,14 @@
 accounts for our bug #185343 and several bugs filed at mysql.com.
 
 
-diff -Naur mysql-connector-odbc-3.51.12.orig/driver/handle.c mysql-connector-odbc-3.51.12/driver/handle.c
---- mysql-connector-odbc-3.51.12.orig/driver/handle.c	2005-10-09 15:33:40.000000000 -0400
-+++ mysql-connector-odbc-3.51.12/driver/handle.c	2006-03-24 14:28:33.000000000 -0500
-@@ -107,7 +107,6 @@
-   GlobalFree(GlobalHandle((HGLOBAL) henv));
+diff -Naur mysql-connector-odbc-3.51.14r248.orig/driver/handle.c mysql-connector-odbc-3.51.14r248/driver/handle.c
+--- mysql-connector-odbc-3.51.14r248.orig/driver/handle.c	2007-03-07 18:56:40.000000000 -0500
++++ mysql-connector-odbc-3.51.14r248/driver/handle.c	2007-04-20 13:12:25.000000000 -0400
+@@ -121,7 +121,6 @@
+     GlobalFree(GlobalHandle((HGLOBAL) henv));
  #else
-   if (henv) my_free((char*) henv,MYF(0));
--  myodbc_end();
+     if (henv) my_free((char*) henv,MYF(0));
+-    myodbc_end();
  #endif /* _UNIX_ */
-   return (SQL_SUCCESS);
+     return(SQL_SUCCESS);
  }


Index: mysql-connector-odbc.spec
===================================================================
RCS file: /cvs/dist/rpms/mysql-connector-odbc/devel/mysql-connector-odbc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mysql-connector-odbc.spec	17 Jul 2006 14:56:58 -0000	1.7
+++ mysql-connector-odbc.spec	20 Apr 2007 17:58:49 -0000	1.8
@@ -1,17 +1,19 @@
 Summary: ODBC driver for MySQL
 Name: mysql-connector-odbc
-Version: 3.51.12
-Release: 2.2
+Version: 3.51.14r248
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.mysql.com/downloads/api-myodbc.html
-Source: http://www.mysql.com/Downloads/MyODBC/mysql-connector-odbc-%{version}.tar.gz
+Source: http://dev.mysql.com/downloads/connector/odbc/mysql-connector-odbc-%{version}.tar.gz
 Patch1: myodbc-locale.patch
 Patch2: myodbc-shutdown.patch
+Patch3: myodbc-multilib.patch
+
 Requires: unixODBC
 BuildRequires: mysql-devel unixODBC-devel
 BuildRequires: automake autoconf libtool libtool-ltdl-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 An ODBC (rev 3) driver for MySQL, for use with unixODBC.
@@ -21,6 +23,7 @@
 
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 CFLAGS="%{optflags} -fno-strict-aliasing"
@@ -54,6 +57,11 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/libmyodbc3.*a
 rm -f $RPM_BUILD_ROOT%{_libdir}/libmyodbc3_r.*a
 
+# makefile thinks it should install docs in totally wrong place
+rm -f $RPM_BUILD_ROOT/usr/share/mysql-connector-odbc/README
+rm -f $RPM_BUILD_ROOT/usr/share/mysql-connector-odbc/README.debug
+rm -f $RPM_BUILD_ROOT/usr/share/mysql-connector-odbc/ChangeLog
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -63,10 +71,15 @@
 
 %files
 %defattr(-,root,root)
-%doc README ChangeLog COPYING EXCEPTIONS
+%doc README README.debug ChangeLog LICENSE.gpl LICENSE.exceptions
 %{_libdir}/lib*so
 
 %changelog
+* Fri Apr 20 2007 Tom Lane <tgl at redhat.com> 3.51.14r248-1
+- Update to mysql-connector-odbc 3.51.14r248-1
+Resolves: #236473
+- Fix build problem on multilib machines
+
 * Mon Jul 17 2006 Tom Lane <tgl at redhat.com> 3.51.12-2.2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mysql-connector-odbc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Nov 2005 22:19:01 -0000	1.2
+++ sources	20 Apr 2007 17:58:49 -0000	1.3
@@ -1 +1 @@
-a484f590464fb823a8f821b2f1fd7fef  mysql-connector-odbc-3.51.12.tar.gz
+87918b6daf67beebb9ddd9b576fe5d36  mysql-connector-odbc-3.51.14r248.tar.gz



From fedora-cvs-commits at redhat.com  Fri Apr 20 18:01:29 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 14:01:29 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.298,
	1.299 policycoreutils.spec, 1.403, 1.404
Message-ID: <200704201801.l3KI1TTH006759@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Fri Apr 20 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-10
- Fix genhomedircon to handle non user_u for the default user


policycoreutils-rhat.patch:
 Makefile                     |    2 +-
 audit2allow/Makefile         |    3 ++-
 audit2why/Makefile           |    2 +-
 restorecon/restorecon.c      |   17 ++++++++++++-----
 restorecond/restorecond.c    |   12 +++++++-----
 restorecond/restorecond.conf |    3 +++
 restorecond/restorecond.init |    1 +
 scripts/chcat                |   17 ++++++++++-------
 scripts/fixfiles             |    2 +-
 scripts/genhomedircon        |   30 ++++++++++++++++++++++--------
 semanage/seobject.py         |   10 +++++++---
 11 files changed, 67 insertions(+), 32 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- policycoreutils-rhat.patch	18 Apr 2007 18:35:05 -0000	1.298
+++ policycoreutils-rhat.patch	20 Apr 2007 18:01:26 -0000	1.299
@@ -200,7 +200,7 @@
  
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-2.0.9/scripts/genhomedircon
 --- nsapolicycoreutils/scripts/genhomedircon	2006-11-28 09:24:33.000000000 -0500
-+++ policycoreutils-2.0.9/scripts/genhomedircon	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.9/scripts/genhomedircon	2007-04-20 13:58:01.000000000 -0400
 @@ -26,6 +26,7 @@
  
  import sys, os, pwd, string, getopt, re
@@ -209,7 +209,41 @@
  import gettext
  gettext.install('policycoreutils')
  
-@@ -249,7 +250,10 @@
+@@ -135,6 +136,9 @@
+ 		self.contextdir = "/contexts"
+ 		self.filecontextdir = self.contextdir+"/files"
+ 		self.usepwd = usepwd
++		self.default_user = "user_u"
++		self.default_prefix = "user"
++		self.users = self.getUsers()
+ 
+ 	def getFileContextDir(self):
+ 		return self.selinuxdir+self.type+self.filecontextdir
+@@ -211,6 +215,10 @@
+ 		prefs["prefix"] = prefix
+ 		prefs["home"] = home
+ 		udict[user] = prefs
++			
++	def setDefaultUser(self, user, prefix):
++		self.default_user = user
++		self.default_prefix = prefix
+ 		
+ 	def getUsers(self):
+ 		udict = {}
+@@ -219,7 +227,11 @@
+ 			for seuser in list:
+ 				user = []
+ 				seusername = semanage_seuser_get_sename(seuser)
+-				self.adduser(udict, semanage_seuser_get_name(seuser), seusername, self.get_default_prefix(seusername))
++				prefix = self.get_default_prefix(seusername)
++				if semanage_seuser_get_name(seuser) == "__default__":
++					self.setDefaultUser(seusername, prefix)
++
++				self.adduser(udict, semanage_seuser_get_name(seuser), seusername, prefix)
+ 				
+ 		else:
+ 			try:
+@@ -249,7 +261,10 @@
  				i = i.replace("HOME_DIR", home)
  				i = i.replace("ROLE", prefix)
  				i = i.replace("system_u", seuser)
@@ -221,6 +255,34 @@
  		fd.close()
  		return ret
  
+@@ -266,12 +281,11 @@
+ 		return ret
+ 
+ 	def genHomeDirContext(self):
+-		users = self.getUsers()
+ 		ret = ""
+ 		# Fill in HOME and prefix for users that are defined
+-		for u in users.keys():
+-			ret += self.getHomeDirContext (u, users[u]["seuser"], users[u]["home"], users[u]["prefix"])
+-			ret += self.getUserContext (u, users[u]["seuser"], users[u]["prefix"])
++		for u in self.users.keys():
++			ret += self.getHomeDirContext (u, self.users[u]["seuser"], self.users[u]["home"], self.users[u]["prefix"])
++			ret += self.getUserContext (u, self.users[u]["seuser"], self.users[u]["prefix"])
+ 		return ret+"\n"
+ 
+ 	def checkExists(self, home):
+@@ -318,9 +332,9 @@
+ 	def genoutput(self):
+ 		ret = self.heading()
+ 		for h in self.getHomeDirs():
+-			ret += self.getHomeDirContext ("user_u", "user_u" , h+'/[^/]*', "user")
++			ret += self.getHomeDirContext (self.default_user, self.default_user, h+'/[^/]*', self.default_prefix)
+ 			ret += self.getHomeRootContext(h)
+-		ret += self.getUserContext(".*", "user_u", "user") + "\n"
++		ret += self.getUserContext(".*", self.default_user, self.default_prefix) + "\n"
+ 		ret += self.genHomeDirContext()
+ 		return ret
+ 
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.9/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2007-04-12 12:43:06.000000000 -0400
 +++ policycoreutils-2.0.9/semanage/seobject.py	2007-04-16 13:26:34.000000000 -0400


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -r1.403 -r1.404
--- policycoreutils.spec	19 Apr 2007 13:38:40 -0000	1.403
+++ policycoreutils.spec	20 Apr 2007 18:01:27 -0000	1.404
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 2.0.9
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Fri Apr 20 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-10
+- Fix genhomedircon to handle non user_u for the default user
+
 * Wed Apr 18 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-9
 - More cleanups for gui
 



From fedora-cvs-commits at redhat.com  Fri Apr 20 18:02:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 14:02:23 -0400
Subject: rpms/kernel/FC-6/configs config-generic, 1.268,
	1.268.6.1 config-s390-generic, 1.22, 1.22.54.1
Message-ID: <200704201802.l3KI2N1w006950@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-netdev-fc6-10-branch
	config-generic config-s390-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-generic,v
retrieving revision 1.268
retrieving revision 1.268.6.1
diff -u -r1.268 -r1.268.6.1
--- config-generic	29 Mar 2007 22:19:24 -0000	1.268
+++ config-generic	20 Apr 2007 18:02:21 -0000	1.268.6.1
@@ -485,7 +485,7 @@
 # CONFIG_PATA_JMICRON is not set
 # CONFIG_PATA_LEGACY is not set
 # CONFIG_PATA_TRIFLEX is not set
-CONFIG_PATA_MARVELL=y
+# CONFIG_PATA_MARVELL is not set
 # CONFIG_PATA_MPIIX is not set
 # CONFIG_PATA_OLDPIIX is not set
 # CONFIG_PATA_NETCELL is not set
@@ -637,7 +637,9 @@
 CONFIG_TCP_CONG_LP=m
 CONFIG_TCP_CONG_VENO=m
 
+CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_MD5SIG=y
+CONFIG_TCP_MD5SIG_DEBUG=y
 
 #
 # Networking options
@@ -646,6 +648,7 @@
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -703,6 +706,7 @@
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
@@ -725,6 +729,7 @@
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
@@ -775,13 +780,14 @@
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
@@ -848,6 +854,7 @@
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RT=m
@@ -884,6 +891,7 @@
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
@@ -1091,8 +1099,10 @@
 CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_ADAPTEC_STARFIRE_NAPI=y
 CONFIG_B44=m
+CONFIG_B44_PCI=y
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
 # CONFIG_DGRS is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_E100=m
@@ -1117,6 +1127,7 @@
 CONFIG_VIA_RHINE_MMIO=y
 CONFIG_VIA_RHINE_NAPI=y
 CONFIG_VIA_VELOCITY=m
+CONFIG_SC92031=m
 CONFIG_NET_POCKET=y
 CONFIG_ATP=m
 CONFIG_DE600=m
@@ -1153,9 +1164,12 @@
 CONFIG_S2IO_NAPI=y
 CONFIG_MYRI10GE=m
 CONFIG_NETXEN_NIC=m
+CONFIG_PASEMI_MAC=m
+CONFIG_VIOC=m
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y
+CONFIG_CHELSIO_T3=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1183,18 +1197,33 @@
 CONFIG_NET_RADIO=y
 
 #
-# Obsolete Wireless cards support (pre-802.11)
+# Wireless LAN
 #
+CONFIG_WLAN_PRE80211=y
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
+CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+CONFIG_MAC80211_DEBUG=y
+# CONFIG_MAC80211_VERBOSE_DEBUG is not set
+# CONFIG_MAC80211_LOWTX_FRAME_DUMP is not set
+CONFIG_TKIP_DEBUG=y
+CONFIG_MAC80211_DEBUG_COUNTERS=y
+# CONFIG_HOSTAPD_WPA_TESTING is not set
+CONFIG_MAC80211_IBSS_DEBUG=y
+# CONFIG_MAC80211_VERBOSE_PS_DEBUG is not set
+
+CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT_COMPAT=y
+CONFIG_CFG80211_WEXTNL_COMPAT=y
+CONFIG_NL80211=y
+
 #
 # Wireless 802.11b ISA/PCI cards support
 #
@@ -1212,6 +1241,8 @@
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_USB_DEBUG=y
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1221,6 +1252,7 @@
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_PRISM54=m
+CONFIG_PRISM54_USB=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
 
@@ -1242,6 +1274,30 @@
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HOSTAP_CS=m
 
+CONFIG_BCM43XX_MAC80211=m
+CONFIG_BCM43XX_MAC80211_PCI=y
+CONFIG_BCM43XX_MAC80211_PCMCIA=y
+CONFIG_BCM43XX_MAC80211_DEBUG=y
+CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y
+CONFIG_RT2X00=y
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2X00_DEBUGFS=m
+CONFIG_RT2X00_DEBUG=y
+CONFIG_ADM8211=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_ZD1211RW_MAC80211=m
+CONFIG_ZD1211RW_MAC80211_DEBUG=y
+CONFIG_RTL818X=y
+CONFIG_RTL8187=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_DEBUG=y
+
 #
 # Token Ring devices
 #
@@ -1848,6 +1904,14 @@
 CONFIG_MAX_RAW_DEVS=8192
 CONFIG_HANGCHECK_TIMER=m
 
+CONFIG_SSB=m
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SILENT=n
+CONFIG_SSB_DEBUG=n
+CONFIG_SSB_SERIAL=n
+CONFIG_SSB_DRIVER_PCICORE=y
+
 #
 # Multimedia devices
 #
@@ -2233,6 +2297,7 @@
 CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_CS=m
+CONFIG_USB_OHCI_HCD_SSB=y
 
 #
 # USB Device Class drivers
@@ -2719,7 +2784,7 @@
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_NETWORK_XFRM=y
+# CONFIG_SECURITY_NETWORK_XFRM is not set
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
@@ -2780,6 +2845,8 @@
 #
 CONFIG_CRC16=m
 CONFIG_CRC32=m
+CONFIG_CRC_ITU_T=m
+CONFIG_EEPROM_93CX6=m
 CONFIG_CRC_CCITT=m
 
 CONFIG_ZLIB_INFLATE=y


Index: config-s390-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-s390-generic,v
retrieving revision 1.22
retrieving revision 1.22.54.1
diff -u -r1.22 -r1.22.54.1
--- config-s390-generic	21 Dec 2006 21:45:14 -0000	1.22
+++ config-s390-generic	20 Apr 2007 18:02:21 -0000	1.22.54.1
@@ -106,6 +106,7 @@
 CONFIG_LCS=m
 CONFIG_CTC=m
 CONFIG_IUCV=m
+CONFIG_AFIUCV=m
 CONFIG_QETH=m
 CONFIG_QETH_IPV6=y
 CONFIG_QETH_VLAN=y



From fedora-cvs-commits at redhat.com  Fri Apr 20 18:35:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 14:35:01 -0400
Subject: rpms/MySQL-python/devel .cvsignore, 1.8, 1.9 MySQL-python.spec, 1.26,
	1.27 sources, 1.8, 1.9
Message-ID: <200704201835.l3KIZ13b023410@cvs.devel.redhat.com>

Author: tgl

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

Modified Files:
	.cvsignore MySQL-python.spec sources 
Log Message:
Update to 1.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/MySQL-python/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Dec 2006 21:19:59 -0000	1.8
+++ .cvsignore	20 Apr 2007 18:34:59 -0000	1.9
@@ -1 +1 @@
-MySQL-python-1.2.1_p2.tar.gz
+MySQL-python-1.2.2.tar.gz


Index: MySQL-python.spec
===================================================================
RCS file: /cvs/dist/rpms/MySQL-python/devel/MySQL-python.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- MySQL-python.spec	7 Dec 2006 18:23:16 -0000	1.26
+++ MySQL-python.spec	20 Apr 2007 18:34:59 -0000	1.27
@@ -1,15 +1,16 @@
 Summary: An interface to MySQL
 Name: MySQL-python
-Version: 1.2.1_p2
-Release: 2
+Version: 1.2.2
+Release: 1%{?dist}
 License: GPL
 Group: Development/Libraries
-Source0: http://prdownloads.sourceforge.net/mysql-python/MySQL-python-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-buildroot
 URL: http://sourceforge.net/projects/mysql-python/
+Source0: http://prdownloads.sourceforge.net/mysql-python/MySQL-python-%{version}.tar.gz
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python mx mysql
 Requires: python
-BuildRequires: python-devel
+BuildRequires: python-devel python-setuptools
 BuildRequires: mysql-devel python Distutils gcc zlib-devel
 
 %description
@@ -49,7 +50,7 @@
 
 %files -f INSTALLED_FILES
 %defattr(-,root,root)
-%doc README doc/*
+%doc README GPL doc/*
 %dir %{_libdir}/python?.?/site-packages/MySQLdb
 %{_libdir}/python?.?/site-packages/MySQLdb/*.pyo
 %{_libdir}/python?.?/site-packages/MySQLdb/constants/*.pyo
@@ -57,6 +58,9 @@
 %dir /usr/%{_lib}/python?.?/site-packages/MySQLdb/constants
 
 %changelog
+* Fri Apr 20 2007 Tom Lane <tgl at redhat.com> 1.2.2-1
+- Update to 1.2.2
+
 * Thu Dec  7 2006 Jeremy Katz <katzj at redhat.com> - 1.2.1_p2-2
 - rebuild for python 2.5
 
@@ -144,13 +148,13 @@
 * Thu May 23 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Mon May 13 2002 Trond Eivind Glomsr?d <teg at redhat.com> 0.9.1-2
+* Mon May 13 2002 Trond Eivind Glomsrd <teg at redhat.com> 0.9.1-2
 - Build for newer python
 
-* Wed Mar 13 2002 Trond Eivind Glomsr?d <teg at redhat.com> 0.9.1-1
+* Wed Mar 13 2002 Trond Eivind Glomsrd <teg at redhat.com> 0.9.1-1
 - 0.9.1
 
-* Tue Feb 26 2002 Trond Eivind Glomsr?d <teg at redhat.com> 0.9.0-6
+* Tue Feb 26 2002 Trond Eivind Glomsrd <teg at redhat.com> 0.9.0-6
 - Rebuild
 
 * Thu Jan 31 2002 Elliot Lee <sopwith at redhat.com> 0.9.0-5
@@ -160,11 +164,11 @@
 * Wed Jan 09 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Fri Sep 14 2001 Trond Eivind Glomsr?d <teg at redhat.com> 0.9.0-3
+* Fri Sep 14 2001 Trond Eivind Glomsrd <teg at redhat.com> 0.9.0-3
 - Build for Python 2.2
 
-* Mon Jul 23 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon Jul 23 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - Add zlib-devel to buildrequires (#49788)
 
-* Tue Jun 19 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Tue Jun 19 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/MySQL-python/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Dec 2006 21:19:59 -0000	1.8
+++ sources	20 Apr 2007 18:34:59 -0000	1.9
@@ -1 +1 @@
-e6b9ea21fd91cb4a5663304da727bb70  MySQL-python-1.2.1_p2.tar.gz
+532268f02870bea18c1d465e88afff30  MySQL-python-1.2.2.tar.gz



From fedora-cvs-commits at redhat.com  Fri Apr 20 18:58:06 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 14:58:06 -0400
Subject: rpms/kernel/FC-6 kernel-2.6.spec, 1.2944.4.1, 1.2944.4.2
	4978-ieee80211-crypt-Make-some-TKIP-and-CCMP-error-logging-conditional.txt,
	1.1.2.1, NONE
Message-ID: <200704201858.l3KIw6Hx008069@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-netdev-fc6-10-branch
	kernel-2.6.spec 
Removed Files:
      Tag: private-linville-netdev-fc6-10-branch
	4978-ieee80211-crypt-Make-some-TKIP-and-CCMP-error-logging-conditional.txt 
Log Message:



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2944.4.1
retrieving revision 1.2944.4.2
diff -u -r1.2944.4.1 -r1.2944.4.2
--- kernel-2.6.spec	20 Apr 2007 18:02:19 -0000	1.2944.4.1
+++ kernel-2.6.spec	20 Apr 2007 18:58:04 -0000	1.2944.4.2
@@ -1270,194 +1270,193 @@
 Patch30628: 4975-zd1211rw-rework-band-edge-patching.txt
 Patch30629: 4976-zd1211rw-Add-AL7230B-RF-support-for-ZD1211B.txt
 Patch30630: 4977-zd1211rw-Add-ID-for-ZyXEL-AG-220.txt
-Patch30631: 4978-ieee80211-crypt-Make-some-TKIP-and-CCMP-error-logging-conditional.txt
-Patch30632: 4979-prism54usb-fix-breakage-from-skb-input_device-removal.txt
-Patch30633: 4980-NETFILTER-ipt_CLUSTERIP-fix-oops-in-checkentry-function.txt
-Patch30634: 4986-skge-turn-carrier-off-when-down.txt
-Patch30635: 4987-sky2-turn-carrier-off-when-down.txt
-Patch30636: 4988-sky2-turn-on-clocks-when-doing-resume.txt
-Patch30637: 4989-sky2-phy-workarounds-for-Yukon-EC-U-A1.txt
-Patch30638: 4990-skge-fix-wake-on-lan.txt
-Patch30639: 4991-cxgb3-avoid-deadlock-with-mac-watchdog.txt
-Patch30640: 4992-cxgb3-MAC-watchdog-update.txt
-Patch30641: 4993-cxgb3-missing-CPL-hanler-and-register-setting.txt
-Patch30642: 4994-myri10ge-fix-management-of-the-firmware-4KB-boundary-crossing-restriction.txt
-Patch30643: 4995-myri10ge-more-Intel-chipsets-providing-aligned-PCIe-completions.txt
-Patch30644: 4996-myri10ge-update-driver-version-to-1.3.0-1.233.txt
-Patch30645: 4997-Fabric7-VIOC-driver-source-code.txt
-Patch30646: 4998-Fabric7-VIOC-driver-fixes.txt
-Patch30647: 4999-drivers-net-vioc-vioc_driver.c-replace-pci_module_init-with-pci_register_driver.txt
-Patch30648: 5000-netdrvr-e100-experiment-with-doing-RX-in-a-similar-manner-to-eepro100.txt
-Patch30649: 5001-e1000-FIX-be-ready-for-incoming-irq-at-pci_request_irq.txt
-Patch30650: 5002-e1000-FIX-firmware-handover-bits.txt
-Patch30651: 5003-e1000-FIX-Stop-raw-interrupts-disabled-nag-from-RT.txt
-Patch30652: 5013-TCP-FRTO-Incorrectly-clears-TCPCB_EVER_RETRANS-bit.txt
-Patch30653: 5014-TCP-FRTO-Separated-response-from-FRTO-detection-algorithm.txt
-Patch30654: 5015-TCP-FRTO-Moved-tcp_use_frto-from-tcp.h-to-tcp_input.c.txt
-Patch30655: 5016-TCP-FRTO-Comment-cleanup-improvement.txt
-Patch30656: 5021-TCP-FRTO-Response-should-reset-also-snd_cwnd_cnt.txt
-Patch30657: 5022-TCP-Don-t-enter-to-fast-recovery-while-using-FRTO.txt
-Patch30658: 5023-TCP-FRTO-frto_counter-modulo-op-converted-to-two-assignments.txt
-Patch30659: 5025-TCP-FRTO-Entry-is-allowed-only-during-New-Reno-like-recovery.txt
-Patch30660: 5028-TCP-Prevent-reordering-adjustments-during-FRTO.txt
-Patch30661: 5031-TCP-YeAH-TCP-algorithm-implementation.txt
-Patch30662: 5032-TCP-Add-RFC3742-Limited-Slow-Start-controlled-by-variable-sysctl_tcp_max_ssthresh.txt
-Patch30663: 5033-TCP-struct-sock-argument-renamed-sp-sk.txt
-Patch30664: 5034-TCP-Keep-copied_seq-rcv_wup-and-rcv_next-together.txt
-Patch30665: 5036-TCP-Correct-reordering-detection-change-no-FRTO-case.txt
-Patch30666: 5041-NET-Keep-sk_backlog-near-sk_lock.txt
-Patch30667: 5042-PKTGEN-use-pr_debug.txt
-Patch30668: 5043-PKTGEN-use-random32.txt
-Patch30669: 5044-PKTGEN-don-t-use-__constant_htonl.txt
-Patch30670: 5045-PKTGEN-fix-device-name-handling.txt
-Patch30671: 5046-NET-Convert-xtime.tv_sec-to-get_seconds.txt
-Patch30672: 5049-NETLINK-Mirror-UDP-MSG_TRUNC-semantics.txt
-Patch30673: 5051-IPV6-IP6TUNNEL-Split-out-generic-routine-in-ip6ip6_err.txt
-Patch30674: 5061-TCP-tcp_cubic-faster-cube-root.txt
-Patch30675: 5062-TCP-TCP-Yeah-cleanup.txt
-Patch30676: 5063-IPV4-Optimize-inet_getpeer.txt
-Patch30677: 5064-UDP6-Restore-sk_filter-optimisation.txt
-Patch30678: 5066-NET-802-Use-hton-s-l-where-appropriate.txt
-Patch30679: 5067-NET-8021Q-Use-htons-where-appropriate.txt
-Patch30680: 5068-NET-ATM-Use-htons-where-appropriate.txt
-Patch30681: 5070-NET-CORE-Use-htons-where-appropriate.txt
-Patch30682: 5071-NET-ETHERNET-Use-htons-where-appropriate.txt
-Patch30683: 5072-NET-IEEE80211-Use-htons-where-appropriate.txt
-Patch30684: 5075-NET-SCHED-Use-htons-where-appropriate.txt
-Patch30685: 5076-NET-TIPC-Use-htons-where-appropriate.txt
-Patch30686: 5078-TCP-DCCP-RANDOM-Remove-unused-exports.txt
-Patch30687: 5084-WIRELESS-use-ARRAY_SIZE.txt
-Patch30688: 5087-NET-deinline-some-functions.txt
-Patch30689: 5089-IPV6-Return-correct-result-for-sticky-options.txt
-Patch30690: 5090-IPV6-Ensure-to-truncate-result-and-return-full-length-for-sticky-options.txt
-Patch30691: 5092-UDP-Use-__skb_pull-since-we-have-checked-it-won-t-fail-with-pskb_may_pull.txt
-Patch30692: 5095-TR-Use-tr_hdr-were-appropriate.txt
-Patch30693: 5096-TR-Make-tr_type_trans-set-skb-dev.txt
-Patch30694: 5098-HIPPI-FDDI-Make-hippi-fddi-_type_trans-set-skb-dev.txt
-Patch30695: 5106-TCP-Do-the-layer-header-setting-in-tcp_collapse-relative-to-skb-data.txt
-Patch30696: 5109-LLC-Kill-llc_set_pdu_hdr.txt
-Patch30697: 5110-PPPOE-Introduce-pppoe_hdr.txt
-Patch30698: 5111-BONDING-Introduce-arp_pkt.txt
-Patch30699: 5112-IPV6-Use-skb-nh.ipv6h-instead-of-casting-skb-nh.raw.txt
-Patch30700: 5122-SK_BUFF-xfrm4-use-skb_reset_network_header.txt
-Patch30701: 5128-NET-network-dev-read_mostly.txt
-Patch30702: 5129-NET-make-seq_operations-const.txt
-Patch30703: 5130-NET-show-bound-packet-types.txt
-Patch30704: 5135-BRIDGE-faster-compare-for-link-local-addresses.txt
-Patch30705: 5142-ICMP6-Introduce-icmp6_hdr.txt
-Patch30706: 5153-NETFILTER-x_tables-remove-duplicate-of-xt_prefix.txt
-Patch30707: 5161-NETFILTER-nf_conntrack-uninline-notifier-registration-functions.txt
-Patch30708: 5164-NETFILTER-nfnetlink-remove-unrequired-check-in-nfnetlink_get_subsys.txt
-Patch30709: 5166-NETFILTER-nfnetlink-move-EXPORT_SYMBOL-declarations-next-to-the-exported-symbol.txt
-Patch30710: 5168-NETFILTER-nf_conntrack-use-jhash2-in-__hash_conntrack.txt
-Patch30711: 5169-NETFILTER-nf_conntrack-add-__nf_copy-to-copy-members-in-skb.txt
-Patch30712: 5170-NETFILTER-nf_conntrack-add-nf_copy-to-safely-copy-members-in-skb.txt
-Patch30713: 5171-NETFILTER-TCP-conntrack-accept-RST-PSH-as-valid.txt
-Patch30714: 5172-NETFILTER-TCP-conntrack-factorize-out-the-PUSH-flag.txt
-Patch30715: 5186-NET_SCHED-sch_cbq-fix-cbq_undelay_prio-for-non-active-priorites.txt
-Patch30716: 5197-IrDA-removing-stir4200-useless-include.txt
-Patch30717: 5198-IrDA-irda-lockdep-annotation.txt
-Patch30718: 5199-IrDA-SMC-SuperIO-Chip-LPC47N227-not-identified-properly.txt
-Patch30719: 5202-SK_BUFF-Adjust-the-zeroing-up-to-tail-in-__alloc_skb-too.txt
-Patch30720: 5206-SK_BUFF-Remove-skb_add_mtu-leftovers.txt
-Patch30721: 5214-DCCP-48-bit-sequence-number-arithmetic.txt
-Patch30722: 5215-DCCP-Make-dccp_delta_seqno-return-signed-numbers.txt
-Patch30723: 5216-DCCP-Make-before-relation-unambiguous.txt
-Patch30724: 5217-DCCP-Fix-for-follows48.txt
-Patch30725: 5218-DCCP-Remove-ambiguity-in-the-way-before48-is-used.txt
-Patch30726: 5219-CCID3-Remove-redundant-len-test.txt
-Patch30727: 5220-CCID3-Re-order-CCID-3-source-file.txt
-Patch30728: 5221-CCID3-Use-MSS-for-larger-initial-windows.txt
-Patch30729: 5222-CCID3-Fix-use-of-invalid-loss-intervals.txt
-Patch30730: 5223-CCID3-More-verbose-debugging.txt
-Patch30731: 5224-CCID3-Remove-race-condition-and-update-t_ipi-when-s-changes.txt
-Patch30732: 5225-DCCP-Always-use-debug-toggle-parameters.txt
-Patch30733: 5226-DCCP-More-debug-information-for-dccp_wait_for_ccid.txt
-Patch30734: 5228-CCID3-More-to-see-in-dccp_probe.txt
-Patch30735: 5229-CCID3-Remove-build-warnings-for-64bit.txt
-Patch30736: 5230-CCID3-Wrap-computation-of-RFC3390-initial-rate-into-separate-function.txt
-Patch30737: 5231-CCID3-Handle-Idle-and-Application-Limited-periods.txt
-Patch30738: 5232-DCCP-Provide-function-for-RTT-sampling.txt
-Patch30739: 5233-CCID3-Use-function-for-RTT-sampling.txt
-Patch30740: 5234-DCCP-Sample-RTT-from-SYN-exchange.txt
-Patch30741: 5235-CCID3-Use-initial-RTT-sample-from-SYN-exchange.txt
-Patch30742: 5250-TCP-cubic-optimization.txt
-Patch30743: 5251-NETEM-report-reorder-percent-correctly.txt
-Patch30744: 5253-NETEM-Optimize-tfifo.txt
-Patch30745: 5259-NETLINK-Remove-unused-groups-variable.txt
-Patch30746: 5265-NETEM-spelling-errors.txt
-Patch30747: 5267-NETFILTER-nfnetlink_log-don-t-count-max-a-b-twice.txt
-Patch30748: 5269-NETFILTER-nfnetlink_log-micro-optimization-for-inst-NULL-in-nfulnl_recv_config.txt
-Patch30749: 5270-NETFILTER-nfnetlink_log-micro-optimization-don-t-modify-destroyed-instance.txt
-Patch30750: 5271-NETFILTER-nfnetlink_log-iterator-functions-need-iter_state-only.txt
-Patch30751: 5273-NETFILTER-nfnetlink_log-remove-conditional-locking.txt
-Patch30752: 5274-NETFILTER-Use-setup_timer.txt
-Patch30753: 5275-NETFILTER-nf_conntrack-don-t-use-nfct-in-skb-if-conntrack-is-disabled.txt
-Patch30754: 5276-NETFILTER-nf_conntrack-kill-destroy-in-struct-nf_conntrack-for-diet.txt
-Patch30755: 5278-NET_SCHED-sch_netem-fix-off-by-one-in-send-time-comparison.txt
-Patch30756: 5288-SCTP-Implement-SCTP_FRAGMENT_INTERLEAVE-socket-option.txt
-Patch30757: 5289-SCTP-Implement-SCTP_PARTIAL_DELIVERY_POINT-option.txt
-Patch30758: 5290-SCTP-Implement-SCTP_ADDR_CONFIRMED-state-for-ADDR_CHNAGE-event.txt
-Patch30759: 5291-SCTP-Honor-flags-when-setting-peer-address-parameters.txt
-Patch30760: 5292-SCTP-Implement-sac_info-field-in-SCTP_ASSOC_CHANGE-notification.txt
-Patch30761: 5293-SCTP-Implement-SCTP_MAX_BURST-socket-option.txt
-Patch30762: 5294-NETLINK-introduce-NLA_BINARY-type.txt
-Patch30763: 5295-INET-Use-jhash-random-secret-for-ehash.txt
-Patch30764: 5296-NET-Do-pmtu-check-in-transport-layer.txt
-Patch30765: 5299-TCP-cubic-update-for-net-2.6.22.txt
-Patch30766: 5302-NET-fib_rules-goto-rule-action.txt
-Patch30767: 5303-NET-fib_rules-Mark-rules-detached-from-the-device.txt
-Patch30768: 5304-NET-fib_rules-Add-no-operation-action.txt
-Patch30769: 5305-IPV4-LVS-Allow-to-send-ICMP-unreachable-responses-when-real-servers-are-removed.txt
-Patch30770: 5307-NET-inet_ehash_secret-should-be-__read_mostly-and-set-only-once.txt
-Patch30771: 5308-NET-fib_rules-Flush-route-cache-after-rule-modifications.txt
-Patch30772: 5309-TCP-tcp_memory_pressure-and-tcp_socket-are__read_mostly-candidates.txt
-Patch30773: 5310-IPV4-align-inet_protos-on-SMP.txt
-Patch30774: 5311-BLUETOOTH-Introduce-skb-data-accessor-methods-for-hci_-acl-event-sco-_hdr.txt
-Patch30775: 5313-NET-fib_rules-delay-route-cache-flush-by-ip_rt_min_delay.txt
-Patch30776: 5315-NET-Inline-net_device_stats.txt
-Patch30777: 5320-NET-Move-generic-skbuff-stuff-from-XFRM-code-to-generic-code.txt
-Patch30778: 5323-IPV6-FIB6RULE-Find-source-address-during-looking-up-route.txt
-Patch30779: 5332-bridge-simpler-hash-with-salt.txt
-Patch30780: 5334-bridge-add-support-for-user-mode-STP.txt
-Patch30781: 5335-bridge-change-when-netlink-events-go-to-STP.txt
-Patch30782: 5336-bridge-allow-changing-hardware-address-to-any-valid-address.txt
-Patch30783: 5338-NET-loopback-driver-can-use-loopback_dev-integrated-net_device_stats.txt
-Patch30784: 5344-NETFILTER-ipt_ULOG-use-put_unaligned.txt
-Patch30785: 5345-PKTGEN-Add-try_to_freeze.txt
-Patch30786: 5346-Fix-bug-in-the-calculation-of-very-low-sending-rates.txt
-Patch30787: 5347-Debug-statements-for-Elapsed-Time-option.txt
-Patch30788: 5357-NETFILTER-ebt_arp-add-gratuitous-arp-filtering.txt
-Patch30789: 5360-NETFILTER-nfnetlink_log-remove-fallback-to-group-0.txt
-Patch30790: 5361-NETFILTER-ipt_ULOG-add-compat-conversion-functions.txt
-Patch30791: 5364-VLAN-Allow-VLAN-interface-on-top-of-bridge-interface.txt
-Patch30792: 5365-IPSEC-XFRM_USER-kernel-panic-when-large-security-contexts-in-ACQUIRE.txt
-Patch30793: 5366-IPV6-SNMP-Fix-In-Out-NoRoutes-statistics.txt
-Patch30794: 5367-NETFILTER-arp_tables-Fix-unaligned-accesses.txt
-Patch30795: 5386-NET_SCHED-Eliminate-qdisc_tree_lock.txt
-Patch30796: 5387-NET_SCHED-ingress-switch-back-to-using-ingress_lock.txt
-Patch30797: 5390-KEY-Fix-conversion-between-IPSEC_MODE_xxx-and-XFRM_MODE_xxx.txt
-Patch30798: 5391-NET-Fix-UDP-checksum-issue-in-net-poll-mode.txt
-Patch30799: 5392-NET-Set-a-separate-lockdep-class-for-neighbour-table-s-proxy_queue.txt
-Patch30800: 5393-SCTP-Fix-assertion-atomic_read-sk-sk_rmem_alloc-failed-message.txt
-Patch30801: 5394-SCTP-Unmap-v4mapped-addresses-during-SCTP_BINDX_REM_ADDR-operation.txt
-Patch30802: 5395-BRIDGE-Unaligned-access-when-comparing-ethernet-addresses.txt
-Patch30803: 5406-knfsd-use-a-spinlock-to-protect-sk_info_authunix.txt
-Patch30804: 5411-IPSEC-af_key-Fix-thinko-in-pfkey_xfrm_policy2msg.txt
-Patch30805: 5413-IrDA-Correctly-handling-socket-error.txt
-Patch30806: 5414-NETLINK-Don-t-attach-callback-to-a-going-away-netlink-socket.txt
-Patch30807: 5416-cxgb3-Fix-low-memory-conditions.txt
-Patch30808: 5417-cxgb3-PHY-interrupts-and-GPIO-pins.txt
-Patch30809: 5418-spidernet-Fix-problem-sending-IP-fragments.txt
-Patch30810: 5419-gianfar-needs-crc32-lib-dependency.txt
-Patch30811: 5420-sky2-disable-support-for-88E8056.txt
-Patch30812: 5421-sky2-handle-descriptor-errors.txt
-Patch30813: 5422-sky2-disable-ASF-on-all-chip-types.txt
-Patch30814: 5423-sky2-EC-U-performance-and-jumbo-support.txt
-Patch30815: 5424-sky2-no-jumbo-on-Yukon-FE.txt
-Patch30816: 5425-sky2-version-1.14.txt
-Patch30817: 5426-PPP-Fix-skbuff.c-BUG-due-incorrect-logic-in-process_input_packet.txt
-Patch30818: 5428-Revert-e1000-fix-NAPI-performance-on-4-port-adapters.txt
+Patch30631: 4979-prism54usb-fix-breakage-from-skb-input_device-removal.txt
+Patch30632: 4980-NETFILTER-ipt_CLUSTERIP-fix-oops-in-checkentry-function.txt
+Patch30633: 4986-skge-turn-carrier-off-when-down.txt
+Patch30634: 4987-sky2-turn-carrier-off-when-down.txt
+Patch30635: 4988-sky2-turn-on-clocks-when-doing-resume.txt
+Patch30636: 4989-sky2-phy-workarounds-for-Yukon-EC-U-A1.txt
+Patch30637: 4990-skge-fix-wake-on-lan.txt
+Patch30638: 4991-cxgb3-avoid-deadlock-with-mac-watchdog.txt
+Patch30639: 4992-cxgb3-MAC-watchdog-update.txt
+Patch30640: 4993-cxgb3-missing-CPL-hanler-and-register-setting.txt
+Patch30641: 4994-myri10ge-fix-management-of-the-firmware-4KB-boundary-crossing-restriction.txt
+Patch30642: 4995-myri10ge-more-Intel-chipsets-providing-aligned-PCIe-completions.txt
+Patch30643: 4996-myri10ge-update-driver-version-to-1.3.0-1.233.txt
+Patch30644: 4997-Fabric7-VIOC-driver-source-code.txt
+Patch30645: 4998-Fabric7-VIOC-driver-fixes.txt
+Patch30646: 4999-drivers-net-vioc-vioc_driver.c-replace-pci_module_init-with-pci_register_driver.txt
+Patch30647: 5000-netdrvr-e100-experiment-with-doing-RX-in-a-similar-manner-to-eepro100.txt
+Patch30648: 5001-e1000-FIX-be-ready-for-incoming-irq-at-pci_request_irq.txt
+Patch30649: 5002-e1000-FIX-firmware-handover-bits.txt
+Patch30650: 5003-e1000-FIX-Stop-raw-interrupts-disabled-nag-from-RT.txt
+Patch30651: 5013-TCP-FRTO-Incorrectly-clears-TCPCB_EVER_RETRANS-bit.txt
+Patch30652: 5014-TCP-FRTO-Separated-response-from-FRTO-detection-algorithm.txt
+Patch30653: 5015-TCP-FRTO-Moved-tcp_use_frto-from-tcp.h-to-tcp_input.c.txt
+Patch30654: 5016-TCP-FRTO-Comment-cleanup-improvement.txt
+Patch30655: 5021-TCP-FRTO-Response-should-reset-also-snd_cwnd_cnt.txt
+Patch30656: 5022-TCP-Don-t-enter-to-fast-recovery-while-using-FRTO.txt
+Patch30657: 5023-TCP-FRTO-frto_counter-modulo-op-converted-to-two-assignments.txt
+Patch30658: 5025-TCP-FRTO-Entry-is-allowed-only-during-New-Reno-like-recovery.txt
+Patch30659: 5028-TCP-Prevent-reordering-adjustments-during-FRTO.txt
+Patch30660: 5031-TCP-YeAH-TCP-algorithm-implementation.txt
+Patch30661: 5032-TCP-Add-RFC3742-Limited-Slow-Start-controlled-by-variable-sysctl_tcp_max_ssthresh.txt
+Patch30662: 5033-TCP-struct-sock-argument-renamed-sp-sk.txt
+Patch30663: 5034-TCP-Keep-copied_seq-rcv_wup-and-rcv_next-together.txt
+Patch30664: 5036-TCP-Correct-reordering-detection-change-no-FRTO-case.txt
+Patch30665: 5041-NET-Keep-sk_backlog-near-sk_lock.txt
+Patch30666: 5042-PKTGEN-use-pr_debug.txt
+Patch30667: 5043-PKTGEN-use-random32.txt
+Patch30668: 5044-PKTGEN-don-t-use-__constant_htonl.txt
+Patch30669: 5045-PKTGEN-fix-device-name-handling.txt
+Patch30670: 5046-NET-Convert-xtime.tv_sec-to-get_seconds.txt
+Patch30671: 5049-NETLINK-Mirror-UDP-MSG_TRUNC-semantics.txt
+Patch30672: 5051-IPV6-IP6TUNNEL-Split-out-generic-routine-in-ip6ip6_err.txt
+Patch30673: 5061-TCP-tcp_cubic-faster-cube-root.txt
+Patch30674: 5062-TCP-TCP-Yeah-cleanup.txt
+Patch30675: 5063-IPV4-Optimize-inet_getpeer.txt
+Patch30676: 5064-UDP6-Restore-sk_filter-optimisation.txt
+Patch30677: 5066-NET-802-Use-hton-s-l-where-appropriate.txt
+Patch30678: 5067-NET-8021Q-Use-htons-where-appropriate.txt
+Patch30679: 5068-NET-ATM-Use-htons-where-appropriate.txt
+Patch30680: 5070-NET-CORE-Use-htons-where-appropriate.txt
+Patch30681: 5071-NET-ETHERNET-Use-htons-where-appropriate.txt
+Patch30682: 5072-NET-IEEE80211-Use-htons-where-appropriate.txt
+Patch30683: 5075-NET-SCHED-Use-htons-where-appropriate.txt
+Patch30684: 5076-NET-TIPC-Use-htons-where-appropriate.txt
+Patch30685: 5078-TCP-DCCP-RANDOM-Remove-unused-exports.txt
+Patch30686: 5084-WIRELESS-use-ARRAY_SIZE.txt
+Patch30687: 5087-NET-deinline-some-functions.txt
+Patch30688: 5089-IPV6-Return-correct-result-for-sticky-options.txt
+Patch30689: 5090-IPV6-Ensure-to-truncate-result-and-return-full-length-for-sticky-options.txt
+Patch30690: 5092-UDP-Use-__skb_pull-since-we-have-checked-it-won-t-fail-with-pskb_may_pull.txt
+Patch30691: 5095-TR-Use-tr_hdr-were-appropriate.txt
+Patch30692: 5096-TR-Make-tr_type_trans-set-skb-dev.txt
+Patch30693: 5098-HIPPI-FDDI-Make-hippi-fddi-_type_trans-set-skb-dev.txt
+Patch30694: 5106-TCP-Do-the-layer-header-setting-in-tcp_collapse-relative-to-skb-data.txt
+Patch30695: 5109-LLC-Kill-llc_set_pdu_hdr.txt
+Patch30696: 5110-PPPOE-Introduce-pppoe_hdr.txt
+Patch30697: 5111-BONDING-Introduce-arp_pkt.txt
+Patch30698: 5112-IPV6-Use-skb-nh.ipv6h-instead-of-casting-skb-nh.raw.txt
+Patch30699: 5122-SK_BUFF-xfrm4-use-skb_reset_network_header.txt
+Patch30700: 5128-NET-network-dev-read_mostly.txt
+Patch30701: 5129-NET-make-seq_operations-const.txt
+Patch30702: 5130-NET-show-bound-packet-types.txt
+Patch30703: 5135-BRIDGE-faster-compare-for-link-local-addresses.txt
+Patch30704: 5142-ICMP6-Introduce-icmp6_hdr.txt
+Patch30705: 5153-NETFILTER-x_tables-remove-duplicate-of-xt_prefix.txt
+Patch30706: 5161-NETFILTER-nf_conntrack-uninline-notifier-registration-functions.txt
+Patch30707: 5164-NETFILTER-nfnetlink-remove-unrequired-check-in-nfnetlink_get_subsys.txt
+Patch30708: 5166-NETFILTER-nfnetlink-move-EXPORT_SYMBOL-declarations-next-to-the-exported-symbol.txt
+Patch30709: 5168-NETFILTER-nf_conntrack-use-jhash2-in-__hash_conntrack.txt
+Patch30710: 5169-NETFILTER-nf_conntrack-add-__nf_copy-to-copy-members-in-skb.txt
+Patch30711: 5170-NETFILTER-nf_conntrack-add-nf_copy-to-safely-copy-members-in-skb.txt
+Patch30712: 5171-NETFILTER-TCP-conntrack-accept-RST-PSH-as-valid.txt
+Patch30713: 5172-NETFILTER-TCP-conntrack-factorize-out-the-PUSH-flag.txt
+Patch30714: 5186-NET_SCHED-sch_cbq-fix-cbq_undelay_prio-for-non-active-priorites.txt
+Patch30715: 5197-IrDA-removing-stir4200-useless-include.txt
+Patch30716: 5198-IrDA-irda-lockdep-annotation.txt
+Patch30717: 5199-IrDA-SMC-SuperIO-Chip-LPC47N227-not-identified-properly.txt
+Patch30718: 5202-SK_BUFF-Adjust-the-zeroing-up-to-tail-in-__alloc_skb-too.txt
+Patch30719: 5206-SK_BUFF-Remove-skb_add_mtu-leftovers.txt
+Patch30720: 5214-DCCP-48-bit-sequence-number-arithmetic.txt
+Patch30721: 5215-DCCP-Make-dccp_delta_seqno-return-signed-numbers.txt
+Patch30722: 5216-DCCP-Make-before-relation-unambiguous.txt
+Patch30723: 5217-DCCP-Fix-for-follows48.txt
+Patch30724: 5218-DCCP-Remove-ambiguity-in-the-way-before48-is-used.txt
+Patch30725: 5219-CCID3-Remove-redundant-len-test.txt
+Patch30726: 5220-CCID3-Re-order-CCID-3-source-file.txt
+Patch30727: 5221-CCID3-Use-MSS-for-larger-initial-windows.txt
+Patch30728: 5222-CCID3-Fix-use-of-invalid-loss-intervals.txt
+Patch30729: 5223-CCID3-More-verbose-debugging.txt
+Patch30730: 5224-CCID3-Remove-race-condition-and-update-t_ipi-when-s-changes.txt
+Patch30731: 5225-DCCP-Always-use-debug-toggle-parameters.txt
+Patch30732: 5226-DCCP-More-debug-information-for-dccp_wait_for_ccid.txt
+Patch30733: 5228-CCID3-More-to-see-in-dccp_probe.txt
+Patch30734: 5229-CCID3-Remove-build-warnings-for-64bit.txt
+Patch30735: 5230-CCID3-Wrap-computation-of-RFC3390-initial-rate-into-separate-function.txt
+Patch30736: 5231-CCID3-Handle-Idle-and-Application-Limited-periods.txt
+Patch30737: 5232-DCCP-Provide-function-for-RTT-sampling.txt
+Patch30738: 5233-CCID3-Use-function-for-RTT-sampling.txt
+Patch30739: 5234-DCCP-Sample-RTT-from-SYN-exchange.txt
+Patch30740: 5235-CCID3-Use-initial-RTT-sample-from-SYN-exchange.txt
+Patch30741: 5250-TCP-cubic-optimization.txt
+Patch30742: 5251-NETEM-report-reorder-percent-correctly.txt
+Patch30743: 5253-NETEM-Optimize-tfifo.txt
+Patch30744: 5259-NETLINK-Remove-unused-groups-variable.txt
+Patch30745: 5265-NETEM-spelling-errors.txt
+Patch30746: 5267-NETFILTER-nfnetlink_log-don-t-count-max-a-b-twice.txt
+Patch30747: 5269-NETFILTER-nfnetlink_log-micro-optimization-for-inst-NULL-in-nfulnl_recv_config.txt
+Patch30748: 5270-NETFILTER-nfnetlink_log-micro-optimization-don-t-modify-destroyed-instance.txt
+Patch30749: 5271-NETFILTER-nfnetlink_log-iterator-functions-need-iter_state-only.txt
+Patch30750: 5273-NETFILTER-nfnetlink_log-remove-conditional-locking.txt
+Patch30751: 5274-NETFILTER-Use-setup_timer.txt
+Patch30752: 5275-NETFILTER-nf_conntrack-don-t-use-nfct-in-skb-if-conntrack-is-disabled.txt
+Patch30753: 5276-NETFILTER-nf_conntrack-kill-destroy-in-struct-nf_conntrack-for-diet.txt
+Patch30754: 5278-NET_SCHED-sch_netem-fix-off-by-one-in-send-time-comparison.txt
+Patch30755: 5288-SCTP-Implement-SCTP_FRAGMENT_INTERLEAVE-socket-option.txt
+Patch30756: 5289-SCTP-Implement-SCTP_PARTIAL_DELIVERY_POINT-option.txt
+Patch30757: 5290-SCTP-Implement-SCTP_ADDR_CONFIRMED-state-for-ADDR_CHNAGE-event.txt
+Patch30758: 5291-SCTP-Honor-flags-when-setting-peer-address-parameters.txt
+Patch30759: 5292-SCTP-Implement-sac_info-field-in-SCTP_ASSOC_CHANGE-notification.txt
+Patch30760: 5293-SCTP-Implement-SCTP_MAX_BURST-socket-option.txt
+Patch30761: 5294-NETLINK-introduce-NLA_BINARY-type.txt
+Patch30762: 5295-INET-Use-jhash-random-secret-for-ehash.txt
+Patch30763: 5296-NET-Do-pmtu-check-in-transport-layer.txt
+Patch30764: 5299-TCP-cubic-update-for-net-2.6.22.txt
+Patch30765: 5302-NET-fib_rules-goto-rule-action.txt
+Patch30766: 5303-NET-fib_rules-Mark-rules-detached-from-the-device.txt
+Patch30767: 5304-NET-fib_rules-Add-no-operation-action.txt
+Patch30768: 5305-IPV4-LVS-Allow-to-send-ICMP-unreachable-responses-when-real-servers-are-removed.txt
+Patch30769: 5307-NET-inet_ehash_secret-should-be-__read_mostly-and-set-only-once.txt
+Patch30770: 5308-NET-fib_rules-Flush-route-cache-after-rule-modifications.txt
+Patch30771: 5309-TCP-tcp_memory_pressure-and-tcp_socket-are__read_mostly-candidates.txt
+Patch30772: 5310-IPV4-align-inet_protos-on-SMP.txt
+Patch30773: 5311-BLUETOOTH-Introduce-skb-data-accessor-methods-for-hci_-acl-event-sco-_hdr.txt
+Patch30774: 5313-NET-fib_rules-delay-route-cache-flush-by-ip_rt_min_delay.txt
+Patch30775: 5315-NET-Inline-net_device_stats.txt
+Patch30776: 5320-NET-Move-generic-skbuff-stuff-from-XFRM-code-to-generic-code.txt
+Patch30777: 5323-IPV6-FIB6RULE-Find-source-address-during-looking-up-route.txt
+Patch30778: 5332-bridge-simpler-hash-with-salt.txt
+Patch30779: 5334-bridge-add-support-for-user-mode-STP.txt
+Patch30780: 5335-bridge-change-when-netlink-events-go-to-STP.txt
+Patch30781: 5336-bridge-allow-changing-hardware-address-to-any-valid-address.txt
+Patch30782: 5338-NET-loopback-driver-can-use-loopback_dev-integrated-net_device_stats.txt
+Patch30783: 5344-NETFILTER-ipt_ULOG-use-put_unaligned.txt
+Patch30784: 5345-PKTGEN-Add-try_to_freeze.txt
+Patch30785: 5346-Fix-bug-in-the-calculation-of-very-low-sending-rates.txt
+Patch30786: 5347-Debug-statements-for-Elapsed-Time-option.txt
+Patch30787: 5357-NETFILTER-ebt_arp-add-gratuitous-arp-filtering.txt
+Patch30788: 5360-NETFILTER-nfnetlink_log-remove-fallback-to-group-0.txt
+Patch30789: 5361-NETFILTER-ipt_ULOG-add-compat-conversion-functions.txt
+Patch30790: 5364-VLAN-Allow-VLAN-interface-on-top-of-bridge-interface.txt
+Patch30791: 5365-IPSEC-XFRM_USER-kernel-panic-when-large-security-contexts-in-ACQUIRE.txt
+Patch30792: 5366-IPV6-SNMP-Fix-In-Out-NoRoutes-statistics.txt
+Patch30793: 5367-NETFILTER-arp_tables-Fix-unaligned-accesses.txt
+Patch30794: 5386-NET_SCHED-Eliminate-qdisc_tree_lock.txt
+Patch30795: 5387-NET_SCHED-ingress-switch-back-to-using-ingress_lock.txt
+Patch30796: 5390-KEY-Fix-conversion-between-IPSEC_MODE_xxx-and-XFRM_MODE_xxx.txt
+Patch30797: 5391-NET-Fix-UDP-checksum-issue-in-net-poll-mode.txt
+Patch30798: 5392-NET-Set-a-separate-lockdep-class-for-neighbour-table-s-proxy_queue.txt
+Patch30799: 5393-SCTP-Fix-assertion-atomic_read-sk-sk_rmem_alloc-failed-message.txt
+Patch30800: 5394-SCTP-Unmap-v4mapped-addresses-during-SCTP_BINDX_REM_ADDR-operation.txt
+Patch30801: 5395-BRIDGE-Unaligned-access-when-comparing-ethernet-addresses.txt
+Patch30802: 5406-knfsd-use-a-spinlock-to-protect-sk_info_authunix.txt
+Patch30803: 5411-IPSEC-af_key-Fix-thinko-in-pfkey_xfrm_policy2msg.txt
+Patch30804: 5413-IrDA-Correctly-handling-socket-error.txt
+Patch30805: 5414-NETLINK-Don-t-attach-callback-to-a-going-away-netlink-socket.txt
+Patch30806: 5416-cxgb3-Fix-low-memory-conditions.txt
+Patch30807: 5417-cxgb3-PHY-interrupts-and-GPIO-pins.txt
+Patch30808: 5418-spidernet-Fix-problem-sending-IP-fragments.txt
+Patch30809: 5419-gianfar-needs-crc32-lib-dependency.txt
+Patch30810: 5420-sky2-disable-support-for-88E8056.txt
+Patch30811: 5421-sky2-handle-descriptor-errors.txt
+Patch30812: 5422-sky2-disable-ASF-on-all-chip-types.txt
+Patch30813: 5423-sky2-EC-U-performance-and-jumbo-support.txt
+Patch30814: 5424-sky2-no-jumbo-on-Yukon-FE.txt
+Patch30815: 5425-sky2-version-1.14.txt
+Patch30816: 5426-PPP-Fix-skbuff.c-BUG-due-incorrect-logic-in-process_input_packet.txt
+Patch30817: 5428-Revert-e1000-fix-NAPI-performance-on-4-port-adapters.txt
 
 Patch40000: mac80211.patch
 
@@ -3476,382 +3475,380 @@
 %patch30629 -p1
 # [PATCH] zd1211rw: Add ID for ZyXEL AG-220
 %patch30630 -p1
-# [PATCH] ieee80211-crypt: Make some TKIP and CCMP error logging conditional
-%patch30631 -p1
 # [PATCH] prism54usb: fix breakage from skb->input_device removal
-%patch30632 -p1
+%patch30631 -p1
 # [NETFILTER]: ipt_CLUSTERIP: fix oops in checkentry function
-%patch30633 -p1
+%patch30632 -p1
 # skge: turn carrier off when down
-%patch30634 -p1
+%patch30633 -p1
 # sky2: turn carrier off when down
-%patch30635 -p1
+%patch30634 -p1
 # sky2: turn on clocks when doing resume
-%patch30636 -p1
+%patch30635 -p1
 # sky2: phy workarounds for Yukon EC-U A1
-%patch30637 -p1
+%patch30636 -p1
 # skge: fix wake on lan
-%patch30638 -p1
+%patch30637 -p1
 # cxgb3 - avoid deadlock with mac watchdog
-%patch30639 -p1
+%patch30638 -p1
 # cxgb3 - MAC watchdog update
-%patch30640 -p1
+%patch30639 -p1
 # cxgb3 - missing CPL hanler and register setting.
-%patch30641 -p1
+%patch30640 -p1
 # myri10ge: fix management of the firmware 4KB boundary crossing restriction
-%patch30642 -p1
+%patch30641 -p1
 # myri10ge: more Intel chipsets providing aligned PCIe completions
-%patch30643 -p1
+%patch30642 -p1
 # myri10ge: update driver version to 1.3.0-1.233
-%patch30644 -p1
+%patch30643 -p1
 # Fabric7 VIOC driver source code
-%patch30645 -p1
+%patch30644 -p1
 # Fabric7 VIOC driver fixes
-%patch30646 -p1
+%patch30645 -p1
 # drivers/net/vioc/vioc_driver.c: replace pci_module_init with pci_register_driver
-%patch30647 -p1
+%patch30646 -p1
 # [netdrvr e100] experiment with doing RX in a similar manner to eepro100
-%patch30648 -p1
+%patch30647 -p1
 # e1000: FIX: be ready for incoming irq at pci_request_irq
-%patch30649 -p1
+%patch30648 -p1
 # e1000: FIX: firmware handover bits
-%patch30650 -p1
+%patch30649 -p1
 # e1000: FIX: Stop raw interrupts disabled nag from RT
-%patch30651 -p1
+%patch30650 -p1
 # [TCP] FRTO: Incorrectly clears TCPCB_EVER_RETRANS bit
-%patch30652 -p1
+%patch30651 -p1
 # [TCP] FRTO: Separated response from FRTO detection algorithm
-%patch30653 -p1
+%patch30652 -p1
 # [TCP] FRTO: Moved tcp_use_frto from tcp.h to tcp_input.c
-%patch30654 -p1
+%patch30653 -p1
 # [TCP] FRTO: Comment cleanup & improvement
-%patch30655 -p1
+%patch30654 -p1
 # [TCP] FRTO: Response should reset also snd_cwnd_cnt
-%patch30656 -p1
+%patch30655 -p1
 # [TCP]: Don't enter to fast recovery while using FRTO
-%patch30657 -p1
+%patch30656 -p1
 # [TCP] FRTO: frto_counter modulo-op converted to two assignments
-%patch30658 -p1
+%patch30657 -p1
 # [TCP] FRTO: Entry is allowed only during (New)Reno like recovery
-%patch30659 -p1
+%patch30658 -p1
 # [TCP]: Prevent reordering adjustments during FRTO
-%patch30660 -p1
+%patch30659 -p1
 # [TCP] YeAH-TCP: algorithm implementation
-%patch30661 -p1
+%patch30660 -p1
 # [TCP]: Add RFC3742 Limited Slow-Start, controlled by variable sysctl_tcp_max_ssthresh.
-%patch30662 -p1
+%patch30661 -p1
 # [TCP]: struct \*sock argument renamed: sp -> sk
-%patch30663 -p1
+%patch30662 -p1
 # [TCP]: Keep copied_seq, rcv_wup and rcv_next together.
-%patch30664 -p1
+%patch30663 -p1
 # [TCP]: Correct reordering detection change (no FRTO case)
-%patch30665 -p1
+%patch30664 -p1
 # [NET]: Keep sk_backlog near sk_lock
-%patch30666 -p1
+%patch30665 -p1
 # [PKTGEN]: use pr_debug
-%patch30667 -p1
+%patch30666 -p1
 # [PKTGEN]: use random32
-%patch30668 -p1
+%patch30667 -p1
 # [PKTGEN]: don't use __constant_htonl()
-%patch30669 -p1
+%patch30668 -p1
 # [PKTGEN]: fix device name handling
-%patch30670 -p1
+%patch30669 -p1
 # [NET]: Convert xtime.tv_sec to get_seconds()
-%patch30671 -p1
+%patch30670 -p1
 # [NETLINK]: Mirror UDP MSG_TRUNC semantics.
-%patch30672 -p1
+%patch30671 -p1
 # [IPV6] IP6TUNNEL: Split out generic routine in ip6ip6_err().
-%patch30673 -p1
+%patch30672 -p1
 # [TCP] tcp_cubic: faster cube root
-%patch30674 -p1
+%patch30673 -p1
 # [TCP] TCP Yeah: cleanup
-%patch30675 -p1
+%patch30674 -p1
 # [IPV4]: Optimize inet_getpeer()
-%patch30676 -p1
+%patch30675 -p1
 # [UDP6]: Restore sk_filter optimisation
-%patch30677 -p1
+%patch30676 -p1
 # [NET] 802: Use hton{s,l}() where appropriate.
-%patch30678 -p1
+%patch30677 -p1
 # [NET] 8021Q: Use htons() where appropriate.
-%patch30679 -p1
+%patch30678 -p1
 # [NET] ATM: Use htons() where appropriate.
-%patch30680 -p1
+%patch30679 -p1
 # [NET] CORE: Use htons() where appropriate.
-%patch30681 -p1
+%patch30680 -p1
 # [NET] ETHERNET: Use htons() where appropriate.
-%patch30682 -p1
+%patch30681 -p1
 # [NET] IEEE80211: Use htons() where appropriate.
-%patch30683 -p1
+%patch30682 -p1
 # [NET] SCHED: Use htons() where appropriate.
-%patch30684 -p1
+%patch30683 -p1
 # [NET] TIPC: Use htons() where appropriate.
-%patch30685 -p1
+%patch30684 -p1
 # [TCP/DCCP/RANDOM]: Remove unused exports.
-%patch30686 -p1
+%patch30685 -p1
 # [WIRELESS]: use ARRAY_SIZE()
-%patch30687 -p1
+%patch30686 -p1
 # [NET]: deinline some functions
-%patch30688 -p1
+%patch30687 -p1
 # [IPV6]: Return correct result for sticky options.
-%patch30689 -p1
+%patch30688 -p1
 # [IPV6]: Ensure to truncate result and return full length for sticky options.
-%patch30690 -p1
+%patch30689 -p1
 # [UDP]: Use __skb_pull since we have checked it won't fail with pskb_may_pull
-%patch30691 -p1
+%patch30690 -p1
 # [TR]: Use tr_hdr() were appropriate
-%patch30692 -p1
+%patch30691 -p1
 # [TR]: Make tr_type_trans set skb->dev
-%patch30693 -p1
+%patch30692 -p1
 # [HIPPI/FDDI]: Make {hippi,fddi}_type_trans set skb->dev
-%patch30694 -p1
+%patch30693 -p1
 # [TCP]: Do the layer header setting in tcp_collapse relative to skb->data
-%patch30695 -p1
+%patch30694 -p1
 # [LLC]: Kill llc_set_pdu_hdr
-%patch30696 -p1
+%patch30695 -p1
 # [PPPOE]: Introduce pppoe_hdr()
-%patch30697 -p1
+%patch30696 -p1
 # [BONDING]: Introduce arp_pkt()
-%patch30698 -p1
+%patch30697 -p1
 # [IPV6]: Use skb->nh.ipv6h instead of casting skb->nh.raw
-%patch30699 -p1
+%patch30698 -p1
 # [SK_BUFF] xfrm4: use skb_reset_network_header
-%patch30700 -p1
+%patch30699 -p1
 # [NET]: network dev read_mostly
-%patch30701 -p1
+%patch30700 -p1
 # [NET]: make seq_operations const
-%patch30702 -p1
+%patch30701 -p1
 # [NET]: show bound packet types
-%patch30703 -p1
+%patch30702 -p1
 # [BRIDGE]: faster compare for link local addresses
-%patch30704 -p1
+%patch30703 -p1
 # [ICMP6]: Introduce icmp6_hdr()
-%patch30705 -p1
+%patch30704 -p1
 # [NETFILTER]: x_tables: remove duplicate of xt_prefix
-%patch30706 -p1
+%patch30705 -p1
 # [NETFILTER]: nf_conntrack: uninline notifier registration functions
-%patch30707 -p1
+%patch30706 -p1
 # [NETFILTER]: nfnetlink: remove unrequired check in nfnetlink_get_subsys
-%patch30708 -p1
+%patch30707 -p1
 # [NETFILTER]: nfnetlink: move EXPORT_SYMBOL declarations next to the exported symbol
-%patch30709 -p1
+%patch30708 -p1
 # [NETFILTER]: nf_conntrack: use jhash2 in __hash_conntrack
-%patch30710 -p1
+%patch30709 -p1
 # [NETFILTER]: nf_conntrack: add __nf_copy() to copy members in skb
-%patch30711 -p1
+%patch30710 -p1
 # [NETFILTER]: nf_conntrack: add nf_copy() to safely copy members in skb
-%patch30712 -p1
+%patch30711 -p1
 # [NETFILTER]: TCP conntrack: accept RST|PSH as valid
-%patch30713 -p1
+%patch30712 -p1
 # [NETFILTER]: TCP conntrack: factorize out the PUSH flag
-%patch30714 -p1
+%patch30713 -p1
 # [NET_SCHED]: sch_cbq: fix cbq_undelay_prio for non-active priorites
-%patch30715 -p1
+%patch30714 -p1
 # [IrDA]: removing stir4200 useless include
-%patch30716 -p1
+%patch30715 -p1
 # [IrDA]: irda lockdep annotation
-%patch30717 -p1
+%patch30716 -p1
 # [IrDA]: SMC SuperIO Chip LPC47N227 not identified properly
-%patch30718 -p1
+%patch30717 -p1
 # [SK_BUFF]: Adjust the zeroing up to tail in __alloc_skb too
-%patch30719 -p1
+%patch30718 -p1
 # [SK_BUFF]: Remove skb_add_mtu() leftovers
-%patch30720 -p1
+%patch30719 -p1
 # [DCCP]: 48-bit sequence number arithmetic
-%patch30721 -p1
+%patch30720 -p1
 # [DCCP]: Make dccp_delta_seqno return signed numbers
-%patch30722 -p1
+%patch30721 -p1
 # [DCCP]: Make `before' relation unambiguous
-%patch30723 -p1
+%patch30722 -p1
 # [DCCP]: Fix for follows48
-%patch30724 -p1
+%patch30723 -p1
 # [DCCP]: Remove ambiguity in the way before48 is used
-%patch30725 -p1
+%patch30724 -p1
 # [CCID3]: Remove redundant `len' test
-%patch30726 -p1
+%patch30725 -p1
 # [CCID3]: Re-order CCID 3 source file
-%patch30727 -p1
+%patch30726 -p1
 # [CCID3]: Use MSS for larger initial windows
-%patch30728 -p1
+%patch30727 -p1
 # [CCID3]: Fix use of invalid loss intervals
-%patch30729 -p1
+%patch30728 -p1
 # [CCID3]: More verbose debugging
-%patch30730 -p1
+%patch30729 -p1
 # [CCID3]: Remove race condition and update t_ipi when `s' changes
-%patch30731 -p1
+%patch30730 -p1
 # [DCCP]: Always use debug-toggle parameters
-%patch30732 -p1
+%patch30731 -p1
 # [DCCP]: More debug information for dccp_wait_for_ccid
-%patch30733 -p1
+%patch30732 -p1
 # [CCID3]: More to see in dccp_probe
-%patch30734 -p1
+%patch30733 -p1
 # [CCID3]: Remove build warnings for 64bit
-%patch30735 -p1
+%patch30734 -p1
 # [CCID3]: Wrap computation of RFC3390-initial rate into separate function
-%patch30736 -p1
+%patch30735 -p1
 # [CCID3]: Handle Idle and Application-Limited periods
-%patch30737 -p1
+%patch30736 -p1
 # [DCCP]: Provide function for RTT sampling
-%patch30738 -p1
+%patch30737 -p1
 # [CCID3]: Use function for RTT sampling
-%patch30739 -p1
+%patch30738 -p1
 # [DCCP]: Sample RTT from SYN exchange
-%patch30740 -p1
+%patch30739 -p1
 # [CCID3]: Use initial RTT sample from SYN exchange
-%patch30741 -p1
+%patch30740 -p1
 # [TCP]: cubic optimization
-%patch30742 -p1
+%patch30741 -p1
 # [NETEM]: report reorder percent correctly.
-%patch30743 -p1
+%patch30742 -p1
 # [NETEM]: Optimize tfifo
-%patch30744 -p1
+%patch30743 -p1
 # [NETLINK]: Remove unused groups variable
-%patch30745 -p1
+%patch30744 -p1
 # [NETEM]: spelling errors
-%patch30746 -p1
+%patch30745 -p1
 # [NETFILTER]: nfnetlink_log: don't count max(a,b) twice
-%patch30747 -p1
+%patch30746 -p1
 # [NETFILTER]: nfnetlink_log: micro-optimization for inst==NULL in nfulnl_recv_config()
-%patch30748 -p1
+%patch30747 -p1
 # [NETFILTER]: nfnetlink_log: micro-optimization: don't modify destroyed instance
-%patch30749 -p1
+%patch30748 -p1
 # [NETFILTER]: nfnetlink_log: iterator functions need iter_state \* only
-%patch30750 -p1
+%patch30749 -p1
 # [NETFILTER]: nfnetlink_log: remove conditional locking
-%patch30751 -p1
+%patch30750 -p1
 # [NETFILTER]: Use setup_timer
-%patch30752 -p1
+%patch30751 -p1
 # [NETFILTER]: nf_conntrack: don't use nfct in skb if conntrack is disabled
-%patch30753 -p1
+%patch30752 -p1
 # [NETFILTER]: nf_conntrack: kill destroy() in struct nf_conntrack for diet
-%patch30754 -p1
+%patch30753 -p1
 # [NET_SCHED]: sch_netem: fix off-by-one in send time comparison
-%patch30755 -p1
+%patch30754 -p1
 # [SCTP] Implement SCTP_FRAGMENT_INTERLEAVE socket option
-%patch30756 -p1
+%patch30755 -p1
 # [SCTP]: Implement SCTP_PARTIAL_DELIVERY_POINT option.
-%patch30757 -p1
+%patch30756 -p1
 # [SCTP]: Implement SCTP_ADDR_CONFIRMED state for ADDR_CHNAGE event
-%patch30758 -p1
+%patch30757 -p1
 # [SCTP]: Honor flags when setting peer address parameters
-%patch30759 -p1
+%patch30758 -p1
 # [SCTP]: Implement sac_info field in SCTP_ASSOC_CHANGE notification.
-%patch30760 -p1
+%patch30759 -p1
 # [SCTP]: Implement SCTP_MAX_BURST socket option.
-%patch30761 -p1
+%patch30760 -p1
 # [NETLINK]: introduce NLA_BINARY type
-%patch30762 -p1
+%patch30761 -p1
 # [INET]: Use jhash + random secret for ehash.
-%patch30763 -p1
+%patch30762 -p1
 # [NET] Do pmtu check in transport layer
-%patch30764 -p1
+%patch30763 -p1
 # [TCP]: cubic update for net-2.6.22
-%patch30765 -p1
+%patch30764 -p1
 # [NET] fib_rules: goto rule action
-%patch30766 -p1
+%patch30765 -p1
 # [NET] fib_rules: Mark rules detached from the device
-%patch30767 -p1
+%patch30766 -p1
 # [NET] fib_rules: Add no-operation action
-%patch30768 -p1
+%patch30767 -p1
 # [IPV4] LVS: Allow to send ICMP unreachable responses when real-servers are removed
-%patch30769 -p1
+%patch30768 -p1
 # [NET]: inet_ehash_secret should be __read_mostly and set only once
-%patch30770 -p1
+%patch30769 -p1
 # [NET] fib_rules: Flush route cache after rule modifications
-%patch30771 -p1
+%patch30770 -p1
 # [TCP]: tcp_memory_pressure and tcp_socket are__read_mostly candidates
-%patch30772 -p1
+%patch30771 -p1
 # [IPV4]: align inet_protos[] on SMP
-%patch30773 -p1
+%patch30772 -p1
 # [BLUETOOTH]: Introduce skb->data accessor methods for hci_{acl,event,sco}_hdr
-%patch30774 -p1
+%patch30773 -p1
 # [NET] fib_rules: delay route cache flush by ip_rt_min_delay
-%patch30775 -p1
+%patch30774 -p1
 # [NET]: Inline net_device_stats
-%patch30776 -p1
+%patch30775 -p1
 # [NET]: Move generic skbuff stuff from XFRM code to generic code
-%patch30777 -p1
+%patch30776 -p1
 # [IPV6] FIB6RULE: Find source address during looking up route.
-%patch30778 -p1
+%patch30777 -p1
 # bridge: simpler hash with salt
-%patch30779 -p1
+%patch30778 -p1
 # bridge: add support for user mode STP
-%patch30780 -p1
+%patch30779 -p1
 # bridge: change when netlink events go to STP
-%patch30781 -p1
+%patch30780 -p1
 # bridge: allow changing hardware address to any valid address
-%patch30782 -p1
+%patch30781 -p1
 # [NET]: loopback driver can use loopback_dev integrated net_device_stats
-%patch30783 -p1
+%patch30782 -p1
 # [NETFILTER]: ipt_ULOG: use put_unaligned
-%patch30784 -p1
+%patch30783 -p1
 # [PKTGEN]: Add try_to_freeze()
-%patch30785 -p1
+%patch30784 -p1
 # Fix bug in the calculation of very low sending rates
-%patch30786 -p1
+%patch30785 -p1
 # Debug statements for Elapsed Time option
-%patch30787 -p1
+%patch30786 -p1
 # [NETFILTER]: ebt_arp: add gratuitous arp filtering
-%patch30788 -p1
+%patch30787 -p1
 # [NETFILTER]: nfnetlink_log: remove fallback to group 0
-%patch30789 -p1
+%patch30788 -p1
 # [NETFILTER]: ipt_ULOG: add compat conversion functions
-%patch30790 -p1
+%patch30789 -p1
 # [VLAN]: Allow VLAN interface on top of bridge interface
-%patch30791 -p1
+%patch30790 -p1
 # [IPSEC] XFRM_USER: kernel panic when large security contexts in ACQUIRE
-%patch30792 -p1
+%patch30791 -p1
 # [IPV6] SNMP: Fix {In,Out}NoRoutes statistics.
-%patch30793 -p1
+%patch30792 -p1
 # [NETFILTER] arp_tables: Fix unaligned accesses.
-%patch30794 -p1
+%patch30793 -p1
 # [NET_SCHED]: Eliminate qdisc_tree_lock
-%patch30795 -p1
+%patch30794 -p1
 # [NET_SCHED]: ingress: switch back to using ingress_lock
-%patch30796 -p1
+%patch30795 -p1
 # [KEY]: Fix conversion between IPSEC_MODE_xxx and XFRM_MODE_xxx.
-%patch30797 -p1
+%patch30796 -p1
 # [NET]: Fix UDP checksum issue in net poll mode.
-%patch30798 -p1
+%patch30797 -p1
 # [NET]: Set a separate lockdep class for neighbour table's proxy_queue
-%patch30799 -p1
+%patch30798 -p1
 # [SCTP]: Fix assertion (!atomic_read(&sk->sk_rmem_alloc)) failed message
-%patch30800 -p1
+%patch30799 -p1
 # [SCTP]: Unmap v4mapped addresses during SCTP_BINDX_REM_ADDR operation.
-%patch30801 -p1
+%patch30800 -p1
 # [BRIDGE]: Unaligned access when comparing ethernet addresses
-%patch30802 -p1
+%patch30801 -p1
 # knfsd: use a spinlock to protect sk_info_authunix
-%patch30803 -p1
+%patch30802 -p1
 # [IPSEC] af_key: Fix thinko in pfkey_xfrm_policy2msg()
-%patch30804 -p1
+%patch30803 -p1
 # [IrDA]: Correctly handling socket error
-%patch30805 -p1
+%patch30804 -p1
 # [NETLINK]: Don't attach callback to a going-away netlink socket
-%patch30806 -p1
+%patch30805 -p1
 # cxgb3 - Fix low memory conditions
-%patch30807 -p1
+%patch30806 -p1
 # cxgb3 - PHY interrupts and GPIO pins.
-%patch30808 -p1
+%patch30807 -p1
 # spidernet: Fix problem sending IP fragments
-%patch30809 -p1
+%patch30808 -p1
 # gianfar needs crc32 lib dependency
-%patch30810 -p1
+%patch30809 -p1
 # sky2: disable support for 88E8056
-%patch30811 -p1
+%patch30810 -p1
 # sky2: handle descriptor errors
-%patch30812 -p1
+%patch30811 -p1
 # sky2: disable ASF on all chip types
-%patch30813 -p1
+%patch30812 -p1
 # sky2: EC-U performance and jumbo support
-%patch30814 -p1
+%patch30813 -p1
 # sky2: no jumbo on Yukon FE
-%patch30815 -p1
+%patch30814 -p1
 # sky2: version 1.14
-%patch30816 -p1
+%patch30815 -p1
 # [PPP]: Fix skbuff.c:BUG due incorrect logic in process_input_packet()
-%patch30817 -p1
+%patch30816 -p1
 # Revert "e1000: fix NAPI performance on 4-port adapters"
-%patch30818 -p1
+%patch30817 -p1
 
 # Add mac80211 stack and drivers
 %patch40000 -p1
@@ -5407,7 +5404,6 @@
 - [PATCH] zd1211rw: rework band edge patching
 - [PATCH] zd1211rw: Add AL7230B RF support for ZD1211B
 - [PATCH] zd1211rw: Add ID for ZyXEL AG-220
-- [PATCH] ieee80211-crypt: Make some TKIP and CCMP error logging conditional
 - [PATCH] prism54usb: fix breakage from skb->input_device removal
 - [NETFILTER]: ipt_CLUSTERIP: fix oops in checkentry function
 - skge: turn carrier off when down


--- 4978-ieee80211-crypt-Make-some-TKIP-and-CCMP-error-logging-conditional.txt DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 20 19:08:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 15:08:47 -0400
Subject: rpms/kernel/devel linux-2.6-ps3-ehci-iso.patch, NONE,
	1.1 linux-2.6-ps3-wrap-spu-runctl.patch, NONE,
	1.1 kernel-2.6.spec, 1.3102, 1.3103
Message-ID: <200704201908.l3KJ8lfJ016182@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-ps3-ehci-iso.patch 
	linux-2.6-ps3-wrap-spu-runctl.patch 
Log Message:
PS3 update


linux-2.6-ps3-ehci-iso.patch:
 ehci-sched.c |   34 ++++++++++++++++++++++++++++++----
 1 files changed, 30 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-ps3-ehci-iso.patch ---
From: Masashi Kimoto <Masashi_Kimoto at hq.scei.sony.co.jp>

When we use Linux git tree on PS3 we face a error msg from 
ps3-ehci-driver,
        ps3-ehci-driver sb_04: port 1 resume error -19
        hub 2-0:1.0: hub_port_status failed (err = -32)
        ...
Built-in Bluetooth uses a USB isochronous and causes this error.

USB host controller refers TD after echi driver modify it's Periodic Frame 
List.
Because of this, NULLed TD is asscessed and causes USB error.

In this patch the driver holds the TD while host controller refers the 
list after Active bit=0.

From: Masashi Kimoto <Masashi_Kimoto at hq.scei.sony.co.jp>
Signed-off-by: Geoff Levand <geoffrey.levand at am.sony.com>

---
 drivers/usb/host/ehci-sched.c |   34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

--- ps3-linux-dev.orig/drivers/usb/host/ehci-sched.c
+++ ps3-linux-dev/drivers/usb/host/ehci-sched.c
@@ -1168,8 +1168,21 @@ itd_urb_transaction (
 		if (likely (!list_empty(&stream->free_list))) {
 			itd = list_entry (stream->free_list.prev,
 					 struct ehci_itd, itd_list);
-			list_del (&itd->itd_list);
-			itd_dma = itd->itd_dma;
+#if defined(CONFIG_PPC_PS3)
+			/* Fix for Cell SCC ISO transfer (PS3 Bluetooth). */
+			if (firmware_has_feature(FW_FEATURE_PS3_LV1)
+				&& itd->frame == ((ehci_readl(ehci,
+				&ehci->regs->frame_index) >> 3)
+				% ehci->periodic_size))
+				itd = NULL;
+			else {
+				list_del (&itd->itd_list);
+				itd_dma = itd->itd_dma;
+			}
+#else
+                       list_del (&itd->itd_list);
+                       itd_dma = itd->itd_dma;
+#endif
 		} else
 			itd = NULL;
 
@@ -1784,8 +1797,21 @@ sitd_urb_transaction (
 		if (!list_empty(&stream->free_list)) {
 			sitd = list_entry (stream->free_list.prev,
 					 struct ehci_sitd, sitd_list);
-			list_del (&sitd->sitd_list);
-			sitd_dma = sitd->sitd_dma;
+#if defined(CONFIG_PPC_PS3)
+			/* Fix for Cell SCC ISO transfer (PS3 Bluetooth). */
+			if (firmware_has_feature(FW_FEATURE_PS3_LV1)
+				&& sitd->frame == ((ehci_readl(ehci,
+				&ehci->regs->frame_index) >> 3)
+				% ehci->periodic_size))
+				sitd = NULL;
+			else {
+				list_del (&sitd->sitd_list);
+				sitd_dma = sitd->sitd_dma;
+			}
+#else
+                       list_del (&sitd->sitd_list);
+                       sitd_dma = sitd->sitd_dma;
+#endif
 		} else
 			sitd = NULL;
 

linux-2.6-ps3-wrap-spu-runctl.patch:
 arch/powerpc/platforms/cell/spu_base.c          |    1 +
 arch/powerpc/platforms/cell/spu_manage.c        |   15 +++++++++++++++
 arch/powerpc/platforms/cell/spufs/backing_ops.c |    6 ++++++
 arch/powerpc/platforms/cell/spufs/hw_ops.c      |   10 ++++++++++
 arch/powerpc/platforms/cell/spufs/run.c         |    4 ++--
 arch/powerpc/platforms/cell/spufs/spufs.h       |    1 +
 arch/powerpc/platforms/ps3/spu.c                |   14 ++++++++++++++
 include/asm-powerpc/spu_priv1.h                 |   14 ++++++++++++++
 8 files changed, 63 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-ps3-wrap-spu-runctl.patch ---
From: Masato Noguchi <Masato.Noguchi at jp.sony.com>

 [ note: This patch is a hot-fix and RFC. ]

Current kernel uses the master run control bit (MFC_SR1[S]) to
control SPE execution in spufs_run_spu(). PS3 hypervisor does not
permit to change this bit.
This cause Oops that Gerhard pointed out before.

I know, oldtime kernel used run control register in priv2, and
it was replaced by master run bit to avoid vulnerability.
But, for now, I made a patch closing my eyes to it.
I want to fix it witout using master run bit, if possible.
Does anyone have comments?


BTW, in current implementation, if spe was running at disabled
by master run, it seems to be failed at next spu_run syscall.
Is it correct?


Signed-off-by: Masato Noguchi <Masato.Noguchi at jp.sony.com>
---
 arch/powerpc/platforms/cell/spu_base.c          |    1 +
 arch/powerpc/platforms/cell/spu_manage.c        |   15 +++++++++++++++
 arch/powerpc/platforms/cell/spufs/backing_ops.c |    6 ++++++
 arch/powerpc/platforms/cell/spufs/hw_ops.c      |   10 ++++++++++
 arch/powerpc/platforms/cell/spufs/run.c         |    4 ++--
 arch/powerpc/platforms/cell/spufs/spufs.h       |    1 +
 arch/powerpc/platforms/ps3/spu.c                |   14 ++++++++++++++
 include/asm-powerpc/spu_priv1.h                 |   14 ++++++++++++++
 8 files changed, 63 insertions(+), 2 deletions(-)

--- ps3-linux-dev.orig/arch/powerpc/platforms/cell/spu_base.c
+++ ps3-linux-dev/arch/powerpc/platforms/cell/spu_base.c
@@ -39,6 +39,7 @@ const struct spu_management_ops *spu_man
 const struct spu_priv1_ops *spu_priv1_ops;
 
 EXPORT_SYMBOL_GPL(spu_priv1_ops);
+EXPORT_SYMBOL_GPL(spu_management_ops);
 
 static int __spu_trap_invalid_dma(struct spu *spu)
 {
--- ps3-linux-dev.orig/arch/powerpc/platforms/cell/spu_manage.c
+++ ps3-linux-dev/arch/powerpc/platforms/cell/spu_manage.c
@@ -35,6 +35,7 @@
 #include <asm/firmware.h>
 #include <asm/prom.h>
 
+#include "spufs/spufs.h"
 #include "interrupt.h"
 
 struct device_node *spu_devnode(struct spu *spu)
@@ -413,8 +414,22 @@ static int of_destroy_spu(struct spu *sp
 	return 0;
 }
 
+static int enable_spu_by_master_run(struct spu_context *ctx)
+{
+	ctx->ops->master_start(ctx);
+	return 0;
+}
+
+static int disable_spu_by_master_run(struct spu_context *ctx)
+{
+	ctx->ops->master_stop(ctx);
+	return 0;
+}
+
 const struct spu_management_ops spu_management_of_ops = {
 	.enumerate_spus = of_enumerate_spus,
 	.create_spu = of_create_spu,
 	.destroy_spu = of_destroy_spu,
+	.enable_spu = enable_spu_by_master_run,
+	.disable_spu = disable_spu_by_master_run,
 };
--- ps3-linux-dev.orig/arch/powerpc/platforms/cell/spufs/backing_ops.c
+++ ps3-linux-dev/arch/powerpc/platforms/cell/spufs/backing_ops.c
@@ -285,6 +285,11 @@ static void spu_backing_runcntl_write(st
 	spin_unlock(&ctx->csa.register_lock);
 }
 
+static void spu_backing_runcntl_stop(struct spu_context *ctx)
+{
+	spu_backing_runcntl_write(ctx, SPU_RUNCNTL_STOP);
+}
+
 static void spu_backing_master_start(struct spu_context *ctx)
 {
 	struct spu_state *csa = &ctx->csa;
@@ -370,6 +375,7 @@ struct spu_context_ops spu_backing_ops =
 	.get_ls = spu_backing_get_ls,
 	.runcntl_read = spu_backing_runcntl_read,
 	.runcntl_write = spu_backing_runcntl_write,
+	.runcntl_stop = spu_backing_runcntl_stop,
 	.master_start = spu_backing_master_start,
 	.master_stop = spu_backing_master_stop,
 	.set_mfc_query = spu_backing_set_mfc_query,
--- ps3-linux-dev.orig/arch/powerpc/platforms/cell/spufs/hw_ops.c
+++ ps3-linux-dev/arch/powerpc/platforms/cell/spufs/hw_ops.c
@@ -221,6 +221,15 @@ static void spu_hw_runcntl_write(struct 
 	spin_unlock_irq(&ctx->spu->register_lock);
 }
 
+static void spu_hw_runcntl_stop(struct spu_context *ctx)
+{
+	spin_lock_irq(&ctx->spu->register_lock);
+	out_be32(&ctx->spu->problem->spu_runcntl_RW, SPU_RUNCNTL_STOP);
+	while(in_be32(&ctx->spu->problem->spu_status_R) & SPU_STATUS_RUNNING)
+		cpu_relax();
+	spin_unlock_irq(&ctx->spu->register_lock);
+}
+
 static void spu_hw_master_start(struct spu_context *ctx)
 {
 	struct spu *spu = ctx->spu;
@@ -314,6 +323,7 @@ struct spu_context_ops spu_hw_ops = {
 	.get_ls = spu_hw_get_ls,
 	.runcntl_read = spu_hw_runcntl_read,
 	.runcntl_write = spu_hw_runcntl_write,
+	.runcntl_stop = spu_hw_runcntl_stop,
 	.master_start = spu_hw_master_start,
 	.master_stop = spu_hw_master_stop,
 	.set_mfc_query = spu_hw_set_mfc_query,
--- ps3-linux-dev.orig/arch/powerpc/platforms/cell/spufs/run.c
+++ ps3-linux-dev/arch/powerpc/platforms/cell/spufs/run.c
@@ -310,7 +310,7 @@ long spufs_run_spu(struct file *file, st
 	if (down_interruptible(&ctx->run_sema))
 		return -ERESTARTSYS;
 
-	ctx->ops->master_start(ctx);
+	spu_enable_spu(ctx);
 	ctx->event_return = 0;
 	ret = spu_run_init(ctx, npc);
 	if (ret)
@@ -338,7 +338,7 @@ long spufs_run_spu(struct file *file, st
 	} while (!ret && !(status & (SPU_STATUS_STOPPED_BY_STOP |
 				      SPU_STATUS_STOPPED_BY_HALT)));
 
-	ctx->ops->master_stop(ctx);
+	spu_disable_spu(ctx);
 	ret = spu_run_fini(ctx, npc, &status);
 	spu_yield(ctx);
 
--- ps3-linux-dev.orig/arch/powerpc/platforms/cell/spufs/spufs.h
+++ ps3-linux-dev/arch/powerpc/platforms/cell/spufs/spufs.h
@@ -117,6 +117,7 @@ struct spu_context_ops {
 	char*(*get_ls) (struct spu_context * ctx);
 	 u32 (*runcntl_read) (struct spu_context * ctx);
 	void (*runcntl_write) (struct spu_context * ctx, u32 data);
+	void (*runcntl_stop) (struct spu_context * ctx);
 	void (*master_start) (struct spu_context * ctx);
 	void (*master_stop) (struct spu_context * ctx);
 	int (*set_mfc_query)(struct spu_context * ctx, u32 mask, u32 mode);
--- ps3-linux-dev.orig/arch/powerpc/platforms/ps3/spu.c
+++ ps3-linux-dev/arch/powerpc/platforms/ps3/spu.c
@@ -28,6 +28,7 @@
 #include <asm/spu_priv1.h>
 #include <asm/lv1call.h>
 
+#include "../cell/spufs/spufs.h"
 #include "platform.h"
 
 /* spu_management_ops */
@@ -445,10 +446,23 @@ static int __init ps3_enumerate_spus(int
 	return result;
 }
 
+static int ps3_enable_spu(struct spu_context *ctx)
+{
+	return -ENOSYS;
+}
+
+static int ps3_disable_spu(struct spu_context *ctx)
+{
+	ctx->ops->runcntl_stop(ctx);
+	return -ENOSYS;
+}
+
 const struct spu_management_ops spu_management_ps3_ops = {
 	.enumerate_spus = ps3_enumerate_spus,
 	.create_spu = ps3_create_spu,
 	.destroy_spu = ps3_destroy_spu,
+	.enable_spu = ps3_enable_spu,
+	.disable_spu = ps3_disable_spu,
 };
 
 /* spu_priv1_ops */
--- ps3-linux-dev.orig/include/asm-powerpc/spu_priv1.h
+++ ps3-linux-dev/include/asm-powerpc/spu_priv1.h
@@ -178,6 +178,8 @@ struct spu_management_ops {
 	int (*enumerate_spus)(int (*fn)(void *data));
 	int (*create_spu)(struct spu *spu, void *data);
 	int (*destroy_spu)(struct spu *spu);
+	int (*enable_spu)(struct spu_context *ctx);
+	int (*disable_spu)(struct spu_context *ctx);
 };
 
 extern const struct spu_management_ops* spu_management_ops;
@@ -200,6 +202,18 @@ spu_destroy_spu (struct spu *spu)
 	return spu_management_ops->destroy_spu(spu);
 }
 
+static inline int
+spu_enable_spu (struct spu_context *ctx)
+{
+	return spu_management_ops->enable_spu(ctx);
+}
+
+static inline int
+spu_disable_spu (struct spu_context *ctx)
+{
+	return spu_management_ops->disable_spu(ctx);
+}
+
 /*
  * The declarations folowing are put here for convenience
  * and only intended to be used by the platform setup code.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3102
retrieving revision 1.3103
diff -u -r1.3102 -r1.3103
--- kernel-2.6.spec	20 Apr 2007 17:29:29 -0000	1.3102
+++ kernel-2.6.spec	20 Apr 2007 19:08:45 -0000	1.3103
@@ -435,17 +435,20 @@
 Patch356: linux-2.6-ps3-sound.patch
 Patch357: linux-2.6-ps3-smp-boot.patch
 Patch358: linux-2.6-ps3-read-cd.patch
+Patch359: linux-2.6-ps3-ehci-iso.patch
+Patch360: linux-2.6-ps3-wrap-spu-runctl.patch
+Patch361: linux-2.6-ps3-clear-spu-irq.patch
 
 # And then some minor tweaks...
-Patch360: linux-2.6-ps3-memory-probe.patch
-Patch361: linux-2.6-ps3-legacy-ioport.patch
-Patch362: linux-2.6-ps3fb-panic.patch
-Patch363: linux-2.6-ps3-ethernet-modular.patch
-Patch364: linux-2.6-ps3-exports.patch
-Patch365: linux-2.6-ps3-ethernet-autoload.patch
-Patch366: linux-2.6-ps3av-export-header.patch
-Patch367: linux-2.6-ps3-usb-autoload.patch
-Patch368: linux-2.6-ps3-sysbus-modalias.patch
+Patch370: linux-2.6-ps3-memory-probe.patch
+Patch371: linux-2.6-ps3-legacy-ioport.patch
+Patch372: linux-2.6-ps3fb-panic.patch
+Patch373: linux-2.6-ps3-ethernet-modular.patch
+Patch374: linux-2.6-ps3-exports.patch
+Patch375: linux-2.6-ps3-ethernet-autoload.patch
+Patch376: linux-2.6-ps3av-export-header.patch
+Patch377: linux-2.6-ps3-usb-autoload.patch
+Patch378: linux-2.6-ps3-sysbus-modalias.patch
 
 # 500 - 599   s390(x)
 
@@ -1081,16 +1084,19 @@
 %patch356 -p1
 %patch357 -p1
 %patch358 -p1
-
+%patch359 -p1
 %patch360 -p1
 %patch361 -p1
-%patch362 -p1
-%patch363 -p1
-%patch364 -p1
-%patch365 -p1
-%patch366 -p1
-%patch367 -p1
-%patch368 -p1
+
+%patch370 -p1
+%patch371 -p1
+%patch372 -p1
+%patch373 -p1
+%patch374 -p1
+%patch375 -p1
+%patch376 -p1
+%patch377 -p1
+%patch378 -p1
 
 # S390
 
@@ -2324,6 +2330,10 @@
 #  - tux.
 
 %changelog
+* Fri Apr 20 2007 David Woodhouse <dwmw2 at redhat.com>
+- Add workaround for PS3 EHCI isochronous mode
+- SPU fixes for PS3
+
 * Fri Apr 20 2007 Dave Jones <davej at redhat.com>
 - 2.6.21-rc7-git4
 



From fedora-cvs-commits at redhat.com  Fri Apr 20 19:12:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 15:12:53 -0400
Subject: rpms/kernel/devel linux-2.6-ps3-clear-spu-irq.patch,NONE,1.1
Message-ID: <200704201912.l3KJCrLl019348@cvs.devel.redhat.com>

Author: dwmw2

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

Added Files:
	linux-2.6-ps3-clear-spu-irq.patch 
Log Message:
add missing file

linux-2.6-ps3-clear-spu-irq.patch:
 arch/powerpc/platforms/cell/spu_base.c |   23 +++++++++++++++--------
 include/asm-powerpc/spu.h              |    2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

--- NEW FILE linux-2.6-ps3-clear-spu-irq.patch ---
From: Masato Noguchi <Masato.Noguchi at jp.sony.com>

In the PS3 platform, all interrupts are virtuailzed by hypervisor.
Thus, there is a little difference between baremetal and PS3.

Cell BE Architecture says SPU MFC class 0 interrupt is a pulse.
That means, once interrupt raised, never re-raised until someone
changes interrupt status.

Current spufs inplementation rely on it.
Class 0 handler just wake up a process and interrupt status is
cleared by that process at outside of interrupt handler.

While, the PS3 hypervisor treats all SPU interrupt as a level.
That means, if unmasked interrupt status bit remaind at
the end of interrupt handler, the hypervisor creates renewed
virtual interrupt packet.

Thus, Current kernel will freeze by interrupts raised 
over and over again, once SPE raised class 0 interrupt.


Signed-off-by: Masato Noguchi <Masato.Noguchi at jp.sony.com>
Signed-off-by: Geoff Levand <geoffrey.levand at am.sony.com>
---
 arch/powerpc/platforms/cell/spu_base.c |   23 +++++++++++++++--------
 include/asm-powerpc/spu.h              |    2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

--- ps3-linux-2.6.20.orig/arch/powerpc/platforms/cell/spu_base.c
+++ ps3-linux-2.6.20/arch/powerpc/platforms/cell/spu_base.c
@@ -158,27 +158,34 @@ static irqreturn_t
 spu_irq_class_0(int irq, void *data)
 {
 	struct spu *spu;
+	unsigned long stat, mask;
 
 	spu = data;
-	spu->class_0_pending = 1;
+
+	mask = spu_int_mask_get(spu, 0);
+	stat = spu_int_stat_get(spu, 0);
+	stat &= mask;
+
+	spin_lock(&spu->register_lock);
+	spu->class_0_pending |= stat;
+	spin_unlock(&spu->register_lock);
+
 	spu->stop_callback(spu);
 
+	spu_int_stat_clear(spu, 0, stat);
+
 	return IRQ_HANDLED;
 }
 
 int
 spu_irq_class_0_bottom(struct spu *spu)
 {
-	unsigned long stat, mask;
 	unsigned long flags;
-
-	spu->class_0_pending = 0;
+	unsigned long stat;
 
 	spin_lock_irqsave(&spu->register_lock, flags);
-	mask = spu_int_mask_get(spu, 0);
-	stat = spu_int_stat_get(spu, 0);
-
-	stat &= mask;
+	stat = spu->class_0_pending;
+	spu->class_0_pending = 0;
 
 	if (stat & 1) /* invalid DMA alignment */
 		__spu_trap_dma_align(spu);
--- ps3-linux-2.6.20.orig/include/asm-powerpc/spu.h
+++ ps3-linux-2.6.20/include/asm-powerpc/spu.h
@@ -122,6 +122,7 @@ struct spu {
 	u64 flags;
 	u64 dar;
 	u64 dsisr;
+	u64 class_0_pending;
 	size_t ls_size;
 	unsigned int slb_replace;
 	struct mm_struct *mm;
@@ -129,7 +130,6 @@ struct spu {
 	struct spu_runqueue *rq;
 	unsigned long long timestamp;
 	pid_t pid;
-	int class_0_pending;
 	spinlock_t register_lock;
 
 	void (* wbox_callback)(struct spu *spu);



From fedora-cvs-commits at redhat.com  Fri Apr 20 19:25:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 15:25:53 -0400
Subject: rpms/elfutils/devel Makefile,1.21,1.22
Message-ID: <200704201925.l3KJPrQT029132@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29080

Modified Files:
	Makefile 
Log Message:
Make portable spec use non-fatal check.


Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile	19 Apr 2007 16:28:11 -0000	1.21
+++ Makefile	20 Apr 2007 19:25:46 -0000	1.22
@@ -18,7 +18,7 @@
 	mv $@.new $@
 
 elfutils-portable.spec: elfutils.spec
-	(echo '%define _with_compat 1'; cat $<) > $@.new
+	(echo '%define _with_compat 1'; sed 's/ check$$/& || :/' $<) > $@.new
 	mv -f $@.new $@
 
 portable-r = 0.$(subst $(DIST),,$(RELEASE))



From fedora-cvs-commits at redhat.com  Fri Apr 20 19:46:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 15:46:18 -0400
Subject: rpms/xerces-j2/devel xerces-j2.spec,1.47,1.48
Message-ID: <200704201946.l3KJkICC001409@cvs.devel.redhat.com>

Author: mwringe

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

Modified Files:
	xerces-j2.spec 
Log Message:
- Update with newest jpp version
- Clean up spec file for Fedora Review



Index: xerces-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xerces-j2/devel/xerces-j2.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- xerces-j2.spec	13 Aug 2006 15:52:03 -0000	1.47
+++ xerces-j2.spec	20 Apr 2007 19:46:16 -0000	1.48
@@ -31,49 +31,52 @@
 #%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 bootstrap %{?_with_bootstrap:1}%{!?_with_bootstrap:%{?_without_bootstrap:0}%{!?_without_bootstrap:%{?_bootstrap:%{_bootstrap}}%{!?_bootstrap:0}}}
 
-%define cvs_version	2_7_1
-%define section		free
+%define cvs_version     2_7_1
 
-Name:		xerces-j2
-Version:	2.7.1
-Release:	7jpp.2
-Epoch:		0
-Summary:	Java XML parser
-License:	Apache Software License
-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
+Name:           xerces-j2
+Version:        2.7.1
+Release:        9jpp.1%{?dist}
+Epoch:          0
+Summary:        Java XML parser
+License:        Apache Software License
+URL:            http://xerces.apache.org/
+Group:          Text Processing/Markup/XML
+Source0:        http://archive.apache.org/dist/xml/xerces-j/Xerces-J-src.2.7.1.tar.gz
 Source1:        %{name}-version.sh
 Source2:        %{name}-constants.sh
-Source3:	XJavac.java
+Source3:        XJavac.java
 Patch0:         %{name}-build.patch
 Patch1:         %{name}-libgcj.patch
-Obsoletes:	xerces-j2-dom3
-Provides:	jaxp_parser_impl
-Provides:	xerces-j2-dom3
-Requires:	xml-commons-apis >= 0:1.3
-Requires:	xml-commons-resolver >= 1.1
-BuildRequires:	java-devel
-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 >= 0:1.3
-# xml-stylbook is not yet in FC
-#BuildRequires:	xml-stylebook
+Obsoletes:      xerces-j2-dom3 < %{epoch}:%{version}-%{release}
+Provides:       jaxp_parser_impl
+Provides:       xerces-j2-dom3 = %{epoch}:%{version}-%{release}
+Requires:       xml-commons-apis >= 0:1.3
+Requires:       xml-commons-resolver >= 1.1
+BuildRequires:  java-devel
+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 >= 0:1.3
+%if ! %{bootstrap}
+# xml-stylebook is not in Fedora yet
+#BuildRequires:  xml-stylebook
+BuildRequires:  xalan-j2
+%endif
 Requires(post): /usr/sbin/update-alternatives jaxp_parser_impl
 Requires(preun): /usr/sbin/update-alternatives jaxp_parser_impl
 
 %if ! %{gcj_support}
-BuildArch:	noarch
+BuildArch:      noarch
 %endif
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %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
+BuildRequires:      java-devel-gcj >= 1.5.0
+Requires(post):         java-gcj >= 1.5.0
+Requires(postun):       java-gcj >= 1.5.0
 %endif
 
 %description
@@ -97,49 +100,49 @@
 page.
 
 %package        javadoc-impl
-Summary:	Javadoc for %{name} implementation
-Group:		Development/Documentation
-Requires(post): /bin/rm /bin/ln
+Summary:        Javadoc for %{name} implementation
+Group:          Development/Documentation
 
 %description    javadoc-impl
 Javadoc for %{name} implementation.
 
 %package        javadoc-apis
-Summary:	Javadoc for %{name} apis
-Group:		Development/Documentation
-Obsoletes:	xerces-j2-dom3-javadoc
-Requires(post): /bin/rm /bin/ln
+Summary:        Javadoc for %{name} apis
+Group:          Development/Documentation
+Obsoletes:      xerces-j2-dom3-javadoc < %{epoch}:%{release}-%{version}
+Provides:       xerces-j2-dom3-javadoc = %{epoch}:%{release}-%{version}
 
 %description    javadoc-apis
 Javadoc for %{name} apis.
 
 %package        javadoc-xni
-Summary:	Javadoc for %{name} xni
-Group:		Development/Documentation
-Requires(post): /bin/rm /bin/ln
+Summary:        Javadoc for %{name} xni
+Group:          Development/Documentation
 
 %description    javadoc-xni
 Javadoc for %{name} xni.
 
 %package        javadoc-other
-Summary:	Javadoc for other %{name} components
-Group:		Development/Documentation
-Requires(post): /bin/rm /bin/ln
+Summary:        Javadoc for other %{name} components
+Group:          Development/Documentation
 
 %description    javadoc-other
 Javadoc for other %{name} components.
 
-%package        demo
-Summary:	Demo for %{name}
-Group:		Development/Testing
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+%if ! %{gcj_support}
+%package        manual
+Summary:        Documents for %{name}
+Group:          Development/Documentation
 
-%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
+%description    manual
+%{summary}.
 %endif
 
+%package        demo
+Summary:        Demo for %{name}
+Group:          Development/Testing
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
 %description    demo
 Demonstrations and samples for %{name}.
 
@@ -147,7 +150,7 @@
 Summary:        Additional utility scripts for %{name}
 Group:          Text Processing/Markup/XML
 Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:	jpackage-utils >= 0:1.6
+Requires:       jpackage-utils >= 0:1.6
 
 %description    scripts
 Additional utility scripts for %{name}.
@@ -160,6 +163,7 @@
 cp -a %{SOURCE3} tools/org/apache/xerces/util
 %patch1 -p0 -b .libgcj
 
+%{__sed} -i 's/\r//' NOTICE
 
 %build
 pushd tools
@@ -167,19 +171,42 @@
 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) .
+%if ! %{bootstrap}
+# Fedora does not have xml-stylebook yet
+#ln -sf $(build-classpath xml-stylebook) .
+ln -sf $(build-classpath xalan-j2) xalan.jar
+%endif
 popd
 
-%if ! %{gcj_support}
-export CLASSPATH=$(build-classpath xml-stylebook):tools/bin/xjavac.jar
+#%if ! %{gcj_support}
+# Fedora does not have xml-stylebook yet
+#export CLASSPATH=$(build-classpath xml-stylebook):tools/bin/xjavac.jar:build/xercesImpl.jar
+export CLASSPATH=tools/bin/xjavac.jar:build/xercesImpl.jar
 export ANT_OPTS="-Xmx256m -Djava.endorsed.dirs=$(pwd)/tools -Djava.awt.headless=true -Dbuild.sysclasspath=first -Ddisconnected=true"
-%endif
+#%endif
+%if %{bootstrap}
+ant \
+        -Dbuild.compiler=modern \
+        -Dtools.dir=%{_javadir} \
+        -Djar.apis=xml-commons-apis.jar \
+        -Djar.resolver=xml-commons-resolver.jar \
+        clean jars javadocs
+%else
+%if ! %{gcj_support}
 ant \
-	-Dbuild.compiler=modern \
-	-Dtools.dir=%{_javadir} \
-	-Djar.apis=xml-commons-apis.jar \
-	-Djar.resolver=xml-commons-resolver.jar \
-	clean jars javadocs sampjar
-	#docs cannot be built due missing xml-stylebook in FC
+        -Dbuild.compiler=modern \
+        -Djar.apis=xml-commons-apis.jar \
+        -Djar.resolver=xml-commons-resolver.jar \
+#        -Ddoc.generator.package=./tools/xml-stylebook.jar \
+        clean jars javadocs docs sampjar
+%else
+ant \
+        -Dbuild.compiler=modern \
+        -Djar.apis=xml-commons-apis.jar \
+        -Djar.resolver=xml-commons-resolver.jar \
+        clean jars javadocs 
+%endif
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -213,6 +240,19 @@
 
 rm -rf build/docs/javadocs
 
+# manual
+%if ! %{gcj_support} && ! %{bootstrap}
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+cp -pr build/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+cp -p ISSUES  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+cp -p LICENSE*  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+cp -p NOTICE  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+cp -p README  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+cp -p STATUS  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+cp -p TODO  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
+%endif
+
 # scripts
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}-version
@@ -228,7 +268,6 @@
 ln -s %{_sysconfdir}/alternatives \
   $RPM_BUILD_ROOT%{_javadir}/jaxp_parser_impl.jar
 
-
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
 %endif
@@ -236,23 +275,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-%post javadoc-apis
-rm -f %{_javadocdir}/%{name}-apis
-ln -s %{name}-apis-%{version} %{_javadocdir}/%{name}-apis
-
-%post javadoc-impl
-rm -f %{_javadocdir}/%{name}-impl
-ln -s %{name}-impl-%{version} %{_javadocdir}/%{name}-impl
-
-%post javadoc-other
-rm -f %{_javadocdir}/%{name}-other
-ln -s %{name}-other-%{version} %{_javadocdir}/%{name}-other
-
-%post javadoc-xni
-rm -f %{_javadocdir}/%{name}-xni
-ln -s %{name}-xni-%{version} %{_javadocdir}/%{name}-xni
-
 %post
 update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
   jaxp_parser_impl %{_javadir}/%{name}.jar 40
@@ -270,24 +292,24 @@
   update-alternatives --remove jaxp_parser_impl %{_javadir}/%{name}.jar
 } >/dev/null 2>&1 || :
 
-%postun
 %if %{gcj_support}
+%postun
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%post demo
 %if %{gcj_support}
+%post demo
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%postun demo
 %if %{gcj_support}
+%postun demo
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -296,7 +318,7 @@
 
 %files
 %defattr(0644,root,root,0755)
-%doc LICENSE README ISSUES STATUS TODO
+%doc [A-Z]*
 %{_javadir}/%{name}*.jar
 %{_javadir}/dom3-%{name}*.jar
 %ghost %{_javadir}/jaxp_parser_impl.jar
@@ -308,22 +330,28 @@
 %files javadoc-impl
 %defattr(0644,root,root,0755)
 %doc %{_javadocdir}/%{name}-impl-%{version}
-%ghost %doc %{_javadocdir}/%{name}-impl
+%doc %{_javadocdir}/%{name}-impl
 
 %files javadoc-apis
 %defattr(0644,root,root,0755)
 %doc %{_javadocdir}/%{name}-apis-%{version}
-%ghost %doc %{_javadocdir}/%{name}-apis
+%doc %{_javadocdir}/%{name}-apis
 
 %files javadoc-other
 %defattr(0644,root,root,0755)
 %doc %{_javadocdir}/%{name}-other-%{version}
-%ghost %doc %{_javadocdir}/%{name}-other
+%doc %{_javadocdir}/%{name}-other
 
 %files javadoc-xni
 %defattr(0644,root,root,0755)
 %doc %{_javadocdir}/%{name}-xni-%{version}
-%ghost %doc %{_javadocdir}/%{name}-xni
+%doc %{_javadocdir}/%{name}-xni
+
+%if ! %{gcj_support}
+%files manual
+%defattr(0644,root,root,0755)
+%doc %{_docdir}/%{name}-%{version}/[a-z]*
+%endif
 
 %files demo
 %defattr(0644,root,root,0755)
@@ -339,6 +367,10 @@
 
 
 %changelog
+* Wed Mar 28 2007 Matt Wringe <mwringe at redhat.com> 0:2.7.1-9jpp.1
+- Update with newest jpp version
+- Clean up spec file for Fedora Review
+
 * Sun Aug 13 2006 Warren Togami <wtogami at redhat.com> 0:2.7.1-7jpp.2
 - fix typo in preun req
 
@@ -422,7 +454,7 @@
 - Use absolute paths for rebuild-gcj-db.
 
 * Thu May  5 2005 Gary Benson <gbenson at redhat.com> 0:2.6.2-4jpp_5fc
-- Add dependencies for %post and %postun scriptlets (#156901).
+- Add dependencies for %%post and %%postun scriptlets (#156901).
 
 * Fri Apr 29 2005 Gary Benson <gbenson at redhat.com> 0:2.6.2-4jpp_4fc
 - BC-compile.
@@ -462,7 +494,7 @@
   from <mwringe at redhat.com> and <vivekl at redhat.com>.
 
 * Mon Jun 21 2004 Vivek Lakshmanan <vivekl at redhat.com> 0:2.6.2-2jpp_2rh
-- Added new Source1 URL and added new %setup to expand it under the
+- Added new Source1 URL and added new %%setup to expand it under the
   expanded result of Source0.
 - Updated Patch0 to fix version discrepancies.
 - Added build requirement for xml-commons-apis
@@ -564,7 +596,7 @@
 - vendor, distribution, group tags
 - provides jaxp_parser_impl
 - dropped api jar
-- renamed lone jar to %{name}.jar
+- renamed lone jar to %%{name}.jar
 - priority bumped to 40
 - fixed stylebook build (add xerces-j1 in classpath)
 



From fedora-cvs-commits at redhat.com  Fri Apr 20 20:05:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 16:05:21 -0400
Subject: rpms/xalan-j2/devel xalan-j2.spec,1.54,1.55
Message-ID: <200704202005.l3KK5LC8002211@cvs.devel.redhat.com>

Author: vivekl

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

Modified Files:
	xalan-j2.spec 
Log Message:
- Rebuild to fix incomplete .db/so files due to broken aot-compile-rpm




Index: xalan-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xalan-j2/devel/xalan-j2.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- xalan-j2.spec	18 Aug 2006 16:11:49 -0000	1.54
+++ xalan-j2.spec	20 Apr 2007 20:05:19 -0000	1.55
@@ -37,7 +37,7 @@
 
 Name:           xalan-j2
 Version:        2.7.0
-Release:        6jpp.1
+Release:        6jpp.2%{?dist}
 Epoch:          0
 Summary:        Java XSLT processor
 License:        Apache Software License
@@ -342,6 +342,9 @@
 %endif
 
 %changelog
+* Fri Apr 20 2007 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.7.0-6jpp.2.fc7
+- Rebuild to fix incomplete .db/so files due to broken aot-compile-rpm
+
 * Fri Aug 18 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.7.0-6jpp.1
 - Resync with latest from JPP.
 
@@ -512,7 +515,6 @@
     generation, since it's tuned for stylebook-1.0-b3_xalan-2.jar
   - build and provide xsltc in a separate rpm
 
-%changelog
 * Mon Jul 01 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 2.3.1-2jpp 
 - provides jaxp_transform_impl
 - requires jaxp_parser_impl



From fedora-cvs-commits at redhat.com  Fri Apr 20 20:11:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 16:11:36 -0400
Subject: rpms/xalan-j2/FC-6 xalan-j2.spec,1.54,1.55
Message-ID: <200704202011.l3KKBaXw002594@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/xalan-j2/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv2580

Modified Files:
	xalan-j2.spec 
Log Message:
- Rebuild to fix incomplete .db/so files due to broken aot-compile-rpm




Index: xalan-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xalan-j2/FC-6/xalan-j2.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- xalan-j2.spec	18 Aug 2006 16:11:49 -0000	1.54
+++ xalan-j2.spec	20 Apr 2007 20:11:34 -0000	1.55
@@ -37,7 +37,7 @@
 
 Name:           xalan-j2
 Version:        2.7.0
-Release:        6jpp.1
+Release:        6jpp.2%{?dist}
 Epoch:          0
 Summary:        Java XSLT processor
 License:        Apache Software License
@@ -342,6 +342,9 @@
 %endif
 
 %changelog
+* Fri Apr 20 2007 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.7.0-6jpp.2.fc6
+- Rebuild to fix incomplete .db/so files due to broken aot-compile-rpm
+
 * Fri Aug 18 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.7.0-6jpp.1
 - Resync with latest from JPP.
 
@@ -512,7 +515,6 @@
     generation, since it's tuned for stylebook-1.0-b3_xalan-2.jar
   - build and provide xsltc in a separate rpm
 
-%changelog
 * Mon Jul 01 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 2.3.1-2jpp 
 - provides jaxp_transform_impl
 - requires jaxp_parser_impl



From fedora-cvs-commits at redhat.com  Fri Apr 20 20:12:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 16:12:57 -0400
Subject: rpms/gthumb/devel .cvsignore, 1.27, 1.28 gthumb.spec, 1.67,
	1.68 sources, 1.28, 1.29
Message-ID: <200704202012.l3KKCv6O002699@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gthumb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2671

Modified Files:
	.cvsignore gthumb.spec sources 
Log Message:
2.10.2, including several important bug-fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	20 Mar 2007 13:54:04 -0000	1.27
+++ .cvsignore	20 Apr 2007 20:12:55 -0000	1.28
@@ -1 +1 @@
-gthumb-2.10.0.tar.bz2
+gthumb-2.10.2.tar.bz2


Index: gthumb.spec
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- gthumb.spec	2 Apr 2007 05:16:08 -0000	1.67
+++ gthumb.spec	20 Apr 2007 20:12:55 -0000	1.68
@@ -10,8 +10,8 @@
 
 Summary: Image viewer, editor, organizer
 Name: gthumb
-Version: 2.10.0
-Release: 3%{?dist}
+Version: 2.10.2
+Release: 1%{?dist}
 URL: http://gthumb.sourceforge.net
 Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gthumb/2.10/%{name}-%{version}.tar.bz2
 License: GPL
@@ -135,6 +135,9 @@
 %{_datadir}/icons/hicolor/*
 
 %changelog
+* Fri Apr 20 2007 Matthias Clasen <mclasen at redhat.com> - 2.10.2-1
+- Update to 2.10.2
+- 
 * Mon Apr  2 2007 Matthias Clasen <mclasen at redhat.com> - 2.10.0-3
 - Use the PICTURES user dir as default location for photo import
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	20 Mar 2007 13:54:04 -0000	1.28
+++ sources	20 Apr 2007 20:12:55 -0000	1.29
@@ -1 +1 @@
-a3e785778c262c193f750d4b17e0edfd  gthumb-2.10.0.tar.bz2
+fbd779a16ea3c715d2a10911c41937ed  gthumb-2.10.2.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr 20 20:13:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 16:13:09 -0400
Subject: rpms/selinux-policy/devel policy-20070219.patch, 1.56,
	1.57 selinux-policy.spec, 1.441, 1.442
Message-ID: <200704202013.l3KKD9Rj002727@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20070219.patch selinux-policy.spec 
Log Message:
* Thu Apr 19 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-12
- Allow consolekit to syslog
- Allow ntfs to work with hal


policy-20070219.patch:
 Rules.modular                           |   12 +
 policy/flask/access_vectors             |    4 
 policy/global_booleans                  |    2 
 policy/global_tunables                  |    7 
 policy/mls                              |   31 ++-
 policy/modules/admin/acct.te            |    1 
 policy/modules/admin/alsa.fc            |    1 
 policy/modules/admin/amtu.fc            |    3 
 policy/modules/admin/amtu.if            |   53 +++++
 policy/modules/admin/amtu.te            |   56 ++++++
 policy/modules/admin/bootloader.te      |    3 
 policy/modules/admin/consoletype.te     |   10 -
 policy/modules/admin/dmesg.te           |    1 
 policy/modules/admin/kudzu.te           |    6 
 policy/modules/admin/logwatch.te        |    4 
 policy/modules/admin/netutils.te        |    6 
 policy/modules/admin/rpm.fc             |    3 
 policy/modules/admin/rpm.if             |   85 +++++++--
 policy/modules/admin/rpm.te             |    2 
 policy/modules/admin/su.if              |    4 
 policy/modules/admin/usermanage.if      |    2 
 policy/modules/admin/usermanage.te      |   26 ++
 policy/modules/apps/gnome.if            |   26 ++
 policy/modules/apps/gpg.fc              |    2 
 policy/modules/apps/loadkeys.if         |   44 +---
 policy/modules/apps/mozilla.if          |    1 
 policy/modules/apps/slocate.te          |    5 
 policy/modules/apps/uml.if              |   27 --
 policy/modules/kernel/corecommands.fc   |    5 
 policy/modules/kernel/corecommands.if   |   20 ++
 policy/modules/kernel/corenetwork.te.in |   15 +
 policy/modules/kernel/devices.if        |   36 +++
 policy/modules/kernel/domain.if         |   18 +
 policy/modules/kernel/domain.te         |   46 +++++
 policy/modules/kernel/files.fc          |    1 
 policy/modules/kernel/files.if          |   83 +++++++--
 policy/modules/kernel/filesystem.if     |   39 ++++
 policy/modules/kernel/filesystem.te     |   13 +
 policy/modules/kernel/kernel.if         |   42 ++++
 policy/modules/kernel/kernel.te         |    2 
 policy/modules/kernel/mls.if            |   20 ++
 policy/modules/kernel/mls.te            |    3 
 policy/modules/kernel/selinux.if        |   38 ++++
 policy/modules/kernel/storage.if        |    2 
 policy/modules/kernel/terminal.if       |    2 
 policy/modules/kernel/terminal.te       |    1 
 policy/modules/services/aide.fc         |    1 
 policy/modules/services/aide.te         |    2 
 policy/modules/services/amavis.if       |   19 ++
 policy/modules/services/amavis.te       |    3 
 policy/modules/services/apache.fc       |   14 -
 policy/modules/services/apache.if       |  171 +++++++++++++++++-
 policy/modules/services/apache.te       |   72 +++++++
 policy/modules/services/apcupsd.fc      |    9 
 policy/modules/services/apcupsd.if      |  108 +++++++++++
 policy/modules/services/apcupsd.te      |   92 ++++++++++
 policy/modules/services/automount.te    |    2 
 policy/modules/services/avahi.if        |   19 ++
 policy/modules/services/avahi.te        |    4 
 policy/modules/services/bind.te         |    1 
 policy/modules/services/bluetooth.te    |    2 
 policy/modules/services/clamav.te       |    1 
 policy/modules/services/consolekit.te   |   33 ++-
 policy/modules/services/cron.fc         |    1 
 policy/modules/services/cron.if         |   33 +--
 policy/modules/services/cron.te         |   43 ++++
 policy/modules/services/cups.te         |    6 
 policy/modules/services/cvs.te          |    1 
 policy/modules/services/cyrus.te        |    1 
 policy/modules/services/dbus.if         |   63 ++++++
 policy/modules/services/dhcp.te         |    2 
 policy/modules/services/djbdns.te       |    5 
 policy/modules/services/dovecot.te      |    5 
 policy/modules/services/ftp.te          |    5 
 policy/modules/services/hal.fc          |    8 
 policy/modules/services/hal.if          |   77 ++++++++
 policy/modules/services/hal.te          |  147 +++++++++++++++-
 policy/modules/services/inetd.te        |    5 
 policy/modules/services/kerberos.if     |   79 ++------
 policy/modules/services/kerberos.te     |   36 +++
 policy/modules/services/mailman.if      |   19 ++
 policy/modules/services/mta.if          |   19 ++
 policy/modules/services/mta.te          |    2 
 policy/modules/services/nis.if          |    4 
 policy/modules/services/nis.te          |    4 
 policy/modules/services/nscd.te         |   10 -
 policy/modules/services/ntp.te          |    4 
 policy/modules/services/pegasus.if      |   18 +
 policy/modules/services/pegasus.te      |    6 
 policy/modules/services/postfix.if      |    1 
 policy/modules/services/postfix.te      |    8 
 policy/modules/services/ppp.te          |    2 
 policy/modules/services/procmail.te     |    1 
 policy/modules/services/pyzor.te        |    7 
 policy/modules/services/radius.te       |    4 
 policy/modules/services/rpc.if          |    5 
 policy/modules/services/rsync.te        |    1 
 policy/modules/services/rwho.fc         |    3 
 policy/modules/services/rwho.if         |   84 +++++++++
 policy/modules/services/rwho.te         |   61 ++++++
 policy/modules/services/samba.fc        |    3 
 policy/modules/services/samba.if        |   86 +++++++++
 policy/modules/services/samba.te        |   85 +++++++++
 policy/modules/services/sendmail.if     |   22 ++
 policy/modules/services/smartmon.te     |    1 
 policy/modules/services/snmp.te         |   15 +
 policy/modules/services/spamassassin.te |    7 
 policy/modules/services/squid.fc        |    2 
 policy/modules/services/squid.if        |   22 ++
 policy/modules/services/squid.te        |   12 +
 policy/modules/services/ssh.if          |   39 ++++
 policy/modules/services/ssh.te          |   10 -
 policy/modules/services/w3c.fc          |    2 
 policy/modules/services/w3c.if          |    1 
 policy/modules/services/w3c.te          |   14 +
 policy/modules/system/application.fc    |    1 
 policy/modules/system/application.if    |  104 +++++++++++
 policy/modules/system/application.te    |   14 +
 policy/modules/system/authlogin.if      |   83 +++++++--
 policy/modules/system/authlogin.te      |    3 
 policy/modules/system/fstools.fc        |    1 
 policy/modules/system/fstools.te        |    1 
 policy/modules/system/fusermount.fc     |    6 
 policy/modules/system/fusermount.if     |   41 ++++
 policy/modules/system/fusermount.te     |   50 +++++
 policy/modules/system/getty.te          |    3 
 policy/modules/system/hostname.te       |   14 +
 policy/modules/system/init.if           |   42 ++++
 policy/modules/system/init.te           |   35 +++
 policy/modules/system/ipsec.if          |   20 ++
 policy/modules/system/ipsec.te          |    3 
 policy/modules/system/iptables.te       |    5 
 policy/modules/system/libraries.fc      |    5 
 policy/modules/system/libraries.te      |    4 
 policy/modules/system/locallogin.te     |    7 
 policy/modules/system/logging.if        |    2 
 policy/modules/system/logging.te        |    2 
 policy/modules/system/lvm.fc            |    1 
 policy/modules/system/lvm.te            |    8 
 policy/modules/system/modutils.te       |    7 
 policy/modules/system/mount.fc          |    3 
 policy/modules/system/mount.if          |   37 ++++
 policy/modules/system/mount.te          |   70 +++++++
 policy/modules/system/raid.te           |    1 
 policy/modules/system/selinuxutil.fc    |    1 
 policy/modules/system/selinuxutil.if    |    5 
 policy/modules/system/selinuxutil.te    |   59 +++---
 policy/modules/system/setrans.if        |    1 
 policy/modules/system/sysnetwork.te     |    3 
 policy/modules/system/udev.te           |   12 +
 policy/modules/system/unconfined.fc     |    1 
 policy/modules/system/unconfined.if     |   10 -
 policy/modules/system/unconfined.te     |   24 ++
 policy/modules/system/userdomain.if     |  293 +++++++++++++++++---------------
 policy/modules/system/userdomain.te     |   63 +++++-
 policy/modules/system/xen.te            |   35 +++
 policy/support/obj_perm_sets.spt        |   12 +
 157 files changed, 3096 insertions(+), 463 deletions(-)

Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- policy-20070219.patch	19 Apr 2007 18:24:08 -0000	1.56
+++ policy-20070219.patch	20 Apr 2007 20:13:07 -0000	1.57
@@ -1558,7 +1558,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.5.12/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2007-02-20 16:35:52.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/kernel/terminal.if	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/kernel/terminal.if	2007-04-20 13:13:05.000000000 -0400
 @@ -1052,7 +1052,7 @@
  	')
  
@@ -1599,6 +1599,32 @@
  logging_log_filetrans(aide_t,aide_log_t,file)
  
  files_read_all_files(aide_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.if serefpolicy-2.5.12/policy/modules/services/amavis.if
+--- nsaserefpolicy/policy/modules/services/amavis.if	2007-01-02 12:57:43.000000000 -0500
++++ serefpolicy-2.5.12/policy/modules/services/amavis.if	2007-04-20 11:27:07.000000000 -0400
+@@ -167,3 +167,22 @@
+ 	allow $1 amavis_var_run_t:file setattr;
+ 	files_search_pids($1)
+ ')
++
++########################################
++## <summary>
++##	Set the create of amavis var run files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`amavis_create_pid_files',`
++	gen_require(`
++		type amavis_var_run_t;
++	')
++
++	allow $1 amavis_var_run_t:file create_file_perms;
++	files_search_pids($1)
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.5.12/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2007-03-26 10:39:04.000000000 -0400
 +++ serefpolicy-2.5.12/policy/modules/services/amavis.te	2007-04-11 17:07:34.000000000 -0400
@@ -2151,8 +2177,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apcupsd.te serefpolicy-2.5.12/policy/modules/services/apcupsd.te
 --- nsaserefpolicy/policy/modules/services/apcupsd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/services/apcupsd.te	2007-04-12 15:16:19.000000000 -0400
-@@ -0,0 +1,91 @@
++++ serefpolicy-2.5.12/policy/modules/services/apcupsd.te	2007-04-20 09:22:35.000000000 -0400
+@@ -0,0 +1,92 @@
 +policy_module(apcupsd,1.0.0)
 +
 +########################################
@@ -2184,6 +2210,7 @@
 +init_use_script_ptys(apcupsd_t)
 +domain_use_interactive_fds(apcupsd_t)
 +
++allow apcupsd_t self:process signal;
 +allow apcupsd_t self:fifo_file rw_file_perms;
 +allow apcupsd_t self:unix_stream_socket create_stream_socket_perms;
 +allow apcupsd_t self:tcp_socket create_stream_socket_perms;
@@ -2300,6 +2327,17 @@
 +optional_policy(`
 +	samba_stream_connect_winbind(avahi_t)
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-2.5.12/policy/modules/services/bind.te
+--- nsaserefpolicy/policy/modules/services/bind.te	2007-03-26 16:24:12.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/bind.te	2007-04-20 16:05:15.000000000 -0400
+@@ -236,6 +236,7 @@
+ corenet_tcp_sendrecv_all_nodes(ndc_t)
+ corenet_tcp_sendrecv_all_ports(ndc_t)
+ corenet_tcp_connect_rndc_port(ndc_t)
++corenet_tcp_bind_all_nodes(ndc_t)
+ corenet_sendrecv_rndc_client_packets(ndc_t)
+ 
+ fs_getattr_xattr_fs(ndc_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.5.12/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2007-03-20 23:38:04.000000000 -0400
 +++ serefpolicy-2.5.12/policy/modules/services/bluetooth.te	2007-04-11 17:07:34.000000000 -0400
@@ -2312,9 +2350,20 @@
  
  #Handle bluetooth serial devices
  term_use_unallocated_ttys(bluetooth_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-2.5.12/policy/modules/services/clamav.te
+--- nsaserefpolicy/policy/modules/services/clamav.te	2007-03-20 23:38:05.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/clamav.te	2007-04-20 11:25:27.000000000 -0400
+@@ -126,6 +126,7 @@
+ 	amavis_read_lib_files(clamd_t)
+ 	amavis_read_spool_files(clamd_t)
+ 	amavis_spool_filetrans(clamd_t,clamd_var_run_t,sock_file)
++	amavis_create_pid_files(clamd_t)
+ ')
+ 
+ ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-2.5.12/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2007-04-11 16:04:02.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/consolekit.te	2007-04-18 15:27:17.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/consolekit.te	2007-04-20 16:00:26.000000000 -0400
 @@ -19,14 +19,13 @@
  # consolekit local policy
  #
@@ -2333,7 +2382,7 @@
  
  dev_read_urand(consolekit_t)
  dev_read_sysfs(consolekit_t)
-@@ -38,18 +37,32 @@
+@@ -38,18 +37,34 @@
  # needs to read /var/lib/dbus/machine-id
  files_read_var_lib_files(consolekit_t)
  
@@ -2345,6 +2394,8 @@
  libs_use_ld_so(consolekit_t)
  libs_use_shared_libs(consolekit_t)
  
++logging_send_syslog_msg(consolekit_t)
++
  miscfiles_read_localization(consolekit_t)
  
 +term_use_all_terms(consolekit_t)
@@ -2369,7 +2420,7 @@
  optional_policy(`
  	dbus_system_bus_client_template(consolekit, consolekit_t)
  	dbus_send_system_bus(consolekit_t)
-@@ -61,3 +74,7 @@
+@@ -61,3 +76,7 @@
  		unconfined_dbus_chat(consolekit_t)
  	')
  ')
@@ -2841,8 +2892,8 @@
 +/var/log/pm-suspend.log				gen_context(system_u:object_r:hald_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.5.12/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2007-02-19 11:32:53.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/services/hal.if	2007-04-16 11:36:25.000000000 -0400
-@@ -208,3 +208,42 @@
++++ serefpolicy-2.5.12/policy/modules/services/hal.if	2007-04-20 16:11:31.000000000 -0400
+@@ -208,3 +208,80 @@
  	files_search_pids($1)
  	allow $1 hald_var_run_t:file rw_file_perms;
  ')
@@ -2885,6 +2936,44 @@
 +	logging_search_logs($1)
 +	allow $1 hald_log_t:file rw_file_perms;
 +')
++
++########################################
++## <summary>
++##	Allow domain to use file descriptors from hal.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`hal_use_fds',`
++	gen_require(`
++		type hald_t;
++	')
++
++	allow $1 hald_t:fd use; 
++')
++
++########################################
++## <summary>
++##	Allow attempts to read and write to
++##	hald unnamed pipes.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`hal_rw_pipes',`
++	gen_require(`
++		type hald_t;
++	')
++
++	allow $1 hald_t:fifo_file rw_fifo_file_perms; 
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.5.12/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2007-03-20 23:38:00.000000000 -0400
 +++ serefpolicy-2.5.12/policy/modules/services/hal.te	2007-04-19 09:51:36.000000000 -0400
@@ -3469,7 +3558,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.5.12/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2007-04-10 12:52:58.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/services/ntp.te	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/services/ntp.te	2007-04-20 14:48:46.000000000 -0400
 @@ -137,6 +137,10 @@
  ')
  
@@ -3763,8 +3852,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rwho.te serefpolicy-2.5.12/policy/modules/services/rwho.te
 --- nsaserefpolicy/policy/modules/services/rwho.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/services/rwho.te	2007-04-17 15:21:00.000000000 -0400
-@@ -0,0 +1,65 @@
++++ serefpolicy-2.5.12/policy/modules/services/rwho.te	2007-04-20 13:14:06.000000000 -0400
+@@ -0,0 +1,61 @@
 +policy_module(rwho,1.0.0)
 +
 +########################################
@@ -3824,12 +3913,8 @@
 +
 +sysnet_dns_name_resolve(rwho_t)
 +
-+ifdef(`targeted_policy',`
-+	term_dontaudit_use_unallocated_ttys(rwho_t)
-+	term_dontaudit_use_generic_ptys(rwho_t)
-+')
-+
-+
++term_dontaudit_use_all_user_ttys(rwho_t)
++term_dontaudit_use_all_user_ptys(rwho_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-2.5.12/policy/modules/services/samba.fc
 --- nsaserefpolicy/policy/modules/services/samba.fc	2007-02-23 16:50:01.000000000 -0500
 +++ serefpolicy-2.5.12/policy/modules/services/samba.fc	2007-04-11 17:07:34.000000000 -0400
@@ -4835,8 +4920,8 @@
 \ No newline at end of file
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fusermount.te serefpolicy-2.5.12/policy/modules/system/fusermount.te
 --- nsaserefpolicy/policy/modules/system/fusermount.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/system/fusermount.te	2007-04-11 17:07:34.000000000 -0400
-@@ -0,0 +1,45 @@
++++ serefpolicy-2.5.12/policy/modules/system/fusermount.te	2007-04-20 16:11:36.000000000 -0400
+@@ -0,0 +1,50 @@
 +policy_module(fusermount,1.0.0)
 +
 +########################################
@@ -4874,6 +4959,11 @@
 +storage_raw_write_fixed_disk(fusermount_t)
 +
 +optional_policy(`
++	hal_write_log(fusermount_t)
++	hal_use_fds(fusermount_t)
++')
++
++optional_policy(`
 +	mount_ntfs_rw_stream_sockets(fusermount_t)
 +')
 +
@@ -5389,7 +5479,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.5.12/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2007-03-26 16:24:13.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/mount.te	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/mount.te	2007-04-20 16:11:51.000000000 -0400
 @@ -9,6 +9,13 @@
  ifdef(`targeted_policy',`
  ## <desc>
@@ -5444,7 +5534,7 @@
  	')
  ')
  
-@@ -205,3 +222,46 @@
+@@ -205,3 +222,52 @@
  	files_etc_filetrans_etc_runtime(unconfined_mount_t,file)
  	unconfined_domain(unconfined_mount_t)
  ')
@@ -5488,9 +5578,15 @@
 +	nscd_socket_use(mount_ntfs_t)
 +')
 +
++optional_policy(`
++	hal_write_log(mount_ntfs_t)
++	hal_use_fds(mount_ntfs_t)
++')
++
 +ifdef(`targeted_policy',`
 +	term_use_generic_ptys(mount_ntfs_t)
 +')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-2.5.12/policy/modules/system/raid.te
 --- nsaserefpolicy/policy/modules/system/raid.te	2007-03-26 10:39:07.000000000 -0400
 +++ serefpolicy-2.5.12/policy/modules/system/raid.te	2007-04-11 17:07:34.000000000 -0400
@@ -5852,7 +5948,7 @@
  		init_dbus_chat_script(unconfined_execmem_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.5.12/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-03-26 16:24:13.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/userdomain.if	2007-04-19 09:43:55.000000000 -0400
++++ serefpolicy-2.5.12/policy/modules/system/userdomain.if	2007-04-20 13:05:24.000000000 -0400
 @@ -114,6 +114,10 @@
  		# Allow making the stack executable via mprotect.
  		allow $1_t self:process execstack;
@@ -5864,6 +5960,15 @@
  ')
  
  #######################################
+@@ -631,7 +635,7 @@
+ ##	</summary>
+ ## </param>
+ #
+-template(`userdom_role_change_template',`
++template(`userdom_rolechange_template',`
+ 	gen_require(`
+ 		role $1_r, $2_r;
+ 		type $1_t, $2_t;
 @@ -764,6 +768,7 @@
  	auth_search_pam_console_data($1_t)
  	auth_run_pam($1_t,$1_r,{ $1_tty_device_t $1_devpts_t })
@@ -5881,7 +5986,18 @@
  
  	# 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)
-@@ -1126,7 +1131,7 @@
+@@ -1059,10 +1064,6 @@
+ 		dontaudit xdm_t $1_home_t:file rw_file_perms;
+ 	')
+ 
+-	# 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 };
+ 	') dnl end TODO
+ ')
+ 
+@@ -1126,7 +1127,7 @@
  	# $1_t local policy
  	#
  
@@ -5890,7 +6006,7 @@
  	allow $1_t self:process { setexec setfscreate };
  
  	# Set password information for other users.
-@@ -1225,22 +1230,6 @@
+@@ -1225,22 +1226,6 @@
  	')
  
  	optional_policy(`
@@ -5913,7 +6029,7 @@
  		userhelper_exec($1_t)
  	')
  ')
-@@ -1369,11 +1358,7 @@
+@@ -1369,11 +1354,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_generic_user',`
@@ -5926,7 +6042,7 @@
  ')
  
  ########################################
-@@ -1400,11 +1385,7 @@
+@@ -1400,11 +1381,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_from_generic_user',`
@@ -5939,7 +6055,7 @@
  ')
  
  ########################################
-@@ -1430,11 +1411,7 @@
+@@ -1430,11 +1407,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_staff',`
@@ -5952,7 +6068,7 @@
  ')
  
  ########################################
-@@ -1461,11 +1438,7 @@
+@@ -1461,11 +1434,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_from_staff',`
@@ -5965,7 +6081,7 @@
  ')
  
  ########################################
-@@ -1491,11 +1464,7 @@
+@@ -1491,11 +1460,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_sysadm',`
@@ -5978,7 +6094,7 @@
  ')
  
  ########################################
-@@ -1522,11 +1491,7 @@
+@@ -1522,11 +1487,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_from_sysadm',`
@@ -5991,7 +6107,7 @@
  ')
  
  ########################################
-@@ -1714,13 +1679,11 @@
+@@ -1714,13 +1675,11 @@
  ## </param>
  #
  template(`userdom_setattr_user_ptys',`
@@ -6009,7 +6125,7 @@
  ')
  
  ########################################
-@@ -1749,13 +1712,11 @@
+@@ -1749,13 +1708,11 @@
  ## </param>
  #
  template(`userdom_create_user_pty',`
@@ -6027,7 +6143,7 @@
  ')
  
  ########################################
-@@ -3640,13 +3601,12 @@
+@@ -3640,13 +3597,12 @@
  template(`userdom_setattr_user_ttys',`
  	ifdef(`targeted_policy',`
  		term_setattr_unallocated_ttys($2)
@@ -6046,7 +6162,7 @@
  ')
  
  ########################################
-@@ -3677,13 +3637,12 @@
+@@ -3677,13 +3633,12 @@
  template(`userdom_use_user_ttys',`
  	ifdef(`targeted_policy',`
  		term_use_unallocated_ttys($2)
@@ -6065,7 +6181,7 @@
  ')
  
  ########################################
-@@ -3712,18 +3671,13 @@
+@@ -3712,18 +3667,13 @@
  ## </param>
  #
  template(`userdom_use_user_terminals',`
@@ -6090,7 +6206,7 @@
  ')
  
  ########################################
-@@ -5369,14 +5323,13 @@
+@@ -5369,14 +5319,13 @@
  interface(`userdom_use_unpriv_users_ptys',`
  	ifdef(`targeted_policy',`
  		term_use_generic_ptys($1)
@@ -6111,7 +6227,7 @@
  ')
  
  ########################################
-@@ -5393,13 +5346,13 @@
+@@ -5393,13 +5342,13 @@
  interface(`userdom_dontaudit_use_unpriv_users_ptys',`
  	ifdef(`targeted_policy',`
  		term_dontaudit_use_generic_ptys($1)
@@ -6130,7 +6246,7 @@
  ')
  
  ########################################
-@@ -5452,13 +5405,12 @@
+@@ -5452,13 +5401,12 @@
  interface(`userdom_list_unpriv_users_tmp',`
  	ifdef(`targeted_policy',`
  		files_list_tmp($1)
@@ -6149,7 +6265,7 @@
  ')
  
  ########################################
-@@ -5474,13 +5426,12 @@
+@@ -5474,13 +5422,12 @@
  interface(`userdom_read_unpriv_users_tmp_files',`
  	ifdef(`targeted_policy',`
  		files_read_generic_tmp_files($1)
@@ -6168,7 +6284,7 @@
  ')
  
  ########################################
-@@ -5496,13 +5447,12 @@
+@@ -5496,13 +5443,12 @@
  interface(`userdom_read_unpriv_users_tmp_symlinks',`
  	ifdef(`targeted_policy',`
  		files_read_generic_tmp_symlinks($1)
@@ -6187,7 +6303,7 @@
  ')
  
  ########################################
-@@ -5536,13 +5486,12 @@
+@@ -5536,13 +5482,12 @@
  interface(`userdom_use_unpriv_users_ttys',`
  	ifdef(`targeted_policy',`
  		term_use_unallocated_ttys($1)
@@ -6206,7 +6322,7 @@
  ')
  
  ########################################
-@@ -5559,13 +5508,12 @@
+@@ -5559,13 +5504,12 @@
  interface(`userdom_dontaudit_use_unpriv_users_ttys',`
  	ifdef(`targeted_policy',`
  		term_dontaudit_use_unallocated_ttys($1)
@@ -6225,7 +6341,7 @@
  ')
  
  ########################################
-@@ -5737,3 +5685,92 @@
+@@ -5737,3 +5681,92 @@
  	allow $1 user_home_dir_t:dir manage_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.441
retrieving revision 1.442
diff -u -r1.441 -r1.442
--- selinux-policy.spec	19 Apr 2007 18:24:08 -0000	1.441
+++ selinux-policy.spec	20 Apr 2007 20:13:07 -0000	1.442
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.5.12
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -358,8 +358,12 @@
 %endif
 
 %changelog
+* Thu Apr 19 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-12
+- Allow consolekit to syslog
+- Allow ntfs to work with hal
+
 * Thu Apr 19 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-11
-- Allow iptbales to read etc_runtime_t
+- Allow iptables to read etc_runtime_t
 
 * Thu Apr 19 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-10
 - MLS Fixes



From fedora-cvs-commits at redhat.com  Fri Apr 20 20:23:37 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 16:23:37 -0400
Subject: rpms/MySQL-python/devel setup.py, NONE, 1.1 sitecfg.patch, NONE,
	1.1 MySQL-python.spec, 1.27, 1.28
Message-ID: <200704202023.l3KKNbHf003066@cvs.devel.redhat.com>

Author: tgl

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

Modified Files:
	MySQL-python.spec 
Added Files:
	setup.py sitecfg.patch 
Log Message:
Avoid depending on python-setuptools, since that's not in Core.


--- NEW FILE setup.py ---
#!/usr/bin/env python

class Abort(Exception): pass

import os
import sys
from distutils.core import setup
from distutils.extension import Extension
from ConfigParser import SafeConfigParser

if sys.version_info < (2, 3):
    raise Abort, "Python-2.3 or newer is required"

config = SafeConfigParser()
config.read(['metadata.cfg', 'site.cfg'])

metadata = dict(config.items('metadata'))
options = dict(config.items('options'))

metadata['py_modules'] = filter(None, metadata['py_modules'].split('\n'))
metadata['classifiers'] = filter(None, metadata['classifiers'].split('\n'))

def mysql_config(what):
    from os import popen
    f = popen("mysql_config --%s" % what)
    data = f.read().strip().split()
    if f.close(): data = []
    return data

# This dequote() business is required for some older versions
# of mysql_config

def dequote(s):
    if s[0] in "\"'" and s[0] == s[-1]:
        s = s[1:-1]
    return s

def enabled(option):
    value = options[option]
    s = value.lower()
    if s in ('yes','true','1','y'):
        return True
    elif s in ('no', 'false', '0', 'n'):
        return False
    else:
        raise Abort, "Unknown value %s for option %s" % (value, option)

extra_objects = []
static = enabled('static')
if enabled('embedded'):
    libs = mysql_config("libmysqld-libs")
    client = "mysqld"
elif enabled('threadsafe'):
    libs = mysql_config("libs_r")
    client = "mysqlclient_r"
    if not libs:
        libs = mysql_config("libs")
        client = "mysqlclient"
else:
    libs = mysql_config("libs")
    client = "mysqlclient"

name = "MySQL-%s" % os.path.basename(sys.executable)
if enabled('embedded'):
    name = name + "-embedded"
metadata['name'] = name

library_dirs = [ dequote(i[2:]) for i in libs if i.startswith("-L") ]
libraries = [ dequote(i[2:]) for i in libs if i.startswith("-l") ]

removable_compile_args = '-I -L -l'.split()
extra_compile_args = [ i for i in mysql_config("cflags")
                       if i[:2] not in removable_compile_args ]
include_dirs = [ dequote(i[2:])
                 for i in mysql_config('include')
                 if i.startswith('-I') ]
if not include_dirs: # fix for MySQL-3.23
    include_dirs = [ dequote(i[2:])
		     for i in mysql_config('cflags')
		     if i.startswith('-I') ]

if static:
    extra_objects.append(os.path.join(
        library_dirs[0],'lib%s.a' % client))

extra_compile_args.append("-Dversion_info=\"%s\"" % metadata['version_info'])
extra_compile_args.append("-D__version__=\"%s\"" % metadata['version'])

rel = open("MySQLdb/release.py",'w')
rel.write("""
__author__ = "%(author)s <%(author_email)s>"
version_info = %(version_info)s
__version__ = "%(version)s"
""" % metadata)
rel.close()

del metadata['version_info']

ext_mysql_metadata = dict(
    name="_mysql",
    include_dirs=include_dirs,
    library_dirs=library_dirs,
    libraries=libraries,
    extra_compile_args=extra_compile_args,
    extra_objects=extra_objects,
    sources=['_mysql.c'],
    )
if config.read(['site.cfg']):
    ext_mysql_metadata.update([ (k, v.split()) for k, v in config.items('compiler') ])
ext_mysql = Extension(**ext_mysql_metadata)
metadata['ext_modules'] = [ext_mysql]
setup(**metadata)

sitecfg.patch:
 site.cfg |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE sitecfg.patch ---
Old setup.py script expects a [compiler] section in site.cfg,
but we don't actually need to have anything in it.


diff -Naur MySQL-python-1.2.2.orig/site.cfg MySQL-python-1.2.2/site.cfg
--- MySQL-python-1.2.2.orig/site.cfg	2007-03-03 21:53:59.000000000 -0500
+++ MySQL-python-1.2.2/site.cfg	2007-04-20 16:18:13.000000000 -0400
@@ -16,3 +16,6 @@
 # This has to be set for Windows builds to work.
 # Only change this if you have a different version.
 registry_key = SOFTWARE\MySQL AB\MySQL Server 5.0
+
+# Use the compiler section to add additional options for the extension build.
+[compiler]


Index: MySQL-python.spec
===================================================================
RCS file: /cvs/dist/rpms/MySQL-python/devel/MySQL-python.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- MySQL-python.spec	20 Apr 2007 18:34:59 -0000	1.27
+++ MySQL-python.spec	20 Apr 2007 20:23:35 -0000	1.28
@@ -6,11 +6,16 @@
 Group: Development/Libraries
 URL: http://sourceforge.net/projects/mysql-python/
 Source0: http://prdownloads.sourceforge.net/mysql-python/MySQL-python-%{version}.tar.gz
+# 1.2.2 has adopted python-setuptools in preference to distutils, but since
+# we don't (yet?) ship that in Fedora or RHEL, we keep using the setup.py
+# script from 1.2.1_p2 for now.
+Source1: setup.py
+Patch1: sitecfg.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python mx mysql
 Requires: python
-BuildRequires: python-devel python-setuptools
+BuildRequires: python-devel
 BuildRequires: mysql-devel python Distutils gcc zlib-devel
 
 %description
@@ -34,6 +39,10 @@
 %prep
 %setup -q
 
+cp -f %{SOURCE1} setup.py
+
+%patch1 -p1
+
 %build
 rm -f doc/*~
 export libdirname=%{_lib}
@@ -59,7 +68,7 @@
 
 %changelog
 * Fri Apr 20 2007 Tom Lane <tgl at redhat.com> 1.2.2-1
-- Update to 1.2.2
+- Update to 1.2.2, but not 1.2.2 setup.py (since we don't ship setuptools yet)
 
 * Thu Dec  7 2006 Jeremy Katz <katzj at redhat.com> - 1.2.1_p2-2
 - rebuild for python 2.5



From fedora-cvs-commits at redhat.com  Fri Apr 20 20:27:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 16:27:21 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.406, 1.407 anaconda.spec, 1.536,
	1.537 sources, 1.531, 1.532
Message-ID: <200704202027.l3KKRL6R003191@cvs.devel.redhat.com>

Author: clumens

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -r1.406 -r1.407
--- .cvsignore	19 Apr 2007 21:15:58 -0000	1.406
+++ .cvsignore	20 Apr 2007 20:27:19 -0000	1.407
@@ -1 +1,2 @@
 anaconda-11.2.0.53.tar.bz2
+anaconda-11.2.0.54.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.536
retrieving revision 1.537
diff -u -r1.536 -r1.537
--- anaconda.spec	19 Apr 2007 21:15:58 -0000	1.536
+++ anaconda.spec	20 Apr 2007 20:27:19 -0000	1.537
@@ -1,7 +1,7 @@
 %define livearches %{ix86} x86_64
 
 Name: anaconda
-Version: 11.2.0.53
+Version: 11.2.0.54
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -21,7 +21,7 @@
 BuildRequires: slang-devel >= 2.0.6-2, slang-static
 BuildRequires: newt-devel, newt-static
 BuildRequires: glib2-devel >= 2.11.1-5, glib2-static
-BuildRequires: libdhcp-devel-static >= 1.24-3, mkinitrd-devel >= 5.1.2-1
+BuildRequires: libdhcp-static >= 1.24-3, mkinitrd-devel >= 5.1.2-1
 BuildRequires: audit-libs-devel
 %ifarch %livearches
 BuildRequires: desktop-file-utils
@@ -65,7 +65,7 @@
 AutoReqProv: false
 Requires: libxml2-python, python, rpm-python >= 4.2-0.61
 Requires: anaconda = %{version}-%{release}
-Requires: createrepo >= 0.4.7, squashfs-tools, mkisofs
+Requires: createrepo >= 0.4.7, squashfs-tools, genisoimage
 %ifarch %{ix86} x86_64
 Requires: syslinux
 %endif
@@ -142,6 +142,15 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Fri Apr 20 2007 Chris Lumens <clumens at redhat.com> - 11.2.0.54-1
+- Be smarter about detecting network link status (dcantrell, #236483).
+- Lots of yum mirror list and retry fixes (dlehman).
+- BR libdhcp-static (dcantrell).
+- Add Mist theme (katzj).
+- Update translation files (katzj, #237263).
+- Fix VNC traceback (#237194).
+- Fix error message for > 15 partitions per disk (dcantrell, #234686).
+
 * Thu Apr 19 2007 Jeremy Katz <katzj at redhat.com> - 11.2.0.53-1
 - Add Romanian to language list (#237060)
 - Fix selinux context of /etc/modprobe.d


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.531
retrieving revision 1.532
diff -u -r1.531 -r1.532
--- sources	19 Apr 2007 21:15:58 -0000	1.531
+++ sources	20 Apr 2007 20:27:19 -0000	1.532
@@ -1 +1 @@
-79656ed3fb9143d6bfda7df891f5050d  anaconda-11.2.0.53.tar.bz2
+7579717f78553935f5924731b4a37c84  anaconda-11.2.0.54.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Apr 21 00:23:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 20:23:43 -0400
Subject: rpms/fedora-release/devel .cvsignore, 1.24, 1.25 fedora-release.spec,
	1.52, 1.53 sources, 1.40, 1.41
Message-ID: <200704210023.l3L0NhYT019372@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fedora-release/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19356

Modified Files:
	.cvsignore fedora-release.spec sources 
Log Message:
bump for test4


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	21 Mar 2007 22:33:25 -0000	1.24
+++ .cvsignore	21 Apr 2007 00:23:41 -0000	1.25
@@ -1 +1 @@
-fedora-release-6.92.tar.gz
+fedora-release-6.93.tar.gz


Index: fedora-release.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/fedora-release.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- fedora-release.spec	21 Mar 2007 22:33:25 -0000	1.52
+++ fedora-release.spec	21 Apr 2007 00:23:41 -0000	1.53
@@ -2,7 +2,7 @@
 
 Summary:	Fedora release files
 Name:		fedora-release
-Version:	6.92
+Version:	6.93
 Release:	1
 License:	GFDL
 Group:		System Environment/Base
@@ -62,6 +62,9 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Fri Apr 20 2007 Jesse Keating <jkeating at redhat.com> - 6.93-1
+- Bump for Test 4
+
 * Mon Mar 19 2007 Jesse Keating <jkeating at redhat.com> - 6.92-1
 - Bump for Test 3
 - No more eula in fedora-release, moved to firstboot


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	21 Mar 2007 22:33:25 -0000	1.40
+++ sources	21 Apr 2007 00:23:41 -0000	1.41
@@ -1 +1 @@
-668b210280ee1d00e519507ee5c86e57  fedora-release-6.92.tar.gz
+6527b7a9c2eeb5b56c2e853f33434148  fedora-release-6.93.tar.gz



From fedora-cvs-commits at redhat.com  Sat Apr 21 02:05:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 20 Apr 2007 22:05:18 -0400
Subject: rpms/fedora-release-notes/devel .cvsignore, 1.9,
	1.10 fedora-release-notes.spec, 1.17, 1.18 sources, 1.17, 1.18
Message-ID: <200704210205.l3L25IKV010587@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fedora-release-notes/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10556/devel

Modified Files:
	.cvsignore fedora-release-notes.spec sources 
Log Message:
auto-import fedora-release-notes-6.93-1 on branch devel from fedora-release-notes-6.93-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fedora-release-notes/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	23 Mar 2007 16:50:34 -0000	1.9
+++ .cvsignore	21 Apr 2007 02:05:16 -0000	1.10
@@ -1,5 +1,5 @@
-README-6.92.tar.gz
-README-BURNING-ISOS-6.92.tar.gz
-about-fedora-6.92.tar.gz
-fedora-release-notes-6.92.tar.gz
-homepage-6.92.tar.gz
+README-6.93.tar.gz
+README-BURNING-ISOS-6.93.tar.gz
+about-fedora-6.93.tar.gz
+fedora-release-notes-6.93.tar.gz
+homepage-6.93.tar.gz


Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-release-notes/devel/fedora-release-notes.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fedora-release-notes.spec	23 Mar 2007 16:50:34 -0000	1.17
+++ fedora-release-notes.spec	21 Apr 2007 02:05:16 -0000	1.18
@@ -1,7 +1,7 @@
 Name:		fedora-release-notes
-Version:	6.92
-Release:	5
-Summary:	Release Notes for Fedora Core %{version}
+Version:	6.93
+Release:	1
+Summary:	Release Notes for Fedora %{version}
 URL:		http://fedoraproject.org/wiki/Docs/Beats
 
 Group:		System Environment/Base
@@ -19,7 +19,7 @@
 Obsoletes:	indexhtml < 9-3
 
 %description 
-These are the official Release Notes for Fedora Core %{version},
+These are the official Release Notes for Fedora %{version},
 written and edited by the Fedora community.  For more
 information on the Release Notes process or how you can
 contribute, refer to the Release Notes HOWTO located at
@@ -93,6 +93,9 @@
 
 
 %changelog
+* Sun Apr 15 2007 Paul W. Frields <stickster at gmail.com> - 6.93-1
+- Update for Fedora 7 test4
+
 * Fri Mar 23 2007 Paul W. Frields <stickster at gmail.com> - 6.92-5
 - Bump release to include fixes in homepage module
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fedora-release-notes/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	23 Mar 2007 16:50:34 -0000	1.17
+++ sources	21 Apr 2007 02:05:16 -0000	1.18
@@ -1,5 +1,5 @@
-045115dff23214fed9970d5eadff6220  README-6.92.tar.gz
-eb75ed6f4b70b28f202048549a77fe83  README-BURNING-ISOS-6.92.tar.gz
-594823453f19e989ca1ba5c3e382c2ac  about-fedora-6.92.tar.gz
-6af7a89930f50944907831f05dcf85de  fedora-release-notes-6.92.tar.gz
-715eb96ff908ec05649f761fb3698abc  homepage-6.92.tar.gz
+56997a282f51ae259993ffc16d16391b  README-6.93.tar.gz
+3e553d04d7f3e8836a60af6e13458ce2  README-BURNING-ISOS-6.93.tar.gz
+0af86c72e93a52f9c5c5efd48d09faaf  about-fedora-6.93.tar.gz
+6d0563c7d6613b54d9b4d0d6a3ca7cbe  fedora-release-notes-6.93.tar.gz
+64ee3e0960c1ccc6b2d9a10f2b2bc579  homepage-6.93.tar.gz



From fedora-cvs-commits at redhat.com  Sat Apr 21 19:26:34 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 15:26:34 -0400
Subject: rpms/anaconda/devel anaconda.spec,1.537,1.538
Message-ID: <200704211926.l3LJQYsD024853@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	anaconda.spec 
Log Message:
We don't have access to genisoimage in core yet.


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.537
retrieving revision 1.538
diff -u -r1.537 -r1.538
--- anaconda.spec	20 Apr 2007 20:27:19 -0000	1.537
+++ anaconda.spec	21 Apr 2007 19:26:32 -0000	1.538
@@ -2,7 +2,7 @@
 
 Name: anaconda
 Version: 11.2.0.54
-Release: 1
+Release: 2
 License: GPL
 Summary: Graphical system installer
 Group: Applications/System
@@ -65,7 +65,7 @@
 AutoReqProv: false
 Requires: libxml2-python, python, rpm-python >= 4.2-0.61
 Requires: anaconda = %{version}-%{release}
-Requires: createrepo >= 0.4.7, squashfs-tools, genisoimage
+Requires: createrepo >= 0.4.7, squashfs-tools, mkisofs
 %ifarch %{ix86} x86_64
 Requires: syslinux
 %endif
@@ -142,6 +142,9 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Sat Apr 21 2007 Jesse Keating <jkeating at redhat.com> - 11.2.0.54-2
+- s/genisoimage/mkisofs until the merge.
+
 * Fri Apr 20 2007 Chris Lumens <clumens at redhat.com> - 11.2.0.54-1
 - Be smarter about detecting network link status (dcantrell, #236483).
 - Lots of yum mirror list and retry fixes (dlehman).



From fedora-cvs-commits at redhat.com  Sat Apr 21 20:42:51 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 16:42:51 -0400
Subject: rpms/mikmod/devel libmikmod-3.1.11-a.diff, 1.2,
	1.3 libmikmod-64bit.patch, 1.3, 1.4 libmikmod-esd.patch, 1.3,
	1.4 libmikmod-strip-lib.patch, 1.3,
	1.4 mikmod-3.1.6-multilib.patch, 1.2, 1.3 mikmod.spec, 1.33,
	1.34 sources, 1.4, 1.5
Message-ID: <200704212042.l3LKgpxm017273@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/mikmod/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16878

Modified Files:
	libmikmod-64bit.patch libmikmod-esd.patch 
	libmikmod-strip-lib.patch mikmod-3.1.6-multilib.patch 
	mikmod.spec sources 
Added Files:
	libmikmod-3.1.11-a.diff 
Log Message:
- downgrade libmikmod to avoid dependency problems before F7 release
- minor spec fixes


libmikmod-3.1.11-a.diff:
 NEWS                       |   14 +
 config.guess               |  407 ++++++++++++++++++++++++++++++---------------
 config.sub                 |  140 ++++++++-------
 configure.in               |    2 
 dlapi/dl_hpux.c            |    2 
 docs/mikmod.texi           |    2 
 drivers/drv_AF.c           |    2 
 drivers/drv_aix.c          |    2 
 drivers/drv_alsa.c         |    2 
 drivers/drv_dart.c         |    2 
 drivers/drv_ds.c           |    2 
 drivers/drv_esd.c          |    2 
 drivers/drv_hp.c           |    2 
 drivers/drv_mac.c          |    2 
 drivers/drv_nos.c          |    2 
 drivers/drv_os2.c          |    2 
 drivers/drv_oss.c          |    2 
 drivers/drv_pipe.c         |    2 
 drivers/drv_raw.c          |    2 
 drivers/drv_sam9407.c      |    2 
 drivers/drv_sgi.c          |    2 
 drivers/drv_stdout.c       |    2 
 drivers/drv_sun.c          |    2 
 drivers/drv_ultra.c        |    2 
 drivers/drv_wav.c          |    2 
 drivers/drv_win.c          |    2 
 include/mikmod.h.in        |    4 
 include/mikmod_internals.h |    2 
 libmikmod.m4               |    2 
 loaders/load_669.c         |    2 
 loaders/load_amf.c         |    2 
 loaders/load_dsm.c         |    2 
 loaders/load_far.c         |    2 
 loaders/load_gdm.c         |    2 
 loaders/load_imf.c         |    2 
 loaders/load_it.c          |    2 
 loaders/load_m15.c         |    2 
 loaders/load_med.c         |    2 
 loaders/load_mod.c         |    2 
 loaders/load_mtm.c         |    2 
 loaders/load_okt.c         |    2 
 loaders/load_s3m.c         |    2 
 loaders/load_stm.c         |    2 
 loaders/load_stx.c         |    2 
 loaders/load_ult.c         |    2 
 loaders/load_uni.c         |    2 
 loaders/load_xm.c          |    2 
 macintosh/mikmod.h         |    2 
 mkinstalldirs              |    2 
 mmio/mmalloc.c             |    2 
 mmio/mmerror.c             |    2 
 mmio/mmio.c                |    2 
 os2/configure.cmd          |    2 
 playercode/mdreg.c         |    2 
 playercode/mdriver.c       |    2 
 playercode/mdulaw.c        |    2 
 playercode/mloader.c       |    2 
 playercode/mlreg.c         |    2 
 playercode/mlutil.c        |    2 
 playercode/mplayer.c       |    2 
 playercode/munitrk.c       |    2 
 playercode/mwav.c          |    2 
 playercode/npertab.c       |    2 
 playercode/sloader.c       |    2 
 playercode/virtch.c        |    2 
 playercode/virtch2.c       |    2 
 playercode/virtch_common.c |    2 
 win32/mikmod_build.h       |    2 
 68 files changed, 432 insertions(+), 261 deletions(-)

Index: libmikmod-3.1.11-a.diff
===================================================================
RCS file: libmikmod-3.1.11-a.diff
diff -N libmikmod-3.1.11-a.diff
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libmikmod-3.1.11-a.diff	21 Apr 2007 20:42:49 -0000	1.3
@@ -0,0 +1,1852 @@
+diff --recursive --unified libmikmod-3.1.11/NEWS libmikmod-3.1.11-a/NEWS
+--- libmikmod-3.1.11/NEWS	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/NEWS	2004-06-04 08:24:26.000000000 -0400
+@@ -1,3 +1,17 @@
++Summary of changes between libmikmod 3.1.11 and libmikmod 3.1.11-a
++========================================================================
++libmikmod-3.1.11-a was released on 05/03/2004
++
++Most of my work and attention goes on the 3.2.x series, but I still receive
++occasional bug reports and patchs for the 3.1.11 version. There are not enough
++changes to make a full release, but many people may find this patch useful.
++
++BUGFIXES
++- libmikmod playback now works correcly on amd64 (type size problem)
++- fixed warning issued by automake >= 1.8
++- config.sub and config.guess updated
++
++
+ Summary of changes between libmikmod 3.1.10 and libmikmod 3.1.11 (Thiers):
+ ==========================================================================
+ 
+diff --recursive --unified libmikmod-3.1.11/config.guess libmikmod-3.1.11-a/config.guess
+--- libmikmod-3.1.11/config.guess	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/config.guess	2004-06-04 08:24:26.000000000 -0400
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002 Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ 
+-timestamp='2002-01-02'
++timestamp='2004-03-03'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -24,7 +24,7 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
+-# Originally written by Per Bothner <bothner at cygnus.com>.
++# Originally written by Per Bothner <per at bothner.com>.
+ # Please send patches to <config-patches at gnu.org>.  Submit a context
+ # diff and a properly formatted ChangeLog entry.
+ #
+@@ -88,30 +88,42 @@
+   exit 1
+ fi
+ 
++trap 'exit 1' 1 2 15
+ 
+-dummy=dummy-$$
+-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
++# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
++# compiler to aid in system detection is discouraged as it requires
++# temporary files to be created and, as you can see below, it is a
++# headache to deal with in a portable fashion.
+ 
+-# CC_FOR_BUILD -- compiler used by this script.
+ # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+ # use `HOST_CC' if defined, but it is deprecated.
+ 
+-set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
+- ,,)    echo "int dummy(){}" > $dummy.c ;
+-	for c in cc gcc c89 ; do
+-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
+-	  if test $? = 0 ; then
++# Portable tmp directory creation inspired by the Autoconf team.
++
++set_cc_for_build='
++trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
++trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
++: ${TMPDIR=/tmp} ;
++ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
++ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
++ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
++ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
++dummy=$tmp/dummy ;
++tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
++case $CC_FOR_BUILD,$HOST_CC,$CC in
++ ,,)    echo "int x;" > $dummy.c ;
++	for c in cc gcc c89 c99 ; do
++	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+ 	     CC_FOR_BUILD="$c"; break ;
+ 	  fi ;
+ 	done ;
+-	rm -f $dummy.c $dummy.o $dummy.rel ;
+ 	if test x"$CC_FOR_BUILD" = x ; then
+ 	  CC_FOR_BUILD=no_compiler_found ;
+ 	fi
+ 	;;
+  ,,*)   CC_FOR_BUILD=$CC ;;
+  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+-esac'
++esac ;'
+ 
+ # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+ # (ghazi at noc.rutgers.edu 1994-08-24)
+@@ -138,9 +150,11 @@
+ 	#
+ 	# Note: NetBSD doesn't particularly care about the vendor
+ 	# portion of the name.  We always set it to "unknown".
+-	UNAME_MACHINE_ARCH=`(uname -p) 2>/dev/null` || \
+-	    UNAME_MACHINE_ARCH=unknown
++	sysctl="sysctl -n hw.machine_arch"
++	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
++	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+ 	case "${UNAME_MACHINE_ARCH}" in
++	    armeb) machine=armeb-unknown ;;
+ 	    arm*) machine=arm-unknown ;;
+ 	    sh3el) machine=shl-unknown ;;
+ 	    sh3eb) machine=sh-unknown ;;
+@@ -166,18 +180,35 @@
+ 		;;
+ 	esac
+ 	# The OS release
+-	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++	# Debian GNU/NetBSD machines have a different userland, and
++	# thus, need a distinct triplet. However, they do not need
++	# kernel version information, so it can be replaced with a
++	# suitable tag, in the style of linux-gnu.
++	case "${UNAME_VERSION}" in
++	    Debian*)
++		release='-gnu'
++		;;
++	    *)
++		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++		;;
++	esac
+ 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+ 	# contains redundant information, the shorter form:
+ 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ 	echo "${machine}-${os}${release}"
+ 	exit 0 ;;
++    amd64:OpenBSD:*:*)
++	echo x86_64-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
+     amiga:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     arc:OpenBSD:*:*)
+ 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
++    cats:OpenBSD:*:*)
++	echo arm-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
+     hp300:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -196,6 +227,9 @@
+     mvmeppc:OpenBSD:*:*)
+ 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
++    pegasos:OpenBSD:*:*)
++	echo powerpc-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
+     pmax:OpenBSD:*:*)
+ 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -211,68 +245,70 @@
+     *:OpenBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
++    *:ekkoBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
++	exit 0 ;;
++    macppc:MirBSD:*:*)
++	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
++	exit 0 ;;
++    *:MirBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
++	exit 0 ;;
+     alpha:OSF1:*:*)
+-	if test $UNAME_RELEASE = "V4.0"; then
++	case $UNAME_RELEASE in
++	*4.0)
+ 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+-	fi
++		;;
++	*5.*)
++	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++		;;
++	esac
++	# According to Compaq, /usr/sbin/psrinfo has been available on
++	# OSF/1 and Tru64 systems produced since 1995.  I hope that
++	# covers most systems running today.  This code pipes the CPU
++	# types through head -n 1, so we only detect the type of CPU 0.
++	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
++	case "$ALPHA_CPU_TYPE" in
++	    "EV4 (21064)")
++		UNAME_MACHINE="alpha" ;;
++	    "EV4.5 (21064)")
++		UNAME_MACHINE="alpha" ;;
++	    "LCA4 (21066/21068)")
++		UNAME_MACHINE="alpha" ;;
++	    "EV5 (21164)")
++		UNAME_MACHINE="alphaev5" ;;
++	    "EV5.6 (21164A)")
++		UNAME_MACHINE="alphaev56" ;;
++	    "EV5.6 (21164PC)")
++		UNAME_MACHINE="alphapca56" ;;
++	    "EV5.7 (21164PC)")
++		UNAME_MACHINE="alphapca57" ;;
++	    "EV6 (21264)")
++		UNAME_MACHINE="alphaev6" ;;
++	    "EV6.7 (21264A)")
++		UNAME_MACHINE="alphaev67" ;;
++	    "EV6.8CB (21264C)")
++		UNAME_MACHINE="alphaev68" ;;
++	    "EV6.8AL (21264B)")
++		UNAME_MACHINE="alphaev68" ;;
++	    "EV6.8CX (21264D)")
++		UNAME_MACHINE="alphaev68" ;;
++	    "EV6.9A (21264/EV69A)")
++		UNAME_MACHINE="alphaev69" ;;
++	    "EV7 (21364)")
++		UNAME_MACHINE="alphaev7" ;;
++	    "EV7.9 (21364A)")
++		UNAME_MACHINE="alphaev79" ;;
++	esac
++	# A Pn.n version is a patched version.
+ 	# A Vn.n version is a released version.
+ 	# A Tn.n version is a released field test version.
+ 	# A Xn.n version is an unreleased experimental baselevel.
+ 	# 1.2 uses "1.2" for uname -r.
+-	cat <<EOF >$dummy.s
+-	.data
+-\$Lformat:
+-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+-
+-	.text
+-	.globl main
+-	.align 4
+-	.ent main
+-main:
+-	.frame \$30,16,\$26,0
+-	ldgp \$29,0(\$27)
+-	.prologue 1
+-	.long 0x47e03d80 # implver \$0
+-	lda \$2,-1
+-	.long 0x47e20c21 # amask \$2,\$1
+-	lda \$16,\$Lformat
+-	mov \$0,\$17
+-	not \$1,\$18
+-	jsr \$26,printf
+-	ldgp \$29,0(\$26)
+-	mov 0,\$16
+-	jsr \$26,exit
+-	.end main
+-EOF
+-	eval $set_cc_for_build
+-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+-	if test "$?" = 0 ; then
+-		case `./$dummy` in
+-			0-0)
+-				UNAME_MACHINE="alpha"
+-				;;
+-			1-0)
+-				UNAME_MACHINE="alphaev5"
+-				;;
+-			1-1)
+-				UNAME_MACHINE="alphaev56"
+-				;;
+-			1-101)
+-				UNAME_MACHINE="alphapca56"
+-				;;
+-			2-303)
+-				UNAME_MACHINE="alphaev6"
+-				;;
+-			2-307)
+-				UNAME_MACHINE="alphaev67"
+-				;;
+-			2-1307)
+-				UNAME_MACHINE="alphaev68"
+-				;;
+-		esac
+-	fi
+-	rm -f $dummy.s $dummy
+-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
++	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
++	exit 0 ;;
++    Alpha*:OpenVMS:*:*)
++	echo alpha-hp-vms
+ 	exit 0 ;;
+     Alpha\ *:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+@@ -295,6 +331,9 @@
+     *:OS/390:*:*)
+ 	echo i370-ibm-openedition
+ 	exit 0 ;;
++    *:OS400:*:*)
++        echo powerpc-ibm-os400
++	exit 0 ;;
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ 	echo arm-acorn-riscix${UNAME_RELEASE}
+ 	exit 0;;
+@@ -312,6 +351,13 @@
+     NILE*:*:*:dcosx)
+ 	echo pyramid-pyramid-svr4
+ 	exit 0 ;;
++    DRS?6000:unix:4.0:6*)
++	echo sparc-icl-nx6
++	exit 0 ;;
++    DRS?6000:UNIX_SV:4.2*:7*)
++	case `/usr/bin/uname -p` in
++	    sparc) echo sparc-icl-nx7 && exit 0 ;;
++	esac ;;
+     sun4H:SunOS:5.*:*)
+ 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit 0 ;;
+@@ -340,7 +386,7 @@
+ 	echo m68k-sun-sunos${UNAME_RELEASE}
+ 	exit 0 ;;
+     sun*:*:4.2BSD:*)
+-	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
++	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+ 	case "`/bin/arch`" in
+ 	    sun3)
+@@ -380,6 +426,9 @@
+     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+         echo m68k-unknown-mint${UNAME_RELEASE}
+         exit 0 ;;
++    m68k:machten:*:*)
++	echo m68k-apple-machten${UNAME_RELEASE}
++	exit 0 ;;
+     powerpc:machten:*:*)
+ 	echo powerpc-apple-machten${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -418,15 +467,20 @@
+ 	  exit (-1);
+ 	}
+ EOF
+-	$CC_FOR_BUILD $dummy.c -o $dummy \
+-	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+-	  && rm -f $dummy.c $dummy && exit 0
+-	rm -f $dummy.c $dummy
++	$CC_FOR_BUILD -o $dummy $dummy.c \
++	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
++	  && exit 0
+ 	echo mips-mips-riscos${UNAME_RELEASE}
+ 	exit 0 ;;
+     Motorola:PowerMAX_OS:*:*)
+ 	echo powerpc-motorola-powermax
+ 	exit 0 ;;
++    Motorola:*:4.3:PL8-*)
++	echo powerpc-harris-powermax
++	exit 0 ;;
++    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
++	echo powerpc-harris-powermax
++	exit 0 ;;
+     Night_Hawk:Power_UNIX:*:*)
+ 	echo powerpc-harris-powerunix
+ 	exit 0 ;;
+@@ -499,8 +553,7 @@
+ 			exit(0);
+ 			}
+ EOF
+-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+-		rm -f $dummy.c $dummy
++		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ 		echo rs6000-ibm-aix3.2.5
+ 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+ 		echo rs6000-ibm-aix3.2.4
+@@ -509,7 +562,7 @@
+ 	fi
+ 	exit 0 ;;
+     *:AIX:*:[45])
+-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
++	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+ 	else
+@@ -598,11 +651,21 @@
+                   exit (0);
+               }
+ EOF
+-		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
+-		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+-		    rm -f $dummy.c $dummy
++		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
++		    test -z "$HP_ARCH" && HP_ARCH=hppa
+ 		fi ;;
+ 	esac
++	if [ ${HP_ARCH} = "hppa2.0w" ]
++	then
++	    # avoid double evaluation of $set_cc_for_build
++	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
++	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
++	    then
++		HP_ARCH="hppa2.0w"
++	    else
++		HP_ARCH="hppa64"
++	    fi
++	fi
+ 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ 	exit 0 ;;
+     ia64:HP-UX:*:*)
+@@ -636,8 +699,7 @@
+ 	  exit (0);
+ 	}
+ EOF
+-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+-	rm -f $dummy.c $dummy
++	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ 	echo unknown-hitachi-hiuxwe2
+ 	exit 0 ;;
+     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+@@ -683,9 +745,6 @@
+     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ 	echo c4-convex-bsd
+         exit 0 ;;
+-    CRAY*X-MP:*:*:*)
+-	echo xmp-cray-unicos
+-        exit 0 ;;
+     CRAY*Y-MP:*:*:*)
+ 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+@@ -698,24 +757,26 @@
+     CRAY*TS:*:*:*)
+ 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+-    CRAY*T3D:*:*:*)
+-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+-	exit 0 ;;
+     CRAY*T3E:*:*:*)
+ 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     CRAY*SV1:*:*:*)
+ 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+-    CRAY-2:*:*:*)
+-	echo cray2-cray-unicos
+-        exit 0 ;;
++    *:UNICOS/mp:*:*)
++	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit 0 ;;
+     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+         exit 0 ;;
++    5000:UNIX_System_V:4.*:*)
++        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
++        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++	exit 0 ;;
+     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -726,7 +787,21 @@
+ 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:FreeBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
++	# Determine whether the default compiler uses glibc.
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#include <features.h>
++	#if __GLIBC__ >= 2
++	LIBC=gnu
++	#else
++	LIBC=
++	#endif
++EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
++	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
++	# FreeBSD's kernel, but not the complete OS.
++	case ${LIBC} in gnu) kernel_only='k' ;; esac
++	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+ 	exit 0 ;;
+     i*:CYGWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-cygwin
+@@ -737,14 +812,17 @@
+     i*:PW*:*)
+ 	echo ${UNAME_MACHINE}-pc-pw32
+ 	exit 0 ;;
+-    x86:Interix*:3*)
+-	echo i386-pc-interix3
++    x86:Interix*:[34]*)
++	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
++	exit 0 ;;
++    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
++	echo i${UNAME_MACHINE}-pc-mks
+ 	exit 0 ;;
+     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+ 	# UNAME_MACHINE based on the output of uname instead of i386?
+-	echo i386-pc-interix
++	echo i586-pc-interix
+ 	exit 0 ;;
+     i*:UWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-uwin
+@@ -756,16 +834,24 @@
+ 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit 0 ;;
+     *:GNU:*:*)
++	# the GNU system
+ 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ 	exit 0 ;;
++    *:GNU/*:*:*)
++	# other systems with GNU libc and userland
++	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
++	exit 0 ;;
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit 0 ;;
+     arm*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
++    cris:Linux:*:*)
++	echo cris-axis-linux-gnu
++	exit 0 ;;
+     ia64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
+     m68*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+@@ -776,19 +862,37 @@
+ 	#undef CPU
+ 	#undef mips
+ 	#undef mipsel
+-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 
+-	CPU=mipsel 
++	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
++	CPU=mipsel
+ 	#else
+-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 
++	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ 	CPU=mips
+ 	#else
+ 	CPU=
+ 	#endif
+-	#endif 
++	#endif
++EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
++	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
++	;;
++    mips64:Linux:*:*)
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#undef CPU
++	#undef mips64
++	#undef mips64el
++	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
++	CPU=mips64el
++	#else
++	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
++	CPU=mips64
++	#else
++	CPU=
++	#endif
++	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+-	rm -f $dummy.c
+-	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
++	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ 	;;
+     ppc:Linux:*:*)
+ 	echo powerpc-unknown-linux-gnu
+@@ -824,6 +928,9 @@
+     s390:Linux:*:* | s390x:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-ibm-linux
+ 	exit 0 ;;
++    sh64*:Linux:*:*)
++    	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
+     sh*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
+@@ -837,7 +944,8 @@
+ 	# The BFD linker knows what the default object file format is, so
+ 	# first see if it will tell us. cd to the root directory to prevent
+ 	# problems with other programs or directories called `ld' in the path.
+-	ld_supported_targets=`cd /; ld --help 2>&1 \
++	# Set LC_ALL=C to ensure ld outputs messages in English.
++	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+ 			 | sed -ne '/supported targets:/!d
+ 				    s/[ 	][ 	]*/ /g
+ 				    s/.*supported targets: *//
+@@ -849,7 +957,7 @@
+ 		;;
+ 	  a.out-i386-linux)
+ 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+-		exit 0 ;;		
++		exit 0 ;;
+ 	  coff-i386)
+ 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+ 		exit 0 ;;
+@@ -874,11 +982,17 @@
+ 	LIBC=gnulibc1
+ 	# endif
+ 	#else
++	#ifdef __INTEL_COMPILER
++	LIBC=gnu
++	#else
+ 	LIBC=gnuaout
+ 	#endif
++	#endif
++	#ifdef __dietlibc__
++	LIBC=dietlibc
++	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+-	rm -f $dummy.c
+ 	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+ 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+ 	;;
+@@ -896,6 +1010,26 @@
+         # Use sysv4.2uw... so that sysv4* matches it.
+ 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ 	exit 0 ;;
++    i*86:OS/2:*:*)
++	# If we were able to find `uname', then EMX Unix compatibility
++	# is probably installed.
++	echo ${UNAME_MACHINE}-pc-os2-emx
++	exit 0 ;;
++    i*86:XTS-300:*:STOP)
++	echo ${UNAME_MACHINE}-unknown-stop
++	exit 0 ;;
++    i*86:atheos:*:*)
++	echo ${UNAME_MACHINE}-unknown-atheos
++	exit 0 ;;
++	i*86:syllable:*:*)
++	echo ${UNAME_MACHINE}-pc-syllable
++	exit 0 ;;
++    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++	echo i386-unknown-lynxos${UNAME_RELEASE}
++	exit 0 ;;
++    i*86:*DOS:*:*)
++	echo ${UNAME_MACHINE}-pc-msdosdjgpp
++	exit 0 ;;
+     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+ 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+@@ -917,22 +1051,19 @@
+ 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+ 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+ 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
++		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
++		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
++		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+ 			&& UNAME_MACHINE=i586
+-		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
++		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+ 			&& UNAME_MACHINE=i686
+-		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
++		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+ 			&& UNAME_MACHINE=i686
+ 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+ 	else
+ 		echo ${UNAME_MACHINE}-pc-sysv32
+ 	fi
+ 	exit 0 ;;
+-    i*86:*DOS:*:*)
+-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+-	exit 0 ;;
+     pc:*:*:*)
+ 	# Left here for compatibility:
+         # uname -m prints for DJGPP always 'pc', but it prints nothing about
+@@ -956,9 +1087,15 @@
+ 	# "miniframe"
+ 	echo m68010-convergent-sysv
+ 	exit 0 ;;
++    mc68k:UNIX:SYSTEM5:3.51m)
++	echo m68k-convergent-sysv
++	exit 0 ;;
++    M680?0:D-NIX:5.3:*)
++	echo m68k-diab-dnix
++	exit 0 ;;
+     M68*:*:R3V[567]*:*)
+ 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
++    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+ 	OS_REL=''
+ 	test -r /etc/.relid \
+ 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+@@ -975,9 +1112,6 @@
+     mc68030:UNIX_System_V:4.*:*)
+ 	echo m68k-atari-sysv4
+ 	exit 0 ;;
+-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+-	echo i386-unknown-lynxos${UNAME_RELEASE}
+-	exit 0 ;;
+     TSUNAMI:LynxOS:2.*:*)
+ 	echo sparc-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -1049,6 +1183,9 @@
+     SX-5:SUPER-UX:*:*)
+ 	echo sx5-nec-superux${UNAME_RELEASE}
+ 	exit 0 ;;
++    SX-6:SUPER-UX:*:*)
++	echo sx6-nec-superux${UNAME_RELEASE}
++	exit 0 ;;
+     Power*:Rhapsody:*:*)
+ 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -1056,18 +1193,24 @@
+ 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:Darwin:*:*)
+-	echo `uname -p`-apple-darwin${UNAME_RELEASE}
++	case `uname -p` in
++	    *86) UNAME_PROCESSOR=i686 ;;
++	    powerpc) UNAME_PROCESSOR=powerpc ;;
++	esac
++	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:procnto*:*:* | *:QNX:[0123456789]*:*)
+-	if test "${UNAME_MACHINE}" = "x86pc"; then
++	UNAME_PROCESSOR=`uname -p`
++	if test "$UNAME_PROCESSOR" = "x86"; then
++		UNAME_PROCESSOR=i386
+ 		UNAME_MACHINE=pc
+ 	fi
+-	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
++	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:QNX:*:4*)
+ 	echo i386-pc-qnx
+ 	exit 0 ;;
+-    NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
++    NSR-?:NONSTOP_KERNEL:*:*)
+ 	echo nsr-tandem-nsk${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:NonStop-UX:*:*)
+@@ -1090,11 +1233,6 @@
+ 	fi
+ 	echo ${UNAME_MACHINE}-unknown-plan9
+ 	exit 0 ;;
+-    i*86:OS/2:*:*)
+-	# If we were able to find `uname', then EMX Unix compatibility
+-	# is probably installed.
+-	echo ${UNAME_MACHINE}-pc-os2-emx
+-	exit 0 ;;
+     *:TOPS-10:*:*)
+ 	echo pdp10-unknown-tops10
+ 	exit 0 ;;
+@@ -1113,11 +1251,11 @@
+     *:ITS:*:*)
+ 	echo pdp10-unknown-its
+ 	exit 0 ;;
+-    i*86:XTS-300:*:STOP)
+-	echo ${UNAME_MACHINE}-unknown-stop
++    SEI:*:*:SEIUX)
++        echo mips-sei-seiux${UNAME_RELEASE}
+ 	exit 0 ;;
+-    i*86:atheos:*:*)
+-	echo ${UNAME_MACHINE}-unknown-atheos
++    *:DragonFly:*:*)
++	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ 	exit 0 ;;
+ esac
+ 
+@@ -1239,8 +1377,7 @@
+ }
+ EOF
+ 
+-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
+-rm -f $dummy.c $dummy
++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+ 
+ # Apollos put the system type in the environment.
+ 
+diff --recursive --unified libmikmod-3.1.11/config.sub libmikmod-3.1.11-a/config.sub
+--- libmikmod-3.1.11/config.sub	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/config.sub	2004-06-04 08:24:26.000000000 -0400
+@@ -3,7 +3,7 @@
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ #   2000, 2001, 2002 Free Software Foundation, Inc.
+ 
+-timestamp='2002-01-02'
++timestamp='2002-07-03'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -118,7 +118,7 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
++  nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+     ;;
+@@ -230,24 +230,32 @@
+ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ 	| c4x | clipper \
+-	| d10v | d30v | dsp16xx \
+-	| fr30 \
++	| d10v | d30v | dlx | dsp16xx \
++	| fr30 | frv \
+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ 	| i370 | i860 | i960 | ia64 \
++	| ip2k \
+ 	| m32r | m68000 | m68k | m88k | mcore \
+-	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
+-	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
+-	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
+-	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
+-	| mipsisa32 \
++	| mips | mipsbe | mipseb | mipsel | mipsle \
++	| mips16 \
++	| mips64 | mips64el \
++	| mips64orion | mips64orionel \
++	| mips64vr4100 | mips64vr4100el \
++	| mips64vr4300 | mips64vr4300el \
++	| mips64vr5000 | mips64vr5000el \
++	| mipsisa32 | mipsisa32el \
++	| mipsisa64 | mipsisa64el \
++	| mipsisa64sb1 | mipsisa64sb1el \
++	| mipstx39 | mipstx39el \
+ 	| mn10200 | mn10300 \
+ 	| ns16k | ns32k \
+-	| openrisc \
++	| openrisc | or32 \
+ 	| pdp10 | pdp11 | pj | pjl \
+ 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ 	| pyramid \
+-	| sh | sh[34] | sh[34]eb | shbe | shle \
+-	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
++	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
++	| sh64 | sh64le \
++	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+ 	| strongarm \
+ 	| tahoe | thumb | tic80 | tron \
+ 	| v850 | v850e \
+@@ -281,37 +289,46 @@
+ 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+-	| arm-*  | armbe-* | armle-* | armv*-* \
++	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+ 	| avr-* \
+ 	| bs2000-* \
+ 	| c[123]* | c30-* | [cjt]90-* | c54x-* \
+-	| clipper-* | cray2-* | cydra-* \
+-	| d10v-* | d30v-* \
++	| clipper-* | cydra-* \
++	| d10v-* | d30v-* | dlx-* \
+ 	| elxsi-* \
+-	| f30[01]-* | f700-* | fr30-* | fx80-* \
++	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ 	| h8300-* | h8500-* \
+ 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ 	| i*86-* | i860-* | i960-* | ia64-* \
++	| ip2k-* \
+ 	| m32r-* \
+-	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
++	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+ 	| m88110-* | m88k-* | mcore-* \
+-	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
+-	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
+-	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
+-	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
++	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
++	| mips16-* \
++	| mips64-* | mips64el-* \
++	| mips64orion-* | mips64orionel-* \
++	| mips64vr4100-* | mips64vr4100el-* \
++	| mips64vr4300-* | mips64vr4300el-* \
++	| mips64vr5000-* | mips64vr5000el-* \
++	| mipsisa32-* | mipsisa32el-* \
++	| mipsisa64-* | mipsisa64el-* \
++	| mipsisa64sb1-* | mipsisa64sb1el-* \
++	| mipstx39 | mipstx39el \
+ 	| none-* | np1-* | ns16k-* | ns32k-* \
+ 	| orion-* \
+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ 	| pyramid-* \
+ 	| romp-* | rs6000-* \
+-	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
+-	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
+-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \
+-	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
++	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
++	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
++	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
++	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
++	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+ 	| v850-* | v850e-* | vax-* \
+ 	| we32k-* \
+-	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* | xstormy16-* \
++	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+ 	| xtensa-* \
+ 	| ymp-* \
+ 	| z8k-*)
+@@ -377,6 +394,10 @@
+ 		basic_machine=ns32k-sequent
+ 		os=-dynix
+ 		;;
++	c90)
++		basic_machine=c90-cray
++		os=-unicos
++		;;
+ 	convex-c1)
+ 		basic_machine=c1-convex
+ 		os=-bsd
+@@ -397,16 +418,8 @@
+ 		basic_machine=c38-convex
+ 		os=-bsd
+ 		;;
+-	cray | ymp)
+-		basic_machine=ymp-cray
+-		os=-unicos
+-		;;
+-	cray2)
+-		basic_machine=cray2-cray
+-		os=-unicos
+-		;;
+-	[cjt]90)
+-		basic_machine=${basic_machine}-cray
++	cray | j90)
++		basic_machine=j90-cray
+ 		os=-unicos
+ 		;;
+ 	crds | unos)
+@@ -609,14 +622,6 @@
+ 		basic_machine=m68k-atari
+ 		os=-mint
+ 		;;
+-	mipsel*-linux*)
+-		basic_machine=mipsel-unknown
+-		os=-linux-gnu
+-		;;
+-	mips*-linux*)
+-		basic_machine=mips-unknown
+-		os=-linux-gnu
+-		;;
+ 	mips3*-*)
+ 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+ 		;;
+@@ -714,6 +719,10 @@
+ 		basic_machine=hppa1.1-oki
+ 		os=-proelf
+ 		;;
++	or32 | or32-*)
++		basic_machine=or32-unknown
++		os=-coff
++		;;
+ 	OSE68000 | ose68000)
+ 		basic_machine=m68000-ericsson
+ 		os=-ose
+@@ -874,7 +883,7 @@
+ 	sun386 | sun386i | roadrunner)
+ 		basic_machine=i386-sun
+ 		;;
+-	sv1)
++        sv1)
+ 		basic_machine=sv1-cray
+ 		os=-unicos
+ 		;;
+@@ -882,8 +891,16 @@
+ 		basic_machine=i386-sequent
+ 		os=-dynix
+ 		;;
++	t3d)
++		basic_machine=alpha-cray
++		os=-unicos
++		;;
+ 	t3e)
+-		basic_machine=t3e-cray
++		basic_machine=alphaev5-cray
++		os=-unicos
++		;;
++	t90)
++		basic_machine=t90-cray
+ 		os=-unicos
+ 		;;
+ 	tic54x | c54x*)
+@@ -950,13 +967,13 @@
+ 		basic_machine=i386-pc
+ 		os=-windows32-msvcrt
+ 		;;
+-	xmp)
+-		basic_machine=xmp-cray
+-		os=-unicos
+-		;;
+         xps | xps100)
+ 		basic_machine=xps100-honeywell
+ 		;;
++	ymp)
++		basic_machine=ymp-cray
++		os=-unicos
++		;;
+ 	z8k-*-coff)
+ 		basic_machine=z8k-unknown
+ 		os=-sim
+@@ -977,13 +994,6 @@
+ 	op60c)
+ 		basic_machine=hppa1.1-oki
+ 		;;
+-	mips)
+-		if [ x$os = x-linux-gnu ]; then
+-			basic_machine=mips-unknown
+-		else
+-			basic_machine=mips-mips
+-		fi
+-		;;
+ 	romp)
+ 		basic_machine=romp-ibm
+ 		;;
+@@ -1003,9 +1013,12 @@
+ 	we32k)
+ 		basic_machine=we32k-att
+ 		;;
+-	sh3 | sh4 | sh3eb | sh4eb)
++	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
+ 		basic_machine=sh-unknown
+ 		;;
++	sh64)
++		basic_machine=sh64-unknown
++		;;
+ 	sparc | sparcv9 | sparcv9b)
+ 		basic_machine=sparc-sun
+ 		;;
+@@ -1093,7 +1106,8 @@
+ 	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* | -morphos*)
++	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
++	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+@@ -1154,6 +1168,9 @@
+ 	-ctix* | -uts*)
+ 		os=-sysv
+ 		;;
++	-nova*)
++		os=-rtmk-nova
++		;;
+ 	-ns2 )
+ 	        os=-nextstep2
+ 		;;
+@@ -1259,6 +1276,9 @@
+ 	mips*-*)
+ 		os=-elf
+ 		;;
++	or32-*)
++		os=-coff
++		;;
+ 	*-tti)	# must be before sparc entry or we get the wrong os.
+ 		os=-sysv3
+ 		;;
+@@ -1406,7 +1426,7 @@
+ 			-ptx*)
+ 				vendor=sequent
+ 				;;
+-			-vxsim* | -vxworks*)
++			-vxsim* | -vxworks* | -windiss*)
+ 				vendor=wrs
+ 				;;
+ 			-aux*)
+diff --recursive --unified libmikmod-3.1.11/configure.in libmikmod-3.1.11-a/configure.in
+--- libmikmod-3.1.11/configure.in	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/configure.in	2004-06-04 08:24:26.000000000 -0400
+@@ -1,6 +1,6 @@
+ dnl Process this file with autoconf to produce a configure script.
+ dnl
+-dnl $Id$
++dnl $Id$
+ 
+ AC_INIT(include/mikmod.h.in)
+ 
+diff --recursive --unified libmikmod-3.1.11/dlapi/dl_hpux.c libmikmod-3.1.11-a/dlapi/dl_hpux.c
+--- libmikmod-3.1.11/dlapi/dl_hpux.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/dlapi/dl_hpux.c	2004-06-04 08:24:26.000000000 -0400
+@@ -1,6 +1,6 @@
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   simple dlopen()-like implementation above HP-UX shl_xxx() API
+ 
+diff --recursive --unified libmikmod-3.1.11/docs/mikmod.texi libmikmod-3.1.11-a/docs/mikmod.texi
+--- libmikmod-3.1.11/docs/mikmod.texi	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/docs/mikmod.texi	2004-06-04 08:24:26.000000000 -0400
+@@ -7,7 +7,7 @@
+ 
+   MikMod Sound Library Documentation
+ 
+-  $Id$
++  $Id$
+ 
+ @end ignore
+ @c comment this during modifications
+diff --recursive --unified libmikmod-3.1.11/drivers/drv_AF.c libmikmod-3.1.11-a/drivers/drv_AF.c
+--- libmikmod-3.1.11/drivers/drv_AF.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/drivers/drv_AF.c	2004-06-04 08:24:26.000000000 -0400
+@@ -20,7 +20,7 @@
+   
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Driver for output on AF audio server.
+ 
+diff --recursive --unified libmikmod-3.1.11/drivers/drv_aix.c libmikmod-3.1.11-a/drivers/drv_aix.c
+--- libmikmod-3.1.11/drivers/drv_aix.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/drivers/drv_aix.c	2004-06-04 08:24:26.000000000 -0400
+@@ -20,7 +20,7 @@
+   
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Driver for output to AIX series audio device
+ 
+diff --recursive --unified libmikmod-3.1.11/drivers/drv_alsa.c libmikmod-3.1.11-a/drivers/drv_alsa.c
+--- libmikmod-3.1.11/drivers/drv_alsa.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/drivers/drv_alsa.c	2004-06-04 08:24:26.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Driver for Advanced Linux Sound Architecture (ALSA)
+ 
+diff --recursive --unified libmikmod-3.1.11/drivers/drv_dart.c libmikmod-3.1.11-a/drivers/drv_dart.c
+--- libmikmod-3.1.11/drivers/drv_dart.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/drivers/drv_dart.c	2004-06-04 08:24:26.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Driver for output on OS/2 MMPM/2 using direct audio (DART)
+ 
+diff --recursive --unified libmikmod-3.1.11/drivers/drv_ds.c libmikmod-3.1.11-a/drivers/drv_ds.c
+--- libmikmod-3.1.11/drivers/drv_ds.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/drivers/drv_ds.c	2004-06-04 08:24:26.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Driver for output on win32 platforms using DirectSound
+ 
+diff --recursive --unified libmikmod-3.1.11/drivers/drv_esd.c libmikmod-3.1.11-a/drivers/drv_esd.c
+--- libmikmod-3.1.11/drivers/drv_esd.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/drivers/drv_esd.c	2004-06-04 08:24:26.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Driver for the Enlightened sound daemon (EsounD)
+ 
+diff --recursive --unified libmikmod-3.1.11/drivers/drv_hp.c libmikmod-3.1.11-a/drivers/drv_hp.c
+--- libmikmod-3.1.11/drivers/drv_hp.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/drivers/drv_hp.c	2004-06-04 08:24:26.000000000 -0400
+@@ -20,7 +20,7 @@
+   
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Driver for output to HP 9000 series /dev/audio
+ 
+diff --recursive --unified libmikmod-3.1.11/drivers/drv_mac.c libmikmod-3.1.11-a/drivers/drv_mac.c
+--- libmikmod-3.1.11/drivers/drv_mac.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/drivers/drv_mac.c	2004-06-04 08:24:26.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Driver for output to the Macintosh Sound Manager
+ 
+diff --recursive --unified libmikmod-3.1.11/drivers/drv_nos.c libmikmod-3.1.11-a/drivers/drv_nos.c
+--- libmikmod-3.1.11/drivers/drv_nos.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/drivers/drv_nos.c	2004-06-04 08:24:26.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Driver for no output
+ 
+diff --recursive --unified libmikmod-3.1.11/drivers/drv_os2.c libmikmod-3.1.11-a/drivers/drv_os2.c
+--- libmikmod-3.1.11/drivers/drv_os2.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/drivers/drv_os2.c	2004-06-04 08:24:26.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Driver for output on OS/2 using MMPM/2 MCI interface
+ 
+diff --recursive --unified libmikmod-3.1.11/drivers/drv_oss.c libmikmod-3.1.11-a/drivers/drv_oss.c
+--- libmikmod-3.1.11/drivers/drv_oss.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/drivers/drv_oss.c	2004-06-04 08:24:26.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Driver for output on Linux and FreeBSD Open Sound System (OSS) (/dev/dsp) 
+ 
+diff --recursive --unified libmikmod-3.1.11/drivers/drv_pipe.c libmikmod-3.1.11-a/drivers/drv_pipe.c
+--- libmikmod-3.1.11/drivers/drv_pipe.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/drivers/drv_pipe.c	2004-06-04 08:24:26.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Driver for output via a pipe to another command
+ 
+diff --recursive --unified libmikmod-3.1.11/drivers/drv_raw.c libmikmod-3.1.11-a/drivers/drv_raw.c
+--- libmikmod-3.1.11/drivers/drv_raw.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/drivers/drv_raw.c	2004-06-04 08:24:26.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Driver for output to a file called MUSIC.RAW
+ 
+diff --recursive --unified libmikmod-3.1.11/drivers/drv_sam9407.c libmikmod-3.1.11-a/drivers/drv_sam9407.c
+--- libmikmod-3.1.11/drivers/drv_sam9407.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/drivers/drv_sam9407.c	2004-06-04 08:24:26.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+   
+-  $Id$
++  $Id$
+   
+   Driver for the Linux sam9407 driver
+   
+diff --recursive --unified libmikmod-3.1.11/drivers/drv_sgi.c libmikmod-3.1.11-a/drivers/drv_sgi.c
+--- libmikmod-3.1.11/drivers/drv_sgi.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/drivers/drv_sgi.c	2004-06-04 08:24:26.000000000 -0400
+@@ -20,7 +20,7 @@
+   
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Driver for output on SGI audio system (needs libaudio from the dmedia
+   package).
+diff --recursive --unified libmikmod-3.1.11/drivers/drv_stdout.c libmikmod-3.1.11-a/drivers/drv_stdout.c
+--- libmikmod-3.1.11/drivers/drv_stdout.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/drivers/drv_stdout.c	2004-06-04 08:24:26.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Output data to stdout
+ 
+diff --recursive --unified libmikmod-3.1.11/drivers/drv_sun.c libmikmod-3.1.11-a/drivers/drv_sun.c
+--- libmikmod-3.1.11/drivers/drv_sun.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/drivers/drv_sun.c	2004-06-04 08:24:26.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Driver for output on the Sun audio device (/dev/audio).
+   Also works under NetBSD and OpenBSD
+diff --recursive --unified libmikmod-3.1.11/drivers/drv_ultra.c libmikmod-3.1.11-a/drivers/drv_ultra.c
+--- libmikmod-3.1.11/drivers/drv_ultra.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/drivers/drv_ultra.c	2004-06-04 08:24:26.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Driver for the Linux Ultrasound driver
+ 
+diff --recursive --unified libmikmod-3.1.11/drivers/drv_wav.c libmikmod-3.1.11-a/drivers/drv_wav.c
+--- libmikmod-3.1.11/drivers/drv_wav.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/drivers/drv_wav.c	2004-06-04 08:24:26.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Driver for output to a file called MUSIC.WAV
+ 
+diff --recursive --unified libmikmod-3.1.11/drivers/drv_win.c libmikmod-3.1.11-a/drivers/drv_win.c
+--- libmikmod-3.1.11/drivers/drv_win.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/drivers/drv_win.c	2004-06-04 08:24:26.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Driver for output on win32 platforms using the multimedia API
+ 
+diff --recursive --unified libmikmod-3.1.11/include/mikmod.h.in libmikmod-3.1.11-a/include/mikmod.h.in
+--- libmikmod-3.1.11/include/mikmod.h.in	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/include/mikmod.h.in	2004-06-04 08:24:26.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   MikMod sound library include file
+ 
+@@ -85,7 +85,7 @@
+ 
+ @DOES_NOT_HAVE_SIGNED@
+ 
+-#if defined(__arch64__) || defined(__alpha)
++#if defined(__arch64__) || defined(__alpha) || defined(__x86_64)
+ /* 64 bit architectures */
+ 
+ typedef signed char     SBYTE;      /* 1 byte, signed */
+diff --recursive --unified libmikmod-3.1.11/include/mikmod_internals.h libmikmod-3.1.11-a/include/mikmod_internals.h
+--- libmikmod-3.1.11/include/mikmod_internals.h	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/include/mikmod_internals.h	2004-06-04 08:24:26.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   MikMod sound library internal definitions
+ 
+diff --recursive --unified libmikmod-3.1.11/libmikmod.m4 libmikmod-3.1.11-a/libmikmod.m4
+--- libmikmod-3.1.11/libmikmod.m4	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/libmikmod.m4	2004-06-04 08:24:26.000000000 -0400
+@@ -8,7 +8,7 @@
+ dnl Test for libmikmod, and define LIBMIKMOD_CFLAGS, LIBMIKMOD_LIBS and
+ dnl LIBMIKMOD_LDADD
+ dnl
+-AC_DEFUN(AM_PATH_LIBMIKMOD,
++AC_DEFUN([AM_PATH_LIBMIKMOD],
+ [dnl 
+ dnl Get the cflags and libraries from the libmikmod-config script
+ dnl
+diff --recursive --unified libmikmod-3.1.11/loaders/load_669.c libmikmod-3.1.11-a/loaders/load_669.c
+--- libmikmod-3.1.11/loaders/load_669.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/loaders/load_669.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Composer 669 module loader
+ 
+diff --recursive --unified libmikmod-3.1.11/loaders/load_amf.c libmikmod-3.1.11-a/loaders/load_amf.c
+--- libmikmod-3.1.11/loaders/load_amf.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/loaders/load_amf.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   DMP Advanced Module Format loader
+ 
+diff --recursive --unified libmikmod-3.1.11/loaders/load_dsm.c libmikmod-3.1.11-a/loaders/load_dsm.c
+--- libmikmod-3.1.11/loaders/load_dsm.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/loaders/load_dsm.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   DSIK internal format (DSM) module loader
+ 
+diff --recursive --unified libmikmod-3.1.11/loaders/load_far.c libmikmod-3.1.11-a/loaders/load_far.c
+--- libmikmod-3.1.11/loaders/load_far.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/loaders/load_far.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Farandole (FAR) module loader
+ 
+diff --recursive --unified libmikmod-3.1.11/loaders/load_gdm.c libmikmod-3.1.11-a/loaders/load_gdm.c
+--- libmikmod-3.1.11/loaders/load_gdm.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/loaders/load_gdm.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   General DigiMusic (GDM) module loader
+ 
+diff --recursive --unified libmikmod-3.1.11/loaders/load_imf.c libmikmod-3.1.11-a/loaders/load_imf.c
+--- libmikmod-3.1.11/loaders/load_imf.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/loaders/load_imf.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Imago Orpheus (IMF) module loader
+ 
+diff --recursive --unified libmikmod-3.1.11/loaders/load_it.c libmikmod-3.1.11-a/loaders/load_it.c
+--- libmikmod-3.1.11/loaders/load_it.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/loaders/load_it.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Impulse tracker (IT) module loader
+ 
+diff --recursive --unified libmikmod-3.1.11/loaders/load_m15.c libmikmod-3.1.11-a/loaders/load_m15.c
+--- libmikmod-3.1.11/loaders/load_m15.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/loaders/load_m15.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   15 instrument MOD loader
+   Also supports Ultimate Sound Tracker (old M15 format)
+diff --recursive --unified libmikmod-3.1.11/loaders/load_med.c libmikmod-3.1.11-a/loaders/load_med.c
+--- libmikmod-3.1.11/loaders/load_med.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/loaders/load_med.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Amiga MED module loader
+ 
+diff --recursive --unified libmikmod-3.1.11/loaders/load_mod.c libmikmod-3.1.11-a/loaders/load_mod.c
+--- libmikmod-3.1.11/loaders/load_mod.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/loaders/load_mod.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Generic MOD loader (Protracker, StarTracker, FastTracker, etc)
+ 
+diff --recursive --unified libmikmod-3.1.11/loaders/load_mtm.c libmikmod-3.1.11-a/loaders/load_mtm.c
+--- libmikmod-3.1.11/loaders/load_mtm.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/loaders/load_mtm.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   MTM module loader
+ 
+diff --recursive --unified libmikmod-3.1.11/loaders/load_okt.c libmikmod-3.1.11-a/loaders/load_okt.c
+--- libmikmod-3.1.11/loaders/load_okt.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/loaders/load_okt.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Oktalyzer (OKT) module loader
+ 
+diff --recursive --unified libmikmod-3.1.11/loaders/load_s3m.c libmikmod-3.1.11-a/loaders/load_s3m.c
+--- libmikmod-3.1.11/loaders/load_s3m.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/loaders/load_s3m.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Screamtracker (S3M) module loader
+ 
+diff --recursive --unified libmikmod-3.1.11/loaders/load_stm.c libmikmod-3.1.11-a/loaders/load_stm.c
+--- libmikmod-3.1.11/loaders/load_stm.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/loaders/load_stm.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Screamtracker 2 (STM) module loader
+ 
+diff --recursive --unified libmikmod-3.1.11/loaders/load_stx.c libmikmod-3.1.11-a/loaders/load_stx.c
+--- libmikmod-3.1.11/loaders/load_stx.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/loaders/load_stx.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   STMIK 0.2 (STX) module loader
+ 
+diff --recursive --unified libmikmod-3.1.11/loaders/load_ult.c libmikmod-3.1.11-a/loaders/load_ult.c
+--- libmikmod-3.1.11/loaders/load_ult.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/loaders/load_ult.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Ultratracker (ULT) module loader
+ 
+diff --recursive --unified libmikmod-3.1.11/loaders/load_uni.c libmikmod-3.1.11-a/loaders/load_uni.c
+--- libmikmod-3.1.11/loaders/load_uni.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/loaders/load_uni.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   UNIMOD (libmikmod's and APlayer's internal module format) loader
+ 
+diff --recursive --unified libmikmod-3.1.11/loaders/load_xm.c libmikmod-3.1.11-a/loaders/load_xm.c
+--- libmikmod-3.1.11/loaders/load_xm.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/loaders/load_xm.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Fasttracker (XM) module loader
+ 
+diff --recursive --unified libmikmod-3.1.11/macintosh/mikmod.h libmikmod-3.1.11-a/macintosh/mikmod.h
+--- libmikmod-3.1.11/macintosh/mikmod.h	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/macintosh/mikmod.h	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   MikMod sound library include file
+ 
+diff --recursive --unified libmikmod-3.1.11/mkinstalldirs libmikmod-3.1.11-a/mkinstalldirs
+--- libmikmod-3.1.11/mkinstalldirs	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/mkinstalldirs	2004-06-04 08:24:26.000000000 -0400
+@@ -4,7 +4,7 @@
+ # Created: 1993-05-16
+ # Public domain
+ 
+-# $Id$
++# $Id$
+ 
+ errstatus=0
+ 
+diff --recursive --unified libmikmod-3.1.11/mmio/mmalloc.c libmikmod-3.1.11-a/mmio/mmalloc.c
+--- libmikmod-3.1.11/mmio/mmalloc.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/mmio/mmalloc.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Dynamic memory routines
+ 
+diff --recursive --unified libmikmod-3.1.11/mmio/mmerror.c libmikmod-3.1.11-a/mmio/mmerror.c
+--- libmikmod-3.1.11/mmio/mmerror.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/mmio/mmerror.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Error handling functions.
+   Register an error handler with _mm_RegisterErrorHandler() and you're all set.
+diff --recursive --unified libmikmod-3.1.11/mmio/mmio.c libmikmod-3.1.11-a/mmio/mmio.c
+--- libmikmod-3.1.11/mmio/mmio.c	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/mmio/mmio.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Portable file I/O routines
+ 
+diff --recursive --unified libmikmod-3.1.11/os2/configure.cmd libmikmod-3.1.11-a/os2/configure.cmd
+--- libmikmod-3.1.11/os2/configure.cmd	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/os2/configure.cmd	2004-06-04 08:24:27.000000000 -0400
+@@ -22,7 +22,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Configuration script for libmikmod under OS/2
+ 
+diff --recursive --unified libmikmod-3.1.11/playercode/mdreg.c libmikmod-3.1.11-a/playercode/mdreg.c
+--- libmikmod-3.1.11/playercode/mdreg.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/playercode/mdreg.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Routine for registering all drivers in libmikmod for the current platform.
+ 
+diff --recursive --unified libmikmod-3.1.11/playercode/mdriver.c libmikmod-3.1.11-a/playercode/mdriver.c
+--- libmikmod-3.1.11/playercode/mdriver.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/playercode/mdriver.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   These routines are used to access the available soundcard drivers.
+ 
+diff --recursive --unified libmikmod-3.1.11/playercode/mdulaw.c libmikmod-3.1.11-a/playercode/mdulaw.c
+--- libmikmod-3.1.11/playercode/mdulaw.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/playercode/mdulaw.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Mu-law routines
+ 
+diff --recursive --unified libmikmod-3.1.11/playercode/mloader.c libmikmod-3.1.11-a/playercode/mloader.c
+--- libmikmod-3.1.11/playercode/mloader.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/playercode/mloader.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   These routines are used to access the available module loaders
+ 
+diff --recursive --unified libmikmod-3.1.11/playercode/mlreg.c libmikmod-3.1.11-a/playercode/mlreg.c
+--- libmikmod-3.1.11/playercode/mlreg.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/playercode/mlreg.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Routine for registering all loaders in libmikmod for the current platform.
+ 
+diff --recursive --unified libmikmod-3.1.11/playercode/mlutil.c libmikmod-3.1.11-a/playercode/mlutil.c
+--- libmikmod-3.1.11/playercode/mlutil.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/playercode/mlutil.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Utility functions for the module loader
+ 
+diff --recursive --unified libmikmod-3.1.11/playercode/mplayer.c libmikmod-3.1.11-a/playercode/mplayer.c
+--- libmikmod-3.1.11/playercode/mplayer.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/playercode/mplayer.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   The Protracker Player Driver
+ 
+diff --recursive --unified libmikmod-3.1.11/playercode/munitrk.c libmikmod-3.1.11-a/playercode/munitrk.c
+--- libmikmod-3.1.11/playercode/munitrk.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/playercode/munitrk.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   All routines dealing with the manipulation of UNITRK streams
+ 
+diff --recursive --unified libmikmod-3.1.11/playercode/mwav.c libmikmod-3.1.11-a/playercode/mwav.c
+--- libmikmod-3.1.11/playercode/mwav.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/playercode/mwav.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   WAV sample loader
+ 
+diff --recursive --unified libmikmod-3.1.11/playercode/npertab.c libmikmod-3.1.11-a/playercode/npertab.c
+--- libmikmod-3.1.11/playercode/npertab.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/playercode/npertab.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   MOD format period table.  Used by both the MOD and M15 (15-inst mod) Loaders.
+ 
+diff --recursive --unified libmikmod-3.1.11/playercode/sloader.c libmikmod-3.1.11-a/playercode/sloader.c
+--- libmikmod-3.1.11/playercode/sloader.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/playercode/sloader.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Routines for loading samples. The sample loader utilizes the routines
+   provided by the "registered" sample loader.
+diff --recursive --unified libmikmod-3.1.11/playercode/virtch.c libmikmod-3.1.11-a/playercode/virtch.c
+--- libmikmod-3.1.11/playercode/virtch.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/playercode/virtch.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Sample mixing routines, using a 32 bits mixing buffer.
+ 
+diff --recursive --unified libmikmod-3.1.11/playercode/virtch2.c libmikmod-3.1.11-a/playercode/virtch2.c
+--- libmikmod-3.1.11/playercode/virtch2.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/playercode/virtch2.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   High-quality sample mixing routines, using a 32 bits mixing buffer,
+   interpolation, and sample smoothing to improve sound quality and remove
+diff --recursive --unified libmikmod-3.1.11/playercode/virtch_common.c libmikmod-3.1.11-a/playercode/virtch_common.c
+--- libmikmod-3.1.11/playercode/virtch_common.c	2004-01-21 12:43:53.000000000 -0500
++++ libmikmod-3.1.11-a/playercode/virtch_common.c	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   Common source parts between the two software mixers.
+   This file is probably the ugliest part of libmikmod...
+diff --recursive --unified libmikmod-3.1.11/win32/mikmod_build.h libmikmod-3.1.11-a/win32/mikmod_build.h
+--- libmikmod-3.1.11/win32/mikmod_build.h	2004-01-21 12:43:52.000000000 -0500
++++ libmikmod-3.1.11-a/win32/mikmod_build.h	2004-06-04 08:24:27.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ /*==============================================================================
+ 
+-  $Id$
++  $Id$
+ 
+   MikMod sound library include file
+ 

libmikmod-64bit.patch:
 mikmod.h.in        |    3 ++-
 mikmod_internals.h |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

Index: libmikmod-64bit.patch
===================================================================
RCS file: /cvs/dist/rpms/mikmod/devel/libmikmod-64bit.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libmikmod-64bit.patch	17 Apr 2007 17:32:47 -0000	1.3
+++ libmikmod-64bit.patch	21 Apr 2007 20:42:49 -0000	1.4
@@ -1,5 +1,5 @@
---- mikmod-3.2.2-beta1/libmikmod-3.2.0-beta2/include/mikmod_internals.h.64bit	2004-08-04 05:08:06.604109384 +0200
-+++ mikmod-3.2.2-beta1/libmikmod-3.2.0-beta2/include/mikmod_internals.h	2004-08-04 05:09:56.700372208 +0200
+--- mikmod-3.1.6/libmikmod-3.1.11/include/mikmod_internals.h.64bit	2004-08-04 05:08:06.604109384 +0200
++++ mikmod-3.1.6/libmikmod-3.1.11/include/mikmod_internals.h	2004-08-04 05:09:56.700372208 +0200
 @@ -50,7 +50,8 @@
  /*========== More type definitions */
  
@@ -10,13 +10,13 @@
  typedef long		SLONGLONG;
  #define NATIVE_64BIT_INT
  #elif defined(__WATCOMC__)
---- mikmod-3.2.2-beta1/libmikmod-3.2.0-beta2/include/mikmod.h.in.64bit	2004-08-04 05:07:56.092707360 +0200
-+++ mikmod-3.2.2-beta1/libmikmod-3.2.0-beta2/include/mikmod.h.in	2004-08-04 05:09:06.217046840 +0200
+--- mikmod-3.1.6/libmikmod-3.1.11/include/mikmod.h.in.64bit	2004-08-04 05:07:56.092707360 +0200
++++ mikmod-3.1.6/libmikmod-3.1.11/include/mikmod.h.in	2004-08-04 05:09:06.217046840 +0200
 @@ -85,7 +85,8 @@
  
  @DOES_NOT_HAVE_SIGNED@
  
--#if defined(__arch64__) || defined(__alpha)
+-#if defined(__arch64__) || defined(__alpha) || defined(__x86_64)
 +#include <stdint.h>
 +#if __WORDSIZE == 64
  /* 64 bit architectures */

libmikmod-esd.patch:
 drv_esd.c |   62 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 34 insertions(+), 28 deletions(-)

Index: libmikmod-esd.patch
===================================================================
RCS file: /cvs/dist/rpms/mikmod/devel/libmikmod-esd.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libmikmod-esd.patch	17 Apr 2007 17:32:47 -0000	1.3
+++ libmikmod-esd.patch	21 Apr 2007 20:42:49 -0000	1.4
@@ -1,5 +1,5 @@
---- mikmod-3.2.2-beta1/libmikmod-3.2.0-beta2/drivers/drv_esd.c.esd	2004-08-04 05:04:58.990630968 +0200
-+++ mikmod-3.2.2-beta1/libmikmod-3.2.0-beta2/drivers/drv_esd.c	2004-08-04 05:05:32.940469808 +0200
+--- mikmod-3.1.6/libmikmod-3.1.11/drivers/drv_esd.c.esd	2004-08-04 05:04:58.990630968 +0200
++++ mikmod-3.1.6/libmikmod-3.1.11/drivers/drv_esd.c	2004-08-04 05:05:32.940469808 +0200
 @@ -127,20 +127,19 @@
  /* I hope to have this function integrated into libesd someday...*/
  static ssize_t esd_writebuf(int fd,const void *buffer,size_t count)

libmikmod-strip-lib.patch:
 Makefile.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: libmikmod-strip-lib.patch
===================================================================
RCS file: /cvs/dist/rpms/mikmod/devel/libmikmod-strip-lib.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libmikmod-strip-lib.patch	17 Apr 2007 17:32:47 -0000	1.3
+++ libmikmod-strip-lib.patch	21 Apr 2007 20:42:49 -0000	1.4
@@ -1,6 +1,6 @@
---- mikmod-3.2.2-beta1/libmikmod-3.2.0-beta2/libmikmod/Makefile.in.old	2004-02-19 14:34:00.000000000 +0100
-+++ mikmod-3.2.2-beta1/libmikmod-3.2.0-beta2/libmikmod/Makefile.in	2007-04-17 19:06:37.000000000 +0200
-@@ -52,7 +52,7 @@
+--- mikmod-3.1.6/libmikmod-3.1.11/libmikmod/Makefile.in.old	2004-01-21 18:43:52.000000000 +0100
++++ mikmod-3.1.6/libmikmod-3.1.11/libmikmod/Makefile.in	2004-12-22 11:44:28.143658832 +0100
+@@ -51,7 +51,7 @@
  
  install:	$(LIB)
  	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)

mikmod-3.1.6-multilib.patch:
 configure           |    2 +-
 libmikmod-config.in |   14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

Index: mikmod-3.1.6-multilib.patch
===================================================================
RCS file: /cvs/dist/rpms/mikmod/devel/mikmod-3.1.6-multilib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mikmod-3.1.6-multilib.patch	17 Apr 2007 17:32:47 -0000	1.2
+++ mikmod-3.1.6-multilib.patch	21 Apr 2007 20:42:49 -0000	1.3
@@ -1,5 +1,5 @@
---- mikmod-3.2.2-beta1/libmikmod-3.2.0-beta2/libmikmod-config.in.old	2004-01-21 18:43:52.000000000 +0100
-+++ mikmod-3.2.2-beta1/libmikmod-3.2.0-beta2/libmikmod-config.in	2006-05-31 17:36:12.000000000 +0200
+--- mikmod-3.1.6/libmikmod-3.1.11/libmikmod-config.in.old	2004-01-21 18:43:52.000000000 +0100
++++ mikmod-3.1.6/libmikmod-3.1.11/libmikmod-config.in	2006-05-31 17:36:12.000000000 +0200
 @@ -5,7 +5,7 @@
  exec_prefix_set=no
  
@@ -31,8 +31,8 @@
  	*)
  		echo "${usage}" 1>&2
  		exit 1
---- mikmod-3.2.2-beta1/libmikmod-3.2.0-beta2/configure.old	2004-01-21 18:43:52.000000000 +0100
-+++ mikmod-3.2.2-beta1/libmikmod-3.2.0-beta2/configure	2006-05-31 17:37:10.000000000 +0200
+--- mikmod-3.1.6/libmikmod-3.1.11/configure.old	2004-01-21 18:43:52.000000000 +0100
++++ mikmod-3.1.6/libmikmod-3.1.11/configure	2006-05-31 17:37:10.000000000 +0200
 @@ -6390,7 +6390,7 @@
  cross_compiling=$ac_cv_prog_cc_cross
  


Index: mikmod.spec
===================================================================
RCS file: /cvs/dist/rpms/mikmod/devel/mikmod.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- mikmod.spec	17 Apr 2007 17:32:47 -0000	1.33
+++ mikmod.spec	21 Apr 2007 20:42:49 -0000	1.34
@@ -1,20 +1,21 @@
-%define lversion 3.2.0-beta2
+%define lversion 3.1.11
 
 Summary: A MOD music file player
 Name: mikmod
 Version: 3.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL/LGPL
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ncurses-devel
+BuildRequires: ncurses-devel texinfo
 URL: http://mikmod.raphnet.net/
 Source0: http://mikmod.raphnet.net/files/mikmod-%{version}-beta1.tar.gz
 Source1: http://mikmod.raphnet.net/files/libmikmod-%{lversion}.tar.gz
-Patch0:  libmikmod-esd.patch
-Patch1:  libmikmod-64bit.patch
-Patch2:  libmikmod-strip-lib.patch
-Patch3:  mikmod-3.1.6-multilib.patch
+Patch0:  http://mikmod.raphnet.net/files/libmikmod-3.1.11-a.diff
+Patch1:  libmikmod-esd.patch
+Patch2:  libmikmod-64bit.patch
+Patch3:  libmikmod-strip-lib.patch
+Patch4:  mikmod-3.1.6-multilib.patch
 
 %description
 MikMod is one of the best and most well known MOD music file players
@@ -40,10 +41,11 @@
 
 %prep
 %setup -q -a 1 -n %{name}-%{version}-beta1
-%patch0 -p1 -b .esd
-%patch1 -p1 -b .64bit
-%patch2 -p1 -b .lib-strip
-%patch3 -p1 -b .multi
+%patch0 -p0
+%patch1 -p1 -b .esd
+%patch2 -p1 -b .64bit
+%patch3 -p1 -b .lib-strip
+%patch4 -p1 -b .multi
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -53,14 +55,14 @@
 popd
 
 # Trick it into compiling while libmikmod is not installed...
-export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_prefix}/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir}:$LD_LIBRARY_PATH
 perl -pi -e "s,-lmikmod,-I$RPM_BUILD_ROOT%{_prefix}/include -L$RPM_BUILD_ROOT%{_libdir} -lmikmod,g" libmikmod-%{lversion}/libmikmod-config
 export LIBMIKMOD_CONFIG=`pwd`/libmikmod-%{lversion}/libmikmod-config
 %configure \
 	--with-libmikmod-prefix=$RPM_BUILD_ROOT%{_prefix} \
-	--with-libmikmod-exec-prefix=$RPM_BUILD_ROOT%{_prefix}/bin \
+	--with-libmikmod-exec-prefix=$RPM_BUILD_ROOT%{_bindir} \
 	--disable-libmikmodtest
-make CFLAGS="$RPM_OPT_FLAGS `libmikmod-%{lversion}/libmikmod-config --cflags`" LDFLAGS="-lm"
+make CFLAGS="$RPM_OPT_FLAGS `libmikmod-%{lversion}/libmikmod-config --cflags`"
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -102,6 +104,10 @@
 %{_mandir}/man1/libmikmod-config*
 
 %changelog
+* Sat Apr 21 2007 Jindrich Novy <jnovy at redhat.com> 3.2.2-2
+- downgrade libmikmod to avoid dependency problems before F7 release
+- minor spec fixes
+
 * Tue Apr 17 2007 Jindrich Novy <jnovy at redhat.com> 3.2.2-1
 - update to mikmod-3.2.2-beta1
 - drop useless libtool, texinfo BuildRequires


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mikmod/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Apr 2007 17:32:47 -0000	1.4
+++ sources	21 Apr 2007 20:42:49 -0000	1.5
@@ -1,2 +1,2 @@
 9a9534a054afe8d28cc784041e6d1519  mikmod-3.2.2-beta1.tar.gz
-19fc0879aebd1610813a23bd84726362  libmikmod-3.2.0-beta2.tar.gz
+705106da305e8de191549f1e7393185c  libmikmod-3.1.11.tar.gz



From fedora-cvs-commits at redhat.com  Sat Apr 21 22:15:48 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 18:15:48 -0400
Subject: rpms/kernel/devel linux-2.6-ps3-wrap-spu-runctl.patch,1.1,1.2
Message-ID: <200704212215.l3LMFmaA019187@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	linux-2.6-ps3-wrap-spu-runctl.patch 
Log Message:
fix warning

linux-2.6-ps3-wrap-spu-runctl.patch:
 arch/powerpc/platforms/cell/spu_base.c          |    1 +
 arch/powerpc/platforms/cell/spu_manage.c        |   15 +++++++++++++++
 arch/powerpc/platforms/cell/spufs/backing_ops.c |    6 ++++++
 arch/powerpc/platforms/cell/spufs/hw_ops.c      |   10 ++++++++++
 arch/powerpc/platforms/cell/spufs/run.c         |    4 ++--
 arch/powerpc/platforms/cell/spufs/spufs.h       |    1 +
 arch/powerpc/platforms/ps3/spu.c                |   14 ++++++++++++++
 include/asm-powerpc/spu_priv1.h                 |   15 +++++++++++++++
 8 files changed, 64 insertions(+), 2 deletions(-)

Index: linux-2.6-ps3-wrap-spu-runctl.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-ps3-wrap-spu-runctl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-ps3-wrap-spu-runctl.patch	20 Apr 2007 19:08:45 -0000	1.1
+++ linux-2.6-ps3-wrap-spu-runctl.patch	21 Apr 2007 22:15:46 -0000	1.2
@@ -188,6 +188,14 @@
  /* spu_priv1_ops */
 --- ps3-linux-dev.orig/include/asm-powerpc/spu_priv1.h
 +++ ps3-linux-dev/include/asm-powerpc/spu_priv1.h
+@@ -24,6 +24,7 @@
+ #include <linux/types.h>
+ 
+ struct spu;
++struct spu_context;
+ 
+ /* access to priv1 registers */
+ 
 @@ -178,6 +178,8 @@ struct spu_management_ops {
  	int (*enumerate_spus)(int (*fn)(void *data));
  	int (*create_spu)(struct spu *spu, void *data);



From fedora-cvs-commits at redhat.com  Sat Apr 21 23:42:12 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 19:42:12 -0400
Subject: rpms/gsf-sharp/devel gsf-sharp.spec,1.20,1.21
Message-ID: <200704212342.l3LNgCD8009700@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gsf-sharp.spec 
Log Message:
Don't ship .la and .a files



Index: gsf-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/gsf-sharp/devel/gsf-sharp.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gsf-sharp.spec	1 Oct 2006 21:17:02 -0000	1.20
+++ gsf-sharp.spec	21 Apr 2007 23:42:09 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           gsf-sharp
 Version:        0.8.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Mono bindings for libgsf
 
 Group:          System Environment/Libraries
@@ -42,6 +42,8 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT GACUTIL_FLAGS="/package gtk-sharp /gacdir %{_libdir} /root ${RPM_BUILD_ROOT}%{_libdir}"
 
+rm $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -58,6 +60,9 @@
 %{_libdir}/pkgconfig/gsf-sharp.pc
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 0.8.1-3
+- Don't ship .la files and static libs
+
 * Sun Oct 01 2006 Jesse Keating <jkeating at redhat.com> - 0.8.1-2.fc6
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-cvs-commits at redhat.com  Sat Apr 21 23:53:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 19:53:32 -0400
Subject: rpms/gok/devel gok.spec,1.45,1.46
Message-ID: <200704212353.l3LNrWHW009863@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gok/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9849

Modified Files:
	gok.spec 
Log Message:
File list cleanups



Index: gok.spec
===================================================================
RCS file: /cvs/dist/rpms/gok/devel/gok.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gok.spec	28 Feb 2007 15:23:04 -0000	1.45
+++ gok.spec	21 Apr 2007 23:53:30 -0000	1.46
@@ -3,7 +3,7 @@
 Summary: GNOME Onscreen Keyboard
 Name: gok
 Version: 1.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Desktop/Accessibility
 URL: http://www.gok.ca/
@@ -107,15 +107,14 @@
 
 %files -f %{po_package}.lang
 %defattr(-,root,root,-)
-%doc
+%doc README NEWS AUTHORS COPYING
 %{_sysconfdir}/gconf/schemas/*schemas
 %{_bindir}/gok
 %{_bindir}/create-branching-keyboard
 %{_libdir}/bonobo/servers/GNOME_Gok.server
 %{_datadir}/gok
-%{_datadir}/gnome
-%{_datadir}/omf
-%{_datadir}/gtk-doc/html
+%{_datadir}/gnome/help/gok
+%{_datadir}/omf/gok
 #%{_datadir}/applications/gok.desktop
 
 %{_datadir}/pixmaps/*
@@ -123,8 +122,13 @@
 %files devel
 %defattr(-, root, root)
 %{_libdir}/pkgconfig/*pc
+%{_datadir}/gtk-doc/html/gok
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 1.2.2-2
+- Move api docs to -devel
+- Some file list cleanups
+
 * Tue Feb 27 2007 Matthias Clasen <mclasen at redhat.com> - 1.2.2-1
 - Update to 1.2.2
 



From fedora-cvs-commits at redhat.com  Sat Apr 21 23:56:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 19:56:45 -0400
Subject: rpms/planner/devel planner.spec,1.39,1.40
Message-ID: <200704212356.l3LNuj7S009958@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/planner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9944

Modified Files:
	planner.spec 
Log Message:
Move api docs to -devel



Index: planner.spec
===================================================================
RCS file: /cvs/dist/rpms/planner/devel/planner.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- planner.spec	9 Feb 2007 13:46:40 -0000	1.39
+++ planner.spec	21 Apr 2007 23:56:43 -0000	1.40
@@ -1,7 +1,7 @@
 Summary:   A graphical project management tool
 Name:      planner
 Version:   0.14.2
-Release:   4%{?dist}
+Release:   5%{?dist}
 License:   GPL
 Group:     Applications/Productivity
 URL:       http://planner.imendio.org
@@ -37,7 +37,7 @@
 %package devel
 Summary: Libraries and include files for developing with planner
 Group: Development/Libraries
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig, glib2-devel, libxml2-devel, libgsf-devel
 
 %description devel
@@ -47,7 +47,7 @@
 %package eds
 Summary: Planner integration with evolution
 Group: Applications/Productivity
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 
 %description eds
 This package provides a plugin to integration planner and evolution.
@@ -129,7 +129,6 @@
 %{_datadir}/mime/packages/*
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
-%{_datadir}/gtk-doc/html/lib%{name}
 %{_datadir}/gnome/help/%{name}/*
 %{_datadir}/omf/%{name}/%{name}-*.omf
 %{_mandir}/man1/planner.1.gz
@@ -151,9 +150,13 @@
 %defattr(-,root,root)
 %{_includedir}/%{name}-1.0
 %{_libdir}/lib%{name}-1.so
+%{_datadir}/gtk-doc/html/lib%{name}
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 0.14.2-5
+- Move api docs to -devel
+
 * Fri Feb 09 2007 Caolan McNamara <caolanm at redhat.com> - 0.14.2-4
 - some spec cleanup
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 00:32:10 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 20:32:10 -0400
Subject: rpms/libXcomposite/devel libXcomposite.spec,1.18,1.19
Message-ID: <200704220032.l3M0WAPn024567@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	libXcomposite.spec 
Log Message:
Don't install INSTALL



Index: libXcomposite.spec
===================================================================
RCS file: /cvs/dist/rpms/libXcomposite/devel/libXcomposite.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libXcomposite.spec	20 Nov 2006 15:25:29 -0000	1.18
+++ libXcomposite.spec	22 Apr 2007 00:32:07 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXcomposite runtime library
 Name: libXcomposite
 Version: 0.3.1
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -64,7 +64,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libXcomposite.so.1
 %{_libdir}/libXcomposite.so.1.0.0
 
@@ -80,6 +80,9 @@
 %{_libdir}/pkgconfig/xcomposite.pc
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 0.3.1-2
+- Don't install INSTALL
+
 * Mon Nov 20 2006 Adam Jackson <ajax at redhat.com> 0.3.1-1
 - Update to 0.3.1
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 00:34:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 20:34:18 -0400
Subject: rpms/libXt/devel libXt.spec,1.24,1.25
Message-ID: <200704220034.l3M0YIpb026034@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libXt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25709

Modified Files:
	libXt.spec 
Log Message:
Don't install INSTALL



Index: libXt.spec
===================================================================
RCS file: /cvs/dist/rpms/libXt/devel/libXt.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libXt.spec	20 Nov 2006 19:22:50 -0000	1.24
+++ libXt.spec	22 Apr 2007 00:34:16 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXt runtime library
 Name: libXt
 Version: 1.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -75,7 +75,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog NEWS
+%doc AUTHORS COPYING README ChangeLog NEWS
 %{_libdir}/libXt.so.6
 %{_libdir}/libXt.so.6.0.0
 %dir %{_datadir}/X11/app-defaults
@@ -131,6 +131,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.0.4-2
+- Don't install INSTALL
+
 * Mon Nov 20 2006 Adam Jackson <ajax at redhat.com> 1.0.4-1.fc7
 - Update to 1.0.4
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 00:35:51 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 20:35:51 -0400
Subject: rpms/libXrender/devel libXrender.spec,1.17,1.18
Message-ID: <200704220035.l3M0ZpdO027130@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libXrender/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27000

Modified Files:
	libXrender.spec 
Log Message:
Don't install INSTALL



Index: libXrender.spec
===================================================================
RCS file: /cvs/dist/rpms/libXrender/devel/libXrender.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libXrender.spec	20 Nov 2006 19:17:34 -0000	1.17
+++ libXrender.spec	22 Apr 2007 00:35:49 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXrender runtime library
 Name: libXrender
 Version: 0.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -62,7 +62,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libXrender.so.1
 %{_libdir}/libXrender.so.1.3.0
 
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/xrender.pc
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 0.9.2-2
+- Don't install INSTALL
+
 * Mon Nov 20 2006 Adam Jackson <ajax at redhat.com> 0.9.2-1
 - Update to 0.9.2
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 00:38:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 20:38:23 -0400
Subject: rpms/xorg-x11-xauth/devel xorg-x11-xauth.spec,1.14,1.15
Message-ID: <200704220038.l3M0cNXq029001@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	xorg-x11-xauth.spec 
Log Message:
Don't install INSTALL



Index: xorg-x11-xauth.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xauth/devel/xorg-x11-xauth.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-xauth.spec	5 Jan 2007 23:35:18 -0000	1.14
+++ xorg-x11-xauth.spec	22 Apr 2007 00:38:21 -0000	1.15
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X authority utilities
 Name: xorg-x11-%{pkgname}
 Version: 1.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 # NOTE: Remove Epoch line if package gets renamed
 Epoch: 1
 License: MIT/X11
@@ -58,7 +58,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING INSTALL NEWS README ChangeLog
+%doc AUTHORS COPYING NEWS README ChangeLog
 %{_bindir}/xauth
 %{_bindir}/mkxauth
 #%dir %{_mandir}/man1x
@@ -66,6 +66,9 @@
 %{_mandir}/man1/mkxauth.1*
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1:1.0.2-2
+- Don't install INSTALL
+
 * Fri Jan 05 2007 Adam Jackson <ajax at redhat.com> 1:1.0.2-1.fc7
 - Update to 1.0.2
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 00:39:54 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 20:39:54 -0400
Subject: rpms/libXrandr/devel libXrandr.spec,1.19,1.20
Message-ID: <200704220039.l3M0dsRX030109@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libXrandr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30008

Modified Files:
	libXrandr.spec 
Log Message:
Don't install INSTALL



Index: libXrandr.spec
===================================================================
RCS file: /cvs/dist/rpms/libXrandr/devel/libXrandr.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libXrandr.spec	12 Apr 2007 18:19:47 -0000	1.19
+++ libXrandr.spec	22 Apr 2007 00:39:52 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXrandr runtime library
 Name: libXrandr
 Version: 1.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -60,7 +60,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libXrandr.so.2
 %{_libdir}/libXrandr.so.2.1.0
 
@@ -75,6 +75,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.2.0-4
+- Don't install INSTALL
+
 * Thu Apr 12 2007 Adam Jackson <ajax at redhat.com> 1.2.0-3
 - BuildRequire on the randrproto virtual instead of a magic x-x-p-d version.
 - Fix -devel package to require sufficiently new randrproto.



From fedora-cvs-commits at redhat.com  Sun Apr 22 00:41:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 20:41:36 -0400
Subject: rpms/libXpm/devel libXpm.spec,1.17,1.18
Message-ID: <200704220041.l3M0fabr031430@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libXpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31296

Modified Files:
	libXpm.spec 
Log Message:
Don't install INSTALL



Index: libXpm.spec
===================================================================
RCS file: /cvs/dist/rpms/libXpm/devel/libXpm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libXpm.spec	20 Nov 2006 18:53:46 -0000	1.17
+++ libXpm.spec	22 Apr 2007 00:41:34 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXpm runtime library
 Name: libXpm
 Version: 3.5.6
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -67,7 +67,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libXpm.so.4
 %{_libdir}/libXpm.so.4.11.0
 
@@ -88,6 +88,9 @@
 #%{_mandir}/man1/*.1x*
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 3.5.6-2
+- Don't install INSTALL
+
 * Mon Nov 20 2006 Adam Jackson <ajax at redhat.com> 3.5.6-1
 - Update to 3.5.6
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 00:43:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 20:43:47 -0400
Subject: rpms/devhelp/devel devhelp.spec,1.59,1.60
Message-ID: <200704220043.l3M0hlaL000587@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/devhelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv448

Modified Files:
	devhelp.spec 
Log Message:
Don't install INSTALL



Index: devhelp.spec
===================================================================
RCS file: /cvs/dist/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- devhelp.spec	23 Mar 2007 15:25:57 -0000	1.59
+++ devhelp.spec	22 Apr 2007 00:43:45 -0000	1.60
@@ -4,7 +4,7 @@
 
 Name: devhelp
 Version: 0.13
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Development/Tools
 Summary: API document browser
@@ -106,7 +106,7 @@
 
 %files -f devhelp.lang
 %defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog NEWS README INSTALL
+%doc AUTHORS COPYING ChangeLog NEWS README 
 
 %{_bindir}/devhelp
 %{_libdir}/libdevhelp*.so.*
@@ -127,6 +127,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 0.13-6
+- Don't install INSTALL
+
 * Fri Mar 23 2007 Christopher Aillon <caillon at redhat.com> - 0.13-5
 - Rebuild against newer gecko
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 00:47:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 20:47:01 -0400
Subject: rpms/libsoup/devel libsoup.spec,1.50,1.51
Message-ID: <200704220047.l3M0l1DM002973@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libsoup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2864

Modified Files:
	libsoup.spec 
Log Message:
Don't install INSTALL



Index: libsoup.spec
===================================================================
RCS file: /cvs/dist/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- libsoup.spec	12 Feb 2007 16:25:17 -0000	1.50
+++ libsoup.spec	22 Apr 2007 00:46:58 -0000	1.51
@@ -2,7 +2,7 @@
 
 Name: libsoup
 Version: 2.2.100
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: Development/Libraries
 Summary: Soup, an HTTP library implementation
@@ -70,7 +70,7 @@
 
 %files
 %defattr(-, root, root)
-%doc README COPYING ChangeLog NEWS AUTHORS INSTALL 
+%doc README COPYING ChangeLog NEWS AUTHORS
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -81,6 +81,9 @@
 %{_datadir}/gtk-doc/html/libsoup
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 2.2.100-2
+- Don't install INSTALL
+
 * Mon Feb 12 2007 Matthew Barnes <mbarnes at redhat.com> - 2.2.100-1
 - Update to 2.2.100
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 00:49:00 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 20:49:00 -0400
Subject: rpms/glade2/devel glade2.spec,1.27,1.28
Message-ID: <200704220049.l3M0n0bB004535@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	glade2.spec 
Log Message:
Don't install INSTALL



Index: glade2.spec
===================================================================
RCS file: /cvs/dist/rpms/glade2/devel/glade2.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- glade2.spec	8 Sep 2006 16:56:21 -0000	1.27
+++ glade2.spec	22 Apr 2007 00:48:58 -0000	1.28
@@ -16,7 +16,7 @@
 Summary:        A GTK+ GUI builder.
 Name:           glade2
 Version:        2.12.1
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 License:        GPL
 URL:            http://glade.gnome.org/
 Source:         http://ftp.gnome.org/pub/GNOME/sources/glade/2.6/glade-%{version}.tar.bz2
@@ -37,7 +37,7 @@
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: scrollkeeper
 BuildRequires: gettext
-BuildRequires: perl-XML-Parser
+BuildRequires: perl(XML::Parser)
 
 %description
 Glade is a free user interface builder for GTK+ and the GNOME GUI
@@ -73,7 +73,7 @@
 
 %files -f %{po_package}.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog INSTALL README NEWS TODO
+%doc AUTHORS COPYING ChangeLog README NEWS TODO
 %{_datadir}/glade-2
 %{_datadir}/gnome/help/glade-2
 %{_datadir}/omf/glade-2
@@ -82,6 +82,9 @@
 %{_bindir}/*
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.1-6
+- Don't install INSTALL
+
 * Fri Sep  8 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.1-5
 - Fix directory ownership issues
 - Add missing BuildRequires



From fedora-cvs-commits at redhat.com  Sun Apr 22 00:50:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 20:50:32 -0400
Subject: rpms/gnome-volume-manager/devel gnome-volume-manager.spec, 1.60,
	1.61
Message-ID: <200704220050.l3M0oW5X005730@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-volume-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5642

Modified Files:
	gnome-volume-manager.spec 
Log Message:
Don't install INSTALL



Index: gnome-volume-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- gnome-volume-manager.spec	4 Apr 2007 02:22:13 -0000	1.60
+++ gnome-volume-manager.spec	22 Apr 2007 00:50:30 -0000	1.61
@@ -1,7 +1,7 @@
 Summary: The GNOME Volume Manager
 Name: gnome-volume-manager
 Version: 2.17.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/System
 Source0: gnome-volume-manager-%{version}.tar.bz2
@@ -19,7 +19,7 @@
 BuildRequires: dbus-devel >= 0.90
 BuildRequires: dbus-glib-devel >= 0.70
 BuildRequires: hal-devel >= 0.5.0
-BuildRequires: perl-XML-Parser
+BuildRequires: perl(XML::Parser)
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
 Requires: hal >= 0.5.0
@@ -106,7 +106,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_bindir}/*
 %{_datadir}/applications/gnome-volume-properties.desktop
 %{_datadir}/gnome-volume-manager
@@ -115,6 +115,9 @@
 %{_datadir}/gnome/autostart/gnome-volume-manager.desktop
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 2.17.0-6
+- Don't install INSTALL
+
 * Tue Apr  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.17.0-5
 - Add an explicit --vendor argument to pacify older desktop-file-utils
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 00:52:38 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 20:52:38 -0400
Subject: rpms/evolution/devel evolution.spec,1.246,1.247
Message-ID: <200704220052.l3M0qcmw007133@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	evolution.spec 
Log Message:
Don't install INSTALL



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- evolution.spec	14 Apr 2007 20:46:09 -0000	1.246
+++ evolution.spec	22 Apr 2007 00:52:35 -0000	1.247
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -490,7 +490,7 @@
 
 %files -f evolution-%{evo_major}.lang
 %defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
+%doc AUTHORS COPYING ChangeLog NEWS README
 
 # GConf schemas:
 %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas 
@@ -738,6 +738,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 2.10.1-5
+- Don't install INSTALL
+
 * Sat Apr 14 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-4.fc7
 - Add patch for RH bug #234315 (fix saving attachments).
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 00:54:10 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 20:54:10 -0400
Subject: rpms/scrollkeeper/devel scrollkeeper.spec,1.26,1.27
Message-ID: <200704220054.l3M0sADo008287@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/scrollkeeper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8191

Modified Files:
	scrollkeeper.spec 
Log Message:
Don't install INSTALL



Index: scrollkeeper.spec
===================================================================
RCS file: /cvs/dist/rpms/scrollkeeper/devel/scrollkeeper.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- scrollkeeper.spec	10 Apr 2007 13:38:07 -0000	1.26
+++ scrollkeeper.spec	22 Apr 2007 00:54:08 -0000	1.27
@@ -2,7 +2,7 @@
 
 Name: scrollkeeper
 Version: 0.3.14
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: LGPL
 Group: System Environment/Base
 Summary: ScrollKeeper is a cataloging system for documentation on open systems.
@@ -84,7 +84,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc COPYING COPYING.DOC AUTHORS README ChangeLog NEWS INSTALL 
+%doc COPYING COPYING.DOC AUTHORS README ChangeLog NEWS 
 %doc scrollkeeper-spec.txt
 %dir %{_datadir}/omf
 %{_datadir}/omf/scrollkeeper
@@ -136,6 +136,9 @@
 /sbin/ldconfig
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 0.3.4-12
+- Don't install INSTALL
+
 * Tue Apr 10 2007 Matthias Clasen <mclasen at redhat.com> - 0.3.4-11
 - Add Panjabi translations for the content list (#230686)
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 00:59:35 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 20:59:35 -0400
Subject: rpms/compiz/devel compiz.spec,1.78,1.79
Message-ID: <200704220059.l3M0xZEs012409@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12298

Modified Files:
	compiz.spec 
Log Message:
Don't install INSTALL



Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- compiz.spec	16 Apr 2007 17:05:45 -0000	1.78
+++ compiz.spec	22 Apr 2007 00:59:33 -0000	1.79
@@ -6,7 +6,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.3.6
-Release:        8%{?dist}
+Release:        9%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -168,7 +168,7 @@
 
 %files -f all.lang
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING* INSTALL README TODO
+%doc AUTHORS ChangeLog COPYING* README TODO
 %{_bindir}/compiz
 %{_bindir}/gtk-window-decorator
 %{_libdir}/libdecoration.so.*
@@ -198,6 +198,9 @@
 %{_libdir}/libdecoration.so
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 0.3.6-9
+- Don't install INSTALL
+
 * Mon Apr 16 2007 Kristian H??gsberg <krh at hinata.boston.redhat.com> - 0.3.6-8
 - Update metacity build requires to metacity-devel.
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 01:02:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 21:02:18 -0400
Subject: rpms/gnome-spell/devel gnome-spell.spec,1.25,1.26
Message-ID: <200704220102.l3M12Iep014169@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-spell.spec 
Log Message:
Don't install INSTALL



Index: gnome-spell.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-spell/devel/gnome-spell.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gnome-spell.spec	24 Jan 2007 16:13:11 -0000	1.25
+++ gnome-spell.spec	22 Apr 2007 01:02:16 -0000	1.26
@@ -2,7 +2,7 @@
 
 Name: gnome-spell
 Version: 1.0.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Text
 Summary: Bonobo component for spell checking
@@ -61,7 +61,7 @@
 
 %files -f gnome-spell-%{version}.lang
 %defattr(-,root,root)
-%doc README COPYING ChangeLog NEWS AUTHORS INSTALL
+%doc README COPYING ChangeLog NEWS AUTHORS 
 %dir %{_libdir}/gnome-spell
 %{_libdir}/gnome-spell/*.so
 %{_libdir}/bonobo/servers/*
@@ -70,6 +70,9 @@
 %{_datadir}/idl/*
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 1.0.7-5
+- Don't install INSTALL
+
 * Wed Jan 24 2007 Matthew Barnes <mbarnes at redhat.com> - 1.0.7-4.fc7
 - Clean up spec file, remove unused patches.
 - Revise multilib patch so that we no longer have to run the autotools



From fedora-cvs-commits at redhat.com  Sun Apr 22 01:08:29 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 21:08:29 -0400
Subject: rpms/libXaw/devel libXaw.spec,1.21,1.22
Message-ID: <200704220108.l3M18TdT018694@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libXaw/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18515

Modified Files:
	libXaw.spec 
Log Message:
Don't install INSTALL



Index: libXaw.spec
===================================================================
RCS file: /cvs/dist/rpms/libXaw/devel/libXaw.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libXaw.spec	12 Jul 2006 06:59:29 -0000	1.21
+++ libXaw.spec	22 Apr 2007 01:08:27 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXaw runtime library
 Name: libXaw
 Version: 1.0.2
-Release: 8.1
+Release: 9
 License: MIT/X11
 URL: http://www.x.org
 Group: System Environment/Libraries
@@ -71,7 +71,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libXaw.so.6
 %{_libdir}/libXaw.so.7
 %{_libdir}/libXaw6.so.6
@@ -101,7 +101,10 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 1.0.2-9
+- Don't install INSTALL
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2-8.1
 - rebuild
 
 * Fri Jul  7 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-8



From fedora-cvs-commits at redhat.com  Sun Apr 22 01:10:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 21:10:18 -0400
Subject: rpms/libXtst/devel libXtst.spec,1.14,1.15
Message-ID: <200704220110.l3M1AIXb020080@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libXtst/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19949

Modified Files:
	libXtst.spec 
Log Message:
Don't install INSTALL



Index: libXtst.spec
===================================================================
RCS file: /cvs/dist/rpms/libXtst/devel/libXtst.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXtst.spec	12 Jul 2006 07:12:58 -0000	1.14
+++ libXtst.spec	22 Apr 2007 01:10:15 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXtst runtime library
 Name: libXtst
 Version: 1.0.1
-Release: 3.1
+Release: 4
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -63,7 +63,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libXtst.so.6
 %{_libdir}/libXtst.so.6.1.0
 
@@ -76,7 +76,10 @@
 %{_libdir}/pkgconfig/xtst.pc
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 1.0.1-4
+- Don't install INSTALL
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-3.1
 - rebuild
 
 * Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3



From fedora-cvs-commits at redhat.com  Sun Apr 22 01:18:10 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 21:18:10 -0400
Subject: rpms/libXTrap/devel libXTrap.spec,1.13,1.14
Message-ID: <200704220118.l3M1IANk025243@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libXTrap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25124

Modified Files:
	libXTrap.spec 
Log Message:
Don't install INSTALL



Index: libXTrap.spec
===================================================================
RCS file: /cvs/dist/rpms/libXTrap/devel/libXTrap.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXTrap.spec	12 Jul 2006 07:12:49 -0000	1.13
+++ libXTrap.spec	22 Apr 2007 01:18:07 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXTrap runtime library
 Name: libXTrap
 Version: 1.0.0
-Release: 3.1
+Release: 4
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -61,7 +61,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libXTrap.so.6
 %{_libdir}/libXTrap.so.6.4.0
 
@@ -74,7 +74,10 @@
 %{_libdir}/pkgconfig/xtrap.pc
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 1.0.0-4
+- Don't install INSTALL
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-3.1
 - rebuild
 
 * Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-3



From fedora-cvs-commits at redhat.com  Sun Apr 22 01:19:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 21:19:43 -0400
Subject: rpms/libSM/devel libSM.spec,1.17,1.18
Message-ID: <200704220119.l3M1Jh1Z026301@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libSM/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26221

Modified Files:
	libSM.spec 
Log Message:
Don't install INSTALL



Index: libSM.spec
===================================================================
RCS file: /cvs/dist/rpms/libSM/devel/libSM.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libSM.spec	20 Nov 2006 15:05:45 -0000	1.17
+++ libSM.spec	22 Apr 2007 01:19:41 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libSM runtime library
 Name: libSM
 Version: 1.0.2
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -63,7 +63,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libSM.so.6
 %{_libdir}/libSM.so.6.0.0
 
@@ -81,6 +81,9 @@
 %{_libdir}/pkgconfig/sm.pc
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.0.2-2
+- Don't install INSTALL
+
 * Mon Nov 20 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
 - Update to 1.0.2
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 01:22:13 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 21:22:13 -0400
Subject: rpms/xorg-x11-twm/devel xorg-x11-twm.spec,1.16,1.17
Message-ID: <200704220122.l3M1MDIp027868@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	xorg-x11-twm.spec 
Log Message:
Don't install INSTALL



Index: xorg-x11-twm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-twm/devel/xorg-x11-twm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-twm.spec	12 Jul 2006 09:19:35 -0000	1.16
+++ xorg-x11-twm.spec	22 Apr 2007 01:22:11 -0000	1.17
@@ -5,7 +5,7 @@
 # NOTE: Remove Epoch line if package gets renamed to something like "twm"
 Epoch: 1
 Version: 1.0.1
-Release: 3.1
+Release: 4
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -67,7 +67,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING INSTALL NEWS README ChangeLog
+%doc AUTHORS COPYING NEWS README ChangeLog
 %{_bindir}/twm
 #%dir %{_mandir}/man1x
 %{_mandir}/man1/twm.1x*
@@ -75,7 +75,10 @@
 %config %{_sysconfdir}/X11/twm/system.twmrc
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 1:1.0.1-4
+- Don't install INSTALL
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0.1-3.1
 - rebuild
 
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-3



From fedora-cvs-commits at redhat.com  Sun Apr 22 01:23:59 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 21:23:59 -0400
Subject: rpms/libXinerama/devel libXinerama.spec,1.14,1.15
Message-ID: <200704220123.l3M1NxYs029095@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libXinerama/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29007

Modified Files:
	libXinerama.spec 
Log Message:
Don't install INSTALL



Index: libXinerama.spec
===================================================================
RCS file: /cvs/dist/rpms/libXinerama/devel/libXinerama.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXinerama.spec	26 Mar 2007 18:36:58 -0000	1.14
+++ libXinerama.spec	22 Apr 2007 01:23:56 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXinerama runtime library
 Name: libXinerama
 Version: 1.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -58,7 +58,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libXinerama.so.1
 %{_libdir}/libXinerama.so.1.0.0
 
@@ -69,6 +69,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.0.2-2
+- Don't install INSTALL
+
 * Mon Mar 26 2007 Adam Jackson <ajax at redhat.com> 1.0.2-1
 - libXinerama 1.0.2
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 01:26:02 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 21:26:02 -0400
Subject: rpms/libXfixes/devel libXfixes.spec,1.15,1.16
Message-ID: <200704220126.l3M1Q2cu030636@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libXfixes/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30531

Modified Files:
	libXfixes.spec 
Log Message:
Don't install INSTALL



Index: libXfixes.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfixes/devel/libXfixes.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libXfixes.spec	20 Nov 2006 16:42:18 -0000	1.15
+++ libXfixes.spec	22 Apr 2007 01:26:00 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfixes runtime library
 Name: libXfixes
 Version: 4.0.3
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -61,7 +61,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libXfixes.so.3
 %{_libdir}/libXfixes.so.3.1.0
 
@@ -79,6 +79,9 @@
 %{_mandir}/man3/Xfixes.3*
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 4.0.3-2
+- Don't install INSTALL
+
 * Mon Nov 20 2006 Adam Jackson <ajax at redhat.com> 4.0.3-1
 - Update to 4.0.3
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 01:27:41 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 21:27:41 -0400
Subject: rpms/libICE/devel libICE.spec,1.17,1.18
Message-ID: <200704220127.l3M1RfpI031774@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libICE/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31670

Modified Files:
	libICE.spec 
Log Message:
Don't install INSTALL



Index: libICE.spec
===================================================================
RCS file: /cvs/dist/rpms/libICE/devel/libICE.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libICE.spec	5 Jan 2007 23:46:57 -0000	1.17
+++ libICE.spec	22 Apr 2007 01:27:39 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libICE runtime library
 Name: libICE
 Version: 1.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -60,7 +60,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libICE.so.6
 %{_libdir}/libICE.so.6.3.0
 
@@ -75,6 +75,9 @@
 %{_libdir}/pkgconfig/ice.pc
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.0.3-2
+- Don't install INSTALL
+
 * Fri Jan 05 2007 Adam Jackson <ajax at redhat.com> 1.0.3-1
 - Update to 1.0.3
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 01:29:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 21:29:36 -0400
Subject: rpms/libXcursor/devel libXcursor.spec,1.16,1.17
Message-ID: <200704220129.l3M1TaXV000770@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libXcursor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv622

Modified Files:
	libXcursor.spec 
Log Message:
Don't install INSTALL



Index: libXcursor.spec
===================================================================
RCS file: /cvs/dist/rpms/libXcursor/devel/libXcursor.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libXcursor.spec	20 Nov 2006 15:34:19 -0000	1.16
+++ libXcursor.spec	22 Apr 2007 01:29:34 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXcursor runtime library
 Name: libXcursor
 Version: 1.1.8
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -69,7 +69,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libXcursor.so.1
 %{_libdir}/libXcursor.so.1.0.2
 %dir %{_datadir}/icons
@@ -90,6 +90,9 @@
 %{_mandir}/man3/Xcursor.3*
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.1.8-2
+- Don't install INSTALL
+
 * Mon Nov 20 2006 Adam Jackson <ajax at redhat.com> 1.1.8-1
 - Update to 1.1.8
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 01:31:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 21:31:42 -0400
Subject: rpms/xsri/devel xsri.spec,1.16,1.17
Message-ID: <200704220131.l3M1VgYP002202@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/xsri/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2116

Modified Files:
	xsri.spec 
Log Message:
Don't install INSTALL



Index: xsri.spec
===================================================================
RCS file: /cvs/dist/rpms/xsri/devel/xsri.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xsri.spec	21 Jul 2006 20:23:06 -0000	1.16
+++ xsri.spec	22 Apr 2007 01:31:40 -0000	1.17
@@ -1,7 +1,7 @@
 Summary:   X Set Root Image
 Name:      xsri
 Version:   2.1.0
-Release:   10%{?dist}
+Release:   11%{?dist}
 Epoch:     1
 License:   GPL
 Group:     System Environment/Base
@@ -34,11 +34,14 @@
 
 %files
 %defattr(-, root, root)
-%doc COPYING ChangeLog README INSTALL NEWS
+%doc COPYING ChangeLog README NEWS
 %{_bindir}/xsri
 %{_mandir}/man1/xsri.1*
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1:2.10.0-11
+- Don't install INSTALL
+
 * Fri Jul 21 2006 Mike A. Harris <mharris at redhat.com> 1:2.1.0-10.fc6
 - Added manpage for xsri (#13197)
 - Use {dist} tag in release field.



From fedora-cvs-commits at redhat.com  Sun Apr 22 01:33:04 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 21:33:04 -0400
Subject: rpms/xrestop/devel xrestop.spec,1.11,1.12
Message-ID: <200704220133.l3M1X4tC003161@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/xrestop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3079

Modified Files:
	xrestop.spec 
Log Message:
Don't install INSTALL



Index: xrestop.spec
===================================================================
RCS file: /cvs/dist/rpms/xrestop/devel/xrestop.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xrestop.spec	13 Feb 2007 20:56:06 -0000	1.11
+++ xrestop.spec	22 Apr 2007 01:33:01 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: X Resource Monitor
 Name: xrestop
 Version: 0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.freedesktop.org/Software/xrestop
@@ -34,11 +34,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING INSTALL NEWS README
+%doc AUTHORS COPYING NEWS README
 %{_bindir}/xrestop
 %{_mandir}/man1/xrestop.1*
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 0.4-2
+- Don't install INSTALL
+
 * Tue Feb 13 2007 Adam Jackson <ajax at redhat.com> 0.4-1
 - Update to 0.4
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 01:37:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 21:37:49 -0400
Subject: rpms/xorg-x11-xtrans-devel/devel xorg-x11-xtrans-devel.spec, 1.18,
	1.19
Message-ID: <200704220137.l3M1bnSN001568@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	xorg-x11-xtrans-devel.spec 
Log Message:
Don't install INSTALL



Index: xorg-x11-xtrans-devel.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xtrans-devel/devel/xorg-x11-xtrans-devel.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xorg-x11-xtrans-devel.spec	6 Jan 2007 04:44:03 -0000	1.18
+++ xorg-x11-xtrans-devel.spec	22 Apr 2007 01:37:47 -0000	1.19
@@ -6,7 +6,7 @@
 Summary: X.Org X11 developmental X transport library
 Name: xorg-x11-xtrans-devel
 Version: 1.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -40,7 +40,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README
+%doc AUTHORS ChangeLog COPYING NEWS README
 %dir %{_includedir}/X11
 %dir %{_includedir}/X11/Xtrans
 %{_includedir}/X11/Xtrans/Xtrans.c
@@ -57,10 +57,13 @@
 %{_datadir}/aclocal/xtrans.m4
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.0.3-2
+- Don't install INSTALL
+
 * Fri Jan 05 2007 Adam Jackson <ajax at redhat.com> 1.0.3-1
 - Update to 1.0.3
 
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.1
 - rebuild
 
 * Mon Jul 10 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-1.fc6



From fedora-cvs-commits at redhat.com  Sun Apr 22 01:39:10 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 21:39:10 -0400
Subject: rpms/xorg-x11-xinit/devel xorg-x11-xinit.spec,1.39,1.40
Message-ID: <200704220139.l3M1dAbS001611@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	xorg-x11-xinit.spec 
Log Message:
Don't install INSTALL



Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xorg-x11-xinit.spec	19 Apr 2007 16:38:38 -0000	1.39
+++ xorg-x11-xinit.spec	22 Apr 2007 01:39:08 -0000	1.40
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X Window System xinit startup scripts
 Name:      xorg-x11-%{pkgname}
 Version:   1.0.2
-Release:   19%{?dist}
+Release:   20%{?dist}
 License:   MIT/X11
 Group:     User Interface/X
 URL:       http://www.x.org
@@ -93,7 +93,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING INSTALL README NEWS ChangeLog
+%doc AUTHORS COPYING README NEWS ChangeLog
 %{_bindir}/startx
 %{_bindir}/xinit
 %dir %{_sysconfdir}/X11
@@ -112,6 +112,9 @@
 %{_mandir}/man1/xinit.1*
 
 %changelog
+* Say Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.0.2-20
+- Don't install INSTALL
+
 * Thu Apr 19 2007 Warren Togami <wtogami at redhat.com> 1.0.2-19
 - disable SCIM by default in non-Asian languages #237054
   If you want to use SCIM, use im-chooser to enable it.



From fedora-cvs-commits at redhat.com  Sun Apr 22 01:40:55 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 21:40:55 -0400
Subject: rpms/xorg-x11-xfs/devel xorg-x11-xfs.spec,1.27,1.28
Message-ID: <200704220140.l3M1et8N001663@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	xorg-x11-xfs.spec 
Log Message:
Don't install INSTALL



Index: xorg-x11-xfs.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/xorg-x11-xfs.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xorg-x11-xfs.spec	12 Jul 2006 09:21:39 -0000	1.27
+++ xorg-x11-xfs.spec	22 Apr 2007 01:40:53 -0000	1.28
@@ -9,7 +9,7 @@
 Summary: X.Org X11 xfs font server
 Name: xorg-x11-%{pkgname}
 Version: %{xfs_version}
-Release: 3.1
+Release: 4
 # NOTE: Remove Epoch line if package gets renamed
 Epoch: 1
 License: MIT/X11
@@ -253,7 +253,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc xfs-%{version}/AUTHORS xfs-%{version}/COPYING xfs-%{version}/INSTALL
+%doc xfs-%{version}/AUTHORS xfs-%{version}/COPYING 
 %doc xfs-%{version}/NEWS xfs-%{version}/README xfs-%{version}/ChangeLog
 %{_bindir}/xfs
 %dir %{_sysconfdir}/X11
@@ -281,7 +281,10 @@
 %{_mandir}/man1/xfsinfo.1x*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 1:1.0.2-4
+- Don't install INSTALL
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0.2-3.1
 - rebuild
 
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.2-3



From fedora-cvs-commits at redhat.com  Sun Apr 22 01:43:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 21:43:01 -0400
Subject: rpms/libXvMC/devel libXvMC.spec,1.19,1.20
Message-ID: <200704220143.l3M1h19l001708@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	libXvMC.spec 
Log Message:
Don't install INSTALL



Index: libXvMC.spec
===================================================================
RCS file: /cvs/dist/rpms/libXvMC/devel/libXvMC.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libXvMC.spec	6 Jan 2007 03:45:44 -0000	1.19
+++ libXvMC.spec	22 Apr 2007 01:42:59 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXvMC runtime library
 Name: libXvMC
 Version: 1.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -68,7 +68,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libXvMC.so.1
 %{_libdir}/libXvMC.so.1.0.0
 %{_libdir}/libXvMCW.so.1
@@ -89,6 +89,9 @@
 %{_libdir}/pkgconfig/xvmc.pc
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.0.4-2
+- Don't install INSTALL
+
 * Fri Jan 05 2007 Adam Jackson <ajax at redhat.com> 1.0.4-1
 - Update to 1.0.4
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 01:44:22 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 21:44:22 -0400
Subject: rpms/libXv/devel libXv.spec,1.18,1.19
Message-ID: <200704220144.l3M1iMtu001741@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	libXv.spec 
Log Message:
Don't install INSTALL



Index: libXv.spec
===================================================================
RCS file: /cvs/dist/rpms/libXv/devel/libXv.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libXv.spec	6 Jan 2007 03:39:17 -0000	1.18
+++ libXv.spec	22 Apr 2007 01:44:20 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXv runtime library
 Name:    libXv
 Version: 1.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -64,7 +64,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libXv.so.1
 %{_libdir}/libXv.so.1.0.0
 
@@ -82,6 +82,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.0.3-2
+- Don't install INSTALL
+
 * Fri Jan 05 2007 Adam Jackson <ajax at redhat.com> 1.0.3-1
 - Update to 1.0.3
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 01:47:05 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 21:47:05 -0400
Subject: rpms/libdmx/devel libdmx.spec,1.15,1.16
Message-ID: <200704220147.l3M1l5oc001787@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libdmx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1772

Modified Files:
	libdmx.spec 
Log Message:
Don't install INSTALL



Index: libdmx.spec
===================================================================
RCS file: /cvs/dist/rpms/libdmx/devel/libdmx.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libdmx.spec	12 Jul 2006 06:48:10 -0000	1.15
+++ libdmx.spec	22 Apr 2007 01:47:03 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libdmx runtime library
 Name: libdmx
 Version: 1.0.2
-Release: 3.1
+Release: 4
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -62,7 +62,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libdmx.so.1
 %{_libdir}/libdmx.so.1.0.0
 
@@ -77,7 +77,10 @@
 %{_mandir}/man3/*.3*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 1.0.2-4
+- Don't install INSTALL
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2-3.1
 - rebuild
 
 * Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-3



From fedora-cvs-commits at redhat.com  Sun Apr 22 01:51:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 21:51:31 -0400
Subject: rpms/libfontenc/devel libfontenc.spec,1.20,1.21
Message-ID: <200704220151.l3M1pVrc001856@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libfontenc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1839

Modified Files:
	libfontenc.spec 
Log Message:
Don't install INSTALL



Index: libfontenc.spec
===================================================================
RCS file: /cvs/dist/rpms/libfontenc/devel/libfontenc.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libfontenc.spec	24 Jan 2007 17:29:40 -0000	1.20
+++ libfontenc.spec	22 Apr 2007 01:51:29 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libfontenc runtime library
 Name: libfontenc
 Version: 1.0.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -71,7 +71,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libfontenc.so.1
 %{_libdir}/libfontenc.so.1.0.0
 
@@ -87,6 +87,9 @@
 %{_libdir}/pkgconfig/fontenc.pc
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.0.4-3
+- Don't install INSTALL
+
 * Wed Jan 24 2007 Adam Jackson <ajax at redhat.com> 1.0.4-2
 - Add BuildRequires on xorg-x11-font-utils to set encodings path correctly.
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 01:55:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 21:55:01 -0400
Subject: rpms/libFS/devel libFS.spec,1.25,1.26
Message-ID: <200704220155.l3M1t1No001913@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libFS/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1898

Modified Files:
	libFS.spec 
Log Message:
Don't install INSTALL



Index: libFS.spec
===================================================================
RCS file: /cvs/dist/rpms/libFS/devel/libFS.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libFS.spec	12 Jul 2006 06:49:19 -0000	1.25
+++ libFS.spec	22 Apr 2007 01:54:59 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libFS runtime library
 Name: libFS
 Version: 1.0.0
-Release: 3.1
+Release: 4
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -61,7 +61,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libFS.so.6
 %{_libdir}/libFS.so.6.0.0
 
@@ -77,7 +77,10 @@
 %{_libdir}/pkgconfig/libfs.pc
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 1.0.0-4
+- Don't install INSTALL
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-3.1
 - rebuild
 
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-3



From fedora-cvs-commits at redhat.com  Sun Apr 22 01:55:39 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 21:55:39 -0400
Subject: rpms/kernel/devel patch-2.6.21-rc7-git5.bz2.sign, NONE,
	1.1 .cvsignore, 1.610, 1.611 kernel-2.6.spec, 1.3103,
	1.3104 sources, 1.573, 1.574 upstream, 1.501,
	1.502 patch-2.6.21-rc7-git4.bz2.sign, 1.1, NONE
Message-ID: <200704220155.l3M1tdaK001958@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.21-rc7-git5.bz2.sign 
Removed Files:
	patch-2.6.21-rc7-git4.bz2.sign 
Log Message:
* Sat Apr 21 2007 Dave Jones <davej at redhat.com>
- 2.6.21-rc7-git5



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

iD8DBQBGKdUqyGugalF9Dw4RAg7uAJ4+IkFO5gSO8/+7IoKYkcnofUPUaACdGD1o
I5+FI+FA097G3l4zq8VZvfo=
=sCql
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.610
retrieving revision 1.611
diff -u -r1.610 -r1.611
--- .cvsignore	20 Apr 2007 17:29:29 -0000	1.610
+++ .cvsignore	22 Apr 2007 01:55:37 -0000	1.611
@@ -6,3 +6,4 @@
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc7.bz2
 patch-2.6.21-rc7-git4.bz2
+patch-2.6.21-rc7-git5.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3103
retrieving revision 1.3104
diff -u -r1.3103 -r1.3104
--- kernel-2.6.spec	20 Apr 2007 19:08:45 -0000	1.3103
+++ kernel-2.6.spec	22 Apr 2007 01:55:37 -0000	1.3104
@@ -371,7 +371,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.21-rc7.bz2
-Patch2: patch-2.6.21-rc7-git4.bz2
+Patch2: patch-2.6.21-rc7-git5.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -2330,6 +2330,9 @@
 #  - tux.
 
 %changelog
+* Sat Apr 21 2007 Dave Jones <davej at redhat.com>
+- 2.6.21-rc7-git5
+
 * Fri Apr 20 2007 David Woodhouse <dwmw2 at redhat.com>
 - Add workaround for PS3 EHCI isochronous mode
 - SPU fixes for PS3


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.573
retrieving revision 1.574
diff -u -r1.573 -r1.574
--- sources	20 Apr 2007 17:29:29 -0000	1.573
+++ sources	22 Apr 2007 01:55:37 -0000	1.574
@@ -2,3 +2,4 @@
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 3a54bf5a7cf6b124e680e1d08fe1b20b  patch-2.6.21-rc7.bz2
 8a967ac2d7c74ddbbd24c106d9d2518b  patch-2.6.21-rc7-git4.bz2
+b62d3d52565d2b2b64a1246f11e3f40f  patch-2.6.21-rc7-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.501
retrieving revision 1.502
diff -u -r1.501 -r1.502
--- upstream	20 Apr 2007 17:29:29 -0000	1.501
+++ upstream	22 Apr 2007 01:55:37 -0000	1.502
@@ -1,3 +1,3 @@
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc7.bz2
-patch-2.6.21-rc7-git4.bz2
+patch-2.6.21-rc7-git5.bz2


--- patch-2.6.21-rc7-git4.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sun Apr 22 01:56:55 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 21:56:55 -0400
Subject: rpms/libX11/devel libX11.spec,1.34,1.35
Message-ID: <200704220156.l3M1utXw002064@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libX11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2046

Modified Files:
	libX11.spec 
Log Message:
Don't install INSTALL



Index: libX11.spec
===================================================================
RCS file: /cvs/dist/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libX11.spec	6 Apr 2007 18:31:38 -0000	1.34
+++ libX11.spec	22 Apr 2007 01:56:53 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.0.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -88,7 +88,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog NEWS
+%doc AUTHORS COPYING README ChangeLog NEWS
 %dir %{_datadir}/X11
 %dir %{_datadir}/X11/locale
 %dir %{_datadir}/X11/locale/C
@@ -245,6 +245,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.0.3-9
+- Don't install INSTALL
+
 * Fri Apr 06 2007 Adam Jackson <ajax at redhat.com> 1.0.3-8
 - Fix for CVE 2007-1667.
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 01:58:44 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 21:58:44 -0400
Subject: rpms/libXau/devel libXau.spec,1.17,1.18
Message-ID: <200704220158.l3M1wiqK002114@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libXau/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2096

Modified Files:
	libXau.spec 
Log Message:
Don't install INSTALL



Index: libXau.spec
===================================================================
RCS file: /cvs/dist/rpms/libXau/devel/libXau.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libXau.spec	6 Jan 2007 00:00:42 -0000	1.17
+++ libXau.spec	22 Apr 2007 01:58:42 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXau runtime library
 Name: libXau
 Version: 1.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -61,7 +61,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libXau.so.6
 %{_libdir}/libXau.so.6.0.0
 
@@ -78,6 +78,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.0.3-2
+- Don't install INSTALL
+
 * Fri Jan 05 2007 Adam Jackson <ajax at redhat.com> 1.0.3-1
 - Update to 1.0.3
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 02:00:16 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 22:00:16 -0400
Subject: rpms/libXdamage/devel libXdamage.spec,1.17,1.18
Message-ID: <200704220200.l3M20GiQ002178@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libXdamage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2154

Modified Files:
	libXdamage.spec 
Log Message:
Don't install INSTALL



Index: libXdamage.spec
===================================================================
RCS file: /cvs/dist/rpms/libXdamage/devel/libXdamage.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libXdamage.spec	26 Mar 2007 18:53:44 -0000	1.17
+++ libXdamage.spec	22 Apr 2007 02:00:10 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXdamage runtime library
 Name: libXdamage
 Version: 1.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -58,7 +58,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libXdamage.so.1
 %{_libdir}/libXdamage.so.1.1.0
 
@@ -71,6 +71,9 @@
 %{_libdir}/pkgconfig/xdamage.pc
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.1.1-2
+- Don't install INSTALL
+
 * Mon Mar 26 2007 Adam Jackson <ajax at redhat.com> 1.1.1-1
 - libXdamage 1.1.1
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 02:02:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 22:02:23 -0400
Subject: rpms/libXdmcp/devel libXdmcp.spec,1.16,1.17
Message-ID: <200704220202.l3M22NAY002292@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libXdmcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2278

Modified Files:
	libXdmcp.spec 
Log Message:
Don't install INSTALL



Index: libXdmcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libXdmcp/devel/libXdmcp.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libXdmcp.spec	20 Nov 2006 20:32:10 -0000	1.16
+++ libXdmcp.spec	22 Apr 2007 02:02:21 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXdmcp runtime library
 Name: libXdmcp
 Version: 1.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -62,7 +62,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libXdmcp.so.6
 %{_libdir}/libXdmcp.so.6.0.0
 
@@ -77,6 +77,9 @@
 %{_libdir}/pkgconfig/xdmcp.pc
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.0.2-3
+- Don't install INSTALL
+
 * Mon Nov 20 2006 Adam Jackson <ajax at redhat.com> 1.0.2-2.fc7
 - libXdmcp-1.0.2-namespace-pollution.patch: Hide Xalloc and friends from the
   dynamic linker.



From fedora-cvs-commits at redhat.com  Sun Apr 22 02:05:52 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 22:05:52 -0400
Subject: rpms/libXevie/devel libXevie.spec,1.16,1.17
Message-ID: <200704220205.l3M25qG0002357@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libXevie/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2341

Modified Files:
	libXevie.spec 
Log Message:
Don't install INSTALL



Index: libXevie.spec
===================================================================
RCS file: /cvs/dist/rpms/libXevie/devel/libXevie.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libXevie.spec	20 Nov 2006 15:51:17 -0000	1.16
+++ libXevie.spec	22 Apr 2007 02:05:50 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXevie runtime library
 Name: libXevie
 Version: 1.0.2
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -62,7 +62,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libXevie.so.1
 %{_libdir}/libXevie.so.1.0.0
 
@@ -80,6 +80,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.0.2-2
+- Don't install INSTALL
+
 * Mon Nov 20 2006 Adam Jackson <ajax at redhat.com> 1.0.2-1
 - Update to 1.0.2
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 02:09:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 22:09:21 -0400
Subject: rpms/libXext/devel libXext.spec,1.16,1.17
Message-ID: <200704220209.l3M29LGG002408@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libXext/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2394

Modified Files:
	libXext.spec 
Log Message:
Don't install INSTALL



Index: libXext.spec
===================================================================
RCS file: /cvs/dist/rpms/libXext/devel/libXext.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libXext.spec	3 Oct 2006 16:10:06 -0000	1.16
+++ libXext.spec	22 Apr 2007 02:09:19 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXext runtime library
 Name: libXext
 Version: 1.0.1
-Release: 3
+Release: 4
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -64,7 +64,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libXext.so.6
 %{_libdir}/libXext.so.6.4.0
 
@@ -79,10 +79,13 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.0.1-4
+- Don't install INSTALL
+
 * Tue Oct 3 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-3
 - Force xorg-x11-proto-devel on >= 7.1-10 (for LBX headers), and rebuild.
 
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-2.1
 - rebuild
 
 * Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2



From fedora-cvs-commits at redhat.com  Sun Apr 22 02:13:20 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 22:13:20 -0400
Subject: rpms/libXfontcache/devel libXfontcache.spec,1.17,1.18
Message-ID: <200704220213.l3M2DKc9002470@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libXfontcache/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2455

Modified Files:
	libXfontcache.spec 
Log Message:
Don't install INSTALL



Index: libXfontcache.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfontcache/devel/libXfontcache.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libXfontcache.spec	6 Jan 2007 00:09:28 -0000	1.17
+++ libXfontcache.spec	22 Apr 2007 02:13:18 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfontcache runtime library
 Name: libXfontcache
 Version: 1.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -63,7 +63,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libXfontcache.so.1
 %{_libdir}/libXfontcache.so.1.0.0
 
@@ -79,6 +79,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.0.4-2
+- Don't install INSTALL
+
 * Fri Jan 05 2007 Adam Jackson <ajax at redhat.com> 1.0.4-1
 - Update to 1.0.4
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 02:16:28 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 22:16:28 -0400
Subject: rpms/libXft/devel libXft.spec,1.18,1.19
Message-ID: <200704220216.l3M2GSKN002516@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libXft/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2502

Modified Files:
	libXft.spec 
Log Message:
Don't install INSTALL



Index: libXft.spec
===================================================================
RCS file: /cvs/dist/rpms/libXft/devel/libXft.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libXft.spec	5 Jan 2007 23:31:42 -0000	1.18
+++ libXft.spec	22 Apr 2007 02:16:26 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXft runtime library
 Name: libXft
 Version: 2.1.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -74,7 +74,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog NEWS
+%doc AUTHORS COPYING README ChangeLog NEWS
 %{_libdir}/libXft.so.2
 %{_libdir}/libXft.so.2.1.2
 
@@ -95,6 +95,9 @@
 %{_mandir}/man3/Xft.3*
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 2.1.12-2
+- Don't install INSTALL
+
 * Fri Jan 05 2007 Adam Jackson <ajax at redhat.com> 2.1.12-1.fc7
 - Update to 2.1.12
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 02:20:48 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 22:20:48 -0400
Subject: rpms/libXi/devel libXi.spec,1.17,1.18
Message-ID: <200704220220.l3M2KmmT002584@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libXi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2570

Modified Files:
	libXi.spec 
Log Message:
Don't install INSTALL



Index: libXi.spec
===================================================================
RCS file: /cvs/dist/rpms/libXi/devel/libXi.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libXi.spec	11 Apr 2007 20:47:20 -0000	1.17
+++ libXi.spec	22 Apr 2007 02:20:46 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXi runtime library
 Name: libXi
 Version: 1.0.4
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -63,7 +63,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libXi.so.6
 %{_libdir}/libXi.so.6.0.0
 
@@ -78,6 +78,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.0.4-2
+- Don't install INSTALL
+
 * Wed Apr 11 2007 Adam Jackson <ajax at redhat.com> 1.0.4-1
 - libXi 1.0.4
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 02:29:38 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 22:29:38 -0400
Subject: rpms/libxkbfile/devel libxkbfile.spec,1.19,1.20
Message-ID: <200704220229.l3M2TclY002667@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libxkbfile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2652

Modified Files:
	libxkbfile.spec 
Log Message:
Don't install INSTALL



Index: libxkbfile.spec
===================================================================
RCS file: /cvs/dist/rpms/libxkbfile/devel/libxkbfile.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libxkbfile.spec	20 Nov 2006 19:35:54 -0000	1.19
+++ libxkbfile.spec	22 Apr 2007 02:29:35 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libxkbfile runtime library
 Name: libxkbfile
 Version: 1.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -64,7 +64,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libxkbfile.so.1
 %{_libdir}/libxkbfile.so.1.0.2
 
@@ -85,6 +85,9 @@
 %{_libdir}/pkgconfig/xkbfile.pc
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.0.4-2
+- Don't install INSTALL
+
 * Mon Nov 20 2006 Adam Jackson <ajax at redhat.com> 1.0.4-1.fc7
 - Update to 1.0.4
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 02:31:58 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 22:31:58 -0400
Subject: rpms/libXmu/devel libXmu.spec,1.22,1.23
Message-ID: <200704220231.l3M2Vw1c016806@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libXmu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16710

Modified Files:
	libXmu.spec 
Log Message:
Don't install INSTALL



Index: libXmu.spec
===================================================================
RCS file: /cvs/dist/rpms/libXmu/devel/libXmu.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libXmu.spec	20 Nov 2006 18:47:29 -0000	1.22
+++ libXmu.spec	22 Apr 2007 02:31:55 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXmu/libXmuu runtime libraries
 Name: libXmu
 Version: 1.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -65,7 +65,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libXmu.so.6
 %{_libdir}/libXmu.so.6.2.0
 %{_libdir}/libXmuu.so.1
@@ -107,6 +107,9 @@
 %{_libdir}/pkgconfig/xmuu.pc
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.0.3-2
+- Don't install INSTALL
+
 * Mon Nov 20 2006 Adam Jackson <ajax at redhat.com> 1.0.3-1.fc7
 - Update to 1.0.3
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 02:33:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 22:33:32 -0400
Subject: rpms/libXres/devel libXres.spec,1.17,1.18
Message-ID: <200704220233.l3M2XWc0017922@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libXres/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17834

Modified Files:
	libXres.spec 
Log Message:
Don't install INSTALL



Index: libXres.spec
===================================================================
RCS file: /cvs/dist/rpms/libXres/devel/libXres.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libXres.spec	6 Jan 2007 00:12:42 -0000	1.17
+++ libXres.spec	22 Apr 2007 02:33:30 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXres runtime library
 Name: libXres
 Version: 1.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -61,7 +61,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libXRes.so.1
 %{_libdir}/libXRes.so.1.0.0
 
@@ -79,6 +79,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.0.3-2
+- Don't install INSTALL
+
 * Fri Jan 05 2007 Adam Jackson <ajax at redhat.com> 1.0.3-1
 - Update to 1.0.3
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 02:35:33 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 22:35:33 -0400
Subject: rpms/libXScrnSaver/devel libXScrnSaver.spec,1.22,1.23
Message-ID: <200704220235.l3M2ZXIl019242@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libXScrnSaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19137

Modified Files:
	libXScrnSaver.spec 
Log Message:
Don't install INSTALL



Index: libXScrnSaver.spec
===================================================================
RCS file: /cvs/dist/rpms/libXScrnSaver/devel/libXScrnSaver.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libXScrnSaver.spec	5 Jan 2007 23:50:03 -0000	1.22
+++ libXScrnSaver.spec	22 Apr 2007 02:35:31 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXss runtime library
 Name: libXScrnSaver
 Version: 1.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -67,7 +67,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libXss.so.1
 %{_libdir}/libXss.so.1.0.0
 
@@ -83,6 +83,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> 1.1.2-2
+- Don't install INSTALL
+
 * Fri Jan 05 2007 Adam Jackson <ajax at redhat.com> 1.1.2-1
 - Update to 1.1.2
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 02:54:13 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 22:54:13 -0400
Subject: rpms/gamin/devel gamin.spec,1.58,1.59
Message-ID: <200704220254.l3M2sD4N032685@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gamin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32560

Modified Files:
	gamin.spec 
Log Message:
Don't ship static libraries



Index: gamin.spec
===================================================================
RCS file: /cvs/dist/rpms/gamin/devel/gamin.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- gamin.spec	11 Apr 2007 14:38:04 -0000	1.58
+++ gamin.spec	22 Apr 2007 02:54:11 -0000	1.59
@@ -1,7 +1,7 @@
 Summary: Library providing the FAM File Alteration Monitor API
 Name: gamin
 Version: 0.1.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPL
 Group: Development/Libraries
 Source: gamin-%{version}.tar.gz
@@ -84,7 +84,6 @@
 %defattr(-, root, root)
 
 %{_libdir}/lib*.so
-%{_libdir}/*a
 %{_includedir}/fam.h
 %{_libdir}/pkgconfig/gamin.pc
 
@@ -97,6 +96,9 @@
 %doc doc/python.html
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 0.1.8-6
+- Don't ship static libraries
+
 * Wed Apr 11 2007 Alexander Larsson <alexl at redhat.com> - 0.1.8-5
 - Add patch that handles inotify failing fallback (#233316)
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 02:57:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 22:57:31 -0400
Subject: rpms/gnome-pilot/devel gnome-pilot.spec,1.56,1.57
Message-ID: <200704220257.l3M2vVJD002689@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-pilot.spec 
Log Message:
Don't ship .la and .a files



Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/devel/gnome-pilot.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- gnome-pilot.spec	18 Apr 2007 21:17:34 -0000	1.56
+++ gnome-pilot.spec	22 Apr 2007 02:57:29 -0000	1.57
@@ -95,8 +95,8 @@
 mv $RPM_BUILD_ROOT/%{_datadir}/gnome-pilot/conduits/*.conduit \
    $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/
 
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{a,la}
+rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.{a,la}
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
 %find_lang %{name}
@@ -155,6 +155,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 2.0.15-6
+- Don't ship static libraries and .la files
+
 * Wed Apr 18 2007 Matthew Barnes <mbarnes at redhat.com> - 2.0.15-5.fc7
 - Add patch for RH bug #198211 (unresolved symbols in libraries).
 - Add autoconf and automake as build requirements, since we now have to



From fedora-cvs-commits at redhat.com  Sun Apr 22 03:09:44 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 23:09:44 -0400
Subject: rpms/libgnomecups/devel libgnomecups.spec,1.45,1.46
Message-ID: <200704220309.l3M39iAb011473@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomecups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11342

Modified Files:
	libgnomecups.spec 
Log Message:
Don't ship static libraries



Index: libgnomecups.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomecups/devel/libgnomecups.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- libgnomecups.spec	2 Oct 2006 18:48:58 -0000	1.45
+++ libgnomecups.spec	22 Apr 2007 03:09:42 -0000	1.46
@@ -1,7 +1,7 @@
 Summary:  GNOME library for CUPS integration
 Name:     libgnomecups
 Version:  0.2.2
-Release:  8
+Release:  9%{?dist}
 License:  LGPL
 Group:    Development/Libraries
 URL:      http://www.gnome.org
@@ -14,8 +14,8 @@
 BuildRequires: dbus-glib-devel
 BuildRequires: autoconf, automake, libtool, gettext
 BuildRequires: intltool
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Source: %{name}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+Source: http://ftp.gnome.org/pub/gnome/sources/libgnomecups/0.2/%{name}-%{version}.tar.bz2
 Patch2: libgnomecups-no-gnome-common.patch
 Patch3: libgnomecups-dbus.patch
 Patch5: libgnomecups-0.1.14-go-direct.patch
@@ -30,6 +30,7 @@
 Group: Development/GNOME and GTK+
 Requires: %{name} = %{version}-%{release}
 Requires: cups-devel glib2-devel
+Requires: pkgconfig
 
 %description devel
 GNOME library for CUPS integration
@@ -70,11 +71,15 @@
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
-%{_libdir}/*.a
+%exclude %{_libdir}/*.a
 %exclude %{_libdir}/*.la
 %{_libdir}/*.so
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 0.2.2-9
+- Don't ship static libraries
+- Small spec file cleanups
+
 * Mon Oct  2 2006 Christopher Aillon <caillon at redhat.com> - 0.2.2-8
 - Add fixes for a leak and an invalid memory access from usptream.
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 03:18:51 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 23:18:51 -0400
Subject: rpms/libgnomeprint22/devel libgnomeprint22.spec,1.48,1.49
Message-ID: <200704220318.l3M3IpuM018247@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomeprint22/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18059

Modified Files:
	libgnomeprint22.spec 
Log Message:
Don't ship .la files



Index: libgnomeprint22.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprint22/devel/libgnomeprint22.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- libgnomeprint22.spec	13 Mar 2007 17:28:33 -0000	1.48
+++ libgnomeprint22.spec	22 Apr 2007 03:18:49 -0000	1.49
@@ -13,7 +13,7 @@
 Summary: Printing library for GNOME
 Name:		libgnomeprint22
 Version: 	2.18.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	LGPL
 Group:          System Environment/Base
 Source: 	http://ftp.gnome.org/pub/gnome/sources/libgnomeprint/2.18/libgnomeprint-%{version}.tar.bz2
@@ -60,7 +60,7 @@
 Group: Development/Libraries
 
 Requires:	%{name} = %{version}-%{release}
-
+Requires:	pkgconfig
 Requires:	glib2-devel >= %{glib2_version}
 Requires:	pango-devel >= %{pango_version}
 Requires:	libxml2-devel >= %{libxml2_version}
@@ -105,6 +105,9 @@
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/lib*.so.*
 %{_libdir}/libgnomeprint/
+%exclude %{_libdir}/libgnomeprint/2.18.0/modules/*.la
+%exclude %{_libdir}/libgnomeprint/2.18.0/modules/filters/*.la
+%exclude %{_libdir}/libgnomeprint/2.18.0/modules/transports/*.la
 %{_datadir}/libgnomeprint/
 
 %files devel
@@ -113,9 +116,13 @@
 %exclude %{_libdir}/*.la
 %{_includedir}/*
 %{_libdir}/pkgconfig/*
-%{_datadir}/gtk-doc/*
+%{_datadir}/gtk-doc/html/libgnomeprint
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-2
+- Don't ship .la files
+- Require pkgconfig in the -devel package
+
 * Tue Mar 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-1
 - Update to 2.18.0
 



From fedora-cvs-commits at redhat.com  Sun Apr 22 03:22:16 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 21 Apr 2007 23:22:16 -0400
Subject: rpms/at-spi/devel at-spi.spec,1.67,1.68
Message-ID: <200704220322.l3M3MGpD020588@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	at-spi.spec 
Log Message:
Don't ship .la files



Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- at-spi.spec	9 Apr 2007 11:49:08 -0000	1.67
+++ at-spi.spec	22 Apr 2007 03:22:13 -0000	1.68
@@ -8,7 +8,7 @@
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
 Version: 1.18.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: http://ftp.gnome.org/pub/gnome/sources/at-spi/1.18/%{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=427836
@@ -65,7 +65,7 @@
 
 
 %build
-%configure --disable-gtk-doc
+%configure --disable-gtk-doc --disable-static
 make
 
 %install
@@ -76,6 +76,7 @@
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/orbit-2.0/*.la
 
 %post -p /sbin/ldconfig
 
@@ -102,6 +103,9 @@
 %{_includedir}/* 
 
 %changelog
+* Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 1.18.1-2
+- Don't ship .la files
+
 * Mon Apr  9 2007 Matthias Clasen <mclasen at redhat.com> - 1.18.1-1
 - Update to 1.18.1, which includes the previous patch
 - Drop obsolete patch



From fedora-cvs-commits at redhat.com  Sun Apr 22 08:52:12 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 22 Apr 2007 04:52:12 -0400
Subject: rpms/gdb/devel gdbcompare,1.3,1.4
Message-ID: <200704220852.l3M8qCjV001562@cvs.devel.redhat.com>

Author: jkratoch

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1394

Modified Files:
	gdbcompare 
Log Message:
Permit excessive files with just a warning.



Index: gdbcompare
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdbcompare,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gdbcompare	9 Jan 2007 11:34:40 -0000	1.3
+++ gdbcompare	22 Apr 2007 08:52:09 -0000	1.4
@@ -20,12 +20,15 @@
 closedir DIR or die "closedir: $!";
 
 for (values(%arch)) {
-	die "Not 2 elements:\n".Dumper($_) if 2!=@$_;
+	next if 2==@$_;
+	warn "Single element: ".${$_}[0]."\n" if 1==@$_;
+	die "Not 2 elements:\n".Dumper($_) if 1!=@$_;
 }
 
 system("rm -f tests/gdbcompare-*.diff") and die;
 
 for my $arch (sort keys(%arch)) {
+	next if 2!=@{$arch{$arch}};
 	sub trans { return {"."=>0,"-"=>1}->{($_[0]=~/([-.])[^-.]+[.]\w+$/)[0]}.$_[0]; };
 	my @sorted=sort { my $a1=trans $a; my $b1=trans $b; ($b1 cmp $a1) * ($reverse ? -1 : 1); } @{$arch{$arch}};
 	do { system $_ and die $_; } for "diff -u tests/'".$sorted[1]."' tests/'".$sorted[0]."' >tests/gdbcompare-'$arch'.diff;true";



From fedora-cvs-commits at redhat.com  Sun Apr 22 13:13:54 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 22 Apr 2007 09:13:54 -0400
Subject: rpms/gdb/devel gdb-6.6-bz229517-gcore-without-terminal.patch, NONE,
	1.1 gdb-6.6-bz237096-watchthreads-testcasefix.patch, NONE,
	1.1 gdb-6.6-libunwind-major-version.patch, NONE, 1.1 gdb.spec,
	1.225, 1.226
Message-ID: <200704221313.l3MDDssj031690@cvs.devel.redhat.com>

Author: jkratoch

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31584

Modified Files:
	gdb.spec 
Added Files:
	gdb-6.6-bz229517-gcore-without-terminal.patch 
	gdb-6.6-bz237096-watchthreads-testcasefix.patch 
	gdb-6.6-libunwind-major-version.patch 
Log Message:
* Sun Apr 22 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-9
- Allow running `/usr/bin/gcore' with provided but inaccessible tty (BZ 229517).
- Fix testcase for watchpoints in threads (for BZ 237096).
- BuildRequires now `libunwind-devel' instead of the former `libunwind'.
- Use the runtime libunwind .so.7, it requires now >= 0.99-0.1.frysk20070405cvs.
- Resolves: rhbz#229517
- Related: rhbz#237096


gdb-6.6-bz229517-gcore-without-terminal.patch:
 ./gdb/testsuite/gdb.base/gcorebg.c   |   43 ++++++++++++
 ./gdb/testsuite/gdb.base/gcorebg.exp |  120 +++++++++++++++++++++++++++++++++++
 gdb/gdb_gcore.sh                     |    4 -
 3 files changed, 166 insertions(+), 1 deletion(-)

--- NEW FILE gdb-6.6-bz229517-gcore-without-terminal.patch ---
2007-04-22  Jan Kratochvil <jan.kratochvil at redhat.com>

	* gdb_gcore.sh: Redirect GDB from `</dev/null'.

2007-04-22  Jan Kratochvil <jan.kratochvil at redhat.com>

	* gdb.base/gcorebg.exp, gdb.base/gcorebg.c: New files.


--- gdb-6.6-orig/gdb/gdb_gcore.sh	2005-12-17 17:33:59.000000000 -0500
+++ gdb-6.6/gdb/gdb_gcore.sh	2007-04-22 05:42:50.000000000 -0400
@@ -71,7 +71,9 @@
 quit
 EOF
 
-	gdb -x $tmpfile -batch
+	# `</dev/null' to avoid touching interactive terminal if it is
+	# available but not accessible (SIGTTIN risk)
+	gdb -x $tmpfile -batch </dev/null
 
 	if [ -r $name.$pid ] ; then 
 	    rc=0
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ./gdb/testsuite/gdb.base/gcorebg.c	25 Feb 2007 12:21:20 -0000
@@ -0,0 +1,43 @@
+#include <stdio.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <signal.h>
+
+int main (int argc, char **argv)
+{
+  pid_t pid = 0;
+  pid_t ppid;
+  char buf[256];
+
+  if (argc != 4)
+    {
+      fprintf (stderr, "Syntax: %s {standard|detached} <gcore command> <core output file>\n",
+	       argv[0]);
+      exit (1);
+    }
+
+  pid = fork ();
+
+  switch (pid)
+    {
+      case 0:
+        if (strcmp (argv[1], "detached") == 0)
+	  setpgrp ();
+	ppid = getppid ();
+	sprintf (buf, "sh %s -o %s %d", argv[2], argv[3], (int) ppid);
+	system (buf);
+	kill (ppid, SIGTERM);
+	break;
+
+      case -1:
+	perror ("fork err\n");
+	exit (1);
+	break;
+
+      default:
+	sleep (60);
+    }
+
+  return 0;
+}
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ./gdb/testsuite/gdb.base/gcorebg.exp	25 Feb 2007 12:21:20 -0000
@@ -0,0 +1,120 @@
+# Copyright 2007 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.  
+
+# Please email any bugs, comments, and/or additions to this file to:
+# bug-gdb at prep.ai.mit.edu
+
+# This file was written by Jan Kratochvil <jan.kratochvil at redhat.com>.
+# This is a test for `gdb_gcore.sh' functionality.
+# It also tests a regression with `gdb_gcore.sh' being run without its
+# accessible terminal.
+
+if $tracelevel then {
+	strace $tracelevel
+}
+
+set prms_id 0
+set bug_id 0
+
+if ![info exists GCORE] {
+    set GCORE "${srcdir}/../gdb_gcore.sh"
+}
+verbose "using GCORE = $GCORE" 2
+
+set testfile "gcorebg"
+set srcfile  ${testfile}.c
+set binfile  ${objdir}/${subdir}/${testfile}
+set corefile ${objdir}/${subdir}/${testfile}.test
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
+     untested gcorebg.exp
+     return -1
+}
+
+# Cleanup.
+
+proc core_clean {} {
+    global corefile
+
+    foreach file [glob -nocomplain [join [list $corefile *] ""]] {
+	verbose "Delete file $file" 1
+	remote_file target delete $file
+    }
+}
+core_clean
+remote_file target delete "./gdb"
+
+# Generate the core file.
+
+# Provide `./gdb' for `gdb_gcore.sh' running it as a bare `gdb' command.
+# Setup also `$PATH' appropriately.
+# If GDB was not found let `gdb_gcore.sh' to find the system GDB by `$PATH'.
+if {$GDB != "gdb"} {
+    file link ./gdb $GDB
+}
+global env
+set oldpath $env(PATH)
+set env(PATH) [join [list . $env(PATH)] ":"]
+verbose "PATH = $env(PATH)" 2
+
+# Test file body.
+# $detached == "standard" || $detached == "detached"
+
+proc test_body { detached } {
+    global binfile
+    global GCORE
+    global corefile
+
+    set res [remote_spawn target "$binfile $detached $GCORE $corefile"]
+    if { $res < 0 || $res == "" } {
+	fail "Spawning $detached gcore"
+	return 1
+    }
+    pass "Spawning $detached gcore"
+    remote_expect target 20 {
+	timeout {
+	    fail "Spawned $detached gcore finished"
+	    remote_exec target "kill -9 -[exp_pid -i $res]"
+	    return 1
+	}
+	eof {
+	    pass "Spawned $detached gcore finished"
+	    remote_wait target 20
+	}
+    }
+
+    if {1 == [llength [glob -nocomplain [join [list $corefile *] ""]]]} {
+	pass "Core file generated by $detached gcore"
+    } else {
+	fail "Core file generated by $detached gcore"
+    }
+    core_clean
+}
+
+# First a general `gdb_gcore.sh' spawn with its controlling terminal available.
+
+test_body standard
+
+# And now `gdb_gcore.sh' spawn without its controlling terminal available.
+# It is spawned through `gcorebg.c' using setpgrp ().
+
+test_body detached
+
+
+# Cleanup.
+
+set env(PATH) $oldpath
+remote_file target delete "./gdb"

gdb-6.6-bz237096-watchthreads-testcasefix.patch:
 watchthreads.exp |   39 ++++++++++++++++++++++++++++-----------
 1 files changed, 28 insertions(+), 11 deletions(-)

--- NEW FILE gdb-6.6-bz237096-watchthreads-testcasefix.patch ---
TODO: ./gdb/testsuite/gdb.threads/watchthreads2.exp

It applies only to recent (~2.6.20) Linux kernels, on RHEL4 the behavior is not
changed (and this patch has no effect there).


--- ./gdb/testsuite/gdb.threads/watchthreads.exp	9 Jan 2007 17:59:14 -0000	1.3
+++ ./gdb/testsuite/gdb.threads/watchthreads.exp	20 Apr 2007 19:11:01 -0000
@@ -65,25 +65,42 @@ set inc_line [gdb_get_line_number "Loop 
 
 # Loop and continue to allow both watchpoints to be triggered.
 for {set i 0} {$i < 30} {incr i} {
-  set test_flag 0
+  set test_flag_0 0
+  set test_flag_1 0
   gdb_test_multiple "continue" "threaded watch loop" {
-    -re "Hardware watchpoint 2: args\\\[0\\\].*Old value = 0.*New value = 1.*main \\\(\\\) at .*watchthreads.c:$init_line.*$gdb_prompt $"
-       { set args_0 1; set test_flag 1 }
-    -re "Hardware watchpoint 3: args\\\[1\\\].*Old value = 0.*New value = 1.*main \\\(\\\) at .*watchthreads.c:$init_line.*$gdb_prompt $"
-       { set args_1 1; set test_flag 1 }
-    -re "Hardware watchpoint 2: args\\\[0\\\].*Old value = $args_0.*New value = [expr $args_0+1].*in thread_function \\\(arg=0x0\\\) at .*watchthreads.c:$inc_line.*$gdb_prompt $"
-       { set args_0 [expr $args_0+1]; set test_flag 1 }
-    -re "Hardware watchpoint 3: args\\\[1\\\].*Old value = $args_1.*New value = [expr $args_1+1].*in thread_function \\\(arg=0x1\\\) at .*watchthreads.c:$inc_line.*$gdb_prompt $"
-       { set args_1 [expr $args_1+1]; set test_flag 1 }
+    -re "(.*)$gdb_prompt $" {
+      set test_flag_1 1
+      set string $expect_out(1,string)
+      foreach match [regexp -nocase -all -inline "Hardware watchpoint .*? at .*?watchthreads.c:\[0-9\]*\r" $string] {
+	# FIXME: Test also for the trailing: \[^\r\]*main \\\(\\\) at .*?watchthreads.c:$init_line\r
+	# We cannot test the line position as we do not get it for the
+	# non-active threads (not being last in the list).
+	if [regexp "Hardware watchpoint 2: args\\\[0\\\]\[^\r\]*\r\[^\r\]*\r\[^\r\]*Old value = 0\[^\r\]*\r\[^\r\]*New value = 1\r" $match] {
+	  set args_0 1; set test_flag_0 1
+	}
+	# FIXME: Test also for the trailing: \[^\r\]*main \\\(\\\) at .*?watchthreads.c:$init_line\r
+	if [regexp "Hardware watchpoint 3: args\\\[1\\\]\[^\r\]*\r\[^\r\]*\r\[^\r\]*Old value = 0\[^\r\]*\r\[^\r\]*New value = 1\r" $match] {
+	  set args_1 1; set test_flag_0 1
+	}
+	# FIXME: Test also for the trailing: \[^\r\]*thread_function \\\(arg=0x0\\\) at .*?watchthreads.c:$inc_line\r
+	if [regexp "Hardware watchpoint 2: args\\\[0\\\]\[^\r\]*\r\[^\r\]*\r\[^\r\]*Old value = $args_0\[^\r\]*\r\[^\r\]*New value = [expr $args_0+1]\r" $match] {
+	  set args_0 [expr $args_0+1]; set test_flag_0 1
+	}
+	# FIXME: Test also for the trailing: \[^\r\]*thread_function \\\(arg=0x0\\\) at .*?watchthreads.c:$inc_line\r
+	if [regexp "Hardware watchpoint 3: args\\\[1\\\]\[^\r\]*\r\[^\r\]*\r\[^\r\]*Old value = $args_1\[^\r\]*\r\[^\r\]*New value = [expr $args_1+1]\r" $match] {
+	  set args_1 [expr $args_1+1]; set test_flag_0 1
+	}
+      }
+    }
   }
   # If we fail above, don't bother continuing loop
-  if { $test_flag == 0 } {
+  if { $test_flag_0 == 0 || $test_flag_1 == 0 } {
     set i 30;
   }
 }
 
 # Print success message if loop succeeded.
-if { $test_flag == 1 } {
+if { $test_flag_0 == 1 && $test_flag_1 == 1 } {
   pass "threaded watch loop"
 }
 

gdb-6.6-libunwind-major-version.patch:
 libunwind-frame.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE gdb-6.6-libunwind-major-version.patch ---
--- gdb-6.6-orig/gdb/libunwind-frame.c	2007-04-08 20:49:09.000000000 +0200
+++ gdb-6.6/gdb/libunwind-frame.c	2007-04-10 23:45:22.000000000 +0200
@@ -74,7 +74,9 @@
 #define STRINGIFY(name)		STRINGIFY2(name)
 
 #ifndef LIBUNWIND_SO
-#define LIBUNWIND_SO "libunwind-" STRINGIFY(UNW_TARGET) ".so"
+/* Use the stable ABI major version number.  `libunwind-ia64.so' is a link time
+   only library, not a runtime one.  */
+#define LIBUNWIND_SO "libunwind-" STRINGIFY(UNW_TARGET) ".so.7"
 #endif
 
 static char *get_reg_name = STRINGIFY(UNW_OBJ(get_reg));


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- gdb.spec	24 Mar 2007 08:55:33 -0000	1.225
+++ gdb.spec	22 Apr 2007 13:13:52 -0000	1.226
@@ -11,7 +11,7 @@
 Version: 6.6
 
 # The release always contains a leading reserved number, start it at 1.
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -317,6 +317,15 @@
 # Use definition of an empty structure as it is not an opaque type (BZ 233716).
 Patch238: gdb-6.6-bz233716-empty-structure-override.patch
 
+# Use the runtime variant of `libunwind-ARCH.so.7' rather than the `.so' one.
+Patch244: gdb-6.6-libunwind-major-version.patch
+
+# Allow running `/usr/bin/gcore' with provided but inaccessible tty (BZ 229517).
+Patch245: gdb-6.6-bz229517-gcore-without-terminal.patch
+
+# Fix testcase for watchpoints in threads (for BZ 237096).
+Patch246: gdb-6.6-bz237096-watchthreads-testcasefix.patch
+
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
 BuildRequires: flex bison sharutils
 
@@ -327,8 +336,8 @@
 %endif
 
 %ifarch ia64
-BuildRequires: libunwind >= 0.96-3
-Requires: libunwind >= 0.96-3
+BuildRequires: libunwind-devel >= 0.99-0.1.frysk20070405cvs
+Requires: libunwind >= 0.99-0.1.frysk20070405cvs
 %else
 BuildRequires: prelink
 %endif
@@ -445,6 +454,9 @@
 %patch235 -p1
 %patch236 -p1
 %patch238 -p1
+%patch244 -p1
+%patch245 -p1
+%patch246 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -483,13 +495,19 @@
 enable_build_warnings="--enable-gdb-build-warnings=,-Werror"
 %endif
 
-../configure \
-	--prefix=%{_prefix} \
-	--sysconfdir=%{_sysconfdir} \
-	--mandir=%{_mandir} \
-	--infodir=%{_infodir}\
-	$enable_build_warnings \
-        --with-separate-debug-dir=/usr/lib/debug \
+../configure						\
+	--prefix=%{_prefix}				\
+	--libdir=%{_libdir}				\
+	--sysconfdir=%{_sysconfdir}			\
+	--mandir=%{_mandir}				\
+	--infodir=%{_infodir}				\
+	$enable_build_warnings				\
+	--with-separate-debug-dir=/usr/lib/debug	\
+%ifarch ia64
+	--with-libunwind				\
+%else
+	--without-libunwind				\
+%endif
     %{_target_platform}
 
 make -k
@@ -607,6 +625,12 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Sun Apr 22 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-9
+- Allow running `/usr/bin/gcore' with provided but inaccessible tty (BZ 229517).
+- Fix testcase for watchpoints in threads (for BZ 237096).
+- BuildRequires now `libunwind-devel' instead of the former `libunwind'.
+- Use the runtime libunwind .so.7, it requires now >= 0.99-0.1.frysk20070405cvs.
+
 * Sat Mar 24 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-8
 - Use definition of an empty structure as it is not an opaque type (BZ 233716).
 - Fixed the gdb.base/attachstop.exp testcase false 2 FAILs.



From fedora-cvs-commits at redhat.com  Sun Apr 22 13:30:54 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 22 Apr 2007 09:30:54 -0400
Subject: rpms/libunwind/devel libunwind.spec,1.21,1.22
Message-ID: <200704221330.l3MDUsV6010524@cvs.devel.redhat.com>

Author: jkratoch

Update of /cvs/dist/rpms/libunwind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10412

Modified Files:
	libunwind.spec 
Log Message:
* Sun Apr 22 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 0.99-0.2.frysk20070405cvs
- Require conflict with gdb < gdb-6.6-9 as it would not find `libunwind.so'.
- Fixed (unused - commented) rule for a RPM build with embedded debug info.



Index: libunwind.spec
===================================================================
RCS file: /cvs/dist/rpms/libunwind/devel/libunwind.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libunwind.spec	5 Apr 2007 22:17:46 -0000	1.21
+++ libunwind.spec	22 Apr 2007 13:30:46 -0000	1.22
@@ -1,13 +1,14 @@
 # Define this if you want to skip the strip step and preserve debug info.
 # Useful for testing. 
-#define __spec_install_post /usr/lib/rpm/brp-compress || :
+#define __debug_install_post : > %{_builddir}/%{?buildsubdir}/debugfiles.list
+
 Summary: An unwinding library
 Name: libunwind
 # Latest libunwind release.
 Version: 0.99
 %define frysksnap 20070405cvs
 %define upstreamsnap 070224
-Release: 0.1.frysk%{frysksnap}%{?dist}
+Release: 0.2.frysk%{frysksnap}%{?dist}
 License: BSD
 Group: Development/Debuggers
 Source: http://download.savannah.nongnu.org/releases/libunwind/libunwind-snap-%{upstreamsnap}.tar.gz
@@ -18,6 +19,7 @@
 
 BuildRequires: glibc gcc make tar gzip
 BuildRequires: automake libtool autoconf
+Conflicts: gdb < 6.6-9
 
 %description
 Libunwind provides a C ABI to determine the call-chain of a program.
@@ -75,6 +77,10 @@
 %{_includedir}/*
 
 %changelog
+* Sun Apr 22 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 0.99-0.2.frysk20070405cvs
+- Require conflict with gdb < gdb-6.6-9 as it would not find `libunwind.so'.
+- Fixed (unused - commented) rule for a RPM build with embedded debug info.
+
 * Thu Apr  5 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 0.99-0.1.frysk20070405cvs
 - Update to the upstream snapshot snap-070224.
 - Use the Frysk's modified version, currently snapshot 20070405cvs.



From fedora-cvs-commits at redhat.com  Sun Apr 22 14:23:08 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 22 Apr 2007 10:23:08 -0400
Subject: rpms/samba/devel .cvsignore, 1.36, 1.37 samba.spec, 1.112,
	1.113 sources, 1.38, 1.39 samba-3-0-25rc1-bugday-apr10.patch,
	1.1, NONE samba3_idmap_loop.patch, 1.1,
	NONE samba3_idmap_offline.patch, 1.1, NONE
Message-ID: <200704221423.l3MEN8nV010870@cvs.devel.redhat.com>

Author: ssorce

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10854

Modified Files:
	.cvsignore samba.spec sources 
Removed Files:
	samba-3-0-25rc1-bugday-apr10.patch samba3_idmap_loop.patch 
	samba3_idmap_offline.patch 
Log Message:

Update to rc2
remove patches that have been integrated upstream




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	10 Apr 2007 13:50:53 -0000	1.36
+++ .cvsignore	22 Apr 2007 14:23:05 -0000	1.37
@@ -1 +1,2 @@
 samba-3.0.25rc1.tar.gz
+samba-3.0.25rc2.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- samba.spec	19 Apr 2007 16:35:53 -0000	1.112
+++ samba.spec	22 Apr 2007 14:23:05 -0000	1.113
@@ -2,13 +2,13 @@
 Name: samba
 Epoch: 0
 Version: 3.0.25
-Release: 0.7.rc1%{?dist}.3
+Release: 0.1.rc2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.samba.org/
 
 #TAG: change for non-pre
-Source: http://www.samba.org/samba/ftp/rc/%{name}-%{version}rc1.tar.gz
+Source: http://www.samba.org/samba/ftp/rc/%{name}-%{version}rc2.tar.gz
 #Source: http://www.samba.org/samba/ftp/samba/%{name}-%{version}.tar.gz
 
 # Red Hat specific replacement-files
@@ -46,9 +46,6 @@
 #Patch112: samba-3.0.15pre2-bug106483.patch
 #Patch113: samba-3.0.21-warnings.patch
 Patch200: samba-3.0.25rc1-inotifiy.patch
-Patch201: samba-3-0-25rc1-bugday-apr10.patch
-Patch202: samba3_idmap_loop.patch
-Patch203: samba3_idmap_offline.patch
 
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
@@ -141,7 +138,7 @@
 
 %prep
 # TAG: change for non-pre
-%setup -q -n samba-3.0.25rc1
+%setup -q -n samba-3.0.25rc2
 #%setup -q 
 
 # copy Red Hat specific scripts
@@ -171,9 +168,6 @@
 #%patch112 -p1 -b .bug106483
 #%patch113 -p1 -b .warnings
 %patch200 -p0 -b .inotify
-%patch201 -p0 -b .bugday
-%patch202 -p0 -b .idmap_loop
-%patch203 -p0 -b .idmap_offline
 
 # crap
 rm -f examples/VFS/.cvsignore
@@ -580,6 +574,7 @@
 %{_bindir}/tdbtool
 %{_sbindir}/winbindd
 %{_libdir}/samba/idmap
+%{_libdir}/samba/nss_info
 %dir /var/lib/samba
 %attr(700,root,root) %dir /var/lib/samba/private
 %dir /var/run/winbindd


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	10 Apr 2007 13:50:53 -0000	1.38
+++ sources	22 Apr 2007 14:23:06 -0000	1.39
@@ -1 +1,2 @@
 23690bd9f12eae1dd2c54a1cc3cae8fb  samba-3.0.25rc1.tar.gz
+bd45fee528ab4cb6adea1a97e71e9d8c  samba-3.0.25rc2.tar.gz


--- samba-3-0-25rc1-bugday-apr10.patch DELETED ---


--- samba3_idmap_loop.patch DELETED ---


--- samba3_idmap_offline.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sun Apr 22 20:16:06 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 22 Apr 2007 16:16:06 -0400
Subject: rpms/gdb/devel gdb-6.6-bz234468-fork-detach-info.patch, NONE,
	1.1 gdb.spec, 1.226, 1.227
Message-ID: <200704222016.l3MKG6Ee015790@cvs.devel.redhat.com>

Author: jkratoch

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15774

Modified Files:
	gdb.spec 
Added Files:
	gdb-6.6-bz234468-fork-detach-info.patch 
Log Message:
* Sun Apr 22 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-10
- Notify user of a child forked process being detached (BZ 235197).
- Resolves: rhbz#235197


gdb-6.6-bz234468-fork-detach-info.patch:
 linux-nat.c                        |   10 +++++-
 testsuite/gdb.base/fork-detach.c   |   57 +++++++++++++++++++++++++++++++++++++
 testsuite/gdb.base/fork-detach.exp |   43 +++++++++++++++++++++++++++
 3 files changed, 109 insertions(+), 1 deletion(-)

--- NEW FILE gdb-6.6-bz234468-fork-detach-info.patch ---
--- ./gdb/linux-nat.c	9 Feb 2007 20:52:16 -0000	1.56
+++ ./gdb/linux-nat.c	22 Apr 2007 17:20:25 -0000
@@ -378,9 +378,17 @@ child_follow_fork (struct target_ops *op
       /* Detach new forked process?  */
       if (detach_fork)
 	{
+	  static int advice_printed = 0;
+
+	  target_terminal_ours ();
+	  fprintf_filtered (gdb_stdlog,
+			 _("[Detaching after fork from child process %d.%s]\n"),
+			    child_pid, (advice_printed ? "" :
+					_(" (Try `set detach-on-fork off'.)")));
+	  advice_printed = 1;
+
 	  if (debug_linux_nat)
 	    {
-	      target_terminal_ours ();
 	      fprintf_filtered (gdb_stdlog,
 				"Detaching after fork from child process %d.\n",
 				child_pid);
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ./gdb/testsuite/gdb.base/fork-detach.c	22 Apr 2007 17:20:25 -0000
@@ -0,0 +1,57 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2007 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.
+
+   Please email any bugs, comments, and/or additions to this file to:
+   bug-gdb at prep.ai.mit.edu  */
+
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <assert.h>
+#include <stdlib.h>
+
+static void func (void)
+{
+}
+
+int main (void)
+{
+  pid_t child;
+
+  child = fork ();
+  switch (child)
+    {
+      case -1:
+	abort ();
+      case 0:
+	func ();
+	break;
+      default:
+        {
+/* We do not test the switching to the other fork by GDB `fork 1'.  */
+#if 0
+	  pid_t got;
+
+	  got = waitpid (child, NULL, 0);
+	  assert (got == child);
+#endif
+	  break;
+	}
+    }
+  return 0;
+}
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ./gdb/testsuite/gdb.base/fork-detach.exp	22 Apr 2007 17:20:25 -0000
@@ -0,0 +1,43 @@
+# Copyright 2007 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.  
+
+if $tracelevel then {
+    strace $tracelevel
+}
+
+set prms_id 0
+set bug_id 0
+
+set testfile fork-detach
+set srcfile ${testfile}.c
+set binfile ${objdir}/${subdir}/${testfile}
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
+    untested "Couldn't compile test program"
+    return -1
+}
+
+# Get things started.
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+
+gdb_run_cmd
+# `Starting program: .*' prefix is available since gdb-6.7.
+gdb_test "" \
+         "\\\[Detaching after fork from child process.*Program exited normally\\..*" \
+         "Info message caught"


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- gdb.spec	22 Apr 2007 13:13:52 -0000	1.226
+++ gdb.spec	22 Apr 2007 20:16:04 -0000	1.227
@@ -11,7 +11,7 @@
 Version: 6.6
 
 # The release always contains a leading reserved number, start it at 1.
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -326,6 +326,9 @@
 # Fix testcase for watchpoints in threads (for BZ 237096).
 Patch246: gdb-6.6-bz237096-watchthreads-testcasefix.patch
 
+# Notify user of a child forked process being detached (BZ 235197).
+Patch247: gdb-6.6-bz234468-fork-detach-info.patch
+
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
 BuildRequires: flex bison sharutils
 
@@ -457,6 +460,7 @@
 %patch244 -p1
 %patch245 -p1
 %patch246 -p1
+%patch247 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -625,6 +629,9 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Sun Apr 22 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-10
+- Notify user of a child forked process being detached (BZ 235197).
+
 * Sun Apr 22 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-9
 - Allow running `/usr/bin/gcore' with provided but inaccessible tty (BZ 229517).
 - Fix testcase for watchpoints in threads (for BZ 237096).



From fedora-cvs-commits at redhat.com  Mon Apr 23 00:30:41 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 22 Apr 2007 20:30:41 -0400
Subject: rpms/libchewing/devel libchewing-0.3.0-7.bz237233.patch,NONE,1.1
Message-ID: <200704230030.l3N0UfYU031316@cvs.devel.redhat.com>

Author: cchance

Update of /cvs/dist/rpms/libchewing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31297

Added Files:
	libchewing-0.3.0-7.bz237233.patch 
Log Message:
* Fri Apr 20 2007 Caius Chance <cchance at redhat.com> - 0.3.0-7.fc7
- Fixed bz#237233: Up arrow on candidate list doesn't work.


libchewing-0.3.0-7.bz237233.patch:
 chewingio.c |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

--- NEW FILE libchewing-0.3.0-7.bz237233.patch ---
--- libchewing-0.3.0/src/chewingio.c.orig	2007-04-20 17:05:06.000000000 +1000
+++ libchewing-0.3.0/src/chewingio.c	2007-04-20 17:01:46.000000000 +1000
@@ -567,7 +567,9 @@
 {
 	ChewingData *pgdata = ctx->data;
 	ChewingOutput *pgo = ctx->output;
-	int keystrokeRtn = KEYSTROKE_ABSORB;
+	int toSelect = 0;
+ 	int keystrokeRtn = KEYSTROKE_ABSORB;
+	int key_buf_cursor;
 
 	CheckAndResetRange( pgdata );
 
@@ -575,8 +577,14 @@
 		keystrokeRtn = KEYSTROKE_IGNORE;
 	}
 
-	if ( pgdata->bSelect )
-		ChoicePrevAvail( pgdata );
+	key_buf_cursor = pgdata->chiSymbolCursor;
+	if ( pgdata->chiSymbolCursor == pgdata->chiSymbolBufLen )
+		key_buf_cursor--;
+
+        if ( ! pgdata->symbolKeyBuf[ key_buf_cursor ] ) {
+		/* Close Symbol Choice List */
+        	chewing_handle_Esc(ctx);
+	}
 
 	MakeOutputWithRtn( pgo, pgdata, keystrokeRtn );
 	return 0;



From fedora-cvs-commits at redhat.com  Mon Apr 23 00:58:38 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 22 Apr 2007 20:58:38 -0400
Subject: rpms/evolution/devel evolution-2.10.1-fix-uri-handling.patch, NONE,
	1.1 evolution.spec, 1.247, 1.248
Message-ID: <200704230058.l3N0wcZs031469@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.10.1-fix-uri-handling.patch 
Log Message:

* Sun Apr 22 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-6.fc7
- Add patch for RH bug #236860 (launching from clock applet).


evolution-2.10.1-fix-uri-handling.patch:
 e-shell.c |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)

--- NEW FILE evolution-2.10.1-fix-uri-handling.patch ---
--- evolution-2.10.1/shell/e-shell.c.fix-uri-handling	2007-04-22 20:19:39.000000000 -0400
+++ evolution-2.10.1/shell/e-shell.c	2007-04-22 20:20:25.000000000 -0400
@@ -257,8 +257,8 @@
 {
 	EShell *shell = E_SHELL (bonobo_object_from_servant (servant));
 	EComponentInfo *component_info;
+	GtkWidget *shell_window;
 	char *schema, *p;
-	int show = FALSE;
 
 	schema = g_alloca(strlen(uri)+1);
 	strcpy(schema, uri);
@@ -267,26 +267,20 @@
 		*p = 0;
 
  	component_info = e_component_registry_peek_info(shell->priv->component_registry, ECR_FIELD_SCHEMA, schema);
-	if (component_info == NULL) {
-		show = TRUE;
+	if (component_info == NULL)
 		component_info = e_component_registry_peek_info(shell->priv->component_registry, ECR_FIELD_ALIAS, schema);
-	}
 
 	if (component_info == NULL) {
 		CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_UnsupportedSchema, NULL);
 		return;
 	}
 
-	if (show) {
-		GtkWidget *shell_window;
-		
-		shell_window = (GtkWidget *)e_shell_create_window (shell, component_info->id, NULL);
-		if (shell_window == NULL) {
-			CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_ComponentNotFound, NULL);
-			return;
-		}
+	shell_window = (GtkWidget *)e_shell_create_window (shell, component_info->id, NULL);
+	if (shell_window == NULL) {
+		CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_ComponentNotFound, NULL);
+		return;
 	}
-	
+
 	GNOME_Evolution_Component_handleURI (component_info->iface, uri, ev);
 	/* not an error not to implement it */
 	if (ev->_id != NULL && strcmp(ev->_id, ex_CORBA_NO_IMPLEMENT) == 0)


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- evolution.spec	22 Apr 2007 00:52:35 -0000	1.247
+++ evolution.spec	23 Apr 2007 00:58:36 -0000	1.248
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -161,12 +161,15 @@
 # GNOME bug #427939 (gnome-doc-utils)
 Patch48: evolution-2.10.1-fix-gnome-doc-utils.patch
 
-# RH bug 235878 / GNOME bug #386503
+# RH bug #235878 / GNOME bug #386503
 Patch49: evolution-2.10.1-fix-help.patch
 
-# RH bug 234315 / GNOME bug #423766
+# RH bug #234315 / GNOME bug #423766
 Patch50: evolution-2.10.1-saving-attachments.patch
 
+# RH bug #236860 / GNOME bug #407104
+Patch51: evolution-2.10.1-fix-uri-handling.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -322,6 +325,7 @@
 %patch48 -p1 -b .fix-gnome-doc-utils
 %patch49 -p1 -b .fix-help
 %patch50 -p1 -b .saving-attachments
+%patch51 -p1 -b .fix-uri-handling
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -738,6 +742,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Sun Apr 22 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-6.fc7
+- Add patch for RH bug #236860 (launching from clock applet).
+
 * Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 2.10.1-5
 - Don't install INSTALL
 



From fedora-cvs-commits at redhat.com  Mon Apr 23 04:26:40 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 00:26:40 -0400
Subject: rpms/fedora-logos/devel fedora-logos.spec,1.66,1.67
Message-ID: <200704230426.l3N4Qe7l013480@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/fedora-logos/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13465

Modified Files:
	fedora-logos.spec 
Log Message:
Clean up %post



Index: fedora-logos.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- fedora-logos.spec	20 Apr 2007 07:00:09 -0000	1.66
+++ fedora-logos.spec	23 Apr 2007 04:26:32 -0000	1.67
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
 Version: 6.0.98
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
 License: Copyright ? 1999-2007 Red Hat, Inc.  All rights reserved.
@@ -159,13 +159,13 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create $RPM_BUILD_ROOT%{_datadir}/icons/hicolor || :
-touch --no-create $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve || :
-touch --no-create $RPM_BUILD_ROOT%{_datadir}/icons/Fedora || :
+touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/Bluecurve || :
+touch --no-create %{_datadir}/icons/Fedora || :
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache --quiet $RPM_BUILD_ROOT%{_datadir}/icons/hicolor || :
-  gtk-update-icon-cache --quiet $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve || :
-  gtk-update-icon-cache --quiet $RPM_BUILD_ROOT%{_datadir}/icons/Fedora || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/Bluecurve || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/Fedora || :
 fi
 
 %files
@@ -195,6 +195,9 @@
 # end i386 bits
 
 %changelog
+* Mon Apr 23 2007 Matthias Clasen <mclasen at redhat.com> - 6.0.98-3
+- Clean up %%post scriptlet (#237428)
+
 * Fri Apr 20 2007 Matthias Clasen <mclasen at redhat.com> - 6.0.98-2
 - Add a Fedora icon theme
 



From fedora-cvs-commits at redhat.com  Mon Apr 23 06:48:20 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 02:48:20 -0400
Subject: rpms/openldap/FC-6 openldap.spec,1.64,1.65
Message-ID: <200704230648.l3N6mKI2029744@cvs.devel.redhat.com>

Author: jsafrane

Update of /cvs/dist/rpms/openldap/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv26639

Modified Files:
	openldap.spec 
Log Message:
Do not delete database in %preun if there is update in progress (bz#230959)



Index: openldap.spec
===================================================================
RCS file: /cvs/dist/rpms/openldap/FC-6/openldap.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- openldap.spec	28 Nov 2006 22:28:41 -0000	1.64
+++ openldap.spec	23 Apr 2007 06:48:18 -0000	1.65
@@ -599,21 +599,20 @@
 if [ "$1" = "0" ] ; then
 	/sbin/service ldap stop > /dev/null 2>&1 || :
 	/sbin/chkconfig --del ldap
-fi
-# See if slapd has been configured and (ever) started
-files=$(echo /var/lib/ldap/{[a]lock,*.bdb,*.dbd,log.*,__db.*})
-if [ "$files" != '/var/lib/ldap/[a]lock /var/lib/ldap/*.bdb /var/lib/ldap/*.dbd /var/lib/ldap/log.* /var/lib/ldap/__db.*' ] ; then
-	# Save an ldif of the database where the "% post servers" scriptlet can
-	# restore it.  Also save the database files to a "rpmorig" directory
-	# Just In Case (TM)
-	if /sbin/runuser -m -s /usr/sbin/slapcat -- ldap -l /var/lib/ldap/upgrade.ldif > /dev/null 2>&1 ; then
-		if [ -s /var/lib/ldap/upgrade.ldif ] ; then
-			/bin/rm -fr /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
-			mkdir /var/lib/ldap/rpmorig
-			mv /var/lib/ldap/{alock,*.bdb,__db.*,log.*} /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
-			cp -f /var/lib/ldap/DB_CONFIG /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
-		else
-			/bin/rm -f /var/lib/ldap/upgrade.ldif
+	# See if slapd has been configured and (ever) started
+	files=$(echo /var/lib/ldap/{[a]lock,*.bdb,*.dbd,log.*,__db.*})
+	if [ "$files" != '/var/lib/ldap/[a]lock /var/lib/ldap/*.bdb /var/lib/ldap/*.dbd /var/lib/ldap/log.* /var/lib/ldap/__db.*' ] ; then
+		# Save an ldif of the database. Also save the database files to a "rpmorig" directory
+		# Just In Case (TM)
+		if /sbin/runuser -m -s /usr/sbin/slapcat -- ldap -l /var/lib/ldap/upgrade.ldif > /dev/null 2>&1 ; then
+			if [ -s /var/lib/ldap/upgrade.ldif ] ; then
+				/bin/rm -fr /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
+				mkdir /var/lib/ldap/rpmorig
+				mv /var/lib/ldap/{alock,*.bdb,__db.*,log.*} /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
+				cp -f /var/lib/ldap/DB_CONFIG /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
+			else
+				/bin/rm -f /var/lib/ldap/upgrade.ldif
+			fi
 		fi
 	fi
 fi



From fedora-cvs-commits at redhat.com  Mon Apr 23 06:52:00 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 02:52:00 -0400
Subject: rpms/openldap/FC-5 openldap.spec,1.55,1.56
Message-ID: <200704230652.l3N6q09N032374@cvs.devel.redhat.com>

Author: jsafrane

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

Modified Files:
	openldap.spec 
Log Message:
Do not delete database in %preun if there is update in progress (bz#230959)



Index: openldap.spec
===================================================================
RCS file: /cvs/dist/rpms/openldap/FC-5/openldap.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- openldap.spec	28 Nov 2006 20:49:28 -0000	1.55
+++ openldap.spec	23 Apr 2007 06:51:58 -0000	1.56
@@ -600,21 +600,20 @@
 if [ "$1" = "0" ] ; then
 	/sbin/service ldap stop > /dev/null 2>&1 || :
 	/sbin/chkconfig --del ldap
-fi
-# See if slapd has been configured and (ever) started
-files=$(echo /var/lib/ldap/{[a]lock,*.bdb,*.dbd,log.*,__db.*})
-if [ "$files" != '/var/lib/ldap/[a]lock /var/lib/ldap/*.bdb /var/lib/ldap/*.dbd /var/lib/ldap/log.* /var/lib/ldap/__db.*' ] ; then
-	# Save an ldif of the database where the "% post servers" scriptlet can
-	# restore it.  Also save the database files to a "rpmorig" directory
-	# Just In Case (TM)
-	if /sbin/runuser -m -s /usr/sbin/slapcat -- ldap -l /var/lib/ldap/upgrade.ldif > /dev/null 2>&1 ; then
-		if [ -s /var/lib/ldap/upgrade.ldif ] ; then
-			/bin/rm -fr /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
-			mkdir /var/lib/ldap/rpmorig
-			mv /var/lib/ldap/{alock,*.bdb,__db.*,log.*} /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
-			cp -f /var/lib/ldap/DB_CONFIG /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
-		else
-			/bin/rm -f /var/lib/ldap/upgrade.ldif
+	# See if slapd has been configured and (ever) started
+	files=$(echo /var/lib/ldap/{[a]lock,*.bdb,*.dbd,log.*,__db.*})
+	if [ "$files" != '/var/lib/ldap/[a]lock /var/lib/ldap/*.bdb /var/lib/ldap/*.dbd /var/lib/ldap/log.* /var/lib/ldap/__db.*' ] ; then
+		# Save an ldif of the database.  Also save the database files to a "rpmorig" directory
+		# Just In Case (TM)
+		if /sbin/runuser -m -s /usr/sbin/slapcat -- ldap -l /var/lib/ldap/upgrade.ldif > /dev/null 2>&1 ; then
+			if [ -s /var/lib/ldap/upgrade.ldif ] ; then
+				/bin/rm -fr /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
+				mkdir /var/lib/ldap/rpmorig
+				mv /var/lib/ldap/{alock,*.bdb,__db.*,log.*} /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
+				cp -f /var/lib/ldap/DB_CONFIG /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
+			else
+				/bin/rm -f /var/lib/ldap/upgrade.ldif
+			fi
 		fi
 	fi
 fi



From fedora-cvs-commits at redhat.com  Mon Apr 23 07:02:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 03:02:26 -0400
Subject: rpms/openldap/FC-6 openldap.spec,1.65,1.66
Message-ID: <200704230702.l3N72QI4007590@cvs.devel.redhat.com>

Author: jsafrane

Update of /cvs/dist/rpms/openldap/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv7526

Modified Files:
	openldap.spec 
Log Message:
Minor .spec cleanup (rpmlinting)


Index: openldap.spec
===================================================================
RCS file: /cvs/dist/rpms/openldap/FC-6/openldap.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- openldap.spec	23 Apr 2007 06:48:18 -0000	1.65
+++ openldap.spec	23 Apr 2007 07:02:24 -0000	1.66
@@ -10,7 +10,7 @@
 %define compat_version %{version_22}
 %define nptl_arches %{ix86} ia64 ppc ppc64 s390 s390x sparcv9 x86_64
 
-Summary: The configuration files, libraries, and documentation for OpenLDAP.
+Summary: The configuration files, libraries, and documentation for OpenLDAP
 Name: openldap
 Version: %{version_23}
 Release: 1%{?dist}.1
@@ -63,9 +63,9 @@
 
 URL: http://www.openldap.org/
 BuildRoot: %{_tmppath}/%{name}-%{version_23}-root
-BuildPreReq: cyrus-sasl-devel >= 2.1, gdbm-devel, libtool >= 1.5.6-2, krb5-devel
-BuildPreReq: openssl-devel, pam-devel, perl, pkgconfig, tcp_wrappers,
-BuildPreReq: unixODBC-devel, bind-libbind-devel, libtool-ltdl-devel
+BuildRequires: cyrus-sasl-devel >= 2.1, gdbm-devel, libtool >= 1.5.6-2, krb5-devel
+BuildRequires: openssl-devel, pam-devel, perl, pkgconfig, tcp_wrappers,
+BuildRequires: unixODBC-devel, bind-libbind-devel, libtool-ltdl-devel
 Requires: glibc >= 2.2.3-48, mktemp
 
 %description
@@ -93,7 +93,7 @@
 
 %package servers
 Summary: OpenLDAP servers and related files.
-Prereq: fileutils, make, openldap = %{version_23}-%{release}, openssl, /usr/sbin/useradd, /sbin/chkconfig, /sbin/runuser
+Requires: fileutils, make, openldap = %{version_23}-%{release}, openssl, /usr/sbin/useradd, /sbin/chkconfig, /sbin/runuser
 Group: System Environment/Daemons
 
 %description servers
@@ -107,7 +107,7 @@
 
 %package servers-sql
 Summary: OpenLDAP server SQL support module.
-Prereq: openldap-servers = %{version_23}-%{release}
+Requires: openldap-servers = %{version_23}-%{release}
 Group: System Environment/Daemons
 
 %description servers-sql
@@ -121,7 +121,7 @@
 
 %package clients
 Summary: Client programs for OpenLDAP.
-Prereq: openldap = %{version_23}-%{release}
+Requires: openldap = %{version_23}-%{release}
 Group: Applications/Internet
 
 %description clients



From fedora-cvs-commits at redhat.com  Mon Apr 23 07:04:38 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 03:04:38 -0400
Subject: rpms/openldap/FC-5 openldap.spec,1.56,1.57
Message-ID: <200704230704.l3N74cW0009588@cvs.devel.redhat.com>

Author: jsafrane

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

Modified Files:
	openldap.spec 
Log Message:
Minor .spec cleanup (rpmlinting)


Index: openldap.spec
===================================================================
RCS file: /cvs/dist/rpms/openldap/FC-5/openldap.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- openldap.spec	23 Apr 2007 06:51:58 -0000	1.56
+++ openldap.spec	23 Apr 2007 07:04:36 -0000	1.57
@@ -10,7 +10,7 @@
 %define compat_version %{version_22}
 %define nptl_arches %{ix86} ia64 ppc ppc64 s390 s390x sparcv9 x86_64
 
-Summary: The configuration files, libraries, and documentation for OpenLDAP.
+Summary: The configuration files, libraries, and documentation for OpenLDAP
 Name: openldap
 Version: %{version_23}
 Release: 1%{?dist}
@@ -64,9 +64,9 @@
 
 URL: http://www.openldap.org/
 BuildRoot: %{_tmppath}/%{name}-%{version_23}-root
-BuildPreReq: cyrus-sasl-devel >= 2.1, gdbm-devel, libtool >= 1.5.6-2, krb5-devel
-BuildPreReq: openssl-devel, pam-devel, perl, pkgconfig, tcp_wrappers,
-BuildPreReq: unixODBC-devel, bind-libbind-devel, libtool-ltdl-devel
+BuildRequires: cyrus-sasl-devel >= 2.1, gdbm-devel, libtool >= 1.5.6-2, krb5-devel
+BuildRequires: openssl-devel, pam-devel, perl, pkgconfig, tcp_wrappers,
+BuildRequires: unixODBC-devel, bind-libbind-devel, libtool-ltdl-devel
 Requires: glibc >= 2.2.3-48, mktemp
 
 %description
@@ -94,7 +94,7 @@
 
 %package servers
 Summary: OpenLDAP servers and related files.
-Prereq: fileutils, make, openldap = %{version_23}-%{release}, openssl, /usr/sbin/useradd, /sbin/chkconfig, /sbin/runuser
+Requires: fileutils, make, openldap = %{version_23}-%{release}, openssl, /usr/sbin/useradd, /sbin/chkconfig, /sbin/runuser
 Group: System Environment/Daemons
 
 %description servers
@@ -108,7 +108,7 @@
 
 %package servers-sql
 Summary: OpenLDAP server SQL support module.
-Prereq: openldap-servers = %{version_23}-%{release}
+Requires: openldap-servers = %{version_23}-%{release}
 Group: System Environment/Daemons
 
 %description servers-sql
@@ -122,7 +122,7 @@
 
 %package clients
 Summary: Client programs for OpenLDAP.
-Prereq: openldap = %{version_23}-%{release}
+Requires: openldap = %{version_23}-%{release}
 Group: Applications/Internet
 
 %description clients



From fedora-cvs-commits at redhat.com  Mon Apr 23 07:43:41 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 03:43:41 -0400
Subject: rpms/openldap/FC-5 openldap.spec,1.57,1.58
Message-ID: <200704230743.l3N7hfRY028293@cvs.devel.redhat.com>

Author: jsafrane

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

Modified Files:
	openldap.spec 
Log Message:
bind-libbind-devel removed from BuildRequires (bz#216851)
use %_localstatedir instead of var/ (bz#220970)
make slapadd quiet (bz#224581)
add few buzilla IDs to .spec


Index: openldap.spec
===================================================================
RCS file: /cvs/dist/rpms/openldap/FC-5/openldap.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- openldap.spec	23 Apr 2007 07:04:36 -0000	1.57
+++ openldap.spec	23 Apr 2007 07:43:38 -0000	1.58
@@ -66,7 +66,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version_23}-root
 BuildRequires: cyrus-sasl-devel >= 2.1, gdbm-devel, libtool >= 1.5.6-2, krb5-devel
 BuildRequires: openssl-devel, pam-devel, perl, pkgconfig, tcp_wrappers,
-BuildRequires: unixODBC-devel, bind-libbind-devel, libtool-ltdl-devel
+BuildRequires: unixODBC-devel, libtool-ltdl-devel
 Requires: glibc >= 2.2.3-48, mktemp
 
 %description
@@ -527,8 +527,8 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/openldap/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/openldap/*.so
 
-rm -f $RPM_BUILD_ROOT/var/openldap-data/DB_CONFIG.example
-rmdir $RPM_BUILD_ROOT/var/openldap-slurp $RPM_BUILD_ROOT/var/openldap-data
+rm -f $RPM_BUILD_ROOT%{_localstatedir}/openldap-data/DB_CONFIG.example
+rmdir $RPM_BUILD_ROOT%{_localstatedir}/openldap-slurp $RPM_BUILD_ROOT/var/openldap-data
 
 %clean 
 rm -rf $RPM_BUILD_ROOT
@@ -574,7 +574,7 @@
 # If there's a /var/lib/ldap/upgrade.ldif file, slapadd it and delete it.
 # It was created by the uninstall of the previous version.
 if [ -s /var/lib/ldap/upgrade.ldif ] ; then
-	/sbin/runuser -m -s /usr/sbin/slapadd -- "ldap" -l /var/lib/ldap/upgrade.ldif
+	/sbin/runuser -m -s /usr/sbin/slapadd -- "ldap" -l /var/lib/ldap/upgrade.ldif >/dev/null 2>&1 
 	/bin/rm /var/lib/ldap/upgrade.ldif
 fi
 exec > /dev/null 2> /dev/null
@@ -724,8 +724,11 @@
     bz#190383: openldap 2.3 packages contain the administrator's guide for 2.2
     bz#204593: service ldap fails after having added entries to ldap
     bz#199322: RFE: perform cleanup in ldap.init
+    bz#211045: permissions of ldapi socket need to be world-writable
+    bz#209496: openldap-server syncrepl failure bug
+    bz#205827: CVE-2006-4600 openldap improper selfwrite access
 - Include the gethostbyname_r patch
-- include the correct guide.html
+- include the correct guide.html (bz#190383)
 - Fix the upgrade logic, so that upgrades from 2.3.30 to newer versions
   won't leave junk in /var/lib/ldap if it was empty, and correctly
   generates/uses the upgrade.ldif file otherwise.  Note that upgrades *to*



From fedora-cvs-commits at redhat.com  Mon Apr 23 07:44:12 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 03:44:12 -0400
Subject: rpms/openldap/FC-6 openldap.spec,1.66,1.67
Message-ID: <200704230744.l3N7iCsX028320@cvs.devel.redhat.com>

Author: jsafrane

Update of /cvs/dist/rpms/openldap/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv28306

Modified Files:
	openldap.spec 
Log Message:
bind-libbind-devel removed from BuildRequires (bz#216851)
use %_localstatedir instead of var/ (bz#220970)
make slapadd quiet (bz#224581)
add few buzilla IDs to .spec


Index: openldap.spec
===================================================================
RCS file: /cvs/dist/rpms/openldap/FC-6/openldap.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- openldap.spec	23 Apr 2007 07:02:24 -0000	1.66
+++ openldap.spec	23 Apr 2007 07:44:10 -0000	1.67
@@ -65,7 +65,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version_23}-root
 BuildRequires: cyrus-sasl-devel >= 2.1, gdbm-devel, libtool >= 1.5.6-2, krb5-devel
 BuildRequires: openssl-devel, pam-devel, perl, pkgconfig, tcp_wrappers,
-BuildRequires: unixODBC-devel, bind-libbind-devel, libtool-ltdl-devel
+BuildRequires: unixODBC-devel, libtool-ltdl-devel
 Requires: glibc >= 2.2.3-48, mktemp
 
 %description
@@ -526,8 +526,8 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/openldap/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/openldap/*.so
 
-rm -f $RPM_BUILD_ROOT/var/openldap-data/DB_CONFIG.example
-rmdir $RPM_BUILD_ROOT/var/openldap-slurp $RPM_BUILD_ROOT/var/openldap-data
+rm -f $RPM_BUILD_ROOT%{_localstatedir}/openldap-data/DB_CONFIG.example
+rmdir $RPM_BUILD_ROOT%{_localstatedir}/openldap-slurp $RPM_BUILD_ROOT/var/openldap-data
 
 %clean 
 rm -rf $RPM_BUILD_ROOT
@@ -573,7 +573,7 @@
 # If there's a /var/lib/ldap/upgrade.ldif file, slapadd it and delete it.
 # It was created by the uninstall of the previous version.
 if [ -s /var/lib/ldap/upgrade.ldif ] ; then
-	/sbin/runuser -m -s /usr/sbin/slapadd -- "ldap" -l /var/lib/ldap/upgrade.ldif
+	/sbin/runuser -m -s /usr/sbin/slapadd -- "ldap" -l /var/lib/ldap/upgrade.ldif >/dev/null 2>&1
 	/bin/rm /var/lib/ldap/upgrade.ldif
 fi
 exec > /dev/null 2> /dev/null
@@ -725,7 +725,7 @@
 - Add more database file types to check for in ldap.init
 
 * Thu Nov 16 2006 Jay Fenlason <fenlason at redhat.com> 2.3.30-1%{?dist}
-- New upstream version
+- New upstream version (bz#211045, bz#209496, bz#205827)
 
 * Sun Oct 01 2006 Jesse Keating <jkeating at redhat.com> - 2.3.27-4
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21



From fedora-cvs-commits at redhat.com  Mon Apr 23 07:45:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 03:45:57 -0400
Subject: rpms/openldap/devel openldap.spec,1.64,1.65
Message-ID: <200704230745.l3N7jvDg028357@cvs.devel.redhat.com>

Author: jsafrane

Update of /cvs/dist/rpms/openldap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28343

Modified Files:
	openldap.spec 
Log Message:
bind-devel removed from BuildRequires (bz#216851)
use %_localstatedir instead of var/ (bz#220970)
minor fixes in openldap.spec (rpmlint)


Index: openldap.spec
===================================================================
RCS file: /cvs/dist/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- openldap.spec	19 Feb 2007 20:44:22 -0000	1.64
+++ openldap.spec	23 Apr 2007 07:45:55 -0000	1.65
@@ -10,10 +10,10 @@
 %define compat_version %{version_22}
 %define nptl_arches %{ix86} ia64 ppc ppc64 s390 s390x sparcv9 x86_64
 
-Summary: The configuration files, libraries, and documentation for OpenLDAP.
+Summary: The configuration files, libraries, and documentation for OpenLDAP
 Name: openldap
 Version: %{version_23}
-Release: 0%{?dist}
+Release: 0%{?dist}.1
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
@@ -40,6 +40,7 @@
 Patch6: openldap-2.3.11-nosql.patch
 #Patch7: openldap-2.3.19-nostrip.patch
 Patch8: openldap-2.3.19-gethostbyXXXX_r.patch
+Patch9: openldap-2.3.34-quiet-slaptest.patch
 
 # Patches for 2.2.29 for the compat-openldap package.
 Patch100: openldap-2.2.13-tls-fix-connection-test.patch
@@ -63,9 +64,9 @@
 
 URL: http://www.openldap.org/
 BuildRoot: %{_tmppath}/%{name}-%{version_23}-root
-BuildPreReq: cyrus-sasl-devel >= 2.1, gdbm-devel, libtool >= 1.5.6-2, krb5-devel
-BuildPreReq: openssl-devel, pam-devel, perl, pkgconfig, tcp_wrappers-devel,
-BuildPreReq: unixODBC-devel, bind-devel, libtool-ltdl-devel
+BuildRequires: cyrus-sasl-devel >= 2.1, gdbm-devel, libtool >= 1.5.6-2, krb5-devel
+BuildRequires: openssl-devel, pam-devel, perl, pkgconfig, tcp_wrappers-devel,
+BuildRequires: unixODBC-devel, libtool-ltdl-devel
 Requires: glibc >= 2.2.3-48, mktemp
 
 %description
@@ -93,7 +94,7 @@
 
 %package servers
 Summary: OpenLDAP servers and related files.
-Prereq: fileutils, make, openldap = %{version_23}-%{release}, openssl, /usr/sbin/useradd, /sbin/chkconfig, /sbin/runuser
+Requires: fileutils, make, openldap = %{version_23}-%{release}, openssl, /usr/sbin/useradd, /sbin/chkconfig, /sbin/runuser
 Group: System Environment/Daemons
 
 %description servers
@@ -107,7 +108,7 @@
 
 %package servers-sql
 Summary: OpenLDAP server SQL support module.
-Prereq: openldap-servers = %{version_23}-%{release}
+Requires: openldap-servers = %{version_23}-%{release}
 Group: System Environment/Daemons
 
 %description servers-sql
@@ -121,7 +122,7 @@
 
 %package clients
 Summary: Client programs for OpenLDAP.
-Prereq: openldap = %{version_23}-%{release}
+Requires: openldap = %{version_23}-%{release}
 Group: Applications/Internet
 
 %description clients
@@ -174,6 +175,7 @@
 %patch6 -p1 -b .nosql
 #%patch7 -p1 -b .nostrip
 %patch8 -p1 -b .gethostbyname_r
+%patch9 -p1 -b .quiet-slaptest
 cp %{_datadir}/libtool/config.{sub,guess} build/
 popd
 
@@ -527,8 +529,8 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/openldap/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/openldap/*.so
 
-rm -f $RPM_BUILD_ROOT/var/openldap-data/DB_CONFIG.example
-rmdir $RPM_BUILD_ROOT/var/openldap-slurp $RPM_BUILD_ROOT/var/openldap-data
+rm -f $RPM_BUILD_ROOT%{_localstatedir}/openldap-data/DB_CONFIG.example
+rmdir $RPM_BUILD_ROOT%{_localstatedir}/openldap-slurp $RPM_BUILD_ROOT%{_localstatedir}/openldap-data
 
 %clean 
 rm -rf $RPM_BUILD_ROOT



From fedora-cvs-commits at redhat.com  Mon Apr 23 07:59:52 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 03:59:52 -0400
Subject: rpms/ksh/devel ksh-20070328-leak.patch, NONE,
	1.1 ksh-20070328-loginsh.patch, NONE,
	1.1 ksh-20070328-uname.patch, NONE,
	1.1 ksh-20070328-useex.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 ksh.spec, 1.28, 1.29 sources, 1.8, 1.9
Message-ID: <200704230759.l3N7xq3I028513@cvs.devel.redhat.com>

Author: tsmetana

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

Modified Files:
	.cvsignore ksh.spec sources 
Added Files:
	ksh-20070328-leak.patch ksh-20070328-loginsh.patch 
	ksh-20070328-uname.patch ksh-20070328-useex.patch 
Log Message:
New upstream sources, fixed #182397, fixed memory leak

ksh-20070328-leak.patch:
 xec.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE ksh-20070328-leak.patch ---
--- ksh-20070328/src/cmd/ksh93/sh/xec.c.orig	2007-04-19 08:54:10.000000000 +0200
+++ ksh-20070328/src/cmd/ksh93/sh/xec.c	2007-04-19 08:55:56.000000000 +0200
@@ -1190,6 +1190,8 @@
 			}
 			sh_popcontext(&buff);
 			sh_iorestore(buff.topfd,jmpval);
+			if(buff.olist)
+				free_list(buff.olist);
 			if(type&FPIN)
 			{
 				job.waitall = waitall;
@@ -2878,6 +2880,8 @@
 	else
 		exitset();
 	sh_popcontext(&buff);
+	if(buff.olist)
+		free_list(buff.olist);
 #ifdef SIGTSTP
 	if(jobwasset)
 	{

ksh-20070328-loginsh.patch:
 init.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE ksh-20070328-loginsh.patch ---
--- ksh-20070328/src/cmd/ksh93/sh/init.c.loginsh	2007-04-17 13:49:15.000000000 +0200
+++ ksh-20070328/src/cmd/ksh93/sh/init.c	2007-04-17 13:49:54.000000000 +0200
@@ -790,6 +790,10 @@
 	register const char*	s;
 	register int		t = 0;
 	
+	if (*path == '-')
+	{
+		t |= SH_TYPE_LOGIN;
+	}
 	if (s = (const char*)strrchr(path, '/'))
 		s++;
 	else

ksh-20070328-uname.patch:
 uname.c |    6 +-----
 1 files changed, 1 insertion(+), 5 deletions(-)

--- NEW FILE ksh-20070328-uname.patch ---
--- ksh-20070328/src/lib/libcmd/uname.c.uname_fix	2007-04-17 13:39:44.000000000 +0200
+++ ksh-20070328/src/lib/libcmd/uname.c	2007-04-17 13:41:24.000000000 +0200
@@ -446,11 +446,7 @@
 		if (flags & OPT_domain)
 		{
 			if (!*(s = astconf("SRPC_DOMAIN", NiL, NiL)))
-#if _lib_getdomainname
-				getdomainname(s, sizeof(buf));
-#else
-				/*NOP*/;
-#endif
+				s = ut.__domainname;
 			output(OPT_domain, s, "domain");
 		}
 #if _mem_m_type_utsname

ksh-20070328-useex.patch:
 bin/mamprobe             |   17 +++++++++--------
 src/cmd/INIT/mamprobe.sh |   17 +++++++++--------
 2 files changed, 18 insertions(+), 16 deletions(-)

--- NEW FILE ksh-20070328-useex.patch ---
--- ksh-20070328/bin/mamprobe.useex	2007-04-17 13:45:27.000000000 +0200
+++ ksh-20070328/bin/mamprobe	2007-04-17 13:46:14.000000000 +0200
@@ -200,14 +200,15 @@
 
 # STD* are standard commands/flags with possible execrate(1)
 
-if	(
-ed <<!
-q
-!
-) < /dev/null > /dev/null 2>&1
-then	STDED=ed
-else	STDED=ex
-fi
+#if	(
+#ed <<!
+#q
+#!
+#) < /dev/null > /dev/null 2>&1
+#then	STDED=ed
+#else	STDED=ex
+#fi
+STDED=ex
 STDEDFLAGS=-
 set STDCAT cat STDCHMOD chmod STDCMP cmp STDCP cp STDLN ln STDMV mv STDRM rm
 while	:
--- ksh-20070328/src/cmd/INIT/mamprobe.sh.useex	2007-04-17 13:46:45.000000000 +0200
+++ ksh-20070328/src/cmd/INIT/mamprobe.sh	2007-04-17 13:47:24.000000000 +0200
@@ -219,14 +219,15 @@
 
 # STD* are standard commands/flags with possible execrate(1)
 
-if	(
-ed <<!
-q
-!
-) < /dev/null > /dev/null 2>&1
-then	STDED=ed
-else	STDED=ex
-fi
+#if	(
+#ed <<!
+#q
+#!
+#) < /dev/null > /dev/null 2>&1
+#then	STDED=ed
+#else	STDED=ex
+#fi
+STDED=ex
 STDEDFLAGS=-
 set STDCAT cat STDCHMOD chmod STDCMP cmp STDCP cp STDLN ln STDMV mv STDRM rm
 while	:


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 Feb 2007 12:36:12 -0000	1.8
+++ .cvsignore	23 Apr 2007 07:59:50 -0000	1.9
@@ -1,3 +1,6 @@
 ast-base-locale.2007-01-11.tgz
 ast-ksh.2007-01-11.tgz
 INIT.2007-01-11.tar
+INIT.2007-03-28.tgz
+ast-ksh.2007-03-28.tgz
+ast-base-locale.2007-03-28.tgz


Index: ksh.spec
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/ksh.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ksh.spec	21 Feb 2007 12:36:12 -0000	1.28
+++ ksh.spec	23 Apr 2007 07:59:50 -0000	1.29
@@ -1,5 +1,5 @@
 #ExclusiveArch:  x86_64
-%define       releasedate   2007-01-11
+%define       releasedate   2007-03-28
 #ExcludeArch:  ia64
 
 Name:         ksh
@@ -7,15 +7,17 @@
 URL:          http://www.kornshell.com/
 Group:        Applications/Shells
 License:      Common Public License Version 1.0
-Version:      20070111
+Version:      20070328
 Release:      1
 #Source0:      http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.linux.i386.tgz
 Source0:      http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.tgz
-Source1:      http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tar
+Source1:      http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tgz
 Source2:      http://www.research.att.com/~gsf/download/tgz/ast-base-locale.%{releasedate}.tgz
 Patch0:       ksh-20041225-gcc4.patch
-Patch1:       ksh-20070111-uname.patch
-Patch2:       ksh-20070111-useex.patch
+Patch1:       ksh-20070328-uname.patch
+Patch2:       ksh-20070328-useex.patch
+Patch3:       ksh-20070328-loginsh.patch
+Patch4:       ksh-20070328-leak.patch
 # for debugging only:
 #Patch100:     ksh-20060124-iffedebug.patch
 
@@ -40,6 +42,8 @@
 %patch0 -p1 -b .gcc4
 %patch1 -p1 -b .uname
 %patch2 -p1 -b .use_ex
+%patch3 -p1 -b .loginsh
+%patch4 -p1 -b .leak
 #patch100 -p1 -b .iffedebug
 
 %build
@@ -99,6 +103,11 @@
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Apr 19 2007 Tomas Smetana <tsmetana at redhat.com> 20070328-1
+- new upstream source
+- fix login shell invocation (#182397)
+- fix memory leak
+
 * Wed Feb 21 2007 Karsten Hopp <karsten at redhat.com> 20070111-1
 - new upstream version
 - fix invalid write in uname function


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 Feb 2007 12:36:12 -0000	1.8
+++ sources	23 Apr 2007 07:59:50 -0000	1.9
@@ -1,3 +1,6 @@
 727f240f8e56b555aa884de4a032519d  ast-base-locale.2007-01-11.tgz
 a24a0b8d8dc81600d624e3c0f2159e38  ast-ksh.2007-01-11.tgz
 4cf6a21b17748b4f586235fa289586c6  INIT.2007-01-11.tar
+c257f2557e3e136c05b8e7eb0ac1aab0  INIT.2007-03-28.tgz
+9227250fa6ad2235cc8665bb664cc740  ast-ksh.2007-03-28.tgz
+1763efbc8217d0399f08bdeb31168e9a  ast-base-locale.2007-03-28.tgz



From fedora-cvs-commits at redhat.com  Mon Apr 23 08:15:56 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 04:15:56 -0400
Subject: rpms/zlib/devel zlib-1.2.3-autotools.patch, 1.2, 1.3 zlib.spec, 1.36,
	1.37
Message-ID: <200704230815.l3N8Fuj5029466@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/zlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29448

Modified Files:
	zlib-1.2.3-autotools.patch zlib.spec 
Log Message:
- Resolves: 237295
  fix Summary tag



zlib-1.2.3-autotools.patch:
 Makefile.am  |   19 +++++++++++++++++++
 configure.ac |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)

Index: zlib-1.2.3-autotools.patch
===================================================================
RCS file: /cvs/dist/rpms/zlib/devel/zlib-1.2.3-autotools.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zlib-1.2.3-autotools.patch	21 Feb 2007 17:02:56 -0000	1.2
+++ zlib-1.2.3-autotools.patch	23 Apr 2007 08:15:53 -0000	1.3
@@ -26,7 +26,7 @@
 +#                                               -*- Autoconf -*-
 +# Process this file with autoconf to produce a configure script.
 +
-+AC_PREREQ(2.61)
++AC_PREREQ(2.59)
 +AC_INIT([zlib], 1.2.3, [bugzilla.redhat.com])
 +AC_CONFIG_SRCDIR([minigzip.c])
 +AC_CONFIG_HEADER([config.h])


Index: zlib.spec
===================================================================
RCS file: /cvs/dist/rpms/zlib/devel/zlib.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- zlib.spec	23 Mar 2007 14:00:47 -0000	1.36
+++ zlib.spec	23 Apr 2007 08:15:53 -0000	1.37
@@ -1,7 +1,7 @@
-Summary: The zlib compression and deprefix=${RPM_BUILD_ROOT}%{_prefix}compression library
+Summary: The zlib compression and decompression library
 Name: zlib
 Version: 1.2.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 Group: System Environment/Libraries
 Source: http://www.zlib.net/zlib-%{version}.tar.gz
 #Patch0: zlib-1.1.4-make-test.patch
@@ -82,6 +82,10 @@
 %{_mandir}/man3/zlib.3*
 
 %changelog
+* Mon Apr 23 2007 Ivana Varekova <varekova at redhat.com> - 1.2.3-11
+- Resolves: 237295
+  fix Summary tag
+
 * Fri Mar 23 2007 Ivana Varekova <varekova at redhat.com> - 1.2.3-10
 - remove zlib .so.* packages to /lib
 



From fedora-cvs-commits at redhat.com  Mon Apr 23 08:43:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 04:43:45 -0400
Subject: rpms/samba/devel samba-3.0.25rc2-idmap-fix.patch, NONE,
	1.1 samba-3.0.25rc2-pie.patch, NONE, 1.1 samba.spec, 1.113,
	1.114 sources, 1.39, 1.40
Message-ID: <200704230843.l3N8hjKu019448@cvs.devel.redhat.com>

Author: ssorce

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19046

Modified Files:
	samba.spec sources 
Added Files:
	samba-3.0.25rc2-idmap-fix.patch samba-3.0.25rc2-pie.patch 
Log Message:

show stopper bugs discovered after rc2 was cut



samba-3.0.25rc2-idmap-fix.patch:
 idmap.c |   59 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 30 insertions(+), 29 deletions(-)

--- NEW FILE samba-3.0.25rc2-idmap-fix.patch ---
Author: jerry
Revision: r22473
Modified: source/nsswitch/idmap.c /branches/SAMBA_3_0_25/source/nsswitch/idmap.c /branches/SAMBA_3_0_25/source/passdb/pdb_ldap.c /branches/SAMBA_3_0_RELEASE/source/nsswitch/idmap.c
Added: 
Removed: 


Correct fix for setting a default compat tdb idmap backend.
Previous code would always fill in &quot;idmap backend = tdb&quot;
even if you defined idmap domains.  My fault.  I should
have tested the original patch more before committing.


Index: source/nsswitch/idmap.c
===================================================================
--- source/nsswitch/idmap.c	(revision 22472)
+++ source/nsswitch/idmap.c	(revision 22473)
@@ -289,40 +289,42 @@
 
 	dom_list = lp_idmap_domains();
 	
-	if ( dom_list && lp_idmap_backend() ) {
-		DEBUG(0, ("WARNING: idmap backend and idmap domains are "
-			  "mutually excusive!\n"));
-		DEBUGADD(0,("idmap backend option will be IGNORED!\n"));
-	} else if ( lp_idmap_backend() ) {
-		const char **compat_list = lp_idmap_backend();
+	if ( lp_idmap_backend() ) {
+       		const char **compat_list = lp_idmap_backend();
 		char *p = NULL;
 		const char *q = NULL;		
 
-		compat = 1;
+		if ( dom_list ) {			
+			DEBUG(0, ("WARNING: idmap backend and idmap domains are "
+				  "mutually excusive!\n"));
+			DEBUGADD(0,("idmap backend option will be IGNORED!\n"));
+		} else {
+			compat = 1;
 
-		if ( (compat_backend = talloc_strdup( idmap_ctx, *compat_list )) == NULL ) {
-			ret = NT_STATUS_NO_MEMORY;
-			goto done;			
-		}
+			if ( (compat_backend = talloc_strdup( idmap_ctx, *compat_list )) == NULL ) {
+				ret = NT_STATUS_NO_MEMORY;
+				goto done;
+			}
 		
-		/* strip any leading idmap_ prefix of */
-		if (strncmp(*compat_list, "idmap_", 6) == 0 ) {
-			q = *compat_list += 6;
-			DEBUG(0, ("WARNING: idmap backend uses obsolete and "
-				  "deprecated 'idmap_' prefix.\n"
-				  "Please replace 'idmap_%s' by '%s' in %s\n", 
-				  q, q, dyn_CONFIGFILE));
-			compat_backend = talloc_strdup( idmap_ctx, q);
-		} else {
-			compat_backend = talloc_strdup( idmap_ctx, *compat_list);
-		}
+			/* strip any leading idmap_ prefix of */
+			if (strncmp(*compat_list, "idmap_", 6) == 0 ) {
+				q = *compat_list += 6;
+				DEBUG(0, ("WARNING: idmap backend uses obsolete and "
+					  "deprecated 'idmap_' prefix.\n"
+					  "Please replace 'idmap_%s' by '%s' in %s\n", 
+					  q, q, dyn_CONFIGFILE));
+				compat_backend = talloc_strdup( idmap_ctx, q);
+			} else {
+				compat_backend = talloc_strdup( idmap_ctx, *compat_list);
+			}
 			
-		/* separate the backend and module arguements */
-		if ((p = strchr(compat_backend, ':')) != NULL) {
-			*p = '\0';			
-			compat_params = p + 1;
-		}
-	} else {
+			/* separate the backend and module arguements */
+			if ((p = strchr(compat_backend, ':')) != NULL) {
+				*p = '\0';			
+				compat_params = p + 1;
+			}
+		}		
+	} else if ( !dom_list ) {
 		/* Back compatible: without idmap domains and explicit
 		   idmap backend.  Taking default idmap backend: tdb */
 		
@@ -331,7 +333,6 @@
 		compat_params = compat_backend;
 	}
 
-
 	if ( ! dom_list) {
 		dom_list = idmap_default_domain;
 	}


samba-3.0.25rc2-pie.patch:
 Makefile.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE samba-3.0.25rc2-pie.patch ---
Index: source/Makefile.in
===================================================================
--- source/Makefile.in	(revision 22417)
+++ source/Makefile.in	(working copy)
@@ -23,10 +23,10 @@
 CFLAGS=@CFLAGS@
 CPPFLAGS=-DHAVE_CONFIG_H @CPPFLAGS@
 EXEEXT=@EXEEXT@
-LDFLAGS=@PIE_LDFLAGS@ @LDFLAGS@
 AR=@AR@
 LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@
 WINBIND_NSS_LDSHFLAGS=@WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@
+LDFLAGS=@PIE_LDFLAGS@ @LDFLAGS@
 AWK=@AWK@
 PICFLAG=@PICFLAG@
 DYNEXP=@DYNEXP@


Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- samba.spec	22 Apr 2007 14:23:05 -0000	1.113
+++ samba.spec	23 Apr 2007 08:43:43 -0000	1.114
@@ -2,7 +2,7 @@
 Name: samba
 Epoch: 0
 Version: 3.0.25
-Release: 0.1.rc2%{?dist}
+Release: 0.2.rc2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.samba.org/
@@ -46,6 +46,8 @@
 #Patch112: samba-3.0.15pre2-bug106483.patch
 #Patch113: samba-3.0.21-warnings.patch
 Patch200: samba-3.0.25rc1-inotifiy.patch
+Patch201: samba-3.0.25rc2-idmap-fix.patch
+Patch202: samba-3.0.25rc2-pie.patch
 
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
@@ -168,6 +170,8 @@
 #%patch112 -p1 -b .bug106483
 #%patch113 -p1 -b .warnings
 %patch200 -p0 -b .inotify
+%patch201 -p0 -b .idmap-fix
+%patch202 -p0 -b .pie
 
 # crap
 rm -f examples/VFS/.cvsignore


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	22 Apr 2007 14:23:06 -0000	1.39
+++ sources	23 Apr 2007 08:43:43 -0000	1.40
@@ -1,2 +1 @@
-23690bd9f12eae1dd2c54a1cc3cae8fb  samba-3.0.25rc1.tar.gz
 bd45fee528ab4cb6adea1a97e71e9d8c  samba-3.0.25rc2.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr 23 09:01:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 05:01:43 -0400
Subject: rpms/samba/devel samba-3.0.25rc2-pie.patch,1.1,1.2
Message-ID: <200704230901.l3N91h4k032168@cvs.devel.redhat.com>

Author: ssorce

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31987

Modified Files:
	samba-3.0.25rc2-pie.patch 
Log Message:

some more anti-pie chnages



samba-3.0.25rc2-pie.patch:
 Makefile.in |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Index: samba-3.0.25rc2-pie.patch
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba-3.0.25rc2-pie.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- samba-3.0.25rc2-pie.patch	23 Apr 2007 08:43:43 -0000	1.1
+++ samba-3.0.25rc2-pie.patch	23 Apr 2007 09:01:40 -0000	1.2
@@ -14,3 +14,39 @@
  AWK=@AWK@
  PICFLAG=@PICFLAG@
  DYNEXP=@DYNEXP@
+@@ -1144,7 +1144,7 @@
+ 
+ bin/libaddns. at SHLIBEXT@: proto_exists $(LIBADDNS_OBJ)
+ 	@echo Linking libaddns shared library $@
+-	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBADDNS_OBJ) $(LDFLAGS) $(LIBS) \
++	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBADDNS_OBJ) $(LIBS) \
+ 		$(KRB5LIBS) $(UUID_LIBS)\
+ 		@SONAMEFLAG@`basename $@`.$(LIBADDNS_MAJOR)
+ 
+@@ -1154,7 +1154,7 @@
+ 
+ bin/libsmbclient. at SHLIBEXT@: proto_exists $(LIBSMBCLIENT_OBJ)
+ 	@echo Linking libsmbclient shared library $@
+-	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_OBJ) $(LDFLAGS) $(LIBS) \
++	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_OBJ) $(LIBS) \
+ 		$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
+ 		@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
+ 
+@@ -1164,7 +1164,7 @@
+ 
+ bin/libsmbsharemodes. at SHLIBEXT@: proto_exists $(LIBSMBSHAREMODES_OBJ)
+ 	@echo Linking libsmbsharemodes shared library $@
+-	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBSHAREMODES_OBJ) $(LDFLAGS) $(LIBS) \
++	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBSHAREMODES_OBJ) $(LIBS) \
+ 		$(KRB5LIBS) $(LDAP_LIBS) \
+ 		@SONAMEFLAG@`basename $@`.$(LIBSMBSHAREMODES_MAJOR)
+ 
+@@ -1174,7 +1174,7 @@
+ 
+ bin/libmsrpc. at SHLIBEXT@: proto_exists $(CAC_OBJ)
+ 	@echo Linking libmsrpc shared library $@
+-	@$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_OBJ) $(LDFLAGS) $(LIBS) \
++	@$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_OBJ) $(LIBS) \
+ 	@SONAMEFLAG@`basename $@`.$(LIBMSRPC_MAJOR)
+ 
+ bin/libmsrpc.a: proto_exists $(CAC_OBJ)



From fedora-cvs-commits at redhat.com  Mon Apr 23 09:17:55 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 05:17:55 -0400
Subject: rpms/ksh/devel sources, 1.9, 1.10 ksh-20070111-uname.patch, 1.1,
	NONE ksh-20070111-useex.patch, 1.1, NONE
Message-ID: <200704230917.l3N9HtwF011655@cvs.devel.redhat.com>

Author: tsmetana

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

Modified Files:
	sources 
Removed Files:
	ksh-20070111-uname.patch ksh-20070111-useex.patch 
Log Message:
Removed unused sources and patches


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Apr 2007 07:59:50 -0000	1.9
+++ sources	23 Apr 2007 09:17:53 -0000	1.10
@@ -1,6 +1,3 @@
-727f240f8e56b555aa884de4a032519d  ast-base-locale.2007-01-11.tgz
-a24a0b8d8dc81600d624e3c0f2159e38  ast-ksh.2007-01-11.tgz
-4cf6a21b17748b4f586235fa289586c6  INIT.2007-01-11.tar
 c257f2557e3e136c05b8e7eb0ac1aab0  INIT.2007-03-28.tgz
 9227250fa6ad2235cc8665bb664cc740  ast-ksh.2007-03-28.tgz
 1763efbc8217d0399f08bdeb31168e9a  ast-base-locale.2007-03-28.tgz


--- ksh-20070111-uname.patch DELETED ---


--- ksh-20070111-useex.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 23 09:28:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 05:28:47 -0400
Subject: rpms/samba/devel samba.spec,1.114,1.115
Message-ID: <200704230928.l3N9Slbl019388@cvs.devel.redhat.com>

Author: ssorce

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19086

Modified Files:
	samba.spec 
Log Message:

Wrong release number we must keep growing until 3.0.25 final




Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- samba.spec	23 Apr 2007 08:43:43 -0000	1.114
+++ samba.spec	23 Apr 2007 09:28:45 -0000	1.115
@@ -2,7 +2,7 @@
 Name: samba
 Epoch: 0
 Version: 3.0.25
-Release: 0.2.rc2%{?dist}
+Release: 0.8.rc2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.samba.org/



From fedora-cvs-commits at redhat.com  Mon Apr 23 10:37:27 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 06:37:27 -0400
Subject: rpms/rpm/devel rpm-debugedit-incremental-fix.patch, NONE,
	1.1 rpm.spec, 1.228, 1.229
Message-ID: <200704231037.l3NAbRnu005973@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5897

Modified Files:
	rpm.spec 
Added Files:
	rpm-debugedit-incremental-fix.patch 
Log Message:
* Mon Apr 23 2007 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-45
- Fix debugedit for relative paths (#232222)
- Resolves: rhbz#232222


rpm-debugedit-incremental-fix.patch:
 debugedit.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

--- NEW FILE rpm-debugedit-incremental-fix.patch ---
--- rpm-4.4.2/tools/debugedit.c.jj	2007-04-20 21:27:50.000000000 +0200
+++ rpm-4.4.2/tools/debugedit.c	2007-04-20 23:07:27.000000000 +0200
@@ -371,9 +371,10 @@ canonicalize_path (const char *s, char *
 
       if (s[0] == '.' && (s[1] == 0 || IS_DIR_SEPARATOR (s[1])))
 	{
-	  s ++;
-	  if (!*s && d > droot)
-	    d--;
+	  s++;
+	  if (*s)
+	    while (IS_DIR_SEPARATOR (*s))
+	      ++s;
 	}
 
       else if (s[0] == '.' && s[1] == '.'
@@ -401,8 +402,6 @@ canonicalize_path (const char *s, char *
 		  if (*s)
 		    while (IS_DIR_SEPARATOR (*s))
 		      s++;
-		  else if (d > droot)
-		    d--;
 		}
 	    }
 	  else
@@ -411,7 +410,6 @@ canonicalize_path (const char *s, char *
 	      *d++ = *s++;
 	    }
 	}
-
       else
 	{
 	  while (*s && ! IS_DIR_SEPARATOR (*s))


Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- rpm.spec	19 Apr 2007 08:51:25 -0000	1.228
+++ rpm.spec	23 Apr 2007 10:37:25 -0000	1.229
@@ -17,7 +17,7 @@
 Name: rpm
 Version: 4.4.2
 %{expand: %%define rpm_version %{version}}
-Release: 44%{?dist}
+Release: 45%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source: rpm-%{rpm_version}.tar.gz
@@ -66,6 +66,7 @@
 Patch40: rpm-4.4.2-forkfailed.patch
 Patch41: rpm-4.4.2-cdiff.patch
 Patch42: rpm-4.4.2-docflags.patch
+Patch43: rpm-debugedit-incremental-fix.patch
 License: GPL
 Requires: patch > 2.5
 Prereq: shadow-utils
@@ -210,6 +211,7 @@
 %patch40 -p0 -b .forkfail
 %patch41 -p1 -b .cdiff
 %patch42 -p1 -b .docflags
+%patch43 -p1 -b .debugcan2
 
 # rebuild configure for ipv6
 autoconf
@@ -571,6 +573,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Mon Apr 23 2007 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-45
+- Fix debugedit for relative paths (#232222)
+
 * Mon Apr 16 2007 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-44
 - Set default verify flags for %%doc (#235353)
 - Revert to old configure line 



From fedora-cvs-commits at redhat.com  Mon Apr 23 10:39:22 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 06:39:22 -0400
Subject: rpms/openldap/devel openldap-2.3.34-quiet-slaptest.patch,NONE,1.1
Message-ID: <200704231039.l3NAdMSf007429@cvs.devel.redhat.com>

Author: jsafrane

Update of /cvs/dist/rpms/openldap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7386

Added Files:
	openldap-2.3.34-quiet-slaptest.patch 
Log Message:
Making slaptest quiet

openldap-2.3.34-quiet-slaptest.patch:
 slaptest.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE openldap-2.3.34-quiet-slaptest.patch ---
Force slaptest to be quiet when no problem is found. Use -v to display "success" message.
Patch sent upstream (ITS#4930: slaptest should be quiet on success)

--- openldap-2.3.34/servers/slapd/slaptest.c.orig	2007-01-02 22:43:59.000000000 +0100
+++ openldap-2.3.34/servers/slapd/slaptest.c	2007-04-17 10:54:36.000000000 +0200
@@ -103,7 +103,8 @@
 		}
 	}
 
-	fprintf( stderr, "config file testing succeeded\n");
+	if (verbose)
+		fprintf( stderr, "config file testing succeeded\n");
 
 	slap_tool_destroy();
 



From fedora-cvs-commits at redhat.com  Mon Apr 23 11:18:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 07:18:32 -0400
Subject: rpms/hardlink/devel hardlink.spec,1.27,1.28
Message-ID: <200704231118.l3NBIWdm003198@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/hardlink/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3015

Modified Files:
	hardlink.spec 
Log Message:
- include sources in debuginfo package (#230833)



Index: hardlink.spec
===================================================================
RCS file: /cvs/dist/rpms/hardlink/devel/hardlink.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- hardlink.spec	5 Feb 2007 13:44:54 -0000	1.27
+++ hardlink.spec	23 Apr 2007 11:18:30 -0000	1.28
@@ -1,7 +1,7 @@
 Summary:	Create a tree of hardlinks
 Name:		hardlink
 Version:	1.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 URL:		http://cvs.fedora.redhat.com/viewcvs/devel/hardlink/
@@ -18,9 +18,10 @@
 
 %prep
 %setup -q -c -T
+install -pm 644 %{SOURCE0} hardlink.c
 
 %build
-gcc $RPM_OPT_FLAGS %{SOURCE0} -o hardlink
+gcc $RPM_OPT_FLAGS hardlink.c -o hardlink
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -36,6 +37,9 @@
 %{_mandir}/man1/hardlink.1*
 
 %changelog
+* Mon Apr 23 2007 Jindrich Novy <jnovy at redhat.com> - 1:1.0-4
+- include sources in debuginfo package (#230833)
+
 * Mon Feb  5 2007 Jindrich Novy <jnovy at redhat.com> - 1:1.0-3
 - merge review related spec fixes (#225881)
 



From fedora-cvs-commits at redhat.com  Mon Apr 23 12:00:11 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 08:00:11 -0400
Subject: rpms/kdebase/devel kdebase-3.5.6-consolekit-kdm.patch, NONE,
	1.1 kdebase.spec, 1.243, 1.244
Message-ID: <200704231200.l3NC0BKq011684@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.6-consolekit-kdm.patch 
Log Message:
apply patch KDM to support ConsoleKit, thanks to Kevin Kofler, #228111


kdebase-3.5.6-consolekit-kdm.patch:
 backend/Imakefile    |    4 
 backend/Makefile.am  |    5 
 backend/Makefile.in  |   13 -
 backend/client.c     |   14 +
 backend/consolekit.c |  552 +++++++++++++++++++++++++++++++++++++++++++++++++++
 backend/consolekit.h |   36 +++
 backend/dm.h         |    6 
 backend/session.c    |   20 +
 configure.in.in      |   47 ++++
 9 files changed, 688 insertions(+), 9 deletions(-)

--- NEW FILE kdebase-3.5.6-consolekit-kdm.patch ---
diff -Nur kdebase-3.5.6/kdm/backend/client.c kdebase-3.5.6-consolekit/kdm/backend/client.c
--- kdebase-3.5.6/kdm/backend/client.c	2007-01-15 12:32:23.000000000 +0100
+++ kdebase-3.5.6-consolekit/kdm/backend/client.c	2007-04-17 23:36:08.000000000 +0200
@@ -82,6 +82,10 @@
 # include <time.h>
 #endif /* USE_PAM || _AIX */
 
+#ifdef WITH_CONSOLE_KIT
+#include "consolekit.h"
+#endif
+
 /*
  * Session data, mostly what struct verify_info was for
  */
@@ -1097,8 +1101,13 @@
 static int removeCreds;
 #endif
 
+#ifdef WITH_CONSOLE_KIT
+int
+StartClient( const char *ck_session_cookie )
+#else
 int
 StartClient()
+#endif
 {
 	const char *home, *sessargs, *desksess;
 	char **env, *xma;
@@ -1194,6 +1203,11 @@
 	if (krbtkfile[0] != '\0')
 		env = setEnv( env, "KRBTKFILE", krbtkfile );
 #endif
+#ifdef WITH_CONSOLE_KIT
+	if (ck_session_cookie != NULL) {
+		env = setEnv ( env, "XDG_SESSION_COOKIE", ck_session_cookie );
+	}
+#endif
 	userEnviron = inheritEnv( env, envvars );
 	env = systemEnv( p->pw_name );
 	systemEnviron = setEnv( env, "HOME", p->pw_dir );
diff -Nur kdebase-3.5.6/kdm/backend/consolekit.c kdebase-3.5.6-consolekit/kdm/backend/consolekit.c
--- kdebase-3.5.6/kdm/backend/consolekit.c	1970-01-01 01:00:00.000000000 +0100
+++ kdebase-3.5.6-consolekit/kdm/backend/consolekit.c	2007-04-18 00:34:42.000000000 +0200
@@ -0,0 +1,552 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2006-2007 William Jon McCann <mccann at jhu.edu>
+ * Copyright (C) 2007 Kevin Kofler <Kevin at tigcc.ticalc.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#include "dm.h"
+#include "dm_auth.h"
+#include "dm_error.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <pwd.h>
+
+#define DBUS_API_SUBJECT_TO_CHANGE
+#include <dbus/dbus.h>
+
+#include "consolekit.h"
+
+
+#define CK_NAME              "org.freedesktop.ConsoleKit"
+#define CK_PATH              "/org/freedesktop/ConsoleKit"
+#define CK_INTERFACE         "org.freedesktop.ConsoleKit"
+#define CK_MANAGER_PATH      "/org/freedesktop/ConsoleKit/Manager"
+#define CK_MANAGER_INTERFACE "org.freedesktop.ConsoleKit.Manager"
+#define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session"
+
+static DBusConnection *private_connection = NULL;
+
+static void
+add_param_int (DBusMessageIter *iter_struct,
+	       const char      *key,
+	       int              value)
+{
+	DBusMessageIter iter_struct_entry;
+	DBusMessageIter iter_var;
+
+	dbus_message_iter_open_container (iter_struct,
+					  DBUS_TYPE_STRUCT,
+					  NULL,
+					  &iter_struct_entry);
+
+	dbus_message_iter_append_basic (&iter_struct_entry,
+					DBUS_TYPE_STRING,
+					&key);
+
+	dbus_message_iter_open_container (&iter_struct_entry,
+					  DBUS_TYPE_VARIANT,
+					  DBUS_TYPE_INT32_AS_STRING,
+					  &iter_var);
+
+	dbus_message_iter_append_basic (&iter_var,
+					DBUS_TYPE_INT32,
+					&value);
+
+	dbus_message_iter_close_container (&iter_struct_entry,
+					   &iter_var);
+
+	dbus_message_iter_close_container (iter_struct, &iter_struct_entry);
+}
+
+static void
+add_param_boolean (DBusMessageIter *iter_struct,
+		   const char      *key,
+		   int             value)
+{
+	DBusMessageIter iter_struct_entry;
+	DBusMessageIter iter_var;
+
+	dbus_message_iter_open_container (iter_struct,
+					  DBUS_TYPE_STRUCT,
+					  NULL,
+					  &iter_struct_entry);
+
+	dbus_message_iter_append_basic (&iter_struct_entry,
+					DBUS_TYPE_STRING,
+					&key);
+
+	dbus_message_iter_open_container (&iter_struct_entry,
+					  DBUS_TYPE_VARIANT,
+					  DBUS_TYPE_BOOLEAN_AS_STRING,
+					  &iter_var);
+
+	dbus_message_iter_append_basic (&iter_var,
+					DBUS_TYPE_BOOLEAN,
+					&value);
+
+	dbus_message_iter_close_container (&iter_struct_entry,
+					   &iter_var);
+
+	dbus_message_iter_close_container (iter_struct, &iter_struct_entry);
+}
+
+static void
+add_param_string (DBusMessageIter *iter_struct,
+		  const char      *key,
+		  const char      *value)
+{
+	DBusMessageIter iter_struct_entry;
+	DBusMessageIter iter_var;
+
+	dbus_message_iter_open_container (iter_struct,
+					  DBUS_TYPE_STRUCT,
+					  NULL,
+					  &iter_struct_entry);
+
+	dbus_message_iter_append_basic (&iter_struct_entry,
+					DBUS_TYPE_STRING,
+					&key);
+
+	dbus_message_iter_open_container (&iter_struct_entry,
+					  DBUS_TYPE_VARIANT,
+					  DBUS_TYPE_STRING_AS_STRING,
+					  &iter_var);
+
+	dbus_message_iter_append_basic (&iter_var,
+					DBUS_TYPE_STRING,
+					&value);
+
+	dbus_message_iter_close_container (&iter_struct_entry,
+					   &iter_var);
+
+	dbus_message_iter_close_container (iter_struct, &iter_struct_entry);
+}
+
+static int
+session_get_x11_display (DBusConnection *connection,
+			 const char     *ssid,
+			 char          **str)
+{
+	DBusError       error;
+	DBusMessage    *message;
+	DBusMessage    *reply;
+	DBusMessageIter iter;
+	const char     *value;
+
+	if (str != NULL) {
+		*str = NULL;
+	}
+
+	message = dbus_message_new_method_call (CK_NAME,
+						ssid,
+						CK_SESSION_INTERFACE,
+						"GetX11Display");
+	if (message == NULL) {
+		Debug ("ConsoleKit: Couldn't allocate the D-Bus message");
+		return FALSE;
+	}
+
+	dbus_error_init (&error);
+	reply = dbus_connection_send_with_reply_and_block (connection,
+							   message,
+							   -1, &error);
+	if (dbus_error_is_set (&error)) {
+		Debug ("ConsoleKit: %s raised:\n %s\n\n", error.name, error.message);
+		reply = NULL;
+	}
+
+	dbus_connection_flush (connection);
+	dbus_message_unref (message);
+
+	if (reply == NULL) {
+		return FALSE;
+	}
+
+	dbus_message_iter_init (reply, &iter);
+	dbus_message_iter_get_basic (&iter, &value);
+	if (str != NULL) {
+		*str = strdup (value);
+	}
+	dbus_message_unref (reply);
+
+	return TRUE;
+}
+
+static int
+session_unlock (DBusConnection *connection,
+		const char     *ssid)
+{
+	DBusError       error;
+	DBusMessage    *message;
+	DBusMessage    *reply;
+
+	Debug ("ConsoleKit: Unlocking session %s", ssid);
+	message = dbus_message_new_method_call (CK_NAME,
+						ssid,
+						CK_SESSION_INTERFACE,
+						"Unlock");
+	if (message == NULL) {
+		Debug ("ConsoleKit: Couldn't allocate the D-Bus message");
+		return FALSE;
+	}
+
+	dbus_error_init (&error);
+	reply = dbus_connection_send_with_reply_and_block (connection,
+							   message,
+							   -1, &error);
+	dbus_message_unref (message);
+	dbus_message_unref (reply);
+	dbus_connection_flush (connection);
+
+	if (dbus_error_is_set (&error)) {
+		Debug ("ConsoleKit: %s raised:\n %s\n\n", error.name, error.message);
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+/* from libhal */
+static char **
+get_path_array_from_iter (DBusMessageIter *iter,
+			  int             *num_elements)
+{
+	int count;
+	char **buffer;
+
+	count = 0;
+	buffer = (char **)malloc (sizeof (char *) * 8);
+
+	if (buffer == NULL)
+		goto oom;
+
+	buffer[0] = NULL;
+	while (dbus_message_iter_get_arg_type (iter) == DBUS_TYPE_OBJECT_PATH) {
+		const char *value;
+		char *str;
+
+		if ((count % 8) == 0 && count != 0) {
+			buffer = realloc (buffer, sizeof (char *) * (count + 8));
+			if (buffer == NULL)
+				goto oom;
+		}
+
+		dbus_message_iter_get_basic (iter, &value);
+		str = strdup (value);
+		if (str == NULL)
+			goto oom;
+
+		buffer[count] = str;
+
+		dbus_message_iter_next (iter);
+		count++;
+	}
+
+	if ((count % 8) == 0) {
+		buffer = realloc (buffer, sizeof (char *) * (count + 1));
+		if (buffer == NULL)
+			goto oom;
+	}
+
+	buffer[count] = NULL;
+	if (num_elements != NULL)
+		*num_elements = count;
+	return buffer;
+
+oom:
+	LogWarn ("%s %d : error allocating memory\n", __FILE__, __LINE__);
+	return NULL;
+
+}
+
+static char **
+get_sessions_for_user (DBusConnection *connection,
+		       const char     *user,
+		       const char     *x11_display)
+{
+	DBusError       error;
+	DBusMessage    *message;
+	DBusMessage    *reply;
+	DBusMessageIter iter;
+	DBusMessageIter iter_reply;
+	DBusMessageIter iter_array;
+	struct passwd	*pwent;
+	char           **sessions;
+
+	sessions = NULL;
+	message = NULL;
+	reply = NULL;
+
+	pwent = getpwnam (user);
+
+	dbus_error_init (&error);
+	message = dbus_message_new_method_call (CK_NAME,
+						CK_MANAGER_PATH,
+						CK_MANAGER_INTERFACE,
+						"GetSessionsForUser");
+	if (message == NULL) {
+		Debug ("ConsoleKit: Couldn't allocate the D-Bus message");
+		goto out;
+	}
+
+	dbus_message_iter_init_append (message, &iter);
+	dbus_message_iter_append_basic (&iter,
+					DBUS_TYPE_UINT32,
+					&pwent->pw_uid);
+
+	dbus_error_init (&error);
+	reply = dbus_connection_send_with_reply_and_block (connection,
+							   message,
+							   -1, &error);
+	dbus_connection_flush (connection);
+
+	if (dbus_error_is_set (&error)) {
+		Debug ("ConsoleKit: %s raised:\n %s\n\n", error.name, error.message);
+		goto out;
+	}
+
+	if (reply == NULL) {
+		Debug ("ConsoleKit: No reply for GetSessionsForUser");
+		goto out;
+	}
+
+	dbus_message_iter_init (reply, &iter_reply);
+	if (dbus_message_iter_get_arg_type (&iter_reply) != DBUS_TYPE_ARRAY) {
+		Debug ("ConsoleKit: Wrong reply for GetSessionsForUser - expecting an array.");
+		goto out;
+	}
+
+	dbus_message_iter_recurse (&iter_reply, &iter_array);
+	sessions = get_path_array_from_iter (&iter_array, NULL);
+
+ out:
+	if (message != NULL) {
+		dbus_message_unref (message);
+	}
+	if (reply != NULL) {
+		dbus_message_unref (reply);
+	}
+
+	return sessions;
+}
+
+void
+unlock_ck_session (const char *user,
+		   const char *x11_display)
+{
+	DBusError       error;
+	DBusConnection *connection;
+	char           **sessions;
+	int              i;
+
+	Debug ("ConsoleKit: Unlocking session for %s on %s", user, x11_display);
+
+	dbus_error_init (&error);
+	connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
+	if (connection == NULL) {
+		Debug ("ConsoleKit: Failed to connect to the D-Bus daemon: %s", error.message);
+		dbus_error_free (&error);
+		return;
+	}
+
+	sessions = get_sessions_for_user (connection, user, x11_display);
+	if (sessions == NULL || sessions[0] == NULL) {
+		Debug ("ConsoleKit: no sessions found");
+		return;
+	}
+
+	for (i = 0; sessions[i] != NULL; i++) {
+		char *ssid;
+		char *xdisplay;
+
+		ssid = sessions[i];
+		session_get_x11_display (connection, ssid, &xdisplay);
+		Debug ("ConsoleKit: session %s has DISPLAY %s", ssid, xdisplay);
+
+		if (xdisplay != NULL
+		    && x11_display != NULL
+		    && strcmp (xdisplay, x11_display) == 0) {
+			int res;
+
+			res = session_unlock (connection, ssid);
+			if (! res) {
+				LogError ("ConsoleKit: Unable to unlock %s", ssid);
+			}
+		}
+
+		free (xdisplay);
+	}
+
+	freeStrArr (sessions);
+}
+
+char *
+open_ck_session (struct passwd *pwent,
+		 struct display *d)
+{
+	DBusConnection *connection;
+	DBusError       error;
+	DBusMessage    *message;
+	DBusMessage    *reply;
+	DBusMessageIter iter;
+	DBusMessageIter iter_struct;
+	char	       *cookie;
+
+	cookie = NULL;
+
+	Debug ("ConsoleKit: Opening session for %s", pwent->pw_name);
+
+	dbus_error_init (&error);
+	connection = dbus_bus_get_private (DBUS_BUS_SYSTEM, &error);
+	private_connection = connection;
+
+	if (connection == NULL) {
+		Debug ("ConsoleKit: Failed to connect to the D-Bus daemon: %s", error.message);
+		dbus_error_free (&error);
+		return NULL;
+	}
+
+	dbus_connection_set_exit_on_disconnect (connection, FALSE);
+	/* FIXME: What to do about these?
+	dbus_connection_set_watch_functions( connection,
+	                                     dbusAddWatch,
+	                                     dbusRemoveWatch,
+	                                     dbusToggleWatch,
+	                                     data, 0 );
+	dbus_connection_set_timeout_functions( connection,
+	                                       dbusAddTimeout,
+	                                       dbusRemoveTimeout,
+	                                       dbusToggleTimeout,
+	                                       data, 0 );
+	dbus_connection_set_wakeup_main_function( connection,
+	                                          dbusWakeupMain,
+	                                          data, 0 ); */
+
+	dbus_error_init (&error);
+	message = dbus_message_new_method_call (CK_NAME,
+						CK_MANAGER_PATH,
+						CK_MANAGER_INTERFACE,
+						"OpenSessionWithParameters");
+	if (message == NULL) {
+		Debug ("ConsoleKit: Couldn't allocate the D-Bus message");
+		return NULL;
+	}
+
+	dbus_message_iter_init_append (message, &iter);
+	dbus_message_iter_open_container (&iter,
+					  DBUS_TYPE_ARRAY,
+					  DBUS_STRUCT_BEGIN_CHAR_AS_STRING
+					  DBUS_TYPE_STRING_AS_STRING
+					  DBUS_TYPE_VARIANT_AS_STRING
+					  DBUS_STRUCT_END_CHAR_AS_STRING,
+					  &iter_struct);
+
+	add_param_int (&iter_struct, "user", pwent->pw_uid);
+	add_param_string (&iter_struct, "x11-display", d->name);
+	add_param_boolean (&iter_struct, "is-local", ((d->displayType & d_location) == dLocal));
+#ifdef XDMCP
+	if ((d->displayType & d_location) != dLocal) {
+		add_param_string (&iter_struct, "remote-host-name", d->remoteHost);
+	}
+#endif
+
+#ifdef HAVE_VTS
+	if (d->serverVT > 0) {
+		char device[20];
+
+		/* FIXME: how does xorg construct this */
+		sprintf(device, "/dev/tty%d", d->serverVT);
+		add_param_string (&iter_struct, "x11-display-device", device);
+	}
+#endif
+
+	dbus_message_iter_close_container (&iter, &iter_struct);
+
+	reply = dbus_connection_send_with_reply_and_block (connection,
+							   message,
+							   -1, &error);
+	if (dbus_error_is_set (&error)) {
+		Debug ("ConsoleKit: %s raised:\n %s\n\n", error.name, error.message);
+		reply = NULL;
+	}
+
+	dbus_connection_flush (connection);
+
+	dbus_message_unref (message);
+	dbus_error_free (&error);
+
+	if (reply != NULL) {
+		const char *value;
+
+		dbus_message_iter_init (reply, &iter);
+		dbus_message_iter_get_basic (&iter, &value);
+		cookie = strdup (value);
+		dbus_message_unref (reply);
+	}
+
+	return cookie;
+}
+
+void
+close_ck_session (const char *cookie)
+{
+	DBusError       error;
+	DBusMessage    *message;
+	DBusMessage    *reply;
+	DBusMessageIter iter;
+
+	if (cookie == NULL) {
+		return;
+	}
+
+	if (private_connection == NULL) {
+		return;
+	}
+
+	dbus_error_init (&error);
+	message = dbus_message_new_method_call (CK_NAME,
+						CK_MANAGER_PATH,
+						CK_MANAGER_INTERFACE,
+						"CloseSession");
+	if (message == NULL) {
+		Debug ("ConsoleKit: Couldn't allocate the D-Bus message");
+		return;
+	}
+
+	dbus_message_iter_init_append (message, &iter);
+	dbus_message_iter_append_basic (&iter,
+					DBUS_TYPE_STRING,
+					&cookie);
+
+	reply = dbus_connection_send_with_reply_and_block (private_connection,
+							   message,
+							   -1, &error);
+	if (dbus_error_is_set (&error)) {
+		Debug ("ConsoleKit: %s raised:\n %s\n\n", error.name, error.message);
+		reply = NULL;
+	}
+
+	dbus_connection_flush (private_connection);
+
+	dbus_message_unref (message);
+	dbus_error_free (&error);
+
+        dbus_connection_close (private_connection);
+	private_connection = NULL;
+}
diff -Nur kdebase-3.5.6/kdm/backend/consolekit.h kdebase-3.5.6-consolekit/kdm/backend/consolekit.h
--- kdebase-3.5.6/kdm/backend/consolekit.h	1970-01-01 01:00:00.000000000 +0100
+++ kdebase-3.5.6-consolekit/kdm/backend/consolekit.h	2007-04-18 00:34:51.000000000 +0200
@@ -0,0 +1,36 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2006 William Jon McCann <mccann at jhu.edu>
+ * Copyright (C) 2007 Kevin Kofler <Kevin at tigcc.ticalc.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+
+#ifndef __CONSOLE_KIT_H
+#define __CONSOLE_KIT_H
+
+#include <pwd.h>
+
+struct display;
+
+char *      open_ck_session       (struct passwd *pwent,
+                                   struct display *display);
+void        close_ck_session      (const char    *cookie);
+void        unlock_ck_session     (const char    *user,
+                                   const char    *x11_display);
+
+#endif /* __CONSOLE_KIT_H */
diff -Nur kdebase-3.5.6/kdm/backend/dm.h kdebase-3.5.6-consolekit/kdm/backend/dm.h
--- kdebase-3.5.6/kdm/backend/dm.h	2005-09-10 10:26:12.000000000 +0200
+++ kdebase-3.5.6-consolekit/kdm/backend/dm.h	2007-04-17 23:07:13.000000000 +0200
@@ -37,6 +37,8 @@
 #ifndef _DM_H_
 #define _DM_H_ 1
 
+#define WITH_CONSOLE_KIT
+
 #include "greet.h"
 #include <config.ci>
 
@@ -476,7 +478,11 @@
 #define GCONV_BINARY  5
 typedef char *(*GConvFunc)( int what, const char *prompt );
 int Verify( GConvFunc gconv, int rootok );
+#ifdef WITH_CONSOLE_KIT
+int StartClient( const char *ck_session_cookie );
+#else
 int StartClient( void );
+#endif
 void SessionExit( int status ) ATTR_NORETURN;
 int ReadDmrc( void );
 extern char **userEnviron, **systemEnviron;
diff -Nur kdebase-3.5.6/kdm/backend/Imakefile kdebase-3.5.6-consolekit/kdm/backend/Imakefile
--- kdebase-3.5.6/kdm/backend/Imakefile	2005-09-10 10:26:12.000000000 +0200
+++ kdebase-3.5.6-consolekit/kdm/backend/Imakefile	2007-04-17 20:09:50.000000000 +0200
@@ -155,13 +155,13 @@
 		 netaddr.c reset.c resource.c protodpy.c policy.c \
 		 session.c socket.c streams.c util.c xdmcp.c \
 		 process.c mitauth.c \
-		 genauth.c access.c choose.c \
+		 genauth.c access.c choose.c consolekit.c \
 		 $(XDMAUTHSRCS) $(RPCSRCS) $(KRB5SRCS)
       COMMOBJS = auth.o daemon.o server.o dpylist.o dm.o error.o \
 		 netaddr.o reset.o resource.o protodpy.o policy.o \
 		 session.o socket.o streams.o util.o xdmcp.o \
 		 process.o mitauth.o \
-		 genauth.o access.o choose.o \
+		 genauth.o access.o choose.o consolekit.o \
 		 $(XDMAUTHOBJS) $(RPCOBJS) $(KRB5OBJS)
 
          SRCS1 = $(COMMSRCS) client.c
diff -Nur kdebase-3.5.6/kdm/backend/Makefile.am kdebase-3.5.6-consolekit/kdm/backend/Makefile.am
--- kdebase-3.5.6/kdm/backend/Makefile.am	2005-09-10 10:26:13.000000000 +0200
+++ kdebase-3.5.6-consolekit/kdm/backend/Makefile.am	2007-04-17 22:01:27.000000000 +0200
@@ -1,9 +1,9 @@
 # forcibly remove thread-related defines & flags
 AUTOMAKE_OPTIONS = foreign
-CPPFLAGS = $(USER_INCLUDES) $(X_INCLUDES) $(KRB4_INCS) $(KRB5_INCS) -I.. -I../..
+CPPFLAGS = $(USER_INCLUDES) $(X_INCLUDES) $(KRB4_INCS) $(KRB5_INCS) $(DBUS_INCS) -I.. -I../..
 LDFLAGS = $(USER_LDFLAGS) $(X_LDFLAGS) $(X_RPATH) $(KRB4_RPATH) $(KRB5_RPATH)
 LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(PASSWDLIBS) \
-    $(LIB_LIBS) $(KRB4_LIBS) $(KRB5_LIBS) $(LIBSOCKET) $(LIBRESOLV) \
+    $(LIB_LIBS) $(KRB4_LIBS) $(KRB5_LIBS) $(DBUS_LIBS) $(LIBSOCKET) $(LIBRESOLV) \
     $(LIBUCB) $(LIBUTIL) $(LIBPOSIX4)
 
 bin_PROGRAMS = kdm
@@ -13,6 +13,7 @@
     bootman.c \
     choose.c \
     client.c \
+    consolekit.c \
     ctrl.c \
     daemon.c \
     dm.c \
diff -Nur kdebase-3.5.6/kdm/backend/Makefile.in kdebase-3.5.6-consolekit/kdm/backend/Makefile.in
--- kdebase-3.5.6/kdm/backend/Makefile.in	2007-01-16 10:33:47.000000000 +0100
+++ kdebase-3.5.6-consolekit/kdm/backend/Makefile.in	2007-04-17 22:02:02.000000000 +0200
@@ -55,7 +55,7 @@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_kdm_OBJECTS = access.$(OBJEXT) auth.$(OBJEXT) bootman.$(OBJEXT) \
-	choose.$(OBJEXT) client.$(OBJEXT) ctrl.$(OBJEXT) \
+	choose.$(OBJEXT) client.$(OBJEXT) consolekit.$(OBJEXT) ctrl.$(OBJEXT) \
 	daemon.$(OBJEXT) dm.$(OBJEXT) dpylist.$(OBJEXT) \
 	error.$(OBJEXT) genauth.$(OBJEXT) inifile.$(OBJEXT) \
 	krb5auth.$(OBJEXT) mitauth.$(OBJEXT) netaddr.$(OBJEXT) \
@@ -66,9 +66,9 @@
 	xdmauth.$(OBJEXT) xdmcp.$(OBJEXT)
 #>- kdm_OBJECTS = $(am_kdm_OBJECTS)
 #>+ 13
-kdm_final_OBJECTS = access.o auth.o bootman.o choose.o client.o ctrl.o daemon.o dm.o dpylist.o error.o genauth.o inifile.o krb5auth.o mitauth.o netaddr.o policy.o process.o protodpy.o reset.o resource.o rpcauth.o server.o session.o sessreg.o socket.o streams.o util.o xdmauth.o xdmcp.o 
+kdm_final_OBJECTS = access.o auth.o bootman.o choose.o client.o consolekit.o ctrl.o daemon.o dm.o dpylist.o error.o genauth.o inifile.o krb5auth.o mitauth.o netaddr.o policy.o process.o protodpy.o reset.o resource.o rpcauth.o server.o session.o sessreg.o socket.o streams.o util.o xdmauth.o xdmcp.o 
 kdm_nofinal_OBJECTS = access.$(OBJEXT) auth.$(OBJEXT) bootman.$(OBJEXT) \
-	choose.$(OBJEXT) client.$(OBJEXT) ctrl.$(OBJEXT) \
+	choose.$(OBJEXT) client.$(OBJEXT) consolekit.$(OBJEXT) ctrl.$(OBJEXT) \
 	daemon.$(OBJEXT) dm.$(OBJEXT) dpylist.$(OBJEXT) \
 	error.$(OBJEXT) genauth.$(OBJEXT) inifile.$(OBJEXT) \
 	krb5auth.$(OBJEXT) mitauth.$(OBJEXT) netaddr.$(OBJEXT) \
@@ -125,7 +125,7 @@
 COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
 CONF_FILES = @CONF_FILES@
 CPP = @CPP@
-CPPFLAGS = $(USER_INCLUDES) $(X_INCLUDES) $(KRB4_INCS) $(KRB5_INCS) -I.. -I../..
+CPPFLAGS = $(USER_INCLUDES) $(X_INCLUDES) $(KRB4_INCS) $(KRB5_INCS) $(DBUS_LIBS) -I.. -I../..
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@@ -594,7 +594,7 @@
 # forcibly remove thread-related defines & flags
 AUTOMAKE_OPTIONS = foreign
 LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(PASSWDLIBS) \
-    $(LIB_LIBS) $(KRB4_LIBS) $(KRB5_LIBS) $(LIBSOCKET) $(LIBRESOLV) \
+    $(LIB_LIBS) $(KRB4_LIBS) $(KRB5_LIBS) $(DBUS_LIBS) $(LIBSOCKET) $(LIBRESOLV) \
     $(LIBUCB) $(LIBUTIL) $(LIBPOSIX4)
 
 kdm_SOURCES = \
@@ -603,6 +603,7 @@
     bootman.c \
     choose.c \
     client.c \
+    consolekit.c \
     ctrl.c \
     daemon.c \
     dm.c \
@@ -724,6 +725,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/bootman.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/choose.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/client.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/consolekit.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ctrl.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/daemon.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dm.Po at am__quote@
@@ -1032,6 +1034,7 @@
 $(srcdir)/daemon.c: ../config.ci 
 nmcheck-am: nmcheck
 $(srcdir)/server.c: ../config.ci 
+$(srcdir)/consolekit.c: ../config.ci 
 $(srcdir)/client.c: ../config.ci 
 $(srcdir)/util.c: ../config.ci 
 $(srcdir)/policy.c: ../config.ci 
diff -Nur kdebase-3.5.6/kdm/backend/session.c kdebase-3.5.6-consolekit/kdm/backend/session.c
--- kdebase-3.5.6/kdm/backend/session.c	2006-01-19 18:03:14.000000000 +0100
+++ kdebase-3.5.6-consolekit/kdm/backend/session.c	2007-04-18 00:35:14.000000000 +0200
@@ -45,6 +45,10 @@
 #include <ctype.h>
 #include <signal.h>
 
+#ifdef WITH_CONSOLE_KIT
+#include "consolekit.h"
+#endif
+
 struct display *td;
 const char *td_setup = "auto";
 
@@ -525,6 +529,9 @@
 	int ex, cmd;
 	volatile int clientPid = 0;
 	Time_t tdiff;
+#ifdef WITH_CONSOLE_KIT
+	char *ck_session_cookie;
+#endif
 
 	td = d;
 	Debug( "ManageSession %s\n", d->name );
@@ -620,7 +627,12 @@
 	if (td_setup)
 		SetupDisplay( td_setup );
 
+#ifdef WITH_CONSOLE_KIT
+	ck_session_cookie = open_ck_session (getpwnam(d->userName), d);
+	if (!(clientPid = StartClient(ck_session_cookie))) {
+#else
 	if (!(clientPid = StartClient())) {
+#endif
 		LogError( "Client start failed\n" );
 		SessionExit( EX_NORMAL ); /* XXX maybe EX_REMANAGE_DPY? -- enable in dm.c! */
 	}
@@ -642,6 +654,14 @@
 				catchTerm( SIGTERM );
 		}
 	}
+
+#ifdef WITH_CONSOLE_KIT
+	if (ck_session_cookie != NULL) {
+		close_ck_session (ck_session_cookie);
+		free (ck_session_cookie);
+	}
+#endif
+
 	/*
 	 * Sometimes the Xsession somehow manages to exit before
 	 * a server crash is noticed - so we sleep a bit and wait
diff -Nur kdebase-3.5.6/kdm/configure.in.in kdebase-3.5.6-consolekit/kdm/configure.in.in
--- kdebase-3.5.6/kdm/configure.in.in	2006-01-19 18:03:15.000000000 +0100
+++ kdebase-3.5.6-consolekit/kdm/configure.in.in	2007-04-17 22:00:06.000000000 +0200
@@ -240,4 +240,51 @@
     AC_DEFINE(WITH_KDM_XCONSOLE, 1, [Build kdm with built-in xconsole])
 fi
 
+########### Check for DBus
+
+  AC_MSG_CHECKING(for DBus)
+
+  dbus_inc=NOTFOUND
+  dbus_lib=NOTFOUND
+  dbus=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/dbus.h, $search_incs, dbus_incdir)
+
+  search_incs_arch_deps="$kde_includes $kde_extra_includes /usr/lib$kdelibsuff/dbus-1.0/include /usr/local/lib$kdelibsuff/dbus-1.0/include"
+  AC_FIND_FILE(dbus/dbus-arch-deps.h, $search_incs_arch_deps, dbus_incdir_arch_deps)
+
+  if test -r $dbus_incdir/dbus/dbus.h && test -r $dbus_incdir_arch_deps/dbus/dbus-arch-deps.h ; then
+    DBUS_INCS="-I$dbus_incdir -I$dbus_incdir_arch_deps"
+    dbus_inc=FOUND
+  fi
+
+  search_libs="$kde_libraries $kde_extra_libs /usr/lib$kdelibsuff /usr/local/lib$kdelibsuff"
+  AC_FIND_FILE(libdbus-1.so, $search_libs, dbus_libdir)
+
+  if test -r $dbus_libdir/libdbus-1.so ; then
+    DBUS_LIBS="-L$dbus_libdir -ldbus-1"
+    dbus_lib=FOUND
+  fi
+
+  if test $dbus_inc != FOUND || test $dbus_lib != FOUND ; then 
+    KDE_PKG_CHECK_MODULES( DBUS, "dbus-1", [ DBUS_INCS=$DBUS_CFLAGS; dbus_inc=FOUND; dbus_lib=FOUND; ] , AC_MSG_RESULT( Nothing found on PKG_CONFIG_PATH ) )
+  fi
+
+  dbus_bus_var=`pkg-config --variable=system_bus_default_address dbus-1 2>/dev/null`
+  if test -z "$dbus_bus_var"; then
+        dbus_bus_var="unix:path=/var/run/dbus/system_bus_socket"
+  fi
+  AC_DEFINE_UNQUOTED(DBUS_SYSTEM_BUS, "$dbus_bus_var", [Define the unix domain path for dbus system bus])
+
+  if test $dbus_inc = FOUND && test $dbus_lib = FOUND ; then
+    AC_MSG_RESULT(headers $DBUS_INCS libraries $DBUS_LIBS)
+    dbus=FOUND
+  else
+    AC_MSG_RESULT(searched but not found)
+  fi
+
+  AC_SUBST(DBUS_INCS)
+  AC_SUBST(DBUS_LIBS)
+
 dnl AC_OUTPUT(kdm/kfrontend/sessions/kde.desktop)


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- kdebase.spec	10 Apr 2007 15:51:30 -0000	1.243
+++ kdebase.spec	23 Apr 2007 12:00:08 -0000	1.244
@@ -18,7 +18,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -59,6 +59,7 @@
 Patch24: kdebase-3.5.4-tango-icon-theme.patch
 Patch25: kdebase-3.5.4-konqueror-shortcut.patch
 Patch26: kdebase-3.5.5-suspend.patch
+Patch27: kdebase-3.5.6-consolekit-kdm.patch
 
 Provides: %{name} = %{epoch}:%{version}-%{release}.%{_arch}
 
@@ -180,6 +181,7 @@
 %patch24 -p1 -b .tango-icon-theme
 %patch25 -p1 -b .konqueror-shortcut
 %patch26 -p1 -b .suspend
+%patch27 -p1 -b .consolekit
 
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
@@ -552,6 +554,9 @@
 %exclude %{_libdir}/libkdeinit_*.so
 
 %changelog
+* Mon Apr 23 2007 Than Ngo <than at redhat.com> - 6:3.5.6-6.fc7
+- apply patch KDM to support ConsoleKit, thanks to Kevin Kofler, #228111
+
 * Tue Apr 10 2007 Than Ngo <than at redhat.com> 6:3.5.6-5.fc7
 - fix unknown protocol smb
 - add Buildrequires on libusb-devel



From fedora-cvs-commits at redhat.com  Mon Apr 23 12:11:56 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 08:11:56 -0400
Subject: rpms/desktop-printing/devel desktop-printing.spec, 1.87,
	1.88 redhat-print-applet.desktop, 1.2, 1.3
Message-ID: <200704231211.l3NCBusa011944@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/desktop-printing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11929

Modified Files:
	desktop-printing.spec redhat-print-applet.desktop 
Log Message:
* Mon Apr 23 2007 Tim Waugh <twaugh at redhat.com> 0.20-7
- Updated applet desktop file from CVS for translations.
- Don't ship session CUPS configuration files or gconf schema (bug #237403).
- Resolves: rhbz#237403



Index: desktop-printing.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-printing/devel/desktop-printing.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- desktop-printing.spec	27 Mar 2007 16:33:45 -0000	1.87
+++ desktop-printing.spec	23 Apr 2007 12:11:54 -0000	1.88
@@ -6,7 +6,7 @@
 Summary: Desktop print icon
 Name: desktop-printing
 Version: 0.20
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Applications/File
 Source0: http://download.gnome.org/sources/eggcups/0.20/eggcups-%{version}.tar.bz2
@@ -73,6 +73,10 @@
 
 # Don't ship eggcups.
 rm -f $RPM_BUILD_ROOT%{_bindir}/eggcups
+rm -rf $RPM_BUILD_ROOT%{_datadir}/eggcups/server-root
+rm -rf $RPM_BUILD_ROOT%{_datadir}/eggcups/glade
+rm -f $RPM_BUILD_ROOT%{_datadir}/eggcups/cupsd.conf
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/gconf/*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -97,10 +101,13 @@
 %{_datadir}/applications/gnome-default-printer.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gnome-default-printer.png
 %{_sysconfdir}/dbus-1/system.d/*.conf
-%{_sysconfdir}/gconf/*
 %{_sysconfdir}/xdg/autostart/*.desktop
 
 %changelog
+* Mon Apr 23 2007 Tim Waugh <twaugh at redhat.com> 0.20-7
+- Updated applet desktop file from CVS for translations.
+- Don't ship session CUPS configuration files or gconf schema (bug #237403).
+
 * Tue Mar 27 2007 Tim Waugh <twaugh at redhat.com> 0.20-6
 - Ship translations for applet desktop file.
 - Don't ship the eggcups binary.


Index: redhat-print-applet.desktop
===================================================================
RCS file: /cvs/dist/rpms/desktop-printing/devel/redhat-print-applet.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- redhat-print-applet.desktop	27 Mar 2007 16:33:45 -0000	1.2
+++ redhat-print-applet.desktop	23 Apr 2007 12:11:54 -0000	1.3
@@ -1,30 +1,60 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Print queue applet
+Name[bg]=?????????? ???? ?????????? ???? ????????????????
+Name[bn_IN]=????????????????????? ???????????? ????????????????????? ???????????????????????????
+Name[ca]=Miniaplicaci?? de la cua d'impressi??
+Name[cs]=Aplet tiskov?? fronty
+Name[de]=Drucke Warteschlange-Applet
 Name[es]=Applet de la cola de impresi??n
 Name[fi]=Tulostusjonosovelma
+Name[fr]=Applet de file d'impression
 Name[gu]=???????????? ???????????? ??????????????????
+Name[hi]=?????????????????? ???????????? ????????????????????????
 Name[hr]=Aplet ??ekanja ispisa
+Name[hu]=Nyomtat??sisor-alkalmaz??s
 Name[it]=Applet coda di stampa
+Name[ms]=Applet giliran cetakan
+Name[nb]=Panelprogram for utskriftsk??
+Name[nl]=Printwachtrij-applet
+Name[or]=?????????????????? ???????????? ???????????????????????? ?????????????????? ??????????????????
 Name[pl]=Aplet kolejki drukowania
 Name[pt]='Applet' da fila de impress??o
-Name[pt_BR]=Applet de fila de Impress??o
+Name[pt_BR]=Miniaplicativo da fila de impress??o
+Name[ro]=Aplica??ie pentru coada de a??teptare la imprimare
 Name[ru]=???????????? ?????????????? ???????????? 
 Name[sr]=?????????????????? ???? ???????????????? ????????
 Name[sr at Latn]=Program??e za ??tampanje reda
+Name[sv]=Applet f??r skrivark??
+Name[ta]=??????????????? ??????????????? ???????????????????????????
 Name[uk]=?????????? ?????????? ??????????
 Comment=System tray icon for managing print jobs
+Comment[bg]=Systray ?????????? ???? ???????????????????? ???? ???????????????? ???? ????????????????
+Comment[bn_IN]=????????????????????? ???????????? ??????????????????????????? ???????????? ?????????????????????-???????????? ?????? ??????????????????????????????????????? ????????????
+Comment[ca]=Icona de la safata del sistema per a gestionar tasques d'impressi??
+Comment[cs]=Ikona v oznamovac?? oblasti pro spr??vu tiskov??ch ??loh
+Comment[de]=Systemablage-Symbol zur Verwaltung von Druck-Jobs
 Comment[es]=Icono del area de notificaci??n para administrar trabajos de impresi??n
 Comment[fi]=Ilmoitusalueen kuvake tulostust??iden hallintaan
+Comment[fr]=Zone de notification pour la gestion des t??ches d'impression
 Comment[gu]=???????????? ??????????????????????????? ???????????????????????? ???????????? ???????????? ?????????????????? ???????????? ???????????????
+Comment[hi]=???????????? ????????? ????????????????????? ?????? ???????????? ?????????????????? ???????????? ??????????????????
 Comment[hr]=Ikona sistemske trake za upravljanje zadacima ispisivanja
+Comment[hu]=Rendszert??lca-ikon nyomtat??si feladatok kezel??s??hez
 Comment[it]=Icona della system tray per gestire i lavori di stampa
+Comment[nb]=Varselikon for utskriftsjobber for systemomr??det
+Comment[nl]=Systeemvak icoon voor het beheren van printopdrachten
+Comment[or]=?????????????????? ????????????????????? ????????????????????? ???????????????????????? ??????????????? ???????????? ?????????????????? ???????????? ?????????????????????????????????
 Comment[pl]=Ikona w obszarze powiadamiania do zarz??dzania zadaniami wydruku
 Comment[pt]=??cone da bandeja para gerir as tarefas de impress??o
-Comment[pt_BR]=Icone no sistema de bandeja (tray) para gerenciamento de trabalhos de impress??o.
+Comment[pt_BR]=??cone de bandeja do sistema para gerenciamento de trabalhos de impress??o
+Comment[ro]=Pictogram?? bara de sistem pentru managementul lucr??rilor de imprimare
 Comment[ru]=???????????? ???????????????????? ???????? ?????? ???????????????????? ?????????????????? ????????????
+Comment[sk]=Ikona syst??mov??ho z??sobn??ka pre spr??vu tla??ov??ch ??loh
 Comment[sr]=?????????? ?????????????????? ?????????????????????? ???????? ???? ?????????????????? ?????????????????????? ??????????????????
 Comment[sr at Latn]=Ikona sistemske obave??tajne zone za upravljanje ??tamparskim poslovima
+Comment[sv]=Aktivitetsf??ltsikon f??r administrera skrivarjobb
+Comment[ta]=??????????????? ?????????????????? ???????????????????????? ??????????????? ???????????? ??????????????? ?????????????????????
 Comment[uk]=???????????? ?? ?????????????????? ?????????????? ?????? ?????????????????? ???????????????????? ??????????
 Exec=/usr/bin/system-config-printer-applet
 Terminal=false



From fedora-cvs-commits at redhat.com  Mon Apr 23 12:38:51 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 08:38:51 -0400
Subject: rpms/eel2/devel eel2.spec,1.68,1.69
Message-ID: <200704231238.l3NCcp1H031210@cvs.devel.redhat.com>

Author: alexl

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

Modified Files:
	eel2.spec 
Log Message:
* Mon Apr 23 2007  <alexl at redhat.com> - 2.18.0.1-5
- spec cleanup from merge review (#225718)



Index: eel2.spec
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- eel2.spec	18 Apr 2007 15:31:57 -0000	1.68
+++ eel2.spec	23 Apr 2007 12:38:49 -0000	1.69
@@ -13,16 +13,16 @@
 
 %define po_package eel-2.0
 
-Name:		eel2
-Summary:        Eazel Extensions Library
-Version: 	2.18.0.1
-Release: 	4%{?dist}
-License: 	LGPL
-Group: System Environment/Libraries
-Source: 	eel-%{version}.tar.bz2
-URL: 		http://www.gnome.org/projects/nautilus/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-	
+Name:        eel2
+Summary:     Eazel Extensions Library
+Version:     2.18.0.1
+Release:     5%{?dist}
+License:     LGPL
+Group:       System Environment/Libraries
+Source:      ftp://ftp.gnome.org/pub/gnome/sources/eel/2.18/eel-%{version}.tar.bz2
+URL:         http://www.gnome.org/projects/nautilus/
+BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+    
 Requires: pango >= %{pango_version}
 Requires: gtk2 >= %{gtk2_version}
 Requires: libgnomeui >= %{libgnomeui_version}
@@ -81,8 +81,11 @@
 
 %patch1 -p1 -b .gnome-bg
 
+# Fix spurious exec permissions
+chmod a-x COPYING
+
 %build
-CFLAGS="$RPM_OPT_FLAGS -g -DEEL_OMIT_SELF_CHECK" %configure
+CFLAGS="$RPM_OPT_FLAGS -DEEL_OMIT_SELF_CHECK" %configure
 export tagname=CC
 make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
 
@@ -111,10 +114,13 @@
 %files devel
 %defattr(-,root,root)
 %{_libdir}/*.so
-%{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
 %{_includedir}/eel-2
 
 %changelog
+* Mon Apr 23 2007  <alexl at redhat.com> - 2.18.0.1-5
+- spec cleanup from merge review (#225718)
+
 * Wed Apr 18 2007 Soren Sandmann <sandmann at redhat.com> - 2.18.0.1-4
 - Fix bug in gnome-bg patch where resetting backgrounds didn't work.
 



From fedora-cvs-commits at redhat.com  Mon Apr 23 13:04:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 09:04:50 -0400
Subject: rpms/which/devel which-2.csh,1.2,1.3 which.spec,1.12,1.13
Message-ID: <200704231304.l3ND4o7Q017661@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/which/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17418

Modified Files:
	which.spec 
Added Files:
	which-2.csh 
Log Message:
- add missing which-2 script for csh
- cleanup specfile #226539




Index: which-2.csh
===================================================================
RCS file: which-2.csh
diff -N which-2.csh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ which-2.csh	23 Apr 2007 13:04:48 -0000	1.3
@@ -0,0 +1,4 @@
+# Initialization script for csh
+
+# export AFS, if you are in AFS environment
+alias which 'alias | /usr/bin/which --tty-only --read-alias --show-dot --show-tilde'


Index: which.spec
===================================================================
RCS file: /cvs/dist/rpms/which/devel/which.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- which.spec	22 Jan 2007 10:45:31 -0000	1.12
+++ which.spec	23 Apr 2007 13:04:48 -0000	1.13
@@ -1,18 +1,18 @@
-Summary: Displays where a particular program in your path is located.
+Summary: Displays where a particular program in your path is located
 Name: which
 Version: 2.16
-Release: 8
+Release: 9%{?dist}
 License: GPL
 Group: Applications/System
 Source0: http://www.xs4all.nl/~carlo17/which/%{name}-%{version}.tar.gz
 Source1: which-2.sh
+Source2: which-2.csh
 Url: http://www.xs4all.nl/~carlo17/which/
 Patch: which-2.13-afs.patch
 Patch1: which-2.14-broken.patch
-Prefix: %{_prefix}
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Prereq: /sbin/install-info
-Prereq: dev
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires(preun): /sbin/install-info
+Requires(post): /sbin/install-info
 
 %description
 The which command shows the full pathname of a specified program, if
@@ -20,20 +20,22 @@
 
 %prep
 %setup -q
+
 %patch -p1 -b .afs
 %patch1 -p1 -b .broken
 
 %build
 %configure
 
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
+
 mkdir -p $RPM_BUILD_ROOT/etc/profile.d
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/profile.d
+install -p -m 755 %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d/
 
 %post
 /sbin/install-info --quiet --info-dir=%{_infodir} %{_infodir}/which.info.gz > /dev/null 2>&1 || :
@@ -48,13 +50,17 @@
 
 %files
 %defattr(-,root,root)
-%doc EXAMPLES README AUTHORS NEWS
-%{_bindir}/*
+%doc COPYING AUTHORS LICENSE EXAMPLES README AUTHORS NEWS
 %config /etc/profile.d/which-2.*
+%{_bindir}/*
 %{_infodir}/which.info.gz
 %{_mandir}/*/*
 
 %changelog
+* Mon Apr 23 2007 Than Ngo <than at redhat.com> - 2.16-9.fc7
+- add missing which-2 script for csh
+- cleanup specfile #226539
+
 * Mon Jan 22 2007 Than Ngo <than at redhat.com> - 2.16-8
 - install-info scriptlet failures
 



From fedora-cvs-commits at redhat.com  Mon Apr 23 14:38:04 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 10:38:04 -0400
Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.117,
	1.118 libselinux.spec, 1.262, 1.263
Message-ID: <200704231438.l3NEc4H6022273@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Mon Apr 23 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.13-2
- Add get_context_list funcitions to swig file


libselinux-rhat.patch:
 selinux.py         |   21 +
 selinuxswig.i      |   26 +
 selinuxswig_wrap.c |  909 ++++++++++++++++++++++++++++++++++++++++++-----------
 3 files changed, 766 insertions(+), 190 deletions(-)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- libselinux-rhat.patch	12 Apr 2007 20:07:39 -0000	1.117
+++ libselinux-rhat.patch	23 Apr 2007 14:38:02 -0000	1.118
@@ -1,8 +1,79 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-2.0.12/src/selinuxswig.i
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0.13/src/selinux.py
+--- nsalibselinux/src/selinux.py	2007-02-22 08:53:23.000000000 -0500
++++ libselinux-2.0.13/src/selinux.py	2007-04-23 10:26:41.000000000 -0400
+@@ -48,8 +48,19 @@
+ del types
+ 
+ 
++SELINUX_DEFAULTUSER = _selinux.SELINUX_DEFAULTUSER
++get_ordered_context_list = _selinux.get_ordered_context_list
++get_ordered_context_list_with_level = _selinux.get_ordered_context_list_with_level
++get_default_context = _selinux.get_default_context
++get_default_context_with_level = _selinux.get_default_context_with_level
++get_default_context_with_role = _selinux.get_default_context_with_role
++get_default_context_with_rolelevel = _selinux.get_default_context_with_rolelevel
++query_user_context = _selinux.query_user_context
++manual_user_enter_context = _selinux.manual_user_enter_context
+ is_selinux_enabled = _selinux.is_selinux_enabled
+ is_selinux_mls_enabled = _selinux.is_selinux_mls_enabled
++freecon = _selinux.freecon
++freeconary = _selinux.freeconary
+ getcon = _selinux.getcon
+ setcon = _selinux.setcon
+ getpidcon = _selinux.getpidcon
+@@ -88,6 +99,8 @@
+ set_matchpathcon_flags = _selinux.set_matchpathcon_flags
+ matchpathcon_init = _selinux.matchpathcon_init
+ matchpathcon = _selinux.matchpathcon
++matchpathcon_init_prefix = _selinux.matchpathcon_init_prefix
++matchpathcon_fini = _selinux.matchpathcon_fini
+ matchmediacon = _selinux.matchmediacon
+ selinux_getenforcemode = _selinux.selinux_getenforcemode
+ selinux_policy_root = _selinux.selinux_policy_root
+@@ -102,6 +115,7 @@
+ selinux_homedir_context_path = _selinux.selinux_homedir_context_path
+ selinux_media_context_path = _selinux.selinux_media_context_path
+ selinux_contexts_path = _selinux.selinux_contexts_path
++selinux_securetty_types_path = _selinux.selinux_securetty_types_path
+ selinux_booleans_path = _selinux.selinux_booleans_path
+ selinux_customizable_types_path = _selinux.selinux_customizable_types_path
+ selinux_users_path = _selinux.selinux_users_path
+@@ -109,13 +123,16 @@
+ selinux_translations_path = _selinux.selinux_translations_path
+ selinux_netfilter_context_path = _selinux.selinux_netfilter_context_path
+ selinux_path = _selinux.selinux_path
+-selinux_check_passwd_access = _selinux.selinux_check_passwd_access
+-checkPasswdAccess = _selinux.checkPasswdAccess
++selinux_check_securetty_context = _selinux.selinux_check_securetty_context
++set_selinuxmnt = _selinux.set_selinuxmnt
+ rpm_execcon = _selinux.rpm_execcon
+ is_context_customizable = _selinux.is_context_customizable
+ selinux_trans_to_raw_context = _selinux.selinux_trans_to_raw_context
+ selinux_raw_to_trans_context = _selinux.selinux_raw_to_trans_context
+ selinux_getpolicytype = _selinux.selinux_getpolicytype
+ getseuserbyname = _selinux.getseuserbyname
++selinux_file_context_cmp = _selinux.selinux_file_context_cmp
++selinux_file_context_verify = _selinux.selinux_file_context_verify
++selinux_lsetfilecon_default = _selinux.selinux_lsetfilecon_default
+ 
+ 
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-2.0.13/src/selinuxswig.i
 --- nsalibselinux/src/selinuxswig.i	2007-04-12 16:02:48.000000000 -0400
-+++ libselinux-2.0.12/src/selinuxswig.i	2007-04-12 12:39:51.000000000 -0400
-@@ -44,6 +44,8 @@
++++ libselinux-2.0.13/src/selinuxswig.i	2007-04-23 10:26:21.000000000 -0400
+@@ -21,6 +21,7 @@
+ %module selinux
+ %{
+ 	#include "selinux/selinux.h"
++	#include "selinux/get_context_list.h"
+ %}
+ %apply int *OUTPUT { int * };
+ %apply int *OUTPUT { size_t * };
+@@ -42,8 +43,12 @@
+ 
+ %typedef unsigned mode_t;
  
++%include "../include/selinux/get_context_list.h"
++
  extern int is_selinux_enabled(void);
  extern int is_selinux_mls_enabled(void);
 +extern void freecon(security_context_t con);
@@ -10,7 +81,7 @@
  extern int getcon(security_context_t *con);
  extern int setcon(security_context_t con);
  extern int getpidcon(int pid, security_context_t *con);
-@@ -90,6 +92,11 @@
+@@ -90,6 +95,11 @@
  			mode_t mode,
  			security_context_t *con);
  
@@ -22,7 +93,7 @@
  extern int matchmediacon(const char *media,
  		 security_context_t *con);
  
-@@ -106,6 +113,7 @@
+@@ -106,6 +116,7 @@
  extern const char *selinux_homedir_context_path(void);
  extern const char *selinux_media_context_path(void);
  extern const char *selinux_contexts_path(void);
@@ -30,7 +101,7 @@
  extern const char *selinux_booleans_path(void);
  extern const char *selinux_customizable_types_path(void);
  extern const char *selinux_users_path(void);
-@@ -113,8 +121,11 @@
+@@ -113,11 +124,15 @@
  extern const char *selinux_translations_path(void);
  extern const char *selinux_netfilter_context_path(void);
  extern const char *selinux_path(void);
@@ -38,13 +109,26 @@
 -extern int checkPasswdAccess(access_vector_t requested);
 +#extern int selinux_check_passwd_access(access_vector_t requested);
 +#extern int checkPasswdAccess(access_vector_t requested);
-+
+ 
 +extern int selinux_check_securetty_context(security_context_t tty_context);
 +void set_selinuxmnt(char *mnt);
- 
++
++#ifdef SWIGpython
  // This tells SWIG to treat char ** as a special case
- %typemap(python,in) char ** {
-@@ -164,3 +175,7 @@
+-%typemap(python,in) char ** {
++%typemap(in) char ** {
+   /* Check if is a list */
+   if (PyList_Check($input)) {
+     int size = PyList_Size($input);
+@@ -143,6 +158,7 @@
+     return NULL;
+   }
+ }
++#endif
+ 
+ extern int rpm_execcon(unsigned int verified, 
+ 		       const char *filename, 
+@@ -164,3 +180,7 @@
  }
  extern int selinux_getpolicytype(char **enforce);
  extern int getseuserbyname(const char *linuxuser, char **seuser, char **level);
@@ -52,3 +136,1092 @@
 +int selinux_file_context_cmp(const security_context_t a, const security_context_t b);
 +int selinux_file_context_verify(const char *path, mode_t mode);
 +int selinux_lsetfilecon_default(const char *path);
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_wrap.c libselinux-2.0.13/src/selinuxswig_wrap.c
+--- nsalibselinux/src/selinuxswig_wrap.c	2007-04-12 16:02:48.000000000 -0400
++++ libselinux-2.0.13/src/selinuxswig_wrap.c	2007-04-23 10:26:41.000000000 -0400
+@@ -2449,11 +2449,11 @@
+ /* -------- TYPES TABLE (BEGIN) -------- */
+ 
+ #define SWIGTYPE_p_SELboolean swig_types[0]
+-#define SWIGTYPE_p_access_vector_t swig_types[1]
+-#define SWIGTYPE_p_char swig_types[2]
+-#define SWIGTYPE_p_int swig_types[3]
+-#define SWIGTYPE_p_p_char swig_types[4]
+-#define SWIGTYPE_p_p_p_char swig_types[5]
++#define SWIGTYPE_p_char swig_types[1]
++#define SWIGTYPE_p_int swig_types[2]
++#define SWIGTYPE_p_p_char swig_types[3]
++#define SWIGTYPE_p_p_p_char swig_types[4]
++#define SWIGTYPE_p_p_security_context_t swig_types[5]
+ #define SWIGTYPE_p_security_context_t swig_types[6]
+ #define SWIGTYPE_p_unsigned_int swig_types[7]
+ static swig_type_info *swig_types[9];
+@@ -2485,6 +2485,99 @@
+ 
+ 
+ 	#include "selinux/selinux.h"
++	#include "selinux/get_context_list.h"
++
++
++SWIGINTERN swig_type_info*
++SWIG_pchar_descriptor(void)
++{
++  static int init = 0;
++  static swig_type_info* info = 0;
++  if (!init) {
++    info = SWIG_TypeQuery("_p_char");
++    init = 1;
++  }
++  return info;
++}
++
++
++SWIGINTERNINLINE PyObject *
++SWIG_FromCharPtrAndSize(const char* carray, size_t size)
++{
++  if (carray) {
++    if (size > INT_MAX) {
++      swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
++      return pchar_descriptor ? 
++	SWIG_NewPointerObj((char *)(carray), pchar_descriptor, 0) : SWIG_Py_Void();
++    } else {
++      return PyString_FromStringAndSize(carray, (int)(size));
++    }
++  } else {
++    return SWIG_Py_Void();
++  }
++}
++
++
++SWIGINTERNINLINE PyObject * 
++SWIG_FromCharPtr(const char *cptr)
++{ 
++  return SWIG_FromCharPtrAndSize(cptr, (cptr ? strlen(cptr) : 0));
++}
++
++
++SWIGINTERN int
++SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
++{
++  if (PyString_Check(obj)) {
++    char *cstr; Py_ssize_t len;
++    PyString_AsStringAndSize(obj, &cstr, &len);
++    if (cptr)  {
++      if (alloc) {
++	/* 
++	   In python the user should not be able to modify the inner
++	   string representation. To warranty that, if you define
++	   SWIG_PYTHON_SAFE_CSTRINGS, a new/copy of the python string
++	   buffer is always returned.
++
++	   The default behavior is just to return the pointer value,
++	   so, be careful.
++	*/ 
++#if defined(SWIG_PYTHON_SAFE_CSTRINGS)
++	if (*alloc != SWIG_OLDOBJ) 
++#else
++	if (*alloc == SWIG_NEWOBJ) 
++#endif
++	  {
++	    *cptr = (char *)memcpy((char *)malloc((len + 1)*sizeof(char)), cstr, sizeof(char)*(len + 1));
++	    *alloc = SWIG_NEWOBJ;
++	  }
++	else {
++	  *cptr = cstr;
++	  *alloc = SWIG_OLDOBJ;
++	}
++      } else {
++	*cptr = PyString_AsString(obj);
++      }
++    }
++    if (psize) *psize = len + 1;
++    return SWIG_OK;
++  } else {
++    swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
++    if (pchar_descriptor) {
++      void* vptr = 0;
++      if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) {
++	if (cptr) *cptr = (char *) vptr;
++	if (psize) *psize = vptr ? (strlen((char *)vptr) + 1) : 0;
++	if (alloc) *alloc = SWIG_OLDOBJ;
++	return SWIG_OK;
++      }
++    }
++  }
++  return SWIG_TypeError;
++}
++
++
++
+ 
+ 
+   #define SWIG_From_long   PyInt_FromLong 
+@@ -2644,74 +2737,6 @@
+ }
+ 
+ 
+-SWIGINTERN swig_type_info*
+-SWIG_pchar_descriptor(void)
+-{
+-  static int init = 0;
+-  static swig_type_info* info = 0;
+-  if (!init) {
+-    info = SWIG_TypeQuery("_p_char");
+-    init = 1;
+-  }
+-  return info;
+-}
+-
+-
+-SWIGINTERN int
+-SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
+-{
+-  if (PyString_Check(obj)) {
+-    char *cstr; Py_ssize_t len;
+-    PyString_AsStringAndSize(obj, &cstr, &len);
+-    if (cptr)  {
+-      if (alloc) {
+-	/* 
+-	   In python the user should not be able to modify the inner
+-	   string representation. To warranty that, if you define
+-	   SWIG_PYTHON_SAFE_CSTRINGS, a new/copy of the python string
+-	   buffer is always returned.
+-
+-	   The default behavior is just to return the pointer value,
+-	   so, be careful.
+-	*/ 
+-#if defined(SWIG_PYTHON_SAFE_CSTRINGS)
+-	if (*alloc != SWIG_OLDOBJ) 
+-#else
+-	if (*alloc == SWIG_NEWOBJ) 
+-#endif
+-	  {
+-	    *cptr = (char *)memcpy((char *)malloc((len + 1)*sizeof(char)), cstr, sizeof(char)*(len + 1));
+-	    *alloc = SWIG_NEWOBJ;
+-	  }
+-	else {
+-	  *cptr = cstr;
+-	  *alloc = SWIG_OLDOBJ;
+-	}
+-      } else {
+-	*cptr = PyString_AsString(obj);
+-      }
+-    }
+-    if (psize) *psize = len + 1;
+-    return SWIG_OK;
+-  } else {
+-    swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
+-    if (pchar_descriptor) {
+-      void* vptr = 0;
+-      if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) {
+-	if (cptr) *cptr = (char *) vptr;
+-	if (psize) *psize = vptr ? (strlen((char *)vptr) + 1) : 0;
+-	if (alloc) *alloc = SWIG_OLDOBJ;
+-	return SWIG_OK;
+-      }
+-    }
+-  }
+-  return SWIG_TypeError;
+-}
+-
+-
+-
+-
+-
+ SWIGINTERN int
+ SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val) 
+ {
+@@ -2781,33 +2806,396 @@
+   return res;
+ }
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++SWIGINTERN PyObject *_wrap_get_ordered_context_list(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
++  PyObject *resultobj = 0;
++  char *arg1 = (char *) 0 ;
++  security_context_t arg2 ;
++  security_context_t **arg3 = (security_context_t **) 0 ;
++  int result;
++  int res1 ;
++  char *buf1 = 0 ;
++  int alloc1 = 0 ;
++  void *argp3 = 0 ;
++  int res3 = 0 ;
++  PyObject * obj0 = 0 ;
++  PyObject * obj1 = 0 ;
++  PyObject * obj2 = 0 ;
++  
++  if (!PyArg_ParseTuple(args,(char *)"OOO:get_ordered_context_list",&obj0,&obj1,&obj2)) SWIG_fail;
++  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
++  if (!SWIG_IsOK(res1)) {
++    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "get_ordered_context_list" "', argument " "1"" of type '" "char const *""'");
++  }
++  arg1 = (char *)(buf1);
++  {
++    arg2 = (security_context_t)PyString_AsString(obj1);
++  }
++  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_p_security_context_t, 0 |  0 );
++  if (!SWIG_IsOK(res3)) {
++    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "get_ordered_context_list" "', argument " "3"" of type '" "security_context_t **""'"); 
++  }
++  arg3 = (security_context_t **)(argp3);
++  result = (int)get_ordered_context_list((char const *)arg1,arg2,arg3);
++  resultobj = SWIG_From_int((int)(result));
++  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
++  return resultobj;
++fail:
++  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
++  return NULL;
++}
++
++
++SWIGINTERN PyObject *_wrap_get_ordered_context_list_with_level(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
++  PyObject *resultobj = 0;
++  char *arg1 = (char *) 0 ;
++  char *arg2 = (char *) 0 ;
++  security_context_t arg3 ;
++  security_context_t **arg4 = (security_context_t **) 0 ;
++  int result;
++  int res1 ;
++  char *buf1 = 0 ;
++  int alloc1 = 0 ;
++  int res2 ;
++  char *buf2 = 0 ;
++  int alloc2 = 0 ;
++  void *argp4 = 0 ;
++  int res4 = 0 ;
++  PyObject * obj0 = 0 ;
++  PyObject * obj1 = 0 ;
++  PyObject * obj2 = 0 ;
++  PyObject * obj3 = 0 ;
++  
++  if (!PyArg_ParseTuple(args,(char *)"OOOO:get_ordered_context_list_with_level",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
++  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
++  if (!SWIG_IsOK(res1)) {
++    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "get_ordered_context_list_with_level" "', argument " "1"" of type '" "char const *""'");
++  }
++  arg1 = (char *)(buf1);
++  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
++  if (!SWIG_IsOK(res2)) {
++    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "get_ordered_context_list_with_level" "', argument " "2"" of type '" "char const *""'");
++  }
++  arg2 = (char *)(buf2);
++  {
++    arg3 = (security_context_t)PyString_AsString(obj2);
++  }
++  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_p_security_context_t, 0 |  0 );
++  if (!SWIG_IsOK(res4)) {
++    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "get_ordered_context_list_with_level" "', argument " "4"" of type '" "security_context_t **""'"); 
++  }
++  arg4 = (security_context_t **)(argp4);
++  result = (int)get_ordered_context_list_with_level((char const *)arg1,(char const *)arg2,arg3,arg4);
++  resultobj = SWIG_From_int((int)(result));
++  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
++  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
++  return resultobj;
++fail:
++  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
++  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
++  return NULL;
++}
++
++
++SWIGINTERN PyObject *_wrap_get_default_context(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
++  PyObject *resultobj = 0;
++  char *arg1 = (char *) 0 ;
++  security_context_t arg2 ;
++  security_context_t *arg3 = (security_context_t *) 0 ;
++  int result;
++  int res1 ;
++  char *buf1 = 0 ;
++  int alloc1 = 0 ;
++  security_context_t temp3 = NULL ;
++  char *temp30 = NULL ;
++  PyObject * obj0 = 0 ;
++  PyObject * obj1 = 0 ;
++  
++  {
++    arg3 = &temp3;
++  }
++  if (!PyArg_ParseTuple(args,(char *)"OO:get_default_context",&obj0,&obj1)) SWIG_fail;
++  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
++  if (!SWIG_IsOK(res1)) {
++    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "get_default_context" "', argument " "1"" of type '" "char const *""'");
++  }
++  arg1 = (char *)(buf1);
++  {
++    arg2 = (security_context_t)PyString_AsString(obj1);
++  }
++  result = (int)get_default_context((char const *)arg1,arg2,arg3);
++  resultobj = SWIG_From_int((int)(result));
++  {
++    if (*arg3)
++    temp30 = *arg3;
++    else
++    temp30 = "";
++    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp30));
++  }
++  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
++  return resultobj;
++fail:
++  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
++  return NULL;
++}
++
++
++SWIGINTERN PyObject *_wrap_get_default_context_with_level(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
++  PyObject *resultobj = 0;
++  char *arg1 = (char *) 0 ;
++  char *arg2 = (char *) 0 ;
++  security_context_t arg3 ;
++  security_context_t *arg4 = (security_context_t *) 0 ;
++  int result;
++  int res1 ;
++  char *buf1 = 0 ;
++  int alloc1 = 0 ;
++  int res2 ;
++  char *buf2 = 0 ;
++  int alloc2 = 0 ;
++  security_context_t temp4 = NULL ;
++  char *temp40 = NULL ;
++  PyObject * obj0 = 0 ;
++  PyObject * obj1 = 0 ;
++  PyObject * obj2 = 0 ;
++  
++  {
++    arg4 = &temp4;
++  }
++  if (!PyArg_ParseTuple(args,(char *)"OOO:get_default_context_with_level",&obj0,&obj1,&obj2)) SWIG_fail;
++  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
++  if (!SWIG_IsOK(res1)) {
++    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "get_default_context_with_level" "', argument " "1"" of type '" "char const *""'");
++  }
++  arg1 = (char *)(buf1);
++  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
++  if (!SWIG_IsOK(res2)) {
++    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "get_default_context_with_level" "', argument " "2"" of type '" "char const *""'");
++  }
++  arg2 = (char *)(buf2);
++  {
++    arg3 = (security_context_t)PyString_AsString(obj2);
++  }
++  result = (int)get_default_context_with_level((char const *)arg1,(char const *)arg2,arg3,arg4);
++  resultobj = SWIG_From_int((int)(result));
++  {
++    if (*arg4)
++    temp40 = *arg4;
++    else
++    temp40 = "";
++    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp40));
++  }
++  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
++  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
++  return resultobj;
++fail:
++  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
++  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
++  return NULL;
++}
++
++
++SWIGINTERN PyObject *_wrap_get_default_context_with_role(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
++  PyObject *resultobj = 0;
++  char *arg1 = (char *) 0 ;
++  char *arg2 = (char *) 0 ;
++  security_context_t arg3 ;
++  security_context_t *arg4 = (security_context_t *) 0 ;
++  int result;
++  int res1 ;
++  char *buf1 = 0 ;
++  int alloc1 = 0 ;
++  int res2 ;
++  char *buf2 = 0 ;
++  int alloc2 = 0 ;
++  security_context_t temp4 = NULL ;
++  char *temp40 = NULL ;
++  PyObject * obj0 = 0 ;
++  PyObject * obj1 = 0 ;
++  PyObject * obj2 = 0 ;
++  
++  {
++    arg4 = &temp4;
++  }
++  if (!PyArg_ParseTuple(args,(char *)"OOO:get_default_context_with_role",&obj0,&obj1,&obj2)) SWIG_fail;
++  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
++  if (!SWIG_IsOK(res1)) {
++    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "get_default_context_with_role" "', argument " "1"" of type '" "char const *""'");
++  }
++  arg1 = (char *)(buf1);
++  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
++  if (!SWIG_IsOK(res2)) {
++    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "get_default_context_with_role" "', argument " "2"" of type '" "char const *""'");
++  }
++  arg2 = (char *)(buf2);
++  {
++    arg3 = (security_context_t)PyString_AsString(obj2);
++  }
++  result = (int)get_default_context_with_role((char const *)arg1,(char const *)arg2,arg3,arg4);
++  resultobj = SWIG_From_int((int)(result));
++  {
++    if (*arg4)
++    temp40 = *arg4;
++    else
++    temp40 = "";
++    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp40));
++  }
++  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
++  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
++  return resultobj;
++fail:
++  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
++  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
++  return NULL;
++}
++
++
++SWIGINTERN PyObject *_wrap_get_default_context_with_rolelevel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
++  PyObject *resultobj = 0;
++  char *arg1 = (char *) 0 ;
++  char *arg2 = (char *) 0 ;
++  char *arg3 = (char *) 0 ;
++  security_context_t arg4 ;
++  security_context_t *arg5 = (security_context_t *) 0 ;
++  int result;
++  int res1 ;
++  char *buf1 = 0 ;
++  int alloc1 = 0 ;
++  int res2 ;
++  char *buf2 = 0 ;
++  int alloc2 = 0 ;
++  int res3 ;
++  char *buf3 = 0 ;
++  int alloc3 = 0 ;
++  security_context_t temp5 = NULL ;
++  char *temp50 = NULL ;
++  PyObject * obj0 = 0 ;
++  PyObject * obj1 = 0 ;
++  PyObject * obj2 = 0 ;
++  PyObject * obj3 = 0 ;
++  
++  {
++    arg5 = &temp5;
++  }
++  if (!PyArg_ParseTuple(args,(char *)"OOOO:get_default_context_with_rolelevel",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
++  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
++  if (!SWIG_IsOK(res1)) {
++    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "get_default_context_with_rolelevel" "', argument " "1"" of type '" "char const *""'");
++  }
++  arg1 = (char *)(buf1);
++  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
++  if (!SWIG_IsOK(res2)) {
++    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "get_default_context_with_rolelevel" "', argument " "2"" of type '" "char const *""'");
++  }
++  arg2 = (char *)(buf2);
++  res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
++  if (!SWIG_IsOK(res3)) {
++    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "get_default_context_with_rolelevel" "', argument " "3"" of type '" "char const *""'");
++  }
++  arg3 = (char *)(buf3);
++  {
++    arg4 = (security_context_t)PyString_AsString(obj3);
++  }
++  result = (int)get_default_context_with_rolelevel((char const *)arg1,(char const *)arg2,(char const *)arg3,arg4,arg5);
++  resultobj = SWIG_From_int((int)(result));
++  {
++    if (*arg5)
++    temp50 = *arg5;
++    else
++    temp50 = "";
++    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp50));
++  }
++  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
++  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
++  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
++  return resultobj;
++fail:
++  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
++  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
++  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
++  return NULL;
++}
++
++
++SWIGINTERN PyObject *_wrap_query_user_context(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
++  PyObject *resultobj = 0;
++  security_context_t *arg1 = (security_context_t *) 0 ;
++  security_context_t *arg2 = (security_context_t *) 0 ;
++  int result;
++  security_context_t temp1 = NULL ;
++  security_context_t temp2 = NULL ;
++  char *temp10 = NULL ;
++  char *temp20 = NULL ;
++  
++  {
++    arg1 = &temp1;
++  }
++  {
++    arg2 = &temp2;
++  }
++  if (!PyArg_ParseTuple(args,(char *)":query_user_context")) SWIG_fail;
++  result = (int)query_user_context(arg1,arg2);
++  resultobj = SWIG_From_int((int)(result));
++  {
++    if (*arg1)
++    temp10 = *arg1;
++    else
++    temp10 = "";
++    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp10));
++  }
++  {
++    if (*arg2)
++    temp20 = *arg2;
++    else
++    temp20 = "";
++    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp20));
++  }
++  return resultobj;
++fail:
++  return NULL;
++}
++
+ 
+-SWIGINTERNINLINE PyObject *
+-SWIG_FromCharPtrAndSize(const char* carray, size_t size)
+-{
+-  if (carray) {
+-    if (size > INT_MAX) {
+-      swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
+-      return pchar_descriptor ? 
+-	SWIG_NewPointerObj((char *)(carray), pchar_descriptor, 0) : SWIG_Py_Void();
+-    } else {
+-      return PyString_FromStringAndSize(carray, (int)(size));
+-    }
+-  } else {
+-    return SWIG_Py_Void();
++SWIGINTERN PyObject *_wrap_manual_user_enter_context(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
++  PyObject *resultobj = 0;
++  char *arg1 = (char *) 0 ;
++  security_context_t *arg2 = (security_context_t *) 0 ;
++  int result;
++  int res1 ;
++  char *buf1 = 0 ;
++  int alloc1 = 0 ;
++  security_context_t temp2 = NULL ;
++  char *temp20 = NULL ;
++  PyObject * obj0 = 0 ;
++  
++  {
++    arg2 = &temp2;
++  }
++  if (!PyArg_ParseTuple(args,(char *)"O:manual_user_enter_context",&obj0)) SWIG_fail;
++  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
++  if (!SWIG_IsOK(res1)) {
++    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "manual_user_enter_context" "', argument " "1"" of type '" "char const *""'");
++  }
++  arg1 = (char *)(buf1);
++  result = (int)manual_user_enter_context((char const *)arg1,arg2);
++  resultobj = SWIG_From_int((int)(result));
++  {
++    if (*arg2)
++    temp20 = *arg2;
++    else
++    temp20 = "";
++    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp20));
+   }
++  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
++  return resultobj;
++fail:
++  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
++  return NULL;
+ }
+ 
+ 
+-SWIGINTERNINLINE PyObject * 
+-SWIG_FromCharPtr(const char *cptr)
+-{ 
+-  return SWIG_FromCharPtrAndSize(cptr, (cptr ? strlen(cptr) : 0));
+-}
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+ SWIGINTERN PyObject *_wrap_is_selinux_enabled(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+   PyObject *resultobj = 0;
+   int result;
+@@ -2834,6 +3222,48 @@
+ }
+ 
+ 
++SWIGINTERN PyObject *_wrap_freecon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
++  PyObject *resultobj = 0;
++  security_context_t arg1 ;
++  PyObject * obj0 = 0 ;
++  
++  if (!PyArg_ParseTuple(args,(char *)"O:freecon",&obj0)) SWIG_fail;
++  {
++    arg1 = (security_context_t)PyString_AsString(obj0);
++  }
++  freecon(arg1);
++  resultobj = SWIG_Py_Void();
++  return resultobj;
++fail:
++  return NULL;
++}
++
++
++SWIGINTERN PyObject *_wrap_freeconary(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
++  PyObject *resultobj = 0;
++  security_context_t *arg1 = (security_context_t *) 0 ;
++  security_context_t temp1 = NULL ;
++  char *temp10 = NULL ;
++  
++  {
++    arg1 = &temp1;
++  }
++  if (!PyArg_ParseTuple(args,(char *)":freeconary")) SWIG_fail;
++  freeconary(arg1);
++  resultobj = SWIG_Py_Void();
++  {
++    if (*arg1)
++    temp10 = *arg1;
++    else
++    temp10 = "";
++    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(temp10));
++  }
++  return resultobj;
++fail:
++  return NULL;
++}
++
++
+ SWIGINTERN PyObject *_wrap_getcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+   PyObject *resultobj = 0;
+   security_context_t *arg1 = (security_context_t *) 0 ;
+@@ -3777,6 +4207,55 @@
+ }
+ 
+ 
++SWIGINTERN PyObject *_wrap_matchpathcon_init_prefix(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
++  PyObject *resultobj = 0;
++  char *arg1 = (char *) 0 ;
++  char *arg2 = (char *) 0 ;
++  int result;
++  int res1 ;
++  char *buf1 = 0 ;
++  int alloc1 = 0 ;
++  int res2 ;
++  char *buf2 = 0 ;
++  int alloc2 = 0 ;
++  PyObject * obj0 = 0 ;
++  PyObject * obj1 = 0 ;
++  
++  if (!PyArg_ParseTuple(args,(char *)"OO:matchpathcon_init_prefix",&obj0,&obj1)) SWIG_fail;
++  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
++  if (!SWIG_IsOK(res1)) {
++    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "matchpathcon_init_prefix" "', argument " "1"" of type '" "char const *""'");
++  }
++  arg1 = (char *)(buf1);
++  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
++  if (!SWIG_IsOK(res2)) {
++    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "matchpathcon_init_prefix" "', argument " "2"" of type '" "char const *""'");
++  }
++  arg2 = (char *)(buf2);
++  result = (int)matchpathcon_init_prefix((char const *)arg1,(char const *)arg2);
++  resultobj = SWIG_From_int((int)(result));
++  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
++  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
++  return resultobj;
++fail:
++  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
++  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
++  return NULL;
++}
++
++
++SWIGINTERN PyObject *_wrap_matchpathcon_fini(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
++  PyObject *resultobj = 0;
++  
++  if (!PyArg_ParseTuple(args,(char *)":matchpathcon_fini")) SWIG_fail;
++  matchpathcon_fini();
++  resultobj = SWIG_Py_Void();
++  return resultobj;
++fail:
++  return NULL;
++}
++
++
+ SWIGINTERN PyObject *_wrap_matchmediacon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+   PyObject *resultobj = 0;
+   char *arg1 = (char *) 0 ;
+@@ -3994,6 +4473,19 @@
+ }
+ 
+ 
++SWIGINTERN PyObject *_wrap_selinux_securetty_types_path(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
++  PyObject *resultobj = 0;
++  char *result = 0 ;
++  
++  if (!PyArg_ParseTuple(args,(char *)":selinux_securetty_types_path")) SWIG_fail;
++  result = (char *)selinux_securetty_types_path();
++  resultobj = SWIG_FromCharPtr((const char *)result);
++  return resultobj;
++fail:
++  return NULL;
++}
++
++
+ SWIGINTERN PyObject *_wrap_selinux_booleans_path(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+   PyObject *resultobj = 0;
+   char *result = 0 ;
+@@ -4085,27 +4577,17 @@
+ }
+ 
+ 
+-SWIGINTERN PyObject *_wrap_selinux_check_passwd_access(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
++SWIGINTERN PyObject *_wrap_selinux_check_securetty_context(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+   PyObject *resultobj = 0;
+-  access_vector_t arg1 ;
++  security_context_t arg1 ;
+   int result;
+-  void *argp1 ;
+-  int res1 = 0 ;
+   PyObject * obj0 = 0 ;
+   
+-  if (!PyArg_ParseTuple(args,(char *)"O:selinux_check_passwd_access",&obj0)) SWIG_fail;
++  if (!PyArg_ParseTuple(args,(char *)"O:selinux_check_securetty_context",&obj0)) SWIG_fail;
+   {
+-    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_access_vector_t,  0 );
+-    if (!SWIG_IsOK(res1)) {
+-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "selinux_check_passwd_access" "', argument " "1"" of type '" "access_vector_t""'"); 
+-    }  
+-    if (!argp1) {
+-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "selinux_check_passwd_access" "', argument " "1"" of type '" "access_vector_t""'");
+-    } else {
+-      arg1 = *((access_vector_t *)(argp1));
+-    }
++    arg1 = (security_context_t)PyString_AsString(obj0);
+   }
+-  result = (int)selinux_check_passwd_access(arg1);
++  result = (int)selinux_check_securetty_context(arg1);
+   resultobj = SWIG_From_int((int)(result));
+   return resultobj;
+ fail:
+@@ -4113,30 +4595,26 @@
+ }
+ 
+ 
+-SWIGINTERN PyObject *_wrap_checkPasswdAccess(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
++SWIGINTERN PyObject *_wrap_set_selinuxmnt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+   PyObject *resultobj = 0;
+-  access_vector_t arg1 ;
+-  int result;
+-  void *argp1 ;
+-  int res1 = 0 ;
++  char *arg1 = (char *) 0 ;
++  int res1 ;
++  char *buf1 = 0 ;
++  int alloc1 = 0 ;
+   PyObject * obj0 = 0 ;
+   
+-  if (!PyArg_ParseTuple(args,(char *)"O:checkPasswdAccess",&obj0)) SWIG_fail;
+-  {
+-    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_access_vector_t,  0 );
+-    if (!SWIG_IsOK(res1)) {
+-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "checkPasswdAccess" "', argument " "1"" of type '" "access_vector_t""'"); 
+-    }  
+-    if (!argp1) {
+-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "checkPasswdAccess" "', argument " "1"" of type '" "access_vector_t""'");
+-    } else {
+-      arg1 = *((access_vector_t *)(argp1));
+-    }
++  if (!PyArg_ParseTuple(args,(char *)"O:set_selinuxmnt",&obj0)) SWIG_fail;
++  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
++  if (!SWIG_IsOK(res1)) {
++    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "set_selinuxmnt" "', argument " "1"" of type '" "char *""'");
+   }
+-  result = (int)checkPasswdAccess(arg1);
+-  resultobj = SWIG_From_int((int)(result));
++  arg1 = (char *)(buf1);
++  set_selinuxmnt(arg1);
++  resultobj = SWIG_Py_Void();
++  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+   return resultobj;
+ fail:
++  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+   return NULL;
+ }
+ 
+@@ -4153,6 +4631,10 @@
+   int res2 ;
+   char *buf2 = 0 ;
+   int alloc2 = 0 ;
++  void *argp3 = 0 ;
++  int res3 = 0 ;
++  void *argp4 = 0 ;
++  int res4 = 0 ;
+   PyObject * obj0 = 0 ;
+   PyObject * obj1 = 0 ;
+   PyObject * obj2 = 0 ;
+@@ -4169,58 +4651,16 @@
+     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "rpm_execcon" "', argument " "2"" of type '" "char const *""'");
+   }
+   arg2 = (char *)(buf2);
+-  {
+-    /* Check if is a list */
+-    if (PyList_Check(obj2)) {
+-      int size = PyList_Size(obj2);
+-      int i = 0;
+-      arg3 = (char **) malloc((size+1)*sizeof(char *));
+-      if (arg3 == NULL) {
+-        PyErr_SetString(PyExc_MemoryError,"Out of memory");
+-        return NULL;
+-      }
+-      for (i = 0; i < size; i++) {
+-        PyObject *o = PyList_GetItem(obj2,i);
+-        if (PyString_Check(o))
+-        arg3[i] = PyString_AsString(PyList_GetItem(obj2,i));
+-        else {
+-          PyErr_SetString(PyExc_TypeError,"list must contain strings");
+-          free(arg3);
+-          return NULL;
+-        }
+-      }
+-      arg3[i] = 0;
+-    } else {
+-      PyErr_SetString(PyExc_TypeError,"not a list");
+-      return NULL;
+-    }
+-  }
+-  {
+-    /* Check if is a list */
+-    if (PyList_Check(obj3)) {
+-      int size = PyList_Size(obj3);
+-      int i = 0;
+-      arg4 = (char **) malloc((size+1)*sizeof(char *));
+-      if (arg4 == NULL) {
+-        PyErr_SetString(PyExc_MemoryError,"Out of memory");
+-        return NULL;
+-      }
+-      for (i = 0; i < size; i++) {
+-        PyObject *o = PyList_GetItem(obj3,i);
+-        if (PyString_Check(o))
+-        arg4[i] = PyString_AsString(PyList_GetItem(obj3,i));
+-        else {
+-          PyErr_SetString(PyExc_TypeError,"list must contain strings");
+-          free(arg4);
+-          return NULL;
+-        }
+-      }
+-      arg4[i] = 0;
+-    } else {
+-      PyErr_SetString(PyExc_TypeError,"not a list");
+-      return NULL;
+-    }
++  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_p_char, 0 |  0 );
++  if (!SWIG_IsOK(res3)) {
++    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "rpm_execcon" "', argument " "3"" of type '" "char **""'"); 
++  }
++  arg3 = (char **)(argp3);
++  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_p_char, 0 |  0 );
++  if (!SWIG_IsOK(res4)) {
++    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "rpm_execcon" "', argument " "4"" of type '" "char **""'"); 
+   }
++  arg4 = (char **)(argp4);
+   result = (int)rpm_execcon(arg1,(char const *)arg2,arg3,arg4);
+   resultobj = SWIG_From_int((int)(result));
+   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+@@ -4387,9 +4827,101 @@
+ }
+ 
+ 
++SWIGINTERN PyObject *_wrap_selinux_file_context_cmp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
++  PyObject *resultobj = 0;
++  security_context_t arg1 ;
++  security_context_t arg2 ;
++  int result;
++  PyObject * obj0 = 0 ;
++  PyObject * obj1 = 0 ;
++  
++  if (!PyArg_ParseTuple(args,(char *)"OO:selinux_file_context_cmp",&obj0,&obj1)) SWIG_fail;
++  {
++    arg1 = (security_context_t)PyString_AsString(obj0);
++  }
++  {
++    arg2 = (security_context_t)PyString_AsString(obj1);
++  }
++  result = (int)selinux_file_context_cmp(arg1,arg2);
++  resultobj = SWIG_From_int((int)(result));
++  return resultobj;
++fail:
++  return NULL;
++}
++
++
++SWIGINTERN PyObject *_wrap_selinux_file_context_verify(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
++  PyObject *resultobj = 0;
++  char *arg1 = (char *) 0 ;
++  mode_t arg2 ;
++  int result;
++  int res1 ;
++  char *buf1 = 0 ;
++  int alloc1 = 0 ;
++  unsigned int val2 ;
++  int ecode2 = 0 ;
++  PyObject * obj0 = 0 ;
++  PyObject * obj1 = 0 ;
++  
++  if (!PyArg_ParseTuple(args,(char *)"OO:selinux_file_context_verify",&obj0,&obj1)) SWIG_fail;
++  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
++  if (!SWIG_IsOK(res1)) {
++    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "selinux_file_context_verify" "', argument " "1"" of type '" "char const *""'");
++  }
++  arg1 = (char *)(buf1);
++  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
++  if (!SWIG_IsOK(ecode2)) {
++    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "selinux_file_context_verify" "', argument " "2"" of type '" "mode_t""'");
++  } 
++  arg2 = (mode_t)(val2);
++  result = (int)selinux_file_context_verify((char const *)arg1,arg2);
++  resultobj = SWIG_From_int((int)(result));
++  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
++  return resultobj;
++fail:
++  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
++  return NULL;
++}
++
++
++SWIGINTERN PyObject *_wrap_selinux_lsetfilecon_default(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
++  PyObject *resultobj = 0;
++  char *arg1 = (char *) 0 ;
++  int result;
++  int res1 ;
++  char *buf1 = 0 ;
++  int alloc1 = 0 ;
++  PyObject * obj0 = 0 ;
++  
++  if (!PyArg_ParseTuple(args,(char *)"O:selinux_lsetfilecon_default",&obj0)) SWIG_fail;
++  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
++  if (!SWIG_IsOK(res1)) {
++    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "selinux_lsetfilecon_default" "', argument " "1"" of type '" "char const *""'");
++  }
++  arg1 = (char *)(buf1);
++  result = (int)selinux_lsetfilecon_default((char const *)arg1);
++  resultobj = SWIG_From_int((int)(result));
++  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
++  return resultobj;
++fail:
++  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
++  return NULL;
++}
++
++
+ static PyMethodDef SwigMethods[] = {
++	 { (char *)"get_ordered_context_list", _wrap_get_ordered_context_list, METH_VARARGS, NULL},
++	 { (char *)"get_ordered_context_list_with_level", _wrap_get_ordered_context_list_with_level, METH_VARARGS, NULL},
++	 { (char *)"get_default_context", _wrap_get_default_context, METH_VARARGS, NULL},
++	 { (char *)"get_default_context_with_level", _wrap_get_default_context_with_level, METH_VARARGS, NULL},
++	 { (char *)"get_default_context_with_role", _wrap_get_default_context_with_role, METH_VARARGS, NULL},
++	 { (char *)"get_default_context_with_rolelevel", _wrap_get_default_context_with_rolelevel, METH_VARARGS, NULL},
++	 { (char *)"query_user_context", _wrap_query_user_context, METH_VARARGS, NULL},
++	 { (char *)"manual_user_enter_context", _wrap_manual_user_enter_context, METH_VARARGS, NULL},
+ 	 { (char *)"is_selinux_enabled", _wrap_is_selinux_enabled, METH_VARARGS, NULL},
+ 	 { (char *)"is_selinux_mls_enabled", _wrap_is_selinux_mls_enabled, METH_VARARGS, NULL},
++	 { (char *)"freecon", _wrap_freecon, METH_VARARGS, NULL},
++	 { (char *)"freeconary", _wrap_freeconary, METH_VARARGS, NULL},
+ 	 { (char *)"getcon", _wrap_getcon, METH_VARARGS, NULL},
+ 	 { (char *)"setcon", _wrap_setcon, METH_VARARGS, NULL},
+ 	 { (char *)"getpidcon", _wrap_getpidcon, METH_VARARGS, NULL},
+@@ -4426,6 +4958,8 @@
+ 	 { (char *)"set_matchpathcon_flags", _wrap_set_matchpathcon_flags, METH_VARARGS, NULL},
+ 	 { (char *)"matchpathcon_init", _wrap_matchpathcon_init, METH_VARARGS, NULL},
+ 	 { (char *)"matchpathcon", _wrap_matchpathcon, METH_VARARGS, NULL},
++	 { (char *)"matchpathcon_init_prefix", _wrap_matchpathcon_init_prefix, METH_VARARGS, NULL},
++	 { (char *)"matchpathcon_fini", _wrap_matchpathcon_fini, METH_VARARGS, NULL},
+ 	 { (char *)"matchmediacon", _wrap_matchmediacon, METH_VARARGS, NULL},
+ 	 { (char *)"selinux_getenforcemode", _wrap_selinux_getenforcemode, METH_VARARGS, NULL},
+ 	 { (char *)"selinux_policy_root", _wrap_selinux_policy_root, METH_VARARGS, NULL},
+@@ -4440,6 +4974,7 @@
+ 	 { (char *)"selinux_homedir_context_path", _wrap_selinux_homedir_context_path, METH_VARARGS, NULL},
+ 	 { (char *)"selinux_media_context_path", _wrap_selinux_media_context_path, METH_VARARGS, NULL},
+ 	 { (char *)"selinux_contexts_path", _wrap_selinux_contexts_path, METH_VARARGS, NULL},
++	 { (char *)"selinux_securetty_types_path", _wrap_selinux_securetty_types_path, METH_VARARGS, NULL},
+ 	 { (char *)"selinux_booleans_path", _wrap_selinux_booleans_path, METH_VARARGS, NULL},
+ 	 { (char *)"selinux_customizable_types_path", _wrap_selinux_customizable_types_path, METH_VARARGS, NULL},
+ 	 { (char *)"selinux_users_path", _wrap_selinux_users_path, METH_VARARGS, NULL},
+@@ -4447,14 +4982,17 @@
+ 	 { (char *)"selinux_translations_path", _wrap_selinux_translations_path, METH_VARARGS, NULL},
+ 	 { (char *)"selinux_netfilter_context_path", _wrap_selinux_netfilter_context_path, METH_VARARGS, NULL},
+ 	 { (char *)"selinux_path", _wrap_selinux_path, METH_VARARGS, NULL},
+-	 { (char *)"selinux_check_passwd_access", _wrap_selinux_check_passwd_access, METH_VARARGS, NULL},
+-	 { (char *)"checkPasswdAccess", _wrap_checkPasswdAccess, METH_VARARGS, NULL},
++	 { (char *)"selinux_check_securetty_context", _wrap_selinux_check_securetty_context, METH_VARARGS, NULL},
++	 { (char *)"set_selinuxmnt", _wrap_set_selinuxmnt, METH_VARARGS, NULL},
+ 	 { (char *)"rpm_execcon", _wrap_rpm_execcon, METH_VARARGS, NULL},
+ 	 { (char *)"is_context_customizable", _wrap_is_context_customizable, METH_VARARGS, NULL},
+ 	 { (char *)"selinux_trans_to_raw_context", _wrap_selinux_trans_to_raw_context, METH_VARARGS, NULL},
+ 	 { (char *)"selinux_raw_to_trans_context", _wrap_selinux_raw_to_trans_context, METH_VARARGS, NULL},
+ 	 { (char *)"selinux_getpolicytype", _wrap_selinux_getpolicytype, METH_VARARGS, NULL},
+ 	 { (char *)"getseuserbyname", _wrap_getseuserbyname, METH_VARARGS, NULL},
++	 { (char *)"selinux_file_context_cmp", _wrap_selinux_file_context_cmp, METH_VARARGS, NULL},
++	 { (char *)"selinux_file_context_verify", _wrap_selinux_file_context_verify, METH_VARARGS, NULL},
++	 { (char *)"selinux_lsetfilecon_default", _wrap_selinux_lsetfilecon_default, METH_VARARGS, NULL},
+ 	 { NULL, NULL, 0, NULL }
+ };
+ 
+@@ -4462,41 +5000,41 @@
+ /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
+ 
+ static swig_type_info _swigt__p_SELboolean = {"_p_SELboolean", "SELboolean *", 0, 0, (void*)0, 0};
+-static swig_type_info _swigt__p_access_vector_t = {"_p_access_vector_t", "access_vector_t *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_int = {"_p_int", "int *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_p_p_char = {"_p_p_p_char", "char ***", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_p_security_context_t = {"_p_p_security_context_t", "security_context_t **", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_security_context_t = {"_p_security_context_t", "security_context_t *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int *|mode_t *", 0, 0, (void*)0, 0};
+ 
+ static swig_type_info *swig_type_initial[] = {
+   &_swigt__p_SELboolean,
+-  &_swigt__p_access_vector_t,
+   &_swigt__p_char,
+   &_swigt__p_int,
+   &_swigt__p_p_char,
+   &_swigt__p_p_p_char,
++  &_swigt__p_p_security_context_t,
+   &_swigt__p_security_context_t,
+   &_swigt__p_unsigned_int,
+ };
+ 
+ static swig_cast_info _swigc__p_SELboolean[] = {  {&_swigt__p_SELboolean, 0, 0, 0},{0, 0, 0, 0}};
+-static swig_cast_info _swigc__p_access_vector_t[] = {  {&_swigt__p_access_vector_t, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_p_char[] = {  {&_swigt__p_p_char, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_p_p_char[] = {  {&_swigt__p_p_p_char, 0, 0, 0},{0, 0, 0, 0}};
++static swig_cast_info _swigc__p_p_security_context_t[] = {  {&_swigt__p_p_security_context_t, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_security_context_t[] = {  {&_swigt__p_security_context_t, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_unsigned_int[] = {  {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}};
+ 
+ static swig_cast_info *swig_cast_initial[] = {
+   _swigc__p_SELboolean,
+-  _swigc__p_access_vector_t,
+   _swigc__p_char,
+   _swigc__p_int,
+   _swigc__p_p_char,
+   _swigc__p_p_p_char,
++  _swigc__p_p_security_context_t,
+   _swigc__p_security_context_t,
+   _swigc__p_unsigned_int,
+ };
+@@ -5019,6 +5557,7 @@
+   SWIG_InstallConstants(d,swig_const_table);
+   
+   
++  SWIG_Python_SetConstant(d, "SELINUX_DEFAULTUSER",SWIG_FromCharPtr("user_u"));
+   SWIG_Python_SetConstant(d, "MATCHPATHCON_BASEONLY",SWIG_From_int((int)(1)));
+   SWIG_Python_SetConstant(d, "MATCHPATHCON_NOTRANS",SWIG_From_int((int)(2)));
+ }


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- libselinux.spec	12 Apr 2007 20:07:39 -0000	1.262
+++ libselinux.spec	23 Apr 2007 14:38:02 -0000	1.263
@@ -2,7 +2,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -121,6 +121,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Mon Apr 23 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.13-2
+- Add get_context_list funcitions to swig file
+
 * Thu Apr 12 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.13-1
 - Upgrade to upstream
 	* Merged rpm_execcon python binding fix, matchpathcon man page fix, and getsebool -a handling for EACCES from Dan Walsh.



From fedora-cvs-commits at redhat.com  Mon Apr 23 14:47:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 10:47:49 -0400
Subject: rpms/vnc/devel vnc.spec,1.171,1.172 vnc-188169.patch,1.2,NONE
Message-ID: <200704231447.l3NElno1029541@cvs.devel.redhat.com>

Author: atkac

Update of /cvs/dist/rpms/vnc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29227

Modified Files:
	vnc.spec 
Removed Files:
	vnc-188169.patch 
Log Message:
removed patch to 188169
removed Xvnc's int10 module



Index: vnc.spec
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- vnc.spec	27 Mar 2007 09:38:37 -0000	1.171
+++ vnc.spec	23 Apr 2007 14:47:47 -0000	1.172
@@ -4,7 +4,7 @@
 Summary:   A remote display system
 Name:      vnc
 Version:   4.1.2
-Release:   16%{?dist}
+Release:   17%{?dist}
 URL:       http://www.realvnc.com
 Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
 Source1:   http://www.realvnc.com/dist/vnc-%{java_vnc_version}-javasrc.tar.gz
@@ -28,7 +28,6 @@
 Patch17:   vnc-select.patch
 Patch19:   vnc-ppc64.patch
 Patch21:   vnc-newfbsize.patch
-Patch22:   vnc-188169.patch
 Patch23:   vnc-210617.patch
 Patch24:   vnc-102434.patch
 Patch25:   vnc-config.patch
@@ -107,7 +106,6 @@
 %patch17 -p1 -b .select
 %patch19 -p1 -b .ppc64
 %patch21 -p1 -b .newfbsize
-%patch22 -p1 -b .fix
 %patch23 -p1 -b .ipv6
 %patch24 -p1 -b .102434
 %patch25 -p1 -b .config
@@ -163,8 +161,7 @@
 	--disable-xevie \
 	--disable-dri \
         --enable-glx \
-        --with-mesa-source=%{_datadir}/mesa/source \
-	--with-int10=stub
+        --with-mesa-source=%{_datadir}/mesa/source
 
 make %{?_smp_mflags}
 
@@ -316,6 +313,11 @@
 %{_libdir}/librfb.so.*
 
 %changelog
+* Mon Apr 23 2007 Adam Tkac <atkac redhat com> 4.1.2-17.fc7
+- removed patch to #188169 because patching this bug could do
+  more things bad than good
+- removed int10 module from vnc (with-int10 option)
+
 * Tue Mar 27 2007 Adam Tkac <atkac redhat com> 4.1.2-16.fc7
 - fixed vnc module crashing (#234124)
 - vncviewer has been moved from Utility group to Network group (#231765)


--- vnc-188169.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 23 14:49:34 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 10:49:34 -0400
Subject: rpms/totem/devel totem.spec,1.101,1.102
Message-ID: <200704231449.l3NEnYE0030857@cvs.devel.redhat.com>

Author: bnocera

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30725

Modified Files:
	totem.spec 
Log Message:
* Mon Apr 23 2007 - Bastien Nocera <bnocera at redhat.com> - 2.18.2-3
- Add missing control-center-devel BuildRequires, to use the new
  playback key infrastructure in gnome-settings-daemon (#237484)



Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- totem.spec	11 Apr 2007 11:33:12 -0000	1.101
+++ totem.spec	23 Apr 2007 14:49:32 -0000	1.102
@@ -5,7 +5,7 @@
 Summary: Movie player for GNOME 2
 Name: totem
 Version: 2.18.1
-Release: 2%{?dist} 
+Release: 3%{?dist} 
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/totem/
@@ -42,6 +42,7 @@
 BuildRequires: libXxf86vm-devel
 BuildRequires: libXt-devel
 BuildRequires: dbus-devel
+BuildRequires: control-center-devel >= 2.18.0
 BuildRequires: hal-devel
 BuildRequires: gnome-doc-utils
 
@@ -202,6 +203,10 @@
 %{_libdir}/*so
 
 %changelog
+* Mon Apr 23 2007 - Bastien Nocera <bnocera at redhat.com> - 2.18.2-3
+- Add missing control-center-devel BuildRequires, to use the new
+  playback key infrastructure in gnome-settings-daemon (#237484)
+
 * Wed Apr 11 2007 - Bastien Nocera <bnocera at redhat.com> - 2.18.1-2
 - Add requires for gnome-themes, spotted by Nigel Jones (#235819)
 



From fedora-cvs-commits at redhat.com  Mon Apr 23 14:53:04 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 10:53:04 -0400
Subject: rpms/glib-java/devel glib-java.spec,1.53,1.54
Message-ID: <200704231453.l3NEr4V8000881@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/glib-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv837

Modified Files:
	glib-java.spec 
Log Message:
- Move /usr/include/glib-java/jg_jnu.h to devel.


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- glib-java.spec	20 Apr 2007 17:35:46 -0000	1.53
+++ glib-java.spec	23 Apr 2007 14:53:01 -0000	1.54
@@ -106,8 +106,6 @@
 %defattr(-,root,root,-)
 # Do not distribute the NEWS file, it is empty.
 %doc AUTHORS ChangeLog COPYING README 
-%dir %{_includedir}/%{name_base}
-%{_includedir}/%{name_base}/*
 %{_libdir}/libglibjava-*.so
 %{_libdir}/libglibjni-*.so
 %{_datadir}/java/*.jar
@@ -117,12 +115,17 @@
 %files devel
 %defattr(-,root,root)
 %doc doc/api
+%dir %{_includedir}/%{name_base}
+%{_includedir}/%{name_base}/*
 %{_libdir}/libglibjava.so
 %{_libdir}/libglibjni.so
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/java/*.zip
 
 %changelog
+* Mon Apr 23 2007 Stepan Kasal <skasal at redhat.com> - 0.2.6-10
+- Move /usr/include/glib-java/jg_jnu.h to devel.
+
 * Fri Apr 20 2007 Stepan Kasal <skasal at redhat.com> - 0.2.6-9
 - Adhere to packaging guidelines.
 - Resolves: #225807



From fedora-cvs-commits at redhat.com  Mon Apr 23 14:53:27 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 10:53:27 -0400
Subject: rpms/glib-java/devel glib-java.spec,1.54,1.55
Message-ID: <200704231453.l3NErR15001216@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/glib-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1177

Modified Files:
	glib-java.spec 
Log Message:
- Move /usr/include/glib-java/jg_jnu.h to devel.


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- glib-java.spec	23 Apr 2007 14:53:01 -0000	1.54
+++ glib-java.spec	23 Apr 2007 14:53:25 -0000	1.55
@@ -15,7 +15,7 @@
 Summary:	Base Library for the Java-GNOME libraries 
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	0.2.6
-Release:	9%{?dist}
+Release:	10%{?dist}
 URL:		http://java-gnome.sourceforge.net
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.2/%{name_base}-%{version}.tar.bz2
 Patch0:		%{name}-gjavah.patch



From fedora-cvs-commits at redhat.com  Mon Apr 23 15:03:04 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 11:03:04 -0400
Subject: rpms/policycoreutils/FC-6 policycoreutils-gui.patch, 1.2,
	1.3 policycoreutils-rhat.patch, 1.255,
	1.256 policycoreutils.spec, 1.333, 1.334
Message-ID: <200704231503.l3NF34ia008245@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-gui.patch policycoreutils-rhat.patch 
	policycoreutils.spec 
Log Message:
* Tue Apr 17 2007 Dan Walsh <dwalsh at redhat.com> 1.34.1-8
- Fix genhomedircon to handle __default__ not being user_u
- Modify polgengui to be wizard


policycoreutils-gui.patch:
 Makefile                    |   34 
 booleansPage.py             |  224 +++
 fcontextPage.py             |  207 +++
 loginsPage.py               |  173 ++
 mappingsPage.py             |   54 
 modulesPage.py              |  172 ++
 polgen.glade                | 1167 ++++++++++++++++
 polgen.py                   |  455 ++++++
 polgengui.py                |  253 +++
 portsPage.py                |  227 +++
 selinux.tbl                 |  274 +++
 semanagePage.py             |  115 +
 statusPage.py               |  220 +++
 system-config-selinux.glade | 3034 ++++++++++++++++++++++++++++++++++++++++++++
 system-config-selinux.py    |  169 ++
 templates/__init__.py       |   18 
 templates/executable.py     |  156 ++
 templates/network.py        |   44 
 templates/rw.py             |  104 +
 templates/script.py         |   42 
 templates/semodule.py       |   41 
 templates/tmp.py            |   72 +
 templates/var_lib.py        |  137 +
 templates/var_log.py        |   89 +
 templates/var_run.py        |   95 +
 templates/var_spool.py      |  105 +
 translationsPage.py         |  111 +
 usersPage.py                |  166 ++
 28 files changed, 7958 insertions(+)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 policycoreutils-gui.patch
Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-6/policycoreutils-gui.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- policycoreutils-gui.patch	17 Apr 2007 12:31:49 -0000	1.2
+++ policycoreutils-gui.patch	23 Apr 2007 15:03:01 -0000	1.3
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.9/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/booleansPage.py	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.9/gui/booleansPage.py	2007-04-18 13:14:57.000000000 -0400
 @@ -0,0 +1,224 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -228,7 +228,7 @@
 +        commands.getstatusoutput(setsebool)
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.9/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/fcontextPage.py	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.9/gui/fcontextPage.py	2007-04-18 13:14:57.000000000 -0400
 @@ -0,0 +1,207 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -439,7 +439,7 @@
 +        self.store.set_value(iter, TYPE_COL, "system_u:object_r:%s:%s" % (type, mls))
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.9/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/loginsPage.py	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.9/gui/loginsPage.py	2007-04-18 13:14:57.000000000 -0400
 @@ -0,0 +1,173 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -654,7 +654,7 @@
 +relabel:
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.9/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/mappingsPage.py	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.9/gui/mappingsPage.py	2007-04-18 13:14:57.000000000 -0400
 @@ -0,0 +1,54 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -712,7 +712,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.9/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/modulesPage.py	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.9/gui/modulesPage.py	2007-04-18 13:14:57.000000000 -0400
 @@ -0,0 +1,172 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -888,12 +888,13 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.9/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/polgen.glade	2007-04-16 13:26:34.000000000 -0400
-@@ -0,0 +1,1127 @@
++++ policycoreutils-2.0.9/gui/polgen.glade	2007-04-18 15:15:26.000000000 -0400
+@@ -0,0 +1,1167 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 +
 +<glade-interface>
++<requires lib="gnome"/>
 +
 +<widget class="GtkWindow" id="main_window">
 +  <property name="visible">True</property>
@@ -918,210 +919,300 @@
 +      <property name="spacing">0</property>
 +
 +      <child>
-+	<widget class="GtkTable" id="table1">
++	<widget class="GnomeDruid" id="druid1">
++	  <property name="border_width">4</property>
 +	  <property name="visible">True</property>
-+	  <property name="n_rows">5</property>
-+	  <property name="n_columns">4</property>
-+	  <property name="homogeneous">False</property>
-+	  <property name="row_spacing">0</property>
-+	  <property name="column_spacing">0</property>
++	  <property name="show_help">False</property>
 +
 +	  <child>
-+	    <widget class="GtkLabel" id="label1">
++	    <widget class="GnomeDruidPageEdge" id="druidpagestart1">
 +	      <property name="visible">True</property>
-+	      <property name="label" translatable="yes">Name</property>
-+	      <property name="use_underline">False</property>
-+	      <property name="use_markup">False</property>
-+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-+	      <property name="wrap">False</property>
-+	      <property name="selectable">False</property>
-+	      <property name="xalign">0</property>
-+	      <property name="yalign">0.5</property>
-+	      <property name="xpad">0</property>
-+	      <property name="ypad">0</property>
-+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+	      <property name="width_chars">-1</property>
-+	      <property name="single_line_mode">False</property>
-+	      <property name="angle">0</property>
++	      <property name="position">GNOME_EDGE_START</property>
++	      <property name="title" translatable="yes">SELinux Policy Generation Druid</property>
++	      <property name="text" translatable="yes">This tool can be used to generate a policy framework, to confine an application using SELinux.   The tool will generate a Type Enforcement File (te), an interface file (if), a File Context File (fc) and a shell script (sh) used to compile the policy. </property>
 +	    </widget>
-+	    <packing>
-+	      <property name="left_attach">0</property>
-+	      <property name="right_attach">1</property>
-+	      <property name="top_attach">0</property>
-+	      <property name="bottom_attach">1</property>
-+	      <property name="x_options">fill</property>
-+	      <property name="y_options"></property>
-+	    </packing>
 +	  </child>
 +
 +	  <child>
-+	    <widget class="GtkLabel" id="label2">
++	    <widget class="GnomeDruidPageStandard" id="name_page">
 +	      <property name="visible">True</property>
-+	      <property name="label" translatable="yes">Executable</property>
-+	      <property name="use_underline">False</property>
-+	      <property name="use_markup">False</property>
-+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-+	      <property name="wrap">False</property>
-+	      <property name="selectable">False</property>
-+	      <property name="xalign">0</property>
-+	      <property name="yalign">0.5</property>
-+	      <property name="xpad">0</property>
-+	      <property name="ypad">0</property>
-+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+	      <property name="width_chars">-1</property>
-+	      <property name="single_line_mode">False</property>
-+	      <property name="angle">0</property>
-+	    </widget>
-+	    <packing>
-+	      <property name="left_attach">0</property>
-+	      <property name="right_attach">1</property>
-+	      <property name="top_attach">1</property>
-+	      <property name="bottom_attach">2</property>
-+	      <property name="y_padding">5</property>
-+	      <property name="x_options">fill</property>
-+	      <property name="y_options"></property>
-+	    </packing>
-+	  </child>
++	      <property name="title" translatable="yes">Name of application to be confined</property>
 +
-+	  <child>
-+	    <widget class="GtkLabel" id="label14">
-+	      <property name="visible">True</property>
-+	      <property name="label" translatable="yes">Application Type</property>
-+	      <property name="use_underline">False</property>
-+	      <property name="use_markup">False</property>
-+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-+	      <property name="wrap">False</property>
-+	      <property name="selectable">False</property>
-+	      <property name="xalign">0</property>
-+	      <property name="yalign">0.5</property>
-+	      <property name="xpad">0</property>
-+	      <property name="ypad">0</property>
-+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+	      <property name="width_chars">-1</property>
-+	      <property name="single_line_mode">False</property>
-+	      <property name="angle">0</property>
-+	    </widget>
-+	    <packing>
-+	      <property name="left_attach">0</property>
-+	      <property name="right_attach">1</property>
-+	      <property name="top_attach">2</property>
-+	      <property name="bottom_attach">3</property>
-+	      <property name="x_options">fill</property>
-+	      <property name="y_options"></property>
-+	    </packing>
-+	  </child>
++	      <child internal-child="vbox">
++		<widget class="GtkVBox" id="druid-vbox5">
++		  <property name="border_width">16</property>
++		  <property name="visible">True</property>
++		  <property name="homogeneous">False</property>
++		  <property name="spacing">6</property>
 +
-+	  <child>
-+	    <widget class="GtkButton" id="button1">
-+	      <property name="visible">True</property>
-+	      <property name="can_focus">True</property>
-+	      <property name="label" translatable="yes">...</property>
-+	      <property name="use_underline">True</property>
-+	      <property name="relief">GTK_RELIEF_NORMAL</property>
-+	      <property name="focus_on_click">True</property>
-+	      <signal name="clicked" handler="on_exec_select_clicked" last_modification_time="Wed, 21 Feb 2007 18:45:26 GMT"/>
-+	    </widget>
-+	    <packing>
-+	      <property name="left_attach">3</property>
-+	      <property name="right_attach">4</property>
-+	      <property name="top_attach">1</property>
-+	      <property name="bottom_attach">2</property>
-+	      <property name="x_options">fill</property>
-+	      <property name="y_options"></property>
-+	    </packing>
-+	  </child>
++		  <child>
[...1830 lines suppressed...]
 +files_tmp_file(TEMPLATETYPE_tmp_t)
 +"""
 +
 +te_rules="""
-+# tmp  files
 +allow TEMPLATETYPE_t TEMPLATETYPE_tmp_t:file manage_file_perms;
 +allow TEMPLATETYPE_t TEMPLATETYPE_tmp_t:dir create_dir_perms;
 +files_pid_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_tmp_t, { file dir })
@@ -7252,8 +7343,8 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.9/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_lib.py	2007-04-16 13:26:34.000000000 -0400
-@@ -0,0 +1,107 @@
++++ policycoreutils-2.0.9/gui/templates/var_lib.py	2007-04-18 13:13:36.000000000 -0400
+@@ -0,0 +1,137 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -7279,18 +7370,21 @@
 +
 +########################### Type Enforcement File #############################
 +te_types="""
-+# var/lib files
 +type TEMPLATETYPE_var_lib_t;
 +files_type(TEMPLATETYPE_var_lib_t)
 +"""
 +te_rules="""
-+# var/lib files for TEMPLATETYPE
-+allow TEMPLATETYPE_t TEMPLATETYPE_var_lib_t:file create_file_perms;
-+allow TEMPLATETYPE_t TEMPLATETYPE_var_lib_t:sock_file create_file_perms;
-+allow TEMPLATETYPE_t TEMPLATETYPE_var_lib_t:dir create_dir_perms;
-+files_var_lib_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_lib_t, { file dir sock_file })
++allow TEMPLATETYPE_t TEMPLATETYPE_var_lib_t:file manage_file_perms;
++allow TEMPLATETYPE_t TEMPLATETYPE_var_lib_t:dir manage_dir_perms;
++files_var_lib_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_lib_t, { file dir })
++"""
++
++te_stream_rules="""\
++allow TEMPLATETYPE_t TEMPLATETYPE_var_lib_t:sock_file manage_file_perms;
++files_pid_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_lib_t, sock_file)
 +"""
 +
++
 +########################### Interface File #############################
 +if_rules="""
 +########################################
@@ -7353,18 +7447,45 @@
 +	files_search_var_lib($1)
 +')
 +"""
++
++if_stream_rules="""
++########################################
++## <summary>
++##	Connect to TEMPLATETYPE over an unix stream socket.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`TEMPLATETYPE_stream_connect',`
++	gen_require(`
++		type TEMPLATETYPE_t, TEMPLATETYPE_var_lib_t;
++	')
++
++	files_search_pids($1)
++	allow $1 TEMPLATETYPE_var_lib_t:sock_file write;
++	allow $1 TEMPLATETYPE_t:unix_stream_socket connectto;
++')
++"""
++
 +########################### File Context ##################################
 +fc_file="""\
 +FILENAME		--	gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
 +
++fc_sock_file="""\
++FILENAME		-s	gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
++"""
++
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.9/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_log.py	2007-04-16 13:26:34.000000000 -0400
-@@ -0,0 +1,91 @@
++++ policycoreutils-2.0.9/gui/templates/var_log.py	2007-04-18 13:13:36.000000000 -0400
+@@ -0,0 +1,89 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -7390,13 +7511,11 @@
 +
 +########################### Type Enforcement File #############################
 +te_types="""
-+# log files
 +type TEMPLATETYPE_log_t;
 +logging_log_file(TEMPLATETYPE_log_t)
 +"""
 +
 +te_rules="""
-+# log files
 +allow TEMPLATETYPE_t TEMPLATETYPE_log_t:file manage_file_perms;
 +allow TEMPLATETYPE_t TEMPLATETYPE_log_t:dir { rw_dir_perms setattr };
 +logging_log_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_log_t,{ file dir })
@@ -7458,8 +7577,8 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.9/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_run.py	2007-04-16 13:26:34.000000000 -0400
-@@ -0,0 +1,93 @@
++++ policycoreutils-2.0.9/gui/templates/var_run.py	2007-04-18 13:13:36.000000000 -0400
+@@ -0,0 +1,95 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -7484,16 +7603,14 @@
 +########################### var_run Template File #############################
 +
 +te_types="""
-+# pid files
 +type TEMPLATETYPE_var_run_t;
 +files_pid_file(TEMPLATETYPE_var_run_t)
 +"""
 +
 +te_rules="""
-+# pid file
 +allow TEMPLATETYPE_t TEMPLATETYPE_var_run_t:file manage_file_perms;
-+allow TEMPLATETYPE_t TEMPLATETYPE_var_run_t:dir rw_dir_perms;
-+files_pid_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_run_t, file)
++allow TEMPLATETYPE_t TEMPLATETYPE_var_run_t:dir manage_dir_perms;
++files_pid_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_run_t, { file dir })
 +"""
 +
 +te_stream_rules="""
@@ -7523,7 +7640,7 @@
 +
 +"""
 +
-+if_stream_rules="""
++if_stream_rules="""\
 +########################################
 +## <summary>
 +##	Connect to TEMPLATETYPE over an unix stream socket.
@@ -7549,14 +7666,18 @@
 +FILENAME		--	gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
 +
++fc_sock_file="""\
++FILENAME		-s	gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
++"""
++
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.9/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_spool.py	2007-04-16 13:26:34.000000000 -0400
-@@ -0,0 +1,107 @@
++++ policycoreutils-2.0.9/gui/templates/var_spool.py	2007-04-19 09:35:34.000000000 -0400
+@@ -0,0 +1,105 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -7582,12 +7703,10 @@
 +
 +########################### Type Enforcement File #############################
 +te_types="""
-+# var/spool files
 +type TEMPLATETYPE_spool_t;
 +files_type(TEMPLATETYPE_spool_t)
 +"""
 +te_rules="""
-+# var/spool files for TEMPLATETYPE
 +allow TEMPLATETYPE_t TEMPLATETYPE_spool_t:dir manage_dir_perms;
 +allow TEMPLATETYPE_t TEMPLATETYPE_spool_t:file manage_file_perms;
 +allow TEMPLATETYPE_t TEMPLATETYPE_spool_t:sock_file create_file_perms;
@@ -7666,7 +7785,7 @@
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.9/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/translationsPage.py	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.9/gui/translationsPage.py	2007-04-18 13:14:57.000000000 -0400
 @@ -0,0 +1,111 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -7781,7 +7900,7 @@
 +        self.store.set_value(iter, 1, translation)
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.9/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/usersPage.py	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.9/gui/usersPage.py	2007-04-18 13:14:57.000000000 -0400
 @@ -0,0 +1,166 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.

policycoreutils-rhat.patch:
 Makefile                     |    2 
 audit2allow/Makefile         |   13 -
 audit2allow/audit2allow      |  473 +++++++++++++++++++++++--------------------
 audit2allow/sepolgen-ifgen   |   86 +++++++
 restorecon/restorecon.c      |    4 
 restorecond/restorecond.c    |   12 -
 restorecond/restorecond.conf |    3 
 restorecond/restorecond.init |   43 +++
 scripts/chcat                |   36 ++-
 scripts/fixfiles.8           |    2 
 scripts/genhomedircon        |   30 ++
 semanage/seobject.py         |   10 
 12 files changed, 455 insertions(+), 259 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-6/policycoreutils-rhat.patch,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- policycoreutils-rhat.patch	16 Apr 2007 18:26:26 -0000	1.255
+++ policycoreutils-rhat.patch	23 Apr 2007 15:03:01 -0000	1.256
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.34.1/audit2allow/audit2allow
 --- nsapolicycoreutils/audit2allow/audit2allow	2007-01-24 10:04:01.000000000 -0500
-+++ policycoreutils-1.34.1/audit2allow/audit2allow	2007-04-16 14:12:28.000000000 -0400
++++ policycoreutils-1.34.1/audit2allow/audit2allow	2007-04-23 11:00:14.000000000 -0400
 @@ -1,226 +1,265 @@
  #! /usr/bin/python -E
 -# Copyright (C) 2005 Red Hat 
@@ -486,7 +486,7 @@
 +    app.main()
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-1.34.1/audit2allow/Makefile
 --- nsapolicycoreutils/audit2allow/Makefile	2007-01-24 10:04:01.000000000 -0500
-+++ policycoreutils-1.34.1/audit2allow/Makefile	2007-04-16 14:26:04.000000000 -0400
++++ policycoreutils-1.34.1/audit2allow/Makefile	2007-04-23 11:00:14.000000000 -0400
 @@ -1,26 +1,27 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -523,7 +523,7 @@
 +relabel: ;
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/sepolgen-ifgen policycoreutils-1.34.1/audit2allow/sepolgen-ifgen
 --- nsapolicycoreutils/audit2allow/sepolgen-ifgen	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.34.1/audit2allow/sepolgen-ifgen	2007-04-16 14:12:33.000000000 -0400
++++ policycoreutils-1.34.1/audit2allow/sepolgen-ifgen	2007-04-23 11:00:14.000000000 -0400
 @@ -0,0 +1,86 @@
 +#! /usr/bin/python -E
 +#
@@ -613,7 +613,7 @@
 +    sys.exit(main())
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.34.1/Makefile
 --- nsapolicycoreutils/Makefile	2007-01-24 10:04:00.000000000 -0500
-+++ policycoreutils-1.34.1/Makefile	2007-04-16 14:08:01.000000000 -0400
++++ policycoreutils-1.34.1/Makefile	2007-04-23 11:00:14.000000000 -0400
 @@ -1,4 +1,4 @@
 -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
@@ -622,7 +622,7 @@
  	@for subdir in $(SUBDIRS); do \
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.34.1/restorecon/restorecon.c
 --- nsapolicycoreutils/restorecon/restorecon.c	2007-01-24 10:04:01.000000000 -0500
-+++ policycoreutils-1.34.1/restorecon/restorecon.c	2007-04-16 14:08:01.000000000 -0400
++++ policycoreutils-1.34.1/restorecon/restorecon.c	2007-04-23 11:00:14.000000000 -0400
 @@ -336,8 +336,8 @@
  				if (!file_exist && errno == ENOENT)
  					return;
@@ -636,7 +636,7 @@
  		}
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.34.1/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2007-01-24 10:04:01.000000000 -0500
-+++ policycoreutils-1.34.1/restorecond/restorecond.c	2007-04-16 14:08:01.000000000 -0400
++++ policycoreutils-1.34.1/restorecond/restorecond.c	2007-04-23 11:00:14.000000000 -0400
 @@ -210,9 +210,10 @@
  			}
  
@@ -665,7 +665,7 @@
  	close(fd);
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.34.1/restorecond/restorecond.conf
 --- nsapolicycoreutils/restorecond/restorecond.conf	2007-01-24 10:04:01.000000000 -0500
-+++ policycoreutils-1.34.1/restorecond/restorecond.conf	2007-04-16 14:08:01.000000000 -0400
++++ policycoreutils-1.34.1/restorecond/restorecond.conf	2007-04-23 11:00:14.000000000 -0400
 @@ -1,7 +1,10 @@
  /etc/resolv.conf
 +/etc/localtime
@@ -679,7 +679,7 @@
  ~/.mozilla/plugins/libflashplayer.so
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-1.34.1/restorecond/restorecond.init
 --- nsapolicycoreutils/restorecond/restorecond.init	2007-01-24 10:04:01.000000000 -0500
-+++ policycoreutils-1.34.1/restorecond/restorecond.init	2007-04-16 14:08:01.000000000 -0400
++++ policycoreutils-1.34.1/restorecond/restorecond.init	2007-04-23 11:00:14.000000000 -0400
 @@ -1,43 +1,68 @@
  #!/bin/sh
  #
@@ -776,7 +776,7 @@
 +
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-1.34.1/scripts/chcat
 --- nsapolicycoreutils/scripts/chcat	2007-01-24 10:04:01.000000000 -0500
-+++ policycoreutils-1.34.1/scripts/chcat	2007-04-16 14:08:01.000000000 -0400
++++ policycoreutils-1.34.1/scripts/chcat	2007-04-23 11:00:14.000000000 -0400
 @@ -62,12 +62,20 @@
          for i in newcat[1:]:
              if i not in cats:
@@ -844,7 +844,7 @@
  def chcat_replace(newcat, objects, login_ind):
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles.8 policycoreutils-1.34.1/scripts/fixfiles.8
 --- nsapolicycoreutils/scripts/fixfiles.8	2007-01-24 10:04:01.000000000 -0500
-+++ policycoreutils-1.34.1/scripts/fixfiles.8	2007-04-16 14:08:01.000000000 -0400
++++ policycoreutils-1.34.1/scripts/fixfiles.8	2007-04-23 11:00:14.000000000 -0400
 @@ -35,7 +35,7 @@
  
  .TP 
@@ -854,9 +854,94 @@
  
  .TP 
  .B -R rpmpackagename[,rpmpackagename...]
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.34.1/scripts/genhomedircon
+--- nsapolicycoreutils/scripts/genhomedircon	2007-01-24 10:04:01.000000000 -0500
++++ policycoreutils-1.34.1/scripts/genhomedircon	2007-04-23 11:01:29.000000000 -0400
+@@ -26,6 +26,7 @@
+ 
+ import sys, os, pwd, string, getopt, re
+ from semanage import *;
++import selinux
+ import gettext
+ gettext.install('policycoreutils')
+ 
+@@ -135,6 +136,9 @@
+ 		self.contextdir = "/contexts"
+ 		self.filecontextdir = self.contextdir+"/files"
+ 		self.usepwd = usepwd
++		self.default_user = "user_u"
++		self.default_prefix = "user"
++		self.users = self.getUsers()
+ 
+ 	def getFileContextDir(self):
+ 		return self.selinuxdir+self.type+self.filecontextdir
+@@ -211,6 +215,10 @@
+ 		prefs["prefix"] = prefix
+ 		prefs["home"] = home
+ 		udict[user] = prefs
++			
++	def setDefaultUser(self, user, prefix):
++		self.default_user = user
++		self.default_prefix = prefix
+ 		
+ 	def getUsers(self):
+ 		udict = {}
+@@ -219,7 +227,11 @@
+ 			for seuser in list:
+ 				user = []
+ 				seusername = semanage_seuser_get_sename(seuser)
+-				self.adduser(udict, semanage_seuser_get_name(seuser), seusername, self.get_default_prefix(seusername))
++				prefix = self.get_default_prefix(seusername)
++				if semanage_seuser_get_name(seuser) == "__default__":
++					self.setDefaultUser(seusername, prefix)
++
++				self.adduser(udict, semanage_seuser_get_name(seuser), seusername, prefix)
+ 				
+ 		else:
+ 			try:
+@@ -249,7 +261,10 @@
+ 				i = i.replace("HOME_DIR", home)
+ 				i = i.replace("ROLE", prefix)
+ 				i = i.replace("system_u", seuser)
+-				ret = ret+i
++				# Validate if the generated context exists.  Some user types may not exist
++				scon = i.split()[-1]
++				if selinux.security_check_context(scon) == 0:
++					ret = ret+i
+ 		fd.close()
+ 		return ret
+ 
+@@ -266,12 +281,11 @@
+ 		return ret
+ 
+ 	def genHomeDirContext(self):
+-		users = self.getUsers()
+ 		ret = ""
+ 		# Fill in HOME and prefix for users that are defined
+-		for u in users.keys():
+-			ret += self.getHomeDirContext (u, users[u]["seuser"], users[u]["home"], users[u]["prefix"])
+-			ret += self.getUserContext (u, users[u]["seuser"], users[u]["prefix"])
++		for u in self.users.keys():
++			ret += self.getHomeDirContext (u, self.users[u]["seuser"], self.users[u]["home"], self.users[u]["prefix"])
++			ret += self.getUserContext (u, self.users[u]["seuser"], self.users[u]["prefix"])
+ 		return ret+"\n"
+ 
+ 	def checkExists(self, home):
+@@ -318,9 +332,9 @@
+ 	def genoutput(self):
+ 		ret = self.heading()
+ 		for h in self.getHomeDirs():
+-			ret += self.getHomeDirContext ("user_u", "user_u" , h+'/[^/]*', "user")
++			ret += self.getHomeDirContext (self.default_user, self.default_user, h+'/[^/]*', self.default_prefix)
+ 			ret += self.getHomeRootContext(h)
+-		ret += self.getUserContext(".*", "user_u", "user") + "\n"
++		ret += self.getUserContext(".*", self.default_user, self.default_prefix) + "\n"
+ 		ret += self.genHomeDirContext()
+ 		return ret
+ 
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.34.1/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2007-01-24 10:04:01.000000000 -0500
-+++ policycoreutils-1.34.1/semanage/seobject.py	2007-04-16 14:08:01.000000000 -0400
++++ policycoreutils-1.34.1/semanage/seobject.py	2007-04-23 11:00:14.000000000 -0400
 @@ -209,7 +209,8 @@
  		os.write(fd, self.out())
  		os.close(fd)


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-6/policycoreutils.spec,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -r1.333 -r1.334
--- policycoreutils.spec	17 Apr 2007 12:31:49 -0000	1.333
+++ policycoreutils.spec	23 Apr 2007 15:03:02 -0000	1.334
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.34.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -190,6 +190,10 @@
 fi
 
 %changelog
+* Tue Apr 17 2007 Dan Walsh <dwalsh at redhat.com> 1.34.1-8
+- Fix genhomedircon to handle __default__ not being user_u
+- Modify polgengui to be wizard
+
 * Tue Apr 17 2007 Dan Walsh <dwalsh at redhat.com> 1.34.1-7
 - Fully path script.py
 



From fedora-cvs-commits at redhat.com  Mon Apr 23 15:24:33 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 11:24:33 -0400
Subject: rpms/qt/devel qt-3.3.6-fontrendering-gu-228451.patch, NONE,
	1.1 qt.spec, 1.134, 1.135
Message-ID: <200704231524.l3NFOXgx024286@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/qt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24210

Modified Files:
	qt.spec 
Added Files:
	qt-3.3.6-fontrendering-gu-228451.patch 
Log Message:
apply patch to fix fontrendering problem in gu_IN #228451


qt-3.3.6-fontrendering-gu-228451.patch:
 qscriptengine_x11.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE qt-3.3.6-fontrendering-gu-228451.patch ---
diff -pruN qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp
--- qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp	2007-02-13 14:35:30.000000000 +0530
+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp	2007-02-13 14:37:58.000000000 +0530
@@ -226,7 +226,7 @@ static const unsigned char indicForms[0x
     Invalid, VowelMark, VowelMark, VowelMark,
     Invalid, IndependentVowel, IndependentVowel, IndependentVowel,
     IndependentVowel, IndependentVowel, IndependentVowel, IndependentVowel,
-    Invalid, IndependentVowel, Invalid, IndependentVowel,
+    IndependentVowel, IndependentVowel, Invalid, IndependentVowel,
 
     IndependentVowel, IndependentVowel, Invalid, IndependentVowel,
     IndependentVowel, Consonant, Consonant, Consonant,


Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/qt.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- qt.spec	11 Apr 2007 13:28:18 -0000	1.134
+++ qt.spec	23 Apr 2007 15:24:31 -0000	1.135
@@ -1,7 +1,7 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: 3.3.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
@@ -38,6 +38,7 @@
 Patch33: qt-3.3.8-fontrendering-#214570.patch
 Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch
 Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch
+Patch36: qt-3.3.6-fontrendering-gu-228451.patch
 
 # immodule patches
 Patch50: qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-pre.patch
@@ -273,6 +274,7 @@
 %patch33 -p1 -b .fontrendering-#214570
 %patch34 -p1 -b .fontrendering-#209974
 %patch35 -p1 -b .fontrendering-ml_IN-217657
+%patch36 -p1 -b .fontrendering-gu-228451
 
 %if %{immodule}
 %patch50 -p1 -b .pre
@@ -564,6 +566,9 @@
 
 
 %changelog
+* Mon Apr 23 2007 Than Ngo <than at redhat.com> - 1:3.3.8-5.fc7
+- apply patch to fix fontrendering problem in gu_IN #228451
+
 * Wed Apr 11 2007 Than Ngo <than at redhat.com> - 1:3.3.8-4.fc7
 - adjust qt-3.3.8-fontrendering-as_IN-209972.patch and
   qt-3.3.8-fontrendering-#214570.patch for qt-3.3.8



From fedora-cvs-commits at redhat.com  Mon Apr 23 15:36:52 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 11:36:52 -0400
Subject: rpms/qt/devel qt-3.3.6-fontrendering-gu-228452.patch, NONE,
	1.1 qt.spec, 1.135, 1.136
Message-ID: <200704231536.l3NFaq1a019105@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/qt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2739

Modified Files:
	qt.spec 
Added Files:
	qt-3.3.6-fontrendering-gu-228452.patch 
Log Message:
apply patch to fix fontrendering problem in gu_IN #228451,#228452


qt-3.3.6-fontrendering-gu-228452.patch:
 qscriptengine_x11.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE qt-3.3.6-fontrendering-gu-228452.patch ---
diff -pruN qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp
--- qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp	2007-02-13 14:41:25.000000000 +0530
+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp	2007-02-13 14:40:02.000000000 +0530
@@ -253,7 +253,7 @@ static const unsigned char indicForms[0x
     Unknown, Unknown, Unknown, Unknown,
     Unknown, Unknown, Unknown, Unknown,
 
-    Other, Other, Other, Other,
+    Other, Other, VowelMark, VowelMark,
     Other, Other, Other, Other,
     Other, Other, Other, Other,
     Other, Other, Other, Other,


Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/qt.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- qt.spec	23 Apr 2007 15:24:31 -0000	1.135
+++ qt.spec	23 Apr 2007 15:36:50 -0000	1.136
@@ -39,6 +39,7 @@
 Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch
 Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch
 Patch36: qt-3.3.6-fontrendering-gu-228451.patch
+Patch37: qt-3.3.6-fontrendering-gu-228452.patch
 
 # immodule patches
 Patch50: qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-pre.patch
@@ -275,6 +276,7 @@
 %patch34 -p1 -b .fontrendering-#209974
 %patch35 -p1 -b .fontrendering-ml_IN-217657
 %patch36 -p1 -b .fontrendering-gu-228451
+%patch37 -p1 -b .fontrendering-gu-228452
 
 %if %{immodule}
 %patch50 -p1 -b .pre
@@ -567,7 +569,7 @@
 
 %changelog
 * Mon Apr 23 2007 Than Ngo <than at redhat.com> - 1:3.3.8-5.fc7
-- apply patch to fix fontrendering problem in gu_IN #228451
+- apply patch to fix fontrendering problem in gu_IN #228451,#228452
 
 * Wed Apr 11 2007 Than Ngo <than at redhat.com> - 1:3.3.8-4.fc7
 - adjust qt-3.3.8-fontrendering-as_IN-209972.patch and



From fedora-cvs-commits at redhat.com  Mon Apr 23 15:39:15 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 11:39:15 -0400
Subject: rpms/agg/devel agg-2.5-pkgconfig.patch, NONE,
	1.1 agg-2.4-depends.patch, 1.2, 1.3 agg.spec, 1.15, 1.16
Message-ID: <200704231539.l3NFdEfJ029008@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/agg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28987

Modified Files:
	agg-2.4-depends.patch agg.spec 
Added Files:
	agg-2.5-pkgconfig.patch 
Log Message:
Resolves: rhbz#237493 misapplied patch

agg-2.5-pkgconfig.patch:
 libagg.pc.in |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE agg-2.5-pkgconfig.patch ---
--- agg-2.5/libagg.pc.in.orig	2007-01-07 13:58:28.000000000 +0000
+++ agg-2.5/libagg.pc.in	2007-01-07 14:02:40.000000000 +0000
@@ -6,5 +6,6 @@
 Name: libagg
 Description: Anti Grain Geometry - A High Quality Rendering Engine for C++
 Version: @VERSION@
-Libs: -L${libdir} -Wl,-rpath,${exec_prefix}/lib -lagg
+Requires.private: freetype2
+Libs: -L${libdir} -lagg
 Cflags: -I${includedir}

agg-2.4-depends.patch:
 font_freetype/Makefile.am    |    3 ++-
 src/platform/X11/Makefile.am |    2 +-
 src/platform/sdl/Makefile.am |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

Index: agg-2.4-depends.patch
===================================================================
RCS file: /cvs/dist/rpms/agg/devel/agg-2.4-depends.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- agg-2.4-depends.patch	6 Jan 2007 16:31:21 -0000	1.2
+++ agg-2.4-depends.patch	23 Apr 2007 15:39:12 -0000	1.3
@@ -26,6 +26,7 @@
 diff -ru agg-2.4.orig/src/platform/X11/Makefile.am agg-2.4/src/platform/X11/Makefile.am
 --- agg-2.4.orig/src/platform/X11/Makefile.am	2005-10-19 19:11:35.000000000 +0100
 +++ agg-2.4/src/platform/X11/Makefile.am	2006-07-10 15:11:55.000000000 +0100
+@@ -4,5 +4,5 @@
  libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@  -L at x_libraries@
  libaggplatformX11_la_SOURCES = agg_platform_support.cpp
  libaggplatformX11_la_CXXFLAGS =  -I$(top_srcdir)/include -I at x_includes@


Index: agg.spec
===================================================================
RCS file: /cvs/dist/rpms/agg/devel/agg.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- agg.spec	6 Jan 2007 16:19:28 -0000	1.15
+++ agg.spec	23 Apr 2007 15:39:12 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Anti-Grain Geometry
 Name:    agg
 Version: 2.5
-Release: 1
+Release: 2%{?dist}
 Group:   System Environment/Libraries
 URL:     http://www.antigrain.com
 License: GPL
@@ -10,9 +10,10 @@
 BuildRequires: automake, libtool, libX11-devel, freetype-devel, SDL-devel
 
 Patch0: agg-2.4-depends.patch
+Patch1: agg-2.5-pkgconfig.patch
 
 %description
-A High Quality Rendering Engine for C++
+A High Quality Rendering Engine for C++.
 
 %package devel
 Summary: Support files necessary to compile applications with agg
@@ -20,26 +21,25 @@
 Requires: agg = %{version}-%{release}
 
 %description devel
-Libraries, headers, and support files necessary to compile applications using agg
+Libraries, headers, and support files necessary to compile applications using agg.
 
 %prep
 %setup -q
 %patch0 -p1 -b .agg-2.4-depends
+%patch1 -p1 -b .agg-2.5-pkgconfig.patch
+sh ./autogen.sh
 
 %build
-sh ./autogen.sh --disable-gpc
-%configure
-make
+%configure --disable-static --disable-gpc
+make %{?_smp_mflags}
 
 %install
-%makeinstall
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+make DESTDIR=$RPM_BUILD_ROOT install
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun 
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
@@ -47,16 +47,18 @@
 %{_libdir}/lib*.so.*
 
 %files devel
-%{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libagg.pc
-%{_includedir}/agg2
+%{_includedir}/agg2/
 %{_datadir}/aclocal/libagg.m4
 
 %clean
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 23 2007 Caolan McNamara <caolanm at redhat.com> - 2.5-2
+- Resolves: rhbz#237493 misapplied patch
+
 * Sat Jan 06 2007 Caolan McNamara <caolanm at redhat.com> - 2.5-1
 - bump to 2.5
 



From fedora-cvs-commits at redhat.com  Mon Apr 23 16:39:02 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 12:39:02 -0400
Subject: rpms/kernel-xen-2.6/devel linux-2.6-xen-execshield.patch, 1.3.2.3,
	1.3.2.4
Message-ID: <200704231639.l3NGd24g016623@cvs.devel.redhat.com>

Author: ehabkost

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

Modified Files:
      Tag: private-ehabkost-2_6_21-branch
	linux-2.6-xen-execshield.patch 
Log Message:
Fixing stupid mistake made when rebasing -xen-execshield.patch

Problem not detected before because Brew is *still* not getting the
right package from CVS, even after tagging.  :(



linux-2.6-xen-execshield.patch:
 arch/i386/kernel/cpu/common-xen.c         |    7 ++
 arch/i386/kernel/process-xen.c            |   60 +++++++++++++++++++
 arch/i386/kernel/smp-xen.c                |    3 
 arch/i386/kernel/traps-xen.c              |   93 +++++++++++++++++++++++++++++-
 arch/i386/mm/init-xen.c                   |    6 +
 arch/x86_64/kernel/process-xen.c          |    6 -
 arch/x86_64/kernel/setup64-xen.c          |   40 ------------
 arch/x86_64/mm/fault-xen.c                |    2 
 include/asm-i386/mach-xen/asm/desc.h      |   14 ++++
 include/asm-i386/mach-xen/asm/pgalloc.h   |    1 
 include/asm-i386/mach-xen/asm/processor.h |    8 ++
 include/asm-x86_64/mach-xen/asm/pgalloc.h |    7 ++
 12 files changed, 197 insertions(+), 50 deletions(-)

Index: linux-2.6-xen-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/linux-2.6-xen-execshield.patch,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- linux-2.6-xen-execshield.patch	13 Apr 2007 18:41:08 -0000	1.3.2.3
+++ linux-2.6-xen-execshield.patch	23 Apr 2007 16:39:00 -0000	1.3.2.4
@@ -20,16 +20,16 @@
 ===================================================================
 --- linux-2.6.20.patching.orig/arch/i386/kernel/process-xen.c
 +++ linux-2.6.20.patching/arch/i386/kernel/process-xen.c
-@@ -500,6 +500,9 @@ static inline void disable_tsc(struct ta
- {
- 	struct thread_info *prev, *next;
+@@ -573,6 +573,9 @@ struct task_struct fastcall * __switch_t
+ 	else BUG_ON(!(read_cr0() & 8));
+ #endif
  
 +	if (next_p->mm)
 +		load_user_cs_desc(cpu, next_p->mm);
 +
- 	/*
- 	 * gcc should eliminate the ->thread_info dereference if
- 	 * has_secure_computing returns 0 at compile time (SECCOMP=n).
+ 	/* we're going to use this soon, after a few expensive things */
+ 	if (next_p->fpu_counter > 5)
+ 		prefetch(&next->i387.fxsave);
 @@ -871,3 +874,60 @@ unsigned long arch_align_stack(unsigned 
  		sp -= get_random_int() % 8192;
  	return sp & ~0xf;



From fedora-cvs-commits at redhat.com  Mon Apr 23 17:00:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 13:00:50 -0400
Subject: rpms/selinux-policy/devel .cvsignore, 1.111,
	1.112 policy-20070219.patch, 1.57, 1.58 selinux-policy.spec,
	1.442, 1.443 sources, 1.119, 1.120
Message-ID: <200704231700.l3NH0ogW032597@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore policy-20070219.patch selinux-policy.spec sources 
Log Message:
* Mon Apr 23 2007 Dan Walsh <dwalsh at redhat.com> 2.6.1-1
- Upstream bumped the version



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- .cvsignore	11 Apr 2007 20:23:53 -0000	1.111
+++ .cvsignore	23 Apr 2007 17:00:48 -0000	1.112
@@ -113,3 +113,4 @@
 serefpolicy-2.5.10.tgz
 serefpolicy-2.5.11.tgz
 serefpolicy-2.5.12.tgz
+serefpolicy-2.6.1.tgz

policy-20070219.patch:
 Rules.modular                           |   12 +
 VERSION                                 |    2 
 policy/flask/access_vectors             |    4 
 policy/global_booleans                  |    2 
 policy/global_tunables                  |    7 
 policy/mls                              |   31 ++-
 policy/modules/admin/acct.te            |    1 
 policy/modules/admin/alsa.fc            |    1 
 policy/modules/admin/amtu.fc            |    3 
 policy/modules/admin/amtu.if            |   53 ++++++
 policy/modules/admin/amtu.te            |   56 ++++++
 policy/modules/admin/bootloader.te      |    3 
 policy/modules/admin/consoletype.te     |   10 -
 policy/modules/admin/dmesg.te           |    1 
 policy/modules/admin/kudzu.te           |    6 
 policy/modules/admin/logwatch.te        |    4 
 policy/modules/admin/netutils.te        |    6 
 policy/modules/admin/readahead.te       |    6 
 policy/modules/admin/rpm.fc             |    3 
 policy/modules/admin/rpm.if             |   85 +++++++--
 policy/modules/admin/rpm.te             |    2 
 policy/modules/admin/su.if              |    4 
 policy/modules/admin/usermanage.if      |    2 
 policy/modules/admin/usermanage.te      |   26 +++
 policy/modules/apps/gnome.if            |   26 ++-
 policy/modules/apps/gpg.fc              |    2 
 policy/modules/apps/loadkeys.if         |   44 +----
 policy/modules/apps/mozilla.if          |    1 
 policy/modules/apps/slocate.te          |    5 
 policy/modules/apps/uml.if              |   27 ---
 policy/modules/kernel/corecommands.fc   |    5 
 policy/modules/kernel/corecommands.if   |   20 ++
 policy/modules/kernel/corenetwork.te.in |   15 +
 policy/modules/kernel/devices.if        |   36 ++++
 policy/modules/kernel/domain.if         |   18 ++
 policy/modules/kernel/domain.te         |   46 +++++
 policy/modules/kernel/files.fc          |    1 
 policy/modules/kernel/files.if          |   83 ++++++++-
 policy/modules/kernel/filesystem.if     |   39 ++++
 policy/modules/kernel/filesystem.te     |   13 +
 policy/modules/kernel/kernel.if         |   42 ++++
 policy/modules/kernel/kernel.te         |    2 
 policy/modules/kernel/mls.if            |   20 ++
 policy/modules/kernel/mls.te            |    3 
 policy/modules/kernel/selinux.if        |   38 ++++
 policy/modules/kernel/storage.if        |    2 
 policy/modules/kernel/terminal.if       |    2 
 policy/modules/kernel/terminal.te       |    1 
 policy/modules/services/aide.fc         |    1 
 policy/modules/services/aide.te         |    2 
 policy/modules/services/amavis.if       |   19 ++
 policy/modules/services/amavis.te       |    3 
 policy/modules/services/apache.fc       |   14 -
 policy/modules/services/apache.if       |  171 ++++++++++++++++++-
 policy/modules/services/apache.te       |   76 ++++++++
 policy/modules/services/apcupsd.fc      |    9 +
 policy/modules/services/apcupsd.if      |  108 ++++++++++++
 policy/modules/services/apcupsd.te      |   92 ++++++++++
 policy/modules/services/automount.te    |    2 
 policy/modules/services/avahi.if        |   19 ++
 policy/modules/services/avahi.te        |    4 
 policy/modules/services/bind.te         |    1 
 policy/modules/services/bluetooth.te    |    2 
 policy/modules/services/clamav.te       |    1 
 policy/modules/services/clockspeed.if   |    2 
 policy/modules/services/consolekit.te   |   33 +++
 policy/modules/services/cron.fc         |    1 
 policy/modules/services/cron.if         |   33 +--
 policy/modules/services/cron.te         |   43 ++++
 policy/modules/services/cups.te         |    6 
 policy/modules/services/cvs.te          |    1 
 policy/modules/services/cyrus.te        |    1 
 policy/modules/services/dbus.if         |   63 +++++++
 policy/modules/services/dhcp.te         |    2 
 policy/modules/services/djbdns.te       |    5 
 policy/modules/services/dovecot.te      |    5 
 policy/modules/services/ftp.te          |    5 
 policy/modules/services/hal.fc          |    8 
 policy/modules/services/hal.if          |   77 ++++++++
 policy/modules/services/hal.te          |  147 ++++++++++++++++
 policy/modules/services/inetd.te        |    5 
 policy/modules/services/kerberos.if     |   79 ++-------
 policy/modules/services/kerberos.te     |   34 +++
 policy/modules/services/mailman.if      |   19 ++
 policy/modules/services/mta.if          |   19 ++
 policy/modules/services/mta.te          |    2 
 policy/modules/services/nis.if          |    4 
 policy/modules/services/nis.te          |    4 
 policy/modules/services/nscd.te         |   10 +
 policy/modules/services/ntp.te          |    4 
 policy/modules/services/pegasus.if      |   18 ++
 policy/modules/services/pegasus.te      |    6 
 policy/modules/services/postfix.if      |    1 
 policy/modules/services/postfix.te      |    8 
 policy/modules/services/ppp.te          |    2 
 policy/modules/services/procmail.te     |    1 
 policy/modules/services/pyzor.te        |    7 
 policy/modules/services/radius.te       |    4 
 policy/modules/services/rpc.if          |    5 
 policy/modules/services/rpc.te          |    1 
 policy/modules/services/rpcbind.fc      |    6 
 policy/modules/services/rpcbind.if      |  104 ++++++++++++
 policy/modules/services/rpcbind.te      |   83 +++++++++
 policy/modules/services/rsync.te        |    1 
 policy/modules/services/rwho.fc         |    3 
 policy/modules/services/rwho.if         |   84 +++++++++
 policy/modules/services/rwho.te         |   61 +++++++
 policy/modules/services/samba.fc        |    3 
 policy/modules/services/samba.if        |   86 +++++++++
 policy/modules/services/samba.te        |   87 +++++++++-
 policy/modules/services/sendmail.if     |   22 ++
 policy/modules/services/smartmon.te     |    1 
 policy/modules/services/snmp.te         |   15 +
 policy/modules/services/spamassassin.te |    7 
 policy/modules/services/squid.fc        |    2 
 policy/modules/services/squid.if        |   22 ++
 policy/modules/services/squid.te        |   12 +
 policy/modules/services/ssh.if          |   39 ++++
 policy/modules/services/ssh.te          |    9 -
 policy/modules/services/w3c.fc          |    2 
 policy/modules/services/w3c.if          |    1 
 policy/modules/services/w3c.te          |   14 +
 policy/modules/system/application.fc    |    1 
 policy/modules/system/application.if    |  104 ++++++++++++
 policy/modules/system/application.te    |   14 +
 policy/modules/system/authlogin.if      |   83 +++++++--
 policy/modules/system/authlogin.te      |    3 
 policy/modules/system/fstools.fc        |    1 
 policy/modules/system/fstools.te        |    1 
 policy/modules/system/fusermount.fc     |    6 
 policy/modules/system/fusermount.if     |   41 ++++
 policy/modules/system/fusermount.te     |   50 +++++
 policy/modules/system/getty.te          |    3 
 policy/modules/system/hostname.te       |   14 +
 policy/modules/system/init.if           |   42 ++++
 policy/modules/system/init.te           |   35 +++-
 policy/modules/system/ipsec.if          |   20 ++
 policy/modules/system/ipsec.te          |    3 
 policy/modules/system/iptables.te       |    5 
 policy/modules/system/libraries.fc      |    5 
 policy/modules/system/libraries.te      |    4 
 policy/modules/system/locallogin.te     |    7 
 policy/modules/system/logging.if        |   21 ++
 policy/modules/system/logging.te        |    2 
 policy/modules/system/lvm.fc            |    1 
 policy/modules/system/lvm.te            |    8 
 policy/modules/system/modutils.te       |    7 
 policy/modules/system/mount.fc          |    3 
 policy/modules/system/mount.if          |   37 ++++
 policy/modules/system/mount.te          |   70 +++++++-
 policy/modules/system/raid.te           |    1 
 policy/modules/system/selinuxutil.fc    |    1 
 policy/modules/system/selinuxutil.if    |    5 
 policy/modules/system/selinuxutil.te    |   68 ++++---
 policy/modules/system/sysnetwork.te     |    3 
 policy/modules/system/udev.te           |   12 +
 policy/modules/system/unconfined.fc     |    1 
 policy/modules/system/unconfined.if     |   10 -
 policy/modules/system/unconfined.te     |   24 ++
 policy/modules/system/userdomain.if     |  277 ++++++++++++++++++--------------
 policy/modules/system/userdomain.te     |   69 +++++--
 policy/modules/system/xen.te            |   35 +++-
 policy/support/obj_perm_sets.spt        |   12 +
 163 files changed, 3326 insertions(+), 457 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.57 -r 1.58 policy-20070219.patch
Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- policy-20070219.patch	20 Apr 2007 20:13:07 -0000	1.57
+++ policy-20070219.patch	23 Apr 2007 17:00:48 -0000	1.58
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.5.12/policy/flask/access_vectors
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.6.1/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2007-02-26 09:43:33.000000000 -0500
-+++ serefpolicy-2.5.12/policy/flask/access_vectors	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.6.1/policy/flask/access_vectors	2007-04-23 09:53:18.000000000 -0400
 @@ -598,6 +598,8 @@
  	shmempwd
  	shmemgrp
@@ -19,9 +19,9 @@
  }
  
  class key
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.5.12/policy/global_booleans
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.6.1/policy/global_booleans
 --- nsaserefpolicy/policy/global_booleans	2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-2.5.12/policy/global_booleans	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.6.1/policy/global_booleans	2007-04-23 09:53:18.000000000 -0400
 @@ -4,7 +4,6 @@
  # file should be used.
  #
@@ -38,9 +38,9 @@
  
  ## <desc>
  ## <p>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.5.12/policy/global_tunables
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.6.1/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2007-03-26 16:24:14.000000000 -0400
-+++ serefpolicy-2.5.12/policy/global_tunables	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.6.1/policy/global_tunables	2007-04-23 09:53:18.000000000 -0400
 @@ -102,12 +102,6 @@
  ## </desc>
  gen_tunable(use_samba_home_dirs,false)
@@ -59,9 +59,9 @@
  ## </desc>
  gen_tunable(write_untrusted_content,false)
 -')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.5.12/policy/mls
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.6.1/policy/mls
 --- nsaserefpolicy/policy/mls	2007-03-09 13:02:20.000000000 -0500
-+++ serefpolicy-2.5.12/policy/mls	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.6.1/policy/mls	2007-04-23 09:53:18.000000000 -0400
 @@ -89,12 +89,14 @@
  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
@@ -133,9 +133,9 @@
  	 ( t2 == unlabeled_t ));
  
  mlsconstrain association { polmatch }
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.5.12/policy/modules/admin/acct.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.6.1/policy/modules/admin/acct.te
 --- nsaserefpolicy/policy/modules/admin/acct.te	2007-03-26 10:39:08.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/admin/acct.te	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/acct.te	2007-04-23 09:53:18.000000000 -0400
 @@ -9,6 +9,7 @@
  type acct_t;
  type acct_exec_t;
@@ -144,25 +144,25 @@
  
  type acct_data_t;
  logging_log_file(acct_data_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.fc serefpolicy-2.5.12/policy/modules/admin/alsa.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.fc serefpolicy-2.6.1/policy/modules/admin/alsa.fc
 --- nsaserefpolicy/policy/modules/admin/alsa.fc	2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/admin/alsa.fc	2007-04-18 16:47:23.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/alsa.fc	2007-04-23 09:53:18.000000000 -0400
 @@ -1,4 +1,5 @@
  
  /etc/alsa/pcm(/.*)?		gen_context(system_u:object_r:alsa_etc_rw_t,s0)
 +/etc/asound(/.*)?		gen_context(system_u:object_r:alsa_etc_rw_t,s0)
  
  /usr/bin/ainit 		--	gen_context(system_u:object_r:alsa_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.fc serefpolicy-2.5.12/policy/modules/admin/amtu.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.fc serefpolicy-2.6.1/policy/modules/admin/amtu.fc
 --- nsaserefpolicy/policy/modules/admin/amtu.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/admin/amtu.fc	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/amtu.fc	2007-04-23 09:53:18.000000000 -0400
 @@ -0,0 +1,3 @@
 +
 +/usr/bin/amtu    --    gen_context(system_u:object_r:amtu_exec_t,s0)
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.if serefpolicy-2.5.12/policy/modules/admin/amtu.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.if serefpolicy-2.6.1/policy/modules/admin/amtu.if
 --- nsaserefpolicy/policy/modules/admin/amtu.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/admin/amtu.if	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/amtu.if	2007-04-23 09:53:18.000000000 -0400
 @@ -0,0 +1,53 @@
 +## <summary>
 +##	abstract Machine Test Utility 
@@ -217,9 +217,9 @@
 +	role $2 types amtu_t;
 +	allow amtu_t $3:chr_file rw_term_perms;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.te serefpolicy-2.5.12/policy/modules/admin/amtu.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.te serefpolicy-2.6.1/policy/modules/admin/amtu.te
 --- nsaserefpolicy/policy/modules/admin/amtu.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/admin/amtu.te	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/amtu.te	2007-04-23 09:53:18.000000000 -0400
 @@ -0,0 +1,56 @@
 +policy_module(amtu,1.0.23)
 +
@@ -277,9 +277,9 @@
 +    term_dontaudit_search_ptys(amtu_t)
 +');
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.5.12/policy/modules/admin/bootloader.te
---- nsaserefpolicy/policy/modules/admin/bootloader.te	2007-02-19 11:32:54.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/admin/bootloader.te	2007-04-16 11:36:34.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.6.1/policy/modules/admin/bootloader.te
+--- nsaserefpolicy/policy/modules/admin/bootloader.te	2007-04-23 09:36:02.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/bootloader.te	2007-04-23 09:53:18.000000000 -0400
 @@ -65,6 +65,8 @@
  files_tmp_filetrans(bootloader_t,bootloader_tmp_t,{ dir file lnk_file chr_file blk_file })
  # for tune2fs (cjp: ?)
@@ -297,9 +297,9 @@
  ')
  
  optional_policy(`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.5.12/policy/modules/admin/consoletype.te
---- nsaserefpolicy/policy/modules/admin/consoletype.te	2007-02-19 11:32:54.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/admin/consoletype.te	2007-04-11 17:07:34.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.6.1/policy/modules/admin/consoletype.te
+--- nsaserefpolicy/policy/modules/admin/consoletype.te	2007-04-23 09:36:02.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/consoletype.te	2007-04-23 09:53:18.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -331,9 +331,9 @@
  
  domain_use_interactive_fds(consoletype_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-2.5.12/policy/modules/admin/dmesg.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-2.6.1/policy/modules/admin/dmesg.te
 --- nsaserefpolicy/policy/modules/admin/dmesg.te	2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-2.5.12/policy/modules/admin/dmesg.te	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/dmesg.te	2007-04-23 09:53:18.000000000 -0400
 @@ -10,6 +10,7 @@
  	type dmesg_t;
  	type dmesg_exec_t;
@@ -342,9 +342,9 @@
  	role system_r types dmesg_t;
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.5.12/policy/modules/admin/kudzu.te
---- nsaserefpolicy/policy/modules/admin/kudzu.te	2007-04-10 12:52:58.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/admin/kudzu.te	2007-04-11 17:07:34.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.6.1/policy/modules/admin/kudzu.te
+--- nsaserefpolicy/policy/modules/admin/kudzu.te	2007-04-23 09:36:02.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/kudzu.te	2007-04-23 09:53:18.000000000 -0400
 @@ -21,8 +21,8 @@
  # Local policy
  #
@@ -365,9 +365,9 @@
  # kudzu will telinit to make init re-read
  # the inittab after configuring serial consoles
  init_telinit(kudzu_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.5.12/policy/modules/admin/logwatch.te
---- nsaserefpolicy/policy/modules/admin/logwatch.te	2007-04-10 12:52:58.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/admin/logwatch.te	2007-04-11 17:07:34.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.6.1/policy/modules/admin/logwatch.te
+--- nsaserefpolicy/policy/modules/admin/logwatch.te	2007-04-23 09:36:02.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/logwatch.te	2007-04-23 09:53:18.000000000 -0400
 @@ -95,6 +95,10 @@
  ')
  
@@ -379,9 +379,9 @@
  	bind_read_config(logwatch_t)
  	bind_read_zone(logwatch_t)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.5.12/policy/modules/admin/netutils.te
---- nsaserefpolicy/policy/modules/admin/netutils.te	2007-03-26 16:24:13.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/admin/netutils.te	2007-04-11 17:07:34.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.6.1/policy/modules/admin/netutils.te
+--- nsaserefpolicy/policy/modules/admin/netutils.te	2007-04-23 09:36:02.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/netutils.te	2007-04-23 09:53:18.000000000 -0400
 @@ -31,6 +31,7 @@
  type traceroute_t;
  type traceroute_exec_t;
@@ -416,9 +416,29 @@
  sysnet_read_config(ping_t)
  sysnet_dns_name_resolve(ping_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.5.12/policy/modules/admin/rpm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.6.1/policy/modules/admin/readahead.te
+--- nsaserefpolicy/policy/modules/admin/readahead.te	2007-01-02 12:57:51.000000000 -0500
++++ serefpolicy-2.6.1/policy/modules/admin/readahead.te	2007-04-23 09:53:18.000000000 -0400
+@@ -36,7 +36,7 @@
+ dev_dontaudit_read_all_blk_files(readahead_t)
+ dev_dontaudit_getattr_memory_dev(readahead_t)
+ dev_dontaudit_getattr_nvram_dev(readahead_t)
+-storage_dontaudit_getattr_fixed_disk_dev(readahead_t)
++storage_raw_read_fixed_disk(readahead_t)
[...2303 lines suppressed...]
  	ifdef(`targeted_policy',`
  		term_use_generic_ptys($1)
@@ -6227,7 +6489,7 @@
  ')
  
  ########################################
-@@ -5393,13 +5342,13 @@
+@@ -5377,13 +5342,13 @@
  interface(`userdom_dontaudit_use_unpriv_users_ptys',`
  	ifdef(`targeted_policy',`
  		term_dontaudit_use_generic_ptys($1)
@@ -6246,7 +6508,7 @@
  ')
  
  ########################################
-@@ -5452,13 +5401,12 @@
+@@ -5436,13 +5401,12 @@
  interface(`userdom_list_unpriv_users_tmp',`
  	ifdef(`targeted_policy',`
  		files_list_tmp($1)
@@ -6265,7 +6527,7 @@
  ')
  
  ########################################
-@@ -5474,13 +5422,12 @@
+@@ -5458,13 +5422,12 @@
  interface(`userdom_read_unpriv_users_tmp_files',`
  	ifdef(`targeted_policy',`
  		files_read_generic_tmp_files($1)
@@ -6284,7 +6546,7 @@
  ')
  
  ########################################
-@@ -5496,13 +5443,12 @@
+@@ -5480,13 +5443,12 @@
  interface(`userdom_read_unpriv_users_tmp_symlinks',`
  	ifdef(`targeted_policy',`
  		files_read_generic_tmp_symlinks($1)
@@ -6303,7 +6565,7 @@
  ')
  
  ########################################
-@@ -5536,13 +5482,12 @@
+@@ -5520,13 +5482,12 @@
  interface(`userdom_use_unpriv_users_ttys',`
  	ifdef(`targeted_policy',`
  		term_use_unallocated_ttys($1)
@@ -6322,7 +6584,7 @@
  ')
  
  ########################################
-@@ -5559,13 +5504,12 @@
+@@ -5543,13 +5504,12 @@
  interface(`userdom_dontaudit_use_unpriv_users_ttys',`
  	ifdef(`targeted_policy',`
  		term_dontaudit_use_unallocated_ttys($1)
@@ -6341,7 +6603,7 @@
  ')
  
  ########################################
-@@ -5737,3 +5681,92 @@
+@@ -5721,3 +5681,92 @@
  	allow $1 user_home_dir_t:dir manage_dir_perms;
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
@@ -6434,9 +6696,9 @@
 +		dontaudit $1 sysadm_home_dir_t:dir write;
 +	')
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.5.12/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2007-03-26 16:24:13.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/userdomain.te	2007-04-19 10:08:39.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.6.1/policy/modules/system/userdomain.te
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2007-04-23 09:36:02.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/system/userdomain.te	2007-04-23 09:53:18.000000000 -0400
 @@ -15,7 +15,6 @@
  # Declarations
  #
@@ -6515,18 +6777,48 @@
  		apache_run_helper(sysadm_t,sysadm_r,admin_terminal)
  		#apache_run_all_scripts(sysadm_t,sysadm_r)
  		#apache_domtrans_sys_script(sysadm_t)
-@@ -384,6 +411,10 @@
+@@ -294,10 +321,6 @@
  	')
  
  	optional_policy(`
+-		cron_admin_template(sysadm,sysadm_t,sysadm_r)
+-	')
+-
+-	optional_policy(`
+ 		dcc_run_cdcc(sysadm_t,sysadm_r,admin_terminal)
+ 		dcc_run_client(sysadm_t,sysadm_r,admin_terminal)
+ 		dcc_run_dbclean(sysadm_t,sysadm_r,admin_terminal)
+@@ -325,7 +348,6 @@
+ 
+ 	optional_policy(`
+ 		ethereal_run_tethereal(sysadm_t,sysadm_r,admin_terminal)
+-		ethereal_admin_template(sysadm,sysadm_t,sysadm_r)
+ 	')
+ 
+ 	optional_policy(`
+@@ -368,7 +390,6 @@
+ 
+ 	optional_policy(`
+ 		lpd_run_checkpc(sysadm_t,sysadm_r,admin_terminal)
+-		lpr_admin_template(sysadm,sysadm_t,sysadm_r)
+ 	')
+ 
+ 	optional_policy(`
+@@ -386,11 +407,11 @@
+ 	')
+ 
+ 	optional_policy(`
+-		mta_admin_template(sysadm,sysadm_t,sysadm_r)
++		mysql_stream_connect(sysadm_t)
+ 	')
+ 
+ 	optional_policy(`
+-		mysql_stream_connect(sysadm_t)
 +		netlabel_run_mgmt(sysadm_t,sysadm_r,admin_terminal)
-+	')
-+
-+	optional_policy(`
- 		netutils_run(sysadm_t,sysadm_r,admin_terminal)
- 		netutils_run_ping(sysadm_t,sysadm_r,admin_terminal)
- 		netutils_run_traceroute(sysadm_t,sysadm_r,admin_terminal)
-@@ -442,6 +473,9 @@
+ 	')
+ 
+ 	optional_policy(`
+@@ -452,6 +473,9 @@
  
  		ifdef(`enable_mls',`
  			userdom_security_admin_template(secadm_t,secadm_r,{ secadm_tty_device_t sysadm_devpts_t })
@@ -6536,7 +6828,7 @@
  		', `
  			userdom_security_admin_template(sysadm_t,sysadm_r,admin_terminal)
  		')
-@@ -494,15 +528,15 @@
+@@ -504,15 +528,15 @@
  	unconfined_alias_domain(sysadm_t)
  
  	# User home directory type.
@@ -6561,7 +6853,7 @@
  
  	# compatibility for switching from strict
  #	dominance { role secadm_r { role system_r; }}
-@@ -538,4 +572,9 @@
+@@ -548,4 +572,9 @@
  	optional_policy(`
  		samba_per_role_template(user)
  	')
@@ -6571,9 +6863,9 @@
 +	')
 +
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.5.12/policy/modules/system/xen.te
---- nsaserefpolicy/policy/modules/system/xen.te	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.5.12/policy/modules/system/xen.te	2007-04-11 17:07:34.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.6.1/policy/modules/system/xen.te
+--- nsaserefpolicy/policy/modules/system/xen.te	2007-04-23 09:36:02.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/system/xen.te	2007-04-23 09:53:18.000000000 -0400
 @@ -25,6 +25,10 @@
  domain_type(xend_t)
  init_daemon_domain(xend_t, xend_exec_t)
@@ -6656,9 +6948,9 @@
 +fs_read_nfs_files(xend_t)
 +fs_getattr_all_fs(xend_t)
 +fs_read_dos_files(xend_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-2.5.12/policy/support/obj_perm_sets.spt
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-2.6.1/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2007-01-02 12:57:51.000000000 -0500
-+++ serefpolicy-2.5.12/policy/support/obj_perm_sets.spt	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.6.1/policy/support/obj_perm_sets.spt	2007-04-23 09:53:18.000000000 -0400
 @@ -215,7 +215,7 @@
  define(`getattr_file_perms',`{ getattr }')
  define(`setattr_file_perms',`{ setattr }')
@@ -6682,9 +6974,9 @@
 +define(`all_association', `{ sendto recvfrom setcontext polmatch } ')
 +
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.5.12/Rules.modular
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.6.1/Rules.modular
 --- nsaserefpolicy/Rules.modular	2007-03-22 14:30:10.000000000 -0400
-+++ serefpolicy-2.5.12/Rules.modular	2007-04-11 17:07:34.000000000 -0400
++++ serefpolicy-2.6.1/Rules.modular	2007-04-23 09:53:18.000000000 -0400
 @@ -167,7 +167,7 @@
  # these have to run individually because order matters:
  	$(verbose) $(GREP) '^sid ' $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true
@@ -6711,3 +7003,9 @@
  # Clean the sources
  #
  clean:
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/VERSION serefpolicy-2.6.1/VERSION
+--- nsaserefpolicy/VERSION	2007-04-23 09:36:02.000000000 -0400
++++ serefpolicy-2.6.1/VERSION	2007-04-23 09:53:18.000000000 -0400
+@@ -1 +1 @@
+-20070417
++20061212


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -r1.442 -r1.443
--- selinux-policy.spec	20 Apr 2007 20:13:07 -0000	1.442
+++ selinux-policy.spec	23 Apr 2007 17:00:48 -0000	1.443
@@ -16,8 +16,8 @@
 %define CHECKPOLICYVER 2.0.1-2
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.5.12
-Release: 12%{?dist}
+Version: 2.6.1
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -358,6 +358,9 @@
 %endif
 
 %changelog
+* Mon Apr 23 2007 Dan Walsh <dwalsh at redhat.com> 2.6.1-1
+- Upstream bumped the version
+
 * Thu Apr 19 2007 Dan Walsh <dwalsh at redhat.com> 2.5.12-12
 - Allow consolekit to syslog
 - Allow ntfs to work with hal


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- sources	11 Apr 2007 20:30:58 -0000	1.119
+++ sources	23 Apr 2007 17:00:48 -0000	1.120
@@ -1 +1 @@
-0aa75b44a124001fa6ce77ac24718e50  serefpolicy-2.5.12.tgz
+45c746832144dbac9073a3d8e6524a59  serefpolicy-2.6.1.tgz



From fedora-cvs-commits at redhat.com  Mon Apr 23 17:12:16 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 13:12:16 -0400
Subject: rpms/selinux-policy/devel policy-20070219.patch,1.58,1.59
Message-ID: <200704231712.l3NHCGxW008428@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20070219.patch 
Log Message:
* Mon Apr 23 2007 Dan Walsh <dwalsh at redhat.com> 2.6.1-1
- Upstream bumped the version


policy-20070219.patch:
 Rules.modular                           |   12 +
 VERSION                                 |    2 
 policy/flask/access_vectors             |    4 
 policy/global_booleans                  |    2 
 policy/global_tunables                  |    7 
 policy/mls                              |   31 ++-
 policy/modules/admin/acct.te            |    1 
 policy/modules/admin/alsa.fc            |    1 
 policy/modules/admin/amtu.fc            |    3 
 policy/modules/admin/amtu.if            |   53 ++++++
 policy/modules/admin/amtu.te            |   56 ++++++
 policy/modules/admin/bootloader.te      |    3 
 policy/modules/admin/consoletype.te     |   10 -
 policy/modules/admin/dmesg.te           |    1 
 policy/modules/admin/kudzu.te           |    6 
 policy/modules/admin/logwatch.te        |    4 
 policy/modules/admin/netutils.te        |    6 
 policy/modules/admin/readahead.te       |    6 
 policy/modules/admin/rpm.fc             |    3 
 policy/modules/admin/rpm.if             |   85 +++++++--
 policy/modules/admin/rpm.te             |    2 
 policy/modules/admin/su.if              |    4 
 policy/modules/admin/usermanage.if      |    2 
 policy/modules/admin/usermanage.te      |   26 +++
 policy/modules/apps/gnome.if            |   26 ++-
 policy/modules/apps/gpg.fc              |    2 
 policy/modules/apps/loadkeys.if         |   44 +----
 policy/modules/apps/mozilla.if          |    1 
 policy/modules/apps/slocate.te          |    5 
 policy/modules/apps/uml.if              |   27 ---
 policy/modules/kernel/corecommands.fc   |    5 
 policy/modules/kernel/corecommands.if   |   20 ++
 policy/modules/kernel/corenetwork.te.in |   15 +
 policy/modules/kernel/devices.if        |   36 ++++
 policy/modules/kernel/domain.if         |   18 ++
 policy/modules/kernel/domain.te         |   46 +++++
 policy/modules/kernel/files.fc          |    1 
 policy/modules/kernel/files.if          |   83 ++++++++-
 policy/modules/kernel/filesystem.if     |   39 ++++
 policy/modules/kernel/filesystem.te     |   13 +
 policy/modules/kernel/kernel.if         |   42 ++++
 policy/modules/kernel/kernel.te         |    2 
 policy/modules/kernel/mls.if            |   20 ++
 policy/modules/kernel/mls.te            |    3 
 policy/modules/kernel/selinux.if        |   38 ++++
 policy/modules/kernel/storage.if        |    2 
 policy/modules/kernel/terminal.if       |    2 
 policy/modules/kernel/terminal.te       |    1 
 policy/modules/services/aide.fc         |    1 
 policy/modules/services/aide.te         |    2 
 policy/modules/services/amavis.if       |   19 ++
 policy/modules/services/amavis.te       |    3 
 policy/modules/services/apache.fc       |   14 -
 policy/modules/services/apache.if       |  171 ++++++++++++++++++-
 policy/modules/services/apache.te       |   76 ++++++++
 policy/modules/services/apcupsd.fc      |    9 +
 policy/modules/services/apcupsd.if      |  108 ++++++++++++
 policy/modules/services/apcupsd.te      |   92 ++++++++++
 policy/modules/services/automount.te    |    2 
 policy/modules/services/avahi.if        |   19 ++
 policy/modules/services/avahi.te        |    4 
 policy/modules/services/bind.te         |    1 
 policy/modules/services/bluetooth.te    |    2 
 policy/modules/services/clamav.te       |    1 
 policy/modules/services/clockspeed.if   |    2 
 policy/modules/services/consolekit.te   |   33 +++
 policy/modules/services/cron.fc         |    1 
 policy/modules/services/cron.if         |   33 +--
 policy/modules/services/cron.te         |   43 ++++-
 policy/modules/services/cups.te         |    6 
 policy/modules/services/cvs.te          |    1 
 policy/modules/services/cyrus.te        |    1 
 policy/modules/services/dbus.if         |   63 +++++++
 policy/modules/services/dhcp.te         |    2 
 policy/modules/services/djbdns.te       |    5 
 policy/modules/services/dovecot.te      |    5 
 policy/modules/services/ftp.te          |    5 
 policy/modules/services/hal.fc          |    8 
 policy/modules/services/hal.if          |   77 ++++++++
 policy/modules/services/hal.te          |  147 ++++++++++++++++-
 policy/modules/services/inetd.te        |    5 
 policy/modules/services/kerberos.if     |   79 ++-------
 policy/modules/services/kerberos.te     |   34 +++
 policy/modules/services/mailman.if      |   19 ++
 policy/modules/services/mta.if          |   19 ++
 policy/modules/services/mta.te          |    2 
 policy/modules/services/nis.if          |    4 
 policy/modules/services/nis.te          |    4 
 policy/modules/services/nscd.te         |   10 +
 policy/modules/services/ntp.te          |    4 
 policy/modules/services/pegasus.if      |   18 ++
 policy/modules/services/pegasus.te      |    6 
 policy/modules/services/postfix.if      |    1 
 policy/modules/services/postfix.te      |    8 
 policy/modules/services/ppp.te          |    2 
 policy/modules/services/procmail.te     |    1 
 policy/modules/services/pyzor.te        |    7 
 policy/modules/services/radius.te       |    4 
 policy/modules/services/rpc.if          |    5 
 policy/modules/services/rpc.te          |    1 
 policy/modules/services/rpcbind.fc      |    6 
 policy/modules/services/rpcbind.if      |  104 ++++++++++++
 policy/modules/services/rpcbind.te      |   83 +++++++++
 policy/modules/services/rsync.te        |    1 
 policy/modules/services/rwho.fc         |    3 
 policy/modules/services/rwho.if         |   84 +++++++++
 policy/modules/services/rwho.te         |   61 +++++++
 policy/modules/services/samba.fc        |    3 
 policy/modules/services/samba.if        |   86 ++++++++++
 policy/modules/services/samba.te        |   87 +++++++++-
 policy/modules/services/sendmail.if     |   22 ++
 policy/modules/services/smartmon.te     |    1 
 policy/modules/services/snmp.te         |   15 +
 policy/modules/services/spamassassin.te |    7 
 policy/modules/services/squid.fc        |    2 
 policy/modules/services/squid.if        |   22 ++
 policy/modules/services/squid.te        |   12 +
 policy/modules/services/ssh.if          |   39 ++++
 policy/modules/services/ssh.te          |    9 -
 policy/modules/services/w3c.fc          |    2 
 policy/modules/services/w3c.if          |    1 
 policy/modules/services/w3c.te          |   14 +
 policy/modules/system/application.fc    |    1 
 policy/modules/system/application.if    |  104 ++++++++++++
 policy/modules/system/application.te    |   14 +
 policy/modules/system/authlogin.if      |   83 +++++++--
 policy/modules/system/authlogin.te      |    3 
 policy/modules/system/fstools.fc        |    1 
 policy/modules/system/fstools.te        |    1 
 policy/modules/system/fusermount.fc     |    6 
 policy/modules/system/fusermount.if     |   41 ++++
 policy/modules/system/fusermount.te     |   50 +++++
 policy/modules/system/getty.te          |    3 
 policy/modules/system/hostname.te       |   14 +
 policy/modules/system/init.if           |   42 ++++
 policy/modules/system/init.te           |   35 +++-
 policy/modules/system/ipsec.if          |   20 ++
 policy/modules/system/ipsec.te          |    3 
 policy/modules/system/iptables.te       |    5 
 policy/modules/system/libraries.fc      |    5 
 policy/modules/system/libraries.te      |    4 
 policy/modules/system/locallogin.te     |    7 
 policy/modules/system/logging.if        |   21 ++
 policy/modules/system/logging.te        |    2 
 policy/modules/system/lvm.fc            |    1 
 policy/modules/system/lvm.te            |    8 
 policy/modules/system/modutils.te       |    7 
 policy/modules/system/mount.fc          |    3 
 policy/modules/system/mount.if          |   37 ++++
 policy/modules/system/mount.te          |   70 +++++++-
 policy/modules/system/raid.te           |    1 
 policy/modules/system/selinuxutil.fc    |    1 
 policy/modules/system/selinuxutil.if    |    5 
 policy/modules/system/selinuxutil.te    |   68 ++++---
 policy/modules/system/sysnetwork.te     |    3 
 policy/modules/system/udev.te           |   12 +
 policy/modules/system/unconfined.fc     |    1 
 policy/modules/system/unconfined.if     |   10 -
 policy/modules/system/unconfined.te     |   24 ++
 policy/modules/system/userdomain.if     |  275 ++++++++++++++++++--------------
 policy/modules/system/userdomain.te     |   69 +++++---
 policy/modules/system/xen.te            |   35 +++-
 policy/support/obj_perm_sets.spt        |   12 +
 163 files changed, 3325 insertions(+), 456 deletions(-)

Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- policy-20070219.patch	23 Apr 2007 17:00:48 -0000	1.58
+++ policy-20070219.patch	23 Apr 2007 17:12:14 -0000	1.59
@@ -6245,15 +6245,6 @@
  ')
  
  #######################################
-@@ -631,7 +635,7 @@
- ##	</summary>
- ## </param>
- #
--template(`userdom_role_change_template',`
-+template(`userdom_rolechange_template',`
- 	gen_require(`
- 		role $1_r, $2_r;
- 		type $1_t, $2_t;
 @@ -764,6 +768,7 @@
  	auth_search_pam_console_data($1_t)
  	auth_run_pam($1_t,$1_r,{ $1_tty_device_t $1_devpts_t })



From fedora-cvs-commits at redhat.com  Mon Apr 23 17:24:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 13:24:18 -0400
Subject: rpms/pyparted/devel pyparted-1.8.6-Makefile.patch, NONE,
	1.1 pyparted.spec, 1.38, 1.39
Message-ID: <200704231724.l3NHOIQY017541@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/pyparted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17488

Modified Files:
	pyparted.spec 
Added Files:
	pyparted-1.8.6-Makefile.patch 
Log Message:
* Mon Apr 23 2007 David Cantrell <dcantrell at redhat.com> - 1.8.6-2
- Ensure build env CFLAGS are included (#226337)


pyparted-1.8.6-Makefile.patch:
 Makefile |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

--- NEW FILE pyparted-1.8.6-Makefile.patch ---
--- pyparted-1.8.6/Makefile.orig	2007-04-20 12:31:54.000000000 -0400
+++ pyparted-1.8.6/Makefile	2007-04-23 12:18:56.000000000 -0400
@@ -24,16 +24,14 @@
 OBJ = $(SRC:%.c=%.o)
 TXT = Makefile pyparted.spec AUTHORS COPYING ChangeLog INSTALL NEWS README
 
-PYVER    = $(shell python -c "import sys; print sys.version[:3]")
-VERSION  = $(shell awk '/Version:/ { print $$2 }' pyparted.spec)
-RELEASE  = $(shell awk '/Release:/ { print $$2 }' pyparted.spec | sed -e 's|%.*$$||g')
-
-CC      = gcc
-CFLAGS  += -O2 -Wall -g -I/usr/include/python$(PYVER) -I. -fPIC
-#LDFLAGS += 
+PYVER   = $(shell python -c "import sys; print sys.version[:3]")
+VERSION = $(shell awk '/Version:/ { print $$2 }' pyparted.spec)
+RELEASE = $(shell awk '/Release:/ { print $$2 }' pyparted.spec | sed -e 's|%.*$$||g')
+
+CC     ?= gcc
+CFLAGS += -I/usr/include/python$(PYVER) -I. -fPIC
 
 # Build with libparted (parted-1.8.3 and higher have a pkg-config file)
-#CFLAGS  += $(shell pkg-config --cflags libparted)   # no CFLAGS needed
 LDFLAGS += $(shell pkg-config --libs libparted)
 
 libdir ?= $(DESTDIR)$(shell rpm --eval "%{_libdir}")/python$(PYVER)/site-packages


Index: pyparted.spec
===================================================================
RCS file: /cvs/dist/rpms/pyparted/devel/pyparted.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- pyparted.spec	20 Apr 2007 15:40:18 -0000	1.38
+++ pyparted.spec	23 Apr 2007 17:24:16 -0000	1.39
@@ -3,12 +3,13 @@
 Summary: Python module for GNU parted
 Name:    pyparted
 Version: 1.8.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group:   System Environment/Libraries
 URL:     http://people.redhat.com/dcantrel/%{name}
 
 Source0: http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.bz2
+Patch0:  %{name}-1.8.6-Makefile.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python-devel, parted-devel >= 1.8.6
@@ -20,12 +21,12 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .Makefile
 
 %build
-%{__make} %{?_smp_mflags}
+CFLAGS="%{optflags}" CC="%{__cc}" %{__make} %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
 %clean
@@ -37,6 +38,9 @@
 %{python_sitearch}/partedmodule.so
 
 %changelog
+* Mon Apr 23 2007 David Cantrell <dcantrell at redhat.com> - 1.8.6-2
+- Ensure build env CFLAGS are included (#226337)
+
 * Fri Apr 19 2007 David Cantrell <dcantrell at redhat.com> - 1.8.6-1
 - Merge review (#226337)
 



From fedora-cvs-commits at redhat.com  Mon Apr 23 17:31:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 13:31:23 -0400
Subject: rpms/kernel-xen-2.6/devel kernel-xen.spec, 1.18.2.3,
	1.18.2.4 kernel-2.6.20-ppc64iseries-kdump.config, 1.1.2.1,
	NONE kernel-2.6.20-ppc64iseries.config, 1.1.2.1, NONE
Message-ID: <200704231731.l3NHVNR7022781@cvs.devel.redhat.com>

Author: ehabkost

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

Modified Files:
      Tag: private-ehabkost-2_6_21-branch
	kernel-xen.spec 
Removed Files:
      Tag: private-ehabkost-2_6_21-branch
	kernel-2.6.20-ppc64iseries-kdump.config 
	kernel-2.6.20-ppc64iseries.config 
Log Message:
Removing ppc64iseries bits

ppc64iseries is not on rawhide kernel anymore. Removing it here, also.



Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.18.2.3
retrieving revision 1.18.2.4
diff -u -r1.18.2.3 -r1.18.2.4
--- kernel-xen.spec	12 Apr 2007 17:40:02 -0000	1.18.2.3
+++ kernel-xen.spec	23 Apr 2007 17:31:21 -0000	1.18.2.4
@@ -172,7 +172,7 @@
 
 # We don't build a kernel on i386 or s390x -- we only do kernel-headers there.
 # We also don't support s390, iseries and ia64 on Fedora.
-%define nobuildarches noarch i386 s390 s390x ppc64iseries ia64 ppc
+%define nobuildarches noarch i386 s390 s390x ia64 ppc
 
 %ifarch %nobuildarches
 %define buildup 0
@@ -224,7 +224,7 @@
 %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
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390 s390x
 %endif
 ExclusiveOS: Linux
 Provides: kernel-drm = 4.3.0
@@ -278,8 +278,6 @@
 Source29: kernel-%{kversion}-ppc-smp.config
 Source30: kernel-%{kversion}-ppc64.config
 Source31: kernel-%{kversion}-ppc64-kdump.config
-Source32: kernel-%{kversion}-ppc64iseries.config
-Source33: kernel-%{kversion}-ppc64iseries-kdump.config
 
 Source34: kernel-%{kversion}-s390.config
 Source35: kernel-%{kversion}-s390x.config


--- kernel-2.6.20-ppc64iseries-kdump.config DELETED ---


--- kernel-2.6.20-ppc64iseries.config DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 23 19:04:03 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 15:04:03 -0400
Subject: rpms/evolution/devel evolution.spec,1.248,1.249
Message-ID: <200704231904.l3NJ43hR029605@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Log Message:

* Mon Apr 23 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-7.fc7
- Remove the welcome email from evolution at novell.com (bug #179427).



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- evolution.spec	23 Apr 2007 00:58:36 -0000	1.248
+++ evolution.spec	23 Apr 2007 19:04:01 -0000	1.249
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -331,6 +331,11 @@
 mkdir -p krb5-fakeprefix/lib
 mkdir -p krb5-fakeprefix/%{_lib}
 
+# Remove the welcome email from Novell
+for inbox in mail/default/*/Inbox; do
+  echo -n "" > $inbox
+done
+
 %build
 # define all of our flags, this is kind of ugly :(
 %if %{ldap_support}
@@ -742,6 +747,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Apr 23 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-7.fc7
+- Remove the welcome email from evolution at novell.com (bug #179427).
+
 * Sun Apr 22 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-6.fc7
 - Add patch for RH bug #236860 (launching from clock applet).
 



From fedora-cvs-commits at redhat.com  Mon Apr 23 19:04:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 15:04:32 -0400
Subject: rpms/system-config-kickstart/devel .cvsignore, 1.42, 1.43 sources,
	1.50, 1.51 system-config-kickstart.spec, 1.55, 1.56
Message-ID: <200704231904.l3NJ4WN8029984@cvs.devel.redhat.com>

Author: clumens

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

Modified Files:
	.cvsignore sources system-config-kickstart.spec 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	19 Mar 2007 21:16:58 -0000	1.42
+++ .cvsignore	23 Apr 2007 19:04:30 -0000	1.43
@@ -35,3 +35,4 @@
 system-config-kickstart-2.7.2.tar.gz
 system-config-kickstart-2.7.3.tar.gz
 system-config-kickstart-2.7.4.tar.gz
+system-config-kickstart-2.7.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	19 Mar 2007 21:16:58 -0000	1.50
+++ sources	23 Apr 2007 19:04:30 -0000	1.51
@@ -1 +1 @@
-7cfb8a5f5b605eef409ab51fb2729da8  system-config-kickstart-2.7.4.tar.gz
+3c31bec56f8ec7b61efb211e9b00ba4b  system-config-kickstart-2.7.5.tar.gz


Index: system-config-kickstart.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/system-config-kickstart.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- system-config-kickstart.spec	19 Mar 2007 21:16:58 -0000	1.55
+++ system-config-kickstart.spec	23 Apr 2007 19:04:30 -0000	1.56
@@ -1,6 +1,6 @@
 Summary: A graphical interface for making kickstart files.
 Name: system-config-kickstart
-Version: 2.7.4
+Version: 2.7.5
 Release: 1%{?dist}
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -28,7 +28,7 @@
 Requires(postun): gtk2 >= 2.6
 
 %description
-Kickstart Configurator is a graphical tool for creating kickstart files.  
+Kickstart Configurator is a graphical tool for creating kickstart files.
 
 %prep
 %setup -q
@@ -78,6 +78,12 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png
 
 %changelog
+* Mon Apr 23 2007 Chris Lumens <clumens at redhat.com> 2.7.5-1
+- Default to installing instead of upgrading.
+- Set a default SELinux setting when started up.
+- Don't write out remove lines for packages not available on the
+  installation architecture.
+
 * Mon Mar 19 2007 Chris Lumens <clumens at redhat.com> 2.7.4-1
 - Fix loading packages section (#232285).
 - Fix preview/save on upgrade (#232282).



From fedora-cvs-commits at redhat.com  Mon Apr 23 19:11:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 15:11:23 -0400
Subject: rpms/devhelp/devel devhelp-0.13-initialize-gthread.patch, NONE,
	1.1 devhelp.spec, 1.60, 1.61
Message-ID: <200704231911.l3NJBNjO002518@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/devhelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2396

Modified Files:
	devhelp.spec 
Added Files:
	devhelp-0.13-initialize-gthread.patch 
Log Message:

* Mon Apr 23 2007 Matthew Barnes <mbarnes at redhat.com> - 0.13-7.fc7
- Add patch for RH bug #230837 (initialize GThread).


devhelp-0.13-initialize-gthread.patch:
 dh-main.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE devhelp-0.13-initialize-gthread.patch ---
--- devhelp-0.13/src/dh-main.c.initialize-gthread	2007-04-23 15:05:15.000000000 -0400
+++ devhelp-0.13/src/dh-main.c	2007-04-23 15:05:31.000000000 -0400
@@ -112,6 +112,8 @@
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (PACKAGE);
 
+	g_thread_init (NULL);
+
 	if (!gtk_init_with_args (&argc, &argv, NULL, options, GETTEXT_PACKAGE, &error)) {
 		g_printerr ("%s\n", error->message);
 		return 1;


Index: devhelp.spec
===================================================================
RCS file: /cvs/dist/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- devhelp.spec	22 Apr 2007 00:43:45 -0000	1.60
+++ devhelp.spec	23 Apr 2007 19:11:21 -0000	1.61
@@ -4,7 +4,7 @@
 
 Name: devhelp
 Version: 0.13
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Development/Tools
 Summary: API document browser
@@ -12,6 +12,11 @@
 Source: http://ftp.gnome.org/pub/GNOME/sources/devhelp/%{version}/devhelp-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/devhelp-%{version}-%{release}-root
 
+### Patch ###
+
+# RH bug #230837 / GNOME bug #414221
+Patch1: devhelp-0.13-initialize-gthread.patch
+
 ### Dependencies ###
 
 Requires(pre): GConf2 >= 2.14
@@ -47,6 +52,7 @@
 
 %prep
 %setup -q -n devhelp-%{version}
+%patch1 -p1 -b .initialize-gthread
 
 %build
 %configure --disable-static
@@ -127,6 +133,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Apr 23 2007 Matthew Barnes <mbarnes at redhat.com> - 0.13-7.fc7
+- Add patch for RH bug #230837 (initialize GThread).
+
 * Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 0.13-6
 - Don't install INSTALL
 



From fedora-cvs-commits at redhat.com  Mon Apr 23 20:17:44 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 16:17:44 -0400
Subject: rpms/gnome-pilot/devel gnome-pilot-2.0.15-unresolved-symbols.patch,
	1.1, 1.2 gnome-pilot.spec, 1.57, 1.58
Message-ID: <200704232017.l3NKHiWS018170@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	gnome-pilot-2.0.15-unresolved-symbols.patch gnome-pilot.spec 
Log Message:

* Mon Apr 23 2007 Matthew Barnes <mbarnes at redhat.com> - 2.0.15-7.fc7
- Revise patch for RH bug #198211 to match upstream's solution.


gnome-pilot-2.0.15-unresolved-symbols.patch:
 capplet/pilot.c                             |    1 
 conduits/backup/Makefile.am                 |    3 -
 conduits/file/Makefile.am                   |    3 -
 conduits/test/Makefile.am                   |    3 -
 gpilotd/Makefile.am                         |    8 +++
 gpilotd/gnome-pilot-structures.c            |   37 +++++++++------
 gpilotd/gnome-pilot-structures.h            |   13 +++++
 libgpilotdCM/Makefile.am                    |    4 +
 libgpilotdCM/gnome-pilot-conduit-config.gob |   66 +++++++++++++++++++++++++---
 9 files changed, 113 insertions(+), 25 deletions(-)

Index: gnome-pilot-2.0.15-unresolved-symbols.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/devel/gnome-pilot-2.0.15-unresolved-symbols.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-pilot-2.0.15-unresolved-symbols.patch	18 Apr 2007 21:17:34 -0000	1.1
+++ gnome-pilot-2.0.15-unresolved-symbols.patch	23 Apr 2007 20:17:42 -0000	1.2
@@ -1,5 +1,140 @@
---- gnome-pilot-2.0.15/libgpilotdCM/Makefile.am.unresolved-symbols	2007-04-18 17:08:43.000000000 -0400
-+++ gnome-pilot-2.0.15/libgpilotdCM/Makefile.am	2007-04-18 17:12:57.000000000 -0400
+--- gnome-pilot-2.0.15/capplet/pilot.c.unresolved-symbols	2006-02-01 17:03:55.000000000 -0500
++++ gnome-pilot-2.0.15/capplet/pilot.c	2007-04-23 15:40:37.000000000 -0400
+@@ -29,6 +29,7 @@
+ #include <pi-util.h>
+ 
+ #include "pilot.h"
++#include "util.h"
+ 
+ /* create new pilotstate structure, initialize to sane state */
+ PilotState
+--- gnome-pilot-2.0.15/libgpilotdCM/gnome-pilot-conduit-config.gob.unresolved-symbols	2002-11-22 11:04:01.000000000 -0500
++++ gnome-pilot-2.0.15/libgpilotdCM/gnome-pilot-conduit-config.gob	2007-04-23 15:40:37.000000000 -0400
+@@ -42,6 +42,57 @@
+ 	private guint32 pilot_id;
+ 	private GnomePilotConduitManagement *gpcm;
+ 
++	/*****************************/
++	/* Private Utility Functions */
++	/*****************************/
++
++	public const gchar *
++	sync_type_int_to_str(GnomePilotConduitSyncType e)
++	{
++		switch(e) {
++		case GnomePilotConduitSyncTypeCustom:
++			return GnomePilotConduitSyncTypeCustomStr;
++		case GnomePilotConduitSyncTypeSynchronize:
++			return GnomePilotConduitSyncTypeSynchronizeStr;
++		case GnomePilotConduitSyncTypeCopyFromPilot:
++			return GnomePilotConduitSyncTypeCopyFromPilotStr;
++		case GnomePilotConduitSyncTypeCopyToPilot:
++			return GnomePilotConduitSyncTypeCopyToPilotStr;
++		case GnomePilotConduitSyncTypeMergeFromPilot:
++			return GnomePilotConduitSyncTypeMergeFromPilotStr;
++		case GnomePilotConduitSyncTypeMergeToPilot:
++			return GnomePilotConduitSyncTypeMergeToPilotStr;
++		case GnomePilotConduitSyncTypeNotSet:
++			return GnomePilotConduitSyncTypeNotSetStr;
++		default: 
++		  g_message ("sync_type_int_to_str: invalid sync_type %d",e);
++		  return GnomePilotConduitSyncTypeNotSetStr;
++		}
++	}
++
++	public gint
++	sync_type_str_to_int(gchar *s) 
++	{
++		g_return_val_if_fail(s!=NULL,GnomePilotConduitSyncTypeNotSet);
++
++		if (strcmp (s, GnomePilotConduitSyncTypeSynchronizeStr) == 0) {
++			return GnomePilotConduitSyncTypeSynchronize;
++		} else if (strcmp (s, GnomePilotConduitSyncTypeCopyToPilotStr) == 0) {
++			return GnomePilotConduitSyncTypeCopyToPilot;
++		} else if (strcmp (s, GnomePilotConduitSyncTypeCopyFromPilotStr) == 0) {
++			return GnomePilotConduitSyncTypeCopyFromPilot;
++		} else if (strcmp (s, GnomePilotConduitSyncTypeMergeToPilotStr) == 0) {
++			return GnomePilotConduitSyncTypeMergeToPilot;
++		} else if (strcmp (s, GnomePilotConduitSyncTypeMergeFromPilotStr) == 0) {
++			return GnomePilotConduitSyncTypeMergeFromPilot;
++		} else if (strcmp (s, GnomePilotConduitSyncTypeCustomStr) == 0) {
++			return GnomePilotConduitSyncTypeCustom;
++		} else if (strcmp (s, GnomePilotConduitSyncTypeNotSetStr) == 0) {
++			return GnomePilotConduitSyncTypeNotSet;
++		}
++		return GnomePilotConduitSyncTypeNotSet;
++	}
++
+ 	/***************************/
+ 	/* Initialization          */
+ 	/***************************/
+@@ -82,7 +133,7 @@
+ 			gnome_config_push_prefix(prefix);
+ 			tmp = gnome_config_get_string("sync_type");
+ 			if (tmp) {
+-				self->sync_type = gnome_pilot_conduit_sync_type_str_to_int(tmp);
++				self->sync_type = self_sync_type_str_to_int(tmp);
+ 			} else {
+ 				g_warning("conduit has no sync_type, synchronization will skip this conduit");
+ 				self->sync_type = GnomePilotConduitSyncTypeNotSet;
+@@ -90,7 +141,7 @@
+ 			g_free(tmp);
+ 			tmp = gnome_config_get_string("first_sync_type");
+ 			if (tmp) {
+-				self->first_sync_type = gnome_pilot_conduit_sync_type_str_to_int(tmp);
++				self->first_sync_type = self_sync_type_str_to_int(tmp);
+ 			} else {
+ 				self->first_sync_type = GnomePilotConduitSyncTypeNotSet;
+ 			}
+@@ -113,9 +164,9 @@
+ 				                 gnome_pilot_conduit_management_get_id(self->_priv->gpcm));
+ 			gnome_config_push_prefix(prefix);
+ 			gnome_config_set_string("sync_type",
+-						gnome_pilot_conduit_sync_type_int_to_str(self->sync_type));
++						self_sync_type_int_to_str(self->sync_type));
+ 			gnome_config_set_string("first_sync_type",
+-						gnome_pilot_conduit_sync_type_int_to_str(self->first_sync_type));
++						self_sync_type_int_to_str(self->first_sync_type));
+ 			if(self->first_sync_type==GnomePilotConduitSyncTypeSynchronize) 
+ 			        gnome_config_set_bool("slow_sync",self->first_slow);
+ 			else
+@@ -178,7 +229,7 @@
+ 						tmpstr = gnome_config_get_string(newpfx);
+ 					}
+ 					/* g_message("%s says %s",newpfx,tmpstr); */
+-					(*sync_type) = gnome_pilot_conduit_sync_type_str_to_int(tmpstr);
++					(*sync_type) = self_sync_type_str_to_int(tmpstr);
+ 					g_free(newpfx);
+ 					g_free(tmpstr);
+ 				}
+@@ -247,7 +298,7 @@
+ 		/* g_message("prefix = %s",tmp); */
+ 		gnome_config_push_prefix(tmp);
+ 		gnome_config_set_string("sync_type",
+-					gnome_pilot_conduit_sync_type_int_to_str(sync_type));
++					self_sync_type_int_to_str(sync_type));
+ 		gnome_config_pop_prefix();
+ 		gnome_config_sync();
+ 		g_free(tmp);
+@@ -270,7 +321,7 @@
+ 				      gnome_pilot_conduit_management_get_id(self->_priv->gpcm));
+ 		gnome_config_push_prefix(tmp);
+ 		gnome_config_set_string("first_sync_type",
+-					gnome_pilot_conduit_sync_type_int_to_str(first_sync_type));
++					self_sync_type_int_to_str(first_sync_type));
+ 		if(first_sync_type==GnomePilotConduitSyncTypeSynchronize) 
+ 			gnome_config_set_bool("slow_sync",slow);
+ 		else
+@@ -357,6 +408,7 @@
+ 		gnome_config_sync();
+ 		g_free(tmp);		
+ 	}
++
+ }
+ 
+ %{
+--- gnome-pilot-2.0.15/libgpilotdCM/Makefile.am.unresolved-symbols	2007-04-23 15:39:04.000000000 -0400
++++ gnome-pilot-2.0.15/libgpilotdCM/Makefile.am	2007-04-23 15:40:37.000000000 -0400
 @@ -40,6 +40,10 @@
  	gnome-pilot-conduit-management.h 	\
  	gnome-pilot-conduit-config.h
@@ -12,7 +147,7 @@
  	-version-info $(GPILOTD_CM_CURRENT):$(GPILOTD_CM_REVISION):$(GPILOTD_CM_AGE)
  
 --- gnome-pilot-2.0.15/gpilotd/Makefile.am.unresolved-symbols	2006-10-14 14:17:35.000000000 -0400
-+++ gnome-pilot-2.0.15/gpilotd/Makefile.am	2007-04-18 17:08:43.000000000 -0400
++++ gnome-pilot-2.0.15/gpilotd/Makefile.am	2007-04-23 15:40:37.000000000 -0400
 @@ -110,6 +110,10 @@
  
  libgpilotdinclude_HEADERS = gnome-pilot-client.h
@@ -35,3 +170,128 @@
  libgpilotdconduit_la_LDFLAGS = \
  	-version-info $(GPILOTD_CONDUIT_CURRENT):$(GPILOTD_CONDUIT_REVISION):$(GPILOTD_CONDUIT_AGE)
  
+--- gnome-pilot-2.0.15/gpilotd/gnome-pilot-structures.h.unresolved-symbols	2006-07-12 03:23:19.000000000 -0400
++++ gnome-pilot-2.0.15/gpilotd/gnome-pilot-structures.h	2007-04-23 15:41:16.000000000 -0400
+@@ -28,6 +28,10 @@
+ #include <glib.h>
+ 
+ typedef enum {
++/* WARNING: If adding to the SyncTypes, you will need
++ *          to update code in gnome-pilot-structures.c
++ *          and in gnome-pilot-conduit-config.gob.
++ */
+ 	GnomePilotConduitSyncTypeCustom,
+ 	GnomePilotConduitSyncTypeSynchronize,
+ 	GnomePilotConduitSyncTypeCopyFromPilot,
+@@ -37,6 +41,15 @@
+ 	GnomePilotConduitSyncTypeNotSet
+ } GnomePilotConduitSyncType;
+ 
++#define GnomePilotConduitSyncTypeCustomStr "custom"
++#define GnomePilotConduitSyncTypeSynchronizeStr "synchronize"
++#define GnomePilotConduitSyncTypeCopyFromPilotStr "copy_from_pilot"
++#define GnomePilotConduitSyncTypeCopyToPilotStr "copy_to_pilot"
++#define GnomePilotConduitSyncTypeMergeFromPilotStr "merge_from_pilot"
++#define GnomePilotConduitSyncTypeMergeToPilotStr "merge_to_pilot"
++#define GnomePilotConduitSyncTypeNotSetStr "not_set"
++
++
+ gint         gnome_pilot_conduit_sync_type_str_to_int(const gchar *s);
+ const gchar* gnome_pilot_conduit_sync_type_int_to_str(GnomePilotConduitSyncType e);
+ 
+--- gnome-pilot-2.0.15/gpilotd/gnome-pilot-structures.c.unresolved-symbols	2006-05-17 14:24:12.000000000 -0400
++++ gnome-pilot-2.0.15/gpilotd/gnome-pilot-structures.c	2007-04-23 15:40:37.000000000 -0400
+@@ -790,19 +790,19 @@
+ {
+ 	g_return_val_if_fail(s!=NULL,GnomePilotConduitSyncTypeNotSet);
+ 
+-	if (strcmp (s, "synchronize") == 0) {
++	if (strcmp (s, GnomePilotConduitSyncTypeSynchronizeStr) == 0) {
+ 		return GnomePilotConduitSyncTypeSynchronize;
+-	} else if (strcmp (s, "copy_to_pilot") == 0) {
++	} else if (strcmp (s, GnomePilotConduitSyncTypeCopyToPilotStr) == 0) {
+ 		return GnomePilotConduitSyncTypeCopyToPilot;
+-	} else if (strcmp (s, "copy_from_pilot") == 0) {
++	} else if (strcmp (s, GnomePilotConduitSyncTypeCopyFromPilotStr) == 0) {
+ 		return GnomePilotConduitSyncTypeCopyFromPilot;
+-	} else if (strcmp (s, "merge_to_pilot") == 0) {
++	} else if (strcmp (s, GnomePilotConduitSyncTypeMergeToPilotStr) == 0) {
+ 		return GnomePilotConduitSyncTypeMergeToPilot;
+-	} else if (strcmp (s, "merge_from_pilot") == 0) {
++	} else if (strcmp (s, GnomePilotConduitSyncTypeMergeFromPilotStr) == 0) {
+ 		return GnomePilotConduitSyncTypeMergeFromPilot;
+-	} else if (strcmp (s, "custom") == 0) {
++	} else if (strcmp (s, GnomePilotConduitSyncTypeCustomStr) == 0) {
+ 		return GnomePilotConduitSyncTypeCustom;
+-	} else if (strcmp (s, "not_set") == 0) {
++	} else if (strcmp (s, GnomePilotConduitSyncTypeNotSetStr) == 0) {
+ 		return GnomePilotConduitSyncTypeNotSet;
+ 	}
+ 	return GnomePilotConduitSyncTypeNotSet;
+@@ -812,15 +812,22 @@
+ gnome_pilot_conduit_sync_type_int_to_str(GnomePilotConduitSyncType e) 
+ {
+ 	switch(e) {
+-	case GnomePilotConduitSyncTypeCustom:         return "custom";
+-	case GnomePilotConduitSyncTypeSynchronize:    return "synchronize";
+-	case GnomePilotConduitSyncTypeCopyFromPilot:  return "copy_from_pilot";
+-	case GnomePilotConduitSyncTypeCopyToPilot:    return "copy_to_pilot";
+-	case GnomePilotConduitSyncTypeMergeFromPilot: return "merge_from_pilot";
+-	case GnomePilotConduitSyncTypeMergeToPilot:   return "merge_to_pilot";
+-	case GnomePilotConduitSyncTypeNotSet:         return "not_set";
++	case GnomePilotConduitSyncTypeCustom:
++		return GnomePilotConduitSyncTypeCustomStr;
++	case GnomePilotConduitSyncTypeSynchronize:
++		return GnomePilotConduitSyncTypeSynchronizeStr;
++	case GnomePilotConduitSyncTypeCopyFromPilot:
++		return GnomePilotConduitSyncTypeCopyFromPilotStr;
++	case GnomePilotConduitSyncTypeCopyToPilot:
++		return GnomePilotConduitSyncTypeCopyToPilotStr;
++	case GnomePilotConduitSyncTypeMergeFromPilot:
++		return GnomePilotConduitSyncTypeMergeFromPilotStr;
++	case GnomePilotConduitSyncTypeMergeToPilot:
++		return GnomePilotConduitSyncTypeMergeToPilotStr;
++	case GnomePilotConduitSyncTypeNotSet:
++		return GnomePilotConduitSyncTypeNotSetStr;
+ 	default: 
+ 	  g_message ("gnome_pilot_conduit_sync_type_int_to_str: invalid sync_type %d",e);
+-	  return "not_set";
++	  return GnomePilotConduitSyncTypeNotSetStr;
+ 	}
+ }
+--- gnome-pilot-2.0.15/conduits/backup/Makefile.am.unresolved-symbols	2005-08-10 09:12:22.000000000 -0400
++++ gnome-pilot-2.0.15/conduits/backup/Makefile.am	2007-04-23 15:40:37.000000000 -0400
+@@ -12,7 +12,8 @@
+ 
+ libbackup_conduit_la_LDFLAGS = -module -avoid-version
+ libbackup_conduit_la_LIBADD = 	\
+-	$(GNOME_PILOT_LIBS)
++	$(GNOME_PILOT_LIBS) \
++	-lgpilotdconduit
+ 
+ @GP_CONDUIT_RULE@
+ 
+--- gnome-pilot-2.0.15/conduits/test/Makefile.am.unresolved-symbols	2005-08-10 09:12:22.000000000 -0400
++++ gnome-pilot-2.0.15/conduits/test/Makefile.am	2007-04-23 15:40:37.000000000 -0400
+@@ -12,7 +12,8 @@
+ 
+ libtest_conduit_la_LDFLAGS = -module -avoid-version
+ libtest_conduit_la_LIBADD = 	\
+-	$(GNOME_PILOT_LIBS)
++	$(GNOME_PILOT_LIBS) \
++	-lgpilotdconduit
+ 
+ @GP_CONDUIT_RULE@
+ 
+--- gnome-pilot-2.0.15/conduits/file/Makefile.am.unresolved-symbols	2006-10-14 13:09:44.000000000 -0400
++++ gnome-pilot-2.0.15/conduits/file/Makefile.am	2007-04-23 15:40:37.000000000 -0400
+@@ -14,7 +14,8 @@
+ 
+ libfile_conduit_la_LDFLAGS = -module -avoid-version
+ libfile_conduit_la_LIBADD = 		\
+-	$(GNOME_PILOT_LIBS) 
++	$(GNOME_PILOT_LIBS)  \
++	-lgpilotdconduit
+ 
+ 
+ bin_PROGRAMS = gpilot-install-file


Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/devel/gnome-pilot.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- gnome-pilot.spec	22 Apr 2007 02:57:29 -0000	1.57
+++ gnome-pilot.spec	23 Apr 2007 20:17:42 -0000	1.58
@@ -4,7 +4,7 @@
 
 Name: gnome-pilot
 Version: 2.0.15
-Release: 5%{?dist}
+Release: 7%{?dist}
 License: LGPL
 Group: Applications/Communications
 Summary: GNOME pilot programs
@@ -155,6 +155,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Apr 23 2007 Matthew Barnes <mbarnes at redhat.com> - 2.0.15-7.fc7
+- Revise patch for RH bug #198211 to match upstream's solution.
+
 * Sat Apr 21 2007 Matthias Clasen <mclasen at redhat.com> - 2.0.15-6
 - Don't ship static libraries and .la files
 



From fedora-cvs-commits at redhat.com  Mon Apr 23 21:04:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 17:04:21 -0400
Subject: rpms/spamassassin/devel .cvsignore, 1.36, 1.37 sources, 1.35,
	1.36 spamassassin.spec, 1.93, 1.94
Message-ID: <200704232104.l3NL4L58023477@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/spamassassin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23407

Modified Files:
	.cvsignore sources spamassassin.spec 
Log Message:
3.2.0 rc3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	13 Apr 2007 14:57:04 -0000	1.36
+++ .cvsignore	23 Apr 2007 21:04:19 -0000	1.37
@@ -1 +1 @@
-Mail-SpamAssassin-3.2.0-rc2.tar.bz2
+Mail-SpamAssassin-3.2.0-rc3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	13 Apr 2007 14:57:04 -0000	1.35
+++ sources	23 Apr 2007 21:04:19 -0000	1.36
@@ -1 +1 @@
-fcc0242642826191a58d45bf5777e3b2  Mail-SpamAssassin-3.2.0-rc2.tar.bz2
+23299659a018a1e316ce450c28ac2e29  Mail-SpamAssassin-3.2.0-rc3.tar.bz2


Index: spamassassin.spec
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- spamassassin.spec	13 Apr 2007 14:57:04 -0000	1.93
+++ spamassassin.spec	23 Apr 2007 21:04:19 -0000	1.94
@@ -12,12 +12,12 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 # temporary pre-release number
-%define pre rc2
+%define pre rc3
 
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: spamassassin
 Version: 3.2.0
-Release: 0.4.%{pre}%{?dist}
+Release: 0.5.%{pre}%{?dist}
 License: Apache License
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -192,6 +192,9 @@
 exit 0
 
 %changelog
+* Mon Apr 13 2007 Warren Togami <wtogami at redhat.com> 3.2.0-0.5.rc3
+- 3.2.0 rc3
+
 * Mon Apr 13 2007 Warren Togami <wtogami at redhat.com> 3.2.0-0.4.rc2
 - 3.2.0 rc2
 



From fedora-cvs-commits at redhat.com  Mon Apr 23 21:11:04 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 17:11:04 -0400
Subject: rpms/gnome-pilot/devel gnome-pilot-2.0.15-unresolved-symbols.patch,
	1.2, 1.3
Message-ID: <200704232111.l3NLB4Va028496@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	gnome-pilot-2.0.15-unresolved-symbols.patch 
Log Message:
- Fix a build script problem.


gnome-pilot-2.0.15-unresolved-symbols.patch:
 capplet/pilot.c                             |    1 
 conduits/backup/Makefile.am                 |    3 -
 conduits/file/Makefile.am                   |    3 -
 conduits/test/Makefile.am                   |    3 -
 gpilotd/Makefile.am                         |    8 +++
 gpilotd/gnome-pilot-structures.c            |   37 +++++++++------
 gpilotd/gnome-pilot-structures.h            |   13 +++++
 libgpilotdCM/Makefile.am                    |    4 +
 libgpilotdCM/gnome-pilot-conduit-config.gob |   66 +++++++++++++++++++++++++---
 9 files changed, 113 insertions(+), 25 deletions(-)

Index: gnome-pilot-2.0.15-unresolved-symbols.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/devel/gnome-pilot-2.0.15-unresolved-symbols.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-pilot-2.0.15-unresolved-symbols.patch	23 Apr 2007 20:17:42 -0000	1.2
+++ gnome-pilot-2.0.15-unresolved-symbols.patch	23 Apr 2007 21:11:02 -0000	1.3
@@ -267,7 +267,7 @@
  libbackup_conduit_la_LIBADD = 	\
 -	$(GNOME_PILOT_LIBS)
 +	$(GNOME_PILOT_LIBS) \
-+	-lgpilotdconduit
++	$(top_builddir)/gpilotd/libgpilotdconduit.la
  
  @GP_CONDUIT_RULE@
  
@@ -279,7 +279,7 @@
  libtest_conduit_la_LIBADD = 	\
 -	$(GNOME_PILOT_LIBS)
 +	$(GNOME_PILOT_LIBS) \
-+	-lgpilotdconduit
++	$(top_builddir)/gpilotd/libgpilotdconduit.la
  
  @GP_CONDUIT_RULE@
  
@@ -291,7 +291,7 @@
  libfile_conduit_la_LIBADD = 		\
 -	$(GNOME_PILOT_LIBS) 
 +	$(GNOME_PILOT_LIBS)  \
-+	-lgpilotdconduit
++	$(top_builddir)/gpilotd/libgpilotdconduit.la
  
  
  bin_PROGRAMS = gpilot-install-file



From fedora-cvs-commits at redhat.com  Mon Apr 23 21:49:41 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 17:49:41 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.407, 1.408 anaconda.spec, 1.538,
	1.539 sources, 1.532, 1.533
Message-ID: <200704232149.l3NLnfmK010363@cvs.devel.redhat.com>

Author: katzj

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -r1.407 -r1.408
--- .cvsignore	20 Apr 2007 20:27:19 -0000	1.407
+++ .cvsignore	23 Apr 2007 21:49:39 -0000	1.408
@@ -1,2 +1 @@
-anaconda-11.2.0.53.tar.bz2
-anaconda-11.2.0.54.tar.bz2
+anaconda-11.2.0.55.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.538
retrieving revision 1.539
diff -u -r1.538 -r1.539
--- anaconda.spec	21 Apr 2007 19:26:32 -0000	1.538
+++ anaconda.spec	23 Apr 2007 21:49:39 -0000	1.539
@@ -1,8 +1,8 @@
 %define livearches %{ix86} x86_64
 
 Name: anaconda
-Version: 11.2.0.54
-Release: 2
+Version: 11.2.0.55
+Release: 1
 License: GPL
 Summary: Graphical system installer
 Group: Applications/System
@@ -51,7 +51,7 @@
 Requires(postun): desktop-file-utils >= 0.8
 %endif
 Obsoletes: anaconda-images <= 10
-Url: http://fedora.redhat.com/projects/anaconda-installer/
+Url: http://fedoraproject.org/wiki/Anaconda
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -142,8 +142,11 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
-* Sat Apr 21 2007 Jesse Keating <jkeating at redhat.com> - 11.2.0.54-2
-- s/genisoimage/mkisofs until the merge.
+* Mon Apr 23 2007 Jeremy Katz <katzj at redhat.com> - 11.2.0.55-1
+- Fix FTP/HTTP installs booted from disc1/rescueCD
+- Ensure kickstart scripts are executed with the right cwd (clumens, #237317)
+- Fix net device comparison (dcantrell, #237431)
+- Fix multiple repos some more (#231543)
 
 * Fri Apr 20 2007 Chris Lumens <clumens at redhat.com> - 11.2.0.54-1
 - Be smarter about detecting network link status (dcantrell, #236483).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.532
retrieving revision 1.533
diff -u -r1.532 -r1.533
--- sources	20 Apr 2007 20:27:19 -0000	1.532
+++ sources	23 Apr 2007 21:49:39 -0000	1.533
@@ -1 +1 @@
-7579717f78553935f5924731b4a37c84  anaconda-11.2.0.54.tar.bz2
+a75ad5317409417ebbca5205348d08ec  anaconda-11.2.0.55.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 23 22:29:00 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 18:29:00 -0400
Subject: rpms/postgresql-jdbc/devel .cvsignore, 1.4, 1.5 postgresql-jdbc.spec,
	1.10, 1.11 sources, 1.4, 1.5
Message-ID: <200704232229.l3NMT0UZ011766@cvs.devel.redhat.com>

Author: tgl

Update of /cvs/dist/rpms/postgresql-jdbc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11749

Modified Files:
	.cvsignore postgresql-jdbc.spec sources 
Log Message:
Update to build 8.2-505


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/postgresql-jdbc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Dec 2006 23:39:09 -0000	1.4
+++ .cvsignore	23 Apr 2007 22:28:57 -0000	1.5
@@ -1 +1 @@
-postgresql-jdbc-8.2-504.src.tar.gz
+postgresql-jdbc-8.2-505.src.tar.gz


Index: postgresql-jdbc.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql-jdbc/devel/postgresql-jdbc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- postgresql-jdbc.spec	15 Dec 2006 23:39:09 -0000	1.10
+++ postgresql-jdbc.spec	23 Apr 2007 22:28:57 -0000	1.11
@@ -33,11 +33,11 @@
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 %define section		devel
-%define upstreamver	8.2-504
+%define upstreamver	8.2-505
 
 Summary:	JDBC driver for PostgreSQL
 Name:		postgresql-jdbc
-Version:	8.2.504
+Version:	8.2.505
 Release:	1jpp%{?dist}
 Epoch:		0
 License:	BSD
@@ -128,6 +128,9 @@
 %endif
 
 %changelog
+* Mon Apr 23 2007 Tom Lane <tgl at redhat.com> 8.2.505-1jpp
+- Update to build 8.2-505
+
 * Fri Dec 15 2006 Tom Lane <tgl at redhat.com> 8.2.504-1jpp
 - Update to build 8.2-504
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/postgresql-jdbc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Dec 2006 23:39:09 -0000	1.4
+++ sources	23 Apr 2007 22:28:57 -0000	1.5
@@ -1 +1 @@
-90e20213973a528d22c47a298e48ba58  postgresql-jdbc-8.2-504.src.tar.gz
+2dc5f3b2204f1b47372f21da9f81920a  postgresql-jdbc-8.2-505.src.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr 23 23:02:48 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 19:02:48 -0400
Subject: rpms/kernel/devel patch-2.6.21-rc7-git6.bz2.sign, NONE,
	1.1 .cvsignore, 1.611, 1.612 kernel-2.6.spec, 1.3104,
	1.3105 sources, 1.574, 1.575 upstream, 1.502,
	1.503 patch-2.6.21-rc7-git5.bz2.sign, 1.1, NONE
Message-ID: <200704232302.l3NN2mFB015200@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.21-rc7-git6.bz2.sign 
Removed Files:
	patch-2.6.21-rc7-git5.bz2.sign 
Log Message:
* Mon Apr 23 2007 Dave Jones <davej at redhat.com>
- 2.6.21-rc7-git6



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

iD8DBQBGLQPZyGugalF9Dw4RAuZCAJ9yTOVg1tk/X/xf/7ZIZbg2t759WQCeISu5
WRYEvDucLC7yNxHkGV4expI=
=C6bt
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.611
retrieving revision 1.612
diff -u -r1.611 -r1.612
--- .cvsignore	22 Apr 2007 01:55:37 -0000	1.611
+++ .cvsignore	23 Apr 2007 23:02:46 -0000	1.612
@@ -5,5 +5,4 @@
 kernel-2.6.20
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc7.bz2
-patch-2.6.21-rc7-git4.bz2
-patch-2.6.21-rc7-git5.bz2
+patch-2.6.21-rc7-git6.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3104
retrieving revision 1.3105
diff -u -r1.3104 -r1.3105
--- kernel-2.6.spec	22 Apr 2007 01:55:37 -0000	1.3104
+++ kernel-2.6.spec	23 Apr 2007 23:02:46 -0000	1.3105
@@ -371,7 +371,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.21-rc7.bz2
-Patch2: patch-2.6.21-rc7-git5.bz2
+Patch2: patch-2.6.21-rc7-git6.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -2330,6 +2330,9 @@
 #  - tux.
 
 %changelog
+* Mon Apr 23 2007 Dave Jones <davej at redhat.com>
+- 2.6.21-rc7-git6
+
 * Sat Apr 21 2007 Dave Jones <davej at redhat.com>
 - 2.6.21-rc7-git5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.574
retrieving revision 1.575
diff -u -r1.574 -r1.575
--- sources	22 Apr 2007 01:55:37 -0000	1.574
+++ sources	23 Apr 2007 23:02:46 -0000	1.575
@@ -1,5 +1,4 @@
 2618cbcc9c9ac1c3c04be903fe3338a7  sparse-0.2.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 3a54bf5a7cf6b124e680e1d08fe1b20b  patch-2.6.21-rc7.bz2
-8a967ac2d7c74ddbbd24c106d9d2518b  patch-2.6.21-rc7-git4.bz2
-b62d3d52565d2b2b64a1246f11e3f40f  patch-2.6.21-rc7-git5.bz2
+9e18261cb76baa932814df0790313c6e  patch-2.6.21-rc7-git6.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.502
retrieving revision 1.503
diff -u -r1.502 -r1.503
--- upstream	22 Apr 2007 01:55:37 -0000	1.502
+++ upstream	23 Apr 2007 23:02:46 -0000	1.503
@@ -1,3 +1,3 @@
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc7.bz2
-patch-2.6.21-rc7-git5.bz2
+patch-2.6.21-rc7-git6.bz2


--- patch-2.6.21-rc7-git5.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 24 00:50:02 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 20:50:02 -0400
Subject: rpms/fedora-release-notes/devel fedora-release-notes.spec, 1.18,
	1.19 sources, 1.18, 1.19
Message-ID: <200704240050.l3O0o2QQ030691@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fedora-release-notes/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30624/devel

Modified Files:
	fedora-release-notes.spec sources 
Log Message:
auto-import fedora-release-notes-6.93-2 on branch devel from fedora-release-notes-6.93-2.src.rpm


Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-release-notes/devel/fedora-release-notes.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- fedora-release-notes.spec	21 Apr 2007 02:05:16 -0000	1.18
+++ fedora-release-notes.spec	24 Apr 2007 00:50:00 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		fedora-release-notes
 Version:	6.93
-Release:	1
+Release:	2
 Summary:	Release Notes for Fedora %{version}
 URL:		http://fedoraproject.org/wiki/Docs/Beats
 
@@ -93,6 +93,9 @@
 
 
 %changelog
+* Mon Apr 23 2007 Jesse Keating <jkeating at redhat.com> - 6.93-2
+- Updated translations and bits from wiki
+
 * Sun Apr 15 2007 Paul W. Frields <stickster at gmail.com> - 6.93-1
 - Update for Fedora 7 test4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fedora-release-notes/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	21 Apr 2007 02:05:16 -0000	1.18
+++ sources	24 Apr 2007 00:50:00 -0000	1.19
@@ -1,5 +1,5 @@
-56997a282f51ae259993ffc16d16391b  README-6.93.tar.gz
-3e553d04d7f3e8836a60af6e13458ce2  README-BURNING-ISOS-6.93.tar.gz
-0af86c72e93a52f9c5c5efd48d09faaf  about-fedora-6.93.tar.gz
-6d0563c7d6613b54d9b4d0d6a3ca7cbe  fedora-release-notes-6.93.tar.gz
-64ee3e0960c1ccc6b2d9a10f2b2bc579  homepage-6.93.tar.gz
+9c05429b1c4a9b339882cceef79cd44a  README-6.93.tar.gz
+701daf646d52f106c27679df6b86442d  README-BURNING-ISOS-6.93.tar.gz
+e371adf0f9874080135709d1559712d0  about-fedora-6.93.tar.gz
+88676b6f67e9bd208d04499b2bf2f81f  fedora-release-notes-6.93.tar.gz
+7931717c29560d9fea6425369dfcf8fd  homepage-6.93.tar.gz



From fedora-cvs-commits at redhat.com  Tue Apr 24 02:18:08 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 22:18:08 -0400
Subject: rpms/gnome-user-share/devel gnome-user-share.spec,1.20,1.21
Message-ID: <200704240218.l3O2I89W027921@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-user-share/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27907

Modified Files:
	gnome-user-share.spec 
Log Message:
Improve %description



Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnome-user-share.spec	23 Mar 2007 21:51:43 -0000	1.20
+++ gnome-user-share.spec	24 Apr 2007 02:18:06 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 0.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org
@@ -24,7 +24,16 @@
 Requires(preun): GConf2
 
 %description
-GNOME user file sharing.
+
+gnome-user-share is a small package that binds together various free
+software projects to bring easy to use user-level file sharing to the
+masses.
+
+The program is meant to run in the background when the user is logged
+in, and when file sharing is enabled a webdav server is started that
+shares the $HOME/Public folder. The share is then published to all
+computers on the local network using mDNS/rendezvous, so that it shows
+up in the Network location in GNOME.
 
 %prep
 %setup -q
@@ -78,6 +87,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Mon Apr 23 2007 Matthias Clasen  <mclasen at redhat.com> - 0.11-3
+- Improve %%description (#235677)
+
 * Fri Mar 23 2007 Matthias Clasen  <mclasen at redhat.com> - 0.11-2
 - Don't hardwire invisible char (#233676)
 



From fedora-cvs-commits at redhat.com  Tue Apr 24 02:48:12 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 22:48:12 -0400
Subject: rpms/xorg-x11-drv-i810/devel .cvsignore, 1.21, 1.22 sources, 1.21,
	1.22 xorg-x11-drv-i810.spec, 1.54, 1.55
Message-ID: <200704240248.l3O2mCEl020779@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	4 Apr 2007 16:54:24 -0000	1.21
+++ .cvsignore	24 Apr 2007 02:48:10 -0000	1.22
@@ -1,2 +1,2 @@
 xf86-video-i810-1.6.5.tar.bz2
-xf86-video-intel-1.9.94.tar.bz2
+xf86-video-intel-2.0.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	4 Apr 2007 16:54:24 -0000	1.21
+++ sources	24 Apr 2007 02:48:10 -0000	1.22
@@ -1,2 +1,2 @@
 fc1e0da3430551bf25a7babf7ccfd3bf  xf86-video-i810-1.6.5.tar.bz2
-d6c2e9700c74ae01b124183582827cf5  xf86-video-intel-1.9.94.tar.bz2
+269dd43f0a414d032fea1599a73b5b77  xf86-video-intel-2.0.0.tar.bz2


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- xorg-x11-drv-i810.spec	10 Apr 2007 17:27:28 -0000	1.54
+++ xorg-x11-drv-i810.spec	24 Apr 2007 02:48:10 -0000	1.55
@@ -2,27 +2,26 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define preview_version 1.9.94
+%define legacy_version 1.6.5
 
 Summary:   Xorg X11 i810 video driver(s)
 Name:      xorg-x11-drv-i810
-Version:   1.6.5
-Release:   19%{?dist}
+Version:   2.0.0
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   xf86-video-intel-%{preview_version}.tar.bz2
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{legacy_version}.tar.bz2
+Source1:   xf86-video-intel-%{version}.tar.bz2
 Source2:   i810.xinf
 
-# modesetting driver patches
+# new school intel driver patches
 
-# stock driver patches
+# legacy i810 driver patches
 Patch100: i810-1.6.5-to-git-20060911.patch
 Patch101: i810-match-server-sync-ranges.patch
-
 Patch1000: i965-xv-hang-fix.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
@@ -45,30 +44,31 @@
 Summary:   Xorg X11 i810 video driver XvMC development package
 Group:     Development/System
 Requires:  %{name} = %{version}-%{release}
+Provides:  xorg-x11-drv-intel = %{version}-%{release}
 
 %description devel
 X.Org X11 i810 video driver XvMC development package.
 
 %prep
-%setup -q -n %{tarball}-%{version}
+%setup -q -n %{tarball}-%{legacy_version}
 
 %patch100 -p2 -b .i810-git-20060911
 %patch101 -p2 -b .server-ranges
 %patch1000 -p2 -b .965-xv
 
 cd ..
-rm -rf xf86-video-intel-%{preview_version}
+rm -rf xf86-video-intel-%{version}
 tar jxf %{SOURCE1}
 
 %build
 OPTS="--disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri"
 ./configure ${OPTS} && make || exit 1
-cd ../xf86-video-intel-%{preview_version} && ./configure ${OPTS} && make && cd - || exit 1
+cd ../xf86-video-intel-%{version} && ./configure ${OPTS} && make && cd - || exit 1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-cd ../xf86-video-intel-%{preview_version} && make install DESTDIR=$RPM_BUILD_ROOT && cd - || exit 1
+cd ../xf86-video-intel-%{version} && make install DESTDIR=$RPM_BUILD_ROOT && cd - || exit 1
 make install DESTDIR=$RPM_BUILD_ROOT || exit 1
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
@@ -100,6 +100,11 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Mon Apr 23 2007 Adam Jackson <ajax at redhat.com> 2.0.0-1
+- xf86-video-intel 2.0.0.  Change the version number to match, why not.
+- Add a Virtual provides for xorg-x11-drv-intel, since we should probably
+  rename this at some point.
+
 * Tue Apr 10 2007 Adam Jackson <ajax at redhat.com> 1.6.5-19
 - i810.xinf: Move all 965 and 945 chips onto the new driver, as well as
   915GM.



From fedora-cvs-commits at redhat.com  Tue Apr 24 03:00:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 23 Apr 2007 23:00:01 -0400
Subject: rpms/xorg-x11-server/devel .cvsignore, 1.24, 1.25 sources, 1.19,
	1.20 xorg-x11-server.spec, 1.223, 1.224 int10-debug.patch, 1.1,
	NONE xserver-rc5-to-now.patch, 1.1, NONE
Message-ID: <200704240300.l3O3016H029379@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	.cvsignore sources xorg-x11-server.spec 
Removed Files:
	int10-debug.patch xserver-rc5-to-now.patch 
Log Message:
auto-import xorg-x11-server-1.3.0.0-1.fc7 on branch devel from xorg-x11-server-1.3.0.0-1.fc7.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	6 Apr 2007 18:07:34 -0000	1.24
+++ .cvsignore	24 Apr 2007 02:59:59 -0000	1.25
@@ -1 +1 @@
-xorg-server-1.2.99.905.tar.bz2
+xorg-server-1.3.0.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	6 Apr 2007 18:07:34 -0000	1.19
+++ sources	24 Apr 2007 02:59:59 -0000	1.20
@@ -1 +1 @@
-0c755fb74191ba1bca47657be8791bd2  xorg-server-1.2.99.905.tar.bz2
+a51a7d482e3c689394755bb17bda8526  xorg-server-1.3.0.0.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- xorg-x11-server.spec	13 Apr 2007 14:22:56 -0000	1.223
+++ xorg-x11-server.spec	24 Apr 2007 02:59:59 -0000	1.224
@@ -8,8 +8,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.2.99.905
-Release:   5%{?dist}
+Version:   1.3.0.0
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -66,9 +66,6 @@
 Patch2504:  xserver-1.3.0-domain-obiwan.patch
 Patch2505:  xserver-1.3.0-pci-device-enable.patch
 
-# XXX should be dropped when 1.3 releases
-Patch99999: xserver-rc5-to-now.patch
-
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -301,8 +298,6 @@
 %patch2504 -p1 -b .domain-obiwan
 %patch2505 -p1 -b .device-enable
 
-%patch99999 -p1 -b .git
-
 %build
 
 # --with-rgb-path should be superfluous now ?
@@ -560,6 +555,9 @@
 
 
 %changelog
+* Mon Apr 23 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-1
+- xserver 1.3.0.
+
 * Fri Apr 13 2007 Adam Jackson <ajax at redhat.com> 1.2.99.905-5
 - xserver-rc5-to-now.patch: Updates from git.
 


--- int10-debug.patch DELETED ---


--- xserver-rc5-to-now.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Apr 24 07:14:55 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 03:14:55 -0400
Subject: rpms/sane-backends/devel
	sane-backends-1.0.18-logical_vs_binary.patch, NONE,
	1.1 sane-backends.spec, 1.78, 1.79
Message-ID: <200704240714.l3O7EsBG020991@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	sane-backends.spec 
Added Files:
	sane-backends-1.0.18-logical_vs_binary.patch 
Log Message:
don't erroneously use logical "&&" instead of binary "&" at some places in the canon driver


sane-backends-1.0.18-logical_vs_binary.patch:
 canon.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE sane-backends-1.0.18-logical_vs_binary.patch ---
--- sane-backends-1.0.18/backend/canon.c.logical_vs_binary	2006-06-19 23:07:52.000000000 +0200
+++ sane-backends-1.0.18/backend/canon.c	2007-04-24 09:08:56.000000000 +0200
@@ -246,12 +246,12 @@
     TPU_STAT_INACTIVE : TPU_STAT_NONE;
   if (dev->tpu.Status == SANE_TRUE)	/* TPU available */
     {
-      dev->tpu.Status = (tbuf[2 + 4 + 5] && 0x04) ?
+      dev->tpu.Status = (tbuf[2 + 4 + 5] & 0x04) ?
 	TPU_STAT_INACTIVE : TPU_STAT_ACTIVE;
     }
-  dev->tpu.ControlMode = tbuf[3 + 4 + 5] && 0x03;
+  dev->tpu.ControlMode = tbuf[3 + 4 + 5] & 0x03;
   dev->tpu.Transparency = tbuf[4 + 4 + 5] * 256 + tbuf[5 + 4 + 5];
-  dev->tpu.PosNeg = tbuf[6 + 4 + 5] && 0x01;
+  dev->tpu.PosNeg = tbuf[6 + 4 + 5] & 0x01;
   dev->tpu.FilmType = tbuf[7 + 4 + 5];
 
   DBG (11, "TPU Status: %d\n", dev->tpu.Status);


Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- sane-backends.spec	13 Oct 2006 11:59:45 -0000	1.78
+++ sane-backends.spec	24 Apr 2007 07:14:48 -0000	1.79
@@ -18,7 +18,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.18
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL (programs), relaxed LGPL (libraries), and public domain (docs)
 Group: System Environment/Libraries
 Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
@@ -26,7 +26,8 @@
 Patch1: sane-backends-1.0.18-rpath.patch
 Patch2: sane-backends-1.0.12-badcode.patch
 Patch3: sane-backends-multilib.patch
-Patch5: sane-backends-1.0.17-pkgconfig.patch
+Patch4: sane-backends-1.0.17-pkgconfig.patch
+Patch5: sane-backends-1.0.18-logical_vs_binary.patch
 URL: http://www.sane-project.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
 BuildRequires: tetex-latex libusb-devel libieee1284-devel libjpeg-devel
@@ -105,7 +106,8 @@
 %patch1 -p1 -b .rpath
 %patch2 -p1 -b .badcode
 %patch3 -p1 -b .multilib
-%patch5 -p1 -b .pkgconfig
+%patch4 -p1 -b .pkgconfig
+%patch5 -p1 -b .logical_vs_binary
 
 # Fix bug #62847.
 perl -pi -e 's,/dev/usbscanner0?,/dev/usb/scanner0,' backend/*.conf
@@ -228,6 +230,10 @@
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* Tue Apr 24 2007 Nils Philippsen <nphilipp at redhat.com> - 1.0.18-6
+- don't erroneously use logical "&&" instead of binary "&" at some places in
+  the canon driver
+
 * Fri Oct 13 2006 Nils Philippsen <nphilipp at redhat.com> - 1.0.18-5
 - use %%rhel, not %%redhat
 



From fedora-cvs-commits at redhat.com  Tue Apr 24 09:12:37 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 05:12:37 -0400
Subject: rpms/openldap/devel openldap-2.3.34-pthread.patch, NONE,
	1.1 ldap.init, 1.19, 1.20 openldap.spec, 1.65, 1.66
Message-ID: <200704240912.l3O9CaDs015512@cvs.devel.redhat.com>

Author: jsafrane

Update of /cvs/dist/rpms/openldap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15453

Modified Files:
	ldap.init openldap.spec 
Added Files:
	openldap-2.3.34-pthread.patch 
Log Message:
-changelog update
link libldap_r with pthread (bz#198226)

openldap-2.3.34-pthread.patch:
 Makefile.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openldap-2.3.34-pthread.patch ---
Make libldap_r.so link with pthread.

--- openldap-2.3.34/libraries/libldap_r/Makefile.in.orig	2007-01-02 22:43:50.000000000 +0100
+++ openldap-2.3.34/libraries/libldap_r/Makefile.in	2007-04-24 10:27:53.000000000 +0200
@@ -56,7 +56,7 @@
 XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
 XXXLIBS = $(LTHREAD_LIBS)
 NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
-UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
+UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS)
 
 .links : Makefile
 	@for i in $(XXSRCS); do \


Index: ldap.init
===================================================================
RCS file: /cvs/dist/rpms/openldap/devel/ldap.init,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ldap.init	22 Sep 2006 18:32:00 -0000	1.19
+++ ldap.init	24 Apr 2007 09:12:34 -0000	1.20
@@ -121,7 +121,17 @@
 		fi
 	done
 	# Check the configuration file.
-	if ! action $"Checking configuration files for $prog: " /sbin/runuser -m -s "$slaptest" -- "$user" $slaptestflags; then
+	slaptestout=`/sbin/runuser -m -s "$slaptest" -- "$user" $slaptestflags 2>&1`
+	slaptestexit=$?
+	# print warning if slaptest passed but reports some problems
+	if test $slaptestexit == 0  -a  -n "$slaptestout" ; then
+		echo -n $"Checking configuration files for $prog: " ; warning ; echo
+		echo "$slaptestout"
+	fi
+	# report error if configuration file is wrong
+	if test $slaptestexit != 0 ; then
+		echo -n $"Checking configuration files for $prog: " ; failure ; echo
+		echo "$slaptestout"
 		if /sbin/runuser -m -s "$slaptest" -- "$user" "-u" > /dev/null 2> /dev/null ; then
 			dirs=`LANG=C egrep '^directory[[:space:]]+[[:print:]]+$' /etc/openldap/slapd.conf | awk '{print $2}'`
 			for directory in $dirs ; do


Index: openldap.spec
===================================================================
RCS file: /cvs/dist/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- openldap.spec	23 Apr 2007 07:45:55 -0000	1.65
+++ openldap.spec	24 Apr 2007 09:12:34 -0000	1.66
@@ -13,7 +13,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP
 Name: openldap
 Version: %{version_23}
-Release: 0%{?dist}.1
+Release: 1%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
@@ -41,6 +41,7 @@
 #Patch7: openldap-2.3.19-nostrip.patch
 Patch8: openldap-2.3.19-gethostbyXXXX_r.patch
 Patch9: openldap-2.3.34-quiet-slaptest.patch
+Patch10: openldap-2.3.34-pthread.patch
 
 # Patches for 2.2.29 for the compat-openldap package.
 Patch100: openldap-2.2.13-tls-fix-connection-test.patch
@@ -176,6 +177,7 @@
 #%patch7 -p1 -b .nostrip
 %patch8 -p1 -b .gethostbyname_r
 %patch9 -p1 -b .quiet-slaptest
+%patch10 -p1 -b .pthread
 cp %{_datadir}/libtool/config.{sub,guess} build/
 popd
 
@@ -714,6 +716,14 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Mon Apr 23 2007 Jan Safranek <jsafranek at redhat.com> 2.3.34-1%{?dist}
+- slapadd during package update is now quiet (bz#224581)
+- use _localstatedir instead of var/ during build (bz#220970)
+- bind-libbind-devel removed from BuildRequires (bz#216851)
+- slaptest is now quiet during service ldap start, if
+  there is no error/warning (bz#143697)
+- libldap_r.so now links with pthread (bz#198226)
+
 * Mon Feb 19 2007 Jay Fenlason <fenlason<redhat.com> 2.3.34-1%{?dist}
 - New upstream release
 - Upgrade the scripts for migrating the database so that they might



From fedora-cvs-commits at redhat.com  Tue Apr 24 09:22:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 05:22:42 -0400
Subject: rpms/gimp/devel .cvsignore, 1.28, 1.29 gimp.spec, 1.118,
	1.119 sources, 1.28, 1.29
Message-ID: <200704240922.l3O9Mg3Z022654@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore gimp.spec sources 
Log Message:
version 2.2.14 with many bugfixes



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	25 Aug 2006 16:19:30 -0000	1.28
+++ .cvsignore	24 Apr 2007 09:22:40 -0000	1.29
@@ -1 +1 @@
-gimp-2.2.13.tar.bz2
+gimp-2.2.14.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- gimp.spec	12 Apr 2007 12:13:09 -0000	1.118
+++ gimp.spec	24 Apr 2007 09:22:40 -0000	1.119
@@ -36,14 +36,14 @@
 
 Summary:	GNU Image Manipulation Program
 Name: 		gimp
-Version: 	2.2.13
+Version: 	2.2.14
 %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
@@ -418,6 +418,39 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr 24 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.14-1
+- version 2.2.14
+  
+  Bugs fixed in GIMP 2.2.14
+  =========================
+  
+  - avoid crashing on newer versions of the winicon format (bug #352899)
+  - fixed crash in Postscript plug-in (bug #353381)
+  - fixed handling of TABs in the text tool (bug #353132)
+  - fixed bug in Depth Merge plug-in (bug #355219)
+  - fixed bug in GimpDrawablePreview widget (bug #353639)
+  - fixed bug in Line Nove script (bug #357433)
+  - fixed bug in Ripple plug-in (bug #357431)
+  - save locale independent files from Fractal Explorer plug-in (bug #360095)
+  - fixed bug in Super Nova plug-in (bug #340073)
+  - be more robust against broken XCF files (bug #357809)
+  - fixed drawing issues in Image Map plug-in (bug #311621)
+  - fixed smoothing option in Fractal Explorer plug-in (bug #372671)
+  - load channels in the proper order when opening an XCF file (bug #378003)
+  - deal with floating selections in the Burn-In Animation script (bug #384096)
+  - fixed clipping in the GimpPreviewArea widget (bug #392692)
+  - fixed a potential crash in gimp-remote (bug #392111)
+  - work around a file-chooser problem on Windows (bug #398726)
+  - fixed markup of the gimp(1) manual page (bug #401145)
+  - fixed the fix for the right-to-left layout in layers dialog (bug #348347)
+  - fixed PSD save plug-in on 64bit architectures (bug #335130)
+  - added missing dependency in gimpui-2.0.pc file (bug #356394)
+  - fixed a crash in the PSD save plug-in (bug #395385)
+  - improved robustness of transform tool preview code (bug #420595)
+  - improved forward compatibility of XCF loader (bug #316207)
+  - don't crash in the Compressor plug-in if files can't be opened (bug #422444)
+  - fixed sensitivity of input fields in the Lighting plug-in (bug #359833)
+
 * Mon Mar 26 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.13-3
 - use gutenprint per default for current development/future distribution
   versions (Fedora >= 7, RHEL >= 6)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	25 Aug 2006 16:19:30 -0000	1.28
+++ sources	24 Apr 2007 09:22:40 -0000	1.29
@@ -1 +1 @@
-d84a4a476a0c4fae24602db67f6fe49a  gimp-2.2.13.tar.bz2
+2f47dd66d714a970356e275dd1d3caac  gimp-2.2.14.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Apr 24 09:53:06 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 05:53:06 -0400
Subject: rpms/system-config-date/devel .cvsignore, 1.57, 1.58 sources, 1.61,
	1.62 system-config-date.spec, 1.66, 1.67
Message-ID: <200704240953.l3O9r6pY028005@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
move zoom scale to the left of the canvas



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	5 Apr 2007 15:09:59 -0000	1.57
+++ .cvsignore	24 Apr 2007 09:53:04 -0000	1.58
@@ -1 +1 @@
-system-config-date-1.8.94.tar.bz2
+system-config-date-1.8.95.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	5 Apr 2007 15:09:59 -0000	1.61
+++ sources	24 Apr 2007 09:53:04 -0000	1.62
@@ -1 +1 @@
-86a8b2edecdd08e045960fe995e59b68  system-config-date-1.8.94.tar.bz2
+c19817e07fb16197237efa022365254e  system-config-date-1.8.95.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- system-config-date.spec	5 Apr 2007 15:09:59 -0000	1.66
+++ system-config-date.spec	24 Apr 2007 09:53:04 -0000	1.67
@@ -1,6 +1,6 @@
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.8.94
+Version: 1.8.95
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/date
 License: GPL
@@ -96,6 +96,9 @@
 %config(noreplace) %{_sysconfdir}/ntp/ntpservers
 
 %changelog
+* Tue Apr 24 2007 Nils Philippsen <nphilipp at redhat.com> 1.8.95
+- move zoom scale to the left of the canvas
+
 * Thu Apr 05 2007 Nils Philippsen <nphilipp at redhat.com> 1.8.94
 - use underscores instead of spaces in timezone filenames (#235064)
 



From fedora-cvs-commits at redhat.com  Tue Apr 24 10:06:24 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 06:06:24 -0400
Subject: rpms/gimp/devel gimp.spec,1.119,1.120
Message-ID: <200704241006.l3OA6Ono028309@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	gimp.spec 
Log Message:
don't BuildRequire gimp-print/gutenprint anymore



Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- gimp.spec	24 Apr 2007 09:22:40 -0000	1.119
+++ gimp.spec	24 Apr 2007 10:06:22 -0000	1.120
@@ -74,11 +74,6 @@
 %else
 BuildRequires:	xorg-x11-devel
 %endif
-%if %_enable_gutenprint
-BuildRequires:  gutenprint-devel >= 5.0.0
-%else
-BuildRequires:	gimp-print-devel >= 4.2.0
-%endif
 BuildRequires:	automake >= 1.7
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	libtool >= 1.5
@@ -95,11 +90,6 @@
 Requires: 	gtk2 >= 2.4.14
 Requires:	pango >= 1.6.0
 Requires:	fontconfig >= 2.2.0
-%if %_enable_gutenprint
-Requires:   gutenprint >= 5.0.0
-%else
-Requires:	gimp-print >= 4.2.0
-%endif
 Requires(post): /usr/bin/update-desktop-database
 Requires(post): hicolor-icon-theme
 Requires(postun): /usr/bin/update-desktop-database
@@ -153,7 +143,7 @@
 Python support:               %_enable_python
 MP support:                   %_enable_mp
 build static libs:            %_enable_static
-build print plugin:           %_enable_print
+build internal print plugin:  %_enable_print
 include convenience symlinks: %_enable_convenience
 
 
@@ -451,6 +441,8 @@
   - don't crash in the Compressor plug-in if files can't be opened (bug #422444)
   - fixed sensitivity of input fields in the Lighting plug-in (bug #359833)
 
+- don't BuildRequire gimp-print/gutenprint anymore
+
 * Mon Mar 26 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.13-3
 - use gutenprint per default for current development/future distribution
   versions (Fedora >= 7, RHEL >= 6)



From fedora-cvs-commits at redhat.com  Tue Apr 24 10:57:35 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 06:57:35 -0400
Subject: rpms/kernel/devel linux-2.6-cell-spu-device-tree.patch, NONE,
	1.1 kernel-2.6.spec, 1.3105, 1.3106
Message-ID: <200704241057.l3OAvZGT027992@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-cell-spu-device-tree.patch 
Log Message:
Support proper SPU device-tree nodes on Cell


linux-2.6-cell-spu-device-tree.patch:
 cbe_regs.c |  118 +++++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 88 insertions(+), 30 deletions(-)

--- NEW FILE linux-2.6-cell-spu-device-tree.patch ---
From: Christian Krafft <krafft at de.ibm.com>

This patch adds support for a proper device-tree.
A porper device-tree on cell contains be nodes
for each CBE containg nodes for SPEs and all the
other special devices on it.
Ofcourse oldschool devicetree is still supported.

Signed-off-by: Christian Krafft <krafft at de.ibm.com>
Signed-off-by: Arnd Bergmann <arnd.bergmann at de.ibm.com>

Index: linux-2.6/arch/powerpc/platforms/cell/cbe_regs.c
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/cell/cbe_regs.c
+++ linux-2.6/arch/powerpc/platforms/cell/cbe_regs.c
@@ -14,6 +14,8 @@
 #include <asm/pgtable.h>
 #include <asm/prom.h>
 #include <asm/ptrace.h>
+#include <asm/of_device.h>
+#include <asm/of_platform.h>
 
 #include "cbe_regs.h"
 
@@ -27,6 +29,7 @@
 static struct cbe_regs_map
 {
 	struct device_node *cpu_node;
+	struct device_node *be_node;
 	struct cbe_pmd_regs __iomem *pmd_regs;
 	struct cbe_iic_regs __iomem *iic_regs;
 	struct cbe_mic_tm_regs __iomem *mic_tm_regs;
@@ -37,6 +40,7 @@ static int cbe_regs_map_count;
 static struct cbe_thread_map
 {
 	struct device_node *cpu_node;
+	struct device_node *be_node;
 	struct cbe_regs_map *regs;
 	unsigned int thread_id;
 	unsigned int cbe_id;
@@ -50,22 +54,29 @@ static struct cbe_regs_map *cbe_find_map
 	int i;
 	struct device_node *tmp_np;
 
-	if (strcasecmp(np->type, "spe") == 0) {
-		if (np->data == NULL) {
-			/* walk up path until cpu node was found */
-			tmp_np = np->parent;
-			while (tmp_np != NULL && strcasecmp(tmp_np->type, "cpu") != 0)
-				tmp_np = tmp_np->parent;
+	if (strcasecmp(np->type, "spe")) {
+		for (i = 0; i < cbe_regs_map_count; i++)
+			if (cbe_regs_maps[i].cpu_node == np ||
+			    cbe_regs_maps[i].be_node == np)
+				return &cbe_regs_maps[i];
+		return NULL;
+	}
 
-			np->data = cbe_find_map(tmp_np);
-		}
+	if (np->data)
 		return np->data;
-	}
 
-	for (i = 0; i < cbe_regs_map_count; i++)
-		if (cbe_regs_maps[i].cpu_node == np)
-			return &cbe_regs_maps[i];
-	return NULL;
+	/* walk up path until cpu or be node was found */
+	tmp_np = np;
+	do {
+		tmp_np = tmp_np->parent;
+		/* on a correct devicetree we wont get up to root */
+		BUG_ON(!tmp_np);
+	} while (strcasecmp(tmp_np->type, "cpu") &&
+		 strcasecmp(tmp_np->type, "be"));
+
+	np->data = cbe_find_map(tmp_np);
+
+	return np->data;
 }
 
 struct cbe_pmd_regs __iomem *cbe_get_pmd_regs(struct device_node *np)
@@ -153,6 +164,67 @@ u32 cbe_node_to_cpu(int node)
 }
 EXPORT_SYMBOL_GPL(cbe_node_to_cpu);
 
+static struct device_node *cbe_get_be_node(int cpu_id)
+{
+	struct device_node *np;
+
+	for_each_node_by_type (np, "be") {
+		int len,i;
+		const phandle *cpu_handle;
+
+		cpu_handle = of_get_property(np, "cpus", &len);
+
+		for (i=0; i<len; i++)
+			if (of_find_node_by_phandle(cpu_handle[i]) == of_get_cpu_node(cpu_id, NULL))
+				return np;
+	}
+
+	return NULL;
+}
+
+void __init cbe_fill_regs_map(struct cbe_regs_map *map)
+{
+	if(map->be_node) {
+		struct device_node *be, *np;
+
+		be = map->be_node;
+
+		for_each_node_by_type(np, "pervasive")
+			if (of_get_parent(np) == be)
+				map->pmd_regs = of_iomap(np, 0);
+
+		for_each_node_by_type(np, "CBEA-Internal-Interrupt-Controller")
+			if (of_get_parent(np) == be)
+				map->iic_regs = of_iomap(np, 2);
+
+		for_each_node_by_type(np, "mic-tm")
+			if (of_get_parent(np) == be)
+				map->mic_tm_regs = of_iomap(np, 0);
+	} else {
+		struct device_node *cpu;
+		/* That hack must die die die ! */
+		const struct address_prop {
+			unsigned long address;
+			unsigned int len;
+		} __attribute__((packed)) *prop;
+
+		cpu = map->cpu_node;
+
+		prop = of_get_property(cpu, "pervasive", NULL);
+		if (prop != NULL)
+			map->pmd_regs = ioremap(prop->address, prop->len);
+
+		prop = of_get_property(cpu, "iic", NULL);
+		if (prop != NULL)
+			map->iic_regs = ioremap(prop->address, prop->len);
+
+		prop = of_get_property(cpu, "mic-tm", NULL);
+		if (prop != NULL)
+			map->mic_tm_regs = ioremap(prop->address, prop->len);
+	}
+}
+
+
 void __init cbe_regs_init(void)
 {
 	int i;
@@ -162,6 +234,7 @@ void __init cbe_regs_init(void)
 	/* Build local fast map of CPUs */
 	for_each_possible_cpu(i) {
 		cbe_thread_map[i].cpu_node = of_get_cpu_node(i, &thread_id);
+		cbe_thread_map[i].be_node = cbe_get_be_node(i);
 		cbe_thread_map[i].thread_id = thread_id;
 	}
 
@@ -170,12 +243,6 @@ void __init cbe_regs_init(void)
 		struct cbe_regs_map *map;
 		unsigned int cbe_id;
 
-		/* That hack must die die die ! */
-		const struct address_prop {
-			unsigned long address;
-			unsigned int len;
-		} __attribute__((packed)) *prop;
-
 		cbe_id = cbe_regs_map_count++;
 		map = &cbe_regs_maps[cbe_id];
 
@@ -193,23 +260,14 @@ void __init cbe_regs_init(void)
 			if (thread->cpu_node == cpu) {
 				thread->regs = map;
 				thread->cbe_id = cbe_id;
+				map->be_node = thread->be_node;
 				cpu_set(i, cbe_local_mask[cbe_id]);
 				if(thread->thread_id == 0)
 					cpu_set(i, cbe_first_online_cpu);
 			}
 		}
 
-		prop = of_get_property(cpu, "pervasive", NULL);
-		if (prop != NULL)
-			map->pmd_regs = ioremap(prop->address, prop->len);
-
-		prop = of_get_property(cpu, "iic", NULL);
-		if (prop != NULL)
-			map->iic_regs = ioremap(prop->address, prop->len);
-
-		prop = of_get_property(cpu, "mic-tm", NULL);
-		if (prop != NULL)
-			map->mic_tm_regs = ioremap(prop->address, prop->len);
+		cbe_fill_regs_map(map);
 	}
 }
 

--

_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev at ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3105
retrieving revision 1.3106
diff -u -r1.3105 -r1.3106
--- kernel-2.6.spec	23 Apr 2007 23:02:46 -0000	1.3105
+++ kernel-2.6.spec	24 Apr 2007 10:57:32 -0000	1.3106
@@ -408,6 +408,7 @@
 Patch305: linux-2.6-pmac-zilog.patch
 Patch306: linux-2.6-powerpc-reserve-initrd-1.patch
 Patch307: linux-2.6-powerpc-reserve-initrd-2.patch
+Patch308: linux-2.6-cell-new-device-tree.patch
 
 Patch310: linux-2.6-common-uevent.patch
 Patch311: linux-2.6-uevent-macio.patch
@@ -1056,6 +1057,7 @@
 # Ensure initrd memory is reserved at boot
 %patch306 -p1
 %patch307 -p1
+%patch308 -p1
 
 # uevent support for of_platform device
 %patch310 -p1
@@ -2330,6 +2332,9 @@
 #  - tux.
 
 %changelog
+* Tue Apr 24 2007 David Woodhouse <dwmw2 at redhat.com>
+- Support proper device-tree layout for Cell SPUs
+
 * Mon Apr 23 2007 Dave Jones <davej at redhat.com>
 - 2.6.21-rc7-git6
 



From fedora-cvs-commits at redhat.com  Tue Apr 24 11:00:19 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 07:00:19 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.3106,1.3107
Message-ID: <200704241100.l3OB0J4t030042@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Log Message:
helps if patch has same name in filesystem and specfile. You'd think I'd know that by now


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3106
retrieving revision 1.3107
diff -u -r1.3106 -r1.3107
--- kernel-2.6.spec	24 Apr 2007 10:57:32 -0000	1.3106
+++ kernel-2.6.spec	24 Apr 2007 11:00:17 -0000	1.3107
@@ -408,7 +408,7 @@
 Patch305: linux-2.6-pmac-zilog.patch
 Patch306: linux-2.6-powerpc-reserve-initrd-1.patch
 Patch307: linux-2.6-powerpc-reserve-initrd-2.patch
-Patch308: linux-2.6-cell-new-device-tree.patch
+Patch308: linux-2.6-cell-spu-device-tree.patch
 
 Patch310: linux-2.6-common-uevent.patch
 Patch311: linux-2.6-uevent-macio.patch



From fedora-cvs-commits at redhat.com  Tue Apr 24 11:12:40 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 07:12:40 -0400
Subject: rpms/bind/devel bind-9.4.0-zone-freeze.patch, 1.1, 1.2 bind.spec,
	1.173, 1.174 named.caching-nameserver.conf, 1.5, 1.6
Message-ID: <200704241112.l3OBCePe006557@cvs.devel.redhat.com>

Author: atkac

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

Modified Files:
	bind-9.4.0-zone-freeze.patch bind.spec 
	named.caching-nameserver.conf 
Log Message:
- cleanup in caching-nameserver config file
- zone-freeze patch has been improved


bind-9.4.0-zone-freeze.patch:
 bin/named/server.c         |   23 ++++++++++++++---------
 bin/named_sdb/server.c     |   25 +++++++++++++++----------
 lib/dns/include/dns/view.h |   13 +++++++++++++
 lib/dns/view.c             |   26 ++++++++++++++++++++++++++
 4 files changed, 68 insertions(+), 19 deletions(-)

Index: bind-9.4.0-zone-freeze.patch
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind-9.4.0-zone-freeze.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bind-9.4.0-zone-freeze.patch	18 Apr 2007 11:25:21 -0000	1.1
+++ bind-9.4.0-zone-freeze.patch	24 Apr 2007 11:12:38 -0000	1.2
@@ -1,46 +1,50 @@
---- bind-9.4.0/lib/dns/view.c.freeze	2007-04-18 11:51:02.000000000 +0200
-+++ bind-9.4.0/lib/dns/view.c	2007-04-18 12:50:30.000000000 +0200
-@@ -1140,6 +1140,28 @@
+--- bind-9.4.0/lib/dns/view.c.freeze	2007-04-24 12:35:03.000000000 +0200
++++ bind-9.4.0/lib/dns/view.c	2007-04-24 12:52:02.000000000 +0200
+@@ -1140,6 +1140,32 @@
  }
  
  isc_result_t
-+dns_viewlist_findzone(dns_viewlist_t *list, const char* name,
++dns_viewlist_findzone(dns_viewlist_t *list, dns_name_t *name, isc_boolean_t allclasses,
 +                      dns_rdataclass_t rdclass, dns_zone_t **zonep)
 +{
 +	dns_view_t *view;
 +	isc_result_t result;
++	isc_boolean_t match = isc_boolean_false;
 +
 +	REQUIRE(list != NULL);
 +
 +	for (view = ISC_LIST_HEAD(*list);
 +             view != NULL;
 +             view = ISC_LIST_NEXT(view, link)) {
-+		if (view->rdclass != rdclass)
++		if (allclasses == isc_boolean_false && view->rdclass != rdclass )
 +			continue;
 +		result = dns_zt_find(view->zonetable, name,
 +                                     0, NULL, zonep);
-+		if (result == ISC_R_SUCCESS)
-+			return ISC_R_SUCCESS;
++		if(result == ISC_R_SUCCESS) {
++			if (match != isc_boolean_false)
++				return ISC_R_NOTFOUND;
++			match = isc_boolean_true;
++		}
 +	}
-+	return ISC_R_NOTFOUND;
++	return (match == isc_boolean_false) ? ISC_R_NOTFOUND : ISC_R_SUCCESS;
 +}
 +
 +isc_result_t
  dns_view_load(dns_view_t *view, isc_boolean_t stop) {
  
  	REQUIRE(DNS_VIEW_VALID(view));
---- bind-9.4.0/lib/dns/include/dns/view.h.freeze	2007-04-18 12:03:13.000000000 +0200
-+++ bind-9.4.0/lib/dns/include/dns/view.h	2007-04-18 12:49:47.000000000 +0200
+--- bind-9.4.0/lib/dns/include/dns/view.h.freeze	2007-04-24 12:35:03.000000000 +0200
++++ bind-9.4.0/lib/dns/include/dns/view.h	2007-04-24 12:35:03.000000000 +0200
 @@ -592,6 +592,19 @@
   */
  
  isc_result_t
-+dns_viewlist_findzone(dns_viewlist_t *list, const char* name,
++dns_viewlist_findzone(dns_viewlist_t *list, dns_name_t *name, isc_boolean_t allclasses,
 +                      dns_rdataclass_t rdclass, dns_zone_t **zonep);
 +
 +/*%<
 + * Search zone with 'name' in view with 'rdclass' in viewlist 'list'
-+ * If found, zone is returned in *zonep
++ * If found, zone is returned in *zonep. If allclasses is set rdclass is ignored
 + *
 + * Returns:
 + *\li	#ISC_R_SUCCESS          A matching zone was found.
@@ -51,9 +55,9 @@
  dns_view_findzone(dns_view_t *view, dns_name_t *name, dns_zone_t **zonep);
  /*%<
   * Search for the zone 'name' in the zone table of 'view'.
---- bind-9.4.0/bin/named/server.c.freeze	2007-04-18 12:44:26.000000000 +0200
-+++ bind-9.4.0/bin/named/server.c	2007-04-18 12:48:02.000000000 +0200
-@@ -3922,19 +3922,23 @@
+--- bind-9.4.0/bin/named/server.c.freeze	2007-04-24 12:35:03.000000000 +0200
++++ bind-9.4.0/bin/named/server.c	2007-04-24 12:35:03.000000000 +0200
+@@ -3922,19 +3922,24 @@
  		rdclass = dns_rdataclass_in;
  	}
  	
@@ -65,6 +69,7 @@
 -		goto fail1;
 +	if (viewtxt == NULL) {
 +		result = dns_viewlist_findzone(&server->viewlist, dns_fixedname_name(&name),
++					       (classtxt == NULL) ? isc_boolean_true : isc_boolean_false,
 +					       rdclass, zonep);
 +	}
 +	else {
@@ -86,9 +91,9 @@
   fail1:
  	return (result);
  }
---- bind-9.4.0/bin/named_sdb/server.c.freeze	2007-04-18 12:52:58.000000000 +0200
-+++ bind-9.4.0/bin/named_sdb/server.c	2007-04-18 12:54:29.000000000 +0200
-@@ -3917,15 +3917,20 @@
+--- bind-9.4.0/bin/named_sdb/server.c.freeze	2007-04-24 12:35:03.000000000 +0200
++++ bind-9.4.0/bin/named_sdb/server.c	2007-04-24 12:35:03.000000000 +0200
+@@ -3917,19 +3917,24 @@
  		rdclass = dns_rdataclass_in;
  	}
  	
@@ -103,6 +108,7 @@
 -			     0, NULL, zonep);
 +	if (viewtxt == NULL) {
 +                result = dns_viewlist_findzone(&server->viewlist, dns_fixedname_name(&name),
++					       (classtxt == NULL) ? isc_boolean_true : isc_boolean_false,
 +                                               rdclass, zonep);
 +        }
 +        else {
@@ -118,3 +124,7 @@
  	/* Partial match? */
  	if (result != ISC_R_SUCCESS && *zonep != NULL)
  		dns_zone_detach(zonep);
+-	dns_view_detach(&view);
+  fail1:
+ 	return (result);
+ }


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- bind.spec	18 Apr 2007 11:25:21 -0000	1.173
+++ bind.spec	24 Apr 2007 11:12:38 -0000	1.174
@@ -17,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.4.0
-Release: 	7%{?dist}
+Release: 	8%{?dist}
 Epoch:   	31
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,6 +82,7 @@
 Patch65:	bind-9.4.0-dig-idn.patch
 %endif
 Patch66:	bind-9.4.0-zone-freeze.patch
+#Patch67:	bind-9.4.0-dbus-race-condition.patch
 #
 Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2, mktemp
 Requires(post): grep, chkconfig >= 1.3.26
@@ -287,6 +288,7 @@
 #
 # this must follow all dbus patches:
 #
+#%patch67 -p1 -b .race-condition
 cp -fp contrib/dbus/{dbus_mgr.c,dbus_service.c} bin/named
 cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named
 %if %{SDB}
@@ -806,6 +808,11 @@
 
 
 %changelog
+* Tue Apr 24 2007 Adam Tkac <atkac redhat com> 31:9.4.0-8.fc7
+- improved "zone freeze patch" - if multiple zone with same name exists
+  no zone is freezed
+- minor cleanup in caching-nameserver's config file
+
 * Tue Apr 17 2007 Adam Tkac <atkac redhat com> 31:9.4.0-7.fc7
 - removed DEBUGINFO option because with this option (default) was bind
   builded with -O0 and without this flag no debuginfo package was produced.


Index: named.caching-nameserver.conf
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/named.caching-nameserver.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- named.caching-nameserver.conf	10 Apr 2007 17:25:42 -0000	1.5
+++ named.caching-nameserver.conf	24 Apr 2007 11:12:38 -0000	1.6
@@ -19,6 +19,7 @@
         statistics-file "/var/named/data/named_stats.txt";
         memstatistics-file "/var/named/data/named_mem_stats.txt";
 	allow-query     { localhost; };
+	recursion yes;
 };
 logging {
         channel default_debug {
@@ -26,9 +27,4 @@
                 severity dynamic;
         };
 };
-view localhost_resolver {
-	match-clients 	   { localhost; };
-	match-destinations { localhost; };
-	recursion yes;
-	include "/etc/named.rfc1912.zones";
-};
+include "/etc/named.rfc1912.zones";



From fedora-cvs-commits at redhat.com  Tue Apr 24 11:24:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 07:24:30 -0400
Subject: rpms/openldap/devel openldap.spec,1.66,1.67
Message-ID: <200704241124.l3OBOUi6015028@cvs.devel.redhat.com>

Author: jsafrane

Update of /cvs/dist/rpms/openldap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14969

Modified Files:
	openldap.spec 
Log Message:
do not strip binaries to produce correct .debuginfo packages (bz#152516)


Index: openldap.spec
===================================================================
RCS file: /cvs/dist/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- openldap.spec	24 Apr 2007 09:12:34 -0000	1.66
+++ openldap.spec	24 Apr 2007 11:24:28 -0000	1.67
@@ -13,7 +13,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP
 Name: openldap
 Version: %{version_23}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
@@ -274,7 +274,7 @@
 		./libtool --mode=compile %{__cc} -o $nptl_lo -c $nptl_s
 	fi
 	make %{_smp_mflags} libdb_base=libslapd_db libso_base=libslapd_db LIBSO_LIBS="$nptl_lo"
-	make install libdb_base=libslapd_db libso_base=libslapd_db LIBSO_LIBS="$nptl_lo"
+	make install libdb_base=libslapd_db libso_base=libslapd_db LIBSO_LIBS="$nptl_lo" strip="false"
 	ln -sf libslapd_db.so ${dbdir}/%{_lib}/${subdir}/libdb.so
 	popd
 }
@@ -413,7 +413,7 @@
 # libraries share sonames, so we have to choose one or the other.
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/
 pushd openldap-%{compat_version}/build-compat/libraries
-	make install DESTDIR=$RPM_BUILD_ROOT
+	make install DESTDIR=$RPM_BUILD_ROOT STRIP=""
 	rm $RPM_BUILD_ROOT/%{_libdir}/*.a
 	rm $RPM_BUILD_ROOT/%{_libdir}/*.la
 	rm $RPM_BUILD_ROOT/%{_libdir}/*.so
@@ -444,7 +444,7 @@
 popd
 
 pushd openldap-%{version_23}/build-servers
-make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} LIBTOOL="$libtool"
+make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} LIBTOOL="$libtool" STRIP=""
 popd
 
 # Install the bdb maintenance tools.
@@ -460,13 +460,15 @@
 make install DESTDIR=$RPM_BUILD_ROOT \
 	includedir=%{evolution_connector_includedir} \
 	libdir=%{evolution_connector_libdir} \
-	LIBTOOL="$libtool"
+	LIBTOOL="$libtool" \
+	STRIP=""
+
 install -m644 \
 	$RPM_SOURCE_DIR/README.evolution \
 	$RPM_BUILD_ROOT/%{evolution_connector_prefix}/
 popd
 pushd openldap-%{version_23}/build-clients
-make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} LIBTOOL="$libtool"
+make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} LIBTOOL="$libtool" STRIP=""
 popd
 
 # Create this directory so that authconfig setting TLS_CACERT to
@@ -716,13 +718,15 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
-* Mon Apr 23 2007 Jan Safranek <jsafranek at redhat.com> 2.3.34-1%{?dist}
+* Mon Apr 23 2007 Jan Safranek <jsafranek at redhat.com> 2.3.34-2%{?dist}
 - slapadd during package update is now quiet (bz#224581)
 - use _localstatedir instead of var/ during build (bz#220970)
 - bind-libbind-devel removed from BuildRequires (bz#216851)
 - slaptest is now quiet during service ldap start, if
   there is no error/warning (bz#143697)
 - libldap_r.so now links with pthread (bz#198226)
+- do not strip binaries to produce correct .debuginfo packages
+  (bz#152516)
 
 * Mon Feb 19 2007 Jay Fenlason <fenlason<redhat.com> 2.3.34-1%{?dist}
 - New upstream release



From fedora-cvs-commits at redhat.com  Tue Apr 24 11:26:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 07:26:30 -0400
Subject: rpms/kernel/devel linux-2.6-cell-spu-device-tree.patch,1.1,1.2
Message-ID: <200704241126.l3OBQUtM016512@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	linux-2.6-cell-spu-device-tree.patch 
Log Message:
fix patch to apply to current kernel

linux-2.6-cell-spu-device-tree.patch:
 cbe_regs.c |  126 ++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 92 insertions(+), 34 deletions(-)

Index: linux-2.6-cell-spu-device-tree.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-cell-spu-device-tree.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-cell-spu-device-tree.patch	24 Apr 2007 10:57:33 -0000	1.1
+++ linux-2.6-cell-spu-device-tree.patch	24 Apr 2007 11:26:28 -0000	1.2
@@ -1,18 +1,5 @@
-From: Christian Krafft <krafft at de.ibm.com>
-
-This patch adds support for a proper device-tree.
-A porper device-tree on cell contains be nodes
-for each CBE containg nodes for SPEs and all the
-other special devices on it.
-Ofcourse oldschool devicetree is still supported.
-
-Signed-off-by: Christian Krafft <krafft at de.ibm.com>
-Signed-off-by: Arnd Bergmann <arnd.bergmann at de.ibm.com>
-
-Index: linux-2.6/arch/powerpc/platforms/cell/cbe_regs.c
-===================================================================
---- linux-2.6.orig/arch/powerpc/platforms/cell/cbe_regs.c
-+++ linux-2.6/arch/powerpc/platforms/cell/cbe_regs.c
+--- arch/powerpc/platforms/cell/cbe_regs.c.spu	2007-02-04 18:44:54.000000000 +0000
++++ arch/powerpc/platforms/cell/cbe_regs.c	2007-04-24 12:24:20.000000000 +0100
 @@ -14,6 +14,8 @@
  #include <asm/pgtable.h>
  #include <asm/prom.h>
@@ -36,9 +23,9 @@
  	struct device_node *cpu_node;
 +	struct device_node *be_node;
  	struct cbe_regs_map *regs;
- 	unsigned int thread_id;
- 	unsigned int cbe_id;
-@@ -50,22 +54,29 @@ static struct cbe_regs_map *cbe_find_map
+ } cbe_thread_map[NR_CPUS];
+ 
+@@ -45,22 +49,29 @@ static struct cbe_regs_map *cbe_find_map
  	int i;
  	struct device_node *tmp_np;
  
@@ -81,9 +68,9 @@
  }
  
  struct cbe_pmd_regs __iomem *cbe_get_pmd_regs(struct device_node *np)
-@@ -153,6 +164,67 @@ u32 cbe_node_to_cpu(int node)
+@@ -143,26 +154,82 @@ u32 cbe_get_hw_thread_id(int cpu)
  }
- EXPORT_SYMBOL_GPL(cbe_node_to_cpu);
+ EXPORT_SYMBOL_GPL(cbe_get_hw_thread_id);
  
 +static struct device_node *cbe_get_be_node(int cpu_id)
 +{
@@ -149,17 +136,18 @@
  void __init cbe_regs_init(void)
  {
  	int i;
-@@ -162,6 +234,7 @@ void __init cbe_regs_init(void)
+ 	struct device_node *cpu;
+ 
  	/* Build local fast map of CPUs */
- 	for_each_possible_cpu(i) {
- 		cbe_thread_map[i].cpu_node = of_get_cpu_node(i, &thread_id);
-+		cbe_thread_map[i].be_node = cbe_get_be_node(i);
- 		cbe_thread_map[i].thread_id = thread_id;
- 	}
+-	for_each_possible_cpu(i)
++	for_each_possible_cpu(i) {
+ 		cbe_thread_map[i].cpu_node = of_get_cpu_node(i, NULL);
++ 		cbe_thread_map[i].be_node = cbe_get_be_node(i);
++	}
  
-@@ -170,12 +243,6 @@ void __init cbe_regs_init(void)
- 		struct cbe_regs_map *map;
- 		unsigned int cbe_id;
+ 	/* Find maps for each device tree CPU */
+ 	for_each_node_by_type(cpu, "cpu") {
+ 		struct cbe_regs_map *map = &cbe_regs_maps[cbe_regs_map_count++];
  
 -		/* That hack must die die die ! */
 -		const struct address_prop {
@@ -167,39 +155,33 @@
 -			unsigned int len;
 -		} __attribute__((packed)) *prop;
 -
- 		cbe_id = cbe_regs_map_count++;
- 		map = &cbe_regs_maps[cbe_id];
- 
-@@ -193,23 +260,14 @@ void __init cbe_regs_init(void)
- 			if (thread->cpu_node == cpu) {
- 				thread->regs = map;
- 				thread->cbe_id = cbe_id;
-+				map->be_node = thread->be_node;
- 				cpu_set(i, cbe_local_mask[cbe_id]);
- 				if(thread->thread_id == 0)
- 					cpu_set(i, cbe_first_online_cpu);
- 			}
+-
+ 		if (cbe_regs_map_count > MAX_CBE) {
+ 			printk(KERN_ERR "cbe_regs: More BE chips than supported"
+ 			       "!\n");
+@@ -171,21 +238,12 @@ void __init cbe_regs_init(void)
  		}
+ 		map->cpu_node = cpu;
+ 		for_each_possible_cpu(i)
+-			if (cbe_thread_map[i].cpu_node == cpu)
++			if (cbe_thread_map[i].cpu_node == cpu) {
+ 				cbe_thread_map[i].regs = map;
++				map->be_node = thread->be_node;
++			}
  
--		prop = of_get_property(cpu, "pervasive", NULL);
+-		prop = get_property(cpu, "pervasive", NULL);
 -		if (prop != NULL)
 -			map->pmd_regs = ioremap(prop->address, prop->len);
 -
--		prop = of_get_property(cpu, "iic", NULL);
+-		prop = get_property(cpu, "iic", NULL);
 -		if (prop != NULL)
 -			map->iic_regs = ioremap(prop->address, prop->len);
 -
--		prop = of_get_property(cpu, "mic-tm", NULL);
+-		prop = (struct address_prop *)get_property(cpu, "mic-tm",
+-							   NULL);
 -		if (prop != NULL)
 -			map->mic_tm_regs = ioremap(prop->address, prop->len);
 +		cbe_fill_regs_map(map);
  	}
  }
  
-
---
-
-_______________________________________________
-Linuxppc-dev mailing list
-Linuxppc-dev at ozlabs.org
-https://ozlabs.org/mailman/listinfo/linuxppc-dev



From fedora-cvs-commits at redhat.com  Tue Apr 24 11:27:37 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 07:27:37 -0400
Subject: rpms/openldap/FC-6 openldap.spec,1.67,1.68
Message-ID: <200704241127.l3OBRbgo017340@cvs.devel.redhat.com>

Author: jsafrane

Update of /cvs/dist/rpms/openldap/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv17286

Modified Files:
	openldap.spec 
Log Message:
changelog updated


Index: openldap.spec
===================================================================
RCS file: /cvs/dist/rpms/openldap/FC-6/openldap.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- openldap.spec	23 Apr 2007 07:44:10 -0000	1.67
+++ openldap.spec	24 Apr 2007 11:27:35 -0000	1.68
@@ -13,7 +13,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP
 Name: openldap
 Version: %{version_23}
-Release: 1%{?dist}.1
+Release: 2%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
@@ -527,7 +527,7 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/openldap/*.so
 
 rm -f $RPM_BUILD_ROOT%{_localstatedir}/openldap-data/DB_CONFIG.example
-rmdir $RPM_BUILD_ROOT%{_localstatedir}/openldap-slurp $RPM_BUILD_ROOT/var/openldap-data
+rmdir $RPM_BUILD_ROOT%{_localstatedir}/openldap-slurp $RPM_BUILD_ROOT%{_localstatedir}/openldap-data
 
 %clean 
 rm -rf $RPM_BUILD_ROOT
@@ -716,6 +716,18 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Mon Apr 23 2007 Jan Safranek <jsafranek at redhat.com> 2.3.30-2%{?dist}
+- Finally fix the upgrade logic, so that upgrades from 2.3.30 to newer 
+  versions will work. Note that upgrades *to* 2.3.30 will have 
+  to be done carefully, because the half of the upgrade logic in the 
+  2.3.27-4 rpms is broken, and will mess up the upgrade.
+  (bz#230959)
+- slapadd during package update is now quiet (bz#224581)
+- use _localstatedir instead of var/ during build (bz#220970)
+- bind-libbind-devel removed from BuildRequires (bz#216851)
+- slaptest is now quiet during service ldap start, if
+  there is no error/warning (bz#143697)
+
 * Tue Nov 28 2006 Jay Fenlason <fenlason at redhat.com> 2.3.30-1%{?dist}.1
 - Fix the upgrade logic, so that upgrades from 2.3.30 to newer versions
   won't leave junk in /var/lib/ldap if it was empty, and correctly



From fedora-cvs-commits at redhat.com  Tue Apr 24 11:27:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 07:27:53 -0400
Subject: rpms/openldap/FC-5 openldap.spec,1.58,1.59
Message-ID: <200704241127.l3OBRr3o017580@cvs.devel.redhat.com>

Author: jsafrane

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

Modified Files:
	openldap.spec 
Log Message:
changelog updated


Index: openldap.spec
===================================================================
RCS file: /cvs/dist/rpms/openldap/FC-5/openldap.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- openldap.spec	23 Apr 2007 07:43:38 -0000	1.58
+++ openldap.spec	24 Apr 2007 11:27:51 -0000	1.59
@@ -13,7 +13,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP
 Name: openldap
 Version: %{version_23}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
@@ -717,6 +717,18 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Mon Apr 23 2007 Jan Safranek <jsafranek at redhat.com> 2.3.30-2%{?dist}
+- Finally fix the upgrade logic, so that upgrades from 2.3.30 to newer
+  versions will work. Note that upgrades *to* 2.3.30 will have
+  to be done carefully, because the half of the upgrade logic in the
+  2.3.27-4 rpms is broken, and will mess up the upgrade.
+  (bz#230959)
+- slapadd during package update is now quiet (bz#224581)
+- use _localstatedir instead of var/ during build (bz#220970)
+- bind-libbind-devel removed from BuildRequires (bz#216851)
+- slaptest is now quiet during service ldap start, if
+  there is no error/warning (bz#143697)
+
 * Fri Nov 17 2006 Jay Fenlason <fenlason at redhat.com> 2.3.30-1%{?dist}
 - New upstream release
 - Backport fixes from rawhide for



From fedora-cvs-commits at redhat.com  Tue Apr 24 11:28:03 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 07:28:03 -0400
Subject: rpms/kernel/devel linux-2.6-cell-spu-device-tree.patch,1.2,1.3
Message-ID: <200704241128.l3OBS2dA017710@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	linux-2.6-cell-spu-device-tree.patch 
Log Message:
fix patch to apply to current kernel

linux-2.6-cell-spu-device-tree.patch:
 cbe_regs.c |  126 ++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 92 insertions(+), 34 deletions(-)

Index: linux-2.6-cell-spu-device-tree.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-cell-spu-device-tree.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-cell-spu-device-tree.patch	24 Apr 2007 11:26:28 -0000	1.2
+++ linux-2.6-cell-spu-device-tree.patch	24 Apr 2007 11:28:00 -0000	1.3
@@ -1,5 +1,5 @@
---- arch/powerpc/platforms/cell/cbe_regs.c.spu	2007-02-04 18:44:54.000000000 +0000
-+++ arch/powerpc/platforms/cell/cbe_regs.c	2007-04-24 12:24:20.000000000 +0100
+--- linux-2.6.20.ppc64/arch/powerpc/platforms/cell/cbe_regs.c.spu	2007-02-04 18:44:54.000000000 +0000
++++ linux-2.6.20.ppc64/arch/powerpc/platforms/cell/cbe_regs.c	2007-04-24 12:24:20.000000000 +0100
 @@ -14,6 +14,8 @@
  #include <asm/pgtable.h>
  #include <asm/prom.h>



From fedora-cvs-commits at redhat.com  Tue Apr 24 11:42:40 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 07:42:40 -0400
Subject: rpms/kernel/devel linux-2.6-cell-spu-device-tree.patch,1.3,1.4
Message-ID: <200704241142.l3OBgeZe019443@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	linux-2.6-cell-spu-device-tree.patch 
Log Message:
As an added bonus, make it compile too

linux-2.6-cell-spu-device-tree.patch:
 linux-2.6.20.ppc64/arch/powerpc//platforms/cell/cbe_regs.c |  126 +++++++++----
 linux-2.6/arch/powerpc/sysdev/pmi.c                        |   19 -
 linux-2.6/include/asm-powerpc/prom.h                       |   11 +
 3 files changed, 105 insertions(+), 51 deletions(-)

Index: linux-2.6-cell-spu-device-tree.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-cell-spu-device-tree.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-cell-spu-device-tree.patch	24 Apr 2007 11:28:00 -0000	1.3
+++ linux-2.6-cell-spu-device-tree.patch	24 Apr 2007 11:42:37 -0000	1.4
@@ -1,5 +1,85 @@
---- linux-2.6.20.ppc64/arch/powerpc/platforms/cell/cbe_regs.c.spu	2007-02-04 18:44:54.000000000 +0000
-+++ linux-2.6.20.ppc64/arch/powerpc/platforms/cell/cbe_regs.c	2007-04-24 12:24:20.000000000 +0100
+Index: linux-2.6/arch/powerpc/sysdev/pmi.c
+===================================================================
+--- linux-2.6.orig/arch/powerpc/sysdev/pmi.c
++++ linux-2.6/arch/powerpc/sysdev/pmi.c
+@@ -33,7 +33,7 @@
+ #include <asm/of_platform.h>
+ #include <asm/io.h>
+ #include <asm/pmi.h>
+-
++#include <asm/prom.h>
+ 
+ struct pmi_data {
+ 	struct list_head	handler;
+@@ -49,21 +49,6 @@ struct pmi_data {
+ };
+ 
+ 
+-
+-static void __iomem *of_iomap(struct device_node *np)
+-{
+-	struct resource res;
+-
+-	if (of_address_to_resource(np, 0, &res))
+-		return NULL;
+-
+-	pr_debug("Resource start: 0x%lx\n", res.start);
+-	pr_debug("Resource end: 0x%lx\n", res.end);
+-
+-	return ioremap(res.start, 1 + res.end - res.start);
+-}
+-
+-
+ static int pmi_irq_handler(int irq, void *dev_id)
+ {
+ 	struct pmi_data *data;
+@@ -154,7 +139,7 @@ static int pmi_of_probe(struct of_device
+ 		goto out;
+ 	}
+ 
+-	data->pmi_reg = of_iomap(np);
++	data->pmi_reg = of_iomap(np, 0);
+ 	if (!data->pmi_reg) {
+ 		printk(KERN_ERR "pmi: invalid register address.\n");
+ 		rc = -EFAULT;
+Index: linux-2.6/include/asm-powerpc/prom.h
+===================================================================
+--- linux-2.6.orig/include/asm-powerpc/prom.h
++++ linux-2.6/include/asm-powerpc/prom.h
+@@ -20,6 +20,7 @@
+ #include <linux/platform_device.h>
+ #include <asm/irq.h>
+ #include <asm/atomic.h>
++#include <asm/io.h>
+ 
+ /* Definitions used by the flattened device tree */
+ #define OF_DT_HEADER		0xd00dfeed	/* marker */
+@@ -355,6 +356,16 @@ static inline int of_irq_to_resource(str
+ 	return irq;
+ }
+ 
++static inline void __iomem *of_iomap(struct device_node *np, int index)
++{
++	struct resource res;
++
++	if (of_address_to_resource(np, index, &res))
++		return NULL;
++
++	return ioremap(res.start, 1 + res.end - res.start);
++}
++
+ 
+ #endif /* __KERNEL__ */
+ #endif /* _POWERPC_PROM_H */
+
+--
+
+_______________________________________________
+Linuxppc-dev mailing list
+Linuxppc-dev at ozlabs.org
+https://ozlabs.org/mailman/listinfo/linuxppc-dev
+--- linux-2.6.20.ppc64/arch/powerpc//platforms/cell/cbe_regs.c.orig	2007-04-24 12:37:04.000000000 +0100
++++ linux-2.6.20.ppc64/arch/powerpc//platforms/cell/cbe_regs.c	2007-04-24 12:36:18.000000000 +0100
 @@ -14,6 +14,8 @@
  #include <asm/pgtable.h>
  #include <asm/prom.h>
@@ -80,7 +160,7 @@
 +		int len,i;
 +		const phandle *cpu_handle;
 +
-+		cpu_handle = of_get_property(np, "cpus", &len);
++		cpu_handle = get_property(np, "cpus", &len);
 +
 +		for (i=0; i<len; i++)
 +			if (of_find_node_by_phandle(cpu_handle[i]) == of_get_cpu_node(cpu_id, NULL))
@@ -118,15 +198,15 @@
 +
 +		cpu = map->cpu_node;
 +
-+		prop = of_get_property(cpu, "pervasive", NULL);
++		prop = get_property(cpu, "pervasive", NULL);
 +		if (prop != NULL)
 +			map->pmd_regs = ioremap(prop->address, prop->len);
 +
-+		prop = of_get_property(cpu, "iic", NULL);
++		prop = get_property(cpu, "iic", NULL);
 +		if (prop != NULL)
 +			map->iic_regs = ioremap(prop->address, prop->len);
 +
-+		prop = of_get_property(cpu, "mic-tm", NULL);
++		prop = get_property(cpu, "mic-tm", NULL);
 +		if (prop != NULL)
 +			map->mic_tm_regs = ioremap(prop->address, prop->len);
 +	}
@@ -166,7 +246,7 @@
 -			if (cbe_thread_map[i].cpu_node == cpu)
 +			if (cbe_thread_map[i].cpu_node == cpu) {
  				cbe_thread_map[i].regs = map;
-+				map->be_node = thread->be_node;
++				map->be_node = cbe_thread_map[i].be_node;
 +			}
  
 -		prop = get_property(cpu, "pervasive", NULL);



From fedora-cvs-commits at redhat.com  Tue Apr 24 11:44:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 07:44:09 -0400
Subject: rpms/sane-frontends/devel sane-frontends.spec,1.21,1.22
Message-ID: <200704241144.l3OBi9n6019537@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	sane-frontends.spec 
Log Message:
merge review (#226389):
  - add version info to obsoletes/provides
  - no config files in /usr
  - use %%configure macro
add dist tag
Resolves: #226389



Index: sane-frontends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-frontends/devel/sane-frontends.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sane-frontends.spec	15 Mar 2007 11:58:31 -0000	1.21
+++ sane-frontends.spec	24 Apr 2007 11:44:07 -0000	1.22
@@ -1,6 +1,6 @@
 Name: sane-frontends
 Version: 1.0.14
-Release: 2
+Release: 3%{?dist}
 Summary: Graphical frontend to SANE
 URL:       http://www.sane-project.org
 Source0:    ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
@@ -11,8 +11,8 @@
 BuildRequires: sane-backends-devel libieee1284-devel
 Requires:  sane-backends
 Buildroot: %{_tmppath}/%{name}-root
-Obsoletes: sane
-Provides: sane
+Obsoletes: sane <= 0:1.0.9
+Provides: sane = %{?epoch:%{epoch}:}%{version}-%{release}
 ExcludeArch: s390 s390x
 
 %description
@@ -23,8 +23,7 @@
 %patch0 -p1 -b .badcode
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" \
-./configure --with-gnu-ld --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir}
+%configure --with-gnu-ld --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir}
 make
 
 %install
@@ -40,11 +39,18 @@
 %files
 %defattr(-,root,root,755)
 %{_bindir}/*
-%config(noreplace) %{_datadir}/sane/sane-style.rc
+%{_datadir}/sane/sane-style.rc
 %{_mandir}/man1/*
 
 
 %changelog
+* Tue Apr 24 2007 Nils Philippsen <nphilipp at redhat.com> 1.0.14-3
+- merge review (#226389):
+  - add version info to obsoletes/provides
+  - no config files in /usr
+  - use %%configure macro
+- add dist tag
+
 * Thu Mar 15 2007 Karsten Hopp <karsten at redhat.com> 1.0.14-2
 - rebuild with current gtk2 to add png support (#232013)
 



From fedora-cvs-commits at redhat.com  Tue Apr 24 11:52:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 07:52:57 -0400
Subject: rpms/xsane/devel xsane.spec,1.47,1.48
Message-ID: <200704241152.l3OBqvXA019675@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	xsane.spec 
Log Message:
don't include obsolete Application category in desktop file (#226658)
Resolves: #226658



Index: xsane.spec
===================================================================
RCS file: /cvs/dist/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- xsane.spec	4 Apr 2007 13:14:03 -0000	1.47
+++ xsane.spec	24 Apr 2007 11:52:54 -0000	1.48
@@ -3,7 +3,7 @@
 Name: xsane
 Summary: X Window System front-end for the SANE scanner interface
 Version: 0.994
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane.desktop
 Source2: xsane.conf.in
@@ -75,7 +75,6 @@
     --add-category X-Red-Hat-Base                       \
     --add-category X-Fedora                             \
     --add-category Graphics                             \
-    --add-category Application                          \
     %{SOURCE1}
 
 %find_lang %{name} XSANE.lang
@@ -118,6 +117,9 @@
 fi
 
 %changelog
+* Tue Apr 24 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-3
+- don't include obsolete Application category in desktop file (#226658)
+
 * Wed Apr 04 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-2
 - save prefs when EULA is accepted to ensure that EULA is only shown once at
   startup (#233645)



From fedora-cvs-commits at redhat.com  Tue Apr 24 12:28:59 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 08:28:59 -0400
Subject: rpms/squirrelmail/devel
	squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch, 1.2,
	1.3 squirrelmail.spec, 1.52, 1.53
Message-ID: <200704241228.l3OCSxIS020126@cvs.devel.redhat.com>

Author: mbacovsk

Update of /cvs/dist/rpms/squirrelmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20110

Modified Files:
	squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch 
	squirrelmail.spec 
Log Message:
* Mon Apr 23 2007 Martin Bacovsky <mbacovsk at redhat.com> - 1.4.9a-2
- resolves: #237136:PHP Fatal error: Call to a member 
  function getParameter() on a non-object in 
  /usr/share/squirrelmail/functions/mime.php on line 317
- resolves: #229454: Errors in /var/log/httpd/error_log
- resolves: #222879: squirrelmail ja_JP patches break build


squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch:
 mime.php |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

Index: squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch	17 Apr 2007 16:52:44 -0000	1.2
+++ squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch	24 Apr 2007 12:28:57 -0000	1.3
@@ -1,66 +1,6 @@
 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,16 @@ function formatBody($imap_stream, $messa
-     }
- 
-     $body = '';
-+    $charset_converted = false;
-+    $charset = strtolower($body_message->header->getParameter('charset'));
-+    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;
      }


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- squirrelmail.spec	17 Apr 2007 17:34:27 -0000	1.52
+++ squirrelmail.spec	24 Apr 2007 12:28:57 -0000	1.53
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.9a
-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.9-20070106.tar.bz2
 Source5: config_local.php
 Patch1:  squirrelmail-1.4.6-zenkaku-subject-convert.patch
-Patch2:  squirrelmail-1.4.8-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
@@ -45,7 +45,7 @@
 %prep
 %setup -q -n squirrelmail-%{version}
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 
@@ -258,6 +258,13 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Mon Apr 23 2007 Martin Bacovsky <mbacovsk at redhat.com> - 1.4.9a-2
+- resolves: #237136:PHP Fatal error: Call to a member 
+  function getParameter() on a non-object in 
+  /usr/share/squirrelmail/functions/mime.php on line 317
+- resolves: #229454: Errors in /var/log/httpd/error_log
+- resolves: #222879: squirrelmail ja_JP patches break build
+
 * Tue Apr 17 2007 Martin Bacovsky <mbacovsk at redhat.com> - 1.4.9a-1
 - upgarde to new upstream 1.4.9a
 - resolves: #235560 Many SM errors in apache logs



From fedora-cvs-commits at redhat.com  Tue Apr 24 13:04:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 09:04:50 -0400
Subject: rpms/hwbrowser/devel .cvsignore, 1.29, 1.30 hwbrowser.spec, 1.39,
	1.40 sources, 1.33, 1.34
Message-ID: <200704241304.l3OD4oCf025205@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/hwbrowser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24937a

Modified Files:
	.cvsignore hwbrowser.spec sources 
Log Message:
merge review (#225892):
- desktop file: use "true" instead of "0", don't use obsolete Application category
- don't use macros in %%changelog
- remove hashbang from DeviceList.py
Resolves: #225892



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hwbrowser/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	30 Mar 2007 14:52:48 -0000	1.29
+++ .cvsignore	24 Apr 2007 13:04:47 -0000	1.30
@@ -1 +1 @@
-hwbrowser-0.31.tar.gz
+hwbrowser-0.32.tar.gz


Index: hwbrowser.spec
===================================================================
RCS file: /cvs/dist/rpms/hwbrowser/devel/hwbrowser.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- hwbrowser.spec	30 Mar 2007 14:52:48 -0000	1.39
+++ hwbrowser.spec	24 Apr 2007 13:04:47 -0000	1.40
@@ -1,8 +1,7 @@
 Summary: Hardware browser
 Name: hwbrowser
-Version: 0.31
+Version: 0.32
 Release: 1%{?dist}
-URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/System
@@ -62,6 +61,13 @@
 %{_datadir}/applications/redhat-hwbrowser.desktop
 
 %changelog
+* Tue Apr 24 2007 Nils Philippsen <nphilipp at redhat.com> - 0.32
+- merge review (#225892):
+  - desktop file: use "true" instead of "0", don't use obsolete Application
+    category
+  - don't use macros in %%changelog
+  - remove hashbang from DeviceList.py
+
 * Fri Mar 30 2007 Nils Philippsen <nphilipp at redhat.com> - 0.31
 - fix summary, don't hash-bang python modules, mark config files (#225892)
 - remove kontrol-panel icon
@@ -249,7 +255,7 @@
 - new version.
 
 * Wed Aug 29 2001 Jonathan Blandford <jrb at redhat.com>
-- remove desktop file from %{_datadir}/kontrol-panel, #52718
+- remove desktop file from %%{_datadir}/kontrol-panel, #52718
 
 * Fri Aug 24 2001 Jonathan Blandford <jrb at redhat.com>
 - more translations.  Fix brokenness with kudzu probing.  Fix .desktop


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hwbrowser/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	30 Mar 2007 14:52:48 -0000	1.33
+++ sources	24 Apr 2007 13:04:47 -0000	1.34
@@ -1 +1 @@
-2f5d0e6a7557f4721ec05532d17c590f  hwbrowser-0.31.tar.gz
+c817a01e5bf60e30458df5b4b90d27d7  hwbrowser-0.32.tar.gz



From fedora-cvs-commits at redhat.com  Tue Apr 24 14:11:13 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 10:11:13 -0400
Subject: rpms/gnome-pilot/devel gnome-pilot-2.0.15-unresolved-symbols.patch,
	1.3, 1.4 gnome-pilot.spec, 1.58, 1.59
Message-ID: <200704241411.l3OEBDxM012172@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	gnome-pilot-2.0.15-unresolved-symbols.patch gnome-pilot.spec 
Log Message:

* Tue Apr 24 2007 Matthew Barnes <mbarnes at redhat.com> - 2.0.15-8.fc7
- One more revision of the patch to close RH bug #198211.


gnome-pilot-2.0.15-unresolved-symbols.patch:
 capplet/pilot.c                                 |    1 
 conduits/backup/Makefile.am                     |    3 -
 conduits/file/Makefile.am                       |    3 -
 conduits/test/Makefile.am                       |    3 -
 gpilotd/Makefile.am                             |    8 ++
 gpilotd/gnome-pilot-structures.c                |   37 ++++++++-----
 gpilotd/gnome-pilot-structures.h                |   13 ++++
 libgpilotdCM/Makefile.am                        |    4 +
 libgpilotdCM/gnome-pilot-conduit-config.gob     |   66 +++++++++++++++++++++---
 libgpilotdCM/gnome-pilot-conduit-management.gob |    4 +
 10 files changed, 116 insertions(+), 26 deletions(-)

Index: gnome-pilot-2.0.15-unresolved-symbols.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/devel/gnome-pilot-2.0.15-unresolved-symbols.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-pilot-2.0.15-unresolved-symbols.patch	23 Apr 2007 21:11:02 -0000	1.3
+++ gnome-pilot-2.0.15-unresolved-symbols.patch	24 Apr 2007 14:11:11 -0000	1.4
@@ -1,5 +1,5 @@
 --- gnome-pilot-2.0.15/capplet/pilot.c.unresolved-symbols	2006-02-01 17:03:55.000000000 -0500
-+++ gnome-pilot-2.0.15/capplet/pilot.c	2007-04-23 15:40:37.000000000 -0400
++++ gnome-pilot-2.0.15/capplet/pilot.c	2007-04-23 17:08:37.000000000 -0400
 @@ -29,6 +29,7 @@
  #include <pi-util.h>
  
@@ -9,7 +9,7 @@
  /* create new pilotstate structure, initialize to sane state */
  PilotState
 --- gnome-pilot-2.0.15/libgpilotdCM/gnome-pilot-conduit-config.gob.unresolved-symbols	2002-11-22 11:04:01.000000000 -0500
-+++ gnome-pilot-2.0.15/libgpilotdCM/gnome-pilot-conduit-config.gob	2007-04-23 15:40:37.000000000 -0400
++++ gnome-pilot-2.0.15/libgpilotdCM/gnome-pilot-conduit-config.gob	2007-04-23 17:08:37.000000000 -0400
 @@ -42,6 +42,57 @@
  	private guint32 pilot_id;
  	private GnomePilotConduitManagement *gpcm;
@@ -133,8 +133,8 @@
  }
  
  %{
---- gnome-pilot-2.0.15/libgpilotdCM/Makefile.am.unresolved-symbols	2007-04-23 15:39:04.000000000 -0400
-+++ gnome-pilot-2.0.15/libgpilotdCM/Makefile.am	2007-04-23 15:40:37.000000000 -0400
+--- gnome-pilot-2.0.15/libgpilotdCM/Makefile.am.unresolved-symbols	2007-04-23 17:08:37.000000000 -0400
++++ gnome-pilot-2.0.15/libgpilotdCM/Makefile.am	2007-04-23 17:08:37.000000000 -0400
 @@ -40,6 +40,10 @@
  	gnome-pilot-conduit-management.h 	\
  	gnome-pilot-conduit-config.h
@@ -146,8 +146,21 @@
  libgpilotdcm_la_LDFLAGS = \
  	-version-info $(GPILOTD_CM_CURRENT):$(GPILOTD_CM_REVISION):$(GPILOTD_CM_AGE)
  
+--- gnome-pilot-2.0.15/libgpilotdCM/gnome-pilot-conduit-management.gob.unresolved-symbols	2007-04-24 09:57:31.000000000 -0400
++++ gnome-pilot-2.0.15/libgpilotdCM/gnome-pilot-conduit-management.gob	2007-04-24 09:58:51.000000000 -0400
+@@ -755,7 +755,9 @@
+ 				(*instance) = self->_priv->old_load_func (pilot->pilot_id);
+ 			}
+ 			/* Set the conduits name field */
+-			gnome_pilot_conduit_set_name (*instance, self->_priv->mgmtdata->name);
++			/* Avoid dependency on the gpilotd/ directory */
++			/*gnome_pilot_conduit_set_name (*instance, self->_priv->mgmtdata->name);*/
++			g_object_set(G_OBJECT(*instance), "name", self->_priv->mgmtdata->name, NULL);
+ 		}
+ 		UNLOCK_INSTANCE;
+ 		return err;
 --- gnome-pilot-2.0.15/gpilotd/Makefile.am.unresolved-symbols	2006-10-14 14:17:35.000000000 -0400
-+++ gnome-pilot-2.0.15/gpilotd/Makefile.am	2007-04-23 15:40:37.000000000 -0400
++++ gnome-pilot-2.0.15/gpilotd/Makefile.am	2007-04-23 17:08:37.000000000 -0400
 @@ -110,6 +110,10 @@
  
  libgpilotdinclude_HEADERS = gnome-pilot-client.h
@@ -171,7 +184,7 @@
  	-version-info $(GPILOTD_CONDUIT_CURRENT):$(GPILOTD_CONDUIT_REVISION):$(GPILOTD_CONDUIT_AGE)
  
 --- gnome-pilot-2.0.15/gpilotd/gnome-pilot-structures.h.unresolved-symbols	2006-07-12 03:23:19.000000000 -0400
-+++ gnome-pilot-2.0.15/gpilotd/gnome-pilot-structures.h	2007-04-23 15:41:16.000000000 -0400
++++ gnome-pilot-2.0.15/gpilotd/gnome-pilot-structures.h	2007-04-23 17:08:37.000000000 -0400
 @@ -28,6 +28,10 @@
  #include <glib.h>
  
@@ -200,7 +213,7 @@
  const gchar* gnome_pilot_conduit_sync_type_int_to_str(GnomePilotConduitSyncType e);
  
 --- gnome-pilot-2.0.15/gpilotd/gnome-pilot-structures.c.unresolved-symbols	2006-05-17 14:24:12.000000000 -0400
-+++ gnome-pilot-2.0.15/gpilotd/gnome-pilot-structures.c	2007-04-23 15:40:37.000000000 -0400
++++ gnome-pilot-2.0.15/gpilotd/gnome-pilot-structures.c	2007-04-23 17:08:37.000000000 -0400
 @@ -790,19 +790,19 @@
  {
  	g_return_val_if_fail(s!=NULL,GnomePilotConduitSyncTypeNotSet);
@@ -260,7 +273,7 @@
  	}
  }
 --- gnome-pilot-2.0.15/conduits/backup/Makefile.am.unresolved-symbols	2005-08-10 09:12:22.000000000 -0400
-+++ gnome-pilot-2.0.15/conduits/backup/Makefile.am	2007-04-23 15:40:37.000000000 -0400
++++ gnome-pilot-2.0.15/conduits/backup/Makefile.am	2007-04-23 17:08:37.000000000 -0400
 @@ -12,7 +12,8 @@
  
  libbackup_conduit_la_LDFLAGS = -module -avoid-version
@@ -272,7 +285,7 @@
  @GP_CONDUIT_RULE@
  
 --- gnome-pilot-2.0.15/conduits/test/Makefile.am.unresolved-symbols	2005-08-10 09:12:22.000000000 -0400
-+++ gnome-pilot-2.0.15/conduits/test/Makefile.am	2007-04-23 15:40:37.000000000 -0400
++++ gnome-pilot-2.0.15/conduits/test/Makefile.am	2007-04-23 17:08:37.000000000 -0400
 @@ -12,7 +12,8 @@
  
  libtest_conduit_la_LDFLAGS = -module -avoid-version
@@ -284,7 +297,7 @@
  @GP_CONDUIT_RULE@
  
 --- gnome-pilot-2.0.15/conduits/file/Makefile.am.unresolved-symbols	2006-10-14 13:09:44.000000000 -0400
-+++ gnome-pilot-2.0.15/conduits/file/Makefile.am	2007-04-23 15:40:37.000000000 -0400
++++ gnome-pilot-2.0.15/conduits/file/Makefile.am	2007-04-23 17:08:37.000000000 -0400
 @@ -14,7 +14,8 @@
  
  libfile_conduit_la_LDFLAGS = -module -avoid-version


Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/devel/gnome-pilot.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- gnome-pilot.spec	23 Apr 2007 20:17:42 -0000	1.58
+++ gnome-pilot.spec	24 Apr 2007 14:11:11 -0000	1.59
@@ -4,7 +4,7 @@
 
 Name: gnome-pilot
 Version: 2.0.15
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: LGPL
 Group: Applications/Communications
 Summary: GNOME pilot programs
@@ -155,6 +155,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Apr 24 2007 Matthew Barnes <mbarnes at redhat.com> - 2.0.15-8.fc7
+- One more revision of the patch to close RH bug #198211.
+
 * Mon Apr 23 2007 Matthew Barnes <mbarnes at redhat.com> - 2.0.15-7.fc7
 - Revise patch for RH bug #198211 to match upstream's solution.
 



From fedora-cvs-commits at redhat.com  Tue Apr 24 14:17:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 10:17:47 -0400
Subject: rpms/kdegames/devel kdegames.spec,1.57,1.58
Message-ID: <200704241417.l3OEHlc6012412@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdegames.spec 
Log Message:
cleanup



Index: kdegames.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kdegames.spec	6 Mar 2007 14:59:17 -0000	1.57
+++ kdegames.spec	24 Apr 2007 14:17:45 -0000	1.58
@@ -13,7 +13,7 @@
 %define kdelibs_epoch 6
 
 Version: 3.5.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 6
 Summary: K Desktop Environment - Games
 Name: kdegames
@@ -116,16 +116,20 @@
 rm -rf %{buildroot}
 
 %post
-/sbin/ldconfig ||:
-%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+/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 ||:
-%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+/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 -f %{name}.lang
 %defattr(-,root,root,-)
@@ -152,6 +156,9 @@
 %exclude %{_libdir}/libkdeinit_*.so
 
 %changelog
+* Tue Apr 24 2007 Than Ngo <than at redhat.com> - 6:3.5.6-3.fc7
+- cleanup
+
 * Tue Mar 06 2007 Than Ngo <than at redhat.com> - 6:3.5.6-2.fc7
 - cleanup 
 



From fedora-cvs-commits at redhat.com  Tue Apr 24 14:33:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 10:33:50 -0400
Subject: rpms/docbook-utils/devel docbook-utils-funcsynopsis.patch, NONE,
	1.1 docbook-utils.spec, 1.20, 1.21
Message-ID: <200704241433.l3OEXoPK027757@cvs.devel.redhat.com>

Author: pmejzlik

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

Modified Files:
	docbook-utils.spec 
Added Files:
	docbook-utils-funcsynopsis.patch 
Log Message:
- Fixed a minor bug in processing of <funcsynopsisinfo> (bug #217649)


docbook-utils-funcsynopsis.patch:
 docbook2man-spec.pl |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE docbook-utils-funcsynopsis.patch ---
--- docbook-utils-0.6.14/helpers/docbook2man-spec.pl.0	2007-04-24 16:19:56.000000000 +0200
+++ docbook-utils-0.6.14/helpers/docbook2man-spec.pl	2007-04-24 16:21:23.000000000 +0200
@@ -418,11 +418,13 @@
 
 man_sgml('<FUNCSYNOPSIS>', sub {
 	man_output("\n.sp\n");
+	man_output("\n.nf\n");
 	bold_on();
 });
 man_sgml('</FUNCSYNOPSIS>', sub {
 	font_off();
 	man_output("\n");
+	man_output("\n.fi\n");
 });
 
 man_sgml('<CMDSYNOPSIS>', "\n\n");


Index: docbook-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/docbook-utils/devel/docbook-utils.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- docbook-utils.spec	12 Jul 2006 05:41:49 -0000	1.20
+++ docbook-utils.spec	24 Apr 2007 14:33:48 -0000	1.21
@@ -1,6 +1,6 @@
 Name: docbook-utils
 Version: 0.6.14
-Release: 5.1
+Release: 6
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents.
@@ -26,6 +26,7 @@
 Provides: stylesheets
 
 Patch0: docbook-utils-spaces.patch
+Patch1: docbook-utils-funcsynopsis.patch
 
 %Description
 This package contains scripts are for easy conversion from DocBook
@@ -49,6 +50,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .spaces
+%patch1 -p1 -b .0
 
 %build
 ./configure --prefix=%{_prefix} --mandir=%{_mandir}
@@ -116,6 +118,9 @@
 %{_mandir}/*/docbook2ps.*
 
 %changelog
+* Tue Apr 24 2007 Petr Mejzlik <pmejzlik at redhat.com> 0.6.14-6
+- Fixed a minor bug in processing of <funcsynopsisinfo> (bug #217649)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.6.14-5.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Apr 24 14:43:25 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 10:43:25 -0400
Subject: rpms/OpenIPMI/devel OpenIPMI-2.0.6-badheader.patch, 1.1,
	1.2 OpenIPMI.spec, 1.41, 1.42
Message-ID: <200704241443.l3OEhP6j002201@cvs.devel.redhat.com>

Author: pknirsch

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

Modified Files:
	OpenIPMI-2.0.6-badheader.patch OpenIPMI.spec 
Log Message:
- Updated to OpenIPMI-2.0.11


OpenIPMI-2.0.6-badheader.patch:
 ipmievd.c           |    1 -
 plugins/open/open.c |    1 -
 2 files changed, 2 deletions(-)

Index: OpenIPMI-2.0.6-badheader.patch
===================================================================
RCS file: /cvs/dist/rpms/OpenIPMI/devel/OpenIPMI-2.0.6-badheader.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OpenIPMI-2.0.6-badheader.patch	16 Jun 2006 16:21:38 -0000	1.1
+++ OpenIPMI-2.0.6-badheader.patch	24 Apr 2007 14:43:23 -0000	1.2
@@ -1,5 +1,5 @@
---- OpenIPMI-2.0.6/ipmitool-1.8.8/src/plugins/open/open.c.foo	2006-06-16 12:13:58.000000000 -0400
-+++ OpenIPMI-2.0.6/ipmitool-1.8.8/src/plugins/open/open.c	2006-06-16 12:19:09.000000000 -0400
+--- OpenIPMI-2.0.6/ipmitool-1.8.9/src/plugins/open/open.c.foo	2006-06-16 12:13:58.000000000 -0400
++++ OpenIPMI-2.0.6/ipmitool-1.8.9/src/plugins/open/open.c	2006-06-16 12:19:09.000000000 -0400
 @@ -50,7 +50,6 @@
  #endif
  
@@ -8,8 +8,8 @@
  # include <linux/ipmi.h>
  #elif defined(HAVE_FREEBSD_IPMI_H)
  /* FreeBSD OpenIPMI-compatible header */
---- OpenIPMI-2.0.6/ipmitool-1.8.8/src/ipmievd.c.foo	2006-06-16 12:14:18.000000000 -0400
-+++ OpenIPMI-2.0.6/ipmitool-1.8.8/src/ipmievd.c	2006-06-16 12:14:22.000000000 -0400
+--- OpenIPMI-2.0.6/ipmitool-1.8.9/src/ipmievd.c.foo	2006-06-16 12:14:18.000000000 -0400
++++ OpenIPMI-2.0.6/ipmitool-1.8.9/src/ipmievd.c	2006-06-16 12:14:22.000000000 -0400
 @@ -54,7 +54,6 @@
  
  #ifdef IPMI_INTF_OPEN


Index: OpenIPMI.spec
===================================================================
RCS file: /cvs/dist/rpms/OpenIPMI/devel/OpenIPMI.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- OpenIPMI.spec	7 Dec 2006 18:25:07 -0000	1.41
+++ OpenIPMI.spec	24 Apr 2007 14:43:23 -0000	1.42
@@ -1,9 +1,9 @@
-%define ipmitoolver 1.8.8
+%define ipmitoolver 1.8.9
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
-Version: 2.0.6
-Release: 7%{?dist}
+Version: 2.0.11
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -11,8 +11,6 @@
 Source2: http://prdownloads.sourceforge.net/ipmitool/ipmitool-%{ipmitoolver}.tar.gz
 Source3: openipmi.sysconf
 Source4: openipmi.initscript
-Patch1: OpenIPMI-2.0.6-badheader.patch
-Patch100: ipmitool-1.8.7-peftime.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 PreReq: chkconfig
 BuildPrereq: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel
@@ -64,10 +62,6 @@
 
 %prep
 %setup -q -a 2
-%patch1 -p1 -b .badheader
-pushd ipmitool-%{ipmitoolver}
-%patch100 -p1 -b .peftime
-popd
 
 %build
 %configure --with-pythoninstall=%{python_sitearch}
@@ -85,8 +79,8 @@
 rm -rf $RPM_BUILD_ROOT/usr/lib
 %endif
 pushd ipmitool-%{ipmitoolver}
-%makeinstall
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/
+make install DESTDIR=$RPM_BUILD_ROOT
+#rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/
 popd
 
 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
@@ -138,19 +132,19 @@
 %{_mandir}/man8/ipmilan*
 
 %files perl
-%{_libdir}/perl5/site_perl/*/*-linux-thread-multi/OpenIPMI.pm
-%dir %{_libdir}/perl5/site_perl/*/*-linux-thread-multi/auto/OpenIPMI
-%{_libdir}/perl5/site_perl/*/*-linux-thread-multi/auto/OpenIPMI/*
+%{_libdir}/perl5/vendor_perl/*/*-linux-thread-multi/OpenIPMI.pm
+%dir %{_libdir}/perl5/vendor_perl/*/*-linux-thread-multi/auto/OpenIPMI
+%{_libdir}/perl5/vendor_perl/*/*-linux-thread-multi/auto/OpenIPMI/*
 
 %files python
 %{_libdir}/python*/site-packages/*
 
 %files tools
 %defattr(-,root,root)
-%{_datadir}/ipmitool/
 %{_bindir}/ipmitool
 %{_mandir}/man1/ipmitool*
 %{_mandir}/man8/ipmievd*
+%{_datadir}/doc/ipmitool
 /usr/sbin/ipmievd
 
 %files libs
@@ -166,6 +160,12 @@
 %{_libdir}/*.a
 
 %changelog
+* Tue Apr 24 2007 Phil Knirsch <pknirsch at redhat.com> - 2.0.11-1
+- Update to OpenIPMI-2.0.11
+
+* Tue Feb 27 2007 Phil Knirsch <pknirsch at redhat.com> - 2.0.6-8
+- Update for ipmitool-1.8.9
+
 * Thu Dec  7 2006 Jeremy Katz <katzj at redhat.com> - 2.0.6-7
 - rebuild for python 2.5
 



From fedora-cvs-commits at redhat.com  Tue Apr 24 14:44:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 10:44:09 -0400
Subject: rpms/policycoreutils/devel .cvsignore, 1.147,
	1.148 policycoreutils-rhat.patch, 1.299,
	1.300 policycoreutils.spec, 1.404, 1.405 sources, 1.152, 1.153
Message-ID: <200704241444.l3OEi94v002810@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore policycoreutils-rhat.patch policycoreutils.spec 
	sources 
Log Message:
* Tue Apr 24 2007 Dan Walsh <dwalsh at redhat.com> 2.0.10-1
- Updated version of policycoreutils
	* Merged chcat, fixfiles, genhomedircon, restorecond, and restorecon patches from Dan Walsh.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- .cvsignore	12 Apr 2007 16:51:50 -0000	1.147
+++ .cvsignore	24 Apr 2007 14:44:06 -0000	1.148
@@ -145,3 +145,4 @@
 policycoreutils-2.0.8.tgz
 sepolgen-1.0.8.tgz
 policycoreutils-2.0.9.tgz
+policycoreutils-2.0.10.tgz

policycoreutils-rhat.patch:
 ChangeLog                    |    3 ---
 Makefile                     |    2 +-
 audit2allow/Makefile         |    3 ++-
 audit2why/Makefile           |    2 +-
 restorecon/restorecon.c      |   15 +++++++++++----
 restorecond/restorecond.c    |   12 +++++++-----
 restorecond/restorecond.conf |    3 +++
 scripts/genhomedircon        |   24 +++++++++++++++++-------
 semanage/seobject.py         |   10 +++++++---
 9 files changed, 49 insertions(+), 25 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- policycoreutils-rhat.patch	20 Apr 2007 18:01:26 -0000	1.299
+++ policycoreutils-rhat.patch	24 Apr 2007 14:44:06 -0000	1.300
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-2.0.9/audit2allow/Makefile
 --- nsapolicycoreutils/audit2allow/Makefile	2007-02-07 12:11:49.000000000 -0500
-+++ policycoreutils-2.0.9/audit2allow/Makefile	2007-04-18 14:32:01.000000000 -0400
++++ policycoreutils-2.0.9/audit2allow/Makefile	2007-04-23 13:08:07.000000000 -0400
 @@ -1,6 +1,7 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -29,6 +29,16 @@
  LIBDIR ?= ${PREFIX}/lib
  MANDIR ?= $(PREFIX)/share/man
  LOCALEDIR ?= /usr/share/locale
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/ChangeLog policycoreutils-2.0.9/ChangeLog
+--- nsapolicycoreutils/ChangeLog	2007-04-24 10:36:17.000000000 -0400
++++ policycoreutils-2.0.9/ChangeLog	2007-04-12 12:43:10.000000000 -0400
+@@ -1,6 +1,3 @@
+-2.0.10 2007-04-24
+-	* Merged chcat, fixfiles, genhomedircon, restorecond, and restorecon patches from Dan Walsh.
+-
+ 2.0.9 2007-04-12
+ 	* Merged seobject setransRecords patch to return the first alias from Xavier Toth.
+ 
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.9/Makefile
 --- nsapolicycoreutils/Makefile	2006-11-16 17:15:00.000000000 -0500
 +++ policycoreutils-2.0.9/Makefile	2007-04-16 13:26:34.000000000 -0400
@@ -39,7 +49,7 @@
  all install relabel clean indent:
  	@for subdir in $(SUBDIRS); do \
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-2.0.9/restorecon/restorecon.c
---- nsapolicycoreutils/restorecon/restorecon.c	2006-11-16 17:14:26.000000000 -0500
+--- nsapolicycoreutils/restorecon/restorecon.c	2007-04-24 10:36:17.000000000 -0400
 +++ policycoreutils-2.0.9/restorecon/restorecon.c	2007-04-18 14:26:39.000000000 -0400
 @@ -16,6 +16,7 @@
   * -v	Show changes in file labels.  
@@ -57,7 +67,7 @@
  #define STAT_BLOCK_SIZE 1
  static int pipe_fds[2] = { -1, -1 };
  static unsigned long long count = 0;
-@@ -326,18 +328,20 @@
+@@ -326,17 +328,19 @@
  			rc = fork();
  		if (rc == 0) {
  			close(pipe_fds[0]);
@@ -75,13 +85,11 @@
  				if (!file_exist && errno == ENOENT)
  					return;
  				fprintf(stderr,
--					"%s:  error while labeling files under %s\n",
--					progname, buf);
+-					"%s: error while traversing %s: %s\n",
 +					"%s: %s: %s\n",
-+					progname, buf, strerror(errno));
+ 					progname, buf, strerror(errno));
  				errors++;
  			}
- 		}
 @@ -367,11 +371,14 @@
  
  	set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
@@ -141,75 +149,10 @@
 +/etc/lvm/.cache
  ~/public_html
  ~/.mozilla/plugins/libflashplayer.so
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.9/restorecond/restorecond.init
---- nsapolicycoreutils/restorecond/restorecond.init	2007-03-01 17:23:40.000000000 -0500
-+++ policycoreutils-2.0.9/restorecond/restorecond.init	2007-04-16 13:26:34.000000000 -0400
-@@ -73,6 +73,7 @@
-         ;;
-   status)
- 	status restorecond
-+	RETVAL=$?
- 	;;
-   restart|reload)
- 	restart
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.9/scripts/chcat
---- nsapolicycoreutils/scripts/chcat	2007-02-22 08:53:22.000000000 -0500
-+++ policycoreutils-2.0.9/scripts/chcat	2007-04-16 13:26:34.000000000 -0400
-@@ -74,9 +74,11 @@
-             if i not in cats:
-                 cats.append(i)
- 
--        new_serange = "%s-%s:%s" % (serange[0], top[0], string.join(cats, ","))
--        if new_serange[-1:] == ":":
--            new_serange = new_serange[:-1]
-+            
-+        if len(cats) > 0:
-+            new_serange = "%s-%s:%s" % (serange[0], top[0], ",".join(cats))
-+        else
-+            new_serange = "%s-%s" % (serange[0], top[0])
-             
-         if add_ind:
-             cmd = "semanage login -a -r %s -s %s %s" % (new_serange, user[0], u)
-@@ -151,10 +153,11 @@
-             if i in cats:
-                 cats.remove(i)
- 
--        new_serange = "%s-%s:%s" % (serange[0], top[0], string.join(cats, ","))
--        if new_serange[-1:] == ":":
--            new_serange = new_serange[:-1]
--        
-+        if len(cats) > 0:
-+            new_serange = "%s-%s:%s" % (serange[0], top[0], ",".join(cats))
-+        else
-+            new_serange = "%s-%s" % (serange[0], top[0])
-+            
-         if add_ind:
-             cmd = "semanage login -a -r %s -s %s %s" % (new_serange, user[0], u)
-         else:
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.9/scripts/fixfiles
---- nsapolicycoreutils/scripts/fixfiles	2007-01-11 08:56:30.000000000 -0500
-+++ policycoreutils-2.0.9/scripts/fixfiles	2007-04-16 13:26:34.000000000 -0400
-@@ -138,7 +138,7 @@
-     exit $?
- fi
- LogReadOnly
--${SETFILES} ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE
-+${SETFILES} -q ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE
- exit $?
- }
- 
 diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-2.0.9/scripts/genhomedircon
---- nsapolicycoreutils/scripts/genhomedircon	2006-11-28 09:24:33.000000000 -0500
+--- nsapolicycoreutils/scripts/genhomedircon	2007-04-24 10:36:17.000000000 -0400
 +++ policycoreutils-2.0.9/scripts/genhomedircon	2007-04-20 13:58:01.000000000 -0400
-@@ -26,6 +26,7 @@
- 
- import sys, os, pwd, string, getopt, re
- from semanage import *;
-+import selinux
- import gettext
- gettext.install('policycoreutils')
- 
-@@ -135,6 +136,9 @@
+@@ -136,6 +136,9 @@
  		self.contextdir = "/contexts"
  		self.filecontextdir = self.contextdir+"/files"
  		self.usepwd = usepwd
@@ -219,7 +162,7 @@
  
  	def getFileContextDir(self):
  		return self.selinuxdir+self.type+self.filecontextdir
-@@ -211,6 +215,10 @@
+@@ -212,6 +215,10 @@
  		prefs["prefix"] = prefix
  		prefs["home"] = home
  		udict[user] = prefs
@@ -230,7 +173,7 @@
  		
  	def getUsers(self):
  		udict = {}
-@@ -219,7 +227,11 @@
+@@ -220,7 +227,11 @@
  			for seuser in list:
  				user = []
  				seusername = semanage_seuser_get_sename(seuser)
@@ -243,19 +186,7 @@
  				
  		else:
  			try:
-@@ -249,7 +261,10 @@
- 				i = i.replace("HOME_DIR", home)
- 				i = i.replace("ROLE", prefix)
- 				i = i.replace("system_u", seuser)
--				ret = ret+i
-+				# Validate if the generated context exists.  Some user types may not exist
-+				scon = i.split()[-1]
-+				if selinux.security_check_context(scon) == 0:
-+					ret = ret+i
- 		fd.close()
- 		return ret
- 
-@@ -266,12 +281,11 @@
+@@ -270,12 +281,11 @@
  		return ret
  
  	def genHomeDirContext(self):
@@ -271,7 +202,7 @@
  		return ret+"\n"
  
  	def checkExists(self, home):
-@@ -318,9 +332,9 @@
+@@ -322,9 +332,9 @@
  	def genoutput(self):
  		ret = self.heading()
  		for h in self.getHomeDirs():


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -r1.404 -r1.405
--- policycoreutils.spec	20 Apr 2007 18:01:27 -0000	1.404
+++ policycoreutils.spec	24 Apr 2007 14:44:07 -0000	1.405
@@ -5,8 +5,8 @@
 %define sepolgenver 1.0.8
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 2.0.9
-Release: 10%{?dist}
+Version: 2.0.10
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,10 @@
 fi
 
 %changelog
+* Tue Apr 24 2007 Dan Walsh <dwalsh at redhat.com> 2.0.10-1
+- Updated version of policycoreutils
+	* Merged chcat, fixfiles, genhomedircon, restorecond, and restorecon patches from Dan Walsh.
+
 * Fri Apr 20 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-10
 - Fix genhomedircon to handle non user_u for the default user
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- sources	12 Apr 2007 16:51:50 -0000	1.152
+++ sources	24 Apr 2007 14:44:07 -0000	1.153
@@ -1,2 +1,2 @@
 4d6e57c7fc396efbcf96b7accab4ba30  sepolgen-1.0.8.tgz
-daa0a6e388b811b1a64a1504ca37b41d  policycoreutils-2.0.9.tgz
+6c44f3d0aa3f76efff635669b8d189d3  policycoreutils-2.0.10.tgz



From fedora-cvs-commits at redhat.com  Tue Apr 24 14:44:24 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 10:44:24 -0400
Subject: rpms/docbook-utils/FC-6 docbook-utils-funcsynopsis.patch, NONE,
	1.1 docbook-utils.spec, 1.20, 1.21
Message-ID: <200704241444.l3OEiOuC003052@cvs.devel.redhat.com>

Author: pmejzlik

Update of /cvs/dist/rpms/docbook-utils/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv2960

Modified Files:
	docbook-utils.spec 
Added Files:
	docbook-utils-funcsynopsis.patch 
Log Message:
- Fixed a minor bug in processing of <funcsynopsisinfo> (bug #217649)


docbook-utils-funcsynopsis.patch:
 docbook2man-spec.pl |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE docbook-utils-funcsynopsis.patch ---
--- docbook-utils-0.6.14/helpers/docbook2man-spec.pl.0	2007-04-24 16:19:56.000000000 +0200
+++ docbook-utils-0.6.14/helpers/docbook2man-spec.pl	2007-04-24 16:21:23.000000000 +0200
@@ -418,11 +418,13 @@
 
 man_sgml('<FUNCSYNOPSIS>', sub {
 	man_output("\n.sp\n");
+	man_output("\n.nf\n");
 	bold_on();
 });
 man_sgml('</FUNCSYNOPSIS>', sub {
 	font_off();
 	man_output("\n");
+	man_output("\n.fi\n");
 });
 
 man_sgml('<CMDSYNOPSIS>', "\n\n");


Index: docbook-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/docbook-utils/FC-6/docbook-utils.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- docbook-utils.spec	12 Jul 2006 05:41:49 -0000	1.20
+++ docbook-utils.spec	24 Apr 2007 14:44:21 -0000	1.21
@@ -1,6 +1,6 @@
 Name: docbook-utils
 Version: 0.6.14
-Release: 5.1
+Release: 6
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents.
@@ -26,6 +26,7 @@
 Provides: stylesheets
 
 Patch0: docbook-utils-spaces.patch
+Patch1: docbook-utils-funcsynopsis.patch
 
 %Description
 This package contains scripts are for easy conversion from DocBook
@@ -49,6 +50,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .spaces
+%patch1 -p1 -b .funcsynopsis
 
 %build
 ./configure --prefix=%{_prefix} --mandir=%{_mandir}
@@ -116,6 +118,9 @@
 %{_mandir}/*/docbook2ps.*
 
 %changelog
+* Tue Apr 24 2007 Petr Mejzlik <pmejzlik at redhat.com> 0.6.14-6
+- Fixed a minor bug in processing of <funcsynopsisinfo> (bug #217649)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.6.14-5.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Apr 24 14:48:17 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 10:48:17 -0400
Subject: rpms/docbook-utils/FC-6 docbook-utils.spec,1.21,1.22
Message-ID: <200704241448.l3OEmHA4006134@cvs.devel.redhat.com>

Author: pmejzlik

Update of /cvs/dist/rpms/docbook-utils/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv5984

Modified Files:
	docbook-utils.spec 
Log Message:
- add missing dist tag



Index: docbook-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/docbook-utils/FC-6/docbook-utils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- docbook-utils.spec	24 Apr 2007 14:44:21 -0000	1.21
+++ docbook-utils.spec	24 Apr 2007 14:48:15 -0000	1.22
@@ -1,6 +1,6 @@
 Name: docbook-utils
 Version: 0.6.14
-Release: 6
+Release: 6%{?dist}
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents.
@@ -120,6 +120,7 @@
 %changelog
 * Tue Apr 24 2007 Petr Mejzlik <pmejzlik at redhat.com> 0.6.14-6
 - Fixed a minor bug in processing of <funcsynopsisinfo> (bug #217649)
+- add missing dist tag
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.6.14-5.1
 - rebuild



From fedora-cvs-commits at redhat.com  Tue Apr 24 14:48:37 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 10:48:37 -0400
Subject: rpms/libselinux/devel .cvsignore, 1.138, 1.139 libselinux.spec,
	1.263, 1.264 sources, 1.140, 1.141
Message-ID: <200704241448.l3OEmb3R006439@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libselinux.spec sources 
Log Message:
* Tue Apr 24 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-1
- Upgrade to upstream
	* Merged build fix for avc_internal.c from Joshua Brindle.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- .cvsignore	12 Apr 2007 20:07:39 -0000	1.138
+++ .cvsignore	24 Apr 2007 14:48:35 -0000	1.139
@@ -117,3 +117,4 @@
 libselinux-2.0.11.tgz
 libselinux-2.0.12.tgz
 libselinux-2.0.13.tgz
+libselinux-2.0.14.tgz


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- libselinux.spec	23 Apr 2007 14:38:02 -0000	1.263
+++ libselinux.spec	24 Apr 2007 14:48:35 -0000	1.264
@@ -1,8 +1,8 @@
 %define libsepolver 2.0.1-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.13
-Release: 2%{?dist}
+Version: 2.0.14
+Release: 1%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -121,6 +121,10 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Tue Apr 24 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.14-1
+- Upgrade to upstream
+	* Merged build fix for avc_internal.c from Joshua Brindle.
+
 * Mon Apr 23 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.13-2
 - Add get_context_list funcitions to swig file
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/sources,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- sources	12 Apr 2007 20:07:39 -0000	1.140
+++ sources	24 Apr 2007 14:48:35 -0000	1.141
@@ -1 +1 @@
-757f1175a62d14c66938ff5f177d2c6d  libselinux-2.0.13.tgz
+c7bcec2fc9766fd31a2468f08ac186ac  libselinux-2.0.14.tgz



From fedora-cvs-commits at redhat.com  Tue Apr 24 14:49:28 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 10:49:28 -0400
Subject: rpms/docbook-utils/devel docbook-utils.spec,1.21,1.22
Message-ID: <200704241449.l3OEnSOM007260@cvs.devel.redhat.com>

Author: pmejzlik

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

Modified Files:
	docbook-utils.spec 
Log Message:
- add missing dist tag, bump release



Index: docbook-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/docbook-utils/devel/docbook-utils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- docbook-utils.spec	24 Apr 2007 14:33:48 -0000	1.21
+++ docbook-utils.spec	24 Apr 2007 14:49:26 -0000	1.22
@@ -1,6 +1,6 @@
 Name: docbook-utils
 Version: 0.6.14
-Release: 6
+Release: 7%{?dist}
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents.
@@ -118,6 +118,9 @@
 %{_mandir}/*/docbook2ps.*
 
 %changelog
+* Tue Apr 24 2007 Petr Mejzlik <pmejzlik at redhat.com> 0.6.14-7
+- add missing dist tag, bump release
+
 * Tue Apr 24 2007 Petr Mejzlik <pmejzlik at redhat.com> 0.6.14-6
 - Fixed a minor bug in processing of <funcsynopsisinfo> (bug #217649)
 



From fedora-cvs-commits at redhat.com  Tue Apr 24 14:52:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 10:52:53 -0400
Subject: rpms/gmp/devel gmp.spec,1.38,1.39
Message-ID: <200704241452.l3OEqrqk009612@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gmp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9551

Modified Files:
	gmp.spec 
Log Message:
- fix library permissions


Index: gmp.spec
===================================================================
RCS file: /cvs/dist/rpms/gmp/devel/gmp.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gmp.spec	14 Mar 2007 12:07:26 -0000	1.38
+++ gmp.spec	24 Apr 2007 14:52:51 -0000	1.39
@@ -9,7 +9,7 @@
 Summary: A GNU arbitrary precision library
 Name: gmp
 Version: 4.1.4
-Release: 12.2
+Release: 12.3
 URL: http://www.swox.com/gmp/
 Source0: ftp://ftp.gnu.org/pub/gnu/gmp/gmp-%{version}.tar.bz2
 Source1: http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
@@ -118,15 +118,15 @@
 cd build-sse2
 export LD_LIBRARY_PATH=`pwd`/.libs
 mkdir $RPM_BUILD_ROOT%{_libdir}/sse2
-install -m 644 .libs/libgmp.so.3.* $RPM_BUILD_ROOT%{_libdir}/sse2
+install -m 755 .libs/libgmp.so.3.* $RPM_BUILD_ROOT%{_libdir}/sse2
 cp -a .libs/libgmp.so.3 $RPM_BUILD_ROOT%{_libdir}/sse2
-chmod 644 $RPM_BUILD_ROOT%{_libdir}/sse2/libgmp.so.3
-install -m 644 .libs/libgmpxx.so.3.* $RPM_BUILD_ROOT%{_libdir}/sse2
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/sse2/libgmp.so.3
+install -m 755 .libs/libgmpxx.so.3.* $RPM_BUILD_ROOT%{_libdir}/sse2
 cp -a .libs/libgmpxx.so.3 $RPM_BUILD_ROOT%{_libdir}/sse2
-chmod 644 $RPM_BUILD_ROOT%{_libdir}/sse2/libgmpxx.so.3
-install -m 644 .libs/libmp.so.3.* $RPM_BUILD_ROOT%{_libdir}/sse2
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/sse2/libgmpxx.so.3
+install -m 755 .libs/libmp.so.3.* $RPM_BUILD_ROOT%{_libdir}/sse2
 cp -a .libs/libmp.so.3 $RPM_BUILD_ROOT%{_libdir}/sse2
-chmod 644 $RPM_BUILD_ROOT%{_libdir}/sse2/libmp.so.3
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/sse2/libmp.so.3
 cd ..
 %endif
 cd mpfr-%{mpfr_version}
@@ -208,6 +208,9 @@
 %{_infodir}/mpfr.info*
 
 %changelog
+* Tue Apr 24 2007 Karsten Hopp <karsten at redhat.com> 4.1.4-12.3
+- fix library permissions
+
 * Wed Mar 14 2007 Karsten Hopp <karsten at redhat.com> 4.1.4-12.2
 - fix typo
 



From fedora-cvs-commits at redhat.com  Tue Apr 24 15:41:44 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 11:41:44 -0400
Subject: rpms/OpenIPMI/devel .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <200704241541.l3OFfiOp005669@cvs.devel.redhat.com>

Author: pknirsch

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

Modified Files:
	.cvsignore sources 
Log Message:
- Add new source files properly.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/OpenIPMI/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 May 2006 10:13:11 -0000	1.7
+++ .cvsignore	24 Apr 2007 15:41:42 -0000	1.8
@@ -1,2 +1,2 @@
-ipmitool-1.8.8.tar.gz
-OpenIPMI-2.0.6.tar.gz
+ipmitool-1.8.9.tar.gz
+OpenIPMI-2.0.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/OpenIPMI/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 May 2006 10:13:11 -0000	1.7
+++ sources	24 Apr 2007 15:41:42 -0000	1.8
@@ -1,2 +1,2 @@
-8ae20a7621b00148acacab5b44540f3e  ipmitool-1.8.8.tar.gz
-43be79ea0693dbde0420202e721b5232  OpenIPMI-2.0.6.tar.gz
+3b4dbdbaa1edff3dccaf88d161b34cd2  ipmitool-1.8.9.tar.gz
+2fdcb5be3730cf26e69bb20d29415710  OpenIPMI-2.0.11.tar.gz



From fedora-cvs-commits at redhat.com  Tue Apr 24 15:57:27 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 11:57:27 -0400
Subject: rpms/gdb/devel gdb-6.6-bz225783-gdb-debuginfo-paths.patch, NONE,
	1.1 gdb-6.6-bz225783-prelink-path.patch, NONE,
	1.1 gdb-6.6-bz235753-gcore-strings-overflow.patch, NONE,
	1.1 gdb-6.3-warnings-20050317.patch, 1.4, 1.5 gdb.spec, 1.227, 1.228
Message-ID: <200704241557.l3OFvRSi005979@cvs.devel.redhat.com>

Author: jkratoch

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5954

Modified Files:
	gdb-6.3-warnings-20050317.patch gdb.spec 
Added Files:
	gdb-6.6-bz225783-gdb-debuginfo-paths.patch 
	gdb-6.6-bz225783-prelink-path.patch 
	gdb-6.6-bz235753-gcore-strings-overflow.patch 
Log Message:
* Tue Apr 24 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-11
- Package review, analysed by Ralf Corsepius (BZ 225783).
 - Fix prelink(8) testcase for non-root $PATH missing `/usr/sbin' (BZ 225783).
 - Fix debugging GDB itself - the compiled in source files paths (BZ 225783).
 - Fix harmless GCORE stack buffer overflow, by _FORTIFY_SOURCE=2 (BZ 235753).
 - Fix XML support - the build was missing `expat-devel'.
 - Updated the `info' files handling by the spec file.
 - Building now with the standard Fedora code protections - _FORTIFY_SOURCE=2.
 - Use multiple CPUs for the build (%{?_smp_mflags}).
 - Separate testsuite run to its %check section.
 - Fix (remove) non-ASCII spec file characters.
 - Remove system tools versions dumping - already present in mock build logs.
- Reverts: rhbz#235197
- Related: rhbz#235197 rhbz#225783
- Resolves: rhbz#235753


gdb-6.6-bz225783-gdb-debuginfo-paths.patch:
 Makefile.in |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

--- NEW FILE gdb-6.6-bz225783-gdb-debuginfo-paths.patch ---
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=225783


--- gdb-6.6-orig/gdb/Makefile.in	2007-04-08 20:49:10.000000000 +0200
+++ gdb-6.6/gdb/Makefile.in	2007-04-08 23:22:40.000000000 +0200
@@ -1672,17 +1672,19 @@ po/$(PACKAGE).pot: force
 
 .SUFFIXES: .y .l
 .y.c: 
-	$(SHELL) $(YLWRAP) $< y.tab.c $@.tmp -- $(YACC) $(YFLAGS)
-	-sed -e '/extern.*malloc/d' \
+	rm -f $@ $@.tmp
+	$(SHELL) $(YLWRAP) $< y.tab.c $@ -- $(YACC) $(YFLAGS) && mv $@ $@.tmp \
+		|| (rm -f $@; false)
+	sed -e '/extern.*malloc/d' \
 	     -e '/extern.*realloc/d' \
 	     -e '/extern.*free/d' \
 	     -e '/include.*malloc.h/d' \
 	     -e 's/\([^x]\)malloc/\1xmalloc/g' \
 	     -e 's/\([^x]\)realloc/\1xrealloc/g' \
 	     -e '/^#line.*y.tab.c/d' \
-	  < $@.tmp > $@.new
-	-rm $@.tmp
-	mv $@.new ./$*.c
+	     -e "s/^\(#line.*\)`basename $<`/\1`echo $<|sed 's/\//\\\\\//g'`/" \
+	  < $@.tmp > $@
+	rm -f $@.tmp
 .l.c:
 	if [ "$(FLEX)" ] && $(FLEX) --version >/dev/null 2>&1; then \
 	    $(FLEX) -o$@ $< && \

gdb-6.6-bz225783-prelink-path.patch:
 prelink.exp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE gdb-6.6-bz225783-prelink-path.patch ---
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=225783


--- gdb-6.6/gdb/testsuite/gdb.base/prelink.exp.orig	2006-03-08 19:22:09.000000000 -0500
+++ gdb-6.6/gdb/testsuite/gdb.base/prelink.exp	2007-04-08 13:22:45.000000000 -0400
@@ -48,7 +48,7 @@
     return -1
 }
 
-if {[catch "system \"prelink -qNR ${libfile}\""] != 0} {
+if {[catch "system \"/usr/sbin/prelink -qNR ${libfile}\""] != 0} {
     # Maybe we don't have prelink.
     return -1
 }
@@ -89,11 +89,11 @@
     return 0
 }
 
-if {[catch "system \"prelink -uN ${libfile}\""] != 0} {
+if {[catch "system \"/usr/sbin/prelink -uN ${libfile}\""] != 0} {
     untested "${libfile} was not prelinked, maybe system libraries are not prelinked?"
     return 0
 }
-catch "system \"prelink -qNR ${libfile}\""
+catch "system \"/usr/sbin/prelink -qNR ${libfile}\""
 
 # Start with a fresh gdb
 

gdb-6.6-bz235753-gcore-strings-overflow.patch:
 linux-nat.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

--- NEW FILE gdb-6.6-bz235753-gcore-strings-overflow.patch ---
Failing on _FORTIFY_SOURCE=2 for `gdb.base/corefile.exp'.


--- gdb-6.6/gdb/linux-nat.c-orig	2007-04-08 21:12:38.000000000 +0200
+++ gdb-6.6/gdb/linux-nat.c	2007-04-09 20:05:43.000000000 +0200
@@ -2838,7 +2838,9 @@ linux_nat_make_corefile_notes (bfd *obfd
 {
   struct linux_nat_corefile_thread_data thread_args;
   struct cleanup *old_chain;
+  /* Length must be >= sizeof (prpsinfo_t.pr_fname).  */
   char fname[16] = { '\0' };
+  /* Length must be >= sizeof (prpsinfo_t.pr_psargs).  */
   char psargs[80] = { '\0' };
   char *note_data = NULL;
   ptid_t current_ptid = inferior_ptid;
@@ -2851,9 +2853,14 @@ linux_nat_make_corefile_notes (bfd *obfd
       strncpy (psargs, get_exec_file (0), sizeof (psargs));
       if (get_inferior_args ())
 	{
-	  strncat (psargs, " ", sizeof (psargs) - strlen (psargs));
-	  strncat (psargs, get_inferior_args (),
-		   sizeof (psargs) - strlen (psargs));
+	  /* linux_elfcore_write_prpsinfo () handles zero non-terminated
+	     strings right if they provide enough characters for its purposes.
+	     Handle to fully filled (=> zero non-terminated) strings here.  */
+	  if (memchr (psargs, 0, sizeof (psargs)) != NULL)
+	    strncat (psargs, " ", sizeof (psargs) - strlen (psargs) - 1);
+	  if (memchr (psargs, 0, sizeof (psargs)) != NULL)
+	    strncat (psargs, get_inferior_args (),
+		     sizeof (psargs) - strlen (psargs) - 1);
 	}
       note_data = (char *) linux_elfcore_write_prpsinfo (obfd, note_data,
 							 note_size, fname,

gdb-6.3-warnings-20050317.patch:
 gdb-6.6/gdb/cli/cli-cmds.c                 |    3 ++-
 gdb-6.6/gdb/cp-valprint.c                  |    4 ++--
 gdb-6.6/gdb/doublest.c                     |   13 ++++---------
 gdb-6.6/gdb/dwarf2expr.c                   |    2 ++
 gdb-6.6/gdb/dwarf2read.c                   |   14 +++++++++-----
 gdb-6.6/gdb/f-exp.y                        |    2 ++
 gdb-6.6/gdb/gdb-events.c                   |    2 ++
 gdb-6.6/gdb/inflow.c                       |    9 ++++++---
 gdb-6.6/gdb/linespec.c                     |    2 +-
 gdb-6.6/gdb/linux-nat.c                    |    3 ++-
 gdb-6.6/gdb/macroscope.c                   |    9 ++++-----
 gdb-6.6/gdb/main.c                         |    3 ++-
 gdb-6.6/gdb/mi/mi-cmd-break.c              |    4 ++--
 gdb-6.6/gdb/mi/mi-cmd-disas.c              |    2 +-
 gdb-6.6/gdb/mi/mi-cmd-env.c                |    4 ++--
 gdb-6.6/gdb/mi/mi-getopt.c                 |    2 +-
 gdb-6.6/gdb/mi/mi-main.c                   |    4 ++--
 gdb-6.6/gdb/p-valprint.c                   |    4 ++--
 gdb-6.6/gdb/remote-fileio.c                |   26 +++++++++++++-------------
 gdb-6.6/gdb/remote.c                       |    4 ++--
 gdb-6.6/gdb/s390-tdep.c                    |    6 ++++++
 gdb-6.6/gdb/source.c                       |    4 ++--
 gdb-6.6/gdb/stabsread.c                    |    3 ++-
 gdb-6.6/gdb/symfile.c                      |    2 ++
 gdb-6.6/gdb/target.c                       |    3 +++
 gdb-6.6/gdb/testsuite/gdb.base/move-dir.h  |    2 +-
 gdb-6.6/gdb/testsuite/gdb.base/sigrepeat.c |    1 +
 gdb-6.6/gdb/top.c                          |    3 ++-
 gdb-6.6/gdb/tui/tui-layout.c               |    8 ++++----
 gdb-6.6/gdb/ui-file.c                      |    3 ++-
 gdb-6.6/gdb/utils.c                        |    3 ++-
 gdb-6.6/gdb/varobj.c                       |   16 ++++++----------
 gdb/mi/mi-cmd-env.c                        |    3 ++-
 33 files changed, 98 insertions(+), 75 deletions(-)

Index: gdb-6.3-warnings-20050317.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-warnings-20050317.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gdb-6.3-warnings-20050317.patch	21 Jan 2007 01:53:01 -0000	1.4
+++ gdb-6.3-warnings-20050317.patch	24 Apr 2007 15:57:25 -0000	1.5
@@ -1,17 +1,3 @@
-Index: gdb-6.6/gdb/configure
-===================================================================
---- gdb-6.6.orig/gdb/configure
-+++ gdb-6.6/gdb/configure
-@@ -20991,7 +20991,8 @@ fi
- # gdb/doc/gdbint.texinfo.
- build_warnings="-Wimplicit -Wreturn-type -Wcomment -Wtrigraphs \
- -Wformat -Wparentheses -Wpointer-arith -Wformat-nonliteral \
---Wunused-label -Wunused-function -Wno-pointer-sign"
-+-Wunused-label -Wunused-function -Wno-pointer-sign -Wno-unused \
-+-Wp,-U_FORTIFY_SOURCE"
- 
- # GCC supports -Wuninitialized only with -O or -On, n != 0.
- if test x${CFLAGS+set} = xset; then
 Index: gdb-6.6/gdb/mi/mi-cmd-env.c
 ===================================================================
 --- gdb-6.6.orig/gdb/mi/mi-cmd-env.c
@@ -534,20 +520,6 @@
  
        /* Set ourselves as our root */
        var->root->rootvar = var;
-Index: gdb-6.6/gdb/configure.ac
-===================================================================
---- gdb-6.6.orig/gdb/configure.ac
-+++ gdb-6.6/gdb/configure.ac
-@@ -1112,7 +1112,8 @@ fi
- # gdb/doc/gdbint.texinfo.
- build_warnings="-Wimplicit -Wreturn-type -Wcomment -Wtrigraphs \
- -Wformat -Wparentheses -Wpointer-arith -Wformat-nonliteral \
---Wunused-label -Wunused-function -Wno-pointer-sign"
-+-Wunused-label -Wunused-function -Wno-pointer-sign -Wno-unused \
-+-Wp,-U_FORTIFY_SOURCE"
- 
- # GCC supports -Wuninitialized only with -O or -On, n != 0.
- if test x${CFLAGS+set} = xset; then
 Index: gdb-6.6/gdb/doublest.c
 ===================================================================
 --- gdb-6.6.orig/gdb/doublest.c
@@ -572,3 +544,121 @@
      }
    if (len < sizeof(result) * FLOATFORMAT_CHAR_BIT)
      /* Mask out bits which are not part of the field */
+diff -u -rup gdb-6.6-orig/gdb/cli/cli-cmds.c gdb-6.6/gdb/cli/cli-cmds.c
+--- gdb-6.6-orig/gdb/cli/cli-cmds.c	2007-04-08 20:49:09.000000000 +0200
++++ gdb-6.6/gdb/cli/cli-cmds.c	2007-04-08 20:54:49.000000000 +0200
+@@ -323,7 +323,8 @@ pwd_command (char *args, int from_tty)
+ {
+   if (args)
+     error (_("The \"pwd\" command does not take an argument: %s"), args);
+-  getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
++  /* Unused result.  */
++  1 && getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
+ 
+   if (strcmp (gdb_dirbuf, current_directory) != 0)
+     printf_unfiltered (_("Working directory %s\n (canonically %s).\n"),
+diff -u -rup gdb-6.6-orig/gdb/inflow.c gdb-6.6/gdb/inflow.c
+--- gdb-6.6-orig/gdb/inflow.c	2006-02-10 23:01:43.000000000 +0100
++++ gdb-6.6/gdb/inflow.c	2007-04-08 20:56:48.000000000 +0200
+@@ -549,17 +549,20 @@ new_tty (void)
+   if (tty != 0)
+     {
+       close (0);
+-      dup (tty);
++      /* Unused result.  */
++      1 && dup (tty);
+     }
+   if (tty != 1)
+     {
+       close (1);
+-      dup (tty);
++      /* Unused result.  */
++      1 && dup (tty);
+     }
+   if (tty != 2)
+     {
+       close (2);
+-      dup (tty);
++      /* Unused result.  */
++      1 && dup (tty);
+     }
+   if (tty > 2)
+     close (tty);
+diff -u -rup gdb-6.6-orig/gdb/linux-nat.c gdb-6.6/gdb/linux-nat.c
+--- gdb-6.6-orig/gdb/linux-nat.c	2007-04-08 20:49:11.000000000 +0200
++++ gdb-6.6/gdb/linux-nat.c	2007-04-08 20:54:08.000000000 +0200
+@@ -2972,7 +2972,8 @@ linux_nat_info_proc_cmd (char *args, int
+       sprintf (fname1, "/proc/%lld/cmdline", pid);
+       if ((procfile = fopen (fname1, "r")) > 0)
+ 	{
+-	  fgets (buffer, sizeof (buffer), procfile);
++	  /* Unused result.  */
++	  1 && fgets (buffer, sizeof (buffer), procfile);
+ 	  printf_filtered ("cmdline = '%s'\n", buffer);
+ 	  fclose (procfile);
+ 	}
+diff -u -rup gdb-6.6-orig/gdb/main.c gdb-6.6/gdb/main.c
+--- gdb-6.6-orig/gdb/main.c	2007-04-08 20:49:09.000000000 +0200
++++ gdb-6.6/gdb/main.c	2007-04-08 20:55:30.000000000 +0200
+@@ -195,7 +195,8 @@ captured_main (void *data)
+   line[0] = '\0';		/* Terminate saved (now empty) cmd line */
+   instream = stdin;
+ 
+-  getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
++  /* Unused result.  */
++  1 && getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
+   current_directory = gdb_dirbuf;
+ 
+   gdb_stdout = stdio_fileopen (stdout);
+diff -u -rup gdb-6.6-orig/gdb/mi/mi-cmd-env.c gdb-6.6/gdb/mi/mi-cmd-env.c
+--- gdb-6.6-orig/gdb/mi/mi-cmd-env.c	2007-04-08 20:49:09.000000000 +0200
++++ gdb-6.6/gdb/mi/mi-cmd-env.c	2007-04-08 20:55:11.000000000 +0200
+@@ -80,7 +80,8 @@ mi_cmd_env_pwd (char *command, char **ar
+      
+   /* Otherwise the mi level is 2 or higher.  */
+ 
+-  getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
++  /* Unused result.  */
++  1 && getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
+   ui_out_field_string (uiout, "cwd", gdb_dirbuf);
+ 
+   return MI_CMD_DONE;
+diff -u -rup gdb-6.6-orig/gdb/top.c gdb-6.6/gdb/top.c
+--- gdb-6.6-orig/gdb/top.c	2007-04-08 20:49:10.000000000 +0200
++++ gdb-6.6/gdb/top.c	2007-04-08 20:55:46.000000000 +0200
+@@ -1643,7 +1643,8 @@ gdb_init (char *argv0)
+ 
+   /* Run the init function of each source file */
+ 
+-  getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
++  /* Unused result.  */
++  1 && getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
+   current_directory = gdb_dirbuf;
+ 
+ #ifdef __MSDOS__
+diff -u -rup gdb-6.6-orig/gdb/ui-file.c gdb-6.6/gdb/ui-file.c
+--- gdb-6.6-orig/gdb/ui-file.c	2005-12-17 23:34:03.000000000 +0100
++++ gdb-6.6/gdb/ui-file.c	2007-04-08 20:56:21.000000000 +0200
+@@ -482,7 +482,8 @@ stdio_file_write (struct ui_file *file, 
+   if (stdio->magic != &stdio_file_magic)
+     internal_error (__FILE__, __LINE__,
+ 		    _("stdio_file_write: bad magic number"));
+-  fwrite (buf, length_buf, 1, stdio->file);
++  /* Unused result.  */
++  1 && fwrite (buf, length_buf, 1, stdio->file);
+ }
+ 
+ static void
+diff -u -rup gdb-6.6-orig/gdb/utils.c gdb-6.6/gdb/utils.c
+--- gdb-6.6-orig/gdb/utils.c	2007-04-08 20:49:09.000000000 +0200
++++ gdb-6.6/gdb/utils.c	2007-04-08 20:56:01.000000000 +0200
+@@ -718,7 +718,8 @@ internal_vproblem (struct internal_probl
+ 	abort ();	/* NOTE: GDB has only three calls to abort().  */
+       default:
+ 	dejavu = 3;
+-	write (STDERR_FILENO, msg, sizeof (msg));
++	/* Unused result.  */
++	1 && write (STDERR_FILENO, msg, sizeof (msg));
+ 	exit (1);
+       }
+   }


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- gdb.spec	22 Apr 2007 20:16:04 -0000	1.227
+++ gdb.spec	24 Apr 2007 15:57:25 -0000	1.228
@@ -1,6 +1,6 @@
-# Define this if you want to skip the strip step and preserve debug
-# info.  Useful for testing.
-#define __spec_install_post /usr/lib/rpm/brp-compress || :
+# Define this if you want to skip the strip step and preserve debug info.
+# Useful for testing.
+#define __debug_install_post : > %{_builddir}/%{?buildsubdir}/debugfiles.list
 
 Summary: A GNU source-level debugger for C, C++, Java and other languages.
 Name: gdb
@@ -11,17 +11,17 @@
 Version: 6.6
 
 # The release always contains a leading reserved number, start it at 1.
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 License: GPL
 Group: Development/Debuggers
 Source: ftp://ftp.gnu.org/gnu/gdb/gdb-6.6.tar.bz2
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 URL: http://gnu.org/software/gdb/
 
 # For our convenience
 %define gdb_src gdb-6.6
-%define gdb_build %{gdb_src}/build-%{_target_platform}
+%define gdb_build build-%{_target_platform}
 
 # Make sure we get rid of the old package gdb64, now that we have unified
 # support for 32-64 bits in one single 64-bit gdb.
@@ -317,6 +317,15 @@
 # Use definition of an empty structure as it is not an opaque type (BZ 233716).
 Patch238: gdb-6.6-bz233716-empty-structure-override.patch
 
+# Fix prelink(8) testcase for non-root $PATH missing `/usr/sbin' (BZ 225783).
+Patch240: gdb-6.6-bz225783-prelink-path.patch
+
+# Fix debugging GDB itself - the compiled in source files paths (BZ 225783).
+Patch241: gdb-6.6-bz225783-gdb-debuginfo-paths.patch
+
+# Fix harmless GCORE stack buffer overflow, by _FORTIFY_SOURCE=2 (BZ 235753).
+Patch243: gdb-6.6-bz235753-gcore-strings-overflow.patch
+
 # Use the runtime variant of `libunwind-ARCH.so.7' rather than the `.so' one.
 Patch244: gdb-6.6-libunwind-major-version.patch
 
@@ -330,7 +339,7 @@
 Patch247: gdb-6.6-bz234468-fork-detach-info.patch
 
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
-BuildRequires: flex bison sharutils
+BuildRequires: flex bison sharutils expat-devel
 
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{multilib_64_archs} sparc ppc
@@ -345,7 +354,8 @@
 BuildRequires: prelink
 %endif
  
-Prereq: info
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description
 GDB, the GNU debugger, allows you to debug programs written in C, C++,
@@ -359,6 +369,10 @@
 
 %setup -q -n %{gdb_src}
 
+# Files have `# <number> <file>' statements breaking VPATH / find-debuginfo.sh .
+rm -f gdb/ada-exp.c gdb/ada-lex.c gdb/c-exp.c gdb/cp-name-parser.c gdb/f-exp.c
+rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc-exp.c gdb/p-exp.c
+
 # Apply patches defined above.
 
 %patch0 -p1
@@ -457,6 +471,9 @@
 %patch235 -p1
 %patch236 -p1
 %patch238 -p1
+%patch240 -p1
+%patch241 -p1
+%patch243 -p1
 %patch244 -p1
 %patch245 -p1
 %patch246 -p1
@@ -475,12 +492,10 @@
 
 %build
 
-# Initially we're in the %{gdb_src} directory.
-cd ..
-
 # Identify the build directory with the version of gdb as well as the
 # architecture, to allow for mutliple versions to be installed and
 # built.
+# Initially we're in the %{gdb_src} directory.
 
 rm -fr %{gdb_build}
 mkdir %{gdb_build}
@@ -494,9 +509,9 @@
 
 export CFLAGS="$RPM_OPT_FLAGS"
 
-enable_build_warnings=""
+enable_build_warnings="--enable-gdb-build-warnings=,-Wno-unused"
 %ifarch %{ix86} alpha ia64 ppc s390 s390x x86_64 ppc64
-enable_build_warnings="--enable-gdb-build-warnings=,-Werror"
+enable_build_warnings="$enable_build_warnings,-Werror"
 %endif
 
 ../configure						\
@@ -514,29 +529,15 @@
 %endif
     %{_target_platform}
 
-make -k
-make info
+make %{?_smp_mflags}
+make %{?_smp_mflags} info
 
-# Get some information about which tools we interact with. We cannot
-# invoke rpm -q from here.
-# Note that binutils and glibc don't brand themselves as RedHat specific
-# versions. This is very wrong. They are not the vanilla FSF ones!
-%ifarch %{ix86} ppc s390 ia64
-if [ -x /lib/tls/libc.so.6 ] ; then
-  /lib/tls/libc.so.6
-elif [ -x /lib/tls/libc.so.6.1 ] ; then
-    /lib/tls/libc.so.6.1
-fi
-%endif
-%ifarch x86_64 s390x ppc64
-if  [ -x /lib64/tls/libc.so.6 ] ; then
-   /lib64/tls/libc.so.6
-fi
-%endif
+# Copy the <sourcetree>/gdb/NEWS file to the directory above it.
+cp $RPM_BUILD_DIR/%{gdb_src}/gdb/NEWS $RPM_BUILD_DIR/%{gdb_src}
 
-gcc -v
-uname -a
-ld -v
+%check
+# Initially we're in the %{gdb_src} directory.
+cd %{gdb_build}
 
 # For now do testing only on these platforms. 
 %ifarch %{ix86} x86_64 s390x s390 ppc ia64 ppc64
@@ -545,27 +546,30 @@
 # Need to use a single --ignore option, second use overrides first.
 # "chng-syms.exp" for possibly avoiding Linux kernel crash - Bug 207002.
 # "threadcrash.exp" is incompatible on ia64 with old kernels.
-make -k check RUNTESTFLAGS='--ignore "bigcore.exp chng-syms.exp checkpoint.exp threadcrash.exp"' || :
+# No `%{?_smp_mflags}' here as it may race.
+# WARNING: can't generate a core file - core tests suppressed - check ulimit
+(
+  # ULIMIT required for `gdb.base/auxv.exp'.
+  ulimit -H -c
+  ulimit -c unlimited || :
+  make -k check RUNTESTFLAGS='--ignore "bigcore.exp chng-syms.exp checkpoint.exp threadcrash.exp"' || :
+)
 for t in sum log; do
   ln gdb.$t gdb-%{_target_platform}.$t || :
 done
-tar cf - gdb-%{_target_platform}.{sum,log} \
-	| bzip2 -1 \
-	| uuencode gdb-%{_target_platform}.tar.bz2 \
-	|| :
+# `tar | bzip2 | uuencode' may have some piping problems in Brew.
+tar cjf gdb-%{_target_platform}.tar.bz2 gdb-%{_target_platform}.{sum,log}
+uuencode gdb-%{_target_platform}.tar.bz2 gdb-%{_target_platform}.tar.bz2
 cd ../..
 echo ====================TESTING END=====================
 %endif
 
-cd ..
-# Copy the <sourcetree>/gdb/NEWS file to the directory above it.
-cp $RPM_BUILD_DIR/%{gdb_src}/gdb/NEWS $RPM_BUILD_DIR/%{gdb_src}
-
 %install
-cd ../%{gdb_build}
+# Initially we're in the %{gdb_src} directory.
+cd %{gdb_build}
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT
 
 # install the gcore script in /usr/bin
 cp $RPM_BUILD_DIR/%{gdb_src}/gdb/gdb_gcore.sh $RPM_BUILD_ROOT%{_prefix}/bin/gcore
@@ -595,25 +599,17 @@
 # This step is part of the installation of the RPM. Not to be confused
 # with the 'make install ' of the build (rpmbuild) process.
 
-[ -f %{_infodir}/annotate.info ]	&& /sbin/install-info %{_infodir}/annotate.info %{_infodir}/dir || :
-[ -f %{_infodir}/annotate.info.gz ]	&& /sbin/install-info %{_infodir}/annotate.info.gz %{_infodir}/dir  || :
-[ -f %{_infodir}/gdb.info ]		&& /sbin/install-info %{_infodir}/gdb.info %{_infodir}/dir || :
-[ -f %{_infodir}/gdb.info.gz ]		&& /sbin/install-info %{_infodir}/gdb.info.gz %{_infodir}/dir  || :
-[ -f %{_infodir}/gdbint.info ]         && /sbin/install-info %{_infodir}/gdbint.info %{_infodir}/dir || :
-[ -f %{_infodir}/gdbint.info.gz ]      && /sbin/install-info %{_infodir}/gdbint.info.gz %{_infodir}/dir  || :
-[ -f %{_infodir}/stabs.info ]		&& /sbin/install-info %{_infodir}/stabs.info %{_infodir}/dir  || :
-[ -f %{_infodir}/stabs.info.gz ]	&& /sbin/install-info %{_infodir}/stabs.info.gz %{_infodir}/dir  || :
+/sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
+/sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
+/sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
+/sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
 
 %preun
 if [ $1 = 0 ]; then
-	[ -f %{_infodir}/annotate.info ]	&& /sbin/install-info --delete %{_infodir}/annotate.info %{_infodir}/dir  || :
-	[ -f %{_infodir}/annotate.info.gz ]	&& /sbin/install-info --delete %{_infodir}/annotate.info.gz %{_infodir}/dir  || :
-	[ -f %{_infodir}/gdb.info ]		&& /sbin/install-info --delete %{_infodir}/gdb.info %{_infodir}/dir  || :
-	[ -f %{_infodir}/gdb.info.gz ]		&& /sbin/install-info --delete %{_infodir}/gdb.info.gz %{_infodir}/dir  || :
-	[ -f %{_infodir}/gdbint.info ]          && /sbin/install-info --delete %{_infodir}/gdbint.info %{_infodir}/dir  || :
-	[ -f %{_infodir}/gdbint.info.gz ]       && /sbin/install-info --delete %{_infodir}/gdbint.info.gz %{_infodir}/dir  || :
-	[ -f %{_infodir}/stabs.info ]		&& /sbin/install-info --delete %{_infodir}/stabs.info %{_infodir}/dir  || :
-	[ -f %{_infodir}/stabs.info.gz ]	&& /sbin/install-info --delete %{_infodir}/stabs.info.gz %{_infodir}/dir  || :
+	/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
+	/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
+	/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
+	/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
 fi
 
 %files
@@ -629,6 +625,19 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Tue Apr 24 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-11
+- Package review, analysed by Ralf Corsepius (BZ 225783).
+ - Fix prelink(8) testcase for non-root $PATH missing `/usr/sbin' (BZ 225783).
+ - Fix debugging GDB itself - the compiled in source files paths (BZ 225783).
+ - Fix harmless GCORE stack buffer overflow, by _FORTIFY_SOURCE=2 (BZ 235753).
+ - Fix XML support - the build was missing `expat-devel'.
+ - Updated the `info' files handling by the spec file.
+ - Building now with the standard Fedora code protections - _FORTIFY_SOURCE=2.
+ - Use multiple CPUs for the build (%{?_smp_mflags}).
+ - Separate testsuite run to its %check section.
+ - Fix (remove) non-ASCII spec file characters.
+ - Remove system tools versions dumping - already present in mock build logs.
+
 * Sun Apr 22 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-10
 - Notify user of a child forked process being detached (BZ 235197).
 
@@ -1909,144 +1918,144 @@
 * Fri Aug 23 2002 Florian La Roche <Florian.LaRoche at redhat.de>
 - added mainframe patch from developerworks
 
-* Wed Aug 21 2002 Trond Eivind Glomsr?d <teg at redhat.com> 5.2.1-3
+* Wed Aug 21 2002 Trond Eivind Glomsrod <teg at redhat.com> 5.2.1-3
 - Add changelogs to the previous patch
 
-* Wed Aug 14 2002 Trond Eivind Glomsr?d <teg at redhat.com> 5.2.1-2
+* Wed Aug 14 2002 Trond Eivind Glomsrod <teg at redhat.com> 5.2.1-2
 - Add some patches from Elena Zannoni <ezannoni at redhat.com>
 
-* Tue Jul 23 2002 Trond Eivind Glomsr?d <teg at redhat.com> 5.2.1-1
+* Tue Jul 23 2002 Trond Eivind Glomsrod <teg at redhat.com> 5.2.1-1
 - 5.2.1
 
 * Mon Jul 22 2002 Florian La Roche <Florian.LaRoche at redhat.de>
 - compile on mainframe
 
-* Mon Jul  8 2002 Trond Eivind Glomsr?d <teg at redhat.com> 5.2-3
+* Mon Jul  8 2002 Trond Eivind Glomsrod <teg at redhat.com> 5.2-3
 - Rebuild
 
-* Tue May  7 2002 Trond Eivind Glomsr?d <teg at redhat.com> 5.2-2
+* Tue May  7 2002 Trond Eivind Glomsrod <teg at redhat.com> 5.2-2
 - Rebuild
 
-* Mon Apr 29 2002 Trond Eivind Glomsr?d <teg at redhat.com> 5.2-1
+* Mon Apr 29 2002 Trond Eivind Glomsrod <teg at redhat.com> 5.2-1
 - 5.2
 
-* Mon Apr 29 2002 Trond Eivind Glomsr?d <teg at redhat.com> 5.1.92-1
+* Mon Apr 29 2002 Trond Eivind Glomsrod <teg at redhat.com> 5.1.92-1
 - 5.1.92. Hopefully identical to 5.2 final
 
-* Mon Apr 22 2002 Trond Eivind Glomsr?d <teg at redhat.com> 5.1.91-1
+* Mon Apr 22 2002 Trond Eivind Glomsrod <teg at redhat.com> 5.1.91-1
 - 5.1.91. 5.2 expected in a week
 
-* Thu Mar 28 2002 Trond Eivind Glomsr?d <teg at redhat.com> 5.1.90CVS-5
+* Thu Mar 28 2002 Trond Eivind Glomsrod <teg at redhat.com> 5.1.90CVS-5
 - Update to current
 
-* Thu Mar 28 2002 Trond Eivind Glomsr?d <teg at redhat.com> 5.1.90CVS-4
+* Thu Mar 28 2002 Trond Eivind Glomsrod <teg at redhat.com> 5.1.90CVS-4
 - Update to current
 
-* Thu Mar 28 2002 Trond Eivind Glomsr?d <teg at redhat.com> 5.1.90CVS-3
+* Thu Mar 28 2002 Trond Eivind Glomsrod <teg at redhat.com> 5.1.90CVS-3
 - Update to current
 
-* Wed Mar 20 2002 Trond Eivind Glomsr?d <teg at redhat.com> 5.1.90CVS-2
+* Wed Mar 20 2002 Trond Eivind Glomsrod <teg at redhat.com> 5.1.90CVS-2
 - Update to current
 
-* Wed Mar 13 2002 Trond Eivind Glomsr?d <teg at redhat.com> 5.1.90CVS-1
+* Wed Mar 13 2002 Trond Eivind Glomsrod <teg at redhat.com> 5.1.90CVS-1
 - Update to current 5.2 branch 
 
-* Thu Jan 24 2002 Trond Eivind Glomsr?d <teg at redhat.com> 5.1.1-1
+* Thu Jan 24 2002 Trond Eivind Glomsrod <teg at redhat.com> 5.1.1-1
 - 5.1.1
 - add URL
 
 * Wed Jan 09 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Mon Dec 10 2001 Trond Eivind Glomsr?d <teg at redhat.com> 5.1-2
+* Mon Dec 10 2001 Trond Eivind Glomsrod <teg at redhat.com> 5.1-2
 - Fix some thread+fpu problems
 
-* Mon Nov 26 2001 Trond Eivind Glomsr?d <teg at redhat.com> 5.1-1
+* Mon Nov 26 2001 Trond Eivind Glomsrod <teg at redhat.com> 5.1-1
 - 5.1
 
-* Mon Nov 19 2001 Trond Eivind Glomsr?d <teg at redhat.com> 5.0.94-0.71
+* Mon Nov 19 2001 Trond Eivind Glomsrod <teg at redhat.com> 5.0.94-0.71
 - 5.0.94. Almost there....
 
-* Mon Nov 12 2001 Trond Eivind Glomsr?d <teg at redhat.com> 5.0.93-2
+* Mon Nov 12 2001 Trond Eivind Glomsrod <teg at redhat.com> 5.0.93-2
 - Add patch from jakub at redhat.com to improve handling of DWARF
 
-* Mon Nov 12 2001 Trond Eivind Glomsr?d <teg at redhat.com> 5.0.93-1
+* Mon Nov 12 2001 Trond Eivind Glomsrod <teg at redhat.com> 5.0.93-1
 - 5.0.93 
 - handle missing info pages in post/pre scripts
 
-* Wed Oct 31 2001 Trond Eivind Glomsr?d <teg at redhat.com> 5.0.92-1
+* Wed Oct 31 2001 Trond Eivind Glomsrod <teg at redhat.com> 5.0.92-1
 - 5.0.92
 
-* Fri Oct 26 2001 Trond Eivind Glomsr?d <teg at redhat.com> 5.0.91rh-1
+* Fri Oct 26 2001 Trond Eivind Glomsrod <teg at redhat.com> 5.0.91rh-1
 - New snapshot
 - Use the 5.0.91 versioning from the snapshot
 
-* Wed Oct 17 2001 Trond Eivind Glomsr?d <teg at redhat.com> 5.0rh-17
+* Wed Oct 17 2001 Trond Eivind Glomsrod <teg at redhat.com> 5.0rh-17
 - New snapshot
 
-* Thu Sep 27 2001 Trond Eivind Glomsr?d <teg at redhat.com> 
+* Thu Sep 27 2001 Trond Eivind Glomsrod <teg at redhat.com> 
 - New snapshot
 
-* Wed Sep 12 2001 Trond Eivind Glomsr?d <teg at redhat.com> 5.0rh-16
+* Wed Sep 12 2001 Trond Eivind Glomsrod <teg at redhat.com> 5.0rh-16
 - New snapshot 
 
-* Mon Aug 13 2001 Trond Eivind Glomsr?d <teg at redhat.com> 5.0rh-15
+* Mon Aug 13 2001 Trond Eivind Glomsrod <teg at redhat.com> 5.0rh-15
 - Don't buildrequire compat-glibc (#51690)
 
-* Thu Aug  9 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Thu Aug  9 2001 Trond Eivind Glomsrod <teg at redhat.com>
 - New snapshot, from the stable branch eventually leading to gdb 5.1
 
-* Mon Jul 30 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon Jul 30 2001 Trond Eivind Glomsrod <teg at redhat.com>
 - s/Copyright/License/
 - Add texinfo to BuildRequires
 
-* Mon Jun 25 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon Jun 25 2001 Trond Eivind Glomsrod <teg at redhat.com>
 - New snapshot
 
-* Fri Jun 15 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Jun 15 2001 Trond Eivind Glomsrod <teg at redhat.com>
 - New snapshot
 - Add ncurses-devel to buildprereq
 - Remove perl from buildprereq, as gdb changed the way 
   version strings are generated
 
-* Thu Jun 14 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Thu Jun 14 2001 Trond Eivind Glomsrod <teg at redhat.com>
 - New snapshot
 
-* Wed May 16 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Wed May 16 2001 Trond Eivind Glomsrod <teg at redhat.com>
 - New snapshot - this had thread fixes for curing #39070
 - New way of specifying version
 
-* Tue May  1 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Tue May  1 2001 Trond Eivind Glomsrod <teg at redhat.com>
 - New tarball
 - Kevin's patch is now part of gdb
 
-* Mon Apr  9 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon Apr  9 2001 Trond Eivind Glomsrod <teg at redhat.com>
 - Add patch from kevinb at redhat.com to fix floating point + thread 
   problem (#24310)
 - remove old workarounds
 - new snapshot
 
-* Thu Apr  5 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Thu Apr  5 2001 Trond Eivind Glomsrod <teg at redhat.com>
 - New snapshot
 
 * Sat Mar 17 2001 Bill Nottingham <notting at redhat.com>
 - on ia64, there are no old headers :)
 
-* Fri Mar 16 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Mar 16 2001 Trond Eivind Glomsrod <teg at redhat.com>
 - build with old headers, new compiler
 
-* Wed Mar 16 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Wed Mar 16 2001 Trond Eivind Glomsrod <teg at redhat.com>
 - new snapshot
 
-* Mon Feb 26 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon Feb 26 2001 Trond Eivind Glomsrod <teg at redhat.com>
 - new snapshot which should fix some more IA64 problems (#29151)
 - remove IA64 patch, it's now integrated
 
-* Wed Feb 21 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Wed Feb 21 2001 Trond Eivind Glomsrod <teg at redhat.com>
 - add IA64 and Alpha patches from Kevin Buettner <kevinb at redhat.com>
 - use perl instead of patch for fixing the version string
 
-* Tue Feb 20 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Tue Feb 20 2001 Trond Eivind Glomsrod <teg at redhat.com>
 - don't use kgcc anymore
 - mark it as our own version
 - new snapshot
@@ -2055,50 +2064,50 @@
 - Link with ncurses 5.x even though we're using kgcc.
   No need to drag in requirements on ncurses4 (Bug #24445)
 
-* Fri Jan 19 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Jan 19 2001 Trond Eivind Glomsrod <teg at redhat.com>
 - new snapshot
 
-* Thu Dec 20 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Thu Dec 20 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - new snapshot
 
-* Mon Dec 04 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon Dec 04 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - new snapshot
 - new alpha patch - it now compiles everywhere. Finally.
 
-* Fri Dec 01 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Dec 01 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - new snapshot
 
-* Mon Nov 20 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon Nov 20 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - new CVS snapshot
 - disable the patches
 - don't use %%configure, as it confuses the autoconf script
 - enable SPARC, disable Alpha
 
 
-* Wed Aug 09 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Wed Aug 09 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - added patch from GDB team for C++ symbol handling
 
-* Mon Jul 25 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon Jul 25 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - upgrade to CVS snapshot
 - excludearch SPARC, build on IA61
 
-* Wed Jul 19 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Wed Jul 19 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - rebuild
 
 * Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
 - automatic rebuild
 
-* Sun Jul 02 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Sun Jul 02 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - rebuild
 
-* Fri Jun 08 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Jun 08 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - use %%configure, %%makeinstall, %%{_infodir}, %%{_mandir},
   and %%{_tmppath}
 - the install scripts  for info are broken(they don't care about
   you specify in the installstep), work around that.
 - don't build for IA64
 
-* Mon May 22 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon May 22 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - upgraded to 5.0 - dump all patches. Reapply later if needed.
 - added the NEWS file to the %%doc files
 - don't delete files which doesn't get installed (readline, texinfo)



From fedora-cvs-commits at redhat.com  Tue Apr 24 17:03:12 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 13:03:12 -0400
Subject: rpms/kernel/devel linux-2.6-cell-spufs-fixes.patch, NONE,
	1.1 kernel-2.6.spec, 1.3107,
	1.3108 linux-2.6-ps3-wrap-spu-runctl.patch, 1.2, 1.3
Message-ID: <200704241703.l3OH3C7k010215@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec linux-2.6-ps3-wrap-spu-runctl.patch 
Added Files:
	linux-2.6-cell-spufs-fixes.patch 
Log Message:
spufs fixes

linux-2.6-cell-spufs-fixes.patch:
 arch/powerpc/platforms/cell/spu_base.c          |  161 +-----------------
 arch/powerpc/platforms/cell/spu_coredump.c      |   34 +--
 arch/powerpc/platforms/cell/spufs/Makefile      |    2 
 arch/powerpc/platforms/cell/spufs/backing_ops.c |    6 
 arch/powerpc/platforms/cell/spufs/context.c     |   45 -----
 arch/powerpc/platforms/cell/spufs/coredump.c    |   19 +-
 arch/powerpc/platforms/cell/spufs/fault.c       |  211 ++++++++++++++++++++++++
 arch/powerpc/platforms/cell/spufs/file.c        |  152 +++++++++++++++--
 arch/powerpc/platforms/cell/spufs/hw_ops.c      |    9 +
 arch/powerpc/platforms/cell/spufs/inode.c       |   42 +++-
 arch/powerpc/platforms/cell/spufs/run.c         |  123 ++++++-------
 arch/powerpc/platforms/cell/spufs/sched.c       |  109 +++++++-----
 arch/powerpc/platforms/cell/spufs/spufs.h       |   34 ++-
 arch/powerpc/platforms/cell/spufs/switch.c      |    8 
 include/asm-powerpc/mmu.h                       |    1 
 include/asm-powerpc/spu_csa.h                   |    1 
 16 files changed, 591 insertions(+), 366 deletions(-)

--- NEW FILE linux-2.6-cell-spufs-fixes.patch ---
commit ccf17e9d008dfebbf90dfa4ee1a56e81c784c73e
Author: Jeremy Kerr <jk at ozlabs.org>
Date:   Mon Apr 23 21:08:29 2007 +0200

    [POWERPC] spu_base: fix initialisation on systems with no SPEs
    
    This change fixes the case where spu_base and spufs are initialised on a
    system with no SPEs - unconditionally create the spu_lists so spu_alloc
    doesn't explode, and check for spu_management ops before starting spufs.
    
    Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
    Signed-off-by: Arnd Bergmann <arnd.bergmann at de.ibm.com>
    
     arch/powerpc/platforms/cell/spu_base.c    |    7 ++++---
     arch/powerpc/platforms/cell/spufs/inode.c |    5 +++++
     2 files changed, 9 insertions(+), 3 deletions(-)

commit befdc746ee027d686a06be29cb1391f9d2c45cf6
Author: Christoph Hellwig <hch at lst.de>
Date:   Mon Apr 23 21:08:28 2007 +0200

    [POWERPC] spu_base: remove cleanup_spu_base
    
    spu_base.c is always built into the kernel image, so there is no need
    for a cleanup function.  And some of the things it does are in the
    way for my following patches, so I'd rather get rid of it ASAP.
    
    Signed-off-by: Christoph Hellwig <hch at lst.de>
    Signed-off-by: Arnd Bergmann <arnd.bergmann at de.ibm.com>

commit aa45e2569ffe963dfbbbfddfdccd12afe69b2d65
Author: Christoph Hellwig <hch at lst.de>
Date:   Mon Apr 23 21:08:27 2007 +0200

    [POWERPC] spufs: various run.c cleanups
    
     - remove the spu_acquire_runnable from spu_run_init.  I need to
       opencode it in spufs_run_spu in the next patch
     - remove various inline attributes, we don't really want to inline
       long functions with multiple callsites
     - cleanup return values and runcntl_write calls in spu_run_init
     - use normal kernel codingstyle in spu_reacquire_runnable
    
    Signed-off-by: Christoph Hellwig <hch at lst.de>
    Signed-off-by: Arnd Bergmann <arnd.bergmann at de.ibm.com>

commit fe8a29db5bce1b5bd1ceb85fd153fac52cdab7b2
Author: Akinobu Mita <mita at fixstars.com>
Date:   Mon Apr 23 21:08:26 2007 +0200

    [POWERPC] spufs: enable SPU coredump for kernel-builtin spufs
    
    spu_coredump_calls.owner is NULL in case of a builtin spufs,
    so the checks in here break.
    Check for the availability of the spu_coredump_calls variable
    instead.
    
    Signed-off-by: Arnd Bergmann <arnd.bergmann at de.ibm.com>

commit 6cf2179202cf706471777ad6ee5d0377d5990ab7
Author: Arnd Bergmann <arnd.bergmann at de.ibm.com>
Date:   Mon Apr 23 21:08:25 2007 +0200

    [POWERPC] spufs: fix memory leak on coredump
    
    Dynamically allocated read/write buffer in spufs_arch_write_note() will
    not be freed. Convert it to get_free_page at the same time.
    
    Cc: Akinobu Mita <mita at fixstars.com>
    Signed-off-by: Arnd Bergmann <arnd.bergmann at de.ibm.com>

commit d3764397d07b1e03943edfdcc3fb77af7bdac02b
Author: Jeremy Kerr <jk at ozlabs.org>
Date:   Mon Apr 23 21:08:24 2007 +0200

    [POWERPC] spufs: Minor cleanup of spu_wait
    
    Change the loop in spu_wait to be a little more straightforward.
    
    Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
    Signed-off-by: Arnd Bergmann <arnd.bergmann at de.ibm.com>

commit f11f5ee70f48899506514e5e0d10ee2c8ddd359a
Author: Jeremy Kerr <jk at ozlabs.org>
Date:   Mon Apr 23 21:08:23 2007 +0200

    [POWERPC] spufs: add mode= mount option
    
    Add a 'mode=' option to spufs mount arguments. This allows more
    control over access to the top-level spufs directory.
    
    Tested on Cell.
    
    Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
    Signed-off-by: Arnd Bergmann <arnd.bergmann at de.ibm.com>

commit 9e2fe2ce4e957a79d3dc5d813e0cfb10d79b79b3
Author: Akinobu Mita <mita at fixstars.com>
Date:   Mon Apr 23 21:08:22 2007 +0200

    [POWERPC] spufs: use memcpy_fromio() to copy from local store
    
    GCC may generates inline copy loop to handle memcpy() function
    instead of kernel defined memcpy(). But this inlined version of memcpy()
    causes an alignment interrupt when copying from local store.
    
    This patch uses memcpy_fromio() and memcpy_toio to copy local store
    to prevent memcpy() being inlined.
    
    Signed-off-by: Akinobu Mita <mita at fixstars.com>
    Signed-off-by: Arnd Bergmann <arnd.bergmann at de.ibm.com>

commit 8a7d86bdb22678b17928eef0c8fa356d8b21cc76
Author: Christoph Hellwig <hch at lst.de>
Date:   Mon Apr 23 21:08:21 2007 +0200

    [POWERPC] spufs: avoid spurious memory barriers
    
    We now have proper locking around assignets of the mapping pointers,
    and the spin_unlock implies enough of a barrier to get rid of the
    explicit one.
    
    Signed-off-by: Christoph Hellwig <hch at lst.de>
    Signed-off-by: Arnd Bergmann <arnd.bergmann at de.ibm.com>

commit db1384b40d12eda6910513ff429ad90453ca49e1
Author: Akinobu Mita <mita at fixstars.com>
Date:   Mon Apr 23 21:08:20 2007 +0200

    [POWERPC] spufs: fix memory leak on spufs reloading
    
    When SPU isolation mode enabled, isolated_loader would be
    allocated by spufs_init_isolated_loader() on module_init().
    But anyone do not free it.
    
    This patch introduces spufs_exit_isolated_loader() which is
    the opposite of spufs_init_isolated_loader() and called on
    module_exit().
    
    Cc: Arnd Bergmann <arnd at arndb.de>
    Signed-off-by: Akinobu Mita <mita at fixstars.com>
    Signed-off-by: Christoph Hellwig <hch at lst.de>
    Signed-off-by: Arnd Bergmann <arnd.bergmann at de.ibm.com>

commit c99c1994a2bb9493b4ac372b2b6ee2606d291171
Author: Akinobu Mita <mita at fixstars.com>
Date:   Mon Apr 23 21:08:19 2007 +0200

    [POWERPC] spufs: fix missing error handling in module_init()
    
    spufs module_init forgot to call a few cleanup functions
    on error path. This patch also includes cosmetic changes in
    spu_sched_init() (identation fix and return error code).
    
    [modified by hch to apply ontop of the latest schedule changes]
    
    Cc: Arnd Bergmann <arnd at arndb.de>
    Signed-off-by: Akinobu Mita <mita at fixstars.com>
    Signed-off-by: Christoph Hellwig <hch at lst.de>
    Signed-off-by: Arnd Bergmann <arnd.bergmann at de.ibm.com>

commit 577f8f1021f9ee6ef2a98a142652759ec122d27f
Author: Akinobu Mita <mita at fixstars.com>
Date:   Mon Apr 23 21:08:18 2007 +0200

    [POWERPC] spufs: check spu_acquire_runnable() return value
    
    This patch checks return value of spu_acquire_runnable() in
    spufs_mfc_write().
    
    Signed-off-by: Akinobu Mita <mita at fixstars.com>
    Signed-off-by: Christoph Hellwig <hch at lst.de>
    Signed-off-by: Arnd Bergmann <arnd.bergmann at de.ibm.com>

commit e45d48a34d4d1862d28d22c2533b8c6bb83b8c1f
Author: Christoph Hellwig <hch at lst.de>
Date:   Mon Apr 23 21:08:17 2007 +0200

    [POWERPC] spufs: turn run_sema into run_mutex
    
    There is no reason for run_sema to be a struct semaphore.  Changing
    it to a mutex and rename it accordingly.
    
    Signed-off-by: Christoph Hellwig <hch at lst.de>
    Signed-off-by: Arnd Bergmann <arnd.bergmann at de.ibm.com>

commit c8a1e9393a86f862ab9c8bc0db9b8a1822226f84
Author: Jeremy Kerr <jk at ozlabs.org>
Date:   Mon Apr 23 21:08:16 2007 +0200

    [POWERPC] spufs: provide siginfo for SPE faults
    
    This change populates a siginfo struct for SPE application exceptions
    (ie, invalid DMAs and illegal instructions).
    
    Tested on an IBM Cell Blade.
    
    Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
    Signed-off-by: Arnd Bergmann <arnd.bergmann at de.ibm.com>
[...1665 lines suppressed...]
+		spin_lock(&spu_prio->runq_lock);
+		__spu_del_from_rq(ctx);
 	}
+	spin_unlock(&spu_prio->runq_lock);
 	__set_current_state(TASK_RUNNING);
 	remove_wait_queue(&ctx->stop_wq, &wait);
 }
@@ -280,9 +290,14 @@ static void spu_reschedule(struct spu *spu)
 	spin_lock(&spu_prio->runq_lock);
 	best = sched_find_first_bit(spu_prio->bitmap);
 	if (best < MAX_PRIO) {
-		struct spu_context *ctx = spu_grab_context(best);
-		if (ctx)
-			wake_up(&ctx->stop_wq);
+		struct list_head *rq = &spu_prio->runq[best];
+		struct spu_context *ctx;
+
+		BUG_ON(list_empty(rq));
+
+		ctx = list_entry(rq->next, struct spu_context, rq);
+		__spu_del_from_rq(ctx);
+		wake_up(&ctx->stop_wq);
 	}
 	spin_unlock(&spu_prio->runq_lock);
 }
@@ -365,6 +380,12 @@ static struct spu *find_victim(struct spu_context *ctx)
 			}
 			spu_unbind_context(spu, victim);
 			mutex_unlock(&victim->state_mutex);
+			/*
+			 * We need to break out of the wait loop in spu_run
+			 * manually to ensure this context gets put on the
+			 * runqueue again ASAP.
+			 */
+			wake_up(&victim->stop_wq);
 			return spu;
 		}
 	}
@@ -377,7 +398,7 @@ static struct spu *find_victim(struct spu_context *ctx)
  * @ctx:	spu context to schedule
  * @flags:	flags (currently ignored)
  *
- * Tries to find a free spu to run @ctx.  If no free spu is availble
+ * Tries to find a free spu to run @ctx.  If no free spu is available
  * add the context to the runqueue so it gets woken up once an spu
  * is available.
  */
@@ -402,9 +423,7 @@ int spu_activate(struct spu_context *ctx, unsigned long flags)
 			return 0;
 		}
 
-		spu_add_to_rq(ctx);
 		spu_prio_wait(ctx);
-		spu_del_from_rq(ctx);
 	} while (!signal_pending(current));
 
 	return -ERESTARTSYS;
diff --git a/arch/powerpc/platforms/cell/spufs/spufs.h b/arch/powerpc/platforms/cell/spufs/spufs.h
index 5c4e47d..0a947fd 100644
--- a/arch/powerpc/platforms/cell/spufs/spufs.h
+++ b/arch/powerpc/platforms/cell/spufs/spufs.h
@@ -41,7 +41,7 @@ struct spu_gang;
 
 /* ctx->sched_flags */
 enum {
-	SPU_SCHED_WAKE = 0, /* currently unused */
+	SPU_SCHED_EXITING = 0,
 };
 
 struct spu_context {
@@ -50,16 +50,17 @@ struct spu_context {
 	spinlock_t mmio_lock;		  /* protects mmio access */
 	struct address_space *local_store; /* local store mapping.  */
 	struct address_space *mfc;	   /* 'mfc' area mappings. */
-	struct address_space *cntl; 	   /* 'control' area mappings. */
-	struct address_space *signal1; 	   /* 'signal1' area mappings. */
-	struct address_space *signal2; 	   /* 'signal2' area mappings. */
-	struct address_space *mss; 	   /* 'mss' area mappings. */
-	struct address_space *psmap; 	   /* 'psmap' area mappings. */
+	struct address_space *cntl;	   /* 'control' area mappings. */
+	struct address_space *signal1;	   /* 'signal1' area mappings. */
+	struct address_space *signal2;	   /* 'signal2' area mappings. */
+	struct address_space *mss;	   /* 'mss' area mappings. */
+	struct address_space *psmap;	   /* 'psmap' area mappings. */
+	spinlock_t mapping_lock;
 	u64 object_id;		   /* user space pointer for oprofile */
 
 	enum { SPU_STATE_RUNNABLE, SPU_STATE_SAVED } state;
 	struct mutex state_mutex;
-	struct semaphore run_sema;
+	struct mutex run_mutex;
 
 	struct mm_struct *owner;
 
@@ -140,6 +141,7 @@ struct spu_context_ops {
 			       struct spu_dma_info * info);
 	void (*proxydma_info_read) (struct spu_context * ctx,
 				    struct spu_proxydma_info * info);
+	void (*restart_dma)(struct spu_context *ctx);
 };
 
 extern struct spu_context_ops spu_hw_ops;
@@ -149,6 +151,7 @@ struct spufs_inode_info {
 	struct spu_context *i_ctx;
 	struct spu_gang *i_gang;
 	struct inode vfs_inode;
+	int i_openers;
 };
 #define SPUFS_I(inode) \
 	container_of(inode, struct spufs_inode_info, vfs_inode)
@@ -170,6 +173,9 @@ int put_spu_gang(struct spu_gang *gang);
 void spu_gang_remove_ctx(struct spu_gang *gang, struct spu_context *ctx);
 void spu_gang_add_ctx(struct spu_gang *gang, struct spu_context *ctx);
 
+/* fault handling */
+int spufs_handle_class1(struct spu_context *ctx);
+
 /* context management */
 static inline void spu_acquire(struct spu_context *ctx)
 {
@@ -190,7 +196,6 @@ void spu_unmap_mappings(struct spu_context *ctx);
 void spu_forget(struct spu_context *ctx);
 int spu_acquire_runnable(struct spu_context *ctx, unsigned long flags);
 void spu_acquire_saved(struct spu_context *ctx);
-int spu_acquire_exclusive(struct spu_context *ctx);
 
 int spu_activate(struct spu_context *ctx, unsigned long flags);
 void spu_deactivate(struct spu_context *ctx);
@@ -218,14 +223,13 @@ extern char *isolated_loader;
 		prepare_to_wait(&(wq), &__wait, TASK_INTERRUPTIBLE);	\
 		if (condition)						\
 			break;						\
-		if (!signal_pending(current)) {				\
-			spu_release(ctx);				\
-			schedule();					\
-			spu_acquire(ctx);				\
-			continue;					\
+		if (signal_pending(current)) {				\
+			__ret = -ERESTARTSYS;				\
+			break;						\
 		}							\
-		__ret = -ERESTARTSYS;					\
-		break;							\
+		spu_release(ctx);					\
+		schedule();						\
+		spu_acquire(ctx);					\
 	}								\
 	finish_wait(&(wq), &__wait);					\
 	__ret;								\
diff --git a/arch/powerpc/platforms/cell/spufs/switch.c b/arch/powerpc/platforms/cell/spufs/switch.c
index fd91c73..8347c4a 100644
--- a/arch/powerpc/platforms/cell/spufs/switch.c
+++ b/arch/powerpc/platforms/cell/spufs/switch.c
@@ -2084,6 +2084,10 @@ int spu_save(struct spu_state *prev, struct spu *spu)
 	int rc;
 
 	acquire_spu_lock(spu);	        /* Step 1.     */
+	prev->dar = spu->dar;
+	prev->dsisr = spu->dsisr;
+	spu->dar = 0;
+	spu->dsisr = 0;
 	rc = __do_spu_save(prev, spu);	/* Steps 2-53. */
 	release_spu_lock(spu);
 	if (rc != 0 && rc != 2 && rc != 6) {
@@ -2109,9 +2113,9 @@ int spu_restore(struct spu_state *new, struct spu *spu)
 
 	acquire_spu_lock(spu);
 	harvest(NULL, spu);
-	spu->dar = 0;
-	spu->dsisr = 0;
 	spu->slb_replace = 0;
+	new->dar = 0;
+	new->dsisr = 0;
 	spu->class_0_pending = 0;
 	rc = __do_spu_restore(new, spu);
 	release_spu_lock(spu);
diff --git a/include/asm-powerpc/mmu.h b/include/asm-powerpc/mmu.h
index 200055a..e22fd88 100644
--- a/include/asm-powerpc/mmu.h
+++ b/include/asm-powerpc/mmu.h
@@ -234,6 +234,7 @@ extern int __hash_page_64K(unsigned long ea, unsigned long access,
 			   unsigned long vsid, pte_t *ptep, unsigned long trap,
 			   unsigned int local);
 struct mm_struct;
+extern int hash_page(unsigned long ea, unsigned long access, unsigned long trap);
 extern int hash_huge_page(struct mm_struct *mm, unsigned long access,
 			  unsigned long ea, unsigned long vsid, int local,
 			  unsigned long trap);
diff --git a/include/asm-powerpc/spu_csa.h b/include/asm-powerpc/spu_csa.h
index 8aad061..02e56a6 100644
--- a/include/asm-powerpc/spu_csa.h
+++ b/include/asm-powerpc/spu_csa.h
@@ -242,6 +242,7 @@ struct spu_state {
 	u64 spu_chnldata_RW[32];
 	u32 spu_mailbox_data[4];
 	u32 pu_mailbox_data[1];
+	u64 dar, dsisr;
 	unsigned long suspend_time;
 	spinlock_t register_lock;
 };


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3107
retrieving revision 1.3108
diff -u -r1.3107 -r1.3108
--- kernel-2.6.spec	24 Apr 2007 11:00:17 -0000	1.3107
+++ kernel-2.6.spec	24 Apr 2007 17:03:10 -0000	1.3108
@@ -409,6 +409,7 @@
 Patch306: linux-2.6-powerpc-reserve-initrd-1.patch
 Patch307: linux-2.6-powerpc-reserve-initrd-2.patch
 Patch308: linux-2.6-cell-spu-device-tree.patch
+Patch309: linux-2.6-cell-spufs-fixes.patch
 
 Patch310: linux-2.6-common-uevent.patch
 Patch311: linux-2.6-uevent-macio.patch
@@ -1058,6 +1059,7 @@
 %patch306 -p1
 %patch307 -p1
 %patch308 -p1
+%patch309 -p1
 
 # uevent support for of_platform device
 %patch310 -p1
@@ -2334,6 +2336,7 @@
 %changelog
 * Tue Apr 24 2007 David Woodhouse <dwmw2 at redhat.com>
 - Support proper device-tree layout for Cell SPUs
+- Cell spufs fixes
 
 * Mon Apr 23 2007 Dave Jones <davej at redhat.com>
 - 2.6.21-rc7-git6

linux-2.6-ps3-wrap-spu-runctl.patch:
 arch/powerpc/platforms/cell/spu_manage.c        |   15 +++++++++++++++
 arch/powerpc/platforms/cell/spufs/backing_ops.c |    6 ++++++
 arch/powerpc/platforms/cell/spufs/hw_ops.c      |   10 ++++++++++
 arch/powerpc/platforms/cell/spufs/run.c         |    4 ++--
 arch/powerpc/platforms/cell/spufs/spufs.h       |    1 +
 arch/powerpc/platforms/ps3/spu.c                |   14 ++++++++++++++
 include/asm-powerpc/spu_priv1.h                 |   15 +++++++++++++++
 7 files changed, 63 insertions(+), 2 deletions(-)

Index: linux-2.6-ps3-wrap-spu-runctl.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-ps3-wrap-spu-runctl.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-ps3-wrap-spu-runctl.patch	21 Apr 2007 22:15:46 -0000	1.2
+++ linux-2.6-ps3-wrap-spu-runctl.patch	24 Apr 2007 17:03:10 -0000	1.3
@@ -31,16 +31,6 @@
  include/asm-powerpc/spu_priv1.h                 |   14 ++++++++++++++
  8 files changed, 63 insertions(+), 2 deletions(-)
 
---- ps3-linux-dev.orig/arch/powerpc/platforms/cell/spu_base.c
-+++ ps3-linux-dev/arch/powerpc/platforms/cell/spu_base.c
-@@ -39,6 +39,7 @@ const struct spu_management_ops *spu_man
- const struct spu_priv1_ops *spu_priv1_ops;
- 
- EXPORT_SYMBOL_GPL(spu_priv1_ops);
-+EXPORT_SYMBOL_GPL(spu_management_ops);
- 
- static int __spu_trap_invalid_dma(struct spu *spu)
- {
 --- ps3-linux-dev.orig/arch/powerpc/platforms/cell/spu_manage.c
 +++ ps3-linux-dev/arch/powerpc/platforms/cell/spu_manage.c
 @@ -35,6 +35,7 @@



From fedora-cvs-commits at redhat.com  Tue Apr 24 17:58:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 13:58:21 -0400
Subject: rpms/postgresql-jdbc/devel postgresql-jdbc-version.patch, NONE,
	1.1 postgresql-jdbc.spec, 1.11, 1.12
Message-ID: <200704241758.l3OHwLus030809@cvs.devel.redhat.com>

Author: tgl

Update of /cvs/dist/rpms/postgresql-jdbc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30793

Modified Files:
	postgresql-jdbc.spec 
Added Files:
	postgresql-jdbc-version.patch 
Log Message:
Work around 1.4 vs 1.5 versioning inconsistency

postgresql-jdbc-version.patch:
 build.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE postgresql-jdbc-version.patch ---
Workaround for problem that ant's java.specification.version reports 1.5
but that's not the default source for <javac> as of F7.  This will probably
be fixed by a cleaner upstream change, but for now, just force it.


diff -Naur postgresql-jdbc-8.2-505.src.orig/build.xml postgresql-jdbc-8.2-505.src/build.xml
--- postgresql-jdbc-8.2-505.src.orig/build.xml	2006-11-28 23:00:15.000000000 -0500
+++ postgresql-jdbc-8.2-505.src/build.xml	2007-04-24 13:31:29.000000000 -0400
@@ -112,7 +112,7 @@
     <available classname="org.postgresql.Driver" property="old.driver.present" />
     <fail message="Old driver was detected on classpath or in jre/lib/ext, please remove and try again." if="old.driver.present" />
 
-    <javac classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">
+    <javac classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}" source="1.5">
       <!-- This is the core of the driver.  It is common for all versions. -->
        <include name="${package}/*.java" />
        <include name="${package}/core/**" />
@@ -386,7 +386,7 @@
   <target name="testjar" depends="jar">
     <fail message="JUnit could not be found in your classpath.  You must download and install it from http://junit.org to build and run the test suite." unless="junit" />
     <mkdir dir="${builddir}/tests"/>
-    <javac srcdir="${srcdir}" destdir="${builddir}/tests" debug="${debug}">
+    <javac srcdir="${srcdir}" destdir="${builddir}/tests" debug="${debug}" source="1.5">
       <include name="${package}/test/**" />
 
       <exclude name="${package}/test/jdbc2/optional/**" unless="jdbc2optionaltests" />


Index: postgresql-jdbc.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql-jdbc/devel/postgresql-jdbc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- postgresql-jdbc.spec	23 Apr 2007 22:28:57 -0000	1.11
+++ postgresql-jdbc.spec	24 Apr 2007 17:58:19 -0000	1.12
@@ -45,6 +45,7 @@
 URL:		http://jdbc.postgresql.org/
 
 Source0:	http://jdbc.postgresql.org/download/%{name}-%{upstreamver}.src.tar.gz
+Patch1:		postgresql-jdbc-version.patch
 
 %if ! %{gcj_support}
 BuildArch:	noarch
@@ -77,6 +78,8 @@
 # remove any binary libs
 find -name "*.jar" -or -name "*.class" | xargs rm -f
 
+%patch1 -p1
+
 %build
 export OPT_JAR_LIST="ant/ant-junit junit"
 export CLASSPATH=
@@ -128,8 +131,9 @@
 %endif
 
 %changelog
-* Mon Apr 23 2007 Tom Lane <tgl at redhat.com> 8.2.505-1jpp
+* Tue Apr 24 2007 Tom Lane <tgl at redhat.com> 8.2.505-1jpp
 - Update to build 8.2-505
+- Work around 1.4 vs 1.5 versioning inconsistency
 
 * Fri Dec 15 2006 Tom Lane <tgl at redhat.com> 8.2.504-1jpp
 - Update to build 8.2-504



From fedora-cvs-commits at redhat.com  Tue Apr 24 18:11:17 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 14:11:17 -0400
Subject: rpms/redhat-artwork/devel index.theme.icon, 1.1,
	1.2 redhat-artwork.spec, 1.179, 1.180
Message-ID: <200704241811.l3OIBHg3031260@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	index.theme.icon redhat-artwork.spec 
Log Message:
Inherit Bluecurve icons, too



Index: index.theme.icon
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/index.theme.icon,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.theme.icon	20 Apr 2007 06:59:27 -0000	1.1
+++ index.theme.icon	24 Apr 2007 18:11:15 -0000	1.2
@@ -1,7 +1,9 @@
 [Icon Theme]
 Name=Fedora
 Comment=Fedora Icon Theme
-Inherits=Mist
+# use Mist until Echo is ready
+# Bluecurve is here for the OpenOffice.org icons
+Inherits=Mist,Bluecurve
 Example=x-directory-normal
 
 # KDE Specific Stuff


Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- redhat-artwork.spec	20 Apr 2007 06:59:27 -0000	1.179
+++ redhat-artwork.spec	24 Apr 2007 18:11:15 -0000	1.180
@@ -7,7 +7,7 @@
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
 Version: 5.0.12
-Release: 5%{?dist} 
+Release: 6%{?dist} 
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
@@ -433,6 +433,9 @@
 %ghost %{_datadir}/icons/Fedora/icon-theme.cache
 
 %changelog
+* Tue Apr 24 2007 Matthias Clasen <mclasen at redhat.com> 5.0.12-6
+- Inherit the Bluecurve icon theme, too 
+
 * Thu Apr 19 2007 Matthias Clasen <mclasen at redhat.com> 5.0.12-5
 - Add a Fedora metatheme 
 - Add a Fedora icon theme 



From fedora-cvs-commits at redhat.com  Tue Apr 24 18:43:39 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 14:43:39 -0400
Subject: rpms/perl/devel perl.spec,1.111,1.112
Message-ID: <200704241843.l3OIhdbq021641@cvs.devel.redhat.com>

Author: rnorwood

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

Modified Files:
	perl.spec 
Log Message:
related: bz#226276 - properly version Provides: cpan, fix %{libdir} issues


Index: perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- perl.spec	18 Apr 2007 20:05:08 -0000	1.111
+++ perl.spec	24 Apr 2007 18:43:37 -0000	1.112
@@ -20,7 +20,7 @@
 
 Name:           perl
 Version:        5.8.8
-Release:        16.2%{?dist}
+Release:        16.3%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        The Perl programming language
 Group:          Development/Languages
@@ -220,7 +220,7 @@
 Epoch:          0
 Version:        1.76_02
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
-Provides:	cpan
+Provides:	cpan-%{version}
 
 %description CPAN
 Query, download and build perl modules from CPAN sites.
@@ -548,28 +548,28 @@
 %exclude %{_mandir}/man3/CPAN*
 
 # ExtUtils-Embed
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Embed.pm
+%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/Embed.pm
 %exclude %{_mandir}/man3/ExtUtils::Embed*
 
 # ExtUtils-MakeMaker
 %exclude %{_bindir}/instmodsh
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Command/
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Install.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Installed.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Liblist/
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Liblist.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MakeMaker/
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MakeMaker.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MANIFEST.SKIP
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MM*.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MY.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Manifest.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Mkbootstrap.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Mksymlists.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/NOTES
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Packlist.pm
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/PATCHING
-%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/testlib.pm
+%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/Command/
+%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/Install.pm
+%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/Installed.pm
+%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/Liblist/
+%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/Liblist.pm
+%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/MakeMaker/
+%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/MakeMaker.pm
+%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/MANIFEST.SKIP
+%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/MM*.pm
+%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/MY.pm
+%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/Manifest.pm
+%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/Mkbootstrap.pm
+%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/Mksymlists.pm
+%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/NOTES
+%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/Packlist.pm
+%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/PATCHING
+%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/testlib.pm
 %exclude %{_mandir}/man1/instmodsh.1*
 %exclude %{_mandir}/man3/ExtUtils::Command::MM*
 %exclude %{_mandir}/man3/ExtUtils::Install.3*
@@ -586,15 +586,15 @@
 
 # Test::Harness
 %exclude %{_bindir}/prove
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Test/Harness*
+%exclude %{_libdir}/perl5/%{perl_version}/Test/Harness*
 %exclude %{_mandir}/man1/prove.1*
 %exclude %{_mandir}/man3/Test::Harness*
 
 # Test::Simple
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Test/More*
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Test/Builder*
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Test/Simple*
-%exclude %{_prefix}/lib/perl5/%{perl_version}/Test/Tutorial*
+%exclude %{_libdir}/perl5/%{perl_version}/Test/More*
+%exclude %{_libdir}/perl5/%{perl_version}/Test/Builder*
+%exclude %{_libdir}/perl5/%{perl_version}/Test/Simple*
+%exclude %{_libdir}/perl5/%{perl_version}/Test/Tutorial*
 %exclude %{_mandir}/man3/Test::More*
 %exclude %{_mandir}/man3/Test::Builder*
 %exclude %{_mandir}/man3/Test::Simple*



From fedora-cvs-commits at redhat.com  Tue Apr 24 18:51:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 14:51:23 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.14,
	1.15 policycoreutils.spec, 1.405, 1.406
Message-ID: <200704241851.l3OIpNld027314@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Tue Apr 24 2007 Dan Walsh <dwalsh at redhat.com> 2.0.10-2
- Fixes for polgengui


policycoreutils-gui.patch:
 Makefile                    |   34 
 booleansPage.py             |  224 +++
 fcontextPage.py             |  207 +++
 loginsPage.py               |  173 ++
 mappingsPage.py             |   54 
 modulesPage.py              |  172 ++
 polgen.glade                | 1168 ++++++++++++++++
 polgen.py                   |  455 ++++++
 polgengui.py                |  253 +++
 portsPage.py                |  227 +++
 selinux.tbl                 |  274 +++
 semanagePage.py             |  115 +
 statusPage.py               |  220 +++
 system-config-selinux.glade | 3034 ++++++++++++++++++++++++++++++++++++++++++++
 system-config-selinux.py    |  169 ++
 templates/__init__.py       |   18 
 templates/executable.py     |  156 ++
 templates/network.py        |   44 
 templates/rw.py             |  104 +
 templates/script.py         |   42 
 templates/semodule.py       |   41 
 templates/tmp.py            |   72 +
 templates/var_lib.py        |  137 +
 templates/var_log.py        |   89 +
 templates/var_run.py        |   95 +
 templates/var_spool.py      |  105 +
 translationsPage.py         |  111 +
 usersPage.py                |  166 ++
 28 files changed, 7959 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- policycoreutils-gui.patch	19 Apr 2007 13:38:40 -0000	1.14
+++ policycoreutils-gui.patch	24 Apr 2007 18:51:20 -0000	1.15
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.9/gui/booleansPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.10/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/booleansPage.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.10/gui/booleansPage.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,224 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -226,9 +226,9 @@
 +
 +        setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val)
 +        commands.getstatusoutput(setsebool)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.9/gui/fcontextPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.10/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/fcontextPage.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.10/gui/fcontextPage.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,207 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -437,9 +437,9 @@
 +        self.store.set_value(iter, SPEC_COL, fspec)
 +        self.store.set_value(iter, FTYPE_COL, ftype)
 +        self.store.set_value(iter, TYPE_COL, "system_u:object_r:%s:%s" % (type, mls))
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.9/gui/loginsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.10/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/loginsPage.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.10/gui/loginsPage.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,173 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -614,9 +614,9 @@
 +        self.store.set_value(iter, 1, seuser)
 +        self.store.set_value(iter, 2, seobject.translate(serange))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.9/gui/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.10/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/Makefile	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.10/gui/Makefile	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,34 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -652,9 +652,9 @@
 +indent:
 +
 +relabel:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.9/gui/mappingsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.10/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/mappingsPage.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.10/gui/mappingsPage.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,54 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -710,9 +710,9 @@
 +        for k in keys:
 +            print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1]))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.9/gui/modulesPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.10/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/modulesPage.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.10/gui/modulesPage.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,172 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -886,10 +886,10 @@
 +        
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.9/gui/polgen.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.10/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/polgen.glade	2007-04-18 15:15:26.000000000 -0400
-@@ -0,0 +1,1167 @@
++++ policycoreutils-2.0.10/gui/polgen.glade	2007-04-24 14:49:29.000000000 -0400
+@@ -0,0 +1,1168 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 +
@@ -923,6 +923,7 @@
 +	  <property name="border_width">4</property>
 +	  <property name="visible">True</property>
 +	  <property name="show_help">False</property>
++	  <signal name="cancel" handler="on_druid_cancel" last_modification_time="Tue, 24 Apr 2007 18:48:08 GMT"/>
 +
 +	  <child>
 +	    <widget class="GnomeDruidPageEdge" id="druidpagestart1">
@@ -2057,9 +2058,9 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.9/gui/polgengui.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.10/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/polgengui.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.10/gui/polgengui.py	2007-04-24 14:49:20.000000000 -0400
 @@ -0,0 +1,253 @@
 +#!/usr/bin/python
 +#
@@ -2128,7 +2129,7 @@
 +class childWindow:
 +    def __init__(self):
 +        self.xml = xml
-+        xml.signal_connect("on_close_clicked", self.quit)
++        xml.signal_connect("on_druid_cancel", self.quit)
 +        xml.signal_connect("on_delete_clicked", self.delete)
 +        xml.signal_connect("on_exec_select_clicked", self.exec_select)
 +        xml.signal_connect("on_add_clicked", self.add)
@@ -2314,9 +2315,9 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.9/gui/polgen.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.10/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/polgen.py	2007-04-18 15:18:32.000000000 -0400
++++ policycoreutils-2.0.10/gui/polgen.py	2007-04-24 14:44:30.000000000 -0400
 @@ -0,0 +1,455 @@
 +#! /usr/bin/python
 +# Copyright (C) 2007 Red Hat 
@@ -2611,7 +2612,7 @@
 +		newif = re.sub("TEMPLATETYPE", self.name, executable.if_rules)
 +		
 +		for d in self.DEFAULT_DIRS:
-+			if self.DEFAULT_DIRS[d][1] > 0:
++			if len(self.DEFAULT_DIRS[d][1]) > 0:
 +				newif += re.sub("TEMPLATETYPE", self.name, self.DEFAULT_DIRS[d][2].if_rules)
 +                                for i in self.DEFAULT_DIRS[d][1]:
 +                                        if os.path.exists(i) and stat.S_ISSOCK(os.stat(i)[stat.ST_MODE]):
@@ -2773,9 +2774,9 @@
 +    sys.exit(0)
 +    
 +	
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.9/gui/portsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.10/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/portsPage.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.10/gui/portsPage.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,227 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -3004,9 +3005,9 @@
 +        self.store.set_value(iter, MLS_COL, mls)
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.9/gui/selinux.tbl
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.10/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/selinux.tbl	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.10/gui/selinux.tbl	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,274 @@
 +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
 +allow_cvs_read_shadow  _("CVS") _("Allow cvs daemon to read shadow")
@@ -3282,9 +3283,9 @@
 +webadm_manage_users_files _("HTTPD Service") _("Allow httpd to access nfs file systems.")
 +webadm_read_users_files _("HTTPD Service") _("Allow httpd to access nfs file systems.")
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.9/gui/semanagePage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.10/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/semanagePage.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.10/gui/semanagePage.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,115 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -3401,9 +3402,9 @@
 +        self.dialog.hide()
 +
 +    
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.9/gui/statusPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.10/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/statusPage.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.10/gui/statusPage.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,220 @@
 +## statusPage.py - show selinux status
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -3625,9 +3626,9 @@
 +        return self.types[self.selinuxTypeOptionMenu.get_active()]
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.9/gui/system-config-selinux.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.10/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/system-config-selinux.glade	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.10/gui/system-config-selinux.glade	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,3034 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -6663,9 +6664,9 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.9/gui/system-config-selinux.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.10/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/system-config-selinux.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.10/gui/system-config-selinux.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,169 @@
 +#!/usr/bin/python
 +#
@@ -6836,9 +6837,9 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.9/gui/templates/executable.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.10/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/executable.py	2007-04-18 13:13:36.000000000 -0400
++++ policycoreutils-2.0.10/gui/templates/executable.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,156 @@
 +#! /usr/bin/env python
 +# Copyright (C) 2007 Red Hat 
@@ -6996,9 +6997,9 @@
 +EXECUTABLE		--	gen_context(system_u:object_r:TEMPLATETYPE_exec_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.9/gui/templates/__init__.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.10/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/__init__.py	2007-04-18 13:13:36.000000000 -0400
++++ policycoreutils-2.0.10/gui/templates/__init__.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -7018,9 +7019,9 @@
 +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 +#
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.9/gui/templates/network.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.10/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/network.py	2007-04-18 15:15:55.000000000 -0400
++++ policycoreutils-2.0.10/gui/templates/network.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,44 @@
 +te_port_types="""\
 +type TEMPLATETYPE_port_t;
@@ -7066,9 +7067,9 @@
 +allow TEMPLATETYPE_t TEMPLATETYPE_port_t:udp_socket name_bind;
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.9/gui/templates/rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.10/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/rw.py	2007-04-18 13:13:36.000000000 -0400
++++ policycoreutils-2.0.10/gui/templates/rw.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,104 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7174,9 +7175,9 @@
 +fc_dir="""
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.9/gui/templates/script.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.10/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/script.py	2007-04-18 13:13:36.000000000 -0400
++++ policycoreutils-2.0.10/gui/templates/script.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,42 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7220,9 +7221,9 @@
 +/usr/sbin/semanage port -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.9/gui/templates/semodule.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.10/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/semodule.py	2007-04-18 13:13:36.000000000 -0400
++++ policycoreutils-2.0.10/gui/templates/semodule.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7265,9 +7266,9 @@
 +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.9/gui/templates/tmp.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.10/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/tmp.py	2007-04-18 13:13:36.000000000 -0400
++++ policycoreutils-2.0.10/gui/templates/tmp.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,72 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7341,9 +7342,9 @@
 +	dontaudit $1 TEMPLATETYPE_tmp_t:file r_file_perms;
 +')
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.9/gui/templates/var_lib.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.10/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_lib.py	2007-04-18 13:13:36.000000000 -0400
++++ policycoreutils-2.0.10/gui/templates/var_lib.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,137 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7482,9 +7483,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.9/gui/templates/var_log.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.10/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_log.py	2007-04-18 13:13:36.000000000 -0400
++++ policycoreutils-2.0.10/gui/templates/var_log.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,89 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7575,9 +7576,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.9/gui/templates/var_run.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.10/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_run.py	2007-04-18 13:13:36.000000000 -0400
++++ policycoreutils-2.0.10/gui/templates/var_run.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,95 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7674,9 +7675,9 @@
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.9/gui/templates/var_spool.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.10/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_spool.py	2007-04-19 09:35:34.000000000 -0400
++++ policycoreutils-2.0.10/gui/templates/var_spool.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,105 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7783,9 +7784,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.9/gui/translationsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.10/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/translationsPage.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.10/gui/translationsPage.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,111 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -7898,9 +7899,9 @@
 +        store, iter = self.view.get_selection().get_selected()
 +        self.store.set_value(iter, 0, level)
 +        self.store.set_value(iter, 1, translation)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.9/gui/usersPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.10/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/usersPage.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.10/gui/usersPage.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,166 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -r1.405 -r1.406
--- policycoreutils.spec	24 Apr 2007 14:44:07 -0000	1.405
+++ policycoreutils.spec	24 Apr 2007 18:51:20 -0000	1.406
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 2.0.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Tue Apr 24 2007 Dan Walsh <dwalsh at redhat.com> 2.0.10-2
+- Fixes for polgengui
+
 * Tue Apr 24 2007 Dan Walsh <dwalsh at redhat.com> 2.0.10-1
 - Updated version of policycoreutils
 	* Merged chcat, fixfiles, genhomedircon, restorecond, and restorecon patches from Dan Walsh.



From fedora-cvs-commits at redhat.com  Tue Apr 24 19:21:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 15:21:42 -0400
Subject: rpms/postgresql/devel .cvsignore, 1.35, 1.36 postgresql.spec, 1.76,
	1.77 sources, 1.36, 1.37
Message-ID: <200704241921.l3OJLgv0017180@cvs.devel.redhat.com>

Author: tgl

Update of /cvs/dist/rpms/postgresql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17138

Modified Files:
	.cvsignore postgresql.spec sources 
Log Message:
Update to PostgreSQL 8.2.4 for CVE-2007-2138, data loss bugs
Resolves: #237682


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/postgresql/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	7 Feb 2007 14:58:38 -0000	1.35
+++ .cvsignore	24 Apr 2007 19:21:40 -0000	1.36
@@ -1,4 +1,4 @@
-postgresql-8.2.3.tar.bz2
+postgresql-8.2.4.tar.bz2
 PyGreSQL-3.8.1.tgz
 pgtcl1.5.3.tar.gz
 pgtcldocs-20060909.zip


Index: postgresql.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- postgresql.spec	14 Feb 2007 16:45:46 -0000	1.76
+++ postgresql.spec	24 Apr 2007 19:21:40 -0000	1.77
@@ -78,10 +78,10 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 
-Summary: PostgreSQL client programs and libraries.
+Summary: PostgreSQL client programs and libraries
 Name: postgresql
-Version: 8.2.3
-Release: 2%{?dist}
+Version: 8.2.4
+Release: 1%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -106,42 +106,42 @@
 Patch6: postgresql-perl-rpath.patch
 Patch8: postgresql-prefer-ncurses.patch
 
-Buildrequires: perl glibc-devel bison flex autoconf
+BuildRequires: perl glibc-devel bison flex autoconf
 Prereq: /sbin/ldconfig initscripts
 
 %if %python || %plpython
-BuildPrereq: python-devel
+BuildRequires: python-devel
 %endif
 
 %if %tcl || %pltcl
-BuildPrereq: tcl
+BuildRequires: tcl
 %if %tcldevel
-Buildrequires: tcl-devel
+BuildRequires: tcl-devel
 %endif
 %endif
 
-BuildPrereq: readline-devel
-BuildPrereq: zlib-devel >= 1.0.4
+BuildRequires: readline-devel
+BuildRequires: zlib-devel >= 1.0.4
 
 %if %ssl
-BuildPrereq: openssl-devel
+BuildRequires: openssl-devel
 %endif
 
 %if %kerberos
-BuildPrereq: krb5-devel
-BuildPrereq: e2fsprogs-devel
+BuildRequires: krb5-devel
+BuildRequires: e2fsprogs-devel
 %endif
 
 %if %nls
-BuildPrereq: gettext >= 0.10.35
+BuildRequires: gettext >= 0.10.35
 %endif
 
 %if %xml
-BuildPrereq: libxml2-devel libxslt-devel
+BuildRequires: libxml2-devel libxslt-devel
 %endif
 
 %if %pam
-BuildPrereq: pam-devel
+BuildRequires: pam-devel
 %endif
 
 Obsoletes: postgresql-clients
@@ -170,7 +170,7 @@
 if you're installing the postgresql-server package.
 
 %package libs
-Summary: The shared libraries required for any PostgreSQL clients.
+Summary: The shared libraries required for any PostgreSQL clients
 Group: Applications/Databases
 Provides: libpq.so
 Obsoletes: rh-postgresql-libs
@@ -182,7 +182,7 @@
 PostgreSQL server.
 
 %package server
-Summary: The programs needed to create and run a PostgreSQL server.
+Summary: The programs needed to create and run a PostgreSQL server
 Group: Applications/Databases
 Prereq: /usr/sbin/useradd /sbin/chkconfig 
 Prereq: postgresql = %{version}-%{release} libpq.so
@@ -224,7 +224,7 @@
 
 
 %package devel
-Summary: PostgreSQL development header files and libraries.
+Summary: PostgreSQL development header files and libraries
 Group: Development/Libraries
 Prereq: postgresql = %{version}-%{release}
 Requires: postgresql-libs = %{version}-%{release}
@@ -240,7 +240,7 @@
 #------------
 %if %plperl
 %package plperl
-Summary: The Perl procedural language for PostgreSQL.
+Summary: The Perl procedural language for PostgreSQL
 Group: Applications/Databases
 PreReq: postgresql = %{version}-%{release}
 PreReq: postgresql-server = %{version}-%{release}
@@ -256,7 +256,7 @@
 #------------
 %if %plpython
 %package plpython
-Summary: The Python procedural language for PostgreSQL.
+Summary: The Python procedural language for PostgreSQL
 Group: Applications/Databases
 PreReq: postgresql = %{version}-%{release}
 PreReq: postgresql-server = %{version}-%{release}
@@ -272,7 +272,7 @@
 #------------
 %if %pltcl
 %package pltcl
-Summary: The Tcl procedural language for PostgreSQL.
+Summary: The Tcl procedural language for PostgreSQL
 Group: Applications/Databases
 PreReq: postgresql = %{version}-%{release}
 PreReq: postgresql-server = %{version}-%{release}
@@ -288,7 +288,7 @@
 #------------
 %if %tcl
 %package tcl
-Summary: A Tcl client library for PostgreSQL.
+Summary: A Tcl client library for PostgreSQL
 Group: Applications/Databases
 Requires: libpq.so
 Requires: tcl >= 8.3
@@ -303,7 +303,7 @@
 #------------
 %if %python
 %package python
-Summary: Development module for Python code to access a PostgreSQL DB.
+Summary: Development module for Python code to access a PostgreSQL DB
 Group: Applications/Databases
 Requires: libpq.so
 Requires: python mx
@@ -319,7 +319,7 @@
 #----------
 %if %test
 %package test
-Summary: The test suite distributed with PostgreSQL.
+Summary: The test suite distributed with PostgreSQL
 Group: Applications/Databases
 PreReq: postgresql = %{version}-%{release}
 PreReq: postgresql-server = %{version}-%{release}
@@ -822,6 +822,10 @@
 %endif
 
 %changelog
+* Tue Apr 24 2007 Tom Lane <tgl at redhat.com> 8.2.4-1
+- Update to PostgreSQL 8.2.4 for CVE-2007-2138, data loss bugs
+Resolves: #237682
+
 * Wed Feb 14 2007 Karsten Hopp <karsten at redhat.com> 8.2.3-2
 - rebuild with tcl-8.4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/postgresql/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	7 Feb 2007 14:58:38 -0000	1.36
+++ sources	24 Apr 2007 19:21:40 -0000	1.37
@@ -1,4 +1,4 @@
-cb47771004d53505200ffd00ac45bc32  postgresql-8.2.3.tar.bz2
+af7ec100a33c41bfb8d87b5e0ec2f44a  postgresql-8.2.4.tar.bz2
 5575979dac93c9c5795d7693a8f91c86  PyGreSQL-3.8.1.tgz
 43ad97c7dd108fb7a165b4755d8aec32  pgtcl1.5.3.tar.gz
 a71b4aced6b0b068335f8e040e5b9fb6  pgtcldocs-20060909.zip



From fedora-cvs-commits at redhat.com  Tue Apr 24 19:39:03 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 15:39:03 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1167,1.1168
Message-ID: <200704241939.l3OJd3Aj023801@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
remove gnome icons


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1167
retrieving revision 1.1168
diff -u -r1.1167 -r1.1168
--- openoffice.org.spec	18 Apr 2007 09:50:31 -0000	1.1167
+++ openoffice.org.spec	24 Apr 2007 19:39:00 -0000	1.1168
@@ -1,6 +1,6 @@
 %define oootag OOF680
 %define ooomilestone 14
-%define rh_rpm_release 6
+%define rh_rpm_release 7
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -1429,6 +1429,9 @@
 mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-math.desktop
 mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-draw.desktop
 rm -rf $RPM_BUILD_ROOT/%{instdir}/share/xdg
+#get rid of the gnome icons
+rm -rf sysui/unxlng*/misc/redhat/usr/share/icons/gnome
+#relocate the rest of them
 cp -r sysui/unxlng*/misc/redhat/usr/share/icons $RPM_BUILD_ROOT/%{_datadir}
 cp -r sysui/unxlng*/misc/redhat/usr/share/mime-info $RPM_BUILD_ROOT/%{_datadir}
 cp -r sysui/unxlng*/misc/redhat/usr/share/mimelnk $RPM_BUILD_ROOT/%{_datadir}
@@ -2161,7 +2164,7 @@
 
 %post core
 update-desktop-database -q %{_datadir}/applications
-for theme in hicolor locolor gnome; do
+for theme in hicolor locolor; do
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
     if test -d "%{_datadir}/icons/$theme"; then
       if test -f "%{_datadir}/icons/$theme/index.theme"; then
@@ -2174,7 +2177,7 @@
 
 %postun core
 update-desktop-database -q %{_datadir}/applications
-for theme in hicolor locolor gnome; do
+for theme in hicolor locolor; do
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
     if test -d "%{_datadir}/icons/$theme"; then
       if test -f "%{_datadir}/icons/$theme/index.theme"; then
@@ -2629,6 +2632,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Tue Apr 24 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.7-unreleased
+- remove gnome icons to that mist inheritance from bluecurve will give
+  the bluecurve panel icons
+
 * Tue Apr 17 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.6
 - merge openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch
 - Resolves: rhbz#235834 update font subpixel logic



From fedora-cvs-commits at redhat.com  Tue Apr 24 19:49:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 15:49:43 -0400
Subject: rpms/postgresql/FC-6 .cvsignore, 1.35, 1.36 postgresql.spec, 1.73,
	1.74 sources, 1.36, 1.37
Message-ID: <200704241949.l3OJnhU6024021@cvs.devel.redhat.com>

Author: tgl

Update of /cvs/dist/rpms/postgresql/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv24005

Modified Files:
	.cvsignore postgresql.spec sources 
Log Message:
Update to PostgreSQL 8.1.9 for CVE-2007-2138, data loss bugs
Resolves: #237682


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/postgresql/FC-6/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	7 Feb 2007 15:15:29 -0000	1.35
+++ .cvsignore	24 Apr 2007 19:49:40 -0000	1.36
@@ -1,4 +1,4 @@
-postgresql-8.1.8.tar.bz2
+postgresql-8.1.9.tar.bz2
 PyGreSQL-3.8.1.tgz
 pgtcl1.5.2.tar.gz
 pgtcldocs-20041108.zip


Index: postgresql.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql/FC-6/postgresql.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- postgresql.spec	7 Feb 2007 15:15:29 -0000	1.73
+++ postgresql.spec	24 Apr 2007 19:49:40 -0000	1.74
@@ -81,7 +81,7 @@
 
 Summary: PostgreSQL client programs and libraries.
 Name: postgresql
-Version: 8.1.8
+Version: 8.1.9
 Release: 1%{?dist}
 License: BSD
 Group: Applications/Databases
@@ -828,6 +828,10 @@
 %endif
 
 %changelog
+* Tue Apr 24 2007 Tom Lane <tgl at redhat.com> 8.1.9-1
+- Update to PostgreSQL 8.1.9 for CVE-2007-2138, data loss bugs
+Resolves: #237682
+
 * Wed Feb  7 2007 Tom Lane <tgl at redhat.com> 8.1.8-1
 - Update to PostgreSQL 8.1.8 due to regression induced by security fix
 Resolves: #227522


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/postgresql/FC-6/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	7 Feb 2007 15:15:29 -0000	1.36
+++ sources	24 Apr 2007 19:49:41 -0000	1.37
@@ -1,4 +1,4 @@
-b05e1d7f0cac9cc4e096aa21409dee55  postgresql-8.1.8.tar.bz2
+a8a3bd5cb45c4c2747d5218912a82cfc  postgresql-8.1.9.tar.bz2
 5575979dac93c9c5795d7693a8f91c86  PyGreSQL-3.8.1.tgz
 d19dfdcb54c334495d32456a043e0232  pgtcl1.5.2.tar.gz
 3d504b46231914d61fd49175f67e8715  pgtcldocs-20041108.zip



From fedora-cvs-commits at redhat.com  Tue Apr 24 20:02:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 16:02:53 -0400
Subject: rpms/evolution-data-server/FC-6
	evolution-data-server-1.8.3-apop-auth-vulnerability.patch,
	NONE, 1.1 evolution-data-server.spec, 1.140, 1.141
Message-ID: <200704242002.l3OK2rTN024623@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-1.8.3-apop-auth-vulnerability.patch 
Log Message:

* Tue Apr 24 2007 Matthew Barnes <mbarnes at redhat.com> - 1.8.3-5.fc6
- Add patch for RH bug #235290 (APOP authentication vulnerability).


evolution-data-server-1.8.3-apop-auth-vulnerability.patch:
 camel-pop3-store.c |   16 ++++++++++++++++
 1 files changed, 16 insertions(+)

--- NEW FILE evolution-data-server-1.8.3-apop-auth-vulnerability.patch ---
--- evolution-data-server-1.8.3/camel/providers/pop3/camel-pop3-store.c.apop-auth-vulnerability	2007-01-29 04:44:18.000000000 -0500
+++ evolution-data-server-1.8.3/camel/providers/pop3/camel-pop3-store.c	2007-04-24 15:58:21.000000000 -0400
@@ -34,6 +34,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
+#include <ctype.h>
 
 #include "camel-operation.h"
 
@@ -489,6 +490,21 @@
 	} else if (strcmp(service->url->authmech, "+APOP") == 0 && store->engine->apop) {
 		char *secret, md5asc[33], *d;
 		unsigned char md5sum[16], *s;
+
+		d = store->engine->apop;
+
+		while (*d != '\0') {
+			if (!isascii((int)*d)) {
+				camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
+						_("Unable to connect to POP server %s: "
+						"Invalid APOP ID received. Impersonation attack "
+						"suspected. Please contact your admin."),
+						CAMEL_SERVICE (store)->url->host);
+
+				return FALSE;
+			}
+			d++;
+		}
 		
 		secret = g_alloca(strlen(store->engine->apop)+strlen(service->url->passwd)+1);
 		sprintf(secret, "%s%s",  store->engine->apop, service->url->passwd);


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/FC-6/evolution-data-server.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- evolution-data-server.spec	9 Mar 2007 19:41:25 -0000	1.140
+++ evolution-data-server.spec	24 Apr 2007 20:02:51 -0000	1.141
@@ -25,7 +25,7 @@
 
 Name: evolution-data-server
 Version: 1.8.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -68,6 +68,9 @@
 # GNOME bug #415922
 Patch22: evolution-data-server-1.8.3-isa-support.patch
 
+# RH bug #235290 / GNOME bug #424373
+Patch23: evolution-data-server-1.8.3-apop-auth-vulnerability.patch
+
 ### Dependencies ###
 
 Requires: GConf2
@@ -158,6 +161,7 @@
 %patch20 -p1 -b .updated-zoneinfo
 %patch21 -p1 -b .local-calendar-crasher
 %patch22 -p1 -b .isa-support
+%patch23 -p1 -b .apop-auth-vulnerability
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -375,6 +379,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Tue Apr 24 2007 Matthew Barnes <mbarnes at redhat.com> - 1.8.3-5.fc6
+- Add patch for RH bug #235290 (APOP authentication vulnerability).
+
 * Fri Mar 09 2007 Matthew Barnes <mbarnes at redhat.com> - 1.8.3-4.fc6
 - Add patch for GNOME bug #363102 (local calendar crasher).
 - Add patch for GNOME bug #415922 (support MS ISA Server 2004).



From fedora-cvs-commits at redhat.com  Tue Apr 24 20:04:02 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 16:04:02 -0400
Subject: rpms/postgresql/FC-5 .cvsignore, 1.34, 1.35 postgresql.spec, 1.71,
	1.72 sources, 1.35, 1.36
Message-ID: <200704242004.l3OK42Jm024749@cvs.devel.redhat.com>

Author: tgl

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

Modified Files:
	.cvsignore postgresql.spec sources 
Log Message:
Update to PostgreSQL 8.1.9 for CVE-2007-2138, data loss bugs
Resolves: #237682


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/postgresql/FC-5/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	7 Feb 2007 15:33:04 -0000	1.34
+++ .cvsignore	24 Apr 2007 20:04:00 -0000	1.35
@@ -1,4 +1,4 @@
-postgresql-8.1.8.tar.bz2
+postgresql-8.1.9.tar.bz2
 PyGreSQL-3.8.1.tgz
 pgtcl1.5.2.tar.gz
 pgtcldocs-20041108.zip


Index: postgresql.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql/FC-5/postgresql.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- postgresql.spec	7 Feb 2007 15:33:04 -0000	1.71
+++ postgresql.spec	24 Apr 2007 20:04:00 -0000	1.72
@@ -81,7 +81,7 @@
 
 Summary: PostgreSQL client programs and libraries.
 Name: postgresql
-Version: 8.1.8
+Version: 8.1.9
 Release: 1%{?dist}
 License: BSD
 Group: Applications/Databases
@@ -826,6 +826,10 @@
 %endif
 
 %changelog
+* Tue Apr 24 2007 Tom Lane <tgl at redhat.com> 8.1.9-1
+- Update to PostgreSQL 8.1.9 for CVE-2007-2138, data loss bugs
+Resolves: #237682
+
 * Wed Feb  7 2007 Tom Lane <tgl at redhat.com> 8.1.8-1
 - Update to PostgreSQL 8.1.8 due to regression induced by security fix
 Resolves: #227522


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/postgresql/FC-5/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	7 Feb 2007 15:33:04 -0000	1.35
+++ sources	24 Apr 2007 20:04:00 -0000	1.36
@@ -1,4 +1,4 @@
-b05e1d7f0cac9cc4e096aa21409dee55  postgresql-8.1.8.tar.bz2
+a8a3bd5cb45c4c2747d5218912a82cfc  postgresql-8.1.9.tar.bz2
 5575979dac93c9c5795d7693a8f91c86  PyGreSQL-3.8.1.tgz
 d19dfdcb54c334495d32456a043e0232  pgtcl1.5.2.tar.gz
 3d504b46231914d61fd49175f67e8715  pgtcldocs-20041108.zip



From fedora-cvs-commits at redhat.com  Tue Apr 24 20:08:11 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 16:08:11 -0400
Subject: rpms/evolution-data-server/FC-5
	evolution-data-server-1.6.3-apop-auth-vulnerability.patch,
	NONE, 1.1 evolution-data-server.spec, 1.94, 1.95
Message-ID: <200704242008.l3OK8Bqt024969@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-1.6.3-apop-auth-vulnerability.patch 
Log Message:

* Tue Apr 24 2007 Matthew Barnes <mbarnes at redhat.com> - 1.6.3-3.fc5
- Add patch for RH bug #235290 (APOP authentication vulnerability).


evolution-data-server-1.6.3-apop-auth-vulnerability.patch:
 camel-pop3-store.c |   16 ++++++++++++++++
 1 files changed, 16 insertions(+)

--- NEW FILE evolution-data-server-1.6.3-apop-auth-vulnerability.patch ---
--- evolution-data-server-1.6.3/camel/providers/pop3/camel-pop3-store.c.apop-auth-vulnerability	2006-05-03 09:59:27.000000000 -0400
+++ evolution-data-server-1.6.3/camel/providers/pop3/camel-pop3-store.c	2007-04-24 16:05:15.000000000 -0400
@@ -34,6 +34,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
+#include <ctype.h>
 
 #include "camel-operation.h"
 
@@ -485,6 +486,21 @@
 	} else if (strcmp(service->url->authmech, "+APOP") == 0 && store->engine->apop) {
 		char *secret, md5asc[33], *d;
 		unsigned char md5sum[16], *s;
+
+		d = store->engine->apop;
+
+		while (*d != '\0') {
+			if (!isascii((int)*d)) {
+				camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
+						_("Unable to connect to POP server %s: "
+						"Invalid APOP ID received. Impersonation attack "
+						"suspected. Please contact your admin."),
+						CAMEL_SERVICE (store)->url->host);
+
+				return FALSE;
+			}
+			d++;
+		}
 		
 		secret = g_alloca(strlen(store->engine->apop)+strlen(service->url->passwd)+1);
 		sprintf(secret, "%s%s",  store->engine->apop, service->url->passwd);


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/FC-5/evolution-data-server.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- evolution-data-server.spec	6 Mar 2007 19:38:05 -0000	1.94
+++ evolution-data-server.spec	24 Apr 2007 20:08:09 -0000	1.95
@@ -22,7 +22,7 @@
 
 Name: evolution-data-server
 Version: 1.6.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for evolution
@@ -42,6 +42,9 @@
 # GNOME bug #301363
 Patch16: evolution-data-server-1.6.3-updated-zoneinfo.patch
 
+# RH bug #235290 / GNOME bug #424373
+Patch17: evolution-data-server-1.6.3-apop-auth-vulnerability.patch
+
 ### Dependencies ###
 
 Requires: GConf2
@@ -123,6 +126,7 @@
 %patch14 -p1 -b .validatehelo
 %patch15 -p1 -b .make_imap4_optional
 %patch16 -p1 -b .updated-zoneinfo
+%patch17 -p1 -b .apop-auth-vulnerability
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -323,6 +327,9 @@
 
 
 %changelog
+* Tue Apr 24 2007 Matthew Barnes <mbarnes at redhat.com> - 1.6.3-3.fc5
+- Add patch for RH bug #235290 (APOP authentication vulnerability).
+
 * Tue Mar 06 2007 Matthew Barnes <mbarnes at redhat.com> - 1.6.3-2.fc5
 - Add patch for GNOME bug #301363 (update timezones).
 



From fedora-cvs-commits at redhat.com  Tue Apr 24 20:15:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 16:15:53 -0400
Subject: rpms/evolution-data-server/devel
	evolution-data-server-1.10.1-apop-auth-vulnerability.patch,
	NONE, 1.1 evolution-data-server.spec, 1.159, 1.160
Message-ID: <200704242015.l3OKFrRB025220@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-1.10.1-apop-auth-vulnerability.patch 
Log Message:

* Tue Apr 24 2007 Matthew Barnes <mbarnes at redhat.com> - 1.10.1-2.fc7
- Add patch for RH bug #235290 (APOP authentication vulnerability).


evolution-data-server-1.10.1-apop-auth-vulnerability.patch:
 camel-pop3-store.c |   16 ++++++++++++++++
 1 files changed, 16 insertions(+)

--- NEW FILE evolution-data-server-1.10.1-apop-auth-vulnerability.patch ---
--- evolution-data-server-1.10.1/camel/providers/pop3/camel-pop3-store.c.apop-auth-vulnerability	2007-04-09 08:42:37.000000000 -0400
+++ evolution-data-server-1.10.1/camel/providers/pop3/camel-pop3-store.c	2007-04-24 16:12:28.000000000 -0400
@@ -34,6 +34,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
+#include <ctype.h>
 
 #include "camel-operation.h"
 
@@ -489,6 +490,21 @@
 	} else if (strcmp(service->url->authmech, "+APOP") == 0 && store->engine->apop) {
 		char *secret, md5asc[33], *d;
 		unsigned char md5sum[16], *s;
+
+		d = store->engine->apop;
+
+		while (*d != '\0') {
+			if (!isascii((int)*d)) {
+				camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
+						_("Unable to connect to POP server %s: "
+						"Invalid APOP ID received. Impersonation attack "
+						"suspected. Please contact your admin."),
+						CAMEL_SERVICE (store)->url->host);
+
+				return FALSE;
+			}
+			d++;
+		}
 		
 		secret = g_alloca(strlen(store->engine->apop)+strlen(service->url->passwd)+1);
 		sprintf(secret, "%s%s",  store->engine->apop, service->url->passwd);


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- evolution-data-server.spec	9 Apr 2007 16:41:22 -0000	1.159
+++ evolution-data-server.spec	24 Apr 2007 20:15:51 -0000	1.160
@@ -26,7 +26,7 @@
 
 Name: evolution-data-server
 Version: 1.10.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -78,6 +78,9 @@
 # GNOME bug #417999
 Patch23: evolution-data-server-1.10.0-code-cleanup.patch
 
+# RH bug #235290 / GNOME bug #424373
+Patch24: evolution-data-server-1.10.1-apop-auth-vulnerability.patch
+
 ### Dependencies ###
 
 Requires: GConf2
@@ -171,6 +174,7 @@
 %patch21 -p1 -b .e-passwords
 %patch22 -p1 -b .isa-support
 %patch23 -p1 -b .code-cleanup
+%patch24 -p1 -b .apop-auth-vulnerability
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -388,6 +392,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Tue Apr 24 2007 Matthew Barnes <mbarnes at redhat.com> - 1.10.1-2.fc7
+- Add patch for RH bug #235290 (APOP authentication vulnerability).
+
 * Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 1.10.1-1.fc7
 - Update to 1.10.1
 - Remove evolution-data-server-1.10.0-no-more-beeps.patch (fixed upstream).



From fedora-cvs-commits at redhat.com  Tue Apr 24 21:48:56 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 17:48:56 -0400
Subject: rpms/kernel/devel linux-2.6-ps3-drivers-only-on-ps3.patch, NONE,
	1.1 kernel-2.6.spec, 1.3108,
	1.3109 linux-2.6-cell-spu-device-tree.patch, 1.4, 1.5
Message-ID: <200704242148.l3OLmuSv017591@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec linux-2.6-cell-spu-device-tree.patch 
Added Files:
	linux-2.6-ps3-drivers-only-on-ps3.patch 
Log Message:
Fix SPU patches on QS21, don't try to init PS3 drivers on non-PS3

linux-2.6-ps3-drivers-only-on-ps3.patch:
 arch/powerpc/platforms/ps3/device-init.c |    4 ++++
 drivers/net/gelic_net.c                  |    5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-ps3-drivers-only-on-ps3.patch ---
commit 8c1099f5198da6c3457dc9c229df7121afec0b81
Author: Geoff Levand <geoffrey.levand at am.sony.com>
Date:   Wed Apr 18 11:45:33 2007 -0700

    [PS3] Add firmware_has_feature to device-init, gelic.

diff --git a/arch/powerpc/platforms/ps3/device-init.c b/arch/powerpc/platforms/ps3/device-init.c
index 63bea8f..a832889 100644
--- a/arch/powerpc/platforms/ps3/device-init.c
+++ b/arch/powerpc/platforms/ps3/device-init.c
@@ -22,6 +22,7 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <asm/firmware.h>
 
 #include "platform.h"
 
@@ -439,6 +440,9 @@ ps3_register_known_devices (void)
 {
 	int result;
 
+	if (!firmware_has_feature(FW_FEATURE_PS3_LV1))
+		return -ENODEV;
+
 	pr_debug(" -> %s:%d\n", __func__, __LINE__);
 
 	//ps3_repository_dump_bus_info();
diff --git a/drivers/net/gelic_net.c b/drivers/net/gelic_net.c
index 1169960..2588a4a 100644
--- a/drivers/net/gelic_net.c
+++ b/drivers/net/gelic_net.c
@@ -56,6 +56,7 @@
 #include <asm/pci-bridge.h>
 #include <net/checksum.h>
 #include <asm/io.h>
+#include <asm/firmware.h>
 #include <asm/ps3.h>
 #include <asm/lv1call.h>
 
@@ -1849,7 +1850,9 @@ static struct ps3_system_bus_driver ps3_gelic_driver = {
 static int __init
 ps3_gelic_driver_init (void)
 {
-	return ps3_system_bus_driver_register(&ps3_gelic_driver);
+	return firmware_has_feature(FW_FEATURE_PS3_LV1)
+		? ps3_system_bus_driver_register(&ps3_gelic_driver)
+		: -ENODEV;
 }
 
 static void __exit


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3108
retrieving revision 1.3109
diff -u -r1.3108 -r1.3109
--- kernel-2.6.spec	24 Apr 2007 17:03:10 -0000	1.3108
+++ kernel-2.6.spec	24 Apr 2007 21:48:53 -0000	1.3109
@@ -440,6 +440,7 @@
 Patch359: linux-2.6-ps3-ehci-iso.patch
 Patch360: linux-2.6-ps3-wrap-spu-runctl.patch
 Patch361: linux-2.6-ps3-clear-spu-irq.patch
+Patch362: linux-2.6-ps3-drivers-only-on-ps3.patch
 
 # And then some minor tweaks...
 Patch370: linux-2.6-ps3-memory-probe.patch
@@ -1091,6 +1092,7 @@
 %patch359 -p1
 %patch360 -p1
 %patch361 -p1
+%patch362 -p1
 
 %patch370 -p1
 %patch371 -p1

linux-2.6-cell-spu-device-tree.patch:
 arch/powerpc/oprofile/op_model_cell.c  |    1 
 arch/powerpc/platforms/cell/cbe_regs.c |   54 +++++++++++++++++++++++----------
 arch/powerpc/platforms/cell/cbe_regs.h |    5 +++
 include/asm-powerpc/cell-pmu.h         |    5 ---
 include/asm/cell-pmu.h                 |    5 ---
 5 files changed, 45 insertions(+), 25 deletions(-)

Index: linux-2.6-cell-spu-device-tree.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-cell-spu-device-tree.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-cell-spu-device-tree.patch	24 Apr 2007 11:42:37 -0000	1.4
+++ linux-2.6-cell-spu-device-tree.patch	24 Apr 2007 21:48:53 -0000	1.5
@@ -1,267 +1,195 @@
-Index: linux-2.6/arch/powerpc/sysdev/pmi.c
-===================================================================
---- linux-2.6.orig/arch/powerpc/sysdev/pmi.c
-+++ linux-2.6/arch/powerpc/sysdev/pmi.c
-@@ -33,7 +33,7 @@
- #include <asm/of_platform.h>
- #include <asm/io.h>
- #include <asm/pmi.h>
--
-+#include <asm/prom.h>
- 
- struct pmi_data {
- 	struct list_head	handler;
-@@ -49,21 +49,6 @@ struct pmi_data {
- };
- 
- 
--
--static void __iomem *of_iomap(struct device_node *np)
--{
--	struct resource res;
--
--	if (of_address_to_resource(np, 0, &res))
--		return NULL;
--
--	pr_debug("Resource start: 0x%lx\n", res.start);
--	pr_debug("Resource end: 0x%lx\n", res.end);
--
--	return ioremap(res.start, 1 + res.end - res.start);
--}
--
--
- static int pmi_irq_handler(int irq, void *dev_id)
- {
- 	struct pmi_data *data;
-@@ -154,7 +139,7 @@ static int pmi_of_probe(struct of_device
- 		goto out;
- 	}
- 
--	data->pmi_reg = of_iomap(np);
-+	data->pmi_reg = of_iomap(np, 0);
- 	if (!data->pmi_reg) {
- 		printk(KERN_ERR "pmi: invalid register address.\n");
- 		rc = -EFAULT;
-Index: linux-2.6/include/asm-powerpc/prom.h
-===================================================================
---- linux-2.6.orig/include/asm-powerpc/prom.h
-+++ linux-2.6/include/asm-powerpc/prom.h
-@@ -20,6 +20,7 @@
- #include <linux/platform_device.h>
- #include <asm/irq.h>
- #include <asm/atomic.h>
-+#include <asm/io.h>
- 
- /* Definitions used by the flattened device tree */
- #define OF_DT_HEADER		0xd00dfeed	/* marker */
-@@ -355,6 +356,16 @@ static inline int of_irq_to_resource(str
- 	return irq;
- }
- 
-+static inline void __iomem *of_iomap(struct device_node *np, int index)
-+{
-+	struct resource res;
-+
-+	if (of_address_to_resource(np, index, &res))
-+		return NULL;
-+
-+	return ioremap(res.start, 1 + res.end - res.start);
-+}
-+
- 
- #endif /* __KERNEL__ */
- #endif /* _POWERPC_PROM_H */
+Subject: [PATCH 01/10] cell: add cbe_node_to_cpu function
+From: Christian Krafft <krafft at de.ibm.com>
 
---
+This patch adds code to deal with conversion of
+logical cpu to cbe nodes. It removes code that
+assummed there were two logical CPUs per CBE.
 
-_______________________________________________
-Linuxppc-dev mailing list
-Linuxppc-dev at ozlabs.org
-https://ozlabs.org/mailman/listinfo/linuxppc-dev
---- linux-2.6.20.ppc64/arch/powerpc//platforms/cell/cbe_regs.c.orig	2007-04-24 12:37:04.000000000 +0100
-+++ linux-2.6.20.ppc64/arch/powerpc//platforms/cell/cbe_regs.c	2007-04-24 12:36:18.000000000 +0100
-@@ -14,6 +14,8 @@
- #include <asm/pgtable.h>
- #include <asm/prom.h>
- #include <asm/ptrace.h>
-+#include <asm/of_device.h>
-+#include <asm/of_platform.h>
- 
- #include "cbe_regs.h"
- 
-@@ -27,6 +29,7 @@
- static struct cbe_regs_map
- {
- 	struct device_node *cpu_node;
-+	struct device_node *be_node;
- 	struct cbe_pmd_regs __iomem *pmd_regs;
- 	struct cbe_iic_regs __iomem *iic_regs;
- 	struct cbe_mic_tm_regs __iomem *mic_tm_regs;
-@@ -37,6 +40,7 @@ static int cbe_regs_map_count;
- static struct cbe_thread_map
- {
+Signed-off-by: Christian Krafft <krafft at de.ibm.com>
+Signed-off-by: Arnd Bergmann <arnd.bergmann at de.ibm.com>
+
+----------
+
+Subject: [PATCH 07/10] add of_iomap function
+From: Christian Krafft <krafft at de.ibm.com>
+
+The of_iomap function maps memory for a given
+device_node and returns a pointer to that memory.
+This is used at some places, so it makes sense to
+a seperate function.
+
+Signed-off-by: Christian Krafft <krafft at de.ibm.com>
+Signed-off-by: Arnd Bergmann <arnd.bergmann at de.ibm.com>
+
+----------
+
+Subject: [PATCH 08/10] cell: add support for proper device-tree
+From: Christian Krafft <krafft at de.ibm.com>
+
+This patch adds support for a proper device-tree.
+A porper device-tree on cell contains be nodes
+for each CBE containg nodes for SPEs and all the
+other special devices on it.
+Ofcourse oldschool devicetree is still supported.
+
+Signed-off-by: Christian Krafft <krafft at de.ibm.com>
+Signed-off-by: Arnd Bergmann <arnd.bergmann at de.ibm.com>
+
+
+diff -ur linux-2.6.20.ppc64.3108/arch/powerpc/oprofile/op_model_cell.c linux-2.6.20.ppc64/arch/powerpc/oprofile/op_model_cell.c
+--- linux-2.6.20.ppc64.3108/arch/powerpc/oprofile/op_model_cell.c	2007-04-24 18:03:51.000000000 +0100
++++ linux-2.6.20.ppc64/arch/powerpc/oprofile/op_model_cell.c	2007-04-24 19:34:42.000000000 +0100
+@@ -37,6 +37,7 @@
+ #include <asm/system.h>
+ 
+ #include "../platforms/cell/interrupt.h"
++#include "../platforms/cell/cbe_regs.h"
+ 
+ #define PPU_CYCLES_EVENT_NUM 1	/*  event number for CYCLES */
+ #define PPU_CYCLES_GRP_NUM   1  /* special group number for identifying
+diff -ur linux-2.6.20.ppc64.3108/arch/powerpc/platforms/cell/cbe_regs.c linux-2.6.20.ppc64/arch/powerpc/platforms/cell/cbe_regs.c
+--- linux-2.6.20.ppc64.3108/arch/powerpc/platforms/cell/cbe_regs.c	2007-04-24 18:04:00.000000000 +0100
++++ linux-2.6.20.ppc64/arch/powerpc/platforms/cell/cbe_regs.c	2007-04-24 19:39:15.000000000 +0100
+@@ -42,8 +42,13 @@
  	struct device_node *cpu_node;
-+	struct device_node *be_node;
+ 	struct device_node *be_node;
  	struct cbe_regs_map *regs;
++	unsigned int thread_id;
++	unsigned int cbe_id;
  } cbe_thread_map[NR_CPUS];
  
-@@ -45,22 +49,29 @@ static struct cbe_regs_map *cbe_find_map
- 	int i;
- 	struct device_node *tmp_np;
- 
--	if (strcasecmp(np->type, "spe") == 0) {
--		if (np->data == NULL) {
--			/* walk up path until cpu node was found */
--			tmp_np = np->parent;
--			while (tmp_np != NULL && strcasecmp(tmp_np->type, "cpu") != 0)
--				tmp_np = tmp_np->parent;
-+	if (strcasecmp(np->type, "spe")) {
-+		for (i = 0; i < cbe_regs_map_count; i++)
-+			if (cbe_regs_maps[i].cpu_node == np ||
-+			    cbe_regs_maps[i].be_node == np)
-+				return &cbe_regs_maps[i];
-+		return NULL;
-+	}
- 
--			np->data = cbe_find_map(tmp_np);
--		}
-+	if (np->data)
- 		return np->data;
--	}
- 
--	for (i = 0; i < cbe_regs_map_count; i++)
--		if (cbe_regs_maps[i].cpu_node == np)
--			return &cbe_regs_maps[i];
--	return NULL;
-+	/* walk up path until cpu or be node was found */
-+	tmp_np = np;
-+	do {
-+		tmp_np = tmp_np->parent;
-+		/* on a correct devicetree we wont get up to root */
-+		BUG_ON(!tmp_np);
-+	} while (strcasecmp(tmp_np->type, "cpu") &&
-+		 strcasecmp(tmp_np->type, "be"));
-+
-+	np->data = cbe_find_map(tmp_np);
++static cpumask_t cbe_local_mask[MAX_CBE] = { [0 ... MAX_CBE-1] = CPU_MASK_NONE };
++static cpumask_t cbe_first_online_cpu = CPU_MASK_NONE;
 +
-+	return np->data;
+ static struct cbe_regs_map *cbe_find_map(struct device_node *np)
+ {
+ 	int i;
+@@ -141,19 +146,24 @@
  }
+ EXPORT_SYMBOL_GPL(cbe_get_cpu_mic_tm_regs);
  
- struct cbe_pmd_regs __iomem *cbe_get_pmd_regs(struct device_node *np)
-@@ -143,26 +154,82 @@ u32 cbe_get_hw_thread_id(int cpu)
+-/* FIXME
+- * This is little more than a stub at the moment.  It should be
+- * fleshed out so that it works for both SMT and non-SMT, no
+- * matter if the passed cpu is odd or even.
+- * For SMT enabled, returns 0 for even-numbered cpu; otherwise 1.
+- * For SMT disabled, returns 0 for all cpus.
+- */
+ u32 cbe_get_hw_thread_id(int cpu)
+ {
+-	return (cpu & 1);
++	return cbe_thread_map[cpu].thread_id;
  }
  EXPORT_SYMBOL_GPL(cbe_get_hw_thread_id);
  
-+static struct device_node *cbe_get_be_node(int cpu_id)
++u32 cbe_cpu_to_node(int cpu)
 +{
-+	struct device_node *np;
-+
-+	for_each_node_by_type (np, "be") {
-+		int len,i;
-+		const phandle *cpu_handle;
-+
-+		cpu_handle = get_property(np, "cpus", &len);
-+
-+		for (i=0; i<len; i++)
-+			if (of_find_node_by_phandle(cpu_handle[i]) == of_get_cpu_node(cpu_id, NULL))
-+				return np;
-+	}
-+
-+	return NULL;
++	return cbe_thread_map[cpu].cbe_id;
 +}
++EXPORT_SYMBOL_GPL(cbe_cpu_to_node);
 +
-+void __init cbe_fill_regs_map(struct cbe_regs_map *map)
++u32 cbe_node_to_cpu(int node)
 +{
-+	if(map->be_node) {
-+		struct device_node *be, *np;
-+
-+		be = map->be_node;
-+
-+		for_each_node_by_type(np, "pervasive")
-+			if (of_get_parent(np) == be)
-+				map->pmd_regs = of_iomap(np, 0);
-+
-+		for_each_node_by_type(np, "CBEA-Internal-Interrupt-Controller")
-+			if (of_get_parent(np) == be)
-+				map->iic_regs = of_iomap(np, 2);
-+
-+		for_each_node_by_type(np, "mic-tm")
-+			if (of_get_parent(np) == be)
-+				map->mic_tm_regs = of_iomap(np, 0);
-+	} else {
-+		struct device_node *cpu;
-+		/* That hack must die die die ! */
-+		const struct address_prop {
-+			unsigned long address;
-+			unsigned int len;
-+		} __attribute__((packed)) *prop;
-+
-+		cpu = map->cpu_node;
-+
-+		prop = get_property(cpu, "pervasive", NULL);
-+		if (prop != NULL)
-+			map->pmd_regs = ioremap(prop->address, prop->len);
-+
-+		prop = get_property(cpu, "iic", NULL);
-+		if (prop != NULL)
-+			map->iic_regs = ioremap(prop->address, prop->len);
-+
-+		prop = get_property(cpu, "mic-tm", NULL);
-+		if (prop != NULL)
-+			map->mic_tm_regs = ioremap(prop->address, prop->len);
-+	}
++	return find_first_bit( (unsigned long *) &cbe_local_mask[node], sizeof(cpumask_t));
 +}
++EXPORT_SYMBOL_GPL(cbe_node_to_cpu);
 +
-+
+ static struct device_node *cbe_get_be_node(int cpu_id)
+ {
+ 	struct device_node *np;
+@@ -218,17 +228,23 @@
  void __init cbe_regs_init(void)
  {
  	int i;
++	unsigned int thread_id;
  	struct device_node *cpu;
  
  	/* Build local fast map of CPUs */
--	for_each_possible_cpu(i)
-+	for_each_possible_cpu(i) {
- 		cbe_thread_map[i].cpu_node = of_get_cpu_node(i, NULL);
-+ 		cbe_thread_map[i].be_node = cbe_get_be_node(i);
-+	}
+ 	for_each_possible_cpu(i) {
+-		cbe_thread_map[i].cpu_node = of_get_cpu_node(i, NULL);
+- 		cbe_thread_map[i].be_node = cbe_get_be_node(i);
++		cbe_thread_map[i].cpu_node = of_get_cpu_node(i, &thread_id);
++		cbe_thread_map[i].be_node = cbe_get_be_node(i);
++		cbe_thread_map[i].thread_id = thread_id;
+ 	}
  
  	/* Find maps for each device tree CPU */
  	for_each_node_by_type(cpu, "cpu") {
- 		struct cbe_regs_map *map = &cbe_regs_maps[cbe_regs_map_count++];
+-		struct cbe_regs_map *map = &cbe_regs_maps[cbe_regs_map_count++];
++		struct cbe_regs_map *map;
++		unsigned int cbe_id;
++
++		cbe_id = cbe_regs_map_count++;
++		map = &cbe_regs_maps[cbe_id];
  
--		/* That hack must die die die ! */
--		const struct address_prop {
--			unsigned long address;
--			unsigned int len;
--		} __attribute__((packed)) *prop;
--
--
  		if (cbe_regs_map_count > MAX_CBE) {
  			printk(KERN_ERR "cbe_regs: More BE chips than supported"
- 			       "!\n");
-@@ -171,21 +238,12 @@ void __init cbe_regs_init(void)
+@@ -237,11 +253,19 @@
+ 			return;
  		}
  		map->cpu_node = cpu;
- 		for_each_possible_cpu(i)
--			if (cbe_thread_map[i].cpu_node == cpu)
-+			if (cbe_thread_map[i].cpu_node == cpu) {
- 				cbe_thread_map[i].regs = map;
-+				map->be_node = cbe_thread_map[i].be_node;
-+			}
- 
--		prop = get_property(cpu, "pervasive", NULL);
--		if (prop != NULL)
--			map->pmd_regs = ioremap(prop->address, prop->len);
--
--		prop = get_property(cpu, "iic", NULL);
--		if (prop != NULL)
--			map->iic_regs = ioremap(prop->address, prop->len);
--
--		prop = (struct address_prop *)get_property(cpu, "mic-tm",
--							   NULL);
--		if (prop != NULL)
--			map->mic_tm_regs = ioremap(prop->address, prop->len);
-+		cbe_fill_regs_map(map);
- 	}
- }
+-		for_each_possible_cpu(i)
+-			if (cbe_thread_map[i].cpu_node == cpu) {
+-				cbe_thread_map[i].regs = map;
+-				map->be_node = cbe_thread_map[i].be_node;
++
++		for_each_possible_cpu(i) {
++			struct cbe_thread_map *thread = &cbe_thread_map[i];
++
++			if (thread->cpu_node == cpu) {
++				thread->regs = map;
++				thread->cbe_id = cbe_id;
++				map->be_node = thread->be_node;
++				cpu_set(i, cbe_local_mask[cbe_id]);
++				if(thread->thread_id == 0)
++					cpu_set(i, cbe_first_online_cpu);
+ 			}
++		}
  
+ 		cbe_fill_regs_map(map);
+ 	}
+diff -ur linux-2.6.20.ppc64.3108/arch/powerpc/platforms/cell/cbe_regs.h linux-2.6.20.ppc64/arch/powerpc/platforms/cell/cbe_regs.h
+--- linux-2.6.20.ppc64.3108/arch/powerpc/platforms/cell/cbe_regs.h	2007-02-04 18:44:54.000000000 +0000
++++ linux-2.6.20.ppc64/arch/powerpc/platforms/cell/cbe_regs.h	2007-04-24 19:34:42.000000000 +0100
+@@ -255,6 +255,11 @@
+ extern struct cbe_mic_tm_regs __iomem *cbe_get_mic_tm_regs(struct device_node *np);
+ extern struct cbe_mic_tm_regs __iomem *cbe_get_cpu_mic_tm_regs(int cpu);
+ 
++/* some utility functions to deal with SMT */
++extern u32 cbe_get_hw_thread_id(int cpu);
++extern u32 cbe_cpu_to_node(int cpu);
++extern u32 cbe_node_to_cpu(int node);
++
+ /* Init this module early */
+ extern void cbe_regs_init(void);
+ 
+diff -ur linux-2.6.20.ppc64.3108/include/asm/cell-pmu.h linux-2.6.20.ppc64/include/asm/cell-pmu.h
+--- linux-2.6.20.ppc64.3108/include/asm/cell-pmu.h	2007-04-24 18:03:57.000000000 +0100
++++ linux-2.6.20.ppc64/include/asm/cell-pmu.h	2007-04-24 19:34:42.000000000 +0100
+@@ -97,11 +97,6 @@
+ extern u32  cbe_get_and_clear_pm_interrupts(u32 cpu);
+ extern void cbe_sync_irq(int node);
+ 
+-/* Utility functions, macros */
+-extern u32 cbe_get_hw_thread_id(int cpu);
+-
+-#define cbe_cpu_to_node(cpu) ((cpu) >> 1)
+-
+ #define CBE_COUNT_SUPERVISOR_MODE       0
+ #define CBE_COUNT_HYPERVISOR_MODE       1
+ #define CBE_COUNT_PROBLEM_MODE          2
+diff -ur linux-2.6.20.ppc64.3108/include/asm-powerpc/cell-pmu.h linux-2.6.20.ppc64/include/asm-powerpc/cell-pmu.h
+--- linux-2.6.20.ppc64.3108/include/asm-powerpc/cell-pmu.h	2007-04-24 18:03:57.000000000 +0100
++++ linux-2.6.20.ppc64/include/asm-powerpc/cell-pmu.h	2007-04-24 19:34:42.000000000 +0100
+@@ -97,11 +97,6 @@
+ extern u32  cbe_get_and_clear_pm_interrupts(u32 cpu);
+ extern void cbe_sync_irq(int node);
+ 
+-/* Utility functions, macros */
+-extern u32 cbe_get_hw_thread_id(int cpu);
+-
+-#define cbe_cpu_to_node(cpu) ((cpu) >> 1)
+-
+ #define CBE_COUNT_SUPERVISOR_MODE       0
+ #define CBE_COUNT_HYPERVISOR_MODE       1
+ #define CBE_COUNT_PROBLEM_MODE          2



From fedora-cvs-commits at redhat.com  Tue Apr 24 21:54:14 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 17:54:14 -0400
Subject: rpms/kernel/devel linux-2.6-cell-spu-device-tree.patch,1.5,1.6
Message-ID: <200704242154.l3OLsE2N017666@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	linux-2.6-cell-spu-device-tree.patch 
Log Message:
fix spu patch

linux-2.6-cell-spu-device-tree.patch:
 linux-2.6.20.ppc64.spustuff/arch/powerpc/platforms/cell/cbe_regs.c |  143 +++++++---
 linux-2.6.20.ppc64/arch/powerpc/oprofile/op_model_cell.c           |    1 
 linux-2.6.20.ppc64/arch/powerpc/platforms/cell/cbe_regs.h          |    5 
 linux-2.6.20.ppc64/include/asm-powerpc/cell-pmu.h                  |    5 
 4 files changed, 114 insertions(+), 40 deletions(-)

Index: linux-2.6-cell-spu-device-tree.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-cell-spu-device-tree.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-cell-spu-device-tree.patch	24 Apr 2007 21:48:53 -0000	1.5
+++ linux-2.6-cell-spu-device-tree.patch	24 Apr 2007 21:54:11 -0000	1.6
@@ -48,90 +48,197 @@
  #define PPU_CYCLES_EVENT_NUM 1	/*  event number for CYCLES */
  #define PPU_CYCLES_GRP_NUM   1  /* special group number for identifying
 diff -ur linux-2.6.20.ppc64.3108/arch/powerpc/platforms/cell/cbe_regs.c linux-2.6.20.ppc64/arch/powerpc/platforms/cell/cbe_regs.c
---- linux-2.6.20.ppc64.3108/arch/powerpc/platforms/cell/cbe_regs.c	2007-04-24 18:04:00.000000000 +0100
-+++ linux-2.6.20.ppc64/arch/powerpc/platforms/cell/cbe_regs.c	2007-04-24 19:39:15.000000000 +0100
-@@ -42,8 +42,13 @@
+--- linux-2.6.20.ppc64/arch/powerpc//platforms/cell/cbe_regs.c	2007-04-24 22:50:22.000000000 +0100
++++ linux-2.6.20.ppc64.spustuff/arch/powerpc/platforms/cell/cbe_regs.c	2007-04-24 19:39:15.000000000 +0100
+@@ -14,6 +14,8 @@
+ #include <asm/pgtable.h>
+ #include <asm/prom.h>
+ #include <asm/ptrace.h>
++#include <asm/of_device.h>
++#include <asm/of_platform.h>
+ 
+ #include "cbe_regs.h"
+ 
+@@ -27,6 +29,7 @@
+ static struct cbe_regs_map
+ {
+ 	struct device_node *cpu_node;
++	struct device_node *be_node;
+ 	struct cbe_pmd_regs __iomem *pmd_regs;
+ 	struct cbe_iic_regs __iomem *iic_regs;
+ 	struct cbe_mic_tm_regs __iomem *mic_tm_regs;
+@@ -37,6 +40,7 @@ static int cbe_regs_map_count;
+ static struct cbe_thread_map
+ {
  	struct device_node *cpu_node;
- 	struct device_node *be_node;
++	struct device_node *be_node;
  	struct cbe_regs_map *regs;
-+	unsigned int thread_id;
-+	unsigned int cbe_id;
- } cbe_thread_map[NR_CPUS];
+ 	unsigned int thread_id;
+ 	unsigned int cbe_id;
+@@ -50,22 +54,29 @@ static struct cbe_regs_map *cbe_find_map
+ 	int i;
+ 	struct device_node *tmp_np;
  
-+static cpumask_t cbe_local_mask[MAX_CBE] = { [0 ... MAX_CBE-1] = CPU_MASK_NONE };
-+static cpumask_t cbe_first_online_cpu = CPU_MASK_NONE;
+-	if (strcasecmp(np->type, "spe") == 0) {
+-		if (np->data == NULL) {
+-			/* walk up path until cpu node was found */
+-			tmp_np = np->parent;
+-			while (tmp_np != NULL && strcasecmp(tmp_np->type, "cpu") != 0)
+-				tmp_np = tmp_np->parent;
++	if (strcasecmp(np->type, "spe")) {
++		for (i = 0; i < cbe_regs_map_count; i++)
++			if (cbe_regs_maps[i].cpu_node == np ||
++			    cbe_regs_maps[i].be_node == np)
++				return &cbe_regs_maps[i];
++		return NULL;
++	}
+ 
+-			np->data = cbe_find_map(tmp_np);
+-		}
++	if (np->data)
+ 		return np->data;
+-	}
+ 
+-	for (i = 0; i < cbe_regs_map_count; i++)
+-		if (cbe_regs_maps[i].cpu_node == np)
+-			return &cbe_regs_maps[i];
+-	return NULL;
++	/* walk up path until cpu or be node was found */
++	tmp_np = np;
++	do {
++		tmp_np = tmp_np->parent;
++		/* on a correct devicetree we wont get up to root */
++		BUG_ON(!tmp_np);
++	} while (strcasecmp(tmp_np->type, "cpu") &&
++		 strcasecmp(tmp_np->type, "be"));
 +
- static struct cbe_regs_map *cbe_find_map(struct device_node *np)
- {
- 	int i;
-@@ -141,19 +146,24 @@
++	np->data = cbe_find_map(tmp_np);
++
++	return np->data;
  }
- EXPORT_SYMBOL_GPL(cbe_get_cpu_mic_tm_regs);
  
--/* FIXME
-- * This is little more than a stub at the moment.  It should be
-- * fleshed out so that it works for both SMT and non-SMT, no
-- * matter if the passed cpu is odd or even.
-- * For SMT enabled, returns 0 for even-numbered cpu; otherwise 1.
-- * For SMT disabled, returns 0 for all cpus.
-- */
+ struct cbe_pmd_regs __iomem *cbe_get_pmd_regs(struct device_node *np)
+@@ -137,6 +148,7 @@ EXPORT_SYMBOL_GPL(cbe_get_cpu_mic_tm_reg
+ 
  u32 cbe_get_hw_thread_id(int cpu)
  {
--	return (cpu & 1);
 +	return cbe_thread_map[cpu].thread_id;
  }
  EXPORT_SYMBOL_GPL(cbe_get_hw_thread_id);
  
-+u32 cbe_cpu_to_node(int cpu)
-+{
-+	return cbe_thread_map[cpu].cbe_id;
+@@ -152,36 +164,51 @@ u32 cbe_node_to_cpu(int node)
+ }
+ EXPORT_SYMBOL_GPL(cbe_node_to_cpu);
+ 
+-void __init cbe_regs_init(void)
++static struct device_node *cbe_get_be_node(int cpu_id)
+ {
+-	int i;
+-	struct device_node *cpu;
++	struct device_node *np;
+ 
+-	/* Build local fast map of CPUs */
+-	for_each_possible_cpu(i)
+-		cbe_thread_map[i].cpu_node = of_get_cpu_node(i, NULL);
++	for_each_node_by_type (np, "be") {
++		int len,i;
++		const phandle *cpu_handle;
+ 
+-	/* Find maps for each device tree CPU */
+-	for_each_node_by_type(cpu, "cpu") {
+-		struct cbe_regs_map *map = &cbe_regs_maps[cbe_regs_map_count++];
++		cpu_handle = get_property(np, "cpus", &len);
++
++		for (i=0; i<len; i++)
++			if (of_find_node_by_phandle(cpu_handle[i]) == of_get_cpu_node(cpu_id, NULL))
++				return np;
++	}
+ 
++	return NULL;
 +}
-+EXPORT_SYMBOL_GPL(cbe_cpu_to_node);
 +
-+u32 cbe_node_to_cpu(int node)
++void __init cbe_fill_regs_map(struct cbe_regs_map *map)
 +{
-+	return find_first_bit( (unsigned long *) &cbe_local_mask[node], sizeof(cpumask_t));
-+}
-+EXPORT_SYMBOL_GPL(cbe_node_to_cpu);
++	if(map->be_node) {
++		struct device_node *be, *np;
 +
- static struct device_node *cbe_get_be_node(int cpu_id)
- {
- 	struct device_node *np;
-@@ -218,17 +228,23 @@
- void __init cbe_regs_init(void)
- {
- 	int i;
-+	unsigned int thread_id;
- 	struct device_node *cpu;
++		be = map->be_node;
++
++		for_each_node_by_type(np, "pervasive")
++			if (of_get_parent(np) == be)
++				map->pmd_regs = of_iomap(np, 0);
++
++		for_each_node_by_type(np, "CBEA-Internal-Interrupt-Controller")
++			if (of_get_parent(np) == be)
++				map->iic_regs = of_iomap(np, 2);
++
++		for_each_node_by_type(np, "mic-tm")
++			if (of_get_parent(np) == be)
++				map->mic_tm_regs = of_iomap(np, 0);
++	} else {
++		struct device_node *cpu;
+ 		/* That hack must die die die ! */
+ 		const struct address_prop {
+ 			unsigned long address;
+ 			unsigned int len;
+ 		} __attribute__((packed)) *prop;
  
- 	/* Build local fast map of CPUs */
- 	for_each_possible_cpu(i) {
--		cbe_thread_map[i].cpu_node = of_get_cpu_node(i, NULL);
-- 		cbe_thread_map[i].be_node = cbe_get_be_node(i);
+-
+-		if (cbe_regs_map_count > MAX_CBE) {
+-			printk(KERN_ERR "cbe_regs: More BE chips than supported"
+-			       "!\n");
+-			cbe_regs_map_count--;
+-			return;
+-		}
+-		map->cpu_node = cpu;
+-		for_each_possible_cpu(i)
+-			if (cbe_thread_map[i].cpu_node == cpu)
+-				cbe_thread_map[i].regs = map;
++		cpu = map->cpu_node;
+ 
+ 		prop = get_property(cpu, "pervasive", NULL);
+ 		if (prop != NULL)
+@@ -191,10 +218,56 @@ void __init cbe_regs_init(void)
+ 		if (prop != NULL)
+ 			map->iic_regs = ioremap(prop->address, prop->len);
+ 
+-		prop = (struct address_prop *)get_property(cpu, "mic-tm",
+-							   NULL);
++		prop = get_property(cpu, "mic-tm", NULL);
+ 		if (prop != NULL)
+ 			map->mic_tm_regs = ioremap(prop->address, prop->len);
+ 	}
+ }
+ 
++
++void __init cbe_regs_init(void)
++{
++	int i;
++	unsigned int thread_id;
++	struct device_node *cpu;
++
++	/* Build local fast map of CPUs */
++	for_each_possible_cpu(i) {
 +		cbe_thread_map[i].cpu_node = of_get_cpu_node(i, &thread_id);
 +		cbe_thread_map[i].be_node = cbe_get_be_node(i);
 +		cbe_thread_map[i].thread_id = thread_id;
- 	}
- 
- 	/* Find maps for each device tree CPU */
- 	for_each_node_by_type(cpu, "cpu") {
--		struct cbe_regs_map *map = &cbe_regs_maps[cbe_regs_map_count++];
++	}
++
++	/* Find maps for each device tree CPU */
++	for_each_node_by_type(cpu, "cpu") {
 +		struct cbe_regs_map *map;
 +		unsigned int cbe_id;
 +
 +		cbe_id = cbe_regs_map_count++;
 +		map = &cbe_regs_maps[cbe_id];
- 
- 		if (cbe_regs_map_count > MAX_CBE) {
- 			printk(KERN_ERR "cbe_regs: More BE chips than supported"
-@@ -237,11 +253,19 @@
- 			return;
- 		}
- 		map->cpu_node = cpu;
--		for_each_possible_cpu(i)
--			if (cbe_thread_map[i].cpu_node == cpu) {
--				cbe_thread_map[i].regs = map;
--				map->be_node = cbe_thread_map[i].be_node;
++
++		if (cbe_regs_map_count > MAX_CBE) {
++			printk(KERN_ERR "cbe_regs: More BE chips than supported"
++			       "!\n");
++			cbe_regs_map_count--;
++			return;
++		}
++		map->cpu_node = cpu;
 +
 +		for_each_possible_cpu(i) {
 +			struct cbe_thread_map *thread = &cbe_thread_map[i];
@@ -143,11 +250,13 @@
 +				cpu_set(i, cbe_local_mask[cbe_id]);
 +				if(thread->thread_id == 0)
 +					cpu_set(i, cbe_first_online_cpu);
- 			}
++			}
 +		}
- 
- 		cbe_fill_regs_map(map);
- 	}
++
++		cbe_fill_regs_map(map);
++	}
++}
++
 diff -ur linux-2.6.20.ppc64.3108/arch/powerpc/platforms/cell/cbe_regs.h linux-2.6.20.ppc64/arch/powerpc/platforms/cell/cbe_regs.h
 --- linux-2.6.20.ppc64.3108/arch/powerpc/platforms/cell/cbe_regs.h	2007-02-04 18:44:54.000000000 +0000
 +++ linux-2.6.20.ppc64/arch/powerpc/platforms/cell/cbe_regs.h	2007-04-24 19:34:42.000000000 +0100
@@ -163,21 +272,6 @@
  /* Init this module early */
  extern void cbe_regs_init(void);
  
-diff -ur linux-2.6.20.ppc64.3108/include/asm/cell-pmu.h linux-2.6.20.ppc64/include/asm/cell-pmu.h
---- linux-2.6.20.ppc64.3108/include/asm/cell-pmu.h	2007-04-24 18:03:57.000000000 +0100
-+++ linux-2.6.20.ppc64/include/asm/cell-pmu.h	2007-04-24 19:34:42.000000000 +0100
-@@ -97,11 +97,6 @@
- extern u32  cbe_get_and_clear_pm_interrupts(u32 cpu);
- extern void cbe_sync_irq(int node);
- 
--/* Utility functions, macros */
--extern u32 cbe_get_hw_thread_id(int cpu);
--
--#define cbe_cpu_to_node(cpu) ((cpu) >> 1)
--
- #define CBE_COUNT_SUPERVISOR_MODE       0
- #define CBE_COUNT_HYPERVISOR_MODE       1
- #define CBE_COUNT_PROBLEM_MODE          2
 diff -ur linux-2.6.20.ppc64.3108/include/asm-powerpc/cell-pmu.h linux-2.6.20.ppc64/include/asm-powerpc/cell-pmu.h
 --- linux-2.6.20.ppc64.3108/include/asm-powerpc/cell-pmu.h	2007-04-24 18:03:57.000000000 +0100
 +++ linux-2.6.20.ppc64/include/asm-powerpc/cell-pmu.h	2007-04-24 19:34:42.000000000 +0100



From fedora-cvs-commits at redhat.com  Tue Apr 24 21:57:00 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 17:57:00 -0400
Subject: rpms/kernel/devel linux-2.6-cell-spu-device-tree.patch,1.6,1.7
Message-ID: <200704242157.l3OLv0AB017725@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	linux-2.6-cell-spu-device-tree.patch 
Log Message:
fix spu patch harder

linux-2.6-cell-spu-device-tree.patch:
 linux-2.6.20.ppc64.spustuff/arch/powerpc/platforms/cell/cbe_regs.c |  168 +++++++---
 linux-2.6.20.ppc64/arch/powerpc/oprofile/op_model_cell.c           |    1 
 linux-2.6.20.ppc64/arch/powerpc/platforms/cell/cbe_regs.h          |    5 
 linux-2.6.20.ppc64/include/asm-powerpc/cell-pmu.h                  |    5 
 4 files changed, 131 insertions(+), 48 deletions(-)

Index: linux-2.6-cell-spu-device-tree.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-cell-spu-device-tree.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-cell-spu-device-tree.patch	24 Apr 2007 21:54:11 -0000	1.6
+++ linux-2.6-cell-spu-device-tree.patch	24 Apr 2007 21:56:57 -0000	1.7
@@ -67,15 +67,21 @@
  	struct cbe_pmd_regs __iomem *pmd_regs;
  	struct cbe_iic_regs __iomem *iic_regs;
  	struct cbe_mic_tm_regs __iomem *mic_tm_regs;
-@@ -37,6 +40,7 @@ static int cbe_regs_map_count;
+@@ -37,30 +40,43 @@ static int cbe_regs_map_count;
  static struct cbe_thread_map
  {
  	struct device_node *cpu_node;
 +	struct device_node *be_node;
  	struct cbe_regs_map *regs;
- 	unsigned int thread_id;
- 	unsigned int cbe_id;
-@@ -50,22 +54,29 @@ static struct cbe_regs_map *cbe_find_map
++	unsigned int thread_id;
++	unsigned int cbe_id;
+ } cbe_thread_map[NR_CPUS];
+ 
++static cpumask_t cbe_local_mask[MAX_CBE] = { [0 ... MAX_CBE-1] = CPU_MASK_NONE };
++static cpumask_t cbe_first_online_cpu = CPU_MASK_NONE;
++
+ static struct cbe_regs_map *cbe_find_map(struct device_node *np)
+ {
  	int i;
  	struct device_node *tmp_np;
  
@@ -118,42 +124,60 @@
  }
  
  struct cbe_pmd_regs __iomem *cbe_get_pmd_regs(struct device_node *np)
-@@ -137,6 +148,7 @@ EXPORT_SYMBOL_GPL(cbe_get_cpu_mic_tm_reg
+@@ -130,49 +146,69 @@ struct cbe_mic_tm_regs __iomem *cbe_get_
+ }
+ EXPORT_SYMBOL_GPL(cbe_get_cpu_mic_tm_regs);
  
+-/* FIXME
+- * This is little more than a stub at the moment.  It should be
+- * fleshed out so that it works for both SMT and non-SMT, no
+- * matter if the passed cpu is odd or even.
+- * For SMT enabled, returns 0 for even-numbered cpu; otherwise 1.
+- * For SMT disabled, returns 0 for all cpus.
+- */
  u32 cbe_get_hw_thread_id(int cpu)
  {
+-	return (cpu & 1);
 +	return cbe_thread_map[cpu].thread_id;
  }
  EXPORT_SYMBOL_GPL(cbe_get_hw_thread_id);
  
-@@ -152,36 +164,51 @@ u32 cbe_node_to_cpu(int node)
- }
- EXPORT_SYMBOL_GPL(cbe_node_to_cpu);
- 
 -void __init cbe_regs_init(void)
-+static struct device_node *cbe_get_be_node(int cpu_id)
++u32 cbe_cpu_to_node(int cpu)
  {
 -	int i;
 -	struct device_node *cpu;
-+	struct device_node *np;
++	return cbe_thread_map[cpu].cbe_id;
++}
++EXPORT_SYMBOL_GPL(cbe_cpu_to_node);
  
 -	/* Build local fast map of CPUs */
 -	for_each_possible_cpu(i)
 -		cbe_thread_map[i].cpu_node = of_get_cpu_node(i, NULL);
-+	for_each_node_by_type (np, "be") {
-+		int len,i;
-+		const phandle *cpu_handle;
++u32 cbe_node_to_cpu(int node)
++{
++	return find_first_bit( (unsigned long *) &cbe_local_mask[node], sizeof(cpumask_t));
++}
++EXPORT_SYMBOL_GPL(cbe_node_to_cpu);
  
 -	/* Find maps for each device tree CPU */
 -	for_each_node_by_type(cpu, "cpu") {
 -		struct cbe_regs_map *map = &cbe_regs_maps[cbe_regs_map_count++];
++static struct device_node *cbe_get_be_node(int cpu_id)
++{
++	struct device_node *np;
++
++	for_each_node_by_type (np, "be") {
++		int len,i;
++		const phandle *cpu_handle;
++
 +		cpu_handle = get_property(np, "cpus", &len);
 +
 +		for (i=0; i<len; i++)
 +			if (of_find_node_by_phandle(cpu_handle[i]) == of_get_cpu_node(cpu_id, NULL))
 +				return np;
 +	}
- 
++
 +	return NULL;
 +}
 +
@@ -161,7 +185,7 @@
 +{
 +	if(map->be_node) {
 +		struct device_node *be, *np;
-+
+ 
 +		be = map->be_node;
 +
 +		for_each_node_by_type(np, "pervasive")
@@ -198,7 +222,7 @@
  
  		prop = get_property(cpu, "pervasive", NULL);
  		if (prop != NULL)
-@@ -191,10 +218,56 @@ void __init cbe_regs_init(void)
+@@ -182,10 +218,56 @@ void __init cbe_regs_init(void)
  		if (prop != NULL)
  			map->iic_regs = ioremap(prop->address, prop->len);
  



From fedora-cvs-commits at redhat.com  Tue Apr 24 22:01:48 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 18:01:48 -0400
Subject: rpms/kernel/devel linux-2.6-cell-spu-device-tree.patch,1.7,1.8
Message-ID: <200704242201.l3OM1mDq017995@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	linux-2.6-cell-spu-device-tree.patch 
Log Message:
/me bangs head against wall. Harder.

linux-2.6-cell-spu-device-tree.patch:
 arch/powerpc/sysdev/pmi.c                                          |   19 -
 linux-2.6.20.ppc64.spustuff/arch/powerpc/platforms/cell/cbe_regs.c |  168 +++++++---
 linux-2.6.20.ppc64/arch/powerpc/oprofile/op_model_cell.c           |    1 
 linux-2.6.20.ppc64/arch/powerpc/platforms/cell/cbe_regs.h          |    5 
 linux-2.6.20.ppc64/include/asm-powerpc/cell-pmu.h                  |    5 
 linux-2.6/include/asm-powerpc/prom.h                               |   11 
 6 files changed, 144 insertions(+), 65 deletions(-)

Index: linux-2.6-cell-spu-device-tree.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-cell-spu-device-tree.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-cell-spu-device-tree.patch	24 Apr 2007 21:56:57 -0000	1.7
+++ linux-2.6-cell-spu-device-tree.patch	24 Apr 2007 22:01:43 -0000	1.8
@@ -311,3 +311,81 @@
  #define CBE_COUNT_SUPERVISOR_MODE       0
  #define CBE_COUNT_HYPERVISOR_MODE       1
  #define CBE_COUNT_PROBLEM_MODE          2
+--- linux-2.6.orig/arch/powerpc/sysdev/pmi.c
++++ linux-2.6/arch/powerpc/sysdev/pmi.c
+@@ -33,7 +33,7 @@
+ #include <asm/of_platform.h>
+ #include <asm/io.h>
+ #include <asm/pmi.h>
+-
++#include <asm/prom.h>
+ 
+ struct pmi_data {
+ 	struct list_head	handler;
+@@ -49,21 +49,6 @@ struct pmi_data {
+ };
+ 
+ 
+-
+-static void __iomem *of_iomap(struct device_node *np)
+-{
+-	struct resource res;
+-
+-	if (of_address_to_resource(np, 0, &res))
+-		return NULL;
+-
+-	pr_debug("Resource start: 0x%lx\n", res.start);
+-	pr_debug("Resource end: 0x%lx\n", res.end);
+-
+-	return ioremap(res.start, 1 + res.end - res.start);
+-}
+-
+-
+ static int pmi_irq_handler(int irq, void *dev_id)
+ {
+ 	struct pmi_data *data;
+@@ -154,7 +139,7 @@ static int pmi_of_probe(struct of_device
+ 		goto out;
+ 	}
+ 
+-	data->pmi_reg = of_iomap(np);
++	data->pmi_reg = of_iomap(np, 0);
+ 	if (!data->pmi_reg) {
+ 		printk(KERN_ERR "pmi: invalid register address.\n");
+ 		rc = -EFAULT;
+Index: linux-2.6/include/asm-powerpc/prom.h
+===================================================================
+--- linux-2.6.orig/include/asm-powerpc/prom.h
++++ linux-2.6/include/asm-powerpc/prom.h
+@@ -20,6 +20,7 @@
+ #include <linux/platform_device.h>
+ #include <asm/irq.h>
+ #include <asm/atomic.h>
++#include <asm/io.h>
+ 
+ /* Definitions used by the flattened device tree */
+ #define OF_DT_HEADER		0xd00dfeed	/* marker */
+@@ -355,6 +356,16 @@ static inline int of_irq_to_resource(str
+ 	return irq;
+ }
+ 
++static inline void __iomem *of_iomap(struct device_node *np, int index)
++{
++	struct resource res;
++
++	if (of_address_to_resource(np, index, &res))
++		return NULL;
++
++	return ioremap(res.start, 1 + res.end - res.start);
++}
++
+ 
+ #endif /* __KERNEL__ */
+ #endif /* _POWERPC_PROM_H */
+
+--
+
+_______________________________________________
+Linuxppc-dev mailing list
+Linuxppc-dev at ozlabs.org
+https://ozlabs.org/mailman/listinfo/linuxppc-dev



From fedora-cvs-commits at redhat.com  Wed Apr 25 00:09:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 24 Apr 2007 20:09:26 -0400
Subject: rpms/kernel/devel patch-2.6.21-rc7-git7.bz2.sign, NONE,
	1.1 .cvsignore, 1.612, 1.613 kernel-2.6.spec, 1.3109,
	1.3110 sources, 1.575, 1.576 upstream, 1.503,
	1.504 patch-2.6.21-rc7-git6.bz2.sign, 1.1, NONE
Message-ID: <200704250009.l3P09QXf010328@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.21-rc7-git7.bz2.sign 
Removed Files:
	patch-2.6.21-rc7-git6.bz2.sign 
Log Message:
* Tue Apr 24 2007 Dave Jones <davej at redhat.com>
- 2.6.21-rc7-git7



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

iD8DBQBGLm9fyGugalF9Dw4RAlSZAJ9fHveFZV8HPoFxsUfO/1bqL7mopACfc9il
bul+JSoV1bsGsPBT1Hd1xpM=
=eUib
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.612
retrieving revision 1.613
diff -u -r1.612 -r1.613
--- .cvsignore	23 Apr 2007 23:02:46 -0000	1.612
+++ .cvsignore	25 Apr 2007 00:09:23 -0000	1.613
@@ -5,4 +5,4 @@
 kernel-2.6.20
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc7.bz2
-patch-2.6.21-rc7-git6.bz2
+patch-2.6.21-rc7-git7.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3109
retrieving revision 1.3110
diff -u -r1.3109 -r1.3110
--- kernel-2.6.spec	24 Apr 2007 21:48:53 -0000	1.3109
+++ kernel-2.6.spec	25 Apr 2007 00:09:23 -0000	1.3110
@@ -371,7 +371,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.21-rc7.bz2
-Patch2: patch-2.6.21-rc7-git6.bz2
+Patch2: patch-2.6.21-rc7-git7.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -2336,6 +2336,9 @@
 #  - tux.
 
 %changelog
+* Tue Apr 24 2007 Dave Jones <davej at redhat.com>
+- 2.6.21-rc7-git7
+
 * Tue Apr 24 2007 David Woodhouse <dwmw2 at redhat.com>
 - Support proper device-tree layout for Cell SPUs
 - Cell spufs fixes


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.575
retrieving revision 1.576
diff -u -r1.575 -r1.576
--- sources	23 Apr 2007 23:02:46 -0000	1.575
+++ sources	25 Apr 2007 00:09:23 -0000	1.576
@@ -1,4 +1,4 @@
 2618cbcc9c9ac1c3c04be903fe3338a7  sparse-0.2.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 3a54bf5a7cf6b124e680e1d08fe1b20b  patch-2.6.21-rc7.bz2
-9e18261cb76baa932814df0790313c6e  patch-2.6.21-rc7-git6.bz2
+0a8dcc4ce7214cdc12698d40e2d89d42  patch-2.6.21-rc7-git7.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.503
retrieving revision 1.504
diff -u -r1.503 -r1.504
--- upstream	23 Apr 2007 23:02:46 -0000	1.503
+++ upstream	25 Apr 2007 00:09:24 -0000	1.504
@@ -1,3 +1,3 @@
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc7.bz2
-patch-2.6.21-rc7-git6.bz2
+patch-2.6.21-rc7-git7.bz2


--- patch-2.6.21-rc7-git6.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 25 08:27:52 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 04:27:52 -0400
Subject: rpms/openldap/FC-5 openldap.spec,1.59,1.60
Message-ID: <200704250827.l3P8RqGb008155@cvs.devel.redhat.com>

Author: jsafrane

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

Modified Files:
	openldap.spec 
Log Message:
Minor .spec fix


Index: openldap.spec
===================================================================
RCS file: /cvs/dist/rpms/openldap/FC-5/openldap.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- openldap.spec	24 Apr 2007 11:27:51 -0000	1.59
+++ openldap.spec	25 Apr 2007 08:27:50 -0000	1.60
@@ -528,7 +528,7 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/openldap/*.so
 
 rm -f $RPM_BUILD_ROOT%{_localstatedir}/openldap-data/DB_CONFIG.example
-rmdir $RPM_BUILD_ROOT%{_localstatedir}/openldap-slurp $RPM_BUILD_ROOT/var/openldap-data
+rmdir $RPM_BUILD_ROOT%{_localstatedir}/openldap-slurp $RPM_BUILD_ROOT%{_localstatedir}/openldap-data
 
 %clean 
 rm -rf $RPM_BUILD_ROOT



From fedora-cvs-commits at redhat.com  Wed Apr 25 09:45:00 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 05:45:00 -0400
Subject: rpms/gcc/devel gcc41-pr30558.patch, NONE, 1.1 gcc41-pr31598.patch,
	NONE, 1.1 gcc41-rh235008.patch, NONE, 1.1 .cvsignore, 1.204,
	1.205 README.libgcjwebplugin.so, 1.1, 1.2 gcc41.spec, 1.158,
	1.159 sources, 1.206, 1.207 gcc41-pr31632.patch, 1.1,
	NONE gcc41-rh237067.patch, 1.1, NONE
Message-ID: <200704250945.l3P9j0FI031255@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	.cvsignore README.libgcjwebplugin.so gcc41.spec sources 
Added Files:
	gcc41-pr30558.patch gcc41-pr31598.patch gcc41-rh235008.patch 
Removed Files:
	gcc41-pr31632.patch gcc41-rh237067.patch 
Log Message:
4.1.2-11

gcc41-pr30558.patch:
 testsuite/g++.dg/gomp/pr30558.C |   41 ++++++++++++++++++++++++++++++++++++++++
 tree-eh.c                       |    4 +++
 2 files changed, 45 insertions(+)

--- NEW FILE gcc41-pr30558.patch ---
2007-04-24  Jakub Jelinek  <jakub at redhat.com>

	PR tree-optimization/30558
	* tree-eh.c (lower_eh_filter): If EH_FILTER_MUST_NOT_THROW
	clear this_state.prev_try.

	* g++.dg/gomp/pr30558.C: New test.

--- gcc/tree-eh.c.jj	2007-03-12 17:18:17.000000000 +0100
+++ gcc/tree-eh.c	2007-04-24 17:32:16.000000000 +0200
@@ -1497,6 +1497,10 @@ lower_eh_filter (struct leh_state *state
 					 EH_FILTER_TYPES (inner));
   this_state = *state;
   this_state.cur_region = this_region;
+  /* For must not throw regions any cleanup regions inside it
+     can't reach outer catch regions.  */
+  if (EH_FILTER_MUST_NOT_THROW (inner))
+    this_state.prev_try = NULL;
 
   lower_eh_constructs_1 (&this_state, &TREE_OPERAND (*tp, 0));
 
--- gcc/testsuite/g++.dg/gomp/pr30558.C.jj	2007-04-24 17:41:47.000000000 +0200
+++ gcc/testsuite/g++.dg/gomp/pr30558.C	2007-04-24 17:42:24.000000000 +0200
@@ -0,0 +1,41 @@
+// PR tree-optimization/30558
+// { dg-do compile }
+// { dg-options "-fopenmp" }
+
+template <typename T> struct F
+{
+  ~F ();
+  F (T);
+  const T &operator[] (unsigned i) const;
+};
+
+template <typename T> F<T> foo (const F<T> &x)
+{
+  return F<T> (x[1]);
+}
+
+struct G
+{
+  G () { bar (2); }
+  F<int> &operator () (F<int> x);
+  void bar (int);
+};
+
+int
+main ()
+{
+  try
+  {
+    G g;
+#pragma omp parallel for
+    for (int i = 0; i < 10; ++i)
+      {
+	F<int> j (i);
+	F<int> f = g (j);
+	F<int> h = foo (f);
+      }
+  }
+  catch (int &e)
+  {
+  }
+}

gcc41-pr31598.patch:
 cp/semantics.c                  |    3 +-
 testsuite/g++.dg/gomp/pr31598.C |   59 ++++++++++++++++++++++++++++++++++++++++
 tree-inline.c                   |    3 +-
 3 files changed, 63 insertions(+), 2 deletions(-)

--- NEW FILE gcc41-pr31598.patch ---
2007-04-24  Jakub Jelinek  <jakub at redhat.com>

	PR c++/31598
	* tree-inline.c (copy_body_r): Don't touch TREE_TYPE of OMP_CLAUSE.

	* semantics.c (finish_omp_clauses): Don't create CP_OMP_CLAUSE_INFO
	for type dependent OMP_CLAUSE_DECLs.

	* g++.dg/gomp/pr31598.C: New test.

--- gcc/tree-inline.c.jj	2007-04-14 14:55:25.000000000 +0200
+++ gcc/tree-inline.c	2007-04-24 11:33:19.000000000 +0200
@@ -650,7 +650,8 @@ copy_body_r (tree *tp, int *walk_subtree
 	    (NULL_TREE,
 	     id->eh_region_offset + TREE_INT_CST_LOW (TREE_OPERAND (*tp, 0)));
 
-      TREE_TYPE (*tp) = remap_type (TREE_TYPE (*tp), id);
+      if (TREE_CODE (*tp) != OMP_CLAUSE)
+	TREE_TYPE (*tp) = remap_type (TREE_TYPE (*tp), id);
 
       /* The copied TARGET_EXPR has never been expanded, even if the
 	 original node was expanded already.  */
--- gcc/cp/semantics.c.jj	2007-04-01 20:16:51.000000000 +0200
+++ gcc/cp/semantics.c	2007-04-24 10:45:35.000000000 +0200
@@ -3627,7 +3627,8 @@ finish_omp_clauses (tree clauses)
 	 Save the results, because later we won't be in the right context
 	 for making these queries.  */
       if (CLASS_TYPE_P (inner_type)
-	  && (need_default_ctor || need_copy_ctor || need_copy_assignment))
+	  && (need_default_ctor || need_copy_ctor || need_copy_assignment)
+	  && !type_dependent_expression_p (t))
 	{
 	  int save_errorcount = errorcount;
 	  tree info;
--- gcc/testsuite/g++.dg/gomp/pr31598.C.jj	2007-04-24 10:47:50.000000000 +0200
+++ gcc/testsuite/g++.dg/gomp/pr31598.C	2007-04-24 11:49:35.000000000 +0200
@@ -0,0 +1,59 @@
+// PR c++/31598
+// { dg-do compile }
+//
+// Copyright (C) 2007 Free Software Foundation, Inc.
+// Contributed by Theodore.Papadopoulo
+//   16 Apr 2007 <Theodore.Papadopoulo at sophia.inria.fr>
+
+int i;
+template <typename> struct A { A() {} };
+template <typename> struct C { C() { i++; } C(const C &) { i += 2; } };
+struct D { D() {} };
+
+struct M { typedef double E; };
+
+template <typename T>
+struct R
+{
+  R()
+  {
+    typedef A<typename T::E> B;
+    B b;
+    #pragma omp parallel for firstprivate(b) schedule(guided)
+      for (int t = 0; t < 10; ++t)
+	;
+  }
+};
+
+template <typename T>
+struct S
+{
+  S()
+  {
+    typedef C<typename T::E> B;
+    B b;
+    #pragma omp parallel for firstprivate(b)
+      for (int t = 0; t < 10; ++t)
+	;
+  }
+};
+
+struct U
+{
+  U()
+  {
+    D b;
+    #pragma omp parallel for firstprivate(b)
+      for (int t = 0; t < 10; ++t)
+	;
+  }
+};
+
+int
+main ()
+{
+  R<M> r;
+  S<M> s;
+  U u;
+  return 0;
+}

gcc41-rh235008.patch:
 sv.po |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gcc41-rh235008.patch ---
2007-04-12  Jakub Jelinek  <jakub at redhat.com>

	* fr.po: Use %s rather than %S.
	* sr.po: Likewise.
	* tr.po: Likewise.
	* sv.po: Likewise.
	* rw.po: Comment out translations with bogus format
	strings.

--- gcc/po/fr.po	(revision 123636)
+++ gcc/po/fr.po	(working copy)
@@ -31416,7 +31416,7 @@ msgstr "attribut ? %s ? ignor?"
 #~ msgstr "prise de l'adresse de la borne de l'expression d'un pointeur-vers-un membre"
 
 #~ msgid "%s from type `%T' to type `%T' casts away constness"
-#~ msgstr "%S ? partir du ? %T ? vers le type ? %T ? provoque un transtypage sans constante"
+#~ msgstr "%s ? partir du ? %T ? vers le type ? %T ? provoque un transtypage sans constante"
 
 #~ msgid "invalid reinterpret_cast from type `%T' to type `%T'"
 #~ msgstr "reinterpret_cast invalide ? partir du type ? %T ? vers le type ? %T ?"
--- gcc/po/sr.po	(revision 123636)
+++ gcc/po/sr.po	(working copy)
@@ -8516,7 +8516,7 @@ msgstr "???? ???????? ???? ?????????????
 #: fortran/symbol.c:592
 #, no-c-format
 msgid "Duplicate %s attribute specified at %L"
-msgstr "?????????????????? ?????????????? %S ?????????????? ?????? %L"
+msgstr "?????????????????? ?????????????? %s ?????????????? ?????? %L"
 
 #: fortran/symbol.c:733
 #, no-c-format
--- gcc/po/tr.po	(revision 123636)
+++ gcc/po/tr.po	(working copy)
@@ -6951,7 +6951,7 @@ msgstr "INTERFACE g??vdesinde umulmad??k
 #: fortran/parse.c:1604
 #, no-c-format
 msgid "%s statement must appear in a MODULE"
-msgstr "%S deyimi bir MODULE'de g??r??nmemeli"
+msgstr "%s deyimi bir MODULE'de g??r??nmemeli"
 
 #: fortran/parse.c:1611
 #, no-c-format
--- gcc/po/rw.po	(revision 123636)
+++ gcc/po/rw.po	(working copy)
@@ -2168,8 +2168,8 @@ msgstr ""
 
 #: tlink.c:480
 #, fuzzy, c-format
-msgid "renaming .rpo file"
-msgstr "Gufungura %s%S Ibisohoka IDOSIYE"
+#~ msgid "renaming .rpo file"
+#~ msgstr "Gufungura %s%S Ibisohoka IDOSIYE"
 
 #: tlink.c:534
 #, c-format
@@ -17500,8 +17500,8 @@ msgstr "-Umutekano"
 
 #: c-opts.c:1040
 #, fuzzy, gcc-internal-format
-msgid "opening output file %s: %m"
-msgstr "Gufungura %s%S Ibisohoka IDOSIYE"
+#~ msgid "opening output file %s: %m"
+#~ msgstr "Gufungura %s%S Ibisohoka IDOSIYE"
 
 #: c-opts.c:1045
 #, fuzzy, gcc-internal-format
@@ -17515,8 +17515,8 @@ msgstr ""
 
 #: c-opts.c:1177
 #, fuzzy, gcc-internal-format
-msgid "opening dependency file %s: %m"
-msgstr "Gufungura %s%S IDOSIYE"
+#~ msgid "opening dependency file %s: %m"
+#~ msgstr "Gufungura %s%S IDOSIYE"
 
 #: c-opts.c:1187
 #, fuzzy, gcc-internal-format
--- gcc/po/sv.po	2007-02-20 22:38:45.000000000 +0100
+++ gcc/po/sv.po	2007-04-13 00:18:11.000000000 +0200
@@ -3328,7 +3328,7 @@ msgstr "ogiltig operand till %%R"
 #: config/sh/sh.c:773
 #, c-format
 msgid "invalid operand to %%S"
-msgstr "ogiltig operand till %%R"
+msgstr "ogiltig operand till %%S"
 
 #: config/sh/sh.c:7679
 msgid "created and used with different architectures / ABIs"
@@ -8019,7 +8019,7 @@ msgstr "PROCEDURE-attribut i konflikt me
 #: fortran/resolve.c:4943
 #, no-c-format
 msgid "Parameter array '%s' at %L cannot be automatic or assumed shape"
-msgstr "Parametervektor \"%S\" vid %L kan inte ha automatisk eller antagen form"
+msgstr "Parametervektor \"%s\" vid %L kan inte ha automatisk eller antagen form"
 
 #: fortran/resolve.c:4955
 #, no-c-format


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- .cvsignore	18 Apr 2007 20:10:59 -0000	1.204
+++ .cvsignore	25 Apr 2007 09:44:58 -0000	1.205
@@ -1 +1 @@
-gcc-4.1.2-20070418.tar.bz2
+gcc-4.1.2-20070424.tar.bz2


Index: README.libgcjwebplugin.so
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/README.libgcjwebplugin.so,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.libgcjwebplugin.so	15 Sep 2006 09:41:09 -0000	1.1
+++ README.libgcjwebplugin.so	25 Apr 2007 09:44:58 -0000	1.2
@@ -42,7 +42,7 @@
 the web.  If you're interested in trying gcjwebplugin, you can do so
 by creating a symbolic link in ~/.mozilla/plugins like so:
 
-ln -s /usr/lib/gcj-4.1.1/libgcjwebplugin.so ~/.mozilla/plugins/
+ln -s /usr/lib/gcj- at VERSION@/libgcjwebplugin.so ~/.mozilla/plugins/
 
 Type about:plugins in Firefox's URL bar to confirm that the plugin has
 been loaded.  To see gcjwebplugin debugging output, run:


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- gcc41.spec	19 Apr 2007 15:24:24 -0000	1.158
+++ gcc41.spec	25 Apr 2007 09:44:58 -0000	1.159
@@ -1,6 +1,6 @@
-%define DATE 20070418
+%define DATE 20070424
 %define gcc_version 4.1.2
-%define gcc_release 10
+%define gcc_release 11
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -139,9 +139,10 @@
 Patch28: gcc41-pr31187.patch
 Patch29: gcc41-rh231818.patch
 Patch30: gcc41-rh234515.patch
-Patch31: gcc41-pr31632.patch
+Patch31: gcc41-pr30558.patch
 Patch32: gcc41-rh236895.patch
-Patch33: gcc41-rh237067.patch
+Patch33: gcc41-pr31598.patch
+Patch34: gcc41-rh235008.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -451,9 +452,10 @@
 %patch28 -p0 -b .pr31187~
 %patch29 -p0 -b .rh231818~
 %patch30 -p0 -b .rh234515~
-%patch31 -p0 -b .pr31632~
+%patch31 -p0 -b .pr30558~
 %patch32 -p0 -b .rh236895~
-%patch33 -p0 -b .rh237067~
+%patch33 -p0 -b .pr31598~
+%patch34 -p0 -b .rh235008~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -641,7 +643,7 @@
 mkdir -p rpm.doc/gfortran rpm.doc/objc
 mkdir -p rpm.doc/boehm-gc rpm.doc/fastjar rpm.doc/libffi rpm.doc/libjava
 mkdir -p rpm.doc/changelogs/{gcc/cp,gcc/java,gcc/ada,libstdc++-v3,libobjc,libmudflap,libgomp}
-cp -p %{SOURCE2} rpm.doc/README.libgcjwebplugin.so
+sed -e 's, at VERSION@,%{gcc_version},' %{SOURCE2} > rpm.doc/README.libgcjwebplugin.so
 
 for i in {gcc,gcc/cp,gcc/java,gcc/ada,libstdc++-v3,libobjc,libmudflap,libgomp}/ChangeLog*; do
 	cp -p $i rpm.doc/changelogs/$i
@@ -1577,6 +1579,16 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Wed Apr 25 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-11
+- update from gcc-4_1-branch (-r123951:124100)
+  - PRs middle-end/31448, preprocessor/30468, target/28623, target/31641
+- Java fixes
+  - PRs classpath/31626, classpath/31646, #236895
+- fix a couple of translation bugs that could lead to ICEs (#235008)
+- fix ICE with #pragma omp parallel inside of a try catch construct
+  (PR tree-optimization/30558)
+- fix OpenMP clause handling in templates (PR c++/31598)
+
 * Thu Apr 19 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-10
 - fix folding of comparisions against min, min+1, max-1, max
   (#236711, PR tree-optimization/31632)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- sources	18 Apr 2007 20:10:59 -0000	1.206
+++ sources	25 Apr 2007 09:44:58 -0000	1.207
@@ -1 +1 @@
-d315aa245a891a2b44415851d93afa54  gcc-4.1.2-20070418.tar.bz2
+0a2c2aaf18c3227cfb4a6f85ec68847d  gcc-4.1.2-20070424.tar.bz2


--- gcc41-pr31632.patch DELETED ---


--- gcc41-rh237067.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 25 10:44:04 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 06:44:04 -0400
Subject: rpms/man-pages-da/devel man-pages-da.spec,1.12,1.13
Message-ID: <200704251044.l3PAi4Nl021719@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/man-pages-da/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21538

Modified Files:
	man-pages-da.spec 
Log Message:
- Resolves: 237608
  remove URL tag



Index: man-pages-da.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-da/devel/man-pages-da.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- man-pages-da.spec	2 Mar 2007 12:46:12 -0000	1.12
+++ man-pages-da.spec	25 Apr 2007 10:44:01 -0000	1.13
@@ -1,11 +1,10 @@
 Summary: Danish man pages from the Linux Documentation Project
 Name: man-pages-da
 Version: 0.1.1
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: Distributable
 Group: Documentation
 Patch: manpages-da-0.1.1-manpath.patch 
-URL: http://www.sslug.dk/locale/man-sider/
 Source: http://www.sslug.dk/locale/man-sider/manpages-da-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
@@ -38,6 +37,10 @@
 %{_mandir}/da/*
 
 %changelog
+* Wed Apr 25 2007 Ivana Varekova <varekova at redhat.com> - 0.1.1-14
+- Resolves: 237608
+  remove URL tag
+
 * Fri Mar  2 2007 Ivana Varekova <varekova at redhat.com> - 0.1.1-13
 - Resolves: 226122
   incorporate package review feedback



From fedora-cvs-commits at redhat.com  Wed Apr 25 11:23:41 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 07:23:41 -0400
Subject: rpms/system-config-bind/devel system-config-bind.spec,1.67,1.68
Message-ID: <200704251123.l3PBNfp8017733@cvs.devel.redhat.com>

Author: odvorace

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

Modified Files:
	system-config-bind.spec 
Log Message:
corrected spec file


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/devel/system-config-bind.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- system-config-bind.spec	3 Apr 2007 11:35:21 -0000	1.67
+++ system-config-bind.spec	25 Apr 2007 11:23:39 -0000	1.68
@@ -1,10 +1,9 @@
 Summary: 	The Red Hat BIND DNS Configuration Tool.
 Name: 		system-config-bind
 Version: 	4.0.2
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 License: 	GPL
 Group: 		Applications/System
-URL: 		http://people.redhat.com/~jvdias/system-config-bind
 Source0: 	%{name}-%{version}.tar.gz
 Patch: 		system-config-bind-4.0.2-ver.patch
 Patch1:		system-config-bind-4.0.2-version-2.patch
@@ -107,6 +106,9 @@
 fi
 
 %changelog
+* Wed Apr 25 2007 Ondrej Dvoracek <odvorace at redhat.com> - 4.0.2.7
+- Removed broken URL (#237363)
+
 * Tue Apr 3 2007 Ondrej Dvoracek <odvorace at redhat.com> - 4.0.2-6
 - Corrected rndc key labels
 - Resolves #219795



From fedora-cvs-commits at redhat.com  Wed Apr 25 12:00:56 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 08:00:56 -0400
Subject: rpms/system-config-nfs/devel .cvsignore, 1.31, 1.32 sources, 1.34,
	1.35 system-config-nfs.spec, 1.38, 1.39
Message-ID: <200704251200.l3PC0umI023082@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore sources system-config-nfs.spec 
Log Message:
pick up updated language files
update URL
mention that we are upstream
use preferred buildroot
clean buildroot before installing
fix licensing blurb in PO files
require python >= 2.0 instead of python2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-nfs/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	8 Feb 2007 13:43:33 -0000	1.31
+++ .cvsignore	25 Apr 2007 12:00:49 -0000	1.32
@@ -1 +1 @@
-system-config-nfs-1.3.24.tar.bz2
+system-config-nfs-1.3.25.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-nfs/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	8 Feb 2007 13:43:33 -0000	1.34
+++ sources	25 Apr 2007 12:00:49 -0000	1.35
@@ -1 +1 @@
-9eef73dfa522781066a5da52f75474af  system-config-nfs-1.3.24.tar.bz2
+df9fbef6b1da57d1850d7e697b80d923  system-config-nfs-1.3.25.tar.bz2


Index: system-config-nfs.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-nfs/devel/system-config-nfs.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- system-config-nfs.spec	8 Feb 2007 13:43:33 -0000	1.38
+++ system-config-nfs.spec	25 Apr 2007 12:00:49 -0000	1.39
@@ -1,13 +1,15 @@
 Summary: NFS server configuration tool
 Name: system-config-nfs
-Version: 1.3.24
+Version: 1.3.25
 Release: 1%{?dist}
-URL: http://fedora.redhat.com/projects/config-tools/
+URL: http://fedoraproject.org/wiki/SystemConfig/nfs
 License: GPL
 ExclusiveOS: Linux
 Group: System Environment/Base
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
+# We are upstream, thus the source is only available from within this source
+# package.
 Source0: %{name}-%{version}.tar.bz2
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -16,7 +18,7 @@
 Obsoletes: redhat-config-nfs
 Requires: pygtk2
 Requires: pygtk2-libglade
-Requires: python2
+Requires: python >= 2.0
 Requires: nfs-utils
 Requires: usermode >= 1.36
 Requires: rhpl
@@ -35,6 +37,7 @@
 make %{?_smp_mflags}
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
 desktop-file-install --vendor system --delete-original       \
@@ -73,6 +76,19 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-nfs
 
 %changelog
+* Wed Apr 25 2007 Nils Philippsen <nphilipp at redhat.com> 1.3.25
+- pick up updated language files
+
+* Thu Mar 22 2007 Nils Philippsen <nphilipp at redhat.com>
+- update URL
+
+* Tue Mar 20 2007 Nils Philippsen <nphilipp at redhat.com>
+- mention that we are upstream
+- use preferred buildroot
+- clean buildroot before installing
+- fix licensing blurb in PO files
+- require python >= 2.0 instead of python2
+
 * Thu Feb 08 2007 Nils Philippsen <nphilipp at redhat.com> 1.3.24
 - pick up updated translations
 



From fedora-cvs-commits at redhat.com  Wed Apr 25 12:01:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 08:01:36 -0400
Subject: rpms/hal-cups-utils/devel .cvsignore, 1.15, 1.16 hal-cups-utils.spec,
	1.52, 1.53 sources, 1.15, 1.16
Message-ID: <200704251201.l3PC1aOn023159@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore hal-cups-utils.spec sources 
Log Message:
* Wed Apr 25 2007 Tim Waugh <twaugh at redhat.com> 0.6.7-1
- 0.6.7:
  - Use usb: URI scheme when possible (bug #236720).
- Resolves: rhbz#236720



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	4 Apr 2007 14:17:59 -0000	1.15
+++ .cvsignore	25 Apr 2007 12:01:34 -0000	1.16
@@ -3,3 +3,4 @@
 hal-cups-utils-0.6.4.tar.gz
 hal-cups-utils-0.6.5.tar.gz
 hal-cups-utils-0.6.6.tar.gz
+hal-cups-utils-0.6.7.tar.gz


Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- hal-cups-utils.spec	4 Apr 2007 14:17:59 -0000	1.52
+++ hal-cups-utils.spec	25 Apr 2007 12:01:34 -0000	1.53
@@ -1,6 +1,6 @@
 Summary: Halified CUPS utilities 
 Name: hal-cups-utils
-Version: 0.6.6
+Version: 0.6.7
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
@@ -59,6 +59,10 @@
 %{_initrddir}/cups-config-daemon
 
 %changelog
+* Wed Apr 25 2007 Tim Waugh <twaugh at redhat.com> 0.6.7-1
+- 0.6.7:
+  - Use usb: URI scheme when possible (bug #236720).
+
 * Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com> 0.6.6-1
 - Prevent a traceback in hal_lpadmin (bug #232733).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	4 Apr 2007 14:17:59 -0000	1.15
+++ sources	25 Apr 2007 12:01:34 -0000	1.16
@@ -1 +1 @@
-72065a8df3cfbe25a16dc3fcbde44f53  hal-cups-utils-0.6.6.tar.gz
+457343aac052cb621a211d4262374720  hal-cups-utils-0.6.7.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 25 12:02:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 08:02:49 -0400
Subject: rpms/hal-cups-utils/FC-6 .cvsignore, 1.14, 1.15 hal-cups-utils.spec,
	1.48, 1.49 sources, 1.14, 1.15
Message-ID: <200704251202.l3PC2nut023283@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore hal-cups-utils.spec sources 
Log Message:
* Wed Apr 25 2007 Tim Waugh <twaugh at redhat.com> 0.6.7-1
- 0.6.7:
  - Use usb: URI scheme when possible (bug #236720).
  - Prevent a traceback in hal_lpadmin (bug #232733).
- Resolves: rhbz#236720 rhbz#232733



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/FC-6/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	8 Jan 2007 17:03:55 -0000	1.14
+++ .cvsignore	25 Apr 2007 12:02:47 -0000	1.15
@@ -2,3 +2,4 @@
 hal-cups-utils-0.6.3.tar.gz
 hal-cups-utils-0.6.4.tar.gz
 hal-cups-utils-0.6.5.tar.gz
+hal-cups-utils-0.6.7.tar.gz


Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/FC-6/hal-cups-utils.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- hal-cups-utils.spec	8 Jan 2007 17:03:55 -0000	1.48
+++ hal-cups-utils.spec	25 Apr 2007 12:02:47 -0000	1.49
@@ -1,6 +1,6 @@
 Summary: Halified CUPS utilities 
 Name: hal-cups-utils
-Version: 0.6.5
+Version: 0.6.7
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
@@ -59,6 +59,11 @@
 %{_initrddir}/cups-config-daemon
 
 %changelog
+* Wed Apr 25 2007 Tim Waugh <twaugh at redhat.com> 0.6.7-1
+- 0.6.7:
+  - Use usb: URI scheme when possible (bug #236720).
+  - Prevent a traceback in hal_lpadmin (bug #232733).
+
 * Mon Jan  8 2007 Tim Waugh <twaugh at redhat.com> 0.6.5-1
 - Requires system-config-printer >= 0.7.46.
 - 0.6.5:


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/FC-6/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	8 Jan 2007 17:03:55 -0000	1.14
+++ sources	25 Apr 2007 12:02:47 -0000	1.15
@@ -1 +1,2 @@
 c6c136608761159f9d2cc682ee2b1e8d  hal-cups-utils-0.6.5.tar.gz
+457343aac052cb621a211d4262374720  hal-cups-utils-0.6.7.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 25 12:29:28 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 08:29:28 -0400
Subject: rpms/system-config-date/FC-6
	system-config-date-1.8.12-missingntpconf.patch, NONE,
	1.1 system-config-date.spec, 1.60, 1.61
Message-ID: <200704251229.l3PCTST6023745@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/system-config-date/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv23729

Modified Files:
	system-config-date.spec 
Added Files:
	system-config-date-1.8.12-missingntpconf.patch 
Log Message:
handle missing /etc/ntp.conf gracefully (#237736)
Resolves: #237736


system-config-date-1.8.12-missingntpconf.patch:
 dateBackend.py |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE system-config-date-1.8.12-missingntpconf.patch ---
--- system-config-date-1.8.12/src/dateBackend.py.missingntpconf	2006-03-06 16:35:42.000000000 +0100
+++ system-config-date-1.8.12/src/dateBackend.py	2007-04-25 14:26:33.000000000 +0200
@@ -154,8 +154,9 @@
         serversfound = []
         restrictfound = []
 
-        #Write /etc/ntp.conf file
-        if self.ntpFile:
+        # Write /etc/ntp.conf file, default to template if it was missing or
+        # empty
+        if self.ntpFile and len (self.ntpFile) > 0:
             lines = self.ntpFile
         else:
             fd = open("/usr/share/system-config-date/ntp.template", "r")
@@ -392,7 +393,7 @@
                         if not self.restrict_hosts.has_key (host):
                             self.restrict_hosts[host] = line
 
-            return (self.ntpServers, self.ntpLocalTimeSource)
+        return (self.ntpServers, self.ntpLocalTimeSource)
 
     def getNtpBroadcastClient(self):
         broadcastclient = False


Index: system-config-date.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/FC-6/system-config-date.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- system-config-date.spec	16 Jan 2007 09:12:51 -0000	1.60
+++ system-config-date.spec	25 Apr 2007 12:29:26 -0000	1.61
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
 Version: 1.8.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -9,6 +9,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 Source0: %{name}-%{version}.tar.bz2
+Patch0: system-config-date-1.8.12-missingntpconf.patch
 Obsoletes: timetool
 Obsoletes: dateconfig
 Obsoletes: timeconfig
@@ -38,6 +39,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .missingntpconf
 
 %build
 make
@@ -98,6 +100,9 @@
 %attr(0644,root,root) %config(noreplace) /usr/share/system-config-date/ntp.template
 
 %changelog
+* Wed Apr 25 2007 Nils Philippsen <nphilipp at redhat.com> 1.8.12-2
+- handle missing /etc/ntp.conf gracefully (#237736)
+
 * Tue Jan 16 2007 Nils Philippsen <nphilipp at redhat.com> 1.8.12
 - pick up updated translations (#220952)
 



From fedora-cvs-commits at redhat.com  Wed Apr 25 12:36:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 08:36:53 -0400
Subject: rpms/system-config-date/devel .cvsignore, 1.58, 1.59 sources, 1.62,
	1.63 system-config-date.spec, 1.67, 1.68
Message-ID: <200704251236.l3PCarCM008764@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
handle missing /etc/ntp.conf gracefully (#237777)
versionize obsoletes
pick up updated translations
Resolves: #237777



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	24 Apr 2007 09:53:04 -0000	1.58
+++ .cvsignore	25 Apr 2007 12:36:51 -0000	1.59
@@ -1 +1 @@
-system-config-date-1.8.95.tar.bz2
+system-config-date-1.8.96.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	24 Apr 2007 09:53:04 -0000	1.62
+++ sources	25 Apr 2007 12:36:51 -0000	1.63
@@ -1 +1 @@
-c19817e07fb16197237efa022365254e  system-config-date-1.8.95.tar.bz2
+81e2dc017d862d850038554d2d6618e6  system-config-date-1.8.96.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- system-config-date.spec	24 Apr 2007 09:53:04 -0000	1.67
+++ system-config-date.spec	25 Apr 2007 12:36:51 -0000	1.68
@@ -1,6 +1,6 @@
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.8.95
+Version: 1.8.96
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/date
 License: GPL
@@ -11,10 +11,10 @@
 # We are upstream, thus the source is only available from within this source
 # package.
 Source0: %{name}-%{version}.tar.bz2
-Obsoletes: timetool
-Obsoletes: dateconfig
-Obsoletes: timeconfig
-Obsoletes: redhat-config-date
+Obsoletes: timetool < 3.0
+Obsoletes: dateconfig < 1.2
+Obsoletes: timeconfig < 3.2.10
+Obsoletes: redhat-config-date < 1.5.26
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: intltool
@@ -96,6 +96,11 @@
 %config(noreplace) %{_sysconfdir}/ntp/ntpservers
 
 %changelog
+* Wed Apr 25 2007 Nils Philippsen <nphilipp at redhat.com> 1.8.96
+- handle missing /etc/ntp.conf gracefully (#237777)
+- versionize obsoletes
+- pick up updated translations
+
 * Tue Apr 24 2007 Nils Philippsen <nphilipp at redhat.com> 1.8.95
 - move zoom scale to the left of the canvas
 



From fedora-cvs-commits at redhat.com  Wed Apr 25 12:48:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 08:48:21 -0400
Subject: rpms/tcsh/devel tcsh-6.14.00-unprintable.patch, NONE, 1.1 tcsh.spec,
	1.47, 1.48
Message-ID: <200704251248.l3PCmLqr017362@cvs.devel.redhat.com>

Author: vcrhonek

Update of /cvs/dist/rpms/tcsh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17315

Modified Files:
	tcsh.spec 
Added Files:
	tcsh-6.14.00-unprintable.patch 
Log Message:
fix unprintable (#233525)

tcsh-6.14.00-unprintable.patch:
 tw.parse.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE tcsh-6.14.00-unprintable.patch ---
--- tcsh-6.14.00/tw.parse.c.old	2007-04-24 16:46:32.000000000 +0200
+++ tcsh-6.14.00/tw.parse.c	2007-04-24 17:02:28.000000000 +0200
@@ -2065,7 +2065,8 @@
 	     (Strchr(val, 'x') != NULL);
 
     for (i = 0; i < count; i++)	{ /* find widest string */
-	maxwidth = max(maxwidth, (unsigned int) NLSStringWidth(items[i]));
+        if (NLSStringWidth(items[i]) != -1)
+	    maxwidth = max(maxwidth, (unsigned int) NLSStringWidth(items[i]));
     }
 
     maxwidth += no_file_suffix ? 1 : 2;	/* for the file tag and space */


Index: tcsh.spec
===================================================================
RCS file: /cvs/dist/rpms/tcsh/devel/tcsh.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- tcsh.spec	26 Feb 2007 15:55:08 -0000	1.47
+++ tcsh.spec	25 Apr 2007 12:48:19 -0000	1.48
@@ -3,7 +3,7 @@
 Summary: An enhanced version of csh, the C shell
 Name: tcsh
 Version: 6.14
-Release: 15
+Release: 16
 License: BSD
 Group: System Environment/Shells
 Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz
@@ -20,6 +20,7 @@
 Patch10: tcsh-6.14.00-spell-crash.patch
 Patch11: tcsh-6.14.00-remotehost.patch
 Patch12: tcsh-6.14.00-tinfo.patch
+Patch13: tcsh-6.14.00-unprintable.patch
 Provides: csh = %{version}
 Requires(post): grep
 Requires(postun): coreutils, grep
@@ -50,6 +51,7 @@
 %patch10 -p1 -b .spell-crash
 %patch11 -p1 -b .remotehost
 %patch12 -p1 -b .tinfo
+%patch13 -p1 -b .unprintable
 
 %build
 # For tcsh-6.14.00-tinfo.patch
@@ -117,6 +119,10 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Apr 25 2007 Vitezslav Crhonek <vcrhonek at redhat.com> 6.14-16
+- Fix floating exception in print_by_column() with unprintable characters
+  (#233525)
+
 * Mon Feb 26 2007 Miloslav Trmac <mitr at redhat.com> - 6.14-15
 - Fix License:
   Related: #226483.



From fedora-cvs-commits at redhat.com  Wed Apr 25 12:53:27 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 08:53:27 -0400
Subject: rpms/system-config-users/devel .cvsignore, 1.44, 1.45 sources, 1.47,
	1.48 system-config-users.spec, 1.53, 1.54
Message-ID: <200704251253.l3PCrRUj021052@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore sources system-config-users.spec 
Log Message:
pick up updated translations



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-users/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	30 Mar 2007 07:51:44 -0000	1.44
+++ .cvsignore	25 Apr 2007 12:53:25 -0000	1.45
@@ -1 +1 @@
-system-config-users-1.2.56.tar.bz2
+system-config-users-1.2.57.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-users/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	30 Mar 2007 07:51:44 -0000	1.47
+++ sources	25 Apr 2007 12:53:25 -0000	1.48
@@ -1 +1 @@
-821dca368d153e85cd0eeb5e963435d1  system-config-users-1.2.56.tar.bz2
+e889081d47e474edc0315e1b5145b1dc  system-config-users-1.2.57.tar.bz2


Index: system-config-users.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-users/devel/system-config-users.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- system-config-users.spec	30 Mar 2007 07:51:02 -0000	1.53
+++ system-config-users.spec	25 Apr 2007 12:53:25 -0000	1.54
@@ -1,6 +1,6 @@
 Summary: A graphical interface for administering users and groups
 Name: system-config-users
-Version: 1.2.56
+Version: 1.2.57
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/users
 License: GPL
@@ -89,6 +89,9 @@
 %attr(0644,root,root) %config (noreplace) /etc/sysconfig/system-config-users
 
 %changelog
+* Wed Apr 25 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.57
+- pick up updated translations
+
 * Fri Mar 30 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.56
 - check whether password and confirmed password match before checking weakness
   etc.



From fedora-cvs-commits at redhat.com  Wed Apr 25 12:58:37 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 08:58:37 -0400
Subject: rpms/smartmontools/FC-6 smartmontools-5.37-cloexec.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 smartd.initd, 1.4,
	1.5 smartmontools.spec, 1.24, 1.25 sources, 1.3, 1.4
Message-ID: <200704251258.l3PCwbL0024940@cvs.devel.redhat.com>

Author: tsmetana

Update of /cvs/dist/rpms/smartmontools/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv24886

Modified Files:
	.cvsignore smartd.initd smartmontools.spec sources 
Added Files:
	smartmontools-5.37-cloexec.patch 
Log Message:
New upstream version (#237399), fix minor bug (#237531)

smartmontools-5.37-cloexec.patch:
 os_linux.cpp |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

--- NEW FILE smartmontools-5.37-cloexec.patch ---
--- smartmontools-5.37/os_linux.cpp.fix	2006-10-25 19:01:42.000000000 +0200
+++ smartmontools-5.37/os_linux.cpp	2007-02-27 13:20:55.000000000 +0100
@@ -190,14 +190,14 @@
 
 // equivalent to open(path, flags)
 int deviceopen(const char *pathname, char *type){
+  int fd = -1;
   if (!strcmp(type,"SCSI")) {
-    int fd = open(pathname, O_RDWR | O_NONBLOCK);
+    fd = open(pathname, O_RDWR | O_NONBLOCK);
     if (fd < 0 && errno == EROFS)
       fd = open(pathname, O_RDONLY | O_NONBLOCK);
-    return fd;
   }
   else if (!strcmp(type,"ATA")) 
-    return open(pathname, O_RDONLY | O_NONBLOCK);
+    fd = open(pathname, O_RDONLY | O_NONBLOCK);
   else if (!strcmp(type,"ATA_3WARE_9000")) {
     // the device nodes for this controller are dynamically assigned,
     // so we need to check that they exist with the correct major
@@ -207,7 +207,7 @@
         errno=ENXIO;
       return -1;
     }
-    return open(pathname, O_RDONLY | O_NONBLOCK);
+    fd = open(pathname, O_RDONLY | O_NONBLOCK);
   }
   else if (!strcmp(type,"ATA_3WARE_678K")) {
     // the device nodes for this controller are dynamically assigned,
@@ -218,15 +218,19 @@
         errno=ENXIO;
       return -1;
     }
-    return open(pathname, O_RDONLY | O_NONBLOCK);
+    fd = open(pathname, O_RDONLY | O_NONBLOCK);
   }
   else if(!strcmp(type, "CCISS")) {
     // the device is a cciss smart array device.
-    return open(pathname, O_RDWR | O_NONBLOCK);
+    fd = open(pathname, O_RDWR | O_NONBLOCK);
   }
   else
     return -1;
 
+  if (fd != -1) {
+    fcntl(fd, F_SETFD, FD_CLOEXEC);
+  }
+  return fd;
 }
 
 // equivalent to close(file descriptor)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/smartmontools/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 May 2006 07:54:10 -0000	1.4
+++ .cvsignore	25 Apr 2007 12:58:35 -0000	1.5
@@ -1 +1,2 @@
 smartmontools-5.36.tar.gz
+smartmontools-5.37.tar.gz


Index: smartd.initd
===================================================================
RCS file: /cvs/dist/rpms/smartmontools/FC-6/smartd.initd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- smartd.initd	13 Dec 2006 13:19:43 -0000	1.4
+++ smartd.initd	25 Apr 2007 12:58:35 -0000	1.5
@@ -78,6 +78,7 @@
 	    ;;
 	status)
 	    status $prog
+	    RETVAL=$?
 	    ;;
 	*)
 	    echo $"Usage: $0 {start|stop|reload|report|restart|status}"


Index: smartmontools.spec
===================================================================
RCS file: /cvs/dist/rpms/smartmontools/FC-6/smartmontools.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- smartmontools.spec	13 Dec 2006 13:19:43 -0000	1.24
+++ smartmontools.spec	25 Apr 2007 12:58:35 -0000	1.25
@@ -1,19 +1,16 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
-Version:	5.36
-Release: 	3.2%{?dist}
+Version:	5.37
+Release: 	1%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPL
 URL:		http://smartmontools.sourceforge.net/
 Source0:	http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source1:	http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz.asc
-Source2:	smartd.initd
-Source3:	smartd-conf.py
-Source4:	smartmontools.sysconf
-Patch1:		http://people.fedora.de/rsc/smartmontools-5.36-cciss.patch
-Patch2:		smartmontools-5.36-cloexec.patch
-Patch3:		smartmontools-5.36-sata.patch
+Source1:	smartd.initd
+Source2:	smartd-conf.py
+Source3:	smartmontools.sysconf
+Patch1:		smartmontools-5.37-cloexec.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 PreReq:		/sbin/chkconfig /sbin/service
@@ -32,9 +29,7 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .cciss
-%patch2 -p1 -b .cloexec
-%patch3 -p1 -b .sata
+%patch1 -p1 -b .cloexec
 
 %build
 %configure
@@ -46,9 +41,9 @@
 
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/smartd.conf
 rm -f examplescripts/Makefile*
-install -D -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/smartd
-install -D -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sbindir}/smartd-conf.py
-install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/smartmontools
+install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/smartd
+install -D -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sbindir}/smartd-conf.py
+install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/smartmontools
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -80,6 +75,10 @@
 
 
 %changelog
+* Wed Apr 25 2007 Tomas Smetana <tsmetana at redhat.com> - 1:5.36-3.2
+- new upstream version (#237399)
+- return correct value from init script (#237531)
+
 * Wed Dec 13 2006 Tomas Mraz <tmraz at redhat.com> - 1:5.36-3.2
 - make descripton in init script recognizable by s-c-services (#217591)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/smartmontools/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 May 2006 07:54:10 -0000	1.3
+++ sources	25 Apr 2007 12:58:35 -0000	1.4
@@ -1 +1 @@
-2e424f2d35efa38a29ebca419c1dbe3c  smartmontools-5.36.tar.gz
+4ab3668b7d1362ce923f64a211e0e568  smartmontools-5.37.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 25 13:25:02 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 09:25:02 -0400
Subject: rpms/smartmontools/FC-6 smartmontools.spec,1.25,1.26
Message-ID: <200704251325.l3PDP2aW010658@cvs.devel.redhat.com>

Author: tsmetana

Update of /cvs/dist/rpms/smartmontools/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv10601

Modified Files:
	smartmontools.spec 
Log Message:
Fix broken build on x86_64


Index: smartmontools.spec
===================================================================
RCS file: /cvs/dist/rpms/smartmontools/FC-6/smartmontools.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- smartmontools.spec	25 Apr 2007 12:58:35 -0000	1.25
+++ smartmontools.spec	25 Apr 2007 13:24:59 -0000	1.26
@@ -33,7 +33,7 @@
 
 %build
 %configure
-make CFLAGS="$RPM_OPT_FLAGS -fpie" LDFLAGS="-pie -Wl,-z,relro,-z,now"
+make CFLAGS="$RPM_OPT_FLAGS -fpie" LDFLAGS="-fpie -Wl,-z,relro,-z,now"
 
 %install
 rm -rf $RPM_BUILD_ROOT



From fedora-cvs-commits at redhat.com  Wed Apr 25 13:26:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 09:26:43 -0400
Subject: rpms/kernel-xen-2.6/devel linux-2.6-xen-execshield.patch, 1.3.2.4,
	1.3.2.5
Message-ID: <200704251326.l3PDQhgC011906@cvs.devel.redhat.com>

Author: ehabkost

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

Modified Files:
      Tag: private-ehabkost-2_6_21-branch
	linux-2.6-xen-execshield.patch 
Log Message:
Fix the xen execshield patch to implement load_user_cs_desc() properly

This code was on the previous linux-2.6-xen-execshield.patch, but the
regeneration of the patch due to conflicts on the old patch removed
reverted load_user_cs_desc() to the non-xen implementation.



linux-2.6-xen-execshield.patch:
 arch/i386/kernel/cpu/common-xen.c         |    7 ++
 arch/i386/kernel/process-xen.c            |   60 +++++++++++++++++++
 arch/i386/kernel/smp-xen.c                |    3 
 arch/i386/kernel/traps-xen.c              |   93 +++++++++++++++++++++++++++++-
 arch/i386/mm/init-xen.c                   |    6 +
 arch/x86_64/kernel/process-xen.c          |    6 -
 arch/x86_64/kernel/setup64-xen.c          |   40 ------------
 arch/x86_64/mm/fault-xen.c                |    2 
 include/asm-i386/mach-xen/asm/desc.h      |   14 ++++
 include/asm-i386/mach-xen/asm/pgalloc.h   |    1 
 include/asm-i386/mach-xen/asm/processor.h |    8 ++
 include/asm-x86_64/mach-xen/asm/pgalloc.h |    7 ++
 12 files changed, 197 insertions(+), 50 deletions(-)

Index: linux-2.6-xen-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/linux-2.6-xen-execshield.patch,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -r1.3.2.4 -r1.3.2.5
--- linux-2.6-xen-execshield.patch	23 Apr 2007 16:39:00 -0000	1.3.2.4
+++ linux-2.6-xen-execshield.patch	25 Apr 2007 13:26:40 -0000	1.3.2.5
@@ -367,7 +367,7 @@
 +}
 +
 +#define load_user_cs_desc(cpu, mm) \
-+	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
++        HYPERVISOR_update_descriptor(virt_to_machine(&get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS]), (u64)(mm)->context.user_cs.a | ((u64)(mm)->context.user_cs.b) << 32);
 +
 +extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
 +extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);



From fedora-cvs-commits at redhat.com  Wed Apr 25 13:35:58 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 09:35:58 -0400
Subject: rpms/openoffice.org/FC-6
	openoffice.org-2.0.4.ooo69010.sd.undocrash.patch, NONE,
	1.1 openoffice.org.spec, 1.942, 1.943
Message-ID: <200704251335.l3PDZwqS018298@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.4.ooo69010.sd.undocrash.patch 
Log Message:
add openoffice.org-2.0.4.ooo69010.sd.undocrash.patch

openoffice.org-2.0.4.ooo69010.sd.undocrash.patch:
 outlview.cxx |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

--- NEW FILE openoffice.org-2.0.4.ooo69010.sd.undocrash.patch ---
Index: source/ui/view/outlview.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/view/outlview.cxx,v
retrieving revision 1.42
retrieving revision 1.42.38.1
diff -u -r1.42 -r1.42.38.1
--- openoffice.org.orig/sd/source/ui/view/outlview.cxx	16 Sep 2006 19:41:44 -0000	1.42
+++ openoffice.org/sd/source/ui/view/outlview.cxx	25 Oct 2006 16:55:58 -0000	1.42.38.1
@@ -1856,6 +1856,7 @@
 					// the top EditUndo of the previous undo list
 
 					// first remove the merged undo action
+					DBG_ASSERT( pListAction->aUndoActions[nEditPos] == pEditUndo, "sd::OutlineView::TryToMergeUndoActions(), wrong edit pos!" );
 					pListAction->aUndoActions.Remove(nEditPos);
 					delete pEditUndo;
 
@@ -1882,15 +1883,14 @@
 
 							if( pSourceList && pDestinationList )
 							{
-								const USHORT nCount = pSourceList->aUndoActions.Count();
-								nAction = 0;
+								USHORT nCount = pSourceList->aUndoActions.Count();
 								USHORT nDestAction = pDestinationList->aUndoActions.Count();
-								while( nAction < nCount )
+								while( nCount-- )
 								{
-									const SfxUndoAction* pTemp = pSourceList->aUndoActions.GetObject(nAction++);
+									const SfxUndoAction* pTemp = pSourceList->aUndoActions.GetObject(0);
+									pSourceList->aUndoActions.Remove(0);
 									pDestinationList->aUndoActions.Insert( pTemp, nDestAction++ );
 								}
-								pSourceList->aUndoActions.Remove( nCount - 1 );
 								pDestinationList->nCurUndoAction = pDestinationList->aUndoActions.Count();
 
 								pListAction->aUndoActions.Remove(0);
@@ -1906,17 +1906,15 @@
 						// now we have to move all remaining doc undo actions from the top undo
 						// list to the previous undo list and remove the top undo list
 
-						const USHORT nCount = pListAction->aUndoActions.Count();
-						nAction = 0;
+						USHORT nCount = pListAction->aUndoActions.Count();
 						USHORT nDestAction = pPrevListAction->aUndoActions.Count();
-						while( nAction < nCount )
+						while( nCount-- )
 						{
-							const SfxUndoAction* pTemp = pListAction->aUndoActions.GetObject(nAction++);
+							const SfxUndoAction* pTemp = pListAction->aUndoActions.GetObject(0);
+							pListAction->aUndoActions.Remove(0);
 							if( pTemp )
 								pPrevListAction->aUndoActions.Insert( pTemp, nDestAction++ );
 						}
-
-						pListAction->aUndoActions.Remove( nCount - 1 );
 						pPrevListAction->nCurUndoAction = pPrevListAction->aUndoActions.Count();
 					}
 	


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v
retrieving revision 1.942
retrieving revision 1.943
diff -u -r1.942 -r1.943
--- openoffice.org.spec	17 Apr 2007 17:13:58 -0000	1.942
+++ openoffice.org.spec	25 Apr 2007 13:35:55 -0000	1.943
@@ -1,6 +1,6 @@
 %define oootag OOD680
 %define ooomilestone 5
-%define rh_rpm_release 5.22
+%define rh_rpm_release 5.23
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -164,6 +164,7 @@
 Patch96: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
 Patch97: openoffice.org-cairoupdate.patch
 Patch98: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch99: openoffice.org-2.0.4.ooo69010.sd.undocrash.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1062,6 +1063,7 @@
 %patch96 -p1 -b .ooo75167.framework.workspacerestore.patch
 %patch97 -p1 -b .openoffice.org-cairoupdate.patch
 %patch98 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch99 -p1 -b .ooo69010.sd.undocrash.patch
 
 tar xzf %{SOURCE1}
 
@@ -2591,6 +2593,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Wed Apr 25 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.23
+- add openoffice.org-2.0.4.ooo69010.sd.undocrash.patch
+
 * Tue Apr 17 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.22
 - Resolves: rhbz#236773 unbelieveably impress fails on using the file dialog
 



From fedora-cvs-commits at redhat.com  Wed Apr 25 14:15:56 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 10:15:56 -0400
Subject: rpms/system-config-services/devel .cvsignore, 1.31, 1.32 sources,
	1.41, 1.42 system-config-services.spec, 1.42, 1.43
Message-ID: <200704251415.l3PEFuAv016019@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore sources system-config-services.spec 
Log Message:
pick up updated translations
work around issues with UTF-8 in translatable strings (#232809)
update URL
mention that we are upstream
use preferred buildroot
fix licensing blurb in PO files
recode spec file to UTF-8
Resolves: #232809



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-services/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	31 Jan 2007 17:08:40 -0000	1.31
+++ .cvsignore	25 Apr 2007 14:15:54 -0000	1.32
@@ -1 +1 @@
-system-config-services-0.9.6.tar.bz2
+system-config-services-0.9.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-services/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	31 Jan 2007 17:08:40 -0000	1.41
+++ sources	25 Apr 2007 14:15:54 -0000	1.42
@@ -1 +1 @@
-3fd833284441c566c708196399055b4c  system-config-services-0.9.6.tar.bz2
+52db18a9cf62d1d2e77e437c7e807e7e  system-config-services-0.9.7.tar.bz2


Index: system-config-services.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-services/devel/system-config-services.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- system-config-services.spec	31 Jan 2007 17:08:40 -0000	1.42
+++ system-config-services.spec	25 Apr 2007 14:15:54 -0000	1.43
@@ -1,14 +1,16 @@
 # -*- RPM-SPEC -*-
 Summary: system-config-services is an initscript and xinetd configuration utility
 Name: system-config-services
-Version: 0.9.6
+Version: 0.9.7
 Release: 1%{?dist}
-URL: http://www.redhat.com/ 
+URL: http://fedoraproject.org/wiki/SystemConfig/services
+# We are upstream, thus the source is only available from within this source
+# package.
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
 Group: Applications/System
 BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: /sbin/chkconfig
 Requires: pygtk2, pygtk2-libglade, rhpl
 Requires: usermode >= 1.36, usermode-gtk
@@ -76,6 +78,19 @@
 %{_mandir}/*/system-config-services.8*
 
 %changelog
+* Wed Apr 25 2007 Nils Philippsen <nphilipp at redhat.com> - 0.9.7
+- pick up updated translations
+- work around issues with UTF-8 in translatable strings (#232809)
+
+* Thu Mar 22 2007 Nils Philippsen <nphilipp at redhat.com>
+- update URL
+
+* Tue Mar 20 2007 Nils Philippsen <nphilipp at redhat.com>
+- mention that we are upstream
+- use preferred buildroot
+- fix licensing blurb in PO files
+- recode spec file to UTF-8
+
 * Wed Jan 31 2007 Nils Philippsen <nphilipp at redhat.com> - 0.9.6
 - fix up service metadata reading a bit (#217591)
 
@@ -426,7 +441,7 @@
 * Wed May 29 2002 Bill Nottingham <notting at redhat.com> 0.8.0-1
 - initial hack gtk2 port
 
-* Mon Apr 15 2002 Trond Eivind Glomsr?d <teg at redhat.com> 0.7.0-3
+* Mon Apr 15 2002 Trond Eivind Glomsr??d <teg at redhat.com> 0.7.0-3
 - Update translations
 
 * Wed Apr 10 2002 Bill Nottingham <notting at redhat.com> 0.7.0-2



From fedora-cvs-commits at redhat.com  Wed Apr 25 15:11:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 11:11:23 -0400
Subject: rpms/libsemanage/devel .cvsignore, 1.74, 1.75 libsemanage.spec,
	1.121, 1.122 sources, 1.76, 1.77
Message-ID: <200704251511.l3PFBNoq025676@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libsemanage.spec sources 
Log Message:
* Wed Apr 25 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.2-1
- Upgrade to latest from NSA
	* Merged optimizations from Stephen Smalley.
	  - do not set all booleans upon commit, only those whose values have changed
	  - only install the sandbox upon commit if something was rebuilt



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- .cvsignore	13 Mar 2007 00:21:38 -0000	1.74
+++ .cvsignore	25 Apr 2007 15:11:21 -0000	1.75
@@ -80,3 +80,4 @@
 libsemanage-1.10.1.tgz
 libsemanage-2.0.0.tgz
 libsemanage-2.0.1.tgz
+libsemanage-2.0.2.tgz


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- libsemanage.spec	27 Mar 2007 19:48:04 -0000	1.121
+++ libsemanage.spec	25 Apr 2007 15:11:21 -0000	1.122
@@ -2,8 +2,8 @@
 %define libselinuxver 2.0.0-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 2.0.1
-Release: 2%{?dist}
+Version: 2.0.2
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -77,6 +77,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 25 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.2-1
+- Upgrade to latest from NSA
+	* Merged optimizations from Stephen Smalley.
+	  - do not set all booleans upon commit, only those whose values have changed
+	  - only install the sandbox upon commit if something was rebuilt
+
 * Sat Mar 17 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.1-2
 - Add SELinux to Man page Names so man -k will work
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- sources	13 Mar 2007 00:21:38 -0000	1.76
+++ sources	25 Apr 2007 15:11:21 -0000	1.77
@@ -1 +1 @@
-af7c5925ae205d6006b608f820a18b02  libsemanage-2.0.1.tgz
+6bb42d180e101aa2f079ac852f611d34  libsemanage-2.0.2.tgz



From fedora-cvs-commits at redhat.com  Wed Apr 25 15:32:03 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 11:32:03 -0400
Subject: rpms/policycoreutils/devel .cvsignore, 1.148,
	1.149 policycoreutils-rhat.patch, 1.300,
	1.301 policycoreutils.spec, 1.406, 1.407 sources, 1.153, 1.154
Message-ID: <200704251532.l3PFW3Nv008453@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore policycoreutils-rhat.patch policycoreutils.spec 
	sources 
Log Message:
* Wed Apr 25 2007 Dan Walsh <dwalsh at redhat.com> 2.0.13-1
- Updated version of policycoreutils
	* Merged setsebool patch to only use libsemanage for persistent boolean changes from Stephen Smalley.
	* Merged genhomedircon patch to use the __default__ setting from Dan Walsh.
	* Dropped -b option from load_policy in preparation for always preserving booleans across reloads in the kernel.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- .cvsignore	24 Apr 2007 14:44:06 -0000	1.148
+++ .cvsignore	25 Apr 2007 15:32:00 -0000	1.149
@@ -146,3 +146,4 @@
 sepolgen-1.0.8.tgz
 policycoreutils-2.0.9.tgz
 policycoreutils-2.0.10.tgz
+policycoreutils-2.0.13.tgz

policycoreutils-rhat.patch:
 Makefile                  |    2 +-
 audit2allow/Makefile      |    3 ++-
 audit2why/Makefile        |    2 +-
 restorecon/restorecon.c   |   15 +++++++++++----
 restorecond/restorecond.c |   12 +++++++-----
 semanage/seobject.py      |   10 +++++++---
 6 files changed, 29 insertions(+), 15 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- policycoreutils-rhat.patch	24 Apr 2007 14:44:06 -0000	1.300
+++ policycoreutils-rhat.patch	25 Apr 2007 15:32:00 -0000	1.301
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-2.0.9/audit2allow/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-2.0.10/audit2allow/Makefile
 --- nsapolicycoreutils/audit2allow/Makefile	2007-02-07 12:11:49.000000000 -0500
-+++ policycoreutils-2.0.9/audit2allow/Makefile	2007-04-23 13:08:07.000000000 -0400
++++ policycoreutils-2.0.10/audit2allow/Makefile	2007-04-24 14:43:23.000000000 -0400
 @@ -1,6 +1,7 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -18,9 +18,9 @@
  	-mkdir -p $(MANDIR)/man1
  	install -m 644 audit2allow.1 $(MANDIR)/man1/
  
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2why/Makefile policycoreutils-2.0.9/audit2why/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2why/Makefile policycoreutils-2.0.10/audit2why/Makefile
 --- nsapolicycoreutils/audit2why/Makefile	2006-11-16 17:14:26.000000000 -0500
-+++ policycoreutils-2.0.9/audit2why/Makefile	2007-04-18 14:28:26.000000000 -0400
++++ policycoreutils-2.0.10/audit2why/Makefile	2007-04-24 14:43:23.000000000 -0400
 @@ -1,6 +1,6 @@
  # Installation directories.
  PREFIX ?= ${DESTDIR}/usr
@@ -29,28 +29,18 @@
  LIBDIR ?= ${PREFIX}/lib
  MANDIR ?= $(PREFIX)/share/man
  LOCALEDIR ?= /usr/share/locale
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/ChangeLog policycoreutils-2.0.9/ChangeLog
---- nsapolicycoreutils/ChangeLog	2007-04-24 10:36:17.000000000 -0400
-+++ policycoreutils-2.0.9/ChangeLog	2007-04-12 12:43:10.000000000 -0400
-@@ -1,6 +1,3 @@
--2.0.10 2007-04-24
--	* Merged chcat, fixfiles, genhomedircon, restorecond, and restorecon patches from Dan Walsh.
--
- 2.0.9 2007-04-12
- 	* Merged seobject setransRecords patch to return the first alias from Xavier Toth.
- 
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.9/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.10/Makefile
 --- nsapolicycoreutils/Makefile	2006-11-16 17:15:00.000000000 -0500
-+++ policycoreutils-2.0.9/Makefile	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.10/Makefile	2007-04-24 14:43:23.000000000 -0400
 @@ -1,4 +1,4 @@
 -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
  
  all install relabel clean indent:
  	@for subdir in $(SUBDIRS); do \
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-2.0.9/restorecon/restorecon.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-2.0.10/restorecon/restorecon.c
 --- nsapolicycoreutils/restorecon/restorecon.c	2007-04-24 10:36:17.000000000 -0400
-+++ policycoreutils-2.0.9/restorecon/restorecon.c	2007-04-18 14:26:39.000000000 -0400
++++ policycoreutils-2.0.10/restorecon/restorecon.c	2007-04-24 14:43:23.000000000 -0400
 @@ -16,6 +16,7 @@
   * -v	Show changes in file labels.  
   * -o	filename save list of files with incorrect context
@@ -106,9 +96,9 @@
  		case 'i':
  			file_exist = 0;
  			break;
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.9/restorecond/restorecond.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.10/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2007-02-22 08:53:22.000000000 -0500
-+++ policycoreutils-2.0.9/restorecond/restorecond.c	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.10/restorecond/restorecond.c	2007-04-24 14:43:23.000000000 -0400
 @@ -210,9 +210,10 @@
  			}
  
@@ -135,88 +125,9 @@
  	}
  	free(scontext);
  	close(fd);
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.9/restorecond/restorecond.conf
---- nsapolicycoreutils/restorecond/restorecond.conf	2006-11-20 12:19:55.000000000 -0500
-+++ policycoreutils-2.0.9/restorecond/restorecond.conf	2007-04-16 13:26:34.000000000 -0400
-@@ -1,7 +1,10 @@
- /etc/resolv.conf
-+/etc/localtime
- /etc/samba/secrets.tdb
- /etc/mtab
- /var/run/utmp
-+/var/run/faillog
- /var/log/wtmp
-+/etc/lvm/.cache
- ~/public_html
- ~/.mozilla/plugins/libflashplayer.so
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-2.0.9/scripts/genhomedircon
---- nsapolicycoreutils/scripts/genhomedircon	2007-04-24 10:36:17.000000000 -0400
-+++ policycoreutils-2.0.9/scripts/genhomedircon	2007-04-20 13:58:01.000000000 -0400
-@@ -136,6 +136,9 @@
- 		self.contextdir = "/contexts"
- 		self.filecontextdir = self.contextdir+"/files"
- 		self.usepwd = usepwd
-+		self.default_user = "user_u"
-+		self.default_prefix = "user"
-+		self.users = self.getUsers()
- 
- 	def getFileContextDir(self):
- 		return self.selinuxdir+self.type+self.filecontextdir
-@@ -212,6 +215,10 @@
- 		prefs["prefix"] = prefix
- 		prefs["home"] = home
- 		udict[user] = prefs
-+			
-+	def setDefaultUser(self, user, prefix):
-+		self.default_user = user
-+		self.default_prefix = prefix
- 		
- 	def getUsers(self):
- 		udict = {}
-@@ -220,7 +227,11 @@
- 			for seuser in list:
- 				user = []
- 				seusername = semanage_seuser_get_sename(seuser)
--				self.adduser(udict, semanage_seuser_get_name(seuser), seusername, self.get_default_prefix(seusername))
-+				prefix = self.get_default_prefix(seusername)
-+				if semanage_seuser_get_name(seuser) == "__default__":
-+					self.setDefaultUser(seusername, prefix)
-+
-+				self.adduser(udict, semanage_seuser_get_name(seuser), seusername, prefix)
- 				
- 		else:
- 			try:
-@@ -270,12 +281,11 @@
- 		return ret
- 
- 	def genHomeDirContext(self):
--		users = self.getUsers()
- 		ret = ""
- 		# Fill in HOME and prefix for users that are defined
--		for u in users.keys():
--			ret += self.getHomeDirContext (u, users[u]["seuser"], users[u]["home"], users[u]["prefix"])
--			ret += self.getUserContext (u, users[u]["seuser"], users[u]["prefix"])
-+		for u in self.users.keys():
-+			ret += self.getHomeDirContext (u, self.users[u]["seuser"], self.users[u]["home"], self.users[u]["prefix"])
-+			ret += self.getUserContext (u, self.users[u]["seuser"], self.users[u]["prefix"])
- 		return ret+"\n"
- 
- 	def checkExists(self, home):
-@@ -322,9 +332,9 @@
- 	def genoutput(self):
- 		ret = self.heading()
- 		for h in self.getHomeDirs():
--			ret += self.getHomeDirContext ("user_u", "user_u" , h+'/[^/]*', "user")
-+			ret += self.getHomeDirContext (self.default_user, self.default_user, h+'/[^/]*', self.default_prefix)
- 			ret += self.getHomeRootContext(h)
--		ret += self.getUserContext(".*", "user_u", "user") + "\n"
-+		ret += self.getUserContext(".*", self.default_user, self.default_prefix) + "\n"
- 		ret += self.genHomeDirContext()
- 		return ret
- 
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.9/semanage/seobject.py
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.10/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2007-04-12 12:43:06.000000000 -0400
-+++ policycoreutils-2.0.9/semanage/seobject.py	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.10/semanage/seobject.py	2007-04-24 14:43:23.000000000 -0400
 @@ -210,6 +210,7 @@
  		os.write(fd, self.out())
  		os.close(fd)


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -r1.406 -r1.407
--- policycoreutils.spec	24 Apr 2007 18:51:20 -0000	1.406
+++ policycoreutils.spec	25 Apr 2007 15:32:01 -0000	1.407
@@ -1,12 +1,12 @@
-%define libauditver 1.4.2-1
+	%define libauditver 1.4.2-1
 %define libsepolver 2.0.1-1
 %define libsemanagever 1.10.0-1
 %define libselinuxver 2.0.0-1
 %define sepolgenver 1.0.8
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 2.0.10
-Release: 2%{?dist}
+Version: 2.0.13
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,12 @@
 fi
 
 %changelog
+* Wed Apr 25 2007 Dan Walsh <dwalsh at redhat.com> 2.0.13-1
+- Updated version of policycoreutils
+	* Merged setsebool patch to only use libsemanage for persistent boolean changes from Stephen Smalley.
+	* Merged genhomedircon patch to use the __default__ setting from Dan Walsh.
+	* Dropped -b option from load_policy in preparation for always preserving booleans across reloads in the kernel.
+
 * Tue Apr 24 2007 Dan Walsh <dwalsh at redhat.com> 2.0.10-2
 - Fixes for polgengui
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- sources	24 Apr 2007 14:44:07 -0000	1.153
+++ sources	25 Apr 2007 15:32:01 -0000	1.154
@@ -1,2 +1,2 @@
 4d6e57c7fc396efbcf96b7accab4ba30  sepolgen-1.0.8.tgz
-6c44f3d0aa3f76efff635669b8d189d3  policycoreutils-2.0.10.tgz
+07e3ef9504b878733696a4d7ea9b33e4  policycoreutils-2.0.13.tgz



From fedora-cvs-commits at redhat.com  Wed Apr 25 15:49:07 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 11:49:07 -0400
Subject: rpms/ipsec-tools/FC-6 ipsec-tools-0.6.5-CVE-2007-1841.patch, NONE,
	1.1 ipsec-tools-0.6.5-acquires.patch, NONE,
	1.1 ipsec-tools-0.6.5-ctx.patch, NONE,
	1.1 ipsec-tools-0.6.5-loopback.patch, NONE,
	1.1 ipsec-tools.spec, 1.34, 1.35
Message-ID: <200704251549.l3PFn70O008741@cvs.devel.redhat.com>

Author: jantill

Update of /cvs/dist/rpms/ipsec-tools/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv8719

Modified Files:
	ipsec-tools.spec 
Added Files:
	ipsec-tools-0.6.5-CVE-2007-1841.patch 
	ipsec-tools-0.6.5-acquires.patch ipsec-tools-0.6.5-ctx.patch 
	ipsec-tools-0.6.5-loopback.patch 
Log Message:
* Mon Apr 23 2007 Steve Grubb <sgrubb at redhat.com> - 0.6.5-8
- Upstream fix for Racoon DOS, informational delete must be encrypted
- Resolves: rhbz#235388 - CVE-2007-1841 ipsec-tools racoon DoS


ipsec-tools-0.6.5-CVE-2007-1841.patch:
 isakmp_inf.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE ipsec-tools-0.6.5-CVE-2007-1841.patch ---
Index: src/racoon/isakmp_inf.c
===================================================================
RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/isakmp_inf.c,v
retrieving revision 1.14.4.9
diff -u -p -r1.14.4.9 isakmp_inf.c
--- src/racoon/isakmp_inf.c	2 Aug 2005 15:09:26 -0000	1.14.4.9
+++ src/racoon/isakmp_inf.c	2 Apr 2007 12:52:07 -0000
@@ -267,12 +267,12 @@ isakmp_info_recv(iph1, msg0)
 
 	switch (np) {
 	case ISAKMP_NPTYPE_N:
-		if (isakmp_info_recv_n(iph1, msg) < 0)
-			goto end;
+		if ( encrypted )
+			isakmp_info_recv_n(iph1, msg);
 		break;
 	case ISAKMP_NPTYPE_D:
-		if (isakmp_info_recv_d(iph1, msg) < 0)
-			goto end;
+		if ( encrypted )
+			isakmp_info_recv_d(iph1, msg);
 		break;
 	case ISAKMP_NPTYPE_NONCE:
 		/* XXX to be 6.4.2 ike-01.txt */

ipsec-tools-0.6.5-acquires.patch:
 handler.h |    2 ++
 pfkey.c   |   35 ++++++++++++++++++++++++++++++-----
 2 files changed, 32 insertions(+), 5 deletions(-)

--- NEW FILE ipsec-tools-0.6.5-acquires.patch ---
diff -urpN ipsec-tools-0.6.5/src/racoon/handler.h ipsec-tools-0.6.5.sandbox/src/racoon/handler.h
--- ipsec-tools-0.6.5/src/racoon/handler.h	2005-05-07 12:26:05.000000000 -0500
+++ ipsec-tools-0.6.5.sandbox/src/racoon/handler.h	2007-04-10 10:57:52.000000000 -0500
@@ -279,6 +279,8 @@ struct ph2handle {
 	u_int8_t flags;			/* Flags for phase 2 */
 	u_int32_t msgid;		/* msgid for phase 2 */
 
+	u_int32_t sa_count;		/* num of SAs sent in SADB_ADD */
+	
 	struct sainfo *sainfo;		/* place holder of sainfo */
 	struct saprop *proposal;	/* SA(s) proposal. */
 	struct saprop *approval;	/* SA(s) approved. */
diff -urpN ipsec-tools-0.6.5/src/racoon/pfkey.c ipsec-tools-0.6.5.sandbox/src/racoon/pfkey.c
--- ipsec-tools-0.6.5/src/racoon/pfkey.c	2007-04-10 10:17:40.000000000 -0500
+++ ipsec-tools-0.6.5.sandbox/src/racoon/pfkey.c	2007-04-10 10:56:39.000000000 -0500
@@ -1287,7 +1287,9 @@ pk_recvupdate(mhp)
 	SCHED_KILL(iph2->sce);
 	
 	/* update status */
-	iph2->status = PHASE2ST_ESTABLISHED;
+	/* Do this in pk_recvadd
+	 * iph2->status = PHASE2ST_ESTABLISHED;
+	 */
 
 #ifdef ENABLE_STATS
 	gettimeofday(&iph2->end, NULL);
@@ -1333,6 +1335,7 @@ pk_sendadd(iph2)
 	u_int8_t ctxdoi = 0, ctxalg = 0;
 	u_int16_t ctxstrlen = 0;
 	caddr_t ctxstr = NULL;
+	u_int32_t sa_sent = 0;
 
 	/* sanity check */
 	if (iph2->approval == NULL) {
@@ -1470,6 +1473,9 @@ pk_sendadd(iph2)
 		}
 #endif /* ENABLE_NATT */
 
+		/* keep count of SAs added. */
+		sa_sent++;
+
 		if (!lcconf->pathinfo[LC_PATHTYPE_BACKUPSA])
 			continue;
 
@@ -1497,6 +1503,7 @@ pk_sendadd(iph2)
 			satype, pr->spi_p, mode));
 	}
 
+	iph2->sa_count = sa_sent;
 	return 0;
 }
 
@@ -1552,9 +1559,18 @@ pk_recvadd(mhp)
 	}
 
 	/*
-	 * NOTE don't update any status of phase2 handle
-	 * because they must be updated by SADB_UPDATE message
+	 * Thus, update the status of phase 2 handle after all SADB_ADD
+	 * msgs have been received for the handle, rather than
+	 * after SADB_UPDATE.
+	 *
+	 * This also removes the possibilty of processing an ACQUIRE
+	 * received by kernel for SAs we are still adding.
 	 */
+	if (iph2->sa_count) {
+		iph2->sa_count = iph2->sa_count - 1;
+		if (iph2->sa_count == 0)
+			iph2->status = PHASE2ST_ESTABLISHED;
+	}
 
 	plog(LLV_INFO, LOCATION, NULL,
 		"IPsec-SA established: %s\n",
@@ -1639,8 +1655,6 @@ pk_recvexpire(mhp)
 	/* turn off the timer for calling isakmp_ph2expire() */ 
 	SCHED_KILL(iph2->sce);
 
-	iph2->status = PHASE2ST_EXPIRED;
-
 	/* INITIATOR, begin phase 2 exchange. */
 	/* allocate buffer for status management of pfkey message */
 	if (iph2->side == INITIATOR) {
@@ -1668,6 +1682,7 @@ pk_recvexpire(mhp)
 	/* If not received SADB_EXPIRE, INITIATOR delete ph2handle. */
 	/* RESPONDER always delete ph2handle, keep silent.  RESPONDER doesn't
 	 * manage IPsec SA, so delete the list */
+	iph2->status = PHASE2ST_EXPIRED;
 	unbindph12(iph2);
 	remph2(iph2);
 	delph2(iph2);
@@ -1789,8 +1804,18 @@ pk_recvacquire(mhp)
 	 *    2. its state is equal to PHASE2ST_ESTABLISHED, then racoon
 	 *       has to prcesss such a acquire message because racoon may
 	 *       lost the expire message.
+	 *
+	 * When in responder role, an spid doesn't get added to
+	 * the handler since responder didn't receive acquire.
+	 * Thus there is the case that a negotiation can be occurring
+	 * and responder receives acquire for same policy. So to prevent
+	 * another identical negotiation, also check by address.
 	 */
+
 	iph2[0] = getph2byid(src, dst, xpl->sadb_x_policy_id);
+	if (iph2[0] == NULL)
+		iph2[0] = getph2bysaddr(src, dst);
+
 	if (iph2[0] != NULL) {
 		if (iph2[0]->status < PHASE2ST_ESTABLISHED) {
 			plog(LLV_DEBUG, LOCATION, NULL,


ipsec-tools-0.6.5-ctx.patch:
 ipsec_doi.c |    6 +++++-
 security.c  |    1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE ipsec-tools-0.6.5-ctx.patch ---
diff -urpN ipsec-tools-0.6.5.orig/src/racoon/ipsec_doi.c ipsec-tools-0.6.5.patch/src/racoon/ipsec_doi.c
--- ipsec-tools-0.6.5.orig/src/racoon/ipsec_doi.c	2007-03-15 14:10:01.000000000 -0500
+++ ipsec-tools-0.6.5.patch/src/racoon/ipsec_doi.c	2007-03-15 14:19:43.000000000 -0500
@@ -3063,8 +3063,11 @@ setph2proposal0(iph2, pp, pr)
 
 #ifdef HAVE_SECCTX
 		if (*pp->sctx.ctx_str) {
+			struct security_ctx secctx;
+			secctx = pp->sctx;
+			secctx.ctx_strlen = htons(pp->sctx.ctx_strlen);
 			x = isakmp_set_attr_v(x, IPSECDOI_ATTR_SECCTX,
-					      (caddr_t)&pp->sctx, truectxlen);
+					      (caddr_t)&secctx, truectxlen);
 		}
 #endif
 
@@ -4189,6 +4192,7 @@ ipsecdoi_t2satrns(t, pp, pr, tr)
 		{
 			int len = ntohs(d->lorv);
 			memcpy(&pp->sctx, d + 1, len);
+			pp->sctx.ctx_strlen = ntohs(pp->sctx.ctx_strlen);
 			break;
 		}
 #endif
diff -urpN ipsec-tools-0.6.5.orig/src/racoon/security.c ipsec-tools-0.6.5.patch/src/racoon/security.c
--- ipsec-tools-0.6.5.orig/src/racoon/security.c	2007-03-15 14:10:01.000000000 -0500
+++ ipsec-tools-0.6.5.patch/src/racoon/security.c	2007-03-15 14:19:31.000000000 -0500
@@ -153,6 +153,7 @@ get_security_context(sa, p)
 				return -1;
 			}
 			memcpy(&p->sec_ctx, d + 1, lorv);
+			p->sec_ctx.ctx_strlen = ntohs(p->sec_ctx.ctx_strlen);
 			return 0;
 		}
 	}

ipsec-tools-0.6.5-loopback.patch:
 configure.ac           |   21 +++++++
 src/racoon/Makefile.am |    2 
 src/racoon/handler.h   |    3 -
 src/racoon/main.c      |    8 ++
 src/racoon/pfkey.c     |  140 ++++++++++++++++++++++++++++++++++++++++++++++---
 src/racoon/policy.h    |   10 +++
 src/racoon/security.c  |   79 ++++++++++++++++++++++-----
 7 files changed, 237 insertions(+), 26 deletions(-)

--- NEW FILE ipsec-tools-0.6.5-loopback.patch ---
diff -urp ipsec-tools-0.6.5.orig/configure.ac ipsec-tools-0.6.5/configure.ac
--- ipsec-tools-0.6.5.orig/configure.ac	2007-04-19 13:16:42.000000000 -0400
+++ ipsec-tools-0.6.5/configure.ac	2007-04-20 08:26:52.000000000 -0400
@@ -624,6 +624,27 @@ if test "$enable_security_context" = "ye
 	fi
 fi
 
+AC_MSG_CHECKING(whether to support Auditing)
+AC_ARG_ENABLE(audit,
+	[  --enable-audit    build audit daemon support for SELinux],
+		enable_audit=$enableval,enable_audit=auto)
+
+AC_MSG_RESULT($enable_audit)
+
+# libaudit detection
+if test x$enable_audit = xno ; then
+    have_libaudit=no;
+else
+    AC_CHECK_LIB(audit, audit_log_user_avc_message,
+                 have_libaudit=yes, have_libaudit=no)
+fi
+AM_CONDITIONAL(HAVE_LIBAUDIT, test x$have_libaudit = xyes)
+if test x$have_libaudit = xyes ; then
+    AUDIT_LIBS="-laudit"
+    AC_DEFINE(HAVE_LIBAUDIT,1,[audit daemon SELinux support])
+fi
+AC_SUBST(AUDIT_LIBS)
+
 CFLAGS="$CFLAGS $CFLAGS_ADD"
 CPPFLAGS="$CPPFLAGS $CPPFLAGS_ADD"
 
diff -urp ipsec-tools-0.6.5.orig/src/racoon/handler.h ipsec-tools-0.6.5/src/racoon/handler.h
--- ipsec-tools-0.6.5.orig/src/racoon/handler.h	2007-04-19 13:16:42.000000000 -0400
+++ ipsec-tools-0.6.5/src/racoon/handler.h	2007-04-20 08:26:52.000000000 -0400
@@ -280,6 +280,7 @@ struct ph2handle {
 	u_int32_t msgid;		/* msgid for phase 2 */
 
 	u_int32_t sa_count;		/* num of SAs sent in SADB_ADD */
+	u_int8_t loopback;
 	
 	struct sainfo *sainfo;		/* place holder of sainfo */
 	struct saprop *proposal;	/* SA(s) proposal. */
@@ -422,7 +423,7 @@ struct policyindex;
 extern struct ph1handle *getph1byindex __P((isakmp_index *));
 extern struct ph1handle *getph1byindex0 __P((isakmp_index *));
 extern struct ph1handle *getph1byaddr __P((struct sockaddr *,
-	struct sockaddr *));
+					   struct sockaddr *));
 extern struct ph1handle *getph1byaddrwop __P((struct sockaddr *,
 	struct sockaddr *));
 extern struct ph1handle *getph1bydstaddrwop __P((struct sockaddr *));
diff -urp ipsec-tools-0.6.5.orig/src/racoon/main.c ipsec-tools-0.6.5/src/racoon/main.c
--- ipsec-tools-0.6.5.orig/src/racoon/main.c	2005-11-06 12:18:26.000000000 -0500
+++ ipsec-tools-0.6.5/src/racoon/main.c	2007-04-20 08:26:52.000000000 -0400
@@ -73,6 +73,7 @@
 #include "session.h"
 #include "oakley.h"
 #include "pfkey.h"
+#include "policy.h"
 #include "crypto_openssl.h"
 #include "backupsa.h"
 #include "vendorid.h"
@@ -163,7 +164,12 @@ main(ac, av)
 #ifdef DEBUG_RECORD_MALLOCATION
 	DRM_init();
 #endif
-
+#ifdef HAVE_SECCTX
+	init_avc();
+#endif
+#ifdef HAVE_LIBAUDIT
+	audit_init();
+#endif
 	eay_init();
 	initlcconf();
 	initrmconf();
diff -urp ipsec-tools-0.6.5.orig/src/racoon/Makefile.am ipsec-tools-0.6.5/src/racoon/Makefile.am
--- ipsec-tools-0.6.5.orig/src/racoon/Makefile.am	2007-04-19 13:16:42.000000000 -0400
+++ ipsec-tools-0.6.5/src/racoon/Makefile.am	2007-04-19 13:17:22.000000000 -0400
@@ -34,7 +34,7 @@ EXTRA_racoon_SOURCES = isakmp_xauth.c is
 	isakmp_frag.c nattraversal.c security.c $(MISSING_ALGOS)
 racoon_LDFLAGS = ../libipsec/libipsec.la
 racoon_LDADD = $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) \
-	$(SECCTX_OBJS) $(LEXLIB) vmbuf.o sockmisc.o misc.o
+	$(SECCTX_OBJS) $(LEXLIB) vmbuf.o sockmisc.o misc.o @AUDIT_LIBS@
 racoon_DEPENDENCIES = ../libipsec/libipsec.la \
 	$(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) $(SECCTX_OBJS) \
 	vmbuf.o sockmisc.o misc.o
diff -urp ipsec-tools-0.6.5.orig/src/racoon/pfkey.c ipsec-tools-0.6.5/src/racoon/pfkey.c
--- ipsec-tools-0.6.5.orig/src/racoon/pfkey.c	2007-04-19 13:16:42.000000000 -0400
+++ ipsec-tools-0.6.5/src/racoon/pfkey.c	2007-04-20 08:26:52.000000000 -0400
@@ -99,6 +99,7 @@
 #include "nattraversal.h"
 #include "crypto_openssl.h"
 #include "grabmyaddr.h"
+#include "sockmisc.h"
 
 #if defined(SADB_X_EALG_RIJNDAELCBC) && !defined(SADB_X_EALG_AESCBC)
 #define SADB_X_EALG_AESCBC  SADB_X_EALG_RIJNDAELCBC
@@ -959,6 +960,45 @@ pk_recvgetspi(mhp) 
 		return -1;
 	}
 
+#ifdef HAVE_SECCTX
+	if (iph2->loopback == 1) {
+		u_int satype, reqid;
+		struct sockaddr *src;
+
+		src = PFKEY_ADDR_SADDR(mhp[SADB_EXT_ADDRESS_DST]);
+		if (cmpsaddrstrict(src, dst) == 0) {
+			/* yep, this is loopback. install SA */
+			satype = ipsecdoi2pfkey_proto(iph2->proposal->head->proto_id);
+			if (satype == ~0) {
+				plog(LLV_ERROR, LOCATION, NULL,
+				     "invalid proto_id %d\n",
+				     iph2->proposal->head->proto_id);
+				return -1;
+			}
+			      
+			reqid = iph2->proposal->head->reqid_in;
+			
+			iph2->status = PHASE2ST_ADDSA;
+			if (pfkey_send_update(lcconf->sock_pfkey, satype, 
+			    IPSEC_MODE_TRANSPORT, src, dst, sa->sadb_sa_spi, 
+			    reqid, 0, NULL, SADB_EALG_NULL, 0, SADB_AALG_NONE,
+			    0, 0, 0, 0, iph2->proposal->lifetime, 0, 
+			    iph2->seq, iph2->proposal->sctx.ctx_doi, 
+			    iph2->proposal->sctx.ctx_alg,
+			    iph2->proposal->sctx.ctx_str, 
+			    iph2->proposal->sctx.ctx_strlen) < 0) {
+				plog(LLV_ERROR, LOCATION, NULL, 
+				     "failed to update loopback SA: %s\n", 
+				     ipsec_strerror());
+				remph2(iph2);
+				delph2(iph2);
+				return -1;
+			}
+		}
+		return 0;
+	}
+#endif /* HAVE SECCTX */
+			    	
 	/* set SPI, and check to get all spi whether or not */
 	allspiok = 1;
 	notfound = 1;
@@ -1244,6 +1284,26 @@ pk_recvupdate(mhp)
 		return -1;
 	}
 
+#ifdef HAVE_SECCTX
+	/* get update for loopback here */
+	if (iph2->loopback == 1 && (cmpsaddrstrict(src, dst) == 0)) {
+		plog(LLV_INFO, LOCATION, NULL,
+			"IPsec-SA established without ISAKMP: %s\n",
+			sadbsecas2str(iph2->dst, iph2->src,
+			msg->sadb_msg_satype, sa->sadb_sa_spi,
+			IPSEC_MODE_TRANSPORT));
+
+		/* turn off the timer for calling pfkey_timeover() */
+		SCHED_KILL(iph2->sce);
+
+		iph2->sce = sched_new(iph2->proposal->lifetime,
+	    	isakmp_ph2expire_stub, iph2);
+		
+		iph2->status = PHASE2ST_ESTABLISHED;
+		return 0;
+	}
+#endif
+		
 	/* check to complete all keys ? */
 	for (pr = iph2->approval->head; pr != NULL; pr = pr->next) {
 		proto_id = pfkey2ipsecdoi_proto(msg->sadb_msg_satype);
@@ -1286,11 +1346,6 @@ pk_recvupdate(mhp)
 	/* turn off the timer for calling pfkey_timeover() */
 	SCHED_KILL(iph2->sce);
 	
-	/* update status */
-	/* Do this in pk_recvadd
-	 * iph2->status = PHASE2ST_ESTABLISHED;
-	 */
-
 #ifdef ENABLE_STATS
 	gettimeofday(&iph2->end, NULL);
 	syslog(LOG_NOTICE, "%s(%s): %8.6f",
@@ -1705,6 +1761,7 @@ pk_recvacquire(mhp)
 	struct sadb_x_sec_ctx *m_sec_ctx;
 #endif /* HAVE_SECCTX */
 	struct policyindex spidx;
+	int do_listen = 0;
 
 	/* ignore this message because of local test mode. */
 	if (f_local)
@@ -1728,6 +1785,12 @@ pk_recvacquire(mhp)
 	m_sec_ctx = (struct sadb_x_sec_ctx *)mhp[SADB_X_EXT_SEC_CTX];
 
 	if (m_sec_ctx != NULL) {
+		if (m_sec_ctx->sadb_x_ctx_len > MAX_CTXSTR_SIZE) {
+			plog(LLV_ERROR, LOCATION, NULL,
+			     "ignoring ACQUIRE: security context is greater than MAX, %d.\n",
+			     MAX_CTXSTR_SIZE);
+			return -1;
+		}
 		plog(LLV_INFO, LOCATION, NULL, 
 			"security context doi: %u\n",
 			m_sec_ctx->sadb_x_ctx_doi);
@@ -1779,7 +1842,6 @@ pk_recvacquire(mhp)
 		 */
 		struct sockaddr *sa = PFKEY_ADDR_SADDR(mhp[SADB_EXT_ADDRESS_SRC]);
 		struct myaddrs *p;
-		int do_listen = 0;
 		for (p = lcconf->myaddrs; p; p = p->next) {
 			if (!cmpsaddrwop(p->addr, sa)) {
 				do_listen = 1;
@@ -1903,6 +1965,73 @@ pk_recvacquire(mhp)
 	plog(LLV_DEBUG, LOCATION, NULL,
 		"new acquire %s\n", spidx2str(&sp_out->spidx));
 
+#ifdef HAVE_SECCTX
+	/*
+	 * If the src address in the ACQUIRE is one we listen on and
+	 * the src and dst addresses are the same, then assume this
+	 * packet arrived over loopback and just get an SPI and
+	 * install the SA.
+	*/
+        if (do_listen && m_sec_ctx && (cmpsaddrstrict(src, dst) == 0)) {
+		struct saprop *newpp;
+		struct saproto *newpr;
+		iph2[n]->loopback = 1;
+		newpp = newsaprop();
+		if (newpp == NULL) {
+			plog(LLV_ERROR, LOCATION, NULL, 
+			     "failed to allocate saprop.\n");
+			delph2(iph2[n]);
+			return -1;
+		}
+		/* allocate to hold reqid */
+		newpr = newsaproto();
+		if (newpr == NULL) {
+			plog(LLV_ERROR, LOCATION, NULL, 
+			     "failed to allocate saproto.\n");
+			delph2(iph2[n]);
+			return -1;
+		}
+
+		newpr->reqid_out = sp_out->req->saidx.reqid;
+		newpr->reqid_in = sp_in->req->saidx.reqid;
+		newpr->proto_id = ipproto2doi(sp_out->req->saidx.proto);
+		
+		inssaprotorev(newpp, newpr);
+		iph2[n]->proposal = newpp;
+		printsaprop0(LLV_DEBUG, newpp);
+
+		set_secctx_in_proposal(iph2[n], spidx);
+		iph2[n]->proposal->lifetime = IPSECDOI_ATTR_SA_LD_SEC_DEFAULT;
+
+		insph2(iph2[n]);
+		
+		iph2[n]->status = PHASE2ST_GETSPISENT;
+                plog(LLV_DEBUG, LOCATION, NULL, "call pfkey_send_getspi\n");
+                if (pfkey_send_getspi(
+                                lcconf->sock_pfkey,
+                                iph2[n]->satype,
+                                IPSEC_MODE_TRANSPORT,
+                                dst,                    /* src of SA */
+                                src,                    /* dst of SA */
+                                0, 0,
+                                newpr->reqid_in, iph2[n]->seq) < 0) {
+                        plog(LLV_ERROR, LOCATION, NULL,
+                                "ipseclib failed send getspi (%s)\n",
+                                ipsec_strerror());
+			delph2(iph2[n]);
+                        return -1;
+                }
+		iph2[n]->sce = sched_new(lcconf->wait_ph2complete,
+                	pfkey_timeover_stub, iph2[n]);
+
+                plog(LLV_DEBUG, LOCATION, NULL,
+                        "pfkey GETSPI sent: %s\n",
+                        sadbsecas2str(dst, src, iph2[n]->satype, 0, 
+			IPSEC_MODE_TRANSPORT));
+		return 0;
+	}
+#endif /* HAVE_SECCTX */
+	
 	/* get sainfo */
     {
 	vchar_t *idsrc, *iddst;
diff -urp ipsec-tools-0.6.5.orig/src/racoon/policy.h ipsec-tools-0.6.5/src/racoon/policy.h
--- ipsec-tools-0.6.5.orig/src/racoon/policy.h	2007-04-19 13:16:42.000000000 -0400
+++ ipsec-tools-0.6.5/src/racoon/policy.h	2007-04-19 13:17:22.000000000 -0400
@@ -36,7 +36,11 @@
 
 #ifdef HAVE_SECCTX
 
-#define MAX_CTXSTR_SIZE 50
+/* Current LSPP policy is 1024 compartments, 5 chars each 'c1024'. SE Linux
+ * will attempt to combine so, worst case is all odd or even numbers. The
+ * context size of SE Linux types is max'ed around 256. We allow 16 for
+ * sensitivity */
+#define MAX_CTXSTR_SIZE 3344  /* (6 * 512) + 256 + 16 */
 struct security_ctx {
 	u_int8_t ctx_doi;	/* Security Context DOI */
 	u_int8_t ctx_alg;	/* Security Context Algorithm */
@@ -147,9 +151,13 @@ extern void initsp __P((void));
 extern struct ipsecrequest *newipsecreq __P((void));
 
 extern const char *spidx2str __P((const struct policyindex *));
+#ifdef HAVE_LIBAUDIT
+extern void audit_init __P((void));
+#endif
 #ifdef HAVE_SECCTX
 #include <selinux/selinux.h>
 extern int get_security_context __P((vchar_t *, struct policyindex *));
+extern void init_avc __P((void));
 extern int within_range __P((security_context_t, security_context_t));
 extern void set_secctx_in_proposal __P((struct ph2handle *, struct policyindex));
 #endif
diff -urp ipsec-tools-0.6.5.orig/src/racoon/security.c ipsec-tools-0.6.5/src/racoon/security.c
--- ipsec-tools-0.6.5.orig/src/racoon/security.c	2007-04-19 13:16:42.000000000 -0400
+++ ipsec-tools-0.6.5/src/racoon/security.c	2007-04-19 13:17:22.000000000 -0400
@@ -55,6 +55,60 @@
 #include "proposal.h"
 #include "strnames.h"
 #include "handler.h"
+#ifdef HAVE_LIBAUDIT
+#include <unistd.h>
+#include "libaudit.h"
+#endif
+
+static void log_callback (const char *fmt, ...);
+
+static const struct avc_log_callback log_cb =
+{
+  .func_log = log_callback,
+  .func_audit = NULL
+};
+
+#ifdef HAVE_LIBAUDIT
+static int audit_fd = -1;
+void
+audit_init(void)
+{
+	audit_fd = audit_open();
+	if (audit_fd < 0) {
+	/* If kernel doesn't support audit, bail out */
+		if (errno == EINVAL || errno == EPROTONOSUPPORT ||
+				errno == EAFNOSUPPORT)
+			return;
+		/* If unprivileged, bail out */
+		if (errno == EPERM && getuid() != 0)
+			return;
+		plog (LLV_ERROR, LOCATION, NULL,
+			"Failed opening connection to the audit subsystem");
+	}
+}
+#endif /* HAVE_LIBAUDIT */
+
+static void
+log_callback (const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+#ifdef HAVE_LIBAUDIT
+	if (audit_fd >= 0) {
+		char buf[PATH_MAX*2];
+
+		/* FIXME: need to change this to show real user */
+		vsnprintf(buf, sizeof(buf), fmt, ap);
+		audit_log_user_avc_message(audit_fd, AUDIT_USER_AVC,
+				buf, NULL, NULL, NULL, -1);
+		return;
+	} else
+#endif /* HAVE_LIBAUDIT */
+	{
+		vsyslog (LOG_INFO, fmt, ap);
+		va_end(ap);
+	}
+}
 
 /* 
  * Get the security context information from SA.
@@ -181,24 +235,21 @@ set_secctx_in_proposal(iph2, spidx)
  * return:	0	if avc was successfully initialized
  * 		1	if the avc could not be initialized
  */
-
-static int
+static int mls_ready = 0;
+void
 init_avc(void)
 {
-	int rtn = 0;
-
 	if (!is_selinux_mls_enabled()) {
 		plog(LLV_ERROR, LOCATION, NULL, "racoon: MLS support is not"
 				" enabled.\n");
-		return 1;
+		return;
 	}
 
-	rtn = avc_init("racoon", NULL, NULL, NULL, NULL);
-	if (rtn != 0) {
-		plog(LLV_ERROR, LOCATION, NULL, "racoon: could not initialize avc.\n");
-		rtn = 1;
-	}
-	return rtn;
+	if (avc_init("racoon", NULL, &log_cb, NULL, NULL) == 0)
+		mls_ready = 1;
+	else
+		plog(LLV_ERROR, LOCATION, NULL,
+				"racoon: could not initialize avc.\n");
 }
 
 /*
@@ -225,12 +276,8 @@ within_range(security_context_t sl, secu
 	if (!*range)	/* This policy doesn't have security context */
 		return 1;
 
-	rtn = init_avc();
-	if (rtn != 0) {
-		plog(LLV_ERROR, LOCATION, NULL, 
-			"within_range: couldn't initialize the AVC\n");
+	if (!mls_ready) /* mls may not be enabled */
 		return 0;
-	}
 
 	/*
 	 * Get the sids for the sl and range contexts


Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/FC-6/ipsec-tools.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ipsec-tools.spec	1 Oct 2006 20:19:38 -0000	1.34
+++ ipsec-tools.spec	25 Apr 2007 15:49:05 -0000	1.35
@@ -1,6 +1,6 @@
 Name: ipsec-tools
 Version: 0.6.5
-Release: 6
+Release: 8%{?dist}
 Summary: Tools for configuring and using IPSEC
 License: BSD
 Group: System Environment/Base
@@ -19,9 +19,14 @@
 Patch7: ipsec-tools-0.6.5-mls.patch
 Patch8: ipsec-tools-0.6.5-pre6.patch
 Patch9: racoon-lspp-ipsec.patch
+Patch10: ipsec-tools-0.6.5-ctx.patch
+Patch11: ipsec-tools-0.6.5-acquires.patch
+Patch12: ipsec-tools-0.6.5-loopback.patch
+Patch13: ipsec-tools-0.6.5-CVE-2007-1841.patch
 
 BuildRequires: openssl-devel, krb5-devel, bison, flex, automake, libtool
 BuildRequires: libselinux-devel >= 1.30.28-2
+BuildRequires: audit-libs-devel >= 1.3.1
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: initscripts >= 7.31.11.EL-1
 	
@@ -42,6 +47,10 @@
 %patch7 -p1 -b .mls
 %patch8 -p1 -b .pre6
 %patch9 -p1 -b .sctx
+%patch10 -p1 -b .hctx
+%patch11 -p1 -b .acquires
+%patch12 -p1 -b .loopback
+%patch13 -p0 -b .CVE-2007-1841
 
 mkdir -p kernel-headers/linux
 cp %{SOURCE1} %{SOURCE2} %{SOURCE5} %{SOURCE6} kernel-headers/linux
@@ -59,7 +68,9 @@
  --enable-dpd \
  --enable-gssapi \
  --enable-natt \
- --enable-security-context
+ --enable-security-context \
+ --enable-racoon-over-loopback \
+ --enable-audit
 make
 
 %install
@@ -100,6 +111,30 @@
 %config(noreplace) /etc/racoon/racoon.conf
 
 %changelog
+* Mon Apr 23 2007 Steve Grubb <sgrubb at redhat.com> - 0.6.5-8
+- Upstream fix for Racoon DOS, informational delete must be encrypted
+- Resolves: rhbz#235388 - CVE-2007-1841 ipsec-tools racoon DoS
+
+* Fri Apr 20 2007 Steve Grubb <sgrubb at redhat.com> - 0.6.5-7
+- Resolves: #218386 labeled ipsec does not work over loopback
+
+* Mon Apr 16 2007 Steve Grubb <sgrubb at redhat.com> - 0.6.5-6.6
+- Related: #232508 add auditing to racoon
+
+* Sat Apr 14 2007 Steve Grubb <sgrubb at redhat.com> - 0.6.5-6.5
+- Resolves: #235680 racoon socket descriptor exhaustion
+
+* Thu Apr 12 2007 Steve Grubb <sgrubb at redhat.com> - 0.6.5-6.4
+- Resolves: #236121 increase buffer for context
+
+* Tue Apr 10 2007 Steve Grubb <sgrubb at redhat.com> - 0.6.5-6.3
+- Resolves: #234491 kernel sends ACQUIRES that racoon is not catching
+- Resolves: #218386 labeled ipsec does not work over loopback
+
+* Tue Mar 20 2007 Harald Hoyer <harald at redhat.com> - 0.6.5-6.2%{?dist}
+- fix for setting the security context into a proposal (32<->64bit)
+- Resolves: rhbz#232508
+
 * Sun Oct 01 2006 Jesse Keating <jkeating at redhat.com> - 0.6.5-6
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-cvs-commits at redhat.com  Wed Apr 25 16:13:04 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 12:13:04 -0400
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.145,1.146
Message-ID: <200704251613.l3PGD4LM009531@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9514

Modified Files:
	NetworkManager.spec 
Log Message:
* Wed Apr 25 2007 Christopher Aillon <caillon at redhat.com> 1:0.6.5-2
- Fix requires macro (237806)



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- NetworkManager.spec	20 Apr 2007 03:41:24 -0000	1.145
+++ NetworkManager.spec	25 Apr 2007 16:13:02 -0000	1.146
@@ -2,6 +2,7 @@
 
 %define dbus_version	0.90
 %define dbus_glib_version 0.70
+%define hal_version 0.5.0
 
 %define gtk2_version	2.6.0
 %define wireless_tools_version 1:28-0pre9
@@ -10,7 +11,7 @@
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.6.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -246,6 +247,9 @@
 
 
 %changelog
+* Wed Apr 25 2007 Christopher Aillon <caillon at redhat.com> 1:0.6.5-2
+- Fix requires macro (237806)
+
 * Thu Apr 19 2007 Christopher Aillon <caillon at redhat.com> 1:0.6.5-1
 - Update to 0.6.5 final
 - Don't lose scanned security information



From fedora-cvs-commits at redhat.com  Wed Apr 25 16:28:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 12:28:01 -0400
Subject: rpms/kernel/devel patch-2.6.21-rc7-git8.bz2.sign, NONE,
	1.1 .cvsignore, 1.613, 1.614 kernel-2.6.spec, 1.3110,
	1.3111 sources, 1.576, 1.577 upstream, 1.504,
	1.505 patch-2.6.21-rc7-git7.bz2.sign, 1.1, NONE
Message-ID: <200704251628.l3PGS1Tw009789@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.21-rc7-git8.bz2.sign 
Removed Files:
	patch-2.6.21-rc7-git7.bz2.sign 
Log Message:
* Wed Apr 25 2007 Dave Jones <davej at redhat.com>
- 2.6.21-rc7-git8



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

iD8DBQBGLxMxyGugalF9Dw4RArbRAJ9hw3Z942aNuC8Ts3KrskN826VoOQCfWTl3
TM1dHiIddCkaKnwqmQiDYgk=
=H+D+
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.613
retrieving revision 1.614
diff -u -r1.613 -r1.614
--- .cvsignore	25 Apr 2007 00:09:23 -0000	1.613
+++ .cvsignore	25 Apr 2007 16:27:58 -0000	1.614
@@ -5,4 +5,4 @@
 kernel-2.6.20
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc7.bz2
-patch-2.6.21-rc7-git7.bz2
+patch-2.6.21-rc7-git8.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3110
retrieving revision 1.3111
diff -u -r1.3110 -r1.3111
--- kernel-2.6.spec	25 Apr 2007 00:09:23 -0000	1.3110
+++ kernel-2.6.spec	25 Apr 2007 16:27:58 -0000	1.3111
@@ -371,7 +371,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.21-rc7.bz2
-Patch2: patch-2.6.21-rc7-git7.bz2
+Patch2: patch-2.6.21-rc7-git8.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -2336,6 +2336,9 @@
 #  - tux.
 
 %changelog
+* Wed Apr 25 2007 Dave Jones <davej at redhat.com>
+- 2.6.21-rc7-git8
+
 * Tue Apr 24 2007 Dave Jones <davej at redhat.com>
 - 2.6.21-rc7-git7
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.576
retrieving revision 1.577
diff -u -r1.576 -r1.577
--- sources	25 Apr 2007 00:09:23 -0000	1.576
+++ sources	25 Apr 2007 16:27:59 -0000	1.577
@@ -1,4 +1,4 @@
 2618cbcc9c9ac1c3c04be903fe3338a7  sparse-0.2.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 3a54bf5a7cf6b124e680e1d08fe1b20b  patch-2.6.21-rc7.bz2
-0a8dcc4ce7214cdc12698d40e2d89d42  patch-2.6.21-rc7-git7.bz2
+be1c6e406d879b9ab31c590c28f0af80  patch-2.6.21-rc7-git8.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.504
retrieving revision 1.505
diff -u -r1.504 -r1.505
--- upstream	25 Apr 2007 00:09:24 -0000	1.504
+++ upstream	25 Apr 2007 16:27:59 -0000	1.505
@@ -1,3 +1,3 @@
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc7.bz2
-patch-2.6.21-rc7-git7.bz2
+patch-2.6.21-rc7-git8.bz2


--- patch-2.6.21-rc7-git7.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 25 16:30:58 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 12:30:58 -0400
Subject: rpms/ipsec-tools/devel ipsec-tools-0.6.5-CVE-2007-1841.patch, NONE,
	1.1 ipsec-tools.spec, 1.40, 1.41
Message-ID: <200704251630.l3PGUwTv022531@cvs.devel.redhat.com>

Author: jantill

Update of /cvs/dist/rpms/ipsec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17199

Modified Files:
	ipsec-tools.spec 
Added Files:
	ipsec-tools-0.6.5-CVE-2007-1841.patch 
Log Message:
* Mon Apr 23 2007 Steve Grubb <sgrubb at redhat.com> - 0.6.5-8
- Upstream fix for Racoon DOS, informational delete must be encrypted
- Resolves: rhbz#235388 - CVE-2007-1841 ipsec-tools racoon DoS


ipsec-tools-0.6.5-CVE-2007-1841.patch:
 isakmp_inf.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE ipsec-tools-0.6.5-CVE-2007-1841.patch ---
Index: src/racoon/isakmp_inf.c
===================================================================
RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/isakmp_inf.c,v
retrieving revision 1.14.4.9
diff -u -p -r1.14.4.9 isakmp_inf.c
--- src/racoon/isakmp_inf.c	2 Aug 2005 15:09:26 -0000	1.14.4.9
+++ src/racoon/isakmp_inf.c	2 Apr 2007 12:52:07 -0000
@@ -267,12 +267,12 @@ isakmp_info_recv(iph1, msg0)
 
 	switch (np) {
 	case ISAKMP_NPTYPE_N:
-		if (isakmp_info_recv_n(iph1, msg) < 0)
-			goto end;
+		if ( encrypted )
+			isakmp_info_recv_n(iph1, msg);
 		break;
 	case ISAKMP_NPTYPE_D:
-		if (isakmp_info_recv_d(iph1, msg) < 0)
-			goto end;
+		if ( encrypted )
+			isakmp_info_recv_d(iph1, msg);
 		break;
 	case ISAKMP_NPTYPE_NONCE:
 		/* XXX to be 6.4.2 ike-01.txt */


Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ipsec-tools.spec	14 Apr 2007 21:02:15 -0000	1.40
+++ ipsec-tools.spec	25 Apr 2007 16:30:51 -0000	1.41
@@ -20,13 +20,15 @@
 Patch10: ipsec-tools-0.6.5-ctx.patch
 Patch11: ipsec-tools-0.6.5-acquires.patch
 Patch12: ipsec-tools-0.6.5-loopback.patch
-Patch13: ipsec-tools-0.6.5-context-increase.patch
-Patch14: ipsec-tools-0.6.5-leak.patch
-
+#Patch13: ipsec-tools-0.6.5-context-increase.patch
+#Patch14: ipsec-tools-0.6.5-leak.patch
+Patch13: ipsec-tools-0.6.5-CVE-2007-1841.patch
+ 
 BuildRequires: openssl-devel, krb5-devel, bison, flex, automake, libtool
 BuildRequires: libselinux-devel >= 1.30.28-2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: initscripts >= 7.31.11.EL-1
+BuildRequires: audit-libs-devel >= 1.3.1
 	
 %description
 This is the IPsec-Tools package.  You need this package in order to
@@ -46,8 +48,7 @@
 %patch10 -p1 -b .hctx
 %patch11 -p1 -b .acquires
 %patch12 -p1 -b .loopback
-%patch13 -p1 -b .context
-%patch14 -p1 -b .leak
+%patch13 -p0 -b .CVE-2007-1841
 
 mkdir -p kernel-headers/linux
 cp %{SOURCE1} %{SOURCE2} %{SOURCE5} %{SOURCE6} kernel-headers/linux
@@ -66,7 +67,8 @@
  --enable-gssapi \
  --enable-natt \
  --enable-security-context \
- --enable-racoon-over-loopback
+ --enable-racoon-over-loopback \
+ --enable-audit
 make
 
 %install
@@ -107,6 +109,16 @@
 %config(noreplace) /etc/racoon/racoon.conf
 
 %changelog
+* Mon Apr 23 2007 Steve Grubb <sgrubb at redhat.com> - 0.6.5-8
+- Upstream fix for Racoon DOS, informational delete must be encrypted
+- Resolves: rhbz#235388 - CVE-2007-1841 ipsec-tools racoon DoS
+
+* Fri Apr 20 2007 Steve Grubb <sgrubb at redhat.com> - 0.6.5-7
+- Resolves: #218386 labeled ipsec does not work over loopback
+
+* Mon Apr 16 2007 Steve Grubb <sgrubb at redhat.com> - 0.6.5-6.6
+- Related: #232508 add auditing to racoon
+
 * Sat Apr 14 2007 Steve Grubb <sgrubb at redhat.com> - 0.6.6-6%{?dist}
 - Resolves: #235680 racoon socket descriptor exhaustion
 



From fedora-cvs-commits at redhat.com  Wed Apr 25 16:31:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 12:31:26 -0400
Subject: rpms/ipsec-tools/devel ipsec-tools.spec,1.41,1.42
Message-ID: <200704251631.l3PGVQaR023232@cvs.devel.redhat.com>

Author: jantill

Update of /cvs/dist/rpms/ipsec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23191

Modified Files:
	ipsec-tools.spec 
Log Message:
* Mon Apr 23 2007 Steve Grubb <sgrubb at redhat.com> - 0.6.5-8
- Upstream fix for Racoon DOS, informational delete must be encrypted
- Resolves: rhbz#235388 - CVE-2007-1841 ipsec-tools racoon DoS



Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ipsec-tools.spec	25 Apr 2007 16:30:51 -0000	1.41
+++ ipsec-tools.spec	25 Apr 2007 16:31:24 -0000	1.42
@@ -1,6 +1,6 @@
 Name: ipsec-tools
 Version: 0.6.6
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Tools for configuring and using IPSEC
 License: BSD
 Group: System Environment/Base



From fedora-cvs-commits at redhat.com  Wed Apr 25 16:35:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 12:35:30 -0400
Subject: rpms/xorg-x11-drv-amd/devel sources, 1.7, 1.8 xorg-x11-drv-amd.spec,
	1.13, 1.14
Message-ID: <200704251635.l3PGZURM026022@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	sources xorg-x11-drv-amd.spec 
Log Message:
* Tue Apr 24 2007 Adam Jackson <ajax at redhat.com> 0.0-16.20070424
- Misc LX fixes.



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-amd/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Oct 2006 23:05:00 -0000	1.7
+++ sources	25 Apr 2007 16:35:28 -0000	1.8
@@ -1 +1 @@
-ede489ed1993da055fe24a8d23a79555  xf86-video-amd-0.0-git20061016.tar.bz2
+0b0d4ace479ec3b42359df6bdc33ba1a  xf86-video-amd-0.0-git20070424.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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-amd.spec	17 Apr 2007 14:03:34 -0000	1.13
+++ xorg-x11-drv-amd.spec	25 Apr 2007 16:35:28 -0000	1.14
@@ -2,22 +2,19 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define gitdate 20061016
+%define gitdate 20070424
 
 Summary:   Xorg X11 AMD Geode video driver
 Name:      xorg-x11-drv-amd
 Version:   0.0
-Release:   9.%{gitdate}git%{?dist}
-URL:       http://git.infradead.org/?p=users/jcrouse/xf86-video-amd.git
+Release:   16.%{gitdate}%{?dist}
+URL:       http://dev.laptop.org/git.do?p=xf86-amd-devel
 Source0:    xf86-video-amd-0.0-git%{gitdate}.tar.bz2
 #Source1:   amd.xinf
-License: MIT
+License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0: amd-visibility.patch
-Patch1: amd-build-fix.patch
-
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig
@@ -38,14 +35,14 @@
 Requires:  xorg-x11-server-Xorg >= 1.1.0
 %endif
 
+Patch: lx-disable-compression.patch
+
 %description 
 X.Org X11 AMD Geode video driver.
 
 %prep
-#%setup -q -n %{tarball}-%{version}
 %setup -q -n %{tarball}
-%patch0 -p1 -b .visibility
-%patch1 -p1 -b .jx
+%patch -p1 -b .jx
 
 # remind myself to do snapshots properly
 if [ -e %{tarball}/.git ] ; then
@@ -78,11 +75,36 @@
 %{driverdir}/amd_drv.so
 %{driverdir}/ztv_drv.so
 #%{_datadir}/hwdata/videoaliases/amd.xinf
+#%dir %{_mandir}/man4x
 %{_mandir}/man4/amd.4*
 
 %changelog
-* Tue Apr 17 2007 Adam Jackson <ajax at redhat.com> 0.0-9.20061016git
-- Fix the license.
+* Tue Apr 24 2007 Adam Jackson <ajax at redhat.com> 0.0-16.20070424
+- Misc LX fixes.
+
+* Thu Apr 19 2007 Adam Jackson <ajax at redhat.com> 0.0-15.20070418
+- Disable compression on LX for now, it's busted.
+
+* Wed Apr 18 2007 Adam Jackson <ajax at redhat.com> 0.0-14.20070418
+- Geode LX branch work
+
+* Sat Feb  3 2007 Dan Williams <dcbw at redhat.com> 0.0-13.20070203.olpc1
+- Fix segfault when accel is disabled
+
+* Tue Jan 16 2007 Adam Jackson <ajax at redhat.com> 0.0-13.20070116.olpc1
+- Fix EXA setup.
+
+* Mon Jan 15 2007 Adam Jackson <ajax at redhat.com> 0.0-12.20070115.olpc1
+- More Xv fixes, mode sync wonkiness, distcheck fix.
+
+* Thu Jan 11 2007 Adam Jackson <ajax at redhat.com> 0.0-11.20070111.olpc1
+- Xv fixes, RANDR fixes, minor crash fix.
+
+* Thu Jan 04 2007 Adam Jackson <ajax at redhat.com> 0.0-10.20070104.olpc1
+- Pull from dev.laptop.org: RANDR support, misc cleanup.
+
+* Thu Nov 9 2006 Adam Jackson <ajackson at redhat.com> 0.0-9.20061109git.olpc1
+- Today's update: DCON support, etc.
 
 * Mon Oct 16 2006 Adam Jackson <ajackson at redhat.com> 0.0-8.20061016git.fc7
 - Today's snapshot: More Xv love.



From fedora-cvs-commits at redhat.com  Wed Apr 25 16:36:38 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 12:36:38 -0400
Subject: rpms/xorg-x11-drv-amd/devel lx-disable-compression.patch,NONE,1.1
Message-ID: <200704251636.l3PGacKb026839@cvs.devel.redhat.com>

Author: ajackson

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

Added Files:
	lx-disable-compression.patch 
Log Message:
* Tue Apr 24 2007 Adam Jackson <ajax at redhat.com> 0.0-16.20070424
- Misc LX fixes.


lx-disable-compression.patch:
 amd_lx_driver.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE lx-disable-compression.patch ---
--- xf86-video-amd/src/amd_lx_driver.c.jx	2007-04-18 14:45:01.000000000 -0400
+++ xf86-video-amd/src/amd_lx_driver.c	2007-04-19 17:23:41.000000000 -0400
@@ -291,7 +291,9 @@
     fbavail -= pGeode->displaySize;
     fboffset += pGeode->displaySize;
 
-    if (pGeode->tryCompression) {
+    if (1)
+	pGeode->Compression = FALSE;
+    else if (pGeode->tryCompression) {
 	size = pScrni->virtualY * LX_CB_PITCH;
 
 	if (size <= fbavail) {



From fedora-cvs-commits at redhat.com  Wed Apr 25 16:37:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 12:37:43 -0400
Subject: rpms/postgresql-odbc/devel .cvsignore, 1.8, 1.9 acinclude.m4, 1.1,
	1.2 postgresql-odbc.spec, 1.17, 1.18 sources, 1.8, 1.9
Message-ID: <200704251637.l3PGbhqR027723@cvs.devel.redhat.com>

Author: tgl

Update of /cvs/dist/rpms/postgresql-odbc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27676

Modified Files:
	.cvsignore acinclude.m4 postgresql-odbc.spec sources 
Log Message:
Update to version 08.02.0200


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/postgresql-odbc/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Feb 2006 22:15:42 -0000	1.8
+++ .cvsignore	25 Apr 2007 16:37:41 -0000	1.9
@@ -1 +1 @@
-psqlodbc-08.01.0200.tar.gz
+psqlodbc-08.02.0200.tar.gz


Index: acinclude.m4
===================================================================
RCS file: /cvs/dist/rpms/postgresql-odbc/devel/acinclude.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- acinclude.m4	9 Sep 2004 10:36:41 -0000	1.1
+++ acinclude.m4	25 Apr 2007 16:37:41 -0000	1.2
@@ -1,4 +1,304 @@
-# $Header$
+# Macros that test various C library quirks
+# $PostgreSQL: pgsql/config/c-library.m4,v 1.31 2005/02/24 01:34:45 tgl Exp $
+
+
+# PGAC_VAR_INT_TIMEZONE
+# ---------------------
+# Check if the global variable `timezone' exists. If so, define
+# HAVE_INT_TIMEZONE.
+AC_DEFUN([PGAC_VAR_INT_TIMEZONE],
+[AC_CACHE_CHECK(for int timezone, pgac_cv_var_int_timezone,
+[AC_TRY_LINK([#include <time.h>
+int res;],
+  [#ifndef __CYGWIN__
+res = timezone / 60;
+#else
+res = _timezone / 60;
+#endif],
+  [pgac_cv_var_int_timezone=yes],
+  [pgac_cv_var_int_timezone=no])])
+if test x"$pgac_cv_var_int_timezone" = xyes ; then
+  AC_DEFINE(HAVE_INT_TIMEZONE,, [Define to 1 if you have the global variable 'int timezone'.])
+fi])# PGAC_VAR_INT_TIMEZONE
+
+
+# PGAC_STRUCT_TIMEZONE
+# ------------------
+# Figure out how to get the current timezone.  If `struct tm' has a
+# `tm_zone' member, define `HAVE_TM_ZONE'.  Also, if the
+# external array `tzname' is found, define `HAVE_TZNAME'.
+# This is the same as the standard macro AC_STRUCT_TIMEZONE, except that
+# tzname[] is checked for regardless of whether we find tm_zone.
+AC_DEFUN([PGAC_STRUCT_TIMEZONE],
+[AC_REQUIRE([AC_STRUCT_TM])dnl
+AC_CHECK_MEMBERS([struct tm.tm_zone],,,[#include <sys/types.h>
+#include <$ac_cv_struct_tm>
+])
+if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
+  AC_DEFINE(HAVE_TM_ZONE, 1,
+            [Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
+             `HAVE_STRUCT_TM_TM_ZONE' instead.])
+fi
+AC_CACHE_CHECK(for tzname, ac_cv_var_tzname,
+[AC_TRY_LINK(
+[#include <time.h>
+#ifndef tzname /* For SGI.  */
+extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
+#endif
+],
+[atoi(*tzname);], ac_cv_var_tzname=yes, ac_cv_var_tzname=no)])
+if test $ac_cv_var_tzname = yes; then
+    AC_DEFINE(HAVE_TZNAME, 1,
+              [Define to 1 if you have the external array `tzname'.])
+fi
+])# PGAC_STRUCT_TIMEZONE
+
+
+# PGAC_FUNC_GETTIMEOFDAY_1ARG
+# ---------------------------
+# Check if gettimeofday() has only one arguments. (Normal is two.)
+# If so, define GETTIMEOFDAY_1ARG.
+AC_DEFUN([PGAC_FUNC_GETTIMEOFDAY_1ARG],
+[AC_CACHE_CHECK(whether gettimeofday takes only one argument,
+pgac_cv_func_gettimeofday_1arg,
+[AC_TRY_COMPILE([#include <sys/time.h>],
+[struct timeval *tp;
+struct timezone *tzp;
+gettimeofday(tp,tzp);],
+[pgac_cv_func_gettimeofday_1arg=no],
+[pgac_cv_func_gettimeofday_1arg=yes])])
+if test x"$pgac_cv_func_gettimeofday_1arg" = xyes ; then
+  AC_DEFINE(GETTIMEOFDAY_1ARG,, [Define to 1 if gettimeofday() takes only 1 argument.])
+fi
+AH_VERBATIM(GETTIMEOFDAY_1ARG_,
+[@%:@ifdef GETTIMEOFDAY_1ARG
+@%:@ define gettimeofday(a,b) gettimeofday(a)
+@%:@endif])dnl
+])# PGAC_FUNC_GETTIMEOFDAY_1ARG
+
+
+# PGAC_FUNC_GETPWUID_R_5ARG
+# ---------------------------
+# Check if getpwuid_r() takes a fifth argument (later POSIX standard, not draft version)
+# If so, define GETPWUID_R_5ARG
+AC_DEFUN([PGAC_FUNC_GETPWUID_R_5ARG],
+[AC_CACHE_CHECK(whether getpwuid_r takes a fifth argument,
+pgac_func_getpwuid_r_5arg,
+[AC_TRY_COMPILE([#include <sys/types.h>
+#include <pwd.h>],
+[uid_t uid;
+struct passwd *space;
+char *buf;
+size_t bufsize;
+struct passwd **result;
+getpwuid_r(uid, space, buf, bufsize, result);],
+[pgac_func_getpwuid_r_5arg=yes],
+[pgac_func_getpwuid_r_5arg=no])])
+if test x"$pgac_func_getpwuid_r_5arg" = xyes ; then
+  AC_DEFINE(GETPWUID_R_5ARG,, [Define to 1 if getpwuid_r() takes a 5th argument.])
+fi
+])# PGAC_FUNC_GETPWUID_R_5ARG
+
+
+# PGAC_FUNC_STRERROR_R_INT
+# ---------------------------
+# Check if strerror_r() returns an int (SUSv3) rather than a char * (GNU libc)
+# If so, define STRERROR_R_INT
+AC_DEFUN([PGAC_FUNC_STRERROR_R_INT],
+[AC_CACHE_CHECK(whether strerror_r returns int,
+pgac_func_strerror_r_int,
+[AC_TRY_COMPILE([#include <string.h>],
+[#ifndef _AIX
+int strerror_r(int, char *, size_t);
+#else
+/* Older AIX has 'int' for the third argument so we don't test the args. */
+int strerror_r();
+#endif],
+[pgac_func_strerror_r_int=yes],
+[pgac_func_strerror_r_int=no])])
+if test x"$pgac_func_strerror_r_int" = xyes ; then
+  AC_DEFINE(STRERROR_R_INT,, [Define to 1 if strerror_r() returns a int.])
+fi
+])# PGAC_FUNC_STRERROR_R_INT
+
+
+# PGAC_UNION_SEMUN
+# ----------------
+# Check if `union semun' exists. Define HAVE_UNION_SEMUN if so.
+# If it doesn't then one could define it as
+# union semun { int val; struct semid_ds *buf; unsigned short *array; }
+AC_DEFUN([PGAC_UNION_SEMUN],
+[AC_CHECK_TYPES([union semun], [], [],
+[#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/sem.h>])])# PGAC_UNION_SEMUN
+
+
+# PGAC_STRUCT_SOCKADDR_UN
+# -----------------------
+# If `struct sockaddr_un' exists, define HAVE_UNIX_SOCKETS.
+# (Requires test for <sys/un.h>!)
+AC_DEFUN([PGAC_STRUCT_SOCKADDR_UN],
+[AC_CHECK_TYPES([struct sockaddr_un], [AC_DEFINE(HAVE_UNIX_SOCKETS, 1, [Define to 1 if you have unix sockets.])], [],
+[#include <sys/types.h>
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+])])# PGAC_STRUCT_SOCKADDR_UN
+
+
+# PGAC_STRUCT_SOCKADDR_STORAGE
+# ----------------------------
+# If `struct sockaddr_storage' exists, define HAVE_STRUCT_SOCKADDR_STORAGE.
+# If it is missing then one could define it.
+AC_DEFUN([PGAC_STRUCT_SOCKADDR_STORAGE],
+[AC_CHECK_TYPES([struct sockaddr_storage], [], [],
+[#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+])])# PGAC_STRUCT_SOCKADDR_STORAGE
+
+# PGAC_STRUCT_SOCKADDR_STORAGE_MEMBERS
+# --------------------------------------
+# Check the members of `struct sockaddr_storage'.  We need to know about
+# ss_family and ss_len.  (Some platforms follow RFC 2553 and call them
+# __ss_family and __ss_len.)  We also check struct sockaddr's sa_len;
+# if we have to define our own `struct sockaddr_storage', this tells us
+# whether we need to provide an ss_len field.
+AC_DEFUN([PGAC_STRUCT_SOCKADDR_STORAGE_MEMBERS],
+[AC_CHECK_MEMBERS([struct sockaddr_storage.ss_family,
+		   struct sockaddr_storage.__ss_family,
+		   struct sockaddr_storage.ss_len,
+		   struct sockaddr_storage.__ss_len,
+		   struct sockaddr.sa_len], [], [],
+[#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+])])# PGAC_STRUCT_SOCKADDR_STORAGE_MEMBERS
+
+
+# PGAC_STRUCT_ADDRINFO
+# -----------------------
+# If `struct addrinfo' exists, define HAVE_STRUCT_ADDRINFO.
+AC_DEFUN([PGAC_STRUCT_ADDRINFO],
+[AC_CHECK_TYPES([struct addrinfo], [], [],
+[#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+])])# PGAC_STRUCT_ADDRINFO
+
+
+# PGAC_FUNC_POSIX_SIGNALS
+# -----------------------
+# Check to see if the machine has the POSIX signal interface. Define
+# HAVE_POSIX_SIGNALS if so. Also set the output variable HAVE_POSIX_SIGNALS
+# to yes or no.
+#
+# Note that this test only compiles a test program, it doesn't check
+# whether the routines actually work. If that becomes a problem, make
+# a fancier check.
+AC_DEFUN([PGAC_FUNC_POSIX_SIGNALS],
+[AC_CACHE_CHECK(for POSIX signal interface, pgac_cv_func_posix_signals,
+[AC_TRY_LINK([#include <signal.h>
+],
+[struct sigaction act, oact;
+sigemptyset(&act.sa_mask);
+act.sa_flags = SA_RESTART;
+sigaction(0, &act, &oact);],
+[pgac_cv_func_posix_signals=yes],
+[pgac_cv_func_posix_signals=no])])
+if test x"$pgac_cv_func_posix_signals" = xyes ; then
+  AC_DEFINE(HAVE_POSIX_SIGNALS,, [Define to 1 if you have the POSIX signal interface.])
+fi
+HAVE_POSIX_SIGNALS=$pgac_cv_func_posix_signals
+AC_SUBST(HAVE_POSIX_SIGNALS)])# PGAC_FUNC_POSIX_SIGNALS
+
+
+# PGAC_FUNC_SNPRINTF_LONG_LONG_INT_FORMAT
+# ---------------------------------------
+# Determine which format snprintf uses for long long int.  We handle
+# %lld, %qd, %I64d.  The result is in shell variable
+# LONG_LONG_INT_FORMAT.
+#
+# MinGW uses '%I64d', though gcc throws an warning with -Wall,
+# while '%lld' doesn't generate a warning, but doesn't work.
+#
+AC_DEFUN([PGAC_FUNC_SNPRINTF_LONG_LONG_INT_FORMAT],
+[AC_MSG_CHECKING([snprintf format for long long int])
+AC_CACHE_VAL(pgac_cv_snprintf_long_long_int_format,
+[for pgac_format in '%lld' '%qd' '%I64d'; do
+AC_TRY_RUN([#include <stdio.h>
+typedef long long int ac_int64;
+#define INT64_FORMAT "$pgac_format"
+
+ac_int64 a = 20000001;
+ac_int64 b = 40000005;
+
+int does_int64_snprintf_work()
+{
+  ac_int64 c;
+  char buf[100];
+
+  if (sizeof(ac_int64) != 8)
+    return 0;			/* doesn't look like the right size */
+
+  c = a * b;
+  snprintf(buf, 100, INT64_FORMAT, c);
+  if (strcmp(buf, "800000140000005") != 0)
+    return 0;			/* either multiply or snprintf is busted */
+  return 1;
+}
+main() {
+  exit(! does_int64_snprintf_work());
+}],
+[pgac_cv_snprintf_long_long_int_format=$pgac_format; break],
+[],
+[pgac_cv_snprintf_long_long_int_format=cross; break])
+done])dnl AC_CACHE_VAL
+
+LONG_LONG_INT_FORMAT=''
+
+case $pgac_cv_snprintf_long_long_int_format in
+  cross) AC_MSG_RESULT([cannot test (not on host machine)]);;
+  ?*)    AC_MSG_RESULT([$pgac_cv_snprintf_long_long_int_format])
+         LONG_LONG_INT_FORMAT=$pgac_cv_snprintf_long_long_int_format;;
+  *)     AC_MSG_RESULT(none);;
+esac])# PGAC_FUNC_SNPRINTF_LONG_LONG_INT_FORMAT
+
+
+# PGAC_FUNC_PRINTF_ARG_CONTROL
+# ---------------------------------------
+# Determine if printf supports %1$ argument selection, e.g. %5$ selects
+# the fifth argument after the printf print string.
+# This is not in the C99 standard, but in the Single Unix Specification (SUS).
+# It is used in our language translation strings.
+#
+AC_DEFUN([PGAC_FUNC_PRINTF_ARG_CONTROL],
+[AC_MSG_CHECKING([whether printf supports argument control])
+AC_CACHE_VAL(pgac_cv_printf_arg_control,
+[AC_TRY_RUN([#include <stdio.h>
+#include <string.h>
+
+int main()
+{
+  char buf[100];
+
+  /* can it swap arguments? */
+  snprintf(buf, 100, "%2\$d %1\$d", 3, 4);
+  if (strcmp(buf, "4 3") != 0)
+    return 1;
+  return 0;
+}],
+[pgac_cv_printf_arg_control=yes],
+[pgac_cv_printf_arg_control=no],
+[pgac_cv_printf_arg_control=cross])
+])dnl AC_CACHE_VAL
+AC_MSG_RESULT([$pgac_cv_printf_arg_control])
+])# PGAC_FUNC_PRINTF_ARG_CONTROL
+
+# $PostgreSQL: pgsql/config/general.m4,v 1.9 2006/11/30 22:21:23 tgl Exp $
 
 # This file defines new macros to process configure command line
 # arguments, to replace the brain-dead AC_ARG_WITH and AC_ARG_ENABLE.
@@ -24,10 +324,11 @@
 # This is the base layer. TYPE is either "with" or "enable", depending
 # on what you like. NAME is the rest of the option name, HELP-STRING
 # as usual. ACTION-IF-YES is executed if the option is given without
-# and argument (or "yes", which is the same); similar for ACTION-IF-NO.
+# an argument (or "yes", which is the same); similar for ACTION-IF-NO.
 
 AC_DEFUN([PGAC_ARG],
 [
+pgac_args="$pgac_args pgac_arg_to_variable([$1],[$2])"
 m4_case([$1],
 
 enable, [
@@ -68,6 +369,22 @@
 )
 ])# PGAC_ARG
 
+# PGAC_ARG_CHECK()
+# ----------------
+# Checks if the user passed any --with/without/enable/disable
+# arguments that were not defined. Just prints out a warning message,
+# so this should be called near the end, so the user will see it.
+
+AC_DEFUN([PGAC_ARG_CHECK],
+[for pgac_var in `set | sed 's/=.*//' | $EGREP 'with_|enable_'`; do
+  for pgac_arg in $pgac_args with_gnu_ld; do
+    if test "$pgac_var" = "$pgac_arg"; then
+      continue 2
+    fi
+  done
+  pgac_txt=`echo $pgac_var | sed 's/_/-/g'`
+  AC_MSG_WARN([option ignored: --$pgac_txt])
+done])# PGAC_ARG_CHECK
 
 # PGAC_ARG_BOOL(TYPE, NAME, DEFAULT, HELP-STRING, 
 #               [ACTION-IF-YES], [ACTION-IF-NO])
@@ -133,93 +450,3 @@
 fi
 ])[]dnl
 ])# PGAC_ARG_OPTARG
-
-# Macros that test various C library quirks
-# $Header$
-
-
-# PGAC_VAR_INT_TIMEZONE
-# ---------------------
-# Check if the global variable `timezone' exists. If so, define
-# HAVE_INT_TIMEZONE.
-AC_DEFUN([PGAC_VAR_INT_TIMEZONE],
-[AC_CACHE_CHECK(for int timezone, pgac_cv_var_int_timezone,
-[AC_TRY_LINK([#include <time.h>
-int res;],
-  [res = timezone / 60;],
-  [pgac_cv_var_int_timezone=yes],
-  [pgac_cv_var_int_timezone=no])])
-if test x"$pgac_cv_var_int_timezone" = xyes ; then
-  AC_DEFINE(HAVE_INT_TIMEZONE,, [Set to 1 if you have the global variable timezone])
-fi])# PGAC_VAR_INT_TIMEZONE
-
-
-# PGAC_FUNC_GETTIMEOFDAY_1ARG
-# ---------------------------
-# Check if gettimeofday() has only one arguments. (Normal is two.)
-# If so, define GETTIMEOFDAY_1ARG.
-AC_DEFUN([PGAC_FUNC_GETTIMEOFDAY_1ARG],
-[AC_CACHE_CHECK(whether gettimeofday takes only one argument,
-pgac_cv_func_gettimeofday_1arg,
-[AC_TRY_COMPILE([#include <sys/time.h>],
-[struct timeval *tp;
-struct timezone *tzp;
-gettimeofday(tp,tzp);],
-[pgac_cv_func_gettimeofday_1arg=no],
-[pgac_cv_func_gettimeofday_1arg=yes])])
-if test x"$pgac_cv_func_gettimeofday_1arg" = xyes ; then
-  AC_DEFINE(GETTIMEOFDAY_1ARG,, [Set to 1 if gettimeofday() takes only 1 argument])
-fi])# PGAC_FUNC_GETTIMEOFDAY_1ARG
-
-
-# PGAC_UNION_SEMUN
-# ----------------
-# Check if `union semun' exists. Define HAVE_UNION_SEMUN if so.
-# If it doesn't then one could define it as
-# union semun { int val; struct semid_ds *buf; unsigned short *array; }
-AC_DEFUN([PGAC_UNION_SEMUN],
-[AC_CHECK_TYPES([union semun], [], [],
-[#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>])])# PGAC_UNION_SEMUN
-
-
-# PGAC_STRUCT_SOCKADDR_UN
-# -----------------------
-# If `struct sockaddr_un' exists, define HAVE_STRUCT_SOCKADDR_UN. If
-# it is missing then one could define it as { short int sun_family;
-# char sun_path[108]; }. (Requires test for <sys/un.h>!)
-AC_DEFUN([PGAC_STRUCT_SOCKADDR_UN],
-[AC_CHECK_TYPES([struct sockaddr_un], [], [],
-[#include <sys/types.h>
-#ifdef HAVE_SYS_UN_H
-#include <sys/un.h>
-#endif
-])])# PGAC_STRUCT_SOCKADDR_UN
-
-
-# PGAC_FUNC_POSIX_SIGNALS
-# -----------------------
-# Check to see if the machine has the POSIX signal interface. Define
-# HAVE_POSIX_SIGNALS if so. Also set the output variable HAVE_POSIX_SIGNALS
-# to yes or no.
-#
-# Note that this test only compiles a test program, it doesn't check
-# whether the routines actually work. If that becomes a problem, make
-# a fancier check.
-AC_DEFUN([PGAC_FUNC_POSIX_SIGNALS],
-[AC_CACHE_CHECK(for POSIX signal interface, pgac_cv_func_posix_signals,
-[AC_TRY_LINK([#include <signal.h>
-],
-[struct sigaction act, oact;
-sigemptyset(&act.sa_mask);
-act.sa_flags = SA_RESTART;
-sigaction(0, &act, &oact);],
-[pgac_cv_func_posix_signals=yes],
-[pgac_cv_func_posix_signals=no])])
-if test x"$pgac_cv_func_posix_signals" = xyes ; then
-  AC_DEFINE(HAVE_POSIX_SIGNALS,, [Set to 1 if you have the POSIX signal interface])
-fi
-HAVE_POSIX_SIGNALS=$pgac_cv_func_posix_signals
-AC_SUBST(HAVE_POSIX_SIGNALS)])# PGAC_FUNC_POSIX_SIGNALS
-


Index: postgresql-odbc.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql-odbc/devel/postgresql-odbc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- postgresql-odbc.spec	11 Dec 2006 21:59:44 -0000	1.17
+++ postgresql-odbc.spec	25 Apr 2007 16:37:41 -0000	1.18
@@ -1,22 +1,26 @@
 Name: postgresql-odbc
-Summary: PostgreSQL ODBC driver.
-Version: 08.01.0200
-Release: 4%{?dist}
+Summary: PostgreSQL ODBC driver
+Version: 08.02.0200
+Release: 1%{?dist}
 License: LGPL
 Group: Applications/Databases
-Url: http://gborg.postgresql.org/project/psqlodbc
+URL: http://psqlodbc.projects.postgresql.org/
 
-Source0: ftp://ftp.us.postgresql.org/odbc/versions/src/psqlodbc-%{version}.tar.gz
+Source0: http://www.postgresql.org/ftp/odbc/versions/src/psqlodbc-%{version}.tar.gz
+# CAUTION: acinclude.m4 has to be kept in sync with package's aclocal.m4.
+# This is a kluge that ought to go away, but upstream currently isn't
+# shipping their custom macros anywhere except in aclocal.m4.  (The macros
+# actually come from the Postgres source tree, but we haven't got that
+# available while building this RPM.)  To generate: in this source tree,
+#   aclocal -I . -I $PGSRC/config
+# then strip aclocal.m4 down to just the PGAC macros.
 Source1: acinclude.m4
 
-BuildRoot: %{_tmppath}/%{name}-root
-BuildPreReq: unixODBC-devel
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: unixODBC-devel
 BuildRequires: libtool automake autoconf postgresql-devel
 
 Requires: postgresql-libs >= 8.0
-Provides: postgresql-odbc
-
-Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 # This spec file and ancillary files are licensed in accordance with 
 # the psqlodbc license.
@@ -31,10 +35,11 @@
 # Some missing macros.  Courtesy Owen Taylor <otaylor at redhat.com>.
 
 cp -p %{SOURCE1} .
-aclocal
-libtoolize --force
-automake
+libtoolize --force  --copy
+aclocal -I .
+automake --add-missing --copy
 autoconf
+autoheader
 
 %build
 
@@ -70,6 +75,9 @@
 %doc license.txt readme.txt docs/*
 
 %changelog
+* Wed Apr 25 2007 Tom Lane <tgl at redhat.com> 08.02.0200-1
+- Update to version 08.02.0200
+
 * Mon Dec 11 2006 Tom Lane <tgl at redhat.com> 08.01.0200-4
 - Rebuild for new Postgres libraries
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/postgresql-odbc/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Feb 2006 22:15:42 -0000	1.8
+++ sources	25 Apr 2007 16:37:41 -0000	1.9
@@ -1 +1 @@
-61206229b5d8dfe5e7a4cf81a7a218da  psqlodbc-08.01.0200.tar.gz
+c8de1ac6c7002e764629c4e4ef24ae61  psqlodbc-08.02.0200.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 25 16:42:13 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 12:42:13 -0400
Subject: rpms/postgresql-odbc/devel postgresql-odbc.spec,1.18,1.19
Message-ID: <200704251642.l3PGgDWO031048@cvs.devel.redhat.com>

Author: tgl

Update of /cvs/dist/rpms/postgresql-odbc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31007

Modified Files:
	postgresql-odbc.spec 
Log Message:
Add missing BuildRequires.


Index: postgresql-odbc.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql-odbc/devel/postgresql-odbc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- postgresql-odbc.spec	25 Apr 2007 16:37:41 -0000	1.18
+++ postgresql-odbc.spec	25 Apr 2007 16:42:11 -0000	1.19
@@ -18,7 +18,7 @@
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: unixODBC-devel
-BuildRequires: libtool automake autoconf postgresql-devel
+BuildRequires: libtool automake autoconf postgresql-devel openssl-devel
 
 Requires: postgresql-libs >= 8.0
 



From fedora-cvs-commits at redhat.com  Wed Apr 25 16:52:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 12:52:43 -0400
Subject: rpms/postgresql-odbc/devel postgresql-odbc.spec,1.19,1.20
Message-ID: <200704251652.l3PGqheZ006492@cvs.devel.redhat.com>

Author: tgl

Update of /cvs/dist/rpms/postgresql-odbc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6444

Modified Files:
	postgresql-odbc.spec 
Log Message:
Add missing BuildRequires.


Index: postgresql-odbc.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql-odbc/devel/postgresql-odbc.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- postgresql-odbc.spec	25 Apr 2007 16:42:11 -0000	1.19
+++ postgresql-odbc.spec	25 Apr 2007 16:52:40 -0000	1.20
@@ -18,7 +18,8 @@
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: unixODBC-devel
-BuildRequires: libtool automake autoconf postgresql-devel openssl-devel
+BuildRequires: libtool automake autoconf postgresql-devel
+BuildRequires: openssl-devel krb5-devel pam-devel zlib-devel readline-devel
 
 Requires: postgresql-libs >= 8.0
 



From fedora-cvs-commits at redhat.com  Wed Apr 25 16:53:34 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 12:53:34 -0400
Subject: rpms/eclipse/FC-6 eclipse-ecj-gcj.patch, 1.2,
	1.3 eclipse-pde.build-add-package-build.patch, 1.2,
	1.3 eclipse.spec, 1.353, 1.354 eclipse-javadoclinks.patch, 1.5,
	NONE eclipse-searchindexlucene.patch, 1.1, NONE
Message-ID: <200704251653.l3PGrYFH007128@cvs.devel.redhat.com>

Author: bkonrath

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

Modified Files:
	eclipse-ecj-gcj.patch 
	eclipse-pde.build-add-package-build.patch eclipse.spec 
Removed Files:
	eclipse-javadoclinks.patch eclipse-searchindexlucene.patch 
Log Message:
* Wed Apr 11 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-2.fc6
- Fix links to system-installed javadocs.
- Update package-build releng script to work with 3.2 plugins.
- Update ecj-gcj patch.
- Resolves: 237835. 


eclipse-ecj-gcj.patch:
 GCCMain.java        |  495 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 messages.properties |    5 
 2 files changed, 500 insertions(+)

Index: eclipse-ecj-gcj.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse-ecj-gcj.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-ecj-gcj.patch	21 Feb 2007 05:25:12 -0000	1.2
+++ eclipse-ecj-gcj.patch	25 Apr 2007 16:53:32 -0000	1.3
@@ -1,3 +1,19 @@
+Index: batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties,v
+retrieving revision 1.546.2.23
+diff -u -r1.546.2.23 messages.properties
+--- batch/org/eclipse/jdt/internal/compiler/batch/messages.properties	8 Feb 2007 15:04:43 -0000	1.546.2.23
++++ batch/org/eclipse/jdt/internal/compiler/batch/messages.properties	26 Feb 2007 18:21:06 -0000
+@@ -249,3 +249,8 @@
+ template.restrictedAccess.constructor = The constructor {0} is not accessible due to restriction on classpath entry {1}
+ template.restrictedAccess.field = The field {0} from the type {1} is not accessible due to restriction on classpath entry {2}
+ template.restrictedAccess.method = The method {0} from the type {1} is not accessible due to restriction on classpath entry {2}
++
++# GCCMain messages.
++gcc.zipArg=-fzip-target requires argument
++gcc.zipDepArg=-fzip-dependency requires argument
++gcc.noClasspath=no classpath specified
 Index: batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
 ===================================================================
 RCS file: batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
@@ -351,7 +367,7 @@
 +						this.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$
 +				}
 +				this.destinationPath = arg;
-+				// this.generatePackagesStructure = true;
++				this.generatePackagesStructure = true;
 +			} else if (currentArg.startsWith("-fbootclasspath=")) { //$NON-NLS-1$
 +				classpath = getArgument(currentArg);
 +			} else if (currentArg.equals("-fzip-target")) { //$NON-NLS-1$

eclipse-pde.build-add-package-build.patch:
 build.properties                  |   12 +++
 customTargets-assemble-target.xml |   12 +++
 customTargets.xml                 |  144 ++++++++++++++++++++++++++++++++++++++
 prepare-build-dir.sh              |   77 ++++++++++++++++++++
 4 files changed, 245 insertions(+)

Index: eclipse-pde.build-add-package-build.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse-pde.build-add-package-build.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-pde.build-add-package-build.patch	30 Jan 2007 00:09:14 -0000	1.2
+++ eclipse-pde.build-add-package-build.patch	25 Apr 2007 16:53:32 -0000	1.3
@@ -193,42 +193,9 @@
 diff -N templates/package-build/prepare-build-dir.sh
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ templates/package-build/prepare-build-dir.sh	1 Jan 1970 00:00:00 -0000
-@@ -0,0 +1,83 @@
+@@ -0,0 +1,77 @@
 +#!/bin/sh
 +
-+
-+make_links()
-+{
-+  TYPE=$1
-+  TYPEDIR=$2
-+  shift; shift;
-+  XMLFILES=$@
-+  
-+  CURBUILDFILE=$BUILDDIR/tmp/$TYPE-build.xml
-+  cat $BUILDFILE | sed "s|@type@|$TYPE|" > $CURBUILDFILE
-+
-+  for f in $XMLFILES; do
-+    PROJECTDIR=$(dirname $f)
-+    PROJECTNAME=$(ant -Dbasedir=$PROJECTDIR -f $CURBUILDFILE 2>&1 | grep echo | cut --delimiter=' ' -f 7)
-+    if [ -z $PROJECTNAME ]; then
-+      if [ ! -e $PROJECTDIR/META-INF/MANIFEST.MF ]; then
-+        echo "ERROR: could not determine the feature id for $PROJECTDIR"
-+        exit 1
-+      fi
-+      PROJECTNAME=$(grep Bundle-SymbolicName $PROJECTDIR/META-INF/MANIFEST.MF | cut --delimiter=';' -f 1 | cut --delimiter=' ' -f 2)
-+      if [ -z $PROJECTNAME  ]; then
-+        echo "ERROR: could not determine the feature id for $PROJECTDIR"
-+        exit 1
-+      fi
-+    fi
-+    
-+    echo "  making symlink: $BUILDDIR/$TYPEDIR/$PROJECTNAME -> $PROJECTDIR"
-+    ln -sf $PROJECTDIR $BUILDDIR/$TYPEDIR/$PROJECTNAME 
-+
-+  done
-+}
-+
-+
 +if [ $# -ne 2 ]; then 
 +  echo "usage: $0 <path to source dir> <path to build dir>"
 +  exit 1
@@ -257,23 +224,50 @@
 +        </target>
 +</project>" > $BUILDFILE
 +
-+# find the feature.xml, plugin.xml and fragment.xml files
-+FEATURES=$(find $SOURCEDIR -name feature.xml)
-+PLUGINS=$(find $SOURCEDIR -name plugin.xml) 
-+FRAGMENTS=$(find $SOURCEDIR -name fragment.xml) 
++for type in feature plugin fragment; do
++  CURBUILDFILE=$BUILDDIR/tmp/$type-build.xml
++  cat $BUILDFILE | sed "s|@type@|$type|" > $CURBUILDFILE
++done
 +
 +# make the directories eclipse is expecting 
 +echo "  making the 'features' and 'plugins' directories"
 +mkdir -p $BUILDDIR/features $BUILDDIR/plugins
 +
 +# make symlinks for the features
-+make_links feature features $FEATURES
++FEATURES=$(find $SOURCEDIR -name feature.xml)
++for f in $FEATURES; do
++  PROJECTDIR=$(dirname $f)
++  PROJECTNAME=$(ant -Dbasedir=$PROJECTDIR -f $BUILDDIR/tmp/feature-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7)
++  if [ -z $PROJECTNAME ]; then
++    echo "ERROR: could not determine the feature id for $PROJECTDIR"
++    exit 1
++  fi
++
++  echo "  making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR"
++  ln -sf $PROJECTDIR $BUILDDIR/features/$PROJECTNAME
++done
++
++# make symlinks for plugins and fragments
++PLUGINDIRS=$(find $SOURCEDIR -name plugin.xml -o -name fragment.xml -o -name MANIFEST.MF | sed "s/plugin.xml//g" | sed "s/fragment.xml//g" | sed "s/META-INF\/MANIFEST.MF//" | sort | uniq)
++for dir in $PLUGINDIRS; do
++  PROJECTNAME=""
++  if [ -e $dir/META-INF/MANIFEST.MF ]; then
++    PROJECTNAME=$(grep Bundle-SymbolicName $dir/META-INF/MANIFEST.MF | cut --delimiter=';' -f 1 | cut --delimiter=' ' -f 2)
++  elif [ -e $dir/plugin.xml ]; then
++    PROJECTNAME=$(ant -Dbasedir=$dir -f $BUILDDIR/tmp/plugin-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7)
++  elif [ -e $dir/fragment.xml ]; then
++    PROJECTNAME=$(ant -Dbasedir=$dir -f $BUILDDIR/tmp/fragment-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7)
++  fi
++
++  if [ -z $PROJECTNAME  ]; then
++    echo "ERROR: could not determine the plugin or fragment id for $dir"
++    exit 1
++  fi
 +
-+# make the symlinks for plugins
-+make_links plugin plugins $PLUGINS
++  echo "  making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir"
++  ln -sf $dir $BUILDDIR/plugins/$PROJECTNAME
 +
-+# make the symlinks for fragments - they go in the plugins directory as well
-+make_links fragment plugins $FRAGMENTS
++done 
 +
 +rm -rf $BUILDDIR/tmp
 +echo done 


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse.spec,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- eclipse.spec	21 Feb 2007 05:25:12 -0000	1.353
+++ eclipse.spec	25 Apr 2007 16:53:32 -0000	1.354
@@ -19,11 +19,11 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1%{?dist} 
+Release:        2%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
-Source0:	http://download.eclipse.org/eclipse/downloads/drops/R-3.2.2-200702121330/eclipse-sourceBuild-srcIncluded-3.2.2.zip
+Source0:        http://download.eclipse.org/eclipse/downloads/drops/R-3.2.2-200702121330/eclipse-sourceBuild-srcIncluded-3.2.2.zip
 Source2:        %{name}.desktop
 # The icu4j bits will be moved out into their own package for Fedora 7.  See:
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=199504
@@ -59,9 +59,6 @@
 #    (which contains the JNI .sos) is in %{_libdir}
 # We should investigate whether or not this can go upstream
 Patch12:        %{name}-launcher-set-install-dir-and-shared-config.patch
-# Don't attempt to link to Sun's javadocs
-# FIXME:  could use sed instead
-Patch13:        %{name}-javadoclinks.patch
 # Always generate debug info when building RPMs (Andrew Haley)
 # This needs to be investigated for getEnv changes
 Patch14:        %{name}-ecj-rpmdebuginfo.patch
@@ -406,6 +403,7 @@
 sed --in-place "s/4.1.130/5.5.17/g"                      \
                 features/org.eclipse.platform/build.xml \
                 plugins/org.eclipse.tomcat/build.xml    \
+                plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF   \
                 assemble.*.xml
 pushd plugins/org.eclipse.help.webapp
 %patch8 -p0
@@ -444,15 +442,16 @@
 sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" library/eclipse.c
 popd
 
-# Link against our system-installed javadocs
-%patch13 -p0
-sed --in-place "s:/usr/share/:%{_datadir}/:g"           \
-        plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt  \
-        plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
-        plugins/org.eclipse.pde.doc.user/pdeOptions     \
-        plugins/org.eclipse.platform.doc.isv/platformOptions.txt 
+# use our system-installed javadocs
+sed --in-place "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadocs/java|" \
+   plugins/org.eclipse.platform.doc.isv/platformOptions.txt
+sed --in-place "s|http://java.sun.com/j2se/1.5/docs/api|%{_datadir}/javadocs/java|" \
+   plugins/org.eclipse.jdt.doc.isv/jdtaptOptions.txt                     \
+   plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
+sed --in-place "s|http://java.sun.com/j2se/1.4/docs/api|%{_datadir}/javadocs/java|" \
+   plugins/org.eclipse.pde.doc.user/pdeOptions.txt                       \
+   plugins/org.eclipse.pde.doc.user/pdeOptions
 %patch14 -p0
-pwd
 
 pushd plugins/org.eclipse.pde.build
 %patch15
@@ -760,7 +759,6 @@
 tar jxf %{SOURCE20}
 
 %build
-env
 ORIGCLASSPATH=$CLASSPATH
 
 # Build jsch
@@ -1765,6 +1763,12 @@
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
+* Wed Apr 11 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-2.fc6
+- Fix links to system-installed javadocs.
+- Update package-build releng script to work with 3.2 plugins.
+- Update ecj-gcj patch.
+- Resolves: 237835. 
+
 * Mon Feb 19 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-1.fc6
 - 3.2.2.
 


--- eclipse-javadoclinks.patch DELETED ---


--- eclipse-searchindexlucene.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 25 17:10:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 13:10:18 -0400
Subject: rpms/cups/devel cups-usb-paperout.patch, NONE, 1.1 cups.spec, 1.327,
	1.328
Message-ID: <200704251710.l3PHAIYx019462@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-usb-paperout.patch 
Log Message:
* Wed Apr 25 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-7
- Until bug #236736 is fixed, work around the kernel usblp driver's
  quirks so that we can detect paper-out conditions.
- Resolves: rhbz#236736


cups-usb-paperout.patch:
 runloop.c  |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 usb-unix.c |   16 ++++++++++++++++
 2 files changed, 65 insertions(+)

--- NEW FILE cups-usb-paperout.patch ---
--- cups-1.2.10/backend/runloop.c.usb-paperout	2006-12-06 20:10:16.000000000 +0000
+++ cups-1.2.10/backend/runloop.c	2007-04-25 18:00:59.000000000 +0100
@@ -40,6 +40,14 @@
 #endif /* __hpux */
 
 
+#ifdef __linux
+#include <sys/ioctl.h>
+#include <linux/lp.h>
+#include <time.h>
+int linux_usb_paperout_hack = 0;
+#endif /* __linux */
+
+
 /*
  * 'backendRunLoop()' - Read and write print and back-channel data.
  */
@@ -64,6 +72,9 @@
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
   struct sigaction action;		/* Actions for POSIX signals */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+#ifdef __linux
+  time_t	last_write = 0;		/* Last time write() succeeded */
+#endif /* __linux */
 
 
   fprintf(stderr, "DEBUG: backendRunLoop(print_fd=%d, device_fd=%d, use_bc=%d)\n",
@@ -227,6 +238,9 @@
       }
       else
       {
+#ifdef __linux
+	last_write = time (NULL);
+#endif /* __linux */
         if (paperout)
 	{
 	  fputs("STATE: -media-empty-error\n", stderr);
@@ -247,7 +261,42 @@
 	total_bytes += bytes;
       }
     }
+
+#ifdef __linux
+    if (linux_usb_paperout_hack)
+    {
+      time_t now;
+      if (!paperout &&
+	  ((now = time(NULL)) - last_write) > 5)
+      {
+	unsigned int status;
+	if (ioctl (device_fd, LPGETSTATUS, &status) == 0 &&
+	    (status & LP_POUTPA))
+	{
+	  fputs("ERROR: Out of paper!\n", stderr);
+	  fputs("STATE: +media-empty-error\n", stderr);
+	  paperout = 1;
+	}
+
+	/* Don't check status for another 5s. */
+	last_write = now;
+      }
+    }
+#endif /* __linux */
+  }
+
+#ifdef __linux
+  if (linux_usb_paperout_hack)
+  {
+    /* Wait for the last write() to finish. */
+    do
+    {
+      FD_ZERO(&output);
+      FD_SET(device_fd, &output);
+    } while (select(device_fd + 1, NULL, &output, NULL, NULL) < 0 &&
+	     errno == EINTR);
   }
+#endif /* __linux */
 
  /*
   * Return with success...
--- cups-1.2.10/backend/usb-unix.c.usb-paperout	2007-04-25 17:50:06.000000000 +0100
+++ cups-1.2.10/backend/usb-unix.c	2007-04-25 17:50:06.000000000 +0100
@@ -39,6 +39,11 @@
 #include "ieee1284.c"
 #include <sys/select.h>
 
+#ifdef __linux
+#include <unistd.h>
+#include <fcntl.h>
+extern int linux_usb_paperout_hack;
+#endif /* __linux */
 
 /*
  * Local functions...
@@ -70,6 +75,11 @@
   (void)argc;
   (void)argv;
 
+#ifdef __linux
+  /* Get the runloop to check for USB paper-out condition. */
+  linux_usb_paperout_hack = 1;
+#endif /* __linux */
+
  /*
   * Open the USB port device...
   */
@@ -150,6 +160,12 @@
 
   tcsetattr(device_fd, TCSANOW, &opts);
 
+#ifdef __linux
+  /* Put the file descriptor into non-blocking mode so that we
+   * get a chance to detect paper-out. */
+  fcntl (device_fd, F_SETFL, fcntl (device_fd, F_GETFL) | O_NONBLOCK);
+#endif /* __linux */
+
  /*
   * Finally, send the print file...
   */


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -r1.327 -r1.328
--- cups.spec	10 Apr 2007 10:52:58 -0000	1.327
+++ cups.spec	25 Apr 2007 17:10:11 -0000	1.328
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.10
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -46,6 +46,7 @@
 Patch22: cups-af_unix-auth.patch
 Patch23: cups-str2323.patch
 Patch24: cups-str2109.patch
+Patch25: cups-usb-paperout.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -154,6 +155,7 @@
 %patch22 -p1 -b .af_unix-auth
 %patch23 -p1 -b .str2323
 %patch24 -p1 -b .str2109
+%patch25 -p1 -b .usb-paperout
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -440,6 +442,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Apr 25 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-7
+- Until bug #236736 is fixed, work around the kernel usblp driver's
+  quirks so that we can detect paper-out conditions.
+
 * Tue Apr 10 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-6
 - Fixed 'cancel' man page (bug #234088).
 - Added empty subscriptions.conf file to make sure it gets the right



From fedora-cvs-commits at redhat.com  Wed Apr 25 17:12:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 13:12:49 -0400
Subject: rpms/cups/FC-6 cups-usb-paperout.patch, NONE, 1.1 cups.spec, 1.328,
	1.329
Message-ID: <200704251712.l3PHCnXn021467@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-usb-paperout.patch 
Log Message:
* Wed Apr 25 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-5
- Until bug #236736 is fixed, work around the kernel usblp driver's
  quirks so that we can detect paper-out conditions.
- Resolves: rhbz#236736


cups-usb-paperout.patch:
 runloop.c  |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 usb-unix.c |   16 ++++++++++++++++
 2 files changed, 65 insertions(+)

--- NEW FILE cups-usb-paperout.patch ---
--- cups-1.2.10/backend/runloop.c.usb-paperout	2006-12-06 20:10:16.000000000 +0000
+++ cups-1.2.10/backend/runloop.c	2007-04-25 18:00:59.000000000 +0100
@@ -40,6 +40,14 @@
 #endif /* __hpux */
 
 
+#ifdef __linux
+#include <sys/ioctl.h>
+#include <linux/lp.h>
+#include <time.h>
+int linux_usb_paperout_hack = 0;
+#endif /* __linux */
+
+
 /*
  * 'backendRunLoop()' - Read and write print and back-channel data.
  */
@@ -64,6 +72,9 @@
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
   struct sigaction action;		/* Actions for POSIX signals */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+#ifdef __linux
+  time_t	last_write = 0;		/* Last time write() succeeded */
+#endif /* __linux */
 
 
   fprintf(stderr, "DEBUG: backendRunLoop(print_fd=%d, device_fd=%d, use_bc=%d)\n",
@@ -227,6 +238,9 @@
       }
       else
       {
+#ifdef __linux
+	last_write = time (NULL);
+#endif /* __linux */
         if (paperout)
 	{
 	  fputs("STATE: -media-empty-error\n", stderr);
@@ -247,7 +261,42 @@
 	total_bytes += bytes;
       }
     }
+
+#ifdef __linux
+    if (linux_usb_paperout_hack)
+    {
+      time_t now;
+      if (!paperout &&
+	  ((now = time(NULL)) - last_write) > 5)
+      {
+	unsigned int status;
+	if (ioctl (device_fd, LPGETSTATUS, &status) == 0 &&
+	    (status & LP_POUTPA))
+	{
+	  fputs("ERROR: Out of paper!\n", stderr);
+	  fputs("STATE: +media-empty-error\n", stderr);
+	  paperout = 1;
+	}
+
+	/* Don't check status for another 5s. */
+	last_write = now;
+      }
+    }
+#endif /* __linux */
+  }
+
+#ifdef __linux
+  if (linux_usb_paperout_hack)
+  {
+    /* Wait for the last write() to finish. */
+    do
+    {
+      FD_ZERO(&output);
+      FD_SET(device_fd, &output);
+    } while (select(device_fd + 1, NULL, &output, NULL, NULL) < 0 &&
+	     errno == EINTR);
   }
+#endif /* __linux */
 
  /*
   * Return with success...
--- cups-1.2.10/backend/usb-unix.c.usb-paperout	2007-04-25 17:50:06.000000000 +0100
+++ cups-1.2.10/backend/usb-unix.c	2007-04-25 17:50:06.000000000 +0100
@@ -39,6 +39,11 @@
 #include "ieee1284.c"
 #include <sys/select.h>
 
+#ifdef __linux
+#include <unistd.h>
+#include <fcntl.h>
+extern int linux_usb_paperout_hack;
+#endif /* __linux */
 
 /*
  * Local functions...
@@ -70,6 +75,11 @@
   (void)argc;
   (void)argv;
 
+#ifdef __linux
+  /* Get the runloop to check for USB paper-out condition. */
+  linux_usb_paperout_hack = 1;
+#endif /* __linux */
+
  /*
   * Open the USB port device...
   */
@@ -150,6 +160,12 @@
 
   tcsetattr(device_fd, TCSANOW, &opts);
 
+#ifdef __linux
+  /* Put the file descriptor into non-blocking mode so that we
+   * get a chance to detect paper-out. */
+  fcntl (device_fd, F_SETFL, fcntl (device_fd, F_GETFL) | O_NONBLOCK);
+#endif /* __linux */
+
  /*
   * Finally, send the print file...
   */


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -r1.328 -r1.329
--- cups.spec	4 Apr 2007 16:59:11 -0000	1.328
+++ cups.spec	25 Apr 2007 17:12:47 -0000	1.329
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.10
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -48,6 +48,7 @@
 Patch22: cups-logrotate.patch
 Patch23: cups-str2323.patch
 Patch24: cups-str2109.patch
+Patch25: cups-usb-paperout.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -157,6 +158,7 @@
 %patch22 -p1 -b .logrotate
 %patch23 -p1 -b .str2323
 %patch24 -p1 -b .str2109
+%patch25 -p1 -b .usb-paperout
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -440,6 +442,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Apr 25 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-5
+- Until bug #236736 is fixed, work around the kernel usblp driver's
+  quirks so that we can detect paper-out conditions.
+
 * Wed Apr  4 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-4
 - Send D-BUS QueueChanged signal on printer state changes.
 



From fedora-cvs-commits at redhat.com  Wed Apr 25 17:21:15 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 13:21:15 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.70,
	1.71 setroubleshoot.logrotate, 1.4, 1.5 setroubleshoot.spec,
	1.84, 1.85 sources, 1.80, 1.81
Message-ID: <200704251721.l3PHLFZf027768@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27697/devel

Modified Files:
	.cvsignore setroubleshoot.logrotate setroubleshoot.spec 
	sources 
Log Message:
auto-import setroubleshoot-1.9.5-1.fc7 on branch devel from setroubleshoot-1.9.5-1.fc7.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- .cvsignore	20 Mar 2007 15:25:50 -0000	1.70
+++ .cvsignore	25 Apr 2007 17:21:13 -0000	1.71
@@ -1 +1 @@
-setroubleshoot-1.9.4.tar.gz
+setroubleshoot-1.9.5.tar.gz


Index: setroubleshoot.logrotate
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.logrotate,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- setroubleshoot.logrotate	20 Mar 2007 15:25:50 -0000	1.4
+++ setroubleshoot.logrotate	25 Apr 2007 17:21:13 -0000	1.5
@@ -1,4 +1,4 @@
-/usr/local/var/log/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.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- setroubleshoot.spec	20 Mar 2007 15:25:50 -0000	1.84
+++ setroubleshoot.spec	25 Apr 2007 17:21:13 -0000	1.85
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 1.9.4
+Version: 1.9.5
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
@@ -148,6 +148,10 @@
 /etc/rc.d/init.d/%{name}
 
 %changelog
+* Wed Apr 25 2007 Dan Walsh <dwalsh at redhat.com> - 1.9.5-1
+- Update translations
+- Fix mislabeled file
+
 * Mon Mar 19 2007 Dan Walsh <dwalsh at redhat.com> - 1.9.4-1
 	- Remove disable_trans boolean
 	- Check for paths in filesystem before suggesting chcon -R 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- sources	20 Mar 2007 15:25:50 -0000	1.80
+++ sources	25 Apr 2007 17:21:13 -0000	1.81
@@ -1 +1 @@
-dcbe7f3db18ec3f30583897b562b5cb8  setroubleshoot-1.9.4.tar.gz
+3a39d2519f9f9fb798ca9a5d1220f6a1  setroubleshoot-1.9.5.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 25 17:22:39 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 13:22:39 -0400
Subject: rpms/mlocate/devel .cvsignore, 1.6, 1.7 mlocate.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <200704251722.l3PHMdcd028773@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/mlocate/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28686

Modified Files:
	.cvsignore mlocate.spec sources 
Log Message:
* Wed Apr 25 2007 Miloslav Trmac <mitr at redhat.com> - 0.17-1
- Update to mlocate-0.17
  Resolves: #237120



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mlocate/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Mar 2007 01:58:28 -0000	1.6
+++ .cvsignore	25 Apr 2007 17:22:37 -0000	1.7
@@ -1 +1 @@
-mlocate-0.16.tar.bz2
+mlocate-0.17.tar.bz2


Index: mlocate.spec
===================================================================
RCS file: /cvs/dist/rpms/mlocate/devel/mlocate.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mlocate.spec	6 Mar 2007 01:58:28 -0000	1.12
+++ mlocate.spec	25 Apr 2007 17:22:37 -0000	1.13
@@ -1,6 +1,6 @@
 Summary: An utility for finding files by name
 Name: mlocate
-Version: 0.16
+Version: 0.17
 Release: 1
 License: GPLv2
 Group: Applications/System
@@ -66,6 +66,10 @@
 %ghost /var/lib/mlocate/mlocate.db
 
 %changelog
+* Wed Apr 25 2007 Miloslav Trmac <mitr at redhat.com> - 0.17-1
+- Update to mlocate-0.17
+  Resolves: #237120
+
 * Tue Mar  6 2007 Miloslav Trmac <mitr at redhat.com> - 0.16-1
 - Update to mlocate-0.16
 - Enable PRUNE_BIND_MOUNTS by default


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mlocate/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Mar 2007 01:58:28 -0000	1.6
+++ sources	25 Apr 2007 17:22:37 -0000	1.7
@@ -1 +1 @@
-4840542d9732eda6f41d4cd936852887  mlocate-0.16.tar.bz2
+e8fc089a235a4a7bf9bfbc536c17116c  mlocate-0.17.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Apr 25 17:35:48 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 13:35:48 -0400
Subject: rpms/pm-utils/devel pm-utils-0.99.3-vbe-redirect.patch, NONE,
	1.1 pm-utils.spec, 1.54, 1.55
Message-ID: <200704251735.l3PHZm6C005509@cvs.devel.redhat.com>

Author: pjones

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

Modified Files:
	pm-utils.spec 
Added Files:
	pm-utils-0.99.3-vbe-redirect.patch 
Log Message:
- get rid of bogus redirect on "vbetool post"


pm-utils-0.99.3-vbe-redirect.patch:
 99video |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pm-utils-0.99.3-vbe-redirect.patch ---
--- pm-utils-0.99.3/pm/hooks/99video	6 Mar 2007 19:55:31 -0000	1.3
+++ pm-utils-0.99.3/pm/hooks/99video	25 Apr 2007 17:30:22 -0000
@@ -35,7 +35,7 @@ resume_video()
 	fi
 	# We might need to do one or many of these quirks
 	if [ "${DISPLAY_QUIRK_VBE_POST}" == "true" ]; then
-		vbe post </dev/tty0
+		vbe post
 		usleep 100000
 	fi
 	if [ "${DISPLAY_QUIRK_VBESTATE_RESTORE}" == "true" ]; then



Index: pm-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- pm-utils.spec	26 Mar 2007 14:20:54 -0000	1.54
+++ pm-utils.spec	25 Apr 2007 17:35:46 -0000	1.55
@@ -2,7 +2,7 @@
 Summary: Power management utilities and scripts for Fedora Core
 License: GPL
 Version: 0.99.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Base
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64
 Requires: usermode kbd pciutils >= 2.2.1
@@ -34,6 +34,7 @@
 
 Patch0: pm-utils-0.99.3-disable.patch
 #Patch1: pm-utils-0.19-vidhooks.patch
+Patch2: pm-utils-0.99.3-vbe-redirect.patch
 
 Patch10: vbetool-0.3-fix-gcc4bug.patch
 
@@ -50,6 +51,7 @@
 
 %patch0 -p1 -b .disable
 #%patch1 -p1 -b .vidhooks
+%patch2 -p1 -b .vbe-redirect
 
 %patch10 -p0 -b .gcc4
 
@@ -161,6 +163,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Apr 25 2007 Peter Jones <pjones at redhat.com> - 0.99.3-2
+- Get rid of bogus redirect on "vbetool post"
+
 * Mon Mar 26 2007 Peter Jones <pjones at redhat.com> - 0.99.3-1
 - update to 0.99.3
 - configure manually in the spec to avoid %%_lib as lib64



From fedora-cvs-commits at redhat.com  Wed Apr 25 18:07:05 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 14:07:05 -0400
Subject: rpms/kernel/devel git-wireless-dev.patch, 1.6, 1.7 kernel-2.6.spec,
	1.3111, 1.3112 linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch,
	1.3, NONE
Message-ID: <200704251807.l3PI75Ae003512@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
	git-wireless-dev.patch kernel-2.6.spec 
Removed Files:
	linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch 
Log Message:
update git-wireless-dev.patch

git-wireless-dev.patch:
 .mailmap                                                |    1 
 CREDITS                                                 |   37 
 Documentation/feature-removal-schedule.txt              |   11 
 MAINTAINERS                                             |   60 
 drivers/Kconfig                                         |    2 
 drivers/Makefile                                        |    1 
 drivers/misc/Kconfig                                    |    8 
 drivers/misc/Makefile                                   |    1 
 drivers/misc/eeprom_93cx6.c                             |  347 +
 drivers/net/Makefile                                    |    2 
 drivers/net/wireless/Kconfig                            |  120 
 drivers/net/wireless/Makefile                           |    3 
 drivers/net/wireless/bcm43xx/Kconfig                    |    4 
 drivers/net/wireless/hostap/Kconfig                     |    3 
 drivers/net/wireless/mac80211/Kconfig                   |    6 
 drivers/net/wireless/mac80211/Makefile                  |    6 
 drivers/net/wireless/mac80211/README                    |    2 
 drivers/net/wireless/mac80211/adm8211/Kconfig           |   25 
 drivers/net/wireless/mac80211/adm8211/Makefile          |    1 
 drivers/net/wireless/mac80211/adm8211/adm8211.c         | 2172 ++++++
 drivers/net/wireless/mac80211/adm8211/adm8211.h         |  622 +
 drivers/net/wireless/mac80211/bcm43xx/Kconfig           |  101 
 drivers/net/wireless/mac80211/bcm43xx/Makefile          |   18 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h         |  885 ++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c |  433 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h |  110 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c     | 1383 ++++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h     |  361 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c    |  300 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h    |   56 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c      | 1110 +++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h      |   92 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c    | 4029 ++++++++++++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h    |  156 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c  |  163 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h  |   22 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c     | 4286 +++++++++++++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h     |  309 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c     |  671 ++
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h     |  170 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c   |   82 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h   |   41 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c   |  232 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h   |    9 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c  |  376 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h  |   28 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c    |  603 +
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h    |  250 
 drivers/net/wireless/mac80211/p54/Kconfig               |   10 
 drivers/net/wireless/mac80211/p54/Makefile              |    4 
 drivers/net/wireless/mac80211/p54/net2280.h             |  452 +
 drivers/net/wireless/mac80211/p54/prism54.h             |   77 
 drivers/net/wireless/mac80211/p54/prism54common.c       |  821 ++
 drivers/net/wireless/mac80211/p54/prism54common.h       |  328 +
 drivers/net/wireless/mac80211/p54/prism54magic.h        |   77 
 drivers/net/wireless/mac80211/p54/prism54pci.c          |  700 ++
 drivers/net/wireless/mac80211/p54/prism54pci.h          |  106 
 drivers/net/wireless/mac80211/p54/prism54usb.c          |  946 ++
 drivers/net/wireless/mac80211/p54/prism54usb.h          |  133 
 drivers/net/wireless/mac80211/rt2x00/Kconfig            |   99 
 drivers/net/wireless/mac80211/rt2x00/Makefile           |   12 
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.c        | 2562 ++++++++
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.h        |  925 ++
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.c        | 2859 ++++++++
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.h        | 1192 +++
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.c        | 2695 ++++++++
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.h        |  740 ++
 drivers/net/wireless/mac80211/rt2x00/rt2x00.h           | 1070 +++
 drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c      |  354 +
 drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h      |   71 
 drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c        |  282 
 drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h        |   80 
 drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c        |  540 +
 drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h        |   39 
 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h        |   82 
 drivers/net/wireless/mac80211/rt2x00/rt61pci.c          | 3333 ++++++++++
 drivers/net/wireless/mac80211/rt2x00/rt61pci.h          | 1355 ++++
 drivers/net/wireless/mac80211/rt2x00/rt73usb.c          | 2993 +++++++++
 drivers/net/wireless/mac80211/rt2x00/rt73usb.h          |  939 ++
 drivers/net/wireless/mac80211/rtl818x/Kconfig           |    9 
 drivers/net/wireless/mac80211/rtl818x/Makefile          |    2 
 drivers/net/wireless/mac80211/rtl818x/rtl8187.h         |  126 
 drivers/net/wireless/mac80211/rtl818x/rtl8187_dev.c     |  726 ++
 drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.c |  747 ++
 drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.h |   30 
 drivers/net/wireless/mac80211/rtl818x/rtl818x.h         |  180 
 drivers/net/wireless/mac80211/zd1211rw/Kconfig          |   19 
 drivers/net/wireless/mac80211/zd1211rw/Makefile         |   11 
 drivers/net/wireless/mac80211/zd1211rw/zd_chip.c        | 1679 +++++
 drivers/net/wireless/mac80211/zd1211rw/zd_chip.h        |  910 ++
 drivers/net/wireless/mac80211/zd1211rw/zd_def.h         |   57 
 drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h   |   67 
 drivers/net/wireless/mac80211/zd1211rw/zd_mac.c         |  700 ++
 drivers/net/wireless/mac80211/zd1211rw/zd_mac.h         |  250 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf.c          |  170 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf.h          |   80 
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c   |  436 +
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c  |  491 +
 drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c   |  279 
 drivers/net/wireless/mac80211/zd1211rw/zd_usb.c         | 1337 ++++
 drivers/net/wireless/mac80211/zd1211rw/zd_usb.h         |  241 
 drivers/net/wireless/mac80211/zd1211rw/zd_util.c        |   82 
 drivers/net/wireless/mac80211/zd1211rw/zd_util.h        |   29 
 drivers/net/wireless/zd1211rw/Kconfig                   |    4 
 drivers/ssb/Kconfig                                     |   93 
 drivers/ssb/Makefile                                    |   11 
 drivers/ssb/driver_chipcommon.c                         |  402 +
 drivers/ssb/driver_mipscore.c                           |  258 
 drivers/ssb/driver_pcicore.c                            |  556 +
 drivers/ssb/main.c                                      | 1047 +++
 drivers/ssb/pci.c                                       |  672 ++
 drivers/ssb/pcihost_wrapper.c                           |  104 
 drivers/ssb/pcmcia.c                                    |  256 
 drivers/ssb/scan.c                                      |  407 +
 drivers/ssb/ssb_private.h                               |  151 
 drivers/usb/host/Kconfig                                |   13 
 drivers/usb/host/ohci-hcd.c                             |   21 
 drivers/usb/host/ohci-ssb.c                             |  254 
 include/linux/Kbuild                                    |    2 
 include/linux/crc-itu-t.h                               |   27 
 include/linux/eeprom_93cx6.h                            |   77 
 include/linux/ieee80211.h                               |  403 +
 include/linux/netdevice.h                               |    7 
 include/linux/nl80211.h                                 |  301 
 include/linux/ssb/ssb.h                                 |  403 +
 include/linux/ssb/ssb_driver_chipcommon.h               |  387 +
 include/linux/ssb/ssb_driver_extif.h                    |  163 
 include/linux/ssb/ssb_driver_mips.h                     |   47 
 include/linux/ssb/ssb_driver_pci.h                      |  108 
 include/linux/ssb/ssb_regs.h                            |  294 
 include/net/cfg80211.h                                  |  154 
 include/net/iw_handler.h                                |   13 
 include/net/mac80211.h                                  | 1103 +++
 include/net/wireless.h                                  |  159 
 lib/Kconfig                                             |    8 
 lib/Makefile                                            |    1 
 lib/crc-itu-t.c                                         |   64 
 net/Kconfig                                             |   12 
 net/Makefile                                            |    2 
 net/core/Makefile                                       |    1 
 net/core/dev.c                                          |   33 
 net/core/rtnetlink.c                                    |   31 
 net/core/wireless.c                                     | 2371 -------
 net/ieee80211/Kconfig                                   |    3 
 net/mac80211/Kconfig                                    |   81 
 net/mac80211/Makefile                                   |   21 
 net/mac80211/aes_ccm.c                                  |  155 
 net/mac80211/aes_ccm.h                                  |   26 
 net/mac80211/debugfs.c                                  |  436 +
 net/mac80211/debugfs.h                                  |   16 
 net/mac80211/debugfs_key.c                              |  253 
 net/mac80211/debugfs_key.h                              |   34 
 net/mac80211/debugfs_netdev.c                           |  440 +
 net/mac80211/debugfs_netdev.h                           |   30 
 net/mac80211/debugfs_sta.c                              |  247 
 net/mac80211/debugfs_sta.h                              |   12 
 net/mac80211/hostapd_ioctl.h                            |  347 +
 net/mac80211/ieee80211.c                                | 5102 ++++++++++++++++
 net/mac80211/ieee80211_cfg.c                            |   75 
 net/mac80211/ieee80211_cfg.h                            |    9 
 net/mac80211/ieee80211_common.h                         |   98 
 net/mac80211/ieee80211_i.h                              |  854 ++
 net/mac80211/ieee80211_iface.c                          |  366 +
 net/mac80211/ieee80211_ioctl.c                          | 3290 ++++++++++
 net/mac80211/ieee80211_key.h                            |  106 
 net/mac80211/ieee80211_led.c                            |   91 
 net/mac80211/ieee80211_led.h                            |   32 
 net/mac80211/ieee80211_rate.c                           |  140 
 net/mac80211/ieee80211_rate.h                           |  144 
 net/mac80211/ieee80211_scan.c                           |  344 +
 net/mac80211/ieee80211_sta.c                            | 3202 ++++++++++
 net/mac80211/michael.c                                  |  104 
 net/mac80211/michael.h                                  |   20 
 net/mac80211/rc80211_simple.c                           |  432 +
 net/mac80211/sta_info.c                                 |  463 +
 net/mac80211/sta_info.h                                 |  167 
 net/mac80211/tkip.c                                     |  341 +
 net/mac80211/tkip.h                                     |   36 
 net/mac80211/wep.c                                      |  328 +
 net/mac80211/wep.h                                      |   40 
 net/mac80211/wme.c                                      |  685 ++
 net/mac80211/wme.h                                      |   38 
 net/mac80211/wpa.c                                      |  846 ++
 net/mac80211/wpa.h                                      |   31 
 net/wireless/Kconfig                                    |   46 
 net/wireless/Makefile                                   |   17 
 net/wireless/core.c                                     |  359 +
 net/wireless/core.h                                     |   80 
 net/wireless/nl80211.c                                  |  993 +++
 net/wireless/nl80211.h                                  |   24 
 net/wireless/sysfs.c                                    |  130 
 net/wireless/sysfs.h                                    |    9 
 net/wireless/wext-common.c                              |  663 ++
 net/wireless/wext-compat.c                              |  789 ++
 net/wireless/wext-export.c                              |   29 
 net/wireless/wext-mod.c                                 |   20 
 net/wireless/wext-old.c                                 |  829 ++
 net/wireless/wext.h                                     |   51 
 198 files changed, 85649 insertions(+), 2539 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.6 -r 1.7 git-wireless-dev.patch
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/git-wireless-dev.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- git-wireless-dev.patch	13 Apr 2007 20:44:49 -0000	1.6
+++ git-wireless-dev.patch	25 Apr 2007 18:07:00 -0000	1.7
@@ -1,13078 +1,13118 @@
 git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-dev.git
 
-commit 5363171f929bc62290a1119e492f3ae7d9636c5e
+commit 6295da8ac8ad909dbe49d4c02ee9902fbdb04704
 
-diff --git a/.mailmap b/.mailmap
-index bf62dbe..5662cc7 100644
---- a/.mailmap
-+++ b/.mailmap
-@@ -57,6 +57,7 @@ Jean Tourrilhes <jt at hpl.hp.com>
- Jeff Garzik <jgarzik at pretzel.yyz.us>
- Jens Axboe <axboe at suse.de>
- Jens Osterkamp <Jens.Osterkamp at de.ibm.com>
-+Johannes Berg <johannes at sipsolutions.net>
- John Stultz <johnstul at us.ibm.com>
- Juha Yrjola <at solidboot.com>
- Juha Yrjola <juha.yrjola at nokia.com>
-diff --git a/CREDITS b/CREDITS
-index 6bd8ab8..f95e8af 100644
---- a/CREDITS
-+++ b/CREDITS
-@@ -317,6 +317,12 @@ S: 2322 37th Ave SW
- S: Seattle, Washington 98126-2010
- S: USA
- 
-+N: Johannes Berg
-+E: johannes at sipsolutions.net
-+W: http://johannes.sipsolutions.net/
-+P: 1024D/9AB78CA5 AD02 0176 4E29 C137 1DF6 08D2 FC44 CF86 9AB7 8CA5
-+D: powerpc & 802.11 hacker
-+
- N: Stephen R. van den Berg (AKA BuGless)
- E: berg at pool.informatik.rwth-aachen.de
- D: General kernel, gcc, and libc hacker
-@@ -659,6 +665,11 @@ D: Minor updates to SCSI code for the Co
- S: (ask for current address)
- S: USA
- 
-+N: Robin Cornelius
-+E: robincornelius at users.sourceforge.net
-+D: Ralink rt2x00 WLAN driver
-+S: Cornwall, U.K.
-+
- N: Mark Corner
- E: mcorner at umich.edu
- W: http://www.eecs.umich.edu/~mcorner/
-@@ -673,6 +684,11 @@ D: Kernel module SMART utilities
- S: Santa Cruz, California
- S: USA
- 
-+N: Luis Correia
-+E: lfcorreia at users.sf.net
-+D: Ralink rt2x00 WLAN driver
-+S: Belas, Portugal
-+
- N: Alan Cox
- W: http://www.linux.org.uk/diary/
- D: Linux Networking (0.99.10->2.0.29)
-@@ -827,6 +843,12 @@ S: Lancs
- S: PR4 6AX
- S: United Kingdom
- 
-+N: Ivo van Doorn
-+E: IvDoorn at gmail.com
-+W: http://www.mendiosus.nl
-+D: Ralink rt2x00 WLAN driver
-+S: Haarlem, The Netherlands
-+
- N: John G Dorsey
- E: john+ at cs.cmu.edu
- D: ARM Linux ports to Assabet/Neponset, Spot
-@@ -3510,6 +3532,12 @@ S: Maastrichterweg 63
- S: 5554 GG Valkenswaard
- S: The Netherlands
- 
-+N: Mark Wallis
-+E: mwallis at serialmonkey.com
-+W: http://mark.serialmonkey.com
-+D: Ralink rt2x00 WLAN driver
-+S: Newcastle, Australia
-+
- N: Peter Shaobo Wang
- E: pwang at mmdcorp.com
- W: http://www.mmdcorp.com/pw/linux
-@@ -3644,6 +3672,15 @@ S: Alte Regensburger Str. 11a
- S: 93149 Nittenau
- S: Germany
- 
-+N: Gertjan van Wingerde
-+E: gwingerde at home.nl
-+D: Ralink rt2x00 WLAN driver
-+D: Minix V2 file-system
-+D: Misc fixes
-+S: Geessinkweg 177
-+S: 7544 TX Enschede
-+S: The Netherlands
-+
- N: Lars Wirzenius
- E: liw at iki.fi
- D: Linux System Administrator's Guide, author, former maintainer
-diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
-index 0bc8b0b..0f7a323 100644
---- a/Documentation/feature-removal-schedule.txt
-+++ b/Documentation/feature-removal-schedule.txt
-@@ -305,18 +305,6 @@ Who:	Richard Purdie <rpurdie at rpsys.net>
- 
- ---------------------------
- 
--What:	Wireless extensions over netlink (CONFIG_NET_WIRELESS_RTNETLINK)
--When:	with the merge of wireless-dev, 2.6.22 or later
--Why:	The option/code is
--	 * not enabled on most kernels
--	 * not required by any userspace tools (except an experimental one,
--	   and even there only for some parts, others use ioctl)
--	 * pointless since wext is no longer evolving and the ioctl
--	   interface needs to be kept
--Who:	Johannes Berg <johannes at sipsolutions.net>
--
-----------------------------
--
- What:	i8xx_tco watchdog driver
- When:	in 2.6.22
- Why:	the i8xx_tco watchdog driver has been replaced by the iTCO_wdt
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 829407f..233ba0d 100644
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -296,6 +296,14 @@ M:	corentin.labbe at geomatys.fr
- L:	lm-sensors at lm-sensors.org
- S:	Maintained
- 
-+ADM8211 WIRELESS DRIVER
-+P:	Michael Wu
-+M:	flamingice at sourmilk.net
-+L:	linux-wireless at vger.kernel.org
-+W:	http://aluminum.sourmilk.net/adm8211/
-+T:	git kernel.org:/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
-+S:	Maintained
+--- /dev/null	2007-04-17 21:17:54.747954992 -0400
++++ linux-2.6.20.noarch/include/net/wireless.h	2007-04-25 11:20:17.000000000 -0400
+@@ -0,0 +1,159 @@
++#ifndef __NET_WIRELESS_H
++#define __NET_WIRELESS_H
 +
- ADT746X FAN DRIVER
- P:	Colin Leroy
- M:	colin at colino.net
-@@ -656,6 +664,7 @@ S:	Supported
- ATMEL WIRELESS DRIVER
- P:	Simon Kelley
- M:	simon at thekelleys.org.uk
-+L:	linux-wireless at vger.kernel.org
- W:	http://www.thekelleys.org.uk/atmel
- W:	http://atmelwlandriver.sourceforge.net/
- S:	Maintained
-@@ -706,11 +715,21 @@ L:	linux-hams at vger.kernel.org
- W:	http://www.baycom.org/~tom/ham/ham.html
- S:	Maintained
- 
-+BCM43XX WIRELESS DRIVER (DEVICESCAPE BASED VERSION)
-+P:	Michael Buesch
-+M:	mb at bu3sch.de
-+P:	Stefano Brivio
-+M:	st3 at riseup.net
-+L:	linux-wireless at vger.kernel.org
-+W:	http://bcm43xx.berlios.de/
-+S:	Maintained
++/*
++ * 802.11 device management
++ *
++ * Copyright 2007	Johannes Berg <johannes at sipsolutions.net>
++ */
 +
- BCM43XX WIRELESS DRIVER (SOFTMAC BASED VERSION)
- P:	Larry Finger
- M:	Larry.Finger at lwfinger.net
- P:	Stefano Brivio
- M:	st3 at riseup.net
-+L:	linux-wireless at vger.kernel.org
- W:	http://bcm43xx.berlios.de/
- S:	Maintained
- 
-@@ -892,6 +911,12 @@ M:	maxextreme at gmail.com
- L:	linux-kernel at vger.kernel.org
- S:	Maintained
- 
-+CFG80211 and NL80211
-+P:	Johannes Berg
-+M:	johannes at sipsolutions.net
-+L:	linux-wireless at vger.kernel.org
-+S:	Maintained
[...146205 lines suppressed...]
-+	       2 * sizeof(struct iw_quality));
++	if (sdata->type != IEEE80211_IF_TYPE_STA &&
++	    sdata->type != IEEE80211_IF_TYPE_IBSS)
++		return -EINVAL;
 +
++	ieee80211_send_deauth(dev, ifsta, reason);
++	ieee80211_set_disassoc(dev, ifsta, 1);
 +	return 0;
 +}
-+EXPORT_SYMBOL(iw_handler_get_thrspy);
 +
-+/*------------------------------------------------------------------*/
-+/*
-+ * Prepare and send a Spy Threshold event
-+ */
-+static void iw_send_thrspy_event(struct net_device *	dev,
-+				 struct iw_spy_data *	spydata,
-+				 unsigned char *	address,
-+				 struct iw_quality *	wstats)
-+{
-+	union iwreq_data	wrqu;
-+	struct iw_thrspy	threshold;
-+
-+	/* Init */
-+	wrqu.data.length = 1;
-+	wrqu.data.flags = 0;
-+	/* Copy address */
-+	memcpy(threshold.addr.sa_data, address, ETH_ALEN);
-+	threshold.addr.sa_family = ARPHRD_ETHER;
-+	/* Copy stats */
-+	memcpy(&(threshold.qual), wstats, sizeof(struct iw_quality));
-+	/* Copy also thresholds */
-+	memcpy(&(threshold.low), &(spydata->spy_thr_low),
-+	       2 * sizeof(struct iw_quality));
-+
-+	/* Send event to user space */
-+	wireless_send_event(dev, SIOCGIWTHRSPY, &wrqu, (char *) &threshold);
-+}
 +
-+/* ---------------------------------------------------------------- */
-+/*
-+ * Call for the driver to update the spy data.
-+ * For now, the spy data is a simple array. As the size of the array is
-+ * small, this is good enough. If we wanted to support larger number of
-+ * spy addresses, we should use something more efficient...
-+ */
-+void wireless_spy_update(struct net_device *	dev,
-+			 unsigned char *	address,
-+			 struct iw_quality *	wstats)
++int ieee80211_sta_disassociate(struct net_device *dev, u16 reason)
 +{
-+	struct iw_spy_data *	spydata = get_spydata(dev);
-+	int			i;
-+	int			match = -1;
++	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
++	struct ieee80211_if_sta *ifsta = &sdata->u.sta;
 +
-+	/* Make sure driver is not buggy or using the old API */
-+	if(!spydata)
-+		return;
++	printk(KERN_DEBUG "%s: disassociate(reason=%d)\n",
++	       dev->name, reason);
 +
-+	/* Update all records that match */
-+	for(i = 0; i < spydata->spy_number; i++)
-+		if(!compare_ether_addr(address, spydata->spy_address[i])) {
-+			memcpy(&(spydata->spy_stat[i]), wstats,
-+			       sizeof(struct iw_quality));
-+			match = i;
-+		}
++	if (sdata->type != IEEE80211_IF_TYPE_STA)
++		return -EINVAL;
 +
-+	/* Generate an event if we cross the spy threshold.
-+	 * To avoid event storms, we have a simple hysteresis : we generate
-+	 * event only when we go under the low threshold or above the
-+	 * high threshold. */
-+	if(match >= 0) {
-+		if(spydata->spy_thr_under[match]) {
-+			if(wstats->level > spydata->spy_thr_high.level) {
-+				spydata->spy_thr_under[match] = 0;
-+				iw_send_thrspy_event(dev, spydata,
-+						     address, wstats);
-+			}
-+		} else {
-+			if(wstats->level < spydata->spy_thr_low.level) {
-+				spydata->spy_thr_under[match] = 1;
-+				iw_send_thrspy_event(dev, spydata,
-+						     address, wstats);
-+			}
-+		}
-+	}
++	if (!ifsta->associated)
++		return -1;
++
++	ieee80211_send_disassoc(dev, ifsta, reason);
++	ieee80211_set_disassoc(dev, ifsta, 0);
++	return 0;
 +}
-+EXPORT_SYMBOL(wireless_spy_update);
-diff --git a/net/wireless/wext.h b/net/wireless/wext.h
-new file mode 100644
-index 0000000..ced6667
---- /dev/null
-+++ b/net/wireless/wext.h
-@@ -0,0 +1,51 @@
+--- /dev/null	2007-04-17 21:17:54.747954992 -0400
++++ linux-2.6.20.noarch/net/mac80211/ieee80211_cfg.h	2007-04-25 11:20:17.000000000 -0400
+@@ -0,0 +1,9 @@
 +/*
-+ * some foo for wext compat/wext interoperability
++ * mac80211 configuration hooks for cfg80211
 + */
-+#ifndef _WEXT_H
-+#define _WEXT_H
-+#include <linux/netdevice.h>
-+#include <linux/if.h>
-+#include <linux/wireless.h>
-+#include <net/iw_handler.h>
-+
-+/* wext compatibility must be compiled in...
-+ * this extern is in wext-compat.c */
-+struct cfg80211_ioctl_ops {
-+	/* used to make sure the module isn't going away
-+	 * can't really happen, except if no driver has cfg80211
-+	 * in use, but in that case  */
-+	struct module *module;
-+
-+	/* and finally this is used to do work */
-+	int (*do_wext_ioctl)(struct ifreq *ifr, unsigned int cmd);
-+};
-+extern struct cfg80211_ioctl_ops cfg80211_ioctl_ops;
-+
++#ifndef __IEEE80211_CFG_H
++#define __IEEE80211_CFG_H
 +
-+struct iw_statistics *get_wireless_stats(struct net_device *dev,
-+					 struct iw_statistics *out);
-+int wireless_process_ioctl(struct ifreq *ifr, unsigned int cmd);
++extern struct cfg80211_ops mac80211_config_ops;
 +
-+int cfg80211_wext_ioctl(struct ifreq *ifr, unsigned int cmd);
-+#ifdef CFG80211_MODULE
-+int call_cfg80211_wext_ioctl(struct ifreq *ifr, unsigned int cmd);
-+#else
-+#define call_cfg80211_wext_ioctl cfg80211_wext_ioctl
-+#endif
++#endif /* __IEEE80211_CFG_H */
+--- /dev/null	2007-04-17 21:17:54.747954992 -0400
++++ linux-2.6.20.noarch/net/mac80211/debugfs.h	2007-04-25 11:20:17.000000000 -0400
+@@ -0,0 +1,16 @@
++#ifndef __MAC80211_DEBUGFS_H
++#define __MAC80211_DEBUGFS_H
 +
-+#if defined(CONFIG_CFG80211_WEXT_COMPAT) && defined(CFG80211_MODULE)
-+int cfg80211_wext_init(void);
-+void cfg80211_wext_exit(void);
++#ifdef CONFIG_MAC80211_DEBUGFS
++extern void debugfs_hw_add(struct ieee80211_local *local);
++extern void debugfs_hw_del(struct ieee80211_local *local);
++extern int mac80211_open_file_generic(struct inode *inode, struct file *file);
 +#else
-+static inline int cfg80211_wext_init(void)
++static inline void debugfs_hw_add(struct ieee80211_local *local)
 +{
-+	return 0;
++	return;
 +}
-+static inline void cfg80211_wext_exit(void) {}
++static inline void debugfs_hw_del(struct ieee80211_local *local) {}
 +#endif
 +
-+extern const struct iw_ioctl_description wext_standard_ioctl[];
-+extern const unsigned wext_standard_ioctl_num;
-+extern const struct iw_ioctl_description standard_event[];
-+extern const int event_type_size[];
-+#endif /* _WEXT_H */
++#endif /* __MAC80211_DEBUGFS_H */
+--- linux-2.6.20.noarch/net/ieee80211/Kconfig.orig	2007-04-25 11:19:13.000000000 -0400
++++ linux-2.6.20.noarch/net/ieee80211/Kconfig	2007-04-25 11:20:17.000000000 -0400
+@@ -56,7 +56,8 @@ config IEEE80211_CRYPT_CCMP
+ 
+ config IEEE80211_CRYPT_TKIP
+ 	tristate "IEEE 802.11i TKIP encryption"
+-	depends on IEEE80211 && NET_RADIO
++	depends on IEEE80211
++	select WIRELESS_EXT
+ 	select CRYPTO
+ 	select CRYPTO_MICHAEL_MIC
+ 	select CRYPTO_ECB
+--- linux-2.6.20.noarch/.mailmap.orig	2007-04-25 11:19:13.000000000 -0400
++++ linux-2.6.20.noarch/.mailmap	2007-04-25 11:20:17.000000000 -0400
+@@ -57,6 +57,7 @@ Jean Tourrilhes <jt at hpl.hp.com>
+ Jeff Garzik <jgarzik at pretzel.yyz.us>
+ Jens Axboe <axboe at suse.de>
+ Jens Osterkamp <Jens.Osterkamp at de.ibm.com>
++Johannes Berg <johannes at sipsolutions.net>
+ John Stultz <johnstul at us.ibm.com>
+ Juha Yrjola <at solidboot.com>
+ Juha Yrjola <juha.yrjola at nokia.com>


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3111
retrieving revision 1.3112
diff -u -r1.3111 -r1.3112
--- kernel-2.6.spec	25 Apr 2007 16:27:58 -0000	1.3111
+++ kernel-2.6.spec	25 Apr 2007 18:07:02 -0000	1.3112
@@ -599,8 +599,7 @@
 Patch2300: git-wireless-dev.patch
 Patch2301: git-iwlwifi.patch
 Patch2302: git-iwlwifi-fixes.patch
-Patch2303: linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch
-Patch2304: linux-2.6-zd1211rw-mac80211-queue-limit.patch
+Patch2303: linux-2.6-zd1211rw-mac80211-queue-limit.patch
 
 # ACPI bits
 
@@ -1343,10 +1342,8 @@
 %patch2301 -p1
 # ...plus some fixes not yet in Intel's tree
 %patch2302 -p1
-# fix oops on ppc for bcm43xx-mac80211 w/ phy rev 1
-%patch2303 -p1
 # limite queueing of URBs to zd1211rw-mac80211 driver
-%patch2304 -p1
+%patch2303 -p1
 
 # ACPI patches
 
@@ -2336,6 +2333,10 @@
 #  - tux.
 
 %changelog
+* Wed Apr 25 2007 John W. Linville <linville at redhat.com>
+- Update git-wireless-dev.patch
+- Remove linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch (obsoleted by above)
+
 * Wed Apr 25 2007 Dave Jones <davej at redhat.com>
 - 2.6.21-rc7-git8
 


--- linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 25 18:31:39 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 14:31:39 -0400
Subject: rpms/selinux-policy/devel policy-20070219.patch, 1.59,
	1.60 selinux-policy.spec, 1.443, 1.444
Message-ID: <200704251831.l3PIVdhd017712@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20070219.patch selinux-policy.spec 
Log Message:
* Wed Apr 25 2007 Dan Walsh <dwalsh at redhat.com> 2.6.1-2
- Fixes for unix_update
- Fix logwatch to be able to search all dirs


policy-20070219.patch:
 Rules.modular                           |   12 +
 VERSION                                 |    2 
 policy/flask/access_vectors             |    4 
 policy/global_booleans                  |    2 
 policy/global_tunables                  |   15 -
 policy/mls                              |   31 ++-
 policy/modules/admin/acct.te            |    1 
 policy/modules/admin/alsa.fc            |    1 
 policy/modules/admin/amtu.fc            |    3 
 policy/modules/admin/amtu.if            |   53 ++++++
 policy/modules/admin/amtu.te            |   56 ++++++
 policy/modules/admin/bootloader.te      |    3 
 policy/modules/admin/consoletype.te     |   10 -
 policy/modules/admin/dmesg.te           |    1 
 policy/modules/admin/kudzu.te           |    6 
 policy/modules/admin/logrotate.te       |    1 
 policy/modules/admin/logwatch.te        |    6 
 policy/modules/admin/netutils.te        |    6 
 policy/modules/admin/readahead.te       |    6 
 policy/modules/admin/rpm.fc             |    3 
 policy/modules/admin/rpm.if             |   85 +++++++--
 policy/modules/admin/rpm.te             |    2 
 policy/modules/admin/su.if              |    6 
 policy/modules/admin/sudo.if            |    1 
 policy/modules/admin/usermanage.if      |    2 
 policy/modules/admin/usermanage.te      |   27 +++
 policy/modules/apps/gnome.if            |   26 ++-
 policy/modules/apps/gpg.fc              |    2 
 policy/modules/apps/loadkeys.if         |   44 +----
 policy/modules/apps/mozilla.if          |    1 
 policy/modules/apps/slocate.te          |    5 
 policy/modules/apps/uml.if              |   27 ---
 policy/modules/kernel/corecommands.fc   |    5 
 policy/modules/kernel/corecommands.if   |   20 ++
 policy/modules/kernel/corenetwork.te.in |   15 +
 policy/modules/kernel/devices.if        |   36 ++++
 policy/modules/kernel/domain.if         |   18 ++
 policy/modules/kernel/domain.te         |   46 +++++
 policy/modules/kernel/files.fc          |    1 
 policy/modules/kernel/files.if          |   83 ++++++++-
 policy/modules/kernel/filesystem.if     |   39 ++++
 policy/modules/kernel/filesystem.te     |   13 +
 policy/modules/kernel/kernel.if         |   42 ++++
 policy/modules/kernel/kernel.te         |    2 
 policy/modules/kernel/mls.if            |   20 ++
 policy/modules/kernel/mls.te            |    3 
 policy/modules/kernel/selinux.if        |   38 ++++
 policy/modules/kernel/storage.if        |    2 
 policy/modules/kernel/terminal.if       |   21 ++
 policy/modules/kernel/terminal.te       |    1 
 policy/modules/services/aide.fc         |    1 
 policy/modules/services/aide.te         |    2 
 policy/modules/services/amavis.if       |   19 ++
 policy/modules/services/amavis.te       |    3 
 policy/modules/services/apache.fc       |   14 -
 policy/modules/services/apache.if       |  171 ++++++++++++++++++-
 policy/modules/services/apache.te       |   79 +++++++++
 policy/modules/services/apcupsd.fc      |    9 +
 policy/modules/services/apcupsd.if      |  108 ++++++++++++
 policy/modules/services/apcupsd.te      |   92 ++++++++++
 policy/modules/services/automount.te    |    2 
 policy/modules/services/avahi.if        |   19 ++
 policy/modules/services/avahi.te        |    4 
 policy/modules/services/bind.te         |    1 
 policy/modules/services/bluetooth.te    |    2 
 policy/modules/services/clamav.te       |    1 
 policy/modules/services/clockspeed.if   |    2 
 policy/modules/services/consolekit.te   |   33 +++
 policy/modules/services/cron.fc         |    1 
 policy/modules/services/cron.if         |   33 +--
 policy/modules/services/cron.te         |   46 ++++-
 policy/modules/services/cups.te         |    6 
 policy/modules/services/cvs.te          |    1 
 policy/modules/services/cyrus.te        |    1 
 policy/modules/services/dbus.if         |   63 +++++++
 policy/modules/services/dhcp.te         |    2 
 policy/modules/services/djbdns.te       |    5 
 policy/modules/services/dovecot.te      |    5 
 policy/modules/services/ftp.te          |    5 
 policy/modules/services/hal.fc          |    8 
 policy/modules/services/hal.if          |   77 ++++++++
 policy/modules/services/hal.te          |  147 ++++++++++++++++-
 policy/modules/services/inetd.te        |    5 
 policy/modules/services/kerberos.if     |   79 ++-------
 policy/modules/services/kerberos.te     |   34 +++
 policy/modules/services/mailman.if      |   19 ++
 policy/modules/services/mta.if          |   19 ++
 policy/modules/services/mta.te          |    2 
 policy/modules/services/nis.if          |    4 
 policy/modules/services/nis.te          |    4 
 policy/modules/services/nscd.te         |   10 +
 policy/modules/services/ntp.te          |    4 
 policy/modules/services/pegasus.if      |   18 ++
 policy/modules/services/pegasus.te      |    6 
 policy/modules/services/postfix.if      |    1 
 policy/modules/services/postfix.te      |    8 
 policy/modules/services/ppp.te          |    2 
 policy/modules/services/procmail.te     |    1 
 policy/modules/services/pyzor.te        |    7 
 policy/modules/services/radius.te       |    4 
 policy/modules/services/rlogin.te       |    1 
 policy/modules/services/rpc.if          |    5 
 policy/modules/services/rpc.te          |    1 
 policy/modules/services/rpcbind.fc      |    6 
 policy/modules/services/rpcbind.if      |  104 ++++++++++++
 policy/modules/services/rpcbind.te      |   83 +++++++++
 policy/modules/services/rsync.te        |    1 
 policy/modules/services/rwho.fc         |    3 
 policy/modules/services/rwho.if         |   84 +++++++++
 policy/modules/services/rwho.te         |   61 +++++++
 policy/modules/services/samba.fc        |    3 
 policy/modules/services/samba.if        |   86 ++++++++++
 policy/modules/services/samba.te        |   87 +++++++++-
 policy/modules/services/sasl.te         |    1 
 policy/modules/services/sendmail.if     |   22 ++
 policy/modules/services/smartmon.te     |    1 
 policy/modules/services/snmp.te         |   15 +
 policy/modules/services/spamassassin.te |    7 
 policy/modules/services/squid.fc        |    2 
 policy/modules/services/squid.if        |   22 ++
 policy/modules/services/squid.te        |   12 +
 policy/modules/services/ssh.if          |   39 ++++
 policy/modules/services/ssh.te          |    9 -
 policy/modules/services/w3c.fc          |    2 
 policy/modules/services/w3c.if          |    1 
 policy/modules/services/w3c.te          |   14 +
 policy/modules/system/application.fc    |    1 
 policy/modules/system/application.if    |  104 ++++++++++++
 policy/modules/system/application.te    |   14 +
 policy/modules/system/authlogin.fc      |    1 
 policy/modules/system/authlogin.if      |  142 ++++++++++++++--
 policy/modules/system/authlogin.te      |   36 ++++
 policy/modules/system/fstools.fc        |    1 
 policy/modules/system/fstools.te        |    1 
 policy/modules/system/fusermount.fc     |    6 
 policy/modules/system/fusermount.if     |   41 ++++
 policy/modules/system/fusermount.te     |   50 +++++
 policy/modules/system/getty.te          |    3 
 policy/modules/system/hostname.te       |   14 +
 policy/modules/system/init.if           |   42 ++++
 policy/modules/system/init.te           |   35 +++-
 policy/modules/system/ipsec.if          |   20 ++
 policy/modules/system/ipsec.te          |    3 
 policy/modules/system/iptables.te       |    5 
 policy/modules/system/libraries.fc      |    5 
 policy/modules/system/libraries.te      |    4 
 policy/modules/system/locallogin.te     |   12 +
 policy/modules/system/logging.if        |   21 ++
 policy/modules/system/logging.te        |    2 
 policy/modules/system/lvm.fc            |    1 
 policy/modules/system/lvm.te            |    8 
 policy/modules/system/modutils.te       |    7 
 policy/modules/system/mount.fc          |    3 
 policy/modules/system/mount.if          |   37 ++++
 policy/modules/system/mount.te          |   70 +++++++-
 policy/modules/system/raid.te           |    1 
 policy/modules/system/selinuxutil.fc    |    1 
 policy/modules/system/selinuxutil.if    |    6 
 policy/modules/system/selinuxutil.te    |   70 +++++---
 policy/modules/system/sysnetwork.te     |    3 
 policy/modules/system/udev.te           |   12 +
 policy/modules/system/unconfined.fc     |    1 
 policy/modules/system/unconfined.if     |   10 -
 policy/modules/system/unconfined.te     |   24 ++
 policy/modules/system/userdomain.if     |  275 ++++++++++++++++++--------------
 policy/modules/system/userdomain.te     |   73 ++++++--
 policy/modules/system/xen.te            |   35 +++-
 policy/support/obj_perm_sets.spt        |   12 +
 168 files changed, 3471 insertions(+), 457 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.59 -r 1.60 policy-20070219.patch
Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- policy-20070219.patch	23 Apr 2007 17:12:14 -0000	1.59
+++ policy-20070219.patch	25 Apr 2007 18:31:32 -0000	1.60
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.6.1/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2007-02-26 09:43:33.000000000 -0500
-+++ serefpolicy-2.6.1/policy/flask/access_vectors	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/policy/flask/access_vectors	2007-04-23 13:12:09.000000000 -0400
 @@ -598,6 +598,8 @@
  	shmempwd
  	shmemgrp
@@ -21,7 +21,7 @@
  class key
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.6.1/policy/global_booleans
 --- nsaserefpolicy/policy/global_booleans	2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-2.6.1/policy/global_booleans	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/policy/global_booleans	2007-04-23 13:12:09.000000000 -0400
 @@ -4,7 +4,6 @@
  # file should be used.
  #
@@ -40,7 +40,7 @@
  ## <p>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.6.1/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2007-03-26 16:24:14.000000000 -0400
-+++ serefpolicy-2.6.1/policy/global_tunables	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/policy/global_tunables	2007-04-25 10:03:25.000000000 -0400
 @@ -102,12 +102,6 @@
  ## </desc>
  gen_tunable(use_samba_home_dirs,false)
@@ -54,14 +54,22 @@
  ## <desc>
  ## <p>
  ## Allow email client to various content.
-@@ -143,4 +137,3 @@
+@@ -143,4 +137,11 @@
  ## </p>
  ## </desc>
  gen_tunable(write_untrusted_content,false)
 -')
++
++## <desc>
++## <p>
++## Allow users to connect to console (s390)
++## </p>
++## </desc>
++gen_tunable(allow_console_login,false)
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.6.1/policy/mls
 --- nsaserefpolicy/policy/mls	2007-03-09 13:02:20.000000000 -0500
-+++ serefpolicy-2.6.1/policy/mls	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/policy/mls	2007-04-23 13:12:09.000000000 -0400
 @@ -89,12 +89,14 @@
  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
@@ -135,7 +143,7 @@
  mlsconstrain association { polmatch }
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.6.1/policy/modules/admin/acct.te
 --- nsaserefpolicy/policy/modules/admin/acct.te	2007-03-26 10:39:08.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/admin/acct.te	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/acct.te	2007-04-23 13:12:09.000000000 -0400
 @@ -9,6 +9,7 @@
  type acct_t;
  type acct_exec_t;
@@ -146,7 +154,7 @@
  logging_log_file(acct_data_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.fc serefpolicy-2.6.1/policy/modules/admin/alsa.fc
 --- nsaserefpolicy/policy/modules/admin/alsa.fc	2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-2.6.1/policy/modules/admin/alsa.fc	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/alsa.fc	2007-04-23 13:12:09.000000000 -0400
 @@ -1,4 +1,5 @@
  
  /etc/alsa/pcm(/.*)?		gen_context(system_u:object_r:alsa_etc_rw_t,s0)
@@ -155,14 +163,14 @@
  /usr/bin/ainit 		--	gen_context(system_u:object_r:alsa_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.fc serefpolicy-2.6.1/policy/modules/admin/amtu.fc
 --- nsaserefpolicy/policy/modules/admin/amtu.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.1/policy/modules/admin/amtu.fc	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/amtu.fc	2007-04-23 13:12:09.000000000 -0400
 @@ -0,0 +1,3 @@
 +
 +/usr/bin/amtu    --    gen_context(system_u:object_r:amtu_exec_t,s0)
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.if serefpolicy-2.6.1/policy/modules/admin/amtu.if
 --- nsaserefpolicy/policy/modules/admin/amtu.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.1/policy/modules/admin/amtu.if	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/amtu.if	2007-04-23 13:12:09.000000000 -0400
 @@ -0,0 +1,53 @@
 +## <summary>
 +##	abstract Machine Test Utility 
@@ -219,7 +227,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.te serefpolicy-2.6.1/policy/modules/admin/amtu.te
 --- nsaserefpolicy/policy/modules/admin/amtu.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.1/policy/modules/admin/amtu.te	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/amtu.te	2007-04-23 13:12:09.000000000 -0400
 @@ -0,0 +1,56 @@
 +policy_module(amtu,1.0.23)
 +
@@ -279,7 +287,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.6.1/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/admin/bootloader.te	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/bootloader.te	2007-04-23 13:12:09.000000000 -0400
 @@ -65,6 +65,8 @@
  files_tmp_filetrans(bootloader_t,bootloader_tmp_t,{ dir file lnk_file chr_file blk_file })
  # for tune2fs (cjp: ?)
@@ -299,7 +307,7 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.6.1/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/admin/consoletype.te	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/consoletype.te	2007-04-23 13:12:09.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -333,7 +341,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-2.6.1/policy/modules/admin/dmesg.te
 --- nsaserefpolicy/policy/modules/admin/dmesg.te	2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-2.6.1/policy/modules/admin/dmesg.te	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/dmesg.te	2007-04-23 13:12:09.000000000 -0400
 @@ -10,6 +10,7 @@
  	type dmesg_t;
  	type dmesg_exec_t;
@@ -344,7 +352,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.6.1/policy/modules/admin/kudzu.te
 --- nsaserefpolicy/policy/modules/admin/kudzu.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/admin/kudzu.te	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/kudzu.te	2007-04-23 13:12:09.000000000 -0400
 @@ -21,8 +21,8 @@
  # Local policy
  #
@@ -365,10 +373,30 @@
  # kudzu will telinit to make init re-read
  # the inittab after configuring serial consoles
  init_telinit(kudzu_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-2.6.1/policy/modules/admin/logrotate.te
+--- nsaserefpolicy/policy/modules/admin/logrotate.te	2007-03-26 10:39:08.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/logrotate.te	2007-04-23 15:49:39.000000000 -0400
+@@ -75,6 +75,7 @@
+ mls_file_read_up(logrotate_t)
+ mls_file_write_down(logrotate_t)
+ mls_file_upgrade(logrotate_t)
++mls_process_write_down(logrotate_t)
+ 
+ selinux_get_fs_mount(logrotate_t)
+ selinux_get_enforce_mode(logrotate_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.6.1/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/admin/logwatch.te	2007-04-23 09:53:18.000000000 -0400
-@@ -95,6 +95,10 @@
++++ serefpolicy-2.6.1/policy/modules/admin/logwatch.te	2007-04-25 14:29:50.000000000 -0400
+@@ -63,6 +63,8 @@
+ files_search_mnt(logwatch_t)
+ files_dontaudit_search_home(logwatch_t)
+ files_dontaudit_search_boot(logwatch_t)
++# Execs df and if file system mounted with a context avc raised
++files_search_all_dirs(logwatch_t)
+ 
+ fs_getattr_all_fs(logwatch_t)
+ fs_dontaudit_list_auto_mountpoints(logwatch_t)
+@@ -95,6 +97,10 @@
  ')
  
  optional_policy(`
@@ -381,7 +409,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.6.1/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/admin/netutils.te	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/netutils.te	2007-04-23 13:12:09.000000000 -0400
 @@ -31,6 +31,7 @@
  type traceroute_t;
  type traceroute_exec_t;
@@ -418,7 +446,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.6.1/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2007-01-02 12:57:51.000000000 -0500
-+++ serefpolicy-2.6.1/policy/modules/admin/readahead.te	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/readahead.te	2007-04-23 13:12:09.000000000 -0400
 @@ -36,7 +36,7 @@
  dev_dontaudit_read_all_blk_files(readahead_t)
  dev_dontaudit_getattr_memory_dev(readahead_t)
@@ -438,7 +466,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.6.1/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-2.6.1/policy/modules/admin/rpm.fc	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/rpm.fc	2007-04-23 13:12:09.000000000 -0400
 @@ -21,6 +21,9 @@
  /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)
@@ -451,7 +479,7 @@
[...1642 lines suppressed...]
  ')
-@@ -637,6 +637,8 @@
+@@ -637,6 +638,8 @@
  		type selinux_config_t;
  	')
  
@@ -5907,7 +6167,7 @@
  	files_search_etc($1)
  	allow $1 selinux_config_t:dir list_dir_perms;
  	read_files_pattern($1,selinux_config_t,selinux_config_t)
-@@ -682,6 +684,7 @@
+@@ -682,6 +685,7 @@
  	')
  
  	files_search_etc($1)
@@ -5917,7 +6177,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.6.1/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/system/selinuxutil.te	2007-04-23 09:55:33.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/system/selinuxutil.te	2007-04-23 16:56:36.000000000 -0400
 @@ -1,10 +1,8 @@
  
  policy_module(selinuxutil,1.5.0)
@@ -6004,7 +6264,15 @@
  	')
  ')
  
-@@ -310,15 +310,13 @@
+@@ -281,6 +281,7 @@
+ term_dontaudit_use_unallocated_ttys(newrole_t)
+ 
+ auth_domtrans_chk_passwd(newrole_t)
++auth_domtrans_upd_passwd(newrole_t)
+ auth_rw_faillog(newrole_t)
+ 
+ corecmd_list_bin(newrole_t)
+@@ -310,15 +311,13 @@
  userdom_dontaudit_search_all_users_home_content(newrole_t)
  userdom_search_all_users_home_dirs(newrole_t)
  
@@ -6027,7 +6295,7 @@
  
  tunable_policy(`allow_polyinstantiation',`
  	files_polyinstantiate_all(newrole_t)
-@@ -426,6 +424,10 @@
+@@ -426,6 +425,10 @@
  	hotplug_use_fds(restorecon_t)
  ')
  
@@ -6038,7 +6306,15 @@
  ########################################
  #
  # Restorecond local policy
-@@ -571,7 +573,10 @@
+@@ -504,6 +507,7 @@
+ term_dontaudit_list_ptys(run_init_t)
+ 
+ auth_domtrans_chk_passwd(run_init_t)
++auth_domtrans_upd_passwd(run_init_t)
+ auth_dontaudit_read_shadow(run_init_t)
+ 
+ corecmd_exec_bin(run_init_t)
+@@ -571,7 +575,10 @@
  kernel_read_system_state(semanage_t)
  kernel_read_kernel_sysctls(semanage_t)
  
@@ -6049,7 +6325,7 @@
  
  dev_read_urand(semanage_t)
  
-@@ -621,6 +626,15 @@
+@@ -621,6 +628,15 @@
  
  userdom_search_sysadm_home_dirs(semanage_t)
  
@@ -6065,7 +6341,7 @@
  # cjp: need a more general way to handle this:
  ifdef(`enable_mls',`
  	# read secadm tmp files
-@@ -700,6 +714,8 @@
+@@ -700,6 +716,8 @@
  ifdef(`hide_broken_symptoms',`
  	# cjp: cover up stray file descriptors.
  	optional_policy(`
@@ -6077,7 +6353,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.6.1/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/system/sysnetwork.te	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/system/sysnetwork.te	2007-04-23 13:12:09.000000000 -0400
 @@ -164,6 +164,8 @@
  	dbus_connect_system_bus(dhcpc_t)
  	dbus_send_system_bus(dhcpc_t)
@@ -6097,7 +6373,7 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.6.1/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/system/udev.te	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/system/udev.te	2007-04-23 13:12:09.000000000 -0400
 @@ -83,12 +83,19 @@
  kernel_dgram_send(udev_t)
  kernel_signal(udev_t)
@@ -6131,7 +6407,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.6.1/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2007-02-19 11:32:53.000000000 -0500
-+++ serefpolicy-2.6.1/policy/modules/system/unconfined.fc	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/system/unconfined.fc	2007-04-23 13:12:09.000000000 -0400
 @@ -10,4 +10,5 @@
  /usr/bin/valgrind 		--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  /usr/local/RealPlayer/realplay\.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
@@ -6140,7 +6416,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.6.1/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2007-02-19 11:32:53.000000000 -0500
-+++ serefpolicy-2.6.1/policy/modules/system/unconfined.if	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/system/unconfined.if	2007-04-23 13:12:09.000000000 -0400
 @@ -18,7 +18,7 @@
  	')
  
@@ -6167,7 +6443,7 @@
  	corenet_unconfined($1)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.6.1/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/system/unconfined.te	2007-04-23 09:55:46.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/system/unconfined.te	2007-04-23 13:12:09.000000000 -0400
 @@ -6,6 +6,15 @@
  # Declarations
  #
@@ -6233,7 +6509,7 @@
  		init_dbus_chat_script(unconfined_execmem_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.6.1/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/system/userdomain.if	2007-04-23 12:53:48.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/system/userdomain.if	2007-04-23 13:12:09.000000000 -0400
 @@ -114,6 +114,10 @@
  		# Allow making the stack executable via mprotect.
  		allow $1_t self:process execstack;
@@ -6689,7 +6965,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.6.1/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/system/userdomain.te	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/system/userdomain.te	2007-04-25 10:05:02.000000000 -0400
 @@ -15,7 +15,6 @@
  # Declarations
  #
@@ -6844,7 +7120,7 @@
  
  	# compatibility for switching from strict
  #	dominance { role secadm_r { role system_r; }}
-@@ -548,4 +572,9 @@
+@@ -548,4 +572,13 @@
  	optional_policy(`
  		samba_per_role_template(user)
  	')
@@ -6853,10 +7129,14 @@
 +		gnome_per_role_template(user, user_t, user_r)
 +	')
 +
++')
++
++tunable_policy(`allow_console_login', `
++	term_use_console(userdomain)
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.6.1/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/system/xen.te	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/system/xen.te	2007-04-23 13:12:09.000000000 -0400
 @@ -25,6 +25,10 @@
  domain_type(xend_t)
  init_daemon_domain(xend_t, xend_exec_t)
@@ -6941,7 +7221,7 @@
 +fs_read_dos_files(xend_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-2.6.1/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2007-01-02 12:57:51.000000000 -0500
-+++ serefpolicy-2.6.1/policy/support/obj_perm_sets.spt	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/policy/support/obj_perm_sets.spt	2007-04-23 13:12:09.000000000 -0400
 @@ -215,7 +215,7 @@
  define(`getattr_file_perms',`{ getattr }')
  define(`setattr_file_perms',`{ setattr }')
@@ -6967,7 +7247,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.6.1/Rules.modular
 --- nsaserefpolicy/Rules.modular	2007-03-22 14:30:10.000000000 -0400
-+++ serefpolicy-2.6.1/Rules.modular	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/Rules.modular	2007-04-23 13:12:09.000000000 -0400
 @@ -167,7 +167,7 @@
  # these have to run individually because order matters:
  	$(verbose) $(GREP) '^sid ' $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true
@@ -6996,7 +7276,7 @@
  clean:
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/VERSION serefpolicy-2.6.1/VERSION
 --- nsaserefpolicy/VERSION	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/VERSION	2007-04-23 09:53:18.000000000 -0400
++++ serefpolicy-2.6.1/VERSION	2007-04-23 13:12:09.000000000 -0400
 @@ -1 +1 @@
 -20070417
 +20061212


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -r1.443 -r1.444
--- selinux-policy.spec	23 Apr 2007 17:00:48 -0000	1.443
+++ selinux-policy.spec	25 Apr 2007 18:31:32 -0000	1.444
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -358,6 +358,10 @@
 %endif
 
 %changelog
+* Wed Apr 25 2007 Dan Walsh <dwalsh at redhat.com> 2.6.1-2
+- Fixes for unix_update
+- Fix logwatch to be able to search all dirs
+
 * Mon Apr 23 2007 Dan Walsh <dwalsh at redhat.com> 2.6.1-1
 - Upstream bumped the version
 



From fedora-cvs-commits at redhat.com  Wed Apr 25 18:49:51 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 14:49:51 -0400
Subject: rpms/mod_auth_pgsql/devel sources,1.7,1.8
Message-ID: <200704251849.l3PInpTt030638@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/mod_auth_pgsql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30519

Modified Files:
	sources 
Log Message:
- remove stale source



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mod_auth_pgsql/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Jan 2006 09:04:46 -0000	1.7
+++ sources	25 Apr 2007 18:49:49 -0000	1.8
@@ -1,2 +1 @@
-6d3cc25e997286e11f61907fc9cf4a63  mod_auth_pgsql-2.0.1.tar.gz
 d44074b3b9bdb0a5eb9702814872ad43  mod_auth_pgsql-2.0.3.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 25 19:02:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 15:02:23 -0400
Subject: rpms/xorg-x11-server/devel xserver-1.3.0-less-randr-fakerama.patch,
	NONE, 1.1 xorg-x11-server.spec, 1.224, 1.225
Message-ID: <200704251902.l3PJ2NTv007276@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.3.0-less-randr-fakerama.patch 
Log Message:
* Wed Apr 25 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-2
- xserver-1.3.0-less-randr-fakerama.patch: Disable RANDR's fake Xinerama
  geometry when there's more than one protocol screen. (#231257)


xserver-1.3.0-less-randr-fakerama.patch:
 rrxinerama.c |    8 ++++++++
 1 files changed, 8 insertions(+)

--- NEW FILE xserver-1.3.0-less-randr-fakerama.patch ---
--- xorg-server-1.3.0.0/randr/rrxinerama.c.jx	2007-01-30 02:01:52.000000000 -0500
+++ xorg-server-1.3.0.0/randr/rrxinerama.c	2007-04-25 13:26:23.000000000 -0400
@@ -425,6 +425,14 @@
 	return;
 #endif
 
+    /*
+     * Xinerama isn't capable enough to have multiple protocol screens each
+     * with their own output geometry.  So if there's more than one protocol
+     * screen, just don't even try.
+     */
+    if (screenInfo.numScreens > 1)
+	return;
+
     (void) AddExtension(PANORAMIX_PROTOCOL_NAME, 0,0,
 			ProcRRXineramaDispatch,
 			SProcRRXineramaDispatch,


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- xorg-x11-server.spec	24 Apr 2007 02:59:59 -0000	1.224
+++ xorg-x11-server.spec	25 Apr 2007 19:02:21 -0000	1.225
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.3.0.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -57,6 +57,7 @@
 Patch2003:  xserver-1.2.0-vfprintf.patch
 Patch2004:  xserver-1.2.0-honor-displaysize.patch
 Patch2005:  xserver-1.2.99.901-xephyr-crash-at-exit.patch
+Patch2006:  xserver-1.3.0-less-randr-fakerama.patch
 
 # assorted PCI layer shenanigans.  oh the pain.
 Patch2500:  xorg-x11-server-1.2.99-unbreak-domain.patch
@@ -290,6 +291,7 @@
 %patch2003 -p1 -b .vfprintf
 %patch2004 -p1 -b .displaysize
 %patch2005 -p1 -b .xephyr-crash
+%patch2006 -p1 -b .fakerama
 
 %patch2500 -p1 -b .unbreak-domains
 %patch2501 -p1 -b .pci-bus-count
@@ -555,6 +557,10 @@
 
 
 %changelog
+* Wed Apr 25 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-2
+- xserver-1.3.0-less-randr-fakerama.patch: Disable RANDR's fake Xinerama
+  geometry when there's more than one protocol screen. (#231257)
+
 * Mon Apr 23 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-1
 - xserver 1.3.0.
 



From fedora-cvs-commits at redhat.com  Wed Apr 25 19:04:27 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 15:04:27 -0400
Subject: rpms/ant/devel ant.spec,1.80,1.81
Message-ID: <200704251904.l3PJ4RuE008655@cvs.devel.redhat.com>

Author: pcheung

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

Modified Files:
	ant.spec 
Log Message:
Update spec file as per fedora review




Index: ant.spec
===================================================================
RCS file: /cvs/dist/rpms/ant/devel/ant.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- ant.spec	19 Mar 2007 15:52:03 -0000	1.80
+++ ant.spec	25 Apr 2007 19:04:25 -0000	1.81
@@ -51,7 +51,7 @@
 
 Name:           ant
 Version:        1.6.5
-Release:        %{jpprelease}.2%{?dist}
+Release:        %{jpprelease}.3%{?dist}
 Epoch:          0
 Summary:        Ant build tool for java
 Summary(it):    Tool per la compilazione di programmi java
@@ -83,7 +83,6 @@
 BuildRequires:  jaxp_parser_impl
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  java-devel
-BuildRequires:  coreutils
 %if ! %{bootstrap1}
 Requires:       jaxp_parser_impl
 BuildRequires:  jaxp_parser_impl
@@ -567,7 +566,6 @@
 Group:          Development/Build Tools
 AutoReqProv:    no
 Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       /usr/bin/perl
 Requires:       /usr/bin/python
 
 %description scripts
@@ -592,8 +590,6 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Requires(post):   /bin/rm,/bin/ln
-Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -697,13 +693,6 @@
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
-## endorsed jars
-#mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}/endorsed
-#pushd $RPM_BUILD_ROOT%{_javadir}/%{name}/endorsed
-#ln -sf $(build-classpath xml-commons-apis)
-#ln -sf $(build-classpath xerces-j2) jaxp_parser_impl.jar
-#popd
-
 # scripts: remove dos and os/2 scripts
 rm -f src/script/*.bat
 rm -f src/script/*.cmd
@@ -752,6 +741,7 @@
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # fix link between manual and javadoc
 (cd docs/manual; ln -sf %{_javadocdir}/%{name}-%{version} api)
@@ -767,17 +757,6 @@
 
 # -----------------------------------------------------------------------------
 
-%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 ]
@@ -1382,10 +1361,14 @@
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
 
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Apr 25 2007 Permaine Cheung <pcheung at redhat.com> 0:1.6.5-4jpp.3
+- Update spec file as per fedora review.
+
 * Mon Mar 19 2007 Permaine Cheung <pcheung at redhat.com> 1.6.5-4jpp.2
 - Get rid of the Provides for ant-optional and ant-optional-full.
 



From fedora-cvs-commits at redhat.com  Wed Apr 25 19:39:51 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 15:39:51 -0400
Subject: rpms/hal/devel hal-0.5.9-fixes.patch, 1.1, 1.2 hal.spec, 1.129,
	1.130 firewire-ioctl-changes.patch, 1.1, NONE
Message-ID: <200704251939.l3PJdpuf028505@cvs.devel.redhat.com>

Author: davidz

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

Modified Files:
	hal-0.5.9-fixes.patch hal.spec 
Removed Files:
	firewire-ioctl-changes.patch 
Log Message:
* Wed Apr 25 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-6
- Pick up the latest fixes from 0.5.9 stable branch
- Drop firewire prober patch as this is already in the 0.5.9 stable branch
- Resolves: #237871 (pass correct quirks)



hal-0.5.9-fixes.patch:
 NEWS                                          |   28 +++++++++++++++++-
 configure.in                                  |    4 +-
 doc/spec/hal-spec-fdi-files.xml               |    8 ++---
 fdi/policy/10osvendor/10-keyboard-policy.fdi  |    8 +++--
 fdi/policy/10osvendor/10-macbookpro-utils.fdi |   15 +++++++++
 fdi/policy/10osvendor/20-storage-methods.fdi  |    1 
 hald/device_info.c                            |   31 ++++++++++----------
 hald/freebsd/hf-pci.c                         |   13 ++++++--
 hald/freebsd/hf-storage.c                     |   26 ++++++++++++++++
 hald/freebsd/hf-usb.c                         |    8 +++--
 hald/hald.c                                   |    3 -
 hald/hald_dbus.c                              |    1 
 hald/linux/probing/probe-ieee1394-unit.c      |   13 +++-----
 hald/linux/probing/probe-volume.c             |   40 ++++++++++++++++----------
 hald/mmap_cache.c                             |    6 +--
 libhal/libhal.c                               |    3 +
 partutil/Makefile.am                          |   11 +------
 tools/hal-luks-setup                          |   14 ++++-----
 tools/hal-luks-teardown                       |   14 ++++-----
 tools/linux/hal-system-power-hibernate-linux  |    6 +--
 tools/linux/hal-system-power-suspend-linux    |    6 +--
 21 files changed, 171 insertions(+), 88 deletions(-)

Index: hal-0.5.9-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal-0.5.9-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hal-0.5.9-fixes.patch	12 Apr 2007 20:17:38 -0000	1.1
+++ hal-0.5.9-fixes.patch	25 Apr 2007 19:39:49 -0000	1.2
@@ -97,6 +97,44 @@
          <match key="info.capabilities" contains_not="button">
  	  <append key="info.capabilities" type="strlist">button</append>
          </match>
+diff --git a/fdi/policy/10osvendor/10-macbookpro-utils.fdi b/fdi/policy/10osvendor/10-macbookpro-utils.fdi
+index 1b0ac67..8aed6c0 100644
+--- a/fdi/policy/10osvendor/10-macbookpro-utils.fdi
++++ b/fdi/policy/10osvendor/10-macbookpro-utils.fdi
+@@ -11,6 +11,21 @@
+           <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_keyboard_backlight"/>
+           <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel"/>
+         </match>
++        <match key="system.hardware.product" string="MacBookPro1,2">
++          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_light_sensor"/>
++          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_keyboard_backlight"/>
++          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel"/>
++        </match>
++        <match key="system.hardware.product" string="MacBookPro2,1">
++          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_light_sensor"/>
++          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_keyboard_backlight"/>
++          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel"/>
++        </match>
++        <match key="system.hardware.product" string="MacBookPro2,2">
++          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_light_sensor"/>
++          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_keyboard_backlight"/>
++          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel"/>
++        </match>
+       </match>
+     </match>
+   </device>
+diff --git a/fdi/policy/10osvendor/20-storage-methods.fdi b/fdi/policy/10osvendor/20-storage-methods.fdi
+index 79904f2..b2b190f 100644
+--- a/fdi/policy/10osvendor/20-storage-methods.fdi
++++ b/fdi/policy/10osvendor/20-storage-methods.fdi
+@@ -186,6 +186,7 @@
+ 	  <append key="volume.mount.valid_options" type="strlist">gid=</append>
+ 	  <append key="volume.mount.valid_options" type="strlist">umask=</append>
+ 	  <append key="volume.mount.valid_options" type="strlist">locale=</append>
++	  <append key="volume.mount.valid_options" type="strlist">utf8</append>
+ 	</match>
+ 	<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="FreeBSD">
+ 	  <append key="volume.mount.valid_options" type="strlist">-u=</append>
 diff --git a/hald/device_info.c b/hald/device_info.c
 index 8355011..3b9cf7b 100644
 --- a/hald/device_info.c
@@ -145,6 +183,124 @@
  		}
  	
  		if (rule->type_match == MATCH_CONTAINS) {	
+diff --git a/hald/freebsd/hf-pci.c b/hald/freebsd/hf-pci.c
+index 400f183..8709913 100644
+--- a/hald/freebsd/hf-pci.c
++++ b/hald/freebsd/hf-pci.c
+@@ -38,6 +38,7 @@
+ 
+ #include "../hald.h"
+ #include "../ids.h"
++#include "../device.h"
+ #include "../logger.h"
+ #include "../util.h"
+ 
+@@ -210,9 +211,15 @@ hf_pci_probe_bus (HalDevice *parent, int bus, bitstr_t *busmap)
+ 
+ 	  info = g_new(DeviceInfo, 1);
+ 	  info->device = hf_device_store_match(hald_get_gdl(),
+-			                       hal_property_new_int("pci.freebsd.bus", p->pc_sel.pc_bus),
+-					       hal_property_new_int("pci.freebsd.device", p->pc_sel.pc_dev),
+-					       hal_property_new_int("pci.freebsd.function", p->pc_sel.pc_func),
++			  		       "pci.freebsd.bus",
++					       HAL_PROPERTY_TYPE_INT32,
++					       p->pc_sel.pc_bus,
++					       "pci.freebsd.device",
++					       HAL_PROPERTY_TYPE_INT32,
++					       p->pc_sel.pc_dev,
++					       "pci.freebsd.function",
++					       HAL_PROPERTY_TYPE_INT32,
++					       p->pc_sel.pc_func,
+ 					       NULL);
+ 	  info->p = *p;
+ 	  info->secondary_bus = hf_pci_get_register(p, PCIR_SECBUS_1);
+diff --git a/hald/freebsd/hf-storage.c b/hald/freebsd/hf-storage.c
+index 19c3ad7..347aef3 100644
+--- a/hald/freebsd/hf-storage.c
++++ b/hald/freebsd/hf-storage.c
+@@ -65,6 +65,7 @@ static GNode *hf_storage_geom_tree = NULL;
+ static GHashTable *hf_storage_geom_hash = NULL;
+ 
+ static void hf_storage_init_geom (void);
++static gboolean hf_storage_device_has_addon (HalDevice *device);
+ 
+ static void
+ hf_storage_geom_free (gpointer data)
+@@ -587,7 +588,8 @@ hf_storage_conftxt_timeout_cb (gpointer data)
+ 		{
+ 		  /* disk changed */
+ 		  device = hf_devtree_find_from_name(hald_get_gdl(), disk->name);
+-		  if (device && hal_device_has_capability(device, "storage"))
++		  if (device && hal_device_has_capability(device, "storage") &&
++		      ! hf_storage_device_has_addon(device))
+ 		    hf_storage_device_rescan_real(device);
+ 		}
+ 	    }
+@@ -768,6 +770,28 @@ hf_storage_device_rescan (HalDevice *device)
+     return FALSE;
+ }
+ 
++static gboolean
++hf_storage_device_has_addon (HalDevice *device)
++{
++  HalDeviceStrListIter iter;
++
++  g_return_val_if_fail(device != NULL, FALSE);
++
++  for (hal_device_property_strlist_iter_init(device, "info.addons", &iter);
++       hal_device_property_strlist_iter_is_valid(&iter);
++       hal_device_property_strlist_iter_next(&iter))
++    {
++      const char *addon;
++
++      addon = hal_device_property_strlist_iter_get_value(&iter);
++
++      if (! strcmp(addon, "hald-addon-storage"))
++        return TRUE;
++    }
++
++  return FALSE;
++}
++
+ HFHandler hf_storage_handler = {
+   .init =		hf_storage_init,
+   .probe =		hf_storage_probe,
+diff --git a/hald/freebsd/hf-usb.c b/hald/freebsd/hf-usb.c
+index f7b2bf0..b7991b5 100644
+--- a/hald/freebsd/hf-usb.c
++++ b/hald/freebsd/hf-usb.c
+@@ -372,11 +372,11 @@ hf_usb_device_new (HalDevice *parent,
+       can_wake_up = (config_desc.bmAttributes & UC_REMOTE_WAKEUP) != 0;
+       num_interfaces = config_desc.bNumInterface;
+ 
+-      if (config_desc->iConfiguration != 0)
++      if (config_desc.iConfiguration != 0)
+ 	{
+ 	  char *configuration;
+ 
+-	  configuration = hf_usb_get_string_descriptor(controller->fd, di->udi_addr, config_desc->iConfiguration, NULL);
++	  configuration = hf_usb_get_string_descriptor(controller->fd, di->udi_addr, config_desc.iConfiguration, NULL);
+ 	  if (configuration)
+ 	    {
+ 	      hal_device_property_set_string(device, "usb_device.configuration", configuration);
+@@ -424,6 +424,8 @@ hf_usb_device_new (HalDevice *parent,
+ 
+ static HalDevice *
+ hf_usb_interface_device_new (HalDevice *parent,
++			     Controller *controller,
++			     const struct usb_device_info *di,
+ 			     const usb_interface_descriptor_t *desc)
+ {
+   HalDevice *device;
+@@ -576,7 +578,7 @@ hf_usb_probe_device (HalDevice *parent,
+ 	      break;
+ 	    }
+ 
+-	  if_device = hf_usb_interface_device_new(device, if_desc);
++	  if_device = hf_usb_interface_device_new(device, controller, device_info, if_desc);
+ 	  hf_device_preprobe_and_add(if_device);
+ 
+ 	  p += USB_INTERFACE_DESCRIPTOR_SIZE + if_desc->bNumEndpoints * USB_ENDPOINT_DESCRIPTOR_SIZE;
 diff --git a/hald/hald.c b/hald/hald.c
 index 1a13a31..9135440 100644
 --- a/hald/hald.c
@@ -171,6 +327,93 @@
          }
  
  	dbus_error_init (&error);
+diff --git a/hald/linux/probing/probe-ieee1394-unit.c b/hald/linux/probing/probe-ieee1394-unit.c
+index bfa3ed0..70facfd 100644
+--- a/hald/linux/probing/probe-ieee1394-unit.c
++++ b/hald/linux/probing/probe-ieee1394-unit.c
+@@ -83,14 +83,11 @@ struct fw_cdev_event_request {
+ 	__u32 data[0];
+ };
+ 
+-#define FW_CDEV_IOC_GET_INFO		_IO('#', 0x00)
+-#define FW_CDEV_IOC_SEND_REQUEST	_IO('#', 0x01)
+-#define FW_CDEV_IOC_ALLOCATE		_IO('#', 0x02)
+-#define FW_CDEV_IOC_DEALLOCATE		_IO('#', 0x03)
+-#define FW_CDEV_IOC_SEND_RESPONSE	_IO('#', 0x04)
+-#define FW_CDEV_IOC_INITIATE_BUS_RESET	_IO('#', 0x05)
+-#define FW_CDEV_IOC_ADD_DESCRIPTOR	_IO('#', 0x06)
+-#define FW_CDEV_IOC_REMOVE_DESCRIPTOR	_IO('#', 0x07)
++#define FW_CDEV_IOC_GET_INFO		_IOWR('#', 0x00, struct fw_cdev_get_info)
++#define FW_CDEV_IOC_SEND_REQUEST	_IOW('#', 0x01, struct fw_cdev_send_request)
++#define FW_CDEV_IOC_ALLOCATE		_IOWR('#', 0x02, struct fw_cdev_allocate)
++#define FW_CDEV_IOC_DEALLOCATE		_IOW('#', 0x03, struct fw_cdev_deallocate)
++#define FW_CDEV_IOC_SEND_RESPONSE	_IOW('#', 0x04, struct fw_cdev_send_response)
+ 
+ /* FW_CDEV_VERSION History
+  *
+diff --git a/hald/linux/probing/probe-volume.c b/hald/linux/probing/probe-volume.c
+index d5963db..b003b25 100644
+--- a/hald/linux/probing/probe-volume.c
++++ b/hald/linux/probing/probe-volume.c
+@@ -122,33 +122,43 @@ set_volume_id_values (LibHalContext *ctx, const char *udi, LibHalChangeSet *cs,
+ 	libhal_changeset_set_property_string (cs, "volume.fsusage", usage);
+ 	HAL_DEBUG (("volume.fsusage = '%s'", usage));
+ 
+-	libhal_changeset_set_property_string (cs, "volume.fstype", vid->type);
++	if (!libhal_changeset_set_property_string (cs, "volume.fstype", vid->type))
++		libhal_changeset_set_property_string (cs, "volume.fstype", "");
++
+ 	HAL_DEBUG(("volume.fstype = '%s'", vid->type));
++
+ 	if (vid->type_version[0] != '\0') {
+ 		libhal_changeset_set_property_string (cs, "volume.fsversion", vid->type_version);
+ 		HAL_DEBUG(("volume.fsversion = '%s'", vid->type_version));
+ 	}
++
+ 	libhal_changeset_set_property_string (cs, "volume.uuid", vid->uuid);
+ 	HAL_DEBUG(("volume.uuid = '%s'", vid->uuid));
+ 
+-	/* we need to be sure for a utf8 valid label, because dbus accept only utf8 valid strings */
+-	volume_label = strdup_valid_utf8 (vid->label);
+-	if( volume_label != NULL ) {
+-		libhal_changeset_set_property_string (cs, "volume.label", volume_label);
+-		HAL_DEBUG(("volume.label = '%s'", volume_label));
++	if(vid->label != NULL && vid->label[0] != '\0') {
++		/* we need to be sure for a utf8 valid label, because dbus accept only utf8 valid strings */
++		volume_label = strdup_valid_utf8 (vid->label);
++		if( volume_label != NULL ) {
++			libhal_changeset_set_property_string (cs, "volume.label", volume_label);
++			HAL_DEBUG(("volume.label = '%s'", volume_label));
+ 		
+-		if (strlen(volume_label) > 0) {	
+-			libhal_changeset_set_property_string (cs, "info.product", volume_label);
+-		}
+-		else {
+-			snprintf (buf, sizeof (buf), "Volume (%s)", vid->type);
+-			libhal_changeset_set_property_string (cs, "info.product", buf);
++			if (strlen(volume_label) > 0) {	
++				libhal_changeset_set_property_string (cs, "info.product", volume_label);
++				g_free(volume_label);
++				return;
++			}
++
++			g_free(volume_label);
+ 		}
+-		g_free(volume_label);
+-	} else {
++	}
++
++	if (vid->type != NULL) {
+ 		snprintf (buf, sizeof (buf), "Volume (%s)", vid->type);
+-		libhal_changeset_set_property_string (cs, "info.product", buf);
++	} else {
++		snprintf (buf, sizeof (buf), "Volume (unknown)");
+ 	}
++
++	libhal_changeset_set_property_string (cs, "info.product", buf);
+ }
+ 
+ static void
 diff --git a/hald/mmap_cache.c b/hald/mmap_cache.c
 index 1711f3f..1170bd8 100644
 --- a/hald/mmap_cache.c
@@ -189,6 +432,45 @@
  	}
  
  	regen_cache_done = TRUE;
+diff --git a/libhal/libhal.c b/libhal/libhal.c
+index 8e76032..0f229c5 100644
+--- a/libhal/libhal.c
++++ b/libhal/libhal.c
+@@ -3821,6 +3821,9 @@ libhal_changeset_set_property_string (LibHalChangeSet *changeset, const char *ke
+ {
+ 	LibHalChangeSetElement *elem;
+ 
++	LIBHAL_CHECK_PARAM_VALID(key, "*key", FALSE);
++	LIBHAL_CHECK_PARAM_VALID(value, "*value", FALSE);
++
+ 	elem = calloc (1, sizeof (LibHalChangeSetElement));
+ 	if (elem == NULL)
+ 		goto out;
+diff --git a/partutil/Makefile.am b/partutil/Makefile.am
+index bf48de6..5c7b8f3 100644
+--- a/partutil/Makefile.am
++++ b/partutil/Makefile.am
+@@ -1,17 +1,12 @@
+-if HALD_COMPILE_SOLARIS 
+-# do nothing
+-else if HALD_COMPILE_FREEBSD
+-# do nothing
+-else 
++if HALD_COMPILE_LINUX
++noinst_LTLIBRARIES = libpartutil.la
++endif
+ 
+ INCLUDES = @GLIB_CFLAGS@
+ 
+-noinst_LTLIBRARIES = libpartutil.la
+-
+ libpartutil_la_SOURCES = partutil.h partutil.c ../hald/logger.c
+ 
+ libpartutil_la_LIBADD = @GLIB_LIBS@ @PARTED_LIBS@
+ 
+ clean-local :
+ 	rm -f *~
+-endif
 diff --git a/tools/hal-luks-setup b/tools/hal-luks-setup
 index 154bde6..4e91d55 100755
 --- a/tools/hal-luks-setup
@@ -247,3 +529,39 @@
          locked_out
      fi
  fi
+diff --git a/tools/linux/hal-system-power-hibernate-linux b/tools/linux/hal-system-power-hibernate-linux
+index 250e191..d38c509 100755
+--- a/tools/linux/hal-system-power-hibernate-linux
++++ b/tools/linux/hal-system-power-hibernate-linux
+@@ -18,10 +18,10 @@ QUIRKS=""
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_S3_MODE" = "true" ] && QUIRKS="$QUIRKS --quirk-s3-mode"
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_DPMS_SUSPEND" = "true" ] && QUIRKS="$QUIRKS --quirk-dpms-suspend"
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_DPMS_ON" = "true" ] && QUIRKS="$QUIRKS --quirk-dpms-on"
+-[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBESTATE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbestate"
+-[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBEMODE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbemode"
++[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBESTATE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbestate-restore"
++[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBEMODE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbemode-restore"
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VGA_MODE_3" = "true" ] && QUIRKS="$QUIRKS --quirk-vga-mode3"
+-[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBE_POST" = "true" ] && QUIRKS="$QUIRKS --quirk-vbepost"
++[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBE_POST" = "true" ] && QUIRKS="$QUIRKS --quirk-vbe-post"
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_RADEON_OFF" = "true" ] && QUIRKS="$QUIRKS --quirk-radeon-off"
+ 
+ #ALTLinux only supports powersave
+diff --git a/tools/linux/hal-system-power-suspend-linux b/tools/linux/hal-system-power-suspend-linux
+index 8139842..d101b52 100755
+--- a/tools/linux/hal-system-power-suspend-linux
++++ b/tools/linux/hal-system-power-suspend-linux
+@@ -26,10 +26,10 @@ QUIRKS=""
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_S3_MODE" = "true" ] && QUIRKS="$QUIRKS --quirk-s3-mode"
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_DPMS_SUSPEND" = "true" ] && QUIRKS="$QUIRKS --quirk-dpms-suspend"
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_DPMS_ON" = "true" ] && QUIRKS="$QUIRKS --quirk-dpms-on"
+-[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBESTATE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbestate"
+-[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBEMODE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbemode"
++[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBESTATE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbestate-restore"
++[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBEMODE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbemode-restore"
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VGA_MODE_3" = "true" ] && QUIRKS="$QUIRKS --quirk-vga-mode3"
+-[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBE_POST" = "true" ] && QUIRKS="$QUIRKS --quirk-vbepost"
++[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBE_POST" = "true" ] && QUIRKS="$QUIRKS --quirk-vbe-post"
+ [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_RADEON_OFF" = "true" ] && QUIRKS="$QUIRKS --quirk-radeon-off"
+ 
+ #PMU systems cannot use /sys/power/state yet, so use a helper to issue an ioctl


Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- hal.spec	18 Apr 2007 15:22:12 -0000	1.129
+++ hal.spec	25 Apr 2007 19:39:49 -0000	1.130
@@ -24,13 +24,12 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.9
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://people.freedesktop.org/~david/dist/%{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
 Source2: hal-device-manager.desktop
 Patch0: hal-0.5.9-fixes.patch
-Patch500: firewire-ioctl-changes.patch
 
 License: AFL/GPL
 Group: System Environment/Libraries
@@ -128,7 +127,6 @@
 %prep
 %setup -q
 %patch0 -p 1 -b .fixes
-%patch500 -p1 -b .firewire-ioctl-changes
 
 %build
 %configure --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version} --with-os-type=redhat --enable-console-kit --enable-acl-management --enable-umount-helper --enable-acpi-ibm --enable-acpi-toshiba --with-eject=/usr/sbin/eject
@@ -262,6 +260,11 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Wed Apr 25 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-6
+- Pick up the latest fixes from 0.5.9 stable branch
+- Drop firewire prober patch as this is already in the 0.5.9 stable branch
+- Resolves: #237871 (pass correct quirks)
+
 * Wed Apr 18 2007 Kristian H??gsberg <krh at redhat.com> - 0.5.9-5
 - Update firewire prober to use correct ioctl codes.
 


--- firewire-ioctl-changes.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Apr 25 19:42:12 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 15:42:12 -0400
Subject: rpms/kernel/devel git-iwlwifi-fixes.patch, 1.3, 1.4 kernel-2.6.spec,
	1.3112, 1.3113
Message-ID: <200704251942.l3PJgCcN028623@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
	git-iwlwifi-fixes.patch kernel-2.6.spec 
Log Message:
fix iwlwifi build breakage

git-iwlwifi-fixes.patch:
 base.c    |   30 +++---------------------------
 iwlwifi.h |    2 +-
 2 files changed, 4 insertions(+), 28 deletions(-)

Index: git-iwlwifi-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/git-iwlwifi-fixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- git-iwlwifi-fixes.patch	11 Apr 2007 20:15:34 -0000	1.3
+++ git-iwlwifi-fixes.patch	25 Apr 2007 19:42:10 -0000	1.4
@@ -1,6 +1,64 @@
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig	2007-04-11 15:15:22.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-04-11 15:15:27.000000000 -0400
-@@ -12970,6 +12970,7 @@ static int ipw_pci_probe(struct pci_dev 
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig	2007-04-25 15:18:59.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-04-25 15:27:43.000000000 -0400
+@@ -7599,7 +7599,6 @@ static void ipw_handle_data_packet(struc
+ 	short len = le16_to_cpu(rx_hdr->len);
+ 
+ 	/* We received data from the HW, so stop the watchdog */
+-	ieee80211_netif_oper(priv->ieee, NETIF_UPDATE_TX_START);
+ 	if (unlikely((len + IPW_RX_FRAME_SIZE) > skb_tailroom(rxb->skb))) {
+ 		priv->wstats.discard.misc++;
+ 		IPW_DEBUG_DROP("Corruption detected! Oh no!\n");
+@@ -8238,10 +8237,6 @@ static int ipw_queue_tx_reclaim(struct i
+ 		is_next = 1;
+ 	}
+  done:
+-	if (ipw_queue_space(q) > q->low_mark && (fifo >= 0)
+-	    && (fifo != priv->hw_setting.cmd_queue_no)
+-	    && priv->netdev_registered && netif_running(priv->net_dev))
+-		ieee80211_netif_oper(priv->ieee, NETIF_WAKE);
+ 	used = q->first_empty - q->last_used;
+ 	if (used < 0)
+ 		used += q->n_window;
+@@ -9185,13 +9180,9 @@ static int d_open(struct ieee80211_hw *h
+ 	/* we should be verifying the device is ready to be opened */
+ 	mutex_lock(&priv->mutex);
+ 
+-	if (priv->net_dev && !(priv->status & STATUS_RF_KILL_MASK)) {
+-		ieee80211_netif_oper(priv->ieee, NETIF_ATTACH);
+-		ieee80211_netif_oper(priv->ieee, NETIF_START);
+-		ieee80211_netif_oper(priv->ieee, NETIF_WAKE);
++	if (priv->net_dev && !(priv->status & STATUS_RF_KILL_MASK))
+ 		netif_carrier_on(priv->net_dev);
+ 
+-	}
+ 	mutex_unlock(&priv->mutex);
+ 	IPW_DEBUG_MAC80211("leave %p\n", hw);
+ 	return 0;
+@@ -9974,14 +9965,6 @@ static void ipw_link_up(struct ipw_priv 
+ 	priv->last_frag_num = -1;
+ 	priv->last_packet_time = 0;
+ 
+-	if (ieee80211_netif_oper(priv->ieee, NETIF_IS_STOPPED)) {
+-		IPW_DEBUG_NOTIF("waking queue\n");
+-		ieee80211_netif_oper(priv->ieee, NETIF_WAKE);
+-	} else {
+-		IPW_DEBUG_NOTIF("starting queue\n");
+-		ieee80211_netif_oper(priv->ieee, NETIF_START);
+-	}
+-
+ 	ipw_scan_cancel(priv);
+ 	ipw_reset_stats(priv);
+ 
+@@ -10247,7 +10230,7 @@ static int ipw_update_power_cmd(struct i
+ 	u8 period = 0;
+ 	struct ipw_power_mgr *pow_data;
+ 
+-	if ((mode < IPW_POWER_MODE_CAM) || (mode > IPW_POWER_INDEX_5)) {
++	if (mode > IPW_POWER_INDEX_5) {
+ 		IPW_DEBUG_POWER("Error invalid power mode \n");
+ 		return -1;
+ 	}
+@@ -12970,6 +12953,7 @@ static int ipw_pci_probe(struct pci_dev 
  	err = ipw_read_ucode(priv);
  	if (err) {
  		IPW_ERROR("Could not read microcode from disk: %d\n", err);
@@ -8,8 +66,30 @@
  		goto out_remove_sysfs;
  	}
  
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h.orig	2007-04-11 15:17:53.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h	2007-04-11 15:18:59.000000000 -0400
+@@ -13154,9 +13138,6 @@ static int ipw_pci_suspend(struct pci_de
+ 	/* Take down the device; powers it off, etc. */
+ 	ipw_down(priv);
+ 
+-	/* Remove the PRESENT state of the device */
+-	if (priv->netdev_registered)
+-		ieee80211_netif_oper(priv->ieee, NETIF_DETACH);
+ 	pci_save_state(pdev);
+ 	pci_disable_device(pdev);
+ 	pci_set_power_state(pdev, PCI_D3hot);
+@@ -13186,11 +13167,6 @@ static int ipw_pci_resume(struct pci_dev
+ 	 */
+ 	pci_write_config_byte(pdev, 0x41, 0x00);
+ 
+-	/* Set the device back into the PRESENT state; this will also wake
+-	 * the queue of needed */
+-	if (priv->netdev_registered)
+-		ieee80211_netif_oper(priv->ieee, NETIF_ATTACH);
+-
+ 	queue_delayed_work(priv->workqueue, &priv->resume_work, 3 * HZ);
+ 
+ 	mutex_unlock(&priv->mutex);
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h.orig	2007-04-25 15:18:59.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h	2007-04-25 15:19:11.000000000 -0400
 @@ -180,7 +180,7 @@ do { if (ipw_debug_level & (level)) \
  #define IPW_DL_QOS           (1<<31)
  


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3112
retrieving revision 1.3113
diff -u -r1.3112 -r1.3113
--- kernel-2.6.spec	25 Apr 2007 18:07:02 -0000	1.3112
+++ kernel-2.6.spec	25 Apr 2007 19:42:10 -0000	1.3113
@@ -2336,6 +2336,7 @@
 * Wed Apr 25 2007 John W. Linville <linville at redhat.com>
 - Update git-wireless-dev.patch
 - Remove linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch (obsoleted by above)
+- Update git-iwlwifi-fixes.patch to match new git-wireless-dev.patch
 
 * Wed Apr 25 2007 Dave Jones <davej at redhat.com>
 - 2.6.21-rc7-git8



From fedora-cvs-commits at redhat.com  Wed Apr 25 20:55:34 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 16:55:34 -0400
Subject: rpms/kernel/devel/configs config-x86-generic, 1.86,
	1.87 config-x86_64-generic, 1.68, 1.69
Message-ID: <200704252055.l3PKtYOe028197@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-x86-generic config-x86_64-generic 
Log Message:
* Wed Apr 25 2007 Dave Jones <davej at redhat.com>
- Disable CONFIG_ACPI_ASUS in favour of CONFIG_ASUS_LAPTOP



Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- config-x86-generic	13 Apr 2007 20:40:51 -0000	1.86
+++ config-x86-generic	25 Apr 2007 20:55:31 -0000	1.87
@@ -124,7 +124,7 @@
 
 CONFIG_ACPI=y
 CONFIG_ACPI_AC=m
-CONFIG_ACPI_ASUS=m
+# CONFIG_ACPI_ASUS is not set
 CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BAY=m
 CONFIG_ACPI_IBM_BAY=y


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- config-x86_64-generic	13 Apr 2007 20:40:51 -0000	1.68
+++ config-x86_64-generic	25 Apr 2007 20:55:31 -0000	1.69
@@ -60,7 +60,7 @@
 
 CONFIG_ACPI=y
 CONFIG_ACPI_AC=m
-CONFIG_ACPI_ASUS=m
+# CONFIG_ACPI_ASUS is not set
 CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BAY=m
 CONFIG_ACPI_IBM_BAY=y



From fedora-cvs-commits at redhat.com  Wed Apr 25 20:55:33 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 16:55:33 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.3113,1.3114
Message-ID: <200704252055.l3PKtX8x028189@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
* Wed Apr 25 2007 Dave Jones <davej at redhat.com>
- Disable CONFIG_ACPI_ASUS in favour of CONFIG_ASUS_LAPTOP



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3113
retrieving revision 1.3114
diff -u -r1.3113 -r1.3114
--- kernel-2.6.spec	25 Apr 2007 19:42:10 -0000	1.3113
+++ kernel-2.6.spec	25 Apr 2007 20:55:31 -0000	1.3114
@@ -2333,6 +2333,9 @@
 #  - tux.
 
 %changelog
+* Wed Apr 25 2007 Dave Jones <davej at redhat.com>
+- Disable CONFIG_ACPI_ASUS in favour of CONFIG_ASUS_LAPTOP
+
 * Wed Apr 25 2007 John W. Linville <linville at redhat.com>
 - Update git-wireless-dev.patch
 - Remove linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch (obsoleted by above)



From fedora-cvs-commits at redhat.com  Wed Apr 25 20:57:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 16:57:36 -0400
Subject: rpms/perl/devel perl.spec,1.112,1.113
Message-ID: <200704252057.l3PKvat9029723@cvs.devel.redhat.com>

Author: rnorwood

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

Modified Files:
	perl.spec 
Log Message:
bugzilla: 226276 - fix librdir issues and cpan Provides version...again.


Index: perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- perl.spec	24 Apr 2007 18:43:37 -0000	1.112
+++ perl.spec	25 Apr 2007 20:57:34 -0000	1.113
@@ -20,7 +20,7 @@
 
 Name:           perl
 Version:        5.8.8
-Release:        16.3%{?dist}
+Release:        16.4%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        The Perl programming language
 Group:          Development/Languages
@@ -220,7 +220,7 @@
 Epoch:          0
 Version:        1.76_02
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
-Provides:	cpan-%{version}
+Provides:	cpan = %{version}
 
 %description CPAN
 Query, download and build perl modules from CPAN sites.
@@ -548,28 +548,28 @@
 %exclude %{_mandir}/man3/CPAN*
 
 # ExtUtils-Embed
-%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/Embed.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Embed.pm
 %exclude %{_mandir}/man3/ExtUtils::Embed*
 
 # ExtUtils-MakeMaker
 %exclude %{_bindir}/instmodsh
-%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/Command/
-%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/Install.pm
-%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/Installed.pm
-%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/Liblist/
-%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/Liblist.pm
-%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/MakeMaker/
-%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/MakeMaker.pm
-%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/MANIFEST.SKIP
-%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/MM*.pm
-%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/MY.pm
-%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/Manifest.pm
-%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/Mkbootstrap.pm
-%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/Mksymlists.pm
-%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/NOTES
-%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/Packlist.pm
-%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/PATCHING
-%exclude %{_libdir}/perl5/%{perl_version}/ExtUtils/testlib.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Command/
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Install.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Installed.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Liblist/
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Liblist.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MakeMaker/
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MakeMaker.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MANIFEST.SKIP
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MM*.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MY.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Manifest.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Mkbootstrap.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Mksymlists.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/NOTES
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Packlist.pm
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/PATCHING
+%exclude %{_prefix}/lib/perl5/%{perl_version}/ExtUtils/testlib.pm
 %exclude %{_mandir}/man1/instmodsh.1*
 %exclude %{_mandir}/man3/ExtUtils::Command::MM*
 %exclude %{_mandir}/man3/ExtUtils::Install.3*
@@ -586,21 +586,20 @@
 
 # Test::Harness
 %exclude %{_bindir}/prove
-%exclude %{_libdir}/perl5/%{perl_version}/Test/Harness*
+%exclude %{_prefix}/lib/perl5/%{perl_version}/Test/Harness*
 %exclude %{_mandir}/man1/prove.1*
 %exclude %{_mandir}/man3/Test::Harness*
 
 # Test::Simple
-%exclude %{_libdir}/perl5/%{perl_version}/Test/More*
-%exclude %{_libdir}/perl5/%{perl_version}/Test/Builder*
-%exclude %{_libdir}/perl5/%{perl_version}/Test/Simple*
-%exclude %{_libdir}/perl5/%{perl_version}/Test/Tutorial*
+%exclude %{_prefix}/lib/perl5/%{perl_version}/Test/More*
+%exclude %{_prefix}/lib/perl5/%{perl_version}/Test/Builder*
+%exclude %{_prefix}/lib/perl5/%{perl_version}/Test/Simple*
+%exclude %{_prefix}/lib/perl5/%{perl_version}/Test/Tutorial*
 %exclude %{_mandir}/man3/Test::More*
 %exclude %{_mandir}/man3/Test::Builder*
 %exclude %{_mandir}/man3/Test::Simple*
 %exclude %{_mandir}/man3/Test::Tutorial*
 
-
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/enc2xs
@@ -630,29 +629,29 @@
 
 %files ExtUtils-Embed
 %defattr(-,root,root,-)
-%{_libdir}/perl5/%{perl_version}/ExtUtils/Embed.pm
+%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Embed.pm
 %{_mandir}/man3/ExtUtils::Embed*
 
 %files ExtUtils-MakeMaker
 %defattr(-,root,root,-)
 %{_bindir}/instmodsh
-%{_libdir}/perl5/%{perl_version}/ExtUtils/Command/
-%{_libdir}/perl5/%{perl_version}/ExtUtils/Install.pm
-%{_libdir}/perl5/%{perl_version}/ExtUtils/Installed.pm
-%{_libdir}/perl5/%{perl_version}/ExtUtils/Liblist/
-%{_libdir}/perl5/%{perl_version}/ExtUtils/Liblist.pm
-%{_libdir}/perl5/%{perl_version}/ExtUtils/MakeMaker/
-%{_libdir}/perl5/%{perl_version}/ExtUtils/MakeMaker.pm
-%{_libdir}/perl5/%{perl_version}/ExtUtils/MANIFEST.SKIP
-%{_libdir}/perl5/%{perl_version}/ExtUtils/MM*.pm
-%{_libdir}/perl5/%{perl_version}/ExtUtils/MY.pm
-%{_libdir}/perl5/%{perl_version}/ExtUtils/Manifest.pm
-%{_libdir}/perl5/%{perl_version}/ExtUtils/Mkbootstrap.pm
-%{_libdir}/perl5/%{perl_version}/ExtUtils/Mksymlists.pm
-%{_libdir}/perl5/%{perl_version}/ExtUtils/NOTES
-%{_libdir}/perl5/%{perl_version}/ExtUtils/Packlist.pm
-%{_libdir}/perl5/%{perl_version}/ExtUtils/PATCHING
-%{_libdir}/perl5/%{perl_version}/ExtUtils/testlib.pm
+%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Command/
+%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Install.pm
+%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Installed.pm
+%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Liblist/
+%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Liblist.pm
+%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MakeMaker/
+%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MakeMaker.pm
+%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MANIFEST.SKIP
+%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MM*.pm
+%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/MY.pm
+%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Manifest.pm
+%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Mkbootstrap.pm
+%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Mksymlists.pm
+%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/NOTES
+%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/Packlist.pm
+%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/PATCHING
+%{_prefix}/lib/perl5/%{perl_version}/ExtUtils/testlib.pm
 %{_mandir}/man1/instmodsh.1*
 %{_mandir}/man3/ExtUtils::Command::MM*
 %{_mandir}/man3/ExtUtils::Install.3*
@@ -670,16 +669,16 @@
 %files Test-Harness
 %defattr(-,root,root,-)
 %{_bindir}/prove
-%{_libdir}/perl5/%{perl_version}/Test/Harness*
+%{_prefix}/lib/perl5/%{perl_version}/Test/Harness*
 %{_mandir}/man1/prove.1*
 %{_mandir}/man3/Test::Harness*
 
 %files Test-Simple
 %defattr(-,root,root,-)
-%{_libdir}/perl5/%{perl_version}/Test/More*
-%{_libdir}/perl5/%{perl_version}/Test/Builder*
-%{_libdir}/perl5/%{perl_version}/Test/Simple*
-%{_libdir}/perl5/%{perl_version}/Test/Tutorial*
+%{_prefix}/lib/perl5/%{perl_version}/Test/More*
+%{_prefix}/lib/perl5/%{perl_version}/Test/Builder*
+%{_prefix}/lib/perl5/%{perl_version}/Test/Simple*
+%{_prefix}/lib/perl5/%{perl_version}/Test/Tutorial*
 %{_mandir}/man3/Test::More*
 %{_mandir}/man3/Test::Builder*
 %{_mandir}/man3/Test::Simple*



From fedora-cvs-commits at redhat.com  Wed Apr 25 21:04:25 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 17:04:25 -0400
Subject: rpms/perl/devel perl.spec,1.113,1.114
Message-ID: <200704252104.l3PL4PUA002148@cvs.devel.redhat.com>

Author: rnorwood

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

Modified Files:
	perl.spec 
Log Message:
split out libperl from main perl package.


Index: perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- perl.spec	25 Apr 2007 20:57:34 -0000	1.113
+++ perl.spec	25 Apr 2007 21:04:23 -0000	1.114
@@ -195,6 +195,15 @@
 Install this package if you want to program in Perl or enable your
 system to handle Perl scripts.
 
+%package libs
+Summary:        The libraries for the perl runtime
+Group:          Development/Languages
+Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
+
+%description libs
+The libraries for the perl runtime
+
+
 %package devel
 Summary:        Header files for use in perl development
 Group:          Development/Languages
@@ -500,6 +509,14 @@
   done
 popd
 
+echo "%{_libdir}/perl5/%{perl_version}/%{perl_archname}/CORE/libperl.so" > libs_filelist
+
+for i in %{perlmodcompat} ; do
+    if -d $RPM_BUILD_ROOT%{_libdir}/perl5/$i/%{perl_archname}/CORE ; then
+       echo "%{_libdir}/perl5/$i/%{perl_archname}/CORE" >> libs_filelist
+    fi
+done
+
 chmod -R u+w $RPM_BUILD_ROOT/*
 %if %{perl_debugging}
 exit 0
@@ -512,6 +529,10 @@
 %check
 make test
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root,-)
 %doc Copying README
@@ -523,6 +544,9 @@
 %{_prefix}/lib/perl5/
 %endif
 
+# libs
+%exclude %{_libdir}/perl5/%{perl_version}/%{perl_archname}/CORE/libperl.so
+
 # devel
 %exclude %{_bindir}/enc2xs
 %exclude %{_mandir}/man1/enc2xs*
@@ -600,6 +624,9 @@
 %exclude %{_mandir}/man3/Test::Simple*
 %exclude %{_mandir}/man3/Test::Tutorial*
 
+%files libs -f libs_filelist
+%defattr(-,root,root)
+
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/enc2xs



From fedora-cvs-commits at redhat.com  Wed Apr 25 21:13:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 17:13:32 -0400
Subject: rpms/gdb/devel gdb-6.5-bz237872-ppc-long-double.patch, NONE,
	1.1 gdb-6.6-gcore32-test.patch, NONE, 1.1 gdb.spec, 1.228, 1.229
Message-ID: <200704252113.l3PLDW5c008991@cvs.devel.redhat.com>

Author: jkratoch

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8875

Modified Files:
	gdb.spec 
Added Files:
	gdb-6.5-bz237872-ppc-long-double.patch 
	gdb-6.6-gcore32-test.patch 
Log Message:
* Wed Apr 25 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-12
- Enable PowerPC to print 128-bit long double variables (BZ 237872).
- New testcase for 32bit inferiors on 64bit hosts.
- Resolves: rhbz#237872
- Related: rhbz#232014


gdb-6.5-bz237872-ppc-long-double.patch:
 gdb/configure.host      |    5 +++++
 gdb/ppc-linux-tdep.c    |    4 +++-
 gdb/rs6000-tdep.c       |   14 +++++++++++++-
 include/floatformat.h   |    3 +++
 libiberty/floatformat.c |   19 +++++++++++++++++++
 5 files changed, 43 insertions(+), 2 deletions(-)

--- NEW FILE gdb-6.5-bz237872-ppc-long-double.patch ---
2007-04-20  Luis Machado  <luisgpm at br.ibm.com>

	* rs6000-tdep.c (rs6000_gdbarch_init): Set the long double format for
	powerpc64.
	* configure.host : Set the host long double format for powerpc64 to be
	a 128-bit type defined in libiberty/floatformat.c.
	* ppc-linux-tdep.c (ppc_linux_init_abi): Remove code that sets long double 
	size to 8 bytes. This breaks expression evaluation by overriding the 
	default.
	* floatformat.c : Introduce default floatformat structs to describe the
	128-bit long double found on the powerpc64. Description does not fully
	describe this format which is actually a pair of 64-bit doubles. However
	we are relying on floatformat_to_doublest() recognizing that this is
	also the default host floatformat.
	* floatformat.h : Default floatformat structs for powerpc64 128-bit
	long doubles.

Index: ./gdb/configure.host
===================================================================
--- ./gdb/configure.host.orig	2007-04-21 23:51:06.000000000 -0300
+++ ./gdb/configure.host	2007-04-21 23:51:09.000000000 -0300
@@ -179,6 +179,11 @@
 	gdb_host_double_format="&floatformat_ieee_double_big"
 	gdb_host_long_double_format="&floatformat_m68881_ext"
 	;;
+powerpc64-*-*)
+	gdb_host_float_format=0
+	gdb_host_double_format=0
+	gdb_host_long_double_format="&floatformat_ppc64_long_double_big"
+	;;
 *)
 	gdb_host_float_format=0
 	gdb_host_double_format=0
Index: ./gdb/rs6000-tdep.c
===================================================================
--- ./gdb/rs6000-tdep.c.orig	2007-04-21 23:51:06.000000000 -0300
+++ ./gdb/rs6000-tdep.c	2007-04-21 23:51:09.000000000 -0300
@@ -3442,7 +3442,19 @@
   set_gdbarch_float_bit (gdbarch, 4 * TARGET_CHAR_BIT);
   set_gdbarch_double_bit (gdbarch, 8 * TARGET_CHAR_BIT);
   if (sysv_abi)
-    set_gdbarch_long_double_bit (gdbarch, 16 * TARGET_CHAR_BIT);
+    {
+      int byte_order = gdbarch_byte_order (gdbarch);
+
+      if (byte_order == BFD_ENDIAN_BIG)
+        set_gdbarch_long_double_format (gdbarch, &floatformat_ppc64_long_double_big);
+      else if (byte_order == BFD_ENDIAN_LITTLE) 
+        set_gdbarch_long_double_format (gdbarch, &floatformat_ppc64_long_double_little);
+      else
+        internal_error (__FILE__, __LINE__,
+                      _("rs6000_gdbarch_init: "
+                        "bad byte order"));
+      set_gdbarch_long_double_bit (gdbarch, 16 * TARGET_CHAR_BIT);
+    }
   else
     set_gdbarch_long_double_bit (gdbarch, 8 * TARGET_CHAR_BIT);
   set_gdbarch_char_signed (gdbarch, 0);
Index: ./include/floatformat.h
===================================================================
--- ./include/floatformat.h.orig	2007-04-21 23:51:06.000000000 -0300
+++ ./include/floatformat.h	2007-04-21 23:51:09.000000000 -0300
@@ -118,6 +118,9 @@
 extern const struct floatformat floatformat_ia64_spill_little;
 extern const struct floatformat floatformat_ia64_quad_big;
 extern const struct floatformat floatformat_ia64_quad_little;
+/* ppc64 long double implemented as 2 doubles */
+extern const struct floatformat floatformat_ppc64_long_double_big;
+extern const struct floatformat floatformat_ppc64_long_double_little;
 
 /* Convert from FMT to a double.
    FROM is the address of the extended float.
Index: ./libiberty/floatformat.c
===================================================================
--- ./libiberty/floatformat.c.orig	2007-04-21 23:51:06.000000000 -0300
+++ ./libiberty/floatformat.c	2007-04-21 23:51:09.000000000 -0300
@@ -106,6 +106,25 @@
   floatformat_always_valid
 };
 
+/* floatformats for ppc64 long double, big and little endian.           */
+/* The layout is a pair of doubles. Don't use this description to pass  */
+/* information to get_field(). The bit size is the important thing.     */
+const struct floatformat floatformat_ppc64_long_double_big =
+{
+  floatformat_big, 128, 0, 1, 11, 1023, 2047, 12, 52, 
+  floatformat_intbit_no,
+  "floatformat_ppc64_long_double_big",
+  floatformat_always_valid
+};
+
+const struct floatformat floatformat_ppc64_long_double_little =
+{
+  floatformat_little, 128, 0, 1, 11, 1023, 2047, 12, 52, 
+  floatformat_intbit_no,
+  "floatformat_ppc64_long_double_little",
+  floatformat_always_valid
+};
+
 /* floatformat for IEEE double, little endian byte order, with big endian word
    ordering, as on the ARM.  */
 
Index: ./gdb/ppc-linux-tdep.c
===================================================================
--- ./gdb/ppc-linux-tdep.c.orig	2007-04-21 19:48:50.000000000 -0300
+++ ./gdb/ppc-linux-tdep.c	2007-04-22 00:29:50.000000000 -0300
@@ -1059,7 +1059,8 @@
 {
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 
-  /* NOTE: jimb/2004-03-26: The System V ABI PowerPC Processor
+#if 0
+	/* NOTE: jimb/2004-03-26: The System V ABI PowerPC Processor
      Supplement says that long doubles are sixteen bytes long.
      However, as one of the known warts of its ABI, PPC GNU/Linux uses
      eight-byte long doubles.  GCC only recently got 128-bit long
@@ -1068,6 +1069,7 @@
      double' on PPC GNU/Linux are non-conformant.  */
   /* NOTE: cagney/2005-01-25: True for both 32- and 64-bit.  */
   set_gdbarch_long_double_bit (gdbarch, 8 * TARGET_CHAR_BIT);
+#endif
 
   if (tdep->wordsize == 4)
     {

gdb-6.6-gcore32-test.patch:
 gcore.exp |   88 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 48 insertions(+), 40 deletions(-)

--- NEW FILE gdb-6.6-gcore32-test.patch ---
Test GCORE on 32bit inferiors on 64bit platforms.

UNSUPPORTED results are valid for `-m64' on 32bit targets.


--- ./gdb/testsuite/gdb.base/gcore.exp	9 Jan 2007 17:59:11 -0000	1.9
+++ ./gdb/testsuite/gdb.base/gcore.exp	23 Apr 2007 19:20:12 -0000
@@ -31,9 +31,14 @@ set testfile "gcore"
 set srcfile  ${testfile}.c
 set binfile  ${objdir}/${subdir}/${testfile}
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested gcore.exp
-     return -1
+# `-static-libgcc' to avoid dependency on `libgcc.{i386,ppc}'.
+foreach additional_flags {{} {-m32 -static-libgcc} {-m64 -static-libgcc}} {
+
+set prefix "arch{$additional_flags}:"
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug additional_flags=$additional_flags]] != "" } {
+     unsupported "${prefix} gcore.exp"
+     continue
 }
 
 # Start with a fresh gdb.
@@ -48,23 +52,23 @@ send_gdb "help gcore\n"
 gdb_expect {
     -re "Undefined command: .gcore.*$gdb_prompt $" {
 	# gcore command not supported -- nothing to test here.
-	unsupported "gdb does not support gcore on this target"
-	return -1;
+	unsupported "${prefix} gdb does not support gcore on this target"
+	continue
     }
     -re "Save a core file .*$gdb_prompt $" {
-	pass "help gcore"
+	pass "${prefix} help gcore"
     }
     -re ".*$gdb_prompt $" {
-	fail "help gcore"
+	fail "${prefix} help gcore"
     }
     timeout {
-	fail "help gcore (timeout)"
+	fail "${prefix} help gcore (timeout)"
     }
 }
 
 if { ! [ runto_main ] } then {
-    untested gcore.exp
-    return -1
+    untested "${prefix} gcore.exp"
+    continue
 }
 
 proc capture_command_output { command prefix } {
@@ -78,7 +82,7 @@ proc capture_command_output { command pr
 	    set output_string $expect_out(1,string)
 	}
 	default {
-	    fail "capture_command_output failed on $command."
+	    fail "${prefix} capture_command_output failed on $command."
 	}
     }
     return $output_string
@@ -109,15 +113,15 @@ set pre_corefile_extern_array \
 set escapedfilename [string_to_regexp ${objdir}/${subdir}/gcore.test]
 
 gdb_test_multiple "gcore ${objdir}/${subdir}/gcore.test" \
-	"save a corefile" \
+	"${prefix} save a corefile" \
 {
   -re "Saved corefile ${escapedfilename}\[\r\n\]+$gdb_prompt $" {
-    pass "save a corefile"
+    pass "${prefix} save a corefile"
     global core_supported
     set core_supported 1
   }
   -re "Can't create a corefile\[\r\n\]+$gdb_prompt $" {
-    unsupported "save a corefile"
+    unsupported "${prefix} save a corefile"
     global core_supported
     set core_supported 0
   }
@@ -125,7 +129,7 @@ gdb_test_multiple "gcore ${objdir}/${sub
 
 global core_supported
 if {!$core_supported} {
-  return -1
+    continue
 }
 
 # Now restart gdb and load the corefile.
@@ -137,31 +141,31 @@ gdb_load ${binfile}
 send_gdb "core ${objdir}/${subdir}/gcore.test\n"
 gdb_expect {
     -re ".* is not a core dump:.*$gdb_prompt $" {
-	fail "re-load generated corefile (bad file format)"
+	fail "${prefix} re-load generated corefile (bad file format)"
 	# No use proceeding from here.
-	return;	
+	continue
     }
     -re ".*: No such file or directory.*$gdb_prompt $" {
-	fail "re-load generated corefile (file not found)"
+	fail "${prefix} re-load generated corefile (file not found)"
 	# No use proceeding from here.
-	return;	
+	continue
     }
     -re ".*Couldn't find .* registers in core file.*$gdb_prompt $" {
-	fail "re-load generated corefile (incomplete note section)"
+	fail "${prefix} re-load generated corefile (incomplete note section)"
     }
     -re "Core was generated by .*$gdb_prompt $" {
-	pass "re-load generated corefile"
+	pass "${prefix} re-load generated corefile"
     }
     -re ".*$gdb_prompt $" {
-	fail "re-load generated corefile"
+	fail "${prefix} re-load generated corefile"
     }
     timeout {
-	fail "re-load generated corefile (timeout)"
+	fail "${prefix} re-load generated corefile (timeout)"
     }
 }
 
 send_gdb "where\n"
-gdb_expect_list "where in corefile" ".*$gdb_prompt $" {
+gdb_expect_list "${prefix} where in corefile" ".*$gdb_prompt $" {
     ".*\[\r\n\]+#0 .* terminal_func \\(\\) at "
     ".*\[\r\n\]+#1 .* array_func \\(\\) at "
     ".*\[\r\n\]+#2 .* factorial_func \\(value=1\\) at "
@@ -175,61 +179,64 @@ gdb_expect_list "where in corefile" ".*$
 
 set post_corefile_regs [capture_command_output "info registers" ""]
 if ![string compare $pre_corefile_regs $post_corefile_regs] then {
-    pass "corefile restored general registers"
+    pass "${prefix} corefile restored general registers"
 } else {
-    fail "corefile restored general registers"
+    fail "${prefix} corefile restored general registers"
 }
 
 set post_corefile_allregs [capture_command_output "info all-reg" ""]
 if ![string compare $pre_corefile_allregs $post_corefile_allregs] then {
-    pass "corefile restored all registers"
+    pass "${prefix} corefile restored all registers"
 } else {
-    fail "corefile restored all registers"
+    fail "${prefix} corefile restored all registers"
 }
 
 set post_corefile_extern_array \
 	[capture_command_output "print extern_array" "$print_prefix"]
 if ![string compare $pre_corefile_extern_array $post_corefile_extern_array]  {
-    pass "corefile restored extern array"
+    pass "${prefix} corefile restored extern array"
 } else {
-    fail "corefile restored extern array"
+    fail "${prefix} corefile restored extern array"
 }
 
 set post_corefile_static_array \
 	[capture_command_output "print static_array" "$print_prefix"]
 if ![string compare $pre_corefile_static_array $post_corefile_static_array]  {
-    pass "corefile restored static array"
+    pass "${prefix} corefile restored static array"
 } else {
-    fail "corefile restored static array"
+    fail "${prefix} corefile restored static array"
 }
 
 set post_corefile_uninit_array \
 	[capture_command_output "print un_initialized_array" "$print_prefix"]
 if ![string compare $pre_corefile_uninit_array $post_corefile_uninit_array]  {
-    pass "corefile restored un-initialized array"
+    pass "${prefix} corefile restored un-initialized array"
 } else {
-    fail "corefile restored un-initialized array"
+    fail "${prefix} corefile restored un-initialized array"
 }
 
 set post_corefile_heap_string \
 	[capture_command_output "print heap_string" "$print_prefix"]
 if ![string compare $pre_corefile_heap_string $post_corefile_heap_string]  {
-    pass "corefile restored heap array"
+    pass "${prefix} corefile restored heap array"
 } else {
-    fail "corefile restored heap array"
+    fail "${prefix} corefile restored heap array"
 }
 
 set post_corefile_local_array \
 	[capture_command_output "print array_func::local_array" "$print_prefix"]
 if ![string compare $pre_corefile_local_array $post_corefile_local_array]  {
-    pass "corefile restored stack array"
+    pass "${prefix} corefile restored stack array"
 } else {
-    fail "corefile restored stack array"
+    fail "${prefix} corefile restored stack array"
 }
 
 set post_corefile_backtrace [capture_command_output "backtrace" ""]
 if ![string compare $pre_corefile_backtrace $post_corefile_backtrace]  {
-    pass "corefile restored backtrace"
+    pass "${prefix} corefile restored backtrace"
 } else {
-    fail "corefile restored backtrace"
+    fail "${prefix} corefile restored backtrace"
+}
+
+# $additional_flags:
 }


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- gdb.spec	24 Apr 2007 15:57:25 -0000	1.228
+++ gdb.spec	25 Apr 2007 21:13:29 -0000	1.229
@@ -11,7 +11,7 @@
 Version: 6.6
 
 # The release always contains a leading reserved number, start it at 1.
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -338,6 +338,12 @@
 # Notify user of a child forked process being detached (BZ 235197).
 Patch247: gdb-6.6-bz234468-fork-detach-info.patch
 
+# New testcase for 32bit inferiors on 64bit hosts.
+Patch249: gdb-6.6-gcore32-test.patch
+
+# Enable PowerPC to print 128-bit long double variables (BZ 237872).
+Patch251: gdb-6.5-bz237872-ppc-long-double.patch
+
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
 BuildRequires: flex bison sharutils expat-devel
 
@@ -478,6 +484,8 @@
 %patch245 -p1
 %patch246 -p1
 %patch247 -p1
+%patch249 -p1
+%patch251 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -625,6 +633,10 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Wed Apr 25 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-12
+- Enable PowerPC to print 128-bit long double variables (BZ 237872).
+- New testcase for 32bit inferiors on 64bit hosts.
+
 * Tue Apr 24 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-11
 - Package review, analysed by Ralf Corsepius (BZ 225783).
  - Fix prelink(8) testcase for non-root $PATH missing `/usr/sbin' (BZ 225783).



From fedora-cvs-commits at redhat.com  Wed Apr 25 21:39:59 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 17:39:59 -0400
Subject: rpms/kernel/FC-5 linux-2.6-20.8-unofficial.patch, NONE,
	1.1 kernel-2.6.spec, 1.2313, 1.2314
Message-ID: <200704252139.l3PLdxtA021367@cvs.devel.redhat.com>

Author: cebbert

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-20.8-unofficial.patch 
Log Message:
* Wed Apr 25 2007 Chuck Ebbert <cebbert at redhat.com>		1.2314
- 2.6.20.8
  Patch taken from mailing list, not available elsewhere.


linux-2.6-20.8-unofficial.patch:
 Makefile                |    2 +-
 net/ipv4/fib_frontend.c |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-20.8-unofficial.patch ---
diff --git a/Makefile b/Makefile
index bc99522..f3539e8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 20
-EXTRAVERSION = .7
+EXTRAVERSION = .8
 NAME = Homicidal Dwarf Hamster
 
 # *DOCUMENTATION*
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index d47b72a..fa2cb8c 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -772,6 +772,8 @@ static void nl_fib_lookup(struct fib_result_nl *frn, struct fib_table *tb )
 				       .nl_u = { .ip4_u = { .daddr = frn->fl_addr,
 							    .tos = frn->fl_tos,
 							    .scope = frn->fl_scope } } };
+
+	frn->err = -ENOENT;
 	if (tb) {
 		local_bh_disable();
 
@@ -783,6 +785,7 @@ static void nl_fib_lookup(struct fib_result_nl *frn, struct fib_table *tb )
 			frn->nh_sel = res.nh_sel;
 			frn->type = res.type;
 			frn->scope = res.scope;
+			fib_res_put(&res);
 		}
 		local_bh_enable();
 	}
@@ -797,6 +800,9 @@ static void nl_fib_input(struct sock *sk, int len)
 	struct fib_table *tb;
 	
 	skb = skb_dequeue(&sk->sk_receive_queue);
+	if (skb == NULL)
+		return;
+
 	nlh = (struct nlmsghdr *)skb->data;
 	if (skb->len < NLMSG_SPACE(0) || skb->len < nlh->nlmsg_len ||
 	    nlh->nlmsg_len < NLMSG_LENGTH(sizeof(*frn))) {
@@ -809,7 +815,7 @@ static void nl_fib_input(struct sock *sk, int len)
 
 	nl_fib_lookup(frn, tb);
 	
-	pid = nlh->nlmsg_pid;           /*pid of sending process */
+	pid = NETLINK_CB(skb).pid;       /* pid of sending process */
 	NETLINK_CB(skb).pid = 0;         /* from kernel */
 	NETLINK_CB(skb).dst_group = 0;  /* unicast */
 	netlink_unicast(sk, skb, pid, MSG_DONTWAIT);


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2313
retrieving revision 1.2314
diff -u -r1.2313 -r1.2314
--- kernel-2.6.spec	17 Apr 2007 20:40:15 -0000	1.2313
+++ kernel-2.6.spec	25 Apr 2007 21:39:56 -0000	1.2314
@@ -317,6 +317,7 @@
 Patch5: patch-2.6.20.4-5.bz2
 Patch6: patch-2.6.20.5-6.bz2
 Patch7: patch-2.6.20.6-7.bz2
+Patch8: linux-2.6-20.8-unofficial.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 
@@ -878,6 +879,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
@@ -1888,6 +1890,10 @@
 %endif
 
 %changelog
+* Wed Apr 25 2007 Chuck Ebbert <cebbert at redhat.com>		1.2314
+- 2.6.20.8
+  Patch taken from mailing list, not available elsewhere.
+
 * Tue Apr 17 2007 Chuck Ebbert <cebbert at redhat.com>		1.2313
 - 2.6.20.7
 



From fedora-cvs-commits at redhat.com  Wed Apr 25 21:40:24 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 17:40:24 -0400
Subject: rpms/kernel/FC-6 linux-2.6-20.8-unofficial.patch, NONE,
	1.1 kernel-2.6.spec, 1.2945, 1.2946
Message-ID: <200704252140.l3PLeOQk021415@cvs.devel.redhat.com>

Author: cebbert

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-20.8-unofficial.patch 
Log Message:
* Wed Apr 25 2007 Chuck Ebbert <cebbert at redhat.com>		1.2946
- 2.6.20.8
  Patch taken from mailing list, not available elsewhere.


linux-2.6-20.8-unofficial.patch:
 Makefile                |    2 +-
 net/ipv4/fib_frontend.c |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-20.8-unofficial.patch ---
diff --git a/Makefile b/Makefile
index bc99522..f3539e8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 20
-EXTRAVERSION = .7
+EXTRAVERSION = .8
 NAME = Homicidal Dwarf Hamster
 
 # *DOCUMENTATION*
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index d47b72a..fa2cb8c 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -772,6 +772,8 @@ static void nl_fib_lookup(struct fib_result_nl *frn, struct fib_table *tb )
 				       .nl_u = { .ip4_u = { .daddr = frn->fl_addr,
 							    .tos = frn->fl_tos,
 							    .scope = frn->fl_scope } } };
+
+	frn->err = -ENOENT;
 	if (tb) {
 		local_bh_disable();
 
@@ -783,6 +785,7 @@ static void nl_fib_lookup(struct fib_result_nl *frn, struct fib_table *tb )
 			frn->nh_sel = res.nh_sel;
 			frn->type = res.type;
 			frn->scope = res.scope;
+			fib_res_put(&res);
 		}
 		local_bh_enable();
 	}
@@ -797,6 +800,9 @@ static void nl_fib_input(struct sock *sk, int len)
 	struct fib_table *tb;
 	
 	skb = skb_dequeue(&sk->sk_receive_queue);
+	if (skb == NULL)
+		return;
+
 	nlh = (struct nlmsghdr *)skb->data;
 	if (skb->len < NLMSG_SPACE(0) || skb->len < nlh->nlmsg_len ||
 	    nlh->nlmsg_len < NLMSG_LENGTH(sizeof(*frn))) {
@@ -809,7 +815,7 @@ static void nl_fib_input(struct sock *sk, int len)
 
 	nl_fib_lookup(frn, tb);
 	
-	pid = nlh->nlmsg_pid;           /*pid of sending process */
+	pid = NETLINK_CB(skb).pid;       /* pid of sending process */
 	NETLINK_CB(skb).pid = 0;         /* from kernel */
 	NETLINK_CB(skb).dst_group = 0;  /* unicast */
 	netlink_unicast(sk, skb, pid, MSG_DONTWAIT);


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2945
retrieving revision 1.2946
diff -u -r1.2945 -r1.2946
--- kernel-2.6.spec	17 Apr 2007 22:17:22 -0000	1.2945
+++ kernel-2.6.spec	25 Apr 2007 21:40:22 -0000	1.2946
@@ -377,6 +377,7 @@
 Patch5: patch-2.6.20.4-5.bz2
 Patch6: patch-2.6.20.5-6.bz2
 Patch7: patch-2.6.20.6-7.bz2
+Patch8: linux-2.6-20.8-unofficial.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 # needed to get utrace patch to apply cleanly
@@ -1021,6 +1022,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
@@ -2288,6 +2290,10 @@
 %endif
 
 %changelog
+* Wed Apr 25 2007 Chuck Ebbert <cebbert at redhat.com>		1.2946
+- 2.6.20.8
+  Patch taken from mailing list, not available elsewhere.
+
 * Tue Apr 17 2007 Chuck Ebbert <cebbert at redhat.com>		1.2945
 - 2.6.20.7
 



From fedora-cvs-commits at redhat.com  Wed Apr 25 23:54:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 19:54:18 -0400
Subject: rpms/jakarta-commons-discovery/devel jakarta-commons-discovery.spec,
	1.11, 1.12
Message-ID: <200704252354.l3PNsIlL013425@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-discovery/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13406

Modified Files:
	jakarta-commons-discovery.spec 
Log Message:
Merge with latest jpp version
fix rpmlint isuses



Index: jakarta-commons-discovery.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-discovery/devel/jakarta-commons-discovery.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jakarta-commons-discovery.spec	10 Aug 2006 19:26:52 -0000	1.11
+++ jakarta-commons-discovery.spec	25 Apr 2007 23:54:16 -0000	1.12
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,8 +37,8 @@
 
 Summary:        Jakarta Commons Discovery
 Name:           jakarta-commons-discovery
-Version:        0.3
-Release:        4jpp.1
+Version:        0.4
+Release:        2jpp.1%{?dist}
 Epoch:          1
 Group:          Development/Libraries/Java
 License:        Apache Software License
@@ -46,17 +46,19 @@
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
-Source0:        http://www.apache.org/dist/jakarta/commons/discovery/source/commonsdiscovery0.3src.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:  ant, jpackage-utils >= 0:1.5
+Source0:        http://www.apache.org/dist/jakarta/commons/discovery/source/commons-discovery-0.4-src.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  jpackage-utils >= 0:1.6
+BuildRequires:  ant
+BuildRequires:  ant-nodeps
 BuildRequires:  junit >= 0:3.7
-BuildRequires:  jakarta-commons-logging >= 0:1.0.1
-Requires:       jakarta-commons-logging >= 0:1.0.1
+BuildRequires:  jakarta-commons-logging >= 0:1.0.4
+Requires:       jakarta-commons-logging >= 0:1.0.4
 
 %if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
+BuildRequires:          java-gcj-compat-devel
+Requires(post):         java-gcj-compat
+Requires(postun):       java-gcj-compat
 %endif
 
 %description
@@ -81,12 +83,9 @@
 # -----------------------------------------------------------------------------
 
 %prep
-%setup -q -n commons-discovery-%{version}
+%setup -q -n commons-discovery-%{version}-src
 chmod u+w .
 
-# No NOTICE.txt file in the sources
-touch NOTICE.txt 
-
 # -----------------------------------------------------------------------------
 
 %build
@@ -108,7 +107,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
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} 
 
 # -----------------------------------------------------------------------------
 
@@ -120,25 +119,17 @@
 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}
+%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
@@ -148,20 +139,36 @@
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt
+%doc NOTICE.txt
+%doc RELEASE-NOTES.txt
 %{_javadir}/*
 
 %if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-discovery-0.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-discovery-0.4.jar.*
 %endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%doc %{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
 
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Mar 21 2007 Matt Wringe <mwringe at redhat.com> - 1:0.4-2jpp.1
+- Merge with latest jpp version
+- fix rpmlint isuses
+
+* Sat Feb 17 2007 Fernando Nasser <fnasser at redhat.com> - 1:0.4-2jpp
+- Remove distribution and vendor tags
+- Fix empty post postun messages
+- Use spaces and no tabs all over
+
+* Sat Feb 17 2007 Fernando Nasser <fnasser at redhat.com> - 1:0.4-1jpp
+- Upgrade to 0.4
+- New license is ASL 2
+- Add NOTICE.txt real file
+
 * 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
@@ -186,12 +193,12 @@
 * Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 1:0.2-2jpp
 - Rebuild with ant-1.6.2
 
-* Thu Apr 17 2003 Ville Skytt? <ville.skytta at iki.fi> - 1:0.2-1jpp
+* Thu Apr 17 2003 Ville Skytt?? <ville.skytta at iki.fi> - 1:0.2-1jpp
 - Update to 0.2 and JPackage 1.5.
 
-* Fri Sep 13 2002 Ville Skytt? <ville.skytta at iki.fi> 1:0.1-1jpp
+* Fri Sep 13 2002 Ville Skytt?? <ville.skytta at iki.fi> 1:0.1-1jpp
 - 0.1.
 
-* Sat Sep  7 2002 Ville Skytt? <ville.skytta at iki.fi> 1.0-0.rc1.1jpp
+* Sat Sep  7 2002 Ville Skytt?? <ville.skytta at iki.fi> 1.0-0.rc1.1jpp
 - First JPackage release.
 



From fedora-cvs-commits at redhat.com  Wed Apr 25 23:57:44 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 19:57:44 -0400
Subject: rpms/jakarta-commons-discovery/devel .cvsignore, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200704252357.l3PNviqA013626@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-discovery/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13598

Modified Files:
	.cvsignore sources 
Log Message:
Updated sources



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-discovery/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Jun 2005 15:55:42 -0000	1.3
+++ .cvsignore	25 Apr 2007 23:57:42 -0000	1.4
@@ -1,4 +1 @@
-commonsdiscovery0.3src.tar.gz
-commons-discovery-0.3
-noarch
-*.src.rpm
+commons-discovery-0.4-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-discovery/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Jun 2005 15:55:42 -0000	1.3
+++ sources	25 Apr 2007 23:57:42 -0000	1.4
@@ -1 +1 @@
-233726c301278b7ca8baa50eb7b0f582  commonsdiscovery0.3src.tar.gz
+1275ad4c6ce54b9323269e30dc42dd0e  commons-discovery-0.4-src.tar.gz



From fedora-cvs-commits at redhat.com  Wed Apr 25 23:58:02 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 19:58:02 -0400
Subject: rpms/gtk2-engines/devel gtk2-engines.spec,1.63,1.64
Message-ID: <200704252358.l3PNw2Mq013695@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gtk2-engines.spec 
Log Message:
Remove an undefined macro



Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- gtk2-engines.spec	13 Mar 2007 16:43:36 -0000	1.63
+++ gtk2-engines.spec	25 Apr 2007 23:58:00 -0000	1.64
@@ -1,7 +1,7 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
 Version:        2.10.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:        GPL
 Group:          System Environment/Libraries
 Source:         http://ftp.gnome.org/pub/gnome/sources/gtk-engines/2.9/gtk-engines-%{version}.tar.bz2
@@ -9,7 +9,7 @@
 Patch0:		gtk-engines-2.9.4-clearlooks-stepper.patch
 
 Conflicts:  	gnome-themes < 2.9.0
-Obsoletes:      gnome-theme-clearlooks <= %{clearlooks_version}
+Obsoletes:      gnome-theme-clearlooks <= 0.5
 
 Requires:       gtk2 >= 2.9.0
 BuildRequires:  gtk2-devel >= 2.2.0
@@ -66,6 +66,9 @@
 %{_datadir}/gtk-engines
 
 %changelog
+* Wed Apr 25 2007 Matthias Clasen <mclasen at redhat.com> - 2.10.0-2
+- Remove and undefined macro (#237810)
+
 * Tue Mar 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.10.0-1
 - Update to 2.10.0
 



From fedora-cvs-commits at redhat.com  Thu Apr 26 00:05:06 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 20:05:06 -0400
Subject: rpms/libsemanage/devel .cvsignore, 1.75, 1.76 libsemanage.spec,
	1.122, 1.123 sources, 1.77, 1.78
Message-ID: <200704260005.l3Q056uG013927@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libsemanage.spec sources 
Log Message:
* Wed Apr 25 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.3-1
- Upgrade to latest from NSA
	* Fix to libsemanage man patches so whatis will work better from Dan Walsh



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- .cvsignore	25 Apr 2007 15:11:21 -0000	1.75
+++ .cvsignore	26 Apr 2007 00:05:03 -0000	1.76
@@ -81,3 +81,4 @@
 libsemanage-2.0.0.tgz
 libsemanage-2.0.1.tgz
 libsemanage-2.0.2.tgz
+libsemanage-2.0.3.tgz


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- libsemanage.spec	25 Apr 2007 15:11:21 -0000	1.122
+++ libsemanage.spec	26 Apr 2007 00:05:03 -0000	1.123
@@ -2,12 +2,11 @@
 %define libselinuxver 2.0.0-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 2.0.2
+Version: 2.0.3
 Release: 1%{?dist}
 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} swig
@@ -41,7 +40,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
 
 %build
 make clean
@@ -77,6 +75,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 25 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.3-1
+- Upgrade to latest from NSA
+	* Fix to libsemanage man patches so whatis will work better from Dan Walsh
+
 * Wed Apr 25 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.2-1
 - Upgrade to latest from NSA
 	* Merged optimizations from Stephen Smalley.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- sources	25 Apr 2007 15:11:21 -0000	1.77
+++ sources	26 Apr 2007 00:05:03 -0000	1.78
@@ -1 +1 @@
-6bb42d180e101aa2f079ac852f611d34  libsemanage-2.0.2.tgz
+2c3e8b1008132a061461c441ffd13f0a  libsemanage-2.0.3.tgz



From fedora-cvs-commits at redhat.com  Thu Apr 26 00:09:24 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 20:09:24 -0400
Subject: rpms/xdoclet/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xdoclet-ant.not-required.patch, 1.3, 1.4 xdoclet.spec,
	1.28, 1.29
Message-ID: <200704260009.l3Q09OwI014060@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/xdoclet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14046

Modified Files:
	.cvsignore sources xdoclet-ant.not-required.patch xdoclet.spec 
Log Message:
- Merge with newest jpp version
- Fix some rpm lint warnings



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Jul 2006 04:26:35 -0000	1.5
+++ .cvsignore	26 Apr 2007 00:09:22 -0000	1.6
@@ -1,2 +1,2 @@
-xdoclet-src-1.2.3-RHCLEAN.tgz
+xdoclet-src-1.2.3.tgz
 xdoclet-modules-objectweb-4.6.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Jul 2006 04:26:35 -0000	1.5
+++ sources	26 Apr 2007 00:09:22 -0000	1.6
@@ -1,2 +1,2 @@
-cd3e46f6470bba5f786e0d5555e252f8  xdoclet-src-1.2.3-RHCLEAN.tgz
+9e1a2856e03b338b505a086b962a77ab  xdoclet-src-1.2.3.tgz
 a4bf2dddfcc204f538dfc633f0aeed30  xdoclet-modules-objectweb-4.6.tgz

xdoclet-ant.not-required.patch:
 core/src/xdoclet/TemplateSubTask.java                                        |    8 ++++----
 core/src/xdoclet/XmlSubTask.java                                             |    4 ++--
 modules/apache/src/xdoclet/modules/apache/struts/StrutsConfigXmlSubTask.java |    2 +-
 modules/ejb/src/xdoclet/modules/ejb/EjbDocletTask.java                       |    4 ++--
 modules/ejb/src/xdoclet/modules/ejb/entity/DataObjectSubTask.java            |    2 +-
 modules/ejb/src/xdoclet/modules/ejb/entity/ValueObjectSubTask.java           |    2 +-
 modules/hibernate/src/xdoclet/modules/hibernate/HibernateSubTask.java        |    2 +-
 modules/hp/src/xdoclet/modules/hp/hpas/ejb/HPASSubTask.java                  |   10 +++++-----
 modules/libelis/src/xdoclet/modules/libelis/jdo/LidoSubTask.java             |    2 +-
 modules/mvcsoft/src/xdoclet/modules/mvcsoft/ejb/MVCSoftSubTask.java          |    4 ++--
 modules/solarmetric/src/xdoclet/modules/solarmetric/jdo/KodoSubTask.java     |    2 +-
 modules/sun/src/xdoclet/modules/sun/sunone/ejb/SunONESubTask.java            |    6 +++---
 modules/tjdo/src/xdoclet/modules/triactive/jdo/TJDOSubTask.java              |    2 +-
 13 files changed, 25 insertions(+), 25 deletions(-)

Index: xdoclet-ant.not-required.patch
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/xdoclet-ant.not-required.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xdoclet-ant.not-required.patch	23 Jul 2006 05:33:03 -0000	1.3
+++ xdoclet-ant.not-required.patch	26 Apr 2007 00:09:22 -0000	1.4
@@ -191,28 +191,6 @@
       */
      public void setLoggingtype(String loggingType)
      {
---- modules/objectweb/src/xdoclet/modules/objectweb/jonas/ejb/JonasSubTask.java.orig	2004-06-30 20:49:02.000000000 +0200
-+++ modules/objectweb/src/xdoclet/modules/objectweb/jonas/ejb/JonasSubTask.java	2004-06-30 20:39:18.000000000 +0200
-@@ -228,7 +228,7 @@
-      * Sets the version of JOnAS. Supported versions are: 2.3, 2.4, 2.5, 2.6, 3.0, 3.2, 3.3.2, 4.0, 4.2, 4.6
-      *
-      * @param version      The new version value. Supported versions are: 2.3, 2.4, 2.5, 2.6, 3.0, 3.2, 3.3.2, 4.0, 4.2, 4.6
--     * @ant.not-required   No, default is "2.6".
-+     * @ant.not-required   "No, default is '2.6'."
-      */
-     public void setVersion(JonasVersionTypes version)
-     {
---- modules/objectweb/src/xdoclet/modules/objectweb/jonas/web/JonasWebSubTask.java.orig	2004-06-30 20:49:02.000000000 +0200
-+++ modules/objectweb/src/xdoclet/modules/objectweb/jonas/web/JonasWebSubTask.java	2004-06-30 20:39:43.000000000 +0200
-@@ -127,7 +127,7 @@
-      * Sets the version of JOnAS. Supported versions are: 2.6.
-      *
-      * @param version      The new version value. Supported versions are: 2.6.
--     * @ant.not-required   No, default is "2.6".
-+     * @ant.not-required   "No, default is '2.6'."
-      */
-     public void setVersion(JonasVersionTypes version)
-     {
 --- modules/solarmetric/src/xdoclet/modules/solarmetric/jdo/KodoSubTask.java.orig	2004-06-30 20:49:02.000000000 +0200
 +++ modules/solarmetric/src/xdoclet/modules/solarmetric/jdo/KodoSubTask.java	2004-06-30 20:40:02.000000000 +0200
 @@ -63,7 +63,7 @@


Index: xdoclet.spec
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/xdoclet.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xdoclet.spec	11 Apr 2007 13:26:59 -0000	1.28
+++ xdoclet.spec	26 Apr 2007 00:09:22 -0000	1.29
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -29,45 +29,52 @@
 #
 
 %define _with_gcj_support 1
+%define _without_maven 1
 
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
-%define section free
+# If you don't want to build with maven, and use straight ant instead,
+# give rpmbuild option '--without maven'
+%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
+%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
 
-# FIXME: JPP 1.7 lacks webwork and xwork, needed for the demo
+# FIXME: Fedora lacks webwork and xwork, needed for the demo
 %define _without_demo 1
 
 # If you do not want to build samples in demo subpackage because of their 
 # runtime deps, give rpmbuild option '--without demo'
 %define with_demo %{!?_without_demo:1}%{?_without_demo:0}
 
-Name:		xdoclet
-Version:	1.2.3
-Release:	7jpp.3
-Epoch:		0
-Summary:	XDoclet Attribute Orientated Programming Framework
-License:	XDoclet Open Source Licence
-Group:		Development/Framework
-URL:		http://xdoclet.sourceforge.net
-Source0:	%{name}-src-%{version}-RHCLEAN.tgz
-Source1:	%{name}-modules-objectweb-4.6.tgz
-Patch0:		xdoclet-build_xml.patch
-Patch1:		xdoclet-XDocletModulesEjbMessages.patch
-Patch2:		xdoclet-ant.not-required.patch
-Patch3:		xdoclet-WebLogicSubTask.patch
-Patch4:		xdoclet-project_xml.patch
-Patch5:		xdoclet-AbstractProgramElementTagsHandler.patch
-Patch6:		xdoclet-build_docs_xml.patch
+Name:           xdoclet
+Version:        1.2.3
+Release:        8jpp.1%{?dist}
+Epoch:          0
+Summary:        XDoclet Attribute Orientated Programming Framework
+License:        BSD Style       
+Group:          Development/Framework
+URL:            http://xdoclet.sourceforge.net
+Source0:        http://superb-east.dl.sourceforge.net/sourceforge/xdoclet/xdoclet-src-1.2.3.tgz 
+#Source1:        %{name}-modules-objectweb-4.6.tgz
+Patch0:         xdoclet-build_xml.patch
+Patch1:         xdoclet-XDocletModulesEjbMessages.patch
+Patch2:         xdoclet-ant.not-required.patch
+Patch3:         xdoclet-WebLogicSubTask.patch
+Patch4:         xdoclet-project_xml.patch
+Patch5:         xdoclet-AbstractProgramElementTagsHandler.patch
+Patch6:         xdoclet-build_docs_xml.patch
 
 %if ! %{gcj_support}
-BuildArch:	noarch
+BuildArch:      noarch
 %endif
-BuildRoot: 	%{_tmppath}/%{name}-root
+BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  java-devel >= 0:1.4.2
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-nodeps >= 0:1.5
-BuildRequires:	ant-trax
+BuildRequires:  ant-trax
+%if %{with_maven}
+BuildRequires:  maven >= 0:1.1
+%endif
 BuildRequires:  junit
 BuildRequires:  javacc
 BuildRequires:  jrefactory
@@ -75,6 +82,7 @@
 BuildRequires:  jakarta-commons-collections 
 BuildRequires:  jakarta-commons-lang 
 BuildRequires:  jakarta-commons-logging 
+#BuildRequires:  jakarta-commons-net 
 BuildRequires:  log4j
 BuildRequires:  struts 
 BuildRequires:  velocity 
@@ -92,9 +100,9 @@
 Requires:  xjavadoc = 0:1.1
 
 %if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
+BuildRequires:          java-gcj-compat-devel
+Requires(post):         java-gcj-compat
+Requires(postun):       java-gcj-compat
 %endif
 
 %description
@@ -102,8 +110,8 @@
 
 %if %{with_demo}
 %package demo
-Summary:	XDoclet Sample Projects
-Group:		Development/Framework
+Summary:        XDoclet Sample Projects
+Group:          Development/Framework
 BuildRequires:  servletapi4
 BuildRequires:  struts
 BuildRequires:  velocity
@@ -127,64 +135,76 @@
 This package contains sample XDoclet projects.
 %endif
 
+%if %{with_maven}
+%package maven-plugin
+Summary:        XDoclet Maven Plugin
+Group:          Development/Framework
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       maven >= 0:1.1
+
+%description maven-plugin
+%{summary}.
+%endif
+
 %package javadoc
-Summary:	XDoclet Javadoc
-Group:		Development/Documentation
-Requires(post): /bin/rm /bin/ln
-Requires(postun): /bin/rm
+Summary:        XDoclet Javadoc
+Group:          Development/Documentation
 
 %description javadoc
 This package contains XDoclet javadoc
 
 %package manual
-Summary:	XDoclet Sample Manuals and Documentation
-Group:		Development/Documentation
+Summary:        XDoclet Sample Manuals and Documentation
+Group:          Development/Documentation
 
 %description manual
 This package contains XDoclet documentation.
 
 %prep
 %setup -q
-#find . -name "*.jar" -exec rm {} \;
-for j in $(find . -name "*.jar"); do
-    mv $j $j.no
-done
+# Remove binary information in the source tar
+find . -name "*.jar" -exec rm {} \;
+find . -name "*.class" -exec rm {} \;
 
 # Replace JOnAS specific tasks with code blessed by ObjectWeb
-pushd modules
-mv objectweb objectweb.orig
-tar xzf %{SOURCE1}
-popd
+#pushd modules
+#mv objectweb objectweb.orig
+#tar xzf %{SOURCE1}
+#popd
 
 # Remove mockobjects support.
 rm -rf modules/mockobjects
 
 for j in xjavadoc-1.1 jrefactory javacc junit bsf commons-collections commons-logging log4j velocity xalan-j2 xjavadoc xml-commons-apis; do
-	ln -s $(build-classpath $j) lib
+        ln -s $(build-classpath $j) lib
 done
 
 %if %{with_demo}
 for j in servletapi4 struts velocity webwork-migration xwork geronimo-ejb-2.1-api myfaces/myfaces-jsf-api geronimo-jms-1.1-api; do
-	ln -s $(build-classpath $j) samples/lib
+        ln -s $(build-classpath $j) samples/lib
 done
 for j in mx4j/mx4j-jmx mx4j/mx4j-tools; do
         i=$(build-classpath $j)
-	ln -s $(build-classpath $j) samples/lib
+        ln -s $(build-classpath $j) samples/lib
 done
 %endif
 
 %patch0 -b .sav
 %patch1 -b .sav
-%patch2
+%patch2 
 %patch3 -b .sav
 %patch4 -b .sav
 %patch5 -b .sav
 %patch6 -b .sav
 
 %build
-export OPT_JAR_LIST="ant/ant-nodeps jrefactory jaxp_transform_impl ant/ant-trax"
-ant xjavadoc core modules docs l10n
-
+export MAVEN_HOME=/usr/share/maven
+export MAVEN_LOCAL_HOME=$(pwd)/.maven
+%if %{with_maven}
+ant -Dbuild.sysclasspath=first core modules maven docs l10n
+%else
+ant -Dbuild.sysclasspath=first core modules docs l10n
+%endif
 %if %{with_demo}
 ant samples
 %endif
@@ -193,6 +213,9 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
 install -m 644 target/lib/xdoclet*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}
+%if %{with_maven}
+install -m 644 target/lib/maven-xdoclet*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}
+%endif
 (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
 %if %{with_demo}
@@ -207,34 +230,25 @@
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 cp -p LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} 
 
 %if %{gcj_support}
-%{_bindir}/aot-compile-rpm
+%{_bindir}/aot-compile-rpm 
 %endif
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && 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}
+%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
@@ -243,10 +257,12 @@
 
 %files
 %defattr(-, root, root, -)
-%{_javadir}/%{name}
-#%doc %{_docdir}/%{name}-%{version}/LICENSE.txt
+%dir %{_javadir}/%{name}
+%{_javadir}/%{name}/%{name}*.jar
+%doc %{_docdir}/%{name}-%{version}/LICENSE.txt
 
 %if %{gcj_support}
+%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-1.2.3.jar.*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-apache-module-1.2.3.jar.*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-bea-module-1.2.3.jar.*
@@ -283,6 +299,12 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-xdoclet-module-1.2.3.jar.*
 %endif
 
+%if %{with_maven}
+%files maven-plugin
+%defattr(-, root, root, -)
+%{_javadir}/%{name}/maven-%{name}*.jar
+%endif
+
 %if %{with_demo}
 %files demo
 %defattr(-, root, root, -)
@@ -292,16 +314,27 @@
 %files javadoc
 %defattr(-, root, root, -)
 %doc %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%doc %{_javadocdir}/%{name}
 
 %files manual
 %defattr(-, root, root, -)
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Wed Apr 25 2007 Matt Wringe <mwringe at redhat.com> - 0:1.2.3-8jpp.1
+- Merge with newest jpp version
+- Fix some rpm lint warnings
+
 * Tue Apr 11 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.2.3-7jpp.3
 - Remove mockobjects requirements.
 
+* Wed Mar 07 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2.3-8jpp
+- Optionally build without maven
+- Separate out maven-xdoclet-plugin into own subpackage
+- Reactivate demo, now that webwork and xwork are available
+- No native xdoclet-maven-plugin
+
+
 * Fri Aug 04 2006 Matt Wringe <mwringe at redhat.com> - 0:1.2.3-7jpp.2
 - Rebuild with define with_gcj_support
 
@@ -328,7 +361,7 @@
 * Sat Jul 22 2006 Matt Wringe <mringe at redhat.com> - 0:1.2.3-6jpp
 - Add conditional native compiling
 - Add missing buildrequires: ant-nodeps and ant-trax
-- Add missing javadoc %ghost symlink
+- Add missing javadoc %%ghost symlink
 
 * Thu Jun 08 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.2.3-5jpp
 - Update objectweb module to match JOnAS 4.6.x



From fedora-cvs-commits at redhat.com  Thu Apr 26 00:16:29 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 20:16:29 -0400
Subject: rpms/puretls/devel puretls-demo-README, NONE, 1.1 puretls.spec, 1.14,
	1.15
Message-ID: <200704260016.l3Q0GT2x014224@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/puretls/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14210

Modified Files:
	puretls.spec 
Added Files:
	puretls-demo-README 
Log Message:
Merge with latest jpp version



--- NEW FILE puretls-demo-README ---
RUNNING DEMO PROGRAMS
To run the demos use the following commands:
        java COM.claymoresystems.ptls.demo.SSLServer -f -D dh1024.pem
the -f tells it to seed the PRNG with zeros for faster startup
(but zero security)
the -D tells it to use dh1024.pem for it's DH params instead of
generating them on the fly.

and in a different shell, execute:
        java COM.claymoresystems.ptls.demo.SSLClient

NOTE: you will most likely have to setup your classpath variable to include
the cryptix, cryptix-asn1, gnu-getopt and the puretls jar (both the main
puretls and the puretls demo jar).

If all goes well, you should see (in the window in which
you ran SSLClient):
        Cipher suite: TLS_DHE_DSS_WITH_DES_CBC_SHA
        Cert chain
        Issuer C=US,ST=California,O=Claymore Systems, Inc.,CN=Test CA
        Subject C=US,ST=California,O=Claymore Systems, Inc.,CN=Test CA
        Serial 0
        Validity Tue Jun 22 18:07:17 GMT 1999-Thu Jul 22 18:07:17 GMT 1999
        Issuer C=US,ST=California,O=Claymore Systems, Inc.,CN=Test CA
        Subject C=US,ST=California,O=Claymore Systems, Inc.,CN=Test Server
        Serial 6
        Validity Tue Jun 22 18:08:24 GMT 1999-Wed Jun 21 18:08:24 GMT 2000
        HTTP/1.0 200 OK
        Server: PureTLS Demo Server

        Success!

And in the window in which you ran SSLServer:
        Accepted connection




Index: puretls.spec
===================================================================
RCS file: /cvs/dist/rpms/puretls/devel/puretls.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- puretls.spec	10 Aug 2006 21:02:27 -0000	1.14
+++ puretls.spec	26 Apr 2007 00:16:26 -0000	1.15
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -32,68 +32,67 @@
 
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
-%define beta		b5
+%define beta            b5
 
-%define section		free
-
-Name:		puretls
-Version:	0.9
-Release:	0.%{beta}.4jpp.1
-Summary:	Java implementation of SSLv3 and TLSv1
-License:	BSD style
-Group:		Development/Libraries/Java
-Source0:	%{name}-%{version}%{beta}.tar.gz
-Url:		http://www.rtfm.com/puretls
-Requires:	cryptix
-Requires:	cryptix-asn1
-BuildRequires:	ant
-BuildRequires:	cryptix
-BuildRequires:	cryptix-asn1
-BuildRequires:	gnu.getopt
+Name:           puretls
+Version:        0.9
+Release:        0.1.%{beta}.5jpp.1%{?dist}
+Summary:        Java implementation of SSLv3 and TLSv1
+License:        BSD style
+Group:          Development/Libraries/Java
+Source0:        puretls-0.9b5.tar.gz
+#http://www.rtfm.com/cgi-bin/distrib.cgi?puretls-0.9b5.tar.gz
+#note: rpm cannot handle the url properly since it gets the file using cgi
+Url:            http://www.rtfm.com/puretls
+Source1:        puretls-demo-README
+# source1 is the part of the INSTALL that explains how to use the demo
+Patch0:         puretls-build_xml.patch
+Requires:       cryptix
+Requires:       cryptix-asn1
+BuildRequires:  ant
+BuildRequires:  cryptix
+BuildRequires:  cryptix-asn1
+BuildRequires:  gnu.getopt
 BuildRequires:  java-devel >= 1.4.0
 %if ! %{gcj_support}
-Buildarch:	noarch
+Buildarch:      noarch
 %endif
-Buildroot:	%{_tmppath}/%{name}-%{version}-buildroot
+Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
+BuildRequires:          java-gcj-compat-devel
+Requires(post):         java-gcj-compat
+Requires(postun):       java-gcj-compat
 %endif
 
 %description
 PureTLS is a free Java-only implementation of the SSLv3 and TLSv1
-(RFC2246) protocols. PureTLS was developed by Eric Rescorla for Claymore
-Systems, Inc, but is being distributed for free because we believe that
-basic network security is a public good and should be a commodity.
+(RFC2246) protocols.
 
 %package javadoc
-Group:	Development/Libraries/Java
-Summary:	Javadoc for %{name}
-Requires(post): /bin/rm /bin/ln
-Requires(postun): /bin/rm
+Group:  Development/Libraries/Java
+Summary:        Javadoc for %{name}
 
 %description javadoc
 Javadoc for %{name}.
 
 %package demo
-Group:	Development/Libraries/Java
-Summary:	Demo for %{name}
-Requires:	%{name}
+Group:  Development/Libraries/Java
+Summary:        Demo for %{name}
+Requires:       %{name}
 
 %if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
+BuildRequires:          java-gcj-compat-devel
+Requires(post):         java-gcj-compat
+Requires(postun):       java-gcj-compat
 %endif
 
 %description demo
 Demo for %{name}.
 
 %prep
-rm -rf $RPM_BUILD_ROOT
 %setup -q -n %{name}-%{version}%{beta}
+%patch0
 # fix perl location
 find . -type f |
     xargs grep -l "/usr/local/bin/perl5" | \
@@ -116,15 +115,16 @@
 mkdir dist
 
 for javaver in 1.4 ; do
-	export JAVA_HOME=$(find /usr/lib/jvm -name "java-$javaver*" -type d | sort | tail -1)
-	export CLASSPATH=$(build-classpath cryptix cryptix-asn1 gnu.getopt)
-	ant -Djdk.version=$javaver clean compile
+        export JAVA_HOME=$(find %{_jvmdir} -name "java-$javaver*" -type d | sort | tail -1)
+        export CLASSPATH=$(build-classpath cryptix cryptix-asn1 gnu.getopt)
+        ant -Djdk.version=$javaver clean compile
         mv build/%{name}.jar dist/%{name}$javaver.jar
 done
 
 ant javadoc
 
 %install
+rm -rf $RPM_BUILD_ROOT
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}-ext
@@ -136,14 +136,15 @@
 
 # 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
+cp -pr build/doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} 
 
 # data
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -m 644 build/%{name}demo.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-demo.jar
-install -m 644 *.pem $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -m 755 test.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-demo-%{version}
+install -m 644 build/%{name}demo.jar $RPM_BUILD_ROOT%{_datadir}/%{name}-demo-%{version}/%{name}-demo.jar
+install -m 644 *.pem $RPM_BUILD_ROOT%{_datadir}/%{name}-demo-%{version}
+install -m 755 test.pl $RPM_BUILD_ROOT%{_datadir}/%{name}-demo-%{version}
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}-demo-%{version}/README
 
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
@@ -152,42 +153,32 @@
 %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}
+%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
 fi
 %endif
 
-%post demo
 %if %{gcj_support}
+%post demo
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%postun demo
 %if %{gcj_support}
+%postun demo
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -196,7 +187,7 @@
 
 %files
 %defattr(-,root,root)
-%doc ChangeLog COPYRIGHT INSTALL LICENSE README
+%doc ChangeLog COPYRIGHT LICENSE README
 %{_javadir}-*/*.jar
 
 
@@ -206,19 +197,29 @@
 
 %files javadoc
 %defattr(-,root,root)
-%{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%doc %{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
 
 %files demo
 %defattr(-,root,root)
-%{_datadir}/%{name}
+%{_datadir}/%{name}-demo-%{version}
+%doc %{_datadir}/%{name}-demo-%{version}/README
 
-# FIX ME: its building with an empty demo jar
-#%if %{gcj_support}
-#%attr(-,root,root) %{_libdir}/gcj/%{name}/puretls-demo.jar.*
-#%endif
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/puretls-demo.jar.*
+%endif
 
 %changelog
+* Thu Mar 22 2007 Matt Wringe <mwringe at redhat.com> - 0.9-0.1.b5.5jpp.1
+- Merge with latest jpp version
+
+* Thu Mar 22 2007 Matt Wringe <mwringe at redhat.com> - 0.9-0.b5.5jpp
+- Add patch to build.xml to allow detection of gnugetopt so that
+  the demo subpackage jar is not empty
+- Fix some rpmlint issues
+- Update copyright year
+- Remove vendor and distribution tags
+
 * 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



From fedora-cvs-commits at redhat.com  Thu Apr 26 00:19:40 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 20:19:40 -0400
Subject: rpms/jakarta-commons-codec/devel .cvsignore, 1.3,
	1.4 jakarta-commons-codec-1.3-buildscript.patch, 1.2,
	1.3 jakarta-commons-codec.spec, 1.16, 1.17 sources, 1.2, 1.3
Message-ID: <200704260019.l3Q0JewQ014378@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-codec/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14361

Modified Files:
	.cvsignore jakarta-commons-codec-1.3-buildscript.patch 
	jakarta-commons-codec.spec sources 
Log Message:
Update to latest jpp version
Fix rpmlint issues



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-codec/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Jun 2005 16:59:09 -0000	1.3
+++ .cvsignore	26 Apr 2007 00:19:38 -0000	1.4
@@ -1,4 +1 @@
 commons-codec-1.3-src.tar.gz
-jakarta-commons-codec-1.3
-noarch
-*.src.rpm

jakarta-commons-codec-1.3-buildscript.patch:
 build.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: jakarta-commons-codec-1.3-buildscript.patch
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-codec/devel/jakarta-commons-codec-1.3-buildscript.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jakarta-commons-codec-1.3-buildscript.patch	26 Sep 2006 14:17:14 -0000	1.2
+++ jakarta-commons-codec-1.3-buildscript.patch	26 Apr 2007 00:19:38 -0000	1.3
@@ -1,20 +1,20 @@
---- jakarta-commons-codec-1.3/build.xml.orig	2006-09-25 21:21:10.000000000 -0400
-+++ jakarta-commons-codec-1.3/build.xml	2006-09-25 21:27:04.000000000 -0400
+--- jakarta-commons-codec-1.3/build.xml.orig	2007-04-10 14:07:43.000000000 -0400
++++ jakarta-commons-codec-1.3/build.xml	2007-04-10 14:08:33.000000000 -0400
 @@ -84,7 +84,7 @@
-         	windowtitle="${component.title} (Version ${component.version})" 
-         	bottom="${component.name} version ${component.version} - Copyright &amp;copy; 2002-2004 - Apache Software Foundation" 
-         	use="true" 
--        	link="http://java.sun.com/products/jdk/1.3/docs/api/">
-+        	link="file:///usr/share/javadoc/java">
-             <classpath refid="compile.classpath"/>
-         </javadoc>
-     </target>
+         	windowtitle="${component.title} (Version ${component.version})" 
+         	bottom="${component.name} version ${component.version} - Copyright &amp;copy; 2002-2004 - Apache Software Foundation" 
+         	use="true" 
+-        	link="http://java.sun.com/products/jdk/1.3/docs/api/">
++        	link="file:///usr/share/javadoc/java">
+             <classpath refid="compile.classpath"/>
+         </javadoc>
+     </target>
 @@ -177,7 +177,7 @@
-     <!-- Run all the JUnit Tests -->
-     <target name="test" depends="compile.tests" description="Compiles and runs unit test cases">
-         <record name="${build.home}/test-output.txt" append="no" action="start"/>
--        <junit printsummary="yes" haltonfailure="yes">
-+        <junit printsummary="yes" haltonfailure="no">
-             <classpath refid="test.classpath"/>
-             <formatter type="plain"/>
-             <batchtest fork="yes" todir="${build.home}/test-reports">
+     <!-- Run all the JUnit Tests -->
+     <target name="test" depends="compile.tests" description="Compiles and runs unit test cases">
+         <record name="${build.home}/test-output.txt" append="no" action="start"/>
+-        <junit printsummary="yes" haltonfailure="yes">
++        <junit printsummary="yes" haltonfailure="no">
+             <classpath refid="test.classpath"/>
+             <formatter type="plain"/>
+             <batchtest fork="yes" todir="${build.home}/test-reports">


Index: jakarta-commons-codec.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-codec/devel/jakarta-commons-codec.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jakarta-commons-codec.spec	1 Oct 2006 21:17:16 -0000	1.16
+++ jakarta-commons-codec.spec	26 Apr 2007 00:19:38 -0000	1.17
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -38,14 +38,18 @@
 
 Name:           jakarta-commons-codec
 Version:        1.3
-Release:        7jpp.2
-Summary:        Jakarta Commons Codec Package
+Release:        8jpp.1%{?dist}
+Summary:        Implementations of common encoders and decoders
 License:        Apache Software License
 Group:          Development/Libraries/Java
 Epoch:          0
 URL:            http://jakarta.apache.org/commons/codec/
-Source0:        http://www.apache.org/dist/jakarta/commons/codec/source/commons-codec-%{version}-src.tar.gz
-Patch0:		jakarta-commons-codec-1.3-buildscript.patch
+Source0:        commons-codec-%{version}-src.tar.gz
+# svn export http://svn.apache.org/repos/asf/jakarta/commons/proper/codec/tags/CODEC_1_3/
+# cd CODEC_1_3
+# tar czvf commons-codec-1.3-src.tar.gz .
+
+Patch0:         jakarta-commons-codec-1.3-buildscript.patch
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant >= 0:1.6.2
 BuildRequires:  ant-junit
@@ -54,26 +58,25 @@
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Provides:       %{short_name}
-Obsoletes:      %{short_name}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Provides:       %{short_name} = %{epoch}:%{version}-%{release}
+Obsoletes:      %{short_name} <= %{epoch}:%{version}-%{release}
 
 %if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
+BuildRequires:          java-gcj-compat-devel
+Requires(post):         java-gcj-compat
+Requires(postun):       java-gcj-compat
 %endif
 
 %description
 Commons Codec is an attempt to provide definitive implementations of
-commonly used encoders and decoders.
+commonly used encoders and decoders. Examples include Base64, Hex,
+Phonetic and URLs.
 
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 Requires:       java-javadoc
-Requires(post): /bin/rm /bin/ln
-Requires(postun): /bin/rm
 
 %description    javadoc
 Javadoc for %{name}.
@@ -88,6 +91,10 @@
 # This problem has been communicated upstream Bug 31096
 %patch0 -p1
 
+#fixes eof encoding
+%{__sed} -i 's/\r//' LICENSE.txt
+%{__sed} -i 's/\r//' RELEASE-NOTES.txt
+
 # -----------------------------------------------------------------------------
 
 %build
@@ -119,7 +126,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
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # -----------------------------------------------------------------------------
 
@@ -132,25 +139,16 @@
 
 # -----------------------------------------------------------------------------
 
-%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}
+%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
@@ -168,11 +166,19 @@
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%doc %{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Mar 21 2007 Matt Wringe <mwringe at redhat.com> 0:1.3-8jpp.1
+- Update to latest jpp version
+- Fix rpmlint issues
+
+* Wed Mar 21 2007 Matt Wringe <mwringe at redhat.com> 0:1.3-8jpp
+- Fix some rpmlint warnings
+- Update copyright year
+
 * Sun Oct 01 2006 Jesse Keating <jkeating at redhat.com> 0:1.3-7jpp.2
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
@@ -217,5 +223,5 @@
 - 1.2
 - use perl instead of patch
 
-* Wed May 28 2003 Ville Skytt? <jpackage-discuss at zarb.org> - 0:1.1-1jpp
+* Wed May 28 2003 Ville Skytt?? <jpackage-discuss at zarb.org> - 0:1.1-1jpp
 - First JPackage release.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-codec/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 May 2005 15:43:54 -0000	1.2
+++ sources	26 Apr 2007 00:19:38 -0000	1.3
@@ -1 +1 @@
-ac19a5dc22b1293b39d0445ad08c4ce7  commons-codec-1.3-src.tar.gz
+79e00c8738aa947f0c2a068301eda808  commons-codec-1.3-src.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 26 00:21:34 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 20:21:34 -0400
Subject: rpms/puretls/devel puretls-build_xml.patch,NONE,1.1
Message-ID: <200704260021.l3Q0LYma014485@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/puretls/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14470

Added Files:
	puretls-build_xml.patch 
Log Message:
cvs add puretls-build_xml.patch


puretls-build_xml.patch:
 build.xml |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE puretls-build_xml.patch ---
--- build.xml.orig	2007-03-22 10:07:48.000000000 -0400
+++ build.xml	2007-03-22 10:08:03.000000000 -0400
@@ -32,7 +32,7 @@
     <available property="gnugetopt.present.runtime"
                classname="gnu.getopt.Getopt"/>
     <available property="gnugetopt.present"
-               file="${gnugetopt.cp}/gnu/getopt/Getopt.class"/>
+               classname="gnu.getopt.Getopt"/>
   </target>
 
   <!-- ==================== Report if GNU GetOpt is available ============ -->



From fedora-cvs-commits at redhat.com  Thu Apr 26 00:25:08 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 20:25:08 -0400
Subject: rpms/jakarta-commons-modeler/devel .cvsignore, 1.4,
	1.5 jakarta-commons-modeler.spec, 1.35, 1.36 sources, 1.2, 1.3
Message-ID: <200704260025.l3Q0P8ko014597@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-modeler/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14582

Modified Files:
	.cvsignore jakarta-commons-modeler.spec sources 
Log Message:
Merge with lastest jpp version



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 May 2005 11:15:39 -0000	1.4
+++ .cvsignore	26 Apr 2007 00:25:06 -0000	1.5
@@ -1,4 +1 @@
-modeler-1.1-src.tar.gz
-commons-modeler-1.1-src
-i386
-*.src.rpm
+commons-modeler-2.0-src.tar.gz


Index: jakarta-commons-modeler.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- jakarta-commons-modeler.spec	10 Aug 2006 19:40:02 -0000	1.35
+++ jakarta-commons-modeler.spec	26 Apr 2007 00:25:06 -0000	1.36
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -32,139 +32,167 @@
 
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
-%define base_name	modeler
-%define short_name	commons-%{base_name}
-%define	section		free
-
-Name:		jakarta-%{short_name}
-Version:	1.1
-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
-BuildRequires:	xml-commons-apis
-BuildRequires:	jaxp_transform_impl
-BuildRequires:	jmxri
-BuildRequires:	junit >= 0:3.7
-BuildRequires:	jakarta-commons-beanutils >= 0:1.3
-BuildRequires:	jakarta-commons-collections >= 0:2.0
-BuildRequires:	jakarta-commons-digester >= 0:1.2
-BuildRequires:	jakarta-commons-logging >= 0:1.0
-Requires:	jaxp_parser_impl
-Requires:	xml-commons-apis
-Requires:	jaxp_transform_impl
-Requires:	jmxri
-Requires:	jakarta-commons-beanutils >= 0:1.3
-Requires:	jakarta-commons-collections >= 0:2.0
-Requires:	jakarta-commons-digester >= 0:1.2
-Requires:	jakarta-commons-logging >= 0:1.0
-%if ! %{gcj_support}
-BuildArch:	noarch
-%endif
-BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
-Provides:	%{short_name}
-Obsoletes:	%{short_name}
+%define base_name       modeler
+%define short_name      commons-%{base_name}
+
+Name:       jakarta-%{short_name}
+Epoch:      0
+Version:    2.0
+Release:    3jpp.1%{?dist}
+Summary:    Model MBeans utilty classes
+Group:      Development/Libraries/Java
+License:    Apache Software License
+Url:        http://jakarta.apache.org/commons/%{base_name}
+Source0:    http://www.ibiblio.org/pub/mirrors/apache/jakarta/commons/modeler/source/commons-modeler-2.0-src.tar.gz
+Patch0:     %{name}.build.properties.default.patch
+Patch1:     %{name}.build.xml.patch
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
+BuildRequires:    java-gcj-compat-devel
+Requires(post):   java-gcj-compat
+Requires(postun): java-gcj-compat
+%endif
+BuildRequires:  ant
+BuildRequires:  findutils
+BuildRequires:  jakarta-commons-beanutils >= 0:1.3
+BuildRequires:  jakarta-commons-collections >= 0:2.0
+BuildRequires:  jakarta-commons-digester >= 0:1.2
+BuildRequires:  jakarta-commons-logging >= 0:1.0
+BuildRequires:  jaxp_parser_impl
+BuildRequires:  jaxp_transform_impl
+BuildRequires:  jmxri
+BuildRequires:  junit >= 0:3.7
+BuildRequires:  xml-commons-apis >= 1.3
+Requires:       jakarta-commons-beanutils >= 0:1.3
+Requires:       jakarta-commons-collections >= 0:2.0
+Requires:       jakarta-commons-digester >= 0:1.2
+Requires:       jakarta-commons-logging >= 0:1.0
+Requires:       jaxp_parser_impl
+Requires:       jaxp_transform_impl
+Requires:       jmxri
+Requires:       xml-commons-apis
+%if ! %{gcj_support}
+BuildArch:      noarch
 %endif
+Provides: %{short_name} = %{epoch}:%{version}-%{release}
+Obsoletes: %{short_name} < %{epoch}:%{version}-%{release}
 
 %description
 The Modeler project shall create and maintain a set of Java
-classes to provide the facilities described in the preceeding section, plus
-unit tests and small examples of using these facilities to instrument
-Java classes with Model MBean support.
+classes to provide support for configuring and instantiating Model
+MBeans, plus unit tests and small examples of using these facilities
+to instrument Java classes with Model MBean support.
 
 %package javadoc
-Summary:	Javadoc for %{name}
-Group:		Development/Documentation
-Requires(post): /bin/rm /bin/ln 
-Requires(postun): /bin/rm
+Summary:        Javadoc for %{name}
+Group:          Development/Documentation
 
 %description javadoc
 Javadoc for %{name}.
 
 %prep
-%setup -n %{short_name}-%{version}-src
-#%%patch
+%setup -q -n %{short_name}-%{version}-src
 %patch0
 %patch1  
-# remove all binary libs
-find . -name "*.jar" -exec rm -f {} \;
+# remove all binary files
+find . \( -name "*.jar" -o -name "*.class" -o -name "*.zip" \) \
+    | xargs %{__rm} -f
+
+
+# fix eol encodings
+%{__sed} -i 's/\r//' xdocs/downloads.xml
+%{__sed} -i 's/\r//' xdocs/cvs-usage.xml
+%{__sed} -i 's/\r//' xdocs/issue-tracking.xml
+%{__sed} -i 's/\r//' LICENSE.txt
+%{__sed} -i 's/\r//' xdocs/navigation.xml
+%{__sed} -i 's/\r//' xdocs/style/project.css
+%{__sed} -i 's/\r//' xdocs/index.xml
+%{__sed} -i 's/\r//' xdocs/building.xml
+%{__sed} -i 's/\r//' NOTICE.txt
+%{__sed} -i 's/\r//' RELEASE-NOTES.txt
 
 %build
 export CLASSPATH=$(build-classpath xml-commons-apis jaxp_parser_impl jaxp_transform_impl jmxri junit commons-beanutils commons-collections commons-digester commons-logging)
-%ant dist
+%{ant} dist
 
 %install
+%{__rm} -rf %{buildroot}
 # jars
-%__mkdir_p %{buildroot}%{_javadir}
-%__cp -a dist/%{short_name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %__ln_s ${jar} `echo $jar| %__sed  "s|jakarta-||g"`; done)
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %__ln_s ${jar} `echo $jar| %__sed  "s|-%{version}||g"`; done)
+%{__mkdir_p} %{buildroot}%{_javadir}
+%{__cp} -a dist/%{short_name}.jar \
+    %{buildroot}%{_javadir}/%{name}-%{version}.jar
+(
+    cd %{buildroot}%{_javadir}
+    for jar in *-%{version}*; do
+        %{__ln_s} ${jar} `echo $jar | %{__sed} "s|jakarta-||g"`
+    done
+)
+(
+    cd %{buildroot}%{_javadir}
+    for jar in *-%{version}*; do
+        %{__ln_s} ${jar} `echo $jar | %__sed "s|-%{version}||g"`
+    done
+)
 # javadoc
-%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
-%__cp -a dist/docs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-(cd %{buildroot}%{_javadocdir} && %__ln_s %{name}-%{version} %{name})
-
+%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
+%{__cp} -a dist/docs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+(
+    cd %{buildroot}%{_javadocdir}
+    %{__ln_s} %{name}-%{version} %{name}
+)
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
 %endif
 
 %clean
-%__rm -rf %{buildroot}
-
-%post javadoc
-%__rm -f %{_javadocdir}/%{name}
-%__ln_s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ $1 -eq 0 ]; then
-  %__rm -f %{_javadocdir}/%{name}
-fi
+%{__rm} -rf %{buildroot}
 
-%post
 %if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
+%post
+if [ -x %{_bindir}/rebuild-gcj-db ]; then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%postun
 %if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
+%postun
+if [ -x %{_bindir}/rebuild-gcj-db ]; then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
 %files
 %defattr(0644,root,root,0755)
-%doc STATUS.html RELEASE-NOTES.txt PROPOSAL.html
+%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt xdocs
 %{_javadir}/*
 
 %if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-modeler-1.1.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
 %endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%dir %{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}-%{version}/*
-%ghost %dir %{_javadocdir}/%{name}
+%doc %{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed Mar 21 2007 Matt Wringe <mwringe at redhat.com> - 0:2.0-3jpp.1
+- Merge with lastest jpp version
+
+* Wed Mar 21 2007 Matt Wringe <mwringe at redhat.com> - 0:2.0-3jpp
+- Make provides and obsoletes versioned
+- Fix eol encoding on various files
+
+* Tue Mar 12 2007 Jason Corley <jason.corley at gmail.com> - 0:2.0-2jpp
+- respin to upload to main repo
+- fix rpmlint warnings
+
+* Tue Feb 27 2007 Jason Corley <jason.corley at gmail.com> - 0:2.0-1jpp
+- change copyright text to have current year
+- minor aesthetic cleanups
+- update to 2.0
+
 * Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> - 0:1.1-8jpp.1
 - Merge with upstream version:
  - Add missing javadoc requires
@@ -221,5 +249,5 @@
 
 * Fri Jun 07 2002 Henri Gomez <hgomez at users.sourceforge.net> 1.0-1jpp 
 - 1.0
-- added short names in %{_javadir}, as does jakarta developpers
+- added short names in %%{_javadir}, as does jakarta developpers
 - first jPackage release


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2004 16:10:26 -0000	1.2
+++ sources	26 Apr 2007 00:25:06 -0000	1.3
@@ -1 +1 @@
-6de043186a348758c845f1a2321e8308  modeler-1.1-src.tar.gz
+43983c66113ddaa9880e4a7ea7d38db4  commons-modeler-2.0-src.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 26 00:26:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 20:26:57 -0400
Subject: rpms/selinux-policy/devel policy-20070219.patch,1.60,1.61
Message-ID: <200704260026.l3Q0QvGo014717@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20070219.patch 
Log Message:
* Wed Apr 25 2007 Dan Walsh <dwalsh at redhat.com> 2.6.1-2
- Fixes for unix_update
- Fix logwatch to be able to search all dirs


policy-20070219.patch:
 Rules.modular                           |   12 +
 VERSION                                 |    2 
 policy/flask/access_vectors             |    4 
 policy/global_booleans                  |    2 
 policy/global_tunables                  |   15 -
 policy/mls                              |   31 ++-
 policy/modules/admin/acct.te            |    1 
 policy/modules/admin/alsa.fc            |    1 
 policy/modules/admin/amtu.fc            |    3 
 policy/modules/admin/amtu.if            |   53 +++++
 policy/modules/admin/amtu.te            |   56 ++++++
 policy/modules/admin/bootloader.te      |    3 
 policy/modules/admin/consoletype.te     |   10 -
 policy/modules/admin/dmesg.te           |    1 
 policy/modules/admin/kudzu.te           |    6 
 policy/modules/admin/logrotate.te       |    1 
 policy/modules/admin/logwatch.te        |    6 
 policy/modules/admin/netutils.te        |    6 
 policy/modules/admin/readahead.te       |    6 
 policy/modules/admin/rpm.fc             |    3 
 policy/modules/admin/rpm.if             |   85 +++++++--
 policy/modules/admin/rpm.te             |    2 
 policy/modules/admin/su.if              |    6 
 policy/modules/admin/sudo.if            |    1 
 policy/modules/admin/usermanage.if      |    2 
 policy/modules/admin/usermanage.te      |   27 +++
 policy/modules/apps/gnome.if            |   26 ++
 policy/modules/apps/gpg.fc              |    2 
 policy/modules/apps/loadkeys.if         |   44 +---
 policy/modules/apps/mozilla.if          |    1 
 policy/modules/apps/slocate.te          |    5 
 policy/modules/apps/uml.if              |   27 ---
 policy/modules/kernel/corecommands.fc   |    5 
 policy/modules/kernel/corecommands.if   |   20 ++
 policy/modules/kernel/corenetwork.te.in |   15 +
 policy/modules/kernel/devices.if        |   36 ++++
 policy/modules/kernel/domain.if         |   18 ++
 policy/modules/kernel/domain.te         |   46 +++++
 policy/modules/kernel/files.fc          |    1 
 policy/modules/kernel/files.if          |   83 ++++++++-
 policy/modules/kernel/filesystem.if     |   39 ++++
 policy/modules/kernel/filesystem.te     |   19 ++
 policy/modules/kernel/kernel.if         |   42 ++++
 policy/modules/kernel/kernel.te         |    2 
 policy/modules/kernel/mls.if            |   20 ++
 policy/modules/kernel/mls.te            |    3 
 policy/modules/kernel/selinux.if        |   38 ++++
 policy/modules/kernel/storage.if        |    2 
 policy/modules/kernel/terminal.if       |   21 ++
 policy/modules/kernel/terminal.te       |    1 
 policy/modules/services/aide.fc         |    1 
 policy/modules/services/aide.te         |    2 
 policy/modules/services/amavis.if       |   19 ++
 policy/modules/services/amavis.te       |    3 
 policy/modules/services/apache.fc       |   14 -
 policy/modules/services/apache.if       |  171 ++++++++++++++++++-
 policy/modules/services/apache.te       |   79 ++++++++
 policy/modules/services/apcupsd.fc      |    9 +
 policy/modules/services/apcupsd.if      |  108 ++++++++++++
 policy/modules/services/apcupsd.te      |   92 ++++++++++
 policy/modules/services/automount.te    |    2 
 policy/modules/services/avahi.if        |   19 ++
 policy/modules/services/avahi.te        |    4 
 policy/modules/services/bind.te         |    1 
 policy/modules/services/bluetooth.te    |    2 
 policy/modules/services/clamav.te       |    1 
 policy/modules/services/clockspeed.if   |    2 
 policy/modules/services/consolekit.te   |   33 ++-
 policy/modules/services/cron.fc         |    1 
 policy/modules/services/cron.if         |   33 +--
 policy/modules/services/cron.te         |   46 ++++-
 policy/modules/services/cups.te         |    6 
 policy/modules/services/cvs.te          |    1 
 policy/modules/services/cyrus.te        |    1 
 policy/modules/services/dbus.if         |   63 +++++++
 policy/modules/services/dhcp.te         |    2 
 policy/modules/services/djbdns.te       |    5 
 policy/modules/services/dovecot.te      |    5 
 policy/modules/services/ftp.te          |    5 
 policy/modules/services/hal.fc          |    8 
 policy/modules/services/hal.if          |   77 ++++++++
 policy/modules/services/hal.te          |  147 ++++++++++++++++
 policy/modules/services/inetd.te        |    5 
 policy/modules/services/kerberos.if     |   79 ++------
 policy/modules/services/kerberos.te     |   34 +++
 policy/modules/services/mailman.if      |   19 ++
 policy/modules/services/mta.if          |   19 ++
 policy/modules/services/mta.te          |    2 
 policy/modules/services/nis.if          |    4 
 policy/modules/services/nis.te          |    4 
 policy/modules/services/nscd.te         |   10 +
 policy/modules/services/ntp.te          |    4 
 policy/modules/services/pegasus.if      |   18 ++
 policy/modules/services/pegasus.te      |    6 
 policy/modules/services/postfix.if      |    1 
 policy/modules/services/postfix.te      |    8 
 policy/modules/services/ppp.te          |    2 
 policy/modules/services/procmail.te     |    1 
 policy/modules/services/pyzor.te        |    7 
 policy/modules/services/radius.te       |    4 
 policy/modules/services/rlogin.te       |    1 
 policy/modules/services/rpc.if          |    5 
 policy/modules/services/rpc.te          |    1 
 policy/modules/services/rpcbind.fc      |    6 
 policy/modules/services/rpcbind.if      |  104 +++++++++++
 policy/modules/services/rpcbind.te      |   83 +++++++++
 policy/modules/services/rsync.te        |    1 
 policy/modules/services/rwho.fc         |    3 
 policy/modules/services/rwho.if         |   84 +++++++++
 policy/modules/services/rwho.te         |   61 ++++++
 policy/modules/services/samba.fc        |    3 
 policy/modules/services/samba.if        |   86 +++++++++
 policy/modules/services/samba.te        |   87 +++++++++
 policy/modules/services/sasl.te         |    1 
 policy/modules/services/sendmail.if     |   22 ++
 policy/modules/services/smartmon.te     |    1 
 policy/modules/services/snmp.te         |   15 +
 policy/modules/services/spamassassin.te |   11 -
 policy/modules/services/squid.fc        |    2 
 policy/modules/services/squid.if        |   22 ++
 policy/modules/services/squid.te        |   12 +
 policy/modules/services/ssh.if          |   39 ++++
 policy/modules/services/ssh.te          |    9 -
 policy/modules/services/w3c.fc          |    2 
 policy/modules/services/w3c.if          |    1 
 policy/modules/services/w3c.te          |   14 +
 policy/modules/system/application.fc    |    1 
 policy/modules/system/application.if    |  104 +++++++++++
 policy/modules/system/application.te    |   14 +
 policy/modules/system/authlogin.fc      |    1 
 policy/modules/system/authlogin.if      |  141 ++++++++++++++-
 policy/modules/system/authlogin.te      |   36 ++++
 policy/modules/system/fstools.fc        |    1 
 policy/modules/system/fstools.te        |    1 
 policy/modules/system/fusermount.fc     |    6 
 policy/modules/system/fusermount.if     |   41 ++++
 policy/modules/system/fusermount.te     |   50 +++++
 policy/modules/system/getty.te          |    3 
 policy/modules/system/hostname.te       |   14 +
 policy/modules/system/init.if           |   42 ++++
 policy/modules/system/init.te           |   35 +++
 policy/modules/system/ipsec.if          |   20 ++
 policy/modules/system/ipsec.te          |    3 
 policy/modules/system/iptables.te       |    5 
 policy/modules/system/libraries.fc      |    5 
 policy/modules/system/libraries.te      |    4 
 policy/modules/system/locallogin.te     |   12 +
 policy/modules/system/logging.if        |   21 ++
 policy/modules/system/logging.te        |    2 
 policy/modules/system/lvm.fc            |    1 
 policy/modules/system/lvm.te            |    8 
 policy/modules/system/modutils.te       |    7 
 policy/modules/system/mount.fc          |    3 
 policy/modules/system/mount.if          |   37 ++++
 policy/modules/system/mount.te          |   70 +++++++
 policy/modules/system/raid.te           |    1 
 policy/modules/system/selinuxutil.fc    |    1 
 policy/modules/system/selinuxutil.if    |    6 
 policy/modules/system/selinuxutil.te    |   70 ++++---
 policy/modules/system/sysnetwork.te     |    3 
 policy/modules/system/udev.te           |   12 +
 policy/modules/system/unconfined.fc     |    1 
 policy/modules/system/unconfined.if     |   10 -
 policy/modules/system/unconfined.te     |   24 ++
 policy/modules/system/userdomain.if     |  284 +++++++++++++++++++-------------
 policy/modules/system/userdomain.te     |   81 +++++----
 policy/modules/system/xen.te            |   35 +++
 policy/support/obj_perm_sets.spt        |   12 +
 168 files changed, 3489 insertions(+), 465 deletions(-)

Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- policy-20070219.patch	25 Apr 2007 18:31:32 -0000	1.60
+++ policy-20070219.patch	26 Apr 2007 00:26:55 -0000	1.61
@@ -386,13 +386,13 @@
  selinux_get_enforce_mode(logrotate_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.6.1/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/admin/logwatch.te	2007-04-25 14:29:50.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/logwatch.te	2007-04-25 19:20:38.000000000 -0400
 @@ -63,6 +63,8 @@
  files_search_mnt(logwatch_t)
  files_dontaudit_search_home(logwatch_t)
  files_dontaudit_search_boot(logwatch_t)
 +# Execs df and if file system mounted with a context avc raised
-+files_search_all_dirs(logwatch_t)
++files_search_all(logwatch_t)
  
  fs_getattr_all_fs(logwatch_t)
  fs_dontaudit_list_auto_mountpoints(logwatch_t)
@@ -1410,7 +1410,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.6.1/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2007-04-23 09:35:56.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/kernel/filesystem.te	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/kernel/filesystem.te	2007-04-25 20:11:39.000000000 -0400
 @@ -54,17 +54,30 @@
  
  type capifs_t;
@@ -1442,6 +1442,19 @@
  type futexfs_t;
  fs_type(futexfs_t)
  genfscon futexfs / gen_context(system_u:object_r:futexfs_t,s0)
+@@ -83,6 +96,12 @@
+ fs_type(inotifyfs_t)
+ genfscon inotifyfs / gen_context(system_u:object_r:inotifyfs_t,s0)
+ 
++type mvfs_t;
++fs_type(mvfs_t)
++fs_noxattr_type(mvfs_t)
++allow mvfs_t self:filesystem associate;
++genfscon mvfs / gen_context(system_u:object_r:mvfs_t,s0)
++
+ type nfsd_fs_t;
+ fs_type(nfsd_fs_t)
+ genfscon nfsd / gen_context(system_u:object_r:nfsd_fs_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.6.1/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2007-02-19 11:32:51.000000000 -0500
 +++ serefpolicy-2.6.1/policy/modules/kernel/kernel.if	2007-04-23 13:12:09.000000000 -0400
@@ -4618,12 +4631,12 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-2.6.1/policy/modules/services/sasl.te
 --- nsaserefpolicy/policy/modules/services/sasl.te	2007-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/services/sasl.te	2007-04-25 08:58:33.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/services/sasl.te	2007-04-25 20:21:04.000000000 -0400
 @@ -63,6 +63,7 @@
  selinux_compute_access_vector(saslauthd_t)
  
  auth_domtrans_chk_passwd(saslauthd_t)
-+auth_domtrans_udp_passwd(saslauthd_t)
++auth_domtrans_upd_passwd(saslauthd_t)
  auth_use_nsswitch(saslauthd_t)
  
  domain_use_interactive_fds(saslauthd_t)
@@ -4714,7 +4727,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.6.1/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2007-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/services/spamassassin.te	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/services/spamassassin.te	2007-04-25 19:53:11.000000000 -0400
 @@ -6,14 +6,12 @@
  # Declarations
  #
@@ -4756,6 +4769,17 @@
  corenet_sendrecv_razor_client_packets(spamd_t)
  corenet_sendrecv_spamd_server_packets(spamd_t)
  # spamassassin 3.1 needs this for its
+@@ -192,6 +191,10 @@
+ ')
+ 
+ optional_policy(`
++	mysql_stream_connect(spamd_t)
++')
++
++optional_policy(`
+ 	nis_use_ypbind(spamd_t)
+ ')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.fc serefpolicy-2.6.1/policy/modules/services/squid.fc
 --- nsaserefpolicy/policy/modules/services/squid.fc	2006-11-16 17:15:21.000000000 -0500
 +++ serefpolicy-2.6.1/policy/modules/services/squid.fc	2007-04-23 13:12:09.000000000 -0400
@@ -5089,7 +5113,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.6.1/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/system/authlogin.if	2007-04-24 09:13:47.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/system/authlogin.if	2007-04-25 20:19:29.000000000 -0400
 @@ -152,21 +152,12 @@
  ## </param>
  #
@@ -5137,7 +5161,7 @@
  	# for SSP/ProPolice
  	dev_read_urand($1)
  
-@@ -211,9 +208,12 @@
+@@ -211,9 +208,11 @@
  	auth_read_login_records($1)
  	auth_append_login_records($1)
  	auth_rw_lastlog($1)
@@ -5145,13 +5169,12 @@
 +	auth_rw_faillog($1)
  	auth_exec_pam($1)
  
-+	files_dontaudit_rw_etc_dirs($1)
 +	auth_domtrans_upd_passwd($1)
 +
  	init_rw_utmp($1)
  
  	logging_send_syslog_msg($1)
-@@ -221,6 +221,7 @@
+@@ -221,6 +220,7 @@
  	seutil_read_config($1)
  	seutil_read_default_contexts($1)
  
@@ -5159,7 +5182,7 @@
  	tunable_policy(`allow_polyinstantiation',`
  		files_polyinstantiate_all($1)
  	')
-@@ -1391,3 +1392,114 @@
+@@ -1391,3 +1391,114 @@
  	typeattribute $1 can_write_shadow_passwords;
  	typeattribute $1 can_relabelto_shadow_passwords;
  ')
@@ -5239,7 +5262,7 @@
 +	allow updpwd_t $1:fd use;
 +	allow updpwd_t $1:fifo_file rw_file_perms;
 +	allow updpwd_t $1:process sigchld;
-+	dontaudit $2 shadow_t:file { getattr read };
++	auth_dontaudit_read_shadow($1)
 +
 +')
 +
@@ -6509,8 +6532,8 @@
  		init_dbus_chat_script(unconfined_execmem_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.6.1/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/system/userdomain.if	2007-04-23 13:12:09.000000000 -0400
-@@ -114,6 +114,10 @@
++++ serefpolicy-2.6.1/policy/modules/system/userdomain.if	2007-04-25 19:40:17.000000000 -0400
+@@ -114,6 +114,18 @@
  		# Allow making the stack executable via mprotect.
  		allow $1_t self:process execstack;
  	')
@@ -6518,18 +6541,27 @@
 +	optional_policy(`
 +		ssh_rw_stream_sockets($1_t)
 +	')
++
++	optional_policy(`
++		consoletype_exec($1_t)
++	')
++
++	optional_policy(`
++		hostname_exec($1_t)
++	')
  ')
  
  #######################################
-@@ -764,6 +768,7 @@
+@@ -764,6 +776,8 @@
  	auth_search_pam_console_data($1_t)
  	auth_run_pam($1_t,$1_r,{ $1_tty_device_t $1_devpts_t })
  	auth_run_utempter($1_t,$1_r,{ $1_tty_device_t $1_devpts_t })
++	auth_run_upd_passwd($1_t,$1_r,{ $1_tty_device_t $1_devpts_t })
 +	auth_read_key($1_t)
  
  	init_read_utmp($1_t)
  	# The library functions always try to open read-write first,
-@@ -992,7 +997,7 @@
+@@ -992,7 +1006,7 @@
  	manage_fifo_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t)
  	filetrans_pattern(privhome,$1_home_dir_t,$1_home_t,{ dir file lnk_file sock_file fifo_file })
  
@@ -6538,7 +6570,7 @@
  
  	# 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)
-@@ -1059,10 +1064,6 @@
+@@ -1059,10 +1073,6 @@
  		dontaudit xdm_t $1_home_t:file rw_file_perms;
  	')
  
@@ -6549,7 +6581,7 @@
  	') dnl end TODO
  ')
  
-@@ -1126,7 +1127,7 @@
+@@ -1126,7 +1136,7 @@
  	# $1_t local policy
  	#
  
@@ -6558,7 +6590,7 @@
  	allow $1_t self:process { setexec setfscreate };
  
  	# Set password information for other users.
-@@ -1353,11 +1354,7 @@
+@@ -1353,11 +1363,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_generic_user',`
@@ -6571,7 +6603,7 @@
  ')
  
  ########################################
-@@ -1384,11 +1381,7 @@
+@@ -1384,11 +1390,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_from_generic_user',`
@@ -6584,7 +6616,7 @@
  ')
  
  ########################################
-@@ -1414,11 +1407,7 @@
+@@ -1414,11 +1416,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_staff',`
@@ -6597,7 +6629,7 @@
  ')
  
  ########################################
-@@ -1445,11 +1434,7 @@
+@@ -1445,11 +1443,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_from_staff',`
@@ -6610,7 +6642,7 @@
  ')
  
  ########################################
-@@ -1475,11 +1460,7 @@
+@@ -1475,11 +1469,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_sysadm',`
@@ -6623,7 +6655,7 @@
  ')
  
  ########################################
-@@ -1506,11 +1487,7 @@
+@@ -1506,11 +1496,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_from_sysadm',`
@@ -6636,7 +6668,7 @@
  ')
  
  ########################################
-@@ -1698,13 +1675,11 @@
+@@ -1698,13 +1684,11 @@
  ## </param>
  #
  template(`userdom_setattr_user_ptys',`
@@ -6654,7 +6686,7 @@
  ')
  
  ########################################
-@@ -1733,13 +1708,11 @@
+@@ -1733,13 +1717,11 @@
  ## </param>
  #
  template(`userdom_create_user_pty',`
@@ -6672,7 +6704,7 @@
  ')
  
  ########################################
-@@ -3624,13 +3597,12 @@
+@@ -3624,13 +3606,12 @@
  template(`userdom_setattr_user_ttys',`
  	ifdef(`targeted_policy',`
  		term_setattr_unallocated_ttys($2)
@@ -6691,7 +6723,7 @@
  ')
  
  ########################################
-@@ -3661,13 +3633,12 @@
+@@ -3661,13 +3642,12 @@
  template(`userdom_use_user_ttys',`
  	ifdef(`targeted_policy',`
  		term_use_unallocated_ttys($2)
@@ -6710,7 +6742,7 @@
  ')
  
  ########################################
-@@ -3696,18 +3667,13 @@
+@@ -3696,18 +3676,13 @@
  ## </param>
  #
  template(`userdom_use_user_terminals',`
@@ -6735,7 +6767,7 @@
  ')
  
  ########################################
-@@ -5353,14 +5319,13 @@
+@@ -5353,14 +5328,13 @@
  interface(`userdom_use_unpriv_users_ptys',`
  	ifdef(`targeted_policy',`
  		term_use_generic_ptys($1)
@@ -6756,7 +6788,7 @@
  ')
  
  ########################################
-@@ -5377,13 +5342,13 @@
+@@ -5377,13 +5351,13 @@
  interface(`userdom_dontaudit_use_unpriv_users_ptys',`
  	ifdef(`targeted_policy',`
  		term_dontaudit_use_generic_ptys($1)
@@ -6775,7 +6807,7 @@
  ')
  
  ########################################
-@@ -5436,13 +5401,12 @@
+@@ -5436,13 +5410,12 @@
  interface(`userdom_list_unpriv_users_tmp',`
  	ifdef(`targeted_policy',`
  		files_list_tmp($1)
@@ -6794,7 +6826,7 @@
  ')
  
  ########################################
-@@ -5458,13 +5422,12 @@
+@@ -5458,13 +5431,12 @@
  interface(`userdom_read_unpriv_users_tmp_files',`
  	ifdef(`targeted_policy',`
  		files_read_generic_tmp_files($1)
@@ -6813,7 +6845,7 @@
  ')
  
  ########################################
-@@ -5480,13 +5443,12 @@
+@@ -5480,13 +5452,12 @@
  interface(`userdom_read_unpriv_users_tmp_symlinks',`
  	ifdef(`targeted_policy',`
  		files_read_generic_tmp_symlinks($1)
@@ -6832,7 +6864,7 @@
  ')
  
  ########################################
-@@ -5520,13 +5482,12 @@
+@@ -5520,13 +5491,12 @@
  interface(`userdom_use_unpriv_users_ttys',`
  	ifdef(`targeted_policy',`
  		term_use_unallocated_ttys($1)
@@ -6851,7 +6883,7 @@
  ')
  
  ########################################
-@@ -5543,13 +5504,12 @@
+@@ -5543,13 +5513,12 @@
  interface(`userdom_dontaudit_use_unpriv_users_ttys',`
  	ifdef(`targeted_policy',`
  		term_dontaudit_use_unallocated_ttys($1)
@@ -6870,7 +6902,7 @@
  ')
  
  ########################################
-@@ -5721,3 +5681,92 @@
+@@ -5721,3 +5690,92 @@
  	allow $1 user_home_dir_t:dir manage_dir_perms;
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
@@ -6965,7 +6997,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.6.1/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/system/userdomain.te	2007-04-25 10:05:02.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/system/userdomain.te	2007-04-25 19:18:21.000000000 -0400
 @@ -15,7 +15,6 @@
  # Declarations
  #
@@ -7044,10 +7076,18 @@
  		apache_run_helper(sysadm_t,sysadm_r,admin_terminal)
  		#apache_run_all_scripts(sysadm_t,sysadm_r)
  		#apache_domtrans_sys_script(sysadm_t)
-@@ -294,10 +321,6 @@
+@@ -286,18 +313,6 @@
  	')
  
  	optional_policy(`
+-		consoletype_exec(sysadm_t)
+-
+-		ifdef(`enable_mls',`
+-			consoletype_exec(auditadm_t)
+-		')
+-	')
+-
+-	optional_policy(`
 -		cron_admin_template(sysadm,sysadm_t,sysadm_r)
 -	')
 -
@@ -7055,7 +7095,7 @@
  		dcc_run_cdcc(sysadm_t,sysadm_r,admin_terminal)
  		dcc_run_client(sysadm_t,sysadm_r,admin_terminal)
  		dcc_run_dbclean(sysadm_t,sysadm_r,admin_terminal)
-@@ -325,7 +348,6 @@
+@@ -325,7 +340,6 @@
  
  	optional_policy(`
  		ethereal_run_tethereal(sysadm_t,sysadm_r,admin_terminal)
@@ -7063,7 +7103,7 @@
  	')
  
  	optional_policy(`
-@@ -368,7 +390,6 @@
+@@ -368,7 +382,6 @@
  
  	optional_policy(`
  		lpd_run_checkpc(sysadm_t,sysadm_r,admin_terminal)
@@ -7071,7 +7111,7 @@
  	')
  
  	optional_policy(`
-@@ -386,11 +407,11 @@
+@@ -386,11 +399,11 @@
  	')
  
  	optional_policy(`
@@ -7085,7 +7125,7 @@
  	')
  
  	optional_policy(`
-@@ -452,6 +473,9 @@
+@@ -452,6 +465,9 @@
  
  		ifdef(`enable_mls',`
  			userdom_security_admin_template(secadm_t,secadm_r,{ secadm_tty_device_t sysadm_devpts_t })
@@ -7095,7 +7135,7 @@
  		', `
  			userdom_security_admin_template(sysadm_t,sysadm_r,admin_terminal)
  		')
-@@ -504,15 +528,15 @@
+@@ -504,15 +520,15 @@
  	unconfined_alias_domain(sysadm_t)
  
  	# User home directory type.
@@ -7120,7 +7160,7 @@
  
  	# compatibility for switching from strict
  #	dominance { role secadm_r { role system_r; }}
-@@ -548,4 +572,13 @@
+@@ -548,4 +564,13 @@
  	optional_policy(`
  		samba_per_role_template(user)
  	')



From fedora-cvs-commits at redhat.com  Thu Apr 26 00:28:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 20:28:21 -0400
Subject: rpms/policycoreutils/devel .cvsignore, 1.149,
	1.150 policycoreutils.spec, 1.407, 1.408 sources, 1.154, 1.155
Message-ID: <200704260028.l3Q0SLoZ014819@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore policycoreutils.spec sources 
Log Message:
* Wed Apr 25 2007 Dan Walsh <dwalsh at redhat.com> 2.0.14-1
- Updated version of policycoreutils
	* Build fix for setsebool.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- .cvsignore	25 Apr 2007 15:32:00 -0000	1.149
+++ .cvsignore	26 Apr 2007 00:28:19 -0000	1.150
@@ -147,3 +147,4 @@
 policycoreutils-2.0.9.tgz
 policycoreutils-2.0.10.tgz
 policycoreutils-2.0.13.tgz
+policycoreutils-2.0.14.tgz


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -r1.407 -r1.408
--- policycoreutils.spec	25 Apr 2007 15:32:01 -0000	1.407
+++ policycoreutils.spec	26 Apr 2007 00:28:19 -0000	1.408
@@ -1,11 +1,11 @@
-	%define libauditver 1.4.2-1
+%define libauditver 1.4.2-1
 %define libsepolver 2.0.1-1
 %define libsemanagever 1.10.0-1
 %define libselinuxver 2.0.0-1
 %define sepolgenver 1.0.8
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 2.0.13
+Version: 2.0.14
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -192,6 +192,10 @@
 fi
 
 %changelog
+* Wed Apr 25 2007 Dan Walsh <dwalsh at redhat.com> 2.0.14-1
+- Updated version of policycoreutils
+	* Build fix for setsebool.
+
 * Wed Apr 25 2007 Dan Walsh <dwalsh at redhat.com> 2.0.13-1
 - Updated version of policycoreutils
 	* Merged setsebool patch to only use libsemanage for persistent boolean changes from Stephen Smalley.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- sources	25 Apr 2007 15:32:01 -0000	1.154
+++ sources	26 Apr 2007 00:28:19 -0000	1.155
@@ -1,2 +1,2 @@
 4d6e57c7fc396efbcf96b7accab4ba30  sepolgen-1.0.8.tgz
-07e3ef9504b878733696a4d7ea9b33e4  policycoreutils-2.0.13.tgz
+5be8860197a4c917ffc94bb01980c3d7  policycoreutils-2.0.14.tgz



From fedora-cvs-commits at redhat.com  Thu Apr 26 00:30:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 20:30:18 -0400
Subject: rpms/jakarta-taglibs-standard/devel
	jakarta-taglibs-standard-1.1.1-build.patch, 1.2,
	1.3 jakarta-taglibs-standard.spec, 1.21, 1.22
Message-ID: <200704260030.l3Q0UI5V014948@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jakarta-taglibs-standard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14922

Modified Files:
	jakarta-taglibs-standard-1.1.1-build.patch 
	jakarta-taglibs-standard.spec 
Log Message:
Merge with latest jpp version
Fix various rpmlint warnings


jakarta-taglibs-standard-1.1.1-build.patch:
 build.xml |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

Index: jakarta-taglibs-standard-1.1.1-build.patch
===================================================================
RCS file: /cvs/dist/rpms/jakarta-taglibs-standard/devel/jakarta-taglibs-standard-1.1.1-build.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jakarta-taglibs-standard-1.1.1-build.patch	22 Oct 2004 15:26:57 -0000	1.2
+++ jakarta-taglibs-standard-1.1.1-build.patch	26 Apr 2007 00:30:16 -0000	1.3
@@ -1,6 +1,6 @@
---- standard/build.xml.orig	2004-10-22 11:16:21.000000000 -0400
-+++ standard/build.xml	2004-10-22 11:17:53.000000000 -0400
-@@ -164,14 +164,11 @@
+--- standard/build.xml.orig	2004-07-19 17:06:08.000000000 -0400
++++ standard/build.xml	2007-04-16 17:56:48.000000000 -0400
+@@ -164,18 +164,16 @@
    <!-- Build the tag library itself -->
    <target name="library-build" depends="prepare-build">  
      
@@ -17,3 +17,19 @@
        excludes="org/apache/taglibs/standard/lang/jstl/parser/jsp20/* org/apache/taglibs/standard/lang/jpath/** org/apache/taglibs/standard/lang/spel/**"
        debug="${compile.debug}"
        deprecation="${compile.deprecation}"
+-      optimize="${compile.optimize}"/> 
++      optimize="${compile.optimize}"
++      source="1.4"/> 
+       
+     <!-- copy the TLDs in META-INF -->
+     <copy todir="${build.library}/META-INF">
+@@ -277,7 +275,8 @@
+            classpath="${servlet24.jar}:${jsp20.jar}:${build.library}/classes"
+            debug="${compile.debug}"
+            deprecation="${compile.deprecation}"
+-           optimize="${compile.optimize}"/>
++           optimize="${compile.optimize}"
++           source="1.4"/>
+   
+     <!-- Copy web.xml + examples TLD -->
+     <copy todir="${build.examples}/WEB-INF">


Index: jakarta-taglibs-standard.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-taglibs-standard/devel/jakarta-taglibs-standard.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jakarta-taglibs-standard.spec	10 Aug 2006 18:32:43 -0000	1.21
+++ jakarta-taglibs-standard.spec	26 Apr 2007 00:30:16 -0000	1.22
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -34,21 +34,18 @@
 
 %define base_name       standard
 %define short_name      taglibs-%{base_name}
-%define jversion	1.1.1
-
-%define section         free
 
 Name:           jakarta-taglibs-standard
 Version:        1.1.1
-Release:        7jpp.1
+Release:        8jpp.1%{?dist}
 Epoch:          0
 Summary:        An open-source implementation of the JSP Standard Tag Library
 License:        Apache Software License
 Group:          Development/Libraries/Java
 URL:            http://jakarta.apache.org/taglibs/
-Source:         http://www.apache.org/dist/jakarta/taglibs/standard/source/jakarta-taglibs-standard-%{jversion}-src.tar.gz
-Patch0:		jakarta-taglibs-standard-%{version}-build.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Source:         http://archive.apache.org/dist/jakarta/taglibs/standard/source/jakarta-taglibs-standard-1.1.1-src.tar.gz
+Patch0:         jakarta-taglibs-standard-%{version}-build.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if ! %{gcj_support}
 BuildArch:      noarch
@@ -63,31 +60,28 @@
 Requires:       xalan-j2 >= 2.6.0
 
 %if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
+BuildRequires:          java-gcj-compat-devel
+Requires(post):         java-gcj-compat
+Requires(postun):       java-gcj-compat
 %endif
 
 %description
-This directory contains releases for the 1.1.x versions of the Standard
-Tag Library, Jakarta Taglibs's open-source implementation of the JSP
-Standard Tag Library (JSTL), version 1.1. JSTL is a standard under the
+This package contains Jakarta Taglibs's open-source implementation of the 
+JSP Standard Tag Library (JSTL), version 1.1. JSTL is a standard under the
 Java Community Process.
 
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 BuildRequires:  java-javadoc
-Requires(post): /bin/rm /bin/ln
-Requires(postun): /bin/rm
 
 %description    javadoc
 Javadoc for %{name}.
 
 
 %prep
-%setup -q -n %{name}-%{jversion}-src
-%patch0
+%setup -q -n %{name}-%{version}-src
+%patch0 -b .orig
 cat > build.properties <<EOBP
 build.dir=build
 dist.dir=dist
@@ -118,7 +112,7 @@
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr standard/dist/standard/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %if %{gcj_support}
@@ -128,26 +122,16 @@
 %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}
+%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
@@ -167,10 +151,18 @@
 %files javadoc
 %defattr(0644,root,root,0755)
 %doc %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%doc %{_javadocdir}/%{name}
 
 
 %changelog
+* Wed Mar 21 2007 Matt Wringe <mwringe at redhat.com> 0:1.1.1-8jpp.1
+- Merge with latest jpp version
+- Fix various rpmlint warnings
+
+* Wed Mar 21 2007 Matt Wringe <mwringe at redhat.com> 0:1.1.1-8jpp
+- Fix empty javadoc post and postun rpmlint warnings
+- Update copyright year
+
 * Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> 0:1.1.1-7jpp.1
 - Merge with upstream version
  - Add missing javadoc postun



From fedora-cvs-commits at redhat.com  Thu Apr 26 00:35:52 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 20:35:52 -0400
Subject: rpms/jakarta-commons-modeler/devel
	jakarta-commons-modeler.build.properties.default.patch, 1.1,
	1.2 jakarta-commons-modeler.build.xml.patch, 1.1, 1.2
Message-ID: <200704260035.l3Q0ZqtH031090@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-modeler/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30826

Modified Files:
	jakarta-commons-modeler.build.properties.default.patch 
	jakarta-commons-modeler.build.xml.patch 
Log Message:
Update Patches to what jpp currently has


jakarta-commons-modeler.build.properties.default.patch:
 build.properties.default |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Index: jakarta-commons-modeler.build.properties.default.patch
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.build.properties.default.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jakarta-commons-modeler.build.properties.default.patch	10 Aug 2006 19:40:02 -0000	1.1
+++ jakarta-commons-modeler.build.properties.default.patch	26 Apr 2007 00:35:50 -0000	1.2
@@ -1,39 +1,39 @@
---- build.properties.default.original	2006-08-10 11:13:12.000000000 -0400
-+++ build.properties.default	2006-08-10 11:31:26.000000000 -0400
+--- build.properties.default.orig	2007-02-27 15:27:41.000000000 -0500
++++ build.properties.default	2007-02-27 15:30:31.000000000 -0500
 @@ -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
+ # --------------------------------------------------
+ 
+ # ----- 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
+ # --------------------------------------------------
+ 
+ # ----- 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
+ 
+ 
+ # ----- 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(-)

Index: jakarta-commons-modeler.build.xml.patch
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.build.xml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jakarta-commons-modeler.build.xml.patch	10 Aug 2006 19:40:02 -0000	1.1
+++ jakarta-commons-modeler.build.xml.patch	26 Apr 2007 00:35:50 -0000	1.2
@@ -1,32 +1,32 @@
---- build.xml.original	2006-08-10 11:35:09.000000000 -0400
-+++ build.xml	2006-08-10 11:49:22.000000000 -0400
+--- build.xml.orig	2007-02-27 15:31:59.000000000 -0500
++++ build.xml	2007-02-27 15:33:05.000000000 -0500
 @@ -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"/>
+ 
+ 
+   <!-- 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"/>



From fedora-cvs-commits at redhat.com  Thu Apr 26 00:41:24 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 20:41:24 -0400
Subject: rpms/gdb/devel gdb-6.6-bz232014-gcore-ppc-on-ppc64.patch, NONE,
	1.1 gdb.spec, 1.229, 1.230
Message-ID: <200704260041.l3Q0fOU1002362@cvs.devel.redhat.com>

Author: jkratoch

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2191

Modified Files:
	gdb.spec 
Added Files:
	gdb-6.6-bz232014-gcore-ppc-on-ppc64.patch 
Log Message:
* Wed Apr 25 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-13
- Fix `gcore' command for 32bit PPC inferiors on 64bit PPC hosts (BZ 232015).
- Resolves: rhbz#232015


gdb-6.6-bz232014-gcore-ppc-on-ppc64.patch:
 Makefile.in     |    2 -
 gdb_procfs32.h  |   27 +++++++++++++++++++--
 gdb_user32.h    |    4 +++
 ppc-linux-nat.c |   70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 99 insertions(+), 4 deletions(-)

--- NEW FILE gdb-6.6-bz232014-gcore-ppc-on-ppc64.patch ---
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=232014


Based on `gdb-6.5-gcore-i386-on-amd64.patch'.


diff -u -rup gdb-6.6-orig/gdb/Makefile.in gdb-6.6/gdb/Makefile.in
--- gdb-6.6-orig/gdb/Makefile.in	2007-03-12 17:59:56.000000000 -0400
+++ gdb-6.6/gdb/Makefile.in	2007-04-23 13:05:05.000000000 -0400
@@ -2481,7 +2481,7 @@ ppcbug-rom.o: ppcbug-rom.c $(defs_h) $(g
 ppc-linux-nat.o: ppc-linux-nat.c $(defs_h) $(gdb_string_h) $(frame_h) \
 	$(inferior_h) $(gdbcore_h) $(regcache_h) $(gdb_assert_h) \
 	$(gdb_wait_h) $(gregset_h) $(ppc_tdep_h) $(target_h) \
-	$(linux_nat_h)
+	$(linux_nat_h) $(elf_bfd_h) $(gdb_procfs32_h)
 ppc-linux-tdep.o: ppc-linux-tdep.c $(defs_h) $(frame_h) $(inferior_h) \
 	$(symtab_h) $(target_h) $(gdbcore_h) $(gdbcmd_h) $(symfile_h) \
 	$(objfiles_h) $(regcache_h) $(value_h) $(osabi_h) $(regset_h) \
diff -u -rup gdb-6.6-orig/gdb/gdb_procfs32.h gdb-6.6/gdb/gdb_procfs32.h
--- gdb-6.6-orig/gdb/gdb_procfs32.h	2007-03-12 17:59:55.000000000 -0400
+++ gdb-6.6/gdb/gdb_procfs32.h	2007-04-23 13:07:03.000000000 -0400
@@ -23,6 +23,8 @@
 #ifndef _SYS_PROCFS32_H
 #define _SYS_PROCFS32_H	1
 
+#if defined(__x86_64__) || defined(__ppc64__) || defined(__powerpc64__)
+
 /* This is somewhat modelled after the file of the same name on SVR4
    systems.  It provides a definition of the core file format for ELF
    used on Linux.  It doesn't have anything to do with the /proc file
@@ -49,17 +51,27 @@ typedef unsigned int elf_greg32_t;
    user_regs_struct' directly in the typedef, but tradition says that
    the register set is an array, which does have some peculiar
    semantics, so leave it that way.  */
+#if defined(__x86_64__)
 #define ELF_NGREG32 (sizeof (struct user_regs32_struct) / sizeof(elf_greg32_t))
+#elif defined(__ppc64__) || defined(__powerpc64__)
+#define ELF_NGREG32 48
+#else
+#error "Unsupported platform"
+#endif
 typedef elf_greg32_t elf_gregset32_t[ELF_NGREG32];
 
 /* Register set for the floating-point registers.  */
-typedef struct user_fpregs32_struct elf_fpregset32_t;
-
 /* Register set for the extended floating-point registers.  Includes
    the Pentium III SSE registers in addition to the classic
    floating-point stuff.  */
+#if defined(__x86_64__)
+typedef struct user_fpregs32_struct elf_fpregset32_t;
 typedef struct user_fpxregs32_struct elf_fpxregset32_t;
-
+#elif defined(__ppc64__) || defined(__powerpc64__)
+typedef elf_fpregset_t elf_fpregset32_t;
+#else
+#error "Unsupported platform"
+#endif
 
 /* Definitions to generate Intel SVR4-like core files.  These mostly
    have the same names as the SVR4 types with "elf_" tacked on the
@@ -100,8 +112,15 @@
     char pr_zomb;			/* Zombie.  */
     char pr_nice;			/* Nice val.  */
     unsigned int pr_flag;		/* Flags.  */
+#if defined(__x86_64__)
     unsigned short int pr_uid;
     unsigned short int pr_gid;
+#elif defined(__ppc64__) || defined(__powerpc64__)
+    unsigned int pr_uid;
+    unsigned int pr_gid;
+#else
+#error "Unsupported platform"
+#endif
     int pr_pid, pr_ppid, pr_pgrp, pr_sid;
     /* Lots missing */
     char pr_fname[16];			/* Filename of executable.  */
@@ -123,6 +135,8 @@ typedef struct elf_prpsinfo32 prpsinfo32
 
 __END_DECLS
 
+#endif /* defined(__x86_64__) || defined(__ppc64__) || defined(__powerpc64__) */
+
 #endif	/* _SYS_PROCFS32_H */
 
 #endif /* HAVE_SYS_PROCFS32_H */
diff -u -rup gdb-6.6-orig/gdb/gdb_user32.h gdb-6.6/gdb/gdb_user32.h
--- gdb-6.6-orig/gdb/gdb_user32.h	2007-03-12 17:59:55.000000000 -0400
+++ gdb-6.6/gdb/gdb_user32.h	2007-04-23 13:05:05.000000000 -0400
@@ -32,6 +32,8 @@ typedef unsigned int gdb_uint32_t;
 #ifndef _SYS_USER32_H
 #define _SYS_USER32_H	1
 
+#ifdef __x86_64__
+
 /* These are the 32-bit x86 structures.  */
 
 struct user_fpregs32_struct
@@ -103,6 +105,8 @@ struct user32
   int				u_debugreg [8];
 };
 
+#endif /* __x86_64__ */
+
 #endif	/* _SYS_USER32_H */
 
 #endif /* HAVE_SYS_USER32_H */
diff -u -rup gdb-6.6-orig/gdb/ppc-linux-nat.c gdb-6.6/gdb/ppc-linux-nat.c
--- gdb-6.6-orig/gdb/ppc-linux-nat.c	2006-05-05 16:45:03.000000000 -0400
+++ gdb-6.6/gdb/ppc-linux-nat.c	2007-04-23 13:16:09.000000000 -0400
@@ -29,6 +29,8 @@
 #include "gdb_assert.h"
 #include "target.h"
 #include "linux-nat.h"
+#include "bfd/elf-bfd.h"
+#include "gdb_procfs32.h"
 
 #include <stdint.h>
 #include <sys/types.h>
@@ -1002,6 +1004,68 @@ fill_fpregset (gdb_fpregset_t *fpregsetp
     }
 }
 
+#if defined(__ppc64__) || defined(__powerpc64__)
+
+/* This functions make ELF32 32-bit elfcore note sections
+   on ppc64 environment. */
+
+static char *
+ppc_linux_elfcore_write_prpsinfo (bfd *abfd, char *buf, int *bufsiz,
+				    const char *fname, const char *psargs)
+{
+  if (gdbarch_ptr_bit(current_gdbarch) == 32)
+    {
+      int note_type;
+      char *note_name = "CORE";
+      struct elf_prpsinfo32 data;
+      note_type = NT_PRPSINFO;
+
+      memset (&data, 0, sizeof (data));
+      strncpy (data.pr_fname, fname, sizeof (data.pr_fname));
+      strncpy (data.pr_psargs, psargs, sizeof (data.pr_psargs));
+      return elfcore_write_note (abfd, buf, bufsiz,
+				 note_name, note_type, &data, sizeof (data));
+    }
+  else
+    return elfcore_write_prpsinfo (abfd, buf, bufsiz, fname, psargs);
+}
+
+static void
+ppc_linux_set_registers (const gdb_byte *gregs, gdb_byte *buf)
+{
+  int i;
+  const int elf_ngreg = 48;
+
+  /* Copy the ppc registers in the ppc64 layout into ppc layout.  */
+  for (i = 0; i < elf_ngreg; i++)
+    memcpy (buf + 4 * i, gregs + 8 * i + 4, 4);
+  /* CR and XER are an exception as they are shifted left there,
+     see fill_gregset().  */
+  memcpy (buf + 4 * PT_CCR, gregs + 8 * PT_CCR + 0, 4);
+  memcpy (buf + 4 * PT_XER, gregs + 8 * PT_XER + 0, 4);
+}
+
+static char *
+ppc_linux_elfcore_write_prstatus (bfd *abfd, char *buf, int *bufsiz,
+			      long pid, int cursig, const void *gregs)
+{
+  if (gdbarch_ptr_bit(current_gdbarch) == 32)
+    {
+      char *note_name = "CORE";
+      struct elf_prstatus32 prstat;
+      memset (&prstat, 0, sizeof (prstat));
+      prstat.pr_pid = pid;
+      prstat.pr_cursig = cursig;
+      ppc_linux_set_registers (gregs, (gdb_byte *) &prstat.pr_reg);
+      return elfcore_write_note (abfd, buf, bufsiz, note_name,
+				 NT_PRSTATUS, &prstat, sizeof (prstat));
+    }
+  else
+    return elfcore_write_prstatus (abfd, buf, bufsiz, pid, cursig, gregs);
+}
+
+#endif /* defined(__ppc64__) || defined(__powerpc64__) */
+
 void _initialize_ppc_linux_nat (void);
 
 void
@@ -1024,6 +1084,12 @@ _initialize_ppc_linux_nat (void)
   t->to_stopped_by_watchpoint = ppc_linux_stopped_by_watchpoint;
   t->to_stopped_data_address = ppc_linux_stopped_data_address;
 
+#if defined(__ppc64__) || defined(__powerpc64__)
+  /* This functions make elfcore note sections. */
+  linux_elfcore_write_prpsinfo = ppc_linux_elfcore_write_prpsinfo;
+  linux_elfcore_write_prstatus = ppc_linux_elfcore_write_prstatus;
+#endif /* defined(__ppc64__) || defined(__powerpc64__) */
+
   /* Register the target.  */
   linux_nat_add_target (t);
 }


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- gdb.spec	25 Apr 2007 21:13:29 -0000	1.229
+++ gdb.spec	26 Apr 2007 00:41:22 -0000	1.230
@@ -11,7 +11,7 @@
 Version: 6.6
 
 # The release always contains a leading reserved number, start it at 1.
-Release: 12%{?dist}
+Release: 13%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -338,7 +338,10 @@
 # Notify user of a child forked process being detached (BZ 235197).
 Patch247: gdb-6.6-bz234468-fork-detach-info.patch
 
-# New testcase for 32bit inferiors on 64bit hosts.
+# Fix `gcore' command for 32bit PPC inferiors on 64bit PPC hosts (BZ 232014).
+Patch248: gdb-6.6-bz232014-gcore-ppc-on-ppc64.patch
+
+# New testcase for gcore of 32bit inferiors on 64bit hosts.
 Patch249: gdb-6.6-gcore32-test.patch
 
 # Enable PowerPC to print 128-bit long double variables (BZ 237872).
@@ -484,6 +487,7 @@
 %patch245 -p1
 %patch246 -p1
 %patch247 -p1
+%patch248 -p1
 %patch249 -p1
 %patch251 -p1
 
@@ -633,9 +637,12 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Wed Apr 25 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-13
+- Fix `gcore' command for 32bit PPC inferiors on 64bit PPC hosts (BZ 232015).
+
 * Wed Apr 25 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-12
 - Enable PowerPC to print 128-bit long double variables (BZ 237872).
-- New testcase for 32bit inferiors on 64bit hosts.
+- New testcase for gcore of 32bit inferiors on 64bit hosts.
 
 * Tue Apr 24 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-11
 - Package review, analysed by Ralf Corsepius (BZ 225783).



From fedora-cvs-commits at redhat.com  Thu Apr 26 00:45:39 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 20:45:39 -0400
Subject: rpms/jakarta-commons-dbcp/devel dbcp-tomcat5-build.xml, NONE,
	1.1 .cvsignore, 1.6,
	1.7 commons-dbcp-1.2.1-TestConnectionPool.patch, 1.1,
	1.2 jakarta-commons-dbcp.spec, 1.24,
	1.25 pom-maven2jpp-mapdeps.xsl, 1.1, 1.2 sources, 1.5, 1.6
Message-ID: <200704260045.l3Q0jdec005541@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-dbcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5427

Modified Files:
	.cvsignore commons-dbcp-1.2.1-TestConnectionPool.patch 
	jakarta-commons-dbcp.spec pom-maven2jpp-mapdeps.xsl sources 
Added Files:
	dbcp-tomcat5-build.xml 
Log Message:
Merger with newest jpp version
Fix rpmlint issues
Disable testThreaded for now as it will sometimes fail



***** Error reading new file: [Errno 2] No such file or directory: 'dbcp-tomcat5-build.xml'

Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-dbcp/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Jul 2006 23:42:25 -0000	1.6
+++ .cvsignore	26 Apr 2007 00:45:37 -0000	1.7
@@ -1,2 +1,2 @@
-commons-dbcp-1.2.1-src-RHCLEAN.tar.bz2
+commons-dbcp-1.2.1-src.tar.gz
 commons-build.tar.gz

commons-dbcp-1.2.1-TestConnectionPool.patch:
 TestConnectionPool.java |  124 +++++++++++++++++++++++++++++-------------------
 1 files changed, 76 insertions(+), 48 deletions(-)

Index: commons-dbcp-1.2.1-TestConnectionPool.patch
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-dbcp/devel/commons-dbcp-1.2.1-TestConnectionPool.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- commons-dbcp-1.2.1-TestConnectionPool.patch	20 Jul 2006 22:21:45 -0000	1.1
+++ commons-dbcp-1.2.1-TestConnectionPool.patch	26 Apr 2007 00:45:37 -0000	1.2
@@ -1,549 +1,26 @@
---- src/test/org/apache/commons/dbcp/TestConnectionPool.java.sav	2006-04-12 16:04:03.000000000 +0200
-+++ src/test/org/apache/commons/dbcp/TestConnectionPool.java	2006-04-12 16:08:30.000000000 +0200
-@@ -1,490 +1,516 @@
--/*
-- * Copyright 1999-2004 The Apache Software Foundation.
-- * 
-- * Licensed under the Apache License, Version 2.0 (the "License");
-- * you may not use this file except in compliance with the License.
-- * You may obtain a copy of the License at
-- * 
-- *      http://www.apache.org/licenses/LICENSE-2.0
-- * 
-- * Unless required by applicable law or agreed to in writing, software
-- * distributed under the License is distributed on an "AS IS" BASIS,
-- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- * See the License for the specific language governing permissions and
-- * limitations under the License.
-- */
--
--package org.apache.commons.dbcp;
--
--import java.sql.Connection;
--import java.sql.PreparedStatement;
--import java.sql.ResultSet;
--import java.sql.SQLException;
--import java.sql.Statement;
--
--import junit.framework.TestCase;
--
--// XXX FIX ME XXX
--// this class still needs some cleanup, but at least
--// this consolidates most of the relevant test code
--// in a fairly re-usable fashion
--// XXX FIX ME XXX
--
--/**
-- * Base test suite for DBCP pools.
-- * 
-- * @author Rodney Waldhoff
-- * @author Sean C. Sullivan
-- * @author John McNally
-- * @author Dirk Verbeeck
-- * @version $Revision$ $Date$
-- */
--public abstract class TestConnectionPool extends TestCase {
--    public TestConnectionPool(String testName) {
--        super(testName);
--    }
--
--    public void setUp() throws Exception {
--        super.setUp();
--    }
--
--    public void tearDown() throws Exception {
--        super.tearDown();
--    }
--
--    protected abstract Connection getConnection() throws Exception;
--    
--    protected int getMaxActive() {
--        return 10;
--    }
--    
--    protected long getMaxWait() {
--        return 100L;
--    }
--
--    // ----------- Utility Methods --------------------------------- 
--
--    protected String getUsername(Connection conn) throws SQLException {
--        Statement stmt = conn.createStatement();
--        ResultSet rs = stmt.executeQuery("select username");
--        if (rs.next()) {
--            return rs.getString(1);
--        }
--        return null;
--    }
--
--    // ----------- tests --------------------------------- 
--
--    public void testClearWarnings() throws Exception {
--        Connection[] c = new Connection[getMaxActive()];
--        for (int i = 0; i < c.length; i++) {
--            c[i] = getConnection();
--            assertTrue(c[i] != null);
--            
--            // generate SQLWarning on connection
--            c[i].prepareCall("warning");
--        }
--
--        for (int i = 0; i < c.length; i++) {
--            assertNotNull(c[i].getWarnings());
--        }
--
--        for (int i = 0; i < c.length; i++) {
--            c[i].close();
--        }
--        
--        for (int i = 0; i < c.length; i++) {
--            c[i] = getConnection();
--        }        
--
--        for (int i = 0; i < c.length; i++) {
--            // warnings should have been cleared by putting the connection back in the pool
--            assertNull(c[i].getWarnings());
--        }
--
--        for (int i = 0; i < c.length; i++) {
--            c[i].close();
--        }
--    }
--
--    public void testIsClosed() throws Exception {
--        for(int i=0;i<getMaxActive();i++) {
--            Connection conn = getConnection();
--            assertTrue(null != conn);
--            assertTrue(!conn.isClosed());
--            PreparedStatement stmt = conn.prepareStatement("select * from dual");
--            assertTrue(null != stmt);
--            ResultSet rset = stmt.executeQuery();
--            assertTrue(null != rset);
--            assertTrue(rset.next());
--            rset.close();
--            stmt.close();
--            conn.close();
--            assertTrue(conn.isClosed());
--        }
--    }
--
--    public void testCantCloseConnectionTwice() throws Exception {
--        for(int i=0;i<getMaxActive();i++) { // loop to show we *can* close again once we've borrowed it from the pool again
--            Connection conn = getConnection();
--            assertTrue(null != conn);
--            assertTrue(!conn.isClosed());
--            conn.close();
--            assertTrue(conn.isClosed());
--            try {
--                conn.close();
--                fail("Expected SQLException on second attempt to close (" + conn.getClass().getName() + ")");
--            } catch(SQLException e) {
--                // expected
--            }
--            assertTrue(conn.isClosed());
--        }
--    }
--
--    public void testCantCloseStatementTwice() throws Exception {
--        Connection conn = getConnection();
--        assertTrue(null != conn);
--        assertTrue(!conn.isClosed());
--        for(int i=0;i<2;i++) { // loop to show we *can* close again once we've borrowed it from the pool again
--            PreparedStatement stmt = conn.prepareStatement("select * from dual");
--            assertTrue(null != stmt);
--            stmt.close();
--            try {
--                stmt.close();
--                fail("Expected SQLException on second attempt to close (" + stmt.getClass().getName() + ")");
--            } catch(SQLException e) {
--                // expected
--            }
--        }
--        conn.close();
--    }
--
--    public void testSimple() throws Exception {
--        Connection conn = getConnection();
--        assertTrue(null != conn);
--        PreparedStatement stmt = conn.prepareStatement("select * from dual");
--        assertTrue(null != stmt);
--        ResultSet rset = stmt.executeQuery();
--        assertTrue(null != rset);
--        assertTrue(rset.next());
--        rset.close();
--        stmt.close();
--        conn.close();
--    }
--
--    public void testRepeatedBorrowAndReturn() throws Exception {
--        for(int i=0;i<100;i++) {
--            Connection conn = getConnection();
--            assertTrue(null != conn);
--            PreparedStatement stmt = conn.prepareStatement("select * from dual");
--            assertTrue(null != stmt);
--            ResultSet rset = stmt.executeQuery();
--            assertTrue(null != rset);
--            assertTrue(rset.next());
--            rset.close();
--            stmt.close();
--            conn.close();
--        }
--    }
--
--    public void testSimple2() throws Exception {
--        Connection conn = getConnection();
--        assertTrue(null != conn);
--        {
--            PreparedStatement stmt = conn.prepareStatement("select * from dual");
--            assertTrue(null != stmt);
--            ResultSet rset = stmt.executeQuery();
--            assertTrue(null != rset);
--            assertTrue(rset.next());
--            rset.close();
--            stmt.close();
--        }
--        {
--            PreparedStatement stmt = conn.prepareStatement("select * from dual");
--            assertTrue(null != stmt);
--            ResultSet rset = stmt.executeQuery();
--            assertTrue(null != rset);
--            assertTrue(rset.next());
--            rset.close();
--            stmt.close();
--        }
--        conn.close();
--        try {
--            conn.createStatement();
--            fail("Can't use closed connections");
--        } catch(SQLException e) {
--            ; // expected
--        }
--
--        conn = getConnection();
--        assertTrue(null != conn);
--        {
--            PreparedStatement stmt = conn.prepareStatement("select * from dual");
--            assertTrue(null != stmt);
--            ResultSet rset = stmt.executeQuery();
--            assertTrue(null != rset);
--            assertTrue(rset.next());
--            rset.close();
--            stmt.close();
--        }
--        {
--            PreparedStatement stmt = conn.prepareStatement("select * from dual");
--            assertTrue(null != stmt);
--            ResultSet rset = stmt.executeQuery();
--            assertTrue(null != rset);
--            assertTrue(rset.next());
--            rset.close();
--            stmt.close();
--        }
--        conn.close();
--        conn = null;
--    }
--
--    public void testPooling() throws Exception {
--        Connection conn = getConnection();
--        Connection underconn = null;
--        if(conn instanceof DelegatingConnection) {
--            underconn = ((DelegatingConnection)conn).getInnermostDelegate();
--        } else {
--            return; // skip this test
--        }
--        assertTrue(underconn != null);
--        Connection conn2 = getConnection();
--        Connection underconn2 = null;
--        if(conn2 instanceof DelegatingConnection) {
--            underconn2 = ((DelegatingConnection)conn2).getInnermostDelegate();
--        } else {
--            return; // skip this test
--        }
--        assertTrue(underconn2 != null);
--        assertTrue(underconn != underconn2);
--        conn2.close();
--        conn.close();
--        Connection conn3 = getConnection();
--        Connection underconn3 = null;
--        if(conn3 instanceof DelegatingConnection) {
--            underconn3 = ((DelegatingConnection)conn3).getInnermostDelegate();
--        } else {
--            return; // skip this test
--        }
--        assertTrue( underconn3 == underconn || underconn3 == underconn2 );
--        conn3.close();
--    }
--    
--    public void testAutoCommitBehavior() throws Exception {
--        Connection conn = getConnection();
--        assertTrue(conn != null);
--        assertTrue(conn.getAutoCommit());
--        conn.setAutoCommit(false);
--        conn.close();
--        
--        Connection conn2 = getConnection();
--        assertTrue( conn2.getAutoCommit() );
--        
--        Connection conn3 = getConnection();
--        assertTrue( conn3.getAutoCommit() );
--
--        conn2.close();
--        
--        conn3.close();
--    }
--    
--    /** @see http://issues.apache.org/bugzilla/show_bug.cgi?id=12400 */
--    public void testConnectionsAreDistinct() throws Exception {
--        Connection[] conn = new Connection[getMaxActive()];
--        for(int i=0;i<conn.length;i++) {
--            conn[i] = getConnection();
--            for(int j=0;j<i;j++) {
--                assertTrue(conn[j] != conn[i]);
--                assertTrue(!conn[j].equals(conn[i]));
--            }
--        }
--        for(int i=0;i<conn.length;i++) {
--            conn[i].close();
--        }
--    }
--
--
--    public void testOpening() throws Exception {
--        Connection[] c = new Connection[getMaxActive()];
--        // test that opening new connections is not closing previous
--        for (int i = 0; i < c.length; i++) {
--            c[i] = getConnection();
--            assertTrue(c[i] != null);
--            for (int j = 0; j <= i; j++) {
--                assertTrue(!c[j].isClosed());
--            }
--        }
--
--        for (int i = 0; i < c.length; i++) {
--            c[i].close();
--        }
--    }
--
--    public void testClosing() throws Exception {
--        Connection[] c = new Connection[getMaxActive()];
--        // open the maximum connections
--        for (int i = 0; i < c.length; i++) {
--            c[i] = getConnection();
--        }
--
--        // close one of the connections
--        c[0].close();
--        assertTrue(c[0].isClosed());
--
--        // get a new connection
--        c[0] = getConnection();
--
--        for (int i = 0; i < c.length; i++) {
--            c[i].close();
--        }
--    }
--
--    public void testMaxActive() throws Exception {
--        Connection[] c = new Connection[getMaxActive()];
--        for (int i = 0; i < c.length; i++) {
--            c[i] = getConnection();
--            assertTrue(c[i] != null);
--        }
--
--        try {
--            getConnection();
--            fail("Allowed to open more than DefaultMaxActive connections.");
--        } catch (java.sql.SQLException e) {
--            // should only be able to open 10 connections, so this test should
--            // throw an exception
--        }
--
--        for (int i = 0; i < c.length; i++) {
--            c[i].close();
--        }
--    }
--
--    public void testThreaded() {
--        TestThread[] threads = new TestThread[getMaxActive()];
--        for(int i=0;i<threads.length;i++) {
--            threads[i] = new TestThread(50,50);
--            Thread t = new Thread(threads[i]);
--            t.start();
--        }
--        for(int i=0;i<threads.length;i++) {
--            while(!(threads[i]).complete()) {
--                try {
--                    Thread.sleep(100L);
--                } catch(Exception e) {
--                    // ignored
--                }
--            }
--            if(threads[i].failed()) {
--                fail();
--            }
--        }
--    }
--
--    class TestThread implements Runnable {
--        java.util.Random _random = new java.util.Random();
--        boolean _complete = false;
--        boolean _failed = false;
--        int _iter = 100;
--        int _delay = 50;
--
--        public TestThread() {
--        }
--
--        public TestThread(int iter) {
--            _iter = iter;
--        }
--
--        public TestThread(int iter, int delay) {
--            _iter = iter;
--            _delay = delay;
--        }
--
--        public boolean complete() {
--            return _complete;
--        }
--
--        public boolean failed() {
--            return _failed;
--        }
--
--        public void run() {
--            for(int i=0;i<_iter;i++) {
--                try {
--                    Thread.sleep((long)_random.nextInt(_delay));
--                } catch(Exception e) {
--                    // ignored
--                }
--                Connection conn = null;
--                PreparedStatement stmt = null;
--                ResultSet rset = null;
--                try {
--                    conn = getConnection();
--                    stmt = conn.prepareStatement("select 'literal', SYSDATE from dual");
--                    rset = stmt.executeQuery();
--                    try {
--                        Thread.sleep((long)_random.nextInt(_delay));
--                    } catch(Exception e) {
--                        // ignored
--                    }
--                } catch(Exception e) {
--                    e.printStackTrace();
--                    _failed = true;
--                    _complete = true;
--                    break;
--                } finally {
--                    try { rset.close(); } catch(Exception e) { }
--                    try { stmt.close(); } catch(Exception e) { }
--                    try { conn.close(); } catch(Exception e) { }
--                }
--            }
--            _complete = true;
--        }
--    }
--
--    // Bugzilla Bug 24328: PooledConnectionImpl ignores resultsetType 
--    // and Concurrency if statement pooling is not enabled
--    // http://issues.apache.org/bugzilla/show_bug.cgi?id=24328
--    public void testPrepareStatementOptions() throws Exception 
--    {
--        Connection conn = getConnection();
--        assertTrue(null != conn);
--        PreparedStatement stmt = conn.prepareStatement("select * from dual", 
--            ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE);
--        assertTrue(null != stmt);
--        ResultSet rset = stmt.executeQuery();
--        assertTrue(null != rset);
--        assertTrue(rset.next());
--        
--        assertEquals(ResultSet.TYPE_SCROLL_SENSITIVE, rset.getType());
--        assertEquals(ResultSet.CONCUR_UPDATABLE, rset.getConcurrency());
--        
--        rset.close();
--        stmt.close();
--        conn.close();
--    }
--
--    // Bugzilla Bug 24966: NullPointer with Oracle 9 driver
--    // wrong order of passivate/close when a rset isn't closed
--    public void testNoRsetClose() throws Exception {
--        Connection conn = getConnection();
--        assertNotNull(conn);
--        PreparedStatement stmt = conn.prepareStatement("test");
--        assertNotNull(stmt);
--        ResultSet rset = stmt.getResultSet();
--        assertNotNull(rset);
--        // forget to close the resultset: rset.close();
--        stmt.close();
--        conn.close();
--    }
--    
--    // Bugzilla Bug 26966: Connectionpool's connections always returns same
--    public void testHashCode() throws Exception {
--        Connection conn1 = getConnection();
--        assertNotNull(conn1);
--        Connection conn2 = getConnection();
--        assertNotNull(conn2);
--
--        assertTrue(conn1.hashCode() != conn2.hashCode());
--    }
--}
-+/*
-+ * Copyright 1999-2004 The Apache Software Foundation.
-+ * 
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ * 
-+ *      http://www.apache.org/licenses/LICENSE-2.0
-+ * 
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+
-+package org.apache.commons.dbcp;
-+
-+import java.sql.Connection;
-+import java.sql.PreparedStatement;
-+import java.sql.ResultSet;
-+import java.sql.SQLException;
-+import java.sql.Statement;
+--- src/test/org/apache/commons/dbcp/TestConnectionPool.java.sav	2004-06-12 09:42:21.000000000 -0400
++++ src/test/org/apache/commons/dbcp/TestConnectionPool.java	2007-03-21 15:08:56.000000000 -0400
+@@ -21,6 +21,7 @@
+ import java.sql.ResultSet;
+ import java.sql.SQLException;
+ import java.sql.Statement;
 +import java.util.Stack;
-+
-+import junit.framework.TestCase;
-+
-+// XXX FIX ME XXX
-+// this class still needs some cleanup, but at least
-+// this consolidates most of the relevant test code
-+// in a fairly re-usable fashion
-+// XXX FIX ME XXX
-+
-+/**
-+ * Base test suite for DBCP pools.
-+ * 
-+ * @author Rodney Waldhoff
-+ * @author Sean C. Sullivan
-+ * @author John McNally
-+ * @author Dirk Verbeeck
+ 
+ import junit.framework.TestCase;
+ 
+@@ -37,7 +38,7 @@
+  * @author Sean C. Sullivan
+  * @author John McNally
+  * @author Dirk Verbeeck
+- * @version $Revision$ $Date$
 + * @version $Revision$ $Date$
-+ */
-+public abstract class TestConnectionPool extends TestCase {
-+    public TestConnectionPool(String testName) {
-+        super(testName);
-+    }
-+
-+    public void setUp() throws Exception {
-+        super.setUp();
-+    }
-+
-+    public void tearDown() throws Exception {
-+        super.tearDown();
+  */
+ public abstract class TestConnectionPool extends TestCase {
+     public TestConnectionPool(String testName) {
+@@ -50,6 +51,17 @@
+ 
+     public void tearDown() throws Exception {
+         super.tearDown();
 +        // Close any connections opened by the test
 +        while (!connections.isEmpty()) {
 +            Connection conn = (Connection) connections.pop();
@@ -555,18 +32,13 @@
 +                conn = null;
 +            }
 +        }
-+    }
-+
-+    protected abstract Connection getConnection() throws Exception;
-+    
-+    protected int getMaxActive() {
-+        return 10;
-+    }
-+    
-+    protected long getMaxWait() {
-+        return 100L;
-+    }
-+    
+     }
+ 
+     protected abstract Connection getConnection() throws Exception;
+@@ -62,6 +74,16 @@
+         return 100L;
+     }
+ 
 +    /** Connections opened during the course of a test */
 +    protected Stack connections = new Stack();
 +    
@@ -577,185 +49,98 @@
 +        return connection;
 +    }
 +
-+    // ----------- Utility Methods --------------------------------- 
-+
-+    protected String getUsername(Connection conn) throws SQLException {
-+        Statement stmt = conn.createStatement();
-+        ResultSet rs = stmt.executeQuery("select username");
-+        if (rs.next()) {
-+            return rs.getString(1);
-+        }
-+        return null;
-+    }
-+
-+    // ----------- tests --------------------------------- 
-+
-+    public void testClearWarnings() throws Exception {
-+        Connection[] c = new Connection[getMaxActive()];
-+        for (int i = 0; i < c.length; i++) {
+     // ----------- Utility Methods --------------------------------- 
+ 
+     protected String getUsername(Connection conn) throws SQLException {
+@@ -78,7 +100,7 @@
+     public void testClearWarnings() throws Exception {
+         Connection[] c = new Connection[getMaxActive()];
+         for (int i = 0; i < c.length; i++) {
+-            c[i] = getConnection();
 +            c[i] = newConnection();
-+            assertTrue(c[i] != null);
-+            
-+            // generate SQLWarning on connection
-+            c[i].prepareCall("warning");
-+        }
-+
-+        for (int i = 0; i < c.length; i++) {
-+            assertNotNull(c[i].getWarnings());
-+        }
-+
-+        for (int i = 0; i < c.length; i++) {
-+            c[i].close();
-+        }
-+        
-+        for (int i = 0; i < c.length; i++) {
+             assertTrue(c[i] != null);
+             
+             // generate SQLWarning on connection
+@@ -94,7 +116,7 @@
+         }
+         
+         for (int i = 0; i < c.length; i++) {
+-            c[i] = getConnection();
 +            c[i] = newConnection();
-+        }        
-+
-+        for (int i = 0; i < c.length; i++) {
-+            // warnings should have been cleared by putting the connection back in the pool
-+            assertNull(c[i].getWarnings());
-+        }
-+
-+        for (int i = 0; i < c.length; i++) {
-+            c[i].close();
-+        }
-+    }
-+
-+    public void testIsClosed() throws Exception {
-+        for(int i=0;i<getMaxActive();i++) {
+         }        
+ 
+         for (int i = 0; i < c.length; i++) {
+@@ -109,7 +131,7 @@
+ 
+     public void testIsClosed() throws Exception {
+         for(int i=0;i<getMaxActive();i++) {
+-            Connection conn = getConnection();
 +            Connection conn = newConnection();
-+            assertTrue(null != conn);
-+            assertTrue(!conn.isClosed());
-+            PreparedStatement stmt = conn.prepareStatement("select * from dual");
-+            assertTrue(null != stmt);
-+            ResultSet rset = stmt.executeQuery();
-+            assertTrue(null != rset);
-+            assertTrue(rset.next());
-+            rset.close();
-+            stmt.close();
-+            conn.close();
-+            assertTrue(conn.isClosed());
-+        }
-+    }
-+
-+    public void testCantCloseConnectionTwice() throws Exception {
-+        for(int i=0;i<getMaxActive();i++) { // loop to show we *can* close again once we've borrowed it from the pool again
+             assertTrue(null != conn);
+             assertTrue(!conn.isClosed());
+             PreparedStatement stmt = conn.prepareStatement("select * from dual");
+@@ -126,7 +148,7 @@
+ 
+     public void testCantCloseConnectionTwice() throws Exception {
+         for(int i=0;i<getMaxActive();i++) { // loop to show we *can* close again once we've borrowed it from the pool again
+-            Connection conn = getConnection();
 +            Connection conn = newConnection();
-+            assertTrue(null != conn);
-+            assertTrue(!conn.isClosed());
-+            conn.close();
-+            assertTrue(conn.isClosed());
-+            try {
-+                conn.close();
-+                fail("Expected SQLException on second attempt to close (" + conn.getClass().getName() + ")");
-+            } catch(SQLException e) {
-+                // expected
-+            }
-+            assertTrue(conn.isClosed());
-+        }
-+    }
-+
-+    public void testCantCloseStatementTwice() throws Exception {
+             assertTrue(null != conn);
+             assertTrue(!conn.isClosed());
+             conn.close();
+@@ -142,7 +164,7 @@
+     }
+ 
+     public void testCantCloseStatementTwice() throws Exception {
+-        Connection conn = getConnection();
 +        Connection conn = newConnection();
-+        assertTrue(null != conn);
-+        assertTrue(!conn.isClosed());
-+        for(int i=0;i<2;i++) { // loop to show we *can* close again once we've borrowed it from the pool again
-+            PreparedStatement stmt = conn.prepareStatement("select * from dual");
-+            assertTrue(null != stmt);
-+            stmt.close();
-+            try {
-+                stmt.close();
-+                fail("Expected SQLException on second attempt to close (" + stmt.getClass().getName() + ")");
-+            } catch(SQLException e) {
-+                // expected
-+            }
-+        }
-+        conn.close();
-+    }
-+
-+    public void testSimple() throws Exception {
+         assertTrue(null != conn);
+         assertTrue(!conn.isClosed());
+         for(int i=0;i<2;i++) { // loop to show we *can* close again once we've borrowed it from the pool again
+@@ -160,7 +182,7 @@
+     }
+ 
+     public void testSimple() throws Exception {
+-        Connection conn = getConnection();
 +        Connection conn = newConnection();
-+        assertTrue(null != conn);
-+        PreparedStatement stmt = conn.prepareStatement("select * from dual");
-+        assertTrue(null != stmt);
-+        ResultSet rset = stmt.executeQuery();
-+        assertTrue(null != rset);
-+        assertTrue(rset.next());
-+        rset.close();
-+        stmt.close();
-+        conn.close();
-+    }
-+
-+    public void testRepeatedBorrowAndReturn() throws Exception {
-+        for(int i=0;i<100;i++) {
+         assertTrue(null != conn);
+         PreparedStatement stmt = conn.prepareStatement("select * from dual");
+         assertTrue(null != stmt);
+@@ -174,7 +196,7 @@
+ 
+     public void testRepeatedBorrowAndReturn() throws Exception {
+         for(int i=0;i<100;i++) {
+-            Connection conn = getConnection();
 +            Connection conn = newConnection();
-+            assertTrue(null != conn);
-+            PreparedStatement stmt = conn.prepareStatement("select * from dual");
-+            assertTrue(null != stmt);
-+            ResultSet rset = stmt.executeQuery();
-+            assertTrue(null != rset);
-+            assertTrue(rset.next());
-+            rset.close();
-+            stmt.close();
-+            conn.close();
-+        }
-+    }
-+
-+    public void testSimple2() throws Exception {
+             assertTrue(null != conn);
+             PreparedStatement stmt = conn.prepareStatement("select * from dual");
+             assertTrue(null != stmt);
+@@ -188,7 +210,7 @@
+     }
+ 
+     public void testSimple2() throws Exception {
+-        Connection conn = getConnection();
 +        Connection conn = newConnection();
-+        assertTrue(null != conn);
-+        {
-+            PreparedStatement stmt = conn.prepareStatement("select * from dual");
-+            assertTrue(null != stmt);
-+            ResultSet rset = stmt.executeQuery();
-+            assertTrue(null != rset);
-+            assertTrue(rset.next());
-+            rset.close();
-+            stmt.close();
-+        }
-+        {
-+            PreparedStatement stmt = conn.prepareStatement("select * from dual");
-+            assertTrue(null != stmt);
-+            ResultSet rset = stmt.executeQuery();
-+            assertTrue(null != rset);
-+            assertTrue(rset.next());
-+            rset.close();
-+            stmt.close();
-+        }
-+        conn.close();
-+        try {
-+            conn.createStatement();
-+            fail("Can't use closed connections");
-+        } catch(SQLException e) {
-+            ; // expected
-+        }
-+
+         assertTrue(null != conn);
+         {
+             PreparedStatement stmt = conn.prepareStatement("select * from dual");
+@@ -216,7 +238,7 @@
+             ; // expected
+         }
+ 
+-        conn = getConnection();
 +        conn = newConnection();
-+        assertTrue(null != conn);
-+        {
-+            PreparedStatement stmt = conn.prepareStatement("select * from dual");
-+            assertTrue(null != stmt);
-+            ResultSet rset = stmt.executeQuery();
-+            assertTrue(null != rset);
-+            assertTrue(rset.next());
-+            rset.close();
-+            stmt.close();
-+        }
-+        {
-+            PreparedStatement stmt = conn.prepareStatement("select * from dual");
-+            assertTrue(null != stmt);
-+            ResultSet rset = stmt.executeQuery();
-+            assertTrue(null != rset);
-+            assertTrue(rset.next());
-+            rset.close();
-+            stmt.close();
-+        }
-+        conn.close();
-+        conn = null;
-+    }
-+
-+    public void testPooling() throws Exception {  
+         assertTrue(null != conn);
+         {
+             PreparedStatement stmt = conn.prepareStatement("select * from dual");
+@@ -241,47 +263,51 @@
+     }
+ 
+     public void testPooling() throws Exception {
+-        Connection conn = getConnection();
+-        Connection underconn = null;
+-        if(conn instanceof DelegatingConnection) {
+-            underconn = ((DelegatingConnection)conn).getInnermostDelegate();
 +        // Grab a maximal set of open connections from the pool
 +        Connection[] c = new Connection[getMaxActive()];
 +        Connection[] u = new Connection[getMaxActive()];
@@ -763,13 +148,32 @@
 +            c[i] = newConnection();
 +            if (c[i] instanceof DelegatingConnection) {
 +                u[i] = ((DelegatingConnection) c[i]).getInnermostDelegate();
-+            } else {
+         } else {
+-            return; // skip this test
 +                for (int j = 0; j <= i; j++) {
 +                    c[j].close();
-+                }
-+                return; // skip this test   
-+            }
-+        }        
+         }
+-        assertTrue(underconn != null);
+-        Connection conn2 = getConnection();
+-        Connection underconn2 = null;
+-        if(conn2 instanceof DelegatingConnection) {
+-            underconn2 = ((DelegatingConnection)conn2).getInnermostDelegate();
+-        } else {
+             return; // skip this test
+         }
+-        assertTrue(underconn2 != null);
+-        assertTrue(underconn != underconn2);
+-        conn2.close();
+-        conn.close();
+-        Connection conn3 = getConnection();
+-        Connection underconn3 = null;
+-        if(conn3 instanceof DelegatingConnection) {
+-            underconn3 = ((DelegatingConnection)conn3).getInnermostDelegate();
+-        } else {
+-            return; // skip this test
+         }
+-        assertTrue( underconn3 == underconn || underconn3 == underconn2 );
+-        conn3.close();
 +        // Close connections one at a time and get new ones, making sure
 +        // the new ones come from the pool
 +        for (int i = 0; i < c.length; i++) {
@@ -788,222 +192,130 @@
 +            assertTrue("New connection not from pool", found);
 +            con.close();
 +        }
-+    }
-+    
-+    public void testAutoCommitBehavior() throws Exception {
+     }
+     
+     public void testAutoCommitBehavior() throws Exception {
+-        Connection conn = getConnection();
 +        Connection conn = newConnection();
-+        assertTrue(conn != null);
-+        assertTrue(conn.getAutoCommit());
-+        conn.setAutoCommit(false);
-+        conn.close();
-+        
+         assertTrue(conn != null);
+         assertTrue(conn.getAutoCommit());
+         conn.setAutoCommit(false);
+         conn.close();
+         
+-        Connection conn2 = getConnection();
 +        Connection conn2 = newConnection();
-+        assertTrue( conn2.getAutoCommit() );
-+        
+         assertTrue( conn2.getAutoCommit() );
+         
+-        Connection conn3 = getConnection();
 +        Connection conn3 = newConnection();
-+        assertTrue( conn3.getAutoCommit() );
-+
-+        conn2.close();
-+        
-+        conn3.close();
-+    }
-+    
-+    /** @see http://issues.apache.org/bugzilla/show_bug.cgi?id=12400 */
-+    public void testConnectionsAreDistinct() throws Exception {
-+        Connection[] conn = new Connection[getMaxActive()];
-+        for(int i=0;i<conn.length;i++) {
+         assertTrue( conn3.getAutoCommit() );
+ 
+         conn2.close();
+@@ -293,7 +319,7 @@
+     public void testConnectionsAreDistinct() throws Exception {
+         Connection[] conn = new Connection[getMaxActive()];
+         for(int i=0;i<conn.length;i++) {
+-            conn[i] = getConnection();
 +            conn[i] = newConnection();
-+            for(int j=0;j<i;j++) {
-+                assertTrue(conn[j] != conn[i]);
-+                assertTrue(!conn[j].equals(conn[i]));
-+            }
-+        }
-+        for(int i=0;i<conn.length;i++) {
-+            conn[i].close();
-+        }
-+    }
-+
-+
-+    public void testOpening() throws Exception {
-+        Connection[] c = new Connection[getMaxActive()];
-+        // test that opening new connections is not closing previous
-+        for (int i = 0; i < c.length; i++) {
+             for(int j=0;j<i;j++) {
+                 assertTrue(conn[j] != conn[i]);
+                 assertTrue(!conn[j].equals(conn[i]));
+@@ -309,7 +335,7 @@
+         Connection[] c = new Connection[getMaxActive()];
+         // test that opening new connections is not closing previous
+         for (int i = 0; i < c.length; i++) {
+-            c[i] = getConnection();
 +            c[i] = newConnection();
-+            assertTrue(c[i] != null);
-+            for (int j = 0; j <= i; j++) {
-+                assertTrue(!c[j].isClosed());
-+            }
-+        }
-+
-+        for (int i = 0; i < c.length; i++) {
-+            c[i].close();
-+        }
-+    }
-+
-+    public void testClosing() throws Exception {
-+        Connection[] c = new Connection[getMaxActive()];
-+        // open the maximum connections
-+        for (int i = 0; i < c.length; i++) {
+             assertTrue(c[i] != null);
+             for (int j = 0; j <= i; j++) {
+                 assertTrue(!c[j].isClosed());
+@@ -325,7 +351,7 @@
+         Connection[] c = new Connection[getMaxActive()];
+         // open the maximum connections
+         for (int i = 0; i < c.length; i++) {
+-            c[i] = getConnection();
 +            c[i] = newConnection();
-+        }
-+
-+        // close one of the connections
-+        c[0].close();
-+        assertTrue(c[0].isClosed());
-+
-+        // get a new connection
+         }
+ 
+         // close one of the connections
+@@ -333,7 +359,7 @@
+         assertTrue(c[0].isClosed());
+ 
+         // get a new connection
+-        c[0] = getConnection();
 +        c[0] = newConnection();
-+
-+        for (int i = 0; i < c.length; i++) {
-+            c[i].close();
-+        }
-+    }
-+
-+    public void testMaxActive() throws Exception {
-+        Connection[] c = new Connection[getMaxActive()];
-+        for (int i = 0; i < c.length; i++) {
+ 
+         for (int i = 0; i < c.length; i++) {
+             c[i].close();
+@@ -343,12 +369,12 @@
+     public void testMaxActive() throws Exception {
+         Connection[] c = new Connection[getMaxActive()];
+         for (int i = 0; i < c.length; i++) {
+-            c[i] = getConnection();
 +            c[i] = newConnection();
-+            assertTrue(c[i] != null);
-+        }
-+
-+        try {
+             assertTrue(c[i] != null);
+         }
+ 
+         try {
+-            getConnection();
 +            newConnection();
-+            fail("Allowed to open more than DefaultMaxActive connections.");
-+        } catch (java.sql.SQLException e) {
-+            // should only be able to open 10 connections, so this test should
-+            // throw an exception
-+        }
-+
-+        for (int i = 0; i < c.length; i++) {
-+            c[i].close();
-+        }
-+    }
-+
-+    public void testThreaded() {
-+        TestThread[] threads = new TestThread[getMaxActive()];
-+        for(int i=0;i<threads.length;i++) {
-+            threads[i] = new TestThread(50,50);
-+            Thread t = new Thread(threads[i]);
-+            t.start();
-+        }
-+        for(int i=0;i<threads.length;i++) {
-+            while(!(threads[i]).complete()) {
-+                try {
-+                    Thread.sleep(100L);
-+                } catch(Exception e) {
-+                    // ignored
-+                }
-+            }
-+            if(threads[i].failed()) {
-+                fail();
-+            }
-+        }
-+    }
-+
-+    class TestThread implements Runnable {
-+        java.util.Random _random = new java.util.Random();
-+        boolean _complete = false;
-+        boolean _failed = false;
-+        int _iter = 100;
-+        int _delay = 50;
-+
-+        public TestThread() {
-+        }
-+
-+        public TestThread(int iter) {
-+            _iter = iter;
-+        }
-+
-+        public TestThread(int iter, int delay) {
-+            _iter = iter;
-+            _delay = delay;
-+        }
-+
-+        public boolean complete() {
-+            return _complete;
-+        }
-+
-+        public boolean failed() {
-+            return _failed;
-+        }
-+
-+        public void run() {
-+            for(int i=0;i<_iter;i++) {
-+                try {
-+                    Thread.sleep((long)_random.nextInt(_delay));
-+                } catch(Exception e) {
-+                    // ignored
-+                }
-+                Connection conn = null;
-+                PreparedStatement stmt = null;
-+                ResultSet rset = null;
-+                try {
+             fail("Allowed to open more than DefaultMaxActive connections.");
+         } catch (java.sql.SQLException e) {
+             // should only be able to open 10 connections, so this test should
+@@ -360,6 +386,8 @@
+         }
+     }
+ 
++    // Test Disabled due to random failures when using gcj.
++    /*
+     public void testThreaded() {
+         TestThread[] threads = new TestThread[getMaxActive()];
+         for(int i=0;i<threads.length;i++) {
+@@ -379,7 +407,7 @@
+                 fail();
+             }
+         }
+-    }
++    }
 */
+ 
+     class TestThread implements Runnable {
+         java.util.Random _random = new java.util.Random();
+@@ -419,7 +447,7 @@
+                 PreparedStatement stmt = null;
+                 ResultSet rset = null;
+                 try {
+-                    conn = getConnection();
 +                    conn = newConnection();
-+                    stmt = conn.prepareStatement("select 'literal', SYSDATE from dual");
-+                    rset = stmt.executeQuery();
-+                    try {
-+                        Thread.sleep((long)_random.nextInt(_delay));
-+                    } catch(Exception e) {
-+                        // ignored
-+                    }
-+                } catch(Exception e) {
-+                    e.printStackTrace();
-+                    _failed = true;
-+                    _complete = true;
-+                    break;
-+                } finally {
-+                    try { rset.close(); } catch(Exception e) { }
-+                    try { stmt.close(); } catch(Exception e) { }
-+                    try { conn.close(); } catch(Exception e) { }
-+                }
-+            }
-+            _complete = true;
-+        }
-+    }
-+
-+    // Bugzilla Bug 24328: PooledConnectionImpl ignores resultsetType 
-+    // and Concurrency if statement pooling is not enabled
-+    // http://issues.apache.org/bugzilla/show_bug.cgi?id=24328
-+    public void testPrepareStatementOptions() throws Exception 
-+    {
+                     stmt = conn.prepareStatement("select 'literal', SYSDATE from dual");
+                     rset = stmt.executeQuery();
+                     try {
+@@ -447,7 +475,7 @@
+     // http://issues.apache.org/bugzilla/show_bug.cgi?id=24328
+     public void testPrepareStatementOptions() throws Exception 
+     {
+-        Connection conn = getConnection();
 +        Connection conn = newConnection();
-+        assertTrue(null != conn);
-+        PreparedStatement stmt = conn.prepareStatement("select * from dual", 
-+            ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE);
-+        assertTrue(null != stmt);
-+        ResultSet rset = stmt.executeQuery();
-+        assertTrue(null != rset);
-+        assertTrue(rset.next());
-+        
-+        assertEquals(ResultSet.TYPE_SCROLL_SENSITIVE, rset.getType());
-+        assertEquals(ResultSet.CONCUR_UPDATABLE, rset.getConcurrency());
-+        
-+        rset.close();
-+        stmt.close();
-+        conn.close();
-+    }
-+
-+    // Bugzilla Bug 24966: NullPointer with Oracle 9 driver
-+    // wrong order of passivate/close when a rset isn't closed
-+    public void testNoRsetClose() throws Exception {
+         assertTrue(null != conn);
+         PreparedStatement stmt = conn.prepareStatement("select * from dual", 
+             ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE);
+@@ -467,7 +495,7 @@
+     // Bugzilla Bug 24966: NullPointer with Oracle 9 driver
+     // wrong order of passivate/close when a rset isn't closed
+     public void testNoRsetClose() throws Exception {
+-        Connection conn = getConnection();
 +        Connection conn = newConnection();
-+        assertNotNull(conn);
-+        PreparedStatement stmt = conn.prepareStatement("test");
-+        assertNotNull(stmt);
-+        ResultSet rset = stmt.getResultSet();
-+        assertNotNull(rset);
-+        // forget to close the resultset: rset.close();
-+        stmt.close();
-+        conn.close();
-+    }
-+    
-+    // Bugzilla Bug 26966: Connectionpool's connections always returns same
-+    public void testHashCode() throws Exception {
+         assertNotNull(conn);
+         PreparedStatement stmt = conn.prepareStatement("test");
+         assertNotNull(stmt);
+@@ -480,9 +508,9 @@
+     
+     // Bugzilla Bug 26966: Connectionpool's connections always returns same
+     public void testHashCode() throws Exception {
+-        Connection conn1 = getConnection();
 +        Connection conn1 = newConnection();
-+        assertNotNull(conn1);
+         assertNotNull(conn1);
+-        Connection conn2 = getConnection();
 +        Connection conn2 = newConnection();
-+        assertNotNull(conn2);
-+
-+        assertTrue(conn1.hashCode() != conn2.hashCode());
-+    }
-+}
+         assertNotNull(conn2);
+ 
+         assertTrue(conn1.hashCode() != conn2.hashCode());


Index: jakarta-commons-dbcp.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-dbcp/devel/jakarta-commons-dbcp.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jakarta-commons-dbcp.spec	18 Aug 2006 18:44:48 -0000	1.24
+++ jakarta-commons-dbcp.spec	26 Apr 2007 00:45:37 -0000	1.25
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -39,61 +39,78 @@
 %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
 %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
 
-%define base_name	dbcp
-%define short_name	commons-%{base_name}
-%define	section		free
-
-Name:		jakarta-commons-dbcp
-Version:	1.2.1
-Release:	7jpp.1
-Epoch:		0
-Summary:	Jakarta Commons DataBase Pooling Package
-License:	Apache Software License 2.0
-Group:		Development/Libraries/Java
-Source0:	%{short_name}-%{version}-src-RHCLEAN.tar.bz2
+%define base_name       dbcp
+%define short_name      commons-%{base_name}
+%define section         free
+
+Name:           jakarta-commons-dbcp
+Version:        1.2.1
+Release:        10jpp.1%{?dist}
+Epoch:          0
+Summary:        Jakarta Commons DataBase Pooling Package
+License:        Apache Software License 
+Group:          Development/Libraries/Java
+Source0:        http://archive.apache.org/dist/jakarta/commons/dbcp/source/commons-dbcp-1.2.1-src.tar.gz 
 Source1:        pom-maven2jpp-depcat.xsl
 Source2:        pom-maven2jpp-newdepmap.xsl
 Source3:        pom-maven2jpp-mapdeps.xsl
 Source4:        %{base_name}-%{version}-jpp-depmap.xml
 Source5:        commons-build.tar.gz
-
-Patch0:		commons-dbcp-1.2.1-project_xml.patch
-Patch1:		commons-dbcp-1.2.1-TestJOCLed.patch
-Patch2:		commons-dbcp-1.2.1-TestConnectionPool.patch
-Patch3:		commons-dbcp-1.2.1-navigation_xml.patch
-Patch4:		commons-dbcp-1.2.1-project_properties.patch
-
-Url:		http://jakarta.apache.org/commons/%{base_name}
-BuildRequires:	ant
-BuildRequires:	jakarta-commons-collections >= 2.0
-BuildRequires:	jakarta-commons-pool >= 1.1
-BuildRequires:	jdbc-stdext >= 2.0
-BuildRequires:	xerces-j2
-BuildRequires:	xml-commons-apis >= 0:1.3
+# svn export -r '{2007-02-15}' http://svn.apache.org/repos/asf/jakarta/commons/proper/commons-build/trunk/ commons-build
+# tar czf commons-build.tar.gz commons-build
+Source6:        dbcp-tomcat5-build.xml
+
+Patch0:         commons-dbcp-1.2.1-project_xml.patch
+Patch1:         commons-dbcp-1.2.1-TestJOCLed.patch
+Patch2:         commons-dbcp-1.2.1-TestConnectionPool.patch
+Patch3:         commons-dbcp-1.2.1-navigation_xml.patch
+Patch4:         commons-dbcp-1.2.1-project_properties.patch
+
+Url:            http://jakarta.apache.org/commons/%{base_name}
+BuildRequires:  ant
+BuildRequires:  jakarta-commons-collections >= 2.0
+BuildRequires:  jakarta-commons-pool >= 1.1
+BuildRequires:  jdbc-stdext >= 2.0
+BuildRequires:  xerces-j2
+BuildRequires:  xml-commons-apis >= 0:1.3
 BuildRequires:  jpackage-utils > 1.6
-BuildRequires:	junit >= 3.8
+BuildRequires:  junit >= 3.8
+BuildRequires:  jakarta-commons-pool-tomcat5
+BuildRequires:  jakarta-commons-collections-tomcat5
 %if %{with_maven}
 BuildRequires:  maven >= 0:1.1
+BuildRequires:  maven-plugins-base
+BuildRequires:  maven-plugin-test
+BuildRequires:  maven-plugin-xdoc
+BuildRequires:  maven-plugin-license
+BuildRequires:  maven-plugin-changes
+BuildRequires:  maven-plugin-jdepend
+BuildRequires:  maven-plugin-jdiff
+BuildRequires:  maven-plugin-jxr
+BuildRequires:  maven-plugin-tasklist
+BuildRequires:  maven-plugin-developer-activity
+BuildRequires:  maven-plugin-file-activity
 BuildRequires:  saxon
 BuildRequires:  saxon-scripts
 %endif
 
 Requires(post):  /usr/sbin/update-alternatives
 Requires(preun):  /usr/sbin/update-alternatives
-Requires:	jakarta-commons-collections >= 2.0
-Requires:	jakarta-commons-pool >= 1.1
+Requires:       jakarta-commons-collections >= 2.0
+Requires:       jakarta-commons-pool >= 1.1
 %if ! %{gcj_support}
-BuildArch:	noarch
+BuildArch:      noarch
 %endif
-BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
-Provides:	%{short_name}
-Provides:  hibernate_jdbc_cache
-Obsoletes:	%{short_name}
+
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Provides:   %{short_name} = %{epoch}:%{version}-%{release}
+Provides:   hibernate_jdbc_cache = %{epoch}:%{version}-%{release}
+Obsoletes:  %{short_name} < %{epoch}:%{version}-%{release}
 
 %if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
+BuildRequires:          java-gcj-compat-devel
+Requires(post):         java-gcj-compat
+Requires(postun):       java-gcj-compat
 %endif
 
 %description
@@ -113,14 +130,26 @@
 handles any user account issues internally.
 
 %package javadoc
-Summary:	Javadoc for %{name}
-Group:		Development/Documentation
+Summary:        Javadoc for %{name}
+Group:          Development/Documentation
 Requires(post):   /bin/rm,/bin/ln
 Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
 
+%package tomcat5
+Summary:        DBCP dependency for Tomcat5
+Group:          Development/Libraries/Java
+
+%if %{gcj_support}
+Requires(post):         java-gcj-compat
+Requires(postun):       java-gcj-compat
+%endif
+
+%description tomcat5
+DBCP dependency for Tomcat5
+
 %if %{with_maven}
 %package manual
 Summary:        Documents for %{name}
@@ -138,13 +167,16 @@
 
 EOT
 
-rm -rf $RPM_BUILD_ROOT
 %setup -q -n %{short_name}-%{version}
+%{__sed} -i 's/\r//' LICENSE.txt
+%{__sed} -i 's/\r//' NOTICE.txt
+%{__sed} -i 's/\r//' README.txt
 # quick hack
 cp LICENSE.txt ../LICENSE
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 gzip -dc %{SOURCE5} | tar xf -
+cp %{SOURCE6} .
 
 %patch0 -b .sav
 %patch1 -b .sav
@@ -183,21 +215,23 @@
         jar javadoc xdoc:transform
 %else
 
-# FIXME: There are some failures with no specific pattern.
 export CLASSPATH=$(build-classpath jdbc-stdext xerces-j2)
 ant \
-	-Dbuild.sysclasspath=first \
-	-Dcommons-pool.jar=$(build-classpath commons-pool) \
-	-Dcommons-collections.jar=$(build-classpath commons-collections) \
-	-Djunit.jar=$(build-classpath junit) \
-	-Djndi.jar=$(build-classpath jndi) \
-	-Dsax2.jar=$(build-classpath xml-commons-apis) \
-	-Djava.io.tmpdir=. \
-    -Dtest.failonerror=false \
-	dist test
+        -Dbuild.sysclasspath=first \
+        -Dcommons-pool.jar=$(build-classpath commons-pool) \
+        -Dcommons-collections.jar=$(build-classpath commons-collections) \
+        -Djunit.jar=$(build-classpath junit) \
+        -Djndi.jar=$(build-classpath jndi) \
+        -Dsax2.jar=$(build-classpath xml-commons-apis) \
+        -Djava.io.tmpdir=. \
+        dist test
 %endif
 
+export CLASSPATH=$(build-classpath jdbc-stdext xerces-j2 commons-collections-tomcat5 commons-pool-tomcat5)        
+ant     -f dbcp-tomcat5-build.xml
+
 %install
+rm -rf $RPM_BUILD_ROOT
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 %if %{with_maven}
@@ -205,8 +239,12 @@
 %else
 install -m 644 dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 %endif
+#tomcat5 jars 
+install -m 644 dbcp-tomcat5/%{short_name}-tomcat5.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tomcat5-%{version}.jar
+
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|jakarta-||g"`; done)
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 %if %{with_maven}
@@ -215,7 +253,7 @@
 %else
 cp -pr dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 %endif
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %if %{with_maven}
 # manual
@@ -227,10 +265,9 @@
 rm ../LICENSE
 
 # hibernate_jdbc_cache ghost symlink
-ln -s %{_sysconfdir}/alternatives \
+ln -s %{_sysconfdir}/alternatives/hibernate_jdbc_cache \
   $RPM_BUILD_ROOT%{_javadir}/hibernate_jdbc_cache.jar
 
-
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
 %endif
@@ -263,29 +300,48 @@
   update-alternatives --remove hibernate_jdbc_cache %{_javadir}/%{name}.jar
 } >/dev/null 2>&1 || :
 
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-    rm -f %{_javadocdir}/%{name}
+%if %{gcj_support}
+%post tomcat5
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%if %{gcj_support}
+%postun tomcat5
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
 fi
+%endif
 
 %files
 %defattr(-,root,root)
-%doc LICENSE.txt
-%{_javadir}/*
+%doc LICENSE.txt NOTICE.txt README.txt
+%{_javadir}/%{name}.jar
+%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{short_name}.jar
+%{_javadir}/%{short_name}-%{version}.jar
 %ghost %{_javadir}/hibernate_jdbc_cache.jar
 
 %if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
+%endif
+
+%files tomcat5
+%defattr(-,root,root)
+%{_javadir}/*-tomcat5*.jar
+%doc LICENSE.txt NOTICE.txt
+
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/*-tomcat5*
 %endif
 
 %files javadoc
 %defattr(-,root,root)
 %doc %{_javadocdir}/%{name}-%{version}
-%ghost %{_javadocdir}/%{name}
+%doc %{_javadocdir}/%{name}
 
 %if %{with_maven}
 %files manual
@@ -294,6 +350,24 @@
 %endif
 
 %changelog
+* Mon Mar 12 2007 Matt Wringe <mwringe at redhat.com> 0:1.2.1-10jpp.1
+- Merger with newest jpp version
+- Fix rpmlint issues
+- Disable testThreaded for now as it will sometimes fail
+
+* Fri Feb 23 2007 Jason Corley <jason.corley at gmail.com> 0:1.2.1-10jpp
+- update copyright to contain current year
+- rebuild on RHEL4 to avoid broken jar repack script in FC6
+
+* Fri Jan 26 2007 Matt Wringe <mwringe at redhat.com> 0:1.2.1-9jpp
+- Fix bug in dbcp-tomcat5-build.xml
+
+* Mon Jan 22 2007 Matt Wringe <mwringe at redhat.com> 0:1.2.1-8jpp
+- Add tomcat5 subpackage
+- Add versioning to provides and obsoletes
+- Move rm -rf %%RPM_BUILD_ROOT from %%prep to %%install
+- Add missing maven plugin dependencies
+
 * Thu Aug 17 2006 Deepak Bhole <dbhole at redhat.com> 0:1.2.1-7jpp.1
 - Added missing postun section.
 
@@ -356,5 +430,5 @@
 
 * Fri Jun 07 2002 Henri Gomez <hgomez at users.sourceforge.net> 1.0-1jpp 
 - 1.0 (cvs 20020606)
-- added short names in %{_javadir}, as does jakarta developpers
+- added short names in %%{_javadir}, as does jakarta developpers
 - first jPackage release


Index: pom-maven2jpp-mapdeps.xsl
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-dbcp/devel/pom-maven2jpp-mapdeps.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pom-maven2jpp-mapdeps.xsl	20 Jul 2006 22:21:45 -0000	1.1
+++ pom-maven2jpp-mapdeps.xsl	26 Apr 2007 00:45:37 -0000	1.2
@@ -47,19 +47,23 @@
  <xsl:template name="replace">
   <xsl:param name="artifact"/>
   <xsl:variable name="this" select="."/>
-  <xsl:element name="dependency">
    <xsl:choose>
     <xsl:when test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
      <xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
-      <xsl:copy-of select="../jpp/*"/>
-      <xsl:copy-of select="$this/properties"/>
+      <xsl:if test="../jpp">
+       <xsl:element name="dependency">
+        <xsl:copy-of select="../jpp/*"/>
+        <xsl:copy-of select="$this/properties"/>
+       </xsl:element>
+      </xsl:if>
      </xsl:for-each>
     </xsl:when>
     <xsl:otherwise>
-     <xsl:copy-of select="./*"/>
+     <xsl:element name="dependency">
+      <xsl:copy-of select="./*"/>
+     </xsl:element>
     </xsl:otherwise>
    </xsl:choose>
-  </xsl:element>
   <xsl:if test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
    <xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
     <xsl:for-each select="../add/dependency">


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-dbcp/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Jul 2006 23:42:25 -0000	1.5
+++ sources	26 Apr 2007 00:45:37 -0000	1.6
@@ -1,2 +1,2 @@
-e278f00dcafddaead0caa5c1ba991b1b  commons-dbcp-1.2.1-src-RHCLEAN.tar.bz2
-a9522fe95e0fe85857174b3c19763c97  commons-build.tar.gz
+b7336a1d34ea0e8e9c39b67af510c46d  commons-dbcp-1.2.1-src.tar.gz
+ae5c78642da2f356e0d9806c6ce5f265  commons-build.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 26 00:49:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 20:49:36 -0400
Subject: rpms/jakarta-commons-collections/devel
	jakarta-commons-collections.spec, 1.47, 1.48
Message-ID: <200704260049.l3Q0naQl008350@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-collections/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8198

Modified Files:
	jakarta-commons-collections.spec 
Log Message:
A couple of updates for Fedora Review



Index: jakarta-commons-collections.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/jakarta-commons-collections.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- jakarta-commons-collections.spec	12 Mar 2007 23:38:21 -0000	1.47
+++ jakarta-commons-collections.spec	26 Apr 2007 00:49:34 -0000	1.48
@@ -44,9 +44,9 @@
 
 Name:       jakarta-%{short_name}
 Version:    3.1
-Release:    9jpp.1%{?dist}
+Release:    9jpp.2%{?dist}
 Epoch:      0
-Summary:    Jakarta Commons Collections Package
+Summary:    Provides new interfaces, implementations and utilities for Java Collections
 License:    Apache Software License 
 Group:      Development/Libraries/Java
 Source0:    http://www.apache.org/dist/jakarta/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
@@ -90,7 +90,7 @@
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:   %{short_name} = %{epoch}:%{version}-%{release}
 Obsoletes:  %{short_name} < %{epoch}:%{version}-%{release}
 
@@ -137,7 +137,7 @@
 %{summary}.
 
 %package tomcat5
-Summary:        Collection dependency for Tomcat5
+Summary:        Jakarta Commons Collection dependency for Tomcat5
 Group:          Development/Libraries/Java
 
 %if %{gcj_support}
@@ -147,7 +147,7 @@
 %endif
 
 %description tomcat5
-Collections dependency for Tomcat5
+A package that is specifically designed to fulfill to a Tomcat5 dependency.
 
 %package testframework-javadoc
 Summary:        Javadoc for %{name}-testframework
@@ -381,6 +381,9 @@
 %endif
 
 %changelog
+* Wed Apr 25 2007 Matt Wringe <mwringe at redhat.com> - 0:3.1-9jpp.2
+- A couple of spec file cleanups for Fedora Review
+
 * Mon Mar 12 2007 Matt Wringe <mwringe at redhat.com> - 0:3.1-9jpp.1
 - Merge with jpp version
 - Fix rpmlint issues



From fedora-cvs-commits at redhat.com  Thu Apr 26 00:51:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 20:51:09 -0400
Subject: rpms/jakarta-commons-pool/devel jakarta-commons-pool.spec, 1.19,
	1.20
Message-ID: <200704260051.l3Q0p9hE009523@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-pool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9331

Modified Files:
	jakarta-commons-pool.spec 
Log Message:
A couple of minor spec file changes for Fedora Review



Index: jakarta-commons-pool.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-pool/devel/jakarta-commons-pool.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jakarta-commons-pool.spec	8 Mar 2007 19:04:41 -0000	1.19
+++ jakarta-commons-pool.spec	26 Apr 2007 00:51:07 -0000	1.20
@@ -45,7 +45,7 @@
 
 Name:           jakarta-commons-pool
 Version:        1.3
-Release:        9jpp.1%{?dist}
+Release:        9jpp.2%{?dist}
 Epoch:          0
 Summary:        Jakarta Commons Pool Package
 License:        Apache Software License
@@ -106,8 +106,6 @@
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 Requires:       java-javadoc
-Requires(post):   /bin/rm,/bin/ln
-Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -237,7 +235,7 @@
 
 %files
 %defattr(0644,root,root,0755)
-%doc README.txt LICENSE.txt
+%doc README.txt LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
 %{_javadir}/%{name}.jar
 %{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{short_name}.jar
@@ -271,6 +269,9 @@
 %endif
 
 %changelog
+* Wed Apr 25 2007 Matt Wringe <mwringe at redhat.com> 0:1.3-9jpp.2
+- A couple of minor spec file changes for Fedora review
+
 * Wed Mar 07 2007 Matt Wringe <mwringe at redhat.com> 0:1.3-9jpp.1
 - Merge with updated jpp version
 - Updated commons-build, no longer need patchs to get around local



From fedora-cvs-commits at redhat.com  Thu Apr 26 01:22:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 21:22:26 -0400
Subject: rpms/kernel/devel patch-2.6.21-rc7-git9.bz2.sign, NONE,
	1.1 .cvsignore, 1.614, 1.615 kernel-2.6.spec, 1.3114,
	1.3115 sources, 1.577, 1.578 upstream, 1.505,
	1.506 patch-2.6.21-rc7-git8.bz2.sign, 1.1, NONE
Message-ID: <200704260122.l3Q1MQ3o029984@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.21-rc7-git9.bz2.sign 
Removed Files:
	patch-2.6.21-rc7-git8.bz2.sign 
Log Message:
* Wed Apr 25 2007 Dave Jones <davej at redhat.com>
- 2.6.21-rc7-git9



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

iD8DBQBGL6ZnyGugalF9Dw4RAggIAJ9P+UihbVYzp05SRIEDzYw9LITSCACeN0UK
+Ezwal/q4l7JWlhegGmpvFA=
=IUD6
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.614
retrieving revision 1.615
diff -u -r1.614 -r1.615
--- .cvsignore	25 Apr 2007 16:27:58 -0000	1.614
+++ .cvsignore	26 Apr 2007 01:22:23 -0000	1.615
@@ -5,4 +5,4 @@
 kernel-2.6.20
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc7.bz2
-patch-2.6.21-rc7-git8.bz2
+patch-2.6.21-rc7-git9.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3114
retrieving revision 1.3115
diff -u -r1.3114 -r1.3115
--- kernel-2.6.spec	25 Apr 2007 20:55:31 -0000	1.3114
+++ kernel-2.6.spec	26 Apr 2007 01:22:23 -0000	1.3115
@@ -371,7 +371,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.21-rc7.bz2
-Patch2: patch-2.6.21-rc7-git8.bz2
+Patch2: patch-2.6.21-rc7-git9.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -2334,6 +2334,9 @@
 
 %changelog
 * Wed Apr 25 2007 Dave Jones <davej at redhat.com>
+- 2.6.21-rc7-git9
+
+* Wed Apr 25 2007 Dave Jones <davej at redhat.com>
 - Disable CONFIG_ACPI_ASUS in favour of CONFIG_ASUS_LAPTOP
 
 * Wed Apr 25 2007 John W. Linville <linville at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.577
retrieving revision 1.578
diff -u -r1.577 -r1.578
--- sources	25 Apr 2007 16:27:59 -0000	1.577
+++ sources	26 Apr 2007 01:22:23 -0000	1.578
@@ -1,4 +1,4 @@
 2618cbcc9c9ac1c3c04be903fe3338a7  sparse-0.2.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 3a54bf5a7cf6b124e680e1d08fe1b20b  patch-2.6.21-rc7.bz2
-be1c6e406d879b9ab31c590c28f0af80  patch-2.6.21-rc7-git8.bz2
+a11ccd4a3af987208e6c41100ff52b5e  patch-2.6.21-rc7-git9.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.505
retrieving revision 1.506
diff -u -r1.505 -r1.506
--- upstream	25 Apr 2007 16:27:59 -0000	1.505
+++ upstream	26 Apr 2007 01:22:23 -0000	1.506
@@ -1,3 +1,3 @@
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc7.bz2
-patch-2.6.21-rc7-git8.bz2
+patch-2.6.21-rc7-git9.bz2


--- patch-2.6.21-rc7-git8.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 26 02:22:02 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 25 Apr 2007 22:22:02 -0400
Subject: rpms/man-pages-ja/devel .cvsignore, 1.44, 1.45 man-pages-ja.spec,
	1.51, 1.52 sources, 1.43, 1.44
Message-ID: <200704260222.l3Q2M24o007077@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/man-pages-ja/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7060

Modified Files:
	.cvsignore man-pages-ja.spec sources 
Log Message:
* Thu Apr 26 2007 Akira TAGOH <tagoh at redhat.com> - 20070415-1
- updates to 20070415.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/man-pages-ja/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	16 Mar 2007 12:18:31 -0000	1.44
+++ .cvsignore	26 Apr 2007 02:21:59 -0000	1.45
@@ -31,3 +31,4 @@
 man-pages-ja-20070115.tar.gz
 man-pages-ja-20070215.tar.gz
 man-pages-ja-20070315.tar.gz
+man-pages-ja-20070415.tar.gz


Index: man-pages-ja.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-ja/devel/man-pages-ja.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- man-pages-ja.spec	16 Mar 2007 12:04:00 -0000	1.51
+++ man-pages-ja.spec	26 Apr 2007 02:22:00 -0000	1.52
@@ -1,4 +1,4 @@
-%define	manver		20070315
+%define	manver		20070415
 %define	use_utf8	1
 
 Name: man-pages-ja
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Thu Apr 26 2007 Akira TAGOH <tagoh at redhat.com> - 20070415-1
+- updates to 20070415.
+
 * Fri Mar 16 2007 Akira TAGOH <tagoh at redhat.com> - 20070315-1
 - updates to 20070315.
 - convert a spec file to UTF-8.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/man-pages-ja/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	16 Mar 2007 12:18:31 -0000	1.43
+++ sources	26 Apr 2007 02:22:00 -0000	1.44
@@ -1 +1 @@
-4a929c7c006369658e593ebb2e5c6acf  man-pages-ja-20070315.tar.gz
+178f6cbe9e68fef1b53313f38adc28cb  man-pages-ja-20070415.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 26 04:07:27 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 00:07:27 -0400
Subject: rpms/pm-utils/devel pm-utils.spec,1.55,1.56
Message-ID: <200704260407.l3Q47R1m030801@cvs.devel.redhat.com>

Author: pjones

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

Modified Files:
	pm-utils.spec 
Log Message:
- add build dep for zlib



Index: pm-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- pm-utils.spec	25 Apr 2007 17:35:46 -0000	1.55
+++ pm-utils.spec	26 Apr 2007 04:07:24 -0000	1.56
@@ -30,7 +30,7 @@
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: hal-devel pkgconfig pciutils-devel
-BuildRequires: dbus-devel >= 0.90
+BuildRequires: dbus-devel >= 0.90, zlib-devel
 
 Patch0: pm-utils-0.99.3-disable.patch
 #Patch1: pm-utils-0.19-vidhooks.patch



From fedora-cvs-commits at redhat.com  Thu Apr 26 04:26:56 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 00:26:56 -0400
Subject: rpms/pm-utils/devel vbetool-libz.patch, NONE, 1.1 pm-utils.spec,
	1.56, 1.57
Message-ID: <200704260426.l3Q4QucQ031165@cvs.devel.redhat.com>

Author: pjones

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

Modified Files:
	pm-utils.spec 
Added Files:
	vbetool-libz.patch 
Log Message:
- fix zlib linkage


vbetool-libz.patch:
 Makefile.am |    4 ++--
 Makefile.in |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE vbetool-libz.patch ---
--- vbetool-0.7/Makefile.am.zlib	2007-04-26 00:15:40.000000000 -0400
+++ vbetool-0.7/Makefile.am	2007-04-26 00:15:59.000000000 -0400
@@ -6,11 +6,11 @@
 
 if WITH_X86EMU
 x86 = thunk.c x86-common.c
-vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a
+vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a $(libdir)/libz.a
 else
 x86 = lrmi.c x86-common.c
 x86lib = ""
-vbetool_LDADD = $(libdir)/libpci.a
+vbetool_LDADD = $(libdir)/libpci.a $(libdir)/libz.a
 endif
 
 man_MANS = vbetool.1
--- vbetool-0.7/Makefile.in.zlib	2007-04-26 00:16:04.000000000 -0400
+++ vbetool-0.7/Makefile.in	2007-04-26 00:16:20.000000000 -0400
@@ -57,9 +57,9 @@
 @WITH_X86EMU_TRUE at am__objects_1 = thunk.$(OBJEXT) x86-common.$(OBJEXT)
 am_vbetool_OBJECTS = vbetool.$(OBJEXT) $(am__objects_1)
 vbetool_OBJECTS = $(am_vbetool_OBJECTS)
- at WITH_X86EMU_FALSE@vbetool_DEPENDENCIES = $(libdir)/libpci.a
+ at WITH_X86EMU_FALSE@vbetool_DEPENDENCIES = $(libdir)/libpci.a $(libdir)/libz.a
 @WITH_X86EMU_TRUE at vbetool_DEPENDENCIES = x86emu/libx86emu.a \
- at WITH_X86EMU_TRUE@	$(libdir)/libpci.a
+ at WITH_X86EMU_TRUE@	$(libdir)/libpci.a $(libdir)/libz.a
 DEFAULT_INCLUDES = -I. -I$(srcdir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles


Index: pm-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- pm-utils.spec	26 Apr 2007 04:07:24 -0000	1.56
+++ pm-utils.spec	26 Apr 2007 04:26:50 -0000	1.57
@@ -37,6 +37,7 @@
 Patch2: pm-utils-0.99.3-vbe-redirect.patch
 
 Patch10: vbetool-0.3-fix-gcc4bug.patch
+Patch11: vbetool-libz.patch
 
 Patch20: radeontool-1.5.diff
 Patch21: radeontool-fix-option-handling.diff
@@ -54,6 +55,7 @@
 %patch2 -p1 -b .vbe-redirect
 
 %patch10 -p0 -b .gcc4
+%patch11 -p0 -b .zlib
 
 cd radeontool-1.5
 %patch20 -p0 -b .volatile
@@ -76,7 +78,7 @@
 
 %ifarch i386 x86_64
 cd radeontool-1.5
-%{__cc} $RPM_OPT_FLAGS -o radeontool radeontool.c -lpci
+%{__cc} $RPM_OPT_FLAGS -o radeontool radeontool.c -lpci -lz
 cd ..
 %endif
 
@@ -165,6 +167,7 @@
 %changelog
 * Wed Apr 25 2007 Peter Jones <pjones at redhat.com> - 0.99.3-2
 - Get rid of bogus redirect on "vbetool post"
+- add zlib linkage for vbetool and radeontool
 
 * Mon Mar 26 2007 Peter Jones <pjones at redhat.com> - 0.99.3-1
 - update to 0.99.3



From fedora-cvs-commits at redhat.com  Thu Apr 26 04:34:38 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 00:34:38 -0400
Subject: rpms/pm-utils/devel vbetool-libz.patch,1.1,1.2
Message-ID: <200704260434.l3Q4YcbN012738@cvs.devel.redhat.com>

Author: pjones

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

Modified Files:
	vbetool-libz.patch 
Log Message:
- fix the vbetool libz patch once more!


vbetool-libz.patch:
 Makefile.am |    4 ++--
 Makefile.in |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

Index: vbetool-libz.patch
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/vbetool-libz.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vbetool-libz.patch	26 Apr 2007 04:26:50 -0000	1.1
+++ vbetool-libz.patch	26 Apr 2007 04:34:35 -0000	1.2
@@ -1,5 +1,5 @@
---- vbetool-0.7/Makefile.am.zlib	2007-04-26 00:15:40.000000000 -0400
-+++ vbetool-0.7/Makefile.am	2007-04-26 00:15:59.000000000 -0400
+--- vbetool-0.7/Makefile.am.zlib	2006-07-25 21:21:31.000000000 -0400
++++ vbetool-0.7/Makefile.am	2007-04-26 00:18:40.000000000 -0400
 @@ -6,11 +6,11 @@
  
  if WITH_X86EMU
@@ -14,8 +14,8 @@
  endif
  
  man_MANS = vbetool.1
---- vbetool-0.7/Makefile.in.zlib	2007-04-26 00:16:04.000000000 -0400
-+++ vbetool-0.7/Makefile.in	2007-04-26 00:16:20.000000000 -0400
+--- vbetool-0.7/Makefile.in.zlib	2006-07-25 21:26:30.000000000 -0400
++++ vbetool-0.7/Makefile.in	2007-04-26 00:20:34.000000000 -0400
 @@ -57,9 +57,9 @@
  @WITH_X86EMU_TRUE at am__objects_1 = thunk.$(OBJEXT) x86-common.$(OBJEXT)
  am_vbetool_OBJECTS = vbetool.$(OBJEXT) $(am__objects_1)
@@ -28,3 +28,14 @@
  DEFAULT_INCLUDES = -I. -I$(srcdir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
+@@ -174,8 +174,8 @@
+ SUBDIRS = x86emu
+ @WITH_X86EMU_FALSE at x86 = lrmi.c x86-common.c
+ @WITH_X86EMU_TRUE at x86 = thunk.c x86-common.c
+- at WITH_X86EMU_FALSE@vbetool_LDADD = $(libdir)/libpci.a
+- at WITH_X86EMU_TRUE@vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a
++ at WITH_X86EMU_FALSE@vbetool_LDADD = $(libdir)/libpci.a $(libdir)/libz.a
++ at WITH_X86EMU_TRUE@vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a $(libdir)/libz.a
+ @WITH_X86EMU_FALSE at x86lib = ""
+ man_MANS = vbetool.1
+ vbetool_SOURCES = vbetool.c $(x86)



From fedora-cvs-commits at redhat.com  Thu Apr 26 10:13:19 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 06:13:19 -0400
Subject: rpms/avahi/FC-6 avahi-0.6.16-status-ec.patch, NONE, 1.1 avahi.spec,
	1.74, 1.75
Message-ID: <200704261013.l3QADJ0s007291@cvs.devel.redhat.com>

Author: mbacovsk

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

Modified Files:
	avahi.spec 
Added Files:
	avahi-0.6.16-status-ec.patch 
Log Message:
* Wed Apr 11 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.6.16-4
- resolves: #185692: avahi-sharp installs into wrong location for x86-64
- resolves: #220267: avahi-qt3.pc depends on qt-mt.pc but the rpm does not
- resolves: #237844: command service avahi-daemon status returns wrong value


avahi-0.6.16-status-ec.patch:
 avahi-daemon.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE avahi-0.6.16-status-ec.patch ---
--- avahi-0.6.16/initscript/fedora/avahi-daemon.in.status-ec	2007-04-26 11:59:05.000000000 +0200
+++ avahi-0.6.16/initscript/fedora/avahi-daemon.in	2007-04-26 11:59:42.000000000 +0200
@@ -80,7 +80,7 @@
 	;;
   status)
         $AVAHI_BIN -c
-	[ $? = 0 ] && echo $"Avahi daemon is running" || echo $"Avahi daemon is not running"
+	[ $? = 0 ] && echo $"Avahi daemon is running" || ( echo $"Avahi daemon is not running" ; exit 1 )
 	;;
   restart)
 	restart


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/FC-6/avahi.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- avahi.spec	30 Mar 2007 20:00:42 -0000	1.74
+++ avahi.spec	26 Apr 2007 10:13:17 -0000	1.75
@@ -6,7 +6,7 @@
 %endif
 Name:           avahi
 Version:        0.6.16
-Release: 	    3%{?dist}
+Release: 	    4%{?dist}
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -39,12 +39,12 @@
 # enable mono's mcs to work in beehive buildroot:
 Patch6:     avahi-0.6.3-MONO_SHARED_DIR.patch
 Patch14:	avahi-0.6.9-bz189427.patch
-Patch15:	avahi-0.6.9-mono-libdir.patch
 Patch17:	avahi-0.6.11-use-ipv6-yes.patch
 Patch20: 	avahi-0.6.15-initscript.patch
 Patch21: 	avahi-0.6.11-align.patch
 Patch23:    avahi-0.6.15-netdev.patch
 Patch24: 	avahi-0.6.16-register-time-event.patch
+Patch25:	avahi-0.6.16-status-ec.patch
 
 
 %description
@@ -166,12 +166,12 @@
 %patch6 -p1 -b .MONO_SHARED_DIR
 %endif
 %patch14 -p1 -b .bz189427
-%patch15 -p1 -b .mono-libdir
 %patch17 -p1 -b .use-ipv6-yes
 %patch20 -p1 -b .initscript
 %patch21 -p1 -b .align
 %patch23 -p1 -b .netdev
 %patch24 -p0 -b .register-time-event
+%patch25 -p1 -b .status-ec
 
 %build
 # auto* update needed for avahi-0.5.2-fedora.patch
@@ -223,10 +223,6 @@
 mkdir -p $RPM_BUILD_ROOT/etc/avahi/etc
 touch $RPM_BUILD_ROOT/etc/avahi/etc/localtime
 #
-# Fix avahi-sharp default installation into /usr/lib64 on x86_64:
-if [ ! -e $RPM_BUILD_ROOT/%{_prefix}/lib/mono ] && [ -e  $RPM_BUILD_ROOT/%{_libdir}/mono ]; then
-   mv -f $RPM_BUILD_ROOT/%{_libdir}/mono $RPM_BUILD_ROOT/%{_prefix}/lib; 
-fi
 # fix bug 197414 - add missing symlinks for avahi-compat-howl and avahi-compat-dns-sd
 %if %{WITH_COMPAT_HOWL}
 ln -s avahi-compat-howl.pc  $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/howl.pc 
@@ -342,18 +338,18 @@
 %files qt3
 %defattr(0644, root, root, 0755)
 %attr(755,root,root) %{_libdir}/libavahi-qt3.so.*
-%{_libdir}/pkgconfig/avahi-qt3.pc
 
 %files qt3-devel
 %defattr(0644, root, root, 0755)
 %attr(755,root,root) %{_libdir}/libavahi-qt3.so
 %{_includedir}/avahi-qt3
+%{_libdir}/pkgconfig/avahi-qt3.pc
 
 %if %{WITH_MONO}
 %files sharp
 %defattr(0644, root, root, 0755)
-%{_prefix}/lib/mono/avahi-sharp
-%{_prefix}/lib/mono/gac/avahi-sharp
+%{_libdir}/mono/avahi-sharp
+%{_libdir}/mono/gac/avahi-sharp
 %{_libdir}/pkgconfig/avahi-sharp.pc
 %endif
 
@@ -385,14 +381,19 @@
 %endif
 
 %changelog
-* Fri Mar 30 2007 Dan Williams <dcbw at redhat.com> - 0.6.16-3.fc6
+* Wed Apr 11 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.6.16-4
+- resolves: #185692: avahi-sharp installs into wrong location for x86-64
+- resolves: #220267: avahi-qt3.pc depends on qt-mt.pc but the rpm does not
+- resolves: #237844: command service avahi-daemon status returns wrong value
+
+* Fri Mar 30 2007 Dan Williams <dcbw at redhat.com> - 0.6.16-3
 - Fix race condition during conflict state that triggers an assertion
     http://www.avahi.org/changeset/1400
 
-* Tue Jan 16 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.6.16-2.fc6
+* Tue Jan 16 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.6.16-2
 - Resolves: #219218 - avahi package does not create group "netdev"
 
-* Sun Jan  7 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.6.16-1.fc6
+* Sun Jan  7 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.6.16-1
 - Resolves: #221440 - CVE-2006-6870 Maliciously crafted packed can DoS avahi daemon
 - Resolves: #219218 - avahi package does not create group "netdev"
 



From fedora-cvs-commits at redhat.com  Thu Apr 26 10:59:40 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 06:59:40 -0400
Subject: rpms/pilot-link/devel .cvsignore, 1.13, 1.14 pilot-link.spec, 1.54,
	1.55 sources, 1.14, 1.15
Message-ID: <200704261059.l3QAxeLP008446@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/pilot-link/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8334

Modified Files:
	.cvsignore pilot-link.spec sources 
Log Message:
- update to 0.12.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pilot-link/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	6 Sep 2006 16:28:03 -0000	1.13
+++ .cvsignore	26 Apr 2007 10:59:38 -0000	1.14
@@ -1 +1 @@
-pilot-link-0.12.1.tar.bz2
+pilot-link-0.12.2.tar.bz2


Index: pilot-link.spec
===================================================================
RCS file: /cvs/dist/rpms/pilot-link/devel/pilot-link.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- pilot-link.spec	16 Apr 2007 10:04:12 -0000	1.54
+++ pilot-link.spec	26 Apr 2007 10:59:38 -0000	1.55
@@ -2,8 +2,8 @@
 %define perl_version 5.8.0
 
 Name: pilot-link
-Version: 0.12.1
-Release: 6%{?dist}
+Version: 0.12.2
+Release: 1%{?dist}
 Epoch: 2
 License: GPL
 Group: Applications/Communications
@@ -143,6 +143,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Apr 26 2007 Ivana Varekova <varekova at redhat.com> - 2:0.12.2-1
+- update to 0.12.2
+
 * Mon Apr 16 2007 Ivana Varekova <varekova at redhat.com> - 2:0.12.1-6
 - add --enable-libusb (#236413)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pilot-link/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	6 Sep 2006 16:28:03 -0000	1.14
+++ sources	26 Apr 2007 10:59:38 -0000	1.15
@@ -1 +1 @@
-80579c6f68eb583f54294d5651c4632b  pilot-link-0.12.1.tar.bz2
+c1f4db8f32a2ee916fedb9a2dac8aa26  pilot-link-0.12.2.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 26 11:59:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 07:59:09 -0400
Subject: rpms/procps/FC-6 procps-3.2.7-ps-stime.patch, NONE,
	1.1 procps-3.2.7-sysctl-tmpname.patch, NONE,
	1.1 procps-3.2.7-watch-unicode.patch, NONE, 1.1 procps.spec,
	1.60, 1.61
Message-ID: <200704261159.l3QBx9fR030658@cvs.devel.redhat.com>

Author: tsmetana

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

Modified Files:
	procps.spec 
Added Files:
	procps-3.2.7-ps-stime.patch procps-3.2.7-sysctl-tmpname.patch 
	procps-3.2.7-watch-unicode.patch 
Log Message:
new patches for ps, watch and sysctl

procps-3.2.7-ps-stime.patch:
 common.h |    1 +
 global.c |   20 ++++++++++++++++++--
 output.c |    2 --
 3 files changed, 19 insertions(+), 4 deletions(-)

--- NEW FILE procps-3.2.7-ps-stime.patch ---
--- procps-3.2.7/ps/output.c.jitter	2007-04-26 13:15:47.000000000 +0200
+++ procps-3.2.7/ps/output.c	2007-04-26 13:31:24.000000000 +0200
@@ -77,7 +77,6 @@
 static int wide_signals;  /* true if we have room */
 
 static unsigned long seconds_since_1970;
-static unsigned long time_of_boot;
 static unsigned long page_shift;
 
 
@@ -1952,7 +1951,6 @@
   // available space:  page_size*outbuf_pages-SPACE_AMOUNT
 
   seconds_since_1970 = time(NULL);
-  time_of_boot = seconds_since_1970 - seconds_since_boot;
 
   meminfo();
 
--- procps-3.2.7/ps/common.h.jitter	2005-01-27 04:43:22.000000000 +0100
+++ procps-3.2.7/ps/common.h	2007-04-26 12:44:01.000000000 +0200
@@ -302,6 +302,7 @@
 extern int             screen_cols;
 extern int             screen_rows;
 extern unsigned long   seconds_since_boot;
+extern unsigned long   time_of_boot;
 extern selection_node *selection_list;
 extern unsigned        simple_select;
 extern sort_node      *sort_list;
--- procps-3.2.7/ps/global.c.jitter	2005-10-30 01:43:34.000000000 +0200
+++ procps-3.2.7/ps/global.c	2007-04-26 13:26:38.000000000 +0200
@@ -70,6 +70,7 @@
 int             screen_cols = -1;
 int             screen_rows = -1;
 unsigned long   seconds_since_boot = -1;
+unsigned long   time_of_boot = -1;
 selection_node *selection_list = (selection_node *)0xdeadbeef;
 unsigned        simple_select = 0xffffffff;
 sort_node      *sort_list = (sort_node *)0xdeadbeef; /* ready-to-use sort list */
@@ -361,7 +362,23 @@
   look_up_our_self(&p);
   set_screen_size();
   set_personality();
-  
+  int fd;
+  char *buf[BUFFSIZE];
+  const char *b;
+
+  /* get boot time from /proc/stat */
+  fd = open("/proc/stat", O_RDONLY, 0);
+  if (fd != -1) {
+    buf[BUFFSIZE-1] = 0;
+    read(fd, buf, BUFFSIZE-1);
+    b = strstr(buf, "btime ");
+    if (b) {
+      sscanf(b, "btime %lu", &time_of_boot);
+      seconds_since_boot = time(0) - time_of_boot;
+    }  
+    close(fd);
+  }
+    
   all_processes         = 0;
   bsd_c_option          = 0;
   bsd_e_option          = 0;
@@ -380,7 +397,6 @@
   negate_selection      = 0;
   page_size             = getpagesize();
   running_only          = 0;
-  seconds_since_boot    = uptime(0,0);
   selection_list        = NULL;
   simple_select         = 0;
   sort_list             = NULL;

procps-3.2.7-sysctl-tmpname.patch:
 sysctl.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE procps-3.2.7-sysctl-tmpname.patch ---
--- procps-3.2.7/sysctl.c.old	2007-04-25 16:38:30.000000000 +0200
+++ procps-3.2.7/sysctl.c	2007-04-25 16:39:12.000000000 +0200
@@ -174,7 +174,7 @@
    }
 
    /* used to open the file */
-   tmpname = malloc(strlen(name)+strlen(PROC_PATH)+1);
+   tmpname = malloc(strlen(name)+strlen(PROC_PATH)+2);
    strcpy(tmpname, PROC_PATH);
    strcat(tmpname, name); 
    slashdot(tmpname+strlen(PROC_PATH),'.','/'); /* change . to / */

procps-3.2.7-watch-unicode.patch:
 Makefile |    2 -
 watch.c  |   70 ++++++++++++++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 55 insertions(+), 17 deletions(-)

--- NEW FILE procps-3.2.7-watch-unicode.patch ---
diff -u procps-3.2.7/Makefile procps/Makefile
--- procps-3.2.7/Makefile	2007-01-16 17:24:49.000000000 +0100
+++ procps/Makefile	2007-01-16 17:29:27.000000000 +0100
@@ -67,7 +67,7 @@
 # plus the top-level Makefile to make it work stand-alone.
 _TARFILES := Makefile
 
-CURSES := -lncurses
+CURSES := -lncursesw
 
 # This seems about right for the dynamic library stuff.
 # Something like this is probably needed to make the SE Linux
diff -u procps-3.2.7/watch.c procps/watch.c
--- procps-3.2.7/watch.c	2007-01-16 17:24:49.000000000 +0100
+++ procps/watch.c	2007-01-16 18:06:57.000000000 +0100
@@ -15,7 +15,7 @@
 #include <ctype.h>
 #include <getopt.h>
 #include <signal.h>
-#include <ncurses.h>
+#include <ncursesw/ncurses.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -28,6 +28,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <wchar.h>
+#include <wctype.h>
 
 #ifdef FORCE_8BIT
 #undef isprint
@@ -137,6 +139,27 @@
 	}
 }
 
+static wint_t
+readwc(FILE *stream, mbstate_t *mbs)
+{
+	for (;;) {
+		int chr;
+		char c;
+		wchar_t wc;
+		size_t len;
+
+		chr = getc(stream);
+		if (chr == EOF)
+			return WEOF;
+		c = chr;
+		len = mbrtowc(&wc, &c, 1, mbs);
+		if (len == (size_t)-1)
+			memset(mbs, 0, sizeof(*mbs));
+		else if (len != (size_t)-2)
+			return wc;
+	}
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -243,6 +266,7 @@
 		FILE *p;
 		int x, y;
 		int oldeolseen = 1;
+		mbstate_t mbs;
 
 		if (screen_size_changed) {
 			get_terminal_size();
@@ -276,49 +300,63 @@
 			do_exit(2);
 		}
 
+		memset(&mbs, 0, sizeof(mbs));
 		for (y = show_title; y < height; y++) {
 			int eolseen = 0, tabpending = 0;
 			for (x = 0; x < width; x++) {
-				int c = ' ';
-				int attr = 0;
+				wint_t c = L' ';
+				int attr = 0, c_width;
+				cchar_t cc;
+				wchar_t wstr[2];
 
 				if (!eolseen) {
 					/* if there is a tab pending, just spit spaces until the
 					   next stop instead of reading characters */
 					if (!tabpending)
 						do
-							c = getc(p);
-						while (c != EOF && !isprint(c)
-						       && c != '\n'
-						       && c != '\t');
-					if (c == '\n')
+							c = readwc(p, &mbs);
+						while (c != WEOF && !iswprint(c)
+						       && c != L'\n'
+						       && c != L'\t');
+					if (c == L'\n')
 						if (!oldeolseen && x == 0) {
 							x = -1;
 							continue;
 						} else
 							eolseen = 1;
-					else if (c == '\t')
+					else if (c == L'\t')
 						tabpending = 1;
-					if (c == EOF || c == '\n' || c == '\t')
-						c = ' ';
+					if (c == WEOF || c == L'\n' || c == L'\t')
+						c = L' ';
 					if (tabpending && (((x + 1) % 8) == 0))
 						tabpending = 0;
 				}
+				wstr[0] = c;
+				wstr[1] = 0;
+				setcchar (&cc, wstr, 0, 0, NULL);
 				move(y, x);
 				if (option_differences) {
-					int oldch = inch();
-					char oldc = oldch & A_CHARTEXT;
+					cchar_t oldc;
+					wchar_t oldwstr[2];
+					attr_t attrs;
+					short colors;
+
+					in_wch(&oldc);
+					getcchar(&oldc, oldwstr, &attrs, &colors, NULL);
 					attr = !first_screen
-					    && (c != oldc
+					    && (wstr[0] != oldwstr[0]
 						||
 						(option_differences_cumulative
-						 && (oldch & A_ATTRIBUTES)));
+						 && attrs));
 				}
 				if (attr)
 					standout();
-				addch(c);
+				add_wch(&cc);
 				if (attr)
 					standend();
+				c_width = wcwidth(c);
+				if (c_width > 1)
+					x += c_width - 1;
 			}
 			oldeolseen = eolseen;
 		}


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/FC-6/procps.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- procps.spec	3 Apr 2007 10:15:02 -0000	1.60
+++ procps.spec	26 Apr 2007 11:59:06 -0000	1.61
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities.
 Name: procps
 Version: 3.2.7
-Release: 8.3%{dist}
+Release: 9%{?dist}
 License: GPL
 Group: Applications/System
 Source: http://procps.sourceforge.net/procps-%{version}.tar.gz
@@ -49,6 +49,11 @@
 Patch22: procps-3.2.7-top-sorthigh.path
 # 234546 - 'w' doesn't give correct information about what's being run.
 Patch23: procps-3.2.7-w-best.patch
+# 183029 - watch ignores unicode characters
+Patch24: procps-3.2.7-watch-unicode.patch
+Patch25: procps-3.2.7-sysctl-tmpname.patch
+# 222251 - STIME can jitter by one second
+Patch26: procps-3.2.7-ps-stime.patch
 
 BuildRequires: ncurses-devel
 
@@ -97,6 +102,9 @@
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
 
 cp %SOURCE1 .
 
@@ -134,6 +142,11 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Thu Apr 26 2007 Tomas Smetana <tsmetana at redhat.com> 3.2.7-9
+- fix #183029 - watch ignores multibyte characters
+- fix #222251 - STIME column can jitter
+- fix array overflow in sysctl
+
 * Tue Apr  3 2007 Karel Zak <kzak at redhat.com> 3.2.7-8.3
 - fix #234546 - 'w' doesn't give correct information about what's being run.
 - fix #228870 - process `sysctl' is using deprecated sysctl



From fedora-cvs-commits at redhat.com  Thu Apr 26 12:39:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 08:39:50 -0400
Subject: rpms/hal-cups-utils/devel .cvsignore, 1.16, 1.17 hal-cups-utils.spec,
	1.53, 1.54 sources, 1.16, 1.17
Message-ID: <200704261239.l3QCdogg018202@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore hal-cups-utils.spec sources 
Log Message:
* Thu Apr 26 2007 Tim Waugh <twaugh at redhat.com> 0.6.8-1
- 0.6.8:
  - Several hal backend fixes (retry when device not connected,
    printer state management, paper-out detection).
  - Small hal_lpadmin fix for traceback.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	25 Apr 2007 12:01:34 -0000	1.16
+++ .cvsignore	26 Apr 2007 12:39:48 -0000	1.17
@@ -4,3 +4,4 @@
 hal-cups-utils-0.6.5.tar.gz
 hal-cups-utils-0.6.6.tar.gz
 hal-cups-utils-0.6.7.tar.gz
+hal-cups-utils-0.6.8.tar.gz


Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- hal-cups-utils.spec	25 Apr 2007 12:01:34 -0000	1.53
+++ hal-cups-utils.spec	26 Apr 2007 12:39:48 -0000	1.54
@@ -1,6 +1,6 @@
 Summary: Halified CUPS utilities 
 Name: hal-cups-utils
-Version: 0.6.7
+Version: 0.6.8
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
@@ -59,6 +59,12 @@
 %{_initrddir}/cups-config-daemon
 
 %changelog
+* Thu Apr 26 2007 Tim Waugh <twaugh at redhat.com> 0.6.8-1
+- 0.6.8:
+  - Several hal backend fixes (retry when device not connected,
+    printer state management, paper-out detection).
+  - Small hal_lpadmin fix for traceback.
+
 * Wed Apr 25 2007 Tim Waugh <twaugh at redhat.com> 0.6.7-1
 - 0.6.7:
   - Use usb: URI scheme when possible (bug #236720).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	25 Apr 2007 12:01:34 -0000	1.16
+++ sources	26 Apr 2007 12:39:48 -0000	1.17
@@ -1 +1 @@
-457343aac052cb621a211d4262374720  hal-cups-utils-0.6.7.tar.gz
+492c3833be5556f23e7ef291b26c7677  hal-cups-utils-0.6.8.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 26 12:40:30 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 08:40:30 -0400
Subject: rpms/hal-cups-utils/FC-6 .cvsignore, 1.15, 1.16 hal-cups-utils.spec,
	1.49, 1.50 sources, 1.15, 1.16
Message-ID: <200704261240.l3QCeULF018721@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore hal-cups-utils.spec sources 
Log Message:
* Thu Apr 26 2007 Tim Waugh <twaugh at redhat.com> 0.6.8-1
- 0.6.8:
  - Several hal backend fixes (retry when device not connected,
    printer state management, paper-out detection).
  - Small hal_lpadmin fix for traceback.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/FC-6/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	25 Apr 2007 12:02:47 -0000	1.15
+++ .cvsignore	26 Apr 2007 12:40:24 -0000	1.16
@@ -3,3 +3,4 @@
 hal-cups-utils-0.6.4.tar.gz
 hal-cups-utils-0.6.5.tar.gz
 hal-cups-utils-0.6.7.tar.gz
+hal-cups-utils-0.6.8.tar.gz


Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/FC-6/hal-cups-utils.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- hal-cups-utils.spec	25 Apr 2007 12:02:47 -0000	1.49
+++ hal-cups-utils.spec	26 Apr 2007 12:40:24 -0000	1.50
@@ -59,6 +59,12 @@
 %{_initrddir}/cups-config-daemon
 
 %changelog
+* Thu Apr 26 2007 Tim Waugh <twaugh at redhat.com> 0.6.8-1
+- 0.6.8:
+  - Several hal backend fixes (retry when device not connected,
+    printer state management, paper-out detection).
+  - Small hal_lpadmin fix for traceback.
+
 * Wed Apr 25 2007 Tim Waugh <twaugh at redhat.com> 0.6.7-1
 - 0.6.7:
   - Use usb: URI scheme when possible (bug #236720).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/FC-6/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	25 Apr 2007 12:02:47 -0000	1.15
+++ sources	26 Apr 2007 12:40:24 -0000	1.16
@@ -1,2 +1 @@
-c6c136608761159f9d2cc682ee2b1e8d  hal-cups-utils-0.6.5.tar.gz
-457343aac052cb621a211d4262374720  hal-cups-utils-0.6.7.tar.gz
+492c3833be5556f23e7ef291b26c7677  hal-cups-utils-0.6.8.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 26 12:42:14 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 08:42:14 -0400
Subject: rpms/hal-cups-utils/FC-6 hal-cups-utils.spec,1.50,1.51
Message-ID: <200704261242.l3QCgEX3020097@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hal-cups-utils.spec 
Log Message:
Bump version.


Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/FC-6/hal-cups-utils.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- hal-cups-utils.spec	26 Apr 2007 12:40:24 -0000	1.50
+++ hal-cups-utils.spec	26 Apr 2007 12:42:12 -0000	1.51
@@ -1,6 +1,6 @@
 Summary: Halified CUPS utilities 
 Name: hal-cups-utils
-Version: 0.6.7
+Version: 0.6.8
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System



From fedora-cvs-commits at redhat.com  Thu Apr 26 12:50:11 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 08:50:11 -0400
Subject: rpms/cups/devel cups.init,1.10,1.11 cups.spec,1.328,1.329
Message-ID: <200704261250.l3QCoBs0025895@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.init cups.spec 
Log Message:
* Thu Apr 26 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-8
- Initscript fixes (bug #237955).
- Resolves: rhbz#237955



Index: cups.init
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cups.init	1 Jun 2006 12:58:58 -0000	1.10
+++ cups.init	26 Apr 2007 12:50:08 -0000	1.11
@@ -32,13 +32,7 @@
 # Linux
 
 # Source function library.
-if [ -f /etc/init.d/functions ] ; then
-	. /etc/init.d/functions
-elif [ -f /etc/rc.d/init.d/functions ] ; then
-	. /etc/rc.d/init.d/functions
-else
-	exit 0
-fi
+. /etc/init.d/functions
 
 DAEMON=cupsd
 
@@ -90,6 +84,7 @@
 	;;
 	status)
 		status $DAEMON
+		RETVAL=$?
 	;;
 	restartlog)
 		stop
@@ -99,7 +94,7 @@
 	*)
 
 	echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}"
-	exit 1
+	exit 3
 esac
 
 exit $RETVAL


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -r1.328 -r1.329
--- cups.spec	25 Apr 2007 17:10:11 -0000	1.328
+++ cups.spec	26 Apr 2007 12:50:08 -0000	1.329
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.10
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -442,6 +442,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Apr 26 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-8
+- Initscript fixes (bug #237955).
+
 * Wed Apr 25 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-7
 - Until bug #236736 is fixed, work around the kernel usblp driver's
   quirks so that we can detect paper-out conditions.



From fedora-cvs-commits at redhat.com  Thu Apr 26 13:11:22 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 09:11:22 -0400
Subject: rpms/jdepend/devel jdepend.spec,1.19,1.20
Message-ID: <200704261311.l3QDBMh3008830@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jdepend/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8715

Modified Files:
	jdepend.spec 
Log Message:
rebuild



Index: jdepend.spec
===================================================================
RCS file: /cvs/dist/rpms/jdepend/devel/jdepend.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jdepend.spec	26 Oct 2006 15:17:22 -0000	1.19
+++ jdepend.spec	26 Apr 2007 13:11:20 -0000	1.20
@@ -36,7 +36,7 @@
 
 Name:		jdepend
 Version:	2.6
-Release:	6jpp.2
+Release:	6jpp.3
 Epoch:		0
 Summary:        Java Design Quality Metrics
 License:        Clarkware License
@@ -157,6 +157,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Apr 26 2007 Matt Wringe <mwringe at redhat.com> - 0:2.6-6jpp.3
+- rebuild
+
 * Thu Oct 26 2006 Fernando Nasser <fnasser at redhat.com> - 0:2.6-6jpp.2
 - Really add missing javadoc requires this time
 



From fedora-cvs-commits at redhat.com  Thu Apr 26 13:35:34 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 09:35:34 -0400
Subject: rpms/smartmontools/FC-6 smartmontools.spec,1.26,1.27
Message-ID: <200704261335.l3QDZYsW025056@cvs.devel.redhat.com>

Author: tsmetana

Update of /cvs/dist/rpms/smartmontools/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv25015

Modified Files:
	smartmontools.spec 
Log Message:
fix typo in specfile


Index: smartmontools.spec
===================================================================
RCS file: /cvs/dist/rpms/smartmontools/FC-6/smartmontools.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- smartmontools.spec	25 Apr 2007 13:24:59 -0000	1.26
+++ smartmontools.spec	26 Apr 2007 13:35:32 -0000	1.27
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.37
-Release: 	1%{?dist}
+Release: 	1.1%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPL
@@ -75,7 +75,11 @@
 
 
 %changelog
-* Wed Apr 25 2007 Tomas Smetana <tsmetana at redhat.com> - 1:5.36-3.2
+* Thu Apr 26 2007 Tomas Smetana <tsmetana at redhat.com> - 1:5.37-1.1
+- fix wrong version in changelog
+- rebuild
+
+* Wed Apr 25 2007 Tomas Smetana <tsmetana at redhat.com> - 1:5.37-1
 - new upstream version (#237399)
 - return correct value from init script (#237531)
 



From fedora-cvs-commits at redhat.com  Thu Apr 26 14:11:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 10:11:43 -0400
Subject: rpms/kernel/devel linux-2.6.21.tar.bz2.sign, NONE, 1.1 .cvsignore,
	1.615, 1.616 kernel-2.6.spec, 1.3115, 1.3116 sources, 1.578,
	1.579 upstream, 1.506, 1.507 linux-2.6.20.tar.bz2.sign, 1.1,
	NONE patch-2.6.21-rc7-git9.bz2.sign, 1.1,
	NONE patch-2.6.21-rc7.bz2.sign, 1.1, NONE
Message-ID: <200704261411.l3QEBhwk022959@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	linux-2.6.21.tar.bz2.sign 
Removed Files:
	linux-2.6.20.tar.bz2.sign patch-2.6.21-rc7-git9.bz2.sign 
	patch-2.6.21-rc7.bz2.sign 
Log Message:
* Thu Apr 26 2007 Dave Jones <davej at redhat.com>
- 2.6.21



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

iD8DBQBGMDTzyGugalF9Dw4RAu38AJ91aU60u8cdBZoUuM19AkmZLQunRwCfd66G
DPHXFTHqiYB4RZ6mIx2ymVU=
=cnCB
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.615
retrieving revision 1.616
diff -u -r1.615 -r1.616
--- .cvsignore	26 Apr 2007 01:22:23 -0000	1.615
+++ .cvsignore	26 Apr 2007 14:11:41 -0000	1.616
@@ -2,7 +2,5 @@
 kernel-2.6.*.config
 temp-*
 sparse-0.2.tar.bz2
-kernel-2.6.20
-linux-2.6.20.tar.bz2
-patch-2.6.21-rc7.bz2
-patch-2.6.21-rc7-git9.bz2
+kernel-2.6.21
+linux-2.6.21.tar.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3115
retrieving revision 1.3116
diff -u -r1.3115 -r1.3116
--- kernel-2.6.spec	26 Apr 2007 01:22:23 -0000	1.3115
+++ kernel-2.6.spec	26 Apr 2007 14:11:41 -0000	1.3116
@@ -57,7 +57,7 @@
 # by setting the define to ".local" or ".bz123456"
 #
 #% define buildid .local
-%define sublevel 20
+%define sublevel 21
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}%{?buildid}
@@ -370,8 +370,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.21-rc7.bz2
-Patch2: patch-2.6.21-rc7-git9.bz2
+#Patch1: patch-2.6.21.1.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -1002,8 +1001,7 @@
 cd linux-%{kversion}.%{_target_cpu}
 
 # Update to latest upstream.
-%patch1 -p1
-%patch2 -p1
+#%patch1 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
@@ -2333,6 +2331,9 @@
 #  - tux.
 
 %changelog
+* Thu Apr 26 2007 Dave Jones <davej at redhat.com>
+- 2.6.21
+
 * Wed Apr 25 2007 Dave Jones <davej at redhat.com>
 - 2.6.21-rc7-git9
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.578
retrieving revision 1.579
diff -u -r1.578 -r1.579
--- sources	26 Apr 2007 01:22:23 -0000	1.578
+++ sources	26 Apr 2007 14:11:41 -0000	1.579
@@ -1,4 +1,2 @@
 2618cbcc9c9ac1c3c04be903fe3338a7  sparse-0.2.tar.bz2
-34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
-3a54bf5a7cf6b124e680e1d08fe1b20b  patch-2.6.21-rc7.bz2
-a11ccd4a3af987208e6c41100ff52b5e  patch-2.6.21-rc7-git9.bz2
+1b515f588078dfa7f4bab2634bd17e80  linux-2.6.21.tar.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.506
retrieving revision 1.507
diff -u -r1.506 -r1.507
--- upstream	26 Apr 2007 01:22:23 -0000	1.506
+++ upstream	26 Apr 2007 14:11:41 -0000	1.507
@@ -1,3 +1 @@
-linux-2.6.20.tar.bz2
-patch-2.6.21-rc7.bz2
-patch-2.6.21-rc7-git9.bz2
+linux-2.6.21.tar.bz2


--- linux-2.6.20.tar.bz2.sign DELETED ---


--- patch-2.6.21-rc7-git9.bz2.sign DELETED ---


--- patch-2.6.21-rc7.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 26 14:16:19 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 10:16:19 -0400
Subject: rpms/evolution-connector/devel evolution-connector.spec,1.96,1.97
Message-ID: <200704261416.l3QEGJFx023175@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-connector.spec 
Log Message:

* Thu Apr 26 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-2.fc7
- Fix a misnamed macro (RH bug #237807).



Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- evolution-connector.spec	9 Apr 2007 16:56:03 -0000	1.96
+++ evolution-connector.spec	26 Apr 2007 14:16:12 -0000	1.97
@@ -1,6 +1,6 @@
 %define evo_version 2.9.1
 %define eds_version 1.9.4
-%define gnomeprint22_version 2.2.0
+%define libgnomeprint22_version 2.2.0
 %define intltool_version 0.35.5
 %define libsoup_version 2.2.6.1
 
@@ -149,6 +149,9 @@
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Thu Apr 26 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-2.fc7
+- Fix a misnamed macro (RH bug #237807).
+
 * Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-1.fc7
 - Update to 2.10.1
 - Add -Wdeclaration-after-statement to strict build settings.



From fedora-cvs-commits at redhat.com  Thu Apr 26 14:17:25 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 10:17:25 -0400
Subject: rpms/evolution-connector/devel evolution-connector.spec,1.97,1.98
Message-ID: <200704261417.l3QEHP9J023250@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-connector.spec 
Log Message:
Bump release



Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- evolution-connector.spec	26 Apr 2007 14:16:12 -0000	1.97
+++ evolution-connector.spec	26 Apr 2007 14:17:23 -0000	1.98
@@ -24,7 +24,7 @@
 
 Name: evolution-connector
 Version: 2.10.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server



From fedora-cvs-commits at redhat.com  Thu Apr 26 14:44:46 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 10:44:46 -0400
Subject: rpms/xorg-x11-font-utils/devel .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 xorg-x11-font-utils.spec, 1.24, 1.25
Message-ID: <200704261444.l3QEiksF013976@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-font-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13908/devel

Modified Files:
	.cvsignore sources xorg-x11-font-utils.spec 
Log Message:
auto-import xorg-x11-font-utils-7.2-1.fc7 on branch devel from xorg-x11-font-utils-7.2-1.fc7.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-font-utils/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	26 Mar 2007 19:16:48 -0000	1.12
+++ .cvsignore	26 Apr 2007 14:44:44 -0000	1.13
@@ -1,5 +1,5 @@
-bdftopcf-1.0.0.tar.bz2
 font-util-1.0.1.tar.bz2
 fonttosfnt-1.0.3.tar.bz2
-mkfontscale-1.0.1.tar.bz2
 mkfontdir-1.0.3.tar.bz2
+mkfontscale-1.0.1.tar.bz2
+bdftopcf-1.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-font-utils/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	26 Mar 2007 19:16:48 -0000	1.12
+++ sources	26 Apr 2007 14:44:44 -0000	1.13
@@ -1,5 +1,5 @@
-f489db67914ca4d9d2fa0331132f342b  bdftopcf-1.0.0.tar.bz2
 b81535f78fe05732931f02841e5ca37b  font-util-1.0.1.tar.bz2
 b0ebd86029571239b9d7b0c61191b591  fonttosfnt-1.0.3.tar.bz2
-1e74e68eb9e8e91c6b7b615d80dc5ee1  mkfontscale-1.0.1.tar.bz2
 4d0f89a23f77e22f1671a77bf0898955  mkfontdir-1.0.3.tar.bz2
+1e74e68eb9e8e91c6b7b615d80dc5ee1  mkfontscale-1.0.1.tar.bz2
+9685fab33d39954ab8a0d22e0969d5a4  bdftopcf-1.0.1.tar.bz2


Index: xorg-x11-font-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-font-utils/devel/xorg-x11-font-utils.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xorg-x11-font-utils.spec	26 Mar 2007 19:16:48 -0000	1.24
+++ xorg-x11-font-utils.spec	26 Apr 2007 14:44:44 -0000	1.25
@@ -4,14 +4,14 @@
 Name: xorg-x11-%{pkgname}
 # IMPORTANT: If package ever gets renamed to something else, remove the Epoch line!
 Epoch: 1
-Version: 7.1
-Release: 5%{?dist}
+Version: 7.2
+Release: 1%{?dist}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: ftp://ftp.x.org/pub/individual/app/bdftopcf-1.0.0.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/app/bdftopcf-1.0.1.tar.bz2
 Source1: ftp://ftp.x.org/pub/individual/app/fonttosfnt-1.0.3.tar.bz2
 Source2: ftp://ftp.x.org/pub/individual/app/mkfontdir-1.0.3.tar.bz2
 Source3: ftp://ftp.x.org/pub/individual/app/mkfontscale-1.0.1.tar.bz2
@@ -125,6 +125,10 @@
 %{_mandir}/man1/ucs2any.1*
 
 %changelog
+* Thu Apr 26 2007 Adam Jackson <ajax at redhat.com> 1:7.2-1
+- bdftopcf 1.0.1
+- Superstition bump to 7.2-1
+
 * Mon Mar 26 2007 Adam Jackson <ajax at redhat.com> 1:7.1-5
 - mkfontdir 1.0.3
 



From fedora-cvs-commits at redhat.com  Thu Apr 26 14:45:24 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 10:45:24 -0400
Subject: rpms/comps-extras/devel .cvsignore, 1.15, 1.16 comps-extras.spec,
	1.24, 1.25 sources, 1.19, 1.20
Message-ID: <200704261445.l3QEjOmW014507@cvs.devel.redhat.com>

Author: notting

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

Modified Files:
	.cvsignore comps-extras.spec sources 
Log Message:
12-1, new mist/gnome icons



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/comps-extras/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	17 Apr 2007 22:16:28 -0000	1.15
+++ .cvsignore	26 Apr 2007 14:45:21 -0000	1.16
@@ -1 +1 @@
-comps-extras-11.3.tar.gz
+comps-extras-12.tar.gz


Index: comps-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/comps-extras/devel/comps-extras.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- comps-extras.spec	17 Apr 2007 22:16:28 -0000	1.24
+++ comps-extras.spec	26 Apr 2007 14:45:21 -0000	1.25
@@ -1,6 +1,6 @@
 Summary: Images for components included in Fedora
 Name: comps-extras
-Version: 11.3
+Version: 12
 Release: 1
 # no upstream source releases; the src.rpm is the source much like 
 # with fedora-release, etc.  anonymous cvs available via
@@ -34,6 +34,9 @@
 %{_datadir}/pixmaps/comps/*
 
 %changelog
+* Thu Apr 26 2007 Bill Nottingham <notting at redhat.com> - 12-1
+- updates to match current icon theme
+
 * Tue Apr 17 2007 Bill Nottingham <notting at redhat.com> - 11.3-1
 - add icons: clustering, virt, window-managers, uncategorized
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/comps-extras/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	17 Apr 2007 22:16:28 -0000	1.19
+++ sources	26 Apr 2007 14:45:21 -0000	1.20
@@ -1 +1 @@
-d16f7b4ffab8a50e74e9f79f0144b451  comps-extras-11.3.tar.gz
+a6594a5f0739ee1d7e6477c0783fec86  comps-extras-12.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 26 14:45:59 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 10:45:59 -0400
Subject: rpms/rhpl/devel .cvsignore, 1.78, 1.79 rhpl.spec, 1.97, 1.98 sources,
	1.86, 1.87
Message-ID: <200704261445.l3QEjxMt014986@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/rhpl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14925/devel

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- .cvsignore	18 Apr 2007 16:06:17 -0000	1.78
+++ .cvsignore	26 Apr 2007 14:45:57 -0000	1.79
@@ -1,2 +1 @@
-rhpl-0.203.tar.gz
-rhpl-0.204.tar.gz
+rhpl-0.205.tar.gz


Index: rhpl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/rhpl.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- rhpl.spec	18 Apr 2007 16:06:17 -0000	1.97
+++ rhpl.spec	26 Apr 2007 14:45:57 -0000	1.98
@@ -1,6 +1,6 @@
 Summary: Library of python code used by programs in Red Hat Linux
 Name: rhpl
-Version: 0.204
+Version: 0.205
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -38,6 +38,9 @@
 %{_libdir}/python?.?/site-packages/rhpl
 
 %changelog
+* Thu Apr 26 2007 Jeremy Katz <katzj at redhat.com> - 0.205-1
+- Fix tracebacks with unicode strings (#237956)
+
 * Wed Apr 18 2007 Chris Lumens <clumens at redhat.com> - 0.204-1
 - Fix PS3 platform detection (#236507).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/sources,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- sources	18 Apr 2007 16:06:17 -0000	1.86
+++ sources	26 Apr 2007 14:45:57 -0000	1.87
@@ -1 +1 @@
-2e39cc23298e6d80937447bba9f5961a  rhpl-0.204.tar.gz
+91a55a0f4c64f2d5b97d105c28673abd  rhpl-0.205.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 26 15:04:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 11:04:09 -0400
Subject: rpms/kernel/FC-5 patch-2.6.20.7-8.bz2.sign, NONE,
	1.1 patch-2.6.20.8-9.bz2.sign, NONE, 1.1 .cvsignore, 1.441,
	1.442 kernel-2.6.spec, 1.2314, 1.2315 sources, 1.381,
	1.382 upstream, 1.344, 1.345 linux-2.6-20.8-unofficial.patch,
	1.1, NONE
Message-ID: <200704261504.l3QF49js028295@cvs.devel.redhat.com>

Author: cebbert

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.20.7-8.bz2.sign patch-2.6.20.8-9.bz2.sign 
Removed Files:
	linux-2.6-20.8-unofficial.patch 
Log Message:
* Thu Apr 26 2007 Chuck Ebbert <cebbert at redhat.com>		1.2315
- 2.6.20.8 (official)
- 2.6.20.9



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

iD8DBQBGL8gWyGugalF9Dw4RAqNuAJ9imtWxfx5IObwCPbetb1xNCao0XgCeM0BH
N7v0PLYVEvk90TwFMM/vfAI=
=dsxm
-----END PGP SIGNATURE-----


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

iD8DBQBGMFV1yGugalF9Dw4RArqNAJ9OD3zgty+1t6DC3ehT+dU1741yjQCfVJTc
MQ1kAy+NefMa0um5JuxojEs=
=o/Gr
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -r1.441 -r1.442
--- .cvsignore	17 Apr 2007 00:52:48 -0000	1.441
+++ .cvsignore	26 Apr 2007 15:04:06 -0000	1.442
@@ -3,6 +3,7 @@
 temp-*
 kernel-2.6.20
 linux-2.6.20.tar.bz2
+xen-3.0.3-11774.tar.bz2
 patch-2.6.20.1.bz2
 patch-2.6.20.1-2.bz2
 patch-2.6.20.2-3.bz2
@@ -10,4 +11,5 @@
 patch-2.6.20.4-5.bz2
 patch-2.6.20.5-6.bz2
 patch-2.6.20.6-7.bz2
-xen-3.0.3-11774.tar.bz2
+patch-2.6.20.7-8.bz2
+patch-2.6.20.8-9.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2314
retrieving revision 1.2315
diff -u -r1.2314 -r1.2315
--- kernel-2.6.spec	25 Apr 2007 21:39:56 -0000	1.2314
+++ kernel-2.6.spec	26 Apr 2007 15:04:07 -0000	1.2315
@@ -317,7 +317,8 @@
 Patch5: patch-2.6.20.4-5.bz2
 Patch6: patch-2.6.20.5-6.bz2
 Patch7: patch-2.6.20.6-7.bz2
-Patch8: linux-2.6-20.8-unofficial.patch
+Patch8: patch-2.6.20.7-8.bz2
+Patch9: patch-2.6.20.8-9.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 
@@ -880,6 +881,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
@@ -1890,6 +1892,10 @@
 %endif
 
 %changelog
+* Thu Apr 26 2007 Chuck Ebbert <cebbert at redhat.com>		1.2315
+- 2.6.20.8 (official)
+- 2.6.20.9
+
 * Wed Apr 25 2007 Chuck Ebbert <cebbert at redhat.com>		1.2314
 - 2.6.20.8
   Patch taken from mailing list, not available elsewhere.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -r1.381 -r1.382
--- sources	17 Apr 2007 00:52:48 -0000	1.381
+++ sources	26 Apr 2007 15:04:07 -0000	1.382
@@ -1,4 +1,5 @@
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
+a9d44b2651b0898e103395b2a7a4f263  xen-3.0.3-11774.tar.bz2
 5739512c396b37d9506bca2afe5aaa1d  patch-2.6.20.1.bz2
 8445b2544410648bc228bc12839d921e  patch-2.6.20.1-2.bz2
 8425cead82afc782e2a3866a287a61fe  patch-2.6.20.2-3.bz2
@@ -6,4 +7,5 @@
 5eba73d99e55d62450961bdb5fe04b74  patch-2.6.20.4-5.bz2
 f979e94c4e44928bd122604fdf586933  patch-2.6.20.5-6.bz2
 557549a69f3ec7b615d252f302ad5099  patch-2.6.20.6-7.bz2
-a9d44b2651b0898e103395b2a7a4f263  xen-3.0.3-11774.tar.bz2
+2d67b7c603a3cb081da1db6048bd7316  patch-2.6.20.7-8.bz2
+931bd27010da400fc4902bef049904b9  patch-2.6.20.8-9.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- upstream	17 Apr 2007 00:52:48 -0000	1.344
+++ upstream	26 Apr 2007 15:04:07 -0000	1.345
@@ -6,3 +6,5 @@
 patch-2.6.20.4-5.bz2
 patch-2.6.20.5-6.bz2
 patch-2.6.20.6-7.bz2
+patch-2.6.20.7-8.bz2
+patch-2.6.20.8-9.bz2


--- linux-2.6-20.8-unofficial.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 26 15:04:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 11:04:18 -0400
Subject: rpms/kernel/FC-6 patch-2.6.20.7-8.bz2.sign, NONE,
	1.1 patch-2.6.20.8-9.bz2.sign, NONE, 1.1 .cvsignore, 1.560,
	1.561 kernel-2.6.spec, 1.2946, 1.2947 sources, 1.524,
	1.525 upstream, 1.444, 1.445 linux-2.6-20.8-unofficial.patch,
	1.1, NONE
Message-ID: <200704261504.l3QF4IQC028431@cvs.devel.redhat.com>

Author: cebbert

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.20.7-8.bz2.sign patch-2.6.20.8-9.bz2.sign 
Removed Files:
	linux-2.6-20.8-unofficial.patch 
Log Message:
* Thu Apr 26 2007 Chuck Ebbert <cebbert at redhat.com>		1.2947
- 2.6.20.8 (official)
- 2.6.20.9



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

iD8DBQBGL8gWyGugalF9Dw4RAqNuAJ9imtWxfx5IObwCPbetb1xNCao0XgCeM0BH
N7v0PLYVEvk90TwFMM/vfAI=
=dsxm
-----END PGP SIGNATURE-----


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

iD8DBQBGMFV1yGugalF9Dw4RArqNAJ9OD3zgty+1t6DC3ehT+dU1741yjQCfVJTc
MQ1kAy+NefMa0um5JuxojEs=
=o/Gr
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/.cvsignore,v
retrieving revision 1.560
retrieving revision 1.561
diff -u -r1.560 -r1.561
--- .cvsignore	17 Apr 2007 00:52:13 -0000	1.560
+++ .cvsignore	26 Apr 2007 15:04:15 -0000	1.561
@@ -3,6 +3,7 @@
 temp-*
 kernel-2.6.20
 linux-2.6.20.tar.bz2
+xen-3.0.3-11774.tar.bz2
 patch-2.6.20.1.bz2
 patch-2.6.20.1-2.bz2
 patch-2.6.20.2-3.bz2
@@ -10,4 +11,5 @@
 patch-2.6.20.4-5.bz2
 patch-2.6.20.5-6.bz2
 patch-2.6.20.6-7.bz2
-xen-3.0.3-11774.tar.bz2
+patch-2.6.20.7-8.bz2
+patch-2.6.20.8-9.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2946
retrieving revision 1.2947
diff -u -r1.2946 -r1.2947
--- kernel-2.6.spec	25 Apr 2007 21:40:22 -0000	1.2946
+++ kernel-2.6.spec	26 Apr 2007 15:04:15 -0000	1.2947
@@ -377,7 +377,8 @@
 Patch5: patch-2.6.20.4-5.bz2
 Patch6: patch-2.6.20.5-6.bz2
 Patch7: patch-2.6.20.6-7.bz2
-Patch8: linux-2.6-20.8-unofficial.patch
+Patch8: patch-2.6.20.7-8.bz2
+Patch9: patch-2.6.20.8-9.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 # needed to get utrace patch to apply cleanly
@@ -1023,6 +1024,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
@@ -2290,6 +2292,10 @@
 %endif
 
 %changelog
+* Thu Apr 26 2007 Chuck Ebbert <cebbert at redhat.com>		1.2947
+- 2.6.20.8 (official)
+- 2.6.20.9
+
 * Wed Apr 25 2007 Chuck Ebbert <cebbert at redhat.com>		1.2946
 - 2.6.20.8
   Patch taken from mailing list, not available elsewhere.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/sources,v
retrieving revision 1.524
retrieving revision 1.525
diff -u -r1.524 -r1.525
--- sources	17 Apr 2007 00:52:13 -0000	1.524
+++ sources	26 Apr 2007 15:04:16 -0000	1.525
@@ -1,4 +1,5 @@
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
+a9d44b2651b0898e103395b2a7a4f263  xen-3.0.3-11774.tar.bz2
 5739512c396b37d9506bca2afe5aaa1d  patch-2.6.20.1.bz2
 8445b2544410648bc228bc12839d921e  patch-2.6.20.1-2.bz2
 8425cead82afc782e2a3866a287a61fe  patch-2.6.20.2-3.bz2
@@ -6,4 +7,5 @@
 5eba73d99e55d62450961bdb5fe04b74  patch-2.6.20.4-5.bz2
 f979e94c4e44928bd122604fdf586933  patch-2.6.20.5-6.bz2
 557549a69f3ec7b615d252f302ad5099  patch-2.6.20.6-7.bz2
-a9d44b2651b0898e103395b2a7a4f263  xen-3.0.3-11774.tar.bz2
+2d67b7c603a3cb081da1db6048bd7316  patch-2.6.20.7-8.bz2
+931bd27010da400fc4902bef049904b9  patch-2.6.20.8-9.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/upstream,v
retrieving revision 1.444
retrieving revision 1.445
diff -u -r1.444 -r1.445
--- upstream	17 Apr 2007 00:52:13 -0000	1.444
+++ upstream	26 Apr 2007 15:04:16 -0000	1.445
@@ -6,3 +6,5 @@
 patch-2.6.20.4-5.bz2
 patch-2.6.20.5-6.bz2
 patch-2.6.20.6-7.bz2
+patch-2.6.20.7-8.bz2
+patch-2.6.20.8-9.bz2


--- linux-2.6-20.8-unofficial.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 26 15:16:38 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 11:16:38 -0400
Subject: rpms/jakarta-commons-fileupload/devel .cvsignore, 1.3,
	1.4 jakarta-commons-fileupload-crosslink.patch, 1.1,
	1.2 jakarta-commons-fileupload-servletapi5.patch, 1.3,
	1.4 jakarta-commons-fileupload.spec, 1.22, 1.23 sources, 1.2, 1.3
Message-ID: <200704261516.l3QFGcKY005219@cvs.devel.redhat.com>

Author: pcheung

Update of /cvs/dist/rpms/jakarta-commons-fileupload/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5118

Modified Files:
	.cvsignore jakarta-commons-fileupload-crosslink.patch 
	jakarta-commons-fileupload-servletapi5.patch 
	jakarta-commons-fileupload.spec sources 
Log Message:
Update spec file as per fedora review




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-fileupload/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Jan 2005 15:10:13 -0000	1.3
+++ .cvsignore	26 Apr 2007 15:16:31 -0000	1.4
@@ -1,4 +1 @@
 commons-fileupload-1.0-src.tar.gz
-commons-fileupload-1.0
-noarch
-*.src.rpm

jakarta-commons-fileupload-crosslink.patch:
 build.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

Index: jakarta-commons-fileupload-crosslink.patch
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-fileupload/devel/jakarta-commons-fileupload-crosslink.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jakarta-commons-fileupload-crosslink.patch	9 Sep 2004 06:27:26 -0000	1.1
+++ jakarta-commons-fileupload-crosslink.patch	26 Apr 2007 15:16:31 -0000	1.2
@@ -1,10 +1,17 @@
---- build.xml~	2003-06-26 09:12:13.000000000 +0300
-+++ build.xml	2003-06-28 02:34:52.000000000 +0300
+--- build.xml	2007-04-17 11:13:49.000000000 -0400
++++ build.xml	2007-04-17 11:14:09.000000000 -0400
 @@ -136,6 +136,7 @@
-         <pathelement location="target/${final.name}.jar">
-         </pathelement>
-       </classpath>
-+      <link href="${servletapi.javadoc}" />
-     </javadoc>
-   </target>
-   <target name="get-deps" unless="noget" depends="init">
+         <pathelement location="target/${final.name}.jar">
+         </pathelement>
+       </classpath>
++      <link href="${servletapi.javadoc}" />
+     </javadoc>
+   </target>
+   <target name="get-deps" unless="noget" depends="init">
+@@ -156,4 +157,4 @@
+     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+     </unjar>
+   </target>
+-</project>
+\ No newline at end of file
++</project>

jakarta-commons-fileupload-servletapi5.patch:
 MyHttpServletRequest.java |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+)

Index: jakarta-commons-fileupload-servletapi5.patch
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-fileupload/devel/jakarta-commons-fileupload-servletapi5.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jakarta-commons-fileupload-servletapi5.patch	22 Oct 2004 00:53:37 -0000	1.3
+++ jakarta-commons-fileupload-servletapi5.patch	26 Apr 2007 15:16:31 -0000	1.4
@@ -1,55 +1,55 @@
---- src/test/org/apache/commons/fileupload/MyHttpServletRequest.java.orig	2004-07-27 09:09:48.000000000 -0400
-+++ src/test/org/apache/commons/fileupload/MyHttpServletRequest.java	2004-07-27 09:42:18.000000000 -0400
-@@ -366,6 +366,14 @@
- 	}
- 
- 	/**
-+	 * @see javax.servlet.ServletRequest#getLocalName()
-+	 */
-+	public String getLocalName()
-+	{
-+		return null;
-+	}
-+
-+	/**
- 	 * @see javax.servlet.ServletRequest#getServerPort()
- 	 */
- 	public int getServerPort()
-@@ -374,6 +382,22 @@
- 	}
- 
- 	/**
-+	 * @see javax.servlet.ServletRequest#getRemotePort()
-+	 */
-+	public int getRemotePort()
-+	{
-+		return 0;
-+	}
-+
-+	/**
-+	 * @see javax.servlet.ServletRequest#getLocalPort()
-+	 */
-+	public int getLocalPort()
-+	{
-+		return 0;
-+	}
-+
-+	/**
- 	 * @see javax.servlet.ServletRequest#getReader()
- 	 */
- 	public BufferedReader getReader() throws IOException
-@@ -390,6 +414,14 @@
- 	}
- 
- 	/**
-+	 * @see javax.servlet.ServletRequest#getLocalAddr()
-+	 */
-+	public String getLocalAddr()
-+	{
-+		return null;
-+	}
-+
-+	/**
- 	 * @see javax.servlet.ServletRequest#getRemoteHost()
- 	 */
- 	public String getRemoteHost()
+--- src/test/org/apache/commons/fileupload/MyHttpServletRequest.java.orig	2007-04-17 11:21:13.000000000 -0400
++++ src/test/org/apache/commons/fileupload/MyHttpServletRequest.java	2007-04-17 11:24:29.000000000 -0400
+@@ -366,6 +366,14 @@ class MyHttpServletRequest implements Ht
+ 	}
+ 
+ 	/**
++	 * @see javax.servlet.ServletRequest#getLocalName()
++	 */
++	public String getLocalName()
++	{
++		return null;
++	}
++
++	/**
+ 	 * @see javax.servlet.ServletRequest#getServerPort()
+ 	 */
+ 	public int getServerPort()
+@@ -374,6 +382,22 @@ class MyHttpServletRequest implements Ht
+ 	}
+ 
+ 	/**
++	 * @see javax.servlet.ServletRequest#getRemotePort()
++	 */
++	public int getRemotePort()
++	{
++		return 0;
++	}
++
++	/**
++	 * @see javax.servlet.ServletRequest#getLocalPort()
++	 */
++	public int getLocalPort()
++	{
++		return 0;
++	}
++
++	/**
+ 	 * @see javax.servlet.ServletRequest#getReader()
+ 	 */
+ 	public BufferedReader getReader() throws IOException
+@@ -390,6 +414,14 @@ class MyHttpServletRequest implements Ht
+ 	}
+ 
+ 	/**
++	 * @see javax.servlet.ServletRequest#getLocalAddr()
++	 */
++	public String getLocalAddr()
++	{
++		return null;
++	}
++
++	/**
+ 	 * @see javax.servlet.ServletRequest#getRemoteHost()
+ 	 */
+ 	public String getRemoteHost()


Index: jakarta-commons-fileupload.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-fileupload/devel/jakarta-commons-fileupload.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jakarta-commons-fileupload.spec	10 Aug 2006 21:09:28 -0000	1.22
+++ jakarta-commons-fileupload.spec	26 Apr 2007 15:16:31 -0000	1.23
@@ -34,16 +34,18 @@
 
 %define base_name       fileupload
 %define short_name      commons-%{base_name}
-%define section         free
 
 Name:           jakarta-%{short_name}
 Version:        1.0
-Release:        6jpp.1
-Summary:        Jakarta Commons Fileupload Package
+Release:        6jpp.2%{?dist}
+Summary:        This package provides an api to work with html file upload
 License:        Apache Software License
 Group:          Development/Libraries/Java
 Epoch:          1
-Source0:        http://www.apache.org/dist/jakarta/commons/fileupload/source/commons-fileupload-1.0-src.tar.gz
+Source0:        commons-fileupload-1.0-src.tar.gz
+#svn export http://svn.apache.org/repos/asf/jakarta/commons/proper/fileupload/tags/FILEUPLOAD_1_0/
+#mv FILEUPLOAD_1_0 commons-fileupload-1.0
+#tar czvf commons-fileupload-1.0-src.tar.gz commons-fileupload-1.0
 Patch0:         %{name}-crosslink.patch
 Patch1:         %{name}-servletapi5.patch
 URL:            http://jakarta.apache.org/commons/fileupload/
@@ -54,17 +56,18 @@
 BuildRequires:  servlet24
 BuildRequires:  servletapi5-javadoc
 Requires:       servletapi5
+Requires:       jpackage-utils
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Provides:       %{short_name}
-Obsoletes:      %{short_name}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Provides:       %{short_name} = %{epoch}:%{version}-%{release}
+Obsoletes:      %{short_name} < %{epoch}:%{version}-%{release}
 
 %if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
+BuildRequires:          java-gcj-compat-devel
+Requires(post):         java-gcj-compat
+Requires(postun):       java-gcj-compat
 %endif
 
 %description
@@ -77,8 +80,6 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Requires(post):   /bin/rm,/bin/ln
-Requires(postun): /bin/rm
 
 %description    javadoc
 Javadoc for %{name}.
@@ -116,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}
 
 # -----------------------------------------------------------------------------
 
@@ -128,27 +130,16 @@
 
 # -----------------------------------------------------------------------------
 
-%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}
+%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
@@ -157,20 +148,25 @@
 
 %files
 %defattr(0644,root,root,0755)
-%doc LICENSE.txt
+%doc LICENSE.txt RELEASE-NOTES.txt
 %{_javadir}/*
 
 %if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
+%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
 %endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
 
 # -----------------------------------------------------------------------------
 
 %changelog
+* Tue Apr 17 2007 Permaine Cheung <pcheung at redhat.com> - 1:1.0-6jpp.2
+- Update spec file as per fedora review
+
 * Thu Aug 10 2006 Deepak Bhole <dbhole at redhat.com> - 1:1.0-6jpp.1
 - Added missing requirements.
 
@@ -193,7 +189,7 @@
 * Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 1:1.0-2jpp
 - Rebuild with ant-1.6.2
 
-* Sat Jun 28 2003 Ville Skytt? <ville.skytta at iki.fi> - 1:1.0-1jpp
+* Sat Jun 28 2003 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-1jpp
 - Update to 1.0.
 - Add Epochs to dependencies.
 - Nuke beanutils dependency.
@@ -208,7 +204,7 @@
 * Fri Mar 07 2003 Henri Gomez <hgomez at users.sourceforge.net> - 1:1.0-0.beta1.2jpp
 - replace servlet23 requirement by servlet4api
 
-* Wed Feb 26 2003 Ville Skytt? <ville.skytta at iki.fi> - 1:1.0-0.beta1.1jpp
+* Wed Feb 26 2003 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-0.beta1.1jpp
 - Update to 1.0 beta 1 (no code changes from cvs20030115).
 - Fix requirements.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-fileupload/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2004 06:27:26 -0000	1.2
+++ sources	26 Apr 2007 15:16:31 -0000	1.3
@@ -1 +1 @@
-c6fa0cc10e18cffa8c479c6cb61914b8  commons-fileupload-1.0-src.tar.gz
+18041bec90fe9d8c070f59afaab2b9a4  commons-fileupload-1.0-src.tar.gz



From fedora-cvs-commits at redhat.com  Thu Apr 26 16:00:34 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 12:00:34 -0400
Subject: rpms/cpuspeed/devel cpuspeed.conf,1.3,1.4 cpuspeed.init,1.32,1.33
Message-ID: <200704261600.l3QG0Ya2016187@cvs.devel.redhat.com>

Author: jwilson

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

Modified Files:
	cpuspeed.conf cpuspeed.init 
Log Message:
Use variable for program name, add to config file documentation and fix up exit codes (#237942)


Index: cpuspeed.conf
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cpuspeed.conf	11 Jan 2007 19:02:47 -0000	1.3
+++ cpuspeed.conf	26 Apr 2007 16:00:31 -0000	1.4
@@ -1,7 +1,10 @@
-# /etc/cpuspeed.conf
+# /etc/sysconfig/cpuspeed
 #
 # This configuration file controls the behavior of both the
 # cpuspeed daemon and various cpufreq modules.
+# For the vast majority of users, there shouldn't be any need to
+# alter the contents of this file at all. By and large, frequency
+# scaling should Just Work(tm) with the defaults.
 
 ### DRIVER ###
 # Your CPUFreq driver module


Index: cpuspeed.init
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.init,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- cpuspeed.init	12 Mar 2007 17:28:19 -0000	1.32
+++ cpuspeed.init	26 Apr 2007 16:00:31 -0000	1.33
@@ -3,18 +3,18 @@
 #
 # chkconfig: 12345 06 99
 # description: Run dynamic CPU speed daemon and/or load appropriate
-#              cpu frequency scaling kernel modules and governors
+#              cpu frequency scaling kernel modules and/or governors
 
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-[ -f /usr/sbin/cpuspeed ] || exit 0
-
 prog="cpuspeed"
 
+[ -f /usr/sbin/$prog ] || exit 5
+
 # Get config.
-if [ -f /etc/sysconfig/cpuspeed ]; then
-  . /etc/sysconfig/cpuspeed
+if [ -f /etc/sysconfig/$prog ]; then
+  . /etc/sysconfig/$prog
 fi
 
 cpu0freqd=/sys/devices/system/cpu/cpu0/cpufreq
@@ -22,7 +22,7 @@
 testpat="${cpus}/cpufreq/scaling_driver"
 lockfile="/var/lock/subsys/$prog"
 xendir="/proc/xen"
-logger="/usr/bin/logger -p info -t cpuspeed"
+logger="/usr/bin/logger -p info -t $prog"
 IGNORE_NICE=${IGNORE_NICE:-0}
 module_loaded=false
 
@@ -91,19 +91,19 @@
   if [ "$IGNORE_NICE" -eq 0 ]; then
     OPTS="$OPTS -n"
   fi
-  daemon cpuspeed -d $OPTS
+  daemon $prog -d $OPTS
   RETVAL=$?
   return $RETVAL
 }
 
 stop_cpuspeed() {
-  if [ -n "`pidof cpuspeed`" ]; then
+  if [ -n "`pidof $prog`" ]; then
     echo -n $"Stopping $prog: "
-    killproc cpuspeed -USR1
-    killproc cpuspeed -INT
+    killproc $prog -USR1
+    killproc $prog -INT
   fi
-  if [ -n "`pidof cpuspeed`" ]; then
-    killproc cpuspeed
+  if [ -n "`pidof $prog`" ]; then
+    killproc $prog
   fi
   RETVAL=$?
   return $RETVAL
@@ -244,7 +244,7 @@
     elif [ $module_loaded == true -o ${governor} == "performance" ]; then
       echo "Frequency scaling enabled using ${governor} governor"
     else
-      status cpuspeed
+      status $prog
     fi
     ;;
 
@@ -255,7 +255,7 @@
 
   condrestart)
     governor_module_loaded && module_loaded=true
-    if [ $module_loaded == true -o -n "`pidof cpuspeed`" -o ${governor} == "performance" ]; then
+    if [ $module_loaded == true -o -n "`pidof $prog`" -o ${governor} == "performance" ]; then
       stop
       start
     fi
@@ -263,7 +263,7 @@
 
   *)
     echo $"Usage: $0 {start|stop|restart|condrestart|status}"
-    exit 1
+    exit 3
     ;;
 esac
 



From fedora-cvs-commits at redhat.com  Thu Apr 26 16:01:59 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 12:01:59 -0400
Subject: rpms/cpuspeed/devel cpuspeed.spec,1.57,1.58
Message-ID: <200704261601.l3QG1xet016266@cvs.devel.redhat.com>

Author: jwilson

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

Modified Files:
	cpuspeed.spec 
Log Message:
Update spec file too...


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- cpuspeed.spec	12 Mar 2007 17:28:20 -0000	1.57
+++ cpuspeed.spec	26 Apr 2007 16:01:57 -0000	1.58
@@ -85,6 +85,11 @@
 exit 0
 
 %changelog
+* Thu Apr 26 2007 Jarod Wilson <jwilson at redhat.com>
+- Add a bit to the config file documentation
+- Use variable for program name
+- Fix up exit codes (#237942)
+
 * Mon Mar 12 2007 Jarod Wilson <jwilson at redhat.com>
 - Try loading acpi-cpufreq even on machines that don't
   report est flag (#231783, #216702)



From fedora-cvs-commits at redhat.com  Thu Apr 26 16:03:12 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 12:03:12 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.421,1.422
Message-ID: <200704261603.l3QG3COj016361@cvs.devel.redhat.com>

Author: bkonrath

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

Modified Files:
	eclipse.spec 
Log Message:
* Fri Apr 27 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-9
- Remove BR eclipse-pde.
- Related: #236895



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -r1.421 -r1.422
--- eclipse.spec	13 Apr 2007 09:36:34 -0000	1.421
+++ eclipse.spec	26 Apr 2007 16:03:09 -0000	1.422
@@ -126,8 +126,6 @@
 %if %{gcj_support}
 BuildRequires:  gcc-java >= 4.0.2
 BuildRequires:  java-gcj-compat-devel >= 1.0.64
-# GCJ class loading bug requires this
-BuildRequires:  eclipse-pde
 %else
 BuildRequires:  java-devel >= 1.4.2
 %endif
@@ -1720,6 +1718,10 @@
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
+* Fri Apr 27 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-9
+- Remove BR eclipse-pde.
+- Related: #236895
+
 * Wed Apr 11 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-8
 - Link to system-installed jsch instead of including it. 
 - Fix links to system-installed javadocs.



From fedora-cvs-commits at redhat.com  Thu Apr 26 16:04:10 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 12:04:10 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.422,1.423
Message-ID: <200704261604.l3QG4AmN016424@cvs.devel.redhat.com>

Author: bkonrath

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

Modified Files:
	eclipse.spec 
Log Message:
- Bump release.



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -r1.422 -r1.423
--- eclipse.spec	26 Apr 2007 16:03:09 -0000	1.422
+++ eclipse.spec	26 Apr 2007 16:04:08 -0000	1.423
@@ -19,7 +19,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        8%{?dist} 
+Release:        9%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/



From fedora-cvs-commits at redhat.com  Thu Apr 26 16:20:28 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 12:20:28 -0400
Subject: rpms/bsh/devel bsh.spec,1.12,1.13
Message-ID: <200704261620.l3QGKSjA016695@cvs.devel.redhat.com>

Author: pcheung

Update of /cvs/dist/rpms/bsh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16673

Modified Files:
	bsh.spec 
Log Message:
Update spec file as per fedora review process




Index: bsh.spec
===================================================================
RCS file: /cvs/dist/rpms/bsh/devel/bsh.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bsh.spec	16 Mar 2007 15:51:11 -0000	1.12
+++ bsh.spec	26 Apr 2007 16:20:20 -0000	1.13
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,7 @@
 #tar cjf bsh-1.3.0-src.tar.bz2 BeanShell
 Patch0:         %{name}-build.patch
 #Patch1:         %{name}-readline.patch
-BuildRequires:  ant, bsf, perl, ant-trax
+BuildRequires:  ant, bsf, ant-trax
 Requires:       bsf
 Requires:       jpackage-utils >= 0:1.6
 #BuildRequires:  libreadline-java
@@ -90,8 +90,6 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Java
-Requires(post):   /bin/rm,/bin/ln
-Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -149,6 +147,8 @@
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
 # demo
 for i in `find tests -name \*.bsh`; do
   perl -p -i -e 's,^\n?#!(/(usr/)?bin/java bsh\.Interpreter|/bin/sh),#!/usr/bin/env %{_bindir}/%{name},' $i
@@ -231,15 +231,6 @@
 %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
-
 %if %{gcj_support}
 %post
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -275,6 +266,7 @@
 %files javadoc
 %defattr(-,root,root)
 %{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
 
 %files demo
 %defattr(-,root,root)



From fedora-cvs-commits at redhat.com  Thu Apr 26 16:24:47 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 12:24:47 -0400
Subject: rpms/bsf/devel bsf.spec,1.15,1.16
Message-ID: <200704261624.l3QGOlgl016799@cvs.devel.redhat.com>

Author: pcheung

Update of /cvs/dist/rpms/bsf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16785

Modified Files:
	bsf.spec 
Log Message:
Update spec file as per Fedora guidelines




Index: bsf.spec
===================================================================
RCS file: /cvs/dist/rpms/bsf/devel/bsf.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- bsf.spec	13 Mar 2007 17:22:14 -0000	1.15
+++ bsf.spec	26 Apr 2007 16:24:45 -0000	1.16
@@ -41,7 +41,6 @@
 Url:            http://jakarta.apache.org/bsf/
 Group:          Development/Libraries/Java
 #http://jakarta.apache.org/builds/jakarta-%{name}/dev/v%{version}/src/%{name}-src-%{version}.tar.gz
-#Source0:        %{name}-src-%{version}-RHCLEAN.tar.bz2
 Source0:        %{name}-src-%{version}.tar.gz
 Patch1:                 %{name}-javac.patch
 BuildRequires:  jpackage-utils >= 1.6
@@ -52,6 +51,7 @@
 Requires:               servletapi5
 Requires:               xalan-j2
 Requires:               tomcat5-jsp-2.0-api
+Requires:               jpackage-utils
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
@@ -92,8 +92,6 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Requires(post):   /bin/rm,/bin/ln
-Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -127,6 +125,7 @@
 %{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
 %{__cp} -pr src/build/javadocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
 (cd %{buildroot}%{_javadocdir} && ln -sf %{name}-%{version} %{name})
+ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
 
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
@@ -135,15 +134,6 @@
 %clean
 %{__rm} -rf %{buildroot}
 
-%post javadoc
-%{__rm} -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ $1 -eq 0 ]; then
-  %{__rm} -f %{_javadocdir}/%{name}
-fi
-
 %post
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -162,7 +152,7 @@
 
 %files
 %defattr(-,root,root)
-%doc license.txt src/AUTHORS src/BUILDING src/CHANGES src/CHANGES.old src/INSTALL src/README src/TODO
+%doc license.txt src/AUTHORS src/CHANGES src/CHANGES.old src/README src/TODO
 %{_javadir}/*
 
 %if %{gcj_support}
@@ -173,11 +163,11 @@
 %defattr(-,root,root)
 %dir %{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}-%{version}/*
-%ghost %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}
 
 %changelog
-* Wed Mar 07 2007 Permaine Cheung <dbhole at redhat.com> 0:2.3.0-11jpp.2
-- Update spec file as per Fedora guidelines.
+* Wed Mar 07 2007 Permaine Cheung <pcheung at redhat.com> 0:2.3.0-11jpp.2
+- Update spec file as per Fedora guidelines
 
 * Thu Aug 03 2006 Deepak Bhole <dbhole at redhat.com> 0:2.3.0-11jpp.1
 - Added missing requirements.



From fedora-cvs-commits at redhat.com  Thu Apr 26 16:40:16 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 12:40:16 -0400
Subject: rpms/rdesktop/devel rdesktop-fix-segfault.patch, NONE,
	1.1 rdesktop.spec, 1.24, 1.25
Message-ID: <200704261640.l3QGeGot004066@cvs.devel.redhat.com>

Author: davidz

Update of /cvs/dist/rpms/rdesktop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3782

Modified Files:
	rdesktop.spec 
Added Files:
	rdesktop-fix-segfault.patch 
Log Message:
* Thu Apr 26 2007 David Zeuthen <davidz at redhat.com> - 1.5.0-2
- Fix segfault triggered by X11 update (#238032)



rdesktop-fix-segfault.patch:
 xwin.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rdesktop-fix-segfault.patch ---
--- xwin.c.fix-segfault	2007-04-26 12:37:28.000000000 -0400
+++ xwin.c	2007-04-26 12:37:50.000000000 -0400
@@ -3219,7 +3219,7 @@
 		return;
 
 	image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0,
-			     (char *) data, cx, cy, BitmapPad(g_display), cx * g_bpp / 8);
+			     (char *) data, cx, cy, g_bpp, 0);
 
 	if (g_ownbackstore)
 	{


Index: rdesktop.spec
===================================================================
RCS file: /cvs/dist/rpms/rdesktop/devel/rdesktop.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- rdesktop.spec	19 Nov 2006 06:26:54 -0000	1.24
+++ rdesktop.spec	26 Apr 2007 16:40:14 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           rdesktop
 Version:        1.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        X client for remote desktop into Windows Terminal Server
 
 Group:          User Interface/Desktops
@@ -10,6 +10,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  openssl-devel, libX11-devel
 
+Patch0: rdesktop-fix-segfault.patch
+
 %description
 rdesktop is an open source client for Windows NT Terminal Server and
 Windows 2000 & 2003 Terminal Services, capable of natively speaking 
@@ -18,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .fix-segfault
 
 %build
 %configure --with-ipv6
@@ -38,6 +41,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Apr 26 2007 David Zeuthen <davidz at redhat.com> - 1.5.0-2
+- Fix segfault triggered by X11 update (#238032)
+
 * Sun Nov 19 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.0-1
 - Update to 1.5.0
 



From fedora-cvs-commits at redhat.com  Thu Apr 26 16:44:38 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 12:44:38 -0400
Subject: rpms/rdesktop/FC-6 rdesktop-fix-segfault.patch, NONE,
	1.1 rdesktop.spec, 1.24, 1.25
Message-ID: <200704261644.l3QGicLr007336@cvs.devel.redhat.com>

Author: davidz

Update of /cvs/dist/rpms/rdesktop/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv7193

Modified Files:
	rdesktop.spec 
Added Files:
	rdesktop-fix-segfault.patch 
Log Message:
* Thu Apr 26 2007 David Zeuthen <davidz at redhat.com> - 1.5.0-2
- Fix segfault triggered by X11 update (#236006)



rdesktop-fix-segfault.patch:
 xwin.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rdesktop-fix-segfault.patch ---
--- xwin.c.fix-segfault	2007-04-26 12:37:28.000000000 -0400
+++ xwin.c	2007-04-26 12:37:50.000000000 -0400
@@ -3219,7 +3219,7 @@
 		return;
 
 	image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0,
-			     (char *) data, cx, cy, BitmapPad(g_display), cx * g_bpp / 8);
+			     (char *) data, cx, cy, g_bpp, 0);
 
 	if (g_ownbackstore)
 	{


Index: rdesktop.spec
===================================================================
RCS file: /cvs/dist/rpms/rdesktop/FC-6/rdesktop.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- rdesktop.spec	8 Dec 2006 19:26:11 -0000	1.24
+++ rdesktop.spec	26 Apr 2007 16:44:36 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           rdesktop
 Version:        1.5.0
-Release:        1
+Release:        2%{?dist}
 Summary:        X client for remote desktop into Windows Terminal Server
 
 Group:          User Interface/Desktops
@@ -9,6 +9,7 @@
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  openssl-devel, libX11-devel
+Patch0: rdesktop-fix-segfault.patch
 
 %description
 rdesktop is an open source client for Windows NT Terminal Server and
@@ -18,6 +19,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .fix-segfault
 
 %build
 %configure --with-ipv6
@@ -38,6 +40,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Apr 26 2007 David Zeuthen <davidz at redhat.com> - 1.5.0-2
+- Fix segfault triggered by X11 update (#236006)
+
 * Fri Dec 08 2006 Behdad Esfahbod <besfahbo at redhat.com> - 1.5.0-1
 - Update to 1.5.0
 - Resolves #207120



From fedora-cvs-commits at redhat.com  Thu Apr 26 16:57:19 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 12:57:19 -0400
Subject: rpms/esc/devel esc.png,NONE,1.1
Message-ID: <200704261657.l3QGvJl0016613@cvs.devel.redhat.com>

Author: jmagne

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

Added Files:
	esc.png 
Log Message:
Linux themed.



From fedora-cvs-commits at redhat.com  Thu Apr 26 16:57:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 12:57:43 -0400
Subject: rpms/esc/devel esc.spec,1.26,1.27
Message-ID: <200704261657.l3QGvhqO016920@cvs.devel.redhat.com>

Author: jmagne

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

Modified Files:
	esc.spec 
Log Message:
More UI fixes.


Index: esc.spec
===================================================================
RCS file: /cvs/dist/rpms/esc/devel/esc.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- esc.spec	4 Apr 2007 00:45:52 -0000	1.26
+++ esc.spec	26 Apr 2007 16:57:41 -0000	1.27
@@ -1,6 +1,6 @@
 Name: esc 
 Version: 1.0.1
-Release: 2%{?dist} 
+Release: 3%{?dist} 
 Summary: Enterprise Security Client Smart Card Client
 License: GPL
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
@@ -11,6 +11,7 @@
 Patch1: firefox-1.5-with-system-nss.patch
 Patch2: firefox-1.1-nss-system-nspr.patch
 Patch3: esc-1.0.1-admin-row-update.patch
+Patch4: esc-1.0.1-ui-fixes-1.patch 
 
 BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
 BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
@@ -43,12 +44,14 @@
 %define pixmapdir  %{_datadir}/pixmaps
 %define docdir    %{_defaultdocdir}/%{escname}
 %define escappdir src/app/xpcom
+%define escxuldir src/app/xul/esc
 
 
 Source0: %{escname}.tar.bz2
 Source1: esc
 Source2: esc.desktop
 Source3: xulrunner-1.8.0.4-source.tar.bz2
+Source4: esc.png
 
 
 %description
@@ -62,6 +65,7 @@
 #Perform esc patching
 
 %patch3 -p1 -b .fix3
+%patch4 -p1 -b .fix4
 
 
 #Unpack xulrunner where esc expects it to be.
@@ -86,6 +90,8 @@
 
 cd ../..
 
+cp %{SOURCE4} %{escxuldir}/%{esc_chromepath}
+
 make BUILD_OPT=1 HAVE_LIB_NOTIFY=1 ESC_VERSION=%{version}-%{release}
 
 %install
@@ -170,6 +176,8 @@
 fi
 
 %changelog
+* Thu Apr 26 2007 Jack Magne <jmagne at redhat.com>- 1.0.0-3
+- Many UI usability fixes.
 * Tue Apr 03 2007 Jack Magne <jmagne at redhat.com>- 1.0.0-2
 * Mon Mar 05 2007 Jack Magne <jmagne at redhat.com>- 1.0.0-1
 - Stability fixes



From fedora-cvs-commits at redhat.com  Thu Apr 26 16:58:59 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 12:58:59 -0400
Subject: rpms/esc/devel esc-1.0.1-ui-fixes-1.patch,NONE,1.1
Message-ID: <200704261658.l3QGwxmx017881@cvs.devel.redhat.com>

Author: jmagne

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

Added Files:
	esc-1.0.1-ui-fixes-1.patch 
Log Message:
UI fixes.

esc-1.0.1-ui-fixes-1.patch:
 app/xpcom/rhCoolKey.cpp                         |   64 ++
 app/xpcom/rhICoolKey.idl                        |    4 
 app/xpcom/tray/rhLinuxTray.cpp                  |   70 ++-
 app/xpcom/tray/rhTray.h                         |    1 
 app/xul/esc/application.ini                     |    4 
 app/xul/esc/chrome/content/esc/ESC.js           |  518 ++++++++++++++++++++----
 app/xul/esc/chrome/content/esc/GenericAuth.js   |   23 -
 app/xul/esc/chrome/content/esc/GenericAuth.xul  |    1 
 app/xul/esc/chrome/content/esc/advancedinfo.xul |    4 
 app/xul/esc/chrome/content/esc/config.xul       |    4 
 app/xul/esc/chrome/content/esc/esc.css          |    2 
 app/xul/esc/chrome/content/esc/esc.xul          |    4 
 app/xul/esc/chrome/content/esc/password.js      |   38 +
 app/xul/esc/chrome/content/esc/password.xul     |    9 
 app/xul/esc/chrome/content/esc/security.xul     |    2 
 app/xul/esc/chrome/content/esc/settings.xul     |   28 -
 app/xul/esc/chrome/locale/en-US/esc.dtd         |   11 
 app/xul/esc/chrome/locale/en-US/esc.properties  |   21 
 lib/coolkey/CoolKey.cpp                         |   10 
 lib/coolkey/CoolKey.h                           |    1 
 lib/coolkey/NSSManager.cpp                      |  154 ++++++-
 lib/coolkey/NSSManager.h                        |    7 
 22 files changed, 851 insertions(+), 129 deletions(-)

--- NEW FILE esc-1.0.1-ui-fixes-1.patch ---
--- ./esc/src/lib/coolkey/NSSManager.cpp.fix4	2007-04-25 10:52:35.000000000 -0700
+++ ./esc/src/lib/coolkey/NSSManager.cpp	2007-04-25 10:52:47.000000000 -0700
@@ -51,6 +51,9 @@
     char tBuff[56];
     PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::NSSManager:\n",GetTStamp(tBuff,56)));
     mpSCMonitoringThread = NULL;
+#ifdef LINUX
+    systemCertDB = NULL;
+#endif
 }
 
 NSSManager::~NSSManager()
@@ -61,6 +64,7 @@
         delete mpSCMonitoringThread;
         mpSCMonitoringThread = NULL;
     }
+
 }
 
 HRESULT NSSManager::InitNSS(const char *aAppDir)
@@ -110,6 +114,21 @@
         return E_FAIL;
     }
 
+#ifdef LINUX
+
+    // Load our Linux only database
+
+
+    const char *modspec = "configdir='/etc/pki/nssdb' tokenDescripton='SystemDB' flags='readOnly'";
+    PK11SlotInfo *systemCertDB = SECMOD_OpenUserDB(modspec);
+
+    if(!systemCertDB)
+    {
+        PR_LOG( coolKeyLogNSS, PR_LOG_ALWAYS, ("%s NSSManager::InitNSS problem loading Linux  System Cert Database!\n",GetTStamp(tBuff,56)));
+    }
+
+#endif
+
     mpSCMonitoringThread = new SmartCardMonitoringThread(userModule);
     if (!mpSCMonitoringThread) {
         SECMOD_UnloadUserModule(userModule);
@@ -132,6 +151,17 @@
   
   // Logout all tokens.
     PK11_LogoutAll();
+
+#ifdef LINUX
+    if(systemCertDB)
+    {
+        SECMOD_CloseUserDB(systemCertDB);
+
+        PK11_FreeSlot(systemCertDB);
+        systemCertDB = NULL;
+    }
+
+#endif
 }
 
 bool 
@@ -326,7 +356,7 @@
     return S_OK;
 }
 
-HRESULT NSSManager::GetKeyIssuedTo(const CoolKey *aKey, char *aBuf, int aBufLength)
+HRESULT NSSManager::GetKeyIssuer(const CoolKey *aKey, char *aBuf, int aBufLength)
 {
     char tBuff[56];
     if(!aBuf)
@@ -337,17 +367,89 @@
     PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetKeyIssuedTo \n",GetTStamp(tBuff,56)));
 
     if(!aKey )
-    {
         return E_FAIL;
-    }
 
     PK11SlotInfo *slot = GetSlotForKeyID(aKey);
 
     if (!slot)
+        return E_FAIL;
+
+    CERTCertList *certs = PK11_ListCerts(PK11CertListAll,NULL);
+
+    if (!certs)
     {
+        PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%sNSSManager::GetKeyIssuer no certs found! \n",GetTStamp(tBuff,56)));
+        PK11_FreeSlot(slot);
         return E_FAIL;
     }
 
+    CERTCertListNode *node= NULL;
+
+    char *orgID = NULL;
+
+    for( node = CERT_LIST_HEAD(certs);
+             ! CERT_LIST_END(node, certs);
+             node = CERT_LIST_NEXT(node))
+    {
+        if(node->cert)
+        {
+            CERTCertificate *cert = node->cert;
+
+            if(cert)
+            {
+                if(cert->slot == slot)
+                {
+                    if(IsCACert(cert))
+                    {
+                        continue;
+                    }
+                    orgID    = CERT_GetOrgName(&cert->subject);
+                    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetKeyIssuedTo ourSlot %p curSlot  %p org %s \n",GetTStamp(tBuff,56),slot,cert->slot,orgID));
+
+                }
+
+                if(orgID)
+                    break;
+            }
+        }
+
+    }
+
+    if(orgID && ((int)strlen(orgID)  <  aBufLength))
+    {
+        strcpy(aBuf,orgID);
+    }
+
+    if(certs)
+      CERT_DestroyCertList(certs);
+
+    if(slot)
+      PK11_FreeSlot(slot);
+
+    if(orgID)
+        PORT_Free(orgID);
+
+    return S_OK;
+}
+
+HRESULT NSSManager::GetKeyIssuedTo(const CoolKey *aKey, char *aBuf, int aBufLength)
+{
+    char tBuff[56];
+    if(!aBuf)
+        return E_FAIL;
+
+    aBuf[0]=0;
+
+    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetKeyIssuedTo \n",GetTStamp(tBuff,56)));
+
+    if(!aKey )
+        return E_FAIL;
+
+    PK11SlotInfo *slot = GetSlotForKeyID(aKey);
+
+    if (!slot)
+        return E_FAIL;
+
     CERTCertList *certs = PK11_ListCerts(PK11CertListAll,NULL);
 
     if (!certs)
@@ -373,8 +475,14 @@
             {
                 if(cert->slot == slot)
                 {
+                    if(IsCACert(cert))
+                    {
+                        continue;
+                    }
+
                     certID = CERT_GetCommonName(&cert->subject);
-                    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetKeyIssuedTo ourSlot %p curSlot  %p certID %s \n",GetTStamp(tBuff,56),slot,cert->slot,certID));
+
+                    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetKeyIssuedTo ourSlot %p curSlot  %p certID %s  \n",GetTStamp(tBuff,56),slot,cert->slot,certID));
 
                 }
 
@@ -627,3 +735,41 @@
   
     return isAuthenticated;
 }
+
+bool 
+NSSManager::IsCACert(CERTCertificate *cert)
+{
+    char tBuff[56];
+    bool isCA = false;
+
+    if(!cert)
+        return isCA;
+
+    SECItem basicItem;
+    basicItem.data = 0;
+    
+    SECStatus s = CERT_FindCertExtension(cert, SEC_OID_X509_BASIC_CONSTRAINTS, &basicItem);
+
+    if(s != SECSuccess || !basicItem.data)
+        return isCA;
+
+    CERTBasicConstraints basic_value;
+   
+    s = CERT_DecodeBasicConstraintValue(&basic_value,&basicItem); 
+
+    if(s != SECSuccess)
+       return isCA;
+
+    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%sNSSManager::GetKeyIssuedTo isCA %d  \n",GetTStamp(tBuff,56),basic_value.isCA));
+
+    if(basic_value.isCA)
+    {
+        PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%sNSSManager::GetKeyIssuedTo found a CA cert , skipping! \n",GetTStamp(tBuff,56)));
+        isCA = true;
+    }
+
+    PORT_Free(basicItem.data);
+    basicItem.data = NULL;
+
+    return isCA;
+}
--- ./esc/src/lib/coolkey/CoolKey.h.fix4	2007-04-25 10:52:20.000000000 -0700
+++ ./esc/src/lib/coolkey/CoolKey.h	2007-04-25 11:02:56.000000000 -0700
@@ -134,6 +134,7 @@
 COOLKEY_API HRESULT CoolKeyGetCertInfo(const CoolKey *aKey, char *aCertNickname, std::string & aCertInfo);
 
 COOLKEY_API HRESULT CoolKeyGetIssuedTo(const CoolKey *aKey, char *aBuf, int aBufLength);
+COOLKEY_API HRESULT CoolKeyGetIssuer(const CoolKey *aKey, char *aBuf, int aBufLength);
 
 COOLKEY_API bool    CoolKeyRequiresAuthentication(const CoolKey *aKey);
 COOLKEY_API bool    CoolKeyIsAuthenticated(const CoolKey *aKey);
--- ./esc/src/lib/coolkey/CoolKey.cpp.fix4	2007-04-25 10:51:58.000000000 -0700
+++ ./esc/src/lib/coolkey/CoolKey.cpp	2007-04-25 10:52:06.000000000 -0700
@@ -844,6 +844,16 @@
     return NSSManager::GetKeyIssuedTo(aKey,aBuf,aBufLength);
 }
 
+HRESULT
+CoolKeyGetIssuer(const CoolKey *aKey, char *aBuf, int aBufLength)
+{
+    if (!aKey || !aKey->mKeyID || !aBuf || aBufLength < 1)
+        return E_FAIL;
+
+    return NSSManager::GetKeyIssuer(aKey,aBuf,aBufLength);
+}
+
+
 HRESULT CoolKeyGetATR(const CoolKey *aKey, char *aBuf, int aBufLen)
 {
     char tBuff[56];
--- ./esc/src/lib/coolkey/NSSManager.h.fix4	2007-04-25 11:08:44.000000000 -0700
+++ ./esc/src/lib/coolkey/NSSManager.h	2007-04-25 10:53:08.000000000 -0700
@@ -68,11 +68,16 @@
 
   static HRESULT GetKeyIssuedTo(const CoolKey *aKey, char *aBuf, int aBufLength);
 
-
+  static HRESULT GetKeyIssuer(const CoolKey *aKey, char *aBuf, int aBufLength);
 
 
  private:
 
+   static bool IsCACert(CERTCertificate *cert);
+
+#ifdef LINUX
+  PK11SlotInfo *systemCertDB;
+#endif
   SmartCardMonitoringThread *mpSCMonitoringThread;
 };
 
--- ./esc/src/app/xpcom/rhICoolKey.idl.fix4	2007-04-25 10:41:08.000000000 -0700
+++ ./esc/src/app/xpcom/rhICoolKey.idl	2007-04-25 10:41:36.000000000 -0700
@@ -66,9 +66,13 @@
     string GetCoolKeyCertInfo(in unsigned long aKeyType, in string aKeyID, in string aCertNickname);
 
     string GetCoolKeyIssuedTo(in unsigned long aKeyType, in string aKeyID);
+   
+    string GetCoolKeyIssuer(in unsigned long aKeyType, in string aKeyID);
 
     string GetCoolKeyATR(in unsigned long aKeyType, in string aKeyID);
 
+    string GetCoolKeyTokenName(in unsigned long aKeyType, in string aKeyID);
+
     boolean GetCoolKeyRequiresAuthentication(in unsigned long aKeyType,in string aKeyID);
 
     boolean GetCoolKeyIsAuthenticated(in unsigned long aKeyType,in string aKeyID);
--- ./esc/src/app/xpcom/rhCoolKey.cpp.fix4	2007-04-25 10:40:43.000000000 -0700
+++ ./esc/src/app/xpcom/rhCoolKey.cpp	2007-04-25 10:40:53.000000000 -0700
@@ -1074,7 +1074,7 @@
     char tBuff[56];
     PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::GetCoolKeyIsReallyCoolKey thread: %p \n",GetTStamp(tBuff,56),PR_GetCurrentThread()));
 
-    if (ASCCoolKeyIsAvailable(aKeyType, (char *) aKeyID)) {
+    if (aKeyType && aKeyID && ASCCoolKeyIsAvailable(aKeyType, (char *) aKeyID)) {
         if (aKeyID) {
             AutoCoolKey key(aKeyType, aKeyID);
             PRBool isCool = CoolKeyIsReallyCoolKey(&key);
@@ -1164,6 +1164,34 @@
       return NS_OK;
   }
 
+/* string GetCoolKeyTokenName (in unsigned long aKeyType, in string aKeyID); */
+ NS_IMETHODIMP rhCoolKey::GetCoolKeyTokenName(PRUint32 aKeyType, const char *aKeyID, char **_retval)
+{
+  char tBuff[56];
+
+  *_retval = NULL;
+
+  if(!aKeyType && !aKeyID)
+      return NS_OK;
+
+  AutoCoolKey key(aKeyType,aKeyID);
+  
+  char *tokenName = NULL;
+
+  tokenName = (char *) CoolKeyGetTokenName(&key);
+
+  PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::GetCoolKeyTokenName %s \n",GetTStamp(tBuff,56),tokenName));
+  if(tokenName)
+  {
+      char *temp =  (char *) nsMemory::Clone(tokenName,sizeof(char) * strlen((char *)tokenName) + 1);
+      *_retval  = temp;
+
+  }
+
+  return NS_OK;
+
+}
+
 /* string GetCoolKeyIssuerInfo (in unsigned long aKeyType, in string aKeyID); */  NS_IMETHODIMP rhCoolKey::GetCoolKeyIssuerInfo(PRUint32 aKeyType, const char *aKeyID, char **_retval)
 {
     char tBuff[56];
@@ -1251,6 +1279,40 @@
     return NS_OK;
 
 }
+
+/* string GetCoolKeyIssuer (in unsigned long aKeyType, in string aKeyID); */
+NS_IMETHODIMP rhCoolKey::GetCoolKeyIssuer(PRUint32 aKeyType, const char *aKeyID, char **issuer)
+{
+    char tBuff[56];
+    if (!aKeyID) {
+        return NS_ERROR_FAILURE;
+    }
+
+    AutoCoolKey key(aKeyType, ( char *)aKeyID);
+
+  //  const char *keyName = CoolKeyGetTokenName(&key);
+
+    char buff[512];
+    int bufLength = 512;
+    buff[0] = 0;
+   
+    CoolKeyGetIssuer(&key, (char *) buff, bufLength);
+
+    if(!buff[0])
+    {
+        return NS_OK;
+    }
+
+    PR_LOG(coolKeyLog,PR_LOG_DEBUG,("%s rhCoolKey::RhGetCoolKeyGetIssuer  %s \n",GetTStamp(tBuff,56),(char *) buff));
+
+    char *temp =  (char *) nsMemory::Clone(buff,sizeof(char) * strlen(buff) + 1);
+
+    *issuer = temp;
+
+    return NS_OK;
+
+}
+
 /* boolean SetCoolKeyConfigValue (in string aName, in string aValue); */
 NS_IMETHODIMP rhCoolKey::SetCoolKeyConfigValue(const char *aName, const char *aValue, PRBool *_retval)
 {
--- ./esc/src/app/xpcom/tray/rhTray.h.fix4	2007-04-25 10:55:28.000000000 -0700
+++ ./esc/src/app/xpcom/tray/rhTray.h	2007-04-25 10:55:35.000000000 -0700
@@ -263,6 +263,7 @@
   // Icon menu related
 
     static GtkWidget *mIconMenu;
+    static GtkWidget *mIconBoxWidget;
     static void IconMenuCBProc(GtkWidget *widget, gpointer data);
     HRESULT CreateIconMenu();     
 
--- ./esc/src/app/xpcom/tray/rhLinuxTray.cpp.fix4	2007-04-25 10:42:40.000000000 -0700
+++ ./esc/src/app/xpcom/tray/rhLinuxTray.cpp	2007-04-25 10:42:51.000000000 -0700
@@ -22,11 +22,13 @@
 #include <prlog.h>
 #include "notifytray.h"
 #include "intl/nsIStringBundle.h"
+#include <gdk/gdkx.h>
 
 NS_IMPL_ISUPPORTS1(rhTray, rhITray)
 
 GtkWidget* rhTray::mWnd = NULL;
 GtkWidget* rhTray::mIconMenu = NULL;
+GtkWidget* rhTray::mIconBoxWidget = NULL;
 
 int rhTray::mInitialized = 0;
 
@@ -37,6 +39,44 @@
 
 static PRLogModuleInfo *trayLog = PR_NewLogModule("tray");
 
+static void popup_position(GtkMenu *menu,
+                                       gint *x,
+                                       gint *y,
+                                       gboolean *push_in,
+                                       gpointer user_data)
+{
+
+  char tBuff[56];
+  GtkWidget *icon_box_widget = GTK_WIDGET(user_data);
+
+  if(icon_box_widget)
+  {
+     GdkWindow* window = icon_box_widget->window;
+
+     gint width;
+     gint height;
+
+     gint px;
+     gint py;
+
+     gdk_drawable_get_size(window,&width,&height);
+
+     gdk_window_get_position(window,
+                                     &px,
+                                     &py);
+
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s popup_position width %d height %d  px %d py %d \n",GetTStamp(tBuff,56),width,height,px,py));
+
+
+     gint x_coord = px;
+     gint y_coord = (py + height);
+
+     *x = x_coord;
+     *y = y_coord; 
+
+  }
+
+}
 
 rhTray::rhTray() 
 {
@@ -232,11 +272,12 @@
        return E_FAIL;
     }
     
-    GtkWidget *icon_widget = notify_icon_get_box_widget();
+    mIconBoxWidget = notify_icon_get_box_widget();
 
-    if(icon_widget)
+    if(mIconBoxWidget)
     {
-        g_signal_connect(G_OBJECT(icon_widget), "button-press-event", G_CALLBACK(rhTray::IconCBProc), NULL);
+        g_signal_connect(G_OBJECT(mIconBoxWidget), "button-press-event", G_CALLBACK(rhTray::IconCBProc), NULL);
+
     }
 
     res = CreateEventWindow();
@@ -352,11 +393,23 @@
 
     GtkWidget *min_item = gtk_menu_item_new_with_label ("Hide");
     GtkWidget *max_item = gtk_menu_item_new_with_label ("Manage Keys");
-    GtkWidget *exit_item = gtk_menu_item_new_with_label ("Exit");
+    GtkWidget *exit_item = gtk_image_menu_item_new_with_label ("Exit");
 
-    gtk_menu_shell_append (GTK_MENU_SHELL (mIconMenu), max_item);
+    GtkWidget* quit_icon = gtk_image_new_from_stock(GTK_STOCK_QUIT,GTK_ICON_SIZE_SMALL_TOOLBAR);
+
+    if(max_item)
+       gtk_menu_shell_append (GTK_MENU_SHELL (mIconMenu), max_item);
     //gtk_menu_shell_append (GTK_MENU_SHELL (mIconMenu), min_item);
-    gtk_menu_shell_append (GTK_MENU_SHELL (mIconMenu), exit_item);
+    if(exit_item)
+    {
+        gtk_menu_shell_append (GTK_MENU_SHELL (mIconMenu), exit_item);
+
+        if(quit_icon)
+        {
+           gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(exit_item), quit_icon);
+
+        }
+    }
 
     g_signal_connect(G_OBJECT (min_item), "activate",
                               G_CALLBACK (rhTray::IconMenuCBProc),
@@ -404,8 +457,8 @@
                 gtk_menu_popup(GTK_MENU(mIconMenu),
                                              NULL,
                                              NULL,
-                                             NULL,
-                                             NULL,
+                        (GtkMenuPositionFunc) popup_position,
+                                              mIconBoxWidget,
                                              event->button,
                                              event->time);
 
@@ -725,6 +778,7 @@
 
          if(widget->window)
          {
+             gdk_x11_window_set_user_time (widget->window, gdk_x11_get_server_time (widget->window));
              if(GTK_WIDGET_VISIBLE(mWnd))
              {
                  gdk_window_show(widget->window);
--- ./esc/src/app/xul/esc/application.ini.fix4	2007-04-25 10:43:17.000000000 -0700
+++ ./esc/src/app/xul/esc/application.ini	2007-04-25 10:44:00.000000000 -0700
@@ -19,13 +19,13 @@
 ;
 ; This field specifies your organization's name.  This field is recommended,
 ; but optional.
-Vendor=RedHat
+Vendor=RedHat
 ;
 ; This field specifies your application's name.  This field is required.
 Name=ESC
 ;
 ; This field specifies your application's version.  This field is optional.
-Version=1.0.0
+Version=1.0.1-3
 ;
 ; This field specifies your application's build ID (timestamp).  This field is
 ; required.
--- ./esc/src/app/xul/esc/chrome/content/esc/security.xul.fix4	2007-04-25 10:48:49.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/security.xul	2007-04-25 10:48:59.000000000 -0700
@@ -38,6 +38,6 @@
   </groupbox>
   <hbox >
         <spacer flex="3"/>
-        <button id="closebtn" label ="&closeNow;" oncommand="window.close();"/>
+        <button id="closebtn" label ="&closeNow;" oncommand="window.close();" accesskey="&Close.accesskey;"/>
   </hbox>
 </window>
--- ./esc/src/app/xul/esc/chrome/content/esc/password.xul.fix4	2007-04-25 10:48:31.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/password.xul	2007-04-25 10:48:40.000000000 -0700
@@ -26,6 +26,7 @@
     onunload="cleanup();"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
+<stringbundle id="esc_strings" src="chrome://esc/locale/esc.properties"/>
 <script src="password.js"/>
 <script src="ESC.js"/>
 <script src="TRAY.js"/>
@@ -50,7 +51,7 @@
     <vbox id="standalone-password-area-id">
          <grid>
              <columns>
-                 <column flex="0"/>
+                 <column flex="1"/>
              </columns>
              <rows>
                  <row>
@@ -70,7 +71,7 @@
                      <label value="&passwordQuality;"/>
                  </row>
                  <row>
-                     <image id="password-image" src="1-none.png"/>
+                     <progressmeter id="pass-progress-id" value="0"/>
                      <spacer flex = "1"/>
                  </row>
                  <row>
@@ -82,8 +83,8 @@
 
    <hbox>
        <spacer flex="1"/>
-       <button id="okbtn" label ="&escOK;" oncommand="doOperation();"/>
-       <button id="cancel" label ="&escCancel;" oncommand ="window.close();"/>
+       <button id="okbtn" label ="&escOK;" oncommand="doOperation();" accesskey="&OK.accesskey;" />
+       <button id="cancel" label ="&escCancel;" oncommand ="window.close();" accesskey="&Cancel.accesskey;"/>
        <spacer flex = "1"/>
    </hbox>
 </groupbox>
--- ./esc/src/app/xul/esc/chrome/content/esc/GenericAuth.xul.fix4	2007-04-25 10:46:22.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/GenericAuth.xul	2007-04-25 10:46:36.000000000 -0700
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/"  type="text/css"?>
 <?xml-stylesheet href="esc.css" type="text/css"?>
 <!-- ***** BEGIN COPYRIGHT BLOCK *****
  * This Program is free software; you can redistribute it and/or modify it under
--- ./esc/src/app/xul/esc/chrome/content/esc/password.js.fix4	2007-04-25 10:48:11.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/password.js	2007-04-25 10:48:20.000000000 -0700
@@ -16,6 +16,9 @@
  * END COPYRIGHT BLOCK **/
 
 var parentWindow = window.opener;
+var gStringBundle=null;
+
+loadStringBundle();
 
 function doOperation()
 {
@@ -57,16 +60,16 @@
   if(reenterpintf_obj)
       rpinVal =  reenterpintf_obj.value;
 
-  if (! pinVal && pintf_obj)
+  if (!pinVal && pintf_obj)
   {
-    MyAlert("You must provide a valid Token PIN!");
-    return null;
+      MyAlert(getBundleString("errorProvideTokenPIN"));
+      return null;
   }
 
-  if ( pinVal != rpinVal && reenterpintf_obj)
+  if ( pinVal != rpinVal )
   {
-    MyAlert("The PIN values you entered don't match!");
-    return null;
+      MyAlert(getBundleString("errorMatchPinValues"));
+      return null;
   }
 
   return pinVal;
@@ -75,4 +78,27 @@
 function PasswordLoad()
 {
     window.sizeToContent();
+    var pintf_obj = document.getElementById("pintf");
+    if(pintf_obj)
+        pintf_obj.focus();
+}
+
+//String bundling related functions
+
+function loadStringBundle()
+{
+    gStringBundle = document.getElementById("esc_strings");
+}
+
+function getBundleString(string_id)
+{
+    var str = null;
+
+    if(!string_id || !gStringBundle)
+       return null;
+
+    str = gStringBundle.getString(string_id);
+
+    return str;
 }
+
--- ./esc/src/app/xul/esc/chrome/content/esc/GenericAuth.js.fix4	2007-04-25 10:45:55.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/GenericAuth.js	2007-04-25 10:46:05.000000000 -0700
@@ -529,6 +529,7 @@
     }
 
     var i = 0;
+    var first_box = 1;
 
     for(i = 0 ; i < len ; i ++)
     {
@@ -594,6 +595,11 @@
                if(field)
                {
                     row.appendChild(field);
+                    if(first_box)
+                    {
+                        field.focus();
+                        first_box = 0;
+                    }
                }
 
            }
@@ -602,19 +608,20 @@
 
     }
 
-    var last_row = AddRowToGrid(grid);
-
-    if(last_row)
+    var ui_hbox = document.createElement("hbox");
+    if(ui_hbox)
     {
-         AddSpacerToNode(last_row,"1","min-height: 20px");
-         AddSpacerToNode(last_row,"1","min-height: 20px");
-        var button = AddButton("","Submit"); 
+        box.appendChild(ui_hbox);
+        AddSpacerToNode(ui_hbox,"1","");
+        var button = AddButton("",getBundleString("authSubmit")); 
         if(button)
+        {
             button.setAttribute("oncommand" , "FormSubmit();");
-
+            button.setAttribute("accesskey", getBundleString("authSubmitAccessKey"));
+        }
 
         if(button)
-            last_row.appendChild(button);
+            ui_hbox.appendChild(button);
     } 
 }
 
--- ./esc/src/app/xul/esc/chrome/content/esc/ESC.js.fix4	2007-04-25 10:44:57.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/ESC.js	2007-04-25 10:45:39.000000000 -0700
@@ -229,9 +229,10 @@
     var issuer = "";
     if(aResult == true)
     {
-        issuer = GetCachedIssuer(keyID);       
+        issuer = GetCoolKeyIssuer(keyType,keyID);       
         if(!issuer)
             issuer = getBundleString("unknownIssuer");
+        recordMessage("In DoPhoneHome callback success issuer " + issuer);
         TraySendNotificationMessage(getBundleString("keyInserted"),"\"" + issuer +"\"" + " " + getBundleString("keyInsertedComputer"),3,4000,GetESCNotifyIconPath(keyType,keyID));
         LogKeyInfo(keyType,keyID,"Key Inserted ...");
         UpdateRowWithPhoneHomeData(keyType,keyID);
@@ -248,7 +249,11 @@
     }
     else
     {
-        issuer = getBundleString("unknownIssuer");
+  
+        issuer = GetCoolKeyIssuer(keyType,keyID);
+        if(!issuer)
+            issuer = getBundleString("unknownIssuer");
+        recordMessage("Phone home callback failed , issuer " + issuer);
         TraySendNotificationMessage(getBundleString("keyInserted"),"\"" + issuer +"\"" + " " + getBundleString("keyInsertedComputer"),3,4000,GetESCNotifyIconPath(keyType,keyID));
         LogKeyInfo(keyType,keyID,"Key Inserted ...");
     }
@@ -265,7 +270,7 @@
       var phoneHomeURI = GetCachedPhoneHomeURL(keyID);
 
       recordMessage("Phone home info cached...");
-      issuer = GetCachedIssuer(keyID);
+      issuer = GetCoolKeyIssuer(keyType,keyID);
       TraySendNotificationMessage(getBundleString("keyInserted"),"\"" + issuer +"\"" + " " + getBundleString("keyInsertedComputer"),3,4000,GetESCNotifyIconPath(keyType,keyID));
       LogKeyInfo(keyType,keyID,"Key Inserted ...");
 
@@ -415,6 +420,11 @@
 
 function InitializePhoneHomeConfigUI()
 {
+    var uri_box = document.getElementById("phonehomeuri");
+    
+    if(uri_box)
+        uri_box.focus();
+
     window.sizeToContent();
 }
 
@@ -666,8 +676,24 @@
 
      issuer = GetCachedIssuer(keyID);
 
-     if(!issuer)
-         issuer = getBundleString("unknownIssuer");
+
+     // Now try to read off the certs if applicable
+
+    if(!issuer && (GetStatusForKeyID(keyType, keyID) == getBundleString("statusEnrolled")))
+    {
+        try {
+            netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+            issuer = netkey.GetCoolKeyIssuer(keyType,keyID);
+
+        } catch (e)
+        {
+            issuer = null;
+        }
+    }
+
+
+    if(!issuer)
+        issuer = getBundleString("unknownIssuer");
 
     return issuer;
 }
@@ -719,11 +745,16 @@
        var appletVerMaj = DoGetCoolKeyGetAppletVer(keyType, keyID , true);
        var appletVerMin = DoGetCoolKeyGetAppletVer(keyType, keyID, false);
 
-       var issuer = GetCachedIssuer(keyID);
+       var issuer = GetCoolKeyIssuer(keyType,keyID);
        if(!issuer)
            issuer = getBundleString("unknownIssuer");
 
-       textDump += getBundleString("smartCardU") + " " + i + ":"  + "\n\n";
+       var cardName = DoCoolKeyGetTokenName(keyType,keyID);
+
+       if(!cardName)
+           cardName = i;
+
+       textDump += getBundleString("smartCardU") + "  " + cardName + ":"  + "\n\n";
 
        textDump += "  " + getBundleString("appletVersion") + " " + appletVerMaj + "." + appletVerMin + "\n";
 
@@ -1008,24 +1039,24 @@
 {
   var image_src = "";
 
-  if(observeBusy && (keyStatus == "BUSY" ))
+  if(observeBusy && (keyStatus == getBundleString("statusBusy")))
   {
       return "throbber-anim5.gif";
   }
-  if(keyStatus == "UNAVAILABLE")
+  if(keyStatus == getBundleString("statusUnavailable"))
   {
       return "";
   }
-  if(keyStatus == "ENROLLED")
+  if(keyStatus == getBundleString("statusEnrolled"))
   {
       image_src = "enrolled-key";
   }
   else
   {
-          if(keyStatus == "UNINITIALIZED")
+          if(keyStatus == getBundleString("statusUninitialized"))
               image_src = "initializecard";
            else
-               if(keyStatus == "NO APPLET")
+               if(keyStatus == getBundleString("statusNoApplet"))
                    image_src = "blank-card";
   }
 
@@ -1205,6 +1236,7 @@
 
 function UpdateEnrollmentArea(keyType,keyID,inserted,showFullUI,showExternalUI)
 {
+
      if(!gEnrollmentPage)
          return;
 
@@ -1215,12 +1247,11 @@
      {
          alreadyEnrolled = true;
      } 
-      var arr = GetAvailableCoolKeys();
-      var numKeys = arr.length;
 
-      //alert("inserted " + inserted + " showFulUI " + showFullUI + " showExternalUI " + showExternalUI + " already enrolled " + alreadyEnrolled);
+      var numUnenrolledKeys = DoGetNumUnenrolledCoolKeys();
+
+      //alert("inserted " + inserted + " showFulUI " + showFullUI + " showExternalUI " + showExternalUI + " already enrolled " + alreadyEnrolled + " numUnenrolledKeys " + numUnenrolledKeys);
 
-     //If we already have external UI and keys left, don't mess it up
 
      var ui_id = document.getElementById("esc-ui");
 
@@ -1232,7 +1263,7 @@
 
          if(!inserted)
          {
-             if(!numKeys)
+             if(!numUnenrolledKeys)
              {
                ui_id.setAttribute("src",null);
              }
@@ -1389,6 +1420,9 @@
    var pw = document.getElementById("pintf").value;
    var pwlength = 0;
 
+   var qualityMeter = document.getElementById("pass-progress-id");
+
+
    if(pw)
        pwlength = pw.length;
 
@@ -1422,6 +1456,11 @@
   if ( pwstrength > 100 ) {
     pwstrength = 100;
   }
+   if(qualityMeter)
+   {
+       qualityMeter.setAttribute("value",  pwstrength);
+
+   }
    if(qualityImage)
    {
         if(pwlength==0)
@@ -1522,13 +1561,14 @@
       break;
     case 4: // Available
     case 6: // UnblockInProgress
-    case 7: // PINResetInProgress
     case 8: // RenewInProgress
       keyStatus = PolicyToKeyType(GetCoolKeyPolicy(keyType, keyID));
       break;
-    case 5: // EnrollmentInProgress
+    case 7: // PINResetInProgress
       keyStatus = getBundleString("statusBusy");
       break;
+    case 5: // EnrollmentInProgress
+      keyStatus = getBundleString("statusBusy");
       break;
     case 9: // FormatInProgress
       keyStatus = getBundleString("statusBusy");
@@ -1604,7 +1644,7 @@
 function UpdateCoolKeyAvailabilityForEnrollment()
 {
   //Here we only allow ONE key
-  //Take the first one that shows up.
+  //Take the first unenrolled one that shows up.
 
   var arr = GetAvailableCoolKeys();
 
@@ -1616,17 +1656,24 @@
 
   var i=0;
 
-  for (i=0; i < 1; i++)
+  for (i=0; i < arr.length; i++)
   {
-      var row = InsertCoolKeyIntoEnrollmentPage(arr[i][0],arr[i][1]);
+      var status =  GetStatusForKeyID(arr[i][0],arr[i][1]);
 
-      if(row)
-        gCurrentSelectedRow = row;
+      if(status  != getBundleString("statusEnrolled"))
+      {
+          var row = InsertCoolKeyIntoEnrollmentPage(arr[i][0],arr[i][1]);
+
+          if(row)
+            gCurrentSelectedRow = row;
 
-       var keyInserted = 1;
-       var showFullUI = 0;
+          var keyInserted = 1;
+          var showFullUI = 0;
     
-       UpdateEnrollmentArea(arr[i][0],arr[i][1],keyInserted,showFullUI);
+          UpdateEnrollmentArea(arr[i][0],arr[i][1],keyInserted,showFullUI);
+
+          break;
+      }
   }
 
   UpdateESCSize();
@@ -1660,6 +1707,8 @@
     {
         UpdateESCSize();
     }
+
+    window.focus();
 }
 
 function SetCurrentSelectedRowForEnrollment()
@@ -1703,6 +1752,9 @@
 
  DoSetEnrolledBrowserLaunchState(); 
  DoHandleEnrolledBrowserLaunch();
+
+ window.setTimeout('ShowWindow()',250);
+
 }
 
 //Window related functions
@@ -2039,11 +2091,15 @@
     if(!gAdminPage)
         return;
 
-    var isCool =  DoGetCoolKeyIsReallyCoolKey(keyType, keyID);
+    var isCool = null;
+
+    //alert("blub " + " keyType " + keyType + " keyID " + keyID);
+
+    isCool = DoGetCoolKeyIsReallyCoolKey(keyType, keyID);
 
     var noKey = 0;
 
-    if(!keyType || !keyID)
+    if(!keyType && !keyID)
     {
         noKey = 1;
     }
@@ -2053,7 +2109,6 @@
     if(!noKey)
         keyStatus = GetStatusForKeyID(keyType, keyID);
 
-
     recordMessage("No Key: " + noKey + " status " + keyStatus);
 
     var passwordArea = document.getElementById("password-area-id");
@@ -2101,11 +2156,6 @@
     if(!viewcertsbtn)
         return;
 
-    //hack for CAC cards that now have no CUID reported
-
-    if(!isCool && !noKey)
-        keyStatus = "ENROLLED";
-
     var image_src = SelectImageForKeyStatus(keyStatus,1,1);
 
     recordMessage("image_src " + image_src);
@@ -2116,13 +2166,38 @@
         ShowItem(detailsImage);
         detailsImage.setAttribute("src", image_src);
     }
+
+    // Now take care of the right click context menu that is
+    // Invisible at this point
+
+   var adminkeymenu = document.getElementById("adminkeymenu");
+   var menu_format = null;
+   var menu_enroll = null;
+   var menu_resetpassword = null;
+
+   if(adminkeymenu)
+   {
+       menu_format = document.getElementById("menu-format");
+       menu_enroll = document.getElementById("menu-enroll");
+       menu_resetpassword = document.getElementById("menu-resetpassword");
+       
+       if(!menu_format || !menu_enroll || !menu_resetpassword)
+       {
+           menu_format = null;
+           menu_enroll = null;
+           menu_resetpassword = null;
+           adminkeymenu = null;
+       }
+   }
+
+   recordMessage("Obtained admin popup menu object.");
     ShowItem(advancedbtn);
     EnableItem(advancedbtn);
 
     var isBusy =  0;
     var operationLabel = null;
 
-    if(keyStatus == "BUSY" || keyStatus == "UNAVAILABLE")
+    if(keyStatus == getBundleString("statusBusy") || keyStatus == getBundleString("statusUnavailable"))
         isBusy = 1;
 
     if(isBusy)
@@ -2132,9 +2207,15 @@
 
    if(!keyStatus)
    {
-
       DisableItem(viewcertsbtn);
       DisableItem(enrollbtn);
+      if(adminkeymenu)
+      {
+         DisableItem(menu_enroll);
+         DisableItem(menu_resetpassword);
+         DisableItem(menu_format);
+      }
+
       DisableItem(resetpinbtn);
       DisableItem(formatbtn);
 
@@ -2144,21 +2225,44 @@
       return;
    }
 
-   if(keyStatus == "ENROLLED")
+   if(keyStatus == getBundleString("statusEnrolled"))
    {
+       var isLoginKey = IsKeyLoginKey(keyType,keyID);
        EnableItem(viewcertsbtn);
 
        DisableItem(enrollbtn);
+       if(adminkeymenu)
+           DisableItem(menu_enroll);
 
        if(isCool)
        {
+           if(adminkeymenu)
+               EnableItem(menu_resetpassword);
+
            EnableItem(resetpinbtn);
-           EnableItem(formatbtn);
+
+           if(!isLoginKey)
+           {
+               EnableItem(formatbtn);
+               if(adminkeymenu)
+                   EnableItem(menu_format);
+           }
+           else
+           {
+               DisableItem(formatbtn);
+               if(adminkeymenu)
+                   DisableItem(menu_format);
+           }
        }
        else
        {
            DisableItem(resetpinbtn);
            DisableItem(formatbtn);
+           if(adminkeymenu)
+           {
+               DisableItem(menu_format);
+               DisableItem(menu_resetpassword);
+           }
        }
 
        if(!isBusy)
@@ -2167,51 +2271,75 @@
        return;
    }
 
-   if(keyStatus == "UNINITIALIZED")
+   if(keyStatus == getBundleString("statusUninitialized"))
    {
          DisableItem(viewcertsbtn);
 
          if(isCool)
          {
               EnableItem(enrollbtn);
+              if(adminkeymenu)
+                  EnableItem(menu_enroll);
          }
          else
          {
+              if(adminkeymenu)
+                  DisableItem(menu_enroll);
+
               DisableItem(enrollbtn);
          }
 
          DisableItem(resetpinbtn);
+         if(adminkeymenu)
+             DisableItem(menu_resetpassword);
+
          if(!isBusy)
-           detailsKeyLabel.setAttribute("value",getBundleString("uninitializedKey"));
+           detailsKeyLabel.setAttribute("value",getBundleString("statusUninitialized"));
 
          if(isCool)
          {
              EnableItem(formatbtn);
-
+             if(adminkeymenu)
+                 EnableItem(menu_format);
          }
          else
          {
+             if(adminkeymenu) 
+                 DisableItem(menu_format);
+
              DisableItem(formatbtn);
          }
 
        return;
    }
 
-   if(keyStatus == "NO APPLET")
+   if(keyStatus == getBundleString("statusNoApplet"))
    {
        DisableItem(viewcertsbtn);
        DisableItem(enrollbtn);
        DisableItem(resetpinbtn);
 
+       if(adminkeymenu)
+       {
+           DisableItem(menu_enroll);
+           DisableItem(menu_resetpassword);
+       }
+
        if(!isBusy)
-           detailsKeyLabel.setAttribute("value",getBundleString("blankKey"));
+           detailsKeyLabel.setAttribute("value",getBundleString("statusNoApplet"));
 
        if(isCool)
        {
+           if(adminkeymenu)
+               EnableItem(menu_format);
+
            EnableItem(formatbtn);
        }
        else
        {
+           if(adminkeymenu)
+               DisableItem(menu_format);
+
            DisableItem(formatbtn);
 
        }
@@ -2229,6 +2357,12 @@
        if(operationLabel)
             detailsKeyLabel.setAttribute("value",operationLabel);
 
+       if(adminkeymenu)
+       {
+           DisableItem(menu_enroll);
+           DisableItem(menu_format);
+           DisableItem(menu_resetpassword);
+       }
    }
 }
 
@@ -2249,7 +2383,6 @@
 }
 function UpdateAdminListRow( keyType, keyID)
 {
-
     if(!gAdminPage)
         return;
 
@@ -2262,6 +2395,8 @@
     if(!listbox)
        return;
 
+    var isLoginKey = IsKeyLoginKey(keyType,keyID);
+
     var issuer = GetCoolKeyIssuer(keyType,keyID);
     var issuedTo = GetCoolKeyIssuedTo(keyType,keyID);
     var keyStatus = GetStatusForKeyID(keyType, keyID);
@@ -2278,7 +2413,13 @@
         issuedToCell.setAttribute("label",issuedTo);
 
     if(statusCell)
-        statusCell.setAttribute("label",keyStatus);
+    {
+        if(!isLoginKey)
+            statusCell.setAttribute("label",keyStatus);
+        else
+            statusCell.setAttribute("label",getBundleString("statusLoggedIn"));
+
+    }
 
     if(imageCell)
         imageCell.setAttribute("image",SelectImageForKeyStatus(keyStatus,1,0));
@@ -2332,7 +2473,13 @@
       return null;
 
   status.setAttribute("class","rowLabelText");
-  status.setAttribute("label",keyStatus);
+
+  var isLoginKey = IsKeyLoginKey(keyType,keyID);
+  if(!isLoginKey)
+      status.setAttribute("label",keyStatus);
+  else
+      status.setAttribute("label",getBundleString("statusLoggedIn"));
+
   status.setAttribute("id",KeyToCellID(keyType,keyID,"status"));
 
   var progressCell = InsertListCell(listrow);
@@ -2351,9 +2498,12 @@
       progressMeter.setAttribute("value", "0%");
 
       progressMeter.setAttribute("class","progressMeter");
+      HideItem(progressMeter);
   }
 
   listrow.setAttribute("onclick","DoSelectAdminListRow(this);");
+  listrow.setAttribute("ondblclick","launchCertViewerIfCerts();");
+  listrow.setAttribute("context","adminkeymenu");
 
   adminListBox.appendChild(listrow);
   return listrow;
@@ -2396,6 +2546,12 @@
 {
   SetProgressMeterValue(progMeterID, 0);
   SetProgressMeterStatus(progMeterID, "");
+
+  var meter = document.getElementById(progMeterID);
+  if(meter)
+      HideItem(meter);
+
+  
 }
 
 function KeyToProgressBarID(keyType, keyID)
@@ -2504,6 +2660,8 @@
 
   var screennamepwd = null;
   var tokencode = null;
+  
+  var failed = 0;
 
   if (type == "userKey")
   {
@@ -2526,6 +2684,7 @@
 
   if (!EnrollCoolKey(keyType, keyID, type, screenname, pin,screennamepwd,tokencode))
   {
+    failed = 1;
     recordMessage("EnrollCoolKey failed.");
   }
 
@@ -2533,7 +2692,11 @@
   {
      UpdateAdminListRow(keyType,keyID);
      UpdateAdminKeyDetailsArea(keyType,keyID);
-     UpdateAdminKeyAreaDetailsLabel(getBundleString("enrollingToken"));
+     if(!failed)
+     {
+          AdminToggleStatusProgress(1,keyType,keyID);
+          UpdateAdminKeyAreaDetailsLabel(getBundleString("enrollingToken"));
+     }
   }
 }
 
@@ -2558,16 +2721,20 @@
   var pin =  GetPINValue();
   var screennamepwd = null;
 
+  var failed = 0;
+
   if (GetCoolKeyIsEnrolled(keyType, keyID))
   {
 
     if (!ResetCoolKeyPIN(keyType, keyID, screenname, pin,screennamepwd))
     {
+      failed = 1;
       recordMessage("ResetCoolKeyPIN failed.");
     }
   }
   else
   {
+      failed = 1;
       MyAlert(getBundleString("errorEnrolledFirst"));
   }
 
@@ -2575,7 +2742,12 @@
   {
      UpdateAdminListRow(keyType,keyID);
      UpdateAdminKeyDetailsArea(keyType,keyID);
-      UpdateAdminKeyAreaDetailsLabel(getBundleString("resettingTokenPIN"));
+
+      if(!failed)
+      {
+          AdminToggleStatusProgress(1,keyType,keyID);
+          UpdateAdminKeyAreaDetailsLabel(getBundleString("resettingTokenPIN"));
+      }
   }
 }
 
@@ -2590,6 +2762,7 @@
   var keyType = keyInfo[0];
   var keyID = keyInfo[1];
 
+  var failed = 0;
   var globalType = GetCachedTokenType(keyID);
 
   if(!type)
@@ -2609,6 +2782,7 @@
 
   if (!FormatCoolKey(keyType, keyID, lType, screenname, pin,screennamepwd,tokencode))
   {
+    failed = 1;
     recordMessage("FormatCoolKey failed.");
   }
 
@@ -2616,7 +2790,11 @@
   {
       UpdateAdminListRow(keyType,keyID);
       UpdateAdminKeyDetailsArea(keyType,keyID);
-      UpdateAdminKeyAreaDetailsLabel(getBundleString("formatingToken"));
+      if(!failed)
+      {
+          AdminToggleStatusProgress(1,keyType,keyID);
+          UpdateAdminKeyAreaDetailsLabel(getBundleString("formatingToken"));
+      }
   }
 }
 function DoCancelOperation()
@@ -2677,18 +2855,25 @@
   {
       var phoneHomeSuccess = 1;
       if(DoGetCoolKeyIsReallyCoolKey(keyType, keyID))
+      {
           phoneHomeSuccess = DoPhoneHome(keyType,keyID);
+      }
+      else
+      {
+          var issuer = GetCoolKeyIssuer(keyType,keyID);
+          if(!issuer )
+              issuer = getBundleString("unknownIssuer");
+
+          TraySendNotificationMessage(getBundleString("keyInserted"),"\"" + issuer +"\"" + " " + getBundleString("keyInsertedComputer"),3,4000,GetESCNotifyIconPath(keyType,keyID));
+
+      }
+
       ShowAllWindows();
       if(!CheckForSecurityMode())
       {
           SelectESCPage(keyType,keyID,1 - phoneHomeSuccess);
       }
 
-      var issuer = GetCachedIssuer(keyID);
-      if(!issuer )
-      {
-          issuer = getBundleString("unknownIssuer");
-      }
   }
 
 }
@@ -2699,7 +2884,6 @@
 
   var  row = GetRowForKey(keyType, keyID);
 
-
   if(gHiddenPage)
   {
       if(curChildWindow)
@@ -2707,7 +2891,7 @@
           curChildWindow.close();
           curChildWindow = null;
       }
-      var issuer = GetCachedIssuer(keyID);
+      var issuer = GetCoolKeyIssuer(keyType,keyID);
       if(!issuer)
           issuer = getBundleString("unknownIssuer");
       TraySendNotificationMessage(getBundleString("keyRemoved"),"\"" + issuer + "\"" + " " + getBundleString("keyRemovedComputer"),1,4000,GetESCNotifyIconPath(keyType,keyID));
@@ -2723,9 +2907,17 @@
   {
       RemoveAdminRow(row);
       if (row == gCurrentSelectedRow)
+      {
           gCurrentSelectedRow = null;
-
-      UpdateAdminKeyDetailsArea(null,null);
+          UpdateAdminBindingListAvailability();
+      }
+      else
+      {
+          if(DoGetNumCoolKeys() == 0)
+          {
+              UpdateAdminKeyDetailsArea(null,null);
+          }
+      }
   }
 
 }
@@ -2765,6 +2957,7 @@
   {
       UpdateAdminKeyDetailsArea(keyType,keyID);
       UpdateAdminListRow(keyType,keyID);
+      AdminToggleStatusProgress(0,keyType,keyID);
   }
 
   ClearProgressBar(KeyToProgressBarID(keyType, keyID));
@@ -2789,6 +2982,7 @@
    {
      UpdateAdminKeyDetailsArea(keyType,keyID);
      UpdateAdminListRow(keyType,keyID);
+     AdminToggleStatusProgress(0,keyType,keyID);
    }
 
 }
@@ -2812,6 +3006,7 @@
    {
      UpdateAdminKeyDetailsArea(keyType,keyID);
      UpdateAdminListRow(keyType,keyID);
+     AdminToggleStatusProgress(0,keyType,keyID);
    }
 
 }
@@ -2858,6 +3053,7 @@
    {
      UpdateAdminKeyDetailsArea(keyType,keyID);
      UpdateAdminListRow(keyType,keyID);
+     AdminToggleStatusProgress(0,keyType,keyID);
    }
 
   if(!CheckForSecurityMode())
@@ -3319,9 +3515,35 @@
 
     return num;
 }
+
+//Return how many unenrolled cards are plugged in.
+function DoGetNumUnenrolledCoolKeys()
+{
+    var num = 0;
+    var arr = GetAvailableCoolKeys();
+    if (arr && arr.length )
+    {
+        for (i=0; i < arr.length; i++)
+        {
+            var status =  GetStatusForKeyID(arr[i][0],arr[i][1]);
+
+            if(status  != getBundleString("statusEnrolled"))
+                num++;
+
+        }
+    }
+
+    return num;
+
+}
+
+
 //Is this really a CoolKey and not a CAC card?
 function DoGetCoolKeyIsReallyCoolKey(keyType,keyID)
 {
+    if(!keyType && !keyID)
+        return 0;
+
     try {
       netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
       var isCool =  netkey.GetCoolKeyIsReallyCoolKey(keyType, keyID);
@@ -3351,10 +3573,25 @@
 
     try {
       netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-      url =  netkey.GetCoolKeyIssuerInfo(keyType, keyID);
+      
+      var tries = 0;
+      while(tries < 3)
+      { 
+          url =  netkey.GetCoolKeyIssuerInfo(keyType, keyID);
+
+          if(url.length < 10)   // Check for bogus junk
+          {
+              recordMessage("Bogus url found ....");
+              url = null;
+              Sleep(150);
+              recordMessage("Going to try again... ");
+          }
+          else
+              break;
+
+          tries ++;
+      }
 
-      if(url.length < 10)   // Check for bogus junk
-          url = null;
 
       if(url)
       {
@@ -3362,7 +3599,26 @@
           var result = DoCoolKeySetConfigValue(issuer_config_value,url);
       }
     } catch (e) {
-      ReportException(getBundleString("errorIssuerInfo") + " " , e);
+      recordMessage("Exception attempting to get token issuer info.");
+
+      var tries = 0;
+      while(tries < 3)
+      {
+          url =  netkey.GetCoolKeyIssuerInfo(keyType, keyID);
+
+          if(url.length < 10)   // Check for bogus junk
+          {
+              recordMessage("Bogus url found from exception....");
+              url = null;
+              sleep(150);
+              recordMessage("From exception.  Going to try again... ");
+          }
+          else
+              break;
+
+          tries ++;
+      }
+      recordMessage("From exception returning " + url);
       return url;
   }
 
@@ -3381,6 +3637,24 @@
 
   return atr;
 }
+
+//Get Token Name of card
+function DoCoolKeyGetTokenName(keyType,keyID)
+{
+    if(!keyType && !keyID)
+        return null;
+
+    var name = null;
+    try {
+      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+      name =  netkey.GetCoolKeyTokenName(keyType, keyID);
+    } catch (e) {
+      return name;
+    }
+
+    return name;
+}
+
 //Get applet version of card
 function DoGetCoolKeyGetAppletVer(keyType, keyID , isMajor)
 {
@@ -3418,6 +3692,13 @@
     MyAlert(usageStr);
 }
 
+function ShowVersion()
+{
+    var verStr = getBundleString("coolkeyComponentVersion")  + "\n\n";
+
+    MyAlert(verStr + " " + GetCoolKeyVersion());
+
+}
 
 //Is the security mode up?
 function CheckForSecurityMode()
@@ -3458,6 +3739,33 @@
     }
 }
 
+//Launch cert viewer if key has certs
+
+function launchCertViewerIfCerts()
+{
+  var row = null;
+
+  if(gCurrentSelectedRow)
+     row = gCurrentSelectedRow;
+
+  if(!row)
+      return;
+
+  var theID = row.getAttribute("id");
+
+  if (!theID)
+    return;
+
+  var keyInfo = RowIDToKeyInfo(theID);
+
+  var status = GetStatusForKeyID(keyInfo[0],keyInfo[1]);
+
+  if(status == getBundleString("statusEnrolled"))
+  {
+      launchCertViewer();
+  }
+}
+
 //Launch page to view card's certificates
 function launchCertViewer()
 {
@@ -3473,7 +3781,6 @@
     if(!adminWnd)
     {
         var wind = window.open("chrome://esc/content/settings.xul","","chrome,resizable,centerscreen,dialog");
-
     } else
     {
         adminWnd.focus();
@@ -3746,7 +4053,7 @@
 
 function LogKeyInfo(aKeyType,aKeyID,aMessage)
 {
-    var issuer = GetCachedIssuer(aKeyID);
+    var issuer = GetCoolKeyIssuer(aKeyType,aKeyID);
     var status =  GetStatusForKeyID(aKeyType, aKeyID);
     var atr =     DoCoolKeyGetATR(aKeyType,aKeyID);
     var tpsURI = GetCachedTPSURL(aKeyID);
@@ -4096,3 +4403,84 @@
   if(consoleService)
       consoleService.logStringMessage("esc: " + message  + "\n");
 }
+
+function GetEnvironmentVar(aVar)
+{
+    if(!aVar)
+        return null;
+
+    var environ =     Components.classes["@mozilla.org/process/environment;1"]
+      .getService(Components.interfaces.nsIEnvironment);
+
+
+    var retVar = null;
+
+    if(environ)
+        retVar =   environ.get(aVar); 
+
+    //alert("var: " + aVar + " value: " + retVar);
+
+   return retVar;
+}
+
+function SetEnvironmentVar(aVar,aValue)
+{
+    if(!aVar || !aValue)
+        return ;
+
+    var environ =     Components.classes["@mozilla.org/process/environment;1"]
+      .getService(Components.interfaces.nsIEnvironment);
+
+    if(environ)
+        retVar =   environ.set(aVar,aValue);
+}
+
+function IsKeyLoginKey(keyType,keyID)
+{
+    var result = 0;
+
+    var token_name = DoCoolKeyGetTokenName(keyType,keyID);
+    var login_token_name = GetEnvironmentVar("PKCS11_LOGIN_TOKEN_NAME");
+
+    if(token_name == login_token_name)
+    {
+        result = 1;
+    }
+
+    return result;
+}
+
+function AdminToggleStatusProgress(aOn,keyType,keyID)
+{
+    if(!gAdminPage)
+        return;
+
+    var statusCell   = document.getElementById(KeyToCellID(keyType,keyID,"status"));
+
+    if(!statusCell)
+        return;
+
+    var progMeterID = KeyToProgressBarID(keyType, keyID);
+    if(!progMeterID)
+        return;
+
+    var meter = document.getElementById(progMeterID);
+
+    if(!meter)
+        return;
+
+    if(aOn)
+    {
+        HideItem(statusCell);
+        ShowItem(meter);
+    }
+    else
+    {
+        HideItem(meter);
+        ShowItem(statusCell);
+
+        var adminList = document.getElementById("AdminBindingList");
+        if(adminList)
+            adminList.focus();
+    }
+}
--- ./esc/src/app/xul/esc/chrome/content/esc/esc.xul.fix4	2007-04-25 10:47:51.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/esc.xul	2007-04-25 10:47:58.000000000 -0700
@@ -151,8 +151,8 @@
   </groupbox>
   <hbox id = "enrollment_button_box">
         <spacer flex = "4"/>
-        <button id="closebtn" label ="&closeNow;" oncommand="HideEnrollmentPage()"/>
-        <button id="enrollbtn" label = "&enrollKeyNow;" oncommand="DoShowFullEnrollmentUI();" hidden="true" disabled="false"/>
+        <button id="closebtn" label ="&closeNow;" oncommand="HideEnrollmentPage()" accesskey="&Close.accesskey;"/>
+        <button id="enrollbtn" label = "&enrollKeyNow;" oncommand="DoShowFullEnrollmentUI();" hidden="true" disabled="false" accesskey="&Enroll.accesskey;"/>
         <spacer class="horSpacerShort"/>
     </hbox>
 </vbox>
--- ./esc/src/app/xul/esc/chrome/content/esc/esc.css.fix4	2007-04-25 10:47:28.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/esc.css	2007-04-25 10:47:41.000000000 -0700
@@ -40,7 +40,7 @@
 
 #logoImage {
 
-    list-style-image: url(logo.gif);
+    list-style-image: url(esc.png);
 }
 
 #cylonImage {
--- ./esc/src/app/xul/esc/chrome/content/esc/settings.xul.fix4	2007-04-25 10:49:09.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/settings.xul	2007-04-25 10:49:20.000000000 -0700
@@ -72,14 +72,14 @@
                           <listcol flex="1"/>
                           <listcol flex="1"/>
                           <listcol flex="1"/>
-                          <listcol flex="1"/>
+                      <!--    <listcol flex="1"/>  -->
                       </listcols>
                       <listhead>
                           <listheader />
                           <listheader flex="3" class="headerText" label="&keyIssuer;"/>
                           <listheader flex="4" class="headerText" label="&keyIssuedTo;"/>
                           <listheader flex="3" class="headerText" label="&keyStatus;"/>
-                          <listheader flex="1" class="headerText" label="&keyProgress;"/>
+            <!--              <listheader flex="1" class="headerText" label="&keyProgress;"/> -->
                       </listhead>
                   </listbox>
              </groupbox>
@@ -132,31 +132,34 @@
                           <spacer class="verticalSpacer"/>
                       </description>
 
-                          <button class="buttonText" id="formatbtn" label="&doFormat;" oncommand="DoFormatCoolKey('userKey')" disabled="true" hidden = "false"/>
-
-                          <button class="buttonText" id="enrollbtn" label="&doEnroll;" oncommand="DoCollectPassword('enroll');" disabled="true" hidden="false"/>
+                          <button class="buttonText" id="formatbtn" label="&doFormat;" oncommand="DoFormatCoolKey('userKey')" disabled="true" hidden = "false" accesskey="&Format.accesskey;"/>
 
-                          <button class="buttonText"  id="resetpinbtn" label="&doResetPin;" oncommand="DoCollectPassword('resetpin');" disabled="true" hidden="false"/>
+                          <button class="buttonText" id="enrollbtn" label="&doEnroll;" oncommand="DoCollectPassword('enroll');" disabled="true" hidden="false" accesskey="&Enroll.accesskey;"/>
 
+                          <button class="buttonText"  id="resetpinbtn" label="&doResetPin;" oncommand="DoCollectPassword('resetpin');" disabled="true" hidden="false" accesskey="&ResetPin.accesskey;"/>
 
-<!--                          <button class="buttonText"  id="viewcertsbtn" label="&doViewCerts;" oncommand="launchCertViewer()" disabled="true" hidden="false"/>
-
-                          <button class="buttonText" id="advancedbtn" label="&advancedInfo;" disabled="true" hidden="false" oncommand="DoShowAdvancedInfo();"/>
--->
                   </vbox> 
              </groupbox>
          </hbox>
         <hbox id = "enrollment_button_box" >
-            <button class="buttonText"  id="viewcertsbtn" label="&doViewCerts;" oncommand="launchCertViewer()" disabled="true" hidden="false"/>
-                          <button class="buttonText" id="advancedbtn" label="&advancedInfo;" disabled="true" hidden="false" oncommand="DoShowAdvancedInfo();"/>
+            <button class="buttonText"  id="viewcertsbtn" label="&doViewCerts;" oncommand="launchCertViewer()" disabled="true" hidden="false" accesskey="&ViewCerts.accesskey;"/>
+                          <button class="buttonText" id="advancedbtn" label="&advancedInfo;" disabled="true" hidden="false" oncommand="DoShowAdvancedInfo();" accesskey="&Diagnostics.accesskey;"/>
 
             <spacer flex = "1"/>
 
             <checkbox id="enrolled_key_browser" label="&dontLaunchBrowser;" checked="false" oncommand="DoHandleEnrolledBrowserLaunch(); " hidden="true" disabled="false" />  
             <spacer flex = "1"/>
-            <button class="buttonText" id="closebtn" label ="&closeAdminLater;" oncommand="HideAdminPage();"/>
+            <button class="buttonText" id="closebtn" label ="&closeAdminLater;" oncommand="HideAdminPage();" accesskey="&Close.accesskey;"/>
             <spacer class="horSpacerShort"/>
 
          </hbox>
   <!-- </groupbox> -->
+
+   <popupset>
+  <menupopup id="adminkeymenu">
+    <menuitem label="&doFormat;" id="menu-format" oncommand="DoFormatCoolKey('userKey');"/>
+    <menuitem label="&doEnroll;" id="menu-enroll" oncommand="DoCollectPassword('enroll');"/>
+    <menuitem label="&doResetPin;" id="menu-resetpassword" oncommand="DoCollectPassword('resetpin');"/>
+  </menupopup>
+</popupset>
 </window>
--- ./esc/src/app/xul/esc/chrome/content/esc/config.xul.fix4	2007-04-25 10:47:10.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/config.xul	2007-04-25 10:47:20.000000000 -0700
@@ -67,14 +67,14 @@
         <row pack="center">
             <label class="titleText"  value="&tpsURIHeader;" /> 
              <textbox size="70" class="configTextBox" id="phonehomeuri"  value="" /> 
-             <button class="mediumButon" id="testtpsurl" label="&doTest;" oncommand="DoPhoneHomeTest();"/>
+             <button class="mediumButon" id="testtpsurl" label="&doTest;" oncommand="DoPhoneHomeTest();" accesskey="&Test.accesskey;"/>
         </row>
     </rows>
     </grid>
 
     <hbox flex="1">
          <spacer flex ="1"/>
-        <button label="&escOK;" oncommand="DoPhoneHomeConfigClose();" /> 
+        <button label="&escOK;" oncommand="DoPhoneHomeConfigClose();" accesskey="&OK.accesskey;" /> 
     </hbox>
     <spacer flex="1" style="min-height: 20px"  />
      </groupbox>
--- ./esc/src/app/xul/esc/chrome/content/esc/advancedinfo.xul.fix4	2007-04-25 10:46:51.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/advancedinfo.xul	2007-04-25 10:47:00.000000000 -0700
@@ -55,8 +55,8 @@
  </groupbox>
 <hbox >
 <spacer flex = "1"/>
-<button id="copytocp" label = "&copyToClipboard;" oncommand="DoCopyAdvancedInfoToClipBoard();"/> 
-<button id="closebtn" label="&closeNow;" oncommand="window.close();" />
+<button id="copytocp" label = "&copyToClipboard;" oncommand="DoCopyAdvancedInfoToClipBoard();" accesskey="&CopyClip.accesskey;"/> 
+<button id="closebtn" label="&closeNow;" oncommand="window.close();" accesskey="&Close.accesskey;" />
  </hbox> 
 
 
--- ./esc/src/app/xul/esc/chrome/locale/en-US/esc.dtd.fix4	2007-04-25 10:50:07.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/locale/en-US/esc.dtd	2007-04-25 10:50:19.000000000 -0700
@@ -86,3 +86,14 @@
 <!ENTITY tpsConfigDesc3 "Enter the location of the smart card server (such as https://smartcardserver.example.com:7888)">
 <!ENTITY diagnosticsMessage "The information below is diagnostic information that your system generates as you use your smart card. If you are having smart card problems, you may be asked by your support engineer to send this information for analysis.">
 <!ENTITY dontLaunchBrowser "Don't launch the default browser when enrolled card is inserted.">
+<!ENTITY Close.accesskey "C">
+<!ENTITY OK.accesskey "O">
+<!ENTITY Format.accesskey "F">
+<!ENTITY Enroll.accesskey "E">
+<!ENTITY ResetPin.accesskey "R">
+<!ENTITY Test.accesskey "T">
+<!ENTITY Diagnostics.accesskey "D">
+<!ENTITY Cancel.accesskey "C">
+<!ENTITY Submit.accesskey "S">
+<!ENTITY ViewCerts.accesskey "V">
+<!ENTITY CopyClip.accesskey "T">
--- ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties.fix4	2007-04-25 10:50:25.000000000 -0700
+++ ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties	2007-04-25 10:50:32.000000000 -0700
@@ -23,12 +23,13 @@
 noKeysPresent=No Cards Present
 blankKey=Blank
 uninitializedKey=Uninitialized
-statusEnrolled=ENROLLED
-statusUnavailable=UNAVAILABLE
-statusNoApplet=NO APPLET
-statusUninitialized=UNINITIALIZED
-statusUnknown=UNKNOWN
-statusBusy=BUSY
+statusEnrolled=Enrolled
+statusUnavailable=Unavailable
+statusNoApplet=Unformatted
+statusUninitialized=Formatted
+statusLoggedIn=Logged In
+statusUnknown=Unknown
+statusBusy=Busy
 unknownIssuer=Unknown
 redHatUser=User
 statusUnknown=Unknown
@@ -79,8 +80,8 @@
 keyRemovedComputer=smart card removed.
 diagnosticsMessage=The information below is diagnostic information that your system generates as you use your smart card. If you are having smart card problems, you may be asked by your support engineer to send this information for analysis.
 
-menuManageKeys=Manage Smart Cards
-menuExit=Exit Smart Card Manager 
+menuManageKeys=Manage Smart Cards...
+menuExit=Quit   
 #ESC Error Messages from TPS
 errorNone=Operation Completed Successfully.
 serverError=Smart Card Server error.
@@ -165,7 +166,7 @@
 errorValidUserPassword=You must provide a valid user password!
 errorSelectKey=Please select a smart card.
 errorEnrolledFirst=Smart card must be enrolled first! Enroll card and try again.
-enrollmentFor=Enrollment for
+enrollmentFor=Enrollment of your 
 errorNeedKeyForSecMode=Please insert enrolled smart card before attempting secure mode.
 wasSuccessful=was successful.
 pinResetSuccessful=Password Reset was successfull!
@@ -201,3 +202,5 @@
 mustHaveValue=Must have value set for field:
 noParentWindow=No parent window.
 authDialogNoParent=Auth dialog has no parent!
+authSubmit=Submit
+authSubmitAccessKey=S



From fedora-cvs-commits at redhat.com  Thu Apr 26 17:00:46 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 13:00:46 -0400
Subject: rpms/esc/devel esc,1.6,1.7
Message-ID: <200704261700.l3QH0kLT019118@cvs.devel.redhat.com>

Author: jmagne

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

Modified Files:
	esc 
Log Message:
New command line options.


Index: esc
===================================================================
RCS file: /cvs/dist/rpms/esc/devel/esc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- esc	4 Apr 2007 00:45:52 -0000	1.6
+++ esc	26 Apr 2007 17:00:41 -0000	1.7
@@ -17,10 +17,20 @@
 # All rights reserved.
 # END COPYRIGHT BLOCK
 
+
+
+
+DO_SECMODE="false"
+SECURITY_URL=
+DO_FORCEMODE="false"
+DO_SHOW_VERSION="false"
+ESC_ARGS=
+
+
 ESC_PROFILE_BASE=~/.redhat/esc
 ESC_LOG_FILE=esc.log
 
-ESC_PATH=$LIBDIR/esc-1.0.1
+ESC_PATH=/usr/lib/esc-1.0.1
 ESC_BIN_PATH=/usr/bin
 ESC_EXEC=esc
 ESCD_EXEC=escd
@@ -31,7 +41,7 @@
 LAST_PROG_PID=0
 SIGUSR1=10
 
-FORCE_START_ESC=$1
+FORCE_START_ESC=
 
 XPTI_DAT=xpti.dat
 COMPREG_DAT=compreg.dat
@@ -57,45 +67,119 @@
     fi
 }
 
+function processArgs {
+
+    for arg in $1 
+    do
+
+        #echo "theArg: $arg"
+        if [ $arg == "forceStartESC" ]
+        then
+            #echo "Do force mode!"
+            FORCE_START_ESC="true"
+        fi
+
+        if [ $arg == "keyInserted" ]
+        then
+            FORCE_START_ESC="true"
+        fi
+
+        if [ $arg == "-version" ]
+        then
+            #echo "Do show version!"
+            DO_SHOW_VERSION="true"
+        fi
+        if [ $DO_SECMODE == "true" ]
+        then
+            #echo "Sec Mode Url $arg"
+            SECURITY_URL=$arg
+        fi
+        if [ $arg == "-secmode" ]
+        then
+            DO_SECMODE="true"
+            #echo "Do security mode!"
+        fi
+    done
+
+    if [ $DO_SECMODE == "true" ]
+    then
+        #echo "Launch ESC in security mode!"
+        ARGS="--secmode $SECURITY_URL"
+    fi
+}
 
 export NSPR_LOG_MODULES=tray:2,coolKeyLib:2,coolKey:2,coolKeyNSS:2,coolKeySmart:2,coolKeyHandler:2,escDLog:5
 
+processArgs $*
 
 if [ ! -d $ESC_PROFILE_BASE ]
 then
-mkdir -p  $ESC_PROFILE_BASE
+    mkdir -p  $ESC_PROFILE_BASE
 fi
 export NSPR_LOG_FILE=$ESC_PROFILE_BASE/$ESC_LOG_FILE
 
 cd $ESC_PATH
 
-isProgRunning $ESC_BIN
+#First check if we just want the version
 
-if [  $LAST_PROG_PID  -gt 0 ]
-then
-./$ESC_EXEC
-exit 0
+if [ $DO_SHOW_VERSION == "true" ]
+    then
+    #echo "try to run the version command!"
+    ESC_ARGS="-version"
+    ./$ESC_EXEC $ESC_ARGS
+    exit 0
 fi
 
-if [ $FORCE_START_ESC ]
+# Start up the daemon if it is not running
+
+isProgRunning $ESCD_BIN
+
+if  [ $LAST_PROG_PID  -gt 0 ]
 then
-./$ESC_EXEC
-exit 0
+    false
+    #echo "escd already running."
+else
+    #echo "escd not running start."
+    removeFile $ESC_PROFILE_BASE/*default/$XPTI_DAT
+    removeFile $ESC_PROFILE_BASE/*default/$COMPREG_DAT
+    ./$ESCD_EXEC --key_Inserted=\"/usr/bin/esc\"  --on_Signal=\"/usr/bin/esc\"
+    exit 0
 fi
 
+# Now check to see if we wer signaled from the daemon
 
+if [ $FORCE_START_ESC ]
+then
+    #echo "force start esc."
 
-isProgRunning $ESCD_BIN
+    #Check to see if esc is already running
 
+    isProgRunning $ESC_BIN
+    if [  $LAST_PROG_PID  -gt 0 ]
+    then
+        #echo "attempting a force start but already running ... exit."
+        exit 0
+    fi
+    #echo "force start esc not running start esc..."
+    ./$ESC_EXEC
+    exit 0
+fi
 
-if  [ $LAST_PROG_PID  -gt 0 ]
+isProgRunning $ESC_BIN
+
+if [  $LAST_PROG_PID  -gt 0 ]
 then
-kill -$SIGUSR1 $LAST_PROG_PID
+    #echo "esc already running."
+    ./$ESC_EXEC  
+    exit 0
 else
-removeFile $ESC_PROFILE_BASE/*default/$XPTI_DAT
-removeFile $ESC_PROFILE_BASE/*default/$COMPREG_DAT
-./$ESCD_EXEC --key_Inserted=\"/usr/bin/esc\"  --on_Signal=\"/usr/bin/esc\"
-
+    #echo "esc not already running start up and bring up window."
+    ./$ESC_EXEC & 
+    sleep 2
+
+    #echo "done sleeping bring up esc window."
+    ./$ESC_EXEC
+    exit 0
 fi
 
 exit 0



From fedora-cvs-commits at redhat.com  Thu Apr 26 17:12:25 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 13:12:25 -0400
Subject: rpms/selinux-policy/devel policy-20070219.patch,1.61,1.62
Message-ID: <200704261712.l3QHCPCW027410@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20070219.patch 
Log Message:
* Wed Apr 25 2007 Dan Walsh <dwalsh at redhat.com> 2.6.1-2
- Fixes for unix_update
- Fix logwatch to be able to search all dirs


policy-20070219.patch:
 Rules.modular                           |   12 +
 VERSION                                 |    2 
 policy/flask/access_vectors             |    4 
 policy/global_booleans                  |    2 
 policy/global_tunables                  |   15 -
 policy/mls                              |   31 ++-
 policy/modules/admin/acct.te            |    1 
 policy/modules/admin/alsa.fc            |    1 
 policy/modules/admin/amtu.fc            |    3 
 policy/modules/admin/amtu.if            |   53 +++++
 policy/modules/admin/amtu.te            |   56 ++++++
 policy/modules/admin/bootloader.te      |    3 
 policy/modules/admin/consoletype.te     |   10 -
 policy/modules/admin/dmesg.te           |    1 
 policy/modules/admin/kudzu.te           |    6 
 policy/modules/admin/logrotate.te       |    1 
 policy/modules/admin/logwatch.te        |    6 
 policy/modules/admin/netutils.te        |    6 
 policy/modules/admin/readahead.te       |    6 
 policy/modules/admin/rpm.fc             |    3 
 policy/modules/admin/rpm.if             |   85 +++++++--
 policy/modules/admin/rpm.te             |    2 
 policy/modules/admin/su.if              |    6 
 policy/modules/admin/sudo.if            |    1 
 policy/modules/admin/usermanage.if      |    2 
 policy/modules/admin/usermanage.te      |   27 +++
 policy/modules/apps/gnome.if            |   26 ++
 policy/modules/apps/gpg.fc              |    2 
 policy/modules/apps/loadkeys.if         |   44 +---
 policy/modules/apps/mozilla.if          |    1 
 policy/modules/apps/slocate.te          |    5 
 policy/modules/apps/uml.if              |   27 ---
 policy/modules/kernel/corecommands.fc   |    5 
 policy/modules/kernel/corecommands.if   |   20 ++
 policy/modules/kernel/corenetwork.te.in |   15 +
 policy/modules/kernel/devices.if        |   36 ++++
 policy/modules/kernel/domain.if         |   18 ++
 policy/modules/kernel/domain.te         |   46 +++++
 policy/modules/kernel/files.fc          |    1 
 policy/modules/kernel/files.if          |   83 ++++++++-
 policy/modules/kernel/filesystem.if     |   39 ++++
 policy/modules/kernel/filesystem.te     |   19 ++
 policy/modules/kernel/kernel.if         |   42 ++++
 policy/modules/kernel/kernel.te         |    2 
 policy/modules/kernel/mls.if            |   20 ++
 policy/modules/kernel/mls.te            |    3 
 policy/modules/kernel/selinux.if        |   38 ++++
 policy/modules/kernel/storage.if        |    2 
 policy/modules/kernel/terminal.if       |   21 ++
 policy/modules/kernel/terminal.te       |    1 
 policy/modules/services/aide.fc         |    1 
 policy/modules/services/aide.te         |    2 
 policy/modules/services/amavis.if       |   19 ++
 policy/modules/services/amavis.te       |    3 
 policy/modules/services/apache.fc       |   14 -
 policy/modules/services/apache.if       |  171 ++++++++++++++++++-
 policy/modules/services/apache.te       |   79 ++++++++
 policy/modules/services/apcupsd.fc      |    9 +
 policy/modules/services/apcupsd.if      |  108 ++++++++++++
 policy/modules/services/apcupsd.te      |   92 ++++++++++
 policy/modules/services/automount.te    |    2 
 policy/modules/services/avahi.if        |   19 ++
 policy/modules/services/avahi.te        |    4 
 policy/modules/services/bind.te         |    1 
 policy/modules/services/bluetooth.te    |    2 
 policy/modules/services/clamav.te       |    1 
 policy/modules/services/clockspeed.if   |    2 
 policy/modules/services/consolekit.te   |   33 ++-
 policy/modules/services/cron.fc         |    1 
 policy/modules/services/cron.if         |   33 +--
 policy/modules/services/cron.te         |   46 ++++-
 policy/modules/services/cups.te         |    6 
 policy/modules/services/cvs.te          |    1 
 policy/modules/services/cyrus.te        |    1 
 policy/modules/services/dbus.if         |   63 +++++++
 policy/modules/services/dhcp.te         |    2 
 policy/modules/services/djbdns.te       |    5 
 policy/modules/services/dovecot.fc      |    2 
 policy/modules/services/dovecot.if      |   40 ++++
 policy/modules/services/dovecot.te      |   50 +++++
 policy/modules/services/ftp.te          |    5 
 policy/modules/services/hal.fc          |    8 
 policy/modules/services/hal.if          |   77 ++++++++
 policy/modules/services/hal.te          |  147 ++++++++++++++++
 policy/modules/services/inetd.te        |    5 
 policy/modules/services/kerberos.if     |   79 ++------
 policy/modules/services/kerberos.te     |   34 +++
 policy/modules/services/mailman.if      |   19 ++
 policy/modules/services/mta.if          |   19 ++
 policy/modules/services/mta.te          |    2 
 policy/modules/services/nis.if          |    4 
 policy/modules/services/nis.te          |    4 
 policy/modules/services/nscd.te         |   10 +
 policy/modules/services/ntp.te          |    4 
 policy/modules/services/pegasus.if      |   18 ++
 policy/modules/services/pegasus.te      |    6 
 policy/modules/services/postfix.if      |   20 ++
 policy/modules/services/postfix.te      |   27 ++-
 policy/modules/services/ppp.te          |    2 
 policy/modules/services/procmail.te     |    1 
 policy/modules/services/pyzor.te        |    7 
 policy/modules/services/radius.te       |    4 
 policy/modules/services/rlogin.te       |    1 
 policy/modules/services/rpc.if          |    5 
 policy/modules/services/rpc.te          |    1 
 policy/modules/services/rpcbind.fc      |    6 
 policy/modules/services/rpcbind.if      |  104 +++++++++++
 policy/modules/services/rpcbind.te      |   83 +++++++++
 policy/modules/services/rsync.te        |    1 
 policy/modules/services/rwho.fc         |    3 
 policy/modules/services/rwho.if         |   84 +++++++++
 policy/modules/services/rwho.te         |   61 ++++++
 policy/modules/services/samba.fc        |    3 
 policy/modules/services/samba.if        |   86 +++++++++
 policy/modules/services/samba.te        |   87 +++++++++
 policy/modules/services/sasl.te         |    1 
 policy/modules/services/sendmail.if     |   22 ++
 policy/modules/services/smartmon.te     |    1 
 policy/modules/services/snmp.te         |   15 +
 policy/modules/services/spamassassin.te |   11 -
 policy/modules/services/squid.fc        |    2 
 policy/modules/services/squid.if        |   22 ++
 policy/modules/services/squid.te        |   12 +
 policy/modules/services/ssh.if          |   39 ++++
 policy/modules/services/ssh.te          |    9 -
 policy/modules/services/w3c.fc          |    2 
 policy/modules/services/w3c.if          |    1 
 policy/modules/services/w3c.te          |   14 +
 policy/modules/system/application.fc    |    1 
 policy/modules/system/application.if    |  104 +++++++++++
 policy/modules/system/application.te    |   14 +
 policy/modules/system/authlogin.fc      |    1 
 policy/modules/system/authlogin.if      |  141 ++++++++++++++-
 policy/modules/system/authlogin.te      |   36 ++++
 policy/modules/system/fstools.fc        |    1 
 policy/modules/system/fstools.te        |    1 
 policy/modules/system/fusermount.fc     |    6 
 policy/modules/system/fusermount.if     |   41 ++++
 policy/modules/system/fusermount.te     |   50 +++++
 policy/modules/system/getty.te          |    3 
 policy/modules/system/hostname.te       |   14 +
 policy/modules/system/init.if           |   42 ++++
 policy/modules/system/init.te           |   35 +++
 policy/modules/system/ipsec.if          |   20 ++
 policy/modules/system/ipsec.te          |    3 
 policy/modules/system/iptables.te       |    5 
 policy/modules/system/libraries.fc      |    5 
 policy/modules/system/libraries.te      |    4 
 policy/modules/system/locallogin.te     |   12 +
 policy/modules/system/logging.if        |   21 ++
 policy/modules/system/logging.te        |    2 
 policy/modules/system/lvm.fc            |    1 
 policy/modules/system/lvm.te            |    8 
 policy/modules/system/modutils.te       |    7 
 policy/modules/system/mount.fc          |    3 
 policy/modules/system/mount.if          |   37 ++++
 policy/modules/system/mount.te          |   70 +++++++
 policy/modules/system/raid.te           |    1 
 policy/modules/system/selinuxutil.fc    |    1 
 policy/modules/system/selinuxutil.if    |    6 
 policy/modules/system/selinuxutil.te    |   70 ++++---
 policy/modules/system/sysnetwork.te     |    3 
 policy/modules/system/udev.te           |   12 +
 policy/modules/system/unconfined.fc     |    1 
 policy/modules/system/unconfined.if     |   10 -
 policy/modules/system/unconfined.te     |   24 ++
 policy/modules/system/userdomain.if     |  284 +++++++++++++++++++-------------
 policy/modules/system/userdomain.te     |   81 +++++----
 policy/modules/system/xen.te            |   35 +++
 policy/support/obj_perm_sets.spt        |   12 +
 170 files changed, 3610 insertions(+), 469 deletions(-)

Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- policy-20070219.patch	26 Apr 2007 00:26:55 -0000	1.61
+++ policy-20070219.patch	26 Apr 2007 17:12:23 -0000	1.62
@@ -1178,7 +1178,7 @@
  /etc/nologin.*		--	gen_context(system_u:object_r:etc_runtime_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.6.1/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2007-02-26 14:17:21.000000000 -0500
-+++ serefpolicy-2.6.1/policy/modules/kernel/files.if	2007-04-25 11:55:28.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/kernel/files.if	2007-04-26 09:55:39.000000000 -0400
 @@ -343,8 +343,7 @@
  
  ########################################
@@ -2991,10 +2991,86 @@
 +	ucspitcp_service_domain(djbdns_axfrdns_t, djbdns_axfrdns_exec_t)
 +')
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-2.6.1/policy/modules/services/dovecot.fc
+--- nsaserefpolicy/policy/modules/services/dovecot.fc	2006-11-16 17:15:21.000000000 -0500
++++ serefpolicy-2.6.1/policy/modules/services/dovecot.fc	2007-04-26 10:45:06.000000000 -0400
+@@ -17,10 +17,12 @@
+ 
+ ifdef(`distro_debian', `
+ /usr/lib/dovecot/dovecot-auth 	--	gen_context(system_u:object_r:dovecot_auth_exec_t,s0)
++/usr/lib/dovecot/deliver --	gen_context(system_u:object_r:dovecot_deliver_exec_t,s0)
+ ')
+ 
+ ifdef(`distro_redhat', `
+ /usr/libexec/dovecot/dovecot-auth --	gen_context(system_u:object_r:dovecot_auth_exec_t,s0)
++/usr/libexec/dovecot/deliver --	gen_context(system_u:object_r:dovecot_deliver_exec_t,s0)
+ ')
+ 
+ #
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.if serefpolicy-2.6.1/policy/modules/services/dovecot.if
+--- nsaserefpolicy/policy/modules/services/dovecot.if	2007-01-02 12:57:43.000000000 -0500
++++ serefpolicy-2.6.1/policy/modules/services/dovecot.if	2007-04-26 10:46:22.000000000 -0400
+@@ -18,3 +18,43 @@
+ 	manage_files_pattern($1,dovecot_spool_t,dovecot_spool_t)
+ 	manage_lnk_files_pattern($1,dovecot_spool_t,dovecot_spool_t)
+ ')
++
++########################################
++## <summary>
++##	Connect to dovecot auth unix domain stream socket.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <rolecap/>
++#
++interface(`dovecot_auth_stream_connect',`
++	gen_require(`
++		type dovecot_t, dovecot_var_run_t;
++	')
++
++	allow $1 dovecot_var_run_t:dir search;
++	allow $1 dovecot_var_run_t:sock_file write;
++	allow $1 dovecot_auth_t:unix_stream_socket connectto;
++')
++
++########################################
++## <summary>
++##	Execute dovecot_deliver in the dovecot_deliver domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dovecot_domtrans_deliver',`
++	gen_require(`
++		type dovecot_deliver_t, dovecot_deliver_exec_t;
++	')
++
++	domtrans_pattern($1,dovecot_deliver_exec_t,dovecot_deliver_t)
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.6.1/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2007-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/services/dovecot.te	2007-04-23 13:12:09.000000000 -0400
-@@ -46,6 +46,7 @@
++++ serefpolicy-2.6.1/policy/modules/services/dovecot.te	2007-04-26 10:50:47.000000000 -0400
+@@ -15,6 +15,12 @@
+ domain_entry_file(dovecot_auth_t,dovecot_auth_exec_t)
+ role system_r types dovecot_auth_t;
+ 
++type dovecot_deliver_t;
++type dovecot_deliver_exec_t;
++domain_type(dovecot_deliver_t)
++domain_entry_file(dovecot_deliver_t,dovecot_deliver_exec_t)
++role system_r types dovecot_deliver_t;
++
+ type dovecot_cert_t;
+ files_type(dovecot_cert_t)
+ 
+@@ -46,6 +52,7 @@
  allow dovecot_t self:tcp_socket create_stream_socket_perms;
  allow dovecot_t self:unix_dgram_socket create_socket_perms;
  allow dovecot_t self:unix_stream_socket { create_stream_socket_perms connectto };
@@ -3002,7 +3078,15 @@
  
  domtrans_pattern(dovecot_t, dovecot_auth_exec_t, dovecot_auth_t)
  
-@@ -140,6 +141,10 @@
+@@ -110,7 +117,6 @@
+ miscfiles_read_localization(dovecot_t)
+ 
+ sysnet_read_config(dovecot_t)
+-sysnet_use_ldap(dovecot_auth_t)
+ 
+ userdom_dontaudit_use_unpriv_user_fds(dovecot_t)
+ userdom_dontaudit_search_sysadm_home_dirs(dovecot_t)
+@@ -140,24 +146,29 @@
  	udev_read_db(dovecot_t)
  ')
  
@@ -3013,6 +3097,78 @@
  ########################################
  #
  # dovecot auth local policy
+ #
+ 
+-allow dovecot_auth_t self:capability { setgid setuid };
++allow dovecot_auth_t self:capability { chown dac_override setgid setuid };
+ allow dovecot_auth_t self:process signal_perms;
+ allow dovecot_auth_t self:fifo_file rw_fifo_file_perms;
+ allow dovecot_auth_t self:unix_dgram_socket create_socket_perms;
+ allow dovecot_auth_t self:unix_stream_socket create_stream_socket_perms;
+ 
+-allow dovecot_auth_t dovecot_t:unix_stream_socket { getattr accept read write ioctl };
++allow dovecot_auth_t dovecot_t:unix_stream_socket { getattr accept read write ioctl connectto };
+ 
+ allow dovecot_auth_t dovecot_passwd_t:file { getattr read };
+ 
+ # Allow dovecot to create and read SSL parameters file
+ manage_files_pattern(dovecot_t,dovecot_var_lib_t,dovecot_var_lib_t)
+ files_search_var_lib(dovecot_t)
++files_read_var_symlinks(dovecot_t)
+ 
+ allow dovecot_auth_t dovecot_var_run_t:dir r_dir_perms;
+ 
+@@ -172,6 +183,7 @@
+ files_read_etc_files(dovecot_auth_t)
+ files_read_etc_runtime_files(dovecot_auth_t)
+ files_search_pids(dovecot_auth_t)
++files_read_usr_files(dovecot_auth_t)
+ files_read_usr_symlinks(dovecot_auth_t)
+ files_search_tmp(dovecot_auth_t)
+ files_read_var_lib_files(dovecot_t)
+@@ -186,6 +198,7 @@
+ seutil_dontaudit_search_config(dovecot_auth_t)
+ 
+ sysnet_dns_name_resolve(dovecot_auth_t)
++sysnet_use_ldap(dovecot_auth_t)
+ 
+ optional_policy(`
+ 	kerberos_use(dovecot_auth_t)
+@@ -194,3 +207,34 @@
+ optional_policy(`
+ 	logging_send_syslog_msg(dovecot_auth_t)
+ ')
++
++optional_policy(`
++	mysql_stream_connect(dovecot_auth_t)
++')
++
++optional_policy(`
++	postfix_search_spool(dovecot_auth_t)
++')
++
++
++########################################
++#
++# dovecot deliver local policy
++#
++allow dovecot_t dovecot_etc_t:file read_file_perms;
++allow dovecot_deliver_t dovecot_var_run_t:dir r_dir_perms;
++
++kernel_read_all_sysctls(dovecot_deliver_t)
++kernel_read_system_state(dovecot_deliver_t)
++
++dovecot_auth_stream_connect(dovecot_deliver_t)
++
++files_read_etc_files(dovecot_deliver_t)
++files_read_etc_runtime_files(dovecot_deliver_t)
++
++libs_use_ld_so(dovecot_deliver_t)
++libs_use_shared_libs(dovecot_deliver_t)
++
++miscfiles_read_localization(dovecot_deliver_t)
++
++mta_manage_spool(dovecot_deliver_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.6.1/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2007-04-23 09:36:01.000000000 -0400
 +++ serefpolicy-2.6.1/policy/modules/services/ftp.te	2007-04-23 13:12:09.000000000 -0400
@@ -3775,7 +3931,7 @@
  userdom_dontaudit_search_sysadm_home_dirs(pegasus_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-2.6.1/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2007-03-26 10:39:04.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/services/postfix.if	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/services/postfix.if	2007-04-26 10:22:59.000000000 -0400
 @@ -122,6 +122,7 @@
  	allow postfix_$1_t postfix_master_t:unix_stream_socket { connectto rw_stream_socket_perms };
  	allow postfix_$1_t self:tcp_socket create_socket_perms;
@@ -3784,9 +3940,32 @@
  
  	domtrans_pattern(postfix_master_t, postfix_$1_exec_t, postfix_$1_t)
  
+@@ -455,3 +456,22 @@
+ 
+ 	typeattribute $1 postfix_user_domtrans;
+ ')
++
++########################################
++## <summary>
++##	Create a named socket in a postfix private directory.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`postfix_create_pivate_sockets',`
++	gen_require(`
++		type postfix_private_t;
++	')
++
++	allow $1 postfix_private_t:dir list_dir_perms;
++	create_sock_files_pattern($1,postfix_private_t,postfix_private_t)
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.6.1/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2007-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/services/postfix.te	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/services/postfix.te	2007-04-26 10:46:37.000000000 -0400
 @@ -169,6 +169,8 @@
  mta_rw_aliases(postfix_master_t)
  mta_read_sendmail_bin(postfix_master_t)
@@ -3796,7 +3975,70 @@
  ifdef(`targeted_policy',`
  	term_dontaudit_use_unallocated_ttys(postfix_master_t)
  	term_dontaudit_use_generic_ptys(postfix_master_t)
-@@ -519,8 +521,6 @@
+@@ -184,6 +186,10 @@
+ ')
+ 
+ optional_policy(`
++	mysql_stream_connect(postfix_master_t)
++')
++
++optional_policy(`
+ 	nis_use_ypbind(postfix_master_t)
+ ')
+ 
+@@ -210,6 +216,7 @@
+ 
+ allow postfix_bounce_t self:capability dac_read_search;
+ allow postfix_bounce_t self:tcp_socket create_socket_perms;
++allow postfix_bounce_t postfix_master_t:file read;
+ 
+ allow postfix_bounce_t postfix_public_t:sock_file write;
+ allow postfix_bounce_t postfix_public_t:dir search;
+@@ -228,6 +235,7 @@
+ #
+ 
+ allow postfix_cleanup_t self:process setrlimit;
++allow postfix_cleanup_t postfix_master_t:file read;
+ 
+ # connect to master process
+ stream_connect_pattern(postfix_cleanup_t,postfix_private_t,postfix_private_t,postfix_master_t)
+@@ -250,6 +258,7 @@
+ 
+ allow postfix_local_t self:fifo_file rw_fifo_file_perms;
+ allow postfix_local_t self:process { setsched setrlimit };
++allow postfix_local_t postfix_master_t:file read;
+ 
+ manage_dirs_pattern(postfix_local_t,postfix_local_tmp_t,postfix_local_tmp_t)
+ manage_files_pattern(postfix_local_t,postfix_local_tmp_t,postfix_local_tmp_t)
+@@ -369,6 +378,7 @@
+ #
+ 
+ allow postfix_pickup_t self:tcp_socket create_socket_perms;
++allow postfix_pickup_t postfix_master_t:file read;
+ 
+ stream_connect_pattern(postfix_pickup_t,postfix_private_t,postfix_private_t,postfix_master_t)
+ 
+@@ -386,7 +396,7 @@
+ # Postfix pipe local policy
+ #
+ 
+-allow postfix_pipe_t self:fifo_file { read write };
++allow postfix_pipe_t self:fifo_file rw_fifo_file_perms;
+ 
+ write_sock_files_pattern(postfix_pipe_t,postfix_private_t,postfix_private_t)
+ 
+@@ -395,6 +405,10 @@
+ rw_files_pattern(postfix_pipe_t,postfix_spool_t,postfix_spool_t)
+ 
+ optional_policy(`
++	dovecot_domtrans_deliver(postfix_pipe_t)
++')
++
++optional_policy(`
+ 	procmail_domtrans(postfix_pipe_t)
+ ')
+ 
+@@ -519,8 +533,6 @@
  # Postfix smtp delivery local policy
  #
  
@@ -3805,7 +4047,7 @@
  # connect to master process
  stream_connect_pattern(postfix_smtp_t,{ postfix_private_t postfix_public_t },{ postfix_private_t postfix_public_t },postfix_master_t)
  
-@@ -552,6 +552,10 @@
+@@ -552,9 +564,18 @@
  mta_read_aliases(postfix_smtpd_t)
  
  optional_policy(`
@@ -3816,6 +4058,14 @@
  	postgrey_stream_connect(postfix_smtpd_t)
  ')
  
+ optional_policy(`
+ 	sasl_connect(postfix_smtpd_t)
+ ')
++
++optional_policy(`
++	dovecot_auth_stream_connect(postfix_smtpd_t)
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-2.6.1/policy/modules/services/ppp.te
 --- nsaserefpolicy/policy/modules/services/ppp.te	2007-04-23 09:36:01.000000000 -0400
 +++ serefpolicy-2.6.1/policy/modules/services/ppp.te	2007-04-23 13:12:09.000000000 -0400



From fedora-cvs-commits at redhat.com  Thu Apr 26 17:30:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 13:30:53 -0400
Subject: rpms/evolution-connector/devel
	evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch, NONE,
	1.1 evolution-exchange-2.10.1-fix-64bit-configure.patch, NONE,
	1.1 evolution-connector.spec, 1.98,
	1.99 ximian-connector-2.1.4-64bit-fix-acinclude.m4.patch, 1.1, NONE
Message-ID: <200704261730.l3QHUrcv009499@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-connector.spec 
Added Files:
	evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch 
	evolution-exchange-2.10.1-fix-64bit-configure.patch 
Removed Files:
	ximian-connector-2.1.4-64bit-fix-acinclude.m4.patch 
Log Message:

* Thu Apr 26 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-3.fc7
- Patch configure to pick up 64-bit changes to acinclude.m4.


evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch:
 acinclude.m4 |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

--- NEW FILE evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch ---
diff -up ximian-connector-2.0.2-pristine/acinclude.m4 ximian-connector-2.0.2-64bit_fix/acinclude.m4
--- ximian-connector-2.0.2-pristine/acinclude.m4	2004-10-12 19:00:06.225752438 -0400
+++ ximian-connector-2.0.2-64bit_fix/acinclude.m4	2004-10-12 19:01:50.635944683 -0400
@@ -34,6 +34,18 @@ AC_DEFUN([EVO_LDAP_CHECK], [
 	AC_ARG_WITH(openldap,     [  --with-openldap=[no/yes/PREFIX]      Enable LDAP support in evolution])
 	AC_ARG_WITH(static-ldap,  [  --with-static-ldap=[no/yes]          Link LDAP support statically into evolution ])
 	AC_CACHE_CHECK([for OpenLDAP], ac_cv_with_openldap, ac_cv_with_openldap="${with_openldap:=$default}")
+
+	AC_MSG_CHECKING(for multilib subdirectory)
+	if test "$GCC" = "yes" ; then
+		multilibsubdir=`$CC -print-multi-os-directory 2> /dev/null`
+	fi
+	multilibsubdir=${multilibsubdir:-.}
+	AC_MSG_RESULT($multilibsubdir)
+	AC_MSG_CHECKING(for lib subdirectory)
+	libsubdir=`echo lib/${multilibsubdir} | sed -re 's,lib/../([[^/]]*),\1,g'`
+	libsubdir=${libsubdir:-lib}
+	AC_MSG_RESULT($libsubdir)
+
 	case $ac_cv_with_openldap in
 	no|"")
 		with_openldap=no
@@ -44,7 +56,7 @@ AC_DEFUN([EVO_LDAP_CHECK], [
 	*)
 		with_openldap=$ac_cv_with_openldap
 		LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
-		LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib"
+		LDAP_LDFLAGS="-L$ac_cv_with_openldap/$libsubdir"
 		;;
 	esac
 
@@ -80,20 +92,20 @@ AC_DEFUN([EVO_LDAP_CHECK], [
 		AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
 		AC_CHECK_LIB(lber, ber_get_tag, [
 			if test "$with_static_ldap" = "yes"; then
-				LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
+				LDAP_LIBS="$with_openldap/$libsubdir/liblber.a $LDAP_LIBS"
 
 				# libldap might depend on OpenSSL... We need to pull
 				# in the dependency libs explicitly here since we're
 				# not using libtool for the configure test.
-				if test -f $with_openldap/lib/libldap.la; then
-					LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
+				if test -f $with_openldap/$libsubdir/libldap.la; then
+					LDAP_LIBS="`. $with_openldap/$libsubdir/libldap.la; echo $dependency_libs` $LDAP_LIBS"
 				fi
 			else
 				LDAP_LIBS="-llber $LDAP_LIBS"
 			fi
 			AC_CHECK_LIB(ldap, ldap_open, [
 					if test $with_static_ldap = "yes"; then
-						LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS"
+						LDAP_LIBS="$with_openldap/$libsubdir/libldap.a $LDAP_LIBS"
 					else
 						LDAP_LIBS="-lldap $LDAP_LIBS"
 					fi],

evolution-exchange-2.10.1-fix-64bit-configure.patch:
 0 files changed

--- NEW FILE evolution-exchange-2.10.1-fix-64bit-configure.patch ---


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- evolution-connector.spec	26 Apr 2007 14:17:23 -0000	1.98
+++ evolution-connector.spec	26 Apr 2007 17:30:50 -0000	1.99
@@ -24,7 +24,7 @@
 
 Name: evolution-connector
 Version: 2.10.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -34,15 +34,17 @@
 
 ### Patches ###
 
-Patch11: ximian-connector-2.1.4-64bit-fix-acinclude.m4.patch
-Patch12: evolution-exchange-2.5.3-fix-marshaller.patch
+Patch11: evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch
+Patch12: evolution-exchange-2.10.1-fix-64bit-configure.patch
+
+Patch13: evolution-exchange-2.5.3-fix-marshaller.patch
 
 # Remove gnome-common macros from configure.in.
 # We do not ship gnome-common (or at least we're not supposed to).
-Patch13: evolution-exchange-2.7.2-no_gnome_common.patch
+Patch14: evolution-exchange-2.7.2-no_gnome_common.patch
 
 # GNOME bug #405916
-Patch14: evolution-exchange-2.9.6-fix-compiler-warnings.patch
+Patch15: evolution-exchange-2.9.6-fix-compiler-warnings.patch
 
 ### Dependencies ###
 
@@ -76,10 +78,11 @@
 %prep
 %setup -q -n evolution-exchange-%{version}
 
-%patch11 -p1 -b .64bit-fix-acinclude.m4
-%patch12 -p1 -b .fix-marshaller
-%patch13 -p1 -b .no_gnome_common
-%patch14 -p1 -b .fix-compiler-warnings
+%patch11 -p1 -b .fix-64bit-acinclude.m4
+%patch12 -p1 -b .fix-64bit-configure
+%patch13 -p1 -b .fix-marshaller
+%patch14 -p1 -b .no_gnome_common
+%patch15 -p1 -b .fix-compiler-warnings
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED"
@@ -149,6 +152,9 @@
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Thu Apr 26 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-3.fc7
+- Patch configure to pick up 64-bit changes to acinclude.m4.
+
 * Thu Apr 26 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-2.fc7
 - Fix a misnamed macro (RH bug #237807).
 


--- ximian-connector-2.1.4-64bit-fix-acinclude.m4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 26 17:52:42 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 13:52:42 -0400
Subject: rpms/dhcdbd/devel dhcdbd-2.7-initscript.patch, NONE, 1.1 dhcdbd.spec,
	1.42, 1.43
Message-ID: <200704261752.l3QHqgq9010435@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcdbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10417

Modified Files:
	dhcdbd.spec 
Added Files:
	dhcdbd-2.7-initscript.patch 
Log Message:
* Thu Apr 26 2007 David Cantrell <dcantrell at redhat.com> - 2.7-2
- Init script fixes (#237977)


dhcdbd-2.7-initscript.patch:
 dhcdbd.init |  144 +++++++++++++++++++++++++++---------------------------------
 1 files changed, 67 insertions(+), 77 deletions(-)

--- NEW FILE dhcdbd-2.7-initscript.patch ---
--- dhcdbd-2.7/dhcdbd.init.init	2007-02-02 11:20:43.000000000 -0500
+++ dhcdbd-2.7/dhcdbd.init	2007-04-26 13:46:29.000000000 -0400
@@ -1,32 +1,24 @@
 #!/bin/bash
 #
-#  dhcdbd  :  DHcp Client D-Bus Daemon
-#
-#  chkconfig: 2345 97 02
-#  description: dhcdbd provides D-BUS control of the ISC DHCP client, \
-#               dhclient, and D-BUS access to the DHCP options obtained by \
-#               dhclient for each IPv4 interface .
-#  processname: dhcdbd
-#
-#  dhcdbd shuts down automatically when the messagebus is shut down .
-#
-. /etc/rc.d/init.d/functions
-[ -e /etc/sysconfig/network ] && . /etc/sysconfig/network
-[ "${NETWORKING}" = "no" ] && exit 0
-prog=dhcdbd
+# chkconfig: 2345 97 02
+# description: dhcdbd provides D-BUS control of the ISC DHCP client, \
+#              dhclient, and D-BUS access to the DHCP options obtained by \
+#              dhclient for each IPv4 interface.  dhcdbd shuts down \
+#              automatically when the messagebus is shut down.
+# processname: dhcdbd
 
-start() {
-    echo -n $"Starting $prog:"
-    daemon /sbin/dhcdbd --system 
-    RETVAL=$?
-    echo
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dhcdbd
-    return $RETVAL;
-}
+# Source function library.
+. /etc/init.d/functions
 
-stop () {
-    echo -n $"Stopping $prog:"
-    if [ -e /var/lock/subsys/dhcdbd ] && [ -e /var/run/dbus/system_bus_socket ]; then
+RETVAL=0
+
+prog=dhcdbd
+dhcdbd=/sbin/dhcdbd
+lockfile=/var/lock/subsys/dhcdbd
+busfile=/var/run/dbus/system_bus_socket
+
+killdhcdbd() {
+    if [ -e $lockfile ] && [ -e $busfile ]; then
         /bin/dbus-send --system \
                         --dest=com.redhat.dhcp \
                         --type=method_call \
@@ -34,74 +26,72 @@
                         --reply-timeout=20000 \
                         /com/redhat/dhcp \
                         com.redhat.dhcp.quit >/dev/null 2>&1
-        RETVAL=$?
-    else 
-        killproc dhcdbd -TERM
-        RETVAL=$?
-    fi;
-    rm -f /var/lock/subsys/dhcdbd
-    if [ $RETVAL -eq 0 ]; then
-        success;
-        echo;
+        return $?
     else
-        failure;
-        echo;
-    fi;
+        killproc $prog -TERM
+        return $?
+    fi
 }
 
-status() {
-    [ ! -f /var/run/dhcdbd.pid ] && return 0
-    pid=`cat /var/run/dhcdbd.pid`;
+start() {
+    echo -n $"Starting $prog:"
+    daemon $dhcdbd --system
     RETVAL=$?
-    if [ "$RETVAL" -eq 0 ] && [ -n "$pid" ]; then
-        sender=`/bin/dbus-send --system \
-                               --dest=com.redhat.dhcp \
-                               --type=method_call \
-                               --print-reply \
-                               --reply-timeout=20000 \
-                               /com/redhat/dhcp \
-                               com.redhat.dhcp.ping |
-                grep 'sender=' | sed 's/^.*sender=//;s/\ .*$//'`;
+    echo
+    [ $RETVAL -eq 0 ] && touch $lockfile
+    return $RETVAL
+}
+
+stop () {
+    echo -n $"Stopping $prog:"
+    delay=3
+    count=10
+    i=1
+    maxcount=`expr $count + 1`
+    while [ $i != $maxcount ]; do
+        killdhcdbd
         RETVAL=$?
-        if [ "$RETVAL" -eq 0 ]; then
-            echo -n $"$prog ( $pid ) listening on $sender"
-            success;
-            echo;
-        else
-            failure;
-            echo;
-        fi;
-    fi;
-    return $RETVAL;
+        if [ $RETVAL = 0 ]; then
+            rm -f $lockfile
+            echo
+            return 0
+        fi
+        sleep $delay
+        i=`expr $i + 1`
+    done
+    failure $"dhcdbd shutdown"
+    echo
+    echo "dhcdbd is still up"
+    exit 1
 }
 
 case "$1" in
-    start) 
-        start;
-        RETVAL=$?;
+    start)
+        start
         ;;
     stop)
-        stop;
-        RETVAL=$?;
+        stop
         ;;
     condrestart)
-        if [ -e /var/lock/subsys/dhcdbd ] && [ -e /var/run/dhcdbd.pid ] && [ -e /proc/`cat /var/run/dhcdbd.pid` ]; then
-            stop;
-            start;
-            RETVAL=$?;
-        fi;
-        ;;
-    restart|reload)
-        stop;
-        start;
-        RETVAL=$?;
+        if [ -e $lockfile ]; then
+            stop
+            start
+        fi
+        ;;
+    restart)
+        stop
+        start
+        ;;
+    reload)
+        RETVAL=3
         ;;
     status)
-        status;
-        RETVAL=$?;
+        status $dhcdbd
+        RETVAL=$?
         ;;
     *)
-        echo $"$prog: Usage: < start | stop | restart | reload | status >"
+        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+        RETVAL=3
         ;;
 esac;
 


Index: dhcdbd.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/dhcdbd.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- dhcdbd.spec	9 Apr 2007 18:45:41 -0000	1.42
+++ dhcdbd.spec	26 Apr 2007 17:52:40 -0000	1.43
@@ -1,18 +1,17 @@
-#  DHCP D-BUS Daemon 
-
-#  If dhcdbd is to be run by the dbus-daemon's service activation service,
-#  then currently it MUST be installed setuid; else, it must have an 
-#  initscript and be run as root during boot .
+# If dhcdbd is to be run by the dbus-daemon's service activation service,
+# then currently it MUST be installed setuid; else, it must have an
+# initscript and be run as root during boot.
 
 Summary:   DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS
 Name:      dhcdbd
 Version:   2.7
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPL
 Group:     System Environment/Daemons
 URL:       http://people.redhat.com/dcantrel/%{name}/
 
 Source:    http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.bz2
+Patch0:    %{name}-2.7-initscript.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: dbus-devel >= 0.90, pkgconfig
@@ -31,6 +30,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .initscript
 
 %build
 %{__make} %{?_smp_mflags}
@@ -67,6 +67,9 @@
 %attr(755,root,root) %{_initrddir}/dhcdbd
 
 %changelog
+* Thu Apr 26 2007 David Cantrell <dcantrell at redhat.com> - 2.7-2
+- Init script fixes (#237977)
+
 * Mon Apr 09 2007 David Cantrell <dcantrell at redhat.com> - 2.7-1
 - Spec file scriptlet cleanups
 



From fedora-cvs-commits at redhat.com  Thu Apr 26 18:02:06 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 14:02:06 -0400
Subject: rpms/kernel/devel Makefile,1.45,1.46
Message-ID: <200704261802.l3QI26l8010776@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	Makefile 
Log Message:
make reconfig version bump


Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Makefile	19 Mar 2007 21:32:30 -0000	1.45
+++ Makefile	26 Apr 2007 18:02:04 -0000	1.46
@@ -63,7 +63,7 @@
 
 reconfig:
 	@rm -f kernel-*-config
-	@VERSION="2.6.20" make -f Makefile.config configs
+	@VERSION="2.6.21" make -f Makefile.config configs
 	@scripts/reconfig.sh
 
 # since i386 isn't a target...



From fedora-cvs-commits at redhat.com  Thu Apr 26 18:12:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 14:12:43 -0400
Subject: rpms/dhcdbd/devel dhcdbd-2.7-initscript.patch,1.1,1.2
Message-ID: <200704261812.l3QIChWx010975@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcdbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10959

Modified Files:
	dhcdbd-2.7-initscript.patch 
Log Message:
* Thu Apr 26 2007 David Cantrell <dcantrell at redhat.com> - 2.7-2
- Init script fixes (#237977)


dhcdbd-2.7-initscript.patch:
 dhcdbd.init |  120 ++++++++++++++++++++++++------------------------------------
 1 files changed, 49 insertions(+), 71 deletions(-)

Index: dhcdbd-2.7-initscript.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/dhcdbd-2.7-initscript.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dhcdbd-2.7-initscript.patch	26 Apr 2007 17:52:40 -0000	1.1
+++ dhcdbd-2.7-initscript.patch	26 Apr 2007 18:12:40 -0000	1.2
@@ -1,6 +1,6 @@
---- dhcdbd-2.7/dhcdbd.init.init	2007-02-02 11:20:43.000000000 -0500
-+++ dhcdbd-2.7/dhcdbd.init	2007-04-26 13:46:29.000000000 -0400
-@@ -1,32 +1,24 @@
+--- dhcdbd-2.7/dhcdbd.init.initscript	2007-02-02 11:20:43.000000000 -0500
++++ dhcdbd-2.7/dhcdbd.init	2007-04-26 14:09:53.000000000 -0400
+@@ -1,32 +1,34 @@
  #!/bin/bash
  #
 -#  dhcdbd  :  DHcp Client D-Bus Daemon
@@ -16,70 +16,74 @@
 -. /etc/rc.d/init.d/functions
 -[ -e /etc/sysconfig/network ] && . /etc/sysconfig/network
 -[ "${NETWORKING}" = "no" ] && exit 0
--prog=dhcdbd
 +# chkconfig: 2345 97 02
 +# description: dhcdbd provides D-BUS control of the ISC DHCP client, \
 +#              dhclient, and D-BUS access to the DHCP options obtained by \
 +#              dhclient for each IPv4 interface.  dhcdbd shuts down \
 +#              automatically when the messagebus is shut down.
 +# processname: dhcdbd
- 
--start() {
--    echo -n $"Starting $prog:"
--    daemon /sbin/dhcdbd --system 
--    RETVAL=$?
--    echo
--    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dhcdbd
--    return $RETVAL;
--}
++
 +# Source function library.
 +. /etc/init.d/functions
- 
--stop () {
--    echo -n $"Stopping $prog:"
--    if [ -e /var/lock/subsys/dhcdbd ] && [ -e /var/run/dbus/system_bus_socket ]; then
++
 +RETVAL=0
 +
-+prog=dhcdbd
+ prog=dhcdbd
 +dhcdbd=/sbin/dhcdbd
 +lockfile=/var/lock/subsys/dhcdbd
 +busfile=/var/run/dbus/system_bus_socket
-+
-+killdhcdbd() {
+ 
+ start() {
+     echo -n $"Starting $prog:"
+-    daemon /sbin/dhcdbd --system 
++    daemon $dhcdbd --system
+     RETVAL=$?
+     echo
+-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dhcdbd
+-    return $RETVAL;
++    [ $RETVAL -eq 0 ] && touch $lockfile
++    return $RETVAL
+ }
+ 
+ stop () {
+     echo -n $"Stopping $prog:"
+-    if [ -e /var/lock/subsys/dhcdbd ] && [ -e /var/run/dbus/system_bus_socket ]; then
 +    if [ -e $lockfile ] && [ -e $busfile ]; then
          /bin/dbus-send --system \
                          --dest=com.redhat.dhcp \
                          --type=method_call \
-@@ -34,74 +26,72 @@
-                         --reply-timeout=20000 \
+@@ -35,74 +37,50 @@
                          /com/redhat/dhcp \
                          com.redhat.dhcp.quit >/dev/null 2>&1
--        RETVAL=$?
+         RETVAL=$?
 -    else 
 -        killproc dhcdbd -TERM
--        RETVAL=$?
++    else
++        killproc $prog -TERM
+         RETVAL=$?
 -    fi;
 -    rm -f /var/lock/subsys/dhcdbd
 -    if [ $RETVAL -eq 0 ]; then
 -        success;
 -        echo;
-+        return $?
++    fi
++
++    if [ $RETVAL = 0 ]; then
++        success
++        echo
      else
 -        failure;
 -        echo;
 -    fi;
-+        killproc $prog -TERM
-+        return $?
+-}
++        failure
++        echo
 +    fi
- }
  
 -status() {
 -    [ ! -f /var/run/dhcdbd.pid ] && return 0
 -    pid=`cat /var/run/dhcdbd.pid`;
-+start() {
-+    echo -n $"Starting $prog:"
-+    daemon $dhcdbd --system
-     RETVAL=$?
+-    RETVAL=$?
 -    if [ "$RETVAL" -eq 0 ] && [ -n "$pid" ]; then
 -        sender=`/bin/dbus-send --system \
 -                               --dest=com.redhat.dhcp \
@@ -89,20 +93,7 @@
 -                               /com/redhat/dhcp \
 -                               com.redhat.dhcp.ping |
 -                grep 'sender=' | sed 's/^.*sender=//;s/\ .*$//'`;
-+    echo
-+    [ $RETVAL -eq 0 ] && touch $lockfile
-+    return $RETVAL
-+}
-+
-+stop () {
-+    echo -n $"Stopping $prog:"
-+    delay=3
-+    count=10
-+    i=1
-+    maxcount=`expr $count + 1`
-+    while [ $i != $maxcount ]; do
-+        killdhcdbd
-         RETVAL=$?
+-        RETVAL=$?
 -        if [ "$RETVAL" -eq 0 ]; then
 -            echo -n $"$prog ( $pid ) listening on $sender"
 -            success;
@@ -113,18 +104,7 @@
 -        fi;
 -    fi;
 -    return $RETVAL;
-+        if [ $RETVAL = 0 ]; then
-+            rm -f $lockfile
-+            echo
-+            return 0
-+        fi
-+        sleep $delay
-+        i=`expr $i + 1`
-+    done
-+    failure $"dhcdbd shutdown"
-+    echo
-+    echo "dhcdbd is still up"
-+    exit 1
++    return $RETVAL
  }
  
  case "$1" in
@@ -175,3 +155,5 @@
          ;;
  esac;
  
+-exit $RETVAL;
++exit $RETVAL



From fedora-cvs-commits at redhat.com  Thu Apr 26 18:13:11 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 14:13:11 -0400
Subject: rpms/dhcdbd/devel dhcdbd.spec,1.43,1.44
Message-ID: <200704261813.l3QIDBK5011009@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcdbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10995

Modified Files:
	dhcdbd.spec 
Log Message:
* Thu Apr 26 2007 David Cantrell <dcantrell at redhat.com> - 2.7-3
- More init script fixes (#237977)



Index: dhcdbd.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/dhcdbd.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- dhcdbd.spec	26 Apr 2007 17:52:40 -0000	1.43
+++ dhcdbd.spec	26 Apr 2007 18:13:09 -0000	1.44
@@ -5,7 +5,7 @@
 Summary:   DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS
 Name:      dhcdbd
 Version:   2.7
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   GPL
 Group:     System Environment/Daemons
 URL:       http://people.redhat.com/dcantrel/%{name}/
@@ -67,6 +67,9 @@
 %attr(755,root,root) %{_initrddir}/dhcdbd
 
 %changelog
+* Thu Apr 26 2007 David Cantrell <dcantrell at redhat.com> - 2.7-3
+- More init script fixes (#237977)
+
 * Thu Apr 26 2007 David Cantrell <dcantrell at redhat.com> - 2.7-2
 - Init script fixes (#237977)
 



From fedora-cvs-commits at redhat.com  Thu Apr 26 18:28:44 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 14:28:44 -0400
Subject: rpms/evolution-connector/devel evolution-connector.spec, 1.99,
	1.100 evolution-exchange-2.7.2-no_gnome_common.patch, 1.3,
	1.4 evolution-exchange-2.10.1-fix-64bit-configure.patch, 1.1, NONE
Message-ID: <200704261828.l3QISik7011537@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-connector.spec 
	evolution-exchange-2.7.2-no_gnome_common.patch 
Removed Files:
	evolution-exchange-2.10.1-fix-64bit-configure.patch 
Log Message:

* Thu Apr 26 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-3.fc7
- Regenerate configure to pick up 64-bit changes to acinclude.m4.
- Require autoconf and automake to build.



Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- evolution-connector.spec	26 Apr 2007 17:30:50 -0000	1.99
+++ evolution-connector.spec	26 Apr 2007 18:28:42 -0000	1.100
@@ -35,16 +35,14 @@
 ### Patches ###
 
 Patch11: evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch
-Patch12: evolution-exchange-2.10.1-fix-64bit-configure.patch
-
-Patch13: evolution-exchange-2.5.3-fix-marshaller.patch
+Patch12: evolution-exchange-2.5.3-fix-marshaller.patch
 
 # Remove gnome-common macros from configure.in.
 # We do not ship gnome-common (or at least we're not supposed to).
-Patch14: evolution-exchange-2.7.2-no_gnome_common.patch
+Patch13: evolution-exchange-2.7.2-no_gnome_common.patch
 
 # GNOME bug #405916
-Patch15: evolution-exchange-2.9.6-fix-compiler-warnings.patch
+Patch14: evolution-exchange-2.9.6-fix-compiler-warnings.patch
 
 ### Dependencies ###
 
@@ -57,6 +55,8 @@
 
 ### Build Dependencies ###
 
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: db4-devel
 BuildRequires: evolution >= %{evo_version}
 BuildRequires: evolution-data-server-devel >= %{eds_version}
@@ -79,10 +79,9 @@
 %setup -q -n evolution-exchange-%{version}
 
 %patch11 -p1 -b .fix-64bit-acinclude.m4
-%patch12 -p1 -b .fix-64bit-configure
-%patch13 -p1 -b .fix-marshaller
-%patch14 -p1 -b .no_gnome_common
-%patch15 -p1 -b .fix-compiler-warnings
+%patch12 -p1 -b .fix-marshaller
+%patch13 -p1 -b .no_gnome_common
+%patch14 -p1 -b .fix-compiler-warnings
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED"
@@ -114,6 +113,9 @@
 	-Werror-implicit-function-declaration"
 %endif
 
+# Regenerate configure to pick up acinclude.m4 changes
+autoreconf --force
+
 %configure \
   --enable-gtk-doc \
   --with-openldap=%{_libdir}/evolution-openldap \
@@ -153,7 +155,8 @@
 
 %changelog
 * Thu Apr 26 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-3.fc7
-- Patch configure to pick up 64-bit changes to acinclude.m4.
+- Regenerate configure to pick up 64-bit changes to acinclude.m4.
+- Require autoconf and automake to build.
 
 * Thu Apr 26 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-2.fc7
 - Fix a misnamed macro (RH bug #237807).

evolution-exchange-2.7.2-no_gnome_common.patch:
 configure.in |    2 --
 1 files changed, 2 deletions(-)

Index: evolution-exchange-2.7.2-no_gnome_common.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-exchange-2.7.2-no_gnome_common.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- evolution-exchange-2.7.2-no_gnome_common.patch	9 Apr 2007 16:56:03 -0000	1.3
+++ evolution-exchange-2.7.2-no_gnome_common.patch	26 Apr 2007 18:28:42 -0000	1.4
@@ -9,160 +9,3 @@
  case $CFLAGS in
  *-Wall*)
  	CFLAGS="$CFLAGS -Wno-sign-compare"
---- evolution-exchange-2.10.1/configure.no_gnome_common	2007-04-09 08:03:50.000000000 -0400
-+++ evolution-exchange-2.10.1/configure	2007-04-09 12:45:51.000000000 -0400
-@@ -23393,154 +23393,6 @@
- 
- 
- 
--    # Check whether --enable-compile-warnings was given.
--if test "${enable_compile_warnings+set}" = set; then
--  enableval=$enable_compile_warnings;
--else
--  enable_compile_warnings="maximum"
--fi
--
--
--    warnCFLAGS=
--    if test "x$GCC" != xyes; then
--	enable_compile_warnings=no
--    fi
--
--    warning_flags=
--    realsave_CFLAGS="$CFLAGS"
--
--    case "$enable_compile_warnings" in
--    no)
--	warning_flags=
--	;;
--    minimum)
--	warning_flags="-Wall"
--	;;
--    yes)
--	warning_flags="-Wall -Wmissing-prototypes"
--	;;
--    maximum|error)
--	warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
--	CFLAGS="$warning_flags $CFLAGS"
--	for option in -Wno-sign-compare; do
--		SAVE_CFLAGS="$CFLAGS"
--		CFLAGS="$CFLAGS $option"
--		{ echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
--echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; }
--		cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  has_option=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	has_option=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--		CFLAGS="$SAVE_CFLAGS"
--		{ echo "$as_me:$LINENO: result: $has_option" >&5
--echo "${ECHO_T}$has_option" >&6; }
--		if test $has_option = yes; then
--		  warning_flags="$warning_flags $option"
--		fi
--		unset has_option
--		unset SAVE_CFLAGS
--	done
--	unset option
--	if test "$enable_compile_warnings" = "error" ; then
--	    warning_flags="$warning_flags -Werror"
--	fi
--	;;
--    *)
--	{ { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
--echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
--   { (exit 1); exit 1; }; }
--	;;
--    esac
--    CFLAGS="$realsave_CFLAGS"
--    { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
--echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; }
--    { echo "$as_me:$LINENO: result: $warning_flags" >&5
--echo "${ECHO_T}$warning_flags" >&6; }
--
--    # Check whether --enable-iso-c was given.
--if test "${enable_iso_c+set}" = set; then
--  enableval=$enable_iso_c;
--else
--  enable_iso_c=no
--fi
--
--
--    { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
--echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; }
--    complCFLAGS=
--    if test "x$enable_iso_c" != "xno"; then
--	if test "x$GCC" = "xyes"; then
--	case " $CFLAGS " in
--	    *\ \	-ansi\ \	*) ;;
--	    *) complCFLAGS="$complCFLAGS -ansi" ;;
--	esac
--	case " $CFLAGS " in
--	    *\ \	-pedantic\ \	*) ;;
--	    *) complCFLAGS="$complCFLAGS -pedantic" ;;
--	esac
--	fi
--    fi
--    { echo "$as_me:$LINENO: result: $complCFLAGS" >&5
--echo "${ECHO_T}$complCFLAGS" >&6; }
--
--    WARN_CFLAGS="$warning_flags $complCFLAGS"
--
--
--CFLAGS="$CFLAGS $WARN_CFLAGS"
- case $CFLAGS in
- *-Wall*)
- 	CFLAGS="$CFLAGS -Wno-sign-compare"


--- evolution-exchange-2.10.1-fix-64bit-configure.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Apr 26 18:28:59 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 14:28:59 -0400
Subject: rpms/dhcpv6/devel dhcpv6-0.10-initscripts.patch, 1.3,
	1.4 dhcpv6.spec, 1.54, 1.55
Message-ID: <200704261828.l3QISxTE011602@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcpv6/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11585

Modified Files:
	dhcpv6.spec 
Added Files:
	dhcpv6-0.10-initscripts.patch 
Log Message:
* Thu Apr 26 2007 David Cantrell <dcantrell at redhat.com> - 0.10-42
- Init script fixes (#237973)


dhcpv6-0.10-initscripts.patch:
 dhcp6r.sh |  124 ++++++++++++++++++++++++++--------------------------------
 dhcp6s.sh |  132 ++++++++++++++++++++++++++++----------------------------------
 2 files changed, 117 insertions(+), 139 deletions(-)

Index: dhcpv6-0.10-initscripts.patch
===================================================================
RCS file: dhcpv6-0.10-initscripts.patch
diff -N dhcpv6-0.10-initscripts.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ dhcpv6-0.10-initscripts.patch	26 Apr 2007 18:28:57 -0000	1.4
@@ -0,0 +1,306 @@
+--- dhcp-0.10/dhcp6r.sh.initscripts	2007-04-26 14:25:25.000000000 -0400
++++ dhcp-0.10/dhcp6r.sh	2007-04-26 14:25:51.000000000 -0400
+@@ -1,89 +1,77 @@
+-#!/bin/sh
+-#
+-# dhcp6r        dhcp6r is an implementation of DHCPv6 relay agent.
+-#               This shell script takes care of starting and stopping
+-#               dhcp6r.
++#!/bin/bash
+ #
+ # chkconfig: - 66 36
+-# description: dhcp6r supports the DHCPv6 relay agent protocol. 
+-#            
++# description: dhcp6r supports the DHCPv6 relay agent protocol.
+ # processname: dhcp6r
+ # config: /etc/sysconfig/dhcp6r
+ 
+-# Source function library.
+-. /etc/rc.d/init.d/functions
++# Source function library
++. /etc/init.d/functions
+ 
+-# Source networking configuration.
+-. /etc/sysconfig/network
+-. /etc/sysconfig/dhcp6r
++RETVAL=0
++prog=dhcp6r
++dhcp6r=/usr/sbin/dhcp6r
++lockfile=/var/lock/subsys/dhcp6r
+ 
+ # Check that networking is up.
+ # networking is not up, return 1 for generic error
+-[ ${NETWORKING} = "no" ] && exit 1
+-
+-# Check that files exist
+-# return 5 if program is not installed
+-[ -f /usr/sbin/dhcp6r ] || exit 5
+-
+-# return 6 if program is not configured
+-[ -f /etc/sysconfig/dhcp6r ] || exit 6
+-
+-RETVAL=0
+-prog="dhcp6r"
++. /etc/sysconfig/network
++[ $NETWORKING = "no" ] && exit 1
+ 
+ start() {
+-	# Start daemons.
+-	echo -n $"Starting $prog: "
+-	daemon /usr/sbin/dhcp6r ${DHCP6RARGS}
+-	RETVAL=$?
+-	echo
+-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/dhcp6r
+-	return $RETVAL
++    # return 5 if program is not installed
++    [ -x $dhcp6r ] || exit 5
++
++    # return 6 if program is not configured
++    [ -f /etc/sysconfig/dhcp6r ] || exit 6
++    . /etc/sysconfig/dhcp6r
++
++    echo -n $"Starting $prog: "
++    daemon $dhcp6r $DHCP6RARGS
++    RETVAL=$?
++    echo
++    [ $RETVAL -eq 0 ] && touch $lockfile
++    return $RETVAL
+ }
+ 
+ stop() {
+-	# Stop daemons.
+-	echo -n $"Shutting down $prog: "
+-	killproc dhcp6r
+-	RETVAL=$?
+-	echo
+-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dhcp6r
+-	return $RETVAL
++    echo -n $"Shutting down $prog: "
++    killproc $prog -TERM
++    RETVAL=$?
++    echo
++    [ $RETVAL -eq 0 ] && rm -f $lockfile
++    return $RETVAL
+ }
+ 
+ # See how we were called.
+ case "$1" in
+-  start)
+-	start
+-	RETVAL=$?
+-	;;
+-  stop)
+-	stop
+-	RETVAL=$?
+-	;;
+-  restart|force-reload)
+-	stop
+-	start
+-	RETVAL=$?
+-	;;
+-  reload)
+-	# unimplemented
+-	RETVAL=3
+-	;;
+-  condrestart)
+-	if [ -f /var/lock/subsys/dhcp6s ]; then
+-	    stop
+-	    start
+-	    RETVAL=$?
+-	fi
+-	;;
+-  status)
+-	status dhcp6r
+-	RETVAL=$?
+-	;;
+-  *)
+-	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+-	exit 1
++    start)
++        start
++        ;;
++    stop)
++        stop
++        ;;
++    restart)
++        stop
++        start
++        ;;
++    reload)
++        RETVAL=3
++        ;;
++    condrestart)
++        if [ -f $lockfile ]; then
++            stop
++            start
++        fi
++        ;;
++    status)
++        status dhcp6r
++        RETVAL=$?
++        ;;
++    *)
++        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
++        RETVAL=3
++        ;;
+ esac
+ 
+ exit $RETVAL
+--- dhcp-0.10/dhcp6s.sh.initscripts	2007-04-26 14:25:25.000000000 -0400
++++ dhcp-0.10/dhcp6s.sh	2007-04-26 14:25:25.000000000 -0400
+@@ -1,94 +1,84 @@
+-#!/bin/sh
+-#
+-# dhcp6s        dhcp6s is an implementation of DHCPv6 server.
+-#               This shell script takes care of starting and stopping
+-#               dhcp6s.
++#!/bin/bash
+ #
+ # chkconfig: - 66 36
+-# description: dhcp6s supports server side of  Dynamic Host Configuration \
++# description: dhcp6s supports the server side of Dynamic Host Configuration \
+ #              Protocol for IPv6.
+ # processname: dhcp6s
+ # config: /etc/dhcp6s.conf
+ # config: /etc/sysconfig/dhcp6s
+ 
+-# Source function library.
+-. /etc/rc.d/init.d/functions
++# Source function library
++. /etc/init.d/functions
+ 
+-# Source networking configuration.
+-. /etc/sysconfig/network
+-. /etc/sysconfig/dhcp6s
++RETVAL=0
++prog=dhcp6s
++dhcp6s=/usr/sbin/dhcp6s
++lockfile=/var/lock/subsys/dhcp6s
+ 
+ # Check that networking is up.
+ # networking is not up, return 1 for generic error
+-[ ${NETWORKING} = "no" ] && exit 1
+-
+-# Check that files exist
+-# return 5 if program is not installed
+-[ -x /usr/sbin/dhcp6s ] || exit 5
+-
+-# return 6 if program is not configured
+-[ -f /etc/dhcp6s.conf ] || exit 6
+-
+-if [ "x$DHCP6SIF" =  "x" ]; then
+-	logger -s -t "dhcp6s" -p "daemon.info" "Warning: dhcp6s listening on ALL interfaces - set DHCP6SIF in /etc/sysconfig/dhcp6s"
+-fi
+-
+-RETVAL=0
+-prog="dhcp6s"
++. /etc/sysconfig/network
++[ $NETWORKING = "no" ] && exit 1
+ 
+ start() {
+-	# Start daemons.
+-	echo -n $"Starting $prog: "
+-	daemon /usr/sbin/dhcp6s -c /etc/dhcp6s.conf ${DHCP6SARGS} ${DHCP6SIF}
+-	RETVAL=$?
+-	echo
+-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/dhcp6s
+-	return $RETVAL
++    # return 5 if program is not installed
++    [ -x $dhcp6s ] || exit 5
++
++    # return 6 if program is not configured
++    [ -f /etc/dhcp6s.conf ] || exit 6
++    [ -f /etc/sysconfig/dhcp6s ] || exit 6
++    . /etc/sysconfig/dhcp6s
++
++    if [ -z "$DHCP6SIF" ]; then
++        logger -s -t "$prog" -p "daemon.info" "Warning: $prog listening on ALL interfaces"
++    fi
++
++    echo -n $"Starting $prog: "
++    daemon $dhcp6s -c /etc/dhcp6s.conf $DHCP6SARGS $DHCP6SIF
++    RETVAL=$?
++    echo
++    [ $RETVAL -eq 0 ] && touch $lockfile
++    return $RETVAL
+ }
+ 
+ stop() {
+-	# Stop daemons.
+-	echo -n $"Shutting down $prog: "
+-	killproc dhcp6s
+-	RETVAL=$?
+-	echo
+-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dhcp6s
+-	return $RETVAL
++    echo -n $"Shutting down $prog: "
++    killproc $prog -TERM
++    RETVAL=$?
++    echo
++    [ $RETVAL -eq 0 ] && rm -f $lockfile
++    return $RETVAL
+ }
+ 
+ # See how we were called.
+ case "$1" in
+-  start)
+-	start
+-	RETVAL=$?
+-	;;
+-  stop)
+-	stop
+-	RETVAL=$?
+-	;;
+-  restart|force-reload)
+-	stop
+-	start
+-	RETVAL=$?
+-	;;
+-  reload)
+-	# unimplemented
+-	RETVAL=3
+-	;;
+-  condrestart)
+-	if [ -f /var/lock/subsys/dhcp6s ]; then
+-	    stop
+-	    start
+-	    RETVAL=$?
+-	fi
+-	;;
+-  status)
+-	status dhcp6s
+-	RETVAL=$?
+-	;;
+-  *)
+-	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+-	exit 1
++    start)
++        start
++        ;;
++    stop)
++        stop
++        ;;
++    restart)
++        stop
++        start
++        ;;
++    reload)
++        RETVAL=3
++        ;;
++    condrestart)
++        if [ -f $lockfile ]; then
++            stop
++            start
++        fi
++        ;;
++    status)
++        status $prog
++        RETVAL=$?
++        ;;
++    *)
++        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
++        RETVAL=3
++        ;;
+ esac
+ 
+ exit $RETVAL


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- dhcpv6.spec	26 Mar 2007 15:01:23 -0000	1.54
+++ dhcpv6.spec	26 Apr 2007 18:28:57 -0000	1.55
@@ -1,37 +1,37 @@
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
 Version: 0.10
-Release: 41%{?dist}
-License: GPL 
+Release: 42%{?dist}
+License: GPL
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/
 Source0: ftp://ftp.sourceforge.net/pub/sourceforge/d/dh/dhcp/dhcp-%{version}.tgz
 Source1: libdhcp6client.pc
 Source2: rfc3315.txt
 
-Patch0:  %{name}-%{version}-redhat.patch
-Patch1:  %{name}-%{version}-relay.patch
-Patch2:  %{name}-%{version}-man.patch
-Patch3:  %{name}-%{version}-gethwid.patch
-Patch4:  %{name}-%{version}-no-strlcat.patch
-Patch5:  %{name}-%{version}-salen.patch
+Patch0:  %{name}-0.10-redhat.patch
+Patch1:  %{name}-0.10-relay.patch
+Patch2:  %{name}-0.10-man.patch
+Patch3:  %{name}-0.10-gethwid.patch
+Patch4:  %{name}-0.10-no-strlcat.patch
+Patch5:  %{name}-0.10-salen.patch
+Patch6:  %{name}-0.10-initscripts.patch
 
-Patch99: %{name}-%{version}-libdhcp6client.patch
+Patch99: %{name}-0.10-libdhcp6client.patch
 
 Prereq: /sbin/chkconfig, /sbin/service
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex, bison, openssl-devel, autoconf, automake, libtool
 
 %description
-Implements the Dynamic Host Configuration Protocol (DHCP) for 
-Internet Protocol version 6 (IPv6) networks in accordance with 
-RFC 3315 : Dynamic Host Configuration Protocol for IPv6 (DHCPv6).
-Consists of dhcp6s(8), the server DHCP daemon, and dhcp6r(8),
-the DHCPv6 relay agent. 
-Install this if you want to support dynamic configuration of
-IPv6 addresses and parameters on your IPv6 network.
-See man dhcp6s(8), dhcp6r(8), dhcp6s.conf(5),
-and the documentation in /usr/share/doc/dhcpv6* .
+Implements the Dynamic Host Configuration Protocol (DHCP) for Internet
+Protocol version 6 (IPv6) networks in accordance with RFC 3315: Dynamic Host
+Configuration Protocol for IPv6 (DHCPv6).  Consists of dhcp6s(8), the server
+DHCP daemon, and dhcp6r(8), the DHCPv6 relay agent.
+
+Install this package if you want to support dynamic configuration of IPv6
+addresses and parameters on your IPv6 network.  See man dhcp6s(8), dhcp6r(8),
+dhcp6s.conf(5), and the documentation in /usr/share/doc/dhcpv6*.
 
 %package -n dhcpv6_client
 Summary:  DHCPv6 client
@@ -39,19 +39,18 @@
 Group: System Environment/Base
 
 %description -n dhcpv6_client
-Provides the client for the DHCPv6 protocol (RFC 3315) to support
-dynamic configuration of IPv6 addresses and parameters.
-See man dhcp6c(8), dhcp6c.conf(5), and the documentation in
-/usr/share/dhcpv6_client* .
+Provides the client for the DHCPv6 protocol (RFC 3315) to support dynamic
+configuration of IPv6 addresses and parameters.  See man dhcp6c(8),
+dhcp6c.conf(5), and the documentation in /usr/share/dhcpv6_client*.
 
 %package -n libdhcp6client
 Summary: The DHCPv6 client in a library for invocation by other programs
 Group:  Development/Libraries
 
 %description -n libdhcp6client
-Provides the client for the DHCPv6 protocol (RFC 3315) to support
-dynamic configuration of IPv6 addresses and parameters, in a 
-library for invocation by other programs.
+Provides the client for the DHCPv6 protocol (RFC 3315) to support dynamic
+configuration of IPv6 addresses and parameters, in a library for invocation
+by other programs.
 
 %package -n libdhcp6client-devel
 Summary: Header files for development with the DHCPv6 client library
@@ -68,6 +67,7 @@
 %patch3 -p1 -b .gethwid
 %patch4 -p1 -b .no_strlcat
 %patch5 -p1 -b .salen
+%patch6 -p1 -b .initscripts
 
 %patch99 -p1 -b .libdhcp6client
 
@@ -160,6 +160,9 @@
 %{_libdir}/libdhcp6client.a
 
 %changelog
+* Thu Apr 26 2007 David Cantrell <dcantrell at redhat.com> - 0.10-42
+- Init script fixes (#237973)
+
 * Mon Mar 26 2007 David Cantrell <dcantrell at redhat.com> - 0.10-41
 - Pass correct sockaddr size for salen parameter to getnameinfo() (#233900)
 - Spec file cleanups per Fedora Packaging Guidelines



From fedora-cvs-commits at redhat.com  Thu Apr 26 18:40:58 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 14:40:58 -0400
Subject: rpms/xmlrpc/devel xmlrpc.spec,1.19,1.20
Message-ID: <200704261840.l3QIew7N031662@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/xmlrpc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31581

Modified Files:
	xmlrpc.spec 
Log Message:
Spec file clean up for Fedora Extras Review



Index: xmlrpc.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlrpc/devel/xmlrpc.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xmlrpc.spec	8 Mar 2007 23:23:20 -0000	1.19
+++ xmlrpc.spec	26 Apr 2007 18:40:51 -0000	1.20
@@ -34,13 +34,13 @@
 
 Name:       xmlrpc
 Version:    2.0.1
-Release:    3jpp.2
+Release:    3jpp.3%{?dist}
 Epoch:      0
 Summary:    Java XML-RPC implementation
 License:    Apache Software License
 Group:      Development/Java
 Url:        http://xml.apache.org/%{name}/
-Source0:    http://www.apache.org/dist/ws/xmlrpc/source/xmlrpc-%{version}-src.tar.gz
+Source0:    http://www.apache.org/dist/ws/xmlrpc/sources/xmlrpc-2.0.1-src.tar.gz
 Patch0:     %{name}-%{version}-jessie.patch
 
 BuildRequires:  ant
@@ -60,7 +60,7 @@
 %if ! %{gcj_support}
 Buildarch:    noarch
 %endif
-Buildroot:    %{_tmppath}/%{name}-%{version}-buildroot
+Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{gcj_support}
 BuildRequires:    java-gcj-compat-devel
@@ -78,9 +78,6 @@
 %package javadoc
 Summary:    Javadoc for %{name}
 Group:      Development/Java
-Requires(post): %{__rm}
-Requires(postun): %{__rm}
-Requires(post): /bin/ln
 
 %description javadoc
 Javadoc for %{name}.
@@ -118,15 +115,6 @@
 %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
-
 %if %{gcj_support}
 %post
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -158,6 +146,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Tue Mar 27 2007 Matt Wringe <mwringe at redhat.com> 0:2.0.1-3jpp.3
+- Spec file clean up for Fedora Extras Review
+
 * Thu Mar 08 2007 Deepak Bhole <dbhole at redhat.com> 2.0.1-3jpp.2
 - Add javax.net.ssl support to build org.apache.xmlrpc.secure.*
 - Minor spec file cleanup



From fedora-cvs-commits at redhat.com  Thu Apr 26 18:41:28 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 14:41:28 -0400
Subject: rpms/xorg-x11-proto-devel/devel .cvsignore, 1.26, 1.27 sources, 1.24,
	1.25 xorg-x11-proto-devel.spec, 1.55, 1.56
Message-ID: <200704261841.l3QIfSnB032164@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	2 Apr 2007 17:55:04 -0000	1.26
+++ .cvsignore	26 Apr 2007 18:41:26 -0000	1.27
@@ -26,4 +26,4 @@
 xineramaproto-1.1.2.tar.bz2
 xproto-7.0.10.tar.bz2
 xproxymanagementprotocol-1.0.2.tar.bz2
-inputproto-1.4.1.tar.bz2
+inputproto-1.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	2 Apr 2007 17:55:04 -0000	1.24
+++ sources	26 Apr 2007 18:41:26 -0000	1.25
@@ -26,4 +26,4 @@
 1cc292c562962ad0ad3a253cae68c632  xineramaproto-1.1.2.tar.bz2
 2ed80e90992e7455eaac4c3e977ebd01  xproto-7.0.10.tar.bz2
 d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
-563cc41eeb590cf5eb2127807b838dfc  inputproto-1.4.1.tar.bz2
+e2c4cf4c2ad59d1e27f09381f6b4a3c3  inputproto-1.4.2.tar.bz2


Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- xorg-x11-proto-devel.spec	5 Apr 2007 19:30:12 -0000	1.55
+++ xorg-x11-proto-devel.spec	26 Apr 2007 18:41:26 -0000	1.56
@@ -10,7 +10,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -31,8 +31,8 @@
 Source7:  ftp://ftp.x.org/pub/individual/proto/fontsproto-2.0.2.tar.bz2
 Source8:  ftp://ftp.x.org/pub/individual/proto/glproto-1.4.8.tar.bz2
 Provides: glproto = 1.4.8
-Source9:  ftp://ftp.x.org/pub/individual/proto/inputproto-1.4.1.tar.bz2
-Provides: inputproto = 1.4.1
+Source9:  ftp://ftp.x.org/pub/individual/proto/inputproto-1.4.2.tar.bz2
+Provides: inputproto = 1.4.2
 Source10: ftp://ftp.x.org/pub/individual/proto/kbproto-1.0.3.tar.bz2
 Provides: kbproto = 1.0.3
 Source13: ftp://ftp.x.org/pub/individual/proto/randrproto-1.2.1.tar.bz2
@@ -286,6 +286,9 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Thu Apr 26 2007 Adam Jackson <ajax at redhat.com> 7.2-9
+- inputproto 1.4.2
+
 * Thu Apr 05 2007 Adam Jackson <ajax at redhat.com> 7.2-8
 - Add virtual provides for the subprotocols (#231156)
 



From fedora-cvs-commits at redhat.com  Thu Apr 26 19:01:46 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 15:01:46 -0400
Subject: rpms/dhcp/devel dhcp-3.0.5-manpages.patch, 1.1, 1.2 dhcp.spec, 1.159,
	1.160 dhcpd.init, 1.13, 1.14 dhcrelay.init, 1.2, 1.3
Message-ID: <200704261901.l3QJ1kwC014500@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14461

Modified Files:
	dhcp-3.0.5-manpages.patch dhcp.spec dhcpd.init dhcrelay.init 
Log Message:
* Thu Apr 26 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-34
- Init script fixes (#237985, #237983)
- Reference correct scripts in dhclient-script.8 man page (#238036)


dhcp-3.0.5-manpages.patch:
 client/dhclient-script.8 |   23 ++++++++
 client/dhclient.8        |  123 +++++++++++++++++++++++++++++++++++++++++++++++
 client/dhclient.conf.5   |   15 +++++
 common/dhcp-options.5    |   18 ++++++
 dhcpctl/dhcpctl.3        |    5 +
 server/dhcpd.conf.5      |   18 ++----
 6 files changed, 187 insertions(+), 15 deletions(-)

Index: dhcp-3.0.5-manpages.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0.5-manpages.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dhcp-3.0.5-manpages.patch	1 Apr 2007 20:52:27 -0000	1.1
+++ dhcp-3.0.5-manpages.patch	26 Apr 2007 19:01:43 -0000	1.2
@@ -1,5 +1,5 @@
 --- dhcp-3.0.5/client/dhclient-script.8.manpages	2005-09-28 15:17:08.000000000 -0400
-+++ dhcp-3.0.5/client/dhclient-script.8	2007-03-29 14:55:09.000000000 -0400
++++ dhcp-3.0.5/client/dhclient-script.8	2007-04-26 14:52:13.000000000 -0400
 @@ -47,7 +47,7 @@
  exit hooks provided (see HOOKS for details).   These hooks will allow the
  user to override the default behaviour of the client in creating a
@@ -20,7 +20,7 @@
 +.B ETCDIR/dhclient-up-hooks
 +script, and source it if found. This script can handle DHCP options in
 +the environment that are not handled by default. A per-interface 
-+.B ETCDIR/dhclient-up-${IF}-hooks
++.B ETCDIR/dhclient-${IF}-up-hooks
 +script will override the generic script and be sourced when interface
 +$IF has been brought up.
 +.PP
@@ -30,7 +30,7 @@
 +.B ETCDIR/dhclient-down-hooks
 +script, and source it if found. This script can handle DHCP options in
 +the environment that are not handled by default. A per-interface 
-+.B ETCDIR/dhclient-down-${IF}-hooks
++.B ETCDIR/dhclient-${IF}-down-hooks
 +script will override the generic script and be sourced when interface
 +$IF is about to be brought down.
 +
@@ -38,7 +38,7 @@
  When dhclient needs to invoke the client configuration script, it
  defines a set of variables in the environment, and then invokes
 --- dhcp-3.0.5/client/dhclient.conf.5.manpages	2005-06-16 15:40:13.000000000 -0400
-+++ dhcp-3.0.5/client/dhclient.conf.5	2007-03-29 14:55:21.000000000 -0400
++++ dhcp-3.0.5/client/dhclient.conf.5	2007-04-26 14:51:02.000000000 -0400
 @@ -185,7 +185,8 @@
  options.   Only the option names should be specified in the request
  statement - not option parameters.   By default, the DHCP server
@@ -68,8 +68,8 @@
  .SH SAMPLE
  The following configuration file is used on a laptop running NetBSD
  1.3.   The laptop has an IP alias of 192.5.5.213, and has one
---- dhcp-3.0.5/client/dhclient.8.manpages	2007-03-29 14:54:16.000000000 -0400
-+++ dhcp-3.0.5/client/dhclient.8	2007-03-29 14:58:16.000000000 -0400
+--- dhcp-3.0.5/client/dhclient.8.manpages	2007-04-26 14:51:02.000000000 -0400
++++ dhcp-3.0.5/client/dhclient.8	2007-04-26 14:51:02.000000000 -0400
 @@ -85,6 +85,28 @@
  .B -x
  ]
@@ -208,7 +208,7 @@
  The syntax of the dhclient.conf(5) file is discussed separately.
  .SH OMAPI
 --- dhcp-3.0.5/common/dhcp-options.5.manpages	2006-04-26 11:12:43.000000000 -0400
-+++ dhcp-3.0.5/common/dhcp-options.5	2007-03-29 14:58:42.000000000 -0400
++++ dhcp-3.0.5/common/dhcp-options.5	2007-04-26 14:51:02.000000000 -0400
 @@ -834,6 +834,24 @@
  classless IP routing is now the most widely deployed routing standard,
  this option is virtually useless, and is not implemented by any of the
@@ -235,7 +235,7 @@
  .PP
  .nf
 --- dhcp-3.0.5/dhcpctl/dhcpctl.3.manpages	2004-09-24 17:08:38.000000000 -0400
-+++ dhcp-3.0.5/dhcpctl/dhcpctl.3	2007-03-29 14:59:16.000000000 -0400
++++ dhcp-3.0.5/dhcpctl/dhcpctl.3	2007-04-26 14:51:02.000000000 -0400
 @@ -43,7 +43,8 @@
  .\"
  .\"
@@ -256,7 +256,7 @@
  int main (int argc, char **argv) {
  	dhcpctl_data_string ipaddrstring = NULL;
 --- dhcp-3.0.5/server/dhcpd.conf.5.manpages	2006-07-09 11:02:24.000000000 -0400
-+++ dhcp-3.0.5/server/dhcpd.conf.5	2007-03-29 14:58:59.000000000 -0400
++++ dhcp-3.0.5/server/dhcpd.conf.5	2007-04-26 14:51:02.000000000 -0400
 @@ -531,9 +531,9 @@
  failover peer "foo" {
    primary;


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- dhcp.spec	20 Apr 2007 16:54:05 -0000	1.159
+++ dhcp.spec	26 Apr 2007 19:01:43 -0000	1.160
@@ -10,7 +10,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.5
-Release:  33%{?dist}
+Release:  34%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -429,6 +429,10 @@
 %{_libdir}/libdhcp4client.a
 
 %changelog
+* Thu Apr 26 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-34
+- Init script fixes (#237985, #237983)
+- Reference correct scripts in dhclient-script.8 man page (#238036)
+
 * Fri Apr 20 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-33
 - Rename -devel-static packages to -static (#225691)
 


Index: dhcpd.init
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcpd.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dhcpd.init	15 Nov 2005 17:11:05 -0000	1.13
+++ dhcpd.init	26 Apr 2007 19:01:43 -0000	1.14
@@ -1,128 +1,104 @@
-#!/bin/sh
-#
-# dhcpd         This shell script takes care of starting and stopping
-#               dhcpd.
+#!/bin/bash
 #
 # chkconfig: - 65 35
 # description: dhcpd provide access to Dynamic Host Control Protocol.
 
 # Source function library.
-. /etc/rc.d/init.d/functions
-
-# Source networking configuration.
-. /etc/sysconfig/network
-. /etc/sysconfig/dhcpd
+. /etc/init.d/functions
 
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
+RETVAL=0
+prog=dhcpd
+dhcpd=/usr/sbin/dhcpd
+lockfile=/var/lock/subsys/dhcpd
 
-[ -f /usr/sbin/dhcpd ] || exit 0
+. /etc/sysconfig/dhcpd
 
-cfOption()
-{ let i=0; 
-  for a in $*; 
-  do ((++i)); 
-     if [ $a = -cf ]; then 
-	 ((++i)); 
-	 eval 'echo $'$i;
-     elif [[ $a = -cf* ]]; then 
-	 echo ${a#-cf}; 
-     fi; 
-  done; 
+cfOption() {
+    let i=0
+    for a in $* ; do
+        ((++i))
+        if [ $a = -cf ]; then
+            ((++i))
+            eval 'echo $'$i
+        elif [[ $a = -cf* ]]; then
+            echo ${a#-cf}
+        fi
+    done
 }
 
 CF=`cfOption $DHCPDARGS`
 if [ -z "$CF" ]; then
-   CF='/etc/dhcpd.conf';
+    CF='/etc/dhcpd.conf'
 fi
 
 [ -f "$CF" ] || exit 0
+
 if [ ! -f /var/lib/dhcpd/dhcpd.leases ] ; then
-   mkdir -p /var/lib/dhcpd
-   touch /var/lib/dhcpd/dhcpd.leases
-   [ -x /sbin/restorecon ] && [ -d /selinux ] && /sbin/restorecon /var/lib/dhcp/dhcpd.leases >/dev/null 2>&1
+    mkdir -p /var/lib/dhcpd
+    touch /var/lib/dhcpd/dhcpd.leases
+    [ -x /sbin/restorecon ] && [ -d /selinux ] && /sbin/restorecon /var/lib/dhcp/dhcpd.leases >/dev/null 2>&1
 fi
 
-RETVAL=0
-prog="dhcpd"
-
-configtest()
-{        
-	/usr/sbin/dhcpd -q -t -cf $CF
-	return $?
+configtest() {
+    [ -x $dhcpd ] || return 5
+    [ -f $CF ] || return 6
+    $dhcpd -q -t -cf $CF
+    RETVAL=$?
+    return $RETVAL
 }
 
 start() {
-	# Start daemons.
-	echo -n $"Starting $prog: "
-	daemon /usr/sbin/dhcpd ${DHCPDARGS} 2>/dev/null
-	RETVAL=$?
-	echo
-	if [ $RETVAL -eq 0 ]; then 
-	    touch /var/lock/subsys/dhcpd
-	    if [ -x /usr/bin/logger ]; then
-		/usr/bin/logger -t dhcpd 'dhcpd startup succeeded'
-	    fi;
-	else
-	    if [ -x /usr/bin/logger ]; then
-		/usr/bin/logger -t dhcpd 'dhcpd startup failed'
-	    fi;
-        fi
-	return $RETVAL
+    [ -x $dhcpd ] || return 5
+    [ -f $CF ] || return 6
+    echo -n $"Starting $prog: "
+    daemon $dhcpd $DHCPDARGS 2>/dev/null
+    RETVAL=$?
+    [ $RETVAL = 0 ] && touch $lockfile
+    return $RETVAL
 }
 
 stop() {
-	# Stop daemons.
-	echo -n $"Shutting down $prog: "
-	killproc dhcpd
-	RETVAL=$?
-	echo
-	if [ $RETVAL -eq 0 ]; then
-           rm -f /var/lock/subsys/dhcpd
-	   if [ -x /usr/bin/logger ]; then
-		/usr/bin/logger -t dhcpd 'dhcpd shutdown succeeded'
-	   fi;
-	else
-	   if [ -x /usr/bin/logger ]; then
-		/usr/bin/logger -t dhcpd 'dhcpd shutdown failed'
-	   fi;
-	fi
-	return $RETVAL
+    echo -n $"Shutting down $prog: "
+    killproc $prog -TERM
+    RETVAL=$?
+    [ $RETVAL = 0 ] && rm -f $lockfile
+    return $RETVAL
 }
 
 # See how we were called.
 case "$1" in
-  start)
-	start
-	;;
-  stop)
-	stop
-	;;
-  restart|reload)
-	configtest || exit $?
-	stop
-	start
-	RETVAL=$?
-	;;
-  condrestart)
-	if [ -f /var/lock/subsys/dhcpd ]; then
-	    stop
-	    start
-	    RETVAL=$?
-	fi
-	;;
-  configtest|check|testconfig|test)
-	configtest
-	RETVAL=$?
-	;;
-  status)
-	status dhcpd
-	RETVAL=$?
-	;;
-  *)
-	echo $"Usage: $0 {start|stop|restart|condrestart|configtest|status}"
-	exit 1
+    start)
+        start
+        ;;
+    stop)
+        stop
+        ;;
+    reload)
+        RETVAL=3
+        ;;
+    restart)
+        configtest || exit $?
+        stop
+        start
+        ;;
+    condrestart)
+        if [ -f $lockfile ]; then
+            stop
+            start
+        fi
+        ;;
+    configtest|check|testconfig|test)
+        configtest
+        RETVAL=$?
+        ;;
+    status)
+        status $prog
+        RETVAL=$?
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|restart|condrestart|configtest|status}"
+        RETVAL=3
+        ;;
 esac
 
 exit $RETVAL
-


Index: dhcrelay.init
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcrelay.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dhcrelay.init	9 Sep 2004 04:14:53 -0000	1.2
+++ dhcrelay.init	26 Apr 2007 19:01:43 -0000	1.3
@@ -1,82 +1,67 @@
-#!/bin/sh
-#
-# dhcrelay      This shell script takes care of starting and stopping
-#               dhcrelay.
+#!/bin/bash
 #
 # chkconfig: - 66 34
 # description: dhcrelay provides a relay for Dynamic Host Control Protocol.
 
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-# Source dhcrelay configuration. We can't default a DHCPSERVERS entry!
-if [ -f /etc/sysconfig/dhcrelay ] ; then
-	. /etc/sysconfig/dhcrelay
-	[ -n "$DHCPSERVERS" ] || exit 0
-else
-	exit 0
-fi
-
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
-
-[ -f /usr/sbin/dhcrelay ] || exit 0
+# Source function library
+. /etc/init.d/functions
 
 RETVAL=0
-prog="dhcrelay"
+prog=dhcrelay
+dhcrelay=/usr/sbin/dhcrelay
+lockfile=/var/lock/subsys/dhcrelay
 
 start() {
-	# Start daemons.
-	echo -n $"Starting $prog: "
-	daemon /usr/sbin/dhcrelay \
-		$([ -n "$INTERFACES" ] && for int in $INTERFACES ; do echo -n " -i $int" ; done) \
-		$DHCPSERVERS
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/dhcrelay
-	return $RETVAL
+    [ -x $dhcrelay ] || exit 5
+    [ -f /etc/sysconfig/dhcrelay ] || exit 6
+    . /etc/sysconfig/dhcrelay
+    [ -z "$DHCPSERVERS" ] && exit 6
+    echo -n $"Starting $prog: "
+    daemon $dhcrelay $([ -n "$INTERFACES" ] && for int in $INTERFACES ; do echo -n " -i $int" ; done) $DHCPSERVERS
+    RETVAL=$?
+    echo
+    [ $RETVAL -eq 0 ] && touch $lockfile
+    return $RETVAL
 }
 
 stop() {
-	# Stop daemons.
-	echo -n $"Shutting down $prog: "
-	killproc dhcrelay
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dhcrelay
-	return $RETVAL
+    echo -n $"Shutting down $prog: "
+    killproc $prog -TERM
+    RETVAL=$?
+    echo
+    [ $RETVAL -eq 0 ] && rm -f $lockfile
+    return $RETVAL
 }
 
 # See how we were called.
 case "$1" in
-  start)
-	start
-	;;
-  stop)
-	stop
-	;;
-  restart|reload)
-	stop
-	start
-	RETVAL=$?
-	;;
-  condrestart)
-	if [ -f /var/lock/subsys/dhcrelay ]; then
-	    stop
-	    start
-	    RETVAL=$?
-	fi
-	;;
-  status)
-	status dhcrelay
-	RETVAL=$?
-	;;
-  *)
-	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
-	exit 1
+    start)
+        start
+        ;;
+    stop)
+        stop
+        ;;
+    reload)
+        RETVAL=3
+        ;;
+    restart)
+        stop
+        start
+        ;;
+    condrestart)
+        if [ -f $lockfile ]; then
+            stop
+            start
+        fi
+        ;;
+    status)
+        status $prog
+        RETVAL=$?
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+        RETVAL=3
+        ;;
 esac
 
 exit $RETVAL



From fedora-cvs-commits at redhat.com  Thu Apr 26 19:54:28 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 15:54:28 -0400
Subject: rpms/kernel-xen-2.6/devel .cvsignore, 1.3, 1.3.4.1 kernel-xen.spec,
	1.18, 1.18.4.1 sources, 1.3, 1.3.4.1 xen-compile-fix.patch,
	1.1, 1.1.4.1 xen-version-strings.patch, 1.1, 1.1.4.1
Message-ID: <200704261954.l3QJsSs2004062@cvs.devel.redhat.com>

Author: ehabkost

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

Modified Files:
      Tag: private-ehabkost-xen-3_0_5-branch
	.cvsignore kernel-xen.spec sources xen-compile-fix.patch 
	xen-version-strings.patch 
Log Message:
Updating xen HV to 3.0.5-rc3

As requested by danpb




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- .cvsignore	22 Mar 2007 16:01:16 -0000	1.3
+++ .cvsignore	26 Apr 2007 19:54:26 -0000	1.3.4.1
@@ -3,3 +3,4 @@
 xen-3.0.4-13132.tar.bz2
 linux-2.6.20.tar.bz2
 patch-2.6.20.3.bz2
+xen-3.0.5-rc3-14934.tar.bz2


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.18
retrieving revision 1.18.4.1
diff -u -r1.18 -r1.18.4.1
--- kernel-xen.spec	22 Mar 2007 17:44:34 -0000	1.18
+++ kernel-xen.spec	26 Apr 2007 19:54:26 -0000	1.18.4.1
@@ -37,7 +37,7 @@
 %define make_target bzImage
 %define kernel_image x86
 
-%define xen_hv_cset 13132
+%define xen_hv_cset 14934
 %define xen_flags verbose=y crash_debug=y
 %define xen_target vmlinuz
 %define xen_image vmlinuz
@@ -255,7 +255,7 @@
 
 
 Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
-Source1: xen-3.0.4-%{xen_hv_cset}.tar.bz2
+Source1: xen-3.0.5-rc3-%{xen_hv_cset}.tar.bz2
 Source2: Config.mk
 
 Source10: COPYING.modules


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/sources,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- sources	22 Mar 2007 16:01:16 -0000	1.3
+++ sources	26 Apr 2007 19:54:26 -0000	1.3.4.1
@@ -3,3 +3,4 @@
 ec35d2aa26cb452832761ff7ce9c4583  xen-3.0.4-13132.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 30764d4152c727b8ec7b709ab5464ec3  patch-2.6.20.3.bz2
+813405b30fba1ce41fedd5756f08b16b  xen-3.0.5-rc3-14934.tar.bz2

xen-compile-fix.patch:
 hvm.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: xen-compile-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/xen-compile-fix.patch,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- xen-compile-fix.patch	24 Jan 2007 01:28:48 -0000	1.1
+++ xen-compile-fix.patch	26 Apr 2007 19:54:26 -0000	1.1.4.1
@@ -1,6 +1,8 @@
---- xen/include/asm-x86/hvm/hvm.h.orig	2007-01-23 02:19:41.000000000 +0100
-+++ xen/include/asm-x86/hvm/hvm.h	2007-01-23 02:18:29.000000000 +0100
-@@ -170,7 +170,7 @@ hvm_long_mode_enabled(struct vcpu *v)
+Index: xen/include/asm-x86/hvm/hvm.h
+===================================================================
+--- xen.orig/include/asm-x86/hvm/hvm.h
++++ xen/include/asm-x86/hvm/hvm.h
+@@ -183,7 +183,7 @@ hvm_long_mode_enabled(struct vcpu *v)
      return hvm_funcs.long_mode_enabled(v);
  }
  #else

xen-version-strings.patch:
 Makefile |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

Index: xen-version-strings.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/xen-version-strings.patch,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- xen-version-strings.patch	24 Jan 2007 01:28:48 -0000	1.1
+++ xen-version-strings.patch	26 Apr 2007 19:54:26 -0000	1.1.4.1
@@ -1,11 +1,13 @@
---- xen/Makefile.orig	2007-01-14 22:08:05.000000000 +0100
-+++ xen/Makefile	2007-01-23 01:13:35.000000000 +0100
+Index: xen/Makefile
+===================================================================
+--- xen.orig/Makefile
++++ xen/Makefile
 @@ -2,7 +2,11 @@
  # All other places this is stored (eg. compile.h) should be autogenerated.
  export XEN_VERSION       = 3
  export XEN_SUBVERSION    = 0
--export XEN_EXTRAVERSION ?= .4-1$(XEN_VENDORVERSION)
-+export XEN_BASEVERSION  ?= .4-1$(XEN_VENDORVERSION)
+-export XEN_EXTRAVERSION ?= .5-rc3$(XEN_VENDORVERSION)
++export XEN_BASEVERSION  ?= .5-rc3$(XEN_VENDORVERSION)
 +export XEN_BUILDER      ?= 
 +export XEN_BUILDVERSION ?= 
 +export XEN_EXTRAVERSION ?= $(XEN_BASEVERSION)$(XEN_BUILDVERSION)
@@ -13,7 +15,7 @@
  export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
  -include xen-version
  
-@@ -108,8 +112,8 @@ include/xen/compile.h: include/xen/compi
+@@ -114,7 +118,7 @@ include/xen/compile.h: include/xen/compi
  	    -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \
  	    -e 's!@@changeset@@!$(shell ((hg parents --template "{date|date} {rev}:{node|short}" >/dev/null && hg parents --template "{date|date} {rev}:{node|short}") || echo "unavailable") 2>/dev/null)!g' \
  	    < include/xen/compile.h.in > $@.new



From fedora-cvs-commits at redhat.com  Thu Apr 26 20:31:58 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 16:31:58 -0400
Subject: rpms/kernel-xen-2.6/devel kernel-xen.spec, 1.18.4.1,
	1.18.4.2 sources, 1.3.4.1, 1.3.4.2
Message-ID: <200704262031.l3QKVwva018962@cvs.devel.redhat.com>

Author: ehabkost

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

Modified Files:
      Tag: private-ehabkost-xen-3_0_5-branch
	kernel-xen.spec sources 
Log Message:
Updating the xen tarball to include everything, not only the 'xen' directory

The only parts removed from the tarball were the 'tools' and 'linux-*'
directories.

This will avoid needing to do some tarball-stripping magic every time the HV
is updated, because including a tarball with only the 'xen' directory
contents isn't enough.




Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.18.4.1
retrieving revision 1.18.4.2
diff -u -r1.18.4.1 -r1.18.4.2
--- kernel-xen.spec	26 Apr 2007 19:54:26 -0000	1.18.4.1
+++ kernel-xen.spec	26 Apr 2007 20:31:56 -0000	1.18.4.2
@@ -1093,7 +1093,7 @@
   rm -rf xen
 fi
 %setup -D -T -q -n kernel-%{version} -a1
-cd xen
+cd xen-3.0.5-rc3-%{xen_hv_cset}/xen
 # Any necessary hypervisor patches go here
 %patch20000 -p1
 %patch20001 -p1
@@ -1101,6 +1101,7 @@
 # Update the Makefile version strings
 sed -i -e 's/\(^export XEN_BUILDER.*$\)/\1'%{?dist}'/' Makefile
 sed -i -e 's/\(^export XEN_BUILDVERSION.*$\)/\1'-%{PACKAGE_RELEASE}'/' Makefile
+cd ../..
 %endif
 
 
@@ -1321,7 +1322,7 @@
 
 %if %{includexen}
 %if %{buildxen}
-  cd xen
+  cd xen-3.0.5-rc3-%{xen_hv_cset}/xen
   mkdir -p $RPM_BUILD_ROOT/%{image_install_path} $RPM_BUILD_ROOT/boot
   make %{?_smp_mflags} %{xen_flags}
   install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL}
@@ -1333,6 +1334,7 @@
   # 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
+  cd ..
 %endif
 %endif
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/sources,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- sources	26 Apr 2007 19:54:26 -0000	1.3.4.1
+++ sources	26 Apr 2007 20:31:56 -0000	1.3.4.2
@@ -3,4 +3,4 @@
 ec35d2aa26cb452832761ff7ce9c4583  xen-3.0.4-13132.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 30764d4152c727b8ec7b709ab5464ec3  patch-2.6.20.3.bz2
-813405b30fba1ce41fedd5756f08b16b  xen-3.0.5-rc3-14934.tar.bz2
+f8922a14df26193321284bbf90feacac  xen-3.0.5-rc3-14934.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Apr 26 23:05:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 19:05:21 -0400
Subject: rpms/m2crypto/devel m2crypto-0.17-xmlrpc.patch, NONE,
	1.1 m2crypto.spec, 1.32, 1.33
Message-ID: <200704262305.l3QN5LP5001155@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/m2crypto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv983

Modified Files:
	m2crypto.spec 
Added Files:
	m2crypto-0.17-xmlrpc.patch 
Log Message:
* Fri Apr 27 2007 Miloslav Trmac <mitr at redhat.com> - 0.17-2
- Make m2xmlrpclib work with Python 2.5
  Resolves: #237902


m2crypto-0.17-xmlrpc.patch:
 m2xmlrpclib.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE m2crypto-0.17-xmlrpc.patch ---
--- /usr/lib/python2.4/site-packages/M2Crypto/m2xmlrpclib.py	2006-03-20 20:26:28.000000000 +0100
+++ m2crypto-0.17/M2Crypto/m2xmlrpclib.py	2007-04-27 00:12:51.000000000 +0200
@@ -14,7 +14,9 @@
 
     user_agent = "M2Crypto_XMLRPC/%s - %s" % (__version__, Transport.user_agent)
 
-    def __init__(self, ssl_context=None):
+    def __init__(self, ssl_context=None, *args, **kw):
+	if getattr(Transport, '__init__', None) is not None:
+		Transport.__init__(self, *args, **kw)
         if ssl_context is None:
             self.ssl_ctx=SSL.Context('sslv23')
         else:


Index: m2crypto.spec
===================================================================
RCS file: /cvs/dist/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- m2crypto.spec	17 Jan 2007 15:19:19 -0000	1.32
+++ m2crypto.spec	26 Apr 2007 23:05:18 -0000	1.33
@@ -3,10 +3,11 @@
 Summary: Support for using OpenSSL in python scripts
 Name: m2crypto
 Version: 0.17
-Release: 1
+Release: 2
 Source0: http://wiki.osafoundation.org/pub/Projects/MeTooCrypto/m2crypto-%{version}.tar.gz
 Patch0: m2crypto-0.17-timeouts.patch
 Patch1: m2crypto-0.17-Py_ssize_t.patch
+Patch2: m2crypto-0.17-xmlrpc.patch
 License: BSDish
 Group: System Environment/Libraries
 URL: http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto
@@ -22,6 +23,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1 -b .Py_ssize_t
+%patch2 -p1 -b .xmlrpc
 
 # Red Hat opensslconf.h #includes an architecture-specific file, but SWIG
 # doesn't follow the #include.
@@ -71,6 +73,10 @@
 %{python_sitearch}/M2Crypto
 
 %changelog
+* Fri Apr 27 2007 Miloslav Trmac <mitr at redhat.com> - 0.17-2
+- Make m2xmlrpclib work with Python 2.5
+  Resolves: #237902
+
 * Wed Jan 17 2007 Miloslav Trmac <mitr at redhat.com> - 0.17-1
 - Update to m2crypto-0.17
 - Update for Python 2.5



From fedora-cvs-commits at redhat.com  Fri Apr 27 00:03:34 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 26 Apr 2007 20:03:34 -0400
Subject: rpms/anthy/devel anthy.spec,1.38,1.39
Message-ID: <200704270003.l3R03YWp021867@cvs.devel.redhat.com>

Author: tagoh

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

Modified Files:
	anthy.spec 
Log Message:
* Fri Apr 27 2007 Akira TAGOH <tagoh at redhat.com> - 8706-2
- Fix wrong Provides line. (#237987)


Index: anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/anthy/devel/anthy.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- anthy.spec	9 Mar 2007 05:01:44 -0000	1.38
+++ anthy.spec	27 Apr 2007 00:03:31 -0000	1.39
@@ -3,7 +3,7 @@
 
 Name:		anthy
 Version:	8706
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 URL:		http://sourceforge.jp/projects/anthy/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,7 +19,7 @@
 Summary:	Japanese character set input library
 Group:		System Environment/Libraries
 Obsoletes:	anthy-libs
-Provides:	anthy-libs = %{name}-%{version}
+Provides:	anthy-libs = %{version}
 %description
 Anthy provides the library to input Japanese on the applications, such as
 X applications and emacs. and the user dictionaries and the users information
@@ -127,6 +127,9 @@
 %endif
 
 %changelog
+* Fri Apr 27 2007 Akira TAGOH <tagoh at redhat.com> - 8706-2
+- Fix wrong Provides line. (#237987)
+
 * Fri Mar  9 2007 Akira TAGOH <tagoh at redhat.com> - 8706-1
 - New upstream release.
 



From fedora-cvs-commits at redhat.com  Fri Apr 27 07:15:29 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 03:15:29 -0400
Subject: rpms/pango/devel .cvsignore, 1.54, 1.55 pango.spec, 1.112,
	1.113 sources, 1.54, 1.55
Message-ID: <200704270715.l3R7FTAA010479@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10398

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
* Fri Apr 10 2007 Behdad Esfahbod <besfahbo at redhat.com> - 1.16.4-1
- Update to 1.16.4.
- Enable doc rebuilding to get cross-references right.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	10 Apr 2007 16:08:11 -0000	1.54
+++ .cvsignore	27 Apr 2007 07:15:27 -0000	1.55
@@ -1 +1 @@
-pango-1.16.2.tar.bz2
+pango-1.16.4.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- pango.spec	10 Apr 2007 16:08:11 -0000	1.112
+++ pango.spec	27 Apr 2007 07:15:27 -0000	1.113
@@ -8,7 +8,7 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.16.2
+Version: 1.16.4
 Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
@@ -34,6 +34,7 @@
 BuildRequires: libXt-devel
 BuildRequires: cairo-devel >= %{cairo_version}
 BuildRequires: libthai-devel >= %{libthai_version}
+BuildRequires: gtk-doc
 Obsoletes: pango-gtkbeta, fribidi-gtkbeta
 
 # Look for pango.modules in an arch-specific directory
@@ -72,7 +73,7 @@
 
 %build
 
-%configure --disable-gtk-doc --with-included-modules=basic-fc
+%configure --enable-gtk-doc --enable-doc-cross-references --with-included-modules=basic-fc
 make
 
 %install
@@ -219,6 +220,10 @@
 
 
 %changelog
+* Fri Apr 10 2007 Behdad Esfahbod <besfahbo at redhat.com> - 1.16.4-1
+- Update to 1.16.4.
+- Enable doc rebuilding to get cross-references right.
+
 * Tue Apr 10 2007 Behdad Esfahbod <besfahbo at redhat.com> - 1.16.2-1
 - Update to 1.16.2.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	10 Apr 2007 16:08:11 -0000	1.54
+++ sources	27 Apr 2007 07:15:27 -0000	1.55
@@ -1 +1 @@
-8ea80c1d747a2844d7d096bfd347c2dc  pango-1.16.2.tar.bz2
+025e2ac5e40cac163aae4653aeef559c  pango-1.16.4.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Apr 27 07:17:20 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 03:17:20 -0400
Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec, 1.83,
	1.84 gnome-power-manager-2.15.4-nodefaultbeep.patch, 1.1, NONE
Message-ID: <200704270717.l3R7HKV1011823@cvs.devel.redhat.com>

Author: davidz

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11726

Modified Files:
	gnome-power-manager.spec 
Removed Files:
	gnome-power-manager-2.15.4-nodefaultbeep.patch 
Log Message:
* Fri Apr 27 2007 David Zeuthen <davidz at redhat.com> - 2.18.2-2
- Remove broken nodefaultbeep patch as it was wrongly applied to disable
  battery recall warnings - gotta love patch(1) (#238087)




Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- gnome-power-manager.spec	13 Apr 2007 22:03:25 -0000	1.83
+++ gnome-power-manager.spec	27 Apr 2007 07:17:18 -0000	1.84
@@ -5,12 +5,11 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.18.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/System
 Source: http://ftp.gnome.org/pub/gnome/sources/gnome-power-manager/2.18/gnome-power-manager-%{version}.tar.bz2
-Patch0: gnome-power-manager-2.15.4-nodefaultbeep.patch
-Patch1: gnome-power-manager-2.17.92-dpms-query-less.patch
+Patch0: gnome-power-manager-2.17.92-dpms-query-less.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gnome-power.sourceforge.net/
 BuildPrereq: libgnomeui-devel
@@ -45,8 +44,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .nodefaultbeep
-%patch1 -p1 -b .dpms-query
+%patch0 -p1 -b .dpms-query
 
 %build
 %configure \
@@ -123,6 +121,10 @@
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* Fri Apr 27 2007 David Zeuthen <davidz at redhat.com> - 2.18.2-2
+- Remove broken nodefaultbeep patch as it was wrongly applied to disable
+  battery recall warnings - gotta love patch(1) (#238087)
+
 * Fri Apr 13 2007 Ray Strode <rstrode at redhat.com> - 2.18.2-1
 - Update to 2.18.2
 


--- gnome-power-manager-2.15.4-nodefaultbeep.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 27 07:33:13 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 03:33:13 -0400
Subject: rpms/vte/devel .cvsignore, 1.56, 1.57 sources, 1.56, 1.57 vte.spec,
	1.109, 1.110
Message-ID: <200704270733.l3R7XDmY023132@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/vte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22933

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
* Tue Apr 27 2007 Behdad Esfahbod <besfahbo at redhat.com> 0.16.3-1
- Update to 0.16.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	10 Apr 2007 16:03:49 -0000	1.56
+++ .cvsignore	27 Apr 2007 07:33:11 -0000	1.57
@@ -1 +1 @@
-vte-0.16.1.tar.bz2
+vte-0.16.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	10 Apr 2007 16:03:49 -0000	1.56
+++ sources	27 Apr 2007 07:33:11 -0000	1.57
@@ -1 +1 @@
-ceec938666899c1e67e1ce4dd358c753  vte-0.16.1.tar.bz2
+a35cb0694159a9782fe43f49215c1bf5  vte-0.16.3.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- vte.spec	12 Apr 2007 01:39:19 -0000	1.109
+++ vte.spec	27 Apr 2007 07:33:11 -0000	1.110
@@ -1,5 +1,5 @@
 Name: vte
-Version: 0.16.1
+Version: 0.16.3
 Release: 1%{?dist}
 Summary: A terminal emulator
 License: LGPL
@@ -101,6 +101,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr 27 2007 Behdad Esfahbod <besfahbo at redhat.com> 0.16.3-1
+- Update to 0.16.3
+
 * Tue Apr 10 2007 Behdad Esfahbod <besfahbo at redhat.com> 0.16.1-1
 - Update to 0.16.1
 - Drop all patches.  All upstreamed.



From fedora-cvs-commits at redhat.com  Fri Apr 27 08:27:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 04:27:49 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.2.0.ooo53397.linkopt.patch, 1.10, 1.11
Message-ID: <200704270827.l3R8Rn2b022575@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	openoffice.org-2.2.0.ooo53397.linkopt.patch 
Log Message:
fix up link line

openoffice.org-2.2.0.ooo53397.linkopt.patch:
 OOF680_m14/solenv/bin/mklinkscript.pl                            |   48 
 OOF680_m14/sw/util/symbolorder                                   | 5110 ++
 UnoControls/prj/build.lst                                        |    2 
 UnoControls/util/makefile.mk                                     |    3 
 automation/prj/build.lst                                         |    2 
 automation/util/makefile.mk                                      |   52 
 avmedia/source/gstreamer/makefile.mk                             |    2 
 avmedia/source/xine/makefile.mk                                  |    2 
 avmedia/util/makefile.mk                                         |    2 
 basctl/util/makefile.mk                                          |   13 
 basegfx/prj/d.lst                                                |    2 
 basegfx/util/makefile.mk                                         |    2 
 basic/prj/d.lst                                                  |    2 
 basic/source/uno/sbservices.cxx                                  |   13 
 basic/util/makefile.mk                                           |    2 
 bf_forms/util/makefile.mk                                        |    0 
 bf_goodies/util/makefile.mk                                      |    0 
 bf_linguistic/source/makefile.mk                                 |    0 
 bf_offmgr/util/makefile.mk                                       |    0 
 bf_sc/util/makefile.mk                                           |    0 
 bf_sch/util/makefile.mk                                          |    0 
 bf_sd/util/makefile.mk                                           |    0 
 bf_starmath/util/makefile.mk                                     |    0 
 bf_svx/util/makefile.mk                                          |    0 
 bf_sw/util/makefile.mk                                           |    0 
 bf_xmloff/util/makefile.mk                                       |    0 
 binfilter/bf_forms/util/makefile.mk                              |   11 
 binfilter/bf_goodies/util/makefile.mk                            |    3 
 binfilter/bf_linguistic/source/makefile.mk                       |    9 
 binfilter/bf_offmgr/util/makefile.mk                             |   10 
 binfilter/bf_sc/util/makefile.mk                                 |   14 
 binfilter/bf_sch/util/makefile.mk                                |    9 
 binfilter/bf_sd/util/makefile.mk                                 |   14 
 binfilter/bf_starmath/util/makefile.mk                           |   10 
 binfilter/bf_svx/util/makefile.mk                                |   16 
 binfilter/bf_sw/util/makefile.mk                                 |   13 
 binfilter/bf_xmloff/util/makefile.mk                             |   13 
 binfilter/binfilterdetect/source/makefile.mk                     |    8 
 binfilter/filter/source/bf_migrate/makefile.mk                   |    9 
 binfilter/filter/source/bf_offwrp/makefile.mk                    |   14 
 binfilter/inc/bf_sfx2/docfile.hxx                                |    2 
 binfilterdetect/source/makefile.mk                               |    0 
 bmpmaker/makefile.mk                                             |    0 
 bootstrp/addexes2/makefile.mk                                    |    0 
 bootstrp/makefile.mk                                             |    0 
 canvas/prj/build.lst                                             |    2 
 canvas/source/cairo/makefile.mk                                  |    2 
 canvas/source/null/makefile.mk                                   |    2 
 canvas/source/tools/makefile.mk                                  |    2 
 canvas/source/vcl/makefile.mk                                    |    2 
 chart2/source/controller/makefile.mk                             |   15 
 chart2/source/model/makefile.mk                                  |    4 
 chart2/source/tools/makefile.mk                                  |    5 
 chart2/source/view/makefile.mk                                   |   14 
 comphelper/prj/d.lst                                             |    2 
 comphelper/source/misc/facreg.cxx                                |    9 
 comphelper/util/makefile.mk                                      |    2 
 configmgr/prj/d.lst                                              |    2 
 configmgr/source/backendhelper/componentdf.cxx                   |   13 
 configmgr/source/backendhelper/makefile.mk                       |    2 
 configmgr/source/misc/configunoreg.cxx                           |   13 
 configmgr/source/platformbe/componentdefn.cxx                    |   14 
 configmgr/source/platformbe/makefile.mk                          |    2 
 configmgr/util/makefile.mk                                       |   22 
 connectivity/source/cpool/makefile.mk                            |    3 
 connectivity/source/dbtools/makefile.mk                          |    5 
 connectivity/source/drivers/adabas/makefile.mk                   |    3 
 connectivity/source/drivers/calc/makefile.mk                     |    9 
 connectivity/source/drivers/dbase/makefile.mk                    |    8 
 connectivity/source/drivers/evoab/makefile.mk                    |   11 
 connectivity/source/drivers/evoab2/makefile.mk                   |   10 
 connectivity/source/drivers/file/makefile.mk                     |    8 
 connectivity/source/drivers/flat/makefile.mk                     |   11 
 connectivity/source/drivers/hsqldb/makefile.mk                   |    3 
 connectivity/source/drivers/jdbc/makefile.mk                     |    3 
 connectivity/source/drivers/mysql/makefile.mk                    |    4 
 connectivity/source/drivers/odbc/makefile.mk                     |    3 
 connectivity/source/manager/makefile.mk                          |    1 
 dbaccess/source/filter/migration/makefile.mk                     |    7 
 dbaccess/source/filter/xml/makefile.mk                           |   13 
 desktop/prj/build.lst                                            |   16 
 desktop/prj/d.lst                                                |    2 
 desktop/source/app/appinit.cxx                                   |  152 
 desktop/source/app/makefile.mk                                   |   44 
 desktop/source/deployment/gui/makefile.mk                        |   12 
 desktop/source/deployment/makefile.mk                            |    8 
 desktop/source/deployment/misc/makefile.mk                       |    5 
 desktop/source/migration/services/makefile.mk                    |    6 
 desktop/source/offacc/makefile.mk                                |    2 
 desktop/source/pkgchk/makefile.mk                                |   13 
 desktop/source/pkgchk/unopkg/makefile.mk                         |   12 
 desktop/source/so_comp/makefile.mk                               |    8 
 desktop/source/splash/makefile.mk                                |   15 
 desktop/source/splash/services_spl.cxx                           |   12 
 desktop/util/makefile.mk                                         |  148 
 dtrans/prj/build.lst                                             |    2 
 dtrans/prj/d.lst                                                 |    2 
 dtrans/source/X11/X11_service.cxx                                |   11 
 dtrans/source/X11/makefile.mk                                    |   12 
 embeddedobj/source/msole/makefile.mk                             |    7 
 embeddedobj/util/makefile.mk                                     |    2 
 extensions/source/abpilot/makefile.mk                            |   11 
 extensions/source/bibliography/makefile.mk                       |    9 
 extensions/source/dbpilots/makefile.mk                           |    7 
 extensions/source/nsplugin/source/makefile.mk                    |    9 
 extensions/source/packer/makefile.mk                             |    2 
 extensions/source/plugin/unx/makefile.mk                         |    3 
 extensions/source/plugin/util/makefile.mk                        |   10 
 extensions/source/preload/makefile.mk                            |    7 
 extensions/source/propctrlr/makefile.mk                          |   10 
 extensions/source/resource/makefile.mk                           |    9 
 extensions/source/scanner/makefile.mk                            |   17 
 extensions/source/svg/makefile.mk                                |    4 
 extensions/source/update/ui/makefile.mk                          |    6 
 extensions/source/xmlextract/makefile.mk                         |    4 
 fileaccess/prj/build.lst                                         |    2 
 fileaccess/prj/d.lst                                             |    2 
 fileaccess/source/FileAccess.cxx                                 |   10 
 fileaccess/source/makefile.mk                                    |   18 
 filter/source/bf_migrate/makefile.mk                             |    0 
 filter/source/bf_offwrp/makefile.mk                              |    0 
 filter/source/config/cache/makefile.mk                           |    7 
 filter/source/filtertracer/makefile.mk                           |    5 
 filter/source/flash/makefile.mk                                  |    7 
 filter/source/msfilter/powerpoint/makefile.mk                    |    3 
 filter/source/pdf/makefile.mk                                    |    9 
 filter/source/svg/makefile.mk                                    |    7 
 filter/source/xmlfilteradaptor/makefile.mk                       |    4 
 filter/source/xmlfilterdetect/makefile.mk                        |    3 
 filter/source/xsltdialog/makefile.mk                             |   11 
 filter/source/xsltfilter/makefile.mk                             |    6 
 fpicker/source/generic/makefile.mk                               |    3 
 fpicker/source/office/makefile.mk                                |    9 
 fpicker/source/unx/gnome/makefile.mk                             |    4 
 framework/inc/macros/registration.hxx                            |   20 
 framework/prj/d.lst                                              |    2 
 framework/source/register/register3rdcomponents.cxx              |   10 
 framework/source/register/registerservices.cxx                   |   10 
 framework/source/register/registertemp.cxx                       |   10 
 framework/util/makefile.mk                                       |   61 
 goodies/prj/d.lst                                                |    2 
 goodies/source/filter.vcl/egif/makefile.mk                       |    2 
 goodies/source/filter.vcl/eos2met/makefile.mk                    |    2 
 goodies/source/filter.vcl/epbm/makefile.mk                       |    2 
 goodies/source/filter.vcl/epgm/makefile.mk                       |    2 
 goodies/source/filter.vcl/epict/makefile.mk                      |    2 
 goodies/source/filter.vcl/eppm/makefile.mk                       |    2 
 goodies/source/filter.vcl/eps/makefile.mk                        |    2 
 goodies/source/filter.vcl/eras/makefile.mk                       |    2 
 goodies/source/filter.vcl/etiff/makefile.mk                      |    2 
 goodies/source/filter.vcl/expm/makefile.mk                       |    2 
 goodies/source/filter.vcl/icgm/makefile.mk                       |    5 
 goodies/source/filter.vcl/idxf/makefile.mk                       |    2 
 goodies/source/filter.vcl/ieps/makefile.mk                       |    2 
 goodies/source/filter.vcl/ios2met/makefile.mk                    |    2 
 goodies/source/filter.vcl/ipbm/makefile.mk                       |    2 
 goodies/source/filter.vcl/ipcd/makefile.mk                       |    2 
 goodies/source/filter.vcl/ipcx/makefile.mk                       |    2 
 goodies/source/filter.vcl/ipict/makefile.mk                      |    2 
 goodies/source/filter.vcl/ipsd/makefile.mk                       |    2 
 goodies/source/filter.vcl/iras/makefile.mk                       |    2 
 goodies/source/filter.vcl/itga/makefile.mk                       |    2 
 goodies/source/filter.vcl/itiff/makefile.mk                      |    2 
 goodies/source/inv/makefile.mk                                   |   17 
 goodies/source/unographic/graphicuno.cxx                         |   13 
 goodies/util/makefile.mk                                         |    2 
 i18npool/prj/d.lst                                               |    2 
 i18npool/source/isolang/makefile.mk                              |    2 
 i18npool/source/registerservices/registerservices.cxx            |    9 
 i18npool/util/makefile.mk                                        |    2 
 i18nutil/prj/d.lst                                               |    3 
 i18nutil/source/utility/makefile.mk                              |   15 
 idl/util/makefile.mk                                             |    5 
 inc/bf_sfx2/docfile.hxx                                          |    0 
 inc/insdlg.hxx                                                   |    0 
 inc/macros/registration.hxx                                      |    0 
 inc/transbnd.hxx                                                 |    0 
 instsetoo_native/util/openoffice.lst                             |    6 
 lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk |    8 
 lingucomponent/source/spellcheck/spell/makefile.mk               |    8 
 lingucomponent/source/thesaurus/libnth/makefile.mk               |    8 
 linguistic/source/makefile.mk                                    |   12 
 msole/makefile.mk                                                |    0 
 openoffice.org/cppcanvas/util/makefile.mk                        |    2 
 openoffice.org/dbaccess/util/makefile.mk                         |   29 
 openoffice.org/desktop/util/symbolorder                          |19993 ++++++++++
 openoffice.org/forms/util/makefile.mk                            |   13 
 openoffice.org/libsofficecheckpoint1/makefile.mk                 |   36 
 openoffice.org/libsofficecheckpoint1/prj/build.lst               |    3 
 openoffice.org/libsofficecheckpoint1/prj/d.lst                   |    1 
 package/prj/build.lst                                            |    2 
 package/prj/d.lst                                                |    2 
 package/source/manifest/UnoRegister.cxx                          |   10 
 package/source/xstor/makefile.mk                                 |    4 
 package/util/makefile.mk                                         |    9 
 padmin/source/makefile.mk                                        |   11 
 prj/build.lst                                                    |    2 
 prj/d.lst                                                        |    0 
 psprint/prj/d.lst                                                |    2 
 psprint/util/makefile.mk                                         |    2 
 regexp/source/makefile.mk                                        |    2 
 rsc/prj/build.lst                                                |    2 
 rsc/source/prj/makefile.mk                                       |    6 
 sc/util/makefile.mk                                              |   36 
 scaddins/source/analysis/makefile.mk                             |    4 
 scaddins/source/datefunc/makefile.mk                             |    4 
 sch/util/makefile.mk                                             |   18 
 scp2/source/gnome/file_gnome.scp                                 |   18 
 scp2/source/gnome/module_gnome.scp                               |    2 
 scp2/source/ooo/file_library_ooo.scp                             |  245 
 scp2/source/ooo/module_hidden_ooo.scp                            |   37 
 scripting/source/basprov/makefile.mk                             |    8 
 scripting/source/dlgprov/makefile.mk                             |    5 
 scripting/source/protocolhandler/makefile.mk                     |    4 
 scripting/source/stringresource/makefile.mk                      |    2 
 scripting/source/vbaevents/makefile.mk                           |    5 
 scripting/util/makefile.mk                                       |    4 
 sd/prj/build.lst                                                 |    2 
 sd/source/filter/eppt/makefile.mk                                |   12 
 sd/util/makefile.mk                                              |   45 
 sfx2/prj/build.lst                                               |    2 
 sfx2/prj/d.lst                                                   |    3 
 sfx2/source/appl/appuno.cxx                                      |   11 
 sfx2/util/makefile.mk                                            |   70 
 shell/prj/d.lst                                                  |    2 
 shell/source/backends/desktopbe/desktopbecdef.cxx                |   13 
 shell/source/backends/desktopbe/makefile.mk                      |   12 
 shell/source/backends/gconfbe/gconfbecdef.cxx                    |   12 
 shell/source/backends/gconfbe/makefile.mk                        |   12 
 shell/source/backends/localebe/localebecdef.cxx                  |   12 
 shell/source/backends/localebe/makefile.mk                       |   12 
 shell/source/unix/sysshell/makefile.mk                           |    4 
 sj2/prj/d.lst                                                    |    2 
 sj2/util/makefile.mk                                             |    6 
 slideshow/util/makefile.mk                                       |    9 
 so3/inc/insdlg.hxx                                               |    7 
 so3/inc/transbnd.hxx                                             |   12 
 so3/prj/d.lst                                                    |    2 
 so3/source/dialog/insdlg.cxx                                     |    4 
 so3/source/inplace/outplace.cxx                                  |    1 
 so3/source/persist/transbnd.cxx                                  |    4 
 so3/util/makefile.mk                                             |    3 
 solenv/bin/modules/installer/configuration.pm                    |    4 
 solenv/bin/modules/installer/profiles.pm                         |    4 
 sot/prj/d.lst                                                    |    2 
 sot/source/unoolestorage/register.cxx                            |    9 
 sot/util/makefile.mk                                             |    2 
 source/FileAccess.cxx                                            |    0 
 source/X11/X11_service.cxx                                       |    0 
 source/X11/makefile.mk                                           |    0 
 source/abpilot/makefile.mk                                       |    0 
 source/analysis/makefile.mk                                      |    0 
 source/app/appinit.cxx                                           |    0 
 source/app/makefile.mk                                           |    0 
 source/app/svapp.cxx                                             |    0 
 source/appl/appuno.cxx                                           |    0 
 source/awt/vclxtoolkit.cxx                                       |    0 
 source/awt/vclxwindow.cxx                                        |    0 
 source/backendhelper/componentdf.cxx                             |    0 
 source/backendhelper/makefile.mk                                 |    0 
 source/backends/desktopbe/desktopbecdef.cxx                      |    0 
 source/backends/desktopbe/makefile.mk                            |    0 
 source/backends/gconfbe/gconfbecdef.cxx                          |    0 
 source/backends/gconfbe/makefile.mk                              |    0 
 source/backends/localebe/localebecdef.cxx                        |    0 
 source/backends/localebe/makefile.mk                             |    0 
 source/basprov/makefile.mk                                       |    0 
 source/bibliography/makefile.mk                                  |    0 
 source/cairo/makefile.mk                                         |    0 
 source/components/factory.cxx                                    |    0 
 source/config/cache/makefile.mk                                  |    0 
 source/controller/makefile.mk                                    |    0 
 source/core/facreg.cxx                                           |    0 
 source/core/makefile.mk                                          |    0 
 source/core/ucbserv.cxx                                          |    0 
 source/cpool/makefile.mk                                         |    0 
 source/datefunc/makefile.mk                                      |    0 
 source/dbpilots/makefile.mk                                      |    0 
 source/dbtools/makefile.mk                                       |    0 
 source/deployment/gui/makefile.mk                                |    0 
 source/deployment/makefile.mk                                    |    0 
 source/deployment/misc/makefile.mk                               |    0 
 source/dialog/insdlg.cxx                                         |    0 
 source/dlgprov/makefile.mk                                       |    0 
 source/drivers/adabas/makefile.mk                                |    0 
 source/drivers/calc/makefile.mk                                  |    0 
 source/drivers/dbase/makefile.mk                                 |    0 
 source/drivers/evoab/makefile.mk                                 |    0 
 source/drivers/evoab2/makefile.mk                                |    0 
 source/drivers/file/makefile.mk                                  |    0 
 source/drivers/flat/makefile.mk                                  |    0 
 source/drivers/hsqldb/makefile.mk                                |    0 
 source/drivers/jdbc/makefile.mk                                  |    0 
 source/drivers/mysql/makefile.mk                                 |    0 
 source/drivers/odbc/makefile.mk                                  |    0 
 source/filter.vcl/egif/makefile.mk                               |    0 
 source/filter.vcl/eos2met/makefile.mk                            |    0 
 source/filter.vcl/epbm/makefile.mk                               |    0 
 source/filter.vcl/epgm/makefile.mk                               |    0 
 source/filter.vcl/epict/makefile.mk                              |    0 
 source/filter.vcl/eppm/makefile.mk                               |    0 
 source/filter.vcl/eps/makefile.mk                                |    0 
 source/filter.vcl/eras/makefile.mk                               |    0 
 source/filter.vcl/etiff/makefile.mk                              |    0 
 source/filter.vcl/expm/makefile.mk                               |    0 
 source/filter.vcl/icgm/makefile.mk                               |    0 
 source/filter.vcl/idxf/makefile.mk                               |    0 
 source/filter.vcl/ieps/makefile.mk                               |    0 
 source/filter.vcl/ios2met/makefile.mk                            |    0 
 source/filter.vcl/ipbm/makefile.mk                               |    0 
 source/filter.vcl/ipcd/makefile.mk                               |    0 
 source/filter.vcl/ipcx/makefile.mk                               |    0 
 source/filter.vcl/ipict/makefile.mk                              |    0 
 source/filter.vcl/ipsd/makefile.mk                               |    0 
 source/filter.vcl/iras/makefile.mk                               |    0 
 source/filter.vcl/itga/makefile.mk                               |    0 
 source/filter.vcl/itiff/makefile.mk                              |    0 
 source/filter/eppt/makefile.mk                                   |    0 
 source/filter/migration/makefile.mk                              |    0 
 source/filter/xml/makefile.mk                                    |    0 
 source/filtertracer/makefile.mk                                  |    0 
 source/flash/makefile.mk                                         |    0 
 source/fsstor/fsfactory.cxx                                      |    0 
 source/fsstor/fsstorage.cxx                                      |    0 
 source/fsstor/makefile.mk                                        |    0 
 source/generic/makefile.mk                                       |    0 
 source/gengal/makefile.mk                                        |    0 
 source/gnome/file_gnome.scp                                      |    0 
 source/gnome/module_gnome.scp                                    |    0 
 source/hatchwindow/makefile.mk                                   |    0 
 source/helper/registerservices.cxx                               |    0 
 source/helpprovider/makefile.mk                                  |    0 
 source/hyphenator/altlinuxhyph/hyphen/makefile.mk                |    0 
 source/inplace/outplace.cxx                                      |    0 
 source/inv/makefile.mk                                           |    0 
 source/isolang/makefile.mk                                       |    0 
 source/makefile.mk                                               |    0 
 source/manager/makefile.mk                                       |    0 
 source/manifest/UnoRegister.cxx                                  |    0 
 source/migration/services/makefile.mk                            |    0 
 source/misc/configunoreg.cxx                                     |    0 
 source/misc/facreg.cxx                                           |    0 
 source/misc/unoservices.cxx                                      |    0 
 source/model/makefile.mk                                         |    0 
 source/msfilter/powerpoint/makefile.mk                           |    0 
 source/nsplugin/source/makefile.mk                               |    0 
 source/null/makefile.mk                                          |    0 
 source/offacc/makefile.mk                                        |    0 
 source/office/makefile.mk                                        |    0 
 source/ooo/file_library_ooo.scp                                  |    0 
 source/ooo/module_hidden_ooo.scp                                 |    0 
 source/packer/makefile.mk                                        |    0 
 source/passwordcontainer/makefile.mk                             |    0 
 source/pdf/makefile.mk                                           |    0 
 source/persist/transbnd.cxx                                      |    0 
 source/pkgchk/makefile.mk                                        |    0 
 source/pkgchk/unopkg/makefile.mk                                 |    0 
 source/platformbe/componentdefn.cxx                              |    0 
 source/platformbe/makefile.mk                                    |    0 
 source/plugin/unx/makefile.mk                                    |    0 
 source/plugin/util/makefile.mk                                   |    0 
 source/preload/makefile.mk                                       |    0 
 source/prj/makefile.mk                                           |    0 
 source/productregistration/makefile.mk                           |    0 
 source/propctrlr/makefile.mk                                     |    0 
 source/protocolhandler/makefile.mk                               |    0 
 source/register/register3rdcomponents.cxx                        |    0 
 source/register/registerservices.cxx                             |    0 
 source/register/registertemp.cxx                                 |    0 
 source/registerservices/registerservices.cxx                     |    0 
 source/resource/makefile.mk                                      |    0 
 source/scanner/makefile.mk                                       |    0 
 source/service/makefile.mk                                       |    0 
 source/so_comp/makefile.mk                                       |    0 
 source/spellcheck/spell/makefile.mk                              |    0 
 source/splash/makefile.mk                                        |    0 
 source/splash/services_spl.cxx                                   |    0 
 source/stringresource/makefile.mk                                |    0 
 source/svg/makefile.mk                                           |    0 
 source/thesaurus/libnth/makefile.mk                              |    0 
 source/tools/makefile.mk                                         |    0 
 source/transform/makefile.mk                                     |    0 
 source/treeview/makefile.mk                                      |    0 
 source/ucbhelper/xtempfile.cxx                                   |    0 
 source/ucp/expand/makefile.mk                                    |    0 
 source/ucp/file/makefile.mk                                      |    0 
 source/ucp/file/prov.cxx                                         |    0 
 source/ucp/ftp/makefile.mk                                       |    0 
 source/ucp/gvfs/makefile.mk                                      |    0 
 source/ucp/gvfs/provider.cxx                                     |    0 
 source/ucp/hierarchy/makefile.mk                                 |    0 
 source/ucp/package/makefile.mk                                   |    0 
 source/ucp/tdoc/makefile.mk                                      |    0 
 source/ucp/webdav/makefile.mk                                    |    0 
 source/unix/sysshell/makefile.mk                                 |    0 
 source/uno/registerservices.cxx                                  |    0 
 source/uno/sbservices.cxx                                        |    0 
 source/unodialogs/textconversiondlgs/makefile.mk                 |    0 
 source/unographic/graphicuno.cxx                                 |    0 
 source/unoolestorage/register.cxx                                |    0 
 source/unx/gnome/makefile.mk                                     |    0 
 source/update/ui/makefile.mk                                     |    0 
 source/utility/makefile.mk                                       |    0 
 source/vcl/makefile.mk                                           |    0 
 source/view/makefile.mk                                          |    0 
 source/xine/makefile.mk                                          |    0 
 source/xmlextract/makefile.mk                                    |    0 
 source/xmlfilteradaptor/makefile.mk                              |    0 
 source/xmlfilterdetect/makefile.mk                               |    0 
 source/xsltdialog/makefile.mk                                    |    0 
 source/xsltfilter/makefile.mk                                    |    0 
 source/xstor/makefile.mk                                         |    0 
 starmath/util/makefile.mk                                        |   19 
 svtools/bmpmaker/makefile.mk                                     |    8 
 svtools/prj/build.lst                                            |    6 
 svtools/prj/d.lst                                                |    3 
 svtools/source/fsstor/fsfactory.cxx                              |   10 
 svtools/source/fsstor/fsstorage.cxx                              |    2 
 svtools/source/fsstor/makefile.mk                                |   16 
 svtools/source/hatchwindow/makefile.mk                           |    4 
 svtools/source/passwordcontainer/makefile.mk                     |    3 
 svtools/source/productregistration/makefile.mk                   |    5 
 svtools/source/uno/registerservices.cxx                          |   10 
 svtools/uno/makefile.mk                                          |    9 
 svtools/util/makefile.mk                                         |  130 
 svx/prj/build.lst                                                |    2 
 svx/source/gengal/makefile.mk                                    |   14 
 svx/source/unodialogs/textconversiondlgs/makefile.mk             |    8 
 svx/util/makefile.mk                                             |   33 
 sw/prj/build.lst                                                 |    2 
 sw/util/makefile.mk                                              |   49 
 toolkit/prj/d.lst                                                |    2 
 toolkit/source/awt/vclxtoolkit.cxx                               |   12 
 toolkit/source/awt/vclxwindow.cxx                                |    6 
 toolkit/source/helper/registerservices.cxx                       |    9 
 toolkit/util/makefile.mk                                         |    3 
 tools/bootstrp/addexes2/makefile.mk                              |    2 
 tools/bootstrp/makefile.mk                                       |    6 
 tools/prj/d.lst                                                  |    2 
 tools/util/makefile.mk                                           |    2 
 transex3/source/makefile.mk                                      |   37 
 ucb/prj/build.lst                                                |    2 
 ucb/prj/d.lst                                                    |    2 
 ucb/source/core/makefile.mk                                      |   19 
 ucb/source/core/ucbserv.cxx                                      |   11 
 ucb/source/ucp/expand/makefile.mk                                |    2 
 ucb/source/ucp/file/makefile.mk                                  |    2 
 ucb/source/ucp/file/prov.cxx                                     |   11 
 ucb/source/ucp/ftp/makefile.mk                                   |    2 
 ucb/source/ucp/gvfs/makefile.mk                                  |   17 
 ucb/source/ucp/gvfs/provider.cxx                                 |   11 
 ucb/source/ucp/hierarchy/makefile.mk                             |    5 
 ucb/source/ucp/package/makefile.mk                               |    5 
 ucb/source/ucp/tdoc/makefile.mk                                  |    5 
 ucb/source/ucp/webdav/makefile.mk                                |    3 
 ucbhelper/prj/d.lst                                              |    2 
 ucbhelper/util/makefile.mk                                       |    2 
 uno/makefile.mk                                                  |    0 
 unotools/prj/d.lst                                               |    2 
 unotools/source/ucbhelper/xtempfile.cxx                          |   10 
 unotools/util/makefile.mk                                        |    2 
 unoxml/prj/build.lst                                             |    2 
 unoxml/source/service/makefile.mk                                |    3 
 util/makefile.mk                                                 |    0 
 util/openoffice.lst                                              |    0 
 uui/util/makefile.mk                                             |    7 
 vcl/prj/d.lst                                                    |    3 
 vcl/source/app/svapp.cxx                                         |   13 
 vcl/source/components/factory.cxx                                |   11 
 vcl/util/makefile.mk                                             |   60 
 vcl/workben/makefile.mk                                          |   22 
 vos/util/makefile.mk                                             |   22 
 workben/makefile.mk                                              |    0 
 writerperfect/util/makefile.mk                                   |   10 
 xmlhelp/source/helpprovider/makefile.mk                          |    3 
 xmlhelp/source/treeview/makefile.mk                              |    3 
 xmlhelp/util/makefile.mk                                         |    4 
 xmloff/prj/build.lst                                             |    2 
 xmloff/prj/d.lst                                                 |    3 
 xmloff/source/core/facreg.cxx                                    |    9 
 xmloff/source/transform/makefile.mk                              |   10 
 xmloff/util/makefile.mk                                          |   67 
 xmlscript/prj/d.lst                                              |    2 
 xmlscript/source/misc/unoservices.cxx                            |   10 
 xmlscript/util/makefile.mk                                       |    3 
 xmlsecurity/util/makefile.mk                                     |   21 
 486 files changed, 26262 insertions(+), 2001 deletions(-)

Index: openoffice.org-2.2.0.ooo53397.linkopt.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo53397.linkopt.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openoffice.org-2.2.0.ooo53397.linkopt.patch	13 Apr 2007 07:09:47 -0000	1.10
+++ openoffice.org-2.2.0.ooo53397.linkopt.patch	27 Apr 2007 08:27:47 -0000	1.11
@@ -8372,13 +8372,13 @@
 +# orders functions in that order, assuming that all of the source
 +# files were compiled with the -ffunction-sections flag.
 +
-+if ($#ARGV != 0) {
++if ($#ARGV < 0) {
 +    die("usage: mklinkscript order-file");
 +}
 +
 +$orderFile = $ARGV[0];
 +
-+open(LD, "ld --verbose|") || die("ld: $!");
++open(LD, "ld --verbose $ARGV[1]|") || die("ld: $!");
 +
 +sub PrintOrder {
 +    my $line;
@@ -13624,7 +13624,7 @@
  .INCLUDE :  target.mk
  
 +$(MISC)$/ldorder: symbolorder
-+   mklinkscript.pl symbolorder > $(MISC)$/ldorder
++   mklinkscript.pl symbolorder $(LINKFLAGSSHLGUI) > $(MISC)$/ldorder
 Index: util/makefile.mk
 ===================================================================
 RCS file: /cvs/framework/desktop/util/makefile.mk,v
@@ -13847,7 +13847,7 @@
  	@+-mkdir $(BIN)$/so >& $(NULLDEV)
 +
 +$(MISC)$/ldorder: symbolorder
-+   mklinkscript.pl symbolorder > $(MISC)$/ldorder
++   mklinkscript.pl symbolorder $(LINKFLAGSSHLGUI) > $(MISC)$/ldorder
 --- /dev/null	2007-04-12 12:58:02.161901192 +0100
 +++ openoffice.org/desktop/util/symbolorder	2007-04-11 14:21:18.000000000 +0100
 @@ -0,0 +1,19993 @@



From fedora-cvs-commits at redhat.com  Fri Apr 27 08:45:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 04:45:50 -0400
Subject: rpms/eclipse/FC-6 eclipse-launcher-addplatformtotildeeclipse.patch,
	1.1, 1.2 eclipse.spec, 1.354, 1.355
Message-ID: <200704270845.l3R8joWn013688@cvs.devel.redhat.com>

Author: bkonrath

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

Modified Files:
	eclipse-launcher-addplatformtotildeeclipse.patch eclipse.spec 
Log Message:
* Fri Apr 27 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-3.fc6
- Fix problem in launcher-addplatformtotildeeclipse.patch.
- Resolves: #238107.


eclipse-launcher-addplatformtotildeeclipse.patch:
 eclipse.c        |    2 +
 gtk/eclipseGtk.c |   85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+)

Index: eclipse-launcher-addplatformtotildeeclipse.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse-launcher-addplatformtotildeeclipse.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-launcher-addplatformtotildeeclipse.patch	28 Nov 2006 20:05:45 -0000	1.1
+++ eclipse-launcher-addplatformtotildeeclipse.patch	27 Apr 2007 08:45:47 -0000	1.2
@@ -6,8 +6,8 @@
 retrieving revision 1.27
 diff -u -r1.27 eclipseGtk.c
 --- library/gtk/eclipseGtk.c	27 Mar 2006 18:25:42 -0000	1.27
-+++ library/gtk/eclipseGtk.c	28 Nov 2006 19:50:03 -0000
-@@ -335,3 +335,73 @@
++++ library/gtk/eclipseGtk.c	27 Apr 2007 08:39:06 -0000
+@@ -335,3 +335,88 @@
    	gtk_main_quit();
    	return FALSE;
  }
@@ -20,22 +20,37 @@
 +    gsize old_length;
 +    gchar *old_contents, *new_contents;
 +    GError *error = NULL;
-+	const gchar *site_element = "<site url=\"platform:/base/\" enabled=\"true\" updateable=\"true\" policy=\"USER-EXCLUDE\">\n<feature id=\"org.eclipse.rcp\" version=\"3.2.1.r321_v20060801-clWbqCmjexIWDqg\" url=\"features/org.eclipse.rcp_3.2.1.r321_v20060801-clWbqCmjexIWDqg/\">\n</feature>\n</site>\n\0";
++	const gchar *site_element = "<site url=\"platform:/base/\" enabled=\"true\" updateable=\"true\" policy=\"USER-EXCLUDE\">\n<feature id=\"org.eclipse.rcp\" version=\"3.2.2.r322_v20070104-iwP0VLKnfFC923K\" url=\"features/org.eclipse.rcp_3.2.2.r322_v20070104-iwP0VLKnfFC923K/\">\n</feature>\n</site>\n\0";
 +	
 +	platform_xml = g_strconcat(g_get_home_dir(), "/.eclipse/org.eclipse.platform_3.2.0/configuration/org.eclipse.update/platform.xml", NULL);
-+    touched = g_strconcat(g_get_home_dir(), "/.eclipse/.homedirmodified-fedora", NULL);
++    touched = g_strconcat(g_get_home_dir(), "/.eclipse/.dont-need-to-modify-homedir-fedora", NULL);
 +	
-+	/* If platform.xml doesn't exist, Eclipse has yet to be started 
-+	 * so don't worry about doing anything.  Also, guard against doing 
-+	 * this more than once with a dot file. */
-+	if (!g_file_test(platform_xml, G_FILE_TEST_EXISTS) || \
-+	     g_file_test(touched, G_FILE_TEST_EXISTS)) {
++
++	if (!g_file_test(platform_xml, G_FILE_TEST_EXISTS))
++	{
++		/* If platform.xml doesn't exist, Eclipse has yet to be started.
++	 	 * We don't have worry about doing anything now and in the future 
++	 	 * so add the appropriate file to ~/.eclipse. */
++	   	if (g_file_set_contents(touched, "\0", -1, &error) == FALSE)
++		{
++			g_print("Error touching ~/.eclipse/.dont-need-to-modify-homedir-fedora.");
++			g_print(g_strconcat(error->message, "\n\0", NULL));
++			g_free(error);
++		}
 +	    g_free(platform_xml);
 +	    g_free(touched);
 +		return;
++		
++	} else if (g_file_test(touched, G_FILE_TEST_EXISTS)) {
++		/* touched exists, we don't need to do anything */ 
++		g_free(platform_xml);
++	    g_free(touched);
++		return;
 +	}
-+	
 +
++
++    /* At this point platform_xml exists and touched does not exist */
++    
 +    if (g_file_get_contents (platform_xml,
 +                             &old_contents, &old_length, &error) == FALSE)
 +    {
@@ -68,7 +83,7 @@
 +
 +	if (g_file_set_contents(touched, "\0", -1, &error) == FALSE)
 +	{
-+		g_print("Error touching ~/.eclipse/.homedirmodified-fedora.\
++		g_print("Error touching ~/.eclipse/.dont-need-to-modify-homedir-fedora.\
 +		         You should remove ~/.eclipse before restarting Eclipse:\0");
 +		g_print(g_strconcat(error->message, "\n\0", NULL));
 +		g_free(error);
@@ -87,7 +102,7 @@
 retrieving revision 1.71
 diff -u -r1.71 eclipse.c
 --- library/eclipse.c	25 Apr 2006 14:31:50 -0000	1.71
-+++ library/eclipse.c	28 Nov 2006 19:50:03 -0000
++++ library/eclipse.c	27 Apr 2007 08:39:05 -0000
 @@ -512,6 +512,8 @@
      /* Get the command to start the Java VM. */
      vmCommandArgs = getVMCommand( argc, argv );


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse.spec,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- eclipse.spec	25 Apr 2007 16:53:32 -0000	1.354
+++ eclipse.spec	27 Apr 2007 08:45:47 -0000	1.355
@@ -19,7 +19,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        2%{?dist} 
+Release:        3%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1763,6 +1763,10 @@
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
+* Fri Apr 27 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-3.fc6
+- Fix problem in launcher-addplatformtotildeeclipse.patch.
+- Resolves: #238107.
+
 * Wed Apr 11 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-2.fc6
 - Fix links to system-installed javadocs.
 - Update package-build releng script to work with 3.2 plugins.



From fedora-cvs-commits at redhat.com  Fri Apr 27 08:48:35 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 04:48:35 -0400
Subject: rpms/eclipse/devel eclipse-launcher-addplatformtotildeeclipse.patch,
	1.1, 1.2 eclipse.spec, 1.423, 1.424
Message-ID: <200704270848.l3R8mZxr015720@cvs.devel.redhat.com>

Author: bkonrath

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

Modified Files:
	eclipse-launcher-addplatformtotildeeclipse.patch eclipse.spec 
Log Message:
* Fri Apr 27 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-10
- Fix problem in launcher-addplatformtotildeeclipse.patch.
- Resolves: #238109.


eclipse-launcher-addplatformtotildeeclipse.patch:
 eclipse.c        |    2 +
 gtk/eclipseGtk.c |   85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+)

Index: eclipse-launcher-addplatformtotildeeclipse.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-launcher-addplatformtotildeeclipse.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-launcher-addplatformtotildeeclipse.patch	28 Nov 2006 19:55:16 -0000	1.1
+++ eclipse-launcher-addplatformtotildeeclipse.patch	27 Apr 2007 08:48:33 -0000	1.2
@@ -6,8 +6,8 @@
 retrieving revision 1.27
 diff -u -r1.27 eclipseGtk.c
 --- library/gtk/eclipseGtk.c	27 Mar 2006 18:25:42 -0000	1.27
-+++ library/gtk/eclipseGtk.c	28 Nov 2006 19:50:03 -0000
-@@ -335,3 +335,73 @@
++++ library/gtk/eclipseGtk.c	27 Apr 2007 08:39:06 -0000
+@@ -335,3 +335,88 @@
    	gtk_main_quit();
    	return FALSE;
  }
@@ -20,22 +20,37 @@
 +    gsize old_length;
 +    gchar *old_contents, *new_contents;
 +    GError *error = NULL;
-+	const gchar *site_element = "<site url=\"platform:/base/\" enabled=\"true\" updateable=\"true\" policy=\"USER-EXCLUDE\">\n<feature id=\"org.eclipse.rcp\" version=\"3.2.1.r321_v20060801-clWbqCmjexIWDqg\" url=\"features/org.eclipse.rcp_3.2.1.r321_v20060801-clWbqCmjexIWDqg/\">\n</feature>\n</site>\n\0";
++	const gchar *site_element = "<site url=\"platform:/base/\" enabled=\"true\" updateable=\"true\" policy=\"USER-EXCLUDE\">\n<feature id=\"org.eclipse.rcp\" version=\"3.2.2.r322_v20070104-iwP0VLKnfFC923K\" url=\"features/org.eclipse.rcp_3.2.2.r322_v20070104-iwP0VLKnfFC923K/\">\n</feature>\n</site>\n\0";
 +	
 +	platform_xml = g_strconcat(g_get_home_dir(), "/.eclipse/org.eclipse.platform_3.2.0/configuration/org.eclipse.update/platform.xml", NULL);
-+    touched = g_strconcat(g_get_home_dir(), "/.eclipse/.homedirmodified-fedora", NULL);
++    touched = g_strconcat(g_get_home_dir(), "/.eclipse/.dont-need-to-modify-homedir-fedora", NULL);
 +	
-+	/* If platform.xml doesn't exist, Eclipse has yet to be started 
-+	 * so don't worry about doing anything.  Also, guard against doing 
-+	 * this more than once with a dot file. */
-+	if (!g_file_test(platform_xml, G_FILE_TEST_EXISTS) || \
-+	     g_file_test(touched, G_FILE_TEST_EXISTS)) {
++
++	if (!g_file_test(platform_xml, G_FILE_TEST_EXISTS))
++	{
++		/* If platform.xml doesn't exist, Eclipse has yet to be started.
++	 	 * We don't have worry about doing anything now and in the future 
++	 	 * so add the appropriate file to ~/.eclipse. */
++	   	if (g_file_set_contents(touched, "\0", -1, &error) == FALSE)
++		{
++			g_print("Error touching ~/.eclipse/.dont-need-to-modify-homedir-fedora.");
++			g_print(g_strconcat(error->message, "\n\0", NULL));
++			g_free(error);
++		}
 +	    g_free(platform_xml);
 +	    g_free(touched);
 +		return;
++		
++	} else if (g_file_test(touched, G_FILE_TEST_EXISTS)) {
++		/* touched exists, we don't need to do anything */ 
++		g_free(platform_xml);
++	    g_free(touched);
++		return;
 +	}
-+	
 +
++
++    /* At this point platform_xml exists and touched does not exist */
++    
 +    if (g_file_get_contents (platform_xml,
 +                             &old_contents, &old_length, &error) == FALSE)
 +    {
@@ -68,7 +83,7 @@
 +
 +	if (g_file_set_contents(touched, "\0", -1, &error) == FALSE)
 +	{
-+		g_print("Error touching ~/.eclipse/.homedirmodified-fedora.\
++		g_print("Error touching ~/.eclipse/.dont-need-to-modify-homedir-fedora.\
 +		         You should remove ~/.eclipse before restarting Eclipse:\0");
 +		g_print(g_strconcat(error->message, "\n\0", NULL));
 +		g_free(error);
@@ -87,7 +102,7 @@
 retrieving revision 1.71
 diff -u -r1.71 eclipse.c
 --- library/eclipse.c	25 Apr 2006 14:31:50 -0000	1.71
-+++ library/eclipse.c	28 Nov 2006 19:50:03 -0000
++++ library/eclipse.c	27 Apr 2007 08:39:05 -0000
 @@ -512,6 +512,8 @@
      /* Get the command to start the Java VM. */
      vmCommandArgs = getVMCommand( argc, argv );


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -r1.423 -r1.424
--- eclipse.spec	26 Apr 2007 16:04:08 -0000	1.423
+++ eclipse.spec	27 Apr 2007 08:48:33 -0000	1.424
@@ -19,7 +19,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        9%{?dist} 
+Release:        10%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1718,6 +1718,10 @@
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
+* Fri Apr 27 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-10
+- Fix problem in launcher-addplatformtotildeeclipse.patch.
+- Resolves: #238109.
+
 * Fri Apr 27 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-9
 - Remove BR eclipse-pde.
 - Related: #236895



From fedora-cvs-commits at redhat.com  Fri Apr 27 10:31:17 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 06:31:17 -0400
Subject: rpms/httpd/FC-6 httpd-2.2.4-getserver.patch, NONE, 1.1 .cvsignore,
	1.17, 1.18 httpd.spec, 1.101, 1.102
Message-ID: <200704271031.l3RAVHaX027325@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	.cvsignore httpd.spec 
Added Files:
	httpd-2.2.4-getserver.patch 
Log Message:
* Fri Apr 27 2007 Joe Orton <jorton at redhat.com> 2.2.4-2.fc6
- fix loading 2.2.4 DSOs with 2.2.3 httpd (#238045)
- mark httpd.conf noreplace


httpd-2.2.4-getserver.patch:
 generators/mod_info.c      |    2 +-
 generators/mod_status.c    |    2 +-
 mappers/mod_rewrite.c      |    2 +-
 proxy/mod_proxy_balancer.c |    2 +-
 proxy/mod_proxy_connect.c  |    6 +++---
 proxy/mod_proxy_ftp.c      |    2 +-
 ssl/ssl_engine_vars.c      |    2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE httpd-2.2.4-getserver.patch ---

Remove dependence on 2.2.4 symbols so the DSOs load in 2.2.3. #238045

(_banner and _version are equivalent; only functional change here is
in mod_status and mod_info, which go back to reflecting 2.2.3 
behaviour)

--- httpd-2.2.4/modules/ssl/ssl_engine_vars.c.getserver
+++ httpd-2.2.4/modules/ssl/ssl_engine_vars.c
@@ -192,7 +192,7 @@
         if (strlen(var) > 12 && strcEQn(var, "SSL_VERSION_", 12))
             result = ssl_var_lookup_ssl_version(p, var+12);
         else if (strcEQ(var, "SERVER_SOFTWARE"))
-            result = ap_get_server_banner();
+            result = ap_get_server_version();
         else if (strcEQ(var, "API_VERSION")) {
             result = apr_itoa(p, MODULE_MAGIC_NUMBER);
             resdup = FALSE;
--- httpd-2.2.4/modules/mappers/mod_rewrite.c.getserver
+++ httpd-2.2.4/modules/mappers/mod_rewrite.c
@@ -2003,7 +2003,7 @@
 
             case 'S':
                 if (!strcmp(var, "SERVER_SOFTWARE")) {
-                    result = ap_get_server_banner();
+                    result = ap_get_server_version();
                 }
                 break;
             }
--- httpd-2.2.4/modules/proxy/mod_proxy_connect.c.getserver
+++ httpd-2.2.4/modules/proxy/mod_proxy_connect.c
@@ -224,7 +224,7 @@
                   "CONNECT %s HTTP/1.0" CRLF, r->uri);
         apr_socket_send(sock, buffer, &nbytes);
         nbytes = apr_snprintf(buffer, sizeof(buffer),
-                  "Proxy-agent: %s" CRLF CRLF, ap_get_server_banner());
+                  "Proxy-agent: %s" CRLF CRLF, ap_get_server_version());
         apr_socket_send(sock, buffer, &nbytes);
     }
     else {
@@ -235,7 +235,7 @@
         ap_xlate_proto_to_ascii(buffer, nbytes);
         apr_socket_send(client_socket, buffer, &nbytes);
         nbytes = apr_snprintf(buffer, sizeof(buffer),
-                  "Proxy-agent: %s" CRLF CRLF, ap_get_server_banner());
+                  "Proxy-agent: %s" CRLF CRLF, ap_get_server_version());
         ap_xlate_proto_to_ascii(buffer, nbytes);
         apr_socket_send(client_socket, buffer, &nbytes);
 #if 0
@@ -244,7 +244,7 @@
          */
         r->status = HTTP_OK;
         r->header_only = 1;
-        apr_table_set(r->headers_out, "Proxy-agent: %s", ap_get_server_banner());
+        apr_table_set(r->headers_out, "Proxy-agent: %s", ap_get_server_version());
         ap_rflush(r);
 #endif
     }
--- httpd-2.2.4/modules/proxy/mod_proxy_ftp.c.getserver
+++ httpd-2.2.4/modules/proxy/mod_proxy_ftp.c
@@ -1666,7 +1666,7 @@
 
     apr_rfc822_date(dates, r->request_time);
     apr_table_setn(r->headers_out, "Date", dates);
-    apr_table_setn(r->headers_out, "Server", ap_get_server_banner());
+    apr_table_setn(r->headers_out, "Server", ap_get_server_version());
 
     /* set content-type */
     if (dirlisting) {
--- httpd-2.2.4/modules/proxy/mod_proxy_balancer.c.getserver
+++ httpd-2.2.4/modules/proxy/mod_proxy_balancer.c
@@ -705,7 +705,7 @@
         ap_rputs("<body><h1>Load Balancer Manager for ", r);
         ap_rvputs(r, ap_get_server_name(r), "</h1>\n\n", NULL);
         ap_rvputs(r, "<dl><dt>Server Version: ",
-                  ap_get_server_description(), "</dt>\n", NULL);
+                  ap_get_server_version(), "</dt>\n", NULL);
         ap_rvputs(r, "<dt>Server Built: ",
                   ap_get_server_built(), "\n</dt></dl>\n", NULL);
         balancer = (proxy_balancer *)conf->balancers->elts;
--- httpd-2.2.4/modules/generators/mod_info.c.getserver
+++ httpd-2.2.4/modules/generators/mod_info.c
@@ -346,7 +346,7 @@
     ap_rprintf(r,
                "<dl><dt><strong>Server Version:</strong> "
                "<font size=\"+1\"><tt>%s</tt></font></dt>\n",
-               ap_get_server_description());
+               ap_get_server_version());
     ap_rprintf(r,
                "<dt><strong>Server Built:</strong> "
                "<font size=\"+1\"><tt>%s</tt></font></dt>\n",
--- httpd-2.2.4/modules/generators/mod_status.c.getserver
+++ httpd-2.2.4/modules/generators/mod_status.c
@@ -397,7 +397,7 @@
         ap_rputs("<h1>Apache Server Status for ", r);
         ap_rvputs(r, ap_get_server_name(r), "</h1>\n\n", NULL);
         ap_rvputs(r, "<dl><dt>Server Version: ",
-                  ap_get_server_description(), "</dt>\n", NULL);
+                  ap_get_server_version(), "</dt>\n", NULL);
         ap_rvputs(r, "<dt>Server Built: ",
                   ap_get_server_built(), "\n</dt></dl><hr /><dl>\n", NULL);
         ap_rvputs(r, "<dt>Current Time: ",


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/httpd/FC-6/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	28 Jul 2006 15:19:20 -0000	1.17
+++ .cvsignore	27 Apr 2007 10:31:14 -0000	1.18
@@ -1 +1,3 @@
 httpd-2.2.3.tar.gz
+httpd-2.2.4
+clog


Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/FC-6/httpd.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- httpd.spec	23 Mar 2007 10:55:21 -0000	1.101
+++ httpd.spec	27 Apr 2007 10:31:14 -0000	1.102
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -40,6 +40,7 @@
 Patch25: httpd-2.0.54-selinux.patch
 # Bug fixes
 Patch54: httpd-2.2.0-authnoprov.patch
+Patch55: httpd-2.2.4-getserver.patch
 License: Apache Software License
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-root
@@ -117,6 +118,7 @@
 %patch25 -p1 -b .selinux
 
 %patch54 -p1 -b .authnoprov
+%patch55 -p1 -b .getserver
 
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -417,7 +419,7 @@
 %{_sysconfdir}/httpd/logs
 %{_sysconfdir}/httpd/run
 %dir %{_sysconfdir}/httpd/conf
-%config %{_sysconfdir}/httpd/conf/httpd.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf/httpd.conf
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/welcome.conf
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/proxy_ajp.conf
 %config(noreplace) %{_sysconfdir}/httpd/conf/magic
@@ -484,6 +486,10 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Fri Apr 27 2007 Joe Orton <jorton at redhat.com> 2.2.4-2.fc6
+- fix loading 2.2.4 DSOs with 2.2.3 httpd (#238045)
+- mark httpd.conf noreplace
+
 * Fri Mar 23 2007 Joe Orton <jorton at redhat.com> 2.2.4-1.fc6
 - update to 2.2.4
 - fix path to special.mk in apxs (#217092)



From fedora-cvs-commits at redhat.com  Fri Apr 27 11:57:15 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 07:57:15 -0400
Subject: rpms/glibc/FC-6 glibc-byteswap.patch, NONE, 1.1 glibc-bz2749.patch,
 NONE, 1.1 glibc-bz3306.patch, NONE, 1.1 glibc-bz3322.patch, NONE,
 1.1 glibc-bz3348.patch, NONE, 1.1 glibc-bz3458.patch, NONE,
 1.1 glibc-bz3842.patch, NONE, 1.1 glibc-bz3851.patch, NONE,
 1.1 glibc-bz3855.patch, NONE, 1.1 glibc-bz3884.patch, NONE,
 1.1 glibc-bz3902.patch, NONE, 1.1 glibc-bz3919.patch, NONE,
 1.1 glibc-bz3944.patch, NONE, 1.1 glibc-bz3957.patch, NONE,
 1.1 glibc-bz3995.patch, NONE, 1.1 glibc-bz4069.patch, NONE,
 1.1 glibc-bz4070.patch, NONE, 1.1 glibc-bz4074.patch, NONE,
 1.1 glibc-bz4076.patch, NONE, 1.1 glibc-bz4101.patch, NONE,
 1.1 glibc-bz4130.patch, NONE, 1.1 glibc-bz4181.patch, NONE,
 1.1 glibc-bz4344.patch, NONE, 1.1 glibc-bz4364.patch, NONE,
 1.1 glibc-bz4368.patch, NONE, 1.1 glibc-bz4405.patch, NONE,
 1.1 glibc-bz4406.patch, NONE, 1.1 glibc-bz4411.patch, NONE,
 1.1 glibc-dst-req-static.patch, NONE, 1.1 glibc-ia64-fesetround.patch, NONE,
 1.1 glibc-libio-throw.patch, NONE, 1.1 glibc-madvise-hidden.patch, NONE,
 1.1 glibc-nis-getservbyname.patch, NONE, 1!
 .1 glibc-nscd-SIGHUP.patch, NONE, 1.1 glibc-po-update2.patch, NONE,
 1.1 glibc-rh178934.patch, NONE, 1.1 glibc-rh203728.patch, NONE,
 1.1 glibc-rh210748-workaround.patch, NONE, 1.1 glibc-rh221187.patch, NONE,
 1.1 glibc-rh222089.patch, NONE, 1.1 glibc-rh225315.patch, NONE,
 1.1 glibc-rh228103.patch, NONE, 1.1 glibc-rh230151.patch, NONE,
 1.1 glibc-rh230198.patch, NONE, 1.1 glibc-rh232633.patch, NONE,
 1.1 glibc-rh233460.patch, NONE, 1.1 glibc-rh235229.patch, NONE,
 1.1 glibc.spec, 1.279, 1.280
Message-ID: <200704271157.l3RBvFJT005019@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	glibc.spec 
Added Files:
	glibc-byteswap.patch glibc-bz2749.patch glibc-bz3306.patch 
	glibc-bz3322.patch glibc-bz3348.patch glibc-bz3458.patch 
	glibc-bz3842.patch glibc-bz3851.patch glibc-bz3855.patch 
	glibc-bz3884.patch glibc-bz3902.patch glibc-bz3919.patch 
	glibc-bz3944.patch glibc-bz3957.patch glibc-bz3995.patch 
	glibc-bz4069.patch glibc-bz4070.patch glibc-bz4074.patch 
	glibc-bz4076.patch glibc-bz4101.patch glibc-bz4130.patch 
	glibc-bz4181.patch glibc-bz4344.patch glibc-bz4364.patch 
	glibc-bz4368.patch glibc-bz4405.patch glibc-bz4406.patch 
	glibc-bz4411.patch glibc-dst-req-static.patch 
	glibc-ia64-fesetround.patch glibc-libio-throw.patch 
	glibc-madvise-hidden.patch glibc-nis-getservbyname.patch 
	glibc-nscd-SIGHUP.patch glibc-po-update2.patch 
	glibc-rh178934.patch glibc-rh203728.patch 
	glibc-rh210748-workaround.patch glibc-rh221187.patch 
	glibc-rh222089.patch glibc-rh225315.patch glibc-rh228103.patch 
	glibc-rh230151.patch glibc-rh230198.patch glibc-rh232633.patch 
	glibc-rh233460.patch glibc-rh235229.patch 
Log Message:
2.5-13.fc6

glibc-byteswap.patch:
 i386/bits/byteswap.h   |    3 ++-
 x86_64/bits/byteswap.h |    4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE glibc-byteswap.patch ---
2007-02-12  Jakub Jelinek  <jakub at redhat.com>

	* sysdeps/i386/bits/byteswap.h (__bswap_32): Add __amdfam10__
	to the list of i486+ CPUs.
	* sysdeps/x86_64/bits/byteswap.h (__bswap_32): Likewise.

2007-01-24  Jakub Jelinek  <jakub at redhat.com>

	* sysdeps/i386/bits/byteswap.h (__bswap_32): Add __nocona__, __core2__
	and __geode__ to the list of i486+ CPUs.
	* sysdeps/x86_64/bits/byteswap.h (__bswap_32): Likewise.

--- libc/sysdeps/i386/bits/byteswap.h	24 Aug 2006 07:02:16 -0000	1.14
+++ libc/sysdeps/i386/bits/byteswap.h	12 Feb 2007 21:21:03 -0000	1.16
@@ -66,7 +67,8 @@ __bswap_16 (unsigned short int __bsx)
    `bswap' opcode.  On i386 we have to use three instructions.  */
 #  if !defined __i486__ && !defined __pentium__ && !defined __pentiumpro__ \
       && !defined __pentium4__ && !defined __k8__ && !defined __athlon__ \
-      && !defined __k6__
+      && !defined __k6__ && !defined __nocona__ && !defined __core2__ \
+      && !defined __geode__ && !defined __amdfam10__
 #   define __bswap_32(x)						      \
      (__extension__							      \
       ({ register unsigned int __v, __x = (x);				      \
--- libc/sysdeps/x86_64/bits/byteswap.h	17 Aug 2003 06:32:00 -0000	1.1
+++ libc/sysdeps/x86_64/bits/byteswap.h	12 Feb 2007 21:21:03 -0000	1.3
@@ -59,7 +60,9 @@
 # if __WORDSIZE == 64 || (defined __i486__ || defined __pentium__	      \
 			  || defined __pentiumpro__ || defined __pentium4__   \
 			  || defined __k8__ || defined __athlon__	      \
-			  || defined __k6__)
+			  || defined __k6__ || defined __nocona__	      \
+			  || defined __core2__ || defined __geode__	      \
+			  || defined __amdfam10__)
 /* To swap the bytes in a word the i486 processors and up provide the
    `bswap' opcode.  On i386 we have to use three instructions.  */
 #  define __bswap_32(x) \

glibc-bz2749.patch:
 math/basic-test.c   |   34 +++++++++++++++++++++++-
 math/test-misc.c    |   72 ++++++++++++++++++++++++++++++++++++++++++++--------
 soft-fp/op-4.h      |    6 ++--
 soft-fp/op-common.h |    7 +++--
 4 files changed, 102 insertions(+), 17 deletions(-)

--- NEW FILE glibc-bz2749.patch ---
2007-01-15  Jakub Jelinek  <jakub at redhat.com>

	* soft-fp/op-common.h (FP_TRUNC): When truncating a NaN, clear
	workbits in semi-raw fraction.

	* math/test-misc.c: Add new tests.

2007-01-14  Steven Munroe  <sjmunroe at us.ibm.com>

	* math/basic-test.c: Include test-skeleton.c.
	(TEST_TRUNC): Define.
	(truncdfsf_test, trunctfsf_test, trunctfdf_test): New.
	(main): Rename to ...
	(do_test): ...this.  Run new tests.
	(TEST_FUNCTION): Define.

2006-10-05  Steven Munroe  <sjmunroe at us.ibm.com>
	    Joe Kerian  <jkerian at us.us.ibm.com>

	[BZ #2749]
	* soft-fp/op-4.h (__FP_FRAC_SUB_3, __FP_FRAC_SUB_4): Correct borrow
	handling for high words.
	* soft-fp/op-common.h (_FP_OVERFLOW_SEMIRAW): Always set inexact
	and overflow for infinity.

--- libc/soft-fp/op-4.h	4 Apr 2006 08:24:47 -0000	1.8
+++ libc/soft-fp/op-4.h	15 Jan 2007 23:43:04 -0000	1.9
@@ -564,7 +564,7 @@
     r1 = x1 - y1;						\
     _c2 = r1 > x1;						\
     r1 -= _c1;							\
-    _c2 |= r1 > _c1;						\
+    _c2 |= _c1 && (y1 == x1);					\
     r2 = x2 - y2 - _c2;						\
   } while (0)
 #endif
@@ -578,11 +578,11 @@
     r1 = x1 - y1;						\
     _c2 = r1 > x1;						\
     r1 -= _c1;							\
-    _c2 |= r1 > _c1;						\
+    _c2 |= _c1 && (y1 == x1);					\
     r2 = x2 - y2;						\
     _c3 = r2 > x2;						\
     r2 -= _c2;							\
-    _c3 |= r2 > _c2;						\
+    _c3 |= _c2 && (y2 == x2);					\
     r3 = x3 - y3 - _c3;						\
   } while (0)
 #endif
--- libc/soft-fp/op-common.h	4 Apr 2006 08:24:47 -0000	1.9
+++ libc/soft-fp/op-common.h	15 Jan 2007 23:43:04 -0000	1.10
@@ -99,10 +99,10 @@ do {							\
   else							\
     {							\
       X##_e = _FP_EXPMAX_##fs - 1;			\
-      FP_SET_EXCEPTION(FP_EX_OVERFLOW);			\
-      FP_SET_EXCEPTION(FP_EX_INEXACT);			\
       _FP_FRAC_SET_##wc(X, _FP_MAXFRAC_##wc);		\
     }							\
+    FP_SET_EXCEPTION(FP_EX_INEXACT);			\
+    FP_SET_EXCEPTION(FP_EX_OVERFLOW);			\
 } while (0)
 
 /* Check for a semi-raw value being a signaling NaN and raise the
@@ -1252,6 +1252,9 @@ do {									     \
 	      _FP_FRAC_SRL_##swc(S, (_FP_WFRACBITS_##sfs		     \
 				     - _FP_WFRACBITS_##dfs));		     \
 	      _FP_FRAC_COPY_##dwc##_##swc(D, S);			     \
+	      /* Semi-raw NaN must have all workbits cleared.  */	     \
+	      _FP_FRAC_LOW_##dwc(D)					     \
+		&= ~(_FP_W_TYPE) ((1 << _FP_WORKBITS) - 1);		     \
 	      _FP_FRAC_HIGH_##dfs(D) |= _FP_QNANBIT_SH_##dfs;		     \
 	    }								     \
 	}								     \
--- libc/math/basic-test.c	6 Jul 2001 04:55:35 -0000	1.3
+++ libc/math/basic-test.c	15 Jan 2007 23:43:04 -0000	1.4
@@ -44,7 +44,7 @@ NAME (void)								      \
 									      \
   zero_var = 0.0;							      \
   one_var = 1.0;							      \
-  NaN_var = zero_var/zero_var;						      \
+  NaN_var = zero_var / zero_var;					      \
   Inf_var = one_var / zero_var;						      \
 									      \
   (void) &zero_var;							      \
@@ -103,21 +103,51 @@ NAME (void)								      \
   check (#FLOAT " isinf (-HUGE_VALx) == -1", isinf (x1) == -1);		      \
 }
 
+#define TEST_TRUNC(NAME, FLOAT, DOUBLE) \
+void									      \
+NAME (void)								      \
+{									      \
+  volatile DOUBLE Inf_var, NaN_var, zero_var, one_var;			      \
+  FLOAT x1, x2;								      \
+									      \
+  zero_var = 0.0;							      \
+  one_var = 1.0;							      \
+  NaN_var = zero_var / zero_var;					      \
+  Inf_var = one_var / zero_var;						      \
+									      \
+  (void) &NaN_var;							      \
+  (void) &Inf_var;							      \
+									      \
+  x1 = (FLOAT) NaN_var;							      \
+  check (" "#FLOAT" x = ("#FLOAT") ("#DOUBLE") NaN", isnan (x1) != 0);	      \
+  x2 = (FLOAT) Inf_var;							      \
+  check (" "#FLOAT" x = ("#FLOAT") ("#DOUBLE") Inf", isinf (x2) != 0);	      \
+}
+
 TEST_FUNC (float_test, float, nanf, FLT_EPSILON, HUGE_VALF)
 TEST_FUNC (double_test, double, nan, DBL_EPSILON, HUGE_VAL)
+TEST_TRUNC (truncdfsf_test, float, double)
 #ifndef NO_LONG_DOUBLE
 TEST_FUNC (ldouble_test, long double, nanl, LDBL_EPSILON, HUGE_VALL)
+TEST_TRUNC (trunctfsf_test, float, long double)
+TEST_TRUNC (trunctfdf_test, double, long double)
 #endif
 
 int
-main (void)
+do_test (void)
 {
   float_test ();
   double_test ();
+  truncdfsf_test();
 
 #ifndef NO_LONG_DOUBLE
   ldouble_test ();
+  trunctfsf_test();
+  trunctfdf_test();
 #endif
 
   return errors != 0;
 }
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
--- libc/math/test-misc.c	19 Mar 2005 00:28:20 -0000	1.20
+++ libc/math/test-misc.c	15 Jan 2007 23:43:04 -0000	1.21
@@ -44,7 +44,6 @@ main (void)
       }
   }
 
-# if __GNUC__ >= 3 || __GNUC_MINOR__ >= 96
   {
     long double x;
     long double m;
@@ -52,17 +51,17 @@ main (void)
     int e;
     int i;
 
-#  if LDBL_MANT_DIG == 64
+# if LDBL_MANT_DIG == 64
     m = 0xf.fffffffffffffffp-4L;
-#  elif LDBL_MANT_DIG == 106
+# elif LDBL_MANT_DIG == 106
     /* This has to match the mantissa of LDBL_MAX which actually does have a
        missing bit in the middle.  */
     m = 0x1.fffffffffffff7ffffffffffff8p-1L;
-#  elif LDBL_MANT_DIG == 113
+# elif LDBL_MANT_DIG == 113
     m = 0x1.ffffffffffffffffffffffffffffp-1L;
-#  else
-#   error "Please adjust"
-#  endif
+# else
+#  error "Please adjust"
+# endif
 
     for (i = LDBL_MAX_EXP, x = LDBL_MAX; i >= LDBL_MIN_EXP; --i, x /= 2.0L)
       {
@@ -106,9 +105,8 @@ main (void)
       }
 
   }
-# endif
 
-#if 0
+# if 0
   {
     int e;
     long double r = frexpl (LDBL_MIN * LDBL_EPSILON, &e);
@@ -126,7 +124,7 @@ main (void)
 	result = 1;
       }
   }
-#endif
+# endif
 #endif
 
   {
@@ -1183,5 +1181,59 @@ main (void)
     }
 #endif
 
+  volatile float f1 = FLT_MAX;
+  volatile float f2 = FLT_MAX / 2;
+  (void) &f1;
+  (void) &f2;
+  feclearexcept (FE_ALL_EXCEPT);
+  f2 += f1;
+  int fe = fetestexcept (FE_ALL_EXCEPT);
+  if (fe != (FE_OVERFLOW | FE_INEXACT))
+    {
+      printf ("float overflow test failed: %x\n", fe);
+      result = 1;
+    }
+
+  volatile double d1 = DBL_MAX;
+  volatile double d2 = DBL_MAX / 2;
+  (void) &d1;
+  (void) &d2;
+  feclearexcept (FE_ALL_EXCEPT);
+  d2 += d1;
+  fe = fetestexcept (FE_ALL_EXCEPT);
+  if (fe != (FE_OVERFLOW | FE_INEXACT))
+    {
+      printf ("double overflow test failed: %x\n", fe);
+      result = 1;
+    }
+
+#ifndef NO_LONG_DOUBLE
+  volatile long double ld1 = LDBL_MAX;
+  volatile long double ld2 = LDBL_MAX / 2;
+  (void) &ld1;
+  (void) &ld2;
+  feclearexcept (FE_ALL_EXCEPT);
+  ld2 += ld1;
+  fe = fetestexcept (FE_ALL_EXCEPT);
+  if (fe != (FE_OVERFLOW | FE_INEXACT))
+    {
+      printf ("long double overflow test failed: %x\n", fe);
+      result = 1;
+    }
+#endif
+
+#if !defined NO_LONG_DOUBLE && LDBL_MANT_DIG == 113
+  volatile long double ld3 = 0x1.0000000000010000000100000001p+1;
+  volatile long double ld4 = 0x1.0000000000000000000000000001p+1;
+  (void) &ld3;
+  (void) &ld4;
+  ld3 -= ld4;
+  if (ld3 != 0x1.0p-47)
+    {
+      printf ("long double subtraction test failed %.28La\n", ld3);
+      result = 1;
+    }
+#endif
+
   return result;
 }

glibc-bz3306.patch:
 math/bug-nextafter.c                        |  255 ++++++++++++++++++++++++++++
 math/bug-nexttoward.c                       |  255 ++++++++++++++++++++++++++++
 math/math_private.h                         |    6 
 math/s_nextafter.c                          |   20 +-
 math/s_nexttowardf.c                        |   21 +-
 sysdeps/i386/fpu/math_private.h             |   18 +
 sysdeps/i386/fpu/s_nextafterl.c             |   18 -
 sysdeps/i386/fpu/s_nexttoward.c             |   25 +-
 sysdeps/i386/fpu/s_nexttowardf.c            |   25 +-
 sysdeps/ieee754/flt-32/s_nextafterf.c       |   20 +-
 sysdeps/ieee754/ldbl-128/s_nextafterl.c     |   18 -
 sysdeps/ieee754/ldbl-128/s_nexttoward.c     |   23 +-
 sysdeps/ieee754/ldbl-128ibm/s_nextafterl.c  |   20 +-
 sysdeps/ieee754/ldbl-128ibm/s_nexttoward.c  |   23 +-
 sysdeps/ieee754/ldbl-128ibm/s_nexttowardf.c |   26 +-
 sysdeps/ieee754/ldbl-96/s_nextafterl.c      |   20 +-
 sysdeps/ieee754/ldbl-96/s_nexttoward.c      |   23 +-
 sysdeps/ieee754/ldbl-96/s_nexttowardf.c     |   28 +--
 sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c   |   28 +--
 sysdeps/x86_64/fpu/math_private.h           |   21 ++
 20 files changed, 733 insertions(+), 160 deletions(-)

--- NEW FILE glibc-bz3306.patch ---
2007-04-01  Jakub Jelinek  <jakub at redhat.com>

	* sysdeps/ieee754/ldbl-128ibm/s_nextafterl.c (__nextafterl): Use
	math_opt_barrier and math_force_eval macros.

2007-03-27  Jakub Jelinek  <jakub at redhat.com>

	[BZ #3306]
	* math/math_private.h (math_opt_barrier, math_force_eval): Define.
	* sysdeps/i386/fpu/math_private.h: New file.
	* sysdeps/x86_64/fpu/math_private.h: New file.
	* math/s_nexttowardf.c (__nexttowardf): Use math_opt_barrier and
	math_force_eval macros.  Use "+m" constraint on asm rather than
	"=m" and "m".
	* math/s_nextafter.c (__nextafter): Likewise.
	* sysdeps/ieee754/ldbl-128ibm/s_nexttoward.c (__nexttoward):
	Likewise.
	* sysdeps/ieee754/flt-32/s_nextafterf.c (__nextafterf): Likewise.
	* sysdeps/ieee754/ldbl-128/s_nexttoward.c (__nexttoward): Likewise.
	* sysdeps/ieee754/ldbl-96/s_nexttoward.c (__nexttoward): Likewise.
	* sysdeps/i386/fpu/s_nextafterl.c (__nextafterl): Use
	math_opt_barrier and math_force_eval macros.
	* sysdeps/ieee754/ldbl-128/s_nextafterl.c (__nextafterl): Likewise.
	* sysdeps/ieee754/ldbl-96/s_nextafterl.c (__nextafterl): Likewise.
	* sysdeps/i386/fpu/s_nexttoward.c: Include float.h.
	(__nexttoward): Use math_opt_barrier and
	math_force_eval macros.  Use "+m" constraint on asm rather than
	"=m" and "m".  Only use asm to force double result if
	FLT_EVAL_METHOD is 2.
	* sysdeps/i386/fpu/s_nexttowardf.c: Include float.h.
	(__nexttowardf): Use math_opt_barrier and
	math_force_eval macros.  Use "+m" constraint on asm rather than
	"=m" and "m".  Only use asm to force double result if
	FLT_EVAL_METHOD is not 0.
	* sysdeps/ieee754/ldbl-128ibm/s_nexttowardf.c: Include float.h.
	(__nexttowardf): Use math_opt_barrier and
	math_force_eval macros.  If FLT_EVAL_METHOD is not 0, force
	x to float using asm.
	* sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c: Include float.h.
	(__nldbl_nexttowardf): Use math_opt_barrier and
	math_force_eval macros.  If FLT_EVAL_METHOD is not 0, force
	x to float using asm.
	* sysdeps/ieee754/ldbl-96/s_nexttowardf.c: Include float.h.
	(__nexttowardf): Use math_opt_barrier and math_force_eval
	macros.  If FLT_EVAL_METHOD is not 0, force x to float using asm.
	* math/bug-nextafter.c (zero, inf): New variables.
	(main): Add new tests.
	* math/bug-nexttoward.c (zero, inf): New variables.
	(main): Add new tests.

--- libc/math/bug-nextafter.c	9 Dec 2003 18:10:47 -0000	1.3
+++ libc/math/bug-nextafter.c	16 Apr 2007 20:41:33 -0000	1.4
@@ -4,6 +4,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+float zero = 0.0;
+float inf = INFINITY;
+
 int
 main (void)
 {
@@ -34,6 +37,81 @@ main (void)
       ++result;
     }
 
+  i = 0;
+  m = FLT_MIN;
+  feclearexcept (FE_ALL_EXCEPT);
+  i = nextafterf (m, i);
+  if (i < 0 || i >= FLT_MIN)
+    {
+      puts ("nextafterf+ failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nextafterf+ did not underflow");
+      ++result;
+    }
+  i = 0;
+  feclearexcept (FE_ALL_EXCEPT);
+  i = nextafterf (-m, -i);
+  if (i > 0 || i <= -FLT_MIN)
+    {
+      puts ("nextafterf- failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nextafterf- did not underflow");
+      ++result;
+    }
+  i = -INFINITY;
+  feclearexcept (FE_ALL_EXCEPT);
+  m = nextafterf (zero, inf);
+  if (m < 0.0 || m >= FLT_MIN)
+    {
+      puts ("nextafterf+ failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nextafterf+ did not underflow");
+      ++result;
+    }
+  feclearexcept (FE_ALL_EXCEPT);
+  if (nextafterf (m, i) != 0.0)
+    {
+      puts ("nextafterf+ failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nextafterf+ did not underflow");
+      ++result;
+    }
+  feclearexcept (FE_ALL_EXCEPT);
+  m = nextafterf (copysignf (zero, -1.0), -inf);
+  if (m > 0.0 || m <= -FLT_MIN)
+    {
+      puts ("nextafterf- failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nextafterf- did not underflow");
+      ++result;
+    }
+  feclearexcept (FE_ALL_EXCEPT);
+  if (nextafterf (m, -i) != 0.0)
+    {
+      puts ("nextafterf- failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nextafterf- did not underflow");
+      ++result;
+    }
+
   double di = INFINITY;
   double dm = DBL_MAX;
   feclearexcept (FE_ALL_EXCEPT);
@@ -59,5 +137,182 @@ main (void)
       ++result;
     }
 
+  di = 0;
+  dm = DBL_MIN;
+  feclearexcept (FE_ALL_EXCEPT);
+  di = nextafter (dm, di);
+  if (di < 0 || di >= DBL_MIN)
+    {
+      puts ("nextafter+ failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nextafter+ did not underflow");
+      ++result;
+    }
+  di = 0;
+  feclearexcept (FE_ALL_EXCEPT);
+  di = nextafter (-dm, -di);
+  if (di > 0 || di <= -DBL_MIN)
+    {
+      puts ("nextafter- failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nextafter- did not underflow");
+      ++result;
+    }
+  di = -INFINITY;
+  feclearexcept (FE_ALL_EXCEPT);
+  dm = nextafter (zero, inf);
+  if (dm < 0.0 || dm >= DBL_MIN)
+    {
+      puts ("nextafter+ failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nextafter+ did not underflow");
+      ++result;
+    }
+  feclearexcept (FE_ALL_EXCEPT);
+  if (nextafter (dm, di) != 0.0)
+    {
+      puts ("nextafter+ failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nextafter+ did not underflow");
+      ++result;
+    }
+  feclearexcept (FE_ALL_EXCEPT);
+  dm = nextafter (copysign (zero, -1.0), -inf);
+  if (dm > 0.0 || dm <= -DBL_MIN)
+    {
+      puts ("nextafter- failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nextafter- did not underflow");
+      ++result;
+    }
+  feclearexcept (FE_ALL_EXCEPT);
+  if (nextafter (dm, -di) != 0.0)
+    {
+      puts ("nextafter- failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nextafter- did not underflow");
+      ++result;
+    }
+
+#ifndef NO_LONG_DOUBLE
+  long double li = INFINITY;
+  long double lm = LDBL_MAX;
+  feclearexcept (FE_ALL_EXCEPT);
+  if (nextafterl (lm, li) != li)
+    {
+      puts ("nextafterl+ failed");
+      ++result;
+    }
+  if (fetestexcept (FE_OVERFLOW) == 0)
+    {
+      puts ("nextafterl+ did not overflow");
+      ++result;
+    }
+  feclearexcept (FE_ALL_EXCEPT);
+  if (nextafterl (-lm, -li) != -li)
+    {
+      puts ("nextafterl failed");
+      ++result;
+    }
+  if (fetestexcept (FE_OVERFLOW) == 0)
+    {
+      puts ("nextafterl- did not overflow");
+      ++result;
+    }
+
+  li = 0;
+  lm = LDBL_MIN;
+  feclearexcept (FE_ALL_EXCEPT);
+  li = nextafterl (lm, li);
+  if (li < 0 || li >= LDBL_MIN)
+    {
+      puts ("nextafterl+ failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nextafterl+ did not underflow");
+      ++result;
+    }
+  li = 0;
+  feclearexcept (FE_ALL_EXCEPT);
+  li = nextafterl (-lm, -li);
+  if (li > 0 || li <= -LDBL_MIN)
+    {
+      puts ("nextafterl- failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nextafterl- did not underflow");
+      ++result;
+    }
+  li = -INFINITY;
+  feclearexcept (FE_ALL_EXCEPT);
+  lm = nextafterl (zero, inf);
+  if (lm < 0.0 || lm >= LDBL_MIN)
+    {
+      puts ("nextafterl+ failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nextafterl+ did not underflow");
+      ++result;
+    }
+  feclearexcept (FE_ALL_EXCEPT);
+  if (nextafterl (lm, li) != 0.0)
+    {
+      puts ("nextafterl+ failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nextafterl+ did not underflow");
+      ++result;
+    }
+  feclearexcept (FE_ALL_EXCEPT);
+  lm = nextafterl (copysign (zero, -1.0), -inf);
+  if (lm > 0.0 || lm <= -LDBL_MIN)
+    {
+      puts ("nextafterl- failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nextafterl- did not underflow");
+      ++result;
+    }
+  feclearexcept (FE_ALL_EXCEPT);
+  if (nextafterl (lm, -li) != 0.0)
+    {
+      puts ("nextafterl- failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nextafterl- did not underflow");
+      ++result;
+    }
+#endif
+
   return result;
 }
--- libc/math/bug-nexttoward.c	7 Dec 2003 21:13:09 -0000	1.1
+++ libc/math/bug-nexttoward.c	16 Apr 2007 20:41:33 -0000	1.2
@@ -4,6 +4,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+float zero = 0.0;
+float inf = INFINITY;
+
 int
 main (void)
 {
@@ -35,6 +38,81 @@ main (void)
       ++result;
     }
 
+  fi = 0;
+  m = FLT_MIN;
+  feclearexcept (FE_ALL_EXCEPT);
+  fi = nexttowardf (m, fi);
+  if (fi < 0 || fi >= FLT_MIN)
+    {
+      puts ("nexttowardf+ failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nexttowardf+ did not underflow");
+      ++result;
+    }
+  fi = 0;
+  feclearexcept (FE_ALL_EXCEPT);
+  fi = nexttowardf (-m, -fi);
+  if (fi > 0 || fi <= -FLT_MIN)
+    {
+      puts ("nexttowardf- failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nexttowardf- did not underflow");
+      ++result;
+    }
+  fi = -INFINITY;
+  feclearexcept (FE_ALL_EXCEPT);
+  m = nexttowardf (zero, inf);
+  if (m < 0.0 || m >= FLT_MIN)
+    {
+      puts ("nexttowardf+ failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nexttowardf+ did not underflow");
+      ++result;
+    }
+  feclearexcept (FE_ALL_EXCEPT);
+  if (nexttowardf (m, fi) != 0.0)
+    {
+      puts ("nexttowardf+ failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nexttowardf+ did not underflow");
+      ++result;
+    }
+  feclearexcept (FE_ALL_EXCEPT);
+  m = nexttowardf (copysignf (zero, -1.0), -inf);
+  if (m > 0.0 || m <= -FLT_MIN)
+    {
+      puts ("nexttowardf- failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nexttowardf- did not underflow");
+      ++result;
+    }
+  feclearexcept (FE_ALL_EXCEPT);
+  if (nexttowardf (m, -fi) != 0.0)
+    {
+      puts ("nexttowardf- failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nexttowardf- did not underflow");
+      ++result;
+    }
+
   tl = (long double) DBL_MAX + 1.0e305L;
   double di = INFINITY;
   double dm = DBL_MAX;
@@ -61,5 +139,182 @@ main (void)
       ++result;
     }
 
+  di = 0;
+  dm = DBL_MIN;
+  feclearexcept (FE_ALL_EXCEPT);
+  di = nexttoward (dm, di);
+  if (di < 0 || di >= DBL_MIN)
+    {
+      puts ("nexttoward+ failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nexttoward+ did not underflow");
+      ++result;
+    }
+  di = 0;
+  feclearexcept (FE_ALL_EXCEPT);
+  di = nexttoward (-dm, -di);
+  if (di > 0 || di <= -DBL_MIN)
+    {
+      puts ("nexttoward- failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nexttoward- did not underflow");
+      ++result;
+    }
+  di = -INFINITY;
+  feclearexcept (FE_ALL_EXCEPT);
+  dm = nexttoward (zero, inf);
+  if (dm < 0.0 || dm >= DBL_MIN)
+    {
+      puts ("nexttoward+ failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nexttoward+ did not underflow");
+      ++result;
+    }
+  feclearexcept (FE_ALL_EXCEPT);
+  if (nexttoward (dm, di) != 0.0)
+    {
+      puts ("nexttoward+ failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nexttoward+ did not underflow");
+      ++result;
+    }
+  feclearexcept (FE_ALL_EXCEPT);
+  dm = nexttoward (copysign (zero, -1.0), -inf);
+  if (dm > 0.0 || dm <= -DBL_MIN)
+    {
+      puts ("nexttoward- failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nexttoward- did not underflow");
+      ++result;
+    }
+  feclearexcept (FE_ALL_EXCEPT);
+  if (nexttoward (dm, -di) != 0.0)
+    {
+      puts ("nexttoward- failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nexttoward- did not underflow");
+      ++result;
+    }
+
+#ifndef NO_LONG_DOUBLE
+  long double li = INFINITY;
+  long double lm = LDBL_MAX;
+  feclearexcept (FE_ALL_EXCEPT);
+  if (nexttowardl (lm, li) != li)
+    {
+      puts ("nexttowardl+ failed");
+      ++result;
+    }
+  if (fetestexcept (FE_OVERFLOW) == 0)
+    {
+      puts ("nexttowardl+ did not overflow");
+      ++result;
+    }
+  feclearexcept (FE_ALL_EXCEPT);
+  if (nexttowardl (-lm, -li) != -li)
+    {
+      puts ("nexttowardl failed");
+      ++result;
+    }
+  if (fetestexcept (FE_OVERFLOW) == 0)
+    {
+      puts ("nexttowardl- did not overflow");
+      ++result;
+    }
+
+  li = 0;
+  lm = LDBL_MIN;
+  feclearexcept (FE_ALL_EXCEPT);
+  li = nexttowardl (lm, li);
+  if (li < 0 || li >= LDBL_MIN)
+    {
+      puts ("nexttowardl+ failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nexttowardl+ did not underflow");
+      ++result;
+    }
+  li = 0;
+  feclearexcept (FE_ALL_EXCEPT);
+  li = nexttowardl (-lm, -li);
+  if (li > 0 || li <= -LDBL_MIN)
+    {
+      puts ("nexttowardl- failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nexttowardl- did not underflow");
+      ++result;
+    }
+  li = -INFINITY;
+  feclearexcept (FE_ALL_EXCEPT);
+  lm = nexttowardl (zero, inf);
+  if (lm < 0.0 || lm >= LDBL_MIN)
+    {
+      puts ("nexttowardl+ failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nexttowardl+ did not underflow");
+      ++result;
+    }
+  feclearexcept (FE_ALL_EXCEPT);
+  if (nexttowardl (lm, li) != 0.0)
+    {
+      puts ("nexttowardl+ failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nexttowardl+ did not underflow");
+      ++result;
+    }
+  feclearexcept (FE_ALL_EXCEPT);
+  lm = nexttowardl (copysign (zero, -1.0), -inf);
+  if (lm > 0.0 || lm <= -LDBL_MIN)
+    {
+      puts ("nexttowardl- failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nexttowardl- did not underflow");
+      ++result;
+    }
+  feclearexcept (FE_ALL_EXCEPT);
+  if (nexttowardl (lm, -li) != 0.0)
+    {
+      puts ("nexttowardl- failed");
+      ++result;
+    }
+  if (fetestexcept (FE_UNDERFLOW) == 0)
+    {
+      puts ("nexttowardl- did not underflow");
+      ++result;
+    }
+#endif
+
   return result;
 }
--- libc/math/math_private.h	21 Nov 2005 15:43:03 -0000	1.20
+++ libc/math/math_private.h	16 Apr 2007 20:36:59 -0000	1.21
@@ -332,4 +332,10 @@ extern double __slowexp (double __x);
 extern double __slowpow (double __x, double __y, double __z);
 extern void __docos (double __x, double __dx, double __v[]);
 
+#ifndef math_opt_barrier
+#define math_opt_barrier(x) \
+({ __typeof (x) __x = x; __asm ("" : "+m" (__x)); __x; })
+#define math_force_eval(x) __asm __volatile ("" : : "m" (x))
+#endif
+
 #endif /* _MATH_PRIVATE_H_ */
--- libc/math/s_nextafter.c	14 Dec 2005 10:33:59 -0000	1.1
+++ libc/math/s_nextafter.c	16 Apr 2007 20:38:33 -0000	1.2
@@ -26,7 +26,7 @@ static char rcsid[] = "$NetBSD: s_nextaf
 #define nexttoward __internal_nexttoward
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 #include <float.h>
 
 #ifdef __STDC__
@@ -49,9 +49,12 @@ static char rcsid[] = "$NetBSD: s_nextaf
 	   return x+y;
 	if(x==y) return y;		/* x=y, return y */
 	if((ix|lx)==0) {			/* x == 0 */
+	    double u;
 	    INSERT_WORDS(x,hy&0x80000000,1);	/* return +-minsubnormal */
-	    y = x*x;
-	    if(y==x) return y; else return x;	/* raise underflow flag */
+	    u = math_opt_barrier (x);
+	    u = u*u;
+	    math_force_eval (u);		/* raise underflow flag */
+	    return x;
 	}
 	if(hx>=0) {				/* x > 0 */
 	    if(hx>hy||((hx==hy)&&(lx>ly))) {	/* x > y, x -= ulp */
@@ -74,15 +77,12 @@ static char rcsid[] = "$NetBSD: s_nextaf
 	if(hy>=0x7ff00000) {
 	  x = x+x;	/* overflow  */
 	  if (FLT_EVAL_METHOD != 0 && FLT_EVAL_METHOD != 1)
-	    asm ("" : "=m"(x) : "m"(x));
+	    asm ("" : "+m"(x));
 	  return x;	/* overflow  */
 	}
-	if(hy<0x00100000) {		/* underflow */
-	    y = x*x;
-	    if(y!=x) {		/* raise underflow flag */
-	        INSERT_WORDS(y,hx,lx);
-		return y;
-	    }
+	if(hy<0x00100000) {
+	    double u = x*x;			/* underflow */
+	    math_force_eval (u);		/* raise underflow flag */
 	}
 	INSERT_WORDS(x,hx,lx);
 	return x;
--- libc/math/s_nexttowardf.c	14 Dec 2005 10:34:14 -0000	1.1
+++ libc/math/s_nexttowardf.c	16 Apr 2007 20:38:07 -0000	1.2
@@ -21,7 +21,7 @@
  */
 
 #include <math.h>
-#include "math_private.h"
+#include <math_private.h>
 #include <float.h>
 
 #ifdef __STDC__
@@ -45,10 +45,12 @@
 	   return x+y;
 	if((long double) x==y) return y;	/* x=y, return y */
 	if(ix==0) {				/* x == 0 */
-	    float x2;
+	    float u;
 	    SET_FLOAT_WORD(x,(u_int32_t)(hy&0x80000000)|1);/* return +-minsub*/
-	    x2 = x*x;
-	    if(x2==x) return x2; else return x; /* raise underflow flag */
+	    u = math_opt_barrier (x);
+	    u = u * u;
+	    math_force_eval (u);		 /* raise underflow flag */
+	    return x;
 	}
 	if(hx>=0) {				/* x > 0 */
 	    if(hy<0||(ix>>23)>(iy>>20)-0x380
@@ -70,15 +72,12 @@
 	  x = x+x;	/* overflow  */
 	  if (FLT_EVAL_METHOD != 0)
 	    /* Force conversion to float.  */
-	    asm ("" : "=m"(x) : "m"(x));
+	    asm ("" : "+m"(x));
 	  return x;
 	}
-	if(hy<0x00800000) {		/* underflow */
-	    float x2 = x*x;
-	    if(x2!=x) {		/* raise underflow flag */
-		SET_FLOAT_WORD(x2,hx);
-		return x2;
-	    }
+	if(hy<0x00800000) {
+	    float u = x*x;			/* underflow */
+	    math_force_eval (u);		/* raise underflow flag */
 	}
 	SET_FLOAT_WORD(x,hx);
 	return x;
--- libc/sysdeps/i386/fpu/math_private.h	1 Jan 1970 00:00:00 -0000
+++ libc/sysdeps/i386/fpu/math_private.h	16 Apr 2007 20:37:29 -0000	1.1
@@ -0,0 +1,18 @@
+#ifndef _MATH_PRIVATE_H
+
+#define math_opt_barrier(x) \
+({ __typeof(x) __x;					\
+   __asm ("" : "=t" (__x) : "0" (x));			\
+   __x; })
+#define math_force_eval(x) \
+do							\
+  {							\
+    if (sizeof (x) <= sizeof (double))			\
+      __asm __volatile ("" : : "m" (x));		\
+    else						\
+      __asm __volatile ("" : : "f" (x));		\
+  }							\
+while (0)
+
+#include <math/math_private.h>
+#endif
--- libc/sysdeps/i386/fpu/s_nextafterl.c	15 Feb 2003 05:22:58 -0000	1.11
+++ libc/sysdeps/i386/fpu/s_nextafterl.c	16 Apr 2007 20:39:50 -0000	1.12
@@ -27,7 +27,7 @@ static char rcsid[] = "$NetBSD: $";
  */
 
 #include "math.h"
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	long double __nextafterl(long double x, long double y)
@@ -52,9 +52,12 @@ static char rcsid[] = "$NetBSD: $";
 	   return x+y;
 	if(x==y) return y;		/* x=y, return y */
 	if((ix|hx|lx)==0) {			/* x == 0 */
+	    long double u;
 	    SET_LDOUBLE_WORDS(x,esy&0x8000,0,1);/* return +-minsubnormal */
-	    y = x*x;
-	    if(y==x) return y; else return x;	/* raise underflow flag */
+	    u = math_opt_barrier (x);
+	    u = u * u;
+	    math_force_eval (u);		/* raise underflow flag */
+	    return x;
 	}
 	if(esx>=0) {			/* x > 0 */
 	    if(esx>esy||((esx==esy) && (hx>hy||((hx==hy)&&(lx>ly))))) {
@@ -109,12 +112,9 @@ static char rcsid[] = "$NetBSD: $";
 	}
 	esy = esx&0x7fff;
 	if(esy==0x7fff) return x+x;	/* overflow  */
-	if(esy==0) {			/* underflow */
-	    y = x*x;
-	    if(y!=x) {		/* raise underflow flag */
-	        SET_LDOUBLE_WORDS(y,esx,hx,lx);
-		return y;
-	    }
+	if(esy==0) {
+	    long double u = x*x;		/* underflow */
+	    math_force_eval (u);		/* raise underflow flag */
 	}
 	SET_LDOUBLE_WORDS(x,esx,hx,lx);
 	return x;
--- libc/sysdeps/i386/fpu/s_nexttoward.c	7 Dec 2003 21:11:52 -0000	1.2
+++ libc/sysdeps/i386/fpu/s_nexttoward.c	16 Apr 2007 20:40:11 -0000	1.3
@@ -27,7 +27,8 @@ static char rcsid[] = "$NetBSD: $";
  */
 
 #include "math.h"
-#include "math_private.h"
+#include <math_private.h>
+#include <float.h>
 
 #ifdef __STDC__
 	double __nexttoward(double x, long double y)
@@ -52,10 +53,12 @@ static char rcsid[] = "$NetBSD: $";
 	   return x+y;
 	if((long double) x==y) return y;	/* x=y, return y */
 	if((ix|lx)==0) {			/* x == 0 */
-	    double x2;
+	    double u;
 	    INSERT_WORDS(x,(esy&0x8000)<<16,1); /* return +-minsub */
-	    x2 = x*x;
-	    if(x2==x) return x2; else return x;	/* raise underflow flag */
+	    u = math_opt_barrier (x);
+	    u = u * u;
+	    math_force_eval (u);		/* raise underflow flag */
+	    return x;
 	}
 	if(hx>=0) {				/* x > 0 */
 	    if (esy>=0x8000||((ix>>20)&0x7ff)>iy-0x3c00
@@ -85,16 +88,14 @@ static char rcsid[] = "$NetBSD: $";
 	hy = hx&0x7ff00000;
 	if(hy>=0x7ff00000) {
 	  x = x+x;	/* overflow  */
-	  /* Force conversion to double.  */
-	  asm ("" : "=m"(x) : "m"(x));
+	  if (FLT_EVAL_METHOD != 0 && FLT_EVAL_METHOD != 1)
+	    /* Force conversion to double.  */
+	    asm ("" : "+m"(x));
 	  return x;
 	}
-	if(hy<0x00100000) {		/* underflow */
-	    double x2 = x*x;
-	    if(x2!=x) {		/* raise underflow flag */
-	        INSERT_WORDS(x2,hx,lx);
-		return x2;
-	    }
+	if(hy<0x00100000) {
+	    double u = x*x;			/* underflow */
+	    math_force_eval (u);		/* raise underflow flag */
 	}
 	INSERT_WORDS(x,hx,lx);
 	return x;
--- libc/sysdeps/i386/fpu/s_nexttowardf.c	7 Dec 2003 21:12:13 -0000	1.2
+++ libc/sysdeps/i386/fpu/s_nexttowardf.c	16 Apr 2007 20:40:27 -0000	1.3
@@ -19,7 +19,8 @@ static char rcsid[] = "$NetBSD: $";
 #endif
 
 #include "math.h"
-#include "math_private.h"
+#include <math_private.h>
+#include <float.h>
 
 #ifdef __STDC__
 	float __nexttowardf(float x, long double y)
@@ -44,10 +45,12 @@ static char rcsid[] = "$NetBSD: $";
 	   return x+y;
 	if((long double) x==y) return y;	/* x=y, return y */
 	if(ix==0) {				/* x == 0 */
-	    float x2;
+	    float u;
 	    SET_FLOAT_WORD(x,((esy&0x8000)<<16)|1);/* return +-minsub*/
-	    x2 = x*x;
-	    if(x2==x) return x2; else return x;	/* raise underflow flag */
+	    u = math_opt_barrier (x);
+	    u = u * u;
+	    math_force_eval (u);		/* raise underflow flag */
+	    return x;
 	}
 	if(hx>=0) {				/* x > 0 */
 	    if(esy>=0x8000||((ix>>23)&0xff)>iy-0x3f80
@@ -69,16 +72,14 @@ static char rcsid[] = "$NetBSD: $";
 	hy = hx&0x7f800000;
 	if(hy>=0x7f800000) {
 	  x = x+x;	/* overflow  */
-	  /* Force conversion to float.  */
-	  asm ("" : "=m"(x) : "m"(x));
+	  if (FLT_EVAL_METHOD != 0)
+	    /* Force conversion to float.  */
+	    asm ("" : "+m"(x));
 	  return x;
 	}
-	if(hy<0x00800000) {		/* underflow */
-	    float x2 = x*x;
-	    if(x2!=x) {		/* raise underflow flag */
-	        SET_FLOAT_WORD(x2,hx);
-		return x2;
-	    }
+	if(hy<0x00800000) {
+	    float u = x*x;			/* underflow */
+	    math_force_eval (u);		/* raise underflow flag */
 	}
 	SET_FLOAT_WORD(x,hx);
 	return x;
--- libc/sysdeps/ieee754/flt-32/s_nextafterf.c	7 Dec 2003 20:53:59 -0000	1.3
+++ libc/sysdeps/ieee754/flt-32/s_nextafterf.c	16 Apr 2007 20:39:19 -0000	1.4
@@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: s_nextaf
 #endif
 
 #include "math.h"
-#include "math_private.h"
+#include <math_private.h>
 #include <float.h>
 
 #ifdef __STDC__
@@ -40,9 +40,12 @@ static char rcsid[] = "$NetBSD: s_nextaf
 	   return x+y;
 	if(x==y) return y;		/* x=y, return y */
 	if(ix==0) {				/* x == 0 */
+	    float u;
 	    SET_FLOAT_WORD(x,(hy&0x80000000)|1);/* return +-minsubnormal */
-	    y = x*x;
-	    if(y==x) return y; else return x;	/* raise underflow flag */
+	    u = math_opt_barrier (x);
+	    u = u*u;
+	    math_force_eval (u);		/* raise underflow flag */
+	    return x;
 	}
 	if(hx>=0) {				/* x > 0 */
 	    if(hx>hy) {				/* x > y, x -= ulp */
@@ -61,15 +64,12 @@ static char rcsid[] = "$NetBSD: s_nextaf
 	if(hy>=0x7f800000) {
 	  x = x+x;	/* overflow  */
 	  if (FLT_EVAL_METHOD != 0)
-	    asm ("" : "=m"(x) : "m"(x));
+	    asm ("" : "+m"(x));
 	  return x;	/* overflow  */
 	}
-	if(hy<0x00800000) {		/* underflow */
-	    y = x*x;
-	    if(y!=x) {		/* raise underflow flag */
-	        SET_FLOAT_WORD(y,hx);
-		return y;
-	    }
+	if(hy<0x00800000) {
+	    float u = x*x;			/* underflow */
+	    math_force_eval (u);		/* raise underflow flag */
 	}
 	SET_FLOAT_WORD(x,hx);
 	return x;
--- libc/sysdeps/ieee754/ldbl-128/s_nextafterl.c	14 Jul 1999 00:09:34 -0000	1.1
+++ libc/sysdeps/ieee754/ldbl-128/s_nextafterl.c	16 Apr 2007 20:39:50 -0000	1.2
@@ -25,7 +25,7 @@ static char rcsid[] = "$NetBSD: $";
  */
 
 #include "math.h"
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	long double __nextafterl(long double x, long double y)
@@ -47,9 +47,12 @@ static char rcsid[] = "$NetBSD: $";
 	   return x+y;
 	if(x==y) return y;		/* x=y, return y */
 	if((ix|lx)==0) {			/* x == 0 */
+	    long double u;
 	    SET_LDOUBLE_WORDS64(x,hy&0x8000000000000000ULL,1);/* return +-minsubnormal */
-	    y = x*x;
-	    if(y==x) return y; else return x;	/* raise underflow flag */
+	    u = math_opt_barrier (x);
+	    u = u * u;
+	    math_force_eval (u);		/* raise underflow flag */
+	    return x;
 	}
 	if(hx>=0) {			/* x > 0 */
 	    if(hx>hy||((hx==hy)&&(lx>ly))) {	/* x > y, x -= ulp */
@@ -70,12 +73,9 @@ static char rcsid[] = "$NetBSD: $";
 	}
 	hy = hx&0x7fff000000000000LL;
 	if(hy==0x7fff000000000000LL) return x+x;/* overflow  */
-	if(hy==0) {				/* underflow */
-	    y = x*x;
-	    if(y!=x) {		/* raise underflow flag */
-	        SET_LDOUBLE_WORDS64(y,hx,lx);
-		return y;
-	    }
+	if(hy==0) {
+	    long double u = x*x;		/* underflow */
+	    math_force_eval (u);		/* raise underflow flag */
 	}
 	SET_LDOUBLE_WORDS64(x,hx,lx);
 	return x;
--- libc/sysdeps/ieee754/ldbl-128/s_nexttoward.c	7 Dec 2003 21:21:29 -0000	1.3
+++ libc/sysdeps/ieee754/ldbl-128/s_nexttoward.c	16 Apr 2007 20:39:19 -0000	1.4
@@ -26,7 +26,7 @@ static char rcsid[] = "$NetBSD: $";
  */
 
 #include "math.h"
-#include "math_private.h"
+#include <math_private.h>
 #include <float.h>
 
 #ifdef __STDC__
@@ -53,10 +53,12 @@ static char rcsid[] = "$NetBSD: $";
 	   return x+y;
 	if((long double) x==y) return y;	/* x=y, return y */
 	if((ix|lx)==0) {			/* x == 0 */
-	    double x2;
+	    double u;
 	    INSERT_WORDS(x,(u_int32_t)((hy>>32)&0x80000000),1);/* return +-minsub */
-	    x2 = x*x;
-	    if(x2==x) return x2; else return x;	/* raise underflow flag */
+	    u = math_opt_barrier (x);
+	    u = u * u;
+	    math_force_eval (u);		/* raise underflow flag */
+	    return x;
 	}
 	if(hx>=0) {				/* x > 0 */
 	    if (hy<0||(ix>>20)>(iy>>48)-0x3c00
@@ -87,16 +89,13 @@ static char rcsid[] = "$NetBSD: $";
 	if(hy>=0x7ff00000) {
 	  x = x+x;	/* overflow  */
 	  if (FLT_EVAL_METHOD != 0 && FLT_EVAL_METHOD != 1)
-	    /* Force conversion to float.  */
-	    asm ("" : "=m"(x) : "m"(x));
+	    /* Force conversion to double.  */
+	    asm ("" : "+m"(x));
 	  return x;
 	}
-	if(hy<0x00100000) {		/* underflow */
-	    double x2 = x*x;
-	    if(x2!=x) {		/* raise underflow flag */
-	        INSERT_WORDS(x2,hx,lx);
-		return x2;
-	    }
+	if(hy<0x00100000) {
+	    double u = x*x;			/* underflow */
+	    math_force_eval (u);		/* raise underflow flag */
 	}
 	INSERT_WORDS(x,hx,lx);
 	return x;
--- libc/sysdeps/ieee754/ldbl-128ibm/s_nextafterl.c	28 Jan 2006 00:07:25 -0000	1.1
+++ libc/sysdeps/ieee754/ldbl-128ibm/s_nextafterl.c	16 Apr 2007 20:42:16 -0000	1.2
@@ -24,8 +24,8 @@ static char rcsid[] = "$NetBSD: $";
  *   Special cases:
  */
 
-#include "math.h"
-#include "math_private.h"
+#include <math.h>
+#include <math_private.h>
 #include <math_ldbl_opt.h>
 
 #ifdef __STDC__
@@ -53,9 +53,12 @@ static char rcsid[] = "$NetBSD: $";
 	if(x==y)
 	    return y;		/* x=y, return y */
 	if(ihx == 0 && ilx == 0) {			/* x == 0 */
+	    long double u;
 	    SET_LDOUBLE_WORDS64(x,hy&0x8000000000000000ULL,1);/* return +-minsubnormal */
-	    y = x*x;
-	    if(y==x) return y; else return x;	/* raise underflow flag */
+	    u = math_opt_barrier (u);
+	    u = u * u;
+	    math_force_eval (u);		/* raise underflow flag */
+	    return x;
 	}
 	if(ihx>=0) {			/* x > 0 */
 	    if(ihx>ihy||((ihx==ihy)&&(ilx>ily))) {	/* x > y, x -= ulp */
@@ -93,12 +96,9 @@ static char rcsid[] = "$NetBSD: $";
 	}
 	hy = hx&0x7ff0000000000000LL;
 	if(hy==0x7ff0000000000000LL) return x+x;/* overflow  */
-	if(hy==0) {				/* underflow */
-	    y = x*x;
-	    if(y!=x) {		/* raise underflow flag */
-	        SET_LDOUBLE_WORDS64(y,hx,lx);
-		return y;
-	    }
+	if(hy==0) {
+	    long double u = x * x;		/* underflow */
+	    math_force_eval (u);		/* raise underflow flag */
 	}
 	SET_LDOUBLE_WORDS64(x,hx,lx);
 	return x;
--- libc/sysdeps/ieee754/ldbl-128ibm/s_nexttoward.c	28 Jan 2006 00:07:25 -0000	1.1
+++ libc/sysdeps/ieee754/ldbl-128ibm/s_nexttoward.c	16 Apr 2007 20:39:19 -0000	1.2
@@ -26,7 +26,7 @@ static char rcsid[] = "$NetBSD: $";
  */
 
 #include "math.h"
-#include "math_private.h"
+#include <math_private.h>
 #include <math_ldbl_opt.h>
 #include <float.h>
 
@@ -55,10 +55,12 @@ static char rcsid[] = "$NetBSD: $";
 	   return x+y;
 	if((long double) x==y) return y;	/* x=y, return y */
 	if((ix|lx)==0) {			/* x == 0 */
-	    double x2;
+	    double u;
 	    INSERT_WORDS(x,(u_int32_t)((hy>>32)&0x80000000),1);/* return +-minsub */
-	    x2 = x*x;
-	    if(x2==x) return x2; else return x;	/* raise underflow flag */
+	    u = math_opt_barrier (x);
+	    u = u * u;
+	    math_force_eval (u);		/* raise underflow flag */
+	    return x;
 	}
 	if(hx>=0) {				/* x > 0 */
 	    if (hy<0||(ix>>20)>(iy>>52)
@@ -89,16 +91,13 @@ static char rcsid[] = "$NetBSD: $";
 	if(hy>=0x7ff00000) {
 	  x = x+x;	/* overflow  */
 	  if (FLT_EVAL_METHOD != 0 && FLT_EVAL_METHOD != 1)
-	    /* Force conversion to float.  */
-	    asm ("" : "=m"(x) : "m"(x));
+	    /* Force conversion to double.  */
+	    asm ("" : "+m"(x));
 	  return x;
 	}
-	if(hy<0x00100000) {		/* underflow */
-	    double x2 = x*x;
-	    if(x2!=x) {		/* raise underflow flag */
-	        INSERT_WORDS(x2,hx,lx);
-		return x2;
-	    }
+	if(hy<0x00100000) {
+	    double u = x*x;			/* underflow */
+	    math_force_eval (u);		/* raise underflow flag */
 	}
 	INSERT_WORDS(x,hx,lx);
 	return x;
--- libc/sysdeps/ieee754/ldbl-128ibm/s_nexttowardf.c	28 Jan 2006 00:07:25 -0000	1.1
+++ libc/sysdeps/ieee754/ldbl-128ibm/s_nexttowardf.c	16 Apr 2007 20:40:42 -0000	1.2
@@ -19,8 +19,9 @@ static char rcsid[] = "$NetBSD: $";
 #endif
 
 #include "math.h"
-#include "math_private.h"
+#include <math_private.h>
 #include <math_ldbl_opt.h>
+#include <float.h>
 
 #ifdef __STDC__
 	float __nexttowardf(float x, long double y)
@@ -46,10 +47,12 @@ static char rcsid[] = "$NetBSD: $";
 	   return x+y;
 	if((long double) x==y) return y;	/* x=y, return y */
 	if(ix==0) {				/* x == 0 */
-	    float x2;
+	    float u;
 	    SET_FLOAT_WORD(x,(u_int32_t)((hy>>32)&0x80000000)|1);/* return +-minsub*/
-	    x2 = x*x;
-	    if(x2==x) return x2; else return x;	/* raise underflow flag */
+	    u = math_opt_barrier (x);
+	    u = u * u;
+	    math_force_eval (u);		/* raise underflow flag */
+	    return x;
 	}
 	if(hx>=0) {				/* x > 0 */
 	    if(hy<0||(ix>>23)>(iy>>52)-0x380
@@ -69,13 +72,16 @@ static char rcsid[] = "$NetBSD: $";
 	    }
 	}
 	hy = hx&0x7f800000;
-	if(hy>=0x7f800000) return x+x;	/* overflow  */
+	if(hy>=0x7f800000) {
+	  x = x+x;	/* overflow  */
+	  if (FLT_EVAL_METHOD != 0)
+	    /* Force conversion to float.  */
+	    asm ("" : "+m"(x));
+	  return x;
+	}
 	if(hy<0x00800000) {		/* underflow */
-	    float x2 = x*x;
-	    if(x2!=x) {		/* raise underflow flag */
-	        SET_FLOAT_WORD(x2,hx);
-		return x2;
-	    }
+	    float u = x*x;
+	    math_force_eval (u);	/* raise underflow flag */
 	}
 	SET_FLOAT_WORD(x,hx);
 	return x;
--- libc/sysdeps/ieee754/ldbl-96/s_nextafterl.c	16 Oct 2001 11:02:24 -0000	1.3
+++ libc/sysdeps/ieee754/ldbl-96/s_nextafterl.c	16 Apr 2007 20:39:50 -0000	1.4
@@ -26,7 +26,7 @@ static char rcsid[] = "$NetBSD: $";
  */
 
 #include "math.h"
-#include "math_private.h"
+#include <math_private.h>
 
 #ifdef __STDC__
 	long double __nextafterl(long double x, long double y)
@@ -48,9 +48,12 @@ static char rcsid[] = "$NetBSD: $";
 	   return x+y;
 	if(x==y) return y;		/* x=y, return y */
 	if((ix|hx|lx)==0) {			/* x == 0 */
+	    long double u;
 	    SET_LDOUBLE_WORDS(x,esy&0x8000,0,1);/* return +-minsubnormal */
-	    y = x*x;
-	    if(y==x) return y; else return x;	/* raise underflow flag */
+	    u = math_opt_barrier (x);
+	    u = u * u;
+	    math_force_eval (u);		/* raise underflow flag */
+	    return x;
 	}
 	if(esx<0x8000) {			/* x > 0 */
 	    if(ix>iy||((ix==iy) && (hx>hy||((hx==hy)&&(lx>ly))))) {
@@ -85,13 +88,10 @@ static char rcsid[] = "$NetBSD: $";
 	    }
 	}
 	esy = esx&0x7fff;
-	if(esy==0x7fff) return x+x;	/* overflow  */
-	if(esy==0) {			/* underflow */
-	    y = x*x;
-	    if(y!=x) {		/* raise underflow flag */
-	        SET_LDOUBLE_WORDS(y,esx,hx,lx);
-		return y;
-	    }
+	if(esy==0x7fff) return x+x;		/* overflow  */
+	if(esy==0) {
+	    long double u = x*x;		/* underflow */
+	    math_force_eval (u);		/* raise underflow flag */
 	}
 	SET_LDOUBLE_WORDS(x,esx,hx,lx);
 	return x;
--- libc/sysdeps/ieee754/ldbl-96/s_nexttoward.c	14 Jan 2006 12:08:51 -0000	1.6
+++ libc/sysdeps/ieee754/ldbl-96/s_nexttoward.c	16 Apr 2007 20:39:19 -0000	1.7
@@ -26,7 +26,7 @@ static char rcsid[] = "$NetBSD: $";
  */
 
 #include "math.h"
-#include "math_private.h"
+#include <math_private.h>
 #include <float.h>
 
 #ifdef __STDC__
@@ -50,10 +50,12 @@ static char rcsid[] = "$NetBSD: $";
 	   return x+y;
 	if((long double) x==y) return y;	/* x=y, return y */
 	if((ix|lx)==0) {			/* x == 0 */
-	    double x2;
+	    double u;
 	    INSERT_WORDS(x,(esy&0x8000)<<16,1); /* return +-minsub */
-	    x2 = x*x;
-	    if(x2==x) return x2; else return x;	/* raise underflow flag */
+	    u = math_opt_barrier (x);
+	    u = u * u;
+	    math_force_eval (u);		/* raise underflow flag */
+	    return x;
 	}
 	if(hx>=0) {				/* x > 0 */
 	    if (esy>=0x8000||((ix>>20)&0x7ff)>iy-0x3c00
@@ -84,16 +86,13 @@ static char rcsid[] = "$NetBSD: $";
 	if(hy>=0x7ff00000) {
 	  x = x+x;	/* overflow  */
 	  if (FLT_EVAL_METHOD != 0 && FLT_EVAL_METHOD != 1)
-	    /* Force conversion to float.  */
-	    asm ("" : "=m"(x) : "m"(x));
+	    /* Force conversion to double.  */
+	    asm ("" : "+m"(x));
 	  return x;
 	}
-	if(hy<0x00100000) {		/* underflow */
-	    double x2 = x*x;
-	    if(x2!=x) {		/* raise underflow flag */
-	        INSERT_WORDS(x2,hx,lx);
-		return x2;
-	    }
+	if(hy<0x00100000) {
+	    double u = x*x;			/* underflow */
+	    math_force_eval (u);		/* raise underflow flag */
 	}
 	INSERT_WORDS(x,hx,lx);
 	return x;
--- libc/sysdeps/ieee754/ldbl-96/s_nexttowardf.c	16 Jun 2001 03:34:42 -0000	1.2
+++ libc/sysdeps/ieee754/ldbl-96/s_nexttowardf.c	16 Apr 2007 20:41:10 -0000	1.3
@@ -18,7 +18,8 @@ static char rcsid[] = "$NetBSD: $";
 #endif
 
 #include "math.h"
-#include "math_private.h"
+#include <math_private.h>
+#include <float.h>
 
 #ifdef __STDC__
 	float __nexttowardf(float x, long double y)
@@ -41,10 +42,12 @@ static char rcsid[] = "$NetBSD: $";
 	   return x+y;
 	if((long double) x==y) return y;	/* x=y, return y */
 	if(ix==0) {				/* x == 0 */
-	    float x2;
+	    float u;
 	    SET_FLOAT_WORD(x,((esy&0x8000)<<16)|1);/* return +-minsub*/
-	    x2 = x*x;
-	    if(x2==x) return x2; else return x;	/* raise underflow flag */
+	    u = math_opt_barrier (x);
+	    u = u * u;
+	    math_force_eval (u);		/* raise underflow flag */
+	    return x;
 	}
 	if(hx>=0) {				/* x > 0 */
 	    if(esy>=0x8000||((ix>>23)&0xff)>iy-0x3f80
@@ -64,13 +67,16 @@ static char rcsid[] = "$NetBSD: $";
 	    }
 	}
 	hy = hx&0x7f800000;
-	if(hy>=0x7f800000) return x+x;	/* overflow  */
-	if(hy<0x00800000) {		/* underflow */
-	    float x2 = x*x;
-	    if(x2!=x) {		/* raise underflow flag */
-	        SET_FLOAT_WORD(x2,hx);
-		return x2;
-	    }
+	if(hy>=0x7f800000) {
+	  x = x+x;	/* overflow  */
+	  if (FLT_EVAL_METHOD != 0)
+	    /* Force conversion to float.  */
+	    asm ("" : "+m"(x));
+	  return x;
+	}
+	if(hy<0x00800000) {
+	    float u = x*x;			/* underflow */
+	    math_force_eval (u);		/* raise underflow flag */
 	}
 	SET_FLOAT_WORD(x,hx);
 	return x;
--- libc/sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c	21 Jan 2006 19:43:12 -0000	1.1
+++ libc/sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c	16 Apr 2007 20:40:57 -0000	1.2
@@ -20,7 +20,10 @@
  *   Special cases:
  */
 
+#include <math.h>
+#include <math_private.h>
 #include <math_ldbl_opt.h>
+#include <float.h>
 
 float __nldbl_nexttowardf(float x, double y);
 
@@ -39,10 +42,12 @@ float __nldbl_nexttowardf(float x, doubl
 	   return x+y;
 	if((double) x==y) return y;		/* x=y, return y */
 	if(ix==0) {				/* x == 0 */
-	    float x2;
+	    float u;
 	    SET_FLOAT_WORD(x,(u_int32_t)(hy&0x80000000)|1);/* return +-minsub*/
-	    x2 = x*x;
-	    if(x2==x) return x2; else return x; /* raise underflow flag */
+	    u = math_opt_barrier (x);
+	    u = u * u;
+	    math_force_eval (u);		/* raise underflow flag */
+	    return x;
 	}
 	if(hx>=0) {				/* x > 0 */
 	    if(hy<0||(ix>>23)>(iy>>20)-0x380
@@ -60,13 +65,16 @@ float __nldbl_nexttowardf(float x, doubl
 		hx += 1;
 	}
 	hy = hx&0x7f800000;
-	if(hy>=0x7f800000) return x+x;	/* overflow  */
-	if(hy<0x00800000) {		/* underflow */
-	    float x2 = x*x;
-	    if(x2!=x) {		/* raise underflow flag */
-		SET_FLOAT_WORD(x2,hx);
-		return x2;
-	    }
+	if(hy>=0x7f800000) {
+	  x = x+x;	/* overflow  */
+	  if (FLT_EVAL_METHOD != 0)
+	    /* Force conversion to float.  */
+	    asm ("" : "+m"(x));
+	  return x;
+	}
+	if(hy<0x00800000) {
+	    float u = x*x;			/* underflow */
+	    math_force_eval (u);		/* raise underflow flag */
 	}
 	SET_FLOAT_WORD(x,hx);
 	return x;
--- libc/sysdeps/x86_64/fpu/math_private.h	1 Jan 1970 00:00:00 -0000
+++ libc/sysdeps/x86_64/fpu/math_private.h	16 Apr 2007 20:37:41 -0000	1.1
@@ -0,0 +1,21 @@
+#ifndef _MATH_PRIVATE_H
+
+#define math_opt_barrier(x) \
+({ __typeof(x) __x;					\
+   if (sizeof (x) <= sizeof (double))			\
+     __asm ("" : "=x" (__x) : "0" (x));			\
+   else							\
+     __asm ("" : "=t" (__x) : "0" (x));			\
+   __x; })
+#define math_force_eval(x) \
+do							\
+  {							\
+    if (sizeof (x) <= sizeof (double))			\
+      __asm __volatile ("" : : "x" (x));		\
+    else						\
+      __asm __volatile ("" : : "f" (x));		\
+  }							\
+while (0)
+
+#include <math/math_private.h>
+#endif

glibc-bz3322.patch:
 locale/iso-3166.def            |    1 
 locale/iso-4217.def            |    1 
 localedata/SUPPORTED           |    2 
 localedata/locales/sr_ME       |   81 ++++++---
 localedata/locales/sr_RS       |  360 +++++++++++++++++++++++++++++++++++++++++
 localedata/locales/sr_RS at latin |  174 +++++++++++++++++++
 6 files changed, 591 insertions(+), 28 deletions(-)

--- NEW FILE glibc-bz3322.patch ---
2007-02-16  Ulrich Drepper  <drepper at redhat.com>

	* locale/iso-3166.def: Add entry for Serbia.
	* locale/iso-4217.def: Define RSD.

2007-02-17  Ulrich Drepper  <drepper at redhat.com>

	[BZ #3334]
	* locales/sr_ME: Update from maintainer.

2007-02-16  Ulrich Drepper  <drepper at redhat.com>

	[BZ #3322]
	* SUPPORTED (SUPPORTED-LOCALES): Add sr_RS and sr_RS at latin.
	* locales/sr_RS: New file.
	* locales/sr_RS at latin: New file.

--- libc/locale/iso-3166.def	29 Sep 2006 18:07:50 -0000	1.7
+++ libc/locale/iso-3166.def	17 Feb 2007 07:54:52 -0000	1.9
@@ -197,7 +200,8 @@ DEFINE_COUNTRY_CODE ("SAN MARINO", SM, S
 DEFINE_COUNTRY_CODE ("SAO TOME AND PRINCIPE", ST, STP, 678)
 DEFINE_COUNTRY_CODE ("SAUDI ARABIA", SA, SAU, 682)
 DEFINE_COUNTRY_CODE ("SENEGAL", SN, SEN, 686)
 DEFINE_COUNTRY_CODE ("SERBIA AND MONTENEGRO", CS, SCG, 891)
+DEFINE_COUNTRY_CODE ("SERBIA", RS, SRB, 688)
 DEFINE_COUNTRY_CODE ("SEYCHELLES", SC, SYC, 690)
 DEFINE_COUNTRY_CODE ("SIERRA LEONE", SL, SLE, 694)
 DEFINE_COUNTRY_CODE ("SINGAPORE", SG, SGP, 702)
--- libc/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
+++ libc/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
@@ -129,6 +128,7 @@ DEFINE_INT_CURR("PYG")		/* Paraguay Guar
 DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
 DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
 DEFINE_INT_CURR("RON")		/* Romanian New Leu  */
+DEFINE_INT_CURR("RSD")		/* Serbian Dinars  */
 DEFINE_INT_CURR("RUB")		/* Russian Ruble  */
 DEFINE_INT_CURR("RWF")		/* Rwanda Franc  */
 DEFINE_INT_CURR("SAR")		/* Saudi Arabia Riyal  */
--- libc/localedata/SUPPORTED	3 Nov 2006 04:24:47 -0000	1.98
+++ libc/localedata/SUPPORTED	18 Feb 2007 04:52:09 -0000	1.102
@@ -326,6 +326,8 @@ sq_AL/ISO-8859-1 \
 sr_CS.UTF-8/UTF-8 \
 sr_CS/ISO-8859-5 \
 sr_ME/UTF-8 \
+sr_RS/UTF-8 \
+sr_RS at latin/UTF-8 \
 ss_ZA/UTF-8 \
 st_ZA.UTF-8/UTF-8 \
 st_ZA/ISO-8859-1 \
--- libc/localedata/locales/sr_ME	29 Sep 2006 18:28:32 -0000	1.1
+++ libc/localedata/locales/sr_ME	17 Feb 2007 08:08:12 -0000	1.2
@@ -1,42 +1,38 @@
 comment_char %
 escape_char  /
 %
-% Serbian Language in Jekavian dialect Locale for Serbia and Montenegro
-% Source: sr_YU locale
+% Serbian Language locale for Montenegro
+% Source: sr_YU, sr_CS locale
 % Address:
 %
 % Contact: Danilo Segan
-% Email: dsegan at gmx.net
-% Tel: +381 63 8626082
+% Email: danilo at gnome.org
+% Tel: +381 63 323456
 % Fax: none
 % Language: sr
-% Territory: CS
-% Revision: 1.0
-% Date: 2003-08-13
+% Territory: ME
+% Revision: 1.2
+% Date: 2006-10-11
 % Application: general
 % Users: general
 % Charset: UTF-8, ISO-8859-5
 % Distribution and use is free, also
 % for commercial purposes.
-%
-% TODO:
-% -- fix LC_COLLATE to work correctly for latin alphabet too
-%
 
 LC_IDENTIFICATION
-title      "Serbian locale for Serbia and Montenegro"
-source     "sr_YU locale"
+title      "Serbian locale for Montenegro"
+source     "sr_YU, sr_CS locale"
 address    ""
 contact    "Danilo Segan"
 email      "bug-glibc at gnu.org"
 tel        ""
 fax        ""
 language   "Serbian"
-territory  "Serbia and Montenegro"
-revision   "1.1"
-date       "2004-01-10"
+territory  "Montenegro"
+revision   "1.2"
+date       "2006-10-11"
 audience   "general"
-application   ""
+application   "GNU locale"
 abbreviation  ""
 %
 category  i18n:1997;LC_IDENTIFICATION
@@ -54,19 +50,33 @@ category  i18n:1997;LC_MEASUREMENT
 END LC_IDENTIFICATION
 
 LC_CTYPE
-copy "sr_CS"
+copy "i18n"
 END LC_CTYPE
 
 LC_COLLATE
-copy "sr_CS"
+copy "sr_RS"
 END LC_COLLATE
 
 LC_MONETARY
-copy "sr_CS"
+int_curr_symbol           "<U0045><U0055><U0052><U0020>"
+currency_symbol           "<U20AC>"
+mon_decimal_point         "<U002C>"
+mon_thousands_sep         "<U002E>"
+mon_grouping              3;3
+positive_sign             ""
+negative_sign             "<U002D>"
+int_frac_digits           2
+frac_digits               2
+p_cs_precedes             0
+p_sep_by_space            1
+n_cs_precedes             0
+n_sep_by_space            1
+p_sign_posn               1
+n_sign_posn               1
 END LC_MONETARY
 
 LC_NUMERIC
-copy "sr_CS"
+copy "sr_RS"
 END LC_NUMERIC
 
 LC_TIME
@@ -110,31 +120,46 @@ t_fmt_ampm "<U0025><U0054>"
 date_fmt  "<U0025><U0061><U002c><U0020><U0025><U0065><U002E><U0020>/
 <U0025><U0062><U0020><U0025><U0059><U002E><U0020><U0020><U0025><U0048>/
 <U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U005A><U000A>"
-week    7;19971201;4
+% week    7;19971201;4
 first_weekday 2
 first_workday 2
 END LC_TIME
 
 LC_MESSAGES
-copy "sr_CS"
+copy "sr_RS"
 END LC_MESSAGES
 
 LC_PAPER
-copy "sr_CS"
+copy "sr_RS"
 END LC_PAPER
 
 LC_NAME
-copy "sr_CS"
+copy "sr_RS"
 END LC_NAME
 
 LC_ADDRESS
-copy "sr_CS"
+postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
+<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
+<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
+<U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
+<U004E><U0025><U0063><U0025><U004E>"
+country_ab2   "<U004D><U0045>"
+country_ab3   "<U004D><U004E><U0045>"
+country_post  "<U004D><U004E><U0045>"
+country_name  "<U0426><U0440><U043D><U0430><U0020><U0413><U043E><U0440><U0430>"
+country_num   499
+country_car   "<U004D><U004E><U0045>"
+country_isbn  "<U0038><U0036>"
+lang_name     "<U0441><U0440><U043F><U0441><U043A><U0438>"
+lang_term     "<U0073><U0072><U0070>"
+lang_lib      "<U0073><U0063><U0063>"
+lang_ab	      "<U0073><U0072>"
 END LC_ADDRESS
 
 LC_TELEPHONE
-copy "sr_CS"
+copy "sr_RS"
 END LC_TELEPHONE
 
 LC_MEASUREMENT
-copy "sr_CS"
+copy "sr_RS"
 END LC_MEASUREMENT
--- libc/localedata/locales/sr_RS	1 Jan 1970 00:00:00 -0000
+++ libc/localedata/locales/sr_RS	17 Feb 2007 07:55:58 -0000	1.1
@@ -0,0 +1,360 @@
+comment_char %
+escape_char  /
+%
+% Serbian Language Locale for Serbia
+% Source: sr_YU, sr_CS locales
+% Address:
+%
+% Contact: Danilo Segan
+% Email: danilo at gnome.org
+% Tel: +381 63 323456
+% Fax: none
+% Language: sr
+% Territory: RS
+% Revision: 1.3
+% Date: 2006-10-09
+% Application: general
+% Users: general
+% Charset: UTF-8
+% Distribution and use is free, also
+% for commercial purposes.
+%
+
+LC_IDENTIFICATION
+title      "Serbian locale for Serbia"
+source     "sr_YU, sr_CS locale"
+address    ""
+contact    "Danilo Segan"
+email      "bug-glibc-locales at gnu.org"
+tel        ""
+fax        ""
+language   "Serbian"
+territory  "Serbia"
+revision   "1.3"
+date       "2006-10-09"
+audience   "general"
+application   "GNU locale"
+abbreviation  ""
+%
+category  "i18n:1997";LC_IDENTIFICATION
+category  "i18n:1997";LC_CTYPE
+category  "i18n:1997";LC_COLLATE
+category  "i18n:1997";LC_MONETARY
+category  "i18n:1997";LC_NUMERIC
+category  "i18n:1997";LC_TIME
+category  "i18n:1997";LC_MESSAGES
+category  "i18n:1997";LC_PAPER
+category  "i18n:1997";LC_NAME
+category  "i18n:1997";LC_ADDRESS
+category  "i18n:1997";LC_TELEPHONE
+category  "i18n:1997";LC_MEASUREMENT
+END LC_IDENTIFICATION
+
+LC_CTYPE
+copy "i18n"
+translit_start
+include "translit_combining";""
+
+% cyrillic -> latin
+<U0452> "<U0111>";"<U0064><U006A>" % d-
+<U0453> "<U0067><U006A>" % gj
+<U0455> "<U0064><U007A>" % dz
+<U0458> "<U006A>" % j
+<U0459> "<U006C><U006A>" % lj
+<U045A> "<U006E><U006A>" % nj
+<U045B> "<U0107>";"<U0063>" % c'
+<U045C> "<U006B><U006A>" % kj
+<U045F> "<U0064><U017E>";"<U0064><U007A>" % dz<
+
+<U0402> "<U0110>";"<U0044><U006A>" % D-
+<U0403> "<U0047><U006A>" % Gj
+<U0405> "<U0044><U007A>" % Dz
+<U0408> "<U004A>" % J
+<U0409> "<U004C><U006A>" % Lj
+<U040A> "<U004E><U006A>" % Nj
+<U040B> "<U0106>";"<U0043>" % C'
+<U040C> "<U004B><U006A>" % Kj
+<U040F> "<U0044><U017E>";"<U0064><U007A>" % Dz<
+
+<U0430> "<U0061>"
+<U0431> "<U0062>"
+<U0446> "<U0063>"
+<U0434> "<U0064>"
+<U0435> "<U0065>"
+<U0444> "<U0066>"
+<U0433> "<U0067>"
+<U0445> "<U0068>"
+<U0438> "<U0069>"
+<U043A> "<U006B>"
+<U043B> "<U006C>"
+<U043C> "<U006D>"
+<U043D> "<U006E>"
+<U043E> "<U006F>"
+<U043F> "<U0070>"
+<U0440> "<U0072>"
+<U0441> "<U0073>"
+<U0442> "<U0074>"
+<U0443> "<U0075>"
+<U0432> "<U0076>"
+<U0437> "<U007A>"
+<U0436> "<U017E>";"<U007A>" % z<
+<U0448> "<U0161>";"<U0073>" % s<
+<U0447> "<U010D>";"<U0063>" % c<
+
+<U0410> "<U0041>"
+<U0411> "<U0042>"
+<U0426> "<U0043>"
+<U0414> "<U0044>"
+<U0415> "<U0045>"
+<U0424> "<U0046>"
+<U0413> "<U0047>"
+<U0425> "<U0048>"
+<U0418> "<U0049>"
+<U041A> "<U004B>"
+<U041B> "<U004C>"
+<U041C> "<U004D>"
+<U041D> "<U004E>"
+<U041E> "<U004F>"
+<U041F> "<U0050>"
+<U0420> "<U0052>"
+<U0421> "<U0053>"
+<U0422> "<U0054>"
+<U0423> "<U0055>"
+<U0412> "<U0056>"
+<U0417> "<U005A>"
+<U0416> "<U017D>";"<U005A>" % z<
+<U0428> "<U0160>";"<U0053>" % s<
+<U0427> "<U010C>";"<U0063>" % c<
+
+translit_end
+END LC_CTYPE
+
+
+LC_COLLATE
+
+copy "iso14651_t1"
+
+collating-element <D-Z<> from "<U0044><U017D>"
+collating-element <D-z<> from "<U0044><U017E>"
+collating-element <d-Z<> from "<U0064><U017D>"
+collating-element <d-z<> from "<U0064><U017E>"
+
+collating-element <L-J> from "<U004C><U004A>"
+collating-element <L-j> from "<U004C><U006A>"
+collating-element <l-J> from "<U006C><U004A>"
+collating-element <l-j> from "<U006C><U006A>"
+
+collating-element <N-J> from "<U004E><U004A>"
+collating-element <N-j> from "<U004E><U006A>"
+collating-element <n-J> from "<U006E><U004A>"
+collating-element <n-j> from "<U006E><U006A>"
+
+collating-symbol  <d-z-sh>
+collating-symbol  <l-j-sh>
+collating-symbol  <n-j-sh>
+
+collating-symbol <cacute>
+collating-symbol <ccaron>
+collating-symbol <d//>
+collating-symbol <scaron>
+collating-symbol <zcaron>
+
+collating-symbol <CAP-MIN>
+collating-symbol <MIN-CAP>
+
+reorder-after <MIN>
+<MIN-CAP>
+reorder-after <CAP>
+<CAP-MIN>
+
+reorder-after <c>
+<cacute>
+<ccaron>
+<d>
+<d-z-sh>
+<d//>
+reorder-after <l>
+<l-j-sh>
+reorder-after <n>
+<n-j-sh>
+reorder-after <s>
+<scaron>
+reorder-after <z>
+<zcaron>
+
+reorder-after <U0063>
+<U0107>	<cacute>;<PCT>;<MIN>;IGNORE
+<U010D>	<ccaron>;<PCT>;<MIN>;IGNORE
+reorder-after <U0043>
+<U0106>	<cacute>;<PCT>;<CAP>;IGNORE
+<U010C>	<ccaron>;<PCT>;<CAP>;IGNORE
+
+reorder-after <U0064>
+<d-z<>	<d-z-sh>;<PCT>;<MIN>;IGNORE
+<U01C6>	<d-z-sh>;<PCT>;<MIN>;IGNORE
+<d-Z<>	<d-z-sh>;<PCT>;<MIN-CAP>;IGNORE
+<U0111>	<d//>;<PCT>;<MIN>;IGNORE
+reorder-after <U0044>
+<D-Z<>	<d-z-sh>;<PCT>;<CAP>;IGNORE
+<U01C4>	<d-z-sh>;<PCT>;<CAP>;IGNORE
+<D-z<>	<d-z-sh>;<PCT>;<CAP-MIN>;IGNORE
+<U01C5>	<d-z-sh>;<PCT>;<CAP-MIN>;IGNORE
+<U0110>	<d//>;<PCT>;<CAP>;IGNORE
+
+reorder-after <U006C>
+<l-j>	<l-j-sh>;<PCT>;<MIN>;IGNORE
+<U01C9>	<l-j-sh>;<PCT>;<MIN>;IGNORE
+<l-J>	<l-j-sh>;<PCT>;<MIN-CAP>;IGNORE
+reorder-after <U004C>
+<L-J>	<l-j-sh>;<PCT>;<CAP>;IGNORE
+<U01C7>	<l-j-sh>;<PCT>;<CAP>;IGNORE
+<L-j>	<l-j-sh>;<PCT>;<CAP-MIN>;IGNORE
+<U01C8>	<l-j-sh>;<PCT>;<CAP-MIN>;IGNORE
+
+reorder-after <U006E>
+<n-j>	<n-j-sh>;<PCT>;<MIN>;IGNORE
+<U01CC>	<n-j-sh>;<PCT>;<MIN>;IGNORE
+<n-J>	<n-j-sh>;<PCT>;<MIN-CAP>;IGNORE
+reorder-after <U004E>
+<N-J>	<n-j-sh>;<PCT>;<CAP>;IGNORE
+<U01CA>	<n-j-sh>;<PCT>;<CAP>;IGNORE
+<N-j>	<n-j-sh>;<PCT>;<CAP-MIN>;IGNORE
+<U01CB>	<n-j-sh>;<PCT>;<CAP-MIN>;IGNORE
+
+reorder-after <U0073>
+<U0161>	<scaron>;<PCT>;<MIN>;IGNORE
+reorder-after <U0053>
+<U0160>	<scaron>;<PCT>;<CAP>;IGNORE
+
+reorder-after <U007A>
+<U017E>	<zcaron>;<PCT>;<MIN>;IGNORE
+reorder-after <U005A>
+<U017D>	<zcaron>;<PCT>;<CAP>;IGNORE
+
+reorder-end
+
+END LC_COLLATE
+
+LC_MONETARY
+int_curr_symbol           "<U0052><U0053><U0044><U0020>"
+currency_symbol           "<U0434><U0438><U043D>"
+mon_decimal_point         "<U002C>"
+mon_thousands_sep         "<U002E>"
+mon_grouping              3;3
+positive_sign             ""
+negative_sign             "<U002D>"
+int_frac_digits           2
+frac_digits               2
+p_cs_precedes             0
+p_sep_by_space            1
+n_cs_precedes             0
+n_sep_by_space            1
+p_sign_posn               1
+n_sign_posn               1
+END LC_MONETARY
+
+LC_NUMERIC
+decimal_point             "<U002C>"
+thousands_sep             ""
+grouping                  0;0
+END LC_NUMERIC
+
+LC_TIME
+
+abday   "<U043D><U0435><U0434>";"<U043F><U043E><U043D>";/
+        "<U0443><U0442><U043E>";"<U0441><U0440><U0435>";/
+        "<U0447><U0435><U0442>";"<U043F><U0435><U0442>";/
+        "<U0441><U0443><U0431>"
+day     "<U043D><U0435><U0434><U0435><U0459><U0430>";/
+        "<U043F><U043E><U043D><U0435><U0434><U0435><U0459><U0430><U043A>";/
+        "<U0443><U0442><U043E><U0440><U0430><U043A>";/
+        "<U0441><U0440><U0435><U0434><U0430>";/
+        "<U0447><U0435><U0442><U0432><U0440><U0442><U0430><U043A>";/
+        "<U043F><U0435><U0442><U0430><U043A>";/
+        "<U0441><U0443><U0431><U043E><U0442><U0430>"
+abmon   "<U0458><U0430><U043D>";"<U0444><U0435><U0431>";/
+        "<U043C><U0430><U0440>";"<U0430><U043F><U0440>";/
+        "<U043C><U0430><U0458>";"<U0458><U0443><U043D>";/
+        "<U0458><U0443><U043B>";"<U0430><U0432><U0433>";/
+        "<U0441><U0435><U043F>";"<U043E><U043A><U0442>";/
+        "<U043D><U043E><U0432>";"<U0434><U0435><U0446>"
+mon     "<U0458><U0430><U043D><U0443><U0430><U0440>";/
+        "<U0444><U0435><U0431><U0440><U0443><U0430><U0440>";/
+        "<U043C><U0430><U0440><U0442>";/
+        "<U0430><U043F><U0440><U0438><U043B>";/
+        "<U043C><U0430><U0458>";/
+        "<U0458><U0443><U043D>";/
+        "<U0458><U0443><U043B>";/
+        "<U0430><U0432><U0433><U0443><U0441><U0442>";/
+        "<U0441><U0435><U043F><U0442><U0435><U043C><U0431><U0430><U0440>";/
+        "<U043E><U043A><U0442><U043E><U0431><U0430><U0440>";/
+        "<U043D><U043E><U0432><U0435><U043C><U0431><U0430><U0440>";/
+        "<U0434><U0435><U0446><U0435><U043C><U0431><U0430><U0440>"
+
+d_t_fmt "<U0025><U0041><U002C><U0020><U0025><U0064><U002E><U0020>/
+<U0025><U0042><U0020><U0025><U0059><U002E><U0020><U0025><U0054>/
+<U0020><U0025><U005A>"
+d_fmt   "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0059><U002E>"
+t_fmt   "<U0025><U0054>"
+am_pm   "";""
+t_fmt_ampm "<U0025><U0054>"
+date_fmt  "<U0025><U0061><U002C><U0020><U0025><U0065><U002E><U0020>/
+<U0025><U0062><U0020><U0025><U0059><U002E><U0020><U0020><U0025><U0048>/
+<U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U005A><U000A>"
+% week    7;19971201;4
+first_weekday 2
+first_workday 2
+END LC_TIME
+
+LC_MESSAGES
+yesexpr "<U005E><U005B><U0414><U0434><U0044><U0064><U0059><U0079><U005D>"
+noexpr  "<U005E><U005B><U041D><U043D><U004E><U006E><U005D>"
+END LC_MESSAGES
+
+LC_PAPER
+height   297
+width    210
+END LC_PAPER
+
+LC_NAME
+name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
+<U0025><U006D><U0025><U0074><U0025><U0066>"
+name_gen    ""
+name_mr     "<U0433><U002D><U0434><U0438><U043D>"
+name_mrs    "<U0433><U002D><U0452><U0430>"
+name_miss   "<U0433><U002D><U0452><U0438><U0446><U0430>"
+name_ms     "<U0433><U002D><U0452><U0430>"
+END LC_NAME
+
+LC_ADDRESS
+postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
+<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
+<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
+<U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
+<U004E><U0025><U0063><U0025><U004E>"
+country_ab2   "<U0052><U0053>"
+country_ab3   "<U0053><U0052><U0042>"
+% FIXME: country_post is probably incorrect
+country_post  "<U0053><U0052><U0042>"
+country_name  "<U0421><U0440><U0431><U0438><U0458><U0430>"
+country_num   688
+country_car   "<U0053><U0052><U0042>"
+% FIXME: ISBN code is what? "86" that preceedes all the numbers?
+country_isbn  "<U0038><U0036>"
+lang_name     "<U0441><U0440><U043F><U0441><U043A><U0438>"
+lang_term     "<U0073><U0072><U0070>"
+lang_lib      "<U0073><U0063><U0063>"
+lang_ab	      "<U0073><U0072>"
+END LC_ADDRESS
+
+LC_TELEPHONE
+tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
+<U006C>"
+tel_dom_fmt    "<U0025><U0041><U0020><U0025><U006C>"
+int_prefix     "<U0033><U0038><U0031>"
+int_select     "<U0039><U0039>"
+END LC_TELEPHONE
+
+LC_MEASUREMENT
+measurement    1
+END LC_MEASUREMENT
--- libc/localedata/locales/sr_RS at latin	1 Jan 1970 00:00:00 -0000
+++ libc/localedata/locales/sr_RS at latin	17 Feb 2007 07:55:58 -0000	1.1
@@ -0,0 +1,174 @@
+comment_char %
+escape_char  /
+%
+% Serbian Language Locale for Serbia
+% Source: sr_YU, sr_CS locales
+% Address:
+%
+% Contact: Danilo Segan
+% Email: danilo at gnome.org
+% Tel: +381 63 323456
+% Fax: none
+% Language: sr
+% Territory: RS
+% Revision: 1.3
+% Date: 2006-10-09
+% Application: general
+% Users: general
+% Charset: UTF-8, ISO-8859-2
+% Distribution and use is free, also
+% for commercial purposes.
+%
+
+LC_IDENTIFICATION
+title      "Serbian Latin locale for Serbia"
+source     "sr_YU, sr_CS locale"
+address    ""
+contact    "Danilo Segan"
+email      "bug-glibc-locales at gnu.org"
+tel        ""
+fax        ""
+language   "Serbian"
+territory  "Serbia"
+revision   "1.3"
+date       "2006-10-09"
+audience   "general"
+application   "GNU locale"
+abbreviation  ""
+%
+category  "i18n:1997";LC_IDENTIFICATION
+category  "i18n:1997";LC_CTYPE
+category  "i18n:1997";LC_COLLATE
+category  "i18n:1997";LC_MONETARY
+category  "i18n:1997";LC_NUMERIC
+category  "i18n:1997";LC_TIME
+category  "i18n:1997";LC_MESSAGES
+category  "i18n:1997";LC_PAPER
+category  "i18n:1997";LC_NAME
+category  "i18n:1997";LC_ADDRESS
+category  "i18n:1997";LC_TELEPHONE
+category  "i18n:1997";LC_MEASUREMENT
+END LC_IDENTIFICATION
+
+LC_CTYPE
+copy "i18n"
+END LC_CTYPE
+
+LC_COLLATE
+copy "sr_RS"
+END LC_COLLATE
+
+LC_MONETARY
+int_curr_symbol           "<U0052><U0053><U0044><U0020>"
+currency_symbol           "<U0064><U0069><U006E>"
+mon_decimal_point         "<U002C>"
+mon_thousands_sep         "<U002E>"
+mon_grouping              3;3
+positive_sign             ""
+negative_sign             "<U002D>"
+int_frac_digits           0
+frac_digits               0
+p_cs_precedes             1
+p_sep_by_space            1
+n_cs_precedes             1
+n_sep_by_space            1
+p_sign_posn               1
+n_sign_posn               1
+END LC_MONETARY
+
+LC_NUMERIC
+copy "sr_RS"
+END LC_NUMERIC
+
+LC_TIME
+abday   "<U006E><U0065><U0064>";"<U0070><U006F><U006E>";/
+        "<U0075><U0074><U006F>";"<U0073><U0072><U0065>";/
+        "<U010D><U0065><U0074>";"<U0070><U0065><U0074>";/
+        "<U0073><U0075><U0062>"
+day     "<U006E><U0065><U0064><U0065><U006C><U006A><U0061>";/
+        "<U0070><U006F><U006E><U0065><U0064><U0065><U006C><U006A><U0061><U006B>";/
+        "<U0075><U0074><U006F><U0072><U0061><U006B>";/
+        "<U0073><U0072><U0065><U0064><U0061>";/
+        "<U010D><U0065><U0074><U0076><U0072><U0074><U0061><U006B>";/
+        "<U0070><U0065><U0074><U0061><U006B>";/
+        "<U0073><U0075><U0062><U006F><U0074><U0061>"
+abmon   "<U006A><U0061><U006E>";"<U0066><U0065><U0062>";/
+        "<U006D><U0061><U0072>";"<U0061><U0070><U0072>";/
+        "<U006D><U0061><U006A>";"<U006A><U0075><U006E>";/
+        "<U006A><U0075><U006C>";"<U0061><U0076><U0067>";/
+        "<U0073><U0065><U0070>";"<U006F><U006B><U0074>";/
+        "<U006E><U006F><U0076>";"<U0064><U0065><U0063>"
+mon     "<U006A><U0061><U006E><U0075><U0061><U0072>";/
+        "<U0066><U0065><U0062><U0072><U0075><U0061><U0072>";/
+        "<U006D><U0061><U0072><U0074>";/
+        "<U0061><U0070><U0072><U0069><U006C>";/
+        "<U006D><U0061><U006A>";/
+        "<U006A><U0075><U006E><U0069>";/
+        "<U006A><U0075><U006C><U0069>";/
+        "<U0061><U0076><U0067><U0075><U0073><U0074>";/
+        "<U0073><U0065><U0070><U0074><U0065><U006D><U0062><U0061><U0072>";/
+        "<U006F><U006B><U0074><U006F><U0062><U0061><U0072>";/
+        "<U006E><U006F><U0076><U0065><U006D><U0062><U0061><U0072>";/
+        "<U0064><U0065><U0063><U0065><U006D><U0062><U0061><U0072>"
+
+d_t_fmt "<U0025><U0041><U002C><U0020><U0025><U0064><U002E><U0020>/
+<U0025><U0042><U0020><U0025><U0059><U002E><U0020><U0025><U0054>/
+<U0020><U0025><U005A>"
+d_fmt   "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0059><U002E>"
+t_fmt   "<U0025><U0054>"
+am_pm   "";""
+t_fmt_ampm "<U0025><U0054>"
+date_fmt  "<U0025><U0061><U002c><U0020><U0025><U0065><U002E><U0020>/
+<U0025><U0062><U0020><U0025><U0059><U002E><U0020><U0020><U0025><U0048>/
+<U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U005A><U000A>"
+% week    7;19971201;4
+first_weekday 2
+first_workday 2
+END LC_TIME
+
+LC_MESSAGES
+yesexpr "<U005E><U005B><U0064><U0044><U0079><U0059><U005D>"
+noexpr  "<U005E><U005B><U006E><U004E><U005D>"
+END LC_MESSAGES
+
+LC_PAPER
+copy "sr_RS"
+END LC_PAPER
+
+LC_NAME
+name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
+<U0025><U006D><U0025><U0074><U0025><U0066>"
+name_gen    ""
+name_mr     "<U0067><U002D><U0064><U0069><U006E>"
+name_mrs    "<U0067><U002D><U0111><U0061>"
+name_miss   "<U0067><U002D><U0111><U0069><U0063><U0061>"
+name_ms     "<U0067><U002D><U0111><U0061>"
+END LC_NAME
+
+LC_ADDRESS
+postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
+<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
+<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
+<U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
+<U004E><U0025><U0063><U0025><U004E>"
+country_ab2   "<U0052><U0053>"
+country_ab3   "<U0053><U0052><U0042>"
+country_post  "<U0053><U0052><U0042>"
+country_name  "<U0053><U0072><U0062><U0069><U006A><U0061><U0020><U0069>/
+<U0020><U0043><U0072><U006E><U0061><U0020><U0047><U006F><U0072><U0061>"
+country_num   688
+country_car   "<U0053><U0052><U0042>"
+country_isbn  "<U0038><U0036>"
+lang_name     "<U0073><U0072><U0070><U0073><U006B><U0069>"
+lang_term     "<U0073><U0072><U0070>"
+lang_lib      "<U0073><U0063><U0063>"
+lang_ab	      "<U0073><U0072>"
+END LC_ADDRESS
+
+LC_TELEPHONE
+copy "sr_RS"
+END LC_TELEPHONE
+
+LC_MEASUREMENT
+copy "sr_RS"
+END LC_MEASUREMENT

glibc-bz3348.patch:
 debug/xtrace.sh    |   18 +++++++++---------
 malloc/memusage.sh |   20 +++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

--- NEW FILE glibc-bz3348.patch ---
2007-02-17  Ulrich Drepper  <drepper at redhat.com>

	[BZ #3348]
	* malloc/memusage.sh: Cleanups.
	* debug/xtrace.sh: Quoting and trap changes.

--- libc/malloc/memusage.sh	3 Jan 2007 05:44:11 -0000	1.15
+++ libc/malloc/memusage.sh	17 Feb 2007 08:31:17 -0000	1.16
@@ -77,6 +77,15 @@ warranty; not even for MERCHANTABILITY o
   exit 0
 }
 
+# These variables are local
+buffer=
+data=
+memusagestat_args=
+notimer=
+png=
+progname=
+tracemmap=
+
 # Process arguments.  But stop as soon as the program name is found.
 while test $# -gt 0; do
   case "$1" in
@@ -213,15 +222,8 @@ datafile=
 if test -n "$data"; then
   datafile="$data"
 elif test -n "$png"; then
-  datafile=$(mktemp ${TMPDIR:-/tmp}/memusage.XXXXXX 2> /dev/null)
-  if test $? -ne 0; then
-    # Lame, but if there is no `mktemp' program the user cannot expect more.
-    if test "$RANDOM" != "$RANDOM"; then
-      datafile=${TMPDIR:-/tmp}/memusage.$RANDOM
-    else
-      datafile=${TMPDIR:-/tmp}/memusage.$$
-    fi
-  fi
+  datafile=$(mktemp -t memusage.XXXXXX) || exit
+  trap 'rm -f "$datafile"; exit 1' HUP INT QUIT TERM PIPE
 fi
 if test -n "$datafile"; then
   add_env="$add_env MEMUSAGE_OUTPUT=$datafile"
--- libc/debug/xtrace.sh	3 Jan 2007 05:44:11 -0000	1.18
+++ libc/debug/xtrace.sh	17 Feb 2007 08:26:48 -0000	1.19
@@ -161,32 +161,32 @@ if test -n "$data"; then
   while read fct; do
     read file
     if test "$fct" != '??' -a "$file" != '??:0'; then
-      format_line $fct $file
+      format_line "$fct" "$file"
     fi
   done
 else
-  fifo=$(mktemp -u ${TMPDIR:-/tmp}/xtrace.XXXXXX)
+  fifo=$(mktemp -ut xtrace.XXXXXX) || exit
+  trap 'rm -f "$fifo"; exit 1' HUP INT QUIT TERM PIPE
   mkfifo -m 0600 $fifo || exit 1
-  trap 'rm $fifo; exit 1' SIGINT SIGTERM SIGPIPE
 
   # Now start the program and let it write to the FIFO.
   $TERMINAL_PROG -T "xtrace - $program $*" -e /bin/sh -c "LD_PRELOAD=$pcprofileso PCPROFILE_OUTPUT=$fifo $program $*; read < $fifo" &
   termpid=$!
-  $pcprofiledump -u $fifo |
+  $pcprofiledump -u "$fifo" |
   while read line; do
-     echo $line |
+     echo "$line" |
      sed 's/this = \([^,]*\).*/\1/' |
-     addr2line -fC -e $program
+     addr2line -fC -e "$program"
   done |
   while read fct; do
     read file
     if test "$fct" != '??' -a "$file" != '??:0'; then
-      format_line $fct $file
+      format_line "$fct" "$file"
     fi
   done
   read -p "Press return here to close $TERMINAL_PROG($program)."
-  echo > $fifo
-  rm $fifo
+  echo > "$fifo"
+  rm "$fifo"
 fi
 
 exit 0

glibc-bz3458.patch:
 posix_madvise.c |   38 ++++++++++++++++++++++++++++++++++++++
 syscalls.list   |    1 -
 2 files changed, 38 insertions(+), 1 deletion(-)

--- NEW FILE glibc-bz3458.patch ---
2007-02-21  Ulrich Drepper  <drepper at redhat.com>

	[BZ #3458]
	* sysdeps/unix/sysv/linux/posix_madvise.c: New file.
	* sysdeps/unix/sysv/linux/syscalls.list: Remove posix_madvise entry.

--- libc/sysdeps/unix/sysv/linux/posix_madvise.c	1 Jan 1970 00:00:00 -0000
+++ libc/sysdeps/unix/sysv/linux/posix_madvise.c	21 Feb 2007 19:07:06 -0000	1.2
@@ -0,0 +1,38 @@
+/* Copyright (C) 2007 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <sysdep.h>
+#include <sys/mman.h>
+
+
+int
+posix_madvise (void *addr, size_t len, int advice)
+{
+  /* We have one problem: the kernel's MADV_DONTNEED does not
+     correspond to POSIX's POSIX_MADV_DONTNEED.  The former simply
+     discards changes made to the memory without writing it back to
+     disk, if this would be necessary.  The POSIX behavior does not
+     allow this.  There is no functionality mapping the POSIX behavior
+     so far so we ignore that advice for now.  */
+  if (advice == POSIX_MADV_DONTNEED)
+    return 0;
+
+  INTERNAL_SYSCALL_DECL (err);
+  int result = INTERNAL_SYSCALL (madvise, err, 3, addr, len, advice);
+  return INTERNAL_SYSCALL_ERRNO (result, err);
+}
--- libc/sysdeps/unix/sysv/linux/syscalls.list	11 Oct 2006 20:18:04 -0000	1.128
+++ libc/sysdeps/unix/sysv/linux/syscalls.list	21 Feb 2007 19:02:17 -0000	1.129
@@ -32,7 +32,6 @@ ioperm		-	ioperm		i:iii	ioperm
 iopl		-	iopl		i:i	iopl
 klogctl		EXTRA	syslog		i:isi	klogctl
 lchown		-	lchown		i:sii	__lchown	lchown
-posix_madvise	-	madvise		Vi:pii	posix_madvise
 madvise		-	madvise		i:pii	madvise
 mincore		-	mincore		i:anV	mincore
 mlock		-	mlock		i:bn	mlock

glibc-bz3842.patch:
 euidaccess.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE glibc-bz3842.patch ---
2007-02-17  Ulrich Drepper  <drepper at redhat.com>

	[BZ #3842]
	* sysdeps/posix/euidaccess.c [_LIBC] (euidaccess): Remove shortcut
	using __libc_enable_secure.

--- libc/sysdeps/posix/euidaccess.c	6 Jan 2006 11:21:57 -0000	1.13
+++ libc/sysdeps/posix/euidaccess.c	17 Feb 2007 18:12:29 -0000	1.14
@@ -128,10 +128,6 @@ euidaccess (path, mode)
 #ifdef	_LIBC
   uid_t euid;
   gid_t egid;
-
-  if (! __libc_enable_secure)
-    /* If we are not set-uid or set-gid, access does the same.  */
-    return __access (path, mode);
 #else
   if (have_ids == 0)
     {
@@ -162,6 +158,10 @@ euidaccess (path, mode)
   /* Now we need the IDs.  */
   euid = __geteuid ();
   egid = __getegid ();
+
+  if (__getuid () == euid && __getgid () == egid)
+    /* If we are not set-uid or set-gid, access does the same.  */
+    return __access (path, mode);
 #endif
 
   /* The super-user can read and write any file, and execute any file

glibc-bz3851.patch:
 bn_BD |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE glibc-bz3851.patch ---
2007-02-16  Ulrich Drepper  <drepper at redhat.com>

	[BZ #3851]
	* locales/bn_BD: Fix full name of January and February.
	Patch by Jamil Ahmed <jamil at bengalinux.org>.

--- libc/localedata/locales/bn_BD	24 Aug 2006 06:39:08 -0000	1.9
+++ libc/localedata/locales/bn_BD	17 Feb 2007 06:47:08 -0000	1.10
@@ -13,8 +13,8 @@ tel        ""
 fax        ""
 language   "Bengali/Bangla"
 territory  "Bangladesh"
-revision   "0.3"
-date       "2005-01-18"
+revision   "0.5"
+date       "2007-01-10"
 
 category "bn_BD:2001";LC_IDENTIFICATION
 category "bn_BD:2001";LC_COLLATE
@@ -101,8 +101,8 @@ abmon       "<U099C><U09BE><U09A8><U09C1
             "<U09A8><U09AD><U09C7>";/
             "<U09A1><U09BF><U09B8><U09C7>"
 
-mon         "<U099C><U09BE><U09A8><U09C1><U09DF><U09BE><U09B0><U098F>";/
-            "<U09AB><U09C7><U09AC><U09CD><U09B0><U09C1><U09DF><U09BE><U09B0><U098F>";/
+mon         "<U099C><U09BE><U09A8><U09C1><U09DF><U09BE><U09B0><U09BF>";/
+            "<U09AB><U09C7><U09AC><U09CD><U09B0><U09C1><U09DF><U09BE><U09B0><U09BF>";/
             "<U09AE><U09BE><U09B0><U09CD><U099A>";/
             "<U098F><U09AA><U09CD><U09B0><U09BF><U09B2>";/
             "<U09AE><U09C7>";/

glibc-bz3855.patch:
 Makefile      |    3 ++-
 strtod_l.c    |   25 ++++++++++++++++++-------
 tst-strtod2.c |   41 ++++++++++++++++++++++++++++++-----------
 tst-strtod4.c |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 106 insertions(+), 19 deletions(-)

--- NEW FILE glibc-bz3855.patch ---
2007-01-11  Jakub Jelinek  <jakub at redhat.com>

	* stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix handling of multi-byte
	thousands separators.
	* stdlib/Makefile: Add rules to build and run tst-strtod4.
	* stdlib/tst-strtod4.c: New test.

	[BZ #3855]
	* stdlib/strtod_l.c (____STRTOF_INTERNAL): 0x. not followed by
	hexadecimal digit should accept just the initial 0.
	* stdlib/tst-strtod2.c (tests): New variable.
	(do_test): Run several tests rather than just one.

--- libc/stdlib/Makefile	3 Jan 2007 22:42:33 -0000	1.116
+++ libc/stdlib/Makefile	11 Jan 2007 17:37:12 -0000	1.117
@@ -68,7 +68,7 @@ tests		:= tst-strtol tst-strtod testmb t
 		   tst-limits tst-rand48 bug-strtod tst-setcontext	    \
 		   test-a64l tst-qsort tst-system testmb2 bug-strtod2	    \
 		   tst-atof1 tst-atof2 tst-strtod2 tst-strtod3 tst-rand48-2 \
-		   tst-makecontext
+		   tst-makecontext tst-strtod4
 
 include ../Makeconfig
 
@@ -114,6 +114,7 @@ test-canon-ARGS = --test-dir=${common-ob
 
 tst-strtod-ENV = LOCPATH=$(common-objpfx)localedata
 tst-strtod3-ENV = LOCPATH=$(common-objpfx)localedata
+tst-strtod4-ENV = LOCPATH=$(common-objpfx)localedata
 testmb2-ENV = LOCPATH=$(common-objpfx)localedata
 
 # Run a test on the header files we use.
--- libc/stdlib/strtod_l.c	11 Dec 2006 21:43:48 -0000	1.19
+++ libc/stdlib/strtod_l.c	11 Jan 2007 17:35:29 -0000	1.21
@@ -650,10 +651,11 @@ ____STRTOF_INTERNAL (nptr, endptr, group
 	  if (c != '0')
 	    {
 	      for (cnt = 0; thousands[cnt] != '\0'; ++cnt)
-		if (c != thousands[cnt])
+		if (thousands[cnt] != cp[cnt])
 		  break;
 	      if (thousands[cnt] != '\0')
 		break;
+	      cp += cnt - 1;
 	    }
 	  c = *++cp;
 	}
@@ -665,14 +667,23 @@ ____STRTOF_INTERNAL (nptr, endptr, group
   if (!((c >= L_('0') && c <= L_('9'))
 	|| (base == 16 && ((CHAR_TYPE) TOLOWER (c) >= L_('a')
 			   && (CHAR_TYPE) TOLOWER (c) <= L_('f')))
+	|| (
 #ifdef USE_WIDE_CHAR
-	|| c == (wint_t) decimal
+	    c == (wint_t) decimal
 #else
-	|| ({ for (cnt = 0; decimal[cnt] != '\0'; ++cnt)
-	      if (decimal[cnt] != cp[cnt])
-		break;
-	      decimal[cnt] == '\0'; })
-#endif
+	    ({ for (cnt = 0; decimal[cnt] != '\0'; ++cnt)
+		 if (decimal[cnt] != cp[cnt])
+		   break;
+	       decimal[cnt] == '\0'; })
+#endif
+	    /* '0x.' alone is not a valid hexadecimal number.
+	       '.' alone is not valid either, but that has been checked
+	       already earlier.  */
+	    && (base != 16
+		|| cp != start_of_digits
+		|| (cp[decimal_len] >= L_('0') && cp[decimal_len] <= L_('9'))
+		|| ((CHAR_TYPE) TOLOWER (cp[decimal_len]) >= L_('a')
+		    && (CHAR_TYPE) TOLOWER (cp[decimal_len]) <= L_('f'))))
 	|| (base == 16 && (cp != start_of_digits
 			   && (CHAR_TYPE) TOLOWER (c) == L_('p')))
 	|| (base != 16 && (CHAR_TYPE) TOLOWER (c) == L_('e'))))
@@ -715,6 +726,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group
 		  break;
 	      if (thousands[cnt] != '\0')
 		break;
+	      cp += cnt - 1;
 	    }
 #endif
 	}
--- libc/stdlib/tst-strtod2.c	11 Dec 2006 21:36:30 -0000	1.2
+++ libc/stdlib/tst-strtod2.c	11 Jan 2007 17:27:16 -0000	1.3
@@ -1,22 +1,41 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+struct test
+{
+  const char *str;
+  double result;
+  size_t offset;
+} tests[] =
+{
+  { "0xy", 0.0, 1 },
+  { "0x.y", 0.0, 1 },
+  { "0x0.y", 0.0, 4 },
+  { "0x.0y", 0.0, 4 },
+  { ".y", 0.0, 0 },
+  { "0.y", 0.0, 2 },
+  { ".0y", 0.0, 2 }
+};
+
 static int
 do_test (void)
 {
   int status = 0;
-  const char s[] = "0x";
-  char *ep;
-  double r = strtod (s, &ep);
-  if (r != 0)
-    {
-      printf ("r = %g, expect 0\n", r);
-      status = 1;
-    }
-  if (ep != s + 1)
+  for (size_t i = 0; i < sizeof (tests) / sizeof (tests[0]); ++i)
     {
-      printf ("strtod parsed %ju characters, expected 1\n", ep - s);
-      status = 1;
+      char *ep;
+      double r = strtod (tests[i].str, &ep);
+      if (r != tests[i].result)
+	{
+	  printf ("test %zu r = %g, expect %g\n", i, r, tests[i].result);
+	  status = 1;
+	}
+      if (ep != tests[i].str + tests[i].offset)
+	{
+	  printf ("test %zu strtod parsed %ju characters, expected %zu\n",
+		  i, ep - tests[i].str, tests[i].offset);
+	  status = 1;
+	}
     }
   return status;
 }
--- libc/stdlib/tst-strtod4.c	1 Jan 1970 00:00:00 -0000
+++ libc/stdlib/tst-strtod4.c	11 Jan 2007 17:36:58 -0000	1.1
@@ -0,0 +1,56 @@
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define NBSP "\xc2\xa0"
+
+static const struct
+{
+  const char *in;
+  const char *out;
+  double expected;
+} tests[] =
+  {
+    { "000"NBSP"000"NBSP"000", "", 0.0 },
+    { "1"NBSP"000"NBSP"000,5x", "x", 1000000.5 }
+  };
+#define NTESTS (sizeof (tests) / sizeof (tests[0]))
+
+
+static int
+do_test (void)
+{
+  if (setlocale (LC_ALL, "cs_CZ.UTF-8") == NULL)
+    {
+      puts ("could not set locale");
+      return 1;
+    }
+
+  int status = 0;
+
+  for (int i = 0; i < NTESTS; ++i)
+    {
+      char *ep;
+      double r = __strtod_internal (tests[i].in, &ep, 1);
+
+      if (strcmp (ep, tests[i].out) != 0)
+	{
+	  printf ("%d: got rest string \"%s\", expected \"%s\"\n",
+		  i, ep, tests[i].out);
+	  status = 1;
+	}
+
+      if (r != tests[i].expected)
+	{
+	  printf ("%d: got wrong results %g, expected %g\n",
+		  i, r, tests[i].expected);
+	  status = 1;
+	}
+    }
+
+  return status;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"

glibc-bz3884.patch:
 sl_SI |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE glibc-bz3884.patch ---
2007-01-12  Gwenole Beauchesne  <gbeauchesne at mandriva.com>

	[BZ #3884]
	* locales/sl_SI: Slovenia joined the Euro zone.
	Fix negative number format.

--- libc/localedata/locales/sl_SI	30 Jul 2006 22:19:43 -0000	1.15
+++ libc/localedata/locales/sl_SI	17 Feb 2007 06:51:51 -0000	1.16
@@ -2126,8 +2126,8 @@ noexpr  "<U005E><U005B><U004E><U006E><U0
 END LC_MESSAGES
 
 LC_MONETARY
-int_curr_symbol           "<U0053><U0049><U0054><U0020>"
-currency_symbol           "<U0053><U0049><U0054>"
+int_curr_symbol           "<U0045><U0055><U0052><U0020>"
+currency_symbol           "<U20AC>"
 mon_decimal_point         "<U002C>"
 mon_thousands_sep         "<U0020>"
 mon_grouping              3;3
@@ -2136,11 +2136,11 @@ negative_sign             "<U002D>"
 int_frac_digits           2
 frac_digits               2
 p_cs_precedes             0
-p_sep_by_space            2
+p_sep_by_space            1
 n_cs_precedes             0
-n_sep_by_space            2
-p_sign_posn               2
-n_sign_posn               2
+n_sep_by_space            1
+p_sign_posn               1
+n_sign_posn               1
 END LC_MONETARY
 
 LC_NUMERIC

glibc-bz3902.patch:
 Makefile |    2 +-
 _itoa.c  |    3 +++
 bug17.c  |   31 +++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

--- NEW FILE glibc-bz3902.patch ---
2007-01-22  Ulrich Drepper  <drepper at redhat.com>

	[BZ #3902]
	* stdio-common/_itoa.c (_itoa): Make sure at least a zero is emitted.
	* stdio-common/Makefile (tests): Add bug17.
	* stdio-common/bug17.c: New file.

--- libc/stdio-common/_itoa.c	6 Jun 2004 06:02:14 -0000	1.21
+++ libc/stdio-common/_itoa.c	22 Jan 2007 16:16:08 -0000	1.22
@@ -269,6 +269,7 @@ _itoa (value, buflim, base, upper_case)
 
     default:
       {
+	char *bufend = buflim;
 #if BITS_PER_MP_LIMB == 64
 	mp_limb_t base_multiplier = brec->base_multiplier;
 	if (brec->flag)
@@ -454,6 +455,8 @@ _itoa (value, buflim, base, upper_case)
 	  }
 	while (n != 0);
 #endif
+	if (buflim == bufend)
+	  *--buflim = '0';
       }
       break;
     }
--- libc/stdio-common/Makefile	3 Aug 2006 09:25:01 -0000	1.98
+++ libc/stdio-common/Makefile	22 Jan 2007 16:17:13 -0000	1.99
@@ -54,7 +54,7 @@ tests := tstscanf test_rdwr test-popen t
 	 tst-swprintf tst-fseek tst-fmemopen test-vfprintf tst-gets \
 	 tst-perror tst-sprintf tst-rndseek tst-fdopen tst-fphex bug14 bug15 \
 	 tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \
-	 tst-fwrite bug16
+	 tst-fwrite bug16 bug17
 
 test-srcs = tst-unbputc tst-printf
 
--- libc/stdio-common/bug17.c	1 Jan 1970 00:00:00 -0000
+++ libc/stdio-common/bug17.c	22 Jan 2007 16:17:04 -0000	1.1
@@ -0,0 +1,31 @@
+#include <stdio.h>
+#include <string.h>
+
+static int
+do_test (void)
+{
+  static const char expect[] = "0, 0, 0";
+  char buf[100];
+  int status = 0;
+
+  static const char fmt1[] = "%0d, %0ld, %0lld";
+  snprintf (buf, sizeof (buf), fmt1, 0, 0L, 0LL);
+  if (strcmp (buf, expect) != 0)
+    {
+      printf ("\"%s\": got \"%s\", expected \"%s\"\n", fmt1, buf, expect);
+      status = 1;
+    }
+
+  static const char fmt2[] = "%0u, %0lu, %0llu";
+  snprintf (buf, sizeof (buf), fmt2, 0u, 0uL, 0uLL);
+  if (strcmp (buf, expect) != 0)
+    {
+      printf ("\"%s\": got \"%s\", expected \"%s\"\n", fmt2, buf, expect);
+      status = 1;
+    }
+
+  return status;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"

glibc-bz3919.patch:
 math/libm-test.inc            |    5 +++++
 sysdeps/i386/fpu/e_log.S      |   11 ++++++++++-
 sysdeps/i386/fpu/e_logf.S     |   11 ++++++++++-
 sysdeps/i386/fpu/e_logl.S     |   11 ++++++++++-
 sysdeps/x86_64/fpu/e_log10l.S |    5 +++--
 sysdeps/x86_64/fpu/e_log2l.S  |    5 +++--
 sysdeps/x86_64/fpu/e_logl.S   |   12 +++++++++++-
 sysdeps/x86_64/fpu/s_log1pl.S |    5 +++--
 8 files changed, 55 insertions(+), 10 deletions(-)

--- NEW FILE glibc-bz3919.patch ---
2007-03-15  Jakub Jelinek  <jakub at redhat.com>

	[BZ #3919]
	* math/libm-test.inc (log_test): Test -Inf and NaN.
	(log10_test, log1p_test, log2_test): Test -Inf.
	* sysdeps/i386/fpu/e_log.S (__ieee754_log): Don't raise
	FE_INVALID when argument is qNaN.
	* sysdeps/i386/fpu/e_logl.S (__ieee754_logl): Likewise.
	* sysdeps/i386/fpu/e_logf.S (__ieee754_logf): Likewise.
	* sysdeps/x86_64/fpu/e_logl.S (__ieee754_logl): Likewise.
	* sysdeps/x86_64/fpu/e_log10l.S (__ieee754_log10l): Replace
	andb $1, %ah with testb $1, %ah, don't test for parity, instead
	testb $4, %ah and jump if non-zero.
	* sysdeps/x86_64/fpu/e_log2l.S (__ieee754_log2l): Likewise.
	* sysdeps/x86_64/fpu/s_log1pl.S (__log1pl): Likewise.

--- libc/math/libm-test.inc	5 Mar 2007 19:37:53 -0000	1.74
+++ libc/math/libm-test.inc	15 Mar 2007 20:10:16 -0000	1.75
@@ -4127,7 +4127,9 @@ log_test (void)
   TEST_f_f (log, 1, 0);
 
   TEST_f_f (log, -1, nan_value, INVALID_EXCEPTION);
+  TEST_f_f (log, minus_infty, nan_value, INVALID_EXCEPTION);
   TEST_f_f (log, plus_infty, plus_infty);
+  TEST_f_f (log, nan_value, nan_value);
 
   TEST_f_f (log, M_El, 1);
   TEST_f_f (log, 1.0 / M_El, -1);
@@ -4157,6 +4159,7 @@ log10_test (void)
 
   /* log10 (x) == NaN plus invalid exception if x < 0.  */
   TEST_f_f (log10, -1, nan_value, INVALID_EXCEPTION);
+  TEST_f_f (log10, minus_infty, nan_value, INVALID_EXCEPTION);
 
   TEST_f_f (log10, plus_infty, plus_infty);
   TEST_f_f (log10, nan_value, nan_value);
@@ -4188,6 +4191,7 @@ log1p_test (void)
 
   TEST_f_f (log1p, -1, minus_infty, DIVIDE_BY_ZERO_EXCEPTION);
   TEST_f_f (log1p, -2, nan_value, INVALID_EXCEPTION);
+  TEST_f_f (log1p, minus_infty, nan_value, INVALID_EXCEPTION);
 
   TEST_f_f (log1p, plus_infty, plus_infty);
   TEST_f_f (log1p, nan_value, nan_value);
@@ -4218,6 +4222,7 @@ log2_test (void)
   TEST_f_f (log2, 1, 0);
 
   TEST_f_f (log2, -1, nan_value, INVALID_EXCEPTION);
+  TEST_f_f (log2, minus_infty, nan_value, INVALID_EXCEPTION);
 
   TEST_f_f (log2, plus_infty, plus_infty);
   TEST_f_f (log2, nan_value, nan_value);
--- libc/sysdeps/i386/fpu/e_log.S	4 May 2005 17:45:15 -0000	1.2
+++ libc/sysdeps/i386/fpu/e_log.S	15 Mar 2007 20:10:43 -0000	1.3
@@ -36,11 +36,15 @@ limit:	.double 0.29
 ENTRY(__ieee754_log)
 	fldln2			// log(2)
 	fldl	4(%esp)		// x : log(2)
+	fxam
+	fnstsw
 #ifdef PIC
 	LOAD_PIC_REG (dx)
 #endif
 	fld	%st		// x : x : log(2)
-	fsubl	MO(one)		// x-1 : x : log(2)
+	sahf
+	jc	3f		// in case x is NaN or +-Inf
+4:	fsubl	MO(one)		// x-1 : x : log(2)
 	fld	%st		// x-1 : x-1 : x : log(2)
 	fabs			// |x-1| : x-1 : x : log(2)
 	fcompl	MO(limit)	// x-1 : x : log(2)
@@ -54,4 +58,9 @@ ENTRY(__ieee754_log)
 2:	fstp	%st(0)		// x : log(2)
 	fyl2x			// log(x)
 	ret
+
+3:	jp	4b		// in case x is +-Inf
+	fstp	%st(1)
+	fstp	%st(1)
+	ret
 END (__ieee754_log)
--- libc/sysdeps/i386/fpu/e_logf.S	4 May 2005 17:45:15 -0000	1.2
+++ libc/sysdeps/i386/fpu/e_logf.S	15 Mar 2007 20:10:43 -0000	1.3
@@ -37,11 +37,15 @@ limit:	.double 0.29
 ENTRY(__ieee754_logf)
 	fldln2			// log(2)
 	flds	4(%esp)		// x : log(2)
+	fxam
+	fnstsw
 #ifdef PIC
 	LOAD_PIC_REG (dx)
 #endif
 	fld	%st		// x : x : log(2)
-	fsubl	MO(one)		// x-1 : x : log(2)
+	sahf
+	jc	3f		// in case x is NaN or +-Inf
+4:	fsubl	MO(one)		// x-1 : x : log(2)
 	fld	%st		// x-1 : x-1 : x : log(2)
 	fabs			// |x-1| : x-1 : x : log(2)
 	fcompl	MO(limit)	// x-1 : x : log(2)
@@ -55,4 +59,9 @@ ENTRY(__ieee754_logf)
 2:	fstp	%st(0)		// x : log(2)
 	fyl2x			// log(x)
 	ret
+
+3:	jp	4b		// in case x is +-Inf
+	fstp	%st(1)
+	fstp	%st(1)
+	ret
 END (__ieee754_logf)
--- libc/sysdeps/i386/fpu/e_logl.S	4 May 2005 17:45:15 -0000	1.2
+++ libc/sysdeps/i386/fpu/e_logl.S	15 Mar 2007 20:10:43 -0000	1.3
@@ -37,11 +37,15 @@ limit:	.double 0.29
 ENTRY(__ieee754_logl)
 	fldln2			// log(2)
 	fldt	4(%esp)		// x : log(2)
+	fxam
+	fnstsw
 #ifdef PIC
 	LOAD_PIC_REG (dx)
 #endif
 	fld	%st		// x : x : log(2)
-	fsubl	MO(one)		// x-1 : x : log(2)
+	sahf
+	jc	3f		// in case x is NaN or +-Inf
+4:	fsubl	MO(one)		// x-1 : x : log(2)
 	fld	%st		// x-1 : x-1 : x : log(2)
 	fabs			// |x-1| : x-1 : x : log(2)
 	fcompl	MO(limit)	// x-1 : x : log(2)
@@ -55,4 +59,9 @@ ENTRY(__ieee754_logl)
 2:	fstp	%st(0)		// x : log(2)
 	fyl2x			// log(x)
 	ret
+
+3:	jp	4b		// in case x is +-Inf
+	fstp	%st(1)
+	fstp	%st(1)
+	ret
 END (__ieee754_logl)
--- libc/sysdeps/x86_64/fpu/e_log10l.S	19 Sep 2001 10:24:08 -0000	1.1
+++ libc/sysdeps/x86_64/fpu/e_log10l.S	15 Mar 2007 20:10:43 -0000	1.2
@@ -42,7 +42,7 @@ ENTRY(__ieee754_log10l)
 	fxam
 	fnstsw
 	fld	%st		// x : x : log10(2)
-	andb	$1,%ah
+	testb	$1, %ah
 	jnz	3f		// in case x is NaN or ?Inf
 4:	fsubl	MO(one)		// x-1 : x : log10(2)
 	fld	%st		// x-1 : x-1 : x : log10(2)
@@ -59,7 +59,8 @@ ENTRY(__ieee754_log10l)
 	fyl2x			// log10(x)
 	ret
 
-3:	jp	4b		// in case x is ?Inf
+3:	testb	$4, %ah
+	jnz	4b		// in case x is ?Inf
 	fstp	%st(1)
 	fstp	%st(1)
 	ret
--- libc/sysdeps/x86_64/fpu/e_log2l.S	19 Sep 2001 10:24:08 -0000	1.1
+++ libc/sysdeps/x86_64/fpu/e_log2l.S	15 Mar 2007 20:10:43 -0000	1.2
@@ -39,7 +39,7 @@ ENTRY(__ieee754_log2l)
 	fxam
 	fnstsw
 	fld	%st		// x : x : 1
-	andb	$1,%ah
+	testb	$1, %ah
 	jnz	3f		// in case x is NaN or ?Inf
 4:	fsub	%st(2), %st	// x-1 : x : 1
 	fld	%st		// x-1 : x-1 : x : 1
@@ -56,7 +56,8 @@ ENTRY(__ieee754_log2l)
 	fyl2x			// log(x)
 	ret
 
-3:	jp	4b		// in case x is ?Inf
+3:	testb	$4, %ah
+	jnz	4b		// in case x is ?Inf
 	fstp	%st(1)
 	fstp	%st(1)
 	ret
--- libc/sysdeps/x86_64/fpu/e_logl.S	19 Sep 2001 10:24:08 -0000	1.1
+++ libc/sysdeps/x86_64/fpu/e_logl.S	15 Mar 2007 20:10:43 -0000	1.2
@@ -38,8 +38,12 @@ limit:	.double 0.29
 ENTRY(__ieee754_logl)
 	fldln2			// log(2)
 	fldt	8(%rsp)		// x : log(2)
+	fxam
+	fnstsw
 	fld	%st		// x : x : log(2)
-	fsubl	MO(one)		// x-1 : x : log(2)
+	testb	$1, %ah
+	jnz	3f		// in case x is NaN or +-Inf
+4:	fsubl	MO(one)		// x-1 : x : log(2)
 	fld	%st		// x-1 : x-1 : x : log(2)
 	fabs			// |x-1| : x-1 : x : log(2)
 	fcompl	MO(limit)	// x-1 : x : log(2)
@@ -53,4 +57,10 @@ ENTRY(__ieee754_logl)
 2:	fstp	%st(0)		// x : log(2)
 	fyl2x			// log(x)
 	ret
+
+3:	testb	$4, %ah
+	jnz	4b		// in case x is +-Inf
+	fstp	%st(1)
+	fstp	%st(1)
+	ret
 END (__ieee754_logl)
--- libc/sysdeps/x86_64/fpu/s_log1pl.S	19 Sep 2001 10:24:08 -0000	1.1
+++ libc/sysdeps/x86_64/fpu/s_log1pl.S	15 Mar 2007 20:10:43 -0000	1.2
@@ -45,7 +45,7 @@ ENTRY(__log1pl)
 	fxam
 	fnstsw
 	fld	%st
-	andb	$1,%ah
+	testb	$1, %ah
 	jnz	3f		// in case x is NaN or ?Inf
 4:
 	fabs
@@ -62,7 +62,8 @@ ENTRY(__log1pl)
 2:	fyl2xp1
 	ret
 
-3:	jp	4b		// in case x is ?Inf
+3:	testb	$4, %ah
+	jnz	4b		// in case x is ?Inf
 	fstp	%st(1)
 	fstp	%st(1)
 	ret

glibc-bz3944.patch:
 Makefile        |    3 ++-
 strptime_l.c    |    9 +++++++--
 tst-strptime3.c |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 3 deletions(-)

--- NEW FILE glibc-bz3944.patch ---
2007-02-08  Jakub Jelinek  <jakub at redhat.com>

	[BZ #3944]
	* time/strptime_l.c (__strptime_internal): Set have_mon for
	%b/%B/%h.  Set have_mon and have_mday if tm_mon and tm_mday
	have been computed from tm_yday and tm_year.  Don't crash
	in day_of_the_week or day_of_the_year if not have_mon
	and tm_mon contains bogus value.
	* time/Makefile (tests): Add tst-strptime3.
	* time/tst-strptime3.c: New test.

--- libc/time/strptime_l.c	27 Apr 2005 04:30:10 -0000	1.7
+++ libc/time/strptime_l.c	9 Feb 2007 01:32:17 -0000	1.8
@@ -400,6 +400,7 @@ __strptime_internal (rp, fmt, tm, decide
 	    /* Does not match a month name.  */
 	    return NULL;
 	  tm->tm_mon = cnt;
+	  have_mon = 1;
 	  want_xday = 1;
 	  break;
 	case 'c':
@@ -1085,11 +1086,15 @@ __strptime_internal (rp, fmt, tm, decide
 	      tm->tm_mday =
 		(tm->tm_yday
 		 - __mon_yday[__isleap(1900 + tm->tm_year)][t_mon - 1] + 1);
+	  have_mon = 1;
+	  have_mday = 1;
 	}
-      day_of_the_week (tm);
+      /* Don't crash in day_of_the_week if tm_mon is uninitialized.  */
+      if (have_mon || (unsigned) tm->tm_mon <= 11)
+	day_of_the_week (tm);
     }
 
-  if (want_xday && !have_yday)
+  if (want_xday && !have_yday && (have_mon || (unsigned) tm->tm_mon <= 11))
     day_of_the_year (tm);
 
   if ((have_uweek || have_wweek) && have_wday)
--- libc/time/Makefile	9 Sep 2006 16:54:49 -0000	1.110
+++ libc/time/Makefile	9 Feb 2007 01:33:54 -0000	1.111
@@ -35,7 +35,8 @@ distribute := datemsk
 
 tests	:= test_time clocktest tst-posixtz tst-strptime tst_wcsftime \
 	   tst-getdate tst-mktime tst-mktime2 tst-ftime_l tst-strftime \
-	   tst-mktime3 tst-strptime2 bug-asctime bug-asctime_r bug-mktime1
+	   tst-mktime3 tst-strptime2 bug-asctime bug-asctime_r bug-mktime1 \
+	   tst-strptime3
 
 include ../Rules
 
--- libc/time/tst-strptime3.c	1 Jan 1970 00:00:00 -0000
+++ libc/time/tst-strptime3.c	9 Feb 2007 01:33:40 -0000	1.1
@@ -0,0 +1,55 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+
+int
+main (void)
+{
+  int result = 0;
+  struct tm tm;
+
+  memset (&tm, 0xaa, sizeof (tm));
+
+  /* Test we don't crash on uninitialized struct tm.
+     Some fields might contain bogus values until everything
+     needed is initialized, but we shouldn't crash.  */
+  if (strptime ("2007", "%Y", &tm) == NULL
+      || strptime ("12", "%d", &tm) == NULL
+      || strptime ("Feb", "%b", &tm) == NULL
+      || strptime ("13", "%M", &tm) == NULL
+      || strptime ("21", "%S", &tm) == NULL
+      || strptime ("16", "%H", &tm) == NULL)
+    {
+      puts ("strptimes failed");
+      result = 1;
+    }
+
+  if (tm.tm_sec != 21 || tm.tm_min != 13 || tm.tm_hour != 16
+      || tm.tm_mday != 12 || tm.tm_mon != 1 || tm.tm_year != 107
+      || tm.tm_wday != 1 || tm.tm_yday != 42)
+    {
+      puts ("unexpected tm content");
+      result = 1;
+    }
+
+  if (strptime ("8", "%d", &tm) == NULL)
+    {
+      puts ("strptime failed");
+      result = 1;
+    }
+
+  if (tm.tm_sec != 21 || tm.tm_min != 13 || tm.tm_hour != 16
+      || tm.tm_mday != 8 || tm.tm_mon != 1 || tm.tm_year != 107
+      || tm.tm_wday != 4 || tm.tm_yday != 38)
+    {
+      puts ("unexpected tm content");
+      result = 1;
+    }
+
+  if (result == 0)
+    puts ("all OK");
+
+  return 0;
+}

glibc-bz3957.patch:
 Makefile      |    3 +-
 bug-regex27.c |   64 +++++++++++++++++++++++++++++++++++++++++++++++++
 bug-regex28.c |   75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 regcomp.c     |    6 ----
 4 files changed, 142 insertions(+), 6 deletions(-)

--- NEW FILE glibc-bz3957.patch ---
2007-02-05  Jakub Jelinek  <jakub at redhat.com>

	[BZ #3957]
	* posix/regcomp.c (parse_bracket_exp): Set '\n' bit rather than '\0'
	bit for RE_HAT_LISTS_NOT_NEWLINE.
	(build_charclass_op): Remove bogus comment.
	* posix/Makefile (tests): Add bug-regex27 and bug-regex28.
	* posix/bug-regex27.c: New test.
	* posix/bug-regex28.c: New test.

--- libc/posix/regcomp.c	31 Jan 2006 19:17:14 -0000	1.112
+++ libc/posix/regcomp.c	5 Feb 2007 15:23:49 -0000	1.113
@@ -3019,7 +3019,7 @@ parse_bracket_exp (re_string_t *regexp, 
 #endif /* not RE_ENABLE_I18N */
       non_match = 1;
       if (syntax & RE_HAT_LISTS_NOT_NEWLINE)
-	bitset_set (sbcset, '\0');
+	bitset_set (sbcset, '\n');
       re_string_skip_bytes (regexp, token_len); /* Skip a token.  */
       token_len = peek_token_bracket (token, regexp, syntax);
       if (BE (token->type == END_OF_RE, 0))
@@ -3549,10 +3549,6 @@ build_charclass_op (re_dfa_t *dfa, RE_TR
   if (non_match)
     {
 #ifdef RE_ENABLE_I18N
-      /*
-      if (syntax & RE_HAT_LISTS_NOT_NEWLINE)
-	bitset_set(cset->sbcset, '\0');
-      */
       mbcset->non_match = 1;
 #endif /* not RE_ENABLE_I18N */
     }
--- libc/posix/Makefile	3 Jan 2007 23:02:10 -0000	1.194
+++ libc/posix/Makefile	5 Feb 2007 15:22:40 -0000	1.195
@@ -81,7 +81,8 @@ tests		:= tstgetopt testfnm runtests run
 		   bug-regex13 bug-regex14 bug-regex15 bug-regex16 \
 		   bug-regex17 bug-regex18 bug-regex19 bug-regex20 \
 		   bug-regex21 bug-regex22 bug-regex23 bug-regex24 \
-		   bug-regex25 bug-regex26 tst-nice tst-nanosleep tst-regex2 \
+		   bug-regex25 bug-regex26 bug-regex27 bug-regex28 \
+		   tst-nice tst-nanosleep tst-regex2 \
 		   transbug tst-rxspencer tst-pcre tst-boost \
 		   bug-ga1 tst-vfork1 tst-vfork2 tst-vfork3 tst-waitid \
 		   tst-getaddrinfo2 bug-glob1 bug-glob2 tst-sysconf \
--- libc/posix/bug-regex27.c	1 Jan 1970 00:00:00 -0000
+++ libc/posix/bug-regex27.c	5 Feb 2007 15:22:27 -0000	1.1
@@ -0,0 +1,64 @@
+/* Test REG_NEWLINE.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Jakub Jelinek <jakub at redhat.com>, 2007.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <regex.h>
+#include <stdio.h>
+#include <string.h>
+
+struct tests
+{
+  const char *regex;
+  const char *string;
+  int cflags;
+  int retval;
+} tests[] = {
+  { "a.b", "a\nb", REG_EXTENDED | REG_NEWLINE, REG_NOMATCH },
+  { "a.b", "a\nb", REG_EXTENDED, 0 },
+  { "a[^x]b", "a\nb", REG_EXTENDED | REG_NEWLINE, REG_NOMATCH },
+  { "a[^x]b", "a\nb", REG_EXTENDED, 0 }
+};
+
+int
+main (void)
+{
+  regex_t r;
+  size_t i;
+  int ret = 0;
+
+  for (i = 0; i < sizeof (tests) / sizeof (tests[i]); ++i)
+    {
+      memset (&r, 0, sizeof (r));
+      if (regcomp (&r, tests[i].regex, tests[i].cflags))
+	{
+	  printf ("regcomp %zd failed\n", i);
+	  ret = 1;
+	  continue;
+	}
+      int rv = regexec (&r, tests[i].string, 0, NULL, 0);
+      if (rv != tests[i].retval)
+	{
+	  printf ("regexec %zd unexpected value %d != %d\n",
+		  i, rv, tests[i].retval);
+	  ret = 1;
+	}
+      regfree (&r);
+    }
+  return ret;
+}
--- libc/posix/bug-regex28.c	1 Jan 1970 00:00:00 -0000
+++ libc/posix/bug-regex28.c	5 Feb 2007 15:22:27 -0000	1.1
@@ -0,0 +1,75 @@
+/* Test RE_HAT_LISTS_NOT_NEWLINE and RE_DOT_NEWLINE.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Jakub Jelinek <jakub at redhat.com>, 2007.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <regex.h>
+#include <stdio.h>
+#include <string.h>
+
+struct tests
+{
+  const char *regex;
+  const char *string;
+  reg_syntax_t syntax;
+  int retval;
+} tests[] = {
+#define EGREP RE_SYNTAX_EGREP
+#define EGREP_NL (RE_SYNTAX_EGREP | RE_DOT_NEWLINE) & ~RE_HAT_LISTS_NOT_NEWLINE
+  { "a.b", "a\nb", EGREP, -1 },
+  { "a.b", "a\nb", EGREP_NL, 0 },
+  { "a[^x]b", "a\nb", EGREP, -1 },
+  { "a[^x]b", "a\nb", EGREP_NL, 0 },
+  /* While \S and \W are internally handled as [^[:space:]] and [^[:alnum:]_],
+     RE_HAT_LISTS_NOT_NEWLINE did not make any difference, so ensure
+     it doesn't change.  */
+  { "a\\Sb", "a\nb", EGREP, -1 },
+  { "a\\Sb", "a\nb", EGREP_NL, -1 },
+  { "a\\Wb", "a\nb", EGREP, 0 },
+  { "a\\Wb", "a\nb", EGREP_NL, 0 }
+};
+
+int
+main (void)
+{
+  struct re_pattern_buffer r;
+  size_t i;
+  int ret = 0;
+
+  for (i = 0; i < sizeof (tests) / sizeof (tests[i]); ++i)
+    {
+      re_set_syntax (tests[i].syntax);
+      memset (&r, 0, sizeof (r));
+      if (re_compile_pattern (tests[i].regex, strlen (tests[i].regex), &r))
+	{
+	  printf ("re_compile_pattern %zd failed\n", i);
+	  ret = 1;
+	  continue;
+	}
+      size_t len = strlen (tests[i].string);
+      int rv = re_search (&r, tests[i].string, len, 0, len, NULL);
+      if (rv != tests[i].retval)
+	{
+	  printf ("re_search %zd unexpected value %d != %d\n",
+		  i, rv, tests[i].retval);
+	  ret = 1;
+	}
+      regfree (&r);
+    }
+  return ret;
+}

glibc-bz3995.patch:
 ru_RU |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE glibc-bz3995.patch ---
2007-02-16  Ulrich Drepper  <drepper at redhat.com>

	[BZ #3995]
	* locales/ru_RU (LC_TIME): Set first_weekday and first_workday.

--- libc/localedata/locales/ru_RU	30 Jul 2006 22:19:43 -0000	1.29
+++ libc/localedata/locales/ru_RU	17 Feb 2007 07:26:33 -0000	1.30
@@ -149,6 +149,8 @@ t_fmt_ampm ""
 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>"
+first_weekday 2
+first_workday 2
 END LC_TIME
 
 LC_PAPER

glibc-bz4069.patch:
 math/libm-test.inc             |   11 +++++++++++
 sysdeps/i386/fpu/e_pow.S       |   16 +++++++++-------
 sysdeps/i386/fpu/e_powf.S      |   16 +++++++++-------
 sysdeps/i386/fpu/e_powl.S      |   16 +++++++++-------
 sysdeps/ieee754/dbl-64/e_pow.c |   22 +++++++++++-----------
 sysdeps/x86_64/fpu/e_powl.S    |   16 +++++++++-------
 6 files changed, 58 insertions(+), 39 deletions(-)

--- NEW FILE glibc-bz4069.patch ---
2007-03-01  Jakub Jelinek  <jakub at redhat.com>

	[BZ #4069]
	* sysdeps/ieee754/dbl-64/e_pow.c (__ieee754_pow): Check for NaN
	earlier.
	* math/libm-test.inc (pow_test): Add more tests involving NaNs.

	* sysdeps/i386/fpu/e_powf.S (__ieee754_powf): Avoid invalid exception
	for x qNaN and y either +-inf or non-integer value.
	* sysdeps/i386/fpu/e_pow.S (__ieee754_pow): Likewise.
	* sysdeps/i386/fpu/e_powl.S (__ieee754_powl): Likewise.
	* sysdeps/x86_64/fpu/e_powl.S (__ieee754_powl): Likewise.

--- libc/sysdeps/i386/fpu/e_pow.S	4 May 2005 17:45:15 -0000	1.7
+++ libc/sysdeps/i386/fpu/e_pow.S	5 Mar 2007 19:38:51 -0000	1.8
@@ -161,10 +161,11 @@ ENTRY(__ieee754_pow)
 2:	/* y is a real number.  */
 	fxch			// x : y
 	fldl	MO(one)		// 1.0 : x : y
-	fld	%st(1)		// x : 1.0 : x : y
-	fsub	%st(1)		// x-1 : 1.0 : x : y
-	fabs			// |x-1| : 1.0 : x : y
-	fcompl	MO(limit)	// 1.0 : x : y
+	fldl	MO(limit)	// 0.29 : 1.0 : x : y
+	fld	%st(2)		// x : 0.29 : 1.0 : x : y
+	fsub	%st(2)		// x-1 : 0.29 : 1.0 : x : y
+	fabs			// |x-1| : 0.29 : 1.0 : x : y
+	fucompp			// 1.0 : x : y
 	fnstsw
 	fxch			// x : 1.0 : y
 	sahf
@@ -197,9 +198,10 @@ ENTRY(__ieee754_pow)
 	// y == ?inf
 	.align ALIGNARG(4)
 12:	fstp	%st(0)		// pop y
-	fldl	4(%esp)		// x
-	fabs
-	fcompl	MO(one)		// < 1, == 1, or > 1
+	fldl	MO(one)		// 1
+	fldl	4(%esp)		// x : 1
+	fabs			// abs(x) : 1
+	fucompp			// < 1, == 1, or > 1
 	fnstsw
 	andb	$0x45, %ah
 	cmpb	$0x45, %ah
--- libc/sysdeps/i386/fpu/e_powf.S	4 May 2005 17:45:15 -0000	1.7
+++ libc/sysdeps/i386/fpu/e_powf.S	5 Mar 2007 19:38:51 -0000	1.8
@@ -155,10 +155,11 @@ ENTRY(__ieee754_powf)
 2:	/* y is a real number.  */
 	fxch			// x : y
 	fldl	MO(one)		// 1.0 : x : y
-	fld	%st(1)		// x : 1.0 : x : y
-	fsub	%st(1)		// x-1 : 1.0 : x : y
-	fabs			// |x-1| : 1.0 : x : y
-	fcompl	MO(limit)	// 1.0 : x : y
+	fldl	MO(limit)	// 0.29 : 1.0 : x : y
+	fld	%st(2)		// x : 0.29 : 1.0 : x : y
+	fsub	%st(2)		// x-1 : 0.29 : 1.0 : x : y
+	fabs			// |x-1| : 0.29 : 1.0 : x : y
+	fucompp			// 1.0 : x : y
 	fnstsw
 	fxch			// x : 1.0 : y
 	sahf
@@ -191,9 +192,10 @@ ENTRY(__ieee754_powf)
 	// y == ?inf
 	.align ALIGNARG(4)
 12:	fstp	%st(0)		// pop y
-	flds	4(%esp)		// x
-	fabs
-	fcompl	MO(one)		// < 1, == 1, or > 1
+	fldl	MO(one)		// 1
+	flds	4(%esp)		// x : 1
+	fabs			// abs(x) : 1
+	fucompp			// < 1, == 1, or > 1
 	fnstsw
 	andb	$0x45, %ah
 	cmpb	$0x45, %ah
--- libc/sysdeps/i386/fpu/e_powl.S	4 May 2005 17:45:15 -0000	1.7
+++ libc/sysdeps/i386/fpu/e_powl.S	5 Mar 2007 19:38:51 -0000	1.8
@@ -161,10 +161,11 @@ ENTRY(__ieee754_powl)
 2:	/* y is a real number.  */
 	fxch			// x : y
 	fldl	MO(one)		// 1.0 : x : y
-	fld	%st(1)		// x : 1.0 : x : y
-	fsub	%st(1)		// x-1 : 1.0 : x : y
-	fabs			// |x-1| : 1.0 : x : y
-	fcompl	MO(limit)	// 1.0 : x : y
+	fldl	MO(limit)	// 0.29 : 1.0 : x : y
+	fld	%st(2)		// x : 0.29 : 1.0 : x : y
+	fsub	%st(2)		// x-1 : 0.29 : 1.0 : x : y
+	fabs			// |x-1| : 0.29 : 1.0 : x : y
+	fucompp			// 1.0 : x : y
 	fnstsw
 	fxch			// x : 1.0 : y
 	sahf
@@ -210,9 +211,10 @@ ENTRY(__ieee754_powl)
 	// y == ?inf
 	.align ALIGNARG(4)
 12:	fstp	%st(0)		// pop y
-	fldt	4(%esp)		// x
-	fabs
-	fcompl	MO(one)		// < 1, == 1, or > 1
+	fldl	MO(one)		// 1
+	fldt	4(%esp)		// x : 1
+	fabs			// abs(x) : 1
+	fucompp			// < 1, == 1, or > 1
 	fnstsw
 	andb	$0x45, %ah
 	cmpb	$0x45, %ah
--- libc/sysdeps/ieee754/dbl-64/e_pow.c	23 Jan 2004 13:16:24 -0000	1.13
+++ libc/sysdeps/ieee754/dbl-64/e_pow.c	5 Mar 2007 19:37:40 -0000	1.14
@@ -106,20 +106,28 @@ double __ieee754_pow(double x, double y)
     else
       return y < 0 ? 1.0/ABS(x) : 0.0;                               /* return 0 */
   }
+
+  qx = u.i[HIGH_HALF]&0x7fffffff;  /*   no sign   */
+  qy = v.i[HIGH_HALF]&0x7fffffff;  /*   no sign   */
+
+  if (qx >= 0x7ff00000 && (qx > 0x7ff00000 || u.i[LOW_HALF] != 0)) return NaNQ.x;
+  if (qy >= 0x7ff00000 && (qy > 0x7ff00000 || v.i[LOW_HALF] != 0))
+    return x == 1.0 ? 1.0 : NaNQ.x;
+
   /* if x<0 */
   if (u.i[HIGH_HALF] < 0) {
     k = checkint(y);
     if (k==0) {
-      if ((v.i[HIGH_HALF] & 0x7fffffff) == 0x7ff00000 && v.i[LOW_HALF] == 0) {
+      if (qy == 0x7ff00000) {
 	if (x == -1.0) return 1.0;
 	else if (x > -1.0) return v.i[HIGH_HALF] < 0 ? INF.x : 0.0;
 	else return v.i[HIGH_HALF] < 0 ? 0.0 : INF.x;
       }
-      else if (u.i[HIGH_HALF] == 0xfff00000 && u.i[LOW_HALF] == 0)
+      else if (qx == 0x7ff00000)
 	return y < 0 ? 0.0 : INF.x;
       return NaNQ.x;                              /* y not integer and x<0 */
     }
-    else if (u.i[HIGH_HALF] == 0xfff00000 && u.i[LOW_HALF] == 0)
+    else if (qx == 0x7ff00000)
       {
 	if (k < 0)
 	  return y < 0 ? nZERO.x : nINF.x;
@@ -129,14 +137,6 @@ double __ieee754_pow(double x, double y)
     return (k==1)?__ieee754_pow(-x,y):-__ieee754_pow(-x,y); /* if y even or odd */
   }
   /* x>0 */
-  qx = u.i[HIGH_HALF]&0x7fffffff;  /*   no sign   */
-  qy = v.i[HIGH_HALF]&0x7fffffff;  /*   no sign   */
-
-  if (qx > 0x7ff00000 || (qx == 0x7ff00000 && u.i[LOW_HALF] != 0)) return NaNQ.x;
-                                                                 /*  if 0<x<2^-0x7fe */
-  if (qy > 0x7ff00000 || (qy == 0x7ff00000 && v.i[LOW_HALF] != 0))
-    return x == 1.0 ? 1.0 : NaNQ.x;
-                                                                 /*  if y<2^-0x7fe   */
 
   if (qx == 0x7ff00000)                              /* x= 2^-0x3ff */
     {if (y == 0) return NaNQ.x;
--- libc/sysdeps/x86_64/fpu/e_powl.S	20 Jul 2004 07:05:58 -0000	1.2
+++ libc/sysdeps/x86_64/fpu/e_powl.S	5 Mar 2007 19:38:52 -0000	1.3
@@ -146,10 +147,11 @@ ENTRY(__ieee754_powl)
 2:	/* y is a real number.  */
 	fxch			// x : y
 	fldl	MO(one)		// 1.0 : x : y
-	fld	%st(1)		// x : 1.0 : x : y
-	fsub	%st(1)		// x-1 : 1.0 : x : y
-	fabs			// |x-1| : 1.0 : x : y
-	fcompl	MO(limit)	// 1.0 : x : y
+	fldl	MO(limit)	// 0.29 : 1.0 : x : y
+	fld	%st(2)		// x : 0.29 : 1.0 : x : y
+	fsub	%st(2)		// x-1 : 0.29 : 1.0 : x : y
+	fabs			// |x-1| : 0.29 : 1.0 : x : y
+	fucompp			// 1.0 : x : y
 	fnstsw
 	fxch			// x : 1.0 : y
 	test	$4500,%eax
@@ -190,9 +192,10 @@ ENTRY(__ieee754_powl)
 	// y == ?inf
 	.align ALIGNARG(4)
 12:	fstp	%st(0)		// pop y
-	fldt	8(%rsp)		// x
-	fabs
-	fcompl	MO(one)		// < 1, == 1, or > 1
+	fldl	MO(one)		// 1
+	fldt	8(%rsp)		// x : 1
+	fabs			// abs(x) : 1
+	fucompp			// < 1, == 1, or > 1
 	fnstsw
 	andb	$0x45, %ah
 	cmpb	$0x45, %ah
--- libc/math/libm-test.inc	20 Sep 2006 19:36:26 -0000	1.73
+++ libc/math/libm-test.inc	5 Mar 2007 19:37:53 -0000	1.74
@@ -4614,6 +4614,17 @@ pow_test (void)
 
   /* pow (x, NaN) == NaN.  */
   TEST_ff_f (pow, 3.0, nan_value, nan_value);
+  TEST_ff_f (pow, minus_zero, nan_value, nan_value);
+  TEST_ff_f (pow, plus_infty, nan_value, nan_value);
+  TEST_ff_f (pow, -3.0, nan_value, nan_value);
+  TEST_ff_f (pow, minus_infty, nan_value, nan_value);
+
+  TEST_ff_f (pow, nan_value, 3.0, nan_value);
+  TEST_ff_f (pow, nan_value, -3.0, nan_value);
+  TEST_ff_f (pow, nan_value, plus_infty, nan_value);
+  TEST_ff_f (pow, nan_value, minus_infty, nan_value);
+  TEST_ff_f (pow, nan_value, 2.5, nan_value);
+  TEST_ff_f (pow, nan_value, -2.5, nan_value);
 
   TEST_ff_f (pow, 1, plus_infty, 1);
   TEST_ff_f (pow, -1, plus_infty, 1);

glibc-bz4070.patch:
 printf_fp.c |   88 ++++++++++++++++++++++++++++++++++++++++++------------------
 tfformat.c  |   16 ++++++----
 2 files changed, 72 insertions(+), 32 deletions(-)

--- NEW FILE glibc-bz4070.patch ---
2007-04-13  Jakub Jelinek  <jakub at redhat.com>

	* stdio-common/printf_fp.c (___printf_fp): Fix exponent -4
	special case handling when wcp == wstartp + 1.  Fix a comment typo.
	* stdio-common/tfformat.c (sprint_doubles): Add a new testcase.

2007-02-21  Ulrich Drepper  <drepper at redhat.com>

	[BZ #4070]
	* stdio-common/printf_fp.c (___printf_fp): Handle a few more
	special cases.
	* stdio-common/tfformat.c (sprint_doubles): Some more tests.

2007-02-19  Ulrich Drepper  <drepper at redhat.com>

	* stdio-common/printf_fp.c (___printf_fp): Cleanups and minor
	optimization.

--- libc/stdio-common/printf_fp.c	25 Apr 2006 18:38:30 -0000	1.58
+++ libc/stdio-common/printf_fp.c	16 Apr 2007 23:28:26 -0000	1.62
@@ -811,12 +811,14 @@ ___printf_fp (FILE *fp,
     int chars_needed;
     int expscale;
     int intdig_max, intdig_no = 0;
-    int fracdig_min, fracdig_max, fracdig_no = 0;
+    int fracdig_min;
+    int fracdig_max;
     int dig_max;
     int significant;
     int ngroups = 0;
+    char spec = _tolower (info->spec);
 
-    if (_tolower (info->spec) == 'e')
+    if (spec == 'e')
       {
 	type = info->spec;
 	intdig_max = 1;
@@ -826,7 +828,7 @@ ___printf_fp (FILE *fp,
 	dig_max = INT_MAX;		/* Unlimited.  */
 	significant = 1;		/* Does not matter here.  */
       }
-    else if (_tolower (info->spec) == 'f')
+    else if (spec == 'f')
       {
 	type = 'f';
 	fracdig_min = fracdig_max = info->prec < 0 ? 6 : info->prec;
@@ -923,7 +925,9 @@ ___printf_fp (FILE *fp,
       }
 
     /* Generate the needed number of fractional digits.	 */
-    while (fracdig_no < fracdig_min
+    int fracdig_no = 0;
+    int added_zeros = 0;
+    while (fracdig_no < fracdig_min + added_zeros
 	   || (fracdig_no < fracdig_max && (fracsize > 1 || frac[0] != 0)))
       {
 	++fracdig_no;
@@ -934,7 +938,7 @@ ___printf_fp (FILE *fp,
 	  {
 	    ++fracdig_max;
 	    if (fracdig_min > 0)
-	      ++fracdig_min;
+	      ++added_zeros;
 	  }
       }
 
@@ -971,11 +975,23 @@ ___printf_fp (FILE *fp,
 	  {
 	    /* Process fractional digits.  Terminate if not rounded or
 	       radix character is reached.  */
+	    int removed = 0;
 	    while (*--wtp != decimalwc && *wtp == L'9')
-	      *wtp = '0';
+	      {
+		*wtp = L'0';
+		++removed;
+	      }
+	    if (removed == fracdig_min && added_zeros > 0)
+	      --added_zeros;
 	    if (*wtp != decimalwc)
 	      /* Round up.  */
 	      (*wtp)++;
+	    else if (__builtin_expect (spec == 'g' && type == 'f' && info->alt,
+				       0))
+	      /* This is a special case: the rounded number is 1.0,
+		 the format is 'g' or 'G', and the alternative format
+		 is selected.  This means the result must be "1.".  */
+	      --added_zeros;
 	  }
 
 	if (fracdig_no == 0 || *wtp == decimalwc)
@@ -1042,7 +1058,7 @@ ___printf_fp (FILE *fp,
 
   do_expo:
     /* Now remove unnecessary '0' at the end of the string.  */
-    while (fracdig_no > fracdig_min && *(wcp - 1) == L'0')
+    while (fracdig_no > fracdig_min + added_zeros && *(wcp - 1) == L'0')
       {
 	--wcp;
 	--fracdig_no;
@@ -1060,26 +1076,46 @@ ___printf_fp (FILE *fp,
     /* Write the exponent if it is needed.  */
     if (type != 'f')
       {
-	*wcp++ = (wchar_t) type;
-	*wcp++ = expsign ? L'-' : L'+';
-
-	/* Find the magnitude of the exponent.	*/
-	expscale = 10;
-	while (expscale <= exponent)
-	  expscale *= 10;
-
-	if (exponent < 10)
-	  /* Exponent always has at least two digits.  */
-	  *wcp++ = L'0';
+	if (__builtin_expect (expsign != 0 && exponent == 4 && spec == 'g', 0))
+	  {
+	    /* This is another special case.  The exponent of the number is
+	       really smaller than -4, which requires the 'e'/'E' format.
+	       But after rounding the number has an exponent of -4.  */
+	    assert (wcp >= wstartp + 1);
+	    assert (wstartp[0] == L'1');
+	    __wmemcpy (wstartp, L"0.0001", 6);
+	    wstartp[1] = decimalwc;
+	    if (wcp >= wstartp + 2)
+	      {
+		wmemset (wstartp + 6, L'0', wcp - (wstartp + 2));
+		wcp += 4;
+	      }
+	    else
+	      wcp += 5;
+	  }
 	else
-	  do
-	    {
-	      expscale /= 10;
-	      *wcp++ = L'0' + (exponent / expscale);
-	      exponent %= expscale;
-	    }
-	  while (expscale > 10);
-	*wcp++ = L'0' + exponent;
+	  {
+	    *wcp++ = (wchar_t) type;
+	    *wcp++ = expsign ? L'-' : L'+';
+
+	    /* Find the magnitude of the exponent.	*/
+	    expscale = 10;
+	    while (expscale <= exponent)
+	      expscale *= 10;
+
+	    if (exponent < 10)
+	      /* Exponent always has at least two digits.  */
+	      *wcp++ = L'0';
+	    else
+	      do
+		{
+		  expscale /= 10;
+		  *wcp++ = L'0' + (exponent / expscale);
+		  exponent %= expscale;
+		}
+	      while (expscale > 10);
+	    *wcp++ = L'0' + exponent;
+	  }
       }
 
     /* Compute number of characters which must be filled with the padding
--- libc/stdio-common/tfformat.c	11 Mar 2002 21:46:37 -0000	1.7
+++ libc/stdio-common/tfformat.c	16 Apr 2007 23:28:37 -0000	1.9
@@ -4012,6 +4012,15 @@ sprint_double_type sprint_doubles[] =
   {__LINE__, 16,			"0x1.0p+4", "%.1a"},
   {__LINE__, 16,			"0x1.00000000000000000000p+4", "%.20a"},
   {__LINE__, 4444.88888888,		"4445", "%2.F"},
+  {__LINE__, 0.956,			"1", "%.0g"},
+  {__LINE__, 1.0956,			"1.", "%#.0g"},
+  {__LINE__, 0.956,			"1.", "%#.0g"},
+  {__LINE__, 0.0956,			"0.1", "%#.0g"},
+  {__LINE__, 0.00956,			"0.01", "%#.0g"},
+  {__LINE__, 0.000956,			"0.001", "%#.0g"},
+  {__LINE__, 0.000098,			"0.0001", "%#.0g"},
+  {__LINE__, 0.0000996,			"0.00010", "%#.2g"},
+  {__LINE__, 9.999999999999999e-05,	"0.0001", "%g"},
 
   {0 }
 
@@ -4023,13 +4032,8 @@ sprint_double_type sprint_doubles[] =
 
 int required_precision = 13;
 
-#if defined(__STDC__) || defined(__cplusplus)
 static int
 matches (register char *result, register const char *desired)
-#else
-int matches(result, desired)
-     register char *result; register const char *desired;
-#endif
 {
     int digits_seen = 0;
     for (;; result++, desired++) {
@@ -4080,7 +4084,7 @@ int main(int argc, char *argv[])
 
   /* And one special test.  */
   {
-    const char ref[] = "1.7763568394002504646778106689453125e-15";
+    static const char ref[] = "1.7763568394002504646778106689453125e-15";
     int i;
     d = 1.0;
     for (i = 1; i < 50; ++i)

glibc-bz4074.patch:
 grpcache.c |    1 +
 pwdcache.c |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE glibc-bz4074.patch ---
2007-02-21  Ulrich Drepper  <drepper at redhat.com>

	* nscd/grpcache.c (cache_addgr): In case a record changed on
	refresh, adjust key_copy.

	[BZ #4074]
	* nscd/pwdcache.c (cache_addpw): In case a record changed on
	refresh, adjust key_copy.

--- libc/nscd/grpcache.c	14 Jan 2007 05:09:52 -0000	1.47
+++ libc/nscd/grpcache.c	21 Feb 2007 09:07:54 -0000	1.48
@@ -279,6 +279,7 @@ cache_addgr (struct database_dyn *db, in
 		  /* Adjust pointers into the memory block.  */
 		  gr_name = (char *) newp + (gr_name - (char *) dataset);
 		  cp = (char *) newp + (cp - (char *) dataset);
+		  key_copy = (char *) newp + (key_copy - (char *) dataset);
 
 		  dataset = memcpy (newp, dataset, total + n);
 		  alloca_used = false;
--- libc/nscd/pwdcache.c	14 Jan 2007 05:09:52 -0000	1.45
+++ libc/nscd/pwdcache.c	21 Feb 2007 09:05:19 -0000	1.46
@@ -274,6 +274,7 @@ cache_addpw (struct database_dyn *db, in
 		{
 		  /* Adjust pointer into the memory block.  */
 		  cp = (char *) newp + (cp - (char *) dataset);
+		  key_copy = (char *) newp + (key_copy - (char *) dataset);
 
 		  dataset = memcpy (newp, dataset, total + n);
 		  alloca_used = false;

glibc-bz4076.patch:
 Makefile   |    2 +-
 bug-ftw5.c |   25 +++++++++++++++++++++++++
 ftw.c      |   26 +++++++++++++++++++++-----
 3 files changed, 47 insertions(+), 6 deletions(-)

--- NEW FILE glibc-bz4076.patch ---
2007-02-21  Ulrich Drepper  <drepper at redhat.com>

	[BZ #4076]
	* io/ftw.c (ftw_startup): Handle special case of FTW_CHDIR in /.
	(open_dir_stream): Likewise.
	* io/Makefile (tests): Add bug-ftw5.
	* io/bug-ftw5.c: New file.

--- libc/io/ftw.c	10 May 2006 06:35:59 -0000	1.54
+++ libc/io/ftw.c	21 Feb 2007 09:36:15 -0000	1.55
@@ -348,8 +348,17 @@ open_dir_stream (int *dfdp, struct ftw_d
 	}
       else
 	{
-	  const char *name = ((data->flags & FTW_CHDIR)
-			      ? data->dirbuf + data->ftw.base: data->dirbuf);
+	  const char *name;
+
+	  if (data->flags & FTW_CHDIR)
+	    {
+	      name = data->dirbuf + data->ftw.base;
+	      if (name[0] == '\0')
+		name = ".";
+	    }
+	  else
+	    name = data->dirbuf;
+
 	  dirp->stream = __opendir (name);
 	}
 
@@ -721,9 +730,16 @@ ftw_startup (const char *dir, int is_nft
   /* Get stat info for start directory.  */
   if (result == 0)
     {
-      const char *name = ((data.flags & FTW_CHDIR)
-			  ? data.dirbuf + data.ftw.base
-			  : data.dirbuf);
+      const char *name;
+
+      if (data.flags & FTW_CHDIR)
+	{
+	  name = data.dirbuf + data.ftw.base;
+	  if (name[0] == '\0')
+	    name = ".";
+	}
+      else
+	name = data.dirbuf;
 
       if (((flags & FTW_PHYS)
 	   ? LXSTAT (_STAT_VER, name, &st)
--- libc/io/Makefile	5 Dec 2006 21:26:11 -0000	1.68
+++ libc/io/Makefile	21 Feb 2007 09:35:36 -0000	1.69
@@ -66,7 +66,7 @@ tests		:= test-utime test-stat test-stat
 		   tst-openat tst-unlinkat tst-fstatat tst-futimesat \
 		   tst-renameat tst-fchownat tst-fchmodat tst-faccessat \
 		   tst-symlinkat tst-linkat tst-readlinkat tst-mkdirat \
-		   tst-mknodat tst-mkfifoat tst-ttyname_r
+		   tst-mknodat tst-mkfifoat tst-ttyname_r bug-ftw5
 
 distribute	:= ftwtest-sh
 
--- libc/io/bug-ftw5.c	1 Jan 1970 00:00:00 -0000
+++ libc/io/bug-ftw5.c	21 Feb 2007 09:35:26 -0000	1.1
@@ -0,0 +1,25 @@
+#include <errno.h>
+#include <ftw.h>
+#include <stdio.h>
+
+static int
+fn (const char *file, const struct stat *sb, int flag, struct FTW *s)
+{
+  puts (file);
+  return FTW_STOP;
+}
+
+static int
+do_test (void)
+{
+  if (nftw ("/", fn, 0, FTW_CHDIR | FTW_ACTIONRETVAL) < 0)
+    {
+      printf ("nftw / FTW_CHDIR: %m\n");
+      return 1;
+    }
+
+  return 0;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"

glibc-bz4101.patch:
 Makefile    |    2 -
 argp-help.c |    6 +--
 tst-argp2.c |  101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 105 insertions(+), 4 deletions(-)

--- NEW FILE glibc-bz4101.patch ---
2007-03-15  Jakub Jelinek  <jakub at redhat.com>

	[BZ #4101]
	* argp/argp-help.c (hol_cluster_cmp): Fix comparisons used to find
	ancestors with the same depths.
	Patch by Niels Moeller <nisse at lysator.liu.se>.
	(filter_doc): Don't crash if argp is NULL.
	* argp/Makefile (tests): Add tst-argp2.
	* argp/tst-argp2.c: New test.

--- libc/argp/Makefile	9 May 2006 22:42:24 -0000	1.7
+++ libc/argp/Makefile	15 Mar 2007 20:08:57 -0000	1.8
@@ -26,7 +26,7 @@ distribute	= argp-fmtstream.h argp-namef
 routines	= $(addprefix argp-, ba fmtstream fs-xinl help parse pv \
 				     pvh xinl eexst)
 
-tests		= argp-test tst-argp1 bug-argp1
+tests		= argp-test tst-argp1 bug-argp1 tst-argp2
 
 CFLAGS-argp-help.c = $(uses-callbacks) -fexceptions
 CFLAGS-argp-parse.c = $(uses-callbacks)
--- libc/argp/argp-help.c	10 May 2006 06:28:06 -0000	1.54
+++ libc/argp/argp-help.c	15 Mar 2007 20:08:18 -0000	1.55
@@ -672,9 +673,9 @@ hol_cluster_cmp (const struct hol_cluste
 {
   /* If one cluster is deeper than the other, use its ancestor at the same
      level, so that finding the common ancestor is straightforward.  */
-  while (cl1->depth < cl2->depth)
+  while (cl1->depth > cl2->depth)
     cl1 = cl1->parent;
-  while (cl2->depth < cl1->depth)
+  while (cl2->depth > cl1->depth)
     cl2 = cl2->parent;
 
   /* Now reduce both clusters to their ancestors at the point where both have
@@ -987,7 +988,7 @@ static const char *
 filter_doc (const char *doc, int key, const struct argp *argp,
 	    const struct argp_state *state)
 {
-  if (argp->help_filter)
+  if (argp && argp->help_filter)
     /* We must apply a user filter to this output.  */
     {
       void *input = __argp_input (argp, state);
--- libc/argp/tst-argp2.c	1 Jan 1970 00:00:00 -0000
+++ libc/argp/tst-argp2.c	15 Mar 2007 20:08:46 -0000	1.1
@@ -0,0 +1,101 @@
+/* Copyright (C) 2007 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Jakub Jelinek <jakub at redhat.com>, 2007.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <argp.h>
+
+static const struct argp_option opt1[] =
+  {
+    { "opt1", '1', "NUMBER", 0, "Option 1" },
+    { NULL, 0, NULL, 0, NULL }
+  };
+
+static const struct argp_option opt2[] =
+  {
+    { "opt2", '2', "NUMBER", 0, "Option 2" },
+    { NULL, 0, NULL, 0, NULL }
+  };
+
+static const struct argp_option opt3[] =
+  {
+    { "opt3", '3', "NUMBER", 0, "Option 3" },
+    { NULL, 0, NULL, 0, NULL }
+  };
+
+static const struct argp_option opt4[] =
+  {
+    { "opt4", '4', "NUMBER", 0, "Option 4" },
+    { NULL, 0, NULL, 0, NULL }
+  };
+
+static const struct argp_option opt5[] =
+  {
+    { "opt5", '5', "NUMBER", 0, "Option 5" },
+    { NULL, 0, NULL, 0, NULL }
+  };
+
+static struct argp argp5 =
+  {
+    opt5, NULL, "args doc5", "doc5", NULL, NULL, NULL
+  };
+
+static struct argp argp4 =
+  {
+    opt4, NULL, "args doc4", "doc4", NULL, NULL, NULL
+  };
+
+static struct argp argp3 =
+  {
+    opt3, NULL, "args doc3", "doc3", NULL, NULL, NULL
+  };
+
+static struct argp_child children2[] =
+  {
+    { &argp4, 0, "child3", 3 },
+    { &argp5, 0, "child4", 4 },
+    { NULL, 0, NULL, 0 }
+  };
+
+static struct argp argp2 =
+  {
+    opt2, NULL, "args doc2", "doc2", children2, NULL, NULL
+  };
+
+static struct argp_child children1[] =
+  {
+    { &argp2, 0, "child1", 1 },
+    { &argp3, 0, "child2", 2 },
+    { NULL, 0, NULL, 0 }
+  };
+
+static struct argp argp1 =
+  {
+    opt1, NULL, "args doc1", "doc1", children1, NULL, NULL
+  };
+
+
+static int
+do_test (void)
+{
+  argp_help (&argp1, stdout, ARGP_HELP_LONG, (char *) "tst-argp2");
+  return 0;
+}
+
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"

glibc-bz4130.patch:
 utmp_file.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE glibc-bz4130.patch ---
2007-03-15  Jakub Jelinek  <jakub at redhat.com>

	[BZ #4130]
	* login/utmp_file.c (setutent_file): Use O_LARGEFILE for
	open_not_cancel_2.
	(updwtmp_file): Likewise.

--- libc/login/utmp_file.c	14 Dec 2005 11:33:40 -0000	1.17
+++ libc/login/utmp_file.c	15 Mar 2007 20:06:17 -0000	1.18
@@ -140,11 +140,11 @@ setutent_file (void)
 
       file_name = TRANSFORM_UTMP_FILE_NAME (__libc_utmp_file_name);
 
-      file_fd = open_not_cancel_2 (file_name, O_RDWR);
+      file_fd = open_not_cancel_2 (file_name, O_RDWR | O_LARGEFILE);
       if (file_fd == -1)
 	{
 	  /* Hhm, read-write access did not work.  Try read-only.  */
-	  file_fd = open_not_cancel_2 (file_name, O_RDONLY);
+	  file_fd = open_not_cancel_2 (file_name, O_RDONLY | O_LARGEFILE);
 	  if (file_fd == -1)
 	    return 0;
 	}
@@ -459,7 +459,7 @@ updwtmp_file (const char *file, const st
   int fd;
 
   /* Open WTMP file.  */
-  fd = open_not_cancel_2 (file, O_WRONLY);
+  fd = open_not_cancel_2 (file, O_WRONLY | O_LARGEFILE);
   if (fd < 0)
     return -1;
 

glibc-bz4181.patch:
 Makefile         |    2 
 inet6_opt.c      |   34 ++++-----
 test-inet6_opt.c |  207 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 225 insertions(+), 18 deletions(-)

--- NEW FILE glibc-bz4181.patch ---
2007-03-15  Jakub Jelinek  <jakub at redhat.com>

	[BZ #4181]
	* inet/inet6_opt.c (add_padding): Only insert padding if npad > 0.
	(inet6_opt_append): Don't check extlen is big enough if extbuf
	is NULL.
	(inet6_opt_finish): Likewise.
	* inet/Makefile (tests): Add test-inet6_opt.
	* inet/test-inet6_opt.c: New test.

--- libc/inet/Makefile	14 Jan 2007 05:22:09 -0000	1.60
+++ libc/inet/Makefile	15 Mar 2007 20:05:02 -0000	1.61
@@ -52,7 +52,7 @@ routines := htonl htons		\
 aux := check_pf ifreq
 
 tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \
-	 tst-gethnm test-ifaddrs bug-if1
+	 tst-gethnm test-ifaddrs bug-if1 test-inet6_opt
 
 include ../Rules
 
--- libc/inet/inet6_opt.c	25 May 2006 04:38:02 -0000	1.1
+++ libc/inet/inet6_opt.c	15 Mar 2007 20:04:17 -0000	1.2
@@ -51,7 +51,7 @@ add_padding (uint8_t *extbuf, int offset
 {
   if (npad == 1)
     extbuf[offset] = IP6OPT_PAD1;
-  else
+  else if (npad > 0)
     {
       struct ip6_opt *pad_opt = (struct ip6_opt *) (extbuf + offset);
 
@@ -102,21 +102,17 @@ inet6_opt_append (void *extbuf, socklen_
   int data_offset = offset + sizeof (struct ip6_opt);
   int npad = (align - data_offset % align) & (align - 1);
 
-  /* Now we can check whether the buffer is large enough.  */
-  if (data_offset + npad + len > extlen)
-    return -1;
-
-  if (npad != 0)
+  if (extbuf != NULL)
     {
-      if (extbuf != NULL)
-	add_padding (extbuf, offset, npad);
+      /* Now we can check whether the buffer is large enough.  */
+      if (data_offset + npad + len > extlen)
+	return -1;
+
+      add_padding (extbuf, offset, npad);
 
       offset += npad;
-    }
 
-  /* Now prepare the option itself.  */
-  if (extbuf != NULL)
-    {
+      /* Now prepare the option itself.  */
       struct ip6_opt *opt = (struct ip6_opt *) ((uint8_t *) extbuf + offset);
 
       opt->ip6o_type = type;
@@ -124,6 +120,8 @@ inet6_opt_append (void *extbuf, socklen_
 
       *databufp = opt + 1;
     }
+  else
+    offset += npad;
 
   return offset + sizeof (struct ip6_opt) + len;
 }
@@ -145,12 +143,14 @@ inet6_opt_finish (void *extbuf, socklen_
   /* Required padding at the end.  */
   int npad = (8 - (offset & 7)) & 7;
 
-  /* Make sure the buffer is large enough.  */
-  if (offset + npad > extlen)
-    return -1;
-
   if (extbuf != NULL)
-    add_padding (extbuf, offset, npad);
+    {
+      /* Make sure the buffer is large enough.  */
+      if (offset + npad > extlen)
+	return -1;
+
+      add_padding (extbuf, offset, npad);
+    }
 
   return offset + npad;
 }
--- libc/inet/test-inet6_opt.c	1 Jan 1970 00:00:00 -0000
+++ libc/inet/test-inet6_opt.c	15 Mar 2007 20:04:51 -0000	1.1
@@ -0,0 +1,207 @@
+#include <netinet/in.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define OPT_X	42
+#define OPT_Y	43
+#define OPT_Z	44
+
+static void *
+encode_inet6_opt (socklen_t *elp)
+{
+  void *eb = NULL;
+  socklen_t el;
+  int cl;
+  void *db;
+  int offset;
+  uint8_t val1;
+  uint16_t val2;
+  uint32_t val4;
+  uint64_t val8;
+
+  *elp = 0;
+#define CHECK() \
+  if (cl == -1)						\
+    {							\
+      printf ("cl == -1 on line %d\n", __LINE__);	\
+      free (eb);					\
+      return NULL;					\
+    }
+
+  /* Estimate the length */
+  cl = inet6_opt_init (NULL, 0);
+  CHECK ();
+  cl = inet6_opt_append (NULL, 0, cl, OPT_X, 12, 8, NULL);
+  CHECK ();
+  cl = inet6_opt_append (NULL, 0, cl, OPT_Y, 7, 4, NULL);
+  CHECK ();
+  cl = inet6_opt_append (NULL, 0, cl, OPT_Z, 7, 1, NULL);
+  CHECK ();
+  cl = inet6_opt_finish (NULL, 0, cl);
+  CHECK ();
+  el = cl;
+
+  eb = malloc (el + 8);
+  if (eb == NULL)
+    {
+      puts ("malloc failed");
+      return NULL;
+    }
+  /* Canary.  */
+  memcpy (eb + el, "deadbeef", 8);
+
+  cl = inet6_opt_init (eb, el);
+  CHECK ();
+
+  cl = inet6_opt_append (eb, el, cl, OPT_X, 12, 8, &db);
+  CHECK ();
+  val4 = 0x12345678;
+  offset = inet6_opt_set_val (db, 0, &val4, sizeof  (val4));
+  val8 = 0x0102030405060708LL;
+  inet6_opt_set_val (db, offset, &val8, sizeof  (val8));
+
+  cl = inet6_opt_append (eb, el, cl, OPT_Y, 7, 4, &db);
+  CHECK ();
+  val1 = 0x01;
+  offset = inet6_opt_set_val (db, 0, &val1, sizeof  (val1));
+  val2 = 0x1331;
+  offset = inet6_opt_set_val (db, offset, &val2, sizeof  (val2));
+  val4 = 0x01020304;
+  inet6_opt_set_val (db, offset, &val4, sizeof  (val4));
+
+  cl = inet6_opt_append (eb, el, cl, OPT_Z, 7, 1, &db);
+  CHECK ();
+  inet6_opt_set_val (db, 0, (void *) "abcdefg", 7);
+
+  cl = inet6_opt_finish (eb, el, cl);
+  CHECK ();
+
+  if (memcmp (eb + el, "deadbeef", 8) != 0)
+    {
+      puts ("Canary corrupted");
+      free (eb);
+      return NULL;
+    }
+  *elp = el;
+  return eb;
+}
+
+int
+decode_inet6_opt (void *eb, socklen_t el)
+{
+  int ret = 0;
+  int seq = 0;
+  int cl = 0;
+  int offset;
+  uint8_t type;
+  socklen_t len;
+  uint8_t val1;
+  uint16_t val2;
+  uint32_t val4;
+  uint64_t val8;
+  void *db;
+  char buf[8];
+
+  while ((cl = inet6_opt_next (eb, el, cl, &type, &len, &db)) != -1)
+    switch (type)
+      {
+      case OPT_X:
+	if (seq++ != 0)
+	  {
+	    puts ("OPT_X is not first");
+	    ret = 1;
+	  }
+	if (len != 12)
+	  {
+	    printf ("OPT_X's length %d != 12\n", len);
+	    ret = 1;
+	  }
+	offset = inet6_opt_get_val (db, 0, &val4, sizeof (val4));
+	if (val4 != 0x12345678)
+	  {
+	    printf ("OPT_X's val4 %x != 0x12345678\n", val4);
+	    ret = 1;
+	  }
+	offset = inet6_opt_get_val (db, offset, &val8, sizeof (val8));
+	if (offset != len || val8 != 0x0102030405060708LL)
+	  {
+	    printf ("OPT_X's val8 %llx != 0x0102030405060708\n",
+		    (long long) val8);
+	    ret = 1;
+	  }
+	break;
+      case OPT_Y:
+	if (seq++ != 1)
+	  {
+	    puts ("OPT_Y is not second");
+	    ret = 1;
+	  }
+	if (len != 7)
+	  {
+	    printf ("OPT_Y's length %d != 7\n", len);
+	    ret = 1;
+	  }
+	offset = inet6_opt_get_val (db, 0, &val1, sizeof (val1));
+	if (val1 != 0x01)
+	  {
+	    printf ("OPT_Y's val1 %x != 0x01\n", val1);
+	    ret = 1;
+	  }
+	offset = inet6_opt_get_val (db, offset, &val2, sizeof (val2));
+	if (val2 != 0x1331)
+	  {
+	    printf ("OPT_Y's val2 %x != 0x1331\n", val2);
+	    ret = 1;
+	  }
+	offset = inet6_opt_get_val (db, offset, &val4, sizeof (val4));
+	if (offset != len || val4 != 0x01020304)
+	  {
+	    printf ("OPT_Y's val4 %x != 0x01020304\n", val4);
+	    ret = 1;
+	  }
+	break;
+      case OPT_Z:
+	if (seq++ != 2)
+	  {
+	    puts ("OPT_Z is not third");
+	    ret = 1;
+	  }
+	if (len != 7)
+	  {
+	    printf ("OPT_Z's length %d != 7\n", len);
+	    ret = 1;
+	  }
+	offset = inet6_opt_get_val (db, 0, buf, 7);
+	if (offset != len || memcmp (buf, "abcdefg", 7) != 0)
+	  {
+	    buf[7] = '\0';
+	    printf ("OPT_Z's buf \"%s\" != \"abcdefg\"\n", buf);
+	    ret = 1;
+	  }
+	break;
+      default:
+	printf ("Unknown option %d\n", type);
+	ret = 1;
+	break;
+      }
+  if (seq != 3)
+    {
+      puts ("Didn't see all of OPT_X, OPT_Y and OPT_Z");
+      ret = 1;
+    }
+  return ret;
+}
+
+int
+main (void)
+{
+  void *eb;
+  socklen_t el;
+  eb = encode_inet6_opt (&el);
+  if (eb == NULL)
+    return 1;
+  if (decode_inet6_opt (eb, el))
+    return 1;
+  return 0;
+}

glibc-bz4344.patch:
 ldconfig.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE glibc-bz4344.patch ---
2007-04-13  Jakub Jelinek  <jakub at redhat.com>

	[BZ #4344]
	* elf/ldconfig.c (search_dir): Fix 2 off-by-2 errors.
	Reported by David Anderson <davea42 at earthlink.net>.

--- libc/elf/ldconfig.c	3 Jan 2007 05:44:11 -0000	1.58
+++ libc/elf/ldconfig.c	13 Apr 2007 19:53:20 -0000	1.59
@@ -707,10 +707,10 @@ search_dir (const struct dir_entry *entr
 			 + 1, ".#prelink#.", sizeof (".#prelink#.") - 1) == 0)
 	    continue;
 	}
-      len += strlen (entry->path);
+      len += strlen (entry->path) + 2;
       if (len > file_name_len)
 	{
-	  file_name_len = len + 1;
+	  file_name_len = len;
 	  file_name = alloca (file_name_len);
 	  if (!opt_chroot)
 	    real_file_name = file_name;
@@ -718,10 +718,10 @@ search_dir (const struct dir_entry *entr
       sprintf (file_name, "%s/%s", entry->path, direntry->d_name);
       if (opt_chroot)
 	{
-	  len = strlen (dir_name) + strlen (direntry->d_name);
+	  len = strlen (dir_name) + strlen (direntry->d_name) + 2;
 	  if (len > real_file_name_len)
 	    {
-	      real_file_name_len = len + 1;
+	      real_file_name_len = len;
 	      real_file_name = alloca (real_file_name_len);
 	    }
 	  sprintf (real_file_name, "%s/%s", dir_name, direntry->d_name);

glibc-bz4364.patch:
 unistd.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE glibc-bz4364.patch ---
2007-04-16  Ulrich Drepper  <drepper at redhat.com>

	[BZ #4364]
	* posix/unistd.h (_XOPEN_VERSION): Define appropriately for SUSv3.

--- libc/posix/unistd.h	9 Nov 2006 21:51:58 -0000	1.148
+++ libc/posix/unistd.h	16 Apr 2007 23:44:06 -0000	1.149
@@ -56,7 +56,9 @@ __BEGIN_DECLS
 #define _POSIX2_LOCALEDEF       200112L
 
 /* X/Open version number to which the library conforms.  It is selectable.  */
-#ifdef __USE_UNIX98
+#ifdef __USE_XOPEN2K
+# define _XOPEN_VERSION	600
+#elif defined __USE_UNIX98
 # define _XOPEN_VERSION	500
 #else
 # define _XOPEN_VERSION	4

glibc-bz4368.patch:
 stdlib.h |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

--- NEW FILE glibc-bz4368.patch ---
2007-04-17  Ulrich Drepper  <drepper at redhat.com>

	[BZ #4368]
	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.

--- libc/stdlib/stdlib.h	17 Mar 2007 17:04:06 -0000	1.116
+++ libc/stdlib/stdlib.h	17 Apr 2007 18:35:42 -0000	1.117
@@ -747,12 +747,11 @@ extern char *canonicalize_file_name (__c
 #endif
 
 #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
-/* Return the canonical absolute name of file NAME.  The last file name
-   component need not exist, and may be a symlink to a nonexistent file.
-   If RESOLVED is null, the result is malloc'd; otherwise, if the canonical
-   name is PATH_MAX chars or more, returns null with `errno' set to
-   ENAMETOOLONG; if the name fits in fewer than PATH_MAX chars, returns the
-   name in RESOLVED.  */
+/* Return the canonical absolute name of file NAME.  If RESOLVED is
+   null, the result is malloc'd; otherwise, if the canonical name is
+   PATH_MAX chars or more, returns null with `errno' set to
+   ENAMETOOLONG; if the name fits in fewer than PATH_MAX chars,
+   returns the name in RESOLVED.  */
 extern char *realpath (__const char *__restrict __name,
 		       char *__restrict __resolved) __THROW __wur;
 #endif

glibc-bz4405.patch:
 gconv-modules |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE glibc-bz4405.patch ---
2007-04-23  Jakub Jelinek  <jakub at redhat.com>

	[BZ #4405]
	* iconvdata/gconv-modules (E13B): Add a missing slash to the alias
	name.  Patch by Aurelien Jarno <aurelien at aurel32.net>.

--- libc/iconvdata/gconv-modules	20 Jan 2007 00:22:40 -0000	1.90
+++ libc/iconvdata/gconv-modules	23 Apr 2007 09:22:10 -0000	1.91
@@ -1376,7 +1376,7 @@ module	INTERNAL		INIS-CYRILLIC//		INIS-C
 #	from			to			module		cost
 alias	ISO-IR-98//		ISO_2033//
 alias	ISO_2033-1983//		ISO_2033//
-alias	E13B/			ISO_2033//
+alias	E13B//			ISO_2033//
 alias	CSISO2033//		ISO_2033//
 module	ISO_2033//		INTERNAL		ISO_2033	1
 module	INTERNAL		ISO_2033//		ISO_2033	1

glibc-bz4406.patch:
 gconv_charset.h |    2 +-
 iconv_open.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE glibc-bz4406.patch ---
2007-04-25  Ulrich Drepper  <drepper at redhat.com>

	[BZ #4406]
	* iconv/gconv_charset.h (strip): Allow ':'
	* iconv/iconv_open.c (iconv_open): Adjust comment.

--- libc/iconv/gconv_charset.h	21 Dec 2005 07:27:27 -0000	1.9
+++ libc/iconv/gconv_charset.h	25 Apr 2007 15:14:36 -0000	1.10
@@ -30,7 +30,7 @@ strip (char *wp, const char *s)
   while (*s != '\0')
     {
       if (__isalnum_l (*s, _nl_C_locobj_ptr)
-	  || *s == '_' || *s == '-' || *s == '.' || *s == ',')
+	  || *s == '_' || *s == '-' || *s == '.' || *s == ',' || *s == ':')
 	*wp++ = __toupper_l (*s, _nl_C_locobj_ptr);
       else if (*s == '/')
 	{
--- libc/iconv/iconv_open.c	29 Nov 2001 04:57:52 -0000	1.14
+++ libc/iconv/iconv_open.c	25 Apr 2007 15:15:21 -0000	1.15
@@ -38,7 +38,7 @@ iconv_open (const char *tocode, const ch
   int res;
 
   /* Normalize the name.  We remove all characters beside alpha-numeric,
-     '_', '-', '/', and '.'.  */
+     '_', '-', '/', '.', and ':'.  */
   tocode_len = strlen (tocode);
   tocode_conv = (char *) alloca (tocode_len + 3);
   strip (tocode_conv, tocode);

glibc-bz4411.patch:
 en_ZA |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

--- NEW FILE glibc-bz4411.patch ---
2007-04-24  Ulrich Drepper  <drepper at redhat.com>

	[BZ #4411]
	* locales/en_ZA: Update int_select.
	Patch by Dwayne Bailey <dwayne at translate.org.za>.

--- libc/localedata/locales/en_ZA	30 Jul 2006 22:19:44 -0000	1.10
+++ libc/localedata/locales/en_ZA	24 Apr 2007 19:04:21 -0000	1.11
@@ -8,8 +8,8 @@ comment_char  %
 % Fax: +27 12 3430389
 % Language: en
 % Territory: ZA
-% Revision: 1.2.1
-% Date: 2005-10-13
+% Revision: 1.3
+% Date: 2007-04-19
 % Users: general
 % Repertoiremap: mnemonic,ds
 % Charset: ISO-8859-1
@@ -17,6 +17,9 @@ comment_char  %
 % for commercial purposes.
 %
 % Changelog
+% 1.3 (2007-04-19):
+%     2007-04-19 Dwayne Bailey <dwayne at translate.org.za>
+%       - Change int_select from 09 to 00
 % 1.2.1 (2005-10-13):
 %     2005-10-12 Dwayne Bailey <dwayne at translate.org.za>
 %       - Update contact information
@@ -55,8 +58,8 @@ territory  "South Africa"
 % audience     ""
 % application  ""
 abbreviation "Translate.org.za"
-revision   "1.2.1"
-date       "2005-10-13"
+revision   "1.3"
+date       "2007-04-19"
 %
 category  "en_ZA:2003";LC_IDENTIFICATION
 category  "en_ZA:2000";LC_CTYPE
@@ -235,8 +238,8 @@ tel_int_fmt    "<U002B><U0025><U0063><U0
 tel_dom_fmt    "<U0028><U0025><U0041><U0029><U0020><U0025><U006C>"
 
 % Prefix for making international calls
-% "09"
-int_select     "<U0030><U0039>"
+% "00"
+int_select     "<U0030><U0030>"
 
 % International dialing code
 % "27"

glibc-dst-req-static.patch:
 dl-dst.h  |    6 +++---
 dl-open.c |    5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE glibc-dst-req-static.patch ---
2007-03-16  Jakub Jelinek  <jakub at redhat.com>

	* elf/dl-open.c (dl_open_worker): Declare l in 2 different
	smaller scopes.
	* elf/dl-dst.h (DL_DST_REQ_STATIC): Add l as macro argument.
	(DL_DST_REQUIRED): Adjust user.

--- libc/elf/dl-dst.h	9 May 2006 21:44:31 -0000	1.13
+++ libc/elf/dl-dst.h	17 Mar 2007 17:08:00 -0000	1.14
@@ -50,7 +51,7 @@
 									      \
 	   First get the origin string if it is not available yet.	      \
 	   This can only happen for the map of the executable.  */	      \
-	DL_DST_REQ_STATIC						      \
+	DL_DST_REQ_STATIC (l)						      \
 	if ((l)->l_origin == NULL)					      \
 	  {								      \
 	    assert ((l)->l_name[0] == '\0');				      \
@@ -68,9 +69,9 @@
     __len; })
 
 #ifdef SHARED
-# define DL_DST_REQ_STATIC /* nothing */
+# define DL_DST_REQ_STATIC(l) /* nothing */
 #else
-# define DL_DST_REQ_STATIC \
+# define DL_DST_REQ_STATIC(l) \
   if ((l) == NULL)							      \
     {									      \
       const char *origin = _dl_get_origin ();				      \
--- libc/elf/dl-open.c	29 Oct 2006 21:45:26 -0000	1.136
+++ libc/elf/dl-open.c	17 Mar 2007 17:07:51 -0000	1.137
@@ -161,7 +161,7 @@ dl_open_worker (void *a)
   struct dl_open_args *args = a;
   const char *file = args->file;
   int mode = args->mode;
-  struct link_map *new, *l;
+  struct link_map *new;
   int lazy;
   unsigned int i;
   bool any_tls = false;
@@ -186,6 +186,7 @@ dl_open_worker (void *a)
 	 By default we assume this is the main application.  */
       call_map = GL(dl_ns)[LM_ID_BASE]._ns_loaded;
 
+      struct link_map *l;
       for (Lmid_t ns = 0; ns < DL_NNS; ++ns)
 	for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
 	  if (caller_dlopen >= (const void *) l->l_map_start
@@ -325,7 +326,7 @@ dl_open_worker (void *a)
   /* Relocate the objects loaded.  We do this in reverse order so that copy
      relocs of earlier objects overwrite the data written by later objects.  */
 
-  l = new;
+  struct link_map *l = new;
   while (l->l_next)
     l = l->l_next;
   while (1)

glibc-ia64-fesetround.patch:
 fesetround.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE glibc-ia64-fesetround.patch ---
2007-04-01  Jakub Jelinek  <jakub at redhat.com>

	* sysdeps/ia64/fpu/fesetround.c (fesetround): Return 0 on success
	and 1 on failure.

--- libc/sysdeps/ia64/fpu/fesetround.c	8 Jul 2005 18:52:46 -0000	1.4
+++ libc/sysdeps/ia64/fpu/fesetround.c	1 Apr 2007 16:37:33 -0000	1.5
@@ -26,7 +26,7 @@ fesetround (int round)
   fenv_t fpsr;
 
   if (round & ~3)
-    return 0;
+    return 1;
 
   /* Get the current state.  */
   __asm__ __volatile__ ("mov.m %0=ar.fpsr" : "=r" (fpsr));
@@ -37,6 +37,6 @@ fesetround (int round)
   /* Put the new state in effect.  */
   __asm__ __volatile__ ("mov.m ar.fpsr=%0" :: "r" (fpsr) : "memory");
 
-  return 1;
+  return 0;
 }
 libm_hidden_def (fesetround)

glibc-libio-throw.patch:
 fileops.c    |    8 --
 libio.h      |   32 ++++----
 libioP.h     |  233 +++++++++++++++++++++++++----------------------------------
 oldfileops.c |    2 
 4 files changed, 120 insertions(+), 155 deletions(-)

--- NEW FILE glibc-libio-throw.patch ---
2007-03-30  Jakub Jelinek  <jakub at redhat.com>

	* libio/libio.h (__underflow, __uflow, __overflow, __wunderflow,
	__wuflow, __woverflow, _IO_getc, _IO_putc, _IO_peekc_locked, _IO_padn,
	_IO_sgetn, _IO_seekoff, _IO_seekpos, _IO_getwc, _IO_putwc, _IO_wpadn):
	Remove __THROW.
	* libio/fileops.c (new_do_write, _IO_file_xsgetn_mmap,
	_IO_file_xsgetn_maybe_mmap): Likewise.
	* libio/oldfileops.c (old_do_write): Likewise.
	* libio/libioP.h (_IO_switch_to_get_mode, _IO_switch_to_wget_mode,
	_IO_init_marker, _IO_init_wmarker, _IO_default_uflow,
	_IO_wdefault_uflow, _IO_default_setbuf, _IO_default_seekpos,
	_IO_do_write, _IO_new_do_write, _IO_old_do_write, _IO_wdo_write,
	_IO_flush_all_lockp, _IO_flush_all, _IO_cleanup,
	_IO_flush_all_linebuffered, _IO_new_fgetpos, _IO_old_fgetpos,
	_IO_new_fsetpos, _IO_old_fsetpos, _IO_new_fgetpos64,
	_IO_old_fgetpos64, _IO_new_fsetpos64, _IO_old_fsetpos64,
	_IO_file_setbuf, _IO_file_seekoff, _IO_file_xsputn, _IO_file_xsgetn,
	_IO_file_underflow, _IO_file_underflow_mmap,
	_IO_file_underflow_maybe_mmap, _IO_file_overflow, _IO_file_attach,
	_IO_file_open, _IO_file_fopen, _IO_file_write, _IO_file_read,
	_IO_file_sync, _IO_file_close_it, _IO_file_finish,
	_IO_new_file_attach, _IO_new_file_close_it, _IO_new_file_finish,
	_IO_new_file_fopen, _IO_new_file_setbuf, _IO_file_setbuf_mmap,
	_IO_new_file_sync, _IO_new_file_underflow, _IO_new_file_overflow,
	_IO_new_file_seekoff, _IO_new_file_write, _IO_new_file_xsputn,
	_IO_old_file_setbuf, _IO_old_file_seekoff, _IO_old_file_xsputn,
	_IO_old_file_underflow, _IO_old_file_overflow, _IO_old_file_attach,
	_IO_old_file_fopen, _IO_old_file_write, _IO_old_file_sync,
	_IO_old_file_close_it, _IO_old_file_finish, _IO_wfile_xsputn,
	_IO_wfile_setbuf, _IO_wfile_sync, _IO_wfile_underflow,
	_IO_wfile_overflow, _IO_wfile_seekoff, _IO_old_proc_open,
	_IO_old_proc_close, _IO_getdelim, _IO_flush_all_internal,
	_IO_adjust_column_internal, _IO_default_uflow_internal,
	_IO_default_xsgetn_internal, _IO_wdefault_xsputn_internal,
	_IO_wdefault_xsgetn_internal, _IO_wdefault_uflow_internal,
	_IO_file_setbuf_internal, _IO_file_seekoff_internal,
	_IO_file_xsputn_internal, _IO_file_xsgetn_internal,
	_IO_file_close_it_internal, _IO_file_underflow_internal,
	_IO_file_overflow_internal, _IO_file_attach_internal,
	_IO_file_fopen_internal, _IO_file_sync_internal,
	_IO_file_finish_internal, _IO_wfile_xsputn_internal,
	_IO_wfile_seekoff_internal, _IO_wfile_sync_internal,
	_IO_switch_to_wget_mode_internal, _IO_padn_internal,
	_IO_switch_to_get_mode_internal, _IO_seekoff_unlocked,
	_IO_seekpos_unlocked): Likewise.
	(_IO_strtod, _IO_dtoa, _IO_outfloat, _IO_read, _IO_write,
	_IO_lseek, _IO_close, _IO_fstat): Remove unused prototypes.

--- libc/libio/fileops.c	13 Dec 2006 23:16:54 -0000	1.111
+++ libc/libio/fileops.c	16 Apr 2007 23:14:25 -0000	1.112
@@ -472,7 +473,7 @@ _IO_file_setbuf_mmap (fp, p, len)
   return result;
 }
 
-static _IO_size_t new_do_write (_IO_FILE *, const char *, _IO_size_t) __THROW;
+static _IO_size_t new_do_write (_IO_FILE *, const char *, _IO_size_t);
 
 /* Write TO_DO bytes from DATA to FP.
    Then mark FP as having empty buffers. */
@@ -1468,8 +1469,7 @@ _IO_file_xsgetn (fp, data, n)
 }
 INTDEF(_IO_file_xsgetn)
 
-static _IO_size_t _IO_file_xsgetn_mmap (_IO_FILE *, void *, _IO_size_t)
-     __THROW;
+static _IO_size_t _IO_file_xsgetn_mmap (_IO_FILE *, void *, _IO_size_t);
 static _IO_size_t
 _IO_file_xsgetn_mmap (fp, data, n)
      _IO_FILE *fp;
@@ -1528,8 +1528,7 @@ _IO_file_xsgetn_mmap (fp, data, n)
   return s - (char *) data;
 }
 
-static _IO_size_t _IO_file_xsgetn_maybe_mmap (_IO_FILE *, void *, _IO_size_t)
-     __THROW;
+static _IO_size_t _IO_file_xsgetn_maybe_mmap (_IO_FILE *, void *, _IO_size_t);
 static _IO_size_t
 _IO_file_xsgetn_maybe_mmap (fp, data, n)
      _IO_FILE *fp;
--- libc/libio/libio.h	13 Dec 2006 23:15:31 -0000	1.65
+++ libc/libio/libio.h	16 Apr 2007 23:14:04 -0000	1.66
@@ -410,12 +410,12 @@ extern void _IO_cookie_init (struct _IO_
 extern "C" {
 #endif
 
-extern int __underflow (_IO_FILE *) __THROW;
-extern int __uflow (_IO_FILE *) __THROW;
-extern int __overflow (_IO_FILE *, int) __THROW;
-extern _IO_wint_t __wunderflow (_IO_FILE *) __THROW;
-extern _IO_wint_t __wuflow (_IO_FILE *) __THROW;
-extern _IO_wint_t __woverflow (_IO_FILE *, _IO_wint_t) __THROW;
+extern int __underflow (_IO_FILE *);
+extern int __uflow (_IO_FILE *);
+extern int __overflow (_IO_FILE *, int);
+extern _IO_wint_t __wunderflow (_IO_FILE *);
+extern _IO_wint_t __wuflow (_IO_FILE *);
+extern _IO_wint_t __woverflow (_IO_FILE *, _IO_wint_t);
 
 #if  __GNUC__ >= 3
 # define _IO_BE(expr, res) __builtin_expect ((expr), res)
@@ -448,12 +448,12 @@ extern _IO_wint_t __woverflow (_IO_FILE 
 #define _IO_feof_unlocked(__fp) (((__fp)->_flags & _IO_EOF_SEEN) != 0)
 #define _IO_ferror_unlocked(__fp) (((__fp)->_flags & _IO_ERR_SEEN) != 0)
 
-extern int _IO_getc (_IO_FILE *__fp) __THROW;
-extern int _IO_putc (int __c, _IO_FILE *__fp) __THROW;
+extern int _IO_getc (_IO_FILE *__fp);
+extern int _IO_putc (int __c, _IO_FILE *__fp);
 extern int _IO_feof (_IO_FILE *__fp) __THROW;
 extern int _IO_ferror (_IO_FILE *__fp) __THROW;
 
-extern int _IO_peekc_locked (_IO_FILE *__fp) __THROW;
+extern int _IO_peekc_locked (_IO_FILE *__fp);
 
 /* This one is for Emacs. */
 #define _IO_PENDING_OUTPUT_COUNT(_fp)	\
@@ -482,17 +482,17 @@ extern int _IO_vfscanf (_IO_FILE * __res
 			_IO_va_list, int *__restrict);
 extern int _IO_vfprintf (_IO_FILE *__restrict, const char *__restrict,
 			 _IO_va_list);
-extern _IO_ssize_t _IO_padn (_IO_FILE *, int, _IO_ssize_t) __THROW;
-extern _IO_size_t _IO_sgetn (_IO_FILE *, void *, _IO_size_t) __THROW;
+extern _IO_ssize_t _IO_padn (_IO_FILE *, int, _IO_ssize_t);
+extern _IO_size_t _IO_sgetn (_IO_FILE *, void *, _IO_size_t);
 
-extern _IO_off64_t _IO_seekoff (_IO_FILE *, _IO_off64_t, int, int) __THROW;
-extern _IO_off64_t _IO_seekpos (_IO_FILE *, _IO_off64_t, int) __THROW;
+extern _IO_off64_t _IO_seekoff (_IO_FILE *, _IO_off64_t, int, int);
+extern _IO_off64_t _IO_seekpos (_IO_FILE *, _IO_off64_t, int);
 
 extern void _IO_free_backup_area (_IO_FILE *) __THROW;
 
 #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
-extern _IO_wint_t _IO_getwc (_IO_FILE *__fp) __THROW;
-extern _IO_wint_t _IO_putwc (wchar_t __wc, _IO_FILE *__fp) __THROW;
+extern _IO_wint_t _IO_getwc (_IO_FILE *__fp);
+extern _IO_wint_t _IO_putwc (wchar_t __wc, _IO_FILE *__fp);
 extern int _IO_fwide (_IO_FILE *__fp, int __mode) __THROW;
 # if __GNUC__ >= 2
 /* While compiling glibc we have to handle compatibility with very old
@@ -531,7 +531,7 @@ extern int _IO_vfwscanf (_IO_FILE * __re
 			 _IO_va_list, int *__restrict);
 extern int _IO_vfwprintf (_IO_FILE *__restrict, const wchar_t *__restrict,
 			  _IO_va_list);
-extern _IO_ssize_t _IO_wpadn (_IO_FILE *, wint_t, _IO_ssize_t) __THROW;
+extern _IO_ssize_t _IO_wpadn (_IO_FILE *, wint_t, _IO_ssize_t);
 extern void _IO_free_wbackup_area (_IO_FILE *) __THROW;
 #endif
 
--- libc/libio/libioP.h	14 Jan 2006 12:09:46 -0000	1.76
+++ libc/libio/libioP.h	16 Apr 2007 23:15:21 -0000	1.77
@@ -380,7 +380,7 @@ typedef struct _IO_FILE *_IO_ITER;
 
 extern void _IO_switch_to_main_get_area (_IO_FILE *) __THROW;
 extern void _IO_switch_to_backup_area (_IO_FILE *) __THROW;
-extern int _IO_switch_to_get_mode (_IO_FILE *) __THROW;
+extern int _IO_switch_to_get_mode (_IO_FILE *);
 extern void _IO_init (_IO_FILE *, int) __THROW;
 extern int _IO_sputbackc (_IO_FILE *, int) __THROW;
 extern int _IO_sungetc (_IO_FILE *) __THROW;
@@ -394,7 +394,7 @@ extern unsigned _IO_adjust_column (unsig
 
 extern void _IO_switch_to_main_wget_area (_IO_FILE *) __THROW;
 extern void _IO_switch_to_wbackup_area (_IO_FILE *) __THROW;
-extern int _IO_switch_to_wget_mode (_IO_FILE *) __THROW;
+extern int _IO_switch_to_wget_mode (_IO_FILE *);
 extern void _IO_wsetb (_IO_FILE *, wchar_t *, wchar_t *, int) __THROW;
 extern wint_t _IO_sputbackwc (_IO_FILE *, wint_t) __THROW;
 extern wint_t _IO_sungetwc (_IO_FILE *) __THROW;
@@ -404,8 +404,8 @@ extern unsigned _IO_adjust_wcolumn (unsi
 
 /* Marker-related function. */
 
-extern void _IO_init_marker (struct _IO_marker *, _IO_FILE *) __THROW;
-extern void _IO_init_wmarker (struct _IO_marker *, _IO_FILE *) __THROW;
+extern void _IO_init_marker (struct _IO_marker *, _IO_FILE *);
+extern void _IO_init_wmarker (struct _IO_marker *, _IO_FILE *);
 extern void _IO_remove_marker (struct _IO_marker *) __THROW;
 extern int _IO_marker_difference (struct _IO_marker *, struct _IO_marker *)
      __THROW;
@@ -434,22 +434,22 @@ libc_hidden_proto (_IO_list_resetlock)
 /* Default jumptable functions. */
 
 extern int _IO_default_underflow (_IO_FILE *) __THROW;
-extern int _IO_default_uflow (_IO_FILE *) __THROW;
-extern wint_t _IO_wdefault_uflow (_IO_FILE *) __THROW;
+extern int _IO_default_uflow (_IO_FILE *);
+extern wint_t _IO_wdefault_uflow (_IO_FILE *);
 extern int _IO_default_doallocate (_IO_FILE *) __THROW;
 extern int _IO_wdefault_doallocate (_IO_FILE *) __THROW;
 extern void _IO_default_finish (_IO_FILE *, int) __THROW;
 extern void _IO_wdefault_finish (_IO_FILE *, int) __THROW;
 extern int _IO_default_pbackfail (_IO_FILE *, int) __THROW;
 extern wint_t _IO_wdefault_pbackfail (_IO_FILE *, wint_t) __THROW;
-extern _IO_FILE* _IO_default_setbuf (_IO_FILE *, char *, _IO_ssize_t) __THROW;
+extern _IO_FILE* _IO_default_setbuf (_IO_FILE *, char *, _IO_ssize_t);
 extern _IO_size_t _IO_default_xsputn (_IO_FILE *, const void *, _IO_size_t);
 extern _IO_size_t _IO_wdefault_xsputn (_IO_FILE *, const void *, _IO_size_t);
 extern _IO_size_t _IO_default_xsgetn (_IO_FILE *, void *, _IO_size_t);
 extern _IO_size_t _IO_wdefault_xsgetn (_IO_FILE *, void *, _IO_size_t);
 extern _IO_off64_t _IO_default_seekoff (_IO_FILE *, _IO_off64_t, int, int)
      __THROW;
-extern _IO_off64_t _IO_default_seekpos (_IO_FILE *, _IO_off64_t, int) __THROW;
+extern _IO_off64_t _IO_default_seekpos (_IO_FILE *, _IO_off64_t, int);
 extern _IO_ssize_t _IO_default_write (_IO_FILE *, const void *, _IO_ssize_t);
 extern _IO_ssize_t _IO_default_read (_IO_FILE *, void *, _IO_ssize_t);
 extern int _IO_default_stat (_IO_FILE *, void *) __THROW;
@@ -473,22 +473,22 @@ extern const struct _IO_jump_t _IO_old_p
 extern const struct _IO_jump_t _IO_str_jumps attribute_hidden;
 extern const struct _IO_jump_t _IO_wstr_jumps attribute_hidden;
 extern const struct _IO_codecvt __libio_codecvt attribute_hidden;
-extern int _IO_do_write (_IO_FILE *, const char *, _IO_size_t) __THROW;
-extern int _IO_new_do_write (_IO_FILE *, const char *, _IO_size_t) __THROW;
-extern int _IO_old_do_write (_IO_FILE *, const char *, _IO_size_t) __THROW;
-extern int _IO_wdo_write (_IO_FILE *, const wchar_t *, _IO_size_t) __THROW;
-extern int _IO_flush_all_lockp (int) __THROW;
-extern int _IO_flush_all (void) __THROW;
-extern int _IO_cleanup (void) __THROW;
-extern void _IO_flush_all_linebuffered (void) __THROW;
-extern int _IO_new_fgetpos (_IO_FILE *, _IO_fpos_t *) __THROW;
-extern int _IO_old_fgetpos (_IO_FILE *, _IO_fpos_t *) __THROW;
-extern int _IO_new_fsetpos (_IO_FILE *, const _IO_fpos_t *) __THROW;
-extern int _IO_old_fsetpos (_IO_FILE *, const _IO_fpos_t *) __THROW;
-extern int _IO_new_fgetpos64 (_IO_FILE *, _IO_fpos64_t *) __THROW;
-extern int _IO_old_fgetpos64 (_IO_FILE *, _IO_fpos64_t *) __THROW;
-extern int _IO_new_fsetpos64 (_IO_FILE *, const _IO_fpos64_t *) __THROW;
-extern int _IO_old_fsetpos64 (_IO_FILE *, const _IO_fpos64_t *) __THROW;
+extern int _IO_do_write (_IO_FILE *, const char *, _IO_size_t);
+extern int _IO_new_do_write (_IO_FILE *, const char *, _IO_size_t);
+extern int _IO_old_do_write (_IO_FILE *, const char *, _IO_size_t);
+extern int _IO_wdo_write (_IO_FILE *, const wchar_t *, _IO_size_t);
+extern int _IO_flush_all_lockp (int);
+extern int _IO_flush_all (void);
+extern int _IO_cleanup (void);
+extern void _IO_flush_all_linebuffered (void);
+extern int _IO_new_fgetpos (_IO_FILE *, _IO_fpos_t *);
+extern int _IO_old_fgetpos (_IO_FILE *, _IO_fpos_t *);
+extern int _IO_new_fsetpos (_IO_FILE *, const _IO_fpos_t *);
+extern int _IO_old_fsetpos (_IO_FILE *, const _IO_fpos_t *);
+extern int _IO_new_fgetpos64 (_IO_FILE *, _IO_fpos64_t *);
+extern int _IO_old_fgetpos64 (_IO_FILE *, _IO_fpos64_t *);
+extern int _IO_new_fsetpos64 (_IO_FILE *, const _IO_fpos64_t *);
+extern int _IO_old_fsetpos64 (_IO_FILE *, const _IO_fpos64_t *);
 extern void _IO_old_init (_IO_FILE *fp, int flags) __THROW;
 
 
@@ -534,95 +534,79 @@ extern void _IO_old_init (_IO_FILE *fp, 
 /* Jumptable functions for files. */
 
 extern int _IO_file_doallocate (_IO_FILE *) __THROW;
-extern _IO_FILE* _IO_file_setbuf (_IO_FILE *, char *, _IO_ssize_t) __THROW;
-extern _IO_off64_t _IO_file_seekoff (_IO_FILE *, _IO_off64_t, int, int)
-     __THROW;
+extern _IO_FILE* _IO_file_setbuf (_IO_FILE *, char *, _IO_ssize_t);
+extern _IO_off64_t _IO_file_seekoff (_IO_FILE *, _IO_off64_t, int, int);
 extern _IO_off64_t _IO_file_seekoff_mmap (_IO_FILE *, _IO_off64_t, int, int)
      __THROW;
-extern _IO_size_t _IO_file_xsputn (_IO_FILE *, const void *, _IO_size_t)
-     __THROW;
-extern _IO_size_t _IO_file_xsgetn (_IO_FILE *, void *, _IO_size_t) __THROW;
+extern _IO_size_t _IO_file_xsputn (_IO_FILE *, const void *, _IO_size_t);
+extern _IO_size_t _IO_file_xsgetn (_IO_FILE *, void *, _IO_size_t);
 extern int _IO_file_stat (_IO_FILE *, void *) __THROW;
 extern int _IO_file_close (_IO_FILE *) __THROW;
 extern int _IO_file_close_mmap (_IO_FILE *) __THROW;
-extern int _IO_file_underflow (_IO_FILE *) __THROW;
-extern int _IO_file_underflow_mmap (_IO_FILE *) __THROW;
-extern int _IO_file_underflow_maybe_mmap (_IO_FILE *) __THROW;
-extern int _IO_file_overflow (_IO_FILE *, int) __THROW;
+extern int _IO_file_underflow (_IO_FILE *);
+extern int _IO_file_underflow_mmap (_IO_FILE *);
+extern int _IO_file_underflow_maybe_mmap (_IO_FILE *);
+extern int _IO_file_overflow (_IO_FILE *, int);
 #define _IO_file_is_open(__fp) ((__fp)->_fileno != -1)
 extern void _IO_file_init (struct _IO_FILE_plus *) __THROW;
-extern _IO_FILE* _IO_file_attach (_IO_FILE *, int) __THROW;
-extern _IO_FILE* _IO_file_open (_IO_FILE *, const char *, int, int, int, int)
-     __THROW;
+extern _IO_FILE* _IO_file_attach (_IO_FILE *, int);
+extern _IO_FILE* _IO_file_open (_IO_FILE *, const char *, int, int, int, int);
 libc_hidden_proto (_IO_file_open)
-extern _IO_FILE* _IO_file_fopen (_IO_FILE *, const char *, const char *, int)
-     __THROW;
-extern _IO_ssize_t _IO_file_write (_IO_FILE *, const void *, _IO_ssize_t)
-     __THROW;
-extern _IO_ssize_t _IO_file_read (_IO_FILE *, void *, _IO_ssize_t) __THROW;
-extern int _IO_file_sync (_IO_FILE *) __THROW;
-extern int _IO_file_close_it (_IO_FILE *) __THROW;
+extern _IO_FILE* _IO_file_fopen (_IO_FILE *, const char *, const char *, int);
+extern _IO_ssize_t _IO_file_write (_IO_FILE *, const void *, _IO_ssize_t);
+extern _IO_ssize_t _IO_file_read (_IO_FILE *, void *, _IO_ssize_t);
+extern int _IO_file_sync (_IO_FILE *);
+extern int _IO_file_close_it (_IO_FILE *);
 extern _IO_off64_t _IO_file_seek (_IO_FILE *, _IO_off64_t, int) __THROW;
-extern void _IO_file_finish (_IO_FILE *, int) __THROW;
+extern void _IO_file_finish (_IO_FILE *, int);
 
-extern _IO_FILE* _IO_new_file_attach (_IO_FILE *, int) __THROW;
-extern int _IO_new_file_close_it (_IO_FILE *) __THROW;
-extern void _IO_new_file_finish (_IO_FILE *, int) __THROW;
+extern _IO_FILE* _IO_new_file_attach (_IO_FILE *, int);
+extern int _IO_new_file_close_it (_IO_FILE *);
+extern void _IO_new_file_finish (_IO_FILE *, int);
 extern _IO_FILE* _IO_new_file_fopen (_IO_FILE *, const char *, const char *,
-				     int) __THROW;
+				     int);
 extern void _IO_no_init (_IO_FILE *, int, int, struct _IO_wide_data *,
 			 const struct _IO_jump_t *) __THROW;
 extern void _IO_new_file_init (struct _IO_FILE_plus *) __THROW;
-extern _IO_FILE* _IO_new_file_setbuf (_IO_FILE *, char *, _IO_ssize_t) __THROW;
-extern _IO_FILE* _IO_file_setbuf_mmap (_IO_FILE *, char *, _IO_ssize_t)
-     __THROW;
-extern int _IO_new_file_sync (_IO_FILE *) __THROW;
-extern int _IO_new_file_underflow (_IO_FILE *) __THROW;
-extern int _IO_new_file_overflow (_IO_FILE *, int) __THROW;
-extern _IO_off64_t _IO_new_file_seekoff (_IO_FILE *, _IO_off64_t, int, int)
-     __THROW;
-extern _IO_ssize_t _IO_new_file_write (_IO_FILE *, const void *, _IO_ssize_t)
-     __THROW;
-extern _IO_size_t _IO_new_file_xsputn (_IO_FILE *, const void *, _IO_size_t)
-     __THROW;
-
-extern _IO_FILE* _IO_old_file_setbuf (_IO_FILE *, char *, _IO_ssize_t) __THROW;
-extern _IO_off64_t _IO_old_file_seekoff (_IO_FILE *, _IO_off64_t, int, int)
-     __THROW;
-extern _IO_size_t _IO_old_file_xsputn (_IO_FILE *, const void *, _IO_size_t)
-     __THROW;
-extern int _IO_old_file_underflow (_IO_FILE *) __THROW;
-extern int _IO_old_file_overflow (_IO_FILE *, int) __THROW;
+extern _IO_FILE* _IO_new_file_setbuf (_IO_FILE *, char *, _IO_ssize_t);
+extern _IO_FILE* _IO_file_setbuf_mmap (_IO_FILE *, char *, _IO_ssize_t);
+extern int _IO_new_file_sync (_IO_FILE *);
+extern int _IO_new_file_underflow (_IO_FILE *);
+extern int _IO_new_file_overflow (_IO_FILE *, int);
+extern _IO_off64_t _IO_new_file_seekoff (_IO_FILE *, _IO_off64_t, int, int);
+extern _IO_ssize_t _IO_new_file_write (_IO_FILE *, const void *, _IO_ssize_t);
+extern _IO_size_t _IO_new_file_xsputn (_IO_FILE *, const void *, _IO_size_t);
+
+extern _IO_FILE* _IO_old_file_setbuf (_IO_FILE *, char *, _IO_ssize_t);
+extern _IO_off64_t _IO_old_file_seekoff (_IO_FILE *, _IO_off64_t, int, int);
+extern _IO_size_t _IO_old_file_xsputn (_IO_FILE *, const void *, _IO_size_t);
+extern int _IO_old_file_underflow (_IO_FILE *);
+extern int _IO_old_file_overflow (_IO_FILE *, int);
 extern void _IO_old_file_init (struct _IO_FILE_plus *) __THROW;
-extern _IO_FILE* _IO_old_file_attach (_IO_FILE *, int) __THROW;
-extern _IO_FILE* _IO_old_file_fopen (_IO_FILE *, const char *, const char *)
-     __THROW;
-extern _IO_ssize_t _IO_old_file_write (_IO_FILE *, const void *, _IO_ssize_t)
-     __THROW;
-extern int _IO_old_file_sync (_IO_FILE *) __THROW;
-extern int _IO_old_file_close_it (_IO_FILE *) __THROW;
-extern void _IO_old_file_finish (_IO_FILE *, int) __THROW;
+extern _IO_FILE* _IO_old_file_attach (_IO_FILE *, int);
+extern _IO_FILE* _IO_old_file_fopen (_IO_FILE *, const char *, const char *);
+extern _IO_ssize_t _IO_old_file_write (_IO_FILE *, const void *, _IO_ssize_t);
+extern int _IO_old_file_sync (_IO_FILE *);
+extern int _IO_old_file_close_it (_IO_FILE *);
+extern void _IO_old_file_finish (_IO_FILE *, int);
 
 extern int _IO_wfile_doallocate (_IO_FILE *) __THROW;
-extern _IO_size_t _IO_wfile_xsputn (_IO_FILE *, const void *, _IO_size_t)
-     __THROW;
-extern _IO_FILE* _IO_wfile_setbuf (_IO_FILE *, wchar_t *, _IO_ssize_t) __THROW;
-extern wint_t _IO_wfile_sync (_IO_FILE *) __THROW;
-extern wint_t _IO_wfile_underflow (_IO_FILE *) __THROW;
-extern wint_t _IO_wfile_overflow (_IO_FILE *, wint_t) __THROW;
-extern _IO_off64_t _IO_wfile_seekoff (_IO_FILE *, _IO_off64_t, int, int)
-     __THROW;
+extern _IO_size_t _IO_wfile_xsputn (_IO_FILE *, const void *, _IO_size_t);
+extern _IO_FILE* _IO_wfile_setbuf (_IO_FILE *, wchar_t *, _IO_ssize_t);
+extern wint_t _IO_wfile_sync (_IO_FILE *);
+extern wint_t _IO_wfile_underflow (_IO_FILE *);
+extern wint_t _IO_wfile_overflow (_IO_FILE *, wint_t);
+extern _IO_off64_t _IO_wfile_seekoff (_IO_FILE *, _IO_off64_t, int, int);
 
 /* Jumptable functions for proc_files. */
 extern _IO_FILE* _IO_proc_open (_IO_FILE *, const char *, const char *)
      __THROW;
 extern _IO_FILE* _IO_new_proc_open (_IO_FILE *, const char *, const char *)
      __THROW;
-extern _IO_FILE* _IO_old_proc_open (_IO_FILE *, const char *, const char *)
-     __THROW;
+extern _IO_FILE* _IO_old_proc_open (_IO_FILE *, const char *, const char *);
 extern int _IO_proc_close (_IO_FILE *) __THROW;
 extern int _IO_new_proc_close (_IO_FILE *) __THROW;
-extern int _IO_old_proc_close (_IO_FILE *) __THROW;
+extern int _IO_old_proc_close (_IO_FILE *);
 
 /* Jumptable functions for strfiles. */
 extern int _IO_str_underflow (_IO_FILE *) __THROW;
@@ -660,73 +644,62 @@ extern int _IO_vsnprintf (char *string, 
 extern _IO_size_t _IO_getline (_IO_FILE *,char *, _IO_size_t, int, int);
 extern _IO_size_t _IO_getline_info (_IO_FILE *,char *, _IO_size_t,
 				    int, int, int *);
-extern _IO_ssize_t _IO_getdelim (char **, _IO_size_t *, int, _IO_FILE *)
-     __THROW;
+extern _IO_ssize_t _IO_getdelim (char **, _IO_size_t *, int, _IO_FILE *);
 extern _IO_size_t _IO_getwline (_IO_FILE *,wchar_t *, _IO_size_t, wint_t, int);
 extern _IO_size_t _IO_getwline_info (_IO_FILE *,wchar_t *, _IO_size_t,
 				     wint_t, int, wint_t *);
-extern double _IO_strtod (const char *, char **) __THROW;
-extern char *_IO_dtoa (double __d, int __mode, int __ndigits,
-		       int *__decpt, int *__sign, char **__rve) __THROW;
-extern int _IO_outfloat (double __value, _IO_FILE *__sb, int __type,
-			 int __width, int __precision, int __flags,
-			 int __sign_mode, int __fill) __THROW;
 
 extern struct _IO_FILE_plus *_IO_list_all;
 extern void (*_IO_cleanup_registration_needed) (void);
 
 /* Prototype for functions with alternative entry point.  */
-extern int _IO_flush_all_internal (void) __THROW;
-extern unsigned _IO_adjust_column_internal (unsigned, const char *, int)
-     __THROW;
+extern int _IO_flush_all_internal (void);
+extern unsigned _IO_adjust_column_internal (unsigned, const char *, int);
 
-extern int _IO_default_uflow_internal (_IO_FILE *) __THROW;
+extern int _IO_default_uflow_internal (_IO_FILE *);
 extern void _IO_default_finish_internal (_IO_FILE *, int) __THROW;
 extern int _IO_default_pbackfail_internal (_IO_FILE *, int) __THROW;
 extern _IO_size_t _IO_default_xsputn_internal (_IO_FILE *, const void *,
-					       _IO_size_t) __THROW;
-extern _IO_size_t _IO_default_xsgetn_internal (_IO_FILE *, void *, _IO_size_t)
-     __THROW;
+					       _IO_size_t);
+extern _IO_size_t _IO_default_xsgetn_internal (_IO_FILE *, void *, _IO_size_t);
 extern int _IO_default_doallocate_internal (_IO_FILE *) __THROW;
 extern void _IO_wdefault_finish_internal (_IO_FILE *, int) __THROW;
 extern wint_t _IO_wdefault_pbackfail_internal (_IO_FILE *, wint_t) __THROW;
 extern _IO_size_t _IO_wdefault_xsputn_internal (_IO_FILE *, const void *,
-						_IO_size_t) __THROW;
+						_IO_size_t);
 extern _IO_size_t _IO_wdefault_xsgetn_internal (_IO_FILE *, void *,
-						_IO_size_t) __THROW;
+						_IO_size_t);
 extern int _IO_wdefault_doallocate_internal (_IO_FILE *) __THROW;
-extern wint_t _IO_wdefault_uflow_internal (_IO_FILE *) __THROW;
+extern wint_t _IO_wdefault_uflow_internal (_IO_FILE *);
 
 extern int _IO_file_doallocate_internal (_IO_FILE *) __THROW;
-extern _IO_FILE* _IO_file_setbuf_internal (_IO_FILE *, char *, _IO_ssize_t)
-     __THROW;
+extern _IO_FILE* _IO_file_setbuf_internal (_IO_FILE *, char *, _IO_ssize_t);
 extern _IO_off64_t _IO_file_seekoff_internal (_IO_FILE *, _IO_off64_t,
-					      int, int) __THROW;
+					      int, int);
 extern _IO_size_t _IO_file_xsputn_internal (_IO_FILE *, const void *,
-					    _IO_size_t) __THROW;
-extern _IO_size_t _IO_file_xsgetn_internal (_IO_FILE *, void *, _IO_size_t)
-     __THROW;
+					    _IO_size_t);
+extern _IO_size_t _IO_file_xsgetn_internal (_IO_FILE *, void *, _IO_size_t);
 extern int _IO_file_stat_internal (_IO_FILE *, void *) __THROW;
 extern int _IO_file_close_internal (_IO_FILE *) __THROW;
-extern int _IO_file_close_it_internal (_IO_FILE *) __THROW;
-extern int _IO_file_underflow_internal (_IO_FILE *) __THROW;
-extern int _IO_file_overflow_internal (_IO_FILE *, int) __THROW;
+extern int _IO_file_close_it_internal (_IO_FILE *);
+extern int _IO_file_underflow_internal (_IO_FILE *);
+extern int _IO_file_overflow_internal (_IO_FILE *, int);
 extern void _IO_file_init_internal (struct _IO_FILE_plus *) __THROW;
-extern _IO_FILE* _IO_file_attach_internal (_IO_FILE *, int) __THROW;
+extern _IO_FILE* _IO_file_attach_internal (_IO_FILE *, int);
 extern _IO_FILE* _IO_file_fopen_internal (_IO_FILE *, const char *,
-					  const char *, int) __THROW;
+					  const char *, int);
 extern _IO_ssize_t _IO_file_read_internal (_IO_FILE *, void *,
 					   _IO_ssize_t);
-extern int _IO_file_sync_internal (_IO_FILE *) __THROW;
+extern int _IO_file_sync_internal (_IO_FILE *);
 extern _IO_off64_t _IO_file_seek_internal (_IO_FILE *, _IO_off64_t, int)
      __THROW;
-extern void _IO_file_finish_internal (_IO_FILE *, int) __THROW;
+extern void _IO_file_finish_internal (_IO_FILE *, int);
 
 extern _IO_size_t _IO_wfile_xsputn_internal (_IO_FILE *, const void *,
-					     _IO_size_t) __THROW;
+					     _IO_size_t);
 extern _IO_off64_t _IO_wfile_seekoff_internal (_IO_FILE *, _IO_off64_t,
-					       int, int) __THROW;
-extern wint_t _IO_wfile_sync_internal (_IO_FILE *) __THROW;
+					       int, int);
+extern wint_t _IO_wfile_sync_internal (_IO_FILE *);
 
 extern int _IO_str_underflow_internal (_IO_FILE *) __THROW;
 extern int _IO_str_overflow_internal (_IO_FILE *, int) __THROW;
@@ -747,12 +720,12 @@ extern void _IO_wdoallocbuf_internal (_I
 
 extern _IO_size_t _IO_sgetn_internal (_IO_FILE *, void *, _IO_size_t);
 extern void _IO_flush_all_linebuffered_internal (void) __THROW;
-extern int _IO_switch_to_wget_mode_internal (_IO_FILE *) __THROW;
+extern int _IO_switch_to_wget_mode_internal (_IO_FILE *);
 extern void _IO_unsave_markers_internal (_IO_FILE *) __THROW;
 extern void _IO_switch_to_main_wget_area_internal (_IO_FILE *) __THROW;
 extern int _IO_wdo_write_internal (_IO_FILE *, const wchar_t *, _IO_size_t);
 extern int _IO_do_write_internal (_IO_FILE *, const char *, _IO_size_t);
-extern _IO_ssize_t _IO_padn_internal (_IO_FILE *, int, _IO_ssize_t) __THROW;
+extern _IO_ssize_t _IO_padn_internal (_IO_FILE *, int, _IO_ssize_t);
 extern _IO_size_t _IO_getline_info_internal (_IO_FILE *,char *, _IO_size_t,
 					     int, int, int *);
 extern _IO_size_t _IO_getline_internal (_IO_FILE *, char *, _IO_size_t, int,
@@ -762,7 +735,7 @@ extern void _IO_free_backup_area_interna
 extern void _IO_switch_to_wbackup_area_internal (_IO_FILE *) __THROW;
 extern void _IO_setb_internal (_IO_FILE *, char *, char *, int) __THROW;
 extern wint_t _IO_sputbackwc_internal (_IO_FILE *, wint_t) __THROW;
-extern int _IO_switch_to_get_mode_internal (_IO_FILE *) __THROW;
+extern int _IO_switch_to_get_mode_internal (_IO_FILE *);
 extern int _IO_vfscanf_internal (_IO_FILE * __restrict,
 				 const char * __restrict,
 				 _IO_va_list, int *__restrict);
@@ -772,9 +745,9 @@ extern void _IO_doallocbuf_internal (_IO
 extern void _IO_wsetb_internal (_IO_FILE *, wchar_t *, wchar_t *, int)
      __THROW;
 extern _IO_off64_t _IO_seekoff_unlocked (_IO_FILE *, _IO_off64_t, int, int)
-     attribute_hidden __THROW;
+     attribute_hidden;
 extern _IO_off64_t _IO_seekpos_unlocked (_IO_FILE *, _IO_off64_t, int)
-     attribute_hidden __THROW;
+     attribute_hidden;
 extern int _IO_putc_internal (int __c, _IO_FILE *__fp);
 extern void _IO_init_internal (_IO_FILE *, int) __THROW;
 extern void _IO_un_link_internal (struct _IO_FILE_plus *) __THROW;
@@ -866,12 +839,6 @@ extern void _IO_un_link_internal (struct
 #ifndef OS_FSTAT
 # define OS_FSTAT fstat
 #endif
-struct stat;
-extern _IO_ssize_t _IO_read (int, void *, _IO_size_t);
-extern _IO_ssize_t _IO_write (int, const void *, _IO_size_t);
-extern _IO_off64_t _IO_lseek (int, _IO_off64_t, int) __THROW;
-extern int _IO_close (int);
-extern int _IO_fstat (int, struct stat *) __THROW;
 extern int _IO_vscanf (const char *, _IO_va_list) __THROW;
 
 /* _IO_pos_BAD is an _IO_off64_t value indicating error, unknown, or EOF. */
--- libc/libio/oldfileops.c	17 Oct 2005 15:54:13 -0000	1.31
+++ libc/libio/oldfileops.c	16 Apr 2007 23:14:41 -0000	1.32
@@ -271,7 +272,7 @@ _IO_old_file_setbuf (fp, p, len)
     return fp;
 }
 
-static int old_do_write (_IO_FILE *, const char *, _IO_size_t) __THROW;
+static int old_do_write (_IO_FILE *, const char *, _IO_size_t);
 
 /* Write TO_DO bytes from DATA to FP.
    Then mark FP as having empty buffers. */

glibc-madvise-hidden.patch:
 include/sys/mman.h |    3 +++
 misc/madvise.c     |    1 +
 2 files changed, 4 insertions(+)

--- NEW FILE glibc-madvise-hidden.patch ---
2007-04-19  Ulrich Drepper  <drepper at redhat.com>

	* include/sys/mman.h: Mark madvise hidden.
	* misc/madvise.c: Add libc_hidden_def.

--- libc/misc/madvise.c	14 Dec 2005 09:36:14 -0000	1.1
+++ libc/misc/madvise.c	19 Apr 2007 17:42:34 -0000	1.2
@@ -29,5 +29,6 @@ madvise (__ptr_t addr, size_t len, int a
   __set_errno (ENOSYS);
   return -1;
 }
+libc_hidden_def (madvise)
 stub_warning (madvise)
 #include <stub-tag.h>
--- libc/include/sys/mman.h	14 Oct 2005 21:06:10 -0000	1.6
+++ libc/include/sys/mman.h	19 Apr 2007 17:40:54 -0000	1.7
@@ -12,4 +12,7 @@ extern int __mprotect (void *__addr, siz
 /* This one is Linux specific.  */
 extern void *__mremap (void *__addr, size_t __old_len,
 		       size_t __new_len, int __flags, ...);
+
+libc_hidden_proto (madvise);
+
 #endif

glibc-nis-getservbyname.patch:
 nis-service.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE glibc-nis-getservbyname.patch ---
2007-01-13  Ulrich Drepper  <drepper at redhat.com>

	* nis/nss_nis/nis-service.c (_nss_nis_getservbyname_r): Correct
	computation of keylen.

--- libc/nis/nss_nis/nis-service.c	19 Aug 2006 18:36:25 -0000	1.36
+++ libc/nis/nss_nis/nis-service.c	14 Jan 2007 04:30:39 -0000	1.37
@@ -271,7 +271,7 @@ _nss_nis_getservbyname_r (const char *na
 
   /* If the protocol is given, we could try if our NIS server knows
      about services.byservicename map. If yes, we only need one query.  */
-  size_t keylen = strlen (name) + 1 + (protocol ? strlen (protocol) : 0);
+  size_t keylen = strlen (name) + (protocol ? 1 + strlen (protocol) : 0);
   char key[keylen + 1];
 
   /* key is: "name/proto" */

glibc-nscd-SIGHUP.patch:
 connections.c |   46 ++++++++++++++++++++++++++++++++++------------
 1 files changed, 34 insertions(+), 12 deletions(-)

--- NEW FILE glibc-nscd-SIGHUP.patch ---
2006-07-02  Jakub Jelinek  <jakub at redhat.com>

	* nscd/connections.c (sighup_pending): New variable.
	(nscd_run): If sighup_pending, prune all 3 caches.
	(sighup_handler): Don't prune caches here, rather just set
	sighup_pending flag.

--- libc/nscd/connections.c.jj	2006-07-02 11:47:20.000000000 +0200
+++ libc/nscd/connections.c	2006-07-02 12:57:22.000000000 +0200
@@ -66,6 +67,7 @@ static gid_t *server_groups;
 # define NGROUPS 32
 #endif
 static int server_ngroups;
+static volatile int sighup_pending;
 
 static pthread_attr_t attr;
 
@@ -1283,6 +1285,10 @@ nscd_run (void *p)
 	      if (readylist == NULL && to == ETIMEDOUT)
 		{
 		  --nready;
+
+		  if (sighup_pending)
+		    goto sighup_prune;
+
 		  pthread_mutex_unlock (&readylist_lock);
 		  goto only_prune;
 		}
@@ -1292,6 +1298,34 @@ nscd_run (void *p)
 	    pthread_cond_wait (&readylist_cond, &readylist_lock);
 	}
 
+      if (sighup_pending)
+	{
+	  --nready;
+	  pthread_cond_signal (&readylist_cond);
+	sighup_prune:
+	  sighup_pending = 0;
+	  pthread_mutex_unlock (&readylist_lock);
+
+	  /* Prune the password database.  */
+	  if (dbs[pwddb].enabled)
+	    prune_cache (&dbs[pwddb], LONG_MAX, -1);
+
+	  /* Prune the group database.  */
+	  if (dbs[grpdb].enabled)
+	    prune_cache (&dbs[grpdb], LONG_MAX, -1);
+
+	  /* Prune the host database.  */
+	  if (dbs[hstdb].enabled)
+	    prune_cache (&dbs[hstdb], LONG_MAX, -1);
+
+	  /* Re-locking.  */
+	  pthread_mutex_lock (&readylist_lock);
+
+	  /* One more thread available.  */
+	  ++nready;
+	  continue;
+	}
+
       struct fdlist *it = readylist->next;
       if (readylist->next == readylist)
 	/* Just one entry on the list.  */
@@ -1902,16 +1936,5 @@ finish_drop_privileges (void)
 void
 sighup_handler (int signum)
 {
-  /* Prune the password database.  */
-  if (dbs[pwddb].enabled)
-    prune_cache (&dbs[pwddb], LONG_MAX, -1);
-    
-  /* Prune the group database.  */
-  if (dbs[grpdb].enabled)
-    prune_cache (&dbs[grpdb], LONG_MAX, -1);
-
-  /* Prune the host database.  */
-  if (dbs[hstdb].enabled)
-    prune_cache (&dbs[hstdb], LONG_MAX, -1);
+  sighup_pending = 1;
 }
-

glibc-po-update2.patch:
 ru.po | 9248 ++++++++++++++++++++++++++++++++++--------------------------------
 sv.po |   74 
 2 files changed, 4917 insertions(+), 4405 deletions(-)

--- NEW FILE glibc-po-update2.patch ---
2007-02-13  Ulrich Drepper  <drepper at redhat.com>

	* po/ru.po: Update from translation team.

2007-02-03  Ulrich Drepper  <drepper at redhat.com>

	* po/sv.po: Update from translation team. 

--- libc/po/ru.po	21 Sep 2006 04:16:48 -0000	1.2
+++ libc/po/ru.po	13 Feb 2007 15:18:42 -0000	1.3
@@ -1,3713 +1,4449 @@
 # ??????? ????????? GNU libc
 # Copyright (C) 2005 Free Software Foundation, Inc.
-# Oleg Tihonov <ost at tatnipi.ru>, 2005.
+# Oleg Tihonov <ost at tatnipi.ru>, 2005, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 2.3.3\n"
-"POT-Creation-Date: 2004-08-05 09:16+0200\n"
-"PO-Revision-Date: 2005-02-15 11:35+0300\n"
+"Project-Id-Version: libc 2.5\n"
+"POT-Creation-Date: 2006-09-29 11:38-0700\n"
+"PO-Revision-Date: 2007-02-13 13:52+0300\n"
 "Last-Translator: Oleg Tihonov <ost at tatnipi.ru>\n"
 "Language-Team: Russian <ru at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sysdeps/generic/siglist.h:29 stdio-common/../sysdeps/unix/siglist.c:27
-msgid "Hangup"
-msgstr "????? ???????????? ?????"
-
-#: sysdeps/generic/siglist.h:30 stdio-common/../sysdeps/unix/siglist.c:28
-msgid "Interrupt"
-msgstr "??????????"
-
-#: sysdeps/generic/siglist.h:31 stdio-common/../sysdeps/unix/siglist.c:29
-msgid "Quit"
-msgstr "?????"
-
-#: sysdeps/generic/siglist.h:32 stdio-common/../sysdeps/unix/siglist.c:30
-msgid "Illegal instruction"
-msgstr "???????????? ??????????"
+#: argp/argp-help.c:227
+#, c-format
+msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
+msgstr "%.*s: ???????? ARGP_HELP_FMT ??????? ????????"
 
-#: sysdeps/generic/siglist.h:33 stdio-common/../sysdeps/unix/siglist.c:31
-msgid "Trace/breakpoint trap"
-msgstr "??????? ???????????/????????"
+#: argp/argp-help.c:237
+#, c-format
+msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
+msgstr "%.*s: ??????????? ???????? ARGP_HELP_FMT"
 
-#: sysdeps/generic/siglist.h:34
-msgid "Aborted"
-msgstr "????????? ???????"
+#: argp/argp-help.c:250
+#, c-format
+msgid "Garbage in ARGP_HELP_FMT: %s"
+msgstr "????? ? ARGP_HELP_FMT: %s"
 
-#: sysdeps/generic/siglist.h:35 stdio-common/../sysdeps/unix/siglist.c:34
-msgid "Floating point exception"
-msgstr "?????????? ? ???????? ? ????????? ??????"
+#: argp/argp-help.c:1214
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr "???????????? ??? ?????????????? ????????? ??? ??????? ?????? ????? ???????? ????????????? ??? ??????????????? ??? ??????????????? ???????? ??????."
 
-#: sysdeps/generic/siglist.h:36 stdio-common/../sysdeps/unix/siglist.c:35
-msgid "Killed"
-msgstr "?????"
+#: argp/argp-help.c:1600
+msgid "Usage:"
+msgstr "?????????????:"
 
-#: sysdeps/generic/siglist.h:37 stdio-common/../sysdeps/unix/siglist.c:36
-msgid "Bus error"
-msgstr "?????? ????"
+#: argp/argp-help.c:1604
+msgid "  or: "
+msgstr "  ???: "
 
-#: sysdeps/generic/siglist.h:38 stdio-common/../sysdeps/unix/siglist.c:37
-msgid "Segmentation fault"
-msgstr "?????? ???????????????"
+#: argp/argp-help.c:1616
+msgid " [OPTION...]"
+msgstr " [????...]"
 
-#. TRANS Broken pipe; there is no process reading from the other end of a pipe.
-#. TRANS Every library function that returns this error code also generates a
-#. TRANS @code{SIGPIPE} signal; this signal terminates the program if not handled
-#. TRANS or blocked.  Thus, your program will never actually see @code{EPIPE}
-#. TRANS unless it has handled or blocked @code{SIGPIPE}.
-#: sysdeps/generic/siglist.h:39 stdio-common/../sysdeps/gnu/errlist.c:351
-#: stdio-common/../sysdeps/unix/siglist.c:39
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:62
-msgid "Broken pipe"
-msgstr "????? ??????"
+#: argp/argp-help.c:1643
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
+msgstr "?????????? `%s --help' ??? `%s --usage' ??? ????????? ????? ?????????? ????????.\n"
 
-#: sysdeps/generic/siglist.h:40 stdio-common/../sysdeps/unix/siglist.c:40
-msgid "Alarm clock"
-msgstr "?????? ???????"
+#: argp/argp-help.c:1671
+#, c-format
+msgid "Report bugs to %s.\n"
+msgstr "????????? ?? ??????? ??????????? ?? ?????? %s.\n"
 
-#: sysdeps/generic/siglist.h:41 stdio-common/../sysdeps/unix/siglist.c:41
-msgid "Terminated"
-msgstr "?????????"
+#: argp/argp-parse.c:102
+msgid "Give this help list"
+msgstr "?????? ???? ?????????? ??????"
 
-#: sysdeps/generic/siglist.h:42 stdio-common/../sysdeps/unix/siglist.c:42
-msgid "Urgent I/O condition"
-msgstr "???????? ???????? ?????/??????"
+#: argp/argp-parse.c:103
+msgid "Give a short usage message"
+msgstr "?????? ??????? ?????????? ?? ?????????????"
 
-#: sysdeps/generic/siglist.h:43 stdio-common/../sysdeps/unix/siglist.c:43
-msgid "Stopped (signal)"
-msgstr "??????????? (??????)"
+#: argp/argp-parse.c:104
+msgid "Set the program name"
+msgstr "????????????? ??? ?????????"
 
-#: sysdeps/generic/siglist.h:44 stdio-common/../sysdeps/unix/siglist.c:44
-msgid "Stopped"
-msgstr "???????????"
+#: argp/argp-parse.c:106
+msgid "Hang for SECS seconds (default 3600)"
+msgstr "????? ????????? ????? ?????? (?? ????????? 3600)"
 
-#: sysdeps/generic/siglist.h:45 stdio-common/../sysdeps/unix/siglist.c:45
-msgid "Continued"
-msgstr "??????????"
+#: argp/argp-parse.c:167
+msgid "Print program version"
+msgstr "???????? ?????? ?????????"
 
-#: sysdeps/generic/siglist.h:46 stdio-common/../sysdeps/unix/siglist.c:46
-msgid "Child exited"
-msgstr "???????? ??????? ??????????"
+#: argp/argp-parse.c:183
+msgid "(PROGRAM ERROR) No version known!?"
+msgstr "(?????? ?????????) ?????? ??????????!?"
 
-#: sysdeps/generic/siglist.h:47 stdio-common/../sysdeps/unix/siglist.c:47
-msgid "Stopped (tty input)"
-msgstr "??????????? (???? ? ?????????)"
+#: argp/argp-parse.c:623
+#, c-format
+msgid "%s: Too many arguments\n"
+msgstr "%s: ??????? ????? ??????????\n"
 
-#: sysdeps/generic/siglist.h:48 stdio-common/../sysdeps/unix/siglist.c:48
-msgid "Stopped (tty output)"
-msgstr "??????????? (????? ?? ????????)"
+#: argp/argp-parse.c:766
+msgid "(PROGRAM ERROR) Option should have been recognized!?"
+msgstr "(?????? ?????????) ???? ?????? ???? ?????????!?"
 
-#: sysdeps/generic/siglist.h:49 stdio-common/../sysdeps/unix/siglist.c:49
-msgid "I/O possible"
-msgstr "???????? ????/?????"
+#: assert/assert-perr.c:57
+#, c-format
+msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n"
+msgstr "%s%s%s:%u: %s%s??????????? ??????: %s.\n"
 
-#: sysdeps/generic/siglist.h:50 stdio-common/../sysdeps/unix/siglist.c:50
-msgid "CPU time limit exceeded"
-msgstr "???????? ????? ????????????? ???????"
+#: assert/assert.c:57
+#, c-format
+msgid "%s%s%s:%u: %s%sAssertion `%s' failed.\n"
+msgstr "%s%s%s:%u: %s%s??????????? ??????????? `%s' ?? ?????????.\n"
 
-#: sysdeps/generic/siglist.h:51 stdio-common/../sysdeps/unix/siglist.c:51
-msgid "File size limit exceeded"
-msgstr "???????? ????? ??????? ?????"
+#: catgets/gencat.c:109 catgets/gencat.c:113 nscd/nscd.c:96 nss/makedb.c:61
+msgid "NAME"
+msgstr "????"
 
-#: sysdeps/generic/siglist.h:52 stdio-common/../sysdeps/unix/siglist.c:52
-msgid "Virtual timer expired"
[...10684 lines suppressed...]
 msgid "locale alias file `%s' not found"
-msgstr "fil \"%s\" f??r lokalalias hittas inte"
+msgstr "fil \"%s\" f??r lokalalias finns inte"
 
 #: locale/programs/locarchive.c:1121
 #, c-format
@@ -2717,7 +2717,7 @@ msgstr "argumentet till \"%s\" m??ste va
 
 #: locale/programs/locfile.c:251
 msgid "syntax error: not inside a locale definition section"
-msgstr "syntaxfel: inte inne i en lokaldefinition"
+msgstr "syntaxfel: inte inne i en lokalsektion"
 
 #: locale/programs/locfile.c:625
 #, c-format
@@ -2764,7 +2764,7 @@ msgstr "kan inte spara ny repertoartabel
 #: locale/programs/repertoire.c:342
 #, c-format
 msgid "repertoire map file `%s' not found"
-msgstr "hittar inte repertoartabell \"%s\""
+msgstr "hittar inte repertoarfiltabell \"%s\""
 
 #: locale/programs/repertoire.c:449
 #, c-format
@@ -2859,7 +2859,7 @@ msgid ""
 "For bug reporting instructions, please see:\n"
 "<http://www.gnu.org/software/libc/bugs.html>."
 msgstr ""
-"UsageAnv??ndning: memusage [FLAGGA]... PROGRAM [PROGRAMFLAGGA]...\n"
+"Anv??ndning: memusage [FLAGGA]... PROGRAM [PROGRAMFLAGGA]...\n"
 "Sp??ra minnesanv??ndning f??r PROGRAM.\n"
 "\n"
 "   -n,--progname=NAMN     Namn p?? program att sp??ra\n"
@@ -2922,7 +2922,7 @@ msgstr "Titelstr??ng att anv??nda i resu
 
 #: malloc/memusagestat.c:55
 msgid "Generate output linear to time (default is linear to number of function calls)"
-msgstr "Generera utdata linj??r i tiden (standardv??rde ??r linj??r mot anta funktionsanrop)"
+msgstr "Generera utdata linj??r i tiden (standardv??rde ??r linj??r mot antal funktionsanrop)"
 
 #: malloc/memusagestat.c:57
 msgid "Also draw graph for total memory consumption"
@@ -2930,11 +2930,11 @@ msgstr "Visa ocks?? en graf av totala mi
 
 #: malloc/memusagestat.c:58
 msgid "make output graphic VALUE pixel wide"
-msgstr "g??r resultatgrafiken VALUE pixlar bred"
+msgstr "g??r resultatgrafiken ANTAL pixlar bred"
 
 #: malloc/memusagestat.c:59
 msgid "make output graphic VALUE pixel high"
-msgstr "g??r resultatgrafiken VALUE pixlar h??g"
+msgstr "g??r resultatgrafiken ANTAL pixlar h??g"
 
 #: malloc/memusagestat.c:64
 msgid "Generate graphic from memory profiling data"
@@ -3016,7 +3016,7 @@ msgstr "Objekt med samma namn existerar"
 
 #: nis/nis_error.h:16
 msgid "Not master server for this domain"
-msgstr "Ingen huvudserver f??r denna dom??n"
+msgstr "Inte huvudserver f??r denna dom??n"
 
 #: nis/nis_error.h:17
 msgid "Invalid object for operation"
@@ -3207,7 +3207,7 @@ msgstr "Huvudserver:\n"
 
 #: nis/nis_print.c:175
 msgid "Replicate :\n"
-msgstr "Replikerad:\n"
+msgstr "Replikera:\n"
 
 #: nis/nis_print.c:176
 #, c-format
@@ -3404,7 +3404,7 @@ msgstr "Antal objekt      : %u\n"
 #: nis/nis_print.c:377
 #, c-format
 msgid "Object #%d:\n"
-msgstr "Objekt #%d:\n"
+msgstr "Objekt nr %d:\n"
 
 #: nis/nis_print_group_entry.c:117
 #, c-format
@@ -3437,7 +3437,7 @@ msgstr "    Inga rekursiva medlemmar\n"
 
 #: nis/nis_print_group_entry.c:149 nis/nis_print_group_entry.c:165
 msgid "    Explicit nonmembers:\n"
-msgstr "    Explicit icke-medlemmar:\n"
+msgstr "    Explicita icke-medlemmar:\n"
 
 #: nis/nis_print_group_entry.c:154
 msgid "    No explicit nonmembers\n"
@@ -3609,7 +3609,7 @@ msgstr "besk??r %s cache; tid %ld"
 #: nscd/cache.c:289
 #, c-format
 msgid "considering %s entry \"%s\", timeout %<PRIu64>"
-msgstr "??verv??ger %s post \"%s\", tidsgr??ns %<PRIu64>"
+msgstr "??verv??ger %s-post \"%s\", tidsgr??ns %<PRIu64>"
 
 #: nscd/connections.c:469 nscd/connections.c:481 nscd/connections.c:493
 #: nscd/connections.c:512
@@ -3692,7 +3692,7 @@ msgstr "ge ??tkomst till FD %d, f??r %s"
 #: nscd/connections.c:904
 #, c-format
 msgid "cannot handle old request version %d; current version is %d"
-msgstr "Kan inte hantera ??ldre f??rfr??gansversion %d, nuvarande version ??r %d"
+msgstr "kan inte hantera ??ldre f??rfr??gansversion %d, nuvarande version ??r %d"
 
 #: nscd/connections.c:954 nscd/connections.c:1007
 #, c-format
@@ -3851,7 +3851,7 @@ msgstr "Invalidera den angivna cachen"
 
 #: nscd/nscd.c:105
 msgid "TABLE,yes"
-msgstr "TABELL,yes"
+msgstr "TABELL,ja"
 
 #: nscd/nscd.c:106
 msgid "Use separate cache for each user"
@@ -5073,7 +5073,7 @@ msgstr "Avbruten (SIGABRT)"
 
 #: sysdeps/generic/siglist.h:35 sysdeps/unix/siglist.c:34
 msgid "Floating point exception"
-msgstr "Aritmetiskt fel"
+msgstr "Flyttalsfel"
 
 #: sysdeps/generic/siglist.h:36 sysdeps/unix/siglist.c:35
 msgid "Killed"
@@ -5359,7 +5359,7 @@ msgstr "Kodfil upptagen"
 #. TRANS File too big; the size of a file would be larger than allowed by the system.
 #: sysdeps/gnu/errlist.c:307
 msgid "File too large"
-msgstr "Fil f??r stor"
+msgstr "F??r stor fil"
 
 #. TRANS No space left on device; write operation on a file failed because the
 #. TRANS disk is full.
@@ -5514,7 +5514,7 @@ msgstr "Adressfamiljen st??ds inte av pr
 #. TRANS The requested socket address is already in use.  @xref{Socket Addresses}.
 #: sysdeps/gnu/errlist.c:555
 msgid "Address already in use"
-msgstr "Adressen upptagen"
+msgstr "Adressen redan upptagen"
 
 #. TRANS The requested socket address is not available; for example, you tried
 #. TRANS to give a socket a name that doesn't match the local host name.
@@ -5577,7 +5577,7 @@ msgstr "Transportslutpunkten ??r inte f?
 #. TRANS without first specifying a destination for the data with @code{connect}.
 #: sysdeps/gnu/errlist.c:658
 msgid "Destination address required"
-msgstr "Destination kr??vs"
+msgstr "Destinationsadress kr??vs"
 
 #. TRANS The socket has already been shut down.
 #: sysdeps/gnu/errlist.c:667
@@ -5612,7 +5612,7 @@ msgstr "F??r m??nga niv??er av symbolisk
 #. TRANS @code{sethostname}; @pxref{Host Identification}).
 #: sysdeps/gnu/errlist.c:717
 msgid "File name too long"
-msgstr "Filnamn f??r l??ngt"
+msgstr "F??r l??ngt filnamn"
 
 #. TRANS The remote host for a requested network connection is down.
 #: sysdeps/gnu/errlist.c:726
@@ -6147,7 +6147,7 @@ msgstr "%s: anv??ndning ??r %s [ --versi
 #: timezone/zdump.c:301
 #, c-format
 msgid "%s: wild -c argument %s\n"
-msgstr "%s: flaggan -c har ok??nt argument %s\n"
+msgstr "%s: argument \"%s\" till flaggan -c har fel format\n"
 
 #: timezone/zdump.c:392
 msgid "Error writing to standard output"
@@ -6226,7 +6226,7 @@ msgstr "%s: Kan inte l??nka fr??n %s til
 
 #: timezone/zic.c:774 timezone/zic.c:776
 msgid "same rule name in multiple files"
-msgstr "samma regel i flera filer"
+msgstr "samma regelnamn i flera filer"
 
 #: timezone/zic.c:817
 msgid "unruly zone"
@@ -6262,7 +6262,7 @@ msgstr "%s: \"Leap\"-rad i fil %s som in
 #: timezone/zic.c:904 timezone/zic.c:1325 timezone/zic.c:1350
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
-msgstr "%s: panik: ogiltigt l_value %d\n"
+msgstr "%s: panik: Ogiltigt l_value %d\n"
 
 #: timezone/zic.c:912
 #, c-format
@@ -6292,7 +6292,7 @@ msgstr "namnl??s regel"
 
 #: timezone/zic.c:991
 msgid "invalid saved time"
-msgstr "ogiltigt sparad tid"
+msgstr "ogiltig sparad tid"
 
 #: timezone/zic.c:1010
 msgid "wrong number of fields on Zone line"

glibc-rh178934.patch:
 config.h.in                    |    3 +++
 nscd/selinux.c                 |   16 ++++++++++------
 nscd/selinux.h                 |    2 +-
 scripts/check-local-headers.sh |    1 +
 4 files changed, 15 insertions(+), 7 deletions(-)

--- NEW FILE glibc-rh178934.patch ---
2007-03-23  Jakub Jelinek  <jakub at redhat.com>

	* scripts/check-local-headers.sh: Filter out sys/capability.h.

2007-03-22  Jakub Jelinek  <jakub at redhat.com>

	* config.h.in (HAVE_LIBCAP): Add.
	* nscd/selinux.h: Include sys/capability.h rather than non-existent
	sys/capabilities.h.
	* nscd/selinux.c (preserve_capabilities): Use cap_free instead of
	free_caps.  Cast away const from 4th cap_set_flag argument.

--- libc/config.h.in	28 Oct 2006 06:44:04 -0000	1.80
+++ libc/config.h.in	26 Mar 2007 20:40:08 -0000	1.81
@@ -19,6 +19,9 @@
 /* Defined if building with SELinux support & audit libs are detected. */
 #undef	HAVE_LIBAUDIT
 
+/* Defined if building with SELinux support & libcap libs are detected.  */
+#undef  HAVE_LIBCAP
+
 /* Define if using XCOFF. Set by --with-xcoff.  */
 #undef	HAVE_XCOFF
 
--- libc/nscd/selinux.c	14 Jan 2007 05:25:03 -0000	1.10
+++ libc/nscd/selinux.c	26 Mar 2007 20:40:37 -0000	1.11
@@ -187,18 +187,22 @@ preserve_capabilities (void)
   if (tmp_caps == NULL || new_caps == NULL)
     {
       if (tmp_caps != NULL)
-	free_caps (tmp_caps);
+	cap_free (tmp_caps);
 
       dbg_log (_("Failed to initialize drop of capabilities"));
       error (EXIT_FAILURE, 0, _("cap_init failed"));
     }
 
   /* There is no reason why these should not work.  */
-  cap_set_flag (new_caps, CAP_PERMITTED, nnew_cap_list, new_cap_list, CAP_SET);
-  cap_set_flag (new_caps, CAP_EFFECTIVE, nnew_cap_list, new_cap_list, CAP_SET);
-
-  cap_set_flag (tmp_caps, CAP_PERMITTED, ntmp_cap_list, tmp_cap_list, CAP_SET);
-  cap_set_flag (tmp_caps, CAP_EFFECTIVE, ntmp_cap_list, tmp_cap_list, CAP_SET);
+  cap_set_flag (new_caps, CAP_PERMITTED, nnew_cap_list,
+		(cap_value_t *) new_cap_list, CAP_SET);
+  cap_set_flag (new_caps, CAP_EFFECTIVE, nnew_cap_list,
+		(cap_value_t *) new_cap_list, CAP_SET);
+
+  cap_set_flag (tmp_caps, CAP_PERMITTED, ntmp_cap_list,
+		(cap_value_t *) tmp_cap_list, CAP_SET);
+  cap_set_flag (tmp_caps, CAP_EFFECTIVE, ntmp_cap_list,
+		(cap_value_t *) tmp_cap_list, CAP_SET);
 
   int res = cap_set_proc (tmp_caps);
 
--- libc/nscd/selinux.h	26 Apr 2006 16:27:39 -0000	1.3
+++ libc/nscd/selinux.h	26 Mar 2007 20:40:21 -0000	1.4
@@ -23,7 +23,7 @@
 
 #include "nscd.h"
 #ifdef HAVE_LIBCAP
-# include <sys/capabilities.h>
+# include <sys/capability.h>
 #endif
 
 #ifdef HAVE_SELINUX
--- libc/scripts/check-local-headers.sh	12 Jan 2007 16:13:55 -0000	1.4
+++ libc/scripts/check-local-headers.sh	26 Mar 2007 20:41:05 -0000	1.5
@@ -30,6 +30,7 @@ if fgrep "$includedir" */*.{o,os,oS}.d |
 fgrep -v "$includedir/asm" |
 fgrep -v "$includedir/linux" |
 fgrep -v "$includedir/selinux" |
+fgrep -v "$includedir/sys/capability.h" |
 fgrep -v "$includedir/gd"; then
   # If we found a match something is wrong.
   exit 1

glibc-rh203728.patch:
 ld-ctype.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE glibc-rh203728.patch ---
2007-03-15  Jakub Jelinek  <jakub at redhat.com>

	* locale/programs/ld-ctype.c (find_translit): Return NULL if ctype is
	NULL.

--- libc/locale/programs/ld-ctype.c	10 Nov 2006 20:15:53 -0000	1.113
+++ libc/locale/programs/ld-ctype.c	17 Mar 2007 16:52:21 -0000	1.114
@@ -1866,6 +1866,9 @@ find_translit (struct localedef_t *local
   assert (locale != NULL);
   ctype = locale->categories[LC_CTYPE].ctype;
 
+  if (ctype == NULL)
+    return NULL;
+
   if (ctype->translit != NULL)
     result = find_translit2 (ctype, charmap, wch);
 

glibc-rh210748-workaround.patch:
 elf/dl-open.c         |   14 +++++++++++---
 nptl/pthread_create.c |   24 ++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

--- NEW FILE glibc-rh210748-workaround.patch ---
2007-01-15  Jakub Jelinek  <jakub at redhat.com>

	* elf/dl-open.c (add_to_global): If the main searchlist is 256
	entries or more, on each reallocation at least double the size
	of the search list rather than growing it linearly.
	(dl_open_worker): When changing from l_scope_mem to malloced
	l_scope, start with 64 entries rather than 4.

	* pthread_create.c (__pthread_create_2_1): On the first pthread_create
	in a process make sure main search list can store at least 256
	entries.

--- libc/elf/dl-open.c	2006-08-31 08:53:29.000000000 +0200
+++ libc/elf/dl-open.c	2007-01-15 11:22:54.000000000 +0100
@@ -125,14 +125,18 @@ add_to_global (struct link_map *new)
     {
       /* We have to extend the existing array of link maps in the
 	 main map.  */
+      size_t new_size = GL(dl_ns)[new->l_ns]._ns_global_scope_alloc;
+      if (new_size >= 256 && new_size > to_add + 8)
+	new_size *= 2;
+      else
+	new_size += to_add + 8;
       new_global = (struct link_map **)
 	realloc (GL(dl_ns)[new->l_ns]._ns_main_searchlist->r_list,
-		 ((GL(dl_ns)[new->l_ns]._ns_global_scope_alloc + to_add + 8)
-		  * sizeof (struct link_map *)));
+		 new_size * sizeof (struct link_map *));
       if (new_global == NULL)
 	goto nomem;
 
-      GL(dl_ns)[new->l_ns]._ns_global_scope_alloc += to_add + 8;
+      GL(dl_ns)[new->l_ns]._ns_global_scope_alloc = new_size;
       GL(dl_ns)[new->l_ns]._ns_main_searchlist->r_list = new_global;
     }
 
@@ -396,6 +401,10 @@ dl_open_worker (void *a)
 
 	      if (imap->l_scope == imap->l_scope_mem)
 		{
+		  /* Hack: try to minimize the number of realloc calls
+		     when we don't have proper locking yet.  */
+		  new_size = 64;
+
 		  newp = (struct r_scope_elem **)
 		    malloc (new_size * sizeof (struct r_scope_elem *));
 		  if (newp == NULL)
--- libc/nptl/pthread_create.c	2006-09-07 11:04:05.000000000 +0200
+++ libc/nptl/pthread_create.c	2007-01-15 11:18:49.000000000 +0100
@@ -462,6 +462,30 @@ __pthread_create_2_1 (newthread, attr, s
   pd->flags = ((iattr->flags & ~(ATTR_FLAG_SCHED_SET | ATTR_FLAG_POLICY_SET))
 	       | (self->flags & (ATTR_FLAG_SCHED_SET | ATTR_FLAG_POLICY_SET)));
 
+  /* Hack: realloc the main search list on the first pthread_create call
+     to minimize the number of global search scope reallocations.
+     Wastes at most 1KB on 32-bit and 2KB on 64-bit per process
+     which calls pthread_create.  */
+  if (__builtin_expect (self->header.multiple_threads == 0, 0)
+      && GL(dl_ns)[0]._ns_main_searchlist
+      && GL(dl_ns)[0]._ns_main_searchlist->r_nlist < 256
+      && GL(dl_ns)[0]._ns_global_scope_alloc < 256)
+    {
+      struct link_map **new_global = (struct link_map **)
+	realloc (GL(dl_ns)[0]._ns_global_scope_alloc == 0
+		 ? NULL : GL(dl_ns)[0]._ns_main_searchlist->r_list,
+		 256 * sizeof (struct link_map *));
+      if (new_global != NULL)
+	{
+	  if (GL(dl_ns)[0]._ns_global_scope_alloc == 0)
+	    memcpy (new_global, GL(dl_ns)[0]._ns_main_searchlist->r_list,
+		    GL(dl_ns)[0]._ns_main_searchlist->r_nlist
+		    * sizeof (struct link_map *));
+	  GL(dl_ns)[0]._ns_global_scope_alloc = 256;
+	  GL(dl_ns)[0]._ns_main_searchlist->r_list = new_global;
+	}
+    }
+
   /* Initialize the field for the ID of the thread which is waiting
      for us.  This is a self-reference in case the thread is created
      detached.  */

glibc-rh221187.patch:
 Makefile     |   12 ++-
 execvp.c     |  101 ++++++++++++++++----------
 tst-vfork3.c |  224 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 294 insertions(+), 43 deletions(-)

--- NEW FILE glibc-rh221187.patch ---
2007-01-03  Jakub Jelinek  <jakub at redhat.com>

	* posix/execvp.c: Include alloca.h.
	(allocate_scripts_argv): Renamed to...
	(scripts_argv): ... this.  Don't allocate buffer here nor count
	arguments.
	(execvp): Use alloca if possible.
	* posix/Makefile: Add rules to build and run tst-vfork3 test.
	* posix/tst-vfork3.c: New test.

--- libc/posix/Makefile	7 Sep 2006 13:50:05 -0000	1.193
+++ libc/posix/Makefile	3 Jan 2007 23:02:10 -0000	1.194
@@ -83,7 +83,7 @@ tests		:= tstgetopt testfnm runtests run
 		   bug-regex21 bug-regex22 bug-regex23 bug-regex24 \
 		   bug-regex25 bug-regex26 tst-nice tst-nanosleep tst-regex2 \
 		   transbug tst-rxspencer tst-pcre tst-boost \
-		   bug-ga1 tst-vfork1 tst-vfork2 tst-waitid \
+		   bug-ga1 tst-vfork1 tst-vfork2 tst-vfork3 tst-waitid \
 		   tst-getaddrinfo2 bug-glob1 bug-glob2 tst-sysconf \
 		   tst-execvp1 tst-execvp2 tst-execlp1 tst-execlp2 \
 		   tst-execv1 tst-execv2 tst-execl1 tst-execl2 \
@@ -109,7 +109,7 @@ generated := $(addprefix wordexp-test-re
 	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
 	     tst-pcre-mem tst-pcre.mtrace tst-boost-mem tst-boost.mtrace \
 	     bug-ga2.mtrace bug-ga2-mem bug-glob2.mtrace bug-glob2-mem \
-	     getconf.speclist
+	     tst-vfork3-mem tst-vfork3.mtrace getconf.speclist
 
 include ../Rules
 
@@ -175,6 +175,7 @@ tst-exec-ARGS = -- $(built-program-cmd)
 tst-spawn-ARGS = -- $(built-program-cmd)
 tst-dir-ARGS = `pwd` `cd $(common-objdir)/$(subdir); pwd` `cd $(common-objdir); pwd` $(objpfx)tst-dir
 tst-chmod-ARGS = `pwd`
+tst-vfork3-ARGS = --test-dir=$(objpfx)
 
 tst-fnmatch-ENV = LOCPATH=$(common-objpfx)localedata
 tst-regexloc-ENV = LOCPATH=$(common-objpfx)localedata
@@ -219,7 +220,7 @@ ifeq (no,$(cross-compiling))
 tests: $(objpfx)bug-regex2-mem $(objpfx)bug-regex14-mem \
   $(objpfx)bug-regex21-mem $(objpfx)tst-rxspencer-mem \
   $(objpfx)tst-pcre-mem $(objpfx)tst-boost-mem $(objpfx)tst-getconf.out \
-  $(objpfx)bug-glob2-mem
+  $(objpfx)bug-glob2-mem $(objpfx)tst-vfork3-mem
 xtests: $(objpfx)bug-ga2-mem
 endif
 
@@ -246,6 +247,11 @@ bug-regex21-ENV = MALLOC_TRACE=$(objpfx)
 $(objpfx)bug-regex21-mem: $(objpfx)bug-regex21.out
 	$(common-objpfx)malloc/mtrace $(objpfx)bug-regex21.mtrace > $@
 
+tst-vfork3-ENV = MALLOC_TRACE=$(objpfx)tst-vfork3.mtrace
+
+$(objpfx)tst-vfork3-mem: $(objpfx)tst-vfork3.out
+	$(common-objpfx)malloc/mtrace $(objpfx)tst-vfork3.mtrace > $@
+
 # tst-rxspencer.mtrace is generated only when run without --utf8
 # option, since otherwise the file has almost 100M and takes very long
 # time to process.
--- libc/posix/execvp.c	24 Jul 2005 21:38:43 -0000	1.26
+++ libc/posix/execvp.c	3 Jan 2007 23:01:15 -0000	1.27
@@ -16,6 +17,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#include <alloca.h>
 #include <unistd.h>
 #include <stdarg.h>
 #include <stdbool.h>
@@ -27,29 +29,18 @@
 
 /* The file is accessible but it is not an executable file.  Invoke
    the shell to interpret it as a script.  */
-static char **
+static void
 internal_function
-allocate_scripts_argv (const char *file, char *const argv[])
+scripts_argv (const char *file, char *const argv[], int argc, char **new_argv)
 {
-  /* Count the arguments.  */
-  int argc = 0;
-  while (argv[argc++])
-    ;
-
   /* Construct an argument list for the shell.  */
-  char **new_argv = (char **) malloc ((argc + 1) * sizeof (char *));
-  if (new_argv != NULL)
+  new_argv[0] = (char *) _PATH_BSHELL;
+  new_argv[1] = (char *) file;
+  while (argc > 1)
     {
-      new_argv[0] = (char *) _PATH_BSHELL;
-      new_argv[1] = (char *) file;
-      while (argc > 1)
-	{
-	  new_argv[argc] = argv[argc - 1];
-	  --argc;
-	}
+      new_argv[argc] = argv[argc - 1];
+      --argc;
     }
-
-  return new_argv;
 }
 
 
@@ -67,8 +58,6 @@ execvp (file, argv)
       return -1;
     }
 
-  char **script_argv = NULL;
-
   if (strchr (file, '/') != NULL)
     {
       /* Don't search when it contains a slash.  */
@@ -76,46 +65,71 @@ execvp (file, argv)
 
       if (errno == ENOEXEC)
 	{
-	  script_argv = allocate_scripts_argv (file, argv);
+	  /* Count the arguments.  */
+	  int argc = 0;
+	  while (argv[argc++])
+	    ;
+	  size_t len = (argc + 1) * sizeof (char *);
+	  char **script_argv;
+	  void *ptr = NULL;
+	  if (__libc_use_alloca (len))
+	    script_argv = alloca (len);
+	  else
+	    script_argv = ptr = malloc (len);
+
 	  if (script_argv != NULL)
 	    {
+	      scripts_argv (file, argv, argc, script_argv);
 	      __execve (script_argv[0], script_argv, __environ);
 
-	      free (script_argv);
+	      free (ptr);
 	    }
 	}
     }
   else
     {
+      size_t pathlen;
+      size_t alloclen = 0;
       char *path = getenv ("PATH");
+      if (path == NULL)
+	{
+	  pathlen = confstr (_CS_PATH, (char *) NULL, 0);
+	  alloclen = pathlen + 1;
+	}
+      else
+	pathlen = strlen (path);
+
+      size_t len = strlen (file) + 1;
+      alloclen += pathlen + len + 1;
+
+      char *name;
       char *path_malloc = NULL;
+      if (__libc_use_alloca (alloclen))
+	name = alloca (alloclen);
+      else
+	{
+	  path_malloc = name = malloc (alloclen);
+	  if (name == NULL)
+	    return -1;
+	}
+
       if (path == NULL)
 	{
 	  /* There is no `PATH' in the environment.
 	     The default search path is the current directory
 	     followed by the path `confstr' returns for `_CS_PATH'.  */
-	  size_t len = confstr (_CS_PATH, (char *) NULL, 0);
-	  path = (char *) malloc (1 + len);
-	  if (path == NULL)
-	    return -1;
+	  path = name + pathlen + len + 1;
 	  path[0] = ':';
-	  (void) confstr (_CS_PATH, path + 1, len);
-	  path_malloc = path;
+	  (void) confstr (_CS_PATH, path + 1, pathlen);
 	}
 
-      size_t len = strlen (file) + 1;
-      size_t pathlen = strlen (path);
-      char *name = malloc (pathlen + len + 1);
-      if (name == NULL)
-	{
-	  free (path_malloc);
-	  return -1;
-	}
       /* Copy the file name at the top.  */
       name = (char *) memcpy (name + pathlen + 1, file, len);
       /* And add the slash.  */
       *--name = '/';
 
+      char **script_argv = NULL;
+      void *script_argv_malloc = NULL;
       bool got_eacces = false;
       char *p = path;
       do
@@ -139,7 +153,15 @@ execvp (file, argv)
 	    {
 	      if (script_argv == NULL)
 		{
-		  script_argv = allocate_scripts_argv (startp, argv);
+		  /* Count the arguments.  */
+		  int argc = 0;
+		  while (argv[argc++])
+		    ;
+		  size_t arglen = (argc + 1) * sizeof (char *);
+		  if (__libc_use_alloca (alloclen + arglen))
+		    script_argv = alloca (arglen);
+		  else
+		    script_argv = script_argv_malloc = malloc (arglen);
 		  if (script_argv == NULL)
 		    {
 		      /* A possible EACCES error is not as important as
@@ -147,6 +169,7 @@ execvp (file, argv)
 		      got_eacces = false;
 		      break;
 		    }
+		  scripts_argv (startp, argv, argc, script_argv);
 		}
 
 	      __execve (script_argv[0], script_argv, __environ);
@@ -184,11 +207,10 @@ execvp (file, argv)
       /* We tried every element and none of them worked.  */
       if (got_eacces)
 	/* At least one failure was due to permissions, so report that
-           error.  */
+	   error.  */
 	__set_errno (EACCES);
 
-      free (script_argv);
-      free (name - pathlen);
+      free (script_argv_malloc);
       free (path_malloc);
     }
 
--- libc/posix/tst-vfork3.c	1 Jan 1970 00:00:00 -0000
+++ libc/posix/tst-vfork3.c	3 Jan 2007 23:01:58 -0000	1.1
@@ -0,0 +1,224 @@
+/* Test for vfork functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Jakub Jelinek <jakub at redhat.com>, 2007.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <mcheck.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/wait.h>
+
+static int do_test (void);
+static void do_prepare (void);
+char *tmpdirname;
+
+#define TEST_FUNCTION do_test ()
+#define PREPARE(argc, argv) do_prepare ()
+#include "../test-skeleton.c"
+
+static int
+do_test (void)
+{
+  mtrace ();
+
+  const char *path = getenv ("PATH");
+  if (path == NULL)
+    path = "/bin";
+  char pathbuf[strlen (tmpdirname) + 1 + strlen (path) + 1];
+  strcpy (stpcpy (stpcpy (pathbuf, tmpdirname), ":"), path);
+  if (setenv ("PATH", pathbuf, 1) < 0)
+    {
+      puts ("setenv failed");
+      return 1;
+    }
+
+  size_t i;
+  char *argv[3] = { (char *) "script1.sh", (char *) "1", NULL };
+  for (i = 0; i < 5; i++)
+    {
+      pid_t pid = vfork ();
+      if (pid < 0)
+	{
+	  printf ("vfork failed: %m\n");
+	  return 1;
+	}
+      else if (pid == 0)
+	{
+	  execvp ("script1.sh", argv);
+	  _exit (errno);
+	}
+      int status;
+      if (TEMP_FAILURE_RETRY (waitpid (pid, &status, 0)) != pid)
+	{
+	  puts ("waitpid failed");
+	  return 1;
+	}
+      else if (status != 0)
+	{
+	  if (WIFEXITED (status))
+	    printf ("script1.sh failed with status %d\n",
+		    WEXITSTATUS (status));
+	  else
+	    printf ("script1.sh kill by signal %d\n",
+		    WTERMSIG (status));
+	  return 1;
+	}
+    }
+
+  argv[0] = (char *) "script2.sh";
+  argv[1] = (char *) "2";
+  for (i = 0; i < 5; i++)
+    {
+      pid_t pid = vfork ();
+      if (pid < 0)
+	{
+	  printf ("vfork failed: %m\n");
+	  return 1;
+	}
+      else if (pid == 0)
+	{
+	  execvp ("script2.sh", argv);
+	  _exit (errno);
+	}
+      int status;
+      if (TEMP_FAILURE_RETRY (waitpid (pid, &status, 0)) != pid)
+	{
+	  puts ("waitpid failed");
+	  return 1;
+	}
+      else if (status != 0)
+	{
+	  printf ("script2.sh failed with status %d\n", status);
+	  return 1;
+	}
+    }
+
+  for (i = 0; i < 5; i++)
+    {
+      pid_t pid = vfork ();
+      if (pid < 0)
+	{
+	  printf ("vfork failed: %m\n");
+	  return 1;
+	}
+      else if (pid == 0)
+	{
+	  execlp ("script2.sh", "script2.sh", "3", NULL);
+	  _exit (errno);
+	}
+      int status;
+      if (TEMP_FAILURE_RETRY (waitpid (pid, &status, 0)) != pid)
+	{
+	  puts ("waitpid failed");
+	  return 1;
+	}
+      else if (status != 0)
+	{
+	  printf ("script2.sh failed with status %d\n", status);
+	  return 1;
+	}
+    }
+
+  unsetenv ("PATH");
+  argv[0] = (char *) "echo";
+  argv[1] = (char *) "script 4";
+  for (i = 0; i < 5; i++)
+    {
+      pid_t pid = vfork ();
+      if (pid < 0)
+	{
+	  printf ("vfork failed: %m\n");
+	  return 1;
+	}
+      else if (pid == 0)
+	{
+	  execvp ("echo", argv);
+	  _exit (errno);
+	}
+      int status;
+      if (TEMP_FAILURE_RETRY (waitpid (pid, &status, 0)) != pid)
+	{
+	  puts ("waitpid failed");
+	  return 1;
+	}
+      else if (status != 0)
+	{
+	  printf ("echo failed with status %d\n", status);
+	  return 1;
+	}
+    }
+
+  return 0;
+}
+
+static void
+do_prepare (void)
+{
+  size_t len = strlen (test_dir) + sizeof ("/tst-vfork3.XXXXXX");
+  tmpdirname = malloc (len);
+  char *script1 = malloc (len + sizeof "/script1.sh");
+  char *script2 = malloc (len + sizeof "/script2.sh");
+  if (tmpdirname == NULL || script1 == NULL || script2 == NULL)
+    {
+      puts ("out of memory");
+      exit (1);
+    }
+  strcpy (stpcpy (tmpdirname, test_dir), "/tst-vfork3.XXXXXX");
+
+  tmpdirname = mkdtemp (tmpdirname);
+  if (tmpdirname == NULL)
+    {
+      puts ("could not create temporary directory");
+      exit (1);
+    }
+
+  strcpy (stpcpy (script1, tmpdirname), "/script1.sh");
+  strcpy (stpcpy (script2, tmpdirname), "/script2.sh");
+
+  /* Need to make sure tmpdirname is at the end of the linked list.  */
+  add_temp_file (script1);
+  add_temp_file (tmpdirname);
+  add_temp_file (script2);
+
+  const char content1[] = "#!/bin/sh\necho script $1\n";
+  int fd = open (script1, O_WRONLY | O_CREAT, 0700);
+  if (fd < 0
+      || TEMP_FAILURE_RETRY (write (fd, content1, sizeof content1))
+	 != sizeof content1
+      || fchmod (fd, S_IRUSR | S_IXUSR) < 0)
+    {
+      printf ("Could not write %s\n", script1);
+      exit (1);
+    }
+  close (fd);
+
+  const char content2[] = "echo script $1\n";
+  fd = open (script2, O_WRONLY | O_CREAT, 0700);
+  if (fd < 0
+      || TEMP_FAILURE_RETRY (write (fd, content2, sizeof content2))
+	 != sizeof content2
+      || fchmod (fd, S_IRUSR | S_IXUSR) < 0)
+    {
+      printf ("Could not write %s\n", script2);
+      exit (1);
+    }
+  close (fd);
+}

glibc-rh222089.patch:
 fts.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE glibc-rh222089.patch ---
2007-01-10  Ulrich Drepper  <drepper at redhat.com>

	* io/fts.c: Make sure fts_cur is always valid after return from
	fts_read.
	Patch by Miloslav Trmac <mitr at redhat.com>.

--- libc/io/fts.c	2 Oct 2006 16:06:49 -0000	1.35
+++ libc/io/fts.c	10 Jan 2007 18:38:19 -0000	1.36
@@ -376,12 +376,14 @@ fts_read(sp)
 		}
 		p = sp->fts_child;
 		sp->fts_child = NULL;
+		sp->fts_cur = p;
 		goto name;
 	}
 
 	/* Move to the next node on this level. */
 next:	tmp = p;
 	if ((p = p->fts_link) != NULL) {
+		sp->fts_cur = p;
 		free(tmp);
 
 		/*
@@ -394,7 +396,7 @@ next:	tmp = p;
 				return (NULL);
 			}
 			fts_load(sp, p);
-			return (sp->fts_cur = p);
+			return p;
 		}
 
 		/*
@@ -420,11 +422,12 @@ next:	tmp = p;
 name:		t = sp->fts_path + NAPPEND(p->fts_parent);
 		*t++ = '/';
 		memmove(t, p->fts_name, p->fts_namelen + 1);
-		return (sp->fts_cur = p);
+		return p;
 	}
 
 	/* Move up to the parent node. */
 	p = tmp->fts_parent;
+	sp->fts_cur = p;
 	free(tmp);
 
 	if (p->fts_level == FTS_ROOTPARENTLEVEL) {
@@ -465,7 +468,7 @@ name:		t = sp->fts_path + NAPPEND(p->fts
 		return (NULL);
 	}
 	p->fts_info = p->fts_errno ? FTS_ERR : FTS_DP;
-	return (sp->fts_cur = p);
+	return p;
 }
 
 /*

glibc-rh225315.patch:
 nscd-client.h     |    8 +-
 nscd_getai.c      |   69 ++++++++++++++-----------
 nscd_getgr_r.c    |  105 +++++++++++++++++++++++----------------
 nscd_gethst_r.c   |  145 +++++++++++++++++++++++++++++++-----------------------
 nscd_getpw_r.c    |   67 +++++++++++++-----------
 nscd_helper.c     |   26 ++++++++-
 nscd_initgroups.c |   60 ++++++++++++----------
 7 files changed, 287 insertions(+), 193 deletions(-)

--- NEW FILE glibc-rh225315.patch ---
2007-01-31  Jakub Jelinek  <jakub at redhat.com>

	* nscd/nscd-client.h (__nscd_cache_search): Remove const qualifier
	from return value.
	* nscd/nscd_helper.c: Include string.h.
	(__nscd_cache_search): Remove const qualifier from return value.
	On strict alignment architectures check hash entry and data head
	alignment.
	* nscd/nscd_getpw_r.c (nscd_getpw_r): Don't crash or fail because
	mmapped data during GC cycle contains garbage.  If
	__nscd_drop_map_ref fails, decrement mapped->counter when returning
	error or if retrying with NO_MAPPING, only __nscd_unmap if counter
	dropped to 0.
	* nscd/nscd_getgr_r.c (nscd_getgr_r): Likewise.
	* nscd/nscd_initgroups.c (__nscd_getgrouplist): Likewise.
	* nscd/nscd_gethst_r.c (nscd_gethst_r): Likewise.
	* nscd/nscd_getai.c (__nscd_getai): Likewise.

--- libc/nscd/nscd-client.h	14 Jan 2007 05:23:40 -0000	1.24
+++ libc/nscd/nscd-client.h	31 Jan 2007 09:14:21 -0000	1.25
@@ -323,10 +323,10 @@ static inline int __nscd_drop_map_ref (s
 
 
 /* Search the mapped database.  */
-extern const struct datahead *__nscd_cache_search (request_type type,
-						   const char *key,
-						   size_t keylen,
-						   const struct mapped_database *mapped);
+extern struct datahead *__nscd_cache_search (request_type type,
+					     const char *key,
+					     size_t keylen,
+					     const struct mapped_database *mapped);
 
 /* Wrappers around read, readv and write that only read/write less than LEN
    bytes on error or EOF.  */
--- libc/nscd/nscd_getai.c	15 May 2006 20:31:29 -0000	1.12
+++ libc/nscd/nscd_getai.c	31 Jan 2007 09:14:21 -0000	1.13
@@ -42,6 +42,7 @@ __nscd_getai (const char *key, struct ns
 {
   size_t keylen = strlen (key) + 1;
   int gc_cycle;
+  int nretries = 0;
 
   /* If the mapping is available, try to search there instead of
      communicating with the nscd.  */
@@ -50,49 +51,53 @@ __nscd_getai (const char *key, struct ns
 			       &gc_cycle);
 
  retry:;
-  const ai_response_header *ai_resp = NULL;
   struct nscd_ai_result *resultbuf = NULL;
   const char *recend = (const char *) ~UINTMAX_C (0);
   char *respdata = NULL;
   int retval = -1;
   int sock = -1;
+  ai_response_header ai_resp;
 
   if (mapped != NO_MAPPING)
     {
-      const struct datahead *found = __nscd_cache_search (GETAI, key, keylen,
-							  mapped);
+      struct datahead *found = __nscd_cache_search (GETAI, key, keylen,
+						    mapped);
       if (found != NULL)
 	{
-	  ai_resp = &found->data[0].aidata;
-	  respdata = (char *) (ai_resp + 1);
+	  respdata = (char *) (&found->data[0].aidata + 1);
+	  ai_resp = found->data[0].aidata;
 	  recend = (const char *) found->data + found->recsize;
+	  /* Now check if we can trust ai_resp fields.  If GC is
+	     in progress, it can contain anything.  */
+	  if (mapped->head->gc_cycle != gc_cycle)
+	    {
+	      retval = -2;
+	      goto out;
+	    }
 	}
     }
 
   /* If we do not have the cache mapped, try to get the data over the
      socket.  */
-  ai_response_header ai_resp_mem;
-  if (ai_resp == NULL)
+  if (respdata == NULL)
     {
-      sock = __nscd_open_socket (key, keylen, GETAI, &ai_resp_mem,
-				 sizeof (ai_resp_mem));
+      sock = __nscd_open_socket (key, keylen, GETAI, &ai_resp,
+				 sizeof (ai_resp));
       if (sock == -1)
 	{
 	  /* nscd not running or wrong version.  */
 	  __nss_not_use_nscd_hosts = 1;
 	  goto out;
 	}
-
-      ai_resp = &ai_resp_mem;
     }
 
-  if (ai_resp->found == 1)
+  if (ai_resp.found == 1)
     {
-      size_t datalen = ai_resp->naddrs + ai_resp->addrslen + ai_resp->canonlen;
+      size_t datalen = ai_resp.naddrs + ai_resp.addrslen + ai_resp.canonlen;
 
-      /* This check is really only affects the case where the data
+      /* This check really only affects the case where the data
 	 comes from the mapped cache.  */
-      if ((char *) (ai_resp + 1) + datalen > recend)
+      if (respdata + datalen > recend)
 	{
 	  assert (sock == -1);
 	  goto out;
@@ -108,10 +113,10 @@ __nscd_getai (const char *key, struct ns
 	}
 
       /* Set up the data structure, including pointers.  */
-      resultbuf->naddrs = ai_resp->naddrs;
+      resultbuf->naddrs = ai_resp.naddrs;
       resultbuf->addrs = (char *) (resultbuf + 1);
-      resultbuf->family = (uint8_t *) (resultbuf->addrs + ai_resp->addrslen);
-      if (ai_resp->canonlen != 0)
+      resultbuf->family = (uint8_t *) (resultbuf->addrs + ai_resp.addrslen);
+      if (ai_resp.canonlen != 0)
 	resultbuf->canon = (char *) (resultbuf->family + resultbuf->naddrs);
       else
 	resultbuf->canon = NULL;
@@ -137,10 +142,13 @@ __nscd_getai (const char *key, struct ns
 
 	  /* Try to detect corrupt databases.  */
 	  if (resultbuf->canon != NULL
-	      && resultbuf->canon[ai_resp->canonlen - 1] != '\0')
+	      && resultbuf->canon[ai_resp.canonlen - 1] != '\0')
 	    /* We cannot use the database.  */
 	    {
-	      free (resultbuf);
+	      if (mapped->head->gc_cycle != gc_cycle)
+		retval = -2;
+	      else
+		free (resultbuf);
 	      goto out_close;
 	    }
 
@@ -150,7 +158,7 @@ __nscd_getai (const char *key, struct ns
     }
   else
     {
-      if (__builtin_expect (ai_resp->found == -1, 0))
+      if (__builtin_expect (ai_resp.found == -1, 0))
 	{
 	  /* The daemon does not cache this database.  */
 	  __nss_not_use_nscd_hosts = 1;
@@ -158,7 +166,7 @@ __nscd_getai (const char *key, struct ns
 	}
 
       /* Store the error number.  */
-      *h_errnop = ai_resp->error;
+      *h_errnop = ai_resp.error;
 
       /* The `errno' to some value != ERANGE.  */
       __set_errno (ENOENT);
@@ -170,22 +178,25 @@ __nscd_getai (const char *key, struct ns
   if (sock != -1)
     close_not_cancel_no_status (sock);
  out:
-  if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0 && retval != -1)
+  if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0)
     {
       /* When we come here this means there has been a GC cycle while we
 	 were looking for the data.  This means the data might have been
 	 inconsistent.  Retry if possible.  */
-      if ((gc_cycle & 1) != 0)
+      if ((gc_cycle & 1) != 0 || ++nretries == 5 || retval == -1)
 	{
 	  /* nscd is just running gc now.  Disable using the mapping.  */
-	  __nscd_unmap (mapped);
+	  if (atomic_decrement_val (&mapped->counter) == 0)
+	    __nscd_unmap (mapped);
 	  mapped = NO_MAPPING;
 	}
 
-      *result = NULL;
-      free (resultbuf);
-
-      goto retry;
+      if (retval != -1)
+	{
+	  *result = NULL;
+	  free (resultbuf);
+	  goto retry;
+	}
     }
 
   return retval;
--- libc/nscd/nscd_getgr_r.c	15 May 2006 20:39:34 -0000	1.42
+++ libc/nscd/nscd_getgr_r.c	31 Jan 2007 09:14:21 -0000	1.43
@@ -88,6 +89,7 @@ nscd_getgr_r (const char *key, size_t ke
 	      struct group **result)
 {
   int gc_cycle;
+  int nretries = 0;
   const uint32_t *len = NULL;
   size_t lensize = 0;
 
@@ -97,55 +99,59 @@ nscd_getgr_r (const char *key, size_t ke
 						       &__gr_map_handle,
 						       &gc_cycle);
  retry:;
-  const gr_response_header *gr_resp = NULL;
   const char *gr_name = NULL;
   size_t gr_name_len = 0;
   int retval = -1;
   const char *recend = (const char *) ~UINTMAX_C (0);
+  gr_response_header gr_resp;
 
   if (mapped != NO_MAPPING)
     {
-      const struct datahead *found = __nscd_cache_search (type, key, keylen,
-							  mapped);
+      struct datahead *found = __nscd_cache_search (type, key, keylen, mapped);
       if (found != NULL)
 	{
-	  gr_resp = &found->data[0].grdata;
-	  len = (const uint32_t *) (gr_resp + 1);
-	  /* The alignment is always sufficient.  */
-	  assert (((uintptr_t) len & (__alignof__ (*len) - 1)) == 0);
+	  len = (const uint32_t *) (&found->data[0].grdata + 1);
+	  gr_resp = found->data[0].grdata;
 	  gr_name = ((const char *) len
-		     + gr_resp->gr_mem_cnt * sizeof (uint32_t));
-	  gr_name_len = gr_resp->gr_name_len + gr_resp->gr_passwd_len;
+		     + gr_resp.gr_mem_cnt * sizeof (uint32_t));
+	  gr_name_len = gr_resp.gr_name_len + gr_resp.gr_passwd_len;
 	  recend = (const char *) found->data + found->recsize;
+	  /* Now check if we can trust gr_resp fields.  If GC is
+	     in progress, it can contain anything.  */
+	  if (mapped->head->gc_cycle != gc_cycle)
+	    {
+	      retval = -2;
+	      goto out;
+	    }
+
+	  /* The alignment is always sufficient, unless GC is in progress.  */
+	  assert (((uintptr_t) len & (__alignof__ (*len) - 1)) == 0);
 	}
     }
 
-  gr_response_header gr_resp_mem;
   int sock = -1;
-  if (gr_resp == NULL)
+  if (gr_name == NULL)
     {
-      sock = __nscd_open_socket (key, keylen, type, &gr_resp_mem,
-				 sizeof (gr_resp_mem));
+      sock = __nscd_open_socket (key, keylen, type, &gr_resp,
+				 sizeof (gr_resp));
       if (sock == -1)
 	{
 	  __nss_not_use_nscd_group = 1;
 	  goto out;
 	}
-
-      gr_resp = &gr_resp_mem;
     }
 
   /* No value found so far.  */
   *result = NULL;
 
-  if (__builtin_expect (gr_resp->found == -1, 0))
+  if (__builtin_expect (gr_resp.found == -1, 0))
     {
       /* The daemon does not cache this database.  */
       __nss_not_use_nscd_group = 1;
       goto out_close;
     }
 
-  if (gr_resp->found == 1)
+  if (gr_resp.found == 1)
     {
       struct iovec vec[2];
       char *p = buffer;
@@ -157,8 +163,8 @@ nscd_getgr_r (const char *key, size_t ke
 	 align the pointer.  */
       align = ((__alignof__ (char *) - (p - ((char *) 0)))
 	       & (__alignof__ (char *) - 1));
-      total_len = (align + (1 + gr_resp->gr_mem_cnt) * sizeof (char *)
-		   + gr_resp->gr_name_len + gr_resp->gr_passwd_len);
+      total_len = (align + (1 + gr_resp.gr_mem_cnt) * sizeof (char *)
+		   + gr_resp.gr_name_len + gr_resp.gr_passwd_len);
       if (__builtin_expect (buflen < total_len, 0))
 	{
 	no_room:
@@ -170,16 +176,16 @@ nscd_getgr_r (const char *key, size_t ke
 
       p += align;
       resultbuf->gr_mem = (char **) p;
-      p += (1 + gr_resp->gr_mem_cnt) * sizeof (char *);
+      p += (1 + gr_resp.gr_mem_cnt) * sizeof (char *);
 
       /* Set pointers for strings.  */
       resultbuf->gr_name = p;
-      p += gr_resp->gr_name_len;
+      p += gr_resp.gr_name_len;
       resultbuf->gr_passwd = p;
-      p += gr_resp->gr_passwd_len;
+      p += gr_resp.gr_passwd_len;
 
       /* Fill in what we know now.  */
-      resultbuf->gr_gid = gr_resp->gr_gid;
+      resultbuf->gr_gid = gr_resp.gr_gid;
 
       /* Read the length information, group name, and password.  */
       if (gr_name == NULL)
@@ -187,17 +193,17 @@ nscd_getgr_r (const char *key, size_t ke
 	  /* Allocate array to store lengths.  */
 	  if (lensize == 0)
 	    {
-	      lensize = gr_resp->gr_mem_cnt * sizeof (uint32_t);
+	      lensize = gr_resp.gr_mem_cnt * sizeof (uint32_t);
 	      len = (uint32_t *) alloca (lensize);
 	    }
-	  else if (gr_resp->gr_mem_cnt * sizeof (uint32_t) > lensize)
+	  else if (gr_resp.gr_mem_cnt * sizeof (uint32_t) > lensize)
 	    len = extend_alloca (len, lensize,
-				 gr_resp->gr_mem_cnt * sizeof (uint32_t));
+				 gr_resp.gr_mem_cnt * sizeof (uint32_t));
 
 	  vec[0].iov_base = (void *) len;
-	  vec[0].iov_len = gr_resp->gr_mem_cnt * sizeof (uint32_t);
+	  vec[0].iov_len = gr_resp.gr_mem_cnt * sizeof (uint32_t);
 	  vec[1].iov_base = resultbuf->gr_name;
-	  vec[1].iov_len = gr_resp->gr_name_len + gr_resp->gr_passwd_len;
+	  vec[1].iov_len = gr_resp.gr_name_len + gr_resp.gr_passwd_len;
 	  total_len = vec[0].iov_len + vec[1].iov_len;
 
 	  /* Get this data.  */
@@ -209,14 +215,14 @@ nscd_getgr_r (const char *key, size_t ke
 	/* We already have the data.  Just copy the group name and
 	   password.  */
 	memcpy (resultbuf->gr_name, gr_name,
-		gr_resp->gr_name_len + gr_resp->gr_passwd_len);
+		gr_resp.gr_name_len + gr_resp.gr_passwd_len);
 
       /* Clear the terminating entry.  */
-      resultbuf->gr_mem[gr_resp->gr_mem_cnt] = NULL;
+      resultbuf->gr_mem[gr_resp.gr_mem_cnt] = NULL;
 
       /* Prepare reading the group members.  */
       total_len = 0;
-      for (cnt = 0; cnt < gr_resp->gr_mem_cnt; ++cnt)
+      for (cnt = 0; cnt < gr_resp.gr_mem_cnt; ++cnt)
 	{
 	  resultbuf->gr_mem[cnt] = p;
 	  total_len += len[cnt];
@@ -224,9 +230,25 @@ nscd_getgr_r (const char *key, size_t ke
 	}
 
       if (__builtin_expect (gr_name + gr_name_len + total_len > recend, 0))
-	goto out_close;
+	{
+	  /* len array might contain garbage during nscd GC cycle,
+	     retry rather than fail in that case.  */
+	  if (gr_name != NULL && mapped->head->gc_cycle != gc_cycle)
+	    retval = -2;
+	  goto out_close;
+	}
       if (__builtin_expect (total_len > buflen, 0))
-	goto no_room;
+	{
+	  /* len array might contain garbage during nscd GC cycle,
+	     retry rather than fail in that case.  */
+	  if (gr_name != NULL && mapped->head->gc_cycle != gc_cycle)
+	    {
+	      retval = -2;
+	      goto out_close;
+	    }
+	  else
+	    goto no_room;
+	}
 
       retval = 0;
       if (gr_name == NULL)
@@ -248,14 +270,14 @@ nscd_getgr_r (const char *key, size_t ke
 
 	  /* Try to detect corrupt databases.  */
 	  if (resultbuf->gr_name[gr_name_len - 1] != '\0'
-	      || resultbuf->gr_passwd[gr_resp->gr_passwd_len - 1] != '\0'
-	      || ({for (cnt = 0; cnt < gr_resp->gr_mem_cnt; ++cnt)
+	      || resultbuf->gr_passwd[gr_resp.gr_passwd_len - 1] != '\0'
+	      || ({for (cnt = 0; cnt < gr_resp.gr_mem_cnt; ++cnt)
 		     if (resultbuf->gr_mem[cnt][len[cnt] - 1] != '\0')
 		       break;
-	  	   cnt < gr_resp->gr_mem_cnt; }))
+	  	   cnt < gr_resp.gr_mem_cnt; }))
 	    {
 	      /* We cannot use the database.  */
-	      retval = -1;
+	      retval = mapped->head->gc_cycle != gc_cycle ? -2 : -1;
 	      goto out_close;
 	    }
 
@@ -274,19 +296,21 @@ nscd_getgr_r (const char *key, size_t ke
   if (sock != -1)
     close_not_cancel_no_status (sock);
  out:
-  if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0 && retval != -1)
+  if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0)
     {
       /* When we come here this means there has been a GC cycle while we
 	 were looking for the data.  This means the data might have been
 	 inconsistent.  Retry if possible.  */
-      if ((gc_cycle & 1) != 0)
+      if ((gc_cycle & 1) != 0 || ++nretries == 5 || retval == -1)
 	{
 	  /* nscd is just running gc now.  Disable using the mapping.  */
-	  __nscd_unmap (mapped);
+	  if (atomic_decrement_val (&mapped->counter) == 0)
+	    __nscd_unmap (mapped);
 	  mapped = NO_MAPPING;
 	}
 
-      goto retry;
+      if (retval != -1)
+	goto retry;
     }
 
   return retval;
--- libc/nscd/nscd_gethst_r.c	13 Jan 2007 07:30:16 -0000	1.35
+++ libc/nscd/nscd_gethst_r.c	31 Jan 2007 09:14:21 -0000	1.36
@@ -118,7 +118,6 @@ nscd_gethst_r (const char *key, size_t k
 			       &gc_cycle);
 
  retry:;
-  const hst_response_header *hst_resp = NULL;
   const char *h_name = NULL;
   const uint32_t *aliases_len = NULL;
   const char *addr_list = NULL;
@@ -126,18 +125,27 @@ nscd_gethst_r (const char *key, size_t k
   int retval = -1;
   const char *recend = (const char *) ~UINTMAX_C (0);
   int sock = -1;
+  hst_response_header hst_resp;
   if (mapped != NO_MAPPING)
     {
-      const struct datahead *found = __nscd_cache_search (type, key, keylen,
-							  mapped);
+      /* No const qualifier, as it can change during garbage collection.  */
+      struct datahead *found = __nscd_cache_search (type, key, keylen, mapped);
       if (found != NULL)
 	{
-	  hst_resp = &found->data[0].hstdata;
-	  h_name = (char *) (hst_resp + 1);
-	  aliases_len = (uint32_t *) (h_name + hst_resp->h_name_len);
+	  h_name = (char *) (&found->data[0].hstdata + 1);
+	  hst_resp = found->data[0].hstdata;
+	  aliases_len = (uint32_t *) (h_name + hst_resp.h_name_len);
 	  addr_list = ((char *) aliases_len
-		       + hst_resp->h_aliases_cnt * sizeof (uint32_t));
-	  addr_list_len = hst_resp->h_addr_list_cnt * INADDRSZ;
+		       + hst_resp.h_aliases_cnt * sizeof (uint32_t));
+	  addr_list_len = hst_resp.h_addr_list_cnt * INADDRSZ;
+	  recend = (const char *) found->data + found->recsize;
+	  /* Now check if we can trust hst_resp fields.  If GC is
+	     in progress, it can contain anything.  */
+	  if (mapped->head->gc_cycle != gc_cycle)
+	    {
+	      retval = -2;
+	      goto out;
+	    }
 
 #ifndef _STRING_ARCH_unaligned
 	  /* The aliases_len array in the mapped database might very
@@ -147,51 +155,47 @@ nscd_gethst_r (const char *key, size_t k
 	  if (((uintptr_t) aliases_len & (__alignof__ (*aliases_len) - 1))
 	      != 0)
 	    {
-	      uint32_t *tmp = alloca (hst_resp->h_aliases_cnt
+	      uint32_t *tmp = alloca (hst_resp.h_aliases_cnt
 				      * sizeof (uint32_t));
 	      aliases_len = memcpy (tmp, aliases_len,
-				    hst_resp->h_aliases_cnt
+				    hst_resp.h_aliases_cnt
 				    * sizeof (uint32_t));
 	    }
 #endif
 	  if (type != GETHOSTBYADDR && type != GETHOSTBYNAME)
 	    {
-	      if (hst_resp->h_length == INADDRSZ)
+	      if (hst_resp.h_length == INADDRSZ)
 		addr_list += addr_list_len;
-	      addr_list_len = hst_resp->h_addr_list_cnt * IN6ADDRSZ;
+	      addr_list_len = hst_resp.h_addr_list_cnt * IN6ADDRSZ;
 	    }
-	  recend = (const char *) found->data + found->recsize;
 	  if (__builtin_expect ((const char *) addr_list + addr_list_len
 				> recend, 0))
-	    goto out_close;
+	    goto out;
 	}
     }
 
-  hst_response_header hst_resp_mem;
-  if (hst_resp == NULL)
+  if (h_name == NULL)
     {
-      sock = __nscd_open_socket (key, keylen, type, &hst_resp_mem,
-				 sizeof (hst_resp_mem));
+      sock = __nscd_open_socket (key, keylen, type, &hst_resp,
+				 sizeof (hst_resp));
       if (sock == -1)
 	{
 	  __nss_not_use_nscd_hosts = 1;
-	  goto out;;
+	  goto out;
 	}
-
-      hst_resp = &hst_resp_mem;
     }
 
   /* No value found so far.  */
   *result = NULL;
 
-  if (__builtin_expect (hst_resp->found == -1, 0))
+  if (__builtin_expect (hst_resp.found == -1, 0))
     {
       /* The daemon does not cache this database.  */
       __nss_not_use_nscd_hosts = 1;
       goto out_close;
     }
 
-  if (hst_resp->found == 1)
+  if (hst_resp.found == 1)
     {
       struct iovec vec[4];
       char *cp = buffer;
@@ -207,15 +211,15 @@ nscd_gethst_r (const char *key, size_t k
 	 align the pointer and the base of the h_addr_list pointers.  */
       align1 = ((__alignof__ (char *) - (cp - ((char *) 0)))
 		& (__alignof__ (char *) - 1));
-      align2 = ((__alignof__ (char *) - ((cp + align1 + hst_resp->h_name_len)
+      align2 = ((__alignof__ (char *) - ((cp + align1 + hst_resp.h_name_len)
 					 - ((char *) 0)))
 		& (__alignof__ (char *) - 1));
-      if (buflen < (align1 + hst_resp->h_name_len + align2
-		    + ((hst_resp->h_aliases_cnt + hst_resp->h_addr_list_cnt
+      if (buflen < (align1 + hst_resp.h_name_len + align2
+		    + ((hst_resp.h_aliases_cnt + hst_resp.h_addr_list_cnt
 			+ 2)
 		       * sizeof (char *))
-		    + hst_resp->h_addr_list_cnt * (type == AF_INET
-						   ? INADDRSZ : IN6ADDRSZ)))
+		    + hst_resp.h_addr_list_cnt * (type == AF_INET
+						  ? INADDRSZ : IN6ADDRSZ)))
 	{
 	no_room:
 	  *h_errnop = NETDB_INTERNAL;
@@ -227,12 +231,12 @@ nscd_gethst_r (const char *key, size_t k
 
       /* Prepare the result as far as we can.  */
       resultbuf->h_aliases = (char **) cp;
-      cp += (hst_resp->h_aliases_cnt + 1) * sizeof (char *);
+      cp += (hst_resp.h_aliases_cnt + 1) * sizeof (char *);
       resultbuf->h_addr_list = (char **) cp;
-      cp += (hst_resp->h_addr_list_cnt + 1) * sizeof (char *);
+      cp += (hst_resp.h_addr_list_cnt + 1) * sizeof (char *);
 
       resultbuf->h_name = cp;
-      cp += hst_resp->h_name_len + align2;
+      cp += hst_resp.h_name_len + align2;
 
       if (type == GETHOSTBYADDR || type == GETHOSTBYNAME)
 	{
@@ -244,7 +248,7 @@ nscd_gethst_r (const char *key, size_t k
 	  resultbuf->h_addrtype = AF_INET6;
 	  resultbuf->h_length = IN6ADDRSZ;
 	}
-      for (cnt = 0; cnt < hst_resp->h_addr_list_cnt; ++cnt)
+      for (cnt = 0; cnt < hst_resp.h_addr_list_cnt; ++cnt)
 	{
 	  resultbuf->h_addr_list[cnt] = cp;
 	  cp += resultbuf->h_length;
@@ -254,47 +258,47 @@ nscd_gethst_r (const char *key, size_t k
       if (h_name == NULL)
 	{
 	  vec[0].iov_base = resultbuf->h_name;
-	  vec[0].iov_len = hst_resp->h_name_len;
-	  total_len = hst_resp->h_name_len;
+	  vec[0].iov_len = hst_resp.h_name_len;
+	  total_len = hst_resp.h_name_len;
 	  n = 1;
 
-	  if (hst_resp->h_aliases_cnt > 0)
+	  if (hst_resp.h_aliases_cnt > 0)
 	    {
-	      aliases_len = alloca (hst_resp->h_aliases_cnt
+	      aliases_len = alloca (hst_resp.h_aliases_cnt
 				    * sizeof (uint32_t));
 	      vec[n].iov_base = (void *) aliases_len;
-	      vec[n].iov_len = hst_resp->h_aliases_cnt * sizeof (uint32_t);
+	      vec[n].iov_len = hst_resp.h_aliases_cnt * sizeof (uint32_t);
 
-	      total_len += hst_resp->h_aliases_cnt * sizeof (uint32_t);
+	      total_len += hst_resp.h_aliases_cnt * sizeof (uint32_t);
 	      ++n;
 	    }
 
 	  if (type == GETHOSTBYADDR || type == GETHOSTBYNAME)
 	    {
 	      vec[n].iov_base = resultbuf->h_addr_list[0];
-	      vec[n].iov_len = hst_resp->h_addr_list_cnt * INADDRSZ;
+	      vec[n].iov_len = hst_resp.h_addr_list_cnt * INADDRSZ;
 
-	      total_len += hst_resp->h_addr_list_cnt * INADDRSZ;
+	      total_len += hst_resp.h_addr_list_cnt * INADDRSZ;
 
 	      ++n;
 	    }
 	  else
 	    {
-	      if (hst_resp->h_length == INADDRSZ)
+	      if (hst_resp.h_length == INADDRSZ)
 		{
-		  ignore = alloca (hst_resp->h_addr_list_cnt * INADDRSZ);
+		  ignore = alloca (hst_resp.h_addr_list_cnt * INADDRSZ);
 		  vec[n].iov_base = ignore;
-		  vec[n].iov_len = hst_resp->h_addr_list_cnt * INADDRSZ;
+		  vec[n].iov_len = hst_resp.h_addr_list_cnt * INADDRSZ;
 
-		  total_len += hst_resp->h_addr_list_cnt * INADDRSZ;
+		  total_len += hst_resp.h_addr_list_cnt * INADDRSZ;
 
 		  ++n;
 		}
 
 	      vec[n].iov_base = resultbuf->h_addr_list[0];
-	      vec[n].iov_len = hst_resp->h_addr_list_cnt * IN6ADDRSZ;
+	      vec[n].iov_len = hst_resp.h_addr_list_cnt * IN6ADDRSZ;
 
-	      total_len += hst_resp->h_addr_list_cnt * IN6ADDRSZ;
+	      total_len += hst_resp.h_addr_list_cnt * IN6ADDRSZ;
 
 	      ++n;
 	    }
@@ -304,13 +308,13 @@ nscd_gethst_r (const char *key, size_t k
 	}
       else
 	{
-	  memcpy (resultbuf->h_name, h_name, hst_resp->h_name_len);
+	  memcpy (resultbuf->h_name, h_name, hst_resp.h_name_len);
 	  memcpy (resultbuf->h_addr_list[0], addr_list, addr_list_len);
 	}
 
       /*  Now we also can read the aliases.  */
       total_len = 0;
-      for (cnt = 0; cnt < hst_resp->h_aliases_cnt; ++cnt)
+      for (cnt = 0; cnt < hst_resp.h_aliases_cnt; ++cnt)
 	{
 	  resultbuf->h_aliases[cnt] = cp;
 	  cp += aliases_len[cnt];
@@ -320,10 +324,25 @@ nscd_gethst_r (const char *key, size_t k
 
       if (__builtin_expect ((const char *) addr_list + addr_list_len
 			    + total_len > recend, 0))
-	goto out_close;
+	{
+	  /* aliases_len array might contain garbage during nscd GC cycle,
+	     retry rather than fail in that case.  */
+	  if (addr_list != NULL && mapped->head->gc_cycle != gc_cycle)
+	    retval = -2;
+	  goto out_close;
+	}
       /* See whether this would exceed the buffer capacity.  */
       if (__builtin_expect (cp > buffer + buflen, 0))
-	goto no_room;
+	{
+	  /* aliases_len array might contain garbage during nscd GC cycle,
+	     retry rather than fail in that case.  */
+	  if (addr_list != NULL && mapped->head->gc_cycle != gc_cycle)
+	    {
+	      retval = -2;
+	      goto out_close;
+	    }
+	  goto no_room;
+	}
 
       /* And finally read the aliases.  */
       if (addr_list == NULL)
@@ -342,14 +361,18 @@ nscd_gethst_r (const char *key, size_t k
 		  (const char *) addr_list + addr_list_len, total_len);
 
 	  /* Try to detect corrupt databases.  */
-	  if (resultbuf->h_name[hst_resp->h_name_len - 1] != '\0'
-	      || ({for (cnt = 0; cnt < hst_resp->h_aliases_cnt; ++cnt)
+	  if (resultbuf->h_name[hst_resp.h_name_len - 1] != '\0'
+	      || ({for (cnt = 0; cnt < hst_resp.h_aliases_cnt; ++cnt)
 		     if (resultbuf->h_aliases[cnt][aliases_len[cnt] - 1]
 			 != '\0')
 		       break;
-		   cnt < hst_resp->h_aliases_cnt; }))
-	    /* We cannot use the database.  */
-	    goto out_close;
+		   cnt < hst_resp.h_aliases_cnt; }))
+	    {
+	      /* We cannot use the database.  */
+	      if (mapped->head->gc_cycle != gc_cycle)
+		retval = -2;
+	      goto out_close;
+	    }
 
 	  retval = 0;
 	  *result = resultbuf;
@@ -358,7 +381,7 @@ nscd_gethst_r (const char *key, size_t k
   else
     {
       /* Store the error number.  */
-      *h_errnop = hst_resp->error;
+      *h_errnop = hst_resp.error;
 
       /* The `errno' to some value != ERANGE.  */
       __set_errno (ENOENT);
@@ -370,19 +393,21 @@ nscd_gethst_r (const char *key, size_t k
   if (sock != -1)
     close_not_cancel_no_status (sock);
  out:
-  if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0 && retval != -1)
+  if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0)
     {
       /* When we come here this means there has been a GC cycle while we
 	 were looking for the data.  This means the data might have been
 	 inconsistent.  Retry if possible.  */
-      if ((gc_cycle & 1) != 0 || ++nretries == 5)
+      if ((gc_cycle & 1) != 0 || ++nretries == 5 || retval == -1)
 	{
 	  /* nscd is just running gc now.  Disable using the mapping.  */
-	  __nscd_unmap (mapped);
+	  if (atomic_decrement_val (&mapped->counter) == 0)
+	    __nscd_unmap (mapped);
 	  mapped = NO_MAPPING;
 	}
 
-      goto retry;
+      if (retval != -1)
+	goto retry;
     }
 
   return retval;
--- libc/nscd/nscd_getpw_r.c	22 Sep 2005 14:35:11 -0000	1.31
+++ libc/nscd/nscd_getpw_r.c	31 Jan 2007 09:14:21 -0000	1.32
@@ -88,76 +89,81 @@ nscd_getpw_r (const char *key, size_t ke
 	      struct passwd **result)
 {
   int gc_cycle;
+  int nretries = 0;
+
   /* If the mapping is available, try to search there instead of
      communicating with the nscd.  */
   struct mapped_database *mapped;
   mapped = __nscd_get_map_ref (GETFDPW, "passwd", &map_handle, &gc_cycle);
 
  retry:;
-  const pw_response_header *pw_resp = NULL;
   const char *pw_name = NULL;
   int retval = -1;
   const char *recend = (const char *) ~UINTMAX_C (0);
+  pw_response_header pw_resp;
 
   if (mapped != NO_MAPPING)
     {
-      const struct datahead *found = __nscd_cache_search (type, key, keylen,
-							  mapped);
+      struct datahead *found = __nscd_cache_search (type, key, keylen, mapped);
       if (found != NULL)
 	{
-	  pw_resp = &found->data[0].pwdata;
-	  pw_name = (const char *) (pw_resp + 1);
+	  pw_name = (const char *) (&found->data[0].pwdata + 1);
+	  pw_resp = found->data[0].pwdata;
 	  recend = (const char *) found->data + found->recsize;
+	  /* Now check if we can trust pw_resp fields.  If GC is
+	     in progress, it can contain anything.  */
+	  if (mapped->head->gc_cycle != gc_cycle)
+	    {
+	      retval = -2;
+	      goto out;
+	    }
 	}
     }
 
-  pw_response_header pw_resp_mem;
   int sock = -1;
-  if (pw_resp == NULL)
+  if (pw_name == NULL)
     {
-      sock = __nscd_open_socket (key, keylen, type, &pw_resp_mem,
-				 sizeof (pw_resp_mem));
+      sock = __nscd_open_socket (key, keylen, type, &pw_resp,
+				 sizeof (pw_resp));
       if (sock == -1)
 	{
 	  __nss_not_use_nscd_passwd = 1;
 	  goto out;
 	}
-
-      pw_resp = &pw_resp_mem;
     }
 
   /* No value found so far.  */
   *result = NULL;
 
-  if (__builtin_expect (pw_resp->found == -1, 0))
+  if (__builtin_expect (pw_resp.found == -1, 0))
     {
       /* The daemon does not cache this database.  */
       __nss_not_use_nscd_passwd = 1;
       goto out_close;
     }
 
-  if (pw_resp->found == 1)
+  if (pw_resp.found == 1)
     {
       /* Set the information we already have.  */
-      resultbuf->pw_uid = pw_resp->pw_uid;
-      resultbuf->pw_gid = pw_resp->pw_gid;
+      resultbuf->pw_uid = pw_resp.pw_uid;
+      resultbuf->pw_gid = pw_resp.pw_gid;
 
       char *p = buffer;
       /* get pw_name */
       resultbuf->pw_name = p;
-      p += pw_resp->pw_name_len;
+      p += pw_resp.pw_name_len;
       /* get pw_passwd */
       resultbuf->pw_passwd = p;
-      p += pw_resp->pw_passwd_len;
+      p += pw_resp.pw_passwd_len;
       /* get pw_gecos */
       resultbuf->pw_gecos = p;
-      p += pw_resp->pw_gecos_len;
+      p += pw_resp.pw_gecos_len;
       /* get pw_dir */
       resultbuf->pw_dir = p;
-      p += pw_resp->pw_dir_len;
+      p += pw_resp.pw_dir_len;
       /* get pw_pshell */
       resultbuf->pw_shell = p;
-      p += pw_resp->pw_shell_len;
+      p += pw_resp.pw_shell_len;
 
       ssize_t total = p - buffer;
       if (__builtin_expect (pw_name + total > recend, 0))
@@ -189,14 +195,14 @@ nscd_getpw_r (const char *key, size_t ke
 	  memcpy (resultbuf->pw_name, pw_name, total);
 
 	  /* Try to detect corrupt databases.  */
-	  if (resultbuf->pw_name[pw_resp->pw_name_len - 1] != '\0'
-	      || resultbuf->pw_passwd[pw_resp->pw_passwd_len - 1] != '\0'
-	      || resultbuf->pw_gecos[pw_resp->pw_gecos_len - 1] != '\0'
-	      || resultbuf->pw_dir[pw_resp->pw_dir_len - 1] != '\0'
-	      || resultbuf->pw_shell[pw_resp->pw_shell_len - 1] != '\0')
+	  if (resultbuf->pw_name[pw_resp.pw_name_len - 1] != '\0'
+	      || resultbuf->pw_passwd[pw_resp.pw_passwd_len - 1] != '\0'
+	      || resultbuf->pw_gecos[pw_resp.pw_gecos_len - 1] != '\0'
+	      || resultbuf->pw_dir[pw_resp.pw_dir_len - 1] != '\0'
+	      || resultbuf->pw_shell[pw_resp.pw_shell_len - 1] != '\0')
 	    {
 	      /* We cannot use the database.  */
-	      retval = -1;
+	      retval = mapped->head->gc_cycle != gc_cycle ? -2 : -1;
 	      goto out_close;
 	    }
 
@@ -215,19 +221,21 @@ nscd_getpw_r (const char *key, size_t ke
   if (sock != -1)
     close_not_cancel_no_status (sock);
  out:
-  if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0 && retval != -1)
+  if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0)
     {
       /* When we come here this means there has been a GC cycle while we
 	 were looking for the data.  This means the data might have been
 	 inconsistent.  Retry if possible.  */
-      if ((gc_cycle & 1) != 0)
+      if ((gc_cycle & 1) != 0 || ++nretries == 5 || retval == -1)
 	{
 	  /* nscd is just running gc now.  Disable using the mapping.  */
-	  __nscd_unmap (mapped);
+	  if (atomic_decrement_val (&mapped->counter) == 0)
+	    __nscd_unmap (mapped);
 	  mapped = NO_MAPPING;
 	}
 
-      goto retry;
+      if (retval != -1)
+	goto retry;
     }
 
   return retval;
--- libc/nscd/nscd_helper.c	2 Oct 2006 16:33:51 -0000	1.17
+++ libc/nscd/nscd_helper.c	31 Jan 2007 09:14:21 -0000	1.18
@@ -21,6 +22,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdbool.h>
+#include <string.h>
 #include <time.h>
 #include <unistd.h>
 #include <sys/mman.h>
@@ -362,7 +364,10 @@ __nscd_get_map_ref (request_type type, c
 }
 
 
-const struct datahead *
+/* Don't return const struct datahead *, as eventhough the record
+   is normally constant, it can change arbitrarily during nscd
+   garbage collection.  */
+struct datahead *
 __nscd_cache_search (request_type type, const char *key, size_t keylen,
 		     const struct mapped_database *mapped)
 {
@@ -374,16 +379,32 @@ __nscd_cache_search (request_type type, 
     {
       struct hashentry *here = (struct hashentry *) (mapped->data + work);
 
+#ifndef _STRING_ARCH_unaligned
+      /* Although during garbage collection when moving struct hashentry
+	 records around we first copy from old to new location and then
+	 adjust pointer from previous hashentry to it, there is no barrier
+	 between those memory writes.  It is very unlikely to hit it,
+	 so check alignment only if a misaligned load can crash the
+	 application.  */
+      if ((uintptr_t) here & (__alignof__ (*here) - 1))
+	return NULL;
+#endif
+
       if (type == here->type
 	  && keylen == here->len
-	  && here->key + here->len <= datasize
+	  && here->key + keylen <= datasize
 	  && memcmp (key, mapped->data + here->key, keylen) == 0
 	  && here->packet + sizeof (struct datahead) <= datasize)
 	{
 	  /* We found the entry.  Increment the appropriate counter.  */
-	  const struct datahead *dh
+	  struct datahead *dh
 	    = (struct datahead *) (mapped->data + here->packet);
 
+#ifndef _STRING_ARCH_unaligned
+	  if ((uintptr_t) dh & (__alignof__ (*dh) - 1))
+	    return NULL;
+#endif
+
 	  /* See whether we must ignore the entry or whether something
 	     is wrong because garbage collection is in progress.  */
 	  if (dh->usable && here->packet + dh->allocsize <= datasize)
--- libc/nscd/nscd_initgroups.c	29 Sep 2006 17:05:21 -0000	1.11
+++ libc/nscd/nscd_initgroups.c	31 Jan 2007 09:14:21 -0000	1.12
@@ -39,6 +39,7 @@ __nscd_getgrouplist (const char *user, g
 {
   size_t userlen = strlen (user) + 1;
   int gc_cycle;
+  int nretries = 0;
 
   /* If the mapping is available, try to search there instead of
      communicating with the nscd.  */
@@ -46,44 +47,49 @@ __nscd_getgrouplist (const char *user, g
   mapped = __nscd_get_map_ref (GETFDGR, "group", &__gr_map_handle, &gc_cycle);
 
  retry:;
-  const initgr_response_header *initgr_resp = NULL;
   char *respdata = NULL;
   int retval = -1;
   int sock = -1;
+  initgr_response_header initgr_resp;
 
   if (mapped != NO_MAPPING)
     {
-      const struct datahead *found = __nscd_cache_search (INITGROUPS, user,
-							  userlen, mapped);
+      struct datahead *found = __nscd_cache_search (INITGROUPS, user,
+						    userlen, mapped);
       if (found != NULL)
 	{
-	  initgr_resp = &found->data[0].initgrdata;
-	  respdata = (char *) (initgr_resp + 1);
+	  respdata = (char *) (&found->data[0].initgrdata + 1);
+	  initgr_resp = found->data[0].initgrdata;
 	  char *recend = (char *) found->data + found->recsize;
 
-	  if (respdata + initgr_resp->ngrps * sizeof (int32_t) > recend)
+	  /* Now check if we can trust initgr_resp fields.  If GC is
+	     in progress, it can contain anything.  */
+	  if (mapped->head->gc_cycle != gc_cycle)
+	    {
+	      retval = -2;
+	      goto out;
+	    }
+
+	  if (respdata + initgr_resp.ngrps * sizeof (int32_t) > recend)
 	    goto out;
 	}
     }
 
   /* If we do not have the cache mapped, try to get the data over the
      socket.  */
-  initgr_response_header initgr_resp_mem;
-  if (initgr_resp == NULL)
+  if (respdata == NULL)
     {
-      sock = __nscd_open_socket (user, userlen, INITGROUPS, &initgr_resp_mem,
-				 sizeof (initgr_resp_mem));
+      sock = __nscd_open_socket (user, userlen, INITGROUPS, &initgr_resp,
+				 sizeof (initgr_resp));
       if (sock == -1)
 	{
 	  /* nscd not running or wrong version.  */
 	  __nss_not_use_nscd_group = 1;
 	  goto out;
 	}
-
-      initgr_resp = &initgr_resp_mem;
     }
 
-  if (initgr_resp->found == 1)
+  if (initgr_resp.found == 1)
     {
       /* The following code assumes that gid_t and int32_t are the
 	 same size.  This is the case for al existing implementation.
@@ -91,40 +97,40 @@ __nscd_getgrouplist (const char *user, g
 	 doesn't use memcpy but instead copies each array element one
 	 by one.  */
       assert (sizeof (int32_t) == sizeof (gid_t));
-      assert (initgr_resp->ngrps >= 0);
+      assert (initgr_resp.ngrps >= 0);
 
       /* Make sure we have enough room.  We always count GROUP in even
 	 though we might not end up adding it.  */
-      if (*size < initgr_resp->ngrps + 1)
+      if (*size < initgr_resp.ngrps + 1)
 	{
 	  gid_t *newp = realloc (*groupsp,
-				 (initgr_resp->ngrps + 1) * sizeof (gid_t));
+				 (initgr_resp.ngrps + 1) * sizeof (gid_t));
 	  if (newp == NULL)
 	    /* We cannot increase the buffer size.  */
 	    goto out_close;
 
 	  *groupsp = newp;
-	  *size = initgr_resp->ngrps + 1;
+	  *size = initgr_resp.ngrps + 1;
 	}
 
       if (respdata == NULL)
 	{
 	  /* Read the data from the socket.  */
-	  if ((size_t) __readall (sock, *groupsp, initgr_resp->ngrps
+	  if ((size_t) __readall (sock, *groupsp, initgr_resp.ngrps
 						  * sizeof (gid_t))
-	      == initgr_resp->ngrps * sizeof (gid_t))
-	    retval = initgr_resp->ngrps;
+	      == initgr_resp.ngrps * sizeof (gid_t))
+	    retval = initgr_resp.ngrps;
 	}
       else
 	{
 	  /* Just copy the data.  */
-	  retval = initgr_resp->ngrps;
+	  retval = initgr_resp.ngrps;
 	  memcpy (*groupsp, respdata, retval * sizeof (gid_t));
 	}
     }
   else
     {
-      if (__builtin_expect (initgr_resp->found == -1, 0))
+      if (__builtin_expect (initgr_resp.found == -1, 0))
 	{
 	  /* The daemon does not cache this database.  */
 	  __nss_not_use_nscd_group = 1;
@@ -153,19 +159,21 @@ __nscd_getgrouplist (const char *user, g
   if (sock != -1)
     close_not_cancel_no_status (sock);
  out:
-  if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0 && retval != -1)
+  if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0)
     {
       /* When we come here this means there has been a GC cycle while we
 	 were looking for the data.  This means the data might have been
 	 inconsistent.  Retry if possible.  */
-      if ((gc_cycle & 1) != 0)
+      if ((gc_cycle & 1) != 0 || ++nretries == 5 || retval == -1)
 	{
 	  /* nscd is just running gc now.  Disable using the mapping.  */
-	  __nscd_unmap (mapped);
+	  if (atomic_decrement_val (&mapped->counter) == 0)
+	    __nscd_unmap (mapped);
 	  mapped = NO_MAPPING;
 	}
 
-      goto retry;
+      if (retval != -1)
+	goto retry;
     }
 
   return retval;

glibc-rh228103.patch:
 lowlevellock.S |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE glibc-rh228103.patch ---
2007-02-09  Jakub Jelinek  <jakub at redhat.com>

	* sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
	(__lll_mutex_timedlock_wait): Use correct pointer when we don't
	call into the kernel to delay.

--- libc/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	17 Jan 2007 09:33:20 -0000	1.16
+++ libc/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	10 Feb 2007 00:04:24 -0000	1.17
@@ -164,7 +164,7 @@ __lll_mutex_timedlock_wait:
 8:				/* NB: %edx == 2 */
 	xorl	%eax, %eax
 	LOCK
-	cmpxchgl %edx, (%rdi)
+	cmpxchgl %edx, (%r12)
 	jnz	7f
 
 6:	addq	$16, %rsp

glibc-rh230151.patch:
 nscd/gai.c                         |    3 +
 sysdeps/unix/sysv/linux/check_pf.c |   40 +++++++++++++++++---
 sysdeps/unix/sysv/linux/ifaddrs.c  |   73 ++++++++-----------------------------
 3 files changed, 53 insertions(+), 63 deletions(-)

--- NEW FILE glibc-rh230151.patch ---
2007-04-25  Jakub Jelinek  <jakub at redhat.com>

	* sysdeps/unix/sysv/linux/check_pf.c (make_request): Return -1 instead
	of 0 after the out_fail label.

2007-03-18  Jakub Jelinek  <jakub at redhat.com>

	* nscd/gai.c: Include alloca.h.
	(__libc_use_alloca): Define.

2007-03-15  Jakub Jelinek  <jakub at redhat.com>

	* sysdeps/unix/sysv/linux/ifaddrs.c (__netlink_request): Never
	reallocate the buffer, instead fail for MSG_TRUNC or for EBUSY
	NLMSG_ERR.  Instead use a page sized buffer.
	* sysdeps/unix/sysv/linux/check_pf.c (make_request): Use page sized
	buffer.

2007-03-02  Jakub Jelinek  <jakub at redhat.com>

	* sysdeps/unix/sysv/linux/ifaddrs.c (__netlink_request): Retry with
	a new netlink socket if NLMSG_ERR -EBUSY is seen after some MSG_TRUNC
	message.

2007-02-27  Jakub Jelinek  <jakub at redhat.com>

	* sysdeps/unix/sysv/linux/ifaddrs.c (__netlink_request): Fix
	memory reallocation.

--- libc/sysdeps/unix/sysv/linux/ifaddrs.c	19 May 2006 07:46:03 -0000	1.16
+++ libc/sysdeps/unix/sysv/linux/ifaddrs.c	15 Mar 2007 20:02:11 -0000	1.19
@@ -122,36 +122,36 @@ int
 __netlink_request (struct netlink_handle *h, int type)
 {
   struct netlink_res *nlm_next;
-  struct netlink_res **new_nlm_list;
-  static volatile size_t buf_size = 4096;
-  char *buf;
   struct sockaddr_nl nladdr;
   struct nlmsghdr *nlmh;
   ssize_t read_len;
   bool done = false;
-  bool use_malloc = false;
 
-  if (__netlink_sendreq (h, type) < 0)
-    return -1;
+#ifdef PAGE_SIZE
+  /* Help the compiler optimize out the malloc call if PAGE_SIZE
+     is constant and smaller or equal to PTHREAD_STACK_MIN/4.  */
+  const size_t buf_size = PAGE_SIZE;
+#else
+  const size_t buf_size = __getpagesize ();
+#endif
+  bool use_malloc = false;
+  char *buf;
 
-  size_t this_buf_size = buf_size;
-  if (__libc_use_alloca (this_buf_size))
-    buf = alloca (this_buf_size);
+  if (__libc_use_alloca (buf_size))
+    buf = alloca (buf_size);
   else
     {
-      buf = malloc (this_buf_size);
+      buf = malloc (buf_size);
       if (buf != NULL)
 	use_malloc = true;
       else
 	goto out_fail;
     }
 
-  struct iovec iov = { buf, this_buf_size };
+  struct iovec iov = { buf, buf_size };
 
-  if (h->nlm_list != NULL)
-    new_nlm_list = &h->end_ptr->next;
-  else
-    new_nlm_list = &h->nlm_list;
+  if (__netlink_sendreq (h, type) < 0)
+    goto out_fail;
 
   while (! done)
     {
@@ -171,48 +171,7 @@ __netlink_request (struct netlink_handle
 	continue;
 
       if (__builtin_expect (msg.msg_flags & MSG_TRUNC, 0))
-	{
-	  if (this_buf_size >= SIZE_MAX / 2)
-	    goto out_fail;
-
-	  nlm_next = *new_nlm_list;
-	  while (nlm_next != NULL)
-	    {
-	      struct netlink_res *tmpptr;
-
-	      tmpptr = nlm_next->next;
-	      free (nlm_next);
-	      nlm_next = tmpptr;
-	    }
-	  *new_nlm_list = NULL;
-
-	  if (__libc_use_alloca (2 * this_buf_size))
-	    buf = extend_alloca (buf, this_buf_size, 2 * this_buf_size);
-	  else
-	    {
-	      this_buf_size *= 2;
-
-	      char *new_buf = realloc (use_malloc ? buf : NULL, this_buf_size);
-	      if (new_buf == NULL)
-		goto out_fail;
-	      new_buf = buf;
-
-	      use_malloc = true;
-	    }
-	  buf_size = this_buf_size;
-
-	  iov.iov_base = buf;
-	  iov.iov_len = this_buf_size;
-
-	  /* Increase sequence number, so that we can distinguish
-	     between old and new request messages.  */
-	  h->seq++;
-
-	  if (__netlink_sendreq (h, type) < 0)
-	    goto out_fail;
-
-	  continue;
-	}
+	goto out_fail;
 
       size_t count = 0;
       size_t remaining_len = read_len;
--- libc/sysdeps/unix/sysv/linux/check_pf.c	24 Sep 2006 16:50:22 -0000	1.8
+++ libc/sysdeps/unix/sysv/linux/check_pf.c	25 Apr 2007 16:05:18 -0000	1.10
@@ -71,17 +71,38 @@ make_request (int fd, pid_t pid, bool *s
   memset (&nladdr, '\0', sizeof (nladdr));
   nladdr.nl_family = AF_NETLINK;
 
+#ifdef PAGE_SIZE
+  /* Help the compiler optimize out the malloc call if PAGE_SIZE
+     is constant and smaller or equal to PTHREAD_STACK_MIN/4.  */
+  const size_t buf_size = PAGE_SIZE;
+#else
+  const size_t buf_size = __getpagesize ();
+#endif
+  bool use_malloc = false;
+  char *buf;
+
+  if (__libc_use_alloca (buf_size))
+    buf = alloca (buf_size);
+  else
+    {
+      buf = malloc (buf_size);
+      if (buf != NULL)
+	use_malloc = true;
+      else
+	goto out_fail;
+    }
+
+  struct iovec iov = { buf, buf_size };
+
   if (TEMP_FAILURE_RETRY (__sendto (fd, (void *) &req, sizeof (req), 0,
 				    (struct sockaddr *) &nladdr,
 				    sizeof (nladdr))) < 0)
-    return -1;
+    goto out_fail;
 
   *seen_ipv4 = false;
   *seen_ipv6 = false;
 
   bool done = false;
-  char buf[4096];
-  struct iovec iov = { buf, sizeof (buf) };
   struct in6ailist
   {
     struct in6addrinfo info;
@@ -101,10 +122,10 @@ make_request (int fd, pid_t pid, bool *s
 
       ssize_t read_len = TEMP_FAILURE_RETRY (__recvmsg (fd, &msg, 0));
       if (read_len < 0)
-	return -1;
+	goto out_fail;
 
       if (msg.msg_flags & MSG_TRUNC)
-	return -1;
+	goto out_fail;
 
       struct nlmsghdr *nlmh;
       for (nlmh = (struct nlmsghdr *) buf;
@@ -186,7 +207,7 @@ make_request (int fd, pid_t pid, bool *s
     {
       *in6ai = malloc (in6ailistlen * sizeof (**in6ai));
       if (*in6ai == NULL)
-	return -1;
+	goto out_fail;
 
       *in6ailen = in6ailistlen;
 
@@ -198,7 +219,14 @@ make_request (int fd, pid_t pid, bool *s
       while (in6ailist != NULL);
     }
 
+  if (use_malloc)
+    free (buf);
   return 0;
+
+out_fail:
+  if (use_malloc)
+    free (buf);
+  return -1;
 }
 
 
--- libc/nscd/gai.c	14 Jan 2007 05:23:23 -0000	1.5
+++ libc/nscd/gai.c	18 Mar 2007 17:55:48 -0000	1.6
@@ -15,6 +15,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+#include <alloca.h>
 /* This file uses the getaddrinfo code but it compiles it without NSCD
    support.  We just need a few symbol renames.  */
 #define __inet_aton inet_aton
@@ -25,6 +26,8 @@
 #define __sendto sendto
 #define __strchrnul strchrnul
 #define __getline getline
+/* nscd uses 1MB or 2MB thread stacks.  */
+#define __libc_use_alloca(size) (size <= __MAX_ALLOCA_CUTOFF)
 
 #include <getaddrinfo.c>
 

glibc-rh230198.patch:
 fork.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE glibc-rh230198.patch ---
2007-02-25  Ulrich Drepper  <drepper at redhat.com>

	* sysdeps/unix/sysv/linux/fork.c (__libc_fork): Reset refcntr in
	new thread, don't just decrement it.
	Patch by Suzuki K P <suzuki at in.ibm.com>.

--- libc/nptl/sysdeps/unix/sysv/linux/fork.c	20 Dec 2003 23:37:13 -0000	1.11
+++ libc/nptl/sysdeps/unix/sysv/linux/fork.c	25 Feb 2007 21:43:28 -0000	1.12
@@ -167,8 +167,11 @@ __libc_fork (void)
 	    allp->handler->child_handler ();
 
 	  /* Note that we do not have to wake any possible waiter.
-	     This is the only thread in the new process.  */
-	  --allp->handler->refcntr;
+ 	     This is the only thread in the new process.  The count
+ 	     may have been bumped up by other threads doing a fork.
+ 	     We reset it to 1, to avoid waiting for non-existing
+ 	     thread(s) to release the count.  */
+	  allp->handler->refcntr = 1;
 
 	  /* XXX We could at this point look through the object pool
 	     and mark all objects not on the __fork_handlers list as

glibc-rh232633.patch:
 powerpc32/power5+/fpu/s_round.S    |    4 ++--
 powerpc32/power5+/fpu/s_trunc.S    |    4 ++--
 powerpc32/powerpc64/fpu/s_llrint.S |    4 ++++
 powerpc64/power5+/fpu/s_round.S    |    4 ++--
 powerpc64/power5+/fpu/s_trunc.S    |    4 ++--
 5 files changed, 12 insertions(+), 8 deletions(-)

--- NEW FILE glibc-rh232633.patch ---
2007-03-17  Jakub Jelinek  <jakub at redhat.com>

	* sysdeps/powerpc/powerpc32/power5+/fpu/s_round.S: Use GLIBC_2_1
	instead of GLIBC_2_0.
	* sysdeps/powerpc/powerpc32/power5+/fpu/s_trunc.S: Likewise.
	* sysdeps/powerpc/powerpc64/power5+/fpu/s_round.S: Likewise.
	* sysdeps/powerpc/powerpc64/power5+/fpu/s_trunc.S: Likewise.
	* sysdeps/powerpc/powerpc32/powerpc64/fpu/s_llrint.S: Include
	math_ldbl_opt.h.
	(llrintl): Add @GLIBC_2.1 compat symbol.

--- libc/powerpc-cpu/sysdeps/powerpc/powerpc32/power5+/fpu/s_round.S	15 Sep 2006 14:40:36 -0000	1.1.2.1
+++ libc/powerpc-cpu/sysdeps/powerpc/powerpc32/power5+/fpu/s_round.S	17 Mar 2007 21:52:54 -0000	1.1.2.2
@@ -32,6 +32,6 @@ weak_alias (__round, round)
 weak_alias (__round, roundl)
 strong_alias (__round, __roundl)
 #endif
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __round, roundl, GLIBC_2_0)
+#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
+compat_symbol (libm, __round, roundl, GLIBC_2_1)
 #endif
--- libc/powerpc-cpu/sysdeps/powerpc/powerpc32/power5+/fpu/s_trunc.S	15 Sep 2006 14:40:36 -0000	1.1.2.1
+++ libc/powerpc-cpu/sysdeps/powerpc/powerpc32/power5+/fpu/s_trunc.S	17 Mar 2007 21:52:54 -0000	1.1.2.2
@@ -32,6 +32,6 @@ weak_alias (__trunc, trunc)
 weak_alias (__trunc, truncl)
 strong_alias (__trunc, __truncl)
 #endif
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __trunc, truncl, GLIBC_2_0)
+#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
+compat_symbol (libm, __trunc, truncl, GLIBC_2_1)
 #endif
--- libc/powerpc-cpu/sysdeps/powerpc/powerpc32/powerpc64/fpu/s_llrint.S	15 Sep 2006 14:40:37 -0000	1.1.2.1
+++ libc/powerpc-cpu/sysdeps/powerpc/powerpc32/powerpc64/fpu/s_llrint.S	17 Mar 2007 21:52:55 -0000	1.1.2.2
@@ -18,6 +18,7 @@
    02110-1301 USA.  */
 
 #include <sysdep.h>
+#include <math_ldbl_opt.h>
 
 /* long long int[r3, r4] __llrint (double x[fp1])  */
 ENTRY (__llrint)	
@@ -41,3 +42,6 @@ weak_alias (__llrint, llrint)
 strong_alias (__llrint, __llrintl)
 weak_alias (__llrint, llrintl)
 #endif
+#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
+compat_symbol (libm, __llrint, llrintl, GLIBC_2_1)
+#endif
--- libc/powerpc-cpu/sysdeps/powerpc/powerpc64/power5+/fpu/s_round.S	15 Sep 2006 14:40:37 -0000	1.1.2.1
+++ libc/powerpc-cpu/sysdeps/powerpc/powerpc64/power5+/fpu/s_round.S	17 Mar 2007 21:52:55 -0000	1.1.2.2
@@ -33,6 +33,6 @@ weak_alias (__round, round)
 weak_alias (__round, roundl)
 strong_alias (__round, __roundl)
 #endif
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __round, roundl, GLIBC_2_0)
+#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
+compat_symbol (libm, __round, roundl, GLIBC_2_1)
 #endif
--- libc/powerpc-cpu/sysdeps/powerpc/powerpc64/power5+/fpu/s_trunc.S	15 Sep 2006 14:40:37 -0000	1.1.2.1
+++ libc/powerpc-cpu/sysdeps/powerpc/powerpc64/power5+/fpu/s_trunc.S	17 Mar 2007 21:52:55 -0000	1.1.2.2
@@ -33,6 +33,6 @@ weak_alias (__trunc, trunc)
 weak_alias (__trunc, truncl)
 strong_alias (__trunc, __truncl)
 #endif
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __trunc, truncl, GLIBC_2_0)
+#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
+compat_symbol (libm, __trunc, truncl, GLIBC_2_1)
 #endif

glibc-rh233460.patch:
 nis_call.c                    |  365 ++++++++++++++++++++++++++++++++++--------
 nis_lookup.c                  |   12 -
 nis_table.c                   |   12 -
 nss_nisplus/nisplus-ethers.c  |    6 
 nss_nisplus/nisplus-network.c |    8 
 nss_nisplus/nisplus-pwd.c     |    4 
 nss_nisplus/nisplus-rpc.c     |    9 -
 nss_nisplus/nisplus-service.c |    9 -
 nss_nisplus/nisplus-spwd.c    |    2 
 rpcsvc/nislib.h               |    7 
 10 files changed, 336 insertions(+), 98 deletions(-)

--- NEW FILE glibc-rh233460.patch ---
2007-04-05  Jakub Jelinek  <jakub at redhat.com>

	* nis/nis_call.c (__nisfind_server): Replace (*dir)->do_servers
	with obj->do_servers after first_shoot.

2007-03-21  Jakub Jelinek  <jakub at redhat.com>

	* nis/nis_call.c: Include bits/libc-lock.h, sys/stat.h, unistd.h.
	(nis_server_cache, nis_server_cache_lock, nis_cold_start_mtime): New
	variables.
	(nis_server_cache_search, nis_server_cache_add): New functions.
	(__nisfind_server): Use them.  Add dbp and flags argument, if
	call __nisbind_create.
	(__nisbind_create): Add server_used and current_ep arguments,
	only call __nis_findfastest if server_used is ~0.
	(__do_niscall2, __prepare_niscall): Adjust callers.
	(ckey_cache, ckey_cache_size, ckey_cache_allocated, ckey_cache_pid,
	ckey_cache_euid, ckey_cache_lock): New variables.
	(get_ckey): New function.
	(__nisbind_connect): If not dbp->use_udp, pass IPPROTO_TCP to
	__pmap_getnisport.  Save __pmap_getnisport result in
	dbp->addr.sin_port if non-zero.  Use get_ckey to create conversation
	key.
	* nis/nis_lookup.c (nis_lookup): Likewise.
	* nis/nis_table.c (nis_list): Likewise.
	* nis/rpcsvc/nislib.h (__nisbind_create, __nisfind_server): Adjust
	prototypes.

	* nis/nss_nisplus/nisplus-pwd.c (_nss_nisplus_getpwnam_r,
	_nss_nisplus_getpwuid_r): Pass USE_DGRAM flag to nis_list.
	* nis/nss_nisplus/nisplus-service.c (_nss_nisplus_getservbyname_r,
	_nss_nisplus_getservbyport_r): Likewise.
	* nis/nss_nisplus/nisplus-network.c (_nss_nisplus_getnetbyname_r,
	_nss_nisplus_getnetbyaddr_r): Likewise.
	* nis/nss_nisplus/nisplus-spwd.c (_nss_nisplus_getspnam_r): Likewise.
	* nis/nss_nisplus/nisplus-ethers.c (_nss_nisplus_gethostton_r,
	_nss_nisplus_getntohost_r): Likewise.
	* nis/nss_nisplus/nisplus-rpc.c (_nss_nisplus_getrpcbyname_r,
	_nss_nisplus_getrpcbynumber_r): Likewise.

--- libc/nis/nis_call.c	7 Aug 2006 17:39:39 -0000	1.47
+++ libc/nis/nis_call.c	5 Apr 2007 13:59:03 -0000	1.49
@@ -25,8 +26,11 @@
 #include <rpc/auth.h>
 #include <rpcsvc/nis.h>
 #include <sys/socket.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <bits/libc-lock.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"
@@ -107,10 +111,79 @@ __nisbind_next (dir_binding *bind)
 }
 libnsl_hidden_def (__nisbind_next)
 
+static struct ckey_cache_entry
+{
+  struct in_addr inaddr;
+  in_port_t port;
+  unsigned int protocol;
+  des_block ckey;
+} *ckey_cache;
+static size_t ckey_cache_size;
+static size_t ckey_cache_allocated;
+static pid_t ckey_cache_pid;
+static uid_t ckey_cache_euid;
+__libc_lock_define_initialized (static, ckey_cache_lock)
+
+static bool_t
+get_ckey (des_block *ckey, struct sockaddr_in *addr, unsigned int protocol)
+{
+  size_t i;
+  pid_t pid = getpid ();
+  uid_t euid = geteuid ();
+  bool_t ret = FALSE;
+
+  __libc_lock_lock (ckey_cache_lock);
+
+  if (ckey_cache_pid != pid || ckey_cache_euid != euid)
+    {
+      ckey_cache_size = 0;
+      ckey_cache_pid = pid;
+      ckey_cache_euid = euid;
+    }
+
+  for (i = 0; i < ckey_cache_size; ++i)
+    if (ckey_cache[i].port == addr->sin_port
+	&& ckey_cache[i].protocol == protocol
+	&& memcmp (&ckey_cache[i].inaddr, &addr->sin_addr,
+		   sizeof (addr->sin_addr)) == 0)
+      {
+	*ckey = ckey_cache[i].ckey;
+	ret = TRUE;
+	break;
+      }
+
+  if (!ret && key_gendes (ckey) >= 0)
+    {
+      ret = TRUE;
+      /* Don't grow the cache indefinitely.  */
+      if (ckey_cache_size == 256)
+	ckey_cache_size = 0;
+      if (ckey_cache_size == ckey_cache_allocated)
+	{
+	  size_t size = ckey_cache_allocated ? ckey_cache_allocated * 2 : 16;
+	  struct ckey_cache_entry *new_cache
+	    = realloc (ckey_cache, size * sizeof (*ckey_cache));
+	  if (new_cache != NULL)
+	    {
+	      ckey_cache = new_cache;
+	      ckey_cache_allocated = size;
+	    }
+	}
+      ckey_cache[ckey_cache_size].inaddr = addr->sin_addr;
+      ckey_cache[ckey_cache_size].port = addr->sin_port;
+      ckey_cache[ckey_cache_size].protocol = protocol;
+      ckey_cache[ckey_cache_size++].ckey = *ckey;
+    }
+
+  __libc_lock_unlock (ckey_cache_lock);
+  return ret;
+}
+
 nis_error
 __nisbind_connect (dir_binding *dbp)
 {
   nis_server *serv;
+  u_short port;
 
   if (dbp == NULL)
     return NIS_FAIL;
@@ -128,9 +201,12 @@ __nisbind_connect (dir_binding *dbp)
 
   /* Check, if the host is online and rpc.nisd is running. Much faster
      then the clnt*_create functions: */
-  if (__pmap_getnisport (&dbp->addr, NIS_PROG, NIS_VERSION, IPPROTO_UDP) == 0)
+  port = __pmap_getnisport (&dbp->addr, NIS_PROG, NIS_VERSION,
+			    dbp->use_udp ? IPPROTO_UDP : IPPROTO_TCP);
+  if (port == 0)
     return NIS_RPCERROR;
 
+  dbp->addr.sin_port = htons (port);
   dbp->socket = RPC_ANYSOCK;
   if (dbp->use_udp)
     dbp->clnt = clntudp_create (&dbp->addr, NIS_PROG, NIS_VERSION,
@@ -153,17 +229,16 @@ __nisbind_connect (dir_binding *dbp)
 	{
 	  char netname[MAXNETNAMELEN + 1];
 	  char *p;
+	  des_block ckey;
 
-	  p = stpcpy (netname, "unix.");
+	  p = stpcpy (netname, "unix@");
 	  strncpy (p, serv->name, MAXNETNAMELEN - 5);
 	  netname[MAXNETNAMELEN] = '\0';
-	  // XXX What is this supposed to do?  If we really want to replace
-	  // XXX the first dot, then we might as well use unix@ as the
-	  // XXX prefix string.  --drepper
-	  p = strchr (netname, '.');
-	  *p = '@';
-	  dbp->clnt->cl_auth =
-	    authdes_pk_create (netname, &serv->pkey, 300, NULL, NULL);
+	  dbp->clnt->cl_auth = NULL;
+	  if (get_ckey (&ckey, &dbp->addr,
+			dbp->use_udp ? IPPROTO_UDP : IPPROTO_TCP))
+	    dbp->clnt->cl_auth =
+	      authdes_pk_create (netname, &serv->pkey, 300, NULL, &ckey);
 	  if (!dbp->clnt->cl_auth)
 	    dbp->clnt->cl_auth = authunix_create_default ();
 	}
@@ -177,7 +252,8 @@ libnsl_hidden_def (__nisbind_connect)
 
 nis_error
 __nisbind_create (dir_binding *dbp, const nis_server *serv_val,
-		  unsigned int serv_len, unsigned int flags)
+		  unsigned int serv_len, unsigned int server_used,
+		  unsigned int current_ep, unsigned int flags)
 {
   dbp->clnt = NULL;
 
@@ -203,8 +279,16 @@ __nisbind_create (dir_binding *dbp, cons
   dbp->trys = 1;
 
   dbp->class = -1;
-  if (__nis_findfastest (dbp) < 1)
-    return NIS_NAMEUNREACHABLE;
+  if (server_used == ~0)
+    {
+      if (__nis_findfastest (dbp) < 1)
+	return NIS_NAMEUNREACHABLE;
+    }
+  else
+    {
+      dbp->server_used = server_used;
+      dbp->current_ep = current_ep;
+    }
 
   return NIS_SUCCESS;
 }
@@ -306,7 +390,7 @@ __do_niscall2 (const nis_server *server,
   if (flags & MASTER_ONLY)
     server_len = 1;
 
-  status = __nisbind_create (&dbp, server, server_len, flags);
+  status = __nisbind_create (&dbp, server, server_len, ~0, ~0, flags);
   if (status != NIS_SUCCESS)
     return status;
 
@@ -499,42 +583,221 @@ first_shoot (const_nis_name name, int se
   return obj;
 }
 
+static struct nis_server_cache
+{
+  int search_parent_first;
+  int uses;
+  unsigned int size;
+  unsigned int server_used;
+  unsigned int current_ep;
+  time_t expires;
+  char name[];
+} *nis_server_cache[16];
+static time_t nis_cold_start_mtime;
+__libc_lock_define_initialized (static, nis_server_cache_lock)
+
+static directory_obj *
+nis_server_cache_search (const_nis_name name, int search_parent_first,
+			 unsigned int *server_used, unsigned int *current_ep,
+			 struct timeval *now)
+{
+  directory_obj *ret = NULL;
+  int i;
+  char *addr;
+  XDR xdrs;
+  struct stat64 st;
+
+  if (stat64 ("/var/nis/NIS_COLD_START", &st) < 0)
+    st.st_mtime = nis_cold_start_mtime + 1;
+
+  __libc_lock_lock (nis_server_cache_lock);
+
+  for (i = 0; i < 16; ++i)
+    if (nis_server_cache[i] == NULL)
+      continue;
+    else if (st.st_mtime != nis_cold_start_mtime
+	     || now->tv_sec > nis_server_cache[i]->expires)
+      {
+	free (nis_server_cache[i]);
+	nis_server_cache[i] = NULL;
+      }
+    else if (nis_server_cache[i]->search_parent_first == search_parent_first
+	     && strcmp (nis_server_cache[i]->name, name) == 0)
+      {
+	ret = calloc (1, sizeof (directory_obj));
+	if (ret == NULL)
+	  break;
+
+	addr = rawmemchr (nis_server_cache[i]->name, '\0') + 8;
+	addr = (char *) ((uintptr_t) addr & ~(uintptr_t) 7);
+	xdrmem_create (&xdrs, addr, nis_server_cache[i]->size, XDR_DECODE);
+	if (!_xdr_directory_obj (&xdrs, ret))
+	  {
+	    xdr_destroy (&xdrs);
+	    free (ret);
+	    ret = NULL;
+	    free (nis_server_cache[i]);
+	    nis_server_cache[i] = NULL;
+	    break;
+	  }
+	xdr_destroy (&xdrs);
+	*server_used = nis_server_cache[i]->server_used;
+	*current_ep = nis_server_cache[i]->current_ep;
+	break;
+      }
+
+  nis_cold_start_mtime = st.st_mtime;
+
+  __libc_lock_unlock (nis_server_cache_lock);
+  return ret;
+}
+
+static void
+nis_server_cache_add (const_nis_name name, int search_parent_first,
+		      directory_obj *dir, unsigned int server_used,
+		      unsigned int current_ep, struct timeval *now)
+{
+  struct nis_server_cache **loc;
+  struct nis_server_cache *new;
+  struct nis_server_cache *old;
+  int i;
+  char *addr;
+  unsigned int size;
+  XDR xdrs;
+
+  if (dir == NULL)
+    return;
+
+  size = xdr_sizeof ((xdrproc_t) _xdr_directory_obj, (char *) dir);
+  new = calloc (1, sizeof (*new) + strlen (name) + 8 + size);
+  if (new == NULL)
+    return;
+  new->search_parent_first = search_parent_first;
+  new->uses = 1;
+  new->expires = now->tv_sec + dir->do_ttl;
+  new->size = size;
+  new->server_used = server_used;
+  new->current_ep = current_ep;
+  addr = stpcpy (new->name, name) + 8;
+  addr = (char *) ((uintptr_t) addr & ~(uintptr_t) 7);
+
+  xdrmem_create(&xdrs, addr, size, XDR_ENCODE);
+  if (!_xdr_directory_obj (&xdrs, dir))
+    {
+      xdr_destroy (&xdrs);
+      free (new);
+      return;
+    }
+  xdr_destroy (&xdrs);
+
+  __libc_lock_lock (nis_server_cache_lock);
+
+  /* Choose which entry should be evicted from the cache.  */
+  loc = &nis_server_cache[0];
+  if (*loc != NULL)
+    for (i = 1; i < 16; ++i)
+      if (nis_server_cache[i] == NULL)
+	{
+	  loc = &nis_server_cache[i];
+	  break;
+	}
+      else if ((*loc)->uses > nis_server_cache[i]->uses
+	       || ((*loc)->uses == nis_server_cache[i]->uses
+		   && (*loc)->expires > nis_server_cache[i]->expires))
+	loc = &nis_server_cache[i];
+  old = *loc;
+  *loc = new;
+
+  __libc_lock_unlock (nis_server_cache_lock);
+  free (old);
+}
+
 nis_error
 __nisfind_server (const_nis_name name, int search_parent_first,
-		  directory_obj **dir)
+		  directory_obj **dir, dir_binding *dbp, unsigned int flags)
 {
+  nis_error result = NIS_SUCCESS;
+  nis_error status;
+  directory_obj *obj;
+  struct timeval now;
+  unsigned int server_used = ~0;
+  unsigned int current_ep = ~0;
+
   if (name == NULL)
     return NIS_BADNAME;
 
-#if 0
-  /* Search in local cache. In the moment, we ignore the fastest server */
-  if (!(flags & NO_CACHE))
-    dir = __nis_cache_search (name, flags, &cinfo);
-#endif
+  if (*dir != NULL)
+    return NIS_SUCCESS;
 
-  nis_error result = NIS_SUCCESS;
-  if (*dir == NULL)
+  (void) gettimeofday (&now, NULL);
+
+  if ((flags & NO_CACHE) == 0)
+    *dir = nis_server_cache_search (name, search_parent_first, &server_used,
+				    &current_ep, &now);
+  if (*dir != NULL)
     {
-      nis_error status;
-      directory_obj *obj;
+      unsigned int server_len = (*dir)->do_servers.do_servers_len;
+      if (flags & MASTER_ONLY)
+	{
+	  server_len = 1;
+	  if (server_used != 0)
+	    {
+	      server_used = ~0;
+	      current_ep = ~0;
+	    }
+	}
+      result = __nisbind_create (dbp, (*dir)->do_servers.do_servers_val,
+				 server_len, server_used, current_ep, flags);
+      if (result != NIS_SUCCESS)
+	{
+	  nis_free_directory (*dir);
+	  *dir = NULL;
+	}
+      return result;
+    }
 
-      *dir = readColdStartFile ();
-      if (*dir == NULL)
-	/* No /var/nis/NIS_COLD_START->no NIS+ installed.  */
-	return NIS_UNAVAIL;
+  *dir = readColdStartFile ();
+  if (*dir == NULL)
+    /* No /var/nis/NIS_COLD_START->no NIS+ installed.  */
+    return NIS_UNAVAIL;
 
-      /* Try at first, if servers in "dir" know our object */
-      obj = first_shoot (name, search_parent_first, *dir);
+  /* Try at first, if servers in "dir" know our object */
+  obj = first_shoot (name, search_parent_first, *dir);
+  if (obj == NULL)
+    {
+      obj = rec_dirsearch (name, *dir, &status);
       if (obj == NULL)
+	result = status;
+    }
+
+  if (result == NIS_SUCCESS)
+    {
+      unsigned int server_len = obj->do_servers.do_servers_len;
+      if (flags & MASTER_ONLY)
+	server_len = 1;
+      result = __nisbind_create (dbp, obj->do_servers.do_servers_val,
+				 server_len, ~0, ~0, flags);
+      if (result == NIS_SUCCESS)
 	{
-	  obj = rec_dirsearch (name, *dir, &status);
-	  if (obj == NULL)
-	    result = status;
+	  if ((flags & MASTER_ONLY) == 0
+	      || obj->do_servers.do_servers_len == 1)
+	    {
+	      server_used = dbp->server_used;
+	      current_ep = dbp->current_ep;
+	    }
+	  if ((flags & NO_CACHE) == 0)
+	    nis_server_cache_add (name, search_parent_first, obj,
+				  server_used, current_ep, &now);
+	}
+      else
+	{
+	  nis_free_directory (obj);
+	  obj = NULL;
 	}
-
-      *dir = obj;
     }
 
+  *dir = obj;
+
   return result;
 }
 
@@ -543,38 +806,19 @@ nis_error
 __prepare_niscall (const_nis_name name, directory_obj **dirp,
 		   dir_binding *bptrp, unsigned int flags)
 {
-  nis_error retcode = __nisfind_server (name, 1, dirp);
+  nis_error retcode = __nisfind_server (name, 1, dirp, bptrp, flags);
   if (__builtin_expect (retcode != NIS_SUCCESS, 0))
     return retcode;
 
-  nis_server *server;
-  u_int server_len;
-
-  if (flags & MASTER_ONLY)
-    {
-      server = (*dirp)->do_servers.do_servers_val;
-      server_len = 1;
-    }
-  else
-    {
-      server = (*dirp)->do_servers.do_servers_val;
-      server_len = (*dirp)->do_servers.do_servers_len;
-    }
-
-  retcode = __nisbind_create (bptrp, server, server_len, flags);
-  if (retcode == NIS_SUCCESS)
-    {
-      do
-	if (__nisbind_connect (bptrp) == NIS_SUCCESS)
-	  return NIS_SUCCESS;
-      while (__nisbind_next (bptrp) == NIS_SUCCESS);
-
-      __nisbind_destroy (bptrp);
-      memset (bptrp, '\0', sizeof (*bptrp));
+  do
+    if (__nisbind_connect (bptrp) == NIS_SUCCESS)
+      return NIS_SUCCESS;
+  while (__nisbind_next (bptrp) == NIS_SUCCESS);
 
-      retcode = NIS_NAMEUNREACHABLE;
-    }
+  __nisbind_destroy (bptrp);
+  memset (bptrp, '\0', sizeof (*bptrp));
 
+  retcode = NIS_NAMEUNREACHABLE;
   nis_free_directory (*dirp);
   *dirp = NULL;
 
--- libc/nis/nis_lookup.c	7 Aug 2006 16:02:48 -0000	1.20
+++ libc/nis/nis_lookup.c	21 Mar 2007 20:24:59 -0000	1.21
@@ -127,18 +128,10 @@ nis_lookup (const_nis_name name, const u
 			/* Otherwise __nisfind_server will not do anything.  */
 			dir = NULL;
 
-			if (__nisfind_server (req.ns_name, 1, &dir)
+			if (__nisfind_server (req.ns_name, 1, &dir, &bptr,
+					      flags & ~MASTER_ONLY)
 			    != NIS_SUCCESS)
 			  goto out;
-
-			if (__nisbind_create (&bptr,
-					      dir->do_servers.do_servers_val,
-					      dir->do_servers.do_servers_len,
-					      flags) != NIS_SUCCESS)
-			  {
-			    nis_free_directory (dir);
-			    goto out;
-			  }
 		      }
 		    else
 		      if (__nisbind_next (&bptr) != NIS_SUCCESS)
--- libc/nis/nis_table.c	6 Oct 2006 20:31:59 -0000	1.40
+++ libc/nis/nis_table.c	21 Mar 2007 20:24:59 -0000	1.41
@@ -274,21 +275,14 @@ nis_list (const_nis_name name, unsigned 
       memset (res, '\0', sizeof (nis_result));
 
       status = __nisfind_server (ibreq->ibr_name,
-				 ibreq->ibr_srch.ibr_srch_val != NULL, &dir);
+				 ibreq->ibr_srch.ibr_srch_val != NULL,
+				 &dir, &bptr, flags & ~MASTER_ONLY);
       if (status != NIS_SUCCESS)
 	{
           NIS_RES_STATUS (res) = status;
           goto fail3;
 	}
 
-      status = __nisbind_create (&bptr, dir->do_servers.do_servers_val,
-				 dir->do_servers.do_servers_len, flags);
-      if (__builtin_expect (status != NIS_SUCCESS, 0))
-        {
-          NIS_RES_STATUS (res) = status;
-	  goto fail2;
-        }
-
       while (__nisbind_connect (&bptr) != NIS_SUCCESS)
 	if (__builtin_expect (__nisbind_next (&bptr) != NIS_SUCCESS, 0))
 	  {
@@ -338,7 +332,6 @@ nis_list (const_nis_name name, unsigned 
 		    NIS_RES_STATUS (res) = NIS_NOMEMORY;
 		  fail:
 		    __nisbind_destroy (&bptr);
-		  fail2:
 		    nis_free_directory (dir);
 		  fail3:
 		    free (tablepath);
--- libc/nis/nss_nisplus/nisplus-ethers.c	30 Apr 2006 05:44:23 -0000	1.26
+++ libc/nis/nss_nisplus/nisplus-ethers.c	21 Mar 2007 20:24:59 -0000	1.27
@@ -256,7 +257,8 @@ _nss_nisplus_gethostton_r (const char *n
 
   snprintf (buf, sizeof (buf), "[name=%s],%s", name, tablename_val);
 
-  nis_result *result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
+  nis_result *result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS | USE_DGRAM,
+				 NULL, NULL);
 
   if (result == NULL)
     {
@@ -322,7 +324,8 @@ _nss_nisplus_getntohost_r (const struct 
 	    addr->ether_addr_octet[4], addr->ether_addr_octet[5],
 	    tablename_val);
 
-  nis_result *result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
+  nis_result *result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS | USE_DGRAM,
+				 NULL, NULL);
 
   if (result == NULL)
     {
--- libc/nis/nss_nisplus/nisplus-network.c	30 Apr 2006 05:44:23 -0000	1.25
+++ libc/nis/nss_nisplus/nisplus-network.c	21 Mar 2007 20:24:59 -0000	1.26
@@ -338,7 +339,7 @@ _nss_nisplus_getnetbyname_r (const char 
   /* Search at first in the alias list, and use the correct name
      for the next search */
   snprintf (buf, sizeof (buf), "[name=%s],%s", name, tablename_val);
-  result = nis_list (buf, FOLLOW_LINKS | FOLLOW_PATH, NULL, NULL);
+  result = nis_list (buf, FOLLOW_LINKS | FOLLOW_PATH | USE_DGRAM, NULL, NULL);
 
   if (result != NULL)
     {
@@ -366,7 +367,8 @@ _nss_nisplus_getnetbyname_r (const char 
 	}
 
       nis_freeresult (result);
-      result = nis_list (bufptr, FOLLOW_LINKS | FOLLOW_PATH, NULL, NULL);
+      result = nis_list (bufptr, FOLLOW_LINKS | FOLLOW_PATH | USE_DGRAM,
+			 NULL, NULL);
     }
 
   if (result == NULL)
@@ -438,7 +440,8 @@ _nss_nisplus_getnetbyaddr_r (uint32_t ad
     while (1)
       {
 	snprintf (buf, sizeof (buf), "[addr=%s],%s", buf2, tablename_val);
-	nis_result *result = nis_list (buf, EXPAND_NAME, NULL, NULL);
+	nis_result *result = nis_list (buf, EXPAND_NAME | USE_DGRAM,
+				       NULL, NULL);
 
 	if (result == NULL)
 	  {
--- libc/nis/nss_nisplus/nisplus-pwd.c	20 May 2006 19:20:19 -0000	1.23
+++ libc/nis/nss_nisplus/nisplus-pwd.c	21 Mar 2007 20:24:59 -0000	1.24
@@ -311,7 +311,7 @@ _nss_nisplus_getpwnam_r (const char *nam
 
   snprintf (buf, sizeof (buf), "[name=%s],%s", name, pwd_tablename_val);
 
-  result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
+  result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS | USE_DGRAM, NULL, NULL);
 
   if (result == NULL)
     {
@@ -370,7 +370,7 @@ _nss_nisplus_getpwuid_r (const uid_t uid
   snprintf (buf, sizeof (buf), "[uid=%lu],%s",
 	    (unsigned long int) uid, pwd_tablename_val);
 
-  result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
+  result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS | USE_DGRAM, NULL, NULL);
 
   if (result == NULL)
     {
--- libc/nis/nss_nisplus/nisplus-rpc.c	30 Apr 2006 05:44:23 -0000	1.23
+++ libc/nis/nss_nisplus/nisplus-rpc.c	21 Mar 2007 20:24:59 -0000	1.24
@@ -315,7 +315,8 @@ _nss_nisplus_getrpcbyname_r (const char 
   /* Search at first in the alias list, and use the correct name
      for the next search */
   snprintf (buf, sizeof (buf), "[name=%s],%s", name, tablename_val);
-  nis_result *result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
+  nis_result *result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS | USE_DGRAM,
+				 NULL, NULL);
 
   if (result != NULL)
     {
@@ -342,7 +343,8 @@ _nss_nisplus_getrpcbyname_r (const char 
 	}
 
       nis_freeresult (result);
-      result = nis_list (bufptr, FOLLOW_PATH | FOLLOW_LINKS , NULL, NULL);
+      result = nis_list (bufptr, FOLLOW_PATH | FOLLOW_LINKS | USE_DGRAM,
+			 NULL, NULL);
     }
 
   if (result == NULL)
@@ -402,7 +404,8 @@ _nss_nisplus_getrpcbynumber_r (const int
 
   snprintf (buf, sizeof (buf), "[number=%d],%s", number, tablename_val);
 
-  nis_result *result = nis_list (buf, FOLLOW_LINKS | FOLLOW_PATH, NULL, NULL);
+  nis_result *result = nis_list (buf, FOLLOW_LINKS | FOLLOW_PATH | USE_DGRAM,
+				 NULL, NULL);
 
   if (result == NULL)
     {
--- libc/nis/nss_nisplus/nisplus-service.c	30 Apr 2006 05:44:23 -0000	1.25
+++ libc/nis/nss_nisplus/nisplus-service.c	21 Mar 2007 20:24:59 -0000	1.26
@@ -322,7 +322,8 @@ _nss_nisplus_getservbyname_r (const char
      for the next search */
   snprintf (buf, sizeof (buf), "[name=%s,proto=%s],%s", name, protocol,
 	    tablename_val);
-  nis_result *result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
+  nis_result *result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS | USE_DGRAM,
+				 NULL, NULL);
 
   if (result != NULL)
     {
@@ -351,7 +352,8 @@ _nss_nisplus_getservbyname_r (const char
 	}
 
       nis_freeresult (result);
-      result = nis_list (bufptr, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
+      result = nis_list (bufptr, FOLLOW_PATH | FOLLOW_LINKS | USE_DGRAM,
+			 NULL, NULL);
     }
 
   if (result == NULL)
@@ -420,7 +422,8 @@ _nss_nisplus_getservbyport_r (const int 
   snprintf (buf, sizeof (buf), "[port=%d,proto=%s],%s",
 	    number, protocol, tablename_val);
 
-  nis_result *result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
+  nis_result *result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS | USE_DGRAM,
+				 NULL, NULL);
 
   if (result == NULL)
     {
--- libc/nis/nss_nisplus/nisplus-spwd.c	30 Apr 2006 05:44:23 -0000	1.20
+++ libc/nis/nss_nisplus/nisplus-spwd.c	21 Mar 2007 20:24:59 -0000	1.21
@@ -182,7 +183,7 @@ _nss_nisplus_getspnam_r (const char *nam
 
   snprintf (buf, sizeof (buf), "[name=%s],%s", name, pwd_tablename_val);
 
-  result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
+  result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS | USE_DGRAM, NULL, NULL);
 
   if (result == NULL)
     {
--- libc/nis/rpcsvc/nislib.h	7 Aug 2006 16:01:48 -0000	1.15
+++ libc/nis/rpcsvc/nislib.h	21 Mar 2007 20:24:59 -0000	1.16
@@ -272,12 +272,13 @@ struct dir_binding
 typedef struct dir_binding dir_binding;
 
 extern nis_error __nisbind_create (dir_binding *, const nis_server *,
-				   unsigned int, unsigned int) __THROW;
+				   unsigned int, unsigned int, unsigned int,
+				   unsigned int) __THROW;
 extern nis_error __nisbind_connect (dir_binding *) __THROW;
 extern nis_error __nisbind_next (dir_binding *) __THROW;
 extern void __nisbind_destroy (dir_binding *) __THROW;
-extern nis_error __nisfind_server (const_nis_name, int, directory_obj **)
-     __THROW;
+extern nis_error __nisfind_server (const_nis_name, int, directory_obj **,
+				   dir_binding *, unsigned int) __THROW;
 
 #endif
 

glibc-rh235229.patch:
 include/rpcsvc/nislib.h |    2 +
 nis/nis_call.c          |   50 ++++++++++++++++++------------------------------
 nis/nis_domain_of.c     |   14 +++++++++++++
 nis/nis_lookup.c        |    6 +----
 4 files changed, 37 insertions(+), 35 deletions(-)

--- NEW FILE glibc-rh235229.patch ---
2007-04-06  Jakub Jelinek  <jakub at redhat.com>

	* nis/nis_domain_of.c (__nis_domain_of): New function.
	* include/rpcsvc/nislib.h (__nis_domain_of): New prototype.
	* nis/nis_lookup.c (nis_lookup): Use __nis_domain_of.
	* nis/nis_call.c (rec_dirsearch): Likewise.
	(first_shoot): Likewise.  Remove search_parent_first argument.
	(struct nis_server_cache): Rename search_parent_first field
	to search_parent.
	(nis_server_cache_search, nis_server_cache_add): Rename
	search_parent_first argument to search_parent.
	(__nisfind_server): Likewise.  If search_parent, call
	__nis_domain_of.

--- libc/nis/nis_call.c	5 Apr 2007 13:59:03 -0000	1.49
+++ libc/nis/nis_call.c	19 Apr 2007 14:27:55 -0000	1.50
@@ -422,9 +422,7 @@ rec_dirsearch (const_nis_name name, dire
     case HIGHER_NAME:
       { /* We need data from a parent domain */
 	directory_obj *obj;
-	char ndomain[strlen (dir->do_name) + 3];
-
-	nis_domain_of_r (dir->do_name, ndomain, sizeof (ndomain));
+	const char *ndomain = __nis_domain_of (dir->do_name);
 
 	/* The root server of our domain is a replica of the parent
 	   domain ! (Now I understand why a root server must be a
@@ -468,7 +466,7 @@ rec_dirsearch (const_nis_name name, dire
 	size_t namelen = strlen (name);
 	char leaf[namelen + 3];
 	char domain[namelen + 3];
-	char ndomain[namelen + 3];
+	const char *ndomain;
 	char *cp;
 
 	strcpy (domain, name);
@@ -481,8 +479,8 @@ rec_dirsearch (const_nis_name name, dire
 		return NULL;
 	      }
 	    nis_leaf_of_r (domain, leaf, sizeof (leaf));
-	    nis_domain_of_r (domain, ndomain, sizeof (ndomain));
-	    strcpy (domain, ndomain);
+	    ndomain = __nis_domain_of (domain);
+	    memmove (domain, ndomain, strlen (ndomain) + 1);
 	  }
 	while (nis_dir_cmp (domain, dir->do_name) != SAME_NAME);
 
@@ -535,29 +533,16 @@ rec_dirsearch (const_nis_name name, dire
 /* We try to query the current server for the searched object,
    maybe he know about it ? */
 static directory_obj *
-first_shoot (const_nis_name name, int search_parent_first, directory_obj *dir)
+first_shoot (const_nis_name name, directory_obj *dir)
 {
   directory_obj *obj = NULL;
   fd_result *fd_res;
   XDR xdrs;
-  char domain[strlen (name) + 3];
 
-#if 0
   if (nis_dir_cmp (name, dir->do_name) == SAME_NAME)
     return dir;
-#endif
-
-  const char *search_name = name;
-  if (search_parent_first)
-    {
-      nis_domain_of_r (name, domain, sizeof (domain));
-      search_name = domain;
-    }
-
-  if (nis_dir_cmp (search_name, dir->do_name) == SAME_NAME)
-    return dir;
 
-  fd_res = __nis_finddirectory (dir, search_name);
+  fd_res = __nis_finddirectory (dir, name);
   if (fd_res == NULL)
     return NULL;
   if (fd_res->status == NIS_SUCCESS
@@ -585,7 +570,7 @@ first_shoot (const_nis_name name, int se
 
 static struct nis_server_cache
 {
-  int search_parent_first;
+  int search_parent;
   int uses;
   unsigned int size;
   unsigned int server_used;
@@ -597,7 +582,7 @@ static time_t nis_cold_start_mtime;
 __libc_lock_define_initialized (static, nis_server_cache_lock)
 
 static directory_obj *
-nis_server_cache_search (const_nis_name name, int search_parent_first,
+nis_server_cache_search (const_nis_name name, int search_parent,
 			 unsigned int *server_used, unsigned int *current_ep,
 			 struct timeval *now)
 {
@@ -621,7 +606,7 @@ nis_server_cache_search (const_nis_name 
 	free (nis_server_cache[i]);
 	nis_server_cache[i] = NULL;
       }
-    else if (nis_server_cache[i]->search_parent_first == search_parent_first
+    else if (nis_server_cache[i]->search_parent == search_parent
 	     && strcmp (nis_server_cache[i]->name, name) == 0)
       {
 	ret = calloc (1, sizeof (directory_obj));
@@ -653,7 +638,7 @@ nis_server_cache_search (const_nis_name 
 }
 
 static void
-nis_server_cache_add (const_nis_name name, int search_parent_first,
+nis_server_cache_add (const_nis_name name, int search_parent,
 		      directory_obj *dir, unsigned int server_used,
 		      unsigned int current_ep, struct timeval *now)
 {
@@ -672,7 +657,7 @@ nis_server_cache_add (const_nis_name nam
   new = calloc (1, sizeof (*new) + strlen (name) + 8 + size);
   if (new == NULL)
     return;
-  new->search_parent_first = search_parent_first;
+  new->search_parent = search_parent;
   new->uses = 1;
   new->expires = now->tv_sec + dir->do_ttl;
   new->size = size;
@@ -713,7 +698,7 @@ nis_server_cache_add (const_nis_name nam
 }
 
 nis_error
-__nisfind_server (const_nis_name name, int search_parent_first,
+__nisfind_server (const_nis_name name, int search_parent,
 		  directory_obj **dir, dir_binding *dbp, unsigned int flags)
 {
   nis_error result = NIS_SUCCESS;
@@ -732,7 +717,7 @@ __nisfind_server (const_nis_name name, i
   (void) gettimeofday (&now, NULL);
 
   if ((flags & NO_CACHE) == 0)
-    *dir = nis_server_cache_search (name, search_parent_first, &server_used,
+    *dir = nis_server_cache_search (name, search_parent, &server_used,
 				    &current_ep, &now);
   if (*dir != NULL)
     {
@@ -762,10 +747,13 @@ __nisfind_server (const_nis_name name, i
     return NIS_UNAVAIL;
 
   /* Try at first, if servers in "dir" know our object */
-  obj = first_shoot (name, search_parent_first, *dir);
+  const char *search_name = name;
+  if (search_parent)
+    search_name = __nis_domain_of (name);
+  obj = first_shoot (search_name, *dir);
   if (obj == NULL)
     {
-      obj = rec_dirsearch (name, *dir, &status);
+      obj = rec_dirsearch (search_name, *dir, &status);
       if (obj == NULL)
 	result = status;
     }
@@ -786,7 +774,7 @@ __nisfind_server (const_nis_name name, i
 	      current_ep = dbp->current_ep;
 	    }
 	  if ((flags & NO_CACHE) == 0)
-	    nis_server_cache_add (name, search_parent_first, obj,
+	    nis_server_cache_add (name, search_parent, obj,
 				  server_used, current_ep, &now);
 	}
       else
--- libc/nis/nis_domain_of.c	6 Jul 2001 04:55:36 -0000	1.3
+++ libc/nis/nis_domain_of.c	19 Apr 2007 14:27:18 -0000	1.4
@@ -26,3 +26,17 @@ nis_domain_of (const_nis_name name)
 
   return nis_domain_of_r (name, result, NIS_MAXNAMELEN);
 }
+
+const_nis_name
+__nis_domain_of (const_nis_name name)
+{
+  const_nis_name cptr = strchr (name, '.');
+
+  if (cptr++ == NULL)
+    return "";
+
+  if (*cptr == '\0')
+    return ".";
+
+  return cptr;
+}
--- libc/nis/nis_lookup.c	21 Mar 2007 20:24:59 -0000	1.21
+++ libc/nis/nis_lookup.c	19 Apr 2007 14:27:42 -0000	1.22
@@ -75,7 +75,6 @@ nis_lookup (const_nis_name name, const u
 	{
 	  static const struct timeval RPCTIMEOUT = {10, 0};
 	  enum clnt_stat result;
-	  char ndomain[strlen (req.ns_name) + 1];
 
 	again:
 	  result = clnt_call (bptr.clnt, NIS_LOOKUP,
@@ -137,10 +136,9 @@ nis_lookup (const_nis_name name, const u
 		      if (__nisbind_next (&bptr) != NIS_SUCCESS)
 			{
 			  /* No more servers to search.  Try parent.  */
-			  nis_domain_of_r (req.ns_name, ndomain,
-					   sizeof (ndomain));
+			  const char *ndomain = __nis_domain_of (req.ns_name);
 			  req.ns_name = strdupa (ndomain);
-			  if (strcmp (ndomain, ".") == 0)
+			  if (strcmp (req.ns_name, ".") == 0)
 			    {
 			      NIS_RES_STATUS (res) = NIS_NAMEUNREACHABLE;
 			      goto out;
--- libc/include/rpcsvc/nislib.h	24 Oct 2004 20:25:25 -0000	1.2
+++ libc/include/rpcsvc/nislib.h	19 Apr 2007 14:27:30 -0000	1.3
@@ -42,4 +42,6 @@ libnsl_hidden_proto (__nis_default_group
 libnsl_hidden_proto (__nis_default_access)
 libnsl_hidden_proto (nis_clone_object)
 
+extern const_nis_name __nis_domain_of (const_nis_name) __THROW;
+
 #endif


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/FC-6/glibc.spec,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -r1.279 -r1.280
--- glibc.spec	5 Jan 2007 16:41:11 -0000	1.279
+++ glibc.spec	27 Apr 2007 11:57:13 -0000	1.280
@@ -3,7 +3,7 @@
 %define glibcsrcdir glibc-2.5-20061008T1257
 %define glibc_release_tarballs 0
 %define glibcversion 2.5
-%define glibcrelease 10%{?dist}
+%define glibcrelease 13%{?dist}
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -72,6 +72,53 @@
 Patch35: glibc-tst-pselect.patch
 Patch36: glibc-rh220420.patch
 Patch37: glibc-rh220658.patch
+Patch38: glibc-nis-getservbyname.patch
+Patch39: glibc-rh210748-workaround.patch
+Patch40: glibc-rh225315.patch
+Patch41: glibc-rh222089.patch
+Patch42: glibc-rh221187.patch
+Patch43: glibc-bz3855.patch
+Patch44: glibc-bz3902.patch
+Patch45: glibc-bz2749.patch
+Patch46: glibc-byteswap.patch
+Patch47: glibc-bz3957.patch
+Patch48: glibc-bz3944.patch
+Patch49: glibc-rh228103.patch
+Patch50: glibc-nscd-SIGHUP.patch
+Patch51: glibc-po-update2.patch
+Patch52: glibc-bz3322.patch
+Patch53: glibc-bz3851.patch
+Patch54: glibc-bz3884.patch
+Patch55: glibc-bz3995.patch
+Patch56: glibc-bz4411.patch
+Patch57: glibc-bz3348.patch
+Patch58: glibc-bz3842.patch
+Patch59: glibc-bz4070.patch
+Patch60: glibc-bz4074.patch
+Patch61: glibc-bz4076.patch
+Patch62: glibc-bz3458.patch
+Patch63: glibc-rh230151.patch
+Patch64: glibc-bz4069.patch
+Patch65: glibc-bz4181.patch
+Patch66: glibc-bz4130.patch
+Patch67: glibc-bz4101.patch
+Patch68: glibc-bz3919.patch
+Patch69: glibc-rh203728.patch
+Patch70: glibc-dst-req-static.patch
+Patch71: glibc-rh233460.patch
+Patch72: glibc-rh178934.patch
+Patch73: glibc-ia64-fesetround.patch
+Patch74: glibc-bz4344.patch
+Patch75: glibc-bz3306.patch
+Patch76: glibc-libio-throw.patch
+Patch77: glibc-bz4364.patch
+Patch78: glibc-bz4368.patch
+Patch79: glibc-rh235229.patch
+Patch80: glibc-madvise-hidden.patch
+Patch81: glibc-bz4405.patch
+Patch82: glibc-bz4406.patch
+Patch83: glibc-rh232633.patch
+Patch84: glibc-rh230198.patch
 Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root
 Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers,
 Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile
@@ -319,6 +366,53 @@
 %patch35 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
+%patch39 -p1
+%patch40 -p1
+%patch41 -p1
+%patch42 -p1
+%patch43 -p1
+%patch44 -p1
+%patch45 -p1
+%patch46 -p1
+%patch47 -p1
+%patch48 -p1
+%patch49 -p1
+%patch50 -p1
+%patch51 -p1
+%patch52 -p1
+%patch53 -p1
+%patch54 -p1
+%patch55 -p1
+%patch56 -p1
+%patch57 -p1
+%patch58 -p1
+%patch59 -p1
+%patch60 -p1
+%patch61 -p1
+%patch62 -p1
+%patch63 -p1
+%patch64 -p1
+%patch65 -p1
+%patch66 -p1
+%patch67 -p1
+%patch68 -p1
+%patch69 -p1
+%patch70 -p1
+%patch71 -p1
+%patch72 -p1
+%patch73 -p1
+%patch74 -p1
+%patch75 -p1
+%patch76 -p1
+%patch77 -p1
+%patch78 -p1
+%patch79 -p1
+%patch80 -p1
+%patch81 -p1
+%patch82 -p1
+%patch83 -p1
+%patch84 -p1
 
 # Hack till glibc-kernheaders get updated, argh
 mkdir -p override_headers/linux
@@ -1621,6 +1715,41 @@
 %endif
 
 %changelog
+* Fri Apr 27 2007 Jakub Jelinek <jakub at redhat.com> 2.5-13.fc6
+- fix application crashes when doing NSS lookups through nscd
+  mmapped databases and nscd decides to start garbage collection
+  during the lookups (#219145, #225315)
+- fix NIS+ __nisfind_server (#235229)
+- assorted NIS+ speedups (#233460)
+- fix power6 libm compat symbols on ppc32 (#232633)
+- fix child refcntr in NPTL fork (#230198)
+- fix ifaddrs with many net devices on > 4KB page size arches (#230151)
+- fix pthread_mutex_timedlock on x86_64 (#228103)
+- fix HAVE_LIBCAP configure detection (#178934)
+- fix double free in fts_close (#222089)
+- fix vfork+execvp memory leak (#221187)
+- further localedef robustification (#203728)
+- fix printf with %g and values tiny bit smaller than 1.e-4 (#235864,
+  BZ#4362, BZ#4070)
+- fix _XOPEN_VERSION (BZ#4364)
+- nexttoward*/nextafter* fixes (BZ#3306)
+- various fixes (BZ#3919, BZ#4101, BZ#4130, BZ#4181, BZ#4069, BZ#3458,
+  BZ#3348, BZ#4344, BZ#4368, BZ#4305, BZ#4306)
+- fix nftw with FTW_CHDIR on / (BZ#4076)
+- nscd fixes (BZ#4074)
+- fix euidaccess (BZ#3842)
+- assorted locale data fixes (BZ#3322, BZ#3995, BZ#3884, BZ#3851, BZ#4411)
+- fix strptime (BZ#3944)
+- fix regcomp with REG_NEWLINE (BZ#3957)
+- fix %0lld printing of 0LL on 32-bit architectures (BZ#3902)
+- soft-fp fixes (BZ#2749)
+- further strtod fixes (BZ#3855)
+- update ru and sv translations
+- fix fesetround return value on ia64
+- fix nscd SIGHUP database invalidation
+- add a workaround for #210748 and #211133
+- fix NIS getservbyname when proto is NULL
+
 * Fri Jan  5 2007 Jakub Jelinek <jakub at redhat.com> 2.5-10.fc6
 - fix nss_compat +group handling (#220658)
 



From fedora-cvs-commits at redhat.com  Fri Apr 27 12:47:44 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 08:47:44 -0400
Subject: rpms/udev/devel udev-106-setenv.patch, NONE, 1.1 modprobe, 1.1,
	1.2 start_udev, 1.58, 1.59 udev-rules.patch, 1.30,
	1.31 udev.spec, 1.200, 1.201
Message-ID: <200704271247.l3RCli1I030592@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29953

Modified Files:
	modprobe start_udev udev-rules.patch udev.spec 
Added Files:
	udev-106-setenv.patch 
Log Message:
- added env patch
- moved modprobe to the beginning
- added some speedups


udev-106-setenv.patch:
 udev_rules_parse.c |    1 +
 udevcontrol.c      |    9 +++++++++
 udevd.8            |    5 +++++
 udevd.c            |   16 ++++++++++++++++
 udevd.h            |    1 +
 udevd.xml          |    6 ++++++
 6 files changed, 38 insertions(+)

--- NEW FILE udev-106-setenv.patch ---
--- udev-106/udevd.c.setenv	2007-03-03 18:42:09.000000000 +0100
+++ udev-106/udevd.c	2007-04-25 16:22:19.000000000 +0200
@@ -657,6 +657,7 @@
 	struct ucred *cred;
 	char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
 	int *intval;
+	char *pos;
 
 	memset(&ctrl_msg, 0x00, sizeof(struct udevd_ctrl_msg));
 	iov.iov_base = &ctrl_msg;
@@ -693,6 +694,21 @@
 	}
 
 	switch (ctrl_msg.type) {
+	case UDEVD_CTRL_ENV:
+		pos = strchr(ctrl_msg.buf, '=');
+		if (pos == NULL) {
+			err("wrong key format '%s'", ctrl_msg.buf);
+			break;
+		}
+		pos[0] = '\0';
+		if (pos[1] == '\0') {
+			info("udevd message (ENV) received, unset '%s'", ctrl_msg.buf);
+			unsetenv(ctrl_msg.buf);
+		} else {
+			info("udevd message (ENV) received, set '%s=%s'", ctrl_msg.buf, &pos[1]);
+			setenv(ctrl_msg.buf, &pos[1], 1);
+		}
+		break;
 	case UDEVD_CTRL_STOP_EXEC_QUEUE:
 		info("udevd message (STOP_EXEC_QUEUE) received");
 		stop_exec_q = 1;
--- udev-106/udevd.h.setenv	2007-03-03 18:42:09.000000000 +0100
+++ udev-106/udevd.h	2007-04-25 16:22:19.000000000 +0200
@@ -46,6 +46,7 @@
 	UDEVD_CTRL_SET_MAX_CHILDS,
 	UDEVD_CTRL_SET_MAX_CHILDS_RUNNING,
 	UDEVD_CTRL_RELOAD_RULES,
+	UDEVD_CTRL_ENV,
 };
 
 struct udevd_ctrl_msg {
--- udev-106/udev_rules_parse.c.setenv	2007-03-03 18:42:09.000000000 +0100
+++ udev-106/udev_rules_parse.c	2007-04-25 16:19:01.000000000 +0200
@@ -393,6 +393,7 @@
 			}
 			if (strncmp(attr, "PHYSDEV", 7) == 0)
 				physdev = 1;
+			dbg("add_rule_key_pair(%s %s)", attr, value);
 			if (add_rule_key_pair(rule, &rule->env, operation, attr, value) != 0)
 				goto invalid;
 			valid = 1;
--- udev-106/udevd.8.setenv	2007-03-03 18:42:09.000000000 +0100
+++ udev-106/udevd.8	2007-04-25 16:22:19.000000000 +0200
@@ -65,6 +65,11 @@
 .RS 4
 udevcontrol starts the execution of events from udevd.
 .RE
+.PP
+\fBenv \fR\fB\fIvar\fR\fR\fB=\fR\fB\fIvalue\fR\fR
+.RS 4
+Set global variable.
+.RE
 .SH "ENVIRONMENT"
 .PP
 \fBUDEV_LOG\fR
--- udev-106/udevd.xml.setenv	2007-03-03 18:42:09.000000000 +0100
+++ udev-106/udevd.xml	2007-04-25 16:22:19.000000000 +0200
@@ -93,6 +93,12 @@
             </listitem>
           </varlistentry>
           <varlistentry>
+             <term><option>env <replaceable>var</replaceable>=<replaceable>value</replaceable></option></term>
+             <listitem>
+               <para>Set global variable.</para>
+             </listitem>
+           </varlistentry>
+           <varlistentry>
             <term><option>start_exec_queue</option></term>
             <listitem>
               <para>udevcontrol starts the execution of events from udevd.</para>
--- udev-106/udevcontrol.c.setenv	2007-03-03 18:42:09.000000000 +0100
+++ udev-106/udevcontrol.c	2007-04-25 16:22:19.000000000 +0200
@@ -117,6 +117,15 @@
 			}
 			*intval = count;
 			info("send max_childs_running=%i", *intval);
+		} else if (!strncmp(arg, "env", strlen("env"))) {
+		        val = argv[++i];
+			if (val == NULL) {
+			  fprintf(stderr, "missing key\n");
+			  goto exit;
+			}
+			ctrl_msg.type = UDEVD_CTRL_ENV;
+			strlcpy(ctrl_msg.buf, val, sizeof(ctrl_msg.buf));
+			info("send env '%s'", val);
 		} else if (strcmp(arg, "help") == 0  || strcmp(arg, "--help") == 0  || strcmp(arg, "-h") == 0) {
 			printf("Usage: udevcontrol COMMAND\n"
 				"  log_priority=<level>   set the udev log level for the daemon\n"


Index: modprobe
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/modprobe,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- modprobe	23 Jan 2007 14:53:25 -0000	1.1
+++ modprobe	27 Apr 2007 12:47:41 -0000	1.2
@@ -1,7 +1,14 @@
 #!/bin/sh
-if [ -f /dev/.modprobe_debug ]; then
-	/sbin/modprobe -v -s $@ &>/dev/console
+if [ -n "$MODPROBE_COLLECT" ]; then
+	echo $@ >> /dev/MODPROBE
 else
-	/sbin/modprobe $@
+	if [ -n "$MODPROBE_DEBUG" ]; then
+		/sbin/modprobe -v -s $@ &>/dev/console
+	else
+		/sbin/modprobe $@
+	fi
 fi
 
+
+
+


Index: start_udev
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/start_udev,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- start_udev	23 Jan 2007 14:53:25 -0000	1.58
+++ start_udev	27 Apr 2007 12:47:41 -0000	1.59
@@ -181,23 +181,46 @@
 	# trigger the sorted events
 	echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
 	if strstr "$cmdline" modprobedebug; then
-		touch /dev/.modprobe_debug
-	else
-		rm -f /dev/.modprobe_debug
+		/sbin/udevcontrol env MODPROBE_DEBUG=1
+		MODPROBE_OPTIONS="-s -v"
 	fi
 	/sbin/udevd -d
 	ret=$[$ret + $?]
 	if strstr "$cmdline" udevdebug; then
 		/sbin/udevcontrol log_priority=debug
 	fi
+        if strstr "$cmdline" fastudev; then
+		/sbin/udevcontrol env FASTUDEV=1
+        fi
+	if strstr "$cmdline" mcollect; then
+		/sbin/udevcontrol env MODPROBE_COLLECT=1
+		MCOLLECT=1
+	fi
+	if strstr "$cmdline" udevchilds; then
+		/sbin/udevcontrol max_childs_running=$(getval udevchilds $cmdline)
+	fi
+
+	rm -f /dev/MODPROBE
+        /sbin/udevcontrol env STARTUP=1
 	/sbin/udevtrigger
 	ret=$[$ret + $?]
 	wait_for_queue $(getval udevtimeout $cmdline)
 	ret=$[$ret + $?]
+        test -e "$MCOLLECT" && /sbin/udevcontrol env MODPROBE_COLLECT=
+	unset MCOLLECT
+	if [ -e /dev/MODPROBE ]; then 
+		(xargs_simple /sbin/modprobe -a) < /dev/MODPROBE 2>/dev/null
+		rm -f /dev/MODPROBE
+		wait_for_queue $(getval udevtimeout $cmdline)
+		ret=$[$ret + $?]
+	fi
+	/sbin/udevcontrol env STARTUP=
+	/sbin/udevcontrol env MODPROBE_DEBUG=
 else
 	echo -n " kernel too old for this udev version "
 	/sbin/udevd -d
 	ret=10
+
 fi
 
 ret=$[$ret + $?]

udev-rules.patch:
 50-udev.rules        |   13 +++----------
 95-pam-console.rules |    2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

Index: udev-rules.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- udev-rules.patch	7 Mar 2007 18:01:25 -0000	1.30
+++ udev-rules.patch	27 Apr 2007 12:47:41 -0000	1.31
@@ -1,5 +1,10 @@
+--- udev-106/etc/udev/redhat/95-pam-console.rules.rhrules	2007-03-03 18:42:09.000000000 +0100
++++ udev-106/etc/udev/redhat/95-pam-console.rules	2007-04-27 13:16:43.000000000 +0200
+@@ -1 +1 @@
+-ACTION=="add", SYSFS{dev}=="?*", KERNEL=="?*", RUN+="/sbin/pam_console_apply $env{DEVNAME} $env{DEVLINKS}"
++ENV{STARTUP}!="1", ACTION=="add", SYSFS{dev}=="?*", KERNEL=="?*", RUN+="/sbin/pam_console_apply $env{DEVNAME} $env{DEVLINKS}"
 --- udev-106/etc/udev/redhat/50-udev.rules.rhrules	2007-03-03 18:42:09.000000000 +0100
-+++ udev-106/etc/udev/redhat/50-udev.rules	2007-03-07 16:49:26.000000000 +0100
++++ udev-106/etc/udev/redhat/50-udev.rules	2007-04-27 14:45:33.000000000 +0200
 @@ -41,9 +41,6 @@
  KERNEL=="hvc*",                 NAME="%k", GROUP="uucp", MODE="0660"
  KERNEL=="hvsi*",                NAME="%k", GROUP="uucp", MODE="0660"
@@ -10,7 +15,33 @@
  
  # vc devices
  KERNEL=="vcs",			NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
-@@ -280,7 +277,6 @@
+@@ -68,9 +65,6 @@
+ KERNEL=="nvram",		MODE="0660"
+ KERNEL=="rtc",			MODE="0644"
+ 
+-# pnp devices
+-ACTION=="add", SUBSYSTEM=="pnp", RUN+="/bin/sh -c 'while read id; do /lib/udev/modprobe pnp:d$$id; done < /sys/$devpath/id'"
+-
+ # floppy devices
+ KERNEL=="fd[01]*",		GROUP="floppy", MODE="0660"
+ # fix floppy devices
+@@ -233,6 +227,7 @@
+ 
+ KERNEL=="pktcdvd", NAME="%k/control"
+ 
++
+ KERNEL=="hd*[!0-9]", ATTR{removable}=="1", \
+ 	ATTR{media}=="floppy", \
+ 	SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove, all_partitions"
+@@ -255,6 +250,7 @@
+ 	OPTIONS+="ignore_remove"
+ 
+ 
++
+ #######################################
+ # Persistent block device stuff - begin
+ #######################################
+@@ -280,7 +276,6 @@
  KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/usb_id -x"
  KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -s %p -d $tempnode"
  KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -a -s %p -d $tempnode"
@@ -18,3 +49,20 @@
  KERNEL=="sd*[!0-9]|sr*|dasd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
  
  # for partitions import parent information
+@@ -315,9 +310,6 @@
+ 	PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", \
+ 	NAME="%c", MODE="0644"
+ 
+-ACTION=="add", SUBSYSTEM=="?*", ENV{MODALIAS}=="?*", RUN+="modprobe $env{MODALIAS}"
+-
+-ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", RUN+="/bin/sh -c 'echo 1 > /sys/$DEVPATH/allow_func_id_match'"
+ 
+ # sd:           0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
+ # sr:           4 TYPE_WORM, 5 TYPE_ROM
+@@ -351,5 +343,6 @@
+ # mmc block devices
+ ACTION=="add", SUBSYSTEM=="mmc", RUN+="modprobe mmc_block"
+ 
++
+ RUN+="socket:/org/kernel/udev/monitor"
+ 


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- udev.spec	11 Apr 2007 09:53:30 -0000	1.200
+++ udev.spec	27 Apr 2007 12:47:41 -0000	1.201
@@ -1,4 +1,4 @@
-%define debug false
+%define debug true
 %define with_static 1
 %define udev_scriptdir /lib/udev
 %define firmwaredir /lib/firmware
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 106
-Release: 2%{?dist}
+Release: 2.hh.7%{?dist}
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -26,6 +26,7 @@
 Patch9: udev-091-lib64.patch
 Patch10: udev-106-selinuxmedia.patch
 Patch14: udev-095-dbgwait.patch
+Patch15: udev-106-setenv.patch
 
 ExclusiveOS: Linux
 URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
@@ -80,6 +81,7 @@
 %patch9 -p1 -b .lib64
 %patch10 -p1 -b .selinuxmedia
 %patch14 -p1 -b .dbgwait
+%patch15 -p1 -b .setenv
 
 rm -f etc/udev/redhat/51-hotplug.rules
 %build
@@ -216,7 +218,7 @@
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/modules
 cat >$RPM_BUILD_ROOT/etc/sysconfig/modules/udev-stw.modules <<EOF
 #!/bin/sh
-for i in nvram floppy parport lp snd-powermac sonypi;do
+for i in loop nvram floppy parport lp snd-powermac sonypi;do
 	modprobe \$i >/dev/null 2>&1
 done
 EOF



From fedora-cvs-commits at redhat.com  Fri Apr 27 12:48:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 08:48:09 -0400
Subject: rpms/udev/devel start_udev,1.59,1.60
Message-ID: <200704271248.l3RCm9ap030937@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30881

Modified Files:
	start_udev 
Log Message:
fixed console output


Index: start_udev
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/start_udev,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- start_udev	27 Apr 2007 12:47:41 -0000	1.59
+++ start_udev	27 Apr 2007 12:48:07 -0000	1.60
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # start_udev
 #
@@ -32,6 +32,9 @@
 [ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
 udev_root=${udev_root-/dev}
 
+if [ -f /dev/.in_sysinit ]; then
+	exec >/dev/console 2>/dev/console </dev/console
+fi
 
 . /etc/init.d/functions
 



From fedora-cvs-commits at redhat.com  Fri Apr 27 12:55:16 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 08:55:16 -0400
Subject: rpms/udev/devel udev-rules.patch,1.31,1.32
Message-ID: <200704271255.l3RCtGcG003597@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3522

Modified Files:
	udev-rules.patch 
Log Message:
moved modprobe rules

udev-rules.patch:
 05-udev-early.rules  |   13 ++++++++++---
 50-udev.rules        |   13 +++----------
 95-pam-console.rules |    2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

Index: udev-rules.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- udev-rules.patch	27 Apr 2007 12:47:41 -0000	1.31
+++ udev-rules.patch	27 Apr 2007 12:55:14 -0000	1.32
@@ -1,10 +1,10 @@
 --- udev-106/etc/udev/redhat/95-pam-console.rules.rhrules	2007-03-03 18:42:09.000000000 +0100
-+++ udev-106/etc/udev/redhat/95-pam-console.rules	2007-04-27 13:16:43.000000000 +0200
++++ udev-106/etc/udev/redhat/95-pam-console.rules	2007-04-27 14:54:37.000000000 +0200
 @@ -1 +1 @@
 -ACTION=="add", SYSFS{dev}=="?*", KERNEL=="?*", RUN+="/sbin/pam_console_apply $env{DEVNAME} $env{DEVLINKS}"
 +ENV{STARTUP}!="1", ACTION=="add", SYSFS{dev}=="?*", KERNEL=="?*", RUN+="/sbin/pam_console_apply $env{DEVNAME} $env{DEVLINKS}"
 --- udev-106/etc/udev/redhat/50-udev.rules.rhrules	2007-03-03 18:42:09.000000000 +0100
-+++ udev-106/etc/udev/redhat/50-udev.rules	2007-04-27 14:45:33.000000000 +0200
++++ udev-106/etc/udev/redhat/50-udev.rules	2007-04-27 14:54:37.000000000 +0200
 @@ -41,9 +41,6 @@
  KERNEL=="hvc*",                 NAME="%k", GROUP="uucp", MODE="0660"
  KERNEL=="hvsi*",                NAME="%k", GROUP="uucp", MODE="0660"
@@ -66,3 +66,26 @@
 +
  RUN+="socket:/org/kernel/udev/monitor"
  
+--- udev-106/etc/udev/redhat/05-udev-early.rules.rhrules	2007-03-03 18:42:09.000000000 +0100
++++ udev-106/etc/udev/redhat/05-udev-early.rules	2007-04-27 14:55:00.000000000 +0200
+@@ -1,10 +1,17 @@
+ # 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"
+ SUBSYSTEM=="module",		OPTIONS="ignore_device"
+ 
++
++ACTION=="add", SUBSYSTEM=="?*", ENV{MODALIAS}=="?*", RUN+="modprobe $env{MODALIAS}", OPTIONS="last_rule"
++
++# pnp devices
++ACTION=="add", SUBSYSTEM=="pnp", RUN+="/bin/sh -c 'while read id; do /lib/udev/modprobe pnp:d$$id; done < /sys/$devpath/id'", OPTIONS="last_rule"
++
++ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
++
++ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt", RUN+="touch /dev/WAITED"
++
+ ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", RUN="/sbin/firmware_helper", OPTIONS="last_rule"



From fedora-cvs-commits at redhat.com  Fri Apr 27 12:55:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 08:55:57 -0400
Subject: rpms/udev/devel modprobe,1.2,1.3 udev-rules.patch,1.32,1.33
Message-ID: <200704271255.l3RCtvn5004172@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4124

Modified Files:
	modprobe udev-rules.patch 
Log Message:
removed debugging actions


Index: modprobe
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/modprobe,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- modprobe	27 Apr 2007 12:47:41 -0000	1.2
+++ modprobe	27 Apr 2007 12:55:55 -0000	1.3
@@ -9,6 +9,3 @@
 	fi
 fi
 
-
-
-

udev-rules.patch:
 05-udev-early.rules  |   13 ++++++++++---
 50-udev.rules        |   13 +++----------
 95-pam-console.rules |    2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

Index: udev-rules.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- udev-rules.patch	27 Apr 2007 12:55:14 -0000	1.32
+++ udev-rules.patch	27 Apr 2007 12:55:55 -0000	1.33
@@ -86,6 +86,6 @@
 +
 +ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
 +
-+ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt", RUN+="touch /dev/WAITED"
++ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
 +
  ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", RUN="/sbin/firmware_helper", OPTIONS="last_rule"



From fedora-cvs-commits at redhat.com  Fri Apr 27 13:40:56 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 09:40:56 -0400
Subject: rpms/libaio/devel libaio-0.3.106-convert-to-syscall2.patch, NONE,
	1.1.2.1 libaio.spec, 1.23, 1.23.2.1
Message-ID: <200704271340.l3RDeuvc029071@cvs.devel.redhat.com>

Author: jmoyer

Update of /cvs/dist/rpms/libaio/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29054

Modified Files:
      Tag: private-jmoyer-syscall2-branch
	libaio.spec 
Added Files:
      Tag: private-jmoyer-syscall2-branch
	libaio-0.3.106-convert-to-syscall2.patch 
Log Message:
- remove system call assembler and replace with syscall(2)



libaio-0.3.106-convert-to-syscall2.patch:
 Makefile           |    2 +-
 io_queue_init.c    |    6 ++++--
 io_queue_release.c |    5 ++++-
 syscall-alpha.h    |    3 +++
 syscall-i386.h     |    6 ++++++
 syscall-ia64.h     |    3 +++
 syscall-ppc.h      |    3 +++
 syscall-s390.h     |    3 +++
 syscall-x86_64.h   |    3 +++
 syscall.h          |   41 +++++++++++++++++++++++++++++++++++++++++
 10 files changed, 71 insertions(+), 4 deletions(-)

--- NEW FILE libaio-0.3.106-convert-to-syscall2.patch ---
? src/compat-0_1.ol
? src/compat-0_1.os
? src/io_cancel.ol
? src/io_cancel.os
? src/io_destroy.ol
? src/io_destroy.os
? src/io_getevents.ol
? src/io_getevents.os
? src/io_queue_init.ol
? src/io_queue_init.os
? src/io_queue_release.ol
? src/io_queue_release.os
? src/io_queue_run.ol
? src/io_queue_run.os
? src/io_queue_wait.ol
? src/io_queue_wait.os
? src/io_setup.ol
? src/io_setup.os
? src/io_submit.ol
? src/io_submit.os
? src/libaio.so.1.0.1
Index: src/Makefile
===================================================================
RCS file: /usr/local/CVS/libaio/src/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- src/Makefile	25 Jan 2005 19:49:48 -0000	1.20
+++ src/Makefile	26 Apr 2007 18:57:46 -0000
@@ -25,7 +25,7 @@ libaio_srcs += io_getevents.c io_submit.
 libaio_srcs += io_setup.c io_destroy.c
 
 # internal functions
-libaio_srcs += raw_syscall.c
+# libaio_srcs += raw_syscall.c
 
 # old symbols
 libaio_srcs += compat-0_1.c
Index: src/io_queue_init.c
===================================================================
RCS file: /usr/local/CVS/libaio/src/io_queue_init.c,v
retrieving revision 1.5
diff -u -p -r1.5 io_queue_init.c
--- src/io_queue_init.c	20 May 2003 15:54:50 -0000	1.5
+++ src/io_queue_init.c	26 Apr 2007 18:57:46 -0000
@@ -25,9 +25,11 @@
 
 int io_queue_init(int maxevents, io_context_t *ctxp)
 {
+	int ret = -EINVAL;
+
 	if (maxevents > 0) {
 		*ctxp = NULL;
-		return io_setup(maxevents, ctxp);
+		ret = io_setup(maxevents, ctxp);
 	}
-	return -EINVAL;
+	return ret;
 }
Index: src/io_queue_release.c
===================================================================
RCS file: /usr/local/CVS/libaio/src/io_queue_release.c,v
retrieving revision 1.3
diff -u -p -r1.3 io_queue_release.c
--- src/io_queue_release.c	13 Sep 2002 03:30:12 -0000	1.3
+++ src/io_queue_release.c	26 Apr 2007 18:57:46 -0000
@@ -23,5 +23,8 @@
 
 int io_queue_release(io_context_t ctx)
 {
-	return io_destroy(ctx);
+	int ret;
+
+	ret = io_destroy(ctx);
+	return ret;
 }
Index: src/syscall-alpha.h
===================================================================
RCS file: /usr/local/CVS/libaio/src/syscall-alpha.h,v
retrieving revision 1.1
diff -u -p -r1.1 syscall-alpha.h
--- src/syscall-alpha.h	1 Apr 2005 20:31:32 -0000	1.1
+++ src/syscall-alpha.h	26 Apr 2007 18:57:46 -0000
@@ -4,6 +4,8 @@
 #define __NR_io_submit		401
 #define __NR_io_cancel		402
 
+#if 0
+
 #define inline_syscall_r0_asm
 #define inline_syscall_r0_out_constraint        "=v"
 
@@ -207,3 +209,4 @@ type fname (type1 arg1,type2 arg2,type3 
 {									\
    return (type)INLINE_SYSCALL1(sname, 5, arg1, arg2, arg3, arg4, arg5);\
 }
+#endif
Index: src/syscall-i386.h
===================================================================
RCS file: /usr/local/CVS/libaio/src/syscall-i386.h,v
retrieving revision 1.5
diff -u -p -r1.5 syscall-i386.h
--- src/syscall-i386.h	13 Oct 2004 18:10:27 -0000	1.5
+++ src/syscall-i386.h	26 Apr 2007 18:57:46 -0000
@@ -4,6 +4,9 @@
 #define __NR_io_submit		248
 #define __NR_io_cancel		249
 
+#if 0
+
+
 #define io_syscall1(type,fname,sname,type1,arg1)	\
 type fname(type1 arg1)					\
 {							\
@@ -70,3 +73,6 @@ __asm__ volatile ("movl %%ebx,%7\n"					
 	  "m" (tmp));							\
 return __res;								\
 }
+
+
+#endif
Index: src/syscall-ia64.h
===================================================================
RCS file: /usr/local/CVS/libaio/src/syscall-ia64.h,v
retrieving revision 1.8
diff -u -p -r1.8 syscall-ia64.h
--- src/syscall-ia64.h	1 Aug 2005 17:55:04 -0000	1.8
+++ src/syscall-ia64.h	26 Apr 2007 18:57:46 -0000
@@ -4,6 +4,8 @@
 #define __NR_io_submit		1241
 #define __NR_io_cancel		1242
 
+#if 0
+
 #define __ia64_raw_syscall(fname, sname) \
 	__asm__ (".text\n"						\
 		".globl " SYMSTR(fname) "\n"				\
@@ -43,3 +45,4 @@
 #define io_syscall5(type, fname, sname, type1, arg1, type2, arg2, type3, arg3, type4, arg4, type5, arg5)	\
 	extern type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5);			\
 	__ia64_raw_syscall(fname, sname);
+#endif
Index: src/syscall-ppc.h
===================================================================
RCS file: /usr/local/CVS/libaio/src/syscall-ppc.h,v
retrieving revision 1.4
diff -u -p -r1.4 syscall-ppc.h
--- src/syscall-ppc.h	13 Oct 2004 18:10:27 -0000	1.4
+++ src/syscall-ppc.h	26 Apr 2007 18:57:46 -0000
@@ -4,6 +4,7 @@
 #define __NR_io_submit		230
 #define __NR_io_cancel		231
 
+#if 0
 /* On powerpc a system call basically clobbers the same registers like a
  * function call, with the exception of LR (which is needed for the
  * "sc; bnslr" sequence) and CR (where only CR0.SO is clobbered to signal
@@ -92,3 +93,5 @@ type fname(type1 arg1, type2 arg2, type3
 {									\
 	__syscall_nr(5, type, sname, arg1, arg2, arg3, arg4, arg5);	\
 }
+
+#endif
Index: src/syscall-s390.h
===================================================================
RCS file: /usr/local/CVS/libaio/src/syscall-s390.h,v
retrieving revision 1.5
diff -u -p -r1.5 syscall-s390.h
--- src/syscall-s390.h	14 Oct 2004 15:48:53 -0000	1.5
+++ src/syscall-s390.h	26 Apr 2007 18:57:46 -0000
@@ -4,6 +4,8 @@
 #define __NR_io_submit		246
 #define __NR_io_cancel		247
 
+#if 0
+
 #define io_svc_clobber "1", "cc", "memory"
 
 #define io_syscall1(type,fname,sname,type1,arg1)		\
@@ -129,3 +131,4 @@ type fname(type1 arg1, type2 arg2, type3
 	__res = __svcres;					\
 	return (type) __res;					\
 }
+#endif
Index: src/syscall-x86_64.h
===================================================================
RCS file: /usr/local/CVS/libaio/src/syscall-x86_64.h,v
retrieving revision 1.5
diff -u -p -r1.5 syscall-x86_64.h
--- src/syscall-x86_64.h	13 Oct 2004 18:10:27 -0000	1.5
+++ src/syscall-x86_64.h	26 Apr 2007 18:57:46 -0000
@@ -4,6 +4,8 @@
 #define __NR_io_submit		209
 #define __NR_io_cancel		210
 
+#if 0
+
 #define __syscall_clobber "r11","rcx","memory" 
 #define __syscall "syscall"
 
@@ -61,3 +63,4 @@ __asm__ volatile ("movq %5,%%r10 ; movq 
 	__syscall_clobber,"r8","r10" );					\
 return __res;								\
 }
+#endif
Index: src/syscall.h
===================================================================
RCS file: /usr/local/CVS/libaio/src/syscall.h,v
retrieving revision 1.12
diff -u -p -r1.12 syscall.h
--- src/syscall.h	1 Apr 2005 20:31:32 -0000	1.12
+++ src/syscall.h	26 Apr 2007 18:57:46 -0000
@@ -1,5 +1,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
+#include <sys/errno.h>
 
 #define _SYMSTR(str)	#str
 #define SYMSTR(str)	_SYMSTR(str)
@@ -9,6 +10,46 @@
 
 #define DEFSYMVER(compat_sym, orig_sym, ver_sym)	\
 	__asm__(".symver " SYMSTR(compat_sym) "," SYMSTR(orig_sym) "@@LIBAIO_" SYMSTR(ver_sym));
+
+
+/* io_* calls return negative errno and do not set errno */
+#define NEG_ERRNO(x)	(x == -1 ? -errno : x)
+
+#define io_syscall1(type,fname,sname,type1,arg1)	\
+type fname(type1 arg1)					\
+{							\
+	long _res = syscall(__NR_##sname, arg1);	\
+	return NEG_ERRNO(_res);				\
+}
+
+#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2)	\
+type fname(type1 arg1,type2 arg2)				\
+{								\
+	long _res = syscall(__NR_##sname, arg1, arg2);		\
+	return NEG_ERRNO(_res);					\
+}
+
+#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3)	\
+type fname(type1 arg1,type2 arg2,type3 arg3)				\
+{									\
+	long _res = syscall(__NR_##sname, arg1, arg2, arg3);		\
+	return NEG_ERRNO(_res);						\
+}
+
+#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
+type fname(type1 arg1,type2 arg2,type3 arg3,type4 arg4)			\
+{									\
+	long _res = syscall(__NR_##sname, arg1, arg2, arg3, arg4);	\
+	return NEG_ERRNO(_res);						\
+}
+
+#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
+	type5,arg5)							\
+type fname(type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5)	\
+{									\
+	long _res = syscall(__NR_##sname, arg1, arg2, arg3, arg4, arg5); \
+	return NEG_ERRNO(_res);						\
+}
 
 #if defined(__i386__)
 #include "syscall-i386.h"


Index: libaio.spec
===================================================================
RCS file: /cvs/dist/rpms/libaio/devel/libaio.spec,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -u -r1.23 -r1.23.2.1
--- libaio.spec	17 Jul 2006 13:07:32 -0000	1.23
+++ libaio.spec	27 Apr 2007 13:40:52 -0000	1.23.2.1
@@ -1,10 +1,11 @@
 Name: libaio
 Version: 0.3.106
-Release: 3.2
+Release: 3.3
 Summary: Linux-native asynchronous I/O access library
 License: LGPL
 Group:  System Environment/Libraries
 Source: %{name}-%{version}.tar.gz
+Patch1: libaio-0.3.106-convert-to-syscall2.patch
 BuildRoot: %{_tmppath}/%{name}-root
 # Fix ExclusiveArch as we implement this functionality on more architectures
 ExclusiveArch: i386 x86_64 ia64 s390 s390x ppc ppc64 ppc64pseries ppc64iseries alpha alphaev6
@@ -29,6 +30,7 @@
 %prep
 %setup -a 0
 mv %{name}-%{version} compat-%{name}-%{version}
+%patch1 -p0 -b .syscall2
 
 %build
 # A library with a soname of 1.0.0 was inadvertantly released.  This
@@ -70,6 +72,9 @@
 %attr(0644,root,root) %{_libdir}/libaio.a
 
 %changelog
+* Fri Apr 27 2007 Jeff Moyer <jmoyer at redhat.com> - 0.3.106-3.3
+- remove system call assembler and replace with syscall(2)
+
 * Mon Jul 17 2006 Jeff Moyer <jmoyer at redhat.com> - 0.3.106-3.2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Apr 27 13:45:55 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 09:45:55 -0400
Subject: rpms/bind/devel bind-9.4.0-dbus-race-condition.patch, NONE,
	1.1 bind.spec, 1.174, 1.175 named.caching-nameserver.conf, 1.6, 1.7
Message-ID: <200704271345.l3RDjtQ8029171@cvs.devel.redhat.com>

Author: atkac

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

Modified Files:
	bind.spec named.caching-nameserver.conf 
Added Files:
	bind-9.4.0-dbus-race-condition.patch 
Log Message:
- fixed race-condition in dbus code (#235809)


bind-9.4.0-dbus-race-condition.patch:
 dbus_mgr.c     |   15 +++++------
 dbus_service.c |   73 +++++++++++++++++++++++++++++----------------------------
 dbus_service.h |    5 +++
 3 files changed, 49 insertions(+), 44 deletions(-)

--- NEW FILE bind-9.4.0-dbus-race-condition.patch ---
--- bind-9.4.0/contrib/dbus/dbus_service.c.race-condition	2006-09-28 07:53:47.000000000 +0200
+++ bind-9.4.0/contrib/dbus/dbus_service.c	2007-04-27 15:10:03.000000000 +0200
@@ -5,6 +5,7 @@
  *  Provides MINIMAL utilities for construction of D-BUS "Services".
  *  
  *  Copyright(C) Jason Vas Dias, Red Hat Inc., 2005
+ *  Modified by Adam Tkac, Red Hat Inc., 2007
  *
  *  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
@@ -50,6 +51,7 @@
 #include <dbus/dbus.h>
 
 #include <named/dbus_service.h>
+#include <isc/result.h>
 
 typedef struct dbcs_s
 {
@@ -914,38 +916,39 @@
     cs->status = SHUTDOWN;
 }
 
-static DBusConnectionState *
+static isc_result_t
 connection_setup 
-(   DBusConnection *connection,  
+(   DBusConnection *connection,
+    DBUS_SVC *dbus,
     dbus_svc_WatchHandler wh, 
     dbus_svc_ErrorHandler eh, 
     dbus_svc_ErrorHandler dh,
     void *wh_arg
 )
 {
-    DBusConnectionState *cs = dbcs_new( connection );
+    *dbus = dbcs_new( connection );
     
-    if ( cs == 0L )
+    if ( *dbus == 0L )
     {
 	if(eh)(*(eh))("connection_setup: out of memory");
 	goto fail;
     }
-    cs->wh = wh;
-    cs->wh_arg = wh_arg;
-    cs->eh = eh;
-    cs->dh = dh;
+    (*dbus)->wh = wh;
+    (*dbus)->wh_arg = wh_arg;
+    (*dbus)->eh = eh;
+    (*dbus)->dh = dh;
 
     if (!dbus_connection_set_watch_functions 
-	 (    cs->connection,
+	 (    (*dbus)->connection,
 	      add_watch,
 	      remove_watch,
 	      toggle_watch,
-	      cs,
+	      *dbus,
 	      no_free
 	  )
        )
     {
-	if( cs->eh != 0L ) (*(cs->eh))("connection_setup: dbus_connection_set_watch_functions failed");
+	if( (*dbus)->eh != 0L ) (*((*dbus)->eh))("connection_setup: dbus_connection_set_watch_functions failed");
 	goto fail; 
     }
       
@@ -954,43 +957,44 @@
 	      add_timeout,
 	      remove_timeout,
 	      toggle_timeout,
-	      cs, 
+	      *dbus, 
 	      no_free
 	 )
        )
     {
-	if( cs->eh != 0L ) (*(cs->eh))("connection_setup: dbus_connection_set_timeout_functions failed");
+	if( (*dbus)->eh != 0L ) (*((*dbus)->eh))("connection_setup: dbus_connection_set_timeout_functions failed");
 	goto fail;
     }
 
     dbus_connection_set_dispatch_status_function 
     (   connection, 
 	dispatch_status, 
-	cs, 
+	*dbus, 
 	no_free
     ); 
 
     if (dbus_connection_get_dispatch_status (connection) != DBUS_DISPATCH_COMPLETE)
 	dbus_connection_ref(connection);    
     
-    return cs;
+    return ISC_R_SUCCESS;
   
  fail:
-    if( cs != 0L )
-	free(cs);
+    if( *dbus != 0L )
+	free(*dbus);
   
     dbus_connection_set_dispatch_status_function (connection, NULL, NULL, NULL);
     dbus_connection_set_watch_functions (connection, NULL, NULL, NULL, NULL, NULL);
     dbus_connection_set_timeout_functions (connection, NULL, NULL, NULL, NULL, NULL);
   
-    return 0L;
+    return ISC_R_FAILURE;
 }
 
-DBusConnectionState *
+isc_result_t
 dbus_svc_init
 (
     dbus_svc_DBUS_TYPE    bus,
     char                  *name, 
+    DBUS_SVC		  *dbus,
     dbus_svc_WatchHandler wh ,
     dbus_svc_ErrorHandler eh ,
     dbus_svc_ErrorHandler dh ,
@@ -999,7 +1003,6 @@
 {
     DBusConnection       *connection;
     DBusError            error;
-    DBusConnectionState  *cs;
     char *session_bus_address=0L;
 
     memset(&error,'\0',sizeof(DBusError));
@@ -1015,7 +1018,7 @@
 	if ( (connection = dbus_connection_open_private("unix:path=/var/run/dbus/system_bus_socket", &error)) == 0L )
 	{
 	    if(eh)(*eh)("dbus_svc_init failed: %s %s",error.name, error.message);
-	    return ( 0L );
+	    return ISC_R_FAILURE;
 	}
 
 	if ( ! dbus_bus_register(connection,&error) )
@@ -1023,7 +1026,7 @@
 	    if(eh)(*eh)("dbus_bus_register failed: %s %s", error.name, error.message);
 	    dbus_connection_close(connection);
 	    free(connection);
-	    return ( 0L );
+	    return ISC_R_FAILURE;
 	}
 	break;
 
@@ -1033,13 +1036,13 @@
 	if ( session_bus_address == 0L )
 	{
 	    if(eh)(*eh)("dbus_svc_init failed: DBUS_SESSION_BUS_ADDRESS environment variable not set");
-	    return ( 0L );
+	    return ISC_R_FAILURE;
 	}
 
 	if ( (connection = dbus_connection_open_private(session_bus_address, &error)) == 0L )
 	{
 	    if(eh)(*eh)("dbus_svc_init failed: %s %s",error.name, error.message);
-	    return ( 0L );
+	    return ISC_R_FAILURE;
 	}
 
 	if ( ! dbus_bus_register(connection,&error) )
@@ -1047,7 +1050,7 @@
 	    if(eh)(*eh)("dbus_bus_register failed: %s %s", error.name, error.message);
 	    dbus_connection_close(connection);
 	    free(connection);
-	    return ( 0L );
+	    return ISC_R_FAILURE;
 	}
 	break;
 
@@ -1057,27 +1060,27 @@
 	if ( (connection = dbus_bus_get (bus, &error)) == 0L )
 	{
 	    if(eh)(*eh)("dbus_svc_init failed: %s %s",error.name, error.message);
-	    return ( 0L );
+	    return ISC_R_FAILURE;
 	}
 	break;
 
     default:
 	if(eh)(*eh)("dbus_svc_init failed: unknown bus type %d", bus);
-	return ( 0L );
+	return ISC_R_FAILURE;
     }
     
     dbus_connection_set_exit_on_disconnect(connection, FALSE);
 
-    if ( (cs = connection_setup(connection, wh, eh, dh, wh_arg)) == 0L )
+    if ( (connection_setup(connection, dbus, wh, eh, dh, wh_arg)) != ISC_R_SUCCESS)
     {
 	if(eh)(*eh)("dbus_svc_init failed: connection_setup failed");
-	return( 0L );
+	return ISC_R_FAILURE;
     }
 
     if( name == 0L )
-	return( cs );
+	return ISC_R_SUCCESS;
     
-    cs->unique_name = dbus_bus_get_unique_name(connection);
+    (*dbus)->unique_name = dbus_bus_get_unique_name(connection);
 
     switch
 	(   dbus_bus_request_name 
@@ -1102,19 +1105,19 @@
 	if(eh)(*eh)("dbus_svc_init: dbus_bus_request_name failed: %s %s", error.name, error.message);
 	goto give_up;
     }
-    return ( cs );
+    return ISC_R_SUCCESS;
 
  give_up:
     dbus_connection_close( connection );
     dbus_connection_unref( connection );
-    if( cs )
+    if( *dbus )
     {
 	dbus_connection_set_dispatch_status_function (connection, NULL, NULL, NULL);
 	dbus_connection_set_watch_functions (connection, NULL, NULL, NULL, NULL, NULL);
 	dbus_connection_set_timeout_functions (connection, NULL, NULL, NULL, NULL, NULL);
-	free(cs);    
+	free(*dbus);    
     }
-    return ( 0L );
+    return ISC_R_FAILURE;
 }
 
 const char *dbus_svc_unique_name(DBusConnectionState *cs)
--- bind-9.4.0/contrib/dbus/dbus_mgr.c.race-condition	2006-01-23 05:56:26.000000000 +0100
+++ bind-9.4.0/contrib/dbus/dbus_mgr.c	2007-04-27 15:03:19.000000000 +0200
@@ -4,6 +4,7 @@
  *  response to D-BUS dhcp events or commands.
  *
  *  Copyright(C) Jason Vas Dias, Red Hat Inc., 2005
+ *  Modified by Adam Tkac, Red Hat Inc., 2007
  *
  *  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
@@ -281,6 +282,7 @@
 dbus_mgr_init_dbus(ns_dbus_mgr_t * mgr)
 {
     char destination[]=DBUSMGR_DESTINATION;
+    isc_result_t result;
 
     if( mgr->sockets != 0L )
     {
@@ -296,14 +298,11 @@
 	mgr->dbus = 0L;
     }
 
-    mgr->dbus = 
-	dbus_svc_init
-	(   DBUS_PRIVATE_SYSTEM,
-	    destination,
-	    dbus_mgr_watch_handler,
-	    0L, 0L,
-	    mgr
-	);
+    result = dbus_svc_init(DBUS_PRIVATE_SYSTEM, destination, &mgr->dbus,
+					dbus_mgr_watch_handler, 0L, 0L, mgr);
+
+    if(result != ISC_R_SUCCESS)
+	goto cleanup;
 
     if( mgr->dbus == 0L )
     {
--- bind-9.4.0/contrib/dbus/dbus_service.h.race-condition	2006-01-23 05:56:26.000000000 +0100
+++ bind-9.4.0/contrib/dbus/dbus_service.h	2007-04-27 15:03:19.000000000 +0200
@@ -3,6 +3,7 @@
  *  Provides utilities for construction of D-BUS "Services"  
  *
  *  Copyright(C) Jason Vas Dias, Red Hat Inc., 2005
+ *  Modified by Adam Tkac, Red Hat Inc., 2007
  *
  *  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
@@ -22,6 +23,7 @@
 
 #include <stdint.h>
 #include <stdarg.h>
+#include <isc/types.h>
 
 typedef struct dbcs_s* DBUS_SVC;
 
@@ -124,9 +126,10 @@
 
 #define SHUTDOWN 255
 
-extern  DBUS_SVC dbus_svc_init
+extern isc_result_t dbus_svc_init
 ( dbus_svc_DBUS_TYPE bus, 
   char *name,                         /* name to register with D-BUS */
+  DBUS_SVC *dbus,                     /* dbus handle */
   dbus_svc_WatchHandler wh,           /* optional handler for watch events */
   dbus_svc_ErrorHandler eh,           /* optional error log message handler */
   dbus_svc_ErrorHandler dh,           /* optional debug / info log message handler */


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- bind.spec	24 Apr 2007 11:12:38 -0000	1.174
+++ bind.spec	27 Apr 2007 13:45:53 -0000	1.175
@@ -82,7 +82,7 @@
 Patch65:	bind-9.4.0-dig-idn.patch
 %endif
 Patch66:	bind-9.4.0-zone-freeze.patch
-#Patch67:	bind-9.4.0-dbus-race-condition.patch
+Patch67:	bind-9.4.0-dbus-race-condition.patch
 #
 Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2, mktemp
 Requires(post): grep, chkconfig >= 1.3.26
@@ -288,7 +288,7 @@
 #
 # this must follow all dbus patches:
 #
-#%patch67 -p1 -b .race-condition
+%patch67 -p1 -b .race-condition
 cp -fp contrib/dbus/{dbus_mgr.c,dbus_service.c} bin/named
 cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named
 %if %{SDB}
@@ -315,7 +315,7 @@
 
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="$RPM_OPT_FLAGS -O0"
 
 %if %{IDN}
 pushd contrib/idn/idnkit-1.0-src
@@ -808,10 +808,11 @@
 
 
 %changelog
-* Tue Apr 24 2007 Adam Tkac <atkac redhat com> 31:9.4.0-8.fc7
+* Fri Apr 27 2007 Adam Tkac <atkac redhat com> 31:9.4.0-8.fc7
 - improved "zone freeze patch" - if multiple zone with same name exists
   no zone is freezed
 - minor cleanup in caching-nameserver's config file
+- fixed race-condition in dbus code (#235809)
 
 * Tue Apr 17 2007 Adam Tkac <atkac redhat com> 31:9.4.0-7.fc7
 - removed DEBUGINFO option because with this option (default) was bind


Index: named.caching-nameserver.conf
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/named.caching-nameserver.conf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- named.caching-nameserver.conf	24 Apr 2007 11:12:38 -0000	1.6
+++ named.caching-nameserver.conf	27 Apr 2007 13:45:53 -0000	1.7
@@ -3,7 +3,7 @@
 //
 // Provided by Red Hat caching-nameserver package to configure the
 // ISC BIND named(8) DNS server as a caching only nameserver 
-// (as a localhost DNS resolver only). 
+// (as a localhost DNS resolver only).
 //
 // See /usr/share/doc/bind*/sample/ for example named configuration files.
 //



From fedora-cvs-commits at redhat.com  Fri Apr 27 13:47:02 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 09:47:02 -0400
Subject: rpms/udev/devel udev.spec,1.201,1.202
Message-ID: <200704271347.l3RDl2YY029255@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29240

Modified Files:
	udev.spec 
Log Message:
- modprobe only on modalias (bug #238140)
- make startup messages visible again
- speedup boot process by not executing pam_console_apply while booting
- Resolves: rhbz#238140



Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- udev.spec	27 Apr 2007 12:47:41 -0000	1.201
+++ udev.spec	27 Apr 2007 13:47:00 -0000	1.202
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 106
-Release: 2.hh.7%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -352,6 +352,12 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Fri Apr 27 2007 Harald Hoyer <harald at redhat.com> - 106-3
+- modprobe only on modalias (bug #238140)
+- make startup messages visible again
+- speedup boot process by not executing pam_console_apply while booting
+- Resolves: rhbz#238140
+
 * Wed Apr 11 2007 Harald Hoyer <harald at redhat.com> - 106-2
 - create floppy device nodes with the correct selinux context (bug #235953)
 - Resolves: rhbz#235953



From fedora-cvs-commits at redhat.com  Fri Apr 27 13:47:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 09:47:53 -0400
Subject: rpms/bind/devel bind.spec,1.175,1.176
Message-ID: <200704271347.l3RDlrks029327@cvs.devel.redhat.com>

Author: atkac

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

Modified Files:
	bind.spec 
Log Message:
- removed -O0 gcc flag



Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- bind.spec	27 Apr 2007 13:45:53 -0000	1.175
+++ bind.spec	27 Apr 2007 13:47:51 -0000	1.176
@@ -315,7 +315,7 @@
 
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -O0"
+export CFLAGS="$RPM_OPT_FLAGS"
 
 %if %{IDN}
 pushd contrib/idn/idnkit-1.0-src



From fedora-cvs-commits at redhat.com  Fri Apr 27 13:59:13 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 09:59:13 -0400
Subject: rpms/bind/devel bind-chroot-admin.in, 1.19, 1.20 bind.spec, 1.176,
	1.177
Message-ID: <200704271359.l3RDxDm2029542@cvs.devel.redhat.com>

Author: atkac

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29512

Modified Files:
	bind-chroot-admin.in bind.spec 
Log Message:
- added forgotten restorecon statement in bind-chroot-admin



Index: bind-chroot-admin.in
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind-chroot-admin.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bind-chroot-admin.in	16 Mar 2007 15:25:39 -0000	1.19
+++ bind-chroot-admin.in	27 Apr 2007 13:59:11 -0000	1.20
@@ -265,7 +265,7 @@
 	if selinux_enabled && [ -x /sbin/restorecon ]; then
 	   /sbin/restorecon -R ${BIND_CHROOT_PREFIX}/etc ${BIND_CHROOT_PREFIX}/var/named ${BIND_CHROOT_PREFIX}/var/run/named >/dev/null 2>&1;
 	   if [ -e ${BIND_CHROOT_PREFIX}/etc/localtime ] && [ -e /etc/localtime ] ; then 
-	      /usr/bin/ ${BIND_CHROOT_PREFIX}/etc/localtime >/dev/null 2>&1;
+	      /usr/bin/restorecon ${BIND_CHROOT_PREFIX}/etc/localtime >/dev/null 2>&1;
 	   fi;		
 	   /sbin/restorecon /etc/named.*    >/dev/null 2>&1;
 	   /sbin/restorecon /etc/rndc.key   >/dev/null 2>&1;


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- bind.spec	27 Apr 2007 13:47:51 -0000	1.176
+++ bind.spec	27 Apr 2007 13:59:11 -0000	1.177
@@ -813,6 +813,7 @@
   no zone is freezed
 - minor cleanup in caching-nameserver's config file
 - fixed race-condition in dbus code (#235809)
+- added forgotten restorecon statement in bind-chroot-admin
 
 * Tue Apr 17 2007 Adam Tkac <atkac redhat com> 31:9.4.0-7.fc7
 - removed DEBUGINFO option because with this option (default) was bind



From fedora-cvs-commits at redhat.com  Fri Apr 27 14:03:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 10:03:57 -0400
Subject: rpms/bind/FC-6 bind-9.4.0-dbus-race-condition.patch, NONE,
	1.1 bind-chroot-admin.in, 1.15, 1.16 bind.spec, 1.148, 1.149
Message-ID: <200704271403.l3RE3vth029866@cvs.devel.redhat.com>

Author: atkac

Update of /cvs/dist/rpms/bind/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv29830

Modified Files:
	bind-chroot-admin.in bind.spec 
Added Files:
	bind-9.4.0-dbus-race-condition.patch 
Log Message:
- fixed minor issues in bind-chroot-admin script
- fixed race-condition in dbus code (#235809)


bind-9.4.0-dbus-race-condition.patch:
 dbus_mgr.c     |   15 +++++------
 dbus_service.c |   73 +++++++++++++++++++++++++++++----------------------------
 dbus_service.h |    5 +++
 3 files changed, 49 insertions(+), 44 deletions(-)

--- NEW FILE bind-9.4.0-dbus-race-condition.patch ---
--- bind-9.4.0/contrib/dbus/dbus_service.c.race-condition	2006-09-28 07:53:47.000000000 +0200
+++ bind-9.4.0/contrib/dbus/dbus_service.c	2007-04-27 15:10:03.000000000 +0200
@@ -5,6 +5,7 @@
  *  Provides MINIMAL utilities for construction of D-BUS "Services".
  *  
  *  Copyright(C) Jason Vas Dias, Red Hat Inc., 2005
+ *  Modified by Adam Tkac, Red Hat Inc., 2007
  *
  *  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
@@ -50,6 +51,7 @@
 #include <dbus/dbus.h>
 
 #include <named/dbus_service.h>
+#include <isc/result.h>
 
 typedef struct dbcs_s
 {
@@ -914,38 +916,39 @@
     cs->status = SHUTDOWN;
 }
 
-static DBusConnectionState *
+static isc_result_t
 connection_setup 
-(   DBusConnection *connection,  
+(   DBusConnection *connection,
+    DBUS_SVC *dbus,
     dbus_svc_WatchHandler wh, 
     dbus_svc_ErrorHandler eh, 
     dbus_svc_ErrorHandler dh,
     void *wh_arg
 )
 {
-    DBusConnectionState *cs = dbcs_new( connection );
+    *dbus = dbcs_new( connection );
     
-    if ( cs == 0L )
+    if ( *dbus == 0L )
     {
 	if(eh)(*(eh))("connection_setup: out of memory");
 	goto fail;
     }
-    cs->wh = wh;
-    cs->wh_arg = wh_arg;
-    cs->eh = eh;
-    cs->dh = dh;
+    (*dbus)->wh = wh;
+    (*dbus)->wh_arg = wh_arg;
+    (*dbus)->eh = eh;
+    (*dbus)->dh = dh;
 
     if (!dbus_connection_set_watch_functions 
-	 (    cs->connection,
+	 (    (*dbus)->connection,
 	      add_watch,
 	      remove_watch,
 	      toggle_watch,
-	      cs,
+	      *dbus,
 	      no_free
 	  )
        )
     {
-	if( cs->eh != 0L ) (*(cs->eh))("connection_setup: dbus_connection_set_watch_functions failed");
+	if( (*dbus)->eh != 0L ) (*((*dbus)->eh))("connection_setup: dbus_connection_set_watch_functions failed");
 	goto fail; 
     }
       
@@ -954,43 +957,44 @@
 	      add_timeout,
 	      remove_timeout,
 	      toggle_timeout,
-	      cs, 
+	      *dbus, 
 	      no_free
 	 )
        )
     {
-	if( cs->eh != 0L ) (*(cs->eh))("connection_setup: dbus_connection_set_timeout_functions failed");
+	if( (*dbus)->eh != 0L ) (*((*dbus)->eh))("connection_setup: dbus_connection_set_timeout_functions failed");
 	goto fail;
     }
 
     dbus_connection_set_dispatch_status_function 
     (   connection, 
 	dispatch_status, 
-	cs, 
+	*dbus, 
 	no_free
     ); 
 
     if (dbus_connection_get_dispatch_status (connection) != DBUS_DISPATCH_COMPLETE)
 	dbus_connection_ref(connection);    
     
-    return cs;
+    return ISC_R_SUCCESS;
   
  fail:
-    if( cs != 0L )
-	free(cs);
+    if( *dbus != 0L )
+	free(*dbus);
   
     dbus_connection_set_dispatch_status_function (connection, NULL, NULL, NULL);
     dbus_connection_set_watch_functions (connection, NULL, NULL, NULL, NULL, NULL);
     dbus_connection_set_timeout_functions (connection, NULL, NULL, NULL, NULL, NULL);
   
-    return 0L;
+    return ISC_R_FAILURE;
 }
 
-DBusConnectionState *
+isc_result_t
 dbus_svc_init
 (
     dbus_svc_DBUS_TYPE    bus,
     char                  *name, 
+    DBUS_SVC		  *dbus,
     dbus_svc_WatchHandler wh ,
     dbus_svc_ErrorHandler eh ,
     dbus_svc_ErrorHandler dh ,
@@ -999,7 +1003,6 @@
 {
     DBusConnection       *connection;
     DBusError            error;
-    DBusConnectionState  *cs;
     char *session_bus_address=0L;
 
     memset(&error,'\0',sizeof(DBusError));
@@ -1015,7 +1018,7 @@
 	if ( (connection = dbus_connection_open_private("unix:path=/var/run/dbus/system_bus_socket", &error)) == 0L )
 	{
 	    if(eh)(*eh)("dbus_svc_init failed: %s %s",error.name, error.message);
-	    return ( 0L );
+	    return ISC_R_FAILURE;
 	}
 
 	if ( ! dbus_bus_register(connection,&error) )
@@ -1023,7 +1026,7 @@
 	    if(eh)(*eh)("dbus_bus_register failed: %s %s", error.name, error.message);
 	    dbus_connection_close(connection);
 	    free(connection);
-	    return ( 0L );
+	    return ISC_R_FAILURE;
 	}
 	break;
 
@@ -1033,13 +1036,13 @@
 	if ( session_bus_address == 0L )
 	{
 	    if(eh)(*eh)("dbus_svc_init failed: DBUS_SESSION_BUS_ADDRESS environment variable not set");
-	    return ( 0L );
+	    return ISC_R_FAILURE;
 	}
 
 	if ( (connection = dbus_connection_open_private(session_bus_address, &error)) == 0L )
 	{
 	    if(eh)(*eh)("dbus_svc_init failed: %s %s",error.name, error.message);
-	    return ( 0L );
+	    return ISC_R_FAILURE;
 	}
 
 	if ( ! dbus_bus_register(connection,&error) )
@@ -1047,7 +1050,7 @@
 	    if(eh)(*eh)("dbus_bus_register failed: %s %s", error.name, error.message);
 	    dbus_connection_close(connection);
 	    free(connection);
-	    return ( 0L );
+	    return ISC_R_FAILURE;
 	}
 	break;
 
@@ -1057,27 +1060,27 @@
 	if ( (connection = dbus_bus_get (bus, &error)) == 0L )
 	{
 	    if(eh)(*eh)("dbus_svc_init failed: %s %s",error.name, error.message);
-	    return ( 0L );
+	    return ISC_R_FAILURE;
 	}
 	break;
 
     default:
 	if(eh)(*eh)("dbus_svc_init failed: unknown bus type %d", bus);
-	return ( 0L );
+	return ISC_R_FAILURE;
     }
     
     dbus_connection_set_exit_on_disconnect(connection, FALSE);
 
-    if ( (cs = connection_setup(connection, wh, eh, dh, wh_arg)) == 0L )
+    if ( (connection_setup(connection, dbus, wh, eh, dh, wh_arg)) != ISC_R_SUCCESS)
     {
 	if(eh)(*eh)("dbus_svc_init failed: connection_setup failed");
-	return( 0L );
+	return ISC_R_FAILURE;
     }
 
     if( name == 0L )
-	return( cs );
+	return ISC_R_SUCCESS;
     
-    cs->unique_name = dbus_bus_get_unique_name(connection);
+    (*dbus)->unique_name = dbus_bus_get_unique_name(connection);
 
     switch
 	(   dbus_bus_request_name 
@@ -1102,19 +1105,19 @@
 	if(eh)(*eh)("dbus_svc_init: dbus_bus_request_name failed: %s %s", error.name, error.message);
 	goto give_up;
     }
-    return ( cs );
+    return ISC_R_SUCCESS;
 
  give_up:
     dbus_connection_close( connection );
     dbus_connection_unref( connection );
-    if( cs )
+    if( *dbus )
     {
 	dbus_connection_set_dispatch_status_function (connection, NULL, NULL, NULL);
 	dbus_connection_set_watch_functions (connection, NULL, NULL, NULL, NULL, NULL);
 	dbus_connection_set_timeout_functions (connection, NULL, NULL, NULL, NULL, NULL);
-	free(cs);    
+	free(*dbus);    
     }
-    return ( 0L );
+    return ISC_R_FAILURE;
 }
 
 const char *dbus_svc_unique_name(DBusConnectionState *cs)
--- bind-9.4.0/contrib/dbus/dbus_mgr.c.race-condition	2006-01-23 05:56:26.000000000 +0100
+++ bind-9.4.0/contrib/dbus/dbus_mgr.c	2007-04-27 15:03:19.000000000 +0200
@@ -4,6 +4,7 @@
  *  response to D-BUS dhcp events or commands.
  *
  *  Copyright(C) Jason Vas Dias, Red Hat Inc., 2005
+ *  Modified by Adam Tkac, Red Hat Inc., 2007
  *
  *  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
@@ -281,6 +282,7 @@
 dbus_mgr_init_dbus(ns_dbus_mgr_t * mgr)
 {
     char destination[]=DBUSMGR_DESTINATION;
+    isc_result_t result;
 
     if( mgr->sockets != 0L )
     {
@@ -296,14 +298,11 @@
 	mgr->dbus = 0L;
     }
 
-    mgr->dbus = 
-	dbus_svc_init
-	(   DBUS_PRIVATE_SYSTEM,
-	    destination,
-	    dbus_mgr_watch_handler,
-	    0L, 0L,
-	    mgr
-	);
+    result = dbus_svc_init(DBUS_PRIVATE_SYSTEM, destination, &mgr->dbus,
+					dbus_mgr_watch_handler, 0L, 0L, mgr);
+
+    if(result != ISC_R_SUCCESS)
+	goto cleanup;
 
     if( mgr->dbus == 0L )
     {
--- bind-9.4.0/contrib/dbus/dbus_service.h.race-condition	2006-01-23 05:56:26.000000000 +0100
+++ bind-9.4.0/contrib/dbus/dbus_service.h	2007-04-27 15:03:19.000000000 +0200
@@ -3,6 +3,7 @@
  *  Provides utilities for construction of D-BUS "Services"  
  *
  *  Copyright(C) Jason Vas Dias, Red Hat Inc., 2005
+ *  Modified by Adam Tkac, Red Hat Inc., 2007
  *
  *  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
@@ -22,6 +23,7 @@
 
 #include <stdint.h>
 #include <stdarg.h>
+#include <isc/types.h>
 
 typedef struct dbcs_s* DBUS_SVC;
 
@@ -124,9 +126,10 @@
 
 #define SHUTDOWN 255
 
-extern  DBUS_SVC dbus_svc_init
+extern isc_result_t dbus_svc_init
 ( dbus_svc_DBUS_TYPE bus, 
   char *name,                         /* name to register with D-BUS */
+  DBUS_SVC *dbus,                     /* dbus handle */
   dbus_svc_WatchHandler wh,           /* optional handler for watch events */
   dbus_svc_ErrorHandler eh,           /* optional error log message handler */
   dbus_svc_ErrorHandler dh,           /* optional debug / info log message handler */


Index: bind-chroot-admin.in
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-6/bind-chroot-admin.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- bind-chroot-admin.in	26 Feb 2007 13:01:31 -0000	1.15
+++ bind-chroot-admin.in	27 Apr 2007 14:03:50 -0000	1.16
@@ -51,12 +51,15 @@
     fi;
 }
 
-rootdir;
-
 function selinux_enabled()
 {
-    while read d mp fs rest; do if [ "$fs" = "selinuxfs" ]; then return 0; fi; done < /proc/mounts
-    return 1;
+    if [ -x /usr/sbin/selinuxenabled ]; then
+      /usr/sbin/selinuxenabled;
+      if [ $? -eq 0 ]; then
+        return 1;
+      fi;
+    fi;
+    return 0;
 }
 
 function check_dirs()
@@ -96,9 +99,9 @@
     [ ! -e "${BIND_CHROOT_PREFIX}/etc/localtime" ] &&  [ -e /etc/localtime ] && /bin/cp -fp /etc/localtime "${BIND_CHROOT_PREFIX}/etc/localtime";
     /bin/chown --preserve-root root:named "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero};
     /bin/chmod --preserve-root 660 "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero};
-    if selinux_enabled && [ -x /usr/bin/chcon ]; then       
+    if selinux_enabled && [ -x /sbin/restorecon ]; then       
        for dev in random zero null; do
-	   /usr/bin/chcon --reference=/dev/$dev ${BIND_CHROOT_PREFIX}/dev/$dev;
+	   /sbin/restorecon ${BIND_CHROOT_PREFIX}/dev/$dev;
        done
     fi;
 }
@@ -193,20 +196,22 @@
 
 function enable_bind_chroot()
 {
+    rootdir;
     if /bin/egrep -q '^ROOTDIR=' /etc/sysconfig/named; then
 	/bin/sed -i -e 's#^ROOTDIR=.*$#ROOTDIR='${BIND_CHROOT_PREFIX}'#' /etc/sysconfig/named ;
     else
 	echo 'ROOTDIR='${BIND_CHROOT_PREFIX} >> /etc/sysconfig/named;
-    fi
+    fi;
 }
 
 function disable_bind_chroot()
 {
-    /bin/sed -i -e '/^ROOTDIR=/d' /etc/sysconfig/named;    
+    /bin/sed -i -e '/^ROOTDIR=/d' /etc/sysconfig/named;
 }
 
 function sync_files()
 {
+    rootdir;
     shopt -q nullglob;
     ng=$?
     shopt -s nullglob;
@@ -260,16 +265,16 @@
 	if selinux_enabled && [ -x /sbin/restorecon ]; then
 	   /sbin/restorecon -R ${BIND_CHROOT_PREFIX}/etc ${BIND_CHROOT_PREFIX}/var/named ${BIND_CHROOT_PREFIX}/var/run/named >/dev/null 2>&1;
 	   if [ -e ${BIND_CHROOT_PREFIX}/etc/localtime ] && [ -e /etc/localtime ] ; then 
-	      /usr/bin/chcon --reference=/etc/localtime ${BIND_CHROOT_PREFIX}/etc/localtime >/dev/null 2>&1;
+	      /usr/bin/restorecon ${BIND_CHROOT_PREFIX}/etc/localtime >/dev/null 2>&1;
 	   fi;		
-	   /usr/bin/chcon -h --reference=/etc/named.conf /etc/named.*    >/dev/null 2>&1;
-	   /usr/bin/chcon -h --reference=/etc/rndc.key   /etc/rndc.key   >/dev/null 2>&1;
-	   /usr/bin/chcon -h --reference=/etc/rndc.conf  /etc/rndc.conf  >/dev/null 2>&1;
-	   /usr/bin/chcon -h --reference=/var/named     /var/named{/,/*} >/dev/null 2>&1;
-	   /usr/bin/chcon -h --reference=${BIND_CHROOT_PREFIX}/var/named/slaves /var/named/{slaves,data}{/,/*} >/dev/null 2>&1;
+	   /sbin/restorecon /etc/named.*    >/dev/null 2>&1;
+	   /sbin/restorecon /etc/rndc.key   >/dev/null 2>&1;
+	   /sbin/restorecon /etc/rndc.conf  >/dev/null 2>&1;
+	   /sbin/restorecon /var/named{/,/*} >/dev/null 2>&1;
+	   /sbin/restorecon /var/named/{slaves,data}{/,/*} >/dev/null 2>&1;
 	   /sbin/restorecon /var/named/named.ca ${BIND_CHROOT_PREFIX}/var/named/named.ca  >/dev/null 2>&1;
 	   /sbin/restorecon ${BIND_CHROOT_PREFIX} >/dev/null 2>&1;
-	   /usr/bin/chcon -h --reference=${BIND_CHROOT_PREFIX}/var/named/named.ca /var/named/named.ca >/dev/null 2>&1;
+	   /sbin/restorecon /var/named/named.ca >/dev/null 2>&1;
 	fi;
 	/sbin/service named condrestart
 	rm -f $changed;


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-6/bind.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- bind.spec	26 Feb 2007 13:01:31 -0000	1.148
+++ bind.spec	27 Apr 2007 14:03:50 -0000	1.149
@@ -17,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.3.4
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Epoch:   	31
 Url: 		http://www.isc.org/products/BIND/
 Buildroot: 	%{_tmppath}/%{name}-root
@@ -74,6 +74,7 @@
 Patch23: 	bind-9.3.1-dbus_archdep_libdir.patch
 Patch32:	bind-9.3.2-prctl_set_dumpable.patch
 Patch52:	bind-9.3.3-edns.patch
+Patch53:	bind-9.4.0-race-condition.patch
 #
 Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2, mktemp
 Requires(post): bash, coreutils, sed, grep, chkconfig >= 1.3.26
@@ -277,6 +278,7 @@
 #
 # this must follow all dbus patches:
 #
+%patch53 -p1 -b .race-condition
 cp -fp contrib/dbus/{dbus_mgr.c,dbus_service.c} bin/named
 cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named
 %if %{SDB}
@@ -777,6 +779,10 @@
 :;
 
 %changelog
+* Fri Apr 27 2007 Adam Tkac <atkac redhat com> 31:9.3.4-4.fc6
+- fixed some issues in bind-chroot-admin script
+- fixed race-condition in dbus code (#235809)
+
 * Mon Feb 26 2007 Adam Tkac <atkac redhat com> 31:9.3.4-3.fc6
 - fixed broken bind-chroot-admin script
 



From fedora-cvs-commits at redhat.com  Fri Apr 27 14:08:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 10:08:32 -0400
Subject: rpms/bind/FC-6 bind.spec,1.149,1.150
Message-ID: <200704271408.l3RE8WCl030289@cvs.devel.redhat.com>

Author: atkac

Update of /cvs/dist/rpms/bind/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv30250

Modified Files:
	bind.spec 
Log Message:
- fixed typoo in patch name



Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-6/bind.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- bind.spec	27 Apr 2007 14:03:50 -0000	1.149
+++ bind.spec	27 Apr 2007 14:08:30 -0000	1.150
@@ -74,7 +74,7 @@
 Patch23: 	bind-9.3.1-dbus_archdep_libdir.patch
 Patch32:	bind-9.3.2-prctl_set_dumpable.patch
 Patch52:	bind-9.3.3-edns.patch
-Patch53:	bind-9.4.0-race-condition.patch
+Patch53:	bind-9.4.0-dbus-race-condition.patch
 #
 Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2, mktemp
 Requires(post): bash, coreutils, sed, grep, chkconfig >= 1.3.26



From fedora-cvs-commits at redhat.com  Fri Apr 27 14:29:03 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 10:29:03 -0400
Subject: rpms/rpm/FC-6 rpm-4.4.2-no-ppc-asm.patch, NONE, 1.1 rpm.spec, 1.214,
	1.215
Message-ID: <200704271429.l3RET3Xf032044@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/rpm/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv32016

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.4.2-no-ppc-asm.patch 
Log Message:
Fix for builders


rpm-4.4.2-no-ppc-asm.patch:
 rpmrc.c |   21 ---------------------
 1 files changed, 21 deletions(-)

--- NEW FILE rpm-4.4.2-no-ppc-asm.patch ---
--- rpm-4.3.3/lib/rpmrc.c.asm	2005-09-19 13:17:02.000000000 -0400
+++ rpm-4.3.3/lib/rpmrc.c	2005-09-19 13:17:23.000000000 -0400
@@ -1278,27 +1278,6 @@
 	}
 #	endif
 
-#	if defined(__linux__) && defined(__powerpc__)
-	{
-	    unsigned pvr = 0;
-	    __sighandler_t oldh = signal(SIGILL, mfspr_ill);
-	    if (setjmp(mfspr_jmpbuf) == 0) {
-		__asm__ __volatile__ ("mfspr %0, 287" : "=r" (pvr));
-	    }
-	    signal(SIGILL, oldh);
-
-	    if ( pvr ) {
-		pvr >>= 16;
-		if ( pvr >= 0x40)
-		    strcpy(un.machine, "ppcpseries");
-		else if ( (pvr == 0x36) || (pvr == 0x37) )
-		    strcpy(un.machine, "ppciseries");
-		else
-		    strcpy(un.machine, "ppc");
-	    }
-	}
-#	endif
-
 	/* the uname() result goes through the arch_canon table */
 	canon = lookupInCanonTable(un.machine,
 				   tables[RPM_MACHTABLE_INSTARCH].canons,


Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/FC-6/rpm.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- rpm.spec	7 Sep 2006 10:37:45 -0000	1.214
+++ rpm.spec	27 Apr 2007 14:29:01 -0000	1.215
@@ -20,7 +20,7 @@
 %define version 4.4.2
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 32
+Release: 33%{?dist}
 Group: System Environment/Base
 Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
 Source1: mono-find-provides
@@ -58,6 +58,7 @@
 Patch30: rpm-4.4.2-gnuhash.patch
 Patch31: rpm-4.4.2-debugedit-ppc-reloc.patch
 Patch32: rpm-4.4.2-debugpaths.patch
+Patch33: rpm-4.4.2-no-ppc-asm.patch
 License: GPL
 Conflicts: patch < 2.5
 %ifos linux
@@ -203,6 +204,7 @@
 %patch30 -p1 -b .gnuhash
 %patch31 -p0 -b .dbgppc
 %patch32 -p1 -b .dbgpaths
+%patch33 -p1 -b .noppcasm
 
 # rebuild configure for ipv6
 autoconf
@@ -599,6 +601,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Fri Apr 27 2007 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-33
+- Remove ppc64 inline asm (#233145)
+
 * Thu Sep 07 2006 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-32
 - Various debuginfo fixes (#165434, #165418, #149113, #205339)
 



From fedora-cvs-commits at redhat.com  Fri Apr 27 15:07:29 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 11:07:29 -0400
Subject: rpms/redhat-artwork/devel index.theme.icon, 1.2,
	1.3 redhat-artwork.spec, 1.180, 1.181
Message-ID: <200704271507.l3RF7TpB007079@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6861

Modified Files:
	index.theme.icon redhat-artwork.spec 
Log Message:
- Drop the Bluecurve inheritance again, instead copy
  the Openoffice.org icons into the Fedora icon theme





Index: index.theme.icon
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/index.theme.icon,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.theme.icon	24 Apr 2007 18:11:15 -0000	1.2
+++ index.theme.icon	27 Apr 2007 15:07:26 -0000	1.3
@@ -2,8 +2,7 @@
 Name=Fedora
 Comment=Fedora Icon Theme
 # use Mist until Echo is ready
-# Bluecurve is here for the OpenOffice.org icons
-Inherits=Mist,Bluecurve
+Inherits=Mist
 Example=x-directory-normal
 
 # KDE Specific Stuff


Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- redhat-artwork.spec	24 Apr 2007 18:11:15 -0000	1.180
+++ redhat-artwork.spec	27 Apr 2007 15:07:26 -0000	1.181
@@ -7,7 +7,7 @@
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
 Version: 5.0.12
-Release: 6%{?dist} 
+Release: 7%{?dist} 
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
@@ -113,7 +113,18 @@
 
 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve %{SOURCE4}
 
-# we want to own the icon cache
+# add a Fedora metatheme
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/themes/Fedora 
+cp %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/themes/Fedora/index.theme
+
+# add a Fedora icon theme
+for i in 16 24 32 36 48 96; do
+  mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/${i}x${i}/places
+done
+cp %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/index.theme
+
+# we want to own the icon caches
+touch $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/icon-theme.cache
 touch $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/icon-theme.cache
 
 # start-here.png gets provided by fedora-logos
@@ -146,6 +157,19 @@
 done
 popd
 
+# We need the Openoffice icons for the menus
+for d in 48x48 32x32 24x24 16x16; do
+  mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/$d/apps
+  srcdir=$RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/$d/apps
+  destdir=$RPM_BUILD_ROOT%{_datadir}/icons/Fedora/$d/apps
+  cp ${srcdir}/openofficeorg-base.png ${destdir}
+  cp ${srcdir}/openofficeorg-calc.png ${destdir}
+  cp ${srcdir}/openofficeorg-draw.png ${destdir}
+  cp ${srcdir}/openofficeorg-impress.png ${destdir}
+  cp ${srcdir}/openofficeorg-math.png ${destdir}
+  cp ${srcdir}openofficeorg-writer.png ${destdir}
+done
+
 pushd $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/48x48/filesystems
 ln -s ../mimetypes/fileshare.png gnome-fs-ftp.png
 popd
@@ -389,17 +413,6 @@
 popd
 %endif
 
-# add a Fedora metatheme
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/themes/Fedora 
-cp %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/themes/Fedora/index.theme
-
-# add a Fedora icon theme
-for i in 16 24 32 36 48 96; do
-  mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/${i}x${i}/places
-done
-cp %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/index.theme
-touch $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/icon-theme.cache
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -433,6 +446,10 @@
 %ghost %{_datadir}/icons/Fedora/icon-theme.cache
 
 %changelog
+* Fri Apr 27 2007 Matthias Clasen <mclasen at redhat.com> 5.0.12-7
+- Drop the Bluecurve inheritance again, instead copy
+  the Openoffice.org icons into the Fedora icon theme
+
 * Tue Apr 24 2007 Matthias Clasen <mclasen at redhat.com> 5.0.12-6
 - Inherit the Bluecurve icon theme, too 
 



From fedora-cvs-commits at redhat.com  Fri Apr 27 15:10:20 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 11:10:20 -0400
Subject: rpms/redhat-artwork/devel index.theme.icon,1.3,1.4
Message-ID: <200704271510.l3RFAK2u009268@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9147

Modified Files:
	index.theme.icon 
Log Message:
Fix an oversight



Index: index.theme.icon
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/index.theme.icon,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.theme.icon	27 Apr 2007 15:07:26 -0000	1.3
+++ index.theme.icon	27 Apr 2007 15:10:18 -0000	1.4
@@ -21,35 +21,55 @@
 PanelDefault=32
 PanelSizes=16,22,32,48,64,72,96,128
 
-Directories=16x16/places,24x24/places,32x32/places,36x36/places,48x48/places,96x96/places,
+Directories=16x16/places,16x16/apps,24x24/places,24x24/apps,32x32/places,32x32/apps,36x36/places,48x48/places,48x48/apps,96x96/places,
 
 [16x16/places]
 Size=16
-Context=places
+Context=Places
+Type=Threshold
+
+[16x16/apps]
+Size=16
+Context=Applications
 Type=Threshold
 
 [24x24/places]
 Size=24
-Context=places
+Context=Places
+Type=Threshold
+
+[24x24/apps]
+Size=24
+Context=Applications
 Type=Threshold
 
 [32x32/places]
 Size=32
-Context=places
+Context=Places
+Type=Threshold
+
+[32x32/apps]
+Size=32
+Context=Applications
 Type=Threshold
 
 [36x36/places]
 Size=36
-Context=places
+Context=Places
 Type=Threshold
 
 [48x48/places]
 Size=48
-Context=places
+Context=Places
+Type=Threshold
+
+[48x48/apps]
+Size=48
+Context=Applications
 Type=Threshold
 
 [96x96/places]
 Size=96
-Context=places
+Context=Places
 Type=Threshold
 



From fedora-cvs-commits at redhat.com  Fri Apr 27 15:35:16 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 11:35:16 -0400
Subject: rpms/redhat-artwork/devel redhat-artwork.spec,1.181,1.182
Message-ID: <200704271535.l3RFZGe4027450@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27377

Modified Files:
	redhat-artwork.spec 
Log Message:
Fix a typo



Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- redhat-artwork.spec	27 Apr 2007 15:07:26 -0000	1.181
+++ redhat-artwork.spec	27 Apr 2007 15:35:14 -0000	1.182
@@ -167,7 +167,7 @@
   cp ${srcdir}/openofficeorg-draw.png ${destdir}
   cp ${srcdir}/openofficeorg-impress.png ${destdir}
   cp ${srcdir}/openofficeorg-math.png ${destdir}
-  cp ${srcdir}openofficeorg-writer.png ${destdir}
+  cp ${srcdir}/openofficeorg-writer.png ${destdir}
 done
 
 pushd $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/48x48/filesystems



From fedora-cvs-commits at redhat.com  Fri Apr 27 17:23:51 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 13:23:51 -0400
Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.57,
	1.58 policy-20070219.patch, 1.62, 1.63 selinux-policy.spec,
	1.444, 1.445
Message-ID: <200704271723.l3RHNpi2011935@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11887

Modified Files:
	modules-targeted.conf policy-20070219.patch 
	selinux-policy.spec 
Log Message:
* Fri Apr 27 2007 Dan Walsh <dwalsh at redhat.com> 2.6.1-3
- 



Index: modules-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- modules-targeted.conf	19 Apr 2007 13:58:54 -0000	1.57
+++ modules-targeted.conf	27 Apr 2007 17:23:49 -0000	1.58
@@ -1436,6 +1436,13 @@
 aide = base
 
 # Layer: services
+# Module: aide
+#
+# Policy for aide
+# 
+aide = base
+
+# Layer: services
 # Module: w3c
 #
 # w3c

policy-20070219.patch:
 Rules.modular                           |   12 +
 VERSION                                 |    2 
 policy/flask/access_vectors             |    4 
 policy/global_booleans                  |    2 
 policy/global_tunables                  |   15 -
 policy/mls                              |   31 ++-
 policy/modules/admin/acct.te            |    1 
 policy/modules/admin/alsa.fc            |    1 
 policy/modules/admin/amtu.fc            |    3 
 policy/modules/admin/amtu.if            |   53 +++++
 policy/modules/admin/amtu.te            |   56 +++++
 policy/modules/admin/bootloader.te      |    3 
 policy/modules/admin/consoletype.te     |   10 
 policy/modules/admin/dmesg.te           |    1 
 policy/modules/admin/kudzu.te           |    6 
 policy/modules/admin/logrotate.te       |    1 
 policy/modules/admin/logwatch.te        |    6 
 policy/modules/admin/netutils.te        |    6 
 policy/modules/admin/readahead.te       |    6 
 policy/modules/admin/rpm.fc             |    3 
 policy/modules/admin/rpm.if             |   85 ++++++--
 policy/modules/admin/rpm.te             |    2 
 policy/modules/admin/su.if              |    6 
 policy/modules/admin/sudo.if            |    8 
 policy/modules/admin/usermanage.if      |    2 
 policy/modules/admin/usermanage.te      |   27 ++
 policy/modules/apps/gnome.if            |   26 ++
 policy/modules/apps/gpg.fc              |    2 
 policy/modules/apps/loadkeys.if         |   44 +---
 policy/modules/apps/mozilla.if          |    1 
 policy/modules/apps/slocate.te          |    5 
 policy/modules/apps/uml.if              |   27 --
 policy/modules/kernel/corecommands.fc   |    5 
 policy/modules/kernel/corecommands.if   |   20 +
 policy/modules/kernel/corenetwork.te.in |   15 +
 policy/modules/kernel/devices.if        |   36 +++
 policy/modules/kernel/domain.if         |   18 +
 policy/modules/kernel/domain.te         |   46 ++++
 policy/modules/kernel/files.fc          |    1 
 policy/modules/kernel/files.if          |   83 +++++++-
 policy/modules/kernel/filesystem.if     |   39 +++
 policy/modules/kernel/filesystem.te     |   19 +
 policy/modules/kernel/kernel.if         |   42 +++-
 policy/modules/kernel/kernel.te         |    2 
 policy/modules/kernel/mls.if            |   20 +
 policy/modules/kernel/mls.te            |    3 
 policy/modules/kernel/selinux.if        |   38 +++
 policy/modules/kernel/storage.if        |    2 
 policy/modules/kernel/terminal.if       |   21 +-
 policy/modules/kernel/terminal.te       |    1 
 policy/modules/services/aide.fc         |    1 
 policy/modules/services/aide.te         |    2 
 policy/modules/services/amavis.if       |   19 +
 policy/modules/services/amavis.te       |    3 
 policy/modules/services/apache.fc       |   14 -
 policy/modules/services/apache.if       |  171 +++++++++++++++-
 policy/modules/services/apache.te       |   79 +++++++
 policy/modules/services/apcupsd.fc      |    9 
 policy/modules/services/apcupsd.if      |  108 ++++++++++
 policy/modules/services/apcupsd.te      |   92 +++++++++
 policy/modules/services/automount.te    |    2 
 policy/modules/services/avahi.if        |   19 +
 policy/modules/services/avahi.te        |    4 
 policy/modules/services/bind.te         |    1 
 policy/modules/services/bluetooth.te    |    2 
 policy/modules/services/clamav.te       |    1 
 policy/modules/services/clockspeed.if   |    2 
 policy/modules/services/consolekit.te   |   33 ++-
 policy/modules/services/cron.fc         |    1 
 policy/modules/services/cron.if         |   33 +--
 policy/modules/services/cron.te         |   46 +++-
 policy/modules/services/cups.te         |    6 
 policy/modules/services/cvs.te          |    1 
 policy/modules/services/cyrus.te        |    1 
 policy/modules/services/dbus.if         |   63 ++++++
 policy/modules/services/dhcp.te         |    2 
 policy/modules/services/djbdns.te       |    5 
 policy/modules/services/dovecot.fc      |    2 
 policy/modules/services/dovecot.if      |   62 ++++++
 policy/modules/services/dovecot.te      |   59 +++++
 policy/modules/services/ftp.te          |    5 
 policy/modules/services/hal.fc          |    8 
 policy/modules/services/hal.if          |   77 +++++++
 policy/modules/services/hal.te          |  148 ++++++++++++++
 policy/modules/services/inetd.te        |    5 
 policy/modules/services/kerberos.if     |   79 ++-----
 policy/modules/services/kerberos.te     |   34 +++
 policy/modules/services/mailman.if      |   19 +
 policy/modules/services/mta.if          |   19 +
 policy/modules/services/mta.te          |    2 
 policy/modules/services/nis.if          |    4 
 policy/modules/services/nis.te          |    4 
 policy/modules/services/nscd.te         |   10 
 policy/modules/services/ntp.te          |    4 
 policy/modules/services/pegasus.if      |   18 +
 policy/modules/services/pegasus.te      |    6 
 policy/modules/services/postfix.if      |   20 +
 policy/modules/services/postfix.te      |   29 ++
 policy/modules/services/ppp.te          |    2 
 policy/modules/services/procmail.te     |    1 
 policy/modules/services/pyzor.te        |    7 
 policy/modules/services/radius.te       |    4 
 policy/modules/services/rlogin.te       |    1 
 policy/modules/services/rpc.if          |    5 
 policy/modules/services/rpc.te          |    1 
 policy/modules/services/rpcbind.fc      |    6 
 policy/modules/services/rpcbind.if      |  104 ++++++++++
 policy/modules/services/rpcbind.te      |   83 ++++++++
 policy/modules/services/rsync.te        |    1 
 policy/modules/services/rwho.fc         |    3 
 policy/modules/services/rwho.if         |   84 ++++++++
 policy/modules/services/rwho.te         |   61 +++++
 policy/modules/services/samba.fc        |    3 
 policy/modules/services/samba.if        |   86 ++++++++
 policy/modules/services/samba.te        |   87 ++++++++
 policy/modules/services/sasl.te         |    1 
 policy/modules/services/sendmail.if     |   22 ++
 policy/modules/services/smartmon.te     |    1 
 policy/modules/services/snmp.te         |   15 +
 policy/modules/services/spamassassin.te |   12 -
 policy/modules/services/squid.fc        |    2 
 policy/modules/services/squid.if        |   22 ++
 policy/modules/services/squid.te        |   12 +
 policy/modules/services/ssh.if          |   39 +++
 policy/modules/services/ssh.te          |    9 
 policy/modules/services/w3c.fc          |    2 
 policy/modules/services/w3c.if          |    1 
 policy/modules/services/w3c.te          |   14 +
 policy/modules/system/application.fc    |    1 
 policy/modules/system/application.if    |  104 ++++++++++
 policy/modules/system/application.te    |   14 +
 policy/modules/system/authlogin.fc      |    1 
 policy/modules/system/authlogin.if      |  172 +++++++++++++++-
 policy/modules/system/authlogin.te      |   36 +++
 policy/modules/system/fstools.fc        |    1 
 policy/modules/system/fstools.te        |    1 
 policy/modules/system/fusermount.fc     |    6 
 policy/modules/system/fusermount.if     |   41 ++++
 policy/modules/system/fusermount.te     |   50 ++++
 policy/modules/system/getty.te          |    3 
 policy/modules/system/hostname.te       |   14 +
 policy/modules/system/init.if           |   42 ++++
 policy/modules/system/init.te           |   35 ++-
 policy/modules/system/ipsec.if          |   20 +
 policy/modules/system/ipsec.te          |    3 
 policy/modules/system/iptables.te       |    5 
 policy/modules/system/libraries.fc      |    5 
 policy/modules/system/libraries.te      |    4 
 policy/modules/system/locallogin.te     |   12 +
 policy/modules/system/logging.if        |   23 ++
 policy/modules/system/logging.te        |    5 
 policy/modules/system/lvm.fc            |    1 
 policy/modules/system/lvm.te            |    8 
 policy/modules/system/modutils.te       |    7 
 policy/modules/system/mount.fc          |    3 
 policy/modules/system/mount.if          |   37 +++
 policy/modules/system/mount.te          |   70 ++++++
 policy/modules/system/raid.te           |    1 
 policy/modules/system/selinuxutil.fc    |    1 
 policy/modules/system/selinuxutil.if    |    6 
 policy/modules/system/selinuxutil.te    |   70 ++++--
 policy/modules/system/sysnetwork.te     |    3 
 policy/modules/system/udev.te           |   12 +
 policy/modules/system/unconfined.fc     |    1 
 policy/modules/system/unconfined.if     |   10 
 policy/modules/system/unconfined.te     |   24 ++
 policy/modules/system/userdomain.if     |  327 ++++++++++++++++++++------------
 policy/modules/system/userdomain.te     |   81 +++++--
 policy/modules/system/xen.te            |   35 +++
 policy/support/obj_perm_sets.spt        |   12 +
 170 files changed, 3720 insertions(+), 480 deletions(-)

Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- policy-20070219.patch	26 Apr 2007 17:12:23 -0000	1.62
+++ policy-20070219.patch	27 Apr 2007 17:23:49 -0000	1.63
@@ -590,15 +590,36 @@
  domain_system_change_exemption(rpm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-2.6.1/policy/modules/admin/sudo.if
 --- nsaserefpolicy/policy/modules/admin/sudo.if	2007-03-26 10:39:08.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/admin/sudo.if	2007-04-25 08:57:49.000000000 -0400
-@@ -91,6 +91,7 @@
++++ serefpolicy-2.6.1/policy/modules/admin/sudo.if	2007-04-27 10:56:23.000000000 -0400
+@@ -77,6 +77,7 @@
+ 
+ 	# By default, revert to the calling domain when a shell is executed.
+ 	corecmd_shell_domtrans($1_sudo_t,$2)
++	corecmd_bin_domtrans($1_sudo_t,$2)
+ 	allow $2 $1_sudo_t:fd use;
+ 	allow $2 $1_sudo_t:fifo_file rw_file_perms;
+ 	allow $2 $1_sudo_t:process sigchld;
+@@ -90,7 +91,8 @@
+ 	fs_search_auto_mountpoints($1_sudo_t)
  	fs_getattr_xattr_fs($1_sudo_t)
  
- 	auth_domtrans_chk_passwd($1_sudo_t)
-+	auth_domtrans_upd_passwd($1_su_t)
+-	auth_domtrans_chk_passwd($1_sudo_t)
++	auth_run_chk_passwd($1_sudo_t)
++	auth_run_upd_passwd($1_sudo_t)
  	# sudo stores a token in the pam_pid directory
  	auth_manage_pam_pid($1_sudo_t)
  
+@@ -127,6 +129,10 @@
+ 	userdom_dontaudit_search_all_users_home_content($1_sudo_t)
+ 
+ 	optional_policy(`
++		locallogin_search_keys($1_sudo_t)
++	')
++
++	optional_policy(`
+ 		nis_use_ypbind($1_sudo_t)
+ 	')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.6.1/policy/modules/admin/su.if
 --- nsaserefpolicy/policy/modules/admin/su.if	2007-03-26 10:39:08.000000000 -0400
 +++ serefpolicy-2.6.1/policy/modules/admin/su.if	2007-04-25 13:53:26.000000000 -0400
@@ -2993,7 +3014,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-2.6.1/policy/modules/services/dovecot.fc
 --- nsaserefpolicy/policy/modules/services/dovecot.fc	2006-11-16 17:15:21.000000000 -0500
-+++ serefpolicy-2.6.1/policy/modules/services/dovecot.fc	2007-04-26 10:45:06.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/services/dovecot.fc	2007-04-26 10:57:46.000000000 -0400
 @@ -17,10 +17,12 @@
  
  ifdef(`distro_debian', `
@@ -3009,8 +3030,8 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.if serefpolicy-2.6.1/policy/modules/services/dovecot.if
 --- nsaserefpolicy/policy/modules/services/dovecot.if	2007-01-02 12:57:43.000000000 -0500
-+++ serefpolicy-2.6.1/policy/modules/services/dovecot.if	2007-04-26 10:46:22.000000000 -0400
-@@ -18,3 +18,43 @@
++++ serefpolicy-2.6.1/policy/modules/services/dovecot.if	2007-04-27 09:58:21.000000000 -0400
+@@ -18,3 +18,65 @@
  	manage_files_pattern($1,dovecot_spool_t,dovecot_spool_t)
  	manage_lnk_files_pattern($1,dovecot_spool_t,dovecot_spool_t)
  ')
@@ -3028,7 +3049,7 @@
 +#
 +interface(`dovecot_auth_stream_connect',`
 +	gen_require(`
-+		type dovecot_t, dovecot_var_run_t;
++		type dovecot_auth_t, dovecot_var_run_t;
 +	')
 +
 +	allow $1 dovecot_var_run_t:dir search;
@@ -3054,9 +3075,31 @@
 +	domtrans_pattern($1,dovecot_deliver_exec_t,dovecot_deliver_t)
 +')
 +
++########################################
++## <summary>
++##	Execute dovecot_deliver in the dovecot_deliver domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`dovecot_domtrans_deliver',`
++	gen_require(`
++		type dovecot_deliver_t, dovecot_deliver_exec_t;
++	')
++
++	domain_auto_trans($1,dovecot_deliver_exec_t,dovecot_deliver_t)
++
++	allow dovecot_deliver_t $1:fd use;
++	allow dovecot_deliver_t $1:fifo_file rw_file_perms;
++	allow dovecot_deliver_t $1:process sigchld;
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.6.1/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2007-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/services/dovecot.te	2007-04-26 10:50:47.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/services/dovecot.te	2007-04-27 11:01:23.000000000 -0400
 @@ -15,6 +15,12 @@
  domain_entry_file(dovecot_auth_t,dovecot_auth_exec_t)
  role system_r types dovecot_auth_t;
@@ -3134,16 +3177,18 @@
  
  optional_policy(`
  	kerberos_use(dovecot_auth_t)
-@@ -194,3 +207,34 @@
+@@ -194,3 +207,43 @@
  optional_policy(`
  	logging_send_syslog_msg(dovecot_auth_t)
  ')
 +
 +optional_policy(`
++	mysql_search_db(dovecot_auth_t)
 +	mysql_stream_connect(dovecot_auth_t)
 +')
 +
 +optional_policy(`
++	postfix_create_pivate_sockets(dovecot_auth_t)
 +	postfix_search_spool(dovecot_auth_t)
 +')
 +
@@ -3152,7 +3197,7 @@
 +#
 +# dovecot deliver local policy
 +#
-+allow dovecot_t dovecot_etc_t:file read_file_perms;
++allow dovecot_deliver_t dovecot_etc_t:file read_file_perms;
 +allow dovecot_deliver_t dovecot_var_run_t:dir r_dir_perms;
 +
 +kernel_read_all_sysctls(dovecot_deliver_t)
@@ -3168,7 +3213,14 @@
 +
 +miscfiles_read_localization(dovecot_deliver_t)
 +
-+mta_manage_spool(dovecot_deliver_t)
++optional_policy(`
++	mta_manage_spool(dovecot_deliver_t)
++')
++
++ifdef(`targeted_policy',`
++	term_dontaudit_use_unallocated_ttys(dovecot_deliver_t)
++	term_dontaudit_use_generic_ptys(dovecot_deliver_t)
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.6.1/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2007-04-23 09:36:01.000000000 -0400
 +++ serefpolicy-2.6.1/policy/modules/services/ftp.te	2007-04-23 13:12:09.000000000 -0400
@@ -3290,7 +3342,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.6.1/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2007-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/services/hal.te	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/services/hal.te	2007-04-27 10:38:54.000000000 -0400
 @@ -16,9 +16,33 @@
  type hald_var_run_t;
  files_pid_file(hald_var_run_t)
@@ -3395,7 +3447,15 @@
  
  libs_use_ld_so(hald_t)
  libs_use_shared_libs(hald_t)
-@@ -160,6 +196,10 @@
+@@ -148,6 +184,7 @@
+ 
+ seutil_read_config(hald_t)
+ seutil_read_default_contexts(hald_t)
++seutil_read_file_contexts(hald_t)
+ 
+ sysnet_read_config(hald_t)
+ 
+@@ -160,6 +197,10 @@
  ')
  
  optional_policy(`
@@ -3406,7 +3466,7 @@
  	bootloader_domtrans(hald_t)
  ')
  
-@@ -245,3 +285,102 @@
+@@ -245,3 +286,102 @@
  optional_policy(`
  	vbetool_domtrans(hald_t)
  ')
@@ -3965,7 +4025,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.6.1/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2007-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/services/postfix.te	2007-04-26 10:46:37.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/services/postfix.te	2007-04-27 09:59:53.000000000 -0400
 @@ -169,6 +169,8 @@
  mta_rw_aliases(postfix_master_t)
  mta_read_sendmail_bin(postfix_master_t)
@@ -4038,7 +4098,16 @@
  	procmail_domtrans(postfix_pipe_t)
  ')
  
-@@ -519,8 +533,6 @@
+@@ -475,6 +489,8 @@
+ # Postfix qmgr local policy
+ #
+ 
++allow postfix_qmgr_t postfix_master_t:file read;
++
+ stream_connect_pattern(postfix_qmgr_t,{ postfix_private_t postfix_public_t },{ postfix_private_t postfix_public_t },postfix_master_t)
+ 
+ rw_fifo_files_pattern(postfix_qmgr_t,postfix_public_t,postfix_public_t)
+@@ -519,8 +535,6 @@
  # Postfix smtp delivery local policy
  #
  
@@ -4047,7 +4116,7 @@
  # connect to master process
  stream_connect_pattern(postfix_smtp_t,{ postfix_private_t postfix_public_t },{ postfix_private_t postfix_public_t },postfix_master_t)
  
-@@ -552,9 +564,18 @@
+@@ -552,9 +566,18 @@
  mta_read_aliases(postfix_smtpd_t)
  
  optional_policy(`
@@ -4262,7 +4331,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.te serefpolicy-2.6.1/policy/modules/services/rpcbind.te
 --- nsaserefpolicy/policy/modules/services/rpcbind.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.1/policy/modules/services/rpcbind.te	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/services/rpcbind.te	2007-04-27 11:15:25.000000000 -0400
 @@ -0,0 +1,83 @@
 +policy_module(rpcbind,1.0.0)
 +
@@ -4303,14 +4372,14 @@
 +
 +# pid file
 +allow rpcbind_t rpcbind_var_run_t:file manage_file_perms;
-+allow rpcbind_t rpcbind_var_run_t:sock_file manage_file_perms;
++allow rpcbind_t rpcbind_var_run_t:sock_file manage_sock_file_perms;
 +allow rpcbind_t rpcbind_var_run_t:dir rw_dir_perms;
 +files_pid_filetrans(rpcbind_t,rpcbind_var_run_t, { file sock_file })
 +
 +# var/lib files for rpcbind
-+allow rpcbind_t rpcbind_var_lib_t:file create_file_perms;
-+allow rpcbind_t rpcbind_var_lib_t:sock_file create_file_perms;
-+allow rpcbind_t rpcbind_var_lib_t:dir create_dir_perms;
++allow rpcbind_t rpcbind_var_lib_t:file manage_file_perms;
++allow rpcbind_t rpcbind_var_lib_t:sock_file manage_sock_file_perms;
++allow rpcbind_t rpcbind_var_lib_t:dir manage_dir_perms;
 +files_var_lib_filetrans(rpcbind_t,rpcbind_var_lib_t, { file dir sock_file })
 +
 +corenet_non_ipsec_sendrecv(rpcbind_t)
@@ -4977,7 +5046,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.6.1/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2007-04-23 09:36:01.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/services/spamassassin.te	2007-04-25 19:53:11.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/services/spamassassin.te	2007-04-27 09:55:35.000000000 -0400
 @@ -6,14 +6,12 @@
  # Declarations
  #
@@ -5019,10 +5088,11 @@
  corenet_sendrecv_razor_client_packets(spamd_t)
  corenet_sendrecv_spamd_server_packets(spamd_t)
  # spamassassin 3.1 needs this for its
-@@ -192,6 +191,10 @@
+@@ -192,6 +191,11 @@
  ')
  
  optional_policy(`
++	mysql_search_db(spamd_t)
 +	mysql_stream_connect(spamd_t)
 +')
 +
@@ -5363,7 +5433,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.6.1/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/system/authlogin.if	2007-04-25 20:19:29.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/system/authlogin.if	2007-04-26 15:27:28.000000000 -0400
 @@ -152,21 +152,12 @@
  ## </param>
  #
@@ -5432,7 +5502,45 @@
  	tunable_policy(`allow_polyinstantiation',`
  		files_polyinstantiate_all($1)
  	')
-@@ -1391,3 +1391,114 @@
+@@ -357,6 +357,37 @@
+ 
+ ########################################
+ ## <summary>
++##	Execute chkpwd programs in the chkpwd domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++## <param name="role">
++##	<summary>
++##	The role to allow the updpwd domain.
++##	</summary>
++## </param>
++## <param name="terminal">
++##	<summary>
++##	The type of the terminal allow the updpwd domain to use.
++##	</summary>
++## </param>
++#
++interface(`auth_run_chk_passwd',`
++	gen_require(`
++		type chkpwd_t;
++	')
++
++	auth_domtrans_chk_passwd($1)
++	role $2 types chkpwd_t;
++	allow chkpwd_t $3:chr_file rw_file_perms;
++
++')
++
++########################################
++## <summary>
+ ##	Get the attributes of the shadow passwords file.
+ ## </summary>
+ ## <param name="domain">
+@@ -1391,3 +1422,114 @@
  	typeattribute $1 can_write_shadow_passwords;
  	typeattribute $1 can_relabelto_shadow_passwords;
  ')
@@ -6083,7 +6191,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.6.1/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2007-03-26 10:39:07.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/system/logging.if	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/system/logging.if	2007-04-27 11:57:48.000000000 -0400
 @@ -302,6 +302,25 @@
  
  ########################################
@@ -6110,6 +6218,15 @@
  ##	Allows the domain to open a file in the
  ##	log directory, but does not allow the listing
  ##	of the contents of the log directory.
+@@ -436,7 +455,7 @@
+ 
+ 	files_search_var($1)
+ 	allow $1 var_log_t:dir list_dir_perms;
+-	read_files_pattern($1,var_log_t,logfile)
++	read_files_pattern($1,logfile, logfile)
+ ')
+ 
+ ########################################
 @@ -480,6 +499,8 @@
  	files_search_var($1)
  	manage_files_pattern($1,logfile,logfile)
@@ -6121,7 +6238,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.6.1/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/system/logging.te	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/system/logging.te	2007-04-26 11:17:45.000000000 -0400
 @@ -11,6 +11,7 @@
  type auditctl_t;
  type auditctl_exec_t;
@@ -6130,7 +6247,17 @@
  role system_r types auditctl_t;
  
  type auditd_etc_t;
-@@ -331,6 +332,7 @@
+@@ -267,6 +268,9 @@
+ 
+ # create/append log files.
+ manage_files_pattern(syslogd_t,var_log_t,var_log_t)
++# r/w log fifo_files files.
++rw_fifo_files_pattern(syslogd_t,var_log_t,var_log_t)
++
+ # Allow access for syslog-ng
+ allow syslogd_t var_log_t:dir { create setattr };
+ 
+@@ -331,6 +335,7 @@
  domain_use_interactive_fds(syslogd_t)
  
  files_read_etc_files(syslogd_t)
@@ -6782,7 +6909,7 @@
  		init_dbus_chat_script(unconfined_execmem_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.6.1/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/system/userdomain.if	2007-04-25 19:40:17.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/system/userdomain.if	2007-04-27 11:11:14.000000000 -0400
 @@ -114,6 +114,18 @@
  		# Allow making the stack executable via mprotect.
  		allow $1_t self:process execstack;
@@ -6811,16 +6938,70 @@
  
  	init_read_utmp($1_t)
  	# The library functions always try to open read-write first,
-@@ -992,7 +1006,7 @@
- 	manage_fifo_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t)
- 	filetrans_pattern(privhome,$1_home_dir_t,$1_home_t,{ dir file lnk_file sock_file fifo_file })
+@@ -953,6 +967,38 @@
+ ##	</summary>
+ ## </param>
+ #
++template(`userdom_privhome_user_template',`
++	gen_require(`
++		type $1_home_dir_t,  $1_home_t;
++	')
++
++	# privileged home directory writers
++	manage_dirs_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t)
++	manage_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t)
++	manage_lnk_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t)
++	manage_sock_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t)
++	manage_fifo_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t)
++	filetrans_pattern(privhome,$1_home_dir_t,$1_home_t,{ dir file lnk_file sock_file fifo_file })
++')
++
++#######################################
++## <summary>
++##	The template for creating a unprivileged user.
++## </summary>
++## <desc>
++##	<p>
++##	This template creates a user domain, types, and
++##	rules for the user's tty, pty, home directories,
++##	tmp, and tmpfs files.
++##	</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(`userdom_unpriv_user_template', `
+ 
+ 	gen_require(`
+@@ -979,20 +1025,13 @@
+ 	userdom_poly_home_template($1)
+ 	userdom_poly_tmp_template($1)
  
++	userdom_privhome_user_template($1)
++
+ 	##############################
+ 	#
+ 	# Local policy
+ 	#
+-
+-	# privileged home directory writers
+-	manage_dirs_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	manage_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	manage_lnk_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	manage_sock_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	manage_fifo_files_pattern(privhome,{ $1_home_dir_t $1_home_t },$1_home_t)
+-	filetrans_pattern(privhome,$1_home_dir_t,$1_home_t,{ dir file lnk_file sock_file fifo_file })
+-
 -	corecmd_exec_all_executables($1_t)
 +	application_exec_all($1_t)
  
  	# 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)
-@@ -1059,10 +1073,6 @@
+@@ -1059,10 +1098,6 @@
  		dontaudit xdm_t $1_home_t:file rw_file_perms;
  	')
  
@@ -6831,7 +7012,7 @@
  	') dnl end TODO
  ')
  
-@@ -1126,7 +1136,7 @@
+@@ -1126,7 +1161,7 @@
  	# $1_t local policy
  	#
  
@@ -6840,7 +7021,7 @@
  	allow $1_t self:process { setexec setfscreate };
  
  	# Set password information for other users.
-@@ -1353,11 +1363,7 @@
+@@ -1353,11 +1388,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_generic_user',`
@@ -6853,7 +7034,7 @@
  ')
  
  ########################################
-@@ -1384,11 +1390,7 @@
+@@ -1384,11 +1415,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_from_generic_user',`
@@ -6866,7 +7047,7 @@
  ')
  
  ########################################
-@@ -1414,11 +1416,7 @@
+@@ -1414,11 +1441,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_staff',`
@@ -6879,7 +7060,7 @@
  ')
  
  ########################################
-@@ -1445,11 +1443,7 @@
+@@ -1445,11 +1468,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_from_staff',`
@@ -6892,7 +7073,7 @@
  ')
  
  ########################################
-@@ -1475,11 +1469,7 @@
+@@ -1475,11 +1494,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_sysadm',`
@@ -6905,7 +7086,7 @@
  ')
  
  ########################################
-@@ -1506,11 +1496,7 @@
+@@ -1506,11 +1521,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_from_sysadm',`
@@ -6918,7 +7099,7 @@
  ')
  
  ########################################
-@@ -1698,13 +1684,11 @@
+@@ -1698,13 +1709,11 @@
  ## </param>
  #
  template(`userdom_setattr_user_ptys',`
@@ -6936,7 +7117,7 @@
  ')
  
  ########################################
-@@ -1733,13 +1717,11 @@
+@@ -1733,13 +1742,11 @@
  ## </param>
  #
  template(`userdom_create_user_pty',`
@@ -6954,7 +7135,7 @@
  ')
  
  ########################################
-@@ -3624,13 +3606,12 @@
+@@ -3624,13 +3631,12 @@
  template(`userdom_setattr_user_ttys',`
  	ifdef(`targeted_policy',`
  		term_setattr_unallocated_ttys($2)
@@ -6973,7 +7154,7 @@
  ')
  
  ########################################
-@@ -3661,13 +3642,12 @@
+@@ -3661,13 +3667,12 @@
  template(`userdom_use_user_ttys',`
  	ifdef(`targeted_policy',`
  		term_use_unallocated_ttys($2)
@@ -6992,7 +7173,7 @@
  ')
  
  ########################################
-@@ -3696,18 +3676,13 @@
+@@ -3696,18 +3701,13 @@
  ## </param>
  #
  template(`userdom_use_user_terminals',`
@@ -7017,7 +7198,7 @@
  ')
  
  ########################################
-@@ -5353,14 +5328,13 @@
+@@ -5353,14 +5353,13 @@
  interface(`userdom_use_unpriv_users_ptys',`
  	ifdef(`targeted_policy',`
  		term_use_generic_ptys($1)
@@ -7038,7 +7219,7 @@
  ')
  
  ########################################
-@@ -5377,13 +5351,13 @@
+@@ -5377,13 +5376,13 @@
  interface(`userdom_dontaudit_use_unpriv_users_ptys',`
  	ifdef(`targeted_policy',`
  		term_dontaudit_use_generic_ptys($1)
@@ -7057,7 +7238,7 @@
  ')
  
  ########################################
-@@ -5436,13 +5410,12 @@
+@@ -5436,13 +5435,12 @@
  interface(`userdom_list_unpriv_users_tmp',`
  	ifdef(`targeted_policy',`
  		files_list_tmp($1)
@@ -7076,7 +7257,7 @@
  ')
  
  ########################################
-@@ -5458,13 +5431,12 @@
+@@ -5458,13 +5456,12 @@
  interface(`userdom_read_unpriv_users_tmp_files',`
  	ifdef(`targeted_policy',`
  		files_read_generic_tmp_files($1)
@@ -7095,7 +7276,7 @@
  ')
  
  ########################################
-@@ -5480,13 +5452,12 @@
+@@ -5480,13 +5477,12 @@
  interface(`userdom_read_unpriv_users_tmp_symlinks',`
  	ifdef(`targeted_policy',`
  		files_read_generic_tmp_symlinks($1)
@@ -7114,7 +7295,7 @@
  ')
  
  ########################################
-@@ -5520,13 +5491,12 @@
+@@ -5520,13 +5516,12 @@
  interface(`userdom_use_unpriv_users_ttys',`
  	ifdef(`targeted_policy',`
  		term_use_unallocated_ttys($1)
@@ -7133,7 +7314,7 @@
  ')
  
  ########################################
-@@ -5543,13 +5513,12 @@
+@@ -5543,13 +5538,12 @@
  interface(`userdom_dontaudit_use_unpriv_users_ttys',`
  	ifdef(`targeted_policy',`
  		term_dontaudit_use_unallocated_ttys($1)
@@ -7152,7 +7333,7 @@
  ')
  
  ########################################
-@@ -5721,3 +5690,92 @@
+@@ -5721,3 +5715,92 @@
  	allow $1 user_home_dir_t:dir manage_dir_perms;
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
@@ -7247,7 +7428,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.6.1/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/system/userdomain.te	2007-04-25 19:18:21.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/system/userdomain.te	2007-04-27 11:10:52.000000000 -0400
 @@ -15,7 +15,6 @@
  # Declarations
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.444
retrieving revision 1.445
diff -u -r1.444 -r1.445
--- selinux-policy.spec	25 Apr 2007 18:31:32 -0000	1.444
+++ selinux-policy.spec	27 Apr 2007 17:23:49 -0000	1.445
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.6.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -358,6 +358,9 @@
 %endif
 
 %changelog
+* Fri Apr 27 2007 Dan Walsh <dwalsh at redhat.com> 2.6.1-3
+- 
+
 * Wed Apr 25 2007 Dan Walsh <dwalsh at redhat.com> 2.6.1-2
 - Fixes for unix_update
 - Fix logwatch to be able to search all dirs



From fedora-cvs-commits at redhat.com  Fri Apr 27 17:25:44 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 13:25:44 -0400
Subject: rpms/policycoreutils/FC-6 policycoreutils-gui.patch, 1.3,
	1.4 policycoreutils.spec, 1.334, 1.335
Message-ID: <200704271725.l3RHPi95013390@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv13343

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Fri Apr 27 2007 Dan Walsh <dwalsh at redhat.com> 1.34.1-9
- Fixes for polgengui


policycoreutils-gui.patch:
 Makefile                    |   34 
 booleansPage.py             |  224 +++
 fcontextPage.py             |  207 +++
 loginsPage.py               |  173 ++
 mappingsPage.py             |   54 
 modulesPage.py              |  172 ++
 polgen.glade                | 1168 ++++++++++++++++
 polgen.py                   |  455 ++++++
 polgengui.py                |  253 +++
 portsPage.py                |  227 +++
 selinux.tbl                 |  274 +++
 semanagePage.py             |  115 +
 statusPage.py               |  220 +++
 system-config-selinux.glade | 3034 ++++++++++++++++++++++++++++++++++++++++++++
 system-config-selinux.py    |  169 ++
 templates/__init__.py       |   18 
 templates/executable.py     |  156 ++
 templates/network.py        |   44 
 templates/rw.py             |  104 +
 templates/script.py         |   42 
 templates/semodule.py       |   41 
 templates/tmp.py            |   72 +
 templates/var_lib.py        |  137 +
 templates/var_log.py        |   89 +
 templates/var_run.py        |   95 +
 templates/var_spool.py      |  105 +
 translationsPage.py         |  111 +
 usersPage.py                |  166 ++
 28 files changed, 7959 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-6/policycoreutils-gui.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- policycoreutils-gui.patch	23 Apr 2007 15:03:01 -0000	1.3
+++ policycoreutils-gui.patch	27 Apr 2007 17:25:42 -0000	1.4
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.9/gui/booleansPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.10/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/booleansPage.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.10/gui/booleansPage.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,224 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -226,9 +226,9 @@
 +
 +        setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val)
 +        commands.getstatusoutput(setsebool)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.9/gui/fcontextPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.10/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/fcontextPage.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.10/gui/fcontextPage.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,207 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -437,9 +437,9 @@
 +        self.store.set_value(iter, SPEC_COL, fspec)
 +        self.store.set_value(iter, FTYPE_COL, ftype)
 +        self.store.set_value(iter, TYPE_COL, "system_u:object_r:%s:%s" % (type, mls))
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.9/gui/loginsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.10/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/loginsPage.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.10/gui/loginsPage.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,173 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -614,9 +614,9 @@
 +        self.store.set_value(iter, 1, seuser)
 +        self.store.set_value(iter, 2, seobject.translate(serange))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.9/gui/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.10/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/Makefile	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.10/gui/Makefile	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,34 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -652,9 +652,9 @@
 +indent:
 +
 +relabel:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.9/gui/mappingsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.10/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/mappingsPage.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.10/gui/mappingsPage.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,54 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -710,9 +710,9 @@
 +        for k in keys:
 +            print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1]))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.9/gui/modulesPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.10/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/modulesPage.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.10/gui/modulesPage.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,172 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -886,10 +886,10 @@
 +        
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.9/gui/polgen.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.10/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/polgen.glade	2007-04-18 15:15:26.000000000 -0400
-@@ -0,0 +1,1167 @@
++++ policycoreutils-2.0.10/gui/polgen.glade	2007-04-24 14:49:29.000000000 -0400
+@@ -0,0 +1,1168 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 +
@@ -923,6 +923,7 @@
 +	  <property name="border_width">4</property>
 +	  <property name="visible">True</property>
 +	  <property name="show_help">False</property>
++	  <signal name="cancel" handler="on_druid_cancel" last_modification_time="Tue, 24 Apr 2007 18:48:08 GMT"/>
 +
 +	  <child>
 +	    <widget class="GnomeDruidPageEdge" id="druidpagestart1">
@@ -2057,9 +2058,9 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.9/gui/polgengui.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.10/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/polgengui.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.10/gui/polgengui.py	2007-04-24 14:49:20.000000000 -0400
 @@ -0,0 +1,253 @@
 +#!/usr/bin/python
 +#
@@ -2128,7 +2129,7 @@
 +class childWindow:
 +    def __init__(self):
 +        self.xml = xml
-+        xml.signal_connect("on_close_clicked", self.quit)
++        xml.signal_connect("on_druid_cancel", self.quit)
 +        xml.signal_connect("on_delete_clicked", self.delete)
 +        xml.signal_connect("on_exec_select_clicked", self.exec_select)
 +        xml.signal_connect("on_add_clicked", self.add)
@@ -2314,9 +2315,9 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.9/gui/polgen.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.10/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/polgen.py	2007-04-18 15:18:32.000000000 -0400
++++ policycoreutils-2.0.10/gui/polgen.py	2007-04-24 14:44:30.000000000 -0400
 @@ -0,0 +1,455 @@
 +#! /usr/bin/python
 +# Copyright (C) 2007 Red Hat 
@@ -2611,7 +2612,7 @@
 +		newif = re.sub("TEMPLATETYPE", self.name, executable.if_rules)
 +		
 +		for d in self.DEFAULT_DIRS:
-+			if self.DEFAULT_DIRS[d][1] > 0:
++			if len(self.DEFAULT_DIRS[d][1]) > 0:
 +				newif += re.sub("TEMPLATETYPE", self.name, self.DEFAULT_DIRS[d][2].if_rules)
 +                                for i in self.DEFAULT_DIRS[d][1]:
 +                                        if os.path.exists(i) and stat.S_ISSOCK(os.stat(i)[stat.ST_MODE]):
@@ -2773,9 +2774,9 @@
 +    sys.exit(0)
 +    
 +	
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.9/gui/portsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.10/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/portsPage.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.10/gui/portsPage.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,227 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -3004,9 +3005,9 @@
 +        self.store.set_value(iter, MLS_COL, mls)
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.9/gui/selinux.tbl
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.10/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/selinux.tbl	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.10/gui/selinux.tbl	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,274 @@
 +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
 +allow_cvs_read_shadow  _("CVS") _("Allow cvs daemon to read shadow")
@@ -3282,9 +3283,9 @@
 +webadm_manage_users_files _("HTTPD Service") _("Allow httpd to access nfs file systems.")
 +webadm_read_users_files _("HTTPD Service") _("Allow httpd to access nfs file systems.")
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.9/gui/semanagePage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.10/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/semanagePage.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.10/gui/semanagePage.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,115 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -3401,9 +3402,9 @@
 +        self.dialog.hide()
 +
 +    
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.9/gui/statusPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.10/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/statusPage.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.10/gui/statusPage.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,220 @@
 +## statusPage.py - show selinux status
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -3625,9 +3626,9 @@
 +        return self.types[self.selinuxTypeOptionMenu.get_active()]
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.9/gui/system-config-selinux.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.10/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/system-config-selinux.glade	2007-04-16 13:26:34.000000000 -0400
++++ policycoreutils-2.0.10/gui/system-config-selinux.glade	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,3034 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -6663,9 +6664,9 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.9/gui/system-config-selinux.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.10/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/system-config-selinux.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.10/gui/system-config-selinux.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,169 @@
 +#!/usr/bin/python
 +#
@@ -6836,9 +6837,9 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.9/gui/templates/executable.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.10/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/executable.py	2007-04-18 13:13:36.000000000 -0400
++++ policycoreutils-2.0.10/gui/templates/executable.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,156 @@
 +#! /usr/bin/env python
 +# Copyright (C) 2007 Red Hat 
@@ -6996,9 +6997,9 @@
 +EXECUTABLE		--	gen_context(system_u:object_r:TEMPLATETYPE_exec_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.9/gui/templates/__init__.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.10/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/__init__.py	2007-04-18 13:13:36.000000000 -0400
++++ policycoreutils-2.0.10/gui/templates/__init__.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -7018,9 +7019,9 @@
 +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 +#
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.9/gui/templates/network.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.10/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/network.py	2007-04-18 15:15:55.000000000 -0400
++++ policycoreutils-2.0.10/gui/templates/network.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,44 @@
 +te_port_types="""\
 +type TEMPLATETYPE_port_t;
@@ -7066,9 +7067,9 @@
 +allow TEMPLATETYPE_t TEMPLATETYPE_port_t:udp_socket name_bind;
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.9/gui/templates/rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.10/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/rw.py	2007-04-18 13:13:36.000000000 -0400
++++ policycoreutils-2.0.10/gui/templates/rw.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,104 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7174,9 +7175,9 @@
 +fc_dir="""
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.9/gui/templates/script.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.10/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/script.py	2007-04-18 13:13:36.000000000 -0400
++++ policycoreutils-2.0.10/gui/templates/script.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,42 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7220,9 +7221,9 @@
 +/usr/sbin/semanage port -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.9/gui/templates/semodule.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.10/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/semodule.py	2007-04-18 13:13:36.000000000 -0400
++++ policycoreutils-2.0.10/gui/templates/semodule.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7265,9 +7266,9 @@
 +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.9/gui/templates/tmp.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.10/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/tmp.py	2007-04-18 13:13:36.000000000 -0400
++++ policycoreutils-2.0.10/gui/templates/tmp.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,72 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7341,9 +7342,9 @@
 +	dontaudit $1 TEMPLATETYPE_tmp_t:file r_file_perms;
 +')
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.9/gui/templates/var_lib.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.10/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_lib.py	2007-04-18 13:13:36.000000000 -0400
++++ policycoreutils-2.0.10/gui/templates/var_lib.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,137 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7482,9 +7483,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.9/gui/templates/var_log.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.10/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_log.py	2007-04-18 13:13:36.000000000 -0400
++++ policycoreutils-2.0.10/gui/templates/var_log.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,89 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7575,9 +7576,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.9/gui/templates/var_run.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.10/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_run.py	2007-04-18 13:13:36.000000000 -0400
++++ policycoreutils-2.0.10/gui/templates/var_run.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,95 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7674,9 +7675,9 @@
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.9/gui/templates/var_spool.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.10/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/templates/var_spool.py	2007-04-19 09:35:34.000000000 -0400
++++ policycoreutils-2.0.10/gui/templates/var_spool.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,105 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7783,9 +7784,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.9/gui/translationsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.10/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/translationsPage.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.10/gui/translationsPage.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,111 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -7898,9 +7899,9 @@
 +        store, iter = self.view.get_selection().get_selected()
 +        self.store.set_value(iter, 0, level)
 +        self.store.set_value(iter, 1, translation)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.9/gui/usersPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.10/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.9/gui/usersPage.py	2007-04-18 13:14:57.000000000 -0400
++++ policycoreutils-2.0.10/gui/usersPage.py	2007-04-24 14:43:23.000000000 -0400
 @@ -0,0 +1,166 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-6/policycoreutils.spec,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -r1.334 -r1.335
--- policycoreutils.spec	23 Apr 2007 15:03:02 -0000	1.334
+++ policycoreutils.spec	27 Apr 2007 17:25:42 -0000	1.335
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.34.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -190,6 +190,9 @@
 fi
 
 %changelog
+* Fri Apr 27 2007 Dan Walsh <dwalsh at redhat.com> 1.34.1-9
+- Fixes for polgengui
+
 * Tue Apr 17 2007 Dan Walsh <dwalsh at redhat.com> 1.34.1-8
 - Fix genhomedircon to handle __default__ not being user_u
 - Modify polgengui to be wizard



From fedora-cvs-commits at redhat.com  Fri Apr 27 18:31:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 14:31:01 -0400
Subject: rpms/libvirt/devel libvirt.spec,1.52,1.53
Message-ID: <200704271831.l3RIV1Ji000526@cvs.devel.redhat.com>

Author: berrange

Update of /cvs/dist/rpms/libvirt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23398

Modified Files:
	libvirt.spec 
Log Message:
Added missing dep on dnsmasq RPM


Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- libvirt.spec	17 Apr 2007 09:42:15 -0000	1.52
+++ libvirt.spec	27 Apr 2007 18:30:54 -0000	1.53
@@ -9,7 +9,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.2.2
-Release: 1%{?_extra_release}
+Release: 2%{?_extra_release}
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -19,6 +19,7 @@
 Requires: libxml2
 Requires: readline
 Requires: ncurses
+Requires: dnsmasq
 BuildRequires: xen-devel
 BuildRequires: libxml2-devel
 BuildRequires: readline-devel
@@ -169,6 +170,9 @@
 %doc docs/examples/python
 
 %changelog
+* Fri Apr 21 2007 Daniel P. Berrange <berrange at redhat.com> - 0.2.2-2.fc7
+- Added Requires on dnsmasq for virtual networking
+
 * Tue Apr 17 2007 Daniel Veillard <veillard at redhat.com> - 0.2.2-1.fc7
 - Release of 0.2.2
 - lot of assorted bugfixes and cleanups



From fedora-cvs-commits at redhat.com  Fri Apr 27 18:38:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 14:38:26 -0400
Subject: rpms/kernel-xen-2.6/devel linux-2.6-forwarding_of_ip_summed.patch,
	NONE, 1.1.2.1 linux-2.6-kill_skbuff_hack.patch, NONE,
	1.1.2.1 linux-2.6-treat_partial_as_unnecessary.patch, NONE,
	1.1.2.1 linux-2.6-use_csum_start_offset_instead.patch, NONE,
	1.1.2.1 kernel-xen.spec, 1.18.4.2, 1.18.4.3
Message-ID: <200704271838.l3RIcQq8005739@cvs.devel.redhat.com>

Author: ehabkost

Update of /cvs/dist/rpms/kernel-xen-2.6/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4727

Modified Files:
      Tag: private-ehabkost-xen-3_0_5-branch
	kernel-xen.spec 
Added Files:
      Tag: private-ehabkost-xen-3_0_5-branch
	linux-2.6-forwarding_of_ip_summed.patch 
	linux-2.6-kill_skbuff_hack.patch 
	linux-2.6-treat_partial_as_unnecessary.patch 
	linux-2.6-use_csum_start_offset_instead.patch 
Log Message:
Adding Herbert Xu checksum patches (bug #223258)



linux-2.6-forwarding_of_ip_summed.patch:
 include/linux/skbuff.h  |    7 +++++++
 net/bridge/br_forward.c |    2 +-
 net/ipv4/ip_forward.c   |    2 +-
 net/ipv6/ip6_output.c   |    2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-forwarding_of_ip_summed.patch ---
From: Herbert Xu <herbert.xu at redhat.com>
Subject: [1/4] [NET]: Allow forwarding of ip_summed except CHECKSUM_COMPLETE

Hi:

[NET]: Allow forwarding of ip_summed except CHECKSUM_COMPLETE

Right now Xen has a horrible hack that lets it forward packets with
partial checksums.  One of the reasons that CHECKSUM_PARTIAL and
CHECKSUM_COMPLETE were added is so that we can get rid of this hack
(where it creates two extra bits in the skbuff to essentially mirror
ip_summed without being destroyed by the forwarding code).

I had forgotten that I've already gone through all the deivce drivers
last time around to make sure that they're looking at ip_summed ==
CHECKSUM_PARTIAL rather than ip_summed != 0 on transmit.  In any case,
I've now done that again so it should definitely be safe.

Unfortunately nobody has yet added any code to update CHECKSUM_COMPLETE
values on forward so we I'm setting that to CHECKSUM_NONE.  This should
be safe to remove for bridging but I'd like to check that code path
first.

So here is the patch that lets us get rid of the hack by preserving
ip_summed (mostly) on forwarded packets.

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 -ur linux-2.6.20.i386.orig/include/linux/skbuff.h linux-2.6.20.i386/include/linux/skbuff.h
--- linux-2.6.20.i386.orig/include/linux/skbuff.h	2007-04-24 13:18:41.000000000 +1000
+++ linux-2.6.20.i386/include/linux/skbuff.h	2007-04-24 13:31:01.000000000 +1000
@@ -1494,5 +1494,12 @@
 	return skb_shinfo(skb)->gso_size;
 }
 
+static inline void skb_forward_csum(struct sk_buff *skb)
+{
+	/* Unfortunately we don't support this one.  Any brave souls? */
+	if (skb->ip_summed == CHECKSUM_COMPLETE)
+		skb->ip_summed = CHECKSUM_NONE;
+}
+
 #endif	/* __KERNEL__ */
 #endif	/* _LINUX_SKBUFF_H */
diff -ur linux-2.6.20.i386.orig/net/bridge/br_forward.c linux-2.6.20.i386/net/bridge/br_forward.c
--- linux-2.6.20.i386.orig/net/bridge/br_forward.c	2007-03-30 13:39:09.000000000 +1000
+++ linux-2.6.20.i386/net/bridge/br_forward.c	2007-04-24 13:31:01.000000000 +1000
@@ -71,7 +71,7 @@
 
 	indev = skb->dev;
 	skb->dev = to->dev;
-	skb->ip_summed = CHECKSUM_NONE;
+	skb_forward_csum(skb);
 
 	NF_HOOK(PF_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev,
 			br_forward_finish);
diff -ur linux-2.6.20.i386.orig/net/ipv4/ip_forward.c linux-2.6.20.i386/net/ipv4/ip_forward.c
--- linux-2.6.20.i386.orig/net/ipv4/ip_forward.c	2007-03-30 13:39:10.000000000 +1000
+++ linux-2.6.20.i386/net/ipv4/ip_forward.c	2007-04-24 13:31:20.000000000 +1000
@@ -68,7 +68,7 @@
 	if (skb->pkt_type != PACKET_HOST)
 		goto drop;
 
-	skb->ip_summed = CHECKSUM_NONE;
+	skb_forward_csum(skb);
 	
 	/*
 	 *	According to the RFC, we must first decrease the TTL field. If
diff -ur linux-2.6.20.i386.orig/net/ipv6/ip6_output.c linux-2.6.20.i386/net/ipv6/ip6_output.c
--- linux-2.6.20.i386.orig/net/ipv6/ip6_output.c	2007-03-30 13:39:11.000000000 +1000
+++ linux-2.6.20.i386/net/ipv6/ip6_output.c	2007-04-24 13:31:01.000000000 +1000
@@ -372,7 +372,7 @@
 		goto drop;
 	}
 
-	skb->ip_summed = CHECKSUM_NONE;
+	skb_forward_csum(skb);
 
 	/*
 	 *	We DO NOT make any processing on



linux-2.6-kill_skbuff_hack.patch:
 drivers/xen/core/skbuff.c             |   35 ++++++++++++++++++
 drivers/xen/netback/loopback.c        |   10 -----
 drivers/xen/netback/netback.c         |   29 +++++++--------
 drivers/xen/netfront/netfront.c       |   37 ++++++++++---------
 include/linux/skbuff.h                |   10 +----
 net/core/dev.c                        |   63 ----------------------------------
 net/core/skbuff.c                     |    4 --
 net/ipv4/netfilter/ip_nat_proto_tcp.c |    7 ---
 net/ipv4/netfilter/ip_nat_proto_udp.c |    8 ----
 net/ipv4/xfrm4_output.c               |    6 ---
 10 files changed, 70 insertions(+), 139 deletions(-)

--- NEW FILE linux-2.6-kill_skbuff_hack.patch ---
From: Herbert Xu <herbert.xu at redhat.com>
Subject: [4/4] [XEN]: Kill skbuff hack

Hi:

This patch is based on the FC6 kernel.

[XEN]: Kill skbuff hack

Now that the Linux stack can accept packets with partial checksums and
relay them back out again, we can eliminate the skbuff hacks.

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 -ur linux-2.6.20.i386.orig/drivers/xen/core/skbuff.c linux-2.6.20.i386/drivers/xen/core/skbuff.c
--- linux-2.6.20.i386.orig/drivers/xen/core/skbuff.c	2007-04-24 13:18:41.000000000 +1000
+++ linux-2.6.20.i386/drivers/xen/core/skbuff.c	2007-04-24 15:50:03.000000000 +1000
@@ -9,6 +9,10 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/init.h>
+#include <linux/if_ether.h>
+#include <linux/tcp.h>
+#include <linux/udp.h>
+#include <net/ip.h>
 #include <asm/io.h>
 #include <asm/page.h>
 #include <asm/hypervisor.h>
@@ -78,6 +82,37 @@
 	return skb;
 }
 
+int skb_checksum_setup(struct sk_buff *skb)
+{
+	if (skb->protocol != htons(ETH_P_IP))
+		goto out;
+	skb->h.raw = (unsigned char *)skb->nh.iph + 4*skb->nh.iph->ihl;
+	if (skb->h.raw >= skb->tail)
+		goto out;
+	switch (skb->nh.iph->protocol) {
+	case IPPROTO_TCP:
+		skb->csum_offset = offsetof(struct tcphdr, check);
+		break;
+	case IPPROTO_UDP:
+		skb->csum_offset = offsetof(struct udphdr, check);
+		break;
+	default:
+		if (net_ratelimit())
+			printk(KERN_ERR "Attempting to checksum a non-"
+			       "TCP/UDP packet, dropping a protocol"
+			       " %d packet", skb->nh.iph->protocol);
+		goto out;
+	}
+	if ((skb->h.raw + skb->csum_offset + 2) > skb->tail)
+		goto out;
+	skb->ip_summed = CHECKSUM_PARTIAL;
+
+	return 0;
+out:
+	return -EPROTO;
+}
+EXPORT_SYMBOL(skb_checksum_setup);
+
 static void skbuff_ctor(void *buf, struct kmem_cache *cachep, unsigned long unused)
 {
 	int order = 0;
diff -ur linux-2.6.20.i386.orig/drivers/xen/netback/loopback.c linux-2.6.20.i386/drivers/xen/netback/loopback.c
--- linux-2.6.20.i386.orig/drivers/xen/netback/loopback.c	2007-04-24 13:18:41.000000000 +1000
+++ linux-2.6.20.i386/drivers/xen/netback/loopback.c	2007-04-24 15:50:03.000000000 +1000
@@ -149,16 +149,6 @@
 	np->stats.rx_bytes += skb->len;
 	np->stats.rx_packets++;
 
-	if (skb->ip_summed == CHECKSUM_PARTIAL) {
-		/* Defer checksum calculation. */
-		skb->proto_csum_blank = 1;
-		/* Must be a local packet: assert its integrity. */
-		skb->proto_data_valid = 1;
-	}
-
-	skb->ip_summed = skb->proto_data_valid ?
-		CHECKSUM_UNNECESSARY : CHECKSUM_NONE;
-
 	skb->pkt_type = PACKET_HOST; /* overridden by eth_type_trans() */
 	skb->protocol = eth_type_trans(skb, dev);
 	skb->dev      = dev;
diff -ur linux-2.6.20.i386.orig/drivers/xen/netback/netback.c linux-2.6.20.i386/drivers/xen/netback/netback.c
--- linux-2.6.20.i386.orig/drivers/xen/netback/netback.c	2007-04-24 13:18:41.000000000 +1000
+++ linux-2.6.20.i386/drivers/xen/netback/netback.c	2007-04-24 15:50:03.000000000 +1000
@@ -293,7 +293,6 @@
 		/* Copy only the header fields we use in this driver. */
 		nskb->dev = skb->dev;
 		nskb->ip_summed = skb->ip_summed;
-		nskb->proto_data_valid = skb->proto_data_valid;
 		dev_kfree_skb(skb);
 		skb = nskb;
 	}
@@ -677,9 +676,11 @@
 		id = meta[npo.meta_cons].id;
 		flags = nr_frags ? NETRXF_more_data : 0;
 
-		if (skb->ip_summed == CHECKSUM_PARTIAL) /* local packet? */
+		if (skb->ip_summed == CHECKSUM_PARTIAL)
+			/* local packet? */
 			flags |= NETRXF_csum_blank | NETRXF_data_validated;
-		else if (skb->proto_data_valid) /* remote but checksummed? */
+		else if (skb->ip_summed == CHECKSUM_UNNECESSARY)
+			/* remote but checksummed? */
 			flags |= NETRXF_data_validated;
 
 		if (meta[npo.meta_cons].copy)
@@ -1318,23 +1319,19 @@
 			netif_idx_release(pending_idx);
 		}
 
-		/*
-		 * Old frontends do not assert data_validated but we
-		 * can infer it from csum_blank so test both flags.
-		 */
-		if (txp->flags & (NETTXF_data_validated|NETTXF_csum_blank)) {
-			skb->ip_summed = CHECKSUM_UNNECESSARY;
-			skb->proto_data_valid = 1;
-		} else {
-			skb->ip_summed = CHECKSUM_NONE;
-			skb->proto_data_valid = 0;
-		}
-		skb->proto_csum_blank = !!(txp->flags & NETTXF_csum_blank);
-
 		netbk_fill_frags(skb);
 
 		skb->dev      = netif->dev;
 		skb->protocol = eth_type_trans(skb, skb->dev);
+		skb->nh.raw   = skb->data;
+
+		if (txp->flags & NETTXF_csum_blank) {
+			if (skb_checksum_setup(skb)) {
+				kfree_skb(skb);
+				continue;
+			}
+		} else if (txp->flags & NETTXF_data_validated)
+			skb->ip_summed = CHECKSUM_UNNECESSARY;
 
 		netif->stats.rx_bytes += skb->len;
 		netif->stats.rx_packets++;
diff -ur linux-2.6.20.i386.orig/drivers/xen/netfront/netfront.c linux-2.6.20.i386/drivers/xen/netfront/netfront.c
--- linux-2.6.20.i386.orig/drivers/xen/netfront/netfront.c	2007-04-24 13:18:41.000000000 +1000
+++ linux-2.6.20.i386/drivers/xen/netfront/netfront.c	2007-04-24 15:50:03.000000000 +1000
@@ -962,12 +962,12 @@
 	tx->flags = 0;
 	extra = NULL;
 
-	if (skb->ip_summed == CHECKSUM_PARTIAL) /* local packet? */
+	if (skb->ip_summed == CHECKSUM_PARTIAL)
+		/* local packet? */
 		tx->flags |= NETTXF_csum_blank | NETTXF_data_validated;
-#ifdef CONFIG_XEN
-	if (skb->proto_data_valid) /* remote but checksummed? */
+	else if (skb->ip_summed == CHECKSUM_UNNECESSARY)
+		/* remote but checksummed? */
 		tx->flags |= NETTXF_data_validated;
-#endif
 
 #ifdef HAVE_TSO
 	if (skb_is_gso(skb)) {
@@ -1388,20 +1388,10 @@
 		skb->truesize += skb->data_len - (RX_COPY_THRESHOLD - len);
 		skb->len += skb->data_len;
 
-		/*
-		 * Old backends do not assert data_validated but we
-		 * can infer it from csum_blank so test both flags.
-		 */
-		if (rx->flags & (NETRXF_data_validated|NETRXF_csum_blank))
+		if (rx->flags & NETRXF_csum_blank)
+			skb->ip_summed = CHECKSUM_PARTIAL;
+		else if (rx->flags & NETRXF_data_validated)
 			skb->ip_summed = CHECKSUM_UNNECESSARY;
-		else
-			skb->ip_summed = CHECKSUM_NONE;
-#ifdef CONFIG_XEN
-		skb->proto_data_valid = (skb->ip_summed != CHECKSUM_NONE);
-		skb->proto_csum_blank = !!(rx->flags & NETRXF_csum_blank);
-#endif
-		np->stats.rx_packets++;
-		np->stats.rx_bytes += skb->len;
 
 		__skb_queue_tail(&rxq, skb);
 
@@ -1441,6 +1431,19 @@
 
 		/* Ethernet work: Delayed to here as it peeks the header. */
 		skb->protocol = eth_type_trans(skb, dev);
+		skb->nh.raw = skb->data;
+
+		if (skb->ip_summed == CHECKSUM_PARTIAL) {
+			if (skb_checksum_setup(skb)) {
+				work_done--;
+				kfree_skb(skb);
+				np->stats.rx_errors++;
+				continue;
+			}
+		}
+
+		np->stats.rx_packets++;
+		np->stats.rx_bytes += skb->len;
 
 		/* Pass it up. */
 		netif_receive_skb(skb);
diff -ur linux-2.6.20.i386.orig/include/linux/skbuff.h linux-2.6.20.i386/include/linux/skbuff.h
--- linux-2.6.20.i386.orig/include/linux/skbuff.h	2007-04-24 15:16:44.000000000 +1000
+++ linux-2.6.20.i386/include/linux/skbuff.h	2007-04-24 15:50:03.000000000 +1000
@@ -205,8 +205,6 @@
  *	@local_df: allow local fragmentation
  *	@cloned: Head may be cloned (check refcnt to be sure)
  *	@nohdr: Payload reference only, must not modify header
- *	@proto_data_valid: Protocol data validated since arriving at localhost
- *	@proto_csum_blank: Protocol csum must be added before leaving localhost
  *	@pkt_type: Packet class
  *	@fclone: skbuff clone status
  *	@ip_summed: Driver fed us an IP checksum
@@ -292,13 +290,7 @@
 				nfctinfo:3;
 	__u8			pkt_type:3,
 				fclone:2,
-#ifndef CONFIG_XEN
 				ipvs_property:1;
-#else
-				ipvs_property:1,
-				proto_data_valid:1,
-				proto_csum_blank:1;
-#endif
 	__be16			protocol;
 
 	void			(*destructor)(struct sk_buff *skb);
@@ -1351,6 +1343,8 @@
 
 extern struct sk_buff *skb_segment(struct sk_buff *skb, int features);
 
+extern int skb_checksum_setup(struct sk_buff *skb);
+
 static inline void *skb_header_pointer(const struct sk_buff *skb, int offset,
 				       int len, void *buffer)
 {
diff -ur linux-2.6.20.i386.orig/net/core/dev.c linux-2.6.20.i386/net/core/dev.c
--- linux-2.6.20.i386.orig/net/core/dev.c	2007-04-24 15:14:04.000000000 +1000
+++ linux-2.6.20.i386/net/core/dev.c	2007-04-24 15:50:03.000000000 +1000
@@ -117,12 +117,6 @@
 #include <linux/err.h>
 #include <linux/ctype.h>
 
-#ifdef CONFIG_XEN
-#include <net/ip.h>
-#include <linux/tcp.h>
-#include <linux/udp.h>
-#endif
-
 /*
  *	The list of packet types we will receive (as opposed to discard)
  *	and the routines to invoke.
@@ -1400,43 +1394,6 @@
 	}						\
 }
 
-#ifdef CONFIG_XEN
-inline int skb_checksum_setup(struct sk_buff *skb)
-{
-	if (skb->proto_csum_blank) {
-		if (skb->protocol != htons(ETH_P_IP))
-			goto out;
-		skb->h.raw = (unsigned char *)skb->nh.iph + 4*skb->nh.iph->ihl;
-		if (skb->h.raw >= skb->tail)
-			goto out;
-		switch (skb->nh.iph->protocol) {
-		case IPPROTO_TCP:
-			skb->csum = offsetof(struct tcphdr, check);
-			break;
-		case IPPROTO_UDP:
-			skb->csum = offsetof(struct udphdr, check);
-			break;
-		default:
-			if (net_ratelimit())
-				printk(KERN_ERR "Attempting to checksum a non-"
-				       "TCP/UDP packet, dropping a protocol"
-				       " %d packet", skb->nh.iph->protocol);
-			goto out;
-		}
-		if ((skb->h.raw + skb->csum + 2) > skb->tail)
-			goto out;
-		skb->ip_summed = CHECKSUM_PARTIAL;
-		skb->proto_csum_blank = 0;
-	}
-	return 0;
-out:
-	return -EPROTO;
-}
-#else
-inline int skb_checksum_setup(struct sk_buff *skb) { return 0; }
-#endif
-
-
 /**
  *	dev_queue_xmit - transmit a buffer
  *	@skb: buffer to transmit
@@ -1469,12 +1426,6 @@
 	struct Qdisc *q;
 	int rc = -ENOMEM;
 
- 	/* If a checksum-deferred packet is forwarded to a device that needs a
- 	 * checksum, correct the pointers and force checksumming.
- 	 */
- 	if (skb_checksum_setup(skb))
- 		goto out_kfree_skb;
-
 	/* GSO will handle the following emulations directly. */
 	if (netif_needs_gso(dev, skb))
 		goto gso;
@@ -1853,19 +1804,6 @@
 	}
 #endif
 
-#ifdef CONFIG_XEN
-	switch (skb->ip_summed) {
-	case CHECKSUM_UNNECESSARY:
-		skb->proto_data_valid = 1;
-		break;
-	case CHECKSUM_PARTIAL:
-		/* XXX Implement me. */
-	default:
-		skb->proto_data_valid = 0;
-		break;
-	}
-#endif
-
 	list_for_each_entry_rcu(ptype, &ptype_all, list) {
 		if (!ptype->dev || ptype->dev == skb->dev) {
 			if (pt_prev) 
@@ -3630,7 +3568,6 @@
 EXPORT_SYMBOL(net_enable_timestamp);
 EXPORT_SYMBOL(net_disable_timestamp);
 EXPORT_SYMBOL(dev_get_flags);
-EXPORT_SYMBOL(skb_checksum_setup);
 
 #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
 EXPORT_SYMBOL(br_handle_frame_hook);
diff -ur linux-2.6.20.i386.orig/net/core/skbuff.c linux-2.6.20.i386/net/core/skbuff.c
--- linux-2.6.20.i386.orig/net/core/skbuff.c	2007-04-24 15:08:07.000000000 +1000
+++ linux-2.6.20.i386/net/core/skbuff.c	2007-04-24 15:50:03.000000000 +1000
@@ -483,10 +483,6 @@
 	C(local_df);
 	n->cloned = 1;
 	n->nohdr = 0;
-#ifdef CONFIG_XEN
-	C(proto_data_valid);
-	C(proto_csum_blank);
-#endif
 	C(pkt_type);
 	C(ip_summed);
 	C(priority);
diff -ur linux-2.6.20.i386.orig/net/ipv4/netfilter/ip_nat_proto_tcp.c linux-2.6.20.i386/net/ipv4/netfilter/ip_nat_proto_tcp.c
--- linux-2.6.20.i386.orig/net/ipv4/netfilter/ip_nat_proto_tcp.c	2007-04-24 13:18:41.000000000 +1000
+++ linux-2.6.20.i386/net/ipv4/netfilter/ip_nat_proto_tcp.c	2007-04-24 15:50:03.000000000 +1000
@@ -129,15 +129,8 @@
 	if (hdrsize < sizeof(*hdr))
 		return 1;
 
-#ifdef CONFIG_XEN
-	if ((*pskb)->proto_csum_blank)
-		nf_csum_replace4(&hdr->check, oldip, newip);
-	else
-#endif
-	{
 	nf_proto_csum_replace4(&hdr->check, *pskb, oldip, newip, 1);
 	nf_proto_csum_replace2(&hdr->check, *pskb, oldport, newport, 0);
-	}
 	return 1;
 }
 
diff -ur linux-2.6.20.i386.orig/net/ipv4/netfilter/ip_nat_proto_udp.c linux-2.6.20.i386/net/ipv4/netfilter/ip_nat_proto_udp.c
--- linux-2.6.20.i386.orig/net/ipv4/netfilter/ip_nat_proto_udp.c	2007-04-24 13:18:41.000000000 +1000
+++ linux-2.6.20.i386/net/ipv4/netfilter/ip_nat_proto_udp.c	2007-04-24 15:50:03.000000000 +1000
@@ -115,16 +115,8 @@
 	}
 
 	if (hdr->check || (*pskb)->ip_summed == CHECKSUM_PARTIAL) {
-#ifdef CONFIG_XEN
-		if ((*pskb)->proto_csum_blank)
-			nf_csum_replace4(&hdr->check, oldip, newip);
-		else
-#endif
-		{
 		nf_proto_csum_replace4(&hdr->check, *pskb, oldip, newip, 1);
 		nf_proto_csum_replace2(&hdr->check, *pskb, *portptr, newport, 0);
-		}
-
 		if (!hdr->check)
 			hdr->check = CSUM_MANGLED_0;
 	}
diff -ur linux-2.6.20.i386.orig/net/ipv4/xfrm4_output.c linux-2.6.20.i386/net/ipv4/xfrm4_output.c
--- linux-2.6.20.i386.orig/net/ipv4/xfrm4_output.c	2007-04-24 13:18:41.000000000 +1000
+++ linux-2.6.20.i386/net/ipv4/xfrm4_output.c	2007-04-24 15:50:03.000000000 +1000
@@ -18,8 +18,6 @@
 #include <net/xfrm.h>
 #include <net/icmp.h>
 
-extern int skb_checksum_setup(struct sk_buff *skb);
-
 static int xfrm4_tunnel_check_size(struct sk_buff *skb)
 {
 	int mtu, ret = 0;
@@ -49,10 +47,6 @@
 	struct dst_entry *dst = skb->dst;
 	struct xfrm_state *x = dst->xfrm;
 	int err;
-	
-	err = skb_checksum_setup(skb);
-	if (err)
-		goto error_nolock;
 
 	if (skb->ip_summed == CHECKSUM_PARTIAL) {
 		err = skb_checksum_help(skb);



linux-2.6-treat_partial_as_unnecessary.patch:
 include/linux/skbuff.h     |   16 +++++++++++-----
 include/net/tcp.h          |    2 +-
 include/net/udp.h          |    2 +-
 net/core/netpoll.c         |    2 +-
 net/ipv4/ipvs/ip_vs_core.c |    6 ++----
 net/ipv4/tcp_input.c       |    6 +++---
 net/ipv4/tcp_ipv4.c        |    3 +--
 net/ipv4/udp.c             |    6 +++---
 net/ipv6/raw.c             |    4 ++--
 net/ipv6/tcp_ipv6.c        |    3 +--
 net/ipv6/udp.c             |    4 ++--
 net/sctp/input.c           |    3 +--
 net/sunrpc/socklib.c       |    2 +-
 13 files changed, 30 insertions(+), 29 deletions(-)

--- NEW FILE linux-2.6-treat_partial_as_unnecessary.patch ---
From: Herbert Xu <herbert.xu at redhat.com>
Subject: [3/4] [NET]: Treat CHECKSUM_PARTIAL as CHECKSUM_UNNECESSARY

Hi:

[NET]: Treat CHECKSUM_PARTIAL as CHECKSUM_UNNECESSARY

When a transmitted packet is looped back directly, CHECKSUM_PARTIAL
maps to the semantics of CHECKSUM_UNNECESSARY.  Therefore we should
treat it as such in the stack.

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 -ur linux-2.6.20.i386.orig/include/linux/skbuff.h linux-2.6.20.i386/include/linux/skbuff.h
--- linux-2.6.20.i386.orig/include/linux/skbuff.h	2007-04-24 13:42:01.000000000 +1000
+++ linux-2.6.20.i386/include/linux/skbuff.h	2007-04-24 15:16:44.000000000 +1000
@@ -31,10 +31,11 @@
 #define HAVE_ALLOC_SKB		/* For the drivers to know */
 #define HAVE_ALIGNABLE_SKB	/* Ditto 8)		   */
 
+/* Don't change this without changing skb_csum_unnecessary! */
 #define CHECKSUM_NONE 0
-#define CHECKSUM_PARTIAL 1
-#define CHECKSUM_UNNECESSARY 2
-#define CHECKSUM_COMPLETE 3
+#define CHECKSUM_UNNECESSARY 1
+#define CHECKSUM_COMPLETE 2
+#define CHECKSUM_PARTIAL 3
 
 #define SKB_DATA_ALIGN(X)	(((X) + (SMP_CACHE_BYTES - 1)) & \
 				 ~(SMP_CACHE_BYTES - 1))
@@ -1401,6 +1402,11 @@
 
 extern __sum16 __skb_checksum_complete(struct sk_buff *skb);
 
+static inline int skb_csum_unnecessary(const struct sk_buff *skb)
+{
+	return skb->ip_summed & CHECKSUM_UNNECESSARY;
+}
+
 /**
  *	skb_checksum_complete - Calculate checksum of an entire packet
  *	@skb: packet to process
@@ -1419,8 +1425,8 @@
  */
 static inline unsigned int skb_checksum_complete(struct sk_buff *skb)
 {
-	return skb->ip_summed != CHECKSUM_UNNECESSARY &&
-		__skb_checksum_complete(skb);
+	return skb_csum_unnecessary(skb) ?
+	       0 : __skb_checksum_complete(skb);
 }
 
 #ifdef CONFIG_NETFILTER
diff -ur linux-2.6.20.i386.orig/include/net/tcp.h linux-2.6.20.i386/include/net/tcp.h
--- linux-2.6.20.i386.orig/include/net/tcp.h	2007-03-30 13:39:07.000000000 +1000
+++ linux-2.6.20.i386/include/net/tcp.h	2007-04-24 15:16:44.000000000 +1000
@@ -816,7 +816,7 @@
 
 static inline int tcp_checksum_complete(struct sk_buff *skb)
 {
-	return skb->ip_summed != CHECKSUM_UNNECESSARY &&
+	return !skb_csum_unnecessary(skb) &&
 		__tcp_checksum_complete(skb);
 }
 
diff -ur linux-2.6.20.i386.orig/include/net/udp.h linux-2.6.20.i386/include/net/udp.h
--- linux-2.6.20.i386.orig/include/net/udp.h	2007-03-30 13:39:07.000000000 +1000
+++ linux-2.6.20.i386/include/net/udp.h	2007-04-24 15:16:44.000000000 +1000
@@ -80,7 +80,7 @@
 
 static inline int udp_lib_checksum_complete(struct sk_buff *skb)
 {
-	return skb->ip_summed != CHECKSUM_UNNECESSARY &&
+	return !skb_csum_unnecessary(skb) &&
 		__udp_lib_checksum_complete(skb);
 }
 
diff -ur linux-2.6.20.i386.orig/net/core/netpoll.c linux-2.6.20.i386/net/core/netpoll.c
--- linux-2.6.20.i386.orig/net/core/netpoll.c	2007-03-30 13:39:09.000000000 +1000
+++ linux-2.6.20.i386/net/core/netpoll.c	2007-04-24 15:16:44.000000000 +1000
@@ -86,7 +86,7 @@
 {
 	__wsum psum;
 
-	if (uh->check == 0 || skb->ip_summed == CHECKSUM_UNNECESSARY)
+	if (uh->check == 0 || skb_csum_unnecessary(skb))
 		return 0;
 
 	psum = csum_tcpudp_nofold(saddr, daddr, ulen, IPPROTO_UDP, 0);
diff -ur linux-2.6.20.i386.orig/net/ipv4/ipvs/ip_vs_core.c linux-2.6.20.i386/net/ipv4/ipvs/ip_vs_core.c
--- linux-2.6.20.i386.orig/net/ipv4/ipvs/ip_vs_core.c	2007-03-30 13:39:10.000000000 +1000
+++ linux-2.6.20.i386/net/ipv4/ipvs/ip_vs_core.c	2007-04-24 15:16:44.000000000 +1000
@@ -680,8 +680,7 @@
 	}
 
 	/* Ensure the checksum is correct */
-	if (skb->ip_summed != CHECKSUM_UNNECESSARY &&
-	    ip_vs_checksum_complete(skb, ihl)) {
+	if (!skb_csum_unnecessary(skb) && ip_vs_checksum_complete(skb, ihl)) {
 		/* Failed checksum! */
 		IP_VS_DBG(1, "Forward ICMP: failed checksum from %d.%d.%d.%d!\n",
 			  NIPQUAD(iph->saddr));
@@ -921,8 +920,7 @@
 	verdict = NF_DROP;
 
 	/* Ensure the checksum is correct */
-	if (skb->ip_summed != CHECKSUM_UNNECESSARY &&
-	    ip_vs_checksum_complete(skb, ihl)) {
+	if (!skb_csum_unnecessary(skb) && ip_vs_checksum_complete(skb, ihl)) {
 		/* Failed checksum! */
 		IP_VS_DBG(1, "Incoming ICMP: failed checksum from %d.%d.%d.%d!\n",
 			  NIPQUAD(iph->saddr));
diff -ur linux-2.6.20.i386.orig/net/ipv4/tcp_input.c linux-2.6.20.i386/net/ipv4/tcp_input.c
--- linux-2.6.20.i386.orig/net/ipv4/tcp_input.c	2007-03-30 13:39:10.000000000 +1000
+++ linux-2.6.20.i386/net/ipv4/tcp_input.c	2007-04-24 15:16:44.000000000 +1000
@@ -3775,7 +3775,7 @@
 	int err;
 
 	local_bh_enable();
-	if (skb->ip_summed==CHECKSUM_UNNECESSARY)
+	if (skb_csum_unnecessary(skb))
 		err = skb_copy_datagram_iovec(skb, hlen, tp->ucopy.iov, chunk);
 	else
 		err = skb_copy_and_csum_datagram_iovec(skb, hlen,
@@ -3807,7 +3807,7 @@
 
 static inline int tcp_checksum_complete_user(struct sock *sk, struct sk_buff *skb)
 {
-	return skb->ip_summed != CHECKSUM_UNNECESSARY &&
+	return !skb_csum_unnecessary(skb) &&
 		__tcp_checksum_complete_user(sk, skb);
 }
 
@@ -3825,7 +3825,7 @@
 	if (!tp->ucopy.dma_chan && tp->ucopy.pinned_list)
 		tp->ucopy.dma_chan = get_softnet_dma();
 
-	if (tp->ucopy.dma_chan && skb->ip_summed == CHECKSUM_UNNECESSARY) {
+	if (tp->ucopy.dma_chan && skb_csum_unnecessary(skb)) {
 
 		dma_cookie = dma_skb_copy_datagram_iovec(tp->ucopy.dma_chan,
 			skb, hlen, tp->ucopy.iov, chunk, tp->ucopy.pinned_list);
diff -ur linux-2.6.20.i386.orig/net/ipv4/tcp_ipv4.c linux-2.6.20.i386/net/ipv4/tcp_ipv4.c
--- linux-2.6.20.i386.orig/net/ipv4/tcp_ipv4.c	2007-04-24 15:09:28.000000000 +1000
+++ linux-2.6.20.i386/net/ipv4/tcp_ipv4.c	2007-04-24 15:16:44.000000000 +1000
@@ -1636,8 +1636,7 @@
 	 * Packet length and doff are validated by header prediction,
 	 * provided case of th->doff==0 is eliminated.
 	 * So, we defer the checks. */
-	if ((skb->ip_summed != CHECKSUM_UNNECESSARY &&
-	     tcp_v4_checksum_init(skb)))
+	if (!skb_csum_unnecessary(skb) && tcp_v4_checksum_init(skb))
 		goto bad_packet;
 
 	th = skb->h.th;
diff -ur linux-2.6.20.i386.orig/net/ipv4/udp.c linux-2.6.20.i386/net/ipv4/udp.c
--- linux-2.6.20.i386.orig/net/ipv4/udp.c	2007-04-24 15:10:23.000000000 +1000
+++ linux-2.6.20.i386/net/ipv4/udp.c	2007-04-24 15:18:08.000000000 +1000
@@ -839,7 +839,7 @@
 	 * 	          (re-)compute it if message is truncated.
 	 * 	UDP-Lite: always needs to checksum, no HW support.
 	 */
-	copy_only = (skb->ip_summed==CHECKSUM_UNNECESSARY);
+	copy_only = skb_csum_unnecessary(skb);
 
 	if (is_udplite  ||  (!copy_only  &&  msg->msg_flags&MSG_TRUNC)) {
 		if (__udp_lib_checksum_complete(skb))
@@ -1095,7 +1095,7 @@
 		}
 	}
 
-	if (sk->sk_filter && skb->ip_summed != CHECKSUM_UNNECESSARY) {
+	if (sk->sk_filter && !skb_csum_unnecessary(skb)) {
 		if (__udp_lib_checksum_complete(skb))
 			goto drop;
 		skb->ip_summed = CHECKSUM_UNNECESSARY;
@@ -1175,7 +1175,7 @@
 				      skb->len, IPPROTO_UDP, skb->csum       ))
 			skb->ip_summed = CHECKSUM_UNNECESSARY;
 	}
-	if (skb->ip_summed != CHECKSUM_UNNECESSARY)
+	if (!skb_csum_unnecessary(skb))
 		skb->csum = csum_tcpudp_nofold(skb->nh.iph->saddr,
 					       skb->nh.iph->daddr,
 					       skb->len, IPPROTO_UDP, 0);
diff -ur linux-2.6.20.i386.orig/net/ipv6/raw.c linux-2.6.20.i386/net/ipv6/raw.c
--- linux-2.6.20.i386.orig/net/ipv6/raw.c	2007-03-30 13:39:11.000000000 +1000
+++ linux-2.6.20.i386/net/ipv6/raw.c	2007-04-24 15:18:35.000000000 +1000
@@ -369,7 +369,7 @@
 				     skb->len, inet->num, skb->csum))
 			skb->ip_summed = CHECKSUM_UNNECESSARY;
 	}
-	if (skb->ip_summed != CHECKSUM_UNNECESSARY)
+	if (!skb_csum_unnecessary(skb))
 		skb->csum = ~csum_unfold(csum_ipv6_magic(&skb->nh.ipv6h->saddr,
 					     &skb->nh.ipv6h->daddr,
 					     skb->len, inet->num, 0));
@@ -421,7 +421,7 @@
   		msg->msg_flags |= MSG_TRUNC;
   	}
 
-	if (skb->ip_summed==CHECKSUM_UNNECESSARY) {
+	if (skb_csum_unnecessary(skb)) {
 		err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
 	} else if (msg->msg_flags&MSG_TRUNC) {
 		if (__skb_checksum_complete(skb))
diff -ur linux-2.6.20.i386.orig/net/ipv6/tcp_ipv6.c linux-2.6.20.i386/net/ipv6/tcp_ipv6.c
--- linux-2.6.20.i386.orig/net/ipv6/tcp_ipv6.c	2007-04-24 15:10:43.000000000 +1000
+++ linux-2.6.20.i386/net/ipv6/tcp_ipv6.c	2007-04-24 15:16:44.000000000 +1000
@@ -1705,8 +1705,7 @@
 	if (!pskb_may_pull(skb, th->doff*4))
 		goto discard_it;
 
-	if ((skb->ip_summed != CHECKSUM_UNNECESSARY &&
-	     tcp_v6_checksum_init(skb)))
+	if (!skb_csum_unnecessary(skb) && tcp_v6_checksum_init(skb))
 		goto bad_packet;
 
 	th = skb->h.th;
diff -ur linux-2.6.20.i386.orig/net/ipv6/udp.c linux-2.6.20.i386/net/ipv6/udp.c
--- linux-2.6.20.i386.orig/net/ipv6/udp.c	2007-03-30 13:39:11.000000000 +1000
+++ linux-2.6.20.i386/net/ipv6/udp.c	2007-04-24 15:19:35.000000000 +1000
@@ -144,7 +144,7 @@
 	/*
 	 * 	Decide whether to checksum and/or copy data.
 	 */
-	copy_only = (skb->ip_summed==CHECKSUM_UNNECESSARY);
+	copy_only = skb_csum_unnecessary(skb);
 
 	if (is_udplite  ||  (!copy_only  &&  msg->msg_flags&MSG_TRUNC)) {
 		if (__udp_lib_checksum_complete(skb))
@@ -382,7 +382,7 @@
 		    	     skb->len, IPPROTO_UDP, skb->csum             ))
 		skb->ip_summed = CHECKSUM_UNNECESSARY;
 
-	if (skb->ip_summed != CHECKSUM_UNNECESSARY)
+	if (!skb_csum_unnecessary(skb))
 		skb->csum = ~csum_unfold(csum_ipv6_magic(&skb->nh.ipv6h->saddr,
 							 &skb->nh.ipv6h->daddr,
 							 skb->len, IPPROTO_UDP,
diff -ur linux-2.6.20.i386.orig/net/sctp/input.c linux-2.6.20.i386/net/sctp/input.c
--- linux-2.6.20.i386.orig/net/sctp/input.c	2007-03-30 13:39:11.000000000 +1000
+++ linux-2.6.20.i386/net/sctp/input.c	2007-04-24 15:16:44.000000000 +1000
@@ -144,8 +144,7 @@
 	__skb_pull(skb, skb->h.raw - skb->data);
 	if (skb->len < sizeof(struct sctphdr))
 		goto discard_it;
-	if ((skb->ip_summed != CHECKSUM_UNNECESSARY) &&
-	    (sctp_rcv_checksum(skb) < 0))
+	if (!skb_csum_unnecessary(skb) && sctp_rcv_checksum(skb) < 0)
 		goto discard_it;
 
 	skb_pull(skb, sizeof(struct sctphdr));
diff -ur linux-2.6.20.i386.orig/net/sunrpc/socklib.c linux-2.6.20.i386/net/sunrpc/socklib.c
--- linux-2.6.20.i386.orig/net/sunrpc/socklib.c	2007-03-30 13:39:12.000000000 +1000
+++ linux-2.6.20.i386/net/sunrpc/socklib.c	2007-04-24 15:16:44.000000000 +1000
@@ -154,7 +154,7 @@
 	desc.offset = sizeof(struct udphdr);
 	desc.count = skb->len - desc.offset;
 
-	if (skb->ip_summed == CHECKSUM_UNNECESSARY)
+	if (skb_csum_unnecessary(skb))
 		goto no_checksum;
 
 	desc.csum = csum_partial(skb->data, desc.offset, skb->csum);



linux-2.6-use_csum_start_offset_instead.patch:
 include/linux/skbuff.h |    9 +++++++--
 net/core/dev.c         |   23 ++++++++++++++---------
 net/core/skbuff.c      |    2 +-
 net/ipv4/tcp_ipv4.c    |    2 ++
 net/ipv4/udp.c         |    1 +
 net/ipv6/tcp_ipv6.c    |    2 ++
 6 files changed, 27 insertions(+), 12 deletions(-)

--- NEW FILE linux-2.6-use_csum_start_offset_instead.patch ---
From: Herbert Xu <herbert.xu at redhat.com>
Subject: [2/4] [NET]: Use csum_start offset instead of skb_transport_header

Hi:

Note this is based on the upstream net-2.6.22 tree so merging it
into anything before that will require undoing the transport header
changes.  Let me know if there are problems merging it.

[NET]: Use csum_start offset instead of skb_transport_header

The skb transport pointer is currently used to specify the start
of the checksum region for transmit checksum offload.  Unfortunately,
the same pointer is also used during receive side processing.

This creates a problem when we want to retransmit a received
packet with partial checksums since the skb transport pointer
would be overwritten.

This patch solves this problem by creating a new 16-bit csum_start
offset value to replace the skb transport header for the purpose
of checksums.  This offset is calculated from skb->head so that
it does not have to change when skb->data changes.

No extra space is required since csum_offset itself fits within
a 16-bit word so we can use the other 16 bits for csum_start.

For backwards compatibility, just before we push a packet with
partial checksums off into the device driver, we set the skb
transport header to what it would have been under the old scheme.

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 -ur linux-2.6.20.i386.orig/include/linux/skbuff.h linux-2.6.20.i386/include/linux/skbuff.h
--- linux-2.6.20.i386.orig/include/linux/skbuff.h	2007-04-24 13:31:01.000000000 +1000
+++ linux-2.6.20.i386/include/linux/skbuff.h	2007-04-24 13:42:01.000000000 +1000
@@ -198,7 +198,9 @@
  *	@len: Length of actual data
  *	@data_len: Data length
  *	@mac_len: Length of link layer header
- *	@csum: Checksum
+ *	@csum: Checksum (must include start/offset pair)
+ *	@csum_start: Offset from skb->head where checksumming should start
+ *	@csum_offset: Offset from csum_start where checksum should be stored
  *	@local_df: allow local fragmentation
  *	@cloned: Head may be cloned (check refcnt to be sure)
  *	@nohdr: Payload reference only, must not modify header
@@ -276,7 +278,10 @@
 				mac_len;
 	union {
 		__wsum		csum;
-		__u32		csum_offset;
+		struct {
+			__u16	csum_start;
+			__u16	csum_offset;
+		};
 	};
 	__u32			priority;
 	__u8			local_df:1,
diff -ur linux-2.6.20.i386.orig/net/core/dev.c linux-2.6.20.i386/net/core/dev.c
--- linux-2.6.20.i386.orig/net/core/dev.c	2007-04-24 13:18:41.000000000 +1000
+++ linux-2.6.20.i386/net/core/dev.c	2007-04-24 15:14:04.000000000 +1000
@@ -1176,7 +1176,7 @@
 int skb_checksum_help(struct sk_buff *skb)
 {
 	__wsum csum;
-	int ret = 0, offset = skb->h.raw - skb->data;
+	int ret = 0, offset;
 
 	if (skb->ip_summed == CHECKSUM_COMPLETE)
 		goto out_set_summed;
@@ -1192,14 +1192,16 @@
 			goto out;
 	}
 
+	offset = skb->csum_start - skb_headroom(skb);
 	BUG_ON(offset > (int)skb->len);
 	csum = skb_checksum(skb, offset, skb->len-offset, 0);
 
-	offset = skb->tail - skb->h.raw;
+	offset = skb_headlen(skb) - offset;
 	BUG_ON(offset <= 0);
 	BUG_ON(skb->csum_offset + 2 > offset);
 
-	*(__sum16*)(skb->h.raw + skb->csum_offset) = csum_fold(csum);
+	*(__sum16 *)(skb->head + skb->csum_start + skb->csum_offset) =
+		csum_fold(csum);
 
 out_set_summed:
 	skb->ip_summed = CHECKSUM_NONE;
@@ -1494,12 +1496,15 @@
 	/* If packet is not checksummed and device does not support
 	 * checksumming for this protocol, complete checksumming here.
 	 */
-	if (skb->ip_summed == CHECKSUM_PARTIAL &&
-	    (!(dev->features & NETIF_F_GEN_CSUM) &&
-	     (!(dev->features & NETIF_F_IP_CSUM) ||
-	      skb->protocol != htons(ETH_P_IP))))
-	      	if (skb_checksum_help(skb))
-	      		goto out_kfree_skb;
+	if (skb->ip_summed == CHECKSUM_PARTIAL) {
+		skb->h.raw = skb->head + skb->csum_start;
+
+		if (!(dev->features & NETIF_F_GEN_CSUM) &&
+		    (!(dev->features & NETIF_F_IP_CSUM) ||
+		     skb->protocol != htons(ETH_P_IP)))
+		      	if (skb_checksum_help(skb))
+		      		goto out_kfree_skb;
+	}
 
 gso:
 	spin_lock_prefetch(&dev->queue_lock);
diff -ur linux-2.6.20.i386.orig/net/core/skbuff.c linux-2.6.20.i386/net/core/skbuff.c
--- linux-2.6.20.i386.orig/net/core/skbuff.c	2007-04-24 13:18:41.000000000 +1000
+++ linux-2.6.20.i386/net/core/skbuff.c	2007-04-24 15:08:07.000000000 +1000
@@ -1422,7 +1422,7 @@
 	long csstart;
 
 	if (skb->ip_summed == CHECKSUM_PARTIAL)
-		csstart = skb->h.raw - skb->data;
+		csstart = skb->csum_start - skb_headroom(skb);
 	else
 		csstart = skb_headlen(skb);
 
diff -ur linux-2.6.20.i386.orig/net/ipv4/tcp_ipv4.c linux-2.6.20.i386/net/ipv4/tcp_ipv4.c
--- linux-2.6.20.i386.orig/net/ipv4/tcp_ipv4.c	2007-03-30 13:39:10.000000000 +1000
+++ linux-2.6.20.i386/net/ipv4/tcp_ipv4.c	2007-04-24 15:09:28.000000000 +1000
@@ -504,6 +504,7 @@
 	if (skb->ip_summed == CHECKSUM_PARTIAL) {
 		th->check = ~tcp_v4_check(th, len,
 					  inet->saddr, inet->daddr, 0);
+		skb->csum_start = skb->h.raw - skb->head;
 		skb->csum_offset = offsetof(struct tcphdr, check);
 	} else {
 		th->check = tcp_v4_check(th, len, inet->saddr, inet->daddr,
@@ -526,6 +527,7 @@
 
 	th->check = 0;
 	th->check = ~tcp_v4_check(th, skb->len, iph->saddr, iph->daddr, 0);
+	skb->csum_start = skb->h.raw - skb->head;
 	skb->csum_offset = offsetof(struct tcphdr, check);
 	skb->ip_summed = CHECKSUM_PARTIAL;
 	return 0;
diff -ur linux-2.6.20.i386.orig/net/ipv4/udp.c linux-2.6.20.i386/net/ipv4/udp.c
--- linux-2.6.20.i386.orig/net/ipv4/udp.c	2007-04-24 13:18:40.000000000 +1000
+++ linux-2.6.20.i386/net/ipv4/udp.c	2007-04-24 15:10:23.000000000 +1000
@@ -425,6 +425,7 @@
 		/*
 		 * Only one fragment on the socket.
 		 */
+		skb->csum_start = skb->h.raw - skb->head;
 		skb->csum_offset = offsetof(struct udphdr, check);
 		uh->check = ~csum_tcpudp_magic(src, dst, len, IPPROTO_UDP, 0);
 	} else {
diff -ur linux-2.6.20.i386.orig/net/ipv6/tcp_ipv6.c linux-2.6.20.i386/net/ipv6/tcp_ipv6.c
--- linux-2.6.20.i386.orig/net/ipv6/tcp_ipv6.c	2007-03-30 13:39:11.000000000 +1000
+++ linux-2.6.20.i386/net/ipv6/tcp_ipv6.c	2007-04-24 15:10:43.000000000 +1000
@@ -948,6 +948,7 @@
 
 	if (skb->ip_summed == CHECKSUM_PARTIAL) {
 		th->check = ~csum_ipv6_magic(&np->saddr, &np->daddr, len, IPPROTO_TCP,  0);
+		skb->csum_start = skb->h.raw - skb->head;
 		skb->csum_offset = offsetof(struct tcphdr, check);
 	} else {
 		th->check = csum_ipv6_magic(&np->saddr, &np->daddr, len, IPPROTO_TCP, 
@@ -970,6 +971,7 @@
 	th->check = 0;
 	th->check = ~csum_ipv6_magic(&ipv6h->saddr, &ipv6h->daddr, skb->len,
 				     IPPROTO_TCP, 0);
+	skb->csum_start = skb->h.raw - skb->head;
 	skb->csum_offset = offsetof(struct tcphdr, check);
 	skb->ip_summed = CHECKSUM_PARTIAL;
 	return 0;




Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.18.4.2
retrieving revision 1.18.4.3
diff -u -r1.18.4.2 -r1.18.4.3
--- kernel-xen.spec	26 Apr 2007 20:31:56 -0000	1.18.4.2
+++ kernel-xen.spec	27 Apr 2007 18:38:24 -0000	1.18.4.3
@@ -419,6 +419,12 @@
 Patch1610: linux-2.6-input-kill-stupid-messages.patch
 Patch1620: linux-2.6-serial-tickle-nmi.patch
 Patch1650: linux-2.6-serial-460800.patch
+# checksum fixes (bug #223258)
+Patch1660: linux-2.6-forwarding_of_ip_summed.patch
+Patch1661: linux-2.6-use_csum_start_offset_instead.patch
+Patch1662: linux-2.6-treat_partial_as_unnecessary.patch
+Patch1663: linux-2.6-kill_skbuff_hack.patch
+
 Patch1681: linux-2.6-xfs-umount-fix.patch
 Patch1682: linux-2.6-xfs_attr2.patch
 Patch1690: linux-2.6-PT_LOAD-align.patch
@@ -957,6 +963,13 @@
 #%patch1620 -p1
 # Allow to use 480600 baud on 16C950 UARTs
 %patch1650 -p1
+
+# checksum fixes (bug #223258)
+%patch1660 -p1
+%patch1661 -p1
+%patch1662 -p1
+%patch1663 -p1
+
 # Fix XFS umount bug.
 %patch1681 -p1
 # Fix attr2 corruption with btree data extents



From fedora-cvs-commits at redhat.com  Fri Apr 27 18:51:53 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 14:51:53 -0400
Subject: rpms/openoffice.org/FC-6 openoffice.org.spec, 1.943,
	1.944 openoffice.org-2.0.4.ooo69010.sd.undocrash.patch, 1.1, NONE
Message-ID: <200704271851.l3RIprVs015799@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv15760

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.0.4.ooo69010.sd.undocrash.patch 
Log Message:
already added


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v
retrieving revision 1.943
retrieving revision 1.944
diff -u -r1.943 -r1.944
--- openoffice.org.spec	25 Apr 2007 13:35:55 -0000	1.943
+++ openoffice.org.spec	27 Apr 2007 18:51:51 -0000	1.944
@@ -164,7 +164,6 @@
 Patch96: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
 Patch97: openoffice.org-cairoupdate.patch
 Patch98: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch99: openoffice.org-2.0.4.ooo69010.sd.undocrash.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1063,7 +1062,6 @@
 %patch96 -p1 -b .ooo75167.framework.workspacerestore.patch
 %patch97 -p1 -b .openoffice.org-cairoupdate.patch
 %patch98 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch99 -p1 -b .ooo69010.sd.undocrash.patch
 
 tar xzf %{SOURCE1}
 
@@ -2593,9 +2591,6 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Wed Apr 25 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.23
-- add openoffice.org-2.0.4.ooo69010.sd.undocrash.patch
-
 * Tue Apr 17 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.22
 - Resolves: rhbz#236773 unbelieveably impress fails on using the file dialog
 


--- openoffice.org-2.0.4.ooo69010.sd.undocrash.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Apr 27 19:16:59 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 15:16:59 -0400
Subject: rpms/kernel/devel git-iwlwifi-fixes.patch, 1.4,
	1.5 git-iwlwifi.patch, 1.3, 1.4 kernel-2.6.spec, 1.3116, 1.3117
Message-ID: <200704271916.l3RJGxvD001599@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1560

Modified Files:
	git-iwlwifi-fixes.patch git-iwlwifi.patch kernel-2.6.spec 
Log Message:
update iwlwifi (0.0.14+)

git-iwlwifi-fixes.patch:
 base.c    |    2 +-
 iwlwifi.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: git-iwlwifi-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/git-iwlwifi-fixes.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- git-iwlwifi-fixes.patch	25 Apr 2007 19:42:10 -0000	1.4
+++ git-iwlwifi-fixes.patch	27 Apr 2007 19:16:57 -0000	1.5
@@ -1,55 +1,6 @@
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig	2007-04-25 15:18:59.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-04-25 15:27:43.000000000 -0400
-@@ -7599,7 +7599,6 @@ static void ipw_handle_data_packet(struc
- 	short len = le16_to_cpu(rx_hdr->len);
- 
- 	/* We received data from the HW, so stop the watchdog */
--	ieee80211_netif_oper(priv->ieee, NETIF_UPDATE_TX_START);
- 	if (unlikely((len + IPW_RX_FRAME_SIZE) > skb_tailroom(rxb->skb))) {
- 		priv->wstats.discard.misc++;
- 		IPW_DEBUG_DROP("Corruption detected! Oh no!\n");
-@@ -8238,10 +8237,6 @@ static int ipw_queue_tx_reclaim(struct i
- 		is_next = 1;
- 	}
-  done:
--	if (ipw_queue_space(q) > q->low_mark && (fifo >= 0)
--	    && (fifo != priv->hw_setting.cmd_queue_no)
--	    && priv->netdev_registered && netif_running(priv->net_dev))
--		ieee80211_netif_oper(priv->ieee, NETIF_WAKE);
- 	used = q->first_empty - q->last_used;
- 	if (used < 0)
- 		used += q->n_window;
-@@ -9185,13 +9180,9 @@ static int d_open(struct ieee80211_hw *h
- 	/* we should be verifying the device is ready to be opened */
- 	mutex_lock(&priv->mutex);
- 
--	if (priv->net_dev && !(priv->status & STATUS_RF_KILL_MASK)) {
--		ieee80211_netif_oper(priv->ieee, NETIF_ATTACH);
--		ieee80211_netif_oper(priv->ieee, NETIF_START);
--		ieee80211_netif_oper(priv->ieee, NETIF_WAKE);
-+	if (priv->net_dev && !(priv->status & STATUS_RF_KILL_MASK))
- 		netif_carrier_on(priv->net_dev);
- 
--	}
- 	mutex_unlock(&priv->mutex);
- 	IPW_DEBUG_MAC80211("leave %p\n", hw);
- 	return 0;
-@@ -9974,14 +9965,6 @@ static void ipw_link_up(struct ipw_priv 
- 	priv->last_frag_num = -1;
- 	priv->last_packet_time = 0;
- 
--	if (ieee80211_netif_oper(priv->ieee, NETIF_IS_STOPPED)) {
--		IPW_DEBUG_NOTIF("waking queue\n");
--		ieee80211_netif_oper(priv->ieee, NETIF_WAKE);
--	} else {
--		IPW_DEBUG_NOTIF("starting queue\n");
--		ieee80211_netif_oper(priv->ieee, NETIF_START);
--	}
--
- 	ipw_scan_cancel(priv);
- 	ipw_reset_stats(priv);
- 
-@@ -10247,7 +10230,7 @@ static int ipw_update_power_cmd(struct i
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig	2007-04-27 14:33:42.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-04-27 14:37:01.000000000 -0400
+@@ -9951,7 +9951,7 @@ static int ipw_update_power_cmd(struct i
  	u8 period = 0;
  	struct ipw_power_mgr *pow_data;
  
@@ -58,38 +9,8 @@
  		IPW_DEBUG_POWER("Error invalid power mode \n");
  		return -1;
  	}
-@@ -12970,6 +12953,7 @@ static int ipw_pci_probe(struct pci_dev 
- 	err = ipw_read_ucode(priv);
- 	if (err) {
- 		IPW_ERROR("Could not read microcode from disk: %d\n", err);
-+		mutex_unlock(&priv->mutex);
- 		goto out_remove_sysfs;
- 	}
- 
-@@ -13154,9 +13138,6 @@ static int ipw_pci_suspend(struct pci_de
- 	/* Take down the device; powers it off, etc. */
- 	ipw_down(priv);
- 
--	/* Remove the PRESENT state of the device */
--	if (priv->netdev_registered)
--		ieee80211_netif_oper(priv->ieee, NETIF_DETACH);
- 	pci_save_state(pdev);
- 	pci_disable_device(pdev);
- 	pci_set_power_state(pdev, PCI_D3hot);
-@@ -13186,11 +13167,6 @@ static int ipw_pci_resume(struct pci_dev
- 	 */
- 	pci_write_config_byte(pdev, 0x41, 0x00);
- 
--	/* Set the device back into the PRESENT state; this will also wake
--	 * the queue of needed */
--	if (priv->netdev_registered)
--		ieee80211_netif_oper(priv->ieee, NETIF_ATTACH);
--
- 	queue_delayed_work(priv->workqueue, &priv->resume_work, 3 * HZ);
- 
- 	mutex_unlock(&priv->mutex);
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h.orig	2007-04-25 15:18:59.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h	2007-04-25 15:19:11.000000000 -0400
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h.orig	2007-04-27 14:33:42.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h	2007-04-27 14:37:01.000000000 -0400
 @@ -180,7 +180,7 @@ do { if (ipw_debug_level & (level)) \
  #define IPW_DL_QOS           (1<<31)
  

git-iwlwifi.patch:
 Kconfig               |    1 
 Makefile              |    1 
 iwlwifi/Kconfig       |   52 
 iwlwifi/Makefile      |    2 
 iwlwifi/base.c        |12363 ++++++++++++++++++++++++++++++++++++++++++++++++++
 iwlwifi/iwl-3945-rs.c |  962 +++
 iwlwifi/iwl-3945-rs.h |   89 
 iwlwifi/iwlwifi.h     | 1296 +++++
 iwlwifi/iwlwifi_hw.h  | 1973 +++++++
 9 files changed, 16739 insertions(+)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.3 -r 1.4 git-iwlwifi.patch
Index: git-iwlwifi.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/git-iwlwifi.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- git-iwlwifi.patch	13 Apr 2007 20:44:49 -0000	1.3
+++ git-iwlwifi.patch	27 Apr 2007 19:16:57 -0000	1.4
@@ -1,10 +1,10 @@
-http://www.intellinuxwireless.org/repos/iwlwifi.git
+rsync://www.intellinuxwireless.org/repos/iwlwifi.git
 
-commit 54fa65b1135566728167bbab1d2f20c739632e2d
+commit 440a9ee592a409e926f77633ce41ccad7be6c429
 
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig	2007-04-11 14:45:40.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-04-11 14:46:30.000000000 -0400
-@@ -0,0 +1,13762 @@
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig	2007-04-27 14:33:00.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-04-27 14:33:42.000000000 -0400
+@@ -0,0 +1,12363 @@
 +/******************************************************************************
 +
 +  Copyright(c) 2003 - 2006 Intel Corporation. All rights reserved.
@@ -113,7 +113,7 @@
 +
 +#include "iwlwifi.h"
 +
-+#define IWLWIFI_VERSION "0.0.12k"
++#define IWLWIFI_VERSION "0.0.14k"
 +
 +#define DRV_DESCRIPTION	"Intel(R) Wireless Link driver for Linux"
 +#define DRV_COPYRIGHT	"Copyright(c) 2003-2006 Intel Corporation"
@@ -132,61 +132,13 @@
 +#define IEEE80211_24GHZ_BAND     (1<<0)
 +#define IEEE80211_52GHZ_BAND     (1<<1)
 +
-+#define IEEE80211_CCK_RATE_1MB                  0x02
-+#define IEEE80211_CCK_RATE_2MB                  0x04
-+#define IEEE80211_CCK_RATE_5MB                  0x0B
-+#define IEEE80211_CCK_RATE_11MB                 0x16
-+#define IEEE80211_OFDM_RATE_6MB                 0x0C
-+#define IEEE80211_OFDM_RATE_9MB                 0x12
-+#define IEEE80211_OFDM_RATE_12MB                0x18
-+#define IEEE80211_OFDM_RATE_18MB                0x24
-+#define IEEE80211_OFDM_RATE_24MB                0x30
-+#define IEEE80211_OFDM_RATE_36MB                0x48
-+#define IEEE80211_OFDM_RATE_48MB                0x60
-+#define IEEE80211_OFDM_RATE_54MB                0x6C
-+#define IEEE80211_BASIC_RATE_MASK               0x80
-+
-+#define IEEE80211_CCK_RATE_1MB_MASK             (1<<0)
-+#define IEEE80211_CCK_RATE_2MB_MASK             (1<<1)
-+#define IEEE80211_CCK_RATE_5MB_MASK             (1<<2)
-+#define IEEE80211_CCK_RATE_11MB_MASK            (1<<3)
-+#define IEEE80211_OFDM_RATE_6MB_MASK            (1<<4)
-+#define IEEE80211_OFDM_RATE_9MB_MASK            (1<<5)
-+#define IEEE80211_OFDM_RATE_12MB_MASK           (1<<6)
-+#define IEEE80211_OFDM_RATE_18MB_MASK           (1<<7)
-+#define IEEE80211_OFDM_RATE_24MB_MASK           (1<<8)
-+#define IEEE80211_OFDM_RATE_36MB_MASK           (1<<9)
-+#define IEEE80211_OFDM_RATE_48MB_MASK           (1<<10)
-+#define IEEE80211_OFDM_RATE_54MB_MASK           (1<<11)
-+
-+#define IEEE80211_CCK_RATES_MASK                0x0000000F
-+#define IEEE80211_CCK_BASIC_RATES_MASK  (IEEE80211_CCK_RATE_1MB_MASK | \
-+        IEEE80211_CCK_RATE_2MB_MASK)
-+#define IEEE80211_CCK_DEFAULT_RATES_MASK        (IEEE80211_CCK_BASIC_RATES_MASK | \
-+        IEEE80211_CCK_RATE_5MB_MASK | \
-+        IEEE80211_CCK_RATE_11MB_MASK)
-+
-+#define IEEE80211_OFDM_RATES_MASK               0x00000FF0
-+#define IEEE80211_OFDM_BASIC_RATES_MASK (IEEE80211_OFDM_RATE_6MB_MASK | \
-+        IEEE80211_OFDM_RATE_12MB_MASK | \
-+        IEEE80211_OFDM_RATE_24MB_MASK)
-+#define IEEE80211_OFDM_DEFAULT_RATES_MASK       (IEEE80211_OFDM_BASIC_RATES_MASK | \
-+        IEEE80211_OFDM_RATE_9MB_MASK  | \
-+        IEEE80211_OFDM_RATE_18MB_MASK | \
-+        IEEE80211_OFDM_RATE_36MB_MASK | \
-+        IEEE80211_OFDM_RATE_48MB_MASK | \
-+        IEEE80211_OFDM_RATE_54MB_MASK)
-+#define IEEE80211_DEFAULT_RATES_MASK (IEEE80211_OFDM_DEFAULT_RATES_MASK | \
-+                                IEEE80211_CCK_DEFAULT_RATES_MASK)
-+
-+#define IEEE80211_NUM_OFDM_RATES            8
-+#define IEEE80211_NUM_CCK_RATES             4
 +#define IEEE80211_OFDM_SHIFT_MASK_A         4
 +
 +/*MAC80211 end */
 +
 +static u32 ipw_debug_level;
 +
++static int param_disable_hw_scan = 0;
 +static int param_debug = 0;
 +static int param_channel = 0;
 +static int param_mode = 0;
@@ -208,8 +160,6 @@
 +
 +static int ipw_queue_tx_hcmd(struct ipw_priv *priv, struct ipw_host_cmd *cmd);
 +
-+static int ipw_init_rate_scaling(struct ipw_priv *priv);
-+
 +static int ipw_rate_scale_rxon_handle(struct ipw_priv *priv, s32 sta_id);
 +static u8 ipw_find_station(struct ipw_priv *priv, u8 * bssid);
 +static void ipw_clear_stations_table(struct ipw_priv *priv);
@@ -1603,6 +1553,271 @@
 +static DEVICE_ATTR(tx_power, S_IWUSR | S_IRUGO,
 +		   show_tx_power, store_tx_power);
 +
++#ifdef CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT
++
++/*******************************************************/
++
++enum {				/* ieee80211_basic_report.map */
++	IEEE80211_BASIC_MAP_BSS = (1 << 0),
++	IEEE80211_BASIC_MAP_OFDM = (1 << 1),
++	IEEE80211_BASIC_MAP_UNIDENTIFIED = (1 << 2),
++	IEEE80211_BASIC_MAP_RADAR = (1 << 3),
++	IEEE80211_BASIC_MAP_UNMEASURED = (1 << 4),
++	/* Bits 5-7 are reserved */
++
++};
++struct ieee80211_basic_report {
++	u8 channel;
++	__le64 start_time;
++	__le16 duration;
++	u8 map;
++} __attribute__ ((packed));
++
++enum {				/* ieee80211_measurement_request.mode */
++	/* Bit 0 is reserved */
++	IEEE80211_MEASUREMENT_ENABLE = (1 << 1),
++	IEEE80211_MEASUREMENT_REQUEST = (1 << 2),
++	IEEE80211_MEASUREMENT_REPORT = (1 << 3),
++	/* Bits 4-7 are reserved */
++};
++
++enum {
++	IEEE80211_REPORT_BASIC = 0,	/* required */
++	IEEE80211_REPORT_CCA = 1,	/* optional */
++	IEEE80211_REPORT_RPI = 2,	/* optional */
++	/* 3-255 reserved */
++};
++
++struct ieee80211_measurement_params {
++	u8 channel;
++	__le64 start_time;
++	__le16 duration;
++} __attribute__ ((packed));
++
++struct ieee80211_info_element {
++	u8 id;
++	u8 len;
++	u8 data[0];
++} __attribute__ ((packed));
++
++struct ieee80211_measurement_request {
++	struct ieee80211_info_element ie;
++	u8 token;
++	u8 mode;
++	u8 type;
++	struct ieee80211_measurement_params params[0];
++} __attribute__ ((packed));
++
++struct ieee80211_measurement_report {
++	struct ieee80211_info_element ie;
++	u8 token;
++	u8 mode;
++	u8 type;
++	union {
++		struct ieee80211_basic_report basic[0];
++	} u;
++} __attribute__ ((packed));
++
++
++#define BEACON_TIME_MASK_LOW	0x00FFFFFF
++#define BEACON_TIME_MASK_HIGH	0xFF000000
++#define TIME_UNIT		1024
++
++/*
++ * extended beacon time format
++ * time in usec will be changed into a 32-bit value in 8:24 format
++ * the high 1 byte is the beacon counts
++ * the lower 3 bytes is the time in usec within one beacon interval
++ */
++
++static u32 ipw_usecs_to_beacons(u32 usec, u32 beacon_interval)
++{
++	u32 quot;
++	u32 rem;
++	u32 interval = beacon_interval * 1024;
++
++	if (!interval || !usec)
++		return 0;
++
++	quot = (usec / interval) % 0x100;
++	rem = (usec % interval) % BEACON_TIME_MASK_LOW;
++
++	return (quot << 24) + rem;
++}
[...12198 lines suppressed...]
-+	u32 probe_time;
-+} __attribute__ ((packed));
++	if (high != IPW_INVALID_RATE)
++		high_tpt = scale_priv->win[high].average_tpt;
 +
-+struct statistics_general {
-+	u32 temperature;
-+	struct statistics_dbg dbg;
-+	u32 sleep_time;
-+	u32 slots_out;
-+	u32 slots_idle;
-+	u32 ttl_timestamp;
-+	struct statistics_div div;
-+} __attribute__ ((packed));
++	spin_unlock_irqrestore(&priv->lq_mngr.lock, flags);
 +
-+struct ipw_notif_statistics {
-+	u32 flag;
-+	struct statistics_rx rx;
-+	struct statistics_tx tx;
-+	struct statistics_general general;
-+} __attribute__ ((packed));
++	scale_action = 1;
 +
-+struct ipw_rx_packet {
-+	u32 len;
-+	struct ipw_cmd_header hdr;
-+	union {
-+		struct ipw_alive_resp alive_frame;
-+		struct ipw_rx_frame rx_frame;
-+		struct ipw_tx_resp tx_resp;
-+		struct ipw_spectrum_notification spectrum_notif;
-+		struct ipw_csa_notification csa_notif;
-+		struct ipw_error_resp err_resp;
-+		struct ipw_card_state_notif card_state_notif;
-+		struct ipw_notif_statistics stats;
-+		struct BeaconNtfSpecifics beacon_status;
-+		struct ipw_add_sta_resp add_sta;
-+		struct ipw_sleep_notification sleep_notif;
-+		u32 status;
-+		u8 raw[0];
-+	} u;
-+} __attribute__ ((packed));
++	if ((window->success_ratio < IPW_RATE_SCALE_DECREASE_TH) ||
++	    !current_tpt) {
++		IPW_DEBUG_RATE("decrease rate because of low success_ratio\n");
++		scale_action = -1;
++	} else if ((low_tpt == IPW_INVALID_VALUE) &&
++		   (high_tpt == IPW_INVALID_VALUE)) {
++		scale_action = 1;
++	} else if ((low_tpt != IPW_INVALID_VALUE) &&
++		   (high_tpt != IPW_INVALID_VALUE)
++		   && (low_tpt < current_tpt)
++		   && (high_tpt < current_tpt)) {
++		IPW_DEBUG_RATE("No action -- low [%d] & high [%d] < "
++			       "current_tpt [%d]\n",
++			       low_tpt, high_tpt, current_tpt);
++		scale_action = 0;
++	} else {
++		if (high_tpt != IPW_INVALID_VALUE) {
++			if (high_tpt > current_tpt)
++				scale_action = 1;
++			else {
++				IPW_DEBUG_RATE
++					("decrease rate because of high tpt\n");
++				scale_action = -1;
++			}
++		} else if (low_tpt != IPW_INVALID_VALUE) {
++			if (low_tpt > current_tpt) {
++				IPW_DEBUG_RATE
++					("decrease rate because of low tpt\n");
++				scale_action = -1;
++			} else
++				scale_action = 1;
++		}
++	}
 +
-+#define IPW_RX_FRAME_SIZE        (4 + sizeof(struct ipw_rx_frame))
++	if ((window->success_ratio > IPW_RATE_SCALE_HIGH_TH) ||
++	    (current_tpt > (128 * window->average_tpt))) {
++		IPW_DEBUG_RATE("No action -- success_ratio [%d] > HIGH_TH or "
++			       "current_tpt [%d] > average_tpt [%d]\n",
++			       window->success_ratio,
++			       current_tpt, 128 * window->average_tpt);
++		scale_action = 0;
++	}
 +
-+struct ipw_multicast_addr {
-+	u8 num_of_multicast_addresses;
-+	u8 reserved[3];
-+	u8 mac1[6];
-+	u8 mac2[6];
-+	u8 mac3[6];
-+	u8 mac4[6];
-+} __attribute__ ((packed));
++	switch (scale_action) {
++	case -1:
++		if (low != IPW_INVALID_RATE)
++			index = low;
++		break;
 +
-+struct ipw_tgi_tx_key {
-+	u8 key_id;
-+	u8 security_type;
-+	u8 station_index;
-+	u8 flags;
-+	u8 key[16];
-+	u32 tx_counter[2];
-+} __attribute__ ((packed));
++	case 1:
++		if (high != IPW_INVALID_RATE)
++			index = high;
 +
-+struct ipw_associate {
-+	u8 channel;
-+	u8 auth_type:4, auth_key:4;
-+	u8 assoc_type;
-+	u8 reserved;
-+	u16 policy_support;
-+	u8 preamble_length;
-+	u8 ieee_mode;
-+	u8 bssid[ETH_ALEN];
-+	u32 assoc_tsf_msw;
-+	u32 assoc_tsf_lsw;
-+	u16 capability;
-+	u16 listen_interval;
-+	u16 beacon_interval;
-+	u8 dest[ETH_ALEN];
-+	u16 atim_window;
-+	u8 smr;
-+	u8 reserved1;
-+	u16 reserved2;
-+	u16 assoc_id;
-+	u8 erp_value;
-+} __attribute__ ((packed));
++		break;
 +
-+#define IPW_SUPPORTED_RATES_IE_LEN         8
++	case 0:
++	default:
++		break;
++	}
 +
-+struct ipw_supported_rates {
-+	u8 ieee_mode;
-+	u8 num_rates;
-+	u8 purpose;
-+	u8 reserved;
-+	u8 supported_rates[IPW_MAX_RATES];
-+} __attribute__ ((packed));
++	IPW_DEBUG_RATE("Selected %d (action %d) - low %d high %d\n",
++		       index, scale_action, low, high);
 +
-+struct ipw_channel_tx_power {
-+	u8 channel_number;
-+	s8 tx_power;
-+} __attribute__ ((packed));
++ out:
++	    
++	sta->last_txrate = index;
++	sta->txrate = sta->last_txrate;
++	sta_info_put(sta);
 +
++	IPW_DEBUG_RATE("leave: %d\n", index);
++	return &priv->ieee_rates[index];
++}
 +
-+#define IPW_RX_BUF_SIZE 3000
 +
-+#endif				/* __iwlwifi_hw_h__ */
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile.orig	2007-04-11 14:45:40.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile	2007-04-11 14:46:00.000000000 -0400
++static char* rs_name = "iwlwifi rate-scale";
++static void ipw_set_rate_scale_handlers(struct ipw_priv *priv)
++{
++	priv->rate_control.module = NULL;
++	priv->rate_control.name = rs_name;
++	priv->rate_control.tx_status = &rs_tx_status;
++	priv->rate_control.get_rate = &rs_get_rate;
++	priv->rate_control.rate_init = rs_rate_init;
++	priv->rate_control.clear = rs_clear;
++	priv->rate_control.alloc = rs_alloc;
++	priv->rate_control.free = rs_free;
++	priv->rate_control.alloc_sta = rs_alloc_sta;
++	priv->rate_control.free_sta = rs_free_sta;
++}
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile.orig	2007-04-27 14:33:00.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile	2007-04-27 14:33:25.000000000 -0400
 @@ -4,3 +4,4 @@ obj-$(CONFIG_ADM8211)		+= adm8211/
  obj-$(CONFIG_P54_COMMON)	+= p54/
  obj-$(CONFIG_ZD1211RW_MAC80211)	+= zd1211rw/
  obj-$(CONFIG_RTL818X)		+= rtl818x/
 +obj-$(CONFIG_IWLWIFI)		+= iwlwifi/
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig.orig	2007-04-11 14:45:40.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig	2007-04-11 14:46:00.000000000 -0400
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig.orig	2007-04-27 14:33:00.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig	2007-04-27 14:33:25.000000000 -0400
 @@ -4,3 +4,4 @@ source "drivers/net/wireless/mac80211/ad
  source "drivers/net/wireless/mac80211/p54/Kconfig"
  source "drivers/net/wireless/mac80211/zd1211rw/Kconfig"


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3116
retrieving revision 1.3117
diff -u -r1.3116 -r1.3117
--- kernel-2.6.spec	26 Apr 2007 14:11:41 -0000	1.3116
+++ kernel-2.6.spec	27 Apr 2007 19:16:57 -0000	1.3117
@@ -2331,6 +2331,9 @@
 #  - tux.
 
 %changelog
+* Fri Apr 27 2007 John W. Linville <linville at redhat.com>
+- Update git-iwlwifi.patch (and update git-iwlwifi-fixes.patch to match)
+
 * Thu Apr 26 2007 Dave Jones <davej at redhat.com>
 - 2.6.21
 



From fedora-cvs-commits at redhat.com  Fri Apr 27 19:39:40 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 15:39:40 -0400
Subject: rpms/system-config-kickstart/devel .cvsignore, 1.43, 1.44 sources,
	1.51, 1.52 system-config-kickstart.spec, 1.56, 1.57
Message-ID: <200704271939.l3RJdeSd011740@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/system-config-kickstart/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11723

Modified Files:
	.cvsignore sources system-config-kickstart.spec 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	23 Apr 2007 19:04:30 -0000	1.43
+++ .cvsignore	27 Apr 2007 19:39:37 -0000	1.44
@@ -36,3 +36,4 @@
 system-config-kickstart-2.7.3.tar.gz
 system-config-kickstart-2.7.4.tar.gz
 system-config-kickstart-2.7.5.tar.gz
+system-config-kickstart-2.7.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	23 Apr 2007 19:04:30 -0000	1.51
+++ sources	27 Apr 2007 19:39:37 -0000	1.52
@@ -1 +1 @@
-3c31bec56f8ec7b61efb211e9b00ba4b  system-config-kickstart-2.7.5.tar.gz
+68f13e4c3176a1ac67427e4643a2b063  system-config-kickstart-2.7.6.tar.gz


Index: system-config-kickstart.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/system-config-kickstart.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- system-config-kickstart.spec	23 Apr 2007 19:04:30 -0000	1.56
+++ system-config-kickstart.spec	27 Apr 2007 19:39:37 -0000	1.57
@@ -1,8 +1,8 @@
 Summary: A graphical interface for making kickstart files.
 Name: system-config-kickstart
-Version: 2.7.5
+Version: 2.7.6
 Release: 1%{?dist}
-URL: http://fedora.redhat.com/projects/config-tools/
+URL: http://fedoraproject.org/wiki/SystemConfig/Tools
 License: GPL
 ExclusiveOS: Linux
 Group: System Environment/Base
@@ -78,6 +78,10 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png
 
 %changelog
+* Fri Apr 27 2007 Chris Lumens <clumens at redhat.com> 2.7.6-1
+- Update package URL (#237712).
+- Correctly set the language if it ends with ".UTF-8" (#238119).
+
 * Mon Apr 23 2007 Chris Lumens <clumens at redhat.com> 2.7.5-1
 - Default to installing instead of upgrading.
 - Set a default SELinux setting when started up.



From fedora-cvs-commits at redhat.com  Fri Apr 27 19:42:26 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 15:42:26 -0400
Subject: rpms/kernel-xen-2.6/devel kernel-xen.spec,1.18.4.3,1.18.4.4
Message-ID: <200704271942.l3RJgQHZ011881@cvs.devel.redhat.com>

Author: ehabkost

Update of /cvs/dist/rpms/kernel-xen-2.6/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11865

Modified Files:
      Tag: private-ehabkost-xen-3_0_5-branch
	kernel-xen.spec 
Log Message:
Updating %changelog


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.18.4.3
retrieving revision 1.18.4.4
diff -u -r1.18.4.3 -r1.18.4.4
--- kernel-xen.spec	27 Apr 2007 18:38:24 -0000	1.18.4.3
+++ kernel-xen.spec	27 Apr 2007 19:42:24 -0000	1.18.4.4
@@ -2000,6 +2000,10 @@
 #  - tux.
 
 %changelog
+* Fri Apr 27 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Updated Xen Hypervisor to 3.0.5-rc3, hg cset 14934
+- Included checksum patches to fix bug #223258
+
 * Thu Mar 22 2007 Juan Quintela <quintela at redhat.com>
 - disable alternative firewire stack for x86_64, it hangs kernel
   during boot.



From fedora-cvs-commits at redhat.com  Fri Apr 27 19:43:18 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 15:43:18 -0400
Subject: rpms/kernel/FC-6 linux-2.6-forwarding_of_ip_summed.patch, NONE,
	1.1.2.1 linux-2.6-kill_skbuff_hack.patch, NONE,
	1.1.2.1 linux-2.6-treat_partial_as_unnecessary.patch, NONE,
	1.1.2.1 linux-2.6-use_csum_start_offset_instead.patch, NONE,
	1.1.2.1 kernel-2.6.spec, 1.2947, 1.2947.2.1
Message-ID: <200704271943.l3RJhI2p011930@cvs.devel.redhat.com>

Author: ehabkost

Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv11889

Modified Files:
      Tag: private-ehabkost-bz223258-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-ehabkost-bz223258-branch
	linux-2.6-forwarding_of_ip_summed.patch 
	linux-2.6-kill_skbuff_hack.patch 
	linux-2.6-treat_partial_as_unnecessary.patch 
	linux-2.6-use_csum_start_offset_instead.patch 
Log Message:
Adding checksum fixes patches (bug #223258)



linux-2.6-forwarding_of_ip_summed.patch:
 include/linux/skbuff.h  |    7 +++++++
 net/bridge/br_forward.c |    2 +-
 net/ipv4/ip_forward.c   |    2 +-
 net/ipv6/ip6_output.c   |    2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-forwarding_of_ip_summed.patch ---
From: Herbert Xu <herbert.xu at redhat.com>
Subject: [1/4] [NET]: Allow forwarding of ip_summed except CHECKSUM_COMPLETE

Hi:

[NET]: Allow forwarding of ip_summed except CHECKSUM_COMPLETE

Right now Xen has a horrible hack that lets it forward packets with
partial checksums.  One of the reasons that CHECKSUM_PARTIAL and
CHECKSUM_COMPLETE were added is so that we can get rid of this hack
(where it creates two extra bits in the skbuff to essentially mirror
ip_summed without being destroyed by the forwarding code).

I had forgotten that I've already gone through all the deivce drivers
last time around to make sure that they're looking at ip_summed ==
CHECKSUM_PARTIAL rather than ip_summed != 0 on transmit.  In any case,
I've now done that again so it should definitely be safe.

Unfortunately nobody has yet added any code to update CHECKSUM_COMPLETE
values on forward so we I'm setting that to CHECKSUM_NONE.  This should
be safe to remove for bridging but I'd like to check that code path
first.

So here is the patch that lets us get rid of the hack by preserving
ip_summed (mostly) on forwarded packets.

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
--
Index: linux-2.6.20.noarch/include/linux/skbuff.h
===================================================================
--- linux-2.6.20.noarch.orig/include/linux/skbuff.h
+++ linux-2.6.20.noarch/include/linux/skbuff.h
@@ -1495,5 +1495,12 @@ static inline int skb_is_gso(const struc
 	return skb_shinfo(skb)->gso_size;
 }
 
+static inline void skb_forward_csum(struct sk_buff *skb)
+{
+	/* Unfortunately we don't support this one.  Any brave souls? */
+	if (skb->ip_summed == CHECKSUM_COMPLETE)
+		skb->ip_summed = CHECKSUM_NONE;
+}
+
 #endif	/* __KERNEL__ */
 #endif	/* _LINUX_SKBUFF_H */
Index: linux-2.6.20.noarch/net/bridge/br_forward.c
===================================================================
--- linux-2.6.20.noarch.orig/net/bridge/br_forward.c
+++ linux-2.6.20.noarch/net/bridge/br_forward.c
@@ -71,7 +71,7 @@ static void __br_forward(const struct ne
 
 	indev = skb->dev;
 	skb->dev = to->dev;
-	skb->ip_summed = CHECKSUM_NONE;
+	skb_forward_csum(skb);
 
 	NF_HOOK(PF_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev,
 			br_forward_finish);
Index: linux-2.6.20.noarch/net/ipv4/ip_forward.c
===================================================================
--- linux-2.6.20.noarch.orig/net/ipv4/ip_forward.c
+++ linux-2.6.20.noarch/net/ipv4/ip_forward.c
@@ -68,7 +68,7 @@ int ip_forward(struct sk_buff *skb)
 	if (skb->pkt_type != PACKET_HOST)
 		goto drop;
 
-	skb->ip_summed = CHECKSUM_NONE;
+	skb_forward_csum(skb);
 	
 	/*
 	 *	According to the RFC, we must first decrease the TTL field. If
Index: linux-2.6.20.noarch/net/ipv6/ip6_output.c
===================================================================
--- linux-2.6.20.noarch.orig/net/ipv6/ip6_output.c
+++ linux-2.6.20.noarch/net/ipv6/ip6_output.c
@@ -372,7 +372,7 @@ int ip6_forward(struct sk_buff *skb)
 		goto drop;
 	}
 
-	skb->ip_summed = CHECKSUM_NONE;
+	skb_forward_csum(skb);
 
 	/*
 	 *	We DO NOT make any processing on

linux-2.6-kill_skbuff_hack.patch:
 drivers/xen/core/skbuff.c             |   35 ++++++++++++++++++
 drivers/xen/netback/loopback.c        |   10 -----
 drivers/xen/netback/netback.c         |   29 +++++++--------
 drivers/xen/netfront/netfront.c       |   37 ++++++++++---------
 include/linux/skbuff.h                |   10 +----
 net/core/dev.c                        |   63 ----------------------------------
 net/core/skbuff.c                     |    4 --
 net/ipv4/netfilter/ip_nat_proto_tcp.c |    7 ---
 net/ipv4/netfilter/ip_nat_proto_udp.c |    8 ----
 net/ipv4/xfrm4_output.c               |    6 ---
 10 files changed, 70 insertions(+), 139 deletions(-)

--- NEW FILE linux-2.6-kill_skbuff_hack.patch ---
From: Herbert Xu <herbert.xu at redhat.com>
Subject: [4/4] [XEN]: Kill skbuff hack

Hi:

This patch is based on the FC6 kernel.

[XEN]: Kill skbuff hack

Now that the Linux stack can accept packets with partial checksums and
relay them back out again, we can eliminate the skbuff hacks.

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
--
Index: linux-2.6.20.noarch/drivers/xen/core/skbuff.c
===================================================================
--- linux-2.6.20.noarch.orig/drivers/xen/core/skbuff.c
+++ linux-2.6.20.noarch/drivers/xen/core/skbuff.c
@@ -9,6 +9,10 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/init.h>
+#include <linux/if_ether.h>
+#include <linux/tcp.h>
+#include <linux/udp.h>
+#include <net/ip.h>
 #include <asm/io.h>
 #include <asm/page.h>
 #include <asm/hypervisor.h>
@@ -78,6 +82,37 @@ struct sk_buff *__dev_alloc_skb(unsigned
 	return skb;
 }
 
+int skb_checksum_setup(struct sk_buff *skb)
+{
+	if (skb->protocol != htons(ETH_P_IP))
+		goto out;
+	skb->h.raw = (unsigned char *)skb->nh.iph + 4*skb->nh.iph->ihl;
+	if (skb->h.raw >= skb->tail)
+		goto out;
+	switch (skb->nh.iph->protocol) {
+	case IPPROTO_TCP:
+		skb->csum_offset = offsetof(struct tcphdr, check);
+		break;
+	case IPPROTO_UDP:
+		skb->csum_offset = offsetof(struct udphdr, check);
+		break;
+	default:
+		if (net_ratelimit())
+			printk(KERN_ERR "Attempting to checksum a non-"
+			       "TCP/UDP packet, dropping a protocol"
+			       " %d packet", skb->nh.iph->protocol);
+		goto out;
+	}
+	if ((skb->h.raw + skb->csum_offset + 2) > skb->tail)
+		goto out;
+	skb->ip_summed = CHECKSUM_PARTIAL;
+
+	return 0;
+out:
+	return -EPROTO;
+}
+EXPORT_SYMBOL(skb_checksum_setup);
+
 static void skbuff_ctor(void *buf, struct kmem_cache *cachep, unsigned long unused)
 {
 	int order = 0;
Index: linux-2.6.20.noarch/drivers/xen/netback/loopback.c
===================================================================
--- linux-2.6.20.noarch.orig/drivers/xen/netback/loopback.c
+++ linux-2.6.20.noarch/drivers/xen/netback/loopback.c
@@ -149,16 +149,6 @@ static int loopback_start_xmit(struct sk
 	np->stats.rx_bytes += skb->len;
 	np->stats.rx_packets++;
 
-	if (skb->ip_summed == CHECKSUM_PARTIAL) {
-		/* Defer checksum calculation. */
-		skb->proto_csum_blank = 1;
-		/* Must be a local packet: assert its integrity. */
-		skb->proto_data_valid = 1;
-	}
-
-	skb->ip_summed = skb->proto_data_valid ?
-		CHECKSUM_UNNECESSARY : CHECKSUM_NONE;
-
 	skb->pkt_type = PACKET_HOST; /* overridden by eth_type_trans() */
 	skb->protocol = eth_type_trans(skb, dev);
 	skb->dev      = dev;
Index: linux-2.6.20.noarch/drivers/xen/netback/netback.c
===================================================================
--- linux-2.6.20.noarch.orig/drivers/xen/netback/netback.c
+++ linux-2.6.20.noarch/drivers/xen/netback/netback.c
@@ -293,7 +293,6 @@ int netif_be_start_xmit(struct sk_buff *
 		/* Copy only the header fields we use in this driver. */
 		nskb->dev = skb->dev;
 		nskb->ip_summed = skb->ip_summed;
-		nskb->proto_data_valid = skb->proto_data_valid;
 		dev_kfree_skb(skb);
 		skb = nskb;
 	}
@@ -677,9 +676,11 @@ static void net_rx_action(unsigned long 
 		id = meta[npo.meta_cons].id;
 		flags = nr_frags ? NETRXF_more_data : 0;
 
-		if (skb->ip_summed == CHECKSUM_PARTIAL) /* local packet? */
+		if (skb->ip_summed == CHECKSUM_PARTIAL)
+			/* local packet? */
 			flags |= NETRXF_csum_blank | NETRXF_data_validated;
-		else if (skb->proto_data_valid) /* remote but checksummed? */
+		else if (skb->ip_summed == CHECKSUM_UNNECESSARY)
+			/* remote but checksummed? */
 			flags |= NETRXF_data_validated;
 
 		if (meta[npo.meta_cons].copy)
@@ -1317,23 +1318,19 @@ static void net_tx_action(unsigned long 
 			netif_idx_release(pending_idx);
 		}
 
-		/*
-		 * Old frontends do not assert data_validated but we
-		 * can infer it from csum_blank so test both flags.
-		 */
-		if (txp->flags & (NETTXF_data_validated|NETTXF_csum_blank)) {
-			skb->ip_summed = CHECKSUM_UNNECESSARY;
-			skb->proto_data_valid = 1;
-		} else {
-			skb->ip_summed = CHECKSUM_NONE;
-			skb->proto_data_valid = 0;
-		}
-		skb->proto_csum_blank = !!(txp->flags & NETTXF_csum_blank);
-
 		netbk_fill_frags(skb);
 
 		skb->dev      = netif->dev;
 		skb->protocol = eth_type_trans(skb, skb->dev);
+		skb->nh.raw   = skb->data;
+
+		if (txp->flags & NETTXF_csum_blank) {
+			if (skb_checksum_setup(skb)) {
+				kfree_skb(skb);
+				continue;
+			}
+		} else if (txp->flags & NETTXF_data_validated)
+			skb->ip_summed = CHECKSUM_UNNECESSARY;
 
 		netif->stats.rx_bytes += skb->len;
 		netif->stats.rx_packets++;
Index: linux-2.6.20.noarch/drivers/xen/netfront/netfront.c
===================================================================
--- linux-2.6.20.noarch.orig/drivers/xen/netfront/netfront.c
+++ linux-2.6.20.noarch/drivers/xen/netfront/netfront.c
@@ -925,12 +925,12 @@ static int network_start_xmit(struct sk_
 	tx->flags = 0;
 	extra = NULL;
 
-	if (skb->ip_summed == CHECKSUM_PARTIAL) /* local packet? */
+	if (skb->ip_summed == CHECKSUM_PARTIAL)
+		/* local packet? */
 		tx->flags |= NETTXF_csum_blank | NETTXF_data_validated;
-#ifdef CONFIG_XEN
-	if (skb->proto_data_valid) /* remote but checksummed? */
+	else if (skb->ip_summed == CHECKSUM_UNNECESSARY)
+		/* remote but checksummed? */
 		tx->flags |= NETTXF_data_validated;
-#endif
 
 #ifdef HAVE_TSO
 	if (skb_is_gso(skb)) {
@@ -1351,20 +1351,10 @@ err:	
 		skb->truesize += skb->data_len - (RX_COPY_THRESHOLD - len);
 		skb->len += skb->data_len;
 
-		/*
-		 * Old backends do not assert data_validated but we
-		 * can infer it from csum_blank so test both flags.
-		 */
-		if (rx->flags & (NETRXF_data_validated|NETRXF_csum_blank))
+		if (rx->flags & NETRXF_csum_blank)
+			skb->ip_summed = CHECKSUM_PARTIAL;
+		else if (rx->flags & NETRXF_data_validated)
 			skb->ip_summed = CHECKSUM_UNNECESSARY;
-		else
-			skb->ip_summed = CHECKSUM_NONE;
-#ifdef CONFIG_XEN
-		skb->proto_data_valid = (skb->ip_summed != CHECKSUM_NONE);
-		skb->proto_csum_blank = !!(rx->flags & NETRXF_csum_blank);
-#endif
-		np->stats.rx_packets++;
-		np->stats.rx_bytes += skb->len;
 
 		__skb_queue_tail(&rxq, skb);
 
@@ -1404,6 +1394,19 @@ err:	
 
 		/* Ethernet work: Delayed to here as it peeks the header. */
 		skb->protocol = eth_type_trans(skb, dev);
+		skb->nh.raw = skb->data;
+
+		if (skb->ip_summed == CHECKSUM_PARTIAL) {
+			if (skb_checksum_setup(skb)) {
+				work_done--;
+				kfree_skb(skb);
+				np->stats.rx_errors++;
+				continue;
+			}
+		}
+
+		np->stats.rx_packets++;
+		np->stats.rx_bytes += skb->len;
 
 		/* Pass it up. */
 		netif_receive_skb(skb);
Index: linux-2.6.20.noarch/include/linux/skbuff.h
===================================================================
--- linux-2.6.20.noarch.orig/include/linux/skbuff.h
+++ linux-2.6.20.noarch/include/linux/skbuff.h
@@ -205,8 +205,6 @@ enum {
  *	@local_df: allow local fragmentation
  *	@cloned: Head may be cloned (check refcnt to be sure)
  *	@nohdr: Payload reference only, must not modify header
- *	@proto_data_valid: Protocol data validated since arriving at localhost
- *	@proto_csum_blank: Protocol csum must be added before leaving localhost
  *	@pkt_type: Packet class
  *	@fclone: skbuff clone status
  *	@ip_summed: Driver fed us an IP checksum
@@ -293,13 +291,7 @@ struct sk_buff {
 				nfctinfo:3;
 	__u8			pkt_type:3,
 				fclone:2,
-#ifndef CONFIG_XEN
 				ipvs_property:1;
-#else
-				ipvs_property:1,
-				proto_data_valid:1,
-				proto_csum_blank:1;
-#endif
 	__be16			protocol;
 
 	void			(*destructor)(struct sk_buff *skb);
@@ -1352,6 +1344,8 @@ extern void	       skb_split(struct sk_b
 
 extern struct sk_buff *skb_segment(struct sk_buff *skb, int features);
 
+extern int skb_checksum_setup(struct sk_buff *skb);
+
 static inline void *skb_header_pointer(const struct sk_buff *skb, int offset,
 				       int len, void *buffer)
 {
Index: linux-2.6.20.noarch/net/core/dev.c
===================================================================
--- linux-2.6.20.noarch.orig/net/core/dev.c
+++ linux-2.6.20.noarch/net/core/dev.c
@@ -117,12 +117,6 @@
 #include <linux/err.h>
 #include <linux/ctype.h>
 
-#ifdef CONFIG_XEN
-#include <net/ip.h>
-#include <linux/tcp.h>
-#include <linux/udp.h>
-#endif
-
 /*
  *	The list of packet types we will receive (as opposed to discard)
  *	and the routines to invoke.
@@ -1400,43 +1394,6 @@ out_kfree_skb:
 	}						\
 }
 
-#ifdef CONFIG_XEN
-inline int skb_checksum_setup(struct sk_buff *skb)
-{
-	if (skb->proto_csum_blank) {
-		if (skb->protocol != htons(ETH_P_IP))
-			goto out;
-		skb->h.raw = (unsigned char *)skb->nh.iph + 4*skb->nh.iph->ihl;
-		if (skb->h.raw >= skb->tail)
-			goto out;
-		switch (skb->nh.iph->protocol) {
-		case IPPROTO_TCP:
-			skb->csum = offsetof(struct tcphdr, check);
-			break;
-		case IPPROTO_UDP:
-			skb->csum = offsetof(struct udphdr, check);
-			break;
-		default:
-			if (net_ratelimit())
-				printk(KERN_ERR "Attempting to checksum a non-"
-				       "TCP/UDP packet, dropping a protocol"
-				       " %d packet", skb->nh.iph->protocol);
-			goto out;
-		}
-		if ((skb->h.raw + skb->csum + 2) > skb->tail)
-			goto out;
-		skb->ip_summed = CHECKSUM_PARTIAL;
-		skb->proto_csum_blank = 0;
-	}
-	return 0;
-out:
-	return -EPROTO;
-}
-#else
-inline int skb_checksum_setup(struct sk_buff *skb) { return 0; }
-#endif
-
-
 /**
  *	dev_queue_xmit - transmit a buffer
  *	@skb: buffer to transmit
@@ -1469,12 +1426,6 @@ int dev_queue_xmit(struct sk_buff *skb)
 	struct Qdisc *q;
 	int rc = -ENOMEM;
 
- 	/* If a checksum-deferred packet is forwarded to a device that needs a
- 	 * checksum, correct the pointers and force checksumming.
- 	 */
- 	if (skb_checksum_setup(skb))
- 		goto out_kfree_skb;
-
 	/* GSO will handle the following emulations directly. */
 	if (netif_needs_gso(dev, skb))
 		goto gso;
@@ -1853,19 +1804,6 @@ int netif_receive_skb(struct sk_buff *sk
 	}
 #endif
 
-#ifdef CONFIG_XEN
-	switch (skb->ip_summed) {
-	case CHECKSUM_UNNECESSARY:
-		skb->proto_data_valid = 1;
-		break;
-	case CHECKSUM_PARTIAL:
-		/* XXX Implement me. */
-	default:
-		skb->proto_data_valid = 0;
-		break;
-	}
-#endif
-
 	list_for_each_entry_rcu(ptype, &ptype_all, list) {
 		if (!ptype->dev || ptype->dev == skb->dev) {
 			if (pt_prev) 
@@ -3630,7 +3568,6 @@ EXPORT_SYMBOL(unregister_netdevice_notif
 EXPORT_SYMBOL(net_enable_timestamp);
 EXPORT_SYMBOL(net_disable_timestamp);
 EXPORT_SYMBOL(dev_get_flags);
-EXPORT_SYMBOL(skb_checksum_setup);
 
 #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
 EXPORT_SYMBOL(br_handle_frame_hook);
Index: linux-2.6.20.noarch/net/core/skbuff.c
===================================================================
--- linux-2.6.20.noarch.orig/net/core/skbuff.c
+++ linux-2.6.20.noarch/net/core/skbuff.c
@@ -484,10 +484,6 @@ struct sk_buff *skb_clone(struct sk_buff
 	C(local_df);
 	n->cloned = 1;
 	n->nohdr = 0;
-#ifdef CONFIG_XEN
-	C(proto_data_valid);
-	C(proto_csum_blank);
-#endif
 	C(pkt_type);
 	C(ip_summed);
 	C(priority);
Index: linux-2.6.20.noarch/net/ipv4/netfilter/ip_nat_proto_tcp.c
===================================================================
--- linux-2.6.20.noarch.orig/net/ipv4/netfilter/ip_nat_proto_tcp.c
+++ linux-2.6.20.noarch/net/ipv4/netfilter/ip_nat_proto_tcp.c
@@ -129,15 +129,8 @@ tcp_manip_pkt(struct sk_buff **pskb,
 	if (hdrsize < sizeof(*hdr))
 		return 1;
 
-#ifdef CONFIG_XEN
-	if ((*pskb)->proto_csum_blank)
-		nf_csum_replace4(&hdr->check, oldip, newip);
-	else
-#endif
-	{
 	nf_proto_csum_replace4(&hdr->check, *pskb, oldip, newip, 1);
 	nf_proto_csum_replace2(&hdr->check, *pskb, oldport, newport, 0);
-	}
 	return 1;
 }
 
Index: linux-2.6.20.noarch/net/ipv4/netfilter/ip_nat_proto_udp.c
===================================================================
--- linux-2.6.20.noarch.orig/net/ipv4/netfilter/ip_nat_proto_udp.c
+++ linux-2.6.20.noarch/net/ipv4/netfilter/ip_nat_proto_udp.c
@@ -115,16 +115,8 @@ udp_manip_pkt(struct sk_buff **pskb,
 	}
 
 	if (hdr->check || (*pskb)->ip_summed == CHECKSUM_PARTIAL) {
-#ifdef CONFIG_XEN
-		if ((*pskb)->proto_csum_blank)
-			nf_csum_replace4(&hdr->check, oldip, newip);
-		else
-#endif
-		{
 		nf_proto_csum_replace4(&hdr->check, *pskb, oldip, newip, 1);
 		nf_proto_csum_replace2(&hdr->check, *pskb, *portptr, newport, 0);
-		}
-
 		if (!hdr->check)
 			hdr->check = CSUM_MANGLED_0;
 	}
Index: linux-2.6.20.noarch/net/ipv4/xfrm4_output.c
===================================================================
--- linux-2.6.20.noarch.orig/net/ipv4/xfrm4_output.c
+++ linux-2.6.20.noarch/net/ipv4/xfrm4_output.c
@@ -18,8 +18,6 @@
 #include <net/xfrm.h>
 #include <net/icmp.h>
 
-extern int skb_checksum_setup(struct sk_buff *skb);
-
 static int xfrm4_tunnel_check_size(struct sk_buff *skb)
 {
 	int mtu, ret = 0;
@@ -49,10 +47,6 @@ static int xfrm4_output_one(struct sk_bu
 	struct dst_entry *dst = skb->dst;
 	struct xfrm_state *x = dst->xfrm;
 	int err;
-	
-	err = skb_checksum_setup(skb);
-	if (err)
-		goto error_nolock;
 
 	if (skb->ip_summed == CHECKSUM_PARTIAL) {
 		err = skb_checksum_help(skb);

linux-2.6-treat_partial_as_unnecessary.patch:
 include/linux/skbuff.h     |   16 +++++++++++-----
 include/net/tcp.h          |    2 +-
 include/net/udp.h          |    2 +-
 net/core/netpoll.c         |    2 +-
 net/ipv4/ipvs/ip_vs_core.c |    6 ++----
 net/ipv4/tcp_input.c       |    6 +++---
 net/ipv4/tcp_ipv4.c        |    3 +--
 net/ipv4/udp.c             |    6 +++---
 net/ipv6/raw.c             |    4 ++--
 net/ipv6/tcp_ipv6.c        |    3 +--
 net/ipv6/udp.c             |    4 ++--
 net/sctp/input.c           |    3 +--
 net/sunrpc/socklib.c       |    2 +-
 13 files changed, 30 insertions(+), 29 deletions(-)

--- NEW FILE linux-2.6-treat_partial_as_unnecessary.patch ---
From: Herbert Xu <herbert.xu at redhat.com>
Subject: [3/4] [NET]: Treat CHECKSUM_PARTIAL as CHECKSUM_UNNECESSARY

Hi:

[NET]: Treat CHECKSUM_PARTIAL as CHECKSUM_UNNECESSARY

When a transmitted packet is looped back directly, CHECKSUM_PARTIAL
maps to the semantics of CHECKSUM_UNNECESSARY.  Therefore we should
treat it as such in the stack.

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
--
Index: linux-2.6.20.noarch/include/linux/skbuff.h
===================================================================
--- linux-2.6.20.noarch.orig/include/linux/skbuff.h
+++ linux-2.6.20.noarch/include/linux/skbuff.h
@@ -31,10 +31,11 @@
 #define HAVE_ALLOC_SKB		/* For the drivers to know */
 #define HAVE_ALIGNABLE_SKB	/* Ditto 8)		   */
 
+/* Don't change this without changing skb_csum_unnecessary! */
 #define CHECKSUM_NONE 0
-#define CHECKSUM_PARTIAL 1
-#define CHECKSUM_UNNECESSARY 2
-#define CHECKSUM_COMPLETE 3
+#define CHECKSUM_UNNECESSARY 1
+#define CHECKSUM_COMPLETE 2
+#define CHECKSUM_PARTIAL 3
 
 #define SKB_DATA_ALIGN(X)	(((X) + (SMP_CACHE_BYTES - 1)) & \
 				 ~(SMP_CACHE_BYTES - 1))
@@ -1402,6 +1403,11 @@ extern void __net_timestamp(struct sk_bu
 
 extern __sum16 __skb_checksum_complete(struct sk_buff *skb);
 
+static inline int skb_csum_unnecessary(const struct sk_buff *skb)
+{
+	return skb->ip_summed & CHECKSUM_UNNECESSARY;
+}
+
 /**
  *	skb_checksum_complete - Calculate checksum of an entire packet
  *	@skb: packet to process
@@ -1420,8 +1426,8 @@ extern __sum16 __skb_checksum_complete(s
  */
 static inline unsigned int skb_checksum_complete(struct sk_buff *skb)
 {
-	return skb->ip_summed != CHECKSUM_UNNECESSARY &&
-		__skb_checksum_complete(skb);
+	return skb_csum_unnecessary(skb) ?
+	       0 : __skb_checksum_complete(skb);
 }
 
 #ifdef CONFIG_NETFILTER
Index: linux-2.6.20.noarch/include/net/tcp.h
===================================================================
--- linux-2.6.20.noarch.orig/include/net/tcp.h
+++ linux-2.6.20.noarch/include/net/tcp.h
@@ -816,7 +816,7 @@ static inline __sum16 __tcp_checksum_com
 
 static inline int tcp_checksum_complete(struct sk_buff *skb)
 {
-	return skb->ip_summed != CHECKSUM_UNNECESSARY &&
+	return !skb_csum_unnecessary(skb) &&
 		__tcp_checksum_complete(skb);
 }
 
Index: linux-2.6.20.noarch/include/net/udp.h
===================================================================
--- linux-2.6.20.noarch.orig/include/net/udp.h
+++ linux-2.6.20.noarch/include/net/udp.h
@@ -80,7 +80,7 @@ static inline __sum16 __udp_lib_checksum
 
 static inline int udp_lib_checksum_complete(struct sk_buff *skb)
 {
-	return skb->ip_summed != CHECKSUM_UNNECESSARY &&
+	return !skb_csum_unnecessary(skb) &&
 		__udp_lib_checksum_complete(skb);
 }
 
Index: linux-2.6.20.noarch/net/core/netpoll.c
===================================================================
--- linux-2.6.20.noarch.orig/net/core/netpoll.c
+++ linux-2.6.20.noarch/net/core/netpoll.c
@@ -86,7 +86,7 @@ static __sum16 checksum_udp(struct sk_bu
 {
 	__wsum psum;
 
-	if (uh->check == 0 || skb->ip_summed == CHECKSUM_UNNECESSARY)
+	if (uh->check == 0 || skb_csum_unnecessary(skb))
 		return 0;
 
 	psum = csum_tcpudp_nofold(saddr, daddr, ulen, IPPROTO_UDP, 0);
Index: linux-2.6.20.noarch/net/ipv4/ipvs/ip_vs_core.c
===================================================================
--- linux-2.6.20.noarch.orig/net/ipv4/ipvs/ip_vs_core.c
+++ linux-2.6.20.noarch/net/ipv4/ipvs/ip_vs_core.c
@@ -680,8 +680,7 @@ static int ip_vs_out_icmp(struct sk_buff
 	}
 
 	/* Ensure the checksum is correct */
-	if (skb->ip_summed != CHECKSUM_UNNECESSARY &&
-	    ip_vs_checksum_complete(skb, ihl)) {
+	if (!skb_csum_unnecessary(skb) && ip_vs_checksum_complete(skb, ihl)) {
 		/* Failed checksum! */
 		IP_VS_DBG(1, "Forward ICMP: failed checksum from %d.%d.%d.%d!\n",
 			  NIPQUAD(iph->saddr));
@@ -921,8 +920,7 @@ ip_vs_in_icmp(struct sk_buff **pskb, int
 	verdict = NF_DROP;
 
 	/* Ensure the checksum is correct */
-	if (skb->ip_summed != CHECKSUM_UNNECESSARY &&
-	    ip_vs_checksum_complete(skb, ihl)) {
+	if (!skb_csum_unnecessary(skb) && ip_vs_checksum_complete(skb, ihl)) {
 		/* Failed checksum! */
 		IP_VS_DBG(1, "Incoming ICMP: failed checksum from %d.%d.%d.%d!\n",
 			  NIPQUAD(iph->saddr));
Index: linux-2.6.20.noarch/net/ipv4/tcp_input.c
===================================================================
--- linux-2.6.20.noarch.orig/net/ipv4/tcp_input.c
+++ linux-2.6.20.noarch/net/ipv4/tcp_input.c
@@ -3775,7 +3775,7 @@ static int tcp_copy_to_iovec(struct sock
 	int err;
 
 	local_bh_enable();
-	if (skb->ip_summed==CHECKSUM_UNNECESSARY)
+	if (skb_csum_unnecessary(skb))
 		err = skb_copy_datagram_iovec(skb, hlen, tp->ucopy.iov, chunk);
 	else
 		err = skb_copy_and_csum_datagram_iovec(skb, hlen,
@@ -3807,7 +3807,7 @@ static __sum16 __tcp_checksum_complete_u
 
 static inline int tcp_checksum_complete_user(struct sock *sk, struct sk_buff *skb)
 {
-	return skb->ip_summed != CHECKSUM_UNNECESSARY &&
+	return !skb_csum_unnecessary(skb) &&
 		__tcp_checksum_complete_user(sk, skb);
 }
 
@@ -3825,7 +3825,7 @@ static int tcp_dma_try_early_copy(struct
 	if (!tp->ucopy.dma_chan && tp->ucopy.pinned_list)
 		tp->ucopy.dma_chan = get_softnet_dma();
 
-	if (tp->ucopy.dma_chan && skb->ip_summed == CHECKSUM_UNNECESSARY) {
+	if (tp->ucopy.dma_chan && skb_csum_unnecessary(skb)) {
 
 		dma_cookie = dma_skb_copy_datagram_iovec(tp->ucopy.dma_chan,
 			skb, hlen, tp->ucopy.iov, chunk, tp->ucopy.pinned_list);
Index: linux-2.6.20.noarch/net/ipv4/tcp_ipv4.c
===================================================================
--- linux-2.6.20.noarch.orig/net/ipv4/tcp_ipv4.c
+++ linux-2.6.20.noarch/net/ipv4/tcp_ipv4.c
@@ -1636,8 +1636,7 @@ int tcp_v4_rcv(struct sk_buff *skb)
 	 * Packet length and doff are validated by header prediction,
 	 * provided case of th->doff==0 is eliminated.
 	 * So, we defer the checks. */
-	if ((skb->ip_summed != CHECKSUM_UNNECESSARY &&
-	     tcp_v4_checksum_init(skb)))
+	if (!skb_csum_unnecessary(skb) && tcp_v4_checksum_init(skb))
 		goto bad_packet;
 
 	th = skb->h.th;
Index: linux-2.6.20.noarch/net/ipv4/udp.c
===================================================================
--- linux-2.6.20.noarch.orig/net/ipv4/udp.c
+++ linux-2.6.20.noarch/net/ipv4/udp.c
@@ -839,7 +839,7 @@ try_again:
 	 * 	          (re-)compute it if message is truncated.
 	 * 	UDP-Lite: always needs to checksum, no HW support.
 	 */
-	copy_only = (skb->ip_summed==CHECKSUM_UNNECESSARY);
+	copy_only = skb_csum_unnecessary(skb);
 
 	if (is_udplite  ||  (!copy_only  &&  msg->msg_flags&MSG_TRUNC)) {
 		if (__udp_lib_checksum_complete(skb))
@@ -1095,7 +1095,7 @@ int udp_queue_rcv_skb(struct sock * sk, 
 		}
 	}
 
-	if (sk->sk_filter && skb->ip_summed != CHECKSUM_UNNECESSARY) {
+	if (sk->sk_filter && !skb_csum_unnecessary(skb)) {
 		if (__udp_lib_checksum_complete(skb))
 			goto drop;
 		skb->ip_summed = CHECKSUM_UNNECESSARY;
@@ -1175,7 +1175,7 @@ static inline void udp4_csum_init(struct
 				      skb->len, IPPROTO_UDP, skb->csum       ))
 			skb->ip_summed = CHECKSUM_UNNECESSARY;
 	}
-	if (skb->ip_summed != CHECKSUM_UNNECESSARY)
+	if (!skb_csum_unnecessary(skb))
 		skb->csum = csum_tcpudp_nofold(skb->nh.iph->saddr,
 					       skb->nh.iph->daddr,
 					       skb->len, IPPROTO_UDP, 0);
Index: linux-2.6.20.noarch/net/ipv6/raw.c
===================================================================
--- linux-2.6.20.noarch.orig/net/ipv6/raw.c
+++ linux-2.6.20.noarch/net/ipv6/raw.c
@@ -369,7 +369,7 @@ int rawv6_rcv(struct sock *sk, struct sk
 				     skb->len, inet->num, skb->csum))
 			skb->ip_summed = CHECKSUM_UNNECESSARY;
 	}
-	if (skb->ip_summed != CHECKSUM_UNNECESSARY)
+	if (!skb_csum_unnecessary(skb))
 		skb->csum = ~csum_unfold(csum_ipv6_magic(&skb->nh.ipv6h->saddr,
 					     &skb->nh.ipv6h->daddr,
 					     skb->len, inet->num, 0));
@@ -421,7 +421,7 @@ static int rawv6_recvmsg(struct kiocb *i
   		msg->msg_flags |= MSG_TRUNC;
   	}
 
-	if (skb->ip_summed==CHECKSUM_UNNECESSARY) {
+	if (skb_csum_unnecessary(skb)) {
 		err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
 	} else if (msg->msg_flags&MSG_TRUNC) {
 		if (__skb_checksum_complete(skb))
Index: linux-2.6.20.noarch/net/ipv6/tcp_ipv6.c
===================================================================
--- linux-2.6.20.noarch.orig/net/ipv6/tcp_ipv6.c
+++ linux-2.6.20.noarch/net/ipv6/tcp_ipv6.c
@@ -1706,8 +1706,7 @@ static int tcp_v6_rcv(struct sk_buff **p
 	if (!pskb_may_pull(skb, th->doff*4))
 		goto discard_it;
 
-	if ((skb->ip_summed != CHECKSUM_UNNECESSARY &&
-	     tcp_v6_checksum_init(skb)))
+	if (!skb_csum_unnecessary(skb) && tcp_v6_checksum_init(skb))
 		goto bad_packet;
 
 	th = skb->h.th;
Index: linux-2.6.20.noarch/net/ipv6/udp.c
===================================================================
--- linux-2.6.20.noarch.orig/net/ipv6/udp.c
+++ linux-2.6.20.noarch/net/ipv6/udp.c
@@ -144,7 +144,7 @@ try_again:
 	/*
 	 * 	Decide whether to checksum and/or copy data.
 	 */
-	copy_only = (skb->ip_summed==CHECKSUM_UNNECESSARY);
+	copy_only = skb_csum_unnecessary(skb);
 
 	if (is_udplite  ||  (!copy_only  &&  msg->msg_flags&MSG_TRUNC)) {
 		if (__udp_lib_checksum_complete(skb))
@@ -382,7 +382,7 @@ static inline int udp6_csum_init(struct 
 		    	     skb->len, IPPROTO_UDP, skb->csum             ))
 		skb->ip_summed = CHECKSUM_UNNECESSARY;
 
-	if (skb->ip_summed != CHECKSUM_UNNECESSARY)
+	if (!skb_csum_unnecessary(skb))
 		skb->csum = ~csum_unfold(csum_ipv6_magic(&skb->nh.ipv6h->saddr,
 							 &skb->nh.ipv6h->daddr,
 							 skb->len, IPPROTO_UDP,
Index: linux-2.6.20.noarch/net/sctp/input.c
===================================================================
--- linux-2.6.20.noarch.orig/net/sctp/input.c
+++ linux-2.6.20.noarch/net/sctp/input.c
@@ -144,8 +144,7 @@ int sctp_rcv(struct sk_buff *skb)
 	__skb_pull(skb, skb->h.raw - skb->data);
 	if (skb->len < sizeof(struct sctphdr))
 		goto discard_it;
-	if ((skb->ip_summed != CHECKSUM_UNNECESSARY) &&
-	    (sctp_rcv_checksum(skb) < 0))
+	if (!skb_csum_unnecessary(skb) && sctp_rcv_checksum(skb) < 0)
 		goto discard_it;
 
 	skb_pull(skb, sizeof(struct sctphdr));
Index: linux-2.6.20.noarch/net/sunrpc/socklib.c
===================================================================
--- linux-2.6.20.noarch.orig/net/sunrpc/socklib.c
+++ linux-2.6.20.noarch/net/sunrpc/socklib.c
@@ -154,7 +154,7 @@ int csum_partial_copy_to_xdr(struct xdr_
 	desc.offset = sizeof(struct udphdr);
 	desc.count = skb->len - desc.offset;
 
-	if (skb->ip_summed == CHECKSUM_UNNECESSARY)
+	if (skb_csum_unnecessary(skb))
 		goto no_checksum;
 
 	desc.csum = csum_partial(skb->data, desc.offset, skb->csum);

linux-2.6-use_csum_start_offset_instead.patch:
 include/linux/skbuff.h |    9 +++++++--
 net/core/dev.c         |   23 ++++++++++++++---------
 net/core/skbuff.c      |    2 +-
 net/ipv4/tcp_ipv4.c    |    2 ++
 net/ipv4/udp.c         |    1 +
 net/ipv6/tcp_ipv6.c    |    2 ++
 6 files changed, 27 insertions(+), 12 deletions(-)

--- NEW FILE linux-2.6-use_csum_start_offset_instead.patch ---
From: Herbert Xu <herbert.xu at redhat.com>
Subject: [2/4] [NET]: Use csum_start offset instead of skb_transport_header

Hi:

Note this is based on the upstream net-2.6.22 tree so merging it
into anything before that will require undoing the transport header
changes.  Let me know if there are problems merging it.

[NET]: Use csum_start offset instead of skb_transport_header

The skb transport pointer is currently used to specify the start
of the checksum region for transmit checksum offload.  Unfortunately,
the same pointer is also used during receive side processing.

This creates a problem when we want to retransmit a received
packet with partial checksums since the skb transport pointer
would be overwritten.

This patch solves this problem by creating a new 16-bit csum_start
offset value to replace the skb transport header for the purpose
of checksums.  This offset is calculated from skb->head so that
it does not have to change when skb->data changes.

No extra space is required since csum_offset itself fits within
a 16-bit word so we can use the other 16 bits for csum_start.

For backwards compatibility, just before we push a packet with
partial checksums off into the device driver, we set the skb
transport header to what it would have been under the old scheme.

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
--
Index: linux-2.6.20.noarch/include/linux/skbuff.h
===================================================================
--- linux-2.6.20.noarch.orig/include/linux/skbuff.h
+++ linux-2.6.20.noarch/include/linux/skbuff.h
@@ -198,7 +198,9 @@ enum {
  *	@len: Length of actual data
  *	@data_len: Data length
  *	@mac_len: Length of link layer header
- *	@csum: Checksum
+ *	@csum: Checksum (must include start/offset pair)
+ *	@csum_start: Offset from skb->head where checksumming should start
+ *	@csum_offset: Offset from csum_start where checksum should be stored
  *	@local_df: allow local fragmentation
  *	@cloned: Head may be cloned (check refcnt to be sure)
  *	@nohdr: Payload reference only, must not modify header
@@ -277,7 +279,10 @@ struct sk_buff {
 				mac_len;
 	union {
 		__wsum		csum;
-		__u32		csum_offset;
+		struct {
+			__u16	csum_start;
+			__u16	csum_offset;
+		};
 	};
 	__u32			priority;
 	__u8			local_df:1,
Index: linux-2.6.20.noarch/net/core/dev.c
===================================================================
--- linux-2.6.20.noarch.orig/net/core/dev.c
+++ linux-2.6.20.noarch/net/core/dev.c
@@ -1176,7 +1176,7 @@ EXPORT_SYMBOL(netif_device_attach);
 int skb_checksum_help(struct sk_buff *skb)
 {
 	__wsum csum;
-	int ret = 0, offset = skb->h.raw - skb->data;
+	int ret = 0, offset;
 
 	if (skb->ip_summed == CHECKSUM_COMPLETE)
 		goto out_set_summed;
@@ -1192,14 +1192,16 @@ int skb_checksum_help(struct sk_buff *sk
 			goto out;
 	}
 
+	offset = skb->csum_start - skb_headroom(skb);
 	BUG_ON(offset > (int)skb->len);
 	csum = skb_checksum(skb, offset, skb->len-offset, 0);
 
-	offset = skb->tail - skb->h.raw;
+	offset = skb_headlen(skb) - offset;
 	BUG_ON(offset <= 0);
 	BUG_ON(skb->csum_offset + 2 > offset);
 
-	*(__sum16*)(skb->h.raw + skb->csum_offset) = csum_fold(csum);
+	*(__sum16 *)(skb->head + skb->csum_start + skb->csum_offset) =
+		csum_fold(csum);
 
 out_set_summed:
 	skb->ip_summed = CHECKSUM_NONE;
@@ -1494,12 +1496,15 @@ int dev_queue_xmit(struct sk_buff *skb)
 	/* If packet is not checksummed and device does not support
 	 * checksumming for this protocol, complete checksumming here.
 	 */
-	if (skb->ip_summed == CHECKSUM_PARTIAL &&
-	    (!(dev->features & NETIF_F_GEN_CSUM) &&
-	     (!(dev->features & NETIF_F_IP_CSUM) ||
-	      skb->protocol != htons(ETH_P_IP))))
-	      	if (skb_checksum_help(skb))
-	      		goto out_kfree_skb;
+	if (skb->ip_summed == CHECKSUM_PARTIAL) {
+		skb->h.raw = skb->head + skb->csum_start;
+
+		if (!(dev->features & NETIF_F_GEN_CSUM) &&
+		    (!(dev->features & NETIF_F_IP_CSUM) ||
+		     skb->protocol != htons(ETH_P_IP)))
+		      	if (skb_checksum_help(skb))
+		      		goto out_kfree_skb;
+	}
 
 gso:
 	spin_lock_prefetch(&dev->queue_lock);
Index: linux-2.6.20.noarch/net/core/skbuff.c
===================================================================
--- linux-2.6.20.noarch.orig/net/core/skbuff.c
+++ linux-2.6.20.noarch/net/core/skbuff.c
@@ -1423,7 +1423,7 @@ void skb_copy_and_csum_dev(const struct 
 	long csstart;
 
 	if (skb->ip_summed == CHECKSUM_PARTIAL)
-		csstart = skb->h.raw - skb->data;
+		csstart = skb->csum_start - skb_headroom(skb);
 	else
 		csstart = skb_headlen(skb);
 
Index: linux-2.6.20.noarch/net/ipv4/tcp_ipv4.c
===================================================================
--- linux-2.6.20.noarch.orig/net/ipv4/tcp_ipv4.c
+++ linux-2.6.20.noarch/net/ipv4/tcp_ipv4.c
@@ -504,6 +504,7 @@ void tcp_v4_send_check(struct sock *sk, 
 	if (skb->ip_summed == CHECKSUM_PARTIAL) {
 		th->check = ~tcp_v4_check(th, len,
 					  inet->saddr, inet->daddr, 0);
+		skb->csum_start = skb->h.raw - skb->head;
 		skb->csum_offset = offsetof(struct tcphdr, check);
 	} else {
 		th->check = tcp_v4_check(th, len, inet->saddr, inet->daddr,
@@ -526,6 +527,7 @@ int tcp_v4_gso_send_check(struct sk_buff
 
 	th->check = 0;
 	th->check = ~tcp_v4_check(th, skb->len, iph->saddr, iph->daddr, 0);
+	skb->csum_start = skb->h.raw - skb->head;
 	skb->csum_offset = offsetof(struct tcphdr, check);
 	skb->ip_summed = CHECKSUM_PARTIAL;
 	return 0;
Index: linux-2.6.20.noarch/net/ipv4/udp.c
===================================================================
--- linux-2.6.20.noarch.orig/net/ipv4/udp.c
+++ linux-2.6.20.noarch/net/ipv4/udp.c
@@ -425,6 +425,7 @@ static void udp4_hwcsum_outgoing(struct 
 		/*
 		 * Only one fragment on the socket.
 		 */
+		skb->csum_start = skb->h.raw - skb->head;
 		skb->csum_offset = offsetof(struct udphdr, check);
 		uh->check = ~csum_tcpudp_magic(src, dst, len, IPPROTO_UDP, 0);
 	} else {
Index: linux-2.6.20.noarch/net/ipv6/tcp_ipv6.c
===================================================================
--- linux-2.6.20.noarch.orig/net/ipv6/tcp_ipv6.c
+++ linux-2.6.20.noarch/net/ipv6/tcp_ipv6.c
@@ -948,6 +948,7 @@ static void tcp_v6_send_check(struct soc
 
 	if (skb->ip_summed == CHECKSUM_PARTIAL) {
 		th->check = ~csum_ipv6_magic(&np->saddr, &np->daddr, len, IPPROTO_TCP,  0);
+		skb->csum_start = skb->h.raw - skb->head;
 		skb->csum_offset = offsetof(struct tcphdr, check);
 	} else {
 		th->check = csum_ipv6_magic(&np->saddr, &np->daddr, len, IPPROTO_TCP, 
@@ -970,6 +971,7 @@ static int tcp_v6_gso_send_check(struct 
 	th->check = 0;
 	th->check = ~csum_ipv6_magic(&ipv6h->saddr, &ipv6h->daddr, skb->len,
 				     IPPROTO_TCP, 0);
+	skb->csum_start = skb->h.raw - skb->head;
 	skb->csum_offset = offsetof(struct tcphdr, check);
 	skb->ip_summed = CHECKSUM_PARTIAL;
 	return 0;


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2947
retrieving revision 1.2947.2.1
diff -u -r1.2947 -r1.2947.2.1
--- kernel-2.6.spec	26 Apr 2007 15:04:15 -0000	1.2947
+++ kernel-2.6.spec	27 Apr 2007 19:43:16 -0000	1.2947.2.1
@@ -505,6 +505,12 @@
 Patch1601: linux-2.6-sha_alignment.patch
 Patch1650: linux-2.6-serial-460800.patch
 Patch1681: linux-2.6-xfs-umount-fix.patch
+# checksum fixes (bug #223258)
+Patch1660: linux-2.6-forwarding_of_ip_summed.patch
+Patch1661: linux-2.6-use_csum_start_offset_instead.patch
+Patch1662: linux-2.6-treat_partial_as_unnecessary.patch
+Patch1663: linux-2.6-kill_skbuff_hack.patch
+
 Patch1682: linux-2.6-xfs_attr2.patch
 Patch1690: linux-2.6-PT_LOAD-align.patch
 Patch1720: linux-2.6-proc-self-maps-fix.patch
@@ -1222,6 +1228,13 @@
 %patch1650 -p1
 # Fix XFS umount bug.
 %patch1681 -p1
+
+# checksum fixes (bug #223258)
+%patch1660 -p1
+%patch1661 -p1
+%patch1662 -p1
+%patch1663 -p1
+
 # Fix attr2 corruption with btree data extents
 %patch1682 -p1
 # Align kernel data segment to page boundary.



From fedora-cvs-commits at redhat.com  Fri Apr 27 21:10:16 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 17:10:16 -0400
Subject: rpms/kernel/devel linux-2.6-mm-udf-fixes.patch, NONE,
	1.1 kernel-2.6.spec, 1.3117, 1.3118
Message-ID: <200704272110.l3RLAGIF021055@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20782

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-mm-udf-fixes.patch 
Log Message:
* Fri Apr 27 2007 Dave Jones <davej at redhat.com>
- Allow large files on UDF.


linux-2.6-mm-udf-fixes.patch:
 balloc.c    |  177 ++++++++----------
 dir.c       |   39 ++--
 directory.c |   30 +--
 inode.c     |  581 ++++++++++++++++++++++++++++++++++++------------------------
 misc.c      |    6 
 namei.c     |  226 +++++++++++------------
 partition.c |    2 
 super.c     |   75 +++----
 symlink.c   |    2 
 truncate.c  |  206 +++++++++------------
 udf_sb.h    |    2 
 udfdecl.h   |   25 +-
 12 files changed, 731 insertions(+), 640 deletions(-)

--- NEW FILE linux-2.6-mm-udf-fixes.patch ---
Index: linux-2.6.20.noarch/fs/udf/dir.c
===================================================================
--- linux-2.6.20.noarch.orig/fs/udf/dir.c	2007-02-04 13:44:54.000000000 -0500
+++ linux-2.6.20.noarch/fs/udf/dir.c	2007-03-28 15:15:29.000000000 -0400
@@ -111,11 +111,13 @@ do_udf_readdir(struct inode * dir, struc
 	uint16_t liu;
 	uint8_t lfi;
 	loff_t size = (udf_ext0_offset(dir) + dir->i_size) >> 2;
-	struct buffer_head * bh = NULL, * tmp, * bha[16];
-	kernel_lb_addr bloc, eloc;
-	uint32_t extoffset, elen, offset;
+	struct buffer_head *tmp, *bha[16];
+	kernel_lb_addr eloc;
+	uint32_t elen;
+	sector_t offset;
 	int i, num;
 	unsigned int dt_type;
+	struct extent_position epos = { NULL, 0, {0, 0}};
 
 	if (nf_pos >= size)
 		return 0;
@@ -127,23 +129,22 @@ do_udf_readdir(struct inode * dir, struc
 	if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_IN_ICB)
 		fibh.sbh = fibh.ebh = NULL;
 	else if (inode_bmap(dir, nf_pos >> (dir->i_sb->s_blocksize_bits - 2),
-		&bloc, &extoffset, &eloc, &elen, &offset, &bh) == (EXT_RECORDED_ALLOCATED >> 30))
+		&epos, &eloc, &elen, &offset) == (EXT_RECORDED_ALLOCATED >> 30))
 	{
-		offset >>= dir->i_sb->s_blocksize_bits;
 		block = udf_get_lb_pblock(dir->i_sb, eloc, offset);
 		if ((++offset << dir->i_sb->s_blocksize_bits) < elen)
 		{
 			if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_SHORT)
-				extoffset -= sizeof(short_ad);
+				epos.offset -= sizeof(short_ad);
 			else if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_LONG)
-				extoffset -= sizeof(long_ad);
+				epos.offset -= sizeof(long_ad);
 		}
 		else
 			offset = 0;
 
 		if (!(fibh.sbh = fibh.ebh = udf_tread(dir->i_sb, block)))
 		{
-			udf_release_data(bh);
+			brelse(epos.bh);
 			return -EIO;
 		}
 	
@@ -171,7 +172,7 @@ do_udf_readdir(struct inode * dir, struc
 	}
 	else
 	{
-		udf_release_data(bh);
+		brelse(epos.bh);
 		return -ENOENT;
 	}
 
@@ -179,14 +180,14 @@ do_udf_readdir(struct inode * dir, struc
 	{
 		filp->f_pos = nf_pos + 1;
 
-		fi = udf_fileident_read(dir, &nf_pos, &fibh, &cfi, &bloc, &extoffset, &eloc, &elen, &offset, &bh);
+		fi = udf_fileident_read(dir, &nf_pos, &fibh, &cfi, &epos, &eloc, &elen, &offset);
 
 		if (!fi)
 		{
 			if (fibh.sbh != fibh.ebh)
-				udf_release_data(fibh.ebh);
-			udf_release_data(fibh.sbh);
-			udf_release_data(bh);
+				brelse(fibh.ebh);
+			brelse(fibh.sbh);
+			brelse(epos.bh);
 			return 0;
 		}
 
@@ -244,9 +245,9 @@ do_udf_readdir(struct inode * dir, struc
 			if (filldir(dirent, fname, flen, filp->f_pos, iblock, dt_type) < 0)
 			{
 				if (fibh.sbh != fibh.ebh)
-					udf_release_data(fibh.ebh);
-				udf_release_data(fibh.sbh);
-				udf_release_data(bh);
+					brelse(fibh.ebh);
+				brelse(fibh.sbh);
+				brelse(epos.bh);
 	 			return 0;
 			}
 		}
@@ -255,9 +256,9 @@ do_udf_readdir(struct inode * dir, struc
 	filp->f_pos = nf_pos + 1;
 
 	if (fibh.sbh != fibh.ebh)
-		udf_release_data(fibh.ebh);
-	udf_release_data(fibh.sbh);
-	udf_release_data(bh);
+		brelse(fibh.ebh);
+	brelse(fibh.sbh);
+	brelse(epos.bh);
 
 	return 0;
 }
Index: linux-2.6.20.noarch/fs/udf/directory.c
===================================================================
--- linux-2.6.20.noarch.orig/fs/udf/directory.c	2007-02-04 13:44:54.000000000 -0500
+++ linux-2.6.20.noarch/fs/udf/directory.c	2007-03-28 15:15:29.000000000 -0400
@@ -36,14 +36,14 @@ udf_filead_read(struct inode *dir, uint8
 
 	if (!ad)
 	{
-		udf_release_data(*bh);
+		brelse(*bh);
 		*error = 1;
 		return NULL;
 	}
 
 	if (*offset == dir->i_sb->s_blocksize)
 	{
-		udf_release_data(*bh);
+		brelse(*bh);
 		block = udf_get_lb_pblock(dir->i_sb, fe_loc, ++*pos);
 		if (!block)
 			return NULL;
@@ -57,7 +57,7 @@ udf_filead_read(struct inode *dir, uint8
 		remainder = dir->i_sb->s_blocksize - loffset;
 		memcpy((uint8_t *)ad, (*bh)->b_data + loffset, remainder);
 
-		udf_release_data(*bh);
+		brelse(*bh);
 		block = udf_get_lb_pblock(dir->i_sb, fe_loc, ++*pos);
 		if (!block)
 			return NULL;
@@ -75,9 +75,9 @@ struct fileIdentDesc *
 udf_fileident_read(struct inode *dir, loff_t *nf_pos,
 	struct udf_fileident_bh *fibh,
 	struct fileIdentDesc *cfi,
-	kernel_lb_addr *bloc, uint32_t *extoffset, 
+	struct extent_position *epos,
 	kernel_lb_addr *eloc, uint32_t *elen,
-	uint32_t *offset, struct buffer_head **bh)
+	sector_t *offset)
 {
 	struct fileIdentDesc *fi;
 	int i, num, block;
@@ -105,13 +105,11 @@ udf_fileident_read(struct inode *dir, lo
 
 	if (fibh->eoffset == dir->i_sb->s_blocksize)
 	{
-		int lextoffset = *extoffset;
+		int lextoffset = epos->offset;
 
-		if (udf_next_aext(dir, bloc, extoffset, eloc, elen, bh, 1) !=
+		if (udf_next_aext(dir, epos, eloc, elen, 1) !=
 			(EXT_RECORDED_ALLOCATED >> 30))
-		{
 			return NULL;
-		}
 
 		block = udf_get_lb_pblock(dir->i_sb, *eloc, *offset);
 
@@ -120,9 +118,9 @@ udf_fileident_read(struct inode *dir, lo
 		if ((*offset << dir->i_sb->s_blocksize_bits) >= *elen)
 			*offset = 0;
 		else
-			*extoffset = lextoffset;
+			epos->offset = lextoffset;
 
-		udf_release_data(fibh->sbh);
+		brelse(fibh->sbh);
 		if (!(fibh->sbh = fibh->ebh = udf_tread(dir->i_sb, block)))
 			return NULL;
 		fibh->soffset = fibh->eoffset = 0;
@@ -151,7 +149,7 @@ udf_fileident_read(struct inode *dir, lo
 	}
 	else if (fibh->sbh != fibh->ebh)
 	{
-		udf_release_data(fibh->sbh);
+		brelse(fibh->sbh);
 		fibh->sbh = fibh->ebh;
 	}
 
@@ -169,13 +167,11 @@ udf_fileident_read(struct inode *dir, lo
 	}
 	else if (fibh->eoffset > dir->i_sb->s_blocksize)
 	{
-		int lextoffset = *extoffset;
+		int lextoffset = epos->offset;
 
-		if (udf_next_aext(dir, bloc, extoffset, eloc, elen, bh, 1) !=
+		if (udf_next_aext(dir, epos, eloc, elen, 1) !=
 			(EXT_RECORDED_ALLOCATED >> 30))
-		{
 			return NULL;
-		}
 
 		block = udf_get_lb_pblock(dir->i_sb, *eloc, *offset);
 
@@ -184,7 +180,7 @@ udf_fileident_read(struct inode *dir, lo
[...2590 lines suppressed...]
+		brelse(bh);
 	}
 	for (i=0; i<VDS_POS_LENGTH; i++)
 	{
@@ -1269,10 +1269,10 @@ udf_process_sequence(struct super_block 
 					gd = (struct generic_desc *)bh2->b_data;
 					if (ident == TAG_IDENT_PD)
 						udf_load_partdesc(sb, bh2);
-					udf_release_data(bh2);
+					brelse(bh2);
 				}
 			}
-			udf_release_data(bh);
+			brelse(bh);
 		}
 	}
 
@@ -1335,7 +1335,7 @@ udf_load_partition(struct super_block *s
 			reserve_e = reserve_e >> sb->s_blocksize_bits;
 			reserve_e += reserve_s;
 
-			udf_release_data(bh);
+			brelse(bh);
 
 			/* Process the main & reserve sequences */
 			/* responsible for finding the PartitionDesc(s) */
@@ -1405,12 +1405,14 @@ udf_load_partition(struct super_block *s
 
 					pos = udf_block_map(UDF_SB_VAT(sb), 0);
 					bh = sb_bread(sb, pos);
+					if (!bh)
+						return 1;
 					UDF_SB_TYPEVIRT(sb,i).s_start_offset =
 						le16_to_cpu(((struct virtualAllocationTable20 *)bh->b_data + udf_ext0_offset(UDF_SB_VAT(sb)))->lengthHeader) +
 							udf_ext0_offset(UDF_SB_VAT(sb));
 					UDF_SB_TYPEVIRT(sb,i).s_num_entries = (UDF_SB_VAT(sb)->i_size -
 						UDF_SB_TYPEVIRT(sb,i).s_start_offset) >> 2;
-					udf_release_data(bh);
+					brelse(bh);
 				}
 				UDF_SB_PARTROOT(sb,i) = udf_get_pblock(sb, 0, i, 0);
 				UDF_SB_PARTLEN(sb,i) = UDF_SB_PARTLEN(sb,ino.partitionReferenceNum);
@@ -1663,7 +1665,7 @@ static int udf_fill_super(struct super_b
 		iput(inode);
 		goto error_out;
 	}
-	sb->s_maxbytes = 1<<30;
+	sb->s_maxbytes = MAX_LFS_FILESIZE;
 	return 0;
 
 error_out:
@@ -1682,7 +1684,7 @@ error_out:
 		if (UDF_SB_PARTTYPE(sb, UDF_SB_PARTITION(sb)) == UDF_SPARABLE_MAP15)
 		{
 			for (i=0; i<4; i++)
-				udf_release_data(UDF_SB_TYPESPAR(sb, UDF_SB_PARTITION(sb)).s_spar_map[i]);
+				brelse(UDF_SB_TYPESPAR(sb, UDF_SB_PARTITION(sb)).s_spar_map[i]);
 		}
 	}
 #ifdef CONFIG_UDF_NLS
@@ -1691,7 +1693,7 @@ error_out:
 #endif
 	if (!(sb->s_flags & MS_RDONLY))
 		udf_close_lvid(sb);
-	udf_release_data(UDF_SB_LVIDBH(sb));
+	brelse(UDF_SB_LVIDBH(sb));
 	UDF_SB_FREE(sb);
 	kfree(sbi);
 	sb->s_fs_info = NULL;
@@ -1760,7 +1762,7 @@ udf_put_super(struct super_block *sb)
 		if (UDF_SB_PARTTYPE(sb, UDF_SB_PARTITION(sb)) == UDF_SPARABLE_MAP15)
 		{
 			for (i=0; i<4; i++)
-				udf_release_data(UDF_SB_TYPESPAR(sb, UDF_SB_PARTITION(sb)).s_spar_map[i]);
+				brelse(UDF_SB_TYPESPAR(sb, UDF_SB_PARTITION(sb)).s_spar_map[i]);
 		}
 	}
 #ifdef CONFIG_UDF_NLS
@@ -1769,7 +1771,7 @@ udf_put_super(struct super_block *sb)
 #endif
 	if (!(sb->s_flags & MS_RDONLY))
 		udf_close_lvid(sb);
-	udf_release_data(UDF_SB_LVIDBH(sb));
+	brelse(UDF_SB_LVIDBH(sb));
 	UDF_SB_FREE(sb);
 	kfree(sb->s_fs_info);
 	sb->s_fs_info = NULL;
@@ -1839,7 +1841,7 @@ udf_count_free_bitmap(struct super_block
 	}
 	else if (ident != TAG_IDENT_SBD)
 	{
-		udf_release_data(bh);
+		brelse(bh);
 		printk(KERN_ERR "udf: udf_count_free failed\n");
 		goto out;
 	}
@@ -1861,7 +1863,7 @@ udf_count_free_bitmap(struct super_block
 		}
 		if ( bytes )
 		{
-			udf_release_data(bh);
+			brelse(bh);
 			newblock = udf_get_lb_pblock(sb, loc, ++block);
 			bh = udf_tread(sb, newblock);
 			if (!bh)
@@ -1873,7 +1875,7 @@ udf_count_free_bitmap(struct super_block
 			ptr = (uint8_t *)bh->b_data;
 		}
 	}
-	udf_release_data(bh);
+	brelse(bh);
 
 out:
 	unlock_kernel();
@@ -1885,21 +1887,20 @@ static unsigned int
 udf_count_free_table(struct super_block *sb, struct inode * table)
 {
 	unsigned int accum = 0;
-	uint32_t extoffset, elen;
-	kernel_lb_addr bloc, eloc;
+	uint32_t elen;
+	kernel_lb_addr eloc;
 	int8_t etype;
-	struct buffer_head *bh = NULL;
+	struct extent_position epos;
 
 	lock_kernel();
 
-	bloc = UDF_I_LOCATION(table);
-	extoffset = sizeof(struct unallocSpaceEntry);
+	epos.block = UDF_I_LOCATION(table);
+	epos.offset = sizeof(struct unallocSpaceEntry);
+	epos.bh = NULL;
 
-	while ((etype = udf_next_aext(table, &bloc, &extoffset, &eloc, &elen, &bh, 1)) != -1)
-	{
+	while ((etype = udf_next_aext(table, &epos, &eloc, &elen, 1)) != -1)
 		accum += (elen >> table->i_sb->s_blocksize_bits);
-	}
-	udf_release_data(bh);
+	brelse(epos.bh);
 
 	unlock_kernel();
 
Index: linux-2.6.20.noarch/fs/udf/misc.c
===================================================================
--- linux-2.6.20.noarch.orig/fs/udf/misc.c	2007-02-04 13:44:54.000000000 -0500
+++ linux-2.6.20.noarch/fs/udf/misc.c	2007-03-28 15:15:29.000000000 -0400
@@ -274,12 +274,6 @@ udf_read_ptagged(struct super_block *sb,
 		loc.logicalBlockNum + offset, ident);
 }
 
-void udf_release_data(struct buffer_head *bh)
-{
-	if (bh)
-		brelse(bh);
-}
-
 void udf_update_tag(char *data, int length)
 {
 	tag *tptr = (tag *)data;
Index: linux-2.6.20.noarch/fs/udf/partition.c
===================================================================
--- linux-2.6.20.noarch.orig/fs/udf/partition.c	2007-02-04 13:44:54.000000000 -0500
+++ linux-2.6.20.noarch/fs/udf/partition.c	2007-03-28 15:15:29.000000000 -0400
@@ -81,7 +81,7 @@ uint32_t udf_get_pblock_virt15(struct su
 
 	loc = le32_to_cpu(((__le32 *)bh->b_data)[index]);
 
-	udf_release_data(bh);
+	brelse(bh);
 
 	if (UDF_I_LOCATION(UDF_SB_VAT(sb)).partitionReferenceNum == partition)
 	{
Index: linux-2.6.20.noarch/fs/udf/symlink.c
===================================================================
--- linux-2.6.20.noarch.orig/fs/udf/symlink.c	2007-02-04 13:44:54.000000000 -0500
+++ linux-2.6.20.noarch/fs/udf/symlink.c	2007-03-28 15:15:29.000000000 -0400
@@ -95,7 +95,7 @@ static int udf_symlink_filler(struct fil
 	}
 
 	udf_pc_to_char(inode->i_sb, symlink, inode->i_size, p);
-	udf_release_data(bh);
+	brelse(bh);
 
 	unlock_kernel();
 	SetPageUptodate(page);
Index: linux-2.6.20.noarch/fs/udf/udf_sb.h
===================================================================
--- linux-2.6.20.noarch.orig/fs/udf/udf_sb.h	2007-02-04 13:44:54.000000000 -0500
+++ linux-2.6.20.noarch/fs/udf/udf_sb.h	2007-03-28 15:15:29.000000000 -0400
@@ -93,7 +93,7 @@ static inline struct udf_sb_info *UDF_SB
 	for (i=0; i<nr_groups; i++)\
 	{\
 		if (UDF_SB_BITMAP(X,Y,Z,i))\
-			udf_release_data(UDF_SB_BITMAP(X,Y,Z,i));\
+			brelse(UDF_SB_BITMAP(X,Y,Z,i));\
 	}\
 	if (size <= PAGE_SIZE)\
 		kfree(UDF_SB_PARTMAPS(X)[Y].Z.s_bitmap);\


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3117
retrieving revision 1.3118
diff -u -r1.3117 -r1.3118
--- kernel-2.6.spec	27 Apr 2007 19:16:57 -0000	1.3117
+++ kernel-2.6.spec	27 Apr 2007 21:10:09 -0000	1.3118
@@ -556,6 +556,7 @@
 Patch1630: linux-2.6-kvm-19.patch
 Patch1640: linux-2.6-module-override-modparam-cmdline.patch
 Patch1650: linux-2.6-serial-460800.patch
+Patch1660: linux-2.6-mm-udf-fixes.patch
 Patch1681: linux-2.6-xfs-umount-fix.patch
 Patch1690: linux-2.6-PT_LOAD-align.patch
 Patch1700: linux-2.6-dvb-spinlock.patch
@@ -1268,6 +1269,8 @@
 #%patch1640 -p1
 # Allow to use 480600 baud on 16C950 UARTs
 %patch1650 -p1
+# Allow large files on UDF
+%patch1660 -p1
 # Fix XFS umount bug.
 %patch1681 -p1
 # Align kernel data segment to page boundary.
@@ -2331,6 +2334,9 @@
 #  - tux.
 
 %changelog
+* Fri Apr 27 2007 Dave Jones <davej at redhat.com>
+- Allow large files on UDF.
+
 * Fri Apr 27 2007 John W. Linville <linville at redhat.com>
 - Update git-iwlwifi.patch (and update git-iwlwifi-fixes.patch to match)
 



From fedora-cvs-commits at redhat.com  Fri Apr 27 22:41:59 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 18:41:59 -0400
Subject: rpms/kernel/FC-5 linux-2.6.20.10-unoffical.patch, NONE,
	1.1 kernel-2.6.spec, 1.2315, 1.2316
Message-ID: <200704272241.l3RMfxiB026694@cvs.devel.redhat.com>

Author: cebbert

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26641

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6.20.10-unoffical.patch 
Log Message:
* Fri Apr 27 2007 Chuck Ebbert <cebbert at redhat.com>		1.2316
- 2.6.20.10 (from mailing list)


linux-2.6.20.10-unoffical.patch:
 Makefile                |    2 +-
 net/ipv4/fib_frontend.c |    4 ++++
 net/ipv6/exthdrs.c      |    1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6.20.10-unoffical.patch ---
diff --git a/Makefile b/Makefile
index 3e7e6c7..b9ba823 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 20
-EXTRAVERSION = .9
+EXTRAVERSION = .10
 NAME = Homicidal Dwarf Hamster
 
 # *DOCUMENTATION*
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index fa2cb8c..30aae76 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -773,6 +773,10 @@ static void nl_fib_lookup(struct fib_result_nl *frn, struct fib_table *tb )
 							    .tos = frn->fl_tos,
 							    .scope = frn->fl_scope } } };
 
+#ifdef CONFIG_IP_MULTIPLE_TABLES
+	res.r = NULL;
+#endif
+
 	frn->err = -ENOENT;
 	if (tb) {
 		local_bh_disable();
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index 5fd7cf9..de96e1a 100644
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@@ -397,6 +397,7 @@ static int ipv6_rthdr_rcv(struct sk_buff **skbp)
 
 	switch (hdr->type) {
 #ifdef CONFIG_IPV6_MIP6
+	case IPV6_SRCRT_TYPE_2:
 		break;
 #endif
 	case IPV6_SRCRT_TYPE_0:


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2315
retrieving revision 1.2316
diff -u -r1.2315 -r1.2316
--- kernel-2.6.spec	26 Apr 2007 15:04:07 -0000	1.2315
+++ kernel-2.6.spec	27 Apr 2007 22:41:56 -0000	1.2316
@@ -319,11 +319,12 @@
 Patch7: patch-2.6.20.6-7.bz2
 Patch8: patch-2.6.20.7-8.bz2
 Patch9: patch-2.6.20.8-9.bz2
+Patch10: linux-2.6.20.10-unoffical.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 
 # enable sysrq-c on all kernels, not only kexec
-Patch20: linux-2.6-sysrq-c.patch
+Patch70: linux-2.6-sysrq-c.patch
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -882,11 +883,12 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
 # sysrq works always
-%patch20 -p1
+%patch70 -p1
 
 # Architecture patches
 
@@ -1892,6 +1894,9 @@
 %endif
 
 %changelog
+* Fri Apr 27 2007 Chuck Ebbert <cebbert at redhat.com>		1.2316
+- 2.6.20.10 (from mailing list)
+
 * Thu Apr 26 2007 Chuck Ebbert <cebbert at redhat.com>		1.2315
 - 2.6.20.8 (official)
 - 2.6.20.9



From fedora-cvs-commits at redhat.com  Fri Apr 27 22:42:05 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 18:42:05 -0400
Subject: rpms/kernel/FC-6 linux-2.6.20.10-unoffical.patch, NONE,
	1.1 kernel-2.6.spec, 1.2947, 1.2948
Message-ID: <200704272242.l3RMg562026797@cvs.devel.redhat.com>

Author: cebbert

Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv26747

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6.20.10-unoffical.patch 
Log Message:
* Fri Apr 27 2007 Chuck Ebbert <cebbert at redhat.com>		1.2948
- 2.6.20.10 (from mailing list)


linux-2.6.20.10-unoffical.patch:
 Makefile                |    2 +-
 net/ipv4/fib_frontend.c |    4 ++++
 net/ipv6/exthdrs.c      |    1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6.20.10-unoffical.patch ---
diff --git a/Makefile b/Makefile
index 3e7e6c7..b9ba823 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 20
-EXTRAVERSION = .9
+EXTRAVERSION = .10
 NAME = Homicidal Dwarf Hamster
 
 # *DOCUMENTATION*
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index fa2cb8c..30aae76 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -773,6 +773,10 @@ static void nl_fib_lookup(struct fib_result_nl *frn, struct fib_table *tb )
 							    .tos = frn->fl_tos,
 							    .scope = frn->fl_scope } } };
 
+#ifdef CONFIG_IP_MULTIPLE_TABLES
+	res.r = NULL;
+#endif
+
 	frn->err = -ENOENT;
 	if (tb) {
 		local_bh_disable();
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index 5fd7cf9..de96e1a 100644
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@@ -397,6 +397,7 @@ static int ipv6_rthdr_rcv(struct sk_buff **skbp)
 
 	switch (hdr->type) {
 #ifdef CONFIG_IPV6_MIP6
+	case IPV6_SRCRT_TYPE_2:
 		break;
 #endif
 	case IPV6_SRCRT_TYPE_0:


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2947
retrieving revision 1.2948
diff -u -r1.2947 -r1.2948
--- kernel-2.6.spec	26 Apr 2007 15:04:15 -0000	1.2947
+++ kernel-2.6.spec	27 Apr 2007 22:42:03 -0000	1.2948
@@ -379,16 +379,17 @@
 Patch7: patch-2.6.20.6-7.bz2
 Patch8: patch-2.6.20.7-8.bz2
 Patch9: patch-2.6.20.8-9.bz2
+Patch10: linux-2.6.20.10-unoffical.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 # needed to get utrace patch to apply cleanly
-Patch10: linux-2.6-s390_ptrace_sparse_fixes.patch
-Patch11: linux-2.6-x86_64_ptrace_ck_retval.patch
+Patch50: linux-2.6-s390_ptrace_sparse_fixes.patch
+Patch51: linux-2.6-x86_64_ptrace_ck_retval.patch
 # utrace
-Patch15: linux-2.6-utrace.patch
+Patch55: linux-2.6-utrace.patch
 
 # enable sysrq-c on all kernels, not only kexec
-Patch20: linux-2.6-sysrq-c.patch
+Patch70: linux-2.6-sysrq-c.patch
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -1025,18 +1026,19 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
 # Rolands utrace ptrace replacement.
 # needed to get upstream utrace to apply
-%patch10 -p1
-%patch11 -p1
+%patch50 -p1
+%patch51 -p1
 # utrace
-%patch15 -p1
+%patch55 -p1
 
 # sysrq works always
-%patch20 -p1
+%patch70 -p1
 
 # Architecture patches
 
@@ -2292,6 +2294,9 @@
 %endif
 
 %changelog
+* Fri Apr 27 2007 Chuck Ebbert <cebbert at redhat.com>		1.2948
+- 2.6.20.10 (from mailing list)
+
 * Thu Apr 26 2007 Chuck Ebbert <cebbert at redhat.com>		1.2947
 - 2.6.20.8 (official)
 - 2.6.20.9



From fedora-cvs-commits at redhat.com  Sat Apr 28 03:52:04 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 27 Apr 2007 23:52:04 -0400
Subject: rpms/evolution/devel
	evolution-2.10.1-en_CA-attribution-format.patch, NONE,
	1.1 evolution.spec, 1.249, 1.250
Message-ID: <200704280352.l3S3q4w1011478@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11462

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.10.1-en_CA-attribution-format.patch 
Log Message:

* Fri Apr 27 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-8.fc7
- Add patch for RH bug #236399 (en_CA attribution format).


evolution-2.10.1-en_CA-attribution-format.patch:
 en_CA.po |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE evolution-2.10.1-en_CA-attribution-format.patch ---
--- evolution-2.10.1/po/en_CA.po.en_CA-attribution-format	2007-04-27 22:58:06.000000000 -0400
+++ evolution-2.10.1/po/en_CA.po	2007-04-27 22:58:36.000000000 -0400
@@ -10992,7 +10992,7 @@
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr ""
-"On ${AbbrevWeekdayName}, ${Year}-${Day}-${Month} at ${24Hour}:${Minute} "
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 
 #: ../mail/em-filter-editor.c:155


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- evolution.spec	23 Apr 2007 19:04:01 -0000	1.249
+++ evolution.spec	28 Apr 2007 03:52:02 -0000	1.250
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -170,6 +170,9 @@
 # RH bug #236860 / GNOME bug #407104
 Patch51: evolution-2.10.1-fix-uri-handling.patch
 
+# RH bug #236399 / GNOME bug #434019
+Patch52: evolution-2.10.1-en_CA-attribution-format.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -326,6 +329,7 @@
 %patch49 -p1 -b .fix-help
 %patch50 -p1 -b .saving-attachments
 %patch51 -p1 -b .fix-uri-handling
+%patch52 -p1 -b .en_CA-attribution-format
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -747,6 +751,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Fri Apr 27 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-8.fc7
+- Add patch for RH bug #236399 (en_CA attribution format).
+
 * Mon Apr 23 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-7.fc7
 - Remove the welcome email from evolution at novell.com (bug #179427).
 



From fedora-cvs-commits at redhat.com  Sat Apr 28 13:26:05 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 28 Apr 2007 09:26:05 -0400
Subject: rpms/selinux-policy/devel policy-20070219.patch,1.63,1.64
Message-ID: <200704281326.l3SDQ5XU028363@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28240

Modified Files:
	policy-20070219.patch 
Log Message:
* Fri Apr 27 2007 Dan Walsh <dwalsh at redhat.com> 2.6.1-3
- 


policy-20070219.patch:
 Rules.modular                           |   12 +
 VERSION                                 |    2 
 policy/flask/access_vectors             |    4 
 policy/global_booleans                  |    2 
 policy/global_tunables                  |   15 -
 policy/mls                              |   31 ++-
 policy/modules/admin/acct.te            |    1 
 policy/modules/admin/alsa.fc            |    1 
 policy/modules/admin/amtu.fc            |    3 
 policy/modules/admin/amtu.if            |   53 +++++
 policy/modules/admin/amtu.te            |   57 +++++
 policy/modules/admin/bootloader.te      |    3 
 policy/modules/admin/consoletype.te     |   10 
 policy/modules/admin/dmesg.te           |    1 
 policy/modules/admin/kudzu.te           |    6 
 policy/modules/admin/logrotate.te       |    1 
 policy/modules/admin/logwatch.te        |    6 
 policy/modules/admin/netutils.te        |    6 
 policy/modules/admin/readahead.te       |    6 
 policy/modules/admin/rpm.fc             |    3 
 policy/modules/admin/rpm.if             |   85 ++++++--
 policy/modules/admin/rpm.te             |    2 
 policy/modules/admin/su.if              |   13 -
 policy/modules/admin/sudo.if            |    8 
 policy/modules/admin/usermanage.if      |    2 
 policy/modules/admin/usermanage.te      |   40 +++
 policy/modules/admin/vbetool.te         |    1 
 policy/modules/apps/gnome.if            |   26 ++
 policy/modules/apps/gpg.fc              |    2 
 policy/modules/apps/loadkeys.if         |   44 +---
 policy/modules/apps/mozilla.if          |    1 
 policy/modules/apps/slocate.te          |    5 
 policy/modules/apps/uml.if              |   27 --
 policy/modules/kernel/corecommands.fc   |    5 
 policy/modules/kernel/corecommands.if   |   20 +
 policy/modules/kernel/corenetwork.te.in |   15 +
 policy/modules/kernel/devices.fc        |    1 
 policy/modules/kernel/devices.if        |   36 +++
 policy/modules/kernel/domain.if         |   18 +
 policy/modules/kernel/domain.te         |   46 ++++
 policy/modules/kernel/files.fc          |    1 
 policy/modules/kernel/files.if          |   83 +++++++-
 policy/modules/kernel/filesystem.if     |   39 +++
 policy/modules/kernel/filesystem.te     |   19 +
 policy/modules/kernel/kernel.if         |   42 +++-
 policy/modules/kernel/kernel.te         |    3 
 policy/modules/kernel/mls.if            |   20 +
 policy/modules/kernel/mls.te            |    3 
 policy/modules/kernel/selinux.if        |   38 +++
 policy/modules/kernel/storage.if        |    2 
 policy/modules/kernel/terminal.if       |   21 +-
 policy/modules/kernel/terminal.te       |    1 
 policy/modules/services/aide.fc         |    1 
 policy/modules/services/aide.te         |    4 
 policy/modules/services/amavis.if       |   19 +
 policy/modules/services/amavis.te       |    3 
 policy/modules/services/apache.fc       |   14 -
 policy/modules/services/apache.if       |  171 +++++++++++++++-
 policy/modules/services/apache.te       |   79 +++++++
 policy/modules/services/apcupsd.fc      |    9 
 policy/modules/services/apcupsd.if      |  108 ++++++++++
 policy/modules/services/apcupsd.te      |   92 ++++++++
 policy/modules/services/automount.te    |    2 
 policy/modules/services/avahi.if        |   19 +
 policy/modules/services/avahi.te        |    4 
 policy/modules/services/bind.te         |    1 
 policy/modules/services/bluetooth.te    |    2 
 policy/modules/services/clamav.te       |    1 
 policy/modules/services/clockspeed.if   |    2 
 policy/modules/services/consolekit.te   |   33 ++-
 policy/modules/services/cron.fc         |    1 
 policy/modules/services/cron.if         |   33 +--
 policy/modules/services/cron.te         |   48 +++-
 policy/modules/services/cups.te         |   13 +
 policy/modules/services/cvs.te          |    1 
 policy/modules/services/cyrus.te        |    1 
 policy/modules/services/dbus.if         |   66 ++++++
 policy/modules/services/dbus.te         |    7 
 policy/modules/services/dhcp.te         |    2 
 policy/modules/services/djbdns.te       |    5 
 policy/modules/services/dovecot.fc      |    2 
 policy/modules/services/dovecot.if      |   40 +++
 policy/modules/services/dovecot.te      |   59 +++++
 policy/modules/services/ftp.te          |    5 
 policy/modules/services/hal.fc          |    8 
 policy/modules/services/hal.if          |   77 +++++++
 policy/modules/services/hal.te          |  151 ++++++++++++++
 policy/modules/services/inetd.te        |    5 
 policy/modules/services/kerberos.if     |   79 ++-----
 policy/modules/services/kerberos.te     |   34 +++
 policy/modules/services/mailman.if      |   19 +
 policy/modules/services/mta.if          |   19 +
 policy/modules/services/mta.te          |    2 
 policy/modules/services/nis.if          |    4 
 policy/modules/services/nis.te          |    4 
 policy/modules/services/nscd.te         |   15 +
 policy/modules/services/ntp.te          |    4 
 policy/modules/services/oddjob.te       |    2 
 policy/modules/services/pegasus.if      |   18 +
 policy/modules/services/pegasus.te      |    9 
 policy/modules/services/postfix.if      |   20 +
 policy/modules/services/postfix.te      |   29 ++
 policy/modules/services/ppp.te          |    2 
 policy/modules/services/procmail.te     |    7 
 policy/modules/services/pyzor.te        |    7 
 policy/modules/services/radius.te       |    4 
 policy/modules/services/rlogin.te       |    1 
 policy/modules/services/rpc.if          |    5 
 policy/modules/services/rpc.te          |    2 
 policy/modules/services/rpcbind.fc      |    6 
 policy/modules/services/rpcbind.if      |  104 ++++++++++
 policy/modules/services/rpcbind.te      |   83 ++++++++
 policy/modules/services/rsync.te        |    1 
 policy/modules/services/rwho.fc         |    3 
 policy/modules/services/rwho.if         |   84 ++++++++
 policy/modules/services/rwho.te         |   61 +++++
 policy/modules/services/samba.fc        |    3 
 policy/modules/services/samba.if        |   86 ++++++++
 policy/modules/services/samba.te        |   89 ++++++++
 policy/modules/services/sasl.te         |    1 
 policy/modules/services/sendmail.if     |   22 ++
 policy/modules/services/smartmon.te     |    1 
 policy/modules/services/snmp.te         |   15 +
 policy/modules/services/spamassassin.te |   12 -
 policy/modules/services/squid.fc        |    2 
 policy/modules/services/squid.if        |   22 ++
 policy/modules/services/squid.te        |   12 +
 policy/modules/services/ssh.if          |   39 +++
 policy/modules/services/ssh.te          |    9 
 policy/modules/services/w3c.fc          |    2 
 policy/modules/services/w3c.if          |    1 
 policy/modules/services/w3c.te          |   14 +
 policy/modules/system/application.fc    |    1 
 policy/modules/system/application.if    |  104 ++++++++++
 policy/modules/system/application.te    |   14 +
 policy/modules/system/authlogin.fc      |    1 
 policy/modules/system/authlogin.if      |  183 +++++++++++++++--
 policy/modules/system/authlogin.te      |   36 +++
 policy/modules/system/clock.te          |    3 
 policy/modules/system/fstools.fc        |    1 
 policy/modules/system/fstools.te        |    1 
 policy/modules/system/fusermount.fc     |    6 
 policy/modules/system/fusermount.if     |   41 +++
 policy/modules/system/fusermount.te     |   50 ++++
 policy/modules/system/getty.te          |    3 
 policy/modules/system/hostname.te       |   14 +
 policy/modules/system/init.if           |   42 ++++
 policy/modules/system/init.te           |   39 +++
 policy/modules/system/ipsec.if          |   20 +
 policy/modules/system/ipsec.te          |    1 
 policy/modules/system/iptables.te       |    5 
 policy/modules/system/libraries.fc      |    5 
 policy/modules/system/libraries.te      |    4 
 policy/modules/system/locallogin.te     |   12 +
 policy/modules/system/logging.if        |  141 +++++++++++++
 policy/modules/system/logging.te        |   23 +-
 policy/modules/system/lvm.fc            |    1 
 policy/modules/system/lvm.te            |    8 
 policy/modules/system/modutils.te       |    7 
 policy/modules/system/mount.fc          |    3 
 policy/modules/system/mount.if          |   37 +++
 policy/modules/system/mount.te          |   70 ++++++
 policy/modules/system/raid.te           |    1 
 policy/modules/system/selinuxutil.fc    |    1 
 policy/modules/system/selinuxutil.if    |    6 
 policy/modules/system/selinuxutil.te    |   76 ++++---
 policy/modules/system/sysnetwork.te     |    3 
 policy/modules/system/udev.te           |   12 +
 policy/modules/system/unconfined.fc     |    1 
 policy/modules/system/unconfined.if     |   15 -
 policy/modules/system/unconfined.te     |   24 ++
 policy/modules/system/userdomain.if     |  329 +++++++++++++++++++-------------
 policy/modules/system/userdomain.te     |   81 +++++--
 policy/modules/system/xen.te            |   35 +++
 policy/support/misc_patterns.spt        |    5 
 policy/support/obj_perm_sets.spt        |   12 +
 176 files changed, 3882 insertions(+), 533 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.63 -r 1.64 policy-20070219.patch
Index: policy-20070219.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070219.patch,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- policy-20070219.patch	27 Apr 2007 17:23:49 -0000	1.63
+++ policy-20070219.patch	28 Apr 2007 13:26:02 -0000	1.64
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.6.1/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2007-02-26 09:43:33.000000000 -0500
-+++ serefpolicy-2.6.1/policy/flask/access_vectors	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/flask/access_vectors	2007-04-27 16:34:57.000000000 -0400
 @@ -598,6 +598,8 @@
  	shmempwd
  	shmemgrp
@@ -21,7 +21,7 @@
  class key
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.6.1/policy/global_booleans
 --- nsaserefpolicy/policy/global_booleans	2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-2.6.1/policy/global_booleans	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/global_booleans	2007-04-27 16:34:57.000000000 -0400
 @@ -4,7 +4,6 @@
  # file should be used.
  #
@@ -40,7 +40,7 @@
  ## <p>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.6.1/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2007-03-26 16:24:14.000000000 -0400
-+++ serefpolicy-2.6.1/policy/global_tunables	2007-04-25 10:03:25.000000000 -0400
++++ serefpolicy-2.6.1/policy/global_tunables	2007-04-27 16:34:57.000000000 -0400
 @@ -102,12 +102,6 @@
  ## </desc>
  gen_tunable(use_samba_home_dirs,false)
@@ -69,7 +69,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.6.1/policy/mls
 --- nsaserefpolicy/policy/mls	2007-03-09 13:02:20.000000000 -0500
-+++ serefpolicy-2.6.1/policy/mls	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/mls	2007-04-27 16:34:57.000000000 -0400
 @@ -89,12 +89,14 @@
  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
@@ -143,7 +143,7 @@
  mlsconstrain association { polmatch }
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.6.1/policy/modules/admin/acct.te
 --- nsaserefpolicy/policy/modules/admin/acct.te	2007-03-26 10:39:08.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/admin/acct.te	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/acct.te	2007-04-27 16:34:57.000000000 -0400
 @@ -9,6 +9,7 @@
  type acct_t;
  type acct_exec_t;
@@ -154,7 +154,7 @@
  logging_log_file(acct_data_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.fc serefpolicy-2.6.1/policy/modules/admin/alsa.fc
 --- nsaserefpolicy/policy/modules/admin/alsa.fc	2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-2.6.1/policy/modules/admin/alsa.fc	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/alsa.fc	2007-04-27 16:34:57.000000000 -0400
 @@ -1,4 +1,5 @@
  
  /etc/alsa/pcm(/.*)?		gen_context(system_u:object_r:alsa_etc_rw_t,s0)
@@ -163,14 +163,14 @@
  /usr/bin/ainit 		--	gen_context(system_u:object_r:alsa_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.fc serefpolicy-2.6.1/policy/modules/admin/amtu.fc
 --- nsaserefpolicy/policy/modules/admin/amtu.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.1/policy/modules/admin/amtu.fc	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/amtu.fc	2007-04-27 16:34:57.000000000 -0400
 @@ -0,0 +1,3 @@
 +
 +/usr/bin/amtu    --    gen_context(system_u:object_r:amtu_exec_t,s0)
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.if serefpolicy-2.6.1/policy/modules/admin/amtu.if
 --- nsaserefpolicy/policy/modules/admin/amtu.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.1/policy/modules/admin/amtu.if	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/amtu.if	2007-04-27 16:34:57.000000000 -0400
 @@ -0,0 +1,53 @@
 +## <summary>
 +##	abstract Machine Test Utility 
@@ -227,8 +227,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.te serefpolicy-2.6.1/policy/modules/admin/amtu.te
 --- nsaserefpolicy/policy/modules/admin/amtu.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.6.1/policy/modules/admin/amtu.te	2007-04-23 13:12:09.000000000 -0400
-@@ -0,0 +1,56 @@
++++ serefpolicy-2.6.1/policy/modules/admin/amtu.te	2007-04-27 16:55:38.000000000 -0400
+@@ -0,0 +1,57 @@
 +policy_module(amtu,1.0.23)
 +
 +########################################
@@ -247,8 +247,7 @@
 +#
 +
 +# Specific allow rules required for amtu
-+allow amtu_t self:capability { audit_write net_raw };
-+allow amtu_t self:netlink_audit_socket { create nlmsg_relay read write };
++allow amtu_t self:capability net_raw;
 +allow amtu_t self:packet_socket { bind create read write };
 +allow amtu_t self:udp_socket { create ioctl };
 +
@@ -261,6 +260,8 @@
 +libs_use_ld_so(amtu_t)
 +libs_use_shared_libs(amtu_t)
 +
++logging_send_audit_msg(amtu_t)
++
 +optional_policy(`
 +    seutil_use_newrole_fds(amtu_t)
 +');
@@ -287,7 +288,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.6.1/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/admin/bootloader.te	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/bootloader.te	2007-04-27 16:34:57.000000000 -0400
 @@ -65,6 +65,8 @@
  files_tmp_filetrans(bootloader_t,bootloader_tmp_t,{ dir file lnk_file chr_file blk_file })
  # for tune2fs (cjp: ?)
@@ -307,7 +308,7 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.6.1/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/admin/consoletype.te	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/consoletype.te	2007-04-27 16:34:57.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -341,7 +342,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-2.6.1/policy/modules/admin/dmesg.te
 --- nsaserefpolicy/policy/modules/admin/dmesg.te	2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-2.6.1/policy/modules/admin/dmesg.te	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/dmesg.te	2007-04-27 16:34:57.000000000 -0400
 @@ -10,6 +10,7 @@
  	type dmesg_t;
  	type dmesg_exec_t;
@@ -352,7 +353,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.6.1/policy/modules/admin/kudzu.te
 --- nsaserefpolicy/policy/modules/admin/kudzu.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/admin/kudzu.te	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/kudzu.te	2007-04-27 16:34:57.000000000 -0400
 @@ -21,8 +21,8 @@
  # Local policy
  #
@@ -375,7 +376,7 @@
  init_telinit(kudzu_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-2.6.1/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2007-03-26 10:39:08.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/admin/logrotate.te	2007-04-23 15:49:39.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/logrotate.te	2007-04-27 16:34:57.000000000 -0400
 @@ -75,6 +75,7 @@
  mls_file_read_up(logrotate_t)
  mls_file_write_down(logrotate_t)
@@ -386,7 +387,7 @@
  selinux_get_enforce_mode(logrotate_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.6.1/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/admin/logwatch.te	2007-04-25 19:20:38.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/logwatch.te	2007-04-27 16:34:57.000000000 -0400
 @@ -63,6 +63,8 @@
  files_search_mnt(logwatch_t)
  files_dontaudit_search_home(logwatch_t)
@@ -409,7 +410,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.6.1/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/admin/netutils.te	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/netutils.te	2007-04-27 16:34:57.000000000 -0400
 @@ -31,6 +31,7 @@
  type traceroute_t;
  type traceroute_exec_t;
@@ -446,7 +447,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.6.1/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2007-01-02 12:57:51.000000000 -0500
-+++ serefpolicy-2.6.1/policy/modules/admin/readahead.te	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/readahead.te	2007-04-27 16:34:57.000000000 -0400
 @@ -36,7 +36,7 @@
  dev_dontaudit_read_all_blk_files(readahead_t)
  dev_dontaudit_getattr_memory_dev(readahead_t)
@@ -466,7 +467,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.6.1/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-11-16 17:15:26.000000000 -0500
-+++ serefpolicy-2.6.1/policy/modules/admin/rpm.fc	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/rpm.fc	2007-04-27 16:34:57.000000000 -0400
 @@ -21,6 +21,9 @@
  /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)
@@ -479,7 +480,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.6.1/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2007-04-11 10:19:43.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/admin/rpm.if	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/admin/rpm.if	2007-04-27 16:34:57.000000000 -0400
 @@ -211,26 +211,6 @@
  
  ########################################
@@ -578,7 +579,7 @@
 +
[...2514 lines suppressed...]
  ## <rolecap/>
  #
  template(`userdom_role_change_from_staff',`
@@ -7073,7 +7728,7 @@
  ')
  
  ########################################
-@@ -1475,11 +1494,7 @@
+@@ -1475,11 +1492,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_sysadm',`
@@ -7086,7 +7741,7 @@
  ')
  
  ########################################
-@@ -1506,11 +1521,7 @@
+@@ -1506,11 +1519,7 @@
  ## <rolecap/>
  #
  template(`userdom_role_change_from_sysadm',`
@@ -7099,7 +7754,7 @@
  ')
  
  ########################################
-@@ -1698,13 +1709,11 @@
+@@ -1698,13 +1707,11 @@
  ## </param>
  #
  template(`userdom_setattr_user_ptys',`
@@ -7117,7 +7772,7 @@
  ')
  
  ########################################
-@@ -1733,13 +1742,11 @@
+@@ -1733,13 +1740,11 @@
  ## </param>
  #
  template(`userdom_create_user_pty',`
@@ -7135,7 +7790,7 @@
  ')
  
  ########################################
-@@ -3624,13 +3631,12 @@
+@@ -3624,13 +3629,12 @@
  template(`userdom_setattr_user_ttys',`
  	ifdef(`targeted_policy',`
  		term_setattr_unallocated_ttys($2)
@@ -7154,7 +7809,7 @@
  ')
  
  ########################################
-@@ -3661,13 +3667,12 @@
+@@ -3661,13 +3665,12 @@
  template(`userdom_use_user_ttys',`
  	ifdef(`targeted_policy',`
  		term_use_unallocated_ttys($2)
@@ -7173,7 +7828,7 @@
  ')
  
  ########################################
-@@ -3696,18 +3701,13 @@
+@@ -3696,18 +3699,13 @@
  ## </param>
  #
  template(`userdom_use_user_terminals',`
@@ -7198,7 +7853,7 @@
  ')
  
  ########################################
-@@ -5353,14 +5353,13 @@
+@@ -5353,14 +5351,13 @@
  interface(`userdom_use_unpriv_users_ptys',`
  	ifdef(`targeted_policy',`
  		term_use_generic_ptys($1)
@@ -7219,7 +7874,7 @@
  ')
  
  ########################################
-@@ -5377,13 +5376,13 @@
+@@ -5377,13 +5374,13 @@
  interface(`userdom_dontaudit_use_unpriv_users_ptys',`
  	ifdef(`targeted_policy',`
  		term_dontaudit_use_generic_ptys($1)
@@ -7238,7 +7893,7 @@
  ')
  
  ########################################
-@@ -5436,13 +5435,12 @@
+@@ -5436,13 +5433,12 @@
  interface(`userdom_list_unpriv_users_tmp',`
  	ifdef(`targeted_policy',`
  		files_list_tmp($1)
@@ -7257,7 +7912,7 @@
  ')
  
  ########################################
-@@ -5458,13 +5456,12 @@
+@@ -5458,13 +5454,12 @@
  interface(`userdom_read_unpriv_users_tmp_files',`
  	ifdef(`targeted_policy',`
  		files_read_generic_tmp_files($1)
@@ -7276,7 +7931,7 @@
  ')
  
  ########################################
-@@ -5480,13 +5477,12 @@
+@@ -5480,13 +5475,12 @@
  interface(`userdom_read_unpriv_users_tmp_symlinks',`
  	ifdef(`targeted_policy',`
  		files_read_generic_tmp_symlinks($1)
@@ -7295,7 +7950,7 @@
  ')
  
  ########################################
-@@ -5520,13 +5516,12 @@
+@@ -5520,13 +5514,12 @@
  interface(`userdom_use_unpriv_users_ttys',`
  	ifdef(`targeted_policy',`
  		term_use_unallocated_ttys($1)
@@ -7314,7 +7969,7 @@
  ')
  
  ########################################
-@@ -5543,13 +5538,12 @@
+@@ -5543,13 +5536,12 @@
  interface(`userdom_dontaudit_use_unpriv_users_ttys',`
  	ifdef(`targeted_policy',`
  		term_dontaudit_use_unallocated_ttys($1)
@@ -7333,7 +7988,7 @@
  ')
  
  ########################################
-@@ -5721,3 +5715,92 @@
+@@ -5721,3 +5713,92 @@
  	allow $1 user_home_dir_t:dir manage_dir_perms;
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
@@ -7428,7 +8083,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.6.1/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/system/userdomain.te	2007-04-27 11:10:52.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/system/userdomain.te	2007-04-27 16:34:57.000000000 -0400
 @@ -15,7 +15,6 @@
  # Declarations
  #
@@ -7607,7 +8262,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.6.1/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/policy/modules/system/xen.te	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/modules/system/xen.te	2007-04-27 16:34:57.000000000 -0400
 @@ -25,6 +25,10 @@
  domain_type(xend_t)
  init_daemon_domain(xend_t, xend_exec_t)
@@ -7690,9 +8345,24 @@
 +fs_read_nfs_files(xend_t)
 +fs_getattr_all_fs(xend_t)
 +fs_read_dos_files(xend_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/misc_patterns.spt serefpolicy-2.6.1/policy/support/misc_patterns.spt
+--- nsaserefpolicy/policy/support/misc_patterns.spt	2007-01-02 12:57:51.000000000 -0500
++++ serefpolicy-2.6.1/policy/support/misc_patterns.spt	2007-04-27 17:27:40.000000000 -0400
+@@ -41,11 +41,6 @@
+ #
+ # Other process permissions
+ #
+-define(`send_audit_msgs_pattern',`
+-	allow $1 self:capability audit_write;
+-	allow $1 self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
+-')
+-
+ define(`ps_process_pattern',`
+ 	allow $1 $2:dir { search getattr read };
+ 	allow $1 $2:{ file lnk_file } { read getattr };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-2.6.1/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2007-01-02 12:57:51.000000000 -0500
-+++ serefpolicy-2.6.1/policy/support/obj_perm_sets.spt	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/policy/support/obj_perm_sets.spt	2007-04-27 16:34:57.000000000 -0400
 @@ -215,7 +215,7 @@
  define(`getattr_file_perms',`{ getattr }')
  define(`setattr_file_perms',`{ setattr }')
@@ -7718,7 +8388,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.6.1/Rules.modular
 --- nsaserefpolicy/Rules.modular	2007-03-22 14:30:10.000000000 -0400
-+++ serefpolicy-2.6.1/Rules.modular	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/Rules.modular	2007-04-27 16:34:57.000000000 -0400
 @@ -167,7 +167,7 @@
  # these have to run individually because order matters:
  	$(verbose) $(GREP) '^sid ' $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true
@@ -7747,7 +8417,7 @@
  clean:
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/VERSION serefpolicy-2.6.1/VERSION
 --- nsaserefpolicy/VERSION	2007-04-23 09:36:02.000000000 -0400
-+++ serefpolicy-2.6.1/VERSION	2007-04-23 13:12:09.000000000 -0400
++++ serefpolicy-2.6.1/VERSION	2007-04-27 16:34:57.000000000 -0400
 @@ -1 +1 @@
 -20070417
 +20061212



From fedora-cvs-commits at redhat.com  Sat Apr 28 21:50:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 28 Apr 2007 17:50:50 -0400
Subject: rpms/gdb/devel gdb-6.6-bz238285-gcore-strings-overflow.patch, NONE,
	1.1 gdb-6.6-upstream.patch, 1.4, 1.5 gdb.spec, 1.230,
	1.231 gdb-6.6-bz235753-gcore-strings-overflow.patch, 1.1, NONE
Message-ID: <200704282150.l3SLooHF028515@cvs.devel.redhat.com>

Author: jkratoch

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28494

Modified Files:
	gdb-6.6-upstream.patch gdb.spec 
Added Files:
	gdb-6.6-bz238285-gcore-strings-overflow.patch 
Removed Files:
	gdb-6.6-bz235753-gcore-strings-overflow.patch 
Log Message:
* Sat Apr 28 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-14
- Fixup for the PPC Power6/DFP instructions disassembly (BZ 230000).
- New testcase for the GCORE buffer overflow (for BZ 238285, formerly 235753).
- Related: rhbz#230000 rhbz#238285 rhbz#235753


gdb-6.6-bz238285-gcore-strings-overflow.patch:
 ./gdb/testsuite/gdb.base/gcore-buffer-overflow.c   |   27 ++++++++
 ./gdb/testsuite/gdb.base/gcore-buffer-overflow.exp |   70 +++++++++++++++++++++
 gdb-6.6/gdb/linux-nat.c                            |   13 +++
 3 files changed, 107 insertions(+), 3 deletions(-)

--- NEW FILE gdb-6.6-bz238285-gcore-strings-overflow.patch ---
Failing on _FORTIFY_SOURCE=2 for `gdb.base/corefile.exp'.


--- gdb-6.6/gdb/linux-nat.c-orig	2007-04-08 21:12:38.000000000 +0200
+++ gdb-6.6/gdb/linux-nat.c	2007-04-09 20:05:43.000000000 +0200
@@ -2838,7 +2838,9 @@ linux_nat_make_corefile_notes (bfd *obfd
 {
   struct linux_nat_corefile_thread_data thread_args;
   struct cleanup *old_chain;
+  /* Length must be >= sizeof (prpsinfo_t.pr_fname).  */
   char fname[16] = { '\0' };
+  /* Length must be >= sizeof (prpsinfo_t.pr_psargs).  */
   char psargs[80] = { '\0' };
   char *note_data = NULL;
   ptid_t current_ptid = inferior_ptid;
@@ -2851,9 +2853,14 @@ linux_nat_make_corefile_notes (bfd *obfd
       strncpy (psargs, get_exec_file (0), sizeof (psargs));
       if (get_inferior_args ())
 	{
-	  strncat (psargs, " ", sizeof (psargs) - strlen (psargs));
-	  strncat (psargs, get_inferior_args (),
-		   sizeof (psargs) - strlen (psargs));
+	  /* linux_elfcore_write_prpsinfo () handles zero non-terminated
+	     strings right if they provide enough characters for its purposes.
+	     Handle to fully filled (=> zero non-terminated) strings here.  */
+	  if (memchr (psargs, 0, sizeof (psargs)) != NULL)
+	    strncat (psargs, " ", sizeof (psargs) - strlen (psargs) - 1);
+	  if (memchr (psargs, 0, sizeof (psargs)) != NULL)
+	    strncat (psargs, get_inferior_args (),
+		     sizeof (psargs) - strlen (psargs) - 1);
 	}
       note_data = (char *) linux_elfcore_write_prpsinfo (obfd, note_data,
 							 note_size, fname,


2007-04-28  Jan Kratochvil  <jan.kratochvil at redhat.com>

	* gdb.base/gcore-buffer-overflow.c, gdb.base/gcore-buffer-overflow.exp:
	New files.

Index: ./gdb/testsuite/gdb.base/gcore-buffer-overflow.c
===================================================================
RCS file: gdb/testsuite/gdb.base/gcore-buffer-overflow.c
diff -N gdb/testsuite/gdb.base/gcore-buffer-overflow.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ./gdb/testsuite/gdb.base/gcore-buffer-overflow.c	28 Apr 2007 18:48:15 -0000
@@ -0,0 +1,27 @@
+/* Copyright 2007 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   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.  */
+
+/*
+ * Test GDB's internal buffers safety for the GCORE command.
+ */
+
+int main (void)
+{
+  return 0;
+}
Index: ./gdb/testsuite/gdb.base/gcore-buffer-overflow.exp
===================================================================
RCS file: gdb/testsuite/gdb.base/gcore-buffer-overflow.exp
diff -N gdb/testsuite/gdb.base/gcore-buffer-overflow.exp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ./gdb/testsuite/gdb.base/gcore-buffer-overflow.exp	28 Apr 2007 18:48:15 -0000
@@ -0,0 +1,70 @@
+# Copyright 2007 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.  
+
+# Please email any bugs, comments, and/or additions to this file to:
+# bug-gdb at prep.ai.mit.edu
+
+# Test GDB's internal buffers safety for the GCORE command.
+
+if $tracelevel then {
+	strace $tracelevel
+}
+
+set prms_id 0
+set bug_id 0
+
+set testfile "gcore-buffer-overflow"
+set srcfile  ${testfile}.c
+# The ${binfile} basename needs to exceed 80 characters (`sizeof (psargs)')
+# plus some additional data to overwrite the stack frame.
+set pattern  01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
+set binfile  ${objdir}/${subdir}/${testfile}-${pattern}
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
+     untested gcore.exp
+     return -1
+}
+
+# Start with a fresh gdb.
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+
+gdb_test "set args ${pattern}"	\
+         ""			\
+         "Set buffer exceeding arguments"
+
+if { ! [ runto_main ] } then {
+    untested gcore-buffer-overflow.exp
+    return -1
+}
+
+set escapedfilename [string_to_regexp ${objdir}/${subdir}/gcore-buffer-overflow.test]
+
+set test "save a corefile"
+gdb_test_multiple "gcore ${objdir}/${subdir}/gcore-buffer-overflow.test" $test {
+    -re "Saved corefile ${escapedfilename}\[\r\n\]+$gdb_prompt $" {
+	pass $test
+    }
+    -re "Can't create a corefile\[\r\n\]+$gdb_prompt $" {
+	unsupported $test
+    }
+    eof {
+	fail $test
+    }
+}

gdb-6.6-upstream.patch:
 ./gdb/NEWS                             |    3 +
 ./gdb/arch-utils.c                     |    2 
 ./gdb/c-valprint.c                     |    2 
 ./gdb/config/nm-linux.h                |    5 --
 ./gdb/doc/gdb.texinfo                  |   20 +++++++++
 ./gdb/dwarf2loc.h                      |    4 -
 ./gdb/frame.c                          |   13 ++++--
 ./gdb/ia64-tdep.c                      |   11 ++---
 ./gdb/linux-nat.c                      |   38 ++++++++++++-----
 ./gdb/linux-nat.h                      |    2 
 ./gdb/rs6000-tdep.c                    |    3 +
 ./gdb/testsuite/gdb.arch/i386-sse.exp  |    5 +-
 ./gdb/testsuite/gdb.base/charsign.c    |   37 +++++++++++++++++
 ./gdb/testsuite/gdb.base/charsign.exp  |   70 +++++++++++++++++++++++++++++++++
 ./gdb/testsuite/gdb.base/printcmds.exp |   12 ++---
 ./gdb/testsuite/gdb.base/setvar.exp    |    8 +--
 ./opcodes/ppc-opc.c                    |   68 ++++++++++++++------------------
 linux-thread-db.c                      |   19 +++-----
 18 files changed, 235 insertions(+), 87 deletions(-)

Index: gdb-6.6-upstream.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.6-upstream.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gdb-6.6-upstream.patch	15 Mar 2007 08:37:13 -0000	1.4
+++ gdb-6.6-upstream.patch	28 Apr 2007 21:50:42 -0000	1.5
@@ -552,3 +552,189 @@
  
    /* The objfile containing the symbol whose location we're computing.  */
    /* Used (only???) by thread local variables.  The objfile in which
+
+
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=230000
+
+
+Fixes embarrassing errors in the ppc dfp instructions committed some
+time ago.  IBM numbers bits in architecture manuals starting from zero
+in the most signifigant bit.  Fields are marked by numbering their
+most signifigant bit too.  This means some translating is required when
+filling out new powerpc_operand entries.  You can't just plug IBM
+numbers into the shift counts.  Also, Z_MASK is too big for
+instructions that take RMC operands.
+
+	* ppc-opc.c (DCM, DGM, TE, RMC, R, SP, S): Correct shift.
+	(Z2_MASK): Define.
+	(powerpc_opcodes): Use Z2_MASK in all insns taking RMC operand.
+
+--- ./opcodes/ppc-opc.c	19 Apr 2007 01:39:31 -0000	1.91
++++ ./opcodes/ppc-opc.c	20 Apr 2007 09:52:09 -0000
+@@ -530,8 +530,9 @@ const struct powerpc_operand powerpc_ope
+ #define SIMM VD + 1
+   { 5, 16, NULL, NULL, PPC_OPERAND_SIGNED},
+ 
+-  /* The UIMM field in a VX form instruction.  */
++  /* The UIMM field in a VX form instruction, and TE in Z form.  */
+ #define UIMM SIMM + 1
++#define TE UIMM
+   { 5, 16, NULL, NULL, 0 },
+ 
+   /* The SHB field in a VA form instruction.  */
+@@ -564,31 +565,23 @@ const struct powerpc_operand powerpc_ope
+ #define A_L MTMSRD_L
+   { 1, 16, NULL, NULL, PPC_OPERAND_OPTIONAL },
+ 
+-  /* The DCM field in a Z form instruction.  */
+-#define DCM MTMSRD_L + 1
+-  { 6, 16, NULL, NULL, 0 },
+-
+-  /* Likewise, the DGM field in a Z form instruction.  */
+-#define DGM DCM + 1
+-  { 6, 16, NULL, NULL, 0 },
+-
+-#define TE DGM + 1
+-  { 5, 11, NULL, NULL, 0 },
+-
+-#define RMC TE + 1
+-  { 2, 21, NULL, NULL, 0 },
++#define RMC A_L + 1
++  { 2, 9, NULL, NULL, 0 },
+ 
+ #define R RMC + 1
+-  { 1, 15, NULL, NULL, 0 },
++  { 1, 16, NULL, NULL, 0 },
+ 
+ #define SP R + 1
+-  { 2, 11, NULL, NULL, 0 },
++  { 2, 19, NULL, NULL, 0 },
+ 
+ #define S SP + 1
+-  { 1, 11, NULL, NULL, 0 },
++  { 1, 20, NULL, NULL, 0 },
+ 
+   /* SH field starting at bit position 16.  */
+ #define SH16 S + 1
++  /* The DCM and DGM fields in a Z form instruction.  */
++#define DCM SH16
++#define DGM DCM
+   { 6, 10, NULL, NULL, 0 },
+ 
+   /* The L field in an X form with the RT field fixed instruction.  */
+@@ -1683,6 +1676,7 @@ extract_tbr (unsigned long insn,
+ 
+ /* The mask for a Z form instruction.  */
+ #define Z_MASK ZRC (0x3f, 0x1ff, 1)
++#define Z2_MASK ZRC (0x3f, 0xff, 1)
+ 
+ /* An X_MASK with the RA field fixed.  */
+ #define XRA_MASK (X_MASK | RA_MASK)
+@@ -4639,8 +4633,8 @@ const struct powerpc_opcode powerpc_opco
+ { "dadd",    XRC(59,2,0), X_MASK,	POWER6,		{ FRT, FRA, FRB } },
+ { "dadd.",   XRC(59,2,1), X_MASK,	POWER6,		{ FRT, FRA, FRB } },
+ 
+-{ "dqua",    ZRC(59,3,0), Z_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },
+-{ "dqua.",   ZRC(59,3,1), Z_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },
++{ "dqua",    ZRC(59,3,0), Z2_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },
++{ "dqua.",   ZRC(59,3,1), Z2_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },
+ 
+ { "fdivs",   A(59,18,0), AFRC_MASK,	PPC,		{ FRT, FRA, FRB } },
+ { "fdivs.",  A(59,18,1), AFRC_MASK,	PPC,		{ FRT, FRA, FRB } },
+@@ -4678,20 +4672,20 @@ const struct powerpc_opcode powerpc_opco
+ { "dmul",    XRC(59,34,0), X_MASK,	POWER6,		{ FRT, FRA, FRB } },
+ { "dmul.",   XRC(59,34,1), X_MASK,	POWER6,		{ FRT, FRA, FRB } },
+ 
+-{ "drrnd",   ZRC(59,35,0), Z_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },
+-{ "drrnd.",  ZRC(59,35,1), Z_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },
++{ "drrnd",   ZRC(59,35,0), Z2_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },
++{ "drrnd.",  ZRC(59,35,1), Z2_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },
+ 
+ { "dscli",   ZRC(59,66,0), Z_MASK,	POWER6,		{ FRT, FRA, SH16 } },
+ { "dscli.",  ZRC(59,66,1), Z_MASK,	POWER6,		{ FRT, FRA, SH16 } },
+ 
+-{ "dquai",   ZRC(59,67,0), Z_MASK,	POWER6,		{ TE,  FRT, FRB, RMC } },
+-{ "dquai.",  ZRC(59,67,1), Z_MASK,	POWER6,		{ TE,  FRT, FRB, RMC } },
++{ "dquai",   ZRC(59,67,0), Z2_MASK,	POWER6,		{ TE,  FRT, FRB, RMC } },
++{ "dquai.",  ZRC(59,67,1), Z2_MASK,	POWER6,		{ TE,  FRT, FRB, RMC } },
+ 
+ { "dscri",   ZRC(59,98,0), Z_MASK,	POWER6,		{ FRT, FRA, SH16 } },
+ { "dscri.",  ZRC(59,98,1), Z_MASK,	POWER6,		{ FRT, FRA, SH16 } },
+ 
+-{ "drintx",  ZRC(59,99,0), Z_MASK,	POWER6,		{ R, FRT, FRB, RMC } },
+-{ "drintx.", ZRC(59,99,1), Z_MASK,	POWER6,		{ R, FRT, FRB, RMC } },
++{ "drintx",  ZRC(59,99,0), Z2_MASK,	POWER6,		{ R, FRT, FRB, RMC } },
++{ "drintx.", ZRC(59,99,1), Z2_MASK,	POWER6,		{ R, FRT, FRB, RMC } },
+ 
+ { "dcmpo",   X(59,130),	   X_MASK,	POWER6,		{ BF,  FRA, FRB } },
+ 
+@@ -4699,8 +4693,8 @@ const struct powerpc_opcode powerpc_opco
+ { "dtstdc",  Z(59,194),	   Z_MASK,	POWER6,		{ BF,  FRA, DCM } },
+ { "dtstdg",  Z(59,226),	   Z_MASK,	POWER6,		{ BF,  FRA, DGM } },
+ 
+-{ "drintn",  ZRC(59,227,0), Z_MASK,	POWER6,		{ R, FRT, FRB, RMC } },
+-{ "drintn.", ZRC(59,227,1), Z_MASK,	POWER6,		{ R, FRT, FRB, RMC } },
++{ "drintn",  ZRC(59,227,0), Z2_MASK,	POWER6,		{ R, FRT, FRB, RMC } },
++{ "drintn.", ZRC(59,227,1), Z2_MASK,	POWER6,		{ R, FRT, FRB, RMC } },
+ 
+ { "dctdp",   XRC(59,258,0), X_MASK,	POWER6,		{ FRT, FRB } },
+ { "dctdp.",  XRC(59,258,1), X_MASK,	POWER6,		{ FRT, FRB } },
+@@ -4766,8 +4760,8 @@ const struct powerpc_opcode powerpc_opco
+ { "daddq",   XRC(63,2,0), X_MASK,	POWER6,		{ FRT, FRA, FRB } },
+ { "daddq.",  XRC(63,2,1), X_MASK,	POWER6,		{ FRT, FRA, FRB } },
+ 
+-{ "dquaq",   ZRC(63,3,0), Z_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },
+-{ "dquaq.",  ZRC(63,3,1), Z_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },
++{ "dquaq",   ZRC(63,3,0), Z2_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },
++{ "dquaq.",  ZRC(63,3,1), Z2_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },
+ 
+ { "fcpsgn",  XRC(63,8,0), X_MASK,	POWER6,		{ FRT, FRA, FRB } },
+ { "fcpsgn.", XRC(63,8,1), X_MASK,	POWER6,		{ FRT, FRA, FRB } },
+@@ -4842,8 +4836,8 @@ const struct powerpc_opcode powerpc_opco
+ { "dmulq",   XRC(63,34,0), X_MASK,	POWER6,		{ FRT, FRA, FRB } },
+ { "dmulq.",  XRC(63,34,1), X_MASK,	POWER6,		{ FRT, FRA, FRB } },
+ 
+-{ "drrndq",  ZRC(63,35,0), Z_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },
+-{ "drrndq.", ZRC(63,35,1), Z_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },
++{ "drrndq",  ZRC(63,35,0), Z2_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },
++{ "drrndq.", ZRC(63,35,1), Z2_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },
+ 
+ { "mtfsb1",  XRC(63,38,0), XRARB_MASK,	COM,		{ BT } },
+ { "mtfsb1.", XRC(63,38,1), XRARB_MASK,	COM,		{ BT } },
+@@ -4856,8 +4850,8 @@ const struct powerpc_opcode powerpc_opco
+ { "dscliq",  ZRC(63,66,0), Z_MASK,	POWER6,		{ FRT, FRA, SH16 } },
+ { "dscliq.", ZRC(63,66,1), Z_MASK,	POWER6,		{ FRT, FRA, SH16 } },
+ 
+-{ "dquaiq",  ZRC(63,67,0), Z_MASK,	POWER6,		{ TE,  FRT, FRB, RMC } },
+-{ "dquaiq.", ZRC(63,67,1), Z_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },
++{ "dquaiq",  ZRC(63,67,0), Z2_MASK,	POWER6,		{ TE,  FRT, FRB, RMC } },
++{ "dquaiq.", ZRC(63,67,1), Z2_MASK,	POWER6,		{ FRT, FRA, FRB, RMC } },
+ 
+ { "mtfsb0",  XRC(63,70,0), XRARB_MASK,	COM,		{ BT } },
+ { "mtfsb0.", XRC(63,70,1), XRARB_MASK,	COM,		{ BT } },
+@@ -4868,8 +4862,8 @@ const struct powerpc_opcode powerpc_opco
+ { "dscriq",  ZRC(63,98,0), Z_MASK,	POWER6,		{ FRT, FRA, SH16 } },
+ { "dscriq.", ZRC(63,98,1), Z_MASK,	POWER6,		{ FRT, FRA, SH16 } },
+ 
+-{ "drintxq", ZRC(63,99,0), Z_MASK,	POWER6,		{ R, FRT, FRB, RMC } },
+-{ "drintxq.",ZRC(63,99,1), Z_MASK,	POWER6,		{ R, FRT, FRB, RMC } },
++{ "drintxq", ZRC(63,99,0), Z2_MASK,	POWER6,		{ R, FRT, FRB, RMC } },
++{ "drintxq.",ZRC(63,99,1), Z2_MASK,	POWER6,		{ R, FRT, FRB, RMC } },
+ 
+ { "dcmpoq",  X(63,130),	   X_MASK,	POWER6,		{ BF,  FRA, FRB } },
+ 
+@@ -4883,8 +4877,8 @@ const struct powerpc_opcode powerpc_opco
+ { "dtstdcq", Z(63,194),	    Z_MASK,	POWER6,		{ BF,  FRA, DCM } },
+ { "dtstdgq", Z(63,226),	    Z_MASK,	POWER6,		{ BF,  FRA, DGM } },
+ 
+-{ "drintnq", ZRC(63,227,0), Z_MASK,	POWER6,		{ R, FRT, FRB, RMC } },
+-{ "drintnq.",ZRC(63,227,1), Z_MASK,	POWER6,		{ R, FRT, FRB, RMC } },
++{ "drintnq", ZRC(63,227,0), Z2_MASK,	POWER6,		{ R, FRT, FRB, RMC } },
++{ "drintnq.",ZRC(63,227,1), Z2_MASK,	POWER6,		{ R, FRT, FRB, RMC } },
+ 
+ { "dctqpq",  XRC(63,258,0), X_MASK,	POWER6,		{ FRT, FRB } },
+ { "dctqpq.", XRC(63,258,1), X_MASK,	POWER6,		{ FRT, FRB } },
+
+-- 
+Alan Modra
+IBM OzLabs - Linux Technology Centre


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- gdb.spec	26 Apr 2007 00:41:22 -0000	1.230
+++ gdb.spec	28 Apr 2007 21:50:42 -0000	1.231
@@ -11,7 +11,7 @@
 Version: 6.6
 
 # The release always contains a leading reserved number, start it at 1.
-Release: 13%{?dist}
+Release: 14%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -323,8 +323,8 @@
 # Fix debugging GDB itself - the compiled in source files paths (BZ 225783).
 Patch241: gdb-6.6-bz225783-gdb-debuginfo-paths.patch
 
-# Fix harmless GCORE stack buffer overflow, by _FORTIFY_SOURCE=2 (BZ 235753).
-Patch243: gdb-6.6-bz235753-gcore-strings-overflow.patch
+# Fix harmless GCORE stack buffer overflow, by _FORTIFY_SOURCE=2 (BZ 238285).
+Patch243: gdb-6.6-bz238285-gcore-strings-overflow.patch
 
 # Use the runtime variant of `libunwind-ARCH.so.7' rather than the `.so' one.
 Patch244: gdb-6.6-libunwind-major-version.patch
@@ -637,6 +637,10 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Sat Apr 28 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-14
+- Fixup for the PPC Power6/DFP instructions disassembly (BZ 230000).
+- New testcase for the GCORE buffer overflow (for BZ 238285, formerly 235753).
+
 * Wed Apr 25 2007 Jan Kratochvil <jan.kratochvil at redhat.com> - 6.6-13
 - Fix `gcore' command for 32bit PPC inferiors on 64bit PPC hosts (BZ 232015).
 
@@ -648,7 +652,7 @@
 - Package review, analysed by Ralf Corsepius (BZ 225783).
  - Fix prelink(8) testcase for non-root $PATH missing `/usr/sbin' (BZ 225783).
  - Fix debugging GDB itself - the compiled in source files paths (BZ 225783).
- - Fix harmless GCORE stack buffer overflow, by _FORTIFY_SOURCE=2 (BZ 235753).
+ - Fix harmless GCORE stack buffer overflow, by _FORTIFY_SOURCE=2 (BZ 238285).
  - Fix XML support - the build was missing `expat-devel'.
  - Updated the `info' files handling by the spec file.
  - Building now with the standard Fedora code protections - _FORTIFY_SOURCE=2.


--- gdb-6.6-bz235753-gcore-strings-overflow.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sun Apr 29 21:04:51 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 29 Apr 2007 17:04:51 -0400
Subject: rpms/kernel/devel patch-2.6.21.1.bz2.sign, NONE, 1.1 .cvsignore,
	1.616, 1.617 kernel-2.6.spec, 1.3118, 1.3119 sources, 1.579,
	1.580 upstream, 1.507, 1.508
Message-ID: <200704292104.l3TL4pf8028334@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28044

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.21.1.bz2.sign 
Log Message:
* Sun Apr 29 2007 Dave Jones <davej at redhat.com>
- 2.6.21.1



--- NEW FILE patch-2.6.21.1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBGMnQ0yGugalF9Dw4RAmQUAJ9hxjTl2TG5wlf9bzYb4siP7GoqtACfe9Es
Me92Psc9ZhFnjkpecDfKeko=
=Cq5X
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.616
retrieving revision 1.617
diff -u -r1.616 -r1.617
--- .cvsignore	26 Apr 2007 14:11:41 -0000	1.616
+++ .cvsignore	29 Apr 2007 21:04:48 -0000	1.617
@@ -4,3 +4,4 @@
 sparse-0.2.tar.bz2
 kernel-2.6.21
 linux-2.6.21.tar.bz2
+patch-2.6.21.1.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3118
retrieving revision 1.3119
diff -u -r1.3118 -r1.3119
--- kernel-2.6.spec	27 Apr 2007 21:10:09 -0000	1.3118
+++ kernel-2.6.spec	29 Apr 2007 21:04:48 -0000	1.3119
@@ -370,7 +370,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-#Patch1: patch-2.6.21.1.bz2
+Patch1: patch-2.6.21.1.bz2
 Patch3: git-geode.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
@@ -1002,7 +1002,7 @@
 cd linux-%{kversion}.%{_target_cpu}
 
 # Update to latest upstream.
-#%patch1 -p1
+%patch1 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
@@ -2334,6 +2334,9 @@
 #  - tux.
 
 %changelog
+* Sun Apr 29 2007 Dave Jones <davej at redhat.com>
+- 2.6.21.1
+
 * Fri Apr 27 2007 Dave Jones <davej at redhat.com>
 - Allow large files on UDF.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.579
retrieving revision 1.580
diff -u -r1.579 -r1.580
--- sources	26 Apr 2007 14:11:41 -0000	1.579
+++ sources	29 Apr 2007 21:04:49 -0000	1.580
@@ -1,2 +1,3 @@
 2618cbcc9c9ac1c3c04be903fe3338a7  sparse-0.2.tar.bz2
 1b515f588078dfa7f4bab2634bd17e80  linux-2.6.21.tar.bz2
+c4c368f173af267a564948065ffc1689  patch-2.6.21.1.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.507
retrieving revision 1.508
diff -u -r1.507 -r1.508
--- upstream	26 Apr 2007 14:11:41 -0000	1.507
+++ upstream	29 Apr 2007 21:04:49 -0000	1.508
@@ -1 +1,2 @@
 linux-2.6.21.tar.bz2
+patch-2.6.21.1.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 30 08:14:49 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 04:14:49 -0400
Subject: rpms/gettext/devel gettext-php-prinf-output-237241.patch, NONE,
	1.1 gettext.spec, 1.73, 1.74
Message-ID: <200704300814.l3U8En37007776@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/gettext/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7758

Modified Files:
	gettext.spec 
Added Files:
	gettext-php-prinf-output-237241.patch 
Log Message:
- add gettext-php-prinf-output-237241.patch to workaround php test failure
  (#237241)


gettext-php-prinf-output-237241.patch:
 lang-php |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gettext-php-prinf-output-237241.patch ---
--- gettext-0.16.1/gettext-tools/tests/lang-php~	2006-11-28 03:02:08.000000000 +1000
+++ gettext-0.16.1/gettext-tools/tests/lang-php	2007-04-30 17:51:31.000000000 +1000
@@ -15,7 +15,7 @@
   bindtextdomain ("prog", ".");
   echo _("'Your command, please?', asked the waiter.");
   echo "\n";
-  echo printf(_("%s is replaced by %s."), "FF", "EUR");
+  printf(_("%s is replaced by %s."), "FF", "EUR");
   echo "\n";
 ?>
 EOF


Index: gettext.spec
===================================================================
RCS file: /cvs/dist/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- gettext.spec	19 Mar 2007 04:16:15 -0000	1.73
+++ gettext.spec	30 Apr 2007 08:14:47 -0000	1.74
@@ -4,7 +4,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.16.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL/LGPL
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
@@ -25,6 +25,7 @@
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Patch1: gettext-tools-tests-lang-gawk-fail.patch
 Patch2: gettext-php-headers.patch
+Patch3: gettext-php-prinf-output-237241.patch
 
 %description
 The GNU gettext package provides a set of tools and documentation for
@@ -60,6 +61,7 @@
 %setup -q
 %patch1 -p1 -b .1-fails~
 %patch2 -p0 -b .2-header~
+%patch3 -p1 -b .3-printf~
 
 
 %build
@@ -225,7 +227,9 @@
 
 
 %changelog
-* Mon Mar 19 2007 Jens Petersen <petersen at redhat.com>
+* Mon Apr 30 2007 Jens Petersen <petersen at redhat.com> - 0.16.1-8
+- add gettext-php-prinf-output-237241.patch to workaround php test failure
+  (#237241)
 - add gettext-php-headers.patch to correct php test headers
   (Robert Scheck, #232832)
 



From fedora-cvs-commits at redhat.com  Mon Apr 30 08:20:40 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 04:20:40 -0400
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.111,1.112
Message-ID: <200704300820.l3U8Ke4R007885@cvs.devel.redhat.com>

Author: bnocera

Update of /cvs/dist/rpms/rhythmbox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7871

Modified Files:
	rhythmbox.spec 
Log Message:
* Mon Apr 30 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-7.fc7
- Add missing gnome-python2-gconf and gnome-python2-gnomevfs deps
  (#238363)



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- rhythmbox.spec	20 Apr 2007 13:28:40 -0000	1.111
+++ rhythmbox.spec	30 Apr 2007 08:20:38 -0000	1.112
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.10.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -12,7 +12,7 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: gtk2 >= 2.4.0
 Requires: libgnomeui >= 2.6.0
-Requires: gnome-python2
+Requires: gnome-python2 gnome-python2-gconf gnome-python2-gnomevfs
 Requires: gnome-themes
 Requires(post): scrollkeeper
 Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
@@ -150,6 +150,10 @@
 %{_libexecdir}/rhythmbox-metadata
 
 %changelog
+* Mon Apr 30 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-7.fc7
+- Add missing gnome-python2-gconf and gnome-python2-gnomevfs deps
+  (#238363)
+
 * Fri Apr 20 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-6.fc7
 - Enable the Magnatune and Jamendo stores by default (#237131)
 



From fedora-cvs-commits at redhat.com  Mon Apr 30 09:07:06 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 05:07:06 -0400
Subject: rpms/man-pages/devel man-pages-2.46-libaio-includes.patch, NONE,
	1.1 man-pages-2.46-nscd.patch, NONE, 1.1 .cvsignore, 1.32,
	1.33 man-pages-2.43-mount.patch, 1.1, 1.2 man-pages.spec, 1.71,
	1.72 sources, 1.31, 1.32 man-pages-2.25-dbopen.patch, 1.1, NONE
Message-ID: <200704300907.l3U976Ph014211@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/man-pages/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14055

Modified Files:
	.cvsignore man-pages-2.43-mount.patch man-pages.spec sources 
Added Files:
	man-pages-2.46-libaio-includes.patch man-pages-2.46-nscd.patch 
Removed Files:
	man-pages-2.25-dbopen.patch 
Log Message:
- update to 2.46


man-pages-2.46-libaio-includes.patch:
 man2/io_submit.2 |    2 +-
 man8/nscd.8      |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE man-pages-2.46-libaio-includes.patch ---
--- man-pages-2.46/man2/io_submit.2.pom	2007-04-30 10:24:08.000000000 +0200
+++ man-pages-2.46/man2/io_submit.2	2007-04-30 11:02:41.000000000 +0200
@@ -27,7 +27,7 @@
 .nf
 .\" .ad l
 .\" .hy 0
-.B #include <linux/aio.h>
+.B #include <libaio.h>
 .sp
 .\" .HP 16
 .BI "int io_submit(aio_context_t " ctx_id ", long " nr \
--- man-pages-2.46/man8/nscd.8.pom	2007-04-30 10:24:21.000000000 +0200
+++ man-pages-2.46/man8/nscd.8	2007-04-30 10:57:49.000000000 +0200
@@ -47,6 +47,8 @@
 Note that the shadow file is specifically not cached.
 .BR getspnam (3)
 calls remain uncached as a result.
+As a result of this behavior there is not possible to change non-nscd user 
+to another non-nscd user via su service when nscd is running. 
 .SH OPTIONS
 .TP
 .B "\-\-help"

man-pages-2.46-nscd.patch:
 nscd.8 |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE man-pages-2.46-nscd.patch ---
--- man-pages-2.46/man8/nscd.8.pom	2007-04-30 10:24:21.000000000 +0200
+++ man-pages-2.46/man8/nscd.8	2007-04-30 10:57:49.000000000 +0200
@@ -47,6 +47,8 @@
 Note that the shadow file is specifically not cached.
 .BR getspnam (3)
 calls remain uncached as a result.
+As a result of this behavior there is not possible to change non-nscd user 
+to another non-nscd user via su service when nscd is running. 
 .SH OPTIONS
 .TP
 .B "\-\-help"


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	11 Apr 2007 12:54:29 -0000	1.32
+++ .cvsignore	30 Apr 2007 09:07:03 -0000	1.33
@@ -1,4 +1,4 @@
 man-pages-extralocale.tar.bz2
 man2.tar.gz
 man2_sys2.1.tar.gz
-man-pages-2.44.tar.bz2
+man-pages-2.46.tar.bz2

man-pages-2.43-mount.patch:
 mount.2 |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

Index: man-pages-2.43-mount.patch
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/man-pages-2.43-mount.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- man-pages-2.43-mount.patch	1 Dec 2006 10:44:00 -0000	1.1
+++ man-pages-2.43-mount.patch	30 Apr 2007 09:07:03 -0000	1.2
@@ -14,7 +14,7 @@
  .\" the Solaris manual page it can cause data loss on Solaris.
  .\" If the same holds on Linux, then this should be documented.
  .TP
-+In previous version of kernel there were two more possible 
++In the previous version of kernel there were two more possible 
 +flags:
  .BR MNT_DETACH " (since Linux 2.4.11)"
  Perform a lazy unmount: make the mount point unavailable for


Index: man-pages.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- man-pages.spec	11 Apr 2007 12:54:29 -0000	1.71
+++ man-pages.spec	30 Apr 2007 09:07:03 -0000	1.72
@@ -1,6 +1,6 @@
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
-Version: 2.44
+Version: 2.46
 Release: 1%{?dist}
 License: distributable
 Group: Documentation
@@ -17,10 +17,9 @@
 Source14: man2_sys2.1.tar.gz
 Patch1: man-pages-1.51-iconv.patch
 Patch8: man-pages-1.60-fs.patch
-Patch23: man-pages-2.25-dbopen.patch
 Patch24: man-pages-2.25-malloc.patch
-Patch28: man-pages-2.34-nscd.patch
-Patch30: man-pages-2.34-libaio-includes.patch
+Patch28: man-pages-2.46-nscd.patch
+Patch30: man-pages-2.46-libaio-includes.patch
 Patch36: man-pages-2.39-unimplemented.patch
 Patch37: man-pages-2.41-mmap.patch
 Patch38: man-pages-2.43-mount.patch
@@ -54,10 +53,9 @@
 
 %patch1 -p1
 %patch8 -p1
-%patch23 -p1
 %patch24 -p1
-%patch28 -p1
-%patch30 -p1
+#%patch28 -p1
+#%patch30 -p1
 %patch36 -p1 
 %patch37 -p1
 %patch38 -p1
@@ -214,6 +212,9 @@
 %lang(en) %{_mandir}/en/man*
 
 %changelog
+* Mon Apr 30 2007 Ivana Varekova <varekova at redhat.com> 2.46-1
+- update to 2.46
+
 * Wed Apr 11 2007 Ivana Varekova <varekova at redhat.com> 2.44-1
 - update to 2.44
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	11 Apr 2007 12:54:29 -0000	1.31
+++ sources	30 Apr 2007 09:07:03 -0000	1.32
@@ -1,4 +1,4 @@
 57f2e0500d177e05647990eae439a8ee  man-pages-extralocale.tar.bz2
 af09d031dcee66929510e078d00066f2  man2.tar.gz
 fbc03fdbc665e24961d30dad3ed8596d  man2_sys2.1.tar.gz
-e2a0b9822e50760e25b47d2a9b300a69  man-pages-2.44.tar.bz2
+318a948119a593b5042b7eb52a2ab79e  man-pages-2.46.tar.bz2


--- man-pages-2.25-dbopen.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 30 09:37:16 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 05:37:16 -0400
Subject: rpms/icu/devel icu.icuXXXX.malayalam.bysyllable.patch, NONE,
	1.1 icu.icu5431.malayam.patch, 1.2, 1.3 icu.spec, 1.48, 1.49
Message-ID: <200704300937.l3U9bGtV021436@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/icu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15021

Modified Files:
	icu.icu5431.malayam.patch icu.spec 
Added Files:
	icu.icuXXXX.malayalam.bysyllable.patch 
Log Message:
Resolves: rhbz#220867 Malayalam rendering

icu.icuXXXX.malayalam.bysyllable.patch:
 IndicReordering.h         |    1 
 LEGlyphStorage.h          |    2 
 LayoutEngine.cpp          |    9 ++-
 Makefile.in               |    1 
 MalayalamLayoutEngine.cpp |  121 ++++++++++++++++++++++++++++++++++++++++++++++
 MalayalamLayoutEngine.h   |   41 +++++++++++++++
 6 files changed, 173 insertions(+), 2 deletions(-)

--- NEW FILE icu.icuXXXX.malayalam.bysyllable.patch ---
diff -ruN icu.orig/source/layout/IndicReordering.h icu/source/layout/IndicReordering.h
--- icu.orig/source/layout/IndicReordering.h	2007-04-27 10:28:22.000000000 +0100
+++ icu/source/layout/IndicReordering.h	2007-04-27 10:39:22.000000000 +0100
@@ -142,6 +142,7 @@
     // do not instantiate
     IndicReordering();
 
+public:
     static le_int32 findSyllable(const IndicClassTable *classTable, const LEUnicode *chars, le_int32 prev, le_int32 charCount);
 
 };
diff -ruN icu.orig/source/layout/LayoutEngine.cpp icu/source/layout/LayoutEngine.cpp
--- icu.orig/source/layout/LayoutEngine.cpp	2007-04-27 10:28:22.000000000 +0100
+++ icu/source/layout/LayoutEngine.cpp	2007-04-27 10:39:22.000000000 +0100
@@ -14,6 +14,7 @@
 #include "CanonShaping.h"
 #include "HanLayoutEngine.h"
 #include "HangulLayoutEngine.h"
+#include "MalayalamLayoutEngine.h"
 #include "IndicLayoutEngine.h"
 #include "KhmerLayoutEngine.h"
 #include "ThaiLayoutEngine.h"
@@ -451,11 +452,13 @@
 
     if (gsubTable != NULL && gsubTable->coversScript(scriptTag = OpenTypeLayoutEngine::getScriptTag(scriptCode))) {
         switch (scriptCode) {
+        case mlymScriptCode:
+            result = new MalayalamOpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, typoFlags, gsubTable);
+	    break;
         case bengScriptCode:
         case devaScriptCode:
         case gujrScriptCode:
         case kndaScriptCode:
-        case mlymScriptCode:
         case oryaScriptCode:
         case guruScriptCode:
         case tamlScriptCode:
@@ -512,11 +515,13 @@
             result = new GXLayoutEngine(fontInstance, scriptCode, languageCode, morphTable);
         } else {
             switch (scriptCode) {
+            case mlymScriptCode:
+                result = new MalayalamOpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, typoFlags);
+	        break;
             case bengScriptCode:
             case devaScriptCode:
             case gujrScriptCode:
             case kndaScriptCode:
-            case mlymScriptCode:
             case oryaScriptCode:
             case guruScriptCode:
             case tamlScriptCode:
diff -ruN icu.orig/source/layout/LEGlyphStorage.h icu/source/layout/LEGlyphStorage.h
--- icu.orig/source/layout/LEGlyphStorage.h	2007-04-27 10:28:22.000000000 +0100
+++ icu/source/layout/LEGlyphStorage.h	2007-04-27 10:43:54.000000000 +0100
@@ -413,6 +413,8 @@
      */
     void adoptGlyphArray(LEGlyphStorage &from);
 
+    void appendGlyphStorage(LEGlyphStorage &from);
+
     /**
      * Delete the char indices array and replace it with the one
      * in <code>from</code>. Set the char indices array pointer
diff -ruN icu.orig/source/layout/Makefile.in icu/source/layout/Makefile.in
--- icu.orig/source/layout/Makefile.in	2007-04-27 10:28:22.000000000 +0100
+++ icu/source/layout/Makefile.in	2007-04-27 10:39:22.000000000 +0100
@@ -66,6 +66,7 @@
 ArabicLayoutEngine.o \
 GXLayoutEngine.o \
 HanLayoutEngine.o \
+MalayalamLayoutEngine.o \
 IndicLayoutEngine.o \
 LayoutEngine.o \
 ContextualGlyphSubstProc.o \
diff -ruN icu.orig/source/layout/MalayalamLayoutEngine.cpp icu/source/layout/MalayalamLayoutEngine.cpp
--- icu.orig/source/layout/MalayalamLayoutEngine.cpp	1970-01-01 01:00:00.000000000 +0100
+++ icu/source/layout/MalayalamLayoutEngine.cpp	2007-04-27 10:44:26.000000000 +0100
@@ -0,0 +1,121 @@
+
+/*
+ *
+ * (C) Copyright IBM Corp. 1998-2005 - All Rights Reserved
+ *
+ */
+
+#include "LETypes.h"
+#include "LayoutEngine.h"
+#include "OpenTypeLayoutEngine.h"
+#include "MalayalamLayoutEngine.h"
+#include "ScriptAndLanguageTags.h"
+
+#include "GlyphSubstitutionTables.h"
+#include "GlyphDefinitionTables.h"
+#include "GlyphPositioningTables.h"
+
+#include "GDEFMarkFilter.h"
+#include "LEGlyphStorage.h"
+
+#include "IndicReordering.h"
+
+#include <stdio.h>
+
+U_NAMESPACE_BEGIN
+
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(MalayalamOpenTypeLayoutEngine)
+
+void LEGlyphStorage::appendGlyphStorage(LEGlyphStorage &from)
+{
+    if (fInsertionList) applyInsertions();
+    if (from.fInsertionList) from.applyInsertions();
+
+    if (!from.fGlyphCount)
+        return;
+
+    le_int32 newGlyphCount = fGlyphCount + from.fGlyphCount;
+
+    fGlyphs = (LEGlyphID*)LE_GROW_ARRAY(fGlyphs, newGlyphCount);
+    LE_ARRAY_COPY(fGlyphs+fGlyphCount, from.fGlyphs, from.fGlyphCount);
+
+    le_int32 nLargestIndex = 0;
+    if (fGlyphCount)
+    {
+        for (le_int32 i = 0; i < fGlyphCount; ++i)
+        {
+            if (fCharIndices[i] > nLargestIndex)
+                nLargestIndex = fCharIndices[i];
+        }
+        nLargestIndex+=1;
+    }
+    fCharIndices = (le_int32 *)LE_GROW_ARRAY(fCharIndices, newGlyphCount);
+    for (le_int32 i = 0; i < from.fGlyphCount; ++i)
+        fCharIndices[fGlyphCount+i] = from.fCharIndices[i] + nLargestIndex;
+
+    fAuxData = (le_uint32 *)LE_GROW_ARRAY(fAuxData, newGlyphCount);
+    LE_ARRAY_COPY(fAuxData+fGlyphCount, from.fAuxData, from.fGlyphCount);
+
+    fGlyphCount = newGlyphCount;
+}
+
+le_int32 MalayalamOpenTypeLayoutEngine::glyphPostProcessing(LEGlyphStorage &tempGlyphStorage, LEGlyphStorage &glyphStorage, LEErrorCode &success)
+{
+    if (LE_FAILURE(success)) {
+        return 0;
+    }
+
+    glyphStorage.appendGlyphStorage(tempGlyphStorage);
+
+    return glyphStorage.getGlyphCount();
+}
+
+
+le_int32 MalayalamOpenTypeLayoutEngine::computeGlyphs(const LEUnicode chars[], le_int32 offset, le_int32 count, le_int32 max, le_bool rightToLeft, LEGlyphStorage &glyphStorage, LEErrorCode &success)
+{
+    if (LE_FAILURE(success)) {
+        return 0;
+    }
+
+    if (chars == NULL || offset < 0 || count < 0 || max < 0 || offset >= max || offset + count > max) {
+        success = LE_ILLEGAL_ARGUMENT_ERROR;
+        return 0;
+    }
+
+    le_int32 outGlyphCount=0;
+
+    const IndicClassTable *classTable = IndicClassTable::getScriptClassTable(fScriptCode);
+    le_int32 prev = 0;
+    while (prev < count)
+    { 
+        le_int32 outCharCount=0, fakeGlyphCount=0;
+        LEUnicode *outChars = NULL;
+        LEGlyphStorage fakeGlyphStorage;
+
+        le_int32 syllable = IndicReordering::findSyllable(classTable, chars+offset, prev, count);
+        outCharCount = characterProcessing(chars+prev, offset, syllable-prev, max, rightToLeft, outChars, fakeGlyphStorage, success);
+
+        if (LE_FAILURE(success)) {
+            return 0;
+        }
+
+        if (outChars != NULL) {
+            fakeGlyphCount = glyphProcessing(outChars, 0, outCharCount, outCharCount, rightToLeft, fakeGlyphStorage, success);
+            LE_DELETE_ARRAY(outChars); // FIXME: a subclass may have allocated this, in which case this delete might not work...
+        } else {
+            fakeGlyphCount = glyphProcessing(chars+prev, offset, syllable-prev, max, rightToLeft, fakeGlyphStorage, success);
+        }
+
+        if (LE_FAILURE(success)) {
+            return 0;
+        }
+
+        outGlyphCount = glyphPostProcessing(fakeGlyphStorage, glyphStorage, success);
+
+        prev = syllable;
+    }
+
+    return outGlyphCount;
+}
+
+U_NAMESPACE_END
diff -ruN icu.orig/source/layout/MalayalamLayoutEngine.h icu/source/layout/MalayalamLayoutEngine.h
--- icu.orig/source/layout/MalayalamLayoutEngine.h	1970-01-01 01:00:00.000000000 +0100
+++ icu/source/layout/MalayalamLayoutEngine.h	2007-04-27 10:39:52.000000000 +0100
@@ -0,0 +1,41 @@
+
+/*
+ *
+ * (C) Copyright IBM Corp. 1998-2005 - All Rights Reserved
+ *
+ */
+
+#ifndef __MALAYALAMLAYOUTENGINE_H
+#define __MALAYALAMLAYOUTENGINE_H
+
+#include "IndicLayoutEngine.h"
+
+U_NAMESPACE_BEGIN
+
+class MalayalamOpenTypeLayoutEngine : public IndicOpenTypeLayoutEngine
+{
+public:
+    MalayalamOpenTypeLayoutEngine(const LEFontInstance *fontInstance, le_int32 scriptCode, le_int32 languageCode,
+                            le_int32 typoFlags, const GlyphSubstitutionTableHeader *gsubTable) :
+        IndicOpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, typoFlags, gsubTable)
+
+    {}
+
+    MalayalamOpenTypeLayoutEngine(const LEFontInstance *fontInstance, le_int32 scriptCode, le_int32 languageCode,
+			      le_int32 typoFlags) :
+        IndicOpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, typoFlags)
+
+    {}
+
+    virtual UClassID getDynamicClassID() const;
+    static UClassID getStaticClassID();
+
+protected:
+    virtual le_int32 glyphPostProcessing(LEGlyphStorage &tempGlyphStorage, LEGlyphStorage &glyphStorage, LEErrorCode &success);
+
+    virtual le_int32 computeGlyphs(const LEUnicode chars[], le_int32 offset, le_int32 count, le_int32 max, le_bool rightToLeft, LEGlyphStorage &glyphStorage, LEErrorCode &success);
+};
+
+U_NAMESPACE_END
+#endif
+

icu.icu5431.malayam.patch:
 IndicReordering.cpp |   51 ++++++++++++++++++++++++++++++++++++++++++++-------
 MPreFixups.cpp      |    6 ++++++
 MPreFixups.h        |    2 ++
 3 files changed, 52 insertions(+), 7 deletions(-)

Index: icu.icu5431.malayam.patch
===================================================================
RCS file: /cvs/dist/rpms/icu/devel/icu.icu5431.malayam.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- icu.icu5431.malayam.patch	21 Dec 2006 09:30:55 -0000	1.2
+++ icu.icu5431.malayam.patch	30 Apr 2007 09:37:13 -0000	1.3
@@ -57,7 +57,7 @@
  static const FeatureMap featureMap[] =
  {
      {loclFeatureTag, loclFeatureMask},
-@@ -629,6 +651,20 @@
+@@ -629,6 +651,21 @@
                  output.writeChar(chars[i], i, tagArray4);
              }
  
@@ -68,11 +68,12 @@
 +		 (chars[baseConsonant] == 0x0d30)) &&
 +                ((chars[baseConsonant - 2] >= 0x0d15) &&
 +                 (chars[baseConsonant - 2] <= 0x0d39)))  {
++               if (baseConsonant < 3 || chars[baseConsonant - 3] != 0x0d4d) {
++                    output.swapChars(-1, -3);
 +
-+                output.swapChars(-1, -3);
-+
-+		if (mpreFixups)
-+			mpreFixups->reduce();
++		    if (mpreFixups)
++		        mpreFixups->reduce();
++		}
 +            }
 +
              if ((classTable->scriptFlags & SF_MATRAS_AFTER_BASE) != 0) {


Index: icu.spec
===================================================================
RCS file: /cvs/dist/rpms/icu/devel/icu.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- icu.spec	13 Feb 2007 16:05:13 -0000	1.48
+++ icu.spec	30 Apr 2007 09:37:13 -0000	1.49
@@ -1,6 +1,6 @@
 Name:      icu
 Version:   3.6
-Release:   18%{?dist}
+Release:   19%{?dist}
 Summary:   International Components for Unicode
 Group:     System Environment/Libraries
 License:   MIT
@@ -23,6 +23,7 @@
 Patch12: icu.icu5557.safety.patch
 Patch13: icu.icu5506.multiplevowels.patch
 Patch14: icu.icu5594.gujarati.patch
+Patch15: icu.icuXXXX.malayalam.bysyllable.patch
 
 %description
 The International Components for Unicode (ICU) libraries provide
@@ -73,7 +74,7 @@
 %patch11 -p1 -b .icu5501.sinhala.biggerexpand.patch
 %patch12 -p1 -b .icu5557.safety.patch
 %patch13 -p1 -b .icu5506.multiplevowels.patch
-%patch14 -p1 -b .icu5594.gujarati.patch
+%patch15 -p1 -b .icuXXXX.malayalam.bysyllable.patch
 
 %build
 cd source
@@ -150,6 +151,9 @@
 %doc source/__docs/%{name}/html/*
 
 %changelog
+* Mon Apr 30 2007 Caolan McNamara <caolanm at redhat.com> - 3.6-19
+- Resolves: rhbz#220867 Malayalam rendering
+
 * Tue Feb 13 2007 Caolan McNamara <caolanm at redhat.com> - 3.6-18
 - Resolves: rhbz#228457 icu.icu5594.gujarati.patch
 



From fedora-cvs-commits at redhat.com  Mon Apr 30 10:21:12 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 06:21:12 -0400
Subject: rpms/kdebase/devel kdebase-3.5.6-consolekit-kdm.patch, 1.1,
	1.2 kdebase.spec, 1.244, 1.245
Message-ID: <200704301021.l3UALCm7031739@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31723

Modified Files:
	kdebase-3.5.6-consolekit-kdm.patch kdebase.spec 
Log Message:
apply patch KDM to support ConsoleKit


kdebase-3.5.6-consolekit-kdm.patch:
 backend/Imakefile    |    4 
 backend/Makefile.am  |    5 
 backend/Makefile.in  |   13 -
 backend/client.c     |   14 +
 backend/consolekit.c |  552 +++++++++++++++++++++++++++++++++++++++++++++++++++
 backend/consolekit.h |   36 +++
 backend/dm.h         |    6 
 backend/session.c    |   20 +
 configure.in.in      |   47 ++++
 9 files changed, 688 insertions(+), 9 deletions(-)

Index: kdebase-3.5.6-consolekit-kdm.patch
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase-3.5.6-consolekit-kdm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-3.5.6-consolekit-kdm.patch	23 Apr 2007 12:00:08 -0000	1.1
+++ kdebase-3.5.6-consolekit-kdm.patch	30 Apr 2007 10:21:09 -0000	1.2
@@ -768,7 +768,7 @@
  $(srcdir)/policy.c: ../config.ci 
 diff -Nur kdebase-3.5.6/kdm/backend/session.c kdebase-3.5.6-consolekit/kdm/backend/session.c
 --- kdebase-3.5.6/kdm/backend/session.c	2006-01-19 18:03:14.000000000 +0100
-+++ kdebase-3.5.6-consolekit/kdm/backend/session.c	2007-04-18 00:35:14.000000000 +0200
++++ kdebase-3.5.6-consolekit/kdm/backend/session.c	2007-04-28 15:57:00.000000000 +0200
 @@ -45,6 +45,10 @@
  #include <ctype.h>
  #include <signal.h>
@@ -795,7 +795,7 @@
  		SetupDisplay( td_setup );
  
 +#ifdef WITH_CONSOLE_KIT
-+	ck_session_cookie = open_ck_session (getpwnam(d->userName), d);
++	ck_session_cookie = open_ck_session (getpwnam(curuser), d);
 +	if (!(clientPid = StartClient(ck_session_cookie))) {
 +#else
  	if (!(clientPid = StartClient())) {


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- kdebase.spec	23 Apr 2007 12:00:08 -0000	1.244
+++ kdebase.spec	30 Apr 2007 10:21:09 -0000	1.245
@@ -555,7 +555,8 @@
 
 %changelog
 * Mon Apr 23 2007 Than Ngo <than at redhat.com> - 6:3.5.6-6.fc7
-- apply patch KDM to support ConsoleKit, thanks to Kevin Kofler, #228111
+- apply patch KDM to support ConsoleKit, thanks to Kevin Kofler and
+  S.??a??lar Onur, #228111
 
 * Tue Apr 10 2007 Than Ngo <than at redhat.com> 6:3.5.6-5.fc7
 - fix unknown protocol smb



From fedora-cvs-commits at redhat.com  Mon Apr 30 11:46:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 07:46:36 -0400
Subject: rpms/pilot-link/devel pilot-link-0.12.2-m4.patch, NONE,
	1.1 pilot-link.spec, 1.55, 1.56
Message-ID: <200704301146.l3UBkakY022548@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/pilot-link/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22518

Modified Files:
	pilot-link.spec 
Added Files:
	pilot-link-0.12.2-m4.patch 
Log Message:
- Resolves: 238239
  fix a syntax error in pilot-link.m4



pilot-link-0.12.2-m4.patch:
 pilot-link.m4.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pilot-link-0.12.2-m4.patch ---
--- pilot-link-0.12.2/pilot-link.m4.in.pom	2007-02-02 11:54:32.000000000 +0100
+++ pilot-link-0.12.2/pilot-link.m4.in	2007-04-30 13:40:21.000000000 +0200
@@ -1,4 +1,4 @@
-AC_DEFUN([IT_PROG_INTLTOOL], [AC_PREREQ([2.50])dnl
+AC_DEFUN([IT_PROG_INTLTOOL], [AC_PREREQ([2.50])])dnl
 
 AC_DEFUN([AC_PILOT_LINK_HOOK],
 [


Index: pilot-link.spec
===================================================================
RCS file: /cvs/dist/rpms/pilot-link/devel/pilot-link.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- pilot-link.spec	26 Apr 2007 10:59:38 -0000	1.55
+++ pilot-link.spec	30 Apr 2007 11:46:33 -0000	1.56
@@ -3,7 +3,7 @@
 
 Name: pilot-link
 Version: 0.12.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 2
 License: GPL
 Group: Applications/Communications
@@ -16,6 +16,7 @@
 #Patch2: pilot-link-0.11.0-perlpollute.patch  # May be still applied
 #Patch3: pilot-link-0.11.2-malsync.patch  # May be still applied
 Patch4: pilot-link-0.12.1-var.patch 
+Patch5: pilot-link-0.12.2-m4.patch
 
 Requires: /sbin/ldconfig
 
@@ -65,6 +66,7 @@
 #%patch2 -p1 -b .perlpollute
 #%patch3 -p1 -b .malsync
 %endif
+%patch5 -p1 -b .typo
 
 %build
 autoreconf -is
@@ -143,6 +145,10 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Mon Apr 30 2007 Ivana Varekova <varekova at redhat.com> - 2:0.12.2-2
+- Resolves: 238239
+  fix a syntax error in pilot-link.m4
+
 * Thu Apr 26 2007 Ivana Varekova <varekova at redhat.com> - 2:0.12.2-1
 - update to 0.12.2
 



From fedora-cvs-commits at redhat.com  Mon Apr 30 12:06:48 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 08:06:48 -0400
Subject: rpms/vim/devel 7.0.225,NONE,1.1
Message-ID: <200704301206.l3UC6msV022895@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22882

Added Files:
	7.0.225 
Log Message:
Patchlevel 225


--- NEW FILE 7.0.225 ---
To: vim-dev at vim.org
Subject: patch 7.0.225
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.225
Problem:    When using setline() in an InsertEnter autocommand and doing "A"
	    the cursor ends up on the last byte in the line. (Yukihiro
	    Nakadaira)
Solution:   Only adjust the column when using setline() for the cursor line.
	    Move it back to the head byte if necessary.
Files:	    src/eval.c, src/misc2.c


*** ../vim-7.0.224/src/eval.c	Tue Mar 27 16:57:54 2007
--- src/eval.c	Thu Apr 26 10:52:09 2007
***************
*** 14397,14403 ****
  	    if (u_savesub(lnum) == OK && ml_replace(lnum, line, TRUE) == OK)
  	    {
  		changed_bytes(lnum, 0);
! 		check_cursor_col();
  		rettv->vval.v_number = 0;	/* OK */
  	    }
  	}
--- 14411,14418 ----
  	    if (u_savesub(lnum) == OK && ml_replace(lnum, line, TRUE) == OK)
  	    {
  		changed_bytes(lnum, 0);
! 		if (lnum == curwin->w_cursor.lnum)
! 		    check_cursor_col();
  		rettv->vval.v_number = 0;	/* OK */
  	    }
  	}
*** ../vim-7.0.224/src/misc2.c	Tue Feb 20 03:18:20 2007
--- src/misc2.c	Tue Mar 27 21:59:56 2007
***************
*** 516,522 ****
--- 516,529 ----
  		|| virtual_active())
  	    curwin->w_cursor.col = len;
  	else
+ 	{
  	    curwin->w_cursor.col = len - 1;
+ #ifdef FEAT_MBYTE
+ 	    /* prevent cursor from moving on the trail byte */
+ 	    if (has_mbyte)
+ 		mb_adjust_cursor();
+ #endif
+ 	}
      }
  
  #ifdef FEAT_VIRTUALEDIT
*** ../vim-7.0.224/src/version.c	Tue Mar 27 16:57:54 2007
--- src/version.c	Thu Apr 26 10:53:33 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     225,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
14. You start introducing yourself as "Jim at I-I-Net dot net dot au"

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Apr 30 12:06:52 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 08:06:52 -0400
Subject: rpms/vim/devel 7.0.226,NONE,1.1
Message-ID: <200704301206.l3UC6qsb022915@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22902

Added Files:
	7.0.226 
Log Message:
Patchlevel 226


--- NEW FILE 7.0.226 ---
To: vim-dev at vim.org
Subject: patch 7.0.226
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.226
Problem:    Display flickering when updating signs through the netbeans
	    interface. (Xavier de Gaye)
Solution:   Remove the redraw_later(CLEAR) call.
Files:	    src/netbeans.c


*** ../vim-7.0.225/src/netbeans.c	Tue Nov 14 18:29:00 2006
--- src/netbeans.c	Sat Apr 21 18:14:00 2007
***************
*** 2143,2150 ****
  		    coloncmd(":sign jump %d buffer=%d", serNum,
  						       buf->bufp->b_fnum);
  	    }
- 	    /* XXX only redraw what changed. */
- 	    redraw_later(CLEAR);
  #endif
  /* =====================================================================*/
  	}
--- 2143,2148 ----
*** ../vim-7.0.225/src/version.c	Thu Apr 26 10:55:46 2007
--- src/version.c	Thu Apr 26 11:00:01 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     226,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
15. Your heart races faster and beats irregularly each time you see a new WWW
    site address in print or on TV, even though you've never had heart
    problems before.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Apr 30 12:06:55 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 08:06:55 -0400
Subject: rpms/vim/devel 7.0.227,NONE,1.1
Message-ID: <200704301206.l3UC6tOC022937@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22923

Added Files:
	7.0.227 
Log Message:
Patchlevel 227


--- NEW FILE 7.0.227 ---
To: vim-dev at vim.org
Subject: patch 7.0.227
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.227
Problem:    Crash when closing a window in the GUI. (Charles Campbell)
Solution:   Don't call out_flush() from win_free().
Files:	    src/window.c


*** ../vim-7.0.226/src/window.c	Sun Mar 11 15:53:27 2007
--- src/window.c	Wed Apr 18 22:31:52 2007
***************
*** 2084,2089 ****
--- 2084,2096 ----
      }
  #endif
  
+ #ifdef FEAT_GUI
+     /* Avoid trouble with scrollbars that are going to be deleted in
+      * win_free(). */
+     if (gui.in_use)
+ 	out_flush();
+ #endif
+ 
      /*
       * Close the link to the buffer.
       */
***************
*** 4174,4180 ****
  #ifdef FEAT_GUI
      if (gui.in_use)
      {
- 	out_flush();
  	gui_mch_destroy_scrollbar(&wp->w_scrollbars[SBAR_LEFT]);
  	gui_mch_destroy_scrollbar(&wp->w_scrollbars[SBAR_RIGHT]);
      }
--- 4181,4186 ----
*** ../vim-7.0.226/src/version.c	Thu Apr 26 11:01:16 2007
--- src/version.c	Thu Apr 26 16:09:30 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     227,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
16. You step out of your room and realize that your parents have moved and
    you don't have a clue when it happened.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Apr 30 12:06:58 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 08:06:58 -0400
Subject: rpms/vim/devel 7.0.228,NONE,1.1
Message-ID: <200704301206.l3UC6w0n022960@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22944

Added Files:
	7.0.228 
Log Message:
Patchlevel 228


--- NEW FILE 7.0.228 ---
To: vim-dev at vim.org
Subject: patch 7.0.228
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.228
Problem:    Cygwin: problem with symlink to DOS style path.
Solution:   Invoke cygwin_conv_to_posix_path(). (Luca Masini)
Files:	    src/os_unix.c


*** ../vim-7.0.227/src/os_unix.c	Tue Mar  6 20:27:03 2007
--- src/os_unix.c	Mon Apr 23 22:27:16 2007
***************
*** 55,60 ****
--- 55,66 ----
  # endif
  #endif
  
+ #ifdef __CYGWIN__
+ # ifndef WIN32
+ #  include <sys/cygwin.h>	/* for cygwin_conv_to_posix_path() */
+ # endif
+ #endif
+ 
  #if defined(HAVE_SELECT)
  extern int   select __ARGS((int, fd_set *, fd_set *, fd_set *, struct timeval *));
  #endif
***************
*** 2228,2233 ****
--- 2258,2270 ----
  
  #ifdef VMS
      fname = vms_fixfilename(fname);
+ #endif
+ 
+ #ifdef __CYGWIN__
+     /*
+      * This helps for when "/etc/hosts" is a symlink to "c:/something/hosts".
+      */
+     cygwin_conv_to_posix_path(fname, fname);
  #endif
  
      /* expand it if forced or not an absolute path */
*** ../vim-7.0.227/src/version.c	Thu Apr 26 16:11:47 2007
--- src/version.c	Thu Apr 26 16:27:29 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     228,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
19. All of your friends have an @ in their names.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Apr 30 12:07:02 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 08:07:02 -0400
Subject: rpms/vim/devel 7.0.229,NONE,1.1
Message-ID: <200704301207.l3UC72fw022981@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22967

Added Files:
	7.0.229 
Log Message:
Patchlevel 229


--- NEW FILE 7.0.229 ---
To: vim-dev at vim.org
Subject: patch 7.0.229
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.229
Problem:    When 'pastetoggle' starts with Esc then pressing Esc in Insert
	    mode will not time out. (Jeffery Small)
Solution:   Use KL_PART_KEY instead of KL_PART_MAP, so that 'ttimeout' applies
	    to the 'pastetoggle' key.
Files:	    src/getchar.c


*** ../vim-7.0.228/src/getchar.c	Sun Mar  4 21:25:44 2007
--- src/getchar.c	Thu Apr 19 22:13:37 2007
***************
*** 2183,2189 ****
  			}
  			/* Need more chars for partly match. */
  			if (mlen == typebuf.tb_len)
! 			    keylen = KL_PART_MAP;
  			else if (max_mlen < mlen)
  			    /* no match, may have to check for termcode at
  			     * next character */
--- 2187,2193 ----
  			}
  			/* Need more chars for partly match. */
  			if (mlen == typebuf.tb_len)
! 			    keylen = KL_PART_KEY;
  			else if (max_mlen < mlen)
  			    /* no match, may have to check for termcode at
  			     * next character */
*** ../vim-7.0.228/src/version.c	Thu Apr 26 16:28:43 2007
--- src/version.c	Thu Apr 26 16:48:59 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     229,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
20. When looking at a pageful of someone else's links, you notice all of them
    are already highlighted in purple.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Apr 30 12:07:05 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 08:07:05 -0400
Subject: rpms/vim/devel 7.0.230,NONE,1.1
Message-ID: <200704301207.l3UC752Z023005@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22989

Added Files:
	7.0.230 
Log Message:
Patchlevel 230


--- NEW FILE 7.0.230 ---
# KH: patched for runtimeupdate
To: vim-dev at vim.org
Subject: patch 7.0.230
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.230
Problem:    After using ":lcd" a script doesn't know how to restore the
	    current directory.
Solution:   Add the haslocaldir() function. (Bob Hiestand)
Files:	    runtime/doc/usr_41.txt, runtime/doc/eval.txt, src/eval.c


*** ../vim-7.0.229/runtime/doc/usr_41.txt	Sun May  7 17:02:39 2006
--- runtime/doc/usr_41.txt	Thu Apr 26 17:06:48 2007
***************
*** 1,4 ****
! *usr_41.txt*	For Vim version 7.0.  Last change: 2006 Aug 16
  
  		     VIM USER MANUAL - by Bram Moolenaar
  
--- 1,4 ----
! *usr_41.txt*	For Vim version 7.0.  Last change: 2007 Apr 26
  
  		     VIM USER MANUAL - by Bram Moolenaar
  
***************
*** 703,708 ****
--- 703,709 ----
  	isdirectory()		check if a directory exists
  	getfsize()		get the size of a file
  	getcwd()		get the current working directory
+ 	haslocaldir()		check if current window used |:lcd|
  	tempname()		get the name of a temporary file
  	mkdir()			create a new directory
  	delete()		delete a file
*** ../vim-7.0.229/runtime/doc/eval.txt	Tue Mar 27 10:20:58 2007
--- runtime/doc/eval.txt	Tue Apr 24 21:50:49 2007
***************
*** 1,4 ****
! *eval.txt*      For Vim version 7.0.  Last change: 2006 Nov 01
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- 1,4 ----
! *eval.txt*      For Vim version 7.0.  Last change: 2007 Apr 24
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
***************
*** 1623,1628 ****
--- 1633,1639 ----
  globpath( {path}, {expr})	String	do glob({expr}) for all dirs in {path}
  has( {feature})			Number	TRUE if feature {feature} supported
  has_key( {dict}, {key})		Number	TRUE if {dict} has entry {key}
+ haslocaldir()			Number	TRUE if current window executed |:lcd|
  hasmapto( {what} [, {mode} [, {abbr}]])
  				Number	TRUE if mapping to {what} exists
  histadd( {history},{item})	String	add an item to a history
***************
*** 3016,3021 ****
--- 3041,3049 ----
  		The result is a Number, which is 1 if |Dictionary| {dict} has
  		an entry with key {key}.  Zero otherwise.
  
+ haslocaldir()						*haslocaldir()*
+ 		The result is a Number, which is 1 when the current
+                 window has set a local path via |:lcd|, and 0 otherwise.
  
  hasmapto({what} [, {mode} [, {abbr}]])			*hasmapto()*
  		The result is a Number, which is 1 if there is a mapping that
*** ../vim-7.0.229/src/eval.c	Thu Apr 26 10:55:46 2007
--- src/eval.c	Thu Apr 26 10:52:09 2007
***************
*** 541,546 ****
--- 541,547 ----
  static void f_globpath __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_has __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_has_key __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_haslocaldir __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_hasmapto __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_histadd __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_histdel __ARGS((typval_T *argvars, typval_T *rettv));
***************
*** 7110,7115 ****
--- 7111,7117 ----
      {"globpath",	2, 2, f_globpath},
      {"has",		1, 1, f_has},
      {"has_key",		2, 2, f_has_key},
+     {"haslocaldir",	0, 0, f_haslocaldir},
      {"hasmapto",	1, 3, f_hasmapto},
      {"highlightID",	1, 1, f_hlID},		/* obsolete */
      {"highlight_exists",1, 1, f_hlexists},	/* obsolete */
***************
*** 11131,11136 ****
--- 11133,11150 ----
  
      rettv->vval.v_number = dict_find(argvars[0].vval.v_dict,
  				      get_tv_string(&argvars[1]), -1) != NULL;
+ }
+ 
+ /*
+  * "haslocaldir()" function
+  */
+ /*ARGSUSED*/
+     static void
+ f_haslocaldir(argvars, rettv)
+     typval_T	*argvars;
+     typval_T	*rettv;
+ {
+     rettv->vval.v_number = (curwin->w_localdir != NULL);
  }
  
  /*
*** ../vim-7.0.229/src/version.c	Thu Apr 26 16:50:05 2007
--- src/version.c	Thu Apr 26 17:04:15 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     230,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
22. You've already visited all the links at Yahoo and you're halfway through
    Lycos.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Apr 30 12:07:09 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 08:07:09 -0400
Subject: rpms/vim/devel 7.0.231,NONE,1.1
Message-ID: <200704301207.l3UC79G9023025@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23012

Added Files:
	7.0.231 
Log Message:
Patchlevel 231


--- NEW FILE 7.0.231 ---
To: vim-dev at vim.org
Subject: patch 7.0.231
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.231
Problem:    When recovering from a swap file the page size is likely to be
	    different from the minimum.  The block used for the first page
	    then has a buffer of the wrong size, causing a crash when it's
	    reused later.  (Zephaniah Hull)
Solution:   Reallocate the buffer when the page size changes.  Also check that
	    the page size is at least the minimum value.
Files:	    src/memline.c


*** ../vim-7.0.230/src/memline.c	Tue Mar  6 20:27:03 2007
--- src/memline.c	Thu Apr 19 16:10:39 2007
***************
*** 1015,1032 ****
--- 1015,1053 ----
  	msg_end();
  	goto theend;
      }
+ 
      /*
       * If we guessed the wrong page size, we have to recalculate the
       * highest block number in the file.
       */
      if (mfp->mf_page_size != (unsigned)char_to_long(b0p->b0_page_size))
      {
+ 	unsigned previous_page_size = mfp->mf_page_size;
+ 
  	mf_new_page_size(mfp, (unsigned)char_to_long(b0p->b0_page_size));
+ 	if (mfp->mf_page_size < previous_page_size)
+ 	{
+ 	    msg_start();
+ 	    msg_outtrans_attr(mfp->mf_fname, attr | MSG_HIST);
+ 	    MSG_PUTS_ATTR(_(" has been damaged (page size is smaller than minimum value).\n"),
+ 			attr | MSG_HIST);
+ 	    msg_end();
+ 	    goto theend;
+ 	}
  	if ((size = lseek(mfp->mf_fd, (off_t)0L, SEEK_END)) <= 0)
  	    mfp->mf_blocknr_max = 0;	    /* no file or empty file */
  	else
  	    mfp->mf_blocknr_max = (blocknr_T)(size / mfp->mf_page_size);
  	mfp->mf_infile_count = mfp->mf_blocknr_max;
+ 
+ 	/* need to reallocate the memory used to store the data */
+ 	p = alloc(mfp->mf_page_size);
+ 	if (p == NULL)
+ 	    goto theend;
+ 	mch_memmove(p, hp->bh_data, previous_page_size);
+ 	vim_free(hp->bh_data);
+ 	hp->bh_data = p;
+ 	b0p = (ZERO_BL *)(hp->bh_data);
      }
  
  /*
*** ../vim-7.0.230/src/version.c	Thu Apr 26 17:08:16 2007
--- src/version.c	Thu Apr 26 17:11:38 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     231,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
23. You can't call your mother...she doesn't have a modem.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Apr 30 12:07:12 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 08:07:12 -0400
Subject: rpms/vim/devel 7.0.232,NONE,1.1
Message-ID: <200704301207.l3UC7CUJ023045@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23032

Added Files:
	7.0.232 
Log Message:
Patchlevel 232


--- NEW FILE 7.0.232 ---
To: vim-dev at vim.org
Subject: patch 7.0.232 (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.232 (extra)
Problem:    Mac: doesn't support GUI tab page labels.
Solution:   Add GUI tab page labels. (Nicolas Weber)
Files:	    src/feature.h, src/gui.c, src/gui.h, src/gui_mac.c,
	    src/proto/gui_mac.pro


*** ../vim-7.0.231/src/feature.h	Wed Nov  1 18:10:36 2006
--- src/feature.h	Thu Mar 15 19:02:15 2007
***************
*** 756,761 ****
--- 756,762 ----
  #if defined(FEAT_WINDOWS) && defined(FEAT_NORMAL) \
      && (defined(FEAT_GUI_GTK) \
  	|| (defined(FEAT_GUI_MOTIF) && defined(HAVE_XM_NOTEBOOK_H)) \
+ 	|| defined(FEAT_GUI_MAC) \
  	|| (defined(FEAT_GUI_MSWIN) && (!defined(_MSC_VER) || _MSC_VER > 1020)))
  # define FEAT_GUI_TABLINE
  #endif
*** ../vim-7.0.231/src/gui.c	Tue Oct 10 17:36:50 2006
--- src/gui.c	Thu Mar 15 19:02:15 2007
***************
*** 1159,1165 ****
  #endif
  
  # if defined(FEAT_GUI_TABLINE) && (defined(FEAT_GUI_MSWIN) \
! 	|| defined(FEAT_GUI_MOTIF))
      if (gui_has_tabline())
  	text_area_y += gui.tabline_height;
  #endif
--- 1159,1165 ----
  #endif
  
  # if defined(FEAT_GUI_TABLINE) && (defined(FEAT_GUI_MSWIN) \
!  	|| defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_MAC))
      if (gui_has_tabline())
  	text_area_y += gui.tabline_height;
  #endif
*** ../vim-7.0.231/src/gui.h	Thu Apr 27 01:52:33 2006
--- src/gui.h	Thu Mar 15 19:02:15 2007
***************
*** 421,427 ****
  #endif	/* FEAT_GUI_GTK */
  
  #if defined(FEAT_GUI_TABLINE) \
! 	&& (defined(FEAT_GUI_W32) || defined(FEAT_GUI_MOTIF))
      int		tabline_height;
  #endif
  
--- 425,432 ----
  #endif	/* FEAT_GUI_GTK */
  
  #if defined(FEAT_GUI_TABLINE) \
!  	&& (defined(FEAT_GUI_W32) || defined(FEAT_GUI_MOTIF) \
!                  || defined(FEAT_GUI_MAC))
      int		tabline_height;
  #endif
  
*** ../vim-7.0.231/src/gui_mac.c	Thu Mar  8 20:39:02 2007
--- src/gui_mac.c	Fri Mar 16 11:26:05 2007
***************
*** 4,10 ****
   *				GUI/Motif support by Robert Webb
   *				Macintosh port by Dany St-Amant
   *					      and Axel Kielhorn
!  *				Port to MPW by Bernhard Pr?mmer
   *				Initial Carbon port by Ammon Skidmore
   *
   * Do ":help uganda"  in Vim to read copying and usage conditions.
--- 4,10 ----
   *				GUI/Motif support by Robert Webb
   *				Macintosh port by Dany St-Amant
   *					      and Axel Kielhorn
!  *				Port to MPW by Bernhard Pruemmer
   *				Initial Carbon port by Ammon Skidmore
   *
   * Do ":help uganda"  in Vim to read copying and usage conditions.
***************
*** 260,265 ****
--- 260,270 ----
  OSErr HandleUnusedParms(const AppleEvent *theAEvent);
  #endif
  
+ #ifdef FEAT_GUI_TABLINE
+ static void initialise_tabline(void);
+ static WindowRef drawer = NULL; // TODO: put into gui.h
+ #endif
+ 
  /*
   * ------------------------------------------------------------
   * Conversion Utility
***************
*** 2357,2362 ****
--- 2323,2335 ----
  
      thePart = FindWindow(theEvent->where, &whichWindow);
  
+ #ifdef FEAT_GUI_TABLINE
+     /* prevent that the vim window size changes if it's activated by a
+        click into the tab pane */
+     if (whichWindow == drawer)
+         return;
+ #endif
+ 
      switch (thePart)
      {
  	case (inDesk):
***************
*** 3097,3102 ****
--- 3070,3082 ----
  #endif
  */
  
+ #ifdef FEAT_GUI_TABLINE
+     /*
+      * Create the tabline
+      */
+     initialise_tabline();
+ #endif
+ 
      /* TODO: Load bitmap if using TOOLBAR */
      return OK;
  }
***************
*** 5895,5901 ****
      theCPB.dirInfo.ioFDirIndex = 0;
      theCPB.dirInfo.ioNamePtr   = file.name;
      theCPB.dirInfo.ioVRefNum   = file.vRefNum;
!   /*theCPB.hFileInfo.ioDirID   = 0;*/
      theCPB.dirInfo.ioDrDirID   = file.parID;
  
      /* As ioFDirIndex = 0, get the info of ioNamePtr,
--- 5875,5881 ----
      theCPB.dirInfo.ioFDirIndex = 0;
      theCPB.dirInfo.ioNamePtr   = file.name;
      theCPB.dirInfo.ioVRefNum   = file.vRefNum;
!     /*theCPB.hFileInfo.ioDirID   = 0;*/
      theCPB.dirInfo.ioDrDirID   = file.parID;
  
      /* As ioFDirIndex = 0, get the info of ioNamePtr,
***************
*** 6093,6096 ****
--- 6073,6479 ----
      return (script != smRoman
  	    && script == GetScriptManagerVariable(smSysScript)) ? 1 : 0;
  }
+ 
  #endif /* defined(USE_IM_CONTROL) || defined(PROTO) */
+ 
+ 
+ 
+ 
+ #if defined(FEAT_GUI_TABLINE) || defined(PROTO)
+ // drawer implementation
+ static MenuRef contextMenu = NULL;
+ enum
+ {
+     kTabContextMenuId = 42,
+ };
+ 
+ // the caller has to CFRelease() the returned string
+     static CFStringRef
+ getTabLabel(tabpage_T *page)
+ {
+     get_tabline_label(page, FALSE);
+ #ifdef MACOS_CONVERT
+     return mac_enc_to_cfstring(NameBuff, STRLEN(NameBuff));
+ #else
+     // TODO: check internal encoding?
+     return CFStringCreateWithCString(kCFAllocatorDefault, (char *)NameBuff,
+ 						   kCFStringEncodingMacRoman);
+ #endif
+ }
+ 
+ 
+ #define DRAWER_SIZE 150
+ #define DRAWER_INSET 16
+ 
+ static ControlRef dataBrowser = NULL;
+ 
+ // when the tabline is hidden, vim doesn't call update_tabline(). When
+ // the tabline is shown again, show_tabline() is called before upate_tabline(),
+ // and because of this, the tab labels and vims internal tabs are out of sync
+ // for a very short time. to prevent inconsistent state, we store the labels
+ // of the tabs, not pointers to the tabs (which are invalid for a short time).
+ static CFStringRef *tabLabels = NULL;
+ static int tabLabelsSize = 0;
+ 
+ enum
+ {
+     kTabsColumn = 'Tabs'
+ };
+ 
+     static int
+ getTabCount(void)
+ {
+     tabpage_T	*tp;
+     int		numTabs = 0;
+ 
+     for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
+         ++numTabs;
+     return numTabs;
+ }
+ 
+ // data browser item display callback
+     static OSStatus
+ dbItemDataCallback(ControlRef browser,
+ 	DataBrowserItemID itemID,
+         DataBrowserPropertyID property /* column id */,
+         DataBrowserItemDataRef itemData,
+ 	Boolean changeValue)
+ {
+     OSStatus status = noErr;
+ 
+     // assert(property == kTabsColumn); // why is this violated??
+ 
+     // changeValue is true if we have a modifieable list and data was changed.
+     // In our case, it's always false.
+     // (that is: if (changeValue) updateInternalData(); else return
+     // internalData();
+     if (!changeValue)
+     {
+ 	CFStringRef str;
+ 
+ 	assert(itemID - 1 >= 0 && itemID - 1 < tabLabelsSize);
+ 	str = tabLabels[itemID - 1];
+ 	status = SetDataBrowserItemDataText(itemData, str);
+     }
+     else
+ 	status = errDataBrowserPropertyNotSupported;
+ 
+     return status;
+ }
+ 
+ // data browser action callback
+     static void
+ dbItemNotificationCallback(ControlRef browser,
+ 	DataBrowserItemID item,
+ 	DataBrowserItemNotification message)
+ {
+     switch (message)
+     {
+ 	case kDataBrowserItemSelected:
+ 	    send_tabline_event(item);
+ 	    break;
+     }
+ }
+ 
+ // callbacks needed for contextual menu:
+     static void
+ dbGetContextualMenuCallback(ControlRef browser,
+ 	MenuRef *menu,
+         UInt32 *helpType,
+ 	CFStringRef *helpItemString,
+         AEDesc *selection)
+ {
+     // on mac os 9: kCMHelpItemNoHelp, but it's not the same
+     *helpType = kCMHelpItemRemoveHelp; // OS X only ;-)
+     *helpItemString = NULL;
+ 
+     *menu = contextMenu;
+ }
+ 
+     static void
+ dbSelectContextualMenuCallback(ControlRef browser,
+ 	MenuRef menu,
+ 	UInt32 selectionType,
+ 	SInt16 menuID,
+ 	MenuItemIndex menuItem)
+ {
+     if (selectionType == kCMMenuItemSelected)
+     {
+ 	MenuCommand command;
+ 	GetMenuItemCommandID(menu, menuItem, &command);
+ 
+ 	// get tab that was selected when the context menu appeared
+ 	// (there is always one tab selected). TODO: check if the context menu
+ 	// isn't opened on an item but on empty space (has to be possible some
+ 	// way, the finder does it too ;-) )
+ 	Handle items = NewHandle(0);
+ 	if (items != NULL)
+ 	{
+ 	    int numItems;
+ 
+ 	    GetDataBrowserItems(browser, kDataBrowserNoItem, false,
+ 					   kDataBrowserItemIsSelected, items);
+ 	    numItems = GetHandleSize(items) / sizeof(DataBrowserItemID);
+ 	    if (numItems > 0)
+ 	    {
+ 		int idx;
+ 		DataBrowserItemID *itemsPtr;
+ 
+ 		HLock(items);
+ 		itemsPtr = (DataBrowserItemID *)*items;
+ 		idx = itemsPtr[0];
+ 		HUnlock(items);
+ 		send_tabline_menu_event(idx, command);
+ 	    }
+ 	    DisposeHandle(items);
+ 	}
+     }
+ }
+ 
+ // focus callback of the data browser to always leave focus in vim
+     static OSStatus
+ dbFocusCallback(EventHandlerCallRef handler, EventRef event, void *data)
+ {
+     assert(GetEventClass(event) == kEventClassControl
+ 	    && GetEventKind(event) == kEventControlSetFocusPart);
+ 
+     return paramErr;
+ }
+ 
+ 
+ // drawer callback to resize data browser to drawer size
+     static OSStatus
+ drawerCallback(EventHandlerCallRef handler, EventRef event, void *data)
+ {
+     switch (GetEventKind(event))
+     {
+ 	case kEventWindowBoundsChanged: // move or resize
+ 	    {
+ 		UInt32 attribs;
+ 		GetEventParameter(event, kEventParamAttributes, typeUInt32,
+ 				       NULL, sizeof(attribs), NULL, &attribs);
+ 		if (attribs & kWindowBoundsChangeSizeChanged) // resize
+ 		{
+ 		    Rect r;
+ 		    GetWindowBounds(drawer, kWindowContentRgn, &r);
+ 		    SetRect(&r, 0, 0, r.right - r.left, r.bottom - r.top);
+ 		    SetControlBounds(dataBrowser, &r);
+ 		    SetDataBrowserTableViewNamedColumnWidth(dataBrowser,
+ 							kTabsColumn, r.right);
+ 		}
+ 	    }
+ 	    break;
+     }
+ 
+     return eventNotHandledErr;
+ }
+ 
+ // Load DataBrowserChangeAttributes() dynamically on tiger (and better).
+ // This way the code works on 10.2 and 10.3 as well (it doesn't have the
+ // blue highlights in the list view on these systems, though. Oh well.)
+ 
+ 
+ #import <mach-o/dyld.h>
+ 
+ enum { kMyDataBrowserAttributeListViewAlternatingRowColors = (1 << 1) };
+ 
+     static OSStatus
+ myDataBrowserChangeAttributes(ControlRef inDataBrowser,
+ 	OptionBits inAttributesToSet,
+ 	OptionBits inAttributesToClear)
+ {
+     long osVersion;
+     char *symbolName;
+     NSSymbol symbol = NULL;
+     OSStatus (*dataBrowserChangeAttributes)(ControlRef inDataBrowser,
+ 	      OptionBits   inAttributesToSet, OptionBits inAttributesToClear);
+ 
+     Gestalt(gestaltSystemVersion, &osVersion);
+     if (osVersion < 0x1040) // only supported for 10.4 (and up)
+ 	return noErr;
+ 
+     // C name mangling...
+     symbolName = "_DataBrowserChangeAttributes";
+     if (!NSIsSymbolNameDefined(symbolName)
+ 	    || (symbol = NSLookupAndBindSymbol(symbolName)) == NULL)
+ 	return noErr;
+ 
+     dataBrowserChangeAttributes = NSAddressOfSymbol(symbol);
+     if (dataBrowserChangeAttributes == NULL)
+ 	return noErr; // well...
+     return dataBrowserChangeAttributes(inDataBrowser,
+ 				      inAttributesToSet, inAttributesToClear);
+ }
+ 
+     static void
+ initialise_tabline(void)
+ {
+     Rect drawerRect = { 0, 0, 0, DRAWER_SIZE };
+     DataBrowserCallbacks dbCallbacks;
+     EventTypeSpec focusEvent = {kEventClassControl, kEventControlSetFocusPart};
+     EventTypeSpec resizeEvent = {kEventClassWindow, kEventWindowBoundsChanged};
+     DataBrowserListViewColumnDesc colDesc;
+ 
+     // drawers have to have compositing enabled
+     CreateNewWindow(kDrawerWindowClass,
+ 	    kWindowStandardHandlerAttribute
+ 		    | kWindowCompositingAttribute
+ 		    | kWindowResizableAttribute
+ 		    | kWindowLiveResizeAttribute,
+ 	    &drawerRect, &drawer);
+ 
+     SetThemeWindowBackground(drawer, kThemeBrushDrawerBackground, true);
+     SetDrawerParent(drawer, gui.VimWindow);
+     SetDrawerOffsets(drawer, kWindowOffsetUnchanged, DRAWER_INSET);
+ 
+ 
+     // create list view embedded in drawer
+     CreateDataBrowserControl(drawer, &drawerRect, kDataBrowserListView,
+ 								&dataBrowser);
+ 
+     dbCallbacks.version = kDataBrowserLatestCallbacks;
+     InitDataBrowserCallbacks(&dbCallbacks);
+     dbCallbacks.u.v1.itemDataCallback =
+ 				NewDataBrowserItemDataUPP(dbItemDataCallback);
+     dbCallbacks.u.v1.itemNotificationCallback =
+ 		NewDataBrowserItemNotificationUPP(dbItemNotificationCallback);
+     dbCallbacks.u.v1.getContextualMenuCallback =
+ 	      NewDataBrowserGetContextualMenuUPP(dbGetContextualMenuCallback);
+     dbCallbacks.u.v1.selectContextualMenuCallback =
+ 	NewDataBrowserSelectContextualMenuUPP(dbSelectContextualMenuCallback);
+ 
+     SetDataBrowserCallbacks(dataBrowser, &dbCallbacks);
+ 
+     SetDataBrowserListViewHeaderBtnHeight(dataBrowser, 0); // no header
+     SetDataBrowserHasScrollBars(dataBrowser, false, true); // only vertical
+     SetDataBrowserSelectionFlags(dataBrowser,
+ 	      kDataBrowserSelectOnlyOne | kDataBrowserNeverEmptySelectionSet);
+     SetDataBrowserTableViewHiliteStyle(dataBrowser,
+ 					     kDataBrowserTableViewFillHilite);
+     Boolean b = false;
+     SetControlData(dataBrowser, kControlEntireControl,
+ 		  kControlDataBrowserIncludesFrameAndFocusTag, sizeof(b), &b);
+ 
+     // enable blue background in data browser (this is only in 10.4 and vim
+     // has to support older osx versions as well, so we have to load this
+     // function dynamically)
+     myDataBrowserChangeAttributes(dataBrowser,
+ 		      kMyDataBrowserAttributeListViewAlternatingRowColors, 0);
+ 
+     // install callback that keeps focus in vim and away from the data browser
+     InstallControlEventHandler(dataBrowser, dbFocusCallback, 1, &focusEvent,
+ 								  NULL, NULL);
+ 
+     // install callback that keeps data browser at the size of the drawer
+     InstallWindowEventHandler(drawer, drawerCallback, 1, &resizeEvent,
+ 								  NULL, NULL);
+ 
+     // add "tabs" column to data browser
+     colDesc.propertyDesc.propertyID = kTabsColumn;
+     colDesc.propertyDesc.propertyType = kDataBrowserTextType;
+ 
+     // add if items can be selected (?): kDataBrowserListViewSelectionColumn
+     colDesc.propertyDesc.propertyFlags = kDataBrowserDefaultPropertyFlags;
+ 
+     colDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;
+     colDesc.headerBtnDesc.minimumWidth = 100;
+     colDesc.headerBtnDesc.maximumWidth = 150;
+     colDesc.headerBtnDesc.titleOffset = 0;
+     colDesc.headerBtnDesc.titleString = CFSTR("Tabs");
+     colDesc.headerBtnDesc.initialOrder = kDataBrowserOrderIncreasing;
+     colDesc.headerBtnDesc.btnFontStyle.flags = 0; // use default font
+     colDesc.headerBtnDesc.btnContentInfo.contentType = kControlContentTextOnly;
+ 
+     AddDataBrowserListViewColumn(dataBrowser, &colDesc, 0);
+ 
+     // create tabline popup menu required by vim docs (see :he tabline-menu)
+     CreateNewMenu(kTabContextMenuId, 0, &contextMenu);
+     AppendMenuItemTextWithCFString(contextMenu, CFSTR("Close"), 0,
+ 						    TABLINE_MENU_CLOSE, NULL);
+     AppendMenuItemTextWithCFString(contextMenu, CFSTR("New Tab"), 0,
+ 						      TABLINE_MENU_NEW, NULL);
+     AppendMenuItemTextWithCFString(contextMenu, CFSTR("Open Tab..."), 0,
+ 						     TABLINE_MENU_OPEN, NULL);
+ }
+ 
+ 
+ /*
+  * Show or hide the tabline.
+  */
+     void
+ gui_mch_show_tabline(int showit)
+ {
+     if (showit == 0)
+         CloseDrawer(drawer, true);
+     else
+         OpenDrawer(drawer, kWindowEdgeRight, true);
+ }
+ 
+ /*
+  * Return TRUE when tabline is displayed.
+  */
+     int
+ gui_mch_showing_tabline(void)
+ {
+     WindowDrawerState state = GetDrawerState(drawer);
+ 
+     return state == kWindowDrawerOpen || state == kWindowDrawerOpening;
+ }
+ 
+ /*
+  * Update the labels of the tabline.
+  */
+     void
+ gui_mch_update_tabline(void)
+ {
+     tabpage_T	*tp;
+     int		numTabs = getTabCount();
+     int		nr = 1;
+     int		curtabidx = 1;
+ 
+     // adjust data browser
+     if (tabLabels != NULL)
+     {
+         int i;
+ 
+         for (i = 0; i < tabLabelsSize; ++i)
+             CFRelease(tabLabels[i]);
+         free(tabLabels);
+     }
+     tabLabels = (CFStringRef *)malloc(numTabs * sizeof(CFStringRef));
+     tabLabelsSize = numTabs;
+ 
+     for (tp = first_tabpage; tp != NULL; tp = tp->tp_next, ++nr)
+     {
+ 	if (tp == curtab)
+ 	    curtabidx = nr;
+         tabLabels[nr-1] = getTabLabel(tp);
+     }
+ 
+     RemoveDataBrowserItems(dataBrowser, kDataBrowserNoItem, 0, NULL,
+ 						  kDataBrowserItemNoProperty);
+     // data browser uses ids 1, 2, 3, ... numTabs per default, so we
+     // can pass NULL for the id array
+     AddDataBrowserItems(dataBrowser, kDataBrowserNoItem, numTabs, NULL,
+ 						  kDataBrowserItemNoProperty);
+ 
+     DataBrowserItemID item = curtabidx;
+     SetDataBrowserSelectedItems(dataBrowser, 1, &item, kDataBrowserItemsAssign);
+ }
+ 
+ /*
+  * Set the current tab to "nr".  First tab is 1.
+  */
+     void
+ gui_mch_set_curtab(nr)
+     int		nr;
+ {
+     DataBrowserItemID item = nr;
+     SetDataBrowserSelectedItems(dataBrowser, 1, &item, kDataBrowserItemsAssign);
+ 
+     // TODO: call something like this?: (or restore scroll position, or...)
+     RevealDataBrowserItem(dataBrowser, item, kTabsColumn,
+ 						      kDataBrowserRevealOnly);
+ }
+ 
+ #endif // FEAT_GUI_TABLINE
*** ../vim-7.0.231/src/proto/gui_mac.pro	Tue Mar 28 23:01:02 2006
--- src/proto/gui_mac.pro	Thu Mar 15 20:23:42 2007
***************
*** 84,89 ****
--- 84,93 ----
  int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield));
  char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
  void gui_mch_set_foreground __ARGS((void));
+ void gui_mch_show_tabline __ARGS((int showit));
+ int gui_mch_showing_tabline __ARGS((void));
+ void gui_mch_update_tabline __ARGS((void));
+ void gui_mch_set_curtab __ARGS((int nr));
  
  char_u *C2Pascal_save __ARGS((char_u *Cstring));
  char_u *C2Pascal_save_and_remove_backslash __ARGS((char_u *Cstring));
*** ../vim-7.0.231/src/version.c	Thu Apr 26 17:23:28 2007
--- src/version.c	Thu Apr 26 18:17:42 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     232,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
24. You realize there is not a sound in the house and you have no idea where
    your children are.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Apr 30 12:07:16 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 08:07:16 -0400
Subject: rpms/vim/devel 7.0.233,NONE,1.1
Message-ID: <200704301207.l3UC7Gho023065@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23052

Added Files:
	7.0.233 
Log Message:
Patchlevel 233


--- NEW FILE 7.0.233 ---
To: vim-dev at vim.org
Subject: patch 7.0.233 (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.233 (extra)
Problem:    Mac: code formatted badly.
Solution:   Fix code formatting
Files:	    src/gui_mac.c


*** ../vim-7.0.232/src/gui_mac.c	Thu Apr 26 18:22:12 2007
--- src/gui_mac.c	Fri Mar 16 11:26:05 2007
***************
*** 28,38 ****
   *
   */
  
!  /* TODO (Jussi)
!   *   * Clipboard does not work (at least some cases)
!   *   * ATSU font rendering has some problems
!   *   * Investigate and remove dead code (there is still lots of that)
!   */
  
  #include <Devices.h> /* included first to avoid CR problems */
  #include "vim.h"
--- 28,38 ----
   *
   */
  
! /* TODO (Jussi)
!  *   * Clipboard does not work (at least some cases)
!  *   * ATSU font rendering has some problems
!  *   * Investigate and remove dead code (there is still lots of that)
!  */
  
  #include <Devices.h> /* included first to avoid CR problems */
  #include "vim.h"
***************
*** 504,512 ****
      /* Get number of files in list */
      *error = AECountItems(theList, numFiles);
      if (*error)
!     {
! 	return(fnames);
!     }
  
      /* Allocate the pointer list */
      fnames = (char_u **) alloc(*numFiles * sizeof(char_u *));
--- 504,510 ----
      /* Get number of files in list */
      *error = AECountItems(theList, numFiles);
      if (*error)
! 	return fnames;
  
      /* Allocate the pointer list */
      fnames = (char_u **) alloc(*numFiles * sizeof(char_u *));
***************
*** 526,532 ****
  	{
  	    /* Caller is able to clean up */
  	    /* TODO: Should be clean up or not? For safety. */
! 	    return(fnames);
  	}
  
  	/* Convert the FSSpec to a pathname */
--- 524,530 ----
  	{
  	    /* Caller is able to clean up */
  	    /* TODO: Should be clean up or not? For safety. */
! 	    return fnames;
  	}
  
  	/* Convert the FSSpec to a pathname */
***************
*** 589,603 ****
  
      error = AEGetParamPtr(theAEvent, keyDirectObject, typeChar, &typeCode, (Ptr) &SearchData, sizeof(WindowSearch), &actualSize);
      if (error)
!     {
! 	return(error);
!     }
  
      error = HandleUnusedParms(theAEvent);
      if (error)
!     {
! 	return(error);
!     }
  
      for (buf = firstbuf; buf != NULL; buf = buf->b_next)
  	if (buf->b_ml.ml_mfp != NULL
--- 587,597 ----
  
      error = AEGetParamPtr(theAEvent, keyDirectObject, typeChar, &typeCode, (Ptr) &SearchData, sizeof(WindowSearch), &actualSize);
      if (error)
! 	return error;
  
      error = HandleUnusedParms(theAEvent);
      if (error)
! 	return error;
  
      for (buf = firstbuf; buf != NULL; buf = buf->b_next)
  	if (buf->b_ml.ml_mfp != NULL
***************
*** 668,676 ****
  
      error = HandleUnusedParms(theAEvent);
      if (error)
!     {
! 	return(error);
!     }
  
      /* Send the reply */
  /*  replyObject.descriptorType = typeNull;
--- 662,668 ----
  
      error = HandleUnusedParms(theAEvent);
      if (error)
! 	return error;
  
      /* Send the reply */
  /*  replyObject.descriptorType = typeNull;
***************
*** 679,687 ****
  /* AECreateDesc(typeChar, (Ptr)&title[1], title[0], &data) */
      error = AECreateList(nil, 0, false, &replyList);
      if (error)
!     {
! 	return(error);
!     }
  
  #if 0
      error = AECountItems(&replyList, &numFiles);
--- 671,677 ----
  /* AECreateDesc(typeChar, (Ptr)&title[1], title[0], &data) */
      error = AECreateList(nil, 0, false, &replyList);
      if (error)
! 	return error;
  
  #if 0
      error = AECountItems(&replyList, &numFiles);
***************
*** 775,783 ****
      error = AEGetParamPtr(theAEvent, keyDirectObject, typeChar, &typeCode, (Ptr) &GetTextData, sizeof(GetTextData), &actualSize);
  
      if (error)
!     {
! 	return(error);
!     }
  
      for (buf = firstbuf; buf != NULL; buf = buf->b_next)
  	if (buf->b_ml.ml_mfp != NULL)
--- 765,771 ----
      error = AEGetParamPtr(theAEvent, keyDirectObject, typeChar, &typeCode, (Ptr) &GetTextData, sizeof(GetTextData), &actualSize);
  
      if (error)
! 	return error;
  
      for (buf = firstbuf; buf != NULL; buf = buf->b_next)
  	if (buf->b_ml.ml_mfp != NULL)
***************
*** 826,837 ****
      }
  
      error = HandleUnusedParms(theAEvent);
-     if (error)
-     {
- 	return(error);
-     }
  
!     return(error);
  }
  
  /*
--- 814,821 ----
      }
  
      error = HandleUnusedParms(theAEvent);
  
!     return error;
  }
  
  /*
***************
*** 1017,1025 ****
      /* the direct object parameter is the list of aliases to files (one or more) */
      error = AEGetParamDesc(theAEvent, keyDirectObject, typeAEList, &theList);
      if (error)
!     {
! 	return(error);
!     }
  
  
      error = AEGetParamPtr(theAEvent, keyAEPosition, typeChar, &typeCode, (Ptr) &thePosition, sizeof(SelectionRange), &actualSize);
--- 1001,1007 ----
      /* the direct object parameter is the list of aliases to files (one or more) */
      error = AEGetParamDesc(theAEvent, keyDirectObject, typeAEList, &theList);
      if (error)
! 	return error;
  
  
      error = AEGetParamPtr(theAEvent, keyAEPosition, typeChar, &typeCode, (Ptr) &thePosition, sizeof(SelectionRange), &actualSize);
***************
*** 1028,1036 ****
      if (error == errAEDescNotFound)
  	error = noErr;
      if (error)
!     {
! 	return(error);
!     }
  
  /*
      error = AEGetParamDesc(theAEvent, keyAEPosition, typeChar, &thePosition);
--- 1010,1016 ----
      if (error == errAEDescNotFound)
  	error = noErr;
      if (error)
! 	return error;
  
  /*
      error = AEGetParamDesc(theAEvent, keyAEPosition, typeChar, &thePosition);
***************
*** 1134,1148 ****
      /* Fake mouse event to wake from stall */
      PostEvent(mouseUp, 0);
  
!   finished:
      AEDisposeDesc(&theList); /* dispose what we allocated */
  
      error = HandleUnusedParms(theAEvent);
!     if (error)
!     {
! 	return(error);
!     }
!     return(error);
  }
  
  /*
--- 1114,1124 ----
      /* Fake mouse event to wake from stall */
      PostEvent(mouseUp, 0);
  
! finished:
      AEDisposeDesc(&theList); /* dispose what we allocated */
  
      error = HandleUnusedParms(theAEvent);
!     return error;
  }
  
  /*
***************
*** 1158,1169 ****
      OSErr	error = noErr;
  
      error = HandleUnusedParms(theAEvent);
!     if (error)
!     {
! 	return(error);
!     }
! 
!     return(error);
  }
  
  /*
--- 1134,1140 ----
      OSErr	error = noErr;
  
      error = HandleUnusedParms(theAEvent);
!     return error;
  }
  
  /*
***************
*** 1180,1193 ****
  
      error = HandleUnusedParms(theAEvent);
      if (error)
!     {
! 	return(error);
!     }
  
      /* Need to fake a :confirm qa */
      do_cmdline_cmd((char_u *)"confirm qa");
  
!     return(error);
  }
  
  /*
--- 1151,1162 ----
  
      error = HandleUnusedParms(theAEvent);
      if (error)
! 	return error;
  
      /* Need to fake a :confirm qa */
      do_cmdline_cmd((char_u *)"confirm qa");
  
!     return error;
  }
  
  /*
***************
*** 1203,1214 ****
      OSErr	error = noErr;
  
      error = HandleUnusedParms(theAEvent);
-     if (error)
-     {
- 	return(error);
-     }
  
!     return(error);
  }
  
  /*
--- 1172,1179 ----
      OSErr	error = noErr;
  
      error = HandleUnusedParms(theAEvent);
  
!     return error;
  }
  
  /*
***************
*** 1225,1236 ****
      OSErr	error = noErr;
  
      error = HandleUnusedParms(theAEvent);
-     if (error)
-     {
- 	return(error);
-     }
  
!     return(error);
  }
  
  
--- 1190,1197 ----
      OSErr	error = noErr;
  
      error = HandleUnusedParms(theAEvent);
  
!     return error;
  }
  
  
***************
*** 2517,2523 ****
  
      return noErr;
  
!   bail:
      /*
       * when we fail give any additional callback handler a chance to perform
       * it's actions
--- 2478,2484 ----
  
      return noErr;
  
! bail:
      /*
       * when we fail give any additional callback handler a chance to perform
       * it's actions
***************
*** 2907,2913 ****
  #endif
  
      static OSErr
! receiveHandler(WindowRef theWindow, void* handlerRefCon, DragRef theDrag)
  {
      int		x, y;
      int_u	modifiers;
--- 2868,2874 ----
  #endif
  
      static OSErr
! receiveHandler(WindowRef theWindow, void *handlerRefCon, DragRef theDrag)
  {
      int		x, y;
      int_u	modifiers;
***************
*** 4982,4988 ****
      SetControl32BitMaximum (sb->id, max);
      SetControl32BitMinimum (sb->id, 0);
      SetControl32BitValue   (sb->id, val);
!     SetControlViewSize     (sb->id, size);    
  #ifdef DEBUG_MAC_SB
      printf("thumb_sb (%x) %x, %x,%x\n",sb->id, val, size, max);
  #endif
--- 4943,4949 ----
      SetControl32BitMaximum (sb->id, max);
      SetControl32BitMinimum (sb->id, 0);
      SetControl32BitValue   (sb->id, val);
!     SetControlViewSize     (sb->id, size);
  #ifdef DEBUG_MAC_SB
      printf("thumb_sb (%x) %x, %x,%x\n",sb->id, val, size, max);
  #endif
*** ../vim-7.0.232/src/version.c	Thu Apr 26 18:22:12 2007
--- src/version.c	Thu Apr 26 18:41:08 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     233,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
25. You believe nothing looks sexier than a man in boxer shorts illuminated
    only by a 17" inch svga monitor.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Apr 30 12:07:19 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 08:07:19 -0400
Subject: rpms/vim/devel 7.0.234,NONE,1.1
Message-ID: <200704301207.l3UC7JHl023085@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23072

Added Files:
	7.0.234 
Log Message:
Patchlevel 234


--- NEW FILE 7.0.234 ---
To: vim-dev at vim.org
Subject: patch 7.0.234
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.234
Problem:    It's possible to use feedkeys() from a modeline.  That is a
	    security issue, can be used for a trojan horse.
Solution:   Disallow using feedkeys() in the sandbox.
Files:	    src/eval.c


*** ../vim-7.0.233/src/eval.c	Thu Apr 26 17:08:16 2007
--- src/eval.c	Fri Apr 27 21:48:18 2007
***************
*** 9078,9083 ****
--- 9078,9089 ----
      int		typed = FALSE;
      char_u	*keys_esc;
  
+     /* This is not allowed in the sandbox.  If the commands would still be
+      * executed in the sandbox it would be OK, but it probably happens later,
+      * when "sandbox" is no longer set. */
+     if (check_secure())
+ 	return;
+ 
      rettv->vval.v_number = 0;
      keys = get_tv_string(&argvars[0]);
      if (*keys != NUL)
*** ../vim-7.0.233/src/version.c	Thu Apr 26 18:42:17 2007
--- src/version.c	Fri Apr 27 22:13:23 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     234,
  /**/

-- 
"Making it up?  Why should I want to make anything up?  Life's bad enough
as it is without wanting to invent any more of it."
		-- Marvin, the Paranoid Android in Douglas Adams'
		   "The Hitchhiker's Guide to the Galaxy"

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Apr 30 12:07:22 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 08:07:22 -0400
Subject: rpms/vim/devel 7.0.235,NONE,1.1
Message-ID: <200704301207.l3UC7MZZ023105@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23092

Added Files:
	7.0.235 
Log Message:
Patchlevel 235


--- NEW FILE 7.0.235 ---
To: vim-dev at vim.org
Subject: patch 7.0.235
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.235
Problem:    It is possible to use writefile() in the sandbox.
Solution:   Add a few more checks for the sandbox.
Files:      src/eval.c
    

*** ../vim-7.0.234/src/eval.c	Fri Apr 27 22:17:43 2007
--- src/eval.c	Sat Apr 28 21:36:02 2007
***************
*** 15598,15603 ****
--- 15598,15606 ----
      int		err = FALSE;
      FILE	*fd;
  
+     if (check_restricted() || check_secure())
+ 	return;
+ 
      if (argvars[1].v_type != VAR_UNKNOWN)
      {
  	/*
***************
*** 16430,16435 ****
--- 16433,16441 ----
      char_u	*s;
      int		ret = 0;
      int		c;
+ 
+     if (check_restricted() || check_secure())
+ 	return;
  
      if (argvars[0].v_type != VAR_LIST)
      {
*** ../vim-7.0.234/src/version.c	Fri Apr 27 22:17:43 2007
--- src/version.c	Sun Apr 29 13:54:29 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     235,
  /**/

-- 
Now it is such a bizarrely improbable coincidence that anything as
mind-bogglingly useful as the Babel fish could have evolved purely by chance
that some thinkers have chosen to see it as a final and clinching proof of the
NON-existence of God.
The argument goes something like this: 'I refuse to prove that I exist,' says
God, 'for proof denies faith, and without faith I am nothing.'
'But,' says Man, 'the Babel fish is a dead giveaway, isn't it?  It could not
have evolved by chance.  It proves you exist, and so therefore, by your own
arguments, you don't.  QED.'
'Oh dear,' says God, 'I hadn't thought of that,' and promptly vanishes in a
puff of logic.
'Oh, that was easy,' says Man, and for an encore goes on to prove that black
is white and gets himself killed on the next pedestrian crossing.
		-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Apr 30 12:07:48 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 08:07:48 -0400
Subject: rpms/vim/devel vim.spec,1.165,1.166 README.patches,1.75,1.76
Message-ID: <200704301207.l3UC7mRw023131@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23116

Modified Files:
	vim.spec README.patches 
Log Message:
- update to patchlevel 235, fixes modeline issues


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- vim.spec	17 Apr 2007 11:56:52 -0000	1.165
+++ vim.spec	30 Apr 2007 12:07:45 -0000	1.166
@@ -15,13 +15,13 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim70%{?beta}
-%define patchlevel 224
+%define patchlevel 235
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -277,6 +277,19 @@
 Patch222: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.222
 Patch223: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.223
 Patch224: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.224
+Patch225: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.225
+Patch226: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.226
+Patch227: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.227
+Patch228: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.228
+Patch229: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.229
+Patch230: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.230
+Patch231: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.231
+# Mac:
+#Patch232: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.232
+# Mac:
+#Patch233: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.233
+Patch234: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.234
+Patch235: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.235
 
 Patch3000: vim-7.0-syntax.patch
 #Patch3001: vim-6.2-rh1.patch
@@ -669,7 +682,18 @@
 %patch222 -p0
 %patch223 -p0
 %patch224 -p0
-
+%patch225 -p0
+%patch226 -p0
+%patch227 -p0
+%patch228 -p0
+%patch229 -p0
+%patch230 -p0
+%patch231 -p0
+# Mac:
+#patch232 -p0
+#patch233 -p0
+%patch234 -p0
+%patch235 -p0
 
 # install spell files
 %if %{withvimspell}
@@ -1057,6 +1081,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Mon Apr 30 2007 Karsten Hopp <karsten at redhat.com> 7.0.235-1
+- update to patchlevel 235, fixes modeline issues 
+
 * Tue Apr 17 2007 Karsten Hopp <karsten at redhat.com> 7.0.224-3
 - fix typo in require line (vim-X11 - 2:7.0.224-2.fc7.i386 requires 4)
 


Index: README.patches
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/README.patches,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- README.patches	30 Mar 2007 11:16:51 -0000	1.75
+++ README.patches	30 Apr 2007 12:07:45 -0000	1.76
@@ -255,3 +255,14 @@
   4147  7.0.222  'cindent' works for Perl, except for recognizing comments
   2604  7.0.223  popup menu could not handle unprintable characters
   6467  7.0.224  when expanding "##" spaces are escaped twice
+  2203  7.0.225  after setline() cursor may be on wrong byte of mulit-byte char
+  1578  7.0.226  display flicker when setting sign through netbeans interface
+  1720  7.0.227  crash when closing a window in the GUI
+  1779  7.0.228  Cygwin: problem with symlink to DOS style path
+  1806  7.0.229  if 'pt' starts with Esc then Insert mode Esc doesn't time out
+  4586  7.0.230  a script doesn't know if the current dir is a local dir
+  2628  7.0.231  recovery from a swap file may crash
+ 18671  7.0.232  (extra) Mac: GUI tab labels are not supported
+  9738  7.0.233  (extra) Mac: code badly formatted
+  1723  7.0.234  feedkeys() may be invoked from a modeline
+  2299  7.0.235  writefile() may be invoked from a modeline



From fedora-cvs-commits at redhat.com  Mon Apr 30 13:00:50 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 09:00:50 -0400
Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.15,
	1.16 policycoreutils.spec, 1.408, 1.409
Message-ID: <200704301300.l3UD0oMs025472@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25405

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Mon Apr 30 2007 Dan Walsh <dwalsh at redhat.com> 2.0.14-2
- Fix title on system-config-selinux


policycoreutils-gui.patch:
 Makefile                    |   34 
 booleansPage.py             |  224 +++
 fcontextPage.py             |  207 +++
 loginsPage.py               |  173 ++
 mappingsPage.py             |   54 
 modulesPage.py              |  172 ++
 polgen.glade                | 1168 ++++++++++++++++
 polgen.py                   |  455 ++++++
 polgengui.py                |  253 +++
 portsPage.py                |  227 +++
 selinux.tbl                 |  274 +++
 semanagePage.py             |  115 +
 statusPage.py               |  220 +++
 system-config-selinux.glade | 3035 ++++++++++++++++++++++++++++++++++++++++++++
 system-config-selinux.py    |  169 ++
 templates/__init__.py       |   18 
 templates/executable.py     |  156 ++
 templates/network.py        |   44 
 templates/rw.py             |  104 +
 templates/script.py         |   42 
 templates/semodule.py       |   41 
 templates/tmp.py            |   72 +
 templates/var_lib.py        |  137 +
 templates/var_log.py        |   89 +
 templates/var_run.py        |   95 +
 templates/var_spool.py      |  105 +
 translationsPage.py         |  111 +
 usersPage.py                |  166 ++
 28 files changed, 7960 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- policycoreutils-gui.patch	24 Apr 2007 18:51:20 -0000	1.15
+++ policycoreutils-gui.patch	30 Apr 2007 13:00:48 -0000	1.16
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.10/gui/booleansPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.14/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/booleansPage.py	2007-04-24 14:43:23.000000000 -0400
++++ policycoreutils-2.0.14/gui/booleansPage.py	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,224 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -226,9 +226,9 @@
 +
 +        setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val)
 +        commands.getstatusoutput(setsebool)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.10/gui/fcontextPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.14/gui/fcontextPage.py
 --- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/fcontextPage.py	2007-04-24 14:43:23.000000000 -0400
++++ policycoreutils-2.0.14/gui/fcontextPage.py	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,207 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -437,9 +437,9 @@
 +        self.store.set_value(iter, SPEC_COL, fspec)
 +        self.store.set_value(iter, FTYPE_COL, ftype)
 +        self.store.set_value(iter, TYPE_COL, "system_u:object_r:%s:%s" % (type, mls))
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.10/gui/loginsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.14/gui/loginsPage.py
 --- nsapolicycoreutils/gui/loginsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/loginsPage.py	2007-04-24 14:43:23.000000000 -0400
++++ policycoreutils-2.0.14/gui/loginsPage.py	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,173 @@
 +## loginsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -614,9 +614,9 @@
 +        self.store.set_value(iter, 1, seuser)
 +        self.store.set_value(iter, 2, seobject.translate(serange))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.10/gui/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.14/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/Makefile	2007-04-24 14:43:23.000000000 -0400
++++ policycoreutils-2.0.14/gui/Makefile	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,34 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
@@ -652,9 +652,9 @@
 +indent:
 +
 +relabel:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.10/gui/mappingsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.14/gui/mappingsPage.py
 --- nsapolicycoreutils/gui/mappingsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/mappingsPage.py	2007-04-24 14:43:23.000000000 -0400
++++ policycoreutils-2.0.14/gui/mappingsPage.py	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,54 @@
 +## mappingsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -710,9 +710,9 @@
 +        for k in keys:
 +            print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1]))
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.10/gui/modulesPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.14/gui/modulesPage.py
 --- nsapolicycoreutils/gui/modulesPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/modulesPage.py	2007-04-24 14:43:23.000000000 -0400
++++ policycoreutils-2.0.14/gui/modulesPage.py	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,172 @@
 +## modulesPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -886,9 +886,9 @@
 +        
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.10/gui/polgen.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.14/gui/polgen.glade
 --- nsapolicycoreutils/gui/polgen.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/polgen.glade	2007-04-24 14:49:29.000000000 -0400
++++ policycoreutils-2.0.14/gui/polgen.glade	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,1168 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -2058,9 +2058,9 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.10/gui/polgengui.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.14/gui/polgengui.py
 --- nsapolicycoreutils/gui/polgengui.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/polgengui.py	2007-04-24 14:49:20.000000000 -0400
++++ policycoreutils-2.0.14/gui/polgengui.py	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,253 @@
 +#!/usr/bin/python
 +#
@@ -2315,9 +2315,9 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.10/gui/polgen.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.14/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/polgen.py	2007-04-24 14:44:30.000000000 -0400
++++ policycoreutils-2.0.14/gui/polgen.py	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,455 @@
 +#! /usr/bin/python
 +# Copyright (C) 2007 Red Hat 
@@ -2774,9 +2774,9 @@
 +    sys.exit(0)
 +    
 +	
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.10/gui/portsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.14/gui/portsPage.py
 --- nsapolicycoreutils/gui/portsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/portsPage.py	2007-04-24 14:43:23.000000000 -0400
++++ policycoreutils-2.0.14/gui/portsPage.py	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,227 @@
 +## portsPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -3005,9 +3005,9 @@
 +        self.store.set_value(iter, MLS_COL, mls)
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.10/gui/selinux.tbl
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.14/gui/selinux.tbl
 --- nsapolicycoreutils/gui/selinux.tbl	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/selinux.tbl	2007-04-24 14:43:23.000000000 -0400
++++ policycoreutils-2.0.14/gui/selinux.tbl	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,274 @@
 +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
 +allow_cvs_read_shadow  _("CVS") _("Allow cvs daemon to read shadow")
@@ -3283,9 +3283,9 @@
 +webadm_manage_users_files _("HTTPD Service") _("Allow httpd to access nfs file systems.")
 +webadm_read_users_files _("HTTPD Service") _("Allow httpd to access nfs file systems.")
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.10/gui/semanagePage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.14/gui/semanagePage.py
 --- nsapolicycoreutils/gui/semanagePage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/semanagePage.py	2007-04-24 14:43:23.000000000 -0400
++++ policycoreutils-2.0.14/gui/semanagePage.py	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,115 @@
 +## semanagePage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -3402,9 +3402,9 @@
 +        self.dialog.hide()
 +
 +    
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.10/gui/statusPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.14/gui/statusPage.py
 --- nsapolicycoreutils/gui/statusPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/statusPage.py	2007-04-24 14:43:23.000000000 -0400
++++ policycoreutils-2.0.14/gui/statusPage.py	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,220 @@
 +## statusPage.py - show selinux status
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -3626,10 +3626,10 @@
 +        return self.types[self.selinuxTypeOptionMenu.get_active()]
 +
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.10/gui/system-config-selinux.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.14/gui/system-config-selinux.glade
 --- nsapolicycoreutils/gui/system-config-selinux.glade	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/system-config-selinux.glade	2007-04-24 14:43:23.000000000 -0400
-@@ -0,0 +1,3034 @@
++++ policycoreutils-2.0.14/gui/system-config-selinux.glade	2007-04-30 08:58:02.000000000 -0400
+@@ -0,0 +1,3035 @@
 +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
 +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 +
@@ -4997,6 +4997,7 @@
 +<widget class="GnomeApp" id="mainWindow">
 +  <property name="width_request">800</property>
 +  <property name="height_request">500</property>
++  <property name="title" translatable="yes">SELinux Administration</property>
 +  <property name="type">GTK_WINDOW_TOPLEVEL</property>
 +  <property name="window_position">GTK_WIN_POS_NONE</property>
 +  <property name="modal">False</property>
@@ -6664,9 +6665,9 @@
 +</widget>
 +
 +</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.10/gui/system-config-selinux.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.14/gui/system-config-selinux.py
 --- nsapolicycoreutils/gui/system-config-selinux.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/system-config-selinux.py	2007-04-24 14:43:23.000000000 -0400
++++ policycoreutils-2.0.14/gui/system-config-selinux.py	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,169 @@
 +#!/usr/bin/python
 +#
@@ -6837,9 +6838,9 @@
 +
 +    app = childWindow()
 +    app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.10/gui/templates/executable.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.14/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/templates/executable.py	2007-04-24 14:43:23.000000000 -0400
++++ policycoreutils-2.0.14/gui/templates/executable.py	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,156 @@
 +#! /usr/bin/env python
 +# Copyright (C) 2007 Red Hat 
@@ -6997,9 +6998,9 @@
 +EXECUTABLE		--	gen_context(system_u:object_r:TEMPLATETYPE_exec_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.10/gui/templates/__init__.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.14/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/templates/__init__.py	2007-04-24 14:43:23.000000000 -0400
++++ policycoreutils-2.0.14/gui/templates/__init__.py	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -7019,9 +7020,9 @@
 +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 +#
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.10/gui/templates/network.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.14/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/templates/network.py	2007-04-24 14:43:23.000000000 -0400
++++ policycoreutils-2.0.14/gui/templates/network.py	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,44 @@
 +te_port_types="""\
 +type TEMPLATETYPE_port_t;
@@ -7067,9 +7068,9 @@
 +allow TEMPLATETYPE_t TEMPLATETYPE_port_t:udp_socket name_bind;
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.10/gui/templates/rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.14/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/templates/rw.py	2007-04-24 14:43:23.000000000 -0400
++++ policycoreutils-2.0.14/gui/templates/rw.py	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,104 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7175,9 +7176,9 @@
 +fc_dir="""
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.10/gui/templates/script.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.14/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/templates/script.py	2007-04-24 14:43:23.000000000 -0400
++++ policycoreutils-2.0.14/gui/templates/script.py	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,42 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7221,9 +7222,9 @@
 +/usr/sbin/semanage port -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.10/gui/templates/semodule.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.14/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/templates/semodule.py	2007-04-24 14:43:23.000000000 -0400
++++ policycoreutils-2.0.14/gui/templates/semodule.py	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7266,9 +7267,9 @@
 +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.10/gui/templates/tmp.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.14/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/templates/tmp.py	2007-04-24 14:43:23.000000000 -0400
++++ policycoreutils-2.0.14/gui/templates/tmp.py	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,72 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7342,9 +7343,9 @@
 +	dontaudit $1 TEMPLATETYPE_tmp_t:file r_file_perms;
 +')
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.10/gui/templates/var_lib.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.14/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/templates/var_lib.py	2007-04-24 14:43:23.000000000 -0400
++++ policycoreutils-2.0.14/gui/templates/var_lib.py	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,137 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7483,9 +7484,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.10/gui/templates/var_log.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.14/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/templates/var_log.py	2007-04-24 14:43:23.000000000 -0400
++++ policycoreutils-2.0.14/gui/templates/var_log.py	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,89 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7576,9 +7577,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.10/gui/templates/var_run.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.14/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/templates/var_run.py	2007-04-24 14:43:23.000000000 -0400
++++ policycoreutils-2.0.14/gui/templates/var_run.py	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,95 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7675,9 +7676,9 @@
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.10/gui/templates/var_spool.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.14/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/templates/var_spool.py	2007-04-24 14:43:23.000000000 -0400
++++ policycoreutils-2.0.14/gui/templates/var_spool.py	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,105 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -7784,9 +7785,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
 +"""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.10/gui/translationsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.14/gui/translationsPage.py
 --- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/translationsPage.py	2007-04-24 14:43:23.000000000 -0400
++++ policycoreutils-2.0.14/gui/translationsPage.py	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,111 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -7899,9 +7900,9 @@
 +        store, iter = self.view.get_selection().get_selected()
 +        self.store.set_value(iter, 0, level)
 +        self.store.set_value(iter, 1, translation)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.10/gui/usersPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.14/gui/usersPage.py
 --- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.10/gui/usersPage.py	2007-04-24 14:43:23.000000000 -0400
++++ policycoreutils-2.0.14/gui/usersPage.py	2007-04-30 08:57:42.000000000 -0400
 @@ -0,0 +1,166 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -r1.408 -r1.409
--- policycoreutils.spec	26 Apr 2007 00:28:19 -0000	1.408
+++ policycoreutils.spec	30 Apr 2007 13:00:48 -0000	1.409
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 2.0.14
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,9 @@
 fi
 
 %changelog
+* Mon Apr 30 2007 Dan Walsh <dwalsh at redhat.com> 2.0.14-2
+- Fix title on system-config-selinux
+
 * Wed Apr 25 2007 Dan Walsh <dwalsh at redhat.com> 2.0.14-1
 - Updated version of policycoreutils
 	* Build fix for setsebool.



From fedora-cvs-commits at redhat.com  Mon Apr 30 13:08:54 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 09:08:54 -0400
Subject: rpms/kdebase/devel kdebase.spec,1.245,1.246
Message-ID: <200704301308.l3UD8s1p031290@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31189

Modified Files:
	kdebase.spec 
Log Message:
ktip, kpersonlizer, kpager, kappfinder in kdebase-extras



Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- kdebase.spec	30 Apr 2007 10:21:09 -0000	1.245
+++ kdebase.spec	30 Apr 2007 13:08:52 -0000	1.246
@@ -4,7 +4,6 @@
 %define final 0
 
 %define redhatify 1
-%define include_kappfinder 0
 
 %define qt_version 3.3.8
 %define arts_version 1.5.6
@@ -157,6 +156,19 @@
 Install kdebase-devel if you want to develop or compile Konqueror,
 Kate plugins or KWin styles.
 
+%package extras
+Summary: Extras packages from kdebase
+Requires: %{name} = %{epoch}:%{version}-%{release}.%{_arch}
+Requires: kdelibs-devel >= %{version}
+Group: User Interface/Desktops
+
+%description extras
+Extra applications for the K Desktop Environment, including:
+ * kappfinder
+ * kpager
+ * ktip
+ * kpersonalizer
+
 %prep
 %setup -q
 %patch0 -p1 -b .redhat-pam
@@ -260,24 +272,7 @@
 install -m 644 kde.pamd %{buildroot}/etc/pam.d/kscreensaver
 install -m 644 kde.pamd %{buildroot}/etc/pam.d/kcheckpass
 
-# fix kappfinder script for relocatability and run it through consolehelper
-%if %{include_kappfinder}
-pushd %{buildroot}%{_bindir}
-mkdir -p ../sbin
-cp kappfinder kappfinder.temp
-sed -e 's.\$(prefix).\$KDEDIR.g' kappfinder.temp > ../sbin/kappfinder
-chmod 0755 ../sbin/kappfinder
-rm -f kappfinder.temp
-ln -sf consolehelper kappfinder
-popd
-
-mkdir -p %{buildroot}/etc/security/console.apps
-cat >%{buildroot}/etc/security/console.apps/kappfinder <<EOF
-USER=root
-PROGRAM=%{_sbindir}/kappfinder
-SESSION=true
-EOF
-%else
+%if %{rhel}
 rm -rf %{buildroot}%{_bindir}/kappfinder \
        %{buildroot}%{_datadir}/applnk/System/kappfinder.desktop \
        %{buildroot}%{_datadir}/applications/kde/kappfinder.desktop \
@@ -405,8 +400,76 @@
 fi
 %{_bindir}/update-desktop-database 2> /dev/null || : 
 
+%post extras
+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 extras
+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 extras
+%defattr(-,root,root)
+# kappfinder
+%{_bindir}/kappfinder
+%{_datadir}/applications/kde/kappfinder.desktop
+%{_datadir}/applnk/System/kappfinder.desktop
+%{_datadir}/apps/kappfinder/
+%{_datadir}/icons/hicolor/*/apps/kappfinder.png
+
+# ktip
+%{_bindir}/ktip
+%{_datadir}/applications/kde/ktip.desktop
+%{_datadir}/applnk/Toys/ktip.desktop
+%{_datadir}/apps/kdewizard
+%{_datadir}/autostart/ktip.desktop
+%{_datadir}/icons/hicolor/*/apps/ktip*
+
+# kpersonalizer
+%{_bindir}/kpersonalizer
+%{_datadir}/applications/kde/kpersonalizer.desktop
+%{_datadir}/applnk/System/kpersonalizer.desktop
+%{_datadir}/apps/kpersonalizer/
+%{_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png
+
+# kpager
+%{_bindir}/kpager
+%{_datadir}/applications/kde/kpager.desktop
+%{_datadir}/applnk/Utilities/kpager.desktop
+%{_datadir}/icons/hicolor/*/apps/kpager.png
+
 %files
 %defattr(-,root,root)
+# kappfinder
+%exclude %{_datadir}/applications/kde/kappfinder.desktop
+%exclude %{_datadir}/applnk/System/kappfinder.desktop
+%exclude %{_datadir}/apps/kappfinder/
+%exclude %{_datadir}/icons/hicolor/*/apps/kappfinder.png
+
+# ktip
+%exclude %{_datadir}/applications/kde/ktip.desktop
+%exclude %{_datadir}/applnk/Toys/ktip.desktop
+%exclude %{_datadir}/apps/kdewizard
+%exclude %{_datadir}/autostart/ktip.desktop
+%exclude %{_datadir}/icons/hicolor/*/apps/ktip*
+
+# kpersonalizer
+%exclude %{_datadir}/applications/kde/kpersonalizer.desktop
+%exclude %{_datadir}/applnk/System/kpersonalizer.desktop
+%exclude %{_datadir}/apps/kpersonalizer/
+%exclude %{_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png
+
+# kpager
+%exclude %{_datadir}/applications/kde/kpager.desktop
+%exclude %{_datadir}/applnk/Utilities/kpager.desktop
+%exclude %{_datadir}/icons/hicolor/*/apps/kpager.png
+
 %doc AUTHORS COPYING README
 %doc %{_docdir}/HTML/en/*
 %config(noreplace) /etc/ksysguarddrc
@@ -419,9 +482,6 @@
 %config(noreplace) /etc/kderc
 %config(noreplace) /etc/X11/xdm/kdmrc
 %config(noreplace) /etc/pam.d/*
-%if %{include_kappfinder}
-%config(noreplace) /etc/security/console.apps/*
-%endif
 %dir %{_libdir}/mozilla
 %dir %{_libdir}/mozilla/plugins
 %{_bindir}/appletproxy
@@ -480,8 +540,6 @@
 %{_bindir}/kompmgr
 %{_bindir}/konqueror
 %attr(2755,root,utempter) %{_bindir}/konsole
-%{_bindir}/kpager
-%{_bindir}/kpersonalizer
 %{_bindir}/kpm
 %{_bindir}/kprinter
 %{_bindir}/krandom.kss
@@ -496,7 +554,6 @@
 %{_bindir}/ksysguard
 %{_bindir}/ksysguardd
 %{_bindir}/ksystraycmd
-%{_bindir}/ktip
 %{_bindir}/ktrash
 %{_bindir}/kwebdesktop
 %{_bindir}/kwin
@@ -557,6 +614,7 @@
 * Mon Apr 23 2007 Than Ngo <than at redhat.com> - 6:3.5.6-6.fc7
 - apply patch KDM to support ConsoleKit, thanks to Kevin Kofler and
   S.??a??lar Onur, #228111
+- ktip, kpersonlizer, kpager, kappfinder in kdebase-extras
 
 * Tue Apr 10 2007 Than Ngo <than at redhat.com> 6:3.5.6-5.fc7
 - fix unknown protocol smb



From fedora-cvs-commits at redhat.com  Mon Apr 30 14:07:45 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 10:07:45 -0400
Subject: rpms/procps/FC-5 procps-3.2.7-longcmd.patch, NONE,
	1.1 procps-3.2.7-ps-stime.patch, NONE,
	1.1 procps-3.2.7-selinux.patch, NONE,
	1.1 procps-3.2.7-sysctl-ignore.patch, NONE,
	1.1 procps-3.2.7-sysctl-tmpname.patch, NONE,
	1.1 procps-3.2.7-top-env-cpuloop.patch, NONE,
	1.1 procps-3.2.7-top-exitcode.patch, NONE,
	1.1 procps-3.2.7-top-remcpu.patch, NONE,
	1.1 procps-3.2.7-top-single.patch, NONE,
	1.1 procps-3.2.7-top-sorthigh.path, NONE,
	1.1 procps-3.2.7-vmstat-cpusteal.patch, NONE,
	1.1 procps-3.2.7-vmstat-pgpg.patch, NONE,
	1.1 procps-3.2.7-w-best.patch, NONE,
	1.1 procps-3.2.7-watch-unicode.patch, NONE, 1.1 .cvsignore,
	1.12, 1.13 procps.spec, 1.50, 1.51 sources, 1.12,
	1.13 procps-3.2.3-slabtop-man.patch, 1.1,
	NONE procps-3.2.5-selinux.patch, 1.1,
	NONE procps-3.2.5-top-remcpu.patch, 1.2,
	NONE procps-3.2.6-cpu-steal.patch, 1.2,
	NONE procps-3.2.6-top-env-cpuloop.patch, 1.1,
	NONE procps-3.2.6-watch-timing.patch, 1.1, NONE
Message-ID: <200704301407.l3UE7jPZ014792@cvs.devel.redhat.com>

Author: tsmetana

Update of /cvs/dist/rpms/procps/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14771

Modified Files:
	.cvsignore procps.spec sources 
Added Files:
	procps-3.2.7-longcmd.patch procps-3.2.7-ps-stime.patch 
	procps-3.2.7-selinux.patch procps-3.2.7-sysctl-ignore.patch 
	procps-3.2.7-sysctl-tmpname.patch 
	procps-3.2.7-top-env-cpuloop.patch 
	procps-3.2.7-top-exitcode.patch procps-3.2.7-top-remcpu.patch 
	procps-3.2.7-top-single.patch procps-3.2.7-top-sorthigh.path 
	procps-3.2.7-vmstat-cpusteal.patch 
	procps-3.2.7-vmstat-pgpg.patch procps-3.2.7-w-best.patch 
	procps-3.2.7-watch-unicode.patch 
Removed Files:
	procps-3.2.3-slabtop-man.patch procps-3.2.5-selinux.patch 
	procps-3.2.5-top-remcpu.patch procps-3.2.6-cpu-steal.patch 
	procps-3.2.6-top-env-cpuloop.patch 
	procps-3.2.6-watch-timing.patch 
Log Message:
New upstream version

procps-3.2.7-longcmd.patch:
 readproc.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE procps-3.2.7-longcmd.patch ---
--- procps-3.2.7/proc/readproc.c.kzak	2006-06-16 10:18:13.000000000 +0200
+++ procps-3.2.7/proc/readproc.c	2006-09-27 11:25:13.000000000 +0200
@@ -432,14 +432,17 @@
     if(fd==-1) return NULL;
 
     /* read whole file into a memory buffer, allocating as we go */
-    while ((n = read(fd, buf, sizeof buf - 1)) > 0) {
+    while ((n = read(fd, buf, sizeof buf - 1)) >= 0) {
 	if (n < (int)(sizeof buf - 1))
 	    end_of_file = 1;
-	if (n == 0 && rbuf == 0)
+	if (n == 0 && rbuf == 0) {
+	    close(fd);
 	    return NULL;	/* process died between our open and read */
+	}
 	if (n < 0) {
 	    if (rbuf)
 		free(rbuf);
+	    close(fd);
 	    return NULL;	/* read error */
 	}
 	if (end_of_file && buf[n-1])		/* last read char not null */

procps-3.2.7-ps-stime.patch:
 common.h |    1 +
 global.c |   20 ++++++++++++++++++--
 output.c |    2 --
 3 files changed, 19 insertions(+), 4 deletions(-)

--- NEW FILE procps-3.2.7-ps-stime.patch ---
--- procps-3.2.7/ps/output.c.jitter	2007-04-26 13:15:47.000000000 +0200
+++ procps-3.2.7/ps/output.c	2007-04-26 13:31:24.000000000 +0200
@@ -77,7 +77,6 @@
 static int wide_signals;  /* true if we have room */
 
 static unsigned long seconds_since_1970;
-static unsigned long time_of_boot;
 static unsigned long page_shift;
 
 
@@ -1952,7 +1951,6 @@
   // available space:  page_size*outbuf_pages-SPACE_AMOUNT
 
   seconds_since_1970 = time(NULL);
-  time_of_boot = seconds_since_1970 - seconds_since_boot;
 
   meminfo();
 
--- procps-3.2.7/ps/common.h.jitter	2005-01-27 04:43:22.000000000 +0100
+++ procps-3.2.7/ps/common.h	2007-04-26 12:44:01.000000000 +0200
@@ -302,6 +302,7 @@
 extern int             screen_cols;
 extern int             screen_rows;
 extern unsigned long   seconds_since_boot;
+extern unsigned long   time_of_boot;
 extern selection_node *selection_list;
 extern unsigned        simple_select;
 extern sort_node      *sort_list;
--- procps-3.2.7/ps/global.c.jitter	2005-10-30 01:43:34.000000000 +0200
+++ procps-3.2.7/ps/global.c	2007-04-26 13:26:38.000000000 +0200
@@ -70,6 +70,7 @@
 int             screen_cols = -1;
 int             screen_rows = -1;
 unsigned long   seconds_since_boot = -1;
+unsigned long   time_of_boot = -1;
 selection_node *selection_list = (selection_node *)0xdeadbeef;
 unsigned        simple_select = 0xffffffff;
 sort_node      *sort_list = (sort_node *)0xdeadbeef; /* ready-to-use sort list */
@@ -361,7 +362,23 @@
   look_up_our_self(&p);
   set_screen_size();
   set_personality();
-  
+  int fd;
+  char *buf[BUFFSIZE];
+  const char *b;
+
+  /* get boot time from /proc/stat */
+  fd = open("/proc/stat", O_RDONLY, 0);
+  if (fd != -1) {
+    buf[BUFFSIZE-1] = 0;
+    read(fd, buf, BUFFSIZE-1);
+    b = strstr(buf, "btime ");
+    if (b) {
+      sscanf(b, "btime %lu", &time_of_boot);
+      seconds_since_boot = time(0) - time_of_boot;
+    }  
+    close(fd);
+  }
+    
   all_processes         = 0;
   bsd_c_option          = 0;
   bsd_e_option          = 0;
@@ -380,7 +397,6 @@
   negate_selection      = 0;
   page_size             = getpagesize();
   running_only          = 0;
-  seconds_since_boot    = uptime(0,0);
   selection_list        = NULL;
   simple_select         = 0;
   sort_list             = NULL;

procps-3.2.7-selinux.patch:
 parser.c |    2 +-
 ps.1     |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE procps-3.2.7-selinux.patch ---
--- procps-3.2.7/ps/parser.c.selinux	2006-06-25 09:14:58.000000000 +0200
+++ procps-3.2.7/ps/parser.c	2006-07-10 10:14:22.000000000 +0200
@@ -231,7 +231,7 @@
     // In the meantime, please do not add to it. The list is
     // intended to ONLY contain flags defined by the POSIX and UNIX
     // standards published by The Open Group, IEEE, and ISO.
-    if(!strchr("aAdefgGlnoptuU", *flagptr)) not_pure_unix = 1;  // dude, -Z ain't in POSIX
+    if(!strchr("aAdefgGlnoptuUZ", *flagptr)) not_pure_unix = 1;  // dude, -Z ain't in POSIX
 
     switch(*flagptr){
     case 'A':
--- procps-3.2.7/ps/ps.1.selinux	2005-10-30 03:44:03.000000000 +0100
+++ procps-3.2.7/ps/ps.1	2006-07-10 10:08:12.000000000 +0200
@@ -450,6 +450,9 @@
 Do not show flags; show rss in place of addr.
 This option can only be used with \fB\-l\fR.
 
+.opt \-Z
+display security context format (SELinux, etc.)
+
 .opt \-\-format \ format
 user\-defined format.  Identical to \fB\-o\fR and \fBo\fR.
 

procps-3.2.7-sysctl-ignore.patch:
 sysctl.c |   50 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 47 insertions(+), 3 deletions(-)

--- NEW FILE procps-3.2.7-sysctl-ignore.patch ---
--- procps-3.2.7/sysctl.c.kzak	2007-04-03 01:26:01.000000000 +0200
+++ procps-3.2.7/sysctl.c	2007-04-03 01:26:13.000000000 +0200
@@ -63,6 +63,44 @@
 static const char ERR_PRELOAD_FILE[] = "error: unable to open preload file \"%s\"\n";
 static const char WARN_BAD_LINE[] = "warning: %s(%d): invalid syntax, continuing...\n";
 
+/* Ignore deprecated sysctls
+ * -- we use this list when we scan (DisplayAll) /proc/sys only. We don't use it
+ *    in case when user direcly uses deprecated key. It's better when user can read
+ *    an error message from kernel.
+ */
+struct sysctl_ignore {
+	const char *prefix;
+	int        prefix_len;
+	const char *option;
+	int        option_len;
+};
+
+#define IGNORE_ENTRY(prefix, option) \
+		{ prefix, sizeof(prefix)-1, option, sizeof(option)-1 }
+
+static struct sysctl_ignore Ignore[] =
+{
+	IGNORE_ENTRY( "net.ipv6.neigh", "base_reachable_time" ),
+	IGNORE_ENTRY( "net.ipv6.neigh", "retrans_time" )
+};
+
+static bool IsIgnored(const char *name)
+{
+  unsigned int i;
+  int sz = strlen(name);
+
+  for (i = 0; i < sizeof(Ignore)/sizeof(struct sysctl_ignore); i++) {
+     struct sysctl_ignore *p = &Ignore[i];
+
+     if (sz < (p->prefix_len + p->option_len))
+	     continue;
+
+     if (strncmp(name, p->prefix, p->prefix_len) == 0 &&
+         strcmp(name + (sz - p->option_len), p->option) == 0)
+       return true;
+  }
+  return false;
+}
 
 static void slashdot(char *restrict p, char old, char new){
   p = strpbrk(p,"/.");
@@ -122,7 +160,7 @@
  *     Read a sysctl setting 
  *
  */
-static int ReadSetting(const char *restrict const name) {
+static int ReadSetting(const char *restrict const name, bool useign) {
    int rc = 0;
    char *restrict tmpname;
    char *restrict outname;
@@ -145,6 +183,12 @@
    outname = strdup(name);
    slashdot(outname,'/','.'); /* change / to . */
 
+   if (useign && IsIgnored(outname)) {
+     free(outname);
+     free(tmpname);
+     return rc;
+   }
+
    if (stat(tmpname, &st)==0) {
 	if (st.st_mode & (S_IRUSR|S_IROTH|S_IRGRP))	   
 	   	fp = fopen(tmpname, "r");
@@ -257,7 +301,7 @@
                strcat(tmpdir, "/");
                DisplayAll(tmpdir);
             } else {
-               rc |= ReadSetting(tmpdir+strlen(PROC_PATH));
+               rc |= ReadSetting(tmpdir+strlen(PROC_PATH), true);
             }
          }
          free(tmpdir);
@@ -519,7 +563,7 @@
          if (WriteMode || index(*argv, '='))
             ReturnCode = WriteSetting(*argv);
          else
-            ReturnCode = ReadSetting(*argv);
+            ReturnCode = ReadSetting(*argv, false);
       }
    }
 

procps-3.2.7-sysctl-tmpname.patch:
 sysctl.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE procps-3.2.7-sysctl-tmpname.patch ---
--- procps-3.2.7/sysctl.c.old	2007-04-25 16:38:30.000000000 +0200
+++ procps-3.2.7/sysctl.c	2007-04-25 16:39:12.000000000 +0200
@@ -174,7 +174,7 @@
    }
 
    /* used to open the file */
-   tmpname = malloc(strlen(name)+strlen(PROC_PATH)+1);
+   tmpname = malloc(strlen(name)+strlen(PROC_PATH)+2);
    strcpy(tmpname, PROC_PATH);
    strcat(tmpname, name); 
    slashdot(tmpname+strlen(PROC_PATH),'.','/'); /* change . to / */

procps-3.2.7-top-env-cpuloop.patch:
 top.1 |    7 +++++++
 top.c |   28 ++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

--- NEW FILE procps-3.2.7-top-env-cpuloop.patch ---
--- procps-3.2.7/top.c.kzak	2006-08-31 10:44:42.000000000 +0200
+++ procps-3.2.7/top.c	2006-08-31 10:46:15.000000000 +0200
@@ -121,6 +121,7 @@
            Secure_mode = 0;     // set if some functionality restricted
 
 static int VIRT_vmsize = 0;	//use vm_size for VIRT 
+static int CPU_loop = 0;	// wait for reliable CPU data
 
         /* Some cap's stuff to reduce runtime calls --
            to accomodate 'Batch' mode, they begin life as empty strings */
@@ -1679,6 +1680,8 @@
    
    if (( getenv("STATSIZE")) && ( atoi(getenv("STATSIZE")) == 1 )) 
 	   VIRT_vmsize = 1;
+   if (( getenv("CPULOOP")) && ( atoi(getenv("CPULOOP")) == 1 )) 
+	   CPU_loop = 1;
 }
 
 
@@ -2978,6 +2981,7 @@
 {
    static proc_t **p_table = NULL;
    static CPU_t  *smpcpu = NULL;
+   static int first = 0;
 
    // whoa first time, gotta' prime the pump...
    if (!p_table) {
@@ -3025,6 +3029,28 @@
 
       smpcpu = cpus_refresh(smpcpu);
 
+      if (first==0 && CPU_loop)
+      {
+	 int i;
+	 CPU_t *cpu;
+	 for (i = 0; i < Cpu_tot; i++) {
+           cpu =  &smpcpu[i];
+	   cpu->u_sav = cpu->u;
+	   cpu->s_sav = cpu->s;
+	   cpu->n_sav = cpu->n;
+	   cpu->i_sav = cpu->i;
+	   cpu->w_sav = cpu->w;
+	   cpu->x_sav = cpu->x;
+	   cpu->y_sav = cpu->y;
+	   cpu->z_sav = cpu->z;
+	 }
+         tv.tv_sec = Rc.delay_time;
+         tv.tv_usec = (Rc.delay_time - (int)Rc.delay_time) * 1000000;
+         select(0, NULL, NULL, NULL, &tv);
+
+	 smpcpu = cpus_refresh(smpcpu);
+      }
+
       if (CHKw(Curwin, View_CPUSUM)) {
          // display just the 1st /proc/stat line
          summaryhlp(&smpcpu[Cpu_tot], "Cpu(s):");
@@ -3050,6 +3076,8 @@
    }
 
    SETw(Curwin, NEWFRAM_cwo);
+
+   first = 1;
    return p_table;
 }
 
--- procps-3.2.7/top.1.kzak	2006-08-31 10:44:42.000000000 +0200
+++ procps-3.2.7/top.1	2006-08-31 10:44:42.000000000 +0200
@@ -1183,6 +1183,13 @@
 Send bug reports to:
    Albert D\. Cahalan, <albert at users.sf.net>
 
+The top command calculates Cpu(s) by looking at the change in CPU time values
+between samples. When you first run it, it has no previous sample to compare
+to, so these initial values are the percentages since boot. It means you need
+at least two loops or you have to ignore summary output from the first loop.
+This is problem for example for batch mode. There is a possible workaround if
+you define the CPULOOP=1 environment variable. The top command will be run one
+extra hidden loop for CPU data before standard output.
 
 .\" ----------------------------------------------------------------------
 .SH 8. HISTORY Former top

procps-3.2.7-top-exitcode.patch:
 top.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE procps-3.2.7-top-exitcode.patch ---
--- procps-3.2.7/top.c.exitcode	2006-09-19 12:45:47.000000000 +0200
+++ procps-3.2.7/top.c	2006-09-19 12:45:56.000000000 +0200
@@ -412,7 +412,7 @@
 static void end_pgm (int dont_care_sig)
 {
    (void)dont_care_sig;
-   bye_bye(stdout, 1, NULL);
+   bye_bye(stdout, 0, NULL);
 }
 
 

procps-3.2.7-top-remcpu.patch:
 top.c |   60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 46 insertions(+), 14 deletions(-)

--- NEW FILE procps-3.2.7-top-remcpu.patch ---
--- procps-3.2.7/top.c.remcpu	2006-07-10 10:41:11.000000000 +0200
+++ procps-3.2.7/top.c	2006-07-10 10:41:35.000000000 +0200
@@ -912,6 +912,7 @@
 static CPU_t *cpus_refresh (CPU_t *cpus)
 {
    static FILE *fp = NULL;
+   static int cpu_max;
    int i;
    int num;
    // enough for a /proc/stat CPU line (not the intr line)
@@ -926,24 +927,29 @@
                can hold tics representing the /proc/stat cpu summary (the first
                line read) -- that slot supports our View_CPUSUM toggle */
       cpus = alloc_c((1 + Cpu_tot) * sizeof(CPU_t));
+      cpu_max = Cpu_tot;
    }
+   else if (cpu_max > Cpu_tot)
+      /* move saved CUPs summary to cpu_max possition */
+      memcpy(&cpus[cpu_max], &cpus[Cpu_tot], sizeof(CPU_t));
+   
    rewind(fp);
    fflush(fp);
 
    // first value the last slot with the cpu summary line
    if (!fgets(buf, sizeof(buf), fp)) std_err("failed /proc/stat read");
-   cpus[Cpu_tot].x = 0;  // FIXME: can't tell by kernel version number
-   cpus[Cpu_tot].y = 0;  // FIXME: can't tell by kernel version number
-   cpus[Cpu_tot].z = 0;  // FIXME: can't tell by kernel version number
+   cpus[cpu_max].x = 0;  // FIXME: can't tell by kernel version number
+   cpus[cpu_max].y = 0;  // FIXME: can't tell by kernel version number
+   cpus[cpu_max].z = 0;  // FIXME: can't tell by kernel version number
    num = sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu",
-      &cpus[Cpu_tot].u,
-      &cpus[Cpu_tot].n,
-      &cpus[Cpu_tot].s,
-      &cpus[Cpu_tot].i,
-      &cpus[Cpu_tot].w,
-      &cpus[Cpu_tot].x,
-      &cpus[Cpu_tot].y,
-      &cpus[Cpu_tot].z
+      &cpus[cpu_max].u,
+      &cpus[cpu_max].n,
+      &cpus[cpu_max].s,
+      &cpus[cpu_max].i,
+      &cpus[cpu_max].w,
+      &cpus[cpu_max].x,
+      &cpus[cpu_max].y,
+      &cpus[cpu_max].z
    );
    if (num < 4)
          std_err("failed /proc/stat read");
@@ -955,7 +961,7 @@
    }
 
    // now value each separate cpu's tics
-   for (i = 0; 1 < Cpu_tot && i < Cpu_tot; i++) {
+   for (i = 0; ; i++) {
       if (!fgets(buf, sizeof(buf), fp)) std_err("failed /proc/stat read");
       cpus[i].x = 0;  // FIXME: can't tell by kernel version number
       cpus[i].y = 0;  // FIXME: can't tell by kernel version number
@@ -964,9 +970,35 @@
          &cpus[i].id,
          &cpus[i].u, &cpus[i].n, &cpus[i].s, &cpus[i].i, &cpus[i].w, &cpus[i].x, &cpus[i].y, &cpus[i].z
       );
-      if (num < 4)
-            std_err("failed /proc/stat read");
+      if (num < 4) {
+	 Cpu_tot = i;
+	 break;
+      }
+      if (i == cpu_max - 1) {
+	 // Bump cpu_max and extend cpus
+	 cpu_max++;
+	 cpus = realloc(cpus, (1 + cpu_max) * sizeof(CPU_t));
+	 if (!cpus) std_err("realloc failed");
+	 memcpy(&cpus[cpu_max], &cpus[cpu_max-1], sizeof(CPU_t));
+      }
+   }
+
+   if (cpu_max > Cpu_tot)
+      memcpy(&cpus[Cpu_tot], &cpus[cpu_max], sizeof(CPU_t));
+
+   // and just in case we're 2.2.xx compiled without SMP support...
+   if (Cpu_tot == 1) {
+      cpus[0].id = cpus[1].id = 0;
+      cpus[0].u = cpus[1].u;
+      cpus[0].n = cpus[1].n;
+      cpus[0].s = cpus[1].s;
+      cpus[0].i = cpus[1].i;
+      cpus[0].w = cpus[1].w;
+      cpus[0].x = cpus[1].x;
+      cpus[0].y = cpus[1].y;
+      cpus[0].z = cpus[1].z;
    }
+   
    return cpus;
 }
 

procps-3.2.7-top-single.patch:
 top.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE procps-3.2.7-top-single.patch ---
--- procps-3.2.7/top.c.single	2006-09-19 12:26:32.000000000 +0200
+++ procps-3.2.7/top.c	2006-09-19 12:27:12.000000000 +0200
@@ -2529,7 +2529,7 @@
 
    switch (c) {
       case '1':
-         if (Cpu_tot+7 > Screen_rows && !CHKw(Curwin, View_CPUSUM)) {
+         if (Cpu_tot+7 > Screen_rows && CHKw(Curwin, View_CPUSUM)) {
             show_msg(err_num_cpus);
             break;
          }


--- NEW FILE procps-3.2.7-top-sorthigh.path ---
--- procps-3.2.7/top.c.sorthigh	2007-02-05 09:06:34.000000000 +0100
+++ procps-3.2.7/top.c	2007-02-05 09:09:35.000000000 +0100
@@ -3121,6 +3121,7 @@
       unsigned    w = Fieldstab[i].width;
 
       int advance = (x==0) && !Rc.mode_altscr;
+      f += advance;
 
       switch (i) {
          case P_CMD:
@@ -3179,7 +3180,7 @@
             break;
          case P_PRI:
             if (unlikely(-99 > p->priority) || unlikely(999 < p->priority)) {
-               f = "  RT";
+               f = advance ? " RT" : "  RT";
                MKCOL("");
             } else
                MKCOL((int)p->priority);
@@ -3227,7 +3228,7 @@
             break;
          case P_WCH:
             if (No_ksyms) {
-               f = " %08lx ";
+               f = advance ? "%08lx " : " %08lx ";
                MKCOL((long)p->wchan);
             } else {
                MKCOL(lookup_wchan(p->wchan, p->XXXID));
@@ -3236,7 +3237,7 @@
 
         } /* end: switch 'procflag' */
 
-        rp = scat(rp, cbuf+advance);
+        rp = scat(rp, cbuf);
    } /* end: for 'maxpflgs' */
 
    PUFF(

procps-3.2.7-vmstat-cpusteal.patch:
 vmstat.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE procps-3.2.7-vmstat-cpusteal.patch ---
--- procps-3.2.7/vmstat.c.steal	2006-07-10 10:49:49.000000000 +0200
+++ procps-3.2.7/vmstat.c	2006-07-10 10:54:03.000000000 +0200
@@ -150,15 +150,15 @@
 ////////////////////////////////////////////////////////////////////////////
 
 static void new_header(void){
-  printf("procs -----------memory---------- ---swap-- -----io---- -system-- ----cpu----\n");
+  printf("procs -----------memory---------- ---swap-- -----io---- --system-- -----cpu------\n");
   printf(
-    "%2s %2s %6s %6s %6s %6s %4s %4s %5s %5s %4s %4s %2s %2s %2s %2s\n",
+    "%2s %2s %6s %6s %6s %6s %4s %4s %5s %5s %4s %4s %2s %2s %2s %2s %2s\n",
     "r","b",
     "swpd", "free", a_option?"inact":"buff", a_option?"active":"cache",
     "si","so",
     "bi","bo",
     "in","cs",
-    "us","sy","id","wa"
+    "us","sy","id","wa", "st"
   );
 }
 
@@ -173,7 +173,7 @@
 ////////////////////////////////////////////////////////////////////////////
 
 static void new_format(void) {
-  const char format[]="%2u %2u %6lu %6lu %6lu %6lu %4u %4u %5u %5u %4u %4u %2u %2u %2u %2u\n";
+  const char format[]="%2u %2u %6lu %6lu %6lu %6lu %4u %4u %5u %5u %4u %4u %2u %2u %2u %2u %2u\n";
   unsigned int tog=0; /* toggle switch for cleaner code */
   unsigned int i;
   unsigned int hz = Hertz;
@@ -217,8 +217,8 @@
 	 (unsigned)( (100*duse                    + divo2) / Div ),
 	 (unsigned)( (100*dsys                    + divo2) / Div ),
 	 (unsigned)( (100*didl                    + divo2) / Div ),
-	 (unsigned)( (100*diow                    + divo2) / Div ) /* ,
-	 (unsigned)( (100*dstl                    + divo2) / Div ) */
+	 (unsigned)( (100*diow                    + divo2) / Div ),
+	 (unsigned)( (100*dstl                    + divo2) / Div )
   );
 
   for(i=1;i<num_updates;i++) { /* \\\\\\\\\\\\\\\\\\\\ main loop ////////////////// */
@@ -266,8 +266,8 @@
 	   (unsigned)( (100*duse+divo2)/Div ), /*us*/
 	   (unsigned)( (100*dsys+divo2)/Div ), /*sy*/
 	   (unsigned)( (100*didl+divo2)/Div ), /*id*/
-	   (unsigned)( (100*diow+divo2)/Div )/*, //wa
-	   (unsigned)( (100*dstl+divo2)/Div )  //st  */
+	   (unsigned)( (100*diow+divo2)/Div ), //wa
+	   (unsigned)( (100*dstl+divo2)/Div )  //st
     );
   }
 }

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,

procps-3.2.7-w-best.patch:
 w.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE procps-3.2.7-w-best.patch ---
--- procps-3.2.7/w.c.kzak	2007-04-02 23:58:30.000000000 +0200
+++ procps-3.2.7/w.c	2007-04-03 00:09:15.000000000 +0200
@@ -149,11 +149,11 @@
 	const proc_t *restrict const tmp = *pptr;
 	if(unlikely(tmp->tgid == u->ut_pid)) {
 	    *found_utpid = 1;
-	    best = tmp;
+	    if (!best)
+	         best = tmp;
 	}
 	if(tmp->tty != line) continue;
 	(*jcpu) += tmp->utime + tmp->stime;
-	secondbest = tmp;
 	/* same time-logic here as for "best" below */
 	if(!  (secondbest && tmp->start_time <= secondbest->start_time)  ){
 	    secondbest = tmp;

procps-3.2.7-watch-unicode.patch:
 Makefile |    2 -
 watch.c  |   70 ++++++++++++++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 55 insertions(+), 17 deletions(-)

--- NEW FILE procps-3.2.7-watch-unicode.patch ---
diff -u procps-3.2.7/Makefile procps/Makefile
--- procps-3.2.7/Makefile	2007-01-16 17:24:49.000000000 +0100
+++ procps/Makefile	2007-01-16 17:29:27.000000000 +0100
@@ -67,7 +67,7 @@
 # plus the top-level Makefile to make it work stand-alone.
 _TARFILES := Makefile
 
-CURSES := -lncurses
+CURSES := -lncursesw
 
 # This seems about right for the dynamic library stuff.
 # Something like this is probably needed to make the SE Linux
diff -u procps-3.2.7/watch.c procps/watch.c
--- procps-3.2.7/watch.c	2007-01-16 17:24:49.000000000 +0100
+++ procps/watch.c	2007-01-16 18:06:57.000000000 +0100
@@ -15,7 +15,7 @@
 #include <ctype.h>
 #include <getopt.h>
 #include <signal.h>
-#include <ncurses.h>
+#include <ncursesw/ncurses.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -28,6 +28,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <wchar.h>
+#include <wctype.h>
 
 #ifdef FORCE_8BIT
 #undef isprint
@@ -137,6 +139,27 @@
 	}
 }
 
+static wint_t
+readwc(FILE *stream, mbstate_t *mbs)
+{
+	for (;;) {
+		int chr;
+		char c;
+		wchar_t wc;
+		size_t len;
+
+		chr = getc(stream);
+		if (chr == EOF)
+			return WEOF;
+		c = chr;
+		len = mbrtowc(&wc, &c, 1, mbs);
+		if (len == (size_t)-1)
+			memset(mbs, 0, sizeof(*mbs));
+		else if (len != (size_t)-2)
+			return wc;
+	}
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -243,6 +266,7 @@
 		FILE *p;
 		int x, y;
 		int oldeolseen = 1;
+		mbstate_t mbs;
 
 		if (screen_size_changed) {
 			get_terminal_size();
@@ -276,49 +300,63 @@
 			do_exit(2);
 		}
 
+		memset(&mbs, 0, sizeof(mbs));
 		for (y = show_title; y < height; y++) {
 			int eolseen = 0, tabpending = 0;
 			for (x = 0; x < width; x++) {
-				int c = ' ';
-				int attr = 0;
+				wint_t c = L' ';
+				int attr = 0, c_width;
+				cchar_t cc;
+				wchar_t wstr[2];
 
 				if (!eolseen) {
 					/* if there is a tab pending, just spit spaces until the
 					   next stop instead of reading characters */
 					if (!tabpending)
 						do
-							c = getc(p);
-						while (c != EOF && !isprint(c)
-						       && c != '\n'
-						       && c != '\t');
-					if (c == '\n')
+							c = readwc(p, &mbs);
+						while (c != WEOF && !iswprint(c)
+						       && c != L'\n'
+						       && c != L'\t');
+					if (c == L'\n')
 						if (!oldeolseen && x == 0) {
 							x = -1;
 							continue;
 						} else
 							eolseen = 1;
-					else if (c == '\t')
+					else if (c == L'\t')
 						tabpending = 1;
-					if (c == EOF || c == '\n' || c == '\t')
-						c = ' ';
+					if (c == WEOF || c == L'\n' || c == L'\t')
+						c = L' ';
 					if (tabpending && (((x + 1) % 8) == 0))
 						tabpending = 0;
 				}
+				wstr[0] = c;
+				wstr[1] = 0;
+				setcchar (&cc, wstr, 0, 0, NULL);
 				move(y, x);
 				if (option_differences) {
-					int oldch = inch();
-					char oldc = oldch & A_CHARTEXT;
+					cchar_t oldc;
+					wchar_t oldwstr[2];
+					attr_t attrs;
+					short colors;
+
+					in_wch(&oldc);
+					getcchar(&oldc, oldwstr, &attrs, &colors, NULL);
 					attr = !first_screen
-					    && (c != oldc
+					    && (wstr[0] != oldwstr[0]
 						||
 						(option_differences_cumulative
-						 && (oldch & A_ATTRIBUTES)));
+						 && attrs));
 				}
 				if (attr)
 					standout();
-				addch(c);
+				add_wch(&cc);
 				if (attr)
 					standend();
+				c_width = wcwidth(c);
+				if (c_width > 1)
+					x += c_width - 1;
 			}
 			oldeolseen = eolseen;
 		}


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/procps/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	1 Nov 2005 10:37:33 -0000	1.12
+++ .cvsignore	30 Apr 2007 14:07:43 -0000	1.13
@@ -1 +1,2 @@
 procps-3.2.6.tar.gz
+procps-3.2.7.tar.gz


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/FC-5/procps.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- procps.spec	10 Jul 2006 09:54:22 -0000	1.50
+++ procps.spec	30 Apr 2007 14:07:43 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities.
 Name: procps
-Version: 3.2.6
-Release: 3.5
+Version: 3.2.7
+Release: 1
 License: GPL
 Group: Applications/System
 Source: http://procps.sourceforge.net/procps-%{version}.tar.gz
@@ -9,7 +9,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /bin/rm /sbin/ldconfig
 
-Patch1: procps-3.2.5-selinux.patch
+Patch1: procps-3.2.7-selinux.patch
 Patch2: procps-3.1.15-misc.patch
 Patch3: procps-3.2.3-FAQ.patch
 Patch4: procps-3.2.1-selinux-workaround.patch
@@ -22,19 +22,35 @@
 Patch10: procps-3.2.5-top-rc.patch
 # 161303 - 'top' failed when remove cpus
 # 186017 - Top "Cpu0" line never updates on single processor machine
-Patch11: procps-3.2.5-top-remcpu.patch
+Patch11: procps-3.2.7-top-remcpu.patch
 # Selinux
 Patch12: procps-3.2.6-libselinux.patch
-# 168444 - Memory usage conflicts with /proc/meminfo 
-Patch13: procps-3.2.3-slabtop-man.patch
 # 177453 - for VIRT use proc->vm_size rather then proc->size (workaround)
 Patch14: procps-3.2.6-top-env-vmsize.patch
 # 174619 - workaround for reliable Cpu(s) data in the first loop
-Patch15: procps-3.2.6-top-env-cpuloop.patch
+Patch15: procps-3.2.7-top-env-cpuloop.patch
 # 185299 - cpu steal time support
-Patch16: procps-3.2.6-cpu-steal.patch
-# 191493 - watch -n doesn't handle large integers properly
-Patch17: procps-3.2.6-watch-timing.patch
+Patch16: procps-3.2.7-vmstat-cpusteal.patch
+# 134516 - ps ignores /proc/#/cmdline if contents 2047 bytes
+Patch17: procps-3.2.7-longcmd.patch
+# 189349 - 32bit vmstat on 64bit kernel
+Patch18: procps-3.2.7-vmstat-pgpg.patch
+# 206551 - top fails to convert to cpu single mode when hit '1'
+Patch19: procps-3.2.7-top-single.patch
+# 199174 - top returns with exit code 1 even if no error occurs
+Patch20: procps-3.2.7-top-exitcode.patch
+# 212637 - sysctl using deprecated syscall
+# 228870 - process `sysctl' is using deprecated sysctl ...
+Patch21: procps-3.2.7-sysctl-ignore.patch
+# 140975 - top corrupts screen when sorting on first column
+Patch22: procps-3.2.7-top-sorthigh.path
+# 234546 - 'w' doesn't give correct information about what's being run.
+Patch23: procps-3.2.7-w-best.patch
+# 183029 - watch ignores unicode characters
+Patch24: procps-3.2.7-watch-unicode.patch
+Patch25: procps-3.2.7-sysctl-tmpname.patch
+# 222251 - STIME can jitter by one second
+Patch26: procps-3.2.7-ps-stime.patch
 
 BuildRequires: ncurses-devel
 
@@ -62,22 +78,30 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .selinux
-%patch2 -p1 -b .misc
-%patch3 -p1 -b .FAQ
-%patch4 -p1 -b .selinux-workaround
-%patch6 -p1 -b .noproc
-%patch7 -p1 -b .pseudo
-%patch8 -p1 -b .0x9b
-%patch9 -p1 -b .writeonly
-%patch10 -p1 -b .rc
-%patch11 -p1 -b .remcpu
-%patch12 -p1 -b .libselinux
-%patch13 -p1 -b .slabman
-%patch14 -p1 -b .env-vmsize
-%patch15 -p1 -b .env-cpuloop
-%patch16 -p1 -b .steal
-%patch17 -p1 -b .timing
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
 
 cp %SOURCE1 .
 
@@ -115,6 +139,10 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Mon Apr 30 2007 Tomas Smetana <tsmetana at redhat.com> 3.2.7-1
+- new upstream version
+- remove unused patches
+
 * Mon Jul 10 2006 Karel Zak <kzak at redhat.com> 3.2.6-3.5
 - fix bugs in cpu steal time patch
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/procps/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	1 Nov 2005 10:37:33 -0000	1.12
+++ sources	30 Apr 2007 14:07:43 -0000	1.13
@@ -1 +1 @@
-7ce39ea27d7b3da0e8ad74dd41d06783  procps-3.2.6.tar.gz
+f490bca772b16472962c7b9f23b1e97d  procps-3.2.7.tar.gz


--- procps-3.2.3-slabtop-man.patch DELETED ---


--- procps-3.2.5-selinux.patch DELETED ---


--- procps-3.2.5-top-remcpu.patch DELETED ---


--- procps-3.2.6-cpu-steal.patch DELETED ---


--- procps-3.2.6-top-env-cpuloop.patch DELETED ---


--- procps-3.2.6-watch-timing.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 30 14:12:21 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 10:12:21 -0400
Subject: rpms/procps/FC-5 procps.spec,1.51,1.52
Message-ID: <200704301412.l3UECLug014948@cvs.devel.redhat.com>

Author: tsmetana

Update of /cvs/dist/rpms/procps/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14934

Modified Files:
	procps.spec 
Log Message:
Update revision number


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/FC-5/procps.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- procps.spec	30 Apr 2007 14:07:43 -0000	1.51
+++ procps.spec	30 Apr 2007 14:12:19 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities.
 Name: procps
 Version: 3.2.7
-Release: 1
+Release: 1%{?dist}
 License: GPL
 Group: Applications/System
 Source: http://procps.sourceforge.net/procps-%{version}.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr 30 15:13:43 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 11:13:43 -0400
Subject: rpms/samba/devel .cvsignore, 1.37, 1.38 samba.spec, 1.115,
	1.116 sources, 1.40, 1.41
Message-ID: <200704301513.l3UFDhdE026532@cvs.devel.redhat.com>

Author: gdeschne

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26335

Modified Files:
	.cvsignore samba.spec sources 
Log Message:
Update to 3.0.25rc3.

Guenther



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	22 Apr 2007 14:23:05 -0000	1.37
+++ .cvsignore	30 Apr 2007 15:13:41 -0000	1.38
@@ -1,2 +1 @@
-samba-3.0.25rc1.tar.gz
-samba-3.0.25rc2.tar.gz
+samba-3.0.25rc3.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- samba.spec	23 Apr 2007 09:28:45 -0000	1.115
+++ samba.spec	30 Apr 2007 15:13:41 -0000	1.116
@@ -2,13 +2,13 @@
 Name: samba
 Epoch: 0
 Version: 3.0.25
-Release: 0.8.rc2%{?dist}
+Release: 0.8.rc3%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.samba.org/
 
 #TAG: change for non-pre
-Source: http://www.samba.org/samba/ftp/rc/%{name}-%{version}rc2.tar.gz
+Source: http://www.samba.org/samba/ftp/rc/%{name}-%{version}rc3.tar.gz
 #Source: http://www.samba.org/samba/ftp/samba/%{name}-%{version}.tar.gz
 
 # Red Hat specific replacement-files
@@ -46,8 +46,8 @@
 #Patch112: samba-3.0.15pre2-bug106483.patch
 #Patch113: samba-3.0.21-warnings.patch
 Patch200: samba-3.0.25rc1-inotifiy.patch
-Patch201: samba-3.0.25rc2-idmap-fix.patch
-Patch202: samba-3.0.25rc2-pie.patch
+#Patch201: samba-3.0.25rc2-idmap-fix.patch
+#Patch202: samba-3.0.25rc2-pie.patch
 
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
@@ -140,7 +140,7 @@
 
 %prep
 # TAG: change for non-pre
-%setup -q -n samba-3.0.25rc2
+%setup -q -n samba-3.0.25rc3
 #%setup -q 
 
 # copy Red Hat specific scripts
@@ -170,8 +170,8 @@
 #%patch112 -p1 -b .bug106483
 #%patch113 -p1 -b .warnings
 %patch200 -p0 -b .inotify
-%patch201 -p0 -b .idmap-fix
-%patch202 -p0 -b .pie
+#%patch201 -p0 -b .idmap-fix
+#%patch202 -p0 -b .pie
 
 # crap
 rm -f examples/VFS/.cvsignore
@@ -633,10 +633,13 @@
 #%{_includedir}/libmsrpc.h
 
 %changelog
+* Mon Apr 30 2007 Guenther Deschner <gdeschner at redhat.com>
+- move to 3.0.25rc3
+
 * Thu Apr 19 2007 Simo Sorce <ssorce at redhat.com>
 - fixes in the spec file
 - moved to 3.0.25rc1
-- addedd parches (merged upstream so they will be removed in 3.0.25rc2)
+- addedd patches (merged upstream so they will be removed in 3.0.25rc2)
 
 * Wed Apr 4 2007 Simo Sorce <ssorce at redhat.com> 3.0.24-12.fc7
 - fixes in smb.conf


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	23 Apr 2007 08:43:43 -0000	1.40
+++ sources	30 Apr 2007 15:13:41 -0000	1.41
@@ -1 +1 @@
-bd45fee528ab4cb6adea1a97e71e9d8c  samba-3.0.25rc2.tar.gz
+106b621039a0700a0043f18a0d491217  samba-3.0.25rc3.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr 30 15:23:01 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 11:23:01 -0400
Subject: rpms/kdesdk/devel kdesdk.spec,1.62,1.63
Message-ID: <200704301523.l3UFN16I000760@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdesdk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv686

Modified Files:
	kdesdk.spec 
Log Message:
shouldn't own /usr/share/doc/HTML/en/common



Index: kdesdk.spec
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- kdesdk.spec	7 Feb 2007 23:09:27 -0000	1.62
+++ kdesdk.spec	30 Apr 2007 15:22:58 -0000	1.63
@@ -13,7 +13,7 @@
 
 Name: kdesdk
 Version: 3.5.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The KDE Software Development Kit (SDK)
 URL: http://www.kde.org/
 License: GPL
@@ -114,8 +114,13 @@
 done
 popd
 
+<<<<<<< kdesdk.spec
+rm -f %{buildroot}/%{_datadir}/apps/kapptemplate/admin/Makefile
+      %{buildroot}/%{_datadir}/apps/kapptemplate/admin/Makefile.in
+=======
 rm -f %{buildroot}/%{_datadir}/apps/kapptemplate/admin/Makefile \
       %{buildroot}/%{_datadir}/apps/kapptemplate/admin/Makefile.in
+>>>>>>> 1.62
 
 %clean
 rm -rf %{buildroot}
@@ -138,6 +143,7 @@
 
 %files
 %defattr(-,root,root)
+%exclude %{_docdir}/HTML/en/common
 %doc %{_docdir}/HTML/en/*
 %{_bindir}/*
 %{_libdir}/kde3/*
@@ -161,6 +167,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Apr 30 2007 Than Ngo <than at redhat.com> - 3.5.6-2.fc7
+- shouldn't own /usr/share/doc/HTML/en/common
+
 * Thu Feb 08 2007 Than Ngo <than at redhat.com> 3.5.6-1.fc7
 - 3.5.6
 



From fedora-cvs-commits at redhat.com  Mon Apr 30 15:23:52 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 11:23:52 -0400
Subject: rpms/gimp/devel gimp-2.2.14-sunras-overflow.patch, NONE,
	1.1 gimp.spec, 1.120, 1.121
Message-ID: <200704301523.l3UFNqxw001301@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1214

Modified Files:
	gimp.spec 
Added Files:
	gimp-2.2.14-sunras-overflow.patch 
Log Message:
avoid buffer overflow in sunras plugin (#238422)


gimp-2.2.14-sunras-overflow.patch:
 ChangeLog                |    7 +++++++
 plug-ins/common/sunras.c |   21 +++++++++++----------
 2 files changed, 18 insertions(+), 10 deletions(-)

--- NEW FILE gimp-2.2.14-sunras-overflow.patch ---
--- gimp-2.2.14/ChangeLog.sunras-overflow	2007-04-17 23:58:21.000000000 +0200
+++ gimp-2.2.14/ChangeLog	2007-04-30 15:38:06.000000000 +0200
@@ -0,0 +1,7 @@
+2007-04-27  Sven Neumann  <sven at gimp.org>
+
+	Merged from trunk:
+
+	* plug-ins/common/sunras.c (set_color_table): guard against a
+	possible stack overflow.
+
--- gimp-2.2.14/plug-ins/common/sunras.c.sunras-overflow	2007-04-17 23:11:23.000000000 +0200
+++ gimp-2.2.14/plug-ins/common/sunras.c	2007-04-30 15:36:33.000000000 +0200
@@ -102,8 +102,7 @@
                           gint32            image_ID,
                           gint32            drawable_ID);
 
-static void set_color_table (gint32, L_SUNFILEHEADER *, unsigned char *);
-
+static void   set_color_table  (gint32, L_SUNFILEHEADER *, const guchar *);
 static gint32 create_new_image (const gchar   *filename,
                                 guint          width,
                                 guint          height,
@@ -865,19 +864,20 @@
 static void
 set_color_table (gint32           image_ID,
 		 L_SUNFILEHEADER *sunhdr,
-		 guchar          *suncolmap)
+		 const guchar    *suncolmap)
 {
-  int ncols, j;
-  guchar ColorMap[256*3];
+  guchar ColorMap[256 * 3];
+  gint   ncols, j;
 
   ncols = sunhdr->l_ras_maplength / 3;
-  if (ncols <= 0) return;
+  if (ncols <= 0)
+    return;
 
-  for (j = 0; j < ncols; j++)
+  for (j = 0; j < MIN (ncols, 256); j++)
     {
-      ColorMap[j*3]   = suncolmap[j];
-      ColorMap[j*3+1] = suncolmap[j+ncols];
-      ColorMap[j*3+2] = suncolmap[j+2*ncols];
+      ColorMap[j * 3 + 0] = suncolmap[j];
+      ColorMap[j * 3 + 1] = suncolmap[j + ncols];
+      ColorMap[j * 3 + 2] = suncolmap[j + 2 * ncols];
     }
 
 #ifdef DEBUG
@@ -886,6 +886,7 @@
     printf ("%3d: 0x%02x 0x%02x 0x%02x\n", j,
 	    ColorMap[j*3], ColorMap[j*3+1], ColorMap[j*3+2]);
 #endif
+
   gimp_image_set_colormap (image_ID, ColorMap, ncols);
 }
 


Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- gimp.spec	24 Apr 2007 10:06:22 -0000	1.120
+++ gimp.spec	30 Apr 2007 15:23:50 -0000	1.121
@@ -43,7 +43,7 @@
 %define age 0
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:    1%{?dist}
+Release:    2%{?dist}
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -102,6 +102,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.14-sunras-overflow.patch
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -156,6 +157,7 @@
 %patch4 -p1 -b .gifload
 %patch5 -p1 -b .htmlview
 %patch6 -p1 -b .gimptool
+%patch7 -p1 -b .sunras-overflow
 
 %build
 libtoolize --copy --force
@@ -408,6 +410,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Apr 30 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.14-2
+- avoid buffer overflow in sunras plugin (#238422)
+
 * Tue Apr 24 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.14-1
 - version 2.2.14
   



From fedora-cvs-commits at redhat.com  Mon Apr 30 15:31:13 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 11:31:13 -0400
Subject: rpms/setools/devel .cvsignore, 1.17, 1.18 setools.spec, 1.70,
	1.71 sources, 1.20, 1.21
Message-ID: <200704301531.l3UFVDA4006690@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6637

Modified Files:
	.cvsignore setools.spec sources 
Log Message:
* Mon Apr 30 2007 Dan Walsh <dwalsh at redhat.com> 3.2-1
- Start shipping the rest of the setools command line apps



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setools/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	13 Feb 2007 13:01:46 -0000	1.17
+++ .cvsignore	30 Apr 2007 15:31:11 -0000	1.18
@@ -10,3 +10,4 @@
 setools-2.3.tar.bz2
 setools-2.4.tar.bz2
 setools-3.1.tar.bz2
+setools-3.2.tar.bz2


Index: setools.spec
===================================================================
RCS file: /cvs/dist/rpms/setools/devel/setools.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- setools.spec	30 Mar 2007 14:57:04 -0000	1.70
+++ setools.spec	30 Apr 2007 15:31:11 -0000	1.71
@@ -1,220 +1,254 @@
-Summary: SELinux tools for managing policy
 Name: setools
-Version: 3.1
-Release: 4%{?dist}
+Version: 3.2
+Release: 1
 License: GPL
+URL: http://oss.tresys.com/projects/setools
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Source: setools-%{version}.tar.bz2
+AutoReqProv: no
+Summary: Policy analysis tools for SELinux.
 Group: System Environment/Base
-URL:	http://www.tresys.com/
-Source: http://www.tresys.com/Downloads/selinux-tools/setools-%{version}.tar.bz2
-Source1: setools.pam
-Source4: seaudit.console
-Source5: apol.desktop
-Source7: seaudit.desktop
-Source9: sediffx.desktop
-Source10: seaudit.png
-Source11: apol.png
-Source12: sediffx.png
-Patch: setools-rhat.patch
-
-Prefix: %{_prefix}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: checkpolicy, policycoreutils, tcl >= 8.4 
-Buildrequires: tk-devel >= 8.4, tcl-devel >= 8.4 libsepol-devel >= 1.15.1
-BuildRequires: gtk2-devel, libglade2-devel
-BuildRequires: libselinux-devel, libxml2-devel 
-BuildRequires: autoconf
-BuildRequires: libcap-devel
-BuildPrereq: bison, flex, pkgconfig
+
+# disable auto dependency generation because they are explicitly listed
+%define __find_requires %{nil}
 
 %description
-Security-enhanced Linux is a patch of the Linux kernel and a number of
-utilities with enhanced security functionality designed to add
-mandatory access 
-controls to Linux.  The Security-enhanced Linux kernel contains new 
-architectural components originally developed to improve the security
- of the Flask 
-operating system. These architectural components provide general
- support for the 
-enforcement of many kinds of mandatory access control policies, including
- those 
-based on the concepts of Type Enforcement, Role-based Access Control, and 
-Multi-level Security.
+SETools is a collection of graphical tools, command-line tools, and
+libraries designed to facilitate SELinux policy analysis.  The
+following are included:
+
+  apol          Tcl/Tk-based policy analysis tool
+  awish         customized wish interpreter
+  libapol       policy analysis library
+  libapol-tcl   bindings between apol and libapol
+  libpoldiff    semantic policy difference library
+  libqpol       library that abstracts policy internals
+  libseaudit    parse and filter SELinux audit messages in log files
+  libsefs       SELinux filesystem database library
+  seaudit       audit log analysis tools: seaudit and seaudit-report
+  sechecker     SELinux policy checking tool
+  secmds        command line tools: seinfo, sesearch, findcon,
+                replcon, indexcon, and searchcon
+  sediff        semantic policy difference tools: sediff and sediffx
+
+%package libs
+License: LGPL
+Summary: Policy analysis support libraries for SELinux.
+Group: System Environment/Libraries
+Requires: libselinux >= 1.30 libsepol >= 1.12.27 libxml2
+Provides: libqpol = 1.1 libapol = 3.1 libpoldiff = 1.1 libsefs = 3.0.2 libseaudit = 4.0.0
+BuildPrereq: flex, bison, pkgconfig
+BuildRequires: libselinux-devel >= 1.30 libsepol-devel >= 1.12.27 libxml2-devel
+BuildRequires: tk-devel >= 8.4.9 tcl-devel >= 8.4.9
+BuildRequires: gtk2-devel >= 2.4 libglade2-devel libxml2-devel
+Prereq: /sbin/ldconfig
+Conflicts: setools
+
+%description libs
+SETools is a collection of graphical tools, command-line tools, and
+libraries designed to facilitate SELinux policy analysis.
+
+This package includes the following run-time libraries:
+
+  libapol       policy analysis library
+  libpoldiff    semantic policy difference library
+  libqpol       library that abstracts policy internals
+  libseaudit    parse and filter SELinux audit messages in log files
+  libsefs       SELinux filesystem database library
+
+%package devel
+Summary: Policy analysis development files for SELinux.
+Group: System Environment/Libraries
+Requires: libselinux-devel >= 1.30 libsepol-devel >= 1.12.27 libxml2-devel
+Requires: %{name} = %{version}-%{release} sqlite-devel
+
+%description devel
+SETools is a collection of graphical tools, command-line tools, and
+libraries designed to facilitate SELinux policy analysis.
 
-The tools and libraries in this release include:
+This package includes header files and archives for the following
+libraries:
 
-1. libapol: The main policy.conf analysis library, which is the core 
-library for all our tools.
+  libapol       policy analysis library
+  libapol-tcl   bindings between apol and libapol
+  libpoldiff    semantic policy difference library
+  libqpol       library that abstracts policy internals
+  libseaudit    parse and filter SELinux audit messages in log files
+  libsefs       SELinux filesystem database library
+
+%package console
+AutoReqProv: no
+Summary: Policy analysis command-line tools for SELinux.
+Group: System Environment/Base
+Requires: libqpol >= 1.1 libapol >= 3.1 libpoldiff >= 1.1 libsefs >= 3.0 libseaudit >= 4.0
+Requires: libselinux >= 1.30
 
-See the help files for apol for help on using the 
-tools.
+%description console
+SETools is a collection of graphical tools, command-line tools, and
+libraries designed to facilitate SELinux policy analysis.
+
+This package includes the following console tools:
+
+  seaudit-report  audit log analysis tool
+  sechecker       SELinux policy checking tool
+  secmds          command line tools: seinfo, sesearch, findcon,
+                  replcon, indexcon, and searchcon
+  sediff          semantic policy difference tool
 
 %package gui
-Summary: Graphical tools for handling SETools
+AutoReqProv: no
+Summary: Policy analysis graphical tools for SELinux.
 Group: System Environment/Base
+Requires: libqpol >= 1.1 libapol >= 3.1 libpoldiff >= 1.1 libsefs >= 3.0 libseaudit >= 4.0
+Requires: tcl >= 8.4.9 tk >= 8.4.9 bwidget >= 1.8
+Requires: glib >= 1.2 gtk2 >= 2.4 gdk-pixbuf libxml2 libglade2
 Requires: %{name} = %{version}-%{release}
-Requires: tk >= 8.4, libglade2 > 2, usermode
 
 %description gui
-Security-enhanced Linux is a patch of the Linux kernel and a number of
-utilities with enhanced security functionality designed to add
- mandatory access 
-controls to Linux.  The Security-enhanced Linux kernel contains new 
-architectural components originally developed to improve 
-the security of the Flask 
-operating system. These architectural components provide 
-general support for the 
-enforcement of many kinds of mandatory access control policies,
- including those 
-based on the concepts of Type Enforcement, Role-based Access Control, and 
-Multi-level Security.
-
-The tools and libraries in this release include:
-
-1. apol: The GUI-based policy analysis tool.
-
-2. awish: A version of the TCL/TK wish interpreter that includes the 
-setools libraries.  We use this to test our GUIs (apol have the 
-interpreter compiled within them).  One could conceivably write one's own 
-GUI tools using TCL/TK as extended via awish.
+SETools is a collection of graphical tools, command-line tools, and
+libraries designed to facilitate SELinux policy analysis.
+
+This package includes the following graphical tools:
 
-See the help files for apol for help on using the 
-tools.
+  apol          Tcl/Tk-based policy analysis tool
+  awish         customized wish interpreter
+  seaudit       audit log analysis tool
+  sediffx       semantic policy difference tool
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
 
 %build
-autoconf
-%configure --disable-bwidget-check --disable-selinux-check 
-make clean
-make LIBDIR=%{_libdir} all
+%configure --disable-bwidget-check --disable-selinux-check
+make
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
-mkdir -p $RPM_BUILD_ROOT/%_libdir
-mkdir -p $RPM_BUILD_ROOT%{_includedir}/selinux/apol
-mkdir -p $RPM_BUILD_ROOT/usr/share/doc/setools-%{version}
-mkdir -p $RPM_BUILD_ROOT/usr/share/tcl8.4
-mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
-	
-make DESTDIR="${RPM_BUILD_ROOT}" LIBDIR=%{_libdir} install
-rm -rf ${RPM_BUILD_ROOT}%{_includedir}/libsefs/sqlite
-
+%makeinstall
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib*so
+mkdir -p ${RPM_BUILD_ROOT}/usr/share/pixmaps
 install -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d
-install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/seaudit
+install -m 644 packages/rpm/seaudit.pam ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/seaudit
 install -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps
-install -m 644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/seaudit
+install -m 644 packages/rpm/seaudit.console ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/seaudit
 install -d -m 755 ${RPM_BUILD_ROOT}%{_datadir}/applications
-install -m 664 %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/applications/apol.desktop
-install -m 664 %{SOURCE7} ${RPM_BUILD_ROOT}%{_datadir}/applications/seaudit.desktop
-install -m 664 %{SOURCE9} ${RPM_BUILD_ROOT}%{_datadir}/applications/sediffx.desktop
-install -m 664 %{SOURCE10} ${RPM_BUILD_ROOT}/usr/share/pixmaps/seaudit.png
-install -m 664 %{SOURCE11} ${RPM_BUILD_ROOT}/usr/share/pixmaps/apol.png
-install -m 664 %{SOURCE12} ${RPM_BUILD_ROOT}/usr/share/pixmaps/sediffx.png
-
+install -m 664 packages/rpm/apol.desktop ${RPM_BUILD_ROOT}%{_datadir}/applications/apol.desktop
+install -m 664 packages/rpm/seaudit.desktop ${RPM_BUILD_ROOT}%{_datadir}/applications/seaudit.desktop
+install -m 664 packages/rpm/sediffx.desktop ${RPM_BUILD_ROOT}%{_datadir}/applications/sediffx.desktop
+install -m 664 apol/apol.png ${RPM_BUILD_ROOT}/usr/share/pixmaps/apol.png
+install -m 664 seaudit/seaudit.png ${RPM_BUILD_ROOT}/usr/share/pixmaps/seaudit.png
+install -m 664 sediff/sediffx.png ${RPM_BUILD_ROOT}/usr/share/pixmaps/sediffx.png
 cd $RPM_BUILD_ROOT/%{_bindir}/
 ln -sf consolehelper seaudit
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-%files gui
+%files libs
 %defattr(-,root,root)
-%dir /usr/share/tcl8.4/BWidget-1.8.0
-/usr/share/tcl8.4/BWidget-1.8.0/*
-%{_bindir}/apol
-%{_bindir}/sediffx
-%{_bindir}/awish
-%{_bindir}/seaudit
-%{_bindir}/seaudit-report
-%{_bindir}/findcon
-%{_bindir}/replcon
-%{_bindir}/searchcon
-%{_bindir}/indexcon
-%{_sbindir}/seaudit
-%{_datadir}/applications/apol.desktop
-%{_datadir}/applications/seaudit.desktop
-%{_datadir}/applications/sediffx.desktop
-%config(noreplace) %{_sysconfdir}/pam.d/seaudit
-%config(noreplace) %{_sysconfdir}/security/console.apps/seaudit
-
-/usr/share/setools/apol.tcl
-/usr/share/setools/apol_perm_mapping_ver12
-/usr/share/setools/apol_perm_mapping_ver15
-/usr/share/setools/apol_perm_mapping_ver16
-/usr/share/setools/apol_perm_mapping_ver17
-/usr/share/setools/apol_perm_mapping_ver18
-/usr/share/setools/apol_perm_mapping_ver19
-/usr/share/setools/apol_perm_mapping_ver20
-/usr/share/setools/apol_perm_mapping_ver21
-/usr/share/setools/*.glade
-/usr/share/setools/*.png
-/usr/share/setools/*.gif
-/usr/share/setools/dot_seaudit
-/usr/share/setools/seaudit-report-service
-/usr/share/setools/seaudit-report.conf
-/usr/share/setools/seaudit-report.css
-
-%{_mandir}/man*/*
-%attr(0644,root,root) /usr/share/pixmaps/seaudit.png
-%attr(0644,root,root) /usr/share/pixmaps/apol.png
-%attr(0644,root,root) /usr/share/pixmaps/sediffx.png
-
-%package devel
-Summary: Development environment for SETools
-Group: System Environment/Base
-Requires: %{name} = %{version}-%{release} sqlite-devel
-
-%description devel
-Headers, static libraries and API docs for SETools.
+%{_libdir}/libqpol.so.*
+%{_libdir}/libapol.so.*
+%{_libdir}/libpoldiff.so.*
+%{_libdir}/libsefs.so.*
+%{_libdir}/libseaudit.so.*
+%{_datadir}/setools-%{version}/seaudit-report.conf
+%{_datadir}/setools-%{version}/seaudit-report.css
+%doc AUTHORS ChangeLog COPYING COPYING.GPL COPYING.LGPL KNOWN-BUGS NEWS README
 
 %files devel
-%defattr(-,root,root)
-%{_includedir}/apol
-%{_includedir}/poldiff
-%{_includedir}/qpol
-%{_includedir}/sefs
-%{_includedir}/seaudit
-%{_includedir}/selinux/apol
-
-%{_libdir}/libsefs.a
-%{_libdir}/libapol.a
-%{_libdir}/libapol-tcl.a
 %{_libdir}/libqpol.a
-%{_libdir}/libseaudit.a
+%{_libdir}/libapol.a
 %{_libdir}/libpoldiff.a
+%{_libdir}/libsefs.a
+%{_libdir}/libseaudit.a
+%{_libdir}/libapol-tcl.a
+%dir %{_includedir}/qpol
+%{_includedir}/qpol/*.h
+%dir %{_includedir}/apol
+%{_includedir}/apol/*.h
+%dir %{_includedir}/poldiff
+%{_includedir}/poldiff/*.h
+%dir %{_includedir}/sefs
+%{_includedir}/sefs/*.h
+%dir %{_includedir}/seaudit
+%{_includedir}/seaudit/*.h
 
-%post devel -p /sbin/ldconfig
-
-%postun devel -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root)
+%files console
 %{_bindir}/seinfo
 %{_bindir}/sesearch
+%{_bindir}/indexcon
+%{_bindir}/findcon
+%{_bindir}/replcon
+%{_bindir}/searchcon
 %{_bindir}/sechecker
 %{_bindir}/sediff
-%doc KNOWN-BUGS
-%doc README
+%{_bindir}/seaudit-report
+%{_datadir}/setools-%{version}/sechecker-profiles/all-checks.sechecker
+%{_datadir}/setools-%{version}/sechecker-profiles/analysis-checks.sechecker
+%{_datadir}/setools-%{version}/sechecker-profiles/devel-checks.sechecker
+%{_datadir}/setools-%{version}/sechecker-profiles/sechecker.dtd
+%{_datadir}/setools-%{version}/sechecker_help.txt
+%{_datadir}/setools-%{version}/seaudit-report-service
+%{_mandir}/man1/findcon.1.gz
+%{_mandir}/man1/indexcon.1.gz
+%{_mandir}/man1/replcon.1.gz
+%{_mandir}/man1/searchcon.1.gz
 %{_mandir}/man1/sechecker.1.gz
-%{_mandir}/man1/seinfo.1.gz
 %{_mandir}/man1/sediff.1.gz
+%{_mandir}/man1/seinfo.1.gz
 %{_mandir}/man1/sesearch.1.gz
-%attr(755,root,root) %dir /usr/share/setools
-%attr(755,root,root) %dir /usr/share/setools/sechecker-profiles
-/usr/share/setools/sechecker-profiles/*
-/usr/share/setools/*.txt
-%attr(755,root,root) %{_libdir}/libapol.so*
-%attr(755,root,root) %{_libdir}/libqpol.so*
-%attr(755,root,root) %{_libdir}/libpoldiff.so*
-%attr(755,root,root) %{_libdir}/libsefs.so*
-%attr(755,root,root) %{_libdir}/libseaudit.so*
+%{_mandir}/man8/seaudit-report.8.gz
+
+%files gui
+%{_bindir}/seaudit
+%{_bindir}/sediffx
+%{_bindir}/apol
+%{_bindir}/awish
+%{_datadir}/setools-%{version}/sediff_help.txt
+%{_datadir}/setools-%{version}/sediffx.glade
+%{_datadir}/setools-%{version}/sediffx.png
+%{_datadir}/setools-%{version}/sediffx-small.png
+%{_datadir}/setools-%{version}/apol_help.txt
+%{_datadir}/setools-%{version}/domaintrans_help.txt
+%{_datadir}/setools-%{version}/file_relabel_help.txt
+%{_datadir}/setools-%{version}/infoflow_help.txt
+%{_datadir}/setools-%{version}/types_relation_help.txt
+%{_datadir}/setools-%{version}/apol_perm_mapping_ver12
+%{_datadir}/setools-%{version}/apol_perm_mapping_ver15
+%{_datadir}/setools-%{version}/apol_perm_mapping_ver16
+%{_datadir}/setools-%{version}/apol_perm_mapping_ver17
+%{_datadir}/setools-%{version}/apol_perm_mapping_ver18
+%{_datadir}/setools-%{version}/apol_perm_mapping_ver19
+%{_datadir}/setools-%{version}/apol_perm_mapping_ver20
+%{_datadir}/setools-%{version}/apol_perm_mapping_ver21
+%{_datadir}/setools-%{version}/apol.gif
+%{_datadir}/setools-%{version}/apol.tcl
+%{_datadir}/setools-%{version}/seaudit.glade
+%{_datadir}/setools-%{version}/seaudit_help.txt
+%{_datadir}/setools-%{version}/seaudit.png
+%{_datadir}/setools-%{version}/seaudit-small.png
+%{_datadir}/setools-%{version}/dot_seaudit
+%{_mandir}/man1/apol.1.gz
+%{_mandir}/man1/sediffx.1.gz
+%{_mandir}/man8/seaudit.8.gz
+%{_sbindir}/seaudit
+
+%config(noreplace) %{_sysconfdir}/pam.d/seaudit
+%config(noreplace) %{_sysconfdir}/security/console.apps/seaudit
+%{_datadir}/applications/apol.desktop
+%{_datadir}/applications/seaudit.desktop
+%{_datadir}/applications/sediffx.desktop
+%attr(0644,root,root) /usr/share/pixmaps/apol.png
+%attr(0644,root,root) /usr/share/pixmaps/seaudit.png
+%attr(0644,root,root) /usr/share/pixmaps/sediffx.png
+
+%post libs
+/sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %changelog
-* Tue Mar 29 2007 Dan Walsh <dwalsh at redhat.com> 3.1-4
+* Mon Apr 30 2007 Dan Walsh <dwalsh at redhat.com> 3.2-1
 - Start shipping the rest of the setools command line apps
 
 * Tue Feb 20 2007 Dan Walsh <dwalsh at redhat.com> 3.1-3
@@ -464,7 +498,3 @@
 
 * Mon Jun 2 2003 Dan Walsh <dwalsh at redhat.com> 1.0-1
 - Initial version
-
-
-
-


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setools/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	13 Feb 2007 13:01:46 -0000	1.20
+++ sources	30 Apr 2007 15:31:11 -0000	1.21
@@ -1 +1 @@
-700028fed279939f98054f4a6185a47e  setools-3.1.tar.bz2
+699988ceb2d996cf172aa66bf24d7c0b  setools-3.2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 30 16:00:51 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 12:00:51 -0400
Subject: rpms/selinux-policy/FC-6 modules-strict.conf, 1.19,
	1.20 modules-targeted.conf, 1.43, 1.44 policy-20061106.patch,
	1.38, 1.39 selinux-policy.spec, 1.362, 1.363
Message-ID: <200704301600.l3UG0pZL007560@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv7536

Modified Files:
	modules-strict.conf modules-targeted.conf 
	policy-20061106.patch selinux-policy.spec 
Log Message:
* Mon Apr 30 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-64
- Add fail2ban policy



Index: modules-strict.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/modules-strict.conf,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- modules-strict.conf	28 Mar 2007 13:15:07 -0000	1.19
+++ modules-strict.conf	30 Apr 2007 16:00:49 -0000	1.20
@@ -1325,3 +1325,11 @@
 #  File System in Userspace (FUSE) utilities
 # 
 fusermount = base
+
+# Layer: services
+# Module: fail2ban
+#
+# daiemon that bans IP that makes too many password failures
+# 
+fail2ban = module
+


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/modules-targeted.conf,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- modules-targeted.conf	10 Apr 2007 19:12:48 -0000	1.43
+++ modules-targeted.conf	30 Apr 2007 16:00:49 -0000	1.44
@@ -1193,3 +1193,10 @@
 #
 apcupsd = module
 
+# Layer: services
+# Module: fail2ban
+#
+# daiemon that bans IP that makes too many password failures
+# 
+fail2ban = module
+

policy-20061106.patch:
 Rules.modular                                |   10 
 config/appconfig-strict-mcs/seusers          |    1 
 config/appconfig-strict-mls/default_contexts |    6 
 config/appconfig-strict-mls/seusers          |    1 
 config/appconfig-strict/seusers              |    1 
 man/man8/kerberos_selinux.8                  |    2 
 policy/flask/access_vectors                  |    2 
 policy/global_tunables                       |   93 ++++
 policy/mls                                   |   31 +
 policy/modules/admin/acct.te                 |    1 
 policy/modules/admin/amanda.if               |   17 
 policy/modules/admin/amanda.te               |    6 
 policy/modules/admin/amtu.fc                 |    3 
 policy/modules/admin/amtu.if                 |   57 ++
 policy/modules/admin/amtu.te                 |   56 ++
 policy/modules/admin/backup.te               |    5 
 policy/modules/admin/bootloader.fc           |    5 
 policy/modules/admin/bootloader.te           |   14 
 policy/modules/admin/consoletype.te          |   21 
 policy/modules/admin/ddcprobe.te             |   10 
 policy/modules/admin/dmesg.te                |    7 
 policy/modules/admin/dmidecode.te            |    5 
 policy/modules/admin/firstboot.if            |    6 
 policy/modules/admin/kudzu.te                |   14 
 policy/modules/admin/logrotate.te            |    5 
 policy/modules/admin/logwatch.te             |   14 
 policy/modules/admin/netutils.te             |   13 
 policy/modules/admin/portage.te              |    5 
 policy/modules/admin/prelink.te              |   18 
 policy/modules/admin/quota.fc                |    7 
 policy/modules/admin/quota.te                |   24 -
 policy/modules/admin/readahead.te            |    2 
 policy/modules/admin/rpm.fc                  |    3 
 policy/modules/admin/rpm.if                  |   43 +
 policy/modules/admin/rpm.te                  |   49 --
 policy/modules/admin/su.if                   |   38 +
 policy/modules/admin/su.te                   |    2 
 policy/modules/admin/sudo.if                 |   13 
 policy/modules/admin/tripwire.te             |   11 
 policy/modules/admin/usbmodules.te           |    5 
 policy/modules/admin/usermanage.if           |    2 
 policy/modules/admin/usermanage.te           |   58 ++
 policy/modules/admin/vpn.te                  |    1 
 policy/modules/apps/ethereal.te              |    5 
 policy/modules/apps/evolution.if             |  107 ++++
 policy/modules/apps/evolution.te             |    1 
 policy/modules/apps/games.fc                 |    1 
 policy/modules/apps/gnome.fc                 |    2 
 policy/modules/apps/gnome.if                 |  108 ++++
 policy/modules/apps/gnome.te                 |    5 
 policy/modules/apps/gpg.if                   |    1 
 policy/modules/apps/java.fc                  |    2 
 policy/modules/apps/java.if                  |   38 +
 policy/modules/apps/java.te                  |    2 
 policy/modules/apps/loadkeys.if              |   17 
 policy/modules/apps/mozilla.if               |  208 ++++++++-
 policy/modules/apps/mplayer.if               |   84 +++
 policy/modules/apps/mplayer.te               |    1 
 policy/modules/apps/slocate.te               |    3 
 policy/modules/apps/thunderbird.if           |   81 +++
 policy/modules/apps/userhelper.if            |   20 
 policy/modules/apps/webalizer.te             |    6 
 policy/modules/apps/wine.fc                  |    1 
 policy/modules/apps/yam.te                   |    5 
 policy/modules/kernel/corecommands.fc        |   20 
 policy/modules/kernel/corecommands.if        |   77 +++
 policy/modules/kernel/corenetwork.if.in      |  140 ++++++
 policy/modules/kernel/corenetwork.te.in      |   14 
 policy/modules/kernel/devices.fc             |    8 
 policy/modules/kernel/devices.if             |   18 
 policy/modules/kernel/devices.te             |    8 
 policy/modules/kernel/domain.if              |   58 ++
 policy/modules/kernel/domain.te              |   22 +
 policy/modules/kernel/files.fc               |    2 
 policy/modules/kernel/files.if               |  224 +++++++++-
 policy/modules/kernel/filesystem.if          |   62 ++
 policy/modules/kernel/filesystem.te          |   20 
 policy/modules/kernel/kernel.if              |   84 +++
 policy/modules/kernel/kernel.te              |   22 -
 policy/modules/kernel/mls.if                 |   28 +
 policy/modules/kernel/mls.te                 |    6 
 policy/modules/kernel/storage.fc             |    3 
 policy/modules/kernel/storage.if             |    2 
 policy/modules/kernel/terminal.fc            |    1 
 policy/modules/kernel/terminal.if            |   21 
 policy/modules/kernel/terminal.te            |    1 
 policy/modules/services/aide.fc              |    3 
 policy/modules/services/aide.te              |   11 
 policy/modules/services/amavis.if            |   19 
 policy/modules/services/amavis.te            |    2 
 policy/modules/services/apache.fc            |   17 
 policy/modules/services/apache.if            |   22 -
 policy/modules/services/apache.te            |   43 +
 policy/modules/services/apm.te               |    3 
 policy/modules/services/automount.fc         |    1 
 policy/modules/services/automount.te         |    9 
 policy/modules/services/avahi.if             |   40 +
 policy/modules/services/bind.fc              |    1 
 policy/modules/services/bind.te              |    6 
 policy/modules/services/bluetooth.te         |    8 
 policy/modules/services/ccs.fc               |    1 
 policy/modules/services/ccs.te               |   11 
 policy/modules/services/clamav.te            |    3 
 policy/modules/services/courier.te           |    1 
 policy/modules/services/cron.fc              |    6 
 policy/modules/services/cron.if              |   92 ++--
 policy/modules/services/cron.te              |   58 ++
 policy/modules/services/cups.fc              |    3 
 policy/modules/services/cups.te              |   18 
 policy/modules/services/cvs.te               |    2 
 policy/modules/services/cyrus.te             |    5 
 policy/modules/services/dbus.fc              |    1 
 policy/modules/services/dbus.if              |   66 ++-
 policy/modules/services/dbus.te              |    4 
 policy/modules/services/dcc.te               |    9 
 policy/modules/services/dhcp.te              |    2 
 policy/modules/services/dovecot.fc           |    1 
 policy/modules/services/dovecot.if           |   44 ++
 policy/modules/services/dovecot.te           |   56 ++
 policy/modules/services/fail2ban.fc          |    3 
 policy/modules/services/fail2ban.if          |   80 +++
 policy/modules/services/fail2ban.te          |   74 +++
 policy/modules/services/ftp.te               |   19 
 policy/modules/services/hal.fc               |    4 
 policy/modules/services/hal.if               |   57 ++
 policy/modules/services/hal.te               |   26 +
 policy/modules/services/inetd.te             |   28 +
 policy/modules/services/irqbalance.te        |    4 
 policy/modules/services/kerberos.if          |   25 +
 policy/modules/services/kerberos.te          |   15 
 policy/modules/services/ktalk.fc             |    3 
 policy/modules/services/ktalk.te             |    5 
 policy/modules/services/lpd.if               |   57 +-
 policy/modules/services/lpd.te               |    5 
 policy/modules/services/mailman.if           |   20 
 policy/modules/services/mailman.te           |    1 
 policy/modules/services/mta.fc               |    1 
 policy/modules/services/mta.if               |   20 
 policy/modules/services/mta.te               |    2 
 policy/modules/services/munin.te             |    5 
 policy/modules/services/networkmanager.fc    |    2 
 policy/modules/services/networkmanager.te    |    2 
 policy/modules/services/nis.fc               |    3 
 policy/modules/services/nis.if               |    8 
 policy/modules/services/nis.te               |   34 +
 policy/modules/services/nscd.if              |   20 
 policy/modules/services/nscd.te              |   28 -
 policy/modules/services/oav.te               |    5 
 policy/modules/services/oddjob.te            |    5 
 policy/modules/services/openca.if            |    4 
 policy/modules/services/openca.te            |    2 
 policy/modules/services/openvpn.te           |    4 
 policy/modules/services/pcscd.fc             |    9 
 policy/modules/services/pcscd.if             |   62 ++
 policy/modules/services/pcscd.te             |   79 +++
 policy/modules/services/pegasus.if           |   31 +
 policy/modules/services/pegasus.te           |   11 
 policy/modules/services/portmap.te           |    5 
 policy/modules/services/portslave.te         |    1 
 policy/modules/services/postfix.fc           |    1 
 policy/modules/services/postfix.if           |   22 -
 policy/modules/services/postfix.te           |   48 ++
 policy/modules/services/ppp.te               |    2 
 policy/modules/services/procmail.te          |   28 +
 policy/modules/services/pyzor.if             |   18 
 policy/modules/services/pyzor.te             |   13 
 policy/modules/services/radius.te            |    2 
 policy/modules/services/radvd.te             |    2 
 policy/modules/services/rhgb.if              |   76 +++
 policy/modules/services/rhgb.te              |    3 
 policy/modules/services/ricci.te             |   22 -
 policy/modules/services/rlogin.te            |   11 
 policy/modules/services/rpc.fc               |    1 
 policy/modules/services/rpc.if               |    3 
 policy/modules/services/rpc.te               |   27 +
 policy/modules/services/rshd.te              |    1 
 policy/modules/services/rsync.te             |    1 
 policy/modules/services/samba.fc             |    5 
 policy/modules/services/samba.if             |   62 ++
 policy/modules/services/samba.te             |   68 ++-
 policy/modules/services/sasl.te              |   13 
 policy/modules/services/sendmail.if          |   22 +
 policy/modules/services/sendmail.te          |    8 
 policy/modules/services/setroubleshoot.if    |   20 
 policy/modules/services/setroubleshoot.te    |    2 
 policy/modules/services/smartmon.te          |    1 
 policy/modules/services/snmp.if              |   17 
 policy/modules/services/snmp.te              |   17 
 policy/modules/services/spamassassin.fc      |    2 
 policy/modules/services/spamassassin.if      |   42 +
 policy/modules/services/spamassassin.te      |   23 -
 policy/modules/services/squid.fc             |    2 
 policy/modules/services/squid.if             |   21 
 policy/modules/services/squid.te             |   11 
 policy/modules/services/ssh.if               |   83 +++
 policy/modules/services/ssh.te               |   14 
 policy/modules/services/telnet.te            |    3 
 policy/modules/services/tftp.te              |    2 
 policy/modules/services/uucp.fc              |    1 
 policy/modules/services/uucp.if              |   67 +++
 policy/modules/services/uucp.te              |   44 +-
 policy/modules/services/uwimap.te            |    1 
 policy/modules/services/xserver.fc           |    2 
 policy/modules/services/xserver.if           |  190 ++++++++
 policy/modules/services/xserver.te           |   12 
 policy/modules/system/authlogin.fc           |    1 
 policy/modules/system/authlogin.if           |  180 +++++++-
 policy/modules/system/authlogin.te           |   41 +
 policy/modules/system/clock.te               |   18 
 policy/modules/system/fstools.fc             |    1 
 policy/modules/system/fstools.te             |   11 
 policy/modules/system/getty.te               |   14 
 policy/modules/system/hostname.te            |   19 
 policy/modules/system/init.if                |   64 ++
 policy/modules/system/init.te                |   51 ++
 policy/modules/system/ipsec.fc               |    5 
 policy/modules/system/ipsec.if               |   99 ++++
 policy/modules/system/ipsec.te               |  121 +++++
 policy/modules/system/iptables.te            |   23 -
 policy/modules/system/libraries.fc           |   42 +
 policy/modules/system/libraries.te           |   11 
 policy/modules/system/locallogin.if          |   37 +
 policy/modules/system/locallogin.te          |   11 
 policy/modules/system/logging.fc             |    5 
 policy/modules/system/logging.if             |   61 ++
 policy/modules/system/logging.te             |   33 +
 policy/modules/system/lvm.fc                 |    2 
 policy/modules/system/lvm.if                 |   44 +-
 policy/modules/system/lvm.te                 |   81 +++
 policy/modules/system/miscfiles.fc           |    3 
 policy/modules/system/miscfiles.if           |   79 +++
 policy/modules/system/modutils.te            |   25 -
 policy/modules/system/mount.te               |   27 -
 policy/modules/system/netlabel.te            |    6 
 policy/modules/system/pcmcia.te              |    5 
 policy/modules/system/raid.te                |   15 
 policy/modules/system/selinuxutil.fc         |    2 
 policy/modules/system/selinuxutil.if         |  121 +++++
 policy/modules/system/selinuxutil.te         |  134 ++----
 policy/modules/system/sysnetwork.te          |   12 
 policy/modules/system/tzdata.fc              |    3 
 policy/modules/system/tzdata.if              |   23 +
 policy/modules/system/tzdata.te              |   51 ++
 policy/modules/system/unconfined.fc          |    4 
 policy/modules/system/unconfined.if          |   19 
 policy/modules/system/unconfined.te          |   23 +
 policy/modules/system/userdomain.if          |  590 +++++++++++++++++++++++----
 policy/modules/system/userdomain.te          |  105 ++--
 policy/modules/system/xen.fc                 |    1 
 policy/modules/system/xen.te                 |   46 +-
 250 files changed, 6175 insertions(+), 693 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.38 -r 1.39 policy-20061106.patch
Index: policy-20061106.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-20061106.patch,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- policy-20061106.patch	20 Apr 2007 15:31:18 -0000	1.38
+++ policy-20061106.patch	30 Apr 2007 16:00:49 -0000	1.39
@@ -1,20 +1,20 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict/seusers serefpolicy-2.4.6/config/appconfig-strict/seusers
 --- nsaserefpolicy/config/appconfig-strict/seusers	2006-11-29 12:04:52.000000000 -0500
-+++ serefpolicy-2.4.6/config/appconfig-strict/seusers	2007-04-20 09:05:19.000000000 -0400
++++ serefpolicy-2.4.6/config/appconfig-strict/seusers	2007-04-30 08:30:15.000000000 -0400
 @@ -1,2 +1,3 @@
 +system_u:system_u
  root:root
  __default__:user_u
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mcs/seusers serefpolicy-2.4.6/config/appconfig-strict-mcs/seusers
 --- nsaserefpolicy/config/appconfig-strict-mcs/seusers	2006-11-29 12:04:52.000000000 -0500
-+++ serefpolicy-2.4.6/config/appconfig-strict-mcs/seusers	2007-04-20 09:05:19.000000000 -0400
++++ serefpolicy-2.4.6/config/appconfig-strict-mcs/seusers	2007-04-30 08:30:15.000000000 -0400
 @@ -1,2 +1,3 @@
 +system_u:system_u:s0-mcs_systemhigh
  root:root:s0-mcs_systemhigh
  __default__:user_u:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/default_contexts serefpolicy-2.4.6/config/appconfig-strict-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-strict-mls/default_contexts	2006-11-29 12:04:52.000000000 -0500
-+++ serefpolicy-2.4.6/config/appconfig-strict-mls/default_contexts	2007-04-20 09:05:19.000000000 -0400
++++ serefpolicy-2.4.6/config/appconfig-strict-mls/default_contexts	2007-04-30 08:30:15.000000000 -0400
 @@ -1,7 +1,7 @@
  system_r:sulogin_t:s0	sysadm_r:sysadm_t:s0
 -system_r:local_login_t:s0	staff_r:staff_t:s0 user_r:user_t:s0 sysadm_r:sysadm_t:s0
@@ -28,14 +28,14 @@
  staff_r:staff_su_t:s0	staff_r:staff_t:s0 user_r:user_t:s0 sysadm_r:sysadm_t:s0 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/seusers serefpolicy-2.4.6/config/appconfig-strict-mls/seusers
 --- nsaserefpolicy/config/appconfig-strict-mls/seusers	2006-11-29 12:04:52.000000000 -0500
-+++ serefpolicy-2.4.6/config/appconfig-strict-mls/seusers	2007-04-20 09:05:19.000000000 -0400
++++ serefpolicy-2.4.6/config/appconfig-strict-mls/seusers	2007-04-30 08:30:15.000000000 -0400
 @@ -1,2 +1,3 @@
 +system_u:system_u:s0-mls_systemhigh
  root:root:s0-mls_systemhigh
  __default__:user_u:s0
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/kerberos_selinux.8 serefpolicy-2.4.6/man/man8/kerberos_selinux.8
 --- nsaserefpolicy/man/man8/kerberos_selinux.8	2006-11-29 12:04:48.000000000 -0500
-+++ serefpolicy-2.4.6/man/man8/kerberos_selinux.8	2007-04-20 09:05:19.000000000 -0400
++++ serefpolicy-2.4.6/man/man8/kerberos_selinux.8	2007-04-30 08:30:15.000000000 -0400
 @@ -18,7 +18,7 @@
  .br
  service krb5kdc restart
@@ -47,7 +47,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.4.6/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2006-11-29 12:04:48.000000000 -0500
-+++ serefpolicy-2.4.6/policy/flask/access_vectors	2007-04-20 09:05:19.000000000 -0400
++++ serefpolicy-2.4.6/policy/flask/access_vectors	2007-04-30 08:30:15.000000000 -0400
 @@ -619,6 +619,8 @@
  	send
  	recv
@@ -59,7 +59,7 @@
  class key
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.4.6/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/global_tunables	2007-04-20 09:05:19.000000000 -0400
++++ serefpolicy-2.4.6/policy/global_tunables	2007-04-30 08:30:15.000000000 -0400
 @@ -82,6 +82,14 @@
  
  ## <desc>
@@ -150,7 +150,7 @@
  ## Allow mount to mount any file
  ## </p>
  ## </desc>
-@@ -596,8 +640,49 @@
+@@ -596,8 +640,53 @@
  
  ## <desc>
  ## <p>
@@ -160,7 +160,7 @@
  ## </desc>
  gen_tunable(spamd_enable_home_dirs,true)
 +
- ')
++')
 +
 +## <desc>
 +## <p>
@@ -197,13 +197,17 @@
 +## </p>
 +## </desc>
 +gen_tunable(allow_ipsec_label,true)
-+')
-+
-+
+ ')
 +
++## <desc>
++## <p>
++## Allow users to connect to console (s390)
++## </p>
++## </desc>
++gen_tunable(allow_console_login,false)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.4.6/policy/mls
 --- nsaserefpolicy/policy/mls	2006-11-29 12:04:48.000000000 -0500
-+++ serefpolicy-2.4.6/policy/mls	2007-04-20 09:05:19.000000000 -0400
++++ serefpolicy-2.4.6/policy/mls	2007-04-30 08:30:15.000000000 -0400
 @@ -89,12 +89,14 @@
  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
@@ -277,7 +281,7 @@
  mlsconstrain association { polmatch }
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.4.6/policy/modules/admin/acct.te
 --- nsaserefpolicy/policy/modules/admin/acct.te	2006-11-29 12:04:48.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/acct.te	2007-04-20 09:05:19.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/admin/acct.te	2007-04-30 08:30:15.000000000 -0400
 @@ -9,6 +9,7 @@
  type acct_t;
  type acct_exec_t;
@@ -288,7 +292,7 @@
  logging_log_file(acct_data_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.if serefpolicy-2.4.6/policy/modules/admin/amanda.if
 --- nsaserefpolicy/policy/modules/admin/amanda.if	2006-11-29 12:04:48.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/amanda.if	2007-04-20 09:05:19.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/admin/amanda.if	2007-04-30 08:30:15.000000000 -0400
 @@ -127,4 +127,21 @@
  	allow $1 amanda_log_t:file ra_file_perms;
  ')
@@ -313,7 +317,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.4.6/policy/modules/admin/amanda.te
 --- nsaserefpolicy/policy/modules/admin/amanda.te	2006-11-29 12:04:48.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/amanda.te	2007-04-20 09:05:19.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/admin/amanda.te	2007-04-30 08:30:15.000000000 -0400
 @@ -75,6 +75,7 @@
  allow amanda_t self:unix_dgram_socket create_socket_perms;
  allow amanda_t self:tcp_socket create_stream_socket_perms;
@@ -333,14 +337,14 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.fc serefpolicy-2.4.6/policy/modules/admin/amtu.fc
 --- nsaserefpolicy/policy/modules/admin/amtu.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/amtu.fc	2007-04-20 09:05:19.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/admin/amtu.fc	2007-04-30 08:30:15.000000000 -0400
 @@ -0,0 +1,3 @@
 +
 +/usr/bin/amtu    --    gen_context(system_u:object_r:amtu_exec_t,s0)
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.if serefpolicy-2.4.6/policy/modules/admin/amtu.if
 --- nsaserefpolicy/policy/modules/admin/amtu.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/amtu.if	2007-04-20 09:05:19.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/admin/amtu.if	2007-04-30 08:30:15.000000000 -0400
 @@ -0,0 +1,57 @@
 +## <summary>
 +##	abstract Machine Test Utility 
@@ -401,7 +405,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.te serefpolicy-2.4.6/policy/modules/admin/amtu.te
 --- nsaserefpolicy/policy/modules/admin/amtu.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/amtu.te	2007-04-20 09:05:19.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/admin/amtu.te	2007-04-30 08:30:15.000000000 -0400
 @@ -0,0 +1,56 @@
 +policy_module(amtu,1.0.23)
 +
@@ -421,8 +425,8 @@
 +#
 +
 +# Specific allow rules required for amtu
-+allow amtu_t self:capability { audit_write net_raw };
-+allow amtu_t self:netlink_audit_socket { create nlmsg_relay read write };
++allow amtu_t self:capability { net_raw };
++logging_send_audit_msg(amtu_t)
 +allow amtu_t self:packet_socket { bind create read write };
 +allow amtu_t self:udp_socket { create ioctl };
 +
@@ -461,7 +465,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/backup.te serefpolicy-2.4.6/policy/modules/admin/backup.te
 --- nsaserefpolicy/policy/modules/admin/backup.te	2006-11-29 12:04:48.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/backup.te	2007-04-20 09:05:19.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/admin/backup.te	2007-04-30 08:30:15.000000000 -0400
 @@ -82,3 +82,8 @@
  optional_policy(`
  	nis_use_ypbind(backup_t)
@@ -473,7 +477,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.fc serefpolicy-2.4.6/policy/modules/admin/bootloader.fc
 --- nsaserefpolicy/policy/modules/admin/bootloader.fc	2006-11-29 12:04:48.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/bootloader.fc	2007-04-20 09:05:19.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/admin/bootloader.fc	2007-04-30 08:30:15.000000000 -0400
 @@ -2,11 +2,6 @@
  /etc/lilo\.conf.*	--	gen_context(system_u:object_r:bootloader_etc_t,s0)
  /etc/yaboot\.conf.*	--	gen_context(system_u:object_r:bootloader_etc_t,s0)
@@ -488,7 +492,7 @@
  /sbin/ybin.*		--	gen_context(system_u:object_r:bootloader_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.4.6/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-11-29 12:04:48.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/admin/bootloader.te	2007-04-20 09:05:19.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/admin/bootloader.te	2007-04-30 08:30:15.000000000 -0400
 @@ -93,6 +93,8 @@
  fs_manage_dos_files(bootloader_t)
  
@@ -523,7 +527,7 @@
 +')
[...4526 lines suppressed...]
  ')
-@@ -2218,7 +2256,7 @@
+@@ -2218,7 +2263,7 @@
  	')
  
  	files_search_home($2)
@@ -11211,7 +12429,7 @@
  	allow $2 $1_home_t:dir rw_dir_perms;
  	allow $2 $1_home_t:sock_file create_file_perms;
  ')
-@@ -3977,7 +4015,7 @@
+@@ -3977,7 +4022,7 @@
  	')
  
  	files_search_home($1)
@@ -11220,7 +12438,7 @@
  ')
  
  ########################################
-@@ -3996,7 +4034,7 @@
+@@ -3996,7 +4041,7 @@
  		type staff_home_dir_t;
  	')
  
@@ -11229,7 +12447,7 @@
  ')
  
  ########################################
-@@ -4343,7 +4381,7 @@
+@@ -4343,7 +4388,7 @@
  		type sysadm_home_dir_t;
  	')
  
@@ -11238,7 +12456,7 @@
  ')
  
  ########################################
-@@ -4501,41 +4539,13 @@
+@@ -4501,41 +4546,13 @@
  ## </param>
  #
  interface(`userdom_read_sysadm_home_content_files',`
@@ -11256,7 +12474,7 @@
 +		type sysadm_home_dir_t, sysadm_home_t;
  	')
 -')
- 
+-
 -########################################
 -## <summary>
 -##	Read files in the sysadm users home directory.
@@ -11272,7 +12490,7 @@
 -		gen_require(`
 -			type sysadm_tmp_t;
 -		')
--
+ 
 -		files_search_tmp($1)
 -		allow $1 sysadm_tmp_t:dir list_dir_perms;
 -		allow $1 sysadm_tmp_t:{ file lnk_file } r_file_perms;
@@ -11285,7 +12503,7 @@
  ')
  
  ########################################
-@@ -4858,7 +4868,7 @@
+@@ -4858,7 +4875,7 @@
  		type user_home_t;
  	')
  
@@ -11294,7 +12512,7 @@
  ')
  
  ########################################
-@@ -4905,6 +4915,28 @@
+@@ -4905,6 +4922,28 @@
  
  ########################################
  ## <summary>
@@ -11323,7 +12541,7 @@
  ##	Read files in generic user home directories.
  ## </summary>
  ## <param name="domain">
-@@ -5497,3 +5529,410 @@
+@@ -5497,3 +5536,410 @@
  	allow $1 user_home_dir_t:dir create_dir_perms;
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
@@ -11736,7 +12954,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.4.6/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/system/userdomain.te	2007-04-20 09:05:19.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/system/userdomain.te	2007-04-30 08:30:15.000000000 -0400
 @@ -24,6 +24,9 @@
  # users home directory contents
  attribute home_type;
@@ -11842,15 +13060,23 @@
  		# cjp: why is this not apm_run_client
  		apm_domtrans_client(sysadm_t)
  	')
-@@ -229,7 +248,6 @@
- 		consoletype_exec(sysadm_t)
+@@ -226,15 +245,6 @@
+ 	')
  
- 		ifdef(`enable_mls',`
+ 	optional_policy(`
+-		consoletype_exec(sysadm_t)
+-
+-		ifdef(`enable_mls',`
 -			consoletype_exec(secadm_t)
- 			consoletype_exec(auditadm_t)
- 		')
- 	')
-@@ -248,7 +266,6 @@
+-			consoletype_exec(auditadm_t)
+-		')
+-	')
+-
+-	optional_policy(`
+ 		dcc_run_cdcc(sysadm_t,sysadm_r,admin_terminal)
+ 		dcc_run_client(sysadm_t,sysadm_r,admin_terminal)
+ 		dcc_run_dbclean(sysadm_t,sysadm_r,admin_terminal)
+@@ -248,7 +258,6 @@
  		dmesg_exec(sysadm_t)
  
  		ifdef(`enable_mls',`
@@ -11858,7 +13084,7 @@
  			dmesg_exec(auditadm_t)
  		')
  	')
-@@ -285,6 +302,8 @@
+@@ -285,6 +294,8 @@
  		ipsec_stream_connect(sysadm_t)
  		# for lsof
  		ipsec_getattr_key_sockets(sysadm_t)
@@ -11867,7 +13093,7 @@
  	')
  
  	optional_policy(`
-@@ -326,6 +345,10 @@
+@@ -326,6 +337,10 @@
  	')
  
  	optional_policy(`
@@ -11878,7 +13104,7 @@
  		netutils_run(sysadm_t,sysadm_r,admin_terminal)
  		netutils_run_ping(sysadm_t,sysadm_r,admin_terminal)
  		netutils_run_traceroute(sysadm_t,sysadm_r,admin_terminal)
-@@ -383,27 +406,12 @@
+@@ -383,27 +398,12 @@
  		seutil_run_runinit(sysadm_t,sysadm_r,admin_terminal)
  
  		ifdef(`enable_mls',`
@@ -11911,7 +13137,7 @@
  		')
  	')
  
-@@ -428,6 +436,9 @@
+@@ -428,6 +428,9 @@
  	')
  
  	optional_policy(`
@@ -11921,9 +13147,17 @@
  		usermanage_run_admin_passwd(sysadm_t,sysadm_r,admin_terminal)
  		usermanage_run_groupadd(sysadm_t,sysadm_r,admin_terminal)
  		usermanage_run_useradd(sysadm_t,sysadm_r,admin_terminal)
+@@ -500,3 +503,7 @@
+ 		samba_per_role_template(user)
+ 	')
+ ')
++
++tunable_policy(`allow_console_login', `
++	term_use_console(userdomain)
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-2.4.6/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/system/xen.fc	2007-04-20 09:05:19.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/system/xen.fc	2007-04-30 08:30:15.000000000 -0400
 @@ -8,6 +8,7 @@
  /usr/sbin/xm		--	gen_context(system_u:object_r:xm_exec_t,s0)
  
@@ -11934,7 +13168,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.4.6/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/policy/modules/system/xen.te	2007-04-20 09:05:19.000000000 -0400
++++ serefpolicy-2.4.6/policy/modules/system/xen.te	2007-04-30 08:30:15.000000000 -0400
 @@ -20,12 +20,15 @@
  type xenctl_t;
  files_type(xenctl_t)
@@ -12056,7 +13290,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.4.6/Rules.modular
 --- nsaserefpolicy/Rules.modular	2006-11-29 12:04:51.000000000 -0500
-+++ serefpolicy-2.4.6/Rules.modular	2007-04-20 09:05:19.000000000 -0400
++++ serefpolicy-2.4.6/Rules.modular	2007-04-30 08:30:15.000000000 -0400
 @@ -219,6 +219,16 @@
  
  ########################################


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/selinux-policy.spec,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -r1.362 -r1.363
--- selinux-policy.spec	20 Apr 2007 15:31:18 -0000	1.362
+++ selinux-policy.spec	30 Apr 2007 16:00:49 -0000	1.363
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.4.6
-Release: 62%{?dist}
+Release: 64%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -360,6 +360,12 @@
 %endif
 
 %changelog
+* Mon Apr 30 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-64
+- Add fail2ban policy
+
+* Fri Apr 20 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-63
+- Make nfs create files with the correct file context when sharing homedirs
+
 * Fri Apr 20 2007 Dan Walsh <dwalsh at redhat.com> 2.4.6-62
 - Revert patch to stop secadm and sysadm from having audit_control
 Resolves: #236855



From fedora-cvs-commits at redhat.com  Mon Apr 30 16:45:19 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 12:45:19 -0400
Subject: rpms/gimp/devel gimp.spec,1.121,1.122
Message-ID: <200704301645.l3UGjJcB031200@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31116

Modified Files:
	gimp.spec 
Log Message:
don't erroneously delete symlinks to external plugins when updating (#238337)



Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- gimp.spec	30 Apr 2007 15:23:50 -0000	1.121
+++ gimp.spec	30 Apr 2007 16:45:17 -0000	1.122
@@ -43,7 +43,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
@@ -275,10 +275,13 @@
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
+%{_sbindir}/gimp-plugin-mgr --uninstall '*'
 %{_sbindir}/gimp-plugin-mgr --install '*'
 
 %preun
-%{_sbindir}/gimp-plugin-mgr --uninstall '*'
+if [ "$1" = "0" ]; then
+    %{_sbindir}/gimp-plugin-mgr --uninstall '*'
+fi
 
 %postun
 if [ "$1" = "0" ]; then
@@ -410,6 +413,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Apr 30 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.14-3
+- don't erroneously delete symlinks to external plugins when updating (#238337)
+
 * Mon Apr 30 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.14-2
 - avoid buffer overflow in sunras plugin (#238422)
 



From fedora-cvs-commits at redhat.com  Mon Apr 30 16:47:29 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 12:47:29 -0400
Subject: rpms/openoffice.org/devel sources,1.237,1.238
Message-ID: <200704301647.l3UGlTot032739@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32696

Modified Files:
	sources 
Log Message:
rename and add a title to templates


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- sources	25 Mar 2007 17:44:09 -0000	1.237
+++ sources	30 Apr 2007 16:47:27 -0000	1.238
@@ -2,6 +2,6 @@
 b54bcc9fdb23389e961b281508d9110c  documentation.openoffice.org-templates.tar.gz
 1b4d9a03ebb4c864015620153afb77c6  Tigert-templates.tar.gz
 05a906513ef89af5e189097fa0c50681  ooo64726.sdf
-26c72b57608d21c7cccf941f1df2aea9  redhat-templates.tar.gz
 e3a0b76dcd876f3d721ee7183729153d  unowinreg.dll
 f6f7bff8c668481ddb2c67f6a6eb3027  OOF680_m14.tar.bz2
+f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz



From fedora-cvs-commits at redhat.com  Mon Apr 30 17:58:48 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 13:58:48 -0400
Subject: rpms/eclipse/FC-6 eclipse-launcher-addplatformtotildeeclipse.patch,
	1.2, 1.3 eclipse.spec, 1.355, 1.356
Message-ID: <200704301758.l3UHwm3m001153@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv1129

Modified Files:
	eclipse-launcher-addplatformtotildeeclipse.patch eclipse.spec 
Log Message:
* Mon Apr 30 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-4.fc6
- Add workaround in launcher-addplatformtotildeeclipse.patch for problems 
  caused by bug #238107.
- Resolves: #238107.


eclipse-launcher-addplatformtotildeeclipse.patch:
 eclipse.c        |    2 +
 gtk/eclipseGtk.c |   92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+)

Index: eclipse-launcher-addplatformtotildeeclipse.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse-launcher-addplatformtotildeeclipse.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-launcher-addplatformtotildeeclipse.patch	27 Apr 2007 08:45:47 -0000	1.2
+++ eclipse-launcher-addplatformtotildeeclipse.patch	30 Apr 2007 17:58:46 -0000	1.3
@@ -1,13 +1,27 @@
-### Eclipse Workspace Patch 1.0
-#P platform-launcher
+Index: library/eclipse.c
+===================================================================
+RCS file: /cvsroot/eclipse/platform-launcher/library/eclipse.c,v
+retrieving revision 1.71
+diff -u -r1.71 eclipse.c
+--- library/eclipse.c	25 Apr 2006 14:31:50 -0000	1.71
++++ library/eclipse.c	30 Apr 2007 17:43:21 -0000
+@@ -512,6 +513,8 @@
+     /* Get the command to start the Java VM. */
+     vmCommandArgs = getVMCommand( argc, argv );
+ 
++    addPlatformToTildeDotEclipse();
++
+     /* While the Java VM should be restarted */
+     vmCommand = vmCommandArgs;
+     while (vmCommand != NULL)
 Index: library/gtk/eclipseGtk.c
 ===================================================================
 RCS file: /cvsroot/eclipse/platform-launcher/library/gtk/eclipseGtk.c,v
 retrieving revision 1.27
 diff -u -r1.27 eclipseGtk.c
 --- library/gtk/eclipseGtk.c	27 Mar 2006 18:25:42 -0000	1.27
-+++ library/gtk/eclipseGtk.c	27 Apr 2007 08:39:06 -0000
-@@ -335,3 +335,88 @@
++++ library/gtk/eclipseGtk.c	30 Apr 2007 17:43:21 -0000
+@@ -335,3 +335,95 @@
    	gtk_main_quit();
    	return FALSE;
  }
@@ -16,14 +30,12 @@
 +void addPlatformToTildeDotEclipse()
 +{
 +	gchar *platform_xml, *touched;
-+	gchar *config_end_position;
-+    gsize old_length;
-+    gchar *old_contents, *new_contents;
-+    GError *error = NULL;
-+	const gchar *site_element = "<site url=\"platform:/base/\" enabled=\"true\" updateable=\"true\" policy=\"USER-EXCLUDE\">\n<feature id=\"org.eclipse.rcp\" version=\"3.2.2.r322_v20070104-iwP0VLKnfFC923K\" url=\"features/org.eclipse.rcp_3.2.2.r322_v20070104-iwP0VLKnfFC923K/\">\n</feature>\n</site>\n\0";
++	gchar *rcp321_position;
++	gchar *platform_xml_contents;
++	GError *error = NULL;
 +	
 +	platform_xml = g_strconcat(g_get_home_dir(), "/.eclipse/org.eclipse.platform_3.2.0/configuration/org.eclipse.update/platform.xml", NULL);
-+    touched = g_strconcat(g_get_home_dir(), "/.eclipse/.dont-need-to-modify-homedir-fedora", NULL);
++	touched = g_strconcat(g_get_home_dir(), "/.eclipse/.homedirmodified-fedora", NULL);
 +	
 +
 +	if (!g_file_test(platform_xml, G_FILE_TEST_EXISTS))
@@ -33,82 +45,75 @@
 +	 	 * so add the appropriate file to ~/.eclipse. */
 +	   	if (g_file_set_contents(touched, "\0", -1, &error) == FALSE)
 +		{
-+			g_print("Error touching ~/.eclipse/.dont-need-to-modify-homedir-fedora.");
++			g_print("Error touching ~/.eclipse/.homedirmodified-fedora.");
 +			g_print(g_strconcat(error->message, "\n\0", NULL));
 +			g_free(error);
 +		}
-+	    g_free(platform_xml);
-+	    g_free(touched);
++		g_free(platform_xml);
++		g_free(touched);
 +		return;
 +		
-+	} else if (g_file_test(touched, G_FILE_TEST_EXISTS)) {
++	} else {
++		/* platform_xml exists, workaround these two bugs:
++		 * https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=238107
++		 * https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=238109
++		 * 
++		 * remove the unwanted feature if its in platform.xml */
++
++		 if (g_file_get_contents(platform_xml, &platform_xml_contents, NULL, &error) == FALSE) {
++		 	g_print("Error reading platform.xml in ~/.eclipse.\
++					You should remove ~/.eclipse before restarting Eclipse:\0");
++			g_print(g_strconcat(error->message, "\n\0", NULL));
++        		g_free(error);
++       			g_free(platform_xml);
++	    		g_free(touched);
++        		return;
++		 }
++		 
++		 gchar *unwanted_feature = "<feature id=\"org.eclipse.rcp\" version=\"3.2.1.r321_v20060801-clWbqCmjexIWDqg\" url=\"features/org.eclipse.rcp_3.2.1.r321_v20060801-clWbqCmjexIWDqg/\">\n</feature>\0";
++		 rcp321_position = g_strrstr(platform_xml_contents, unwanted_feature);
++
++		 if (rcp321_position != NULL) 
++		 {
++		 	int i;
++		 	for (i = 0; i < strlen(unwanted_feature); i++) {
++				rcp321_position[i] = ' ';
++		 	}
++		 }
++		 
++		if (g_file_set_contents(platform_xml, platform_xml_contents, -1, &error) == FALSE)
++		{
++        		g_print("Error writing platform.xml in ~/.eclipse.\
++		         	You should remove ~/.eclipse before restarting Eclipse:\0");
++			g_print(g_strconcat(error->message, "\n\0", NULL));
++        		g_free(error);
++        		g_free(touched);
++        		g_free(platform_xml);
++        		g_free(platform_xml_contents);
++        		return;
++    		}
++    	
++        	g_free(platform_xml_contents);
++	}
++	
++	
++	if (g_file_test(touched, G_FILE_TEST_EXISTS)) {
 +		/* touched exists, we don't need to do anything */ 
 +		g_free(platform_xml);
-+	    g_free(touched);
++		g_free(touched);
 +		return;
 +	}
 +
-+
-+    /* At this point platform_xml exists and touched does not exist */
-+    
-+    if (g_file_get_contents (platform_xml,
-+                             &old_contents, &old_length, &error) == FALSE)
-+    {
-+    	g_print("Error reading platform.xml in ~/.eclipse.\
-+		         You should remove ~/.eclipse before restarting Eclipse:\0");
-+		g_print(g_strconcat(error->message, "\n\0", NULL));
-+        g_free(error);
-+       	g_free(platform_xml);
-+	    g_free(touched);
-+        return;
-+    }
-+
-+    config_end_position = g_strrstr_len(old_contents, old_length, "</config>");
-+    *config_end_position = '\0';
-+    new_contents = g_strconcat(old_contents, site_element, "</config>\n\0", NULL);
-+
-+    if (g_file_set_contents(platform_xml,
-+                            new_contents, -1, &error) == FALSE)
-+    {
-+        g_print("Error writing platform.xml in ~/.eclipse.\
-+		         You should remove ~/.eclipse before restarting Eclipse:\0");
-+		g_print(g_strconcat(error->message, "\n\0", NULL));
-+        g_free(error);
-+        g_free(touched);
-+        g_free(platform_xml);
-+        g_free(new_contents);
-+        g_free(old_contents);
-+        return;
-+    }
-+
-+	if (g_file_set_contents(touched, "\0", -1, &error) == FALSE)
++	/* At this point platform_xml exists and touched does not exist. */
++	if (g_remove (platform_xml) < 0) 
 +	{
-+		g_print("Error touching ~/.eclipse/.dont-need-to-modify-homedir-fedora.\
++       		g_print("Error writing platform.xml in ~/.eclipse.\
 +		         You should remove ~/.eclipse before restarting Eclipse:\0");
 +		g_print(g_strconcat(error->message, "\n\0", NULL));
-+		g_free(error);
++        	g_free(error);
 +	}
 +
-+    g_free(platform_xml);
-+    g_free(touched);
-+    g_free(new_contents);
-+    g_free(old_contents);
-+    
-+    return;
++	g_free(platform_xml);
++	g_free(touched);
++	return;
 +}
-Index: library/eclipse.c
-===================================================================
-RCS file: /cvsroot/eclipse/platform-launcher/library/eclipse.c,v
-retrieving revision 1.71
-diff -u -r1.71 eclipse.c
---- library/eclipse.c	25 Apr 2006 14:31:50 -0000	1.71
-+++ library/eclipse.c	27 Apr 2007 08:39:05 -0000
-@@ -512,6 +512,8 @@
-     /* Get the command to start the Java VM. */
-     vmCommandArgs = getVMCommand( argc, argv );
- 
-+    addPlatformToTildeDotEclipse();
-+
-     /* While the Java VM should be restarted */
-     vmCommand = vmCommandArgs;
-     while (vmCommand != NULL)


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse.spec,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- eclipse.spec	27 Apr 2007 08:45:47 -0000	1.355
+++ eclipse.spec	30 Apr 2007 17:58:46 -0000	1.356
@@ -19,7 +19,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        3%{?dist} 
+Release:        4%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1763,6 +1763,11 @@
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
+* Mon Apr 30 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-4.fc6
+- Add workaround in launcher-addplatformtotildeeclipse.patch for problems 
+  caused by bug #238107.
+- Resolves: #238107.
+ 
 * Fri Apr 27 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-3.fc6
 - Fix problem in launcher-addplatformtotildeeclipse.patch.
 - Resolves: #238107.



From fedora-cvs-commits at redhat.com  Mon Apr 30 18:03:31 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 14:03:31 -0400
Subject: rpms/eclipse/devel eclipse-launcher-addplatformtotildeeclipse.patch,
	1.2, 1.3 eclipse.spec, 1.424, 1.425
Message-ID: <200704301803.l3UI3VUP001367@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1349

Modified Files:
	eclipse-launcher-addplatformtotildeeclipse.patch eclipse.spec 
Log Message:
* Mon Apr 30 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-11
- Add workaround in launcher-addplatformtotildeeclipse.patch for problems
  caused by bug #238109.
- Resolves: #238109.


eclipse-launcher-addplatformtotildeeclipse.patch:
 eclipse.c        |    2 +
 gtk/eclipseGtk.c |   92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+)

Index: eclipse-launcher-addplatformtotildeeclipse.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-launcher-addplatformtotildeeclipse.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-launcher-addplatformtotildeeclipse.patch	27 Apr 2007 08:48:33 -0000	1.2
+++ eclipse-launcher-addplatformtotildeeclipse.patch	30 Apr 2007 18:03:28 -0000	1.3
@@ -1,13 +1,27 @@
-### Eclipse Workspace Patch 1.0
-#P platform-launcher
+Index: library/eclipse.c
+===================================================================
+RCS file: /cvsroot/eclipse/platform-launcher/library/eclipse.c,v
+retrieving revision 1.71
+diff -u -r1.71 eclipse.c
+--- library/eclipse.c	25 Apr 2006 14:31:50 -0000	1.71
++++ library/eclipse.c	30 Apr 2007 17:43:21 -0000
+@@ -512,6 +513,8 @@
+     /* Get the command to start the Java VM. */
+     vmCommandArgs = getVMCommand( argc, argv );
+ 
++    addPlatformToTildeDotEclipse();
++
+     /* While the Java VM should be restarted */
+     vmCommand = vmCommandArgs;
+     while (vmCommand != NULL)
 Index: library/gtk/eclipseGtk.c
 ===================================================================
 RCS file: /cvsroot/eclipse/platform-launcher/library/gtk/eclipseGtk.c,v
 retrieving revision 1.27
 diff -u -r1.27 eclipseGtk.c
 --- library/gtk/eclipseGtk.c	27 Mar 2006 18:25:42 -0000	1.27
-+++ library/gtk/eclipseGtk.c	27 Apr 2007 08:39:06 -0000
-@@ -335,3 +335,88 @@
++++ library/gtk/eclipseGtk.c	30 Apr 2007 17:43:21 -0000
+@@ -335,3 +335,95 @@
    	gtk_main_quit();
    	return FALSE;
  }
@@ -16,14 +30,12 @@
 +void addPlatformToTildeDotEclipse()
 +{
 +	gchar *platform_xml, *touched;
-+	gchar *config_end_position;
-+    gsize old_length;
-+    gchar *old_contents, *new_contents;
-+    GError *error = NULL;
-+	const gchar *site_element = "<site url=\"platform:/base/\" enabled=\"true\" updateable=\"true\" policy=\"USER-EXCLUDE\">\n<feature id=\"org.eclipse.rcp\" version=\"3.2.2.r322_v20070104-iwP0VLKnfFC923K\" url=\"features/org.eclipse.rcp_3.2.2.r322_v20070104-iwP0VLKnfFC923K/\">\n</feature>\n</site>\n\0";
++	gchar *rcp321_position;
++	gchar *platform_xml_contents;
++	GError *error = NULL;
 +	
 +	platform_xml = g_strconcat(g_get_home_dir(), "/.eclipse/org.eclipse.platform_3.2.0/configuration/org.eclipse.update/platform.xml", NULL);
-+    touched = g_strconcat(g_get_home_dir(), "/.eclipse/.dont-need-to-modify-homedir-fedora", NULL);
++	touched = g_strconcat(g_get_home_dir(), "/.eclipse/.homedirmodified-fedora", NULL);
 +	
 +
 +	if (!g_file_test(platform_xml, G_FILE_TEST_EXISTS))
@@ -33,82 +45,75 @@
 +	 	 * so add the appropriate file to ~/.eclipse. */
 +	   	if (g_file_set_contents(touched, "\0", -1, &error) == FALSE)
 +		{
-+			g_print("Error touching ~/.eclipse/.dont-need-to-modify-homedir-fedora.");
++			g_print("Error touching ~/.eclipse/.homedirmodified-fedora.");
 +			g_print(g_strconcat(error->message, "\n\0", NULL));
 +			g_free(error);
 +		}
-+	    g_free(platform_xml);
-+	    g_free(touched);
++		g_free(platform_xml);
++		g_free(touched);
 +		return;
 +		
-+	} else if (g_file_test(touched, G_FILE_TEST_EXISTS)) {
++	} else {
++		/* platform_xml exists, workaround these two bugs:
++		 * https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=238107
++		 * https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=238109
++		 * 
++		 * remove the unwanted feature if its in platform.xml */
++
++		 if (g_file_get_contents(platform_xml, &platform_xml_contents, NULL, &error) == FALSE) {
++		 	g_print("Error reading platform.xml in ~/.eclipse.\
++					You should remove ~/.eclipse before restarting Eclipse:\0");
++			g_print(g_strconcat(error->message, "\n\0", NULL));
++        		g_free(error);
++       			g_free(platform_xml);
++	    		g_free(touched);
++        		return;
++		 }
++		 
++		 gchar *unwanted_feature = "<feature id=\"org.eclipse.rcp\" version=\"3.2.1.r321_v20060801-clWbqCmjexIWDqg\" url=\"features/org.eclipse.rcp_3.2.1.r321_v20060801-clWbqCmjexIWDqg/\">\n</feature>\0";
++		 rcp321_position = g_strrstr(platform_xml_contents, unwanted_feature);
++
++		 if (rcp321_position != NULL) 
++		 {
++		 	int i;
++		 	for (i = 0; i < strlen(unwanted_feature); i++) {
++				rcp321_position[i] = ' ';
++		 	}
++		 }
++		 
++		if (g_file_set_contents(platform_xml, platform_xml_contents, -1, &error) == FALSE)
++		{
++        		g_print("Error writing platform.xml in ~/.eclipse.\
++		         	You should remove ~/.eclipse before restarting Eclipse:\0");
++			g_print(g_strconcat(error->message, "\n\0", NULL));
++        		g_free(error);
++        		g_free(touched);
++        		g_free(platform_xml);
++        		g_free(platform_xml_contents);
++        		return;
++    		}
++    	
++        	g_free(platform_xml_contents);
++	}
++	
++	
++	if (g_file_test(touched, G_FILE_TEST_EXISTS)) {
 +		/* touched exists, we don't need to do anything */ 
 +		g_free(platform_xml);
-+	    g_free(touched);
++		g_free(touched);
 +		return;
 +	}
 +
-+
-+    /* At this point platform_xml exists and touched does not exist */
-+    
-+    if (g_file_get_contents (platform_xml,
-+                             &old_contents, &old_length, &error) == FALSE)
-+    {
-+    	g_print("Error reading platform.xml in ~/.eclipse.\
-+		         You should remove ~/.eclipse before restarting Eclipse:\0");
-+		g_print(g_strconcat(error->message, "\n\0", NULL));
-+        g_free(error);
-+       	g_free(platform_xml);
-+	    g_free(touched);
-+        return;
-+    }
-+
-+    config_end_position = g_strrstr_len(old_contents, old_length, "</config>");
-+    *config_end_position = '\0';
-+    new_contents = g_strconcat(old_contents, site_element, "</config>\n\0", NULL);
-+
-+    if (g_file_set_contents(platform_xml,
-+                            new_contents, -1, &error) == FALSE)
-+    {
-+        g_print("Error writing platform.xml in ~/.eclipse.\
-+		         You should remove ~/.eclipse before restarting Eclipse:\0");
-+		g_print(g_strconcat(error->message, "\n\0", NULL));
-+        g_free(error);
-+        g_free(touched);
-+        g_free(platform_xml);
-+        g_free(new_contents);
-+        g_free(old_contents);
-+        return;
-+    }
-+
-+	if (g_file_set_contents(touched, "\0", -1, &error) == FALSE)
++	/* At this point platform_xml exists and touched does not exist. */
++	if (g_remove (platform_xml) < 0) 
 +	{
-+		g_print("Error touching ~/.eclipse/.dont-need-to-modify-homedir-fedora.\
++       		g_print("Error writing platform.xml in ~/.eclipse.\
 +		         You should remove ~/.eclipse before restarting Eclipse:\0");
 +		g_print(g_strconcat(error->message, "\n\0", NULL));
-+		g_free(error);
++        	g_free(error);
 +	}
 +
-+    g_free(platform_xml);
-+    g_free(touched);
-+    g_free(new_contents);
-+    g_free(old_contents);
-+    
-+    return;
++	g_free(platform_xml);
++	g_free(touched);
++	return;
 +}
-Index: library/eclipse.c
-===================================================================
-RCS file: /cvsroot/eclipse/platform-launcher/library/eclipse.c,v
-retrieving revision 1.71
-diff -u -r1.71 eclipse.c
---- library/eclipse.c	25 Apr 2006 14:31:50 -0000	1.71
-+++ library/eclipse.c	27 Apr 2007 08:39:05 -0000
-@@ -512,6 +512,8 @@
-     /* Get the command to start the Java VM. */
-     vmCommandArgs = getVMCommand( argc, argv );
- 
-+    addPlatformToTildeDotEclipse();
-+
-     /* While the Java VM should be restarted */
-     vmCommand = vmCommandArgs;
-     while (vmCommand != NULL)


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -r1.424 -r1.425
--- eclipse.spec	27 Apr 2007 08:48:33 -0000	1.424
+++ eclipse.spec	30 Apr 2007 18:03:28 -0000	1.425
@@ -19,7 +19,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        10%{?dist} 
+Release:        11%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1718,6 +1718,11 @@
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
+* Mon Apr 30 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-11
+- Add workaround in launcher-addplatformtotildeeclipse.patch for problems
+  caused by bug #238109.
+- Resolves: #238109.
+
 * Fri Apr 27 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-10
 - Fix problem in launcher-addplatformtotildeeclipse.patch.
 - Resolves: #238109.



From fedora-cvs-commits at redhat.com  Mon Apr 30 19:22:57 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 15:22:57 -0400
Subject: rpms/evolution/devel evolution-2.10.0-use-glib-i18n.patch, 1.2,
	1.3 evolution.spec, 1.250,
	1.251 evolution-2.10.1-fix-gnome-doc-utils.patch, 1.1, NONE
Message-ID: <200704301922.l3UJMvYx020623@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20471

Modified Files:
	evolution-2.10.0-use-glib-i18n.patch evolution.spec 
Removed Files:
	evolution-2.10.1-fix-gnome-doc-utils.patch 
Log Message:

* Mon Apr 30 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-9.fc7
- Revise some patches so that we don't have to run autoreconf.
- Remove patch for GNOME bug #427939 (use a different work-around).


evolution-2.10.0-use-glib-i18n.patch:
 a11y/addressbook/ea-addressbook-view.c                      |    2 
 a11y/addressbook/ea-minicard-view.c                         |    3 
 a11y/addressbook/ea-minicard.c                              |    2 
 a11y/calendar/ea-cal-view-event.c                           |    2 
 a11y/calendar/ea-cal-view.c                                 |    2 
 a11y/calendar/ea-day-view-main-item.c                       |    2 
 a11y/calendar/ea-day-view.c                                 |    2 
 a11y/calendar/ea-gnome-calendar.c                           |    2 
 a11y/calendar/ea-jump-button.c                              |    2 
 a11y/calendar/ea-week-view-main-item.c                      |    2 
 a11y/calendar/ea-week-view.c                                |    2 
 a11y/e-table/gal-a11y-e-cell-popup.c                        |    2 
 a11y/e-table/gal-a11y-e-cell-text.c                         |    2 
 a11y/e-table/gal-a11y-e-cell-toggle.c                       |    2 
 a11y/e-table/gal-a11y-e-cell-tree.c                         |    2 
 a11y/e-table/gal-a11y-e-cell.c                              |    2 
 a11y/e-table/gal-a11y-e-table-click-to-add.c                |    2 
 a11y/widgets/ea-calendar-item.c                             |    2 
 addressbook/gui/component/addressbook-config.c              |    2 
 addressbook/gui/component/addressbook-migrate.c             |    2 
 addressbook/gui/component/addressbook-view.c                |    2 
 addressbook/gui/component/addressbook.c                     |    2 
 addressbook/gui/component/autocompletion-config.c           |    2 
 addressbook/gui/contact-editor/e-contact-editor-address.c   |    2 
 addressbook/gui/contact-editor/e-contact-editor-fullname.c  |    2 
 addressbook/gui/contact-editor/e-contact-editor-im.c        |    2 
 addressbook/gui/contact-editor/e-contact-editor.c           |    2 
 addressbook/gui/contact-editor/e-contact-quick-add.c        |    2 
 addressbook/gui/contact-editor/eab-editor.c                 |    2 
 addressbook/gui/contact-list-editor/e-contact-list-editor.c |    2 
 addressbook/gui/widgets/e-addressbook-reflow-adapter.c      |    2 
 addressbook/gui/widgets/e-addressbook-view.c                |    2 
 addressbook/gui/widgets/e-minicard-label.c                  |    2 
 addressbook/gui/widgets/e-minicard-view-widget.c            |    2 
 addressbook/gui/widgets/e-minicard-view.c                   |    2 
 addressbook/gui/widgets/e-minicard.c                        |    2 
 addressbook/gui/widgets/eab-contact-display.c               |    2 
 addressbook/gui/widgets/gal-view-factory-minicard.c         |    2 
 addressbook/printing/e-contact-print-envelope.c             |    2 
 addressbook/printing/e-contact-print.c                      |    2 
 calendar/gui/alarm-notify/alarm-notify-dialog.c             |    2 
 calendar/gui/alarm-notify/alarm-queue.c                     |    2 
 calendar/gui/alarm-notify/notify-main.c                     |    2 
 calendar/gui/alarm-notify/util.c                            |    2 
 calendar/gui/cal-search-bar.c                               |    2 
 calendar/gui/calendar-commands.c                            |    2 
 calendar/gui/calendar-view-factory.c                        |    2 
 calendar/gui/dialogs/alarm-list-dialog.c                    |    2 
 calendar/gui/dialogs/cal-attachment-select-file.c           |    2 
 calendar/gui/dialogs/cal-prefs-dialog.c                     |    2 
 calendar/gui/dialogs/calendar-setup.c                       |    2 
 calendar/gui/dialogs/cancel-comp.c                          |    2 
 calendar/gui/dialogs/changed-comp.c                         |    2 
 calendar/gui/dialogs/comp-editor-page.c                     |    2 
 calendar/gui/dialogs/comp-editor-util.c                     |    2 
 calendar/gui/dialogs/comp-editor.c                          |    2 
 calendar/gui/dialogs/delete-comp.c                          |    2 
 calendar/gui/dialogs/delete-error.c                         |    2 
 calendar/gui/dialogs/event-editor.c                         |    2 
 calendar/gui/dialogs/event-page.c                           |    2 
 calendar/gui/dialogs/memo-editor.c                          |    2 
 calendar/gui/dialogs/memo-page.c                            |    2 
 calendar/gui/dialogs/recur-comp.c                           |    2 
 calendar/gui/dialogs/recurrence-page.c                      |    2 
 calendar/gui/dialogs/schedule-page.c                        |    2 
 calendar/gui/dialogs/task-details-page.c                    |    2 
 calendar/gui/dialogs/task-editor.c                          |    2 
 calendar/gui/dialogs/task-page.c                            |    2 
 calendar/gui/e-alarm-list.c                                 |    2 
 calendar/gui/e-cal-list-view.c                              |    2 
 calendar/gui/e-cal-model-calendar.c                         |    2 
 calendar/gui/e-cal-model-memos.c                            |    2 
 calendar/gui/e-cal-model-tasks.c                            |    2 
 calendar/gui/e-cal-model.c                                  |    2 
 calendar/gui/e-cal-popup.c                                  |    2 
 calendar/gui/e-calendar-view.c                              |    2 
 calendar/gui/e-cell-date-edit-text.c                        |    2 
 calendar/gui/e-day-view-time-item.c                         |    2 
 calendar/gui/e-day-view-top-item.c                          |    2 
 calendar/gui/e-day-view.c                                   |    2 
 calendar/gui/e-itip-control.c                               |    2 
 calendar/gui/e-meeting-list-view.c                          |    2 
 calendar/gui/e-meeting-store.c                              |    2 
 calendar/gui/e-meeting-time-sel-item.c                      |    2 
 calendar/gui/e-meeting-time-sel.c                           |    2 
 calendar/gui/e-timezone-entry.c                             |    2 
 calendar/gui/e-week-view-main-item.c                        |    2 
 calendar/gui/e-week-view.c                                  |    2 
 calendar/gui/gnome-cal.c                                    |    2 
 calendar/gui/itip-utils.c                                   |    2 
 calendar/gui/main.c                                         |    2 
 calendar/gui/memos-control.c                                |    2 
 calendar/gui/misc.c                                         |    2 
 calendar/gui/print.c                                        |    2 
 calendar/gui/tasks-control.c                                |    2 
 calendar/gui/weekday-picker.c                               |    2 
 composer/e-msg-composer-hdrs.c                              |    2 
 composer/e-msg-composer-select-file.c                       |    2 
 composer/e-msg-composer.c                                   |    2 
 e-util/Makefile.am                                          |    1 
 e-util/Makefile.in                                          |    3 
 e-util/e-categories-config.c                                |    2 
 e-util/e-config.c                                           |    2 
 e-util/e-dialog-utils.c                                     |    2 
 e-util/e-error.c                                            |    2 
 e-util/e-event.c                                            |    2 
 e-util/e-i18n.h                                             |   74 ------
 e-util/e-import.c                                           |    2 
 e-util/e-menu.c                                             |    2 
 e-util/e-popup.c                                            |    2 
 e-util/e-text-event-processor.c                             |    3 
 e-util/e-util.c                                             |   14 -
 e-util/e-xml-utils.c                                        |  143 ------------
 e-util/e-xml-utils.h                                        |   12 -
 filter/filter-datespec.c                                    |    2 
 filter/filter-file.c                                        |    2 
 filter/filter-input.c                                       |    2 
 filter/filter-label.c                                       |    2 
 filter/filter-option.c                                      |    2 
 filter/filter-part.c                                        |    2 
 filter/filter-rule.c                                        |    2 
 filter/rule-context.c                                       |    2 
 filter/rule-editor.c                                        |    2 
 mail/em-account-editor.c                                    |    2 
 mail/em-account-prefs.c                                     |    2 
 mail/em-composer-utils.c                                    |    2 
 mail/em-filter-editor.c                                     |    2 
 mail/em-filter-folder-element.c                             |    2 
 mail/em-filter-rule.c                                       |    2 
 mail/em-folder-properties.c                                 |    2 
 mail/em-folder-selection-button.c                           |    2 
 mail/em-folder-selector.c                                   |    2 
 mail/em-folder-tree-model.c                                 |    2 
 mail/em-folder-tree.c                                       |    2 
 mail/em-folder-utils.c                                      |    2 
 mail/em-format-hook.c                                       |    2 
 mail/em-format-html-display.c                               |    2 
 mail/em-format-html.c                                       |    2 
 mail/em-format-quote.c                                      |    2 
 mail/em-format.c                                            |    2 
 mail/em-migrate.c                                           |   36 +--
 mail/em-popup.c                                             |    2 
 mail/em-subscribe-editor.c                                  |    2 
 mail/em-utils.c                                             |    2 
 mail/em-vfolder-editor.c                                    |    2 
 mail/em-vfolder-rule.c                                      |    2 
 mail/importers/mail-importer.c                              |    2 
 mail/mail-autofilter.c                                      |    2 
 mail/mail-component.c                                       |    2 
 mail/mail-folder-cache.c                                    |    2 
 mail/mail-mt.c                                              |    2 
 mail/mail-ops.c                                             |    2 
 mail/mail-send-recv.c                                       |    2 
 mail/mail-tools.c                                           |    2 
 mail/mail-vfolder.c                                         |    2 
 mail/message-list.c                                         |    2 
 mail/message-tag-followup.c                                 |    2 
 plugins/backup-restore/backup-restore.c                     |    2 
 plugins/backup-restore/backup.c                             |    2 
 plugins/bbdb/bbdb.c                                         |    2 
 plugins/bbdb/gaimbuddies.c                                  |    2 
 plugins/calendar-file/calendar-file.c                       |    2 
 plugins/calendar-http/calendar-http.c                       |    2 
 plugins/calendar-weather/calendar-weather.c                 |    2 
 plugins/default-source/default-source.c                     |    2 
 plugins/exchange-operations/exchange-send-options.c         |    2 
 plugins/groupwise-features/addressbook-groupwise.c          |    2 
 plugins/groupwise-features/install-shared.c                 |    2 
 plugins/groupwise-features/junk-settings.c                  |    2 
 plugins/groupwise-features/process-meeting.c                |    2 
 plugins/groupwise-features/send-options.c                   |    2 
 plugins/groupwise-features/share-folder-common.c            |    2 
 plugins/import-ics-attachments/icsimporter.c                |    2 
 plugins/itip-formatter/itip-formatter.c                     |    2 
 plugins/itip-formatter/itip-view.c                          |    2 
 plugins/mark-all-read/mark-all-read.c                       |    2 
 plugins/publish-calendar/publish-calendar.c                 |    2 
 plugins/subject-thread/subject-thread.c                     |    2 
 shell/e-component-registry.c                                |   21 -
 shell/e-shell-folder-title-bar.c                            |    2 
 shell/e-shell-importer.c                                    |    2 
 shell/e-shell-settings-dialog.c                             |   17 -
 shell/e-shell-utils.c                                       |    2 
 shell/e-shell-window-commands.c                             |    9 
 shell/e-shell-window.c                                      |    2 
 shell/e-shell.c                                             |    2 
 shell/e-user-creatable-items-handler.c                      |    2 
 shell/evolution-shell-component-utils.c                     |    2 
 shell/main.c                                                |    2 
 smime/gui/ca-trust-dialog.c                                 |    2 
 smime/gui/cert-trust-dialog.c                               |    2 
 smime/gui/certificate-manager.c                             |    2 
 smime/gui/certificate-viewer.c                              |    2 
 smime/gui/component.c                                       |    2 
 smime/gui/e-cert-selector.c                                 |    2 
 smime/lib/e-cert-db.c                                       |    2 
 smime/lib/e-cert.c                                          |    2 
 smime/lib/e-pkcs12.c                                        |    2 
 tools/killev.c                                              |   12 -
 widgets/menus/gal-define-views-dialog.c                     |    6 
 widgets/menus/gal-define-views-model.c                      |    2 
 widgets/menus/gal-view-collection.c                         |    2 
 widgets/menus/gal-view-factory-etable.c                     |    2 
 widgets/menus/gal-view-instance-save-as-dialog.c            |    6 
 widgets/menus/gal-view-instance.c                           |    2 
 widgets/menus/gal-view-menus.c                              |    2 
 widgets/menus/gal-view-new-dialog.c                         |    4 
 widgets/misc/e-activity-handler.c                           |    2 
 widgets/misc/e-attachment-bar.c                             |    2 
 widgets/misc/e-attachment.c                                 |    2 
 widgets/misc/e-calendar-item.c                              |    2 
 widgets/misc/e-calendar.c                                   |    2 
 widgets/misc/e-canvas-background.c                          |    2 
 widgets/misc/e-canvas-vbox.c                                |    2 
 widgets/misc/e-cell-date-edit.c                             |    2 
 widgets/misc/e-cell-percent.c                               |    2 
 widgets/misc/e-charset-picker.c                             |    2 
 widgets/misc/e-clipped-label.c                              |    2 
 widgets/misc/e-dateedit.c                                   |    2 
 widgets/misc/e-filter-bar.c                                 |    2 
 widgets/misc/e-image-chooser.c                              |    2 
 widgets/misc/e-map.c                                        |    2 
 widgets/misc/e-reflow.c                                     |    2 
 widgets/misc/e-search-bar.c                                 |    2 
 widgets/misc/e-selection-model-array.c                      |    2 
 widgets/misc/e-selection-model.c                            |    2 
 widgets/misc/e-send-options.c                               |    2 
 widgets/misc/e-task-widget.c                                |    2 
 widgets/misc/e-unicode.c                                    |    2 
 widgets/table/e-cell-combo.c                                |    2 
 widgets/table/e-cell-date.c                                 |    2 
 widgets/table/e-cell-float.c                                |    2 
 widgets/table/e-cell-number.c                               |    2 
 widgets/table/e-cell-pixbuf.c                               |    2 
 widgets/table/e-cell-text.c                                 |    2 
 widgets/table/e-table-click-to-add.c                        |    2 
 widgets/table/e-table-col.c                                 |    2 
 widgets/table/e-table-config.c                              |    8 
 widgets/table/e-table-field-chooser-dialog.c                |    2 
 widgets/table/e-table-field-chooser-item.c                  |    2 
 widgets/table/e-table-field-chooser.c                       |    4 
 widgets/table/e-table-group-container.c                     |    2 
 widgets/table/e-table-group-leaf.c                          |    2 
 widgets/table/e-table-header-item.c                         |    6 
 widgets/table/e-table-item.c                                |    2 
 widgets/table/e-table-scrolled.c                            |    2 
 widgets/table/e-table-selection-model.c                     |    2 
 widgets/table/e-table-sorter.c                              |    2 
 widgets/table/e-table.c                                     |    2 
 widgets/table/e-tree-scrolled.c                             |    2 
 widgets/table/e-tree-selection-model.c                      |    2 
 widgets/table/e-tree.c                                      |    2 
 widgets/text/e-completion-view.c                            |    4 
 widgets/text/e-entry.c                                      |    2 
 widgets/text/e-text.c                                       |    2 
 255 files changed, 305 insertions(+), 551 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 evolution-2.10.0-use-glib-i18n.patch
Index: evolution-2.10.0-use-glib-i18n.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.10.0-use-glib-i18n.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- evolution-2.10.0-use-glib-i18n.patch	3 Apr 2007 19:51:14 -0000	1.2
+++ evolution-2.10.0-use-glib-i18n.patch	30 Apr 2007 19:22:54 -0000	1.3
@@ -1,5 +1,5 @@
---- evolution-2.10.0/mail/message-tag-followup.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/message-tag-followup.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/mail/message-tag-followup.c.use-glib-i18n	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/message-tag-followup.c	2007-04-30 13:06:43.000000000 -0400
 @@ -52,7 +52,7 @@
  #include <gconf/gconf-client.h>
  
@@ -9,8 +9,8 @@
  
  #include "e-util/e-icon-factory.h"
  #include "e-util/e-util-private.h"
---- evolution-2.10.0/mail/em-popup.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-popup.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/mail/em-popup.c.use-glib-i18n	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-popup.c	2007-04-30 13:06:43.000000000 -0400
 @@ -41,7 +41,7 @@
  #include <libgnome/gnome-url.h>
  #include <libgnomevfs/gnome-vfs-mime.h>
@@ -20,8 +20,8 @@
  
  #include "em-popup.h"
  #include "libedataserver/e-msgport.h"
---- evolution-2.10.0/mail/em-composer-utils.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
-+++ evolution-2.10.0/mail/em-composer-utils.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/mail/em-composer-utils.c.use-glib-i18n	2007-04-30 13:06:43.000000000 -0400
++++ evolution-2.10.1/mail/em-composer-utils.c	2007-04-30 13:06:43.000000000 -0400
 @@ -29,7 +29,7 @@
  
  #include <libedataserver/e-data-server-util.h>
@@ -31,8 +31,8 @@
  
  #include "mail-mt.h"
  #include "mail-ops.h"
---- evolution-2.10.0/mail/em-account-editor.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-account-editor.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/mail/em-account-editor.c.use-glib-i18n	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-account-editor.c	2007-04-30 13:06:43.000000000 -0400
 @@ -64,7 +64,7 @@
  #include <gtk/gtkcombobox.h>
  #include <gtk/gtktable.h>
@@ -42,8 +42,8 @@
  #include <libgnomeui/gnome-druid.h>
  #include <libgnomeui/gnome-druid-page-standard.h>
  
---- evolution-2.10.0/mail/mail-tools.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/mail-tools.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/mail/mail-tools.c.use-glib-i18n	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/mail-tools.c	2007-04-30 13:06:43.000000000 -0400
 @@ -37,7 +37,7 @@
  #include <gconf/gconf.h>
  #include <gconf/gconf-client.h>
@@ -53,8 +53,8 @@
  
  #include <camel/camel-file-utils.h>
  #include <camel/camel-mime-message.h>
---- evolution-2.10.0/mail/em-folder-selection-button.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-folder-selection-button.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/mail/em-folder-selection-button.c.use-glib-i18n	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-folder-selection-button.c	2007-04-30 13:06:43.000000000 -0400
 @@ -31,7 +31,7 @@
  #include <gtk/gtkhbox.h>
  
@@ -64,8 +64,8 @@
  
  #include "mail-component.h"
  #include "em-folder-tree.h"
---- evolution-2.10.0/mail/em-format-hook.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-format-hook.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/mail/em-format-hook.c.use-glib-i18n	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-format-hook.c	2007-04-30 13:06:43.000000000 -0400
 @@ -33,7 +33,7 @@
  
  #include <e-util/e-icon-factory.h>
@@ -75,8 +75,8 @@
  
  
  /* class name -> klass map for EMFormat and subclasses */
---- evolution-2.10.0/mail/em-format-quote.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-format-quote.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/mail/em-format-quote.c.use-glib-i18n	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-format-quote.c	2007-04-30 13:06:43.000000000 -0400
 @@ -35,7 +35,7 @@
  #include <camel/camel-url.h>
  
@@ -86,8 +86,8 @@
  
  #include "em-stripsig-filter.h"
  #include "em-format-quote.h"
---- evolution-2.10.0/mail/em-utils.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
-+++ evolution-2.10.0/mail/em-utils.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/mail/em-utils.c.use-glib-i18n	2007-04-30 13:06:42.000000000 -0400
++++ evolution-2.10.1/mail/em-utils.c	2007-04-30 13:06:43.000000000 -0400
 @@ -59,7 +59,7 @@
  #include <libgnomevfs/gnome-vfs-mime.h>
  #include <libgnomevfs/gnome-vfs-mime-utils.h>
@@ -97,8 +97,8 @@
  
  #include "mail-component.h"
  #include "mail-mt.h"
---- evolution-2.10.0/mail/em-filter-rule.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-filter-rule.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/mail/em-filter-rule.c.use-glib-i18n	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-filter-rule.c	2007-04-30 13:06:43.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <string.h>
  
@@ -108,8 +108,8 @@
  
  #include "em-filter-rule.h"
  #include "em-filter-context.h"
---- evolution-2.10.0/mail/mail-component.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
-+++ evolution-2.10.0/mail/mail-component.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/mail/mail-component.c.use-glib-i18n	2007-04-30 13:06:43.000000000 -0400
++++ evolution-2.10.1/mail/mail-component.c	2007-04-30 13:06:43.000000000 -0400
 @@ -78,7 +78,7 @@
  
  #include <table/e-tree.h>
@@ -119,8 +119,8 @@
  
  #include <camel/camel-file-utils.h>
  #include <camel/camel-vtrash-folder.h>
---- evolution-2.10.0/mail/importers/mail-importer.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
-+++ evolution-2.10.0/mail/importers/mail-importer.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/mail/importers/mail-importer.c.use-glib-i18n	2007-04-30 13:06:43.000000000 -0400
++++ evolution-2.10.1/mail/importers/mail-importer.c	2007-04-30 13:06:43.000000000 -0400
 @@ -38,7 +38,7 @@
  
  #include <gmodule.h>
@@ -130,8 +130,8 @@
  #include <camel/camel-folder.h>
  #include <camel/camel-store.h>
  #include <camel/camel-mime-message.h>
---- evolution-2.10.0/mail/mail-send-recv.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
-+++ evolution-2.10.0/mail/mail-send-recv.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/mail/mail-send-recv.c.use-glib-i18n	2007-04-30 13:06:43.000000000 -0400
++++ evolution-2.10.1/mail/mail-send-recv.c	2007-04-30 13:06:43.000000000 -0400
 @@ -39,7 +39,7 @@
  #include <gtk/gtkbox.h>
  #include <gtk/gtkscrolledwindow.h>
@@ -141,8 +141,8 @@
  
  #include "e-util/e-gtk-utils.h"
  #include "libedataserver/e-account-list.h"
---- evolution-2.10.0/mail/em-format-html.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
-+++ evolution-2.10.0/mail/em-format-html.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/mail/em-format-html.c.use-glib-i18n	2007-04-30 13:06:43.000000000 -0400
++++ evolution-2.10.1/mail/em-format-html.c	2007-04-30 13:06:43.000000000 -0400
 @@ -51,7 +51,7 @@
  #include <gtkhtml/gtkhtml-embedded.h>
  #include <gtkhtml/gtkhtml-stream.h>
@@ -152,8 +152,8 @@
  
  #include <camel/camel-mime-message.h>
  #include <camel/camel-stream.h>
---- evolution-2.10.0/mail/em-filter-folder-element.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-filter-folder-element.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/mail/em-filter-folder-element.c.use-glib-i18n	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-filter-folder-element.c	2007-04-30 13:06:43.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <string.h>
  
@@ -163,8 +163,8 @@
  
  #include "em-filter-folder-element.h"
  #include "mail/em-folder-selection-button.h"
---- evolution-2.10.0/mail/em-folder-tree.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
-+++ evolution-2.10.0/mail/em-folder-tree.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/mail/em-folder-tree.c.use-glib-i18n	2007-04-30 13:06:43.000000000 -0400
++++ evolution-2.10.1/mail/em-folder-tree.c	2007-04-30 13:06:43.000000000 -0400
 @@ -38,7 +38,7 @@
  #include <glib/gi18n.h>
  #include <gtk/gtk.h>
@@ -174,8 +174,8 @@
  
  #include <camel/camel-session.h>
  #include <camel/camel-store.h>
---- evolution-2.10.0/mail/em-filter-editor.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-filter-editor.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/mail/em-filter-editor.c.use-glib-i18n	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-filter-editor.c	2007-04-30 13:06:43.000000000 -0400
 @@ -26,7 +26,7 @@
  #endif
  
@@ -185,8 +185,8 @@
  
  #include "e-util/e-util-private.h"
  
---- evolution-2.10.0/mail/em-folder-tree-model.c.use-glib-i18n	2007-01-03 10:34:12.000000000 -0500
-+++ evolution-2.10.0/mail/em-folder-tree-model.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/mail/em-folder-tree-model.c.use-glib-i18n	2007-04-09 09:09:27.000000000 -0400
++++ evolution-2.10.1/mail/em-folder-tree-model.c	2007-04-30 13:06:43.000000000 -0400
[...2418 lines suppressed...]
  #endif
  
@@ -3098,8 +3117,8 @@
  #include "e-cal-model-memos.h"
  #include "e-cell-date-edit-text.h"
  #include "misc.h"
---- evolution-2.10.0/calendar/gui/main.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/main.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/calendar/gui/main.c.use-glib-i18n	2007-04-09 09:10:33.000000000 -0400
++++ evolution-2.10.1/calendar/gui/main.c	2007-04-30 13:06:43.000000000 -0400
 @@ -25,7 +25,7 @@
  #endif
  
@@ -3109,8 +3128,8 @@
  #include <libgnome/gnome-init.h>
  #include <libgnomevfs/gnome-vfs-init.h>
  #include <glade/glade.h>
---- evolution-2.10.0/calendar/gui/cal-search-bar.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/cal-search-bar.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/calendar/gui/cal-search-bar.c.use-glib-i18n	2007-04-09 09:10:33.000000000 -0400
++++ evolution-2.10.1/calendar/gui/cal-search-bar.c	2007-04-30 13:06:43.000000000 -0400
 @@ -29,7 +29,7 @@
  #include <gtk/gtkmenuitem.h>
  #include <gtk/gtkoptionmenu.h>
@@ -3120,8 +3139,8 @@
  #include <libedataserver/e-categories.h>
  #include <e-util/e-icon-factory.h>
  #include <libedataserver/e-categories.h>
---- evolution-2.10.0/calendar/gui/e-day-view-time-item.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/e-day-view-time-item.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/calendar/gui/e-day-view-time-item.c.use-glib-i18n	2007-04-09 09:10:33.000000000 -0400
++++ evolution-2.10.1/calendar/gui/e-day-view-time-item.c	2007-04-30 13:06:43.000000000 -0400
 @@ -36,7 +36,7 @@
  #include <gtk/gtksignal.h>
  #include <gtk/gtkradiomenuitem.h>
@@ -3131,8 +3150,8 @@
  #include <misc/e-gui-utils.h>
  #include "e-day-view-time-item.h"
  #include "calendar-config.h"
---- evolution-2.10.0/calendar/gui/e-cal-popup.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/e-cal-popup.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/calendar/gui/e-cal-popup.c.use-glib-i18n	2007-04-09 09:10:33.000000000 -0400
++++ evolution-2.10.1/calendar/gui/e-cal-popup.c	2007-04-30 13:06:43.000000000 -0400
 @@ -39,7 +39,7 @@
  #include <camel/camel-mime-part.h>
  #include <camel/camel-stream-vfs.h>
@@ -3142,8 +3161,8 @@
  #include "e-util/e-mktemp.h"
  #include "e-util/e-dialog-utils.h"
  
---- evolution-2.10.0/calendar/gui/e-meeting-store.c.use-glib-i18n	2007-04-03 15:07:43.000000000 -0400
-+++ evolution-2.10.0/calendar/gui/e-meeting-store.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/calendar/gui/e-meeting-store.c.use-glib-i18n	2007-04-30 13:06:43.000000000 -0400
++++ evolution-2.10.1/calendar/gui/e-meeting-store.c	2007-04-30 13:06:43.000000000 -0400
 @@ -26,7 +26,7 @@
  #endif
  
@@ -3153,8 +3172,8 @@
  #include <libgnome/gnome-util.h>
  #include <libgnomevfs/gnome-vfs.h>
  #include <libebook/e-book.h>
---- evolution-2.10.0/calendar/gui/e-week-view-main-item.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/e-week-view-main-item.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/calendar/gui/e-week-view-main-item.c.use-glib-i18n	2007-04-09 09:10:33.000000000 -0400
++++ evolution-2.10.1/calendar/gui/e-week-view-main-item.c	2007-04-30 13:06:43.000000000 -0400
 @@ -32,7 +32,7 @@
  
  #include <string.h>
@@ -3164,8 +3183,8 @@
  #include "e-week-view-main-item.h"
  #include "ea-calendar.h"
  
---- evolution-2.10.0/calendar/gui/gnome-cal.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/gnome-cal.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/calendar/gui/gnome-cal.c.use-glib-i18n	2007-04-09 09:10:33.000000000 -0400
++++ evolution-2.10.1/calendar/gui/gnome-cal.c	2007-04-30 13:06:43.000000000 -0400
 @@ -36,7 +36,7 @@
  #include <glib.h>
  #include <gdk/gdkkeysyms.h>
@@ -3175,8 +3194,8 @@
  #include <libgnome/gnome-util.h>
  #include <libgnomeui/gnome-dialog.h>
  #include <libgnomeui/gnome-dialog-util.h>
---- evolution-2.10.0/calendar/gui/e-cal-list-view.c.use-glib-i18n	2007-01-03 10:34:53.000000000 -0500
-+++ evolution-2.10.0/calendar/gui/e-cal-list-view.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/calendar/gui/e-cal-list-view.c.use-glib-i18n	2007-04-09 09:10:33.000000000 -0400
++++ evolution-2.10.1/calendar/gui/e-cal-list-view.c	2007-04-30 13:06:43.000000000 -0400
 @@ -50,7 +50,7 @@
  #include <table/e-cell-combo.h>
  #include <misc/e-popup-menu.h>
@@ -3186,8 +3205,8 @@
  #include <libgnome/gnome-exec.h>
  #include <libgnome/gnome-util.h>
  #include <e-util/e-categories-config.h>
---- evolution-2.10.0/smime/lib/e-cert-db.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/lib/e-cert-db.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/smime/lib/e-cert-db.c.use-glib-i18n	2007-04-09 09:07:58.000000000 -0400
++++ evolution-2.10.1/smime/lib/e-cert-db.c	2007-04-30 13:06:43.000000000 -0400
 @@ -90,7 +90,7 @@
  #include "e-util/e-dialog-utils.h"
  #include "e-util/e-util-private.h"
@@ -3197,8 +3216,8 @@
  #include <libedataserverui/e-passwords.h>
  #include <sys/types.h>
  #include <sys/stat.h>
---- evolution-2.10.0/smime/lib/e-cert.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/lib/e-cert.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/smime/lib/e-cert.c.use-glib-i18n	2007-04-09 09:07:58.000000000 -0400
++++ evolution-2.10.1/smime/lib/e-cert.c	2007-04-30 13:06:43.000000000 -0400
 @@ -62,7 +62,7 @@
  
  #include <time.h>
@@ -3208,8 +3227,8 @@
  #include <libedataserver/e-data-server-util.h>
  #include <e-util/e-util.h>	/* for e_utf8_strftime, what about e_time_format_time? */
  
---- evolution-2.10.0/smime/lib/e-pkcs12.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/lib/e-pkcs12.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/smime/lib/e-pkcs12.c.use-glib-i18n	2007-04-09 09:07:58.000000000 -0400
++++ evolution-2.10.1/smime/lib/e-pkcs12.c	2007-04-30 13:06:43.000000000 -0400
 @@ -63,7 +63,7 @@
  #include <glib.h>
  #include <glib/gstdio.h>
@@ -3219,8 +3238,8 @@
  #include <libedataserverui/e-passwords.h>
  
  #include <time.h>
---- evolution-2.10.0/smime/gui/certificate-viewer.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/gui/certificate-viewer.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/smime/gui/certificate-viewer.c.use-glib-i18n	2007-04-09 09:07:55.000000000 -0400
++++ evolution-2.10.1/smime/gui/certificate-viewer.c	2007-04-30 13:06:43.000000000 -0400
 @@ -31,7 +31,7 @@
  
  #include <gtk/gtk.h>
@@ -3230,8 +3249,8 @@
  #include <glade/glade.h>
  
  #include "e-util/e-util-private.h"
---- evolution-2.10.0/smime/gui/certificate-manager.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/gui/certificate-manager.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/smime/gui/certificate-manager.c.use-glib-i18n	2007-04-09 09:07:56.000000000 -0400
++++ evolution-2.10.1/smime/gui/certificate-manager.c	2007-04-30 13:06:43.000000000 -0400
 @@ -29,7 +29,7 @@
  
  #include <gtk/gtk.h>
@@ -3241,8 +3260,8 @@
  
  #include <glade/glade.h>
  #include "evolution-config-control.h"
---- evolution-2.10.0/smime/gui/e-cert-selector.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/gui/e-cert-selector.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/smime/gui/e-cert-selector.c.use-glib-i18n	2007-04-09 09:07:56.000000000 -0400
++++ evolution-2.10.1/smime/gui/e-cert-selector.c	2007-04-30 13:06:43.000000000 -0400
 @@ -23,7 +23,7 @@
  #include <config.h>
  #endif
@@ -3252,8 +3271,8 @@
  
  #include <gtk/gtktextview.h>
  #include <gtk/gtkoptionmenu.h>
---- evolution-2.10.0/smime/gui/cert-trust-dialog.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/gui/cert-trust-dialog.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/smime/gui/cert-trust-dialog.c.use-glib-i18n	2007-04-09 09:07:56.000000000 -0400
++++ evolution-2.10.1/smime/gui/cert-trust-dialog.c	2007-04-30 13:06:43.000000000 -0400
 @@ -36,7 +36,7 @@
  #include <gtk/gtkdialog.h>
  #include <gtk/gtklabel.h>
@@ -3263,8 +3282,8 @@
  #include <glade/glade.h>
  
  #include "e-util/e-util-private.h"
---- evolution-2.10.0/smime/gui/component.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/gui/component.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/smime/gui/component.c.use-glib-i18n	2007-04-09 09:07:56.000000000 -0400
++++ evolution-2.10.1/smime/gui/component.c	2007-04-30 13:06:43.000000000 -0400
 @@ -29,7 +29,7 @@
  
  #include <gtk/gtk.h>
@@ -3274,8 +3293,8 @@
  #include <libedataserverui/e-passwords.h>
  
  #include "ca-trust-dialog.h"
---- evolution-2.10.0/smime/gui/ca-trust-dialog.c.use-glib-i18n	2007-01-03 10:32:55.000000000 -0500
-+++ evolution-2.10.0/smime/gui/ca-trust-dialog.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/smime/gui/ca-trust-dialog.c.use-glib-i18n	2007-04-09 09:07:55.000000000 -0400
++++ evolution-2.10.1/smime/gui/ca-trust-dialog.c	2007-04-30 13:06:43.000000000 -0400
 @@ -30,7 +30,7 @@
  
  #include <gtk/gtk.h>
@@ -3285,8 +3304,8 @@
  #include <glade/glade.h>
  
  #include "e-util/e-util-private.h"
---- evolution-2.10.0/tools/killev.c.use-glib-i18n	2007-01-03 10:32:49.000000000 -0500
-+++ evolution-2.10.0/tools/killev.c	2007-04-03 15:07:43.000000000 -0400
+--- evolution-2.10.1/tools/killev.c.use-glib-i18n	2007-04-09 09:07:44.000000000 -0400
++++ evolution-2.10.1/tools/killev.c	2007-04-30 13:06:43.000000000 -0400
 @@ -31,7 +31,7 @@
  
  #include <bonobo/bonobo-exception.h>


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- evolution.spec	28 Apr 2007 03:52:02 -0000	1.250
+++ evolution.spec	30 Apr 2007 19:22:54 -0000	1.251
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -158,20 +158,17 @@
 # GNOME bug #418971
 Patch47: evolution-2.10.0-drop-old-glib-support.patch
 
-# GNOME bug #427939 (gnome-doc-utils)
-Patch48: evolution-2.10.1-fix-gnome-doc-utils.patch
-
 # RH bug #235878 / GNOME bug #386503
-Patch49: evolution-2.10.1-fix-help.patch
+Patch48: evolution-2.10.1-fix-help.patch
 
 # RH bug #234315 / GNOME bug #423766
-Patch50: evolution-2.10.1-saving-attachments.patch
+Patch49: evolution-2.10.1-saving-attachments.patch
 
 # RH bug #236860 / GNOME bug #407104
-Patch51: evolution-2.10.1-fix-uri-handling.patch
+Patch50: evolution-2.10.1-fix-uri-handling.patch
 
 # RH bug #236399 / GNOME bug #434019
-Patch52: evolution-2.10.1-en_CA-attribution-format.patch
+Patch51: evolution-2.10.1-en_CA-attribution-format.patch
 
 ## Dependencies ###
 
@@ -325,11 +322,10 @@
 %patch45 -p1 -b .shell-main-cleanups
 %patch46 -p1 -b .use-glib-i18n
 %patch47 -p1 -b .drop-old-glib-support
-%patch48 -p1 -b .fix-gnome-doc-utils
-%patch49 -p1 -b .fix-help
-%patch50 -p1 -b .saving-attachments
-%patch51 -p1 -b .fix-uri-handling
-%patch52 -p1 -b .en_CA-attribution-format
+%patch48 -p1 -b .fix-help
+%patch49 -p1 -b .saving-attachments
+%patch50 -p1 -b .fix-uri-handling
+%patch51 -p1 -b .en_CA-attribution-format
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -413,9 +409,9 @@
 	-Werror-implicit-function-declaration"
 %endif
 
-# Rerun the GNU Autotools since we patched some of the input files.
-# Disable portability checking to keep automake 1.10 quiet.
-autoreconf --force --warnings=no-portability
+# Temporary work-around for a bad gnome-doc-utils.make.
+# See GNOME bug #427939.  Should be fixed in evolution-2.10.2.
+sed -i -e 's/@ENABLE_SK_TRUE at _s/_s/' help/Makefile.in
 
 %configure \
   --disable-scrollkeeper \
@@ -751,6 +747,10 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Apr 30 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-9.fc7
+- Revise some patches so that we don't have to run autoreconf.
+- Remove patch for GNOME bug #427939 (use a different work-around).
+
 * Fri Apr 27 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-8.fc7
 - Add patch for RH bug #236399 (en_CA attribution format).
 


--- evolution-2.10.1-fix-gnome-doc-utils.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Apr 30 19:26:38 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 15:26:38 -0400
Subject: rpms/wireless-tools/devel wireless-tools-28-alignment-64bit.patch,
	NONE, 1.1 wireless-tools.spec, 1.34, 1.35
Message-ID: <200704301926.l3UJQcCL023303@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/wireless-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23261

Modified Files:
	wireless-tools.spec 
Added Files:
	wireless-tools-28-alignment-64bit.patch 
Log Message:
* Mon Apr 30 2007 Christopher Aillon <caillon at redhat.com> - 1:28-2
- Backport a few 64bit alignment fixes from the latest betas.


wireless-tools-28-alignment-64bit.patch:
 iwlib.c |   81 +++++++++++++++++++++++++++++++++++++++++++++++-----------------
 iwlib.h |   13 ++++++++++
 2 files changed, 73 insertions(+), 21 deletions(-)

--- NEW FILE wireless-tools-28-alignment-64bit.patch ---
--- wireless_tools.28/iwlib.h.alignment-64bit	2007-04-30 15:15:03.000000000 -0400
+++ wireless_tools.28/iwlib.h	2007-04-30 15:15:33.000000000 -0400
@@ -153,6 +153,19 @@
 #define ARPHRD_IEEE80211 801		/* IEEE 802.11			*/
 #endif /* ARPHRD_IEEE80211 */
 
+#ifndef IW_EV_LCP_PK_LEN
+/* Size of the Event prefix when packed in stream */
+#define IW_EV_LCP_PK_LEN	(4)
+/* Size of the various events when packed in stream */
+#define IW_EV_CHAR_PK_LEN	(IW_EV_LCP_PK_LEN + IFNAMSIZ)
+#define IW_EV_UINT_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(__u32))
+#define IW_EV_FREQ_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct iw_freq))
+#define IW_EV_PARAM_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct iw_param))
+#define IW_EV_ADDR_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct sockaddr))
+#define IW_EV_QUAL_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct iw_quality))
+#define IW_EV_POINT_PK_LEN	(IW_EV_LCP_LEN + 4)
+#endif	/* IW_EV_LCP_PK_LEN */
+
 /****************************** TYPES ******************************/
 
 /* Shortcuts */
--- wireless_tools.28/iwlib.c.alignment-64bit	2007-04-30 15:14:57.000000000 -0400
+++ wireless_tools.28/iwlib.c	2007-04-30 15:15:33.000000000 -0400
@@ -2560,17 +2560,17 @@
 
 /* Size (in bytes) of various events */
 static const int event_type_size[] = {
-	IW_EV_LCP_LEN,		/* IW_HEADER_TYPE_NULL */
+	IW_EV_LCP_PK_LEN,	/* IW_HEADER_TYPE_NULL */
 	0,
-	IW_EV_CHAR_LEN,		/* IW_HEADER_TYPE_CHAR */
+	IW_EV_CHAR_PK_LEN,	/* IW_HEADER_TYPE_CHAR */
 	0,
-	IW_EV_UINT_LEN,		/* IW_HEADER_TYPE_UINT */
-	IW_EV_FREQ_LEN,		/* IW_HEADER_TYPE_FREQ */
-	IW_EV_ADDR_LEN,		/* IW_HEADER_TYPE_ADDR */
+	IW_EV_UINT_PK_LEN,	/* IW_HEADER_TYPE_UINT */
+	IW_EV_FREQ_PK_LEN,	/* IW_HEADER_TYPE_FREQ */
+	IW_EV_ADDR_PK_LEN,	/* IW_HEADER_TYPE_ADDR */
 	0,
-	IW_EV_POINT_LEN,	/* Without variable payload */
-	IW_EV_PARAM_LEN,	/* IW_HEADER_TYPE_PARAM */
-	IW_EV_QUAL_LEN,		/* IW_HEADER_TYPE_QUAL */
+	IW_EV_POINT_PK_LEN,	/* Without variable payload */
+	IW_EV_PARAM_PK_LEN,	/* IW_HEADER_TYPE_PARAM */
+	IW_EV_QUAL_PK_LEN,	/* IW_HEADER_TYPE_QUAL */
 };
 
 /*------------------------------------------------------------------*/
@@ -2607,11 +2607,8 @@
   /* Don't "optimise" the following variable, it will crash */
   unsigned	cmd_index;		/* *MUST* be unsigned */
 
-  /* Unused for now. Will be later on... */
-  we_version = we_version;
-
   /* Check for end of stream */
-  if((stream->current + IW_EV_LCP_LEN) > stream->end)
+  if((stream->current + IW_EV_LCP_PK_LEN) > stream->end)
     return(0);
 
 #if DEBUG
@@ -2621,7 +2618,7 @@
 
   /* Extract the event header (to get the event id).
    * Note : the event may be unaligned, therefore copy... */
-  memcpy((char *) iwe, stream->current, IW_EV_LCP_LEN);
+  memcpy((char *) iwe, stream->current, IW_EV_LCP_PK_LEN);
 
 #if DEBUG
   printf("DBG - iwe->cmd = 0x%X, iwe->len = %d\n",
@@ -2629,7 +2626,7 @@
 #endif
 
   /* Check invalid events */
-  if(iwe->len <= IW_EV_LCP_LEN)
+  if(iwe->len <= IW_EV_LCP_PK_LEN)
     return(-1);
 
   /* Get the type and length of that event */
@@ -2647,26 +2644,26 @@
     }
   if(descr != NULL)
     event_type = descr->header_type;
-  /* Unknown events -> event_type=0 => IW_EV_LCP_LEN */
+  /* Unknown events -> event_type=0 => IW_EV_LCP_PK_LEN */
   event_len = event_type_size[event_type];
   /* Fixup for earlier version of WE */
   if((we_version <= 18) && (event_type == IW_HEADER_TYPE_POINT))
     event_len += IW_EV_POINT_OFF;
 
   /* Check if we know about this event */
-  if(event_len <= IW_EV_LCP_LEN)
+  if(event_len <= IW_EV_LCP_PK_LEN)
     {
       /* Skip to next event */
       stream->current += iwe->len;
       return(2);
     }
-  event_len -= IW_EV_LCP_LEN;
+  event_len -= IW_EV_LCP_PK_LEN;
 
   /* Set pointer on data */
   if(stream->value != NULL)
     pointer = stream->value;			/* Next value in event */
   else
-    pointer = stream->current + IW_EV_LCP_LEN;	/* First value in event */
+    pointer = stream->current + IW_EV_LCP_PK_LEN;	/* First value in event */
 
 #if DEBUG
   printf("DBG - event_type = %d, event_len = %d, pointer = %p\n",
@@ -2682,10 +2679,10 @@
     }
   /* Fixup for WE-19 and later : pointer no longer in the stream */
   if((we_version > 18) && (event_type == IW_HEADER_TYPE_POINT))
-    memcpy((char *) iwe + IW_EV_LCP_LEN + IW_EV_POINT_OFF,
+    memcpy((char *) iwe + IW_EV_LCP_PK_LEN + IW_EV_POINT_OFF,
 	   pointer, event_len);
   else
-    memcpy((char *) iwe + IW_EV_LCP_LEN, pointer, event_len);
+    memcpy((char *) iwe + IW_EV_LCP_PK_LEN, pointer, event_len);
 
   /* Skip event in the stream */
   pointer += event_len;
@@ -2694,7 +2691,7 @@
   if(event_type == IW_HEADER_TYPE_POINT)
     {
       /* Check the length of the payload */
-      unsigned int	extra_len = iwe->len - (event_len + IW_EV_LCP_LEN);
+      unsigned int	extra_len = iwe->len - (event_len + IW_EV_LCP_PK_LEN);
       if(extra_len > 0)
 	{
 	  /* Set pointer on variable part (warning : non aligned) */
@@ -2712,6 +2709,31 @@
 	      /* Discard bogus events which advertise more tokens than
 	       * what they carry... */
 	      unsigned int	token_len = iwe->u.data.length * descr->token_size;
+
+	      /* Ugly fixup for alignement issues.
+	       * If the kernel is 64 bits and userspace 32 bits,
+	       * we have an extra 4+4 bytes.
+	       * Fixing that in the kernel would break 64 bits userspace. */
+	      if((token_len != extra_len) && (extra_len >= 4))
+		{
+		  __u16		alt_dlen = *((__u16 *) pointer);
+		  unsigned int	alt_token_len = alt_dlen * descr->token_size;
+		  if((alt_token_len + 8) == extra_len)
+		    {
+#if DEBUG
+		      printf("DBG - alt_token_len = %d\n", alt_token_len);
+#endif
+		      /* Ok, let's redo everything */
+		      pointer -= event_len;
+		      pointer += 4;
+		      memcpy((char *) iwe + IW_EV_LCP_PK_LEN + IW_EV_POINT_OFF,
+			     pointer, event_len);
+		      pointer += event_len + 4;
+		      iwe->u.data.pointer = pointer;
+		      token_len = alt_token_len;
+		    }
+		}
+
 	      if(token_len > extra_len)
 		iwe->u.data.pointer = NULL;	/* Discard paylod */
 	      /* Check that the advertised token size is not going to
@@ -2737,6 +2759,23 @@
     }
   else
     {
+      /* Ugly fixup for alignement issues.
+       * If the kernel is 64 bits and userspace 32 bits,
+       * we have an extra 4 bytes.
+       * Fixing that in the kernel would break 64 bits userspace. */
+      if((stream->value == NULL)
+	 && ((((iwe->len - IW_EV_LCP_PK_LEN) % event_len) == 4)
+	     || ((event_type == IW_HEADER_TYPE_UINT) && (iwe->len == 12))))
+	{
+#if DEBUG
+	  printf("DBG - alt iwe->len = %d\n", iwe->len - 4);
+#endif
+	  pointer -= event_len;
+	  pointer += 4;
+	  memcpy((char *) iwe + IW_EV_LCP_PK_LEN, pointer, event_len);
+	  pointer += event_len;
+	}
+
       /* Is there more value in the event ? */
       if((pointer + event_len) <= (stream->current + iwe->len))
 	/* Go to next value */


Index: wireless-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/wireless-tools/devel/wireless-tools.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- wireless-tools.spec	29 Aug 2006 23:20:20 -0000	1.34
+++ wireless-tools.spec	30 Apr 2007 19:26:36 -0000	1.35
@@ -8,11 +8,12 @@
 License: GPL
 Name: wireless-tools
 Version: 28
-Release: 1%{?pre_version}%{?dist}
+Release: 2%{?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
 Patch1: wireless-tools-28-makefile.patch
+Patch2: wireless-tools-28-alignment-64bit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 ExcludeArch: s390 s390x
 
@@ -41,6 +42,7 @@
 
 %setup -n wireless_tools.%{version}
 %patch1 -p1 -b .makefile
+%patch2 -p1 -b .alignment-64bit
 
 %build
 make clean
@@ -78,6 +80,9 @@
 
 
 %changelog
+* Mon Apr 30 2007 Christopher Aillon <caillon at redhat.com> - 1:28-2
+- Backport a few 64bit alignment fixes from the latest betas.
+
 * Tue Aug 29 2006 Christopher Aillon <caillon at redhat.com> - 1:28-1
 - Update to the latest stable release
 - Create -devel subpackage for headers



From fedora-cvs-commits at redhat.com  Mon Apr 30 19:37:33 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 15:37:33 -0400
Subject: rpms/gimp/devel gimp.spec,1.122,1.123
Message-ID: <200704301937.l3UJbXKY019413@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21439

Modified Files:
	gimp.spec 
Log Message:
fix plugin symlinks handling better (#238337)
Resolves: #238337



Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- gimp.spec	30 Apr 2007 16:45:17 -0000	1.122
+++ gimp.spec	30 Apr 2007 19:37:26 -0000	1.123
@@ -43,7 +43,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
@@ -269,16 +269,24 @@
 %clean
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
+%pre
+# First, remove old symlinks which are possibly in an old location (before a
+# major version update)
+if [ -x "%{_sbindir}/gimp-plugin-mgr" ]; then
+    %{_sbindir}/gimp-plugin-mgr --uninstall '*'
+fi
+
 %post
 /usr/bin/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
-%{_sbindir}/gimp-plugin-mgr --uninstall '*'
+# Then re-add the symlinks
 %{_sbindir}/gimp-plugin-mgr --install '*'
 
 %preun
+# Only delete symlinks when uninstalling
 if [ "$1" = "0" ]; then
     %{_sbindir}/gimp-plugin-mgr --uninstall '*'
 fi
@@ -413,6 +421,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Apr 30 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.14-4
+- fix plugin symlinks handling better (#238337)
+
 * Mon Apr 30 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.14-3
 - don't erroneously delete symlinks to external plugins when updating (#238337)
 



From fedora-cvs-commits at redhat.com  Mon Apr 30 20:40:36 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 16:40:36 -0400
Subject: rpms/ccid/devel ccid.spec,1.9,1.10
Message-ID: <200704302040.l3UKeaNC015752@cvs.devel.redhat.com>

Author: rrelyea

Update of /cvs/dist/rpms/ccid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15144

Modified Files:
	ccid.spec 
Log Message:


Bug 238321: pcsc-lite_ver is undefined.

Should be pcsc_lite_ver.





Index: ccid.spec
===================================================================
RCS file: /cvs/dist/rpms/ccid/devel/ccid.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ccid.spec	7 Feb 2007 02:22:01 -0000	1.9
+++ ccid.spec	30 Apr 2007 20:40:29 -0000	1.10
@@ -4,7 +4,7 @@
 
 Name:           ccid
 Version:        1.2.1
-Release:        1%{dist}
+Release:        2%{dist}
 Summary:        Generic USB CCID smart card reader driver
 
 Group:          System Environment/Libraries
@@ -14,7 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libusb-devel >= %{libusb_ver}
-BuildRequires:  pcsc-lite-devel >= %{pcsc-lite_ver}
+BuildRequires:  pcsc-lite-devel >= %{pcsc_lite_ver}
 Requires(post): initscripts
 Requires(postun): initscripts
 Requires:       libusb >= %{libusb_ver}
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Mon Apr 30 2007 Bob Relyea <rrelyea at redhat.com> - 1.2.1-2
+- Fix the missed use of the version macro
+
 * Tue Feb 06 2007 Bob Relyea <rrelyea at redhat.com> - 1.2.1-1
 - Pick up ccid 1.2.1
 - use pcscd 'hotplug' feature instead of restarting the daemon



From fedora-cvs-commits at redhat.com  Mon Apr 30 20:51:24 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 16:51:24 -0400
Subject: rpms/python/FC-6 python-syslog-fail-noatexittb.patch, NONE,
	1.1 python.spec, 1.91, 1.92 sources, 1.15, 1.16
Message-ID: <200704302051.l3UKpOQK024078@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/python/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv24033

Modified Files:
	python.spec sources 
Added Files:
	python-syslog-fail-noatexittb.patch 
Log Message:
* Mon Apr 30 2007 Jeremy Katz <katzj at redhat.com>
- fix atexit handler with syslog logging (#237886)


python-syslog-fail-noatexittb.patch:
 handlers.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE python-syslog-fail-noatexittb.patch ---
--- Python-2.4.4/Lib/logging/handlers.py.syslogexit	2006-12-05 11:41:12.000000000 -0500
+++ Python-2.4.4/Lib/logging/handlers.py	2006-12-05 11:41:20.000000000 -0500
@@ -586,11 +586,11 @@
         self.address = address
         self.facility = facility
         if type(address) == types.StringType:
-            self._connect_unixsocket(address)
             self.unixsocket = 1
+            self._connect_unixsocket(address)
         else:
-            self.socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
             self.unixsocket = 0
+            self.socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 
         self.formatter = None
 


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/FC-6/python.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- python.spec	23 Oct 2006 17:54:17 -0000	1.91
+++ python.spec	30 Apr 2007 20:51:22 -0000	1.92
@@ -45,6 +45,7 @@
 Patch17: python-2.4-webbrowser.patch
 Patch18: python-2.4.3-cflags.patch
 Patch19: python-2.4.3-locale.patch
+Patch20: python-syslog-fail-noatexittb.patch
 
 %if %{main_python}
 Obsoletes: Distutils
@@ -154,6 +155,7 @@
 %patch17 -p0 -b .web-browser
 %patch18 -p1 -b .cflags
 %patch19 -p2 -b .locale
+%patch20 -p1 -b .logatexit
 
 # This shouldn't be necesarry, but is right now (2.2a3)
 find -name "*~" |xargs rm -f
@@ -399,6 +401,12 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Mon Apr 30 2007 Jeremy Katz <katzj at redhat.com>
+- fix atexit handler with syslog logging (#237886)
+
+* Sat Jan  6 2007 Jeremy Katz <katzj at redhat.com>
+- fix shm module for 64bit systems (#218778)
+
 * Mon Oct 23 2006 Jeremy Katz <katzj at redhat.com> - 2.4.4-1
 - update to 2.4.4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/python/FC-6/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	23 Oct 2006 17:54:17 -0000	1.15
+++ sources	30 Apr 2007 20:51:22 -0000	1.16
@@ -1,3 +1,2 @@
 e4f2ed866f4ce978fb54bb962eab4fdf  JapaneseCodecs-1.4.11.tar.gz
-141c683447d5e76be1d2bd4829574f02  Python-2.4.3.tar.bz2
 0ba90c79175c017101100ebf5978e906  Python-2.4.4.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Apr 30 20:58:27 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 16:58:27 -0400
Subject: rpms/evolution-data-server/devel
	evolution-data-server-1.10.1-apop-auth-vulnerability.patch,
	1.1, 1.2 evolution-data-server.spec, 1.160, 1.161
Message-ID: <200704302058.l3UKwRkE029155@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29004

Modified Files:
	evolution-data-server-1.10.1-apop-auth-vulnerability.patch 
	evolution-data-server.spec 
Log Message:

* Mon Apr 30 2007 Matthew Barnes <mbarnes at redhat.com> - 1.10.1-3.fc7
- Revise patch for RH bug #235290 to not break string freeze.


evolution-data-server-1.10.1-apop-auth-vulnerability.patch:
 camel-pop3-store.c |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletion(-)

Index: evolution-data-server-1.10.1-apop-auth-vulnerability.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server-1.10.1-apop-auth-vulnerability.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-data-server-1.10.1-apop-auth-vulnerability.patch	24 Apr 2007 20:15:51 -0000	1.1
+++ evolution-data-server-1.10.1-apop-auth-vulnerability.patch	30 Apr 2007 20:58:25 -0000	1.2
@@ -1,5 +1,5 @@
 --- evolution-data-server-1.10.1/camel/providers/pop3/camel-pop3-store.c.apop-auth-vulnerability	2007-04-09 08:42:37.000000000 -0400
-+++ evolution-data-server-1.10.1/camel/providers/pop3/camel-pop3-store.c	2007-04-24 16:12:28.000000000 -0400
++++ evolution-data-server-1.10.1/camel/providers/pop3/camel-pop3-store.c	2007-04-30 16:42:12.000000000 -0400
 @@ -34,6 +34,7 @@
  #include <string.h>
  #include <unistd.h>
@@ -8,25 +8,26 @@
  
  #include "camel-operation.h"
  
-@@ -489,6 +490,21 @@
+@@ -489,7 +490,21 @@
  	} else if (strcmp(service->url->authmech, "+APOP") == 0 && store->engine->apop) {
  		char *secret, md5asc[33], *d;
  		unsigned char md5sum[16], *s;
+-		
 +
 +		d = store->engine->apop;
 +
 +		while (*d != '\0') {
 +			if (!isascii((int)*d)) {
++
 +				camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-+						_("Unable to connect to POP server %s: "
-+						"Invalid APOP ID received. Impersonation attack "
-+						"suspected. Please contact your admin."),
++						_("Unable to connect to POP server %s: "),
 +						CAMEL_SERVICE (store)->url->host);
 +
 +				return FALSE;
 +			}
 +			d++;
 +		}
- 		
++
  		secret = g_alloca(strlen(store->engine->apop)+strlen(service->url->passwd)+1);
  		sprintf(secret, "%s%s",  store->engine->apop, service->url->passwd);
+ 		md5_get_digest(secret, strlen (secret), md5sum);


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- evolution-data-server.spec	24 Apr 2007 20:15:51 -0000	1.160
+++ evolution-data-server.spec	30 Apr 2007 20:58:25 -0000	1.161
@@ -26,7 +26,7 @@
 
 Name: evolution-data-server
 Version: 1.10.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -392,6 +392,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Mon Apr 30 2007 Matthew Barnes <mbarnes at redhat.com> - 1.10.1-3.fc7
+- Revise patch for RH bug #235290 to not break string freeze.
+
 * Tue Apr 24 2007 Matthew Barnes <mbarnes at redhat.com> - 1.10.1-2.fc7
 - Add patch for RH bug #235290 (APOP authentication vulnerability).
 



From fedora-cvs-commits at redhat.com  Mon Apr 30 21:03:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 17:03:32 -0400
Subject: rpms/evolution-data-server/FC-6
	evolution-data-server-1.8.3-apop-auth-vulnerability.patch, 1.1,
	1.2 evolution-data-server.spec, 1.141, 1.142
Message-ID: <200704302103.l3UL3WHi032712@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution-data-server/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv32439

Modified Files:
	evolution-data-server-1.8.3-apop-auth-vulnerability.patch 
	evolution-data-server.spec 
Log Message:

* Mon Apr 30 2007 Matthew Barnes <mbarnes at redhat.com> - 1.8.3-6.fc6
- Revise patch for RH bug #235290 to not break string freeze.


evolution-data-server-1.8.3-apop-auth-vulnerability.patch:
 camel-pop3-store.c |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletion(-)

Index: evolution-data-server-1.8.3-apop-auth-vulnerability.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/FC-6/evolution-data-server-1.8.3-apop-auth-vulnerability.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-data-server-1.8.3-apop-auth-vulnerability.patch	24 Apr 2007 20:02:51 -0000	1.1
+++ evolution-data-server-1.8.3-apop-auth-vulnerability.patch	30 Apr 2007 21:03:29 -0000	1.2
@@ -1,5 +1,5 @@
 --- evolution-data-server-1.8.3/camel/providers/pop3/camel-pop3-store.c.apop-auth-vulnerability	2007-01-29 04:44:18.000000000 -0500
-+++ evolution-data-server-1.8.3/camel/providers/pop3/camel-pop3-store.c	2007-04-24 15:58:21.000000000 -0400
++++ evolution-data-server-1.8.3/camel/providers/pop3/camel-pop3-store.c	2007-04-30 17:02:31.000000000 -0400
 @@ -34,6 +34,7 @@
  #include <string.h>
  #include <unistd.h>
@@ -8,25 +8,26 @@
  
  #include "camel-operation.h"
  
-@@ -489,6 +490,21 @@
+@@ -489,7 +490,21 @@
  	} else if (strcmp(service->url->authmech, "+APOP") == 0 && store->engine->apop) {
  		char *secret, md5asc[33], *d;
  		unsigned char md5sum[16], *s;
+-		
 +
 +		d = store->engine->apop;
 +
 +		while (*d != '\0') {
 +			if (!isascii((int)*d)) {
++
 +				camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-+						_("Unable to connect to POP server %s: "
-+						"Invalid APOP ID received. Impersonation attack "
-+						"suspected. Please contact your admin."),
++						_("Unable to connect to POP server %s: "),
 +						CAMEL_SERVICE (store)->url->host);
 +
 +				return FALSE;
 +			}
 +			d++;
 +		}
- 		
++
  		secret = g_alloca(strlen(store->engine->apop)+strlen(service->url->passwd)+1);
  		sprintf(secret, "%s%s",  store->engine->apop, service->url->passwd);
+ 		md5_get_digest(secret, strlen (secret), md5sum);


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/FC-6/evolution-data-server.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- evolution-data-server.spec	24 Apr 2007 20:02:51 -0000	1.141
+++ evolution-data-server.spec	30 Apr 2007 21:03:29 -0000	1.142
@@ -25,7 +25,7 @@
 
 Name: evolution-data-server
 Version: 1.8.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -379,6 +379,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Mon Apr 30 2007 Matthew Barnes <mbarnes at redhat.com> - 1.8.3-6.fc6
+- Revise patch for RH bug #235290 to not break string freeze.
+
 * Tue Apr 24 2007 Matthew Barnes <mbarnes at redhat.com> - 1.8.3-5.fc6
 - Add patch for RH bug #235290 (APOP authentication vulnerability).
 



From fedora-cvs-commits at redhat.com  Mon Apr 30 21:07:32 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 17:07:32 -0400
Subject: rpms/evolution-data-server/FC-5
	evolution-data-server-1.6.3-apop-auth-vulnerability.patch, 1.1,
	1.2 evolution-data-server.spec, 1.95, 1.96
Message-ID: <200704302107.l3UL7WrL003260@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution-data-server/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3154

Modified Files:
	evolution-data-server-1.6.3-apop-auth-vulnerability.patch 
	evolution-data-server.spec 
Log Message:

* Mon Apr 30 2007 Matthew Barnes <mbarnes at redhat.com> - 1.6.3-4.fc5
- Revise patch for RH bug #235290 to not break string freeze.


evolution-data-server-1.6.3-apop-auth-vulnerability.patch:
 camel-pop3-store.c |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletion(-)

Index: evolution-data-server-1.6.3-apop-auth-vulnerability.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/FC-5/evolution-data-server-1.6.3-apop-auth-vulnerability.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-data-server-1.6.3-apop-auth-vulnerability.patch	24 Apr 2007 20:08:09 -0000	1.1
+++ evolution-data-server-1.6.3-apop-auth-vulnerability.patch	30 Apr 2007 21:07:30 -0000	1.2
@@ -1,5 +1,5 @@
 --- evolution-data-server-1.6.3/camel/providers/pop3/camel-pop3-store.c.apop-auth-vulnerability	2006-05-03 09:59:27.000000000 -0400
-+++ evolution-data-server-1.6.3/camel/providers/pop3/camel-pop3-store.c	2007-04-24 16:05:15.000000000 -0400
++++ evolution-data-server-1.6.3/camel/providers/pop3/camel-pop3-store.c	2007-04-30 17:06:33.000000000 -0400
 @@ -34,6 +34,7 @@
  #include <string.h>
  #include <unistd.h>
@@ -8,25 +8,26 @@
  
  #include "camel-operation.h"
  
-@@ -485,6 +486,21 @@
+@@ -485,7 +486,21 @@
  	} else if (strcmp(service->url->authmech, "+APOP") == 0 && store->engine->apop) {
  		char *secret, md5asc[33], *d;
  		unsigned char md5sum[16], *s;
+-		
 +
 +		d = store->engine->apop;
 +
 +		while (*d != '\0') {
 +			if (!isascii((int)*d)) {
++
 +				camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-+						_("Unable to connect to POP server %s: "
-+						"Invalid APOP ID received. Impersonation attack "
-+						"suspected. Please contact your admin."),
++						_("Unable to connect to POP server %s: "),
 +						CAMEL_SERVICE (store)->url->host);
 +
 +				return FALSE;
 +			}
 +			d++;
 +		}
- 		
++
  		secret = g_alloca(strlen(store->engine->apop)+strlen(service->url->passwd)+1);
  		sprintf(secret, "%s%s",  store->engine->apop, service->url->passwd);
+ 		md5_get_digest(secret, strlen (secret), md5sum);


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/FC-5/evolution-data-server.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- evolution-data-server.spec	24 Apr 2007 20:08:09 -0000	1.95
+++ evolution-data-server.spec	30 Apr 2007 21:07:30 -0000	1.96
@@ -22,7 +22,7 @@
 
 Name: evolution-data-server
 Version: 1.6.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for evolution
@@ -327,6 +327,9 @@
 
 
 %changelog
+* Mon Apr 30 2007 Matthew Barnes <mbarnes at redhat.com> - 1.6.3-4.fc5
+- Revise patch for RH bug #235290 to not break string freeze.
+
 * Tue Apr 24 2007 Matthew Barnes <mbarnes at redhat.com> - 1.6.3-3.fc5
 - Add patch for RH bug #235290 (APOP authentication vulnerability).
 



From fedora-cvs-commits at redhat.com  Mon Apr 30 21:26:23 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 17:26:23 -0400
Subject: rpms/kernel-xen-2.6/devel linux-2.6-csum-missing-line.patch, NONE,
	1.1.2.1 kernel-xen.spec, 1.18.4.4, 1.18.4.5
Message-ID: <200704302126.l3ULQNhs017208@cvs.devel.redhat.com>

Author: ehabkost

Update of /cvs/dist/rpms/kernel-xen-2.6/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29743

Modified Files:
      Tag: private-ehabkost-xen-3_0_5-branch
	kernel-xen.spec 
Added Files:
      Tag: private-ehabkost-xen-3_0_5-branch
	linux-2.6-csum-missing-line.patch 
Log Message:
Patch adding missing line in the csum patches

Subject: Set csum_start when setting csum_offset

The new csum model requires csum_start to be set for csum_offset to
be meaningful.



linux-2.6-csum-missing-line.patch:
 skbuff.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE linux-2.6-csum-missing-line.patch ---
Date: Sat, 28 Apr 2007 16:23:31 +1000
From: Herbert Xu <herbert.xu at redhat.com>
Subject: [XEN]: Set csum_start when setting csum_offset
Message-ID: <20070428062331.GA6461 at gondor.apana.org.au>

On Fri, Apr 27, 2007 at 09:40:03PM -0300, Eduardo Pereira Habkost wrote:
> 
> On CVS, rpms/kernel-xen-2.6/devel, branch private-ehabkost-xen-3_0_5-branch.

Thanks.  It looks like somewhere along the line I managed to
lose an important line in the patch.


The new csum model requires csum_start to be set for csum_offset to
be meaningful.

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
--
--- linux-2.6.20.i386/drivers/xen/core/skbuff.c	2007-04-28 15:30:16.000000000 +1000
+++ build-2.6.20.i386/drivers/xen/core/skbuff.c	2007-04-28 15:30:52.000000000 +1000
@@ -89,6 +89,7 @@
 	skb->h.raw = (unsigned char *)skb->nh.iph + 4*skb->nh.iph->ihl;
 	if (skb->h.raw >= skb->tail)
 		goto out;
+	skb->csum_start = skb->h.raw - skb->head;
 	switch (skb->nh.iph->protocol) {
 	case IPPROTO_TCP:
 		skb->csum_offset = offsetof(struct tcphdr, check);




Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.18.4.4
retrieving revision 1.18.4.5
diff -u -r1.18.4.4 -r1.18.4.5
--- kernel-xen.spec	27 Apr 2007 19:42:24 -0000	1.18.4.4
+++ kernel-xen.spec	30 Apr 2007 21:26:21 -0000	1.18.4.5
@@ -424,6 +424,7 @@
 Patch1661: linux-2.6-use_csum_start_offset_instead.patch
 Patch1662: linux-2.6-treat_partial_as_unnecessary.patch
 Patch1663: linux-2.6-kill_skbuff_hack.patch
+Patch1664: linux-2.6-csum-missing-line.patch
 
 Patch1681: linux-2.6-xfs-umount-fix.patch
 Patch1682: linux-2.6-xfs_attr2.patch
@@ -969,6 +970,7 @@
 %patch1661 -p1
 %patch1662 -p1
 %patch1663 -p1
+%patch1664 -p1
 
 # Fix XFS umount bug.
 %patch1681 -p1



From fedora-cvs-commits at redhat.com  Mon Apr 30 21:28:25 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 17:28:25 -0400
Subject: rpms/kernel/FC-6 linux-2.6-csum-missing-line.patch, NONE,
	1.1.2.1 kernel-2.6.spec, 1.2947.2.1, 1.2947.2.2
Message-ID: <200704302128.l3ULSPFt018707@cvs.devel.redhat.com>

Author: ehabkost

Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv17939

Modified Files:
      Tag: private-ehabkost-bz223258-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-ehabkost-bz223258-branch
	linux-2.6-csum-missing-line.patch 
Log Message:
Patch adding missing line in the csum patches

Subject: Set csum_start when setting csum_offset

The new csum model requires csum_start to be set for csum_offset to
be meaningful.


Updating the spec %changelog, also.


linux-2.6-csum-missing-line.patch:
 skbuff.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE linux-2.6-csum-missing-line.patch ---
Date: Sat, 28 Apr 2007 16:23:31 +1000
From: Herbert Xu <herbert.xu at redhat.com>
Subject: [XEN]: Set csum_start when setting csum_offset
Message-ID: <20070428062331.GA6461 at gondor.apana.org.au>

On Fri, Apr 27, 2007 at 09:40:03PM -0300, Eduardo Pereira Habkost wrote:
> 
> On CVS, rpms/kernel-xen-2.6/devel, branch private-ehabkost-xen-3_0_5-branch.

Thanks.  It looks like somewhere along the line I managed to
lose an important line in the patch.


The new csum model requires csum_start to be set for csum_offset to
be meaningful.

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
--
--- linux-2.6.20.i386/drivers/xen/core/skbuff.c	2007-04-28 15:30:16.000000000 +1000
+++ build-2.6.20.i386/drivers/xen/core/skbuff.c	2007-04-28 15:30:52.000000000 +1000
@@ -89,6 +89,7 @@
 	skb->h.raw = (unsigned char *)skb->nh.iph + 4*skb->nh.iph->ihl;
 	if (skb->h.raw >= skb->tail)
 		goto out;
+	skb->csum_start = skb->h.raw - skb->head;
 	switch (skb->nh.iph->protocol) {
 	case IPPROTO_TCP:
 		skb->csum_offset = offsetof(struct tcphdr, check);




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2947.2.1
retrieving revision 1.2947.2.2
diff -u -r1.2947.2.1 -r1.2947.2.2
--- kernel-2.6.spec	27 Apr 2007 19:43:16 -0000	1.2947.2.1
+++ kernel-2.6.spec	30 Apr 2007 21:28:22 -0000	1.2947.2.2
@@ -510,6 +510,7 @@
 Patch1661: linux-2.6-use_csum_start_offset_instead.patch
 Patch1662: linux-2.6-treat_partial_as_unnecessary.patch
 Patch1663: linux-2.6-kill_skbuff_hack.patch
+Patch1664: linux-2.6-csum-missing-line.patch
 
 Patch1682: linux-2.6-xfs_attr2.patch
 Patch1690: linux-2.6-PT_LOAD-align.patch
@@ -1234,6 +1235,7 @@
 %patch1661 -p1
 %patch1662 -p1
 %patch1663 -p1
+%patch1664 -p1
 
 # Fix attr2 corruption with btree data extents
 %patch1682 -p1
@@ -2305,6 +2307,9 @@
 %endif
 
 %changelog
+* Mon Apr 30 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Included checksum patches to fix bug #223258
+
 * Thu Apr 26 2007 Chuck Ebbert <cebbert at redhat.com>		1.2947
 - 2.6.20.8 (official)
 - 2.6.20.9



From fedora-cvs-commits at redhat.com  Mon Apr 30 21:32:39 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 17:32:39 -0400
Subject: rpms/kernel/devel linux-2.6-net-sis900-oops.patch, NONE,
	1.1 kernel-2.6.spec, 1.3119, 1.3120
Message-ID: <200704302132.l3ULWdOA021890@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21159

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-net-sis900-oops.patch 
Log Message:
* Mon Apr 30 2007 Dave Jones <davej at redhat.com>
- Fix oops in sis900 driver.


linux-2.6-net-sis900-oops.patch:
 sis900.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-net-sis900-oops.patch ---
From: Neil Horman <nhorman at tuxdriver.com>
Date: Thu, 26 Apr 2007 17:47:36 +0000 (-0400)
Subject: sis900: Allocate rx replacement buffer before rx operation
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=dc5a144991ba803bc8afded105c9db1dea0e57ab

sis900: Allocate rx replacement buffer before rx operation

Just found a hole in my last patch.  It was reported to me that shortly after we
integrated this patch.  The report was of an oops that took place inside of
netif_rx when using the sis900 driver.  Looking at my origional patch I noted
that there was a spot between the new skb_alloc and the refill_rx_ring label
where skb got reassigned to the pointer currently held in the rx_ring for the
purposes of receiveing the frame.  The result of this is however that the buffer
that gets passed to netif_rx (if it is called), then gets placed right back into
the rx_ring.  So if you receive frames fast enough the skb being processed by
the network stack can get corrupted.  The reporter is testing out the fix I've
written for this below (I'm not near my hardware at the moment to test myself),
but I wanted to post it for review ASAP.  I'll post test results when I hear
them, but I think this is a pretty straightforward fix.  It just uses a separate
pointer to do the rx operation, so that we don't improperly reassign the pointer
that we use to refill the rx ring.

Signed-off-by: Neil Horman <nhorman at tuxdriver.com>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
---

diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index dea0126..2cb2e15 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -1753,6 +1753,7 @@ static int sis900_rx(struct net_device *net_dev)
 			sis_priv->rx_ring[entry].cmdsts = RX_BUF_SIZE;
 		} else {
 			struct sk_buff * skb;
+			struct sk_buff * rx_skb;
 
 			pci_unmap_single(sis_priv->pci_dev,
 				sis_priv->rx_ring[entry].bufptr, RX_BUF_SIZE,
@@ -1786,10 +1787,10 @@ static int sis900_rx(struct net_device *net_dev)
 			}
 
 			/* give the socket buffer to upper layers */
-			skb = sis_priv->rx_skbuff[entry];
-			skb_put(skb, rx_size);
-			skb->protocol = eth_type_trans(skb, net_dev);
-			netif_rx(skb);
+			rx_skb = sis_priv->rx_skbuff[entry];
+			skb_put(rx_skb, rx_size);
+			rx_skb->protocol = eth_type_trans(rx_skb, net_dev);
+			netif_rx(rx_skb);
 
 			/* some network statistics */
 			if ((rx_status & BCAST) == MCAST)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3119
retrieving revision 1.3120
diff -u -r1.3119 -r1.3120
--- kernel-2.6.spec	29 Apr 2007 21:04:48 -0000	1.3119
+++ kernel-2.6.spec	30 Apr 2007 21:32:36 -0000	1.3120
@@ -557,6 +557,7 @@
 Patch1640: linux-2.6-module-override-modparam-cmdline.patch
 Patch1650: linux-2.6-serial-460800.patch
 Patch1660: linux-2.6-mm-udf-fixes.patch
+Patch1670: linux-2.6-net-sis900-oops.patch
 Patch1681: linux-2.6-xfs-umount-fix.patch
 Patch1690: linux-2.6-PT_LOAD-align.patch
 Patch1700: linux-2.6-dvb-spinlock.patch
@@ -1271,6 +1272,8 @@
 %patch1650 -p1
 # Allow large files on UDF
 %patch1660 -p1
+# Fix oops in sis900
+%patch1670 -p1
 # Fix XFS umount bug.
 %patch1681 -p1
 # Align kernel data segment to page boundary.
@@ -2334,6 +2337,9 @@
 #  - tux.
 
 %changelog
+* Mon Apr 30 2007 Dave Jones <davej at redhat.com>
+- Fix oops in sis900 driver.
+
 * Sun Apr 29 2007 Dave Jones <davej at redhat.com>
 - 2.6.21.1
 



From fedora-cvs-commits at redhat.com  Mon Apr 30 22:09:44 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 18:09:44 -0400
Subject: rpms/kernel-xen-2.6/devel .cvsignore, 1.3, 1.4 kernel-xen.spec, 1.18,
	1.19 sources, 1.3, 1.4 xen-compile-fix.patch, 1.1,
	1.2 xen-version-strings.patch, 1.1, 1.2
Message-ID: <200704302209.l3UM9iUN021933@cvs.devel.redhat.com>

Author: ehabkost

Update of /cvs/dist/rpms/kernel-xen-2.6/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21912

Modified Files:
	.cvsignore kernel-xen.spec sources xen-compile-fix.patch 
	xen-version-strings.patch 
Log Message:
Merging from private-ehabkost-xen-3_0_5-branch




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Mar 2007 16:01:16 -0000	1.3
+++ .cvsignore	30 Apr 2007 22:09:41 -0000	1.4
@@ -3,3 +3,4 @@
 xen-3.0.4-13132.tar.bz2
 linux-2.6.20.tar.bz2
 patch-2.6.20.3.bz2
+xen-3.0.5-rc3-14934.tar.bz2


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kernel-xen.spec	22 Mar 2007 17:44:34 -0000	1.18
+++ kernel-xen.spec	30 Apr 2007 22:09:41 -0000	1.19
@@ -37,7 +37,7 @@
 %define make_target bzImage
 %define kernel_image x86
 
-%define xen_hv_cset 13132
+%define xen_hv_cset 14934
 %define xen_flags verbose=y crash_debug=y
 %define xen_target vmlinuz
 %define xen_image vmlinuz
@@ -255,7 +255,7 @@
 
 
 Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
-Source1: xen-3.0.4-%{xen_hv_cset}.tar.bz2
+Source1: xen-3.0.5-rc3-%{xen_hv_cset}.tar.bz2
 Source2: Config.mk
 
 Source10: COPYING.modules
@@ -419,6 +419,13 @@
 Patch1610: linux-2.6-input-kill-stupid-messages.patch
 Patch1620: linux-2.6-serial-tickle-nmi.patch
 Patch1650: linux-2.6-serial-460800.patch
+# checksum fixes (bug #223258)
+Patch1660: linux-2.6-forwarding_of_ip_summed.patch
+Patch1661: linux-2.6-use_csum_start_offset_instead.patch
+Patch1662: linux-2.6-treat_partial_as_unnecessary.patch
+Patch1663: linux-2.6-kill_skbuff_hack.patch
+Patch1664: linux-2.6-csum-missing-line.patch
+
 Patch1681: linux-2.6-xfs-umount-fix.patch
 Patch1682: linux-2.6-xfs_attr2.patch
 Patch1690: linux-2.6-PT_LOAD-align.patch
@@ -957,6 +964,14 @@
 #%patch1620 -p1
 # Allow to use 480600 baud on 16C950 UARTs
 %patch1650 -p1
+
+# checksum fixes (bug #223258)
+%patch1660 -p1
+%patch1661 -p1
+%patch1662 -p1
+%patch1663 -p1
+%patch1664 -p1
+
 # Fix XFS umount bug.
 %patch1681 -p1
 # Fix attr2 corruption with btree data extents
@@ -1093,7 +1108,7 @@
   rm -rf xen
 fi
 %setup -D -T -q -n kernel-%{version} -a1
-cd xen
+cd xen-3.0.5-rc3-%{xen_hv_cset}/xen
 # Any necessary hypervisor patches go here
 %patch20000 -p1
 %patch20001 -p1
@@ -1101,6 +1116,7 @@
 # Update the Makefile version strings
 sed -i -e 's/\(^export XEN_BUILDER.*$\)/\1'%{?dist}'/' Makefile
 sed -i -e 's/\(^export XEN_BUILDVERSION.*$\)/\1'-%{PACKAGE_RELEASE}'/' Makefile
+cd ../..
 %endif
 
 
@@ -1321,7 +1337,7 @@
 
 %if %{includexen}
 %if %{buildxen}
-  cd xen
+  cd xen-3.0.5-rc3-%{xen_hv_cset}/xen
   mkdir -p $RPM_BUILD_ROOT/%{image_install_path} $RPM_BUILD_ROOT/boot
   make %{?_smp_mflags} %{xen_flags}
   install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL}
@@ -1333,6 +1349,7 @@
   # 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
+  cd ..
 %endif
 %endif
 
@@ -1985,6 +2002,10 @@
 #  - tux.
 
 %changelog
+* Fri Apr 27 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Updated Xen Hypervisor to 3.0.5-rc3, hg cset 14934
+- Included checksum patches to fix bug #223258
+
 * Thu Mar 22 2007 Juan Quintela <quintela at redhat.com>
 - disable alternative firewire stack for x86_64, it hangs kernel
   during boot.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Mar 2007 16:01:16 -0000	1.3
+++ sources	30 Apr 2007 22:09:41 -0000	1.4
@@ -3,3 +3,4 @@
 ec35d2aa26cb452832761ff7ce9c4583  xen-3.0.4-13132.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 30764d4152c727b8ec7b709ab5464ec3  patch-2.6.20.3.bz2
+f8922a14df26193321284bbf90feacac  xen-3.0.5-rc3-14934.tar.bz2

xen-compile-fix.patch:
 hvm.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: xen-compile-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/xen-compile-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-compile-fix.patch	24 Jan 2007 01:28:48 -0000	1.1
+++ xen-compile-fix.patch	30 Apr 2007 22:09:41 -0000	1.2
@@ -1,6 +1,8 @@
---- xen/include/asm-x86/hvm/hvm.h.orig	2007-01-23 02:19:41.000000000 +0100
-+++ xen/include/asm-x86/hvm/hvm.h	2007-01-23 02:18:29.000000000 +0100
-@@ -170,7 +170,7 @@ hvm_long_mode_enabled(struct vcpu *v)
+Index: xen/include/asm-x86/hvm/hvm.h
+===================================================================
+--- xen.orig/include/asm-x86/hvm/hvm.h
++++ xen/include/asm-x86/hvm/hvm.h
+@@ -183,7 +183,7 @@ hvm_long_mode_enabled(struct vcpu *v)
      return hvm_funcs.long_mode_enabled(v);
  }
  #else

xen-version-strings.patch:
 Makefile |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

Index: xen-version-strings.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/xen-version-strings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-version-strings.patch	24 Jan 2007 01:28:48 -0000	1.1
+++ xen-version-strings.patch	30 Apr 2007 22:09:41 -0000	1.2
@@ -1,11 +1,13 @@
---- xen/Makefile.orig	2007-01-14 22:08:05.000000000 +0100
-+++ xen/Makefile	2007-01-23 01:13:35.000000000 +0100
+Index: xen/Makefile
+===================================================================
+--- xen.orig/Makefile
++++ xen/Makefile
 @@ -2,7 +2,11 @@
  # All other places this is stored (eg. compile.h) should be autogenerated.
  export XEN_VERSION       = 3
  export XEN_SUBVERSION    = 0
--export XEN_EXTRAVERSION ?= .4-1$(XEN_VENDORVERSION)
-+export XEN_BASEVERSION  ?= .4-1$(XEN_VENDORVERSION)
+-export XEN_EXTRAVERSION ?= .5-rc3$(XEN_VENDORVERSION)
++export XEN_BASEVERSION  ?= .5-rc3$(XEN_VENDORVERSION)
 +export XEN_BUILDER      ?= 
 +export XEN_BUILDVERSION ?= 
 +export XEN_EXTRAVERSION ?= $(XEN_BASEVERSION)$(XEN_BUILDVERSION)
@@ -13,7 +15,7 @@
  export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
  -include xen-version
  
-@@ -108,8 +112,8 @@ include/xen/compile.h: include/xen/compi
+@@ -114,7 +118,7 @@ include/xen/compile.h: include/xen/compi
  	    -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \
  	    -e 's!@@changeset@@!$(shell ((hg parents --template "{date|date} {rev}:{node|short}" >/dev/null && hg parents --template "{date|date} {rev}:{node|short}") || echo "unavailable") 2>/dev/null)!g' \
  	    < include/xen/compile.h.in > $@.new



From fedora-cvs-commits at redhat.com  Mon Apr 30 22:10:34 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 18:10:34 -0400
Subject: rpms/xorg-x11-server/devel xserver-1.3.0-xkb-and-loathing.patch,
	NONE, 1.1 xorg-x11-server.spec, 1.225, 1.226
Message-ID: <200704302210.l3UMAY1x021984@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21968

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.3.0-xkb-and-loathing.patch 
Log Message:
* Mon Apr 30 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-3
- xserver-1.3.0-xkb-and-loathing.patch: Ignore (not just block) SIGALRM
  around calls to Popen()/Pclose().  Fixes a hang in openoffice when
  opening menus.
- Modify BuildRequires to use the virtual protocol Provides.


xserver-1.3.0-xkb-and-loathing.patch:
 utils.c |    8 ++++++++
 1 files changed, 8 insertions(+)

--- NEW FILE xserver-1.3.0-xkb-and-loathing.patch ---
--- xorg-server-1.3.0.0/os/utils.c.jx	2007-04-25 13:28:05.000000000 -0400
+++ xorg-server-1.3.0.0/os/utils.c	2007-04-30 14:33:04.000000000 -0400
@@ -1725,6 +1725,8 @@
     int pid;
 } *pidlist;
 
+static sighandler_t old_alarm = NULL; /* XXX horrible awful hack */
+
 pointer
 Popen(char *command, char *type)
 {
@@ -1746,11 +1748,15 @@
 	return NULL;
     }
 
+    /* Ignore the smart scheduler while this is going on */
+    old_alarm = signal(SIGALRM, SIG_IGN);
+
     switch (pid = fork()) {
     case -1: 	/* error */
 	close(pdes[0]);
 	close(pdes[1]);
 	xfree(cur);
+	signal(SIGALRM, old_alarm);
 	return NULL;
     case 0:	/* child */
 	if (setgid(getgid()) == -1)
@@ -1926,6 +1932,8 @@
     /* allow EINTR again */
     OsReleaseSignals ();
     
+    signal(SIGALRM, old_alarm);
+
     return pid == -1 ? -1 : pstat;
 }
 


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- xorg-x11-server.spec	25 Apr 2007 19:02:21 -0000	1.225
+++ xorg-x11-server.spec	30 Apr 2007 22:10:31 -0000	1.226
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.3.0.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -30,6 +30,7 @@
 Patch18:   xorg-x11-server-1.1.1-glcore-visual-matching.patch
 Patch19:   xserver-1.3.0-xnest-exposures.patch
 Patch20:   xserver-1.3.0-x86emu-imul-int64.patch
+Patch21:   xserver-1.3.0-xkb-and-loathing.patch
 
 # OpenGL compositing manager feature/optimization patches.
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
@@ -90,7 +91,14 @@
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.1.5
+
 BuildRequires: xorg-x11-proto-devel >= 7.1-11
+BuildRequires: randrproto >= 1.2
+BuildRequires: fixesproto >= 4.0
+BuildRequires: damageproto >= 1.1
+BuildRequires: scrnsaverproto >= 1.1
+BuildRequires: kbproto >= 1.0.3
+
 BuildRequires: xorg-x11-xtrans-devel
 BuildRequires: libXfont-devel
 BuildRequires: libXau-devel
@@ -267,6 +275,7 @@
 %patch18 -p1 -b .glcore-visual
 %patch19 -p1 -b .xnest-expose
 %patch20 -p1 -b .x86emu-imul
+%patch21 -p1 -b .xkb-signal-loathing
 
 %patch100 -p0 -b .no-move-damage
 %patch101 -p0 -b .dont-backfill-bg-none
@@ -557,6 +566,12 @@
 
 
 %changelog
+* Mon Apr 30 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-3
+- xserver-1.3.0-xkb-and-loathing.patch: Ignore (not just block) SIGALRM
+  around calls to Popen()/Pclose().  Fixes a hang in openoffice when
+  opening menus.
+- Modify BuildRequires to use the virtual protocol Provides.
+
 * Wed Apr 25 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-2
 - xserver-1.3.0-less-randr-fakerama.patch: Disable RANDR's fake Xinerama
   geometry when there's more than one protocol screen. (#231257)



From fedora-cvs-commits at redhat.com  Mon Apr 30 22:20:03 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 18:20:03 -0400
Subject: rpms/kernel-xen-2.6/devel linux-2.6-csum-missing-line.patch, 1.1,
	1.2 linux-2.6-forwarding_of_ip_summed.patch, 1.1,
	1.2 linux-2.6-kill_skbuff_hack.patch, 1.1,
	1.2 linux-2.6-treat_partial_as_unnecessary.patch, 1.1,
	1.2 linux-2.6-use_csum_start_offset_instead.patch, 1.1, 1.2
Message-ID: <200704302220.l3UMK3ON022195@cvs.devel.redhat.com>

Author: ehabkost

Update of /cvs/dist/rpms/kernel-xen-2.6/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22147

Added Files:
	linux-2.6-csum-missing-line.patch 
	linux-2.6-forwarding_of_ip_summed.patch 
	linux-2.6-kill_skbuff_hack.patch 
	linux-2.6-treat_partial_as_unnecessary.patch 
	linux-2.6-use_csum_start_offset_instead.patch 
Log Message:
Merging from private-ehabkost-xen-3_0_5-branch (actually adding files)

Files were not added on the previous commit, because cvs tried to commit
it to tag 'HEAD' even after 'cvs update -A'.



linux-2.6-csum-missing-line.patch:
 skbuff.c |    1 +
 1 files changed, 1 insertion(+)

Index: linux-2.6-csum-missing-line.patch
===================================================================
RCS file: linux-2.6-csum-missing-line.patch
diff -N linux-2.6-csum-missing-line.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-csum-missing-line.patch	30 Apr 2007 22:20:01 -0000	1.2
@@ -0,0 +1,37 @@
+Date: Sat, 28 Apr 2007 16:23:31 +1000
+From: Herbert Xu <herbert.xu at redhat.com>
+Subject: [XEN]: Set csum_start when setting csum_offset
+Message-ID: <20070428062331.GA6461 at gondor.apana.org.au>
+
+On Fri, Apr 27, 2007 at 09:40:03PM -0300, Eduardo Pereira Habkost wrote:
+> 
+> On CVS, rpms/kernel-xen-2.6/devel, branch private-ehabkost-xen-3_0_5-branch.
+
+Thanks.  It looks like somewhere along the line I managed to
+lose an important line in the patch.
+
+
+The new csum model requires csum_start to be set for csum_offset to
+be meaningful.
+
+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
+--
+--- linux-2.6.20.i386/drivers/xen/core/skbuff.c	2007-04-28 15:30:16.000000000 +1000
++++ build-2.6.20.i386/drivers/xen/core/skbuff.c	2007-04-28 15:30:52.000000000 +1000
+@@ -89,6 +89,7 @@
+ 	skb->h.raw = (unsigned char *)skb->nh.iph + 4*skb->nh.iph->ihl;
+ 	if (skb->h.raw >= skb->tail)
+ 		goto out;
++	skb->csum_start = skb->h.raw - skb->head;
+ 	switch (skb->nh.iph->protocol) {
+ 	case IPPROTO_TCP:
+ 		skb->csum_offset = offsetof(struct tcphdr, check);
+
+

linux-2.6-forwarding_of_ip_summed.patch:
 include/linux/skbuff.h  |    7 +++++++
 net/bridge/br_forward.c |    2 +-
 net/ipv4/ip_forward.c   |    2 +-
 net/ipv6/ip6_output.c   |    2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

Index: linux-2.6-forwarding_of_ip_summed.patch
===================================================================
RCS file: linux-2.6-forwarding_of_ip_summed.patch
diff -N linux-2.6-forwarding_of_ip_summed.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-forwarding_of_ip_summed.patch	30 Apr 2007 22:20:01 -0000	1.2
@@ -0,0 +1,89 @@
+From: Herbert Xu <herbert.xu at redhat.com>
+Subject: [1/4] [NET]: Allow forwarding of ip_summed except CHECKSUM_COMPLETE
+
+Hi:
+
+[NET]: Allow forwarding of ip_summed except CHECKSUM_COMPLETE
+
+Right now Xen has a horrible hack that lets it forward packets with
+partial checksums.  One of the reasons that CHECKSUM_PARTIAL and
+CHECKSUM_COMPLETE were added is so that we can get rid of this hack
+(where it creates two extra bits in the skbuff to essentially mirror
+ip_summed without being destroyed by the forwarding code).
+
+I had forgotten that I've already gone through all the deivce drivers
+last time around to make sure that they're looking at ip_summed ==
+CHECKSUM_PARTIAL rather than ip_summed != 0 on transmit.  In any case,
+I've now done that again so it should definitely be safe.
+
+Unfortunately nobody has yet added any code to update CHECKSUM_COMPLETE
+values on forward so we I'm setting that to CHECKSUM_NONE.  This should
+be safe to remove for bridging but I'd like to check that code path
+first.
+
+So here is the patch that lets us get rid of the hack by preserving
+ip_summed (mostly) on forwarded packets.
+
+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 -ur linux-2.6.20.i386.orig/include/linux/skbuff.h linux-2.6.20.i386/include/linux/skbuff.h
+--- linux-2.6.20.i386.orig/include/linux/skbuff.h	2007-04-24 13:18:41.000000000 +1000
++++ linux-2.6.20.i386/include/linux/skbuff.h	2007-04-24 13:31:01.000000000 +1000
+@@ -1494,5 +1494,12 @@
+ 	return skb_shinfo(skb)->gso_size;
+ }
+ 
++static inline void skb_forward_csum(struct sk_buff *skb)
++{
++	/* Unfortunately we don't support this one.  Any brave souls? */
++	if (skb->ip_summed == CHECKSUM_COMPLETE)
++		skb->ip_summed = CHECKSUM_NONE;
++}
++
+ #endif	/* __KERNEL__ */
+ #endif	/* _LINUX_SKBUFF_H */
+diff -ur linux-2.6.20.i386.orig/net/bridge/br_forward.c linux-2.6.20.i386/net/bridge/br_forward.c
+--- linux-2.6.20.i386.orig/net/bridge/br_forward.c	2007-03-30 13:39:09.000000000 +1000
++++ linux-2.6.20.i386/net/bridge/br_forward.c	2007-04-24 13:31:01.000000000 +1000
+@@ -71,7 +71,7 @@
+ 
+ 	indev = skb->dev;
+ 	skb->dev = to->dev;
+-	skb->ip_summed = CHECKSUM_NONE;
++	skb_forward_csum(skb);
+ 
+ 	NF_HOOK(PF_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev,
+ 			br_forward_finish);
+diff -ur linux-2.6.20.i386.orig/net/ipv4/ip_forward.c linux-2.6.20.i386/net/ipv4/ip_forward.c
+--- linux-2.6.20.i386.orig/net/ipv4/ip_forward.c	2007-03-30 13:39:10.000000000 +1000
++++ linux-2.6.20.i386/net/ipv4/ip_forward.c	2007-04-24 13:31:20.000000000 +1000
+@@ -68,7 +68,7 @@
+ 	if (skb->pkt_type != PACKET_HOST)
+ 		goto drop;
+ 
+-	skb->ip_summed = CHECKSUM_NONE;
++	skb_forward_csum(skb);
+ 	
+ 	/*
+ 	 *	According to the RFC, we must first decrease the TTL field. If
+diff -ur linux-2.6.20.i386.orig/net/ipv6/ip6_output.c linux-2.6.20.i386/net/ipv6/ip6_output.c
+--- linux-2.6.20.i386.orig/net/ipv6/ip6_output.c	2007-03-30 13:39:11.000000000 +1000
++++ linux-2.6.20.i386/net/ipv6/ip6_output.c	2007-04-24 13:31:01.000000000 +1000
+@@ -372,7 +372,7 @@
+ 		goto drop;
+ 	}
+ 
+-	skb->ip_summed = CHECKSUM_NONE;
++	skb_forward_csum(skb);
+ 
+ 	/*
+ 	 *	We DO NOT make any processing on
+
+

linux-2.6-kill_skbuff_hack.patch:
 drivers/xen/core/skbuff.c             |   35 ++++++++++++++++++
 drivers/xen/netback/loopback.c        |   10 -----
 drivers/xen/netback/netback.c         |   29 +++++++--------
 drivers/xen/netfront/netfront.c       |   37 ++++++++++---------
 include/linux/skbuff.h                |   10 +----
 net/core/dev.c                        |   63 ----------------------------------
 net/core/skbuff.c                     |    4 --
 net/ipv4/netfilter/ip_nat_proto_tcp.c |    7 ---
 net/ipv4/netfilter/ip_nat_proto_udp.c |    8 ----
 net/ipv4/xfrm4_output.c               |    6 ---
 10 files changed, 70 insertions(+), 139 deletions(-)

Index: linux-2.6-kill_skbuff_hack.patch
===================================================================
RCS file: linux-2.6-kill_skbuff_hack.patch
diff -N linux-2.6-kill_skbuff_hack.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-kill_skbuff_hack.patch	30 Apr 2007 22:20:01 -0000	1.2
@@ -0,0 +1,429 @@
+From: Herbert Xu <herbert.xu at redhat.com>
+Subject: [4/4] [XEN]: Kill skbuff hack
+
+Hi:
+
+This patch is based on the FC6 kernel.
+
+[XEN]: Kill skbuff hack
+
+Now that the Linux stack can accept packets with partial checksums and
+relay them back out again, we can eliminate the skbuff hacks.
+
+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 -ur linux-2.6.20.i386.orig/drivers/xen/core/skbuff.c linux-2.6.20.i386/drivers/xen/core/skbuff.c
+--- linux-2.6.20.i386.orig/drivers/xen/core/skbuff.c	2007-04-24 13:18:41.000000000 +1000
++++ linux-2.6.20.i386/drivers/xen/core/skbuff.c	2007-04-24 15:50:03.000000000 +1000
+@@ -9,6 +9,10 @@
+ #include <linux/etherdevice.h>
+ #include <linux/skbuff.h>
+ #include <linux/init.h>
++#include <linux/if_ether.h>
++#include <linux/tcp.h>
++#include <linux/udp.h>
++#include <net/ip.h>
+ #include <asm/io.h>
+ #include <asm/page.h>
+ #include <asm/hypervisor.h>
+@@ -78,6 +82,37 @@
+ 	return skb;
+ }
+ 
++int skb_checksum_setup(struct sk_buff *skb)
++{
++	if (skb->protocol != htons(ETH_P_IP))
++		goto out;
++	skb->h.raw = (unsigned char *)skb->nh.iph + 4*skb->nh.iph->ihl;
++	if (skb->h.raw >= skb->tail)
++		goto out;
++	switch (skb->nh.iph->protocol) {
++	case IPPROTO_TCP:
++		skb->csum_offset = offsetof(struct tcphdr, check);
++		break;
++	case IPPROTO_UDP:
++		skb->csum_offset = offsetof(struct udphdr, check);
++		break;
++	default:
++		if (net_ratelimit())
++			printk(KERN_ERR "Attempting to checksum a non-"
++			       "TCP/UDP packet, dropping a protocol"
++			       " %d packet", skb->nh.iph->protocol);
++		goto out;
++	}
++	if ((skb->h.raw + skb->csum_offset + 2) > skb->tail)
++		goto out;
++	skb->ip_summed = CHECKSUM_PARTIAL;
++
++	return 0;
++out:
++	return -EPROTO;
++}
++EXPORT_SYMBOL(skb_checksum_setup);
++
+ static void skbuff_ctor(void *buf, struct kmem_cache *cachep, unsigned long unused)
+ {
+ 	int order = 0;
+diff -ur linux-2.6.20.i386.orig/drivers/xen/netback/loopback.c linux-2.6.20.i386/drivers/xen/netback/loopback.c
+--- linux-2.6.20.i386.orig/drivers/xen/netback/loopback.c	2007-04-24 13:18:41.000000000 +1000
++++ linux-2.6.20.i386/drivers/xen/netback/loopback.c	2007-04-24 15:50:03.000000000 +1000
+@@ -149,16 +149,6 @@
+ 	np->stats.rx_bytes += skb->len;
+ 	np->stats.rx_packets++;
+ 
+-	if (skb->ip_summed == CHECKSUM_PARTIAL) {
+-		/* Defer checksum calculation. */
+-		skb->proto_csum_blank = 1;
+-		/* Must be a local packet: assert its integrity. */
+-		skb->proto_data_valid = 1;
+-	}
+-
+-	skb->ip_summed = skb->proto_data_valid ?
+-		CHECKSUM_UNNECESSARY : CHECKSUM_NONE;
+-
+ 	skb->pkt_type = PACKET_HOST; /* overridden by eth_type_trans() */
+ 	skb->protocol = eth_type_trans(skb, dev);
+ 	skb->dev      = dev;
+diff -ur linux-2.6.20.i386.orig/drivers/xen/netback/netback.c linux-2.6.20.i386/drivers/xen/netback/netback.c
+--- linux-2.6.20.i386.orig/drivers/xen/netback/netback.c	2007-04-24 13:18:41.000000000 +1000
++++ linux-2.6.20.i386/drivers/xen/netback/netback.c	2007-04-24 15:50:03.000000000 +1000
+@@ -293,7 +293,6 @@
+ 		/* Copy only the header fields we use in this driver. */
+ 		nskb->dev = skb->dev;
+ 		nskb->ip_summed = skb->ip_summed;
+-		nskb->proto_data_valid = skb->proto_data_valid;
+ 		dev_kfree_skb(skb);
+ 		skb = nskb;
+ 	}
+@@ -677,9 +676,11 @@
+ 		id = meta[npo.meta_cons].id;
+ 		flags = nr_frags ? NETRXF_more_data : 0;
+ 
+-		if (skb->ip_summed == CHECKSUM_PARTIAL) /* local packet? */
++		if (skb->ip_summed == CHECKSUM_PARTIAL)
++			/* local packet? */
+ 			flags |= NETRXF_csum_blank | NETRXF_data_validated;
+-		else if (skb->proto_data_valid) /* remote but checksummed? */
++		else if (skb->ip_summed == CHECKSUM_UNNECESSARY)
++			/* remote but checksummed? */
+ 			flags |= NETRXF_data_validated;
+ 
+ 		if (meta[npo.meta_cons].copy)
+@@ -1318,23 +1319,19 @@
+ 			netif_idx_release(pending_idx);
+ 		}
+ 
+-		/*
+-		 * Old frontends do not assert data_validated but we
+-		 * can infer it from csum_blank so test both flags.
+-		 */
+-		if (txp->flags & (NETTXF_data_validated|NETTXF_csum_blank)) {
+-			skb->ip_summed = CHECKSUM_UNNECESSARY;
+-			skb->proto_data_valid = 1;
+-		} else {
+-			skb->ip_summed = CHECKSUM_NONE;
+-			skb->proto_data_valid = 0;
+-		}
+-		skb->proto_csum_blank = !!(txp->flags & NETTXF_csum_blank);
+-
+ 		netbk_fill_frags(skb);
+ 
+ 		skb->dev      = netif->dev;
+ 		skb->protocol = eth_type_trans(skb, skb->dev);
++		skb->nh.raw   = skb->data;
++
++		if (txp->flags & NETTXF_csum_blank) {
++			if (skb_checksum_setup(skb)) {
++				kfree_skb(skb);
++				continue;
++			}
++		} else if (txp->flags & NETTXF_data_validated)
++			skb->ip_summed = CHECKSUM_UNNECESSARY;
+ 
+ 		netif->stats.rx_bytes += skb->len;
+ 		netif->stats.rx_packets++;
+diff -ur linux-2.6.20.i386.orig/drivers/xen/netfront/netfront.c linux-2.6.20.i386/drivers/xen/netfront/netfront.c
+--- linux-2.6.20.i386.orig/drivers/xen/netfront/netfront.c	2007-04-24 13:18:41.000000000 +1000
++++ linux-2.6.20.i386/drivers/xen/netfront/netfront.c	2007-04-24 15:50:03.000000000 +1000
+@@ -962,12 +962,12 @@
+ 	tx->flags = 0;
+ 	extra = NULL;
+ 
+-	if (skb->ip_summed == CHECKSUM_PARTIAL) /* local packet? */
++	if (skb->ip_summed == CHECKSUM_PARTIAL)
++		/* local packet? */
+ 		tx->flags |= NETTXF_csum_blank | NETTXF_data_validated;
+-#ifdef CONFIG_XEN
+-	if (skb->proto_data_valid) /* remote but checksummed? */
++	else if (skb->ip_summed == CHECKSUM_UNNECESSARY)
++		/* remote but checksummed? */
+ 		tx->flags |= NETTXF_data_validated;
+-#endif
+ 
+ #ifdef HAVE_TSO
+ 	if (skb_is_gso(skb)) {
+@@ -1388,20 +1388,10 @@
+ 		skb->truesize += skb->data_len - (RX_COPY_THRESHOLD - len);
+ 		skb->len += skb->data_len;
+ 
+-		/*
+-		 * Old backends do not assert data_validated but we
+-		 * can infer it from csum_blank so test both flags.
+-		 */
+-		if (rx->flags & (NETRXF_data_validated|NETRXF_csum_blank))
++		if (rx->flags & NETRXF_csum_blank)
++			skb->ip_summed = CHECKSUM_PARTIAL;
++		else if (rx->flags & NETRXF_data_validated)
+ 			skb->ip_summed = CHECKSUM_UNNECESSARY;
+-		else
+-			skb->ip_summed = CHECKSUM_NONE;
+-#ifdef CONFIG_XEN
+-		skb->proto_data_valid = (skb->ip_summed != CHECKSUM_NONE);
+-		skb->proto_csum_blank = !!(rx->flags & NETRXF_csum_blank);
+-#endif
+-		np->stats.rx_packets++;
+-		np->stats.rx_bytes += skb->len;
+ 
+ 		__skb_queue_tail(&rxq, skb);
+ 
+@@ -1441,6 +1431,19 @@
+ 
+ 		/* Ethernet work: Delayed to here as it peeks the header. */
+ 		skb->protocol = eth_type_trans(skb, dev);
++		skb->nh.raw = skb->data;
++
++		if (skb->ip_summed == CHECKSUM_PARTIAL) {
++			if (skb_checksum_setup(skb)) {
++				work_done--;
++				kfree_skb(skb);
++				np->stats.rx_errors++;
++				continue;
++			}
++		}
++
++		np->stats.rx_packets++;
++		np->stats.rx_bytes += skb->len;
+ 
+ 		/* Pass it up. */
+ 		netif_receive_skb(skb);
+diff -ur linux-2.6.20.i386.orig/include/linux/skbuff.h linux-2.6.20.i386/include/linux/skbuff.h
+--- linux-2.6.20.i386.orig/include/linux/skbuff.h	2007-04-24 15:16:44.000000000 +1000
++++ linux-2.6.20.i386/include/linux/skbuff.h	2007-04-24 15:50:03.000000000 +1000
+@@ -205,8 +205,6 @@
+  *	@local_df: allow local fragmentation
+  *	@cloned: Head may be cloned (check refcnt to be sure)
+  *	@nohdr: Payload reference only, must not modify header
+- *	@proto_data_valid: Protocol data validated since arriving at localhost
+- *	@proto_csum_blank: Protocol csum must be added before leaving localhost
+  *	@pkt_type: Packet class
+  *	@fclone: skbuff clone status
+  *	@ip_summed: Driver fed us an IP checksum
+@@ -292,13 +290,7 @@
+ 				nfctinfo:3;
+ 	__u8			pkt_type:3,
+ 				fclone:2,
+-#ifndef CONFIG_XEN
+ 				ipvs_property:1;
+-#else
+-				ipvs_property:1,
+-				proto_data_valid:1,
+-				proto_csum_blank:1;
+-#endif
+ 	__be16			protocol;
+ 
+ 	void			(*destructor)(struct sk_buff *skb);
+@@ -1351,6 +1343,8 @@
+ 
+ extern struct sk_buff *skb_segment(struct sk_buff *skb, int features);
+ 
++extern int skb_checksum_setup(struct sk_buff *skb);
++
+ static inline void *skb_header_pointer(const struct sk_buff *skb, int offset,
+ 				       int len, void *buffer)
+ {
+diff -ur linux-2.6.20.i386.orig/net/core/dev.c linux-2.6.20.i386/net/core/dev.c
+--- linux-2.6.20.i386.orig/net/core/dev.c	2007-04-24 15:14:04.000000000 +1000
++++ linux-2.6.20.i386/net/core/dev.c	2007-04-24 15:50:03.000000000 +1000
+@@ -117,12 +117,6 @@
+ #include <linux/err.h>
+ #include <linux/ctype.h>
+ 
+-#ifdef CONFIG_XEN
+-#include <net/ip.h>
+-#include <linux/tcp.h>
+-#include <linux/udp.h>
+-#endif
+-
+ /*
+  *	The list of packet types we will receive (as opposed to discard)
+  *	and the routines to invoke.
+@@ -1400,43 +1394,6 @@
+ 	}						\
+ }
+ 
+-#ifdef CONFIG_XEN
+-inline int skb_checksum_setup(struct sk_buff *skb)
+-{
+-	if (skb->proto_csum_blank) {
+-		if (skb->protocol != htons(ETH_P_IP))
+-			goto out;
+-		skb->h.raw = (unsigned char *)skb->nh.iph + 4*skb->nh.iph->ihl;
+-		if (skb->h.raw >= skb->tail)
+-			goto out;
+-		switch (skb->nh.iph->protocol) {
+-		case IPPROTO_TCP:
+-			skb->csum = offsetof(struct tcphdr, check);
+-			break;
+-		case IPPROTO_UDP:
+-			skb->csum = offsetof(struct udphdr, check);
+-			break;
+-		default:
+-			if (net_ratelimit())
+-				printk(KERN_ERR "Attempting to checksum a non-"
+-				       "TCP/UDP packet, dropping a protocol"
+-				       " %d packet", skb->nh.iph->protocol);
+-			goto out;
+-		}
+-		if ((skb->h.raw + skb->csum + 2) > skb->tail)
+-			goto out;
+-		skb->ip_summed = CHECKSUM_PARTIAL;
+-		skb->proto_csum_blank = 0;
+-	}
+-	return 0;
+-out:
+-	return -EPROTO;
+-}
+-#else
+-inline int skb_checksum_setup(struct sk_buff *skb) { return 0; }
+-#endif
+-
+-
+ /**
+  *	dev_queue_xmit - transmit a buffer
+  *	@skb: buffer to transmit
+@@ -1469,12 +1426,6 @@
+ 	struct Qdisc *q;
+ 	int rc = -ENOMEM;
+ 
+- 	/* If a checksum-deferred packet is forwarded to a device that needs a
+- 	 * checksum, correct the pointers and force checksumming.
+- 	 */
+- 	if (skb_checksum_setup(skb))
+- 		goto out_kfree_skb;
+-
+ 	/* GSO will handle the following emulations directly. */
+ 	if (netif_needs_gso(dev, skb))
+ 		goto gso;
+@@ -1853,19 +1804,6 @@
+ 	}
+ #endif
+ 
+-#ifdef CONFIG_XEN
+-	switch (skb->ip_summed) {
+-	case CHECKSUM_UNNECESSARY:
+-		skb->proto_data_valid = 1;
+-		break;
+-	case CHECKSUM_PARTIAL:
+-		/* XXX Implement me. */
+-	default:
+-		skb->proto_data_valid = 0;
+-		break;
+-	}
+-#endif
+-
+ 	list_for_each_entry_rcu(ptype, &ptype_all, list) {
+ 		if (!ptype->dev || ptype->dev == skb->dev) {
+ 			if (pt_prev) 
+@@ -3630,7 +3568,6 @@
+ EXPORT_SYMBOL(net_enable_timestamp);
+ EXPORT_SYMBOL(net_disable_timestamp);
+ EXPORT_SYMBOL(dev_get_flags);
+-EXPORT_SYMBOL(skb_checksum_setup);
+ 
+ #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
+ EXPORT_SYMBOL(br_handle_frame_hook);
+diff -ur linux-2.6.20.i386.orig/net/core/skbuff.c linux-2.6.20.i386/net/core/skbuff.c
+--- linux-2.6.20.i386.orig/net/core/skbuff.c	2007-04-24 15:08:07.000000000 +1000
++++ linux-2.6.20.i386/net/core/skbuff.c	2007-04-24 15:50:03.000000000 +1000
+@@ -483,10 +483,6 @@
+ 	C(local_df);
+ 	n->cloned = 1;
+ 	n->nohdr = 0;
+-#ifdef CONFIG_XEN
+-	C(proto_data_valid);
+-	C(proto_csum_blank);
+-#endif
+ 	C(pkt_type);
+ 	C(ip_summed);
+ 	C(priority);
+diff -ur linux-2.6.20.i386.orig/net/ipv4/netfilter/ip_nat_proto_tcp.c linux-2.6.20.i386/net/ipv4/netfilter/ip_nat_proto_tcp.c
+--- linux-2.6.20.i386.orig/net/ipv4/netfilter/ip_nat_proto_tcp.c	2007-04-24 13:18:41.000000000 +1000
++++ linux-2.6.20.i386/net/ipv4/netfilter/ip_nat_proto_tcp.c	2007-04-24 15:50:03.000000000 +1000
+@@ -129,15 +129,8 @@
+ 	if (hdrsize < sizeof(*hdr))
+ 		return 1;
+ 
+-#ifdef CONFIG_XEN
+-	if ((*pskb)->proto_csum_blank)
+-		nf_csum_replace4(&hdr->check, oldip, newip);
+-	else
+-#endif
+-	{
+ 	nf_proto_csum_replace4(&hdr->check, *pskb, oldip, newip, 1);
+ 	nf_proto_csum_replace2(&hdr->check, *pskb, oldport, newport, 0);
+-	}
+ 	return 1;
+ }
+ 
+diff -ur linux-2.6.20.i386.orig/net/ipv4/netfilter/ip_nat_proto_udp.c linux-2.6.20.i386/net/ipv4/netfilter/ip_nat_proto_udp.c
+--- linux-2.6.20.i386.orig/net/ipv4/netfilter/ip_nat_proto_udp.c	2007-04-24 13:18:41.000000000 +1000
++++ linux-2.6.20.i386/net/ipv4/netfilter/ip_nat_proto_udp.c	2007-04-24 15:50:03.000000000 +1000
+@@ -115,16 +115,8 @@
+ 	}
+ 
+ 	if (hdr->check || (*pskb)->ip_summed == CHECKSUM_PARTIAL) {
+-#ifdef CONFIG_XEN
+-		if ((*pskb)->proto_csum_blank)
+-			nf_csum_replace4(&hdr->check, oldip, newip);
+-		else
+-#endif
+-		{
+ 		nf_proto_csum_replace4(&hdr->check, *pskb, oldip, newip, 1);
+ 		nf_proto_csum_replace2(&hdr->check, *pskb, *portptr, newport, 0);
+-		}
+-
+ 		if (!hdr->check)
+ 			hdr->check = CSUM_MANGLED_0;
+ 	}
+diff -ur linux-2.6.20.i386.orig/net/ipv4/xfrm4_output.c linux-2.6.20.i386/net/ipv4/xfrm4_output.c
+--- linux-2.6.20.i386.orig/net/ipv4/xfrm4_output.c	2007-04-24 13:18:41.000000000 +1000
++++ linux-2.6.20.i386/net/ipv4/xfrm4_output.c	2007-04-24 15:50:03.000000000 +1000
+@@ -18,8 +18,6 @@
+ #include <net/xfrm.h>
+ #include <net/icmp.h>
+ 
+-extern int skb_checksum_setup(struct sk_buff *skb);
+-
+ static int xfrm4_tunnel_check_size(struct sk_buff *skb)
+ {
+ 	int mtu, ret = 0;
+@@ -49,10 +47,6 @@
+ 	struct dst_entry *dst = skb->dst;
+ 	struct xfrm_state *x = dst->xfrm;
+ 	int err;
+-	
+-	err = skb_checksum_setup(skb);
+-	if (err)
+-		goto error_nolock;
+ 
+ 	if (skb->ip_summed == CHECKSUM_PARTIAL) {
+ 		err = skb_checksum_help(skb);
+
+

linux-2.6-treat_partial_as_unnecessary.patch:
 include/linux/skbuff.h     |   16 +++++++++++-----
 include/net/tcp.h          |    2 +-
 include/net/udp.h          |    2 +-
 net/core/netpoll.c         |    2 +-
 net/ipv4/ipvs/ip_vs_core.c |    6 ++----
 net/ipv4/tcp_input.c       |    6 +++---
 net/ipv4/tcp_ipv4.c        |    3 +--
 net/ipv4/udp.c             |    6 +++---
 net/ipv6/raw.c             |    4 ++--
 net/ipv6/tcp_ipv6.c        |    3 +--
 net/ipv6/udp.c             |    4 ++--
 net/sctp/input.c           |    3 +--
 net/sunrpc/socklib.c       |    2 +-
 13 files changed, 30 insertions(+), 29 deletions(-)

Index: linux-2.6-treat_partial_as_unnecessary.patch
===================================================================
RCS file: linux-2.6-treat_partial_as_unnecessary.patch
diff -N linux-2.6-treat_partial_as_unnecessary.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-treat_partial_as_unnecessary.patch	30 Apr 2007 22:20:01 -0000	1.2
@@ -0,0 +1,275 @@
+From: Herbert Xu <herbert.xu at redhat.com>
+Subject: [3/4] [NET]: Treat CHECKSUM_PARTIAL as CHECKSUM_UNNECESSARY
+
+Hi:
+
+[NET]: Treat CHECKSUM_PARTIAL as CHECKSUM_UNNECESSARY
+
+When a transmitted packet is looped back directly, CHECKSUM_PARTIAL
+maps to the semantics of CHECKSUM_UNNECESSARY.  Therefore we should
+treat it as such in the stack.
+
+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 -ur linux-2.6.20.i386.orig/include/linux/skbuff.h linux-2.6.20.i386/include/linux/skbuff.h
+--- linux-2.6.20.i386.orig/include/linux/skbuff.h	2007-04-24 13:42:01.000000000 +1000
++++ linux-2.6.20.i386/include/linux/skbuff.h	2007-04-24 15:16:44.000000000 +1000
+@@ -31,10 +31,11 @@
+ #define HAVE_ALLOC_SKB		/* For the drivers to know */
+ #define HAVE_ALIGNABLE_SKB	/* Ditto 8)		   */
+ 
++/* Don't change this without changing skb_csum_unnecessary! */
+ #define CHECKSUM_NONE 0
+-#define CHECKSUM_PARTIAL 1
+-#define CHECKSUM_UNNECESSARY 2
+-#define CHECKSUM_COMPLETE 3
++#define CHECKSUM_UNNECESSARY 1
++#define CHECKSUM_COMPLETE 2
++#define CHECKSUM_PARTIAL 3
+ 
+ #define SKB_DATA_ALIGN(X)	(((X) + (SMP_CACHE_BYTES - 1)) & \
+ 				 ~(SMP_CACHE_BYTES - 1))
+@@ -1401,6 +1402,11 @@
+ 
+ extern __sum16 __skb_checksum_complete(struct sk_buff *skb);
+ 
++static inline int skb_csum_unnecessary(const struct sk_buff *skb)
++{
++	return skb->ip_summed & CHECKSUM_UNNECESSARY;
++}
++
+ /**
+  *	skb_checksum_complete - Calculate checksum of an entire packet
+  *	@skb: packet to process
+@@ -1419,8 +1425,8 @@
+  */
+ static inline unsigned int skb_checksum_complete(struct sk_buff *skb)
+ {
+-	return skb->ip_summed != CHECKSUM_UNNECESSARY &&
+-		__skb_checksum_complete(skb);
++	return skb_csum_unnecessary(skb) ?
++	       0 : __skb_checksum_complete(skb);
+ }
+ 
+ #ifdef CONFIG_NETFILTER
+diff -ur linux-2.6.20.i386.orig/include/net/tcp.h linux-2.6.20.i386/include/net/tcp.h
+--- linux-2.6.20.i386.orig/include/net/tcp.h	2007-03-30 13:39:07.000000000 +1000
++++ linux-2.6.20.i386/include/net/tcp.h	2007-04-24 15:16:44.000000000 +1000
+@@ -816,7 +816,7 @@
+ 
+ static inline int tcp_checksum_complete(struct sk_buff *skb)
+ {
+-	return skb->ip_summed != CHECKSUM_UNNECESSARY &&
++	return !skb_csum_unnecessary(skb) &&
+ 		__tcp_checksum_complete(skb);
+ }
+ 
+diff -ur linux-2.6.20.i386.orig/include/net/udp.h linux-2.6.20.i386/include/net/udp.h
+--- linux-2.6.20.i386.orig/include/net/udp.h	2007-03-30 13:39:07.000000000 +1000
++++ linux-2.6.20.i386/include/net/udp.h	2007-04-24 15:16:44.000000000 +1000
+@@ -80,7 +80,7 @@
+ 
+ static inline int udp_lib_checksum_complete(struct sk_buff *skb)
+ {
+-	return skb->ip_summed != CHECKSUM_UNNECESSARY &&
++	return !skb_csum_unnecessary(skb) &&
+ 		__udp_lib_checksum_complete(skb);
+ }
+ 
+diff -ur linux-2.6.20.i386.orig/net/core/netpoll.c linux-2.6.20.i386/net/core/netpoll.c
+--- linux-2.6.20.i386.orig/net/core/netpoll.c	2007-03-30 13:39:09.000000000 +1000
++++ linux-2.6.20.i386/net/core/netpoll.c	2007-04-24 15:16:44.000000000 +1000
+@@ -86,7 +86,7 @@
+ {
+ 	__wsum psum;
+ 
+-	if (uh->check == 0 || skb->ip_summed == CHECKSUM_UNNECESSARY)
++	if (uh->check == 0 || skb_csum_unnecessary(skb))
+ 		return 0;
+ 
+ 	psum = csum_tcpudp_nofold(saddr, daddr, ulen, IPPROTO_UDP, 0);
+diff -ur linux-2.6.20.i386.orig/net/ipv4/ipvs/ip_vs_core.c linux-2.6.20.i386/net/ipv4/ipvs/ip_vs_core.c
+--- linux-2.6.20.i386.orig/net/ipv4/ipvs/ip_vs_core.c	2007-03-30 13:39:10.000000000 +1000
++++ linux-2.6.20.i386/net/ipv4/ipvs/ip_vs_core.c	2007-04-24 15:16:44.000000000 +1000
+@@ -680,8 +680,7 @@
+ 	}
+ 
+ 	/* Ensure the checksum is correct */
+-	if (skb->ip_summed != CHECKSUM_UNNECESSARY &&
+-	    ip_vs_checksum_complete(skb, ihl)) {
++	if (!skb_csum_unnecessary(skb) && ip_vs_checksum_complete(skb, ihl)) {
+ 		/* Failed checksum! */
+ 		IP_VS_DBG(1, "Forward ICMP: failed checksum from %d.%d.%d.%d!\n",
+ 			  NIPQUAD(iph->saddr));
+@@ -921,8 +920,7 @@
+ 	verdict = NF_DROP;
+ 
+ 	/* Ensure the checksum is correct */
+-	if (skb->ip_summed != CHECKSUM_UNNECESSARY &&
+-	    ip_vs_checksum_complete(skb, ihl)) {
++	if (!skb_csum_unnecessary(skb) && ip_vs_checksum_complete(skb, ihl)) {
+ 		/* Failed checksum! */
+ 		IP_VS_DBG(1, "Incoming ICMP: failed checksum from %d.%d.%d.%d!\n",
+ 			  NIPQUAD(iph->saddr));
+diff -ur linux-2.6.20.i386.orig/net/ipv4/tcp_input.c linux-2.6.20.i386/net/ipv4/tcp_input.c
+--- linux-2.6.20.i386.orig/net/ipv4/tcp_input.c	2007-03-30 13:39:10.000000000 +1000
++++ linux-2.6.20.i386/net/ipv4/tcp_input.c	2007-04-24 15:16:44.000000000 +1000
+@@ -3775,7 +3775,7 @@
+ 	int err;
+ 
+ 	local_bh_enable();
+-	if (skb->ip_summed==CHECKSUM_UNNECESSARY)
++	if (skb_csum_unnecessary(skb))
+ 		err = skb_copy_datagram_iovec(skb, hlen, tp->ucopy.iov, chunk);
+ 	else
+ 		err = skb_copy_and_csum_datagram_iovec(skb, hlen,
+@@ -3807,7 +3807,7 @@
+ 
+ static inline int tcp_checksum_complete_user(struct sock *sk, struct sk_buff *skb)
+ {
+-	return skb->ip_summed != CHECKSUM_UNNECESSARY &&
++	return !skb_csum_unnecessary(skb) &&
+ 		__tcp_checksum_complete_user(sk, skb);
+ }
+ 
+@@ -3825,7 +3825,7 @@
+ 	if (!tp->ucopy.dma_chan && tp->ucopy.pinned_list)
+ 		tp->ucopy.dma_chan = get_softnet_dma();
+ 
+-	if (tp->ucopy.dma_chan && skb->ip_summed == CHECKSUM_UNNECESSARY) {
++	if (tp->ucopy.dma_chan && skb_csum_unnecessary(skb)) {
+ 
+ 		dma_cookie = dma_skb_copy_datagram_iovec(tp->ucopy.dma_chan,
+ 			skb, hlen, tp->ucopy.iov, chunk, tp->ucopy.pinned_list);
+diff -ur linux-2.6.20.i386.orig/net/ipv4/tcp_ipv4.c linux-2.6.20.i386/net/ipv4/tcp_ipv4.c
+--- linux-2.6.20.i386.orig/net/ipv4/tcp_ipv4.c	2007-04-24 15:09:28.000000000 +1000
++++ linux-2.6.20.i386/net/ipv4/tcp_ipv4.c	2007-04-24 15:16:44.000000000 +1000
+@@ -1636,8 +1636,7 @@
+ 	 * Packet length and doff are validated by header prediction,
+ 	 * provided case of th->doff==0 is eliminated.
+ 	 * So, we defer the checks. */
+-	if ((skb->ip_summed != CHECKSUM_UNNECESSARY &&
+-	     tcp_v4_checksum_init(skb)))
++	if (!skb_csum_unnecessary(skb) && tcp_v4_checksum_init(skb))
+ 		goto bad_packet;
+ 
+ 	th = skb->h.th;
+diff -ur linux-2.6.20.i386.orig/net/ipv4/udp.c linux-2.6.20.i386/net/ipv4/udp.c
+--- linux-2.6.20.i386.orig/net/ipv4/udp.c	2007-04-24 15:10:23.000000000 +1000
++++ linux-2.6.20.i386/net/ipv4/udp.c	2007-04-24 15:18:08.000000000 +1000
+@@ -839,7 +839,7 @@
+ 	 * 	          (re-)compute it if message is truncated.
+ 	 * 	UDP-Lite: always needs to checksum, no HW support.
+ 	 */
+-	copy_only = (skb->ip_summed==CHECKSUM_UNNECESSARY);
++	copy_only = skb_csum_unnecessary(skb);
+ 
+ 	if (is_udplite  ||  (!copy_only  &&  msg->msg_flags&MSG_TRUNC)) {
+ 		if (__udp_lib_checksum_complete(skb))
+@@ -1095,7 +1095,7 @@
+ 		}
+ 	}
+ 
+-	if (sk->sk_filter && skb->ip_summed != CHECKSUM_UNNECESSARY) {
++	if (sk->sk_filter && !skb_csum_unnecessary(skb)) {
+ 		if (__udp_lib_checksum_complete(skb))
+ 			goto drop;
+ 		skb->ip_summed = CHECKSUM_UNNECESSARY;
+@@ -1175,7 +1175,7 @@
+ 				      skb->len, IPPROTO_UDP, skb->csum       ))
+ 			skb->ip_summed = CHECKSUM_UNNECESSARY;
+ 	}
+-	if (skb->ip_summed != CHECKSUM_UNNECESSARY)
++	if (!skb_csum_unnecessary(skb))
+ 		skb->csum = csum_tcpudp_nofold(skb->nh.iph->saddr,
+ 					       skb->nh.iph->daddr,
+ 					       skb->len, IPPROTO_UDP, 0);
+diff -ur linux-2.6.20.i386.orig/net/ipv6/raw.c linux-2.6.20.i386/net/ipv6/raw.c
+--- linux-2.6.20.i386.orig/net/ipv6/raw.c	2007-03-30 13:39:11.000000000 +1000
++++ linux-2.6.20.i386/net/ipv6/raw.c	2007-04-24 15:18:35.000000000 +1000
+@@ -369,7 +369,7 @@
+ 				     skb->len, inet->num, skb->csum))
+ 			skb->ip_summed = CHECKSUM_UNNECESSARY;
+ 	}
+-	if (skb->ip_summed != CHECKSUM_UNNECESSARY)
++	if (!skb_csum_unnecessary(skb))
+ 		skb->csum = ~csum_unfold(csum_ipv6_magic(&skb->nh.ipv6h->saddr,
+ 					     &skb->nh.ipv6h->daddr,
+ 					     skb->len, inet->num, 0));
+@@ -421,7 +421,7 @@
+   		msg->msg_flags |= MSG_TRUNC;
+   	}
+ 
+-	if (skb->ip_summed==CHECKSUM_UNNECESSARY) {
++	if (skb_csum_unnecessary(skb)) {
+ 		err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
+ 	} else if (msg->msg_flags&MSG_TRUNC) {
+ 		if (__skb_checksum_complete(skb))
+diff -ur linux-2.6.20.i386.orig/net/ipv6/tcp_ipv6.c linux-2.6.20.i386/net/ipv6/tcp_ipv6.c
+--- linux-2.6.20.i386.orig/net/ipv6/tcp_ipv6.c	2007-04-24 15:10:43.000000000 +1000
++++ linux-2.6.20.i386/net/ipv6/tcp_ipv6.c	2007-04-24 15:16:44.000000000 +1000
+@@ -1705,8 +1705,7 @@
+ 	if (!pskb_may_pull(skb, th->doff*4))
+ 		goto discard_it;
+ 
+-	if ((skb->ip_summed != CHECKSUM_UNNECESSARY &&
+-	     tcp_v6_checksum_init(skb)))
++	if (!skb_csum_unnecessary(skb) && tcp_v6_checksum_init(skb))
+ 		goto bad_packet;
+ 
+ 	th = skb->h.th;
+diff -ur linux-2.6.20.i386.orig/net/ipv6/udp.c linux-2.6.20.i386/net/ipv6/udp.c
+--- linux-2.6.20.i386.orig/net/ipv6/udp.c	2007-03-30 13:39:11.000000000 +1000
++++ linux-2.6.20.i386/net/ipv6/udp.c	2007-04-24 15:19:35.000000000 +1000
+@@ -144,7 +144,7 @@
+ 	/*
+ 	 * 	Decide whether to checksum and/or copy data.
+ 	 */
+-	copy_only = (skb->ip_summed==CHECKSUM_UNNECESSARY);
++	copy_only = skb_csum_unnecessary(skb);
+ 
+ 	if (is_udplite  ||  (!copy_only  &&  msg->msg_flags&MSG_TRUNC)) {
+ 		if (__udp_lib_checksum_complete(skb))
+@@ -382,7 +382,7 @@
+ 		    	     skb->len, IPPROTO_UDP, skb->csum             ))
+ 		skb->ip_summed = CHECKSUM_UNNECESSARY;
+ 
+-	if (skb->ip_summed != CHECKSUM_UNNECESSARY)
++	if (!skb_csum_unnecessary(skb))
+ 		skb->csum = ~csum_unfold(csum_ipv6_magic(&skb->nh.ipv6h->saddr,
+ 							 &skb->nh.ipv6h->daddr,
+ 							 skb->len, IPPROTO_UDP,
+diff -ur linux-2.6.20.i386.orig/net/sctp/input.c linux-2.6.20.i386/net/sctp/input.c
+--- linux-2.6.20.i386.orig/net/sctp/input.c	2007-03-30 13:39:11.000000000 +1000
++++ linux-2.6.20.i386/net/sctp/input.c	2007-04-24 15:16:44.000000000 +1000
+@@ -144,8 +144,7 @@
+ 	__skb_pull(skb, skb->h.raw - skb->data);
+ 	if (skb->len < sizeof(struct sctphdr))
+ 		goto discard_it;
+-	if ((skb->ip_summed != CHECKSUM_UNNECESSARY) &&
+-	    (sctp_rcv_checksum(skb) < 0))
++	if (!skb_csum_unnecessary(skb) && sctp_rcv_checksum(skb) < 0)
+ 		goto discard_it;
+ 
+ 	skb_pull(skb, sizeof(struct sctphdr));
+diff -ur linux-2.6.20.i386.orig/net/sunrpc/socklib.c linux-2.6.20.i386/net/sunrpc/socklib.c
+--- linux-2.6.20.i386.orig/net/sunrpc/socklib.c	2007-03-30 13:39:12.000000000 +1000
++++ linux-2.6.20.i386/net/sunrpc/socklib.c	2007-04-24 15:16:44.000000000 +1000
+@@ -154,7 +154,7 @@
+ 	desc.offset = sizeof(struct udphdr);
+ 	desc.count = skb->len - desc.offset;
+ 
+-	if (skb->ip_summed == CHECKSUM_UNNECESSARY)
++	if (skb_csum_unnecessary(skb))
+ 		goto no_checksum;
+ 
+ 	desc.csum = csum_partial(skb->data, desc.offset, skb->csum);
+
+

linux-2.6-use_csum_start_offset_instead.patch:
 include/linux/skbuff.h |    9 +++++++--
 net/core/dev.c         |   23 ++++++++++++++---------
 net/core/skbuff.c      |    2 +-
 net/ipv4/tcp_ipv4.c    |    2 ++
 net/ipv4/udp.c         |    1 +
 net/ipv6/tcp_ipv6.c    |    2 ++
 6 files changed, 27 insertions(+), 12 deletions(-)

Index: linux-2.6-use_csum_start_offset_instead.patch
===================================================================
RCS file: linux-2.6-use_csum_start_offset_instead.patch
diff -N linux-2.6-use_csum_start_offset_instead.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-use_csum_start_offset_instead.patch	30 Apr 2007 22:20:01 -0000	1.2
@@ -0,0 +1,182 @@
+From: Herbert Xu <herbert.xu at redhat.com>
+Subject: [2/4] [NET]: Use csum_start offset instead of skb_transport_header
+
+Hi:
+
+Note this is based on the upstream net-2.6.22 tree so merging it
+into anything before that will require undoing the transport header
+changes.  Let me know if there are problems merging it.
+
+[NET]: Use csum_start offset instead of skb_transport_header
+
+The skb transport pointer is currently used to specify the start
+of the checksum region for transmit checksum offload.  Unfortunately,
+the same pointer is also used during receive side processing.
+
+This creates a problem when we want to retransmit a received
+packet with partial checksums since the skb transport pointer
+would be overwritten.
+
+This patch solves this problem by creating a new 16-bit csum_start
+offset value to replace the skb transport header for the purpose
+of checksums.  This offset is calculated from skb->head so that
+it does not have to change when skb->data changes.
+
+No extra space is required since csum_offset itself fits within
+a 16-bit word so we can use the other 16 bits for csum_start.
+
+For backwards compatibility, just before we push a packet with
+partial checksums off into the device driver, we set the skb
+transport header to what it would have been under the old scheme.
+
+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 -ur linux-2.6.20.i386.orig/include/linux/skbuff.h linux-2.6.20.i386/include/linux/skbuff.h
+--- linux-2.6.20.i386.orig/include/linux/skbuff.h	2007-04-24 13:31:01.000000000 +1000
++++ linux-2.6.20.i386/include/linux/skbuff.h	2007-04-24 13:42:01.000000000 +1000
+@@ -198,7 +198,9 @@
+  *	@len: Length of actual data
+  *	@data_len: Data length
+  *	@mac_len: Length of link layer header
+- *	@csum: Checksum
++ *	@csum: Checksum (must include start/offset pair)
++ *	@csum_start: Offset from skb->head where checksumming should start
++ *	@csum_offset: Offset from csum_start where checksum should be stored
+  *	@local_df: allow local fragmentation
+  *	@cloned: Head may be cloned (check refcnt to be sure)
+  *	@nohdr: Payload reference only, must not modify header
+@@ -276,7 +278,10 @@
+ 				mac_len;
+ 	union {
+ 		__wsum		csum;
+-		__u32		csum_offset;
++		struct {
++			__u16	csum_start;
++			__u16	csum_offset;
++		};
+ 	};
+ 	__u32			priority;
+ 	__u8			local_df:1,
+diff -ur linux-2.6.20.i386.orig/net/core/dev.c linux-2.6.20.i386/net/core/dev.c
+--- linux-2.6.20.i386.orig/net/core/dev.c	2007-04-24 13:18:41.000000000 +1000
++++ linux-2.6.20.i386/net/core/dev.c	2007-04-24 15:14:04.000000000 +1000
+@@ -1176,7 +1176,7 @@
+ int skb_checksum_help(struct sk_buff *skb)
+ {
+ 	__wsum csum;
+-	int ret = 0, offset = skb->h.raw - skb->data;
++	int ret = 0, offset;
+ 
+ 	if (skb->ip_summed == CHECKSUM_COMPLETE)
+ 		goto out_set_summed;
+@@ -1192,14 +1192,16 @@
+ 			goto out;
+ 	}
+ 
++	offset = skb->csum_start - skb_headroom(skb);
+ 	BUG_ON(offset > (int)skb->len);
+ 	csum = skb_checksum(skb, offset, skb->len-offset, 0);
+ 
+-	offset = skb->tail - skb->h.raw;
++	offset = skb_headlen(skb) - offset;
+ 	BUG_ON(offset <= 0);
+ 	BUG_ON(skb->csum_offset + 2 > offset);
+ 
+-	*(__sum16*)(skb->h.raw + skb->csum_offset) = csum_fold(csum);
++	*(__sum16 *)(skb->head + skb->csum_start + skb->csum_offset) =
++		csum_fold(csum);
+ 
+ out_set_summed:
+ 	skb->ip_summed = CHECKSUM_NONE;
+@@ -1494,12 +1496,15 @@
+ 	/* If packet is not checksummed and device does not support
+ 	 * checksumming for this protocol, complete checksumming here.
+ 	 */
+-	if (skb->ip_summed == CHECKSUM_PARTIAL &&
+-	    (!(dev->features & NETIF_F_GEN_CSUM) &&
+-	     (!(dev->features & NETIF_F_IP_CSUM) ||
+-	      skb->protocol != htons(ETH_P_IP))))
+-	      	if (skb_checksum_help(skb))
+-	      		goto out_kfree_skb;
++	if (skb->ip_summed == CHECKSUM_PARTIAL) {
++		skb->h.raw = skb->head + skb->csum_start;
++
++		if (!(dev->features & NETIF_F_GEN_CSUM) &&
++		    (!(dev->features & NETIF_F_IP_CSUM) ||
++		     skb->protocol != htons(ETH_P_IP)))
++		      	if (skb_checksum_help(skb))
++		      		goto out_kfree_skb;
++	}
+ 
+ gso:
+ 	spin_lock_prefetch(&dev->queue_lock);
+diff -ur linux-2.6.20.i386.orig/net/core/skbuff.c linux-2.6.20.i386/net/core/skbuff.c
+--- linux-2.6.20.i386.orig/net/core/skbuff.c	2007-04-24 13:18:41.000000000 +1000
++++ linux-2.6.20.i386/net/core/skbuff.c	2007-04-24 15:08:07.000000000 +1000
+@@ -1422,7 +1422,7 @@
+ 	long csstart;
+ 
+ 	if (skb->ip_summed == CHECKSUM_PARTIAL)
+-		csstart = skb->h.raw - skb->data;
++		csstart = skb->csum_start - skb_headroom(skb);
+ 	else
+ 		csstart = skb_headlen(skb);
+ 
+diff -ur linux-2.6.20.i386.orig/net/ipv4/tcp_ipv4.c linux-2.6.20.i386/net/ipv4/tcp_ipv4.c
+--- linux-2.6.20.i386.orig/net/ipv4/tcp_ipv4.c	2007-03-30 13:39:10.000000000 +1000
++++ linux-2.6.20.i386/net/ipv4/tcp_ipv4.c	2007-04-24 15:09:28.000000000 +1000
+@@ -504,6 +504,7 @@
+ 	if (skb->ip_summed == CHECKSUM_PARTIAL) {
+ 		th->check = ~tcp_v4_check(th, len,
+ 					  inet->saddr, inet->daddr, 0);
++		skb->csum_start = skb->h.raw - skb->head;
+ 		skb->csum_offset = offsetof(struct tcphdr, check);
+ 	} else {
+ 		th->check = tcp_v4_check(th, len, inet->saddr, inet->daddr,
+@@ -526,6 +527,7 @@
+ 
+ 	th->check = 0;
+ 	th->check = ~tcp_v4_check(th, skb->len, iph->saddr, iph->daddr, 0);
++	skb->csum_start = skb->h.raw - skb->head;
+ 	skb->csum_offset = offsetof(struct tcphdr, check);
+ 	skb->ip_summed = CHECKSUM_PARTIAL;
+ 	return 0;
+diff -ur linux-2.6.20.i386.orig/net/ipv4/udp.c linux-2.6.20.i386/net/ipv4/udp.c
+--- linux-2.6.20.i386.orig/net/ipv4/udp.c	2007-04-24 13:18:40.000000000 +1000
++++ linux-2.6.20.i386/net/ipv4/udp.c	2007-04-24 15:10:23.000000000 +1000
+@@ -425,6 +425,7 @@
+ 		/*
+ 		 * Only one fragment on the socket.
+ 		 */
++		skb->csum_start = skb->h.raw - skb->head;
+ 		skb->csum_offset = offsetof(struct udphdr, check);
+ 		uh->check = ~csum_tcpudp_magic(src, dst, len, IPPROTO_UDP, 0);
+ 	} else {
+diff -ur linux-2.6.20.i386.orig/net/ipv6/tcp_ipv6.c linux-2.6.20.i386/net/ipv6/tcp_ipv6.c
+--- linux-2.6.20.i386.orig/net/ipv6/tcp_ipv6.c	2007-03-30 13:39:11.000000000 +1000
++++ linux-2.6.20.i386/net/ipv6/tcp_ipv6.c	2007-04-24 15:10:43.000000000 +1000
+@@ -948,6 +948,7 @@
+ 
+ 	if (skb->ip_summed == CHECKSUM_PARTIAL) {
+ 		th->check = ~csum_ipv6_magic(&np->saddr, &np->daddr, len, IPPROTO_TCP,  0);
++		skb->csum_start = skb->h.raw - skb->head;
+ 		skb->csum_offset = offsetof(struct tcphdr, check);
+ 	} else {
+ 		th->check = csum_ipv6_magic(&np->saddr, &np->daddr, len, IPPROTO_TCP, 
+@@ -970,6 +971,7 @@
+ 	th->check = 0;
+ 	th->check = ~csum_ipv6_magic(&ipv6h->saddr, &ipv6h->daddr, skb->len,
+ 				     IPPROTO_TCP, 0);
++	skb->csum_start = skb->h.raw - skb->head;
+ 	skb->csum_offset = offsetof(struct tcphdr, check);
+ 	skb->ip_summed = CHECKSUM_PARTIAL;
+ 	return 0;
+
+



From fedora-cvs-commits at redhat.com  Mon Apr 30 22:37:04 2007
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 30 Apr 2007 18:37:04 -0400
Subject: rpms/kernel-xen-2.6/devel kernel-xen.spec,1.19,1.20
Message-ID: <200704302237.l3UMb4hb007002@cvs.devel.redhat.com>

Author: ehabkost

Update of /cvs/dist/rpms/kernel-xen-2.6/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6962

Modified Files:
	kernel-xen.spec 
Log Message:
Updating release field by hand