Skip to Content.
Sympa Menu

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

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 (84d27e36cf6e1693d9273c5cf73a3166e5e3d184)
  • Date: Thu, 9 Sep 2010 00:54:46 -0500

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

libs/ncurses/HISTORY | 8 ++++++--
libs/ncurses/PRE_SUB_DEPENDS | 4 ++++
libs/ncurses/REPAIR^none^PRE_SUB_DEPENDS | 4 ++++
libs/ncurses/SUB_DEPENDS | 7 +++++++
utils/util-linux/CONFIGURE | 4 +---
utils/util-linux/DEPENDS | 23 +++++++++++++++++++++--
utils/util-linux/HISTORY | 7 +++++++
utils/util-linux/PRE_BUILD | 4 ----
8 files changed, 50 insertions(+), 11 deletions(-)

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

util-linux: Optionally depends on linux-pam

commit 89381393c2e3d9d13110c852740495d197dced7d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

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

commit 1ca783e80cc1845a25b5c6b0eab86c3b61e0fa62
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ncurses: Fixed formatting

commit 3e6471652f742cb481cadcb1473c36845509d3b6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

util-linux: May use ncurses (for cfdisk), but requires UTF8 support if so
Fixes Bug #15760

commit 706f24f397eea4071760d9a63168c4dd4fab42f3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ncurses: Allow forcing UTF8 fonts (Bug #15760)

diff --git a/libs/ncurses/HISTORY b/libs/ncurses/HISTORY
index 1d5ccf4..0623665 100644
--- a/libs/ncurses/HISTORY
+++ b/libs/ncurses/HISTORY
@@ -1,3 +1,6 @@
+2010-09-08 Eric Sandall <sandalle AT sourcemage.org>
+ * *SUB_DEPENDS: Allow forcing UTF8 fonts (Bug #15760)
+
2009-01-14 George Sherwood <gsherwood AT sourcemage.org>
* CONFIGURE: Change default for UTF-8 to yes

@@ -10,8 +13,8 @@

2008-07-28 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* ncurses-5.6-20080621.patch.gz: replaces the sh script
- * PRE_BUILD: removed the sh script use the patch directly
- * DETAILS: removed the sh script
+ * PRE_BUILD: removed the sh script use the patch directl
+ * DETAILS: removed the sh scrip

2008-07-24 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, PRE_BUILD: added patch patch-5.6-20080621.sh.gz #13654
@@ -167,3 +170,4 @@
2002-04-04 Chris Brien <christopher_brien AT hotmail.com>
* BUILD: Added two lines to sedit out a typecast which causes
a compile error.
+
diff --git a/libs/ncurses/PRE_SUB_DEPENDS b/libs/ncurses/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..382d57f
--- /dev/null
+++ b/libs/ncurses/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ UTF8) [[ $UTF8 == y ]] ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+esac
diff --git a/libs/ncurses/REPAIR^none^PRE_SUB_DEPENDS
b/libs/ncurses/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..382d57f
--- /dev/null
+++ b/libs/ncurses/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ UTF8) [[ $UTF8 == y ]] ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+esac
diff --git a/libs/ncurses/SUB_DEPENDS b/libs/ncurses/SUB_DEPENDS
new file mode 100755
index 0000000..57b993f
--- /dev/null
+++ b/libs/ncurses/SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+ UTF8) if [[ $UL_VERSION != aes ]]; then
+ message "Requested UTF8 fonts of $SPELL, forcing option
UTF8=y" &&
+ UTF8=y
+ fi ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+esac
diff --git a/utils/util-linux/CONFIGURE b/utils/util-linux/CONFIGURE
index 18d82dd..3b00f63 100755
--- a/utils/util-linux/CONFIGURE
+++ b/utils/util-linux/CONFIGURE
@@ -1,5 +1,3 @@
if [[ ! -e "$INSTALL_ROOT/etc/sysconfig/hwclock" ]]; then
config_query UTC "Should the hardware clock store time in UTC (may break
systems like MS Windows)?" y
-fi &&
-
-config_query SELINUX "Do you want to enable selinux support?" n
+fi
diff --git a/utils/util-linux/DEPENDS b/utils/util-linux/DEPENDS
index 8c774cf..ff09750 100755
--- a/utils/util-linux/DEPENDS
+++ b/utils/util-linux/DEPENDS
@@ -4,5 +4,24 @@ depends gnupg &&
depends smgl-fhs &&
depends zlib &&

-optional_depends nfs-utils '' '' 'for NFS mount support'
-
+optional_depends nfs-utils '' '' 'for NFS mount support' &&
+
+optional_depends libselinux \
+ '--with-selinux'
+ '--without-selinux'
+ 'for NSA Security Enhanced Linux' &&
+
+optional_depends linux-pam \
+ '--with-pam' \
+ '--without-pam' \
+ 'for Linux Pluggable Authentication Module support' &&
+
+#
+# NOTE:
+# --with-ncurses build with non-wide ncurses, default is wide version
+# (--without-ncurses disables all ncurses(w) support)
+#
+optional_depends -sub "UTF8" ncurses \
+ '' \
+ '--without-ncurses' \
+ 'for cfdisk'
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index cdbf31c..241eaaf 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,10 @@
+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
+ * CONFIGURE, PRE_BUILD: Move SELINUX option to DEPENDS
+
2010-07-06 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated aes version to 2.18; updated aes patch to 20100706

diff --git a/utils/util-linux/PRE_BUILD b/utils/util-linux/PRE_BUILD
index a39de68..5757181 100755
--- a/utils/util-linux/PRE_BUILD
+++ b/utils/util-linux/PRE_BUILD
@@ -3,8 +3,4 @@ cd "$SOURCE_DIRECTORY" &&

if [[ $UL_VERSION == aes ]]; then
bzcat "$SOURCE_CACHE/$SOURCE3" | patch -p1
-fi &&
-
-if [[ $SELINUX == y ]]; then
- OPTS="--with-selinux"
fi




Archive powered by MHonArc 2.6.24.

Top of Page