add mozldap to apache

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@183 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2007-10-05 21:57:19 +00:00
parent 727d6b34cb
commit 8300a29639
15 changed files with 3387 additions and 0 deletions

View File

@@ -0,0 +1,27 @@
AUX apr-util-1.2.10-mozldap60-2.patch 4251 RMD160 028fbcf18b297c3abe529a7bce3ce6d86a7ae3b3 SHA1 de83bf6464f4d3faf73ced0903c9acf400238608 SHA256 b4aac7d935a83690c70445d4bb2b8283b4af30706e492e6c14aacccaa21ae44e
MD5 30dde1357124332b35df0cd2494f83d4 files/apr-util-1.2.10-mozldap60-2.patch 4251
RMD160 028fbcf18b297c3abe529a7bce3ce6d86a7ae3b3 files/apr-util-1.2.10-mozldap60-2.patch 4251
SHA256 b4aac7d935a83690c70445d4bb2b8283b4af30706e492e6c14aacccaa21ae44e files/apr-util-1.2.10-mozldap60-2.patch 4251
AUX apr-util-1.2.8-mozldap60-1.patch 1141 RMD160 40f3e0f1e3ce1a20838e3810689a3e123dfa3032 SHA1 de18b668862129214e8a101c0ea006398b35fb56 SHA256 2687ad2ed39dadc288d205de8152369bdf59696fb0403b8b0e084559581004ee
MD5 1b69c0ee68c2f100dc9b77a5549c8079 files/apr-util-1.2.8-mozldap60-1.patch 1141
RMD160 40f3e0f1e3ce1a20838e3810689a3e123dfa3032 files/apr-util-1.2.8-mozldap60-1.patch 1141
SHA256 2687ad2ed39dadc288d205de8152369bdf59696fb0403b8b0e084559581004ee files/apr-util-1.2.8-mozldap60-1.patch 1141
DIST apr-1.2.11.tar.gz 1114033 RMD160 8b1c1831cd8281de17f41f84ffc5cfd9b6c35553 SHA1 bde2c8b6e477752bcac4f387ac0de9671cd15d1a SHA256 fc7a14e8ded002c252cf5f3ccce6cd5636f01a85986188e373f9343a174c42ff
DIST apr-1.2.8.tar.gz 1107189 RMD160 299e1ddb1f7c9b0169a410e120c30abea38557c5 SHA1 b8c89bab084d1bae1cb15d7b9d5f40d03dfe2c4a SHA256 96e31f0ea2e028f372d5fdbbd4f88f31d59e14eda85cd12153183759f8e221c7
DIST apr-util-1.2.10.tar.gz 654083 RMD160 6d577b04a4d75efcb40e132fddf15faede7b29c1 SHA1 9e136a5492313a0eb3c50154a25da2c99dcabb1b SHA256 8761fec487ff98e7b9d965864125d0468a3d4adf2c91a44834faff3c693e6f47
DIST apr-util-1.2.8.tar.gz 646379 RMD160 00b10ef0aab26f3ea5d374e2400c1dba566a9020 SHA1 49260d98b863756974bd83cd28bc39338d4f3a82 SHA256 6527cb0b3dd619acfca668412e84e52860dfd862054246ca903822d5ea824de6
DIST apr_dbd_mysql-r84.c 49110 RMD160 9d665f2e964b09f58b182829563a203f59e16640 SHA1 04c82a4dda00bbeaddc713b29dae826562fc0db6 SHA256 79893740a58c96fba6e04f800e950ec42d8128e034056ff8a5770e0d3acc4919
EBUILD apr-util-1.2.10-r99.ebuild 3070 RMD160 34451dfa4838d9434a2f682b58bd4b2fa3a9a94b SHA1 7643c830b012872dc315be6d5daadcbf86067f18 SHA256 3a6b89e665dd1fba7f444698867a082f02bf3da9db89383dd1c9cfbfd9a13a95
MD5 b73dcab0779844fbe5928b0c76a8c22f apr-util-1.2.10-r99.ebuild 3070
RMD160 34451dfa4838d9434a2f682b58bd4b2fa3a9a94b apr-util-1.2.10-r99.ebuild 3070
SHA256 3a6b89e665dd1fba7f444698867a082f02bf3da9db89383dd1c9cfbfd9a13a95 apr-util-1.2.10-r99.ebuild 3070
EBUILD apr-util-1.2.8-r99.ebuild 2390 RMD160 9bde7988e3a1de338050948518cf3987504e2bd6 SHA1 a26ed400b3f131b360e6bc91125bd3f078590fea SHA256 3159e97ff85978446dba74848ac7b85a477586ec1fc78a8da977eede653e2221
MD5 a16a127e1f4d4de3534c852a7e8da474 apr-util-1.2.8-r99.ebuild 2390
RMD160 9bde7988e3a1de338050948518cf3987504e2bd6 apr-util-1.2.8-r99.ebuild 2390
SHA256 3159e97ff85978446dba74848ac7b85a477586ec1fc78a8da977eede653e2221 apr-util-1.2.8-r99.ebuild 2390
MD5 f67aba6d96594bf1faa4b5ff8f45aa29 files/digest-apr-util-1.2.10-r99 717
RMD160 9d96fa70dd8c8cb92149a713d0f790ca2b03b156 files/digest-apr-util-1.2.10-r99 717
SHA256 b10027b2194f7bdbd55d5acf3199840ed09da8dad35100d36fbe1664b8d9cede files/digest-apr-util-1.2.10-r99 717
MD5 a370b4eedd72b270820f53bdaad70cd7 files/digest-apr-util-1.2.8-r99 711
RMD160 307be2c9b20be5df35eb35bdd0a9de35ead82a88 files/digest-apr-util-1.2.8-r99 711
SHA256 9a4af4640885ebd660f0ba90f3b00c03b7c7ec7fc2adc44e95d803e9868bcf09 files/digest-apr-util-1.2.8-r99 711

View File

@@ -0,0 +1,110 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.2.10.ebuild,v 1.2 2007/09/09 07:14:48 hollow Exp $
inherit autotools eutils flag-o-matic libtool db-use
DBD_MYSQL=84
APR_PV=1.2.11
DESCRIPTION="Apache Portable Runtime Library"
HOMEPAGE="http://apr.apache.org/"
SRC_URI="mirror://apache/apr/${P}.tar.gz
mirror://apache/apr/apr-${APR_PV}.tar.gz
mysql? ( mirror://gentoo/apr_dbd_mysql-r${DBD_MYSQL}.c )"
LICENSE="Apache-2.0"
SLOT="1"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
IUSE="berkdb doc gdbm ldap mozldap mysql postgres sqlite sqlite3"
RESTRICT="test"
DEPEND="dev-libs/expat
>=dev-libs/apr-${PV}
berkdb? ( =sys-libs/db-4* )
doc? ( app-doc/doxygen )
gdbm? ( sys-libs/gdbm )
ldap? ( =net-nds/openldap-2* )
mozldap? ( =dev-libs/mozldap-6*
=dev-libs/nspr-4*
=dev-libs/nss-3* )
mysql? ( =virtual/mysql-5* )
postgres? ( dev-db/libpq )
sqlite? ( =dev-db/sqlite-2* )
sqlite3? ( =dev-db/sqlite-3* )"
pkg_setup() {
if use ldap && use mozldap ; then
eerror "you cant activate ldap & mozldap at the same time "
eerror "plz deactivate \"dev-libs/apr-util -ldap mozldap\" one in"
eerror "\"etc/portage/package.use\" ;p"
die "ldap and mozldap USE conflict"
fi
}
src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/"${P}"-mozldap60-2.patch
if use mysql ; then
cp "${DISTDIR}"/apr_dbd_mysql-r${DBD_MYSQL}.c \
"${S}"/dbd/apr_dbd_mysql.c || die "could not copy mysql driver"
fi
./buildconf --with-apr=../apr-${APR_PV} || die "buildconf failed"
elibtoolize || die "elibtoolize failed"
}
src_compile() {
local myconf=""
use ldap && myconf="${myconf} --with-ldap"
use mozldap && myconf="${myconf} --with-ldap \
--with-ldap-include=/usr/include/mozldap/ \
--with-ldap-lib=/usr/$(get_libdir)/mozldap/ \
--with-nss-lib=/usr/$(get_libdir)/nss/ \
--with-nspr-lib=/usr/$(get_libdir)/nspr"
if use berkdb; then
dbver="$(db_findver sys-libs/db)" || die "Unable to find db version"
dbver="$(db_ver_to_slot "$dbver")"
dbver="${dbver/\./}"
myconf="${myconf} --with-dbm=db${dbver}
--with-berkeley-db=$(db_includedir):/usr/$(get_libdir)"
else
myconf="${myconf} --without-berkeley-db"
fi
econf --datadir=/usr/share/apr-util-1 \
--with-apr=/usr \
--with-expat=/usr \
$(use_with gdbm) \
$(use_with mysql) \
$(use_with postgres pgsql) \
$(use_with sqlite sqlite2) \
$(use_with sqlite3) \
${myconf} || die "econf failed!"
emake || die "emake failed!"
if use doc; then
emake dox || die "make dox failed"
fi
}
src_install() {
make DESTDIR="${D}" install || die "make install failed"
dodoc CHANGES NOTICE
if use doc; then
dohtml docs/dox/html/* || die
fi
# This file is only used on AIX systems, which gentoo is not,
# and causes collisions between the SLOTs, so kill it
rm "${D}"/usr/$(get_libdir)/aprutil.exp
}

View File

@@ -0,0 +1,86 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.2.8-r1.ebuild,v 1.3 2007/07/31 10:35:02 phreak Exp $
inherit autotools eutils flag-o-matic libtool db-use
DBD_MYSQL=84
DESCRIPTION="Apache Portable Runtime Library"
HOMEPAGE="http://apr.apache.org/"
SRC_URI="mirror://apache/apr/${P}.tar.gz
mirror://apache/apr/apr-${PV}.tar.gz
mysql? ( mirror://gentoo/apr_dbd_mysql-r${DBD_MYSQL}.c )"
LICENSE="Apache-2.0"
SLOT="1"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
IUSE="berkdb gdbm ldap mysql postgres sqlite sqlite3 mozldap"
RESTRICT="test"
DEPEND="dev-libs/expat
>=dev-libs/apr-${PV}
berkdb? ( =sys-libs/db-4* )
gdbm? ( sys-libs/gdbm )
ldap? ( =net-nds/openldap-2* )
mysql? ( =virtual/mysql-5* )
postgres? ( dev-db/libpq )
sqlite? ( =dev-db/sqlite-2* )
sqlite3? ( =dev-db/sqlite-3* )"
src_unpack() {
unpack ${A}
cd "${S}"
if use mozldap ; then
epatch "${FILESDIR}"/"${P}"-mozldap60-1.patch
fi
if use mysql ; then
cp "${DISTDIR}"/apr_dbd_mysql-r${DBD_MYSQL}.c \
"${S}"/dbd/apr_dbd_mysql.c || die "could not copy mysql driver"
fi
./buildconf --with-apr=../apr-${PV} || die "buildconf failed"
elibtoolize || die "elibtoolize failed"
}
src_compile() {
local myconf=""
use ldap && myconf="${myconf} --with-ldap"
use mozldap && myconf="${myconf} --with-ldap-include=/usr/include/mozldap --with-ldap-lib=/usr/$(get_libdir)/mozldap"
if use berkdb; then
dbver="$(db_findver sys-libs/db)" || die "Unable to find db version"
dbver="$(db_ver_to_slot "$dbver")"
dbver="${dbver/\./}"
myconf="${myconf} --with-dbm=db${dbver}
--with-berkeley-db=$(db_includedir):/usr/$(get_libdir)"
else
myconf="${myconf} --without-berkeley-db"
fi
econf --datadir=/usr/share/apr-util-1 \
--with-apr=/usr \
--with-expat=/usr \
$(use_with gdbm) \
$(use_with mysql) \
$(use_with postgres pgsql) \
$(use_with sqlite sqlite2) \
$(use_with sqlite3) \
${myconf} || die "econf failed!"
emake || die "emake failed!"
}
src_install() {
make DESTDIR="${D}" install || die "make install failed"
dodoc CHANGES NOTICE
# This file is only used on AIX systems, which gentoo is not,
# and causes collisions between the SLOTs, so kill it
rm "${D}"/usr/$(get_libdir)/aprutil.exp
}

View File

@@ -0,0 +1,128 @@
Submitted By: Mario Fetka (mario-fetka at gmx dot at)
Date: 2007-10-05
Initial Package Version: 1.2.10
Origin: me
Upstream Status: unknown
Description: apr-util dont want to find mozldap60 this patch corrects it
also check if ber_init is present in libldap60
--- apr-util-1.2.10.orig/build/apu-conf.m4 2007-06-07 11:38:53.000000000 +0200
+++ apr-util-1.2.10/build/apu-conf.m4 2007-10-05 22:37:42.000000000 +0200
@@ -198,6 +198,44 @@
])
+dnl
+dnl Find a particular LBER library
+dnl
+AC_DEFUN([APU_FIND_LBERLIB], [
+ if test ${apu_has_lber} != "1"; then
+ lberlib=$1
+ extralib=$2
+ unset ac_cv_lib_${lberlib}_ber_init
+ unset ac_cv_lib_${lberlib}___ber_init
+ AC_CHECK_LIB(${lberlib}, ber_init,
+ [
+ APR_ADDTO(APRUTIL_EXPORT_LIBS,[-l${lberlib} ${extralib}])
+ APR_ADDTO(APRUTIL_LIBS,[-l${ldaplib} ${extralib}])
+ apu_has_lber="1";
+ ], , ${extralib})
+ fi
+])
+
+
+dnl
+dnl Find a particular LBER library
+dnl
+AC_DEFUN([APU_FIND_LBERLIB], [
+ if test ${apu_has_lber} != "1"; then
+ lberlib=$1
+ extralib=$2
+ unset ac_cv_lib_${lberlib}_ber_init
+ unset ac_cv_lib_${lberlib}___ber_init
+ AC_CHECK_LIB(${lberlib}, ber_init,
+ [
+ APR_ADDTO(APRUTIL_EXPORT_LIBS,[-l${lberlib} ${extralib}])
+ APR_ADDTO(APRUTIL_LIBS,[-l${ldaplib} ${extralib}])
+ apu_has_lber="1";
+ ], , ${extralib})
+ fi
+])
+
+
dnl
dnl APU_FIND_LDAP: figure out where LDAP is located
dnl
@@ -206,6 +244,7 @@
echo $ac_n "${nl}checking for ldap support..."
apu_has_ldap="0";
+apu_has_lber="0";
apu_has_ldapssl_client_init="0"
apu_has_ldapssl_client_deinit="0"
apu_has_ldapssl_add_trusted_cert="0"
@@ -221,6 +260,8 @@
apu_has_ldap_mozilla="0"
apu_has_ldap_other="0"
+AC_ARG_WITH(nss-lib,[ --with-nss-lib=path path to Mozilla nss lib file])
+AC_ARG_WITH(nspr-lib,[ --with-nspr-lib=path path to Moilla nspr lib file])
AC_ARG_WITH(ldap-include,[ --with-ldap-include=path path to ldap include files with trailing slash])
AC_ARG_WITH(ldap-lib,[ --with-ldap-lib=path path to ldap lib file])
AC_ARG_WITH(ldap,[ --with-ldap=library ldap library to use],
@@ -237,9 +278,20 @@
APR_ADDTO(APRUTIL_LDFLAGS, [-L$with_ldap_lib])
fi
+ if test -n "$with_nss_lib"; then
+ LDFLAGS="$LDFLAGS -L$with_nss_lib"
+ APR_ADDTO(APRUTIL_LDFLAGS, [-L$with_nss_lib])
+ fi
+
+ if test -n "$with_nspr_lib"; then
+ LDFLAGS="$LDFLAGS -L$with_nspr_lib"
+ APR_ADDTO(APRUTIL_LDFLAGS, [-L$with_nspr_lib])
+ fi
+
LIBLDAP="$withval"
if test "$LIBLDAP" = "yes"; then
dnl The iPlanet C SDK 5.0 is as yet untested...
+ APU_FIND_LDAPLIB("ldap60", "-lnspr4 -lplc4 -lplds4 -liutil60 -llber60 -lldif60 -lnss3 -lprldap60 -lssl3 -lssldap60")
APU_FIND_LDAPLIB("ldap50", "-lnspr4 -lplc4 -lplds4 -liutil50 -llber50 -lldif50 -lnss3 -lprldap50 -lssl3 -lssldap50")
APU_FIND_LDAPLIB("ldapssl41", "-lnspr3 -lplc3 -lplds3")
APU_FIND_LDAPLIB("ldapssl40")
@@ -259,7 +311,11 @@
fi
test ${apu_has_ldap} != "1" && AC_MSG_ERROR(could not find an LDAP library)
- AC_CHECK_LIB(lber, ber_init)
+
+ echo $ac_n "${nl}checking for lber support..."
+
+ APU_FIND_LBERLIB("ldap60", "-lnspr4 -lplc4 -lplds4 -liutil60 -llber60 -lldif60 -lnss3 -lprldap60 -lssl3 -lssldap60")
+ APU_FIND_LBERLIB("lber")
AC_CHECK_HEADERS(lber.h, lber_h=["#include <lber.h>"])
@@ -278,7 +334,20 @@
AC_DEFINE([HAVE_LDAP_H], 1, [Defined if ldap.h is present])
fi
- AC_CHECK_HEADERS(ldap_ssl.h, ldap_ssl_h=["#include <ldap_ssl.h>"])
+ # Mozilla has a problem in <ldap_ssl.h> which prevents it from
+ # being included by itself. Check for <ldap_ssl.h> manually,
+ # including ldap.h first.
+ AC_CACHE_CHECK([for ldap_ssl.h], [apr_cv_hdr_ldap_ssl_h],
+ [AC_TRY_CPP(
+ [#ifdef HAVE_LDAP_H
+ #include <ldap.h>
+ #endif
+ #include <ldap_ssl.h>
+ ], [apr_cv_hdr_ldap_ssl_h=yes], [apr_cv_hdr_ldap_ssl_h=no])])
+ if test "$apr_cv_hdr_ldap_ssl_h" = "yes"; then
+ ldap_ssl_h=["#include <ldap_ssl.h>"]
+ AC_DEFINE([HAVE_LDAP_SSL_H], 1, [Defined if ldap_ssl.h is present])
+ fi
if test "$apr_cv_hdr_ldap_h" = "yes"; then
AC_CACHE_CHECK([for LDAP toolkit],

View File

@@ -0,0 +1,27 @@
Submitted By: Mario Fetka (mario-fetka at gmx dot at)
Date: 2007-08-20
Initial Package Version: 1.2.8
Origin: me
Upstream Status: unknown
Description: This patch adds support for mozldap (its a hack)
diff -Naur apr-util-1.2.8.orig/build/apu-conf.m4 apr-util-1.2.8/build/apu-conf.m4
--- apr-util-1.2.8.orig/build/apu-conf.m4 2007-08-20 18:22:08.000000000 +0000
+++ apr-util-1.2.8/build/apu-conf.m4 2007-08-20 19:44:42.000000000 +0000
@@ -296,6 +296,7 @@
LIBLDAP="$withval"
if test "$LIBLDAP" = "yes"; then
dnl The iPlanet C SDK 5.0 is as yet untested...
+ APU_FIND_LDAPLIB("ldap60", "-lnspr4 -lplc4 -lplds4 -lldif60 -lnss3 -lprldap60 -lssl3 -lssldap60")
APU_FIND_LDAPLIB("ldap50", "-lnspr4 -lplc4 -lplds4 -liutil50 -llber50 -lldif50 -lnss3 -lprldap50 -lssl3 -lssldap50")
APU_FIND_LDAPLIB("ldapssl41", "-lnspr3 -lplc3 -lplds3")
APU_FIND_LDAPLIB("ldapssl40")
@@ -315,7 +316,7 @@
fi
test ${apu_has_ldap} != "1" && AC_MSG_ERROR(could not find an LDAP library)
- AC_CHECK_LIB(lber, ber_init)
+ AC_CHECK_LIB(ldap60, ber_init)
AC_CHECK_HEADERS(lber.h, lber_h=["#include <lber.h>"])

View File

@@ -0,0 +1,9 @@
MD5 afcf9541dc31551abeb6c53bb42c2596 apr-1.2.11.tar.gz 1114033
RMD160 8b1c1831cd8281de17f41f84ffc5cfd9b6c35553 apr-1.2.11.tar.gz 1114033
SHA256 fc7a14e8ded002c252cf5f3ccce6cd5636f01a85986188e373f9343a174c42ff apr-1.2.11.tar.gz 1114033
MD5 7558fba2ce6eade83cf28a7164a981fa apr-util-1.2.10.tar.gz 654083
RMD160 6d577b04a4d75efcb40e132fddf15faede7b29c1 apr-util-1.2.10.tar.gz 654083
SHA256 8761fec487ff98e7b9d965864125d0468a3d4adf2c91a44834faff3c693e6f47 apr-util-1.2.10.tar.gz 654083
MD5 a9914273d9f27b3c1fbf9bb50e10627f apr_dbd_mysql-r84.c 49110
RMD160 9d665f2e964b09f58b182829563a203f59e16640 apr_dbd_mysql-r84.c 49110
SHA256 79893740a58c96fba6e04f800e950ec42d8128e034056ff8a5770e0d3acc4919 apr_dbd_mysql-r84.c 49110

View File

@@ -0,0 +1,9 @@
MD5 814f19528d9cfc79aef188dd752e04d8 apr-1.2.8.tar.gz 1107189
RMD160 299e1ddb1f7c9b0169a410e120c30abea38557c5 apr-1.2.8.tar.gz 1107189
SHA256 96e31f0ea2e028f372d5fdbbd4f88f31d59e14eda85cd12153183759f8e221c7 apr-1.2.8.tar.gz 1107189
MD5 a2e2e54d65e9eae961f7171335cf2550 apr-util-1.2.8.tar.gz 646379
RMD160 00b10ef0aab26f3ea5d374e2400c1dba566a9020 apr-util-1.2.8.tar.gz 646379
SHA256 6527cb0b3dd619acfca668412e84e52860dfd862054246ca903822d5ea824de6 apr-util-1.2.8.tar.gz 646379
MD5 a9914273d9f27b3c1fbf9bb50e10627f apr_dbd_mysql-r84.c 49110
RMD160 9d665f2e964b09f58b182829563a203f59e16640 apr_dbd_mysql-r84.c 49110
SHA256 79893740a58c96fba6e04f800e950ec42d8128e034056ff8a5770e0d3acc4919 apr_dbd_mysql-r84.c 49110