summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Orgis2007-02-13 12:48:12 +0100
committerJaka Kranjc2007-02-13 20:35:03 +0100
commit8485661c99a06674a9a7ffeafd265075441be9d0 (patch)
tree3cf465750e6dcb38d6da2d258dd3ee550f89233b
parent722caa823b7758c0de26e41c1a822d3f4e7b8968 (diff)
bug 13428: let coreutils and procps depend on util-linux as a placebo for them not providing /bin/kill anymore, updated patchlevel of util-linux to let it install the chosen /bin/kill on system update
(cherry picked from commit b3a2119d19af7d49d045e03f008c5aac09b1937a)
-rwxr-xr-xutils/coreutils/DEPENDS2
-rw-r--r--utils/coreutils/HISTORY4
-rwxr-xr-xutils/procps/DEPENDS2
-rw-r--r--utils/procps/HISTORY4
-rwxr-xr-xutils/util-linux/DETAILS2
-rwxr-xr-xutils/util-linux/HISTORY4
6 files changed, 17 insertions, 1 deletions
diff --git a/utils/coreutils/DEPENDS b/utils/coreutils/DEPENDS
index 0b77337a0c..e67ce2a4b7 100755
--- a/utils/coreutils/DEPENDS
+++ b/utils/coreutils/DEPENDS
@@ -1,5 +1,7 @@
depends gnupg &&
depends smgl-fhs &&
+# bug 13428: /bin/kill from util-linux
+depends util-linux &&
optional_depends linux-pam \
'--enable-pam' \
diff --git a/utils/coreutils/HISTORY b/utils/coreutils/HISTORY
index c1ee650230..26ecef8cce 100644
--- a/utils/coreutils/HISTORY
+++ b/utils/coreutils/HISTORY
@@ -1,3 +1,7 @@
+2007-02-13 Thomas Orgis <sobukus@sourcemage.org>
+ * DEPENDS: depend on util-linux to ensure it's /bin/kill being there in time,
+ #13428
+
2007-02-12 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* protected, REPAIR^none^protected: added with /bin/kill in it #13428
* hostname.diff: eekee updated it for kill removal
diff --git a/utils/procps/DEPENDS b/utils/procps/DEPENDS
index 47b46e3c79..22067653e2 100755
--- a/utils/procps/DEPENDS
+++ b/utils/procps/DEPENDS
@@ -1,3 +1,5 @@
depends gnupg &&
depends ncurses &&
+# bug 13428: /bin/kill from util-linux
+depends util-linux &&
depends smgl-fhs
diff --git a/utils/procps/HISTORY b/utils/procps/HISTORY
index ef5f66fc68..7bd9a97514 100644
--- a/utils/procps/HISTORY
+++ b/utils/procps/HISTORY
@@ -1,3 +1,7 @@
+2007-02-13 Thomas Orgis <sobukus@sourcemage.org>
+ * DEPENDS: depend on util-linux to ensure it's /bin/kill being there in time,
+ #13428
+
2007-02-12 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* protected, REPAIR^none^protected: added with /bin/kill in it #13428
diff --git a/utils/util-linux/DETAILS b/utils/util-linux/DETAILS
index 1c75373fce..40d9892d5a 100755
--- a/utils/util-linux/DETAILS
+++ b/utils/util-linux/DETAILS
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
ENTERED=20010922
LICENSE[0]=GPL
KEYWORDS="utils"
- PATCHLEVEL=2
+ PATCHLEVEL=3
SHORT="Essential utilities for any Linux box."
cat << EOF
Util-linux is a suite of essential utilities for any Linux system. Its
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 3936da5aca..a96e7cb9f4 100755
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,7 @@
+2007-02-13 Thomas Orgis <sobukus@sourcemage.org>
+ * DETAILS: update patchlevel to ensure that /bin/kill will come from here
+ on the next system update, #13428
+
2006-11-20 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* PROVIDES: added, provides PAGER