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 17731DC037A for ; Mon, 30 Nov 2015 09:03:23 +0000 (UTC) Received: from newmail.tetrasec.net (unknown [74.117.189.116]) by mail.alpinelinux.org (Postfix) with ESMTP id E140DDC00C5 for ; Mon, 30 Nov 2015 09:03:22 +0000 (UTC) Received: from ncopa-desktop.alpinelinux.org (unknown [79.160.13.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: n@tanael.org) by newmail.tetrasec.net (Postfix) with ESMTPSA id 8FC475A136F; Mon, 30 Nov 2015 08:52:41 +0000 (GMT) Date: Mon, 30 Nov 2015 10:03:19 +0100 From: Natanael Copa To: Valery Kartel Cc: alpine-aports@lists.alpinelinux.org Subject: Re: [alpine-aports] [PATCH] testing/apache2-mod-perl: patched to work with perl 5.22 Message-ID: <20151130100319.4afe50fb@ncopa-desktop.alpinelinux.org> In-Reply-To: <1446651772-4559-1-git-send-email-valery.kartel@gmail.com> References: <1446651772-4559-1-git-send-email-valery.kartel@gmail.com> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-alpine-linux-musl) X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Virus-Scanned: ClamAV using ClamSMTP 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 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---