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 E2F8CDCEB66 for ; Sat, 17 Oct 2015 14:47:09 +0000 (UTC) Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 7BA48DCEB08 for ; Sat, 17 Oct 2015 14:47:09 +0000 (UTC) Received: by wijp11 with SMTP id p11so45063504wij.0 for ; Sat, 17 Oct 2015 07:47:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=G80v3K6d5/QyxDbRVdUFrcWgWnHuPbtpHZ4kO0/pGAw=; b=ibGba5i9RZATJSIh+gix/wyNKOSl7A3j8GiD/WLrqwLkJzo3Tbv+c4MwQZxT4++wVQ ISdxHtxeT2QQgWw0WYHbjw9CwQHvJ4BAB1gWzd9Jcvb+u75rGwp8YGYLHKDFRhqJKiPO rQQ9rLAmIb88LrFwZyqi7GguxQRZlMJiUOHsd18B9ntvFC5yBXPIMgIZCasIGv/6d1n7 UkHkJEUTaBBwCEjWqnzZ5GV8MntJRe4NxqlepARB4kekK8Qb13vU9EaDERzFrRuwOfW3 PyOPnLJ4b1ldDEDviY8pmr6E91eUF2uBg0AqXbYdMDATg0P6+bzRSRwU6mbyt+MhOVzX uSMQ== X-Gm-Message-State: ALoCoQlROeZBIFU4WyanBTx6bvV5uh/z+XYbLmVuFYOfRkZkaPXrl+sefatMK6YdW9jYi9KSmEEJ X-Received: by 10.194.236.200 with SMTP id uw8mr22806088wjc.126.1445093227889; Sat, 17 Oct 2015 07:47:07 -0700 (PDT) Received: from localhost (pD95787FB.dip0.t-ipconnect.de. [217.87.135.251]) by smtp.gmail.com with ESMTPSA id xt1sm28688593wjb.32.2015.10.17.07.47.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Oct 2015 07:47:07 -0700 (PDT) From: Christian Kampka To: alpine-aports@lists.alpinelinux.org Cc: Christian Kampka Subject: [alpine-aports] [PATCH] main/busybox: split package into core and suid subpackages Date: Sat, 17 Oct 2015 16:46:58 +0200 Message-Id: <1445093218-3450-2-git-send-email-christian@kampka.net> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1445093218-3450-1-git-send-email-christian@kampka.net> References: <1445093218-3450-1-git-send-email-christian@kampka.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: --- main/busybox/APKBUILD | 57 ++++++++++++++++++++++------------ main/busybox/busybox-core.post-install | 4 +++ main/busybox/busybox-core.post-upgrade | 11 +++++++ main/busybox/busybox-core.trigger | 18 +++++++++++ main/busybox/busybox-suid.trigger | 3 ++ main/busybox/busybox.post-install | 4 --- main/busybox/busybox.post-upgrade | 11 ------- main/busybox/busybox.trigger | 20 ------------ 8 files changed, 73 insertions(+), 55 deletions(-) create mode 100644 main/busybox/busybox-core.post-install create mode 100644 main/busybox/busybox-core.post-upgrade create mode 100644 main/busybox/busybox-core.trigger create mode 100644 main/busybox/busybox-suid.trigger delete mode 100644 main/busybox/busybox.post-install delete mode 100644 main/busybox/busybox.post-upgrade delete mode 100644 main/busybox/busybox.trigger diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index c548540..23d24d8 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -2,17 +2,15 @@ # Maintainer: Natanael Copa pkgname=busybox pkgver=1.23.2 -pkgrel=9 +pkgrel=10 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net arch="all" license="GPL2" -depends= +depends="$pkgname-core $pkgname-suid" makedepends="linux-headers" -install="$pkgname.post-install $pkgname.post-upgrade" -subpackages="$pkgname-static" +subpackages="$pkgname-static $pkgname-core $pkgname-suid" options="suid" -triggers="busybox.trigger=/bin:/usr/bin:/sbin:/usr/sbin:/lib/modules/*" source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 bbsuid.c @@ -41,6 +39,7 @@ _sdir="$srcdir"/$pkgname-$pkgver _staticdir="$srcdir"/build-static _dyndir="$srcdir"/build-dynamic _config="$srcdir"/busyboxconfig + prepare() { mkdir -p "$_staticdir" "$_dyndir" #patches @@ -87,31 +86,49 @@ build() { } package() { + mkdir -p "$pkgdir" && return 0 +} + +core() { + pkgdesc="Core utilities of Busybox" + install="$pkgname-core.post-install $pkgname-core.post-upgrade" + triggers="busybox-core.trigger=/bin:/usr/bin:/sbin:/usr/sbin:/lib/modules/*" + depends= + cd "$_dyndir" - mkdir -p "$pkgdir"/usr/sbin "$pkgdir"/usr/bin "$pkgdir"/tmp \ - "$pkgdir"/var/cache/misc "$pkgdir"/bin "$pkgdir"/sbin - chmod 1777 "$pkgdir"/tmp - install -m755 busybox "$pkgdir"/bin/busybox || return 1 - install -m4111 bbsuid "$pkgdir"/bin/bbsuid || return 1 + mkdir -p "$subpkgdir"/usr/sbin "$subpkgdir"/usr/bin "$subpkgdir"/tmp \ + "$subpkgdir"/var/cache/misc "$subpkgdir"/bin "$subpkgdir"/sbin + chmod 1777 "$subpkgdir"/tmp + install -m755 busybox "$subpkgdir"/bin/busybox || return 1 # we need /bin/sh to be able to execute post-install - ln -s /bin/busybox "$pkgdir"/bin/sh + ln -s /bin/busybox "$subpkgdir"/bin/sh #ifupdown needs those dirs to be present mkdir -p \ - "$pkgdir"/etc/network/if-down.d \ - "$pkgdir"/etc/network/if-post-down.d \ - "$pkgdir"/etc/network/if-post-up.d \ - "$pkgdir"/etc/network/if-pre-down.d \ - "$pkgdir"/etc/network/if-pre-up.d \ - "$pkgdir"/etc/network/if-up.d \ + "$subpkgdir"/etc/network/if-down.d \ + "$subpkgdir"/etc/network/if-post-down.d \ + "$subpkgdir"/etc/network/if-post-up.d \ + "$subpkgdir"/etc/network/if-pre-down.d \ + "$subpkgdir"/etc/network/if-pre-up.d \ + "$subpkgdir"/etc/network/if-up.d \ || return 1 install -Dm644 "$srcdir"/acpid.logrotate \ - "$pkgdir/etc/logrotate.d/acpid" || return 1 + "$subpkgdir/etc/logrotate.d/acpid" || return 1 - mkdir -p "$pkgdir"/var/lib/udhcpd || return 1 + mkdir -p "$subpkgdir"/var/lib/udhcpd || return 1 install -Dm644 "$_sdir"/examples/udhcp/udhcpd.conf \ - "$pkgdir"/etc/udhcpd.conf || return 1 + "$subpkgdir"/etc/udhcpd.conf || return 1 +} + +suid() { + pkgdesc="suid binaries of Busybox" + depends="${pkgname}-core" + triggers="busybox-suid.trigger=/bin:/usr/bin:/sbin:/usr/sbin" + + cd "$_dyndir" + mkdir -p "$subpkgdir"/bin + install -m4111 bbsuid "$subpkgdir"/bin/bbsuid || return 1 } static() { diff --git a/main/busybox/busybox-core.post-install b/main/busybox/busybox-core.post-install new file mode 100644 index 0000000..a986b2f --- /dev/null +++ b/main/busybox/busybox-core.post-install @@ -0,0 +1,4 @@ +#!/bin/sh + +# We need the symlinks early +exec /bin/busybox --install -s diff --git a/main/busybox/busybox-core.post-upgrade b/main/busybox/busybox-core.post-upgrade new file mode 100644 index 0000000..268f22d --- /dev/null +++ b/main/busybox/busybox-core.post-upgrade @@ -0,0 +1,11 @@ +#!/bin/sh + +# remove links that has been relocated +for link in /bin/install /bin/ip /bin/vi /usr/bin/lspci; do + if [ -L "$link" ] && [ "$(readlink $link)" = "/bin/busybox" ]; then + rm "$link" + fi +done + +# We need the symlinks early +exec /bin/busybox --install -s diff --git a/main/busybox/busybox-core.trigger b/main/busybox/busybox-core.trigger new file mode 100644 index 0000000..0572ade --- /dev/null +++ b/main/busybox/busybox-core.trigger @@ -0,0 +1,18 @@ +#!/bin/sh + +do_bb_install= + +for i in "$@"; do + case "$i" in + /lib/modules/*) + if [ -d "$i" ]; then + /bin/busybox depmod ${i#/lib/modules/} + fi + ;; + *) do_bb_install=yes;; + esac +done + +if [ -n "$do_bb_install" ]; then + /bin/busybox --install -s +fi diff --git a/main/busybox/busybox-suid.trigger b/main/busybox/busybox-suid.trigger new file mode 100644 index 0000000..7520da3 --- /dev/null +++ b/main/busybox/busybox-suid.trigger @@ -0,0 +1,3 @@ +#!/bin/sh + +/bin/bbsuid --install diff --git a/main/busybox/busybox.post-install b/main/busybox/busybox.post-install deleted file mode 100644 index a986b2f..0000000 --- a/main/busybox/busybox.post-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# We need the symlinks early -exec /bin/busybox --install -s diff --git a/main/busybox/busybox.post-upgrade b/main/busybox/busybox.post-upgrade deleted file mode 100644 index 268f22d..0000000 --- a/main/busybox/busybox.post-upgrade +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -# remove links that has been relocated -for link in /bin/install /bin/ip /bin/vi /usr/bin/lspci; do - if [ -L "$link" ] && [ "$(readlink $link)" = "/bin/busybox" ]; then - rm "$link" - fi -done - -# We need the symlinks early -exec /bin/busybox --install -s diff --git a/main/busybox/busybox.trigger b/main/busybox/busybox.trigger deleted file mode 100644 index 39cc6b4..0000000 --- a/main/busybox/busybox.trigger +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -do_bb_install= - -for i in "$@"; do - case "$i" in - /lib/modules/*) - if [ -d "$i" ]; then - /bin/busybox depmod ${i#/lib/modules/} - fi - ;; - *) do_bb_install=yes;; - esac -done - -if [ -n "$do_bb_install" ]; then - /bin/bbsuid --install - /bin/busybox --install -s -fi - -- 2.6.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---