dbp/linamh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dev-libs/apr-util: correct patch

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@530 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2008-11-07 20:41:27 +00:00
parent 905984fe67
commit 089050a720
7 changed files with 19 additions and 336 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dev-libs/apr-util/ChangeLog
View File

@ -2,6 +2,14 @@
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
07 Nov 2008; Mario Fetka <mario.fetka@gmail.com>
-files/apr-util-1.2.10-mozldap60-2.patch,
-files/apr-util-1.3.4-mozldap60-3.patch,
+files/apr-util-1.3.4-mozldap60-4.patch, -apr-util-1.3.2-r100.ebuild,
-apr-util-1.3.4-r100.ebuild, -apr-util-1.3.4-r101.ebuild,
+apr-util-1.3.4-r102.ebuild:
correct patch
07 Nov 2008; Mario Fetka <mario.fetka@gmail.com>
+files/apr-util-1.3.4-mozldap60-3.patch, +apr-util-1.3.4-r101.ebuild:
correct mozldap patch

10
dev-libs/apr-util/Manifest
View File

@ -1,10 +1,6 @@
AUX apr-util-1.2.10-mozldap60-2.patch 4251 RMD160 202f330c9dd9d5f9677de9f77149e3f912f2ea9c SHA1 1ee53d4de45c6dbc470ba3c2c408161fb16d1412 SHA256 fe43f98d6c1455157c4f3f5436f948496172d1e59733c56f54690ee8e70ad32e
AUX apr-util-1.3.2.patch 1534 RMD160 b4e71d704eb3d0d858391e68e196e64c9e9b76e0 SHA1 83a3b299b7517ad699e1059728d2098441f3f5f7 SHA256 fd4299a0ee259340a515a74b05383eccd80586676b050f71c1f33a84b6b3ae9b
AUX apr-util-1.3.4-mozldap60-3.patch 2964 RMD160 a319a334f5bfc1ec163a8e2eb02f5dae207baf25 SHA1 244177e6224067841a8a0ccec3188de22e589e2d SHA256 bb00933310c1b5d3216a9098460f3b0ab29426f8828fd5868371e892a9482e5f
DIST apr-util-1.3.2.tar.gz 778182 RMD160 868a503cfb038c9dd5f82b0cdd1eee4691ef1096 SHA1 29d3974d928d29fe996f3cf1e6b4794b82272683 SHA256 0c95069e5b4962d56ec4112f2aa85701b93a7374b76adcca348ca19c0db560f1
AUX apr-util-1.3.4-mozldap60-4.patch 2890 RMD160 7471067337cfeb093f6d0c4d6c1bc5cef4930508 SHA1 7dd504feb90a2a845f277763a3f1f5237469b865 SHA256 4839bb33cadb780e55509d831cc4de301875e99648931bd15caef2b3fd6e0e4c
DIST apr-util-1.3.4.tar.gz 778902 RMD160 741b9b8e9449ce3cae565aeac57deaeb688071d3 SHA1 c538c566447cf38b849288a40cf81e5267d9117f SHA256 3f07ffdb18fb853290c9b83e82cd5cae66b8fbc357bd391e846c0afdd24fed7e
EBUILD apr-util-1.3.2-r100.ebuild 2532 RMD160 1b4e62879457592371893d954ad5a7c214d73d89 SHA1 b32f909cecbd8a0739733c19640a98af39e18f54 SHA256 2e0a86de2d33d0f9e4fc01f3cab7dd3e34a463200f0db483f03daf8a713250ff
EBUILD apr-util-1.3.4-r100.ebuild 2544 RMD160 f5c47a0f12e3ac2e7bae4d0d18861a8a65ca2ea6 SHA1 b87e4d09f79a0b1f3618d2efc0745f60e163dec1 SHA256 f54c6266ba7f22c9b93c8ff901fad44f92eee45c48fd36f6225ee93e041d4435
EBUILD apr-util-1.3.4-r101.ebuild 2664 RMD160 64e6dec6fc2c40381a50001d8359c864ee4bfad5 SHA1 7715109aa2853fb736ff345859d3be7b0dfc7a92 SHA256 7e1406f78ea2c77f0b3d40a78c49228b028b97389c071ccd0a7dbba5d5e79562
MISC ChangeLog 1227 RMD160 e3fa91307d996db791b2513b8ffd9b063ba561cd SHA1 4660361e25f8da768f5cad87519f62f4d84eefab SHA256 9e6337695abd8db3e7c1c08424e7a6bf91d84de8b558579d36e741afa737422e
EBUILD apr-util-1.3.4-r102.ebuild 2670 RMD160 91c34176c6f09b36ed125da64173c0affdf5e26f SHA1 ca762f272759b45b8bd5d8d6f5460dd5cc3ef6e9 SHA256 fcb4afed0914487043265a807b449bf241b8f2d9fc3da06c3f88252118693e52
MISC ChangeLog 1545 RMD160 6c66940cdeb50e12ea9193fb06d99c68d7dcd87d SHA1 701022ae1e995c42d3befa04eafac7248b13fb3f SHA256 b79bf666473766089544a06375f3437025f86d00d41650648b5bf9499b4fd428
MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

94
dev-libs/apr-util/apr-util-1.3.2-r100.ebuild
View File

@ -1,94 +0,0 @@
# Copyright 1999-2008 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.3.2.ebuild,v 1.1 2008/06/23 18:06:30 hollow Exp $
inherit eutils flag-o-matic libtool db-use autotools
DESCRIPTION="Apache Portable Runtime Utility Library"
HOMEPAGE="http://apr.apache.org/"
SRC_URI="mirror://apache/apr/${P}.tar.gz"
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 freetds gdbm ldap mozldap mysql odbc postgres sqlite sqlite3"
RESTRICT="test"
RDEPEND="dev-libs/expat
>=dev-libs/apr-${PV}
berkdb? ( =sys-libs/db-4* )
freetds? ( dev-db/freetds )
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* )
odbc? ( dev-db/unixODBC )
postgres? ( virtual/postgresql-base )
sqlite? ( =dev-db/sqlite-2* )
sqlite3? ( =dev-db/sqlite-3* )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )"
src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/"${PN}"-1.2.10-mozldap60-2.patch
eautoconf
}
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 freetds) \
$(use_with gdbm) \
$(use_with mysql) \
$(use_with odbc) \
$(use_with postgres pgsql) \
$(use_with sqlite sqlite2) \
$(use_with sqlite3) \
${myconf}
emake || die "emake failed!"
if use doc; then
emake dox || die "emake dox failed"
fi
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
dodoc CHANGES NOTICE
if use doc; then
dohtml docs/dox/html/* || die "dohtml failed"
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
}

99
dev-libs/apr-util/apr-util-1.3.4-r100.ebuild
View File

@ -1,99 +0,0 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
# usually apr-util has the same PV as apr, but in case of security fixes, this
# may change.
#APR_PV=${PV}
APR_PV="1.3.3"
inherit eutils flag-o-matic libtool db-use autotools
DESCRIPTION="Apache Portable Runtime Utility Library"
HOMEPAGE="http://apr.apache.org/"
SRC_URI="mirror://apache/apr/${P}.tar.gz"
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 freetds gdbm ldap mozldap mysql odbc postgres sqlite sqlite3"
RESTRICT="test"
RDEPEND="dev-libs/expat
>=dev-libs/apr-${APR_PV}
berkdb? ( =sys-libs/db-4* )
freetds? ( dev-db/freetds )
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* )
odbc? ( dev-db/unixODBC )
postgres? ( virtual/postgresql-base )
sqlite? ( =dev-db/sqlite-2* )
sqlite3? ( =dev-db/sqlite-3* )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )"
src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/"${PN}"-1.2.10-mozldap60-2.patch
eautoconf
}
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 freetds) \
$(use_with gdbm) \
$(use_with mysql) \
$(use_with odbc) \
$(use_with postgres pgsql) \
$(use_with sqlite sqlite2) \
$(use_with sqlite3) \
${myconf}
emake || die "emake failed!"
if use doc; then
emake dox || die "emake dox failed"
fi
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
dodoc CHANGES NOTICE
if use doc; then
dohtml docs/dox/html/* || die "dohtml failed"
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
}

12
dev-libs/apr-util/apr-util-1.3.4-r101.ebuild → dev-libs/apr-util/apr-util-1.3.4-r102.ebuild
View File

@ -40,7 +40,7 @@ src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/"${PN}"-1.3.4-mozldap60-3.patch
epatch "${FILESDIR}"/"${PN}"-1.3.4-mozldap60-4.patch
eautoconf
}
@ -63,7 +63,7 @@ src_compile() {
myconf="${myconf} --without-berkeley-db"
fi
use mozldap && append-ldflags "-L/usr/$(get_libdir)/nss/ -L/usr/$(get_libdir)/nspr"
# use mozldap && append-ldflags "-L/usr/$(get_libdir)/nss/ -L/usr/$(get_libdir)/nspr"
econf --datadir=/usr/share/apr-util-1 \
--with-apr=/usr \
--with-expat=/usr \
@ -76,11 +76,11 @@ src_compile() {
$(use_with sqlite3) \
${myconf}
if use mozldap; then
emake EXTRA_LDFLAGS="-L/usr/$(get_libdir)/nss/ -L/usr/$(get_libdir)/nspr" || die "emake failed!"
else
#if use mozldap; then
# emake EXTRA_LDFLAGS="-L/usr/$(get_libdir)/nss/ -L/usr/$(get_libdir)/nspr" || die "emake failed!"
#else
emake || die "emake failed!"
fi
#fi
if use doc; then
emake dox || die "emake dox failed"

128
dev-libs/apr-util/files/apr-util-1.2.10-mozldap60-2.patch
View File

@ -1,128 +0,0 @@
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${lberlib} ${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${lberlib} ${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],

4
dev-libs/apr-util/files/apr-util-1.3.4-mozldap60-3.patch → dev-libs/apr-util/files/apr-util-1.3.4-mozldap60-4.patch
View File

@ -46,7 +46,7 @@ diff -Naur apr-util-1.3.4.orig/build/apu-conf.m4 apr-util-1.3.4/build/apu-conf.m
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("ldap60", "-liutil60 -llber60 -lldif60 -lprldap60 -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")
@ -58,7 +58,7 @@ diff -Naur apr-util-1.3.4.orig/build/apu-conf.m4 apr-util-1.3.4/build/apu-conf.m
+
+ 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("ldap60", "-liutil60 -llber60 -lldif60 -lprldap60 -lssldap60")
+ APU_FIND_LBERLIB("lber")
AC_CHECK_HEADERS(lber.h, lber_h=["#include <lber.h>"])