Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 ChangeLog                  |    4 ++++
 loop-AES.gpg               |binary
 utils/util-linux/BUILD     |   13 ++++++++++---
 utils/util-linux/DEPENDS   |   23 ++++++++++++++++++++---
 utils/util-linux/DETAILS   |    6 +++---
 utils/util-linux/HISTORY   |    8 ++++++++
 utils/util-linux/PRE_BUILD |    4 +++-
 7 files changed, 48 insertions(+), 10 deletions(-)

New commits:
commit c8c1f9a2f0b58593eed08bbfa752ab1f9216679d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    util-linux: => 2.24 (aes); removed conflicts with simpleinit-msb/shadow

commit dc72ee3eb602948f9d27b4fda00ae83182eeaa89
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    loop-AES.gpg: added 8132F189 public key (Jari Ruusu (2013) 
<jariruusu AT users.sourceforge.net>)

diff --git a/ChangeLog b/ChangeLog
index b2dc9f9..e5d31c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-20 Vlad Glagolev <stealth AT sourcemage.org>
+       * loop-AES.gpg: added 8132F189 public key (Jari Ruusu (2013)
+         <jariruusu AT users.sourceforge.net>)
+
 2013-11-17 Robin Cook <rcook AT wyrms.net>
        * libs/iec16022: new spell, library for DataMatrix barcodes
 
diff --git a/loop-AES.gpg b/loop-AES.gpg
index 0409475..506cfa3 100644
Binary files a/loop-AES.gpg and b/loop-AES.gpg differ
diff --git a/utils/util-linux/BUILD b/utils/util-linux/BUILD
index bdeb680..6d02712 100755
--- a/utils/util-linux/BUILD
+++ b/utils/util-linux/BUILD
@@ -5,9 +5,16 @@ if [[ $CROSS_INSTALL == on ]]; then
   OPTS="--host=$HOST $OPTS"
 fi &&
 
-if [[ $UL_VERSION == latest ]]; then
-  OPTS="--disable-eject --disable-kill --disable-login --disable-sulogin 
--disable-su --disable-utmpdump $OPTS"
-fi &&
+OPTS="--disable-eject \
+      --disable-kill \
+      --disable-last \
+      --disable-login \
+      --disable-mesg \
+      --disable-nologin \
+      --disable-su \
+      --disable-sulogin \
+      --disable-utmpdump \
+      $OPTS"
 
 create_group tty &&
 
diff --git a/utils/util-linux/DEPENDS b/utils/util-linux/DEPENDS
index 9e2bb66..2fb693a 100755
--- a/utils/util-linux/DEPENDS
+++ b/utils/util-linux/DEPENDS
@@ -1,8 +1,15 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
 depends  CONSOLE-TOOLS  &&
 depends  e2fsprogs      &&
 depends  gnupg          &&
 depends  smgl-fhs       &&
 depends  zlib           &&
+depends automake &&
+
+if spell_ok automake && is_version_less $(installed_version automake) 1.14; 
then
+  force_depends automake
+fi &&
 
 optional_depends nfs-utils '' '' 'for NFS mount support' &&
 
@@ -12,15 +19,25 @@ optional_depends libselinux \
                  'for NSA Security Enhanced Linux' &&
 
 optional_depends linux-pam \
-                 '--with-pam' \
-                 '--without-pam' \
-                 'for Linux Pluggable Authentication Module support' &&
+                 "--enable-runuser" \
+                 "--disable-runuser" \
+                 "for Linux Pluggable Authentication Module support" &&
+
+optional_depends libcap-ng \
+                 "--enable-setpriv" \
+                 "--disable-setpriv" \
+                 "to build setpriv" &&
 
 optional_depends gettext \
                  "--enable-nls" \
                  "--disable-nls" \
                  "for Native Language Support" &&
 
+optional_depends PYTHON \
+                 "--with-python" \
+                 "--without-python" \
+                 "to generate Python bindings" &&
+
 #
 # NOTE:
 # --with-ncurses  build with non-wide ncurses, default is wide version
diff --git a/utils/util-linux/DETAILS b/utils/util-linux/DETAILS
index 71bce41..951c9df 100755
--- a/utils/util-linux/DETAILS
+++ b/utils/util-linux/DETAILS
@@ -1,9 +1,9 @@
            SPELL=util-linux
 if [[ $UL_VERSION == aes ]]; then
-         VERSION=2.20
+         VERSION=2.24
   SECURITY_PATCH=2
-     
SOURCE_HASH=sha512:d7ccd88410380a6226772bd7cecc9b04158db8813bee7216acb6d8861f7c2a1f2cddb552f0b4c0ca8dafcac3e11ae95ff4438d19aefa503d909ccfca04b5fa27
-         SOURCE3=$SPELL-$VERSION-20110905.diff.bz2
+     
SOURCE_HASH=sha512:9e1945646a64420226e5af4546022ee604fdba89f91ee474b941075fa55cc2c0d8731e485ef39d2a18e85e81f924790437656b75f1944512629817e4af4191d7
+         SOURCE3=$SPELL-$VERSION-20131026.diff.bz2
          SOURCE4=$SOURCE3.sign
   SOURCE3_URL[0]=http://loop-aes.sourceforge.net/updates/$SOURCE3
   SOURCE3_URL[1]=http://koti.tnnet.fi/jari.ruusu/linux/$SOURCE3
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index efe8039..bc566a3 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,11 @@
+2013-11-20 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated aes version to 2.24; updated aes patch to 20131026
+       * BUILD: readability++; disable nologin (provided by shadow); disable
+         last and mesg (provided by simpleinit-msb)
+       * PRE_BUILD: verify aes patch source
+       * DEPENDS: fixed deprecated linux-pam flags; added python and 
libcap-ng
+         optional dependencies; added check for automake
+
 2013-11-17 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version to 2.24
 
diff --git a/utils/util-linux/PRE_BUILD b/utils/util-linux/PRE_BUILD
index 5757181..9285b60 100755
--- a/utils/util-linux/PRE_BUILD
+++ b/utils/util-linux/PRE_BUILD
@@ -2,5 +2,7 @@ default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
 if [[ $UL_VERSION == aes ]]; then
-  bzcat "$SOURCE_CACHE/$SOURCE3" | patch -p1
+  verify_file 3 &&
+  bzcat "$SOURCE_CACHE/$SOURCE3" | patch -p1 &&
+  autoreconf -fi
 fi