Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (2d1519b8575f6114da87c38545b6959ce3b643ed)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Elisamuel Resto <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (2d1519b8575f6114da87c38545b6959ce3b643ed)
  • Date: Sat, 4 Oct 2008 01:30:46 -0500

GIT changes to master grimoire by Elisamuel Resto <ryuji AT sourcemage.org>:

libs/xapian-bindings/HISTORY | 3 +++
libs/xapian-bindings/PRE_SUB_DEPENDS | 10 +++++-----
libs/xapian-bindings/SUB_DEPENDS | 6 +++---
mail/postfix/CONFIGURE | 13 ++++++++-----
mail/postfix/HISTORY | 3 +++
mail/postfix/PREPARE | 8 +++++---
6 files changed, 27 insertions(+), 16 deletions(-)

New commits:
commit 2d1519b8575f6114da87c38545b6959ce3b643ed
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

libs/xapian-bindings: added a catch-all in (PRE_)SUB_DEPENDS and removed
quoting on the loop

commit f430b4ade6fbf21bed25f9135329c6d0b092e756
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

mail/postfix: removed persistent_read calls in CONFIGURE and PREPARE (use
normal var assignments)

diff --git a/libs/xapian-bindings/HISTORY b/libs/xapian-bindings/HISTORY
index 200bbbc..a1b0a59 100644
--- a/libs/xapian-bindings/HISTORY
+++ b/libs/xapian-bindings/HISTORY
@@ -1,3 +1,6 @@
+2008-10-04 Elisamuel Resto <ryuji AT sourcemage.org>
+ * (PRE_)SUB_DEPENDS: added a catch-all; removed quoting on the loop
+
2008-09-16 Elisamuel Resto <ryuji AT sourcemage.org>
* TRIGGERS: added, recast self when xapian-core is recasted

diff --git a/libs/xapian-bindings/PRE_SUB_DEPENDS
b/libs/xapian-bindings/PRE_SUB_DEPENDS
index f0e63ba..ff1637d 100755
--- a/libs/xapian-bindings/PRE_SUB_DEPENDS
+++ b/libs/xapian-bindings/PRE_SUB_DEPENDS
@@ -1,8 +1,8 @@
-case "${THIS_SUB_DEPENDS}" in
+case $THIS_SUB_DEPENDS in
RUBY) is_depends_enabled ${SPELL} ruby && return 0 ;;
PYTHON) is_depends_enabled ${SPELL} python && return 0 ;;
- PHP) if is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} PHP);
then return 0; fi ;;
+ PHP) is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} PHP) &&
return 0 ;;
TCL) is_depends_enabled ${SPELL} tcl && return 0 ;;
- CSHARP) if is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL}
CSHARP); then return 0; fi ;;
-esac &&
-return 1
+ CSHARP) is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} CSHARP)
&& return 0 ;;
+ *) message "${PROBLEM_COLOR}Unknown sub-dependency:
${THIS_SUB_DEPENDS}${DEFAULT_COLOR}" && return 1 ;;
+esac
diff --git a/libs/xapian-bindings/SUB_DEPENDS
b/libs/xapian-bindings/SUB_DEPENDS
index ff3e33b..456d28e 100755
--- a/libs/xapian-bindings/SUB_DEPENDS
+++ b/libs/xapian-bindings/SUB_DEPENDS
@@ -1,8 +1,8 @@
-case "${THIS_SUB_DEPENDS}" in
+case $THIS_SUB_DEPENDS in
RUBY) depends ruby "--with-ruby" ;;
PYTHON) depends python "--with-python" ;;
PHP) depends PHP "--with-php" ;;
TCL) depends tcl "--with-tcl" ;;
CSHARP) depends CSHARP "--with-csharp" ;;
-esac &&
-return 1
+ *) message "${PROBLEM_COLOR}Unknown sub-dependency:
${THIS_SUB_DEPENDS}${DEFAULT_COLOR}" && return 1 ;;
+esac
diff --git a/mail/postfix/CONFIGURE b/mail/postfix/CONFIGURE
index 9c7a1fb..f56ea58 100755
--- a/mail/postfix/CONFIGURE
+++ b/mail/postfix/CONFIGURE
@@ -1,12 +1,13 @@
-persistent_add POSTFIX_PRE_EXISTING &&
-persistent_add POSTFIX_FIX_MAINCF &&
-persistent_add POSTFIX_VDA &&
+local PFIX_VER=$(installed_version $SPELL) &&
+PFIX_VER=$(echo ${PFIX_VER:0:5} | sed -e 's/\.//g') &&

-if [[ "x$POSTFIX_VDA" == "x" ]] && spell_ok $SPELL; then
- persistent_read $SPELL VDA POSTFIX_VDA
+if [[ $PFIX_VER < 255 ]]; then
+ persistent_add POSTFIX_VDA &&
+ POSTFIX_VDA=$VDA
fi &&

if [[ -f /etc/postfix/main.cf ]]; then
+ persistent_add POSTFIX_PRE_EXISTING &&
POSTFIX_PRE_EXISTING="yes" &&

message "${MESSAGE_COLOR}Pre-existing main.cf found. Doing upgrade
install.${DEFAULT_COLOR}" &&
@@ -17,7 +18,9 @@ if [[ -f /etc/postfix/main.cf ]]; then

config_query POSTFIX_FIX_MAINCF "Check for and fix problems in installed
main.cf? (HIGHLY RECOMMENDED)" y
else
+ persistent_add POSTFIX_PRE_EXISTING &&
POSTFIX_PRE_EXISTING="no" &&
+
message "${MESSAGE_COLOR}No pre-existing main.cf found. Doing normal
install.${DEFAULT_COLOR}"
fi &&

diff --git a/mail/postfix/HISTORY b/mail/postfix/HISTORY
index 5469531..67bd081 100644
--- a/mail/postfix/HISTORY
+++ b/mail/postfix/HISTORY
@@ -1,3 +1,6 @@
+2008-10-03 Elisamuel Resto <ryuji AT sourcemage.org>
+ * PREPARE, CONFIGURE: previous variable import checks replaced
+
2008-09-27 Elisamuel Resto <ryuji AT sourcemage.org>
* BUILD, PRE_BUILD, CONFIGURE, INSTALL, PREPARE, DETAILS:
removed brackets and quoted paths; DOCS had dirs, moved to DOC_DIRS
diff --git a/mail/postfix/PREPARE b/mail/postfix/PREPARE
index 94b1514..f7fea9d 100755
--- a/mail/postfix/PREPARE
+++ b/mail/postfix/PREPARE
@@ -1,7 +1,9 @@
-persistent_add POSTFIX_EXP &&
+local PFIX_VER=$(installed_version $SPELL) &&
+PFIX_VER=$(echo ${PFIX_VER:0:5} | sed -e 's/\.//g') &&

-if [[ "x$POSTFIX_EXP" == "x" ]] && spell_ok $SPELL; then
- persistent_read $SPELL PFIX_EXP POSTFIX_EXP
+if [[ $PFIX_VER -lt 255 ]]; then
+ persistent_add POSTFIX_EXP &&
+ POSTFIX_EXP=$PFIX_EXP
fi &&

config_query POSTFIX_EXP "Build experimental version? (it's used by the
author on production servers)" n



  • [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (2d1519b8575f6114da87c38545b6959ce3b643ed), Elisamuel Resto, 10/04/2008

Archive powered by MHonArc 2.6.24.

Top of Page