X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from ncopa-desktop.alpinelinux.org (unknown [79.160.13.133]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: n@tanael.org) by mail.alpinelinux.org (Postfix) with ESMTPSA id D5373DC01C4; Tue, 2 Dec 2014 07:03:16 +0000 (UTC) Date: Tue, 2 Dec 2014 08:03:14 +0100 From: Natanael Copa To: Valery Kartel Cc: alpine-devel@lists.alpinelinux.org Subject: Re: [alpine-devel] [PATCH] testing/exim: fix some mistakes in previous commit Message-ID: <20141202080314.7872960b@ncopa-desktop.alpinelinux.org> In-Reply-To: <1417458282-31566-1-git-send-email-valery.kartel@gmail.com> References: <20141201145339.230d9399@ncopa-desktop.alpinelinux.org> <1417458282-31566-1-git-send-email-valery.kartel@gmail.com> X-Mailer: Claws Mail 3.11.0 (GTK+ 2.24.23; x86_64-alpine-linux-musl) X-Mailinglist: alpine-devel 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 On Mon, 1 Dec 2014 20:24:42 +0200 Valery Kartel wrote: > --- > testing/exim/APKBUILD | 1 - > testing/exim/exim.logrotate | 2 +- > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/testing/exim/APKBUILD b/testing/exim/APKBUILD > index 609e115..7801fff 100644 > --- a/testing/exim/APKBUILD > +++ b/testing/exim/APKBUILD > @@ -40,7 +40,6 @@ package() { > cd $_builddir > make DESTDIR=$pkgdir INSTALL_ARG="-no_symlink -no_chown exim" install > install -D -m644 doc/exim.8 ${pkgdir}/usr/share/man/man8/exim.8 > - cd build-Linux-* > cd $pkgdir/usr/sbin > mv exim-${pkgver}-* exim > for i in mailq rmail rsmtp runq sendmail; do > diff --git a/testing/exim/exim.logrotate b/testing/exim/exim.logrotate > index b789eee..c923ed1 100644 > --- a/testing/exim/exim.logrotate > +++ b/testing/exim/exim.logrotate > @@ -5,7 +5,7 @@ > compress > delaycompress > notifempty > - create 640 root mail > + create 640 mail mail > sharedscripts > postrotate > /etc/init.d/exim reload > /dev/null Applying: testing/exim: fix some mistakes in previous commit error: patch failed: testing/exim/APKBUILD:40 error: testing/exim/APKBUILD: patch does not apply error: patch failed: testing/exim/exim.logrotate:5 error: testing/exim/exim.logrotate: patch does not apply Patch failed at 0001 testing/exim: fix some mistakes in previous commit does not apply. care to rebase this too? maybe merge it with the previous patch? -nc --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---