[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4ea704de2bc8d40400978293aed531dca5119b1e)

Vlad Glagolev scm at sourcemage.org
Mon Nov 9 07:12:20 EST 2009


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

 archive/bacula/BUILD            |   13 ++++++++----
 archive/bacula/CONFIGURE        |    9 ++++++--
 archive/bacula/DEPENDS          |   43 ++++++++++++++++++++++++++++++++++------
 archive/bacula/DETAILS          |   14 +++++--------
 archive/bacula/HISTORY          |    9 ++++++++
 archive/bacula/PREPARE          |    7 +++---
 archive/bacula/bacula-3.0.2.gpg |    0 
 archive/bacula/bacula.gpg       |binary
 dev/null                        |binary
 9 files changed, 72 insertions(+), 23 deletions(-)

New commits:
commit 4ea704de2bc8d40400978293aed531dca5119b1e
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    bacula: => 3.0.3

diff --git a/archive/bacula/BUILD b/archive/bacula/BUILD
index 89c9a09..ba4ab71 100755
--- a/archive/bacula/BUILD
+++ b/archive/bacula/BUILD
@@ -1,8 +1,13 @@
-local python_ver=$(installed_version python) &&
-OPTS=${OPTS//--with-python/--with-python=\/usr\/include\/python${python_ver:0:3}} &&
+# 'sqlite' stays for old semi-deprecated sqlite2 spell
 OPTS=${OPTS//sqlite/sqlite3} &&
-OPTS="${OPTS} ${BACULA_CLIENT}" &&
-if [ "${BACULA_SCM}" == 'y' ]; then
+
+OPTS="$BACULA_CLIENT $OPTS" &&
+OPTS="--with-scriptdir=$INSTALL_ROOT/etc/bacula \
+      --with-working-dir=$INSTALL_ROOT/var/bacula \
+      $OPTS" &&
+
+if [[ $BACULA_SCM == y ]]; then
   cd bacula
 fi &&
+
 default_build
diff --git a/archive/bacula/CONFIGURE b/archive/bacula/CONFIGURE
index 920597c..91166ff 100755
--- a/archive/bacula/CONFIGURE
+++ b/archive/bacula/CONFIGURE
@@ -1,2 +1,7 @@
-config_query_option BACULA_CLIENT 'Build full system ("n" will build backup client only)?' y '' '--enable-client-only' &&
-config_query_list BACULA_BACKEND 'Choose relational backend (SQLite for 10-20 machines only)?' sqlite postgresql mysql
+config_query_option BACULA_CLIENT 'Build full system ("n" will build backup client only)?' y \
+                                  '' '--enable-client-only' &&
+
+config_query_list BACULA_BACKEND 'Choose relational backend (SQLite for 10-20 machines only)?' \
+                                 sqlite \
+                                 postgresql \
+                                 mysql
diff --git a/archive/bacula/DEPENDS b/archive/bacula/DEPENDS
index 6f0ab53..13aeded 100755
--- a/archive/bacula/DEPENDS
+++ b/archive/bacula/DEPENDS
@@ -1,15 +1,46 @@
 depends g++ &&
 
-if [[ ${BACULA_SCM} == "y" ]]; then
+if [[ $BACULA_SCM == y ]]; then
   depends git
 fi &&
+
+optional_depends readline \
+                 "--enable-readline" \
+                 "--disable-readline" \
+                 "for readline support" &&
+
 if [[ -z "$BACULA_CLIENT" ]]; then
   depends $BACULA_BACKEND "--with-$BACULA_BACKEND=$INSTALL_ROOT/usr" &&
 
   optional_depends mtx-tape '' '' 'for tape support' &&
-  optional_depends libgnome '--enable-gnome' '--disable-gnome' 'for GNOME console' &&
-  optional_depends wxgtk '--enable-wx-console' '--disable-wx-console' 'for wxWidgets console' &&
-  optional_depends gtk+2 '--enable-tray-monitor' '--disable-tray-monitor' 'for tray monitor' &&
-  optional_depends openssl '--with-openssl' '--without-openssl' 'for encrypted communication' &&
-  optional_depends python '--with-python' '--without-python' 'for Python scripting support'
+
+  optional_depends libgnome \
+                   '--enable-gnome' \
+                   '--disable-gnome' \
+                   'for GNOME console' &&
+
+  optional_depends wxgtk \
+                   '--enable-wx-console' \
+                   '--disable-wx-console' \
+                   'for wxWidgets console' &&
+
+  optional_depends gtk+2 \
+                   '--enable-tray-monitor' \
+                   '--disable-tray-monitor' \
+                   'for tray monitor' &&
+
+  optional_depends openssl \
+                   '--with-openssl' \
+                   '--without-openssl' \
+                   'for encrypted communication' &&
+
+  optional_depends tcp_wrappers \
+                   "--with-tcp-wrappers" \
+                   "--without-tcp-wrappers" \
+                   "for tcpwrappers support" &&
+
+  optional_depends python \
+                   '--with-python' \
+                   '--without-python' \
+                   'for Python scripting support'
 fi
diff --git a/archive/bacula/DETAILS b/archive/bacula/DETAILS
index 8ce04a2..c33a539 100755
--- a/archive/bacula/DETAILS
+++ b/archive/bacula/DETAILS
@@ -1,8 +1,6 @@
            SPELL=bacula
-if [ "${BACULA_SCM}" == 'y' ]
-then
-  if [ "${BACULA_SCM_AUTOUPDATE}" == 'y' ]
-  then
+if [[ $BACULA_SCM == y ]]; then
+  if [[ $BACULA_SCM_AUTOUPDATE == y ]]; then
          VERSION=$(date +%Y%m%d)
   else
          VERSION=scm
@@ -12,15 +10,15 @@ then
    SOURCE_IGNORE=volatile
    SOURCE_URL[0]=git://bacula.git.sourceforge.net/gitroot/bacula/bacula:$SPELL-$VERSION
 else
-         VERSION=3.0.2
+         VERSION=3.0.3
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
   SOURCE2_IGNORE=signature
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-  SOURCE2_URL[0]=${SOURCE_URL}.sig
-      SOURCE_GPG=${SPELL}-${VERSION}.gpg:${SOURCE2}
+  SOURCE2_URL[0]=$SOURCE_URL.sig
+      SOURCE_GPG=bacula.gpg:$SOURCE2:UPSTREAM_KEY
 fi
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://www.bacula.org/
          ENTERED=20050419
       LICENSE[0]=GPL
diff --git a/archive/bacula/HISTORY b/archive/bacula/HISTORY
index b81dcf4..4fa48fd 100644
--- a/archive/bacula/HISTORY
+++ b/archive/bacula/HISTORY
@@ -1,3 +1,12 @@
+2009-11-09 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 3.0.3; small clean up; use UPSTREAM_KEY
+	* bacula-3.0.2.gpg: renamed to bacula.gpg
+	* PREPARE: small clean up
+	* DEPENDS, CONFIGURE: corrected indentation -- improved readability;
+	  added readline and tc_wrappers deps
+	* BUILD: OPTS stays in the end; python is autodetected now; added sqlite
+	  comment; added scriptdir flag to use centralized directory for scripts
+
 2009-09-04 Quentin Rameau <quinq at sourcemage.org>
 	* DETAILS: updated to version 3.0.2, now use git instead of cvs for scm
 	* DEPENDS: made dependency on mtx-tape optional, changed CVS to git
diff --git a/archive/bacula/PREPARE b/archive/bacula/PREPARE
index d2cf639..f9b16ec 100755
--- a/archive/bacula/PREPARE
+++ b/archive/bacula/PREPARE
@@ -1,4 +1,5 @@
 config_query BACULA_SCM 'Build scm version ?' n &&
-if [ "${BACULA_SCM}" == 'y' ]; then
-  config_query BACULA_SCM_AUTOUPDATE 'Update on every system update?' n 
-fi 
+
+if [[ $BACULA_SCM == y ]]; then
+  config_query BACULA_SCM_AUTOUPDATE 'Update on every system update?' n
+fi
diff --git a/archive/bacula/bacula-3.0.2.gpg b/archive/bacula/bacula-3.0.2.gpg
deleted file mode 100644
index 948351b..0000000
Binary files a/archive/bacula/bacula-3.0.2.gpg and /dev/null differ
diff --git a/archive/bacula/bacula.gpg b/archive/bacula/bacula.gpg
new file mode 100644
index 0000000..948351b
Binary files /dev/null and b/archive/bacula/bacula.gpg differ



More information about the SM-Commit mailing list