OpenPKG CVS Repository
  http://www.openpkg.org/cvsweb/cvsweb.cgi
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-re, openpkg-web, openpkg-src Date:   16-Jul-2002 15:05:46
  Branch: HEAD                             Handle: 2002071614054501

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

  Log:
    add quaterly brain-dead chroot support (dedicated to Thomas Rohde)

  Summary:
    Revision    Changes     Path
    1.6         +5  -0      openpkg-re/vcheck/vc.openssh
    1.49        +15 -2      openpkg-src/openssh/openssh.spec
    1.954       +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  Index: openpkg-re/vcheck/vc.openssh
  ============================================================
  $ cvs diff -u -r1.5 -r1.6 vc.openssh
  --- openpkg-re/vcheck/vc.openssh      27 Jun 2002 06:31:25 -0000      1.5
  +++ openpkg-re/vcheck/vc.openssh      16 Jul 2002 13:05:45 -0000      1.6
  @@ -6,4 +6,9 @@
     url       = ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/
     regex     = openssh-(__VER__)\.tar\.gz
   }
  +prog openssh:chroot = {
  +  version   = 3.4
  +  url       = http://chrootssh.sourceforge.net/patches/
  +  regex     = osshChroot-(__VER__).diff
  +}
   
  Index: openpkg-src/openssh/openssh.spec
  ============================================================
  $ cvs diff -u -r1.48 -r1.49 openssh.spec
  --- openpkg-src/openssh/openssh.spec  6 Jul 2002 12:03:10 -0000       1.48
  +++ openpkg-src/openssh/openssh.spec  16 Jul 2002 13:05:46 -0000      1.49
  @@ -23,6 +23,10 @@
   ##  SUCH DAMAGE.
   ##
   
  +#   package versions
  +%define       V_base       3.4
  +%define       V_portable   p1
  +
   #   package options
   %ifndef       with_pam
   %define       with_pam     no
  @@ -36,6 +40,9 @@
   %ifndef       with_x11
   %define       with_x11     no
   %endif
  +%ifndef       with_chroot
  +%define       with_chroot  no
  +%endif
   
   #   package information
   Name:         openssh
  @@ -46,8 +53,8 @@
   Distribution: OpenPKG [REL]
   Group:        Cryptography
   License:      BSD
  -Version:      3.4p1
  -Release:      20020706
  +Version:      %{V_base}%{V_portable}
  +Release:      20020716
   
   #   list of sources
   Source0:      
ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
  @@ -59,6 +66,7 @@
   Source6:      ssh-keyman
   Source7:      ssh-keyman.1
   Source8:      ssh-keyman.pod
  +Source9:      http://chrootssh.sourceforge.net/patches/osshChroot-%{V_base}.diff
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -95,10 +103,15 @@
   
       Options: with_pam=%{with_pam} with_pcre=%{with_pcre}
       Options: with_skey=%{with_skey} with_x11=%{with_x11}
  +    Options: with_chroot=%{with_chroot}
   
   %prep
       %setup0 -q -c
       %setup1 -q -T -D -a 1
  +%if "%{with_chroot}" == "yes"
  +    cd openssh-%{version}
  +    %{l_patch} -p1 <%{SOURCE osshChroot-%{V_base}.diff}
  +%endif
   
   %build
       #   build faked syslog(3) library
  Index: openpkg-web/news.txt
  ============================================================
  $ cvs diff -u -r1.953 -r1.954 news.txt
  --- openpkg-web/news.txt      16 Jul 2002 12:49:00 -0000      1.953
  +++ openpkg-web/news.txt      16 Jul 2002 13:05:46 -0000      1.954
  @@ -1,3 +1,4 @@
  +16-Jul-2002: Upgraded package: P<openssh-3.4p1-20020716>
   16-Jul-2002: New package: P<btyacc-3.0-20020716>
   16-Jul-2002: New package: P<max-7.4.2-20020716>
   16-Jul-2002: Upgraded package: P<w3m-0.3.1-20020716>
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to