X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 951A5DC965D for ; Mon, 30 Nov 2015 12:28:30 +0000 (UTC) Received: from mail-wm0-f43.google.com (mail-wm0-f43.google.com [74.125.82.43]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 0AE40DC90AE for ; Mon, 30 Nov 2015 12:28:29 +0000 (UTC) Received: by wmww144 with SMTP id w144so135339564wmw.0 for ; Mon, 30 Nov 2015 04:28:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=5VruhASK1Tj2F6nXz3X59ICr4V2iqm0BEIvls6NFHdI=; b=xez/nEP4168adzrMtT2iyWHvOPepaD5k7dMvC2p5yu6uJfKz6PG4g/+CcEF5zTxovw vJhjyczKBHG4PndC+J2U6Ov2APp1GiLQ7DxSnrh/GolQP4Zg8yvOFJzohT0hinr2BULL 6ClgrfhmczhDJMmXo7QVIGDV/9T5auMtoLd2cdY7KnNilgdEoeRyUowllaMrwVF8YDso Xc4qJWZpZEdy66tHNkfCv74xgF/tSbFboY3gtgmOPlo+znEnurDNJ7zXU5yBQayi8hk0 Qr/Og93ALcFbmMBXgtFkgZlq7k0N3R4C1GVGIDEhaY/1xid8eHLyFk+/qKZwLchwqv4C cACg== X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 X-Received: by 10.194.200.134 with SMTP id js6mr83615434wjc.114.1448886508338; Mon, 30 Nov 2015 04:28:28 -0800 (PST) Received: by 10.28.90.132 with HTTP; Mon, 30 Nov 2015 04:28:28 -0800 (PST) In-Reply-To: <20151130100319.4afe50fb@ncopa-desktop.alpinelinux.org> References: <1446651772-4559-1-git-send-email-valery.kartel@gmail.com> <20151130100319.4afe50fb@ncopa-desktop.alpinelinux.org> Date: Mon, 30 Nov 2015 14:28:28 +0200 Message-ID: Subject: Re: [alpine-aports] [PATCH] testing/apache2-mod-perl: patched to work with perl 5.22 From: Valery Kartel To: Natanael Copa Cc: alpine-aports@lists.alpinelinux.org Content-Type: multipart/alternative; boundary=047d7bb708f0a662ba0525c12dc9 X-Virus-Scanned: ClamAV using ClamSMTP --047d7bb708f0a662ba0525c12dc9 Content-Type: text/plain; charset=UTF-8 This patch should be canceled, because it was replaced by accepted one http://patchwork.alpinelinux.org/patch/1050/ In 1050 patch I made a note about it. "This patch is replaces the previous one: http://patchwork.alpinelinux.org/patch/851/" 2015-11-30 11:03 GMT+02:00 Natanael Copa : > On Wed, 4 Nov 2015 17:42:52 +0200 > Valery Kartel wrote: > > > --- > > testing/apache2-mod-perl/APKBUILD | 78 ++++----- > > .../apache2-mod-perl/apache2-mod-perl.apache2.conf | 11 -- > > .../apache2-mod-perl/apache2-mod-perl.post-install | 10 -- > > testing/apache2-mod-perl/env2.patch | 176 > +++++++++++++++++++++ > > .../apache2-mod-perl/mod_perl-2.0.5-nolfs.patch | 14 -- > > .../apache2-mod-perl/mod_perl-2.0.6-nolfs.patch | 13 -- > > testing/apache2-mod-perl/mod_perl-remote-ip.patch | 70 -------- > > testing/apache2-mod-perl/mod_perl.conf | 8 + > > 8 files changed, 216 insertions(+), 164 deletions(-) > > delete mode 100644 > testing/apache2-mod-perl/apache2-mod-perl.apache2.conf > > delete mode 100644 > testing/apache2-mod-perl/apache2-mod-perl.post-install > > create mode 100644 testing/apache2-mod-perl/env2.patch > > delete mode 100644 testing/apache2-mod-perl/mod_perl-2.0.5-nolfs.patch > > delete mode 100644 testing/apache2-mod-perl/mod_perl-2.0.6-nolfs.patch > > delete mode 100644 testing/apache2-mod-perl/mod_perl-remote-ip.patch > > create mode 100644 testing/apache2-mod-perl/mod_perl.conf > > > It does not apply. > > > Applying: testing/apache2-mod-perl: patched to work with perl 5.22 > .git/rebase-apply/patch:182: trailing whitespace. > > .git/rebase-apply/patch:192: trailing whitespace. > > .git/rebase-apply/patch:198: trailing whitespace. > > .git/rebase-apply/patch:201: trailing whitespace. > > .git/rebase-apply/patch:203: trailing whitespace. > > fatal: corrupt patch at line 370 > Patch failed at 0001 testing/apache2-mod-perl: patched to work with perl > 5.22 > The copy of the patch that failed is found in: .git/rebase-apply/patch > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > > > -nc > --047d7bb708f0a662ba0525c12dc9 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
This patch should be canceled, because it was replace= d by accepted one = http://patchwork.alpinelinux.org/patch/1050/

In 1050 patch= I made a note about it.
"This patch is replaces th=
e previous one: htt=
p://patchwork.alpinelinux.org/patch/851/"

2015-11-30 11:03 GMT+02:00 Nat= anael Copa <ncopa@alpinelinux.org>:
On Wed,=C2=A0 4 Nov 2015 17:42:52 +0200
Valery Kartel <valery.kartel@= gmail.com> wrote:

> ---
>=C2=A0 testing/apache2-mod-perl/APKBUILD=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 78 ++++-----
>=C2=A0 .../apache2-mod-perl/apache2-mod-perl.apache2.conf |=C2=A0 11 --=
>=C2=A0 .../apache2-mod-perl/apache2-mod-perl.post-install |=C2=A0 10 --=
>=C2=A0 testing/apache2-mod-perl/env2.patch=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 176 +++++++++++++++++++++
>=C2=A0 .../apache2-mod-perl/mod_perl-2.0.5-nolfs.patch=C2=A0 =C2=A0 |= =C2=A0 14 --
>=C2=A0 .../apache2-mod-perl/mod_perl-2.0.6-nolfs.patch=C2=A0 =C2=A0 |= =C2=A0 13 --
>=C2=A0 testing/apache2-mod-perl/mod_perl-remote-ip.patch=C2=A0 |=C2=A0 = 70 --------
>=C2=A0 testing/apache2-mod-perl/mod_perl.conf=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A08 +
>=C2=A0 8 files changed, 216 insertions(+), 164 deletions(-)
>=C2=A0 delete mode 100644 testing/apache2-mod-perl/apache2-mod-perl.apa= che2.conf
>=C2=A0 delete mode 100644 testing/apache2-mod-perl/apache2-mod-perl.pos= t-install
>=C2=A0 create mode 100644 testing/apache2-mod-perl/env2.patch
>=C2=A0 delete mode 100644 testing/apache2-mod-perl/mod_perl-2.0.5-nolfs= .patch
>=C2=A0 delete mode 100644 testing/apache2-mod-perl/mod_perl-2.0.6-nolfs= .patch
>=C2=A0 delete mode 100644 testing/apache2-mod-perl/mod_perl-remote-ip.p= atch
>=C2=A0 create mode 100644 testing/apache2-mod-perl/mod_perl.conf


It does not apply.


Applying: testing/apache2-mod-perl: patched to work with perl 5.22
.git/rebase-apply/patch:182: trailing whitespace.

.git/rebase-apply/patch:192: trailing whitespace.

.git/rebase-apply/patch:198: trailing whitespace.

.git/rebase-apply/patch:201: trailing whitespace.

.git/rebase-apply/patch:203: trailing whitespace.

fatal: corrupt patch at line 370
Patch failed at 0001 testing/apache2-mod-perl: patched to work with perl 5.= 22
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort&= quot;.


-nc

--047d7bb708f0a662ba0525c12dc9-- --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---