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

List:       openpkg-cvs
Subject:    [CVS] OpenPKG: OPENPKG_2_0_SOLID: openpkg-src/proftpd/ proftpd.patch p...
From:       "Ralf S. Engelschall" <rse () openpkg ! org>
Date:       2004-04-30 7:58:37
Message-ID: 20040430075837.2BD862FE9EF () mail ! openpkg ! org
[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                      Date:   30-Apr-2004 09:58:37
  Branch: OPENPKG_2_0_SOLID                Handle: 2004043008583600

  Added files:              (Branch: OPENPKG_2_0_SOLID)
    openpkg-src/proftpd     proftpd.patch
  Modified files:           (Branch: OPENPKG_2_0_SOLID)
    openpkg-src/proftpd     proftpd.spec

  Log:
    apply ACL CIDR mode bugfix

  Summary:
    Revision    Changes     Path
    1.6.2.1     +24 -0      openpkg-src/proftpd/proftpd.patch
    1.78.2.2    +3  -1      openpkg-src/proftpd/proftpd.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/proftpd/proftpd.patch
  ============================================================================
  $ cvs diff -u -r0 -r1.6.2.1 proftpd.patch
  --- /dev/null	2004-04-30 09:58:36.000000000 +0200
  +++ proftpd.patch	2004-04-30 09:58:37.000000000 +0200
  @@ -0,0 +1,24 @@
  +This patch fixes the broken ACL implementation.
  +Without this patch the ACLs with CIDR entries will not work.
  +See http://bugs.proftpd.org/show_bug.cgi?id=2267 for details.
  +
  +Index: src/dirtree.c
  +--- src/dirtree.c.orig	2003-10-19 00:14:14.000000000 +0200
  ++++ src/dirtree.c	2004-04-30 09:50:58.000000000 +0200
  +@@ -1533,11 +1533,11 @@
  +   }
  + 
  +   if (cidr_mode) {
  +-/* NOTE: encapsulation breakage note/IPv6 change needed here. */
  +-#if 0
  +-    if ((cli_addr->s_addr & htonl(cidr_mask)) == cidr_addr.s_addr)
  +-#endif
  +-      return 1;
  ++    if (pr_netaddr_get_family(cli_addr) == AF_INET) {
  ++      struct in_addr *cli_in_addr = pr_netaddr_get_inaddr(cli_addr);
  ++      if ((cli_in_addr->s_addr & htonl(cidr_mask)) == cidr_addr.s_addr)
  ++        return 1;
  ++    }
  + 
  +   } else {
  +     pr_netaddr_t *acl_addr = NULL;
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/proftpd/proftpd.spec
  ============================================================================
  $ cvs diff -u -r1.78.2.1 -r1.78.2.2 proftpd.spec
  --- openpkg-src/proftpd/proftpd.spec	18 Feb 2004 14:51:16 -0000	1.78.2.1
  +++ openpkg-src/proftpd/proftpd.spec	30 Apr 2004 07:58:36 -0000	1.78.2.2
  @@ -34,7 +34,7 @@
   Group:        FTP
   License:      GPL
   Version:      1.2.9
  -Release:      2.0.0
  +Release:      2.0.1
   
   #   package options
   %option       with_ifsession  no
  @@ -54,6 +54,7 @@
   Source2:      proftpd.msg.goaway
   Source3:      proftpd.msg.login
   Source4:      rc.proftpd
  +Patch0:       proftpd.patch
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -107,6 +108,7 @@
   
   %prep
       %setup -q
  +    %patch -p0
       #   utils also require link with getopt
       %{l_shtool} subst \
           -e 's;\(\$(BUILD_FTPCOUNT_OBJS).*\);\1 %{l_ldflags} -lgetopt;g' \
  @@ .
______________________________________________________________________
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]