[CVS] OpenPKG: OPENPKG_2_5_SOLID: openpkg-src/screen/ screen.patch scr...

2006-02-25 Thread Ralf S. Engelschall
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   25-Feb-2006 19:30:17
  Branch: OPENPKG_2_5_SOLIDHandle: 2006022518301700

  Modified files:   (Branch: OPENPKG_2_5_SOLID)
openpkg-src/screen  screen.patch screen.spec

  Log:
MFC: utmp fixes and FreeBSD 7 support

  Summary:
RevisionChanges Path
1.2.10.2+33 -0  openpkg-src/screen/screen.patch
1.43.4.3+1  -1  openpkg-src/screen/screen.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/screen/screen.patch
  
  $ cvs diff -u -r1.2.10.1 -r1.2.10.2 screen.patch
  --- openpkg-src/screen/screen.patch   8 Nov 2005 10:03:51 -   1.2.10.1
  +++ openpkg-src/screen/screen.patch   25 Feb 2006 18:30:17 -  1.2.10.2
  @@ -198,3 +198,36 @@
# define USE_SETEUID
#endif

  +Index: utmp.c
  +--- utmp.c.orig  2003-09-08 16:27:17 +0200
   utmp.c   2006-01-11 16:53:48 +0100
  +@@ -726,9 +726,12 @@
  + char *line, *user;
  + int pid;
  + {
  ++  time_t temp;
  ++
  +   strncpy(u->ut_line, line, sizeof(u->ut_line));
  +   strncpy(u->ut_name, user, sizeof(u->ut_name));
  +-  (void)time((time_t *)&u->ut_time);
  ++  (void)time(&temp);
  ++  u->ut_time = temp;
  + }
  + 
  + static slot_t
  +Index: pty.c
  +--- pty.c.orig   Mon Feb  6 18:54:37 2006
   pty.cMon Feb  6 18:56:50 2006
  +@@ -33,10 +33,12 @@
  + # include 
  + #endif
  + 
  ++#ifndef __FreeBSD__
  + /* for solaris 2.1, Unixware (SVR4.2) and possibly others */
  + #ifdef HAVE_SVR4_PTYS
  + # include 
  + #endif
  ++#endif
  + 
  + #if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL)
  + # include 
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/screen/screen.spec
  
  $ cvs diff -u -r1.43.4.2 -r1.43.4.3 screen.spec
  --- openpkg-src/screen/screen.spec8 Nov 2005 10:03:51 -   1.43.4.2
  +++ openpkg-src/screen/screen.spec25 Feb 2006 18:30:17 -  1.43.4.3
  @@ -33,7 +33,7 @@
   Group:Terminal
   License:  GPL
   Version:  4.0.2
  -Release:  2.5.1
  +Release:  2.5.2
   
   #   list of sources
   Source0:  
ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-%{version}.tar.gz
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


[CVS] OpenPKG: OPENPKG_2_5_SOLID: openpkg-src/screen/ screen.patch scr...

2005-11-08 Thread Ralf S. Engelschall
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   08-Nov-2005 11:03:51
  Branch: OPENPKG_2_5_SOLIDHandle: 2005110810035100

  Modified files:   (Branch: OPENPKG_2_5_SOLID)
openpkg-src/screen  screen.patch screen.spec

  Log:
MFC: fix compile warnings and fix multi-user mode under FreeBSD

  Summary:
RevisionChanges Path
1.2.10.1+20 -0  openpkg-src/screen/screen.patch
1.43.4.2+1  -1  openpkg-src/screen/screen.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/screen/screen.patch
  
  $ cvs diff -u -r1.2 -r1.2.10.1 screen.patch
  --- openpkg-src/screen/screen.patch   27 May 2004 12:04:43 -  1.2
  +++ openpkg-src/screen/screen.patch   8 Nov 2005 10:03:51 -   1.2.10.1
  @@ -178,3 +178,23 @@
  setenv(var, value, 1);
# else
  setenv(var, value);
  +Index: os.h
  +--- os.h.orig2002-01-08 16:42:33 +0100
   os.h 2005-11-08 11:01:37 +0100
  +@@ -25,6 +25,7 @@
  + #include 
  + #include 
  + 
  ++#include 
  + #include 
  + 
  + /* In strict ANSI mode, HP-UX machines define __hpux but not hpux */
  +@@ -161,7 +162,7 @@
  + # define setregid(rgid, egid) setresgid(rgid, egid, -1)
  + #endif
  + 
  +-#if defined(HAVE_SETEUID) || defined(HAVE_SETREUID)
  ++#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && __FreeBSD_version 
< 50
  + # define USE_SETEUID
  + #endif
  + 
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/screen/screen.spec
  
  $ cvs diff -u -r1.43.4.1 -r1.43.4.2 screen.spec
  --- openpkg-src/screen/screen.spec11 Oct 2005 12:51:50 -  1.43.4.1
  +++ openpkg-src/screen/screen.spec8 Nov 2005 10:03:51 -   1.43.4.2
  @@ -33,7 +33,7 @@
   Group:Terminal
   License:  GPL
   Version:  4.0.2
  -Release:  2.5.0
  +Release:  2.5.1
   
   #   list of sources
   Source0:  
ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-%{version}.tar.gz
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org