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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   24-Jan-2004 22:27:57
  Branch: HEAD                             Handle: 2004012421275402

  Added files:
    openpkg-src/unarj       unarj.patch
  Modified files:
    openpkg-src/unarj       unarj.spec
    openpkg-web             news.txt

  Log:
    make more portable

  Summary:
    Revision    Changes     Path
    1.1         +41 -0      openpkg-src/unarj/unarj.patch
    1.3         +4  -2      openpkg-src/unarj/unarj.spec
    1.8228      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/unarj/unarj.patch
  ============================================================================
  $ cvs diff -u -r0 -r1.1 unarj.patch
  --- /dev/null 2004-01-24 22:27:56.000000000 +0100
  +++ unarj.patch       2004-01-24 22:27:56.000000000 +0100
  @@ -0,0 +1,41 @@
  +Index: environ.c
  +--- environ.c.orig   Sat Jan 24 22:25:16 2004
  ++++ environ.c        Sat Jan 24 22:26:27 2004
  +@@ -430,18 +430,13 @@
  + 
  + #define SUBS_DEFINED
  + 
  ++#include <stdio.h>
  ++#include <stdlib.h>
  ++#include <string.h>
  + #include <time.h>
  + #include <sys/types.h>
  + #include <utime.h>
  +-
  +-#ifndef time_t
  +-#define time_t long
  +-#endif
  +-
  +-extern struct tm *localtime();
  +-extern time_t time();
  +-extern char   *strcpy();
  +-extern voidp  *malloc();
  ++#include <unistd.h>
  + 
  + FILE *
  + file_open(name, mode)
  +@@ -545,12 +540,12 @@
  + #define SEC_IN_DAY    (24L * 60L * 60L)
  + #define INV_VALUE     (SEC_IN_DAY + 1L)
  +     static long retval = INV_VALUE;
  +-    long now, noon;
  ++    time_t now, noon;
  +     struct tm *noontm;
  + 
  +     if (retval != INV_VALUE)
  +         return retval;
  +-    now = (long) time((long *) 0);
  ++    now = time(NULL);
  +     /* Find local time for GMT noon today */
  +     noon = now - now % SEC_IN_DAY + NOONOFFSET ;
  +     noontm = localtime(&noon);
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/unarj/unarj.spec
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 unarj.spec
  --- openpkg-src/unarj/unarj.spec      23 Jan 2004 13:15:09 -0000      1.2
  +++ openpkg-src/unarj/unarj.spec      24 Jan 2004 21:27:56 -0000      1.3
  @@ -37,11 +37,12 @@
   Group:        Archiver
   License:      Open Source
   Version:      %{V_base}
  -Release:      20030726
  +Release:      20040124
   
   #   list of sources
   Source0:      
http://http.us.debian.org/debian/pool/non-free/u/unarj/unarj_%{V_base}.orig.tar.gz
   Patch0:       
http://http.us.debian.org/debian/pool/non-free/u/unarj/unarj_%{V_base}-%{V_diff}.diff.gz
  +Patch1:       unarj.patch
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -56,7 +57,8 @@
   
   %prep
       %setup -q
  -    %patch -p1
  +    %patch -p1 -P 0
  +    %patch -p0 -P 1
   
   %build
       %{l_cc} %{l_cflags -O} -DUNIX -I. -o unarj unarj.c decode.c environ.c
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.8227 -r1.8228 news.txt
  --- openpkg-web/news.txt      24 Jan 2004 21:16:19 -0000      1.8227
  +++ openpkg-web/news.txt      24 Jan 2004 21:27:54 -0000      1.8228
  @@ -1,3 +1,4 @@
  +24-Jan-2004: Upgraded package: P<unarj-2.65-20040124>
   24-Jan-2004: Upgraded package: P<tomcat4-adapter-4.1.29-20040124>
   24-Jan-2004: Upgraded package: P<tla-1.1-20040124>
   24-Jan-2004: Upgraded package: P<roadrunner-0.9.1-20040124>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to