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

List:       openpkg-cvs
Subject:    [CVS] OpenPKG: openpkg-src/inetutils/ inetutils.patch inetutils.spec
From:       "Ralf S. Engelschall" <rse () openpkg ! org>
Date:       2006-03-31 17:21:30
Message-ID: 20060331172130.85D261B50DE () master ! openpkg ! org
[Download RAW message or body]

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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  rse@openpkg.org
  Module: openpkg-src                      Date:   31-Mar-2006 19:21:30
  Branch: HEAD                             Handle: 2006033118213000

  Modified files:
    openpkg-src/inetutils   inetutils.patch inetutils.spec

  Log:
    Revoke type conflict on Linux with 2.6 kernel. Submitted by: skaar

  Summary:
    Revision    Changes     Path
    1.3         +22 -0      openpkg-src/inetutils/inetutils.patch
    1.12        +1  -1      openpkg-src/inetutils/inetutils.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/inetutils/inetutils.patch
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 inetutils.patch
  --- openpkg-src/inetutils/inetutils.patch	23 Jan 2006 13:43:43 -0000	1.2
  +++ openpkg-src/inetutils/inetutils.patch	31 Mar 2006 17:21:30 -0000	1.3
  @@ -128,3 +128,25 @@
    
    FTP_EXTERN int macnum;			/* number of defined macros */
    FTP_EXTERN struct macel macros[16];
  +--- libinetutils/revoke.c.orig	2006-03-30 16:00:38.000000000 -0500
  ++++ libinetutils/revoke.c	2006-03-30 16:00:44.000000000 -0500
  +@@ -10,6 +10,14 @@
  + extern int errno;
  + #endif
  + 
  ++#ifdef __linux__
  ++#include <linux/version.h>
  ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
  ++#define NO_REVOKE 1
  ++#endif
  ++#endif
  ++
  ++#ifndef NO_REVOKE
  + int
  + revoke (char *path)
  + {
  +@@ -21,3 +29,4 @@
  + #endif
  +   return -1;
  + }
  ++#endif
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/inetutils/inetutils.spec
  ============================================================================
  $ cvs diff -u -r1.11 -r1.12 inetutils.spec
  --- openpkg-src/inetutils/inetutils.spec	23 Jan 2006 13:43:43 -0000	1.11
  +++ openpkg-src/inetutils/inetutils.spec	31 Mar 2006 17:21:30 -0000	1.12
  @@ -35,7 +35,7 @@
   Group:        Network
   License:      GPL
   Version:      1.4.2
  -Release:      20060123
  +Release:      20060331
   
   #   package options
   %option       with_fsl     yes
  @@ .
______________________________________________________________________
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]