X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 444C9DC012D for ; Sat, 8 Aug 2015 10:22:49 +0000 (UTC) Received: from lithium.8pit.net (lithium.8pit.net [141.101.32.65]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 95B21DC010C; Sat, 8 Aug 2015 10:22:48 +0000 (UTC) Received: from localhost (ip5f5ac94c.dynamic.kabel-deutschland.de [95.90.201.76]); by lithium.8pit.net (OpenSMTPD) with ESMTPSA id de61fb3e; TLS version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Sat, 8 Aug 2015 12:22:47 +0200 (CEST) From: =?UTF-8?q?S=C3=B6ren=20Tempel?= To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH v2] testing/jailkit: simplify install files Date: Sat, 8 Aug 2015 12:22:41 +0200 Message-Id: <1439029361-25952-1-git-send-email-soeren+git@soeren-tempel.net> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1439029156-25798-1-git-send-email-soeren+git@soeren-tempel.net> References: <1439029156-25798-1-git-send-email-soeren+git@soeren-tempel.net> X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- testing/jailkit/APKBUILD | 2 +- testing/jailkit/jailkit.post-deinstall | 11 ++--------- testing/jailkit/jailkit.post-install | 12 ++---------- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/testing/jailkit/APKBUILD b/testing/jailkit/APKBUILD index f3edc75..1dc8ae0 100644 --- a/testing/jailkit/APKBUILD +++ b/testing/jailkit/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=jailkit pkgver=2.15 -pkgrel=0 +pkgrel=1 pkgdesc="Utilities for chroot jailing a user or process." url="http://olivier.sessink.nl/jailkit" arch="all" diff --git a/testing/jailkit/jailkit.post-deinstall b/testing/jailkit/jailkit.post-deinstall index 1a6f5ab..5766914 100644 --- a/testing/jailkit/jailkit.post-deinstall +++ b/testing/jailkit/jailkit.post-deinstall @@ -1,10 +1,3 @@ #!/bin/sh - -# test if the jk_chrootsh is already in /etc/shells -if test -w /etc/shells; then \ - if grep /usr/sbin/jk_chrootsh /etc/shells ; then \ - echo "commenting /usr/sbin/jk_chroots out of /etc/shells";\ - sed -i "s|^/usr/sbin/jk_chrootsh.*|#&|" /etc/shells ;\ - fi \ -fi - +remove-shell '/usr/sbin/jk_chroots' +exit 0 diff --git a/testing/jailkit/jailkit.post-install b/testing/jailkit/jailkit.post-install index 3476571..88a5925 100644 --- a/testing/jailkit/jailkit.post-install +++ b/testing/jailkit/jailkit.post-install @@ -1,11 +1,3 @@ #!/bin/sh - -# test if the jk_chrootsh is already in /etc/shells -# this previously had _at_echo but that fails on FreeBSD -if test -w /etc/shells; then \ - if ! grep /usr/sbin/jk_chrootsh /etc/shells ; then \ - echo "appending /usr/sbin/jk_chroots to /etc/shells";\ - echo /usr/sbin/jk_chrootsh >> /etc/shells ;\ - fi \ -fi - +add-shell '/usr/sbin/jk_chroots' +exit 0 -- 2.5.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---