Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (66f0f9282b133d77b3177db3047b972e1e078f63)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (66f0f9282b133d77b3177db3047b972e1e078f63)
  • Date: Sun, 19 Apr 2009 17:07:33 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

crypto/cyrus-sasl/DEPENDS | 14 +++++++-------
crypto/cyrus-sasl/HISTORY | 5 +++++
2 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 66f0f9282b133d77b3177db3047b972e1e078f63
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

cyrus-sasl: Use INSTALL_ROOT/ for all --with paths

commit 730a67eed1d4e422deaf75e7fdc321d075832bb9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

cyrus-sasl: Look for OpenSSL in INSTALL_ROOT/usr not /bin
Bug #15177

diff --git a/crypto/cyrus-sasl/DEPENDS b/crypto/cyrus-sasl/DEPENDS
index 8c83237..9f64359 100755
--- a/crypto/cyrus-sasl/DEPENDS
+++ b/crypto/cyrus-sasl/DEPENDS
@@ -4,19 +4,19 @@ depends e2fsprogs &&
depends groff &&
depends libmcrypt &&

-optional_depends openssl '--with-openssl=/bin' '--without-openssl' 'for
OpenSSL' &&
+optional_depends openssl "--with-openssl=$INSTALL_ROOT/usr"
'--without-openssl' 'for OpenSSL' &&

if [[ "$CS_KERBEROS" == 'y' ]]; then
optional_depends krb5 \
- '--enable-gssapi=/usr' \
+ "--enable-gssapi=$INSTALL_ROOT/usr" \
'--disable-gssapi' \
'for Kerberos authentication'
fi &&
if [[ "$CS_MECH" =~ 'saslauthd' ]]; then
case "$CS_SASLD" in
shadow) ;; # TODO, didn't find appropriate option for configure
- PAM) optional_depends linux-pam '--with-pam=/usr' '--without-pam'
'saslauthd PAM backend' ;;
- LDAP) optional_depends openldap '--with-ldap=/usr' '--without-ldap'
'saslauthd LDAP backend';;
+ PAM) optional_depends linux-pam "--with-pam=$INSTALL_ROOT/usr"
'--without-pam' 'saslauthd PAM backend' ;;
+ LDAP) optional_depends openldap "--with-ldap=$INSTALL_ROOT/usr"
'--without-ldap' 'saslauthd LDAP backend';;
KERBEROS) ;; # TODO, what's special about this one?
esac
fi &&
@@ -25,7 +25,7 @@ if [[ "$CS_MECH" =~ 'auxprop' ]]; then
berkeley) depends db '--with-dblib=berkeley';;
gdbm) depends gdbm '--with-dblib=gdbm' ;;
esac &&
- optional_depends sqlite2 '--enable-sql --with-sqlite=/usr'
'--without-sqlite' 'auxprop SQLite backend' &&
- optional_depends mysql '--enable-sql --with-mysql=/usr'
'--without-mysql' 'auxprop MySQL backend' &&
- optional_depends postgresql '--enable-sql --with-pgsql=/usr'
'--without-pgsql' 'auxprop PostgreSQL backend'
+ optional_depends sqlite2 "--enable-sql --with-sqlite=$INSTALL_ROOT/usr"
'--without-sqlite' 'auxprop SQLite backend' &&
+ optional_depends mysql "--enable-sql --with-mysql=$INSTALL_ROOT/usr"
'--without-mysql' 'auxprop MySQL backend' &&
+ optional_depends postgresql "--enable-sql --with-pgsql=$INSTALL_ROOT/usr"
'--without-pgsql' 'auxprop PostgreSQL backend'
fi
diff --git a/crypto/cyrus-sasl/HISTORY b/crypto/cyrus-sasl/HISTORY
index bc17200..fc2b939 100644
--- a/crypto/cyrus-sasl/HISTORY
+++ b/crypto/cyrus-sasl/HISTORY
@@ -1,3 +1,8 @@
+2009-04-19 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Look for OpenSSL in INSTALL_ROOT/usr not /bin
+ Bug #15177
+ Use INSTALL_ROOT/ for all --with paths
+
2009-04-07 Treeve Jelbert <treeve AT sourcemage.org>
* PRE_BUILD, gcc44.diff: added, fix compile with gcc-4.4




  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (66f0f9282b133d77b3177db3047b972e1e078f63), Eric Sandall, 04/19/2009

Archive powered by MHonArc 2.6.24.

Top of Page