X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from ncopa-laptop (3.203.202.84.customer.cdi.no [84.202.203.3]) (using SSLv3 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: nc@alpinelinux.org) by mail.alpinelinux.org (Postfix) with ESMTPSA id 4BB01DC17E5; Tue, 22 Apr 2014 20:00:14 +0000 (UTC) Date: Tue, 22 Apr 2014 22:00:10 +0200 From: Natanael Copa To: Stuart Cardall Cc: alpine-devel@lists.alpinelinux.org Subject: Re: [alpine-devel] [PATCH] testing/inetutils-syslogd: upgrade to 1.9.2 + small fixes Message-ID: <20140422220010.50cbd785@ncopa-laptop> In-Reply-To: <1398005666-21191-1-git-send-email-developer@it-offshore.co.uk> References: <1398005666-21191-1-git-send-email-developer@it-offshore.co.uk> X-Mailer: Claws Mail 3.9.3 (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 Sun, 20 Apr 2014 14:54:26 +0000 Stuart Cardall wrote: > ** Checksums Fixed ** > > APKBUILD now installs /sbin/setup-inetutils-syslogd correctly. > > 'delaycompress' changed to 'copytruncate' in logrotate settings so logs > do not continue to be written to a rotated log file. > > /etc/syslog.conf settings for INN news system commented out by default. > --- > testing/inetutils-syslogd/APKBUILD | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > diff --git a/testing/inetutils-syslogd/APKBUILD b/testing/inetutils-syslogd/APKBUILD > index f29cd33..71e7d78 100644 > --- a/testing/inetutils-syslogd/APKBUILD > +++ b/testing/inetutils-syslogd/APKBUILD > @@ -76,6 +76,7 @@ package() { > md5sums="944f7196a2b3dba2d400e9088576000c inetutils-1.9.1.tar.gz > 6f0deb2a07439638161d03fd887d4fad inetutils-syslogd.initd > edf3f502d9f2bf49c5da8cb37a927d06 inetutils-syslogd.confd > +<<<<<<< Updated upstream > 506560780445d5a7b30e2e3c96efa19d syslog.conf > 9980ae54a3791c7f9d1d3baa04698e2a inetutils-syslogd.logrotate" > sha256sums="02a9ebde8a198cb85f87545b9d88fb103a183958139864a85fe9e027ad79ff2b inetutils-1.9.1.tar.gz > @@ -88,3 +89,20 @@ e70d0e244fcc30e94f846b82b4ec7318b5582f512bd715fb5bd9178d7be5ede0e5b53e29431a2db5 ... > +>>>>>>> Stashed changes Seems like you sent me an unresolved git stash or soemthing that, even if it applied, definitively didnt built. Might be an idea to read a book about git or similar... After manually copy/paste and clean up things I got it to the point where it built, but at end the abuild's QA told me: >>> ERROR: inetutils-syslogd*: Found /usr/lib/charset.alias So I had to clean that up too. Applied after that. Thanks -nc --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---