X-Spam-Check-By:	sourceware.org
To:	cygwin AT cygwin DOT com
From:	=?ISO-8859-1?Q?Ren=E9_Berber?= <r DOT berber AT computer DOT org>
Subject:	Re: Where is patch?
Date:	Wed, 14 Dec 2005 15:22:57 -0600
Lines:	95
Message-ID:	<dnq2fj$ct0$1@sea.gmane.org>
References:	<20051214200901 DOT GD29103 AT trixie DOT casa DOT cgf DOT cx> <SERRANOiab2VL0fap6R000002ca AT SERRANO DOT CAM DOT ARTIMI DOT COM>
Mime-Version:	1.0
User-Agent:	Mozilla Thunderbird 1.0.2 (Windows/20050317)
In-Reply-To:	<SERRANOiab2VL0fap6R000002ca@SERRANO.CAM.ARTIMI.COM>
OpenPGP:	url=ldap://keyserver.pgp.com
X-IsSubscribed:	yes
Mailing-List:	contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Unsubscribe:	<mailto:cygwin-unsubscribe-archive-cygwin=delorie DOT com AT cygwin DOT com>
List-Subscribe:	<mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive:	<http://sourceware.org/ml/cygwin/>
List-Post:	<mailto:cygwin AT cygwin DOT com>
List-Help:	<mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/ml/#faqs>
Sender:	cygwin-owner AT cygwin DOT com
Mail-Followup-To:	cygwin AT cygwin DOT com
Delivered-To:	mailing list cygwin AT cygwin DOT com
Note-from-DJ:	This may be spam

--------------030207080904040200040902
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

Dave Korn wrote:
[snip]
>   And I imagine both of you have testcases available to prove your respec=
tive
> claims..... ?=20=20

Test case attached.

The files are part of mailman, I just included a shortened patch file and t=
he
file to be patched.  The test procedure (with the output I get):

$ mkdir patch-testcase
$ cd patch-testcase/
# [copy both files here]
$ ls
copyof-mailman-2.1.6.tar.bz2  indexing-2.1.6-0.1.patch
$ tar xvf copyof-mailman-2.1.6.tar.bz2
mailman-2.1.6/
mailman-2.1.6/templates/
mailman-2.1.6/templates/da/
mailman-2.1.6/templates/da/archidxfoot.html

$ patch --version
patch 2.5.8
...
$ cd mailman-2.1.6/
$ patch -p1 < ../indexing-2.1.6-0.1.patch
patching file templates/da/archidxfoot.html
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 18.
2 out of 2 hunks FAILED -- saving rejects to file templates/da/archidxfoot.=
html.rej
$ cd ..
$ rm -rf mailman-2.1.6/
$ tar xvf copyof-mailman-2.1.6.tar.bz2
...

$ cd mailman-2.1.6/
$ /usr/local/bin/patch --version
patch 2.5.4
...
$ /usr/local/bin/patch -p1 < ../indexing-2.1.6-0.1.patch
patching file templates/da/archidxfoot.html
---
Ren=E9 Berber

--------------030207080904040200040902
Content-Type: application/octet-stream;
 name="copyof-mailman-2.1.6.tar.bz2"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
 filename="copyof-mailman-2.1.6.tar.bz2"

QlpoOTFBWSZTWUQNcKEAAdl/hP6yQgBSY/+XNkfUIP//32AAAIAIQAH7rZzS
tCVNINKPKeFP1J6j1HlPUGGk2hDE0eRAAGgRTxNFPRNppqGmgAZAABoBpoJJ
U9RoaAE2kwNEwEGQ0aMmA0T0EiSNTUNPUaeoAaB6gABoNDQA9RHyDdArFxaw
eQlSmAhW2SSIWuXmCEJE1OHFYzHOA1QhJgxANJxCay0aS00It+QYGNlgZTJo
MkiuDCFG+J9gZgdA8EiWNFB25uidc8pOL6S31auKUTGvtkyAThJFGIE4usKQ
jbxrpzhJhIYSTM3nwgLbx4sWEFXWF4C1oKgpUA6AL7kTYTngCQuSoIQT6giC
86pKGD4YKHU6g9YplJxCBEoF5ZgRezIUAMuGyjf28/USY6jSjMmc1OJsmJOc
w4Nlp7tF/m+h+qqbyI2g3mDcYTlNAZpX2XrJBy7e6eQXYGWX1t8Z3wtHCMdo
1qNCBwA96Pc8CkJ83PAkBMAaYqonO68FpigpEboAPiiAbtSN++LXMQjIYBAt
n8bIBNyARpk08poWpitps1yEdV9FTSJYzcso4UR4Ra/2FQxiN+4D+YnJMUdF
SquZTRk0xK/AD5dDn+CrAXDHDAoBgGVQLUkDZ+ZGGkBRYdsayfYUgL4UwWZU
pBaFJFFwOAldE27hQmWFmDWCqdZagieTAQsO8DO4rJqVEnrWclgLNQDqnmIc
F2IEAP8XckU4UJBEDXCh

--------------030207080904040200040902
Content-Type: text/plain;
 name="indexing-2.1.6-0.1.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="indexing-2.1.6-0.1.patch"

diff -ruP --exclude=.DS_Store mailman-2.1.6/templates/da/archidxfoot.html mailman-2.1.6-index/templates/da/archidxfoot.html
--- mailman-2.1.6/templates/da/archidxfoot.html	Fri Nov 12 00:09:47 2004
+++ mailman-2.1.6-index/templates/da/archidxfoot.html	Thu Jun  9 14:23:52 2005
@@ -1,4 +1,5 @@
     </ul>
+%(indexing_disable)s
     <p>
       <a name="end"><b>Dato for nyeste meddelelse:</b></a>
        <i>%(lastdate)s</i><br>
@@ -17,5 +18,6 @@
      <hr>
      <i>Dette arkiv blev genereret af
      Pipermail %(version)s.</i>
+%(indexing_enable)s
   </BODY>
 </HTML>


--------------030207080904040200040902
Content-Type: text/plain; charset=us-ascii

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Problem reports:       http://cygwin.com/problems.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/
--------------030207080904040200040902--

- Raw text -