Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.59 grimoire by Vlad Glagolev (30bbcc010924ea4a1cab97f89e9e7894c528a045)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.59 grimoire by Vlad Glagolev (30bbcc010924ea4a1cab97f89e9e7894c528a045)
  • Date: Wed, 31 Aug 2011 00:55:52 -0500

GIT changes to stable-0.59 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

ChangeLog | 4 ++++
apache.gpg |binary
http/apache22/DEPENDS | 6 ++++--
http/apache22/HISTORY | 3 +++
libs/apr-util/HISTORY | 3 +++
libs/apr-util/PRE_SUB_DEPENDS | 5 +++++
libs/apr-util/REPAIR^all^PRE_SUB_DEPENDS | 5 +++++
libs/apr-util/SUB_DEPENDS | 6 ++++++
8 files changed, 30 insertions(+), 2 deletions(-)

New commits:
commit 30bbcc010924ea4a1cab97f89e9e7894c528a045
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

apache.gpg: added 791485A8 public key (Jim Jagielski (Release Signing
Key) <jim AT apache.org>)
(cherry picked from commit 4a20bb2c26acbd2bc084c4a393e3c5c1d73cc9dc)

Conflicts (solved):

ChangeLog

commit c58be610574b73e2a5a8a490e890e68a9f4d7774
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

apache22: improved dependency check

commit 739e46fb7e3c2330f04e9cece2e9272586b8c3ad
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

apr-util: added LDAP subdependency

diff --git a/ChangeLog b/ChangeLog
index a5352c4..1ebbe49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * apache.gpg: added 791485A8 public key (Jim Jagielski (Release
Signing
+ Key) <jim AT apache.org>)
+
2011-08-28 Vlad Glagolev <stealth AT sourcemage.org>
* gnu.gpg: added public key 4AE55E93 (Tristan Gingold
<gingold AT adacore.com>), required for binutils
diff --git a/apache.gpg b/apache.gpg
index 8cc9399..7c7efad 100644
Binary files a/apache.gpg and b/apache.gpg differ
diff --git a/http/apache22/DEPENDS b/http/apache22/DEPENDS
index af158fc..46d5d82 100755
--- a/http/apache22/DEPENDS
+++ b/http/apache22/DEPENDS
@@ -1,8 +1,10 @@
-#depends apr "--with-apr=${INSTALL_ROOT}/usr" &&
-#depends apr-util "--with-apr-util=${INSTALL_ROOT}/usr" &&
depends apr &&
depends apr-util &&

+if list_find "$OPTS" "ldap"; then
+ depends -sub LDAP apr-util
+fi &&
+
optional_depends openssl \
'--enable-ssl' \
'--disable-ssl' \
diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index 22a3116..09d50bb 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,6 @@
+2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: force LDAP version of apr-util if any ldap module is
selected
+
2011-05-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.2.19; SECURITY_PATCH++ (CVE-2011-1928)
swapped source urls; modified short desc
diff --git a/libs/apr-util/HISTORY b/libs/apr-util/HISTORY
index 1c0f808..150cd32 100644
--- a/libs/apr-util/HISTORY
+++ b/libs/apr-util/HISTORY
@@ -1,3 +1,6 @@
+2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * {{REPAIR^all^,}PRE_,}SUB_DEPENDS: added LDAP subdependency
+
2011-07-25 Bor Kraljič <pyrobor AT ver.si>
* DEPENDS: fixed dependency flags

diff --git a/libs/apr-util/PRE_SUB_DEPENDS b/libs/apr-util/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..63b6487
--- /dev/null
+++ b/libs/apr-util/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ LDAP) is_depends_enabled $SPELL openldap;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/libs/apr-util/REPAIR^all^PRE_SUB_DEPENDS
b/libs/apr-util/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..63b6487
--- /dev/null
+++ b/libs/apr-util/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ LDAP) is_depends_enabled $SPELL openldap;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/libs/apr-util/SUB_DEPENDS b/libs/apr-util/SUB_DEPENDS
new file mode 100755
index 0000000..a7d6161
--- /dev/null
+++ b/libs/apr-util/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ LDAP) message "apr-util with OpenLDAP support requested, forcing openldap
dependency" &&
+ depends openldap "--with-ldap";;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac



  • [SM-Commit] GIT changes to stable-0.59 grimoire by Vlad Glagolev (30bbcc010924ea4a1cab97f89e9e7894c528a045), Vlad Glagolev, 08/31/2011

Archive powered by MHonArc 2.6.24.

Top of Page