summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaka Kranjc2008-08-28 23:45:55 +0200
committerJaka Kranjc2008-08-28 23:45:55 +0200
commit927d68c8009b8ce914b6cac77364dcc9fed3a0bf (patch)
treee82f475f2f7ac97be6827a811e91fe9b2acd6eb5
parent5485e16543194b0efe88d1d6ee018ae2af8f86b7 (diff)
apache22: provide sub dependency DAV
(cherry-picked from commit f35c8992ba8ffe047627d55f27eaa743e7e4d725)
-rwxr-xr-xhttp/apache22/BUILD2
-rwxr-xr-xhttp/apache22/CONFIGURE3
-rw-r--r--http/apache22/HISTORY4
-rw-r--r--http/apache22/PRE_SUB_DEPENDS6
-rw-r--r--http/apache22/REPAIR^none^PRE_SUB_DEPENDS6
-rw-r--r--http/apache22/SUB_DEPENDS7
6 files changed, 27 insertions, 1 deletions
diff --git a/http/apache22/BUILD b/http/apache22/BUILD
index 6b4525653f..e87b05c4e1 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 cebb58ad1c..e3712b7081 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 0fa393d5cb..e49ddf43bd 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,7 @@
+2008-08-22 Thomas Orgis <sobukus@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@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 100644
index 0000000000..7dde420468
--- /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 100644
index 0000000000..7dde420468
--- /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 100644
index 0000000000..a1cd21585e
--- /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