Subject: [alpine-aports] [PATCH 3/3] main/s6: upgrade to version 2.2.0.0

From: Christian Kampka <[email-masked]>
Date: Tue, 28 Jul 2015 20:11:28 +0000

[PATCH 3/3] main/s6: upgrade to version 2.2.0.0

Patch attached.
From e215da8b13cf77a805ad3a5c50c8e2ba33f24df4 Mon Sep 17 00:00:00 2001
From: Christian Kampka <[email-masked]>
Date: Tue, 28 Jul 2015 22:06:42 +0200
Subject: [PATCH 3/3] main/s6: upgrade to version 2.2.0.0

---
 main/s6/APKBUILD | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main/s6/APKBUILD b/main/s6/APKBUILD
index e8562e5..da4bfda 100644
--- a/main/s6/APKBUILD
+++ b/main/s6/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: John Regan <[email-masked]>
 # Maintainer: John Regan <[email-masked]>
 pkgname=s6
-pkgver=2.1.6.0
+pkgver=2.2.0.0
 pkgrel=0
 pkgdesc="skarnet.org's small & secure supervision software suite."
 url="http://skarnet.org/software/$pkgname/"
@@ -45,6 +45,6 @@ package() {
 	rm -f "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="c38275f2293e8b0caf8b27d71b549df1  s6-2.1.6.0.tar.gz"
-sha256sums="a4e977253fbe130788b721ae51a70680b71f4dfe3c02ebb1db0472e21548d467  s6-2.1.6.0.tar.gz"
-sha512sums="14f6bef0d3e8666fe2d4530e09045ad0bc0bdec8975168966b551cd6a004311db7a9e593f1e9fdfa7b3c7dc1b210f67ebc9ef3c54151ec92e00204f5e2d54a99  s6-2.1.6.0.tar.gz"
+md5sums="9bd63a263e60c69179976aac1546c198  s6-2.2.0.0.tar.gz"
+sha256sums="1c4bab36d020f4e9ad41ea45ae9858a1241ed2705f08ad7fe5c5f0a470ee3ba3  s6-2.2.0.0.tar.gz"
+sha512sums="c1ecc15830e8b630edd09ff5e95c7902c8223ad1f64faa627224a1d7b6302c37d0e67eb864b980e351c6ca03c63b29948dbe19ca209d260001e676f2973a5a30  s6-2.2.0.0.tar.gz"
-- 
2.4.6

---

From: Francesco Colista <[email-masked]>
Date: Wed, 29 Jul 2015 08:41:58 +0200

> [PATCH 3/3] main/s6: upgrade to version 2.2.0.0

Hello, thanks for your contribution.
Build fails with:

ecstack -fno-stack-protector -pipe -Wall -c -o 
src/supervision/s6-supervise.o src/supervision/s6-supervise.c
src/supervision/s6-supervise.c: In function 'read_uint':
src/supervision/s6-supervise.c:72:20: error: implicit declaration of 
function 'openreadnclose_nb' [-Werror=implicit-function-declaration]
    register int r = openreadnclose_nb(file, buf, UINT_FMT) ;
                     ^
exec gcc -iquote src/include-local -Isrc/include 
-D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -O2 -Os 
-fomit-frame-pointer -Werror=implicit-function-declaration 
-Werror=implicit-int -Werror=pointer-sign -Werror=pointer-arith  -Os 
-fomit-frame-pointer -std=c99 -fomit-frame-pointer -fno-exceptions 
-fno-unwind-tables -fno-asynchronous-unwind-tables -Wa,--noexecstack 
-fno-stack-protector -pipe -Wall -c -o src/supervision/s6-svc.o 
src/supervision/s6-svc.c
exec gcc -iquote src/include-local -Isrc/include 
-D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -O2 -Os 
-fomit-frame-pointer -Werror=implicit-function-declaration 
-Werror=implicit-int -Werror=pointer-sign -Werror=pointer-arith  -Os 
-fomit-frame-pointer -std=c99 -fomit-frame-pointer -fno-exceptions 
-fno-unwind-tables -fno-asynchronous-unwind-tables -Wa,--noexecstack 
-fno-stack-protector -pipe -Wall -c -o src/supervision/s6-svscanctl.o 
src/supervision/s6-svscanctl.c
exec gcc -iquote src/include-local -Isrc/include 
-D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -O2 -Os 
-fomit-frame-pointer -Werror=implicit-function-declaration 
-Werror=implicit-int -Werror=pointer-sign -Werror=pointer-arith  -Os 
-fomit-frame-pointer -std=c99 -fomit-frame-pointer -fno-exceptions 
-fno-unwind-tables -fno-asynchronous-unwind-tables -Wa,--noexecstack 
-fno-stack-protector -pipe -Wall -c -o src/supervision/s6-svok.o 
src/supervision/s6-svok.c
cc1: some warnings being treated as errors
Makefile:109: recipe for target 'src/supervision/s6-supervise.o' failed
make: *** [src/supervision/s6-supervise.o] Error 1
make: *** Waiting for unfinished jobs....
>>> ERROR: s6: all failed
>>> s6: Uninstalling dependencies...

Sadly, package does not build.

-- 
:: Francesco Colista
:: Alpine Linux Infrstraucture
:: http://www.alpinelinux.org

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---

---

From: Christian Kampka <[email-masked]>
Date: Wed, 29 Jul 2015 06:48:49 +0000

Hi,

this patch requires both the upgraded skalib and execline builds, which are
already on the list as patches 1 and 2 of the series.

Cheers,
Christian

Francesco Colista <[email-masked]> schrieb am Mi., 29. Juli 2015

---

From: Francesco Colista <[email-masked]>
Date: Wed, 29 Jul 2015 08:52:56 +0200

Il 2015-07-29 08:48 Christian Kampka ha scritto:
> Hi,
> 
> this patch requires both the upgraded skalib and execline builds,
> which are already on the list as patches 1 and 2 of the series.

Indeed.
After applying the correct skalibs patch, s6 builds.
Thanks.

---