From: Phil Oester <kernel@linuxace.com>
To: Patrick McHardy <kaber@trash.net>
Cc: Jan Engelhardt <jengelh@medozas.de>, netfilter-devel@vger.kernel.org
Subject: Re: [PATCH] Update pom-ng docs for new iptables snapshots
Date: Fri, 15 Aug 2008 04:59:34 -0700 [thread overview]
Message-ID: <20080815115934.GA22307@linuxace.com> (raw)
In-Reply-To: <48A2D882.20908@trash.net>
[-- Attachment #1: Type: text/plain, Size: 563 bytes --]
On Wed, Aug 13, 2008 at 02:50:10PM +0200, Patrick McHardy wrote:
> We can do that, but for now I would prefer this patch since I don't
> have the time for checking whether we still want anything.
>
> The patch doesn't apply cleanly though:
>
> patching file README
> Hunk #1 FAILED at 2.
> 1 out of 1 hunk FAILED -- saving rejects to file README.rej
>
> Not sure what the problem is ...
Neither am I, as I just verified it applies cleanly against
patch-o-matic-ng-20080814 snapshot. Snapshot not reflecting SVN or
git reality? Attached again to be sure.
Phil
[-- Attachment #2: patch-pom-docs --]
[-- Type: text/plain, Size: 794 bytes --]
diff -ruN pom-orig/README pom-new/README
--- pom-orig/README 2008-08-01 14:55:55.000000000 -0700
+++ pom-new/README 2008-08-02 16:03:04.000000000 -0700
@@ -2,9 +2,13 @@
This is the patch-o-matic-ng distribution by the netfilter project
(http://www.netfilter.org/)
- As of iptables-1.2.7, patch-o-matic is distributed as a seperate
+ As of iptables-1.2.7, patch-o-matic is distributed as a separate
package, available from ftp://ftp.netfilter.org/pub/patch-o-matic-ng.
+ NOTE: if you are building against an unreleased (snapshot) version
+ of iptables, make sure you have run release.sh in the iptables tree.
+ Otherwise, runme will fail as it won't find the iptables Makefile.
+
================================================================
FOLLOW THESE STEPS:
next prev parent reply other threads:[~2008-08-15 11:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-02 23:41 [PATCH] Update pom-ng docs for new iptables snapshots Phil Oester
2008-08-03 0:12 ` Jan Engelhardt
2008-08-13 12:50 ` Patrick McHardy
2008-08-15 11:59 ` Phil Oester [this message]
2008-08-15 12:13 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080815115934.GA22307@linuxace.com \
--to=kernel@linuxace.com \
--cc=jengelh@medozas.de \
--cc=kaber@trash.net \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox