openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
March 2010
- 1 participants
- 1093 discussions
Hello community,
here is the log from the commit of package mkvtoolnix for openSUSE:Factory
checked in at Wed Mar 31 18:54:55 CEST 2010.
--------
--- mkvtoolnix/mkvtoolnix.changes 2010-02-13 12:21:20.000000000 +0100
+++ /mounts/work_src_done/STABLE/mkvtoolnix/mkvtoolnix.changes 2010-03-26 18:26:52.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Mar 26 17:20:08 UTC 2010 - cmorve69(a)yahoo.es
+
+- Update to version 3.3.0:
+ Several important bug fixes and a few new features.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
mkvtoolnix-3.2.0.tar.bz2
New:
----
mkvtoolnix-3.3.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mkvtoolnix.spec ++++++
--- /var/tmp/diff_new_pack.CZUUVy/_old 2010-03-31 18:54:36.000000000 +0200
+++ /var/tmp/diff_new_pack.CZUUVy/_new 2010-03-31 18:54:36.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package mkvtoolnix (Version 3.2.0)
+# spec file for package mkvtoolnix (Version 3.3.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -21,7 +21,7 @@
BuildRequires: boost-devel flac-devel gcc-c++ libexpat-devel libmatroska-devel
BuildRequires: libvorbis-devel lzo-devel update-desktop-files wxGTK-devel
Url: http://www.bunkus.org/videotools/mkvtoolnix/
-Version: 3.2.0
+Version: 3.3.0
Release: 1
Summary: Tools to Create, Alter, and Inspect Matroska Files
License: GPLv2+
++++++ mkvtoolnix-3.2.0.tar.bz2 -> mkvtoolnix-3.3.0.tar.bz2 ++++++
++++ 49847 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at Wed Mar 31 18:52:54 CEST 2010.
--------
--- mkinitrd/mkinitrd.changes 2010-03-25 14:59:28.000000000 +0100
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2010-03-26 15:43:16.000000000 +0100
@@ -1,0 +2,12 @@
+Fri Mar 26 15:25:22 CET 2010 - mmarek(a)suse.cz
+
+- setup-storage: Do not assume that anything that contains a colon
+ is nfs (bnc#590135).
+
+-------------------------------------------------------------------
+Fri Mar 26 14:34:47 CET 2010 - mmarek(a)suse.cz
+
+- setup-start: include /etc/sysconfig/kernel early enough
+ (bnc#591398, bnc#591400).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mkinitrd.spec ++++++
--- /var/tmp/diff_new_pack.YiGeYl/_old 2010-03-31 18:50:25.000000000 +0200
+++ /var/tmp/diff_new_pack.YiGeYl/_new 2010-03-31 18:50:25.000000000 +0200
@@ -31,7 +31,7 @@
%endif
AutoReqProv: on
Version: 2.5.10
-Release: 14
+Release: 15
Conflicts: udev < 118
Requires: dhcpcd
Summary: Creates an Initial RAM Disk Image for Preloading Modules
++++++ mkinitrd.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/mkinitrd.changes new/mkinitrd-2.5.10/mkinitrd.changes
--- old/mkinitrd-2.5.10/mkinitrd.changes 2010-03-25 14:36:03.000000000 +0100
+++ new/mkinitrd-2.5.10/mkinitrd.changes 2010-03-26 15:30:24.000000000 +0100
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Fri Mar 26 15:25:22 CET 2010 - mmarek(a)suse.cz
+
+- setup-storage: Do not assume that anything that contains a colon
+ is nfs (bnc#590135).
+
+-------------------------------------------------------------------
+Fri Mar 26 14:34:47 CET 2010 - mmarek(a)suse.cz
+
+- setup-start: include /etc/sysconfig/kernel early enough
+ (bnc#591398, bnc#591400).
+
+-------------------------------------------------------------------
Thu Mar 25 14:35:24 CET 2010 - mmarek(a)suse.cz
- setup-block: catch "(null)" in /sys/class/scsi_host/*/proc_name
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/setup-kms.sh new/mkinitrd-2.5.10/scripts/setup-kms.sh
--- old/mkinitrd-2.5.10/scripts/setup-kms.sh 2010-03-25 14:36:03.000000000 +0100
+++ new/mkinitrd-2.5.10/scripts/setup-kms.sh 2010-03-26 15:30:24.000000000 +0100
@@ -1,7 +1,7 @@
#!/bin/bash
#
#%stage: setup
-#%depends: prepare
+#%depends: start
DRIVERS="i915"
supported_classes="0300"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/setup-start.sh new/mkinitrd-2.5.10/scripts/setup-start.sh
--- old/mkinitrd-2.5.10/scripts/setup-start.sh 2010-03-25 14:36:03.000000000 +0100
+++ new/mkinitrd-2.5.10/scripts/setup-start.sh 2010-03-26 15:30:24.000000000 +0100
@@ -25,15 +25,13 @@
# Set in the mkinitrd script
save_var build_day
+# get variables INITRD_MODULES, DOMU_INITRD_MODULES etc. from configuration
+. $root_dir/etc/sysconfig/kernel
if [ -z "$param_m" ]; then
- # get INITRD_MODULES from system configuration
- . $root_dir/etc/sysconfig/kernel
modules="$INITRD_MODULES"
fi
if [ -z "$param_u" ]; then
- # get DOMU_INITRD_MODULES from system configuration
- . $root_dir/etc/sysconfig/kernel
domu_modules="$DOMU_INITRD_MODULES"
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/setup-storage.sh new/mkinitrd-2.5.10/scripts/setup-storage.sh
--- old/mkinitrd-2.5.10/scripts/setup-storage.sh 2010-03-25 14:36:03.000000000 +0100
+++ new/mkinitrd-2.5.10/scripts/setup-storage.sh 2010-03-26 15:30:24.000000000 +0100
@@ -308,6 +308,8 @@
rootfstype=${rootdev%%://*}
interface=${interface:-default}
;;
+ scsi:*)
+ ;;
*:*)
rootfstype=nfs
interface=${interface:-default}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package lxsession-edit for openSUSE:Factory
checked in at Wed Mar 31 18:50:13 CEST 2010.
--------
--- lxsession-edit/lxsession-edit.changes 2009-12-17 01:37:58.000000000 +0100
+++ /mounts/work_src_done/STABLE/lxsession-edit/lxsession-edit.changes 2010-03-26 01:56:54.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Mar 26 00:58:40 UTC 2010 - andrea(a)opensuse.org
+
+- fixed icon path, now works out of the box
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xfwm4.png
New:
----
lxsession-edit.png
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lxsession-edit.spec ++++++
--- /var/tmp/diff_new_pack.tjDMvP/_old 2010-03-31 18:49:35.000000000 +0200
+++ /var/tmp/diff_new_pack.tjDMvP/_new 2010-03-31 18:49:35.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package lxsession-edit (Version 0.1.1)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,10 +20,10 @@
Name: lxsession-edit
Version: 0.1.1
-Release: 1
+Release: 2
License: GPLv3
Source0: %{name}-%version.tar.bz2
-Source1: xfwm4.png
+Source1: lxsession-edit.png
Patch0: %name-%version-icon.patch
Patch1: %name-%version-obsolete.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -55,9 +55,8 @@
%install
%makeinstall
-#workaround to wrong brp-desktop cheks
-%__install -d %buildroot/%_datadir/icons/gnome/32x32/apps/
-%__cp %SOURCE1 %buildroot/%_datadir/icons/gnome/32x32/apps/
+%__install -d %buildroot/%_datadir/pixmaps
+%__cp %SOURCE1 %buildroot/%_datadir/pixmaps/
%find_lang %{name}
%suse_update_desktop_file lxsession-edit
%fdupes -s %buildroot
@@ -72,7 +71,6 @@
%{_datadir}/applications/lxsession-edit.desktop
%dir %{_datadir}/lxsession-edit
%{_datadir}/lxsession-edit/lxsession-edit.ui
-# workaround for wrong brp-desktop checks
-%exclude %{_datadir}/icons/gnome/32x32/apps/xfwm4.png
+%{_datadir}/pixmaps/lxsession-edit.png
%changelog
++++++ lxsession-edit-0.1.1-icon.patch ++++++
--- /var/tmp/diff_new_pack.tjDMvP/_old 2010-03-31 18:49:35.000000000 +0200
+++ /var/tmp/diff_new_pack.tjDMvP/_new 2010-03-31 18:49:35.000000000 +0200
@@ -5,7 +5,7 @@
[Desktop Entry]
Type=Application
-Icon=xfwm4.png
-+Icon=/usr/share//icons/gnome/32x32/apps/xfwm4.png
++Icon=lxsession-edit
Exec=lxsession-edit
Name=Desktop Session Settings
+Name[it]=Impostazioni Sessione Desktop
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package lua for openSUSE:Factory
checked in at Wed Mar 31 18:49:22 CEST 2010.
--------
--- lua/lua.changes 2009-12-16 10:38:45.000000000 +0100
+++ /mounts/work_src_done/STABLE/lua/lua.changes 2010-03-29 15:48:08.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Mar 23 11:16:23 CET 2010 - pgajdos(a)suse.cz
+
+- modified LUA_PATH_DEFAULT [bnc#589441]: search modules under
+ /usr/%{_lib}/lua/%{major_version} too
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
lua-5.1.4-module-path.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lua.spec ++++++
--- /var/tmp/diff_new_pack.P44HIC/_old 2010-03-31 18:49:08.000000000 +0200
+++ /var/tmp/diff_new_pack.P44HIC/_new 2010-03-31 18:49:08.000000000 +0200
@@ -20,7 +20,7 @@
Name: lua
Version: 5.1.4
-Release: 7
+Release: 8
%define major_version 5.1
License: MIT License (or similar)
Group: System/Libraries
@@ -33,6 +33,7 @@
Source1: macros.lua
Source2: baselibs.conf
Patch0: %{name}-%{version}-shared.diff
+Patch1: %{name}-%{version}-module-path.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -144,8 +145,10 @@
%prep
%setup -q
%patch0 -b .shared
+%patch1 -p1
%build
+sed -i 's:LUA_ROOT2 "LIBDIR/lua/%{major_version}/":LUA_ROOT2 \"%{_lib}/lua/%{major_version}/":' src/luaconf.h
make %{?jobs:-j%jobs} -C src MYCFLAGS="$RPM_OPT_FLAGS -fPIC -DLUA_USE_LINUX" MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" V=%{major_version} all
%install
++++++ lua-5.1.4-module-path.diff ++++++
diff -urNad trunk~/src/luaconf.h trunk/src/luaconf.h
--- trunk~/src/luaconf.h 2006-02-10 12:44:06.000000000 -0500
+++ trunk/src/luaconf.h 2006-02-17 21:32:55.000000000 -0500
@@ -83,13 +83,17 @@
#else
#define LUA_ROOT "/usr/local/"
+#define LUA_ROOT2 "/usr/"
#define LUA_LDIR LUA_ROOT "share/lua/5.1/"
+#define LUA_LDIR2 LUA_ROOT2 "share/lua/5.1/"
#define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
+#define LUA_CDIR2 LUA_ROOT2 "LIBDIR/lua/5.1/"
#define LUA_PATH_DEFAULT \
"./?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
- LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua"
+ LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \
+ LUA_LDIR2"?.lua;" LUA_LDIR2"?/init.lua"
#define LUA_CPATH_DEFAULT \
- "./?.so;" LUA_CDIR"?.so;" LUA_CDIR"loadall.so"
+ "./?.so;" LUA_CDIR"?.so;" LUA_CDIR2"?.so;" LUA_CDIR"loadall.so"
#endif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package linuxrc for openSUSE:Factory
checked in at Wed Mar 31 18:48:50 CEST 2010.
--------
--- linuxrc/linuxrc.changes 2010-02-26 15:25:43.000000000 +0100
+++ /mounts/work_src_done/STABLE/linuxrc/linuxrc.changes 2010-03-30 15:31:09.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Mar 30 15:31:01 CEST 2010 - snwint(a)suse.de
+
+- add 'type' option to url syntax (bnc #590811)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
linuxrc-3.4.11.tar.bz2
New:
----
linuxrc-3.4.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxrc.spec ++++++
--- /var/tmp/diff_new_pack.85Gh0W/_old 2010-03-31 18:11:16.000000000 +0200
+++ /var/tmp/diff_new_pack.85Gh0W/_new 2010-03-31 18:11:16.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package linuxrc (Version 3.4.11)
+# spec file for package linuxrc (Version 3.4.12)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,9 +24,9 @@
Group: System/Boot
AutoReqProv: on
Summary: SUSE Installation Program
-Version: 3.4.11
+Version: 3.4.12
Release: 1
-Source: linuxrc-3.4.11.tar.bz2
+Source: linuxrc-3.4.12.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
++++++ linuxrc-3.4.11.tar.bz2 -> linuxrc-3.4.12.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.4.11/VERSION new/linuxrc-3.4.12/VERSION
--- old/linuxrc-3.4.11/VERSION 2010-02-26 15:25:23.000000000 +0100
+++ new/linuxrc-3.4.12/VERSION 2010-03-30 15:30:57.000000000 +0200
@@ -1 +1 @@
-3.4.11
+3.4.12
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.4.11/changelog new/linuxrc-3.4.12/changelog
--- old/linuxrc-3.4.11/changelog 2010-02-26 15:25:24.000000000 +0100
+++ new/linuxrc-3.4.12/changelog 2010-03-30 15:30:59.000000000 +0200
@@ -1,4 +1,7 @@
-2010-02-26: HEAD
+2010-03-30: HEAD
+ - add 'type' option to url syntax (bnc #590811)
+
+2010-02-26: 3.4.11
- added 'namescheme' option to linuxrc to select alternative device name
schemes (by-id, by-path, by-label); default is 'by-id' (bnc #582717)
- fix make deps for VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.4.11/url.c new/linuxrc-3.4.12/url.c
--- old/linuxrc-3.4.11/url.c 2010-02-26 15:25:20.000000000 +0100
+++ new/linuxrc-3.4.12/url.c 2010-03-30 15:13:12.000000000 +0200
@@ -544,6 +544,10 @@
url->file_list = slist_split(',', sl->value);
}
+ if((sl = slist_getentry(url->query, "type"))) {
+ url->is.file = strcmp(sl->value, "file") ? 0 : 1;
+ }
+
if(
url->scheme == inst_file ||
url->scheme == inst_nfs ||
@@ -612,7 +616,10 @@
fprintf(stderr, "\n");
}
- fprintf(stderr, " network = %u, mountable = %u\n", url->is.network, url->is.mountable);
+ fprintf(stderr,
+ " network = %u, mountable = %u, file = %u\n",
+ url->is.network, url->is.mountable, url->is.file
+ );
if(url->instsys) fprintf(stderr, " instsys = %s\n", url->instsys);
@@ -1161,10 +1168,15 @@
if(config.debug) fprintf(stderr, "[server = %s]\n", inet2print(&url->used.server));
- err = net_mount_nfs(url->mount, &url->used.server, url->path, url->port);
- fprintf(stderr, "nfs: %s -> %s (%d)\n", url->path, url->mount, err);
+ if(!url->is.file) {
+ err = net_mount_nfs(url->mount, &url->used.server, url->path, url->port);
+ fprintf(stderr, "nfs: %s -> %s (%d)\n", url->path, url->mount, err);
+ }
+ else {
+ fprintf(stderr, "nfs: %s: is file, mounting one level up\n", url->path);
+ }
- if(err == ENOTDIR || err == ENOENT) {
+ if(err == ENOTDIR || err == ENOENT || url->is.file) {
str_copy(&url->mount, NULL);
str_copy(&buf, url->path);
@@ -1237,7 +1249,7 @@
if(url->is.mountable) {
file_type = util_check_exist(path);
- if(file_type == 'r') url->is.file = 1;
+ url->is.file = file_type == 'r' ? 1 : 0;
if(file_type) {
if(
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libqt4 for openSUSE:Factory
checked in at Wed Mar 31 18:10:56 CEST 2010.
--------
--- libqt4/libqt4-devel-doc-data.changes 2010-02-17 17:17:53.000000000 +0100
+++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc-data.changes 2010-03-23 21:16:48.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Mar 23 21:15:42 CET 2010 - dmueller(a)suse.de
+
+- fix crash in QGtkStyle when no Gtk is available (bnc#580478)
+
+-------------------------------------------------------------------
libqt4-devel-doc.changes: same change
libqt4-sql-plugins.changes: same change
libqt4.changes: same change
calling whatdependson for head-i586
New:
----
qgtkstyle-no-gtk-crash.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt4-devel-doc-data.spec ++++++
--- /var/tmp/diff_new_pack.vyfSbj/_old 2010-03-31 18:09:36.000000000 +0200
+++ /var/tmp/diff_new_pack.vyfSbj/_new 2010-03-31 18:09:36.000000000 +0200
@@ -28,7 +28,7 @@
# COMMON-VERSION-BEGIN
# COMMON-VERSION-BEGIN
Version: 4.6.2
-Release: 1
+Release: 2
%define base_name libqt4
%define x11_free -everywhere-opensource-src-
%define rversion 4.6.2
@@ -75,6 +75,7 @@
Patch112: s390-qatomic-fixes.diff
Patch113: ppc64-webkit-link-fix.diff
Patch114: fix-sequence-error.diff
+Patch115: qgtkstyle-no-gtk-crash.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle
%define check_config \
@@ -126,6 +127,7 @@
%patch112
%patch113
%patch114
+%patch115
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
# COMMON-END
@@ -180,6 +182,7 @@
for d in docimages qchdocs htmldocs ; do
make INSTALL_ROOT=$RPM_BUILD_ROOT install_${d}
done
+
#mkdir -p $RPM_BUILD_ROOT/%_docdir/%base_name/html
#for d in html-api html-assistant html-designer html-linguist html-qmake; do
# for f in doc/$d/*; do
++++++ libqt4-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.vyfSbj/_old 2010-03-31 18:09:36.000000000 +0200
+++ /var/tmp/diff_new_pack.vyfSbj/_new 2010-03-31 18:09:37.000000000 +0200
@@ -31,7 +31,7 @@
# COMMON-VERSION-BEGIN
# COMMON-VERSION-BEGIN
Version: 4.6.2
-Release: 1
+Release: 2
%define base_name libqt4
%define x11_free -everywhere-opensource-src-
%define rversion 4.6.2
@@ -82,6 +82,7 @@
Patch112: s390-qatomic-fixes.diff
Patch113: ppc64-webkit-link-fix.diff
Patch114: fix-sequence-error.diff
+Patch115: qgtkstyle-no-gtk-crash.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle
%define check_config \
@@ -133,6 +134,7 @@
%patch112
%patch113
%patch114
+%patch115
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
# COMMON-END
@@ -199,11 +201,13 @@
mv $RPM_BUILD_ROOT/%_libdir/qt4/demos/browser/browser $RPM_BUILD_ROOT/%_bindir/qt4-browser
ln -s %_bindir/svgviewer $RPM_BUILD_ROOT/%_libdir/qt4/examples/painting/svgviewer/svgviewer
ln -s %_bindir/qt4-browser $RPM_BUILD_ROOT/%_libdir/qt4/demos/browser/browser
+
# reduce fileconflicts
for f in $(rpm -ql libqt4-devel) $(rpm -ql libqt4-x11) $(rpm -ql libqt4); do
test -f $RPM_BUILD_ROOT/$f && rm $RPM_BUILD_ROOT/$f
done
find $RPM_BUILD_ROOT -type d -print0 | xargs -0 --no-run-if-empty rmdir --ignore-fail-on-non-empty
+
# argggh, qmake is such a piece of <censored>
mkdir -p $RPM_BUILD_ROOT/%_libdir/pkgconfig
find $RPM_BUILD_ROOT/%_libdir -type f -name '*.pc' -exec mv {} $RPM_BUILD_ROOT/%_libdir/pkgconfig \;
@@ -214,6 +218,7 @@
mkdir -p $RPM_BUILD_ROOT/%_docdir/%base_name/
ln -s %_libdir/qt4/demos $RPM_BUILD_ROOT/%_docdir/%base_name/demos
ln -s %_libdir/qt4/examples $RPM_BUILD_ROOT/%_docdir/%base_name/examples
+
# packaged in %name-devel-doc-data
rm -rf $RPM_BUILD_ROOT/%_docdir/%base_name/{doc,html}
rm -f $RPM_BUILD_ROOT/%_libdir/libQt{3,A,C,G,H,N,S,T}*
@@ -222,6 +227,7 @@
%if %suse_version > 1020
%fdupes $RPM_BUILD_ROOT/usr/include
%endif
+
%suse_update_desktop_file -i assistant4 Qt Development Documentation
%clean
++++++ libqt4-sql-plugins.spec ++++++
--- /var/tmp/diff_new_pack.vyfSbj/_old 2010-03-31 18:09:37.000000000 +0200
+++ /var/tmp/diff_new_pack.vyfSbj/_new 2010-03-31 18:09:37.000000000 +0200
@@ -29,7 +29,7 @@
# COMMON-VERSION-BEGIN
# COMMON-VERSION-BEGIN
Version: 4.6.2
-Release: 1
+Release: 2
%define base_name libqt4
%define x11_free -everywhere-opensource-src-
%define rversion 4.6.2
@@ -74,6 +74,7 @@
Patch112: s390-qatomic-fixes.diff
Patch113: ppc64-webkit-link-fix.diff
Patch114: fix-sequence-error.diff
+Patch115: qgtkstyle-no-gtk-crash.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle
%define check_config \
@@ -125,6 +126,7 @@
%patch112
%patch113
%patch114
+%patch115
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
# COMMON-END
@@ -256,16 +258,19 @@
%files -n libqt4-sql-unixODBC
%defattr(-,root,root,755)
%dir %plugindir/sqldrivers
+
%plugindir/sqldrivers/libqsqlodbc*.so
%files -n libqt4-sql-postgresql
%defattr(-,root,root,755)
%dir %plugindir/sqldrivers
+
%plugindir/sqldrivers/libqsqlpsql*.so
%files -n libqt4-sql-mysql
%defattr(-,root,root,755)
%dir %plugindir/sqldrivers
+
%plugindir/sqldrivers/libqsqlmysql*.so
%changelog
++++++ libqt4.spec ++++++
--- /var/tmp/diff_new_pack.vyfSbj/_old 2010-03-31 18:09:37.000000000 +0200
+++ /var/tmp/diff_new_pack.vyfSbj/_new 2010-03-31 18:09:37.000000000 +0200
@@ -54,7 +54,7 @@
Obsoletes: libqt4-dbus-1 < 4.4.0
# COMMON-VERSION-BEGIN
Version: 4.6.2
-Release: 1
+Release: 2
%define base_name libqt4
%define x11_free -everywhere-opensource-src-
%define rversion 4.6.2
@@ -92,6 +92,7 @@
Patch112: s390-qatomic-fixes.diff
Patch113: ppc64-webkit-link-fix.diff
Patch114: fix-sequence-error.diff
+Patch115: qgtkstyle-no-gtk-crash.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle
%define check_config \
@@ -143,6 +144,7 @@
%patch112
%patch113
%patch114
+%patch115
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
# COMMON-END
++++++ qgtkstyle-no-gtk-crash.diff ++++++
--- src/gui/styles/qgtkstyle.cpp
+++ src/gui/styles/qgtkstyle.cpp
@@ -3404,7 +3404,7 @@ QRect QGtkStyle::subElementRect(SubElement element, const QStyleOption *option,
case SE_ProgressBarGroove:
return option->rect;
case SE_PushButtonContents:
- if (!d->gtk_check_version(2, 10, 0)) {
+ if (d->isThemeAvailable() && !d->gtk_check_version(2, 10, 0)) {
GtkWidget *gtkButton = d->gtkWidget(QLS("GtkButton"));
GtkBorder *border = 0;
d->gtk_widget_style_get(gtkButton, "inner-border", &border, NULL);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libfm for openSUSE:Factory
checked in at Wed Mar 31 17:43:24 CEST 2010.
--------
--- libfm/libfm.changes 2010-03-19 20:03:51.000000000 +0100
+++ /mounts/work_src_done/STABLE/libfm/libfm.changes 2010-03-31 03:26:17.000000000 +0200
@@ -1,0 +2,18 @@
+Tue Mar 30 18:23:42 UTC 2010 - andrea(a)opensuse.org
+
+- Fix bnc#591731 (pcmanfm forgot to add '/' after IPs)
+- Fix sf#2978803 (severe file descriptor leaks in
+ thumbnail generating code)
+- Fix incorrect linker options for gnome-terminal wrapper
+
+-------------------------------------------------------------------
+Fri Mar 26 00:01:16 UTC 2010 - andrea(a)opensuse.org
+
+- removed rpath
+
+-------------------------------------------------------------------
+Wed Mar 24 08:16:39 UTC 2010 - andrea(a)opensuse.org
+
+- New git release, several SEGFAULT bug fixed
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libfm.spec ++++++
--- /var/tmp/diff_new_pack.dMaLQI/_old 2010-03-31 17:31:08.000000000 +0200
+++ /var/tmp/diff_new_pack.dMaLQI/_new 2010-03-31 17:31:08.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libfm (Version 0.1.9beta+git20100319)
+# spec file for package libfm (Version 0.1.9beta+git20100330)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,7 +20,7 @@
Name: libfm
Summary: A glib/gio-based lib used to develop file managers
-Version: 0.1.9beta+git20100319
+Version: 0.1.9beta+git20100330
Release: 1
License: GPLv2
Group: Development/Libraries/C and C++
@@ -94,6 +94,11 @@
--enable-demo \
--disable-static \
--enable-debug
+
+# remove rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
make %{?jobs:-j%{jobs}}
%install
++++++ libfm.tar.bz2 ++++++
++++ 4505 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package krusader for openSUSE:Factory
checked in at Wed Mar 31 17:30:25 CEST 2010.
--------
--- KDE/krusader/krusader.changes 2009-08-10 08:15:31.000000000 +0200
+++ /mounts/work_src_done/STABLE/krusader/krusader.changes 2010-03-28 20:56:52.000000000 +0200
@@ -1,0 +2,5 @@
+Sun Mar 28 18:55:38 UTC 2010 - javier(a)opensuse.org
+
+- added browse iso service menu
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
krusader_browse_iso.desktop
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ krusader.spec ++++++
--- /var/tmp/diff_new_pack.Tm2ll5/_old 2010-03-31 17:28:14.000000000 +0200
+++ /var/tmp/diff_new_pack.Tm2ll5/_new 2010-03-31 17:28:14.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package krusader (Version 2.0.0)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,11 +21,12 @@
Name: krusader
Version: 2.0.0
-Release: 3
-License: GPL v2 or later
+Release: 4
+License: GPLv2+
Group: Productivity/File utilities
Url: http://krusader.sourceforge.net/
Source: %{name}-%{version}.tar.bz2
+Source1: krusader_browse_iso.desktop
Patch: FIXME.diff
Patch1: krusader-gcc44.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -46,7 +47,7 @@
Rafi Yanai <krusader(a)users.sourceforge.net>
%package -n kio_iso
-License: GPL v2 or later
+License: GPLv2+
Group: System/GUI/KDE
Summary: KIO slave to access ISO images
Provides: kde4-kio_iso = 1.80.99
@@ -63,7 +64,7 @@
Szombathelyi Gygy <gyurco(a)users.sourceforge.net>
%package doc
-License: GPL v2 or later
+License: GPLv2+
Group: Productivity/File utilities
Summary: A File Manager
@@ -98,6 +99,8 @@
%suse_update_desktop_file krusader_root-mode FileManager Utility
%kde_post_install
%find_lang %{name}
+mkdir -p %{buildroot}%{_kde_share_dir}/services/ServiceMenus/
+cp %{SOURCE1} %{buildroot}%{_kde_share_dir}/services/ServiceMenus/
%fdupes %{buildroot}
%clean
@@ -123,6 +126,7 @@
%config %{_datadir}/kde4/config/kio_isorc
%{_kde4_modules}/kio_iso.so*
%{_kde_share_dir}/services/iso.protocol
+%{_kde_share_dir}/services/ServiceMenus/krusader_browse_iso.desktop
%files doc
%defattr(-,root,root)
++++++ krusader_browse_iso.desktop ++++++
[Desktop Entry]
Type=Service
ServiceTypes=KonqPopupMenu/Plugin
MimeType=application/x-cd-image;
Actions=Browse;
[Desktop Action Browse]
Name=Browse ISO
Name[de]=ISO durchsuchen
Name[es]=Examinar ISO
Icon=application-x-cd-image
Exec=dolphin iso:%U
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory
checked in at Wed Mar 31 17:27:35 CEST 2010.
--------
--- kernel-source/kernel-debug.changes 2010-02-25 20:10:49.000000000 +0100
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2010-03-30 07:00:17.000000000 +0200
@@ -1,0 +2,258 @@
+Mon Mar 29 21:26:55 CEST 2010 - jeffm(a)suse.de
+
+- patches.fixes/reiserfs-fix-locking-BUG-during-mount-failure:
+ reiserfs: Fix locking BUG during mount failure (bnc#591807).
+
+-------------------------------------------------------------------
+Mon Mar 29 19:57:49 CEST 2010 - jeffm(a)suse.de
+
+- Disabled MAX63XX_WATCHDOG on s390.
+
+-------------------------------------------------------------------
+Mon Mar 29 19:31:46 CEST 2010 - jeffm(a)suse.de
+
+- Update to 2.6.34-rc2-git3.
+ - Eliminated 1 patch.
+ - Fixed ps3 config.
+
+-------------------------------------------------------------------
+Mon Mar 29 18:53:20 CEST 2010 - jbeulich(a)novell.com
+
+- Update Xen patches to 2.6.34-rc2 and c/s 1007.
+- Update config files.
+- config.conf: Re-enable Xen configs.
+- patches.xen/xen-floppy: Xen: improve floppy behavior
+ (bnc#584216).
+- patches.xen/xen-vscsi-module-alias: allow pv scsi hba driver
+ to be loaded automatically.
+- patches.xen/xen-vusb-module-alias: allow pv usb hcd driver to
+ be loaded automatically (bnc#584213).
+
+-------------------------------------------------------------------
+Fri Mar 26 18:27:41 CET 2010 - jkosina(a)suse.cz
+
+- patches.fixes/hid-fix-gyration-oops.patch: HID: fix oops in
+ gyration_event() (bnc#589329).
+
+-------------------------------------------------------------------
+Thu Mar 25 23:01:11 CET 2010 - jack(a)suse.de
+
+- patches.fixes/novfs-fix-oops-in-scope-finding: novfs: fix an
+ oops in novfs scope-finding code (bnc#588579).
+
+-------------------------------------------------------------------
+Thu Mar 25 17:48:45 CET 2010 - jeffm(a)suse.de
+
+- patches.fixes/powerpc-fix-handling-of-strnlen-with-zero-len:
+ powerpc: fix handling of strnlen with zero len (bnc#582681).
+
+-------------------------------------------------------------------
+Tue Mar 23 16:22:37 CET 2010 - jeffm(a)suse.de
+
+- patches.drivers/lpfc-add-raywire-id: Delete.
+
+-------------------------------------------------------------------
+Tue Mar 23 16:17:52 CET 2010 - jeffm(a)suse.de
+
+- patches.suse/linux-2.6.29-kms-after-sata.patch: Refresh.
+
+-------------------------------------------------------------------
+Tue Mar 23 16:00:31 CET 2010 - jeffm(a)suse.de
+
+- patches.fixes/do_anonymous_page-race: Delete.
+
+-------------------------------------------------------------------
+Tue Mar 23 15:50:39 CET 2010 - jeffm(a)suse.de
+
+- patches.drivers/libata-prefer-over-ide: Delete.
+- patches.drivers/libata-ahci-aspire-3810t-noncq: Delete.
+- patches.drivers/libata-ata_piix-clear-spurious-IRQ: Delete.
+- patches.suse/block-add-mangle-devt-switch: Delete.
+
+-------------------------------------------------------------------
+Tue Mar 23 15:44:47 CET 2010 - jeffm(a)suse.de
+
+- patches.suse/apm_setup_UP.diff: Delete.
+
+-------------------------------------------------------------------
+Mon Mar 22 18:37:10 CET 2010 - jeffm(a)suse.de
+
+- patches.arch/ppc-efika-bestcomm-ata-dma.patch: Delete.
+- patches.arch/ppc-efika-mpc52xx-ac97.patch: Delete.
+- patches.arch/ppc-efika-psc-console-autodetection.patch: Delete.
+- patches.suse/suse-ppc32-mol-BIT: Delete.
+- patches.suse/suse-ppc32-mol-get-property: Delete.
+- patches.suse/suse-ppc32-mol-handle-mm-fault: Delete.
+- patches.suse/suse-ppc32-mol-ioctl: Delete.
+- patches.suse/suse-ppc32-mol-kbuild.patch: Delete.
+- patches.suse/suse-ppc32-mol-semaphore: Delete.
+- patches.suse/suse-ppc32-mol-sheep: Delete.
+- patches.suse/suse-ppc32-mol.patch: Delete.
+
+-------------------------------------------------------------------
+Mon Mar 22 18:17:00 CET 2010 - jeffm(a)suse.de
+
+- patches.fixes/dlm-enable-debug.patch: Delete.
+
+-------------------------------------------------------------------
+Mon Mar 22 18:16:39 CET 2010 - jeffm(a)suse.de
+
+- patches.fixes/ds1682-build-fix: Delete.
+
+-------------------------------------------------------------------
+Mon Mar 22 17:55:43 CET 2010 - jeffm(a)suse.de
+
+- patches.suse/kvm-as-kmp: Delete.
+
+-------------------------------------------------------------------
+Mon Mar 22 17:32:50 CET 2010 - jeffm(a)suse.de
+
+- patches.suse/xfs-dmapi-fix-incompatible-pointer-type-warning:
+ xfs/dmapi: fix incompatible pointer type warning.
+
+-------------------------------------------------------------------
+Sun Mar 21 23:30:01 CET 2010 - jeffm(a)suse.de
+
+- Updated to 2.6.34-rc2.
+ - Eliminated 4 patches.
+
+-------------------------------------------------------------------
+Fri Mar 19 17:33:27 CET 2010 - jbohac(a)suse.cz
+
+- set CONFIG_IPV6=y for all flavours (bnc#561611)
+
+-------------------------------------------------------------------
+Thu Mar 18 18:57:20 CET 2010 - jeffm(a)suse.de
+
+- Refreshed patch series.
+
+-------------------------------------------------------------------
+Wed Mar 17 16:51:34 CET 2010 - jeffm(a)suse.de
+
+- Updated to 2.6.34-rc1-git6.
+ - Eliminated 8 patches.
+
+-------------------------------------------------------------------
+Tue Mar 16 16:09:25 CET 2010 - mmarek(a)suse.cz
+
+- rpm/kernel-binary.spec.in: Remove Obsoletes: for 10.3 KMPs.
+
+-------------------------------------------------------------------
+Tue Mar 16 16:03:45 CET 2010 - mmarek(a)suse.cz
+
+- rpm/kernel-binary.spec.in: Move Obsoletes: msi-wmi-kmp to the
+ sle11-ga group and make the comment more explanatory.
+
+-------------------------------------------------------------------
+Tue Mar 16 14:14:05 CET 2010 - trenn(a)suse.de
+
+- rpm/kernel-binary.spec.in:
+ bnc#587578
+
+-------------------------------------------------------------------
+Thu Mar 11 16:39:36 CET 2010 - jeffm(a)suse.de
+
+- patches.rpmify/powerpc-mpc52xx-build-fix: powerpc: Build fix
+ for mpc52xx.
+
+-------------------------------------------------------------------
+Thu Mar 11 11:47:14 CET 2010 - knikanth(a)suse.de
+
+- patches.fixes/xfs-nonblocking-inode-locking-io-completion.patch:
+ Fix unintialized variable. Refresh.
+
+-------------------------------------------------------------------
+Wed Mar 10 22:14:03 CET 2010 - jeffm(a)suse.de
+
+- supported.conf: Added kernel/drivers/gpio/max730x, max7301 now
+ depends on it.
+
+-------------------------------------------------------------------
+Wed Mar 10 22:11:16 CET 2010 - jeffm(a)suse.de
+
+- Enabled CONFIG_DRM_RADEON_KMS; Matching KMS-enabled X.org has
+ been committed to Factory.
+
+-------------------------------------------------------------------
+Wed Mar 10 22:06:12 CET 2010 - jeffm(a)suse.de
+
+- patches.rpmify/powerpc-kvm-build-failure-workaround: powerpc:
+ kvm build failure workaround.
+
+-------------------------------------------------------------------
+Wed Mar 10 22:03:49 CET 2010 - jeffm(a)suse.de
+
+- patches.rpmify/powerpc-mpc52xx-build-fix: powerpc: Build fix
+ for mpc52xx.
+
+-------------------------------------------------------------------
+Wed Mar 10 21:07:27 CET 2010 - jeffm(a)suse.de
+
+- supported.conf: Added kernel/drivers/i2c/i2c-smbus, i2c-parport
+ now depends on it.
+
+-------------------------------------------------------------------
+Wed Mar 10 20:26:13 CET 2010 - mmarek(a)suse.cz
+
+- rpm/kernel-binary.spec.in: the dwarfextract package has been
++++ 68 more lines (skipped)
++++ between kernel-source/kernel-debug.changes
++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes
kernel-default.changes: same change
kernel-desktop.changes: same change
kernel-docs.changes: same change
kernel-ec2.changes: same change
kernel-pae.changes: same change
kernel-ppc64.changes: same change
kernel-ps3.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-trace.changes: same change
kernel-vanilla.changes: same change
kernel-vmi.changes: same change
kernel-xen.changes: same change
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.RATGgM/_old 2010-03-31 15:13:24.000000000 +0200
+++ /var/tmp/diff_new_pack.RATGgM/_new 2010-03-31 15:13:24.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-debug (Version 2.6.33)
+# spec file for package kernel-debug (Version 2.6.34)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.33
-%define patchversion 2.6.33
+%define patchversion 2.6.34-rc2-git3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -55,8 +55,8 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
-Version: 2.6.33
-Release: 5
+Version: 2.6.34
+Release: 1
%if %using_buildservice
%else
%endif
@@ -91,7 +91,7 @@
BuildRequires: python
%endif
%ifarch s390 s390x
-%if %build_vanilla
+%if %build_vanilla && 0%{?suse_version} < 1130
BuildRequires: dwarfextract
%endif
%endif
@@ -178,16 +178,13 @@
NoSource: 111
NoSource: 120
-# The following KMPs have been integrated into the kernel package.
+# The following KMPs have been integrated into the kernel package,
+# grouped by the last product that contained them.
# sles10 / 10.3
Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
-# 10.3
-Obsoletes: adm8211-kmp-%build_flavor
-Obsoletes: rt2x00-kmp-%build_flavor
-Obsoletes: rfswitch-kmp-%build_flavor
# 11.0
Obsoletes: atl2-kmp-%build_flavor
Obsoletes: wlan-ng-kmp-%build_flavor
@@ -202,6 +199,8 @@
Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: kvm-kmp-%build_flavor
Obsoletes: perfmon-kmp-%build_flavor
+Obsoletes: iwlagn-2-6-27-kmp-%build_flavor
+Obsoletes: msi-wmi-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
kernel-default.spec: same change
kernel-desktop.spec: same change
++++++ kernel-docs.spec ++++++
--- /var/tmp/diff_new_pack.RATGgM/_old 2010-03-31 15:13:25.000000000 +0200
+++ /var/tmp/diff_new_pack.RATGgM/_new 2010-03-31 15:13:25.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-docs (Version 2.6.33)
+# spec file for package kernel-docs (Version 2.6.34)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -21,13 +21,13 @@
Name: kernel-docs
BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel
-BuildRequires: kernel-source = 2.6.33
+BuildRequires: kernel-source = 2.6.34
Url: http://www.kernel.org/
License: GPLv2+
Group: Documentation/Man
AutoReqProv: on
-Version: 2.6.33
-Release: 5
+Version: 2.6.34
+Release: 1
%if %using_buildservice
%else
%endif
++++++ kernel-ec2.spec ++++++
--- /var/tmp/diff_new_pack.RATGgM/_old 2010-03-31 15:13:25.000000000 +0200
+++ /var/tmp/diff_new_pack.RATGgM/_new 2010-03-31 15:13:25.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-ec2 (Version 2.6.33)
+# spec file for package kernel-ec2 (Version 2.6.34)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.33
-%define patchversion 2.6.33
+%define patchversion 2.6.34-rc2-git3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -55,8 +55,8 @@
Name: kernel-ec2
Summary: The Amazon EC2 Xen Kernel
-Version: 2.6.33
-Release: 4
+Version: 2.6.34
+Release: 1
%if %using_buildservice
%else
%endif
@@ -91,7 +91,7 @@
BuildRequires: python
%endif
%ifarch s390 s390x
-%if %build_vanilla
+%if %build_vanilla && 0%{?suse_version} < 1130
BuildRequires: dwarfextract
%endif
%endif
@@ -174,16 +174,13 @@
NoSource: 111
NoSource: 120
-# The following KMPs have been integrated into the kernel package.
+# The following KMPs have been integrated into the kernel package,
+# grouped by the last product that contained them.
# sles10 / 10.3
Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
-# 10.3
-Obsoletes: adm8211-kmp-%build_flavor
-Obsoletes: rt2x00-kmp-%build_flavor
-Obsoletes: rfswitch-kmp-%build_flavor
# 11.0
Obsoletes: atl2-kmp-%build_flavor
Obsoletes: wlan-ng-kmp-%build_flavor
@@ -198,6 +195,8 @@
Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: kvm-kmp-%build_flavor
Obsoletes: perfmon-kmp-%build_flavor
+Obsoletes: iwlagn-2-6-27-kmp-%build_flavor
+Obsoletes: msi-wmi-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
++++++ kernel-pae.spec ++++++
--- /var/tmp/diff_new_pack.RATGgM/_old 2010-03-31 15:13:25.000000000 +0200
+++ /var/tmp/diff_new_pack.RATGgM/_new 2010-03-31 15:13:25.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-pae (Version 2.6.33)
+# spec file for package kernel-pae (Version 2.6.34)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.33
-%define patchversion 2.6.33
+%define patchversion 2.6.34-rc2-git3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -55,8 +55,8 @@
Name: kernel-pae
Summary: Kernel with PAE Support
-Version: 2.6.33
-Release: 5
+Version: 2.6.34
+Release: 1
%if %using_buildservice
%else
%endif
@@ -91,7 +91,7 @@
BuildRequires: python
%endif
%ifarch s390 s390x
-%if %build_vanilla
+%if %build_vanilla && 0%{?suse_version} < 1130
BuildRequires: dwarfextract
%endif
%endif
@@ -178,16 +178,13 @@
NoSource: 111
NoSource: 120
-# The following KMPs have been integrated into the kernel package.
+# The following KMPs have been integrated into the kernel package,
+# grouped by the last product that contained them.
# sles10 / 10.3
Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
-# 10.3
-Obsoletes: adm8211-kmp-%build_flavor
-Obsoletes: rt2x00-kmp-%build_flavor
-Obsoletes: rfswitch-kmp-%build_flavor
# 11.0
Obsoletes: atl2-kmp-%build_flavor
Obsoletes: wlan-ng-kmp-%build_flavor
@@ -202,6 +199,8 @@
Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: kvm-kmp-%build_flavor
Obsoletes: perfmon-kmp-%build_flavor
+Obsoletes: iwlagn-2-6-27-kmp-%build_flavor
+Obsoletes: msi-wmi-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
kernel-ppc64.spec: same change
kernel-ps3.spec: same change
kernel-s390.spec: same change
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.RATGgM/_old 2010-03-31 15:13:25.000000000 +0200
+++ /var/tmp/diff_new_pack.RATGgM/_new 2010-03-31 15:13:25.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-source (Version 2.6.33)
+# spec file for package kernel-source (Version 2.6.34)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,7 +19,7 @@
# icecream 0
%define srcversion 2.6.33
-%define patchversion 2.6.33
+%define patchversion 2.6.34-rc2-git3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -30,8 +30,8 @@
Name: kernel-source
Summary: The Linux Kernel Sources
-Version: 2.6.33
-Release: 5
+Version: 2.6.34
+Release: 1
%if %using_buildservice
%else
%endif
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.RATGgM/_old 2010-03-31 15:13:25.000000000 +0200
+++ /var/tmp/diff_new_pack.RATGgM/_new 2010-03-31 15:13:25.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-syms (Version 2.6.33)
+# spec file for package kernel-syms (Version 2.6.34)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -23,8 +23,8 @@
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
-Version: 2.6.33
-Release: 5
+Version: 2.6.34
+Release: 1
%if %using_buildservice
%else
%define kernel_source_release %(LC_ALL=C rpm -q kernel-source%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)
++++++ kernel-trace.spec ++++++
--- /var/tmp/diff_new_pack.RATGgM/_old 2010-03-31 15:13:25.000000000 +0200
+++ /var/tmp/diff_new_pack.RATGgM/_new 2010-03-31 15:13:25.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-trace (Version 2.6.33)
+# spec file for package kernel-trace (Version 2.6.34)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.33
-%define patchversion 2.6.33
+%define patchversion 2.6.34-rc2-git3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -55,8 +55,8 @@
Name: kernel-trace
Summary: The Realtime Linux Kernel
-Version: 2.6.33
-Release: 5
+Version: 2.6.34
+Release: 1
%if %using_buildservice
%else
%endif
@@ -91,7 +91,7 @@
BuildRequires: python
%endif
%ifarch s390 s390x
-%if %build_vanilla
+%if %build_vanilla && 0%{?suse_version} < 1130
BuildRequires: dwarfextract
%endif
%endif
@@ -186,16 +186,13 @@
NoSource: 111
NoSource: 120
-# The following KMPs have been integrated into the kernel package.
+# The following KMPs have been integrated into the kernel package,
+# grouped by the last product that contained them.
# sles10 / 10.3
Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
-# 10.3
-Obsoletes: adm8211-kmp-%build_flavor
-Obsoletes: rt2x00-kmp-%build_flavor
-Obsoletes: rfswitch-kmp-%build_flavor
# 11.0
Obsoletes: atl2-kmp-%build_flavor
Obsoletes: wlan-ng-kmp-%build_flavor
@@ -210,6 +207,8 @@
Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: kvm-kmp-%build_flavor
Obsoletes: perfmon-kmp-%build_flavor
+Obsoletes: iwlagn-2-6-27-kmp-%build_flavor
+Obsoletes: msi-wmi-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
kernel-vanilla.spec: same change
kernel-vmi.spec: same change
++++++ kernel-xen.spec ++++++
--- /var/tmp/diff_new_pack.RATGgM/_old 2010-03-31 15:13:25.000000000 +0200
+++ /var/tmp/diff_new_pack.RATGgM/_new 2010-03-31 15:13:25.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-xen (Version 2.6.33)
+# spec file for package kernel-xen (Version 2.6.34)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.33
-%define patchversion 2.6.33
+%define patchversion 2.6.34-rc2-git3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -55,8 +55,8 @@
Name: kernel-xen
Summary: The Xen Kernel
-Version: 2.6.33
-Release: 4
+Version: 2.6.34
+Release: 1
%if %using_buildservice
%else
%endif
@@ -91,7 +91,7 @@
BuildRequires: python
%endif
%ifarch s390 s390x
-%if %build_vanilla
+%if %build_vanilla && 0%{?suse_version} < 1130
BuildRequires: dwarfextract
%endif
%endif
@@ -174,16 +174,13 @@
NoSource: 111
NoSource: 120
-# The following KMPs have been integrated into the kernel package.
+# The following KMPs have been integrated into the kernel package,
+# grouped by the last product that contained them.
# sles10 / 10.3
Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
-# 10.3
-Obsoletes: adm8211-kmp-%build_flavor
-Obsoletes: rt2x00-kmp-%build_flavor
-Obsoletes: rfswitch-kmp-%build_flavor
# 11.0
Obsoletes: atl2-kmp-%build_flavor
Obsoletes: wlan-ng-kmp-%build_flavor
@@ -198,6 +195,8 @@
Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: kvm-kmp-%build_flavor
Obsoletes: perfmon-kmp-%build_flavor
+Obsoletes: iwlagn-2-6-27-kmp-%build_flavor
+Obsoletes: msi-wmi-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
++++++ config.tar.bz2 ++++++
++++ 24106 lines of diff (skipped)
++++++ kernel-binary.spec.in ++++++
--- /var/tmp/diff_new_pack.RATGgM/_old 2010-03-31 15:13:25.000000000 +0200
+++ /var/tmp/diff_new_pack.RATGgM/_new 2010-03-31 15:13:25.000000000 +0200
@@ -92,7 +92,7 @@
BuildRequires: python
%endif
%ifarch s390 s390x
-%if %build_vanilla
+%if %build_vanilla && 0%{?suse_version} < 1130
BuildRequires: dwarfextract
%endif
%endif
@@ -176,16 +176,13 @@
NoSource: 111
NoSource: 120
-# The following KMPs have been integrated into the kernel package.
+# The following KMPs have been integrated into the kernel package,
+# grouped by the last product that contained them.
# sles10 / 10.3
Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
-# 10.3
-Obsoletes: adm8211-kmp-%build_flavor
-Obsoletes: rt2x00-kmp-%build_flavor
-Obsoletes: rfswitch-kmp-%build_flavor
# 11.0
Obsoletes: atl2-kmp-%build_flavor
Obsoletes: wlan-ng-kmp-%build_flavor
@@ -200,6 +197,8 @@
Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: kvm-kmp-%build_flavor
Obsoletes: perfmon-kmp-%build_flavor
+Obsoletes: iwlagn-2-6-27-kmp-%build_flavor
+Obsoletes: msi-wmi-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
++++++ minmem ++++++
--- /var/tmp/diff_new_pack.RATGgM/_old 2010-03-31 15:13:26.000000000 +0200
+++ /var/tmp/diff_new_pack.RATGgM/_new 2010-03-31 15:13:26.000000000 +0200
@@ -1 +1 @@
-2096000
+1048576
++++++ needed_space_in_mb ++++++
--- /var/tmp/diff_new_pack.RATGgM/_old 2010-03-31 15:13:26.000000000 +0200
+++ /var/tmp/diff_new_pack.RATGgM/_new 2010-03-31 15:13:26.000000000 +0200
@@ -1 +1 @@
-6000
+6144
++++++ patches.apparmor.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-add-temporary-declaration-for-vfsmount_lock new/patches.apparmor/apparmor-add-temporary-declaration-for-vfsmount_lock
--- old/patches.apparmor/apparmor-add-temporary-declaration-for-vfsmount_lock 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.apparmor/apparmor-add-temporary-declaration-for-vfsmount_lock 2010-03-18 18:58:09.000000000 +0100
@@ -0,0 +1,27 @@
+From: Jeff Mahoney <jeffm(a)suse.com>
+Subject: apparmor: add temporary declaration for vfsmount_lock
+Patch-mainline: Never
+
+ vfsmount_lock was moved to fs/internal.h in 2.6.34-rc1.
+
+ Until d_namespace_path is cleaned up, we'll need to keep a reference to it.
+
+Signed-off-by: Jeff Mahoney <jeffm(a)suse.com>
+Acked-by: Jeff Mahoney <jeffm(a)suse.com>
+---
+ security/apparmor/path.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/security/apparmor/path.c
++++ b/security/apparmor/path.c
+@@ -84,6 +84,10 @@ int aa_get_name(struct path *path, int i
+ return error;
+ }
+
++/* Only needed until d_namespace_path is cleaned up and doesn't use
++ * vfsmount_lock anymore. -jeffm */
++extern spinlock_t vfsmount_lock;
++
+ int d_namespace_path(struct path *path, char *buf, int buflen, char **name)
+ {
+ struct path root, tmp, ns_root = { };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-allow-truncation-of-deleted-files new/patches.apparmor/apparmor-allow-truncation-of-deleted-files
--- old/patches.apparmor/apparmor-allow-truncation-of-deleted-files 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-allow-truncation-of-deleted-files 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: Allow truncation of deleted files
Git-commit: dae3fe8b3f624c5dd48716899dd45bd9a76320a9
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: Whenever AppArmor is upstream
AppArmor: AppArmor disallows truncate of deleted files.
@@ -33,11 +34,9 @@
security/apparmor/path.c | 4 ++++
1 file changed, 4 insertions(+)
-diff --git a/security/apparmor/path.c b/security/apparmor/path.c
-index 85897e0..2c14e1d 100644
--- a/security/apparmor/path.c
+++ b/security/apparmor/path.c
-@@ -121,6 +121,10 @@ int d_namespace_path(struct path *path, char *buf, int buflen, char **name)
+@@ -121,6 +121,10 @@ int d_namespace_path(struct path *path,
* strip it.
*/
buf[buflen - 11] = 0; /* - (len(" (deleted)") +\0) */
@@ -48,4 +47,3 @@
} else if (!IS_ROOT(path->dentry) && d_unhashed(path->dentry)) {
error = -ENOENT;
#if 0
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-check-for-network-in-interrupt-and-work-around new/patches.apparmor/apparmor-check-for-network-in-interrupt-and-work-around
--- old/patches.apparmor/apparmor-check-for-network-in-interrupt-and-work-around 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-check-for-network-in-interrupt-and-work-around 2010-03-18 18:58:09.000000000 +0100
@@ -30,7 +30,7 @@
static inline void aa_free_net_rules(struct aa_net *new)
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
-@@ -570,8 +570,8 @@ static int apparmor_socket_create(int fa
+@@ -571,8 +571,8 @@ static int apparmor_socket_create(int fa
profile = aa_current_profile();
if (profile)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-correct-mapping-of-file-permissions new/patches.apparmor/apparmor-correct-mapping-of-file-permissions
--- old/patches.apparmor/apparmor-correct-mapping-of-file-permissions 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-correct-mapping-of-file-permissions 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: Correct mapping of file permissions.
Git-commit: 0fbb67a37fc861aa10d9072f315b0e6674be2456
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: not yet
AppArmor: Correct mapping of file permissions.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-ensure-apparmor-enabled-parmater-is-off-if-apparmor-fails-to-initialize new/patches.apparmor/apparmor-ensure-apparmor-enabled-parmater-is-off-if-apparmor-fails-to-initialize
--- old/patches.apparmor/apparmor-ensure-apparmor-enabled-parmater-is-off-if-apparmor-fails-to-initialize 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-ensure-apparmor-enabled-parmater-is-off-if-apparmor-fails-to-initialize 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: ensure apparmor enabled parmater is off if AppArmor fails to initialize.
Git-commit: c68fe02f4a1a9daf53effdef1971a5ae2436d8b0
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: not yet, whenever AppArmor is upstream
AppArmor: ensure apparmor enabled parmater is off if AppArmor fails to initialize.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-explicitly-include-header-files-to-allow-apparmor-to-build-on-powerpc new/patches.apparmor/apparmor-explicitly-include-header-files-to-allow-apparmor-to-build-on-powerpc
--- old/patches.apparmor/apparmor-explicitly-include-header-files-to-allow-apparmor-to-build-on-powerpc 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-explicitly-include-header-files-to-allow-apparmor-to-build-on-powerpc 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: Explicitly include header files to allow apparmor to build on powerpc
Git-commit: 3cfaf52bf1c251f5b88230392e841cc4f9f16a21
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: not yet, whenever AppArmor is upstream
AppArmor: Explicitly include header files to allow apparmor to build on powerpc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fix-argument-size-missmatch-on-64-bit-builds new/patches.apparmor/apparmor-fix-argument-size-missmatch-on-64-bit-builds
--- old/patches.apparmor/apparmor-fix-argument-size-missmatch-on-64-bit-builds 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fix-argument-size-missmatch-on-64-bit-builds 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: fix argument size missmatch on 64 bit builds
Git-commit: fa557cce4bfa8f71b0c3c7546151e0edabf7456a
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: not yet, whenever AppArmor is upstream
AppArmor: fix argument size missmatch on 64 bit builds
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fix-auditing-of-domain-transitions-to-include-target-profile-information new/patches.apparmor/apparmor-fix-auditing-of-domain-transitions-to-include-target-profile-information
--- old/patches.apparmor/apparmor-fix-auditing-of-domain-transitions-to-include-target-profile-information 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fix-auditing-of-domain-transitions-to-include-target-profile-information 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: fix auditing of domain transitions to include target profile information
Git-commit: 75da64947c8ca56439c1b9145962ce515fc178ff
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: not yet, whenever AppArmor is upstream
AppArmor: fix auditing of domain transitions to include target profile information
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fix-build-failure-on-ia64 new/patches.apparmor/apparmor-fix-build-failure-on-ia64
--- old/patches.apparmor/apparmor-fix-build-failure-on-ia64 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fix-build-failure-on-ia64 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: fix build failure on ia64
Git-commit: f33ea46ede948ed04f91c273ecf85c4b54d1299c
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: not yet, whenever AppArmor is upstream
AppArmor: fix build failure on ia64
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fix-c99-violation new/patches.apparmor/apparmor-fix-c99-violation
--- old/patches.apparmor/apparmor-fix-c99-violation 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fix-c99-violation 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: fix C99 violation
Git-commit: 071c722a14e00e5c9bcd5516017a6f4889075e13
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: not yet, whenever AppArmor is upstream
AppArmor: fix C99 violation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fix-cap-audit_caching-preemption-disabling new/patches.apparmor/apparmor-fix-cap-audit_caching-preemption-disabling
--- old/patches.apparmor/apparmor-fix-cap-audit_caching-preemption-disabling 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fix-cap-audit_caching-preemption-disabling 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: Fix cap audit_caching preemption disabling
Git-commit: 10180dca43970cd1bebf88248c1ad63ab7521c7a
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: Whenever AppArmor is upstream
AppArmor: Fix cap audit_caching preemption disabling
@@ -21,11 +22,9 @@
security/apparmor/capability.c | 1 +
1 file changed, 1 insertion(+)
-diff --git a/security/apparmor/capability.c b/security/apparmor/capability.c
-index 65b91cf..5bb2eca 100644
--- a/security/apparmor/capability.c
+++ b/security/apparmor/capability.c
-@@ -72,6 +72,7 @@ static int aa_audit_caps(struct aa_profile *profile, struct aa_audit_caps *sa)
+@@ -72,6 +72,7 @@ static int aa_audit_caps(struct aa_profi
/* Do simple duplicate message elimination */
ent = &get_cpu_var(audit_cache);
if (sa->base.task == ent->task && cap_raised(ent->caps, sa->cap)) {
@@ -33,4 +32,3 @@
if (PROFILE_COMPLAIN(profile))
return 0;
return sa->base.error;
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fix-change_profile-failing-lpn401931 new/patches.apparmor/apparmor-fix-change_profile-failing-lpn401931
--- old/patches.apparmor/apparmor-fix-change_profile-failing-lpn401931 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fix-change_profile-failing-lpn401931 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: Fix change_profile failing lpn401931
Git-commit: db344220ea9cfabde6d37dbe1cf6e2f9731b84cf
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: not yet, whenever AppArmor is upstream
AppArmor: Fix change_profile failing lpn401931
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fix-change_profile-failure new/patches.apparmor/apparmor-fix-change_profile-failure
--- old/patches.apparmor/apparmor-fix-change_profile-failure 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fix-change_profile-failure 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: Fix change_profile failure
Git-commit: 0189ce8a96793ead8eb77d60e22d9166630b6c84
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: not yet, whenever AppArmor is upstream
AppArmor: Fix change_profile failure
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fix-determination-of-forced-audit-messages new/patches.apparmor/apparmor-fix-determination-of-forced-audit-messages
--- old/patches.apparmor/apparmor-fix-determination-of-forced-audit-messages 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fix-determination-of-forced-audit-messages 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: Fix determination of forced AUDIT messages.
Git-commit: 8ee7a29dc712f2fc9ad477ec32324a75e2b920cf
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: not yet, whenever AppArmor is upstream
AppArmor: Fix determination of forced AUDIT messages.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fix-failure-to-audit-change_hat-correctly new/patches.apparmor/apparmor-fix-failure-to-audit-change_hat-correctly
--- old/patches.apparmor/apparmor-fix-failure-to-audit-change_hat-correctly 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fix-failure-to-audit-change_hat-correctly 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: fix failure to audit change_hat correctly
Git-commit: 505784955a55972a76c9984535dc0c1b31f7e0ab
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: Whenever AppArmor is upstream
AppArmor: fix failure to audit change_hat correctly
@@ -25,11 +26,9 @@
security/apparmor/domain.c | 61 ++++++++++++++++++++++++---------------------
1 file changed, 33 insertions(+), 28 deletions(-)
-diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
-index 464f236..cdf9d00 100644
--- a/security/apparmor/domain.c
+++ b/security/apparmor/domain.c
-@@ -525,15 +525,16 @@ int aa_change_hat(const char *hat_name, u64 token, int permtest)
+@@ -525,15 +525,16 @@ int aa_change_hat(const char *hat_name,
struct aa_task_context *cxt;
struct aa_profile *profile, *previous_profile, *hat = NULL;
struct aa_audit_file sa;
@@ -47,7 +46,7 @@
if (!profile) {
sa.base.info = "unconfined";
-@@ -542,32 +543,36 @@ int aa_change_hat(const char *hat_name, u64 token, int permtest)
+@@ -542,32 +543,36 @@ int aa_change_hat(const char *hat_name,
}
if (hat_name) {
@@ -99,7 +98,7 @@
}
sa.base.error = aa_may_change_ptraced_domain(current, hat);
-@@ -579,27 +584,27 @@ int aa_change_hat(const char *hat_name, u64 token, int permtest)
+@@ -579,27 +584,27 @@ int aa_change_hat(const char *hat_name,
if (!permtest) {
sa.base.error = aa_set_current_hat(hat, token);
@@ -139,4 +138,3 @@
return sa.base.error;
}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fix-file-auditing-when-quiet-is-used new/patches.apparmor/apparmor-fix-file-auditing-when-quiet-is-used
--- old/patches.apparmor/apparmor-fix-file-auditing-when-quiet-is-used 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fix-file-auditing-when-quiet-is-used 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: Fix file auditing when quiet is used
Git-commit: 0a844e068d06adf0bd62e82302c24d0bf953209f
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: Whenever AppArmor is upstream
AppArmor: Fix file auditing when quiet is used
@@ -17,11 +18,9 @@
security/apparmor/file.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
-diff --git a/security/apparmor/file.c b/security/apparmor/file.c
-index 16d2f56..f27bae6 100644
--- a/security/apparmor/file.c
+++ b/security/apparmor/file.c
-@@ -139,18 +139,17 @@ int aa_audit_file(struct aa_profile *profile, struct aa_audit_file *sa)
+@@ -139,18 +139,17 @@ int aa_audit_file(struct aa_profile *pro
return 0;
type = AUDIT_APPARMOR_AUDIT;
} else {
@@ -46,4 +45,3 @@
if (!sa->request)
return PROFILE_COMPLAIN(profile) ? 0 : sa->base.error;
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fix-leak-when-profile-transition-table-fails-unpack new/patches.apparmor/apparmor-fix-leak-when-profile-transition-table-fails-unpack
--- old/patches.apparmor/apparmor-fix-leak-when-profile-transition-table-fails-unpack 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fix-leak-when-profile-transition-table-fails-unpack 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: Fix leak when profile transition table fails unpack
Git-commit: 65ed2e80434928de94d7ada01a6ab17d3cf3458b
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: Whenever AppArmor is upstream
Fix leak when profile transition table fails unpack
@@ -20,11 +21,9 @@
security/apparmor/policy_interface.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
-diff --git a/security/apparmor/policy_interface.c b/security/apparmor/policy_interface.c
-index 68e87cd..7609354 100644
--- a/security/apparmor/policy_interface.c
+++ b/security/apparmor/policy_interface.c
-@@ -376,6 +376,7 @@ static int aa_unpack_trans_table(struct aa_ext *e, struct aa_profile *profile)
+@@ -376,6 +376,7 @@ static int aa_unpack_trans_table(struct
if (!profile->file.trans.table)
goto fail;
@@ -32,7 +31,7 @@
for (i = 0; i < size; i++) {
char *tmp;
if (!aa_is_dynstring(e, &tmp, NULL))
-@@ -389,11 +390,15 @@ static int aa_unpack_trans_table(struct aa_ext *e, struct aa_profile *profile)
+@@ -389,11 +390,15 @@ static int aa_unpack_trans_table(struct
goto fail;
if (!aa_is_nameX(e, AA_STRUCTEND, NULL))
goto fail;
@@ -49,4 +48,3 @@
e->pos = pos;
return 0;
}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fix-mapping-of-pux-to-new-internal-permission-format new/patches.apparmor/apparmor-fix-mapping-of-pux-to-new-internal-permission-format
--- old/patches.apparmor/apparmor-fix-mapping-of-pux-to-new-internal-permission-format 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fix-mapping-of-pux-to-new-internal-permission-format 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: Fix mapping of pux to new internal permission format
Git-commit: 936afb68ec447026a201ff7210d6d15dace0c4b3
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: not yet, whenever AppArmor is upstream
AppArmor: Fix mapping of pux to new internal permission format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fix-mediation-of-created-paths-that-look-like-deleted-paths new/patches.apparmor/apparmor-fix-mediation-of-created-paths-that-look-like-deleted-paths
--- old/patches.apparmor/apparmor-fix-mediation-of-created-paths-that-look-like-deleted-paths 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fix-mediation-of-created-paths-that-look-like-deleted-paths 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: Fix mediation of created paths that look like "deleted" paths
Git-commit: d3ed63523f31c0c88335ad2da246f98a153d6080
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: Whenever AppArmor is upstream
AppArmor: Fix mediation of created paths that look like "deleted" paths
@@ -23,11 +24,9 @@
security/apparmor/path.c | 11 +++++++++++
1 file changed, 11 insertions(+)
-diff --git a/security/apparmor/path.c b/security/apparmor/path.c
-index 21f3e67..85897e0 100644
--- a/security/apparmor/path.c
+++ b/security/apparmor/path.c
-@@ -110,6 +110,17 @@ int d_namespace_path(struct path *path, char *buf, int buflen, char **name)
+@@ -110,6 +110,17 @@ int d_namespace_path(struct path *path,
if (IS_ERR(res)) {
error = PTR_ERR(res);
*name = buf;
@@ -45,4 +44,3 @@
} else if (!IS_ROOT(path->dentry) && d_unhashed(path->dentry)) {
error = -ENOENT;
#if 0
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fix-null-pointer-dereference-oops-in-profile-attachment new/patches.apparmor/apparmor-fix-null-pointer-dereference-oops-in-profile-attachment
--- old/patches.apparmor/apparmor-fix-null-pointer-dereference-oops-in-profile-attachment 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fix-null-pointer-dereference-oops-in-profile-attachment 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: Fix NULL pointer dereference oops in profile attachment.
Git-commit: a7e0ec31e0d98c3559b36f8a7eba5237cb61dc33
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: not yet, whenever AppArmor is upstream
AppArmor: Fix NULL pointer dereference oops in profile attachment.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fix-oops-after-profile-removal new/patches.apparmor/apparmor-fix-oops-after-profile-removal
--- old/patches.apparmor/apparmor-fix-oops-after-profile-removal 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fix-oops-after-profile-removal 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: Fix oops after profile removal
Git-commit: 2dcff6eb51fffae61811a05c1c63cf7960f416e0
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: Whenever AppArmor is upstream
AppArmor: Fix oops after profile removal
@@ -24,11 +25,9 @@
security/apparmor/policy.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
-diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
-index b709c30..e2bc9e5 100644
--- a/security/apparmor/policy.c
+++ b/security/apparmor/policy.c
-@@ -322,7 +322,7 @@ void __aa_remove_profile(struct aa_profile *profile,
+@@ -322,7 +322,7 @@ void __aa_remove_profile(struct aa_profi
if (replacement)
profile->replacedby = aa_get_profile(replacement);
else
@@ -37,7 +36,7 @@
list_del_init(&profile->base.list);
if (!(profile->flags & PFLAG_NO_LIST_REF))
aa_put_profile(profile);
-@@ -541,7 +541,7 @@ void free_aa_profile(struct aa_profile *profile)
+@@ -541,7 +541,7 @@ void free_aa_profile(struct aa_profile *
aa_free_sid(profile->sid);
aa_match_free(profile->xmatch);
@@ -46,7 +45,7 @@
aa_put_profile(profile->replacedby);
memset(profile, 0, sizeof(profile));
-@@ -715,13 +715,7 @@ struct aa_profile *aa_sys_find_attach(struct aa_policy_common *base,
+@@ -715,13 +715,7 @@ struct aa_profile *aa_sys_find_attach(st
struct aa_profile *aa_profile_newest(struct aa_profile *profile)
{
if (unlikely(profile && profile->replacedby)) {
@@ -61,4 +60,3 @@
}
return profile;
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fix-oops-in-auditing-of-the-policy-interface-offset new/patches.apparmor/apparmor-fix-oops-in-auditing-of-the-policy-interface-offset
--- old/patches.apparmor/apparmor-fix-oops-in-auditing-of-the-policy-interface-offset 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fix-oops-in-auditing-of-the-policy-interface-offset 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: Fix oops in auditing of the policy interface offset
Git-commit: d3531cf696017fb410eeacd7655a85969901faab
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: not yet, whenever AppArmor is upstream
AppArmor: Fix oops in auditing of the policy interface offset
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fix-oops-in-profile-listing-and-display-full-list new/patches.apparmor/apparmor-fix-oops-in-profile-listing-and-display-full-list
--- old/patches.apparmor/apparmor-fix-oops-in-profile-listing-and-display-full-list 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fix-oops-in-profile-listing-and-display-full-list 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: Fix OOPS in profile listing, and display full list
Git-commit: 76a750c89ed2a89efa9fcd240526e6a06b61c559
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: not yet, whenever AppArmor is upstream
AppArmor: Fix OOPS in profile listing, and display full list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fix-oops-when-auditing-the-addition-of-profile-namespace new/patches.apparmor/apparmor-fix-oops-when-auditing-the-addition-of-profile-namespace
--- old/patches.apparmor/apparmor-fix-oops-when-auditing-the-addition-of-profile-namespace 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fix-oops-when-auditing-the-addition-of-profile-namespace 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: Fix oops when auditing the addition of profile namespace
Git-commit: 1904739da9a248a341b90560dae94159b4b3cc94
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: not yet, whenever AppArmor is upstream
AppArmor: Fix oops when auditing the addition of profile namespace
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fix-oops-when-in-apparmor_bprm_set_creds new/patches.apparmor/apparmor-fix-oops-when-in-apparmor_bprm_set_creds
--- old/patches.apparmor/apparmor-fix-oops-when-in-apparmor_bprm_set_creds 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fix-oops-when-in-apparmor_bprm_set_creds 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: Fix Oops when in apparmor_bprm_set_creds
Git-commit: f5217539d5f2dcc100a8e470f0ec407ae4bbaca3
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: Whenever AppArmor is upstream
AppArmor: Fix Oops when in apparmor_bprm_set_creds
@@ -28,11 +29,9 @@
security/apparmor/domain.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
-index cdf9d00..b091fd9 100644
--- a/security/apparmor/domain.c
+++ b/security/apparmor/domain.c
-@@ -248,7 +248,7 @@ int apparmor_bprm_set_creds(struct linux_binprm *bprm)
+@@ -248,7 +248,7 @@ int apparmor_bprm_set_creds(struct linux
sa.base.error = aa_get_name(&bprm->file->f_path, 0, &buffer,
(char **) &sa.name);
if (sa.base.error) {
@@ -41,4 +40,3 @@
sa.base.error = 0;
sa.base.info = "Exec failed name resolution";
sa.name = bprm->filename;
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fix-operator-precidence-issue-in-as_path_link new/patches.apparmor/apparmor-fix-operator-precidence-issue-in-as_path_link
--- old/patches.apparmor/apparmor-fix-operator-precidence-issue-in-as_path_link 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fix-operator-precidence-issue-in-as_path_link 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: fix operator precidence issue in as_path_link
Git-commit: 14af2d3f28b70768e8b804cb2a09637ab555ed79
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: not yet, whenever AppArmor is upstream
AppArmor: fix operator precidence issue in as_path_link
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fix-profile-attachment-for-regexp-based-profile-names new/patches.apparmor/apparmor-fix-profile-attachment-for-regexp-based-profile-names
--- old/patches.apparmor/apparmor-fix-profile-attachment-for-regexp-based-profile-names 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fix-profile-attachment-for-regexp-based-profile-names 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: Fix profile attachment for regexp based profile names
Git-commit: 65b8e01962b45fecf622e01096a588fce29e973f
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: not yet, whenever AppArmor is upstream
AppArmor: Fix profile attachment for regexp based profile names
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fix-profile-namespace-removal new/patches.apparmor/apparmor-fix-profile-namespace-removal
--- old/patches.apparmor/apparmor-fix-profile-namespace-removal 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fix-profile-namespace-removal 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: Fix profile namespace removal.
Git-commit: f63a3351411c9008147132ac7bb88b835c92fc4a
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: not yet, whenever AppArmor is upstream
AppArmor: Fix profile namespace removal.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fix-refcounting-bug-causing-leak-of-creds-and-oops new/patches.apparmor/apparmor-fix-refcounting-bug-causing-leak-of-creds-and-oops
--- old/patches.apparmor/apparmor-fix-refcounting-bug-causing-leak-of-creds-and-oops 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fix-refcounting-bug-causing-leak-of-creds-and-oops 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: Fix refcounting bug causing leak of creds and oops
Git-commit: ec785e5388eeb615f89cb386ad07099119050984
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: Whenever AppArmor is upstream
AppArmor: Fix refcounting bug causing leak of creds and oops
@@ -33,11 +34,9 @@
security/apparmor/domain.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
-diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
-index b091fd9..497176f 100644
--- a/security/apparmor/domain.c
+++ b/security/apparmor/domain.c
-@@ -64,11 +64,13 @@ static int aa_may_change_ptraced_domain(struct task_struct *task,
+@@ -64,11 +64,13 @@ static int aa_may_change_ptraced_domain(
cred = aa_get_task_policy(tracer, &tracerp);
rcu_read_unlock();
@@ -54,4 +53,3 @@
return error;
}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fix-security_ops-task_setrlimit-api-use new/patches.apparmor/apparmor-fix-security_ops-task_setrlimit-api-use
--- old/patches.apparmor/apparmor-fix-security_ops-task_setrlimit-api-use 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fix-security_ops-task_setrlimit-api-use 2010-03-18 18:58:09.000000000 +0100
@@ -1,5 +1,6 @@
From: Jeff Mahoney <jeffm(a)suse.com>
Subject: AppArmor: Fix security_ops->task_setrlimit API use
+Patch-mainline: not yet, whenever AppArmor is upstream
Linux 2.6.32 changed the task_setrlimit security_operation to
take a task_struct. This patch adds the argument to AppArmor's
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-fully-close-race-condition-for-deleted-paths new/patches.apparmor/apparmor-fully-close-race-condition-for-deleted-paths
--- old/patches.apparmor/apparmor-fully-close-race-condition-for-deleted-paths 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-fully-close-race-condition-for-deleted-paths 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: Fully close race condition for deleted paths
Git-commit: 3dc2836574f209e7de447c1451f0c1c326cacadf
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: Whenever AppArmor is upstream
Fully close race condition for deleted paths
@@ -26,11 +27,9 @@
security/apparmor/path.c | 31 ++++++++++++++++++++++---------
1 file changed, 22 insertions(+), 9 deletions(-)
-diff --git a/security/apparmor/path.c b/security/apparmor/path.c
-index 2c14e1d..a48b5f4 100644
--- a/security/apparmor/path.c
+++ b/security/apparmor/path.c
-@@ -88,6 +88,7 @@ int d_namespace_path(struct path *path, char *buf, int buflen, char **name)
+@@ -88,6 +88,7 @@ int d_namespace_path(struct path *path,
{
struct path root, tmp, ns_root = { };
char *res;
@@ -38,7 +37,7 @@
int error = 0;
read_lock(¤t->fs->lock);
-@@ -101,8 +102,12 @@ int d_namespace_path(struct path *path, char *buf, int buflen, char **name)
+@@ -101,8 +102,12 @@ int d_namespace_path(struct path *path,
ns_root.dentry = dget(ns_root.mnt->mnt_root);
spin_unlock(&vfsmount_lock);
spin_lock(&dcache_lock);
@@ -53,7 +52,7 @@
*name = res;
/* handle error conditions - and still allow a partial path to
-@@ -110,8 +115,21 @@ int d_namespace_path(struct path *path, char *buf, int buflen, char **name)
+@@ -110,8 +115,21 @@ int d_namespace_path(struct path *path,
if (IS_ERR(res)) {
error = PTR_ERR(res);
*name = buf;
@@ -77,7 +76,7 @@
* to the security_path hooks as a deleted
* dentry except without an inode allocated.
*
-@@ -120,11 +138,6 @@ int d_namespace_path(struct path *path, char *buf, int buflen, char **name)
+@@ -120,11 +138,6 @@ int d_namespace_path(struct path *path,
* is guarenteed to be added in this case, so just
* strip it.
*/
@@ -89,4 +88,3 @@
} else if (!IS_ROOT(path->dentry) && d_unhashed(path->dentry)) {
error = -ENOENT;
#if 0
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-missing-unlock new/patches.apparmor/apparmor-missing-unlock
--- old/patches.apparmor/apparmor-missing-unlock 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-missing-unlock 2010-03-18 18:58:09.000000000 +0100
@@ -2,6 +2,7 @@
From: John Johansen <john.johansen(a)canonical.com>
Date: Mon, 9 Nov 2009 23:40:49 -0800
Subject: AppArmor: Add missing unlock to next_profile
+Patch-mainline: not yet, whenever AppArmor is upstream
There is a missing read_unlock in the while loop in next_profile.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-policy-load-and-replacement-can-fail-to-alloc-mem new/patches.apparmor/apparmor-policy-load-and-replacement-can-fail-to-alloc-mem
--- old/patches.apparmor/apparmor-policy-load-and-replacement-can-fail-to-alloc-mem 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-policy-load-and-replacement-can-fail-to-alloc-mem 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: Policy load and replacement can fail to alloc mem
Git-commit: 1ab7b3e6235ae47dfc5ba403c4bc3a664b6f8d8e
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: Whenever AppArmor is upstream
AppArmor: Policy load and replacement can fail to alloc mem
@@ -25,8 +26,6 @@
security/apparmor/match.c | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
-diff --git a/security/apparmor/match.c b/security/apparmor/match.c
-index a22d106..1a50309 100644
--- a/security/apparmor/match.c
+++ b/security/apparmor/match.c
@@ -12,9 +12,11 @@
@@ -57,7 +56,7 @@
static struct table_header *unpack_table(void *blob, size_t bsize)
{
struct table_header *table = NULL;
-@@ -46,6 +56,8 @@ static struct table_header *unpack_table(void *blob, size_t bsize)
+@@ -46,6 +56,8 @@ static struct table_header *unpack_table
goto out;
table = kmalloc(tsize, GFP_KERNEL);
@@ -66,7 +65,7 @@
if (table) {
*table = th;
if (th.td_flags == YYTD_DATA8)
-@@ -110,7 +122,7 @@ int unpack_dfa(struct aa_dfa *dfa, void *blob, size_t size)
+@@ -110,7 +122,7 @@ int unpack_dfa(struct aa_dfa *dfa, void
goto fail;
break;
default:
@@ -75,7 +74,7 @@
goto fail;
}
-@@ -122,7 +134,7 @@ int unpack_dfa(struct aa_dfa *dfa, void *blob, size_t size)
+@@ -122,7 +134,7 @@ int unpack_dfa(struct aa_dfa *dfa, void
fail:
for (i = 0; i < ARRAY_SIZE(dfa->tables); i++) {
@@ -93,4 +92,3 @@
}
kfree(dfa);
}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-return-the-correct-error-codes-on-profile-addition-removal new/patches.apparmor/apparmor-return-the-correct-error-codes-on-profile-addition-removal
--- old/patches.apparmor/apparmor-return-the-correct-error-codes-on-profile-addition-removal 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-return-the-correct-error-codes-on-profile-addition-removal 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: Return the correct error codes on profile addition/removal
Git-commit: 34cc2391cf122ca80627ac7f81d51a88801e3024
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: not yet, whenever AppArmor is upstream
AppArmor: Return the correct error codes on profile addition/removal
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-revert-reporting-of-create-to-write-permission new/patches.apparmor/apparmor-revert-reporting-of-create-to-write-permission
--- old/patches.apparmor/apparmor-revert-reporting-of-create-to-write-permission 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-revert-reporting-of-create-to-write-permission 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: revert reporting of create to write permission.
Git-commit: 5258c0234f53bcf1fc9b2f548835b11535b58135
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: not yet, whenever AppArmor is upstream
AppArmor: revert reporting of create to write permission.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-security-module new/patches.apparmor/apparmor-security-module
--- old/patches.apparmor/apparmor-security-module 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-security-module 2010-03-18 18:58:09.000000000 +0100
@@ -3,6 +3,7 @@
Subject: AppArmor security module
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
Git-commit: 7f6c37ebb481bd6353e50b5f8f37c10a2aa58bcf
+Patch-mainline: Whenever AppArmor is upstream
AppArmor security module
@@ -81,7 +82,7 @@
#define AUDIT_ANOM_PROMISCUOUS 1700 /* Device changed promiscuous mode */
--- a/security/Kconfig
+++ b/security/Kconfig
-@@ -171,6 +171,7 @@ config LSM_MMAP_MIN_ADDR
+@@ -140,6 +140,7 @@ config LSM_MMAP_MIN_ADDR
source security/selinux/Kconfig
source security/smack/Kconfig
source security/tomoyo/Kconfig
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-turn-auditing-of-ptrace-on new/patches.apparmor/apparmor-turn-auditing-of-ptrace-on
--- old/patches.apparmor/apparmor-turn-auditing-of-ptrace-on 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/apparmor-turn-auditing-of-ptrace-on 2010-03-18 18:58:09.000000000 +0100
@@ -4,6 +4,7 @@
Subject: AppArmor: Turn auditing of ptrace on
Git-commit: 6866f5f0b4ac80ec6a5f48b24568f0f9591d1832
Git-Repo: git://kernel.ubuntu.com/jj/apparmor-mainline.git AppArmor-2.4
+Patch-mainline: not yet
AppArmor: Turn auditing of ptrace on
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/ptrace_may_access-fix new/patches.apparmor/ptrace_may_access-fix
--- old/patches.apparmor/ptrace_may_access-fix 2010-02-09 22:55:24.000000000 +0100
+++ new/patches.apparmor/ptrace_may_access-fix 2010-03-18 18:58:09.000000000 +0100
@@ -1,5 +1,6 @@
From: Jeff Mahoney <jeffm(a)suse.com>
Subject: apparmor: ptrace_may_access -> ptrace_access_check
+Patch-mainline: not yet, whenever AppArmor is upstream
This patch adjusts to a security_operations API change in the 2.6.32 kernel.
++++++ patches.arch.tar.bz2 ++++++
++++ 4135 lines of diff (skipped)
++++++ patches.drivers.tar.bz2 ++++++
++++ 4840 lines of diff (skipped)
++++++ patches.fixes.tar.bz2 ++++++
++++ 2514 lines of diff (skipped)
++++++ patches.kernel.org.tar.bz2 ++++++
kernel-source/patches.kernel.org.tar.bz2 /mounts/work_src_done/STABLE/kernel-source/patches.kernel.org.tar.bz2 differ: char 11, line 1
++++++ patches.rpmify.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/buildhost new/patches.rpmify/buildhost
--- old/patches.rpmify/buildhost 2010-02-24 20:02:37.000000000 +0100
+++ new/patches.rpmify/buildhost 2010-03-18 18:58:09.000000000 +0100
@@ -1,5 +1,6 @@
From: Andreas Gruenbacher <agruen(a)suse.de>
Subject: Hide the build hostname
+Patch-mainline: Never, SuSE-specific
Instead of the real build host and user name, use "buildhost.suse.de"
and "geeko".
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/cloneconfig.diff new/patches.rpmify/cloneconfig.diff
--- old/patches.rpmify/cloneconfig.diff 2010-02-24 20:02:37.000000000 +0100
+++ new/patches.rpmify/cloneconfig.diff 2010-03-18 18:58:09.000000000 +0100
@@ -1,5 +1,6 @@
From: Andreas Gruenbacher <agruen(a)suse.de>
Subject: Add ``cloneconfig'' target
+Patch-mainline: not yet
Cloneconfig takes the first configuration it finds which appears
to belong to the running kernel, and configures the kernel sources
@@ -12,7 +13,7 @@
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
-@@ -95,6 +95,22 @@ allnoconfig: $(obj)/conf
+@@ -106,6 +106,22 @@ allnoconfig: $(obj)/conf
allmodconfig: $(obj)/conf
$< -m $(Kconfig)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/dmar-fix-section-mismatch new/patches.rpmify/dmar-fix-section-mismatch
--- old/patches.rpmify/dmar-fix-section-mismatch 2010-02-24 20:02:37.000000000 +0100
+++ new/patches.rpmify/dmar-fix-section-mismatch 2010-03-18 18:58:09.000000000 +0100
@@ -1,5 +1,8 @@
From: Jeff Mahoney <jeffm(a)suse.com>
Subject: dmar: Fix section mismatch
+Patch-mainline: Next linux-next sync
+Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
+Git-commit: 0b8973a81876d90f916507ac40d1381068dc986a
dmar_ir_support uses dmar_tbl, which is __initdata. dmar_ir_support is
only called by intr_remapping_supported, which is __init. So, we mark
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/firmware-path new/patches.rpmify/firmware-path
--- old/patches.rpmify/firmware-path 2010-02-24 20:02:37.000000000 +0100
+++ new/patches.rpmify/firmware-path 2010-03-18 18:58:09.000000000 +0100
@@ -1,5 +1,6 @@
From: Jeff Mahoney <jeffm(a)suse.com>
Subject: [PATCH] firmware: Allow release-specific firmware dir
+Patch-mainline: not yet
Every kernel package trying to provide files under /lib/firmware runs
into problems really quickly with multiple kernels installed.
@@ -14,7 +15,7 @@
--- a/Makefile
+++ b/Makefile
-@@ -1067,7 +1067,7 @@ depend dep:
+@@ -1028,7 +1028,7 @@ depend dep:
# ---------------------------------------------------------------------------
# Firmware install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/ftrace-fix-ftrace_event_call-alignment-for-use-with-gcc-4-5 new/patches.rpmify/ftrace-fix-ftrace_event_call-alignment-for-use-with-gcc-4-5
--- old/patches.rpmify/ftrace-fix-ftrace_event_call-alignment-for-use-with-gcc-4-5 2010-02-24 20:02:37.000000000 +0100
+++ new/patches.rpmify/ftrace-fix-ftrace_event_call-alignment-for-use-with-gcc-4-5 1970-01-01 01:00:00.000000000 +0100
@@ -1,79 +0,0 @@
-From: Jeff Mahoney <jeffm(a)suse.com>
-Subject: ftrace: fix ftrace_event_call alignment for use with gcc 4.5
-References: bnc#582222
-Patch-mainline: Submitted 24 Feb 2010
-
- GCC 4.5 introduced behavior that forces the alignment of structures to
- use the largest possible value. The default value is 32 bytes, so if
- some structures are defined with a 4-byte alignment and others aren't
- declared with an alignment constraint at all - it will align at 32-bytes.
-
- For things like the ftrace events, this results in a non-standard array.
- When initializing the ftrace subsystem, we traverse the _ftrace_events
- section and call the initialization callback for each event. When the
- structures are misaligned, we could be treating another part of the
- structure (or the zeroed out space between them) as a function pointer.
-
- This patch forces the alignment for all the ftrace_event_call structures
- to 4 bytes.
-
- Without this patch, the kernel fails to boot very early when built with
- gcc 4.5.
-
- It's trivial to check the alignment of the members of the array, so it
- might be worthwhile to add something to the build system to do that
- automatically.
-
-Signed-off-by: Jeff Mahoney <jeffm(a)suse.com>
----
- include/linux/syscalls.h | 6 ++++--
- include/trace/ftrace.h | 3 ++-
- kernel/trace/trace.h | 3 ++-
- 3 files changed, 8 insertions(+), 4 deletions(-)
-
---- a/include/linux/syscalls.h
-+++ b/include/linux/syscalls.h
-@@ -132,7 +132,8 @@ struct perf_event_attr;
-
- #define SYSCALL_TRACE_ENTER_EVENT(sname) \
- static const struct syscall_metadata __syscall_meta_##sname; \
-- static struct ftrace_event_call event_enter_##sname; \
-+ static struct ftrace_event_call \
-+ __attribute__((__aligned__(4))) event_enter_##sname; \
- static struct trace_event enter_syscall_print_##sname = { \
- .trace = print_syscall_enter, \
- }; \
-@@ -154,7 +155,8 @@ struct perf_event_attr;
-
- #define SYSCALL_TRACE_EXIT_EVENT(sname) \
- static const struct syscall_metadata __syscall_meta_##sname; \
-- static struct ftrace_event_call event_exit_##sname; \
-+ static struct ftrace_event_call \
-+ __attribute__((__aligned__(4)))event_exit_##sname; \
- static struct trace_event exit_syscall_print_##sname = { \
- .trace = print_syscall_exit, \
- }; \
---- a/include/trace/ftrace.h
-+++ b/include/trace/ftrace.h
-@@ -65,7 +65,8 @@
- };
- #undef DEFINE_EVENT
- #define DEFINE_EVENT(template, name, proto, args) \
-- static struct ftrace_event_call event_##name
-+ static struct ftrace_event_call \
-+ __attribute__((__aligned__(4))) event_##name
-
- #undef DEFINE_EVENT_PRINT
- #define DEFINE_EVENT_PRINT(template, name, proto, args, print) \
---- a/kernel/trace/trace.h
-+++ b/kernel/trace/trace.h
-@@ -791,7 +791,8 @@ extern const char *__stop___trace_bprint
-
- #undef FTRACE_ENTRY
- #define FTRACE_ENTRY(call, struct_name, id, tstruct, print) \
-- extern struct ftrace_event_call event_##call;
-+ extern struct ftrace_event_call \
-+ __attribute__((__aligned__(4))) event_##call;
- #undef FTRACE_ENTRY_DUP
- #define FTRACE_ENTRY_DUP(call, struct_name, id, tstruct, print) \
- FTRACE_ENTRY(call, struct_name, id, PARAMS(tstruct), PARAMS(print))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/hpsa-fix-section-mismatch new/patches.rpmify/hpsa-fix-section-mismatch
--- old/patches.rpmify/hpsa-fix-section-mismatch 2010-02-24 20:02:37.000000000 +0100
+++ new/patches.rpmify/hpsa-fix-section-mismatch 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-From: Jeff Mahoney <jeffm(a)suse.com>
-Subject: hpsa: Fix section mismatch
-
- hpsa_pci_init calls hpsa_interrupt_mode which is a __devinit function.
- hpsa_pci_init is only called by hpsa_init_one which is also __devinit, so
- mark it __devinit as well.
-
-Signed-off-by: Jeff Mahoney <jeffm(a)suse.com>
----
- drivers/scsi/hpsa.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/scsi/hpsa.c
-+++ b/drivers/scsi/hpsa.c
-@@ -3111,7 +3111,7 @@ default_int_mode:
- return;
- }
-
--static int hpsa_pci_init(struct ctlr_info *h, struct pci_dev *pdev)
-+static int __devinit hpsa_pci_init(struct ctlr_info *h, struct pci_dev *pdev)
- {
- ushort subsystem_vendor_id, subsystem_device_id, command;
- __u32 board_id, scratchpad = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/ia64-mca-fix-cast-from-integer-to-pointer-warning new/patches.rpmify/ia64-mca-fix-cast-from-integer-to-pointer-warning
--- old/patches.rpmify/ia64-mca-fix-cast-from-integer-to-pointer-warning 2010-02-24 20:02:37.000000000 +0100
+++ new/patches.rpmify/ia64-mca-fix-cast-from-integer-to-pointer-warning 2010-03-18 18:58:09.000000000 +0100
@@ -1,5 +1,6 @@
From: Jeff Mahoney <jeffm(a)suse.com>
Subject: ia64/mca: Fix cast from integer to pointer warning
+Patch-mainline: not yet
__get_free_pages() returns an unsigned long that is the address of the
pages returned. ia64_mca_cpu_init wants to use it as a data pointer, so
@@ -12,7 +13,7 @@
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
-@@ -1958,7 +1958,8 @@ ia64_mca_cpu_init(void *cpu_data)
+@@ -1858,7 +1858,8 @@ ia64_mca_cpu_init(void *cpu_data)
data = mca_bootmem();
first_time = 0;
} else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/otus-fix-assignment-makes-integer-from-pointer-without-a-cast-warnings new/patches.rpmify/otus-fix-assignment-makes-integer-from-pointer-without-a-cast-warnings
--- old/patches.rpmify/otus-fix-assignment-makes-integer-from-pointer-without-a-cast-warnings 2010-02-24 20:02:37.000000000 +0100
+++ new/patches.rpmify/otus-fix-assignment-makes-integer-from-pointer-without-a-cast-warnings 1970-01-01 01:00:00.000000000 +0100
@@ -1,60 +0,0 @@
-From: Jeff Mahoney <jeffm(a)suse.com>
-Subject: otus: fix assignment makes integer from pointer without a cast warnings
-
- This patch fixes some %x pointer printing to %p.
-
- It also uses the skb_tail_pointer and skb_mac_header macros for accessing
- thos members.
-
-Signed-off-by: Jeff Mahoney <jeffm(a)suse.com>
----
- drivers/staging/otus/usbdrv.c | 4 ++--
- drivers/staging/otus/wrap_pkt.c | 10 ++--------
- 2 files changed, 4 insertions(+), 10 deletions(-)
-
---- a/drivers/staging/otus/usbdrv.c
-+++ b/drivers/staging/otus/usbdrv.c
-@@ -829,7 +829,7 @@ int zfLnxRegisterVapDev(struct net_devic
- {
- /* Allocate net device structure */
- vap[vapId].dev = alloc_etherdev(0);
-- printk("Register vap dev=%x\n", (u32_t)vap[vapId].dev);
-+ printk("Register vap dev=%p\n", vap[vapId].dev);
-
- if(vap[vapId].dev == NULL) {
- printk("alloc_etherdev fail\n");
-@@ -883,7 +883,7 @@ int zfLnxUnregisterVapDev(struct net_dev
- printk("Unregister VAP dev : %s\n", vap[vapId].dev->name);
-
- if(vap[vapId].dev != NULL) {
-- printk("Unregister vap dev=%x\n", (u32_t)vap[vapId].dev);
-+ printk("Unregister vap dev=%p\n", vap[vapId].dev);
- //
- //unregister_netdevice(wds[wdsId].dev);
- unregister_netdev(vap[vapId].dev);
---- a/drivers/staging/otus/wrap_pkt.c
-+++ b/drivers/staging/otus/wrap_pkt.c
-@@ -58,7 +58,7 @@ void zfLnxRecv80211(zdev_t *dev, zbuf_t
- skb1 = skb_copy(buf, GFP_ATOMIC);
- if (skb1 != NULL) {
- skb1->dev = dev;
-- skb1->mac_header = skb1->data;
-+ skb_reset_mac_header(skb1);
- skb1->ip_summed = CHECKSUM_NONE;
- skb1->pkt_type = PACKET_OTHERHOST;
- /* ETH_P_80211_RAW */
-@@ -85,13 +85,7 @@ void zfLnxRecvEth(zdev_t *dev, zbuf_t *b
- /* new_buf = dev_alloc_skb(2048); */
- new_buf = dev_alloc_skb(buf->len);
-
--#ifdef NET_SKBUFF_DATA_USES_OFFSET
-- new_buf->tail = 0;
-- new_buf->len = 0;
--#else
-- new_buf->tail = new_buf->data;
-- new_buf->len = 0;
--#endif
-+ skb_reset_tail_pointer(new_buf);
-
- skb_put(new_buf, buf->len);
- memcpy(new_buf->data, buf->data, buf->len);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/powerpc-kvm-build-failure-workaround new/patches.rpmify/powerpc-kvm-build-failure-workaround
--- old/patches.rpmify/powerpc-kvm-build-failure-workaround 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.rpmify/powerpc-kvm-build-failure-workaround 2010-03-18 18:58:09.000000000 +0100
@@ -0,0 +1,31 @@
+From: Jeff Mahoney <jeffm(a)suse.com>
+Subject: powerpc: kvm build failure workaround
+Patch-mainline: Hopefully never
+
+ This patch works around an issue with gcc 4.5 that is failing the build
+ with:
+ arch/powerpc/kvm/book3s.c:1102:23: error: 'ext_bkp.vrsave' may be used uninitialized in this function
+
+ The warning is incorrect, so we work around it by explicitly setting it to
+ 0.
+
+Signed-off-by: Jeff Mahoney <jeffm(a)suse.com>
+---
+ arch/powerpc/kvm/book3s.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/arch/powerpc/kvm/book3s.c
++++ b/arch/powerpc/kvm/book3s.c
+@@ -1104,6 +1104,12 @@ int __kvmppc_vcpu_run(struct kvm_run *kv
+ bool save_vsx = current->thread.used_vsr;
+ ulong ext_msr;
+
++#ifdef CONFIG_ALTIVEC
++ /* JDM This is functionally unnecessary but works around an
++ * over-eager unintialized usage checker in gcc 4.5 */
++ ext_bkp.vrsave = current->thread.vrsave;
++#endif
++
+ /* No need to go into the guest when all we do is going out */
+ if (signal_pending(current)) {
+ kvm_run->exit_reason = KVM_EXIT_INTR;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/ppc-crashdump-typefix new/patches.rpmify/ppc-crashdump-typefix
--- old/patches.rpmify/ppc-crashdump-typefix 2010-02-24 20:02:37.000000000 +0100
+++ new/patches.rpmify/ppc-crashdump-typefix 2010-03-18 18:58:09.000000000 +0100
@@ -1,5 +1,6 @@
From: Jeff Mahoney <jeffm(a)suse.com>
Subject: powerpc: use min_t in copy_oldmem_page
+Patch-mainline: not yet
The gcc used in Factory considers the comparison of csize and PAGE_SIZE
to be invalid and causes a build failure. This patch forces it to use size_t.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/rpm-kernel-config new/patches.rpmify/rpm-kernel-config
--- old/patches.rpmify/rpm-kernel-config 2010-02-24 20:02:37.000000000 +0100
+++ new/patches.rpmify/rpm-kernel-config 2010-03-18 18:58:09.000000000 +0100
@@ -1,5 +1,6 @@
From: Andreas Gruenbacher <agruen(a)suse.de>
Subject: Add the CONFIG_SUSE_KERNEL option
+Patch-mainline: Never, SuSE-specific
CONFIG_SUSE_KERNEL is set automatically in our config files. It must
still be added in kconfig so that the option does not disappear
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/rt2860-fix-section-mismatches new/patches.rpmify/rt2860-fix-section-mismatches
--- old/patches.rpmify/rt2860-fix-section-mismatches 2010-02-24 20:02:37.000000000 +0100
+++ new/patches.rpmify/rt2860-fix-section-mismatches 1970-01-01 01:00:00.000000000 +0100
@@ -1,36 +0,0 @@
-From: Jeff Mahoney <jeffm(a)suse.com>
-Subject: rt2860: Fix section mismatch
-
- rtusb_probe calls rt2870_probe which is marked __devinit. Since
- rtusb_probe is only called as rtusb_driver->probe, it's safe to mark it
- as __devinit also.
-
-Signed-off-by: Jeff Mahoney <jeffm(a)suse.com>
----
- drivers/staging/rt2860/usb_main_dev.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/drivers/staging/rt2860/usb_main_dev.c
-+++ b/drivers/staging/rt2860/usb_main_dev.c
-@@ -216,8 +216,8 @@ static int rt2870_suspend(struct usb_int
- static int rt2870_resume(struct usb_interface *intf);
- #endif /* CONFIG_PM // */
-
--static int rtusb_probe(struct usb_interface *intf,
-- const struct usb_device_id *id);
-+static int __devinit rtusb_probe(struct usb_interface *intf,
-+ const struct usb_device_id *id);
- static void rtusb_disconnect(struct usb_interface *intf);
-
- static BOOLEAN USBDevConfigInit(IN struct usb_device *dev,
-@@ -296,8 +296,8 @@ static BOOLEAN USBDevConfigInit(IN struc
-
- }
-
--static int rtusb_probe(struct usb_interface *intf,
-- const struct usb_device_id *id)
-+static int __devinit rtusb_probe(struct usb_interface *intf,
-+ const struct usb_device_id *id)
- {
- struct rt_rtmp_adapter *pAd;
- struct usb_device *dev;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/rt2860-use-skb_tail_pointer new/patches.rpmify/rt2860-use-skb_tail_pointer
--- old/patches.rpmify/rt2860-use-skb_tail_pointer 2010-02-24 20:02:37.000000000 +0100
+++ new/patches.rpmify/rt2860-use-skb_tail_pointer 1970-01-01 01:00:00.000000000 +0100
@@ -1,67 +0,0 @@
-From: Jeff Mahoney <jeffm(a)suse.com>
-Subject: rt2860: Use skb_tail_pointer
-
- rt2860 uses skb->tail directly. This patch uses the tail pointer macros
- instead.
-
-Signed-off-by: Jeff Mahoney <jeffm(a)suse.com>
----
- drivers/staging/rt2860/rt_linux.c | 10 +++++-----
- drivers/staging/rt2860/rt_linux.h | 4 ++--
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
---- a/drivers/staging/rt2860/rt_linux.c
-+++ b/drivers/staging/rt2860/rt_linux.c
-@@ -462,9 +462,9 @@ void *duplicate_pkt(struct rt_rtmp_adapt
- if ((skb =
- __dev_alloc_skb(HdrLen + DataSize + 2, MEM_ALLOC_FLAG)) != NULL) {
- skb_reserve(skb, 2);
-- NdisMoveMemory(skb->tail, pHeader802_3, HdrLen);
-+ NdisMoveMemory(skb_tail_pointer(skb), pHeader802_3, HdrLen);
- skb_put(skb, HdrLen);
-- NdisMoveMemory(skb->tail, pData, DataSize);
-+ NdisMoveMemory(skb_tail_pointer(skb), pData, DataSize);
- skb_put(skb, DataSize);
- skb->dev = get_netdev_from_bssid(pAd, FromWhichBSSID);
- pPacket = OSPKT_TO_RTPKT(skb);
-@@ -515,7 +515,7 @@ void *ClonePacket(struct rt_rtmp_adapter
- pClonedPkt->dev = pRxPkt->dev;
- pClonedPkt->data = pData;
- pClonedPkt->len = DataSize;
-- pClonedPkt->tail = pClonedPkt->data + pClonedPkt->len;
-+ skb_set_tail_pointer(pClonedPkt, DataSize)
- ASSERT(DataSize < 1530);
- }
- return pClonedPkt;
-@@ -535,7 +535,7 @@ void update_os_packet_info(struct rt_rtm
- pOSPkt->dev = get_netdev_from_bssid(pAd, FromWhichBSSID);
- pOSPkt->data = pRxBlk->pData;
- pOSPkt->len = pRxBlk->DataSize;
-- pOSPkt->tail = pOSPkt->data + pOSPkt->len;
-+ skb_set_tail_pointer(pOSPkt, pOSPkt->len);
- }
-
- void wlan_802_11_to_802_3_packet(struct rt_rtmp_adapter *pAd,
-@@ -553,7 +553,7 @@ void wlan_802_11_to_802_3_packet(struct
- pOSPkt->dev = get_netdev_from_bssid(pAd, FromWhichBSSID);
- pOSPkt->data = pRxBlk->pData;
- pOSPkt->len = pRxBlk->DataSize;
-- pOSPkt->tail = pOSPkt->data + pOSPkt->len;
-+ skb_set_tail_pointer(pOSPkt, pOSPkt->len);
-
- /* */
- /* copy 802.3 header */
---- a/drivers/staging/rt2860/rt_linux.h
-+++ b/drivers/staging/rt2860/rt_linux.h
-@@ -658,9 +658,9 @@ void linux_pci_unmap_single(void *handle
- (RTPKT_TO_OSPKT(_pkt)->len) = (_len)
-
- #define GET_OS_PKT_DATATAIL(_pkt) \
-- (RTPKT_TO_OSPKT(_pkt)->tail)
-+ (skb_tail_pointer(RTPKT_TO_OSPKT(_pkt))
- #define SET_OS_PKT_DATATAIL(_pkt, _start, _len) \
-- ((RTPKT_TO_OSPKT(_pkt))->tail) = (u8 *)((_start) + (_len))
-+ (skb_set_tail_pointer(RTPKT_TO_OSPKT(_pkt), _len))
-
- #define GET_OS_PKT_HEAD(_pkt) \
- (RTPKT_TO_OSPKT(_pkt)->head)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/rtl8192e-fix-section-mismatches new/patches.rpmify/rtl8192e-fix-section-mismatches
--- old/patches.rpmify/rtl8192e-fix-section-mismatches 2010-02-24 20:02:37.000000000 +0100
+++ new/patches.rpmify/rtl8192e-fix-section-mismatches 1970-01-01 01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-From: Jeff Mahoney <jeffm(a)suse.com>
-Subject: rtl8192e: Fix section mismatches
-
- The following functions are all called during the failure path in
- module initialization so can't be marked __exit.
-
-Signed-off-by: Jeff Mahoney <jeffm(a)suse.com>
----
-
- drivers/staging/rtl8192e/ieee80211/ieee80211_crypt.c | 2 +-
- drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_ccmp.c | 2 +-
- drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_tkip.c | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/drivers/staging/rtl8192e/ieee80211/ieee80211_crypt.c
-+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_crypt.c
-@@ -225,7 +225,7 @@ out:
- }
-
-
--void __exit ieee80211_crypto_deinit(void)
-+void ieee80211_crypto_deinit(void)
- {
- struct list_head *ptr, *n;
-
---- a/drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_ccmp.c
-+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_ccmp.c
-@@ -519,7 +519,7 @@ int __init ieee80211_crypto_ccmp_init(vo
- }
-
-
--void __exit ieee80211_crypto_ccmp_exit(void)
-+void ieee80211_crypto_ccmp_exit(void)
- {
- ieee80211_unregister_crypto_ops(&ieee80211_crypt_ccmp);
- }
---- a/drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_tkip.c
-+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_tkip.c
-@@ -1011,7 +1011,7 @@ int __init ieee80211_crypto_tkip_init(vo
- }
-
-
--void __exit ieee80211_crypto_tkip_exit(void)
-+void ieee80211_crypto_tkip_exit(void)
- {
- ieee80211_unregister_crypto_ops(&ieee80211_crypt_tkip);
- }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/rtl8192e-use-skb_tail_pointer new/patches.rpmify/rtl8192e-use-skb_tail_pointer
--- old/patches.rpmify/rtl8192e-use-skb_tail_pointer 2010-02-24 20:02:37.000000000 +0100
+++ new/patches.rpmify/rtl8192e-use-skb_tail_pointer 1970-01-01 01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-From: Jeff Mahoney <jeffm(a)suse.com>
-Subject: rtl8192e: Use skb_tail_pointer
-
- rtl8192e uses skb->tail directly. This patch uses the tail pointer macros
- instead.
-
-Signed-off-by: Jeff Mahoney <jeffm(a)suse.com>
----
- drivers/staging/rtl8192e/r8192E_core.c | 5 ++---
- drivers/staging/rtl8192e/r819xE_cmdpkt.c | 2 +-
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
---- a/drivers/staging/rtl8192e/r8192E_core.c
-+++ b/drivers/staging/rtl8192e/r8192E_core.c
-@@ -1575,7 +1575,7 @@ static short rtl8192_alloc_rx_desc_ring(
- return 0;
- priv->rx_buf[i] = skb;
- mapping = (dma_addr_t *)skb->cb;
-- *mapping = pci_map_single(priv->pdev, skb->tail,//skb_tail_pointer(skb),
-+ *mapping = pci_map_single(priv->pdev, skb_tail_pointer(skb),
- priv->rxbuffersize, PCI_DMA_FROMDEVICE);
-
- entry->BufferAddress = cpu_to_le32(*mapping);
-@@ -5806,8 +5806,7 @@ static void rtl8192_rx(struct net_device
-
- skb = new_skb;
- priv->rx_buf[priv->rx_idx] = skb;
-- *((dma_addr_t *) skb->cb) = pci_map_single(priv->pdev, skb->tail, priv->rxbuffersize, PCI_DMA_FROMDEVICE);
--// *((dma_addr_t *) skb->cb) = pci_map_single(priv->pdev, skb_tail_pointer(skb), priv->rxbuffersize, PCI_DMA_FROMDEVICE);
-+ *((dma_addr_t *) skb->cb) = pci_map_single(priv->pdev, skb_tail_pointer(skb), priv->rxbuffersize, PCI_DMA_FROMDEVICE);
- }
-
- }
---- a/drivers/staging/rtl8192e/r819xE_cmdpkt.c
-+++ b/drivers/staging/rtl8192e/r819xE_cmdpkt.c
-@@ -135,7 +135,7 @@ RT_STATUS cmpk_message_handle_tx(
- * Transform from little endian to big endian
- * and pending zero
- */
-- seg_ptr = skb->tail;
-+ seg_ptr = skb_tail_pointer(skb);
- for(i=0 ; i < frag_length; i+=4) {
- *seg_ptr++ = ((i+0)<frag_length)?code_virtual_address[i+3]:0;
- *seg_ptr++ = ((i+1)<frag_length)?code_virtual_address[i+2]:0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/rtl8192u-dont-use-mhard-float new/patches.rpmify/rtl8192u-dont-use-mhard-float
--- old/patches.rpmify/rtl8192u-dont-use-mhard-float 2010-02-24 20:02:37.000000000 +0100
+++ new/patches.rpmify/rtl8192u-dont-use-mhard-float 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-From: Jeff Mahoney <jeffm(a)suse.com>
-Subject: rtl8192u: don't use -mhard-float
-
- rtl8192u uses -mhard-float, which doesn't exist on ia64. Since in-kernel
- floating-point isn't allowed, this is implied anyway.
-
-Signed-off-by: Jeff Mahoney <jeffm(a)suse.com>
----
- drivers/staging/rtl8192u/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/staging/rtl8192u/Makefile
-+++ b/drivers/staging/rtl8192u/Makefile
-@@ -3,7 +3,7 @@ NIC_SELECT = RTL8192U
- EXTRA_CFLAGS += -std=gnu89
- EXTRA_CFLAGS += -O2
-
--EXTRA_CFLAGS += -mhard-float -DCONFIG_FORCE_HARD_FLOAT=y
-+EXTRA_CFLAGS += -DCONFIG_FORCE_HARD_FLOAT=y
- EXTRA_CFLAGS += -DJACKSON_NEW_8187 -DJACKSON_NEW_RX
- EXTRA_CFLAGS += -DTHOMAS_BEACON -DTHOMAS_TASKLET -DTHOMAS_SKB -DTHOMAS_TURBO
- #EXTRA_CFLAGS += -DUSB_TX_DRIVER_AGGREGATION_ENABLE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/tioca-fix-assignment-from-incompatible-pointer-warnings new/patches.rpmify/tioca-fix-assignment-from-incompatible-pointer-warnings
--- old/patches.rpmify/tioca-fix-assignment-from-incompatible-pointer-warnings 2010-02-24 20:02:37.000000000 +0100
+++ new/patches.rpmify/tioca-fix-assignment-from-incompatible-pointer-warnings 2010-03-18 18:58:09.000000000 +0100
@@ -1,5 +1,6 @@
From: Jeff Mahoney <jeffm(a)suse.com>
Subject: tioca: Fix assignment from incompatible pointer warnings
+Patch-mainline: not yet
The prototype for sn_pci_provider->{dma_map,dma_map_consistent} expects
an unsigned long instead of a u64.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/tsi148-dependency new/patches.rpmify/tsi148-dependency
--- old/patches.rpmify/tsi148-dependency 2010-02-24 20:02:37.000000000 +0100
+++ new/patches.rpmify/tsi148-dependency 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-From: Jeff Mahoney <jeffm(a)suse.com>
-Subject: vme/tsi148: Depend on VIRT_TO_BUS
-
- This driver depends on virt_to_bus working correctly, but it doesn't
- exist on ppc64 (and probably other arches).
-
-Signed-off-by: Jeff Mahoney <jeffm(a)suse.com>
----
- drivers/staging/vme/bridges/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/staging/vme/bridges/Kconfig
-+++ b/drivers/staging/vme/bridges/Kconfig
-@@ -8,6 +8,7 @@ config VME_CA91CX42
-
- config VME_TSI148
- tristate "Tempe"
-+ depends on VIRT_TO_BUS
- help
- If you say Y here you get support for the Tundra TSI148 VME bridge
- chip.
++++++ patches.suse.tar.bz2 ++++++
++++ 49984 lines of diff (skipped)
++++++ patches.trace.tar.bz2 ++++++
++++ 2348 lines of diff (skipped)
++++++ patches.xen.tar.bz2 ++++++
++++ 44199 lines of diff (skipped)
++++++ series.conf ++++++
--- /var/tmp/diff_new_pack.RATGgM/_old 2010-03-31 15:13:28.000000000 +0200
+++ /var/tmp/diff_new_pack.RATGgM/_new 2010-03-31 15:13:28.000000000 +0200
@@ -27,27 +27,21 @@
# DO NOT MODIFY THEM!
# Send separate patches upstream if you find a problem...
########################################################
+ patches.kernel.org/patch-2.6.34-rc1
+ patches.kernel.org/patch-2.6.34-rc1-rc2
+ patches.kernel.org/patch-2.6.34-rc2-git3
########################################################
# Build fixes that apply to the vanilla kernel too.
# Patches in patches.rpmify are applied to both -vanilla
# and patched flavors.
########################################################
- patches.rpmify/tsi148-dependency
- patches.rpmify/rtl8192u-dont-use-mhard-float
patches.rpmify/tioca-fix-assignment-from-incompatible-pointer-warnings
patches.rpmify/ia64-mca-fix-cast-from-integer-to-pointer-warning
- patches.rpmify/otus-fix-assignment-makes-integer-from-pointer-without-a-cast-warnings
- patches.rpmify/rt2860-use-skb_tail_pointer
- patches.rpmify/rtl8192e-use-skb_tail_pointer
-
- patches.rpmify/rtl8192e-fix-section-mismatches
patches.rpmify/dmar-fix-section-mismatch
- patches.rpmify/hpsa-fix-section-mismatch
- patches.rpmify/rt2860-fix-section-mismatches
patches.rpmify/ppc-crashdump-typefix
- patches.rpmify/ftrace-fix-ftrace_event_call-alignment-for-use-with-gcc-4-5
+ patches.rpmify/powerpc-kvm-build-failure-workaround
########################################################
# kABI consistency patches
@@ -83,7 +77,6 @@
# Simple export additions/removals
########################################################
patches.suse/reiser4-exports
- patches.suse/kvm-as-kmp
patches.suse/export-release_open_intent
patches.suse/export-security_inode_permission
+still_needed-33? patches.suse/export-sync_page_range
@@ -101,13 +94,6 @@
+needs_update-33 patches.suse/sched-revert-latency-defaults
# writable limits
- patches.suse/rlim-0005-core-posix-cpu-timers-cleanup-rlimits-usage.patch
- patches.suse/rlim-0009-X86-use-helpers-for-rlimits.patch
- patches.suse/rlim-0010-FS-use-helpers-for-rlimits.patch
- patches.suse/rlim-0011-MM-use-helpers-for-rlimits.patch
- patches.suse/rlim-0012-core-use-helpers-for-rlimits.patch
- patches.suse/rlim-0013-infiniband-use-helpers-for-rlimits.patch
- patches.suse/rlim-0014-ipc-use-helpers-for-rlimits.patch
patches.suse/rlim-0015-SECURITY-add-task_struct-to-setrlimit.patch
patches.suse/rlim-0016-core-add-task_struct-to-update_rlimit_cpu.patch
patches.suse/rlim-0017-sys_setrlimit-make-sure-rlim_max-never-grows.patch
@@ -156,7 +142,6 @@
patches.arch/x86-hpet-pre-read
+needs_update-33 patches.arch/x86_64-hpet-64bit-timer.patch
- patches.fixes/crypto-testmgr-fix-complain-about-lacking-test.patch
patches.arch/x86-mcp51-no-dac
patches.arch/kvm-split-paravirt-ops-by-functionality
@@ -185,8 +170,6 @@
########################################################
# x86 UV patches from SGI
########################################################
- patches.arch/bug-561939_uv_bios_call_hwperf_updated.patch
-
# bug 566745
patches.arch/UV-Expose-irq_desc-node-in-proc.patch
@@ -204,19 +187,8 @@
patches.suse/8250-sysrq-ctrl_o.patch
patches.suse/ppc-no-LDFLAGS_MODULE.patch
patches.arch/ppc-vio-modalias.patch
- patches.arch/ppc-efika-mpc52xx-ac97.patch
- patches.arch/ppc-efika-psc-console-autodetection.patch
-- patches.arch/ppc-efika-bestcomm-ata-dma.patch
patches.arch/ppc-pegasos-console-autodetection.patch
patches.suse/ppc-powerbook-usb-fn-key-default.patch
- patches.suse/suse-ppc32-mol.patch
- patches.suse/suse-ppc32-mol-kbuild.patch
- patches.suse/suse-ppc32-mol-handle-mm-fault
- patches.suse/suse-ppc32-mol-ioctl
- patches.suse/suse-ppc32-mol-get-property
- patches.suse/suse-ppc32-mol-BIT
- patches.suse/suse-ppc32-mol-sheep
- patches.suse/suse-ppc32-mol-semaphore
patches.drivers/ppc64-adb
patches.suse/suse-ppc64-branding
patches.arch/ppc64-xmon-dmesg-printing.patch
@@ -224,8 +196,7 @@
patches.fixes/ptrace-getsiginfo
patches.arch/ppc-ipic-suspend-without-83xx-fix
patches.arch/ppc-vmcoreinfo.diff
- patches.arch/ppc-pseries-ncpus-1
- patches.arch/ppc-pseries-ncpus-2
+ patches.fixes/powerpc-fix-handling-of-strnlen-with-zero-len
########################################################
# PS3
@@ -240,18 +211,13 @@
patches.arch/s390-message-catalog.diff
patches.arch/kmsg-fix-parameter-limitations
- patches.arch/s390-03-qeth-hs-traffic-analyzer.patch
-
patches.suse/s390-Kerntypes.diff
- patches.arch/s390-05-13-qeth-blkt-defaults.patch
-
########################################################
# VM/FS patches
########################################################
patches.suse/unmap_vmas-lat
patches.suse/silent-stack-overflow-2.patch
- patches.fixes/do_anonymous_page-race
patches.fixes/oom-warning
patches.suse/shmall-bigger
patches.fixes/grab-swap-token-oops
@@ -284,15 +250,12 @@
########################################################
patches.suse/connector-read-mostly
patches.suse/kbd-ignore-gfx.patch
- patches.fixes/ds1682-build-fix
########################################################
#
# ACPI patches
#
########################################################
- patches.suse/apm_setup_UP.diff
-
# Check resource conflicts between hwmon and ACPI OpRegs
patches.arch/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch
@@ -315,9 +278,6 @@
patches.arch/acpi_srat-pxm-rev-ia64.patch
patches.arch/acpi_srat-pxm-rev-x86-64.patch
- patches.fixes/acpi_fix_no_critical_tp.patch
- patches.fixes/acpi_thermal_check_trip_points.patch
-
########################################################
# CPUFREQ
########################################################
@@ -334,9 +294,6 @@
# patches.suse/cpuidle-documentation
patches.fixes/cpufreq_ondemand_performance_optimise_default_settings.patch
- # PCC -> HP's cpufreq driver
- patches.drivers/cpufreq_processor_clocking_control_pcc_driver.patch
-
########################################################
# AGP, graphics related stuff
########################################################
@@ -363,6 +320,7 @@
patches.fixes/nfsd-05-sunrpc-cache-allow-thread-to-block-while-waiting-for.patch
patches.fixes/nfsd-06-sunrpc-cache-retry-cache-lookups-that-return-ETIMEDO.patch
patches.fixes/nfsd-07-nfsd-idmap-drop-special-request-deferal-in-favour-of.patch
+ patches.fixes/sunrpc-monotonic-expiry
########################################################
# lockd + statd
@@ -386,13 +344,12 @@
########################################################
# Reiserfs Patches
########################################################
- patches.fixes/reiserfs-replay-honor-ro
patches.suse/reiserfs-barrier-default
+ patches.fixes/reiserfs-fix-locking-BUG-during-mount-failure
########################################################
# dlm
########################################################
- patches.fixes/dlm-enable-debug.patch
########################################################
# ocfs2
@@ -414,8 +371,9 @@
patches.suse/xfs-dmapi-re-add-flags-for-xfs_free_eofblocks
patches.suse/xfs-nfsd-dmapi-aware
patches.fixes/xfs-dmapi-fixes
- patches.fixes/xfs-redirty-ENOSPC.patch
patches.fixes/xfs-export-debug
+ patches.suse/xfs-dmapi-2-6-34-api-changes
+ patches.suse/xfs-dmapi-fix-incompatible-pointer-type-warning
########################################################
# novfs
@@ -426,6 +384,7 @@
patches.fixes/novfs-fix-inode-uid
patches.fixes/novfs-incorrect-filesize-fix
patches.fixes/novfs-truncate-fix
+ patches.fixes/novfs-fix-oops-in-scope-finding
########################################################
# other filesystem stuff
@@ -497,34 +456,23 @@
# Storage
########################################################
- # add genhd.mangle_minor parameter
- patches.suse/block-add-mangle-devt-switch
-
# libata
patches.drivers/libata-add-waits-for-govault
patches.drivers/libata-unlock-hpa-by-default
- patches.drivers/libata-prefer-over-ide
-
- patches.drivers/libata-ata_piix-clear-spurious-IRQ
- patches.drivers/libata-ahci-aspire-3810t-noncq
# Block layer fixes
patches.fixes/scsi-inquiry-too-short-ratelimit
patches.suse/scsi-netlink-ml
- patches.drivers/mpt-fusion-4.22.00.00-update
++needs_update patches.drivers/mpt-fusion-4.22.00.00-update
patches.fixes/scsi-dh-queuedata-accessors
patches.fixes/scsi-dh-alua-retry-UA
patches.fixes/scsi-add-tgps-setting
patches.fixes/scsi-dh-alua-send-stpg
- patches.fixes/scsi-dh-emc-mode-select-10-size
- patches.fixes/scsi-dh-emc-rw-mismatch
patches.fixes/scsi-dh-rdac-add-stk
patches.fixes/scsi-retry-alua-transition-in-progress
- patches.suse/fc-transport-allow-dev_loss_tmo-disable
patches.fixes/scsi-check-host-lookup-failure
- patches.drivers/lpfc-add-raywire-id
patches.drivers/megaraid-mbox-fix-SG_IO
patches.drivers/qla4xxx-5.01.00-k9-5.01.00.00.11.01-k10.patch
@@ -562,11 +510,6 @@
patches.drivers/ixgbe-entropy-source.patch
patches.drivers/tg3-entropy-source.patch
- # qlge patches from 1.6.33 bnc#560420, fate#307130
- # These patches are not in 2.6.33 as of -rc3.
- patches.drivers/qlge-0025-Add-performance-change-for-non-split-headers.patch
- patches.drivers/qlge-0026-Add-firmware-core-dump.patch
-
+needs_update patches.drivers/e1000-enhance-frame-fragment-detection.patch
+needs_update patches.drivers/e1000e-enhance-frame-fragment-detection.patch
@@ -590,7 +533,6 @@
########################################################
# USB
########################################################
- patches.suse/usb-storage-disable-delay.patch
########################################################
# I2C
@@ -606,19 +548,11 @@
patches.drivers/elousb.patch
patches.fixes/input-add-acer-aspire-5710-to-nomux.patch
patches.drivers/synaptics-hp-clickpad
+ patches.fixes/hid-fix-gyration-oops.patch
##########################################################
# Sound
##########################################################
- patches.drivers/alsa-sp1-hda-57-cx5051-toshiba-quirk
- patches.drivers/alsa-sp1-hda-58-cx5051-lenovo-mute-fix
- patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led
- patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support
- patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2
- patches.drivers/alsa-sp1-hda-63-idt-hp-mute-led-detect
- patches.drivers/alsa-sp1-hda-64-idt-hp-mute-led-cleanup
- patches.drivers/alsa-sp1-hda-65-idt-hp-mute-led-cleanup2
- patches.drivers/alsa-sp1-hda-66-idt-hp-mute-led-fix-polarity
########################################################
# Other driver fixes
@@ -647,6 +581,7 @@
patches.suse/dm-emulate-blkrrpart-ioctl
patches.suse/dm-raid45_2.6.27_20081027.patch
patches.suse/dmraid45-dm_dirty_log_create-api-fix
+ patches.suse/dmraid45-dm_get_device-takes-fewer-arguments
patches.fixes/dm-mpath-reattach-dh
patches.suse/dm-mpath-leastpending-path-update
patches.suse/dm-mpath-accept-failed-paths
@@ -716,6 +651,8 @@
patches.apparmor/apparmor-fix-security_ops-task_setrlimit-api-use
patches.apparmor/apparmor-check-for-network-in-interrupt-and-work-around
+ patches.apparmor/apparmor-add-temporary-declaration-for-vfsmount_lock
+
########################################################
# Address space layout randomization
########################################################
@@ -735,6 +672,7 @@
patches.suse/kdb-fix-assignment-from-incompatible-pointer-warnings
patches.suse/kdb-handle-nonexistance-keyboard-controller
patches.suse/kdb-fix-kdb_cmds-to-include-the-arch-common-macro
+ patches.suse/kdb-vm-api-changes-for-2-6-34
########################################################
# Other patches for debugging
@@ -763,31 +701,8 @@
# Performance Monitoring, Tracing etc
########################################################
-+needs_update-33 patches.suse/perfmon2.patch
-+needs_update-33 patches.suse/perfmon2_ioctl.patch
-+needs_update-33 patches.suse/perfmon2-remove_syscalls.patch
-+needs_update-33 patches.suse/perfmon2-remove_get_base_syscall_attr.patch
-+needs_update-33 patches.suse/perfmon2_noutrace.patch
-
patches.fixes/oprofile_bios_ctr.patch
- patches.trace/lttng-instrumentation-irq.patch
- patches.trace/powerpc-rename-irq-tracing
- patches.trace/lttng-instrumentation-softirq.patch
- patches.trace/lttng-instrumentation-kernel.patch
- patches.trace/lttng-instrumentation-filemap.patch
- patches.trace/lttng-instrumentation-swap.patch
- # fault.h: TP_PROTO(void) expansion failing on ia64, will fix next week
-+tonyj patches.trace/lttng-instrumentation-memory.patch
- patches.trace/lttng-instrumentation-page_alloc.patch
- patches.trace/lttng-instrumentation-hugetlb.patch
- patches.trace/lttng-instrumentation-net.patch
- patches.trace/lttng-instrumentation-ipv4.patch
- patches.trace/lttng-instrumentation-ipv6.patch
- patches.trace/lttng-instrumentation-socket.patch
- patches.trace/lttng-instrumentation-fs.patch
- patches.trace/lttng-instrumentation-ipc.patch
-
patches.trace/utrace-core
+needs_update-32 patches.fixes/nfs-write.c-bug-removal.patch
@@ -896,13 +811,8 @@
patches.xen/xen3-patch-2.6.30
patches.xen/xen3-patch-2.6.31
patches.xen/xen3-patch-2.6.32
- patches.xen/xen3-patch-2.6.33-rc3
- patches.xen/xen3-patch-2.6.33-rc3-rc4
- patches.xen/xen3-patch-2.6.33-rc4-rc5
- patches.xen/xen3-patch-2.6.33-rc5-rc6
- patches.xen/xen3-patch-2.6.33-rc6-rc7
- patches.xen/xen3-patch-2.6.33-rc7-rc8
- patches.xen/xen3-patch-2.6.33-rc8-final
+ patches.xen/xen3-patch-2.6.33
+ patches.xen/xen3-patch-2.6.34-rc2
patches.xen/xen3-seccomp-disable-tsc-option
patches.xen/xen3-x86-mcp51-no-dac
patches.xen/xen3-x86-mark_rodata_rw.patch
@@ -927,6 +837,7 @@
patches.xen/xen-sysdev-suspend
patches.xen/xen-ipi-per-cpu-irq
patches.xen/xen-virq-per-cpu-irq
+ patches.xen/xen-clockevents
patches.xen/xen-spinlock-poll-early
patches.xen/xen-configurable-guest-devices
patches.xen/xen-netback-nr-irqs
@@ -934,8 +845,10 @@
patches.xen/xen-netback-generalize
patches.xen/xen-netback-multiple-tasklets
patches.xen/xen-netback-kernel-threads
- patches.xen/xen-pciback-sriov
patches.xen/xen-unpriv-build
+ patches.xen/xen-vusb-module-alias
+ patches.xen/xen-vscsi-module-alias
+ patches.xen/xen-floppy
patches.xen/xen-dcdbas
patches.xen/xen-x86-panic-no-reboot
patches.xen/xen-x86-dcr-fallback
@@ -946,8 +859,6 @@
patches.xen/xen-x86-machphys-prediction
patches.xen/xen-x86-exit-mmap
patches.xen/xen-x86-per-cpu-vcpu-info
- patches.xen/xen-x86-xtime-lock
- patches.xen/xen-x86-time-per-cpu
patches.xen/xen-x86_64-pgd-pin
patches.xen/xen-x86_64-pgd-alloc-order
patches.xen/xen-x86_64-dump-user-pgt
++++++ source-timestamp ++++++
--- /var/tmp/diff_new_pack.RATGgM/_old 2010-03-31 15:13:28.000000000 +0200
+++ /var/tmp/diff_new_pack.RATGgM/_new 2010-03-31 15:13:28.000000000 +0200
@@ -1,3 +1,3 @@
-2010-02-25 20:06:12 +0100
-GIT Revision: b7bca5b05016a49d4eea335efa861fb37080d6c8
+2010-03-29 21:26:59 +0200
+GIT Revision: 80160e7a98e3a2d74f68c34786e6a862e8d7786f
GIT Branch: master
++++++ supported.conf ++++++
--- /var/tmp/diff_new_pack.RATGgM/_old 2010-03-31 15:13:28.000000000 +0200
+++ /var/tmp/diff_new_pack.RATGgM/_new 2010-03-31 15:13:28.000000000 +0200
@@ -408,6 +408,7 @@
kernel/drivers/firmware/iscsi_ibft
kernel/drivers/gpio/bt8xxgpio
kernel/drivers/gpio/max7301
+ kernel/drivers/gpio/max730x
kernel/drivers/gpio/max732x
kernel/drivers/gpio/mcp23s08
kernel/drivers/gpio/pca953x
@@ -472,6 +473,7 @@
- kernel/drivers/hwmon/adt7470 # Analog Devices ADT7470
- kernel/drivers/hwmon/adt7473 # Analog Devices ADT7473
- kernel/drivers/hwmon/adt7475 # Analog Devices ADT7475
+ kernel/drivers/hwmon/ams/ams
- kernel/drivers/hwmon/applesmc
- kernel/drivers/hwmon/asb100 # ASB100 Bach driver
- kernel/drivers/hwmon/asus_atk0110 # Asus ATK0110 (ACPI)
@@ -575,6 +577,7 @@
kernel/drivers/i2c/chips/tsl2550 # Light sensor
kernel/drivers/i2c/i2c-core # I2C-Bus main module
kernel/drivers/i2c/i2c-dev # I2C /dev entries driver
+ kernel/drivers/i2c/i2c-smbus
kernel/drivers/ide/ide-cd_mod
kernel/drivers/ide/ide-core
kernel/drivers/ide/ide-disk
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory
checked in at Wed Mar 31 15:04:16 CEST 2010.
--------
--- kbd/kbd.changes 2010-02-19 15:16:00.000000000 +0100
+++ /mounts/work_src_done/STABLE/kbd/kbd.changes 2010-03-29 17:31:59.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Mar 29 17:31:11 CEST 2010 - anicka(a)suse.cz
+
+- add lt.std map (bnc#569554)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kbd.spec ++++++
--- /var/tmp/diff_new_pack.3LREoQ/_old 2010-03-31 14:04:06.000000000 +0200
+++ /var/tmp/diff_new_pack.3LREoQ/_new 2010-03-31 14:04:06.000000000 +0200
@@ -24,7 +24,7 @@
Group: System/Console
AutoReqProv: on
Version: 1.14.1
-Release: 24
+Release: 25
Summary: Keyboard and Font Utilities
Source: kbd-%{version}.tar.bz2
Source1: kbd_fonts.tar.bz2
++++++ suse-add.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/data/keymaps/i386/azerty/lt.std.map new/data/keymaps/i386/azerty/lt.std.map
--- old/data/keymaps/i386/azerty/lt.std.map 1970-01-01 01:00:00.000000000 +0100
+++ new/data/keymaps/i386/azerty/lt.std.map 2010-03-29 17:15:16.000000000 +0200
@@ -0,0 +1,167 @@
+# Lithuanian standard keymap
+# Created by Gediminas Paulauskas <menesis(a)delfi.lt>
+# Re-encoded for UTF-8 by Rimas Kudelis <rq(a)akl.lt>
+# The standard can be found at http://ims.mii.lt/klav/
+#
+# ____ ________ _________ _______
+# | S A| S = Shift, A = altgr + Shift | Spausd | Slinkti | Pauzė |
+# | s a| s = normal, a = altgr | SysRq | | |
+# ==== ======== ========= =======
+# ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ _______
+# | ~ | 1 | 2 | 3 | 4 | 5 | 6 ¦| 7 | 8 | 9 | 0 | + | X | <-- |
+# | ` | ! @| - _| / #| ; $| : §| , ^|| . &| = *| ( [| ) ]| ? '| %| |
+# ========================================================================
+# | |<- | Ą | Ž | E | R | T | Y | U | I | O | P | Į | W | , |
+# | ->| | | | €| | | | | | | | {| }| <-' |
+# ===================================================================¬ |
+# | | A | S | D | Š | G | H | J | K | L | Ų | Ė | Q | |
+# | Didž | | | | | | | | | | | "| || |
+# ========================================================================
+# | ^ | > | Z | Ū | C | V | B | N | M | Č | F | Ę | ^ |
+# | | Lyg2 | < -| <| >| -| | | | | „| “| \| | Lyg2 |
+# ========================================================================
+# | | | | | | | | |
+# | Vald | | Alt | Tarpas Jungiamasis t.| Lyg 3 | | | Vald |
+# ====== ====== ====== ======================= ======= ====== ===== ======
+
+keymaps 0-2,4,8,12
+include "azerty-layout"
+strings as usual
+
+# If you want to have right Alt as normal Alt, and have Win keys to act as
+# AltGr (for typing 3rd level characters), uncomment the following lines:
+
+# keycode 100 = Alt
+# keycode 125 = AltGr
+# keycode 126 = AltGr
+
+# -- Row 1 -----------------------------------------------------------------
+# [Esc] [F1][F2][F3] [F4][F5][F6][F7] [F8][F9][F10][F11][F12] [PS][Sc][Pu]
+# --------------------------------------------------------------------------
+
+ keycode 1 = Escape
+alt keycode 1 = Meta_Escape
+
+# -- Row 2 -----------------------------------------------------------------
+# [`~][1!@][2-_][3/#][4;$][5:][6,^][7.&][8=*][9([][0)]][+?'][=+][X%][Backspace]
+# --------------------------------------------------------------------------
+
+ keycode 41 = grave asciitilde
+alt keycode 41 = Meta_grave
+
+ keycode 2 = exclam one at
+alt keycode 2 = Meta_one
+
+ keycode 3 = minus two underscore
+control keycode 3 = Control_underscore
+alt keycode 3 = Meta_two
+
+ keycode 4 = slash three numbersign
+alt keycode 4 = Meta_three
+
+ keycode 5 = semicolon four dollar
+alt keycode 5 = Meta_four
+
+ keycode 6 = colon five section
+alt keycode 6 = Meta_five
+
+ keycode 7 = comma six asciicircum
+alt keycode 7 = Meta_six
+control keycode 11 = Control_asciicircum
+
+ keycode 8 = period seven ampersand
+alt keycode 8 = Meta_seven
+
+ keycode 9 = equal eight asterisk
+alt keycode 9 = Meta_eight
+
+ keycode 10 = parenleft nine bracketleft
+alt keycode 10 = Meta_nine
+
+ keycode 11 = parenright zero bracketright
+alt keycode 11 = Meta_zero
+control keycode 11 = Control_bracketright
+
+ keycode 12 = question plus apostrophe
+alt keycode 12 = Meta_question
+
+ keycode 13 = +x +X percent
+alt keycode 13 = Meta_x
+control keycode 13 = Control_x
+
+ keycode 14 = Delete
+alt keycode 14 = Meta_Delete
+
+# -- Row 3 -----------------------------------------------------------------
+# [Tab][Ą][Ž][E€][R][T][Y][U][I][O][P][Į{][W}][Enter]
+# --------------------------------------------------------------------------
+
+ keycode 15 = Tab
+alt keycode 15 = Meta_Tab
+
+ keycode 16 = U+0105 U+0104
+ keycode 17 = U+017e U+017d
+ keycode 18 = +e +E U+20ac
+control keycode 18 = Control_e
+altgr keycode 19 = nul
+altgr keycode 20 = nul
+altgr keycode 21 = nul
+altgr keycode 22 = nul
+
+ keycode 26 = U+012f U+012e braceleft
+control keycode 26 = Escape
+alt keycode 26 = Meta_bracketleft
+
+ keycode 27 = +w +W braceright
+control keycode 27 = Control_w
+
+# -- Row 4 -----------------------------------------------------------------
+# [CapsLock][A][S][D][Š][G][H][J][K][L][Ų][Ė"][Enter]
+# --------------------------------------------------------------------------
+
+ keycode 58 = Caps_Lock
+
+ keycode 30 = a
+ keycode 33 = U+0161 U+0160
+
+ keycode 39 = U+0173 U+0172
+ keycode 40 = U+0117 U+0116 quotedbl
+
+ keycode 43 = +q +Q bar
+control keycode 43 = Control_q
+
+# -- Row 5 -----------------------------------------------------------------
+# [LShift][<>-][Z<][Ū>][C-][V][B][N][M][Č„][F“][Ę\][RShift]
+# --------------------------------------------------------------------------
+
+ keycode 42 = Shift
+
+ keycode 86 = less greater minus
+ keycode 44 = +z +Z less
+control keycode 44 = Control_z
+ keycode 45 = U+016b U+016a greater
+ keycode 46 = +c +C minus
+control keycode 46 = Control_c
+
+ keycode 51 = U+010d U+010c U+201e
+
+ keycode 52 = +f +F U+201c
+control keycode 52 = Control_f
+
+ keycode 53 = U+0119 U+0118 backslash
+control keycode 53 = Control_backslash
+
+ keycode 54 = Shift
+
+# -- Row 6 -----------------------------------------------------------------
+# [LCtrl] [Lalt][Space][Ralt] [RCtrl]
+# --------------------------------------------------------------------------
+
+ keycode 29 = Control
+ keycode 56 = Alt
+
+ keycode 57 = space
+altgr keycode 57 = nobreakspace
+alt keycode 57 = Meta_space
+
+ keycode 97 = Control
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0