OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Sep-2007 19:45:18
Branch: HEAD Handle: 2007091418451700
Added files:
openpkg-src/curl curl.patch
Modified files:
openpkg-src/curl curl.spec
Log:
add optional LDAP[S] support not that cURL supports regular linking
against OpenLDAP
Summary:
Revision Changes Path
1.14 +39 -0 openpkg-src/curl/curl.patch
1.99 +24 -0 openpkg-src/curl/curl.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/curl/curl.patch
============================================================================
$ cvs diff -u -r0 -r1.14 curl.patch
--- /dev/null 2007-09-14 19:45:16 +0200
+++ curl.patch 2007-09-14 19:45:17 +0200
@@ -0,0 +1,39 @@
+Index: configure
+--- configure.orig 2007-09-14 19:17:04 +0200
++++ configure 2007-09-14 19:21:28 +0200
+@@ -22009,7 +22009,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-l"$LDAPLIBNAME" $LIBS"
++LIBS="-l$LDAPLIBNAME $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -22070,7 +22070,7 @@
+ #define `echo "HAVE_LIB"$LDAPLIBNAME"" | $as_tr_cpp` 1
+ _ACEOF
+
+- LIBS="-l"$LDAPLIBNAME" $LIBS"
++ LIBS="-l$LDAPLIBNAME $LIBS"
+
+ else
+
+@@ -22195,7 +22195,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-l"$LBERLIBNAME" $LIBS"
++LIBS="-l$LBERLIBNAME $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -22256,7 +22256,7 @@
+ #define `echo "HAVE_LIB"$LBERLIBNAME"" | $as_tr_cpp` 1
+ _ACEOF
+
+- LIBS="-l"$LBERLIBNAME" $LIBS"
++ LIBS="-l$LBERLIBNAME $LIBS"
+
+ else
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/curl/curl.spec
============================================================================
$ cvs diff -u -r1.98 -r1.99 curl.spec
--- openpkg-src/curl/curl.spec 14 Sep 2007 06:00:35 -0000 1.98
+++ openpkg-src/curl/curl.spec 14 Sep 2007 17:45:17 -0000 1.99
@@ -42,9 +42,17 @@
%option with_idn no
%option with_ares no
%option with_kerberos no
+%option with_ldap no
+
+# package option dependencies
+%if "%{with_ldap}" == "yes" && "%{with_ssl}" == "no"
+%undefine with_ssl
+%define with_ssl yes
+%endif
# list of sources
Source0: http://curl.haxx.se/download/curl-%{version}.tar.bz2
+Patch0: curl.patch
# build information
Prefix: %{l_prefix}
@@ -75,6 +83,10 @@
BuildPreReq: libssh2
PreReq: libssh2
%endif
+%if "%{with_ldap}" == "yes"
+BuildPreReq: openldap, openssl
+PreReq: openldap, openssl
+%endif
AutoReq: no
AutoReqProv: no
@@ -94,6 +106,7 @@
%prep
%setup -q
+ %patch -p0
%build
%{l_shtool} subst \
@@ -113,6 +126,9 @@
CFLAGS="$CFLAGS `pkg-config --cflags libidn`"
LIBS="$LIBS `pkg-config --libs libidn`"
%endif
+%if "%{with_ldap}" == "yes"
+ LIBS="-lldap -llber -lssl -lcrypto"
+%endif
export GREP="grep"
./configure \
--cache-file=./config.cache \
@@ -149,7 +165,15 @@
%else
--without-libssh2 \
%endif
+%if "%{with_ldap}" == "yes"
+ --enable-ldap \
+ --enable-ldaps \
+ --with-ldap-lib=ldap \
+ --with-lber-lib=lber \
+%else
--disable-ldap \
+ --disable-ldaps \
+%endif
--disable-shared
%{l_make} %{l_mflags -O}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
