Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.24 grimoire by Jaka Kranjc (3e2e1656b30254957d82c210c640dcf948583534)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to stable-0.24 grimoire by Jaka Kranjc (3e2e1656b30254957d82c210c640dcf948583534)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.24 grimoire by Jaka Kranjc (3e2e1656b30254957d82c210c640dcf948583534)
  • Date: Thu, 28 Aug 2008 16:46:36 -0500
GIT changes to stable-0.24 grimoire by Jaka Kranjc
<lynxlynxlynx AT sourcemage.org>:

collab/subversion/DEPENDS | 22 +++++++++++++++++++++-
collab/subversion/HISTORY | 3 +++
http/apache2/BUILD | 2 +-
http/apache2/CONFIGURE | 3 +++
http/apache2/HISTORY | 4 ++++
http/apache2/PRE_SUB_DEPENDS | 6 ++++++
http/apache2/REPAIR^none^PRE_SUB_DEPENDS | 6 ++++++
http/apache2/SUB_DEPENDS | 7 +++++++
http/apache22/BUILD | 2 +-
http/apache22/CONFIGURE | 3 +++
http/apache22/HISTORY | 4 ++++
http/apache22/PRE_SUB_DEPENDS | 6 ++++++
http/apache22/REPAIR^none^PRE_SUB_DEPENDS | 6 ++++++
http/apache22/SUB_DEPENDS | 7 +++++++
14 files changed, 78 insertions(+), 3 deletions(-)

New commits:
commit 3e2e1656b30254957d82c210c640dcf948583534
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

fixing executable bit (problem with smgl-cherry-pick)

commit 927d68c8009b8ce914b6cac77364dcc9fed3a0bf
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

apache22: provide sub dependency DAV

(cherry-picked from commit f35c8992ba8ffe047627d55f27eaa743e7e4d725)

commit 5485e16543194b0efe88d1d6ee018ae2af8f86b7
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

apache2: provide sub dependency DAV

(cherry-picked from commit 9b6731116537c91630dade2f0e3422067d23859f)

commit 0c7e88f603cdd2e4d9a7f40e09af95808aa38d33
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

subverison: sub dependency on apaches with DAV
(cherry picked from commit 7645bb915898fb507cfce5c3bd477ac254fb221f)

diff --git a/collab/subversion/DEPENDS b/collab/subversion/DEPENDS
index aee4567..615b62a 100755
--- a/collab/subversion/DEPENDS
+++ b/collab/subversion/DEPENDS
@@ -27,4 +27,24 @@ optional_depends cyrus-sasl '--with-sasl' '--without-sasl'
'for Cyrus SASL authe
optional_depends neon '--with-neon=/usr' '--without-neon' 'for Subversion
client to support DAV' &&

optional_depends db '--with-berkeley-db' '--without-berkeley-db' 'for
Berkeley DB backend' &&
-optional_depends APACHE2 '--with-apxs' '--without-apxs' 'to create Apache 2
modules'
+optional_depends APACHE2 '--with-apxs' '--without-apxs' 'to create Apache 2
modules' &&
+local indian=$(get_spell_provider $SPELL APACHE2) &&
+if [[ -z "$indian" ]]; then
+:
+else
+ case "$indian" in
+ apache2)
+ sub_depends apache2 DAV
+ ;;
+ apache22)
+ sub_depends apache22 DAV
+ ;;
+ httpd-dev)
+ # nothing to do in this case, it builds all modules
+ ;;
+ *)
+ message "${MESSAGE_COLOR}Unknown provider for APACHE2, please update
this spell!$DEFAULT_COLOR"
+ return -1
+ ;;
+ esac
+fi
diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index 65214c1..4c4ede9 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,3 +1,6 @@
+2008-08-22 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: sub dependency on some apache with DAV
+
2008-07-29 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 1.5.1

diff --git a/http/apache2/BUILD b/http/apache2/BUILD
index 93d01a6..57d9a73 100755
--- a/http/apache2/BUILD
+++ b/http/apache2/BUILD
@@ -13,5 +13,5 @@ cp -f $SCRIPT_DIRECTORY/config.layout $SOURCE_DIRECTORY &&
--mandir=$INSTALL_ROOT/usr/share/man \
--enable-layout=SMGL \
--enable-modules=most \
- $OPTS &&
+ $OPTS $APACHE22_EXTRA &&
make
diff --git a/http/apache2/CONFIGURE b/http/apache2/CONFIGURE
index 2a73097..6637c34 100755
--- a/http/apache2/CONFIGURE
+++ b/http/apache2/CONFIGURE
@@ -8,6 +8,9 @@
# * mod_isapi (win32 only)
# * mod_nw_ssl (netware only)

+# extra options, for sub dependencies
+persistent_add APACHE22_EXTRA
+APACHE22_EXTRA=

basic_config() {
# Perform any configuration in here that doesn't involve modules
diff --git a/http/apache2/HISTORY b/http/apache2/HISTORY
index 805c8eb..3c08dd8 100644
--- a/http/apache2/HISTORY
+++ b/http/apache2/HISTORY
@@ -1,3 +1,7 @@
+2008-08-20 Thomas Orgis <sobukus AT sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^none^PRE_SUB_DEPENDS:
+ provide DAV sub dependency for mod_dav
+
2008-05-27 Remko van der Vossen <wich AT sourcemage.org>
* CONFLICTS: conflict with xshttpd if that is compiled without prefix

diff --git a/http/apache2/PRE_SUB_DEPENDS b/http/apache2/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..7dde420
--- /dev/null
+++ b/http/apache2/PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ DAV) list_find "$OPTS $APACHE22_EXTRA" --enable-dav && return 0 ;;
+ *) echo "unknown sub_depends!" ;;
+esac
+return 1
+
diff --git a/http/apache2/REPAIR^none^PRE_SUB_DEPENDS
b/http/apache2/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..7dde420
--- /dev/null
+++ b/http/apache2/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ DAV) list_find "$OPTS $APACHE22_EXTRA" --enable-dav && return 0 ;;
+ *) echo "unknown sub_depends!" ;;
+esac
+return 1
+
diff --git a/http/apache2/SUB_DEPENDS b/http/apache2/SUB_DEPENDS
new file mode 100755
index 0000000..a1cd215
--- /dev/null
+++ b/http/apache2/SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+ DAV)
+ message "${MESSAGE_COLOR}Forcing DAV module as sub
dependency.$DEFAULT_COLOR" &&
+ APACHE22_EXTRA="$APACHE22_EXTRA --enable-dav"
+ ;;
+ *) echo "unknown sub_depends $THIS_SUB_DEPENDS"; return 1 ;;
+esac
diff --git a/http/apache22/BUILD b/http/apache22/BUILD
index 6b45256..e87b05c 100755
--- a/http/apache22/BUILD
+++ b/http/apache22/BUILD
@@ -13,5 +13,5 @@ cp -f $SCRIPT_DIRECTORY/config.layout $SOURCE_DIRECTORY &&
--mandir=$INSTALL_ROOT/usr/share/man \
--enable-layout=SMGL \
--enable-so \
- $OPTS &&
+ $OPTS $APACHE22_EXTRA &&
make
diff --git a/http/apache22/CONFIGURE b/http/apache22/CONFIGURE
index cebb58a..e3712b7 100755
--- a/http/apache22/CONFIGURE
+++ b/http/apache22/CONFIGURE
@@ -12,6 +12,9 @@
# * mod_isapi (win32 only)
# * mod_nw_ssl (netware only)

+# extra options, for sub dependencies
+persistent_add APACHE22_EXTRA
+APACHE22_EXTRA=

basic_config() {
# Perform any configuration in here that doesn't involve modules
diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index 0fa393d..e49ddf4 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,7 @@
+2008-08-22 Thomas Orgis <sobukus AT sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^none^PRE_SUB_DEPENDS:
+ provide DAV sub dependency for mod_dav
+
2008-06-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.2.9, SECURITY_PATCH=4, CVE-2008-2364, CVE-2007-6420

diff --git a/http/apache22/PRE_SUB_DEPENDS b/http/apache22/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..7dde420
--- /dev/null
+++ b/http/apache22/PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ DAV) list_find "$OPTS $APACHE22_EXTRA" --enable-dav && return 0 ;;
+ *) echo "unknown sub_depends!" ;;
+esac
+return 1
+
diff --git a/http/apache22/REPAIR^none^PRE_SUB_DEPENDS
b/http/apache22/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..7dde420
--- /dev/null
+++ b/http/apache22/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ DAV) list_find "$OPTS $APACHE22_EXTRA" --enable-dav && return 0 ;;
+ *) echo "unknown sub_depends!" ;;
+esac
+return 1
+
diff --git a/http/apache22/SUB_DEPENDS b/http/apache22/SUB_DEPENDS
new file mode 100755
index 0000000..a1cd215
--- /dev/null
+++ b/http/apache22/SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+ DAV)
+ message "${MESSAGE_COLOR}Forcing DAV module as sub
dependency.$DEFAULT_COLOR" &&
+ APACHE22_EXTRA="$APACHE22_EXTRA --enable-dav"
+ ;;
+ *) echo "unknown sub_depends $THIS_SUB_DEPENDS"; return 1 ;;
+esac


  • [SM-Commit] GIT changes to stable-0.24 grimoire by Jaka Kranjc (3e2e1656b30254957d82c210c640dcf948583534), Jaka Kranjc, 08/28/2008

Archive powered by MHonArc 2.6.24.

Top of Page