~alpine/devel

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
1

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

Stuart Cardall <developer@it-offshore.co.uk>
Details
Message ID
<1398005666-21191-1-git-send-email-developer@it-offshore.co.uk>
Sender timestamp
1398005666
DKIM signature
missing
Download raw message
10 years ago
Patch: +18 -0 
** 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
82968692b4fe79706aacaeb1021b343288dc4f1d86925481796dac1f743a8269976ce86bf446cd0c16d246b918e5822e312660b201407eb7031a17cb398c9513  inetutils-syslogd.confd
5abb2a0309c9e180d7cacf97917044a8d3573fdf4d5902d757788fb687800900b47a02c6ec4a113475931176b52a1c2ba0771452bfb301a11b5aa0230377872d  syslog.conf
30741cf17a86a0bf39404882711d827e200a2d22cdba873e49f1a871f8d113cfe5bb1ddf3206c44be888be15aa09104656f9bd26406abb42c9b6fed0624d0bfb  inetutils-syslogd.logrotate"
=======
9c9998ff341c48322ffdc8f48fa018cf  syslog.conf
842e971153c19cb328db2cc6e22a7baf  inetutils-syslogd.logrotate
751bda34989e3a7baff0621a3450cea3  inetutils-syslogd.setup"
sha256sums="0423ea40a160cd4630f817e247df5c08ecc625378d2bb56a0509117a36a89913  inetutils-1.9.2.tar.gz
1cf71f3656dceba3ddf0543a43a98e644a0b42999ba80b9f72318ee578c9ff53  inetutils-syslogd.initd
86105f0a0105f50275f7381b5d7fe603b8d854a0e6753c2f06f6d0c234562948  inetutils-syslogd.confd
0b3f080466437a068d1627a00a5abdf494fdefa2e17821b993462d0310e60cc3  syslog.conf
f2afe7dad8cd933fbd213b20f09127096f8798698874b2ead2d47a6509f95f6c  inetutils-syslogd.logrotate
7747b585eddc9f7bd7cff0d23d785ba7efdbbb4f67781b23279f881272a4d559  inetutils-syslogd.setup"
sha512sums="5584219aba4c4fc035776adf88f0e3e7f5553d35b0142b8633aa21f135b31df1545e40d5ea54ec90dbcc8410dbc9924fb845f8e28daba0d783630a9201e63cbf  inetutils-1.9.2.tar.gz
e70d0e244fcc30e94f846b82b4ec7318b5582f512bd715fb5bd9178d7be5ede0e5b53e29431a2db5177ce2f31fc306900b3a1297a658e84b2671f3ad5153b81c  inetutils-syslogd.initd
82968692b4fe79706aacaeb1021b343288dc4f1d86925481796dac1f743a8269976ce86bf446cd0c16d246b918e5822e312660b201407eb7031a17cb398c9513  inetutils-syslogd.confd
d9c61aee1a3f2c7cf7b06dfda08599c08f1f618ba092e60adff11e9cbe5be847544780eaa9e4bb54a70c5e5bc243fed3d6ff8111878f073b41629db4245b135c  syslog.conf
ffe2b1fd6b9d4dc9e378f0c857be318ec86e48aee17ede865656bdf9a5da3d2f3a8ffe788cd62794132839577ab6ce1ce7fe3a964bc21e0f8b698827a9ee5817  inetutils-syslogd.logrotate
89ee7b84b79575140d38cb08bde1238366aad53977408ddf9f659922618a1716ad8e6367b6ca9712178ac9e9d26639dffca8f5ea1e46bda5c571029e80bc42ee  inetutils-syslogd.setup"
>>>>>>> Stashed changes
-- 
1.9.1



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---
Natanael Copa <ncopa@alpinelinux.org>
Details
Message ID
<20140422220010.50cbd785@ncopa-laptop>
In-Reply-To
<1398005666-21191-1-git-send-email-developer@it-offshore.co.uk> (view parent)
Sender timestamp
1398196810
DKIM signature
missing
Download raw message
10 years ago 
On Sun, 20 Apr 2014 14:54:26 +0000
Stuart Cardall <developer@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
> @@ -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
---
Reply to thread Export thread (mbox)