Source Mage code commit list

[Juuso Alasuutari <scm AT sourcemage.org>]

GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:

 security/rsbac-admin/BUILD     |   15 +++++++++------
 security/rsbac-admin/CONFIGURE |   14 ++++++++++++++
 security/rsbac-admin/DEPENDS   |    5 ++++-
 security/rsbac-admin/DETAILS   |   34 +++++++++++++++++-----------------
 security/rsbac-admin/HISTORY   |    8 ++++++++
 security/rsbac-admin/INSTALL   |   23 ++++++++---------------
 6 files changed, 60 insertions(+), 39 deletions(-)

New commits:
commit f4402536bcada8ad3b86d41598e55ead69b556fd
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

    rsbac-admin: Updated to 1.3.4, added sub-package selection, did some URL 
and misc fixing.

diff --git a/security/rsbac-admin/BUILD b/security/rsbac-admin/BUILD
index c324385..fe55778 100755
--- a/security/rsbac-admin/BUILD
+++ b/security/rsbac-admin/BUILD
@@ -1,6 +1,9 @@
-make PREFIX="${INSTALL_ROOT}/usr" \
-     libs \
-     nss \
-     rklogd \
-     tools \
-     $OPTS
+#
+# There's no headers build target because headers don't need to be
+# built. Therefore only run make if headers isn't the only target,
+# and remove headers from the argument list to avoid an error.
+#
+if [[ "${RSBAC_ADMIN_PKGS// }${OPTS// }" != 'headers' ]]
+then
+  make  PREFIX="$INSTALL_ROOT/usr"  ${RSBAC_ADMIN_PKGS/headers}  $OPTS
+fi
diff --git a/security/rsbac-admin/CONFIGURE b/security/rsbac-admin/CONFIGURE
new file mode 100755
index 0000000..6148754
--- /dev/null
+++ b/security/rsbac-admin/CONFIGURE
@@ -0,0 +1,14 @@
+.  "$GRIMOIRE/config_query_multi.function"  &&
+
+local pkgs="headers libs nss rklogd tools"  &&
+
+config_query_multi  RSBAC_ADMIN_PKGS            \
+                    "Which packages to build?"  \
+                    ALL                         \
+                    $pkgs                       &&
+
+if  list_find  "$RSBAC_ADMIN_PKGS"  ALL
+then
+  persistent_add  RSBAC_ADMIN_PKGS  &&
+  RSBAC_ADMIN_PKGS="$pkgs"
+fi
diff --git a/security/rsbac-admin/DEPENDS b/security/rsbac-admin/DEPENDS
index d0247c6..48752d0 100755
--- a/security/rsbac-admin/DEPENDS
+++ b/security/rsbac-admin/DEPENDS
@@ -1 +1,4 @@
-optional_depends linux-pam "pam" "" "Enable PAM support?"
+optional_depends  linux-pam  \
+                  pam        \
+                  ''         \
+                  'to enable PAM support'
diff --git a/security/rsbac-admin/DETAILS b/security/rsbac-admin/DETAILS
index a6ea1f8..419e576 100755
--- a/security/rsbac-admin/DETAILS
+++ b/security/rsbac-admin/DETAILS
@@ -1,22 +1,22 @@
            SPELL=rsbac-admin
-         VERSION=1.3.1
-          SOURCE="${SPELL}-${VERSION}.tar.bz2"
-   SOURCE_URL[0]=http://download.rsbac.org/code/${VERSION}/${SOURCE}
-   SOURCE_URL[1]=ftp://rsbac.org/code/${VERSION}/${SOURCE}
-   
SOURCE_URL[2]=ftp://rsbac.m-privacy.de/rsbac/download/code/${VERSION}/${SOURCE}
-   SOURCE_URL[3]=http://download.rsbac.m-privacy.de/code/${VERSION}/${SOURCE}
-   SOURCE_URL[4]=http://download.rsbac.gg3.net/code/${VERSION}/${SOURCE}
-   
SOURCE_URL[5]=ftp://ftp.gg3.net/pub/linux/rsbac/download/code/${VERSION}/${SOURCE}
-         SOURCE2=${SOURCE}.asc
-  SOURCE2_URL[0]=http://download.rsbac.org/code/${VERSION}/${SOURCE2}
-  SOURCE2_URL[1]=ftp://rsbac.org/code/${VERSION}/${SOURCE2}
-  
SOURCE2_URL[2]=ftp://rsbac.m-privacy.de/rsbac/download/code/${VERSION}/${SOURCE2}
-  
SOURCE2_URL[3]=http://download.rsbac.m-privacy.de/code/${VERSION}/${SOURCE2}
-  SOURCE2_URL[4]=http://download.rsbac.gg3.net/code/${VERSION}/${SOURCE2}
-  
SOURCE2_URL[5]=ftp://ftp.gg3.net/pub/linux/rsbac/download/code/${VERSION}/${SOURCE2}
+         VERSION=1.3.4
+          SOURCE=$SPELL-$VERSION.tar.bz2
+   SOURCE_URL[0]=http://download.rsbac.org/code/$VERSION/$SOURCE
+   SOURCE_URL[1]=ftp://rsbac.org/download/code/$VERSION/$SOURCE
+   
SOURCE_URL[2]=ftp://rsbac.m-privacy.de/rsbac/download/code/$VERSION/$SOURCE
+   SOURCE_URL[3]=http://download.rsbac.m-privacy.de/code/$VERSION/$SOURCE
+   SOURCE_URL[4]=http://download.rsbac.gg3.net/code/$VERSION/$SOURCE
+   
SOURCE_URL[5]=ftp://ftp.gg3.net/pub/linux/rsbac/download/code/$VERSION/$SOURCE
+         SOURCE2=$SOURCE.asc
+  SOURCE2_URL[0]=http://download.rsbac.org/code/$VERSION/${SOURCE2}
+  SOURCE2_URL[1]=ftp://rsbac.org/download/code/$VERSION/${SOURCE2}
+  
SOURCE2_URL[2]=ftp://rsbac.m-privacy.de/rsbac/download/code/$VERSION/${SOURCE2}
+  SOURCE2_URL[3]=http://download.rsbac.m-privacy.de/code/$VERSION/${SOURCE2}
+  SOURCE2_URL[4]=http://download.rsbac.gg3.net/code/$VERSION/${SOURCE2}
+  
SOURCE2_URL[5]=ftp://ftp.gg3.net/pub/linux/rsbac/download/code/$VERSION/${SOURCE2}
       SOURCE_GPG=rsbac.gpg:$SOURCE2:UPSTREAM_KEY
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
-        WEB_SITE="http://www.rsbac.org/ "
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+        WEB_SITE=http://www.rsbac.org/
       LICENSE[0]=GPL
          ENTERED=20070309
            SHORT="A flexible system of access control based on rules"
diff --git a/security/rsbac-admin/HISTORY b/security/rsbac-admin/HISTORY
index 7fa0699..c94b056 100644
--- a/security/rsbac-admin/HISTORY
+++ b/security/rsbac-admin/HISTORY
@@ -1,2 +1,10 @@
+2007-07-18 Juuso Alasuutari <iuso AT sourcemage.org>
+       * DETAILS: Updated to 1.3.4, fixed broken path in ftp://rsbac.org
+         source URLs.
+       * CONFIGURE: Added, query which packages to build.
+       * DEPENDS: Added nicer formatting.
+       * BUILD: Changed to use the query variable from CONFIGURE.
+       * INSTALL: Same as for BUILD.
+
 2007-03-09 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS, BUILD, INSTALL, HISTORY: created spell
diff --git a/security/rsbac-admin/INSTALL b/security/rsbac-admin/INSTALL
index e2afd75..8b83770 100755
--- a/security/rsbac-admin/INSTALL
+++ b/security/rsbac-admin/INSTALL
@@ -1,15 +1,8 @@
-if [[ -n $OPTS ]]; then
-local i  &&
-local OPTS1  &&
-for i in $OPTS ; do
-   i=$i-install  &&
-   OPTS1="${OPTS1} $i"
-done
-fi
-make PREFIX="${INSTALL_ROOT}/usr" \
-     headers-install \
-     libs-install \
-     nss-install \
-     rklogd-install \
-     tools-install \
-     $OPTS1
+local  pkg  pkgs  &&
+
+for pkg in $RSBAC_ADMIN_PKGS $OPTS
+do
+  pkgs="$pkgs ${pkg}-install"
+done  &&
+
+make  PREFIX="$INSTALL_ROOT/usr"  $pkgs