Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (d39f1092a52afb9443ef8e807ac03d1c01aa70ba)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (d39f1092a52afb9443ef8e807ac03d1c01aa70ba)
  • Date: Thu, 9 Sep 2010 19:17:51 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

utils/util-linux/DEPENDS | 4 ++--
utils/util-linux/HISTORY | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d39f1092a52afb9443ef8e807ac03d1c01aa70ba
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

util-linux: Move SELINUX (libselinux) option to DEPENDS

commit 502c5fdd35130c750eb1566c8ed91881b259fe68
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "util-linux: Move SELINUX (libselinux) option to DEPENDS"

This reverts commit 89381393c2e3d9d13110c852740495d197dced7d.

Missing "\" in DEPENDS for libselinux

Conflicts:

utils/util-linux/DEPENDS
utils/util-linux/HISTORY

diff --git a/utils/util-linux/DEPENDS b/utils/util-linux/DEPENDS
index ff09750..4fd539e 100755
--- a/utils/util-linux/DEPENDS
+++ b/utils/util-linux/DEPENDS
@@ -7,8 +7,8 @@ depends zlib &&
optional_depends nfs-utils '' '' 'for NFS mount support' &&

optional_depends libselinux \
- '--with-selinux'
- '--without-selinux'
+ '--with-selinux' \
+ '--without-selinux' \
'for NSA Security Enhanced Linux' &&

optional_depends linux-pam \
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 241eaaf..7032aaa 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,8 +1,8 @@
2010-09-08 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: May use ncurses (for cfdisk), but requires UTF8 support if
so
Fixes Bug #15760
- Optionally depends on libselinux
Optionally depends on linux-pam
+ Optionally depends on libselinux
* CONFIGURE, PRE_BUILD: Move SELINUX option to DEPENDS

2010-07-06 Vlad Glagolev <stealth AT sourcemage.org>



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (d39f1092a52afb9443ef8e807ac03d1c01aa70ba), Eric Sandall, 09/09/2010

Archive powered by MHonArc 2.6.24.

Top of Page