X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by lists.alpinelinux.org (Postfix) with ESMTP id 325865C5330 for ; Sat, 8 Apr 2017 02:10:46 +0000 (GMT) Received: by mail-qt0-f195.google.com with SMTP id r5so12005782qtb.2 for ; Fri, 07 Apr 2017 19:10:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flatglobe.org; s=google; h=from:to:subject:date:message-id; bh=KCc7HzuwNHtrjozP7RHFANgtx76Xmp5vlEP3fUFC7yk=; b=XS6+9NeAr7pNSrtRLbw6pf89YQIXbICCB7Dkj9t0RyhTyCHtMIY/HsEvqbv208ul8T GI2Sy+55/ffPVfsYqvcRpd8z4T3z50nb1OCOS0UPFIy3x3OTFl6m2efvv6YJLuD4hLZ0 OGaJwpp9LnjmMga0MheoL6pRUzDk/UGB2xcQs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=KCc7HzuwNHtrjozP7RHFANgtx76Xmp5vlEP3fUFC7yk=; b=te2sQxLg5nuqpTThsL3TW+abFk67pc68RO07jS8768xUlfIqOneTcPCVQ5Wx9u9NsS YjEaOn4sGekXUqY2LJL16A+pG7TbNU/FovX0lR5YclOY4oeyMURvqRQkZR982goIewv0 JNl0QMwHHRFPeyje5Tn3YJHUvWZ8U8X7tr8uFRXn+r/isjAJXdi2MyMJnIbimsJYKgTj 3UQjPGnGgihRjrz6djITcNyiTPfDZYXxMfKdPbM6rraHmaG0+GjIpXvKUwsM/BJZyHsY hhVY0pbxy2JeoMx9WiNb9f7F3LIl33vJHb2jjWEFIy4giIwF4JfmJKZXdCI4HltEAFKr yliQ== X-Gm-Message-State: AFeK/H06pU7gnk6C8tWdJbcUl+DluDMaz0P6klKaEr/HwOhxZckAe6ElnQlh2++OJ34jew== X-Received: by 10.237.32.238 with SMTP id 101mr43020997qtb.162.1491617445580; Fri, 07 Apr 2017 19:10:45 -0700 (PDT) Received: from localhost.localdomain (cpe-204-210-151-44.hvc.res.rr.com. [204.210.151.44]) by smtp.gmail.com with ESMTPSA id r60sm4242741qtd.53.2017.04.07.19.10.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 07 Apr 2017 19:10:44 -0700 (PDT) From: "Tuan M. Hoang" To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH] main/openssh: add missing header on s390x Date: Fri, 7 Apr 2017 22:10:25 -0400 Message-Id: <1491617425-2024-1-git-send-email-tmhoang@flatglobe.org> X-Mailer: git-send-email 2.1.4 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: Ref : https://bugzilla.redhat.com/show_bug.cgi?id=1434341 Patch from fedora team --- main/openssh/APKBUILD | 4 +++- main/openssh/openssh-7.5p1-sandbox.patch | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 main/openssh/openssh-7.5p1-sandbox.patch diff --git a/main/openssh/APKBUILD b/main/openssh/APKBUILD index c25bb21ed1..a20b11149a 100644 --- a/main/openssh/APKBUILD +++ b/main/openssh/APKBUILD @@ -28,6 +28,7 @@ source="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar sshd.initd sshd.confd sftp-interactive.patch + openssh-7.5p1-sandbox.patch " # secfixes: # 7.4_p1: @@ -147,4 +148,5 @@ f35fffcd26635249ce5d820e7b3e406e586f2d2d7f6a045f221e2f9fb53aebc1ab1dd1e603b33894 f2b8daa537ea3f32754a4485492cc6eb3f40133ed46c0a5a29a89e4bcf8583d82d891d94bf2e5eb1c916fa68ec094abf4e6cd641e9737a6c05053808012b3a73 bsd-compatible-realpath.patch 394a420a36880bb0dd37dfd8727cea91fd9de6534050169e21212a46513ef3aaafe2752c338699b3d4ccd14871b26cf01a152df8060cd37f86ce0665fd53c63f sshd.initd ce0abddbd2004891f88efd8522c4b37a4989290269fab339c0fa9aacc051f7fd3b20813e192e92e0e64315750041cb74012d4321260f4865ff69d7a935b259d4 sshd.confd -c1d09c65dbc347f0904edc30f91aa9a24b0baee50309536182455b544f1e3f85a8cecfa959e32be8b101d8282ef06dde3febbbc3f315489339dcf04155c859a9 sftp-interactive.patch" +c1d09c65dbc347f0904edc30f91aa9a24b0baee50309536182455b544f1e3f85a8cecfa959e32be8b101d8282ef06dde3febbbc3f315489339dcf04155c859a9 sftp-interactive.patch +15c5478bcae56c019a2fbd82ec04808537fd4ba1f1ba4a0a88c0343c16c698c45dbfac59eebc3fcfd3c15b302ebec43e60ffa02442a6c77673b14818ad3f7b60 openssh-7.5p1-sandbox.patch" diff --git a/main/openssh/openssh-7.5p1-sandbox.patch b/main/openssh/openssh-7.5p1-sandbox.patch new file mode 100644 index 0000000000..7d09632c8f --- /dev/null +++ b/main/openssh/openssh-7.5p1-sandbox.patch @@ -0,0 +1,23 @@ +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c +index 3a1aedce72c2..a8d472a63ccb 100644 +--- a/sandbox-seccomp-filter.c ++++ b/sandbox-seccomp-filter.c +@@ -50,6 +50,9 @@ + #include + + #include ++#ifdef __s390__ ++#include ++#endif + + #include + #include +@@ -235,7 +235,7 @@ static const struct sock_filter preauth_insns[] = { + * x86-64 syscall under some circumstances, e.g. + * https://bugs.debian.org/849923 + */ +- SC_ALLOW(__NR_clock_gettime & ~__X32_SYSCALL_BIT); ++ SC_ALLOW(__NR_clock_gettime & ~__X32_SYSCALL_BIT), + #endif + + /* Default deny */ -- 2.12.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---