[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openpkg-cvs
Subject:    [CVS] OpenPKG: openpkg-src/openssh/ openssh.spec openpkg-web/ news.txt
From:       "Ralf S. Engelschall" <rse () openpkg ! org>
Date:       2003-10-30 20:52:37
[Download RAW message or body]

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  rse@openpkg.org
  Module: openpkg-src openpkg-web          Date:   30-Oct-2003 21:52:37
  Branch: HEAD                             Handle: 2003103020523502

  Modified files:
    openpkg-src/openssh     openssh.spec
    openpkg-web             news.txt

  Log:
    add optional LDAP support (means it directly can read SSH public keys
    from an LDAP server)

  Summary:
    Revision    Changes     Path
    1.114       +17 -1      openpkg-src/openssh/openssh.spec
    1.7233      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/openssh/openssh.spec
  ============================================================================
  $ cvs diff -u -r1.113 -r1.114 openssh.spec
  --- openpkg-src/openssh/openssh.spec	9 Oct 2003 08:03:13 -0000	1.113
  +++ openpkg-src/openssh/openssh.spec	30 Oct 2003 20:52:37 -0000	1.114
  @@ -27,6 +27,9 @@
   %define       V_base        3.7.1
   %define       V_portable    p2
   %define       V_watchdog    3.7.1p1
  +%define       V_ldap_base   3.7.1p2
  +%define       V_ldap_vers1  v2.01
  +%define       V_ldap_vers2  v201
   
   #   package information
   Name:         openssh
  @@ -38,7 +41,7 @@
   Group:        Security
   License:      BSD
   Version:      %{V_base}%{V_portable}
  -Release:      20031009
  +Release:      20031030
   
   #   package options
   %option       with_fsl      yes
  @@ -48,6 +51,7 @@
   %option       with_x11      no
   %option       with_chroot   no
   %option       with_watchdog no
  +%option       with_ldap     no
   
   #   list of sources
   Source0:      ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
  @@ -61,6 +65,7 @@
   Source8:      ssh-keyman.pod
   Patch0:       openssh.patch
   Patch1:       http://www.sc.isc.tohoku.ac.jp/~hgot/sources/openssh-%{V_watchdog}-watchdog.patch.tgz
  +Patch2:       http://ldappubkey.gcu-squad.org/%{V_ldap_vers1}/ldappubkey-ossh%{V_ldap_base}-%{V_ldap_vers2}.patch
  
   #   build information
   Prefix:       %{l_prefix}
  @@ -89,6 +94,10 @@
   BuildPreReq:  X11
   PreReq:       X11
   %endif
  +%if "%{with_ldap}" == "yes"
  +BuildPreReq:  openldap
  +PreReq:       openldap
  +%endif
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -114,6 +123,9 @@
       %{l_gzip} -d -c %{SOURCE openssh-%{V_watchdog}-watchdog.patch.tgz} | %{l_tar} \
xf -  %{l_patch} -p0 <openssh-%{V_watchdog}-watchdog.patch
   %endif
  +%if "%{with_ldap}" == "yes"
  +    %{l_gzip} -d -c %{SOURCE ldappubkey-ossh%{V_ldap_base}-%{V_ldap_vers2}.patch} \
| %{l_patch} -p0  +%endif
   
   %build
       #   configure package
  @@ -125,6 +137,10 @@
   %if "%{with_pam}" == "yes"
       cflags="$cflags -I`%{l_prefix}/etc/rc --query pam_incdir`"
       ldflags="$ldflags -L`%{l_prefix}/etc/rc --query pam_libdir`"
  +%endif
  +%if "%{with_ldap}" == "yes"
  +    cflags="$cflags -DWITH_LDAP_PUBKEY"
  +    ldflags="$ldflags -lldap -llber -lcrypto -lssl"
   %endif
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O} %{l_cppflags} $cflags" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.7232 -r1.7233 news.txt
  --- openpkg-web/news.txt	30 Oct 2003 18:53:34 -0000	1.7232
  +++ openpkg-web/news.txt	30 Oct 2003 20:52:35 -0000	1.7233
  @@ -1,3 +1,4 @@
  +30-Oct-2003: Upgraded package: P<openssh-3.7.1p2-20031030>
   30-Oct-2003: Upgraded package: P<bogofilter-0.15.8-20031030>
   30-Oct-2003: Upgraded package: P<perl-crypto-20031030-20031030>
   30-Oct-2003: Upgraded package: P<mplayer-1.0pre2-20031030>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org


[prev in list] [next in list] [prev in thread] [next in thread]