Bug#400675: kernel-patch-openvz: patch still not applying cleanly

2007-01-26 Thread Steve Langasek
On Mon, Jan 22, 2007 at 10:35:04AM +0100, Ola Lundqvist wrote:
 On Mon, Jan 22, 2007 at 12:33:33AM -0800, Steve Langasek wrote:
  On Mon, Jan 22, 2007 at 08:45:21AM +0100, Ola Lundqvist wrote:
   Do you know if there will be more updates to the kernel after -8?

  Yes, there will.

 Ok, good to know. Upsream and I are subscribed to the package
 tracking system for such uploads so we should be informed quite quickly.

You've probably seen by now that -9 has been uploaded.  There will
definitely be a -10 as well for etch, there are still outstanding RC bugs
that need fixing; but -9 needs to be the final ABI and therefore shouldn't
(I hope) be including any more large upstream merges.

   If so I need to be prepared as that will probably break this patch.

  Why is this patch so fragile?  If it breaks that easily, it hardly seems
  releasable -- how do we protect against it being broken by security updates?

 the patch is very big (about 700k) and applies to huge amount of places in the
 kernel. From 2.6.19 somekind of hook functionality is in place as
 far as I understand, but for 2.6.18 it is not possible to use that. I do not
 know if it solves all the problems though.

 The problem have arized everytime the kernel team change from
 2.6.18 to 2.6.18.3 and then to 2.6.18.6. I do not think a problem have
 arized when just doing minor updates, but I do not know for sure and it
 depends on the update.

Well, the lack of surety is what has me concerned.

 But security updates may need to be coordinated.

Is the security team aware that this is the case?

 I assume that same problem can arize for vserver and xen patch, but those
 patches are a part of the kernel source nowdays.

Yes, which means any problems with those patches are detected at build time
for the linux-2.6 package -- clearly not the case for openvz right now.

On Mon, Jan 22, 2007 at 02:10:02PM +0300, Kir Kolyshkin wrote:
 One failed hunk in net/ipv6/udp.c -- looks like the patch from 2.6.18.5 
 is not applied to linux-source-2.6.18-7:
 * http://tinyurl.com/2n9554

 Six failed hunks in net/ipv4/ip_tables.c -- same, looks like a few 
 patches from 2.6.18.y-stable are not applied to linux-source-2.6.18-7. I 
 see at least the following ones:
 * http://tinyurl.com/2l5sae
 * http://tinyurl.com/38bgxa
 * http://tinyurl.com/2wx9jz

 I have just checked that after applying four patches linked above, 
 kernel-patch-openvz-028test007.1 applies cleanly on top of 
 linux-source-2.6.18-2.6.18-7.

 Thus the question: are you tracking the -stable tree, and how closely do 
 you follow it?

This bug was re-reported because the current version of the openvz patch
package doesn't apply against the /previous/ version of the linux-2.6
package.  The common case here has been that the openvz patch hasn't been
updated to apply to the current version of the linux-2.6 package.

-- 
Steve Langasek   Give me a lever long enough and a Free OS
Debian Developer   to set it on, and I can move the world.
[EMAIL PROTECTED]   http://www.debian.org/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#400675: kernel-patch-openvz: patch still not applying cleanly

2007-01-26 Thread Ola Lundqvist
Hi Steve

I have checked the -9 version and it do not apply cleanly. However
it is just a few files that have problems.

When we update the patch, is it important that the patch just
contain a few changes so it is easy to verify, or can it be
as big as the difference between 028test006.3 and 028test007.1?

Regards,

// Ola

On Fri, Jan 26, 2007 at 01:42:07AM -0800, Steve Langasek wrote:
 On Mon, Jan 22, 2007 at 10:35:04AM +0100, Ola Lundqvist wrote:
  On Mon, Jan 22, 2007 at 12:33:33AM -0800, Steve Langasek wrote:
   On Mon, Jan 22, 2007 at 08:45:21AM +0100, Ola Lundqvist wrote:
Do you know if there will be more updates to the kernel after -8?
 
   Yes, there will.
 
  Ok, good to know. Upsream and I are subscribed to the package
  tracking system for such uploads so we should be informed quite quickly.
 
 You've probably seen by now that -9 has been uploaded.  There will
 definitely be a -10 as well for etch, there are still outstanding RC bugs
 that need fixing; but -9 needs to be the final ABI and therefore shouldn't
 (I hope) be including any more large upstream merges.
 
If so I need to be prepared as that will probably break this patch.
 
   Why is this patch so fragile?  If it breaks that easily, it hardly seems
   releasable -- how do we protect against it being broken by security 
   updates?
 
  the patch is very big (about 700k) and applies to huge amount of places in 
  the
  kernel. From 2.6.19 somekind of hook functionality is in place as
  far as I understand, but for 2.6.18 it is not possible to use that. I do not
  know if it solves all the problems though.
 
  The problem have arized everytime the kernel team change from
  2.6.18 to 2.6.18.3 and then to 2.6.18.6. I do not think a problem have
  arized when just doing minor updates, but I do not know for sure and it
  depends on the update.
 
 Well, the lack of surety is what has me concerned.
 
  But security updates may need to be coordinated.
 
 Is the security team aware that this is the case?
 
  I assume that same problem can arize for vserver and xen patch, but those
  patches are a part of the kernel source nowdays.
 
 Yes, which means any problems with those patches are detected at build time
 for the linux-2.6 package -- clearly not the case for openvz right now.
 
 On Mon, Jan 22, 2007 at 02:10:02PM +0300, Kir Kolyshkin wrote:
  One failed hunk in net/ipv6/udp.c -- looks like the patch from 2.6.18.5 
  is not applied to linux-source-2.6.18-7:
  * http://tinyurl.com/2n9554
 
  Six failed hunks in net/ipv4/ip_tables.c -- same, looks like a few 
  patches from 2.6.18.y-stable are not applied to linux-source-2.6.18-7. I 
  see at least the following ones:
  * http://tinyurl.com/2l5sae
  * http://tinyurl.com/38bgxa
  * http://tinyurl.com/2wx9jz
 
  I have just checked that after applying four patches linked above, 
  kernel-patch-openvz-028test007.1 applies cleanly on top of 
  linux-source-2.6.18-2.6.18-7.
 
  Thus the question: are you tracking the -stable tree, and how closely do 
  you follow it?
 
 This bug was re-reported because the current version of the openvz patch
 package doesn't apply against the /previous/ version of the linux-2.6
 package.  The common case here has been that the openvz patch hasn't been
 updated to apply to the current version of the linux-2.6 package.
 
 -- 
 Steve Langasek   Give me a lever long enough and a Free OS
 Debian Developer   to set it on, and I can move the world.
 [EMAIL PROTECTED]   http://www.debian.org/
 
 

-- 
 - Ola Lundqvist ---
/  [EMAIL PROTECTED] Annebergsslingan 37  \
|  [EMAIL PROTECTED] 654 65 KARLSTAD  |
|  +46 (0)54-10 14 30  +46 (0)70-332 1551   |
|  http://opalsys.net/ UIN/icq: 4912500 |
\  gpg/f.p.: 7090 A92B 18FE 7994 0C36  4FE4 18A1 B1CF 0FE5 3DD9 /
 ---


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#400675: kernel-patch-openvz: patch still not applying cleanly

2007-01-22 Thread Ola Lundqvist
Hi again

Do you know if there will be more updates to the kernel after -8?

If so I need to be prepared as that will probably break this patch.

Regards,

// Ola

On Sun, Jan 21, 2007 at 10:36:30PM -0800, Steve Langasek wrote:
 On Mon, Jan 22, 2007 at 07:06:20AM +0100, Ola Lundqvist wrote:
  What version of the Debian kernel source are you applying it against?
  The version you are referring to (028test007.1) applies against 2.6.18-8.
  If you want to apply against the 2.6.18-7 in etch you need to use the 
  version
  in etch, and that is 028test006.1.
 
 028test006.1 isn't in testing anymore, it was replaced by 028test007.1
 because of this RC bug.  If you're certain that 028test007.1 works with -8,
 please re-close this bug report, because we aren't going to be releasing
 with -7.
 
 -- 
 Steve Langasek   Give me a lever long enough and a Free OS
 Debian Developer   to set it on, and I can move the world.
 [EMAIL PROTECTED]   http://www.debian.org/
 
 

-- 
 - Ola Lundqvist ---
/  [EMAIL PROTECTED] Annebergsslingan 37  \
|  [EMAIL PROTECTED] 654 65 KARLSTAD  |
|  +46 (0)54-10 14 30  +46 (0)70-332 1551   |
|  http://opalsys.net/ UIN/icq: 4912500 |
\  gpg/f.p.: 7090 A92B 18FE 7994 0C36  4FE4 18A1 B1CF 0FE5 3DD9 /
 ---


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#400675: kernel-patch-openvz: patch still not applying cleanly

2007-01-22 Thread Steve Langasek
On Mon, Jan 22, 2007 at 08:45:21AM +0100, Ola Lundqvist wrote:
 Do you know if there will be more updates to the kernel after -8?

Yes, there will.

 If so I need to be prepared as that will probably break this patch.

Why is this patch so fragile?  If it breaks that easily, it hardly seems
releasable -- how do we protect against it being broken by security updates?

-- 
Steve Langasek   Give me a lever long enough and a Free OS
Debian Developer   to set it on, and I can move the world.
[EMAIL PROTECTED]   http://www.debian.org/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#400675: kernel-patch-openvz: patch still not applying cleanly

2007-01-22 Thread Ola Lundqvist
Hi

On Mon, Jan 22, 2007 at 12:33:33AM -0800, Steve Langasek wrote:
 On Mon, Jan 22, 2007 at 08:45:21AM +0100, Ola Lundqvist wrote:
  Do you know if there will be more updates to the kernel after -8?
 
 Yes, there will.

Ok, good to know. Upsream and I are subscribed to the package
tracking system for such uploads so we should be informed quite quickly.

This means that I do not have to bother that 7.1 version do not apply
cleanly against the version in 

  If so I need to be prepared as that will probably break this patch.
 
 Why is this patch so fragile?  If it breaks that easily, it hardly seems
 releasable -- how do we protect against it being broken by security updates?

the patch is very big (about 700k) and applies to huge amount of places in the
kernel. From 2.6.19 somekind of hook functionality is in place as
far as I understand, but for 2.6.18 it is not possible to use that. I do not
know if it solves all the problems though.

The problem have arized everytime the kernel team change from
2.6.18 to 2.6.18.3 and then to 2.6.18.6. I do not think a problem have
arized when just doing minor updates, but I do not know for sure and it
depends on the update.

But security updates may need to be coordinated. I assume that same
problem can arize for vserver and xen patch, but those patches are a part of
the kernel source nowdays. I have requested openvz to be part of that as well
but not yet got any response. See #392015 for my request of that.

Regards,

// Ola

 -- 
 Steve Langasek   Give me a lever long enough and a Free OS
 Debian Developer   to set it on, and I can move the world.
 [EMAIL PROTECTED]   http://www.debian.org/

-- 
 --- Ola Lundqvist systemkonsult --- M Sc in IT Engineering 
/  [EMAIL PROTECTED]   Annebergsslingan 37\
|  [EMAIL PROTECTED]   654 65 KARLSTAD|
|  http://opalsys.net/   Mobile: +46 (0)70-332 1551 |
\  gpg/f.p.: 7090 A92B 18FE 7994 0C36 4FE4 18A1 B1CF 0FE5 3DD9  /
 ---


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#400675: kernel-patch-openvz: patch still not applying cleanly

2007-01-22 Thread Kir Kolyshkin

Hi Steve,

See my comments below.

Steve Langasek wrote:

If so I need to be prepared as that will probably break this patch.



Why is this patch so fragile?  If it breaks that easily, it hardly seems
releasable -- how do we protect against it being broken by security updates?

I suggest that
a. A workaround is to have kernel-image-openvz, the same as 
Linux-VServer does. Thus people will not run into troubles.
b. A solution is to coordinate Debian security updates with OpenVZ 
kernel team. Thus OpenVZ team can timely (i.e. before you release) 
prepare a patch which is surely applicable to your kernel flavour.


Answering your question -- there were two fails, I looked through .rej 
files and found their causes:


One failed hunk in net/ipv6/udp.c -- looks like the patch from 2.6.18.5 
is not applied to linux-source-2.6.18-7:

* http://tinyurl.com/2n9554

Six failed hunks in net/ipv4/ip_tables.c -- same, looks like a few 
patches from 2.6.18.y-stable are not applied to linux-source-2.6.18-7. I 
see at least the following ones:

* http://tinyurl.com/2l5sae
* http://tinyurl.com/38bgxa
* http://tinyurl.com/2wx9jz

I have just checked that after applying four patches linked above, 
kernel-patch-openvz-028test007.1 applies cleanly on top of 
linux-source-2.6.18-2.6.18-7.


Thus the question: are you tracking the -stable tree, and how closely do 
you follow it?


Regards,
 Kir.


--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#400675: kernel-patch-openvz: patch still not applying cleanly

2007-01-21 Thread lhe
Package: kernel-patch-openvz
Version: 028test007.1
Followup-For: Bug #400675

Though i see 
/usr/src/kernel-patches/diffs/openvz/patch-2.6.18.5-debian-ovz028test007.1-combined.gz
 (which seems is the most recent patch), upon
make-kpkg i get the following error:
[...]
START applying openvz patch (OpenVZ kernel patch for virtual server support)
Testing whether OpenVZ kernel patch for virtual server support patch for 
2.6.18 applies (dry run):
6 out of 30 hunks FAILED -- saving rejects to file 
net/ipv4/netfilter/ip_tables.c.rej
1 out of 8 hunks FAILED -- saving rejects to file net/ipv6/udp.c.rej
OpenVZ kernel patch for virtual server support patch for 2.6.18 does not 
apply cleanly
Patch /usr/src/kernel-patches/all/apply/openvz  failed.
[...]

BTW the reject files are not created.


-- System Information:
Debian Release: 4.0
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15)

Versions of packages kernel-patch-openvz depends on:
ii  bash  3.1dfsg-8  The GNU Bourne Again SHell
ii  grep-dctrl2.9.3  Grep Debian package information - 
ii  patch 2.5.9-4Apply a diff file to an original

kernel-patch-openvz recommends no packages.

-- no debconf information


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#400675: kernel-patch-openvz: patch still not applying cleanly

2007-01-21 Thread Ola Lundqvist
Hi

What version of the Debian kernel source are you applying it against?
The version you are referring to (028test007.1) applies against 2.6.18-8.
If you want to apply against the 2.6.18-7 in etch you need to use the version
in etch, and that is 028test006.1.

If you want prepared kernel deb files, such are available at
http://ftp.openvz.org/kernel/debian

Regards,

// Ola

On Sun, Jan 21, 2007 at 06:27:33PM +0100, root wrote:
 Package: kernel-patch-openvz
 Version: 028test007.1
 Followup-For: Bug #400675
 
 There exists 
 /usr/src/kernel-patches/diffs/openvz/patch-2.6.18.5-debian-ovz028test007.1-combined.gz
  (which i guess is the most recent 
 patch mentioned here) and when i look at the scripts it seems prepared for 
 (Debian) kernel 2.6.18, but upon calling make-kpkg i get 
 the following error:
 [...]
 START applying openvz patch (OpenVZ kernel patch for virtual server support)
 Testing whether OpenVZ kernel patch for virtual server support patch for 
 2.6.18 applies (dry run):
 6 out of 30 hunks FAILED -- saving rejects to file 
 net/ipv4/netfilter/ip_tables.c.rej
 1 out of 8 hunks FAILED -- saving rejects to file net/ipv6/udp.c.rej
 OpenVZ kernel patch for virtual server support patch for 2.6.18 does not 
 apply cleanly
 Patch /usr/src/kernel-patches/all/apply/openvz  failed.
 [...]
 
 BTW the reject files are not created.
 
 -- System Information:
 Debian Release: 4.0
   APT prefers testing
   APT policy: (500, 'testing')
 Architecture: i386 (i686)
 Shell:  /bin/sh linked to /bin/bash
 Kernel: Linux 2.6.18
 Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15)
 
 Versions of packages kernel-patch-openvz depends on:
 ii  bash  3.1dfsg-8  The GNU Bourne Again SHell
 ii  grep-dctrl2.9.3  Grep Debian package information 
 - 
 ii  patch 2.5.9-4Apply a diff file to an original
 
 kernel-patch-openvz recommends no packages.
 
 -- no debconf information
 
 

-- 
 - Ola Lundqvist ---
/  [EMAIL PROTECTED] Annebergsslingan 37  \
|  [EMAIL PROTECTED] 654 65 KARLSTAD  |
|  +46 (0)54-10 14 30  +46 (0)70-332 1551   |
|  http://opalsys.net/ UIN/icq: 4912500 |
\  gpg/f.p.: 7090 A92B 18FE 7994 0C36  4FE4 18A1 B1CF 0FE5 3DD9 /
 ---


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#400675: kernel-patch-openvz: patch still not applying cleanly

2007-01-21 Thread Steve Langasek
On Mon, Jan 22, 2007 at 07:06:20AM +0100, Ola Lundqvist wrote:
 What version of the Debian kernel source are you applying it against?
 The version you are referring to (028test007.1) applies against 2.6.18-8.
 If you want to apply against the 2.6.18-7 in etch you need to use the version
 in etch, and that is 028test006.1.

028test006.1 isn't in testing anymore, it was replaced by 028test007.1
because of this RC bug.  If you're certain that 028test007.1 works with -8,
please re-close this bug report, because we aren't going to be releasing
with -7.

-- 
Steve Langasek   Give me a lever long enough and a Free OS
Debian Developer   to set it on, and I can move the world.
[EMAIL PROTECTED]   http://www.debian.org/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]