* 3896 pom-ng broken @ 2005-05-10 11:15 Amin Azez 2005-05-10 15:43 ` Phil Oester 0 siblings, 1 reply; 6+ messages in thread From: Amin Azez @ 2005-05-10 11:15 UTC (permalink / raw) To: netfilter-devel This change http://svn.netfilter.org/cgi-bin/viewcvs.cgi/trunk/patch-o-matic-ng/Netfilter_POM.pm?rev=3896&r1=3820&r2=3896 breaks pom-ng for me, such that it fails to apply most of the pom patches because 2.6.11 seems to be the wrong source version. I reversed this patch and it all works for me. Amin ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: 3896 pom-ng broken 2005-05-10 11:15 3896 pom-ng broken Amin Azez @ 2005-05-10 15:43 ` Phil Oester 2005-05-10 16:05 ` Amin Azez 0 siblings, 1 reply; 6+ messages in thread From: Phil Oester @ 2005-05-10 15:43 UTC (permalink / raw) To: Amin Azez; +Cc: netfilter-devel On Tue, May 10, 2005 at 12:15:19PM +0100, Amin Azez wrote: > This change > > http://svn.netfilter.org/cgi-bin/viewcvs.cgi/trunk/patch-o-matic-ng/Netfilter_POM.pm?rev=3896&r1=3820&r2=3896 > > breaks pom-ng for me, such that it fails to apply most of the pom > patches because 2.6.11 seems to be the wrong source version. Perhaps this was intentional...which specific patches don't work, and did you verify the 'Requires' statement in the info file fits your kernel? Phil ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: 3896 pom-ng broken 2005-05-10 15:43 ` Phil Oester @ 2005-05-10 16:05 ` Amin Azez [not found] ` <debc30fc0505101214699d85b8@mail.gmail.com> 0 siblings, 1 reply; 6+ messages in thread From: Amin Azez @ 2005-05-10 16:05 UTC (permalink / raw) To: Phil Oester; +Cc: netfilter-devel Phil Oester wrote: >On Tue, May 10, 2005 at 12:15:19PM +0100, Amin Azez wrote: > > >>This change >> >>http://svn.netfilter.org/cgi-bin/viewcvs.cgi/trunk/patch-o-matic-ng/Netfilter_POM.pm?rev=3896&r1=3820&r2=3896 >> >>breaks pom-ng for me, such that it fails to apply most of the pom >>patches because 2.6.11 seems to be the wrong source version. >> >> >Perhaps this was intentional...which specific patches don't work, and did you verify >the 'Requires' statement in the info file fits your kernel? > > conntrack-event-api/info Title: conntrack event API Author: Pablo Neira <pablo@eurodev.net> Status: Testing Repository: extra Requires: linux >= 2.6.11 I was patching 2.6.11.7 Amin ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <debc30fc0505101214699d85b8@mail.gmail.com>]
* Re: 3896 pom-ng broken [not found] ` <debc30fc0505101214699d85b8@mail.gmail.com> @ 2005-05-10 19:15 ` Jérôme Poulin 2005-05-11 0:51 ` Phil Oester 0 siblings, 1 reply; 6+ messages in thread From: Jérôme Poulin @ 2005-05-10 19:15 UTC (permalink / raw) Cc: netfilter-devel On 5/10/05, Jérôme Poulin <jeromepoulin@gmail.com> wrote: > See my e-mail, posted the same problem / solution and got no answer, > only 3 patchs apply with that new snapshot, other patch with no > requirements or even with a valid requirement won't apply, only set, > h323, goto and another apply, anyway see my other mails. > > On 5/10/05, Amin Azez <azez@ufomechanic.net> wrote: > > Phil Oester wrote: > > > > >On Tue, May 10, 2005 at 12:15:19PM +0100, Amin Azez wrote: > > > > > > > > >>This change > > >> > > >>http://svn.netfilter.org/cgi-bin/viewcvs.cgi/trunk/patch-o-matic-ng/Netfilter_POM.pm?rev=3896&r1=3820&r2=3896 > > >> > > >>breaks pom-ng for me, such that it fails to apply most of the pom > > >>patches because 2.6.11 seems to be the wrong source version. > > >> > > >> > > >Perhaps this was intentional...which specific patches don't work, and did you verify > > >the 'Requires' statement in the info file fits your kernel? > > > > > > > > conntrack-event-api/info > > Title: conntrack event API > > Author: Pablo Neira <pablo@eurodev.net> > > Status: Testing > > Repository: extra > > Requires: linux >= 2.6.11 > > > > I was patching 2.6.11.7 > > > > Amin > > > > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: 3896 pom-ng broken 2005-05-10 19:15 ` Jérôme Poulin @ 2005-05-11 0:51 ` Phil Oester 2005-05-17 15:05 ` Patrick McHardy 0 siblings, 1 reply; 6+ messages in thread From: Phil Oester @ 2005-05-11 0:51 UTC (permalink / raw) To: Jérôme Poulin; +Cc: netfilter-devel [-- Attachment #1: Type: text/plain, Size: 643 bytes --] On Tue, May 10, 2005 at 03:15:25PM -0400, Jérôme Poulin wrote: > On 5/10/05, Jérôme Poulin <jeromepoulin@gmail.com> wrote: > > See my e-mail, posted the same problem / solution and got no answer, > > only 3 patchs apply with that new snapshot, other patch with no > > requirements or even with a valid requirement won't apply, only set, > > h323, goto and another apply, anyway see my other mails. Indeed, my patch was broken. But the 'Requires' handling is also broken, but will take something nontrivial to fix. In the interim, the below patch reverts my changes, and adds a necessary 2nd Requires to pptp. Harald, please apply. Phil [-- Attachment #2: patch-requiresfix --] [-- Type: text/plain, Size: 957 bytes --] diff -ruN pom-orig/Netfilter_POM.pm pom-new/Netfilter_POM.pm --- pom-orig/Netfilter_POM.pm 2005-05-10 18:15:27.177796688 -0400 +++ pom-new/Netfilter_POM.pm 2005-05-10 18:16:58.249951616 -0400 @@ -196,10 +196,10 @@ # if the requirement refers to the tested patchlet, # project version must fulfil the requirement. # Multiple requirements are ANDed. - return 1 if $pver eq $prog - && $self->version_compare($proj, $op, $ver); + return 0 if $pver eq $prog + && !$self->version_compare($proj, $op, $ver); } - return 0; + return 1; } # are the requirements for a specific patchlet fulfilled? diff -ruN pom-orig/pptp-conntrack-nat/info pom-new/pptp-conntrack-nat/info --- pom-orig/pptp-conntrack-nat/info 2005-05-10 20:35:15.584820688 -0400 +++ pom-new/pptp-conntrack-nat/info 2005-05-10 20:34:12.225452776 -0400 @@ -4,3 +4,4 @@ Repository: extra Depends: !nat-reservations Requires: linux < 2.6.11 +Requires: linux-2.6 < 2.6.11 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: 3896 pom-ng broken 2005-05-11 0:51 ` Phil Oester @ 2005-05-17 15:05 ` Patrick McHardy 0 siblings, 0 replies; 6+ messages in thread From: Patrick McHardy @ 2005-05-17 15:05 UTC (permalink / raw) To: Phil Oester; +Cc: netfilter-devel Phil Oester wrote: > Indeed, my patch was broken. But the 'Requires' handling is also broken, but > will take something nontrivial to fix. > > In the interim, the below patch reverts my changes, and adds a necessary > 2nd Requires to pptp. Harald, please apply. Applied, thanks Phil. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2005-05-17 15:05 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-05-10 11:15 3896 pom-ng broken Amin Azez
2005-05-10 15:43 ` Phil Oester
2005-05-10 16:05 ` Amin Azez
[not found] ` <debc30fc0505101214699d85b8@mail.gmail.com>
2005-05-10 19:15 ` Jérôme Poulin
2005-05-11 0:51 ` Phil Oester
2005-05-17 15:05 ` Patrick McHardy
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.