Mail archive
alpine-devel

Re: [alpine-devel] [PATCH] testing/inetutils-syslogd: upgrade to 1.9.2 + small fixes

From: Natanael Copa <ncopa_at_alpinelinux.org>
Date: Tue, 22 Apr 2014 22:00:10 +0200

On Sun, 20 Apr 2014 14:54:26 +0000
Stuart Cardall <developer_at_it-offshore.co.uk> 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
> _at_@ -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
> _at_@ -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_at_lists.alpinelinux.org
Help:         alpine-devel+help_at_lists.alpinelinux.org
---
Received on Tue Apr 22 2014 - 22:00:10 UTC