Mailinglist Archive: opensuse-commit (1779 mails)

< Previous Next >
commit kernel-source for openSUSE:Factory

Hello community,

here is the log from the commit of package kernel-source for openSUSE:Factory
checked in at Fri Feb 11 02:18:12 CET 2011.



--------
--- kernel-source/kernel-debug.changes 2011-01-22 00:44:56.000000000 +0100
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes
2011-02-09 14:56:46.000000000 +0100
@@ -1,0 +2,130 @@
+Wed Feb 9 13:37:33 CET 2011 - mmarek@xxxxxxx
+
+- rpm/kernel-source.spec.in: Set timestamp of sources to the commit
+ timestamp, so that they are always older than generated files in
+ /usr/src/linux-obj (bnc#669669).
+- commit 31e675a
+
+-------------------------------------------------------------------
+Wed Feb 9 13:00:11 CET 2011 - tiwai@xxxxxxx
+
+- ALSA: hda - Fix missing CA initialization for HDMI/DP
+ (bnc#670577).
+- commit 474305e
+
+-------------------------------------------------------------------
+Wed Feb 9 00:08:37 CET 2011 - mmarek@xxxxxxx
+
+- rpm/kernel-binary.spec.in: Do not run fdupes in /usr/src/linux-obj, to
+ keep timestamps intact.
+- commit e211a69
+
+-------------------------------------------------------------------
+Tue Feb 8 23:42:06 CET 2011 - mmarek@xxxxxxx
+
+- rpm/kernel-source.spec.in: Remove .gitignore files after applying patches
+ (fix last change).
+- commit d6a7494
+
+-------------------------------------------------------------------
+Tue Feb 8 17:24:22 CET 2011 - jslaby@xxxxxxx
+
+- orinoco: allow IW_AUTH_MFP to pass through (bnc#661624).
+- commit 442a3d7
+
+-------------------------------------------------------------------
+Tue Feb 8 16:52:35 CET 2011 - jbeulich@xxxxxxxxxx
+
+- Fix a few issues in patches.suse/stack-unwind (bnc#661409).
+- commit f82619b
+
+-------------------------------------------------------------------
+Mon Feb 7 19:41:04 CET 2011 - jslaby@xxxxxxx
+
+- staging: rt2860: Fix incorrect netif_stop_queue usage warning
+ (bnc#661657).
+- commit 39b4c1e
+
+-------------------------------------------------------------------
+Mon Feb 7 18:20:11 CET 2011 - mmarek@xxxxxxx
+
+- rpm/{kernel-source.spec.in,mkspec}: Sync with vanilla and linux-next
+- commit fecf998
+
+-------------------------------------------------------------------
+Mon Feb 7 16:19:29 CET 2011 - mmarek@xxxxxxx
+
+- rpm/kernel-source.spec.in: Remove dead code.
+- commit b97b6f2
+
+-------------------------------------------------------------------
+Mon Feb 7 14:27:36 CET 2011 - mmarek@xxxxxxx
+
+- rpm/kernel-binary.spec.in, rpm/kernel-spec-macros: Fix the definition
+ of %release_major and rename it to %release_num to better describe
+ what it does. Add some comments to explain how the versioning works.
+- commit 3de2a1a
+
+-------------------------------------------------------------------
+Fri Feb 4 22:22:44 CET 2011 - mmarek@xxxxxxx
+
+- rpm/compute-PATCHVERSION.sh: Fix sed regexp
+- commit d889fe7
+
+-------------------------------------------------------------------
+Thu Feb 3 21:54:01 CET 2011 - rjw@xxxxxxx
+
+- x86, mtrr: avoid MTRR reprogramming on BP during boot on (bnc#623393).
+- commit 0664ad4
+
+-------------------------------------------------------------------
+Thu Feb 3 17:46:29 CET 2011 - jbeulich@xxxxxxxxxx
+
+- Update Xen patches to c/s 1066.
+- cpuidle/x86/perf: fix power:cpu_idle double end events and
+ throw cpu_idle events from the cpuidle layer (bnc#665153).
+- perf: Clean up power events by introducing new, more generic
+ ones (bnc#665153).
+- commit e88242f
+
+-------------------------------------------------------------------
+Thu Feb 3 17:43:57 CET 2011 - jbeulich@xxxxxxxxxx
+
+- Fix jiffy calculations in calibrate_delay_direct to handle
+ overflow.
+- commit 4a69163
+
+-------------------------------------------------------------------
+Wed Feb 2 17:25:06 CET 2011 - tiwai@xxxxxxx
+
+- ALSA: hda - Fix memory leaks in conexant jack arrays
+ (bnc#668929).
+- commit 7dbcb59
+
+-------------------------------------------------------------------
+Mon Jan 31 23:00:46 CET 2011 - jslaby@xxxxxxx
+
+- Refresh patches.rpmify/cloneconfig.diff.
+ scripts/kconfig/conf accepts long parameters only for some time already
+- commit 36bcdd7
+
+-------------------------------------------------------------------
+Mon Jan 31 13:22:49 CET 2011 - jslaby@xxxxxxx
+
+- block: loop queue_lock null pointer derefence in blk_throtl_exit
+ v3 (bnc#666598).
+- commit cd38efd
+
+-------------------------------------------------------------------
+Mon Jan 31 10:47:27 CET 2011 - jslaby@xxxxxxx
+
+- Fix prlimit64 for suid/sgid processes (bnc#668262).
+- commit dae8217
+
+-------------------------------------------------------------------
+Sun Jan 23 23:19:08 CET 2011 - jeffm@xxxxxxxx
+
+- netfilter: Implement RFC 1123 for FTP conntrack (bnc#466279).
+- commit 3e2a2b2
+
+-------------------------------------------------------------------
kernel-default.changes: same change
kernel-desktop.changes: same change
kernel-docs.changes: same change
kernel-ec2.changes: same change
kernel-net.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.DPRIKu/_old 2011-02-11 02:16:17.000000000 +0100
+++ /var/tmp/diff_new_pack.DPRIKu/_new 2011-02-11 02:16:17.000000000 +0100
@@ -56,7 +56,7 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
Version: 2.6.37
-Release: 10
+Release: 11
%if %using_buildservice
%else
%endif
@@ -303,7 +303,7 @@
cp ../config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
- --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+ --set-str CONFIG_LOCALVERSION %release_num-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
@@ -711,8 +711,9 @@
%endif

# Hardlink duplicate files automatically (from package fdupes): It doesn't save
-# much, but it keeps rpmlint from breaking the package build.
-%fdupes $RPM_BUILD_ROOT
+# much, but it keeps rpmlint from breaking the package build. Note that we skip
+# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
+%fdupes $RPM_BUILD_ROOT/lib

%preun -f preun.sh


kernel-default.spec: same change
kernel-desktop.spec: same change
++++++ kernel-docs.spec ++++++
--- /var/tmp/diff_new_pack.DPRIKu/_old 2011-02-11 02:16:17.000000000 +0100
+++ /var/tmp/diff_new_pack.DPRIKu/_new 2011-02-11 02:16:17.000000000 +0100
@@ -25,7 +25,7 @@
Name: kernel-docs
Summary: Kernel Documentation
Version: 2.6.37
-Release: 10
+Release: 11
%if %using_buildservice
%else
%endif

++++++ kernel-ec2.spec ++++++
--- /var/tmp/diff_new_pack.DPRIKu/_old 2011-02-11 02:16:17.000000000 +0100
+++ /var/tmp/diff_new_pack.DPRIKu/_new 2011-02-11 02:16:17.000000000 +0100
@@ -56,7 +56,7 @@
Name: kernel-ec2
Summary: The Amazon EC2 Xen Kernel
Version: 2.6.37
-Release: 7
+Release: 8
%if %using_buildservice
%else
%endif
@@ -301,7 +301,7 @@
cp ../config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
- --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+ --set-str CONFIG_LOCALVERSION %release_num-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
@@ -709,8 +709,9 @@
%endif

# Hardlink duplicate files automatically (from package fdupes): It doesn't save
-# much, but it keeps rpmlint from breaking the package build.
-%fdupes $RPM_BUILD_ROOT
+# much, but it keeps rpmlint from breaking the package build. Note that we skip
+# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
+%fdupes $RPM_BUILD_ROOT/lib

%preun -f preun.sh


++++++ kernel-net.spec ++++++
--- /var/tmp/diff_new_pack.DPRIKu/_old 2011-02-11 02:16:17.000000000 +0100
+++ /var/tmp/diff_new_pack.DPRIKu/_new 2011-02-11 02:16:17.000000000 +0100
@@ -56,7 +56,7 @@
Name: kernel-net
Summary: Minimal kernel with disk and net support
Version: 2.6.37
-Release: 10
+Release: 11
%if %using_buildservice
%else
%endif
@@ -300,7 +300,7 @@
cp ../config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
- --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+ --set-str CONFIG_LOCALVERSION %release_num-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
@@ -708,8 +708,9 @@
%endif

# Hardlink duplicate files automatically (from package fdupes): It doesn't save
-# much, but it keeps rpmlint from breaking the package build.
-%fdupes $RPM_BUILD_ROOT
+# much, but it keeps rpmlint from breaking the package build. Note that we skip
+# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
+%fdupes $RPM_BUILD_ROOT/lib

%preun -f preun.sh


kernel-pae.spec: same change
kernel-ppc64.spec: same change
kernel-ps3.spec: same change
kernel-s390.spec: same change
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.DPRIKu/_old 2011-02-11 02:16:17.000000000 +0100
+++ /var/tmp/diff_new_pack.DPRIKu/_new 2011-02-11 02:16:17.000000000 +0100
@@ -21,17 +21,16 @@
%define srcversion 2.6.37
%define patchversion 2.6.37
%define variant %{nil}
+%define vanilla_only 0

%include %_sourcedir/kernel-spec-macros

%define src_install_dir usr/src/linux-%kernelrelease%variant
-%define obj_install_dir /%src_install_dir-obj
-%define rpm_install_dir %buildroot%real_install_dir

Name: kernel-source
Summary: The Linux Kernel Sources
Version: 2.6.37
-Release: 10
+Release: 11
%if %using_buildservice
%else
%endif
@@ -159,17 +158,9 @@
%setup -q -c -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108
-a 109 -a 110 -a 111 -a 112 -a 113 -a 120

%build
-# Release number without the EXTRAVERSION
-RELEASE=%source_rel
-while [ "$RELEASE" != "${RELEASE#[^0-9]*.}" ]; do
- RELEASE=${RELEASE#[^0-9]*.}
-done
-
mkdir -p $RPM_BUILD_ROOT/usr/src
cd $RPM_BUILD_ROOT/usr/src

-ln -sf linux%variant linux%variant # dummy symlink
-
# Unpack the vanilla kernel sources
tar -xjf %_sourcedir/linux-%srcversion.tar.bz2
if test "%srcversion" != "%kernelrelease%variant"; then
@@ -177,25 +168,35 @@
fi

%if %do_vanilla
-cp -al "%buildroot/%src_install_dir" linux-%kernelrelease-vanilla
+%if %vanilla_only
+ mv \
+%else
+ cp -al \
+%endif
+ linux-%kernelrelease%variant linux-%kernelrelease-vanilla
cd linux-%kernelrelease-vanilla
%_sourcedir/apply-patches --vanilla %_sourcedir/series.conf %my_builddir
%symbols
rm -f $(find . -name ".gitignore")
cd ..
%endif

-cd "%buildroot/%src_install_dir"
+%if ! %vanilla_only
+ln -sf linux%variant linux%variant # dummy symlink
+
+cd linux-%kernelrelease%variant
%_sourcedir/apply-patches %_sourcedir/series.conf %my_builddir %symbols
rm -f $(find . -name ".gitignore")

if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
+%endif

# Hardlink duplicate files automatically (from package fdupes).
%fdupes $RPM_BUILD_ROOT

%install
+%if ! %vanilla_only
# Install the documentation and example Kernel Module Package.
DOC=$RPM_BUILD_ROOT/usr/share/doc/packages/%name
mkdir -p $DOC
@@ -220,6 +221,14 @@
-L "%src_install_dir"
popd

+# kernel-source and kernel-$flavor-devel are built independently, but the
+# shipped sources (/usr/src/linux/) need to be older than generated files
+# (/usr/src/linux-obj). We rely on the git commit timestamp to not point into
+# the future and be thus lower than the timestamps of files built from the
+# source (bnc#669669).
+ts="$(head -n1 %_sourcedir/source-timestamp)"
+find %buildroot/usr/src/linux* ! -type l | xargs touch -d "$ts"
+
%post -f %name-post.sh

%post -n kernel-devel%variant -f %name-post.sh
@@ -235,6 +244,7 @@
/usr/share/doc/packages/%name
/etc/rpm/macros.kernel-source
/usr/lib/rpm/kernel-module-subpackage
+%endif

%if %do_vanilla


++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.DPRIKu/_old 2011-02-11 02:16:17.000000000 +0100
+++ /var/tmp/diff_new_pack.DPRIKu/_new 2011-02-11 02:16:17.000000000 +0100
@@ -24,7 +24,7 @@
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
Version: 2.6.37
-Release: 10
+Release: 11
%if %using_buildservice
%else
%define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version
--qf "%{RELEASE}" | grep -v 'not installed' || echo 0)

++++++ kernel-trace.spec ++++++
--- /var/tmp/diff_new_pack.DPRIKu/_old 2011-02-11 02:16:17.000000000 +0100
+++ /var/tmp/diff_new_pack.DPRIKu/_new 2011-02-11 02:16:17.000000000 +0100
@@ -56,7 +56,7 @@
Name: kernel-trace
Summary: The Standard Kernel with Tracing Features
Version: 2.6.37
-Release: 10
+Release: 11
%if %using_buildservice
%else
%endif
@@ -310,7 +310,7 @@
cp ../config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
- --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+ --set-str CONFIG_LOCALVERSION %release_num-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
@@ -718,8 +718,9 @@
%endif

# Hardlink duplicate files automatically (from package fdupes): It doesn't save
-# much, but it keeps rpmlint from breaking the package build.
-%fdupes $RPM_BUILD_ROOT
+# much, but it keeps rpmlint from breaking the package build. Note that we skip
+# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
+%fdupes $RPM_BUILD_ROOT/lib

%preun -f preun.sh


kernel-vanilla.spec: same change
kernel-vmi.spec: same change
++++++ kernel-xen.spec ++++++
--- /var/tmp/diff_new_pack.DPRIKu/_old 2011-02-11 02:16:17.000000000 +0100
+++ /var/tmp/diff_new_pack.DPRIKu/_new 2011-02-11 02:16:17.000000000 +0100
@@ -56,7 +56,7 @@
Name: kernel-xen
Summary: The Xen Kernel
Version: 2.6.37
-Release: 7
+Release: 8
%if %using_buildservice
%else
%endif
@@ -301,7 +301,7 @@
cp ../config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
- --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+ --set-str CONFIG_LOCALVERSION %release_num-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
@@ -709,8 +709,9 @@
%endif

# Hardlink duplicate files automatically (from package fdupes): It doesn't save
-# much, but it keeps rpmlint from breaking the package build.
-%fdupes $RPM_BUILD_ROOT
+# much, but it keeps rpmlint from breaking the package build. Note that we skip
+# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
+%fdupes $RPM_BUILD_ROOT/lib

%preun -f preun.sh


++++++ compute-PATCHVERSION.sh ++++++
--- /var/tmp/diff_new_pack.DPRIKu/_old 2011-02-11 02:16:17.000000000 +0100
+++ /var/tmp/diff_new_pack.DPRIKu/_new 2011-02-11 02:16:17.000000000 +0100
@@ -20,7 +20,7 @@


source $(dirname $0)/config.sh
-set -- $(echo $SRCVERSION | sed -ne
's/\([0-9]\+\).\([0-9]\+\).\([0-9]\+\)\(.*\)/\1 \2 \3 \4/p')
+set -- $(echo $SRCVERSION | sed -rn 's/([0-9]+)\.([0-9]+)\.([0-9]+)(.*)/\1 \2
\3 \4/p')

VERSION=$1
PATCHLEVEL=$2

++++++ kernel-binary.spec.in ++++++
--- /var/tmp/diff_new_pack.DPRIKu/_old 2011-02-11 02:16:17.000000000 +0100
+++ /var/tmp/diff_new_pack.DPRIKu/_new 2011-02-11 02:16:17.000000000 +0100
@@ -228,7 +228,7 @@
cp ../config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
- --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+ --set-str CONFIG_LOCALVERSION %release_num-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
@@ -638,8 +638,9 @@
%endif

# Hardlink duplicate files automatically (from package fdupes): It doesn't save
-# much, but it keeps rpmlint from breaking the package build.
-%fdupes $RPM_BUILD_ROOT
+# much, but it keeps rpmlint from breaking the package build. Note that we skip
+# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
+%fdupes $RPM_BUILD_ROOT/lib

%preun -f preun.sh
%postun -f postun.sh

++++++ kernel-source.spec.in ++++++
--- /var/tmp/diff_new_pack.DPRIKu/_old 2011-02-11 02:16:18.000000000 +0100
+++ /var/tmp/diff_new_pack.DPRIKu/_new 2011-02-11 02:16:18.000000000 +0100
@@ -21,12 +21,11 @@
%define srcversion @SRCVERSION@
%define patchversion @PATCHVERSION@
%define variant @VARIANT@%{nil}
+%define vanilla_only @VANILLA_ONLY@

%include %_sourcedir/kernel-spec-macros

%define src_install_dir usr/src/linux-%kernelrelease%variant
-%define obj_install_dir /%src_install_dir-obj
-%define rpm_install_dir %buildroot%real_install_dir

Name: kernel-source@VARIANT@
Summary: The Linux Kernel Sources
@@ -160,17 +159,9 @@
%setup -q -c -T @UNPACK_PATCHES@

%build
-# Release number without the EXTRAVERSION
-RELEASE=%source_rel
-while [ "$RELEASE" != "${RELEASE#[^0-9]*.}" ]; do
- RELEASE=${RELEASE#[^0-9]*.}
-done
-
mkdir -p $RPM_BUILD_ROOT/usr/src
cd $RPM_BUILD_ROOT/usr/src

-ln -sf linux%variant linux%variant # dummy symlink
-
# Unpack the vanilla kernel sources
tar -xjf %_sourcedir/linux-%srcversion.tar.bz2
if test "%srcversion" != "%kernelrelease%variant"; then
@@ -179,25 +170,35 @@


%if %do_vanilla
-cp -al "%buildroot/%src_install_dir" linux-%kernelrelease-vanilla
+%if %vanilla_only
+ mv \
+%else
+ cp -al \
+%endif
+ linux-%kernelrelease%variant linux-%kernelrelease-vanilla
cd linux-%kernelrelease-vanilla
%_sourcedir/apply-patches --vanilla %_sourcedir/series.conf %my_builddir
%symbols
rm -f $(find . -name ".gitignore")
cd ..
%endif

-cd "%buildroot/%src_install_dir"
+%if ! %vanilla_only
+ln -sf linux%variant linux%variant # dummy symlink
+
+cd linux-%kernelrelease%variant
%_sourcedir/apply-patches %_sourcedir/series.conf %my_builddir %symbols
rm -f $(find . -name ".gitignore")

if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
+%endif

# Hardlink duplicate files automatically (from package fdupes).
%fdupes $RPM_BUILD_ROOT

%install
+%if ! %vanilla_only
# Install the documentation and example Kernel Module Package.
DOC=$RPM_BUILD_ROOT/usr/share/doc/packages/%name
mkdir -p $DOC
@@ -222,6 +223,14 @@
-L "%src_install_dir"
popd

+# kernel-source and kernel-$flavor-devel are built independently, but the
+# shipped sources (/usr/src/linux/) need to be older than generated files
+# (/usr/src/linux-obj). We rely on the git commit timestamp to not point into
+# the future and be thus lower than the timestamps of files built from the
+# source (bnc#669669).
+ts="$(head -n1 %_sourcedir/source-timestamp)"
+find %buildroot/usr/src/linux* ! -type l | xargs touch -d "$ts"
+
%post -f %name-post.sh

%post -n kernel-devel%variant -f %name-post.sh
@@ -237,6 +246,7 @@
/usr/share/doc/packages/%name
/etc/rpm/macros.kernel-source
/usr/lib/rpm/kernel-module-subpackage
+%endif

%if %do_vanilla
%files vanilla

++++++ kernel-spec-macros ++++++
--- /var/tmp/diff_new_pack.DPRIKu/_old 2011-02-11 02:16:18.000000000 +0100
+++ /var/tmp/diff_new_pack.DPRIKu/_new 2011-02-11 02:16:18.000000000 +0100
@@ -5,14 +5,28 @@
%define _buildshell /bin/bash

%define using_buildservice 0%{?opensuse_bs}
+
+# source_rel is the package release string, without the rebuild counter
+# generated by the build service. In non-official builds, the upstream
+# EXTRAVERSION component is also part of the release string,
+# e.g. next.20110101.9.6 (hyphens are replaced by periods). Builds in the
+# official distribution projects replace the release string though.
%define source_rel %release
%if %using_buildservice
-# The last digit is a volatile rebuild counter, strip it
%define source_rel %(release=%release; echo ${release%.*})
%endif

-%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
-%define kernelrelease %patchversion-%release_major
+# release_num is the numeric source revision part of the release number,
+# i.e. source_rel without the upstream tags like -rcX. A hyphen is added
+# automatically for convenient use.
+# examples: rc3 -> "", rc3.1 -> -1, next.20110101.9 -> -9
+#
+# patchversion is inserted into the spec files by the mkspec script, it is the
+# upstream release string unchanged, e.g. 2.6.38-rc3
+%define release_num %(upstream=%patchversion; upstream=${upstream#%version};
upstream=${upstream#-}; upstream=${upstream//-/.}; rel="%source_rel" ;
res="${rel#$upstream}"; res=${res#.}; echo ${res:+-}${res})
+
+# how the kernel release string (uname -r) should look like
+%define kernelrelease %patchversion%release_num

%define my_builddir %_builddir/%{name}-%{version}


++++++ minmem ++++++
--- /var/tmp/diff_new_pack.DPRIKu/_old 2011-02-11 02:16:20.000000000 +0100
+++ /var/tmp/diff_new_pack.DPRIKu/_new 2011-02-11 02:16:20.000000000 +0100
@@ -1 +1 @@
-2096000
+1048576

++++++ mkspec ++++++
--- /var/tmp/diff_new_pack.DPRIKu/_old 2011-02-11 02:16:20.000000000 +0100
+++ /var/tmp/diff_new_pack.DPRIKu/_new 2011-02-11 02:16:20.000000000 +0100
@@ -25,7 +25,9 @@

# config.sh variables
my %vars = parse_config_sh();
-my ($srcversion, $variant) = ($vars{'SRCVERSION'}, $vars{'VARIANT'});
+my ($srcversion, $variant, $vanilla_only) =
+ ($vars{'SRCVERSION'}, $vars{'VARIANT'}, $vars{'VANILLA_ONLY'});
+$vanilla_only ||= "0";

# rpm changelog
my $changelog = convert_changes();
@@ -65,6 +67,7 @@

my %macros = (
VARIANT => $variant,
+ VANILLA_ONLY => $vanilla_only,
SRCVERSION => $srcversion,
PATCHVERSION => $patchversion,
RPMVERSION => $rpmversion,

++++++ needed_space_in_mb ++++++
--- /var/tmp/diff_new_pack.DPRIKu/_old 2011-02-11 02:16:20.000000000 +0100
+++ /var/tmp/diff_new_pack.DPRIKu/_new 2011-02-11 02:16:20.000000000 +0100
@@ -1 +1 @@
-6000
+6144

++++++ patches.arch.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.arch/x86-mtrr-avoid-MTRR-reprogramming-on-BP-during-boot-on.patch
new/patches.arch/x86-mtrr-avoid-MTRR-reprogramming-on-BP-during-boot-on.patch
---
old/patches.arch/x86-mtrr-avoid-MTRR-reprogramming-on-BP-during-boot-on.patch
1970-01-01 01:00:00.000000000 +0100
+++
new/patches.arch/x86-mtrr-avoid-MTRR-reprogramming-on-BP-during-boot-on.patch
2011-02-03 21:54:01.000000000 +0100
@@ -0,0 +1,92 @@
+From: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
+Subject: x86, mtrr: avoid MTRR reprogramming on BP during boot on
+Patch-mainline: Not yet
+References: bnc#623393
+
+Markus Kohm ran into a hard hang regression on an acer aspire 1310, when acpi
is
+enabled. git bisect showed the following commit as the bad one that introduced
+the boot regression.
+
+ commit d0af9eed5aa91b6b7b5049cae69e5ea956fd85c3
+ Author: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
+ Date: Wed Aug 19 18:05:36 2009 -0700
+
+ x86, pat/mtrr: Rendezvous all the cpus for MTRR/PAT init
+
+Because of the UP configuration of that platform, native_smp_prepare_cpus()
+bailed out (in smp_sanity_check()) before doing the set_mtrr_aps_delayed_init()
+
+Further down the boot path, native_smp_cpus_done() will call the delayed
+MTRR initialization for the AP's (mtrr_aps_init()) with mtrr_aps_delayed_init
+not set. This resulted in the boot processor reprogramming its MTRR's to
+the values seen during the start of the OS boot. While this is not needed
+ideally, this shouldn't have caused any side-effects. This is because the
+reprogramming of MTRR's (set_mtrr_state() that gets called via set_mtrr()) will
+check if the live register contents are different from what is being
+asked to write and will do the actual write only if they are different.
+
+BP's mtrr state is read during the start of the OS boot and typically nothing
+would have changed when we ask to reprogram it on BP again because of the above
+scenario on an UP platform. So on a normal UP platform no reprogramming of BP
+MTRR MSR's happens and all is well.
+
+However, on this platform, bios seems to be modifying the fixed mtrr range
+registers between the start of OS boot and when we double check the live
+registers for reprogramming BP MTRR registers. And as the live registers are
+modified, we end up reprogramming the MTRR's to the state seen during
+the start of the OS boot.
+
+During ACPI initialization, something in the bios (probably smi handler?) don't
+like this fact and results in a hard lockup.
+
+We didn't see this boot hang issue on this platform before the commit
+d0af9eed5aa91b6b7b5049cae69e5ea956fd85c3, because only the AP's (if any)
+will program its MTRR's to the value that BP had at the start of the OS boot.
+
+Fix this issue by checking mtrr_aps_delayed_init before continuing
+further in the mtrr_aps_init(). Now, only AP's (if any) will program
+its MTRR's to the BP values during boot.
+
+Addresses https://bugzilla.novell.com/show_bug.cgi?id=623393
+
+ [By the way, this behavior of the bios modifying MTRR's after the start
+ of the OS boot is not common and the kernel is not prepared to
+ handle this situation well. Irrespective of this issue, during
+ suspend/resume, linux kernel will try to reprogram the BP's MTRR values
+ to the values seen during the start of the OS boot. So suspend/resume might
+ be already broken on this platform for all linux kernel versions.]
+
+Reported-and-bisected-by: Markus Kohm <jabber@xxxxxxx>
+Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
+Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
+---
+ arch/x86/kernel/cpu/mtrr/main.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+Index: linux-2.6.37-openSUSE-11.4/arch/x86/kernel/cpu/mtrr/main.c
+===================================================================
+--- linux-2.6.37-openSUSE-11.4.orig/arch/x86/kernel/cpu/mtrr/main.c
++++ linux-2.6.37-openSUSE-11.4/arch/x86/kernel/cpu/mtrr/main.c
+@@ -793,13 +793,21 @@ void set_mtrr_aps_delayed_init(void)
+ }
+
+ /*
+- * MTRR initialization for all AP's
++ * Delayed MTRR initialization for all AP's
+ */
+ void mtrr_aps_init(void)
+ {
+ if (!use_intel())
+ return;
+
++ /*
++ * Check if someone has requested the delay of AP MTRR initialization,
++ * by doing set_mtrr_aps_delayed_init(), prior to this point. If not,
++ * then we are done.
++ */
++ if (!mtrr_aps_delayed_init)
++ return;
++
+ set_mtrr(~0U, 0, 0, 0);
+ mtrr_aps_delayed_init = false;
+ }

++++++ patches.drivers.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.drivers/alsa-hda-0001-Fix-memory-leaks-in-conexant-jack-arrays
new/patches.drivers/alsa-hda-0001-Fix-memory-leaks-in-conexant-jack-arrays
--- old/patches.drivers/alsa-hda-0001-Fix-memory-leaks-in-conexant-jack-arrays
1970-01-01 01:00:00.000000000 +0100
+++ new/patches.drivers/alsa-hda-0001-Fix-memory-leaks-in-conexant-jack-arrays
2011-02-09 13:00:11.000000000 +0100
@@ -0,0 +1,51 @@
+From 70f7db11c45a313b23922cacf248c613c3b2144c Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@xxxxxxx>
+Date: Wed, 2 Feb 2011 17:16:38 +0100
+Subject: [PATCH] ALSA: hda - Fix memory leaks in conexant jack arrays
+Git-commit: 70f7db11c45a313b23922cacf248c613c3b2144c Mon Sep 17 00:00:00 2001
+Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git
+Patch-mainline: Submitted
+References: bnc#668929
+
+The Conexant codec driver adds the jack arrays in init callback which
+may be called also in each PM resume. This results in the addition of
+new jack element at each time.
+
+The fix is to check whether the requested jack is already present in
+the array.
+
+Reference: Novell bug 668929
+ https://bugzilla.novell.com/show_bug.cgi?id=668929
+
+Cc: <stable@xxxxxxxxxx>
+Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
+
+---
+ sound/pci/hda/patch_conexant.c | 8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
+index 7e1ca43..fbe97d3 100644
+--- a/sound/pci/hda/patch_conexant.c
++++ b/sound/pci/hda/patch_conexant.c
+@@ -407,10 +407,16 @@ static int conexant_add_jack(struct hda_codec *codec,
+ struct conexant_spec *spec;
+ struct conexant_jack *jack;
+ const char *name;
+- int err;
++ int i, err;
+
+ spec = codec->spec;
+ snd_array_init(&spec->jacks, sizeof(*jack), 32);
++
++ jack = spec->jacks.list;
++ for (i = 0; i < spec->jacks.used; i++, jack++)
++ if (jack->nid == nid)
++ return 0 ; /* already present */
++
+ jack = snd_array_new(&spec->jacks);
+ name = (type == SND_JACK_HEADPHONE) ? "Headphone" : "Mic" ;
+
+--
+1.7.3.4
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.drivers/alsa-hda-0002-Fix-missing-CA-initialization-for-HDMI-DP
new/patches.drivers/alsa-hda-0002-Fix-missing-CA-initialization-for-HDMI-DP
--- old/patches.drivers/alsa-hda-0002-Fix-missing-CA-initialization-for-HDMI-DP
1970-01-01 01:00:00.000000000 +0100
+++ new/patches.drivers/alsa-hda-0002-Fix-missing-CA-initialization-for-HDMI-DP
2011-02-09 13:00:11.000000000 +0100
@@ -0,0 +1,41 @@
+From 11839aed21881d7edd65dd79f22a8eb18426f672 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@xxxxxxx>
+Date: Tue, 8 Feb 2011 17:25:49 +0100
+Subject: [PATCH] ALSA: hda - Fix missing CA initialization for HDMI/DP
+Git-commit: 11839aed21881d7edd65dd79f22a8eb18426f672
+Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git
+Patch-mainline: Submitted
+References: bnc#670577
+
+The commit 53d7d69d8ffdfa60c5b66cc2e9ee0774aaaef5c0
+ ALSA: hdmi - support infoframe for DisplayPort
+dropped the initialization of CA field accidentally.
+This resulted in only two-channel LPCM mode on Nvidia machines.
+
+Reference: kernel bug 28592
+ https://bugzilla.kernel.org/show_bug.cgi?id=28592
+
+Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
+
+---
+ sound/pci/hda/patch_hdmi.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/sound/pci/hda/patch_hdmi.c
++++ b/sound/pci/hda/patch_hdmi.c
+@@ -637,6 +637,7 @@
+ hdmi_ai->ver = 0x01;
+ hdmi_ai->len = 0x0a;
+ hdmi_ai->CC02_CT47 = channels - 1;
++ hdmi_ai->CA = ca;
+ hdmi_checksum_audio_infoframe(hdmi_ai);
+ } else if (spec->sink_eld[i].conn_type == 1) { /* DisplayPort */
+ struct dp_audio_infoframe *dp_ai;
+@@ -646,6 +647,7 @@
+ dp_ai->len = 0x1b;
+ dp_ai->ver = 0x11 << 2;
+ dp_ai->CC02_CT47 = channels - 1;
++ dp_ai->CA = ca;
+ } else {
+ snd_printd("HDMI: unknown connection type at pin %d\n",
+ pin_nid);

++++++ patches.fixes.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/patches.fixes/calibrate-jiffy-overflow
new/patches.fixes/calibrate-jiffy-overflow
--- old/patches.fixes/calibrate-jiffy-overflow 1970-01-01 01:00:00.000000000
+0100
+++ new/patches.fixes/calibrate-jiffy-overflow 2011-02-08 17:32:32.000000000
+0100
@@ -0,0 +1,36 @@
+From: http://xenbits.xen.org/XCP/linux-2.6.32.pq.hg?rev/9374bf463b5b
+Subject: Fix jiffy calculations in calibrate_delay_direct to handle overflow.
+Patch-Mainline: not yet
+
+Fixes a hang when booting as dom0 under Xen, when jiffies can be
+quite large by the time the kernel init gets this far.
+
+Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxx>
+
+!time_after() -> time_before_eq() as per suggestion from Jiri Slaby.
+
+Acked-by: jbeulich@xxxxxxxxxx
+Acked-by: jslaby@xxxxxxx
+
+--- a/init/calibrate.c 2010-02-24 19:52:17.000000000 +0100
++++ b/init/calibrate.c 2011-01-28 11:00:10.000000000 +0100
+@@ -66,7 +66,7 @@ static unsigned long __cpuinit calibrate
+ pre_start = 0;
+ read_current_timer(&start);
+ start_jiffies = jiffies;
+- while (jiffies <= (start_jiffies + 1)) {
++ while (time_before_eq(jiffies, start_jiffies + 1)) {
+ pre_start = start;
+ read_current_timer(&start);
+ }
+@@ -74,8 +74,8 @@ static unsigned long __cpuinit calibrate
+
+ pre_end = 0;
+ end = post_start;
+- while (jiffies <=
+- (start_jiffies + 1 + DELAY_CALIBRATION_TICKS)) {
++ while (time_before_eq(jiffies, start_jiffies + 1 +
++ DELAY_CALIBRATION_TICKS)) {
+ pre_end = end;
+ read_current_timer(&end);
+ }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.fixes/fix-prlimit64-for-suid-sgid-processes.patch
new/patches.fixes/fix-prlimit64-for-suid-sgid-processes.patch
--- old/patches.fixes/fix-prlimit64-for-suid-sgid-processes.patch
1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/fix-prlimit64-for-suid-sgid-processes.patch
2011-02-08 17:32:32.000000000 +0100
@@ -0,0 +1,38 @@
+From aa5bd67dcfdf9af34c7fa36ebc87d4e1f7e91873 Mon Sep 17 00:00:00 2001
+From: Kacper Kornet <kornet@xxxxxxxxxxx>
+Date: Sat, 29 Jan 2011 00:21:04 +0100
+Subject: Fix prlimit64 for suid/sgid processes
+Git-commit: aa5bd67dcfdf9af34c7fa36ebc87d4e1f7e91873
+Patch-mainline: yes
+References: bnc#668262
+
+Since check_prlimit_permission always fails in the case of SUID/GUID
+processes, such processes are not able to read or set their own limits.
+This commit changes this by assuming that process can always read/change
+its own limits.
+
+Signed-off-by: Kacper Kornet <kornet@xxxxxxxxxxx>
+Acked-by: Jiri Slaby <jslaby@xxxxxxx>
+Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
+Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
+---
+ kernel/sys.c | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/kernel/sys.c b/kernel/sys.c
+index 31b71a2..18da702 100644
+--- a/kernel/sys.c
++++ b/kernel/sys.c
+@@ -1385,7 +1385,8 @@ static int check_prlimit_permission(struct task_struct
*task)
+ const struct cred *cred = current_cred(), *tcred;
+
+ tcred = __task_cred(task);
+- if ((cred->uid != tcred->euid ||
++ if (current != task &&
++ (cred->uid != tcred->euid ||
+ cred->uid != tcred->suid ||
+ cred->uid != tcred->uid ||
+ cred->gid != tcred->egid ||
+--
+1.7.3.4
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.fixes/loop-queue_lock-null-pointer-derefence-in-blk_throtl_exit-v3.patch

new/patches.fixes/loop-queue_lock-null-pointer-derefence-in-blk_throtl_exit-v3.patch
---
old/patches.fixes/loop-queue_lock-null-pointer-derefence-in-blk_throtl_exit-v3.patch
1970-01-01 01:00:00.000000000 +0100
+++
new/patches.fixes/loop-queue_lock-null-pointer-derefence-in-blk_throtl_exit-v3.patch
2011-02-08 17:32:32.000000000 +0100
@@ -0,0 +1,67 @@
+From: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx>
+Subject: block: loop queue_lock null pointer derefence in blk_throtl_exit v3
+Patch-mainline: not yet
+References: bnc#666598
+
+Performing
+$ sudo mount -o loop -o umask=0 /dev/sdb1 /mnt/
+mount: wrong fs type, bad option, bad superblock on /dev/loop0,
+ missing codepage or helper program, or other error
+ In some cases useful info is found in syslog - try
+ dmesg | tail or so
+
+$ sudo modprobe -r loop
+
+results in oops:
+
+ BUG: unable to handle kernel NULL pointer dereference at 0000000000000004
+ IP: [<ffffffff812479d4>] do_raw_spin_lock+0x14/0x122
+ Process modprobe (pid: 6189, threadinfo ffff88009a898000, task
+ ffff880154a88000)
+ Call Trace:
+ [<ffffffff81486788>] _raw_spin_lock_irq+0x4a/0x51
+ [<ffffffff8123404b>] ? blk_throtl_exit+0x3b/0xa0
+ [<ffffffff8105b120>] ? cancel_delayed_work_sync+0xd/0xf
+ [<ffffffff8123404b>] blk_throtl_exit+0x3b/0xa0
+ [<ffffffff81229bc8>] blk_release_queue+0x21/0x65
+ [<ffffffff8123bb06>] kobject_release+0x51/0x66
+ [<ffffffff8123bab5>] ? kobject_release+0x0/0x66
+ [<ffffffff8123ce1e>] kref_put+0x43/0x4d
+ [<ffffffff8123ba27>] kobject_put+0x47/0x4b
+ [<ffffffff8122717c>] blk_cleanup_queue+0x56/0x5b
+ [<ffffffffa01c3824>] loop_exit+0x68/0x844 [loop]
+ [<ffffffff8107cccc>] sys_delete_module+0x1e8/0x25b
+ [<ffffffff814864c9>] ? trace_hardirqs_on_thunk+0x3a/0x3f
+ [<ffffffff81002112>] system_call_fastpath+0x16/0x1b
+
+because of an attempt to acquire NULL queue_lock. Added the same lines as
+in blk_queue_make_request - `fall back to embedded per-queue lock' - when
+call blk_release_queue on allocated but not initialized queue.
+
+Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx>
+Cc: Vivek Goyal <vgoyal@xxxxxxxxxx>
+Cc: Jens Axboe <jaxboe@xxxxxxxxxxxx>
+Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
+Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
+---
+
+ block/blk-sysfs.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff -puN
block/blk-sysfs.c~loop-queue_lock-null-pointer-derefence-in-blk_throtl_exit-v3
block/blk-sysfs.c
+---
a/block/blk-sysfs.c~loop-queue_lock-null-pointer-derefence-in-blk_throtl_exit-v3
++++ a/block/blk-sysfs.c
+@@ -471,6 +471,12 @@ static void blk_release_queue(struct kob
+
+ blk_sync_queue(q);
+
++ /* It's possible that blk_release_queue will be called on allocated
++ * but never initilalized queue. Fall back to our embedded per-queue
++ * locks in this case. */
++ if (!q->queue_lock)
++ q->queue_lock = &q->__queue_lock;
++
+ blk_throtl_exit(q);
+
+ if (rl->rq_pool)
+_
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack
new/patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack
--- old/patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack
1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack
2011-02-08 17:32:32.000000000 +0100
@@ -0,0 +1,104 @@
+From: Jeff Mahoney <jeffm@xxxxxxxx>
+Subject: netfilter: Implement RFC 1123 for FTP conntrack
+References: bnc#466279
+Patch-mainline: Submitted via
http://bugzilla.netfilter.org/show_bug.cgi?id=574 23 Jan 2011
+
+ The FTP conntrack code currently only accepts the following format for
+ the 227 response for PASV:
+ 227 Entering Passive Mode (148,100,81,40,31,161).
+
+ It doesn't accept the following format from an obscure server:
+ 227 Data transfer will passively listen to 67,218,99,134,50,144
+
+ From RFC 1123:
+ The format of the 227 reply to a PASV command is not
+ well standardized. In particular, an FTP client cannot
+ assume that the parentheses shown on page 40 of RFC-959
+ will be present (and in fact, Figure 3 on page 43 omits
+ them). Therefore, a User-FTP program that interprets
+ the PASV reply must scan the reply for the first digit
+ of the host and port numbers.
+
+ This patch adds support for the RFC 1123 clarification by:
+ - Allowing a search filter to specify NUL as the terminator so that
+ try_number will return successfully if the array of numbers has been
+ filled when an unexpected character is encountered.
+ - Using space as the separator for the 227 reply and then scanning for
+ the first digit of the number sequence. The number sequence is parsed
+ out using the existing try_rfc959 but with a NUL terminator.
+
+ Tracked in: https://bugzilla.novell.com/show_bug.cgi?id=466279
+
+Reported-by: Mark Post <mpost@xxxxxxxxxx>
+Signed-off-by: Jeff Mahoney <jeffm@xxxxxxxx>
+---
+ net/netfilter/nf_conntrack_ftp.c | 36 +++++++++++++++++++++++++++++++-----
+ 1 file changed, 31 insertions(+), 5 deletions(-)
+
+--- a/net/netfilter/nf_conntrack_ftp.c
++++ b/net/netfilter/nf_conntrack_ftp.c
+@@ -53,6 +53,7 @@ unsigned int (*nf_nat_ftp_hook)(struct s
+ EXPORT_SYMBOL_GPL(nf_nat_ftp_hook);
+
+ static int try_rfc959(const char *, size_t, struct nf_conntrack_man *, char);
++static int try_rfc1123(const char *, size_t, struct nf_conntrack_man *, char);
+ static int try_eprt(const char *, size_t, struct nf_conntrack_man *, char);
+ static int try_epsv_response(const char *, size_t, struct nf_conntrack_man *,
+ char);
+@@ -87,10 +88,10 @@ static struct ftp_search {
+ {
+ .pattern = "227 ",
+ .plen = sizeof("227 ") - 1,
+- .skip = '(',
+- .term = ')',
++ .skip = ' ',
++ .term = '\0',
+ .ftptype = NF_CT_FTP_PASV,
+- .getnum = try_rfc959,
++ .getnum = try_rfc1123,
+ },
+ {
+ .pattern = "229 ",
+@@ -129,8 +130,9 @@ static int try_number(const char *data,
+ i++;
+ else {
+ /* Unexpected character; true if it's the
+- terminator and we're finished. */
+- if (*data == term && i == array_size - 1)
++ terminator (or we don't care about one)
++ and we're finished. */
++ if ((*data == term || !term) && i == array_size - 1)
+ return len;
+
+ pr_debug("Char %u (got %u nums) `%u' unexpected\n",
+@@ -160,6 +162,30 @@ static int try_rfc959(const char *data,
+ return length;
+ }
+
++/*
++ * From RFC 1123:
++ * The format of the 227 reply to a PASV command is not
++ * well standardized. In particular, an FTP client cannot
++ * assume that the parentheses shown on page 40 of RFC-959
++ * will be present (and in fact, Figure 3 on page 43 omits
++ * them). Therefore, a User-FTP program that interprets
++ * the PASV reply must scan the reply for the first digit
++ * of the host and port numbers.
++ */
++static int try_rfc1123(const char *data, size_t dlen,
++ struct nf_conntrack_man *cmd, char term)
++{
++ int i;
++ for (i = 0; i < dlen; i++)
++ if (isdigit(data[i]))
++ break;
++
++ if (i == dlen)
++ return 0;
++
++ return try_rfc959(data + i, dlen - i, cmd, 0);
++}
++
+ /* Grab port: number up to delimiter */
+ static int get_port(const char *data, int start, size_t dlen, char delim,
+ __be16 *port)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.fixes/orinoco-allow-IW_AUTH_MFP-to-pass-through.patch
new/patches.fixes/orinoco-allow-IW_AUTH_MFP-to-pass-through.patch
--- old/patches.fixes/orinoco-allow-IW_AUTH_MFP-to-pass-through.patch
1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/orinoco-allow-IW_AUTH_MFP-to-pass-through.patch
2011-02-08 17:32:32.000000000 +0100
@@ -0,0 +1,53 @@
+From 329b32fedc94fd9158f1635ac64f4ae6a00d374c Mon Sep 17 00:00:00 2001
+From: David Kilroy <kilroyd@xxxxxxxxxxxxxx>
+Date: Thu, 2 Dec 2010 18:19:21 +0000
+Subject: orinoco: allow IW_AUTH_MFP to pass through
+Git-commit: 329b32fedc94fd9158f1635ac64f4ae6a00d374c
+Patch-mainline: yes
+References: bnc#661624
+
+The card doesn't support MFP, so silently accept DISABLED and OPTIONAL
+settings.
+
+This avoids the following failure in wpa_supplicant logs:
+
+State: SCANNING -> ASSOCIATING
+wpa_driver_wext_set_operstate: operstate 0->0 (DORMANT)
+netlink: Operstate: linkmode=-1, operstate=5
+wpa_driver_wext_associate
+wpa_driver_wext_set_drop_unencrypted
+wpa_driver_wext_set_psk
+wpa_driver_wext_associate: assoc failed because set_auth_param(IW_AUTH_MFP)
failed
+Association request to the driver failed
+
+Signed-off by: David Kilroy <kilroyd@xxxxxxxxxxxxxx>
+Reported by: Giacomo Comes <comes@xxxxxxxx>
+
+Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
+Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
+---
+ drivers/net/wireless/orinoco/wext.c | 8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/wireless/orinoco/wext.c
b/drivers/net/wireless/orinoco/wext.c
+index 93505f9..8e65ffc 100644
+--- a/drivers/net/wireless/orinoco/wext.c
++++ b/drivers/net/wireless/orinoco/wext.c
+@@ -893,6 +893,14 @@ static int orinoco_ioctl_set_auth(struct net_device *dev,
+ */
+ break;
+
++ case IW_AUTH_MFP:
++ /* Management Frame Protection not supported.
++ * Only fail if set to required.
++ */
++ if (param->value == IW_AUTH_MFP_REQUIRED)
++ ret = -EINVAL;
++ break;
++
+ case IW_AUTH_KEY_MGMT:
+ /* wl_lkm implies value 2 == PSK for Hermes I
+ * which ties in with WEXT
+--
+1.7.3.4
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.fixes/staging-rt2860-Fix-incorrect-netif_stop_queue-usage.patch
new/patches.fixes/staging-rt2860-Fix-incorrect-netif_stop_queue-usage.patch
--- old/patches.fixes/staging-rt2860-Fix-incorrect-netif_stop_queue-usage.patch
1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/staging-rt2860-Fix-incorrect-netif_stop_queue-usage.patch
2011-02-08 17:32:32.000000000 +0100
@@ -0,0 +1,36 @@
+From 9c33008412683eba91bce2dc4575f28c728b6bd1 Mon Sep 17 00:00:00 2001
+From: Denis Kirjanov <dkirjanov@xxxxxxxxxx>
+Date: Mon, 10 Jan 2011 20:09:30 +0000
+Subject: staging: rt2860: Fix incorrect netif_stop_queue usage warning
+Git-commit: 9c33008412683eba91bce2dc4575f28c728b6bd1
+Patch-mainline: yes
+References: bnc#661657
+
+The TX queues are allocated inside register_netdev.
+It doesn't make any sense to stop the queue before
+allocation.
+
+Signed-off-by: Denis Kirjanov <dkirjanov@xxxxxxxxxx>
+Cc: stable <stable@xxxxxxxxxx>
+Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
+Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
+---
+ drivers/staging/rt2860/rt_main_dev.c | 2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/staging/rt2860/rt_main_dev.c
b/drivers/staging/rt2860/rt_main_dev.c
+index 701561d..236dd36 100644
+--- a/drivers/staging/rt2860/rt_main_dev.c
++++ b/drivers/staging/rt2860/rt_main_dev.c
+@@ -484,8 +484,6 @@ struct net_device *RtmpPhyNetDevInit(struct
rt_rtmp_adapter *pAd,
+ net_dev->ml_priv = (void *)pAd;
+ pAd->net_dev = net_dev;
+
+- netif_stop_queue(net_dev);
+-
+ return net_dev;
+
+ }
+--
+1.7.3.4
+

++++++ patches.rpmify.tar.bz2 ++++++
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 2011-01-22 00:32:08.000000000 +0100
+++ new/patches.rpmify/cloneconfig.diff 2011-01-31 23:00:46.000000000 +0100
@@ -32,7 +32,7 @@
+ *) cat $(CLONECONFIG) > .config.running ;; \
+ esac && \
+ echo -e "Cloning configuration file $(CLONECONFIG)\n"
-+ $(Q)$< -D .config.running arch/$(SRCARCH)/Kconfig
++ $(Q)$< --defconfig=.config.running arch/$(SRCARCH)/Kconfig
+

PHONY += listnewconfig oldnoconfig savedefconfig defconfig

++++++ patches.suse.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/patches.suse/stack-unwind
new/patches.suse/stack-unwind
--- old/patches.suse/stack-unwind 2011-01-22 00:32:08.000000000 +0100
+++ new/patches.suse/stack-unwind 2011-02-08 16:52:35.000000000 +0100
@@ -897,7 +897,7 @@
mod->symtab = mod->core_symtab;
--- /dev/null
+++ b/kernel/unwind.c
-@@ -0,0 +1,1303 @@
+@@ -0,0 +1,1305 @@
+/*
+ * Copyright (C) 2002-2006 Novell, Inc.
+ * Jan Beulich <jbeulich@xxxxxxxxxx>
@@ -1949,21 +1949,21 @@
+ if (!fde)
+ dprintk(1, "FDE validation failed (%p,%p).", ptr, end);
+ }
-+#ifdef CONFIG_FRAME_POINTER
+ if (cie == NULL || fde == NULL) {
++#ifdef CONFIG_FRAME_POINTER
+ unsigned long top = TSK_STACK_TOP(frame->task);
+ unsigned long bottom = STACK_BOTTOM(frame->task);
+ unsigned long fp = UNW_FP(frame);
+ unsigned long sp = UNW_SP(frame);
+ unsigned long link;
+
-+ if ((sp | fp) & sizeof(unsigned long))
++ if ((sp | fp) & (sizeof(unsigned long) - 1))
+ return -EPERM;
+
+# if FRAME_RETADDR_OFFSET < 0
+ if (!(sp < top && fp <= sp && bottom < fp))
+# else
-+ if (!(sp < top && fp >= sp && bottom < fp))
++ if (!(sp > top && fp >= sp && bottom > fp))
+# endif
+ return -ENXIO;
+
@@ -1973,11 +1973,11 @@
+# if FRAME_RETADDR_OFFSET < 0
+ if (!(link > bottom && link < fp))
+# else
-+ if (!(link > bottom && link > fp))
++ if (!(link < bottom && link > fp))
+# endif
+ return -ENXIO;
+
-+ if (link & (sizeof(unsigned long) - 1))
++ if (link & (sizeof(link) - 1))
+ return -ENXIO;
+
+ fp += FRAME_RETADDR_OFFSET;
@@ -1992,8 +1992,10 @@
+# endif
+ UNW_FP(frame) = link;
+ return 0;
-+ }
++#else
++ return -ENXIO;
+#endif
++ }
+ state.org = startLoc;
+ memcpy(&state.cfa, &badCFA, sizeof(state.cfa));
+ /* process instructions */

++++++ patches.xen.tar.bz2 ++++++
++++ 45159 lines of diff (skipped)

++++++ series.conf ++++++
--- /var/tmp/diff_new_pack.DPRIKu/_old 2011-02-11 02:16:21.000000000 +0100
+++ /var/tmp/diff_new_pack.DPRIKu/_new 2011-02-11 02:16:21.000000000 +0100
@@ -94,6 +94,7 @@
# I'm accepting it for now because it fixes the crashes that
# many of us have been seeing with 2.6.37-rcX. -jeffm
patches.fixes/sched-cgroup-use-exit-hook-to-avoid-use-after-free-crash
+ patches.fixes/fix-prlimit64-for-suid-sgid-processes.patch

########################################################
# Architecture-specific patches. These used to be all
@@ -137,6 +138,8 @@

patches.suse/x86-mark_rodata_rw.patch

+
patches.arch/x86-mtrr-avoid-MTRR-reprogramming-on-BP-during-boot-on.patch
+
########################################################
# x86 MCE/MCA (Machine Check Error/Architecture) extensions
########################################################
@@ -229,6 +232,7 @@
########################################################
patches.suse/connector-read-mostly
patches.suse/kbd-ignore-gfx.patch
+ patches.fixes/calibrate-jiffy-overflow

########################################################
#
@@ -452,6 +456,7 @@

patches.suse/netfilter-ip_conntrack_slp.patch
patches.fixes/fix-nf_conntrack_slp
+ patches.fixes/netfilter-implement-rfc-1123-for-ftp-conntrack

########################################################
#
@@ -496,6 +501,7 @@

patches.fixes/scsi-ibmvscsi-module_alias.patch
patches.fixes/fix-ata-panic-with-ata_id
+
patches.fixes/loop-queue_lock-null-pointer-derefence-in-blk_throtl_exit-v3.patch

########################################################
# DRM/Video
@@ -527,6 +533,8 @@
patches.suse/wireless-no-aes-select
patches.suse/b43-missing-firmware-info.patch

patches.fixes/iwlwifi-fix-tx-power-configuration-on-3945-and-4965-devices
+ patches.fixes/staging-rt2860-Fix-incorrect-netif_stop_queue-usage.patch
+ patches.fixes/orinoco-allow-IW_AUTH_MFP-to-pass-through.patch

########################################################
# ISDN
@@ -570,6 +578,8 @@
##########################################################
# Sound
##########################################################
+ patches.drivers/alsa-hda-0001-Fix-memory-leaks-in-conexant-jack-arrays
+ patches.drivers/alsa-hda-0002-Fix-missing-CA-initialization-for-HDMI-DP

########################################################
# Other driver fixes
@@ -737,10 +747,6 @@
patches.xen/ipv6-no-autoconf
patches.xen/pci-guestdev
patches.xen/pci-reserve
-+needs_update-33 patches.xen/sfc-driverlink
-+needs_update-33 patches.xen/sfc-resource-driver
-+needs_update-33 patches.xen/sfc-driverlink-conditional
-+needs_update-33 patches.xen/sfc-external-sram
patches.xen/tmem

# bulk stuff, new files for xen
@@ -760,9 +766,6 @@
# fixups due to upstream Xen parts
patches.xen/xen3-fixup-xen

-+needs_update-33 patches.xen/sfc-set-arch
-+needs_update-33 patches.xen/sfc-endianness
-
# newer changeset backports

# changes outside arch/{i386,x86_64}/xen
@@ -794,7 +797,6 @@
patches.xen/xen3-seccomp-disable-tsc-option
patches.xen/xen3-x86-mcp51-no-dac
patches.xen/xen3-x86-mark_rodata_rw.patch
- patches.xen/xen3-acpi_processor_check_maxcpus.patch
patches.xen/xen3-stack-unwind
patches.xen/xen3-x86_64-unwind-annotations


++++++ source-timestamp ++++++
--- /var/tmp/diff_new_pack.DPRIKu/_old 2011-02-11 02:16:21.000000000 +0100
+++ /var/tmp/diff_new_pack.DPRIKu/_new 2011-02-11 02:16:21.000000000 +0100
@@ -1,3 +1,3 @@
-2011-01-22 00:41:44 +0100
-GIT Revision: fa7af15525aa80c8d9c1b092a98b348c11df390e
-GIT Branch: master
+2011-02-09 14:44:19 +0100
+GIT Revision: 31e675a20f711a01725583694d920da20d5f47c2
+GIT Branch: openSUSE-11.4


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread