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: 19-Jan-2006 16:45:31
Branch: OPENPKG_2_5_SOLID Handle: 2006011915453100
Modified files: (Branch: OPENPKG_2_5_SOLID)
openpkg-src/openssh openssh.spec
Log:
MFC: back-port LDAP support fixes (unbreaks build under option
with_ldap)
Summary:
Revision Changes Path
1.153.2.2 +14 -9 openpkg-src/openssh/openssh.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.spec
============================================================================
$ cvs diff -u -r1.153.2.1 -r1.153.2.2 openssh.spec
--- openpkg-src/openssh/openssh.spec 11 Oct 2005 12:51:08 -0000
1.153.2.1
+++ openpkg-src/openssh/openssh.spec 19 Jan 2006 15:45:31 -0000
1.153.2.2
@@ -22,15 +22,12 @@
## SUCH DAMAGE.
##
-# FIXME: rse: with_ldap currently broken due to upgrades
-
# package versions
%define V_base 4.2
%define V_portable p1
%define V_watchdog 4.0p1
-%define V_ldap_base 3.7.1p2
-%define V_ldap_vers1 v2.01
-%define V_ldap_vers2 v201
+%define V_ldap_base 4.1p1
+%define V_ldap_vers 0.3.6
%define V_connect 1.95
# package information
@@ -44,7 +41,7 @@
Group: Security
License: BSD
Version: %{V_base}%{V_portable}
-Release: 2.5.0
+Release: 2.5.1
# package options
%option with_fsl yes
@@ -75,7 +72,7 @@
Patch1: openssh.patch.chroot
Patch2: openssh.patch.alias
Patch3:
http://www.sc.isc.tohoku.ac.jp/~hgot/sources/openssh-%{V_watchdog}-watchdog.patch.tgz
-Patch4:
http://ldappubkey.gcu-squad.org/%{V_ldap_vers1}/ldappubkey-ossh%{V_ldap_base}-%{V_ldap_vers2}.patch
+Patch4:
http://www.opendarwin.org/en/projects/openssh-lpk/files/openssh-lpk-%{V_ldap_base}-%{V_ldap_vers}.patch
Patch5: openssh.patch.sftplogging
Patch6: openssh.patch.scpbindir
@@ -135,6 +132,11 @@
url =
http://www.sc.isc.tohoku.ac.jp/~hgot/sources/openssh-watchdog.html
regex = HREF=.openssh-(__VER__)-watchdog\.patch\.tgz
}
+ prog openssh:ldap = {
+ version = %{V_ldap_base}-%{V_ldap_vers}
+ url = http://www.opendarwin.org/en/projects/openssh-lpk/
+ regex = openssh-lpk-(__VER__)\.patch
+ }
%prep
# unpack and patch distribution
@@ -157,7 +159,7 @@
%{l_patch} -p0 -b <openssh-%{V_watchdog}-watchdog.patch
%endif
%if "%{with_ldap}" == "yes"
- %{l_patch} -p1 -b <%{SOURCE
ldappubkey-ossh%{V_ldap_base}-%{V_ldap_vers2}.patch}
+ %{l_patch} -p1 -b <%{SOURCE
openssh-lpk-%{V_ldap_base}-%{V_ldap_vers}.patch}
%endif
%if "%{with_sftplogging}" == "yes"
%patch -p0 -P 5
@@ -186,7 +188,7 @@
ldflags="$ldflags -L`%{l_rc} --query pam_libdir`"
%endif
%if "%{with_ldap}" == "yes"
- cflags="$cflags -DWITH_LDAP_PUBKEY"
+ cflags="$cflags -DLDAP_DEPRECATED"
ldflags="$ldflags -lldap -llber -lcrypto -lssl"
%endif
strip="--enable-strip"; %{l_shtool} path strip || strip="--disable-strip"
@@ -218,6 +220,9 @@
%if "%{with_wrap}" == "yes"
--with-tcp-wrappers=%{l_prefix} \
%endif
+%if "%{with_ldap}" == "yes"
+ --with-ldap=%{l_prefix} \
+%endif
--with-md5-passwords \
--with-zlib=%{l_prefix} \
--with-ipv4-default \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
