Precedence: list
MIME-Version: 1.0
From: Matthew Hoare <matthew.t.hoare@gmail.com>
Date: Sun, 31 Dec 2017 23:52:19 +0000
Message-ID: <CAK75+=_HTRuE5nW2YjGOxCEFqVizC6qUi-qo1WdMzp2aXrvPtg@mail.gmail.com>
Subject: [alpine-aports] [apline-aports] [PATCH] main/procps: manage busybox symlink conflict
To: alpine-aports@lists.alpinelinux.org
Content-Type: multipart/alternative; boundary="001a11447c4866a2450561ab8ebe"

--001a11447c4866a2450561ab8ebe
Content-Type: text/plain; charset="UTF-8"

>From 5b905cf91c5b08a98d1d65fbcf9ed209025bdc28 Mon Sep 17 00:00:00 2001
From: Matthew T Hoare <matthew.t.hoare@gmail.com>
Date: Sun, 31 Dec 2017 23:41:35 +0000
Subject: [PATCH 1/1] Remove busybox symlinks when procps binaries are
 installed.

---
 main/procps/APKBUILD             | 1 +
 main/procps/procps.post-install  | 7 +++++++
 main/procps/procps.post-upgrade  | 1 +
 main/procps/procps.pre-deinstall | 7 +++++++
 4 files changed, 16 insertions(+)
 create mode 100644 main/procps/procps.post-install
 create mode 100644 main/procps/procps.post-upgrade
 create mode 100644 main/procps/procps.pre-deinstall

diff --git a/main/procps/APKBUILD b/main/procps/APKBUILD
index 3495ee6..af46308 100644
--- a/main/procps/APKBUILD
+++ b/main/procps/APKBUILD
@@ -6,6 +6,7 @@ pkgdesc="Utilities for monitoring your system and processes
on your system"
 url="https://gitlab.com/procps-ng/procps"
 arch="all"
 license="GPL LGPL"
+install="${pkgname}.post-install ${pkgname}.post-upgrade
${pkgname}.pre-deinstall"
 makedepends="ncurses-dev gettext-dev autoconf automake libtool"
 checkdepends="dejagnu"
 subpackages="$pkgname-dev $pkgname-doc libproc"
diff --git a/main/procps/procps.post-install
b/main/procps/procps.post-install
new file mode 100644
index 0000000..823a7c2
--- /dev/null
+++ b/main/procps/procps.post-install
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+for i in pwdx pmap free top pgrep pkill uptime
+  do rm "/usr/bin/${i}"
+done
+
+exit 0
diff --git a/main/procps/procps.post-upgrade
b/main/procps/procps.post-upgrade
new file mode 100644
index 0000000..02ff57d
--- /dev/null
+++ b/main/procps/procps.post-upgrade
@@ -0,0 +1 @@
+procps.post-install
diff --git a/main/procps/procps.pre-deinstall
b/main/procps/procps.pre-deinstall
new file mode 100644
index 0000000..f43b6ee
--- /dev/null
+++ b/main/procps/procps.pre-deinstall
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+for i in pwdx pmap free top pgrep pkill uptime
+  do ln -sf /bin/busybox "/usr/bin/${i}"
+done
+
+exit 0
-- 
2.15.0

--001a11447c4866a2450561ab8ebe
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr">From 5b905cf91c5b08a98d1d65fbcf9ed209025bdc28 Mon Sep 17 0=
0:00:00 2001<br>From: Matthew T Hoare &lt;<a href=3D"mailto:matthew.t.hoare=
@gmail.com">matthew.t.hoare@gmail.com</a>&gt;<br>Date: Sun, 31 Dec 2017 23:=
41:35 +0000<br>Subject: [PATCH 1/1] Remove busybox symlinks when procps bin=
aries are<br>=C2=A0installed.<br><br>---<br>=C2=A0main/procps/APKBUILD=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 1 +=
<br>=C2=A0main/procps/procps.post-install=C2=A0 | 7 +++++++<br>=C2=A0main/p=
rocps/procps.post-upgrade=C2=A0 | 1 +<br>=C2=A0main/procps/procps.pre-deins=
tall | 7 +++++++<br>=C2=A04 files changed, 16 insertions(+)<br>=C2=A0create=
 mode 100644 main/procps/procps.post-install<br>=C2=A0create mode 100644 ma=
in/procps/procps.post-upgrade<br>=C2=A0create mode 100644 main/procps/procp=
s.pre-deinstall<br><br>diff --git a/main/procps/APKBUILD b/main/procps/APKB=
UILD<br>index 3495ee6..af46308 100644<br>--- a/main/procps/APKBUILD<br>+++ =
b/main/procps/APKBUILD<br>@@ -6,6 +6,7 @@ pkgdesc=3D&quot;Utilities for mon=
itoring your system and processes on your system&quot;<br>=C2=A0url=3D&quot=
;<a href=3D"https://gitlab.com/procps-ng/procps">https://gitlab.com/procps-=
ng/procps</a>&quot;<br>=C2=A0arch=3D&quot;all&quot;<br>=C2=A0license=3D&quo=
t;GPL LGPL&quot;<br>+install=3D&quot;${pkgname}.post-install ${pkgname}.pos=
t-upgrade ${pkgname}.pre-deinstall&quot;<br>=C2=A0makedepends=3D&quot;ncurs=
es-dev gettext-dev autoconf automake libtool&quot;<br>=C2=A0checkdepends=3D=
&quot;dejagnu&quot;<br>=C2=A0subpackages=3D&quot;$pkgname-dev $pkgname-doc =
libproc&quot;<br>diff --git a/main/procps/procps.post-install b/main/procps=
/procps.post-install<br>new file mode 100644<br>index 0000000..823a7c2<br>-=
-- /dev/null<br>+++ b/main/procps/procps.post-install<br>@@ -0,0 +1,7 @@<br=
>+#!/bin/sh<br>+<br>+for i in pwdx pmap free top pgrep pkill uptime<br>+=C2=
=A0 do rm &quot;/usr/bin/${i}&quot;<br>+done<br>+<br>+exit 0<br>diff --git =
a/main/procps/procps.post-upgrade b/main/procps/procps.post-upgrade<br>new =
file mode 100644<br>index 0000000..02ff57d<br>--- /dev/null<br>+++ b/main/p=
rocps/procps.post-upgrade<br>@@ -0,0 +1 @@<br>+procps.post-install<br>diff =
--git a/main/procps/procps.pre-deinstall b/main/procps/procps.pre-deinstall=
<br>new file mode 100644<br>index 0000000..f43b6ee<br>--- /dev/null<br>+++ =
b/main/procps/procps.pre-deinstall<br>@@ -0,0 +1,7 @@<br>+#!/bin/sh<br>+<br=
>+for i in pwdx pmap free top pgrep pkill uptime<br>+=C2=A0 do ln -sf /bin/=
busybox &quot;/usr/bin/${i}&quot;<br>+done<br>+<br>+exit 0<br>-- <br>2.15.0=
<br><br><br></div>

--001a11447c4866a2450561ab8ebe--


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---